1372 files changed, 1262 insertions, 136900 deletions

diff --git a/swamid-interfederations-2.0.mxml b/swamid-interfederations-2.0.mxml
index d661550a..d5caa939 100644
--- a/swamid-interfederations-2.0.mxml
+++ b/swamid-interfederations-2.0.mxml
@@ -1,1400 +1,50 @@
 <?xml version="1.0"?>
 <EntitiesDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:xi="http://www.w3.org/2001/XInclude" Name="http://md.swamid.se/md/swamid-interfederations-2.0.xml">
-<xi:include href="swamid-interfederations-2.0/aai-idp.unibe.ch-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/aai-idp.unibe.ch.xml"/>
-<xi:include href="swamid-interfederations-2.0/aai-idp.uzh.ch-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/aai-idp.uzh.ch.xml"/>
-<xi:include href="swamid-interfederations-2.0/aai-integration.dfn.de-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/aai-integration.dfn.de.xml"/>
-<xi:include href="swamid-interfederations-2.0/aai-login.fh-htwchur.ch-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/aai-login.fh-htwchur.ch.xml"/>
-<xi:include href="swamid-interfederations-2.0/aai-login.ph-gr.ch-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/aai-login.ph-gr.ch.xml"/>
-<xi:include href="swamid-interfederations-2.0/aai-logon.bfh.ch-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/aai-logon.bfh.ch.xml"/>
-<xi:include href="swamid-interfederations-2.0/aai-logon.fhnw.ch-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/aai-logon.fhnw.ch.xml"/>
-<xi:include href="swamid-interfederations-2.0/aai-logon.fhsg.ch-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/aai-logon.fhsg.ch.xml"/>
-<xi:include href="swamid-interfederations-2.0/aai-logon.hes-so.ch-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/aai-logon.hes-so.ch.xml"/>
-<xi:include href="swamid-interfederations-2.0/aai-logon.switch.ch-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/aai-logon.switch.ch.xml"/>
-<xi:include href="swamid-interfederations-2.0/aai-logon.uni.li-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/aai-logon.uni.li.xml"/>
-<xi:include href="swamid-interfederations-2.0/aai-logon.wsl.ch-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/aai-logon.wsl.ch.xml"/>
-<xi:include href="swamid-interfederations-2.0/aai.rz.uni-leipzig.de-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/aai.rz.uni-leipzig.de.xml"/>
-<xi:include href="swamid-interfederations-2.0/aai.sztaki.hu-idp.xml"/>
-<xi:include href="swamid-interfederations-2.0/aai.sztaki.hu.xml"/>
-<xi:include href="swamid-interfederations-2.0/aai.unifr.ch-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/aai.unifr.ch.xml"/>
-<xi:include href="swamid-interfederations-2.0/aai-viewer.switch.ch.xml"/>
-<xi:include href="swamid-interfederations-2.0/accounts.okeanos-global.grnet.gr-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/accounts.okeanos-global.grnet.gr.xml"/>
-<xi:include href="swamid-interfederations-2.0/adfs.tue.nl-adfs-services-trust.xml"/>
-<xi:include href="swamid-interfederations-2.0/adfs.tue.nl.xml"/>
-<xi:include href="swamid-interfederations-2.0/agata.suz.cvut.cz-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/agata.suz.cvut.cz.xml"/>
-<xi:include href="swamid-interfederations-2.0/aginfra-sg.ct.infn.it-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/aginfra-sg.ct.infn.it.xml"/>
 <xi:include href="swamid-interfederations-2.0/agw-sparknet.utu.fi.xml"/>
-<xi:include href="swamid-interfederations-2.0/aishib.agropolis.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/aishib.agropolis.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/aleph.svkhk.cz-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/aleph.svkhk.cz.xml"/>
-<xi:include href="swamid-interfederations-2.0/ambre.vetagro-sup.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/ambre.vetagro-sup.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/antimoine.insa-strasbourg.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/antimoine.insa-strasbourg.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/appdb-dev.marie.hellasgrid.gr-edugain-connect.xml"/>
-<xi:include href="swamid-interfederations-2.0/appdb-dev.marie.hellasgrid.gr-edugain-sp.xml"/>
-<xi:include href="swamid-interfederations-2.0/appdb-dev.marie.hellasgrid.gr.xml"/>
-<xi:include href="swamid-interfederations-2.0/appdb.egi.eu-edugain-connect.xml"/>
-<xi:include href="swamid-interfederations-2.0/appdb.egi.eu-edugain-sp.xml"/>
-<xi:include href="swamid-interfederations-2.0/appdb.egi.eu.xml"/>
-<xi:include href="swamid-interfederations-2.0/applications.eu-decide.eu-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/applications.eu-decide.eu.xml"/>
-<xi:include href="swamid-interfederations-2.0/applications.eumedgrid.eu-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/applications.eumedgrid.eu.xml"/>
-<xi:include href="swamid-interfederations-2.0/apu.uepb.edu.br-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/apu.uepb.edu.br.xml"/>
-<xi:include href="swamid-interfederations-2.0/araripe.uece.br-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/araripe.uece.br.xml"/>
-<xi:include href="swamid-interfederations-2.0/arauto.fapesp.br-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/arauto.fapesp.br.xml"/>
 <xi:include href="swamid-interfederations-2.0/atlases.muni.cz-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/atlases.muni.cz.xml"/>
-<xi:include href="swamid-interfederations-2.0/atrium.in2p3.fr-sp.xml"/>
-<xi:include href="swamid-interfederations-2.0/atrium.in2p3.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/attribute-viewer.aai.switch.ch-interfederation-test-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/attribute-viewer.aai.switch.ch-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/attribute-viewer.aai.switch.ch.xml"/>
-<xi:include href="swamid-interfederations-2.0/auth.agrosupdijon.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/auth.agrosupdijon.fr.xml"/>
 <xi:include href="swamid-interfederations-2.0/auth.asiaportal.info.xml"/>
-<xi:include href="swamid-interfederations-2.0/auth.crous-versailles.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/auth.crous-versailles.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/auth.mines-paristech.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/auth.mines-paristech.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/auth.services.bmj.com-auth.xml"/>
-<xi:include href="swamid-interfederations-2.0/auth.services.bmj.com.xml"/>
-<xi:include href="swamid-interfederations-2.0/auth.univ-paris-diderot.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/auth.univ-paris-diderot.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/auth.univ-pau.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/auth.univ-pau.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/auth.u-pec.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/auth.u-pec.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/beta.shib.manchester.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/beta.shib.manchester.ac.uk.xml"/>
-<xi:include href="swamid-interfederations-2.0/bodportal.geant.net-autobahn-gui.xml"/>
-<xi:include href="swamid-interfederations-2.0/bodportal.geant.net.xml"/>
-<xi:include href="swamid-interfederations-2.0/box-idp.nordu.net-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml"/>
-<xi:include href="swamid-interfederations-2.0/box-idp.nordu.net.xml"/>
-<xi:include href="swamid-interfederations-2.0/butare.ifrn.edu.br-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/butare.ifrn.edu.br.xml"/>
-<xi:include href="swamid-interfederations-2.0/cafe01.unicamp.br-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/cafe01.unicamp.br.xml"/>
-<xi:include href="swamid-interfederations-2.0/cafe1.ufes.br-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/cafe1.ufes.br.xml"/>
-<xi:include href="swamid-interfederations-2.0/cafe.accamargo.org.br-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/cafe.accamargo.org.br.xml"/>
-<xi:include href="swamid-interfederations-2.0/cafe.fucape.br-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/cafe.fucape.br.xml"/>
-<xi:include href="swamid-interfederations-2.0/cafe-gateway.ifce.edu.br-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/cafe-gateway.ifce.edu.br.xml"/>
-<xi:include href="swamid-interfederations-2.0/cafe-idp.ufc.br-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/cafe-idp.ufc.br.xml"/>
-<xi:include href="swamid-interfederations-2.0/cafe.iec.pa.gov.br-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/cafe.iec.pa.gov.br.xml"/>
-<xi:include href="swamid-interfederations-2.0/cafe.ifb.edu.br-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/cafe.ifb.edu.br.xml"/>
-<xi:include href="swamid-interfederations-2.0/cafe.ifes.edu.br-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/cafe.ifes.edu.br.xml"/>
-<xi:include href="swamid-interfederations-2.0/cafe.ifg.edu.br-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/cafe.ifg.edu.br.xml"/>
-<xi:include href="swamid-interfederations-2.0/cafe.ifnmg.edu.br-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/cafe.ifnmg.edu.br.xml"/>
-<xi:include href="swamid-interfederations-2.0/cafe.ifpa.edu.br-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/cafe.ifpa.edu.br.xml"/>
-<xi:include href="swamid-interfederations-2.0/cafe.ifro.edu.br-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/cafe.ifro.edu.br.xml"/>
-<xi:include href="swamid-interfederations-2.0/cafe.ifrs.edu.br-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/cafe.ifrs.edu.br.xml"/>
-<xi:include href="swamid-interfederations-2.0/cafe.ifsp.edu.br-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/cafe.ifsp.edu.br.xml"/>
-<xi:include href="swamid-interfederations-2.0/cafe.on.br-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/cafe.on.br.xml"/>
-<xi:include href="swamid-interfederations-2.0/cafe.pucminas.br-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/cafe.pucminas.br.xml"/>
-<xi:include href="swamid-interfederations-2.0/cafernp.insa.gov.br-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/cafernp.insa.gov.br.xml"/>
-<xi:include href="swamid-interfederations-2.0/cafe.sti.uff.br-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/cafe.sti.uff.br.xml"/>
-<xi:include href="swamid-interfederations-2.0/cafetools.ufpi.br-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/cafetools.ufpi.br.xml"/>
-<xi:include href="swamid-interfederations-2.0/cafe.udesc.br-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/cafe.udesc.br.xml"/>
-<xi:include href="swamid-interfederations-2.0/cafe.uesb.br-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/cafe.uesb.br.xml"/>
-<xi:include href="swamid-interfederations-2.0/cafe.uesc.br-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/cafe.uesc.br.xml"/>
-<xi:include href="swamid-interfederations-2.0/cafe.ufba.br-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/cafe.ufba.br.xml"/>
-<xi:include href="swamid-interfederations-2.0/cafe.ufop.br-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/cafe.ufop.br.xml"/>
-<xi:include href="swamid-interfederations-2.0/cafe.ufra.edu.br-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/cafe.ufra.edu.br.xml"/>
-<xi:include href="swamid-interfederations-2.0/cafe.unicentro.br-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/cafe.unicentro.br.xml"/>
-<xi:include href="swamid-interfederations-2.0/cafe.unifap.br-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/cafe.unifap.br.xml"/>
-<xi:include href="swamid-interfederations-2.0/cafe.unifran.br-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/cafe.unifran.br.xml"/>
-<xi:include href="swamid-interfederations-2.0/cafe.unisc.br-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/cafe.unisc.br.xml"/>
-<xi:include href="swamid-interfederations-2.0/cafe.upf.br-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/cafe.upf.br.xml"/>
-<xi:include href="swamid-interfederations-2.0/cafe.uscs.edu.br-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/cafe.uscs.edu.br.xml"/>
-<xi:include href="swamid-interfederations-2.0/capuccino.iff.edu.br-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/capuccino.iff.edu.br.xml"/>
-<xi:include href="swamid-interfederations-2.0/capuccino.info.ufrn.br-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/capuccino.info.ufrn.br.xml"/>
-<xi:include href="swamid-interfederations-2.0/cas.ac-martinique.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/cas.ac-martinique.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/cas.crous-lyon.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/cas.crous-lyon.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/cas.cuni.cz-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/cas.cuni.cz.xml"/>
-<xi:include href="swamid-interfederations-2.0/cas.educagri.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/cas.educagri.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/cas.ent-etrs.net-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/cas.ent-etrs.net.xml"/>
-<xi:include href="swamid-interfederations-2.0/cas.st-cyr.terre.defense.gouv.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/cas.st-cyr.terre.defense.gouv.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/cerbere2.mines-douai.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/cerbere2.mines-douai.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/cern.ch-login.xml"/>
-<xi:include href="swamid-interfederations-2.0/cern.ch.xml"/>
-<xi:include href="swamid-interfederations-2.0/clarin.ids-mannheim.de-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/clarin.ids-mannheim.de.xml"/>
-<xi:include href="swamid-interfederations-2.0/clarin.oeaw.ac.at-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/clarin.oeaw.ac.at.xml"/>
-<xi:include href="swamid-interfederations-2.0/clarino.uib.no-.xml"/>
-<xi:include href="swamid-interfederations-2.0/clarino.uib.no.xml"/>
-<xi:include href="swamid-interfederations-2.0/cloudidp1.canarie.ca.xml"/>
-<xi:include href="swamid-interfederations-2.0/colreg.de.dariah.eu-colreg.xml"/>
-<xi:include href="swamid-interfederations-2.0/colreg.de.dariah.eu.xml"/>
-<xi:include href="swamid-interfederations-2.0/community.ja.net-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/community.ja.net.xml"/>
 <xi:include href="swamid-interfederations-2.0/compute.deic.dk.xml"/>
-<xi:include href="swamid-interfederations-2.0/connect-beta.sunet.se-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/connect-beta.sunet.se.xml"/>
-<xi:include href="swamid-interfederations-2.0/connect.sunet.se-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/connect.sunet.se.xml"/>
 <xi:include href="swamid-interfederations-2.0/core.uwap.org-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml"/>
-<xi:include href="swamid-interfederations-2.0/core.uwap.org.xml"/>
-<xi:include href="swamid-interfederations-2.0/customers.myunidays.com-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/customers.myunidays.com.xml"/>
 <xi:include href="swamid-interfederations-2.0/data.deic.dk.xml"/>
-<xi:include href="swamid-interfederations-2.0/de.dariah.eu-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/de.dariah.eu.xml"/>
-<xi:include href="swamid-interfederations-2.0/dev1.redclara.net-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/dev1.redclara.net.xml"/>
-<xi:include href="swamid-interfederations-2.0/dev2.dariah.eu-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/dev2.dariah.eu.xml"/>
-<xi:include href="swamid-interfederations-2.0/dev.emeraldinsight.com-entity.xml"/>
-<xi:include href="swamid-interfederations-2.0/dev.emeraldinsight.com.xml"/>
-<xi:include href="swamid-interfederations-2.0/dimorus.intranet.ifrj.edu.br-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/dimorus.intranet.ifrj.edu.br.xml"/>
-<xi:include href="swamid-interfederations-2.0/doccom.iml.unibe.ch-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/doccom.iml.unibe.ch.xml"/>
-<xi:include href="swamid-interfederations-2.0/doit.swisdom.org-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/doit.swisdom.org.xml"/>
-<xi:include href="swamid-interfederations-2.0/dourado.ufs.br-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/dourado.ufs.br.xml"/>
-<xi:include href="swamid-interfederations-2.0/du-idp.lanet.lv.xml"/>
-<xi:include href="swamid-interfederations-2.0/e5.onthehub.com.xml"/>
-<xi:include href="swamid-interfederations-2.0/earthserver-sg.consorzio-cometa.it-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/earthserver-sg.consorzio-cometa.it.xml"/>
-<xi:include href="swamid-interfederations-2.0/easydb.geschkult.fu-berlin.de-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/easydb.geschkult.fu-berlin.de.xml"/>
-<xi:include href="swamid-interfederations-2.0/ecsg.dch-rp.eu-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/ecsg.dch-rp.eu.xml"/>
-<xi:include href="swamid-interfederations-2.0/edev.cesnet.cz-sp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/edev.cesnet.cz.xml"/>
-<xi:include href="swamid-interfederations-2.0/educonf-directory.geant.net-simplesaml-module.php-saml-sp-metadata.php-eduCONF.xml"/>
-<xi:include href="swamid-interfederations-2.0/educonf-directory.geant.net.xml"/>
-<xi:include href="swamid-interfederations-2.0/edugain-group.cesnet.cz-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/edugain-group.cesnet.cz.xml"/>
-<xi:include href="swamid-interfederations-2.0/edugate.heanet.ie-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/edugate.heanet.ie.xml"/>
-<xi:include href="swamid-interfederations-2.0/edugate.itb.ie-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/edugate.itb.ie.xml"/>
-<xi:include href="swamid-interfederations-2.0/eduspot.ens-cachan.fr-authsaml2-metadata.xml"/>
-<xi:include href="swamid-interfederations-2.0/eduspot.ens-cachan.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/egiswamid.egi.kth.se-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/egiswamid.egi.kth.se.xml"/>
-<xi:include href="swamid-interfederations-2.0/eka-idp.lanet.lv.xml"/>
-<xi:include href="swamid-interfederations-2.0/eliot.isae.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/eliot.isae.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/e-localcourses.unibo.it.xml"/>
-<xi:include href="swamid-interfederations-2.0/encecafe.ibge.gov.br-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/encecafe.ibge.gov.br.xml"/>
-<xi:include href="swamid-interfederations-2.0/engine.jacson.jiscadvance.biz.xml"/>
-<xi:include href="swamid-interfederations-2.0/engine.surfconext.nl-authentication-sp-metadata.xml"/>
-<xi:include href="swamid-interfederations-2.0/engine.surfconext.nl.xml"/>
-<xi:include href="swamid-interfederations-2.0/epoq.compilatio.net-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/epoq.compilatio.net.xml"/>
-<xi:include href="swamid-interfederations-2.0/febe.ufpe.br-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/febe.ufpe.br.xml"/>
-<xi:include href="swamid-interfederations-2.0/federacao.ifpi.edu.br-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/federacao.ifpi.edu.br.xml"/>
-<xi:include href="swamid-interfederations-2.0/federacao.uvanet.br.xml"/>
-<xi:include href="swamid-interfederations-2.0/federation2.univ-brest.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/federation2.univ-brest.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/federation2.univ-perp.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/federation2.univ-perp.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/federation.agrocampus-ouest.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/federation.agrocampus-ouest.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/federation.bretagne.iufm.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/federation.bretagne.iufm.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/federation.crous-lille.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/federation.crous-lille.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/federation.esiee.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/federation.esiee.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/federation-identite.univ-paris13.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/federation-identite.univ-paris13.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/federation.ined.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/federation.ined.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/federationrenater.univ-montp2.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/federationrenater.univ-montp2.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/federation.sciences-po.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/federation.sciences-po.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/federation.unimes.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/federation.unimes.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/federation.u-pem.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/federation.u-pem.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/federation.upf.pf-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/federation.upf.pf.xml"/>
-<xi:include href="swamid-interfederations-2.0/federation.utbm.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/federation.utbm.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/fede.supelec.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/fede.supelec.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/fed.id.univ-bordeaux.fr-idp_ubx-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/fed.id.univ-bordeaux.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/filesender.cesnet.cz-saml-sp.xml"/>
-<xi:include href="swamid-interfederations-2.0/filesender.cesnet.cz.xml"/>
-<xi:include href="swamid-interfederations-2.0/filesender.du1.cesnet.cz-saml-sp.xml"/>
-<xi:include href="swamid-interfederations-2.0/filesender.du1.cesnet.cz.xml"/>
 <xi:include href="swamid-interfederations-2.0/filesender.funet.fi.xml"/>
-<xi:include href="swamid-interfederations-2.0/filesender.redclara.net-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml"/>
-<xi:include href="swamid-interfederations-2.0/filesender.redclara.net.xml"/>
-<xi:include href="swamid-interfederations-2.0/fim-hn-02-idp.orion.education.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/fire.rettorato.unito.it-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/fire.rettorato.unito.it.xml"/>
-<xi:include href="swamid-interfederations-2.0/fod.geant.net-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/fod.geant.net.xml"/>
 <xi:include href="swamid-interfederations-2.0/foodl.org-simplesaml-module.php-saml-sp-metadata.php-saml.xml"/>
-<xi:include href="swamid-interfederations-2.0/foodl.org.xml"/>
-<xi:include href="swamid-interfederations-2.0/forge.switch.ch-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/forge.switch.ch.xml"/>
-<xi:include href="swamid-interfederations-2.0/fortbildung.unibas.ch.xml"/>
 <xi:include href="swamid-interfederations-2.0/fse.eduuni.fi-adfs-services-trust.xml"/>
-<xi:include href="swamid-interfederations-2.0/fse.eduuni.fi.xml"/>
-<xi:include href="swamid-interfederations-2.0/fs-elcira-srv01.dir.garr.it-simplesamlphp-module.php-saml-sp-metadata.php-default-sp.xml"/>
-<xi:include href="swamid-interfederations-2.0/fs-elcira-srv01.dir.garr.it.xml"/>
-<xi:include href="swamid-interfederations-2.0/ghgtool.grnet.gr-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/ghgtool.grnet.gr.xml"/>
-<xi:include href="swamid-interfederations-2.0/gidp.geant.net.xml"/>
-<xi:include href="swamid-interfederations-2.0/gisela-gw.ct.infn.it-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/gisela-gw.ct.infn.it.xml"/>
-<xi:include href="swamid-interfederations-2.0/gitlab-dev.in2p3.fr-sp.xml"/>
-<xi:include href="swamid-interfederations-2.0/gitlab-dev.in2p3.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/gitlab.in2p3.fr-sp.xml"/>
-<xi:include href="swamid-interfederations-2.0/gitlab.in2p3.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/gn-vho.grnet.gr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/gn-vho.grnet.gr.xml"/>
-<xi:include href="swamid-interfederations-2.0/groupes.france-bioinformatique.fr-sympa.xml"/>
-<xi:include href="swamid-interfederations-2.0/groupes.france-bioinformatique.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/gteavirtual.org.xml"/>
-<xi:include href="swamid-interfederations-2.0/gw-astronomy.org-lists-shibboleth-sp.xml"/>
-<xi:include href="swamid-interfederations-2.0/gw-astronomy.org-shibboleth-sp.xml"/>
-<xi:include href="swamid-interfederations-2.0/gw-astronomy.org-wiki-shibboleth-sp.xml"/>
-<xi:include href="swamid-interfederations-2.0/gw-astronomy.org.xml"/>
-<xi:include href="swamid-interfederations-2.0/gw.ct.infn.it-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/gw.ct.infn.it.xml"/>
 <xi:include href="swamid-interfederations-2.0/haka.saimia.fi-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/haka.saimia.fi.xml"/>
-<xi:include href="swamid-interfederations-2.0/halfback.cnaf.infn.it-casshib-app2.xml"/>
-<xi:include href="swamid-interfederations-2.0/halfback.cnaf.infn.it.xml"/>
-<xi:include href="swamid-interfederations-2.0/hbidp.hb.se-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/hbidp.hb.se.xml"/>
-<xi:include href="swamid-interfederations-2.0/homeproj.cesnet.cz.xml"/>
-<xi:include href="swamid-interfederations-2.0/iam.cf.ac.uk-sp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/iam.cf.ac.uk.xml"/>
-<xi:include href="swamid-interfederations-2.0/id.auf.org-idp-saml2-metadata.xml"/>
-<xi:include href="swamid-interfederations-2.0/id.auf.org.xml"/>
-<xi:include href="swamid-interfederations-2.0/idem.ced.inaf.it-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idem.ced.inaf.it.xml"/>
-<xi:include href="swamid-interfederations-2.0/idemfero.units.it-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idemfero.units.it.xml"/>
-<xi:include href="swamid-interfederations-2.0/idem.univpm.it-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idem.univpm.it.xml"/>
-<xi:include href="swamid-interfederations-2.0/ident.ensta-bretagne.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/ident.ensta-bretagne.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/ident.ensta.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/ident.ensta.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/ident.groupe-esa.com-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/ident.groupe-esa.com.xml"/>
-<xi:include href="swamid-interfederations-2.0/identites.ec-lyon.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/identites.ec-lyon.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/identites.enim.fr-idp-.xml"/>
-<xi:include href="swamid-interfederations-2.0/identites.enim.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/identites.ensea.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/identites.ensea.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/identities.univ-jfc.fr-idp-prod.xml"/>
-<xi:include href="swamid-interfederations-2.0/identities.univ-jfc.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/identity.mdh.se-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/identity.mdh.se.xml"/>
-<xi:include href="swamid-interfederations-2.0/identity.unamur.be-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/identity.unamur.be.xml"/>
-<xi:include href="swamid-interfederations-2.0/ident-shib.ensc-rennes.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/ident-shib.ensc-rennes.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/ident-shib.sciencespo-rennes.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/ident-shib.sciencespo-rennes.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/idm.ics.muni.cz-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idm.ics.muni.cz.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp1.agroparistech.fr-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp1.agroparistech.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp1.crous-aix-marseille.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp1.crous-aix-marseille.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp1.crous-toulouse.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp1.crous-toulouse.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp1.hogent.be-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp1.hogent.be.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp1.inria.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp1.inria.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp1.uwaterloo.ca-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp1.uwaterloo.ca.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp2-1.slu.se-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp2-1.slu.se.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp2.civ.cvut.cz-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp2.civ.cvut.cz.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp2.crous-toulouse.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp2.crous-toulouse.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp2.iay.org.uk-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp2.iay.org.uk.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp2.ics.muni.cz-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp2.ics.muni.cz.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp2.idem.garr.it.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp2.kau.se-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp2.kau.se.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp2.redclara.net-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp2.redclara.net.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.aai.arnes.si-idp-20090116.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.aai.arnes.si.xml"/>
 <xi:include href="swamid-interfederations-2.0/idp.aalto.fi-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.aalto.fi.xml"/>
 <xi:include href="swamid-interfederations-2.0/idp.abo.fi-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.abo.fi.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.aco.net-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.aco.net.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.admin.grnet.gr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.admin.grnet.gr.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.amue.fr-idp-saml2-metadata.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.amue.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.bc.cas.cz-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.bc.cas.cz.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.bth.se-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.bth.se.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp-cafe.ifrr.edu.br-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp-cafe.ifrr.edu.br.xml"/>
-<xi:include href="swamid-interfederations-2.0/idpcafe.ifsc.edu.br-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idpcafe.ifsc.edu.br.xml"/>
-<xi:include href="swamid-interfederations-2.0/idpcafe.ufjf.br-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idpcafe.ufjf.br.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp-cafe.unir.br-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp-cafe.unir.br.xml"/>
-<xi:include href="swamid-interfederations-2.0/idpcafe.usp.br-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idpcafe.usp.br.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.canarie.ca-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.canarie.ca.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.capes.gov.br-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.capes.gov.br.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.cardiff.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.cardiff.ac.uk.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.cedia.org.ec-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.cedia.org.ec.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.cereq.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.cereq.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.cirad.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.cirad.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/idpcnous.cnous.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idpcnous.cnous.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.cnous.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.cnous.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.company.ja.net-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.company.ja.net.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.condorcet.be-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.condorcet.be.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.cpe.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.cpe.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.craw.eu-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.craw.eu.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.crihan.fr-saml2-idp-metadata.php.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.crihan.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.crous-antillesguyane.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.crous-antillesguyane.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.crous-besancon.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.crous-besancon.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.crous-caen.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.crous-caen.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.crous-clermont.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.crous-clermont.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.crous-creteil.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.crous-creteil.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.crous-dijon.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.crous-dijon.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.crous-grenoble.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.crous-grenoble.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.crous-limoges.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.crous-limoges.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.crous-montpellier.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.crous-montpellier.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.crous-nancy-metz.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.crous-nancy-metz.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.crous-nantes.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.crous-nantes.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.crous-nice.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.crous-nice.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.crous-orleans-tours.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.crous-orleans-tours.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.crous-paris.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.crous-paris.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.crous-poitiers.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.crous-poitiers.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.crous-reims.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.crous-reims.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.crous-rennes.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.crous-rennes.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.crous-strasbourg.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.crous-strasbourg.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.cs.cas.cz-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.cs.cas.cz.xml"/>
 <xi:include href="swamid-interfederations-2.0/idp.csc.fi-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.csc.fi.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp-css.irccs.garr.it-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp-css.irccs.garr.it.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.cue-lillenorddefrance.fr-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.cue-lillenorddefrance.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.cvgz.cas.cz-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.cvgz.cas.cz.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.cyceron.fr:8443-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.cyceron.fr:8443.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.dante.net-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.dante.net.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp-dev.cardiff.ac.uk-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp-dev.cardiff.ac.uk.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.dfn.de-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.dfn.de.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp-dgnocchi.irccs.garr.it-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp-dgnocchi.irccs.garr.it.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.dias.ie-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.dias.ie.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.dijon.iufm.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.dijon.iufm.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.dir.garr.it-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.dir.garr.it.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.dit.ie-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.dit.ie.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.dkit.ie-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.dkit.ie.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.ebi.ac.uk-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.ebi.ac.uk.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.ecam.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.ecam.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.ec-lille.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.ec-lille.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.ed.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.ed.ac.uk.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.ehess.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.ehess.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.elte.hu-auth-saml2-idp-metadata.php.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.elte.hu.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.enib.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.enib.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.enitab.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.enitab.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.enit.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.enit.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.ensai.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.ensai.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.ensait.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.ensait.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.ens-cachan.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.ens-cachan.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.ens.fr-idp-idp.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.ens.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.ensma.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.ensma.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp-ensr.ens-rennes.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp-ensr.ens-rennes.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.enssib.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.enssib.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.ent.dauphine.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.ent.dauphine.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.entpe.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.entpe.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.epfl.ch-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.epfl.ch.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.eso.org-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.eso.org.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp-etu.crous-grenoble.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp-etu.crous-grenoble.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.eurecom.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.eurecom.fr.xml"/>
 <xi:include href="swamid-interfederations-2.0/idp.feide.no.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.fgu.cas.cz-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.fgu.cas.cz.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.fh-kaernten.at-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.fh-kaernten.at.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.fh-rosenheim.de-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.fh-rosenheim.de.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.fzu.cas.cz-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.fzu.cas.cz.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.gakunin.nii.ac.jp-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.gakunin.nii.ac.jp.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.georgikon.hu-idp-saml2-idp-metadata.php.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.georgikon.hu.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.gli.cas.cz-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.gli.cas.cz.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.hainaut-promsoc.be-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.hainaut-promsoc.be.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.heanet.ie-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.heanet.ie.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.hebis.de-uni-frankfurt.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.hebis.de.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.hesam.eu-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.hesam.eu.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.hig.se-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.hig.se.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.hs-esslingen.de-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.hs-esslingen.de.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.hslu.ch-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.hslu.ch.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.ibp.cas.cz-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.ibp.cas.cz.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.icpf.cas.cz-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.icpf.cas.cz.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.ids-mannheim.de-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.ids-mannheim.de.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.ifal.edu.br-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.ifal.edu.br.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.ifap.edu.br-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.ifap.edu.br.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.ifc.edu.br-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.ifc.edu.br.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.ifpb.edu.br-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.ifpb.edu.br.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.ifremer.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.ifremer.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.ifsudestemg.edu.br-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.ifsudestemg.edu.br.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.ifto.edu.br-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.ifto.edu.br.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.iit.it-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.iit.it.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.img.cas.cz-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.img.cas.cz.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.inalco.fr-idp.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.inalco.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.inha.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.inha.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.inpa.gov.br-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.inpa.gov.br.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.inp-toulouse.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.inp-toulouse.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.inra.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.inra.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.insa-rennes.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.insa-rennes.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.inserm.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.inserm.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.ipa.ie-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.ipa.ie.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.ipb.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.ipb.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.ipm.cas.cz-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.ipm.cas.cz.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.irstea.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.irstea.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.isibrno.cas.cz-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.isibrno.cas.cz.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.itam.cas.cz-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.itam.cas.cz.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.it.gu.se-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.it.gu.se.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.its.fz-juelich.de-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.its.fz-juelich.de.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.itsligo.ie-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.itsligo.ie.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.it.su.se-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.it.su.se.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.it-tallaght.ie-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.it-tallaght.ie.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.ittralee.ie-idp.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.ittralee.ie.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.izs.it-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.izs.it.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.kb.se-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.kb.se.xml"/>
 <xi:include href="swamid-interfederations-2.0/idp.lapinamk.fi-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.lapinamk.fi.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.lib.cas.cz-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.lib.cas.cz.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.lrz.de-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.lrz.de.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.mast.br-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.mast.br.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.mbu.cas.cz-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.mbu.cas.cz.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.mci4me.at-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.mci4me.at.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.meduniwien.ac.at-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.meduniwien.ac.at.xml"/>
 <xi:include href="swamid-interfederations-2.0/idp.metropolia.fi-idp.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.metropolia.fi.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.mnhn.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.mnhn.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.mta.hu-idp-saml2-idp-metadata.php.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.mta.hu.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.ncirl.ie-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.ncirl.ie.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.nesc.gla.ac.uk-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.nesc.gla.ac.uk.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.niif.hu-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.niif.hu.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.nordu.net-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.nordu.net.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.normandie-univ.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.normandie-univ.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.nuigalway.ie-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.nuigalway.ie.xml"/>
 <xi:include href="swamid-interfederations-2.0/idp.oamk.fi-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.oamk.fi.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.parisdescartes.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.parisdescartes.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.ppke.hu-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.ppke.hu.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp-preprod.cardiff.ac.uk-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp-preprod.cardiff.ac.uk.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.psu.cas.cz-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.psu.cas.cz.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.puc-campinas.edu.br-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.puc-campinas.edu.br.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.renater.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.renater.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.reuna.cl-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.reuna.cl.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.rnp.br-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.rnp.br.xml"/>
-<xi:include href="swamid-interfederations-2.0/idpr.tem-tsp.eu-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idpr.tem-tsp.eu.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.scc.kit.edu-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.scc.kit.edu.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.sciencespobordeaux.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.sciencespobordeaux.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.sgi.cefetmg.br-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.sgi.cefetmg.br.xml"/>
 <xi:include href="swamid-interfederations-2.0/idp.shh.fi-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.shh.fi.xml"/>
-<xi:include href="swamid-interfederations-2.0/idpshib01.ifma.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idpshib01.ifma.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.shibboleth.net-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.shibboleth.net.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.sissa.it-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.sissa.it.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.soc.cas.cz-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.soc.cas.cz.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp-ssbar.beniculturali.garr.it-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp-ssbar.beniculturali.garr.it.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.ssc.cas.cz-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.ssc.cas.cz.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.sssup.it-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.sssup.it.xml"/>
-<xi:include href="swamid-interfederations-2.0/idpstaff.belnet.be-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idpstaff.belnet.be.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp-stellamaris.irccs.garr.it-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp-stellamaris.irccs.garr.it.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.strasbourg.archi.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.strasbourg.archi.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.student.bth.se-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.student.bth.se.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.surfnet.nl.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.sze.hu-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.sze.hu.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.szie.hu-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.szie.hu.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.telecom-bretagne.eu-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.telecom-bretagne.eu.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.telecom-lille1.eu-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.telecom-lille1.eu.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.telecom-paristech.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.telecom-paristech.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp-test.ucs.ed.ac.uk-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp-test.ucs.ed.ac.uk.xml"/>
-<xi:include href="swamid-interfederations-2.0/idptl.telecom-lille.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idptl.telecom-lille.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/idptoo.osu.cz-simplesaml-saml2-idp-metadata.php.xml"/>
-<xi:include href="swamid-interfederations-2.0/idptoo.osu.cz.xml"/>
 <xi:include href="swamid-interfederations-2.0/idp.tut.fi-shibboleth2.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.tut.fi.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.u-bordeaux1.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.u-bordeaux1.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.u-bordeaux2.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.u-bordeaux2.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.u-bordeaux3.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.u-bordeaux3.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.u-bordeaux4.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.u-bordeaux4.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.u-bordeaux.fr-idp_ubx-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.u-bordeaux.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.u-bordeaux-montaigne.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.u-bordeaux-montaigne.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.u-cergy.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.u-cergy.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.u-clermont1.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.u-clermont1.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.ucuenca.edu.ec-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.ucuenca.edu.ec.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.ueb.cas.cz-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.ueb.cas.cz.xml"/>
 <xi:include href="swamid-interfederations-2.0/idp.uef.fi-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.uef.fi.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.ufe.cas.cz-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.ufe.cas.cz.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.ufgd.edu.br-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.ufgd.edu.br.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.ufmg.br-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.ufmg.br.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.ufpr.br-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.ufpr.br.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.ufsm.br-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.ufsm.br.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.uha.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.uha.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.uhk.cz-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.uhk.cz.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.ujep.cz-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.ujep.cz.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.ujf.cas.cz-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.ujf.cas.cz.xml"/>
 <xi:include href="swamid-interfederations-2.0/idp.ulapland.fi-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.ulapland.fi.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.ul.ie-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.ul.ie.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.umk.pl-simplesaml-saml2-idp-metadata.php.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.umk.pl.xml"/>
-<xi:include href="swamid-interfederations-2.0/idpuniba.uniba.it-simplesaml-saml2-idp-metadata.php.xml"/>
-<xi:include href="swamid-interfederations-2.0/idpuniba.uniba.it.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.unibocconi-prod.it-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.unibocconi-prod.it.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.unicaen.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.unicaen.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.unica.it-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.unica.it.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.unijui.edu.br-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.unijui.edu.br.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.unimc.it-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.unimc.it.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.unimedizin-mainz.de-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.unimedizin-mainz.de.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.uniparthenope.it-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.uniparthenope.it.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.unipg.it-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.unipg.it.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.unipi.it-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.unipi.it.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.uniroma3.it-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.uniroma3.it.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.unistra.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.unistra.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp-unito-prod.cineca.it-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp-unito-prod.cineca.it.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.univ-ag.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.univ-ag.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.univ-amu.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.univ-amu.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.univ-artois.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.univ-artois.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.univ-avignon.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.univ-avignon.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.univ-bpclermont.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.univ-bpclermont.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.universite-lyon.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.universite-lyon.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.univ-fcomte.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.univ-fcomte.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.univ-lehavre.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.univ-lehavre.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.univ-lille3.fr-idp.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.univ-lille3.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.univ-lorraine.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.univ-lorraine.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.univ-lyon2.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.univ-lyon2.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.univ-lyon3.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.univ-lyon3.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.univ-orleans.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.univ-orleans.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.univ-paris3.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.univ-paris3.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.univ-paris4.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.univ-paris4.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.univ-paris8.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.univ-paris8.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.univ-tours.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.univ-tours.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.unoesc.edu.br-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.unoesc.edu.br.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.uoa.gr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.uoa.gr.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.u-paris2.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.u-paris2.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.u-picardie.fr-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.u-picardie.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.upmc.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.upmc.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.uqam.ca-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.uqam.ca.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.urca.br-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.urca.br.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.ut-capitole.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.ut-capitole.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.utia.cas.cz-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.utia.cas.cz.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.utorauth.utoronto.ca-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.utorauth.utoronto.ca.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.vet-alfort.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.vet-alfort.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.vib.be-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.vib.be.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.zid.tuwien.ac.at-saml2.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.zid.tuwien.ac.at.xml"/>
-<xi:include href="swamid-interfederations-2.0/id.ucly.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/id.ucly.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/id.vse.cz-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/id.vse.cz.xml"/>
-<xi:include href="swamid-interfederations-2.0/ifs00sv056.ifsul.edu.br-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/ifs00sv056.ifsul.edu.br.xml"/>
-<xi:include href="swamid-interfederations-2.0/imogen.surfnet.nl.xml"/>
-<xi:include href="swamid-interfederations-2.0/indicate-gw.consorzio-cometa.it-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/indicate-gw.consorzio-cometa.it.xml"/>
-<xi:include href="swamid-interfederations-2.0/instantanatomy.co.uk-shib.xml"/>
-<xi:include href="swamid-interfederations-2.0/instantanatomy.co.uk.xml"/>
-<xi:include href="swamid-interfederations-2.0/ir-lan-fid.images-et-reseaux.com-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/ir-lan-fid.images-et-reseaux.com.xml"/>
-<xi:include href="swamid-interfederations-2.0/issues.shibboleth.net-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/issues.shibboleth.net.xml"/>
-<xi:include href="swamid-interfederations-2.0/itacare.bahiana.edu.br-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/itacare.bahiana.edu.br.xml"/>
-<xi:include href="swamid-interfederations-2.0/janus.bordeaux.archi.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/janus.bordeaux.archi.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/joaodebarro.iffarroupilha.edu.br-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/joaodebarro.iffarroupilha.edu.br.xml"/>
-<xi:include href="swamid-interfederations-2.0/katalog.svkos.cz-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/katalog.svkos.cz.xml"/>
-<xi:include href="swamid-interfederations-2.0/keybucket.app.nordu.net-saml2-sp-metadata.xml"/>
-<xi:include href="swamid-interfederations-2.0/keybucket.app.nordu.net.xml"/>
-<xi:include href="swamid-interfederations-2.0/kiidp.ki.se-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/kiidp.ki.se.xml"/>
-<xi:include href="swamid-interfederations-2.0/laife-idp.lanet.lv.xml"/>
-<xi:include href="swamid-interfederations-2.0/laife.lanet.lv.xml"/>
-<xi:include href="swamid-interfederations-2.0/lanet-idp.lanet.lv.xml"/>
-<xi:include href="swamid-interfederations-2.0/ldap-dariah.esc.rzg.mpg.de-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/ldap-dariah.esc.rzg.mpg.de.xml"/>
-<xi:include href="swamid-interfederations-2.0/liepu-idp.lanet.lv.xml"/>
-<xi:include href="swamid-interfederations-2.0/lists.geant.net.xml"/>
-<xi:include href="swamid-interfederations-2.0/lma-idp.lanet.lv.xml"/>
-<xi:include href="swamid-interfederations-2.0/lmuidp.lrz.de-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/lmuidp.lrz.de.xml"/>
-<xi:include href="swamid-interfederations-2.0/lmuza-idp.lanet.lv.xml"/>
-<xi:include href="swamid-interfederations-2.0/login.aaiedu.hr-edugain-saml2-idp-metadata.php.xml"/>
-<xi:include href="swamid-interfederations-2.0/login.aaiedu.hr-wayf-module.php-saml-sp-metadata.php-default-sp.xml"/>
-<xi:include href="swamid-interfederations-2.0/login.aaiedu.hr.xml"/>
-<xi:include href="swamid-interfederations-2.0/login.aai.pionier.net.pl-IdP-saml2-idp-metadata.php.xml"/>
-<xi:include href="swamid-interfederations-2.0/login.aai.pionier.net.pl.xml"/>
-<xi:include href="swamid-interfederations-2.0/login.athena-innovation.gr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/login.athena-innovation.gr.xml"/>
-<xi:include href="swamid-interfederations-2.0/login.bme.hu-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/login.bme.hu.xml"/>
-<xi:include href="swamid-interfederations-2.0/login.du.se-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/login.du.se.xml"/>
-<xi:include href="swamid-interfederations-2.0/login.feld.cvut.cz-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/login.feld.cvut.cz.xml"/>
-<xi:include href="swamid-interfederations-2.0/login.fhv.at-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/login.fhv.at.xml"/>
 <xi:include href="swamid-interfederations-2.0/login.helsinki.fi-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/login.helsinki.fi.xml"/>
-<xi:include href="swamid-interfederations-2.0/login-idp.auth.gr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/login-idp.auth.gr.xml"/>
-<xi:include href="swamid-interfederations-2.0/login.idp.hhs.se-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/login.idp.hhs.se.xml"/>
-<xi:include href="swamid-interfederations-2.0/login.insa-lyon.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/login.insa-lyon.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/login.ktu.lt-simplesaml-saml2-idp-metadata.php.xml"/>
-<xi:include href="swamid-interfederations-2.0/login.ktu.lt.xml"/>
-<xi:include href="swamid-interfederations-2.0/login.liu.se-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/login.liu.se.xml"/>
-<xi:include href="swamid-interfederations-2.0/login.ntua.gr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/login.ntua.gr.xml"/>
-<xi:include href="swamid-interfederations-2.0/login.services.uu.nl-nidp-saml2-metadata.xml"/>
-<xi:include href="swamid-interfederations-2.0/login.services.uu.nl.xml"/>
-<xi:include href="swamid-interfederations-2.0/login.terena.org-idp-saml2-idp-metadata.php.xml"/>
-<xi:include href="swamid-interfederations-2.0/login.terena.org.xml"/>
-<xi:include href="swamid-interfederations-2.0/login.ufrgs.br-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/login.ufrgs.br.xml"/>
-<xi:include href="swamid-interfederations-2.0/login.utenos-kolegija.lt-SAML-IdP.xml"/>
-<xi:include href="swamid-interfederations-2.0/login.utenos-kolegija.lt.xml"/>
 <xi:include href="swamid-interfederations-2.0/logout.uwasa.fi-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/logout.uwasa.fi.xml"/>
-<xi:include href="swamid-interfederations-2.0/lu-idp.lu.lv.xml"/>
-<xi:include href="swamid-interfederations-2.0/marreco.ifsuldeminas.edu.br-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/marreco.ifsuldeminas.edu.br.xml"/>
-<xi:include href="swamid-interfederations-2.0/marte.ifsertao-pe.edu.br-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/marte.ifsertao-pe.edu.br.xml"/>
-<xi:include href="swamid-interfederations-2.0/mayumba.msh-paris.fr-shibauth.php.xml"/>
-<xi:include href="swamid-interfederations-2.0/mayumba.msh-paris.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/meta.cesnet.cz-sp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/meta.cesnet.cz.xml"/>
-<xi:include href="swamid-interfederations-2.0/monitor.eduroam.org-sp-module.php-saml-sp-metadata.php-default-sp.xml"/>
-<xi:include href="swamid-interfederations-2.0/monitor.eduroam.org.xml"/>
 <xi:include href="swamid-interfederations-2.0/moodle.helsinki.fi-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/moodle.helsinki.fi.xml"/>
-<xi:include href="swamid-interfederations-2.0/moodle.utu.fi.xml"/>
-<xi:include href="swamid-interfederations-2.0/neugrid4you.eu-saml-metadata.xml.xml"/>
-<xi:include href="swamid-interfederations-2.0/neugrid4you.eu.xml"/>
-<xi:include href="swamid-interfederations-2.0/nrenadmin.redclara.net-simplesaml-saml2-sp-metadata.php.xml"/>
-<xi:include href="swamid-interfederations-2.0/nrenadmin.redclara.net.xml"/>
-<xi:include href="swamid-interfederations-2.0/ns.crous-dijon.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/nte.gemtech.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/nte.gemtech.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/openskos.meertens.knaw.nl-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/openskos.meertens.knaw.nl.xml"/>
 <xi:include href="swamid-interfederations-2.0/openwiki.uninett.no-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml"/>
-<xi:include href="swamid-interfederations-2.0/openwiki.uninett.no.xml"/>
-<xi:include href="swamid-interfederations-2.0/owncloud.cesnet.cz-saml-sp.xml"/>
-<xi:include href="swamid-interfederations-2.0/owncloud.cesnet.cz.xml"/>
-<xi:include href="swamid-interfederations-2.0/pan.unifei.edu.br-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/pan.unifei.edu.br.xml"/>
-<xi:include href="swamid-interfederations-2.0/papi.kfki.hu-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/papi.kfki.hu.xml"/>
-<xi:include href="swamid-interfederations-2.0/perun-dev.ics.muni.cz.xml"/>
-<xi:include href="swamid-interfederations-2.0/portail.u-picardie.fr.xml"/>
 <xi:include href="swamid-interfederations-2.0/portal.clarin.inl.nl-.xml"/>
-<xi:include href="swamid-interfederations-2.0/portal.clarin.inl.nl.xml"/>
-<xi:include href="swamid-interfederations-2.0/portal.moonshot.ja.net-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/portal.moonshot.ja.net.xml"/>
-<xi:include href="swamid-interfederations-2.0/portofranco.ufma.br-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/portofranco.ufma.br.xml"/>
-<xi:include href="swamid-interfederations-2.0/qub.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/qub.ac.uk.xml"/>
-<xi:include href="swamid-interfederations-2.0/quod.lib.umich.edu-shibboleth-sp-acls.xml"/>
-<xi:include href="swamid-interfederations-2.0/quod.lib.umich.edu.xml"/>
-<xi:include href="swamid-interfederations-2.0/ra-idp.lanet.lv.xml"/>
-<xi:include href="swamid-interfederations-2.0/rastreador.ifba.edu.br-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/rastreador.ifba.edu.br.xml"/>
-<xi:include href="swamid-interfederations-2.0/registration.dariah.eu-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/registration.dariah.eu.xml"/>
-<xi:include href="swamid-interfederations-2.0/rems.elixir-finland.org-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/rems.elixir-finland.org.xml"/>
-<xi:include href="swamid-interfederations-2.0/repos.ids-mannheim.de-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/repos.ids-mannheim.de.xml"/>
-<xi:include href="swamid-interfederations-2.0/ricevi.ct.infn.it-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/ricevi.ct.infn.it.xml"/>
-<xi:include href="swamid-interfederations-2.0/rigal.enpc.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/rigal.enpc.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/rir.dariah.eu-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/rir.dariah.eu.xml"/>
-<xi:include href="swamid-interfederations-2.0/rja-idp.lanet.lv.xml"/>
-<xi:include href="swamid-interfederations-2.0/rnp-cafe.ifs.edu.br-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/rnp-cafe.ifs.edu.br.xml"/>
-<xi:include href="swamid-interfederations-2.0/ross.impa.br-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/ross.impa.br.xml"/>
 <xi:include href="swamid-interfederations-2.0/rr.funet.fi-attribute-test.xml"/>
-<xi:include href="swamid-interfederations-2.0/rr.funet.fi.xml"/>
-<xi:include href="swamid-interfederations-2.0/rtrvirshib.ifmt.edu.br.xml"/>
-<xi:include href="swamid-interfederations-2.0/saml-1.sys.kth.se-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/saml-1.sys.kth.se.xml"/>
-<xi:include href="swamid-interfederations-2.0/saml.ps-ui-test.qalab.geant.net-perfsonar-ui.xml"/>
-<xi:include href="swamid-interfederations-2.0/saml.ps-ui-test.qalab.geant.net.xml"/>
-<xi:include href="swamid-interfederations-2.0/sau09ret.ifbaiano.edu.br-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/sau09ret.ifbaiano.edu.br.xml"/>
-<xi:include href="swamid-interfederations-2.0/science-gateway.chain-project.eu-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/science-gateway.chain-project.eu.xml"/>
-<xi:include href="swamid-interfederations-2.0/sdauth.sciencedirect.com-.xml"/>
-<xi:include href="swamid-interfederations-2.0/sdauth.sciencedirect.com.xml"/>
-<xi:include href="swamid-interfederations-2.0/sds.geschkult.fu-berlin.de-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/sds.geschkult.fu-berlin.de.xml"/>
-<xi:include href="swamid-interfederations-2.0/search.de.dariah.eu-schereg.xml"/>
-<xi:include href="swamid-interfederations-2.0/search.de.dariah.eu-search.xml"/>
-<xi:include href="swamid-interfederations-2.0/search.de.dariah.eu.xml"/>
-<xi:include href="swamid-interfederations-2.0/sesame.ifsttar.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/sesame.ifsttar.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/sgw.africa-grid.org-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/sgw.africa-grid.org.xml"/>
-<xi:include href="swamid-interfederations-2.0/sgw.garr.it-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/sgw.garr.it.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibb1.hj.se-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibb1.hj.se.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibb.crous-amiens.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibb.crous-amiens.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibbo.ec-nantes.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibbo.ec-nantes.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibbo.emse.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibbo.emse.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibbo.enise.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibbo.enise.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibbo.ephe.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibbo.ephe.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth2.crous-poitiers.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth2.crous-poitiers.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth2.ufms.br-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth2.ufms.br.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth.ac-limoges.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth.ac-limoges.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth.ad.cybera.ca-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth.ad.cybera.ca.xml"/>
 <xi:include href="swamid-interfederations-2.0/shibboleth.bbaw.de-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth.bbaw.de.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth.cndp.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth.cndp.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth.crous-poitiers.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth.crous-poitiers.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth.ensi-bourges.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth.ensi-bourges.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth.ensicaen.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth.ensicaen.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth.ensiie.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth.ensiie.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth.ens-lyon.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth.ens-lyon.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth.envt.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth.envt.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth.fhwn.ac.at-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth.fhwn.ac.at.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth.grenoble-inp.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth.grenoble-inp.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth-idp.dti.ufv.br-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth-idp.dti.ufv.br.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth-idp.gwdg.de-gwdg-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth-idp.gwdg.de.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth-idp.mpg.de-mpg-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth-idp.mpg.de.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth-idp.pucrs.br-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth-idp.pucrs.br.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth-idp.uni-goettingen.de-uni-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth-idp.uni-goettingen.de.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth-idp.uni-regensburg.de-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth-idp.uni-regensburg.de.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth.ifpr.edu.br-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth.ifpr.edu.br.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth.im.jku.at-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth.im.jku.at.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth.insa-cvl.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth.insa-cvl.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth.insa-rouen.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth.insa-rouen.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth.medvik.cz-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth.medvik.cz.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth.mines-ales.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth.mines-ales.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth.mzk.cz-simplesaml-metadata.xml.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth.mzk.cz.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth.nkp.cz-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth.nkp.cz.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth.obspm.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth.obspm.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth.reitoria.unesp.br-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth.reitoria.unesp.br.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth.sciencespo-grenoble.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth.sciencespo-grenoble.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth.techlib.cz-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth.techlib.cz.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth.u-bourgogne.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth.u-bourgogne.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/Shibboleth.uem.br-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/Shibboleth.uem.br.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth.ufsc.br-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth.ufsc.br.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth.u-grenoble3.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth.u-grenoble3.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth.ujf-grenoble.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth.ujf-grenoble.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth.unb.br-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth.unb.br.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth.unifi.it-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth.unifi.it.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth.univ-corse.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth.univ-corse.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth.univ-evry.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth.univ-evry.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth.univ-paris-est.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth.univ-paris-est.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth.univ-savoie.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth.univ-savoie.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth.univ-toulouse.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth.univ-toulouse.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth.upmf-grenoble.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth.upmf-grenoble.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth.ups-tlse.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth.ups-tlse.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth.utb.cz-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth.utb.cz.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth.uvsq.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth.uvsq.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibbo.ltu.se-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibbo.ltu.se.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibbo.tul.cz-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibbo.tul.cz.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibb-prod.eseo.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibb-prod.eseo.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/shib.comune.trieste.it-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shib.comune.trieste.it.xml"/>
-<xi:include href="swamid-interfederations-2.0/shib-idp-1.oru.se-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shib-idp-1.oru.se.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibidp.cca.unipd.it-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibidp.cca.unipd.it.xml"/>
-<xi:include href="swamid-interfederations-2.0/shib-idp.cms.hu-berlin.de-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shib-idp.cms.hu-berlin.de.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibidp.oca.eu-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibidp.oca.eu.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibidp.unipr.it-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibidp.unipr.it.xml"/>
-<xi:include href="swamid-interfederations-2.0/shib.ifgoiano.edu.br-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shib.ifgoiano.edu.br.xml"/>
-<xi:include href="swamid-interfederations-2.0/shib.manchester.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shib.manchester.ac.uk.xml"/>
-<xi:include href="swamid-interfederations-2.0/shib.mines-albi.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shib.mines-albi.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/shib-sp-dev.cf.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shib-sp-dev.cf.ac.uk.xml"/>
-<xi:include href="swamid-interfederations-2.0/shib-sp.mediacore.tv.xml"/>
-<xi:include href="swamid-interfederations-2.0/shib.ufg.br-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shib.ufg.br.xml"/>
-<xi:include href="swamid-interfederations-2.0/shib.unibo.it-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shib.unibo.it.xml"/>
-<xi:include href="swamid-interfederations-2.0/shib.u-paris10.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shib.u-paris10.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/shib.zcu.cz-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shib.zcu.cz.xml"/>
-<xi:include href="swamid-interfederations-2.0/siaiap08.univali.br-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/siaiap08.univali.br.xml"/>
-<xi:include href="swamid-interfederations-2.0/si.crous-rouen.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/si.crous-rouen.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/signon.rug.nl-nidp-saml2-metadata.xml"/>
-<xi:include href="swamid-interfederations-2.0/signon.rug.nl.xml"/>
-<xi:include href="swamid-interfederations-2.0/sistemas.uepg.br-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/sistemas.uepg.br.xml"/>
-<xi:include href="swamid-interfederations-2.0/sivic.redclara.net-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/sivic.redclara.net.xml"/>
-<xi:include href="swamid-interfederations-2.0/skmms-idp.lanet.lv.xml"/>
 <xi:include href="swamid-interfederations-2.0/software.msdnaa.dk-.xml"/>
-<xi:include href="swamid-interfederations-2.0/software.msdnaa.dk.xml"/>
-<xi:include href="swamid-interfederations-2.0/sourcesup.cru.fr-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/sourcesup.cru.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/sp24-test.garr.it-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/sp24-test.garr.it.xml"/>
 <xi:include href="swamid-interfederations-2.0/sp.catalog.clarin.eu.xml"/>
 <xi:include href="swamid-interfederations-2.0/sp.corpus1.mpi.nl.xml"/>
 <xi:include href="swamid-interfederations-2.0/sp.dev.clarin.inl.nl-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/sp.dev.clarin.inl.nl.xml"/>
-<xi:include href="swamid-interfederations-2.0/sp.ebrary.com-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/sp.ebrary.com.xml"/>
-<xi:include href="swamid-interfederations-2.0/sp.edina.ac.uk-shibboleth-kbplus.xml"/>
-<xi:include href="swamid-interfederations-2.0/sp.edina.ac.uk.xml"/>
 <xi:include href="swamid-interfederations-2.0/sp.korp.csc.fi-.xml"/>
-<xi:include href="swamid-interfederations-2.0/sp.korp.csc.fi.xml"/>
 <xi:include href="swamid-interfederations-2.0/sp.lat.csc.fi.xml"/>
 <xi:include href="swamid-interfederations-2.0/sp.lux17.mpi.nl.xml"/>
-<xi:include href="swamid-interfederations-2.0/sp.onlinelibrary.wiley.com-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/sp.onlinelibrary.wiley.com.xml"/>
-<xi:include href="swamid-interfederations-2.0/sp.swamid.se-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/sp.swamid.se.xml"/>
-<xi:include href="swamid-interfederations-2.0/sp-test.swamid.se-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/sp-test.swamid.se.xml"/>
-<xi:include href="swamid-interfederations-2.0/sp.textgridlab.org-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/sp.textgridlab.org.xml"/>
-<xi:include href="swamid-interfederations-2.0/sp.upv.es-saml-module.php-saml-sp-metadata.php-upv-sp-saml.xml"/>
-<xi:include href="swamid-interfederations-2.0/sp.upv.es.xml"/>
-<xi:include href="swamid-interfederations-2.0/srvcafe.ifma.edu.br-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/srvcafe.ifma.edu.br.xml"/>
-<xi:include href="swamid-interfederations-2.0/srvcafe.uniso.br-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/srvcafe.uniso.br.xml"/>
-<xi:include href="swamid-interfederations-2.0/srv-cr-idp.crdp-aquitaine.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/srv-cr-idp.crdp-aquitaine.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/srv-fii.insa-toulouse.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/srv-fii.insa-toulouse.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/sse-idp.lanet.lv.xml"/>
-<xi:include href="swamid-interfederations-2.0/sso.dshs-koeln.de-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/sso.dshs-koeln.de.xml"/>
-<xi:include href="swamid-interfederations-2.0/sso.institutoptique.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/sso.institutoptique.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/sso.ird.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/sso.ird.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/sso.man.poznan.pl-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/sso.man.poznan.pl.xml"/>
-<xi:include href="swamid-interfederations-2.0/sso.nikhef.nl-sso-saml2-idp-metadata.php.xml"/>
-<xi:include href="swamid-interfederations-2.0/sso.nikhef.nl.xml"/>
-<xi:include href="swamid-interfederations-2.0/sso.sbg.ac.at-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/sso.sbg.ac.at.xml"/>
-<xi:include href="swamid-interfederations-2.0/sso.siropglobal.org-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/sso.siropglobal.org.xml"/>
-<xi:include href="swamid-interfederations-2.0/sso.tugraz.at-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/sso.tugraz.at.xml"/>
-<xi:include href="swamid-interfederations-2.0/sso.u-psud.fr-idp.xml"/>
-<xi:include href="swamid-interfederations-2.0/sso.u-psud.fr.xml"/>
 <xi:include href="swamid-interfederations-2.0/sso.utu.fi-sso-idp.xml"/>
-<xi:include href="swamid-interfederations-2.0/sso.utu.fi.xml"/>
-<xi:include href="swamid-interfederations-2.0/sso.vgtu.lt-saml2-idp-metadata.php.xml"/>
-<xi:include href="swamid-interfederations-2.0/sso.vgtu.lt.xml"/>
-<xi:include href="swamid-interfederations-2.0/ssso.uni-muenster.de-shibboleth-sp.xml"/>
-<xi:include href="swamid-interfederations-2.0/ssso.uni-muenster.de.xml"/>
-<xi:include href="swamid-interfederations-2.0/store.lu.lv.xml"/>
-<xi:include href="swamid-interfederations-2.0/strong.renater.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/strong.renater.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/studienportal.vetmed.uni-muenchen.de-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/studienportal.vetmed.uni-muenchen.de.xml"/>
 <xi:include href="swamid-interfederations-2.0/synnefo.sky.deic.dk-astakos-ui-login-shibboleth-.xml"/>
-<xi:include href="swamid-interfederations-2.0/synnefo.sky.deic.dk.xml"/>
-<xi:include href="swamid-interfederations-2.0/tcs-escience-portal.terena.org-simplesamlphp-module.php-saml-sp-metadata.php-default-sp.xml"/>
-<xi:include href="swamid-interfederations-2.0/tcs-escience-portal.terena.org.xml"/>
-<xi:include href="swamid-interfederations-2.0/tcs-personal-portal.terena.org-simplesamlphp-module.php-saml-sp-metadata.php-default-sp.xml"/>
-<xi:include href="swamid-interfederations-2.0/tcs-personal-portal.terena.org.xml"/>
 <xi:include href="swamid-interfederations-2.0/terena.org-sp.xml"/>
-<xi:include href="swamid-interfederations-2.0/terena.org.xml"/>
-<xi:include href="swamid-interfederations-2.0/test-adfs.geant.net-adfs-services-trust.xml"/>
-<xi:include href="swamid-interfederations-2.0/test-adfs.geant.net.xml"/>
-<xi:include href="swamid-interfederations-2.0/test-bod-gui.geant.net-autobahn-gui.xml"/>
-<xi:include href="swamid-interfederations-2.0/test-bod-gui.geant.net.xml"/>
-<xi:include href="swamid-interfederations-2.0/test.federation.renater.fr-validation-ressource.xml"/>
-<xi:include href="swamid-interfederations-2.0/test.federation.renater.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/testssso.uni-muenster.de-shibboleth-sp.xml"/>
-<xi:include href="swamid-interfederations-2.0/testssso.uni-muenster.de.xml"/>
-<xi:include href="swamid-interfederations-2.0/test.ukfederation.org.uk-entity.xml"/>
-<xi:include href="swamid-interfederations-2.0/test.ukfederation.org.uk.xml"/>
-<xi:include href="swamid-interfederations-2.0/thalamoss-data.ics.muni.cz-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/thalamoss-data.ics.muni.cz.xml"/>
-<xi:include href="swamid-interfederations-2.0/theia.unifei.edu.br.xml"/>
-<xi:include href="swamid-interfederations-2.0/ticket.iop.org-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/ticket.iop.org.xml"/>
-<xi:include href="swamid-interfederations-2.0/tonga.univ-tlse2.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/tonga.univ-tlse2.fr.xml"/>
 <xi:include href="swamid-interfederations-2.0/tullbommen.arcada.fi-simplesaml-.xml"/>
-<xi:include href="swamid-interfederations-2.0/tullbommen.arcada.fi.xml"/>
-<xi:include href="swamid-interfederations-2.0/tumidp.lrz.de-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/tumidp.lrz.de.xml"/>
-<xi:include href="swamid-interfederations-2.0/uat-adfs.geant.net-adfs-services-trust.xml"/>
-<xi:include href="swamid-interfederations-2.0/uat-adfs.geant.net.xml"/>
-<xi:include href="swamid-interfederations-2.0/uat-bod-gui.geant.net-autobahn-gui.xml"/>
-<xi:include href="swamid-interfederations-2.0/uat-bod-gui.geant.net.xml"/>
-<xi:include href="swamid-interfederations-2.0/uat.leeds1.emeraldinsight.com-entity.xml"/>
-<xi:include href="swamid-interfederations-2.0/uat.leeds1.emeraldinsight.com.xml"/>
-<xi:include href="swamid-interfederations-2.0/ucopia-shib.ensta-bretagne.fr.xml"/>
 <xi:include href="swamid-interfederations-2.0/ufal-point.mff.cuni.cz-shibboleth-eduid-sp.xml"/>
-<xi:include href="swamid-interfederations-2.0/ufal-point.mff.cuni.cz.xml"/>
-<xi:include href="swamid-interfederations-2.0/umbrella.psi.ch-.xml"/>
-<xi:include href="swamid-interfederations-2.0/umbrella.psi.ch.xml"/>
-<xi:include href="swamid-interfederations-2.0/utwente.nl-.xml"/>
-<xi:include href="swamid-interfederations-2.0/utwente.nl.xml"/>
-<xi:include href="swamid-interfederations-2.0/va-idp.lanet.lv.xml"/>
-<xi:include href="swamid-interfederations-2.0/vea-idp.lanet.lv.xml"/>
-<xi:include href="swamid-interfederations-2.0/verify.studentbeans.com-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/verify.studentbeans.com.xml"/>
-<xi:include href="swamid-interfederations-2.0/vip.espci.fr-saml2-idp-metadata.php.xml"/>
-<xi:include href="swamid-interfederations-2.0/vip.espci.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/vmfetid.iamm.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/vmfetid.iamm.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/vm-idp.paris-sorbonne.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/vm-idp.paris-sorbonne.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/vmshib.ufrpe.br-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/vmshib.ufrpe.br.xml"/>
-<xi:include href="swamid-interfederations-2.0/vvc.niif.hu-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/vvc.niif.hu.xml"/>
 <xi:include href="swamid-interfederations-2.0/wayf.card.kilroy.eu-module.php-saml-sp-metadata.php-default-sp.xml"/>
-<xi:include href="swamid-interfederations-2.0/wayf.card.kilroy.eu.xml"/>
 <xi:include href="swamid-interfederations-2.0/wayf.ordbogen.com.xml"/>
 <xi:include href="swamid-interfederations-2.0/wayf.wayf.dk.xml"/>
-<xi:include href="swamid-interfederations-2.0/webinar.nordu.net-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/webinar.nordu.net.xml"/>
 <xi:include href="swamid-interfederations-2.0/weblicht.sfs.uni-tuebingen.de.xml"/>
-<xi:include href="swamid-interfederations-2.0/weblogin2.geant.net-adfs-services-trust.xml"/>
-<xi:include href="swamid-interfederations-2.0/weblogin2.geant.net.xml"/>
-<xi:include href="swamid-interfederations-2.0/weblogin.uu.se-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/weblogin.uu.se.xml"/>
-<xi:include href="swamid-interfederations-2.0/whoami.cesnet.cz-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/whoami.cesnet.cz.xml"/>
-<xi:include href="swamid-interfederations-2.0/wifi.dir.garr.it:12081-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/wifi.dir.garr.it:12081.xml"/>
-<xi:include href="swamid-interfederations-2.0/wifi.espci.fr-saml-metadata.xml"/>
-<xi:include href="swamid-interfederations-2.0/wifi.espci.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/wiki2.redclara.net-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/wiki2.redclara.net.xml"/>
-<xi:include href="swamid-interfederations-2.0/wiki.edugain.org-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/wiki.edugain.org.xml"/>
-<xi:include href="swamid-interfederations-2.0/wiki.helsinki.fi-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/wiki.helsinki.fi.xml"/>
-<xi:include href="swamid-interfederations-2.0/wiki.moonshot.ja.net-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/wiki.moonshot.ja.net.xml"/>
-<xi:include href="swamid-interfederations-2.0/wiki.shibboleth.net-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/wiki.shibboleth.net.xml"/>
 <xi:include href="swamid-interfederations-2.0/wiseflow.dk.xml"/>
-<xi:include href="swamid-interfederations-2.0/www2.eduroam.cz.xml"/>
-<xi:include href="swamid-interfederations-2.0/www3.eduid.cz-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/www3.eduid.cz.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.ebi.ac.uk-ega-.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.ebi.ac.uk.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.emeraldinsight.com-entity.xml"/>
 <xi:include href="swamid-interfederations-2.0/www.emeraldinsight.com-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.emeraldinsight.com.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.knodium.com-Shibboleth.sso-Metadata.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.knodium.com.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.meertens.knaw.nl-Shibboleth.sso-Metadata.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.meertens.knaw.nl.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.openaccessrepository.it-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.openaccessrepository.it.xml"/>
 <xi:include href="swamid-interfederations-2.0/www.ordbogen.com.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.portal.euromonitor.com-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.portal.euromonitor.com.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.qoam.eu-.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.qoam.eu.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.rediris.es-sir-rediristestidp.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.rediris.es-sir-umaidp.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.rediris.es-sir-unedidp.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.rediris.es-sir-uocidp.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.rediris.es-sir-urvidp.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.rediris.es.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.researchprofessional.com-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.researchprofessional.com.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.scran.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.scran.ac.uk.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.sso.uni-erlangen.de-simplesaml-saml2-idp-metadata.php.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.sso.uni-erlangen.de.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.uco.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.uco.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.vho.de-idpvzg.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.vho.de.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.videotorium.hu-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.videotorium.hu.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.vutbr.cz-SSO-saml2-idp.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.vutbr.cz.xml"/>
-<xi:include href="swamid-interfederations-2.0/zeroshell.irccs-stellamaris.it:12081-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/zeroshell.irccs-stellamaris.it:12081.xml"/>
-<xi:include href="swamid-interfederations-2.0/zididp.uni-graz.at-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/zididp.uni-graz.at.xml"/>
-<xi:include href="swamid-interfederations-2.0/zividp.uni-muenster.de-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/zividp.uni-muenster.de.xml"/>
 </EntitiesDescriptor>
diff --git a/swamid-interfederations-2.0/.xml b/swamid-interfederations-2.0/.xml
index 531d52a7..fae36ad8 100644
--- a/swamid-interfederations-2.0/.xml
+++ b/swamid-interfederations-2.0/.xml
@@ -1,161 +1,33 @@
 <?xml version="1.0"?>
-<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:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="urn:mace:kuleuven.be:kulassoc:kuleuven.be">
-<Extensions>
-<mdrpi:RegistrationInfo registrationAuthority="http://federation.belnet.be/" registrationInstant="2012-03-27T12:00:00Z">
-<mdrpi:RegistrationPolicy xml:lang="en">http://federation.belnet.be/files/Belnet-metadata-registration-practice-statement.txt</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">kuleuven.be</shibmd:Scope>
-<shibmd:Scope regexp="false">groept.be</shibmd:Scope>
-<shibmd:Scope regexp="false">hubkaho.be</shibmd:Scope>
-<shibmd:Scope regexp="false">odisee.be</shibmd:Scope>
-<shibmd:Scope regexp="false">vives.be</shibmd:Scope>
-<shibmd:Scope regexp="false">luca-arts.be</shibmd:Scope>
-<shibmd:Scope regexp="false">khlim.be</shibmd:Scope>
-<shibmd:Scope regexp="false">khleuven.be</shibmd:Scope>
-<shibmd:Scope regexp="false">thomasmore.be</shibmd:Scope>
-<mdui:UIInfo>
-<mdui:DisplayName xml:lang="en">KU Leuven Association</mdui:DisplayName>
-<mdui:DisplayName xml:lang="nl">Associatie KU Leuven</mdui:DisplayName>
-<mdui:Description xml:lang="en">KU Leuven and the associated university colleges</mdui:Description>
-<mdui:Description xml:lang="en">KU Leuven en de geassocieerde hogescholen</mdui:Description>
-<mdui:InformationURL xml:lang="en">http://associatie.kuleuven.be/eng</mdui:InformationURL>
-<mdui:InformationURL xml:lang="nl">http://associatie.kuleuven.be/over</mdui:InformationURL>
-<mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAA3BpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuMy1jMDExIDY2LjE0NTY2MSwgMjAxMi8wMi8wNi0xNDo1NjoyNyAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wUmlnaHRzPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvcmlnaHRzLyIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcFJpZ2h0czpNYXJrZWQ9IlRydWUiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENTNiAoV2luZG93cykiIHhtcE1NOkluc3RhbmNlSUQ9InhtcC5paWQ6RDUwMUMyNENENTYzMTFFM0FEMDM5OUJEM0Y1NDQ1OUYiIHhtcE1NOkRvY3VtZW50SUQ9InhtcC5kaWQ6RDUwMUMyNERENTYzMTFFM0FEMDM5OUJEM0Y1NDQ1OUYiPiA8eG1wTU06RGVyaXZlZEZyb20gc3RSZWY6aW5zdGFuY2VJRD0ieG1wLmlpZDpENTAxQzI0QUQ1NjMxMUUzQUQwMzk5QkQzRjU0NDU5RiIgc3RSZWY6ZG9jdW1lbnRJRD0ieG1wLmRpZDpENTAxQzI0QkQ1NjMxMUUzQUQwMzk5QkQzRjU0NDU5RiIvPiA8L3JkZjpEZXNjcmlwdGlvbj4gPC9yZGY6UkRGPiA8L3g6eG1wbWV0YT4gPD94cGFja2V0IGVuZD0iciI/PnDgVQAAAAIVSURBVHjadFLNaxNBFJ+dnd3ZbDeaRJuvGhoPGqGt0iqpgpJ68NRj8aIInsSLqFSPFf8CPXrwIB6KYCXSqwcVpILUQz0EvJaINYY0CU33a3ZmfJtE3UL7Y5mdeR/zfu/9Rrn9vokiUBBiQoq/ew0raC9I9ABen0s3kKQfx6WElaqKkAck+Bx5HN2bPpyOqXB0Avl0o7vLZIz8r4OjZFouLyW1s2laiBP4Tia1mTRtOjxKC0fp24EsZ2i05vksJRjJfRNsJgsWuZDbkzCR0k8k9K4nIn32gbHScsX0qG5p4RW/bFHv8cEYZjO040uMh5HETCVDOio20G45O5zBVxu3fXTDCvflLF3dkjRlYRHWIZ9fLMOv1bWL+eTMpauDhMdLz+vNnesr9+Ha8TgRXz6uftvMpA9BN6T27gNU69Q25xYXcH/8LOCTJiseQa7HTEMHy5TuvFqutiaLUkhlbO4h4+J3o71efXRuYhzth/rWdml+iRr6CO1L32x0Ls6eOigaUMil5iunOz+3w6ZBdtmz71y7/M+9cPfZj0YbnkVx7OjrJ7cGxsWbV968XQsCQXwWJAqjwHXjex0csFZXPqFYSH19rfayMnWmdCx8NSzIH885jqfkKw90XXNcv2d74BBCJOImUTEID913dxxQAOwxqlkmhTQCtBh4uDBoKIKKsapiAYRggqoaHzG4GMrsBxzG+EeAAQCt0M7G/zjX3wAAAABJRU5ErkJggg==</mdui:Logo>
-<mdui:Logo height="75" width="153">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAMgAAABLCAYAAAA1fMjoAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAA11pVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuMy1jMDExIDY2LjE0NTY2MSwgMjAxMi8wMi8wNi0xNDo1NjoyNyAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wTU09Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9tbS8iIHhtbG5zOnN0UmVmPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvc1R5cGUvUmVzb3VyY2VSZWYjIiB4bWxuczp4bXA9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC8iIHhtcE1NOk9yaWdpbmFsRG9jdW1lbnRJRD0idXVpZDozMkNEMEY5MDg3OUQxMURDOTFDN0UzMEIyRjdCQjM1QyIgeG1wTU06RG9jdW1lbnRJRD0ieG1wLmRpZDo5QzUzODlCMkQ2MDcxMUUzQjY2RUFDMkIyRTcwODk5QSIgeG1wTU06SW5zdGFuY2VJRD0ieG1wLmlpZDo5QzUzODlCMUQ2MDcxMUUzQjY2RUFDMkIyRTcwODk5QSIgeG1wOkNyZWF0b3JUb29sPSJBZG9iZSBJbGx1c3RyYXRvciBDUzUuMSI+IDx4bXBNTTpEZXJpdmVkRnJvbSBzdFJlZjppbnN0YW5jZUlEPSJ4bXAuaWlkOkZEN0YxMTc0MDcyMDY4MTE4QzE0QUQ0NTU2MzQwN0Y2IiBzdFJlZjpkb2N1bWVudElEPSJ4bXAuZGlkOkZEN0YxMTc0MDcyMDY4MTE4QzE0QUQ0NTU2MzQwN0Y2Ii8+IDwvcmRmOkRlc2NyaXB0aW9uPiA8L3JkZjpSREY+IDwveDp4bXBtZXRhPiA8P3hwYWNrZXQgZW5kPSJyIj8+R5rIdQAADfdJREFUeNrsXV1oHNcVHtlSYtlyIrW1caChu41bSJw2kh/8EEorOQ8tdaBKUxIKBdslfSgJxKIBQ0tjy6UPhhS54LyVWC70IaHBNsQlfXBXgSYQPdhKK8tQN5WKCzF2QJv4R2tLtnq/2XvXV3fPnbnzu6vd88Gw2tHMmftz/s+dux3Ly8sesLVQnBcfIx//d27cS4gfnvl02WMwWgBrtL+nxHHska8USuIo8NAwGJqACMsxJD6eEUe/OM4JIdnHw8Nod3QoF6ujo8P/FILRKz4OiGOftCpl7Xq4YFPsYjHa0cWi0MtDxGhndOpfhPUYFh9j4kAMMiqsxUEeIgYLSFU4ToiPYelWDbi4UgxGO1mQYbYaDIZdQIpCOOaaoVGFnk5vQ1dH3fnz84vONHZsus/b1tvlFTeuNWgseR9eve3NXV/KhQawobOjRmtz972w78rCXe98edGbFLRuLEXLa1Btu7G4LNp0xyt9UvGuVO5GGtu5a0vWNqD9hY2ddeevLtype87mdWu8Td1rY899tQ9LVjp6O7f1dcV+TlB/dazIYgk3q19akpOg4VWzWThXltbFye1KmsX647e/4E+KiaMXrovJvxXKOHu/tsEf4CCAMY/OXCcZKQ0aCs8X13u7Hl5H9qfGFGKiTl+qeG/O3nQSDJe2QegwXiYTHNr+gC9YJl4997lVAT0t2o9nmkC/f/7BfF1/nyt2x557jOmrZz+30tHb+fbOL8Z+TlB/dazRYhC4VuekUOATMYmqhQyKoyRTwJkCDGBjph1fui/w3qGH7vf2f2NjKPP42kcwyWs7euuuTYOG0rq/2/GgP8lBwqGuxXVg3qBrX3q0x7ltGMcweq7AmFBAO2CRWhn6SP9AWo4+WAspFCOygDjgVVO+/Vk3aGjL/bGEB+cpLRfGmC891pMqDYX939wYmXkgcBACCmiXjVGDXFW0I6m7G9SPqG1azQIC5j8lBALu1BF5znep8opNlK8ephltE0UJD1wMmG1bvODHBVIjp0FDuSSUG+NqQU2mg68NmnGAdiTx1cMEIGy+WilI92TcAYEoC3cq98a4DDbcLCoOoe6Fj/zKZLnmh9t8aQSgVyq3U6EB7Hq42xprvCXijFkRSBd71gq3aj0pkDiv9/HpL68LjF2mhfBCQNEuih7uj5LgiDInys1SyuNK5Y6vTOqCfMIKYWyviut1zF67k4iHMCYuyRMkA+IISEMRFmPobpZLBsKfPMG4ijmm55fqJk9NYFo00D4qRkB7EXyqyQM90KLiBNwPOgi0g6zq4X9eq7XrvGQuxD11ViSmBQFTu8Q7sDLHLlb7BcE2FRief2jggbr7JsR1LomJSNkpMb4Y56wsSMmwHKW8LImLe6ULSVg2q5a1ERMDTQVmUxmSqIhCw+ZaQdObmg3f0Q/KfSoK5sTzbMyNdphWAfRwjzmOcQN11/iiKiA3Wt7FGnUR0MyCc2IyoHUpBsJ3U0B8ZrIwJ7Qg7lF0cO3kp7czoWHWTBRQN6EAGpSAbOsTUzNbFRRSQOaXrFYlyzl5a3ahLv2qlNukpY95AvMXlv5FH1wtV230G11BpyZDaWyTgZTp1+sPYFSbT09ZIBy4/vA/rtU0exo0gkw/zejxYoPp8mKm82HLGKIIuWNTV11MAfe4GQQkyyxWw2DLp1NuhC14NH181+ciBlDPToNGq4CKB6GQqq7mYttks5pCQGyDq5ZgUEExZXHA2L+Y/MyvILtqM2jJn359fao0osZeed6XZE7UeExbkhStKCRNofYoZodQqEwVFRtQbpbubuHQ10AFFRnxfzMzFpeG1TcWwTZlDW1BuEpD3li6a30eJcBwRylGfeNfN50to62fiJeUW4ixMq9pBjfLJc17pXJn9QiIrVLrEmxhIt+5VPEFjBIyxeR+IH2hKoi2WoG/vql7TSIa1XTwEhnoY4UAJSC21LaymqiZ2PpOZY5Qg6FSszeX7rorLMtqBipVWydYFzsiL7xME1mnedWCxUHv3tuEEyKAn8jTergCzAAB2bxuLcmU1aLTrRXMjudR14Lhk9KA1ke2ilpkh3vA9HrWyybYujtj09aqMKgLCayHrQYTtKAyLVdJ3euagl91LpYQjmPiY49xzQFxHktO9mbxElUSv1UF9/CJn/NoplS1BvXdlsZ9538Vsi1RaNSKgKI91DVYZ+ULCqxMX6eVDu7XGRo1FEroIBCP93X6QXOhZ21gLJfHfCiL2EgBcfE8ANdUr/5G4T4pHKiHHJFrsnAe5/AaLoRnIG33yqVSG2aBoEXBUCYtfyGhYErbAkCdgaCpk9JQeFMM/qGBLusEhq3TQrywQngvLViXzIctJqwyw81IDJ5U4bmudFhtFgSrecfNegg2khNCMudVq+r9aVoRm3sBhjd9bww6lnrbfHEc1P9dgjowtHpuUhrKLaIKai5A9swMMkEf5+O0Dfclda/Qnjcu1gsZ1nhR17eSm6WrS8Qd71EXaTFIqu+D2KrniCvAZPoxaXmDT7lZ6gWhqIytM2QaNO5ZkZuRl18EvRCGtqFKHkUzQ0ijMKpNYYGGOR84SpdvZWKFmjYG8TJcSuKcSgzwl7G4j3In1GI5TCSC6ueF5g7ypcFkeA5cD1O7pkHjnmtU8dscRgt0YIHC0pO47pVrZb96H5TcQAwDelGr9Daa0/PRVgG0kpvVoe3Niz9GPPkOCKVIMIYuGa1m2DhOvUf9uObvo6YA182VcdKgsSJL1te1Ym3VrBAIlaVKo3/+UvP5RWeXihFdQEKVzGoREAYjbRdryOF63iuL0Z4WRO3NmwbYgjBaBfquJsviGNS+H9R/BsH8P4PRVgJCANv/FHiIGCwgDAaDBYTBiIpMlrtj20gGoxWQSR1kWRFlMFrIgqS2q8no8b/xyDJay4KkWQfxBn/JFoTRWkE61zkYjAABYTAYLCAMRuwgHQjbi3coyw0cGIxmF5Cg90E8j1fzMtpcQKbYQjAYHIMwGJEtyFCeLtTBPU95B3bvrDuPIuPB8TO17/1bH/JKYy94vT30rywNjfzBm5iarQZQ4rrB/mLdNR1Dv6o7Z7tWp+eK5dJvyfPUc6PScIE5ZhQt9Al9i9L2fT960ht7cVfd/478+QNv5PXTzrSKP37NK2zp9cc8LvR5wbzZaOFZc5fnQ9tljlmoBZGuVa/cH8uHfCcEgfsJueNiroBQHNv/rFU49h5+OzIzM9xx8u8XyPOUYqHO+T77vz+pY9gsQSndVFwsuUEcuG1MCYdXfSdE/bptLj8DrQPaCxaEAjTY+LtnmYszBBibYm7Miam0Bvu/StI49f6FXNu853vbhbXqyyQGgWDAiijq2EgO+/JiN0W1o+Jwnh3FQQGCATPPaKQVWSkQ33miaLl/Jvc2j734/UwEBNZhVP7CrbIax6X7VZbxSSGPDkJDUb6vEg64Vox88N5HtAtrCgTlYpWvV3wXK28Mf+sxq8uXJEhf0V8V2xkClDke3GCPOzDYVHDYyogS6GdjQWYsTPhobS5szOhiPWzJg+SxyFOCdnK6ugWBldgtrcfLcEGF5ZiT8cigtCiZZ7mQOaHiDggHBhJaidF4IYGfr3z9Zok/TIuWhhXRLQiq6PrPH4xK4ShJi4Ii4slGdRhuVTsKR1hqNA+rCjcLbgvFhOPvzlvjj4mp/zi502F9PP7Xs7ESMmlYEf1Xbsfl74AME8Lg/yRCIxll93e3C2Y43XYCkpYvnTRQp2JCCAYYl2ojrI6LQoMrHdZHWxyUhxVZEYPInzaYMs4NNQOjwPU69f4M1z0aAJXuNdOnQQwYl6mTAAJpxq6wImnFIHCnUCg8Jo5Z+QLVsiwSDjfDRAUVDRnZWxEqDoFld70+a8CamXWbpBZELxQiCJ+VMciE5lbhPIRkrNGThAmJoxFYqJKPgc0iULWqvKvnCp/dqKS+H4LuYkEAkMkaUNkrFbzL3y7cJz5/b/wvE6AICMmnsllxXC3QMa/H2iDanSg3FWOnlealxtJWcaaYO0rBL8rcpJ3mhRXBcpO0qunmL0yNUAIgzu31qjua7MnelM/4WZmgzExUV8tMQ4JZojBHqwb8qGVEURKuQoKsUyMx8vpfMrEgnrQg1lgtj8599PHlmmaBNqBMuHK1TCGCG0D5nGoBG9KO1Xt35iIcYelLF83psgLWTPVi7KhxOPGbn/jXoZ9QGi8/+2SkcbCle81AOUr13CXNq4TONdULQbaNQVIBKQT1RRyn8tUEp/0JoawF5WphYGzMj/NhKz3TzpClMUFxaGBcqPvU6ui48YbL+ERde+WS5g1qkw2jx88Iui8kHn/dxULdY4xa1i5jkF55TW6ANoriakFzJWHyVtnwDpo2blEV1sOmqV2C70ZWz01hTkPh6QIyIl2sc/IdkIMy5TsvY4+9eQTo1GTbOkplteJW3HFfq8Qf6H+cBZ2475lf/ymRlXWpnufpgaQmIJL5saxdbUF6QLpVsBrYzWS8GTtqrt0Ckw/87Kiz9sD1YIpWe7cErg5iHFehV9mksPghyEK4Vs/zAvqSdF4btvVodbFbL5lBcX1Jx+UexDBPPLJF3Ntd59NiANN4XyFurKELcZJ4JSwwxhhgLMw1U+XrC35SBGPgGlhjDmwvsdnmIew+N0V2j7aNFvX8KNcGCsjWQnHQRSjluyGJBYTBWA3Qs1glh+uxLmuCh43RjgJiLkosefUbyfHGcYz2FBBzwzi5BSlvJMdoa/DGcQwGCwiDkdDFsvx4Tr+x27tbFovBaMEgncpime+AcBaL0Vb4vwADAI6r9hTmuAw9AAAAAElFTkSuQmCC</mdui:Logo>
-</mdui:UIInfo>
-<mdui:DiscoHints>
-<mdui:DomainHint>kuleuven.be</mdui:DomainHint>
-<mdui:IPHint>134.58.0.0/16</mdui:IPHint>
-<mdui:IPHint>193.190.168.0/23</mdui:IPHint>
-<mdui:IPHint>193.190.176.0/22</mdui:IPHint>
-<mdui:IPHint>193.190.180.0/23</mdui:IPHint>
-<mdui:IPHint>193.190.253.0/24</mdui:IPHint>
-<mdui:IPHint>193.190.146.160/27</mdui:IPHint>
-<mdui:IPHint>193.190.57.0/26</mdui:IPHint>
-<mdui:IPHint>193.190.57.192/27</mdui:IPHint>
-<mdui:IPHint>193.190.57.224/27</mdui:IPHint>
-<mdui:IPHint>193.190.58.0/26</mdui:IPHint>
-<mdui:IPHint>193.190.59.0/24</mdui:IPHint>
-<mdui:IPHint>193.190.255.0/25</mdui:IPHint>
-<mdui:IPHint>193.190.138.0/24</mdui:IPHint>
-<mdui:IPHint>193.191.187.0/25</mdui:IPHint>
-<mdui:IPHint>193.190.77.0/26</mdui:IPHint>
-<mdui:IPHint>193.190.224.0/24</mdui:IPHint>
-<mdui:IPHint>193.190.225.0/24</mdui:IPHint>
-<mdui:IPHint>193.190.130.128/26</mdui:IPHint>
-<mdui:IPHint>2a02:2c40::/32</mdui:IPHint>
-<mdui:GeolocationHint>geo:50.9378101,4.0409517000000505</mdui:GeolocationHint>
-<mdui:GeolocationHint>geo:51.2194475,4.40246430000002</mdui:GeolocationHint>
-<mdui:GeolocationHint>geo:51.209348,3.2246995000000424</mdui:GeolocationHint>
-<mdui:GeolocationHint>geo:50.84999999999999,4.350000000000023</mdui:GeolocationHint>
-<mdui:GeolocationHint>geo:50.91083,5.4133600000000115</mdui:GeolocationHint>
-<mdui:GeolocationHint>geo:50.98965,5.050160000000005</mdui:GeolocationHint>
-<mdui:GeolocationHint>geo:50.8464506,4.262063000000012</mdui:GeolocationHint>
-<mdui:GeolocationHint>geo:51.16257,4.990839999999935</mdui:GeolocationHint>
-<mdui:GeolocationHint>geo:51.0543422,3.717424299999948</mdui:GeolocationHint>
-<mdui:GeolocationHint>geo:50.93069,5.332480000000032</mdui:GeolocationHint>
-<mdui:GeolocationHint>geo:50.8194776,3.2577263000000584</mdui:GeolocationHint>
-<mdui:GeolocationHint>geo:50.87822088437878,4.702697216918987</mdui:GeolocationHint>
-<mdui:GeolocationHint>geo:51.1302138,4.571509200000037</mdui:GeolocationHint>
-<mdui:GeolocationHint>geo:51.0258761,4.477536200000031</mdui:GeolocationHint>
-<mdui:GeolocationHint>geo:51.2166667,2.8999999999999772</mdui:GeolocationHint>
-<mdui:GeolocationHint>geo:50.94990869999999,3.129447099999993</mdui:GeolocationHint>
-<mdui:GeolocationHint>geo:50.8674164,4.377298099999962</mdui:GeolocationHint>
-<mdui:GeolocationHint>geo:51.07045,4.53135999999995</mdui:GeolocationHint>
-<mdui:GeolocationHint>geo:51.1558839,4.15444100000002</mdui:GeolocationHint>
-<mdui:GeolocationHint>geo:50.940892,4.904695599999968</mdui:GeolocationHint>
-<mdui:GeolocationHint>geo:51.06498,3.101570000000038</mdui:GeolocationHint>
-<mdui:GeolocationHint>geo:51.3216509,4.93755770000007</mdui:GeolocationHint>
-<mdui:GeolocationHint>geo:51.2025247,4.770882700000016</mdui:GeolocationHint>
-<mdui:GeolocationHint>geo:50.8134333,4.324834399999986</mdui:GeolocationHint>
-</mdui:DiscoHints>
-</Extensions>
-<KeyDescriptor>
-<ds:KeyInfo>
-<ds:X509Data>
-<ds:X509Certificate>MIIDJzCCAg+gAwIBAgIUJCkaCLjPZevQdbFbyV/aX8+ObfEwDQYJKoZIhvcNAQEF
-BQAwGjEYMBYGA1UEAxMPaWRwLmt1bGV1dmVuLmJlMB4XDTEwMTIwNjEwMzY1MFoX
-DTMwMTIwNjEwMzY1MFowGjEYMBYGA1UEAxMPaWRwLmt1bGV1dmVuLmJlMIIBIjAN
-BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAoIYa2FxhIfJ7Sy1RhWTmUObGUJRO
-WkyRuQ8colNagd7LgtmV1QMtzO7ZBrzUtJYtl65JJdGa0bN3k2UotpvB2qu77n8g
-CenFr2QgOxbf+7uadVkxAYaow0GA1u3a9c4TaHn4Y8WazR1SN386VKGwZcKEGGsV
-KWnC3gXGLar2p1Oqd69l68nSXQ98O6GgmGbnDVbN/VgNI2Vqe5dpu4tAQQoH6gPH
-GPl4xTeffAI/Vcy7OveAEXlz1nGTxJlwZ9/+RmEV8ub553ZYeojaceMqrHDSpkzu
-d8fwWsifjdZS7jfxFuhlbiPh67aa4y1jskGmviWOENCNZU246TyPuSE9nQIDAQAB
-o2UwYzBCBgNVHREEOzA5gg9pZHAua3VsZXV2ZW4uYmWGJmh0dHBzOi8vaWRwLmt1
-bGV1dmVuLmJlL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBQ3Wq3jKozzu+nRqPAm
-llWj/cBVAjANBgkqhkiG9w0BAQUFAAOCAQEANGAtqMje2/kEPetXA0AOesJ0OYxh
-AaKIAawXwUQcvAEW+uO879UEppsq3VMXrX9VqXrXY47o5B2+/NtvSls7U0FeA/QE
-vBEeFteBO7NxKY7VasCCfYI7mT0LUr3MgIPDnENq4ymNyLVgAhxOK4Vu43mtPz8D
-+yUwJwUPelIPJsW994v3EXGFSN8XYoxZcWfub41JBTSCcUPEeRllizGgTgFpZdGw
-yBBF0f9qs7xieTqsGGijXddW2178IDQV0l3abTnhZZW+FWO5pKOYwkRaLD092RVh
-5WD5+lg0EzoMXE00cBUlt6+K8JNWQARxL7MYUMX0ciUUP+XCSFsiYVHX4w==</ds:X509Certificate>
-</ds:X509Data>
-</ds:KeyInfo>
-</KeyDescriptor>
-<ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.kuleuven.be:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-<ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.kuleuven.be: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.kuleuven.be/idp/profile/Shibboleth/SSO"/>
-<SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.kuleuven.be/idp/profile/SAML2/POST/SSO"/>
-<SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.kuleuven.be/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-<SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.kuleuven.be/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">kuleuven.be</shibmd:Scope>
-<shibmd:Scope regexp="false">groept.be</shibmd:Scope>
-<shibmd:Scope regexp="false">hubkaho.be</shibmd:Scope>
-<shibmd:Scope regexp="false">odisee.be</shibmd:Scope>
-<shibmd:Scope regexp="false">vives.be</shibmd:Scope>
-<shibmd:Scope regexp="false">luca-arts.be</shibmd:Scope>
-<shibmd:Scope regexp="false">khlim.be</shibmd:Scope>
-<shibmd:Scope regexp="false">khleuven.be</shibmd:Scope>
-<shibmd:Scope regexp="false">thomasmore.be</shibmd:Scope>
-</Extensions>
-<KeyDescriptor>
-<ds:KeyInfo>
-<ds:X509Data>
-<ds:X509Certificate>MIIDJzCCAg+gAwIBAgIUJCkaCLjPZevQdbFbyV/aX8+ObfEwDQYJKoZIhvcNAQEF
-BQAwGjEYMBYGA1UEAxMPaWRwLmt1bGV1dmVuLmJlMB4XDTEwMTIwNjEwMzY1MFoX
-DTMwMTIwNjEwMzY1MFowGjEYMBYGA1UEAxMPaWRwLmt1bGV1dmVuLmJlMIIBIjAN
-BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAoIYa2FxhIfJ7Sy1RhWTmUObGUJRO
-WkyRuQ8colNagd7LgtmV1QMtzO7ZBrzUtJYtl65JJdGa0bN3k2UotpvB2qu77n8g
-CenFr2QgOxbf+7uadVkxAYaow0GA1u3a9c4TaHn4Y8WazR1SN386VKGwZcKEGGsV
-KWnC3gXGLar2p1Oqd69l68nSXQ98O6GgmGbnDVbN/VgNI2Vqe5dpu4tAQQoH6gPH
-GPl4xTeffAI/Vcy7OveAEXlz1nGTxJlwZ9/+RmEV8ub553ZYeojaceMqrHDSpkzu
-d8fwWsifjdZS7jfxFuhlbiPh67aa4y1jskGmviWOENCNZU246TyPuSE9nQIDAQAB
-o2UwYzBCBgNVHREEOzA5gg9pZHAua3VsZXV2ZW4uYmWGJmh0dHBzOi8vaWRwLmt1
-bGV1dmVuLmJlL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBQ3Wq3jKozzu+nRqPAm
-llWj/cBVAjANBgkqhkiG9w0BAQUFAAOCAQEANGAtqMje2/kEPetXA0AOesJ0OYxh
-AaKIAawXwUQcvAEW+uO879UEppsq3VMXrX9VqXrXY47o5B2+/NtvSls7U0FeA/QE
-vBEeFteBO7NxKY7VasCCfYI7mT0LUr3MgIPDnENq4ymNyLVgAhxOK4Vu43mtPz8D
-+yUwJwUPelIPJsW994v3EXGFSN8XYoxZcWfub41JBTSCcUPEeRllizGgTgFpZdGw
-yBBF0f9qs7xieTqsGGijXddW2178IDQV0l3abTnhZZW+FWO5pKOYwkRaLD092RVh
-5WD5+lg0EzoMXE00cBUlt6+K8JNWQARxL7MYUMX0ciUUP+XCSFsiYVHX4w==</ds:X509Certificate>
-</ds:X509Data>
-</ds:KeyInfo>
-</KeyDescriptor>
-<AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.kuleuven.be:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-<AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.kuleuven.be: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="nl">KU Leuven / Associatie KU Leuven</OrganizationName>
-<OrganizationDisplayName xml:lang="nl">KU Leuven / Associatie KU Leuven</OrganizationDisplayName>
-<OrganizationURL xml:lang="nl">https://admin.kuleuven.be/icts/servicepunt</OrganizationURL>
-</Organization>
-<ContactPerson contactType="technical">
-<GivenName>AAI team</GivenName>
-<EmailAddress>shib@kuleuven.be</EmailAddress>
-</ContactPerson>
-<ContactPerson contactType="support">
-<GivenName>ICTS Servicepunt</GivenName>
-<EmailAddress>servicepunt@icts.kuleuven.be</EmailAddress>
-</ContactPerson>
-</EntityDescriptor>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="urn:ibistic:prod:services.ibistic.net" validUntil="2014-11-02T19:17:01Z" cacheDuration="PT345600S">
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIHOTCCBiGgAwIBAgIQAg/p4rQP3A2b5rG7pJYglTANBgkqhkiG9w0BAQUFADBpMQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3d3cuZGlnaWNlcnQuY29tMSgwJgYDVQQDEx9EaWdpQ2VydCBIaWdoIEFzc3VyYW5jZSBFViBDQS0xMB4XDTEzMDQxMTAwMDAwMFoXDTE1MDUxNTEyMDAwMFowgfUxHTAbBgNVBA8TFFByaXZhdGUgT3JnYW5pemF0aW9uMRMwEQYLKwYBBAGCNzwCAQMTAkRLMREwDwYDVQQFEwgyNzc2ODM5MzEcMBoGA1UECQwTw4VyaHVzZ2FkZSA4OCBTYWwgMTENMAsGA1UEERMEMjEwMDELMAkGA1UEBhMCREsxEzARBgNVBAgMCkvDuGJlbmhhdm4xEzARBgNVBAcMCkvDuGJlbmhhdm4xKTAnBgNVBAoTIEliaXN0aWMgVGVjaG5vbG9naWVzIERlbm1hcmsgQS9TMR0wGwYDVQQDExRzZXJ2aWNlcy5pYmlzdGljLm5ldDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKGGOlp7kpAShy2Duk6H4LhKps7Xveb9HBDRb0701v5dun0g3O1Im5wghIUcYnYuKAnMRQAG+nqlbpw22JKRfQei5snMSqaKiBG7zJl6EB8MeI+Ht1+iWvfn0ijDdU/kkE0U8ZPoJ9z5Wj0SG4KRLu8rkvBlq1V0Fa1sYBJcM9QQIh8GTALbOHkt4rzHXSqt9vb01Hai1hHmQz2Hu+04nGI2AZmTZYDSyyyx9sxSbEJHsyUPrXlEd1WHo8LQuIPmJ7L9SXAVmDmqehRkAKDxrvdi15JOCujpo3wVSbI9TYdZoDQXBQDjkHQliudWHYPHXsadJrkVHhKyk9bnE6lK2GcCAwEAAaOCA04wggNKMB8GA1UdIwQYMBaAFExYyyXwQU9S9CjIgUObpqig5pLlMB0GA1UdDgQWBBScCH5jpiDvtMm0IOrwRYri4+yAtjAfBgNVHREEGDAWghRzZXJ2aWNlcy5pYmlzdGljLm5ldDAOBgNVHQ8BAf8EBAMCBaAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMGMGA1UdHwRcMFowK6ApoCeGJWh0dHA6Ly9jcmwzLmRpZ2ljZXJ0LmNvbS9ldmNhMS1nMi5jcmwwK6ApoCeGJWh0dHA6Ly9jcmw0LmRpZ2ljZXJ0LmNvbS9ldmNhMS1nMi5jcmwwggHEBgNVHSAEggG7MIIBtzCCAbMGCWCGSAGG/WwCATCCAaQwOgYIKwYBBQUHAgEWLmh0dHA6Ly93d3cuZGlnaWNlcnQuY29tL3NzbC1jcHMtcmVwb3NpdG9yeS5odG0wggFkBggrBgEFBQcCAjCCAVYeggFSAEEAbgB5ACAAdQBzAGUAIABvAGYAIAB0AGgAaQBzACAAQwBlAHIAdABpAGYAaQBjAGEAdABlACAAYwBvAG4AcwB0AGkAdAB1AHQAZQBzACAAYQBjAGMAZQBwAHQAYQBuAGMAZQAgAG8AZgAgAHQAaABlACAARABpAGcAaQBDAGUAcgB0ACAAQwBQAC8AQwBQAFMAIABhAG4AZAAgAHQAaABlACAAUgBlAGwAeQBpAG4AZwAgAFAAYQByAHQAeQAgAEEAZwByAGUAZQBtAGUAbgB0ACAAdwBoAGkAYwBoACAAbABpAG0AaQB0ACAAbABpAGEAYgBpAGwAaQB0AHkAIABhAG4AZAAgAGEAcgBlACAAaQBuAGMAbwByAHAAbwByAGEAdABlAGQAIABoAGUAcgBlAGkAbgAgAGIAeQAgAHIAZQBmAGUAcgBlAG4AYwBlAC4wfQYIKwYBBQUHAQEEcTBvMCQGCCsGAQUFBzABhhhodHRwOi8vb2NzcC5kaWdpY2VydC5jb20wRwYIKwYBBQUHMAKGO2h0dHA6Ly9jYWNlcnRzLmRpZ2ljZXJ0LmNvbS9EaWdpQ2VydEhpZ2hBc3N1cmFuY2VFVkNBLTEuY3J0MAwGA1UdEwEB/wQCMAAwDQYJKoZIhvcNAQEFBQADggEBAKbx9nfzso6MmZijJupklvhCGi3CataD6GraOrki2BcAVfLka/VILsR6Lj8LXIN6zQK1XhiPSDvPaXpGFAtz2+IPUFUFJBT3JHsZ6AZDO8xNUMjfe8EYCVg46xyJF0vSSt6YxRcc7Bp+ksqJkmEEN0n/FfPbVDjhLkRUtU0KgockOhJydkDbCk888Ilhec446VRVIwRcHsfFj/CBOvodin14r7TtYphOOjXVp3xpvDSAgYIrWLkiBTFzPda524UeUOVawhcDhDyagmq8MtQp7os9TnyXRS4csHWNO0Wl77wUJcZ2KKFADUEPTrsbHb1sTcMhWW87neRM6fJa+AdGEp8=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIHOTCCBiGgAwIBAgIQAg/p4rQP3A2b5rG7pJYglTANBgkqhkiG9w0BAQUFADBpMQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3d3cuZGlnaWNlcnQuY29tMSgwJgYDVQQDEx9EaWdpQ2VydCBIaWdoIEFzc3VyYW5jZSBFViBDQS0xMB4XDTEzMDQxMTAwMDAwMFoXDTE1MDUxNTEyMDAwMFowgfUxHTAbBgNVBA8TFFByaXZhdGUgT3JnYW5pemF0aW9uMRMwEQYLKwYBBAGCNzwCAQMTAkRLMREwDwYDVQQFEwgyNzc2ODM5MzEcMBoGA1UECQwTw4VyaHVzZ2FkZSA4OCBTYWwgMTENMAsGA1UEERMEMjEwMDELMAkGA1UEBhMCREsxEzARBgNVBAgMCkvDuGJlbmhhdm4xEzARBgNVBAcMCkvDuGJlbmhhdm4xKTAnBgNVBAoTIEliaXN0aWMgVGVjaG5vbG9naWVzIERlbm1hcmsgQS9TMR0wGwYDVQQDExRzZXJ2aWNlcy5pYmlzdGljLm5ldDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKGGOlp7kpAShy2Duk6H4LhKps7Xveb9HBDRb0701v5dun0g3O1Im5wghIUcYnYuKAnMRQAG+nqlbpw22JKRfQei5snMSqaKiBG7zJl6EB8MeI+Ht1+iWvfn0ijDdU/kkE0U8ZPoJ9z5Wj0SG4KRLu8rkvBlq1V0Fa1sYBJcM9QQIh8GTALbOHkt4rzHXSqt9vb01Hai1hHmQz2Hu+04nGI2AZmTZYDSyyyx9sxSbEJHsyUPrXlEd1WHo8LQuIPmJ7L9SXAVmDmqehRkAKDxrvdi15JOCujpo3wVSbI9TYdZoDQXBQDjkHQliudWHYPHXsadJrkVHhKyk9bnE6lK2GcCAwEAAaOCA04wggNKMB8GA1UdIwQYMBaAFExYyyXwQU9S9CjIgUObpqig5pLlMB0GA1UdDgQWBBScCH5jpiDvtMm0IOrwRYri4+yAtjAfBgNVHREEGDAWghRzZXJ2aWNlcy5pYmlzdGljLm5ldDAOBgNVHQ8BAf8EBAMCBaAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMGMGA1UdHwRcMFowK6ApoCeGJWh0dHA6Ly9jcmwzLmRpZ2ljZXJ0LmNvbS9ldmNhMS1nMi5jcmwwK6ApoCeGJWh0dHA6Ly9jcmw0LmRpZ2ljZXJ0LmNvbS9ldmNhMS1nMi5jcmwwggHEBgNVHSAEggG7MIIBtzCCAbMGCWCGSAGG/WwCATCCAaQwOgYIKwYBBQUHAgEWLmh0dHA6Ly93d3cuZGlnaWNlcnQuY29tL3NzbC1jcHMtcmVwb3NpdG9yeS5odG0wggFkBggrBgEFBQcCAjCCAVYeggFSAEEAbgB5ACAAdQBzAGUAIABvAGYAIAB0AGgAaQBzACAAQwBlAHIAdABpAGYAaQBjAGEAdABlACAAYwBvAG4AcwB0AGkAdAB1AHQAZQBzACAAYQBjAGMAZQBwAHQAYQBuAGMAZQAgAG8AZgAgAHQAaABlACAARABpAGcAaQBDAGUAcgB0ACAAQwBQAC8AQwBQAFMAIABhAG4AZAAgAHQAaABlACAAUgBlAGwAeQBpAG4AZwAgAFAAYQByAHQAeQAgAEEAZwByAGUAZQBtAGUAbgB0ACAAdwBoAGkAYwBoACAAbABpAG0AaQB0ACAAbABpAGEAYgBpAGwAaQB0AHkAIABhAG4AZAAgAGEAcgBlACAAaQBuAGMAbwByAHAAbwByAGEAdABlAGQAIABoAGUAcgBlAGkAbgAgAGIAeQAgAHIAZQBmAGUAcgBlAG4AYwBlAC4wfQYIKwYBBQUHAQEEcTBvMCQGCCsGAQUFBzABhhhodHRwOi8vb2NzcC5kaWdpY2VydC5jb20wRwYIKwYBBQUHMAKGO2h0dHA6Ly9jYWNlcnRzLmRpZ2ljZXJ0LmNvbS9EaWdpQ2VydEhpZ2hBc3N1cmFuY2VFVkNBLTEuY3J0MAwGA1UdEwEB/wQCMAAwDQYJKoZIhvcNAQEFBQADggEBAKbx9nfzso6MmZijJupklvhCGi3CataD6GraOrki2BcAVfLka/VILsR6Lj8LXIN6zQK1XhiPSDvPaXpGFAtz2+IPUFUFJBT3JHsZ6AZDO8xNUMjfe8EYCVg46xyJF0vSSt6YxRcc7Bp+ksqJkmEEN0n/FfPbVDjhLkRUtU0KgockOhJydkDbCk888Ilhec446VRVIwRcHsfFj/CBOvodin14r7TtYphOOjXVp3xpvDSAgYIrWLkiBTFzPda524UeUOVawhcDhDyagmq8MtQp7os9TnyXRS4csHWNO0Wl77wUJcZ2KKFADUEPTrsbHb1sTcMhWW87neRM6fJa+AdGEp8=</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://services.ibistic.net/sso/wayf/saml/post/ac" index="0"/>
+    <md:AttributeConsumingService index="0">
+      <md:ServiceName xml:lang="en">Ibistic Services</md:ServiceName>
+      <md:ServiceName xml:lang="da">Ibistic Services</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">to handle and approve supplier invoices in a web-based solution</md:ServiceDescription>
+      <md:ServiceDescription xml:lang="da">at håndtere og godkende leverandørfakturarer i en webbaseret løsning</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: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: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.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.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/Shibboleth.uem.br-idp-shibboleth.xml b/swamid-interfederations-2.0/Shibboleth.uem.br-idp-shibboleth.xml
deleted file mode 100644
index 4fa3f850..00000000
--- a/swamid-interfederations-2.0/Shibboleth.uem.br-idp-shibboleth.xml
+++ /dev/null
@@ -1,102 +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.uem.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">uem.br</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">UEM - Universidade Estadual de Maringa</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="pt-br">UEM - Universidade Estadual de Maringa</mdui:DisplayName>
-        <mdui:Description xml:lang="en">UEM - Universidade Estadual de Maringa</mdui:Description>
-        <mdui:Description xml:lang="pt-br">UEM - Universidade Estadual de Maringa</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.uem.br/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="pt-br">http://www.uem.br/</mdui:InformationURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-    MIIC4jCCAcoCAQAwDQYJKoZIhvcNAQEFBQAwNzEMMAoGA1UECxMDTlBEMQswCQYD
-VQQGEwJCUjEaMBgGA1UEAxMRU2hpYmJvbGV0aC51ZW0uYnIwHhcNMTQwNDE1MTQx
-NTIwWhcNMTkwNDE0MTQxNTIwWjA3MQwwCgYDVQQLEwNOUEQxCzAJBgNVBAYTAkJS
-MRowGAYDVQQDExFTaGliYm9sZXRoLnVlbS5icjCCASIwDQYJKoZIhvcNAQEBBQAD
-ggEPADCCAQoCggEBALs/KHnZekrQFrHtk9e+vVMklEe0+7HfSu34nJHP7vOpQTZR
-KwpRnisPoSwBkeY4JcbgUa2/gSskUTSf4EBWvrfaUs5NATXc0l5VOT7T2vXrUye0
-Ua1LsAroWH2/yEB2gvs8THrtp+UZ1uAYJkoIxcc9ydZ7LKUpSuv/LrCAjHaiwD6q
-jNMSFYm+UUpt6tzAWBuHfoJng92JId0qelSGIT7WjjOPlyE/iA+gXZd1/k4FFS8V
-dxAcNYLlP8uqVjVR9RsHRjOphdxvvNg8r9210k2z8XH698EOKmunuVMkcFaBIevO
-pc6rhoGj/ldt9J8F5skvx2l9qwezMOXwgJyf/UsCAwEAATANBgkqhkiG9w0BAQUF
-AAOCAQEApYQmpGfiWbaWLXUYvh30t5YUPqvnPcNfz70mdUhm4zIDBzHIRZeBHg2L
-95GqLFmCdQnHXcVVVADx/w1FXOQk14l3tmukOCRGHga0Ut6DPvAcJSVcTAfUh03U
-mFETv9XACNN6qWfV0f6kUWU3O64runCgTATOHFNkT+wOusx8pIIwdXudj47+KbZS
-g1si2gBE4K06TiA8DygDCIaqS7roCrsGc1iY1FWop03y91TABSH9EzU25dgAW9Q2
-rFO4M7HOkAEzzTLR7/3eE3fLOv6xTGnASwz3rYbhA/SfJZE/v/Ld6PUhBY1a+WO1
-TZVYQfUodulLy5CH0QkSH1Focl6MuA==
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://Shibboleth.uem.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://Shibboleth.uem.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.uem.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://Shibboleth.uem.br/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://Shibboleth.uem.br/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://Shibboleth.uem.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">uem.br</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-      
-MIIC4jCCAcoCAQAwDQYJKoZIhvcNAQEFBQAwNzEMMAoGA1UECxMDTlBEMQswCQYD
-VQQGEwJCUjEaMBgGA1UEAxMRU2hpYmJvbGV0aC51ZW0uYnIwHhcNMTQwNDE1MTQx
-NTIwWhcNMTkwNDE0MTQxNTIwWjA3MQwwCgYDVQQLEwNOUEQxCzAJBgNVBAYTAkJS
-MRowGAYDVQQDExFTaGliYm9sZXRoLnVlbS5icjCCASIwDQYJKoZIhvcNAQEBBQAD
-ggEPADCCAQoCggEBALs/KHnZekrQFrHtk9e+vVMklEe0+7HfSu34nJHP7vOpQTZR
-KwpRnisPoSwBkeY4JcbgUa2/gSskUTSf4EBWvrfaUs5NATXc0l5VOT7T2vXrUye0
-Ua1LsAroWH2/yEB2gvs8THrtp+UZ1uAYJkoIxcc9ydZ7LKUpSuv/LrCAjHaiwD6q
-jNMSFYm+UUpt6tzAWBuHfoJng92JId0qelSGIT7WjjOPlyE/iA+gXZd1/k4FFS8V
-dxAcNYLlP8uqVjVR9RsHRjOphdxvvNg8r9210k2z8XH698EOKmunuVMkcFaBIevO
-pc6rhoGj/ldt9J8F5skvx2l9qwezMOXwgJyf/UsCAwEAATANBgkqhkiG9w0BAQUF
-AAOCAQEApYQmpGfiWbaWLXUYvh30t5YUPqvnPcNfz70mdUhm4zIDBzHIRZeBHg2L
-95GqLFmCdQnHXcVVVADx/w1FXOQk14l3tmukOCRGHga0Ut6DPvAcJSVcTAfUh03U
-mFETv9XACNN6qWfV0f6kUWU3O64runCgTATOHFNkT+wOusx8pIIwdXudj47+KbZS
-g1si2gBE4K06TiA8DygDCIaqS7roCrsGc1iY1FWop03y91TABSH9EzU25dgAW9Q2
-rFO4M7HOkAEzzTLR7/3eE3fLOv6xTGnASwz3rYbhA/SfJZE/v/Ld6PUhBY1a+WO1
-TZVYQfUodulLy5CH0QkSH1Focl6MuA==
-                    
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://Shibboleth.uem.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://Shibboleth.uem.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">UEM - Universidade Estadual de Maringa</OrganizationName>
-    <OrganizationName xml:lang="pt-br">UEM - Universidade Estadual de Maringa</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">UEM - Universidade Estadual de Maringa</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="pt-br">UEM - Universidade Estadual de Maringa</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.uem.br/</OrganizationURL>
-    <OrganizationURL xml:lang="pt-br">http://www.uem.br/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Helcio do Prado</SurName>
-    <EmailAddress>helcio@uem.br</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/Shibboleth.uem.br.xml b/swamid-interfederations-2.0/Shibboleth.uem.br.xml
deleted file mode 100644
index 4fa3f850..00000000
--- a/swamid-interfederations-2.0/Shibboleth.uem.br.xml
+++ /dev/null
@@ -1,102 +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.uem.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">uem.br</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">UEM - Universidade Estadual de Maringa</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="pt-br">UEM - Universidade Estadual de Maringa</mdui:DisplayName>
-        <mdui:Description xml:lang="en">UEM - Universidade Estadual de Maringa</mdui:Description>
-        <mdui:Description xml:lang="pt-br">UEM - Universidade Estadual de Maringa</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.uem.br/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="pt-br">http://www.uem.br/</mdui:InformationURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-    MIIC4jCCAcoCAQAwDQYJKoZIhvcNAQEFBQAwNzEMMAoGA1UECxMDTlBEMQswCQYD
-VQQGEwJCUjEaMBgGA1UEAxMRU2hpYmJvbGV0aC51ZW0uYnIwHhcNMTQwNDE1MTQx
-NTIwWhcNMTkwNDE0MTQxNTIwWjA3MQwwCgYDVQQLEwNOUEQxCzAJBgNVBAYTAkJS
-MRowGAYDVQQDExFTaGliYm9sZXRoLnVlbS5icjCCASIwDQYJKoZIhvcNAQEBBQAD
-ggEPADCCAQoCggEBALs/KHnZekrQFrHtk9e+vVMklEe0+7HfSu34nJHP7vOpQTZR
-KwpRnisPoSwBkeY4JcbgUa2/gSskUTSf4EBWvrfaUs5NATXc0l5VOT7T2vXrUye0
-Ua1LsAroWH2/yEB2gvs8THrtp+UZ1uAYJkoIxcc9ydZ7LKUpSuv/LrCAjHaiwD6q
-jNMSFYm+UUpt6tzAWBuHfoJng92JId0qelSGIT7WjjOPlyE/iA+gXZd1/k4FFS8V
-dxAcNYLlP8uqVjVR9RsHRjOphdxvvNg8r9210k2z8XH698EOKmunuVMkcFaBIevO
-pc6rhoGj/ldt9J8F5skvx2l9qwezMOXwgJyf/UsCAwEAATANBgkqhkiG9w0BAQUF
-AAOCAQEApYQmpGfiWbaWLXUYvh30t5YUPqvnPcNfz70mdUhm4zIDBzHIRZeBHg2L
-95GqLFmCdQnHXcVVVADx/w1FXOQk14l3tmukOCRGHga0Ut6DPvAcJSVcTAfUh03U
-mFETv9XACNN6qWfV0f6kUWU3O64runCgTATOHFNkT+wOusx8pIIwdXudj47+KbZS
-g1si2gBE4K06TiA8DygDCIaqS7roCrsGc1iY1FWop03y91TABSH9EzU25dgAW9Q2
-rFO4M7HOkAEzzTLR7/3eE3fLOv6xTGnASwz3rYbhA/SfJZE/v/Ld6PUhBY1a+WO1
-TZVYQfUodulLy5CH0QkSH1Focl6MuA==
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://Shibboleth.uem.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://Shibboleth.uem.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.uem.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://Shibboleth.uem.br/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://Shibboleth.uem.br/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://Shibboleth.uem.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">uem.br</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-      
-MIIC4jCCAcoCAQAwDQYJKoZIhvcNAQEFBQAwNzEMMAoGA1UECxMDTlBEMQswCQYD
-VQQGEwJCUjEaMBgGA1UEAxMRU2hpYmJvbGV0aC51ZW0uYnIwHhcNMTQwNDE1MTQx
-NTIwWhcNMTkwNDE0MTQxNTIwWjA3MQwwCgYDVQQLEwNOUEQxCzAJBgNVBAYTAkJS
-MRowGAYDVQQDExFTaGliYm9sZXRoLnVlbS5icjCCASIwDQYJKoZIhvcNAQEBBQAD
-ggEPADCCAQoCggEBALs/KHnZekrQFrHtk9e+vVMklEe0+7HfSu34nJHP7vOpQTZR
-KwpRnisPoSwBkeY4JcbgUa2/gSskUTSf4EBWvrfaUs5NATXc0l5VOT7T2vXrUye0
-Ua1LsAroWH2/yEB2gvs8THrtp+UZ1uAYJkoIxcc9ydZ7LKUpSuv/LrCAjHaiwD6q
-jNMSFYm+UUpt6tzAWBuHfoJng92JId0qelSGIT7WjjOPlyE/iA+gXZd1/k4FFS8V
-dxAcNYLlP8uqVjVR9RsHRjOphdxvvNg8r9210k2z8XH698EOKmunuVMkcFaBIevO
-pc6rhoGj/ldt9J8F5skvx2l9qwezMOXwgJyf/UsCAwEAATANBgkqhkiG9w0BAQUF
-AAOCAQEApYQmpGfiWbaWLXUYvh30t5YUPqvnPcNfz70mdUhm4zIDBzHIRZeBHg2L
-95GqLFmCdQnHXcVVVADx/w1FXOQk14l3tmukOCRGHga0Ut6DPvAcJSVcTAfUh03U
-mFETv9XACNN6qWfV0f6kUWU3O64runCgTATOHFNkT+wOusx8pIIwdXudj47+KbZS
-g1si2gBE4K06TiA8DygDCIaqS7roCrsGc1iY1FWop03y91TABSH9EzU25dgAW9Q2
-rFO4M7HOkAEzzTLR7/3eE3fLOv6xTGnASwz3rYbhA/SfJZE/v/Ld6PUhBY1a+WO1
-TZVYQfUodulLy5CH0QkSH1Focl6MuA==
-                    
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://Shibboleth.uem.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://Shibboleth.uem.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">UEM - Universidade Estadual de Maringa</OrganizationName>
-    <OrganizationName xml:lang="pt-br">UEM - Universidade Estadual de Maringa</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">UEM - Universidade Estadual de Maringa</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="pt-br">UEM - Universidade Estadual de Maringa</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.uem.br/</OrganizationURL>
-    <OrganizationURL xml:lang="pt-br">http://www.uem.br/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Helcio do Prado</SurName>
-    <EmailAddress>helcio@uem.br</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/aai-idp.unibe.ch-idp-shibboleth.xml b/swamid-interfederations-2.0/aai-idp.unibe.ch-idp-shibboleth.xml
deleted file mode 100644
index ea2cb100..00000000
--- a/swamid-interfederations-2.0/aai-idp.unibe.ch-idp-shibboleth.xml
+++ /dev/null
@@ -1,222 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://aai-idp.unibe.ch/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://rr.aai.switch.ch/" registrationInstant="2014-04-11T08:10:51Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.switch.ch/aai/federation/switchaai/metadata-registration-practice-statement-20110711.txt</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-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </Extensions>
-  <IDPSSODescriptor errorURL="http://www.id.unibe.ch/content/helpdesk" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-    <Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unibe.ch</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="de">Universität Bern</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">University of Bern</mdui:DisplayName>
-        <mdui:Description xml:lang="de">Universität Bern</mdui:Description>
-        <mdui:Description xml:lang="en">University of Bern</mdui:Description>
-        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAACF0RVh0U29mdHdhcmUAR3JhcGhpY0NvbnZlcnRlciAoSW50ZWwpd4f6GQAAAeVJREFUeJyUkr9LQlEUx58u6p8gOLq5CeKkq+gkooMi6CCCILi4ujyMokhLkSIJdDKMUmxoShOHkFwEHdR0CULQ5+Dv3yfPhSsVGTncx7vfe87nnPs9lwEA5r9rvV4zFosFqtXqA9X+nYxrPB6farVayGQy9W63e7k3gOO4C4VCAV6vF8xmM4xGo8BegFKp9OR0Oje/wJpMJqjVavd7ARKJxIfP54N6vX6n0+mg1+tFGGxjMpmcrFarg9lsdrxYLA6/JqG+XC6JlkqlmkajEbCLXC73Sjzw+/3gcrlApVKBUqmEZrOZpMlYTa1WQyAQAArr9/vn8/n8aDuFwWBwjhBm46dEIgF0mjqOe9RDodBq17Xww9psNhKIM6YH5XL5kc/nA4/HAzRvJ2DTDiOTyQggGAxuAdFodEC7Gg6HZzsBrVbrRiAQEECxWHymBw6Hg2h6vR52JRNAOp1++1lpOp2eSKVSAmBZlgBwZHQa3wDoNAYaDIZtpXg8zqGG989ms6+Y7Ha7twZ/A2AiBmMAvoF8Pl+02+1EEwqFZKwejweSyeT7r1eIRCJzkUgEYrEYrFYrhMPhZbvdvpbL5YDeaDQaiMVi3F9jZCqVygO+rEajcUsPOp3OVaFQeEGT/zLxEwAA//8DAH2UumiGm7jIAAAAAElFTkSuQmCC</mdui:Logo>
-        <mdui:Logo height="60" width="80">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFAAAAA8CAIAAAB+RarbAAAC0GlDQ1BJQ0NQcm9maWxlAAB4nI2Uz0sUYRjHv7ONGChBYGZ7iKFDSKhMFmVE5a6/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+hkAAAZRSURBVHic7Jp9TFNXGMaJMYpTg4tBF2OMATGYhYWZCUTEzSj+Y2Q47DLUyWAJKhsi39kQEIHJhLCBjgxxGwgCg/GhCOL4UNSKEw0MHBXHN8jnBAUc0MJz9pZbSiHGLN5LK5UnTXN73nNvnt8957znbW912GsmHf6XiI2NXb169dDQEP9LqUECAPv5+VlYWPC/jnokALBIJHJwcOB/HfVIAGBLS0tbW1tHR0dPT8/u7m7+F5xW8QUeHBw0MDAwMzMLDAyklWxnZwdAEGfTJL7Ara2tS5YsEYvFdJyTk7N48eKOjg4hjE2X+AKXlZURcFNTEx3funVr0aJFjY2NQhibLvEFTktLW7VqlVQqpePg4GBDQ0Oa5EIYmy7xBQ4NDV23bp1EIomOjqb5HB8fL4it6RNf4LCwsDVr1piYmGzZsiUjI0MQT9MqBXBqaqqXl5ePjw8l22PHjnl4eDg7O09Zjbm5uQEBARSlPs3NzVyjTCbrG5O6jb+sFMCnTp0KCgry9/dfuHChzphofnZ2dir70WZD+y0XmjdvnhJ4xmnSlKaygVIuR7Vt2zbVEMHr6+tzISokR0dH1etTME0CzsvL0xkXVciqoaKiImXI1dVVvSaF1CRg2leUVLRiVUOUjZWh5ORk9ZoUUpOAbWxsOCQ9Pb2WlhbV0I4dO7jQ/Pnzq6ur1WtSSE0ADwwMUNnAUZmbm4+MjChDT548WblyJRcyNjZ+xUuLF2sCuKqqitLvc1dpaWnpnDlzuJC9vb3aTQqpCeCkpCTlKk1JSVHtFBkZqQxFRUWp3aSQmgB2c3PjkBYsWFBTU6Paafv27VyIxpm+IXCNtbW1/f39ajUrhBTAVFdYWVlxVFQbq/5AVVFRQbeAC61YseLx48fU2NvbS93u3bunGdc8pADu6ekhGI5KJBIpw5S6du7cqZzP1tbWXLu3tzcNu2pimylSANMc1tXV5agIhmukCtnFxYWm+tKlS7mQr68vtefn5y9btuz+/fsac81DCuCuri5l5WhkZJSYmBgTE0MlZHh4OA3j2rVruRCNakREBG1R6enpmvX90ppIWnFxccuXL+fA5s6du3nz5oKCAi6UkJCgrLFNTU0LCws15FYATaq02traSkpKiouLKQNP6VdXV0ft5eXl9H1QjfaElwA/084szQJru2aBtV2zwNquWWBt1yywtmsWWNulAM7Qdk0FjtZ2TQV+faQAlkqlAwMDmrWiHimAJRJJVFTU8PCwZt2oQQpgsVjs7u4+5YGDVkoBnJmZGRISkp2drVk3apACuKOjo7KycuY+1///en6WhspLtZFNbnnuWVP64FEXqv5m7d0vPldtGgeuaWLXy1HXitJKNLUj+TLa/0FxGevtQ+5N1Lawgtvs2SByrqOxHXFZ+OUiep6yCyXsTDqrqGHDMpy/jNgMDA4hT4wHDeznC4hNR00jrt2FpSPEFZDUy1vOZrNeTT6CGwc+k8X2ByLlCg6dwKUb0DFBwI/45Cv2Vz02fIo/H2KTE9IK8LEvu1IKQxscP4uuHph/Bmtn7PbBjXK8+QGiU+XAFg64WobDJ7FhL6N7R+RvbUViLhoeYZMjvghj/c9eAeD4HGbvh7hMMoQL12DtAsMPYefNquvx3j6MjkLki3f3IKuYhh1v2+GHNDztx0YnvLMb/jGs7xm9w/gj+TBu+pzmMFLysddPPsk3OsJsn7yRjg+EIilPg7RsArixDTZHYH0IhX/g91JEpcDzOxz6Bg2t2HeU4mQUZvvRN8BuV2HrARwOR30rvvwW2dfk75IGOAfDxh2POuEUxB42yacJ3Qjqs+drlNzFLm80tyP0J3axRJO4k5KWVEarVH4wCvmLJBthAFM+Ex0Zy+HUMiRlA/8ySulcSCaTh3r7xj+OnUVXGBnrwP19mutM75reCF7XWpqV1+BgCDwjWVsXTqfhyAn8VoTaZhwIhnsEuNxz8hwoY+Xe1KhhvhoHziiWpxyjXexmBWw9IfKglcyK7sB4F0ztQQcHQ6H3vjyNhSdo1DBfjf/HI+sqrJzke0/2VdqNcPC4fEOm3WW9PWVp9qARbuHyHUvXAqd/1axjnhof4UvX8cYGGNjId8vdvtC3YF7fo/gOHINwNAbh55jrSeTewPq9LPK8Rg3z1WuXtP4DAAD//wMAnPfzPGW0I0UAAAAASUVORK5CYII=</mdui:Logo>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:IPHint>195.176.0.128/28</mdui:IPHint>
-        <mdui:IPHint>195.176.3.0/26</mdui:IPHint>
-        <mdui:IPHint>195.176.3.128/28</mdui:IPHint>
-        <mdui:IPHint>192.41.149.0/24</mdui:IPHint>
-        <mdui:IPHint>192.41.152.0/21</mdui:IPHint>
-        <mdui:IPHint>192.41.160.0/24</mdui:IPHint>
-        <mdui:IPHint>2001:620:400::/48</mdui:IPHint>
-        <mdui:IPHint>86.118.0.0/15</mdui:IPHint>
-        <mdui:IPHint>86.118.149.0/26</mdui:IPHint>
-        <mdui:IPHint>130.92.0.0/16</mdui:IPHint>
-        <mdui:DomainHint>unibe.ch</mdui:DomainHint>
-        <mdui:GeolocationHint>geo:46.950509,7.438155</mdui:GeolocationHint>
-      </mdui:DiscoHints>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIFTjCCBDagAwIBAgIUaEj3cUMMoHFpXcehDx5GzSFg6OcwDQYJKoZIhvcNAQEF
-BQAwazELMAkGA1UEBhMCQk0xGTAXBgNVBAoTEFF1b1ZhZGlzIExpbWl0ZWQxHzAd
-BgNVBAsTFnd3dy5xdW92YWRpc2dsb2JhbC5jb20xIDAeBgNVBAMTF1F1b1ZhZGlz
-IEdsb2JhbCBTU0wgSUNBMB4XDTEyMTEwMjA3MjczOFoXDTE0MTEwMjA3MjczOFow
-gb8xEzARBgsrBgEEAYI3PAIBAxMCQ0gxFTATBgsrBgEEAYI3PAIBAhMEQmVybjEa
-MBgGA1UEDxMRR292ZXJubWVudCBFbnRpdHkxEzARBgNVBAUTCjE4MzQtMDMtMTQx
-CzAJBgNVBAYTAkNIMQ0wCwYDVQQIEwRCZXJuMQ0wCwYDVQQHEwRCZXJuMRowGAYD
-VQQKExFVbml2ZXJzaXRhZXQgQmVybjEZMBcGA1UEAxMQYWFpLWlkcC51bmliZS5j
-aDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANjwYYDyz1KQK/RrlHj/
-TIMkmIp1rwlv7KpDa4d8QpHTsBW831PiNI7iYQltZzxC3t8k2sJ8qDX5+uTWXJIA
-C6v60ZxWkWWLf1qkk/cznwvLkEdo1698J4vc6cx91OUX2rq/Q/zjdndXmTGgyfxw
-pAqb2uKBNbG2RoxEdyP1F8Yi3165/8LubrDKXtP9+fdKqQkxv/sZH6NrUWRrJiUd
-+0KhG1LOada7F8DRKQOFtUAJ78di3wmZyJfOXye4yenCfYsWbfrUcuCJDSIqrdFQ
-VVj5AUr3hdKEAJafc22LTDDsdSuKpcv+n2/C/oH8Mdsxg7we6r/dJz4x7vM7GHhn
-pK0CAwEAAaOCAZMwggGPMHQGCCsGAQUFBwEBBGgwZjAqBggrBgEFBQcwAYYeaHR0
-cDovL29jc3AucXVvdmFkaXNnbG9iYWwuY29tMDgGCCsGAQUFBzAChixodHRwOi8v
-dHJ1c3QucXVvdmFkaXNnbG9iYWwuY29tL3F2c3NsaWNhLmNydDBRBgNVHSAESjBI
-MEYGDCsGAQQBvlgAAmQBAjA2MDQGCCsGAQUFBwIBFihodHRwOi8vd3d3LnF1b3Zh
-ZGlzZ2xvYmFsLmNvbS9yZXBvc2l0b3J5MBsGA1UdEQQUMBKCEGFhaS1pZHAudW5p
-YmUuY2gwCwYDVR0PBAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcD
-AjAfBgNVHSMEGDAWgBQyTaFP6vCumbbumwcshAgRUIvifjA7BgNVHR8ENDAyMDCg
-LqAshipodHRwOi8vY3JsLnF1b3ZhZGlzZ2xvYmFsLmNvbS9xdnNzbGljYS5jcmww
-HQYDVR0OBBYEFGm9MS6ojsIWTq+Y8EG534cfO6y4MA0GCSqGSIb3DQEBBQUAA4IB
-AQBx06TLIvS40KeCMCgDJ8MdrDlxt//3F9cyWBsXJkJLdtVD6xTBQ6+lwg9RG+ct
-RO9eZpURgeHEkcy7YkNgq0XukoKl1on7P1tJoLa6fOBq/4XU5EiAeQBeohFOohYO
-qr5PxmgEp98c7clKulvmuJBX/MSqKCHQEVx0fqsiZ7/TUdRinlLNQKVxGMrgm+KG
-zN6anM+WgtbqG+Ed4XaekXpO2EMDnle0SM8vcJ+dUgIEa0+t+fEPCAnN0vD6b910
-uzs7quvneAVGiAeqoZLZ5k62+3qldV40gI41gHflX4mIWMD+TPCFG5ue64N0nLzU
-LxDK1XTR2ZqXgnziFQWnbI54
-						</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>
-MIIFLjCCBBagAwIBAgIUSNx7E+uCPG6hqtUGUdmK6AYhNb4wDQYJKoZIhvcNAQEL
-BQAwTTELMAkGA1UEBhMCQk0xGTAXBgNVBAoTEFF1b1ZhZGlzIExpbWl0ZWQxIzAh
-BgNVBAMTGlF1b1ZhZGlzIEdsb2JhbCBTU0wgSUNBIEcyMB4XDTE0MDQxMTA3MzIx
-M1oXDTE2MDQxMTA3MzIxMVowgb8xEzARBgsrBgEEAYI3PAIBAxMCQ0gxFTATBgsr
-BgEEAYI3PAIBAhMEQmVybjEaMBgGA1UEDxMRR292ZXJubWVudCBFbnRpdHkxEzAR
-BgNVBAUTCjE4MzQtMDMtMTQxCzAJBgNVBAYTAkNIMQ0wCwYDVQQIEwRCZXJuMQ0w
-CwYDVQQHEwRCZXJuMRowGAYDVQQKExFVbml2ZXJzaXRhZXQgQmVybjEZMBcGA1UE
-AxMQYWFpLWlkcC51bmliZS5jaDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
-ggEBAOIKnhNcUtzjdGnBWU5sJGuwQyrGH8PnKmW8SOmKMeArDjc3CNwz20NzSRWL
-fkyG5Ti098dGE5skUwjGoexhqQsECn4CtlosHmQNx6DWvY5lHIzPuZEEkQssYYtN
-jIOfCy6COhce3hi80+pFDHvFYUjWmW+IMeCky60qBZlcM2HiXhh4v/Dlmt/5FgGP
-rQwZUXT5uFCICvcAVpe5NL/bjJQs69yrLu/fEfgdwLeqxYqeol+yZxJZp77mElFB
-wur4fNR1798DsiBPRT4v8Ak73YN4sxwb0ZIvGa8QI/zgrkniRjeAjrP36WmRyoxg
-vZI5ZvkkVTp8uwZuf3/RPn/4mu8CAwEAAaOCAZEwggGNMHMGCCsGAQUFBwEBBGcw
-ZTAqBggrBgEFBQcwAYYeaHR0cDovL29jc3AucXVvdmFkaXNnbG9iYWwuY29tMDcG
-CCsGAQUFBzAChitodHRwOi8vdHJ1c3QucXVvdmFkaXNnbG9iYWwuY29tL3F2c3Ns
-ZzIuY3J0MFEGA1UdIARKMEgwRgYMKwYBBAG+WAACZAECMDYwNAYIKwYBBQUHAgEW
-KGh0dHA6Ly93d3cucXVvdmFkaXNnbG9iYWwuY29tL3JlcG9zaXRvcnkwGwYDVR0R
-BBQwEoIQYWFpLWlkcC51bmliZS5jaDALBgNVHQ8EBAMCBaAwHQYDVR0lBBYwFAYI
-KwYBBQUHAwEGCCsGAQUFBwMCMB8GA1UdIwQYMBaAFJEZYq1bF6cw+/DeOSWxvYy5
-uFEnMDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwucXVvdmFkaXNnbG9iYWwu
-Y29tL3F2c3NsZzIuY3JsMB0GA1UdDgQWBBSCX8oNHGUSht4v58mKWfgqQaG+pTAN
-BgkqhkiG9w0BAQsFAAOCAQEAr+tBEvztLUq6sDzB/I4N4reJiWs+HXM3Nt5zPwBG
-4QmH2X/P0EfIKCKFrcAiBDYK0BBTK5LM78uZoF/rC/eRNJdFqcUxO7V2I2EOr0/g
-dBmV88orKTsK3HJ/BOxy4KGdKeDAMYli35w99xjEfRu+XbGrn8jvDWL4Z93/zbmw
-fOl8C+fbd9vbPPGMbPBYCLuj+JLIjNJVMOFZUCV3qOHPf+llHS+epzBl47oTNWsh
-Fo1fKj/jbU9y/7hE+8uhbqzr8uppWJYcLUpX49pe+YGzfaq0gjMlMh8/Pzc4DXQ7
-W2X26PAcxR9Ni6k2VcPdwrF+wSz0jKwCrJzugJ1Z99ABWA==
-						</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://aai-idp.unibe.ch:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aai-idp.unibe.ch: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-idp.unibe.ch/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://aai-idp.unibe.ch/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://aai-idp.unibe.ch/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://aai-idp.unibe.ch/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
-    <Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unibe.ch</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIFTjCCBDagAwIBAgIUaEj3cUMMoHFpXcehDx5GzSFg6OcwDQYJKoZIhvcNAQEF
-BQAwazELMAkGA1UEBhMCQk0xGTAXBgNVBAoTEFF1b1ZhZGlzIExpbWl0ZWQxHzAd
-BgNVBAsTFnd3dy5xdW92YWRpc2dsb2JhbC5jb20xIDAeBgNVBAMTF1F1b1ZhZGlz
-IEdsb2JhbCBTU0wgSUNBMB4XDTEyMTEwMjA3MjczOFoXDTE0MTEwMjA3MjczOFow
-gb8xEzARBgsrBgEEAYI3PAIBAxMCQ0gxFTATBgsrBgEEAYI3PAIBAhMEQmVybjEa
-MBgGA1UEDxMRR292ZXJubWVudCBFbnRpdHkxEzARBgNVBAUTCjE4MzQtMDMtMTQx
-CzAJBgNVBAYTAkNIMQ0wCwYDVQQIEwRCZXJuMQ0wCwYDVQQHEwRCZXJuMRowGAYD
-VQQKExFVbml2ZXJzaXRhZXQgQmVybjEZMBcGA1UEAxMQYWFpLWlkcC51bmliZS5j
-aDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANjwYYDyz1KQK/RrlHj/
-TIMkmIp1rwlv7KpDa4d8QpHTsBW831PiNI7iYQltZzxC3t8k2sJ8qDX5+uTWXJIA
-C6v60ZxWkWWLf1qkk/cznwvLkEdo1698J4vc6cx91OUX2rq/Q/zjdndXmTGgyfxw
-pAqb2uKBNbG2RoxEdyP1F8Yi3165/8LubrDKXtP9+fdKqQkxv/sZH6NrUWRrJiUd
-+0KhG1LOada7F8DRKQOFtUAJ78di3wmZyJfOXye4yenCfYsWbfrUcuCJDSIqrdFQ
-VVj5AUr3hdKEAJafc22LTDDsdSuKpcv+n2/C/oH8Mdsxg7we6r/dJz4x7vM7GHhn
-pK0CAwEAAaOCAZMwggGPMHQGCCsGAQUFBwEBBGgwZjAqBggrBgEFBQcwAYYeaHR0
-cDovL29jc3AucXVvdmFkaXNnbG9iYWwuY29tMDgGCCsGAQUFBzAChixodHRwOi8v
-dHJ1c3QucXVvdmFkaXNnbG9iYWwuY29tL3F2c3NsaWNhLmNydDBRBgNVHSAESjBI
-MEYGDCsGAQQBvlgAAmQBAjA2MDQGCCsGAQUFBwIBFihodHRwOi8vd3d3LnF1b3Zh
-ZGlzZ2xvYmFsLmNvbS9yZXBvc2l0b3J5MBsGA1UdEQQUMBKCEGFhaS1pZHAudW5p
-YmUuY2gwCwYDVR0PBAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcD
-AjAfBgNVHSMEGDAWgBQyTaFP6vCumbbumwcshAgRUIvifjA7BgNVHR8ENDAyMDCg
-LqAshipodHRwOi8vY3JsLnF1b3ZhZGlzZ2xvYmFsLmNvbS9xdnNzbGljYS5jcmww
-HQYDVR0OBBYEFGm9MS6ojsIWTq+Y8EG534cfO6y4MA0GCSqGSIb3DQEBBQUAA4IB
-AQBx06TLIvS40KeCMCgDJ8MdrDlxt//3F9cyWBsXJkJLdtVD6xTBQ6+lwg9RG+ct
-RO9eZpURgeHEkcy7YkNgq0XukoKl1on7P1tJoLa6fOBq/4XU5EiAeQBeohFOohYO
-qr5PxmgEp98c7clKulvmuJBX/MSqKCHQEVx0fqsiZ7/TUdRinlLNQKVxGMrgm+KG
-zN6anM+WgtbqG+Ed4XaekXpO2EMDnle0SM8vcJ+dUgIEa0+t+fEPCAnN0vD6b910
-uzs7quvneAVGiAeqoZLZ5k62+3qldV40gI41gHflX4mIWMD+TPCFG5ue64N0nLzU
-LxDK1XTR2ZqXgnziFQWnbI54
-						</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>
-MIIFLjCCBBagAwIBAgIUSNx7E+uCPG6hqtUGUdmK6AYhNb4wDQYJKoZIhvcNAQEL
-BQAwTTELMAkGA1UEBhMCQk0xGTAXBgNVBAoTEFF1b1ZhZGlzIExpbWl0ZWQxIzAh
-BgNVBAMTGlF1b1ZhZGlzIEdsb2JhbCBTU0wgSUNBIEcyMB4XDTE0MDQxMTA3MzIx
-M1oXDTE2MDQxMTA3MzIxMVowgb8xEzARBgsrBgEEAYI3PAIBAxMCQ0gxFTATBgsr
-BgEEAYI3PAIBAhMEQmVybjEaMBgGA1UEDxMRR292ZXJubWVudCBFbnRpdHkxEzAR
-BgNVBAUTCjE4MzQtMDMtMTQxCzAJBgNVBAYTAkNIMQ0wCwYDVQQIEwRCZXJuMQ0w
-CwYDVQQHEwRCZXJuMRowGAYDVQQKExFVbml2ZXJzaXRhZXQgQmVybjEZMBcGA1UE
-AxMQYWFpLWlkcC51bmliZS5jaDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
-ggEBAOIKnhNcUtzjdGnBWU5sJGuwQyrGH8PnKmW8SOmKMeArDjc3CNwz20NzSRWL
-fkyG5Ti098dGE5skUwjGoexhqQsECn4CtlosHmQNx6DWvY5lHIzPuZEEkQssYYtN
-jIOfCy6COhce3hi80+pFDHvFYUjWmW+IMeCky60qBZlcM2HiXhh4v/Dlmt/5FgGP
-rQwZUXT5uFCICvcAVpe5NL/bjJQs69yrLu/fEfgdwLeqxYqeol+yZxJZp77mElFB
-wur4fNR1798DsiBPRT4v8Ak73YN4sxwb0ZIvGa8QI/zgrkniRjeAjrP36WmRyoxg
-vZI5ZvkkVTp8uwZuf3/RPn/4mu8CAwEAAaOCAZEwggGNMHMGCCsGAQUFBwEBBGcw
-ZTAqBggrBgEFBQcwAYYeaHR0cDovL29jc3AucXVvdmFkaXNnbG9iYWwuY29tMDcG
-CCsGAQUFBzAChitodHRwOi8vdHJ1c3QucXVvdmFkaXNnbG9iYWwuY29tL3F2c3Ns
-ZzIuY3J0MFEGA1UdIARKMEgwRgYMKwYBBAG+WAACZAECMDYwNAYIKwYBBQUHAgEW
-KGh0dHA6Ly93d3cucXVvdmFkaXNnbG9iYWwuY29tL3JlcG9zaXRvcnkwGwYDVR0R
-BBQwEoIQYWFpLWlkcC51bmliZS5jaDALBgNVHQ8EBAMCBaAwHQYDVR0lBBYwFAYI
-KwYBBQUHAwEGCCsGAQUFBwMCMB8GA1UdIwQYMBaAFJEZYq1bF6cw+/DeOSWxvYy5
-uFEnMDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwucXVvdmFkaXNnbG9iYWwu
-Y29tL3F2c3NsZzIuY3JsMB0GA1UdDgQWBBSCX8oNHGUSht4v58mKWfgqQaG+pTAN
-BgkqhkiG9w0BAQsFAAOCAQEAr+tBEvztLUq6sDzB/I4N4reJiWs+HXM3Nt5zPwBG
-4QmH2X/P0EfIKCKFrcAiBDYK0BBTK5LM78uZoF/rC/eRNJdFqcUxO7V2I2EOr0/g
-dBmV88orKTsK3HJ/BOxy4KGdKeDAMYli35w99xjEfRu+XbGrn8jvDWL4Z93/zbmw
-fOl8C+fbd9vbPPGMbPBYCLuj+JLIjNJVMOFZUCV3qOHPf+llHS+epzBl47oTNWsh
-Fo1fKj/jbU9y/7hE+8uhbqzr8uppWJYcLUpX49pe+YGzfaq0gjMlMh8/Pzc4DXQ7
-W2X26PAcxR9Ni6k2VcPdwrF+wSz0jKwCrJzugJ1Z99ABWA==
-						</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://aai-idp.unibe.ch:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aai-idp.unibe.ch:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">unibe.ch</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">Universität Bern</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">University of Bern</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.unibe.ch/</OrganizationURL>
-    <OrganizationURL xml:lang="en">http://www.unibe.ch/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Campus</GivenName>
-    <SurName>Admins</SurName>
-    <EmailAddress>mailto:admins@campus.unibe.ch</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Campus</GivenName>
-    <SurName>Admins</SurName>
-    <EmailAddress>mailto:admins@campus.unibe.ch</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/aai-idp.unibe.ch.xml b/swamid-interfederations-2.0/aai-idp.unibe.ch.xml
deleted file mode 100644
index ea2cb100..00000000
--- a/swamid-interfederations-2.0/aai-idp.unibe.ch.xml
+++ /dev/null
@@ -1,222 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://aai-idp.unibe.ch/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://rr.aai.switch.ch/" registrationInstant="2014-04-11T08:10:51Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.switch.ch/aai/federation/switchaai/metadata-registration-practice-statement-20110711.txt</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-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </Extensions>
-  <IDPSSODescriptor errorURL="http://www.id.unibe.ch/content/helpdesk" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-    <Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unibe.ch</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="de">Universität Bern</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">University of Bern</mdui:DisplayName>
-        <mdui:Description xml:lang="de">Universität Bern</mdui:Description>
-        <mdui:Description xml:lang="en">University of Bern</mdui:Description>
-        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAACF0RVh0U29mdHdhcmUAR3JhcGhpY0NvbnZlcnRlciAoSW50ZWwpd4f6GQAAAeVJREFUeJyUkr9LQlEUx58u6p8gOLq5CeKkq+gkooMi6CCCILi4ujyMokhLkSIJdDKMUmxoShOHkFwEHdR0CULQ5+Dv3yfPhSsVGTncx7vfe87nnPs9lwEA5r9rvV4zFosFqtXqA9X+nYxrPB6farVayGQy9W63e7k3gOO4C4VCAV6vF8xmM4xGo8BegFKp9OR0Oje/wJpMJqjVavd7ARKJxIfP54N6vX6n0+mg1+tFGGxjMpmcrFarg9lsdrxYLA6/JqG+XC6JlkqlmkajEbCLXC73Sjzw+/3gcrlApVKBUqmEZrOZpMlYTa1WQyAQAArr9/vn8/n8aDuFwWBwjhBm46dEIgF0mjqOe9RDodBq17Xww9psNhKIM6YH5XL5kc/nA4/HAzRvJ2DTDiOTyQggGAxuAdFodEC7Gg6HZzsBrVbrRiAQEECxWHymBw6Hg2h6vR52JRNAOp1++1lpOp2eSKVSAmBZlgBwZHQa3wDoNAYaDIZtpXg8zqGG989ms6+Y7Ha7twZ/A2AiBmMAvoF8Pl+02+1EEwqFZKwejweSyeT7r1eIRCJzkUgEYrEYrFYrhMPhZbvdvpbL5YDeaDQaiMVi3F9jZCqVygO+rEajcUsPOp3OVaFQeEGT/zLxEwAA//8DAH2UumiGm7jIAAAAAElFTkSuQmCC</mdui:Logo>
-        <mdui:Logo height="60" width="80">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFAAAAA8CAIAAAB+RarbAAAC0GlDQ1BJQ0NQcm9maWxlAAB4nI2Uz0sUYRjHv7ONGChBYGZ7iKFDSKhMFmVE5a6/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+hkAAAZRSURBVHic7Jp9TFNXGMaJMYpTg4tBF2OMATGYhYWZCUTEzSj+Y2Q47DLUyWAJKhsi39kQEIHJhLCBjgxxGwgCg/GhCOL4UNSKEw0MHBXHN8jnBAUc0MJz9pZbSiHGLN5LK5UnTXN73nNvnt8957znbW912GsmHf6XiI2NXb169dDQEP9LqUECAPv5+VlYWPC/jnokALBIJHJwcOB/HfVIAGBLS0tbW1tHR0dPT8/u7m7+F5xW8QUeHBw0MDAwMzMLDAyklWxnZwdAEGfTJL7Ara2tS5YsEYvFdJyTk7N48eKOjg4hjE2X+AKXlZURcFNTEx3funVr0aJFjY2NQhibLvEFTktLW7VqlVQqpePg4GBDQ0Oa5EIYmy7xBQ4NDV23bp1EIomOjqb5HB8fL4it6RNf4LCwsDVr1piYmGzZsiUjI0MQT9MqBXBqaqqXl5ePjw8l22PHjnl4eDg7O09Zjbm5uQEBARSlPs3NzVyjTCbrG5O6jb+sFMCnTp0KCgry9/dfuHChzphofnZ2dir70WZD+y0XmjdvnhJ4xmnSlKaygVIuR7Vt2zbVEMHr6+tzISokR0dH1etTME0CzsvL0xkXVciqoaKiImXI1dVVvSaF1CRg2leUVLRiVUOUjZWh5ORk9ZoUUpOAbWxsOCQ9Pb2WlhbV0I4dO7jQ/Pnzq6ur1WtSSE0ADwwMUNnAUZmbm4+MjChDT548WblyJRcyNjZ+xUuLF2sCuKqqitLvc1dpaWnpnDlzuJC9vb3aTQqpCeCkpCTlKk1JSVHtFBkZqQxFRUWp3aSQmgB2c3PjkBYsWFBTU6Paafv27VyIxpm+IXCNtbW1/f39ajUrhBTAVFdYWVlxVFQbq/5AVVFRQbeAC61YseLx48fU2NvbS93u3bunGdc8pADu6ekhGI5KJBIpw5S6du7cqZzP1tbWXLu3tzcNu2pimylSANMc1tXV5agIhmukCtnFxYWm+tKlS7mQr68vtefn5y9btuz+/fsac81DCuCuri5l5WhkZJSYmBgTE0MlZHh4OA3j2rVruRCNakREBG1R6enpmvX90ppIWnFxccuXL+fA5s6du3nz5oKCAi6UkJCgrLFNTU0LCws15FYATaq02traSkpKiouLKQNP6VdXV0ft5eXl9H1QjfaElwA/084szQJru2aBtV2zwNquWWBt1yywtmsWWNulAM7Qdk0FjtZ2TQV+faQAlkqlAwMDmrWiHimAJRJJVFTU8PCwZt2oQQpgsVjs7u4+5YGDVkoBnJmZGRISkp2drVk3apACuKOjo7KycuY+1///en6WhspLtZFNbnnuWVP64FEXqv5m7d0vPldtGgeuaWLXy1HXitJKNLUj+TLa/0FxGevtQ+5N1Lawgtvs2SByrqOxHXFZ+OUiep6yCyXsTDqrqGHDMpy/jNgMDA4hT4wHDeznC4hNR00jrt2FpSPEFZDUy1vOZrNeTT6CGwc+k8X2ByLlCg6dwKUb0DFBwI/45Cv2Vz02fIo/H2KTE9IK8LEvu1IKQxscP4uuHph/Bmtn7PbBjXK8+QGiU+XAFg64WobDJ7FhL6N7R+RvbUViLhoeYZMjvghj/c9eAeD4HGbvh7hMMoQL12DtAsMPYefNquvx3j6MjkLki3f3IKuYhh1v2+GHNDztx0YnvLMb/jGs7xm9w/gj+TBu+pzmMFLysddPPsk3OsJsn7yRjg+EIilPg7RsArixDTZHYH0IhX/g91JEpcDzOxz6Bg2t2HeU4mQUZvvRN8BuV2HrARwOR30rvvwW2dfk75IGOAfDxh2POuEUxB42yacJ3Qjqs+drlNzFLm80tyP0J3axRJO4k5KWVEarVH4wCvmLJBthAFM+Ex0Zy+HUMiRlA/8ySulcSCaTh3r7xj+OnUVXGBnrwP19mutM75reCF7XWpqV1+BgCDwjWVsXTqfhyAn8VoTaZhwIhnsEuNxz8hwoY+Xe1KhhvhoHziiWpxyjXexmBWw9IfKglcyK7sB4F0ztQQcHQ6H3vjyNhSdo1DBfjf/HI+sqrJzke0/2VdqNcPC4fEOm3WW9PWVp9qARbuHyHUvXAqd/1axjnhof4UvX8cYGGNjId8vdvtC3YF7fo/gOHINwNAbh55jrSeTewPq9LPK8Rg3z1WuXtP4DAAD//wMAnPfzPGW0I0UAAAAASUVORK5CYII=</mdui:Logo>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:IPHint>195.176.0.128/28</mdui:IPHint>
-        <mdui:IPHint>195.176.3.0/26</mdui:IPHint>
-        <mdui:IPHint>195.176.3.128/28</mdui:IPHint>
-        <mdui:IPHint>192.41.149.0/24</mdui:IPHint>
-        <mdui:IPHint>192.41.152.0/21</mdui:IPHint>
-        <mdui:IPHint>192.41.160.0/24</mdui:IPHint>
-        <mdui:IPHint>2001:620:400::/48</mdui:IPHint>
-        <mdui:IPHint>86.118.0.0/15</mdui:IPHint>
-        <mdui:IPHint>86.118.149.0/26</mdui:IPHint>
-        <mdui:IPHint>130.92.0.0/16</mdui:IPHint>
-        <mdui:DomainHint>unibe.ch</mdui:DomainHint>
-        <mdui:GeolocationHint>geo:46.950509,7.438155</mdui:GeolocationHint>
-      </mdui:DiscoHints>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIFTjCCBDagAwIBAgIUaEj3cUMMoHFpXcehDx5GzSFg6OcwDQYJKoZIhvcNAQEF
-BQAwazELMAkGA1UEBhMCQk0xGTAXBgNVBAoTEFF1b1ZhZGlzIExpbWl0ZWQxHzAd
-BgNVBAsTFnd3dy5xdW92YWRpc2dsb2JhbC5jb20xIDAeBgNVBAMTF1F1b1ZhZGlz
-IEdsb2JhbCBTU0wgSUNBMB4XDTEyMTEwMjA3MjczOFoXDTE0MTEwMjA3MjczOFow
-gb8xEzARBgsrBgEEAYI3PAIBAxMCQ0gxFTATBgsrBgEEAYI3PAIBAhMEQmVybjEa
-MBgGA1UEDxMRR292ZXJubWVudCBFbnRpdHkxEzARBgNVBAUTCjE4MzQtMDMtMTQx
-CzAJBgNVBAYTAkNIMQ0wCwYDVQQIEwRCZXJuMQ0wCwYDVQQHEwRCZXJuMRowGAYD
-VQQKExFVbml2ZXJzaXRhZXQgQmVybjEZMBcGA1UEAxMQYWFpLWlkcC51bmliZS5j
-aDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANjwYYDyz1KQK/RrlHj/
-TIMkmIp1rwlv7KpDa4d8QpHTsBW831PiNI7iYQltZzxC3t8k2sJ8qDX5+uTWXJIA
-C6v60ZxWkWWLf1qkk/cznwvLkEdo1698J4vc6cx91OUX2rq/Q/zjdndXmTGgyfxw
-pAqb2uKBNbG2RoxEdyP1F8Yi3165/8LubrDKXtP9+fdKqQkxv/sZH6NrUWRrJiUd
-+0KhG1LOada7F8DRKQOFtUAJ78di3wmZyJfOXye4yenCfYsWbfrUcuCJDSIqrdFQ
-VVj5AUr3hdKEAJafc22LTDDsdSuKpcv+n2/C/oH8Mdsxg7we6r/dJz4x7vM7GHhn
-pK0CAwEAAaOCAZMwggGPMHQGCCsGAQUFBwEBBGgwZjAqBggrBgEFBQcwAYYeaHR0
-cDovL29jc3AucXVvdmFkaXNnbG9iYWwuY29tMDgGCCsGAQUFBzAChixodHRwOi8v
-dHJ1c3QucXVvdmFkaXNnbG9iYWwuY29tL3F2c3NsaWNhLmNydDBRBgNVHSAESjBI
-MEYGDCsGAQQBvlgAAmQBAjA2MDQGCCsGAQUFBwIBFihodHRwOi8vd3d3LnF1b3Zh
-ZGlzZ2xvYmFsLmNvbS9yZXBvc2l0b3J5MBsGA1UdEQQUMBKCEGFhaS1pZHAudW5p
-YmUuY2gwCwYDVR0PBAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcD
-AjAfBgNVHSMEGDAWgBQyTaFP6vCumbbumwcshAgRUIvifjA7BgNVHR8ENDAyMDCg
-LqAshipodHRwOi8vY3JsLnF1b3ZhZGlzZ2xvYmFsLmNvbS9xdnNzbGljYS5jcmww
-HQYDVR0OBBYEFGm9MS6ojsIWTq+Y8EG534cfO6y4MA0GCSqGSIb3DQEBBQUAA4IB
-AQBx06TLIvS40KeCMCgDJ8MdrDlxt//3F9cyWBsXJkJLdtVD6xTBQ6+lwg9RG+ct
-RO9eZpURgeHEkcy7YkNgq0XukoKl1on7P1tJoLa6fOBq/4XU5EiAeQBeohFOohYO
-qr5PxmgEp98c7clKulvmuJBX/MSqKCHQEVx0fqsiZ7/TUdRinlLNQKVxGMrgm+KG
-zN6anM+WgtbqG+Ed4XaekXpO2EMDnle0SM8vcJ+dUgIEa0+t+fEPCAnN0vD6b910
-uzs7quvneAVGiAeqoZLZ5k62+3qldV40gI41gHflX4mIWMD+TPCFG5ue64N0nLzU
-LxDK1XTR2ZqXgnziFQWnbI54
-						</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>
-MIIFLjCCBBagAwIBAgIUSNx7E+uCPG6hqtUGUdmK6AYhNb4wDQYJKoZIhvcNAQEL
-BQAwTTELMAkGA1UEBhMCQk0xGTAXBgNVBAoTEFF1b1ZhZGlzIExpbWl0ZWQxIzAh
-BgNVBAMTGlF1b1ZhZGlzIEdsb2JhbCBTU0wgSUNBIEcyMB4XDTE0MDQxMTA3MzIx
-M1oXDTE2MDQxMTA3MzIxMVowgb8xEzARBgsrBgEEAYI3PAIBAxMCQ0gxFTATBgsr
-BgEEAYI3PAIBAhMEQmVybjEaMBgGA1UEDxMRR292ZXJubWVudCBFbnRpdHkxEzAR
-BgNVBAUTCjE4MzQtMDMtMTQxCzAJBgNVBAYTAkNIMQ0wCwYDVQQIEwRCZXJuMQ0w
-CwYDVQQHEwRCZXJuMRowGAYDVQQKExFVbml2ZXJzaXRhZXQgQmVybjEZMBcGA1UE
-AxMQYWFpLWlkcC51bmliZS5jaDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
-ggEBAOIKnhNcUtzjdGnBWU5sJGuwQyrGH8PnKmW8SOmKMeArDjc3CNwz20NzSRWL
-fkyG5Ti098dGE5skUwjGoexhqQsECn4CtlosHmQNx6DWvY5lHIzPuZEEkQssYYtN
-jIOfCy6COhce3hi80+pFDHvFYUjWmW+IMeCky60qBZlcM2HiXhh4v/Dlmt/5FgGP
-rQwZUXT5uFCICvcAVpe5NL/bjJQs69yrLu/fEfgdwLeqxYqeol+yZxJZp77mElFB
-wur4fNR1798DsiBPRT4v8Ak73YN4sxwb0ZIvGa8QI/zgrkniRjeAjrP36WmRyoxg
-vZI5ZvkkVTp8uwZuf3/RPn/4mu8CAwEAAaOCAZEwggGNMHMGCCsGAQUFBwEBBGcw
-ZTAqBggrBgEFBQcwAYYeaHR0cDovL29jc3AucXVvdmFkaXNnbG9iYWwuY29tMDcG
-CCsGAQUFBzAChitodHRwOi8vdHJ1c3QucXVvdmFkaXNnbG9iYWwuY29tL3F2c3Ns
-ZzIuY3J0MFEGA1UdIARKMEgwRgYMKwYBBAG+WAACZAECMDYwNAYIKwYBBQUHAgEW
-KGh0dHA6Ly93d3cucXVvdmFkaXNnbG9iYWwuY29tL3JlcG9zaXRvcnkwGwYDVR0R
-BBQwEoIQYWFpLWlkcC51bmliZS5jaDALBgNVHQ8EBAMCBaAwHQYDVR0lBBYwFAYI
-KwYBBQUHAwEGCCsGAQUFBwMCMB8GA1UdIwQYMBaAFJEZYq1bF6cw+/DeOSWxvYy5
-uFEnMDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwucXVvdmFkaXNnbG9iYWwu
-Y29tL3F2c3NsZzIuY3JsMB0GA1UdDgQWBBSCX8oNHGUSht4v58mKWfgqQaG+pTAN
-BgkqhkiG9w0BAQsFAAOCAQEAr+tBEvztLUq6sDzB/I4N4reJiWs+HXM3Nt5zPwBG
-4QmH2X/P0EfIKCKFrcAiBDYK0BBTK5LM78uZoF/rC/eRNJdFqcUxO7V2I2EOr0/g
-dBmV88orKTsK3HJ/BOxy4KGdKeDAMYli35w99xjEfRu+XbGrn8jvDWL4Z93/zbmw
-fOl8C+fbd9vbPPGMbPBYCLuj+JLIjNJVMOFZUCV3qOHPf+llHS+epzBl47oTNWsh
-Fo1fKj/jbU9y/7hE+8uhbqzr8uppWJYcLUpX49pe+YGzfaq0gjMlMh8/Pzc4DXQ7
-W2X26PAcxR9Ni6k2VcPdwrF+wSz0jKwCrJzugJ1Z99ABWA==
-						</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://aai-idp.unibe.ch:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aai-idp.unibe.ch: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-idp.unibe.ch/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://aai-idp.unibe.ch/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://aai-idp.unibe.ch/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://aai-idp.unibe.ch/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
-    <Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unibe.ch</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIFTjCCBDagAwIBAgIUaEj3cUMMoHFpXcehDx5GzSFg6OcwDQYJKoZIhvcNAQEF
-BQAwazELMAkGA1UEBhMCQk0xGTAXBgNVBAoTEFF1b1ZhZGlzIExpbWl0ZWQxHzAd
-BgNVBAsTFnd3dy5xdW92YWRpc2dsb2JhbC5jb20xIDAeBgNVBAMTF1F1b1ZhZGlz
-IEdsb2JhbCBTU0wgSUNBMB4XDTEyMTEwMjA3MjczOFoXDTE0MTEwMjA3MjczOFow
-gb8xEzARBgsrBgEEAYI3PAIBAxMCQ0gxFTATBgsrBgEEAYI3PAIBAhMEQmVybjEa
-MBgGA1UEDxMRR292ZXJubWVudCBFbnRpdHkxEzARBgNVBAUTCjE4MzQtMDMtMTQx
-CzAJBgNVBAYTAkNIMQ0wCwYDVQQIEwRCZXJuMQ0wCwYDVQQHEwRCZXJuMRowGAYD
-VQQKExFVbml2ZXJzaXRhZXQgQmVybjEZMBcGA1UEAxMQYWFpLWlkcC51bmliZS5j
-aDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANjwYYDyz1KQK/RrlHj/
-TIMkmIp1rwlv7KpDa4d8QpHTsBW831PiNI7iYQltZzxC3t8k2sJ8qDX5+uTWXJIA
-C6v60ZxWkWWLf1qkk/cznwvLkEdo1698J4vc6cx91OUX2rq/Q/zjdndXmTGgyfxw
-pAqb2uKBNbG2RoxEdyP1F8Yi3165/8LubrDKXtP9+fdKqQkxv/sZH6NrUWRrJiUd
-+0KhG1LOada7F8DRKQOFtUAJ78di3wmZyJfOXye4yenCfYsWbfrUcuCJDSIqrdFQ
-VVj5AUr3hdKEAJafc22LTDDsdSuKpcv+n2/C/oH8Mdsxg7we6r/dJz4x7vM7GHhn
-pK0CAwEAAaOCAZMwggGPMHQGCCsGAQUFBwEBBGgwZjAqBggrBgEFBQcwAYYeaHR0
-cDovL29jc3AucXVvdmFkaXNnbG9iYWwuY29tMDgGCCsGAQUFBzAChixodHRwOi8v
-dHJ1c3QucXVvdmFkaXNnbG9iYWwuY29tL3F2c3NsaWNhLmNydDBRBgNVHSAESjBI
-MEYGDCsGAQQBvlgAAmQBAjA2MDQGCCsGAQUFBwIBFihodHRwOi8vd3d3LnF1b3Zh
-ZGlzZ2xvYmFsLmNvbS9yZXBvc2l0b3J5MBsGA1UdEQQUMBKCEGFhaS1pZHAudW5p
-YmUuY2gwCwYDVR0PBAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcD
-AjAfBgNVHSMEGDAWgBQyTaFP6vCumbbumwcshAgRUIvifjA7BgNVHR8ENDAyMDCg
-LqAshipodHRwOi8vY3JsLnF1b3ZhZGlzZ2xvYmFsLmNvbS9xdnNzbGljYS5jcmww
-HQYDVR0OBBYEFGm9MS6ojsIWTq+Y8EG534cfO6y4MA0GCSqGSIb3DQEBBQUAA4IB
-AQBx06TLIvS40KeCMCgDJ8MdrDlxt//3F9cyWBsXJkJLdtVD6xTBQ6+lwg9RG+ct
-RO9eZpURgeHEkcy7YkNgq0XukoKl1on7P1tJoLa6fOBq/4XU5EiAeQBeohFOohYO
-qr5PxmgEp98c7clKulvmuJBX/MSqKCHQEVx0fqsiZ7/TUdRinlLNQKVxGMrgm+KG
-zN6anM+WgtbqG+Ed4XaekXpO2EMDnle0SM8vcJ+dUgIEa0+t+fEPCAnN0vD6b910
-uzs7quvneAVGiAeqoZLZ5k62+3qldV40gI41gHflX4mIWMD+TPCFG5ue64N0nLzU
-LxDK1XTR2ZqXgnziFQWnbI54
-						</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>
-MIIFLjCCBBagAwIBAgIUSNx7E+uCPG6hqtUGUdmK6AYhNb4wDQYJKoZIhvcNAQEL
-BQAwTTELMAkGA1UEBhMCQk0xGTAXBgNVBAoTEFF1b1ZhZGlzIExpbWl0ZWQxIzAh
-BgNVBAMTGlF1b1ZhZGlzIEdsb2JhbCBTU0wgSUNBIEcyMB4XDTE0MDQxMTA3MzIx
-M1oXDTE2MDQxMTA3MzIxMVowgb8xEzARBgsrBgEEAYI3PAIBAxMCQ0gxFTATBgsr
-BgEEAYI3PAIBAhMEQmVybjEaMBgGA1UEDxMRR292ZXJubWVudCBFbnRpdHkxEzAR
-BgNVBAUTCjE4MzQtMDMtMTQxCzAJBgNVBAYTAkNIMQ0wCwYDVQQIEwRCZXJuMQ0w
-CwYDVQQHEwRCZXJuMRowGAYDVQQKExFVbml2ZXJzaXRhZXQgQmVybjEZMBcGA1UE
-AxMQYWFpLWlkcC51bmliZS5jaDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
-ggEBAOIKnhNcUtzjdGnBWU5sJGuwQyrGH8PnKmW8SOmKMeArDjc3CNwz20NzSRWL
-fkyG5Ti098dGE5skUwjGoexhqQsECn4CtlosHmQNx6DWvY5lHIzPuZEEkQssYYtN
-jIOfCy6COhce3hi80+pFDHvFYUjWmW+IMeCky60qBZlcM2HiXhh4v/Dlmt/5FgGP
-rQwZUXT5uFCICvcAVpe5NL/bjJQs69yrLu/fEfgdwLeqxYqeol+yZxJZp77mElFB
-wur4fNR1798DsiBPRT4v8Ak73YN4sxwb0ZIvGa8QI/zgrkniRjeAjrP36WmRyoxg
-vZI5ZvkkVTp8uwZuf3/RPn/4mu8CAwEAAaOCAZEwggGNMHMGCCsGAQUFBwEBBGcw
-ZTAqBggrBgEFBQcwAYYeaHR0cDovL29jc3AucXVvdmFkaXNnbG9iYWwuY29tMDcG
-CCsGAQUFBzAChitodHRwOi8vdHJ1c3QucXVvdmFkaXNnbG9iYWwuY29tL3F2c3Ns
-ZzIuY3J0MFEGA1UdIARKMEgwRgYMKwYBBAG+WAACZAECMDYwNAYIKwYBBQUHAgEW
-KGh0dHA6Ly93d3cucXVvdmFkaXNnbG9iYWwuY29tL3JlcG9zaXRvcnkwGwYDVR0R
-BBQwEoIQYWFpLWlkcC51bmliZS5jaDALBgNVHQ8EBAMCBaAwHQYDVR0lBBYwFAYI
-KwYBBQUHAwEGCCsGAQUFBwMCMB8GA1UdIwQYMBaAFJEZYq1bF6cw+/DeOSWxvYy5
-uFEnMDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwucXVvdmFkaXNnbG9iYWwu
-Y29tL3F2c3NsZzIuY3JsMB0GA1UdDgQWBBSCX8oNHGUSht4v58mKWfgqQaG+pTAN
-BgkqhkiG9w0BAQsFAAOCAQEAr+tBEvztLUq6sDzB/I4N4reJiWs+HXM3Nt5zPwBG
-4QmH2X/P0EfIKCKFrcAiBDYK0BBTK5LM78uZoF/rC/eRNJdFqcUxO7V2I2EOr0/g
-dBmV88orKTsK3HJ/BOxy4KGdKeDAMYli35w99xjEfRu+XbGrn8jvDWL4Z93/zbmw
-fOl8C+fbd9vbPPGMbPBYCLuj+JLIjNJVMOFZUCV3qOHPf+llHS+epzBl47oTNWsh
-Fo1fKj/jbU9y/7hE+8uhbqzr8uppWJYcLUpX49pe+YGzfaq0gjMlMh8/Pzc4DXQ7
-W2X26PAcxR9Ni6k2VcPdwrF+wSz0jKwCrJzugJ1Z99ABWA==
-						</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://aai-idp.unibe.ch:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aai-idp.unibe.ch:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">unibe.ch</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">Universität Bern</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">University of Bern</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.unibe.ch/</OrganizationURL>
-    <OrganizationURL xml:lang="en">http://www.unibe.ch/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Campus</GivenName>
-    <SurName>Admins</SurName>
-    <EmailAddress>mailto:admins@campus.unibe.ch</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Campus</GivenName>
-    <SurName>Admins</SurName>
-    <EmailAddress>mailto:admins@campus.unibe.ch</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/aai-idp.uzh.ch-idp-shibboleth.xml b/swamid-interfederations-2.0/aai-idp.uzh.ch-idp-shibboleth.xml
deleted file mode 100644
index 9933e3bc..00000000
--- a/swamid-interfederations-2.0/aai-idp.uzh.ch-idp-shibboleth.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://aai-idp.uzh.ch/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://rr.aai.switch.ch/" registrationInstant="2014-08-14T09:16:40Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.switch.ch/aai/federation/switchaai/metadata-registration-practice-statement-20110711.txt</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-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </Extensions>
-  <IDPSSODescriptor errorURL="http://www.id.uzh.ch/support.html" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-    <Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uzh.ch</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="de">Universität Zürich</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">University of Zurich</mdui:DisplayName>
-        <mdui:Description xml:lang="de">Universität Zürich</mdui:Description>
-        <mdui:Description xml:lang="en">University of Zurich</mdui:Description>
-        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAACF0RVh0U29mdHdhcmUAR3JhcGhpY0NvbnZlcnRlciAoSW50ZWwpd4f6GQAAAepJREFUeJzMkl9IU1Ecx48W+SK99FKUPdgf3UznqkfpsYdlIE2DLKrXrAw30YegpwUhha9RRJLSS0SF7iVCogfBxG33LmyudG5t1wrdyiE6Kj+dc3aJIUFID3Xhd8/vfn+/7+fee85PlDWY/E2I/wcg6kvEXw1RO0q1db1lDQblLpPNbiUYbGqUeWNUrxWHo2w59KaouYua6tG5ywaI2giejgQDzxYRu8Ocu5ri+t2PnPAlmZpZJZ4q0N6bJHDnE2dlTVSFGHia1R5RE5YAeWvrTvJ8LI/YNUnnjQxDwRyVkr63eZpY+jueK0nuPV6gp3+erU6D0ddL2iNqIgoQodU/R/DVEmJniI5AmsGRnM5butOMxwoIh8ntRwt8zn4jPrvC8soPmi/N2oD9Bm3+BBNvVxF7TAL3F3kYzGrT2FSBo5c/ILZPMjico7ffYpvcwBfjeby+ORvgDOPwvsfKrfFk9Ctfltc4fc3ieFcKdT2Qxqb2dwzJr+rqyyB2hHg5kedUT6oI0DtZZ3DwTALfTYsWnyzUmbhPTnMhkMF/y6LeG+fI+Rm9KtOxiwmqPTHEAcOeA5dMHDL2SaL8JSGPSkH1swoJ1HVnRPaaxTdLs85/O13rBmfDo/xvAOWu6B8Bqqc0lPYTAAD//wMACNpDSI97aawAAAAASUVORK5CYII=</mdui:Logo>
-        <mdui:Logo height="60" width="80">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFAAAAA8CAYAAADxJz2MAAAAAXNSR0IArs4c6QAAGy9pVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+Cjx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IlhNUCBDb3JlIDUuMS4yIj4KICAgPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4KICAgICAgPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIKICAgICAgICAgICAgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIj4KICAgICAgICAgPHhtcDpDcmVhdGVEYXRlPjIwMTAtMDYtMDFUMTI6MzQ6NTFaPC94bXA6Q3JlYXRlRGF0ZT4KICAgICAgICAgPHhtcDpNb2RpZnlEYXRlPjIwMTItMDQtMjRUMTY6MzA6MTQrMDI6MDA8L3htcDpNb2RpZnlEYXRlPgogICAgICAgICA8eG1wOkNyZWF0b3JUb29sPklsbHVzdHJhdG9yPC94bXA6Q3JlYXRvclRvb2w+CiAgICAgICAgIDx4bXA6TWV0YWRhdGFEYXRlPjIwMTItMDQtMjRUMTY6MzA6MTQrMDI6MDA8L3htcDpNZXRhZGF0YURhdGU+CiAgICAgIDwvcmRmOkRlc2NyaXB0aW9uPgogICAgICA8cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIgogICAgICAgICAgICB4bWxuczpkYz0iaHR0cDovL3B1cmwub3JnL2RjL2VsZW1lbnRzLzEuMS8iPgogICAgICAgICA8ZGM6Zm9ybWF0PmltYWdlL3BuZzwvZGM6Zm9ybWF0PgogICAgICA8L3JkZjpEZXNjcmlwdGlvbj4KICAgICAgPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIKICAgICAgICAgICAgeG1sbnM6eG1wTU09Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9tbS8iCiAgICAgICAgICAgIHhtbG5zOnN0RXZ0PSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvc1R5cGUvUmVzb3VyY2VFdmVudCMiCiAgICAgICAgICAgIHhtbG5zOnN0UmVmPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvc1R5cGUvUmVzb3VyY2VSZWYjIj4KICAgICAgICAgPHhtcE1NOkhpc3Rvcnk+CiAgICAgICAgICAgIDxyZGY6U2VxPgogICAgICAgICAgICAgICA8cmRmOmxpIHJkZjpwYXJzZVR5cGU9IlJlc291cmNlIj4KICAgICAgICAgICAgICAgICAgPHN0RXZ0OmFjdGlvbj5jb252ZXJ0ZWQ8L3N0RXZ0OmFjdGlvbj4KICAgICAgICAgICAgICAgICAgPHN0RXZ0OnBhcmFtZXRlcnM+ZnJvbSBhcHBsaWNhdGlvbi9wb3N0c2NyaXB0IHRvIGFwcGxpY2F0aW9uL3ZuZC5hZG9iZS5waG90b3Nob3A8L3N0RXZ0OnBhcmFtZXRlcnM+CiAgICAgICAgICAgICAgIDwvcmRmOmxpPgogICAgICAgICAgICAgICA8cmRmOmxpIHJkZjpwYXJzZVR5cGU9IlJlc291cmNlIj4KICAgICAgICAgICAgICAgICAgPHN0RXZ0OmFjdGlvbj5zYXZlZDwvc3RFdnQ6YWN0aW9uPgogICAgICAgICAgICAgICAgICA8c3RFdnQ6aW5zdGFuY2VJRD54bXAuaWlkOjAzODAxMTc0MDcyMDY4MTFCQjcxREY5M0RENTFGMDU3PC9zdEV2dDppbnN0YW5jZUlEPgogICAgICAgICAgICAgICAgICA8c3RFdnQ6d2hlbj4yMDEyLTA0LTI0VDE2OjMwOjE0KzAyOjAwPC9zdEV2dDp3aGVuPgogICAgICAgICAgICAgICAgICA8c3RFdnQ6c29mdHdhcmVBZ2VudD5BZG9iZSBQaG90b3Nob3AgRWxlbWVudHMgMTAuMCBNYWNpbnRvc2g8L3N0RXZ0OnNvZnR3YXJlQWdlbnQ+CiAgICAgICAgICAgICAgICAgIDxzdEV2dDpjaGFuZ2VkPi88L3N0RXZ0OmNoYW5nZWQ+CiAgICAgICAgICAgICAgIDwvcmRmOmxpPgogICAgICAgICAgICAgICA8cmRmOmxpIHJkZjpwYXJzZVR5cGU9IlJlc291cmNlIj4KICAgICAgICAgICAgICAgICAgPHN0RXZ0OmFjdGlvbj5jb252ZXJ0ZWQ8L3N0RXZ0OmFjdGlvbj4KICAgICAgICAgICAgICAgICAgPHN0RXZ0OnBhcmFtZXRlcnM+ZnJvbSBhcHBsaWNhdGlvbi9wb3N0c2NyaXB0IHRvIGltYWdlL3BuZzwvc3RFdnQ6cGFyYW1ldGVycz4KICAgICAgICAgICAgICAgPC9yZGY6bGk+CiAgICAgICAgICAgICAgIDxyZGY6bGkgcmRmOnBhcnNlVHlwZT0iUmVzb3VyY2UiPgogICAgICAgICAgICAgICAgICA8c3RFdnQ6YWN0aW9uPmRlcml2ZWQ8L3N0RXZ0OmFjdGlvbj4KICAgICAgICAgICAgICAgICAgPHN0RXZ0OnBhcmFtZXRlcnM+Y29udmVydGVkIGZyb20gYXBwbGljYXRpb24vdm5kLmFkb2JlLnBob3Rvc2hvcCB0byBpbWFnZS9wbmc8L3N0RXZ0OnBhcmFtZXRlcnM+CiAgICAgICAgICAgICAgIDwvcmRmOmxpPgogICAgICAgICAgICAgICA8cmRmOmxpIHJkZjpwYXJzZVR5cGU9IlJlc291cmNlIj4KICAgICAgICAgICAgICAgICAgPHN0RXZ0OmFjdGlvbj5zYXZlZDwvc3RFdnQ6YWN0aW9uPgogICAgICAgICAgICAgICAgICA8c3RFdnQ6aW5zdGFuY2VJRD54bXAuaWlkOjA0ODAxMTc0MDcyMDY4MTFCQjcxREY5M0RENTFGMDU3PC9zdEV2dDppbnN0YW5jZUlEPgogICAgICAgICAgICAgICAgICA8c3RFdnQ6d2hlbj4yMDEyLTA0LTI0VDE2OjMwOjE0KzAyOjAwPC9zdEV2dDp3aGVuPgogICAgICAgICAgICAgICAgICA8c3RFdnQ6c29mdHdhcmVBZ2VudD5BZG9iZSBQaG90b3Nob3AgRWxlbWVudHMgMTAuMCBNYWNpbnRvc2g8L3N0RXZ0OnNvZnR3YXJlQWdlbnQ+CiAgICAgICAgICAgICAgICAgIDxzdEV2dDpjaGFuZ2VkPi88L3N0RXZ0OmNoYW5nZWQ+CiAgICAgICAgICAgICAgIDwvcmRmOmxpPgogICAgICAgICAgICA8L3JkZjpTZXE+CiAgICAgICAgIDwveG1wTU06SGlzdG9yeT4KICAgICAgICAgPHhtcE1NOkRlcml2ZWRGcm9tIHJkZjpwYXJzZVR5cGU9IlJlc291cmNlIj4KICAgICAgICAgICAgPHN0UmVmOmluc3RhbmNlSUQ+eG1wLmlpZDowMzgwMTE3NDA3MjA2ODExQkI3MURGOTNERDUxRjA1Nzwvc3RSZWY6aW5zdGFuY2VJRD4KICAgICAgICAgICAgPHN0UmVmOmRvY3VtZW50SUQ+eG1wLmRpZDowMzgwMTE3NDA3MjA2ODExQkI3MURGOTNERDUxRjA1Nzwvc3RSZWY6ZG9jdW1lbnRJRD4KICAgICAgICAgICAgPHN0UmVmOm9yaWdpbmFsRG9jdW1lbnRJRD54bXAuZGlkOjAzODAxMTc0MDcyMDY4MTFCQjcxREY5M0RENTFGMDU3PC9zdFJlZjpvcmlnaW5hbERvY3VtZW50SUQ+CiAgICAgICAgIDwveG1wTU06RGVyaXZlZEZyb20+CiAgICAgICAgIDx4bXBNTTpEb2N1bWVudElEPnhtcC5kaWQ6MDM4MDExNzQwNzIwNjgxMUJCNzFERjkzREQ1MUYwNTc8L3htcE1NOkRvY3VtZW50SUQ+CiAgICAgICAgIDx4bXBNTTpJbnN0YW5jZUlEPnhtcC5paWQ6MDQ4MDExNzQwNzIwNjgxMUJCNzFERjkzREQ1MUYwNTc8L3htcE1NOkluc3RhbmNlSUQ+CiAgICAgICAgIDx4bXBNTTpPcmlnaW5hbERvY3VtZW50SUQ+eG1wLmRpZDowMzgwMTE3NDA3MjA2ODExQkI3MURGOTNERDUxRjA1NzwveG1wTU06T3JpZ2luYWxEb2N1bWVudElEPgogICAgICA8L3JkZjpEZXNjcmlwdGlvbj4KICAgICAgPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIKICAgICAgICAgICAgeG1sbnM6cGhvdG9zaG9wPSJodHRwOi8vbnMuYWRvYmUuY29tL3Bob3Rvc2hvcC8xLjAvIj4KICAgICAgICAgPHBob3Rvc2hvcDpDb2xvck1vZGU+MzwvcGhvdG9zaG9wOkNvbG9yTW9kZT4KICAgICAgICAgPHBob3Rvc2hvcDpJQ0NQcm9maWxlPnNSR0IgSUVDNjE5NjYtMi4xPC9waG90b3Nob3A6SUNDUHJvZmlsZT4KICAgICAgPC9yZGY6RGVzY3JpcHRpb24+CiAgICAgIDxyZGY6RGVzY3JpcHRpb24gcmRmOmFib3V0PSIiCiAgICAgICAgICAgIHhtbG5zOnRpZmY9Imh0dHA6Ly9ucy5hZG9iZS5jb20vdGlmZi8xLjAvIj4KICAgICAgICAgPHRpZmY6T3JpZW50YXRpb24+MTwvdGlmZjpPcmllbnRhdGlvbj4KICAgICAgICAgPHRpZmY6WFJlc29sdXRpb24+NzIwMS8xMDA8L3RpZmY6WFJlc29sdXRpb24+CiAgICAgICAgIDx0aWZmOllSZXNvbHV0aW9uPjcyMDEvMTAwPC90aWZmOllSZXNvbHV0aW9uPgogICAgICAgICA8dGlmZjpSZXNvbHV0aW9uVW5pdD4yPC90aWZmOlJlc29sdXRpb25Vbml0PgogICAgICAgICA8dGlmZjpOYXRpdmVEaWdlc3Q+MjU2LDI1NywyNTgsMjU5LDI2MiwyNzQsMjc3LDI4NCw1MzAsNTMxLDI4MiwyODMsMjk2LDMwMSwzMTgsMzE5LDUyOSw1MzIsMzA2LDI3MCwyNzEsMjcyLDMwNSwzMTUsMzM0MzI7NzEzOThDMjdBQkYzMUM0Q0ExQ0M0NEZFQkE1QzI4RDc8L3RpZmY6TmF0aXZlRGlnZXN0PgogICAgICA8L3JkZjpEZXNjcmlwdGlvbj4KICAgICAgPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIKICAgICAgICAgICAgeG1sbnM6ZXhpZj0iaHR0cDovL25zLmFkb2JlLmNvbS9leGlmLzEuMC8iPgogICAgICAgICA8ZXhpZjpQaXhlbFhEaW1lbnNpb24+Nzg8L2V4aWY6UGl4ZWxYRGltZW5zaW9uPgogICAgICAgICA8ZXhpZjpQaXhlbFlEaW1lbnNpb24+Mjc8L2V4aWY6UGl4ZWxZRGltZW5zaW9uPgogICAgICAgICA8ZXhpZjpDb2xvclNwYWNlPjE8L2V4aWY6Q29sb3JTcGFjZT4KICAgICAgICAgPGV4aWY6TmF0aXZlRGlnZXN0PjM2ODY0LDQwOTYwLDQwOTYxLDM3MTIxLDM3MTIyLDQwOTYyLDQwOTYzLDM3NTEwLDQwOTY0LDM2ODY3LDM2ODY4LDMzNDM0LDMzNDM3LDM0ODUwLDM0ODUyLDM0ODU1LDM0ODU2LDM3Mzc3LDM3Mzc4LDM3Mzc5LDM3MzgwLDM3MzgxLDM3MzgyLDM3MzgzLDM3Mzg0LDM3Mzg1LDM3Mzg2LDM3Mzk2LDQxNDgzLDQxNDg0LDQxNDg2LDQxNDg3LDQxNDg4LDQxNDkyLDQxNDkzLDQxNDk1LDQxNzI4LDQxNzI5LDQxNzMwLDQxOTg1LDQxOTg2LDQxOTg3LDQxOTg4LDQxOTg5LDQxOTkwLDQxOTkxLDQxOTkyLDQxOTkzLDQxOTk0LDQxOTk1LDQxOTk2LDQyMDE2LDAsMiw0LDUsNiw3LDgsOSwxMCwxMSwxMiwxMywxNCwxNSwxNiwxNywxOCwyMCwyMiwyMywyNCwyNSwyNiwyNywyOCwzMDswRUVCOTNGNjc3MEYzODhFNjIzQjI3NzdFM0ZFMkFEOTwvZXhpZjpOYXRpdmVEaWdlc3Q+CiAgICAgIDwvcmRmOkRlc2NyaXB0aW9uPgogICA8L3JkZjpSREY+CjwveDp4bXBtZXRhPgogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgCjw/eHBhY2tldCBlbmQ9InciPz4vWEzOAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAl3RFWHRDb21tZW50AGNIUk0gY2h1bmtsZW4gMzIgaWdub3JlZDoNQVNDSUk6IC4ueiUuLsOEw4kuLsuYy4cuLsOEw4guLnUwLi7DjWAuLjrDsi4uLm8NSEVYOiAwMDAwN0EyNTAwMDA4MDgzMDAwMEY5RkYwMDAwODBFOTAwMDA3NTMwMDAwMEVBNjAwMDAwM0E5ODAwMDAxNzZGo/aNewAABM1JREFUeJzsWtFxozAUTAn+y42+KIESKMElUAIl0AEluARKoATm/u6+XIJL4EJuFy1Cwo7v4jdKrJmNMXqSVqunpwfOy+9fP1+euB/mBHKHOYHcYU4gd5gTyB3mBHKHOYHcYU4gd5gTyB3mBHKHOYHcYU4gd5gTyB3mBHKHOYHcYU4gd/z9c6W41x/VG05v6IEhwFzXvKG42tkXKlcFfBPkCIFGiDSjhqBEh/sq5uGB8zArSQFnAcTTThDqACHLwLYB5vpW2h0fNhOjEhUQQtCbGnhhId7WB/azYGdcd7DvIXb9uOk8vmwEDMQrIQa9ahbzPNfBtob9BajEbhH7f4ooXl5et765z0Z3i8ZxzH9BaBMTkLFMY1sPD2wpLmwZC1vYVhD9JN+72LaX8ea2U+p7xH7uc5rt7hEr0eckc1rmh+9n7jDuPOW4EhDkuG07CNRJZ/SoEUJ1sOXh0sCuQFv1ytW2lz6TAmIM7gJ6Oz2QB1ghY1bSbvFSCT9LG/CuUV9jjBJzG6WvI20xdoG5zqJXoYD0NnpOG5ssB4DYrQzaiq0KzJO8/qCAA8YjeJhNsJsXaITtCC8hxzM+j3JvAieGnIt6XTieeOeFXhr0NS0Civrc72NkshWIsSMSZm4YCt7RE7g4dwh4cf70Z2ihgIsnBKKqkCe5pqfxfiHjpLYwvbcXXtst7Hy8q0GgewkK6gaKJUQ7F/FYtOmdDweDCxLtGwRcTSwQqwy8rZDvtG+DPpme0bOKlICoO8ui7ArIwF/jcxP0ZSVJ7iKeMSQEbLHq3PJ1UN+gT271mShTol0BcZ/ijfL9DDvGtVBAhqhJeOk4bK+euxHQaQzk5PC52b5o2LHe+YODp9RmC6MNFyQVV5k2Ma68k/+AgMsk8f3ofMziwqiAldQNMj7H6aS+kr5UQIaBKRSQq9EkBKyENE+0k3pbrI3zoaEl0a9SYgJ2FCos4tYtBOmdPxmrhIAFVrG1FnCapruwV1ICpjyQJ9/g/Ak4uP1DpAhi0ZcWcDllY8YQmFuxdP6UY8LbRtqUzieisRjI/hbPxn0+EvaxBXX+9Ny8sJA4Vz1SQJ7CTEuKCLFaYloVuY4JeBSb2Cm8Sl4lmN8i4CVRZyJgJxNtdojR6/RzT8BRYuYmDxQ7nqat88/dRXBdi6gMCRXaN9w9IiCzhu4RAuqTSJ/wQJJt5V70Wu5x4tEnEbHRx7LFg4JreuvZ+SSaW38CfxWQeep7+08VEMRPbp0Yh2CdZvqp6xjqhIB8MuACXRPwADsKuMpdpU2t7R8hYBVOOLFl+bZmEI/t5JPhQN/e7B1Mk3tdvfVR0Rq3FlCfU68JuFqATxcQgzNNYbZdYisc3VowbpGz829dQvGY7uy9D6RXqedz0oPzTwJ7AvZBH6YChq/zK+dfHpycP6V1u3aC5RR3PqjXKQIitOIgC0kP4+sx9VTuErU/OZ9ilXq9q8Sd5ZbfRChkCHrfGNxnXvc9fxNhcZFf5XCfud8o9UxTnr/KhUViH4XkFmXO2Ms9tfvevwuHRTyvFw8j+FLh+/5nwhP/+L8xTzwFfAqYK8wJ5A5zArnDnEDuMCeQO8wJ5A5zArnDnEDuMCeQO8wJ5A5zArnDnEDuMCeQO8wJ5I4/AAAA//8DAO++A/GNeIQPAAAAAElFTkSuQmCC</mdui:Logo>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:IPHint>192.41.135.192/27</mdui:IPHint>
-        <mdui:IPHint>192.41.132.0/22</mdui:IPHint>
-        <mdui:IPHint>195.176.0.64/27</mdui:IPHint>
-        <mdui:IPHint>192.41.136.0/24</mdui:IPHint>
-        <mdui:IPHint>2001:620:10::/48</mdui:IPHint>
-        <mdui:IPHint>2001:620:13::/48</mdui:IPHint>
-        <mdui:IPHint>160.85.2.16/28</mdui:IPHint>
-        <mdui:IPHint>160.85.2.128/27</mdui:IPHint>
-        <mdui:IPHint>160.85.3.24/29</mdui:IPHint>
-        <mdui:IPHint>160.85.3.128/25</mdui:IPHint>
-        <mdui:IPHint>192.12.247.0/24</mdui:IPHint>
-        <mdui:IPHint>89.206.64.0/18</mdui:IPHint>
-        <mdui:IPHint>130.60.0.0/16</mdui:IPHint>
-        <mdui:IPHint>130.60.10.0/25</mdui:IPHint>
-        <mdui:IPHint>130.60.128.64/26</mdui:IPHint>
-        <mdui:IPHint>193.138.69.0/24</mdui:IPHint>
-        <mdui:DomainHint>uzh.ch</mdui:DomainHint>
-        <mdui:DomainHint>unizh.ch</mdui:DomainHint>
-        <mdui:DomainHint>unizh.edu</mdui:DomainHint>
-        <mdui:DomainHint>uzh.edu</mdui:DomainHint>
-        <mdui:GeolocationHint>geo:47.374571,8.548659</mdui:GeolocationHint>
-        <mdui:GeolocationHint>geo:47.397194,8.548950</mdui:GeolocationHint>
-        <mdui:GeolocationHint>geo:47.410914,8.540683</mdui:GeolocationHint>
-      </mdui:DiscoHints>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIFNjCCBB6gAwIBAgIUBATM4TCBtgHL7TTLYLT51WgCtTAwDQYJKoZIhvcNAQEL
-BQAwTTELMAkGA1UEBhMCQk0xGTAXBgNVBAoTEFF1b1ZhZGlzIExpbWl0ZWQxIzAh
-BgNVBAMTGlF1b1ZhZGlzIEdsb2JhbCBTU0wgSUNBIEcyMB4XDTE0MDMxNDExMzUw
-NVoXDTE2MDMxNDExMzQ1MFowgckxEzARBgsrBgEEAYI3PAIBAxMCQ0gxGDAWBgsr
-BgEEAYI3PAIBAhMHWnVlcmljaDEaMBgGA1UEDxMRR292ZXJubWVudCBFbnRpdHkx
-EzARBgNVBAUTCjE4MzItMDktMjgxCzAJBgNVBAYTAkNIMRAwDgYDVQQIEwdadWVy
-aWNoMRAwDgYDVQQHEwdadWVyaWNoMR0wGwYDVQQKExRVbml2ZXJzaXRhZXQgWnVl
-cmljaDEXMBUGA1UEAxMOYWFpLWlkcC51emguY2gwggEiMA0GCSqGSIb3DQEBAQUA
-A4IBDwAwggEKAoIBAQCiiuVzv5VrRVKDKd5wGJmA+nMY/qi1Pp4qpPM4l//BhAgK
-JPWyLqybIouWSMT2YKB0HITnPm3p7iJtzMtn7YZxK5wBqYenemFJptVUuS9jHzpq
-I3blM8TKUAoTY4b+Mppgj3njtM77a4YiMqEgSnTkPatEQ5QP0g+IOEI8I67FPXCu
-m+N/EDrviVB055ZEo2W2MTJxgTzRf+dpyoOvt0aVYlsKFcXxHiIfxJxufiO5aKgR
-0e/6lSjrOqhsQ+ZFtT6RkmiW2Oidplwo97B6uIh6Fhp/O7EixF8wN3UWMCWiRqh6
-V6VLOc73rK9hE3nnhF1N+UEowvJ8pVV5EoC2tXoVAgMBAAGjggGPMIIBizBzBggr
-BgEFBQcBAQRnMGUwKgYIKwYBBQUHMAGGHmh0dHA6Ly9vY3NwLnF1b3ZhZGlzZ2xv
-YmFsLmNvbTA3BggrBgEFBQcwAoYraHR0cDovL3RydXN0LnF1b3ZhZGlzZ2xvYmFs
-LmNvbS9xdnNzbGcyLmNydDBRBgNVHSAESjBIMEYGDCsGAQQBvlgAAmQBAjA2MDQG
-CCsGAQUFBwIBFihodHRwOi8vd3d3LnF1b3ZhZGlzZ2xvYmFsLmNvbS9yZXBvc2l0
-b3J5MBkGA1UdEQQSMBCCDmFhaS1pZHAudXpoLmNoMAsGA1UdDwQEAwIFoDAdBgNV
-HSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwHwYDVR0jBBgwFoAUkRlirVsXpzD7
-8N45JbG9jLm4UScwOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC5xdW92YWRp
-c2dsb2JhbC5jb20vcXZzc2xnMi5jcmwwHQYDVR0OBBYEFPdmvpYTb49/qkMzUnCN
-CHZqecp4MA0GCSqGSIb3DQEBCwUAA4IBAQBkxNx/LPp/L2FQRJE4XCHrH1f2LR2e
-BZsuBFBmNdAiXxNABZN/NIup7ADTTalALkY9qb0p7sYZOZ/P0mCIaQm4jrE4lXfC
-hW2bIAiqhmhW96Vg1tQt/hJdXOGwK9DgFM2VUfSrKt8MRRWpa/INWJWQIWsn1vZj
-DLrUq69KTMpWStYH/5ChSvbU6TRKRFp24y1OeMdBAP4kJZJoyocDmj3HCvz8VaSl
-kJTDI4IAgCLhzTnk7ljJI3qhaU7F9tp6iclLPcb/h3Zmzq8+cEPbRuXgTnmbSKX0
-o0HpMPl4e0ANFrH5CpAebxkqLtX1zryAm/Pi5wtxEqKwRv+3gUTol02q
-						</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>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://aai-idp.uzh.ch/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://aai-idp.uzh.ch/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://aai-idp.uzh.ch/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://aai-idp.uzh.ch/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">uzh.ch</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">Universität Zürich</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">University of Zurich</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.uzh.ch/</OrganizationURL>
-    <OrganizationURL xml:lang="en">http://www.uzh.ch/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>UZH</GivenName>
-    <SurName>ID Helpdesk</SurName>
-    <EmailAddress>mailto:support@id.uzh.ch</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>UZH</GivenName>
-    <SurName>AAI Administrator</SurName>
-    <EmailAddress>mailto:aaiadm@id.uzh.ch</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/aai-idp.uzh.ch.xml b/swamid-interfederations-2.0/aai-idp.uzh.ch.xml
deleted file mode 100644
index 9933e3bc..00000000
--- a/swamid-interfederations-2.0/aai-idp.uzh.ch.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://aai-idp.uzh.ch/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://rr.aai.switch.ch/" registrationInstant="2014-08-14T09:16:40Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.switch.ch/aai/federation/switchaai/metadata-registration-practice-statement-20110711.txt</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-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </Extensions>
-  <IDPSSODescriptor errorURL="http://www.id.uzh.ch/support.html" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-    <Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uzh.ch</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="de">Universität Zürich</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">University of Zurich</mdui:DisplayName>
-        <mdui:Description xml:lang="de">Universität Zürich</mdui:Description>
-        <mdui:Description xml:lang="en">University of Zurich</mdui:Description>
-        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAACF0RVh0U29mdHdhcmUAR3JhcGhpY0NvbnZlcnRlciAoSW50ZWwpd4f6GQAAAepJREFUeJzMkl9IU1Ecx48W+SK99FKUPdgf3UznqkfpsYdlIE2DLKrXrAw30YegpwUhha9RRJLSS0SF7iVCogfBxG33LmyudG5t1wrdyiE6Kj+dc3aJIUFID3Xhd8/vfn+/7+fee85PlDWY/E2I/wcg6kvEXw1RO0q1db1lDQblLpPNbiUYbGqUeWNUrxWHo2w59KaouYua6tG5ywaI2giejgQDzxYRu8Ocu5ri+t2PnPAlmZpZJZ4q0N6bJHDnE2dlTVSFGHia1R5RE5YAeWvrTvJ8LI/YNUnnjQxDwRyVkr63eZpY+jueK0nuPV6gp3+erU6D0ddL2iNqIgoQodU/R/DVEmJniI5AmsGRnM5butOMxwoIh8ntRwt8zn4jPrvC8soPmi/N2oD9Bm3+BBNvVxF7TAL3F3kYzGrT2FSBo5c/ILZPMjico7ffYpvcwBfjeby+ORvgDOPwvsfKrfFk9Ctfltc4fc3ieFcKdT2Qxqb2dwzJr+rqyyB2hHg5kedUT6oI0DtZZ3DwTALfTYsWnyzUmbhPTnMhkMF/y6LeG+fI+Rm9KtOxiwmqPTHEAcOeA5dMHDL2SaL8JSGPSkH1swoJ1HVnRPaaxTdLs85/O13rBmfDo/xvAOWu6B8Bqqc0lPYTAAD//wMACNpDSI97aawAAAAASUVORK5CYII=</mdui:Logo>
-        <mdui:Logo height="60" width="80">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFAAAAA8CAYAAADxJz2MAAAAAXNSR0IArs4c6QAAGy9pVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+Cjx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IlhNUCBDb3JlIDUuMS4yIj4KICAgPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4KICAgICAgPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIKICAgICAgICAgICAgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIj4KICAgICAgICAgPHhtcDpDcmVhdGVEYXRlPjIwMTAtMDYtMDFUMTI6MzQ6NTFaPC94bXA6Q3JlYXRlRGF0ZT4KICAgICAgICAgPHhtcDpNb2RpZnlEYXRlPjIwMTItMDQtMjRUMTY6MzA6MTQrMDI6MDA8L3htcDpNb2RpZnlEYXRlPgogICAgICAgICA8eG1wOkNyZWF0b3JUb29sPklsbHVzdHJhdG9yPC94bXA6Q3JlYXRvclRvb2w+CiAgICAgICAgIDx4bXA6TWV0YWRhdGFEYXRlPjIwMTItMDQtMjRUMTY6MzA6MTQrMDI6MDA8L3htcDpNZXRhZGF0YURhdGU+CiAgICAgIDwvcmRmOkRlc2NyaXB0aW9uPgogICAgICA8cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIgogICAgICAgICAgICB4bWxuczpkYz0iaHR0cDovL3B1cmwub3JnL2RjL2VsZW1lbnRzLzEuMS8iPgogICAgICAgICA8ZGM6Zm9ybWF0PmltYWdlL3BuZzwvZGM6Zm9ybWF0PgogICAgICA8L3JkZjpEZXNjcmlwdGlvbj4KICAgICAgPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIKICAgICAgICAgICAgeG1sbnM6eG1wTU09Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9tbS8iCiAgICAgICAgICAgIHhtbG5zOnN0RXZ0PSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvc1R5cGUvUmVzb3VyY2VFdmVudCMiCiAgICAgICAgICAgIHhtbG5zOnN0UmVmPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvc1R5cGUvUmVzb3VyY2VSZWYjIj4KICAgICAgICAgPHhtcE1NOkhpc3Rvcnk+CiAgICAgICAgICAgIDxyZGY6U2VxPgogICAgICAgICAgICAgICA8cmRmOmxpIHJkZjpwYXJzZVR5cGU9IlJlc291cmNlIj4KICAgICAgICAgICAgICAgICAgPHN0RXZ0OmFjdGlvbj5jb252ZXJ0ZWQ8L3N0RXZ0OmFjdGlvbj4KICAgICAgICAgICAgICAgICAgPHN0RXZ0OnBhcmFtZXRlcnM+ZnJvbSBhcHBsaWNhdGlvbi9wb3N0c2NyaXB0IHRvIGFwcGxpY2F0aW9uL3ZuZC5hZG9iZS5waG90b3Nob3A8L3N0RXZ0OnBhcmFtZXRlcnM+CiAgICAgICAgICAgICAgIDwvcmRmOmxpPgogICAgICAgICAgICAgICA8cmRmOmxpIHJkZjpwYXJzZVR5cGU9IlJlc291cmNlIj4KICAgICAgICAgICAgICAgICAgPHN0RXZ0OmFjdGlvbj5zYXZlZDwvc3RFdnQ6YWN0aW9uPgogICAgICAgICAgICAgICAgICA8c3RFdnQ6aW5zdGFuY2VJRD54bXAuaWlkOjAzODAxMTc0MDcyMDY4MTFCQjcxREY5M0RENTFGMDU3PC9zdEV2dDppbnN0YW5jZUlEPgogICAgICAgICAgICAgICAgICA8c3RFdnQ6d2hlbj4yMDEyLTA0LTI0VDE2OjMwOjE0KzAyOjAwPC9zdEV2dDp3aGVuPgogICAgICAgICAgICAgICAgICA8c3RFdnQ6c29mdHdhcmVBZ2VudD5BZG9iZSBQaG90b3Nob3AgRWxlbWVudHMgMTAuMCBNYWNpbnRvc2g8L3N0RXZ0OnNvZnR3YXJlQWdlbnQ+CiAgICAgICAgICAgICAgICAgIDxzdEV2dDpjaGFuZ2VkPi88L3N0RXZ0OmNoYW5nZWQ+CiAgICAgICAgICAgICAgIDwvcmRmOmxpPgogICAgICAgICAgICAgICA8cmRmOmxpIHJkZjpwYXJzZVR5cGU9IlJlc291cmNlIj4KICAgICAgICAgICAgICAgICAgPHN0RXZ0OmFjdGlvbj5jb252ZXJ0ZWQ8L3N0RXZ0OmFjdGlvbj4KICAgICAgICAgICAgICAgICAgPHN0RXZ0OnBhcmFtZXRlcnM+ZnJvbSBhcHBsaWNhdGlvbi9wb3N0c2NyaXB0IHRvIGltYWdlL3BuZzwvc3RFdnQ6cGFyYW1ldGVycz4KICAgICAgICAgICAgICAgPC9yZGY6bGk+CiAgICAgICAgICAgICAgIDxyZGY6bGkgcmRmOnBhcnNlVHlwZT0iUmVzb3VyY2UiPgogICAgICAgICAgICAgICAgICA8c3RFdnQ6YWN0aW9uPmRlcml2ZWQ8L3N0RXZ0OmFjdGlvbj4KICAgICAgICAgICAgICAgICAgPHN0RXZ0OnBhcmFtZXRlcnM+Y29udmVydGVkIGZyb20gYXBwbGljYXRpb24vdm5kLmFkb2JlLnBob3Rvc2hvcCB0byBpbWFnZS9wbmc8L3N0RXZ0OnBhcmFtZXRlcnM+CiAgICAgICAgICAgICAgIDwvcmRmOmxpPgogICAgICAgICAgICAgICA8cmRmOmxpIHJkZjpwYXJzZVR5cGU9IlJlc291cmNlIj4KICAgICAgICAgICAgICAgICAgPHN0RXZ0OmFjdGlvbj5zYXZlZDwvc3RFdnQ6YWN0aW9uPgogICAgICAgICAgICAgICAgICA8c3RFdnQ6aW5zdGFuY2VJRD54bXAuaWlkOjA0ODAxMTc0MDcyMDY4MTFCQjcxREY5M0RENTFGMDU3PC9zdEV2dDppbnN0YW5jZUlEPgogICAgICAgICAgICAgICAgICA8c3RFdnQ6d2hlbj4yMDEyLTA0LTI0VDE2OjMwOjE0KzAyOjAwPC9zdEV2dDp3aGVuPgogICAgICAgICAgICAgICAgICA8c3RFdnQ6c29mdHdhcmVBZ2VudD5BZG9iZSBQaG90b3Nob3AgRWxlbWVudHMgMTAuMCBNYWNpbnRvc2g8L3N0RXZ0OnNvZnR3YXJlQWdlbnQ+CiAgICAgICAgICAgICAgICAgIDxzdEV2dDpjaGFuZ2VkPi88L3N0RXZ0OmNoYW5nZWQ+CiAgICAgICAgICAgICAgIDwvcmRmOmxpPgogICAgICAgICAgICA8L3JkZjpTZXE+CiAgICAgICAgIDwveG1wTU06SGlzdG9yeT4KICAgICAgICAgPHhtcE1NOkRlcml2ZWRGcm9tIHJkZjpwYXJzZVR5cGU9IlJlc291cmNlIj4KICAgICAgICAgICAgPHN0UmVmOmluc3RhbmNlSUQ+eG1wLmlpZDowMzgwMTE3NDA3MjA2ODExQkI3MURGOTNERDUxRjA1Nzwvc3RSZWY6aW5zdGFuY2VJRD4KICAgICAgICAgICAgPHN0UmVmOmRvY3VtZW50SUQ+eG1wLmRpZDowMzgwMTE3NDA3MjA2ODExQkI3MURGOTNERDUxRjA1Nzwvc3RSZWY6ZG9jdW1lbnRJRD4KICAgICAgICAgICAgPHN0UmVmOm9yaWdpbmFsRG9jdW1lbnRJRD54bXAuZGlkOjAzODAxMTc0MDcyMDY4MTFCQjcxREY5M0RENTFGMDU3PC9zdFJlZjpvcmlnaW5hbERvY3VtZW50SUQ+CiAgICAgICAgIDwveG1wTU06RGVyaXZlZEZyb20+CiAgICAgICAgIDx4bXBNTTpEb2N1bWVudElEPnhtcC5kaWQ6MDM4MDExNzQwNzIwNjgxMUJCNzFERjkzREQ1MUYwNTc8L3htcE1NOkRvY3VtZW50SUQ+CiAgICAgICAgIDx4bXBNTTpJbnN0YW5jZUlEPnhtcC5paWQ6MDQ4MDExNzQwNzIwNjgxMUJCNzFERjkzREQ1MUYwNTc8L3htcE1NOkluc3RhbmNlSUQ+CiAgICAgICAgIDx4bXBNTTpPcmlnaW5hbERvY3VtZW50SUQ+eG1wLmRpZDowMzgwMTE3NDA3MjA2ODExQkI3MURGOTNERDUxRjA1NzwveG1wTU06T3JpZ2luYWxEb2N1bWVudElEPgogICAgICA8L3JkZjpEZXNjcmlwdGlvbj4KICAgICAgPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIKICAgICAgICAgICAgeG1sbnM6cGhvdG9zaG9wPSJodHRwOi8vbnMuYWRvYmUuY29tL3Bob3Rvc2hvcC8xLjAvIj4KICAgICAgICAgPHBob3Rvc2hvcDpDb2xvck1vZGU+MzwvcGhvdG9zaG9wOkNvbG9yTW9kZT4KICAgICAgICAgPHBob3Rvc2hvcDpJQ0NQcm9maWxlPnNSR0IgSUVDNjE5NjYtMi4xPC9waG90b3Nob3A6SUNDUHJvZmlsZT4KICAgICAgPC9yZGY6RGVzY3JpcHRpb24+CiAgICAgIDxyZGY6RGVzY3JpcHRpb24gcmRmOmFib3V0PSIiCiAgICAgICAgICAgIHhtbG5zOnRpZmY9Imh0dHA6Ly9ucy5hZG9iZS5jb20vdGlmZi8xLjAvIj4KICAgICAgICAgPHRpZmY6T3JpZW50YXRpb24+MTwvdGlmZjpPcmllbnRhdGlvbj4KICAgICAgICAgPHRpZmY6WFJlc29sdXRpb24+NzIwMS8xMDA8L3RpZmY6WFJlc29sdXRpb24+CiAgICAgICAgIDx0aWZmOllSZXNvbHV0aW9uPjcyMDEvMTAwPC90aWZmOllSZXNvbHV0aW9uPgogICAgICAgICA8dGlmZjpSZXNvbHV0aW9uVW5pdD4yPC90aWZmOlJlc29sdXRpb25Vbml0PgogICAgICAgICA8dGlmZjpOYXRpdmVEaWdlc3Q+MjU2LDI1NywyNTgsMjU5LDI2MiwyNzQsMjc3LDI4NCw1MzAsNTMxLDI4MiwyODMsMjk2LDMwMSwzMTgsMzE5LDUyOSw1MzIsMzA2LDI3MCwyNzEsMjcyLDMwNSwzMTUsMzM0MzI7NzEzOThDMjdBQkYzMUM0Q0ExQ0M0NEZFQkE1QzI4RDc8L3RpZmY6TmF0aXZlRGlnZXN0PgogICAgICA8L3JkZjpEZXNjcmlwdGlvbj4KICAgICAgPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIKICAgICAgICAgICAgeG1sbnM6ZXhpZj0iaHR0cDovL25zLmFkb2JlLmNvbS9leGlmLzEuMC8iPgogICAgICAgICA8ZXhpZjpQaXhlbFhEaW1lbnNpb24+Nzg8L2V4aWY6UGl4ZWxYRGltZW5zaW9uPgogICAgICAgICA8ZXhpZjpQaXhlbFlEaW1lbnNpb24+Mjc8L2V4aWY6UGl4ZWxZRGltZW5zaW9uPgogICAgICAgICA8ZXhpZjpDb2xvclNwYWNlPjE8L2V4aWY6Q29sb3JTcGFjZT4KICAgICAgICAgPGV4aWY6TmF0aXZlRGlnZXN0PjM2ODY0LDQwOTYwLDQwOTYxLDM3MTIxLDM3MTIyLDQwOTYyLDQwOTYzLDM3NTEwLDQwOTY0LDM2ODY3LDM2ODY4LDMzNDM0LDMzNDM3LDM0ODUwLDM0ODUyLDM0ODU1LDM0ODU2LDM3Mzc3LDM3Mzc4LDM3Mzc5LDM3MzgwLDM3MzgxLDM3MzgyLDM3MzgzLDM3Mzg0LDM3Mzg1LDM3Mzg2LDM3Mzk2LDQxNDgzLDQxNDg0LDQxNDg2LDQxNDg3LDQxNDg4LDQxNDkyLDQxNDkzLDQxNDk1LDQxNzI4LDQxNzI5LDQxNzMwLDQxOTg1LDQxOTg2LDQxOTg3LDQxOTg4LDQxOTg5LDQxOTkwLDQxOTkxLDQxOTkyLDQxOTkzLDQxOTk0LDQxOTk1LDQxOTk2LDQyMDE2LDAsMiw0LDUsNiw3LDgsOSwxMCwxMSwxMiwxMywxNCwxNSwxNiwxNywxOCwyMCwyMiwyMywyNCwyNSwyNiwyNywyOCwzMDswRUVCOTNGNjc3MEYzODhFNjIzQjI3NzdFM0ZFMkFEOTwvZXhpZjpOYXRpdmVEaWdlc3Q+CiAgICAgIDwvcmRmOkRlc2NyaXB0aW9uPgogICA8L3JkZjpSREY+CjwveDp4bXBtZXRhPgogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgCjw/eHBhY2tldCBlbmQ9InciPz4vWEzOAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAl3RFWHRDb21tZW50AGNIUk0gY2h1bmtsZW4gMzIgaWdub3JlZDoNQVNDSUk6IC4ueiUuLsOEw4kuLsuYy4cuLsOEw4guLnUwLi7DjWAuLjrDsi4uLm8NSEVYOiAwMDAwN0EyNTAwMDA4MDgzMDAwMEY5RkYwMDAwODBFOTAwMDA3NTMwMDAwMEVBNjAwMDAwM0E5ODAwMDAxNzZGo/aNewAABM1JREFUeJzsWtFxozAUTAn+y42+KIESKMElUAIl0AEluARKoATm/u6+XIJL4EJuFy1Cwo7v4jdKrJmNMXqSVqunpwfOy+9fP1+euB/mBHKHOYHcYU4gd5gTyB3mBHKHOYHcYU4gd5gTyB3mBHKHOYHcYU4gd5gTyB3mBHKHOYHcYU4gd/z9c6W41x/VG05v6IEhwFzXvKG42tkXKlcFfBPkCIFGiDSjhqBEh/sq5uGB8zArSQFnAcTTThDqACHLwLYB5vpW2h0fNhOjEhUQQtCbGnhhId7WB/azYGdcd7DvIXb9uOk8vmwEDMQrIQa9ahbzPNfBtob9BajEbhH7f4ooXl5et765z0Z3i8ZxzH9BaBMTkLFMY1sPD2wpLmwZC1vYVhD9JN+72LaX8ea2U+p7xH7uc5rt7hEr0eckc1rmh+9n7jDuPOW4EhDkuG07CNRJZ/SoEUJ1sOXh0sCuQFv1ytW2lz6TAmIM7gJ6Oz2QB1ghY1bSbvFSCT9LG/CuUV9jjBJzG6WvI20xdoG5zqJXoYD0NnpOG5ssB4DYrQzaiq0KzJO8/qCAA8YjeJhNsJsXaITtCC8hxzM+j3JvAieGnIt6XTieeOeFXhr0NS0Civrc72NkshWIsSMSZm4YCt7RE7g4dwh4cf70Z2ihgIsnBKKqkCe5pqfxfiHjpLYwvbcXXtst7Hy8q0GgewkK6gaKJUQ7F/FYtOmdDweDCxLtGwRcTSwQqwy8rZDvtG+DPpme0bOKlICoO8ui7ArIwF/jcxP0ZSVJ7iKeMSQEbLHq3PJ1UN+gT271mShTol0BcZ/ijfL9DDvGtVBAhqhJeOk4bK+euxHQaQzk5PC52b5o2LHe+YODp9RmC6MNFyQVV5k2Ma68k/+AgMsk8f3ofMziwqiAldQNMj7H6aS+kr5UQIaBKRSQq9EkBKyENE+0k3pbrI3zoaEl0a9SYgJ2FCos4tYtBOmdPxmrhIAFVrG1FnCapruwV1ICpjyQJ9/g/Ak4uP1DpAhi0ZcWcDllY8YQmFuxdP6UY8LbRtqUzieisRjI/hbPxn0+EvaxBXX+9Ny8sJA4Vz1SQJ7CTEuKCLFaYloVuY4JeBSb2Cm8Sl4lmN8i4CVRZyJgJxNtdojR6/RzT8BRYuYmDxQ7nqat88/dRXBdi6gMCRXaN9w9IiCzhu4RAuqTSJ/wQJJt5V70Wu5x4tEnEbHRx7LFg4JreuvZ+SSaW38CfxWQeep7+08VEMRPbp0Yh2CdZvqp6xjqhIB8MuACXRPwADsKuMpdpU2t7R8hYBVOOLFl+bZmEI/t5JPhQN/e7B1Mk3tdvfVR0Rq3FlCfU68JuFqATxcQgzNNYbZdYisc3VowbpGz829dQvGY7uy9D6RXqedz0oPzTwJ7AvZBH6YChq/zK+dfHpycP6V1u3aC5RR3PqjXKQIitOIgC0kP4+sx9VTuErU/OZ9ilXq9q8Sd5ZbfRChkCHrfGNxnXvc9fxNhcZFf5XCfud8o9UxTnr/KhUViH4XkFmXO2Ms9tfvevwuHRTyvFw8j+FLh+/5nwhP/+L8xTzwFfAqYK8wJ5A5zArnDnEDuMCeQO8wJ5A5zArnDnEDuMCeQO8wJ5A5zArnDnEDuMCeQO8wJ5I4/AAAA//8DAO++A/GNeIQPAAAAAElFTkSuQmCC</mdui:Logo>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:IPHint>192.41.135.192/27</mdui:IPHint>
-        <mdui:IPHint>192.41.132.0/22</mdui:IPHint>
-        <mdui:IPHint>195.176.0.64/27</mdui:IPHint>
-        <mdui:IPHint>192.41.136.0/24</mdui:IPHint>
-        <mdui:IPHint>2001:620:10::/48</mdui:IPHint>
-        <mdui:IPHint>2001:620:13::/48</mdui:IPHint>
-        <mdui:IPHint>160.85.2.16/28</mdui:IPHint>
-        <mdui:IPHint>160.85.2.128/27</mdui:IPHint>
-        <mdui:IPHint>160.85.3.24/29</mdui:IPHint>
-        <mdui:IPHint>160.85.3.128/25</mdui:IPHint>
-        <mdui:IPHint>192.12.247.0/24</mdui:IPHint>
-        <mdui:IPHint>89.206.64.0/18</mdui:IPHint>
-        <mdui:IPHint>130.60.0.0/16</mdui:IPHint>
-        <mdui:IPHint>130.60.10.0/25</mdui:IPHint>
-        <mdui:IPHint>130.60.128.64/26</mdui:IPHint>
-        <mdui:IPHint>193.138.69.0/24</mdui:IPHint>
-        <mdui:DomainHint>uzh.ch</mdui:DomainHint>
-        <mdui:DomainHint>unizh.ch</mdui:DomainHint>
-        <mdui:DomainHint>unizh.edu</mdui:DomainHint>
-        <mdui:DomainHint>uzh.edu</mdui:DomainHint>
-        <mdui:GeolocationHint>geo:47.374571,8.548659</mdui:GeolocationHint>
-        <mdui:GeolocationHint>geo:47.397194,8.548950</mdui:GeolocationHint>
-        <mdui:GeolocationHint>geo:47.410914,8.540683</mdui:GeolocationHint>
-      </mdui:DiscoHints>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIFNjCCBB6gAwIBAgIUBATM4TCBtgHL7TTLYLT51WgCtTAwDQYJKoZIhvcNAQEL
-BQAwTTELMAkGA1UEBhMCQk0xGTAXBgNVBAoTEFF1b1ZhZGlzIExpbWl0ZWQxIzAh
-BgNVBAMTGlF1b1ZhZGlzIEdsb2JhbCBTU0wgSUNBIEcyMB4XDTE0MDMxNDExMzUw
-NVoXDTE2MDMxNDExMzQ1MFowgckxEzARBgsrBgEEAYI3PAIBAxMCQ0gxGDAWBgsr
-BgEEAYI3PAIBAhMHWnVlcmljaDEaMBgGA1UEDxMRR292ZXJubWVudCBFbnRpdHkx
-EzARBgNVBAUTCjE4MzItMDktMjgxCzAJBgNVBAYTAkNIMRAwDgYDVQQIEwdadWVy
-aWNoMRAwDgYDVQQHEwdadWVyaWNoMR0wGwYDVQQKExRVbml2ZXJzaXRhZXQgWnVl
-cmljaDEXMBUGA1UEAxMOYWFpLWlkcC51emguY2gwggEiMA0GCSqGSIb3DQEBAQUA
-A4IBDwAwggEKAoIBAQCiiuVzv5VrRVKDKd5wGJmA+nMY/qi1Pp4qpPM4l//BhAgK
-JPWyLqybIouWSMT2YKB0HITnPm3p7iJtzMtn7YZxK5wBqYenemFJptVUuS9jHzpq
-I3blM8TKUAoTY4b+Mppgj3njtM77a4YiMqEgSnTkPatEQ5QP0g+IOEI8I67FPXCu
-m+N/EDrviVB055ZEo2W2MTJxgTzRf+dpyoOvt0aVYlsKFcXxHiIfxJxufiO5aKgR
-0e/6lSjrOqhsQ+ZFtT6RkmiW2Oidplwo97B6uIh6Fhp/O7EixF8wN3UWMCWiRqh6
-V6VLOc73rK9hE3nnhF1N+UEowvJ8pVV5EoC2tXoVAgMBAAGjggGPMIIBizBzBggr
-BgEFBQcBAQRnMGUwKgYIKwYBBQUHMAGGHmh0dHA6Ly9vY3NwLnF1b3ZhZGlzZ2xv
-YmFsLmNvbTA3BggrBgEFBQcwAoYraHR0cDovL3RydXN0LnF1b3ZhZGlzZ2xvYmFs
-LmNvbS9xdnNzbGcyLmNydDBRBgNVHSAESjBIMEYGDCsGAQQBvlgAAmQBAjA2MDQG
-CCsGAQUFBwIBFihodHRwOi8vd3d3LnF1b3ZhZGlzZ2xvYmFsLmNvbS9yZXBvc2l0
-b3J5MBkGA1UdEQQSMBCCDmFhaS1pZHAudXpoLmNoMAsGA1UdDwQEAwIFoDAdBgNV
-HSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwHwYDVR0jBBgwFoAUkRlirVsXpzD7
-8N45JbG9jLm4UScwOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC5xdW92YWRp
-c2dsb2JhbC5jb20vcXZzc2xnMi5jcmwwHQYDVR0OBBYEFPdmvpYTb49/qkMzUnCN
-CHZqecp4MA0GCSqGSIb3DQEBCwUAA4IBAQBkxNx/LPp/L2FQRJE4XCHrH1f2LR2e
-BZsuBFBmNdAiXxNABZN/NIup7ADTTalALkY9qb0p7sYZOZ/P0mCIaQm4jrE4lXfC
-hW2bIAiqhmhW96Vg1tQt/hJdXOGwK9DgFM2VUfSrKt8MRRWpa/INWJWQIWsn1vZj
-DLrUq69KTMpWStYH/5ChSvbU6TRKRFp24y1OeMdBAP4kJZJoyocDmj3HCvz8VaSl
-kJTDI4IAgCLhzTnk7ljJI3qhaU7F9tp6iclLPcb/h3Zmzq8+cEPbRuXgTnmbSKX0
-o0HpMPl4e0ANFrH5CpAebxkqLtX1zryAm/Pi5wtxEqKwRv+3gUTol02q
-						</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>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://aai-idp.uzh.ch/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://aai-idp.uzh.ch/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://aai-idp.uzh.ch/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://aai-idp.uzh.ch/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">uzh.ch</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">Universität Zürich</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">University of Zurich</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.uzh.ch/</OrganizationURL>
-    <OrganizationURL xml:lang="en">http://www.uzh.ch/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>UZH</GivenName>
-    <SurName>ID Helpdesk</SurName>
-    <EmailAddress>mailto:support@id.uzh.ch</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>UZH</GivenName>
-    <SurName>AAI Administrator</SurName>
-    <EmailAddress>mailto:aaiadm@id.uzh.ch</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/aai-integration.dfn.de-idp-shibboleth.xml b/swamid-interfederations-2.0/aai-integration.dfn.de-idp-shibboleth.xml
deleted file mode 100644
index f211dc89..00000000
--- a/swamid-interfederations-2.0/aai-integration.dfn.de-idp-shibboleth.xml
+++ /dev/null
@@ -1,153 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://aai-integration.dfn.de/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2014-02-09T13:52:03Z">
-      <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">dfn.de</saml1md:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="de">DFN AAI Integration + Test IdP</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">DFN AAI Integration + Test IdP</mdui:DisplayName>
-        <mdui:Description xml:lang="de">AAI Integration and Test IdP operated by DFN-AAI</mdui:Description>
-        <mdui:Description xml:lang="en">AAI Integration and Test IdP operated by DFN-AAI</mdui:Description>
-        <mdui:Logo height="16" width="16">https://www.aai.dfn.de/fileadmin/pics/dfn_small.png</mdui:Logo>
-        <mdui:Logo height="130" width="236">https://www.aai.dfn.de/fileadmin/pics/dfn_big.png</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>aai-integration.dfn.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=aai-integration.dfn.de,OU=Geschaeftsstelle,O=DFN-Verein,L=Berlin,ST=Berlin,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIGsTCCBZmgAwIBAgIHF2OL1edpCjANBgkqhkiG9w0BAQsFADBeMQswCQYDVQQG
-EwJERTETMBEGA1UEChMKREZOLVZlcmVpbjEZMBcGA1UECxMQR2VzY2hhZWZ0c3N0
-ZWxsZTEfMB0GA1UEAxMWREZOLVZlcmVpbi1HUy1DQSAtIEcwMjAeFw0xNDA0MDgx
-NDU3MDlaFw0xODExMzAyMjAwMDBaMIGAMQswCQYDVQQGEwJERTEPMA0GA1UECBMG
-QmVybGluMQ8wDQYDVQQHEwZCZXJsaW4xEzARBgNVBAoTCkRGTi1WZXJlaW4xGTAX
-BgNVBAsTEEdlc2NoYWVmdHNzdGVsbGUxHzAdBgNVBAMTFmFhaS1pbnRlZ3JhdGlv
-bi5kZm4uZGUwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCwFs5WqdeU
-cYUa1Q1E+XzX41AljqcXIrkD0DNQ/80AvGDYZ5IKXs5SwlimXhkaNSW/tvqHAlMJ
-F2aZd0q2jjZBSaKd+DPOfP+tX2jg+2FMz+wGSnvP8BOnru44GRMlZr2nbJSxy6Pp
-gAliaX4xT03xJMqAT5KcdVyG6ZnOofBXDw3DJZTmHrZWw+mnxzvW1+O/ySO+E5q7
-iro+Zn40OZfQZaIDbH5qciE3XwrfMr8tZ2XJC62faGW7ZIr1vNGhAQZj3OBLYDtf
-KJP37LxBuy0zYjOMIWUudfRz9oe8GYTs4sOFpovtX+cO8hZzQtom24fph7+hJPc+
-GQArFjPwoa2QkuQQKXoZRJE3IGSRKutNkpZH4s0kwDfly1qPoMqv8EsjwGQgFe+e
-gmzEyyc4tB4AjldCxObvUjKDcUHsmoc2st2bm0+VUxmwoio4hGi0w4rW/FC9M7UH
-2hKEF9paUMeePRfxDLOG3na4ccK65RcSlYpTHizC8HU3AuQ0AzYB/Tes9Oczder/
-ah/U+b/IeJ7ADm/v1m/2p5GMlrAo78XZt6HhLmm4DKKzdiW6uxAHXv30B0houGgn
-E353AyUzBfERLXEkH3FUFYmOySRGStiUBQ1X4zYOQcvkaYruN4PPvOrHW/8H04lu
-Qfp9kynkF3ivk2RBtJFn6k8Z9g1B4kMOwwIDAQABo4ICTzCCAkswOQYDVR0gBDIw
-MDARBg8rBgEEAYGtIYIsAQEEAwEwEQYPKwYBBAGBrSGCLAIBBAMBMAgGBmeBDAEC
-AjAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAUBggrBgEFBQcDAgYI
-KwYBBQUHAwEwHQYDVR0OBBYEFCVvQOYyQfLPymaCGHMtdPpSAi9aMB8GA1UdIwQY
-MBaAFHmiYi/O8QY5Uud2bWLH3ptqdUtJMCEGA1UdEQQaMBiCFmFhaS1pbnRlZ3Jh
-dGlvbi5kZm4uZGUwgZEGA1UdHwSBiTCBhjBBoD+gPYY7aHR0cDovL2NkcDEucGNh
-LmRmbi5kZS9kZm4tdmVyZWluLWdzLWNhL3B1Yi9jcmwvZ19jYWNybC5jcmwwQaA/
-oD2GO2h0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvZGZuLXZlcmVpbi1ncy1jYS9wdWIv
-Y3JsL2dfY2FjcmwuY3JsMIHfBggrBgEFBQcBAQSB0jCBzzAzBggrBgEFBQcwAYYn
-aHR0cDovL29jc3AucGNhLmRmbi5kZS9PQ1NQLVNlcnZlci9PQ1NQMEsGCCsGAQUF
-BzAChj9odHRwOi8vY2RwMS5wY2EuZGZuLmRlL2Rmbi12ZXJlaW4tZ3MtY2EvcHVi
-L2NhY2VydC9nX2NhY2VydC5jcnQwSwYIKwYBBQUHMAKGP2h0dHA6Ly9jZHAyLnBj
-YS5kZm4uZGUvZGZuLXZlcmVpbi1ncy1jYS9wdWIvY2FjZXJ0L2dfY2FjZXJ0LmNy
-dDANBgkqhkiG9w0BAQsFAAOCAQEAZS3H79/HypaZdIGGU640RM1XrWC+A6iaeiJM
-cCIh7rzi++k3bbJWqZqRIxahtOJ0eyFryzc3CO1fhxIK1hRadvp/ZRxhzMH8Gzxo
-FZDU0uD4dzEHyAlo7Rl6Fvn6Zavl+6zbqr9ZNNJDnzPBD89YNCzMR1tGlhctAqE3
-MGTrIX43sYg3o/dEtE3cGV0H37Ea+vnboIvs4NWnFp9VP/iZfCft+anBrMU9VWjv
-sdBn7ycJhT+qKS+RCATDfldXmV3YUH5h5AegQBJhqoODwAR8pjVEl5p8JYMt2Gay
-fpkR3SKNxMqfBlCFiPbXwVv6m+f8qXHVN6Wp1YCP+XaP5IigLw==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://aai-integration.dfn.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aai-integration.dfn.de:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://aai-integration.dfn.de/idp/profile/SAML2/Redirect/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://aai-integration.dfn.de/idp/profile/SAML2/POST/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aai-integration.dfn.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>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://aai-integration.dfn.de/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://aai-integration.dfn.de/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://aai-integration.dfn.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://aai-integration.dfn.de/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aai-integration.dfn.de/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>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">dfn.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>aai-integration.dfn.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=aai-integration.dfn.de,OU=Geschaeftsstelle,O=DFN-Verein,L=Berlin,ST=Berlin,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIGsTCCBZmgAwIBAgIHF2OL1edpCjANBgkqhkiG9w0BAQsFADBeMQswCQYDVQQG
-EwJERTETMBEGA1UEChMKREZOLVZlcmVpbjEZMBcGA1UECxMQR2VzY2hhZWZ0c3N0
-ZWxsZTEfMB0GA1UEAxMWREZOLVZlcmVpbi1HUy1DQSAtIEcwMjAeFw0xNDA0MDgx
-NDU3MDlaFw0xODExMzAyMjAwMDBaMIGAMQswCQYDVQQGEwJERTEPMA0GA1UECBMG
-QmVybGluMQ8wDQYDVQQHEwZCZXJsaW4xEzARBgNVBAoTCkRGTi1WZXJlaW4xGTAX
-BgNVBAsTEEdlc2NoYWVmdHNzdGVsbGUxHzAdBgNVBAMTFmFhaS1pbnRlZ3JhdGlv
-bi5kZm4uZGUwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCwFs5WqdeU
-cYUa1Q1E+XzX41AljqcXIrkD0DNQ/80AvGDYZ5IKXs5SwlimXhkaNSW/tvqHAlMJ
-F2aZd0q2jjZBSaKd+DPOfP+tX2jg+2FMz+wGSnvP8BOnru44GRMlZr2nbJSxy6Pp
-gAliaX4xT03xJMqAT5KcdVyG6ZnOofBXDw3DJZTmHrZWw+mnxzvW1+O/ySO+E5q7
-iro+Zn40OZfQZaIDbH5qciE3XwrfMr8tZ2XJC62faGW7ZIr1vNGhAQZj3OBLYDtf
-KJP37LxBuy0zYjOMIWUudfRz9oe8GYTs4sOFpovtX+cO8hZzQtom24fph7+hJPc+
-GQArFjPwoa2QkuQQKXoZRJE3IGSRKutNkpZH4s0kwDfly1qPoMqv8EsjwGQgFe+e
-gmzEyyc4tB4AjldCxObvUjKDcUHsmoc2st2bm0+VUxmwoio4hGi0w4rW/FC9M7UH
-2hKEF9paUMeePRfxDLOG3na4ccK65RcSlYpTHizC8HU3AuQ0AzYB/Tes9Oczder/
-ah/U+b/IeJ7ADm/v1m/2p5GMlrAo78XZt6HhLmm4DKKzdiW6uxAHXv30B0houGgn
-E353AyUzBfERLXEkH3FUFYmOySRGStiUBQ1X4zYOQcvkaYruN4PPvOrHW/8H04lu
-Qfp9kynkF3ivk2RBtJFn6k8Z9g1B4kMOwwIDAQABo4ICTzCCAkswOQYDVR0gBDIw
-MDARBg8rBgEEAYGtIYIsAQEEAwEwEQYPKwYBBAGBrSGCLAIBBAMBMAgGBmeBDAEC
-AjAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAUBggrBgEFBQcDAgYI
-KwYBBQUHAwEwHQYDVR0OBBYEFCVvQOYyQfLPymaCGHMtdPpSAi9aMB8GA1UdIwQY
-MBaAFHmiYi/O8QY5Uud2bWLH3ptqdUtJMCEGA1UdEQQaMBiCFmFhaS1pbnRlZ3Jh
-dGlvbi5kZm4uZGUwgZEGA1UdHwSBiTCBhjBBoD+gPYY7aHR0cDovL2NkcDEucGNh
-LmRmbi5kZS9kZm4tdmVyZWluLWdzLWNhL3B1Yi9jcmwvZ19jYWNybC5jcmwwQaA/
-oD2GO2h0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvZGZuLXZlcmVpbi1ncy1jYS9wdWIv
-Y3JsL2dfY2FjcmwuY3JsMIHfBggrBgEFBQcBAQSB0jCBzzAzBggrBgEFBQcwAYYn
-aHR0cDovL29jc3AucGNhLmRmbi5kZS9PQ1NQLVNlcnZlci9PQ1NQMEsGCCsGAQUF
-BzAChj9odHRwOi8vY2RwMS5wY2EuZGZuLmRlL2Rmbi12ZXJlaW4tZ3MtY2EvcHVi
-L2NhY2VydC9nX2NhY2VydC5jcnQwSwYIKwYBBQUHMAKGP2h0dHA6Ly9jZHAyLnBj
-YS5kZm4uZGUvZGZuLXZlcmVpbi1ncy1jYS9wdWIvY2FjZXJ0L2dfY2FjZXJ0LmNy
-dDANBgkqhkiG9w0BAQsFAAOCAQEAZS3H79/HypaZdIGGU640RM1XrWC+A6iaeiJM
-cCIh7rzi++k3bbJWqZqRIxahtOJ0eyFryzc3CO1fhxIK1hRadvp/ZRxhzMH8Gzxo
-FZDU0uD4dzEHyAlo7Rl6Fvn6Zavl+6zbqr9ZNNJDnzPBD89YNCzMR1tGlhctAqE3
-MGTrIX43sYg3o/dEtE3cGV0H37Ea+vnboIvs4NWnFp9VP/iZfCft+anBrMU9VWjv
-sdBn7ycJhT+qKS+RCATDfldXmV3YUH5h5AegQBJhqoODwAR8pjVEl5p8JYMt2Gay
-fpkR3SKNxMqfBlCFiPbXwVv6m+f8qXHVN6Wp1YCP+XaP5IigLw==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://aai-integration.dfn.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aai-integration.dfn.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">e15</OrganizationName>
-    <OrganizationName xml:lang="en">e15</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">Verein zur Förderung eines Deutschen Forschungsnetzes</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>Wolfgang</GivenName>
-    <SurName>Pempe</SurName>
-    <EmailAddress>mailto:hotline@aai.dfn.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="support">
-    <GivenName>DFN-AAI</GivenName>
-    <SurName>Hotline</SurName>
-    <EmailAddress>mailto:hotline@aai.dfn.de</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/aai-integration.dfn.de.xml b/swamid-interfederations-2.0/aai-integration.dfn.de.xml
deleted file mode 100644
index f211dc89..00000000
--- a/swamid-interfederations-2.0/aai-integration.dfn.de.xml
+++ /dev/null
@@ -1,153 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://aai-integration.dfn.de/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2014-02-09T13:52:03Z">
-      <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">dfn.de</saml1md:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="de">DFN AAI Integration + Test IdP</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">DFN AAI Integration + Test IdP</mdui:DisplayName>
-        <mdui:Description xml:lang="de">AAI Integration and Test IdP operated by DFN-AAI</mdui:Description>
-        <mdui:Description xml:lang="en">AAI Integration and Test IdP operated by DFN-AAI</mdui:Description>
-        <mdui:Logo height="16" width="16">https://www.aai.dfn.de/fileadmin/pics/dfn_small.png</mdui:Logo>
-        <mdui:Logo height="130" width="236">https://www.aai.dfn.de/fileadmin/pics/dfn_big.png</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>aai-integration.dfn.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=aai-integration.dfn.de,OU=Geschaeftsstelle,O=DFN-Verein,L=Berlin,ST=Berlin,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIGsTCCBZmgAwIBAgIHF2OL1edpCjANBgkqhkiG9w0BAQsFADBeMQswCQYDVQQG
-EwJERTETMBEGA1UEChMKREZOLVZlcmVpbjEZMBcGA1UECxMQR2VzY2hhZWZ0c3N0
-ZWxsZTEfMB0GA1UEAxMWREZOLVZlcmVpbi1HUy1DQSAtIEcwMjAeFw0xNDA0MDgx
-NDU3MDlaFw0xODExMzAyMjAwMDBaMIGAMQswCQYDVQQGEwJERTEPMA0GA1UECBMG
-QmVybGluMQ8wDQYDVQQHEwZCZXJsaW4xEzARBgNVBAoTCkRGTi1WZXJlaW4xGTAX
-BgNVBAsTEEdlc2NoYWVmdHNzdGVsbGUxHzAdBgNVBAMTFmFhaS1pbnRlZ3JhdGlv
-bi5kZm4uZGUwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCwFs5WqdeU
-cYUa1Q1E+XzX41AljqcXIrkD0DNQ/80AvGDYZ5IKXs5SwlimXhkaNSW/tvqHAlMJ
-F2aZd0q2jjZBSaKd+DPOfP+tX2jg+2FMz+wGSnvP8BOnru44GRMlZr2nbJSxy6Pp
-gAliaX4xT03xJMqAT5KcdVyG6ZnOofBXDw3DJZTmHrZWw+mnxzvW1+O/ySO+E5q7
-iro+Zn40OZfQZaIDbH5qciE3XwrfMr8tZ2XJC62faGW7ZIr1vNGhAQZj3OBLYDtf
-KJP37LxBuy0zYjOMIWUudfRz9oe8GYTs4sOFpovtX+cO8hZzQtom24fph7+hJPc+
-GQArFjPwoa2QkuQQKXoZRJE3IGSRKutNkpZH4s0kwDfly1qPoMqv8EsjwGQgFe+e
-gmzEyyc4tB4AjldCxObvUjKDcUHsmoc2st2bm0+VUxmwoio4hGi0w4rW/FC9M7UH
-2hKEF9paUMeePRfxDLOG3na4ccK65RcSlYpTHizC8HU3AuQ0AzYB/Tes9Oczder/
-ah/U+b/IeJ7ADm/v1m/2p5GMlrAo78XZt6HhLmm4DKKzdiW6uxAHXv30B0houGgn
-E353AyUzBfERLXEkH3FUFYmOySRGStiUBQ1X4zYOQcvkaYruN4PPvOrHW/8H04lu
-Qfp9kynkF3ivk2RBtJFn6k8Z9g1B4kMOwwIDAQABo4ICTzCCAkswOQYDVR0gBDIw
-MDARBg8rBgEEAYGtIYIsAQEEAwEwEQYPKwYBBAGBrSGCLAIBBAMBMAgGBmeBDAEC
-AjAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAUBggrBgEFBQcDAgYI
-KwYBBQUHAwEwHQYDVR0OBBYEFCVvQOYyQfLPymaCGHMtdPpSAi9aMB8GA1UdIwQY
-MBaAFHmiYi/O8QY5Uud2bWLH3ptqdUtJMCEGA1UdEQQaMBiCFmFhaS1pbnRlZ3Jh
-dGlvbi5kZm4uZGUwgZEGA1UdHwSBiTCBhjBBoD+gPYY7aHR0cDovL2NkcDEucGNh
-LmRmbi5kZS9kZm4tdmVyZWluLWdzLWNhL3B1Yi9jcmwvZ19jYWNybC5jcmwwQaA/
-oD2GO2h0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvZGZuLXZlcmVpbi1ncy1jYS9wdWIv
-Y3JsL2dfY2FjcmwuY3JsMIHfBggrBgEFBQcBAQSB0jCBzzAzBggrBgEFBQcwAYYn
-aHR0cDovL29jc3AucGNhLmRmbi5kZS9PQ1NQLVNlcnZlci9PQ1NQMEsGCCsGAQUF
-BzAChj9odHRwOi8vY2RwMS5wY2EuZGZuLmRlL2Rmbi12ZXJlaW4tZ3MtY2EvcHVi
-L2NhY2VydC9nX2NhY2VydC5jcnQwSwYIKwYBBQUHMAKGP2h0dHA6Ly9jZHAyLnBj
-YS5kZm4uZGUvZGZuLXZlcmVpbi1ncy1jYS9wdWIvY2FjZXJ0L2dfY2FjZXJ0LmNy
-dDANBgkqhkiG9w0BAQsFAAOCAQEAZS3H79/HypaZdIGGU640RM1XrWC+A6iaeiJM
-cCIh7rzi++k3bbJWqZqRIxahtOJ0eyFryzc3CO1fhxIK1hRadvp/ZRxhzMH8Gzxo
-FZDU0uD4dzEHyAlo7Rl6Fvn6Zavl+6zbqr9ZNNJDnzPBD89YNCzMR1tGlhctAqE3
-MGTrIX43sYg3o/dEtE3cGV0H37Ea+vnboIvs4NWnFp9VP/iZfCft+anBrMU9VWjv
-sdBn7ycJhT+qKS+RCATDfldXmV3YUH5h5AegQBJhqoODwAR8pjVEl5p8JYMt2Gay
-fpkR3SKNxMqfBlCFiPbXwVv6m+f8qXHVN6Wp1YCP+XaP5IigLw==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://aai-integration.dfn.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aai-integration.dfn.de:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://aai-integration.dfn.de/idp/profile/SAML2/Redirect/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://aai-integration.dfn.de/idp/profile/SAML2/POST/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aai-integration.dfn.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>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://aai-integration.dfn.de/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://aai-integration.dfn.de/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://aai-integration.dfn.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://aai-integration.dfn.de/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aai-integration.dfn.de/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>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">dfn.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>aai-integration.dfn.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=aai-integration.dfn.de,OU=Geschaeftsstelle,O=DFN-Verein,L=Berlin,ST=Berlin,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIGsTCCBZmgAwIBAgIHF2OL1edpCjANBgkqhkiG9w0BAQsFADBeMQswCQYDVQQG
-EwJERTETMBEGA1UEChMKREZOLVZlcmVpbjEZMBcGA1UECxMQR2VzY2hhZWZ0c3N0
-ZWxsZTEfMB0GA1UEAxMWREZOLVZlcmVpbi1HUy1DQSAtIEcwMjAeFw0xNDA0MDgx
-NDU3MDlaFw0xODExMzAyMjAwMDBaMIGAMQswCQYDVQQGEwJERTEPMA0GA1UECBMG
-QmVybGluMQ8wDQYDVQQHEwZCZXJsaW4xEzARBgNVBAoTCkRGTi1WZXJlaW4xGTAX
-BgNVBAsTEEdlc2NoYWVmdHNzdGVsbGUxHzAdBgNVBAMTFmFhaS1pbnRlZ3JhdGlv
-bi5kZm4uZGUwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCwFs5WqdeU
-cYUa1Q1E+XzX41AljqcXIrkD0DNQ/80AvGDYZ5IKXs5SwlimXhkaNSW/tvqHAlMJ
-F2aZd0q2jjZBSaKd+DPOfP+tX2jg+2FMz+wGSnvP8BOnru44GRMlZr2nbJSxy6Pp
-gAliaX4xT03xJMqAT5KcdVyG6ZnOofBXDw3DJZTmHrZWw+mnxzvW1+O/ySO+E5q7
-iro+Zn40OZfQZaIDbH5qciE3XwrfMr8tZ2XJC62faGW7ZIr1vNGhAQZj3OBLYDtf
-KJP37LxBuy0zYjOMIWUudfRz9oe8GYTs4sOFpovtX+cO8hZzQtom24fph7+hJPc+
-GQArFjPwoa2QkuQQKXoZRJE3IGSRKutNkpZH4s0kwDfly1qPoMqv8EsjwGQgFe+e
-gmzEyyc4tB4AjldCxObvUjKDcUHsmoc2st2bm0+VUxmwoio4hGi0w4rW/FC9M7UH
-2hKEF9paUMeePRfxDLOG3na4ccK65RcSlYpTHizC8HU3AuQ0AzYB/Tes9Oczder/
-ah/U+b/IeJ7ADm/v1m/2p5GMlrAo78XZt6HhLmm4DKKzdiW6uxAHXv30B0houGgn
-E353AyUzBfERLXEkH3FUFYmOySRGStiUBQ1X4zYOQcvkaYruN4PPvOrHW/8H04lu
-Qfp9kynkF3ivk2RBtJFn6k8Z9g1B4kMOwwIDAQABo4ICTzCCAkswOQYDVR0gBDIw
-MDARBg8rBgEEAYGtIYIsAQEEAwEwEQYPKwYBBAGBrSGCLAIBBAMBMAgGBmeBDAEC
-AjAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAUBggrBgEFBQcDAgYI
-KwYBBQUHAwEwHQYDVR0OBBYEFCVvQOYyQfLPymaCGHMtdPpSAi9aMB8GA1UdIwQY
-MBaAFHmiYi/O8QY5Uud2bWLH3ptqdUtJMCEGA1UdEQQaMBiCFmFhaS1pbnRlZ3Jh
-dGlvbi5kZm4uZGUwgZEGA1UdHwSBiTCBhjBBoD+gPYY7aHR0cDovL2NkcDEucGNh
-LmRmbi5kZS9kZm4tdmVyZWluLWdzLWNhL3B1Yi9jcmwvZ19jYWNybC5jcmwwQaA/
-oD2GO2h0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvZGZuLXZlcmVpbi1ncy1jYS9wdWIv
-Y3JsL2dfY2FjcmwuY3JsMIHfBggrBgEFBQcBAQSB0jCBzzAzBggrBgEFBQcwAYYn
-aHR0cDovL29jc3AucGNhLmRmbi5kZS9PQ1NQLVNlcnZlci9PQ1NQMEsGCCsGAQUF
-BzAChj9odHRwOi8vY2RwMS5wY2EuZGZuLmRlL2Rmbi12ZXJlaW4tZ3MtY2EvcHVi
-L2NhY2VydC9nX2NhY2VydC5jcnQwSwYIKwYBBQUHMAKGP2h0dHA6Ly9jZHAyLnBj
-YS5kZm4uZGUvZGZuLXZlcmVpbi1ncy1jYS9wdWIvY2FjZXJ0L2dfY2FjZXJ0LmNy
-dDANBgkqhkiG9w0BAQsFAAOCAQEAZS3H79/HypaZdIGGU640RM1XrWC+A6iaeiJM
-cCIh7rzi++k3bbJWqZqRIxahtOJ0eyFryzc3CO1fhxIK1hRadvp/ZRxhzMH8Gzxo
-FZDU0uD4dzEHyAlo7Rl6Fvn6Zavl+6zbqr9ZNNJDnzPBD89YNCzMR1tGlhctAqE3
-MGTrIX43sYg3o/dEtE3cGV0H37Ea+vnboIvs4NWnFp9VP/iZfCft+anBrMU9VWjv
-sdBn7ycJhT+qKS+RCATDfldXmV3YUH5h5AegQBJhqoODwAR8pjVEl5p8JYMt2Gay
-fpkR3SKNxMqfBlCFiPbXwVv6m+f8qXHVN6Wp1YCP+XaP5IigLw==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://aai-integration.dfn.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aai-integration.dfn.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">e15</OrganizationName>
-    <OrganizationName xml:lang="en">e15</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">Verein zur Förderung eines Deutschen Forschungsnetzes</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>Wolfgang</GivenName>
-    <SurName>Pempe</SurName>
-    <EmailAddress>mailto:hotline@aai.dfn.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="support">
-    <GivenName>DFN-AAI</GivenName>
-    <SurName>Hotline</SurName>
-    <EmailAddress>mailto:hotline@aai.dfn.de</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/aai-login.fh-htwchur.ch-idp-shibboleth.xml b/swamid-interfederations-2.0/aai-login.fh-htwchur.ch-idp-shibboleth.xml
deleted file mode 100644
index 9b355f22..00000000
--- a/swamid-interfederations-2.0/aai-login.fh-htwchur.ch-idp-shibboleth.xml
+++ /dev/null
@@ -1,124 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://aai-login.fh-htwchur.ch/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://rr.aai.switch.ch/" registrationInstant="2014-09-30T11:15:35Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.switch.ch/aai/federation/switchaai/metadata-registration-practice-statement-20110711.txt</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-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-    <Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fh-htwchur.ch</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="de">HTW Chur - Hochschule für Technik und Wirtschaft</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">HTW Chur - University of Applied Sciences HTW Chur</mdui:DisplayName>
-        <mdui:Description xml:lang="de">Hochschule für Technik und Wirtschaft Chur</mdui:Description>
-        <mdui:Description xml:lang="en">University of Applied Sciences HTW Chur</mdui:Description>
-        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAACSNpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+Cjx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IlhNUCBDb3JlIDUuMS4yIj4KICAgPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4KICAgICAgPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIvPgogICA8L3JkZjpSREY+CjwveDp4bXBtZXRhPgogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgCjw/eHBhY2tldCBlbmQ9InciPz4s45Y3AAABv0lEQVR4nGL4//8/A4OSRQkKVrYsYZDU1GYAAk5OLgYokFRVVfP19fVvLCwq2ZqZlfMMKMbNADYgY8V/FJy1+j+DT3UCTGdEZLTVvPmL/q9Zt/H/9p17/u8/eOT/gkVLgBoZrCAG5Kz/j4LzNv9n8G+EG5CUnMq7d/+hv7v3Hvi/a8/+/yB67fpN/9U1NHKgBqz7j4LzNgENaIAbYGdnz7B5645bIM0wDHKJj6/fXBwuQDWAm5uHYfnKNav27DsId8G+A4f/5xUUnoMYkA20FRnnohoAAjNmzak8cOjo/5279/3fuHnb86XLVm5OS8+shBhgHMyLgk1CeBlUbVlBGhkZGcEGJKekqVXX1AUAA1TGxNQMYTLYAFyAhR1McXFxY5UGG47XAGIAXgNYORkYmJiJMCCirxYFR06sZXDI0IcrEpJjYAhqTWGI6IeqAdJhPbUMKtbuEANAoY6MC7b+ZwhoSoAbIK7GwJC27Aw4gYHkQdEMim5drwlEpQMGcVUGhpTFZxhyNiDUZK0BGuA5gaiUSNiA7PWIRESWC7LX/kfBuRv/M/jVoxmw6AxYI1gN0KJMYI7V8ZgAAAAA//8DADTpV5fxOZV6AAAAAElFTkSuQmCC</mdui:Logo>
-        <mdui:Logo height="60" width="80">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFAAAAA8CAYAAADxJz2MAAAAAXNSR0IArs4c6QAACSNpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+Cjx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IlhNUCBDb3JlIDUuMS4yIj4KICAgPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4KICAgICAgPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIvPgogICA8L3JkZjpSREY+CjwveDp4bXBtZXRhPgogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgCjw/eHBhY2tldCBlbmQ9InciPz4s45Y3AAAH2UlEQVR4nOyYSUxVZxTHn9G4qKZRa+PCXatNUaBqNdHQ1saoCxtr00XLQqMNC4e4MTGxCnHYNHGIVotFLAUFUQQHxAFwnhWcR0AQmZHBERAQ9PT9Dl763tNHjO3Lly/t4p973/ede77/PfeMzyUirv/x7jBOwHYYJ2A7jBOwHcYJ2A7jBGyHcQK2wzgB22GcgO0wTsB2GCdgO4wTsB3GCdgO4wRsh3ECtsM4AdthnIDtME7AdhgnYDuME7AdxgnYDlf2mTJJySyU7VlFCu7TjxZLS2u7eAq2t7dLU1OTPHjwQMrKyuTu3bvCmj/FJSUlcufOHeGKbEFBgdTV1cn9+/fl9u3bUlRUJHl5ebqPPmSrqqqkvLxc9ziHZ9j31Hv8+HGJiYmR3bt3S2trqz7X1tbml0fADRjyfYq4gn4TV/D6DgyJlr5fxkvNg2edpHjxq1evysWLFyU3N1dx4cIFaWxs9Et85syZ0qtXL1mwYIFMnDhR+vXrJzt37pRp06bJ8OHD9feIESNk1KhRMm/ePOndu7csX75cZs2aJUFBQZKZmSkDBgzQ347Offv2qQwfIDk5WRISEiQ6OlqePHnSpQFfvnwpL168CIiRXSPC08Q1LEZcn8d2YPgGGTB+s9Q+/NuADx8+lJycHDWgA4xYW1vrl9SZM2ekR48e+qIREREyePBg4UXmzp0r27dvVwPGxsbKjBkz1OsGDRokSUlJsnDhQpUtLCxUQ1dXV3eesWTJEqmvr/fitXjxYlmxYoWsXbtW+I2RnfPRu3XrVvXYrrgG3IAtLS1y+fLl1wx47949v6TOnj0r3bt3l8mTJ0toaKgMHTpUnj9/rmHHi+Fxqamp+hv5+fPny5gxY2TkyJHqueHh4TJ9+vRO/Rh/6dKl0tDQ4HUmBqypqVFDHT16VFauXKn7iYmJGjXLli2TioqKgBhPDTjsx1Rxhf6uhlN8FiMfjtvkZUDI37p1S8MW43HFI2/evKle9SbFeEK3bt30JRYtWiQDBw7s9J7r169Lz5491TOc5y9duuRm45Lx48fL1KlT9T4jI8NLN57Gh+MeXUeOHFHPIwcie+jQIVm1apXub9y4Ua5cuSLr1q2Tp0+fBs6AY39Klz5hcdLnq/gOfPGnfPLtVql71Ox1KIXg/PnzakAMQIKvrKx8Y27BKLNnz5YhQ4ZofpsyZYqEhIRoiLI/Z84cCQ4OlgkTJmjhYA0jTJo0SfMahSIsLEwePXrkpRvPjYyMVKNFRUXJqVOnZNu2bWrAY8eO6cdKSUmRNWvW6LlwJoX4eu2/asDquiYprXoqpdUNHahqkIqaRrdhvD2Lr0geoRJ3VX0dEPa+IIQ995qbm708GEM4vx1ZX7BO1XaM4nDhQzrPwhM5fr8N139kwEAq/y/AOAHbETDFTgg6VdbBm0LKd83zGcKQ9EHIO2vckw89+1DfYkY68D3bE4Q8Mk5qAaQUZ89Xl+dv+DicXftPlEhiRr4k7S1QJGYUSNrBImn2mESamtskJatQEl/JqFx6nlzJr/NLkGJDlc7KyuosOPR2Bw8e1EpaWlraOdEcPnxY6NuYPujlTp48qVMK7Qmg3WHiKC4u1taJPEyxoBvgeaYV2ibaGIoS53IWhYVqjSEfP36sUxAFkBxJl4BuChF9KRUcHfn5+cqZK/JckeUd4IxeWiZkMLQrmEnkU/ckMnR9B4KipY/PJFJ+v1HeGx2ne51yH/0qP68979eAEOOF4uPjtcXYsmWLGo+D+Z2WlqZr2dnZur5//37ZtWuXksU4q1evVsNiUAzIC9LbXbt2Tc/EyDTicXFxkp6eLidOnJC9e/eqXnShh57Q+TCs7dixQw4cOKCVm7PRDUcqP20PvOADRzhQwdG7Z88e1b1582aVQ4ZJSQ34No00Vbnv2ISOPtGRc498Uetz/RqQL84BeAAegZfcuHFDrxDHo/i67OFVjGNc8SqmD2TxJkITj8FzeObZsw5e6MUj8Qj0sEfbw7Pox7vwIHQQbkQE+pGBA+cQmo5nkhK4so8c5+HdtEbo4Dzu4cU9e4R9wAzIS/CyTvOMMf3NoxDBS3zXeUGMxD0pwLe1IWdhAM819PAck5MzgXjmz38brmE/vD6J9PeZRDDg++6wZq9Tzh32kdE5fonRdPNFcXXCj8mFNb4ga6dPn5Zz585pCPFlCU/2+ScGbyQFMGnwLB60YcMGlSd0kWMPoAcdrJPzCF2SPKHMHiFM2Dv6kEUPOjAyXMjJyPmbqro04LiIPdLfbZz+Xyd0wD2NBH23zWsSqXI32x9/k6x7jtwHo/+QX+Iu+T0QQ0GYvEJyJm9wTx5iIiGvMGo5eY/cxL81GILwY59nCCdCjhxGLiSBk8O4IkOe3LRpk+rBaJyJVzq5jfxKuJLzOJt91jiPez4cH4lC8i6e6sLTKt0eVln7Cu776vomr0mk3X2PET3l8MonjV23CVQtwthpEaiGhBd5hkmCdUIcGVoSvMQJZfIeL4T3OS/Gc3gP+QqPdnTisXgdz3LFkwhfdPJXHGdRuZ2K7JyLLFf235RC3sqAgcoN74JAj12BgHECtsM4AdthnIDtME7AdhgnYDuME7AdxgnYDuMEbIdxArbDOAHbYZyA7TBOwHYYJ2A7jBOwHcYJ2A7jBGyHcQK2wzgB22GcgO0wTsB2GCdgO/4CAAD//wMAgSuJBTXmaCsAAAAASUVORK5CYII=</mdui:Logo>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:IPHint>193.5.58.254/32</mdui:IPHint>
-        <mdui:IPHint>193.5.58.11/32</mdui:IPHint>
-        <mdui:IPHint>193.5.58.23/32</mdui:IPHint>
-        <mdui:IPHint>195.176.242.0/24</mdui:IPHint>
-        <mdui:DomainHint>fh-htwchur.ch</mdui:DomainHint>
-        <mdui:DomainHint>htwchur.ch</mdui:DomainHint>
-        <mdui:GeolocationHint>geo:46.852909,9.512614</mdui:GeolocationHint>
-      </mdui:DiscoHints>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDPDCCAiSgAwIBAgIJAKE9WIOjgzuqMA0GCSqGSIb3DQEBBQUAMCIxIDAeBgNV
-BAMTF2FhaS1sb2dpbi5maC1odHdjaHVyLmNoMB4XDTEyMDcxMTE0MjQyMFoXDTE1
-MDcxMTE0MjQyMFowIjEgMB4GA1UEAxMXYWFpLWxvZ2luLmZoLWh0d2NodXIuY2gw
-ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDEN/79VVK/NhLKXtKTGQqw
-dC7TxQMe4Prdp+I/pJHGpk94Ub9DmguD4B5zqdQO2wof7nHoDFAejOvaNyt6i9Nh
-XBGSIHE9xdd2SVtewbklsDzTjw9MB36vq07/YNM81/F5P9Cqi3XZwYfvatBn+2L/
-PcibWkRlhZJkBj552I2Rryq22lq1YIRGb9AdKpBPKLAU/WXUb3RA2IieCmMoo3Oy
-etcYmwqWX+Ixl4RA/NGXKxViC5ArKub660TbETKNKrfnoH7Lby4yJomUNKFOh6DH
-N/fcIc2+SJcgIKvkhpn6rKBEkKzZ/gJCmAXMus9+Nl3QeT+QThkGtvlAEOouJWHN
-AgMBAAGjdTBzMFIGA1UdEQRLMEmCF2FhaS1sb2dpbi5maC1odHdjaHVyLmNohi5o
-dHRwczovL2FhaS1sb2dpbi5maC1odHdjaHVyLmNoL2lkcC9zaGliYm9sZXRoMB0G
-A1UdDgQWBBQDA6qXY/SX7EaQXqUAK8sZxx+qEDANBgkqhkiG9w0BAQUFAAOCAQEA
-T2IAryzI+8HmvprZ/ov5VForqxJejRsBM02n2fMXyo3x4MqQVYTs4snsbM2LBmC6
-Hr5mXtwSMQagnArbg0hzJosGxSYMmv/M80jnpnnXkgnL2xWZzvCpc410n/qz9csa
-l7azAx3zHazW10PzNu44AmWT+wy+bDVtodDxmytfs0LbaW0TDzXVX2+FGp4dYuEz
-LpGz51VGv7dN4A0UweO7S3QJjTq4Vara326zprde+eVKOc32AxRKG0bJSSTY4bp3
-tBvjpsFG5Or9Sv0khcuYsfqKDY/8yKgrY2P+VI61/sFuUFoF56cJLTMddszkfdJY
-YpkbbBiPxDcMDk93CCNE2w==
-						</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://aai-login.fh-htwchur.ch/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aai-login.fh-htwchur.ch/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-login.fh-htwchur.ch/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://aai-login.fh-htwchur.ch/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://aai-login.fh-htwchur.ch/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://aai-login.fh-htwchur.ch/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
-    <Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fh-htwchur.ch</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDPDCCAiSgAwIBAgIJAKE9WIOjgzuqMA0GCSqGSIb3DQEBBQUAMCIxIDAeBgNV
-BAMTF2FhaS1sb2dpbi5maC1odHdjaHVyLmNoMB4XDTEyMDcxMTE0MjQyMFoXDTE1
-MDcxMTE0MjQyMFowIjEgMB4GA1UEAxMXYWFpLWxvZ2luLmZoLWh0d2NodXIuY2gw
-ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDEN/79VVK/NhLKXtKTGQqw
-dC7TxQMe4Prdp+I/pJHGpk94Ub9DmguD4B5zqdQO2wof7nHoDFAejOvaNyt6i9Nh
-XBGSIHE9xdd2SVtewbklsDzTjw9MB36vq07/YNM81/F5P9Cqi3XZwYfvatBn+2L/
-PcibWkRlhZJkBj552I2Rryq22lq1YIRGb9AdKpBPKLAU/WXUb3RA2IieCmMoo3Oy
-etcYmwqWX+Ixl4RA/NGXKxViC5ArKub660TbETKNKrfnoH7Lby4yJomUNKFOh6DH
-N/fcIc2+SJcgIKvkhpn6rKBEkKzZ/gJCmAXMus9+Nl3QeT+QThkGtvlAEOouJWHN
-AgMBAAGjdTBzMFIGA1UdEQRLMEmCF2FhaS1sb2dpbi5maC1odHdjaHVyLmNohi5o
-dHRwczovL2FhaS1sb2dpbi5maC1odHdjaHVyLmNoL2lkcC9zaGliYm9sZXRoMB0G
-A1UdDgQWBBQDA6qXY/SX7EaQXqUAK8sZxx+qEDANBgkqhkiG9w0BAQUFAAOCAQEA
-T2IAryzI+8HmvprZ/ov5VForqxJejRsBM02n2fMXyo3x4MqQVYTs4snsbM2LBmC6
-Hr5mXtwSMQagnArbg0hzJosGxSYMmv/M80jnpnnXkgnL2xWZzvCpc410n/qz9csa
-l7azAx3zHazW10PzNu44AmWT+wy+bDVtodDxmytfs0LbaW0TDzXVX2+FGp4dYuEz
-LpGz51VGv7dN4A0UweO7S3QJjTq4Vara326zprde+eVKOc32AxRKG0bJSSTY4bp3
-tBvjpsFG5Or9Sv0khcuYsfqKDY/8yKgrY2P+VI61/sFuUFoF56cJLTMddszkfdJY
-YpkbbBiPxDcMDk93CCNE2w==
-						</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://aai-login.fh-htwchur.ch/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aai-login.fh-htwchur.ch/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">fh-htwchur.ch</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">HTW Chur - Hochschule für Technik und Wirtschaft</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">HTW Chur - University of Applied Sciences HTW Chur</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.fh-htwchur.ch/</OrganizationURL>
-    <OrganizationURL xml:lang="en">http://www.fh-htwchur.ch/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>AAI</GivenName>
-    <SurName>HTW</SurName>
-    <EmailAddress>mailto:aai@htwchur.ch</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>SWITCHaai</GivenName>
-    <SurName>Team</SurName>
-    <EmailAddress>mailto:aai@switch.ch</EmailAddress>
-    <TelephoneNumber>+41 44 268 15 05</TelephoneNumber>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/aai-login.fh-htwchur.ch.xml b/swamid-interfederations-2.0/aai-login.fh-htwchur.ch.xml
deleted file mode 100644
index 9b355f22..00000000
--- a/swamid-interfederations-2.0/aai-login.fh-htwchur.ch.xml
+++ /dev/null
@@ -1,124 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://aai-login.fh-htwchur.ch/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://rr.aai.switch.ch/" registrationInstant="2014-09-30T11:15:35Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.switch.ch/aai/federation/switchaai/metadata-registration-practice-statement-20110711.txt</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-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-    <Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fh-htwchur.ch</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="de">HTW Chur - Hochschule für Technik und Wirtschaft</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">HTW Chur - University of Applied Sciences HTW Chur</mdui:DisplayName>
-        <mdui:Description xml:lang="de">Hochschule für Technik und Wirtschaft Chur</mdui:Description>
-        <mdui:Description xml:lang="en">University of Applied Sciences HTW Chur</mdui:Description>
-        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAACSNpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+Cjx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IlhNUCBDb3JlIDUuMS4yIj4KICAgPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4KICAgICAgPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIvPgogICA8L3JkZjpSREY+CjwveDp4bXBtZXRhPgogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgCjw/eHBhY2tldCBlbmQ9InciPz4s45Y3AAABv0lEQVR4nGL4//8/A4OSRQkKVrYsYZDU1GYAAk5OLgYokFRVVfP19fVvLCwq2ZqZlfMMKMbNADYgY8V/FJy1+j+DT3UCTGdEZLTVvPmL/q9Zt/H/9p17/u8/eOT/gkVLgBoZrCAG5Kz/j4LzNv9n8G+EG5CUnMq7d/+hv7v3Hvi/a8/+/yB67fpN/9U1NHKgBqz7j4LzNgENaIAbYGdnz7B5645bIM0wDHKJj6/fXBwuQDWAm5uHYfnKNav27DsId8G+A4f/5xUUnoMYkA20FRnnohoAAjNmzak8cOjo/5279/3fuHnb86XLVm5OS8+shBhgHMyLgk1CeBlUbVlBGhkZGcEGJKekqVXX1AUAA1TGxNQMYTLYAFyAhR1McXFxY5UGG47XAGIAXgNYORkYmJiJMCCirxYFR06sZXDI0IcrEpJjYAhqTWGI6IeqAdJhPbUMKtbuEANAoY6MC7b+ZwhoSoAbIK7GwJC27Aw4gYHkQdEMim5drwlEpQMGcVUGhpTFZxhyNiDUZK0BGuA5gaiUSNiA7PWIRESWC7LX/kfBuRv/M/jVoxmw6AxYI1gN0KJMYI7V8ZgAAAAA//8DADTpV5fxOZV6AAAAAElFTkSuQmCC</mdui:Logo>
-        <mdui:Logo height="60" width="80">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFAAAAA8CAYAAADxJz2MAAAAAXNSR0IArs4c6QAACSNpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+Cjx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IlhNUCBDb3JlIDUuMS4yIj4KICAgPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4KICAgICAgPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIvPgogICA8L3JkZjpSREY+CjwveDp4bXBtZXRhPgogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgCjw/eHBhY2tldCBlbmQ9InciPz4s45Y3AAAH2UlEQVR4nOyYSUxVZxTHn9G4qKZRa+PCXatNUaBqNdHQ1saoCxtr00XLQqMNC4e4MTGxCnHYNHGIVotFLAUFUQQHxAFwnhWcR0AQmZHBERAQ9PT9Dl763tNHjO3Lly/t4p973/ede77/PfeMzyUirv/x7jBOwHYYJ2A7jBOwHcYJ2A7jBGyHcQK2wzgB22GcgO0wTsB2GCdgO4wTsB3GCdgO4wRsh3ECtsM4AdthnIDtME7AdhgnYDuME7AdxgnYDlf2mTJJySyU7VlFCu7TjxZLS2u7eAq2t7dLU1OTPHjwQMrKyuTu3bvCmj/FJSUlcufOHeGKbEFBgdTV1cn9+/fl9u3bUlRUJHl5ebqPPmSrqqqkvLxc9ziHZ9j31Hv8+HGJiYmR3bt3S2trqz7X1tbml0fADRjyfYq4gn4TV/D6DgyJlr5fxkvNg2edpHjxq1evysWLFyU3N1dx4cIFaWxs9Et85syZ0qtXL1mwYIFMnDhR+vXrJzt37pRp06bJ8OHD9feIESNk1KhRMm/ePOndu7csX75cZs2aJUFBQZKZmSkDBgzQ347Offv2qQwfIDk5WRISEiQ6OlqePHnSpQFfvnwpL168CIiRXSPC08Q1LEZcn8d2YPgGGTB+s9Q+/NuADx8+lJycHDWgA4xYW1vrl9SZM2ekR48e+qIREREyePBg4UXmzp0r27dvVwPGxsbKjBkz1OsGDRokSUlJsnDhQpUtLCxUQ1dXV3eesWTJEqmvr/fitXjxYlmxYoWsXbtW+I2RnfPRu3XrVvXYrrgG3IAtLS1y+fLl1wx47949v6TOnj0r3bt3l8mTJ0toaKgMHTpUnj9/rmHHi+Fxqamp+hv5+fPny5gxY2TkyJHqueHh4TJ9+vRO/Rh/6dKl0tDQ4HUmBqypqVFDHT16VFauXKn7iYmJGjXLli2TioqKgBhPDTjsx1Rxhf6uhlN8FiMfjtvkZUDI37p1S8MW43HFI2/evKle9SbFeEK3bt30JRYtWiQDBw7s9J7r169Lz5491TOc5y9duuRm45Lx48fL1KlT9T4jI8NLN57Gh+MeXUeOHFHPIwcie+jQIVm1apXub9y4Ua5cuSLr1q2Tp0+fBs6AY39Klz5hcdLnq/gOfPGnfPLtVql71Ox1KIXg/PnzakAMQIKvrKx8Y27BKLNnz5YhQ4ZofpsyZYqEhIRoiLI/Z84cCQ4OlgkTJmjhYA0jTJo0SfMahSIsLEwePXrkpRvPjYyMVKNFRUXJqVOnZNu2bWrAY8eO6cdKSUmRNWvW6LlwJoX4eu2/asDquiYprXoqpdUNHahqkIqaRrdhvD2Lr0geoRJ3VX0dEPa+IIQ995qbm708GEM4vx1ZX7BO1XaM4nDhQzrPwhM5fr8N139kwEAq/y/AOAHbETDFTgg6VdbBm0LKd83zGcKQ9EHIO2vckw89+1DfYkY68D3bE4Q8Mk5qAaQUZ89Xl+dv+DicXftPlEhiRr4k7S1QJGYUSNrBImn2mESamtskJatQEl/JqFx6nlzJr/NLkGJDlc7KyuosOPR2Bw8e1EpaWlraOdEcPnxY6NuYPujlTp48qVMK7Qmg3WHiKC4u1taJPEyxoBvgeaYV2ibaGIoS53IWhYVqjSEfP36sUxAFkBxJl4BuChF9KRUcHfn5+cqZK/JckeUd4IxeWiZkMLQrmEnkU/ckMnR9B4KipY/PJFJ+v1HeGx2ne51yH/0qP68979eAEOOF4uPjtcXYsmWLGo+D+Z2WlqZr2dnZur5//37ZtWuXksU4q1evVsNiUAzIC9LbXbt2Tc/EyDTicXFxkp6eLidOnJC9e/eqXnShh57Q+TCs7dixQw4cOKCVm7PRDUcqP20PvOADRzhQwdG7Z88e1b1582aVQ4ZJSQ34No00Vbnv2ISOPtGRc498Uetz/RqQL84BeAAegZfcuHFDrxDHo/i67OFVjGNc8SqmD2TxJkITj8FzeObZsw5e6MUj8Qj0sEfbw7Pox7vwIHQQbkQE+pGBA+cQmo5nkhK4so8c5+HdtEbo4Dzu4cU9e4R9wAzIS/CyTvOMMf3NoxDBS3zXeUGMxD0pwLe1IWdhAM819PAck5MzgXjmz38brmE/vD6J9PeZRDDg++6wZq9Tzh32kdE5fonRdPNFcXXCj8mFNb4ga6dPn5Zz585pCPFlCU/2+ScGbyQFMGnwLB60YcMGlSd0kWMPoAcdrJPzCF2SPKHMHiFM2Dv6kEUPOjAyXMjJyPmbqro04LiIPdLfbZz+Xyd0wD2NBH23zWsSqXI32x9/k6x7jtwHo/+QX+Iu+T0QQ0GYvEJyJm9wTx5iIiGvMGo5eY/cxL81GILwY59nCCdCjhxGLiSBk8O4IkOe3LRpk+rBaJyJVzq5jfxKuJLzOJt91jiPez4cH4lC8i6e6sLTKt0eVln7Cu776vomr0mk3X2PET3l8MonjV23CVQtwthpEaiGhBd5hkmCdUIcGVoSvMQJZfIeL4T3OS/Gc3gP+QqPdnTisXgdz3LFkwhfdPJXHGdRuZ2K7JyLLFf235RC3sqAgcoN74JAj12BgHECtsM4AdthnIDtME7AdhgnYDuME7AdxgnYDuMEbIdxArbDOAHbYZyA7TBOwHYYJ2A7jBOwHcYJ2A7jBGyHcQK2wzgB22GcgO0wTsB2GCdgO/4CAAD//wMAgSuJBTXmaCsAAAAASUVORK5CYII=</mdui:Logo>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:IPHint>193.5.58.254/32</mdui:IPHint>
-        <mdui:IPHint>193.5.58.11/32</mdui:IPHint>
-        <mdui:IPHint>193.5.58.23/32</mdui:IPHint>
-        <mdui:IPHint>195.176.242.0/24</mdui:IPHint>
-        <mdui:DomainHint>fh-htwchur.ch</mdui:DomainHint>
-        <mdui:DomainHint>htwchur.ch</mdui:DomainHint>
-        <mdui:GeolocationHint>geo:46.852909,9.512614</mdui:GeolocationHint>
-      </mdui:DiscoHints>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDPDCCAiSgAwIBAgIJAKE9WIOjgzuqMA0GCSqGSIb3DQEBBQUAMCIxIDAeBgNV
-BAMTF2FhaS1sb2dpbi5maC1odHdjaHVyLmNoMB4XDTEyMDcxMTE0MjQyMFoXDTE1
-MDcxMTE0MjQyMFowIjEgMB4GA1UEAxMXYWFpLWxvZ2luLmZoLWh0d2NodXIuY2gw
-ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDEN/79VVK/NhLKXtKTGQqw
-dC7TxQMe4Prdp+I/pJHGpk94Ub9DmguD4B5zqdQO2wof7nHoDFAejOvaNyt6i9Nh
-XBGSIHE9xdd2SVtewbklsDzTjw9MB36vq07/YNM81/F5P9Cqi3XZwYfvatBn+2L/
-PcibWkRlhZJkBj552I2Rryq22lq1YIRGb9AdKpBPKLAU/WXUb3RA2IieCmMoo3Oy
-etcYmwqWX+Ixl4RA/NGXKxViC5ArKub660TbETKNKrfnoH7Lby4yJomUNKFOh6DH
-N/fcIc2+SJcgIKvkhpn6rKBEkKzZ/gJCmAXMus9+Nl3QeT+QThkGtvlAEOouJWHN
-AgMBAAGjdTBzMFIGA1UdEQRLMEmCF2FhaS1sb2dpbi5maC1odHdjaHVyLmNohi5o
-dHRwczovL2FhaS1sb2dpbi5maC1odHdjaHVyLmNoL2lkcC9zaGliYm9sZXRoMB0G
-A1UdDgQWBBQDA6qXY/SX7EaQXqUAK8sZxx+qEDANBgkqhkiG9w0BAQUFAAOCAQEA
-T2IAryzI+8HmvprZ/ov5VForqxJejRsBM02n2fMXyo3x4MqQVYTs4snsbM2LBmC6
-Hr5mXtwSMQagnArbg0hzJosGxSYMmv/M80jnpnnXkgnL2xWZzvCpc410n/qz9csa
-l7azAx3zHazW10PzNu44AmWT+wy+bDVtodDxmytfs0LbaW0TDzXVX2+FGp4dYuEz
-LpGz51VGv7dN4A0UweO7S3QJjTq4Vara326zprde+eVKOc32AxRKG0bJSSTY4bp3
-tBvjpsFG5Or9Sv0khcuYsfqKDY/8yKgrY2P+VI61/sFuUFoF56cJLTMddszkfdJY
-YpkbbBiPxDcMDk93CCNE2w==
-						</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://aai-login.fh-htwchur.ch/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aai-login.fh-htwchur.ch/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-login.fh-htwchur.ch/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://aai-login.fh-htwchur.ch/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://aai-login.fh-htwchur.ch/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://aai-login.fh-htwchur.ch/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
-    <Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fh-htwchur.ch</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDPDCCAiSgAwIBAgIJAKE9WIOjgzuqMA0GCSqGSIb3DQEBBQUAMCIxIDAeBgNV
-BAMTF2FhaS1sb2dpbi5maC1odHdjaHVyLmNoMB4XDTEyMDcxMTE0MjQyMFoXDTE1
-MDcxMTE0MjQyMFowIjEgMB4GA1UEAxMXYWFpLWxvZ2luLmZoLWh0d2NodXIuY2gw
-ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDEN/79VVK/NhLKXtKTGQqw
-dC7TxQMe4Prdp+I/pJHGpk94Ub9DmguD4B5zqdQO2wof7nHoDFAejOvaNyt6i9Nh
-XBGSIHE9xdd2SVtewbklsDzTjw9MB36vq07/YNM81/F5P9Cqi3XZwYfvatBn+2L/
-PcibWkRlhZJkBj552I2Rryq22lq1YIRGb9AdKpBPKLAU/WXUb3RA2IieCmMoo3Oy
-etcYmwqWX+Ixl4RA/NGXKxViC5ArKub660TbETKNKrfnoH7Lby4yJomUNKFOh6DH
-N/fcIc2+SJcgIKvkhpn6rKBEkKzZ/gJCmAXMus9+Nl3QeT+QThkGtvlAEOouJWHN
-AgMBAAGjdTBzMFIGA1UdEQRLMEmCF2FhaS1sb2dpbi5maC1odHdjaHVyLmNohi5o
-dHRwczovL2FhaS1sb2dpbi5maC1odHdjaHVyLmNoL2lkcC9zaGliYm9sZXRoMB0G
-A1UdDgQWBBQDA6qXY/SX7EaQXqUAK8sZxx+qEDANBgkqhkiG9w0BAQUFAAOCAQEA
-T2IAryzI+8HmvprZ/ov5VForqxJejRsBM02n2fMXyo3x4MqQVYTs4snsbM2LBmC6
-Hr5mXtwSMQagnArbg0hzJosGxSYMmv/M80jnpnnXkgnL2xWZzvCpc410n/qz9csa
-l7azAx3zHazW10PzNu44AmWT+wy+bDVtodDxmytfs0LbaW0TDzXVX2+FGp4dYuEz
-LpGz51VGv7dN4A0UweO7S3QJjTq4Vara326zprde+eVKOc32AxRKG0bJSSTY4bp3
-tBvjpsFG5Or9Sv0khcuYsfqKDY/8yKgrY2P+VI61/sFuUFoF56cJLTMddszkfdJY
-YpkbbBiPxDcMDk93CCNE2w==
-						</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://aai-login.fh-htwchur.ch/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aai-login.fh-htwchur.ch/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">fh-htwchur.ch</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">HTW Chur - Hochschule für Technik und Wirtschaft</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">HTW Chur - University of Applied Sciences HTW Chur</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.fh-htwchur.ch/</OrganizationURL>
-    <OrganizationURL xml:lang="en">http://www.fh-htwchur.ch/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>AAI</GivenName>
-    <SurName>HTW</SurName>
-    <EmailAddress>mailto:aai@htwchur.ch</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>SWITCHaai</GivenName>
-    <SurName>Team</SurName>
-    <EmailAddress>mailto:aai@switch.ch</EmailAddress>
-    <TelephoneNumber>+41 44 268 15 05</TelephoneNumber>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/aai-login.ph-gr.ch-idp-shibboleth.xml b/swamid-interfederations-2.0/aai-login.ph-gr.ch-idp-shibboleth.xml
deleted file mode 100644
index d4ff3751..00000000
--- a/swamid-interfederations-2.0/aai-login.ph-gr.ch-idp-shibboleth.xml
+++ /dev/null
@@ -1,125 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://aai-login.ph-gr.ch/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://rr.aai.switch.ch/" registrationInstant="2014-10-06T10:56:07Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.switch.ch/aai/federation/switchaai/metadata-registration-practice-statement-20110711.txt</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-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </Extensions>
-  <IDPSSODescriptor errorURL="http://my.ph-gr.ch/" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-    <Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ph-gr.ch</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="de">PHGR - Pädagogische Hochschule Graubünden</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">PHGR - University of Teacher Education Graubünden</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="it">PHGR - Alta Scuola Pedagogica dei Grigioni</mdui:DisplayName>
-        <mdui:Description xml:lang="de">Pädagogische Hochschule Graubünden</mdui:Description>
-        <mdui:Description xml:lang="en">University of Teacher Education Graubünden</mdui:Description>
-        <mdui:Description xml:lang="it">Alta Scuola Pedagogica dei Grigioni</mdui:Description>
-        <mdui:Keywords xml:lang="en">Chur</mdui:Keywords>
-        <mdui:Keywords xml:lang="de">Chur</mdui:Keywords>
-        <mdui:Keywords xml:lang="it">Coira</mdui:Keywords>
-        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAACF0RVh0U29mdHdhcmUAR3JhcGhpY0NvbnZlcnRlciAoSW50ZWwpd4f6GQAAAitJREFUeJyUUztv01AUPsBWhIRER1bEQEURSAgEA/+BAQkWBCNLFyQEEmIqDDACC0VCCFiogEpdWWjVgiGkjZ30JrFvTxOT+DqO7dw8becG22lDWipIBz/O6zvnfPe70Ov1YNTHLD9BRQKmZc7hlm+kQrH5datvqby8j5n6/f8DCCGG7P5/1XiMme/AvHZe2hVAiH9MItqgymdxPXMeh/1/JVqlh4jkEoqwYNjfakop+Ssw23xFI9v3y2FD7w+A11kH13pHsz/HOUkeRF27jrY5E3YL+gQWHiD5cYT7HoJrz9K8cgYL+WvYH73bAMd6Q3V6FeVvwFz7Pa2UH+HKAnC78pqKePwTWMxfQZs9xZrzkWxkL6O8DGxzdx+63ToYG7eRJMZY5AsCHaKEX3QKvXZWSofkaelT2OBfUlFcUy4gZk6ywQrdwIK1xFGuazdikurOPFlZBF6zZmnVeBZPY5Wm41innZNWl4Dz6jQOAGr2B6qEJDX5YtxBlU9jbvUYil4HVOU4qqkJ7IlOnMv0u5iWxlgQ4BaJAqL9MonD3OsQMIr3cC0kMyK2wRdScTf3E2m3spJtvsBccjzk4jkOjtH3DSDJQ6ilJ7BUuIXl4h30fT2OOZUZLGo342TuzBEa6sCp9I8yEltfYebLkP39rFn/TCJCdypwu73dF7+QXERVngzF0xr5Yg0AmvWllCIdYEZxCvdaHANEZEUSVZVJdO05sleA3wAAAP//AwBuF/0Z3Mc5jQAAAABJRU5ErkJggg==</mdui:Logo>
-        <mdui:Logo height="43" width="80">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFAAAAArCAYAAADv9A+vAAAAAXNSR0IArs4c6QAACSNpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+Cjx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IlhNUCBDb3JlIDUuMS4yIj4KICAgPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4KICAgICAgPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIvPgogICA8L3JkZjpSREY+CjwveDp4bXBtZXRhPgogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgCjw/eHBhY2tldCBlbmQ9InciPz4s45Y3AAAQ7UlEQVR4nOxaDYwc1X0fbEiqNFUbtZEinJbQFgi0sQHJSoPxR2piKDYfjbChATkWjatKAYOCSCLaFFSTtpYiEMExrnFVt8GJprKooThZHzJtalyvudu9vdvvj7nbvdu927vb2Y+3t7e7M/Pm3/d/897s7N6ez0dbaglOepq9mTdv5v3e7//7f7xRAEC51Gbb9iX37dtsNgZQxbYMNpbFGuXnzVZBrcz9VJ/UHiGZ2A0kHlJIdFCB8OC10Ji/EFjJc//H77jCtuTD+73ISl+uX3+LnaOs2bwxMMFWpgovkpH3FIgOKRDHFrwCEuw4ntpBqLXA+yD4K3nmBwEkPuMDB5BSi4HoAEcZGyn73WqkfIXc35DE8KcgGVQgMXwlRBigevFVYtumYoH1EYAugMhAECxkYFJuyqC0W2lfMriWgccARBCZGbcbEyowkAH7rvCZ/y8Avh9AVtQYUMg6br4UOmbMztf0E3p86Nc5A2NM//Ljf0Ysk4j76IoB/KDaMgyUqwl9f0tQuo6e+5diMToQKsCjtsHutZS89hSJM+BSwVWADqSuv60BN3FwNNB9hmCj+zy77xwuIxN2gETgvKCCdATgabbdBVz/SVDHjJFVjIXAWquZ8KVHd5BkgDkQ1pIjCmkupHzuGLYtPLhYQPc9vO942QJIBYBodhIgZzJdeoZsYmKPumZT2ncSkr2oe2iWCB6eL7MQJobAMfONMO87mdzHvG9FtSVjqWP2VCykAyB13+0yZqDXbCWQYjICUMpFngEiwLXEZJeeBOvDPKtcBKAtJT/2LDdfdCAYxpSmj+vAF8gSz6NO/OhxJh0pEaBeDgAu6iDjL2G+PPTgpmd1zJUDKPpQab60a1Juc02RjSNYarSyaiZ8B0mIGDAz+kXSmP+vgMNwyvWSL9AS5rqY5ZeTE5GZgxB+h3niyM5bVlmt66e0WulfdbOZUyU7L8oCl8EW/79euxBA3YsHHQBzmWeY+RKXZXwMKhgoHIhkonzeZWzCXhH3aKFoxfFnSDTwSZZB/Bqkop8h7WaW6ZbpEfw+k6BC0/A6JcpM4dVijAGXEg5kbuaYLhnPWWp3TLfTHD2EizDwsgCQmzAFEW7YHjZSxTDm1Mzol7nnTDD9yqW+SixDV11PKSbbGV/qF3VMHTB4Lqhjic0kgQ6EtdToV0hrIepzAHRYJ++n9jy7r+6OKy1i0TuvMG++1P5LhWTLAOiYHGqRIdIveb08d5wFvlcBTj6KzGH5bLuV9BntSdW0dBVcJkjTB8EYcLwvOzZIyIcZh3QeE+lvEgCDmzelJr/fNEpqvXo+gEydZa1WPue3zIqK16ndcSC9YExNTenh8KgeCARgaGgI8DgyMqKn0ymd/fm9/VutphKPx3S8HgqFeMPfyWRSr9frF2X4JZgw0zqcELKANcuYUSszP9XHwptJik06ObyaNYzdtpBk+CtEi2wn44k/J4XcAdKoXwjY1ODgOU0Gz2w8a16Zmfw7En8Pg2dk8SehVvoXHRfJoo7+Vio/19Kx3YAeGs0cA2xnsX5UxOuYI9Me3Y3H4/oLL7wAd955J5udAmvXfh7uuOPL8LnPfYb/j+0b3/hTyGZzupzr9HRBl9d62+OPPw6nTp0CSvvrbZem9TbvylKzqszN/AMZi3yNTyIWxLjt41z8k8OfBi1+G8lEf48gk6LvOZNNhzeQMtM0m7ZdjyrLWKZRVjPR3yGxQQfAzMjNpM3Y5mjjgjKb//tilC1MJv5FMhb9EjfzRGg1wTw5Hd5BzHaW96WemBOZdvvtt8Ndd90FAwMDMDMz40e2lctldiz5i8Wi/9y5c/Diiy/C5OSk3mGrA+AvfvEfUK2yec7N+bHFYjF97969HEgE0cWCdhZtWQZSy1CIfkZLR7eSaOizjF27GIhbCPecw1fwElQ+8z1CTV2lVkOpzP5Yx3oehiUJ7hg+BdWyT3MckIjrLFupV88FYsMI3pWALCxoewlet8ySUsy/QOKh3yTVuRMM/Cbz1MEAjxP5YiGQ6xm73w1433N4eJhP9OjRo1CpVPwX0zLTNDtOijNwigMYDof13v4I6FNPPQU7duyA+fn5bmzY/csCWK8OaImR3yC59LdIrfwzjRoFJZ9+lqBJce3invMn7oMpbSiF7F8RZGF6eBWv62VTewil844M2E62MpV7hrMvM/xLfBHmq/+uWeYsy4m/Q+Js3GY95JMOgzCtRACTQ062kg5tJAtYaBXPRJatX78enn/+eWi3212W09tonyxJMhB1TwLjNdnXXnsNbrvtNkBN7B17WQCNZsZXq/g0atb4/22WoyZHPssZyCcT3sYmMxSQnhaYLpHyWT+aMNdGBHpkM+sT8nGTw1zYIMpY7A9JTEhBJvJbxGgVlOncDwj+Xyu/o0n9tW1Dqcyd0pCl6cCVfEwt/MdgNsd8tkgFjxw5AnfffTdkMhnd++69Jtc7+V4GSgBlP3n9jTfegE2bNsHo6OgKAeyTOtVKpzVkDnpP1LvC+F8TDDcsnqI5tbv52mAAwUGTS3GtvJExbEBzGcUWJB5Yw8HAsWYnv0+KEwcYeL8CdcZE+Tzsa1pVpZD7tuNsmMPCYy71GHEyFFDmZmf9999/P7z88svQ640vpundAHYzsPeew4cPw5YtW7g09F67BC8MTsmJe2BdLWDZCdkQdACqzak88KUiZ8WsoVp5R5PFAa6DwVuhQf4zIMcuTj7H2YemiiCOJ79K0DHNTr9StFlu7DoHNq7RLqla7Fq+WLgYyOyZ/N8SubDvvHOGmdeXAJ1DP73rB6BkZAfAaQ7g6OjIIg2MRqP69u3bYf/+/dBvvOWdiKdzs5H2pUYY84IOOGPRe4jVmlRlesdjRmtBKRYPcw3E2h4GyJnRu0iLSQHXwPa0mo1/jXvTBIZAwV/moEym9xJMDWX6hqV8DLoX6hGfU6VeJcr910CjdtbVv3/652Owbu0XoFAouPq1FAOXylokgH6/H9DBLCwscOdx+vRpbrqPPPIIoFfuh9ElMdBZLUMpl05qjrat4oHvVPbbBEQtkL84a5ZZV3LaThIdcgBEBk6kHmX5bctxSuW3tETw0/x8cvhKHuOlw9cQYz7t6xQknJCHMhBnigfJKK/UXMHvySa2EdusK7KocOjQIbjllnU8/Og3By/bpAfGcAYD5F4A165dC/feey8Pg2688Ua477774KWXXgJ0Ur3ysCIAUdcw8M2lHySRQSd4RhMk5Z9rjmPoFFWNVl5NMJZy/QtdxU2vNHOEyHGnJ35YjAhzTAU/wTWwXDyuo7OQMiDTRWRzLnkv9/jJ0Mf5Vmdp5ihBSZHvd+jQQbj55nVQq9WU3kn20zuMCffs2QM+nw96TRhDlTVr1sCTTz4JZ86cgXQ63eVUVg6grNmxyTTrCR/XrMBVHLx0dC0LZlngSx39c5hoKKXpQ0UeHCPIWJ6K30oMY1blHt2YUrXoQ9wzp4Ifgxgz83GWaWAMic/hu3XUdEBk/6N3T4Su5fk2jpWO/S5pt4uqw3anmnP06Ktwww3XQT6fX+QAesHEI5riunXrAD2rZVldAL777rtw8OBB2LVrFyQSCb0f63q9vNJdNO3XySlplaYPFyM8a1gN0QvoOZ8lPMOgIkDGanS7pmRifySKAx/jk66WTuiWKCTMs9iOM3PYKV9hv/LsT0TxVDgiKvdB2GSnf8BjxTQuBjvOTbOsxm5y05bv9/rrJ+D666/jk1/OeeARzXHDhg19AUSHgfr30EMPwaOPPgoTExOLGNjrZJTuyq7noZ6KCuaz48ldvGqMQo4xYKPGsnOufZY7YZ1lIVHhXXHCU+P7CBUVGrBbSnnmDY2XrlD7sPaXfoJlMHNu6Z6C5RYIqFVTxhJ73H2ScaZ97WZOdbVNfNUQiYT1TZs2cq1azolIADEofvPNNxcBiEUE/H9sbEy/+uqr4bnnnoNGo6HIcfuN6Tkpy0Oy/ibqgOx6qz4UiIduIRK8ifg2YjBv6lRWHHa15uO+TGS7k+IhayK3Ms+b5X1Mdt1kppdjGQmPDxHg4K+yFO+k5rDP6sSb4lir/JuWCq7hz0OHVC2L+NASWwfIQgScTWzfvn3wwAMPAFZgljJjCWCpVOIM9AKITsUbB+L5s2fP8tTw5MmT4AVP/u7SQNsTx8nPLbhJilWem/5hESeSFsyamTxAMGWTmYBl1fm2JNYF8YsCLfz7pF5juSpnEuUpXLMe8+FuG0//WL+x5B5iUSK002RjVFnIkvThEccsjH2fpNhYqJOFzLecEAfAs7HVAQXNFyd74MAB8E6wn+khAzdu3NiXgd5MBFPC48eP83FljNlvUVwT9hYovQ+l1pyaTewlSdS/kVU81dLS9/DqM6Zt9fp7gcn0dwgCF0F2Zr5OmgsZn1tVxnDEXFDm8j/iledk8CrOqlrlbc2tWjM2TedfKqL557N/QSqz/0hSw+shwrR2cuwJYhozPTt0tBOfCqk5ceIEnyxWWiQT+zVCiLJ169YuDZQMlCYs544hD+bXeO38+fOLQOzSQHezm9pi39Z5OUJOa8nR6wjPaZl2JYSJZhOPkfz4fpIa3UwifgZuWCEzxVeZaRdU734FOiAsXWnx9QTZlDiP+x47iUnrDhBY+7PaSiaxm8QuONVt/oERO05nv0faCxMu85ytUEf/TFEdlwC2Wi3mUF7nk0UHcOzYMRgcHORlKyxroa4hCJg3Yx8EEAHCexFwh4GhRcE4grt7927AbETTtCVyYdsxWQlgZ/Js8MIr3HzRcyJ4mfCtJBvbShIjnyDJUYWMJe4hc8VXSLvFJmq3hNl0Yjlu4kadxX9/SeIj15N05BYyX/UH3MKqeJGqflLLRG8nqZGbyBgbv1b6mWZZxN1/dphnKe59QBdbC+uDoGER9KabboJt27bBgw/ugocffhh27tzJi6wbN26AJ554HDKZTownGSjLWb3j4nkc6+mnn+4CkTOw+wbL2fegBmemQXVVS33Tqe2JWlyFhSW22VBMBpjVrqgYt2GWYlHnIyGvRoEIN/h5xjJM4yyzpMrvYbxZB/8Ky6iyQHxKpUxTcUFBbKvatveTODkxb9DdHa6gaaKzCAaHYGDgNLz99gBcuOCHbHY83Gw22HXDXVzsbxiGgnFks7ngjtVhoc37l0qzfgQPx+0CsN/erxvINkZ8yZCT+yILtfjXwWhPqF5vuViwQeydiL1hWzopTz8Ad4vSOefZb5E7etC5F+R7geeajBLsxYxZvsmwrd/5xdlM7xcQPYG0FGer44F5WcpUqnNvaTynHXb2IqYm9xM3uLY9E/EMCp6JezehOkF5D+hdHwt5ftu2O773upxoZ+dv+W3NpX5f7Nuaxb+XykTEROV+hXQeRntWnUg/zMtMKSzRB64BUn3LU+iki16+HyMvjRH/e/f2A/D/qnXCGNdEOvrSnE/y3DchzTd6P1gsp+18hSVo3bOtuFQW8H7Or7Rfv+vd8rJ0ivd+36tLT5zPJ9AptJRS8QivvKRZ6ILhx3Tuu0Sme1TEYtClYx9SBromzMMYwwkbTJaHJjfzMhIvHmDpqjKg2SLZ936T8hGA0EnOqXhok4R8zr7var6rlo5eR8w2ywZs+XERiFTvIw1UOnGYCAmMipoff4ynbFgFxiJmLvMnxDZbnY8qXXPvaOCHF0DcZrSairmQ9C1UTmn57HdJbFh8eTC8itf08KuDOstdW+2sapiY7FORWn2kgdwhNOZzKn6mFvL/Noz4nYpKbIg5j8ErWFvN/48EvwCjQ38AmcRenp9Sq7MB/WFu/w0AAP//AwDF/aulqC4/dAAAAABJRU5ErkJggg==</mdui:Logo>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:IPHint>193.5.58.160/27</mdui:IPHint>
-        <mdui:DomainHint>ph-gr.ch</mdui:DomainHint>
-        <mdui:GeolocationHint>geo:46.866984,9.536721</mdui:GeolocationHint>
-      </mdui:DiscoHints>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDKDCCAhCgAwIBAgIJANPBvqI6uH7rMA0GCSqGSIb3DQEBBQUAMB0xGzAZBgNV
-BAMTEmFhaS1sb2dpbi5waC1nci5jaDAeFw0xMjA4MDMxMDU4NDZaFw0xNTA4MDMx
-MDU4NDZaMB0xGzAZBgNVBAMTEmFhaS1sb2dpbi5waC1nci5jaDCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBAM6DeV57x0ntO6ngsTUgFxL7gPqK1yc4JW6Q
-Bof970j9y11C9oIIOZMWadurnqdHsvGcX+GbmEvNVI0V4u3Wibg3JU1oXRtYLzDC
-IhVErP4qn3mvq0wQ5IC8br3xQu/PZp16iiZ9YK+ipn7HIow+tAQ2bxONAxtDbrFW
-o4+f5XE7RckoUplEkGFX9B3X2iy1V7rzJt8UsjY6vZVmkLhdSu+O1zBTnTU4DTkB
-1CPnshzK5qWg5Et7CkgPzhFORXPD9tp9QpRSukVee2rHlhIy9umVTzh1M+IcZrW8
-rB0cZfvs7RpOnHtkSpEVoMANC9az9IBU8GzqGy8OmffI+vL71q8CAwEAAaNrMGkw
-SAYDVR0RBEEwP4ISYWFpLWxvZ2luLnBoLWdyLmNohilodHRwczovL2FhaS1sb2dp
-bi5waC1nci5jaC9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUS3jMf00nQqVvJRH7
-r+2JO7i7iuowDQYJKoZIhvcNAQEFBQADggEBACipXitm/nMRmZswt0tAl0fE81DF
-1U8Xxgh7OVK6QjVIebjckobeeV9D4JT3bF+YfZLVxl/9XIRbpBV2aYDf4TXAtN1R
-VZ/km3VDZbHImJQls8VGoJzMXXGcywQwbZg5vXcdXB1FtYWQTkor5lg0mqRAIJES
-BqBm0XGj5gO0xpZnds5cvH94w/xzfI+BDmusQvjTaYPblemangtJ+MD0yXSaHo2z
-PdZQszzV/n+v286sSXaiO/Bd6QbtIRZUZiUR/2MfwjZ+exR0nymEiSNdiKch1ZpN
-3gDJq0hd3/Em8RDzJtiui0YIJVFZdxA3+9QhvGhX0OvziPHKbsxh1mNnI1k=
-						</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://aai-login.ph-gr.ch/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aai-login.ph-gr.ch/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-login.ph-gr.ch/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://aai-login.ph-gr.ch/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://aai-login.ph-gr.ch/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://aai-login.ph-gr.ch/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
-    <Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ph-gr.ch</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDKDCCAhCgAwIBAgIJANPBvqI6uH7rMA0GCSqGSIb3DQEBBQUAMB0xGzAZBgNV
-BAMTEmFhaS1sb2dpbi5waC1nci5jaDAeFw0xMjA4MDMxMDU4NDZaFw0xNTA4MDMx
-MDU4NDZaMB0xGzAZBgNVBAMTEmFhaS1sb2dpbi5waC1nci5jaDCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBAM6DeV57x0ntO6ngsTUgFxL7gPqK1yc4JW6Q
-Bof970j9y11C9oIIOZMWadurnqdHsvGcX+GbmEvNVI0V4u3Wibg3JU1oXRtYLzDC
-IhVErP4qn3mvq0wQ5IC8br3xQu/PZp16iiZ9YK+ipn7HIow+tAQ2bxONAxtDbrFW
-o4+f5XE7RckoUplEkGFX9B3X2iy1V7rzJt8UsjY6vZVmkLhdSu+O1zBTnTU4DTkB
-1CPnshzK5qWg5Et7CkgPzhFORXPD9tp9QpRSukVee2rHlhIy9umVTzh1M+IcZrW8
-rB0cZfvs7RpOnHtkSpEVoMANC9az9IBU8GzqGy8OmffI+vL71q8CAwEAAaNrMGkw
-SAYDVR0RBEEwP4ISYWFpLWxvZ2luLnBoLWdyLmNohilodHRwczovL2FhaS1sb2dp
-bi5waC1nci5jaC9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUS3jMf00nQqVvJRH7
-r+2JO7i7iuowDQYJKoZIhvcNAQEFBQADggEBACipXitm/nMRmZswt0tAl0fE81DF
-1U8Xxgh7OVK6QjVIebjckobeeV9D4JT3bF+YfZLVxl/9XIRbpBV2aYDf4TXAtN1R
-VZ/km3VDZbHImJQls8VGoJzMXXGcywQwbZg5vXcdXB1FtYWQTkor5lg0mqRAIJES
-BqBm0XGj5gO0xpZnds5cvH94w/xzfI+BDmusQvjTaYPblemangtJ+MD0yXSaHo2z
-PdZQszzV/n+v286sSXaiO/Bd6QbtIRZUZiUR/2MfwjZ+exR0nymEiSNdiKch1ZpN
-3gDJq0hd3/Em8RDzJtiui0YIJVFZdxA3+9QhvGhX0OvziPHKbsxh1mNnI1k=
-						</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://aai-login.ph-gr.ch/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aai-login.ph-gr.ch/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">ph-gr.ch</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">PHGR - Pädagogische Hochschule Graubünden</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">PHGR - University of Teacher Education Graubünden</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="it">PHGR - Alta Scuola Pedagogica dei Grigioni</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.ph-gr.ch/</OrganizationURL>
-    <OrganizationURL xml:lang="en">http://www.ph-gr.ch/</OrganizationURL>
-    <OrganizationURL xml:lang="it">http://www.ph-gr.ch/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>AAI</GivenName>
-    <SurName>PHGR</SurName>
-    <EmailAddress>mailto:aai@ph-gr.ch</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>SWITCHaai</GivenName>
-    <SurName>Team</SurName>
-    <EmailAddress>mailto:aai@switch.ch</EmailAddress>
-    <TelephoneNumber>+41 44 268 15 05</TelephoneNumber>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/aai-login.ph-gr.ch.xml b/swamid-interfederations-2.0/aai-login.ph-gr.ch.xml
deleted file mode 100644
index d4ff3751..00000000
--- a/swamid-interfederations-2.0/aai-login.ph-gr.ch.xml
+++ /dev/null
@@ -1,125 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://aai-login.ph-gr.ch/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://rr.aai.switch.ch/" registrationInstant="2014-10-06T10:56:07Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.switch.ch/aai/federation/switchaai/metadata-registration-practice-statement-20110711.txt</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-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </Extensions>
-  <IDPSSODescriptor errorURL="http://my.ph-gr.ch/" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-    <Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ph-gr.ch</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="de">PHGR - Pädagogische Hochschule Graubünden</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">PHGR - University of Teacher Education Graubünden</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="it">PHGR - Alta Scuola Pedagogica dei Grigioni</mdui:DisplayName>
-        <mdui:Description xml:lang="de">Pädagogische Hochschule Graubünden</mdui:Description>
-        <mdui:Description xml:lang="en">University of Teacher Education Graubünden</mdui:Description>
-        <mdui:Description xml:lang="it">Alta Scuola Pedagogica dei Grigioni</mdui:Description>
-        <mdui:Keywords xml:lang="en">Chur</mdui:Keywords>
-        <mdui:Keywords xml:lang="de">Chur</mdui:Keywords>
-        <mdui:Keywords xml:lang="it">Coira</mdui:Keywords>
-        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAACF0RVh0U29mdHdhcmUAR3JhcGhpY0NvbnZlcnRlciAoSW50ZWwpd4f6GQAAAitJREFUeJyUUztv01AUPsBWhIRER1bEQEURSAgEA/+BAQkWBCNLFyQEEmIqDDACC0VCCFiogEpdWWjVgiGkjZ30JrFvTxOT+DqO7dw8becG22lDWipIBz/O6zvnfPe70Ov1YNTHLD9BRQKmZc7hlm+kQrH5datvqby8j5n6/f8DCCGG7P5/1XiMme/AvHZe2hVAiH9MItqgymdxPXMeh/1/JVqlh4jkEoqwYNjfakop+Ssw23xFI9v3y2FD7w+A11kH13pHsz/HOUkeRF27jrY5E3YL+gQWHiD5cYT7HoJrz9K8cgYL+WvYH73bAMd6Q3V6FeVvwFz7Pa2UH+HKAnC78pqKePwTWMxfQZs9xZrzkWxkL6O8DGxzdx+63ToYG7eRJMZY5AsCHaKEX3QKvXZWSofkaelT2OBfUlFcUy4gZk6ywQrdwIK1xFGuazdikurOPFlZBF6zZmnVeBZPY5Wm41innZNWl4Dz6jQOAGr2B6qEJDX5YtxBlU9jbvUYil4HVOU4qqkJ7IlOnMv0u5iWxlgQ4BaJAqL9MonD3OsQMIr3cC0kMyK2wRdScTf3E2m3spJtvsBccjzk4jkOjtH3DSDJQ6ilJ7BUuIXl4h30fT2OOZUZLGo342TuzBEa6sCp9I8yEltfYebLkP39rFn/TCJCdypwu73dF7+QXERVngzF0xr5Yg0AmvWllCIdYEZxCvdaHANEZEUSVZVJdO05sleA3wAAAP//AwBuF/0Z3Mc5jQAAAABJRU5ErkJggg==</mdui:Logo>
-        <mdui:Logo height="43" width="80">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFAAAAArCAYAAADv9A+vAAAAAXNSR0IArs4c6QAACSNpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+Cjx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IlhNUCBDb3JlIDUuMS4yIj4KICAgPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4KICAgICAgPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIvPgogICA8L3JkZjpSREY+CjwveDp4bXBtZXRhPgogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgCjw/eHBhY2tldCBlbmQ9InciPz4s45Y3AAAQ7UlEQVR4nOxaDYwc1X0fbEiqNFUbtZEinJbQFgi0sQHJSoPxR2piKDYfjbChATkWjatKAYOCSCLaFFSTtpYiEMExrnFVt8GJprKooThZHzJtalyvudu9vdvvj7nbvdu927vb2Y+3t7e7M/Pm3/d/897s7N6ez0dbaglOepq9mTdv5v3e7//7f7xRAEC51Gbb9iX37dtsNgZQxbYMNpbFGuXnzVZBrcz9VJ/UHiGZ2A0kHlJIdFCB8OC10Ji/EFjJc//H77jCtuTD+73ISl+uX3+LnaOs2bwxMMFWpgovkpH3FIgOKRDHFrwCEuw4ntpBqLXA+yD4K3nmBwEkPuMDB5BSi4HoAEcZGyn73WqkfIXc35DE8KcgGVQgMXwlRBigevFVYtumYoH1EYAugMhAECxkYFJuyqC0W2lfMriWgccARBCZGbcbEyowkAH7rvCZ/y8Avh9AVtQYUMg6br4UOmbMztf0E3p86Nc5A2NM//Ljf0Ysk4j76IoB/KDaMgyUqwl9f0tQuo6e+5diMToQKsCjtsHutZS89hSJM+BSwVWADqSuv60BN3FwNNB9hmCj+zy77xwuIxN2gETgvKCCdATgabbdBVz/SVDHjJFVjIXAWquZ8KVHd5BkgDkQ1pIjCmkupHzuGLYtPLhYQPc9vO942QJIBYBodhIgZzJdeoZsYmKPumZT2ncSkr2oe2iWCB6eL7MQJobAMfONMO87mdzHvG9FtSVjqWP2VCykAyB13+0yZqDXbCWQYjICUMpFngEiwLXEZJeeBOvDPKtcBKAtJT/2LDdfdCAYxpSmj+vAF8gSz6NO/OhxJh0pEaBeDgAu6iDjL2G+PPTgpmd1zJUDKPpQab60a1Juc02RjSNYarSyaiZ8B0mIGDAz+kXSmP+vgMNwyvWSL9AS5rqY5ZeTE5GZgxB+h3niyM5bVlmt66e0WulfdbOZUyU7L8oCl8EW/79euxBA3YsHHQBzmWeY+RKXZXwMKhgoHIhkonzeZWzCXhH3aKFoxfFnSDTwSZZB/Bqkop8h7WaW6ZbpEfw+k6BC0/A6JcpM4dVijAGXEg5kbuaYLhnPWWp3TLfTHD2EizDwsgCQmzAFEW7YHjZSxTDm1Mzol7nnTDD9yqW+SixDV11PKSbbGV/qF3VMHTB4Lqhjic0kgQ6EtdToV0hrIepzAHRYJ++n9jy7r+6OKy1i0TuvMG++1P5LhWTLAOiYHGqRIdIveb08d5wFvlcBTj6KzGH5bLuV9BntSdW0dBVcJkjTB8EYcLwvOzZIyIcZh3QeE+lvEgCDmzelJr/fNEpqvXo+gEydZa1WPue3zIqK16ndcSC9YExNTenh8KgeCARgaGgI8DgyMqKn0ymd/fm9/VutphKPx3S8HgqFeMPfyWRSr9frF2X4JZgw0zqcELKANcuYUSszP9XHwptJik06ObyaNYzdtpBk+CtEi2wn44k/J4XcAdKoXwjY1ODgOU0Gz2w8a16Zmfw7En8Pg2dk8SehVvoXHRfJoo7+Vio/19Kx3YAeGs0cA2xnsX5UxOuYI9Me3Y3H4/oLL7wAd955J5udAmvXfh7uuOPL8LnPfYb/j+0b3/hTyGZzupzr9HRBl9d62+OPPw6nTp0CSvvrbZem9TbvylKzqszN/AMZi3yNTyIWxLjt41z8k8OfBi1+G8lEf48gk6LvOZNNhzeQMtM0m7ZdjyrLWKZRVjPR3yGxQQfAzMjNpM3Y5mjjgjKb//tilC1MJv5FMhb9EjfzRGg1wTw5Hd5BzHaW96WemBOZdvvtt8Ndd90FAwMDMDMz40e2lctldiz5i8Wi/9y5c/Diiy/C5OSk3mGrA+AvfvEfUK2yec7N+bHFYjF97969HEgE0cWCdhZtWQZSy1CIfkZLR7eSaOizjF27GIhbCPecw1fwElQ+8z1CTV2lVkOpzP5Yx3oehiUJ7hg+BdWyT3MckIjrLFupV88FYsMI3pWALCxoewlet8ySUsy/QOKh3yTVuRMM/Cbz1MEAjxP5YiGQ6xm73w1433N4eJhP9OjRo1CpVPwX0zLTNDtOijNwigMYDof13v4I6FNPPQU7duyA+fn5bmzY/csCWK8OaImR3yC59LdIrfwzjRoFJZ9+lqBJce3invMn7oMpbSiF7F8RZGF6eBWv62VTewil844M2E62MpV7hrMvM/xLfBHmq/+uWeYsy4m/Q+Js3GY95JMOgzCtRACTQ062kg5tJAtYaBXPRJatX78enn/+eWi3212W09tonyxJMhB1TwLjNdnXXnsNbrvtNkBN7B17WQCNZsZXq/g0atb4/22WoyZHPssZyCcT3sYmMxSQnhaYLpHyWT+aMNdGBHpkM+sT8nGTw1zYIMpY7A9JTEhBJvJbxGgVlOncDwj+Xyu/o0n9tW1Dqcyd0pCl6cCVfEwt/MdgNsd8tkgFjxw5AnfffTdkMhnd++69Jtc7+V4GSgBlP3n9jTfegE2bNsHo6OgKAeyTOtVKpzVkDnpP1LvC+F8TDDcsnqI5tbv52mAAwUGTS3GtvJExbEBzGcUWJB5Yw8HAsWYnv0+KEwcYeL8CdcZE+Tzsa1pVpZD7tuNsmMPCYy71GHEyFFDmZmf9999/P7z88svQ640vpundAHYzsPeew4cPw5YtW7g09F67BC8MTsmJe2BdLWDZCdkQdACqzak88KUiZ8WsoVp5R5PFAa6DwVuhQf4zIMcuTj7H2YemiiCOJ79K0DHNTr9StFlu7DoHNq7RLqla7Fq+WLgYyOyZ/N8SubDvvHOGmdeXAJ1DP73rB6BkZAfAaQ7g6OjIIg2MRqP69u3bYf/+/dBvvOWdiKdzs5H2pUYY84IOOGPRe4jVmlRlesdjRmtBKRYPcw3E2h4GyJnRu0iLSQHXwPa0mo1/jXvTBIZAwV/moEym9xJMDWX6hqV8DLoX6hGfU6VeJcr910CjdtbVv3/652Owbu0XoFAouPq1FAOXylokgH6/H9DBLCwscOdx+vRpbrqPPPIIoFfuh9ElMdBZLUMpl05qjrat4oHvVPbbBEQtkL84a5ZZV3LaThIdcgBEBk6kHmX5bctxSuW3tETw0/x8cvhKHuOlw9cQYz7t6xQknJCHMhBnigfJKK/UXMHvySa2EdusK7KocOjQIbjllnU8/Og3By/bpAfGcAYD5F4A165dC/feey8Pg2688Ua477774KWXXgJ0Ur3ysCIAUdcw8M2lHySRQSd4RhMk5Z9rjmPoFFWNVl5NMJZy/QtdxU2vNHOEyHGnJ35YjAhzTAU/wTWwXDyuo7OQMiDTRWRzLnkv9/jJ0Mf5Vmdp5ihBSZHvd+jQQbj55nVQq9WU3kn20zuMCffs2QM+nw96TRhDlTVr1sCTTz4JZ86cgXQ63eVUVg6grNmxyTTrCR/XrMBVHLx0dC0LZlngSx39c5hoKKXpQ0UeHCPIWJ6K30oMY1blHt2YUrXoQ9wzp4Ifgxgz83GWaWAMic/hu3XUdEBk/6N3T4Su5fk2jpWO/S5pt4uqw3anmnP06Ktwww3XQT6fX+QAesHEI5riunXrAD2rZVldAL777rtw8OBB2LVrFyQSCb0f63q9vNJdNO3XySlplaYPFyM8a1gN0QvoOZ8lPMOgIkDGanS7pmRifySKAx/jk66WTuiWKCTMs9iOM3PYKV9hv/LsT0TxVDgiKvdB2GSnf8BjxTQuBjvOTbOsxm5y05bv9/rrJ+D666/jk1/OeeARzXHDhg19AUSHgfr30EMPwaOPPgoTExOLGNjrZJTuyq7noZ6KCuaz48ldvGqMQo4xYKPGsnOufZY7YZ1lIVHhXXHCU+P7CBUVGrBbSnnmDY2XrlD7sPaXfoJlMHNu6Z6C5RYIqFVTxhJ73H2ScaZ97WZOdbVNfNUQiYT1TZs2cq1azolIADEofvPNNxcBiEUE/H9sbEy/+uqr4bnnnoNGo6HIcfuN6Tkpy0Oy/ibqgOx6qz4UiIduIRK8ifg2YjBv6lRWHHa15uO+TGS7k+IhayK3Ms+b5X1Mdt1kppdjGQmPDxHg4K+yFO+k5rDP6sSb4lir/JuWCq7hz0OHVC2L+NASWwfIQgScTWzfvn3wwAMPAFZgljJjCWCpVOIM9AKITsUbB+L5s2fP8tTw5MmT4AVP/u7SQNsTx8nPLbhJilWem/5hESeSFsyamTxAMGWTmYBl1fm2JNYF8YsCLfz7pF5juSpnEuUpXLMe8+FuG0//WL+x5B5iUSK002RjVFnIkvThEccsjH2fpNhYqJOFzLecEAfAs7HVAQXNFyd74MAB8E6wn+khAzdu3NiXgd5MBFPC48eP83FljNlvUVwT9hYovQ+l1pyaTewlSdS/kVU81dLS9/DqM6Zt9fp7gcn0dwgCF0F2Zr5OmgsZn1tVxnDEXFDm8j/iledk8CrOqlrlbc2tWjM2TedfKqL557N/QSqz/0hSw+shwrR2cuwJYhozPTt0tBOfCqk5ceIEnyxWWiQT+zVCiLJ169YuDZQMlCYs544hD+bXeO38+fOLQOzSQHezm9pi39Z5OUJOa8nR6wjPaZl2JYSJZhOPkfz4fpIa3UwifgZuWCEzxVeZaRdU734FOiAsXWnx9QTZlDiP+x47iUnrDhBY+7PaSiaxm8QuONVt/oERO05nv0faCxMu85ytUEf/TFEdlwC2Wi3mUF7nk0UHcOzYMRgcHORlKyxroa4hCJg3Yx8EEAHCexFwh4GhRcE4grt7927AbETTtCVyYdsxWQlgZ/Js8MIr3HzRcyJ4mfCtJBvbShIjnyDJUYWMJe4hc8VXSLvFJmq3hNl0Yjlu4kadxX9/SeIj15N05BYyX/UH3MKqeJGqflLLRG8nqZGbyBgbv1b6mWZZxN1/dphnKe59QBdbC+uDoGER9KabboJt27bBgw/ugocffhh27tzJi6wbN26AJ554HDKZTownGSjLWb3j4nkc6+mnn+4CkTOw+wbL2fegBmemQXVVS33Tqe2JWlyFhSW22VBMBpjVrqgYt2GWYlHnIyGvRoEIN/h5xjJM4yyzpMrvYbxZB/8Ky6iyQHxKpUxTcUFBbKvatveTODkxb9DdHa6gaaKzCAaHYGDgNLz99gBcuOCHbHY83Gw22HXDXVzsbxiGgnFks7ngjtVhoc37l0qzfgQPx+0CsN/erxvINkZ8yZCT+yILtfjXwWhPqF5vuViwQeydiL1hWzopTz8Ad4vSOefZb5E7etC5F+R7geeajBLsxYxZvsmwrd/5xdlM7xcQPYG0FGer44F5WcpUqnNvaTynHXb2IqYm9xM3uLY9E/EMCp6JezehOkF5D+hdHwt5ftu2O773upxoZ+dv+W3NpX5f7Nuaxb+XykTEROV+hXQeRntWnUg/zMtMKSzRB64BUn3LU+iki16+HyMvjRH/e/f2A/D/qnXCGNdEOvrSnE/y3DchzTd6P1gsp+18hSVo3bOtuFQW8H7Or7Rfv+vd8rJ0ivd+36tLT5zPJ9AptJRS8QivvKRZ6ILhx3Tuu0Sme1TEYtClYx9SBromzMMYwwkbTJaHJjfzMhIvHmDpqjKg2SLZ936T8hGA0EnOqXhok4R8zr7var6rlo5eR8w2ywZs+XERiFTvIw1UOnGYCAmMipoff4ynbFgFxiJmLvMnxDZbnY8qXXPvaOCHF0DcZrSairmQ9C1UTmn57HdJbFh8eTC8itf08KuDOstdW+2sapiY7FORWn2kgdwhNOZzKn6mFvL/Noz4nYpKbIg5j8ErWFvN/48EvwCjQ38AmcRenp9Sq7MB/WFu/w0AAP//AwDF/aulqC4/dAAAAABJRU5ErkJggg==</mdui:Logo>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:IPHint>193.5.58.160/27</mdui:IPHint>
-        <mdui:DomainHint>ph-gr.ch</mdui:DomainHint>
-        <mdui:GeolocationHint>geo:46.866984,9.536721</mdui:GeolocationHint>
-      </mdui:DiscoHints>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDKDCCAhCgAwIBAgIJANPBvqI6uH7rMA0GCSqGSIb3DQEBBQUAMB0xGzAZBgNV
-BAMTEmFhaS1sb2dpbi5waC1nci5jaDAeFw0xMjA4MDMxMDU4NDZaFw0xNTA4MDMx
-MDU4NDZaMB0xGzAZBgNVBAMTEmFhaS1sb2dpbi5waC1nci5jaDCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBAM6DeV57x0ntO6ngsTUgFxL7gPqK1yc4JW6Q
-Bof970j9y11C9oIIOZMWadurnqdHsvGcX+GbmEvNVI0V4u3Wibg3JU1oXRtYLzDC
-IhVErP4qn3mvq0wQ5IC8br3xQu/PZp16iiZ9YK+ipn7HIow+tAQ2bxONAxtDbrFW
-o4+f5XE7RckoUplEkGFX9B3X2iy1V7rzJt8UsjY6vZVmkLhdSu+O1zBTnTU4DTkB
-1CPnshzK5qWg5Et7CkgPzhFORXPD9tp9QpRSukVee2rHlhIy9umVTzh1M+IcZrW8
-rB0cZfvs7RpOnHtkSpEVoMANC9az9IBU8GzqGy8OmffI+vL71q8CAwEAAaNrMGkw
-SAYDVR0RBEEwP4ISYWFpLWxvZ2luLnBoLWdyLmNohilodHRwczovL2FhaS1sb2dp
-bi5waC1nci5jaC9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUS3jMf00nQqVvJRH7
-r+2JO7i7iuowDQYJKoZIhvcNAQEFBQADggEBACipXitm/nMRmZswt0tAl0fE81DF
-1U8Xxgh7OVK6QjVIebjckobeeV9D4JT3bF+YfZLVxl/9XIRbpBV2aYDf4TXAtN1R
-VZ/km3VDZbHImJQls8VGoJzMXXGcywQwbZg5vXcdXB1FtYWQTkor5lg0mqRAIJES
-BqBm0XGj5gO0xpZnds5cvH94w/xzfI+BDmusQvjTaYPblemangtJ+MD0yXSaHo2z
-PdZQszzV/n+v286sSXaiO/Bd6QbtIRZUZiUR/2MfwjZ+exR0nymEiSNdiKch1ZpN
-3gDJq0hd3/Em8RDzJtiui0YIJVFZdxA3+9QhvGhX0OvziPHKbsxh1mNnI1k=
-						</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://aai-login.ph-gr.ch/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aai-login.ph-gr.ch/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-login.ph-gr.ch/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://aai-login.ph-gr.ch/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://aai-login.ph-gr.ch/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://aai-login.ph-gr.ch/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
-    <Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ph-gr.ch</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDKDCCAhCgAwIBAgIJANPBvqI6uH7rMA0GCSqGSIb3DQEBBQUAMB0xGzAZBgNV
-BAMTEmFhaS1sb2dpbi5waC1nci5jaDAeFw0xMjA4MDMxMDU4NDZaFw0xNTA4MDMx
-MDU4NDZaMB0xGzAZBgNVBAMTEmFhaS1sb2dpbi5waC1nci5jaDCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBAM6DeV57x0ntO6ngsTUgFxL7gPqK1yc4JW6Q
-Bof970j9y11C9oIIOZMWadurnqdHsvGcX+GbmEvNVI0V4u3Wibg3JU1oXRtYLzDC
-IhVErP4qn3mvq0wQ5IC8br3xQu/PZp16iiZ9YK+ipn7HIow+tAQ2bxONAxtDbrFW
-o4+f5XE7RckoUplEkGFX9B3X2iy1V7rzJt8UsjY6vZVmkLhdSu+O1zBTnTU4DTkB
-1CPnshzK5qWg5Et7CkgPzhFORXPD9tp9QpRSukVee2rHlhIy9umVTzh1M+IcZrW8
-rB0cZfvs7RpOnHtkSpEVoMANC9az9IBU8GzqGy8OmffI+vL71q8CAwEAAaNrMGkw
-SAYDVR0RBEEwP4ISYWFpLWxvZ2luLnBoLWdyLmNohilodHRwczovL2FhaS1sb2dp
-bi5waC1nci5jaC9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUS3jMf00nQqVvJRH7
-r+2JO7i7iuowDQYJKoZIhvcNAQEFBQADggEBACipXitm/nMRmZswt0tAl0fE81DF
-1U8Xxgh7OVK6QjVIebjckobeeV9D4JT3bF+YfZLVxl/9XIRbpBV2aYDf4TXAtN1R
-VZ/km3VDZbHImJQls8VGoJzMXXGcywQwbZg5vXcdXB1FtYWQTkor5lg0mqRAIJES
-BqBm0XGj5gO0xpZnds5cvH94w/xzfI+BDmusQvjTaYPblemangtJ+MD0yXSaHo2z
-PdZQszzV/n+v286sSXaiO/Bd6QbtIRZUZiUR/2MfwjZ+exR0nymEiSNdiKch1ZpN
-3gDJq0hd3/Em8RDzJtiui0YIJVFZdxA3+9QhvGhX0OvziPHKbsxh1mNnI1k=
-						</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://aai-login.ph-gr.ch/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aai-login.ph-gr.ch/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">ph-gr.ch</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">PHGR - Pädagogische Hochschule Graubünden</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">PHGR - University of Teacher Education Graubünden</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="it">PHGR - Alta Scuola Pedagogica dei Grigioni</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.ph-gr.ch/</OrganizationURL>
-    <OrganizationURL xml:lang="en">http://www.ph-gr.ch/</OrganizationURL>
-    <OrganizationURL xml:lang="it">http://www.ph-gr.ch/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>AAI</GivenName>
-    <SurName>PHGR</SurName>
-    <EmailAddress>mailto:aai@ph-gr.ch</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>SWITCHaai</GivenName>
-    <SurName>Team</SurName>
-    <EmailAddress>mailto:aai@switch.ch</EmailAddress>
-    <TelephoneNumber>+41 44 268 15 05</TelephoneNumber>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/aai-logon.bfh.ch-idp-shibboleth.xml b/swamid-interfederations-2.0/aai-logon.bfh.ch-idp-shibboleth.xml
deleted file mode 100644
index 5e37e909..00000000
--- a/swamid-interfederations-2.0/aai-logon.bfh.ch-idp-shibboleth.xml
+++ /dev/null
@@ -1,130 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://aai-logon.bfh.ch/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://rr.aai.switch.ch/" registrationInstant="2014-04-11T07:17:19Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.switch.ch/aai/federation/switchaai/metadata-registration-practice-statement-20110711.txt</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-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </Extensions>
-  <IDPSSODescriptor errorURL="https://it-support.bfh.ch" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-    <Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bfh.ch</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="de">BFH - Berner Fachhochschule</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">BFH - Bern University of Applied Sciences</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="fr">BFH - Haute école spécialisée bernoise</mdui:DisplayName>
-        <mdui:Description xml:lang="de">Berner Fachhochschule BFH</mdui:Description>
-        <mdui:Description xml:lang="en">BFH - Bern University of Applied Sciences</mdui:Description>
-        <mdui:Description xml:lang="fr">Haute école spécialisée bernoise BFH</mdui:Description>
-        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH3gQEDgYKIhOF+gAAANRJREFUOMtj/P//PwMDAwNDVt0kCAMLUFWQPhDiaVcoKyl6AV2OiYEIcPvBU4cJ89fue/z8tQFRBkx0y4djGPj+45fgtv0n69DVsuCyNX/XRAyxizfuBRLtBXQX4AIkuUBGQoS8QIQBL0fzRqIMwGa7haHmAgNN5Q1ku+DE+esJx89dSyA6GpFpGFi8Yc/8t+8/yZMdBgwMDAzHz19LIjoaiQFMpEQjSQbgAvqayuuR+YzE5EYYcLI06A/xtCvCmhI5Odjef//xSxBXdna0NJiILR0AAN4ETpBaPLgrAAAAAElFTkSuQmCC</mdui:Logo>
-        <mdui:Logo height="58" width="80">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFAAAAA6CAIAAACoHEnGAAAACXBIWXMAAC4jAAAuIwF4pT92AAALDElEQVR4nO2ay28b1xWHz7w5HHLIITmkSA7JISm+H3pbduQkjoskRZuiiz6Apt0UaNF21U2XXfYf6K7Iuou0y6JNuymapA2CJHYax7LsWJYVS7JI8f1+zLOLkRVHoSRbJoW48AeCuDM858zv8F6ee+dykMvf/XEifw5OQpIGpZ17Wxs3b1+/0u+2T7T/2oJ984c/eyQ7DGc5VyCazCysICi6t7Op6/qkxU0C9HEdCJI6d+lbr73+K5I0TULQpHnshA384fgrP/gpimLjVXMGnDJhAAhEkvnlS+NTckacPmEAmL/4MmUyj0vK2YCPPBtzrM9PfXxwuNMW3tte+aoZZaIjqZmb/31/UuomwOgeFu2fC+zOTlswXpWe6yj/QDQ5MW0TYXQPA0C5y4/s1UNwTs9Y9UycIxNGUY3ChkZ7qFJHmRHUUzY5HZlw1rX624u/M9q//+jXR41qRRpORNfEODLh6+XcH6//xGir+pHzbbNeGb+oSXJkwrqOHJPnAYWtjbHqmThPNA9rqnr35rVxSTkbRvfwTkvoDC0nOq+vXm01quOWNFlGJ3yzkjrRs9tuvv/Pv4xbz8Q55ZAe9Lpv/emNp/HG+MiidQz1yt7f33zjqavPBqfpYbuDX778moXlxq7mDDhNwgiKRtNz3//5bzyCOG49E+f00xJttnz7R7+wu9xjVHMGjE7YbS5Nc3eMtouuxB23R5pRJvNL33kdQZBJqZsAoxNO82uXQm8b7aTr1kviv47ynxLCoVhmEsomxBOttAwSM8tPHuTMGEPCfjH2FI3qI+dh0f75L+f/AACcqV4bOI4JQZlos8XWbTfGr24CHJlwted8d+sFAMjwNxx07fgolMn0tCy6jky4LVnXKmkAcNC1ExPWNG3MuibGGH7DmqZ1WvUnj3M2jE64PbRW+879tvRFeyTlwrYiy+OXNhlGD+mrxYWrxQWjfW1v5trezDEh1q9fGb+uifGkQ7rTrN+69sFYpJwNT7bFo2lv/+1N+anauDx9wrqm/futP29v3BqjmjPgNBsAANBtN9/+65tbd9bGq+YMwGvlooOfekRrXddq5eLtT6+sffyeNBxMVNmEQEiKdk35EOTksS0NB51mvd/rAjyVDzs84xnP+L9g4flXMwsrAI96Bx9O5GbOv0Qz1odPEiQVTuQBwCOINgf/VS+PX7SPOh/PLz18aLawQjjxqNJPBRZO5Ey0ubizmZ5f4XiPqiipufOKJE1nF2jGQjOW6cx8u1FNzizrut7rNGPZhbs3rw0HveziRYpmaMYaTc80KqXZC5dNNKNrqpjIEQRpMjPR9Oyg1/WHYh5/SNd1MZEnScrm4D3+UKtRnVm+pMiyGM95/MHS7lZwOmV3uoeDvt3Bs5xLjGfLxR19AnedqNnCAiAs5/IIIbvTbbZYdzZv0xZrcfuu0+0LJ/KqItudHpIylQtbAIAgCMdPESQFgHj8IUGMffrBO6qqFrY2aLMFADbWPmE5VyCSvPXJh6FY2uH23rr2IQBsrP3XwXtxgmCsNrcvWC7sVIo7vXazWasQBOl0+5xun6EpFEujOG5h7WPPFgBQDMNRFB102/12q1zY1lRVU/eRpWG1tAsAtXLhYME8HPTv3bnBWG0m2iwNB61mLXfuRQzHZVmWpaGqqJqmKrLUrFdS8xeqpYIiy8nZZVVRNE2T5aE06DNWe6dVFyJxty8oy5KiKLquW1iOYe2KLNEWtl4pSoN+u3nCrsOTgiDIyL04BB29Jjk4/3gGCGIcHvI6WPkYGo6K+YzHRwjHbQ7exh1+ZoUgKbPlS6WYNNGzFy5/NcJ0Zv74S4STeafHf3AYy35hP52ZJynTw1v5qbkLFtuX/qY7Mb6BEI4bReR4sPTCCophCII43N5IIl/d2/X4Qhw/xXJOMZ6VpWE8v9Ru1GRp6A1GzRa2Vi7EZ5bMDGtmrNH0bKdZF8R4vVLMLj4PCHRaDdeUEE3P1kqF/PKLvC9Y3bsfimUUWcZwPJE/12pUbJxblqXM4kq/2/EGIp1WHccJl0dw8FP9bscXig4HPZZzRdKzjUpRVZREfon3BjqtuhCOC5FkvVyce+4bnWYts7Bid3p63VZ64TkURRmrrV4t5ZZekOUhx3uiqdlauaCqyqGEUcZqszvdAEAQFO8L4gTJuTxub6DbbpZ3tyLJGVVRjP4R41kExZweH00zW3fW/OH4+upVMZEDAL8YR1HM7QsCAEmZTDRDEKSu6wRJujyCmWF5byAUy1z/8J1ep221cSRJgQ68NwAAvU7LwXtpxmoyMz5xGnRw+0KR5AwCCOeaAgBJGqyvXhXCcTGes7B2xmob9vvDQX/Q7zIWNjSdubP6cSCSxHGCICiGtRMEGUnkURQz8jqccKW4c3/ztqapbn9QkYaqIvO+AGmiFVnieG+zVtZUpVLcAYBmrSz1u9VSwWS2BKdT/W47nluslws4QbYbVQRFClt3AUCWhhiGm60sPyUwVlu7WdNUpbB1t12vZhYuUrRZUWTeF9RBVxUFw3EMJ1RV6bWbDre3VaugGFrcvtuolaRhv1YpAgCCoIn8UqtebTUq9XJx0O8qigQAqqIoilwvF2O5xV6npaoqiqK1UsHtF5v1yqDfrVf2Roxp5AEohhnPP2M4bpRKDCcAACfIA1OcIAAARfctcZwAABTbb+8XWATBcQLHify5FzEMNwKiKAoAhjuCoAiCYBhuXBT2KzeKfTmOYXwQ0HDE9hsIPDStYDhhHBltBEEA9l3OlK/nH07o/MWXDy1oD0EzFrvLw/uCD33laCR13MYtAExn5nGCpEz0yE9Tc+eNdRVJmcR4dqRNOJl3TfkP/Q4jyf3rpuefiz6kQUzkMPyRtqswIZw0W6yl+/fiuSWbw6Uqciy7IEvDWGaeMtGtepXlnDYHb3e6m7VKPLfoC063GlWasbB2pyJLVhsnJrI2h0tT1enMvCINE7mlRrVkd/JWu9MbjFAU3e+23d5gp9XwCGI0NdNu1rOLz6/fuKoqspjIhRP5zc8+DSdyYjxbr+7FMnNCJFEubIcTueGg3+u2A9GUxx9qVMtG2b+3fgNFsXhuafWjdzEMzy69oCgya3fUSoXMwgpttpAkNZ2eA0BsnDMUyzTrleziRV3TnR4/7xVQzuWmTGYLywnhuEcQLSxXLmxbbFxpd8vtCx36esyMVdO1fq/j8ggW1p6cPa9pul+Mu/0hq42rlXYp2kzRZk3TWLuz12lWSwWcIHLnXlBkCQACkeTmZ6uh6XSttDvs9wDAF4yiKMpyLpbj73++7gtGLSzXrJU51/5TyYyFjaZneW/Q7QvWysVuuwkAmqZu3Pxk5dXvGdNede8+zVjtTrfD7XULosPt2978zOnxC5HE6pX/+MUYTpDeYMTKciRFowCga6oiS/1uZ/fehq7rqqLomq6qqqqpADDodQORxJQggq6rqqJpqnHJe3fWOJe71aj0u53CA0d5OAQEsTlcmqaqiuJwTe1s3g5EksaaXBoOoqnZRq1sBEFQtNdtX3n3H0I4TjNMOJFrN+sWu8MXivV7HZOZ0TVN1/V2o1bcvttp1v1izGRmAIAgKafHBwDddjMQSfLegKaq/W5bkaXi1oamqZqq6poqDQepufPtZh1BoLC10WrWpoQwYBhmlFAMx436/KD6fbG0xgnSsDkojA/eHzhi+IELQVIHBjhBOPip1NwFI86hTx+Kg+SXLxEECQALF18x5oX9mAiCYphRPnCCPFhj4wRpVHiCIA9U4ThhLKIOpBoxCZIyZgQcJ/4HcAk2YtPORt0AAAAASUVORK5CYII=</mdui:Logo>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:IPHint>2001:620:500::/48</mdui:IPHint>
-        <mdui:IPHint>193.5.80.0/21</mdui:IPHint>
-        <mdui:IPHint>147.87.0.0/16</mdui:IPHint>
-        <mdui:IPHint>195.176.3.0/26</mdui:IPHint>
-        <mdui:DomainHint>bfh.ch</mdui:DomainHint>
-        <mdui:GeolocationHint>geo:47.142358,7.244692</mdui:GeolocationHint>
-        <mdui:GeolocationHint>geo:47.057423,7.621388</mdui:GeolocationHint>
-        <mdui:GeolocationHint>geo:46.947922,7.444609</mdui:GeolocationHint>
-        <mdui:GeolocationHint>geo:46.946692,7.391228</mdui:GeolocationHint>
-        <mdui:GeolocationHint>geo:46.991818,7.468039</mdui:GeolocationHint>
-        <mdui:GeolocationHint>geo:47.145776,7.219669</mdui:GeolocationHint>
-      </mdui:DiscoHints>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDIDCCAgigAwIBAgIJAJVzWOYGQeKsMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
-BAMTEGFhaS1sb2dvbi5iZmguY2gwHhcNMTIwNjI1MTIwMDI3WhcNMTUwNjI1MTIw
-MDI3WjAbMRkwFwYDVQQDExBhYWktbG9nb24uYmZoLmNoMIIBIjANBgkqhkiG9w0B
-AQEFAAOCAQ8AMIIBCgKCAQEAnwTKlepv4n191/BElXAMg/u+2St3X4T7Jyekhs0I
-hjOnVrhZg/KOmvpPGnaCEZwdN19Lstq4Wqt0PTJk0AkQn/NWLc3+lTJREQJ8G+hU
-5FAdySCDu2bOrgJjD4Bl7hUN0k4W+bkkdgplvcqXERFqt368qpu2c1lRAEwJ7Tn8
-2XxjoP9rOUpTTW+XJh5g5CK2V9BBPteeVf5Gfwe3/xiuQ4LuHsGW8vFLEZPEdIWD
-b9dPuO6WzmqFon+RxAwwUm9MgR+Fgd3vSqYINZFmOJ9kvEONK1hLv7e0a0MX7BhK
-c28dy/3UBhLZmNfiko8gsDR11rvaEw6GcONW2333o6VKcwIDAQABo2cwZTBEBgNV
-HREEPTA7ghBhYWktbG9nb24uYmZoLmNohidodHRwczovL2FhaS1sb2dvbi5iZmgu
-Y2gvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFByxTmSn9QFnFpQCJWhgYfKAc3bk
-MA0GCSqGSIb3DQEBBQUAA4IBAQAOIELg4Y21HCefARPwRAhwB3XTRAdoucBQt4xu
-s8UC39Yuzi6Eh6SJieGAm9ePLTpNFSH3jIqAiQyxH33jWZMSb229ByIGzbHrm8K7
-WLFuqcLltr9vdd6l1RT+hOt5wPRNQhWqDkWuBRDBZz4WHq3QNypCzSHyvLBYoahb
-JYkfFc6kusMIqlwnGzfxO450QRAdnhf38E9N1iz+nGoRNT+5xwVCsP/bdUVAyYNr
-M2r2BWHVZt2GQD4ZsRgLjtsaRoyobIN2CWhOVZqnlk4vbXFXlS++TwtBzJq8HKft
-2EhVU1pz8jnpJ90P3Nyj1HNw55DR9pn7DMQqIdSAOoyDkoXY
-						</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://aai-logon.bfh.ch:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aai-logon.bfh.ch: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-logon.bfh.ch/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://aai-logon.bfh.ch/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://aai-logon.bfh.ch/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://aai-logon.bfh.ch/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
-    <Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bfh.ch</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDIDCCAgigAwIBAgIJAJVzWOYGQeKsMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
-BAMTEGFhaS1sb2dvbi5iZmguY2gwHhcNMTIwNjI1MTIwMDI3WhcNMTUwNjI1MTIw
-MDI3WjAbMRkwFwYDVQQDExBhYWktbG9nb24uYmZoLmNoMIIBIjANBgkqhkiG9w0B
-AQEFAAOCAQ8AMIIBCgKCAQEAnwTKlepv4n191/BElXAMg/u+2St3X4T7Jyekhs0I
-hjOnVrhZg/KOmvpPGnaCEZwdN19Lstq4Wqt0PTJk0AkQn/NWLc3+lTJREQJ8G+hU
-5FAdySCDu2bOrgJjD4Bl7hUN0k4W+bkkdgplvcqXERFqt368qpu2c1lRAEwJ7Tn8
-2XxjoP9rOUpTTW+XJh5g5CK2V9BBPteeVf5Gfwe3/xiuQ4LuHsGW8vFLEZPEdIWD
-b9dPuO6WzmqFon+RxAwwUm9MgR+Fgd3vSqYINZFmOJ9kvEONK1hLv7e0a0MX7BhK
-c28dy/3UBhLZmNfiko8gsDR11rvaEw6GcONW2333o6VKcwIDAQABo2cwZTBEBgNV
-HREEPTA7ghBhYWktbG9nb24uYmZoLmNohidodHRwczovL2FhaS1sb2dvbi5iZmgu
-Y2gvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFByxTmSn9QFnFpQCJWhgYfKAc3bk
-MA0GCSqGSIb3DQEBBQUAA4IBAQAOIELg4Y21HCefARPwRAhwB3XTRAdoucBQt4xu
-s8UC39Yuzi6Eh6SJieGAm9ePLTpNFSH3jIqAiQyxH33jWZMSb229ByIGzbHrm8K7
-WLFuqcLltr9vdd6l1RT+hOt5wPRNQhWqDkWuBRDBZz4WHq3QNypCzSHyvLBYoahb
-JYkfFc6kusMIqlwnGzfxO450QRAdnhf38E9N1iz+nGoRNT+5xwVCsP/bdUVAyYNr
-M2r2BWHVZt2GQD4ZsRgLjtsaRoyobIN2CWhOVZqnlk4vbXFXlS++TwtBzJq8HKft
-2EhVU1pz8jnpJ90P3Nyj1HNw55DR9pn7DMQqIdSAOoyDkoXY
-						</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://aai-logon.bfh.ch:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aai-logon.bfh.ch:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">bfh.ch</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">BFH - Berner Fachhochschule</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">BFH - Bern University of Applied Sciences</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="fr">BFH - Haute école spécialisée bernoise</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.bfh.ch/</OrganizationURL>
-    <OrganizationURL xml:lang="en">http://www.bfh.ch/</OrganizationURL>
-    <OrganizationURL xml:lang="fr">http://www.bfh.ch/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>BFH-ITS</GivenName>
-    <SurName>Support</SurName>
-    <EmailAddress>mailto:it-support@bfh.ch</EmailAddress>
-    <TelephoneNumber>+41 31 848 48 48</TelephoneNumber>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>AAI</GivenName>
-    <SurName>Admins</SurName>
-    <EmailAddress>mailto:aai-admins@bfh.ch</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/aai-logon.bfh.ch.xml b/swamid-interfederations-2.0/aai-logon.bfh.ch.xml
deleted file mode 100644
index 5e37e909..00000000
--- a/swamid-interfederations-2.0/aai-logon.bfh.ch.xml
+++ /dev/null
@@ -1,130 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://aai-logon.bfh.ch/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://rr.aai.switch.ch/" registrationInstant="2014-04-11T07:17:19Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.switch.ch/aai/federation/switchaai/metadata-registration-practice-statement-20110711.txt</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-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </Extensions>
-  <IDPSSODescriptor errorURL="https://it-support.bfh.ch" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-    <Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bfh.ch</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="de">BFH - Berner Fachhochschule</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">BFH - Bern University of Applied Sciences</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="fr">BFH - Haute école spécialisée bernoise</mdui:DisplayName>
-        <mdui:Description xml:lang="de">Berner Fachhochschule BFH</mdui:Description>
-        <mdui:Description xml:lang="en">BFH - Bern University of Applied Sciences</mdui:Description>
-        <mdui:Description xml:lang="fr">Haute école spécialisée bernoise BFH</mdui:Description>
-        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH3gQEDgYKIhOF+gAAANRJREFUOMtj/P//PwMDAwNDVt0kCAMLUFWQPhDiaVcoKyl6AV2OiYEIcPvBU4cJ89fue/z8tQFRBkx0y4djGPj+45fgtv0n69DVsuCyNX/XRAyxizfuBRLtBXQX4AIkuUBGQoS8QIQBL0fzRqIMwGa7haHmAgNN5Q1ku+DE+esJx89dSyA6GpFpGFi8Yc/8t+8/yZMdBgwMDAzHz19LIjoaiQFMpEQjSQbgAvqayuuR+YzE5EYYcLI06A/xtCvCmhI5Odjef//xSxBXdna0NJiILR0AAN4ETpBaPLgrAAAAAElFTkSuQmCC</mdui:Logo>
-        <mdui:Logo height="58" width="80">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFAAAAA6CAIAAACoHEnGAAAACXBIWXMAAC4jAAAuIwF4pT92AAALDElEQVR4nO2ay28b1xWHz7w5HHLIITmkSA7JISm+H3pbduQkjoskRZuiiz6Apt0UaNF21U2XXfYf6K7Iuou0y6JNuymapA2CJHYax7LsWJYVS7JI8f1+zLOLkRVHoSRbJoW48AeCuDM858zv8F6ee+dykMvf/XEifw5OQpIGpZ17Wxs3b1+/0u+2T7T/2oJ984c/eyQ7DGc5VyCazCysICi6t7Op6/qkxU0C9HEdCJI6d+lbr73+K5I0TULQpHnshA384fgrP/gpimLjVXMGnDJhAAhEkvnlS+NTckacPmEAmL/4MmUyj0vK2YCPPBtzrM9PfXxwuNMW3tte+aoZZaIjqZmb/31/UuomwOgeFu2fC+zOTlswXpWe6yj/QDQ5MW0TYXQPA0C5y4/s1UNwTs9Y9UycIxNGUY3ChkZ7qFJHmRHUUzY5HZlw1rX624u/M9q//+jXR41qRRpORNfEODLh6+XcH6//xGir+pHzbbNeGb+oSXJkwrqOHJPnAYWtjbHqmThPNA9rqnr35rVxSTkbRvfwTkvoDC0nOq+vXm01quOWNFlGJ3yzkjrRs9tuvv/Pv4xbz8Q55ZAe9Lpv/emNp/HG+MiidQz1yt7f33zjqavPBqfpYbuDX778moXlxq7mDDhNwgiKRtNz3//5bzyCOG49E+f00xJttnz7R7+wu9xjVHMGjE7YbS5Nc3eMtouuxB23R5pRJvNL33kdQZBJqZsAoxNO82uXQm8b7aTr1kviv47ynxLCoVhmEsomxBOttAwSM8tPHuTMGEPCfjH2FI3qI+dh0f75L+f/AACcqV4bOI4JQZlos8XWbTfGr24CHJlwted8d+sFAMjwNxx07fgolMn0tCy6jky4LVnXKmkAcNC1ExPWNG3MuibGGH7DmqZ1WvUnj3M2jE64PbRW+879tvRFeyTlwrYiy+OXNhlGD+mrxYWrxQWjfW1v5trezDEh1q9fGb+uifGkQ7rTrN+69sFYpJwNT7bFo2lv/+1N+anauDx9wrqm/futP29v3BqjmjPgNBsAANBtN9/+65tbd9bGq+YMwGvlooOfekRrXddq5eLtT6+sffyeNBxMVNmEQEiKdk35EOTksS0NB51mvd/rAjyVDzs84xnP+L9g4flXMwsrAI96Bx9O5GbOv0Qz1odPEiQVTuQBwCOINgf/VS+PX7SPOh/PLz18aLawQjjxqNJPBRZO5Ey0ubizmZ5f4XiPqiipufOKJE1nF2jGQjOW6cx8u1FNzizrut7rNGPZhbs3rw0HveziRYpmaMYaTc80KqXZC5dNNKNrqpjIEQRpMjPR9Oyg1/WHYh5/SNd1MZEnScrm4D3+UKtRnVm+pMiyGM95/MHS7lZwOmV3uoeDvt3Bs5xLjGfLxR19AnedqNnCAiAs5/IIIbvTbbZYdzZv0xZrcfuu0+0LJ/KqItudHpIylQtbAIAgCMdPESQFgHj8IUGMffrBO6qqFrY2aLMFADbWPmE5VyCSvPXJh6FY2uH23rr2IQBsrP3XwXtxgmCsNrcvWC7sVIo7vXazWasQBOl0+5xun6EpFEujOG5h7WPPFgBQDMNRFB102/12q1zY1lRVU/eRpWG1tAsAtXLhYME8HPTv3bnBWG0m2iwNB61mLXfuRQzHZVmWpaGqqJqmKrLUrFdS8xeqpYIiy8nZZVVRNE2T5aE06DNWe6dVFyJxty8oy5KiKLquW1iOYe2KLNEWtl4pSoN+u3nCrsOTgiDIyL04BB29Jjk4/3gGCGIcHvI6WPkYGo6K+YzHRwjHbQ7exh1+ZoUgKbPlS6WYNNGzFy5/NcJ0Zv74S4STeafHf3AYy35hP52ZJynTw1v5qbkLFtuX/qY7Mb6BEI4bReR4sPTCCophCII43N5IIl/d2/X4Qhw/xXJOMZ6VpWE8v9Ru1GRp6A1GzRa2Vi7EZ5bMDGtmrNH0bKdZF8R4vVLMLj4PCHRaDdeUEE3P1kqF/PKLvC9Y3bsfimUUWcZwPJE/12pUbJxblqXM4kq/2/EGIp1WHccJl0dw8FP9bscXig4HPZZzRdKzjUpRVZREfon3BjqtuhCOC5FkvVyce+4bnWYts7Bid3p63VZ64TkURRmrrV4t5ZZekOUhx3uiqdlauaCqyqGEUcZqszvdAEAQFO8L4gTJuTxub6DbbpZ3tyLJGVVRjP4R41kExZweH00zW3fW/OH4+upVMZEDAL8YR1HM7QsCAEmZTDRDEKSu6wRJujyCmWF5byAUy1z/8J1ep221cSRJgQ68NwAAvU7LwXtpxmoyMz5xGnRw+0KR5AwCCOeaAgBJGqyvXhXCcTGes7B2xmob9vvDQX/Q7zIWNjSdubP6cSCSxHGCICiGtRMEGUnkURQz8jqccKW4c3/ztqapbn9QkYaqIvO+AGmiFVnieG+zVtZUpVLcAYBmrSz1u9VSwWS2BKdT/W47nluslws4QbYbVQRFClt3AUCWhhiGm60sPyUwVlu7WdNUpbB1t12vZhYuUrRZUWTeF9RBVxUFw3EMJ1RV6bWbDre3VaugGFrcvtuolaRhv1YpAgCCoIn8UqtebTUq9XJx0O8qigQAqqIoilwvF2O5xV6npaoqiqK1UsHtF5v1yqDfrVf2Roxp5AEohhnPP2M4bpRKDCcAACfIA1OcIAAARfctcZwAABTbb+8XWATBcQLHify5FzEMNwKiKAoAhjuCoAiCYBhuXBT2KzeKfTmOYXwQ0HDE9hsIPDStYDhhHBltBEEA9l3OlK/nH07o/MWXDy1oD0EzFrvLw/uCD33laCR13MYtAExn5nGCpEz0yE9Tc+eNdRVJmcR4dqRNOJl3TfkP/Q4jyf3rpuefiz6kQUzkMPyRtqswIZw0W6yl+/fiuSWbw6Uqciy7IEvDWGaeMtGtepXlnDYHb3e6m7VKPLfoC063GlWasbB2pyJLVhsnJrI2h0tT1enMvCINE7mlRrVkd/JWu9MbjFAU3e+23d5gp9XwCGI0NdNu1rOLz6/fuKoqspjIhRP5zc8+DSdyYjxbr+7FMnNCJFEubIcTueGg3+u2A9GUxx9qVMtG2b+3fgNFsXhuafWjdzEMzy69oCgya3fUSoXMwgpttpAkNZ2eA0BsnDMUyzTrleziRV3TnR4/7xVQzuWmTGYLywnhuEcQLSxXLmxbbFxpd8vtCx36esyMVdO1fq/j8ggW1p6cPa9pul+Mu/0hq42rlXYp2kzRZk3TWLuz12lWSwWcIHLnXlBkCQACkeTmZ6uh6XSttDvs9wDAF4yiKMpyLpbj73++7gtGLSzXrJU51/5TyYyFjaZneW/Q7QvWysVuuwkAmqZu3Pxk5dXvGdNede8+zVjtTrfD7XULosPt2978zOnxC5HE6pX/+MUYTpDeYMTKciRFowCga6oiS/1uZ/fehq7rqqLomq6qqqqpADDodQORxJQggq6rqqJpqnHJe3fWOJe71aj0u53CA0d5OAQEsTlcmqaqiuJwTe1s3g5EksaaXBoOoqnZRq1sBEFQtNdtX3n3H0I4TjNMOJFrN+sWu8MXivV7HZOZ0TVN1/V2o1bcvttp1v1izGRmAIAgKafHBwDddjMQSfLegKaq/W5bkaXi1oamqZqq6poqDQepufPtZh1BoLC10WrWpoQwYBhmlFAMx436/KD6fbG0xgnSsDkojA/eHzhi+IELQVIHBjhBOPip1NwFI86hTx+Kg+SXLxEECQALF18x5oX9mAiCYphRPnCCPFhj4wRpVHiCIA9U4ThhLKIOpBoxCZIyZgQcJ/4HcAk2YtPORt0AAAAASUVORK5CYII=</mdui:Logo>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:IPHint>2001:620:500::/48</mdui:IPHint>
-        <mdui:IPHint>193.5.80.0/21</mdui:IPHint>
-        <mdui:IPHint>147.87.0.0/16</mdui:IPHint>
-        <mdui:IPHint>195.176.3.0/26</mdui:IPHint>
-        <mdui:DomainHint>bfh.ch</mdui:DomainHint>
-        <mdui:GeolocationHint>geo:47.142358,7.244692</mdui:GeolocationHint>
-        <mdui:GeolocationHint>geo:47.057423,7.621388</mdui:GeolocationHint>
-        <mdui:GeolocationHint>geo:46.947922,7.444609</mdui:GeolocationHint>
-        <mdui:GeolocationHint>geo:46.946692,7.391228</mdui:GeolocationHint>
-        <mdui:GeolocationHint>geo:46.991818,7.468039</mdui:GeolocationHint>
-        <mdui:GeolocationHint>geo:47.145776,7.219669</mdui:GeolocationHint>
-      </mdui:DiscoHints>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDIDCCAgigAwIBAgIJAJVzWOYGQeKsMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
-BAMTEGFhaS1sb2dvbi5iZmguY2gwHhcNMTIwNjI1MTIwMDI3WhcNMTUwNjI1MTIw
-MDI3WjAbMRkwFwYDVQQDExBhYWktbG9nb24uYmZoLmNoMIIBIjANBgkqhkiG9w0B
-AQEFAAOCAQ8AMIIBCgKCAQEAnwTKlepv4n191/BElXAMg/u+2St3X4T7Jyekhs0I
-hjOnVrhZg/KOmvpPGnaCEZwdN19Lstq4Wqt0PTJk0AkQn/NWLc3+lTJREQJ8G+hU
-5FAdySCDu2bOrgJjD4Bl7hUN0k4W+bkkdgplvcqXERFqt368qpu2c1lRAEwJ7Tn8
-2XxjoP9rOUpTTW+XJh5g5CK2V9BBPteeVf5Gfwe3/xiuQ4LuHsGW8vFLEZPEdIWD
-b9dPuO6WzmqFon+RxAwwUm9MgR+Fgd3vSqYINZFmOJ9kvEONK1hLv7e0a0MX7BhK
-c28dy/3UBhLZmNfiko8gsDR11rvaEw6GcONW2333o6VKcwIDAQABo2cwZTBEBgNV
-HREEPTA7ghBhYWktbG9nb24uYmZoLmNohidodHRwczovL2FhaS1sb2dvbi5iZmgu
-Y2gvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFByxTmSn9QFnFpQCJWhgYfKAc3bk
-MA0GCSqGSIb3DQEBBQUAA4IBAQAOIELg4Y21HCefARPwRAhwB3XTRAdoucBQt4xu
-s8UC39Yuzi6Eh6SJieGAm9ePLTpNFSH3jIqAiQyxH33jWZMSb229ByIGzbHrm8K7
-WLFuqcLltr9vdd6l1RT+hOt5wPRNQhWqDkWuBRDBZz4WHq3QNypCzSHyvLBYoahb
-JYkfFc6kusMIqlwnGzfxO450QRAdnhf38E9N1iz+nGoRNT+5xwVCsP/bdUVAyYNr
-M2r2BWHVZt2GQD4ZsRgLjtsaRoyobIN2CWhOVZqnlk4vbXFXlS++TwtBzJq8HKft
-2EhVU1pz8jnpJ90P3Nyj1HNw55DR9pn7DMQqIdSAOoyDkoXY
-						</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://aai-logon.bfh.ch:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aai-logon.bfh.ch: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-logon.bfh.ch/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://aai-logon.bfh.ch/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://aai-logon.bfh.ch/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://aai-logon.bfh.ch/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
-    <Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bfh.ch</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDIDCCAgigAwIBAgIJAJVzWOYGQeKsMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
-BAMTEGFhaS1sb2dvbi5iZmguY2gwHhcNMTIwNjI1MTIwMDI3WhcNMTUwNjI1MTIw
-MDI3WjAbMRkwFwYDVQQDExBhYWktbG9nb24uYmZoLmNoMIIBIjANBgkqhkiG9w0B
-AQEFAAOCAQ8AMIIBCgKCAQEAnwTKlepv4n191/BElXAMg/u+2St3X4T7Jyekhs0I
-hjOnVrhZg/KOmvpPGnaCEZwdN19Lstq4Wqt0PTJk0AkQn/NWLc3+lTJREQJ8G+hU
-5FAdySCDu2bOrgJjD4Bl7hUN0k4W+bkkdgplvcqXERFqt368qpu2c1lRAEwJ7Tn8
-2XxjoP9rOUpTTW+XJh5g5CK2V9BBPteeVf5Gfwe3/xiuQ4LuHsGW8vFLEZPEdIWD
-b9dPuO6WzmqFon+RxAwwUm9MgR+Fgd3vSqYINZFmOJ9kvEONK1hLv7e0a0MX7BhK
-c28dy/3UBhLZmNfiko8gsDR11rvaEw6GcONW2333o6VKcwIDAQABo2cwZTBEBgNV
-HREEPTA7ghBhYWktbG9nb24uYmZoLmNohidodHRwczovL2FhaS1sb2dvbi5iZmgu
-Y2gvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFByxTmSn9QFnFpQCJWhgYfKAc3bk
-MA0GCSqGSIb3DQEBBQUAA4IBAQAOIELg4Y21HCefARPwRAhwB3XTRAdoucBQt4xu
-s8UC39Yuzi6Eh6SJieGAm9ePLTpNFSH3jIqAiQyxH33jWZMSb229ByIGzbHrm8K7
-WLFuqcLltr9vdd6l1RT+hOt5wPRNQhWqDkWuBRDBZz4WHq3QNypCzSHyvLBYoahb
-JYkfFc6kusMIqlwnGzfxO450QRAdnhf38E9N1iz+nGoRNT+5xwVCsP/bdUVAyYNr
-M2r2BWHVZt2GQD4ZsRgLjtsaRoyobIN2CWhOVZqnlk4vbXFXlS++TwtBzJq8HKft
-2EhVU1pz8jnpJ90P3Nyj1HNw55DR9pn7DMQqIdSAOoyDkoXY
-						</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://aai-logon.bfh.ch:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aai-logon.bfh.ch:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">bfh.ch</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">BFH - Berner Fachhochschule</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">BFH - Bern University of Applied Sciences</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="fr">BFH - Haute école spécialisée bernoise</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.bfh.ch/</OrganizationURL>
-    <OrganizationURL xml:lang="en">http://www.bfh.ch/</OrganizationURL>
-    <OrganizationURL xml:lang="fr">http://www.bfh.ch/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>BFH-ITS</GivenName>
-    <SurName>Support</SurName>
-    <EmailAddress>mailto:it-support@bfh.ch</EmailAddress>
-    <TelephoneNumber>+41 31 848 48 48</TelephoneNumber>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>AAI</GivenName>
-    <SurName>Admins</SurName>
-    <EmailAddress>mailto:aai-admins@bfh.ch</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/aai-logon.fhnw.ch-idp-shibboleth.xml b/swamid-interfederations-2.0/aai-logon.fhnw.ch-idp-shibboleth.xml
deleted file mode 100644
index b3630075..00000000
--- a/swamid-interfederations-2.0/aai-logon.fhnw.ch-idp-shibboleth.xml
+++ /dev/null
@@ -1,144 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://aai-logon.fhnw.ch/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://rr.aai.switch.ch/" registrationInstant="2014-08-05T06:48:39Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.switch.ch/aai/federation/switchaai/metadata-registration-practice-statement-20110711.txt</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-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </Extensions>
-  <IDPSSODescriptor errorURL="http://www.fhnw.ch/services/business-applications/supportadressen" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-    <Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fhnw.ch</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="de">FHNW - Fachhochschule Nordwestschweiz</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">FHNW - University of Applied Sciences and Arts Northwestern Switzerland</mdui:DisplayName>
-        <mdui:Description xml:lang="de">Fachhochschule Nordwestschweiz</mdui:Description>
-        <mdui:Description xml:lang="en">University of Applied Sciences and Arts Northwestern Switzerland</mdui:Description>
-        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAC0GlDQ1BJQ0NQcm9maWxlAAB4nI2Uz0sUYRjHv7ONGChBYGZ7iKFDSKhMFmVE5a6/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+hkAAAFdSURBVHicYvj//z8DJZgizdQxIC8vDwPn5+czpKenR2dlZYHZuNSAaDCjsLCQoaCgAE6jGwATA2mAsWE0Q0pKysbg4OB1sbGxi318fG5HR0dXIhuQk5OjB5TfBFRXAdIUGRlZnpaW1h4WFhYHVDOXITQ09DkDMChMTEw2qKio/ACy/wIVcGVmZoINANKGGhoa14Eae4BsNhkZmZdA+YKoqCi5xMTEGgagSSADviQlJTFEREScAhmWnJwsBDIgOzubITU1VUNJSek/kG0XFBQUDbToP9AlmlDDo2Au+Aw0DcMAoPMZgM7P19fXf5+RkSHi7+/fZW9v/yc3N5cR6CUbYJhogsMgICBgN1ADyLbZgYGBR4Cm8wE1gF0AdK47UON1oH9zgXwuoCv2Ai1rBmq2BgciLBZANHKMwAIRFjsweVjow6MRWxyDMMgAkKtwycPwIEjKA24AAAAA//8DAOXaFze+PYMuAAAAAElFTkSuQmCC</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+hkAAAjfSURBVHic7Ft/SJRnHLfOtGVellxYSR5dSBpqWVqWtfJHlmddXl5ZSplmmtaZmRlMGmMD/xCEYGOwBWNMFjQGgxiDQWwgOBgE/tHGYEEDIWhLYhTLofDu8z3uiecen+fufe5uXG/c4Lt7e5/n+X6/z+f9fH8871sphmGkJCV6SbgDVpeEO2B1SbgDVpeEO2B1SbgDVpfA//z+xDoxOjr6rKCgwEg0GFED2NfXBxD9pkQ1N5IONi7Ou3LlSsq5c+d+IAAvX74clW5diZe+BQDyiumavy+Kao7KYR0AVfZUelU+RPLZjN8qXSQhAEYC7P8QHQBfR+FyYPzCQ1fMhPDrKkkGWomBDLBoGKhaG29fYmIgrzgaJumyOByAuvZ0x+O1LtnGxJuBZo2LLDLjYDwBFO2rdMcKYCQb0iJiht50TZvt7+8nALIGBwedAwMD6QQG3ZOBrdKpG8JMN81l9ti1Tvowu0/6ZTbEvfFFxHPhwoUxmXR3dwd++c1dvXq1sbe395sTJ048q6urM44ePWocPHjQ8Hq9j8+ePXsHcxuxIZuMMdEyUHhw+fDrJuz/Wltba+zbt884c+bMNO63m4kM6LBhT6Nsb2yfly5don3m8vMvXrxYduTIkft79uwxWlpa/oG/Y7hvC2FgV1fX2Lp164zMzEwjKysrRFasWGFkZ2cbMECOZwC4bw8dOmSkp6djdYpUioqKjNbW1knMd0QKL50QxtxU2H9n9+7dczK7e/fuJR3NqhRD98gG9luxbNmywN7YPmk9CDALG+mcTcfmzZuf8zbq6+sNRNvIAgAdDocSEJKenp4MPKl7Lpfr1T2bzRYyZ9GiRSH3wI4pgGiXhUw4ABWhboMPt8k+2P79li1bZmR2T5069QsLNZkeGmtoaPhAtseOjo4fmQ/k18mTJzvp/pIlSwI22LzOzs5ZzMsMAXD16tVK8Ox2uwHwPt65c6fBFIYDe/Hixa+u4cSn5IwqrMIxkA9b2B+mOfjtGxoaSjl8+PAX4sOj3wMHDhh8rpLpKikp+U30ecOGDQZCeJjPzWBkD08Uti+320026kwDSBTftm1b4DotLS0seOKGsOk5OJUbCwMxp2Lr1q3zyHM3kH8DLEIoTcjsgvWzKgaS/vPnz5fJ1lEexbpKvkhhrgtjC9LF/v37DfjUbQpAnrpiyEYSNh+Fxc9vygwDOSakeTye3xF295B7bMEwfGvHjh2zMtaD8T+rGE/3oecWP59b9zfZ4m3DXgpyeX1+fv50amqqgULyb1NT04e7du0isPtNMzASeHzIysBvbGy8xTZlBkC+8KAK9m/fvv0lxlyMSbhXnZOTI7WJvbxPemQtCu7bYeelbB3YdputEx4gXadCrxPXduRJB4oYMbDHNIAcQPPIMePNzc2DeGI3a2pqnpphYnV19V1ZWJkBEL8FKB4+NkZ6EMpjsgeHwkLMKJPZCa5rl60rLi4m222qwsOuSQdap1Kq9rj2aDGQBH1QI9GaFJHg2oVk/jwSQ9ErTtI6nSLCO8/fJz3Q90DGdPgyLYYvH47Y+ISYlkioKGBdjqrQMaE9owPogB2aX6gFIJ7uhKxKoi8bU4UTl6AndRkoFhvuz07kJKkd5NpPZHZIL/rY4qVLl0ojq62tbUpVeMQmHmwdB5NfYH6aFoAIwxHxKBN8sm3l5eVh16JqTcpaC91Gmsbb29sHZDaoP8Qcn+zUQ+xjbY/YglH/SyRQNd88qGhzUvPy8mYw/7uQo5wZANE2vMsXAmbs2rVrbZWVlaYBjKaN4YHAsXFSFobIx/MYzxY3HYySXAA8R6ct0beKigoKR69snRgpyH9VwflddC9qAHkhAKkq6QAYLQOhIxf9oDQMcQKZUERICrUe1LsB5Geib3SO54FX2SY/kcbGYYfOw6ssB2Awj3XI9NOZFpV6WFY5AY5j48aNs8iPP+Fc+0Jce/r06Qeq9MIXDxzfctauXTsLnV8y3XELYV0AdYqIEEJ3eNYxQZ9Ia8tF32jNsWPHRoi1AP+66Nfy5cvpaDiuKhx87i0rKxuh6osH8jazYxkGsnloQ2Z4vSwPIkT/4n3jGu4cjL9A4XmAytkk5k6q5pg/LPokpA1inzM7O/sl9E3ywCYEQN0qzFXAEqfTKdWP08Fn/OmD5T6ci78uKSkxhoaGmtHD9ovrqIHG3JZwAJJ/YPC41+sl9tXyYwkNYbNVmIUQ5kjzH9oKA8xolaQFH43j9z69gEDyX9D+0AsEjPl4UMSHAHY30EPA9W3RN0swkIURABgRQ5CktLTUwGZcPNi4zsV/T3BqmMPGy+lea2trs5g/kdfIpk/FPDA7HyesGeTPh/BhlZiCLMNAWuvz+aTn3yAIGWwe9Dlwb4rCE3/uYRUce3SJTTQ13xh7TwSGmIf5eXa7/Q86dUBnqay4WaaIBAEYlDGQThJgSjfpp1f1RUVFjzZt2kSs/Eg8Q6Phf0hr6NzO9ICZj7CHDO58T2yvWbly5Z/IewRepczvBQyM9EpfZKAOgOJZOBKAslaCPiSBWfOkjzGJvcBYs2YNfYd5zDHyc8y3SappN/OJ3u/RL7Uybrd7CrnuusfjuYF8N0HfS3A+fgowq2T+SBmo+qjEPrjAiDKE6YsVzVGtxTk65j4wOHazsLBQ+pDWr19vHD9+nBjTq0oFZAvV+CvxpQIvOK1QUZrAXGc48EIA9If5rMl98quThRgMlcHgGP+JUFyLcb8qPDWPcjZc96OhfkLNM73/oy+ECLmHuD8KxuTy1VSlA2djP8Jzmr7x4HRiVFVVBcCHr3ehwy2+l1SJ1od1scyHu6ezVufDOhsLviV24qHSW+JVxG6zvjA2B3XkkA6sJz0h7x3N7MlyfztL9jAi6Q/nh0yHWT0LGChzNFpmmmWCLgPN6o9mD9GsS/7trBglCWA8AYyV/tGGzBvxV3yTDIyRgfF0TtfpNwJAkR2xVi8zOsIBqGtPdzxe65IhnGTga8LApMT4rzWTkgQwCaBVJeEOWF0S7oDVJeEOWF0S7oDV5T8AAAD//wMAK6fch+XN+x8AAAAASUVORK5CYII=</mdui:Logo>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:IPHint>193.8.137.240/28</mdui:IPHint>
-        <mdui:IPHint>2001:620:300::/48</mdui:IPHint>
-        <mdui:IPHint>193.8.137.224/28</mdui:IPHint>
-        <mdui:IPHint>192.152.98.0/24</mdui:IPHint>
-        <mdui:IPHint>195.176.0.0/28</mdui:IPHint>
-        <mdui:IPHint>195.176.252.0/24</mdui:IPHint>
-        <mdui:IPHint>193.73.125.0/24</mdui:IPHint>
-        <mdui:IPHint>193.8.136.0/24</mdui:IPHint>
-        <mdui:IPHint>193.135.240.0/21</mdui:IPHint>
-        <mdui:IPHint>193.222.241.0/24</mdui:IPHint>
-        <mdui:IPHint>193.222.242.0/23</mdui:IPHint>
-        <mdui:IPHint>193.222.244.0/22</mdui:IPHint>
-        <mdui:IPHint>193.222.248.0/23</mdui:IPHint>
-        <mdui:IPHint>193.222.250.0/24</mdui:IPHint>
-        <mdui:IPHint>147.86.0.0/16</mdui:IPHint>
-        <mdui:DomainHint>fhnw.ch</mdui:DomainHint>
-        <mdui:GeolocationHint>geo:47.392715,8.054434</mdui:GeolocationHint>
-        <mdui:GeolocationHint>geo:47.562410,7.584170</mdui:GeolocationHint>
-        <mdui:GeolocationHint>geo:47.485184,8.198633</mdui:GeolocationHint>
-        <mdui:GeolocationHint>geo:47.475698,7.740292</mdui:GeolocationHint>
-        <mdui:GeolocationHint>geo:47.533412,7.638095</mdui:GeolocationHint>
-        <mdui:GeolocationHint>geo:47.346483,7.911239</mdui:GeolocationHint>
-        <mdui:GeolocationHint>geo:47.212806,7.543743</mdui:GeolocationHint>
-        <mdui:GeolocationHint>geo:47.480694,8.211173</mdui:GeolocationHint>
-        <mdui:GeolocationHint>geo:47.282572,7.942067</mdui:GeolocationHint>
-      </mdui:DiscoHints>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDJDCCAgygAwIBAgIJAIJ6DzWGAuMKMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNV
-BAMTEWFhaS1sb2dvbi5maG53LmNoMB4XDTE0MDUxMTIxNDEwNFoXDTE3MDUxMDIx
-NDEwNFowHDEaMBgGA1UEAxMRYWFpLWxvZ29uLmZobncuY2gwggEiMA0GCSqGSIb3
-DQEBAQUAA4IBDwAwggEKAoIBAQDOkHz+Vpux4iVD5VJ8jZo8Nc5Q5YZ2AgkRo0A1
-mXHGQV9zEol9GSfsI4bR/O2ZIyyrPzDIIt6gGY05kV+v3JrHDyPskU53o95zL/Wd
-RlXKZL01Cxr9e01LfKzOQ+RNcimbGHg/n2V96f0eyonFBgq3En/83U5YKLpxCGNl
-65RI6HwVNPEC8lVOcSpQ7wudWhhzozIo7R8UYCTIptz8IvVate9RZ4pTKt7liZL2
-ARBu14nYsDg4hVexYlfL83pjnHqLAjnGQFcPDTceqUaxvNNpix/vAE6jBKLLKbzd
-dV2+kpIGIlo5YvBXGBe8z6sFgKNAUuzjDFpYTofQhVML2ElZAgMBAAGjaTBnMEYG
-A1UdEQQ/MD2CEWFhaS1sb2dvbi5maG53LmNohihodHRwczovL2FhaS1sb2dvbi5m
-aG53LmNoL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBTem4oyIQo/dTo3R/J2b+7+
-CNTz3DANBgkqhkiG9w0BAQUFAAOCAQEAjVnz/Y4A5DeISewPWxT/KlTWbYrWfkJd
-fMMtc0mV3TGJaWSVzQD0D0WgTnatZaab7A/eRrBHUHWcCtYpamNSsCo1a4TLJHPc
-9PrK0XLHC889mZBwz+dssMq4GXjc1vofxgI8kSmmmFAa7r7zAWPVhduwhnPE5mjY
-jemT6fUUBcDOW5UGKChiIrkN3/9pRGT6pBalNKen1C5P+lBh8bvD2DSzlzjtocHv
-WfOxP5GFY5ZCrTjbF/wFGhk3orBkAoFTpeRdTwE9eE3amEj+bGgiXsh0Z9LGkcJN
-HxsDKvqOV07q5mSPIh+RMYeL+YuHsgti6dcYgM2CtCQj90/ydFLMvQ==
-						</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://aai-logon.fhnw.ch:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aai-logon.fhnw.ch: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-logon.fhnw.ch/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://aai-logon.fhnw.ch/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://aai-logon.fhnw.ch/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://aai-logon.fhnw.ch/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
-    <Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fhnw.ch</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDJDCCAgygAwIBAgIJAIJ6DzWGAuMKMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNV
-BAMTEWFhaS1sb2dvbi5maG53LmNoMB4XDTE0MDUxMTIxNDEwNFoXDTE3MDUxMDIx
-NDEwNFowHDEaMBgGA1UEAxMRYWFpLWxvZ29uLmZobncuY2gwggEiMA0GCSqGSIb3
-DQEBAQUAA4IBDwAwggEKAoIBAQDOkHz+Vpux4iVD5VJ8jZo8Nc5Q5YZ2AgkRo0A1
-mXHGQV9zEol9GSfsI4bR/O2ZIyyrPzDIIt6gGY05kV+v3JrHDyPskU53o95zL/Wd
-RlXKZL01Cxr9e01LfKzOQ+RNcimbGHg/n2V96f0eyonFBgq3En/83U5YKLpxCGNl
-65RI6HwVNPEC8lVOcSpQ7wudWhhzozIo7R8UYCTIptz8IvVate9RZ4pTKt7liZL2
-ARBu14nYsDg4hVexYlfL83pjnHqLAjnGQFcPDTceqUaxvNNpix/vAE6jBKLLKbzd
-dV2+kpIGIlo5YvBXGBe8z6sFgKNAUuzjDFpYTofQhVML2ElZAgMBAAGjaTBnMEYG
-A1UdEQQ/MD2CEWFhaS1sb2dvbi5maG53LmNohihodHRwczovL2FhaS1sb2dvbi5m
-aG53LmNoL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBTem4oyIQo/dTo3R/J2b+7+
-CNTz3DANBgkqhkiG9w0BAQUFAAOCAQEAjVnz/Y4A5DeISewPWxT/KlTWbYrWfkJd
-fMMtc0mV3TGJaWSVzQD0D0WgTnatZaab7A/eRrBHUHWcCtYpamNSsCo1a4TLJHPc
-9PrK0XLHC889mZBwz+dssMq4GXjc1vofxgI8kSmmmFAa7r7zAWPVhduwhnPE5mjY
-jemT6fUUBcDOW5UGKChiIrkN3/9pRGT6pBalNKen1C5P+lBh8bvD2DSzlzjtocHv
-WfOxP5GFY5ZCrTjbF/wFGhk3orBkAoFTpeRdTwE9eE3amEj+bGgiXsh0Z9LGkcJN
-HxsDKvqOV07q5mSPIh+RMYeL+YuHsgti6dcYgM2CtCQj90/ydFLMvQ==
-						</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://aai-logon.fhnw.ch:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aai-logon.fhnw.ch:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">fhnw.ch</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">FHNW - Fachhochschule Nordwestschweiz</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">FHNW - University of Applied Sciences and Arts Northwestern Switzerland</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.fhnw.ch/</OrganizationURL>
-    <OrganizationURL xml:lang="en">http://www.fhnw.ch/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Helpdesk AAI</GivenName>
-    <SurName>FHNW</SurName>
-    <EmailAddress>mailto:aaihelp@fhnw.ch</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Weboffice</GivenName>
-    <SurName>FHNW</SurName>
-    <EmailAddress>mailto:weboffice@fhnw.ch</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Tom</GivenName>
-    <SurName>Gross</SurName>
-    <EmailAddress>mailto:tom.gross@fhnw.ch</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/aai-logon.fhnw.ch.xml b/swamid-interfederations-2.0/aai-logon.fhnw.ch.xml
deleted file mode 100644
index b3630075..00000000
--- a/swamid-interfederations-2.0/aai-logon.fhnw.ch.xml
+++ /dev/null
@@ -1,144 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://aai-logon.fhnw.ch/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://rr.aai.switch.ch/" registrationInstant="2014-08-05T06:48:39Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.switch.ch/aai/federation/switchaai/metadata-registration-practice-statement-20110711.txt</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-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </Extensions>
-  <IDPSSODescriptor errorURL="http://www.fhnw.ch/services/business-applications/supportadressen" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-    <Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fhnw.ch</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="de">FHNW - Fachhochschule Nordwestschweiz</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">FHNW - University of Applied Sciences and Arts Northwestern Switzerland</mdui:DisplayName>
-        <mdui:Description xml:lang="de">Fachhochschule Nordwestschweiz</mdui:Description>
-        <mdui:Description xml:lang="en">University of Applied Sciences and Arts Northwestern Switzerland</mdui:Description>
-        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAC0GlDQ1BJQ0NQcm9maWxlAAB4nI2Uz0sUYRjHv7ONGChBYGZ7iKFDSKhMFmVE5a6/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+hkAAAFdSURBVHicYvj//z8DJZgizdQxIC8vDwPn5+czpKenR2dlZYHZuNSAaDCjsLCQoaCgAE6jGwATA2mAsWE0Q0pKysbg4OB1sbGxi318fG5HR0dXIhuQk5OjB5TfBFRXAdIUGRlZnpaW1h4WFhYHVDOXITQ09DkDMChMTEw2qKio/ACy/wIVcGVmZoINANKGGhoa14Eae4BsNhkZmZdA+YKoqCi5xMTEGgagSSADviQlJTFEREScAhmWnJwsBDIgOzubITU1VUNJSek/kG0XFBQUDbToP9AlmlDDo2Au+Aw0DcMAoPMZgM7P19fXf5+RkSHi7+/fZW9v/yc3N5cR6CUbYJhogsMgICBgN1ADyLbZgYGBR4Cm8wE1gF0AdK47UON1oH9zgXwuoCv2Ai1rBmq2BgciLBZANHKMwAIRFjsweVjow6MRWxyDMMgAkKtwycPwIEjKA24AAAAA//8DAOXaFze+PYMuAAAAAElFTkSuQmCC</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+hkAAAjfSURBVHic7Ft/SJRnHLfOtGVellxYSR5dSBpqWVqWtfJHlmddXl5ZSplmmtaZmRlMGmMD/xCEYGOwBWNMFjQGgxiDQWwgOBgE/tHGYEEDIWhLYhTLofDu8z3uiecen+fufe5uXG/c4Lt7e5/n+X6/z+f9fH8871sphmGkJCV6SbgDVpeEO2B1SbgDVpeEO2B1SbgDVpfA//z+xDoxOjr6rKCgwEg0GFED2NfXBxD9pkQ1N5IONi7Ou3LlSsq5c+d+IAAvX74clW5diZe+BQDyiumavy+Kao7KYR0AVfZUelU+RPLZjN8qXSQhAEYC7P8QHQBfR+FyYPzCQ1fMhPDrKkkGWomBDLBoGKhaG29fYmIgrzgaJumyOByAuvZ0x+O1LtnGxJuBZo2LLDLjYDwBFO2rdMcKYCQb0iJiht50TZvt7+8nALIGBwedAwMD6QQG3ZOBrdKpG8JMN81l9ti1Tvowu0/6ZTbEvfFFxHPhwoUxmXR3dwd++c1dvXq1sbe395sTJ048q6urM44ePWocPHjQ8Hq9j8+ePXsHcxuxIZuMMdEyUHhw+fDrJuz/Wltba+zbt884c+bMNO63m4kM6LBhT6Nsb2yfly5don3m8vMvXrxYduTIkft79uwxWlpa/oG/Y7hvC2FgV1fX2Lp164zMzEwjKysrRFasWGFkZ2cbMECOZwC4bw8dOmSkp6djdYpUioqKjNbW1knMd0QKL50QxtxU2H9n9+7dczK7e/fuJR3NqhRD98gG9luxbNmywN7YPmk9CDALG+mcTcfmzZuf8zbq6+sNRNvIAgAdDocSEJKenp4MPKl7Lpfr1T2bzRYyZ9GiRSH3wI4pgGiXhUw4ABWhboMPt8k+2P79li1bZmR2T5069QsLNZkeGmtoaPhAtseOjo4fmQ/k18mTJzvp/pIlSwI22LzOzs5ZzMsMAXD16tVK8Ox2uwHwPt65c6fBFIYDe/Hixa+u4cSn5IwqrMIxkA9b2B+mOfjtGxoaSjl8+PAX4sOj3wMHDhh8rpLpKikp+U30ecOGDQZCeJjPzWBkD08Uti+320026kwDSBTftm1b4DotLS0seOKGsOk5OJUbCwMxp2Lr1q3zyHM3kH8DLEIoTcjsgvWzKgaS/vPnz5fJ1lEexbpKvkhhrgtjC9LF/v37DfjUbQpAnrpiyEYSNh+Fxc9vygwDOSakeTye3xF295B7bMEwfGvHjh2zMtaD8T+rGE/3oecWP59b9zfZ4m3DXgpyeX1+fv50amqqgULyb1NT04e7du0isPtNMzASeHzIysBvbGy8xTZlBkC+8KAK9m/fvv0lxlyMSbhXnZOTI7WJvbxPemQtCu7bYeelbB3YdputEx4gXadCrxPXduRJB4oYMbDHNIAcQPPIMePNzc2DeGI3a2pqnpphYnV19V1ZWJkBEL8FKB4+NkZ6EMpjsgeHwkLMKJPZCa5rl60rLi4m222qwsOuSQdap1Kq9rj2aDGQBH1QI9GaFJHg2oVk/jwSQ9ErTtI6nSLCO8/fJz3Q90DGdPgyLYYvH47Y+ISYlkioKGBdjqrQMaE9owPogB2aX6gFIJ7uhKxKoi8bU4UTl6AndRkoFhvuz07kJKkd5NpPZHZIL/rY4qVLl0ojq62tbUpVeMQmHmwdB5NfYH6aFoAIwxHxKBN8sm3l5eVh16JqTcpaC91Gmsbb29sHZDaoP8Qcn+zUQ+xjbY/YglH/SyRQNd88qGhzUvPy8mYw/7uQo5wZANE2vMsXAmbs2rVrbZWVlaYBjKaN4YHAsXFSFobIx/MYzxY3HYySXAA8R6ct0beKigoKR69snRgpyH9VwflddC9qAHkhAKkq6QAYLQOhIxf9oDQMcQKZUERICrUe1LsB5Geib3SO54FX2SY/kcbGYYfOw6ssB2Awj3XI9NOZFpV6WFY5AY5j48aNs8iPP+Fc+0Jce/r06Qeq9MIXDxzfctauXTsLnV8y3XELYV0AdYqIEEJ3eNYxQZ9Ia8tF32jNsWPHRoi1AP+66Nfy5cvpaDiuKhx87i0rKxuh6osH8jazYxkGsnloQ2Z4vSwPIkT/4n3jGu4cjL9A4XmAytkk5k6q5pg/LPokpA1inzM7O/sl9E3ywCYEQN0qzFXAEqfTKdWP08Fn/OmD5T6ci78uKSkxhoaGmtHD9ovrqIHG3JZwAJJ/YPC41+sl9tXyYwkNYbNVmIUQ5kjzH9oKA8xolaQFH43j9z69gEDyX9D+0AsEjPl4UMSHAHY30EPA9W3RN0swkIURABgRQ5CktLTUwGZcPNi4zsV/T3BqmMPGy+lea2trs5g/kdfIpk/FPDA7HyesGeTPh/BhlZiCLMNAWuvz+aTn3yAIGWwe9Dlwb4rCE3/uYRUce3SJTTQ13xh7TwSGmIf5eXa7/Q86dUBnqay4WaaIBAEYlDGQThJgSjfpp1f1RUVFjzZt2kSs/Eg8Q6Phf0hr6NzO9ICZj7CHDO58T2yvWbly5Z/IewRepczvBQyM9EpfZKAOgOJZOBKAslaCPiSBWfOkjzGJvcBYs2YNfYd5zDHyc8y3SappN/OJ3u/RL7Uybrd7CrnuusfjuYF8N0HfS3A+fgowq2T+SBmo+qjEPrjAiDKE6YsVzVGtxTk65j4wOHazsLBQ+pDWr19vHD9+nBjTq0oFZAvV+CvxpQIvOK1QUZrAXGc48EIA9If5rMl98quThRgMlcHgGP+JUFyLcb8qPDWPcjZc96OhfkLNM73/oy+ECLmHuD8KxuTy1VSlA2djP8Jzmr7x4HRiVFVVBcCHr3ehwy2+l1SJ1od1scyHu6ezVufDOhsLviV24qHSW+JVxG6zvjA2B3XkkA6sJz0h7x3N7MlyfztL9jAi6Q/nh0yHWT0LGChzNFpmmmWCLgPN6o9mD9GsS/7trBglCWA8AYyV/tGGzBvxV3yTDIyRgfF0TtfpNwJAkR2xVi8zOsIBqGtPdzxe65IhnGTga8LApMT4rzWTkgQwCaBVJeEOWF0S7oDVJeEOWF0S7oDV5T8AAAD//wMAK6fch+XN+x8AAAAASUVORK5CYII=</mdui:Logo>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:IPHint>193.8.137.240/28</mdui:IPHint>
-        <mdui:IPHint>2001:620:300::/48</mdui:IPHint>
-        <mdui:IPHint>193.8.137.224/28</mdui:IPHint>
-        <mdui:IPHint>192.152.98.0/24</mdui:IPHint>
-        <mdui:IPHint>195.176.0.0/28</mdui:IPHint>
-        <mdui:IPHint>195.176.252.0/24</mdui:IPHint>
-        <mdui:IPHint>193.73.125.0/24</mdui:IPHint>
-        <mdui:IPHint>193.8.136.0/24</mdui:IPHint>
-        <mdui:IPHint>193.135.240.0/21</mdui:IPHint>
-        <mdui:IPHint>193.222.241.0/24</mdui:IPHint>
-        <mdui:IPHint>193.222.242.0/23</mdui:IPHint>
-        <mdui:IPHint>193.222.244.0/22</mdui:IPHint>
-        <mdui:IPHint>193.222.248.0/23</mdui:IPHint>
-        <mdui:IPHint>193.222.250.0/24</mdui:IPHint>
-        <mdui:IPHint>147.86.0.0/16</mdui:IPHint>
-        <mdui:DomainHint>fhnw.ch</mdui:DomainHint>
-        <mdui:GeolocationHint>geo:47.392715,8.054434</mdui:GeolocationHint>
-        <mdui:GeolocationHint>geo:47.562410,7.584170</mdui:GeolocationHint>
-        <mdui:GeolocationHint>geo:47.485184,8.198633</mdui:GeolocationHint>
-        <mdui:GeolocationHint>geo:47.475698,7.740292</mdui:GeolocationHint>
-        <mdui:GeolocationHint>geo:47.533412,7.638095</mdui:GeolocationHint>
-        <mdui:GeolocationHint>geo:47.346483,7.911239</mdui:GeolocationHint>
-        <mdui:GeolocationHint>geo:47.212806,7.543743</mdui:GeolocationHint>
-        <mdui:GeolocationHint>geo:47.480694,8.211173</mdui:GeolocationHint>
-        <mdui:GeolocationHint>geo:47.282572,7.942067</mdui:GeolocationHint>
-      </mdui:DiscoHints>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDJDCCAgygAwIBAgIJAIJ6DzWGAuMKMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNV
-BAMTEWFhaS1sb2dvbi5maG53LmNoMB4XDTE0MDUxMTIxNDEwNFoXDTE3MDUxMDIx
-NDEwNFowHDEaMBgGA1UEAxMRYWFpLWxvZ29uLmZobncuY2gwggEiMA0GCSqGSIb3
-DQEBAQUAA4IBDwAwggEKAoIBAQDOkHz+Vpux4iVD5VJ8jZo8Nc5Q5YZ2AgkRo0A1
-mXHGQV9zEol9GSfsI4bR/O2ZIyyrPzDIIt6gGY05kV+v3JrHDyPskU53o95zL/Wd
-RlXKZL01Cxr9e01LfKzOQ+RNcimbGHg/n2V96f0eyonFBgq3En/83U5YKLpxCGNl
-65RI6HwVNPEC8lVOcSpQ7wudWhhzozIo7R8UYCTIptz8IvVate9RZ4pTKt7liZL2
-ARBu14nYsDg4hVexYlfL83pjnHqLAjnGQFcPDTceqUaxvNNpix/vAE6jBKLLKbzd
-dV2+kpIGIlo5YvBXGBe8z6sFgKNAUuzjDFpYTofQhVML2ElZAgMBAAGjaTBnMEYG
-A1UdEQQ/MD2CEWFhaS1sb2dvbi5maG53LmNohihodHRwczovL2FhaS1sb2dvbi5m
-aG53LmNoL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBTem4oyIQo/dTo3R/J2b+7+
-CNTz3DANBgkqhkiG9w0BAQUFAAOCAQEAjVnz/Y4A5DeISewPWxT/KlTWbYrWfkJd
-fMMtc0mV3TGJaWSVzQD0D0WgTnatZaab7A/eRrBHUHWcCtYpamNSsCo1a4TLJHPc
-9PrK0XLHC889mZBwz+dssMq4GXjc1vofxgI8kSmmmFAa7r7zAWPVhduwhnPE5mjY
-jemT6fUUBcDOW5UGKChiIrkN3/9pRGT6pBalNKen1C5P+lBh8bvD2DSzlzjtocHv
-WfOxP5GFY5ZCrTjbF/wFGhk3orBkAoFTpeRdTwE9eE3amEj+bGgiXsh0Z9LGkcJN
-HxsDKvqOV07q5mSPIh+RMYeL+YuHsgti6dcYgM2CtCQj90/ydFLMvQ==
-						</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://aai-logon.fhnw.ch:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aai-logon.fhnw.ch: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-logon.fhnw.ch/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://aai-logon.fhnw.ch/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://aai-logon.fhnw.ch/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://aai-logon.fhnw.ch/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
-    <Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fhnw.ch</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDJDCCAgygAwIBAgIJAIJ6DzWGAuMKMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNV
-BAMTEWFhaS1sb2dvbi5maG53LmNoMB4XDTE0MDUxMTIxNDEwNFoXDTE3MDUxMDIx
-NDEwNFowHDEaMBgGA1UEAxMRYWFpLWxvZ29uLmZobncuY2gwggEiMA0GCSqGSIb3
-DQEBAQUAA4IBDwAwggEKAoIBAQDOkHz+Vpux4iVD5VJ8jZo8Nc5Q5YZ2AgkRo0A1
-mXHGQV9zEol9GSfsI4bR/O2ZIyyrPzDIIt6gGY05kV+v3JrHDyPskU53o95zL/Wd
-RlXKZL01Cxr9e01LfKzOQ+RNcimbGHg/n2V96f0eyonFBgq3En/83U5YKLpxCGNl
-65RI6HwVNPEC8lVOcSpQ7wudWhhzozIo7R8UYCTIptz8IvVate9RZ4pTKt7liZL2
-ARBu14nYsDg4hVexYlfL83pjnHqLAjnGQFcPDTceqUaxvNNpix/vAE6jBKLLKbzd
-dV2+kpIGIlo5YvBXGBe8z6sFgKNAUuzjDFpYTofQhVML2ElZAgMBAAGjaTBnMEYG
-A1UdEQQ/MD2CEWFhaS1sb2dvbi5maG53LmNohihodHRwczovL2FhaS1sb2dvbi5m
-aG53LmNoL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBTem4oyIQo/dTo3R/J2b+7+
-CNTz3DANBgkqhkiG9w0BAQUFAAOCAQEAjVnz/Y4A5DeISewPWxT/KlTWbYrWfkJd
-fMMtc0mV3TGJaWSVzQD0D0WgTnatZaab7A/eRrBHUHWcCtYpamNSsCo1a4TLJHPc
-9PrK0XLHC889mZBwz+dssMq4GXjc1vofxgI8kSmmmFAa7r7zAWPVhduwhnPE5mjY
-jemT6fUUBcDOW5UGKChiIrkN3/9pRGT6pBalNKen1C5P+lBh8bvD2DSzlzjtocHv
-WfOxP5GFY5ZCrTjbF/wFGhk3orBkAoFTpeRdTwE9eE3amEj+bGgiXsh0Z9LGkcJN
-HxsDKvqOV07q5mSPIh+RMYeL+YuHsgti6dcYgM2CtCQj90/ydFLMvQ==
-						</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://aai-logon.fhnw.ch:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aai-logon.fhnw.ch:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">fhnw.ch</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">FHNW - Fachhochschule Nordwestschweiz</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">FHNW - University of Applied Sciences and Arts Northwestern Switzerland</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.fhnw.ch/</OrganizationURL>
-    <OrganizationURL xml:lang="en">http://www.fhnw.ch/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Helpdesk AAI</GivenName>
-    <SurName>FHNW</SurName>
-    <EmailAddress>mailto:aaihelp@fhnw.ch</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Weboffice</GivenName>
-    <SurName>FHNW</SurName>
-    <EmailAddress>mailto:weboffice@fhnw.ch</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Tom</GivenName>
-    <SurName>Gross</SurName>
-    <EmailAddress>mailto:tom.gross@fhnw.ch</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/aai-logon.fhsg.ch-idp-shibboleth.xml b/swamid-interfederations-2.0/aai-logon.fhsg.ch-idp-shibboleth.xml
deleted file mode 100644
index 2f817bb6..00000000
--- a/swamid-interfederations-2.0/aai-logon.fhsg.ch-idp-shibboleth.xml
+++ /dev/null
@@ -1,127 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://aai-logon.fhsg.ch/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://rr.aai.switch.ch/" registrationInstant="2014-09-05T08:54:49Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.switch.ch/aai/federation/switchaai/metadata-registration-practice-statement-20110711.txt</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-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </Extensions>
-  <IDPSSODescriptor errorURL="http://portal.fhsg.ch/it" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-    <Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fhsg.ch</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="de">FHS St. Gallen</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">FHS St.Gallen</mdui:DisplayName>
-        <mdui:Description xml:lang="de">FHS St. Gallen - Hochschule für Angewandte Wissenschaften</mdui:Description>
-        <mdui:Description xml:lang="en">FHS St. Gallen - University of Applied Sciences St. Gallen</mdui:Description>
-        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAC0GlDQ1BJQ0NQcm9maWxlAAB4nI2Uz0sUYRjHv7ONGChBYGZ7iKFDSKhMFmVE5a6/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+hkAAAG/SURBVHicYvj//z8Dg5JFCQpWtixhkNTUZgACTk4uBiiQVFVV8/X19W8sLCrZmpmV8wwoxs0ANiBjxX8UnLX6P4NPdQJMZ0RktNW8+Yv+r1m38f/2nXv+7z945P+CRUuAGhmsIAbkrP+PgvM2/2fwb4QbkJScyrt3/6G/u/ce+L9rz/7/IHrt+k3/1TU0cqAGrPuPgvM2AQ1ogBtgZ2fPsHnrjlsgzTAMcomPr99cHC5ANYCbm4dh+co1q/bsOwh3wb4Dh//nFRSegxiQDbQVGeeiGgACM2bNqTxw6Oj/nbv3/d+4edvzpctWbk5Lz6yEGGAczIuCTUJ4GVRtWUEaGRkZwQYkp6SpVdfUBQADVMbE1AxhMtgAXICFHUxxcXFjlQYbjtcAYgBeA1g5GRiYmIkwIKKvFgVHTqxlcMjQhysSkmNgCGpNYYjoh6oB0mE9tQwq1u4QA0ChjowLtv5nCGhKgBsgrsbAkLbsDDiBgeRB0QyKbl2vCUSlAwZxVQaGlMVnGHI2INRkrQEa4DmBqJRI2IDs9YhERJYLstf+R8G5G/8z+NWjGbDoDFgjWA3QokxgjtXxmAAAAAD//wMANOlXl/E5lXoAAAAASUVORK5CYII=</mdui:Logo>
-        <mdui:Logo height="60" width="80">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFAAAAA8CAIAAAB+RarbAAAC0GlDQ1BJQ0NQcm9maWxlAAB4nI2Uz0sUYRjHv7ONGChBYGZ7iKFDSKhMFmVE5a6/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+hkAAAgNSURBVHic7JhZUFRXGsfzNnk0VvIQM5maVCWVROMwqLhkIIiOqYHBgbBjwMSJ6IPKk+IWFM0AQdlESwERZF8CJSDY3bLJ3s3ayL4JKossooKiIsr84Pbc3GacmaQqw9S091+nTt177ndOn/+3ne/0azOvGF77X29goSETNnTIhA0dMmFDh0zY0CETNnTIhA0dMmFDh0zY0CET/sl4+vTps2fPfsGtLAx0hPtHxoNT1NL2fUJ5eeNtqeiLFy8mJyeHhoY6OjpramoLC4t6e3vnLZeZecnf3++7745fuXKlq6szMTGRwYmJiYiIiHv37j169Cg8/Nz+/fsVCoU4BcXFx8d7eXmlpqaKI9I179y5ExYWduDAAXoWmfeLSqUyPz9/eHg4MjJi3sR/R1jd3L/IMnCRZdAbVrr2Kwt/37gyUe7x48dqtaagoFClylMoVErlVfr6eu285RwcHFxdXYKDg9lEZmamhYWFsONly5beuHGDTVtZWbLvmJgYcUpISPCnn647c+bM2bNneQ0PDw8KChK/9vT0mJqa7tjhERkZuXfv3ra2tnlK2bdv7+HDh5qbm01MTNAsI9PT08InLET//PnzlxCuah1454tT73wR9ms7XVtsFXQiqVKUw3uLi0vgefVqvtBgXlpaNs+rnZ2dk5KShOesrCxLS0t+dXBw0MRkFYSdnBwPHTo0T0eennu2bNmi07tabWz8e2Nj4/j4OGHEy2vf9u3bpfK3b9/28PBwdHTAlaampr799vCxYz6tra3m5p+hBRTt4uLs7u7W3t5eVlb21Sy2sn5HR8fPIwy0Wq2U8GzLy3/w4IFUhuXXrl1jbW2dkZFRUFDwwQfvOzjYb968eenSj2/evFlVVbV6tYmzsxPkxSnszMJi/eefb6qvr8fnd+3atWfP7rt37womwiOSkhJ5OHjwIDyvX7/OJ6KpsrJyzZrVGo3m2CxmCa9fb37r1i0zM1O2GBwc9PXXX12+nL18+fKGhoYvv9yyc+fOn00Y78KNpYThj76lMq6urr6+f6urqyPUc3IuwwQ1FRYWrlhh3Nk5q2PGPXZ4QIMYEWeNj49jeQjgk97e3kePHhE/2dnZEQI85OXl4bSs2dXVBZlvvvmrkdHvSktLjx8/LhDeuHFjTU3NJ58s27ZtG/bfunVrWlqqvb0dc318jrq4uOgR1rQOvG0T+rbNqSW2urboT4EBiRVSMmNjY7ix6M+wzc1VNDRcl8o4OTmJ3ii4NA+jo6MrV67AkgMDA7zCn5BmUBBDBcQFLvfRRx/29/fDnJhkvLu7m9fo6GghHBixtbUlF3p6ehK3Dx8+3LBhw7Vr12bt63O0tbUF5UIbzaIFctjg4J1Lly7Z2PyFibg9ltAjXNcx+LFbOG3pP9p7jqdPp1dLyRAhRUXXMHJeXkFJSWltbV1XV7fgeyLc3d2FzCwQtrGxESiZmv6hp2c2aaGCdevWkqiEjALIcPgzAiRqEkxCQryRkRGJYPfuXb6+voywXTMzM1tbm1WrVhIUJHNzc3MPj+1Ee3l5mZ+fHz7V3t62adMf8ZrAwEB+ws3NLS4uTqVSkTX4CXSC2fUIP52a5mSStr7h8fFHT2b0gaZ7e2/ev3+fbDHzMmBDMarxz76+vpm5hMcBxhQm4uGYTjoFWzU2NrJj4ZUcS8olz5HbR0ZGhEHinzDB4IKacJbOzk5kiPnROWAMAlj8StzyiZWFDbAOwnqEXx3IhA0dOsKTT6ZaekZaen9sTTeGh8YeSkUH704wKJVp7hlholRmYg5irQMIPKkASU4skghpDqT/Cq1/DR3h6raBd+3D3rU//RsHXXvLOjgwWe8c9rlQ8qZ1sCiA8G8dTzd2D4kC5AxOgtTUFEoIqhyO6OrqakpcjUbd0KAlf9TW1mZnZ//wQxpJiDRWVFSkVldyipBdFpowhccS29AltmHUHkJ7wzIwQL/w8I4qZlAU4KymPsHmUpnY2FhK4oSEhLS0tFOnQjm6eL5w4QKHTWJiQm5uLvR45ejiwoBMTEw0Z88t/eplgQj/x0rrSFQxg6IAwjjFPMIcORRkLS0tCoWS44Eao6m5uam5STMH6gRqQ75yDsEWR6BUQObJk/nn3/8NYQ5AXFc89GbmCtKfvhvOcE5yMQUQ8LwSGpzJ0jVfCn5IVByzmpqaXnpd/yUJk41CQkKKi4sxpkqpojZgB1RClI3cJaqrqyjrMTI90avRVOHe1BgUycR2SkoKzxcvXoyKisL4FEnsmInnzp2jFEtPTycpIIlCKyoqSA34BZfqwkJuKAVU17ySOwgoUgM3ZKoxIot1mMI1g+nM0iOsbulfbBXINXjxn3Xt9Q3f+8WXSwkfjChiUBRAmBzW0KWXtLKzszIy0mPjYs+fP08GhvnJkyehAZ/YWPrkiMgIf39/pUp14sQJymAUwQPXY0IaqvTJycnUldSLlZUVVEtHjniHhoaQCEiH8MnJyaG6pjJFjEQAJVaOijqPguBMOQk3VMygQqlAht8SJgYEBOgRHhqbiM7VSltEVl1tm54XaZr7IrPrfpTJ0cbkakcfTEplcD/u6CUlJWh6evo5PbQJWvyNZ5hAieoSFyV6MSm1KjbHRD1zYNOMYEbhvoUGiXm+siyJncsQiwt9a1sbtSSDJAIEuEjTU/ayJo7DUng1c7Xa+t45MK5HeGGAk//zfzQLjFe10np1IBM2dMiEDR0yYUOHTNjQIRM2dMiEDR0yYUOHTNjQIRM2dPwdAAD//wMANQzGak+BGLgAAAAASUVORK5CYII=</mdui:Logo>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:IPHint>195.176.16.0/24</mdui:IPHint>
-        <mdui:IPHint>195.176.16.0/25</mdui:IPHint>
-        <mdui:IPHint>195.176.17.0/24</mdui:IPHint>
-        <mdui:IPHint>195.176.18.200/30</mdui:IPHint>
-        <mdui:IPHint>195.176.18.204/31</mdui:IPHint>
-        <mdui:IPHint>195.176.19.0/25</mdui:IPHint>
-        <mdui:IPHint>195.176.19.128/27</mdui:IPHint>
-        <mdui:IPHint>195.176.19.160/28</mdui:IPHint>
-        <mdui:IPHint>195.176.19.0/25</mdui:IPHint>
-        <mdui:IPHint>195.176.19.128/27</mdui:IPHint>
-        <mdui:IPHint>195.176.19.160/28</mdui:IPHint>
-        <mdui:IPHint>195.176.19.0/28</mdui:IPHint>
-        <mdui:DomainHint>fhsg.ch</mdui:DomainHint>
-        <mdui:GeolocationHint>geo:47.425413,9.371350</mdui:GeolocationHint>
-      </mdui:DiscoHints>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDJDCCAgygAwIBAgIJAJPilzxxDSFSMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNV
-BAMTEWFhaS1sb2dvbi5maHNnLmNoMB4XDTE0MDkwNDA3NDc1NFoXDTE3MDkwMzA3
-NDc1NFowHDEaMBgGA1UEAxMRYWFpLWxvZ29uLmZoc2cuY2gwggEiMA0GCSqGSIb3
-DQEBAQUAA4IBDwAwggEKAoIBAQDDu7JMJ94andqk76Bv1KS2ZWWeDgrV+M1XkTK3
-ZUHWgJtzXIg9+9uQnOZel/TkDp6L+by+AGwcXod61E0uw1RbA+E1NNjYAZhr4JS/
-osFjJkz606hKYOAiv/68xQvmhi/P34U36qsKjX0Zhz2KX84j9lnEdhqQpre4nnsb
-41ykQWuQAJ5QOP0rW/BjjX+GXI+gLiORkHMtb3G34RG6NpzqSDy28wQFDDqFHSrA
-GJyGgNpg0t/gqO8zhI0nATXivoqlRoAd+U6OmUvpQEMQbC0UViv+/Iu2NWif0i2b
-NE36VFxhZSFg28pW9/Axqos+oDEA+zUlZkKz8QE5TGwtlzurAgMBAAGjaTBnMEYG
-A1UdEQQ/MD2CEWFhaS1sb2dvbi5maHNnLmNohihodHRwczovL2FhaS1sb2dvbi5m
-aHNnLmNoL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBR2uqcGmoc4uzwkZ0o2rmgb
-RlsGXTANBgkqhkiG9w0BAQUFAAOCAQEAT9ApCu7pG2zaOzhiDM5LzcQnJcDMckV5
-6q0cpTnjYB90Ff0KIVTsUUDAQ7yixqY9PchIvdzOnMsti9Yc2RyOWj9xkQPS/wR2
-ZyWmBoXBl363F4kijL6zH4BD/e28hQx5FtFj1xTASJUhZuV47VlZglsM1rWeGyxf
-cr+IxYfp7Y4/zFsPuTlCDJrCdMan00AmEEyNDD0hCjuhOCNZVolP4BRJSLusiyRp
-aKbKSwtCxelgvX/DrTHG/CPz5LGC4mO8ZdagGbPscpwxQ97gzYfNoQG0BWoKX9BM
-8EEBPaXFRM+soV0oreSVta3bE4+da2JcQYWXypXGXA2vfp1ZqqBnbA==
-						</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://aai-logon.fhsg.ch:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aai-logon.fhsg.ch: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-logon.fhsg.ch/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://aai-logon.fhsg.ch/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://aai-logon.fhsg.ch/idp/profile/SAML2/POST/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
-    <Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fhsg.ch</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDJDCCAgygAwIBAgIJAJPilzxxDSFSMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNV
-BAMTEWFhaS1sb2dvbi5maHNnLmNoMB4XDTE0MDkwNDA3NDc1NFoXDTE3MDkwMzA3
-NDc1NFowHDEaMBgGA1UEAxMRYWFpLWxvZ29uLmZoc2cuY2gwggEiMA0GCSqGSIb3
-DQEBAQUAA4IBDwAwggEKAoIBAQDDu7JMJ94andqk76Bv1KS2ZWWeDgrV+M1XkTK3
-ZUHWgJtzXIg9+9uQnOZel/TkDp6L+by+AGwcXod61E0uw1RbA+E1NNjYAZhr4JS/
-osFjJkz606hKYOAiv/68xQvmhi/P34U36qsKjX0Zhz2KX84j9lnEdhqQpre4nnsb
-41ykQWuQAJ5QOP0rW/BjjX+GXI+gLiORkHMtb3G34RG6NpzqSDy28wQFDDqFHSrA
-GJyGgNpg0t/gqO8zhI0nATXivoqlRoAd+U6OmUvpQEMQbC0UViv+/Iu2NWif0i2b
-NE36VFxhZSFg28pW9/Axqos+oDEA+zUlZkKz8QE5TGwtlzurAgMBAAGjaTBnMEYG
-A1UdEQQ/MD2CEWFhaS1sb2dvbi5maHNnLmNohihodHRwczovL2FhaS1sb2dvbi5m
-aHNnLmNoL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBR2uqcGmoc4uzwkZ0o2rmgb
-RlsGXTANBgkqhkiG9w0BAQUFAAOCAQEAT9ApCu7pG2zaOzhiDM5LzcQnJcDMckV5
-6q0cpTnjYB90Ff0KIVTsUUDAQ7yixqY9PchIvdzOnMsti9Yc2RyOWj9xkQPS/wR2
-ZyWmBoXBl363F4kijL6zH4BD/e28hQx5FtFj1xTASJUhZuV47VlZglsM1rWeGyxf
-cr+IxYfp7Y4/zFsPuTlCDJrCdMan00AmEEyNDD0hCjuhOCNZVolP4BRJSLusiyRp
-aKbKSwtCxelgvX/DrTHG/CPz5LGC4mO8ZdagGbPscpwxQ97gzYfNoQG0BWoKX9BM
-8EEBPaXFRM+soV0oreSVta3bE4+da2JcQYWXypXGXA2vfp1ZqqBnbA==
-						</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://aai-logon.fhsg.ch:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aai-logon.fhsg.ch:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">fhsg.ch</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">FHS St. Gallen</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">FHS St.Gallen</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.fhsg.ch/</OrganizationURL>
-    <OrganizationURL xml:lang="en">http://www.fhsg.ch/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Hotline</GivenName>
-    <SurName>Support Contact</SurName>
-    <EmailAddress>mailto:switchaai@fhsg.ch</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>SWITCHaai Team</GivenName>
-    <SurName>Informatik</SurName>
-    <EmailAddress>mailto:aai@switch.ch</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/aai-logon.fhsg.ch.xml b/swamid-interfederations-2.0/aai-logon.fhsg.ch.xml
deleted file mode 100644
index 2f817bb6..00000000
--- a/swamid-interfederations-2.0/aai-logon.fhsg.ch.xml
+++ /dev/null
@@ -1,127 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://aai-logon.fhsg.ch/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://rr.aai.switch.ch/" registrationInstant="2014-09-05T08:54:49Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.switch.ch/aai/federation/switchaai/metadata-registration-practice-statement-20110711.txt</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-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </Extensions>
-  <IDPSSODescriptor errorURL="http://portal.fhsg.ch/it" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-    <Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fhsg.ch</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="de">FHS St. Gallen</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">FHS St.Gallen</mdui:DisplayName>
-        <mdui:Description xml:lang="de">FHS St. Gallen - Hochschule für Angewandte Wissenschaften</mdui:Description>
-        <mdui:Description xml:lang="en">FHS St. Gallen - University of Applied Sciences St. Gallen</mdui:Description>
-        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAC0GlDQ1BJQ0NQcm9maWxlAAB4nI2Uz0sUYRjHv7ONGChBYGZ7iKFDSKhMFmVE5a6/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+hkAAAG/SURBVHicYvj//z8Dg5JFCQpWtixhkNTUZgACTk4uBiiQVFVV8/X19W8sLCrZmpmV8wwoxs0ANiBjxX8UnLX6P4NPdQJMZ0RktNW8+Yv+r1m38f/2nXv+7z945P+CRUuAGhmsIAbkrP+PgvM2/2fwb4QbkJScyrt3/6G/u/ce+L9rz/7/IHrt+k3/1TU0cqAGrPuPgvM2AQ1ogBtgZ2fPsHnrjlsgzTAMcomPr99cHC5ANYCbm4dh+co1q/bsOwh3wb4Dh//nFRSegxiQDbQVGeeiGgACM2bNqTxw6Oj/nbv3/d+4edvzpctWbk5Lz6yEGGAczIuCTUJ4GVRtWUEaGRkZwQYkp6SpVdfUBQADVMbE1AxhMtgAXICFHUxxcXFjlQYbjtcAYgBeA1g5GRiYmIkwIKKvFgVHTqxlcMjQhysSkmNgCGpNYYjoh6oB0mE9tQwq1u4QA0ChjowLtv5nCGhKgBsgrsbAkLbsDDiBgeRB0QyKbl2vCUSlAwZxVQaGlMVnGHI2INRkrQEa4DmBqJRI2IDs9YhERJYLstf+R8G5G/8z+NWjGbDoDFgjWA3QokxgjtXxmAAAAAD//wMANOlXl/E5lXoAAAAASUVORK5CYII=</mdui:Logo>
-        <mdui:Logo height="60" width="80">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFAAAAA8CAIAAAB+RarbAAAC0GlDQ1BJQ0NQcm9maWxlAAB4nI2Uz0sUYRjHv7ONGChBYGZ7iKFDSKhMFmVE5a6/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+hkAAAgNSURBVHic7JhZUFRXGsfzNnk0VvIQM5maVCWVROMwqLhkIIiOqYHBgbBjwMSJ6IPKk+IWFM0AQdlESwERZF8CJSDY3bLJ3s3ayL4JKossooKiIsr84Pbc3GacmaQqw9S091+nTt177ndOn/+3ne/0azOvGF77X29goSETNnTIhA0dMmFDh0zY0CETNnTIhA0dMmFDh0zY0CET/sl4+vTps2fPfsGtLAx0hPtHxoNT1NL2fUJ5eeNtqeiLFy8mJyeHhoY6OjpramoLC4t6e3vnLZeZecnf3++7745fuXKlq6szMTGRwYmJiYiIiHv37j169Cg8/Nz+/fsVCoU4BcXFx8d7eXmlpqaKI9I179y5ExYWduDAAXoWmfeLSqUyPz9/eHg4MjJi3sR/R1jd3L/IMnCRZdAbVrr2Kwt/37gyUe7x48dqtaagoFClylMoVErlVfr6eu285RwcHFxdXYKDg9lEZmamhYWFsONly5beuHGDTVtZWbLvmJgYcUpISPCnn647c+bM2bNneQ0PDw8KChK/9vT0mJqa7tjhERkZuXfv3ra2tnlK2bdv7+HDh5qbm01MTNAsI9PT08InLET//PnzlxCuah1454tT73wR9ms7XVtsFXQiqVKUw3uLi0vgefVqvtBgXlpaNs+rnZ2dk5KShOesrCxLS0t+dXBw0MRkFYSdnBwPHTo0T0eennu2bNmi07tabWz8e2Nj4/j4OGHEy2vf9u3bpfK3b9/28PBwdHTAlaampr799vCxYz6tra3m5p+hBRTt4uLs7u7W3t5eVlb21Sy2sn5HR8fPIwy0Wq2U8GzLy3/w4IFUhuXXrl1jbW2dkZFRUFDwwQfvOzjYb968eenSj2/evFlVVbV6tYmzsxPkxSnszMJi/eefb6qvr8fnd+3atWfP7rt37womwiOSkhJ5OHjwIDyvX7/OJ6KpsrJyzZrVGo3m2CxmCa9fb37r1i0zM1O2GBwc9PXXX12+nL18+fKGhoYvv9yyc+fOn00Y78KNpYThj76lMq6urr6+f6urqyPUc3IuwwQ1FRYWrlhh3Nk5q2PGPXZ4QIMYEWeNj49jeQjgk97e3kePHhE/2dnZEQI85OXl4bSs2dXVBZlvvvmrkdHvSktLjx8/LhDeuHFjTU3NJ58s27ZtG/bfunVrWlqqvb0dc318jrq4uOgR1rQOvG0T+rbNqSW2urboT4EBiRVSMmNjY7ix6M+wzc1VNDRcl8o4OTmJ3ii4NA+jo6MrV67AkgMDA7zCn5BmUBBDBcQFLvfRRx/29/fDnJhkvLu7m9fo6GghHBixtbUlF3p6ehK3Dx8+3LBhw7Vr12bt63O0tbUF5UIbzaIFctjg4J1Lly7Z2PyFibg9ltAjXNcx+LFbOG3pP9p7jqdPp1dLyRAhRUXXMHJeXkFJSWltbV1XV7fgeyLc3d2FzCwQtrGxESiZmv6hp2c2aaGCdevWkqiEjALIcPgzAiRqEkxCQryRkRGJYPfuXb6+voywXTMzM1tbm1WrVhIUJHNzc3MPj+1Ee3l5mZ+fHz7V3t62adMf8ZrAwEB+ws3NLS4uTqVSkTX4CXSC2fUIP52a5mSStr7h8fFHT2b0gaZ7e2/ev3+fbDHzMmBDMarxz76+vpm5hMcBxhQm4uGYTjoFWzU2NrJj4ZUcS8olz5HbR0ZGhEHinzDB4IKacJbOzk5kiPnROWAMAlj8StzyiZWFDbAOwnqEXx3IhA0dOsKTT6ZaekZaen9sTTeGh8YeSkUH704wKJVp7hlholRmYg5irQMIPKkASU4skghpDqT/Cq1/DR3h6raBd+3D3rU//RsHXXvLOjgwWe8c9rlQ8qZ1sCiA8G8dTzd2D4kC5AxOgtTUFEoIqhyO6OrqakpcjUbd0KAlf9TW1mZnZ//wQxpJiDRWVFSkVldyipBdFpowhccS29AltmHUHkJ7wzIwQL/w8I4qZlAU4KymPsHmUpnY2FhK4oSEhLS0tFOnQjm6eL5w4QKHTWJiQm5uLvR45ejiwoBMTEw0Z88t/eplgQj/x0rrSFQxg6IAwjjFPMIcORRkLS0tCoWS44Eao6m5uam5STMH6gRqQ75yDsEWR6BUQObJk/nn3/8NYQ5AXFc89GbmCtKfvhvOcE5yMQUQ8LwSGpzJ0jVfCn5IVByzmpqaXnpd/yUJk41CQkKKi4sxpkqpojZgB1RClI3cJaqrqyjrMTI90avRVOHe1BgUycR2SkoKzxcvXoyKisL4FEnsmInnzp2jFEtPTycpIIlCKyoqSA34BZfqwkJuKAVU17ySOwgoUgM3ZKoxIot1mMI1g+nM0iOsbulfbBXINXjxn3Xt9Q3f+8WXSwkfjChiUBRAmBzW0KWXtLKzszIy0mPjYs+fP08GhvnJkyehAZ/YWPrkiMgIf39/pUp14sQJymAUwQPXY0IaqvTJycnUldSLlZUVVEtHjniHhoaQCEiH8MnJyaG6pjJFjEQAJVaOijqPguBMOQk3VMygQqlAht8SJgYEBOgRHhqbiM7VSltEVl1tm54XaZr7IrPrfpTJ0cbkakcfTEplcD/u6CUlJWh6evo5PbQJWvyNZ5hAieoSFyV6MSm1KjbHRD1zYNOMYEbhvoUGiXm+siyJncsQiwt9a1sbtSSDJAIEuEjTU/ayJo7DUng1c7Xa+t45MK5HeGGAk//zfzQLjFe10np1IBM2dMiEDR0yYUOHTNjQIRM2dMiEDR0yYUOHTNjQIRM2dPwdAAD//wMANQzGak+BGLgAAAAASUVORK5CYII=</mdui:Logo>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:IPHint>195.176.16.0/24</mdui:IPHint>
-        <mdui:IPHint>195.176.16.0/25</mdui:IPHint>
-        <mdui:IPHint>195.176.17.0/24</mdui:IPHint>
-        <mdui:IPHint>195.176.18.200/30</mdui:IPHint>
-        <mdui:IPHint>195.176.18.204/31</mdui:IPHint>
-        <mdui:IPHint>195.176.19.0/25</mdui:IPHint>
-        <mdui:IPHint>195.176.19.128/27</mdui:IPHint>
-        <mdui:IPHint>195.176.19.160/28</mdui:IPHint>
-        <mdui:IPHint>195.176.19.0/25</mdui:IPHint>
-        <mdui:IPHint>195.176.19.128/27</mdui:IPHint>
-        <mdui:IPHint>195.176.19.160/28</mdui:IPHint>
-        <mdui:IPHint>195.176.19.0/28</mdui:IPHint>
-        <mdui:DomainHint>fhsg.ch</mdui:DomainHint>
-        <mdui:GeolocationHint>geo:47.425413,9.371350</mdui:GeolocationHint>
-      </mdui:DiscoHints>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDJDCCAgygAwIBAgIJAJPilzxxDSFSMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNV
-BAMTEWFhaS1sb2dvbi5maHNnLmNoMB4XDTE0MDkwNDA3NDc1NFoXDTE3MDkwMzA3
-NDc1NFowHDEaMBgGA1UEAxMRYWFpLWxvZ29uLmZoc2cuY2gwggEiMA0GCSqGSIb3
-DQEBAQUAA4IBDwAwggEKAoIBAQDDu7JMJ94andqk76Bv1KS2ZWWeDgrV+M1XkTK3
-ZUHWgJtzXIg9+9uQnOZel/TkDp6L+by+AGwcXod61E0uw1RbA+E1NNjYAZhr4JS/
-osFjJkz606hKYOAiv/68xQvmhi/P34U36qsKjX0Zhz2KX84j9lnEdhqQpre4nnsb
-41ykQWuQAJ5QOP0rW/BjjX+GXI+gLiORkHMtb3G34RG6NpzqSDy28wQFDDqFHSrA
-GJyGgNpg0t/gqO8zhI0nATXivoqlRoAd+U6OmUvpQEMQbC0UViv+/Iu2NWif0i2b
-NE36VFxhZSFg28pW9/Axqos+oDEA+zUlZkKz8QE5TGwtlzurAgMBAAGjaTBnMEYG
-A1UdEQQ/MD2CEWFhaS1sb2dvbi5maHNnLmNohihodHRwczovL2FhaS1sb2dvbi5m
-aHNnLmNoL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBR2uqcGmoc4uzwkZ0o2rmgb
-RlsGXTANBgkqhkiG9w0BAQUFAAOCAQEAT9ApCu7pG2zaOzhiDM5LzcQnJcDMckV5
-6q0cpTnjYB90Ff0KIVTsUUDAQ7yixqY9PchIvdzOnMsti9Yc2RyOWj9xkQPS/wR2
-ZyWmBoXBl363F4kijL6zH4BD/e28hQx5FtFj1xTASJUhZuV47VlZglsM1rWeGyxf
-cr+IxYfp7Y4/zFsPuTlCDJrCdMan00AmEEyNDD0hCjuhOCNZVolP4BRJSLusiyRp
-aKbKSwtCxelgvX/DrTHG/CPz5LGC4mO8ZdagGbPscpwxQ97gzYfNoQG0BWoKX9BM
-8EEBPaXFRM+soV0oreSVta3bE4+da2JcQYWXypXGXA2vfp1ZqqBnbA==
-						</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://aai-logon.fhsg.ch:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aai-logon.fhsg.ch: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-logon.fhsg.ch/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://aai-logon.fhsg.ch/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://aai-logon.fhsg.ch/idp/profile/SAML2/POST/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
-    <Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fhsg.ch</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDJDCCAgygAwIBAgIJAJPilzxxDSFSMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNV
-BAMTEWFhaS1sb2dvbi5maHNnLmNoMB4XDTE0MDkwNDA3NDc1NFoXDTE3MDkwMzA3
-NDc1NFowHDEaMBgGA1UEAxMRYWFpLWxvZ29uLmZoc2cuY2gwggEiMA0GCSqGSIb3
-DQEBAQUAA4IBDwAwggEKAoIBAQDDu7JMJ94andqk76Bv1KS2ZWWeDgrV+M1XkTK3
-ZUHWgJtzXIg9+9uQnOZel/TkDp6L+by+AGwcXod61E0uw1RbA+E1NNjYAZhr4JS/
-osFjJkz606hKYOAiv/68xQvmhi/P34U36qsKjX0Zhz2KX84j9lnEdhqQpre4nnsb
-41ykQWuQAJ5QOP0rW/BjjX+GXI+gLiORkHMtb3G34RG6NpzqSDy28wQFDDqFHSrA
-GJyGgNpg0t/gqO8zhI0nATXivoqlRoAd+U6OmUvpQEMQbC0UViv+/Iu2NWif0i2b
-NE36VFxhZSFg28pW9/Axqos+oDEA+zUlZkKz8QE5TGwtlzurAgMBAAGjaTBnMEYG
-A1UdEQQ/MD2CEWFhaS1sb2dvbi5maHNnLmNohihodHRwczovL2FhaS1sb2dvbi5m
-aHNnLmNoL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBR2uqcGmoc4uzwkZ0o2rmgb
-RlsGXTANBgkqhkiG9w0BAQUFAAOCAQEAT9ApCu7pG2zaOzhiDM5LzcQnJcDMckV5
-6q0cpTnjYB90Ff0KIVTsUUDAQ7yixqY9PchIvdzOnMsti9Yc2RyOWj9xkQPS/wR2
-ZyWmBoXBl363F4kijL6zH4BD/e28hQx5FtFj1xTASJUhZuV47VlZglsM1rWeGyxf
-cr+IxYfp7Y4/zFsPuTlCDJrCdMan00AmEEyNDD0hCjuhOCNZVolP4BRJSLusiyRp
-aKbKSwtCxelgvX/DrTHG/CPz5LGC4mO8ZdagGbPscpwxQ97gzYfNoQG0BWoKX9BM
-8EEBPaXFRM+soV0oreSVta3bE4+da2JcQYWXypXGXA2vfp1ZqqBnbA==
-						</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://aai-logon.fhsg.ch:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aai-logon.fhsg.ch:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">fhsg.ch</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">FHS St. Gallen</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">FHS St.Gallen</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.fhsg.ch/</OrganizationURL>
-    <OrganizationURL xml:lang="en">http://www.fhsg.ch/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Hotline</GivenName>
-    <SurName>Support Contact</SurName>
-    <EmailAddress>mailto:switchaai@fhsg.ch</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>SWITCHaai Team</GivenName>
-    <SurName>Informatik</SurName>
-    <EmailAddress>mailto:aai@switch.ch</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/aai-logon.hes-so.ch-idp-shibboleth.xml b/swamid-interfederations-2.0/aai-logon.hes-so.ch-idp-shibboleth.xml
deleted file mode 100644
index 6e0a96e0..00000000
--- a/swamid-interfederations-2.0/aai-logon.hes-so.ch-idp-shibboleth.xml
+++ /dev/null
@@ -1,151 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://aai-logon.hes-so.ch/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://rr.aai.switch.ch/" registrationInstant="2014-02-13T16:19:12Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.switch.ch/aai/federation/switchaai/metadata-registration-practice-statement-20110711.txt</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-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </Extensions>
-  <IDPSSODescriptor errorURL="https://aai-logon.hes-so.ch/idp/doc/ListeResp.html" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-    <Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hes-so.ch</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">HES-SO : UAS Western Switzerland</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="fr">HES-SO - Haute École Spécialisée de Suisse occidentale</mdui:DisplayName>
-        <mdui:Description xml:lang="en">University of Applied Sciences Western Switzerland</mdui:Description>
-        <mdui:Description xml:lang="fr">Haute École Spécialisée de Suisse occidentale</mdui:Description>
-        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAW0lEQVR4nGL4TyFgABN5qxECSOyBNQBEI2OcYvgUYzOUdi4gxjYUm4kxgGgXUAJwGrBl9UI4Rhcj2gBcfGQ2A7Igsg3Y+HgNIOQSkg2gOAyIBRQbAAAAAP//AwDivI9ii0QGKQAAAABJRU5ErkJggg==</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+hkAAAlCSURBVHic7Fj5T1zXFebPqJzYDhgDTuV0r1RFjaJKTiI7UtNKbdJFXRSSYBsbx3bSuI3TxrFpUlsywanlpo4NMwzGBgzY2CYsw7Dv+zKswzIwLMOwzDDAgWHc892ZNzyGYUl/eXkKSJ/evHfPve/c731nuQQ9fvw4aBv/PxR3QO1Q3AG1Q3EH1A7FHVA7FHdA7VDcAbVDcQfUDsUdUDsUd0DtUNwBtUNxB9QOxR1QOxR3QO1Q3AG1Q3EH1A7FHVA7FHdA7VDcAbVDcQfUDsUdUDtW3Zis9rRms62gzmQtrTGNl/VP2G/7T3AzesZmMoVdn8duYMKxxu6bglU3r13Opb3HkynsWDLtPqyhE5py8oy5fTau5eWgQ/98QGFsFx6TTLuitHRKW0FKb+RrQeAv//WIgg9rKfyYjp5iYs7eqVpDDAg88OE92nM4icKjmei3tPTXlLV23xT4EZhDISCGFQgCz92tCUCgO+iFc/cp9GgSRcCOCfwwvXabwIAESsS4ZSHsWvYQeAQK1NHuKBmB7tW2APLlw4YBc2JxJ+lKu6jIaGmeW1y6hDG33Na9MgfjyK/p1SZbAs/T8jys0WGZyp5dWPxKG1xaWvzE4XBcnbBak2wTE9rZ2dkreLaevdu9fH5ubi5uanLyJuZMT09fX1xc335DAj+6W7dGWdj0C+fu+RS4ikDkSi8pHZbp7OibpfT9d+5QCJP9FKeGEIB//zouj+r7rUW+ObKPlNdsNr1y8RHti7klfAnm9YE9PO/bb6fQ0Rsl5PL7SIGJW4o19fbqKysrh4sMBoe+oICA4qIie2VFhcVsNt/3nzM2Nna7ob6+s7SkxCbZGwoLnbDv7u4uIqKLWyYwmK/vpVTSzBxdcdLiZSctXZrm35ZpZ8LP/p61DoEeNAxYDT/9IIN2vaWhsKM6QRpyKxDGqg2O0tCz72dQq9mWK1diYfuwcf/JFLbTiPwaynNR0PadSOE1tLTj9QT67af55N6EwOXl5fNtbW21IKBQr58vLyuzNou/plaQUZCfTx0dHRVyUfT09BhAFuaAwOamplb+q6/iDyCRWVdXa1pYWLi0JQLDeAPPnLpNB1htL3PVReU98NE9sfF9x28xeTqB3UyGnED7PMX//GIOK1gjxkHCH6/qKbO233oxu5H285phovhoKJrVtOx2nxeb5uuf2A7r4f1Q3MsfP6TSztH6pkFbwV0O599fyafTus0rvt1uvwalgbz6urruufm5OGkM4TgyMpI2MWFNkisP5MG+uqrK7HDYr8ntjcb2GoyBxE4Z8RsSGCFI1HnCzqsejGFjnnGdL9TlBCJXhRzxVGjYvnQhm+zzi/HS+BlWNRQIZf7g3VQatDmS8XxhyfXJS7HZFHo4SayNd732aR6NzszdlCtlZm7hymYE2my2BImQFtbdRorFWGNDQwdsEeqY62+D0IVyYVPGaparcEMCkYe+yznMg1T6HgPXCO94uDeEz9xaaWPev10l1BXhVdErl3JE8fjsyxb695etFPm5gQuQTrRKodFJlN861Il5XN0vvMp9aHCUxrf+Xib5J3/LoJiEMrpX32+RfwgJKArDw8OZcpU5nc74kuLiKZAIUpoaG42wwXN/MkEGQlxSn8vluhCIaKQE2GDNCS5GW8iBWjrNDfLQ5GySedKRhCtgGrenPf9BpghNicDT2nIfga//xyDmrpCQJMIZpKJnDPFWb5EL+V0pFT1OaW5KeY8TuS7Uq3KQ7JnP8/h6iENa3zbcIQ+v6urqAeS0Og5Vl2spVhrr7+vLNTB52HShNxcitzWw2hDCEpH4AMVFxSLcUUDWU6vJZCoQazEwf1MC4fT5jLVVGHiR2xgplAWBSZU+uz9fKxTE+FTMJ5aI48nenJlMT8ek0NMngFsUxgrXlXfP+8KJgZblOS5AouggH0brfGrHsx+9l0poZ2A/Pz9/ubSk1KZnAqEiosVVVRJKgXLKy8qtUkhLVxSNFQKLfASuF+oDAwOPpPkjFkv6lgg8F6BBlhrpPV47qOokh5g0DjWKAsKkIXf+Lj6fTGPT6d0jU1ndI9NZPaMzmb183zs2k44ztGOe4kQL4172vWOEK31KRbczkj/GMydvi3wpKXrXmxqRCiTCh4eHspq4Yo6Ojt5Zb/MIUxQK2CGkQQJIQ7HAGJQJcmpravpQwQOt0dXVVSopEGtticB3dJXrE3hkhcCYL0p9dlCQVEkRpigUVb3jFYGcGrTNBi3x0RBh4+Z+kO+TF13LsXIbhOx3ROXWedsmDcWuExmbAe9BKyMpaZyJwLOamuoBPEPeRNO9Zh6Timou2UC1WyLwbU1ZgH8mBCDwxgqB6BOfO5spxqFC9Is//Esqb7qecpoH+/TGYePnBe30alyuaI3QW2J9JvLCb+LzKPKagfTcD1qmnNopJ11NqzJN7T/paX3CvQRe5/kbEYWqaeEw82980VwjTA1eAif5tCHyZX9frqSuNu79/AvJEDfdRd582uxX1TckMOp68dYU6CPQs3BmbZ81QpwktD4litMEh+LeY55G+sk3Eukgtzjzi0tik8RtzMGPH4jne9n+x2fS6dmzGfwRdCIPSu96/h9ZZPa2PvLjnxxSXkMT3NnZWTY4OJiNIlBXW2uSmuWmpkajFK4oRiBWOnlAbTipoHK3t7fXYC2MoYVBjyl/16oXH4p9QDsiE8Wxa8cbCfSHzwoCKhAKe+LNRNrNdt/i08GR/xbL7Dy2DxsHBw7yeqG8+V1sC+xkPInfXJFRxU9xvpQaaRD4K7QxvOZOznNPRCYIYM5O2PM6v+CWqL5POgKuDxBYUV4+ik3n5+X5gGoNJbW2tDT5nyhwbzQaqxGisJPPk0jFudj/XatucprMfWgrUqt6p9Kqe21lXaO1a/PI46D79QOWlMoex52qXjtsy7vHagJtBOGJ41mioYNu6I10o8AortriLqrsGat2kmvVJsZm5r7IaxnqTvCzTzR0ksFoacVxcqv5Dv8QGB8fT0b4mQUGs6GoGSbBvSH5jqtoUzBPYGgoC6G+Xn/4lRPxNrYJ3Cbw6wTFHVA7FHdA7VDcAbVDcQfUDsUdUDsUd0DtUNwBtUNxB9QOxR1QOxR3QO1Q3AG1Q3EH1A7FHVA7FHdA7VDcAbVDcQfUDsUdUDsUd0Dt+B8AAAD//wMAZtOP6cvUNwcAAAAASUVORK5CYII=</mdui:Logo>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:IPHint>195.176.12.0/22</mdui:IPHint>
-        <mdui:DomainHint>hes-so.ch</mdui:DomainHint>
-        <mdui:DomainHint>ecal.ch</mdui:DomainHint>
-        <mdui:DomainHint>eia-fr.ch</mdui:DomainHint>
-        <mdui:DomainHint>eif.ch</mdui:DomainHint>
-        <mdui:DomainHint>he-arc.ch</mdui:DomainHint>
-        <mdui:DomainHint>heds-fr.ch</mdui:DomainHint>
-        <mdui:DomainHint>hef-ts.ch</mdui:DomainHint>
-        <mdui:DomainHint>hefr.ch</mdui:DomainHint>
-        <mdui:DomainHint>heg-fr.ch</mdui:DomainHint>
-        <mdui:DomainHint>heig-vd.ch</mdui:DomainHint>
-        <mdui:DomainHint>hesge.ch</mdui:DomainHint>
-        <mdui:DomainHint>hevs.ch</mdui:DomainHint>
-        <mdui:DomainHint>hsw-fr.ch</mdui:DomainHint>
-        <mdui:DomainHint>hta-fr.ch</mdui:DomainHint>
-        <mdui:GeolocationHint>geo:46.996710,6.936891</mdui:GeolocationHint>
-        <mdui:GeolocationHint>geo:46.793393,7.159078</mdui:GeolocationHint>
-        <mdui:GeolocationHint>geo:46.207325,6.099785</mdui:GeolocationHint>
-        <mdui:GeolocationHint>geo:46.293093,7.536841</mdui:GeolocationHint>
-        <mdui:GeolocationHint>geo:46.379599,7.626590</mdui:GeolocationHint>
-        <mdui:GeolocationHint>geo:46.235924,7.351375</mdui:GeolocationHint>
-        <mdui:GeolocationHint>geo:46.287826,7.884015</mdui:GeolocationHint>
-        <mdui:GeolocationHint>geo:47.361332,7.345858</mdui:GeolocationHint>
-        <mdui:GeolocationHint>geo:46.779445,6.658656</mdui:GeolocationHint>
-        <mdui:GeolocationHint>geo:46.526928,6.627963</mdui:GeolocationHint>
-      </mdui:DiscoHints>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDLDCCAhSgAwIBAgIJAMqicqA49UbTMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE2FhaS1sb2dvbi5oZXMtc28uY2gwHhcNMTMxMTI3MTAyODUyWhcNMTYxMTI2
-MTAyODUyWjAeMRwwGgYDVQQDExNhYWktbG9nb24uaGVzLXNvLmNoMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAkJvxk2Aq0rv+KSKYZmat+KfRDoPngFG/
-q7vy+R2o3+em4jUkOI+FrKA87fGmVUTCTj39s6ySilxmeyDppzUG8OLcXYVR62gl
-9EKNAsaDAKLyk6+5EKrD92lgLJqd8mUkFEMsp8Vmp7dfS+3mCrFu1eUC5GdPc+aF
-xf1u+vjP4/ETBU13MNzacsqcXlM0ArPIp7oWrDQnrs151+2kZt5YgASyqtlv6Tz5
-8h153JjL4rkrVSqF3drEFZLN3Qu38zyUrPOYIv9c76lCQ6PUsq875riXZffIcdfP
-dlQtuRuOGnePrs7TP39F5ToJDR5dKdswnhyrgXsTTElkU7UHWlUgKQIDAQABo20w
-azBKBgNVHREEQzBBghNhYWktbG9nb24uaGVzLXNvLmNohipodHRwczovL2FhaS1s
-b2dvbi5oZXMtc28uY2gvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFLPdE7npAe4X
-MCJJ2tWOvKkGDRwTMA0GCSqGSIb3DQEBBQUAA4IBAQAKmIgNATIcA64ve8grxWDR
-cmBxDOoyl4m7zgaOz5TAhL65R3Ieb1wpvFYfIxtuhR3eSbcTYmD7A6BBp5C2QXZa
-2twKtrGfo/WJMhas9NNhthnZQDYpK/1E54nJPNAKY0eZUnh9QCEdcKmLh9TOl6BF
-eYrPRwFJZSV2pBHhXCaO/aEtTvrL7+DnDljnhb0zfBJ4TCCGnQ/MOALNxt/ZkKz5
-QYG9T2ud56O8FIRDi+rCME6nicN5HF4FVFA3Um8q9WED2vQ6mztFY9y+glOHdRqb
-Hpx/eGHluuFsDHUh9eaXQubano3fjXCVFAhHELlqLWa4uEDyoIQ6RID36NV3V7Ul
-						</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://aai-logon.hes-so.ch:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aai-logon.hes-so.ch: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-logon.hes-so.ch/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://aai-logon.hes-so.ch/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://aai-logon.hes-so.ch/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://aai-logon.hes-so.ch/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
-    <Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hes-so.ch</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIFQjCCBCqgAwIBAgIUbQvY+OJqikCxxhTbXiF9bamtIiEwDQYJKoZIhvcNAQEF
-BQAwazELMAkGA1UEBhMCQk0xGTAXBgNVBAoTEFF1b1ZhZGlzIExpbWl0ZWQxHzAd
-BgNVBAsTFnd3dy5xdW92YWRpc2dsb2JhbC5jb20xIDAeBgNVBAMTF1F1b1ZhZGlz
-IEdsb2JhbCBTU0wgSUNBMB4XDTEzMTEyNzExMTkxNVoXDTE2MTEyNzExMTkxM1ow
-ga0xCzAJBgNVBAYTAkNIMQ0wCwYDVQQIEwRKdXJhMREwDwYDVQQHEwhEZWxlbW9u
-dDE/MD0GA1UEChM2SGF1dGUgRWNvbGUgU3BlY2lhbGlzZWUgZGUgU3Vpc3NlIG9j
-Y2lkZW50YWxlIChIRVMtU08pMR0wGwYDVQQLExRTZXJ2aWNlIEluZm9ybWF0aXF1
-ZTEcMBoGA1UEAxMTYWFpLWxvZ29uLmhlcy1zby5jaDCCASIwDQYJKoZIhvcNAQEB
-BQADggEPADCCAQoCggEBAMND3PsEwdrvXK+DGAbsalJikrnHoy6SzdmAV13SR0QA
-+pEPCgngo3UVsaTEz12PIEbPkw0O9neaAt8CbZLgSmAx4sqX0WZAYho20gXDY/Rl
-cXKryuMh/KlPyoC3fsmyVPDPD5uYmLNpCLKjl39I/oo3kpXzcmsdBx8ZFyz6YIod
-e7Aplq6SJhh7s9x8HDg0aavSA7RDRGrZBy9ekqzWCsyyNTpxQWKnEPv4mfjEiyC3
-j9Mv43K9/lE+zgGOiZPx/mJ2CcbJ1sfJIT2Ui0I6dEgyuawkNEIqXWaKer+hMoyM
-xAzDCR0moEAWQ6SPcHwt6jwI2D9vNGcC17Ttr31n//ECAwEAAaOCAZkwggGVMHQG
-CCsGAQUFBwEBBGgwZjAqBggrBgEFBQcwAYYeaHR0cDovL29jc3AucXVvdmFkaXNn
-bG9iYWwuY29tMDgGCCsGAQUFBzAChixodHRwOi8vdHJ1c3QucXVvdmFkaXNnbG9i
-YWwuY29tL3F2c3NsaWNhLmNydDAeBgNVHREEFzAVghNhYWktbG9nb24uaGVzLXNv
-LmNoMFEGA1UdIARKMEgwRgYMKwYBBAG+WAACZAEBMDYwNAYIKwYBBQUHAgEWKGh0
-dHA6Ly93d3cucXVvdmFkaXNnbG9iYWwuY29tL3JlcG9zaXRvcnkwDgYDVR0PAQH/
-BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAfBgNVHSMEGDAW
-gBQyTaFP6vCumbbumwcshAgRUIvifjA7BgNVHR8ENDAyMDCgLqAshipodHRwOi8v
-Y3JsLnF1b3ZhZGlzZ2xvYmFsLmNvbS9xdnNzbGljYS5jcmwwHQYDVR0OBBYEFAX7
-qvdL23DqegSmlCxsX+LERI0AMA0GCSqGSIb3DQEBBQUAA4IBAQBK7qy3M7LVDRUz
-B4szCrhGs4SG5/hh0ZvjSseJaKPwVvqx4p8TdVfuo9VANqkmID1O+lgTBSmNgxai
-xJkCMalwtZDMTKT6SSYFi6khSiYxHDa5NcE7W/SVn5bf5FViuF9P0JeMKnLt+vzF
-wGYTdkdOoOjskmuZmGJhf1VGNtxZ7yI4I4claTWS/4XxAivHx44MmITQrQLLhQZR
-Bb4WgjlWX1X5Do9/nCqSpOJ+QpPb6PRLzsBazR1nwaTVqn7IBTXESQaf3KCAaMUx
-AGxVxS6Wr+7y0NG4xKIrpn+NBa7Tl/KsLcvH8PbmiGa93EFJtbENoO0ICT+2SQQh
-JT6DgiEX
-						</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://aai-logon.hes-so.ch:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aai-logon.hes-so.ch:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">hes-so.ch</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">HES-SO : UAS Western Switzerland</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="fr">HES-SO - Haute École Spécialisée de Suisse occidentale</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.hes-so.ch/</OrganizationURL>
-    <OrganizationURL xml:lang="fr">http://www.hes-so.ch/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Equipe</GivenName>
-    <SurName>AAI HES-SO</SurName>
-    <EmailAddress>mailto:idm@hes-so.ch</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Equipe</GivenName>
-    <SurName>AAI HES-SO</SurName>
-    <EmailAddress>mailto:idm@hes-so.ch</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/aai-logon.hes-so.ch.xml b/swamid-interfederations-2.0/aai-logon.hes-so.ch.xml
deleted file mode 100644
index 6e0a96e0..00000000
--- a/swamid-interfederations-2.0/aai-logon.hes-so.ch.xml
+++ /dev/null
@@ -1,151 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://aai-logon.hes-so.ch/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://rr.aai.switch.ch/" registrationInstant="2014-02-13T16:19:12Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.switch.ch/aai/federation/switchaai/metadata-registration-practice-statement-20110711.txt</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-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </Extensions>
-  <IDPSSODescriptor errorURL="https://aai-logon.hes-so.ch/idp/doc/ListeResp.html" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-    <Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hes-so.ch</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">HES-SO : UAS Western Switzerland</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="fr">HES-SO - Haute École Spécialisée de Suisse occidentale</mdui:DisplayName>
-        <mdui:Description xml:lang="en">University of Applied Sciences Western Switzerland</mdui:Description>
-        <mdui:Description xml:lang="fr">Haute École Spécialisée de Suisse occidentale</mdui:Description>
-        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAW0lEQVR4nGL4TyFgABN5qxECSOyBNQBEI2OcYvgUYzOUdi4gxjYUm4kxgGgXUAJwGrBl9UI4Rhcj2gBcfGQ2A7Igsg3Y+HgNIOQSkg2gOAyIBRQbAAAAAP//AwDivI9ii0QGKQAAAABJRU5ErkJggg==</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+hkAAAlCSURBVHic7Fj5T1zXFebPqJzYDhgDTuV0r1RFjaJKTiI7UtNKbdJFXRSSYBsbx3bSuI3TxrFpUlsywanlpo4NMwzGBgzY2CYsw7Dv+zKswzIwLMOwzDDAgWHc892ZNzyGYUl/eXkKSJ/evHfPve/c731nuQQ9fvw4aBv/PxR3QO1Q3AG1Q3EH1A7FHVA7FHdA7VDcAbVDcQfUDsUdUDsUd0DtUNwBtUNxB9QOxR1QOxR3QO1Q3AG1Q3EH1A7FHVA7FHdA7VDcAbVDcQfUDsUdUDtW3Zis9rRms62gzmQtrTGNl/VP2G/7T3AzesZmMoVdn8duYMKxxu6bglU3r13Opb3HkynsWDLtPqyhE5py8oy5fTau5eWgQ/98QGFsFx6TTLuitHRKW0FKb+RrQeAv//WIgg9rKfyYjp5iYs7eqVpDDAg88OE92nM4icKjmei3tPTXlLV23xT4EZhDISCGFQgCz92tCUCgO+iFc/cp9GgSRcCOCfwwvXabwIAESsS4ZSHsWvYQeAQK1NHuKBmB7tW2APLlw4YBc2JxJ+lKu6jIaGmeW1y6hDG33Na9MgfjyK/p1SZbAs/T8jys0WGZyp5dWPxKG1xaWvzE4XBcnbBak2wTE9rZ2dkreLaevdu9fH5ubi5uanLyJuZMT09fX1xc335DAj+6W7dGWdj0C+fu+RS4ikDkSi8pHZbp7OibpfT9d+5QCJP9FKeGEIB//zouj+r7rUW+ObKPlNdsNr1y8RHti7klfAnm9YE9PO/bb6fQ0Rsl5PL7SIGJW4o19fbqKysrh4sMBoe+oICA4qIie2VFhcVsNt/3nzM2Nna7ob6+s7SkxCbZGwoLnbDv7u4uIqKLWyYwmK/vpVTSzBxdcdLiZSctXZrm35ZpZ8LP/p61DoEeNAxYDT/9IIN2vaWhsKM6QRpyKxDGqg2O0tCz72dQq9mWK1diYfuwcf/JFLbTiPwaynNR0PadSOE1tLTj9QT67af55N6EwOXl5fNtbW21IKBQr58vLyuzNou/plaQUZCfTx0dHRVyUfT09BhAFuaAwOamplb+q6/iDyCRWVdXa1pYWLi0JQLDeAPPnLpNB1htL3PVReU98NE9sfF9x28xeTqB3UyGnED7PMX//GIOK1gjxkHCH6/qKbO233oxu5H285phovhoKJrVtOx2nxeb5uuf2A7r4f1Q3MsfP6TSztH6pkFbwV0O599fyafTus0rvt1uvwalgbz6urruufm5OGkM4TgyMpI2MWFNkisP5MG+uqrK7HDYr8ntjcb2GoyBxE4Z8RsSGCFI1HnCzqsejGFjnnGdL9TlBCJXhRzxVGjYvnQhm+zzi/HS+BlWNRQIZf7g3VQatDmS8XxhyfXJS7HZFHo4SayNd732aR6NzszdlCtlZm7hymYE2my2BImQFtbdRorFWGNDQwdsEeqY62+D0IVyYVPGaparcEMCkYe+yznMg1T6HgPXCO94uDeEz9xaaWPev10l1BXhVdErl3JE8fjsyxb695etFPm5gQuQTrRKodFJlN861Il5XN0vvMp9aHCUxrf+Xib5J3/LoJiEMrpX32+RfwgJKArDw8OZcpU5nc74kuLiKZAIUpoaG42wwXN/MkEGQlxSn8vluhCIaKQE2GDNCS5GW8iBWjrNDfLQ5GySedKRhCtgGrenPf9BpghNicDT2nIfga//xyDmrpCQJMIZpKJnDPFWb5EL+V0pFT1OaW5KeY8TuS7Uq3KQ7JnP8/h6iENa3zbcIQ+v6urqAeS0Og5Vl2spVhrr7+vLNTB52HShNxcitzWw2hDCEpH4AMVFxSLcUUDWU6vJZCoQazEwf1MC4fT5jLVVGHiR2xgplAWBSZU+uz9fKxTE+FTMJ5aI48nenJlMT8ek0NMngFsUxgrXlXfP+8KJgZblOS5AouggH0brfGrHsx+9l0poZ2A/Pz9/ubSk1KZnAqEiosVVVRJKgXLKy8qtUkhLVxSNFQKLfASuF+oDAwOPpPkjFkv6lgg8F6BBlhrpPV47qOokh5g0DjWKAsKkIXf+Lj6fTGPT6d0jU1ndI9NZPaMzmb183zs2k44ztGOe4kQL4172vWOEK31KRbczkj/GMydvi3wpKXrXmxqRCiTCh4eHspq4Yo6Ojt5Zb/MIUxQK2CGkQQJIQ7HAGJQJcmpravpQwQOt0dXVVSopEGtticB3dJXrE3hkhcCYL0p9dlCQVEkRpigUVb3jFYGcGrTNBi3x0RBh4+Z+kO+TF13LsXIbhOx3ROXWedsmDcWuExmbAe9BKyMpaZyJwLOamuoBPEPeRNO9Zh6Timou2UC1WyLwbU1ZgH8mBCDwxgqB6BOfO5spxqFC9Is//Esqb7qecpoH+/TGYePnBe30alyuaI3QW2J9JvLCb+LzKPKagfTcD1qmnNopJ11NqzJN7T/paX3CvQRe5/kbEYWqaeEw82980VwjTA1eAif5tCHyZX9frqSuNu79/AvJEDfdRd582uxX1TckMOp68dYU6CPQs3BmbZ81QpwktD4litMEh+LeY55G+sk3Eukgtzjzi0tik8RtzMGPH4jne9n+x2fS6dmzGfwRdCIPSu96/h9ZZPa2PvLjnxxSXkMT3NnZWTY4OJiNIlBXW2uSmuWmpkajFK4oRiBWOnlAbTipoHK3t7fXYC2MoYVBjyl/16oXH4p9QDsiE8Wxa8cbCfSHzwoCKhAKe+LNRNrNdt/i08GR/xbL7Dy2DxsHBw7yeqG8+V1sC+xkPInfXJFRxU9xvpQaaRD4K7QxvOZOznNPRCYIYM5O2PM6v+CWqL5POgKuDxBYUV4+ik3n5+X5gGoNJbW2tDT5nyhwbzQaqxGisJPPk0jFudj/XatucprMfWgrUqt6p9Kqe21lXaO1a/PI46D79QOWlMoex52qXjtsy7vHagJtBOGJ41mioYNu6I10o8AortriLqrsGat2kmvVJsZm5r7IaxnqTvCzTzR0ksFoacVxcqv5Dv8QGB8fT0b4mQUGs6GoGSbBvSH5jqtoUzBPYGgoC6G+Xn/4lRPxNrYJ3Cbw6wTFHVA7FHdA7VDcAbVDcQfUDsUdUDsUd0DtUNwBtUNxB9QOxR1QOxR3QO1Q3AG1Q3EH1A7FHVA7FHdA7VDcAbVDcQfUDsUdUDsUd0Dt+B8AAAD//wMAZtOP6cvUNwcAAAAASUVORK5CYII=</mdui:Logo>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:IPHint>195.176.12.0/22</mdui:IPHint>
-        <mdui:DomainHint>hes-so.ch</mdui:DomainHint>
-        <mdui:DomainHint>ecal.ch</mdui:DomainHint>
-        <mdui:DomainHint>eia-fr.ch</mdui:DomainHint>
-        <mdui:DomainHint>eif.ch</mdui:DomainHint>
-        <mdui:DomainHint>he-arc.ch</mdui:DomainHint>
-        <mdui:DomainHint>heds-fr.ch</mdui:DomainHint>
-        <mdui:DomainHint>hef-ts.ch</mdui:DomainHint>
-        <mdui:DomainHint>hefr.ch</mdui:DomainHint>
-        <mdui:DomainHint>heg-fr.ch</mdui:DomainHint>
-        <mdui:DomainHint>heig-vd.ch</mdui:DomainHint>
-        <mdui:DomainHint>hesge.ch</mdui:DomainHint>
-        <mdui:DomainHint>hevs.ch</mdui:DomainHint>
-        <mdui:DomainHint>hsw-fr.ch</mdui:DomainHint>
-        <mdui:DomainHint>hta-fr.ch</mdui:DomainHint>
-        <mdui:GeolocationHint>geo:46.996710,6.936891</mdui:GeolocationHint>
-        <mdui:GeolocationHint>geo:46.793393,7.159078</mdui:GeolocationHint>
-        <mdui:GeolocationHint>geo:46.207325,6.099785</mdui:GeolocationHint>
-        <mdui:GeolocationHint>geo:46.293093,7.536841</mdui:GeolocationHint>
-        <mdui:GeolocationHint>geo:46.379599,7.626590</mdui:GeolocationHint>
-        <mdui:GeolocationHint>geo:46.235924,7.351375</mdui:GeolocationHint>
-        <mdui:GeolocationHint>geo:46.287826,7.884015</mdui:GeolocationHint>
-        <mdui:GeolocationHint>geo:47.361332,7.345858</mdui:GeolocationHint>
-        <mdui:GeolocationHint>geo:46.779445,6.658656</mdui:GeolocationHint>
-        <mdui:GeolocationHint>geo:46.526928,6.627963</mdui:GeolocationHint>
-      </mdui:DiscoHints>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDLDCCAhSgAwIBAgIJAMqicqA49UbTMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE2FhaS1sb2dvbi5oZXMtc28uY2gwHhcNMTMxMTI3MTAyODUyWhcNMTYxMTI2
-MTAyODUyWjAeMRwwGgYDVQQDExNhYWktbG9nb24uaGVzLXNvLmNoMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAkJvxk2Aq0rv+KSKYZmat+KfRDoPngFG/
-q7vy+R2o3+em4jUkOI+FrKA87fGmVUTCTj39s6ySilxmeyDppzUG8OLcXYVR62gl
-9EKNAsaDAKLyk6+5EKrD92lgLJqd8mUkFEMsp8Vmp7dfS+3mCrFu1eUC5GdPc+aF
-xf1u+vjP4/ETBU13MNzacsqcXlM0ArPIp7oWrDQnrs151+2kZt5YgASyqtlv6Tz5
-8h153JjL4rkrVSqF3drEFZLN3Qu38zyUrPOYIv9c76lCQ6PUsq875riXZffIcdfP
-dlQtuRuOGnePrs7TP39F5ToJDR5dKdswnhyrgXsTTElkU7UHWlUgKQIDAQABo20w
-azBKBgNVHREEQzBBghNhYWktbG9nb24uaGVzLXNvLmNohipodHRwczovL2FhaS1s
-b2dvbi5oZXMtc28uY2gvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFLPdE7npAe4X
-MCJJ2tWOvKkGDRwTMA0GCSqGSIb3DQEBBQUAA4IBAQAKmIgNATIcA64ve8grxWDR
-cmBxDOoyl4m7zgaOz5TAhL65R3Ieb1wpvFYfIxtuhR3eSbcTYmD7A6BBp5C2QXZa
-2twKtrGfo/WJMhas9NNhthnZQDYpK/1E54nJPNAKY0eZUnh9QCEdcKmLh9TOl6BF
-eYrPRwFJZSV2pBHhXCaO/aEtTvrL7+DnDljnhb0zfBJ4TCCGnQ/MOALNxt/ZkKz5
-QYG9T2ud56O8FIRDi+rCME6nicN5HF4FVFA3Um8q9WED2vQ6mztFY9y+glOHdRqb
-Hpx/eGHluuFsDHUh9eaXQubano3fjXCVFAhHELlqLWa4uEDyoIQ6RID36NV3V7Ul
-						</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://aai-logon.hes-so.ch:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aai-logon.hes-so.ch: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-logon.hes-so.ch/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://aai-logon.hes-so.ch/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://aai-logon.hes-so.ch/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://aai-logon.hes-so.ch/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
-    <Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hes-so.ch</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIFQjCCBCqgAwIBAgIUbQvY+OJqikCxxhTbXiF9bamtIiEwDQYJKoZIhvcNAQEF
-BQAwazELMAkGA1UEBhMCQk0xGTAXBgNVBAoTEFF1b1ZhZGlzIExpbWl0ZWQxHzAd
-BgNVBAsTFnd3dy5xdW92YWRpc2dsb2JhbC5jb20xIDAeBgNVBAMTF1F1b1ZhZGlz
-IEdsb2JhbCBTU0wgSUNBMB4XDTEzMTEyNzExMTkxNVoXDTE2MTEyNzExMTkxM1ow
-ga0xCzAJBgNVBAYTAkNIMQ0wCwYDVQQIEwRKdXJhMREwDwYDVQQHEwhEZWxlbW9u
-dDE/MD0GA1UEChM2SGF1dGUgRWNvbGUgU3BlY2lhbGlzZWUgZGUgU3Vpc3NlIG9j
-Y2lkZW50YWxlIChIRVMtU08pMR0wGwYDVQQLExRTZXJ2aWNlIEluZm9ybWF0aXF1
-ZTEcMBoGA1UEAxMTYWFpLWxvZ29uLmhlcy1zby5jaDCCASIwDQYJKoZIhvcNAQEB
-BQADggEPADCCAQoCggEBAMND3PsEwdrvXK+DGAbsalJikrnHoy6SzdmAV13SR0QA
-+pEPCgngo3UVsaTEz12PIEbPkw0O9neaAt8CbZLgSmAx4sqX0WZAYho20gXDY/Rl
-cXKryuMh/KlPyoC3fsmyVPDPD5uYmLNpCLKjl39I/oo3kpXzcmsdBx8ZFyz6YIod
-e7Aplq6SJhh7s9x8HDg0aavSA7RDRGrZBy9ekqzWCsyyNTpxQWKnEPv4mfjEiyC3
-j9Mv43K9/lE+zgGOiZPx/mJ2CcbJ1sfJIT2Ui0I6dEgyuawkNEIqXWaKer+hMoyM
-xAzDCR0moEAWQ6SPcHwt6jwI2D9vNGcC17Ttr31n//ECAwEAAaOCAZkwggGVMHQG
-CCsGAQUFBwEBBGgwZjAqBggrBgEFBQcwAYYeaHR0cDovL29jc3AucXVvdmFkaXNn
-bG9iYWwuY29tMDgGCCsGAQUFBzAChixodHRwOi8vdHJ1c3QucXVvdmFkaXNnbG9i
-YWwuY29tL3F2c3NsaWNhLmNydDAeBgNVHREEFzAVghNhYWktbG9nb24uaGVzLXNv
-LmNoMFEGA1UdIARKMEgwRgYMKwYBBAG+WAACZAEBMDYwNAYIKwYBBQUHAgEWKGh0
-dHA6Ly93d3cucXVvdmFkaXNnbG9iYWwuY29tL3JlcG9zaXRvcnkwDgYDVR0PAQH/
-BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAfBgNVHSMEGDAW
-gBQyTaFP6vCumbbumwcshAgRUIvifjA7BgNVHR8ENDAyMDCgLqAshipodHRwOi8v
-Y3JsLnF1b3ZhZGlzZ2xvYmFsLmNvbS9xdnNzbGljYS5jcmwwHQYDVR0OBBYEFAX7
-qvdL23DqegSmlCxsX+LERI0AMA0GCSqGSIb3DQEBBQUAA4IBAQBK7qy3M7LVDRUz
-B4szCrhGs4SG5/hh0ZvjSseJaKPwVvqx4p8TdVfuo9VANqkmID1O+lgTBSmNgxai
-xJkCMalwtZDMTKT6SSYFi6khSiYxHDa5NcE7W/SVn5bf5FViuF9P0JeMKnLt+vzF
-wGYTdkdOoOjskmuZmGJhf1VGNtxZ7yI4I4claTWS/4XxAivHx44MmITQrQLLhQZR
-Bb4WgjlWX1X5Do9/nCqSpOJ+QpPb6PRLzsBazR1nwaTVqn7IBTXESQaf3KCAaMUx
-AGxVxS6Wr+7y0NG4xKIrpn+NBa7Tl/KsLcvH8PbmiGa93EFJtbENoO0ICT+2SQQh
-JT6DgiEX
-						</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://aai-logon.hes-so.ch:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aai-logon.hes-so.ch:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">hes-so.ch</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">HES-SO : UAS Western Switzerland</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="fr">HES-SO - Haute École Spécialisée de Suisse occidentale</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.hes-so.ch/</OrganizationURL>
-    <OrganizationURL xml:lang="fr">http://www.hes-so.ch/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Equipe</GivenName>
-    <SurName>AAI HES-SO</SurName>
-    <EmailAddress>mailto:idm@hes-so.ch</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Equipe</GivenName>
-    <SurName>AAI HES-SO</SurName>
-    <EmailAddress>mailto:idm@hes-so.ch</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/aai-logon.switch.ch-idp-shibboleth.xml b/swamid-interfederations-2.0/aai-logon.switch.ch-idp-shibboleth.xml
deleted file mode 100644
index 48f4a875..00000000
--- a/swamid-interfederations-2.0/aai-logon.switch.ch-idp-shibboleth.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://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-10-22T15:43:58Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.switch.ch/aai/federation/switchaai/metadata-registration-practice-statement-20110711.txt</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-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </Extensions>
-  <IDPSSODescriptor errorURL="http://www.switch.ch/aai/contact/" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-    <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: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>
-        <mdui:IPHint>2001:620::/48</mdui:IPHint>
-        <mdui:DomainHint>switch.ch</mdui:DomainHint>
-        <mdui:GeolocationHint>geo:47.37333,8.53111</mdui:GeolocationHint>
-      </mdui:DiscoHints>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDLDCCAhSgAwIBAgIJAIHilzMu/j8KMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE2FhaS1sb2dvbi5zd2l0Y2guY2gwHhcNMTMxMjAyMTUxNzI5WhcNMTYxMjAx
-MTUxNzI5WjAeMRwwGgYDVQQDExNhYWktbG9nb24uc3dpdGNoLmNoMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA72Gf8Be0k33Ucdk6+m/wpe70eZdL8n9Q
-Dk4AuJ7uLFqo9vfJFRpEDbfGAt2s9esAfxX0harLVhEP7bX4HQxDt7uM9PeDXZ3M
-GGiKL4hCNR4RKY1pfx7PoLDHthiO5vVgQzlBAis3R24kL1omDGcHaxuazC5esJ5W
-cW3utZiVvmuLyysAuRupkMsLe2Cy4nEYA3IKVjqJskTACOyBhrv1TjJyVHgUPfqk
-acqMwIHL9fVmLpJwvNHd43btsx4RWtyTMeHxN4N09LnhUP7xlJZeFTgCW02Aqz8J
-HMzqwDJLBmSo7S3tQDUcoID8wXjjC0FH2WcrAi+A6mIaSwweXPXI1wIDAQABo20w
-azBKBgNVHREEQzBBghNhYWktbG9nb24uc3dpdGNoLmNohipodHRwczovL2FhaS1s
-b2dvbi5zd2l0Y2guY2gvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFKCIdiqWvBra
-kKosFDkwV2lqXHPPMA0GCSqGSIb3DQEBBQUAA4IBAQCebaL+8PbVVbIpGsr+ZwvG
-06XdJYWW6adQiOy110041UBodrjqi40rsqfJjhysrNxW9eCyVhJ8tq7Q/QUI6KHJ
-iOOciw+p2c2KNI1nq54Nebjkal+hTbUvS8N7HTMvhYdu7gqqDgnvgP7s3iFAXI5b
-qyPh4TWKXlb45GinyZ3T8OjB6UsHAmhn1hRFuwOa27csxu1qPvFhTgEgbXieo2Nr
-vmIdMu967nRbVMztmAfd7Vv0eMj+YoKuA/RUWqJI6lMjHVpkl2ggE/Kb8mXX/wX1
-pSfkm5o6j1ysHdGdoojvd+BikyPR7hGEs1lukWxump98WxdIHzmo5ErBr770nWRR
-						</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://aai-logon.switch.ch/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aai-logon.switch.ch/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-logon.switch.ch/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://aai-logon.switch.ch/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://aai-logon.switch.ch/idp/profile/SAML2/POST/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
-    <Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">switch.ch</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIFVDCCBDygAwIBAgIULqFVZ3v/ZWU2QoNe1Y/XyQSqGeAwDQYJKoZIhvcNAQEL
-BQAwTTELMAkGA1UEBhMCQk0xGTAXBgNVBAoTEFF1b1ZhZGlzIExpbWl0ZWQxIzAh
-BgNVBAMTGlF1b1ZhZGlzIEdsb2JhbCBTU0wgSUNBIEcyMB4XDTEzMTIwOTEyMTgw
-N1oXDTE1MTIwOTEyMTcyNFowgcgxEzARBgsrBgEEAYI3PAIBAxMCQ0gxFTATBgsr
-BgEEAYI3PAIBAhMEQmVybjEdMBsGA1UEDxMUUHJpdmF0ZSBPcmdhbml6YXRpb24x
-GzAZBgNVBAUTEkNILTAzNS43LjAwMS4yNzgtOTELMAkGA1UEBhMCQ0gxEDAOBgNV
-BAgTB1p1ZXJpY2gxEDAOBgNVBAcTB1p1ZXJpY2gxDzANBgNVBAoTBlNXSVRDSDEc
-MBoGA1UEAxMTYWFpLWxvZ29uLnN3aXRjaC5jaDCCASIwDQYJKoZIhvcNAQEBBQAD
-ggEPADCCAQoCggEBAKplsvC4tYqZuV9IOjCWn6r5gMxMnmJ2EVZkMU8SSW4To8aB
-/dhPc8MUkHQ3bQoew4iolSzBdQ8dCeALCHQLmHD5rqXsRvsTjtkPS7SjaEM4viLF
-dz8oC8Y3x9RA5ruZf5KKPh6f2Dd/1s0IKpf7lPJx6px4ho2QwnOmwIAe3+QWrhK5
-136hmtyObl+rDDkzCwBnir6BXYEPHMSXqR9u9McfCXHjw3qow/qSv2+Ae4lVHh2K
-fiNbFTMa2t5zF53NyQNbK33ckrAJ1R1QcysBT3lyPK4wy3IACZkR2S6Af/GLGE5y
-DWCiwZqKRI+TUcGGHNj7+GEFCfdfHgY8og8Rl/MCAwEAAaOCAa4wggGqMHMGCCsG
-AQUFBwEBBGcwZTAqBggrBgEFBQcwAYYeaHR0cDovL29jc3AucXVvdmFkaXNnbG9i
-YWwuY29tMDcGCCsGAQUFBzAChitodHRwOi8vdHJ1c3QucXVvdmFkaXNnbG9iYWwu
-Y29tL3F2c3NsZzIuY3J0MFEGA1UdIARKMEgwRgYMKwYBBAG+WAACZAECMDYwNAYI
-KwYBBQUHAgEWKGh0dHA6Ly93d3cucXVvdmFkaXNnbG9iYWwuY29tL3JlcG9zaXRv
-cnkwOAYDVR0RBDEwL4ITYWFpLWxvZ29uLnN3aXRjaC5jaIIYeDUwOS5hYWktbG9n
-b24uc3dpdGNoLmNoMAsGA1UdDwQEAwIFoDAdBgNVHSUEFjAUBggrBgEFBQcDAQYI
-KwYBBQUHAwIwHwYDVR0jBBgwFoAUkRlirVsXpzD78N45JbG9jLm4UScwOgYDVR0f
-BDMwMTAvoC2gK4YpaHR0cDovL2NybC5xdW92YWRpc2dsb2JhbC5jb20vcXZzc2xn
-Mi5jcmwwHQYDVR0OBBYEFO5qHZPNwV4RRgjWgE/kQYdVOMgYMA0GCSqGSIb3DQEB
-CwUAA4IBAQAwEck5/yI4crrtFbfMDQzqBCXVQqLQPLZQuy6LcltubJgMY2gixwUk
-g11zTpP8ydZWUzZJ4TdmJwQSxWOiHrmrkpXjPMJ/NKCS7VUjsR9qSLDeJzEs61E0
-Pk8ssP/Caza7B5kUoY52NAfgCLyqGNNqDSCM02JD/sUIF4T5+OiVaDDzKPdBkOHE
-Rei3SQPXcLygCnwaXVWkmQLoqXESIXqmOwbWoACmBolMHKPGzp/4rvp3ejPUwYru
-FIwRkLdxvdKOzE/feFbX4GkXgvg6GmELxSZbakbuQoNeS/aTLYR2Y/GuE4UrA533
-Sih8+vYwOym3ZyV+cdIM1uoInD5lJmgl
-						</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>
-MIIDLDCCAhSgAwIBAgIJAIHilzMu/j8KMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE2FhaS1sb2dvbi5zd2l0Y2guY2gwHhcNMTMxMjAyMTUxNzI5WhcNMTYxMjAx
-MTUxNzI5WjAeMRwwGgYDVQQDExNhYWktbG9nb24uc3dpdGNoLmNoMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA72Gf8Be0k33Ucdk6+m/wpe70eZdL8n9Q
-Dk4AuJ7uLFqo9vfJFRpEDbfGAt2s9esAfxX0harLVhEP7bX4HQxDt7uM9PeDXZ3M
-GGiKL4hCNR4RKY1pfx7PoLDHthiO5vVgQzlBAis3R24kL1omDGcHaxuazC5esJ5W
-cW3utZiVvmuLyysAuRupkMsLe2Cy4nEYA3IKVjqJskTACOyBhrv1TjJyVHgUPfqk
-acqMwIHL9fVmLpJwvNHd43btsx4RWtyTMeHxN4N09LnhUP7xlJZeFTgCW02Aqz8J
-HMzqwDJLBmSo7S3tQDUcoID8wXjjC0FH2WcrAi+A6mIaSwweXPXI1wIDAQABo20w
-azBKBgNVHREEQzBBghNhYWktbG9nb24uc3dpdGNoLmNohipodHRwczovL2FhaS1s
-b2dvbi5zd2l0Y2guY2gvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFKCIdiqWvBra
-kKosFDkwV2lqXHPPMA0GCSqGSIb3DQEBBQUAA4IBAQCebaL+8PbVVbIpGsr+ZwvG
-06XdJYWW6adQiOy110041UBodrjqi40rsqfJjhysrNxW9eCyVhJ8tq7Q/QUI6KHJ
-iOOciw+p2c2KNI1nq54Nebjkal+hTbUvS8N7HTMvhYdu7gqqDgnvgP7s3iFAXI5b
-qyPh4TWKXlb45GinyZ3T8OjB6UsHAmhn1hRFuwOa27csxu1qPvFhTgEgbXieo2Nr
-vmIdMu967nRbVMztmAfd7Vv0eMj+YoKuA/RUWqJI6lMjHVpkl2ggE/Kb8mXX/wX1
-pSfkm5o6j1ysHdGdoojvd+BikyPR7hGEs1lukWxump98WxdIHzmo5ErBr770nWRR
-						</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://aai-logon.switch.ch/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aai-logon.switch.ch/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-  </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>
-    <SurName>Team</SurName>
-    <EmailAddress>mailto:aai@switch.ch</EmailAddress>
-    <TelephoneNumber>+41 44 268 1505</TelephoneNumber>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>SWITCHaai</GivenName>
-    <SurName>Team</SurName>
-    <EmailAddress>mailto:aai@switch.ch</EmailAddress>
-    <TelephoneNumber>+41 44 268 1505</TelephoneNumber>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/aai-logon.switch.ch.xml b/swamid-interfederations-2.0/aai-logon.switch.ch.xml
deleted file mode 100644
index 48f4a875..00000000
--- a/swamid-interfederations-2.0/aai-logon.switch.ch.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://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-10-22T15:43:58Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.switch.ch/aai/federation/switchaai/metadata-registration-practice-statement-20110711.txt</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-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </Extensions>
-  <IDPSSODescriptor errorURL="http://www.switch.ch/aai/contact/" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-    <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: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>
-        <mdui:IPHint>2001:620::/48</mdui:IPHint>
-        <mdui:DomainHint>switch.ch</mdui:DomainHint>
-        <mdui:GeolocationHint>geo:47.37333,8.53111</mdui:GeolocationHint>
-      </mdui:DiscoHints>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDLDCCAhSgAwIBAgIJAIHilzMu/j8KMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE2FhaS1sb2dvbi5zd2l0Y2guY2gwHhcNMTMxMjAyMTUxNzI5WhcNMTYxMjAx
-MTUxNzI5WjAeMRwwGgYDVQQDExNhYWktbG9nb24uc3dpdGNoLmNoMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA72Gf8Be0k33Ucdk6+m/wpe70eZdL8n9Q
-Dk4AuJ7uLFqo9vfJFRpEDbfGAt2s9esAfxX0harLVhEP7bX4HQxDt7uM9PeDXZ3M
-GGiKL4hCNR4RKY1pfx7PoLDHthiO5vVgQzlBAis3R24kL1omDGcHaxuazC5esJ5W
-cW3utZiVvmuLyysAuRupkMsLe2Cy4nEYA3IKVjqJskTACOyBhrv1TjJyVHgUPfqk
-acqMwIHL9fVmLpJwvNHd43btsx4RWtyTMeHxN4N09LnhUP7xlJZeFTgCW02Aqz8J
-HMzqwDJLBmSo7S3tQDUcoID8wXjjC0FH2WcrAi+A6mIaSwweXPXI1wIDAQABo20w
-azBKBgNVHREEQzBBghNhYWktbG9nb24uc3dpdGNoLmNohipodHRwczovL2FhaS1s
-b2dvbi5zd2l0Y2guY2gvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFKCIdiqWvBra
-kKosFDkwV2lqXHPPMA0GCSqGSIb3DQEBBQUAA4IBAQCebaL+8PbVVbIpGsr+ZwvG
-06XdJYWW6adQiOy110041UBodrjqi40rsqfJjhysrNxW9eCyVhJ8tq7Q/QUI6KHJ
-iOOciw+p2c2KNI1nq54Nebjkal+hTbUvS8N7HTMvhYdu7gqqDgnvgP7s3iFAXI5b
-qyPh4TWKXlb45GinyZ3T8OjB6UsHAmhn1hRFuwOa27csxu1qPvFhTgEgbXieo2Nr
-vmIdMu967nRbVMztmAfd7Vv0eMj+YoKuA/RUWqJI6lMjHVpkl2ggE/Kb8mXX/wX1
-pSfkm5o6j1ysHdGdoojvd+BikyPR7hGEs1lukWxump98WxdIHzmo5ErBr770nWRR
-						</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://aai-logon.switch.ch/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aai-logon.switch.ch/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-logon.switch.ch/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://aai-logon.switch.ch/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://aai-logon.switch.ch/idp/profile/SAML2/POST/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
-    <Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">switch.ch</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIFVDCCBDygAwIBAgIULqFVZ3v/ZWU2QoNe1Y/XyQSqGeAwDQYJKoZIhvcNAQEL
-BQAwTTELMAkGA1UEBhMCQk0xGTAXBgNVBAoTEFF1b1ZhZGlzIExpbWl0ZWQxIzAh
-BgNVBAMTGlF1b1ZhZGlzIEdsb2JhbCBTU0wgSUNBIEcyMB4XDTEzMTIwOTEyMTgw
-N1oXDTE1MTIwOTEyMTcyNFowgcgxEzARBgsrBgEEAYI3PAIBAxMCQ0gxFTATBgsr
-BgEEAYI3PAIBAhMEQmVybjEdMBsGA1UEDxMUUHJpdmF0ZSBPcmdhbml6YXRpb24x
-GzAZBgNVBAUTEkNILTAzNS43LjAwMS4yNzgtOTELMAkGA1UEBhMCQ0gxEDAOBgNV
-BAgTB1p1ZXJpY2gxEDAOBgNVBAcTB1p1ZXJpY2gxDzANBgNVBAoTBlNXSVRDSDEc
-MBoGA1UEAxMTYWFpLWxvZ29uLnN3aXRjaC5jaDCCASIwDQYJKoZIhvcNAQEBBQAD
-ggEPADCCAQoCggEBAKplsvC4tYqZuV9IOjCWn6r5gMxMnmJ2EVZkMU8SSW4To8aB
-/dhPc8MUkHQ3bQoew4iolSzBdQ8dCeALCHQLmHD5rqXsRvsTjtkPS7SjaEM4viLF
-dz8oC8Y3x9RA5ruZf5KKPh6f2Dd/1s0IKpf7lPJx6px4ho2QwnOmwIAe3+QWrhK5
-136hmtyObl+rDDkzCwBnir6BXYEPHMSXqR9u9McfCXHjw3qow/qSv2+Ae4lVHh2K
-fiNbFTMa2t5zF53NyQNbK33ckrAJ1R1QcysBT3lyPK4wy3IACZkR2S6Af/GLGE5y
-DWCiwZqKRI+TUcGGHNj7+GEFCfdfHgY8og8Rl/MCAwEAAaOCAa4wggGqMHMGCCsG
-AQUFBwEBBGcwZTAqBggrBgEFBQcwAYYeaHR0cDovL29jc3AucXVvdmFkaXNnbG9i
-YWwuY29tMDcGCCsGAQUFBzAChitodHRwOi8vdHJ1c3QucXVvdmFkaXNnbG9iYWwu
-Y29tL3F2c3NsZzIuY3J0MFEGA1UdIARKMEgwRgYMKwYBBAG+WAACZAECMDYwNAYI
-KwYBBQUHAgEWKGh0dHA6Ly93d3cucXVvdmFkaXNnbG9iYWwuY29tL3JlcG9zaXRv
-cnkwOAYDVR0RBDEwL4ITYWFpLWxvZ29uLnN3aXRjaC5jaIIYeDUwOS5hYWktbG9n
-b24uc3dpdGNoLmNoMAsGA1UdDwQEAwIFoDAdBgNVHSUEFjAUBggrBgEFBQcDAQYI
-KwYBBQUHAwIwHwYDVR0jBBgwFoAUkRlirVsXpzD78N45JbG9jLm4UScwOgYDVR0f
-BDMwMTAvoC2gK4YpaHR0cDovL2NybC5xdW92YWRpc2dsb2JhbC5jb20vcXZzc2xn
-Mi5jcmwwHQYDVR0OBBYEFO5qHZPNwV4RRgjWgE/kQYdVOMgYMA0GCSqGSIb3DQEB
-CwUAA4IBAQAwEck5/yI4crrtFbfMDQzqBCXVQqLQPLZQuy6LcltubJgMY2gixwUk
-g11zTpP8ydZWUzZJ4TdmJwQSxWOiHrmrkpXjPMJ/NKCS7VUjsR9qSLDeJzEs61E0
-Pk8ssP/Caza7B5kUoY52NAfgCLyqGNNqDSCM02JD/sUIF4T5+OiVaDDzKPdBkOHE
-Rei3SQPXcLygCnwaXVWkmQLoqXESIXqmOwbWoACmBolMHKPGzp/4rvp3ejPUwYru
-FIwRkLdxvdKOzE/feFbX4GkXgvg6GmELxSZbakbuQoNeS/aTLYR2Y/GuE4UrA533
-Sih8+vYwOym3ZyV+cdIM1uoInD5lJmgl
-						</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>
-MIIDLDCCAhSgAwIBAgIJAIHilzMu/j8KMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE2FhaS1sb2dvbi5zd2l0Y2guY2gwHhcNMTMxMjAyMTUxNzI5WhcNMTYxMjAx
-MTUxNzI5WjAeMRwwGgYDVQQDExNhYWktbG9nb24uc3dpdGNoLmNoMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA72Gf8Be0k33Ucdk6+m/wpe70eZdL8n9Q
-Dk4AuJ7uLFqo9vfJFRpEDbfGAt2s9esAfxX0harLVhEP7bX4HQxDt7uM9PeDXZ3M
-GGiKL4hCNR4RKY1pfx7PoLDHthiO5vVgQzlBAis3R24kL1omDGcHaxuazC5esJ5W
-cW3utZiVvmuLyysAuRupkMsLe2Cy4nEYA3IKVjqJskTACOyBhrv1TjJyVHgUPfqk
-acqMwIHL9fVmLpJwvNHd43btsx4RWtyTMeHxN4N09LnhUP7xlJZeFTgCW02Aqz8J
-HMzqwDJLBmSo7S3tQDUcoID8wXjjC0FH2WcrAi+A6mIaSwweXPXI1wIDAQABo20w
-azBKBgNVHREEQzBBghNhYWktbG9nb24uc3dpdGNoLmNohipodHRwczovL2FhaS1s
-b2dvbi5zd2l0Y2guY2gvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFKCIdiqWvBra
-kKosFDkwV2lqXHPPMA0GCSqGSIb3DQEBBQUAA4IBAQCebaL+8PbVVbIpGsr+ZwvG
-06XdJYWW6adQiOy110041UBodrjqi40rsqfJjhysrNxW9eCyVhJ8tq7Q/QUI6KHJ
-iOOciw+p2c2KNI1nq54Nebjkal+hTbUvS8N7HTMvhYdu7gqqDgnvgP7s3iFAXI5b
-qyPh4TWKXlb45GinyZ3T8OjB6UsHAmhn1hRFuwOa27csxu1qPvFhTgEgbXieo2Nr
-vmIdMu967nRbVMztmAfd7Vv0eMj+YoKuA/RUWqJI6lMjHVpkl2ggE/Kb8mXX/wX1
-pSfkm5o6j1ysHdGdoojvd+BikyPR7hGEs1lukWxump98WxdIHzmo5ErBr770nWRR
-						</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://aai-logon.switch.ch/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aai-logon.switch.ch/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-  </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>
-    <SurName>Team</SurName>
-    <EmailAddress>mailto:aai@switch.ch</EmailAddress>
-    <TelephoneNumber>+41 44 268 1505</TelephoneNumber>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>SWITCHaai</GivenName>
-    <SurName>Team</SurName>
-    <EmailAddress>mailto:aai@switch.ch</EmailAddress>
-    <TelephoneNumber>+41 44 268 1505</TelephoneNumber>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/aai-logon.uni.li-idp-shibboleth.xml b/swamid-interfederations-2.0/aai-logon.uni.li-idp-shibboleth.xml
deleted file mode 100644
index ec689dfe..00000000
--- a/swamid-interfederations-2.0/aai-logon.uni.li-idp-shibboleth.xml
+++ /dev/null
@@ -1,127 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://aai-logon.uni.li/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://rr.aai.switch.ch/" registrationInstant="2014-01-09T10:10:39Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.switch.ch/aai/federation/switchaai/metadata-registration-practice-statement-20110711.txt</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-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-    <Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uni.li</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="de">Universität Liechtenstein</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">University of Liechtenstein</mdui:DisplayName>
-        <mdui:Description xml:lang="de">Universität Liechtenstein</mdui:Description>
-        <mdui:Description xml:lang="en">University of Liechtenstein</mdui:Description>
-        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAACF0RVh0U29mdHdhcmUAR3JhcGhpY0NvbnZlcnRlciAoSW50ZWwpd4f6GQAAACRJREFUeJxiYBgFlINdalL/icG41I4aQKIBo4BGAAAAAP//AwAhn6eucY32zQAAAABJRU5ErkJggg==</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+hkAAAPLSURBVHic7JjbS1RRFMZXzjjOkDRqOmlY3siI0qDLg1Gm0cUoTI3RsgyjHiywi11U0lA00zK7QC/1UIEvDURvvfUQBZHUS9Hfc1qLvY5nexzRYpjVgtnw42zPXvucb39n7YsDjuNAhn9HXIB2xAVoR1yAdsQFaEdcgHbEBWhHXIB2xAVoR1yAdsQFaEdcgHbEBWhHXIB2xAVoR1yAdsQFaEdcgHbEBWhHXIB2xAVoR1yAdsQFaEdcgHa8SqbsRfYh4ZUELzKwOT+cSBWtBeFESShr/mV1uaFES8HSsVXhYJ2lbcSqX0VKkFlrkAeRC8gmpIvv08tuI/eYk0gcmUamkKDVHkF6kRPIG+Ql0oSs5zqVG8gHZAKpWpGB32uKnFTxa3vMaYyG5l/2vDzP+VkbSxr7G2PPFEbilrZpqz6EVCIzPMgG5Cgbu5oHCHxvNxvklvNIEXIZ2Yjcstru8LUZqec6tXfyh6Eymcy4JQ38vLXQSRVzaEz9Gs/Ax2VR59u2oqSxZGLH2mUN7GCzDvgMvMjm3OX4GTaH4rqRR5bJZNQYmGz0G7gKTIaGLKPVGjjKAwE2xjWQMuMFmEx0DcxF+pDrHD9hPYcysNj3PFrjWpMYeAh5iIyDmdYBzQbSWkSZQ9OxESlFDnMbZccOMFMtYpkW43o/MoycYnNoCm9BjrNpFBsFk7nAz9+FXLLeXwtmqejTaqCKknYD59DAL9jm58diA89Z9bNg1ieaojfBZAxN3SGmyYrPRtrBZBftppStm5FnXK8BL9MakA1ID5iMreMY6ncFaQGzJtL714HZ+fcjp7l/W1oNnEEDv6KBn7DND8W2LzRwxKrT4OiIMuBrz7P+djeQbPA2AHctzAezC1Ohqf8aKQMzxWlqT8HC4vbr4+cBx3dxH9rgaAm4llYDi7MD8cqcYLwiJ7AIPAPGo4Gs0mUMfAomA2m9GvcN+hW3DYC3bt3nKxn9no3dAyaTxtiMauQYmE0m19ePNqlBpM0ysJM/wkDaDfzLkszAQeveA1/8MF+D4GWga4SdgTvBTF3ahSnTqvl+HniZ5/ajD+EOwDaQTgS0DIz/zwZSNtGO2c2GkIGTfI8yho4zT3iQtNP2cz96YS/Xx/hK0+0t9z0C3qH5HVIOZh2lDGzk+6N87eE29xBOayv9d1MBZk3+mPkxIdU/JmTIGJgxUCPiArQjLkA74gK0Iy5AO+ICtCMuQDviArQjLkA74gK0Iy5AO+ICtCMuQDviArQjLkA74gK0Iy5AO+ICtCMuQDviArQjLkA7fwAAAP//AwCc7vsetROpDQAAAABJRU5ErkJggg==</mdui:Logo>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:IPHint>195.176.84.0/23</mdui:IPHint>
-        <mdui:IPHint>193.5.26.0/23</mdui:IPHint>
-        <mdui:IPHint>193.5.26.0/24</mdui:IPHint>
-        <mdui:IPHint>193.5.27.0/24</mdui:IPHint>
-        <mdui:IPHint>193.222.112.0/20</mdui:IPHint>
-        <mdui:IPHint>193.222.112.0/21</mdui:IPHint>
-        <mdui:IPHint>193.222.120.0/22</mdui:IPHint>
-        <mdui:IPHint>193.222.124.0/23</mdui:IPHint>
-        <mdui:IPHint>195.176.80.0/22</mdui:IPHint>
-        <mdui:IPHint>193.222.126.0/24</mdui:IPHint>
-        <mdui:IPHint>193.222.127.0/24</mdui:IPHint>
-        <mdui:DomainHint>uni.li</mdui:DomainHint>
-        <mdui:GeolocationHint>geo:47.149655,9.516456</mdui:GeolocationHint>
-      </mdui:DiscoHints>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDIDCCAgigAwIBAgIJALPA8rj6XmsNMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
-BAMTEGFhaS1sb2dvbi51bmkubGkwHhcNMTQwMTA5MDY0MTUwWhcNMTcwMTA4MDY0
-MTUwWjAbMRkwFwYDVQQDExBhYWktbG9nb24udW5pLmxpMIIBIjANBgkqhkiG9w0B
-AQEFAAOCAQ8AMIIBCgKCAQEA18QaCQt2hS2ln2UCEUZfRP4hnA6hx9VBY1qM0coX
-VawizlgqcaejKFZ3EEi+YlbrI8oqT/XxHfrN97TMMfzbfjpe4yfTO+4qO4kzLquv
-rUBc9Lz9zFn7hwFU6FkOL/ZHfRbztDakuehMi+5l63z8dIkAgS/HC1TsYX1QTnzF
-oZfESlJauTysw/ScDNCF9gnN0NNh1wzsWzguHue14kuwbNVpEcSuV7f6y115d+aC
-ENcifEX4jXQ02QpRb0aRebPEW1waVrUW1oTOhAzQ8aoQw8oO8zNGYAA36FN98Alt
-kib/Fc8e7geFgIdMwmd7sDMlwJr6hOzdJkDJTAZZaFJGXQIDAQABo2cwZTBEBgNV
-HREEPTA7ghBhYWktbG9nb24udW5pLmxphidodHRwczovL2FhaS1sb2dvbi51bmku
-bGkvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFL0xAMbCNYPb2WYBXyVIKNyIzPd4
-MA0GCSqGSIb3DQEBBQUAA4IBAQAAyrTtR1axJmDFepwN9piRyxwe25UjL7OlSKoN
-qpMUDlkEbdmQUg6UODYXC1mQ/QfuPnTDikj2zhr5ylfFSDYPj2kHUyOTN2koTT++
-g0s3ZNe5ly/e+JH1jPMAWLujlpkwflM/lBhgIA0sQXwJEDxigxuqm34Hd8jZv7h8
-a5Sf5EDutKrGtwIfDKSvBynp/cibY7H5Dse/EE4ktFWvMlMDaXPVOWqpzLTb3bIa
-NMeonKCuSuheHvNi2LPf6EyZLALj0VtSW5pxqlhOtcHSlaojESKTL1IrUy5pUmnr
-/LVDLvHUtsJPKNVR2iL2CUFeYjUoh4s2cZPgdMs8Q+XDvVL/
-						</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://aai-logon.uni.li:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aai-logon.uni.li: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-logon.uni.li/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://aai-logon.uni.li/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://aai-logon.uni.li/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://aai-logon.uni.li/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
-    <Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uni.li</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDIDCCAgigAwIBAgIJALPA8rj6XmsNMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
-BAMTEGFhaS1sb2dvbi51bmkubGkwHhcNMTQwMTA5MDY0MTUwWhcNMTcwMTA4MDY0
-MTUwWjAbMRkwFwYDVQQDExBhYWktbG9nb24udW5pLmxpMIIBIjANBgkqhkiG9w0B
-AQEFAAOCAQ8AMIIBCgKCAQEA18QaCQt2hS2ln2UCEUZfRP4hnA6hx9VBY1qM0coX
-VawizlgqcaejKFZ3EEi+YlbrI8oqT/XxHfrN97TMMfzbfjpe4yfTO+4qO4kzLquv
-rUBc9Lz9zFn7hwFU6FkOL/ZHfRbztDakuehMi+5l63z8dIkAgS/HC1TsYX1QTnzF
-oZfESlJauTysw/ScDNCF9gnN0NNh1wzsWzguHue14kuwbNVpEcSuV7f6y115d+aC
-ENcifEX4jXQ02QpRb0aRebPEW1waVrUW1oTOhAzQ8aoQw8oO8zNGYAA36FN98Alt
-kib/Fc8e7geFgIdMwmd7sDMlwJr6hOzdJkDJTAZZaFJGXQIDAQABo2cwZTBEBgNV
-HREEPTA7ghBhYWktbG9nb24udW5pLmxphidodHRwczovL2FhaS1sb2dvbi51bmku
-bGkvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFL0xAMbCNYPb2WYBXyVIKNyIzPd4
-MA0GCSqGSIb3DQEBBQUAA4IBAQAAyrTtR1axJmDFepwN9piRyxwe25UjL7OlSKoN
-qpMUDlkEbdmQUg6UODYXC1mQ/QfuPnTDikj2zhr5ylfFSDYPj2kHUyOTN2koTT++
-g0s3ZNe5ly/e+JH1jPMAWLujlpkwflM/lBhgIA0sQXwJEDxigxuqm34Hd8jZv7h8
-a5Sf5EDutKrGtwIfDKSvBynp/cibY7H5Dse/EE4ktFWvMlMDaXPVOWqpzLTb3bIa
-NMeonKCuSuheHvNi2LPf6EyZLALj0VtSW5pxqlhOtcHSlaojESKTL1IrUy5pUmnr
-/LVDLvHUtsJPKNVR2iL2CUFeYjUoh4s2cZPgdMs8Q+XDvVL/
-						</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://aai-logon.uni.li:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aai-logon.uni.li:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">uni.li</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">Universität Liechtenstein</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">University of Liechtenstein</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.uni.li/</OrganizationURL>
-    <OrganizationURL xml:lang="en">http://www.uni.li/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>AAI</GivenName>
-    <SurName>Team</SurName>
-    <EmailAddress>mailto:aai@uni.li</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>AAI</GivenName>
-    <SurName>Team</SurName>
-    <EmailAddress>mailto:aai@uni.li</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/aai-logon.uni.li.xml b/swamid-interfederations-2.0/aai-logon.uni.li.xml
deleted file mode 100644
index ec689dfe..00000000
--- a/swamid-interfederations-2.0/aai-logon.uni.li.xml
+++ /dev/null
@@ -1,127 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://aai-logon.uni.li/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://rr.aai.switch.ch/" registrationInstant="2014-01-09T10:10:39Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.switch.ch/aai/federation/switchaai/metadata-registration-practice-statement-20110711.txt</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-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-    <Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uni.li</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="de">Universität Liechtenstein</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">University of Liechtenstein</mdui:DisplayName>
-        <mdui:Description xml:lang="de">Universität Liechtenstein</mdui:Description>
-        <mdui:Description xml:lang="en">University of Liechtenstein</mdui:Description>
-        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAACF0RVh0U29mdHdhcmUAR3JhcGhpY0NvbnZlcnRlciAoSW50ZWwpd4f6GQAAACRJREFUeJxiYBgFlINdalL/icG41I4aQKIBo4BGAAAAAP//AwAhn6eucY32zQAAAABJRU5ErkJggg==</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+hkAAAPLSURBVHic7JjbS1RRFMZXzjjOkDRqOmlY3siI0qDLg1Gm0cUoTI3RsgyjHiywi11U0lA00zK7QC/1UIEvDURvvfUQBZHUS9Hfc1qLvY5nexzRYpjVgtnw42zPXvucb39n7YsDjuNAhn9HXIB2xAVoR1yAdsQFaEdcgHbEBWhHXIB2xAVoR1yAdsQFaEdcgHbEBWhHXIB2xAVoR1yAdsQFaEdcgHbEBWhHXIB2xAVoR1yAdsQFaEdcgHa8SqbsRfYh4ZUELzKwOT+cSBWtBeFESShr/mV1uaFES8HSsVXhYJ2lbcSqX0VKkFlrkAeRC8gmpIvv08tuI/eYk0gcmUamkKDVHkF6kRPIG+Ql0oSs5zqVG8gHZAKpWpGB32uKnFTxa3vMaYyG5l/2vDzP+VkbSxr7G2PPFEbilrZpqz6EVCIzPMgG5Cgbu5oHCHxvNxvklvNIEXIZ2Yjcstru8LUZqec6tXfyh6Eymcy4JQ38vLXQSRVzaEz9Gs/Ax2VR59u2oqSxZGLH2mUN7GCzDvgMvMjm3OX4GTaH4rqRR5bJZNQYmGz0G7gKTIaGLKPVGjjKAwE2xjWQMuMFmEx0DcxF+pDrHD9hPYcysNj3PFrjWpMYeAh5iIyDmdYBzQbSWkSZQ9OxESlFDnMbZccOMFMtYpkW43o/MoycYnNoCm9BjrNpFBsFk7nAz9+FXLLeXwtmqejTaqCKknYD59DAL9jm58diA89Z9bNg1ieaojfBZAxN3SGmyYrPRtrBZBftppStm5FnXK8BL9MakA1ID5iMreMY6ncFaQGzJtL714HZ+fcjp7l/W1oNnEEDv6KBn7DND8W2LzRwxKrT4OiIMuBrz7P+djeQbPA2AHctzAezC1Ohqf8aKQMzxWlqT8HC4vbr4+cBx3dxH9rgaAm4llYDi7MD8cqcYLwiJ7AIPAPGo4Gs0mUMfAomA2m9GvcN+hW3DYC3bt3nKxn9no3dAyaTxtiMauQYmE0m19ePNqlBpM0ysJM/wkDaDfzLkszAQeveA1/8MF+D4GWga4SdgTvBTF3ahSnTqvl+HniZ5/ajD+EOwDaQTgS0DIz/zwZSNtGO2c2GkIGTfI8yho4zT3iQtNP2cz96YS/Xx/hK0+0t9z0C3qH5HVIOZh2lDGzk+6N87eE29xBOayv9d1MBZk3+mPkxIdU/JmTIGJgxUCPiArQjLkA74gK0Iy5AO+ICtCMuQDviArQjLkA74gK0Iy5AO+ICtCMuQDviArQjLkA74gK0Iy5AO+ICtCMuQDviArQjLkA7fwAAAP//AwCc7vsetROpDQAAAABJRU5ErkJggg==</mdui:Logo>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:IPHint>195.176.84.0/23</mdui:IPHint>
-        <mdui:IPHint>193.5.26.0/23</mdui:IPHint>
-        <mdui:IPHint>193.5.26.0/24</mdui:IPHint>
-        <mdui:IPHint>193.5.27.0/24</mdui:IPHint>
-        <mdui:IPHint>193.222.112.0/20</mdui:IPHint>
-        <mdui:IPHint>193.222.112.0/21</mdui:IPHint>
-        <mdui:IPHint>193.222.120.0/22</mdui:IPHint>
-        <mdui:IPHint>193.222.124.0/23</mdui:IPHint>
-        <mdui:IPHint>195.176.80.0/22</mdui:IPHint>
-        <mdui:IPHint>193.222.126.0/24</mdui:IPHint>
-        <mdui:IPHint>193.222.127.0/24</mdui:IPHint>
-        <mdui:DomainHint>uni.li</mdui:DomainHint>
-        <mdui:GeolocationHint>geo:47.149655,9.516456</mdui:GeolocationHint>
-      </mdui:DiscoHints>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDIDCCAgigAwIBAgIJALPA8rj6XmsNMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
-BAMTEGFhaS1sb2dvbi51bmkubGkwHhcNMTQwMTA5MDY0MTUwWhcNMTcwMTA4MDY0
-MTUwWjAbMRkwFwYDVQQDExBhYWktbG9nb24udW5pLmxpMIIBIjANBgkqhkiG9w0B
-AQEFAAOCAQ8AMIIBCgKCAQEA18QaCQt2hS2ln2UCEUZfRP4hnA6hx9VBY1qM0coX
-VawizlgqcaejKFZ3EEi+YlbrI8oqT/XxHfrN97TMMfzbfjpe4yfTO+4qO4kzLquv
-rUBc9Lz9zFn7hwFU6FkOL/ZHfRbztDakuehMi+5l63z8dIkAgS/HC1TsYX1QTnzF
-oZfESlJauTysw/ScDNCF9gnN0NNh1wzsWzguHue14kuwbNVpEcSuV7f6y115d+aC
-ENcifEX4jXQ02QpRb0aRebPEW1waVrUW1oTOhAzQ8aoQw8oO8zNGYAA36FN98Alt
-kib/Fc8e7geFgIdMwmd7sDMlwJr6hOzdJkDJTAZZaFJGXQIDAQABo2cwZTBEBgNV
-HREEPTA7ghBhYWktbG9nb24udW5pLmxphidodHRwczovL2FhaS1sb2dvbi51bmku
-bGkvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFL0xAMbCNYPb2WYBXyVIKNyIzPd4
-MA0GCSqGSIb3DQEBBQUAA4IBAQAAyrTtR1axJmDFepwN9piRyxwe25UjL7OlSKoN
-qpMUDlkEbdmQUg6UODYXC1mQ/QfuPnTDikj2zhr5ylfFSDYPj2kHUyOTN2koTT++
-g0s3ZNe5ly/e+JH1jPMAWLujlpkwflM/lBhgIA0sQXwJEDxigxuqm34Hd8jZv7h8
-a5Sf5EDutKrGtwIfDKSvBynp/cibY7H5Dse/EE4ktFWvMlMDaXPVOWqpzLTb3bIa
-NMeonKCuSuheHvNi2LPf6EyZLALj0VtSW5pxqlhOtcHSlaojESKTL1IrUy5pUmnr
-/LVDLvHUtsJPKNVR2iL2CUFeYjUoh4s2cZPgdMs8Q+XDvVL/
-						</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://aai-logon.uni.li:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aai-logon.uni.li: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-logon.uni.li/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://aai-logon.uni.li/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://aai-logon.uni.li/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://aai-logon.uni.li/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
-    <Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uni.li</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDIDCCAgigAwIBAgIJALPA8rj6XmsNMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
-BAMTEGFhaS1sb2dvbi51bmkubGkwHhcNMTQwMTA5MDY0MTUwWhcNMTcwMTA4MDY0
-MTUwWjAbMRkwFwYDVQQDExBhYWktbG9nb24udW5pLmxpMIIBIjANBgkqhkiG9w0B
-AQEFAAOCAQ8AMIIBCgKCAQEA18QaCQt2hS2ln2UCEUZfRP4hnA6hx9VBY1qM0coX
-VawizlgqcaejKFZ3EEi+YlbrI8oqT/XxHfrN97TMMfzbfjpe4yfTO+4qO4kzLquv
-rUBc9Lz9zFn7hwFU6FkOL/ZHfRbztDakuehMi+5l63z8dIkAgS/HC1TsYX1QTnzF
-oZfESlJauTysw/ScDNCF9gnN0NNh1wzsWzguHue14kuwbNVpEcSuV7f6y115d+aC
-ENcifEX4jXQ02QpRb0aRebPEW1waVrUW1oTOhAzQ8aoQw8oO8zNGYAA36FN98Alt
-kib/Fc8e7geFgIdMwmd7sDMlwJr6hOzdJkDJTAZZaFJGXQIDAQABo2cwZTBEBgNV
-HREEPTA7ghBhYWktbG9nb24udW5pLmxphidodHRwczovL2FhaS1sb2dvbi51bmku
-bGkvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFL0xAMbCNYPb2WYBXyVIKNyIzPd4
-MA0GCSqGSIb3DQEBBQUAA4IBAQAAyrTtR1axJmDFepwN9piRyxwe25UjL7OlSKoN
-qpMUDlkEbdmQUg6UODYXC1mQ/QfuPnTDikj2zhr5ylfFSDYPj2kHUyOTN2koTT++
-g0s3ZNe5ly/e+JH1jPMAWLujlpkwflM/lBhgIA0sQXwJEDxigxuqm34Hd8jZv7h8
-a5Sf5EDutKrGtwIfDKSvBynp/cibY7H5Dse/EE4ktFWvMlMDaXPVOWqpzLTb3bIa
-NMeonKCuSuheHvNi2LPf6EyZLALj0VtSW5pxqlhOtcHSlaojESKTL1IrUy5pUmnr
-/LVDLvHUtsJPKNVR2iL2CUFeYjUoh4s2cZPgdMs8Q+XDvVL/
-						</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://aai-logon.uni.li:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aai-logon.uni.li:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">uni.li</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">Universität Liechtenstein</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">University of Liechtenstein</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.uni.li/</OrganizationURL>
-    <OrganizationURL xml:lang="en">http://www.uni.li/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>AAI</GivenName>
-    <SurName>Team</SurName>
-    <EmailAddress>mailto:aai@uni.li</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>AAI</GivenName>
-    <SurName>Team</SurName>
-    <EmailAddress>mailto:aai@uni.li</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/aai-logon.wsl.ch-idp-shibboleth.xml b/swamid-interfederations-2.0/aai-logon.wsl.ch-idp-shibboleth.xml
deleted file mode 100644
index 4eaba5f1..00000000
--- a/swamid-interfederations-2.0/aai-logon.wsl.ch-idp-shibboleth.xml
+++ /dev/null
@@ -1,124 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://aai-logon.wsl.ch/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://rr.aai.switch.ch/" registrationInstant="2014-08-15T06:47:44Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.switch.ch/aai/federation/switchaai/metadata-registration-practice-statement-20110711.txt</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-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </Extensions>
-  <IDPSSODescriptor errorURL="http://helpdesk.wsl.ch" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-    <Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">wsl.ch</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="de">WSL - Eidg. Forschungsanstalt für Wald, Schnee und Landschaft</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">WSL - Swiss Federal Institute for Forest, Snow and Landscape Research</mdui:DisplayName>
-        <mdui:Description xml:lang="de">Eidgenössische Forschungsanstalt für Wald, Schnee und Landschaft</mdui:Description>
-        <mdui:Description xml:lang="en">Swiss Federal Institute for Forest, Snow and Landscape Research</mdui:Description>
-        <mdui:Keywords xml:lang="en">forest+snow+landscape</mdui:Keywords>
-        <mdui:Keywords xml:lang="de">wald+schnee+landschaft</mdui:Keywords>
-        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAAlwSFlzAAC4gQAAuIEBxcbWvAAAACF0RVh0U29mdHdhcmUAR3JhcGhpY0NvbnZlcnRlciAoSW50ZWwpd4f6GQAAAolJREFUeJxsk91Lk2EUwE8QQQTRTTfeFHgjEWlEdNNfULeyu4z20dyHbtOWOt3XO7fpNPuYZCbejUhNJWLW1JQsE+tiBGldJahD+gJRc+6hOJ3nPEPa2sV53+e8zzm/8/kCIkKxxOYXtir7HuKBgIbg1fDk7XvofJESP3azWrFtgeJIvRRguI5gNCM0tSIE2hE0Eo8PodbO56r+QSwJqOgfUMaNzeQYpnNU6UEJIT0YQQiF89/CWACoHh0X8uJgNIbHunoQ6huVoS+kHLV8JgHlDBY76p6MCQZ83dnRZMrFtUXmXot9R85GZkHAtgBCcxtCixd/CQFQPTzKpJnV1Vkw2ZgOHi/G371P/9zLwtm+fGk3W7A8fh8PRzoRWr3UExtOr6zMwuZuDl6trSW5cUQFb1A1zVDL+ptMJjm0tJwGWz1BPDi3tp4EpxvBZMX2+bdCNUJGbvVT5ym1OifTWfeQ6E2oGx4T27kc23789j0BljqUUj85JWBxfSMBJorm9uDxW3e4F4PpD5/BRiAzGYaofruLS7j8aIjqpyx9tB9X9Ph46VMaJr9QHWYrSkhsYXHr30ZW9D5QEJmZdHK5VSNdNwjq4GCwuZcDTpkg+mdJUTyN4WWq3+FWIDPZ1RgQrplwY3s3vr8HPFujBcspYqnVlrKYySSaUlOieXqmIAg/7M9TAvQ0hToXAy50xjD35zfoBgYwS7PWJxJ4LhzG89Eo31+K9xZuIh/8ND69WqiL3d38Pko/kwRU9txFaHDzN6mf6ej4H8CKlTpfY8SGkRE8okV4XeXWhSYmcvK+LBxRGXZ1lQZIuTr+lGusyhuV0RbK9wm/H0/FVGaHvD48HQzy+S8AAAD//wMAwcp34AlJRawAAAAASUVORK5CYII=</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+hkAAA+FSURBVHic5Fx5UFXXGf9AxIiKgsQF9w1kUwQUERQREBFkk8ciS9j3fRcBFVGzTtqk0ySTaSdpp2nTdPqHxkwTp7E2yUyadFKTdCadOJqamqY1TbOYuMvrd855595zz733gSYXcXqcO4977r1n+d3f932/s1zBbrfDaI7/tzRqXO4YgC4uRrkeeITB/IU54LeyHkJCd8OaiAEIDu2B5f61MHdeOl4PwWPSKMu77TROAcROTpggZsyDJctKYXPCM2Ar+BAq6m5CY4cd2nvt0Nlvh+69dujZx37JedtuOzS026Gs5hpk5f4FomOfQFBzsZzpSona8m87jS8ACTvc3PjZdJi3oAqSUk9CRf0wdPTZYc8BO/QfZEffEJ4PsTz5INfIwe/tHWSgllRdgbjEF2GaZx6WP5HWotZ3W2n8AKh2xB38A9oht/AL2mkOBAeHgEEPDtigNl+574D2PrGc5i47pNvOwLz5xVgfo+KE2wPyzgPo6sr/coG5vsVooueoGSosE8EZVEHrHTQBcFDKE0Ef1ILZii9oR9YprHsTe4kTb9lH3lkAVdYtg7itx6GlW2WJCIjmV2KbeE1+RncILBZNva51GNZF/QLbMZu25hb8450DcKI7+50yNQMKSr+hnSKdkU3xVo5es2smZfI88tJIEMqwnQcWvRkbxy2A7g7wVvg3Q23LDT3rREAsYKAIqmzaJdVfgpd3JnvJI4M49gAy8Nxg1ZonjU3WGcuMrhv5xVEyUCxPZGNN8zAsWNQ9GhDHFkButqvDnqIRlksM2dftMWKeEQNNGGfKQJPyxfsZEy9BfdsNFOoVtL1OzHnsAOQBwy+gTWGebEIyS3oP6IFTJIrEHB2ARlHYxAeK/pMFlYvQ1PkY/l4Cz+lptN0mgWVsAORSZYaXDRt105R5MkMMDwP27JHAk/OMJI4zBpKjqOIzBHE/jmYuY8tjaPsNJM5YmrA/FJZd1vk8I9+nYdqglklGQUSn9ZwwsFeuR2a38Lsz/y1o6enA4eBH2P4pRv7QegCZ/3CFhOQ/6kYT9FwYcolH35Bdf7+FQUR+gaT+Thw+Jqc9joL7CdSJPzAyZWsB5JRfuLiaqn6u81QR+19o7/05VDU0ohZMw1FIHOQWJUNxRRnKm0dx/PsnvFcvc8bqIPVWN9khJSMHI/Mb2JONY8tANr70gPzifyl+j00CXECAGiAxeTJGOnOjX7IcID5pLpTW7IOugQtOJY9hkBilkDZjIZc1O7LOwq6SAEjb+Q7plTgBYR2AnH3Bq0nnHazDxnT0vYBm4WOOmkkKCJ4EuYVl+PwZQyBHC6Am8joBUDTljj12lF61KLIrYNGS4rFhIPMVs9A0v3X4tavQ2FEDIaHqPVqnPAsCQ7ZDVEwFbNpSC+ujd+H5Bpg6dZoGyBX+7siGShx6/UNv2mZgGAAoTlSMBCKpx1ZwHjbG3YPm/DChB/eF1prwshUddB5v4NAwCtN89IUs312YKA4IToWcwpMI7k06ISp2tHuATD1dh/sqX4EtSffBvbM9lOfCIz2huvEZZULA0KxNTHj3fqL1jlD/OipTdrBw8dJKNOcQ8J0fay0Due4jU0UDh+3Q1NUHS5axvEn38LoXwc68Y9DVr4+64iHO47X0fA7Z+YdhmZ+vAmRKRiK+pL9p2ChqO83fQpnVjZ/ii2nGv69pQRw0OBy+MCXjfbQKgLXrU603YYBADBRkmv1pWBPhogFv4eIsqGq8aBhdjRggml0/9aPXEMgnYY4vm35aGTQZKuofwes3NGyUdaBswlm5J6Cyvk4JcHKd4jN9dIxMOhgOoeF+4FhvsQ7AwJB2BO8DfGtsADzJYbaLlyZBQ/t100BgqNVkAe0AsqXnC0hKrSKcd7BxPXT2n9WWbRC1eXAg0mpNRBSa56u0TCMBL7aFBMOVQbvByxvA09PHWgBTMo7gG9uu8YleM8ORlV8ZD+VGAtAASO7/Khtew+AU4HhxM1BXEt84rGOjkYuIjO5BVxNB7xf9pZF4J+UlbDvicFMu1gK4q+S3EBsvwrcYBfJnWl/lJPqNdIhDO1JmV/8V1GkHsJ7JtLbUzBg09VNOtSMBZHNiH47RAQX9UdNFKm00/rvYKWsAnOG1GDJzcmHKVLWmrSkv6n2ME41mZMKa+TvZRzrYWNX4HgStWk7r9A+YiIFiP0bdq5qFKQoe9aXDKIsi6L2lNSUq2CZmT66XVN1QXIZlAC5eugkiN6iSw3d+PLT2aIdysn/STBYc0HdEvq4BUGJjZ/9XyMAWIBO3JK3bMB87fj8C9ikDhMqSiyiNapQ22gpinAPoKLuijnRyhrUA+syahZpNZV9mzhtav+fELJ0ycCSzlnxjRf3bEBQSorRj2QpXFMMrIDZhHf7NBDpfXigozdKy1KBeCmA96aS3dQDKc2bTpq1BHSiwz0xv3YoJm+TJQYmxEX1jdh+BCuTEZ5o9pwM0d7+gatFBPYDchMtq7WJZ1gURnqJjf2gKjOgDZa3ndF1YBtjEZ4m+sb79AzTZTNF/KSmvOEONwiMEkfz7LoiPWgcgZ6Jt1znVfEWfJssF6puu4xDrV5BT0AP5xQ+i5HkTx7zD33k6i78Y8tvQ/hGK8Acw+qZD3NatUFJ9CPOvjFg+LyM57fjYAMjSLOozZADNlhR3leTo2BERGYKR9Dgdv35fQCq+bohF4z1Cu8wWpMg9ZO14ddi+sQRwLd0lJUdfGQRyvaH9OeUpMtPhKlla5IZkFObvK5uKZLPWnJtEejM/a2b+4jME6LoW0sGwsQPQe2YSDrcc5mPm9B3OPjNnM31G3i1FgFTBdMeAMICi+bJOkJsBKNclA2ekMeWFKc7c7eknlTaNCYAzfbbp9Z+k33jjErcv0pmvmMS1iJBQf6huOqULMjJIXC+aySdZ5+me4+wbslMl4eUdLTfLahOOHtGEOYBJqUucAkgSCUzqJOxkSLc9ggN8g60houmKADthoDMTJkfCtudprZKFWA3gIhzY2zXTRRoAOQMPEvMIGhFAnkQ2hoaHom98SxMMem8FQDMGOp4hbS+u+BT4zi0pWQ2gK8qRr/UASm+YXM+w6czDadKycSI+/xCycQTJIwIl+UzZX3Lw6tuGcWS1jfVGLyGtA9DNjQnBhG0v6dZ4ZanABGrWLQHIk7izNCR0LZTXva7RfWaSxBBAqU1NXTdghX8Z64/x/hjrAJwyZQbM8Z2IY85yuuNUNlvRSZPGlte23RaAJGnZ6AJxiQU48jitjImNpIrObCWLqG+7DH4BNlriRP0o0HoASQoNXw1ks3h57RXdtLk4lKM6sOPHtw0gT66aXQMTMDDVIBD/Vl6SvO4iA0rbiIK9sOyfMGt2zEjgWQ9gYHAKrI92hdj4X+sbLQBIzjv7TiJbvzOGDDoNkB4Qs7kQisqPoSa9Skc04nib+0xiJeW1FyBq4wA+w2ZqRrFL1eogMhtSM6tguX+UTs7IAPYOfg3Rsd/tmwM5yVvSfO6dBhHrE5GZ7ZCV+xiOiX+CwedHaPId4LeSbDRXETMIGEbJOgD5ZMLaqAPYyEUQn/SaqWPn5rMzb7Xm2e8rkfJGW6bL6IDjyVoGMgZ4Q17xs7A5IR6qGgVNKDCQjzWrm5p0HZcTZ5XcUS5wnT1jli9fv4UXaC2AvCErA6sRvBY0lSfp7gNNRBZY2Nn/OzQlbRlkOZRsQFqwCOjij9xBslWEL9q7CJ+IzfEFuhNi9hz13qBVgC/SCyKjJ9NJVJL4jPTMe1kdc+eNGjzrASSJ7w9MyXgTKupiYWf+GdMxbN/QFUhOYw5c9EFlNUehe+AkasViDYCBITMx/3MoqXpYU+fS5S7Q1PkivpCTEL8tn+Zl5wfhyzvliMbXobnrKF5TRz/p2X60jqqGk2A06XrHAFRTOJRWfwzFleUodq/r1ki41KhsqFSe4EBl5/8G9h62Q2vPcfCeqZaYnGaDgUN2aOs9Db7z1fwtSatpWWRvzZJlobBlqzeCdp5Og9W2XEOQPqcvMbfoXaBfNgJZVAqDvffb6UeM4w5AzqbZc2wYjU+jpLifNtRokqF77/tollonFB5ZSOVH7+BViIpRd2uVVv9UkSGbtqi2X1jWQwGvrD9Nz8tq2HlN8yd45ktBi9lciSYbrDyTvSuM7uMhamHcAUgS11RBq/Yjk97Bzj9LP1eVJxgIIDkFG+i96jDNh+7eIh20FeygOXPmArTu/pgGHzYUZAFosgfgEOz3lJnb05lpVzY8Tc8bOv4M8xZI7XK7SwAkial6V2TUL7Hz70HPvks6AAkr23Y/A74OZ87Zm1f8KmVRXevj9Dx6kz99pqnrP/S3seMYzY+I9MByLtN9LH4B7CPCzJxWCiAr+wi6hI3oJ1m5PIjcFQCqDXaDsLVP0M09Rt+L9B28Cmk7mVPjDNmwqdRh4mfpiMVW0EKfTUopQCaTEcYlZPdUDAYpzHwbzilATPO8B4oqTtDyCZD9h8jH2q/DxjjV7O8aAFUQyba0fVDXpl8sIkxp6X5QszjvPXMG5l2nnU9OC8ZgcBSj7Dfg5e2O0f0PFLQdWdn496MUiO3pD2heAHlpURvbMGKfp4tD9HPXngsod6bffQCSxAfpXt6VGFS+VaagVBZ+hSMYhiCfaSkqP0EZVN82hEz8GoPESzQ/NbPH4eOeg46+v1Lz9Q8M0bwsNbnh/b3KwlRUTP7dCSDtijL0XAIJya/Q9RPORgJm+57nFV9FUlxis2NS4rJj93wDzQ9eHcgE+tAVhxR6V1NPxHqyuclPOQ9f54rgXaMAro+pVwDcawKgk3HxnQVQ2zgXWLCwHvKKLlIGESAIqwrLlP3IKDtW0MhNwGVrtKoPq2s9p8z/pWQMKvkkGLV0H0Yf+Qnmz4FVa1DW1EbQ8klZ8xduVwAk9ZH/DiA80hXH8IB+mvhPp82/8wDypLLRBwKDD6Is+ZJu7N5z4G2IjVcHq2U1H8I+Kng/1jyfnf8UZRARzysDI4QrE7CsE2zq6tBnyLpjCBQT0mk7z+B1tu+YCGliwmyU9Ar+vowW8DIOB9fcHQCSpP1fOzyx8RVopifAtqtNGbtuSXqIRu+s3KfoOWdweGQqZU9R+VngowuV3R7Ivp+h77xJ3URdqx22pZIvj9SVwJSMMPoVaVMnO0hZ5CuleQs0u0THN4A8iZMCLM1FU3JxzMCQrWXhQLaN8MRAd3fks5kFDp62nIUYtBKAbIDnSV2493A8Lx/TnM3OfO8AKgcvnPzTPA/qObAT7TXhHrALZZDDVWyQ3ECpHiEP9O0D4WWzch1ZujaDpg2OAg3LdHb8DwAA//8DAGoy2SUDSfluAAAAAElFTkSuQmCC</mdui:Logo>
-        <mdui:InformationURL xml:lang="en">http://www.wsl.ch/index_EN</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="de">http://www.wsl.ch/index_DE</mdui:InformationURL>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:IPHint>193.134.200.0/22</mdui:IPHint>
-        <mdui:IPHint>193.134.206.0/24</mdui:IPHint>
-        <mdui:DomainHint>wsl.ch</mdui:DomainHint>
-        <mdui:DomainHint>slf.ch</mdui:DomainHint>
-        <mdui:DomainHint>lfi.ch</mdui:DomainHint>
-        <mdui:GeolocationHint>geo:47.360644,8.454924</mdui:GeolocationHint>
-      </mdui:DiscoHints>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDIDCCAgigAwIBAgIJAPZ97OKnIcuaMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
-BAMTEGFhaS1sb2dvbi53c2wuY2gwHhcNMTQwMTI0MDc0MzM2WhcNMTcwMTIzMDc0
-MzM2WjAbMRkwFwYDVQQDExBhYWktbG9nb24ud3NsLmNoMIIBIjANBgkqhkiG9w0B
-AQEFAAOCAQ8AMIIBCgKCAQEAw/9mnMeICEome9JwsYvR37cByiSK4bRDssG76ARD
-UjXBmxxgr+0RJFQgLtJiELwnJ41UMlY+CtorpReaf090OzqzbcKuDbZijOIi5Hic
-vfptOrRNwnsplNCpAQGzWar4yz9WnLTKrYhu24ysHZnjux3gMxLvqAl7+C21ExgA
-Fu0bp4MUv7L2wVLp3ersTkFs74GXxlv3IpjgO/gjv/rtvN/ACD97pjwZIkeLeByb
-9rqNYr8jSC15Hvq14GFYq2pBNZ+8UfK4tFtX2nhmr2uC9/5IvdGEcp77moi4BQac
-tSaHF09f+AAFe8lHxwpA96kcaWn6rMYwuMu2BpmdOQRzuQIDAQABo2cwZTBEBgNV
-HREEPTA7ghBhYWktbG9nb24ud3NsLmNohidodHRwczovL2FhaS1sb2dvbi53c2wu
-Y2gvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFMSFarXK3mFRGfcZQsVzW7GkO2Fw
-MA0GCSqGSIb3DQEBBQUAA4IBAQAD3Xpnezw9EHK+4iPOarnrZ1m5DLIazLLvefGm
-TM8Ok8HCbTiJppiJtozZ1EpduYwqu+cmzHH96PL4HBJSi3yxjhipGQoUcJbXVKRd
-urS4IDybcHCGP/nQw7oWmnzmPAgt3TQjjqIZ6Bik17V4+YbrLxjVWOIQ5tDB1Rvt
-fd/yHuwao2QOyRuNXE4rPKuSlEJ0z8fXJzBEITbL5dtWvT+F8Z/dDjnIu1f2w6Mq
-wuj/MeTYd+DoM/lKiZ3CADkIsdr4bTon8wmb/adGFG45IPWjNouDPLODwB1stc0x
-QciXFnoeJldeK2oUlQAt7geKp0lMf/2Er+D6VuxBQQjmjXZz
-						</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://aai-logon.wsl.ch:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aai-logon.wsl.ch: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-logon.wsl.ch/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://aai-logon.wsl.ch/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://aai-logon.wsl.ch/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://aai-logon.wsl.ch/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
-    <Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">wsl.ch</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDIDCCAgigAwIBAgIJAPZ97OKnIcuaMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
-BAMTEGFhaS1sb2dvbi53c2wuY2gwHhcNMTQwMTI0MDc0MzM2WhcNMTcwMTIzMDc0
-MzM2WjAbMRkwFwYDVQQDExBhYWktbG9nb24ud3NsLmNoMIIBIjANBgkqhkiG9w0B
-AQEFAAOCAQ8AMIIBCgKCAQEAw/9mnMeICEome9JwsYvR37cByiSK4bRDssG76ARD
-UjXBmxxgr+0RJFQgLtJiELwnJ41UMlY+CtorpReaf090OzqzbcKuDbZijOIi5Hic
-vfptOrRNwnsplNCpAQGzWar4yz9WnLTKrYhu24ysHZnjux3gMxLvqAl7+C21ExgA
-Fu0bp4MUv7L2wVLp3ersTkFs74GXxlv3IpjgO/gjv/rtvN/ACD97pjwZIkeLeByb
-9rqNYr8jSC15Hvq14GFYq2pBNZ+8UfK4tFtX2nhmr2uC9/5IvdGEcp77moi4BQac
-tSaHF09f+AAFe8lHxwpA96kcaWn6rMYwuMu2BpmdOQRzuQIDAQABo2cwZTBEBgNV
-HREEPTA7ghBhYWktbG9nb24ud3NsLmNohidodHRwczovL2FhaS1sb2dvbi53c2wu
-Y2gvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFMSFarXK3mFRGfcZQsVzW7GkO2Fw
-MA0GCSqGSIb3DQEBBQUAA4IBAQAD3Xpnezw9EHK+4iPOarnrZ1m5DLIazLLvefGm
-TM8Ok8HCbTiJppiJtozZ1EpduYwqu+cmzHH96PL4HBJSi3yxjhipGQoUcJbXVKRd
-urS4IDybcHCGP/nQw7oWmnzmPAgt3TQjjqIZ6Bik17V4+YbrLxjVWOIQ5tDB1Rvt
-fd/yHuwao2QOyRuNXE4rPKuSlEJ0z8fXJzBEITbL5dtWvT+F8Z/dDjnIu1f2w6Mq
-wuj/MeTYd+DoM/lKiZ3CADkIsdr4bTon8wmb/adGFG45IPWjNouDPLODwB1stc0x
-QciXFnoeJldeK2oUlQAt7geKp0lMf/2Er+D6VuxBQQjmjXZz
-						</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://aai-logon.wsl.ch:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aai-logon.wsl.ch:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">wsl.ch</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">WSL - Eidg. Forschungsanstalt für Wald, Schnee und Landschaft</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">WSL - Swiss Federal Institute for Forest, Snow and Landscape Research</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.wsl.ch/</OrganizationURL>
-    <OrganizationURL xml:lang="en">http://www.wsl.ch/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Helpdesk</GivenName>
-    <SurName>Support Contact</SurName>
-    <EmailAddress>mailto:helpdesk@wsl.ch</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>AAI</GivenName>
-    <SurName>WSL</SurName>
-    <EmailAddress>mailto:aai@wsl.ch</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/aai-logon.wsl.ch.xml b/swamid-interfederations-2.0/aai-logon.wsl.ch.xml
deleted file mode 100644
index 4eaba5f1..00000000
--- a/swamid-interfederations-2.0/aai-logon.wsl.ch.xml
+++ /dev/null
@@ -1,124 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://aai-logon.wsl.ch/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://rr.aai.switch.ch/" registrationInstant="2014-08-15T06:47:44Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.switch.ch/aai/federation/switchaai/metadata-registration-practice-statement-20110711.txt</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-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </Extensions>
-  <IDPSSODescriptor errorURL="http://helpdesk.wsl.ch" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-    <Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">wsl.ch</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="de">WSL - Eidg. Forschungsanstalt für Wald, Schnee und Landschaft</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">WSL - Swiss Federal Institute for Forest, Snow and Landscape Research</mdui:DisplayName>
-        <mdui:Description xml:lang="de">Eidgenössische Forschungsanstalt für Wald, Schnee und Landschaft</mdui:Description>
-        <mdui:Description xml:lang="en">Swiss Federal Institute for Forest, Snow and Landscape Research</mdui:Description>
-        <mdui:Keywords xml:lang="en">forest+snow+landscape</mdui:Keywords>
-        <mdui:Keywords xml:lang="de">wald+schnee+landschaft</mdui:Keywords>
-        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAAlwSFlzAAC4gQAAuIEBxcbWvAAAACF0RVh0U29mdHdhcmUAR3JhcGhpY0NvbnZlcnRlciAoSW50ZWwpd4f6GQAAAolJREFUeJxsk91Lk2EUwE8QQQTRTTfeFHgjEWlEdNNfULeyu4z20dyHbtOWOt3XO7fpNPuYZCbejUhNJWLW1JQsE+tiBGldJahD+gJRc+6hOJ3nPEPa2sV53+e8zzm/8/kCIkKxxOYXtir7HuKBgIbg1fDk7XvofJESP3azWrFtgeJIvRRguI5gNCM0tSIE2hE0Eo8PodbO56r+QSwJqOgfUMaNzeQYpnNU6UEJIT0YQQiF89/CWACoHh0X8uJgNIbHunoQ6huVoS+kHLV8JgHlDBY76p6MCQZ83dnRZMrFtUXmXot9R85GZkHAtgBCcxtCixd/CQFQPTzKpJnV1Vkw2ZgOHi/G371P/9zLwtm+fGk3W7A8fh8PRzoRWr3UExtOr6zMwuZuDl6trSW5cUQFb1A1zVDL+ptMJjm0tJwGWz1BPDi3tp4EpxvBZMX2+bdCNUJGbvVT5ym1OifTWfeQ6E2oGx4T27kc23789j0BljqUUj85JWBxfSMBJorm9uDxW3e4F4PpD5/BRiAzGYaofruLS7j8aIjqpyx9tB9X9Ph46VMaJr9QHWYrSkhsYXHr30ZW9D5QEJmZdHK5VSNdNwjq4GCwuZcDTpkg+mdJUTyN4WWq3+FWIDPZ1RgQrplwY3s3vr8HPFujBcspYqnVlrKYySSaUlOieXqmIAg/7M9TAvQ0hToXAy50xjD35zfoBgYwS7PWJxJ4LhzG89Eo31+K9xZuIh/8ND69WqiL3d38Pko/kwRU9txFaHDzN6mf6ej4H8CKlTpfY8SGkRE8okV4XeXWhSYmcvK+LBxRGXZ1lQZIuTr+lGusyhuV0RbK9wm/H0/FVGaHvD48HQzy+S8AAAD//wMAwcp34AlJRawAAAAASUVORK5CYII=</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+hkAAA+FSURBVHic5Fx5UFXXGf9AxIiKgsQF9w1kUwQUERQREBFkk8ciS9j3fRcBFVGzTtqk0ySTaSdpp2nTdPqHxkwTp7E2yUyadFKTdCadOJqamqY1TbOYuMvrd855595zz733gSYXcXqcO4977r1n+d3f932/s1zBbrfDaI7/tzRqXO4YgC4uRrkeeITB/IU54LeyHkJCd8OaiAEIDu2B5f61MHdeOl4PwWPSKMu77TROAcROTpggZsyDJctKYXPCM2Ar+BAq6m5CY4cd2nvt0Nlvh+69dujZx37JedtuOzS026Gs5hpk5f4FomOfQFBzsZzpSona8m87jS8ACTvc3PjZdJi3oAqSUk9CRf0wdPTZYc8BO/QfZEffEJ4PsTz5INfIwe/tHWSgllRdgbjEF2GaZx6WP5HWotZ3W2n8AKh2xB38A9oht/AL2mkOBAeHgEEPDtigNl+574D2PrGc5i47pNvOwLz5xVgfo+KE2wPyzgPo6sr/coG5vsVooueoGSosE8EZVEHrHTQBcFDKE0Ef1ILZii9oR9YprHsTe4kTb9lH3lkAVdYtg7itx6GlW2WJCIjmV2KbeE1+RncILBZNva51GNZF/QLbMZu25hb8450DcKI7+50yNQMKSr+hnSKdkU3xVo5es2smZfI88tJIEMqwnQcWvRkbxy2A7g7wVvg3Q23LDT3rREAsYKAIqmzaJdVfgpd3JnvJI4M49gAy8Nxg1ZonjU3WGcuMrhv5xVEyUCxPZGNN8zAsWNQ9GhDHFkButqvDnqIRlksM2dftMWKeEQNNGGfKQJPyxfsZEy9BfdsNFOoVtL1OzHnsAOQBwy+gTWGebEIyS3oP6IFTJIrEHB2ARlHYxAeK/pMFlYvQ1PkY/l4Cz+lptN0mgWVsAORSZYaXDRt105R5MkMMDwP27JHAk/OMJI4zBpKjqOIzBHE/jmYuY8tjaPsNJM5YmrA/FJZd1vk8I9+nYdqglklGQUSn9ZwwsFeuR2a38Lsz/y1o6enA4eBH2P4pRv7QegCZ/3CFhOQ/6kYT9FwYcolH35Bdf7+FQUR+gaT+Thw+Jqc9joL7CdSJPzAyZWsB5JRfuLiaqn6u81QR+19o7/05VDU0ohZMw1FIHOQWJUNxRRnKm0dx/PsnvFcvc8bqIPVWN9khJSMHI/Mb2JONY8tANr70gPzifyl+j00CXECAGiAxeTJGOnOjX7IcID5pLpTW7IOugQtOJY9hkBilkDZjIZc1O7LOwq6SAEjb+Q7plTgBYR2AnH3Bq0nnHazDxnT0vYBm4WOOmkkKCJ4EuYVl+PwZQyBHC6Am8joBUDTljj12lF61KLIrYNGS4rFhIPMVs9A0v3X4tavQ2FEDIaHqPVqnPAsCQ7ZDVEwFbNpSC+ujd+H5Bpg6dZoGyBX+7siGShx6/UNv2mZgGAAoTlSMBCKpx1ZwHjbG3YPm/DChB/eF1prwshUddB5v4NAwCtN89IUs312YKA4IToWcwpMI7k06ISp2tHuATD1dh/sqX4EtSffBvbM9lOfCIz2huvEZZULA0KxNTHj3fqL1jlD/OipTdrBw8dJKNOcQ8J0fay0Due4jU0UDh+3Q1NUHS5axvEn38LoXwc68Y9DVr4+64iHO47X0fA7Z+YdhmZ+vAmRKRiK+pL9p2ChqO83fQpnVjZ/ii2nGv69pQRw0OBy+MCXjfbQKgLXrU603YYBADBRkmv1pWBPhogFv4eIsqGq8aBhdjRggml0/9aPXEMgnYY4vm35aGTQZKuofwes3NGyUdaBswlm5J6Cyvk4JcHKd4jN9dIxMOhgOoeF+4FhvsQ7AwJB2BO8DfGtsADzJYbaLlyZBQ/t100BgqNVkAe0AsqXnC0hKrSKcd7BxPXT2n9WWbRC1eXAg0mpNRBSa56u0TCMBL7aFBMOVQbvByxvA09PHWgBTMo7gG9uu8YleM8ORlV8ZD+VGAtAASO7/Khtew+AU4HhxM1BXEt84rGOjkYuIjO5BVxNB7xf9pZF4J+UlbDvicFMu1gK4q+S3EBsvwrcYBfJnWl/lJPqNdIhDO1JmV/8V1GkHsJ7JtLbUzBg09VNOtSMBZHNiH47RAQX9UdNFKm00/rvYKWsAnOG1GDJzcmHKVLWmrSkv6n2ME41mZMKa+TvZRzrYWNX4HgStWk7r9A+YiIFiP0bdq5qFKQoe9aXDKIsi6L2lNSUq2CZmT66XVN1QXIZlAC5eugkiN6iSw3d+PLT2aIdysn/STBYc0HdEvq4BUGJjZ/9XyMAWIBO3JK3bMB87fj8C9ikDhMqSiyiNapQ22gpinAPoKLuijnRyhrUA+syahZpNZV9mzhtav+fELJ0ycCSzlnxjRf3bEBQSorRj2QpXFMMrIDZhHf7NBDpfXigozdKy1KBeCmA96aS3dQDKc2bTpq1BHSiwz0xv3YoJm+TJQYmxEX1jdh+BCuTEZ5o9pwM0d7+gatFBPYDchMtq7WJZ1gURnqJjf2gKjOgDZa3ndF1YBtjEZ4m+sb79AzTZTNF/KSmvOEONwiMEkfz7LoiPWgcgZ6Jt1znVfEWfJssF6puu4xDrV5BT0AP5xQ+i5HkTx7zD33k6i78Y8tvQ/hGK8Acw+qZD3NatUFJ9CPOvjFg+LyM57fjYAMjSLOozZADNlhR3leTo2BERGYKR9Dgdv35fQCq+bohF4z1Cu8wWpMg9ZO14ddi+sQRwLd0lJUdfGQRyvaH9OeUpMtPhKlla5IZkFObvK5uKZLPWnJtEejM/a2b+4jME6LoW0sGwsQPQe2YSDrcc5mPm9B3OPjNnM31G3i1FgFTBdMeAMICi+bJOkJsBKNclA2ekMeWFKc7c7eknlTaNCYAzfbbp9Z+k33jjErcv0pmvmMS1iJBQf6huOqULMjJIXC+aySdZ5+me4+wbslMl4eUdLTfLahOOHtGEOYBJqUucAkgSCUzqJOxkSLc9ggN8g60houmKADthoDMTJkfCtudprZKFWA3gIhzY2zXTRRoAOQMPEvMIGhFAnkQ2hoaHom98SxMMem8FQDMGOp4hbS+u+BT4zi0pWQ2gK8qRr/UASm+YXM+w6czDadKycSI+/xCycQTJIwIl+UzZX3Lw6tuGcWS1jfVGLyGtA9DNjQnBhG0v6dZ4ZanABGrWLQHIk7izNCR0LZTXva7RfWaSxBBAqU1NXTdghX8Z64/x/hjrAJwyZQbM8Z2IY85yuuNUNlvRSZPGlte23RaAJGnZ6AJxiQU48jitjImNpIrObCWLqG+7DH4BNlriRP0o0HoASQoNXw1ks3h57RXdtLk4lKM6sOPHtw0gT66aXQMTMDDVIBD/Vl6SvO4iA0rbiIK9sOyfMGt2zEjgWQ9gYHAKrI92hdj4X+sbLQBIzjv7TiJbvzOGDDoNkB4Qs7kQisqPoSa9Skc04nib+0xiJeW1FyBq4wA+w2ZqRrFL1eogMhtSM6tguX+UTs7IAPYOfg3Rsd/tmwM5yVvSfO6dBhHrE5GZ7ZCV+xiOiX+CwedHaPId4LeSbDRXETMIGEbJOgD5ZMLaqAPYyEUQn/SaqWPn5rMzb7Xm2e8rkfJGW6bL6IDjyVoGMgZ4Q17xs7A5IR6qGgVNKDCQjzWrm5p0HZcTZ5XcUS5wnT1jli9fv4UXaC2AvCErA6sRvBY0lSfp7gNNRBZY2Nn/OzQlbRlkOZRsQFqwCOjij9xBslWEL9q7CJ+IzfEFuhNi9hz13qBVgC/SCyKjJ9NJVJL4jPTMe1kdc+eNGjzrASSJ7w9MyXgTKupiYWf+GdMxbN/QFUhOYw5c9EFlNUehe+AkasViDYCBITMx/3MoqXpYU+fS5S7Q1PkivpCTEL8tn+Zl5wfhyzvliMbXobnrKF5TRz/p2X60jqqGk2A06XrHAFRTOJRWfwzFleUodq/r1ki41KhsqFSe4EBl5/8G9h62Q2vPcfCeqZaYnGaDgUN2aOs9Db7z1fwtSatpWWRvzZJlobBlqzeCdp5Og9W2XEOQPqcvMbfoXaBfNgJZVAqDvffb6UeM4w5AzqbZc2wYjU+jpLifNtRokqF77/tollonFB5ZSOVH7+BViIpRd2uVVv9UkSGbtqi2X1jWQwGvrD9Nz8tq2HlN8yd45ktBi9lciSYbrDyTvSuM7uMhamHcAUgS11RBq/Yjk97Bzj9LP1eVJxgIIDkFG+i96jDNh+7eIh20FeygOXPmArTu/pgGHzYUZAFosgfgEOz3lJnb05lpVzY8Tc8bOv4M8xZI7XK7SwAkial6V2TUL7Hz70HPvks6AAkr23Y/A74OZ87Zm1f8KmVRXevj9Dx6kz99pqnrP/S3seMYzY+I9MByLtN9LH4B7CPCzJxWCiAr+wi6hI3oJ1m5PIjcFQCqDXaDsLVP0M09Rt+L9B28Cmk7mVPjDNmwqdRh4mfpiMVW0EKfTUopQCaTEcYlZPdUDAYpzHwbzilATPO8B4oqTtDyCZD9h8jH2q/DxjjV7O8aAFUQyba0fVDXpl8sIkxp6X5QszjvPXMG5l2nnU9OC8ZgcBSj7Dfg5e2O0f0PFLQdWdn496MUiO3pD2heAHlpURvbMGKfp4tD9HPXngsod6bffQCSxAfpXt6VGFS+VaagVBZ+hSMYhiCfaSkqP0EZVN82hEz8GoPESzQ/NbPH4eOeg46+v1Lz9Q8M0bwsNbnh/b3KwlRUTP7dCSDtijL0XAIJya/Q9RPORgJm+57nFV9FUlxis2NS4rJj93wDzQ9eHcgE+tAVhxR6V1NPxHqyuclPOQ9f54rgXaMAro+pVwDcawKgk3HxnQVQ2zgXWLCwHvKKLlIGESAIqwrLlP3IKDtW0MhNwGVrtKoPq2s9p8z/pWQMKvkkGLV0H0Yf+Qnmz4FVa1DW1EbQ8klZ8xduVwAk9ZH/DiA80hXH8IB+mvhPp82/8wDypLLRBwKDD6Is+ZJu7N5z4G2IjVcHq2U1H8I+Kng/1jyfnf8UZRARzysDI4QrE7CsE2zq6tBnyLpjCBQT0mk7z+B1tu+YCGliwmyU9Ar+vowW8DIOB9fcHQCSpP1fOzyx8RVopifAtqtNGbtuSXqIRu+s3KfoOWdweGQqZU9R+VngowuV3R7Ivp+h77xJ3URdqx22pZIvj9SVwJSMMPoVaVMnO0hZ5CuleQs0u0THN4A8iZMCLM1FU3JxzMCQrWXhQLaN8MRAd3fks5kFDp62nIUYtBKAbIDnSV2493A8Lx/TnM3OfO8AKgcvnPzTPA/qObAT7TXhHrALZZDDVWyQ3ECpHiEP9O0D4WWzch1ZujaDpg2OAg3LdHb8DwAA//8DAGoy2SUDSfluAAAAAElFTkSuQmCC</mdui:Logo>
-        <mdui:InformationURL xml:lang="en">http://www.wsl.ch/index_EN</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="de">http://www.wsl.ch/index_DE</mdui:InformationURL>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:IPHint>193.134.200.0/22</mdui:IPHint>
-        <mdui:IPHint>193.134.206.0/24</mdui:IPHint>
-        <mdui:DomainHint>wsl.ch</mdui:DomainHint>
-        <mdui:DomainHint>slf.ch</mdui:DomainHint>
-        <mdui:DomainHint>lfi.ch</mdui:DomainHint>
-        <mdui:GeolocationHint>geo:47.360644,8.454924</mdui:GeolocationHint>
-      </mdui:DiscoHints>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDIDCCAgigAwIBAgIJAPZ97OKnIcuaMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
-BAMTEGFhaS1sb2dvbi53c2wuY2gwHhcNMTQwMTI0MDc0MzM2WhcNMTcwMTIzMDc0
-MzM2WjAbMRkwFwYDVQQDExBhYWktbG9nb24ud3NsLmNoMIIBIjANBgkqhkiG9w0B
-AQEFAAOCAQ8AMIIBCgKCAQEAw/9mnMeICEome9JwsYvR37cByiSK4bRDssG76ARD
-UjXBmxxgr+0RJFQgLtJiELwnJ41UMlY+CtorpReaf090OzqzbcKuDbZijOIi5Hic
-vfptOrRNwnsplNCpAQGzWar4yz9WnLTKrYhu24ysHZnjux3gMxLvqAl7+C21ExgA
-Fu0bp4MUv7L2wVLp3ersTkFs74GXxlv3IpjgO/gjv/rtvN/ACD97pjwZIkeLeByb
-9rqNYr8jSC15Hvq14GFYq2pBNZ+8UfK4tFtX2nhmr2uC9/5IvdGEcp77moi4BQac
-tSaHF09f+AAFe8lHxwpA96kcaWn6rMYwuMu2BpmdOQRzuQIDAQABo2cwZTBEBgNV
-HREEPTA7ghBhYWktbG9nb24ud3NsLmNohidodHRwczovL2FhaS1sb2dvbi53c2wu
-Y2gvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFMSFarXK3mFRGfcZQsVzW7GkO2Fw
-MA0GCSqGSIb3DQEBBQUAA4IBAQAD3Xpnezw9EHK+4iPOarnrZ1m5DLIazLLvefGm
-TM8Ok8HCbTiJppiJtozZ1EpduYwqu+cmzHH96PL4HBJSi3yxjhipGQoUcJbXVKRd
-urS4IDybcHCGP/nQw7oWmnzmPAgt3TQjjqIZ6Bik17V4+YbrLxjVWOIQ5tDB1Rvt
-fd/yHuwao2QOyRuNXE4rPKuSlEJ0z8fXJzBEITbL5dtWvT+F8Z/dDjnIu1f2w6Mq
-wuj/MeTYd+DoM/lKiZ3CADkIsdr4bTon8wmb/adGFG45IPWjNouDPLODwB1stc0x
-QciXFnoeJldeK2oUlQAt7geKp0lMf/2Er+D6VuxBQQjmjXZz
-						</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://aai-logon.wsl.ch:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aai-logon.wsl.ch: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-logon.wsl.ch/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://aai-logon.wsl.ch/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://aai-logon.wsl.ch/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://aai-logon.wsl.ch/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
-    <Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">wsl.ch</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDIDCCAgigAwIBAgIJAPZ97OKnIcuaMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
-BAMTEGFhaS1sb2dvbi53c2wuY2gwHhcNMTQwMTI0MDc0MzM2WhcNMTcwMTIzMDc0
-MzM2WjAbMRkwFwYDVQQDExBhYWktbG9nb24ud3NsLmNoMIIBIjANBgkqhkiG9w0B
-AQEFAAOCAQ8AMIIBCgKCAQEAw/9mnMeICEome9JwsYvR37cByiSK4bRDssG76ARD
-UjXBmxxgr+0RJFQgLtJiELwnJ41UMlY+CtorpReaf090OzqzbcKuDbZijOIi5Hic
-vfptOrRNwnsplNCpAQGzWar4yz9WnLTKrYhu24ysHZnjux3gMxLvqAl7+C21ExgA
-Fu0bp4MUv7L2wVLp3ersTkFs74GXxlv3IpjgO/gjv/rtvN/ACD97pjwZIkeLeByb
-9rqNYr8jSC15Hvq14GFYq2pBNZ+8UfK4tFtX2nhmr2uC9/5IvdGEcp77moi4BQac
-tSaHF09f+AAFe8lHxwpA96kcaWn6rMYwuMu2BpmdOQRzuQIDAQABo2cwZTBEBgNV
-HREEPTA7ghBhYWktbG9nb24ud3NsLmNohidodHRwczovL2FhaS1sb2dvbi53c2wu
-Y2gvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFMSFarXK3mFRGfcZQsVzW7GkO2Fw
-MA0GCSqGSIb3DQEBBQUAA4IBAQAD3Xpnezw9EHK+4iPOarnrZ1m5DLIazLLvefGm
-TM8Ok8HCbTiJppiJtozZ1EpduYwqu+cmzHH96PL4HBJSi3yxjhipGQoUcJbXVKRd
-urS4IDybcHCGP/nQw7oWmnzmPAgt3TQjjqIZ6Bik17V4+YbrLxjVWOIQ5tDB1Rvt
-fd/yHuwao2QOyRuNXE4rPKuSlEJ0z8fXJzBEITbL5dtWvT+F8Z/dDjnIu1f2w6Mq
-wuj/MeTYd+DoM/lKiZ3CADkIsdr4bTon8wmb/adGFG45IPWjNouDPLODwB1stc0x
-QciXFnoeJldeK2oUlQAt7geKp0lMf/2Er+D6VuxBQQjmjXZz
-						</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://aai-logon.wsl.ch:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aai-logon.wsl.ch:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">wsl.ch</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">WSL - Eidg. Forschungsanstalt für Wald, Schnee und Landschaft</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">WSL - Swiss Federal Institute for Forest, Snow and Landscape Research</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.wsl.ch/</OrganizationURL>
-    <OrganizationURL xml:lang="en">http://www.wsl.ch/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Helpdesk</GivenName>
-    <SurName>Support Contact</SurName>
-    <EmailAddress>mailto:helpdesk@wsl.ch</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>AAI</GivenName>
-    <SurName>WSL</SurName>
-    <EmailAddress>mailto:aai@wsl.ch</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/aai-viewer.switch.ch.xml b/swamid-interfederations-2.0/aai-viewer.switch.ch.xml
deleted file mode 100644
index 5fd6438f..00000000
--- a/swamid-interfederations-2.0/aai-viewer.switch.ch.xml
+++ /dev/null
@@ -1,159 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://aai-viewer.switch.ch/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://rr.aai.switch.ch/" registrationInstant="2012-11-28T13:42:36Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.switch.ch/aai/federation/switchaai/metadata-registration-practice-statement-20110711.txt</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </Extensions>
-  <SPSSODescriptor errorURL="http://www.switch.ch/aai/support/help" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
-    <Extensions>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="de">Attributes Viewer</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">AAI Attributes Viewer</mdui:DisplayName>
-        <mdui:Description xml:lang="de">Zeigt zu Test und Informationszwecken alle Attribute eines Benutzers.</mdui:Description>
-        <mdui:Description xml:lang="en">Displays all available attributes of a user for debugging and informational purposes.</mdui:Description>
-        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAACF0RVh0U29mdHdhcmUAR3JhcGhpY0NvbnZlcnRlciAoSW50ZWwpd4f6GQAAAZJJREFUeJyUk08og2Ecx5+SHNSW/DtQlHKg1MhByjIpLRNx0NZKk0kbbSStHXZdHOVP4bCi5swuXNxQLjiN5UBNc1AzbeR936/39zz7c7B/Dt+e31PP9/P8ft/3eRkARpKPnVDuQsjsy1W2kA8skKwM8tEsEH8tG5QDqEZpqZILdgblbB34+igJygG2RrlRWqsXcqi1pwXKdaAoJLehtk99kJa1wkxrupb9OihPl3lBf6kqiPLg3ThER3BVCRDl8/aI4oC0lFhYGOyiG9nTKIAECjqzQZdMmVqnEbBaAfi0gLeaQ6grGrkkIPqexJjFi+E+PSZGTDANGjHQq8dQdz8CPndhY+Q5hjnPPlirGazDBta5CNakrrVmmGybiETj+UegG3cOz8Gap4V6FgSgYRLthhXcP7zkDzH1/cONmjYrP8xNXXZea9Q6dHELOlPwM1pX98BqxoWRpLZep5uHf/cEic9UwceULaZc22LetGj+eCJZ/lOmYBgzwDizAQrw3z+T2x/E1U24bGNGvwAAAP//AwCkGcs+iePLFQAAAABJRU5ErkJggg==</mdui:Logo>
-        <mdui:Logo height="60" width="80">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFAAAAA8CAIAAAB+RarbAAAC0GlDQ1BJQ0NQcm9maWxlAAB4nI2Uz0sUYRjHv7ONGChBYGZ7iKFDSKhMFmVE5a6/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+hkAAAaRSURBVHic7JZpUFNXFMf92A+dsR8ECrQ6Fq2tlVVELVQEZLNaoSwV1FEsy6CMuyJhFRAQQiAJEBCIiCigaAUFFARZlE0EAReoiiCgLGUnJIQktyc8GpKXSPnUzjzefzKZ9+4979z7u/fcc+4StMi05P+ewH8tEpjoIoGJLhKY6CKBiS4SmOgigYkuEpjoIoGJLhKY6CKBia5FDMyZnLpT/Nzl+FXbgykObmw719TopLKe3hHoEolE2bkN9NTy8XGe9Me37zUHUQu7P4pt0EgHqo5EnRUy7qd56CkLteXBo0AovJRZc7f4BdbTNzAenfgwKqEkGn6sUkZKGS3pYRSrlMoqjaAX5z94Ie3mz/Z+WkrZbs/LtgdT7VzZ9m7snPxnXN60xIA/LUjOqCoqb5UnnOTykzKrwLMM8NgEz9krfc2WsF0uKY4elxzg535J35q63opa19gJBtl5jUqavuysGmlfj2rffrb8hBclR/xSehrRl6G+JpnRXuUg2lL0Oh8ep/gCw12xHt7XsZ62t31We1iWzizrPYnmTqyVm4MNdtC270uycmaZOcZFJpTMrphAeJ5e9K1RqJFNrL27GNXBnf2LS7LGjyFup7N4U9MSKj3LqFMhufLAg8McGHfpGm8ZYFjdlZuCi8tbBQKhxLS98y/tbRfcz2RjA8MCw+uHvlFpdyfP3f58tU99eSliqaOSkzJD8UZR2kZ0yw4JhdgmGNsxvHxzsE6hSARbxOXxebzpzu4hLbMLjNRyWBRogR8YY2aFZa/U1wcw2RVDIxyJY5hkes4TNV3/ipo3EmCDn6O9z+cpBDa2Y6rrBcgAw/Js+ZU5OsbFWZ8Nu+PpcwN7rn/2/iv9QL/IfGkD4FfXjzhmswOlrUGjnTIf1zMR7QvUXYW94YBxTtaZRsRcfCjfFRxzD7rGJ3i49o6uQY3NwUlXZp1zuPwN8wEz8MBGtnSIXtzugSBmpI/KmdC8FRuDnrd+lLahJtd4WpqipxHSjSLOAErUQAVukpZ5gCFTiIGTFAAHUAuM7ZmSDZcItjS/5Pnr9n7J64bt0ZSIO/IexiemTOzjVHX9ZYAhXcHuuRy/llfUUv30XW1jR/PLnvc9w9NSEQ7q6hleaxJ+8ESmSCiSNA6M8K/QqIjbK20pqAwRMVTRYNscMF8MfJiieIe1tl1QuMOB1AITxzh5YJy4XP6mnTG/n8x80tQJk5f8IAGVVLZt3hmjrOkrAwzKvd8CWcHQhg5faptH6phH/mASbr47obahQ9p1fNojFR2/4oq5fMgXoJrCXNHU+JwRcDJVURlF+sP5Qrp3RNMsgqYI2D+qwHQBwLDDP9nSVxmG6lqIZ65jESl+mHkGllWGIV/rB+KB0Uz5gS+HRyY/9o3CIamsfQvwkEVhcyQ2E5wpM8d4C6cEKGNYy+PG3qD99ujV5TlHxUdErFVorGuhwDM7HK0opAOphaaO8QsB3riDdjTg1sDgRO/AWG//GPbfNzDW+qYP1gK/w4+ftDe2dPOnhThHUCchMw8OT0g33n3wUlnbDytRsEZ7j988tssCXd2AuEPi7v5mxFAV1DFwruY/w5/a4aDoQghI4MG1Q6KGip2V24C9cmbOsE+4gjM8PDq51V4uSytr+ULuhj6cNTO1HIBh2XCDOR1K17WIgliorn+nph+SwWCgBGVUFwMrgHKdEVsP8YYWDoyFtMKkFRp7/3vjMMi0uHZILlBZvPxmvc2WpTAFwFhZUsMlLbhvrDYKrW2QqSucSf5vnmmmDnHSIY2pvun9CoMgmM2ew+lwbRBn8gJXxNJAzWmIoYKa2PID/2tI0xQB3y9rVdMLyLhZh2uvqn+33CAoPq1SFnjBZamza8h6byKcctdTWYd8bnh4Z3ucybZwZsEqZN1ukPeCZkr0lzr+yw3OQYYXvw+9RqxvEF0FXdsmvnLICS4VRjb0Q/9UdWlBSK/dGhadWCrfBWsNdxuYBlwEYVZwC4KJ7TuSsXZrOOSRrg/DmBmEtJ5V1OlP3LRg3GXrKDLA4gmPcJipFbqWkUpaFGUtP0jFTofTG5q75F1ggqJ14NhVmM1cRqlnirKtUXuRQnswOxH0R2xyuXwXHJn9RzOu5yleWaFQlHuv5TvjMCVNioq2n9I6CgQ5hMOQVJzDfcHz7PWLGdXyn4+N847637Q5kIwHXiQigYkuEpjoIoGJLhKY6CKBiS4SmOgigYkuEpjoIoGJLhKY6CKBia5FB/w3AAAA//8DABFh2N/+esWhAAAAAElFTkSuQmCC</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDLDCCAhSgAwIBAgIJAMFY1Mdz9NHKMA0GCSqGSIb3DQEBBQUAMB8xHTAbBgNV
-BAMTFGFhaS12aWV3ZXIuc3dpdGNoLmNoMB4XDTExMDcyNTExNDkyN1oXDTE0MDcy
-NDExNDkyN1owHzEdMBsGA1UEAxMUYWFpLXZpZXdlci5zd2l0Y2guY2gwggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDTAMxt4JA8xURwcDSfv8orb4luix+4
-bSsn2Vap1V22UZZ/5JLm6OuCqvRHu94zdw03jsFDCfeWD1JGFm0W+vQ4f0PHe3XE
-hnOWY2+kpkXt5N699BtlJC5Usb25l2txWmKwyqNL66MwTh5qpAd+HelpH+WwzMCS
-OGLbe37dRBnORkUMAOrCAtxxXqGd1TCzFipT5GU0As4IqmMkWTx6K+lBwe8+pzZv
-UL8A/+dtrsnUSLZ/Iw5CSyIVniKAzjcru7J/JTBkINd95maSls5g/Dlbur/3Do1e
-wy0PlSEJkas+oTONIufcAv8a6+FNx0umT/U2oHd6+htIyuRFWccTMFx7AgMBAAGj
-azBpMEgGA1UdEQRBMD+CFGFhaS12aWV3ZXIuc3dpdGNoLmNohidodHRwczovL2Fh
-aS12aWV3ZXIuc3dpdGNoLmNoL3NoaWJib2xldGgwHQYDVR0OBBYEFLnVlSgmE86I
-ENpKibTOKkuooKgnMA0GCSqGSIb3DQEBBQUAA4IBAQACmRIU2iF+1qIzdSZw1gC+
-sqsXGgXWk9bkxTK07B/j5H7uVEnBZUdbuj712lRtQd1nlBBQIeCK56wohwMzCXZx
-7bEMtfcQ8pdAvX+ZhpLBmKNS7PtadUeH34rvqa8w98RyXmlUjVZjux1T5qqVHs53
-JtCwqFapEqLiYfoEVC6hAHx/ZpUU1nRH8UJH5K+3GRnzdUgZ77Z+3ImqzM9pif2l
-F+j60QJys1mYvcl0ZxvURuOEixge4yBYtB4Zi3iUqZaXrjgci2jYU3vmvwE0pnbv
-d1JnLxNKVaHsK7hbON4ohIuPa/mSkFHYOChI6vM3iO7mPo5N5H6R8DuH/v+oPV2o
-						</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIFmDCCBICgAwIBAgIUfKxmfUy8KrHcq8mHRCrVpYNJjhkwDQYJKoZIhvcNAQEF
-BQAwazELMAkGA1UEBhMCQk0xGTAXBgNVBAoTEFF1b1ZhZGlzIExpbWl0ZWQxHzAd
-BgNVBAsTFnd3dy5xdW92YWRpc2dsb2JhbC5jb20xIDAeBgNVBAMTF1F1b1ZhZGlz
-IEdsb2JhbCBTU0wgSUNBMB4XDTEyMTExMjEzMjUzNFoXDTE0MTExMjEzMjUzNFow
-gdMxEzARBgsrBgEEAYI3PAIBAxMCQ0gxFTATBgsrBgEEAYI3PAIBAhMEQmVybjEd
-MBsGA1UEDxMUUHJpdmF0ZSBPcmdhbml6YXRpb24xGzAZBgNVBAUTEkNILTAzNS43
-LjAwMS4yNzgtOTELMAkGA1UEBhMCQ0gxEDAOBgNVBAgTB1p1ZXJpY2gxEDAOBgNV
-BAcTB1p1ZXJpY2gxDzANBgNVBAoTBlNXSVRDSDEnMCUGA1UEAxMeYXR0cmlidXRl
-LXZpZXdlci5hYWkuc3dpdGNoLmNoMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
-CgKCAQEA5kUbUOvI58i3QBK/1mk/w+ob9ABfl3zrROcshAH2nyYp3bXB0OUTtWRD
-cD2U/0Is8QW+1mktBoKa+Rw7422hjG2EvfpwHtCKfjamBGQLAzi+1jZKdDw2GMXM
-5j7ZTBCaAh8orfTQojk6+YxQSMR6ynekwNH/Y8H8sVGsoc5ZktTEiAkFFmS1fsvR
-EKa44d9hoE7rqf5LMxc3gACi/c9yxvDreGvd8ZbWt2lq1ti14w4x3HoSAx0iyXmL
-zuRhrxchpb4PspNwSMHODRH/sbVYF6TGapxUEKeS7LrUVmWSZOzN5jdXajHqPlX6
-xsGcyN5YSkaycKg61ZEoCDtGKvw8UwIDAQABo4IByTCCAcUwdAYIKwYBBQUHAQEE
-aDBmMCoGCCsGAQUFBzABhh5odHRwOi8vb2NzcC5xdW92YWRpc2dsb2JhbC5jb20w
-OAYIKwYBBQUHMAKGLGh0dHA6Ly90cnVzdC5xdW92YWRpc2dsb2JhbC5jb20vcXZz
-c2xpY2EuY3J0MFEGA1UdIARKMEgwRgYMKwYBBAG+WAACZAECMDYwNAYIKwYBBQUH
-AgEWKGh0dHA6Ly93d3cucXVvdmFkaXNnbG9iYWwuY29tL3JlcG9zaXRvcnkwUQYD
-VR0RBEowSIIeYXR0cmlidXRlLXZpZXdlci5hYWkuc3dpdGNoLmNoghBhdi5hYWku
-c3dpdGNoLmNoghRhYWktdmlld2VyLnN3aXRjaC5jaDALBgNVHQ8EBAMCBaAwHQYD
-VR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMB8GA1UdIwQYMBaAFDJNoU/q8K6Z
-tu6bByyECBFQi+J+MDsGA1UdHwQ0MDIwMKAuoCyGKmh0dHA6Ly9jcmwucXVvdmFk
-aXNnbG9iYWwuY29tL3F2c3NsaWNhLmNybDAdBgNVHQ4EFgQUhzmwLKgLTsjUgspI
-CynFmJRxteUwDQYJKoZIhvcNAQEFBQADggEBAHtc5+1yEvv4FHPvYHI7QYGOaC8H
-F8hJUoTEl0RLJU/OAXW4zJlwZYCpH3YtLpkvfpau9T67VU6/9XVH32pBR5boAXmx
-AobGZL1Abioful3Bjbe/rnlQ+70lCcpxxNZXV/XUByHV9KOUBGw4cVA1ys6hwCD0
-w0u+mWE7XbF8GQzs0WDn7Qx7T/+h+593He8Bv+YgNKO7asFXy/BpK0TJpyF4iKgJ
-+TwojPuCMW8FCuygXjz1PYykSSyq7EBPv5vHFa+2IE8k8aJAu+KJxJo7cfWEydbN
-/Uxm5UrhF2xgLbva4FuhunvodQMz+eFIo35mq/wjbdzjdexBKQ43G/E1CvI=
-						</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://aai-viewer.switch.ch/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://attribute-viewer.aai.switch.ch/Shibboleth.sso/SAML2/POST" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://av.aai.switch.ch/Shibboleth.sso/SAML2/POST" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://aai-viewer.switch.ch/Shibboleth.sso/SAML2/POST-SimpleSign" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://aai-viewer.switch.ch/Shibboleth.sso/SAML2/Artifact" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://attribute-viewer.aai.switch.ch/Shibboleth.sso/SAML2/Artifact" index="6"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://av.aai.switch.ch/Shibboleth.sso/SAML2/Artifact" index="7"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://aai-viewer.switch.ch/Shibboleth.sso/SAML2/ECP" index="8"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://attribute-viewer.aai.switch.ch/Shibboleth.sso/SAML2/ECP" index="9"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://av.aai.switch.ch/Shibboleth.sso/SAML2/ECP" index="10"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://aai-viewer.switch.ch/Shibboleth.sso/SAML/POST" index="11"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://attribute-viewer.aai.switch.ch/Shibboleth.sso/SAML/POST" index="12"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://av.aai.switch.ch/Shibboleth.sso/SAML/POST" index="13"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://aai-viewer.switch.ch/Shibboleth.sso/SAML/Artifact" index="14"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://attribute-viewer.aai.switch.ch/Shibboleth.sso/SAML/Artifact" index="15"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://av.aai.switch.ch/Shibboleth.sso/SAML/Artifact" index="16"/>
-    <AttributeConsumingService index="1">
-      <ServiceName xml:lang="de">Attributes Viewer</ServiceName>
-      <ServiceName xml:lang="en">AAI Attributes Viewer</ServiceName>
-      <ServiceDescription xml:lang="de">Zeigt zu Test und Informationszwecken alle Attribute eines Benutzers.</ServiceDescription>
-      <ServiceDescription xml:lang="en">Displays all available attributes of a user for debugging and informational purposes.</ServiceDescription>
-      <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" isRequired="true"/>
-      <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="homePostalAddress" Name="urn:oid:0.9.2342.19200300.100.1.39" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <RequestedAttribute FriendlyName="postalAddress" Name="urn:oid:2.5.4.16" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <RequestedAttribute FriendlyName="homePhone" Name="urn:oid:0.9.2342.19200300.100.1.20" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <RequestedAttribute FriendlyName="telephoneNumber" Name="urn:oid:2.5.4.20" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <RequestedAttribute FriendlyName="mobile" Name="urn:oid:0.9.2342.19200300.100.1.41" 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="true"/>
-      <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" isRequired="true"/>
-      <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" isRequired="true"/>
-      <RequestedAttribute FriendlyName="eduPersonEntitlement" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.7" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <RequestedAttribute FriendlyName="surname" Name="urn:oid:2.5.4.4" 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" 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="employeeNumber" Name="urn:oid:2.16.840.1.113730.3.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <RequestedAttribute FriendlyName="ou" Name="urn:oid:2.5.4.11" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <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="eduPersonAssurance" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.11" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <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="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" isRequired="true"/>
-      <RequestedAttribute FriendlyName="primaryGroupID" Name="urn:oid:1.3.6.1.4.1.7165.2.1.15" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <RequestedAttribute FriendlyName="isMemberOf" Name="urn:oid:1.3.6.1.4.1.5923.1.5.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <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" isRequired="true"/>
-      <RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <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" 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="commonName" Name="urn:oid:2.5.4.3" 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"/>
-      <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"/>
-    </AttributeConsumingService>
-  </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>
-    <SurName>Team</SurName>
-    <EmailAddress>mailto:aai@switch.ch</EmailAddress>
-    <TelephoneNumber>+41 44 268 15 05</TelephoneNumber>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>SWITCHaai</GivenName>
-    <SurName>Team</SurName>
-    <EmailAddress>mailto:aai@switch.ch</EmailAddress>
-    <TelephoneNumber>+41 44 268 15 05</TelephoneNumber>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/aai.rz.uni-leipzig.de-idp-shibboleth.xml b/swamid-interfederations-2.0/aai.rz.uni-leipzig.de-idp-shibboleth.xml
deleted file mode 100644
index b729ca97..00000000
--- a/swamid-interfederations-2.0/aai.rz.uni-leipzig.de-idp-shibboleth.xml
+++ /dev/null
@@ -1,144 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://aai.rz.uni-leipzig.de/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2011-08-12T09:14: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-leipzig.de</saml1md:Scope>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">dzb.de</saml1md:Scope>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">ub.uni-leipzig.de</saml1md:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="de">Universität Leipzig</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">University of Leipzig</mdui:DisplayName>
-        <mdui:Description xml:lang="de">IdP der Uni Leipzig</mdui:Description>
-        <mdui:Description xml:lang="en">IdP University of Leipzig</mdui:Description>
-        <mdui:Logo height="37" width="233">https://www.zv.uni-leipzig.de/fileadmin/www.uni-leipzig.de/images/logo.jpg</mdui:Logo>
-        <mdui:InformationURL xml:lang="de">https://www.uni-leipzig.de/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">https://www.uni-leipzig.de/</mdui:InformationURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>aai.rz.uni-leipzig.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=aai.rz.uni-leipzig.de,OU=URZ,O=Universitaet Leipzig,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIF5DCCBMygAwIBAgIEEi6wvTANBgkqhkiG9w0BAQUFADB/MQswCQYDVQQGEwJE
-RTEdMBsGA1UEChMUVW5pdmVyc2l0YWV0IExlaXB6aWcxDDAKBgNVBAsTA1VSWjEg
-MB4GA1UEAxMXVU5JVkVSU0lUQUVUIExFSVBaSUcgQ0ExITAfBgkqhkiG9w0BCQEW
-EnBraUB1bmktbGVpcHppZy5kZTAeFw0xMTA3MDIxNTAzMTBaFw0xNjA2MzAxNTAz
-MTBaMFoxCzAJBgNVBAYTAkRFMR0wGwYDVQQKExRVbml2ZXJzaXRhZXQgTGVpcHpp
-ZzEMMAoGA1UECxMDVVJaMR4wHAYDVQQDExVhYWkucnoudW5pLWxlaXB6aWcuZGUw
-ggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCh3JxzMGQsIZpSBajOsdg1
-PNiVwmvk8u0+BOBiKisnKfwq754g77HeLQN2F322UMxFX/Gd5SQBYJKvrvtFjcCD
-zK3yWmzcuC/6bjka1MVt0NRT3nzgtrRXz63/WQ5wWUZGZuSVeasyEObtI7w35VyN
-ccLHn1NXR3yLOAzaR/5JXFzi/mTZu4u/AvmSJFxaOfChhXEAVy+F7Umrbx1JnVF8
-PSFrvtzXhDkq82sgAYUhuAcdiDLxY+xYKzgEo/NCId3YQcaHm8Ej0jmJIYS7b51Y
-iXMNeluHgSMHjFJhcXmJfQIsUtqz9zGPRLSPhDoJY3ZZ77TM7cpvmWbqI7idmTJa
-myTwPY5q9N4UiGywrchC3fUyjXDdaPLuqSqAaw+WfRxnVIrtpTUiRdNKWrbkbvwL
-4XUMxJ3ZnM7AqHRIIJNLBdjqOFvTgM25lkEjuLsbwWvCp8PAiCzOzXLD393X4gtG
-iVnVVppyCxkSo5BpGeM6oCbgxyEnVVleyGRpmGt+AbsuyyqAU0o/XbFXnV8j+uo2
-FfI7UGVpwI7coC0IHZYhzL3gUZX/plAgXLQD0yvg38II4g/RAUR9IR+bq/YKurEa
-hLp8YYn7t7UBVkDAOLZJ5Bb55yV6IVClnRH1MSG9zxAzJha963b4Ldgl2iTBJxXo
-9hrcueYnTSFzy+aXTZxIPQIDAQABo4IBizCCAYcwCQYDVR0TBAIwADALBgNVHQ8E
-BAMCBPAwEwYDVR0lBAwwCgYIKwYBBQUHAwEwHQYDVR0OBBYEFPM3g5EU6fDFKqWM
-A3R4EgtwDebPMB8GA1UdIwQYMBaAFDaM3R6c0bqQgPinird0ak3JN9oOMH0GA1Ud
-HwR2MHQwOKA2oDSGMmh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvdW5pbGVpLWNhL3B1
-Yi9jcmwvY2FjcmwuY3JsMDigNqA0hjJodHRwOi8vY2RwMi5wY2EuZGZuLmRlL3Vu
-aWxlaS1jYS9wdWIvY3JsL2NhY3JsLmNybDCBmAYIKwYBBQUHAQEEgYswgYgwQgYI
-KwYBBQUHMAKGNmh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvdW5pbGVpLWNhL3B1Yi9j
-YWNlcnQvY2FjZXJ0LmNydDBCBggrBgEFBQcwAoY2aHR0cDovL2NkcDIucGNhLmRm
-bi5kZS91bmlsZWktY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MA0GCSqGSIb3DQEB
-BQUAA4IBAQAvUWGrn9rasTZ53tV7AIwNqlQt+flcJFiPq0/AGEZF9Shk1AHh+7MS
-htDa6ydnZH8wVSUbke+18ie0gTBZFZTGs242OBaS7Qw4cJIo9+wLugtPsYd1whsR
-kuXwvt8/kDEgDLFuw8zF4HtoRmB+cdSAlM3can5H8/DDGnny0Y5LupIEJsN9f6mI
-qK13ds7GZa2qOvOgPp+FxCDBxWBnZyX1SEhjy80q+vZE0LJOxJtW88oKMWEJL+nY
-dR5QRlXFOhmaxQ8kzm0Q/kFV/LAW/wALLNsH6Apvcb6w04QbN3Uw3kjywWkF2Q3b
-dJK6wmgTVaqH2u5BMKaDvRQ5oqgkgvhU
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://aai.rz.uni-leipzig.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aai.rz.uni-leipzig.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://aai.rz.uni-leipzig.de/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://aai.rz.uni-leipzig.de/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://aai.rz.uni-leipzig.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://aai.rz.uni-leipzig.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-leipzig.de</saml1md:Scope>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">dzb.de</saml1md:Scope>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">ub.uni-leipzig.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>aai.rz.uni-leipzig.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=aai.rz.uni-leipzig.de,OU=URZ,O=Universitaet Leipzig,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIF5DCCBMygAwIBAgIEEi6wvTANBgkqhkiG9w0BAQUFADB/MQswCQYDVQQGEwJE
-RTEdMBsGA1UEChMUVW5pdmVyc2l0YWV0IExlaXB6aWcxDDAKBgNVBAsTA1VSWjEg
-MB4GA1UEAxMXVU5JVkVSU0lUQUVUIExFSVBaSUcgQ0ExITAfBgkqhkiG9w0BCQEW
-EnBraUB1bmktbGVpcHppZy5kZTAeFw0xMTA3MDIxNTAzMTBaFw0xNjA2MzAxNTAz
-MTBaMFoxCzAJBgNVBAYTAkRFMR0wGwYDVQQKExRVbml2ZXJzaXRhZXQgTGVpcHpp
-ZzEMMAoGA1UECxMDVVJaMR4wHAYDVQQDExVhYWkucnoudW5pLWxlaXB6aWcuZGUw
-ggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCh3JxzMGQsIZpSBajOsdg1
-PNiVwmvk8u0+BOBiKisnKfwq754g77HeLQN2F322UMxFX/Gd5SQBYJKvrvtFjcCD
-zK3yWmzcuC/6bjka1MVt0NRT3nzgtrRXz63/WQ5wWUZGZuSVeasyEObtI7w35VyN
-ccLHn1NXR3yLOAzaR/5JXFzi/mTZu4u/AvmSJFxaOfChhXEAVy+F7Umrbx1JnVF8
-PSFrvtzXhDkq82sgAYUhuAcdiDLxY+xYKzgEo/NCId3YQcaHm8Ej0jmJIYS7b51Y
-iXMNeluHgSMHjFJhcXmJfQIsUtqz9zGPRLSPhDoJY3ZZ77TM7cpvmWbqI7idmTJa
-myTwPY5q9N4UiGywrchC3fUyjXDdaPLuqSqAaw+WfRxnVIrtpTUiRdNKWrbkbvwL
-4XUMxJ3ZnM7AqHRIIJNLBdjqOFvTgM25lkEjuLsbwWvCp8PAiCzOzXLD393X4gtG
-iVnVVppyCxkSo5BpGeM6oCbgxyEnVVleyGRpmGt+AbsuyyqAU0o/XbFXnV8j+uo2
-FfI7UGVpwI7coC0IHZYhzL3gUZX/plAgXLQD0yvg38II4g/RAUR9IR+bq/YKurEa
-hLp8YYn7t7UBVkDAOLZJ5Bb55yV6IVClnRH1MSG9zxAzJha963b4Ldgl2iTBJxXo
-9hrcueYnTSFzy+aXTZxIPQIDAQABo4IBizCCAYcwCQYDVR0TBAIwADALBgNVHQ8E
-BAMCBPAwEwYDVR0lBAwwCgYIKwYBBQUHAwEwHQYDVR0OBBYEFPM3g5EU6fDFKqWM
-A3R4EgtwDebPMB8GA1UdIwQYMBaAFDaM3R6c0bqQgPinird0ak3JN9oOMH0GA1Ud
-HwR2MHQwOKA2oDSGMmh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvdW5pbGVpLWNhL3B1
-Yi9jcmwvY2FjcmwuY3JsMDigNqA0hjJodHRwOi8vY2RwMi5wY2EuZGZuLmRlL3Vu
-aWxlaS1jYS9wdWIvY3JsL2NhY3JsLmNybDCBmAYIKwYBBQUHAQEEgYswgYgwQgYI
-KwYBBQUHMAKGNmh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvdW5pbGVpLWNhL3B1Yi9j
-YWNlcnQvY2FjZXJ0LmNydDBCBggrBgEFBQcwAoY2aHR0cDovL2NkcDIucGNhLmRm
-bi5kZS91bmlsZWktY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MA0GCSqGSIb3DQEB
-BQUAA4IBAQAvUWGrn9rasTZ53tV7AIwNqlQt+flcJFiPq0/AGEZF9Shk1AHh+7MS
-htDa6ydnZH8wVSUbke+18ie0gTBZFZTGs242OBaS7Qw4cJIo9+wLugtPsYd1whsR
-kuXwvt8/kDEgDLFuw8zF4HtoRmB+cdSAlM3can5H8/DDGnny0Y5LupIEJsN9f6mI
-qK13ds7GZa2qOvOgPp+FxCDBxWBnZyX1SEhjy80q+vZE0LJOxJtW88oKMWEJL+nY
-dR5QRlXFOhmaxQ8kzm0Q/kFV/LAW/wALLNsH6Apvcb6w04QbN3Uw3kjywWkF2Q3b
-dJK6wmgTVaqH2u5BMKaDvRQ5oqgkgvhU
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://aai.rz.uni-leipzig.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aai.rz.uni-leipzig.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">e256</OrganizationName>
-    <OrganizationName xml:lang="en">e256</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">Universität Leipzig</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">University of Leipzig</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">https://www.uni-leipzig.de</OrganizationURL>
-    <OrganizationURL xml:lang="en">https://www.uni-leipzig.de</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Uwe</GivenName>
-    <SurName>Toenjes</SurName>
-    <EmailAddress>mailto:toenjes@rz.uni-leipzig.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="support">
-    <GivenName>Uwe</GivenName>
-    <SurName>Toenjes</SurName>
-    <EmailAddress>mailto:toenjes@rz.uni-leipzig.de</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/aai.rz.uni-leipzig.de.xml b/swamid-interfederations-2.0/aai.rz.uni-leipzig.de.xml
deleted file mode 100644
index b729ca97..00000000
--- a/swamid-interfederations-2.0/aai.rz.uni-leipzig.de.xml
+++ /dev/null
@@ -1,144 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://aai.rz.uni-leipzig.de/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2011-08-12T09:14: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-leipzig.de</saml1md:Scope>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">dzb.de</saml1md:Scope>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">ub.uni-leipzig.de</saml1md:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="de">Universität Leipzig</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">University of Leipzig</mdui:DisplayName>
-        <mdui:Description xml:lang="de">IdP der Uni Leipzig</mdui:Description>
-        <mdui:Description xml:lang="en">IdP University of Leipzig</mdui:Description>
-        <mdui:Logo height="37" width="233">https://www.zv.uni-leipzig.de/fileadmin/www.uni-leipzig.de/images/logo.jpg</mdui:Logo>
-        <mdui:InformationURL xml:lang="de">https://www.uni-leipzig.de/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">https://www.uni-leipzig.de/</mdui:InformationURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>aai.rz.uni-leipzig.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=aai.rz.uni-leipzig.de,OU=URZ,O=Universitaet Leipzig,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIF5DCCBMygAwIBAgIEEi6wvTANBgkqhkiG9w0BAQUFADB/MQswCQYDVQQGEwJE
-RTEdMBsGA1UEChMUVW5pdmVyc2l0YWV0IExlaXB6aWcxDDAKBgNVBAsTA1VSWjEg
-MB4GA1UEAxMXVU5JVkVSU0lUQUVUIExFSVBaSUcgQ0ExITAfBgkqhkiG9w0BCQEW
-EnBraUB1bmktbGVpcHppZy5kZTAeFw0xMTA3MDIxNTAzMTBaFw0xNjA2MzAxNTAz
-MTBaMFoxCzAJBgNVBAYTAkRFMR0wGwYDVQQKExRVbml2ZXJzaXRhZXQgTGVpcHpp
-ZzEMMAoGA1UECxMDVVJaMR4wHAYDVQQDExVhYWkucnoudW5pLWxlaXB6aWcuZGUw
-ggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCh3JxzMGQsIZpSBajOsdg1
-PNiVwmvk8u0+BOBiKisnKfwq754g77HeLQN2F322UMxFX/Gd5SQBYJKvrvtFjcCD
-zK3yWmzcuC/6bjka1MVt0NRT3nzgtrRXz63/WQ5wWUZGZuSVeasyEObtI7w35VyN
-ccLHn1NXR3yLOAzaR/5JXFzi/mTZu4u/AvmSJFxaOfChhXEAVy+F7Umrbx1JnVF8
-PSFrvtzXhDkq82sgAYUhuAcdiDLxY+xYKzgEo/NCId3YQcaHm8Ej0jmJIYS7b51Y
-iXMNeluHgSMHjFJhcXmJfQIsUtqz9zGPRLSPhDoJY3ZZ77TM7cpvmWbqI7idmTJa
-myTwPY5q9N4UiGywrchC3fUyjXDdaPLuqSqAaw+WfRxnVIrtpTUiRdNKWrbkbvwL
-4XUMxJ3ZnM7AqHRIIJNLBdjqOFvTgM25lkEjuLsbwWvCp8PAiCzOzXLD393X4gtG
-iVnVVppyCxkSo5BpGeM6oCbgxyEnVVleyGRpmGt+AbsuyyqAU0o/XbFXnV8j+uo2
-FfI7UGVpwI7coC0IHZYhzL3gUZX/plAgXLQD0yvg38II4g/RAUR9IR+bq/YKurEa
-hLp8YYn7t7UBVkDAOLZJ5Bb55yV6IVClnRH1MSG9zxAzJha963b4Ldgl2iTBJxXo
-9hrcueYnTSFzy+aXTZxIPQIDAQABo4IBizCCAYcwCQYDVR0TBAIwADALBgNVHQ8E
-BAMCBPAwEwYDVR0lBAwwCgYIKwYBBQUHAwEwHQYDVR0OBBYEFPM3g5EU6fDFKqWM
-A3R4EgtwDebPMB8GA1UdIwQYMBaAFDaM3R6c0bqQgPinird0ak3JN9oOMH0GA1Ud
-HwR2MHQwOKA2oDSGMmh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvdW5pbGVpLWNhL3B1
-Yi9jcmwvY2FjcmwuY3JsMDigNqA0hjJodHRwOi8vY2RwMi5wY2EuZGZuLmRlL3Vu
-aWxlaS1jYS9wdWIvY3JsL2NhY3JsLmNybDCBmAYIKwYBBQUHAQEEgYswgYgwQgYI
-KwYBBQUHMAKGNmh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvdW5pbGVpLWNhL3B1Yi9j
-YWNlcnQvY2FjZXJ0LmNydDBCBggrBgEFBQcwAoY2aHR0cDovL2NkcDIucGNhLmRm
-bi5kZS91bmlsZWktY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MA0GCSqGSIb3DQEB
-BQUAA4IBAQAvUWGrn9rasTZ53tV7AIwNqlQt+flcJFiPq0/AGEZF9Shk1AHh+7MS
-htDa6ydnZH8wVSUbke+18ie0gTBZFZTGs242OBaS7Qw4cJIo9+wLugtPsYd1whsR
-kuXwvt8/kDEgDLFuw8zF4HtoRmB+cdSAlM3can5H8/DDGnny0Y5LupIEJsN9f6mI
-qK13ds7GZa2qOvOgPp+FxCDBxWBnZyX1SEhjy80q+vZE0LJOxJtW88oKMWEJL+nY
-dR5QRlXFOhmaxQ8kzm0Q/kFV/LAW/wALLNsH6Apvcb6w04QbN3Uw3kjywWkF2Q3b
-dJK6wmgTVaqH2u5BMKaDvRQ5oqgkgvhU
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://aai.rz.uni-leipzig.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aai.rz.uni-leipzig.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://aai.rz.uni-leipzig.de/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://aai.rz.uni-leipzig.de/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://aai.rz.uni-leipzig.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://aai.rz.uni-leipzig.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-leipzig.de</saml1md:Scope>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">dzb.de</saml1md:Scope>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">ub.uni-leipzig.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>aai.rz.uni-leipzig.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=aai.rz.uni-leipzig.de,OU=URZ,O=Universitaet Leipzig,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIF5DCCBMygAwIBAgIEEi6wvTANBgkqhkiG9w0BAQUFADB/MQswCQYDVQQGEwJE
-RTEdMBsGA1UEChMUVW5pdmVyc2l0YWV0IExlaXB6aWcxDDAKBgNVBAsTA1VSWjEg
-MB4GA1UEAxMXVU5JVkVSU0lUQUVUIExFSVBaSUcgQ0ExITAfBgkqhkiG9w0BCQEW
-EnBraUB1bmktbGVpcHppZy5kZTAeFw0xMTA3MDIxNTAzMTBaFw0xNjA2MzAxNTAz
-MTBaMFoxCzAJBgNVBAYTAkRFMR0wGwYDVQQKExRVbml2ZXJzaXRhZXQgTGVpcHpp
-ZzEMMAoGA1UECxMDVVJaMR4wHAYDVQQDExVhYWkucnoudW5pLWxlaXB6aWcuZGUw
-ggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCh3JxzMGQsIZpSBajOsdg1
-PNiVwmvk8u0+BOBiKisnKfwq754g77HeLQN2F322UMxFX/Gd5SQBYJKvrvtFjcCD
-zK3yWmzcuC/6bjka1MVt0NRT3nzgtrRXz63/WQ5wWUZGZuSVeasyEObtI7w35VyN
-ccLHn1NXR3yLOAzaR/5JXFzi/mTZu4u/AvmSJFxaOfChhXEAVy+F7Umrbx1JnVF8
-PSFrvtzXhDkq82sgAYUhuAcdiDLxY+xYKzgEo/NCId3YQcaHm8Ej0jmJIYS7b51Y
-iXMNeluHgSMHjFJhcXmJfQIsUtqz9zGPRLSPhDoJY3ZZ77TM7cpvmWbqI7idmTJa
-myTwPY5q9N4UiGywrchC3fUyjXDdaPLuqSqAaw+WfRxnVIrtpTUiRdNKWrbkbvwL
-4XUMxJ3ZnM7AqHRIIJNLBdjqOFvTgM25lkEjuLsbwWvCp8PAiCzOzXLD393X4gtG
-iVnVVppyCxkSo5BpGeM6oCbgxyEnVVleyGRpmGt+AbsuyyqAU0o/XbFXnV8j+uo2
-FfI7UGVpwI7coC0IHZYhzL3gUZX/plAgXLQD0yvg38II4g/RAUR9IR+bq/YKurEa
-hLp8YYn7t7UBVkDAOLZJ5Bb55yV6IVClnRH1MSG9zxAzJha963b4Ldgl2iTBJxXo
-9hrcueYnTSFzy+aXTZxIPQIDAQABo4IBizCCAYcwCQYDVR0TBAIwADALBgNVHQ8E
-BAMCBPAwEwYDVR0lBAwwCgYIKwYBBQUHAwEwHQYDVR0OBBYEFPM3g5EU6fDFKqWM
-A3R4EgtwDebPMB8GA1UdIwQYMBaAFDaM3R6c0bqQgPinird0ak3JN9oOMH0GA1Ud
-HwR2MHQwOKA2oDSGMmh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvdW5pbGVpLWNhL3B1
-Yi9jcmwvY2FjcmwuY3JsMDigNqA0hjJodHRwOi8vY2RwMi5wY2EuZGZuLmRlL3Vu
-aWxlaS1jYS9wdWIvY3JsL2NhY3JsLmNybDCBmAYIKwYBBQUHAQEEgYswgYgwQgYI
-KwYBBQUHMAKGNmh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvdW5pbGVpLWNhL3B1Yi9j
-YWNlcnQvY2FjZXJ0LmNydDBCBggrBgEFBQcwAoY2aHR0cDovL2NkcDIucGNhLmRm
-bi5kZS91bmlsZWktY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MA0GCSqGSIb3DQEB
-BQUAA4IBAQAvUWGrn9rasTZ53tV7AIwNqlQt+flcJFiPq0/AGEZF9Shk1AHh+7MS
-htDa6ydnZH8wVSUbke+18ie0gTBZFZTGs242OBaS7Qw4cJIo9+wLugtPsYd1whsR
-kuXwvt8/kDEgDLFuw8zF4HtoRmB+cdSAlM3can5H8/DDGnny0Y5LupIEJsN9f6mI
-qK13ds7GZa2qOvOgPp+FxCDBxWBnZyX1SEhjy80q+vZE0LJOxJtW88oKMWEJL+nY
-dR5QRlXFOhmaxQ8kzm0Q/kFV/LAW/wALLNsH6Apvcb6w04QbN3Uw3kjywWkF2Q3b
-dJK6wmgTVaqH2u5BMKaDvRQ5oqgkgvhU
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://aai.rz.uni-leipzig.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aai.rz.uni-leipzig.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">e256</OrganizationName>
-    <OrganizationName xml:lang="en">e256</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">Universität Leipzig</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">University of Leipzig</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">https://www.uni-leipzig.de</OrganizationURL>
-    <OrganizationURL xml:lang="en">https://www.uni-leipzig.de</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Uwe</GivenName>
-    <SurName>Toenjes</SurName>
-    <EmailAddress>mailto:toenjes@rz.uni-leipzig.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="support">
-    <GivenName>Uwe</GivenName>
-    <SurName>Toenjes</SurName>
-    <EmailAddress>mailto:toenjes@rz.uni-leipzig.de</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/aai.sztaki.hu-idp.xml b/swamid-interfederations-2.0/aai.sztaki.hu-idp.xml
deleted file mode 100644
index 20e89a30..00000000
--- a/swamid-interfederations-2.0/aai.sztaki.hu-idp.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://aai.sztaki.hu/idp">
-  <Extensions>
-    <ns9:MetadataSet xmlns:ns9="urn:geant:niif.hu:eduid.hu:entity-attributes:processing-info">sztaki</ns9:MetadataSet>
-    <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">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">
-    <Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sztaki.hu</shibmd:Scope>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-        <mdui:IPHint>195.111.0.0/22</mdui:IPHint>
-        <mdui:IPHint>193.225.86.0/23</mdui:IPHint>
-        <mdui:GeolocationHint>geo:47.518209,19.055844</mdui:GeolocationHint>
-      </mdui:DiscoHints>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-        <mdui:DisplayName xml:lang="hu">MTA SZTAKI - Magyar Tudományos Akadémia Számítástechnikai és Automatizálási Kutatóintézet</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Computer and Automation Research Institute, Hungarian Academy of Sciences</mdui:DisplayName>
-        <mdui:Description xml:lang="hu">MTA SZTAKI</mdui:Description>
-        <mdui:Description xml:lang="en">MTA SZTAKI</mdui:Description>
-        <mdui:Logo height="58" width="150">https://aai.sztaki.hu/logo/sztaki.png</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDwDCCAymgAwIBAgIBTzANBgkqhkiG9w0BAQQFADCBmzELMAkGA1UEBhMCSFUxETAPBgNVBAgTCEJ1ZGFwZXN0MREwDwYDVQQHEwhCdWRhcGVzdDETMBEGA1UEChMKTVRBIFNaVEFLSTENMAsGA1UECxMESVRBSzEeMBwGA1UEAxMVQ2VydGlmaWNhdGUgQXV0aG9yaXR5MSIwIAYJKoZIhvcNAQkBFhNzeXMtYWRtaW5Ac3p0YWtpLmh1MB4XDTA5MDgyNjEwMTc1M1oXDTE5MDgyNDEwMTc1M1owgYQxCzAJBgNVBAYTAkhVMREwDwYDVQQIEwhCdWRhcGVzdDETMBEGA1UEChMKTVRBIFNaVEFLSTENMAsGA1UECxMESVRBSzEaMBgGA1UEAxMRYWFpLnN6dGFraS5odS1pZHAxIjAgBgkqhkiG9w0BCQEWE3N5cy1hZG1pbkBzenRha2kuaHUwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAOwYmjlZUiD3pG0R6EZuRHgBYNt5NfpjEDQkeGoGnD0o1LWse4/7Hmf8JoZDKRRkEFuZ0C1S20wxEnOsSK4lsftRpApaibVnAlFpmv04Y5FbAAt2G2cQjEy1L0z1Ks+iLXSZ1c3XDTBknRReUZweIndfB1Y35OEE2yUACiHKlzuPAgMBAAGjggEnMIIBIzAJBgNVHRMEAjAAMCwGCWCGSAGG+EIBDQQfFh1PcGVuU1NMIEdlbmVyYXRlZCBDZXJ0aWZpY2F0ZTAdBgNVHQ4EFgQUMdY3+6/zwEDnlpoSr0DJ5cG5rm4wgcgGA1UdIwSBwDCBvYAUGR0qvyO4kXX/r2cF74rzd2gIsruhgaGkgZ4wgZsxCzAJBgNVBAYTAkhVMREwDwYDVQQIEwhCdWRhcGVzdDERMA8GA1UEBxMIQnVkYXBlc3QxEzARBgNVBAoTCk1UQSBTWlRBS0kxDTALBgNVBAsTBElUQUsxHjAcBgNVBAMTFUNlcnRpZmljYXRlIEF1dGhvcml0eTEiMCAGCSqGSIb3DQEJARYTc3lzLWFkbWluQHN6dGFraS5odYIBADANBgkqhkiG9w0BAQQFAAOBgQAHI9LPaySa8/kmI6y+1z3xKh0xlyHgxY5zTq8QgV03wBz9rRVu9qewfB4lEp0opGxQGx9r9Gck/XXoekYImjsNXOkQ4vXztLQToWCJZQEe2c8c6xfGM+QZG4wNR4yq++DK7LcttW4ZI0A91UoeipNYFqY8K7N9kWsLp7pTGtZEWQ==</ds:X509Certificate>
-        </ds:X509Data>
-        <ds:KeyName>aai.sztaki.hu-idp</ds:KeyName>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://aai.sztaki.hu/idp/saml2/idp/SingleLogoutServiceiFrame.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://aai.sztaki.hu/idp/saml2/idp/SSOService.php"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="hu">MTA SZTAKI - Magyar Tudományos Akadémia Számítástechnikai és Automatizálási Kutatóintézet</OrganizationName>
-    <OrganizationName xml:lang="en">Computer and Automation Research Institute, Hungarian Academy of Sciences</OrganizationName>
-    <OrganizationDisplayName xml:lang="hu">MTA SZTAKI</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">MTA SZTAKI</OrganizationDisplayName>
-    <OrganizationURL xml:lang="hu">https://aai.sztaki.hu</OrganizationURL>
-    <OrganizationURL xml:lang="en">https://aai.sztaki.hu</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>AAI Administrator Team</SurName>
-    <EmailAddress>mailto:aai@sztaki.hu</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="support">
-    <SurName>AAI Administrator Team</SurName>
-    <EmailAddress>mailto:aai@sztaki.hu</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="administrative">
-    <SurName>AAI Administrator Team</SurName>
-    <EmailAddress>mailto:aai@sztaki.hu</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/aai.sztaki.hu.xml b/swamid-interfederations-2.0/aai.sztaki.hu.xml
deleted file mode 100644
index 20e89a30..00000000
--- a/swamid-interfederations-2.0/aai.sztaki.hu.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://aai.sztaki.hu/idp">
-  <Extensions>
-    <ns9:MetadataSet xmlns:ns9="urn:geant:niif.hu:eduid.hu:entity-attributes:processing-info">sztaki</ns9:MetadataSet>
-    <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">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">
-    <Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sztaki.hu</shibmd:Scope>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-        <mdui:IPHint>195.111.0.0/22</mdui:IPHint>
-        <mdui:IPHint>193.225.86.0/23</mdui:IPHint>
-        <mdui:GeolocationHint>geo:47.518209,19.055844</mdui:GeolocationHint>
-      </mdui:DiscoHints>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-        <mdui:DisplayName xml:lang="hu">MTA SZTAKI - Magyar Tudományos Akadémia Számítástechnikai és Automatizálási Kutatóintézet</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Computer and Automation Research Institute, Hungarian Academy of Sciences</mdui:DisplayName>
-        <mdui:Description xml:lang="hu">MTA SZTAKI</mdui:Description>
-        <mdui:Description xml:lang="en">MTA SZTAKI</mdui:Description>
-        <mdui:Logo height="58" width="150">https://aai.sztaki.hu/logo/sztaki.png</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDwDCCAymgAwIBAgIBTzANBgkqhkiG9w0BAQQFADCBmzELMAkGA1UEBhMCSFUxETAPBgNVBAgTCEJ1ZGFwZXN0MREwDwYDVQQHEwhCdWRhcGVzdDETMBEGA1UEChMKTVRBIFNaVEFLSTENMAsGA1UECxMESVRBSzEeMBwGA1UEAxMVQ2VydGlmaWNhdGUgQXV0aG9yaXR5MSIwIAYJKoZIhvcNAQkBFhNzeXMtYWRtaW5Ac3p0YWtpLmh1MB4XDTA5MDgyNjEwMTc1M1oXDTE5MDgyNDEwMTc1M1owgYQxCzAJBgNVBAYTAkhVMREwDwYDVQQIEwhCdWRhcGVzdDETMBEGA1UEChMKTVRBIFNaVEFLSTENMAsGA1UECxMESVRBSzEaMBgGA1UEAxMRYWFpLnN6dGFraS5odS1pZHAxIjAgBgkqhkiG9w0BCQEWE3N5cy1hZG1pbkBzenRha2kuaHUwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAOwYmjlZUiD3pG0R6EZuRHgBYNt5NfpjEDQkeGoGnD0o1LWse4/7Hmf8JoZDKRRkEFuZ0C1S20wxEnOsSK4lsftRpApaibVnAlFpmv04Y5FbAAt2G2cQjEy1L0z1Ks+iLXSZ1c3XDTBknRReUZweIndfB1Y35OEE2yUACiHKlzuPAgMBAAGjggEnMIIBIzAJBgNVHRMEAjAAMCwGCWCGSAGG+EIBDQQfFh1PcGVuU1NMIEdlbmVyYXRlZCBDZXJ0aWZpY2F0ZTAdBgNVHQ4EFgQUMdY3+6/zwEDnlpoSr0DJ5cG5rm4wgcgGA1UdIwSBwDCBvYAUGR0qvyO4kXX/r2cF74rzd2gIsruhgaGkgZ4wgZsxCzAJBgNVBAYTAkhVMREwDwYDVQQIEwhCdWRhcGVzdDERMA8GA1UEBxMIQnVkYXBlc3QxEzARBgNVBAoTCk1UQSBTWlRBS0kxDTALBgNVBAsTBElUQUsxHjAcBgNVBAMTFUNlcnRpZmljYXRlIEF1dGhvcml0eTEiMCAGCSqGSIb3DQEJARYTc3lzLWFkbWluQHN6dGFraS5odYIBADANBgkqhkiG9w0BAQQFAAOBgQAHI9LPaySa8/kmI6y+1z3xKh0xlyHgxY5zTq8QgV03wBz9rRVu9qewfB4lEp0opGxQGx9r9Gck/XXoekYImjsNXOkQ4vXztLQToWCJZQEe2c8c6xfGM+QZG4wNR4yq++DK7LcttW4ZI0A91UoeipNYFqY8K7N9kWsLp7pTGtZEWQ==</ds:X509Certificate>
-        </ds:X509Data>
-        <ds:KeyName>aai.sztaki.hu-idp</ds:KeyName>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://aai.sztaki.hu/idp/saml2/idp/SingleLogoutServiceiFrame.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://aai.sztaki.hu/idp/saml2/idp/SSOService.php"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="hu">MTA SZTAKI - Magyar Tudományos Akadémia Számítástechnikai és Automatizálási Kutatóintézet</OrganizationName>
-    <OrganizationName xml:lang="en">Computer and Automation Research Institute, Hungarian Academy of Sciences</OrganizationName>
-    <OrganizationDisplayName xml:lang="hu">MTA SZTAKI</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">MTA SZTAKI</OrganizationDisplayName>
-    <OrganizationURL xml:lang="hu">https://aai.sztaki.hu</OrganizationURL>
-    <OrganizationURL xml:lang="en">https://aai.sztaki.hu</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>AAI Administrator Team</SurName>
-    <EmailAddress>mailto:aai@sztaki.hu</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="support">
-    <SurName>AAI Administrator Team</SurName>
-    <EmailAddress>mailto:aai@sztaki.hu</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="administrative">
-    <SurName>AAI Administrator Team</SurName>
-    <EmailAddress>mailto:aai@sztaki.hu</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/aai.unifr.ch-idp-shibboleth.xml b/swamid-interfederations-2.0/aai.unifr.ch-idp-shibboleth.xml
deleted file mode 100644
index 38f85741..00000000
--- a/swamid-interfederations-2.0/aai.unifr.ch-idp-shibboleth.xml
+++ /dev/null
@@ -1,125 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://aai.unifr.ch/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://rr.aai.switch.ch/" registrationInstant="2014-10-10T12:32:07Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.switch.ch/aai/federation/switchaai/metadata-registration-practice-statement-20110711.txt</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-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </Extensions>
-  <IDPSSODescriptor errorURL="http://www.unifr.ch/aai" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-    <Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unifr.ch</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="de">Universität Freiburg</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">University of Fribourg</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="fr">Université de Fribourg</mdui:DisplayName>
-        <mdui:Description xml:lang="de">Universität Freiburg</mdui:Description>
-        <mdui:Description xml:lang="en">University of Fribourg</mdui:Description>
-        <mdui:Description xml:lang="fr">Université de Fribourg</mdui:Description>
-        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAAZiS0dEAP8A/wD/oL2nkwAAAAlwSFlzAAALEwAACxMBAJqcGAAAAAd0SU1FB90KHwg5DseRCzwAAAIaSURBVDjLlZO9T1NRGMZ/595akF5bWuQjNrJgIguJizUEk+pIY4gkEP4L3FkM/AFCZWkZSJjLKh8TGCQgTCQyyGolBIwkeNvKxz2PQ0OlGg08yZlO3t85z/u+j7HWyhjDTSSJyxrHGMPOzg75fI7Dw0Oy2Tf4vs/i4hIrK6v4/g+mp99yfn7B/HyBhYV31D0oSVNTU0okEtra+ihAxeIXjYwMKxy+pXw+J2NQqVRSKvVYAwMvJEnWWkmSAxAKhWhqaiQS8QiHXYxx8DyP7u6HTEyM09p6FzA0NzcTjcbq7DgAqdQTQAwOvqSn5xGxWAxrRSaTYWxsDGvBGHAcF9d16xsSBIEkyfd97e9/1dnZmSTp5ORElUpFklQsFhUEgQ4ODnR0dKQgCGoWQo7jsLa2xvj4a6LRKNbC7OwsMzN51tc/4Hl3GB19RTKZpK2tDWstAMYYJFUtHB9/Z2Njg97eXvr7M8TjCXZ3P+F5HpVKmWx28rdnx6kVG2OqAKk620KhwPLyEsZAKOSyubnJ9vY2Q0PDNYAxpnYAQgAtLS2k08+Ym5sjHk8A0NX1gL6+pwRBwOrq+zrIVRlrpXK5hO/7nJ6eIomOjg4aGhr+2r7LH/x5oVwup0jktjo77yuZvKe9vc+6rhwA162SHccAwhhdOxchgHL5J75fRvqGtQEXFzcEpNPPyWYnaWxsQhLt7e3XBph/xflqZP+nX5gqPWD6ar6SAAAAAElFTkSuQmCC</mdui:Logo>
-        <mdui:Logo height="60" width="90">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFoAAAA8CAYAAADmBa1FAAAKT2lDQ1BQaG90b3Nob3AgSUNDIHByb2ZpbGUAAHjanVNnVFPpFj333vRCS4iAlEtvUhUIIFJCi4AUkSYqIQkQSoghodkVUcERRUUEG8igiAOOjoCMFVEsDIoK2AfkIaKOg6OIisr74Xuja9a89+bN/rXXPues852zzwfACAyWSDNRNYAMqUIeEeCDx8TG4eQuQIEKJHAAEAizZCFz/SMBAPh+PDwrIsAHvgABeNMLCADATZvAMByH/w/qQplcAYCEAcB0kThLCIAUAEB6jkKmAEBGAYCdmCZTAKAEAGDLY2LjAFAtAGAnf+bTAICd+Jl7AQBblCEVAaCRACATZYhEAGg7AKzPVopFAFgwABRmS8Q5ANgtADBJV2ZIALC3AMDOEAuyAAgMADBRiIUpAAR7AGDIIyN4AISZABRG8lc88SuuEOcqAAB4mbI8uSQ5RYFbCC1xB1dXLh4ozkkXKxQ2YQJhmkAuwnmZGTKBNA/g88wAAKCRFRHgg/P9eM4Ors7ONo62Dl8t6r8G/yJiYuP+5c+rcEAAAOF0ftH+LC+zGoA7BoBt/qIl7gRoXgugdfeLZrIPQLUAoOnaV/Nw+H48PEWhkLnZ2eXk5NhKxEJbYcpXff5nwl/AV/1s+X48/Pf14L7iJIEyXYFHBPjgwsz0TKUcz5IJhGLc5o9H/LcL//wd0yLESWK5WCoU41EScY5EmozzMqUiiUKSKcUl0v9k4t8s+wM+3zUAsGo+AXuRLahdYwP2SycQWHTA4vcAAPK7b8HUKAgDgGiD4c93/+8//UegJQCAZkmScQAAXkQkLlTKsz/HCAAARKCBKrBBG/TBGCzABhzBBdzBC/xgNoRCJMTCQhBCCmSAHHJgKayCQiiGzbAdKmAv1EAdNMBRaIaTcA4uwlW4Dj1wD/phCJ7BKLyBCQRByAgTYSHaiAFiilgjjggXmYX4IcFIBBKLJCDJiBRRIkuRNUgxUopUIFVIHfI9cgI5h1xGupE7yAAygvyGvEcxlIGyUT3UDLVDuag3GoRGogvQZHQxmo8WoJvQcrQaPYw2oefQq2gP2o8+Q8cwwOgYBzPEbDAuxsNCsTgsCZNjy7EirAyrxhqwVqwDu4n1Y8+xdwQSgUXACTYEd0IgYR5BSFhMWE7YSKggHCQ0EdoJNwkDhFHCJyKTqEu0JroR+cQYYjIxh1hILCPWEo8TLxB7iEPENyQSiUMyJ7mQAkmxpFTSEtJG0m5SI+ksqZs0SBojk8naZGuyBzmULCAryIXkneTD5DPkG+Qh8lsKnWJAcaT4U+IoUspqShnlEOU05QZlmDJBVaOaUt2ooVQRNY9aQq2htlKvUYeoEzR1mjnNgxZJS6WtopXTGmgXaPdpr+h0uhHdlR5Ol9BX0svpR+iX6AP0dwwNhhWDx4hnKBmbGAcYZxl3GK+YTKYZ04sZx1QwNzHrmOeZD5lvVVgqtip8FZHKCpVKlSaVGyovVKmqpqreqgtV81XLVI+pXlN9rkZVM1PjqQnUlqtVqp1Q61MbU2epO6iHqmeob1Q/pH5Z/YkGWcNMw09DpFGgsV/jvMYgC2MZs3gsIWsNq4Z1gTXEJrHN2Xx2KruY/R27iz2qqaE5QzNKM1ezUvOUZj8H45hx+Jx0TgnnKKeX836K3hTvKeIpG6Y0TLkxZVxrqpaXllirSKtRq0frvTau7aedpr1Fu1n7gQ5Bx0onXCdHZ4/OBZ3nU9lT3acKpxZNPTr1ri6qa6UbobtEd79up+6Ynr5egJ5Mb6feeb3n+hx9L/1U/W36p/VHDFgGswwkBtsMzhg8xTVxbzwdL8fb8VFDXcNAQ6VhlWGX4YSRudE8o9VGjUYPjGnGXOMk423GbcajJgYmISZLTepN7ppSTbmmKaY7TDtMx83MzaLN1pk1mz0x1zLnm+eb15vft2BaeFostqi2uGVJsuRaplnutrxuhVo5WaVYVVpds0atna0l1rutu6cRp7lOk06rntZnw7Dxtsm2qbcZsOXYBtuutm22fWFnYhdnt8Wuw+6TvZN9un2N/T0HDYfZDqsdWh1+c7RyFDpWOt6azpzuP33F9JbpL2dYzxDP2DPjthPLKcRpnVOb00dnF2e5c4PziIuJS4LLLpc+Lpsbxt3IveRKdPVxXeF60vWdm7Obwu2o26/uNu5p7ofcn8w0nymeWTNz0MPIQ+BR5dE/C5+VMGvfrH5PQ0+BZ7XnIy9jL5FXrdewt6V3qvdh7xc+9j5yn+M+4zw33jLeWV/MN8C3yLfLT8Nvnl+F30N/I/9k/3r/0QCngCUBZwOJgUGBWwL7+Hp8Ib+OPzrbZfay2e1BjKC5QRVBj4KtguXBrSFoyOyQrSH355jOkc5pDoVQfujW0Adh5mGLw34MJ4WHhVeGP45wiFga0TGXNXfR3ENz30T6RJZE3ptnMU85ry1KNSo+qi5qPNo3ujS6P8YuZlnM1VidWElsSxw5LiquNm5svt/87fOH4p3iC+N7F5gvyF1weaHOwvSFpxapLhIsOpZATIhOOJTwQRAqqBaMJfITdyWOCnnCHcJnIi/RNtGI2ENcKh5O8kgqTXqS7JG8NXkkxTOlLOW5hCepkLxMDUzdmzqeFpp2IG0yPTq9MYOSkZBxQqohTZO2Z+pn5mZ2y6xlhbL+xW6Lty8elQfJa7OQrAVZLQq2QqboVFoo1yoHsmdlV2a/zYnKOZarnivN7cyzytuQN5zvn//tEsIS4ZK2pYZLVy0dWOa9rGo5sjxxedsK4xUFK4ZWBqw8uIq2Km3VT6vtV5eufr0mek1rgV7ByoLBtQFr6wtVCuWFfevc1+1dT1gvWd+1YfqGnRs+FYmKrhTbF5cVf9go3HjlG4dvyr+Z3JS0qavEuWTPZtJm6ebeLZ5bDpaql+aXDm4N2dq0Dd9WtO319kXbL5fNKNu7g7ZDuaO/PLi8ZafJzs07P1SkVPRU+lQ27tLdtWHX+G7R7ht7vPY07NXbW7z3/T7JvttVAVVN1WbVZftJ+7P3P66Jqun4lvttXa1ObXHtxwPSA/0HIw6217nU1R3SPVRSj9Yr60cOxx++/p3vdy0NNg1VjZzG4iNwRHnk6fcJ3/ceDTradox7rOEH0x92HWcdL2pCmvKaRptTmvtbYlu6T8w+0dbq3nr8R9sfD5w0PFl5SvNUyWna6YLTk2fyz4ydlZ19fi753GDborZ752PO32oPb++6EHTh0kX/i+c7vDvOXPK4dPKy2+UTV7hXmq86X23qdOo8/pPTT8e7nLuarrlca7nuer21e2b36RueN87d9L158Rb/1tWeOT3dvfN6b/fF9/XfFt1+cif9zsu72Xcn7q28T7xf9EDtQdlD3YfVP1v+3Njv3H9qwHeg89HcR/cGhYPP/pH1jw9DBY+Zj8uGDYbrnjg+OTniP3L96fynQ89kzyaeF/6i/suuFxYvfvjV69fO0ZjRoZfyl5O/bXyl/erA6xmv28bCxh6+yXgzMV70VvvtwXfcdx3vo98PT+R8IH8o/2j5sfVT0Kf7kxmTk/8EA5jz/GMzLdsAAAAGYktHRAD/AP8A/6C9p5MAAAAJcEhZcwAALiMAAC4jAXilP3YAAAAHdElNRQfdCh8INRXhQY3cAAAQRElEQVR42u2ceXxV1bXHv/vcKfeGJIwJuTcTCWFIICYQhlDqp4IQiAIBqgQUQUZl0BZxrFYqoqUCKiFU+2kFZ4SKta/VqmgVtNL3JAgqGGYfQxIGGSTJHXLPen+ce09uSLC2fe17H7jr84Gcc/be55792+v89lprr7PVqZOn5NVXX8VisQLgcjkpm1gGwCvr1lNXV0dYpk2/2Tx+/fXfc+rkKQCsVis3TZlslr3w/Iv4/X4AAoEAs2bPRCkFwN49e9m8eYtxrqCwsJC8vN5c8vL555+LO8lj/ivIL5SwFBYUGtc7p4g7OVUiZfjVxc3a3Xf3fWZZj+wc83pykkcCgYBZ9tKLL0tyRLtV5RVyOYgGhqZJ6C8iTaOgFKJaud5UwTxas/ZZ9lTtCTcz/lPq25q0Xn6JigaCKNV6n5VC6TrSGsgigDTDb9jVxQSDQWNwRBARkzKa2kVgreuXE9CgRAxgLlA4REDTUKhITFtiHhqUxsZGBg4YZN5PKdVykCJvFeLpy0GsLUFTFyhuK1oZCZQYLUSM02NHjxmaqmmttlUS+Q7Itw7gJafREsGdmnYBdYTAbtlSa0IXmDLlRuM8fM0cAGmh/arpPbh8qEPTtBAwBgDHqmsA8Hq9HDty1NQ9u9XaGmGYk+SMWTPJzOzyt39RgajLbzK09ujRo4ksQqB5OqeY+qYAUYq4hISLmg/hun/e/GfSU7sYlPFtWEsT7Vw2Gq2UYlXFSgMwTTMmshBlRA5AuA4XDIqhmMp0XLb+9S8h9lUXnTkl1F4uI6W2AowdN5aMLhncvfBuqmuPU193HpRGXFwcKR4PT658nKyuWc0aut1uzp09B0oR8Pmw2QxqSU1L5YEHH2DNM2vRFNTVNzSbENu0aUNaWppxTYT4+PjLAmglIpfXrPR/aXVEJQr0pcXRWZnZJMQnhGYmAWlyycPM0rZtAu+9/67ZcNKkyVR9saspFhKa4Kx2K55kNw8teYjevXtHEY4EuqHei7fB28zZuFD8AX+z81PHT1BTW9uqoXz08FGKh5cw59bZ3P/T+6MoN1FHk0cnkYGeCG31+/wXM6NNW1pMh0ShRFi9+im+/vrrKMotYh2hGEXF6lU4HPZmRTab7aKxDgH27q+irq6O/N4FEeac4sCBg7Rv3z4KdDMHJARcXFwb7A6Hec1qsVA0qKhVkMPK/fWpr0NBJM30FZUS3O7kqDqbQIeD9CHXefLkqQYzhICMcTrZf3BvS89QKdB1RCkG9B+EQhBluNiapjHpxkm43e4oymGOjgQ1zK+RbnarYdKwRivNXAQQpVAYMegxY0tZ8sjDUYQvRh1KhH4D+jfNdUrhdDpbttT1CLAV/Qr78sknlQZtaIrXNr6G6EEqflkRRTnsgruTU1GhaI8ABw7tIyYm5lsbFg8fyec7PzNDrPsO7qGhoYHeOXmmFaKAozVHoigTsZQlNHG0rn+H8EczehFEjIBRpPUnSvHB+5ujKIepY/Yts3A6nUjIjg5H4r5NJt0wieO1tYAi0BjAZrNis9mo+GUFe6qqjPVC4MiRw1GUiUbvokGlS446gsEgZ8+eo6VDrVpYc+3atYsi9o8CvXvXboYPG0EzezqUj6FCKQNELYh/njqUppo7JSriPJSXoS4IMEXlH7I6VMsspW/Nt4vKPzgZtqK1kTZyKIfuckt4+RcA3XyFxAQ7nNYFKE3jskmS+1dqdCjPtvnqSkQ0L0oh/1t2dJgaIjU6Kv8ah0UiYtLNAL9YQnlU/n6rQ6ApBg1NKaWRNBKVfxboC7LkQqsmhiZrJqVEWfqfk2hQ6d/N0VGJAh0FOipRoKNAR4GOyuULdMEVfdn68dZLx46ur6vHFetCRPA2eHG6nNTX1+N0OlFKES73+XxYrVZ8Pj8Ohx2LxYLP50PTNHRdJ9gYBMAR40DXdQL+AAB2hz3Uzsehg4dISU0hNjYWr9eL1WqlsbERPdiUxRrjjOHEiROcOHGS7OyuOBwOs6y+rt54cK0psae+vj7kyYIr1mXW9Xq96EEdQXA4HASDQYJB4xljYmLQNM3sm9/vpzHQCAqz38FgkCNHjuBwOEhKSjKwqK/H5XKZz+KKdVFf32AE4CKeyefz8dWhr3B73EYaxpkzZyQ9JUNERKq+rJKCvD4iIpKZniVPP/0rERFJTkoREZEZ02bK5s1bZOGChfLIkkdFRGTw966U7ZXbZf6c26R0zDiZc8tcqdxWKeUrV8ngou/L2DHjJL93gYiIuDunSMWq1ZKc5JGvDn0lU2+aKuvWvSKryitkVMlo6V84QObNmS+VlZXSKzdP5s2ZL4+veMLcIaCurl7ciW65dfYcSUvJkKefMp7PneSRH9/+Y5k///ZmOwqUjhknpaPHyqyZt8jHH2+V2+f/SErHjJVBAwfLyBHXhPrmERGRJQ8/IsOHDpdBAwdL6ZhxIiLSJ6+PlF1XJt8bOFgmXD9RAoGAWV9EJCMtU0REumZ2k7m3zpM0T7psWL9BTp48JclJHln04M/E3TlFNr2zSayG193ym0FdFx5buoz+/fqFoiFNsY9Hfv4IGalduPe+eziwbz/5BfmIErp3yyYnN5fcXrl89OFHjC4dzdSbp5Cf1yfUXPhs52fsrvqChIQEUBqBQCNz583B4/HwzttvU16xku2V22mXkMCAooH07VvQ9PphBAzKK1ayfMUysjKzmTV7JgIM+t6gFtFcEaGkZASDvz+YnJwcXnrhJW67/TbaJiRww6TJzerquk5Obi6dEjsR8Ps5d+4c1bW1bNuxDTC+vbRara3mIdbX17NqdTk+r5fa2uMsXvQQDy76KbNvmcX9D/wEi8WCFvm9tmaxoIcS0X1+H+WrVjLhurKmVzdUz2az0a59O+656x5Kx5aaIxTjdBIXH2fe73evvc6wocWUTbgegMNHvyIrK5Oe3XOorq5utkOCIE1RFwUWq5WE+HjsdgctQzE6TpcTFTEACW3b0iauzQV1FVu2fMTaNc8Z5xaN5Y8t59prRvPU06tb1PX6vHTs2IEPP/zICARZWk5hkRGL8HGsy0XZ9RN54403mTtvDufr62nfvh2vrFtPUf8i1jyzBq1t27Z4fT6WP7acO360gOLi4ebDjxhZzJjSMeihGwYjtpQYNnw4zz//ImWTykyNOLD/AJ9+uoM9e/YSFJ2RJSP43e838urG19B1nTRPOmnp6YDC7/ej60EklH6m67rJnwCnT59h+/btbP5gc/OOKcVDP1tMXq987rrnLrNs239tY9t/bmsGSmMgwMSJE/jFYz83zv1+5t82j2efW8Ndd95j9hNAdJ1jR46ye9dudu3aTXx8PBarjXvvvpcbb5hs7pJjtdn46QMPMv3m6RT0Md6283V1rFv/Mn0L+/Lc2udYcMePWXjHXYgYeOm6YFm0aNGim6fdzN69e+lb2IcFCxcAkJKaQq9euQwZOoSUlBRye+WSmNiJbt2yiY2NpX+/fqSnpzFq9CgAEhM7kZjYiU4dO5Gd3ZX0tDSys7vSvXt3OrRvT35BPkOGXMWePVXMvmUW+QX5JCYlkZPbk3bt2hHXpg1ds7uSkuLB4YjB4/HQoUN7PB4PXbp0Cb1xGmlpqSQmJjJlymTG/3AcABnp6SS0TSAxqRM5uTkm0MnJncnNzTU/Gk1MTCQzK4v8gnxcsS569+5NWloqubm5tGvfnmS3m/T0dJ56ejUWi4WZs2Zw7Fg1PXv0YOmypQDMmXsrhw4cpEtmJo88+jBKKTIy0snJyaFoUBENDQ0UDSqiX79CDh44yJ1330laemo0evdvjEf//xOv18vmD7Zgt9vI7tYNj8d9aQDt8/lwOByICH6/H4fDgdfrNXOkw8eBQACLxUIgEMBut6NCu86E+TPMsXa7HREhEAiglGphB4ft6vD9Iu3bsN2+adMmYl0uXC4XiYmdmpVH3s/r9Rq0omnY7XbzPPzsjY2N5jNaLBZsNpvZX5/Ph4hgs9mwhAyBYDBo1rHb7YY/0Eo/vF4vogtOl/O7IX3mzBlJdaeJiMiXX34pV4RsXk/nFNn68VbRdd20HafdPEM++GCzlBSXyPpXNoiIyITrymTdy+tk3rzbJDnJI8mdU+QP//EHWflkubFLWOcUGV86XkRECq7oK57OKZKc5JEzZ87ITZOnyPpXNkjZ9RMlOXQ9PbWLiIj0LxwoPbvliIjIdeOvN3cVS0/LFF3XRUTE6/WKu3OKJCe65QdXDpHTp09LcucUY1ezJI94vV55ePEScSe5JTnJIzdOmiynT5+WwoJ+IiKS1+sK45mTPHLy5Cl5449vyPRpM4ydzrrlSNWXVbJi+ePmbmfXlowydzpzJxm/8dCih77rLmFgCZkxiqYvZmOcMYwb+8Om5BpAUwqlFEuXLWXp0l8AsGXzFiaUTUB0nTVrf8Ox6sOUXFMCCm6dO4dj1Yf5y9a/AlBTU0Pljm28+ac/Eh8fj6YZnuWLL79AefkTlJaOYd8BY6exI4cPExcfx86dn7Fu/cssf3w5AwcVsW9/VTNbNtbl4ljtUd57fxMBfwCH3c7R6sO0a9+WgwcOooA58+ZyrOYIz73wbLgjIfu3gV1ffs7Vw4byUcikC29FpFk0s+/TZ06nau9uKiu3IyIsXLCQ3Xu+4GjNEYpHFP8dsQ6lRTgFxnFDfQNTp95E2fUT0TStmTfTq1cvaqtreO7Z5xlQNNB4LTUL9//kAX5w5VXU1dWhUDy1+pdkpGVy2/x5AGx87bcU5PXhhkk3cv78eXO1XdM0LBYLIFitVlY+Wc60GdMYXjycDes3hMo1NKWwXrATzvm6OjzJqdx5x52gDBrMzupOZmZXevTsAUrx4gsvMbjo+1RWVjZzvJxOJ+PHXsemd94lNzcnIlmIZgvTz/z6GXrl5DFv3hy++eYb0DTi4+Mp7NOPKZOn8l3sCc3pdOL3+fF6vbz11tskJnUyMV3y6BJqamuJCfn2kau4A4sGsvhni5kQckaCus6COxawfsMrBmgiTJ8xnTVrf8PGjRtpaGhg2bIVHK05gtfro7amtunb8wuk/ImVnDl7FhHhN79+hhY/HiFtYmM5Wn2YZSuWmc7Upzsr2fbJJ5w6ZXy1W1o6mo2vv0qXjC4tJt3yiieZMOE6Vqx4gtjYWHZ9/oVR5vOZb87kKZNZ++wz/Pa3G4mLi0N04dPtn/Knt97k7Llz30mjLYsXL17UrVs37rvnPs6ePcOvfv0rnE4n+/fto+SaEkaOHEH1sWpKSkZy4vhxevbsSceOHenaNYua6moWLFyAzWbj1KmTvP/+ZjZtepf0jHRiY2Pp0LEjI0tGsPXjvzL+h+P56tAhnnyinCuvHMzYcWM5eeIE3bp3Jy0tlfN1ddhsdvKuyKOqqoqK1asYMnQIp0+fJj0jA7vdmLAGDBzQrAP/ffiw6WQFg0FqqmsYPWYUJ06cICcnB6UUO3bs5O233qb2+HH69+tHbU0tVw25ipqaWja9swmX08WDix4gKyuTffv2U1GxmmuvvYbRY0Zx9tw5OnbowNCrh7Jjx05Gjx7FsGFX8+iSR3n3vfcYOGAAw4uHXXwntZD8D6+onOSW8ZhTAAAAAElFTkSuQmCC</mdui:Logo>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:IPHint>192.47.244.0/22</mdui:IPHint>
-        <mdui:IPHint>192.47.248.0/23</mdui:IPHint>
-        <mdui:IPHint>134.21.0.0/16</mdui:IPHint>
-        <mdui:DomainHint>unifr.ch</mdui:DomainHint>
-        <mdui:GeolocationHint>geo:46.806228,7.152400</mdui:GeolocationHint>
-      </mdui:DiscoHints>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDEDCCAfigAwIBAgIJAIp+DMI5Xj2FMA0GCSqGSIb3DQEBBQUAMBcxFTATBgNV
-BAMTDGFhaS51bmlmci5jaDAeFw0xNDA0MDkwNjI2MDVaFw0xNzA0MDgwNjI2MDVa
-MBcxFTATBgNVBAMTDGFhaS51bmlmci5jaDCCASIwDQYJKoZIhvcNAQEBBQADggEP
-ADCCAQoCggEBALXStAT8W6nX2N3ZvU84FpTKuAmdfleTr+f1usWoKz1jnKKkayFu
-lNc39OiJIgqlh3FX1QXV39AJf3AC0OqBAhpeaONnyhdf/ZZ7zhWYbUBsL/3ilSL9
-N1sPzzxGkod0feZlAkXrse2NeZZ7n4pDEz0c59bfe7Egv5iYaaKytNgU8NLpLN9p
-SqpI9okOf7a2H/Fs9PTvTfMagi/VSNcTuKb6UMyhtbS7kSJwyjUQPC9tWyGln5/4
-N5559ice8Cv3Se9sYvBqTojDRgV8XyDtHkcDoTqJgseSLOzF647fs1hDoAZss/Yu
-gfqwPOPcvNWRgsQYfuy9K93Wv4cON8S5+9sCAwEAAaNfMF0wPAYDVR0RBDUwM4IM
-YWFpLnVuaWZyLmNohiNodHRwczovL2FhaS51bmlmci5jaC9pZHAvc2hpYmJvbGV0
-aDAdBgNVHQ4EFgQUc+thXESrJ14M3LZRKwaX2rAt+kQwDQYJKoZIhvcNAQEFBQAD
-ggEBAI+oyk62mRG3tZ5cv5cNM7wAPRpZ/GLjxvM08T5UuIS2zEzMKLGNYIBQXHyV
-4ag2oaNzxaeDejks0v4ixkyT/X+uxe7H0wsHvfBUFGBIpp/F3RF1wLi1fadeQZbn
-bTS8R+Ie5ZvPjfwFLLB8C8kqp587RHcVr9N6IWAKY/2R2wfXATJ5cGrneQirgu3D
-/mKOvEvu+I1xF3b4gc+e2LL7IHhOMNbQFMRkE1+NBWlMCL/C7UqF4ZHeeZSC8CXQ
-/yx90ElnzFiImgYBLDF5a8Aa7UO8f7+hU+m2YaFbj/CNdD+XwFWbfr0va1UP0xas
-ACCNIbiIfzXCYUVLsTaQK7e25kA=
-						</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://aai.unifr.ch:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aai.unifr.ch: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.unifr.ch/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://aai.unifr.ch/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://aai.unifr.ch/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://aai.unifr.ch/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
-    <Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unifr.ch</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDEDCCAfigAwIBAgIJAIp+DMI5Xj2FMA0GCSqGSIb3DQEBBQUAMBcxFTATBgNV
-BAMTDGFhaS51bmlmci5jaDAeFw0xNDA0MDkwNjI2MDVaFw0xNzA0MDgwNjI2MDVa
-MBcxFTATBgNVBAMTDGFhaS51bmlmci5jaDCCASIwDQYJKoZIhvcNAQEBBQADggEP
-ADCCAQoCggEBALXStAT8W6nX2N3ZvU84FpTKuAmdfleTr+f1usWoKz1jnKKkayFu
-lNc39OiJIgqlh3FX1QXV39AJf3AC0OqBAhpeaONnyhdf/ZZ7zhWYbUBsL/3ilSL9
-N1sPzzxGkod0feZlAkXrse2NeZZ7n4pDEz0c59bfe7Egv5iYaaKytNgU8NLpLN9p
-SqpI9okOf7a2H/Fs9PTvTfMagi/VSNcTuKb6UMyhtbS7kSJwyjUQPC9tWyGln5/4
-N5559ice8Cv3Se9sYvBqTojDRgV8XyDtHkcDoTqJgseSLOzF647fs1hDoAZss/Yu
-gfqwPOPcvNWRgsQYfuy9K93Wv4cON8S5+9sCAwEAAaNfMF0wPAYDVR0RBDUwM4IM
-YWFpLnVuaWZyLmNohiNodHRwczovL2FhaS51bmlmci5jaC9pZHAvc2hpYmJvbGV0
-aDAdBgNVHQ4EFgQUc+thXESrJ14M3LZRKwaX2rAt+kQwDQYJKoZIhvcNAQEFBQAD
-ggEBAI+oyk62mRG3tZ5cv5cNM7wAPRpZ/GLjxvM08T5UuIS2zEzMKLGNYIBQXHyV
-4ag2oaNzxaeDejks0v4ixkyT/X+uxe7H0wsHvfBUFGBIpp/F3RF1wLi1fadeQZbn
-bTS8R+Ie5ZvPjfwFLLB8C8kqp587RHcVr9N6IWAKY/2R2wfXATJ5cGrneQirgu3D
-/mKOvEvu+I1xF3b4gc+e2LL7IHhOMNbQFMRkE1+NBWlMCL/C7UqF4ZHeeZSC8CXQ
-/yx90ElnzFiImgYBLDF5a8Aa7UO8f7+hU+m2YaFbj/CNdD+XwFWbfr0va1UP0xas
-ACCNIbiIfzXCYUVLsTaQK7e25kA=
-						</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://aai.unifr.ch:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aai.unifr.ch:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">unifr.ch</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">Universität Freiburg</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">University of Fribourg</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="fr">Université de Fribourg</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.unifr.ch/</OrganizationURL>
-    <OrganizationURL xml:lang="en">http://www.unifr.ch/</OrganizationURL>
-    <OrganizationURL xml:lang="fr">http://www.unifr.ch/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>AAI</GivenName>
-    <SurName>Support Uni Fribourg</SurName>
-    <EmailAddress>mailto:aai@unifr.ch</EmailAddress>
-    <TelephoneNumber>+4126 300 7207</TelephoneNumber>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>AAI</GivenName>
-    <SurName>Support Uni Fribourg</SurName>
-    <EmailAddress>mailto:aai@unifr.ch</EmailAddress>
-    <TelephoneNumber>+4126 300 7207</TelephoneNumber>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/aai.unifr.ch.xml b/swamid-interfederations-2.0/aai.unifr.ch.xml
deleted file mode 100644
index 38f85741..00000000
--- a/swamid-interfederations-2.0/aai.unifr.ch.xml
+++ /dev/null
@@ -1,125 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://aai.unifr.ch/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://rr.aai.switch.ch/" registrationInstant="2014-10-10T12:32:07Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.switch.ch/aai/federation/switchaai/metadata-registration-practice-statement-20110711.txt</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-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </Extensions>
-  <IDPSSODescriptor errorURL="http://www.unifr.ch/aai" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-    <Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unifr.ch</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="de">Universität Freiburg</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">University of Fribourg</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="fr">Université de Fribourg</mdui:DisplayName>
-        <mdui:Description xml:lang="de">Universität Freiburg</mdui:Description>
-        <mdui:Description xml:lang="en">University of Fribourg</mdui:Description>
-        <mdui:Description xml:lang="fr">Université de Fribourg</mdui:Description>
-        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAAZiS0dEAP8A/wD/oL2nkwAAAAlwSFlzAAALEwAACxMBAJqcGAAAAAd0SU1FB90KHwg5DseRCzwAAAIaSURBVDjLlZO9T1NRGMZ/595akF5bWuQjNrJgIguJizUEk+pIY4gkEP4L3FkM/AFCZWkZSJjLKh8TGCQgTCQyyGolBIwkeNvKxz2PQ0OlGg08yZlO3t85z/u+j7HWyhjDTSSJyxrHGMPOzg75fI7Dw0Oy2Tf4vs/i4hIrK6v4/g+mp99yfn7B/HyBhYV31D0oSVNTU0okEtra+ihAxeIXjYwMKxy+pXw+J2NQqVRSKvVYAwMvJEnWWkmSAxAKhWhqaiQS8QiHXYxx8DyP7u6HTEyM09p6FzA0NzcTjcbq7DgAqdQTQAwOvqSn5xGxWAxrRSaTYWxsDGvBGHAcF9d16xsSBIEkyfd97e9/1dnZmSTp5ORElUpFklQsFhUEgQ4ODnR0dKQgCGoWQo7jsLa2xvj4a6LRKNbC7OwsMzN51tc/4Hl3GB19RTKZpK2tDWstAMYYJFUtHB9/Z2Njg97eXvr7M8TjCXZ3P+F5HpVKmWx28rdnx6kVG2OqAKk620KhwPLyEsZAKOSyubnJ9vY2Q0PDNYAxpnYAQgAtLS2k08+Ym5sjHk8A0NX1gL6+pwRBwOrq+zrIVRlrpXK5hO/7nJ6eIomOjg4aGhr+2r7LH/x5oVwup0jktjo77yuZvKe9vc+6rhwA162SHccAwhhdOxchgHL5J75fRvqGtQEXFzcEpNPPyWYnaWxsQhLt7e3XBph/xflqZP+nX5gqPWD6ar6SAAAAAElFTkSuQmCC</mdui:Logo>
-        <mdui:Logo height="60" width="90">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFoAAAA8CAYAAADmBa1FAAAKT2lDQ1BQaG90b3Nob3AgSUNDIHByb2ZpbGUAAHjanVNnVFPpFj333vRCS4iAlEtvUhUIIFJCi4AUkSYqIQkQSoghodkVUcERRUUEG8igiAOOjoCMFVEsDIoK2AfkIaKOg6OIisr74Xuja9a89+bN/rXXPues852zzwfACAyWSDNRNYAMqUIeEeCDx8TG4eQuQIEKJHAAEAizZCFz/SMBAPh+PDwrIsAHvgABeNMLCADATZvAMByH/w/qQplcAYCEAcB0kThLCIAUAEB6jkKmAEBGAYCdmCZTAKAEAGDLY2LjAFAtAGAnf+bTAICd+Jl7AQBblCEVAaCRACATZYhEAGg7AKzPVopFAFgwABRmS8Q5ANgtADBJV2ZIALC3AMDOEAuyAAgMADBRiIUpAAR7AGDIIyN4AISZABRG8lc88SuuEOcqAAB4mbI8uSQ5RYFbCC1xB1dXLh4ozkkXKxQ2YQJhmkAuwnmZGTKBNA/g88wAAKCRFRHgg/P9eM4Ors7ONo62Dl8t6r8G/yJiYuP+5c+rcEAAAOF0ftH+LC+zGoA7BoBt/qIl7gRoXgugdfeLZrIPQLUAoOnaV/Nw+H48PEWhkLnZ2eXk5NhKxEJbYcpXff5nwl/AV/1s+X48/Pf14L7iJIEyXYFHBPjgwsz0TKUcz5IJhGLc5o9H/LcL//wd0yLESWK5WCoU41EScY5EmozzMqUiiUKSKcUl0v9k4t8s+wM+3zUAsGo+AXuRLahdYwP2SycQWHTA4vcAAPK7b8HUKAgDgGiD4c93/+8//UegJQCAZkmScQAAXkQkLlTKsz/HCAAARKCBKrBBG/TBGCzABhzBBdzBC/xgNoRCJMTCQhBCCmSAHHJgKayCQiiGzbAdKmAv1EAdNMBRaIaTcA4uwlW4Dj1wD/phCJ7BKLyBCQRByAgTYSHaiAFiilgjjggXmYX4IcFIBBKLJCDJiBRRIkuRNUgxUopUIFVIHfI9cgI5h1xGupE7yAAygvyGvEcxlIGyUT3UDLVDuag3GoRGogvQZHQxmo8WoJvQcrQaPYw2oefQq2gP2o8+Q8cwwOgYBzPEbDAuxsNCsTgsCZNjy7EirAyrxhqwVqwDu4n1Y8+xdwQSgUXACTYEd0IgYR5BSFhMWE7YSKggHCQ0EdoJNwkDhFHCJyKTqEu0JroR+cQYYjIxh1hILCPWEo8TLxB7iEPENyQSiUMyJ7mQAkmxpFTSEtJG0m5SI+ksqZs0SBojk8naZGuyBzmULCAryIXkneTD5DPkG+Qh8lsKnWJAcaT4U+IoUspqShnlEOU05QZlmDJBVaOaUt2ooVQRNY9aQq2htlKvUYeoEzR1mjnNgxZJS6WtopXTGmgXaPdpr+h0uhHdlR5Ol9BX0svpR+iX6AP0dwwNhhWDx4hnKBmbGAcYZxl3GK+YTKYZ04sZx1QwNzHrmOeZD5lvVVgqtip8FZHKCpVKlSaVGyovVKmqpqreqgtV81XLVI+pXlN9rkZVM1PjqQnUlqtVqp1Q61MbU2epO6iHqmeob1Q/pH5Z/YkGWcNMw09DpFGgsV/jvMYgC2MZs3gsIWsNq4Z1gTXEJrHN2Xx2KruY/R27iz2qqaE5QzNKM1ezUvOUZj8H45hx+Jx0TgnnKKeX836K3hTvKeIpG6Y0TLkxZVxrqpaXllirSKtRq0frvTau7aedpr1Fu1n7gQ5Bx0onXCdHZ4/OBZ3nU9lT3acKpxZNPTr1ri6qa6UbobtEd79up+6Ynr5egJ5Mb6feeb3n+hx9L/1U/W36p/VHDFgGswwkBtsMzhg8xTVxbzwdL8fb8VFDXcNAQ6VhlWGX4YSRudE8o9VGjUYPjGnGXOMk423GbcajJgYmISZLTepN7ppSTbmmKaY7TDtMx83MzaLN1pk1mz0x1zLnm+eb15vft2BaeFostqi2uGVJsuRaplnutrxuhVo5WaVYVVpds0atna0l1rutu6cRp7lOk06rntZnw7Dxtsm2qbcZsOXYBtuutm22fWFnYhdnt8Wuw+6TvZN9un2N/T0HDYfZDqsdWh1+c7RyFDpWOt6azpzuP33F9JbpL2dYzxDP2DPjthPLKcRpnVOb00dnF2e5c4PziIuJS4LLLpc+Lpsbxt3IveRKdPVxXeF60vWdm7Obwu2o26/uNu5p7ofcn8w0nymeWTNz0MPIQ+BR5dE/C5+VMGvfrH5PQ0+BZ7XnIy9jL5FXrdewt6V3qvdh7xc+9j5yn+M+4zw33jLeWV/MN8C3yLfLT8Nvnl+F30N/I/9k/3r/0QCngCUBZwOJgUGBWwL7+Hp8Ib+OPzrbZfay2e1BjKC5QRVBj4KtguXBrSFoyOyQrSH355jOkc5pDoVQfujW0Adh5mGLw34MJ4WHhVeGP45wiFga0TGXNXfR3ENz30T6RJZE3ptnMU85ry1KNSo+qi5qPNo3ujS6P8YuZlnM1VidWElsSxw5LiquNm5svt/87fOH4p3iC+N7F5gvyF1weaHOwvSFpxapLhIsOpZATIhOOJTwQRAqqBaMJfITdyWOCnnCHcJnIi/RNtGI2ENcKh5O8kgqTXqS7JG8NXkkxTOlLOW5hCepkLxMDUzdmzqeFpp2IG0yPTq9MYOSkZBxQqohTZO2Z+pn5mZ2y6xlhbL+xW6Lty8elQfJa7OQrAVZLQq2QqboVFoo1yoHsmdlV2a/zYnKOZarnivN7cyzytuQN5zvn//tEsIS4ZK2pYZLVy0dWOa9rGo5sjxxedsK4xUFK4ZWBqw8uIq2Km3VT6vtV5eufr0mek1rgV7ByoLBtQFr6wtVCuWFfevc1+1dT1gvWd+1YfqGnRs+FYmKrhTbF5cVf9go3HjlG4dvyr+Z3JS0qavEuWTPZtJm6ebeLZ5bDpaql+aXDm4N2dq0Dd9WtO319kXbL5fNKNu7g7ZDuaO/PLi8ZafJzs07P1SkVPRU+lQ27tLdtWHX+G7R7ht7vPY07NXbW7z3/T7JvttVAVVN1WbVZftJ+7P3P66Jqun4lvttXa1ObXHtxwPSA/0HIw6217nU1R3SPVRSj9Yr60cOxx++/p3vdy0NNg1VjZzG4iNwRHnk6fcJ3/ceDTradox7rOEH0x92HWcdL2pCmvKaRptTmvtbYlu6T8w+0dbq3nr8R9sfD5w0PFl5SvNUyWna6YLTk2fyz4ydlZ19fi753GDborZ752PO32oPb++6EHTh0kX/i+c7vDvOXPK4dPKy2+UTV7hXmq86X23qdOo8/pPTT8e7nLuarrlca7nuer21e2b36RueN87d9L158Rb/1tWeOT3dvfN6b/fF9/XfFt1+cif9zsu72Xcn7q28T7xf9EDtQdlD3YfVP1v+3Njv3H9qwHeg89HcR/cGhYPP/pH1jw9DBY+Zj8uGDYbrnjg+OTniP3L96fynQ89kzyaeF/6i/suuFxYvfvjV69fO0ZjRoZfyl5O/bXyl/erA6xmv28bCxh6+yXgzMV70VvvtwXfcdx3vo98PT+R8IH8o/2j5sfVT0Kf7kxmTk/8EA5jz/GMzLdsAAAAGYktHRAD/AP8A/6C9p5MAAAAJcEhZcwAALiMAAC4jAXilP3YAAAAHdElNRQfdCh8INRXhQY3cAAAQRElEQVR42u2ceXxV1bXHv/vcKfeGJIwJuTcTCWFIICYQhlDqp4IQiAIBqgQUQUZl0BZxrFYqoqUCKiFU+2kFZ4SKta/VqmgVtNL3JAgqGGYfQxIGGSTJHXLPen+ce09uSLC2fe17H7jr84Gcc/be55792+v89lprr7PVqZOn5NVXX8VisQLgcjkpm1gGwCvr1lNXV0dYpk2/2Tx+/fXfc+rkKQCsVis3TZlslr3w/Iv4/X4AAoEAs2bPRCkFwN49e9m8eYtxrqCwsJC8vN5c8vL555+LO8lj/ivIL5SwFBYUGtc7p4g7OVUiZfjVxc3a3Xf3fWZZj+wc83pykkcCgYBZ9tKLL0tyRLtV5RVyOYgGhqZJ6C8iTaOgFKJaud5UwTxas/ZZ9lTtCTcz/lPq25q0Xn6JigaCKNV6n5VC6TrSGsgigDTDb9jVxQSDQWNwRBARkzKa2kVgreuXE9CgRAxgLlA4REDTUKhITFtiHhqUxsZGBg4YZN5PKdVykCJvFeLpy0GsLUFTFyhuK1oZCZQYLUSM02NHjxmaqmmttlUS+Q7Itw7gJafREsGdmnYBdYTAbtlSa0IXmDLlRuM8fM0cAGmh/arpPbh8qEPTtBAwBgDHqmsA8Hq9HDty1NQ9u9XaGmGYk+SMWTPJzOzyt39RgajLbzK09ujRo4ksQqB5OqeY+qYAUYq4hISLmg/hun/e/GfSU7sYlPFtWEsT7Vw2Gq2UYlXFSgMwTTMmshBlRA5AuA4XDIqhmMp0XLb+9S8h9lUXnTkl1F4uI6W2AowdN5aMLhncvfBuqmuPU193HpRGXFwcKR4PT658nKyuWc0aut1uzp09B0oR8Pmw2QxqSU1L5YEHH2DNM2vRFNTVNzSbENu0aUNaWppxTYT4+PjLAmglIpfXrPR/aXVEJQr0pcXRWZnZJMQnhGYmAWlyycPM0rZtAu+9/67ZcNKkyVR9saspFhKa4Kx2K55kNw8teYjevXtHEY4EuqHei7fB28zZuFD8AX+z81PHT1BTW9uqoXz08FGKh5cw59bZ3P/T+6MoN1FHk0cnkYGeCG31+/wXM6NNW1pMh0ShRFi9+im+/vrrKMotYh2hGEXF6lU4HPZmRTab7aKxDgH27q+irq6O/N4FEeac4sCBg7Rv3z4KdDMHJARcXFwb7A6Hec1qsVA0qKhVkMPK/fWpr0NBJM30FZUS3O7kqDqbQIeD9CHXefLkqQYzhICMcTrZf3BvS89QKdB1RCkG9B+EQhBluNiapjHpxkm43e4oymGOjgQ1zK+RbnarYdKwRivNXAQQpVAYMegxY0tZ8sjDUYQvRh1KhH4D+jfNdUrhdDpbttT1CLAV/Qr78sknlQZtaIrXNr6G6EEqflkRRTnsgruTU1GhaI8ABw7tIyYm5lsbFg8fyec7PzNDrPsO7qGhoYHeOXmmFaKAozVHoigTsZQlNHG0rn+H8EczehFEjIBRpPUnSvHB+5ujKIepY/Yts3A6nUjIjg5H4r5NJt0wieO1tYAi0BjAZrNis9mo+GUFe6qqjPVC4MiRw1GUiUbvokGlS446gsEgZ8+eo6VDrVpYc+3atYsi9o8CvXvXboYPG0EzezqUj6FCKQNELYh/njqUppo7JSriPJSXoS4IMEXlH7I6VMsspW/Nt4vKPzgZtqK1kTZyKIfuckt4+RcA3XyFxAQ7nNYFKE3jskmS+1dqdCjPtvnqSkQ0L0oh/1t2dJgaIjU6Kv8ah0UiYtLNAL9YQnlU/n6rQ6ApBg1NKaWRNBKVfxboC7LkQqsmhiZrJqVEWfqfk2hQ6d/N0VGJAh0FOipRoKNAR4GOyuULdMEVfdn68dZLx46ur6vHFetCRPA2eHG6nNTX1+N0OlFKES73+XxYrVZ8Pj8Ohx2LxYLP50PTNHRdJ9gYBMAR40DXdQL+AAB2hz3Uzsehg4dISU0hNjYWr9eL1WqlsbERPdiUxRrjjOHEiROcOHGS7OyuOBwOs6y+rt54cK0psae+vj7kyYIr1mXW9Xq96EEdQXA4HASDQYJB4xljYmLQNM3sm9/vpzHQCAqz38FgkCNHjuBwOEhKSjKwqK/H5XKZz+KKdVFf32AE4CKeyefz8dWhr3B73EYaxpkzZyQ9JUNERKq+rJKCvD4iIpKZniVPP/0rERFJTkoREZEZ02bK5s1bZOGChfLIkkdFRGTw966U7ZXbZf6c26R0zDiZc8tcqdxWKeUrV8ngou/L2DHjJL93gYiIuDunSMWq1ZKc5JGvDn0lU2+aKuvWvSKryitkVMlo6V84QObNmS+VlZXSKzdP5s2ZL4+veMLcIaCurl7ciW65dfYcSUvJkKefMp7PneSRH9/+Y5k///ZmOwqUjhknpaPHyqyZt8jHH2+V2+f/SErHjJVBAwfLyBHXhPrmERGRJQ8/IsOHDpdBAwdL6ZhxIiLSJ6+PlF1XJt8bOFgmXD9RAoGAWV9EJCMtU0REumZ2k7m3zpM0T7psWL9BTp48JclJHln04M/E3TlFNr2zSayG193ym0FdFx5buoz+/fqFoiFNsY9Hfv4IGalduPe+eziwbz/5BfmIErp3yyYnN5fcXrl89OFHjC4dzdSbp5Cf1yfUXPhs52fsrvqChIQEUBqBQCNz583B4/HwzttvU16xku2V22mXkMCAooH07VvQ9PphBAzKK1ayfMUysjKzmTV7JgIM+t6gFtFcEaGkZASDvz+YnJwcXnrhJW67/TbaJiRww6TJzerquk5Obi6dEjsR8Ps5d+4c1bW1bNuxDTC+vbRara3mIdbX17NqdTk+r5fa2uMsXvQQDy76KbNvmcX9D/wEi8WCFvm9tmaxoIcS0X1+H+WrVjLhurKmVzdUz2az0a59O+656x5Kx5aaIxTjdBIXH2fe73evvc6wocWUTbgegMNHvyIrK5Oe3XOorq5utkOCIE1RFwUWq5WE+HjsdgctQzE6TpcTFTEACW3b0iauzQV1FVu2fMTaNc8Z5xaN5Y8t59prRvPU06tb1PX6vHTs2IEPP/zICARZWk5hkRGL8HGsy0XZ9RN54403mTtvDufr62nfvh2vrFtPUf8i1jyzBq1t27Z4fT6WP7acO360gOLi4ebDjxhZzJjSMeihGwYjtpQYNnw4zz//ImWTykyNOLD/AJ9+uoM9e/YSFJ2RJSP43e838urG19B1nTRPOmnp6YDC7/ej60EklH6m67rJnwCnT59h+/btbP5gc/OOKcVDP1tMXq987rrnLrNs239tY9t/bmsGSmMgwMSJE/jFYz83zv1+5t82j2efW8Ndd95j9hNAdJ1jR46ye9dudu3aTXx8PBarjXvvvpcbb5hs7pJjtdn46QMPMv3m6RT0Md6283V1rFv/Mn0L+/Lc2udYcMePWXjHXYgYeOm6YFm0aNGim6fdzN69e+lb2IcFCxcAkJKaQq9euQwZOoSUlBRye+WSmNiJbt2yiY2NpX+/fqSnpzFq9CgAEhM7kZjYiU4dO5Gd3ZX0tDSys7vSvXt3OrRvT35BPkOGXMWePVXMvmUW+QX5JCYlkZPbk3bt2hHXpg1ds7uSkuLB4YjB4/HQoUN7PB4PXbp0Cb1xGmlpqSQmJjJlymTG/3AcABnp6SS0TSAxqRM5uTkm0MnJncnNzTU/Gk1MTCQzK4v8gnxcsS569+5NWloqubm5tGvfnmS3m/T0dJ56ejUWi4WZs2Zw7Fg1PXv0YOmypQDMmXsrhw4cpEtmJo88+jBKKTIy0snJyaFoUBENDQ0UDSqiX79CDh44yJ1330laemo0evdvjEf//xOv18vmD7Zgt9vI7tYNj8d9aQDt8/lwOByICH6/H4fDgdfrNXOkw8eBQACLxUIgEMBut6NCu86E+TPMsXa7HREhEAiglGphB4ft6vD9Iu3bsN2+adMmYl0uXC4XiYmdmpVH3s/r9Rq0omnY7XbzPPzsjY2N5jNaLBZsNpvZX5/Ph4hgs9mwhAyBYDBo1rHb7YY/0Eo/vF4vogtOl/O7IX3mzBlJdaeJiMiXX34pV4RsXk/nFNn68VbRdd20HafdPEM++GCzlBSXyPpXNoiIyITrymTdy+tk3rzbJDnJI8mdU+QP//EHWflkubFLWOcUGV86XkRECq7oK57OKZKc5JEzZ87ITZOnyPpXNkjZ9RMlOXQ9PbWLiIj0LxwoPbvliIjIdeOvN3cVS0/LFF3XRUTE6/WKu3OKJCe65QdXDpHTp09LcucUY1ezJI94vV55ePEScSe5JTnJIzdOmiynT5+WwoJ+IiKS1+sK45mTPHLy5Cl5449vyPRpM4ydzrrlSNWXVbJi+ePmbmfXlowydzpzJxm/8dCih77rLmFgCZkxiqYvZmOcMYwb+8Om5BpAUwqlFEuXLWXp0l8AsGXzFiaUTUB0nTVrf8Ox6sOUXFMCCm6dO4dj1Yf5y9a/AlBTU0Pljm28+ac/Eh8fj6YZnuWLL79AefkTlJaOYd8BY6exI4cPExcfx86dn7Fu/cssf3w5AwcVsW9/VTNbNtbl4ljtUd57fxMBfwCH3c7R6sO0a9+WgwcOooA58+ZyrOYIz73wbLgjIfu3gV1ffs7Vw4byUcikC29FpFk0s+/TZ06nau9uKiu3IyIsXLCQ3Xu+4GjNEYpHFP8dsQ6lRTgFxnFDfQNTp95E2fUT0TStmTfTq1cvaqtreO7Z5xlQNNB4LTUL9//kAX5w5VXU1dWhUDy1+pdkpGVy2/x5AGx87bcU5PXhhkk3cv78eXO1XdM0LBYLIFitVlY+Wc60GdMYXjycDes3hMo1NKWwXrATzvm6OjzJqdx5x52gDBrMzupOZmZXevTsAUrx4gsvMbjo+1RWVjZzvJxOJ+PHXsemd94lNzcnIlmIZgvTz/z6GXrl5DFv3hy++eYb0DTi4+Mp7NOPKZOn8l3sCc3pdOL3+fF6vbz11tskJnUyMV3y6BJqamuJCfn2kau4A4sGsvhni5kQckaCus6COxawfsMrBmgiTJ8xnTVrf8PGjRtpaGhg2bIVHK05gtfro7amtunb8wuk/ImVnDl7FhHhN79+hhY/HiFtYmM5Wn2YZSuWmc7Upzsr2fbJJ5w6ZXy1W1o6mo2vv0qXjC4tJt3yiieZMOE6Vqx4gtjYWHZ9/oVR5vOZb87kKZNZ++wz/Pa3G4mLi0N04dPtn/Knt97k7Llz30mjLYsXL17UrVs37rvnPs6ePcOvfv0rnE4n+/fto+SaEkaOHEH1sWpKSkZy4vhxevbsSceOHenaNYua6moWLFyAzWbj1KmTvP/+ZjZtepf0jHRiY2Pp0LEjI0tGsPXjvzL+h+P56tAhnnyinCuvHMzYcWM5eeIE3bp3Jy0tlfN1ddhsdvKuyKOqqoqK1asYMnQIp0+fJj0jA7vdmLAGDBzQrAP/ffiw6WQFg0FqqmsYPWYUJ06cICcnB6UUO3bs5O233qb2+HH69+tHbU0tVw25ipqaWja9swmX08WDix4gKyuTffv2U1GxmmuvvYbRY0Zx9tw5OnbowNCrh7Jjx05Gjx7FsGFX8+iSR3n3vfcYOGAAw4uHXXwntZD8D6+onOSW8ZhTAAAAAElFTkSuQmCC</mdui:Logo>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:IPHint>192.47.244.0/22</mdui:IPHint>
-        <mdui:IPHint>192.47.248.0/23</mdui:IPHint>
-        <mdui:IPHint>134.21.0.0/16</mdui:IPHint>
-        <mdui:DomainHint>unifr.ch</mdui:DomainHint>
-        <mdui:GeolocationHint>geo:46.806228,7.152400</mdui:GeolocationHint>
-      </mdui:DiscoHints>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDEDCCAfigAwIBAgIJAIp+DMI5Xj2FMA0GCSqGSIb3DQEBBQUAMBcxFTATBgNV
-BAMTDGFhaS51bmlmci5jaDAeFw0xNDA0MDkwNjI2MDVaFw0xNzA0MDgwNjI2MDVa
-MBcxFTATBgNVBAMTDGFhaS51bmlmci5jaDCCASIwDQYJKoZIhvcNAQEBBQADggEP
-ADCCAQoCggEBALXStAT8W6nX2N3ZvU84FpTKuAmdfleTr+f1usWoKz1jnKKkayFu
-lNc39OiJIgqlh3FX1QXV39AJf3AC0OqBAhpeaONnyhdf/ZZ7zhWYbUBsL/3ilSL9
-N1sPzzxGkod0feZlAkXrse2NeZZ7n4pDEz0c59bfe7Egv5iYaaKytNgU8NLpLN9p
-SqpI9okOf7a2H/Fs9PTvTfMagi/VSNcTuKb6UMyhtbS7kSJwyjUQPC9tWyGln5/4
-N5559ice8Cv3Se9sYvBqTojDRgV8XyDtHkcDoTqJgseSLOzF647fs1hDoAZss/Yu
-gfqwPOPcvNWRgsQYfuy9K93Wv4cON8S5+9sCAwEAAaNfMF0wPAYDVR0RBDUwM4IM
-YWFpLnVuaWZyLmNohiNodHRwczovL2FhaS51bmlmci5jaC9pZHAvc2hpYmJvbGV0
-aDAdBgNVHQ4EFgQUc+thXESrJ14M3LZRKwaX2rAt+kQwDQYJKoZIhvcNAQEFBQAD
-ggEBAI+oyk62mRG3tZ5cv5cNM7wAPRpZ/GLjxvM08T5UuIS2zEzMKLGNYIBQXHyV
-4ag2oaNzxaeDejks0v4ixkyT/X+uxe7H0wsHvfBUFGBIpp/F3RF1wLi1fadeQZbn
-bTS8R+Ie5ZvPjfwFLLB8C8kqp587RHcVr9N6IWAKY/2R2wfXATJ5cGrneQirgu3D
-/mKOvEvu+I1xF3b4gc+e2LL7IHhOMNbQFMRkE1+NBWlMCL/C7UqF4ZHeeZSC8CXQ
-/yx90ElnzFiImgYBLDF5a8Aa7UO8f7+hU+m2YaFbj/CNdD+XwFWbfr0va1UP0xas
-ACCNIbiIfzXCYUVLsTaQK7e25kA=
-						</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://aai.unifr.ch:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aai.unifr.ch: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.unifr.ch/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://aai.unifr.ch/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://aai.unifr.ch/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://aai.unifr.ch/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
-    <Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unifr.ch</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDEDCCAfigAwIBAgIJAIp+DMI5Xj2FMA0GCSqGSIb3DQEBBQUAMBcxFTATBgNV
-BAMTDGFhaS51bmlmci5jaDAeFw0xNDA0MDkwNjI2MDVaFw0xNzA0MDgwNjI2MDVa
-MBcxFTATBgNVBAMTDGFhaS51bmlmci5jaDCCASIwDQYJKoZIhvcNAQEBBQADggEP
-ADCCAQoCggEBALXStAT8W6nX2N3ZvU84FpTKuAmdfleTr+f1usWoKz1jnKKkayFu
-lNc39OiJIgqlh3FX1QXV39AJf3AC0OqBAhpeaONnyhdf/ZZ7zhWYbUBsL/3ilSL9
-N1sPzzxGkod0feZlAkXrse2NeZZ7n4pDEz0c59bfe7Egv5iYaaKytNgU8NLpLN9p
-SqpI9okOf7a2H/Fs9PTvTfMagi/VSNcTuKb6UMyhtbS7kSJwyjUQPC9tWyGln5/4
-N5559ice8Cv3Se9sYvBqTojDRgV8XyDtHkcDoTqJgseSLOzF647fs1hDoAZss/Yu
-gfqwPOPcvNWRgsQYfuy9K93Wv4cON8S5+9sCAwEAAaNfMF0wPAYDVR0RBDUwM4IM
-YWFpLnVuaWZyLmNohiNodHRwczovL2FhaS51bmlmci5jaC9pZHAvc2hpYmJvbGV0
-aDAdBgNVHQ4EFgQUc+thXESrJ14M3LZRKwaX2rAt+kQwDQYJKoZIhvcNAQEFBQAD
-ggEBAI+oyk62mRG3tZ5cv5cNM7wAPRpZ/GLjxvM08T5UuIS2zEzMKLGNYIBQXHyV
-4ag2oaNzxaeDejks0v4ixkyT/X+uxe7H0wsHvfBUFGBIpp/F3RF1wLi1fadeQZbn
-bTS8R+Ie5ZvPjfwFLLB8C8kqp587RHcVr9N6IWAKY/2R2wfXATJ5cGrneQirgu3D
-/mKOvEvu+I1xF3b4gc+e2LL7IHhOMNbQFMRkE1+NBWlMCL/C7UqF4ZHeeZSC8CXQ
-/yx90ElnzFiImgYBLDF5a8Aa7UO8f7+hU+m2YaFbj/CNdD+XwFWbfr0va1UP0xas
-ACCNIbiIfzXCYUVLsTaQK7e25kA=
-						</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://aai.unifr.ch:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aai.unifr.ch:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">unifr.ch</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">Universität Freiburg</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">University of Fribourg</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="fr">Université de Fribourg</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.unifr.ch/</OrganizationURL>
-    <OrganizationURL xml:lang="en">http://www.unifr.ch/</OrganizationURL>
-    <OrganizationURL xml:lang="fr">http://www.unifr.ch/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>AAI</GivenName>
-    <SurName>Support Uni Fribourg</SurName>
-    <EmailAddress>mailto:aai@unifr.ch</EmailAddress>
-    <TelephoneNumber>+4126 300 7207</TelephoneNumber>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>AAI</GivenName>
-    <SurName>Support Uni Fribourg</SurName>
-    <EmailAddress>mailto:aai@unifr.ch</EmailAddress>
-    <TelephoneNumber>+4126 300 7207</TelephoneNumber>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/accounts.okeanos-global.grnet.gr-shibboleth.xml b/swamid-interfederations-2.0/accounts.okeanos-global.grnet.gr-shibboleth.xml
deleted file mode 100644
index f1a01701..00000000
--- a/swamid-interfederations-2.0/accounts.okeanos-global.grnet.gr-shibboleth.xml
+++ /dev/null
@@ -1,149 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://accounts.okeanos-global.grnet.gr/shibboleth">
-  <Extensions xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi">
-    <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>
-  <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">~okeanos global</mdui:DisplayName>
-        <mdui:Description xml:lang="en">~okeanos global GRNET cloud services</mdui:Description>
-        <mdui:InformationURL xml:lang="en">https://okeanos-global.grnet.gr/about/</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://accounts.okeanos-global.grnet.gr/ui/approval_terms</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="el">https://accounts.okeanos-global.grnet.gr/ui/approval_terms#grterm</mdui:PrivacyStatementURL>
-        <mdui:Logo height="64" width="250" xml:lang="en">https://okeanos-global.grnet.gr/static/medialibrary/2013/10/dashboard_logo.png</mdui:Logo>
-      </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://accounts.okeanos-global.grnet.gr/Shibboleth.sso/DS" index="1"/>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>accounts.okeanos-global.grnet.gr</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509Certificate>
-                            MIIEtjCCA56gAwIBAgIRAO4s6c+ETE33rnsC+Wz5hhQwDQYJKoZIhvcNAQEFBQAw
-                            NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-                            IFNTTCBDQTAeFw0xMzA5MjQwMDAwMDBaFw0xNjA5MjMyMzU5NTlaMFExITAfBgNV
-                            BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEsMCoGA1UEAxMjdzAuYWNjb3Vu
-                            dHMub2tlYW5vcy1nbG9iYWwuZ3JuZXQuZ3IwggEiMA0GCSqGSIb3DQEBAQUAA4IB
-                            DwAwggEKAoIBAQDeVhIzHDfEKAsN7lZbAUI5kKTf254hHjcg6VSAOEaZJb6RaEHJ
-                            N8E0+t6XL/E7lCVTd+K09FWuGCJryA7Ahc7IuYdvI/wOfVDU608bMmwKz12FVyEH
-                            eO8riEFnBt7QZ8HQmdnuOo0o3KtX4+dxfjonA46nm2j/5lgpDsFi9LdqotmI/El2
-                            fkovex5Fvsuu7uEFbejqdXyo/lZ6C5yhAqdnC/h6Tfq7/8nZu55nDtTKYnWhhSkX
-                            eKTOdbwJT4Y1BjkcfCZuBV4zTkA6wwA12gz7wHuz/8eU52jkWmYbzijXwU+AidzB
-                            6BRkCEFL51fOjSis7/czhnExClBf2+Ogg4QNAgMBAAGjggGiMIIBnjAfBgNVHSME
-                            GDAWgBQMvZNoDPPeq6NJays3V0fqkOO57TAdBgNVHQ4EFgQUziXgPt6+mYwwvgKL
-                            GoE2WB9Wr3UwDgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYw
-                            FAYIKwYBBQUHAwEGCCsGAQUFBwMCMCIGA1UdIAQbMBkwDQYLKwYBBAGyMQECAh0w
-                            CAYGZ4EMAQIBMDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVu
-                            YS5vcmcvVEVSRU5BU1NMQ0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcw
-                            AoYpaHR0cDovL2NydC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYI
-                            KwYBBQUHMAGGGmh0dHA6Ly9vY3NwLnRjcy50ZXJlbmEub3JnMFAGA1UdEQRJMEeC
-                            I3cwLmFjY291bnRzLm9rZWFub3MtZ2xvYmFsLmdybmV0LmdygiBhY2NvdW50cy5v
-                            a2Vhbm9zLWdsb2JhbC5ncm5ldC5ncjANBgkqhkiG9w0BAQUFAAOCAQEAqIDuYFZF
-                            SR4jPn1dUu8RXku1Ck0kzsb/p+b6D5nZtvUQxRGhUUw4TJy3onRH7qHInWBrJz0T
-                            tN18fxo8W6kIiIJS28qGurFfb3+z+vC1RyjARH07L7Z+ug+ubZeVVW4S3as6mPlx
-                            6efiRqCJz4sojxjy4xHUB1rKy+7i3fRxHivJyDbCDGKOy2VY/A3ORPGngxpZ1l3A
-                            Cxahaaq/tBTC3+tT7PmPcoEKlmwrGXn3E6b95mQ0iE1tZHb/oIekB/yGUENKMrze
-                            yjODwZKEzsFZOiN5R5mh/mDUTT3GfuYsLKlRoWg07oXaG9JcK57PnHeOtl6sjXtO
-                            yJEZ5Wfqywx4Bw==
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>accounts.okeanos-global.grnet.gr</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509Certificate>
-                            MIIEtjCCA56gAwIBAgIRAO4s6c+ETE33rnsC+Wz5hhQwDQYJKoZIhvcNAQEFBQAw
-                            NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-                            IFNTTCBDQTAeFw0xMzA5MjQwMDAwMDBaFw0xNjA5MjMyMzU5NTlaMFExITAfBgNV
-                            BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEsMCoGA1UEAxMjdzAuYWNjb3Vu
-                            dHMub2tlYW5vcy1nbG9iYWwuZ3JuZXQuZ3IwggEiMA0GCSqGSIb3DQEBAQUAA4IB
-                            DwAwggEKAoIBAQDeVhIzHDfEKAsN7lZbAUI5kKTf254hHjcg6VSAOEaZJb6RaEHJ
-                            N8E0+t6XL/E7lCVTd+K09FWuGCJryA7Ahc7IuYdvI/wOfVDU608bMmwKz12FVyEH
-                            eO8riEFnBt7QZ8HQmdnuOo0o3KtX4+dxfjonA46nm2j/5lgpDsFi9LdqotmI/El2
-                            fkovex5Fvsuu7uEFbejqdXyo/lZ6C5yhAqdnC/h6Tfq7/8nZu55nDtTKYnWhhSkX
-                            eKTOdbwJT4Y1BjkcfCZuBV4zTkA6wwA12gz7wHuz/8eU52jkWmYbzijXwU+AidzB
-                            6BRkCEFL51fOjSis7/czhnExClBf2+Ogg4QNAgMBAAGjggGiMIIBnjAfBgNVHSME
-                            GDAWgBQMvZNoDPPeq6NJays3V0fqkOO57TAdBgNVHQ4EFgQUziXgPt6+mYwwvgKL
-                            GoE2WB9Wr3UwDgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYw
-                            FAYIKwYBBQUHAwEGCCsGAQUFBwMCMCIGA1UdIAQbMBkwDQYLKwYBBAGyMQECAh0w
-                            CAYGZ4EMAQIBMDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVu
-                            YS5vcmcvVEVSRU5BU1NMQ0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcw
-                            AoYpaHR0cDovL2NydC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYI
-                            KwYBBQUHMAGGGmh0dHA6Ly9vY3NwLnRjcy50ZXJlbmEub3JnMFAGA1UdEQRJMEeC
-                            I3cwLmFjY291bnRzLm9rZWFub3MtZ2xvYmFsLmdybmV0LmdygiBhY2NvdW50cy5v
-                            a2Vhbm9zLWdsb2JhbC5ncm5ldC5ncjANBgkqhkiG9w0BAQUFAAOCAQEAqIDuYFZF
-                            SR4jPn1dUu8RXku1Ck0kzsb/p+b6D5nZtvUQxRGhUUw4TJy3onRH7qHInWBrJz0T
-                            tN18fxo8W6kIiIJS28qGurFfb3+z+vC1RyjARH07L7Z+ug+ubZeVVW4S3as6mPlx
-                            6efiRqCJz4sojxjy4xHUB1rKy+7i3fRxHivJyDbCDGKOy2VY/A3ORPGngxpZ1l3A
-                            Cxahaaq/tBTC3+tT7PmPcoEKlmwrGXn3E6b95mQ0iE1tZHb/oIekB/yGUENKMrze
-                            yjODwZKEzsFZOiN5R5mh/mDUTT3GfuYsLKlRoWg07oXaG9JcK57PnHeOtl6sjXtO
-                            yJEZ5Wfqywx4Bw==
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://accounts.okeanos-global.grnet.gr/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://accounts.okeanos-global.grnet.gr/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://accounts.okeanos-global.grnet.gr/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://accounts.okeanos-global.grnet.gr/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://accounts.okeanos-global.grnet.gr/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://accounts.okeanos-global.grnet.gr/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://accounts.okeanos-global.grnet.gr/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://accounts.okeanos-global.grnet.gr/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://accounts.okeanos-global.grnet.gr/Shibboleth.sso/NIM/Artifact"/>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://accounts.okeanos-global.grnet.gr/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://accounts.okeanos-global.grnet.gr/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://accounts.okeanos-global.grnet.gr/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://accounts.okeanos-global.grnet.gr/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://accounts.okeanos-global.grnet.gr/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://accounts.okeanos-global.grnet.gr/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <AttributeConsumingService index="0" isDefault="true">
-      <ServiceName xml:lang="en">~okeanos global</ServiceName>
-      <ServiceDescription xml:lang="en">~okeanos global GRNET cloud services</ServiceDescription>
-      <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="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri" isRequired="true"/>
-      <RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:mace:dir:attribute-def:eduPersonTargetedID" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri" isRequired="true"/>
-      <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="false"/>
-      <RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:mace:dir:attribute-def:eduPersonPrincipalName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri" isRequired="false"/>
-      <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="eduPersonAffiliation" Name="urn:mace:dir:attribute-def:eduPersonAffiliation" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri" isRequired="false"/>
-      <RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-      <RequestedAttribute FriendlyName="mail" Name="urn:mace:dir:attribute-def:mail" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri" isRequired="false"/>
-      <RequestedAttribute FriendlyName="cn" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-      <RequestedAttribute FriendlyName="cn" Name="urn:mace:dir:attribute-def:cn" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace: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="false"/>
-      <RequestedAttribute FriendlyName="displayName" Name="urn:mace:dir:attribute-def:displayName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace: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="givenName" Name="urn:mace:dir:attribute-def:givenName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace: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="surname" Name="urn:mace:dir:attribute-def:sn" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri" isRequired="false"/>
-    </AttributeConsumingService>
-  </SPSSODescriptor>
-  <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>
-    <TelephoneNumber>+30-2109569181</TelephoneNumber>
-  </ContactPerson>
-  <ContactPerson contactType="support">
-    <GivenName>~okeanos support</GivenName>
-    <EmailAddress>support@okeanos.grnet.gr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/accounts.okeanos-global.grnet.gr.xml b/swamid-interfederations-2.0/accounts.okeanos-global.grnet.gr.xml
deleted file mode 100644
index f1a01701..00000000
--- a/swamid-interfederations-2.0/accounts.okeanos-global.grnet.gr.xml
+++ /dev/null
@@ -1,149 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://accounts.okeanos-global.grnet.gr/shibboleth">
-  <Extensions xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi">
-    <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>
-  <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">~okeanos global</mdui:DisplayName>
-        <mdui:Description xml:lang="en">~okeanos global GRNET cloud services</mdui:Description>
-        <mdui:InformationURL xml:lang="en">https://okeanos-global.grnet.gr/about/</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://accounts.okeanos-global.grnet.gr/ui/approval_terms</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="el">https://accounts.okeanos-global.grnet.gr/ui/approval_terms#grterm</mdui:PrivacyStatementURL>
-        <mdui:Logo height="64" width="250" xml:lang="en">https://okeanos-global.grnet.gr/static/medialibrary/2013/10/dashboard_logo.png</mdui:Logo>
-      </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://accounts.okeanos-global.grnet.gr/Shibboleth.sso/DS" index="1"/>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>accounts.okeanos-global.grnet.gr</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509Certificate>
-                            MIIEtjCCA56gAwIBAgIRAO4s6c+ETE33rnsC+Wz5hhQwDQYJKoZIhvcNAQEFBQAw
-                            NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-                            IFNTTCBDQTAeFw0xMzA5MjQwMDAwMDBaFw0xNjA5MjMyMzU5NTlaMFExITAfBgNV
-                            BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEsMCoGA1UEAxMjdzAuYWNjb3Vu
-                            dHMub2tlYW5vcy1nbG9iYWwuZ3JuZXQuZ3IwggEiMA0GCSqGSIb3DQEBAQUAA4IB
-                            DwAwggEKAoIBAQDeVhIzHDfEKAsN7lZbAUI5kKTf254hHjcg6VSAOEaZJb6RaEHJ
-                            N8E0+t6XL/E7lCVTd+K09FWuGCJryA7Ahc7IuYdvI/wOfVDU608bMmwKz12FVyEH
-                            eO8riEFnBt7QZ8HQmdnuOo0o3KtX4+dxfjonA46nm2j/5lgpDsFi9LdqotmI/El2
-                            fkovex5Fvsuu7uEFbejqdXyo/lZ6C5yhAqdnC/h6Tfq7/8nZu55nDtTKYnWhhSkX
-                            eKTOdbwJT4Y1BjkcfCZuBV4zTkA6wwA12gz7wHuz/8eU52jkWmYbzijXwU+AidzB
-                            6BRkCEFL51fOjSis7/czhnExClBf2+Ogg4QNAgMBAAGjggGiMIIBnjAfBgNVHSME
-                            GDAWgBQMvZNoDPPeq6NJays3V0fqkOO57TAdBgNVHQ4EFgQUziXgPt6+mYwwvgKL
-                            GoE2WB9Wr3UwDgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYw
-                            FAYIKwYBBQUHAwEGCCsGAQUFBwMCMCIGA1UdIAQbMBkwDQYLKwYBBAGyMQECAh0w
-                            CAYGZ4EMAQIBMDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVu
-                            YS5vcmcvVEVSRU5BU1NMQ0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcw
-                            AoYpaHR0cDovL2NydC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYI
-                            KwYBBQUHMAGGGmh0dHA6Ly9vY3NwLnRjcy50ZXJlbmEub3JnMFAGA1UdEQRJMEeC
-                            I3cwLmFjY291bnRzLm9rZWFub3MtZ2xvYmFsLmdybmV0LmdygiBhY2NvdW50cy5v
-                            a2Vhbm9zLWdsb2JhbC5ncm5ldC5ncjANBgkqhkiG9w0BAQUFAAOCAQEAqIDuYFZF
-                            SR4jPn1dUu8RXku1Ck0kzsb/p+b6D5nZtvUQxRGhUUw4TJy3onRH7qHInWBrJz0T
-                            tN18fxo8W6kIiIJS28qGurFfb3+z+vC1RyjARH07L7Z+ug+ubZeVVW4S3as6mPlx
-                            6efiRqCJz4sojxjy4xHUB1rKy+7i3fRxHivJyDbCDGKOy2VY/A3ORPGngxpZ1l3A
-                            Cxahaaq/tBTC3+tT7PmPcoEKlmwrGXn3E6b95mQ0iE1tZHb/oIekB/yGUENKMrze
-                            yjODwZKEzsFZOiN5R5mh/mDUTT3GfuYsLKlRoWg07oXaG9JcK57PnHeOtl6sjXtO
-                            yJEZ5Wfqywx4Bw==
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>accounts.okeanos-global.grnet.gr</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509Certificate>
-                            MIIEtjCCA56gAwIBAgIRAO4s6c+ETE33rnsC+Wz5hhQwDQYJKoZIhvcNAQEFBQAw
-                            NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-                            IFNTTCBDQTAeFw0xMzA5MjQwMDAwMDBaFw0xNjA5MjMyMzU5NTlaMFExITAfBgNV
-                            BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEsMCoGA1UEAxMjdzAuYWNjb3Vu
-                            dHMub2tlYW5vcy1nbG9iYWwuZ3JuZXQuZ3IwggEiMA0GCSqGSIb3DQEBAQUAA4IB
-                            DwAwggEKAoIBAQDeVhIzHDfEKAsN7lZbAUI5kKTf254hHjcg6VSAOEaZJb6RaEHJ
-                            N8E0+t6XL/E7lCVTd+K09FWuGCJryA7Ahc7IuYdvI/wOfVDU608bMmwKz12FVyEH
-                            eO8riEFnBt7QZ8HQmdnuOo0o3KtX4+dxfjonA46nm2j/5lgpDsFi9LdqotmI/El2
-                            fkovex5Fvsuu7uEFbejqdXyo/lZ6C5yhAqdnC/h6Tfq7/8nZu55nDtTKYnWhhSkX
-                            eKTOdbwJT4Y1BjkcfCZuBV4zTkA6wwA12gz7wHuz/8eU52jkWmYbzijXwU+AidzB
-                            6BRkCEFL51fOjSis7/czhnExClBf2+Ogg4QNAgMBAAGjggGiMIIBnjAfBgNVHSME
-                            GDAWgBQMvZNoDPPeq6NJays3V0fqkOO57TAdBgNVHQ4EFgQUziXgPt6+mYwwvgKL
-                            GoE2WB9Wr3UwDgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYw
-                            FAYIKwYBBQUHAwEGCCsGAQUFBwMCMCIGA1UdIAQbMBkwDQYLKwYBBAGyMQECAh0w
-                            CAYGZ4EMAQIBMDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVu
-                            YS5vcmcvVEVSRU5BU1NMQ0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcw
-                            AoYpaHR0cDovL2NydC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYI
-                            KwYBBQUHMAGGGmh0dHA6Ly9vY3NwLnRjcy50ZXJlbmEub3JnMFAGA1UdEQRJMEeC
-                            I3cwLmFjY291bnRzLm9rZWFub3MtZ2xvYmFsLmdybmV0LmdygiBhY2NvdW50cy5v
-                            a2Vhbm9zLWdsb2JhbC5ncm5ldC5ncjANBgkqhkiG9w0BAQUFAAOCAQEAqIDuYFZF
-                            SR4jPn1dUu8RXku1Ck0kzsb/p+b6D5nZtvUQxRGhUUw4TJy3onRH7qHInWBrJz0T
-                            tN18fxo8W6kIiIJS28qGurFfb3+z+vC1RyjARH07L7Z+ug+ubZeVVW4S3as6mPlx
-                            6efiRqCJz4sojxjy4xHUB1rKy+7i3fRxHivJyDbCDGKOy2VY/A3ORPGngxpZ1l3A
-                            Cxahaaq/tBTC3+tT7PmPcoEKlmwrGXn3E6b95mQ0iE1tZHb/oIekB/yGUENKMrze
-                            yjODwZKEzsFZOiN5R5mh/mDUTT3GfuYsLKlRoWg07oXaG9JcK57PnHeOtl6sjXtO
-                            yJEZ5Wfqywx4Bw==
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://accounts.okeanos-global.grnet.gr/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://accounts.okeanos-global.grnet.gr/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://accounts.okeanos-global.grnet.gr/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://accounts.okeanos-global.grnet.gr/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://accounts.okeanos-global.grnet.gr/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://accounts.okeanos-global.grnet.gr/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://accounts.okeanos-global.grnet.gr/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://accounts.okeanos-global.grnet.gr/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://accounts.okeanos-global.grnet.gr/Shibboleth.sso/NIM/Artifact"/>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://accounts.okeanos-global.grnet.gr/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://accounts.okeanos-global.grnet.gr/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://accounts.okeanos-global.grnet.gr/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://accounts.okeanos-global.grnet.gr/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://accounts.okeanos-global.grnet.gr/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://accounts.okeanos-global.grnet.gr/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <AttributeConsumingService index="0" isDefault="true">
-      <ServiceName xml:lang="en">~okeanos global</ServiceName>
-      <ServiceDescription xml:lang="en">~okeanos global GRNET cloud services</ServiceDescription>
-      <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="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri" isRequired="true"/>
-      <RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:mace:dir:attribute-def:eduPersonTargetedID" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri" isRequired="true"/>
-      <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="false"/>
-      <RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:mace:dir:attribute-def:eduPersonPrincipalName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri" isRequired="false"/>
-      <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="eduPersonAffiliation" Name="urn:mace:dir:attribute-def:eduPersonAffiliation" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri" isRequired="false"/>
-      <RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-      <RequestedAttribute FriendlyName="mail" Name="urn:mace:dir:attribute-def:mail" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri" isRequired="false"/>
-      <RequestedAttribute FriendlyName="cn" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-      <RequestedAttribute FriendlyName="cn" Name="urn:mace:dir:attribute-def:cn" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace: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="false"/>
-      <RequestedAttribute FriendlyName="displayName" Name="urn:mace:dir:attribute-def:displayName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace: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="givenName" Name="urn:mace:dir:attribute-def:givenName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace: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="surname" Name="urn:mace:dir:attribute-def:sn" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri" isRequired="false"/>
-    </AttributeConsumingService>
-  </SPSSODescriptor>
-  <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>
-    <TelephoneNumber>+30-2109569181</TelephoneNumber>
-  </ContactPerson>
-  <ContactPerson contactType="support">
-    <GivenName>~okeanos support</GivenName>
-    <EmailAddress>support@okeanos.grnet.gr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/adfs.tue.nl-adfs-services-trust.xml b/swamid-interfederations-2.0/adfs.tue.nl-adfs-services-trust.xml
deleted file mode 100644
index f8211026..00000000
--- a/swamid-interfederations-2.0/adfs.tue.nl-adfs-services-trust.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" entityID="http://adfs.tue.nl/adfs/services/trust">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.surfconext.nl/" registrationInstant="2013-03-20T12:22:05Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://wiki.surfnetlabs.nl/display/eduGAIN/EduGAIN</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="nl">Technische Universiteit Eindhoven</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Eindhoven University of Technology</mdui:DisplayName>
-        <mdui:Description xml:lang="nl">Technische Universiteit Eindhoven</mdui:Description>
-        <mdui:Description xml:lang="en">Technische Universiteit Eindhoven</mdui:Description>
-        <mdui:Logo height="60" width="120">https://static.surfconext.nl/media/idp/tue.png</mdui:Logo>
-        <mdui:Keywords xml:lang="nl">Eindhoven University of Technology Technische Universiteit Eindhoven TUE</mdui:Keywords>
-        <mdui:Keywords xml:lang="en">Eindhoven University of Technology Technische Universiteit Eindhoven TUE</mdui:Keywords>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor xmlns:ds="http://www.w3.org/2000/09/xmldsig#" use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIID3zCCAsegAwIBAgIJAMVC9xn1ZfsuMA0GCSqGSIb3DQEBCwUAMIGFMQswCQYD
-VQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMG
-A1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQD
-DB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTAeFw0xNDA1MDUxNDIyMzVa
-Fw0xOTA1MDUxNDIyMzVaMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNo
-dDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYD
-VQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAy
-MDE0MDUwNTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKthMDbB0jKH
-efPzmRu9t2h7iLP4wAXr42bHpjzTEk6gttHFb4l/hFiz1YBI88TjiH6hVjnozo/Y
-HA2c51us+Y7g0XoS7653lbUN/EHzvDMuyis4Xi2Ijf1A/OUQfH1iFUWttIgtWK9+
-fatXoGUS6tirQvrzVh6ZstEp1xbpo1SF6UoVl+fh7tM81qz+Crr/Kroan0UjpZOF
-TwxPoK6fdLgMAieKSCRmBGpbJHbQ2xxbdykBBrBbdfzIX4CDepfjE9h/40ldw5jR
-n3e392jrS6htk23N9BWWrpBT5QCk0kH3h/6F1Dm6TkyG9CDtt73/anuRkvXbeygI
-4wml9bL3rE8CAwEAAaNQME4wHQYDVR0OBBYEFD+Ac7akFxaMhBQAjVfvgGfY8hNK
-MB8GA1UdIwQYMBaAFD+Ac7akFxaMhBQAjVfvgGfY8hNKMAwGA1UdEwQFMAMBAf8w
-DQYJKoZIhvcNAQELBQADggEBAC8L9D67CxIhGo5aGVu63WqRHBNOdo/FAGI7LURD
-FeRmG5nRw/VXzJLGJksh4FSkx7aPrxNWF1uFiDZ80EuYQuIv7bDLblK31ZEbdg1R
-9LgiZCdYSr464I7yXQY9o6FiNtSKZkQO8EsscJPPy/Zp4uHAnADWACkOUHiCbcKi
-UUFu66dX0Wr/v53Gekz487GgVRs8HEeT9MU1reBKRgdENR8PNg4rbQfLc3YQKLWK
-7yWnn/RenjDpuCiePj8N8/80tGgrNgK/6fzM3zI18sSywnXLswxqDb/J+jgVxnQ6
-MrsTf1urM8MnfcxG/82oHIwfMh/sXPCZpo+DTLkhQxctJ3M=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:NameIDFormat xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:NameIDFormat xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">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://engine.surfconext.nl/authentication/idp/single-sign-on/094f85b774f9b4334638677b70d5755c"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="nl">Technische Universiteit Eindhoven</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">Technische Universiteit Eindhoven</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Technische Universiteit Eindhoven</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.surffederatie.nl</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>SURFconext-beheer</md:GivenName>
-    <md:EmailAddress>SURFconext-beheer@surfnet.nl</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>SURFconext-beheer</md:GivenName>
-    <md:EmailAddress>SURFconext-beheer@surfnet.nl</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>SURFconext support</md:GivenName>
-    <md:EmailAddress>help@surfconext.nl</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/adfs.tue.nl.xml b/swamid-interfederations-2.0/adfs.tue.nl.xml
deleted file mode 100644
index f8211026..00000000
--- a/swamid-interfederations-2.0/adfs.tue.nl.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" entityID="http://adfs.tue.nl/adfs/services/trust">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.surfconext.nl/" registrationInstant="2013-03-20T12:22:05Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://wiki.surfnetlabs.nl/display/eduGAIN/EduGAIN</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="nl">Technische Universiteit Eindhoven</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Eindhoven University of Technology</mdui:DisplayName>
-        <mdui:Description xml:lang="nl">Technische Universiteit Eindhoven</mdui:Description>
-        <mdui:Description xml:lang="en">Technische Universiteit Eindhoven</mdui:Description>
-        <mdui:Logo height="60" width="120">https://static.surfconext.nl/media/idp/tue.png</mdui:Logo>
-        <mdui:Keywords xml:lang="nl">Eindhoven University of Technology Technische Universiteit Eindhoven TUE</mdui:Keywords>
-        <mdui:Keywords xml:lang="en">Eindhoven University of Technology Technische Universiteit Eindhoven TUE</mdui:Keywords>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor xmlns:ds="http://www.w3.org/2000/09/xmldsig#" use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIID3zCCAsegAwIBAgIJAMVC9xn1ZfsuMA0GCSqGSIb3DQEBCwUAMIGFMQswCQYD
-VQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMG
-A1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQD
-DB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTAeFw0xNDA1MDUxNDIyMzVa
-Fw0xOTA1MDUxNDIyMzVaMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNo
-dDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYD
-VQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAy
-MDE0MDUwNTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKthMDbB0jKH
-efPzmRu9t2h7iLP4wAXr42bHpjzTEk6gttHFb4l/hFiz1YBI88TjiH6hVjnozo/Y
-HA2c51us+Y7g0XoS7653lbUN/EHzvDMuyis4Xi2Ijf1A/OUQfH1iFUWttIgtWK9+
-fatXoGUS6tirQvrzVh6ZstEp1xbpo1SF6UoVl+fh7tM81qz+Crr/Kroan0UjpZOF
-TwxPoK6fdLgMAieKSCRmBGpbJHbQ2xxbdykBBrBbdfzIX4CDepfjE9h/40ldw5jR
-n3e392jrS6htk23N9BWWrpBT5QCk0kH3h/6F1Dm6TkyG9CDtt73/anuRkvXbeygI
-4wml9bL3rE8CAwEAAaNQME4wHQYDVR0OBBYEFD+Ac7akFxaMhBQAjVfvgGfY8hNK
-MB8GA1UdIwQYMBaAFD+Ac7akFxaMhBQAjVfvgGfY8hNKMAwGA1UdEwQFMAMBAf8w
-DQYJKoZIhvcNAQELBQADggEBAC8L9D67CxIhGo5aGVu63WqRHBNOdo/FAGI7LURD
-FeRmG5nRw/VXzJLGJksh4FSkx7aPrxNWF1uFiDZ80EuYQuIv7bDLblK31ZEbdg1R
-9LgiZCdYSr464I7yXQY9o6FiNtSKZkQO8EsscJPPy/Zp4uHAnADWACkOUHiCbcKi
-UUFu66dX0Wr/v53Gekz487GgVRs8HEeT9MU1reBKRgdENR8PNg4rbQfLc3YQKLWK
-7yWnn/RenjDpuCiePj8N8/80tGgrNgK/6fzM3zI18sSywnXLswxqDb/J+jgVxnQ6
-MrsTf1urM8MnfcxG/82oHIwfMh/sXPCZpo+DTLkhQxctJ3M=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:NameIDFormat xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:NameIDFormat xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">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://engine.surfconext.nl/authentication/idp/single-sign-on/094f85b774f9b4334638677b70d5755c"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="nl">Technische Universiteit Eindhoven</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">Technische Universiteit Eindhoven</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Technische Universiteit Eindhoven</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.surffederatie.nl</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>SURFconext-beheer</md:GivenName>
-    <md:EmailAddress>SURFconext-beheer@surfnet.nl</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>SURFconext-beheer</md:GivenName>
-    <md:EmailAddress>SURFconext-beheer@surfnet.nl</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>SURFconext support</md:GivenName>
-    <md:EmailAddress>help@surfconext.nl</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/agata.suz.cvut.cz-shibboleth.xml b/swamid-interfederations-2.0/agata.suz.cvut.cz-shibboleth.xml
deleted file mode 100644
index 0e23cee0..00000000
--- a/swamid-interfederations-2.0/agata.suz.cvut.cz-shibboleth.xml
+++ /dev/null
@@ -1,109 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://agata.suz.cvut.cz/shibboleth">
-  <md:Extensions xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport">
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/" registrationInstant="2013-08-16T09:51:28Z">
-      <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>
-      <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://agata.suz.cvut.cz/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://agata.suz.cvut.cz/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Czech Technical University in Prague</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="cs">České vysoké učení technické v Praze</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Canteens of CTU in Prague</mdui:Description>
-        <mdui:Description xml:lang="cs">Menzy ČVUT v Praze</mdui:Description>
-        <mdui:InformationURL xml:lang="en">https://www.suz.cvut.cz/en/the-facilities-administration-department-of-the-czech-technical-university-in-prague</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="cs">https://www.suz.cvut.cz/sprava-ucelovych-zarizeni-cvut</mdui:InformationURL>
-        <mdui:Logo height="40" width="53">https://idp2.civ.cvut.cz/idp/images/logo_cvut_40pix.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>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>agata.suz.cvut.cz</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=agata.suz.cvut.cz,OU=Domain Control Validated</ds:X509SubjectName>
-          <ds:X509Certificate>MIIEcDCCA1igAwIBAgIRAJSnezeeSwDm9u6PQ2mCUPswDQYJKoZIhvcNAQEFBQAw
-NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-IFNTTCBDQTAeFw0xMzA3MDEwMDAwMDBaFw0xNjA2MzAyMzU5NTlaMD8xITAfBgNV
-BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEaMBgGA1UEAxMRYWdhdGEuc3V6
-LmN2dXQuY3owggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCkNwyaiPvQ
-fx1lS9AYlyR5VAYOwy/1KBC3FhSdGLMVpYYFIvVCEK5yDqQs6D7edBnjvqoDkIkU
-cbb6LZGz0bmiSMOE5toxMb1r8XzNcjzXe4Rn8NtFbO2lSUp77eTvMt4sTdmq1Krg
-7n5XuS0SrbIcWTh4M81QazVCIpD4L/elNCgyptKWw77EbRYe6as5lJsCcujSDCHD
-gO+gOqCM3fvOLSoCZv6zDnBAS4BVnfOOB4yRZgW5koIMFVnuXkMmyrqSc9kUiWp4
-EjghtgPuVsuhf+KWHegH63HfRBA7wp6Ukz/gkkBmRRIg4ogPUkBQJpTIBmCFHune
-hMUcueegHqRfAgMBAAGjggFuMIIBajAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3
-V0fqkOO57TAdBgNVHQ4EFgQUWeCB62InMSMtp9LL306vFP2jVsgwDgYDVR0PAQH/
-BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUF
-BwMCMCIGA1UdIAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQIBMDoGA1UdHwQz
-MDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0Eu
-Y3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50Y3Mu
-dGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9v
-Y3NwLnRjcy50ZXJlbmEub3JnMBwGA1UdEQQVMBOCEWFnYXRhLnN1ei5jdnV0LmN6
-MA0GCSqGSIb3DQEBBQUAA4IBAQCb5NX/OotQMluDW6r3mCtXGnkSHRikC75D8+ua
-ZEobB7MQHoeJg6ked7FlkatHkoqH2CZL7B66y9mhFJUFSHhRqjmudWRrJBW4SnME
-qnYLXX2q6NSmac3fH7P6BL7FyhED9+T+zfHI99A8oplvnXf4Vws/89hbzopCoI0+
-b++srMBwK/0XLocTzlTHhzCeNKflpEsP5YlNRvj4S25FhCb82Cmd+hL2OQen5000
-C0SakbhPqTeJv59bCJOjYhLfDW90dnn3HjdManRagoyE2zGCa88C7vSqwxabi7fj
-Bie8tt/8TZ/a7EDN0YLJRmmMLKKCTwebuCYsUFiMOLdqCK2+
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://agata.suz.cvut.cz/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://agata.suz.cvut.cz/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://agata.suz.cvut.cz/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://agata.suz.cvut.cz/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://agata.suz.cvut.cz/Shibboleth.sso/SLO/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://agata.suz.cvut.cz/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://agata.suz.cvut.cz/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://agata.suz.cvut.cz/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://agata.suz.cvut.cz/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://agata.suz.cvut.cz/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://agata.suz.cvut.cz/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="cs">ČVUT</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">CTU</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="cs">České vysoké učení technické v Praze</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Czech Technical University in Prague</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="cs">http://www.cvut.cz/cs</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.cvut.cz/en</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Tomas</md:GivenName>
-    <md:SurName>Kanovsky</md:SurName>
-    <md:EmailAddress>kanovsky@suz.cvut.cz</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/agata.suz.cvut.cz.xml b/swamid-interfederations-2.0/agata.suz.cvut.cz.xml
deleted file mode 100644
index 0e23cee0..00000000
--- a/swamid-interfederations-2.0/agata.suz.cvut.cz.xml
+++ /dev/null
@@ -1,109 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://agata.suz.cvut.cz/shibboleth">
-  <md:Extensions xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport">
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/" registrationInstant="2013-08-16T09:51:28Z">
-      <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>
-      <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://agata.suz.cvut.cz/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://agata.suz.cvut.cz/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Czech Technical University in Prague</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="cs">České vysoké učení technické v Praze</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Canteens of CTU in Prague</mdui:Description>
-        <mdui:Description xml:lang="cs">Menzy ČVUT v Praze</mdui:Description>
-        <mdui:InformationURL xml:lang="en">https://www.suz.cvut.cz/en/the-facilities-administration-department-of-the-czech-technical-university-in-prague</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="cs">https://www.suz.cvut.cz/sprava-ucelovych-zarizeni-cvut</mdui:InformationURL>
-        <mdui:Logo height="40" width="53">https://idp2.civ.cvut.cz/idp/images/logo_cvut_40pix.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>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>agata.suz.cvut.cz</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=agata.suz.cvut.cz,OU=Domain Control Validated</ds:X509SubjectName>
-          <ds:X509Certificate>MIIEcDCCA1igAwIBAgIRAJSnezeeSwDm9u6PQ2mCUPswDQYJKoZIhvcNAQEFBQAw
-NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-IFNTTCBDQTAeFw0xMzA3MDEwMDAwMDBaFw0xNjA2MzAyMzU5NTlaMD8xITAfBgNV
-BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEaMBgGA1UEAxMRYWdhdGEuc3V6
-LmN2dXQuY3owggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCkNwyaiPvQ
-fx1lS9AYlyR5VAYOwy/1KBC3FhSdGLMVpYYFIvVCEK5yDqQs6D7edBnjvqoDkIkU
-cbb6LZGz0bmiSMOE5toxMb1r8XzNcjzXe4Rn8NtFbO2lSUp77eTvMt4sTdmq1Krg
-7n5XuS0SrbIcWTh4M81QazVCIpD4L/elNCgyptKWw77EbRYe6as5lJsCcujSDCHD
-gO+gOqCM3fvOLSoCZv6zDnBAS4BVnfOOB4yRZgW5koIMFVnuXkMmyrqSc9kUiWp4
-EjghtgPuVsuhf+KWHegH63HfRBA7wp6Ukz/gkkBmRRIg4ogPUkBQJpTIBmCFHune
-hMUcueegHqRfAgMBAAGjggFuMIIBajAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3
-V0fqkOO57TAdBgNVHQ4EFgQUWeCB62InMSMtp9LL306vFP2jVsgwDgYDVR0PAQH/
-BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUF
-BwMCMCIGA1UdIAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQIBMDoGA1UdHwQz
-MDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0Eu
-Y3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50Y3Mu
-dGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9v
-Y3NwLnRjcy50ZXJlbmEub3JnMBwGA1UdEQQVMBOCEWFnYXRhLnN1ei5jdnV0LmN6
-MA0GCSqGSIb3DQEBBQUAA4IBAQCb5NX/OotQMluDW6r3mCtXGnkSHRikC75D8+ua
-ZEobB7MQHoeJg6ked7FlkatHkoqH2CZL7B66y9mhFJUFSHhRqjmudWRrJBW4SnME
-qnYLXX2q6NSmac3fH7P6BL7FyhED9+T+zfHI99A8oplvnXf4Vws/89hbzopCoI0+
-b++srMBwK/0XLocTzlTHhzCeNKflpEsP5YlNRvj4S25FhCb82Cmd+hL2OQen5000
-C0SakbhPqTeJv59bCJOjYhLfDW90dnn3HjdManRagoyE2zGCa88C7vSqwxabi7fj
-Bie8tt/8TZ/a7EDN0YLJRmmMLKKCTwebuCYsUFiMOLdqCK2+
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://agata.suz.cvut.cz/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://agata.suz.cvut.cz/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://agata.suz.cvut.cz/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://agata.suz.cvut.cz/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://agata.suz.cvut.cz/Shibboleth.sso/SLO/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://agata.suz.cvut.cz/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://agata.suz.cvut.cz/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://agata.suz.cvut.cz/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://agata.suz.cvut.cz/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://agata.suz.cvut.cz/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://agata.suz.cvut.cz/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="cs">ČVUT</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">CTU</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="cs">České vysoké učení technické v Praze</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Czech Technical University in Prague</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="cs">http://www.cvut.cz/cs</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.cvut.cz/en</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Tomas</md:GivenName>
-    <md:SurName>Kanovsky</md:SurName>
-    <md:EmailAddress>kanovsky@suz.cvut.cz</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/aginfra-sg.ct.infn.it-shibboleth.xml b/swamid-interfederations-2.0/aginfra-sg.ct.infn.it-shibboleth.xml
deleted file mode 100644
index 02847bc8..00000000
--- a/swamid-interfederations-2.0/aginfra-sg.ct.infn.it-shibboleth.xml
+++ /dev/null
@@ -1,97 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" entityID="https://aginfra-sg.ct.infn.it/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2012-07-06T15:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</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>
-        <mdui:DisplayName xml:lang="en">agINFRA Science Gateway</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="it">agINFRA Science Gateway</mdui:DisplayName>
-        <mdui:Description xml:lang="en">This Science Gateway has been built mainly for the Virtual Research Community of the agINFRA project but it is of course open to everybody interested in agricultural sciences. The agINFRA Science Gateway meshes-up Grid Computing and Cloud Computing enabled applications and lets users access them in an easy, transparent and ubiquitous way.</mdui:Description>
-        <mdui:Description xml:lang="it">This Science Gateway has been built mainly for the Virtual Research Community of the agINFRA project but it is of course open to everybody interested in agricultural sciences. The agINFRA Science Gateway meshes-up Grid Computing and Cloud Computing enabled applications and lets users access them in an easy, transparent and ubiquitous way.</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://aginfra-sg.ct.infn.it/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="it">http://aginfra-sg.ct.infn.it/</mdui:InformationURL>
-      </mdui:UIInfo>
-      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://aginfra-sg.ct.infn.it/Shibboleth.sso/DS"/>
-      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://aginfra-sg.ct.infn.it/Shibboleth.sso/DS" index="1"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIF0TCCBLmgAwIBAgIRAJjvs9uxU/ydSPVPqQh6szEwDQYJKoZIhvcNAQEFBQAw
-NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-IFNTTCBDQTAeFw0xMzAxMDcwMDAwMDBaFw0xNjAxMDcyMzU5NTlaMIHFMQswCQYD
-VQQGEwJJVDEOMAwGA1UEERMFOTUxMjMxDjAMBgNVBAgTBUl0YWx5MRAwDgYDVQQH
-EwdDYXRhbmlhMRkwFwYDVQQJExBWaWEgUy5Tb2ZpYSBuLjY0MS4wLAYDVQQKEyVJ
-c3RpdHV0byBOYXppb25hbGUgZGkgRmlzaWNhIE51Y2xlYXJlMQ8wDQYDVQQLEwZD
-T01FVEExKDAmBgNVBAMTH3d3dy5jYXRhbmlhLXNjaWVuY2UtZ2F0ZXdheXMuaXQw
-ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDMR2RMw4cNImWSKdvZjDhz
-3JuO7/pMOnGw4hF6uu09cqX8qqBpkU/gd33xq7J254ojywwiIlLT7QaTce4YQU2W
-O5mPyqdHjnpA+C0fJWrQgRyJEXsOzwpxyUG42tim/9jgNNDaUuNSGgrMLGlzl0sU
-i3Cq04AY0hukrtFGe6DFvDsm8xoNwfV8jmO3IipWJdJdezRnCGDgTZqgIWj3yrHo
-LjfgLbs85AJ31plMahcEni1jDZYgzu7FurbKpO4FGSLUEI8VUxncdYx3IWidqYBD
-TjxFGIiRIcD59DTIBxZYT4IgGHhG1whnUtE7nZhtuxFvnxfH4gPi7mPcRwidNHg9
-AgMBAAGjggJIMIICRDAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3V0fqkOO57TAd
-BgNVHQ4EFgQU+qOkofxo+Ei3aGD2lLEkM4L7LS0wDgYDVR0PAQH/BAQDAgWgMAwG
-A1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMCIGA1Ud
-IAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQICMDoGA1UdHwQzMDEwL6AtoCuG
-KWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3JsMG0GCCsG
-AQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50Y3MudGVyZW5hLm9y
-Zy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9vY3NwLnRjcy50
-ZXJlbmEub3JnMIH1BgNVHREEge0wgeqCH3d3dy5jYXRhbmlhLXNjaWVuY2UtZ2F0
-ZXdheXMuaXSCFWFnaW5mcmEtc2cuY3QuaW5mbi5pdIIVY29naXRvLW1lZC5jdC5p
-bmZuLml0giJlYXJ0aHNlcnZlci1zZy5jb25zb3J6aW8tY29tZXRhLml0gg5lY3Nn
-LmRjaC1ycC5ldYISZ2Fyci1zZy5jdC5pbmZuLml0ghBrbGlvcy5jdC5pbmZuLml0
-ghNsaWZlcmF5Mi5jdC5pbmZuLml0ghNzZ3cuYWZyaWNhLWdyaWQub3JnghV3d3cu
-cHJvZ2V0dG8taWNhcm8uaXQwDQYJKoZIhvcNAQEFBQADggEBAIzikPZKDI8rXlUU
-iF8KUeEVYZMyBfRtl0sQYBZCprDoVpCr74CPTxQ72Jrh2mD8oAz0ZYVgOA19AbM8
-PskJlhx4bmDJvWU/C2FrOgYDNg9Tl7dqLnr18GDt7DuC0KXCDupgtBmwy7mayNgA
-n2jbIaYsfMI7k1msS1XoaVX7kBMgmeGY3V11Om9Te7iMWKFOhpavI2hbf741ODtV
-zBen58Q2WzjVEKVQYbY7UgtcYzOM44GhMcdS65lLsBviK7HzyB6I5Iu3TR0bcpFE
-2V4bd6L5foq3Qn+WO9wqOwnOk3qfD/TQId7NWv0ZE2vp8fPPaaRF2XcA7Qh5xltt
-j/MCNlE=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aginfra-sg.ct.infn.it/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aginfra-sg.ct.infn.it/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://aginfra-sg.ct.infn.it/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://aginfra-sg.ct.infn.it/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://aginfra-sg.ct.infn.it/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://aginfra-sg.ct.infn.it/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://aginfra-sg.ct.infn.it/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://aginfra-sg.ct.infn.it/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://aginfra-sg.ct.infn.it/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://aginfra-sg.ct.infn.it/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://aginfra-sg.ct.infn.it/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <AttributeConsumingService index="1">
-      <ServiceName xml:lang="en">agINFRA Science Gateway</ServiceName>
-      <ServiceDescription xml:lang="en">The agINFRA Science Gateway meshes-up Grid Computing and Cloud Computing enabled applications and lets users access them in an easy, transparent and ubiquitous way.</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"/>
-    </AttributeConsumingService>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">INFN Catania</OrganizationName>
-    <OrganizationName xml:lang="it">INFN Catania</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">agINFRA Science Gateway provided by INFN Catania</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="it">agINFRA Science Gateway erogato da INFN Catania</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.ct.infn.it/index.php?lang=en</OrganizationURL>
-    <OrganizationURL xml:lang="it">http://www.ct.infn.it/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Riccardo</GivenName>
-    <SurName>Rotondo</SurName>
-    <EmailAddress>riccardo.rotondo@ct.infn.it</EmailAddress>
-    <EmailAddress>riccardo.rotondo@garr.it</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="administrative">
-    <GivenName>Roberto</GivenName>
-    <SurName>Barbera</SurName>
-    <EmailAddress>roberto.barbera@ct.infn.it</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/aginfra-sg.ct.infn.it.xml b/swamid-interfederations-2.0/aginfra-sg.ct.infn.it.xml
deleted file mode 100644
index 02847bc8..00000000
--- a/swamid-interfederations-2.0/aginfra-sg.ct.infn.it.xml
+++ /dev/null
@@ -1,97 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" entityID="https://aginfra-sg.ct.infn.it/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2012-07-06T15:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</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>
-        <mdui:DisplayName xml:lang="en">agINFRA Science Gateway</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="it">agINFRA Science Gateway</mdui:DisplayName>
-        <mdui:Description xml:lang="en">This Science Gateway has been built mainly for the Virtual Research Community of the agINFRA project but it is of course open to everybody interested in agricultural sciences. The agINFRA Science Gateway meshes-up Grid Computing and Cloud Computing enabled applications and lets users access them in an easy, transparent and ubiquitous way.</mdui:Description>
-        <mdui:Description xml:lang="it">This Science Gateway has been built mainly for the Virtual Research Community of the agINFRA project but it is of course open to everybody interested in agricultural sciences. The agINFRA Science Gateway meshes-up Grid Computing and Cloud Computing enabled applications and lets users access them in an easy, transparent and ubiquitous way.</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://aginfra-sg.ct.infn.it/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="it">http://aginfra-sg.ct.infn.it/</mdui:InformationURL>
-      </mdui:UIInfo>
-      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://aginfra-sg.ct.infn.it/Shibboleth.sso/DS"/>
-      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://aginfra-sg.ct.infn.it/Shibboleth.sso/DS" index="1"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIF0TCCBLmgAwIBAgIRAJjvs9uxU/ydSPVPqQh6szEwDQYJKoZIhvcNAQEFBQAw
-NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-IFNTTCBDQTAeFw0xMzAxMDcwMDAwMDBaFw0xNjAxMDcyMzU5NTlaMIHFMQswCQYD
-VQQGEwJJVDEOMAwGA1UEERMFOTUxMjMxDjAMBgNVBAgTBUl0YWx5MRAwDgYDVQQH
-EwdDYXRhbmlhMRkwFwYDVQQJExBWaWEgUy5Tb2ZpYSBuLjY0MS4wLAYDVQQKEyVJ
-c3RpdHV0byBOYXppb25hbGUgZGkgRmlzaWNhIE51Y2xlYXJlMQ8wDQYDVQQLEwZD
-T01FVEExKDAmBgNVBAMTH3d3dy5jYXRhbmlhLXNjaWVuY2UtZ2F0ZXdheXMuaXQw
-ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDMR2RMw4cNImWSKdvZjDhz
-3JuO7/pMOnGw4hF6uu09cqX8qqBpkU/gd33xq7J254ojywwiIlLT7QaTce4YQU2W
-O5mPyqdHjnpA+C0fJWrQgRyJEXsOzwpxyUG42tim/9jgNNDaUuNSGgrMLGlzl0sU
-i3Cq04AY0hukrtFGe6DFvDsm8xoNwfV8jmO3IipWJdJdezRnCGDgTZqgIWj3yrHo
-LjfgLbs85AJ31plMahcEni1jDZYgzu7FurbKpO4FGSLUEI8VUxncdYx3IWidqYBD
-TjxFGIiRIcD59DTIBxZYT4IgGHhG1whnUtE7nZhtuxFvnxfH4gPi7mPcRwidNHg9
-AgMBAAGjggJIMIICRDAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3V0fqkOO57TAd
-BgNVHQ4EFgQU+qOkofxo+Ei3aGD2lLEkM4L7LS0wDgYDVR0PAQH/BAQDAgWgMAwG
-A1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMCIGA1Ud
-IAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQICMDoGA1UdHwQzMDEwL6AtoCuG
-KWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3JsMG0GCCsG
-AQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50Y3MudGVyZW5hLm9y
-Zy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9vY3NwLnRjcy50
-ZXJlbmEub3JnMIH1BgNVHREEge0wgeqCH3d3dy5jYXRhbmlhLXNjaWVuY2UtZ2F0
-ZXdheXMuaXSCFWFnaW5mcmEtc2cuY3QuaW5mbi5pdIIVY29naXRvLW1lZC5jdC5p
-bmZuLml0giJlYXJ0aHNlcnZlci1zZy5jb25zb3J6aW8tY29tZXRhLml0gg5lY3Nn
-LmRjaC1ycC5ldYISZ2Fyci1zZy5jdC5pbmZuLml0ghBrbGlvcy5jdC5pbmZuLml0
-ghNsaWZlcmF5Mi5jdC5pbmZuLml0ghNzZ3cuYWZyaWNhLWdyaWQub3JnghV3d3cu
-cHJvZ2V0dG8taWNhcm8uaXQwDQYJKoZIhvcNAQEFBQADggEBAIzikPZKDI8rXlUU
-iF8KUeEVYZMyBfRtl0sQYBZCprDoVpCr74CPTxQ72Jrh2mD8oAz0ZYVgOA19AbM8
-PskJlhx4bmDJvWU/C2FrOgYDNg9Tl7dqLnr18GDt7DuC0KXCDupgtBmwy7mayNgA
-n2jbIaYsfMI7k1msS1XoaVX7kBMgmeGY3V11Om9Te7iMWKFOhpavI2hbf741ODtV
-zBen58Q2WzjVEKVQYbY7UgtcYzOM44GhMcdS65lLsBviK7HzyB6I5Iu3TR0bcpFE
-2V4bd6L5foq3Qn+WO9wqOwnOk3qfD/TQId7NWv0ZE2vp8fPPaaRF2XcA7Qh5xltt
-j/MCNlE=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aginfra-sg.ct.infn.it/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aginfra-sg.ct.infn.it/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://aginfra-sg.ct.infn.it/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://aginfra-sg.ct.infn.it/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://aginfra-sg.ct.infn.it/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://aginfra-sg.ct.infn.it/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://aginfra-sg.ct.infn.it/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://aginfra-sg.ct.infn.it/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://aginfra-sg.ct.infn.it/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://aginfra-sg.ct.infn.it/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://aginfra-sg.ct.infn.it/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <AttributeConsumingService index="1">
-      <ServiceName xml:lang="en">agINFRA Science Gateway</ServiceName>
-      <ServiceDescription xml:lang="en">The agINFRA Science Gateway meshes-up Grid Computing and Cloud Computing enabled applications and lets users access them in an easy, transparent and ubiquitous way.</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"/>
-    </AttributeConsumingService>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">INFN Catania</OrganizationName>
-    <OrganizationName xml:lang="it">INFN Catania</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">agINFRA Science Gateway provided by INFN Catania</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="it">agINFRA Science Gateway erogato da INFN Catania</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.ct.infn.it/index.php?lang=en</OrganizationURL>
-    <OrganizationURL xml:lang="it">http://www.ct.infn.it/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Riccardo</GivenName>
-    <SurName>Rotondo</SurName>
-    <EmailAddress>riccardo.rotondo@ct.infn.it</EmailAddress>
-    <EmailAddress>riccardo.rotondo@garr.it</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="administrative">
-    <GivenName>Roberto</GivenName>
-    <SurName>Barbera</SurName>
-    <EmailAddress>roberto.barbera@ct.infn.it</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/aishib.agropolis.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/aishib.agropolis.fr-idp-shibboleth.xml
deleted file mode 100644
index c4d8c9b6..00000000
--- a/swamid-interfederations-2.0/aishib.agropolis.fr-idp-shibboleth.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://aishib.agropolis.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2013-06-06T11:49:20Z">
-      <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">agropolis.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">Agropolis International</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDNzCCAh+gAwIBAgIUYY3sGXwChkj2CRy6QFDvkdj2zlAwDQYJKoZIhvcNAQEF
-BQAwHjEcMBoGA1UEAxMTYWlzaGliLmFncm9wb2xpcy5mcjAeFw0xMzA1MTUxMzM3
-MTJaFw0zMzA1MTUxMzM3MTJaMB4xHDAaBgNVBAMTE2Fpc2hpYi5hZ3JvcG9saXMu
-ZnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCxrDy6lrhIBjcxv16n
-4UJ2cEMYPO4wSmfDwhO6feoSIEuIblYRHE2nQKirMokwD6seF4rbDHyxLXg/ColL
-VLv+0CJteIOZjSCgSN90WzQRrC1Ex5sJfPu6yPEXvW8H1906gEg6ok8rlCIHRGfE
-15pHK5eqxQS5f2n8c2t/Uk33/FBj79/hb3Cd7vE4mdlvReD3AFswC0lV4bPmj3Ka
-KUuMj9xwipwnfWCu6p2/ZJF4M3ADU5grXHJ2Vqmd8DWm5raaObKjYwJddbRBByI8
-bJJLIwAQQmX4Dh4hf1QKlf2oqWPWVQxLQp0erL1U8IWmj1RG8TTH9xOJl6kkEhYq
-Z2gfAgMBAAGjbTBrMEoGA1UdEQRDMEGCE2Fpc2hpYi5hZ3JvcG9saXMuZnKGKmh0
-dHBzOi8vYWlzaGliLmFncm9wb2xpcy5mci9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4E
-FgQU9A7iQ8Qo+t2JCpKuOOV9YBoYs4MwDQYJKoZIhvcNAQEFBQADggEBAG0LOW6I
-F+M8n2NpzyQjfVCJCA6QhWjbXrfemiPJFZGZZb2dVmHof4yCpCUYgHOBoZaXPOlB
-nLYsUWvFZ6V2GELZpLHzHSSrYidieW07qQkh1DwcIYpvtZgLviOtT/tCEGsk925f
-DUoGdeIqpqt54WZcW9+TbKicvjg3JT4BFOQ17bFNwPW+YjTbvsWYxen+e0mRp4vM
-V0yMu2f3bccVhePASSZGL3yod3sJ1dPvlrJO9c35BekhtirolVjZqMQ0AYPVifua
-yIU0dWXsZkAOcBL9kZFbJcYRUIxMgvp8U2Zdv1+ZlwOyXnnWDOOh9wjuT7FAyObU
-ChvjHlgZHkvLwJI=
-					    </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://aishib.agropolis.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://aishib.agropolis.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://aishib.agropolis.fr/idp/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Agropolis International</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Agropolis International</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Jean Cerda</SurName>
-    <EmailAddress>cerda@agropolis.fr</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <SurName>Jean-Pierre  Allano</SurName>
-    <EmailAddress>allano@agropolis.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/aishib.agropolis.fr.xml b/swamid-interfederations-2.0/aishib.agropolis.fr.xml
deleted file mode 100644
index c4d8c9b6..00000000
--- a/swamid-interfederations-2.0/aishib.agropolis.fr.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://aishib.agropolis.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2013-06-06T11:49:20Z">
-      <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">agropolis.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">Agropolis International</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDNzCCAh+gAwIBAgIUYY3sGXwChkj2CRy6QFDvkdj2zlAwDQYJKoZIhvcNAQEF
-BQAwHjEcMBoGA1UEAxMTYWlzaGliLmFncm9wb2xpcy5mcjAeFw0xMzA1MTUxMzM3
-MTJaFw0zMzA1MTUxMzM3MTJaMB4xHDAaBgNVBAMTE2Fpc2hpYi5hZ3JvcG9saXMu
-ZnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCxrDy6lrhIBjcxv16n
-4UJ2cEMYPO4wSmfDwhO6feoSIEuIblYRHE2nQKirMokwD6seF4rbDHyxLXg/ColL
-VLv+0CJteIOZjSCgSN90WzQRrC1Ex5sJfPu6yPEXvW8H1906gEg6ok8rlCIHRGfE
-15pHK5eqxQS5f2n8c2t/Uk33/FBj79/hb3Cd7vE4mdlvReD3AFswC0lV4bPmj3Ka
-KUuMj9xwipwnfWCu6p2/ZJF4M3ADU5grXHJ2Vqmd8DWm5raaObKjYwJddbRBByI8
-bJJLIwAQQmX4Dh4hf1QKlf2oqWPWVQxLQp0erL1U8IWmj1RG8TTH9xOJl6kkEhYq
-Z2gfAgMBAAGjbTBrMEoGA1UdEQRDMEGCE2Fpc2hpYi5hZ3JvcG9saXMuZnKGKmh0
-dHBzOi8vYWlzaGliLmFncm9wb2xpcy5mci9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4E
-FgQU9A7iQ8Qo+t2JCpKuOOV9YBoYs4MwDQYJKoZIhvcNAQEFBQADggEBAG0LOW6I
-F+M8n2NpzyQjfVCJCA6QhWjbXrfemiPJFZGZZb2dVmHof4yCpCUYgHOBoZaXPOlB
-nLYsUWvFZ6V2GELZpLHzHSSrYidieW07qQkh1DwcIYpvtZgLviOtT/tCEGsk925f
-DUoGdeIqpqt54WZcW9+TbKicvjg3JT4BFOQ17bFNwPW+YjTbvsWYxen+e0mRp4vM
-V0yMu2f3bccVhePASSZGL3yod3sJ1dPvlrJO9c35BekhtirolVjZqMQ0AYPVifua
-yIU0dWXsZkAOcBL9kZFbJcYRUIxMgvp8U2Zdv1+ZlwOyXnnWDOOh9wjuT7FAyObU
-ChvjHlgZHkvLwJI=
-					    </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://aishib.agropolis.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://aishib.agropolis.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://aishib.agropolis.fr/idp/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Agropolis International</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Agropolis International</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Jean Cerda</SurName>
-    <EmailAddress>cerda@agropolis.fr</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <SurName>Jean-Pierre  Allano</SurName>
-    <EmailAddress>allano@agropolis.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/aleph.svkhk.cz-idp-shibboleth.xml b/swamid-interfederations-2.0/aleph.svkhk.cz-idp-shibboleth.xml
deleted file mode 100644
index f9ae7731..00000000
--- a/swamid-interfederations-2.0/aleph.svkhk.cz-idp-shibboleth.xml
+++ /dev/null
@@ -1,119 +0,0 @@
-<?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">
-  <md:Extensions xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata">
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/" registrationInstant="2014-01-09T13:46:49Z">
-      <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>
-    <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://eduid.cz/uri/idp-group/library</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md: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/aleph.svkhk.cz.xml b/swamid-interfederations-2.0/aleph.svkhk.cz.xml
deleted file mode 100644
index f9ae7731..00000000
--- a/swamid-interfederations-2.0/aleph.svkhk.cz.xml
+++ /dev/null
@@ -1,119 +0,0 @@
-<?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">
-  <md:Extensions xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata">
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/" registrationInstant="2014-01-09T13:46:49Z">
-      <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>
-    <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://eduid.cz/uri/idp-group/library</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md: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/ambre.vetagro-sup.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/ambre.vetagro-sup.fr-idp-shibboleth.xml
deleted file mode 100644
index 00149424..00000000
--- a/swamid-interfederations-2.0/ambre.vetagro-sup.fr-idp-shibboleth.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ambre.vetagro-sup.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2013-01-14T16:11:53Z">
-      <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">vetagro-sup.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">Vetagro Sup</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDPDCCAiSgAwIBAgIVAL9PsuadPSIZcMHNxlK/oevezmzWMA0GCSqGSIb3DQEB
-BQUAMB8xHTAbBgNVBAMTFGFtYnJlLnZldGFncm8tc3VwLmZyMB4XDTEyMTEwODEw
-MTQwNFoXDTMyMTEwODEwMTQwNFowHzEdMBsGA1UEAxMUYW1icmUudmV0YWdyby1z
-dXAuZnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCc/ptfpmkomwmT
-4RsID+1Ce1dX0eUjcLgSOZN8hVpHWLag2ERWkpmvB5aK7BAFcI5i//Gk80tAiasu
-JtlZhBnEw54aTJRGpyL2CVkHyl6SMRxprIi1Ji67IoGqEgUeGaheAxo+tG5e1WSc
-bIbldcSKdwvjAV+7HSB4C6NqLsAzJH25++yaRH2uf2LTD0TDzNR9Q2hVj/VyYWR+
-K3HWI1Snjn/i7aFfZZhYmBkwHuQOaPhwCM+khikg5XicMsxUhHCMi93UgHGIsdkr
-IEGj4xydBTUKsLaykeuFS8EgXbWwCLGkeX76w8xDoFIpnppU/yFd9v7Zg3EBfn4p
-kTW3GdIjAgMBAAGjbzBtMEwGA1UdEQRFMEOCFGFtYnJlLnZldGFncm8tc3VwLmZy
-hitodHRwczovL2FtYnJlLnZldGFncm8tc3VwLmZyL2lkcC9zaGliYm9sZXRoMB0G
-A1UdDgQWBBTPTqWkVHrHXFjmxMWkNt/sp2h5ozANBgkqhkiG9w0BAQUFAAOCAQEA
-FvXMtfBUmRZCzz8CjanGzr1TBUPmnkrKci5AtkseKw9YlfUmBXTHB01y697nYq6m
-RB6KhvfW212h9CF0IOEEjoadgDhXqGYhq8PnAOtT4Ty3XDy8SbRh8aQWfvnfSngv
-FdpHRiSpj5UXXuT5zTtkf59h58XKtEfCkMbUzvdOgUobJzpD0WISmQHPQnx+Neg6
-9j7oMRrDiZjS39Om8Imu9xvsnddDM3PlsDBIsvrr1o7K5iLkEdR1YYX0ZNDbiFuw
-QXXl2dwQPB8KrScPUvCe57slU2gFQvvIBzjQysxC6V6TPSuM3A/ee56lACuB3jKj
-oYkHQc5Gj/1rSMLmu9aLMg==
-					    </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://ambre.vetagro-sup.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ambre.vetagro-sup.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://ambre.vetagro-sup.fr/idp/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Vetagro Sup</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Vetagro Sup</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Nicolas Aulas</SurName>
-    <EmailAddress>nicolas.aulas@vetagro-sup.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/ambre.vetagro-sup.fr.xml b/swamid-interfederations-2.0/ambre.vetagro-sup.fr.xml
deleted file mode 100644
index 00149424..00000000
--- a/swamid-interfederations-2.0/ambre.vetagro-sup.fr.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ambre.vetagro-sup.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2013-01-14T16:11:53Z">
-      <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">vetagro-sup.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">Vetagro Sup</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDPDCCAiSgAwIBAgIVAL9PsuadPSIZcMHNxlK/oevezmzWMA0GCSqGSIb3DQEB
-BQUAMB8xHTAbBgNVBAMTFGFtYnJlLnZldGFncm8tc3VwLmZyMB4XDTEyMTEwODEw
-MTQwNFoXDTMyMTEwODEwMTQwNFowHzEdMBsGA1UEAxMUYW1icmUudmV0YWdyby1z
-dXAuZnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCc/ptfpmkomwmT
-4RsID+1Ce1dX0eUjcLgSOZN8hVpHWLag2ERWkpmvB5aK7BAFcI5i//Gk80tAiasu
-JtlZhBnEw54aTJRGpyL2CVkHyl6SMRxprIi1Ji67IoGqEgUeGaheAxo+tG5e1WSc
-bIbldcSKdwvjAV+7HSB4C6NqLsAzJH25++yaRH2uf2LTD0TDzNR9Q2hVj/VyYWR+
-K3HWI1Snjn/i7aFfZZhYmBkwHuQOaPhwCM+khikg5XicMsxUhHCMi93UgHGIsdkr
-IEGj4xydBTUKsLaykeuFS8EgXbWwCLGkeX76w8xDoFIpnppU/yFd9v7Zg3EBfn4p
-kTW3GdIjAgMBAAGjbzBtMEwGA1UdEQRFMEOCFGFtYnJlLnZldGFncm8tc3VwLmZy
-hitodHRwczovL2FtYnJlLnZldGFncm8tc3VwLmZyL2lkcC9zaGliYm9sZXRoMB0G
-A1UdDgQWBBTPTqWkVHrHXFjmxMWkNt/sp2h5ozANBgkqhkiG9w0BAQUFAAOCAQEA
-FvXMtfBUmRZCzz8CjanGzr1TBUPmnkrKci5AtkseKw9YlfUmBXTHB01y697nYq6m
-RB6KhvfW212h9CF0IOEEjoadgDhXqGYhq8PnAOtT4Ty3XDy8SbRh8aQWfvnfSngv
-FdpHRiSpj5UXXuT5zTtkf59h58XKtEfCkMbUzvdOgUobJzpD0WISmQHPQnx+Neg6
-9j7oMRrDiZjS39Om8Imu9xvsnddDM3PlsDBIsvrr1o7K5iLkEdR1YYX0ZNDbiFuw
-QXXl2dwQPB8KrScPUvCe57slU2gFQvvIBzjQysxC6V6TPSuM3A/ee56lACuB3jKj
-oYkHQc5Gj/1rSMLmu9aLMg==
-					    </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://ambre.vetagro-sup.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ambre.vetagro-sup.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://ambre.vetagro-sup.fr/idp/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Vetagro Sup</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Vetagro Sup</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Nicolas Aulas</SurName>
-    <EmailAddress>nicolas.aulas@vetagro-sup.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/antimoine.insa-strasbourg.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/antimoine.insa-strasbourg.fr-idp-shibboleth.xml
deleted file mode 100644
index a482e25c..00000000
--- a/swamid-interfederations-2.0/antimoine.insa-strasbourg.fr-idp-shibboleth.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://antimoine.insa-strasbourg.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2014-02-11T08:44:08Z">
-      <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">insa-strasbourg.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">INSA de Strasbourg</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDXDCCAkSgAwIBAgIVAKI+qiqDCk9wTTqn7OVAoZrvj/CpMA0GCSqGSIb3DQEB
-BQUAMCcxJTAjBgNVBAMTHGFudGltb2luZS5pbnNhLXN0cmFzYm91cmcuZnIwHhcN
-MTQwMTEzMTAzOTU4WhcNMzQwMTEzMTAzOTU4WjAnMSUwIwYDVQQDExxhbnRpbW9p
-bmUuaW5zYS1zdHJhc2JvdXJnLmZyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
-CgKCAQEAtuM8lRjlVjjmrHq9VtguaOMQL+Wd99BiOs56kL3Mbctg1FwH69LYThCW
-6dOz6WJg/jU/naF7jEikXKc71xGyu7Ph7Iqa9S5hoXXAT8u/0q2nZDeTOraJqKe1
-FMF2RzXhEEMyQO3CiKNK9b+tbKoNZS7FQCixMZklWZPt4EcEKd6jyRq1WYX3dpnb
-r9I/aCdhtK/PGvGe5gKTDoTR2HKyWKJTc/obf8x/vlYIEwiaGgdlqI2KiBE0x48n
-zQdP6XVi3T8ZWbnkLmCfgJtP2C8PtEJuwDRAy0Z9N4DSwvxn5YCVYgBLSi0TLa10
-B/lUqqBezZrTrA9p9Lt8JtGXW5YGHwIDAQABo38wfTBcBgNVHREEVTBTghxhbnRp
-bW9pbmUuaW5zYS1zdHJhc2JvdXJnLmZyhjNodHRwczovL2FudGltb2luZS5pbnNh
-LXN0cmFzYm91cmcuZnIvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFLFkjPZUc9JY
-qrWjldJ/iGGkKAt4MA0GCSqGSIb3DQEBBQUAA4IBAQBSk/wU1mRn4VF2ifmy261K
-DK7uX+t1H1hh8S38fKSFU7HoNXJTV3vQnmBOpYIGC1gtvmb+qjqpNtikU2zO84Gq
-Q0bXHxYF2d9RUP89mKaFxE5uNcXFmlOA3ChZY3pMT5zwAPI/T60tGrex7zci7OLn
-JDAQj/q4Yk9ejx6JTFggQSCCVh+oV/SDIMd2p5AY6H3mto3b6XCk7Lssa8a/D30k
-pEkZnhTKdN82eRyynuOR7UDU4tasV4d7Mi/j53f5ihnRcsvwh/pYodjoVYY8cEcZ
-JLnAXYF8coSwh8UN4D/0NHsvTuSOFQc85hGrqacMsvxiQiw9mv01AX5+A5YLEbVQ
-					    </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://antimoine.insa-strasbourg.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://antimoine.insa-strasbourg.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://antimoine.insa-strasbourg.fr/idp/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">INSA de Strasbourg</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">INSA de Strasbourg</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Lahsen BOUZID</SurName>
-    <EmailAddress>lahsen.bouzid@insa-strasbourg.fr</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <SurName>Simon SCHERRER</SurName>
-    <EmailAddress>simon.scherrer@insa-strasbourg.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/antimoine.insa-strasbourg.fr.xml b/swamid-interfederations-2.0/antimoine.insa-strasbourg.fr.xml
deleted file mode 100644
index a482e25c..00000000
--- a/swamid-interfederations-2.0/antimoine.insa-strasbourg.fr.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://antimoine.insa-strasbourg.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2014-02-11T08:44:08Z">
-      <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">insa-strasbourg.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">INSA de Strasbourg</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDXDCCAkSgAwIBAgIVAKI+qiqDCk9wTTqn7OVAoZrvj/CpMA0GCSqGSIb3DQEB
-BQUAMCcxJTAjBgNVBAMTHGFudGltb2luZS5pbnNhLXN0cmFzYm91cmcuZnIwHhcN
-MTQwMTEzMTAzOTU4WhcNMzQwMTEzMTAzOTU4WjAnMSUwIwYDVQQDExxhbnRpbW9p
-bmUuaW5zYS1zdHJhc2JvdXJnLmZyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
-CgKCAQEAtuM8lRjlVjjmrHq9VtguaOMQL+Wd99BiOs56kL3Mbctg1FwH69LYThCW
-6dOz6WJg/jU/naF7jEikXKc71xGyu7Ph7Iqa9S5hoXXAT8u/0q2nZDeTOraJqKe1
-FMF2RzXhEEMyQO3CiKNK9b+tbKoNZS7FQCixMZklWZPt4EcEKd6jyRq1WYX3dpnb
-r9I/aCdhtK/PGvGe5gKTDoTR2HKyWKJTc/obf8x/vlYIEwiaGgdlqI2KiBE0x48n
-zQdP6XVi3T8ZWbnkLmCfgJtP2C8PtEJuwDRAy0Z9N4DSwvxn5YCVYgBLSi0TLa10
-B/lUqqBezZrTrA9p9Lt8JtGXW5YGHwIDAQABo38wfTBcBgNVHREEVTBTghxhbnRp
-bW9pbmUuaW5zYS1zdHJhc2JvdXJnLmZyhjNodHRwczovL2FudGltb2luZS5pbnNh
-LXN0cmFzYm91cmcuZnIvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFLFkjPZUc9JY
-qrWjldJ/iGGkKAt4MA0GCSqGSIb3DQEBBQUAA4IBAQBSk/wU1mRn4VF2ifmy261K
-DK7uX+t1H1hh8S38fKSFU7HoNXJTV3vQnmBOpYIGC1gtvmb+qjqpNtikU2zO84Gq
-Q0bXHxYF2d9RUP89mKaFxE5uNcXFmlOA3ChZY3pMT5zwAPI/T60tGrex7zci7OLn
-JDAQj/q4Yk9ejx6JTFggQSCCVh+oV/SDIMd2p5AY6H3mto3b6XCk7Lssa8a/D30k
-pEkZnhTKdN82eRyynuOR7UDU4tasV4d7Mi/j53f5ihnRcsvwh/pYodjoVYY8cEcZ
-JLnAXYF8coSwh8UN4D/0NHsvTuSOFQc85hGrqacMsvxiQiw9mv01AX5+A5YLEbVQ
-					    </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://antimoine.insa-strasbourg.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://antimoine.insa-strasbourg.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://antimoine.insa-strasbourg.fr/idp/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">INSA de Strasbourg</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">INSA de Strasbourg</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Lahsen BOUZID</SurName>
-    <EmailAddress>lahsen.bouzid@insa-strasbourg.fr</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <SurName>Simon SCHERRER</SurName>
-    <EmailAddress>simon.scherrer@insa-strasbourg.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/appdb-dev.marie.hellasgrid.gr-edugain-connect.xml b/swamid-interfederations-2.0/appdb-dev.marie.hellasgrid.gr-edugain-connect.xml
deleted file mode 100644
index a1296141..00000000
--- a/swamid-interfederations-2.0/appdb-dev.marie.hellasgrid.gr-edugain-connect.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://appdb-dev.marie.hellasgrid.gr/edugain-connect">
-  <Extensions xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi">
-    <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>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="en">EGI Applications Database (DEV - Connect)</mdui:DisplayName>
-        <mdui:Description xml:lang="en">EGI Software &amp; Cloud Marketplace (Development Instance - Connect)</mdui:Description>
-        <mdui:InformationURL xml:lang="en">https://wiki.appdb.egi.eu/</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://wiki.appdb.egi.eu/main:about:terms</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="el">https://wiki.appdb.egi.eu/main:about:terms</mdui:PrivacyStatementURL>
-        <mdui:Logo height="128" width="120">https://appdb-dev.marie.hellasgrid.gr/images/appdblogo.png</mdui:Logo>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIFHjCCBAagAwIBAgICA8swDQYJKoZIhvcNAQEFBQAwRTETMBEGCgmSJomT8ixkARkTA09SRzEYMBYGCgmSJomT8ixkARkTCFNFRS1HUklEMRQwEgYDVQQDEwtTRUUtR1JJRCBDQTAeFw0xMzEwMTcxNjEwMTdaFw0xNDA4MTMxNjEwMTdaMG4xEjAQBgoJkiaJk/IsZAEZFgJFVTETMBEGCgmSJomT8ixkARkWA0VHSTELMAkGA1UEBhMCTkwxDjAMBgNVBAoTBUhvc3RzMQ8wDQYDVQQKEwZFR0kuZXUxFTATBgNVBAMTDGFwcGRiLmVnaS5ldTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAK8aVSi+D+NoPI1mRwQGyiOVkxofhYb5ZZGICaQkT8Mu1YaxzxBUl9X94Ily/nv6jp6QfIRA11D7TOB70MoujLmRow/GOt0enkEb0XomI3wM/PiBOvZgjzlaav8R9adKK87lPEvn+LhcjBbMqoIk5C68lQ1dNtKX4G+lUlYY1dbSgPUe5RwEdM8X3EQ1lkYehiC4elDwYKlhTTODtiu7OBm2m/LsYEwWDeaA0XdUK2uv5zaaJyJ+E/NjYxDkIM75MGhS//sPYfEOzqwNm7XY2RlwJR5V47xadCXTxXz3HKuAxx7rwln+EO1bkA6QEgIJ2WLL2dERl2wuhz16QbzDfh8CAwEAAaOCAe0wggHpMAwGA1UdEwEB/wQCMAAwEQYJYIZIAYb4QgEBBAQDAgbAMA4GA1UdDwEB/wQEAwIEsDAdBgNVHQ4EFgQURbjI/ju4HYZ9M0y+hyekx2aWZCswbQYDVR0jBGYwZIAUiz2pt50yJY8/6Nlcb4vnWpSU0MGhSaRHMEUxEzARBgoJkiaJk/IsZAEZEwNPUkcxGDAWBgoJkiaJk/IsZAEZEwhTRUUtR1JJRDEUMBIGA1UEAxMLU0VFLUdSSUQgQ0GCAQAwVQYDVR0fBE4wTDBKoEigRoZEaHR0cDovL3d3dy5ncmlkLmF1dGguZ3IvcGtpL3NlZWdyaWQtY2Evc2VydmljZXMvY3JsL3NlZWdyaWRjYS12Mi5jcmwwbAYDVR0gBGUwYzBTBg0rBgEEAYGBAxQCAQICMEIwQAYIKwYBBQUHAgEWNGh0dHA6Ly93d3cuZ3JpZC5hdXRoLmdyL3BraS9zZWVncmlkLWNhL2RvY3VtZW50cy9jcHMwDAYKKoZIhvdMBQICATBKBgNVHRIEQzBBgRdzZWVncmlkLWNhQGdyaWQuYXV0aC5ncoYmaHR0cDovL3d3dy5ncmlkLmF1dGguZ3IvcGtpL3NlZWdyaWQtY2EwFwYDVR0RBBAwDoIMYXBwZGIuZWdpLmV1MA0GCSqGSIb3DQEBBQUAA4IBAQAXCX8H4nqRDt0UQTdFj+2rbezYFmyw4vQk/zQW+5+bBzoPAI0+/AhcPU6G5MoOTS2AUvqglpdSOWB/XUHrS9J5DFnAaQNj16VYcfMVmVx+TQctZFdAPLriq2r+mCwFAJKA44p9xJZ0nL+YTcHFiUTn2houCvFCEVhF2iMS12fxm0mCRzyCGI7x5PHCsEw2giaAJrErDkFSlIaVUyhNTatIueXfnuclx5E91KQPu/d9Uz/Zn2P6fAJ9D3OaLTscCrij/AqY36Is/93aXkf3oatIc4WvSxJah0pzMFtx7bWj+Q3XDfFXmiy/q7JXQXVs0ZurIoZ5Ngv7UqiIBS9/UEK+</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIFHjCCBAagAwIBAgICA8swDQYJKoZIhvcNAQEFBQAwRTETMBEGCgmSJomT8ixkARkTA09SRzEYMBYGCgmSJomT8ixkARkTCFNFRS1HUklEMRQwEgYDVQQDEwtTRUUtR1JJRCBDQTAeFw0xMzEwMTcxNjEwMTdaFw0xNDA4MTMxNjEwMTdaMG4xEjAQBgoJkiaJk/IsZAEZFgJFVTETMBEGCgmSJomT8ixkARkWA0VHSTELMAkGA1UEBhMCTkwxDjAMBgNVBAoTBUhvc3RzMQ8wDQYDVQQKEwZFR0kuZXUxFTATBgNVBAMTDGFwcGRiLmVnaS5ldTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAK8aVSi+D+NoPI1mRwQGyiOVkxofhYb5ZZGICaQkT8Mu1YaxzxBUl9X94Ily/nv6jp6QfIRA11D7TOB70MoujLmRow/GOt0enkEb0XomI3wM/PiBOvZgjzlaav8R9adKK87lPEvn+LhcjBbMqoIk5C68lQ1dNtKX4G+lUlYY1dbSgPUe5RwEdM8X3EQ1lkYehiC4elDwYKlhTTODtiu7OBm2m/LsYEwWDeaA0XdUK2uv5zaaJyJ+E/NjYxDkIM75MGhS//sPYfEOzqwNm7XY2RlwJR5V47xadCXTxXz3HKuAxx7rwln+EO1bkA6QEgIJ2WLL2dERl2wuhz16QbzDfh8CAwEAAaOCAe0wggHpMAwGA1UdEwEB/wQCMAAwEQYJYIZIAYb4QgEBBAQDAgbAMA4GA1UdDwEB/wQEAwIEsDAdBgNVHQ4EFgQURbjI/ju4HYZ9M0y+hyekx2aWZCswbQYDVR0jBGYwZIAUiz2pt50yJY8/6Nlcb4vnWpSU0MGhSaRHMEUxEzARBgoJkiaJk/IsZAEZEwNPUkcxGDAWBgoJkiaJk/IsZAEZEwhTRUUtR1JJRDEUMBIGA1UEAxMLU0VFLUdSSUQgQ0GCAQAwVQYDVR0fBE4wTDBKoEigRoZEaHR0cDovL3d3dy5ncmlkLmF1dGguZ3IvcGtpL3NlZWdyaWQtY2Evc2VydmljZXMvY3JsL3NlZWdyaWRjYS12Mi5jcmwwbAYDVR0gBGUwYzBTBg0rBgEEAYGBAxQCAQICMEIwQAYIKwYBBQUHAgEWNGh0dHA6Ly93d3cuZ3JpZC5hdXRoLmdyL3BraS9zZWVncmlkLWNhL2RvY3VtZW50cy9jcHMwDAYKKoZIhvdMBQICATBKBgNVHRIEQzBBgRdzZWVncmlkLWNhQGdyaWQuYXV0aC5ncoYmaHR0cDovL3d3dy5ncmlkLmF1dGguZ3IvcGtpL3NlZWdyaWQtY2EwFwYDVR0RBBAwDoIMYXBwZGIuZWdpLmV1MA0GCSqGSIb3DQEBBQUAA4IBAQAXCX8H4nqRDt0UQTdFj+2rbezYFmyw4vQk/zQW+5+bBzoPAI0+/AhcPU6G5MoOTS2AUvqglpdSOWB/XUHrS9J5DFnAaQNj16VYcfMVmVx+TQctZFdAPLriq2r+mCwFAJKA44p9xJZ0nL+YTcHFiUTn2houCvFCEVhF2iMS12fxm0mCRzyCGI7x5PHCsEw2giaAJrErDkFSlIaVUyhNTatIueXfnuclx5E91KQPu/d9Uz/Zn2P6fAJ9D3OaLTscCrij/AqY36Is/93aXkf3oatIc4WvSxJah0pzMFtx7bWj+Q3XDfFXmiy/q7JXQXVs0ZurIoZ5Ngv7UqiIBS9/UEK+</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://appdb-dev.marie.hellasgrid.gr/auth/module.php/saml/sp/saml2-logout.php/edugain-connect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://appdb-dev.marie.hellasgrid.gr/auth/module.php/saml/sp/saml2-logout.php/edugain-connect"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://appdb-dev.marie.hellasgrid.gr/auth/module.php/saml/sp/saml2-acs.php/edugain-connect" index="0"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://appdb-dev.marie.hellasgrid.gr/auth/module.php/saml/sp/saml1-acs.php/edugain-connect" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://appdb-dev.marie.hellasgrid.gr/auth/module.php/saml/sp/saml2-acs.php/edugain-connect" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://appdb-dev.marie.hellasgrid.gr/auth/module.php/saml/sp/saml1-acs.php/edugain-connect/artifact" index="3"/>
-    <md:AttributeConsumingService index="0">
-      <md:ServiceName xml:lang="en">EGI Applications Database (DEV - Connect)</md:ServiceName>
-      <md:ServiceDescription xml:lang="en">EGI Software &amp; Cloud Marketplace (Development Instance - Connect)</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" isRequired="true"/>
-      <md:RequestedAttribute Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md: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: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.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.25178.1.2.10" 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" isRequired="true"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">IASA - GRNET</md:OrganizationName>
-    <md:OrganizationName xml:lang="el">ΙΕΣΕ - ΕΔΕΤ</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Institute of Accelerating Systems and Applications - Greek Research and Technology Network</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="el">Ινστιτούτο Επιταχυντικών Συστημάτων και Εφαρμογών - Εθνικό Δίκτυο Έρευνας και Τεχνολογίας</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.iasa.gr/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="el">http://www.iasa.gr/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.grnet.gr/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="el">http://www.grnet.gr/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Marios</md:GivenName>
-    <md:SurName>Chatziangelou</md:SurName>
-    <md:EmailAddress>mhaggel@iasa.gr</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Marios</md:GivenName>
-    <md:SurName>Chatziangelou</md:SurName>
-    <md:EmailAddress>appdb-support@iasa.gr</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/appdb-dev.marie.hellasgrid.gr-edugain-sp.xml b/swamid-interfederations-2.0/appdb-dev.marie.hellasgrid.gr-edugain-sp.xml
deleted file mode 100644
index 1fa73d1f..00000000
--- a/swamid-interfederations-2.0/appdb-dev.marie.hellasgrid.gr-edugain-sp.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://appdb-dev.marie.hellasgrid.gr/edugain-sp">
-  <Extensions xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi">
-    <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>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="en">EGI Applications Database (DEV)</mdui:DisplayName>
-        <mdui:Description xml:lang="en">EGI Software &amp; Cloud Marketplace (Development Instance)</mdui:Description>
-        <mdui:InformationURL xml:lang="en">https://wiki.appdb.egi.eu/</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://wiki.appdb.egi.eu/main:about:terms</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="el">https://wiki.appdb.egi.eu/main:about:terms</mdui:PrivacyStatementURL>
-        <mdui:Logo height="128" width="120">https://appdb-dev.marie.hellasgrid.gr/images/appdblogo.png</mdui:Logo>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIFHjCCBAagAwIBAgICA8swDQYJKoZIhvcNAQEFBQAwRTETMBEGCgmSJomT8ixkARkTA09SRzEYMBYGCgmSJomT8ixkARkTCFNFRS1HUklEMRQwEgYDVQQDEwtTRUUtR1JJRCBDQTAeFw0xMzEwMTcxNjEwMTdaFw0xNDA4MTMxNjEwMTdaMG4xEjAQBgoJkiaJk/IsZAEZFgJFVTETMBEGCgmSJomT8ixkARkWA0VHSTELMAkGA1UEBhMCTkwxDjAMBgNVBAoTBUhvc3RzMQ8wDQYDVQQKEwZFR0kuZXUxFTATBgNVBAMTDGFwcGRiLmVnaS5ldTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAK8aVSi+D+NoPI1mRwQGyiOVkxofhYb5ZZGICaQkT8Mu1YaxzxBUl9X94Ily/nv6jp6QfIRA11D7TOB70MoujLmRow/GOt0enkEb0XomI3wM/PiBOvZgjzlaav8R9adKK87lPEvn+LhcjBbMqoIk5C68lQ1dNtKX4G+lUlYY1dbSgPUe5RwEdM8X3EQ1lkYehiC4elDwYKlhTTODtiu7OBm2m/LsYEwWDeaA0XdUK2uv5zaaJyJ+E/NjYxDkIM75MGhS//sPYfEOzqwNm7XY2RlwJR5V47xadCXTxXz3HKuAxx7rwln+EO1bkA6QEgIJ2WLL2dERl2wuhz16QbzDfh8CAwEAAaOCAe0wggHpMAwGA1UdEwEB/wQCMAAwEQYJYIZIAYb4QgEBBAQDAgbAMA4GA1UdDwEB/wQEAwIEsDAdBgNVHQ4EFgQURbjI/ju4HYZ9M0y+hyekx2aWZCswbQYDVR0jBGYwZIAUiz2pt50yJY8/6Nlcb4vnWpSU0MGhSaRHMEUxEzARBgoJkiaJk/IsZAEZEwNPUkcxGDAWBgoJkiaJk/IsZAEZEwhTRUUtR1JJRDEUMBIGA1UEAxMLU0VFLUdSSUQgQ0GCAQAwVQYDVR0fBE4wTDBKoEigRoZEaHR0cDovL3d3dy5ncmlkLmF1dGguZ3IvcGtpL3NlZWdyaWQtY2Evc2VydmljZXMvY3JsL3NlZWdyaWRjYS12Mi5jcmwwbAYDVR0gBGUwYzBTBg0rBgEEAYGBAxQCAQICMEIwQAYIKwYBBQUHAgEWNGh0dHA6Ly93d3cuZ3JpZC5hdXRoLmdyL3BraS9zZWVncmlkLWNhL2RvY3VtZW50cy9jcHMwDAYKKoZIhvdMBQICATBKBgNVHRIEQzBBgRdzZWVncmlkLWNhQGdyaWQuYXV0aC5ncoYmaHR0cDovL3d3dy5ncmlkLmF1dGguZ3IvcGtpL3NlZWdyaWQtY2EwFwYDVR0RBBAwDoIMYXBwZGIuZWdpLmV1MA0GCSqGSIb3DQEBBQUAA4IBAQAXCX8H4nqRDt0UQTdFj+2rbezYFmyw4vQk/zQW+5+bBzoPAI0+/AhcPU6G5MoOTS2AUvqglpdSOWB/XUHrS9J5DFnAaQNj16VYcfMVmVx+TQctZFdAPLriq2r+mCwFAJKA44p9xJZ0nL+YTcHFiUTn2houCvFCEVhF2iMS12fxm0mCRzyCGI7x5PHCsEw2giaAJrErDkFSlIaVUyhNTatIueXfnuclx5E91KQPu/d9Uz/Zn2P6fAJ9D3OaLTscCrij/AqY36Is/93aXkf3oatIc4WvSxJah0pzMFtx7bWj+Q3XDfFXmiy/q7JXQXVs0ZurIoZ5Ngv7UqiIBS9/UEK+</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIFHjCCBAagAwIBAgICA8swDQYJKoZIhvcNAQEFBQAwRTETMBEGCgmSJomT8ixkARkTA09SRzEYMBYGCgmSJomT8ixkARkTCFNFRS1HUklEMRQwEgYDVQQDEwtTRUUtR1JJRCBDQTAeFw0xMzEwMTcxNjEwMTdaFw0xNDA4MTMxNjEwMTdaMG4xEjAQBgoJkiaJk/IsZAEZFgJFVTETMBEGCgmSJomT8ixkARkWA0VHSTELMAkGA1UEBhMCTkwxDjAMBgNVBAoTBUhvc3RzMQ8wDQYDVQQKEwZFR0kuZXUxFTATBgNVBAMTDGFwcGRiLmVnaS5ldTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAK8aVSi+D+NoPI1mRwQGyiOVkxofhYb5ZZGICaQkT8Mu1YaxzxBUl9X94Ily/nv6jp6QfIRA11D7TOB70MoujLmRow/GOt0enkEb0XomI3wM/PiBOvZgjzlaav8R9adKK87lPEvn+LhcjBbMqoIk5C68lQ1dNtKX4G+lUlYY1dbSgPUe5RwEdM8X3EQ1lkYehiC4elDwYKlhTTODtiu7OBm2m/LsYEwWDeaA0XdUK2uv5zaaJyJ+E/NjYxDkIM75MGhS//sPYfEOzqwNm7XY2RlwJR5V47xadCXTxXz3HKuAxx7rwln+EO1bkA6QEgIJ2WLL2dERl2wuhz16QbzDfh8CAwEAAaOCAe0wggHpMAwGA1UdEwEB/wQCMAAwEQYJYIZIAYb4QgEBBAQDAgbAMA4GA1UdDwEB/wQEAwIEsDAdBgNVHQ4EFgQURbjI/ju4HYZ9M0y+hyekx2aWZCswbQYDVR0jBGYwZIAUiz2pt50yJY8/6Nlcb4vnWpSU0MGhSaRHMEUxEzARBgoJkiaJk/IsZAEZEwNPUkcxGDAWBgoJkiaJk/IsZAEZEwhTRUUtR1JJRDEUMBIGA1UEAxMLU0VFLUdSSUQgQ0GCAQAwVQYDVR0fBE4wTDBKoEigRoZEaHR0cDovL3d3dy5ncmlkLmF1dGguZ3IvcGtpL3NlZWdyaWQtY2Evc2VydmljZXMvY3JsL3NlZWdyaWRjYS12Mi5jcmwwbAYDVR0gBGUwYzBTBg0rBgEEAYGBAxQCAQICMEIwQAYIKwYBBQUHAgEWNGh0dHA6Ly93d3cuZ3JpZC5hdXRoLmdyL3BraS9zZWVncmlkLWNhL2RvY3VtZW50cy9jcHMwDAYKKoZIhvdMBQICATBKBgNVHRIEQzBBgRdzZWVncmlkLWNhQGdyaWQuYXV0aC5ncoYmaHR0cDovL3d3dy5ncmlkLmF1dGguZ3IvcGtpL3NlZWdyaWQtY2EwFwYDVR0RBBAwDoIMYXBwZGIuZWdpLmV1MA0GCSqGSIb3DQEBBQUAA4IBAQAXCX8H4nqRDt0UQTdFj+2rbezYFmyw4vQk/zQW+5+bBzoPAI0+/AhcPU6G5MoOTS2AUvqglpdSOWB/XUHrS9J5DFnAaQNj16VYcfMVmVx+TQctZFdAPLriq2r+mCwFAJKA44p9xJZ0nL+YTcHFiUTn2houCvFCEVhF2iMS12fxm0mCRzyCGI7x5PHCsEw2giaAJrErDkFSlIaVUyhNTatIueXfnuclx5E91KQPu/d9Uz/Zn2P6fAJ9D3OaLTscCrij/AqY36Is/93aXkf3oatIc4WvSxJah0pzMFtx7bWj+Q3XDfFXmiy/q7JXQXVs0ZurIoZ5Ngv7UqiIBS9/UEK+</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://appdb-dev.marie.hellasgrid.gr/auth/module.php/saml/sp/saml2-logout.php/edugain-sp"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://appdb-dev.marie.hellasgrid.gr/auth/module.php/saml/sp/saml2-logout.php/edugain-sp"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://appdb-dev.marie.hellasgrid.gr/auth/module.php/saml/sp/saml2-acs.php/edugain-sp" index="0"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://appdb-dev.marie.hellasgrid.gr/auth/module.php/saml/sp/saml1-acs.php/edugain-sp" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://appdb-dev.marie.hellasgrid.gr/auth/module.php/saml/sp/saml2-acs.php/edugain-sp" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://appdb-dev.marie.hellasgrid.gr/auth/module.php/saml/sp/saml1-acs.php/edugain-sp/artifact" index="3"/>
-    <md:AttributeConsumingService index="0">
-      <md:ServiceName xml:lang="en">EGI Applications Database (DEV)</md:ServiceName>
-      <md:ServiceDescription xml:lang="en">EGI Software &amp; Cloud Marketplace (Development Instance)</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" isRequired="true"/>
-      <md:RequestedAttribute Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md: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: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.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.25178.1.2.10" 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" isRequired="true"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">IASA - GRNET</md:OrganizationName>
-    <md:OrganizationName xml:lang="el">ΙΕΣΕ - ΕΔΕΤ</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Institute of Accelerating Systems and Applications - Greek Research and Technology Network</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="el">Ινστιτούτο Επιταχυντικών Συστημάτων και Εφαρμογών - Εθνικό Δίκτυο Έρευνας και Τεχνολογίας</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.iasa.gr/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="el">http://www.iasa.gr/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.grnet.gr/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="el">http://www.grnet.gr/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Marios</md:GivenName>
-    <md:SurName>Chatziangelou</md:SurName>
-    <md:EmailAddress>mhaggel@iasa.gr</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Marios</md:GivenName>
-    <md:SurName>Chatziangelou</md:SurName>
-    <md:EmailAddress>appdb-support@iasa.gr</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/appdb-dev.marie.hellasgrid.gr.xml b/swamid-interfederations-2.0/appdb-dev.marie.hellasgrid.gr.xml
deleted file mode 100644
index 1fa73d1f..00000000
--- a/swamid-interfederations-2.0/appdb-dev.marie.hellasgrid.gr.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://appdb-dev.marie.hellasgrid.gr/edugain-sp">
-  <Extensions xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi">
-    <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>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="en">EGI Applications Database (DEV)</mdui:DisplayName>
-        <mdui:Description xml:lang="en">EGI Software &amp; Cloud Marketplace (Development Instance)</mdui:Description>
-        <mdui:InformationURL xml:lang="en">https://wiki.appdb.egi.eu/</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://wiki.appdb.egi.eu/main:about:terms</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="el">https://wiki.appdb.egi.eu/main:about:terms</mdui:PrivacyStatementURL>
-        <mdui:Logo height="128" width="120">https://appdb-dev.marie.hellasgrid.gr/images/appdblogo.png</mdui:Logo>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIFHjCCBAagAwIBAgICA8swDQYJKoZIhvcNAQEFBQAwRTETMBEGCgmSJomT8ixkARkTA09SRzEYMBYGCgmSJomT8ixkARkTCFNFRS1HUklEMRQwEgYDVQQDEwtTRUUtR1JJRCBDQTAeFw0xMzEwMTcxNjEwMTdaFw0xNDA4MTMxNjEwMTdaMG4xEjAQBgoJkiaJk/IsZAEZFgJFVTETMBEGCgmSJomT8ixkARkWA0VHSTELMAkGA1UEBhMCTkwxDjAMBgNVBAoTBUhvc3RzMQ8wDQYDVQQKEwZFR0kuZXUxFTATBgNVBAMTDGFwcGRiLmVnaS5ldTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAK8aVSi+D+NoPI1mRwQGyiOVkxofhYb5ZZGICaQkT8Mu1YaxzxBUl9X94Ily/nv6jp6QfIRA11D7TOB70MoujLmRow/GOt0enkEb0XomI3wM/PiBOvZgjzlaav8R9adKK87lPEvn+LhcjBbMqoIk5C68lQ1dNtKX4G+lUlYY1dbSgPUe5RwEdM8X3EQ1lkYehiC4elDwYKlhTTODtiu7OBm2m/LsYEwWDeaA0XdUK2uv5zaaJyJ+E/NjYxDkIM75MGhS//sPYfEOzqwNm7XY2RlwJR5V47xadCXTxXz3HKuAxx7rwln+EO1bkA6QEgIJ2WLL2dERl2wuhz16QbzDfh8CAwEAAaOCAe0wggHpMAwGA1UdEwEB/wQCMAAwEQYJYIZIAYb4QgEBBAQDAgbAMA4GA1UdDwEB/wQEAwIEsDAdBgNVHQ4EFgQURbjI/ju4HYZ9M0y+hyekx2aWZCswbQYDVR0jBGYwZIAUiz2pt50yJY8/6Nlcb4vnWpSU0MGhSaRHMEUxEzARBgoJkiaJk/IsZAEZEwNPUkcxGDAWBgoJkiaJk/IsZAEZEwhTRUUtR1JJRDEUMBIGA1UEAxMLU0VFLUdSSUQgQ0GCAQAwVQYDVR0fBE4wTDBKoEigRoZEaHR0cDovL3d3dy5ncmlkLmF1dGguZ3IvcGtpL3NlZWdyaWQtY2Evc2VydmljZXMvY3JsL3NlZWdyaWRjYS12Mi5jcmwwbAYDVR0gBGUwYzBTBg0rBgEEAYGBAxQCAQICMEIwQAYIKwYBBQUHAgEWNGh0dHA6Ly93d3cuZ3JpZC5hdXRoLmdyL3BraS9zZWVncmlkLWNhL2RvY3VtZW50cy9jcHMwDAYKKoZIhvdMBQICATBKBgNVHRIEQzBBgRdzZWVncmlkLWNhQGdyaWQuYXV0aC5ncoYmaHR0cDovL3d3dy5ncmlkLmF1dGguZ3IvcGtpL3NlZWdyaWQtY2EwFwYDVR0RBBAwDoIMYXBwZGIuZWdpLmV1MA0GCSqGSIb3DQEBBQUAA4IBAQAXCX8H4nqRDt0UQTdFj+2rbezYFmyw4vQk/zQW+5+bBzoPAI0+/AhcPU6G5MoOTS2AUvqglpdSOWB/XUHrS9J5DFnAaQNj16VYcfMVmVx+TQctZFdAPLriq2r+mCwFAJKA44p9xJZ0nL+YTcHFiUTn2houCvFCEVhF2iMS12fxm0mCRzyCGI7x5PHCsEw2giaAJrErDkFSlIaVUyhNTatIueXfnuclx5E91KQPu/d9Uz/Zn2P6fAJ9D3OaLTscCrij/AqY36Is/93aXkf3oatIc4WvSxJah0pzMFtx7bWj+Q3XDfFXmiy/q7JXQXVs0ZurIoZ5Ngv7UqiIBS9/UEK+</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIFHjCCBAagAwIBAgICA8swDQYJKoZIhvcNAQEFBQAwRTETMBEGCgmSJomT8ixkARkTA09SRzEYMBYGCgmSJomT8ixkARkTCFNFRS1HUklEMRQwEgYDVQQDEwtTRUUtR1JJRCBDQTAeFw0xMzEwMTcxNjEwMTdaFw0xNDA4MTMxNjEwMTdaMG4xEjAQBgoJkiaJk/IsZAEZFgJFVTETMBEGCgmSJomT8ixkARkWA0VHSTELMAkGA1UEBhMCTkwxDjAMBgNVBAoTBUhvc3RzMQ8wDQYDVQQKEwZFR0kuZXUxFTATBgNVBAMTDGFwcGRiLmVnaS5ldTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAK8aVSi+D+NoPI1mRwQGyiOVkxofhYb5ZZGICaQkT8Mu1YaxzxBUl9X94Ily/nv6jp6QfIRA11D7TOB70MoujLmRow/GOt0enkEb0XomI3wM/PiBOvZgjzlaav8R9adKK87lPEvn+LhcjBbMqoIk5C68lQ1dNtKX4G+lUlYY1dbSgPUe5RwEdM8X3EQ1lkYehiC4elDwYKlhTTODtiu7OBm2m/LsYEwWDeaA0XdUK2uv5zaaJyJ+E/NjYxDkIM75MGhS//sPYfEOzqwNm7XY2RlwJR5V47xadCXTxXz3HKuAxx7rwln+EO1bkA6QEgIJ2WLL2dERl2wuhz16QbzDfh8CAwEAAaOCAe0wggHpMAwGA1UdEwEB/wQCMAAwEQYJYIZIAYb4QgEBBAQDAgbAMA4GA1UdDwEB/wQEAwIEsDAdBgNVHQ4EFgQURbjI/ju4HYZ9M0y+hyekx2aWZCswbQYDVR0jBGYwZIAUiz2pt50yJY8/6Nlcb4vnWpSU0MGhSaRHMEUxEzARBgoJkiaJk/IsZAEZEwNPUkcxGDAWBgoJkiaJk/IsZAEZEwhTRUUtR1JJRDEUMBIGA1UEAxMLU0VFLUdSSUQgQ0GCAQAwVQYDVR0fBE4wTDBKoEigRoZEaHR0cDovL3d3dy5ncmlkLmF1dGguZ3IvcGtpL3NlZWdyaWQtY2Evc2VydmljZXMvY3JsL3NlZWdyaWRjYS12Mi5jcmwwbAYDVR0gBGUwYzBTBg0rBgEEAYGBAxQCAQICMEIwQAYIKwYBBQUHAgEWNGh0dHA6Ly93d3cuZ3JpZC5hdXRoLmdyL3BraS9zZWVncmlkLWNhL2RvY3VtZW50cy9jcHMwDAYKKoZIhvdMBQICATBKBgNVHRIEQzBBgRdzZWVncmlkLWNhQGdyaWQuYXV0aC5ncoYmaHR0cDovL3d3dy5ncmlkLmF1dGguZ3IvcGtpL3NlZWdyaWQtY2EwFwYDVR0RBBAwDoIMYXBwZGIuZWdpLmV1MA0GCSqGSIb3DQEBBQUAA4IBAQAXCX8H4nqRDt0UQTdFj+2rbezYFmyw4vQk/zQW+5+bBzoPAI0+/AhcPU6G5MoOTS2AUvqglpdSOWB/XUHrS9J5DFnAaQNj16VYcfMVmVx+TQctZFdAPLriq2r+mCwFAJKA44p9xJZ0nL+YTcHFiUTn2houCvFCEVhF2iMS12fxm0mCRzyCGI7x5PHCsEw2giaAJrErDkFSlIaVUyhNTatIueXfnuclx5E91KQPu/d9Uz/Zn2P6fAJ9D3OaLTscCrij/AqY36Is/93aXkf3oatIc4WvSxJah0pzMFtx7bWj+Q3XDfFXmiy/q7JXQXVs0ZurIoZ5Ngv7UqiIBS9/UEK+</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://appdb-dev.marie.hellasgrid.gr/auth/module.php/saml/sp/saml2-logout.php/edugain-sp"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://appdb-dev.marie.hellasgrid.gr/auth/module.php/saml/sp/saml2-logout.php/edugain-sp"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://appdb-dev.marie.hellasgrid.gr/auth/module.php/saml/sp/saml2-acs.php/edugain-sp" index="0"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://appdb-dev.marie.hellasgrid.gr/auth/module.php/saml/sp/saml1-acs.php/edugain-sp" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://appdb-dev.marie.hellasgrid.gr/auth/module.php/saml/sp/saml2-acs.php/edugain-sp" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://appdb-dev.marie.hellasgrid.gr/auth/module.php/saml/sp/saml1-acs.php/edugain-sp/artifact" index="3"/>
-    <md:AttributeConsumingService index="0">
-      <md:ServiceName xml:lang="en">EGI Applications Database (DEV)</md:ServiceName>
-      <md:ServiceDescription xml:lang="en">EGI Software &amp; Cloud Marketplace (Development Instance)</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" isRequired="true"/>
-      <md:RequestedAttribute Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md: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: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.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.25178.1.2.10" 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" isRequired="true"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">IASA - GRNET</md:OrganizationName>
-    <md:OrganizationName xml:lang="el">ΙΕΣΕ - ΕΔΕΤ</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Institute of Accelerating Systems and Applications - Greek Research and Technology Network</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="el">Ινστιτούτο Επιταχυντικών Συστημάτων και Εφαρμογών - Εθνικό Δίκτυο Έρευνας και Τεχνολογίας</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.iasa.gr/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="el">http://www.iasa.gr/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.grnet.gr/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="el">http://www.grnet.gr/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Marios</md:GivenName>
-    <md:SurName>Chatziangelou</md:SurName>
-    <md:EmailAddress>mhaggel@iasa.gr</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Marios</md:GivenName>
-    <md:SurName>Chatziangelou</md:SurName>
-    <md:EmailAddress>appdb-support@iasa.gr</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/appdb.egi.eu-edugain-connect.xml b/swamid-interfederations-2.0/appdb.egi.eu-edugain-connect.xml
deleted file mode 100644
index bd92e550..00000000
--- a/swamid-interfederations-2.0/appdb.egi.eu-edugain-connect.xml
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://appdb.egi.eu/edugain-connect">
-  <Extensions xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi">
-    <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>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="en">EGI Applications Database (Connect)</mdui:DisplayName>
-        <mdui:Description xml:lang="en">EGI Software &amp; Cloud Marketplace (Connect)</mdui:Description>
-        <mdui:InformationURL xml:lang="en">https://wiki.appdb.egi.eu/</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://wiki.appdb.egi.eu/main:about:terms</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="el">https://wiki.appdb.egi.eu/main:about:terms</mdui:PrivacyStatementURL>
-        <mdui:Logo height="128" width="120">https://appdb.egi.eu/images/appdblogo.png</mdui:Logo>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIID9TCCAt2gAwIBAgIJAIXaE7tbXMMCMA0GCSqGSIb3DQEBBQUAMIGQMQswCQYDVQQGEwJHUjEPMA0GA1UECAwGR3JlZWNlMQ8wDQYDVQQHDAZBdGhlbnMxDTALBgNVBAoMBElBU0ExEzARBgNVBAsMCkFwcERCL0lBU0ExFTATBgNVBAMMDGFwcGRiLmVnaS5ldTEkMCIGCSqGSIb3DQEJARYVYXBwZGItc3VwcG9ydEBpYXNhLmdyMB4XDTE0MTAyMTE2Mjc0N1oXDTI0MTAyMDE2Mjc0N1owgZAxCzAJBgNVBAYTAkdSMQ8wDQYDVQQIDAZHcmVlY2UxDzANBgNVBAcMBkF0aGVuczENMAsGA1UECgwESUFTQTETMBEGA1UECwwKQXBwREIvSUFTQTEVMBMGA1UEAwwMYXBwZGIuZWdpLmV1MSQwIgYJKoZIhvcNAQkBFhVhcHBkYi1zdXBwb3J0QGlhc2EuZ3IwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQD9cPAvFySX3f0rcBymgZ1uiW8xH4oo+E76USeAWBb5uext1yZiV6dM4lAw/s/rxiNV23yaY3T4ELVxe/84jkftxhoMQfP+TgqgGFpldwivdRWpnJs9FiYnd92OabOWNKYQDzx1eqIP1nqOwUiMNtbHH7kGDbkAelxP5eNwCrvk/UNX+Fp0vW7QXAdEQAzRahyC1i4VwgSEVfitLMTtAR3JZKybHhKr5tTK8oPO00pSj6L4TB9mBZB8LtR3RpyWgQlrMIIvd0upST24B5atYNW+J33Gmcu2jhhpDdQJ+QaFl/6j9Ye1aJFa1ysvwz6b+VsK3pvi2lpHGcCn9LjHF9ALAgMBAAGjUDBOMB0GA1UdDgQWBBQ7jcFObUqRcZQDJ11fOuWBVFR2rTAfBgNVHSMEGDAWgBQ7jcFObUqRcZQDJ11fOuWBVFR2rTAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQAPCzRBbiyVZnrO9YxU8VWhzMrQLpAYwcNygGy9emPXwR2iygauIoi7f5MYe5e+BekC57CSxASPCa1431+OgoUNBYROzeasUfXpT5ofFeOH3ciJXMkUbO9E36/S5icbBeMHW60EJoNAhihzVYDtqmbKH6Xfjo6eqH8X745S4yYBLlRvSRYWxxLlAS9Q3ODel7a8L5zzwLSSmbHywkmlton/paeUqku5nSSPs0sO3JIMQoRqH3Mne+CSP6jxrAJVNdhthpKltLtlWB8IZamVhUjGIK3OsF77Vxk3WktY+KwlpgNHnWAXqT9KGCWaZMesDSrXe/sszcgi6Su1WPg8NNTZ</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIID9TCCAt2gAwIBAgIJAIXaE7tbXMMCMA0GCSqGSIb3DQEBBQUAMIGQMQswCQYDVQQGEwJHUjEPMA0GA1UECAwGR3JlZWNlMQ8wDQYDVQQHDAZBdGhlbnMxDTALBgNVBAoMBElBU0ExEzARBgNVBAsMCkFwcERCL0lBU0ExFTATBgNVBAMMDGFwcGRiLmVnaS5ldTEkMCIGCSqGSIb3DQEJARYVYXBwZGItc3VwcG9ydEBpYXNhLmdyMB4XDTE0MTAyMTE2Mjc0N1oXDTI0MTAyMDE2Mjc0N1owgZAxCzAJBgNVBAYTAkdSMQ8wDQYDVQQIDAZHcmVlY2UxDzANBgNVBAcMBkF0aGVuczENMAsGA1UECgwESUFTQTETMBEGA1UECwwKQXBwREIvSUFTQTEVMBMGA1UEAwwMYXBwZGIuZWdpLmV1MSQwIgYJKoZIhvcNAQkBFhVhcHBkYi1zdXBwb3J0QGlhc2EuZ3IwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQD9cPAvFySX3f0rcBymgZ1uiW8xH4oo+E76USeAWBb5uext1yZiV6dM4lAw/s/rxiNV23yaY3T4ELVxe/84jkftxhoMQfP+TgqgGFpldwivdRWpnJs9FiYnd92OabOWNKYQDzx1eqIP1nqOwUiMNtbHH7kGDbkAelxP5eNwCrvk/UNX+Fp0vW7QXAdEQAzRahyC1i4VwgSEVfitLMTtAR3JZKybHhKr5tTK8oPO00pSj6L4TB9mBZB8LtR3RpyWgQlrMIIvd0upST24B5atYNW+J33Gmcu2jhhpDdQJ+QaFl/6j9Ye1aJFa1ysvwz6b+VsK3pvi2lpHGcCn9LjHF9ALAgMBAAGjUDBOMB0GA1UdDgQWBBQ7jcFObUqRcZQDJ11fOuWBVFR2rTAfBgNVHSMEGDAWgBQ7jcFObUqRcZQDJ11fOuWBVFR2rTAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQAPCzRBbiyVZnrO9YxU8VWhzMrQLpAYwcNygGy9emPXwR2iygauIoi7f5MYe5e+BekC57CSxASPCa1431+OgoUNBYROzeasUfXpT5ofFeOH3ciJXMkUbO9E36/S5icbBeMHW60EJoNAhihzVYDtqmbKH6Xfjo6eqH8X745S4yYBLlRvSRYWxxLlAS9Q3ODel7a8L5zzwLSSmbHywkmlton/paeUqku5nSSPs0sO3JIMQoRqH3Mne+CSP6jxrAJVNdhthpKltLtlWB8IZamVhUjGIK3OsF77Vxk3WktY+KwlpgNHnWAXqT9KGCWaZMesDSrXe/sszcgi6Su1WPg8NNTZ</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIE+TCCA+GgAwIBAgIRAIXc8Krve5VuXkhnojBEvuAwDQYJKoZIhvcNAQEFBQAwczELMAkGA1UEBhMCR0IxGzAZBgNVBAgTEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4GA1UEBxMHU2FsZm9yZDEaMBgGA1UEChMRQ09NT0RPIENBIExpbWl0ZWQxGTAXBgNVBAMTEFBvc2l0aXZlU1NMIENBIDIwHhcNMTMxMDAzMDAwMDAwWhcNMTQxMDAzMjM1OTU5WjBQMSEwHwYDVQQLExhEb21haW4gQ29udHJvbCBWYWxpZGF0ZWQxFDASBgNVBAsTC1Bvc2l0aXZlU1NMMRUwEwYDVQQDEwxhcHBkYi5lZ2kuZXUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC9RMFe27ucrw5Uv2oCmfxIB2O4q/dwFNZVZmTWfiRisOyvSUtooCDneO4vhvt6h9YP7zAjPjfBA6SruBKtfXH5j3uPEEllpV4jq4mPJBo0D0P1aPq9ibbh0DrO+XRlcjjXAKYmlBZxa2oIjiFD7MgxAzf6VkTHCNDN/tGLFxCv1+/ExvPpOUZTPBkiGXkEDyJATpepFxROVoo7IZf5Azqpy3lLSMiqbTEKkQXbcW8egmP6wmMpUaNRYHtwNiU3qRVKrZw/322P2yYuFLUpCHPjTNKW4SMlhbt4RyMtO0LnIAJt9DgcMaiha2EDcaojV1fq7pFZzCg1YC6uvFG9atkxAgMBAAGjggGpMIIBpTAfBgNVHSMEGDAWgBSZ5EBfaxRePgXZ3dNjVPxiuPcArDAdBgNVHQ4EFgQUtxGXMez+256VFqWJT7kEz3zY5EEwDgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMFAGA1UdIARJMEcwOwYLKwYBBAGyMQECAgcwLDAqBggrBgEFBQcCARYeaHR0cDovL3d3dy5wb3NpdGl2ZXNzbC5jb20vQ1BTMAgGBmeBDAECATA7BgNVHR8ENDAyMDCgLqAshipodHRwOi8vY3JsLmNvbW9kb2NhLmNvbS9Qb3NpdGl2ZVNTTENBMi5jcmwwbAYIKwYBBQUHAQEEYDBeMDYGCCsGAQUFBzAChipodHRwOi8vY3J0LmNvbW9kb2NhLmNvbS9Qb3NpdGl2ZVNTTENBMi5jcnQwJAYIKwYBBQUHMAGGGGh0dHA6Ly9vY3NwLmNvbW9kb2NhLmNvbTApBgNVHREEIjAgggxhcHBkYi5lZ2kuZXWCEHd3dy5hcHBkYi5lZ2kuZXUwDQYJKoZIhvcNAQEFBQADggEBAJTG+QIH44hiyl/vxEncKy6vAib3n7PbqphVmA4NDf0peKp8xdYoG23YnHG72aGsUwg9031RtN/1LqaAgb2A3JOF5of1pobqQbwPUC6mSNuXFm1cOtZR8gG5e6G3mwB9FWb0P6WK+yzsBhz3ekSziv4PgZjd1HIiSLUg1YwpWYvBIdi+MCDZVSgNmJr9QKsv+N50fcYuGYSmXOEnLNchyMUPcQzzSO/xI0JkeiQkAQ5WfCV03ykmBxSvefeJo35GMzGEIpxrQ/DgyvKIwkFtBf/ESA4ID3JN7+iZJs2XjWRgFZx5mKCwr5uY2tNmvbFvM7g1zFwOyLdlEV45Dp3d9bk=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://appdb.egi.eu/auth/module.php/saml/sp/saml2-logout.php/edugain-connect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://appdb.egi.eu/auth/module.php/saml/sp/saml2-logout.php/edugain-connect"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://appdb.egi.eu/auth/module.php/saml/sp/saml2-acs.php/edugain-connect" index="0"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://appdb.egi.eu/auth/module.php/saml/sp/saml1-acs.php/edugain-connect" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://appdb.egi.eu/auth/module.php/saml/sp/saml2-acs.php/edugain-connect" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://appdb.egi.eu/auth/module.php/saml/sp/saml1-acs.php/edugain-connect/artifact" index="3"/>
-    <md:AttributeConsumingService index="0">
-      <md:ServiceName xml:lang="en">EGI Applications Database (Connect)</md:ServiceName>
-      <md:ServiceDescription xml:lang="en">EGI Software &amp; Cloud Marketplace (Connect)</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" isRequired="true"/>
-      <md:RequestedAttribute Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md: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: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.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.25178.1.2.10" 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" isRequired="true"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">IASA - GRNET</md:OrganizationName>
-    <md:OrganizationName xml:lang="el">ΙΕΣΕ - ΕΔΕΤ</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Institute of Accelerating Systems and Applications - Greek Research and Technology Network</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="el">Ινστιτούτο Επιταχυντικών Συστημάτων και Εφαρμογών - Εθνικό Δίκτυο Έρευνας και Τεχνολογίας</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.iasa.gr/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="el">http://www.iasa.gr/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.grnet.gr/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="el">http://www.grnet.gr/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Marios</md:GivenName>
-    <md:SurName>Chatziangelou</md:SurName>
-    <md:EmailAddress>mhaggel@iasa.gr</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Marios</md:GivenName>
-    <md:SurName>Chatziangelou</md:SurName>
-    <md:EmailAddress>appdb-support@iasa.gr</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/appdb.egi.eu-edugain-sp.xml b/swamid-interfederations-2.0/appdb.egi.eu-edugain-sp.xml
deleted file mode 100644
index d3b4a2ca..00000000
--- a/swamid-interfederations-2.0/appdb.egi.eu-edugain-sp.xml
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://appdb.egi.eu/edugain-sp">
-  <Extensions xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi">
-    <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>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="en">EGI Applications Database</mdui:DisplayName>
-        <mdui:Description xml:lang="en">EGI Software &amp; Cloud Marketplace</mdui:Description>
-        <mdui:InformationURL xml:lang="en">https://wiki.appdb.egi.eu/</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://wiki.appdb.egi.eu/main:about:terms</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="el">https://wiki.appdb.egi.eu/main:about:terms</mdui:PrivacyStatementURL>
-        <mdui:Logo height="128" width="120">https://appdb.egi.eu/images/appdblogo.png</mdui:Logo>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIID9TCCAt2gAwIBAgIJAIXaE7tbXMMCMA0GCSqGSIb3DQEBBQUAMIGQMQswCQYDVQQGEwJHUjEPMA0GA1UECAwGR3JlZWNlMQ8wDQYDVQQHDAZBdGhlbnMxDTALBgNVBAoMBElBU0ExEzARBgNVBAsMCkFwcERCL0lBU0ExFTATBgNVBAMMDGFwcGRiLmVnaS5ldTEkMCIGCSqGSIb3DQEJARYVYXBwZGItc3VwcG9ydEBpYXNhLmdyMB4XDTE0MTAyMTE2Mjc0N1oXDTI0MTAyMDE2Mjc0N1owgZAxCzAJBgNVBAYTAkdSMQ8wDQYDVQQIDAZHcmVlY2UxDzANBgNVBAcMBkF0aGVuczENMAsGA1UECgwESUFTQTETMBEGA1UECwwKQXBwREIvSUFTQTEVMBMGA1UEAwwMYXBwZGIuZWdpLmV1MSQwIgYJKoZIhvcNAQkBFhVhcHBkYi1zdXBwb3J0QGlhc2EuZ3IwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQD9cPAvFySX3f0rcBymgZ1uiW8xH4oo+E76USeAWBb5uext1yZiV6dM4lAw/s/rxiNV23yaY3T4ELVxe/84jkftxhoMQfP+TgqgGFpldwivdRWpnJs9FiYnd92OabOWNKYQDzx1eqIP1nqOwUiMNtbHH7kGDbkAelxP5eNwCrvk/UNX+Fp0vW7QXAdEQAzRahyC1i4VwgSEVfitLMTtAR3JZKybHhKr5tTK8oPO00pSj6L4TB9mBZB8LtR3RpyWgQlrMIIvd0upST24B5atYNW+J33Gmcu2jhhpDdQJ+QaFl/6j9Ye1aJFa1ysvwz6b+VsK3pvi2lpHGcCn9LjHF9ALAgMBAAGjUDBOMB0GA1UdDgQWBBQ7jcFObUqRcZQDJ11fOuWBVFR2rTAfBgNVHSMEGDAWgBQ7jcFObUqRcZQDJ11fOuWBVFR2rTAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQAPCzRBbiyVZnrO9YxU8VWhzMrQLpAYwcNygGy9emPXwR2iygauIoi7f5MYe5e+BekC57CSxASPCa1431+OgoUNBYROzeasUfXpT5ofFeOH3ciJXMkUbO9E36/S5icbBeMHW60EJoNAhihzVYDtqmbKH6Xfjo6eqH8X745S4yYBLlRvSRYWxxLlAS9Q3ODel7a8L5zzwLSSmbHywkmlton/paeUqku5nSSPs0sO3JIMQoRqH3Mne+CSP6jxrAJVNdhthpKltLtlWB8IZamVhUjGIK3OsF77Vxk3WktY+KwlpgNHnWAXqT9KGCWaZMesDSrXe/sszcgi6Su1WPg8NNTZ</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIID9TCCAt2gAwIBAgIJAIXaE7tbXMMCMA0GCSqGSIb3DQEBBQUAMIGQMQswCQYDVQQGEwJHUjEPMA0GA1UECAwGR3JlZWNlMQ8wDQYDVQQHDAZBdGhlbnMxDTALBgNVBAoMBElBU0ExEzARBgNVBAsMCkFwcERCL0lBU0ExFTATBgNVBAMMDGFwcGRiLmVnaS5ldTEkMCIGCSqGSIb3DQEJARYVYXBwZGItc3VwcG9ydEBpYXNhLmdyMB4XDTE0MTAyMTE2Mjc0N1oXDTI0MTAyMDE2Mjc0N1owgZAxCzAJBgNVBAYTAkdSMQ8wDQYDVQQIDAZHcmVlY2UxDzANBgNVBAcMBkF0aGVuczENMAsGA1UECgwESUFTQTETMBEGA1UECwwKQXBwREIvSUFTQTEVMBMGA1UEAwwMYXBwZGIuZWdpLmV1MSQwIgYJKoZIhvcNAQkBFhVhcHBkYi1zdXBwb3J0QGlhc2EuZ3IwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQD9cPAvFySX3f0rcBymgZ1uiW8xH4oo+E76USeAWBb5uext1yZiV6dM4lAw/s/rxiNV23yaY3T4ELVxe/84jkftxhoMQfP+TgqgGFpldwivdRWpnJs9FiYnd92OabOWNKYQDzx1eqIP1nqOwUiMNtbHH7kGDbkAelxP5eNwCrvk/UNX+Fp0vW7QXAdEQAzRahyC1i4VwgSEVfitLMTtAR3JZKybHhKr5tTK8oPO00pSj6L4TB9mBZB8LtR3RpyWgQlrMIIvd0upST24B5atYNW+J33Gmcu2jhhpDdQJ+QaFl/6j9Ye1aJFa1ysvwz6b+VsK3pvi2lpHGcCn9LjHF9ALAgMBAAGjUDBOMB0GA1UdDgQWBBQ7jcFObUqRcZQDJ11fOuWBVFR2rTAfBgNVHSMEGDAWgBQ7jcFObUqRcZQDJ11fOuWBVFR2rTAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQAPCzRBbiyVZnrO9YxU8VWhzMrQLpAYwcNygGy9emPXwR2iygauIoi7f5MYe5e+BekC57CSxASPCa1431+OgoUNBYROzeasUfXpT5ofFeOH3ciJXMkUbO9E36/S5icbBeMHW60EJoNAhihzVYDtqmbKH6Xfjo6eqH8X745S4yYBLlRvSRYWxxLlAS9Q3ODel7a8L5zzwLSSmbHywkmlton/paeUqku5nSSPs0sO3JIMQoRqH3Mne+CSP6jxrAJVNdhthpKltLtlWB8IZamVhUjGIK3OsF77Vxk3WktY+KwlpgNHnWAXqT9KGCWaZMesDSrXe/sszcgi6Su1WPg8NNTZ</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIE+TCCA+GgAwIBAgIRAIXc8Krve5VuXkhnojBEvuAwDQYJKoZIhvcNAQEFBQAwczELMAkGA1UEBhMCR0IxGzAZBgNVBAgTEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4GA1UEBxMHU2FsZm9yZDEaMBgGA1UEChMRQ09NT0RPIENBIExpbWl0ZWQxGTAXBgNVBAMTEFBvc2l0aXZlU1NMIENBIDIwHhcNMTMxMDAzMDAwMDAwWhcNMTQxMDAzMjM1OTU5WjBQMSEwHwYDVQQLExhEb21haW4gQ29udHJvbCBWYWxpZGF0ZWQxFDASBgNVBAsTC1Bvc2l0aXZlU1NMMRUwEwYDVQQDEwxhcHBkYi5lZ2kuZXUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC9RMFe27ucrw5Uv2oCmfxIB2O4q/dwFNZVZmTWfiRisOyvSUtooCDneO4vhvt6h9YP7zAjPjfBA6SruBKtfXH5j3uPEEllpV4jq4mPJBo0D0P1aPq9ibbh0DrO+XRlcjjXAKYmlBZxa2oIjiFD7MgxAzf6VkTHCNDN/tGLFxCv1+/ExvPpOUZTPBkiGXkEDyJATpepFxROVoo7IZf5Azqpy3lLSMiqbTEKkQXbcW8egmP6wmMpUaNRYHtwNiU3qRVKrZw/322P2yYuFLUpCHPjTNKW4SMlhbt4RyMtO0LnIAJt9DgcMaiha2EDcaojV1fq7pFZzCg1YC6uvFG9atkxAgMBAAGjggGpMIIBpTAfBgNVHSMEGDAWgBSZ5EBfaxRePgXZ3dNjVPxiuPcArDAdBgNVHQ4EFgQUtxGXMez+256VFqWJT7kEz3zY5EEwDgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMFAGA1UdIARJMEcwOwYLKwYBBAGyMQECAgcwLDAqBggrBgEFBQcCARYeaHR0cDovL3d3dy5wb3NpdGl2ZXNzbC5jb20vQ1BTMAgGBmeBDAECATA7BgNVHR8ENDAyMDCgLqAshipodHRwOi8vY3JsLmNvbW9kb2NhLmNvbS9Qb3NpdGl2ZVNTTENBMi5jcmwwbAYIKwYBBQUHAQEEYDBeMDYGCCsGAQUFBzAChipodHRwOi8vY3J0LmNvbW9kb2NhLmNvbS9Qb3NpdGl2ZVNTTENBMi5jcnQwJAYIKwYBBQUHMAGGGGh0dHA6Ly9vY3NwLmNvbW9kb2NhLmNvbTApBgNVHREEIjAgggxhcHBkYi5lZ2kuZXWCEHd3dy5hcHBkYi5lZ2kuZXUwDQYJKoZIhvcNAQEFBQADggEBAJTG+QIH44hiyl/vxEncKy6vAib3n7PbqphVmA4NDf0peKp8xdYoG23YnHG72aGsUwg9031RtN/1LqaAgb2A3JOF5of1pobqQbwPUC6mSNuXFm1cOtZR8gG5e6G3mwB9FWb0P6WK+yzsBhz3ekSziv4PgZjd1HIiSLUg1YwpWYvBIdi+MCDZVSgNmJr9QKsv+N50fcYuGYSmXOEnLNchyMUPcQzzSO/xI0JkeiQkAQ5WfCV03ykmBxSvefeJo35GMzGEIpxrQ/DgyvKIwkFtBf/ESA4ID3JN7+iZJs2XjWRgFZx5mKCwr5uY2tNmvbFvM7g1zFwOyLdlEV45Dp3d9bk=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://appdb.egi.eu/auth/module.php/saml/sp/saml2-logout.php/edugain-sp"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://appdb.egi.eu/auth/module.php/saml/sp/saml2-logout.php/edugain-sp"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://appdb.egi.eu/auth/module.php/saml/sp/saml2-acs.php/edugain-sp" index="0"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://appdb.egi.eu/auth/module.php/saml/sp/saml1-acs.php/edugain-sp" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://appdb.egi.eu/auth/module.php/saml/sp/saml2-acs.php/edugain-sp" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://appdb.egi.eu/auth/module.php/saml/sp/saml1-acs.php/edugain-sp/artifact" index="3"/>
-    <md:AttributeConsumingService index="0">
-      <md:ServiceName xml:lang="en">EGI Applications Database</md:ServiceName>
-      <md:ServiceDescription xml:lang="en">EGI Software &amp; Cloud Marketplace</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" isRequired="true"/>
-      <md:RequestedAttribute Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md: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: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.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.25178.1.2.10" 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" isRequired="true"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">IASA - GRNET</md:OrganizationName>
-    <md:OrganizationName xml:lang="el">ΙΕΣΕ - ΕΔΕΤ</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Institute of Accelerating Systems and Applications - Greek Research and Technology Network</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="el">Ινστιτούτο Επιταχυντικών Συστημάτων και Εφαρμογών - Εθνικό Δίκτυο Έρευνας και Τεχνολογίας</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.iasa.gr/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="el">http://www.iasa.gr/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.grnet.gr/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="el">http://www.grnet.gr/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Marios</md:GivenName>
-    <md:SurName>Chatziangelou</md:SurName>
-    <md:EmailAddress>mhaggel@iasa.gr</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Marios</md:GivenName>
-    <md:SurName>Chatziangelou</md:SurName>
-    <md:EmailAddress>appdb-support@iasa.gr</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/appdb.egi.eu.xml b/swamid-interfederations-2.0/appdb.egi.eu.xml
deleted file mode 100644
index d3b4a2ca..00000000
--- a/swamid-interfederations-2.0/appdb.egi.eu.xml
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://appdb.egi.eu/edugain-sp">
-  <Extensions xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi">
-    <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>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="en">EGI Applications Database</mdui:DisplayName>
-        <mdui:Description xml:lang="en">EGI Software &amp; Cloud Marketplace</mdui:Description>
-        <mdui:InformationURL xml:lang="en">https://wiki.appdb.egi.eu/</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://wiki.appdb.egi.eu/main:about:terms</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="el">https://wiki.appdb.egi.eu/main:about:terms</mdui:PrivacyStatementURL>
-        <mdui:Logo height="128" width="120">https://appdb.egi.eu/images/appdblogo.png</mdui:Logo>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIID9TCCAt2gAwIBAgIJAIXaE7tbXMMCMA0GCSqGSIb3DQEBBQUAMIGQMQswCQYDVQQGEwJHUjEPMA0GA1UECAwGR3JlZWNlMQ8wDQYDVQQHDAZBdGhlbnMxDTALBgNVBAoMBElBU0ExEzARBgNVBAsMCkFwcERCL0lBU0ExFTATBgNVBAMMDGFwcGRiLmVnaS5ldTEkMCIGCSqGSIb3DQEJARYVYXBwZGItc3VwcG9ydEBpYXNhLmdyMB4XDTE0MTAyMTE2Mjc0N1oXDTI0MTAyMDE2Mjc0N1owgZAxCzAJBgNVBAYTAkdSMQ8wDQYDVQQIDAZHcmVlY2UxDzANBgNVBAcMBkF0aGVuczENMAsGA1UECgwESUFTQTETMBEGA1UECwwKQXBwREIvSUFTQTEVMBMGA1UEAwwMYXBwZGIuZWdpLmV1MSQwIgYJKoZIhvcNAQkBFhVhcHBkYi1zdXBwb3J0QGlhc2EuZ3IwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQD9cPAvFySX3f0rcBymgZ1uiW8xH4oo+E76USeAWBb5uext1yZiV6dM4lAw/s/rxiNV23yaY3T4ELVxe/84jkftxhoMQfP+TgqgGFpldwivdRWpnJs9FiYnd92OabOWNKYQDzx1eqIP1nqOwUiMNtbHH7kGDbkAelxP5eNwCrvk/UNX+Fp0vW7QXAdEQAzRahyC1i4VwgSEVfitLMTtAR3JZKybHhKr5tTK8oPO00pSj6L4TB9mBZB8LtR3RpyWgQlrMIIvd0upST24B5atYNW+J33Gmcu2jhhpDdQJ+QaFl/6j9Ye1aJFa1ysvwz6b+VsK3pvi2lpHGcCn9LjHF9ALAgMBAAGjUDBOMB0GA1UdDgQWBBQ7jcFObUqRcZQDJ11fOuWBVFR2rTAfBgNVHSMEGDAWgBQ7jcFObUqRcZQDJ11fOuWBVFR2rTAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQAPCzRBbiyVZnrO9YxU8VWhzMrQLpAYwcNygGy9emPXwR2iygauIoi7f5MYe5e+BekC57CSxASPCa1431+OgoUNBYROzeasUfXpT5ofFeOH3ciJXMkUbO9E36/S5icbBeMHW60EJoNAhihzVYDtqmbKH6Xfjo6eqH8X745S4yYBLlRvSRYWxxLlAS9Q3ODel7a8L5zzwLSSmbHywkmlton/paeUqku5nSSPs0sO3JIMQoRqH3Mne+CSP6jxrAJVNdhthpKltLtlWB8IZamVhUjGIK3OsF77Vxk3WktY+KwlpgNHnWAXqT9KGCWaZMesDSrXe/sszcgi6Su1WPg8NNTZ</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIID9TCCAt2gAwIBAgIJAIXaE7tbXMMCMA0GCSqGSIb3DQEBBQUAMIGQMQswCQYDVQQGEwJHUjEPMA0GA1UECAwGR3JlZWNlMQ8wDQYDVQQHDAZBdGhlbnMxDTALBgNVBAoMBElBU0ExEzARBgNVBAsMCkFwcERCL0lBU0ExFTATBgNVBAMMDGFwcGRiLmVnaS5ldTEkMCIGCSqGSIb3DQEJARYVYXBwZGItc3VwcG9ydEBpYXNhLmdyMB4XDTE0MTAyMTE2Mjc0N1oXDTI0MTAyMDE2Mjc0N1owgZAxCzAJBgNVBAYTAkdSMQ8wDQYDVQQIDAZHcmVlY2UxDzANBgNVBAcMBkF0aGVuczENMAsGA1UECgwESUFTQTETMBEGA1UECwwKQXBwREIvSUFTQTEVMBMGA1UEAwwMYXBwZGIuZWdpLmV1MSQwIgYJKoZIhvcNAQkBFhVhcHBkYi1zdXBwb3J0QGlhc2EuZ3IwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQD9cPAvFySX3f0rcBymgZ1uiW8xH4oo+E76USeAWBb5uext1yZiV6dM4lAw/s/rxiNV23yaY3T4ELVxe/84jkftxhoMQfP+TgqgGFpldwivdRWpnJs9FiYnd92OabOWNKYQDzx1eqIP1nqOwUiMNtbHH7kGDbkAelxP5eNwCrvk/UNX+Fp0vW7QXAdEQAzRahyC1i4VwgSEVfitLMTtAR3JZKybHhKr5tTK8oPO00pSj6L4TB9mBZB8LtR3RpyWgQlrMIIvd0upST24B5atYNW+J33Gmcu2jhhpDdQJ+QaFl/6j9Ye1aJFa1ysvwz6b+VsK3pvi2lpHGcCn9LjHF9ALAgMBAAGjUDBOMB0GA1UdDgQWBBQ7jcFObUqRcZQDJ11fOuWBVFR2rTAfBgNVHSMEGDAWgBQ7jcFObUqRcZQDJ11fOuWBVFR2rTAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQAPCzRBbiyVZnrO9YxU8VWhzMrQLpAYwcNygGy9emPXwR2iygauIoi7f5MYe5e+BekC57CSxASPCa1431+OgoUNBYROzeasUfXpT5ofFeOH3ciJXMkUbO9E36/S5icbBeMHW60EJoNAhihzVYDtqmbKH6Xfjo6eqH8X745S4yYBLlRvSRYWxxLlAS9Q3ODel7a8L5zzwLSSmbHywkmlton/paeUqku5nSSPs0sO3JIMQoRqH3Mne+CSP6jxrAJVNdhthpKltLtlWB8IZamVhUjGIK3OsF77Vxk3WktY+KwlpgNHnWAXqT9KGCWaZMesDSrXe/sszcgi6Su1WPg8NNTZ</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIE+TCCA+GgAwIBAgIRAIXc8Krve5VuXkhnojBEvuAwDQYJKoZIhvcNAQEFBQAwczELMAkGA1UEBhMCR0IxGzAZBgNVBAgTEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4GA1UEBxMHU2FsZm9yZDEaMBgGA1UEChMRQ09NT0RPIENBIExpbWl0ZWQxGTAXBgNVBAMTEFBvc2l0aXZlU1NMIENBIDIwHhcNMTMxMDAzMDAwMDAwWhcNMTQxMDAzMjM1OTU5WjBQMSEwHwYDVQQLExhEb21haW4gQ29udHJvbCBWYWxpZGF0ZWQxFDASBgNVBAsTC1Bvc2l0aXZlU1NMMRUwEwYDVQQDEwxhcHBkYi5lZ2kuZXUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC9RMFe27ucrw5Uv2oCmfxIB2O4q/dwFNZVZmTWfiRisOyvSUtooCDneO4vhvt6h9YP7zAjPjfBA6SruBKtfXH5j3uPEEllpV4jq4mPJBo0D0P1aPq9ibbh0DrO+XRlcjjXAKYmlBZxa2oIjiFD7MgxAzf6VkTHCNDN/tGLFxCv1+/ExvPpOUZTPBkiGXkEDyJATpepFxROVoo7IZf5Azqpy3lLSMiqbTEKkQXbcW8egmP6wmMpUaNRYHtwNiU3qRVKrZw/322P2yYuFLUpCHPjTNKW4SMlhbt4RyMtO0LnIAJt9DgcMaiha2EDcaojV1fq7pFZzCg1YC6uvFG9atkxAgMBAAGjggGpMIIBpTAfBgNVHSMEGDAWgBSZ5EBfaxRePgXZ3dNjVPxiuPcArDAdBgNVHQ4EFgQUtxGXMez+256VFqWJT7kEz3zY5EEwDgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMFAGA1UdIARJMEcwOwYLKwYBBAGyMQECAgcwLDAqBggrBgEFBQcCARYeaHR0cDovL3d3dy5wb3NpdGl2ZXNzbC5jb20vQ1BTMAgGBmeBDAECATA7BgNVHR8ENDAyMDCgLqAshipodHRwOi8vY3JsLmNvbW9kb2NhLmNvbS9Qb3NpdGl2ZVNTTENBMi5jcmwwbAYIKwYBBQUHAQEEYDBeMDYGCCsGAQUFBzAChipodHRwOi8vY3J0LmNvbW9kb2NhLmNvbS9Qb3NpdGl2ZVNTTENBMi5jcnQwJAYIKwYBBQUHMAGGGGh0dHA6Ly9vY3NwLmNvbW9kb2NhLmNvbTApBgNVHREEIjAgggxhcHBkYi5lZ2kuZXWCEHd3dy5hcHBkYi5lZ2kuZXUwDQYJKoZIhvcNAQEFBQADggEBAJTG+QIH44hiyl/vxEncKy6vAib3n7PbqphVmA4NDf0peKp8xdYoG23YnHG72aGsUwg9031RtN/1LqaAgb2A3JOF5of1pobqQbwPUC6mSNuXFm1cOtZR8gG5e6G3mwB9FWb0P6WK+yzsBhz3ekSziv4PgZjd1HIiSLUg1YwpWYvBIdi+MCDZVSgNmJr9QKsv+N50fcYuGYSmXOEnLNchyMUPcQzzSO/xI0JkeiQkAQ5WfCV03ykmBxSvefeJo35GMzGEIpxrQ/DgyvKIwkFtBf/ESA4ID3JN7+iZJs2XjWRgFZx5mKCwr5uY2tNmvbFvM7g1zFwOyLdlEV45Dp3d9bk=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://appdb.egi.eu/auth/module.php/saml/sp/saml2-logout.php/edugain-sp"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://appdb.egi.eu/auth/module.php/saml/sp/saml2-logout.php/edugain-sp"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://appdb.egi.eu/auth/module.php/saml/sp/saml2-acs.php/edugain-sp" index="0"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://appdb.egi.eu/auth/module.php/saml/sp/saml1-acs.php/edugain-sp" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://appdb.egi.eu/auth/module.php/saml/sp/saml2-acs.php/edugain-sp" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://appdb.egi.eu/auth/module.php/saml/sp/saml1-acs.php/edugain-sp/artifact" index="3"/>
-    <md:AttributeConsumingService index="0">
-      <md:ServiceName xml:lang="en">EGI Applications Database</md:ServiceName>
-      <md:ServiceDescription xml:lang="en">EGI Software &amp; Cloud Marketplace</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" isRequired="true"/>
-      <md:RequestedAttribute Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md: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: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.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.25178.1.2.10" 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" isRequired="true"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">IASA - GRNET</md:OrganizationName>
-    <md:OrganizationName xml:lang="el">ΙΕΣΕ - ΕΔΕΤ</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Institute of Accelerating Systems and Applications - Greek Research and Technology Network</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="el">Ινστιτούτο Επιταχυντικών Συστημάτων και Εφαρμογών - Εθνικό Δίκτυο Έρευνας και Τεχνολογίας</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.iasa.gr/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="el">http://www.iasa.gr/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.grnet.gr/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="el">http://www.grnet.gr/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Marios</md:GivenName>
-    <md:SurName>Chatziangelou</md:SurName>
-    <md:EmailAddress>mhaggel@iasa.gr</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Marios</md:GivenName>
-    <md:SurName>Chatziangelou</md:SurName>
-    <md:EmailAddress>appdb-support@iasa.gr</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/applications.eu-decide.eu-shibboleth.xml b/swamid-interfederations-2.0/applications.eu-decide.eu-shibboleth.xml
deleted file mode 100644
index f544de23..00000000
--- a/swamid-interfederations-2.0/applications.eu-decide.eu-shibboleth.xml
+++ /dev/null
@@ -1,123 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" entityID="https://applications.eu-decide.eu/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2011-09-05T15:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement
-                </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>
-        <mdui:DisplayName xml:lang="en">DECIDE Science Gateway</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="it">DECIDE Science Gateway</mdui:DisplayName>
-        <mdui:Description xml:lang="en">
-                        This service allows to access and use the applications of the DECIDE project
-                        which provides neurologists and physicians with software tools for the computer-aided
-                        extraction of diagnostic markers for Alzheimer's disease and schizophrenia from
-                        medical images.
-                    </mdui:Description>
-        <mdui:Description xml:lang="it">
-                        Questo servizio permette l'accesso e l'uso delle applicazioni/servizi sviluppati per il
-                        progetto europeo DECIDE che ha come obiettivo quello di fornire a medici ed analisti tool software per
-                        l'individuazione di marker per l'Alzheimer e la schizzofrenia in immagini mediche
-                    </mdui:Description>
-      </mdui:UIInfo>
-      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://applications.eu-decide.eu/Shibboleth.sso/DS"/>
-      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://applications.eu-decide.eu/Shibboleth.sso/DS" index="1"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIFhDCCBGygAwIBAgIRAOyXU1f6GS689kEaSDAhQPYwDQYJKoZIhvcNAQEFBQAw
-NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-IFNTTCBDQTAeFw0xNDA1MTkwMDAwMDBaFw0xNzA1MTgyMzU5NTlaMEAxITAfBgNV
-BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEbMBkGA1UEAxMSbGlmZXJheS5j
-dC5pbmZuLml0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApizyvtMI
-uoSnnz/fvk7lcXwoDUk11NVAlg5w4zh01YKNvy5SzBu0eRIzRos/ALs4CwmxrmCv
-3JQPA4xxItxVd8x9Q+YElQteEcX+mWXXW5LI5XE3xhPzkdFeQrhkinAK2JreSn6E
-TQk8YO1rOxW3qCpKeYZ2VQF3grAU/JRWbvLF+r2j4zE27n+RzBxnYeZ9rtJ/67gU
-7t1S39DRDTyKit7dJIYl50n9g3atWGALb56QoVnlR+RPRxVI9EFd2hEXfrxWXGdt
-F2v6YIMSAAM5l2/SlEmhQSSkmQ4zXcmPrzC6pte9NWoPOTsQnCnocwMJ16aXsnQy
-BxaoywMtq8NsdwIDAQABo4ICgTCCAn0wHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsr
-N1dH6pDjue0wHQYDVR0OBBYEFCy5dq76F94vaAuznAys6UmGxySTMA4GA1UdDwEB
-/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEF
-BQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNVHR8E
-MzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENB
-LmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNz
-LnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8v
-b2NzcC50Y3MudGVyZW5hLm9yZzCCAS0GA1UdEQSCASQwggEgghJsaWZlcmF5LmN0
-LmluZm4uaXSCGWFwcGxpY2F0aW9ucy5ldS1kZWNpZGUuZXWCGWFwcGxpY2F0aW9u
-cy5ldW1lZGdyaWQuZXWCEGdpbGRhLmN0LmluZm4uaXSCFGdpc2VsYS1ndy5jdC5p
-bmZuLml0gg1ndy5jdC5pbmZuLml0ghNnd2VhdGhlci5jdC5pbmZuLml0ghBnd2xp
-Yi5jdC5pbmZuLml0gh9pbmRpY2F0ZS1ndy5jb25zb3J6aW8tY29tZXRhLml0ghFy
-aWNldmkuY3QuaW5mbi5pdIIUdmlyYWxncmlkLmN0LmluZm4uaXSCFHd3dy5jaGFp
-bi1wcm9qZWN0LmV1ghZ3d3cuc3BlY2lhbC1wcm9qZWN0Lml0MA0GCSqGSIb3DQEB
-BQUAA4IBAQCEZIHNNQPD5WkGSlUhCN/BRSharmQ6dT0NiwjQNmRODCpVqBgwVZY0
-VUlAobHaF186QXeiNYge8ZYSpYY2VhBa4znL7IjFODE3FsaJNseKgsyNFqKR8xNO
-nsOCM//SN9N79hwH8yAxLhGyxbnInpOhE6rEkbhtowTjqhDq26cGGlH8JTTPuYvY
-JhgPGGkxo1286x1nuN4ELKvwZ7RF+YTH/WPOIBMNi+ee+vxrIhWbU6iy97f7k4PA
-2e35ZQ6gutnmX2v/ybFWh0ruO4zszYKiMo+zGyLvYmIpV/+Mjs26KbqqrBOS1jjN
-W3MiH8HMxzzYHExNCvzrAgN1TfB+SCiB
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://applications.eu-decide.eu/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://applications.eu-decide.eu/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://applications.eu-decide.eu/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://applications.eu-decide.eu/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://applications.eu-decide.eu/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://applications.eu-decide.eu/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://applications.eu-decide.eu/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://applications.eu-decide.eu/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://applications.eu-decide.eu/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://applications.eu-decide.eu/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://applications.eu-decide.eu/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <AttributeConsumingService index="1">
-      <ServiceName xml:lang="en">DECIDE Science Gateway</ServiceName>
-      <ServiceDescription xml:lang="en">This service allows to access and use the applications of the DECIDE project
-                    which provides neurologists and physicians with software tools for the computer-aided
-                    extraction of diagnostic markers for Alzheimer's disease and schizophrenia from
-                    medical images.
-                </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"/>
-    </AttributeConsumingService>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">COMETA Consortium</OrganizationName>
-    <OrganizationName xml:lang="it">Consorzio COMETA (COnsorzio Multi Ente per la promozione e l'adozione di Tecnologie di calcolo Avanzato)</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">COMETA</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="it">COMETA</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.consorzio-cometa.it/</OrganizationURL>
-    <OrganizationURL xml:lang="it">http://www.consorzio-cometa.it/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Marco</GivenName>
-    <SurName>Fargetta</SurName>
-    <EmailAddress>mailto:marco.fargetta@ct.infn.it</EmailAddress>
-    <EmailAddress>mailto:credentials-admin@ct.infn.it</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Riccardo</GivenName>
-    <SurName>Rotondo</SurName>
-    <EmailAddress>mailto:riccardo.rotondo@ct.infn.it</EmailAddress>
-    <EmailAddress>mailto:credentials-admin@ct.infn.it</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="support">
-    <GivenName>Giuseppe</GivenName>
-    <SurName>Platania</SurName>
-    <EmailAddress>mailto:giuseppe.platania@ct.infn.it</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="support">
-    <GivenName>Carlo</GivenName>
-    <SurName>Rocca</SurName>
-    <EmailAddress>mailto:carlo.rocca@ct.infn.it</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="administrative">
-    <GivenName>Roberto</GivenName>
-    <SurName>Barbera</SurName>
-    <EmailAddress>mailto:roberto.barbera@ct.infn.it</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/applications.eu-decide.eu.xml b/swamid-interfederations-2.0/applications.eu-decide.eu.xml
deleted file mode 100644
index f544de23..00000000
--- a/swamid-interfederations-2.0/applications.eu-decide.eu.xml
+++ /dev/null
@@ -1,123 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" entityID="https://applications.eu-decide.eu/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2011-09-05T15:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement
-                </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>
-        <mdui:DisplayName xml:lang="en">DECIDE Science Gateway</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="it">DECIDE Science Gateway</mdui:DisplayName>
-        <mdui:Description xml:lang="en">
-                        This service allows to access and use the applications of the DECIDE project
-                        which provides neurologists and physicians with software tools for the computer-aided
-                        extraction of diagnostic markers for Alzheimer's disease and schizophrenia from
-                        medical images.
-                    </mdui:Description>
-        <mdui:Description xml:lang="it">
-                        Questo servizio permette l'accesso e l'uso delle applicazioni/servizi sviluppati per il
-                        progetto europeo DECIDE che ha come obiettivo quello di fornire a medici ed analisti tool software per
-                        l'individuazione di marker per l'Alzheimer e la schizzofrenia in immagini mediche
-                    </mdui:Description>
-      </mdui:UIInfo>
-      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://applications.eu-decide.eu/Shibboleth.sso/DS"/>
-      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://applications.eu-decide.eu/Shibboleth.sso/DS" index="1"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIFhDCCBGygAwIBAgIRAOyXU1f6GS689kEaSDAhQPYwDQYJKoZIhvcNAQEFBQAw
-NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-IFNTTCBDQTAeFw0xNDA1MTkwMDAwMDBaFw0xNzA1MTgyMzU5NTlaMEAxITAfBgNV
-BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEbMBkGA1UEAxMSbGlmZXJheS5j
-dC5pbmZuLml0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApizyvtMI
-uoSnnz/fvk7lcXwoDUk11NVAlg5w4zh01YKNvy5SzBu0eRIzRos/ALs4CwmxrmCv
-3JQPA4xxItxVd8x9Q+YElQteEcX+mWXXW5LI5XE3xhPzkdFeQrhkinAK2JreSn6E
-TQk8YO1rOxW3qCpKeYZ2VQF3grAU/JRWbvLF+r2j4zE27n+RzBxnYeZ9rtJ/67gU
-7t1S39DRDTyKit7dJIYl50n9g3atWGALb56QoVnlR+RPRxVI9EFd2hEXfrxWXGdt
-F2v6YIMSAAM5l2/SlEmhQSSkmQ4zXcmPrzC6pte9NWoPOTsQnCnocwMJ16aXsnQy
-BxaoywMtq8NsdwIDAQABo4ICgTCCAn0wHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsr
-N1dH6pDjue0wHQYDVR0OBBYEFCy5dq76F94vaAuznAys6UmGxySTMA4GA1UdDwEB
-/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEF
-BQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNVHR8E
-MzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENB
-LmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNz
-LnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8v
-b2NzcC50Y3MudGVyZW5hLm9yZzCCAS0GA1UdEQSCASQwggEgghJsaWZlcmF5LmN0
-LmluZm4uaXSCGWFwcGxpY2F0aW9ucy5ldS1kZWNpZGUuZXWCGWFwcGxpY2F0aW9u
-cy5ldW1lZGdyaWQuZXWCEGdpbGRhLmN0LmluZm4uaXSCFGdpc2VsYS1ndy5jdC5p
-bmZuLml0gg1ndy5jdC5pbmZuLml0ghNnd2VhdGhlci5jdC5pbmZuLml0ghBnd2xp
-Yi5jdC5pbmZuLml0gh9pbmRpY2F0ZS1ndy5jb25zb3J6aW8tY29tZXRhLml0ghFy
-aWNldmkuY3QuaW5mbi5pdIIUdmlyYWxncmlkLmN0LmluZm4uaXSCFHd3dy5jaGFp
-bi1wcm9qZWN0LmV1ghZ3d3cuc3BlY2lhbC1wcm9qZWN0Lml0MA0GCSqGSIb3DQEB
-BQUAA4IBAQCEZIHNNQPD5WkGSlUhCN/BRSharmQ6dT0NiwjQNmRODCpVqBgwVZY0
-VUlAobHaF186QXeiNYge8ZYSpYY2VhBa4znL7IjFODE3FsaJNseKgsyNFqKR8xNO
-nsOCM//SN9N79hwH8yAxLhGyxbnInpOhE6rEkbhtowTjqhDq26cGGlH8JTTPuYvY
-JhgPGGkxo1286x1nuN4ELKvwZ7RF+YTH/WPOIBMNi+ee+vxrIhWbU6iy97f7k4PA
-2e35ZQ6gutnmX2v/ybFWh0ruO4zszYKiMo+zGyLvYmIpV/+Mjs26KbqqrBOS1jjN
-W3MiH8HMxzzYHExNCvzrAgN1TfB+SCiB
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://applications.eu-decide.eu/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://applications.eu-decide.eu/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://applications.eu-decide.eu/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://applications.eu-decide.eu/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://applications.eu-decide.eu/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://applications.eu-decide.eu/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://applications.eu-decide.eu/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://applications.eu-decide.eu/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://applications.eu-decide.eu/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://applications.eu-decide.eu/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://applications.eu-decide.eu/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <AttributeConsumingService index="1">
-      <ServiceName xml:lang="en">DECIDE Science Gateway</ServiceName>
-      <ServiceDescription xml:lang="en">This service allows to access and use the applications of the DECIDE project
-                    which provides neurologists and physicians with software tools for the computer-aided
-                    extraction of diagnostic markers for Alzheimer's disease and schizophrenia from
-                    medical images.
-                </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"/>
-    </AttributeConsumingService>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">COMETA Consortium</OrganizationName>
-    <OrganizationName xml:lang="it">Consorzio COMETA (COnsorzio Multi Ente per la promozione e l'adozione di Tecnologie di calcolo Avanzato)</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">COMETA</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="it">COMETA</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.consorzio-cometa.it/</OrganizationURL>
-    <OrganizationURL xml:lang="it">http://www.consorzio-cometa.it/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Marco</GivenName>
-    <SurName>Fargetta</SurName>
-    <EmailAddress>mailto:marco.fargetta@ct.infn.it</EmailAddress>
-    <EmailAddress>mailto:credentials-admin@ct.infn.it</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Riccardo</GivenName>
-    <SurName>Rotondo</SurName>
-    <EmailAddress>mailto:riccardo.rotondo@ct.infn.it</EmailAddress>
-    <EmailAddress>mailto:credentials-admin@ct.infn.it</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="support">
-    <GivenName>Giuseppe</GivenName>
-    <SurName>Platania</SurName>
-    <EmailAddress>mailto:giuseppe.platania@ct.infn.it</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="support">
-    <GivenName>Carlo</GivenName>
-    <SurName>Rocca</SurName>
-    <EmailAddress>mailto:carlo.rocca@ct.infn.it</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="administrative">
-    <GivenName>Roberto</GivenName>
-    <SurName>Barbera</SurName>
-    <EmailAddress>mailto:roberto.barbera@ct.infn.it</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/applications.eumedgrid.eu-shibboleth.xml b/swamid-interfederations-2.0/applications.eumedgrid.eu-shibboleth.xml
deleted file mode 100644
index 4a183f96..00000000
--- a/swamid-interfederations-2.0/applications.eumedgrid.eu-shibboleth.xml
+++ /dev/null
@@ -1,121 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" entityID="https://applications.eumedgrid.eu/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2011-09-05T15:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement
-                </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>
-        <mdui:DisplayName xml:lang="en">EUMEDGRID Science Gateway</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="it">EUMEDGRID Science Gateway</mdui:DisplayName>
-        <mdui:Description xml:lang="en">
-                        This service provides information for Grid users, Application developers and
-                        Grid site administrators. It is mainly devoted to the people involved in the
-                        EUMEDGRID-Support project but many pages are of general interest
-                    </mdui:Description>
-        <mdui:Description xml:lang="it">
-                        Questo servizio fornisce informazioni per utenti Grid, sviluppatori ed amministratori
-                        di siti Grid. Esso è principalmente indirizzato alle persone coinvolte nel progetto europeo
-                        EUMEDGRID-Support ma molte informazioni sono di interesse generale
-                    </mdui:Description>
-      </mdui:UIInfo>
-      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://applications.eumedgrid.eu/Shibboleth.sso/DS"/>
-      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://applications.eumedgrid.eu/Shibboleth.sso/DS" index="1"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIFhDCCBGygAwIBAgIRAOyXU1f6GS689kEaSDAhQPYwDQYJKoZIhvcNAQEFBQAw
-NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-IFNTTCBDQTAeFw0xNDA1MTkwMDAwMDBaFw0xNzA1MTgyMzU5NTlaMEAxITAfBgNV
-BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEbMBkGA1UEAxMSbGlmZXJheS5j
-dC5pbmZuLml0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApizyvtMI
-uoSnnz/fvk7lcXwoDUk11NVAlg5w4zh01YKNvy5SzBu0eRIzRos/ALs4CwmxrmCv
-3JQPA4xxItxVd8x9Q+YElQteEcX+mWXXW5LI5XE3xhPzkdFeQrhkinAK2JreSn6E
-TQk8YO1rOxW3qCpKeYZ2VQF3grAU/JRWbvLF+r2j4zE27n+RzBxnYeZ9rtJ/67gU
-7t1S39DRDTyKit7dJIYl50n9g3atWGALb56QoVnlR+RPRxVI9EFd2hEXfrxWXGdt
-F2v6YIMSAAM5l2/SlEmhQSSkmQ4zXcmPrzC6pte9NWoPOTsQnCnocwMJ16aXsnQy
-BxaoywMtq8NsdwIDAQABo4ICgTCCAn0wHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsr
-N1dH6pDjue0wHQYDVR0OBBYEFCy5dq76F94vaAuznAys6UmGxySTMA4GA1UdDwEB
-/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEF
-BQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNVHR8E
-MzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENB
-LmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNz
-LnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8v
-b2NzcC50Y3MudGVyZW5hLm9yZzCCAS0GA1UdEQSCASQwggEgghJsaWZlcmF5LmN0
-LmluZm4uaXSCGWFwcGxpY2F0aW9ucy5ldS1kZWNpZGUuZXWCGWFwcGxpY2F0aW9u
-cy5ldW1lZGdyaWQuZXWCEGdpbGRhLmN0LmluZm4uaXSCFGdpc2VsYS1ndy5jdC5p
-bmZuLml0gg1ndy5jdC5pbmZuLml0ghNnd2VhdGhlci5jdC5pbmZuLml0ghBnd2xp
-Yi5jdC5pbmZuLml0gh9pbmRpY2F0ZS1ndy5jb25zb3J6aW8tY29tZXRhLml0ghFy
-aWNldmkuY3QuaW5mbi5pdIIUdmlyYWxncmlkLmN0LmluZm4uaXSCFHd3dy5jaGFp
-bi1wcm9qZWN0LmV1ghZ3d3cuc3BlY2lhbC1wcm9qZWN0Lml0MA0GCSqGSIb3DQEB
-BQUAA4IBAQCEZIHNNQPD5WkGSlUhCN/BRSharmQ6dT0NiwjQNmRODCpVqBgwVZY0
-VUlAobHaF186QXeiNYge8ZYSpYY2VhBa4znL7IjFODE3FsaJNseKgsyNFqKR8xNO
-nsOCM//SN9N79hwH8yAxLhGyxbnInpOhE6rEkbhtowTjqhDq26cGGlH8JTTPuYvY
-JhgPGGkxo1286x1nuN4ELKvwZ7RF+YTH/WPOIBMNi+ee+vxrIhWbU6iy97f7k4PA
-2e35ZQ6gutnmX2v/ybFWh0ruO4zszYKiMo+zGyLvYmIpV/+Mjs26KbqqrBOS1jjN
-W3MiH8HMxzzYHExNCvzrAgN1TfB+SCiB
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://applications.eumedgrid.eu/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://applications.eumedgrid.eu/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://applications.eumedgrid.eu/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://applications.eumedgrid.eu/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://applications.eumedgrid.eu/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://applications.eumedgrid.eu/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://applications.eumedgrid.eu/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://applications.eumedgrid.eu/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://applications.eumedgrid.eu/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://applications.eumedgrid.eu/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://applications.eumedgrid.eu/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <AttributeConsumingService index="1">
-      <ServiceName xml:lang="en">EUMEDGRID Science Gateway</ServiceName>
-      <ServiceDescription xml:lang="en">This service provides information for Grid users, Application developers and
-                    Grid site administrators. It is mainly devoted to the people involved in the
-                    EUMEDGRID-Support project but many pages are of general interes
-                </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"/>
-    </AttributeConsumingService>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">COMETA Consortium</OrganizationName>
-    <OrganizationName xml:lang="it">Consorzio COMETA (COnsorzio Multi Ente per la promozione e l'adozione di Tecnologie di calcolo Avanzato)</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">COMETA</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="it">COMETA</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.consorzio-cometa.it/</OrganizationURL>
-    <OrganizationURL xml:lang="it">http://www.consorzio-cometa.it/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Marco</GivenName>
-    <SurName>Fargetta</SurName>
-    <EmailAddress>mailto:marco.fargetta@ct.infn.it</EmailAddress>
-    <EmailAddress>mailto:credentials-admin@ct.infn.it</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Riccardo</GivenName>
-    <SurName>Rotondo</SurName>
-    <EmailAddress>mailto:riccardo.rotondo@ct.infn.it</EmailAddress>
-    <EmailAddress>mailto:credentials-admin@ct.infn.it</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="support">
-    <GivenName>Giuseppe</GivenName>
-    <SurName>Platania</SurName>
-    <EmailAddress>mailto:giuseppe.platania@ct.infn.it</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="support">
-    <GivenName>Carlo</GivenName>
-    <SurName>Rocca</SurName>
-    <EmailAddress>mailto:carlo.rocca@ct.infn.it</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="administrative">
-    <GivenName>Roberto</GivenName>
-    <SurName>Barbera</SurName>
-    <EmailAddress>mailto:roberto.barbera@ct.infn.it</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/applications.eumedgrid.eu.xml b/swamid-interfederations-2.0/applications.eumedgrid.eu.xml
deleted file mode 100644
index 4a183f96..00000000
--- a/swamid-interfederations-2.0/applications.eumedgrid.eu.xml
+++ /dev/null
@@ -1,121 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" entityID="https://applications.eumedgrid.eu/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2011-09-05T15:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement
-                </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>
-        <mdui:DisplayName xml:lang="en">EUMEDGRID Science Gateway</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="it">EUMEDGRID Science Gateway</mdui:DisplayName>
-        <mdui:Description xml:lang="en">
-                        This service provides information for Grid users, Application developers and
-                        Grid site administrators. It is mainly devoted to the people involved in the
-                        EUMEDGRID-Support project but many pages are of general interest
-                    </mdui:Description>
-        <mdui:Description xml:lang="it">
-                        Questo servizio fornisce informazioni per utenti Grid, sviluppatori ed amministratori
-                        di siti Grid. Esso è principalmente indirizzato alle persone coinvolte nel progetto europeo
-                        EUMEDGRID-Support ma molte informazioni sono di interesse generale
-                    </mdui:Description>
-      </mdui:UIInfo>
-      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://applications.eumedgrid.eu/Shibboleth.sso/DS"/>
-      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://applications.eumedgrid.eu/Shibboleth.sso/DS" index="1"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIFhDCCBGygAwIBAgIRAOyXU1f6GS689kEaSDAhQPYwDQYJKoZIhvcNAQEFBQAw
-NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-IFNTTCBDQTAeFw0xNDA1MTkwMDAwMDBaFw0xNzA1MTgyMzU5NTlaMEAxITAfBgNV
-BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEbMBkGA1UEAxMSbGlmZXJheS5j
-dC5pbmZuLml0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApizyvtMI
-uoSnnz/fvk7lcXwoDUk11NVAlg5w4zh01YKNvy5SzBu0eRIzRos/ALs4CwmxrmCv
-3JQPA4xxItxVd8x9Q+YElQteEcX+mWXXW5LI5XE3xhPzkdFeQrhkinAK2JreSn6E
-TQk8YO1rOxW3qCpKeYZ2VQF3grAU/JRWbvLF+r2j4zE27n+RzBxnYeZ9rtJ/67gU
-7t1S39DRDTyKit7dJIYl50n9g3atWGALb56QoVnlR+RPRxVI9EFd2hEXfrxWXGdt
-F2v6YIMSAAM5l2/SlEmhQSSkmQ4zXcmPrzC6pte9NWoPOTsQnCnocwMJ16aXsnQy
-BxaoywMtq8NsdwIDAQABo4ICgTCCAn0wHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsr
-N1dH6pDjue0wHQYDVR0OBBYEFCy5dq76F94vaAuznAys6UmGxySTMA4GA1UdDwEB
-/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEF
-BQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNVHR8E
-MzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENB
-LmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNz
-LnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8v
-b2NzcC50Y3MudGVyZW5hLm9yZzCCAS0GA1UdEQSCASQwggEgghJsaWZlcmF5LmN0
-LmluZm4uaXSCGWFwcGxpY2F0aW9ucy5ldS1kZWNpZGUuZXWCGWFwcGxpY2F0aW9u
-cy5ldW1lZGdyaWQuZXWCEGdpbGRhLmN0LmluZm4uaXSCFGdpc2VsYS1ndy5jdC5p
-bmZuLml0gg1ndy5jdC5pbmZuLml0ghNnd2VhdGhlci5jdC5pbmZuLml0ghBnd2xp
-Yi5jdC5pbmZuLml0gh9pbmRpY2F0ZS1ndy5jb25zb3J6aW8tY29tZXRhLml0ghFy
-aWNldmkuY3QuaW5mbi5pdIIUdmlyYWxncmlkLmN0LmluZm4uaXSCFHd3dy5jaGFp
-bi1wcm9qZWN0LmV1ghZ3d3cuc3BlY2lhbC1wcm9qZWN0Lml0MA0GCSqGSIb3DQEB
-BQUAA4IBAQCEZIHNNQPD5WkGSlUhCN/BRSharmQ6dT0NiwjQNmRODCpVqBgwVZY0
-VUlAobHaF186QXeiNYge8ZYSpYY2VhBa4znL7IjFODE3FsaJNseKgsyNFqKR8xNO
-nsOCM//SN9N79hwH8yAxLhGyxbnInpOhE6rEkbhtowTjqhDq26cGGlH8JTTPuYvY
-JhgPGGkxo1286x1nuN4ELKvwZ7RF+YTH/WPOIBMNi+ee+vxrIhWbU6iy97f7k4PA
-2e35ZQ6gutnmX2v/ybFWh0ruO4zszYKiMo+zGyLvYmIpV/+Mjs26KbqqrBOS1jjN
-W3MiH8HMxzzYHExNCvzrAgN1TfB+SCiB
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://applications.eumedgrid.eu/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://applications.eumedgrid.eu/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://applications.eumedgrid.eu/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://applications.eumedgrid.eu/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://applications.eumedgrid.eu/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://applications.eumedgrid.eu/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://applications.eumedgrid.eu/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://applications.eumedgrid.eu/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://applications.eumedgrid.eu/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://applications.eumedgrid.eu/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://applications.eumedgrid.eu/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <AttributeConsumingService index="1">
-      <ServiceName xml:lang="en">EUMEDGRID Science Gateway</ServiceName>
-      <ServiceDescription xml:lang="en">This service provides information for Grid users, Application developers and
-                    Grid site administrators. It is mainly devoted to the people involved in the
-                    EUMEDGRID-Support project but many pages are of general interes
-                </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"/>
-    </AttributeConsumingService>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">COMETA Consortium</OrganizationName>
-    <OrganizationName xml:lang="it">Consorzio COMETA (COnsorzio Multi Ente per la promozione e l'adozione di Tecnologie di calcolo Avanzato)</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">COMETA</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="it">COMETA</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.consorzio-cometa.it/</OrganizationURL>
-    <OrganizationURL xml:lang="it">http://www.consorzio-cometa.it/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Marco</GivenName>
-    <SurName>Fargetta</SurName>
-    <EmailAddress>mailto:marco.fargetta@ct.infn.it</EmailAddress>
-    <EmailAddress>mailto:credentials-admin@ct.infn.it</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Riccardo</GivenName>
-    <SurName>Rotondo</SurName>
-    <EmailAddress>mailto:riccardo.rotondo@ct.infn.it</EmailAddress>
-    <EmailAddress>mailto:credentials-admin@ct.infn.it</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="support">
-    <GivenName>Giuseppe</GivenName>
-    <SurName>Platania</SurName>
-    <EmailAddress>mailto:giuseppe.platania@ct.infn.it</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="support">
-    <GivenName>Carlo</GivenName>
-    <SurName>Rocca</SurName>
-    <EmailAddress>mailto:carlo.rocca@ct.infn.it</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="administrative">
-    <GivenName>Roberto</GivenName>
-    <SurName>Barbera</SurName>
-    <EmailAddress>mailto:roberto.barbera@ct.infn.it</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/apu.uepb.edu.br-idp-shibboleth.xml b/swamid-interfederations-2.0/apu.uepb.edu.br-idp-shibboleth.xml
deleted file mode 100644
index f7a5f88c..00000000
--- a/swamid-interfederations-2.0/apu.uepb.edu.br-idp-shibboleth.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://apu.uepb.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">uepb.edu.br</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">UEPB - Universidade Estadual da Paraiba</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="pt-br">UEPB - Universidade Estadual da Paraiba</mdui:DisplayName>
-        <mdui:Description xml:lang="en">UEPB - Universidade Estadual da Paraiba</mdui:Description>
-        <mdui:Description xml:lang="pt-br">UEPB - Universidade Estadual da Paraiba</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.uepb.edu.br/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="pt-br">http://www.uepb.edu.br/</mdui:InformationURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-    MIID2DCCAsACAQAwDQYJKoZIhvcNAQEFBQAwgbExKTAnBgNVBAoTIFVuaXZlcnNp
-ZGFkZSBFc3RhZHVhbCBkYSBQYXJhaWJhMQ0wCwYDVQQLEwRDVElDMSMwIQYJKoZI
-hvcNAQkBFhRnZXJlbmNpYUB1ZXBiLmVkdS5icjEXMBUGA1UEBxMOQ2FtcGluYSBH
-cmFuZGUxEDAOBgNVBAgTB1BhcmFpYmExCzAJBgNVBAYTAkJSMRgwFgYDVQQDEw9h
-cHUudWVwYi5lZHUuYnIwHhcNMTQwNjA0MTQxMzExWhcNMTkwNjAzMTQxMzExWjCB
-sTEpMCcGA1UEChMgVW5pdmVyc2lkYWRlIEVzdGFkdWFsIGRhIFBhcmFpYmExDTAL
-BgNVBAsTBENUSUMxIzAhBgkqhkiG9w0BCQEWFGdlcmVuY2lhQHVlcGIuZWR1LmJy
-MRcwFQYDVQQHEw5DYW1waW5hIEdyYW5kZTEQMA4GA1UECBMHUGFyYWliYTELMAkG
-A1UEBhMCQlIxGDAWBgNVBAMTD2FwdS51ZXBiLmVkdS5icjCCASIwDQYJKoZIhvcN
-AQEBBQADggEPADCCAQoCggEBAL+PmDkRtaCnS6AZ0SNppN29pZ7E1NxuvDYw5JES
-hXKLFqnBjOqwMOvS5SYWxKOtzDhPWKuT96DXjt6SY5A+fFKCYQUaNIUxTyyuad/e
-5kdf8tMM5FRX3gtaMk9D595xvOyT2Xp7byLU1WolCTWXIBlVuapd7znWcVvoUSfr
-zxK7Kd7wfFu4RT38/zN5FEvPxPbNRYZtcs33rtkCl3fT3XatkTNGEZ/whRNYyN53
-4zr4RZeysJSrAilSdOcM9y+6oYCOFpqn5ygFlQXbj8zEzR9SDMcL5OYbMMmC8bd7
-FOpec0VKbWrOAV//+D9T/ncSBuXfn/zwKk2qneNdESzp8/cCAwEAATANBgkqhkiG
-9w0BAQUFAAOCAQEAuHfrqsDisexElOjxDcmMfvnHTUobLmdLiJL/KoW54icv/dZ2
-w35Ta036Qj5nWBscP++FLfZTbA2RRAIZH5FQJIikDJpDdlUM9wYcAPtP1irb0/h+
-v0pyfB2AONle6H8bQf7wh6yQ0UkyP1knHePbDOchyrWgyK/CA7YoieH20kQlrGQY
-yQ9KnlrE+xw2aYX6bnR2SidjvjrkdFEIWD54AD3VhhKetR+/WSe2C7O/KEJG2suU
-el0jb0m9uKw7IBcWNsHTD0UdQcmG5LmUFUTC6tG8Tv9Dw1LzAYWuR8NZAHsncJ/w
-ULuCd9hGR3D+ZDjlZKLLf3cU3c3+xTC9cp7NmA==
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://apu.uepb.edu.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://apu.uepb.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://apu.uepb.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://apu.uepb.edu.br/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://apu.uepb.edu.br/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://apu.uepb.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>
-      
-MIID2DCCAsACAQAwDQYJKoZIhvcNAQEFBQAwgbExKTAnBgNVBAoTIFVuaXZlcnNp
-ZGFkZSBFc3RhZHVhbCBkYSBQYXJhaWJhMQ0wCwYDVQQLEwRDVElDMSMwIQYJKoZI
-hvcNAQkBFhRnZXJlbmNpYUB1ZXBiLmVkdS5icjEXMBUGA1UEBxMOQ2FtcGluYSBH
-cmFuZGUxEDAOBgNVBAgTB1BhcmFpYmExCzAJBgNVBAYTAkJSMRgwFgYDVQQDEw9h
-cHUudWVwYi5lZHUuYnIwHhcNMTQwNjA0MTQxMzExWhcNMTkwNjAzMTQxMzExWjCB
-sTEpMCcGA1UEChMgVW5pdmVyc2lkYWRlIEVzdGFkdWFsIGRhIFBhcmFpYmExDTAL
-BgNVBAsTBENUSUMxIzAhBgkqhkiG9w0BCQEWFGdlcmVuY2lhQHVlcGIuZWR1LmJy
-MRcwFQYDVQQHEw5DYW1waW5hIEdyYW5kZTEQMA4GA1UECBMHUGFyYWliYTELMAkG
-A1UEBhMCQlIxGDAWBgNVBAMTD2FwdS51ZXBiLmVkdS5icjCCASIwDQYJKoZIhvcN
-AQEBBQADggEPADCCAQoCggEBAL+PmDkRtaCnS6AZ0SNppN29pZ7E1NxuvDYw5JES
-hXKLFqnBjOqwMOvS5SYWxKOtzDhPWKuT96DXjt6SY5A+fFKCYQUaNIUxTyyuad/e
-5kdf8tMM5FRX3gtaMk9D595xvOyT2Xp7byLU1WolCTWXIBlVuapd7znWcVvoUSfr
-zxK7Kd7wfFu4RT38/zN5FEvPxPbNRYZtcs33rtkCl3fT3XatkTNGEZ/whRNYyN53
-4zr4RZeysJSrAilSdOcM9y+6oYCOFpqn5ygFlQXbj8zEzR9SDMcL5OYbMMmC8bd7
-FOpec0VKbWrOAV//+D9T/ncSBuXfn/zwKk2qneNdESzp8/cCAwEAATANBgkqhkiG
-9w0BAQUFAAOCAQEAuHfrqsDisexElOjxDcmMfvnHTUobLmdLiJL/KoW54icv/dZ2
-w35Ta036Qj5nWBscP++FLfZTbA2RRAIZH5FQJIikDJpDdlUM9wYcAPtP1irb0/h+
-v0pyfB2AONle6H8bQf7wh6yQ0UkyP1knHePbDOchyrWgyK/CA7YoieH20kQlrGQY
-yQ9KnlrE+xw2aYX6bnR2SidjvjrkdFEIWD54AD3VhhKetR+/WSe2C7O/KEJG2suU
-el0jb0m9uKw7IBcWNsHTD0UdQcmG5LmUFUTC6tG8Tv9Dw1LzAYWuR8NZAHsncJ/w
-ULuCd9hGR3D+ZDjlZKLLf3cU3c3+xTC9cp7NmA==
-                    
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://apu.uepb.edu.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://apu.uepb.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">UEPB - Universidade Estadual da Paraiba</OrganizationName>
-    <OrganizationName xml:lang="pt-br">UEPB - Universidade Estadual da Paraiba</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">UEPB - Universidade Estadual da Paraiba</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="pt-br">UEPB - Universidade Estadual da Paraiba</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.uepb.edu.br/</OrganizationURL>
-    <OrganizationURL xml:lang="pt-br">http://www.uepb.edu.br/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Gerencia de Redes</SurName>
-    <EmailAddress>gerencia@uepb.edu.br</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/apu.uepb.edu.br.xml b/swamid-interfederations-2.0/apu.uepb.edu.br.xml
deleted file mode 100644
index f7a5f88c..00000000
--- a/swamid-interfederations-2.0/apu.uepb.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://apu.uepb.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">uepb.edu.br</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">UEPB - Universidade Estadual da Paraiba</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="pt-br">UEPB - Universidade Estadual da Paraiba</mdui:DisplayName>
-        <mdui:Description xml:lang="en">UEPB - Universidade Estadual da Paraiba</mdui:Description>
-        <mdui:Description xml:lang="pt-br">UEPB - Universidade Estadual da Paraiba</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.uepb.edu.br/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="pt-br">http://www.uepb.edu.br/</mdui:InformationURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-    MIID2DCCAsACAQAwDQYJKoZIhvcNAQEFBQAwgbExKTAnBgNVBAoTIFVuaXZlcnNp
-ZGFkZSBFc3RhZHVhbCBkYSBQYXJhaWJhMQ0wCwYDVQQLEwRDVElDMSMwIQYJKoZI
-hvcNAQkBFhRnZXJlbmNpYUB1ZXBiLmVkdS5icjEXMBUGA1UEBxMOQ2FtcGluYSBH
-cmFuZGUxEDAOBgNVBAgTB1BhcmFpYmExCzAJBgNVBAYTAkJSMRgwFgYDVQQDEw9h
-cHUudWVwYi5lZHUuYnIwHhcNMTQwNjA0MTQxMzExWhcNMTkwNjAzMTQxMzExWjCB
-sTEpMCcGA1UEChMgVW5pdmVyc2lkYWRlIEVzdGFkdWFsIGRhIFBhcmFpYmExDTAL
-BgNVBAsTBENUSUMxIzAhBgkqhkiG9w0BCQEWFGdlcmVuY2lhQHVlcGIuZWR1LmJy
-MRcwFQYDVQQHEw5DYW1waW5hIEdyYW5kZTEQMA4GA1UECBMHUGFyYWliYTELMAkG
-A1UEBhMCQlIxGDAWBgNVBAMTD2FwdS51ZXBiLmVkdS5icjCCASIwDQYJKoZIhvcN
-AQEBBQADggEPADCCAQoCggEBAL+PmDkRtaCnS6AZ0SNppN29pZ7E1NxuvDYw5JES
-hXKLFqnBjOqwMOvS5SYWxKOtzDhPWKuT96DXjt6SY5A+fFKCYQUaNIUxTyyuad/e
-5kdf8tMM5FRX3gtaMk9D595xvOyT2Xp7byLU1WolCTWXIBlVuapd7znWcVvoUSfr
-zxK7Kd7wfFu4RT38/zN5FEvPxPbNRYZtcs33rtkCl3fT3XatkTNGEZ/whRNYyN53
-4zr4RZeysJSrAilSdOcM9y+6oYCOFpqn5ygFlQXbj8zEzR9SDMcL5OYbMMmC8bd7
-FOpec0VKbWrOAV//+D9T/ncSBuXfn/zwKk2qneNdESzp8/cCAwEAATANBgkqhkiG
-9w0BAQUFAAOCAQEAuHfrqsDisexElOjxDcmMfvnHTUobLmdLiJL/KoW54icv/dZ2
-w35Ta036Qj5nWBscP++FLfZTbA2RRAIZH5FQJIikDJpDdlUM9wYcAPtP1irb0/h+
-v0pyfB2AONle6H8bQf7wh6yQ0UkyP1knHePbDOchyrWgyK/CA7YoieH20kQlrGQY
-yQ9KnlrE+xw2aYX6bnR2SidjvjrkdFEIWD54AD3VhhKetR+/WSe2C7O/KEJG2suU
-el0jb0m9uKw7IBcWNsHTD0UdQcmG5LmUFUTC6tG8Tv9Dw1LzAYWuR8NZAHsncJ/w
-ULuCd9hGR3D+ZDjlZKLLf3cU3c3+xTC9cp7NmA==
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://apu.uepb.edu.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://apu.uepb.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://apu.uepb.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://apu.uepb.edu.br/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://apu.uepb.edu.br/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://apu.uepb.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>
-      
-MIID2DCCAsACAQAwDQYJKoZIhvcNAQEFBQAwgbExKTAnBgNVBAoTIFVuaXZlcnNp
-ZGFkZSBFc3RhZHVhbCBkYSBQYXJhaWJhMQ0wCwYDVQQLEwRDVElDMSMwIQYJKoZI
-hvcNAQkBFhRnZXJlbmNpYUB1ZXBiLmVkdS5icjEXMBUGA1UEBxMOQ2FtcGluYSBH
-cmFuZGUxEDAOBgNVBAgTB1BhcmFpYmExCzAJBgNVBAYTAkJSMRgwFgYDVQQDEw9h
-cHUudWVwYi5lZHUuYnIwHhcNMTQwNjA0MTQxMzExWhcNMTkwNjAzMTQxMzExWjCB
-sTEpMCcGA1UEChMgVW5pdmVyc2lkYWRlIEVzdGFkdWFsIGRhIFBhcmFpYmExDTAL
-BgNVBAsTBENUSUMxIzAhBgkqhkiG9w0BCQEWFGdlcmVuY2lhQHVlcGIuZWR1LmJy
-MRcwFQYDVQQHEw5DYW1waW5hIEdyYW5kZTEQMA4GA1UECBMHUGFyYWliYTELMAkG
-A1UEBhMCQlIxGDAWBgNVBAMTD2FwdS51ZXBiLmVkdS5icjCCASIwDQYJKoZIhvcN
-AQEBBQADggEPADCCAQoCggEBAL+PmDkRtaCnS6AZ0SNppN29pZ7E1NxuvDYw5JES
-hXKLFqnBjOqwMOvS5SYWxKOtzDhPWKuT96DXjt6SY5A+fFKCYQUaNIUxTyyuad/e
-5kdf8tMM5FRX3gtaMk9D595xvOyT2Xp7byLU1WolCTWXIBlVuapd7znWcVvoUSfr
-zxK7Kd7wfFu4RT38/zN5FEvPxPbNRYZtcs33rtkCl3fT3XatkTNGEZ/whRNYyN53
-4zr4RZeysJSrAilSdOcM9y+6oYCOFpqn5ygFlQXbj8zEzR9SDMcL5OYbMMmC8bd7
-FOpec0VKbWrOAV//+D9T/ncSBuXfn/zwKk2qneNdESzp8/cCAwEAATANBgkqhkiG
-9w0BAQUFAAOCAQEAuHfrqsDisexElOjxDcmMfvnHTUobLmdLiJL/KoW54icv/dZ2
-w35Ta036Qj5nWBscP++FLfZTbA2RRAIZH5FQJIikDJpDdlUM9wYcAPtP1irb0/h+
-v0pyfB2AONle6H8bQf7wh6yQ0UkyP1knHePbDOchyrWgyK/CA7YoieH20kQlrGQY
-yQ9KnlrE+xw2aYX6bnR2SidjvjrkdFEIWD54AD3VhhKetR+/WSe2C7O/KEJG2suU
-el0jb0m9uKw7IBcWNsHTD0UdQcmG5LmUFUTC6tG8Tv9Dw1LzAYWuR8NZAHsncJ/w
-ULuCd9hGR3D+ZDjlZKLLf3cU3c3+xTC9cp7NmA==
-                    
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://apu.uepb.edu.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://apu.uepb.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">UEPB - Universidade Estadual da Paraiba</OrganizationName>
-    <OrganizationName xml:lang="pt-br">UEPB - Universidade Estadual da Paraiba</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">UEPB - Universidade Estadual da Paraiba</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="pt-br">UEPB - Universidade Estadual da Paraiba</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.uepb.edu.br/</OrganizationURL>
-    <OrganizationURL xml:lang="pt-br">http://www.uepb.edu.br/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Gerencia de Redes</SurName>
-    <EmailAddress>gerencia@uepb.edu.br</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/araripe.uece.br-idp-shibboleth.xml b/swamid-interfederations-2.0/araripe.uece.br-idp-shibboleth.xml
deleted file mode 100644
index 64c471ad..00000000
--- a/swamid-interfederations-2.0/araripe.uece.br-idp-shibboleth.xml
+++ /dev/null
@@ -1,114 +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://araripe.uece.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">uece.br</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">UECE - Universidade Estadiual do Ceara</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="pt-br">UECE - Universidade Estadiual do Ceara</mdui:DisplayName>
-        <mdui:Description xml:lang="en">UECE - Universidade Estadiual do Ceara</mdui:Description>
-        <mdui:Description xml:lang="pt-br">UECE - Universidade Estadiual do Ceara</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.uece.br</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="pt-br">http://www.uece.br</mdui:InformationURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-    MIID/DCCAuQCAQAwDQYJKoZIhvcNAQEFBQAwgcMxLzAtBgNVBAoTJlVFQ0UgLSBV
-bml2ZXJzaWRhZGUgRXN0YWRpdWFsIGRvIENlYXJhMSQwIgYDVQQLExtEZXBhcnRh
-bWVudG8gZGUgSW5mb3JtYXRpY2ExHzAdBgkqhkiG9w0BCQEWEGRpLmluZnJhQHVl
-Y2UuYnIxEjAQBgNVBAcTCUZvcnRhbGV6YTEOMAwGA1UECBMFQ2VhcmExCzAJBgNV
-BAYTAkJSMRgwFgYDVQQDEw9hcmFyaXBlLnVlY2UuYnIwHhcNMTQwMzIxMTkwNzUy
-WhcNMTcwMzIwMTkwNzUyWjCBwzEvMC0GA1UEChMmVUVDRSAtIFVuaXZlcnNpZGFk
-ZSBFc3RhZGl1YWwgZG8gQ2VhcmExJDAiBgNVBAsTG0RlcGFydGFtZW50byBkZSBJ
-bmZvcm1hdGljYTEfMB0GCSqGSIb3DQEJARYQZGkuaW5mcmFAdWVjZS5icjESMBAG
-A1UEBxMJRm9ydGFsZXphMQ4wDAYDVQQIEwVDZWFyYTELMAkGA1UEBhMCQlIxGDAW
-BgNVBAMTD2FyYXJpcGUudWVjZS5icjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
-AQoCggEBALXknOC9F11nnTnNa8NuRD4cL/FDS9bzesfl/t/XaDMK32F/JgRxumWz
-SK6r0ejmmufDaIglY5kz2wgBry0jPZjkNoVhmDVpSdeEI3s3qDeWb/Jy6QVIYn71
-o25S3p/QTo9DVCjJIYoYD4OmNqU7yJa8sXN5FuvcuTgNXphdbXqMeskw9pGYb1zz
-b+h2jEaWo7wlljOYcwa8F2hJrd9W/ff6vit1cWrXv76afFVK1DjGkuS5H23vEz+Y
-3dRWHaflkxHo7iQ71mLmHGs6lyxf60PmJFyan5J8U1n9xcHlNIWbQsDdpPyxv0To
-PDI8+PywOWhoYYt+zA4Lv9V6CjRqpxMCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEA
-ndu7rtfvY/dTDYWGTdYoTLACJCEsovnY8lzt+kyNIucdgJh//2egd8rKIL8BWUzK
-Ahpc0fitAklIDaVNzvJIrqMXLTFbT0deAJeeWN9e3Lke2bEqJPDO4xh1paedwk8b
-K8n//pcvw6uxKq5GEny5MEhVPaBJthThbH023ict7onBkUClgU7pAYh66JDscvXa
-jRIAsv0FeZt9c0urK4eU4vpnE7Bk0pNSD7pKqQ/ZXngjZSp6CXWlF2J9PGA2g53r
-JuB1tq80AmWAwgGdW4AxW7LLaxwFK6dl0lMIsWYyMleXuh2KhOGxLKrYa/EDs4Yi
-Z1AZ/tU3s4++vwyfNIfQkg==
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://araripe.uece.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://araripe.uece.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://araripe.uece.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://araripe.uece.br/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://araripe.uece.br/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://araripe.uece.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">uece.br</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-      
-MIID/DCCAuQCAQAwDQYJKoZIhvcNAQEFBQAwgcMxLzAtBgNVBAoTJlVFQ0UgLSBV
-bml2ZXJzaWRhZGUgRXN0YWRpdWFsIGRvIENlYXJhMSQwIgYDVQQLExtEZXBhcnRh
-bWVudG8gZGUgSW5mb3JtYXRpY2ExHzAdBgkqhkiG9w0BCQEWEGRpLmluZnJhQHVl
-Y2UuYnIxEjAQBgNVBAcTCUZvcnRhbGV6YTEOMAwGA1UECBMFQ2VhcmExCzAJBgNV
-BAYTAkJSMRgwFgYDVQQDEw9hcmFyaXBlLnVlY2UuYnIwHhcNMTQwMzIxMTkwNzUy
-WhcNMTcwMzIwMTkwNzUyWjCBwzEvMC0GA1UEChMmVUVDRSAtIFVuaXZlcnNpZGFk
-ZSBFc3RhZGl1YWwgZG8gQ2VhcmExJDAiBgNVBAsTG0RlcGFydGFtZW50byBkZSBJ
-bmZvcm1hdGljYTEfMB0GCSqGSIb3DQEJARYQZGkuaW5mcmFAdWVjZS5icjESMBAG
-A1UEBxMJRm9ydGFsZXphMQ4wDAYDVQQIEwVDZWFyYTELMAkGA1UEBhMCQlIxGDAW
-BgNVBAMTD2FyYXJpcGUudWVjZS5icjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
-AQoCggEBALXknOC9F11nnTnNa8NuRD4cL/FDS9bzesfl/t/XaDMK32F/JgRxumWz
-SK6r0ejmmufDaIglY5kz2wgBry0jPZjkNoVhmDVpSdeEI3s3qDeWb/Jy6QVIYn71
-o25S3p/QTo9DVCjJIYoYD4OmNqU7yJa8sXN5FuvcuTgNXphdbXqMeskw9pGYb1zz
-b+h2jEaWo7wlljOYcwa8F2hJrd9W/ff6vit1cWrXv76afFVK1DjGkuS5H23vEz+Y
-3dRWHaflkxHo7iQ71mLmHGs6lyxf60PmJFyan5J8U1n9xcHlNIWbQsDdpPyxv0To
-PDI8+PywOWhoYYt+zA4Lv9V6CjRqpxMCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEA
-ndu7rtfvY/dTDYWGTdYoTLACJCEsovnY8lzt+kyNIucdgJh//2egd8rKIL8BWUzK
-Ahpc0fitAklIDaVNzvJIrqMXLTFbT0deAJeeWN9e3Lke2bEqJPDO4xh1paedwk8b
-K8n//pcvw6uxKq5GEny5MEhVPaBJthThbH023ict7onBkUClgU7pAYh66JDscvXa
-jRIAsv0FeZt9c0urK4eU4vpnE7Bk0pNSD7pKqQ/ZXngjZSp6CXWlF2J9PGA2g53r
-JuB1tq80AmWAwgGdW4AxW7LLaxwFK6dl0lMIsWYyMleXuh2KhOGxLKrYa/EDs4Yi
-Z1AZ/tU3s4++vwyfNIfQkg==
-                    
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://araripe.uece.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://araripe.uece.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">UECE - Universidade Estadiual do Ceara</OrganizationName>
-    <OrganizationName xml:lang="pt-br">UECE - Universidade Estadiual do Ceara</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">UECE - Universidade Estadiual do Ceara</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="pt-br">UECE - Universidade Estadiual do Ceara</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.uece.br</OrganizationURL>
-    <OrganizationURL xml:lang="pt-br">http://www.uece.br</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>DI Infra</SurName>
-    <EmailAddress>di.infra@uece.br</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/araripe.uece.br.xml b/swamid-interfederations-2.0/araripe.uece.br.xml
deleted file mode 100644
index 64c471ad..00000000
--- a/swamid-interfederations-2.0/araripe.uece.br.xml
+++ /dev/null
@@ -1,114 +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://araripe.uece.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">uece.br</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">UECE - Universidade Estadiual do Ceara</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="pt-br">UECE - Universidade Estadiual do Ceara</mdui:DisplayName>
-        <mdui:Description xml:lang="en">UECE - Universidade Estadiual do Ceara</mdui:Description>
-        <mdui:Description xml:lang="pt-br">UECE - Universidade Estadiual do Ceara</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.uece.br</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="pt-br">http://www.uece.br</mdui:InformationURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-    MIID/DCCAuQCAQAwDQYJKoZIhvcNAQEFBQAwgcMxLzAtBgNVBAoTJlVFQ0UgLSBV
-bml2ZXJzaWRhZGUgRXN0YWRpdWFsIGRvIENlYXJhMSQwIgYDVQQLExtEZXBhcnRh
-bWVudG8gZGUgSW5mb3JtYXRpY2ExHzAdBgkqhkiG9w0BCQEWEGRpLmluZnJhQHVl
-Y2UuYnIxEjAQBgNVBAcTCUZvcnRhbGV6YTEOMAwGA1UECBMFQ2VhcmExCzAJBgNV
-BAYTAkJSMRgwFgYDVQQDEw9hcmFyaXBlLnVlY2UuYnIwHhcNMTQwMzIxMTkwNzUy
-WhcNMTcwMzIwMTkwNzUyWjCBwzEvMC0GA1UEChMmVUVDRSAtIFVuaXZlcnNpZGFk
-ZSBFc3RhZGl1YWwgZG8gQ2VhcmExJDAiBgNVBAsTG0RlcGFydGFtZW50byBkZSBJ
-bmZvcm1hdGljYTEfMB0GCSqGSIb3DQEJARYQZGkuaW5mcmFAdWVjZS5icjESMBAG
-A1UEBxMJRm9ydGFsZXphMQ4wDAYDVQQIEwVDZWFyYTELMAkGA1UEBhMCQlIxGDAW
-BgNVBAMTD2FyYXJpcGUudWVjZS5icjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
-AQoCggEBALXknOC9F11nnTnNa8NuRD4cL/FDS9bzesfl/t/XaDMK32F/JgRxumWz
-SK6r0ejmmufDaIglY5kz2wgBry0jPZjkNoVhmDVpSdeEI3s3qDeWb/Jy6QVIYn71
-o25S3p/QTo9DVCjJIYoYD4OmNqU7yJa8sXN5FuvcuTgNXphdbXqMeskw9pGYb1zz
-b+h2jEaWo7wlljOYcwa8F2hJrd9W/ff6vit1cWrXv76afFVK1DjGkuS5H23vEz+Y
-3dRWHaflkxHo7iQ71mLmHGs6lyxf60PmJFyan5J8U1n9xcHlNIWbQsDdpPyxv0To
-PDI8+PywOWhoYYt+zA4Lv9V6CjRqpxMCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEA
-ndu7rtfvY/dTDYWGTdYoTLACJCEsovnY8lzt+kyNIucdgJh//2egd8rKIL8BWUzK
-Ahpc0fitAklIDaVNzvJIrqMXLTFbT0deAJeeWN9e3Lke2bEqJPDO4xh1paedwk8b
-K8n//pcvw6uxKq5GEny5MEhVPaBJthThbH023ict7onBkUClgU7pAYh66JDscvXa
-jRIAsv0FeZt9c0urK4eU4vpnE7Bk0pNSD7pKqQ/ZXngjZSp6CXWlF2J9PGA2g53r
-JuB1tq80AmWAwgGdW4AxW7LLaxwFK6dl0lMIsWYyMleXuh2KhOGxLKrYa/EDs4Yi
-Z1AZ/tU3s4++vwyfNIfQkg==
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://araripe.uece.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://araripe.uece.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://araripe.uece.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://araripe.uece.br/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://araripe.uece.br/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://araripe.uece.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">uece.br</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-      
-MIID/DCCAuQCAQAwDQYJKoZIhvcNAQEFBQAwgcMxLzAtBgNVBAoTJlVFQ0UgLSBV
-bml2ZXJzaWRhZGUgRXN0YWRpdWFsIGRvIENlYXJhMSQwIgYDVQQLExtEZXBhcnRh
-bWVudG8gZGUgSW5mb3JtYXRpY2ExHzAdBgkqhkiG9w0BCQEWEGRpLmluZnJhQHVl
-Y2UuYnIxEjAQBgNVBAcTCUZvcnRhbGV6YTEOMAwGA1UECBMFQ2VhcmExCzAJBgNV
-BAYTAkJSMRgwFgYDVQQDEw9hcmFyaXBlLnVlY2UuYnIwHhcNMTQwMzIxMTkwNzUy
-WhcNMTcwMzIwMTkwNzUyWjCBwzEvMC0GA1UEChMmVUVDRSAtIFVuaXZlcnNpZGFk
-ZSBFc3RhZGl1YWwgZG8gQ2VhcmExJDAiBgNVBAsTG0RlcGFydGFtZW50byBkZSBJ
-bmZvcm1hdGljYTEfMB0GCSqGSIb3DQEJARYQZGkuaW5mcmFAdWVjZS5icjESMBAG
-A1UEBxMJRm9ydGFsZXphMQ4wDAYDVQQIEwVDZWFyYTELMAkGA1UEBhMCQlIxGDAW
-BgNVBAMTD2FyYXJpcGUudWVjZS5icjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
-AQoCggEBALXknOC9F11nnTnNa8NuRD4cL/FDS9bzesfl/t/XaDMK32F/JgRxumWz
-SK6r0ejmmufDaIglY5kz2wgBry0jPZjkNoVhmDVpSdeEI3s3qDeWb/Jy6QVIYn71
-o25S3p/QTo9DVCjJIYoYD4OmNqU7yJa8sXN5FuvcuTgNXphdbXqMeskw9pGYb1zz
-b+h2jEaWo7wlljOYcwa8F2hJrd9W/ff6vit1cWrXv76afFVK1DjGkuS5H23vEz+Y
-3dRWHaflkxHo7iQ71mLmHGs6lyxf60PmJFyan5J8U1n9xcHlNIWbQsDdpPyxv0To
-PDI8+PywOWhoYYt+zA4Lv9V6CjRqpxMCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEA
-ndu7rtfvY/dTDYWGTdYoTLACJCEsovnY8lzt+kyNIucdgJh//2egd8rKIL8BWUzK
-Ahpc0fitAklIDaVNzvJIrqMXLTFbT0deAJeeWN9e3Lke2bEqJPDO4xh1paedwk8b
-K8n//pcvw6uxKq5GEny5MEhVPaBJthThbH023ict7onBkUClgU7pAYh66JDscvXa
-jRIAsv0FeZt9c0urK4eU4vpnE7Bk0pNSD7pKqQ/ZXngjZSp6CXWlF2J9PGA2g53r
-JuB1tq80AmWAwgGdW4AxW7LLaxwFK6dl0lMIsWYyMleXuh2KhOGxLKrYa/EDs4Yi
-Z1AZ/tU3s4++vwyfNIfQkg==
-                    
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://araripe.uece.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://araripe.uece.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">UECE - Universidade Estadiual do Ceara</OrganizationName>
-    <OrganizationName xml:lang="pt-br">UECE - Universidade Estadiual do Ceara</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">UECE - Universidade Estadiual do Ceara</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="pt-br">UECE - Universidade Estadiual do Ceara</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.uece.br</OrganizationURL>
-    <OrganizationURL xml:lang="pt-br">http://www.uece.br</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>DI Infra</SurName>
-    <EmailAddress>di.infra@uece.br</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/arauto.fapesp.br-idp-shibboleth.xml b/swamid-interfederations-2.0/arauto.fapesp.br-idp-shibboleth.xml
deleted file mode 100644
index f10b2c9f..00000000
--- a/swamid-interfederations-2.0/arauto.fapesp.br-idp-shibboleth.xml
+++ /dev/null
@@ -1,100 +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://arauto.fapesp.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">fapesp.br</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">FAPESP - Fundacao de Amparo a pesquisa do estado de Sao Paulo</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="pt-br">FAPESP - Fundacao de Amparo a pesquisa do estado de Sao Paulo</mdui:DisplayName>
-        <mdui:Description xml:lang="en">FAPESP - Fundacao de Amparo a pesquisa do estado de Sao Paulo</mdui:Description>
-        <mdui:Description xml:lang="pt-br">FAPESP - Fundacao de Amparo a pesquisa do estado de Sao Paulo</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.fapesp.br.br/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="pt-br">http://www.fapesp.br.br/</mdui:InformationURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-    MIICzDCCAbQCAQAwDQYJKoZIhvcNAQEFBQAwLDEMMAoGA1UECxMDQ1BEMQswCQYD
-VQQGEwJCUjEPMA0GA1UEAxMGYXJhdXRvMB4XDTEzMDcyNjE3MDQ1OVoXDTE2MDcy
-NTE3MDQ1OVowLDEMMAoGA1UECxMDQ1BEMQswCQYDVQQGEwJCUjEPMA0GA1UEAxMG
-YXJhdXRvMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAw+QLW8JyafF5
-N38EhTdjZhZVL/KDxzWP1fzt/PFIr/ZoX20/x1CcrppX3dVh5gvjv3REY7+7HsIK
-sSXxQq5xZncoY5E995xJM6TuSS3OCz86Te2XUnG8dr/kXAECdmbtBM0qT7WSRSJU
-ae6EkrpWRiSp23Ggz3k9ouOYq6CFpdwjZlCvmYmS7Mlbu/uXGM3NdTv7xAJUFHP4
-HdFvh73ZWBCpMzKo+U0PWXU1e5Y/s4Q5c72jFolx18MjaSMPWE91YjNYTb+35zV/
-SR1Oft3L05uvBX8TUEcKX/mqTd3C707Gy7j/3tGimMlfvGW3njG/3Ff8jWI1dvQU
-qPoDD0qnxQIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQAAntrrVTQK1XATS5H5bOCU
-5es7/siEh5QPiIQwgCLD9P+oXZVtcjW2I1EkF4mp63HQkcvhQmXrRTivqWVXi1Wl
-xz9Dt73NWumz6fDH8iHBeXYRKCyGXvQ8DBUxBZ3QUK9xFyYAbkj9FvuGr0zHs+UZ
-auKJ0Nxm7eIsSnHOXctSQA4VE4YRBqG75sQ/rC9DzJAooP/oIc9/Wqi3EWckxGPW
-Wmju6DPyLY2Bk/vrufHPWl5rvHeLFDU02UUJ2NlNNyOCHbM+MHoGv7DO6I7tdq+0
-xs9YgM0+0GuxfJp9i3sOGK8kbf0TZoMjFP2Iq6wIKZBT2Q2gBsYXd+8k6BksbGO0
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://arauto.fapesp.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://arauto.fapesp.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://arauto.fapesp.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://arauto.fapesp.br/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://arauto.fapesp.br/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://arauto.fapesp.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">fapesp.br</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-      
-MIICzDCCAbQCAQAwDQYJKoZIhvcNAQEFBQAwLDEMMAoGA1UECxMDQ1BEMQswCQYD
-VQQGEwJCUjEPMA0GA1UEAxMGYXJhdXRvMB4XDTEzMDcyNjE3MDQ1OVoXDTE2MDcy
-NTE3MDQ1OVowLDEMMAoGA1UECxMDQ1BEMQswCQYDVQQGEwJCUjEPMA0GA1UEAxMG
-YXJhdXRvMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAw+QLW8JyafF5
-N38EhTdjZhZVL/KDxzWP1fzt/PFIr/ZoX20/x1CcrppX3dVh5gvjv3REY7+7HsIK
-sSXxQq5xZncoY5E995xJM6TuSS3OCz86Te2XUnG8dr/kXAECdmbtBM0qT7WSRSJU
-ae6EkrpWRiSp23Ggz3k9ouOYq6CFpdwjZlCvmYmS7Mlbu/uXGM3NdTv7xAJUFHP4
-HdFvh73ZWBCpMzKo+U0PWXU1e5Y/s4Q5c72jFolx18MjaSMPWE91YjNYTb+35zV/
-SR1Oft3L05uvBX8TUEcKX/mqTd3C707Gy7j/3tGimMlfvGW3njG/3Ff8jWI1dvQU
-qPoDD0qnxQIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQAAntrrVTQK1XATS5H5bOCU
-5es7/siEh5QPiIQwgCLD9P+oXZVtcjW2I1EkF4mp63HQkcvhQmXrRTivqWVXi1Wl
-xz9Dt73NWumz6fDH8iHBeXYRKCyGXvQ8DBUxBZ3QUK9xFyYAbkj9FvuGr0zHs+UZ
-auKJ0Nxm7eIsSnHOXctSQA4VE4YRBqG75sQ/rC9DzJAooP/oIc9/Wqi3EWckxGPW
-Wmju6DPyLY2Bk/vrufHPWl5rvHeLFDU02UUJ2NlNNyOCHbM+MHoGv7DO6I7tdq+0
-xs9YgM0+0GuxfJp9i3sOGK8kbf0TZoMjFP2Iq6wIKZBT2Q2gBsYXd+8k6BksbGO0
-                    
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://arauto.fapesp.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://arauto.fapesp.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">FAPESP - Fundacao de Amparo a pesquisa do estado de Sao Paulo</OrganizationName>
-    <OrganizationName xml:lang="pt-br">FAPESP - Fundacao de Amparo a pesquisa do estado de Sao Paulo</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">FAPESP - Fundacao de Amparo a pesquisa do estado de Sao Paulo</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="pt-br">FAPESP - Fundacao de Amparo a pesquisa do estado de Sao Paulo</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.fapesp.br.br/</OrganizationURL>
-    <OrganizationURL xml:lang="pt-br">http://www.fapesp.br.br/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Leandro Costa</SurName>
-    <EmailAddress>lcosta@fapesp.br</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/arauto.fapesp.br.xml b/swamid-interfederations-2.0/arauto.fapesp.br.xml
deleted file mode 100644
index f10b2c9f..00000000
--- a/swamid-interfederations-2.0/arauto.fapesp.br.xml
+++ /dev/null
@@ -1,100 +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://arauto.fapesp.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">fapesp.br</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">FAPESP - Fundacao de Amparo a pesquisa do estado de Sao Paulo</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="pt-br">FAPESP - Fundacao de Amparo a pesquisa do estado de Sao Paulo</mdui:DisplayName>
-        <mdui:Description xml:lang="en">FAPESP - Fundacao de Amparo a pesquisa do estado de Sao Paulo</mdui:Description>
-        <mdui:Description xml:lang="pt-br">FAPESP - Fundacao de Amparo a pesquisa do estado de Sao Paulo</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.fapesp.br.br/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="pt-br">http://www.fapesp.br.br/</mdui:InformationURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-    MIICzDCCAbQCAQAwDQYJKoZIhvcNAQEFBQAwLDEMMAoGA1UECxMDQ1BEMQswCQYD
-VQQGEwJCUjEPMA0GA1UEAxMGYXJhdXRvMB4XDTEzMDcyNjE3MDQ1OVoXDTE2MDcy
-NTE3MDQ1OVowLDEMMAoGA1UECxMDQ1BEMQswCQYDVQQGEwJCUjEPMA0GA1UEAxMG
-YXJhdXRvMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAw+QLW8JyafF5
-N38EhTdjZhZVL/KDxzWP1fzt/PFIr/ZoX20/x1CcrppX3dVh5gvjv3REY7+7HsIK
-sSXxQq5xZncoY5E995xJM6TuSS3OCz86Te2XUnG8dr/kXAECdmbtBM0qT7WSRSJU
-ae6EkrpWRiSp23Ggz3k9ouOYq6CFpdwjZlCvmYmS7Mlbu/uXGM3NdTv7xAJUFHP4
-HdFvh73ZWBCpMzKo+U0PWXU1e5Y/s4Q5c72jFolx18MjaSMPWE91YjNYTb+35zV/
-SR1Oft3L05uvBX8TUEcKX/mqTd3C707Gy7j/3tGimMlfvGW3njG/3Ff8jWI1dvQU
-qPoDD0qnxQIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQAAntrrVTQK1XATS5H5bOCU
-5es7/siEh5QPiIQwgCLD9P+oXZVtcjW2I1EkF4mp63HQkcvhQmXrRTivqWVXi1Wl
-xz9Dt73NWumz6fDH8iHBeXYRKCyGXvQ8DBUxBZ3QUK9xFyYAbkj9FvuGr0zHs+UZ
-auKJ0Nxm7eIsSnHOXctSQA4VE4YRBqG75sQ/rC9DzJAooP/oIc9/Wqi3EWckxGPW
-Wmju6DPyLY2Bk/vrufHPWl5rvHeLFDU02UUJ2NlNNyOCHbM+MHoGv7DO6I7tdq+0
-xs9YgM0+0GuxfJp9i3sOGK8kbf0TZoMjFP2Iq6wIKZBT2Q2gBsYXd+8k6BksbGO0
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://arauto.fapesp.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://arauto.fapesp.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://arauto.fapesp.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://arauto.fapesp.br/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://arauto.fapesp.br/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://arauto.fapesp.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">fapesp.br</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-      
-MIICzDCCAbQCAQAwDQYJKoZIhvcNAQEFBQAwLDEMMAoGA1UECxMDQ1BEMQswCQYD
-VQQGEwJCUjEPMA0GA1UEAxMGYXJhdXRvMB4XDTEzMDcyNjE3MDQ1OVoXDTE2MDcy
-NTE3MDQ1OVowLDEMMAoGA1UECxMDQ1BEMQswCQYDVQQGEwJCUjEPMA0GA1UEAxMG
-YXJhdXRvMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAw+QLW8JyafF5
-N38EhTdjZhZVL/KDxzWP1fzt/PFIr/ZoX20/x1CcrppX3dVh5gvjv3REY7+7HsIK
-sSXxQq5xZncoY5E995xJM6TuSS3OCz86Te2XUnG8dr/kXAECdmbtBM0qT7WSRSJU
-ae6EkrpWRiSp23Ggz3k9ouOYq6CFpdwjZlCvmYmS7Mlbu/uXGM3NdTv7xAJUFHP4
-HdFvh73ZWBCpMzKo+U0PWXU1e5Y/s4Q5c72jFolx18MjaSMPWE91YjNYTb+35zV/
-SR1Oft3L05uvBX8TUEcKX/mqTd3C707Gy7j/3tGimMlfvGW3njG/3Ff8jWI1dvQU
-qPoDD0qnxQIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQAAntrrVTQK1XATS5H5bOCU
-5es7/siEh5QPiIQwgCLD9P+oXZVtcjW2I1EkF4mp63HQkcvhQmXrRTivqWVXi1Wl
-xz9Dt73NWumz6fDH8iHBeXYRKCyGXvQ8DBUxBZ3QUK9xFyYAbkj9FvuGr0zHs+UZ
-auKJ0Nxm7eIsSnHOXctSQA4VE4YRBqG75sQ/rC9DzJAooP/oIc9/Wqi3EWckxGPW
-Wmju6DPyLY2Bk/vrufHPWl5rvHeLFDU02UUJ2NlNNyOCHbM+MHoGv7DO6I7tdq+0
-xs9YgM0+0GuxfJp9i3sOGK8kbf0TZoMjFP2Iq6wIKZBT2Q2gBsYXd+8k6BksbGO0
-                    
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://arauto.fapesp.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://arauto.fapesp.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">FAPESP - Fundacao de Amparo a pesquisa do estado de Sao Paulo</OrganizationName>
-    <OrganizationName xml:lang="pt-br">FAPESP - Fundacao de Amparo a pesquisa do estado de Sao Paulo</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">FAPESP - Fundacao de Amparo a pesquisa do estado de Sao Paulo</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="pt-br">FAPESP - Fundacao de Amparo a pesquisa do estado de Sao Paulo</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.fapesp.br.br/</OrganizationURL>
-    <OrganizationURL xml:lang="pt-br">http://www.fapesp.br.br/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Leandro Costa</SurName>
-    <EmailAddress>lcosta@fapesp.br</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/atlases.muni.cz.xml b/swamid-interfederations-2.0/atlases.muni.cz.xml
deleted file mode 100644
index a385fe38..00000000
--- a/swamid-interfederations-2.0/atlases.muni.cz.xml
+++ /dev/null
@@ -1,29 +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://atlases.muni.cz/shibboleth">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIEZzCCA0+gAwIBAgILAQAAAAABID3xVZIwDQYJKoZIhvcNAQEFBQAwajEjMCEGA1UECxMaT3JnYW5pemF0aW9uIFZhbGlkYXRpb24gQ0ExEzARBgNVBAoTCkdsb2JhbFNpZ24xLjAsBgNVBAMTJUdsb2JhbFNpZ24gT3JnYW5pemF0aW9uIFZhbGlkYXRpb24gQ0EwHhcNMDkwMzI1MTMwNTE0WhcNMTIwNTA5MDcwNzU3WjCBgzELMAkGA1UEBhMCREsxETAPBgNVBAgTCE9kZW5zZSBNMREwDwYDVQQHEwhPZGVuc2UgTTEbMBkGA1UECxMSV0FZRiAtIFNlY3JldGFyaWF0MR0wGwYDVQQKExRTeWRkYW5zayBVbml2ZXJzaXRldDESMBAGA1UEAxQJKi53YXlmLmRrMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDBsuiyO84OVwkKR0TL6w8viWV4jMg+Jy7LgiEtYfHdnVBCvdM9XJJetS0MiJtulBH4/4ZWrfeGeHgLPvSjp6FiRdI1nDg/33ofc0TdNytxX4tBCzvxM0C4yCCaEXda+tqXJmGua+mVubMhS8kizHjL+s7A8xUqXoEFqOMHtgqoAQIDAQABo4IBdjCCAXIwHwYDVR0jBBgwFoAUfW0q7Garp1E2qwJp8XCPxFkLmh8wSQYIKwYBBQUHAQEEPTA7MDkGCCsGAQUFBzAChi1odHRwOi8vc2VjdXJlLmdsb2JhbHNpZ24ubmV0L2NhY2VydC9vcmd2MS5jcnQwPwYDVR0fBDgwNjA0oDKgMIYuaHR0cDovL2NybC5nbG9iYWxzaWduLm5ldC9Pcmdhbml6YXRpb25WYWwxLmNybDAdBgNVHQ4EFgQUvlkjTc0iuzcvi752QgktLT01obgwCQYDVR0TBAIwADAOBgNVHQ8BAf8EBAMCBaAwKQYDVR0lBCIwIAYIKwYBBQUHAwEGCCsGAQUFBwMCBgorBgEEAYI3CgMDMEsGA1UdIAREMEIwQAYJKwYBBAGgMgEUMDMwMQYIKwYBBQUHAgEWJWh0dHA6Ly93d3cuZ2xvYmFsc2lnbi5uZXQvcmVwb3NpdG9yeS8wEQYJYIZIAYb4QgEBBAQDAgbAMA0GCSqGSIb3DQEBBQUAA4IBAQCKPVJYHjKOrzWtjPBTEJOwIzE0wSIcA+9+GNR5Pvk+6OTf2QTUDDHpXiiIEcYPL1kN/BEvA+N2y+7qyI5MlL7DNIu9clx1lcqhXiQ0lWcu7Bmb7VNPKq5WS1W81GhbZrO6BJtsQctU6odDXMoORay7FxnaxGHOaJlCSQDgT7QrRhzyd80X8NxrSV25byCTb31du8xoO+WagnqAp6xbKs6IsESDw2r/i3rLOXbL37B7lnbjcLC963xN6j7+kiyqiCjvrP0GLfSV4/FN9i9hWrdMlcbnvr23yz5Jflc1oFPtJx7GZqtV0uTijGxCr+aRaUzBPqc3kyavHJcCsn5TcL1t</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIEZzCCA0+gAwIBAgILAQAAAAABID3xVZIwDQYJKoZIhvcNAQEFBQAwajEjMCEGA1UECxMaT3JnYW5pemF0aW9uIFZhbGlkYXRpb24gQ0ExEzARBgNVBAoTCkdsb2JhbFNpZ24xLjAsBgNVBAMTJUdsb2JhbFNpZ24gT3JnYW5pemF0aW9uIFZhbGlkYXRpb24gQ0EwHhcNMDkwMzI1MTMwNTE0WhcNMTIwNTA5MDcwNzU3WjCBgzELMAkGA1UEBhMCREsxETAPBgNVBAgTCE9kZW5zZSBNMREwDwYDVQQHEwhPZGVuc2UgTTEbMBkGA1UECxMSV0FZRiAtIFNlY3JldGFyaWF0MR0wGwYDVQQKExRTeWRkYW5zayBVbml2ZXJzaXRldDESMBAGA1UEAxQJKi53YXlmLmRrMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDBsuiyO84OVwkKR0TL6w8viWV4jMg+Jy7LgiEtYfHdnVBCvdM9XJJetS0MiJtulBH4/4ZWrfeGeHgLPvSjp6FiRdI1nDg/33ofc0TdNytxX4tBCzvxM0C4yCCaEXda+tqXJmGua+mVubMhS8kizHjL+s7A8xUqXoEFqOMHtgqoAQIDAQABo4IBdjCCAXIwHwYDVR0jBBgwFoAUfW0q7Garp1E2qwJp8XCPxFkLmh8wSQYIKwYBBQUHAQEEPTA7MDkGCCsGAQUFBzAChi1odHRwOi8vc2VjdXJlLmdsb2JhbHNpZ24ubmV0L2NhY2VydC9vcmd2MS5jcnQwPwYDVR0fBDgwNjA0oDKgMIYuaHR0cDovL2NybC5nbG9iYWxzaWduLm5ldC9Pcmdhbml6YXRpb25WYWwxLmNybDAdBgNVHQ4EFgQUvlkjTc0iuzcvi752QgktLT01obgwCQYDVR0TBAIwADAOBgNVHQ8BAf8EBAMCBaAwKQYDVR0lBCIwIAYIKwYBBQUHAwEGCCsGAQUFBwMCBgorBgEEAYI3CgMDMEsGA1UdIAREMEIwQAYJKwYBBAGgMgEUMDMwMQYIKwYBBQUHAgEWJWh0dHA6Ly93d3cuZ2xvYmFsc2lnbi5uZXQvcmVwb3NpdG9yeS8wEQYJYIZIAYb4QgEBBAQDAgbAMA0GCSqGSIb3DQEBBQUAA4IBAQCKPVJYHjKOrzWtjPBTEJOwIzE0wSIcA+9+GNR5Pvk+6OTf2QTUDDHpXiiIEcYPL1kN/BEvA+N2y+7qyI5MlL7DNIu9clx1lcqhXiQ0lWcu7Bmb7VNPKq5WS1W81GhbZrO6BJtsQctU6odDXMoORay7FxnaxGHOaJlCSQDgT7QrRhzyd80X8NxrSV25byCTb31du8xoO+WagnqAp6xbKs6IsESDw2r/i3rLOXbL37B7lnbjcLC963xN6j7+kiyqiCjvrP0GLfSV4/FN9i9hWrdMlcbnvr23yz5Jflc1oFPtJx7GZqtV0uTijGxCr+aRaUzBPqc3kyavHJcCsn5TcL1t</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://atlases.muni.cz/Shibboleth.sso/SLO/POST"/>
-    <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://atlases.muni.cz/Shibboleth.sso/SAML2/POST" index="0"/>
-    <md:AttributeConsumingService index="0">
-      <md:ServiceName xml:lang="en">Pathology Images</md:ServiceName>
-      <md:ServiceName xml:lang="da">Patologi-atlasser</md:ServiceName>
-      <md:ServiceDescription xml:lang="en">to provide access to the three atlases: (1) Dermatopathology, (2) Fetal and Neonatal Pathology, (3) Pathology for Pre-graduate Students of Medicine. The atlases may serve as sources of teaching material for pre-graduate as well as postgraduate students of pathology</md:ServiceDescription>
-      <md:ServiceDescription xml:lang="da">give adgang til tre atlasser: (1) Dermato-patologi, (2) Foster- og neonatal patologi, (3) Patologi for medicinstuderende. Atlasserne kan bruges som undervisningsmateriale for patologistuderende</md:ServiceDescription>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/atrium.in2p3.fr-sp.xml b/swamid-interfederations-2.0/atrium.in2p3.fr-sp.xml
deleted file mode 100644
index 6448e387..00000000
--- a/swamid-interfederations-2.0/atrium.in2p3.fr-sp.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://atrium.in2p3.fr/sp">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2014-03-25T10:38:59Z">
-      <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="fr">IN2P3 - Atrium - Gestion documentaire</mdui:DisplayName>
-        <mdui:Description xml:lang="fr">IN2P3 - Atrium - Gestion documentaire
-basé sur le logiciel Nuxeo</mdui:Description>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDEDCCAfigAwIBAgIJAMGXFtpKBnHgMA0GCSqGSIb3DQEBBQUAMBoxGDAWBgNV
-BAMTD2F0cml1bS5pbjJwMy5mcjAeFw0xNDEwMTcwOTAzMTRaFw0yNDEwMTQwOTAz
-MTRaMBoxGDAWBgNVBAMTD2F0cml1bS5pbjJwMy5mcjCCASIwDQYJKoZIhvcNAQEB
-BQADggEPADCCAQoCggEBANImZiGFAvKe8IsYWOo7/O3W9eakTCoNgmbUDnoW+EZt
-2MPRyxnYTm0+FIpFSi4V9QG0r/VI1WIH4jj09SvgVogIdCJY2BiJybZNzVGPLJFL
-3G6cJ/7G5Uc5FcLxLfp6b99IEb3kbcNlrNqcGaFNnFOyjHw9ByqIWAff5SBTUxsI
-tWWPXlOMMboZV/8JFbc2zpIfa+60Cn5xhkqY+7kYhmTXDFeFDIyffa9LR76300nV
-0bQ12SkrOiXw5stqTAX7xRK2/K7zfu1I4y0iQIBxQdmEMwVWUfk+Wo/eEZ6WG6YB
-96IGKwIUmbGCoYKWBQ4DSF329Z3K+9l36TVTxWObI+ECAwEAAaNZMFcwNgYDVR0R
-BC8wLYIPYXRyaXVtLmluMnAzLmZyhhpodHRwczovL2F0cml1bS5pbjJwMy5mci9z
-cDAdBgNVHQ4EFgQUX9KcNb++3ZK/lDgl92aqw9tThskwDQYJKoZIhvcNAQEFBQAD
-ggEBAMsAC/6QERa7FH8vlfRR7mRtFhzDzMaY7oZ8ZIH8ovtBWyEj5/5SQYgUEWcR
-xZ1JE/GKZn95Wxl7S0pp4vM+q+KjENuI+wDhxnC90xUUbwbnRFVB6GNUdpaZ0+KB
-F3684EGWKGiKv2tRX4M2BpFgNPfPppOWkIxD99G0Cesq5Ait1uVUWSdeIsq12v/q
-tBoVWbIwEBRt+bnZl3QDOsVQPcvje1aGHiGiYqsmFAEZoYQ5MEqq+wt/cINZsmIJ
-Xguic2EJqr1Ei4Q2DE91SVuoZVpApQM+R1BOMXC97H5rRU14BOR/Op38xAf9em1l
-yniZ5+JeJC4Wvu7wo3LF9QPfcJg=
-
-					    </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>
-					      MIIDEDCCAfigAwIBAgIJAMGXFtpKBnHgMA0GCSqGSIb3DQEBBQUAMBoxGDAWBgNV
-BAMTD2F0cml1bS5pbjJwMy5mcjAeFw0xNDEwMTcwOTAzMTRaFw0yNDEwMTQwOTAz
-MTRaMBoxGDAWBgNVBAMTD2F0cml1bS5pbjJwMy5mcjCCASIwDQYJKoZIhvcNAQEB
-BQADggEPADCCAQoCggEBANImZiGFAvKe8IsYWOo7/O3W9eakTCoNgmbUDnoW+EZt
-2MPRyxnYTm0+FIpFSi4V9QG0r/VI1WIH4jj09SvgVogIdCJY2BiJybZNzVGPLJFL
-3G6cJ/7G5Uc5FcLxLfp6b99IEb3kbcNlrNqcGaFNnFOyjHw9ByqIWAff5SBTUxsI
-tWWPXlOMMboZV/8JFbc2zpIfa+60Cn5xhkqY+7kYhmTXDFeFDIyffa9LR76300nV
-0bQ12SkrOiXw5stqTAX7xRK2/K7zfu1I4y0iQIBxQdmEMwVWUfk+Wo/eEZ6WG6YB
-96IGKwIUmbGCoYKWBQ4DSF329Z3K+9l36TVTxWObI+ECAwEAAaNZMFcwNgYDVR0R
-BC8wLYIPYXRyaXVtLmluMnAzLmZyhhpodHRwczovL2F0cml1bS5pbjJwMy5mci9z
-cDAdBgNVHQ4EFgQUX9KcNb++3ZK/lDgl92aqw9tThskwDQYJKoZIhvcNAQEFBQAD
-ggEBAMsAC/6QERa7FH8vlfRR7mRtFhzDzMaY7oZ8ZIH8ovtBWyEj5/5SQYgUEWcR
-xZ1JE/GKZn95Wxl7S0pp4vM+q+KjENuI+wDhxnC90xUUbwbnRFVB6GNUdpaZ0+KB
-F3684EGWKGiKv2tRX4M2BpFgNPfPppOWkIxD99G0Cesq5Ait1uVUWSdeIsq12v/q
-tBoVWbIwEBRt+bnZl3QDOsVQPcvje1aGHiGiYqsmFAEZoYQ5MEqq+wt/cINZsmIJ
-Xguic2EJqr1Ei4Q2DE91SVuoZVpApQM+R1BOMXC97H5rRU14BOR/Op38xAf9em1l
-yniZ5+JeJC4Wvu7wo3LF9QPfcJg=
-
-					    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://atrium.in2p3.fr/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://atrium.in2p3.fr/Shibboleth.sso/SAML/POST" index="5"/>
-    <AttributeConsumingService index="0">
-      <ServiceName xml:lang="fr">IN2P3 - Atrium - Gestion documentaire</ServiceName>
-      <ServiceDescription xml:lang="fr">IN2P3 - Atrium - Gestion documentaire
-basé sur le logiciel Nuxeo</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">
-        <saml:AttributeValue xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion">rouet@in2p3.fr</saml:AttributeValue>
-      </RequestedAttribute>
-    </AttributeConsumingService>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">CNRS</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">CNRS</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Jean-René Rouet</SurName>
-    <EmailAddress>rouet@in2p3.fr</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <SurName>Foudil Brétel</SurName>
-    <EmailAddress>foudil.bretel@cc.in2p3.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/atrium.in2p3.fr.xml b/swamid-interfederations-2.0/atrium.in2p3.fr.xml
deleted file mode 100644
index 6448e387..00000000
--- a/swamid-interfederations-2.0/atrium.in2p3.fr.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://atrium.in2p3.fr/sp">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2014-03-25T10:38:59Z">
-      <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="fr">IN2P3 - Atrium - Gestion documentaire</mdui:DisplayName>
-        <mdui:Description xml:lang="fr">IN2P3 - Atrium - Gestion documentaire
-basé sur le logiciel Nuxeo</mdui:Description>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDEDCCAfigAwIBAgIJAMGXFtpKBnHgMA0GCSqGSIb3DQEBBQUAMBoxGDAWBgNV
-BAMTD2F0cml1bS5pbjJwMy5mcjAeFw0xNDEwMTcwOTAzMTRaFw0yNDEwMTQwOTAz
-MTRaMBoxGDAWBgNVBAMTD2F0cml1bS5pbjJwMy5mcjCCASIwDQYJKoZIhvcNAQEB
-BQADggEPADCCAQoCggEBANImZiGFAvKe8IsYWOo7/O3W9eakTCoNgmbUDnoW+EZt
-2MPRyxnYTm0+FIpFSi4V9QG0r/VI1WIH4jj09SvgVogIdCJY2BiJybZNzVGPLJFL
-3G6cJ/7G5Uc5FcLxLfp6b99IEb3kbcNlrNqcGaFNnFOyjHw9ByqIWAff5SBTUxsI
-tWWPXlOMMboZV/8JFbc2zpIfa+60Cn5xhkqY+7kYhmTXDFeFDIyffa9LR76300nV
-0bQ12SkrOiXw5stqTAX7xRK2/K7zfu1I4y0iQIBxQdmEMwVWUfk+Wo/eEZ6WG6YB
-96IGKwIUmbGCoYKWBQ4DSF329Z3K+9l36TVTxWObI+ECAwEAAaNZMFcwNgYDVR0R
-BC8wLYIPYXRyaXVtLmluMnAzLmZyhhpodHRwczovL2F0cml1bS5pbjJwMy5mci9z
-cDAdBgNVHQ4EFgQUX9KcNb++3ZK/lDgl92aqw9tThskwDQYJKoZIhvcNAQEFBQAD
-ggEBAMsAC/6QERa7FH8vlfRR7mRtFhzDzMaY7oZ8ZIH8ovtBWyEj5/5SQYgUEWcR
-xZ1JE/GKZn95Wxl7S0pp4vM+q+KjENuI+wDhxnC90xUUbwbnRFVB6GNUdpaZ0+KB
-F3684EGWKGiKv2tRX4M2BpFgNPfPppOWkIxD99G0Cesq5Ait1uVUWSdeIsq12v/q
-tBoVWbIwEBRt+bnZl3QDOsVQPcvje1aGHiGiYqsmFAEZoYQ5MEqq+wt/cINZsmIJ
-Xguic2EJqr1Ei4Q2DE91SVuoZVpApQM+R1BOMXC97H5rRU14BOR/Op38xAf9em1l
-yniZ5+JeJC4Wvu7wo3LF9QPfcJg=
-
-					    </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>
-					      MIIDEDCCAfigAwIBAgIJAMGXFtpKBnHgMA0GCSqGSIb3DQEBBQUAMBoxGDAWBgNV
-BAMTD2F0cml1bS5pbjJwMy5mcjAeFw0xNDEwMTcwOTAzMTRaFw0yNDEwMTQwOTAz
-MTRaMBoxGDAWBgNVBAMTD2F0cml1bS5pbjJwMy5mcjCCASIwDQYJKoZIhvcNAQEB
-BQADggEPADCCAQoCggEBANImZiGFAvKe8IsYWOo7/O3W9eakTCoNgmbUDnoW+EZt
-2MPRyxnYTm0+FIpFSi4V9QG0r/VI1WIH4jj09SvgVogIdCJY2BiJybZNzVGPLJFL
-3G6cJ/7G5Uc5FcLxLfp6b99IEb3kbcNlrNqcGaFNnFOyjHw9ByqIWAff5SBTUxsI
-tWWPXlOMMboZV/8JFbc2zpIfa+60Cn5xhkqY+7kYhmTXDFeFDIyffa9LR76300nV
-0bQ12SkrOiXw5stqTAX7xRK2/K7zfu1I4y0iQIBxQdmEMwVWUfk+Wo/eEZ6WG6YB
-96IGKwIUmbGCoYKWBQ4DSF329Z3K+9l36TVTxWObI+ECAwEAAaNZMFcwNgYDVR0R
-BC8wLYIPYXRyaXVtLmluMnAzLmZyhhpodHRwczovL2F0cml1bS5pbjJwMy5mci9z
-cDAdBgNVHQ4EFgQUX9KcNb++3ZK/lDgl92aqw9tThskwDQYJKoZIhvcNAQEFBQAD
-ggEBAMsAC/6QERa7FH8vlfRR7mRtFhzDzMaY7oZ8ZIH8ovtBWyEj5/5SQYgUEWcR
-xZ1JE/GKZn95Wxl7S0pp4vM+q+KjENuI+wDhxnC90xUUbwbnRFVB6GNUdpaZ0+KB
-F3684EGWKGiKv2tRX4M2BpFgNPfPppOWkIxD99G0Cesq5Ait1uVUWSdeIsq12v/q
-tBoVWbIwEBRt+bnZl3QDOsVQPcvje1aGHiGiYqsmFAEZoYQ5MEqq+wt/cINZsmIJ
-Xguic2EJqr1Ei4Q2DE91SVuoZVpApQM+R1BOMXC97H5rRU14BOR/Op38xAf9em1l
-yniZ5+JeJC4Wvu7wo3LF9QPfcJg=
-
-					    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://atrium.in2p3.fr/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://atrium.in2p3.fr/Shibboleth.sso/SAML/POST" index="5"/>
-    <AttributeConsumingService index="0">
-      <ServiceName xml:lang="fr">IN2P3 - Atrium - Gestion documentaire</ServiceName>
-      <ServiceDescription xml:lang="fr">IN2P3 - Atrium - Gestion documentaire
-basé sur le logiciel Nuxeo</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">
-        <saml:AttributeValue xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion">rouet@in2p3.fr</saml:AttributeValue>
-      </RequestedAttribute>
-    </AttributeConsumingService>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">CNRS</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">CNRS</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Jean-René Rouet</SurName>
-    <EmailAddress>rouet@in2p3.fr</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <SurName>Foudil Brétel</SurName>
-    <EmailAddress>foudil.bretel@cc.in2p3.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/attribute-viewer.aai.switch.ch-interfederation-test-shibboleth.xml b/swamid-interfederations-2.0/attribute-viewer.aai.switch.ch-interfederation-test-shibboleth.xml
deleted file mode 100644
index bebdbace..00000000
--- a/swamid-interfederations-2.0/attribute-viewer.aai.switch.ch-interfederation-test-shibboleth.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://attribute-viewer.aai.switch.ch/interfederation-test/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://rr.aai.switch.ch/" registrationInstant="2014-08-15T07:30:03Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.switch.ch/aai/federation/switchaai/metadata-registration-practice-statement-20110711.txt</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 errorURL="http://www.switch.ch/aai/support/help" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
-    <Extensions>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">AAI Viewer Interfederation Test</mdui:DisplayName>
-        <mdui:Description xml:lang="en">This service is used to test the interfederation readiness of SWITCHaai Identity Providers.</mdui:Description>
-        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAACF0RVh0U29mdHdhcmUAR3JhcGhpY0NvbnZlcnRlciAoSW50ZWwpd4f6GQAAAZJJREFUeJyUk08og2Ecx5+SHNSW/DtQlHKg1MhByjIpLRNx0NZKk0kbbSStHXZdHOVP4bCi5swuXNxQLjiN5UBNc1AzbeR936/39zz7c7B/Dt+e31PP9/P8ft/3eRkARpKPnVDuQsjsy1W2kA8skKwM8tEsEH8tG5QDqEZpqZILdgblbB34+igJygG2RrlRWqsXcqi1pwXKdaAoJLehtk99kJa1wkxrupb9OihPl3lBf6kqiPLg3ThER3BVCRDl8/aI4oC0lFhYGOyiG9nTKIAECjqzQZdMmVqnEbBaAfi0gLeaQ6grGrkkIPqexJjFi+E+PSZGTDANGjHQq8dQdz8CPndhY+Q5hjnPPlirGazDBta5CNakrrVmmGybiETj+UegG3cOz8Gap4V6FgSgYRLthhXcP7zkDzH1/cONmjYrP8xNXXZea9Q6dHELOlPwM1pX98BqxoWRpLZep5uHf/cEic9UwceULaZc22LetGj+eCJZ/lOmYBgzwDizAQrw3z+T2x/E1U24bGNGvwAAAP//AwCkGcs+iePLFQAAAABJRU5ErkJggg==</mdui:Logo>
-        <mdui:Logo height="60" width="80">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFAAAAA8CAIAAAB+RarbAAAC0GlDQ1BJQ0NQcm9maWxlAAB4nI2Uz0sUYRjHv7ONGChBYGZ7iKFDSKhMFmVE5a6/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+hkAAAaRSURBVHic7JZpUFNXFMf92A+dsR8ECrQ6Fq2tlVVELVQEZLNaoSwV1FEsy6CMuyJhFRAQQiAJEBCIiCigaAUFFARZlE0EAReoiiCgLGUnJIQktyc8GpKXSPnUzjzefzKZ9+4979z7u/fcc+4StMi05P+ewH8tEpjoIoGJLhKY6CKBiS4SmOgigYkuEpjoIoGJLhKY6CKBia5FDMyZnLpT/Nzl+FXbgykObmw719TopLKe3hHoEolE2bkN9NTy8XGe9Me37zUHUQu7P4pt0EgHqo5EnRUy7qd56CkLteXBo0AovJRZc7f4BdbTNzAenfgwKqEkGn6sUkZKGS3pYRSrlMoqjaAX5z94Ie3mz/Z+WkrZbs/LtgdT7VzZ9m7snPxnXN60xIA/LUjOqCoqb5UnnOTykzKrwLMM8NgEz9krfc2WsF0uKY4elxzg535J35q63opa19gJBtl5jUqavuysGmlfj2rffrb8hBclR/xSehrRl6G+JpnRXuUg2lL0Oh8ep/gCw12xHt7XsZ62t31We1iWzizrPYnmTqyVm4MNdtC270uycmaZOcZFJpTMrphAeJ5e9K1RqJFNrL27GNXBnf2LS7LGjyFup7N4U9MSKj3LqFMhufLAg8McGHfpGm8ZYFjdlZuCi8tbBQKhxLS98y/tbRfcz2RjA8MCw+uHvlFpdyfP3f58tU99eSliqaOSkzJD8UZR2kZ0yw4JhdgmGNsxvHxzsE6hSARbxOXxebzpzu4hLbMLjNRyWBRogR8YY2aFZa/U1wcw2RVDIxyJY5hkes4TNV3/ipo3EmCDn6O9z+cpBDa2Y6rrBcgAw/Js+ZU5OsbFWZ8Nu+PpcwN7rn/2/iv9QL/IfGkD4FfXjzhmswOlrUGjnTIf1zMR7QvUXYW94YBxTtaZRsRcfCjfFRxzD7rGJ3i49o6uQY3NwUlXZp1zuPwN8wEz8MBGtnSIXtzugSBmpI/KmdC8FRuDnrd+lLahJtd4WpqipxHSjSLOAErUQAVukpZ5gCFTiIGTFAAHUAuM7ZmSDZcItjS/5Pnr9n7J64bt0ZSIO/IexiemTOzjVHX9ZYAhXcHuuRy/llfUUv30XW1jR/PLnvc9w9NSEQ7q6hleaxJ+8ESmSCiSNA6M8K/QqIjbK20pqAwRMVTRYNscMF8MfJiieIe1tl1QuMOB1AITxzh5YJy4XP6mnTG/n8x80tQJk5f8IAGVVLZt3hmjrOkrAwzKvd8CWcHQhg5faptH6phH/mASbr47obahQ9p1fNojFR2/4oq5fMgXoJrCXNHU+JwRcDJVURlF+sP5Qrp3RNMsgqYI2D+qwHQBwLDDP9nSVxmG6lqIZ65jESl+mHkGllWGIV/rB+KB0Uz5gS+HRyY/9o3CIamsfQvwkEVhcyQ2E5wpM8d4C6cEKGNYy+PG3qD99ujV5TlHxUdErFVorGuhwDM7HK0opAOphaaO8QsB3riDdjTg1sDgRO/AWG//GPbfNzDW+qYP1gK/w4+ftDe2dPOnhThHUCchMw8OT0g33n3wUlnbDytRsEZ7j988tssCXd2AuEPi7v5mxFAV1DFwruY/w5/a4aDoQghI4MG1Q6KGip2V24C9cmbOsE+4gjM8PDq51V4uSytr+ULuhj6cNTO1HIBh2XCDOR1K17WIgliorn+nph+SwWCgBGVUFwMrgHKdEVsP8YYWDoyFtMKkFRp7/3vjMMi0uHZILlBZvPxmvc2WpTAFwFhZUsMlLbhvrDYKrW2QqSucSf5vnmmmDnHSIY2pvun9CoMgmM2ew+lwbRBn8gJXxNJAzWmIoYKa2PID/2tI0xQB3y9rVdMLyLhZh2uvqn+33CAoPq1SFnjBZamza8h6byKcctdTWYd8bnh4Z3ucybZwZsEqZN1ukPeCZkr0lzr+yw3OQYYXvw+9RqxvEF0FXdsmvnLICS4VRjb0Q/9UdWlBSK/dGhadWCrfBWsNdxuYBlwEYVZwC4KJ7TuSsXZrOOSRrg/DmBmEtJ5V1OlP3LRg3GXrKDLA4gmPcJipFbqWkUpaFGUtP0jFTofTG5q75F1ggqJ14NhVmM1cRqlnirKtUXuRQnswOxH0R2xyuXwXHJn9RzOu5yleWaFQlHuv5TvjMCVNioq2n9I6CgQ5hMOQVJzDfcHz7PWLGdXyn4+N847637Q5kIwHXiQigYkuEpjoIoGJLhKY6CKBiS4SmOgigYkuEpjoIoGJLhKY6CKBia5FB/w3AAAA//8DABFh2N/+esWhAAAAAElFTkSuQmCC</mdui:Logo>
-        <mdui:InformationURL xml:lang="en">https://aai-viewer.switch.ch/interfederation-test/</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://aai-viewer.switch.ch/interfederation-test/privacy-statement.html</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDazCCAlOgAwIBAgIJAInsS/34xVwWMA0GCSqGSIb3DQEBBQUAMCkxJzAlBgNV
-BAMTHmF0dHJpYnV0ZS12aWV3ZXIuYWFpLnN3aXRjaC5jaDAeFw0xNDA1MTQxNDQ4
-MzVaFw0xNzA1MTMxNDQ4MzVaMCkxJzAlBgNVBAMTHmF0dHJpYnV0ZS12aWV3ZXIu
-YWFpLnN3aXRjaC5jaDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMYE
-foYKQreiAh1ULU3g5YxUJeU3HHOk3AfWEKj2fQTA9UpPk2GIlXapEoAnbE4qpOoO
-+LR4HEijEXlOdB8DIFIr+7r/lp0yIqM4rF9PIw+yz+bvUgnjLzAy+38QmQsrW1Zn
-xoJs+2tZ0JQ3HZMlGQsDXfJvhfwl5awgbyyKFq5BCIVI8NYqBsj8dbToh/cKJK5L
-7LyPxcU4nqQEgWBLD4ZOdcbTvjRb4EQuMeZL22iYPKIhk+7kLBO3riPP4QZiI8Kv
-bNeLjwbYXCEJ3GfWdIgIwEireu4f4gP6r1ZSegflyYyi4A4XFm56BF9gdyTsjp2Y
-vYAXlQLTMlJPsanyLdUCAwEAAaOBlTCBkjBxBgNVHREEajBogh5hdHRyaWJ1dGUt
-dmlld2VyLmFhaS5zd2l0Y2guY2iGRmh0dHBzOi8vYXR0cmlidXRlLXZpZXdlci5h
-YWkuc3dpdGNoLmNoL2ludGVyZmVkZXJhdGlvbi10ZXN0L3NoaWJib2xldGgwHQYD
-VR0OBBYEFKtMQ76UJ2imKPdoMOiGDQ7EgSfQMA0GCSqGSIb3DQEBBQUAA4IBAQB6
-lHFWlu87yTXTUpr5DTOcaXgsXqaguQBve9QWj39sylbbdNe7qlhfrkP4J4Y1Ye8G
-cQMM3yvHPOqX2yVIwc9lf/mwyhS3EYKS9A6xlGZBfWVAwIV193Lqyj9JgQAFsZV9
-i0w4/AIfJPTTPNNvBoXyLSGNjiDgddcOPbFpvcXmc2huQgafnpPUpHRvzftSqQct
-iJHJIIW6oKr6j3x3iEdvfCgxvjC97Cz2eSxYbaGrO2eBoqWZd46bgtCXE3ODksGX
-DfJWmpOBDWhAdKUZ7CAl9fCH4ztaREeTDK6z0WU3U3T8Q8BBV/jbFeav+tOqMhNH
-jCyyjtF4f+udUgUZm2Jt
-						</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://attribute-viewer.aai.switch.ch/interfederation-test/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://attribute-viewer.aai.switch.ch/interfederation-test/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://attribute-viewer.aai.switch.ch/interfederation-test/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://attribute-viewer.aai.switch.ch/interfederation-test/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://attribute-viewer.aai.switch.ch/interfederation-test/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://attribute-viewer.aai.switch.ch/interfederation-test/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <AttributeConsumingService index="1">
-      <ServiceName xml:lang="en">AAI Viewer Interfederation Test</ServiceName>
-      <ServiceDescription xml:lang="en">This service is used to test the interfederation readiness of SWITCHaai Identity Providers.</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="true"/>
-      <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="true"/>
-      <RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <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="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"/>
-      <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"/>
-    </AttributeConsumingService>
-  </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>AAI</GivenName>
-    <SurName>Team</SurName>
-    <EmailAddress>mailto:aai@switch.ch</EmailAddress>
-    <TelephoneNumber>+41 44 268 15 05</TelephoneNumber>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>AAI</GivenName>
-    <SurName>Team</SurName>
-    <EmailAddress>mailto:aai@switch.ch</EmailAddress>
-    <TelephoneNumber>+41 44 268 15 05</TelephoneNumber>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/attribute-viewer.aai.switch.ch-shibboleth.xml b/swamid-interfederations-2.0/attribute-viewer.aai.switch.ch-shibboleth.xml
deleted file mode 100644
index 1ff79ed9..00000000
--- a/swamid-interfederations-2.0/attribute-viewer.aai.switch.ch-shibboleth.xml
+++ /dev/null
@@ -1,127 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://attribute-viewer.aai.switch.ch/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://rr.aai.switch.ch/" registrationInstant="2014-08-22T14:42:24Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.switch.ch/aai/federation/switchaai/metadata-registration-practice-statement-20110711.txt</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </Extensions>
-  <SPSSODescriptor errorURL="http://www.switch.ch/aai/support/help" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
-    <Extensions>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="de">AAI Attributes Viewer</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">AAI Attributes Viewer</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="fr">AAI Attributes Viewer</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="it">AAI Attributes Viewer</mdui:DisplayName>
-        <mdui:Description xml:lang="de">Zeigt zu Test und Informationszwecken alle Attribute eines Benutzers.</mdui:Description>
-        <mdui:Description xml:lang="en">Displays all available attributes of a user for debugging and informational purposes.</mdui:Description>
-        <mdui:Description xml:lang="fr">Présente tous les attributs d'un utilisateur pour tester et pour obtenir des renseignements.</mdui:Description>
-        <mdui:Description xml:lang="it">Ha tutti gli attributi di un utente per testare e per ottenere informazioni.</mdui:Description>
-        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAACF0RVh0U29mdHdhcmUAR3JhcGhpY0NvbnZlcnRlciAoSW50ZWwpd4f6GQAAAZJJREFUeJyUk08og2Ecx5+SHNSW/DtQlHKg1MhByjIpLRNx0NZKk0kbbSStHXZdHOVP4bCi5swuXNxQLjiN5UBNc1AzbeR936/39zz7c7B/Dt+e31PP9/P8ft/3eRkARpKPnVDuQsjsy1W2kA8skKwM8tEsEH8tG5QDqEZpqZILdgblbB34+igJygG2RrlRWqsXcqi1pwXKdaAoJLehtk99kJa1wkxrupb9OihPl3lBf6kqiPLg3ThER3BVCRDl8/aI4oC0lFhYGOyiG9nTKIAECjqzQZdMmVqnEbBaAfi0gLeaQ6grGrkkIPqexJjFi+E+PSZGTDANGjHQq8dQdz8CPndhY+Q5hjnPPlirGazDBta5CNakrrVmmGybiETj+UegG3cOz8Gap4V6FgSgYRLthhXcP7zkDzH1/cONmjYrP8xNXXZea9Q6dHELOlPwM1pX98BqxoWRpLZep5uHf/cEic9UwceULaZc22LetGj+eCJZ/lOmYBgzwDizAQrw3z+T2x/E1U24bGNGvwAAAP//AwCkGcs+iePLFQAAAABJRU5ErkJggg==</mdui:Logo>
-        <mdui:Logo height="60" width="80">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFAAAAA8CAIAAAB+RarbAAAC0GlDQ1BJQ0NQcm9maWxlAAB4nI2Uz0sUYRjHv7ONGChBYGZ7iKFDSKhMFmVE5a6/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+hkAAAaRSURBVHic7JZpUFNXFMf92A+dsR8ECrQ6Fq2tlVVELVQEZLNaoSwV1FEsy6CMuyJhFRAQQiAJEBCIiCigaAUFFARZlE0EAReoiiCgLGUnJIQktyc8GpKXSPnUzjzefzKZ9+4979z7u/fcc+4StMi05P+ewH8tEpjoIoGJLhKY6CKBiS4SmOgigYkuEpjoIoGJLhKY6CKBia5FDMyZnLpT/Nzl+FXbgykObmw719TopLKe3hHoEolE2bkN9NTy8XGe9Me37zUHUQu7P4pt0EgHqo5EnRUy7qd56CkLteXBo0AovJRZc7f4BdbTNzAenfgwKqEkGn6sUkZKGS3pYRSrlMoqjaAX5z94Ie3mz/Z+WkrZbs/LtgdT7VzZ9m7snPxnXN60xIA/LUjOqCoqb5UnnOTykzKrwLMM8NgEz9krfc2WsF0uKY4elxzg535J35q63opa19gJBtl5jUqavuysGmlfj2rffrb8hBclR/xSehrRl6G+JpnRXuUg2lL0Oh8ep/gCw12xHt7XsZ62t31We1iWzizrPYnmTqyVm4MNdtC270uycmaZOcZFJpTMrphAeJ5e9K1RqJFNrL27GNXBnf2LS7LGjyFup7N4U9MSKj3LqFMhufLAg8McGHfpGm8ZYFjdlZuCi8tbBQKhxLS98y/tbRfcz2RjA8MCw+uHvlFpdyfP3f58tU99eSliqaOSkzJD8UZR2kZ0yw4JhdgmGNsxvHxzsE6hSARbxOXxebzpzu4hLbMLjNRyWBRogR8YY2aFZa/U1wcw2RVDIxyJY5hkes4TNV3/ipo3EmCDn6O9z+cpBDa2Y6rrBcgAw/Js+ZU5OsbFWZ8Nu+PpcwN7rn/2/iv9QL/IfGkD4FfXjzhmswOlrUGjnTIf1zMR7QvUXYW94YBxTtaZRsRcfCjfFRxzD7rGJ3i49o6uQY3NwUlXZp1zuPwN8wEz8MBGtnSIXtzugSBmpI/KmdC8FRuDnrd+lLahJtd4WpqipxHSjSLOAErUQAVukpZ5gCFTiIGTFAAHUAuM7ZmSDZcItjS/5Pnr9n7J64bt0ZSIO/IexiemTOzjVHX9ZYAhXcHuuRy/llfUUv30XW1jR/PLnvc9w9NSEQ7q6hleaxJ+8ESmSCiSNA6M8K/QqIjbK20pqAwRMVTRYNscMF8MfJiieIe1tl1QuMOB1AITxzh5YJy4XP6mnTG/n8x80tQJk5f8IAGVVLZt3hmjrOkrAwzKvd8CWcHQhg5faptH6phH/mASbr47obahQ9p1fNojFR2/4oq5fMgXoJrCXNHU+JwRcDJVURlF+sP5Qrp3RNMsgqYI2D+qwHQBwLDDP9nSVxmG6lqIZ65jESl+mHkGllWGIV/rB+KB0Uz5gS+HRyY/9o3CIamsfQvwkEVhcyQ2E5wpM8d4C6cEKGNYy+PG3qD99ujV5TlHxUdErFVorGuhwDM7HK0opAOphaaO8QsB3riDdjTg1sDgRO/AWG//GPbfNzDW+qYP1gK/w4+ftDe2dPOnhThHUCchMw8OT0g33n3wUlnbDytRsEZ7j988tssCXd2AuEPi7v5mxFAV1DFwruY/w5/a4aDoQghI4MG1Q6KGip2V24C9cmbOsE+4gjM8PDq51V4uSytr+ULuhj6cNTO1HIBh2XCDOR1K17WIgliorn+nph+SwWCgBGVUFwMrgHKdEVsP8YYWDoyFtMKkFRp7/3vjMMi0uHZILlBZvPxmvc2WpTAFwFhZUsMlLbhvrDYKrW2QqSucSf5vnmmmDnHSIY2pvun9CoMgmM2ew+lwbRBn8gJXxNJAzWmIoYKa2PID/2tI0xQB3y9rVdMLyLhZh2uvqn+33CAoPq1SFnjBZamza8h6byKcctdTWYd8bnh4Z3ucybZwZsEqZN1ukPeCZkr0lzr+yw3OQYYXvw+9RqxvEF0FXdsmvnLICS4VRjb0Q/9UdWlBSK/dGhadWCrfBWsNdxuYBlwEYVZwC4KJ7TuSsXZrOOSRrg/DmBmEtJ5V1OlP3LRg3GXrKDLA4gmPcJipFbqWkUpaFGUtP0jFTofTG5q75F1ggqJ14NhVmM1cRqlnirKtUXuRQnswOxH0R2xyuXwXHJn9RzOu5yleWaFQlHuv5TvjMCVNioq2n9I6CgQ5hMOQVJzDfcHz7PWLGdXyn4+N847637Q5kIwHXiQigYkuEpjoIoGJLhKY6CKBiS4SmOgigYkuEpjoIoGJLhKY6CKBia5FB/w3AAAA//8DABFh2N/+esWhAAAAAElFTkSuQmCC</mdui:Logo>
-        <mdui:InformationURL xml:lang="it">https://attribute-viewer.aai.switch.ch/?lang=it</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="fr">https://attribute-viewer.aai.switch.ch/?lang=fr</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">https://attribute-viewer.aai.switch.ch/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="de">https://attribute-viewer.aai.switch.ch/?lang=de</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="fr">https://attribute-viewer.aai.switch.ch/privacy_statement.php?lang=fr</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://attribute-viewer.aai.switch.ch/privacy_statement.php</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="de">https://attribute-viewer.aai.switch.ch/privacy_statement.php?lang=de</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="it">https://attribute-viewer.aai.switch.ch/privacy_statement.php?lang=it</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDVDCCAjygAwIBAgIJAKGvh4Rjh+jgMA0GCSqGSIb3DQEBBQUAMCkxJzAlBgNV
-BAMTHmF0dHJpYnV0ZS12aWV3ZXIuYWFpLnN3aXRjaC5jaDAeFw0xNDA1MTQxNDQ1
-MzhaFw0xNzA1MTMxNDQ1MzhaMCkxJzAlBgNVBAMTHmF0dHJpYnV0ZS12aWV3ZXIu
-YWFpLnN3aXRjaC5jaDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAK7w
-bFh51f8XC/y1CJiXg32dC1TojB6F7RHxRuxpPuNh/zp9/7kWStnddGaaOtw9e2fU
-Q/BOe+ztIT5njJ34lKJqfY4mFj3SbuKjDEBk24o/M15IWTLR+0qx5l0uc/U/CSqu
-2wqS6H6u0BMfuRVGFM8NWXJ55SeKBLXbKJVyboweP2pO5AyRBXZHsM8ZEue9hKbn
-qTrXCMS//OfzLarQ7baYtHr+nRbcihJWa2xa+5swiOuf5vEG6sKJT7NbtVbI5b1v
-tzPiCH36ACSHaKkDMsPGCeu5ectunqxQWbufLijzvurKf7EHilIhNvfT+63CIfCp
-t5ViglqeiMJ1tDqham8CAwEAAaN/MH0wXAYDVR0RBFUwU4IeYXR0cmlidXRlLXZp
-ZXdlci5hYWkuc3dpdGNoLmNohjFodHRwczovL2F0dHJpYnV0ZS12aWV3ZXIuYWFp
-LnN3aXRjaC5jaC9zaGliYm9sZXRoMB0GA1UdDgQWBBSDmwCkWamUzbmbv6h8wpic
-9PoE7jANBgkqhkiG9w0BAQUFAAOCAQEAms0jw2xzz2dsT+y1sG6Omc9idxl2ffzf
-Km6t4tEACaDFWxGhP1xGZ9omE+UyuiftW8Tj/8+c4bVUTd/UhhiIdkmhld5M7awF
-8xtzM979p+uL5abezo5D/8O4IYFWpHZdQ+VSl/Wr9tc9N6dmB5c0xzUm4/YzCaNz
-anih2XoBQzYD8ZpxYWopH/Uwt6KiUf9TV92rR2EkmZloH3HyfxdmaOIxQU1boi8e
-GCyqkxNBftgYk65n7Yn5UVBeUr7IBTmzXLFmluhpNYmcslYf/ClArFLNGhHpI5F0
-UDgBXcQzpXHOg7ks4xbcEPCe0gaQhOKyWjMDALDCmiA7f7/Rnam3CA==
-						</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://attribute-viewer.aai.switch.ch/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://attribute-viewer.aai.switch.ch/Shibboleth.sso/SAML2/Artifact" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://attribute-viewer.aai.switch.ch/Shibboleth.sso/SAML2/ECP" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://attribute-viewer.aai.switch.ch/Shibboleth.sso/SAML/POST" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://attribute-viewer.aai.switch.ch/Shibboleth.sso/SAML/Artifact" index="5"/>
-    <AttributeConsumingService index="1">
-      <ServiceName xml:lang="de">AAI Attributes Viewer</ServiceName>
-      <ServiceName xml:lang="en">AAI Attributes Viewer</ServiceName>
-      <ServiceName xml:lang="fr">AAI Attributes Viewer</ServiceName>
-      <ServiceName xml:lang="it">AAI Attributes Viewer</ServiceName>
-      <ServiceDescription xml:lang="de">Zeigt zu Test und Informationszwecken alle Attribute eines Benutzers.</ServiceDescription>
-      <ServiceDescription xml:lang="en">Displays all available attributes of a user for debugging and informational purposes.</ServiceDescription>
-      <ServiceDescription xml:lang="fr">Présente tous les attributs d'un utilisateur pour tester et pour obtenir des renseignements.</ServiceDescription>
-      <ServiceDescription xml:lang="it">Ha tutti gli attributi di un utente per testare e per ottenere informazioni.</ServiceDescription>
-      <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" isRequired="true"/>
-      <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="homePostalAddress" Name="urn:oid:0.9.2342.19200300.100.1.39" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <RequestedAttribute FriendlyName="postalAddress" Name="urn:oid:2.5.4.16" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <RequestedAttribute FriendlyName="homePhone" Name="urn:oid:0.9.2342.19200300.100.1.20" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <RequestedAttribute FriendlyName="telephoneNumber" Name="urn:oid:2.5.4.20" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <RequestedAttribute FriendlyName="mobile" Name="urn:oid:0.9.2342.19200300.100.1.41" 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="true"/>
-      <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" isRequired="true"/>
-      <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" isRequired="true"/>
-      <RequestedAttribute FriendlyName="eduPersonEntitlement" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.7" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <RequestedAttribute FriendlyName="surname" Name="urn:oid:2.5.4.4" 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" 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="employeeNumber" Name="urn:oid:2.16.840.1.113730.3.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <RequestedAttribute FriendlyName="ou" Name="urn:oid:2.5.4.11" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <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="eduPersonAssurance" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.11" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <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="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" isRequired="true"/>
-      <RequestedAttribute FriendlyName="primaryGroupID" Name="urn:oid:1.3.6.1.4.1.7165.2.1.15" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <RequestedAttribute FriendlyName="isMemberOf" Name="urn:oid:1.3.6.1.4.1.5923.1.5.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <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" isRequired="true"/>
-      <RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <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" 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="commonName" Name="urn:oid:2.5.4.3" 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"/>
-      <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"/>
-    </AttributeConsumingService>
-  </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>
-    <SurName>Team</SurName>
-    <EmailAddress>mailto:aai@switch.ch</EmailAddress>
-    <TelephoneNumber>+41 44 268 15 05</TelephoneNumber>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>SWITCHaai</GivenName>
-    <SurName>Team</SurName>
-    <EmailAddress>mailto:aai@switch.ch</EmailAddress>
-    <TelephoneNumber>+41 44 268 15 05</TelephoneNumber>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/attribute-viewer.aai.switch.ch.xml b/swamid-interfederations-2.0/attribute-viewer.aai.switch.ch.xml
deleted file mode 100644
index 1ff79ed9..00000000
--- a/swamid-interfederations-2.0/attribute-viewer.aai.switch.ch.xml
+++ /dev/null
@@ -1,127 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://attribute-viewer.aai.switch.ch/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://rr.aai.switch.ch/" registrationInstant="2014-08-22T14:42:24Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.switch.ch/aai/federation/switchaai/metadata-registration-practice-statement-20110711.txt</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </Extensions>
-  <SPSSODescriptor errorURL="http://www.switch.ch/aai/support/help" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
-    <Extensions>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="de">AAI Attributes Viewer</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">AAI Attributes Viewer</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="fr">AAI Attributes Viewer</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="it">AAI Attributes Viewer</mdui:DisplayName>
-        <mdui:Description xml:lang="de">Zeigt zu Test und Informationszwecken alle Attribute eines Benutzers.</mdui:Description>
-        <mdui:Description xml:lang="en">Displays all available attributes of a user for debugging and informational purposes.</mdui:Description>
-        <mdui:Description xml:lang="fr">Présente tous les attributs d'un utilisateur pour tester et pour obtenir des renseignements.</mdui:Description>
-        <mdui:Description xml:lang="it">Ha tutti gli attributi di un utente per testare e per ottenere informazioni.</mdui:Description>
-        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAACF0RVh0U29mdHdhcmUAR3JhcGhpY0NvbnZlcnRlciAoSW50ZWwpd4f6GQAAAZJJREFUeJyUk08og2Ecx5+SHNSW/DtQlHKg1MhByjIpLRNx0NZKk0kbbSStHXZdHOVP4bCi5swuXNxQLjiN5UBNc1AzbeR936/39zz7c7B/Dt+e31PP9/P8ft/3eRkARpKPnVDuQsjsy1W2kA8skKwM8tEsEH8tG5QDqEZpqZILdgblbB34+igJygG2RrlRWqsXcqi1pwXKdaAoJLehtk99kJa1wkxrupb9OihPl3lBf6kqiPLg3ThER3BVCRDl8/aI4oC0lFhYGOyiG9nTKIAECjqzQZdMmVqnEbBaAfi0gLeaQ6grGrkkIPqexJjFi+E+PSZGTDANGjHQq8dQdz8CPndhY+Q5hjnPPlirGazDBta5CNakrrVmmGybiETj+UegG3cOz8Gap4V6FgSgYRLthhXcP7zkDzH1/cONmjYrP8xNXXZea9Q6dHELOlPwM1pX98BqxoWRpLZep5uHf/cEic9UwceULaZc22LetGj+eCJZ/lOmYBgzwDizAQrw3z+T2x/E1U24bGNGvwAAAP//AwCkGcs+iePLFQAAAABJRU5ErkJggg==</mdui:Logo>
-        <mdui:Logo height="60" width="80">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFAAAAA8CAIAAAB+RarbAAAC0GlDQ1BJQ0NQcm9maWxlAAB4nI2Uz0sUYRjHv7ONGChBYGZ7iKFDSKhMFmVE5a6/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+hkAAAaRSURBVHic7JZpUFNXFMf92A+dsR8ECrQ6Fq2tlVVELVQEZLNaoSwV1FEsy6CMuyJhFRAQQiAJEBCIiCigaAUFFARZlE0EAReoiiCgLGUnJIQktyc8GpKXSPnUzjzefzKZ9+4979z7u/fcc+4StMi05P+ewH8tEpjoIoGJLhKY6CKBiS4SmOgigYkuEpjoIoGJLhKY6CKBia5FDMyZnLpT/Nzl+FXbgykObmw719TopLKe3hHoEolE2bkN9NTy8XGe9Me37zUHUQu7P4pt0EgHqo5EnRUy7qd56CkLteXBo0AovJRZc7f4BdbTNzAenfgwKqEkGn6sUkZKGS3pYRSrlMoqjaAX5z94Ie3mz/Z+WkrZbs/LtgdT7VzZ9m7snPxnXN60xIA/LUjOqCoqb5UnnOTykzKrwLMM8NgEz9krfc2WsF0uKY4elxzg535J35q63opa19gJBtl5jUqavuysGmlfj2rffrb8hBclR/xSehrRl6G+JpnRXuUg2lL0Oh8ep/gCw12xHt7XsZ62t31We1iWzizrPYnmTqyVm4MNdtC270uycmaZOcZFJpTMrphAeJ5e9K1RqJFNrL27GNXBnf2LS7LGjyFup7N4U9MSKj3LqFMhufLAg8McGHfpGm8ZYFjdlZuCi8tbBQKhxLS98y/tbRfcz2RjA8MCw+uHvlFpdyfP3f58tU99eSliqaOSkzJD8UZR2kZ0yw4JhdgmGNsxvHxzsE6hSARbxOXxebzpzu4hLbMLjNRyWBRogR8YY2aFZa/U1wcw2RVDIxyJY5hkes4TNV3/ipo3EmCDn6O9z+cpBDa2Y6rrBcgAw/Js+ZU5OsbFWZ8Nu+PpcwN7rn/2/iv9QL/IfGkD4FfXjzhmswOlrUGjnTIf1zMR7QvUXYW94YBxTtaZRsRcfCjfFRxzD7rGJ3i49o6uQY3NwUlXZp1zuPwN8wEz8MBGtnSIXtzugSBmpI/KmdC8FRuDnrd+lLahJtd4WpqipxHSjSLOAErUQAVukpZ5gCFTiIGTFAAHUAuM7ZmSDZcItjS/5Pnr9n7J64bt0ZSIO/IexiemTOzjVHX9ZYAhXcHuuRy/llfUUv30XW1jR/PLnvc9w9NSEQ7q6hleaxJ+8ESmSCiSNA6M8K/QqIjbK20pqAwRMVTRYNscMF8MfJiieIe1tl1QuMOB1AITxzh5YJy4XP6mnTG/n8x80tQJk5f8IAGVVLZt3hmjrOkrAwzKvd8CWcHQhg5faptH6phH/mASbr47obahQ9p1fNojFR2/4oq5fMgXoJrCXNHU+JwRcDJVURlF+sP5Qrp3RNMsgqYI2D+qwHQBwLDDP9nSVxmG6lqIZ65jESl+mHkGllWGIV/rB+KB0Uz5gS+HRyY/9o3CIamsfQvwkEVhcyQ2E5wpM8d4C6cEKGNYy+PG3qD99ujV5TlHxUdErFVorGuhwDM7HK0opAOphaaO8QsB3riDdjTg1sDgRO/AWG//GPbfNzDW+qYP1gK/w4+ftDe2dPOnhThHUCchMw8OT0g33n3wUlnbDytRsEZ7j988tssCXd2AuEPi7v5mxFAV1DFwruY/w5/a4aDoQghI4MG1Q6KGip2V24C9cmbOsE+4gjM8PDq51V4uSytr+ULuhj6cNTO1HIBh2XCDOR1K17WIgliorn+nph+SwWCgBGVUFwMrgHKdEVsP8YYWDoyFtMKkFRp7/3vjMMi0uHZILlBZvPxmvc2WpTAFwFhZUsMlLbhvrDYKrW2QqSucSf5vnmmmDnHSIY2pvun9CoMgmM2ew+lwbRBn8gJXxNJAzWmIoYKa2PID/2tI0xQB3y9rVdMLyLhZh2uvqn+33CAoPq1SFnjBZamza8h6byKcctdTWYd8bnh4Z3ucybZwZsEqZN1ukPeCZkr0lzr+yw3OQYYXvw+9RqxvEF0FXdsmvnLICS4VRjb0Q/9UdWlBSK/dGhadWCrfBWsNdxuYBlwEYVZwC4KJ7TuSsXZrOOSRrg/DmBmEtJ5V1OlP3LRg3GXrKDLA4gmPcJipFbqWkUpaFGUtP0jFTofTG5q75F1ggqJ14NhVmM1cRqlnirKtUXuRQnswOxH0R2xyuXwXHJn9RzOu5yleWaFQlHuv5TvjMCVNioq2n9I6CgQ5hMOQVJzDfcHz7PWLGdXyn4+N847637Q5kIwHXiQigYkuEpjoIoGJLhKY6CKBiS4SmOgigYkuEpjoIoGJLhKY6CKBia5FB/w3AAAA//8DABFh2N/+esWhAAAAAElFTkSuQmCC</mdui:Logo>
-        <mdui:InformationURL xml:lang="it">https://attribute-viewer.aai.switch.ch/?lang=it</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="fr">https://attribute-viewer.aai.switch.ch/?lang=fr</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">https://attribute-viewer.aai.switch.ch/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="de">https://attribute-viewer.aai.switch.ch/?lang=de</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="fr">https://attribute-viewer.aai.switch.ch/privacy_statement.php?lang=fr</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://attribute-viewer.aai.switch.ch/privacy_statement.php</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="de">https://attribute-viewer.aai.switch.ch/privacy_statement.php?lang=de</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="it">https://attribute-viewer.aai.switch.ch/privacy_statement.php?lang=it</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDVDCCAjygAwIBAgIJAKGvh4Rjh+jgMA0GCSqGSIb3DQEBBQUAMCkxJzAlBgNV
-BAMTHmF0dHJpYnV0ZS12aWV3ZXIuYWFpLnN3aXRjaC5jaDAeFw0xNDA1MTQxNDQ1
-MzhaFw0xNzA1MTMxNDQ1MzhaMCkxJzAlBgNVBAMTHmF0dHJpYnV0ZS12aWV3ZXIu
-YWFpLnN3aXRjaC5jaDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAK7w
-bFh51f8XC/y1CJiXg32dC1TojB6F7RHxRuxpPuNh/zp9/7kWStnddGaaOtw9e2fU
-Q/BOe+ztIT5njJ34lKJqfY4mFj3SbuKjDEBk24o/M15IWTLR+0qx5l0uc/U/CSqu
-2wqS6H6u0BMfuRVGFM8NWXJ55SeKBLXbKJVyboweP2pO5AyRBXZHsM8ZEue9hKbn
-qTrXCMS//OfzLarQ7baYtHr+nRbcihJWa2xa+5swiOuf5vEG6sKJT7NbtVbI5b1v
-tzPiCH36ACSHaKkDMsPGCeu5ectunqxQWbufLijzvurKf7EHilIhNvfT+63CIfCp
-t5ViglqeiMJ1tDqham8CAwEAAaN/MH0wXAYDVR0RBFUwU4IeYXR0cmlidXRlLXZp
-ZXdlci5hYWkuc3dpdGNoLmNohjFodHRwczovL2F0dHJpYnV0ZS12aWV3ZXIuYWFp
-LnN3aXRjaC5jaC9zaGliYm9sZXRoMB0GA1UdDgQWBBSDmwCkWamUzbmbv6h8wpic
-9PoE7jANBgkqhkiG9w0BAQUFAAOCAQEAms0jw2xzz2dsT+y1sG6Omc9idxl2ffzf
-Km6t4tEACaDFWxGhP1xGZ9omE+UyuiftW8Tj/8+c4bVUTd/UhhiIdkmhld5M7awF
-8xtzM979p+uL5abezo5D/8O4IYFWpHZdQ+VSl/Wr9tc9N6dmB5c0xzUm4/YzCaNz
-anih2XoBQzYD8ZpxYWopH/Uwt6KiUf9TV92rR2EkmZloH3HyfxdmaOIxQU1boi8e
-GCyqkxNBftgYk65n7Yn5UVBeUr7IBTmzXLFmluhpNYmcslYf/ClArFLNGhHpI5F0
-UDgBXcQzpXHOg7ks4xbcEPCe0gaQhOKyWjMDALDCmiA7f7/Rnam3CA==
-						</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://attribute-viewer.aai.switch.ch/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://attribute-viewer.aai.switch.ch/Shibboleth.sso/SAML2/Artifact" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://attribute-viewer.aai.switch.ch/Shibboleth.sso/SAML2/ECP" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://attribute-viewer.aai.switch.ch/Shibboleth.sso/SAML/POST" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://attribute-viewer.aai.switch.ch/Shibboleth.sso/SAML/Artifact" index="5"/>
-    <AttributeConsumingService index="1">
-      <ServiceName xml:lang="de">AAI Attributes Viewer</ServiceName>
-      <ServiceName xml:lang="en">AAI Attributes Viewer</ServiceName>
-      <ServiceName xml:lang="fr">AAI Attributes Viewer</ServiceName>
-      <ServiceName xml:lang="it">AAI Attributes Viewer</ServiceName>
-      <ServiceDescription xml:lang="de">Zeigt zu Test und Informationszwecken alle Attribute eines Benutzers.</ServiceDescription>
-      <ServiceDescription xml:lang="en">Displays all available attributes of a user for debugging and informational purposes.</ServiceDescription>
-      <ServiceDescription xml:lang="fr">Présente tous les attributs d'un utilisateur pour tester et pour obtenir des renseignements.</ServiceDescription>
-      <ServiceDescription xml:lang="it">Ha tutti gli attributi di un utente per testare e per ottenere informazioni.</ServiceDescription>
-      <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" isRequired="true"/>
-      <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="homePostalAddress" Name="urn:oid:0.9.2342.19200300.100.1.39" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <RequestedAttribute FriendlyName="postalAddress" Name="urn:oid:2.5.4.16" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <RequestedAttribute FriendlyName="homePhone" Name="urn:oid:0.9.2342.19200300.100.1.20" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <RequestedAttribute FriendlyName="telephoneNumber" Name="urn:oid:2.5.4.20" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <RequestedAttribute FriendlyName="mobile" Name="urn:oid:0.9.2342.19200300.100.1.41" 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="true"/>
-      <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" isRequired="true"/>
-      <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" isRequired="true"/>
-      <RequestedAttribute FriendlyName="eduPersonEntitlement" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.7" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <RequestedAttribute FriendlyName="surname" Name="urn:oid:2.5.4.4" 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" 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="employeeNumber" Name="urn:oid:2.16.840.1.113730.3.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <RequestedAttribute FriendlyName="ou" Name="urn:oid:2.5.4.11" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <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="eduPersonAssurance" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.11" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <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="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" isRequired="true"/>
-      <RequestedAttribute FriendlyName="primaryGroupID" Name="urn:oid:1.3.6.1.4.1.7165.2.1.15" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <RequestedAttribute FriendlyName="isMemberOf" Name="urn:oid:1.3.6.1.4.1.5923.1.5.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <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" isRequired="true"/>
-      <RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <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" 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="commonName" Name="urn:oid:2.5.4.3" 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"/>
-      <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"/>
-    </AttributeConsumingService>
-  </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>
-    <SurName>Team</SurName>
-    <EmailAddress>mailto:aai@switch.ch</EmailAddress>
-    <TelephoneNumber>+41 44 268 15 05</TelephoneNumber>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>SWITCHaai</GivenName>
-    <SurName>Team</SurName>
-    <EmailAddress>mailto:aai@switch.ch</EmailAddress>
-    <TelephoneNumber>+41 44 268 15 05</TelephoneNumber>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/auth.agrosupdijon.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/auth.agrosupdijon.fr-idp-shibboleth.xml
deleted file mode 100644
index 24cd2eb7..00000000
--- a/swamid-interfederations-2.0/auth.agrosupdijon.fr-idp-shibboleth.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://auth.agrosupdijon.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2014-05-09T14:10:41Z">
-      <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">agrosupdijon.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Agrosup DIJON INSSAAE</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Students</mdui:Description>
-        <mdui:DisplayName xml:lang="fr">Agrosup DIJON INSSAAE</mdui:DisplayName>
-        <mdui:Description xml:lang="fr">Enseignants ; chercheurs ; documentalistes ; étudiants</mdui:Description>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDPDCCAiSgAwIBAgIVAN9nAc/jY36hxrK5oQ/KqjAbjnCMMA0GCSqGSIb3DQEB
-BQUAMB8xHTAbBgNVBAMTFGF1dGguYWdyb3N1cGRpam9uLmZyMB4XDTE0MDUxMjA5
-NDYzNloXDTM0MDUxMjA5NDYzNlowHzEdMBsGA1UEAxMUYXV0aC5hZ3Jvc3VwZGlq
-b24uZnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCdf0IvLcqavsNY
-cZ/SvKmM3KdjpOBdc0FsdBOJRCV/uQauirZSxE9VgE2MGTvVMPt2L9nR+JMznDpA
-1GKo6oUAIXhBE9BNZCG390qAFOXxrvqkULqWxcLh0r4S3fIedq8rLUab9NVnYwN8
-hvOeZQBO06ocmFbtkJjLGUwGqBqTW5PtUV3X0Zh9EXhY+ViruutXIGzyilH+b6eI
-836I5F0MDXE8oHboau6+w4sP977QLJbQU8xXmw2QloSFpkThoJ0ExGwJmtgVQYEN
-cPSSVQI80UeAmLvPQIqo8H0ebJAWLumL4z01W1/Zm4IMTp04R252U7FbDLTEiZRG
-78e/qIHBAgMBAAGjbzBtMEwGA1UdEQRFMEOCFGF1dGguYWdyb3N1cGRpam9uLmZy
-hitodHRwczovL2F1dGguYWdyb3N1cGRpam9uLmZyL2lkcC9zaGliYm9sZXRoMB0G
-A1UdDgQWBBSmpVNWWBQe7203DC0x0nDL0wh/BDANBgkqhkiG9w0BAQUFAAOCAQEA
-Yv95oCB4bPj/ltSf9StUpnJ2z+y2XnVisIpcIsWE5IUJtfza7V0OwO71Ey/GCSKx
-kubwUxJHO1eTdzkce1ajnWW0s7oimDyBalnd+uLG5fESVtAme4hdMrfHVxka10b1
-liQbtPIneokIW/Z4W7h1PUmU+z435uZkJZhQjNbfOtiVhe/7c+ETyVy9LH1SKtLF
-TcyS0/H/Q8cq6DNdeFTwXHFcPRGrFLIFOYN0O/91Fm594fY4tSRF9rXnWZkmBDf0
-esBdxlabPOobsW4ezBttykeeWzbjGEQe6pQQuhnSYOR3du1zAuDmbSosyY2EWqCE
-iN6XFe4H5SWBUGO/Kgpxzg==
-					    </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://auth.agrosupdijon.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://auth.agrosupdijon.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://auth.agrosupdijon.fr/idp/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Agrosup DIJON INSSAAE</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Agrosup DIJON INSSAAE</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <EmailAddress>hostmaster@agrosupdijon.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/auth.agrosupdijon.fr.xml b/swamid-interfederations-2.0/auth.agrosupdijon.fr.xml
deleted file mode 100644
index 24cd2eb7..00000000
--- a/swamid-interfederations-2.0/auth.agrosupdijon.fr.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://auth.agrosupdijon.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2014-05-09T14:10:41Z">
-      <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">agrosupdijon.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Agrosup DIJON INSSAAE</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Students</mdui:Description>
-        <mdui:DisplayName xml:lang="fr">Agrosup DIJON INSSAAE</mdui:DisplayName>
-        <mdui:Description xml:lang="fr">Enseignants ; chercheurs ; documentalistes ; étudiants</mdui:Description>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDPDCCAiSgAwIBAgIVAN9nAc/jY36hxrK5oQ/KqjAbjnCMMA0GCSqGSIb3DQEB
-BQUAMB8xHTAbBgNVBAMTFGF1dGguYWdyb3N1cGRpam9uLmZyMB4XDTE0MDUxMjA5
-NDYzNloXDTM0MDUxMjA5NDYzNlowHzEdMBsGA1UEAxMUYXV0aC5hZ3Jvc3VwZGlq
-b24uZnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCdf0IvLcqavsNY
-cZ/SvKmM3KdjpOBdc0FsdBOJRCV/uQauirZSxE9VgE2MGTvVMPt2L9nR+JMznDpA
-1GKo6oUAIXhBE9BNZCG390qAFOXxrvqkULqWxcLh0r4S3fIedq8rLUab9NVnYwN8
-hvOeZQBO06ocmFbtkJjLGUwGqBqTW5PtUV3X0Zh9EXhY+ViruutXIGzyilH+b6eI
-836I5F0MDXE8oHboau6+w4sP977QLJbQU8xXmw2QloSFpkThoJ0ExGwJmtgVQYEN
-cPSSVQI80UeAmLvPQIqo8H0ebJAWLumL4z01W1/Zm4IMTp04R252U7FbDLTEiZRG
-78e/qIHBAgMBAAGjbzBtMEwGA1UdEQRFMEOCFGF1dGguYWdyb3N1cGRpam9uLmZy
-hitodHRwczovL2F1dGguYWdyb3N1cGRpam9uLmZyL2lkcC9zaGliYm9sZXRoMB0G
-A1UdDgQWBBSmpVNWWBQe7203DC0x0nDL0wh/BDANBgkqhkiG9w0BAQUFAAOCAQEA
-Yv95oCB4bPj/ltSf9StUpnJ2z+y2XnVisIpcIsWE5IUJtfza7V0OwO71Ey/GCSKx
-kubwUxJHO1eTdzkce1ajnWW0s7oimDyBalnd+uLG5fESVtAme4hdMrfHVxka10b1
-liQbtPIneokIW/Z4W7h1PUmU+z435uZkJZhQjNbfOtiVhe/7c+ETyVy9LH1SKtLF
-TcyS0/H/Q8cq6DNdeFTwXHFcPRGrFLIFOYN0O/91Fm594fY4tSRF9rXnWZkmBDf0
-esBdxlabPOobsW4ezBttykeeWzbjGEQe6pQQuhnSYOR3du1zAuDmbSosyY2EWqCE
-iN6XFe4H5SWBUGO/Kgpxzg==
-					    </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://auth.agrosupdijon.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://auth.agrosupdijon.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://auth.agrosupdijon.fr/idp/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Agrosup DIJON INSSAAE</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Agrosup DIJON INSSAAE</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <EmailAddress>hostmaster@agrosupdijon.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/auth.crous-versailles.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/auth.crous-versailles.fr-idp-shibboleth.xml
deleted file mode 100644
index b8848a37..00000000
--- a/swamid-interfederations-2.0/auth.crous-versailles.fr-idp-shibboleth.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://auth.crous-versailles.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2013-02-22T11:00:25Z">
-      <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">crous-versailles.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">CROUS Versailles - Personnels</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIEezCCA2OgAwIBAgIQBQGbJx8ycfocbzaW5m+L4DANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTEzMDEzMTAwMDAwMFoXDTE2MDEzMTIzNTk1OVowTjELMAkGA1UE
-BhMCRlIxHDAaBgNVBAoTE0NST1VTIGRlIFZFUlNBSUxMRVMxITAfBgNVBAMTGGF1
-dGguY3JvdXMtdmVyc2FpbGxlcy5mcjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
-AQoCggEBALT8ahras1SsgYWcRaFEu8/MSACuZsYe74VljdqW/gsn55hUpRSd+hR2
-igczY3H6lmJrnbXMaaOmRwO8OqESSvmqUp6ZLky0UxXpBFf1ouXuBd5Ghis8CD/q
-V5E/loQEVrakpJ0bCtkrEZpFD+4RNSpOOoAQAP4tfz7YM34dal6xCxUBcuy8n5pI
-Jnz5E9UmMAzFLvwr0iNMCR+SBunRFPjlYe+12UHu2cMsKPDWK89hgTfec3w1Tvux
-9/9/NCdRhiyQlnKiAXxmC+TWikrBZ1v9mV5VH9uLmfgRqZjgY648TIzMVVgCC2yo
-d+LTpATPAfmAMeY/uDpqK0IcEAvhtzUCAwEAAaOCAWswggFnMB8GA1UdIwQYMBaA
-FAy9k2gM896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBRm9Gu4ap/VYe37uc/e4QCE
-q4D3gjAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggr
-BgEFBQcDAQYIKwYBBQUHAwIwGAYDVR0gBBEwDzANBgsrBgEEAbIxAQICHTA6BgNV
-HR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNT
-TENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQu
-dGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRw
-Oi8vb2NzcC50Y3MudGVyZW5hLm9yZzAjBgNVHREEHDAaghhhdXRoLmNyb3VzLXZl
-cnNhaWxsZXMuZnIwDQYJKoZIhvcNAQEFBQADggEBABQoWTgD8rOZ2cZ1DFXaR72R
-opGVuKwCxr2HuCD3L17jbfobHbWFVVMjbia5MGUozURJP6XEPFsPR6Gxuv38pI4B
-tySTtMz03p4hXk+q2ldOfQrJ+XergnpU/5r05DkELoqFjXb0qtHm3iUcR1ohRq17
-bApQ08Tt1gGKlZJauC1VqxBoDtYs7mnFLHPz7FOi0jilUsppcj6ph/N3QbBuwb7p
-VJwSJN4NmyTAZv/ErszB2z4hiHxOF/UwX1J38g93MBUSoLx/qMNtJOXkqOt7izen
-+kEx04VnOsKWgTu9oGK57dt1dlLPml8CX9BCHdJ64IL9aTDeJMD2X1IH1/YgJdU=
-					    </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://auth.crous-versailles.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://auth.crous-versailles.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://auth.crous-versailles.fr/idp/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">CROUS Versailles - Personnels</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">CROUS Versailles - Personnels</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <EmailAddress>service.informatique@crous-versailles.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/auth.crous-versailles.fr.xml b/swamid-interfederations-2.0/auth.crous-versailles.fr.xml
deleted file mode 100644
index b8848a37..00000000
--- a/swamid-interfederations-2.0/auth.crous-versailles.fr.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://auth.crous-versailles.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2013-02-22T11:00:25Z">
-      <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">crous-versailles.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">CROUS Versailles - Personnels</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIEezCCA2OgAwIBAgIQBQGbJx8ycfocbzaW5m+L4DANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTEzMDEzMTAwMDAwMFoXDTE2MDEzMTIzNTk1OVowTjELMAkGA1UE
-BhMCRlIxHDAaBgNVBAoTE0NST1VTIGRlIFZFUlNBSUxMRVMxITAfBgNVBAMTGGF1
-dGguY3JvdXMtdmVyc2FpbGxlcy5mcjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
-AQoCggEBALT8ahras1SsgYWcRaFEu8/MSACuZsYe74VljdqW/gsn55hUpRSd+hR2
-igczY3H6lmJrnbXMaaOmRwO8OqESSvmqUp6ZLky0UxXpBFf1ouXuBd5Ghis8CD/q
-V5E/loQEVrakpJ0bCtkrEZpFD+4RNSpOOoAQAP4tfz7YM34dal6xCxUBcuy8n5pI
-Jnz5E9UmMAzFLvwr0iNMCR+SBunRFPjlYe+12UHu2cMsKPDWK89hgTfec3w1Tvux
-9/9/NCdRhiyQlnKiAXxmC+TWikrBZ1v9mV5VH9uLmfgRqZjgY648TIzMVVgCC2yo
-d+LTpATPAfmAMeY/uDpqK0IcEAvhtzUCAwEAAaOCAWswggFnMB8GA1UdIwQYMBaA
-FAy9k2gM896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBRm9Gu4ap/VYe37uc/e4QCE
-q4D3gjAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggr
-BgEFBQcDAQYIKwYBBQUHAwIwGAYDVR0gBBEwDzANBgsrBgEEAbIxAQICHTA6BgNV
-HR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNT
-TENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQu
-dGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRw
-Oi8vb2NzcC50Y3MudGVyZW5hLm9yZzAjBgNVHREEHDAaghhhdXRoLmNyb3VzLXZl
-cnNhaWxsZXMuZnIwDQYJKoZIhvcNAQEFBQADggEBABQoWTgD8rOZ2cZ1DFXaR72R
-opGVuKwCxr2HuCD3L17jbfobHbWFVVMjbia5MGUozURJP6XEPFsPR6Gxuv38pI4B
-tySTtMz03p4hXk+q2ldOfQrJ+XergnpU/5r05DkELoqFjXb0qtHm3iUcR1ohRq17
-bApQ08Tt1gGKlZJauC1VqxBoDtYs7mnFLHPz7FOi0jilUsppcj6ph/N3QbBuwb7p
-VJwSJN4NmyTAZv/ErszB2z4hiHxOF/UwX1J38g93MBUSoLx/qMNtJOXkqOt7izen
-+kEx04VnOsKWgTu9oGK57dt1dlLPml8CX9BCHdJ64IL9aTDeJMD2X1IH1/YgJdU=
-					    </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://auth.crous-versailles.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://auth.crous-versailles.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://auth.crous-versailles.fr/idp/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">CROUS Versailles - Personnels</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">CROUS Versailles - Personnels</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <EmailAddress>service.informatique@crous-versailles.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/auth.mines-paristech.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/auth.mines-paristech.fr-idp-shibboleth.xml
deleted file mode 100644
index 1f18af9d..00000000
--- a/swamid-interfederations-2.0/auth.mines-paristech.fr-idp-shibboleth.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://auth.mines-paristech.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2010-11-05T10:46:47Z">
-      <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">mines-paristech.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">MINES ParisTech</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDUzCCAjugAwIBAgIULpiQTz0SaR3yYl4od7IxCNrwBzUwDQYJKoZIhvcNAQEF
-BQAwJTEjMCEGA1UEAxMaYXV0aC5taW5lcy1wYXJpc3RlY2guZnI6ODAwHhcNMTAw
-NjMwMDg0NTUzWhcNMzAwNjMwMDg0NTUzWjAlMSMwIQYDVQQDExphdXRoLm1pbmVz
-LXBhcmlzdGVjaC5mcjo4MDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
-AMgwMOQgpHeIUXIPrAidenRWJoNDtBbBtJewLYBVXNcjlw48JjYUe4kVAibhvpoB
-GtT/5LDpL7b0f3Dcn79TK1f71KO1NyTReRfE8hahq+9nSfUf9W0g7AE/wzEt/4s2
-oQmhxIaLo/y4d8Jm2gdweX7Zru+e8DmdBfH8XVHEFrleY+iZfHM/RH/uc9hN3XrD
-DFWojw8k+uFBU9MkT8Lw3/qPrCxbMEIcpvrkyDFYiCidJJf9kkSZOBFbfoXMwpyw
-6AUrfax3gCUtN55qexEt/kZlbZr/RWCWRXDlevEHoNm/96j9PntgRFahUALUyhxQ
-BbAx1yzWHRsT5hlPHihht1sCAwEAAaN7MHkwWAYDVR0RBFEwT4IaYXV0aC5taW5l
-cy1wYXJpc3RlY2guZnI6ODCGMWh0dHBzOi8vYXV0aC5taW5lcy1wYXJpc3RlY2gu
-ZnI6ODAvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFEzaglAXYAkaW5DIa13RKccd
-GCGNMA0GCSqGSIb3DQEBBQUAA4IBAQC81N/3UxzYjfCOJPaGkaJmTDkIXPvv45ym
-TCQlISY68bvtWQlf4yGHKW3aLuPZxoCJoGDcYZi4BF2QEPmvQ307GAqJzga3/FlE
-m6QhFpeYnyX6Wa5OEw/EkPj5yMxnymcEO0mWO/oYUnlzmy7yvUR7M+q/wRE2lKHP
-RDLESfEaYEQTniavE4zHDQPTfV0L4tmMMuZ1HrOU7w4kxw6QbHbF74GOC8YCRTDR
-lu66L8LI4yrW5jPq7gDBHSoOwFKbvssCjAdA4qiIU4LkBBspnboZZIP4uNTyp+qg
-SWg2P9PgjSZlwDZkaVgJlTTZJw1mYNCrsOiWjaa7c18O8gcBYmsL
-					    </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://auth.mines-paristech.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://auth.mines-paristech.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://auth.mines-paristech.fr/idp/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">MINES ParisTech</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">MINES ParisTech</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <EmailAddress>federation@mines-paristech.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/auth.mines-paristech.fr.xml b/swamid-interfederations-2.0/auth.mines-paristech.fr.xml
deleted file mode 100644
index 1f18af9d..00000000
--- a/swamid-interfederations-2.0/auth.mines-paristech.fr.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://auth.mines-paristech.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2010-11-05T10:46:47Z">
-      <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">mines-paristech.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">MINES ParisTech</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDUzCCAjugAwIBAgIULpiQTz0SaR3yYl4od7IxCNrwBzUwDQYJKoZIhvcNAQEF
-BQAwJTEjMCEGA1UEAxMaYXV0aC5taW5lcy1wYXJpc3RlY2guZnI6ODAwHhcNMTAw
-NjMwMDg0NTUzWhcNMzAwNjMwMDg0NTUzWjAlMSMwIQYDVQQDExphdXRoLm1pbmVz
-LXBhcmlzdGVjaC5mcjo4MDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
-AMgwMOQgpHeIUXIPrAidenRWJoNDtBbBtJewLYBVXNcjlw48JjYUe4kVAibhvpoB
-GtT/5LDpL7b0f3Dcn79TK1f71KO1NyTReRfE8hahq+9nSfUf9W0g7AE/wzEt/4s2
-oQmhxIaLo/y4d8Jm2gdweX7Zru+e8DmdBfH8XVHEFrleY+iZfHM/RH/uc9hN3XrD
-DFWojw8k+uFBU9MkT8Lw3/qPrCxbMEIcpvrkyDFYiCidJJf9kkSZOBFbfoXMwpyw
-6AUrfax3gCUtN55qexEt/kZlbZr/RWCWRXDlevEHoNm/96j9PntgRFahUALUyhxQ
-BbAx1yzWHRsT5hlPHihht1sCAwEAAaN7MHkwWAYDVR0RBFEwT4IaYXV0aC5taW5l
-cy1wYXJpc3RlY2guZnI6ODCGMWh0dHBzOi8vYXV0aC5taW5lcy1wYXJpc3RlY2gu
-ZnI6ODAvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFEzaglAXYAkaW5DIa13RKccd
-GCGNMA0GCSqGSIb3DQEBBQUAA4IBAQC81N/3UxzYjfCOJPaGkaJmTDkIXPvv45ym
-TCQlISY68bvtWQlf4yGHKW3aLuPZxoCJoGDcYZi4BF2QEPmvQ307GAqJzga3/FlE
-m6QhFpeYnyX6Wa5OEw/EkPj5yMxnymcEO0mWO/oYUnlzmy7yvUR7M+q/wRE2lKHP
-RDLESfEaYEQTniavE4zHDQPTfV0L4tmMMuZ1HrOU7w4kxw6QbHbF74GOC8YCRTDR
-lu66L8LI4yrW5jPq7gDBHSoOwFKbvssCjAdA4qiIU4LkBBspnboZZIP4uNTyp+qg
-SWg2P9PgjSZlwDZkaVgJlTTZJw1mYNCrsOiWjaa7c18O8gcBYmsL
-					    </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://auth.mines-paristech.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://auth.mines-paristech.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://auth.mines-paristech.fr/idp/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">MINES ParisTech</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">MINES ParisTech</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <EmailAddress>federation@mines-paristech.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/auth.services.bmj.com-auth.xml b/swamid-interfederations-2.0/auth.services.bmj.com-auth.xml
deleted file mode 100644
index ea781fce..00000000
--- a/swamid-interfederations-2.0/auth.services.bmj.com-auth.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://auth.services.bmj.com/auth">
-  <!--
-		This is an OpenAthens SP for for BMJ Publishing Group Limited.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2009-08-05T11:42:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </Extensions>
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDqjCCApICCQCaKbK0unVYnjANBgkqhkiG9w0BAQUFADCBljELMAkGA1UEBhMC
-						R0IxEDAOBgNVBAgTB0VuZ2xhbmQxDzANBgNVBAcTBkxvbmRvbjEMMAoGA1UEChMD
-						Qk1KMRMwEQYDVQQLEwpUZWNobm9sb2d5MR4wHAYDVQQDExVhdXRoLnNlcnZpY2Vz
-						LmJtai5jb20xITAfBgkqhkiG9w0BCQEWEm9wZXJhdGlvbnNAYm1qLmNvbTAeFw0x
-						NDA3MTAxMzEyMzNaFw0yNDA3MDkxMzEyMzNaMIGWMQswCQYDVQQGEwJHQjEQMA4G
-						A1UECBMHRW5nbGFuZDEPMA0GA1UEBxMGTG9uZG9uMQwwCgYDVQQKEwNCTUoxEzAR
-						BgNVBAsTClRlY2hub2xvZ3kxHjAcBgNVBAMTFWF1dGguc2VydmljZXMuYm1qLmNv
-						bTEhMB8GCSqGSIb3DQEJARYSb3BlcmF0aW9uc0BibWouY29tMIIBIjANBgkqhkiG
-						9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2mKuJbaYm3cLrHLBDGh4Bw2Vvnars2/KLDLX
-						eTW/pqu0ePzYMwKO33MDxNtSJk1oAzVpu7fqjJnosdmC0iIuRssUfBDluh4K/heW
-						txI+9+2GEldxat1g1rgvyDncKuRd41BvOX5TwDnGSlQsC/KUaxxcBq5v6gA08vJS
-						QPjvTNRbDV0EJOyAkHteob9EQTAE1hMpFP1zUgHBnlAE8Ab02g8kbczsoaqqrjDY
-						QiVEz51xT/5sI/d554wCqyvukbapIYYU/TsEt/mg7d0dc/ios868l7N39nXae6+s
-						To+iY9C30RrgHfVw0dy3F1UURfu6UHWF6ghS4Ci4l8pfyeQczwIDAQABMA0GCSqG
-						SIb3DQEBBQUAA4IBAQBXgJlzJX3Q8QMoxJdPTaeVY79y6nBLWf/PvIazYlgUePmU
-						ZmRhKo50L18R0X98OKCayw79q893a3uCkS/NfEqB819+AajzboYAalYHf+jD9NwB
-						z+vff+oRNERM9khBBnxQZhq21UnPcB4EpYyu9FygjmLrxxwZDzoMmG+sMRVrC1ff
-						LQtlqTHYLsAoyqjs/vmD72kr4MZUNEDwyk/SIRJUU86Axx0/F4XWHA5uzSpD8TM9
-						PN6l+KjcBSxV+BZ0RTY3AXUjDyEug23U8bCaXTaUmCIlIpJMxUwswuoKwSPCwesC
-						4j9ZrnewfA82UxIdQeHXbcTG4FME758xOTVMWUIr
-					</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://auth.services.bmj.com/auth/rcv" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://auth.services.bmj.com/auth/rcv" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://auth.services.bmj.com/auth/rcv/saml1" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://auth.services.bmj.com/auth/rcv/saml1" index="3"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">BMJ Publishing Group Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">The BMJ Group</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://group.bmj.com/group/about</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>BMJ Customer Support</GivenName>
-    <EmailAddress>mailto:support@bmjgroup.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Chris</GivenName>
-    <SurName>Highfield</SurName>
-    <EmailAddress>mailto:chighfield@bmj.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/auth.services.bmj.com.xml b/swamid-interfederations-2.0/auth.services.bmj.com.xml
deleted file mode 100644
index ea781fce..00000000
--- a/swamid-interfederations-2.0/auth.services.bmj.com.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://auth.services.bmj.com/auth">
-  <!--
-		This is an OpenAthens SP for for BMJ Publishing Group Limited.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2009-08-05T11:42:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </Extensions>
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDqjCCApICCQCaKbK0unVYnjANBgkqhkiG9w0BAQUFADCBljELMAkGA1UEBhMC
-						R0IxEDAOBgNVBAgTB0VuZ2xhbmQxDzANBgNVBAcTBkxvbmRvbjEMMAoGA1UEChMD
-						Qk1KMRMwEQYDVQQLEwpUZWNobm9sb2d5MR4wHAYDVQQDExVhdXRoLnNlcnZpY2Vz
-						LmJtai5jb20xITAfBgkqhkiG9w0BCQEWEm9wZXJhdGlvbnNAYm1qLmNvbTAeFw0x
-						NDA3MTAxMzEyMzNaFw0yNDA3MDkxMzEyMzNaMIGWMQswCQYDVQQGEwJHQjEQMA4G
-						A1UECBMHRW5nbGFuZDEPMA0GA1UEBxMGTG9uZG9uMQwwCgYDVQQKEwNCTUoxEzAR
-						BgNVBAsTClRlY2hub2xvZ3kxHjAcBgNVBAMTFWF1dGguc2VydmljZXMuYm1qLmNv
-						bTEhMB8GCSqGSIb3DQEJARYSb3BlcmF0aW9uc0BibWouY29tMIIBIjANBgkqhkiG
-						9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2mKuJbaYm3cLrHLBDGh4Bw2Vvnars2/KLDLX
-						eTW/pqu0ePzYMwKO33MDxNtSJk1oAzVpu7fqjJnosdmC0iIuRssUfBDluh4K/heW
-						txI+9+2GEldxat1g1rgvyDncKuRd41BvOX5TwDnGSlQsC/KUaxxcBq5v6gA08vJS
-						QPjvTNRbDV0EJOyAkHteob9EQTAE1hMpFP1zUgHBnlAE8Ab02g8kbczsoaqqrjDY
-						QiVEz51xT/5sI/d554wCqyvukbapIYYU/TsEt/mg7d0dc/ios868l7N39nXae6+s
-						To+iY9C30RrgHfVw0dy3F1UURfu6UHWF6ghS4Ci4l8pfyeQczwIDAQABMA0GCSqG
-						SIb3DQEBBQUAA4IBAQBXgJlzJX3Q8QMoxJdPTaeVY79y6nBLWf/PvIazYlgUePmU
-						ZmRhKo50L18R0X98OKCayw79q893a3uCkS/NfEqB819+AajzboYAalYHf+jD9NwB
-						z+vff+oRNERM9khBBnxQZhq21UnPcB4EpYyu9FygjmLrxxwZDzoMmG+sMRVrC1ff
-						LQtlqTHYLsAoyqjs/vmD72kr4MZUNEDwyk/SIRJUU86Axx0/F4XWHA5uzSpD8TM9
-						PN6l+KjcBSxV+BZ0RTY3AXUjDyEug23U8bCaXTaUmCIlIpJMxUwswuoKwSPCwesC
-						4j9ZrnewfA82UxIdQeHXbcTG4FME758xOTVMWUIr
-					</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://auth.services.bmj.com/auth/rcv" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://auth.services.bmj.com/auth/rcv" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://auth.services.bmj.com/auth/rcv/saml1" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://auth.services.bmj.com/auth/rcv/saml1" index="3"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">BMJ Publishing Group Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">The BMJ Group</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://group.bmj.com/group/about</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>BMJ Customer Support</GivenName>
-    <EmailAddress>mailto:support@bmjgroup.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Chris</GivenName>
-    <SurName>Highfield</SurName>
-    <EmailAddress>mailto:chighfield@bmj.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/auth.u-pec.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/auth.u-pec.fr-idp-shibboleth.xml
deleted file mode 100644
index 5b1a09d9..00000000
--- a/swamid-interfederations-2.0/auth.u-pec.fr-idp-shibboleth.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://auth.u-pec.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2010-08-30T16:20:09Z">
-      <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">u-pec.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">Université de Paris Est Créteil - UPEC</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDHzCCAgegAwIBAgIUL8rXSh9z8lwFNYmrUxZVQXXbx1AwDQYJKoZIhvcNAQEF
-BQAwGDEWMBQGA1UEAxMNYXV0aC51LXBlYy5mcjAeFw0xMDA3MjMwOTI3MzJaFw0z
-MDA3MjMwOTI3MzJaMBgxFjAUBgNVBAMTDWF1dGgudS1wZWMuZnIwggEiMA0GCSqG
-SIb3DQEBAQUAA4IBDwAwggEKAoIBAQC3CIB42PQo6cg8vYefYuJnhAadIkFr7TKV
-lldoy+uQ8qcyF8ElQdIvvYxkUN0N1RVC9xqez1EiPQ8yKoiH3e24JbaLWMYO5J/K
-BxFYHwRkrSoW150GkvzCP1l7BuQr9x3fEQPsZjk48uZMzguOJY2JyEneyidxYv7g
-+XgUrBDK+OerHBWRYXAezuguxn/zr+aOEXx3htVlUI3S6yXoEFr7URasktJ5qAKj
-O/DfX2rZcUKV9fvGS+dnq4a/kqWD8ycH6NUVu7IbLtCgHLp0BQg6QPkM2Z+AskJv
-gqHxqhpP8zzD5HU5T3aV+MQ9XIg7l3vlebhp6bF4mlM+K8r9noIvAgMBAAGjYTBf
-MD4GA1UdEQQ3MDWCDWF1dGgudS1wZWMuZnKGJGh0dHBzOi8vYXV0aC51LXBlYy5m
-ci9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUx0iOH60s6SQCa/NwoN7hZBocV8Iw
-DQYJKoZIhvcNAQEFBQADggEBAJvL8HOgBpnBhBJJwuM0fWUjxDDN8eoF4kL59Vlz
-maqV9N3mG3UDGBTcT6jjJ/zO7Pb53PJ69Adj7+d8PSyfSs2y2BC+YDOOzWfgrx3m
-DVmVBV/uKJfqRq4rMXsNekVyTmRiVojF3Qzeic6HbwTWMbLEmDxWgAVKOSg0Hu1j
-CANZRHLjo7NC6KWC0Hh0tXrenjG9yvVUxLOE7nnzMiQth4gMlRuLMsWuG5c12RZ7
-una3UJI0MM77yR3S40ltFU6EKnQi3HO3TsP2QNWtkyuBaAhBzI8MuL/P3RPpUTca
-+m1oLcwCBV+imJ+QVPGoY154Eg5BcWrcB2wSC+6+CCPRZks=
-					    </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://auth.u-pec.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://auth.u-pec.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://auth.u-pec.fr/idp/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Université de Paris Est Créteil - UPEC</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Université de Paris Est Créteil - UPEC</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Bastien SORET</SurName>
-    <EmailAddress>bastien.soret@u-pec.fr</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <SurName>Baptiste Le Negaret</SurName>
-    <EmailAddress>baptiste.le-negaret@u-pec.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/auth.u-pec.fr.xml b/swamid-interfederations-2.0/auth.u-pec.fr.xml
deleted file mode 100644
index 5b1a09d9..00000000
--- a/swamid-interfederations-2.0/auth.u-pec.fr.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://auth.u-pec.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2010-08-30T16:20:09Z">
-      <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">u-pec.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">Université de Paris Est Créteil - UPEC</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDHzCCAgegAwIBAgIUL8rXSh9z8lwFNYmrUxZVQXXbx1AwDQYJKoZIhvcNAQEF
-BQAwGDEWMBQGA1UEAxMNYXV0aC51LXBlYy5mcjAeFw0xMDA3MjMwOTI3MzJaFw0z
-MDA3MjMwOTI3MzJaMBgxFjAUBgNVBAMTDWF1dGgudS1wZWMuZnIwggEiMA0GCSqG
-SIb3DQEBAQUAA4IBDwAwggEKAoIBAQC3CIB42PQo6cg8vYefYuJnhAadIkFr7TKV
-lldoy+uQ8qcyF8ElQdIvvYxkUN0N1RVC9xqez1EiPQ8yKoiH3e24JbaLWMYO5J/K
-BxFYHwRkrSoW150GkvzCP1l7BuQr9x3fEQPsZjk48uZMzguOJY2JyEneyidxYv7g
-+XgUrBDK+OerHBWRYXAezuguxn/zr+aOEXx3htVlUI3S6yXoEFr7URasktJ5qAKj
-O/DfX2rZcUKV9fvGS+dnq4a/kqWD8ycH6NUVu7IbLtCgHLp0BQg6QPkM2Z+AskJv
-gqHxqhpP8zzD5HU5T3aV+MQ9XIg7l3vlebhp6bF4mlM+K8r9noIvAgMBAAGjYTBf
-MD4GA1UdEQQ3MDWCDWF1dGgudS1wZWMuZnKGJGh0dHBzOi8vYXV0aC51LXBlYy5m
-ci9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUx0iOH60s6SQCa/NwoN7hZBocV8Iw
-DQYJKoZIhvcNAQEFBQADggEBAJvL8HOgBpnBhBJJwuM0fWUjxDDN8eoF4kL59Vlz
-maqV9N3mG3UDGBTcT6jjJ/zO7Pb53PJ69Adj7+d8PSyfSs2y2BC+YDOOzWfgrx3m
-DVmVBV/uKJfqRq4rMXsNekVyTmRiVojF3Qzeic6HbwTWMbLEmDxWgAVKOSg0Hu1j
-CANZRHLjo7NC6KWC0Hh0tXrenjG9yvVUxLOE7nnzMiQth4gMlRuLMsWuG5c12RZ7
-una3UJI0MM77yR3S40ltFU6EKnQi3HO3TsP2QNWtkyuBaAhBzI8MuL/P3RPpUTca
-+m1oLcwCBV+imJ+QVPGoY154Eg5BcWrcB2wSC+6+CCPRZks=
-					    </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://auth.u-pec.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://auth.u-pec.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://auth.u-pec.fr/idp/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Université de Paris Est Créteil - UPEC</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Université de Paris Est Créteil - UPEC</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Bastien SORET</SurName>
-    <EmailAddress>bastien.soret@u-pec.fr</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <SurName>Baptiste Le Negaret</SurName>
-    <EmailAddress>baptiste.le-negaret@u-pec.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/auth.univ-paris-diderot.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/auth.univ-paris-diderot.fr-idp-shibboleth.xml
deleted file mode 100644
index 70b4ffdd..00000000
--- a/swamid-interfederations-2.0/auth.univ-paris-diderot.fr-idp-shibboleth.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://auth.univ-paris-diderot.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2009-06-22T15:05:05Z">
-      <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">univ-paris-diderot.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">Université de Paris 7 - Denis Diderot</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDSDCCAjCgAwIBAgIJAN6STuFrAhxnMA0GCSqGSIb3DQEBBQUAMCUxIzAhBgNV
-BAMTGmF1dGgudW5pdi1wYXJpcy1kaWRlcm90LmZyMB4XDTE0MDMwNDEzMDA1NFoX
-DTE3MDMwMzEzMDA1NFowJTEjMCEGA1UEAxMaYXV0aC51bml2LXBhcmlzLWRpZGVy
-b3QuZnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCpIa57mIoE7c60
-vKjcad8J0NnF2PS6JunZVvCQxdoFn7M7bNHLXnzbR3eRy/YOvs5Lap/PAZYeefUB
-XN7jsge+V1iqrz464yZGbNYHrweqp8EZU2L8GLNhHI6gOHHDGVR9NbsYFtrfrYnP
-unzON0yI99fg+YKRKIjbzPPsAcsaC6EtztqCzdui/iXpG2jNlvWWWx2TSQR4Dxn/
-cKHABFOwMmoqL/yJ0nvk2zEmL0etBSUdoiGeAOy4YxlrtRWKP8A4xrOwYwCt/v5k
-KWeLb5FHUvLMTRszxd56422oQnAS//0Xjr6k3rIGy6x4QaDj2pnGfBVF7Bj8KzeV
-7LAqpDoZAgMBAAGjezB5MFgGA1UdEQRRME+CGmF1dGgudW5pdi1wYXJpcy1kaWRl
-cm90LmZyhjFodHRwczovL2F1dGgudW5pdi1wYXJpcy1kaWRlcm90LmZyL2lkcC9z
-aGliYm9sZXRoMB0GA1UdDgQWBBQ77uGaL//q8VYtszQ2KFmuivP1fzANBgkqhkiG
-9w0BAQUFAAOCAQEAdmP3c/NNbbabPnpFeykRfkHIOLkVNsqwxR0a2Jr3LNSm9SE/
-Uta0MubpVTrImYQ9Fj8d3/MbSJtFR83dQ7Ib3/JZ04RqHz1LThOga8Qjw7s/O4Do
-j0NW1Rv/3CDCeDM5nOJ+4QlCLu0NqoAKDURooIJf0VTr5LnOAKMeQMAejXrtFjZT
-2IjXihUHeROCpIja7zzo84eZbbZvmOmrIJBbtDIEVjqqq7v9cYAbsrFxRw7WZo8J
-AeQBiqc1r72+AtBF18BJnpvVviUUxNU+MWLbNl+SaWhuUOqKqpFYcmF2jUHrM+N4
-VMThjYGNfbI8izARv+4LCGkfOSrlpq/2KqJ+FQ==
-					    </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://auth.univ-paris-diderot.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://auth.univ-paris-diderot.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://auth.univ-paris-diderot.fr/idp/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Université de Paris 7 - Denis Diderot</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Université de Paris 7 - Denis Diderot</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <EmailAddress>noc@univ-paris-diderot.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/auth.univ-paris-diderot.fr.xml b/swamid-interfederations-2.0/auth.univ-paris-diderot.fr.xml
deleted file mode 100644
index 70b4ffdd..00000000
--- a/swamid-interfederations-2.0/auth.univ-paris-diderot.fr.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://auth.univ-paris-diderot.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2009-06-22T15:05:05Z">
-      <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">univ-paris-diderot.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">Université de Paris 7 - Denis Diderot</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDSDCCAjCgAwIBAgIJAN6STuFrAhxnMA0GCSqGSIb3DQEBBQUAMCUxIzAhBgNV
-BAMTGmF1dGgudW5pdi1wYXJpcy1kaWRlcm90LmZyMB4XDTE0MDMwNDEzMDA1NFoX
-DTE3MDMwMzEzMDA1NFowJTEjMCEGA1UEAxMaYXV0aC51bml2LXBhcmlzLWRpZGVy
-b3QuZnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCpIa57mIoE7c60
-vKjcad8J0NnF2PS6JunZVvCQxdoFn7M7bNHLXnzbR3eRy/YOvs5Lap/PAZYeefUB
-XN7jsge+V1iqrz464yZGbNYHrweqp8EZU2L8GLNhHI6gOHHDGVR9NbsYFtrfrYnP
-unzON0yI99fg+YKRKIjbzPPsAcsaC6EtztqCzdui/iXpG2jNlvWWWx2TSQR4Dxn/
-cKHABFOwMmoqL/yJ0nvk2zEmL0etBSUdoiGeAOy4YxlrtRWKP8A4xrOwYwCt/v5k
-KWeLb5FHUvLMTRszxd56422oQnAS//0Xjr6k3rIGy6x4QaDj2pnGfBVF7Bj8KzeV
-7LAqpDoZAgMBAAGjezB5MFgGA1UdEQRRME+CGmF1dGgudW5pdi1wYXJpcy1kaWRl
-cm90LmZyhjFodHRwczovL2F1dGgudW5pdi1wYXJpcy1kaWRlcm90LmZyL2lkcC9z
-aGliYm9sZXRoMB0GA1UdDgQWBBQ77uGaL//q8VYtszQ2KFmuivP1fzANBgkqhkiG
-9w0BAQUFAAOCAQEAdmP3c/NNbbabPnpFeykRfkHIOLkVNsqwxR0a2Jr3LNSm9SE/
-Uta0MubpVTrImYQ9Fj8d3/MbSJtFR83dQ7Ib3/JZ04RqHz1LThOga8Qjw7s/O4Do
-j0NW1Rv/3CDCeDM5nOJ+4QlCLu0NqoAKDURooIJf0VTr5LnOAKMeQMAejXrtFjZT
-2IjXihUHeROCpIja7zzo84eZbbZvmOmrIJBbtDIEVjqqq7v9cYAbsrFxRw7WZo8J
-AeQBiqc1r72+AtBF18BJnpvVviUUxNU+MWLbNl+SaWhuUOqKqpFYcmF2jUHrM+N4
-VMThjYGNfbI8izARv+4LCGkfOSrlpq/2KqJ+FQ==
-					    </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://auth.univ-paris-diderot.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://auth.univ-paris-diderot.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://auth.univ-paris-diderot.fr/idp/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Université de Paris 7 - Denis Diderot</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Université de Paris 7 - Denis Diderot</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <EmailAddress>noc@univ-paris-diderot.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/auth.univ-pau.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/auth.univ-pau.fr-idp-shibboleth.xml
deleted file mode 100644
index a4260064..00000000
--- a/swamid-interfederations-2.0/auth.univ-pau.fr-idp-shibboleth.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://auth.univ-pau.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2009-04-03T16:39:33Z">
-      <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">univ-pau.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">Université de Pau et des Pays de l'Adour</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDIjCCAgoCCQC3OrRBueQaizANBgkqhkiG9w0BAQUFADBTMQswCQYDVQQGEwJG
-UjEMMAoGA1UEBxMDUGF1MQ0wCwYDVQQKEwRVUFBBMQwwCgYDVQQLEwNDUkkxGTAX
-BgNVBAMTEGF1dGgudW5pdi1wYXUuZnIwHhcNMTMwMjE5MTQ0NTQ4WhcNMjMwMjE3
-MTQ0NTQ4WjBTMQswCQYDVQQGEwJGUjEMMAoGA1UEBxMDUGF1MQ0wCwYDVQQKEwRV
-UFBBMQwwCgYDVQQLEwNDUkkxGTAXBgNVBAMTEGF1dGgudW5pdi1wYXUuZnIwggEi
-MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDWTM/siVuTExMzX3c7YRDl71NX
-0wRsW3qKUbSwM1BI1x4eP9aXECEujPvKYaaudMZziwsAeP+ZCh2RU2URqu9YEGb4
-9ZBFBnFj6GgPtEUZuiJt6vJVKL5l7SUm2NBuNAVRFhFTYkvBQGzS/zd79W2S/8zr
-gMx9tJ7bVi8ZNIheYRJl2FZFqGHhFKKgqSkeFW7qGjiJfy2jY62Ba8TMM7cIDIZ+
-IJ6SmPLFSTONxDZ0hEuinFpO9DCA+ga6nzDXeyMSsU1xdjgn8BD58OBKBZtOjI/T
-58BVHfWrcagqK06C98vQNk97+H8xF+49l0fGXwaSRl1Uf2fqh5RJyupPTtIdAgMB
-AAEwDQYJKoZIhvcNAQEFBQADggEBAI2cHyACJMLw0Xjx7zOYUjwLWakZxNnBiEjX
-MX2t8nr8bi/ZUoABWYP5cypHk9jIY/XngWOmEDwaa5GZiuNokWNfH8glmqFKVTgB
-PILrumLWtA0/CkgmnlaBhgU4pRbxSGZ6FENYIY/P5Grp5P0DzOP8znSDvucrpXf5
-DPGkthWJn/ooDngwBJqQBwxShiRmL1bwRMvdRG9N1bZKO8kYGK1txDkLLOB2n+dA
-mXWnKcQd4kpmpFEoppdN4qgpgZjla+xLPhswKXB81UJ+csh+c7/+oikJZuAS5vPb
-U2avjI5AfKIKKFQYpjP1qpGGUNecL4Bw28IOM+JyrH4T6CmGgq8=
-					    </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://auth.univ-pau.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://auth.univ-pau.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://auth.univ-pau.fr/idp/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Université de Pau et des Pays de l'Adour</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Université de Pau et des Pays de l'Adour</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <EmailAddress>fed-admin@univ-pau.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/auth.univ-pau.fr.xml b/swamid-interfederations-2.0/auth.univ-pau.fr.xml
deleted file mode 100644
index a4260064..00000000
--- a/swamid-interfederations-2.0/auth.univ-pau.fr.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://auth.univ-pau.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2009-04-03T16:39:33Z">
-      <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">univ-pau.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">Université de Pau et des Pays de l'Adour</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDIjCCAgoCCQC3OrRBueQaizANBgkqhkiG9w0BAQUFADBTMQswCQYDVQQGEwJG
-UjEMMAoGA1UEBxMDUGF1MQ0wCwYDVQQKEwRVUFBBMQwwCgYDVQQLEwNDUkkxGTAX
-BgNVBAMTEGF1dGgudW5pdi1wYXUuZnIwHhcNMTMwMjE5MTQ0NTQ4WhcNMjMwMjE3
-MTQ0NTQ4WjBTMQswCQYDVQQGEwJGUjEMMAoGA1UEBxMDUGF1MQ0wCwYDVQQKEwRV
-UFBBMQwwCgYDVQQLEwNDUkkxGTAXBgNVBAMTEGF1dGgudW5pdi1wYXUuZnIwggEi
-MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDWTM/siVuTExMzX3c7YRDl71NX
-0wRsW3qKUbSwM1BI1x4eP9aXECEujPvKYaaudMZziwsAeP+ZCh2RU2URqu9YEGb4
-9ZBFBnFj6GgPtEUZuiJt6vJVKL5l7SUm2NBuNAVRFhFTYkvBQGzS/zd79W2S/8zr
-gMx9tJ7bVi8ZNIheYRJl2FZFqGHhFKKgqSkeFW7qGjiJfy2jY62Ba8TMM7cIDIZ+
-IJ6SmPLFSTONxDZ0hEuinFpO9DCA+ga6nzDXeyMSsU1xdjgn8BD58OBKBZtOjI/T
-58BVHfWrcagqK06C98vQNk97+H8xF+49l0fGXwaSRl1Uf2fqh5RJyupPTtIdAgMB
-AAEwDQYJKoZIhvcNAQEFBQADggEBAI2cHyACJMLw0Xjx7zOYUjwLWakZxNnBiEjX
-MX2t8nr8bi/ZUoABWYP5cypHk9jIY/XngWOmEDwaa5GZiuNokWNfH8glmqFKVTgB
-PILrumLWtA0/CkgmnlaBhgU4pRbxSGZ6FENYIY/P5Grp5P0DzOP8znSDvucrpXf5
-DPGkthWJn/ooDngwBJqQBwxShiRmL1bwRMvdRG9N1bZKO8kYGK1txDkLLOB2n+dA
-mXWnKcQd4kpmpFEoppdN4qgpgZjla+xLPhswKXB81UJ+csh+c7/+oikJZuAS5vPb
-U2avjI5AfKIKKFQYpjP1qpGGUNecL4Bw28IOM+JyrH4T6CmGgq8=
-					    </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://auth.univ-pau.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://auth.univ-pau.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://auth.univ-pau.fr/idp/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Université de Pau et des Pays de l'Adour</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Université de Pau et des Pays de l'Adour</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <EmailAddress>fed-admin@univ-pau.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/beta.shib.manchester.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/beta.shib.manchester.ac.uk-shibboleth.xml
deleted file mode 100644
index ef926099..00000000
--- a/swamid-interfederations-2.0/beta.shib.manchester.ac.uk-shibboleth.xml
+++ /dev/null
@@ -1,139 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://beta.shib.manchester.ac.uk/shibboleth">
-  <!--
-		This is a "beta" Shibboleth IdP for The University of Manchester.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2010-05-06T16:24:24Z">
-      <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">manchester.ac.uk</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">The University of Manchester (Beta)</mdui:DisplayName>
-        <mdui:Logo height="16" width="16">https://login.manchester.ac.uk/disco/logo-16x16-m.png</mdui:Logo>
-        <mdui:Logo height="34" width="80">https://login.manchester.ac.uk/disco/logo-80x34-ltd.png</mdui:Logo>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:IPHint>130.88.0.0/16</mdui:IPHint>
-        <mdui:DomainHint>manchester.ac.uk</mdui:DomainHint>
-        <mdui:DomainHint>man.ac.uk</mdui:DomainHint>
-        <mdui:DomainHint>mbs.ac.uk</mdui:DomainHint>
-        <mdui:DomainHint>mimas.ac.uk</mdui:DomainHint>
-        <mdui:DomainHint>mib.ac.uk</mdui:DomainHint>
-        <mdui:DomainHint>mbs-worldwide.ac.uk</mdui:DomainHint>
-        <mdui:GeolocationHint>geo:53.465624,-2.233193</mdui:GeolocationHint>
-        <mdui:GeolocationHint>geo:53.474881,-2.233593</mdui:GeolocationHint>
-        <mdui:GeolocationHint>geo:53.236237,-2.306421</mdui:GeolocationHint>
-        <mdui:GeolocationHint>geo:53.480372,-2.24893</mdui:GeolocationHint>
-        <mdui:GeolocationHint>geo:51.572576,-1.315923</mdui:GeolocationHint>
-        <mdui:GeolocationHint>geo:53.462436,-2.227711</mdui:GeolocationHint>
-        <mdui:GeolocationHint>geo:53.429749,-2.230049</mdui:GeolocationHint>
-        <mdui:GeolocationHint>geo:53.445089,-2.278115</mdui:GeolocationHint>
-        <mdui:GeolocationHint>geo:53.490592,-2.28839</mdui:GeolocationHint>
-        <mdui:GeolocationHint>geo:53.487545,-2.323424</mdui:GeolocationHint>
-        <mdui:GeolocationHint>geo:53.427332,-2.247825</mdui:GeolocationHint>
-        <mdui:GeolocationHint>geo:46.23145,6.050119</mdui:GeolocationHint>
-      </mdui:DiscoHints>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIEgTCCA2mgAwIBAgIQODuhTy09Kmsw2IJOGwc+7DANBgkqhkiG9w0BAQUFADA2
-						MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-						U1NMIENBMB4XDTEzMDIxOTAwMDAwMFoXDTE2MDIxOTIzNTk1OVowSDEhMB8GA1UE
-						CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMSMwIQYDVQQDExpiZXRhLnNoaWIu
-						bWFuY2hlc3Rlci5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
-						AMa+jhEPLHaYtVI2iX/NONYYshBjccXs1+aZ9ciOvFd3QFRbSr84QprqBdyai7MI
-						boYQZBaEs7bxbAiozZf14L2XAG5sOz1Ra9fJaM/8NbDnVBOou6hHAd1Wqh+/z25p
-						WYA1Sw1H9V5C9VSMtSW6C2vC79WDfyVrPL8mvKG+d5hD/PlFZerIDQVuljOs8wQ5
-						htI7/70dxBZI2ls9xBb1dfyVj/dGp6g6DgIzVcKplq0EwjrrOGwi7S5xevAnPOQl
-						8hm7oMj9TqtqaQLOzKJCtliG3tt9x9lZblSWDAzw21xdl2SXyKVE1rGIAqvTwmDt
-						EwFMHh0pFbGbaqmZFQaY4CkCAwEAAaOCAXcwggFzMB8GA1UdIwQYMBaAFAy9k2gM
-						896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBTkbYr6vMAy5gunSZ2FH1wilnPKNTAO
-						BgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcD
-						AQYIKwYBBQUHAwIwIgYDVR0gBBswGTANBgsrBgEEAbIxAQICHTAIBgZngQwBAgEw
-						OgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJF
-						TkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8v
-						Y3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYa
-						aHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwJQYDVR0RBB4wHIIaYmV0YS5zaGli
-						Lm1hbmNoZXN0ZXIuYWMudWswDQYJKoZIhvcNAQEFBQADggEBAIQIFKVQYtqBrghB
-						6NjTsCIyyDl4NQ6+3xKPDcdBTAZGwLATb6SSd233q8hIwP6z6bibFFwrIBOLbFyY
-						x+7Q6Sy3E+NMd9jI9mREAP8JtnTZfDS9Howj8pZHfwZK2MP2CuSEkyckJfsawgMu
-						UQDWiDFsxNM47l1iZsMGDLcrHXFn9nj2owQ5QGwh1rOyoxJnDciy6Yu/JdpTURYJ
-						U+NheJHahcplg8zBqGUsrrERVQ40BjSi81Y2yPohJqje8AM5tCSD8XW5RcWoNoet
-						vWH3fKPnKXnFm+4A6glqcmRMsNebh/gX5tugbOgVt4SFmC+CFpmUQWqVisGrp8iK
-						0EI2geY=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://beta.shib.manchester.ac.uk:8443/shibboleth-idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://beta.shib.manchester.ac.uk:8443/shibboleth-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://beta.shib.manchester.ac.uk/shibboleth-idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://beta.shib.manchester.ac.uk/shibboleth-idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://beta.shib.manchester.ac.uk/shibboleth-idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://beta.shib.manchester.ac.uk/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>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">manchester.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIEgTCCA2mgAwIBAgIQODuhTy09Kmsw2IJOGwc+7DANBgkqhkiG9w0BAQUFADA2
-						MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-						U1NMIENBMB4XDTEzMDIxOTAwMDAwMFoXDTE2MDIxOTIzNTk1OVowSDEhMB8GA1UE
-						CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMSMwIQYDVQQDExpiZXRhLnNoaWIu
-						bWFuY2hlc3Rlci5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
-						AMa+jhEPLHaYtVI2iX/NONYYshBjccXs1+aZ9ciOvFd3QFRbSr84QprqBdyai7MI
-						boYQZBaEs7bxbAiozZf14L2XAG5sOz1Ra9fJaM/8NbDnVBOou6hHAd1Wqh+/z25p
-						WYA1Sw1H9V5C9VSMtSW6C2vC79WDfyVrPL8mvKG+d5hD/PlFZerIDQVuljOs8wQ5
-						htI7/70dxBZI2ls9xBb1dfyVj/dGp6g6DgIzVcKplq0EwjrrOGwi7S5xevAnPOQl
-						8hm7oMj9TqtqaQLOzKJCtliG3tt9x9lZblSWDAzw21xdl2SXyKVE1rGIAqvTwmDt
-						EwFMHh0pFbGbaqmZFQaY4CkCAwEAAaOCAXcwggFzMB8GA1UdIwQYMBaAFAy9k2gM
-						896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBTkbYr6vMAy5gunSZ2FH1wilnPKNTAO
-						BgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcD
-						AQYIKwYBBQUHAwIwIgYDVR0gBBswGTANBgsrBgEEAbIxAQICHTAIBgZngQwBAgEw
-						OgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJF
-						TkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8v
-						Y3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYa
-						aHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwJQYDVR0RBB4wHIIaYmV0YS5zaGli
-						Lm1hbmNoZXN0ZXIuYWMudWswDQYJKoZIhvcNAQEFBQADggEBAIQIFKVQYtqBrghB
-						6NjTsCIyyDl4NQ6+3xKPDcdBTAZGwLATb6SSd233q8hIwP6z6bibFFwrIBOLbFyY
-						x+7Q6Sy3E+NMd9jI9mREAP8JtnTZfDS9Howj8pZHfwZK2MP2CuSEkyckJfsawgMu
-						UQDWiDFsxNM47l1iZsMGDLcrHXFn9nj2owQ5QGwh1rOyoxJnDciy6Yu/JdpTURYJ
-						U+NheJHahcplg8zBqGUsrrERVQ40BjSi81Y2yPohJqje8AM5tCSD8XW5RcWoNoet
-						vWH3fKPnKXnFm+4A6glqcmRMsNebh/gX5tugbOgVt4SFmC+CFpmUQWqVisGrp8iK
-						0EI2geY=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://beta.shib.manchester.ac.uk:8443/shibboleth-idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://beta.shib.manchester.ac.uk: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="en">The University of Manchester</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">The University of Manchester (Beta)</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.manchester.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>IT Service Desk</GivenName>
-    <EmailAddress>mailto:IT-Servicedesk@manchester.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Sam</GivenName>
-    <SurName>Jones</SurName>
-    <EmailAddress>mailto:sam.jones@manchester.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/beta.shib.manchester.ac.uk.xml b/swamid-interfederations-2.0/beta.shib.manchester.ac.uk.xml
deleted file mode 100644
index ef926099..00000000
--- a/swamid-interfederations-2.0/beta.shib.manchester.ac.uk.xml
+++ /dev/null
@@ -1,139 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://beta.shib.manchester.ac.uk/shibboleth">
-  <!--
-		This is a "beta" Shibboleth IdP for The University of Manchester.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2010-05-06T16:24:24Z">
-      <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">manchester.ac.uk</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">The University of Manchester (Beta)</mdui:DisplayName>
-        <mdui:Logo height="16" width="16">https://login.manchester.ac.uk/disco/logo-16x16-m.png</mdui:Logo>
-        <mdui:Logo height="34" width="80">https://login.manchester.ac.uk/disco/logo-80x34-ltd.png</mdui:Logo>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:IPHint>130.88.0.0/16</mdui:IPHint>
-        <mdui:DomainHint>manchester.ac.uk</mdui:DomainHint>
-        <mdui:DomainHint>man.ac.uk</mdui:DomainHint>
-        <mdui:DomainHint>mbs.ac.uk</mdui:DomainHint>
-        <mdui:DomainHint>mimas.ac.uk</mdui:DomainHint>
-        <mdui:DomainHint>mib.ac.uk</mdui:DomainHint>
-        <mdui:DomainHint>mbs-worldwide.ac.uk</mdui:DomainHint>
-        <mdui:GeolocationHint>geo:53.465624,-2.233193</mdui:GeolocationHint>
-        <mdui:GeolocationHint>geo:53.474881,-2.233593</mdui:GeolocationHint>
-        <mdui:GeolocationHint>geo:53.236237,-2.306421</mdui:GeolocationHint>
-        <mdui:GeolocationHint>geo:53.480372,-2.24893</mdui:GeolocationHint>
-        <mdui:GeolocationHint>geo:51.572576,-1.315923</mdui:GeolocationHint>
-        <mdui:GeolocationHint>geo:53.462436,-2.227711</mdui:GeolocationHint>
-        <mdui:GeolocationHint>geo:53.429749,-2.230049</mdui:GeolocationHint>
-        <mdui:GeolocationHint>geo:53.445089,-2.278115</mdui:GeolocationHint>
-        <mdui:GeolocationHint>geo:53.490592,-2.28839</mdui:GeolocationHint>
-        <mdui:GeolocationHint>geo:53.487545,-2.323424</mdui:GeolocationHint>
-        <mdui:GeolocationHint>geo:53.427332,-2.247825</mdui:GeolocationHint>
-        <mdui:GeolocationHint>geo:46.23145,6.050119</mdui:GeolocationHint>
-      </mdui:DiscoHints>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIEgTCCA2mgAwIBAgIQODuhTy09Kmsw2IJOGwc+7DANBgkqhkiG9w0BAQUFADA2
-						MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-						U1NMIENBMB4XDTEzMDIxOTAwMDAwMFoXDTE2MDIxOTIzNTk1OVowSDEhMB8GA1UE
-						CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMSMwIQYDVQQDExpiZXRhLnNoaWIu
-						bWFuY2hlc3Rlci5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
-						AMa+jhEPLHaYtVI2iX/NONYYshBjccXs1+aZ9ciOvFd3QFRbSr84QprqBdyai7MI
-						boYQZBaEs7bxbAiozZf14L2XAG5sOz1Ra9fJaM/8NbDnVBOou6hHAd1Wqh+/z25p
-						WYA1Sw1H9V5C9VSMtSW6C2vC79WDfyVrPL8mvKG+d5hD/PlFZerIDQVuljOs8wQ5
-						htI7/70dxBZI2ls9xBb1dfyVj/dGp6g6DgIzVcKplq0EwjrrOGwi7S5xevAnPOQl
-						8hm7oMj9TqtqaQLOzKJCtliG3tt9x9lZblSWDAzw21xdl2SXyKVE1rGIAqvTwmDt
-						EwFMHh0pFbGbaqmZFQaY4CkCAwEAAaOCAXcwggFzMB8GA1UdIwQYMBaAFAy9k2gM
-						896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBTkbYr6vMAy5gunSZ2FH1wilnPKNTAO
-						BgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcD
-						AQYIKwYBBQUHAwIwIgYDVR0gBBswGTANBgsrBgEEAbIxAQICHTAIBgZngQwBAgEw
-						OgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJF
-						TkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8v
-						Y3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYa
-						aHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwJQYDVR0RBB4wHIIaYmV0YS5zaGli
-						Lm1hbmNoZXN0ZXIuYWMudWswDQYJKoZIhvcNAQEFBQADggEBAIQIFKVQYtqBrghB
-						6NjTsCIyyDl4NQ6+3xKPDcdBTAZGwLATb6SSd233q8hIwP6z6bibFFwrIBOLbFyY
-						x+7Q6Sy3E+NMd9jI9mREAP8JtnTZfDS9Howj8pZHfwZK2MP2CuSEkyckJfsawgMu
-						UQDWiDFsxNM47l1iZsMGDLcrHXFn9nj2owQ5QGwh1rOyoxJnDciy6Yu/JdpTURYJ
-						U+NheJHahcplg8zBqGUsrrERVQ40BjSi81Y2yPohJqje8AM5tCSD8XW5RcWoNoet
-						vWH3fKPnKXnFm+4A6glqcmRMsNebh/gX5tugbOgVt4SFmC+CFpmUQWqVisGrp8iK
-						0EI2geY=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://beta.shib.manchester.ac.uk:8443/shibboleth-idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://beta.shib.manchester.ac.uk:8443/shibboleth-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://beta.shib.manchester.ac.uk/shibboleth-idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://beta.shib.manchester.ac.uk/shibboleth-idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://beta.shib.manchester.ac.uk/shibboleth-idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://beta.shib.manchester.ac.uk/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>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">manchester.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIEgTCCA2mgAwIBAgIQODuhTy09Kmsw2IJOGwc+7DANBgkqhkiG9w0BAQUFADA2
-						MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-						U1NMIENBMB4XDTEzMDIxOTAwMDAwMFoXDTE2MDIxOTIzNTk1OVowSDEhMB8GA1UE
-						CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMSMwIQYDVQQDExpiZXRhLnNoaWIu
-						bWFuY2hlc3Rlci5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
-						AMa+jhEPLHaYtVI2iX/NONYYshBjccXs1+aZ9ciOvFd3QFRbSr84QprqBdyai7MI
-						boYQZBaEs7bxbAiozZf14L2XAG5sOz1Ra9fJaM/8NbDnVBOou6hHAd1Wqh+/z25p
-						WYA1Sw1H9V5C9VSMtSW6C2vC79WDfyVrPL8mvKG+d5hD/PlFZerIDQVuljOs8wQ5
-						htI7/70dxBZI2ls9xBb1dfyVj/dGp6g6DgIzVcKplq0EwjrrOGwi7S5xevAnPOQl
-						8hm7oMj9TqtqaQLOzKJCtliG3tt9x9lZblSWDAzw21xdl2SXyKVE1rGIAqvTwmDt
-						EwFMHh0pFbGbaqmZFQaY4CkCAwEAAaOCAXcwggFzMB8GA1UdIwQYMBaAFAy9k2gM
-						896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBTkbYr6vMAy5gunSZ2FH1wilnPKNTAO
-						BgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcD
-						AQYIKwYBBQUHAwIwIgYDVR0gBBswGTANBgsrBgEEAbIxAQICHTAIBgZngQwBAgEw
-						OgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJF
-						TkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8v
-						Y3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYa
-						aHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwJQYDVR0RBB4wHIIaYmV0YS5zaGli
-						Lm1hbmNoZXN0ZXIuYWMudWswDQYJKoZIhvcNAQEFBQADggEBAIQIFKVQYtqBrghB
-						6NjTsCIyyDl4NQ6+3xKPDcdBTAZGwLATb6SSd233q8hIwP6z6bibFFwrIBOLbFyY
-						x+7Q6Sy3E+NMd9jI9mREAP8JtnTZfDS9Howj8pZHfwZK2MP2CuSEkyckJfsawgMu
-						UQDWiDFsxNM47l1iZsMGDLcrHXFn9nj2owQ5QGwh1rOyoxJnDciy6Yu/JdpTURYJ
-						U+NheJHahcplg8zBqGUsrrERVQ40BjSi81Y2yPohJqje8AM5tCSD8XW5RcWoNoet
-						vWH3fKPnKXnFm+4A6glqcmRMsNebh/gX5tugbOgVt4SFmC+CFpmUQWqVisGrp8iK
-						0EI2geY=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://beta.shib.manchester.ac.uk:8443/shibboleth-idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://beta.shib.manchester.ac.uk: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="en">The University of Manchester</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">The University of Manchester (Beta)</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.manchester.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>IT Service Desk</GivenName>
-    <EmailAddress>mailto:IT-Servicedesk@manchester.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Sam</GivenName>
-    <SurName>Jones</SurName>
-    <EmailAddress>mailto:sam.jones@manchester.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/bodportal.geant.net-autobahn-gui.xml b/swamid-interfederations-2.0/bodportal.geant.net-autobahn-gui.xml
deleted file mode 100644
index 7047dcaa..00000000
--- a/swamid-interfederations-2.0/bodportal.geant.net-autobahn-gui.xml
+++ /dev/null
@@ -1,97 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://bodportal.geant.net/autobahn-gui">
-  <!--
-		This is an autobahn-gui SP for Delivery of Advanced Network Technology to Europe Limited.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-09-17T13:37:01Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </Extensions>
-  <SPSSODescriptor AuthnRequestsSigned="true" 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">BoD Portal</mdui:DisplayName>
-        <mdui:Description xml:lang="en">A Portal that can be used to access the BoD service for requesting circuit reservations, tracking their status and for administrative operation</mdui:Description>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDKjCCAhKgAwIBAgIJAJDmGErGOKVvMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-						BAMTE2JvZHBvcnRhbC5nZWFudC5uZXQwHhcNMTQwNDExMTUxMDE1WhcNMTcwNDEx
-						MTUxMDE1WjAeMRwwGgYDVQQDExNib2Rwb3J0YWwuZ2VhbnQubmV0MIIBIjANBgkq
-						hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAx+u+ncMfh9UiMVWMm38eNH38kSQxGs53
-						YrgmXl2bJWx1cbDseJ28IIKa3xyR7kIDdGBSKgR9/+dcqmA0jitnQNkc0AxWO/SE
-						Ft9NXOWGPt8db1BuFD2DKtNnaqL5pxUFvv8ZvVtThf0cTWtbJXr9Fqscavh67Xs5
-						h8ZVV/PKJkWzI+MwNNZA4zY/XmlWgFj0JyOoNjKRj0CYdbAO9nxjDvglZBaBZhTL
-						yUFPKFK9PYhvCDGidE6vntyN0IerZR5CVZ4UVB4RpnxhbZJKz2ahDGYDMd7ALOGl
-						XVgbVZIEy1UaWSVw85hB3YolynSIDgQGMikPkm9Ob/p9MNqDSyzpyQIDAQABo2sw
-						aTBIBgNVHREEQTA/ghNib2Rwb3J0YWwuZ2VhbnQubmV0hihodHRwczovL2JvZHBv
-						cnRhbC5nZWFudC5uZXQvYXV0b2JhaG4tZ3VpMB0GA1UdDgQWBBSYqysjUZVqc/9I
-						LTMJw82mQm3zsTANBgkqhkiG9w0BAQUFAAOCAQEAh6tU+wzIMqNY47LypNVtdyZY
-						lLCWA5zLnspGrAZoHkiQWgD9ci7J/WBswCdrs/lSJ170u+CiBulzCNgp3c+z2mlq
-						6snJQNApKtE7JOOXXm7QiBmIeKycfmtkznSAfjQGjlfpIY/qmEPTljJQrj1cl0nH
-						7mHxBTgN/YlZj2H7XQZRQZMw5Y63exLyOzD38kGxt+dUUi07cGHenGHs7y7aPKZi
-						dTpN+ziSFq2kMwKJikMGPFrs84/iYCJxedloJqCXljGD5SMq4k5E4m36LpOyhduX
-						5Xv78mo22p+fa22GBf1a6s/flNWU8+CrOWGHHGO3mvNuS0wMHid3D5dSEk8cLw==
-					</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>
-						MIIDKjCCAhKgAwIBAgIJAJDmGErGOKVvMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-						BAMTE2JvZHBvcnRhbC5nZWFudC5uZXQwHhcNMTQwNDExMTUxMDE1WhcNMTcwNDEx
-						MTUxMDE1WjAeMRwwGgYDVQQDExNib2Rwb3J0YWwuZ2VhbnQubmV0MIIBIjANBgkq
-						hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAx+u+ncMfh9UiMVWMm38eNH38kSQxGs53
-						YrgmXl2bJWx1cbDseJ28IIKa3xyR7kIDdGBSKgR9/+dcqmA0jitnQNkc0AxWO/SE
-						Ft9NXOWGPt8db1BuFD2DKtNnaqL5pxUFvv8ZvVtThf0cTWtbJXr9Fqscavh67Xs5
-						h8ZVV/PKJkWzI+MwNNZA4zY/XmlWgFj0JyOoNjKRj0CYdbAO9nxjDvglZBaBZhTL
-						yUFPKFK9PYhvCDGidE6vntyN0IerZR5CVZ4UVB4RpnxhbZJKz2ahDGYDMd7ALOGl
-						XVgbVZIEy1UaWSVw85hB3YolynSIDgQGMikPkm9Ob/p9MNqDSyzpyQIDAQABo2sw
-						aTBIBgNVHREEQTA/ghNib2Rwb3J0YWwuZ2VhbnQubmV0hihodHRwczovL2JvZHBv
-						cnRhbC5nZWFudC5uZXQvYXV0b2JhaG4tZ3VpMB0GA1UdDgQWBBSYqysjUZVqc/9I
-						LTMJw82mQm3zsTANBgkqhkiG9w0BAQUFAAOCAQEAh6tU+wzIMqNY47LypNVtdyZY
-						lLCWA5zLnspGrAZoHkiQWgD9ci7J/WBswCdrs/lSJ170u+CiBulzCNgp3c+z2mlq
-						6snJQNApKtE7JOOXXm7QiBmIeKycfmtkznSAfjQGjlfpIY/qmEPTljJQrj1cl0nH
-						7mHxBTgN/YlZj2H7XQZRQZMw5Y63exLyOzD38kGxt+dUUi07cGHenGHs7y7aPKZi
-						dTpN+ziSFq2kMwKJikMGPFrs84/iYCJxedloJqCXljGD5SMq4k5E4m36LpOyhduX
-						5Xv78mo22p+fa22GBf1a6s/flNWU8+CrOWGHHGO3mvNuS0wMHid3D5dSEk8cLw==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://bodportal.geant.net/autobahn-gui/saml/LogoutServiceHTTPRedirect" ResponseLocation="https://bodportal.geant.net/autobahn-gui/saml/LogoutServiceHTTPRedirectResponse"/>
-    <NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</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" Location="https://bodportal.geant.net/autobahn-gui/saml/SAMLAssertionConsumer" index="0" isDefault="true"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://bodportal.geant.net/autobahn-gui/saml/SAMLAssertionConsumer" index="1"/>
-    <AttributeConsumingService index="1">
-      <ServiceName xml:lang="en">BoD Portal</ServiceName>
-      <ServiceDescription xml:lang="en">A Portal that can be used to access the BoD service for requesting circuit reservations, tracking their status and for administrative operation</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="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="false"/>
-      <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="false"/>
-    </AttributeConsumingService>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Delivery of Advanced Network Technology to Europe Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">DANTE</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.dante.net</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <Company>DANTE IT Support</Company>
-    <EmailAddress>mailto:DANTEITSupport@dante.net</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <Company>DANTE IT</Company>
-    <EmailAddress>mailto:it@dante.net</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/bodportal.geant.net.xml b/swamid-interfederations-2.0/bodportal.geant.net.xml
deleted file mode 100644
index 7047dcaa..00000000
--- a/swamid-interfederations-2.0/bodportal.geant.net.xml
+++ /dev/null
@@ -1,97 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://bodportal.geant.net/autobahn-gui">
-  <!--
-		This is an autobahn-gui SP for Delivery of Advanced Network Technology to Europe Limited.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-09-17T13:37:01Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </Extensions>
-  <SPSSODescriptor AuthnRequestsSigned="true" 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">BoD Portal</mdui:DisplayName>
-        <mdui:Description xml:lang="en">A Portal that can be used to access the BoD service for requesting circuit reservations, tracking their status and for administrative operation</mdui:Description>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDKjCCAhKgAwIBAgIJAJDmGErGOKVvMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-						BAMTE2JvZHBvcnRhbC5nZWFudC5uZXQwHhcNMTQwNDExMTUxMDE1WhcNMTcwNDEx
-						MTUxMDE1WjAeMRwwGgYDVQQDExNib2Rwb3J0YWwuZ2VhbnQubmV0MIIBIjANBgkq
-						hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAx+u+ncMfh9UiMVWMm38eNH38kSQxGs53
-						YrgmXl2bJWx1cbDseJ28IIKa3xyR7kIDdGBSKgR9/+dcqmA0jitnQNkc0AxWO/SE
-						Ft9NXOWGPt8db1BuFD2DKtNnaqL5pxUFvv8ZvVtThf0cTWtbJXr9Fqscavh67Xs5
-						h8ZVV/PKJkWzI+MwNNZA4zY/XmlWgFj0JyOoNjKRj0CYdbAO9nxjDvglZBaBZhTL
-						yUFPKFK9PYhvCDGidE6vntyN0IerZR5CVZ4UVB4RpnxhbZJKz2ahDGYDMd7ALOGl
-						XVgbVZIEy1UaWSVw85hB3YolynSIDgQGMikPkm9Ob/p9MNqDSyzpyQIDAQABo2sw
-						aTBIBgNVHREEQTA/ghNib2Rwb3J0YWwuZ2VhbnQubmV0hihodHRwczovL2JvZHBv
-						cnRhbC5nZWFudC5uZXQvYXV0b2JhaG4tZ3VpMB0GA1UdDgQWBBSYqysjUZVqc/9I
-						LTMJw82mQm3zsTANBgkqhkiG9w0BAQUFAAOCAQEAh6tU+wzIMqNY47LypNVtdyZY
-						lLCWA5zLnspGrAZoHkiQWgD9ci7J/WBswCdrs/lSJ170u+CiBulzCNgp3c+z2mlq
-						6snJQNApKtE7JOOXXm7QiBmIeKycfmtkznSAfjQGjlfpIY/qmEPTljJQrj1cl0nH
-						7mHxBTgN/YlZj2H7XQZRQZMw5Y63exLyOzD38kGxt+dUUi07cGHenGHs7y7aPKZi
-						dTpN+ziSFq2kMwKJikMGPFrs84/iYCJxedloJqCXljGD5SMq4k5E4m36LpOyhduX
-						5Xv78mo22p+fa22GBf1a6s/flNWU8+CrOWGHHGO3mvNuS0wMHid3D5dSEk8cLw==
-					</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>
-						MIIDKjCCAhKgAwIBAgIJAJDmGErGOKVvMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-						BAMTE2JvZHBvcnRhbC5nZWFudC5uZXQwHhcNMTQwNDExMTUxMDE1WhcNMTcwNDEx
-						MTUxMDE1WjAeMRwwGgYDVQQDExNib2Rwb3J0YWwuZ2VhbnQubmV0MIIBIjANBgkq
-						hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAx+u+ncMfh9UiMVWMm38eNH38kSQxGs53
-						YrgmXl2bJWx1cbDseJ28IIKa3xyR7kIDdGBSKgR9/+dcqmA0jitnQNkc0AxWO/SE
-						Ft9NXOWGPt8db1BuFD2DKtNnaqL5pxUFvv8ZvVtThf0cTWtbJXr9Fqscavh67Xs5
-						h8ZVV/PKJkWzI+MwNNZA4zY/XmlWgFj0JyOoNjKRj0CYdbAO9nxjDvglZBaBZhTL
-						yUFPKFK9PYhvCDGidE6vntyN0IerZR5CVZ4UVB4RpnxhbZJKz2ahDGYDMd7ALOGl
-						XVgbVZIEy1UaWSVw85hB3YolynSIDgQGMikPkm9Ob/p9MNqDSyzpyQIDAQABo2sw
-						aTBIBgNVHREEQTA/ghNib2Rwb3J0YWwuZ2VhbnQubmV0hihodHRwczovL2JvZHBv
-						cnRhbC5nZWFudC5uZXQvYXV0b2JhaG4tZ3VpMB0GA1UdDgQWBBSYqysjUZVqc/9I
-						LTMJw82mQm3zsTANBgkqhkiG9w0BAQUFAAOCAQEAh6tU+wzIMqNY47LypNVtdyZY
-						lLCWA5zLnspGrAZoHkiQWgD9ci7J/WBswCdrs/lSJ170u+CiBulzCNgp3c+z2mlq
-						6snJQNApKtE7JOOXXm7QiBmIeKycfmtkznSAfjQGjlfpIY/qmEPTljJQrj1cl0nH
-						7mHxBTgN/YlZj2H7XQZRQZMw5Y63exLyOzD38kGxt+dUUi07cGHenGHs7y7aPKZi
-						dTpN+ziSFq2kMwKJikMGPFrs84/iYCJxedloJqCXljGD5SMq4k5E4m36LpOyhduX
-						5Xv78mo22p+fa22GBf1a6s/flNWU8+CrOWGHHGO3mvNuS0wMHid3D5dSEk8cLw==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://bodportal.geant.net/autobahn-gui/saml/LogoutServiceHTTPRedirect" ResponseLocation="https://bodportal.geant.net/autobahn-gui/saml/LogoutServiceHTTPRedirectResponse"/>
-    <NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</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" Location="https://bodportal.geant.net/autobahn-gui/saml/SAMLAssertionConsumer" index="0" isDefault="true"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://bodportal.geant.net/autobahn-gui/saml/SAMLAssertionConsumer" index="1"/>
-    <AttributeConsumingService index="1">
-      <ServiceName xml:lang="en">BoD Portal</ServiceName>
-      <ServiceDescription xml:lang="en">A Portal that can be used to access the BoD service for requesting circuit reservations, tracking their status and for administrative operation</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="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="false"/>
-      <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="false"/>
-    </AttributeConsumingService>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Delivery of Advanced Network Technology to Europe Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">DANTE</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.dante.net</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <Company>DANTE IT Support</Company>
-    <EmailAddress>mailto:DANTEITSupport@dante.net</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <Company>DANTE IT</Company>
-    <EmailAddress>mailto:it@dante.net</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/box-idp.nordu.net-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml b/swamid-interfederations-2.0/box-idp.nordu.net-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
deleted file mode 100644
index 0ce9e58e..00000000
--- a/swamid-interfederations-2.0/box-idp.nordu.net-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://box-idp.nordu.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://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/eu-adequate-protection</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/category/nren-service</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.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://box-idp.nordu.net/simplesaml/module.php/saml/sp/discoresp.php" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="sv">NORDUnet Box Service Access</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">NORDUnet Box Service Access</mdui:Description>
-        <mdui:DisplayName xml:lang="en">NORDUnet Box Service Access</mdui:DisplayName>
-        <mdui:Description xml:lang="en">NORDUnet Box Service Access</mdui:Description>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDODCCAiCgAwIBAgIJAIAVEWBFxna/MA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNVBAMTEWJveC1pZHAubm9yZHUubmV0MB4XDTEzMDYxOTA4MTYxMFoXDTIzMDQyODA4MTYxMFowHDEaMBgGA1UEAxMRYm94LWlkcC5ub3JkdS5uZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC5gi5hp6Uh1EAckiVKNUWqUqSPVuKmCEzE6iM85a+y3KZE+GUiaeaykltH0m83B3UsSxPeyZdP/mJTmCRFG/2F05uY1S6kcmK+X1Q+Trfswybt5xOdjlEq17GZD5qBzWMBdcQc60Ai9R2a7OvsRP05jljcv8x2njHbbmP/yqcUbKDL0niSm0bF06Rx5KVw+uWpDM3A34eWyf4aGulfnjy8xWq9plsiqzw2kfrfsmM+4S8oYRP9QqV3RVMlIYuPwyEzO7ko/lRp/moBFkOzbGU2ynuhpn51r9WSX4kK+1gyyi8l/QCZ9jfM+QLY7uB/mm/xUXBfH82K6tvJZLR64OL/AgMBAAGjfTB7MB0GA1UdDgQWBBSeFLZkxHZxW0JeFidp1pR3hhVMmzBMBgNVHSMERTBDgBSeFLZkxHZxW0JeFidp1pR3hhVMm6EgpB4wHDEaMBgGA1UEAxMRYm94LWlkcC5ub3JkdS5uZXSCCQCAFRFgRcZ2vzAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQAQZ0ZVUQvEOucts7DYA885XEbKJZ50tkNHgbna/ZQCdrSMXb4J2l3B706T7yATXBSaH5KgFIgrCVnoCa3CAPlxZf5IUsvU/en+OBFYYlJB6D/ndfvlwYS6uYOBeY3pY/Ct1Epu3AG2qNkZ+LgRNDxMvYLms76BOc4L5YuPOk76tZtbpqw9ChtwcJh3JXvICwZ75I3SyZ1PFOlVsusjq+pZ8Iqk1fGECEJs34szes0j11E46YSMmwLSH1uxyb4LAQQ2K+Ird2Jl9+yPhovsJ/DMxdtg6mA2TeybOSN46hTdPZ44iOuPKrfSrgBMtulYaUN7MG3Rx4b/SffCdTLgBKg2</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDODCCAiCgAwIBAgIJAIAVEWBFxna/MA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNVBAMTEWJveC1pZHAubm9yZHUubmV0MB4XDTEzMDYxOTA4MTYxMFoXDTIzMDQyODA4MTYxMFowHDEaMBgGA1UEAxMRYm94LWlkcC5ub3JkdS5uZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC5gi5hp6Uh1EAckiVKNUWqUqSPVuKmCEzE6iM85a+y3KZE+GUiaeaykltH0m83B3UsSxPeyZdP/mJTmCRFG/2F05uY1S6kcmK+X1Q+Trfswybt5xOdjlEq17GZD5qBzWMBdcQc60Ai9R2a7OvsRP05jljcv8x2njHbbmP/yqcUbKDL0niSm0bF06Rx5KVw+uWpDM3A34eWyf4aGulfnjy8xWq9plsiqzw2kfrfsmM+4S8oYRP9QqV3RVMlIYuPwyEzO7ko/lRp/moBFkOzbGU2ynuhpn51r9WSX4kK+1gyyi8l/QCZ9jfM+QLY7uB/mm/xUXBfH82K6tvJZLR64OL/AgMBAAGjfTB7MB0GA1UdDgQWBBSeFLZkxHZxW0JeFidp1pR3hhVMmzBMBgNVHSMERTBDgBSeFLZkxHZxW0JeFidp1pR3hhVMm6EgpB4wHDEaMBgGA1UEAxMRYm94LWlkcC5ub3JkdS5uZXSCCQCAFRFgRcZ2vzAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQAQZ0ZVUQvEOucts7DYA885XEbKJZ50tkNHgbna/ZQCdrSMXb4J2l3B706T7yATXBSaH5KgFIgrCVnoCa3CAPlxZf5IUsvU/en+OBFYYlJB6D/ndfvlwYS6uYOBeY3pY/Ct1Epu3AG2qNkZ+LgRNDxMvYLms76BOc4L5YuPOk76tZtbpqw9ChtwcJh3JXvICwZ75I3SyZ1PFOlVsusjq+pZ8Iqk1fGECEJs34szes0j11E46YSMmwLSH1uxyb4LAQQ2K+Ird2Jl9+yPhovsJ/DMxdtg6mA2TeybOSN46hTdPZ44iOuPKrfSrgBMtulYaUN7MG3Rx4b/SffCdTLgBKg2</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://box-idp.nordu.net/simplesaml/module.php/saml/sp/saml2-logout.php/default-sp"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://box-idp.nordu.net/simplesaml/module.php/saml/sp/saml2-acs.php/default-sp" index="0"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://box-idp.nordu.net/simplesaml/module.php/saml/sp/saml1-acs.php/default-sp" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://box-idp.nordu.net/simplesaml/module.php/saml/sp/saml2-acs.php/default-sp" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://box-idp.nordu.net/simplesaml/module.php/saml/sp/saml1-acs.php/default-sp/artifact" index="3"/>
-    <md:AttributeConsumingService index="1">
-      <md:ServiceName xml:lang="en">NORDUnet Box Service Access</md:ServiceName>
-      <md:ServiceDescription xml:lang="en">NORDUnet Box Service Access (box.com)</md:ServiceDescription>
-      <md:RequestedAttribute FriendlyName="email" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="surname" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="schacHomeOrganization" Name="urn:oid:1.3.6.1.4.1.25178.1.2.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-      <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-      <md:RequestedAttribute FriendlyName="eduPersonAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-      <md:RequestedAttribute FriendlyName="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" isRequired="false"/>
-      <md:RequestedAttribute FriendlyName="eduPersonEntitlement" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.7" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">NORDUnet</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">NORDUnet A/S</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.nordu.net</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>NORDUNet</md:GivenName>
-    <md:SurName>NOC</md:SurName>
-    <md:EmailAddress>noc@nordu.net</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/box-idp.nordu.net.xml b/swamid-interfederations-2.0/box-idp.nordu.net.xml
deleted file mode 100644
index 0ce9e58e..00000000
--- a/swamid-interfederations-2.0/box-idp.nordu.net.xml
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://box-idp.nordu.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://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/eu-adequate-protection</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/category/nren-service</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.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://box-idp.nordu.net/simplesaml/module.php/saml/sp/discoresp.php" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="sv">NORDUnet Box Service Access</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">NORDUnet Box Service Access</mdui:Description>
-        <mdui:DisplayName xml:lang="en">NORDUnet Box Service Access</mdui:DisplayName>
-        <mdui:Description xml:lang="en">NORDUnet Box Service Access</mdui:Description>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDODCCAiCgAwIBAgIJAIAVEWBFxna/MA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNVBAMTEWJveC1pZHAubm9yZHUubmV0MB4XDTEzMDYxOTA4MTYxMFoXDTIzMDQyODA4MTYxMFowHDEaMBgGA1UEAxMRYm94LWlkcC5ub3JkdS5uZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC5gi5hp6Uh1EAckiVKNUWqUqSPVuKmCEzE6iM85a+y3KZE+GUiaeaykltH0m83B3UsSxPeyZdP/mJTmCRFG/2F05uY1S6kcmK+X1Q+Trfswybt5xOdjlEq17GZD5qBzWMBdcQc60Ai9R2a7OvsRP05jljcv8x2njHbbmP/yqcUbKDL0niSm0bF06Rx5KVw+uWpDM3A34eWyf4aGulfnjy8xWq9plsiqzw2kfrfsmM+4S8oYRP9QqV3RVMlIYuPwyEzO7ko/lRp/moBFkOzbGU2ynuhpn51r9WSX4kK+1gyyi8l/QCZ9jfM+QLY7uB/mm/xUXBfH82K6tvJZLR64OL/AgMBAAGjfTB7MB0GA1UdDgQWBBSeFLZkxHZxW0JeFidp1pR3hhVMmzBMBgNVHSMERTBDgBSeFLZkxHZxW0JeFidp1pR3hhVMm6EgpB4wHDEaMBgGA1UEAxMRYm94LWlkcC5ub3JkdS5uZXSCCQCAFRFgRcZ2vzAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQAQZ0ZVUQvEOucts7DYA885XEbKJZ50tkNHgbna/ZQCdrSMXb4J2l3B706T7yATXBSaH5KgFIgrCVnoCa3CAPlxZf5IUsvU/en+OBFYYlJB6D/ndfvlwYS6uYOBeY3pY/Ct1Epu3AG2qNkZ+LgRNDxMvYLms76BOc4L5YuPOk76tZtbpqw9ChtwcJh3JXvICwZ75I3SyZ1PFOlVsusjq+pZ8Iqk1fGECEJs34szes0j11E46YSMmwLSH1uxyb4LAQQ2K+Ird2Jl9+yPhovsJ/DMxdtg6mA2TeybOSN46hTdPZ44iOuPKrfSrgBMtulYaUN7MG3Rx4b/SffCdTLgBKg2</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDODCCAiCgAwIBAgIJAIAVEWBFxna/MA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNVBAMTEWJveC1pZHAubm9yZHUubmV0MB4XDTEzMDYxOTA4MTYxMFoXDTIzMDQyODA4MTYxMFowHDEaMBgGA1UEAxMRYm94LWlkcC5ub3JkdS5uZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC5gi5hp6Uh1EAckiVKNUWqUqSPVuKmCEzE6iM85a+y3KZE+GUiaeaykltH0m83B3UsSxPeyZdP/mJTmCRFG/2F05uY1S6kcmK+X1Q+Trfswybt5xOdjlEq17GZD5qBzWMBdcQc60Ai9R2a7OvsRP05jljcv8x2njHbbmP/yqcUbKDL0niSm0bF06Rx5KVw+uWpDM3A34eWyf4aGulfnjy8xWq9plsiqzw2kfrfsmM+4S8oYRP9QqV3RVMlIYuPwyEzO7ko/lRp/moBFkOzbGU2ynuhpn51r9WSX4kK+1gyyi8l/QCZ9jfM+QLY7uB/mm/xUXBfH82K6tvJZLR64OL/AgMBAAGjfTB7MB0GA1UdDgQWBBSeFLZkxHZxW0JeFidp1pR3hhVMmzBMBgNVHSMERTBDgBSeFLZkxHZxW0JeFidp1pR3hhVMm6EgpB4wHDEaMBgGA1UEAxMRYm94LWlkcC5ub3JkdS5uZXSCCQCAFRFgRcZ2vzAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQAQZ0ZVUQvEOucts7DYA885XEbKJZ50tkNHgbna/ZQCdrSMXb4J2l3B706T7yATXBSaH5KgFIgrCVnoCa3CAPlxZf5IUsvU/en+OBFYYlJB6D/ndfvlwYS6uYOBeY3pY/Ct1Epu3AG2qNkZ+LgRNDxMvYLms76BOc4L5YuPOk76tZtbpqw9ChtwcJh3JXvICwZ75I3SyZ1PFOlVsusjq+pZ8Iqk1fGECEJs34szes0j11E46YSMmwLSH1uxyb4LAQQ2K+Ird2Jl9+yPhovsJ/DMxdtg6mA2TeybOSN46hTdPZ44iOuPKrfSrgBMtulYaUN7MG3Rx4b/SffCdTLgBKg2</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://box-idp.nordu.net/simplesaml/module.php/saml/sp/saml2-logout.php/default-sp"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://box-idp.nordu.net/simplesaml/module.php/saml/sp/saml2-acs.php/default-sp" index="0"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://box-idp.nordu.net/simplesaml/module.php/saml/sp/saml1-acs.php/default-sp" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://box-idp.nordu.net/simplesaml/module.php/saml/sp/saml2-acs.php/default-sp" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://box-idp.nordu.net/simplesaml/module.php/saml/sp/saml1-acs.php/default-sp/artifact" index="3"/>
-    <md:AttributeConsumingService index="1">
-      <md:ServiceName xml:lang="en">NORDUnet Box Service Access</md:ServiceName>
-      <md:ServiceDescription xml:lang="en">NORDUnet Box Service Access (box.com)</md:ServiceDescription>
-      <md:RequestedAttribute FriendlyName="email" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="surname" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="schacHomeOrganization" Name="urn:oid:1.3.6.1.4.1.25178.1.2.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-      <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-      <md:RequestedAttribute FriendlyName="eduPersonAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-      <md:RequestedAttribute FriendlyName="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" isRequired="false"/>
-      <md:RequestedAttribute FriendlyName="eduPersonEntitlement" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.7" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">NORDUnet</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">NORDUnet A/S</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.nordu.net</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>NORDUNet</md:GivenName>
-    <md:SurName>NOC</md:SurName>
-    <md:EmailAddress>noc@nordu.net</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/butare.ifrn.edu.br-idp-shibboleth.xml b/swamid-interfederations-2.0/butare.ifrn.edu.br-idp-shibboleth.xml
deleted file mode 100644
index fa6c2748..00000000
--- a/swamid-interfederations-2.0/butare.ifrn.edu.br-idp-shibboleth.xml
+++ /dev/null
@@ -1,102 +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://butare.ifrn.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">ifrn.local</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">IFRN - Instituto Federal do Rio Grande do Norte</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="pt-br">IFRN - Instituto Federal do Rio Grande do Norte</mdui:DisplayName>
-        <mdui:Description xml:lang="en">IFRN - Instituto Federal do Rio Grande do Norte</mdui:Description>
-        <mdui:Description xml:lang="pt-br">IFRN - Instituto Federal do Rio Grande do Norte</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.ifrn.edu.br/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="pt-br">http://www.ifrn.edu.br/</mdui:InformationURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-    MIIC0DCCAbgCAQAwDQYJKoZIhvcNAQEFBQAwLjEOMAwGA1UECxMFRElHVEkxCzAJ
-BgNVBAYTAkJSMQ8wDQYDVQQDEwZidXRhcmUwHhcNMTQwNTIzMTcxNjA1WhcNMTkw
-NTIyMTcxNjA1WjAuMQ4wDAYDVQQLEwVESUdUSTELMAkGA1UEBhMCQlIxDzANBgNV
-BAMTBmJ1dGFyZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAM36HWGk
-w9Q7QoZ/pbtE5BKDjrXkwJ9tZVggplOmcnG4XzvKsafA5oTyjkentzuk089/V8JN
-9mzTByAOyMJ1HZLoaWRKw5irjAh81RrPPZyLPjC3VCU6S7VGBwpwu/scnrLkIuz2
-PA4unF/vgPY0GCLtkVS7TKm59szt87xZQfhvKTibtji+DXqeJktm0L1DfZBWC1yH
-VTedJJUOzlGRh44xyZMcmyXO0J2sIu2BTHg0pbZkMmWubG0Gg5ieyn540znoTQ0Y
-ykhImtdHzr+NJnNJUrx0FP+tsfPlY+9+Jtd2hM8PwWoxyrMZ/Hrj6R3kblT4Ycu7
-zIgWdGliX+T+zoECAwEAATANBgkqhkiG9w0BAQUFAAOCAQEASiVRDUu+K0fsrVl8
-Ld9zFoEKWhywzji/ySqDyIep1wf9HKzuPscMkol+lHcwqWdDfP4dSCeIbBp0HB/M
-/b9h67Kd8W2HMo1Mj12dOow0SfUtSkS8jbGctmwRxok5wf4SkCBlXmDKw04T7O0u
-lx+OaodZO13DPijFFDZ6R5nzOpwA6e+psoKODdqhm5mvQ+VDbRT/YZuunq68OAp7
-W35U8nuplIQL1tiVmUzL7Zub4O/riXx0JChZvR5A5tw4s3ciugLNbUx/UAJkntmG
-Xwk5tjWfp+KBfraGK4/jLrShRzEEXl6J8UQl9r5q7ZD1UqQdRentbihSj4pfN5ID
-UG8d4Q==
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://butare.ifrn.edu.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://butare.ifrn.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://butare.ifrn.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://butare.ifrn.edu.br/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://butare.ifrn.edu.br/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://butare.ifrn.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">ifrn.local</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-      
-MIIC0DCCAbgCAQAwDQYJKoZIhvcNAQEFBQAwLjEOMAwGA1UECxMFRElHVEkxCzAJ
-BgNVBAYTAkJSMQ8wDQYDVQQDEwZidXRhcmUwHhcNMTQwNTIzMTcxNjA1WhcNMTkw
-NTIyMTcxNjA1WjAuMQ4wDAYDVQQLEwVESUdUSTELMAkGA1UEBhMCQlIxDzANBgNV
-BAMTBmJ1dGFyZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAM36HWGk
-w9Q7QoZ/pbtE5BKDjrXkwJ9tZVggplOmcnG4XzvKsafA5oTyjkentzuk089/V8JN
-9mzTByAOyMJ1HZLoaWRKw5irjAh81RrPPZyLPjC3VCU6S7VGBwpwu/scnrLkIuz2
-PA4unF/vgPY0GCLtkVS7TKm59szt87xZQfhvKTibtji+DXqeJktm0L1DfZBWC1yH
-VTedJJUOzlGRh44xyZMcmyXO0J2sIu2BTHg0pbZkMmWubG0Gg5ieyn540znoTQ0Y
-ykhImtdHzr+NJnNJUrx0FP+tsfPlY+9+Jtd2hM8PwWoxyrMZ/Hrj6R3kblT4Ycu7
-zIgWdGliX+T+zoECAwEAATANBgkqhkiG9w0BAQUFAAOCAQEASiVRDUu+K0fsrVl8
-Ld9zFoEKWhywzji/ySqDyIep1wf9HKzuPscMkol+lHcwqWdDfP4dSCeIbBp0HB/M
-/b9h67Kd8W2HMo1Mj12dOow0SfUtSkS8jbGctmwRxok5wf4SkCBlXmDKw04T7O0u
-lx+OaodZO13DPijFFDZ6R5nzOpwA6e+psoKODdqhm5mvQ+VDbRT/YZuunq68OAp7
-W35U8nuplIQL1tiVmUzL7Zub4O/riXx0JChZvR5A5tw4s3ciugLNbUx/UAJkntmG
-Xwk5tjWfp+KBfraGK4/jLrShRzEEXl6J8UQl9r5q7ZD1UqQdRentbihSj4pfN5ID
-UG8d4Q==
-		    
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://butare.ifrn.edu.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://butare.ifrn.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">IFRN - Instituto Federal do Rio Grande do Norte</OrganizationName>
-    <OrganizationName xml:lang="pt-br">IFRN - Instituto Federal do Rio Grande do Norte</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">IFRN - Instituto Federal do Rio Grande do Norte</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="pt-br">IFRN - Instituto Federal do Rio Grande do Norte</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.ifrn.edu.br/</OrganizationURL>
-    <OrganizationURL xml:lang="pt-br">http://www.ifrn.edu.br/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Carlos Eduardo Egito</SurName>
-    <EmailAddress>eduardo.egito@ifrn.edu.br</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/butare.ifrn.edu.br.xml b/swamid-interfederations-2.0/butare.ifrn.edu.br.xml
deleted file mode 100644
index fa6c2748..00000000
--- a/swamid-interfederations-2.0/butare.ifrn.edu.br.xml
+++ /dev/null
@@ -1,102 +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://butare.ifrn.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">ifrn.local</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">IFRN - Instituto Federal do Rio Grande do Norte</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="pt-br">IFRN - Instituto Federal do Rio Grande do Norte</mdui:DisplayName>
-        <mdui:Description xml:lang="en">IFRN - Instituto Federal do Rio Grande do Norte</mdui:Description>
-        <mdui:Description xml:lang="pt-br">IFRN - Instituto Federal do Rio Grande do Norte</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.ifrn.edu.br/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="pt-br">http://www.ifrn.edu.br/</mdui:InformationURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-    MIIC0DCCAbgCAQAwDQYJKoZIhvcNAQEFBQAwLjEOMAwGA1UECxMFRElHVEkxCzAJ
-BgNVBAYTAkJSMQ8wDQYDVQQDEwZidXRhcmUwHhcNMTQwNTIzMTcxNjA1WhcNMTkw
-NTIyMTcxNjA1WjAuMQ4wDAYDVQQLEwVESUdUSTELMAkGA1UEBhMCQlIxDzANBgNV
-BAMTBmJ1dGFyZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAM36HWGk
-w9Q7QoZ/pbtE5BKDjrXkwJ9tZVggplOmcnG4XzvKsafA5oTyjkentzuk089/V8JN
-9mzTByAOyMJ1HZLoaWRKw5irjAh81RrPPZyLPjC3VCU6S7VGBwpwu/scnrLkIuz2
-PA4unF/vgPY0GCLtkVS7TKm59szt87xZQfhvKTibtji+DXqeJktm0L1DfZBWC1yH
-VTedJJUOzlGRh44xyZMcmyXO0J2sIu2BTHg0pbZkMmWubG0Gg5ieyn540znoTQ0Y
-ykhImtdHzr+NJnNJUrx0FP+tsfPlY+9+Jtd2hM8PwWoxyrMZ/Hrj6R3kblT4Ycu7
-zIgWdGliX+T+zoECAwEAATANBgkqhkiG9w0BAQUFAAOCAQEASiVRDUu+K0fsrVl8
-Ld9zFoEKWhywzji/ySqDyIep1wf9HKzuPscMkol+lHcwqWdDfP4dSCeIbBp0HB/M
-/b9h67Kd8W2HMo1Mj12dOow0SfUtSkS8jbGctmwRxok5wf4SkCBlXmDKw04T7O0u
-lx+OaodZO13DPijFFDZ6R5nzOpwA6e+psoKODdqhm5mvQ+VDbRT/YZuunq68OAp7
-W35U8nuplIQL1tiVmUzL7Zub4O/riXx0JChZvR5A5tw4s3ciugLNbUx/UAJkntmG
-Xwk5tjWfp+KBfraGK4/jLrShRzEEXl6J8UQl9r5q7ZD1UqQdRentbihSj4pfN5ID
-UG8d4Q==
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://butare.ifrn.edu.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://butare.ifrn.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://butare.ifrn.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://butare.ifrn.edu.br/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://butare.ifrn.edu.br/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://butare.ifrn.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">ifrn.local</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-      
-MIIC0DCCAbgCAQAwDQYJKoZIhvcNAQEFBQAwLjEOMAwGA1UECxMFRElHVEkxCzAJ
-BgNVBAYTAkJSMQ8wDQYDVQQDEwZidXRhcmUwHhcNMTQwNTIzMTcxNjA1WhcNMTkw
-NTIyMTcxNjA1WjAuMQ4wDAYDVQQLEwVESUdUSTELMAkGA1UEBhMCQlIxDzANBgNV
-BAMTBmJ1dGFyZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAM36HWGk
-w9Q7QoZ/pbtE5BKDjrXkwJ9tZVggplOmcnG4XzvKsafA5oTyjkentzuk089/V8JN
-9mzTByAOyMJ1HZLoaWRKw5irjAh81RrPPZyLPjC3VCU6S7VGBwpwu/scnrLkIuz2
-PA4unF/vgPY0GCLtkVS7TKm59szt87xZQfhvKTibtji+DXqeJktm0L1DfZBWC1yH
-VTedJJUOzlGRh44xyZMcmyXO0J2sIu2BTHg0pbZkMmWubG0Gg5ieyn540znoTQ0Y
-ykhImtdHzr+NJnNJUrx0FP+tsfPlY+9+Jtd2hM8PwWoxyrMZ/Hrj6R3kblT4Ycu7
-zIgWdGliX+T+zoECAwEAATANBgkqhkiG9w0BAQUFAAOCAQEASiVRDUu+K0fsrVl8
-Ld9zFoEKWhywzji/ySqDyIep1wf9HKzuPscMkol+lHcwqWdDfP4dSCeIbBp0HB/M
-/b9h67Kd8W2HMo1Mj12dOow0SfUtSkS8jbGctmwRxok5wf4SkCBlXmDKw04T7O0u
-lx+OaodZO13DPijFFDZ6R5nzOpwA6e+psoKODdqhm5mvQ+VDbRT/YZuunq68OAp7
-W35U8nuplIQL1tiVmUzL7Zub4O/riXx0JChZvR5A5tw4s3ciugLNbUx/UAJkntmG
-Xwk5tjWfp+KBfraGK4/jLrShRzEEXl6J8UQl9r5q7ZD1UqQdRentbihSj4pfN5ID
-UG8d4Q==
-		    
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://butare.ifrn.edu.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://butare.ifrn.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">IFRN - Instituto Federal do Rio Grande do Norte</OrganizationName>
-    <OrganizationName xml:lang="pt-br">IFRN - Instituto Federal do Rio Grande do Norte</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">IFRN - Instituto Federal do Rio Grande do Norte</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="pt-br">IFRN - Instituto Federal do Rio Grande do Norte</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.ifrn.edu.br/</OrganizationURL>
-    <OrganizationURL xml:lang="pt-br">http://www.ifrn.edu.br/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Carlos Eduardo Egito</SurName>
-    <EmailAddress>eduardo.egito@ifrn.edu.br</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/cafe-gateway.ifce.edu.br-idp-shibboleth.xml b/swamid-interfederations-2.0/cafe-gateway.ifce.edu.br-idp-shibboleth.xml
deleted file mode 100644
index 3c0cb550..00000000
--- a/swamid-interfederations-2.0/cafe-gateway.ifce.edu.br-idp-shibboleth.xml
+++ /dev/null
@@ -1,98 +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-gateway.ifce.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">edu.br</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">IFCE - Instituto Federal de Educacao do Ceara</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="pt-br">IFCE - Instituto Federal de Educacao do Ceara</mdui:DisplayName>
-        <mdui:Description xml:lang="en">IFCE - Instituto Federal de Educacao do Ceara</mdui:Description>
-        <mdui:Description xml:lang="pt-br">IFCE - Instituto Federal de Educacao do Ceara</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.ifce.edu.br</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="pt-br">http://www.ifce.edu.br</mdui:InformationURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-    MIICjjCCAXYCAQAwDQYJKoZIhvcNAQEFBQAwDTELMAkGA1UEBhMCQlIwHhcNMTQw
-NDIzMTQxMTM1WhcNMTkwNDIyMTQxMTM1WjANMQswCQYDVQQGEwJCUjCCASIwDQYJ
-KoZIhvcNAQEBBQADggEPADCCAQoCggEBAMG0Ale+E+Hc6LXUIYFAyexypOGse0ZA
-iHv8A1m2SoiVpP/AuxZjHeZ8tgYB2g9wEV7sBVtRzcWPpfDnMEnwV0ycZLq1ud85
-anRUWHCXgqjgBOJPC5SNfur9b+c+z68csotN67l/4KhThVlX1bDSKsgb9sBzlHdx
-lmjPqPt4nPQG3f3eg+A+zVVoTbciDR+MM0aaoww0oFspsBxsSOzmwTO8y5SWh0Zt
-DN50/KIeZqdmLR/bNg0VIHieyKggu0df7583pofwhq/khw85kayRWOZRlK2DPqM4
-lkWYFa9hwi7SjViGte4iFBm5QyU9ROxtr1BrRruVh1gvRiQ21JEqYh0CAwEAATAN
-BgkqhkiG9w0BAQUFAAOCAQEAgAWYi5wzaShN4+xW6GKvJB95rStAKuVBMNbvOaW+
-VvokC6np6tH3c6DmJS4Nk2ko8JvW46JKE7FDJ33yhdbg7DNFE8d9jTj1afNL99p8
-RnKzPbbDSpF86ZMV/CcGW3gKf/EpRr3M7g7Q+1bP5IBgF1wlxaP6hge0FbmKOML/
-cSsmJF5QDRLxFl+wUr9NYd05jJwNn87GVqad1+05/vnafFOk3c8k0ZD1BrCpX6eZ
-F/cL2jO5urN3UFVa2NBuec51EbyHkL8vkzLdUf3pGTP/aDDHiUofaXC1MA2+xo1o
-WKF3ut56xBKMt3NdUfAXqqOu8wRUZYIwpU2ZpT8Cn4Y7Yw==
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe-gateway.ifce.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-gateway.ifce.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-gateway.ifce.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cafe-gateway.ifce.edu.br/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://cafe-gateway.ifce.edu.br/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://cafe-gateway.ifce.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>
-      
-MIICjjCCAXYCAQAwDQYJKoZIhvcNAQEFBQAwDTELMAkGA1UEBhMCQlIwHhcNMTQw
-NDIzMTQxMTM1WhcNMTkwNDIyMTQxMTM1WjANMQswCQYDVQQGEwJCUjCCASIwDQYJ
-KoZIhvcNAQEBBQADggEPADCCAQoCggEBAMG0Ale+E+Hc6LXUIYFAyexypOGse0ZA
-iHv8A1m2SoiVpP/AuxZjHeZ8tgYB2g9wEV7sBVtRzcWPpfDnMEnwV0ycZLq1ud85
-anRUWHCXgqjgBOJPC5SNfur9b+c+z68csotN67l/4KhThVlX1bDSKsgb9sBzlHdx
-lmjPqPt4nPQG3f3eg+A+zVVoTbciDR+MM0aaoww0oFspsBxsSOzmwTO8y5SWh0Zt
-DN50/KIeZqdmLR/bNg0VIHieyKggu0df7583pofwhq/khw85kayRWOZRlK2DPqM4
-lkWYFa9hwi7SjViGte4iFBm5QyU9ROxtr1BrRruVh1gvRiQ21JEqYh0CAwEAATAN
-BgkqhkiG9w0BAQUFAAOCAQEAgAWYi5wzaShN4+xW6GKvJB95rStAKuVBMNbvOaW+
-VvokC6np6tH3c6DmJS4Nk2ko8JvW46JKE7FDJ33yhdbg7DNFE8d9jTj1afNL99p8
-RnKzPbbDSpF86ZMV/CcGW3gKf/EpRr3M7g7Q+1bP5IBgF1wlxaP6hge0FbmKOML/
-cSsmJF5QDRLxFl+wUr9NYd05jJwNn87GVqad1+05/vnafFOk3c8k0ZD1BrCpX6eZ
-F/cL2jO5urN3UFVa2NBuec51EbyHkL8vkzLdUf3pGTP/aDDHiUofaXC1MA2+xo1o
-WKF3ut56xBKMt3NdUfAXqqOu8wRUZYIwpU2ZpT8Cn4Y7Yw==
-                    
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe-gateway.ifce.edu.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafe-gateway.ifce.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">IFCE - Instituto Federal de Educacao do Ceara</OrganizationName>
-    <OrganizationName xml:lang="pt-br">IFCE - Instituto Federal de Educacao do Ceara</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">IFCE - Instituto Federal de Educacao do Ceara</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="pt-br">IFCE - Instituto Federal de Educacao do Ceara</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.ifce.edu.br</OrganizationURL>
-    <OrganizationURL xml:lang="pt-br">http://www.ifce.edu.br</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Jessyca</SurName>
-    <EmailAddress>jessyca@ifce.edu.br</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/cafe-gateway.ifce.edu.br.xml b/swamid-interfederations-2.0/cafe-gateway.ifce.edu.br.xml
deleted file mode 100644
index 3c0cb550..00000000
--- a/swamid-interfederations-2.0/cafe-gateway.ifce.edu.br.xml
+++ /dev/null
@@ -1,98 +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-gateway.ifce.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">edu.br</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">IFCE - Instituto Federal de Educacao do Ceara</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="pt-br">IFCE - Instituto Federal de Educacao do Ceara</mdui:DisplayName>
-        <mdui:Description xml:lang="en">IFCE - Instituto Federal de Educacao do Ceara</mdui:Description>
-        <mdui:Description xml:lang="pt-br">IFCE - Instituto Federal de Educacao do Ceara</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.ifce.edu.br</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="pt-br">http://www.ifce.edu.br</mdui:InformationURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-    MIICjjCCAXYCAQAwDQYJKoZIhvcNAQEFBQAwDTELMAkGA1UEBhMCQlIwHhcNMTQw
-NDIzMTQxMTM1WhcNMTkwNDIyMTQxMTM1WjANMQswCQYDVQQGEwJCUjCCASIwDQYJ
-KoZIhvcNAQEBBQADggEPADCCAQoCggEBAMG0Ale+E+Hc6LXUIYFAyexypOGse0ZA
-iHv8A1m2SoiVpP/AuxZjHeZ8tgYB2g9wEV7sBVtRzcWPpfDnMEnwV0ycZLq1ud85
-anRUWHCXgqjgBOJPC5SNfur9b+c+z68csotN67l/4KhThVlX1bDSKsgb9sBzlHdx
-lmjPqPt4nPQG3f3eg+A+zVVoTbciDR+MM0aaoww0oFspsBxsSOzmwTO8y5SWh0Zt
-DN50/KIeZqdmLR/bNg0VIHieyKggu0df7583pofwhq/khw85kayRWOZRlK2DPqM4
-lkWYFa9hwi7SjViGte4iFBm5QyU9ROxtr1BrRruVh1gvRiQ21JEqYh0CAwEAATAN
-BgkqhkiG9w0BAQUFAAOCAQEAgAWYi5wzaShN4+xW6GKvJB95rStAKuVBMNbvOaW+
-VvokC6np6tH3c6DmJS4Nk2ko8JvW46JKE7FDJ33yhdbg7DNFE8d9jTj1afNL99p8
-RnKzPbbDSpF86ZMV/CcGW3gKf/EpRr3M7g7Q+1bP5IBgF1wlxaP6hge0FbmKOML/
-cSsmJF5QDRLxFl+wUr9NYd05jJwNn87GVqad1+05/vnafFOk3c8k0ZD1BrCpX6eZ
-F/cL2jO5urN3UFVa2NBuec51EbyHkL8vkzLdUf3pGTP/aDDHiUofaXC1MA2+xo1o
-WKF3ut56xBKMt3NdUfAXqqOu8wRUZYIwpU2ZpT8Cn4Y7Yw==
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe-gateway.ifce.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-gateway.ifce.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-gateway.ifce.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cafe-gateway.ifce.edu.br/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://cafe-gateway.ifce.edu.br/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://cafe-gateway.ifce.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>
-      
-MIICjjCCAXYCAQAwDQYJKoZIhvcNAQEFBQAwDTELMAkGA1UEBhMCQlIwHhcNMTQw
-NDIzMTQxMTM1WhcNMTkwNDIyMTQxMTM1WjANMQswCQYDVQQGEwJCUjCCASIwDQYJ
-KoZIhvcNAQEBBQADggEPADCCAQoCggEBAMG0Ale+E+Hc6LXUIYFAyexypOGse0ZA
-iHv8A1m2SoiVpP/AuxZjHeZ8tgYB2g9wEV7sBVtRzcWPpfDnMEnwV0ycZLq1ud85
-anRUWHCXgqjgBOJPC5SNfur9b+c+z68csotN67l/4KhThVlX1bDSKsgb9sBzlHdx
-lmjPqPt4nPQG3f3eg+A+zVVoTbciDR+MM0aaoww0oFspsBxsSOzmwTO8y5SWh0Zt
-DN50/KIeZqdmLR/bNg0VIHieyKggu0df7583pofwhq/khw85kayRWOZRlK2DPqM4
-lkWYFa9hwi7SjViGte4iFBm5QyU9ROxtr1BrRruVh1gvRiQ21JEqYh0CAwEAATAN
-BgkqhkiG9w0BAQUFAAOCAQEAgAWYi5wzaShN4+xW6GKvJB95rStAKuVBMNbvOaW+
-VvokC6np6tH3c6DmJS4Nk2ko8JvW46JKE7FDJ33yhdbg7DNFE8d9jTj1afNL99p8
-RnKzPbbDSpF86ZMV/CcGW3gKf/EpRr3M7g7Q+1bP5IBgF1wlxaP6hge0FbmKOML/
-cSsmJF5QDRLxFl+wUr9NYd05jJwNn87GVqad1+05/vnafFOk3c8k0ZD1BrCpX6eZ
-F/cL2jO5urN3UFVa2NBuec51EbyHkL8vkzLdUf3pGTP/aDDHiUofaXC1MA2+xo1o
-WKF3ut56xBKMt3NdUfAXqqOu8wRUZYIwpU2ZpT8Cn4Y7Yw==
-                    
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe-gateway.ifce.edu.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafe-gateway.ifce.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">IFCE - Instituto Federal de Educacao do Ceara</OrganizationName>
-    <OrganizationName xml:lang="pt-br">IFCE - Instituto Federal de Educacao do Ceara</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">IFCE - Instituto Federal de Educacao do Ceara</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="pt-br">IFCE - Instituto Federal de Educacao do Ceara</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.ifce.edu.br</OrganizationURL>
-    <OrganizationURL xml:lang="pt-br">http://www.ifce.edu.br</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Jessyca</SurName>
-    <EmailAddress>jessyca@ifce.edu.br</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/cafe-idp.ufc.br-idp-shibboleth.xml b/swamid-interfederations-2.0/cafe-idp.ufc.br-idp-shibboleth.xml
deleted file mode 100644
index b62100cf..00000000
--- a/swamid-interfederations-2.0/cafe-idp.ufc.br-idp-shibboleth.xml
+++ /dev/null
@@ -1,130 +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-idp.ufc.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">ufc.br</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">UFC - Universidade Federal do Ceara</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="pt-br">UFC - Universidade Federal do Ceara</mdui:DisplayName>
-        <mdui:Description xml:lang="en">UFC - Universidade Federal do Ceara</mdui:Description>
-        <mdui:Description xml:lang="pt-br">UFC - Universidade Federal do Ceara</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.ufc.br/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="pt-br">http://www.ufc.br/</mdui:InformationURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-    MIIFlTCCA32gAwIBAgIDIAACMA0GCSqGSIb3DQEBBQUAMIGmMQswCQYDVQQGEwJC
-UjEOMAwGA1UECBMFQ2VhcmExJjAkBgNVBAoTHVVuaXZlcnNpZGFkZSBGZWRlcmFs
-IGRvIENlYXJhMS8wLQYDVQQLEyZTZWNyZXRhcmlhIGRlIFRlY25vbG9naWEgZGEg
-SW5mb3JtYWNhbzETMBEGA1UEAxMKU1RJL1VGQyBDQTEZMBcGCSqGSIb3DQEJARYK
-aWNwQHVmYy5icjAeFw0xMjAyMTQwMDA3MjdaFw0xNTAyMTMwMDA3MjdaMIG6MQsw
-CQYDVQQGEwJCUjEOMAwGA1UECBMFQ2VhcmExJjAkBgNVBAoTHVVuaXZlcnNpZGFk
-ZSBGZWRlcmFsIGRvIENlYXJhMS8wLQYDVQQLEyZTZWNyZXRhcmlhIGRlIFRlY25v
-bG9naWEgZGEgSW5mb3JtYWNhbzEYMBYGA1UEAxMPY2FmZS1pZHAudWZjLmJyMSgw
-JgYJKoZIhvcNAQkBFhlmZWRlcmFjYW9fY2FmZUBzdGkudWZjLmJyMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApeXN9BTjR7AV5uuJb2dRAKEJt/KzgRiI
-3cCUyOmrPUE04I8Sbp3wWxlVA1k6iwItp5B+2tOvfa0+4uvv0osb12bQSdPEzwj2
-KPA6BIqbvgHKFX+eUI0Elg+/XfxOug2Iw/7s/GGjYizkbe+DzuvfN/MDM0wfHorN
-fDHhbmIa6H+MD4sPqWe1bQ3SK/SX0s1k+3K9fIqapdZN4EUY4vslRpeOIqWrxWAC
-jSoEO1a0O6Y7ICx7fCl6G/WWTO0xQD7viAm62J2HGoLQDghXcVPPUnVjCkjbsKVn
-AmiObh4lMc+yMskm+xFdMBSbj/WBL/tHn2+uv0aLnQZ+zolC58vi8QIDAQABo4G1
-MIGyMAkGA1UdEwQCMAAwEQYJYIZIAYb4QgEBBAQDAgZAMAsGA1UdDwQEAwIFoDBF
-BglghkgBhvhCAQ0EOBY2Q2VyaWZpY2FkbyBnZXJhZG8gcGVsYSBBdXRvcmlkYWRl
-IENlcnRpZmljYWRvcmEgZGEgVUZDMB0GA1UdDgQWBBReOcIa7LgN9ILR8HfwOwXd
-X7YQqzAfBgNVHSMEGDAWgBQ3qefaK1KfmDaPK09j5qeA8C5kdTANBgkqhkiG9w0B
-AQUFAAOCAgEAdoQaFNlkV6XxTaRY95vhYe79oEu9pt9GWN+0x7/BHAb3wAtyjCiN
-shOgW6WuelgWTpWnJZFWPJ02/DPzjYaqxikgPIbmPOjpcnRoKr+7ZV0adecOAx0v
-QRlyped/WCV7UoPxKSWBAH525HatXsdqHY4UEAc+DnM72dljQxKuoO+FgBkIsfFb
-nY6nDjqofZpjeUaEiXx0iZZawpPPL2f3fUzQacCktIcogWT7owSs7kBLWjkxqX8H
-bBwpy0Vi7GQ+vlis7101Akkn5ByEla+CEdZNQ9mSQ6PkX2o4PBqjVHkOkphnxSq6
-U5ckksAXefMjEll0i+uyDWRcAU1RPpfUsX8XFeTPDQQUE+tBLd/xzM8lRPKKRZmt
-8PMWDvkMh+AejFsL0qhWJ/ZhdkiSFGBxna7KujkU94yQ3uswkW/zk9cOFLKMcYNj
-oXi2CET7dQR41z4rOiT/m/ahE28z7UIGtPQ6/nWSbJNlDjrMBJUUvSTYiYmRrERm
-6+dvS6XbmQE7oRwKAr4C/QzrTcqNeUjNyBdwIM1JIew9x2rP8Oz8r4JvniFzpOQJ
-U9NOxeEjsUXIzVRleY7p9PdHzI8dlw1eaUXpY6wxo1I5tlE/s7CXBluBu1XFmfjW
-pvRqAIJbiBU2SoQSshxQrIgHmPuHBnucMrgU3yjwTjboiqKD9o88NyU=
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe-idp.ufc.br/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafe-idp.ufc.br/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-idp.ufc.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cafe-idp.ufc.br/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://cafe-idp.ufc.br/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://cafe-idp.ufc.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">ufc.br</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-      
-MIIFlTCCA32gAwIBAgIDIAACMA0GCSqGSIb3DQEBBQUAMIGmMQswCQYDVQQGEwJC
-UjEOMAwGA1UECBMFQ2VhcmExJjAkBgNVBAoTHVVuaXZlcnNpZGFkZSBGZWRlcmFs
-IGRvIENlYXJhMS8wLQYDVQQLEyZTZWNyZXRhcmlhIGRlIFRlY25vbG9naWEgZGEg
-SW5mb3JtYWNhbzETMBEGA1UEAxMKU1RJL1VGQyBDQTEZMBcGCSqGSIb3DQEJARYK
-aWNwQHVmYy5icjAeFw0xMjAyMTQwMDA3MjdaFw0xNTAyMTMwMDA3MjdaMIG6MQsw
-CQYDVQQGEwJCUjEOMAwGA1UECBMFQ2VhcmExJjAkBgNVBAoTHVVuaXZlcnNpZGFk
-ZSBGZWRlcmFsIGRvIENlYXJhMS8wLQYDVQQLEyZTZWNyZXRhcmlhIGRlIFRlY25v
-bG9naWEgZGEgSW5mb3JtYWNhbzEYMBYGA1UEAxMPY2FmZS1pZHAudWZjLmJyMSgw
-JgYJKoZIhvcNAQkBFhlmZWRlcmFjYW9fY2FmZUBzdGkudWZjLmJyMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApeXN9BTjR7AV5uuJb2dRAKEJt/KzgRiI
-3cCUyOmrPUE04I8Sbp3wWxlVA1k6iwItp5B+2tOvfa0+4uvv0osb12bQSdPEzwj2
-KPA6BIqbvgHKFX+eUI0Elg+/XfxOug2Iw/7s/GGjYizkbe+DzuvfN/MDM0wfHorN
-fDHhbmIa6H+MD4sPqWe1bQ3SK/SX0s1k+3K9fIqapdZN4EUY4vslRpeOIqWrxWAC
-jSoEO1a0O6Y7ICx7fCl6G/WWTO0xQD7viAm62J2HGoLQDghXcVPPUnVjCkjbsKVn
-AmiObh4lMc+yMskm+xFdMBSbj/WBL/tHn2+uv0aLnQZ+zolC58vi8QIDAQABo4G1
-MIGyMAkGA1UdEwQCMAAwEQYJYIZIAYb4QgEBBAQDAgZAMAsGA1UdDwQEAwIFoDBF
-BglghkgBhvhCAQ0EOBY2Q2VyaWZpY2FkbyBnZXJhZG8gcGVsYSBBdXRvcmlkYWRl
-IENlcnRpZmljYWRvcmEgZGEgVUZDMB0GA1UdDgQWBBReOcIa7LgN9ILR8HfwOwXd
-X7YQqzAfBgNVHSMEGDAWgBQ3qefaK1KfmDaPK09j5qeA8C5kdTANBgkqhkiG9w0B
-AQUFAAOCAgEAdoQaFNlkV6XxTaRY95vhYe79oEu9pt9GWN+0x7/BHAb3wAtyjCiN
-shOgW6WuelgWTpWnJZFWPJ02/DPzjYaqxikgPIbmPOjpcnRoKr+7ZV0adecOAx0v
-QRlyped/WCV7UoPxKSWBAH525HatXsdqHY4UEAc+DnM72dljQxKuoO+FgBkIsfFb
-nY6nDjqofZpjeUaEiXx0iZZawpPPL2f3fUzQacCktIcogWT7owSs7kBLWjkxqX8H
-bBwpy0Vi7GQ+vlis7101Akkn5ByEla+CEdZNQ9mSQ6PkX2o4PBqjVHkOkphnxSq6
-U5ckksAXefMjEll0i+uyDWRcAU1RPpfUsX8XFeTPDQQUE+tBLd/xzM8lRPKKRZmt
-8PMWDvkMh+AejFsL0qhWJ/ZhdkiSFGBxna7KujkU94yQ3uswkW/zk9cOFLKMcYNj
-oXi2CET7dQR41z4rOiT/m/ahE28z7UIGtPQ6/nWSbJNlDjrMBJUUvSTYiYmRrERm
-6+dvS6XbmQE7oRwKAr4C/QzrTcqNeUjNyBdwIM1JIew9x2rP8Oz8r4JvniFzpOQJ
-U9NOxeEjsUXIzVRleY7p9PdHzI8dlw1eaUXpY6wxo1I5tlE/s7CXBluBu1XFmfjW
-pvRqAIJbiBU2SoQSshxQrIgHmPuHBnucMrgU3yjwTjboiqKD9o88NyU=
-                    
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe-idp.ufc.br/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafe-idp.ufc.br/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">UFC - Universidade Federal do Ceara</OrganizationName>
-    <OrganizationName xml:lang="pt-br">UFC - Universidade Federal do Ceara</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">UFC - Universidade Federal do Ceara</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="pt-br">UFC - Universidade Federal do Ceara</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.ufc.br/</OrganizationURL>
-    <OrganizationURL xml:lang="pt-br">http://www.ufc.br/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Federacao CAFe</SurName>
-    <EmailAddress>federacao_cafe@sti.ufc.br</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/cafe-idp.ufc.br.xml b/swamid-interfederations-2.0/cafe-idp.ufc.br.xml
deleted file mode 100644
index b62100cf..00000000
--- a/swamid-interfederations-2.0/cafe-idp.ufc.br.xml
+++ /dev/null
@@ -1,130 +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-idp.ufc.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">ufc.br</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">UFC - Universidade Federal do Ceara</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="pt-br">UFC - Universidade Federal do Ceara</mdui:DisplayName>
-        <mdui:Description xml:lang="en">UFC - Universidade Federal do Ceara</mdui:Description>
-        <mdui:Description xml:lang="pt-br">UFC - Universidade Federal do Ceara</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.ufc.br/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="pt-br">http://www.ufc.br/</mdui:InformationURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-    MIIFlTCCA32gAwIBAgIDIAACMA0GCSqGSIb3DQEBBQUAMIGmMQswCQYDVQQGEwJC
-UjEOMAwGA1UECBMFQ2VhcmExJjAkBgNVBAoTHVVuaXZlcnNpZGFkZSBGZWRlcmFs
-IGRvIENlYXJhMS8wLQYDVQQLEyZTZWNyZXRhcmlhIGRlIFRlY25vbG9naWEgZGEg
-SW5mb3JtYWNhbzETMBEGA1UEAxMKU1RJL1VGQyBDQTEZMBcGCSqGSIb3DQEJARYK
-aWNwQHVmYy5icjAeFw0xMjAyMTQwMDA3MjdaFw0xNTAyMTMwMDA3MjdaMIG6MQsw
-CQYDVQQGEwJCUjEOMAwGA1UECBMFQ2VhcmExJjAkBgNVBAoTHVVuaXZlcnNpZGFk
-ZSBGZWRlcmFsIGRvIENlYXJhMS8wLQYDVQQLEyZTZWNyZXRhcmlhIGRlIFRlY25v
-bG9naWEgZGEgSW5mb3JtYWNhbzEYMBYGA1UEAxMPY2FmZS1pZHAudWZjLmJyMSgw
-JgYJKoZIhvcNAQkBFhlmZWRlcmFjYW9fY2FmZUBzdGkudWZjLmJyMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApeXN9BTjR7AV5uuJb2dRAKEJt/KzgRiI
-3cCUyOmrPUE04I8Sbp3wWxlVA1k6iwItp5B+2tOvfa0+4uvv0osb12bQSdPEzwj2
-KPA6BIqbvgHKFX+eUI0Elg+/XfxOug2Iw/7s/GGjYizkbe+DzuvfN/MDM0wfHorN
-fDHhbmIa6H+MD4sPqWe1bQ3SK/SX0s1k+3K9fIqapdZN4EUY4vslRpeOIqWrxWAC
-jSoEO1a0O6Y7ICx7fCl6G/WWTO0xQD7viAm62J2HGoLQDghXcVPPUnVjCkjbsKVn
-AmiObh4lMc+yMskm+xFdMBSbj/WBL/tHn2+uv0aLnQZ+zolC58vi8QIDAQABo4G1
-MIGyMAkGA1UdEwQCMAAwEQYJYIZIAYb4QgEBBAQDAgZAMAsGA1UdDwQEAwIFoDBF
-BglghkgBhvhCAQ0EOBY2Q2VyaWZpY2FkbyBnZXJhZG8gcGVsYSBBdXRvcmlkYWRl
-IENlcnRpZmljYWRvcmEgZGEgVUZDMB0GA1UdDgQWBBReOcIa7LgN9ILR8HfwOwXd
-X7YQqzAfBgNVHSMEGDAWgBQ3qefaK1KfmDaPK09j5qeA8C5kdTANBgkqhkiG9w0B
-AQUFAAOCAgEAdoQaFNlkV6XxTaRY95vhYe79oEu9pt9GWN+0x7/BHAb3wAtyjCiN
-shOgW6WuelgWTpWnJZFWPJ02/DPzjYaqxikgPIbmPOjpcnRoKr+7ZV0adecOAx0v
-QRlyped/WCV7UoPxKSWBAH525HatXsdqHY4UEAc+DnM72dljQxKuoO+FgBkIsfFb
-nY6nDjqofZpjeUaEiXx0iZZawpPPL2f3fUzQacCktIcogWT7owSs7kBLWjkxqX8H
-bBwpy0Vi7GQ+vlis7101Akkn5ByEla+CEdZNQ9mSQ6PkX2o4PBqjVHkOkphnxSq6
-U5ckksAXefMjEll0i+uyDWRcAU1RPpfUsX8XFeTPDQQUE+tBLd/xzM8lRPKKRZmt
-8PMWDvkMh+AejFsL0qhWJ/ZhdkiSFGBxna7KujkU94yQ3uswkW/zk9cOFLKMcYNj
-oXi2CET7dQR41z4rOiT/m/ahE28z7UIGtPQ6/nWSbJNlDjrMBJUUvSTYiYmRrERm
-6+dvS6XbmQE7oRwKAr4C/QzrTcqNeUjNyBdwIM1JIew9x2rP8Oz8r4JvniFzpOQJ
-U9NOxeEjsUXIzVRleY7p9PdHzI8dlw1eaUXpY6wxo1I5tlE/s7CXBluBu1XFmfjW
-pvRqAIJbiBU2SoQSshxQrIgHmPuHBnucMrgU3yjwTjboiqKD9o88NyU=
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe-idp.ufc.br/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafe-idp.ufc.br/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-idp.ufc.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cafe-idp.ufc.br/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://cafe-idp.ufc.br/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://cafe-idp.ufc.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">ufc.br</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-      
-MIIFlTCCA32gAwIBAgIDIAACMA0GCSqGSIb3DQEBBQUAMIGmMQswCQYDVQQGEwJC
-UjEOMAwGA1UECBMFQ2VhcmExJjAkBgNVBAoTHVVuaXZlcnNpZGFkZSBGZWRlcmFs
-IGRvIENlYXJhMS8wLQYDVQQLEyZTZWNyZXRhcmlhIGRlIFRlY25vbG9naWEgZGEg
-SW5mb3JtYWNhbzETMBEGA1UEAxMKU1RJL1VGQyBDQTEZMBcGCSqGSIb3DQEJARYK
-aWNwQHVmYy5icjAeFw0xMjAyMTQwMDA3MjdaFw0xNTAyMTMwMDA3MjdaMIG6MQsw
-CQYDVQQGEwJCUjEOMAwGA1UECBMFQ2VhcmExJjAkBgNVBAoTHVVuaXZlcnNpZGFk
-ZSBGZWRlcmFsIGRvIENlYXJhMS8wLQYDVQQLEyZTZWNyZXRhcmlhIGRlIFRlY25v
-bG9naWEgZGEgSW5mb3JtYWNhbzEYMBYGA1UEAxMPY2FmZS1pZHAudWZjLmJyMSgw
-JgYJKoZIhvcNAQkBFhlmZWRlcmFjYW9fY2FmZUBzdGkudWZjLmJyMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApeXN9BTjR7AV5uuJb2dRAKEJt/KzgRiI
-3cCUyOmrPUE04I8Sbp3wWxlVA1k6iwItp5B+2tOvfa0+4uvv0osb12bQSdPEzwj2
-KPA6BIqbvgHKFX+eUI0Elg+/XfxOug2Iw/7s/GGjYizkbe+DzuvfN/MDM0wfHorN
-fDHhbmIa6H+MD4sPqWe1bQ3SK/SX0s1k+3K9fIqapdZN4EUY4vslRpeOIqWrxWAC
-jSoEO1a0O6Y7ICx7fCl6G/WWTO0xQD7viAm62J2HGoLQDghXcVPPUnVjCkjbsKVn
-AmiObh4lMc+yMskm+xFdMBSbj/WBL/tHn2+uv0aLnQZ+zolC58vi8QIDAQABo4G1
-MIGyMAkGA1UdEwQCMAAwEQYJYIZIAYb4QgEBBAQDAgZAMAsGA1UdDwQEAwIFoDBF
-BglghkgBhvhCAQ0EOBY2Q2VyaWZpY2FkbyBnZXJhZG8gcGVsYSBBdXRvcmlkYWRl
-IENlcnRpZmljYWRvcmEgZGEgVUZDMB0GA1UdDgQWBBReOcIa7LgN9ILR8HfwOwXd
-X7YQqzAfBgNVHSMEGDAWgBQ3qefaK1KfmDaPK09j5qeA8C5kdTANBgkqhkiG9w0B
-AQUFAAOCAgEAdoQaFNlkV6XxTaRY95vhYe79oEu9pt9GWN+0x7/BHAb3wAtyjCiN
-shOgW6WuelgWTpWnJZFWPJ02/DPzjYaqxikgPIbmPOjpcnRoKr+7ZV0adecOAx0v
-QRlyped/WCV7UoPxKSWBAH525HatXsdqHY4UEAc+DnM72dljQxKuoO+FgBkIsfFb
-nY6nDjqofZpjeUaEiXx0iZZawpPPL2f3fUzQacCktIcogWT7owSs7kBLWjkxqX8H
-bBwpy0Vi7GQ+vlis7101Akkn5ByEla+CEdZNQ9mSQ6PkX2o4PBqjVHkOkphnxSq6
-U5ckksAXefMjEll0i+uyDWRcAU1RPpfUsX8XFeTPDQQUE+tBLd/xzM8lRPKKRZmt
-8PMWDvkMh+AejFsL0qhWJ/ZhdkiSFGBxna7KujkU94yQ3uswkW/zk9cOFLKMcYNj
-oXi2CET7dQR41z4rOiT/m/ahE28z7UIGtPQ6/nWSbJNlDjrMBJUUvSTYiYmRrERm
-6+dvS6XbmQE7oRwKAr4C/QzrTcqNeUjNyBdwIM1JIew9x2rP8Oz8r4JvniFzpOQJ
-U9NOxeEjsUXIzVRleY7p9PdHzI8dlw1eaUXpY6wxo1I5tlE/s7CXBluBu1XFmfjW
-pvRqAIJbiBU2SoQSshxQrIgHmPuHBnucMrgU3yjwTjboiqKD9o88NyU=
-                    
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe-idp.ufc.br/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafe-idp.ufc.br/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">UFC - Universidade Federal do Ceara</OrganizationName>
-    <OrganizationName xml:lang="pt-br">UFC - Universidade Federal do Ceara</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">UFC - Universidade Federal do Ceara</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="pt-br">UFC - Universidade Federal do Ceara</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.ufc.br/</OrganizationURL>
-    <OrganizationURL xml:lang="pt-br">http://www.ufc.br/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Federacao CAFe</SurName>
-    <EmailAddress>federacao_cafe@sti.ufc.br</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/cafe.accamargo.org.br-idp-shibboleth.xml b/swamid-interfederations-2.0/cafe.accamargo.org.br-idp-shibboleth.xml
deleted file mode 100644
index 386da33f..00000000
--- a/swamid-interfederations-2.0/cafe.accamargo.org.br-idp-shibboleth.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.accamargo.org.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">org.br</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">ACC - A.C.Camargo Cancer Center</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="pt-br">ACC - A.C.Camargo Cancer Center</mdui:DisplayName>
-        <mdui:Description xml:lang="en">ACC - A.C.Camargo Cancer Center</mdui:Description>
-        <mdui:Description xml:lang="pt-br">ACC - A.C.Camargo Cancer Center</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.accamargo.org.br/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="pt-br">http://www.accamargo.org.br/</mdui:InformationURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-    MIID3jCCAsYCAQAwDQYJKoZIhvcNAQEFBQAwgbQxIjAgBgNVBAoTGUEuQy5DYW1h
-cmdvIENhbmNlciBDZW50ZXIxCzAJBgNVBAsTAlRJMSUwIwYJKoZIhvcNAQkBFhZp
-bmZyYUBhY2NhbWFyZ28ub3JnLmJyMRIwEAYDVQQHEwlTYW8gUGF1bG8xEjAQBgNV
-BAgTCVNhbyBQYXVsbzELMAkGA1UEBhMCQlIxJTAjBgNVBAMTHGFjY2FmZS5jb3Jw
-LmFjY2FtYXJnby5vcmcuYnIwHhcNMTQwNzIyMTgwOTU4WhcNMTcwNzIxMTgwOTU4
-WjCBtDEiMCAGA1UEChMZQS5DLkNhbWFyZ28gQ2FuY2VyIENlbnRlcjELMAkGA1UE
-CxMCVEkxJTAjBgkqhkiG9w0BCQEWFmluZnJhQGFjY2FtYXJnby5vcmcuYnIxEjAQ
-BgNVBAcTCVNhbyBQYXVsbzESMBAGA1UECBMJU2FvIFBhdWxvMQswCQYDVQQGEwJC
-UjElMCMGA1UEAxMcYWNjYWZlLmNvcnAuYWNjYW1hcmdvLm9yZy5icjCCASIwDQYJ
-KoZIhvcNAQEBBQADggEPADCCAQoCggEBALY7jcZgj0WKZ4s0bkWLRwBKf7hOkYT9
-m4lQhe2Wg4nN6LiBEmcSbHdCOgFD/rpz6GptT0Z6nApwTmdIHsn7vzK+Jd9bbh/j
-z7fcvsk+r94PSrOLoRz9R77jq58k5OnEcAIZiz5YSWg9l5r9n7+YpMsIA8sARrVe
-EFjcqnXUcC24HfPlppXpUF03CROWXjuwUWMelVeFpAS2UKD1O01S9ch12PFqz0Tj
-5owqgBT9Vcn6hv6hfN8ogU6Ob7lyzgrVmlIFeAVfx58FbpW2z3tKSCAFXh1AdzsA
-TgABmcYBaMDTaOY7NsNBGQVIIhSalGPxpNEbJV+9YLg/c1KTszCSV5ECAwEAATAN
-BgkqhkiG9w0BAQUFAAOCAQEAk0bRv4nd7W6HTFmSGEsKPPM2ZKY8/c1EiZT283Gz
-VO27NGBym9ZhTv9bHftimmoMSvlOAdXILfwJsGdbFFh+B8s+7VDmbx1pRnq1kimU
-KaAy2jaC+ci8zFK7jN4Q6KgqzC1zZs8BTE8DCgEvXQM2dTIVr72bEPttKOCCbNIs
-9w0dgvDMZINHqX9D7fe3NBLD+3qT6huDlE2ZNwSyc+X8+u2eF2hnNzGpPEhXx/in
-WPQ16QixB5B6rtqjbR5194ASzPcn83Nq3+yCt0kYxyBx2zsH8TS1gkkMWhH+ryVi
-qityQ40gZWuWRd8gfBbCoN4OslA5NohCqtIm+5YasOdyzw==
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.accamargo.org.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafe.accamargo.org.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.accamargo.org.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cafe.accamargo.org.br/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://cafe.accamargo.org.br/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://cafe.accamargo.org.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">org.br</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-      
-MIID3jCCAsYCAQAwDQYJKoZIhvcNAQEFBQAwgbQxIjAgBgNVBAoTGUEuQy5DYW1h
-cmdvIENhbmNlciBDZW50ZXIxCzAJBgNVBAsTAlRJMSUwIwYJKoZIhvcNAQkBFhZp
-bmZyYUBhY2NhbWFyZ28ub3JnLmJyMRIwEAYDVQQHEwlTYW8gUGF1bG8xEjAQBgNV
-BAgTCVNhbyBQYXVsbzELMAkGA1UEBhMCQlIxJTAjBgNVBAMTHGFjY2FmZS5jb3Jw
-LmFjY2FtYXJnby5vcmcuYnIwHhcNMTQwNzIyMTgwOTU4WhcNMTcwNzIxMTgwOTU4
-WjCBtDEiMCAGA1UEChMZQS5DLkNhbWFyZ28gQ2FuY2VyIENlbnRlcjELMAkGA1UE
-CxMCVEkxJTAjBgkqhkiG9w0BCQEWFmluZnJhQGFjY2FtYXJnby5vcmcuYnIxEjAQ
-BgNVBAcTCVNhbyBQYXVsbzESMBAGA1UECBMJU2FvIFBhdWxvMQswCQYDVQQGEwJC
-UjElMCMGA1UEAxMcYWNjYWZlLmNvcnAuYWNjYW1hcmdvLm9yZy5icjCCASIwDQYJ
-KoZIhvcNAQEBBQADggEPADCCAQoCggEBALY7jcZgj0WKZ4s0bkWLRwBKf7hOkYT9
-m4lQhe2Wg4nN6LiBEmcSbHdCOgFD/rpz6GptT0Z6nApwTmdIHsn7vzK+Jd9bbh/j
-z7fcvsk+r94PSrOLoRz9R77jq58k5OnEcAIZiz5YSWg9l5r9n7+YpMsIA8sARrVe
-EFjcqnXUcC24HfPlppXpUF03CROWXjuwUWMelVeFpAS2UKD1O01S9ch12PFqz0Tj
-5owqgBT9Vcn6hv6hfN8ogU6Ob7lyzgrVmlIFeAVfx58FbpW2z3tKSCAFXh1AdzsA
-TgABmcYBaMDTaOY7NsNBGQVIIhSalGPxpNEbJV+9YLg/c1KTszCSV5ECAwEAATAN
-BgkqhkiG9w0BAQUFAAOCAQEAk0bRv4nd7W6HTFmSGEsKPPM2ZKY8/c1EiZT283Gz
-VO27NGBym9ZhTv9bHftimmoMSvlOAdXILfwJsGdbFFh+B8s+7VDmbx1pRnq1kimU
-KaAy2jaC+ci8zFK7jN4Q6KgqzC1zZs8BTE8DCgEvXQM2dTIVr72bEPttKOCCbNIs
-9w0dgvDMZINHqX9D7fe3NBLD+3qT6huDlE2ZNwSyc+X8+u2eF2hnNzGpPEhXx/in
-WPQ16QixB5B6rtqjbR5194ASzPcn83Nq3+yCt0kYxyBx2zsH8TS1gkkMWhH+ryVi
-qityQ40gZWuWRd8gfBbCoN4OslA5NohCqtIm+5YasOdyzw==
-                    
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.accamargo.org.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafe.accamargo.org.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">ACC - A.C.Camargo Cancer Center</OrganizationName>
-    <OrganizationName xml:lang="pt-br">ACC - A.C.Camargo Cancer Center</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">ACC - A.C.Camargo Cancer Center</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="pt-br">ACC - A.C.Camargo Cancer Center</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.accamargo.org.br/</OrganizationURL>
-    <OrganizationURL xml:lang="pt-br">http://www.accamargo.org.br/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Bruno Alencar</SurName>
-    <EmailAddress>infra@accamargo.org.br</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/cafe.accamargo.org.br.xml b/swamid-interfederations-2.0/cafe.accamargo.org.br.xml
deleted file mode 100644
index 386da33f..00000000
--- a/swamid-interfederations-2.0/cafe.accamargo.org.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.accamargo.org.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">org.br</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">ACC - A.C.Camargo Cancer Center</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="pt-br">ACC - A.C.Camargo Cancer Center</mdui:DisplayName>
-        <mdui:Description xml:lang="en">ACC - A.C.Camargo Cancer Center</mdui:Description>
-        <mdui:Description xml:lang="pt-br">ACC - A.C.Camargo Cancer Center</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.accamargo.org.br/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="pt-br">http://www.accamargo.org.br/</mdui:InformationURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-    MIID3jCCAsYCAQAwDQYJKoZIhvcNAQEFBQAwgbQxIjAgBgNVBAoTGUEuQy5DYW1h
-cmdvIENhbmNlciBDZW50ZXIxCzAJBgNVBAsTAlRJMSUwIwYJKoZIhvcNAQkBFhZp
-bmZyYUBhY2NhbWFyZ28ub3JnLmJyMRIwEAYDVQQHEwlTYW8gUGF1bG8xEjAQBgNV
-BAgTCVNhbyBQYXVsbzELMAkGA1UEBhMCQlIxJTAjBgNVBAMTHGFjY2FmZS5jb3Jw
-LmFjY2FtYXJnby5vcmcuYnIwHhcNMTQwNzIyMTgwOTU4WhcNMTcwNzIxMTgwOTU4
-WjCBtDEiMCAGA1UEChMZQS5DLkNhbWFyZ28gQ2FuY2VyIENlbnRlcjELMAkGA1UE
-CxMCVEkxJTAjBgkqhkiG9w0BCQEWFmluZnJhQGFjY2FtYXJnby5vcmcuYnIxEjAQ
-BgNVBAcTCVNhbyBQYXVsbzESMBAGA1UECBMJU2FvIFBhdWxvMQswCQYDVQQGEwJC
-UjElMCMGA1UEAxMcYWNjYWZlLmNvcnAuYWNjYW1hcmdvLm9yZy5icjCCASIwDQYJ
-KoZIhvcNAQEBBQADggEPADCCAQoCggEBALY7jcZgj0WKZ4s0bkWLRwBKf7hOkYT9
-m4lQhe2Wg4nN6LiBEmcSbHdCOgFD/rpz6GptT0Z6nApwTmdIHsn7vzK+Jd9bbh/j
-z7fcvsk+r94PSrOLoRz9R77jq58k5OnEcAIZiz5YSWg9l5r9n7+YpMsIA8sARrVe
-EFjcqnXUcC24HfPlppXpUF03CROWXjuwUWMelVeFpAS2UKD1O01S9ch12PFqz0Tj
-5owqgBT9Vcn6hv6hfN8ogU6Ob7lyzgrVmlIFeAVfx58FbpW2z3tKSCAFXh1AdzsA
-TgABmcYBaMDTaOY7NsNBGQVIIhSalGPxpNEbJV+9YLg/c1KTszCSV5ECAwEAATAN
-BgkqhkiG9w0BAQUFAAOCAQEAk0bRv4nd7W6HTFmSGEsKPPM2ZKY8/c1EiZT283Gz
-VO27NGBym9ZhTv9bHftimmoMSvlOAdXILfwJsGdbFFh+B8s+7VDmbx1pRnq1kimU
-KaAy2jaC+ci8zFK7jN4Q6KgqzC1zZs8BTE8DCgEvXQM2dTIVr72bEPttKOCCbNIs
-9w0dgvDMZINHqX9D7fe3NBLD+3qT6huDlE2ZNwSyc+X8+u2eF2hnNzGpPEhXx/in
-WPQ16QixB5B6rtqjbR5194ASzPcn83Nq3+yCt0kYxyBx2zsH8TS1gkkMWhH+ryVi
-qityQ40gZWuWRd8gfBbCoN4OslA5NohCqtIm+5YasOdyzw==
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.accamargo.org.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafe.accamargo.org.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.accamargo.org.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cafe.accamargo.org.br/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://cafe.accamargo.org.br/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://cafe.accamargo.org.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">org.br</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-      
-MIID3jCCAsYCAQAwDQYJKoZIhvcNAQEFBQAwgbQxIjAgBgNVBAoTGUEuQy5DYW1h
-cmdvIENhbmNlciBDZW50ZXIxCzAJBgNVBAsTAlRJMSUwIwYJKoZIhvcNAQkBFhZp
-bmZyYUBhY2NhbWFyZ28ub3JnLmJyMRIwEAYDVQQHEwlTYW8gUGF1bG8xEjAQBgNV
-BAgTCVNhbyBQYXVsbzELMAkGA1UEBhMCQlIxJTAjBgNVBAMTHGFjY2FmZS5jb3Jw
-LmFjY2FtYXJnby5vcmcuYnIwHhcNMTQwNzIyMTgwOTU4WhcNMTcwNzIxMTgwOTU4
-WjCBtDEiMCAGA1UEChMZQS5DLkNhbWFyZ28gQ2FuY2VyIENlbnRlcjELMAkGA1UE
-CxMCVEkxJTAjBgkqhkiG9w0BCQEWFmluZnJhQGFjY2FtYXJnby5vcmcuYnIxEjAQ
-BgNVBAcTCVNhbyBQYXVsbzESMBAGA1UECBMJU2FvIFBhdWxvMQswCQYDVQQGEwJC
-UjElMCMGA1UEAxMcYWNjYWZlLmNvcnAuYWNjYW1hcmdvLm9yZy5icjCCASIwDQYJ
-KoZIhvcNAQEBBQADggEPADCCAQoCggEBALY7jcZgj0WKZ4s0bkWLRwBKf7hOkYT9
-m4lQhe2Wg4nN6LiBEmcSbHdCOgFD/rpz6GptT0Z6nApwTmdIHsn7vzK+Jd9bbh/j
-z7fcvsk+r94PSrOLoRz9R77jq58k5OnEcAIZiz5YSWg9l5r9n7+YpMsIA8sARrVe
-EFjcqnXUcC24HfPlppXpUF03CROWXjuwUWMelVeFpAS2UKD1O01S9ch12PFqz0Tj
-5owqgBT9Vcn6hv6hfN8ogU6Ob7lyzgrVmlIFeAVfx58FbpW2z3tKSCAFXh1AdzsA
-TgABmcYBaMDTaOY7NsNBGQVIIhSalGPxpNEbJV+9YLg/c1KTszCSV5ECAwEAATAN
-BgkqhkiG9w0BAQUFAAOCAQEAk0bRv4nd7W6HTFmSGEsKPPM2ZKY8/c1EiZT283Gz
-VO27NGBym9ZhTv9bHftimmoMSvlOAdXILfwJsGdbFFh+B8s+7VDmbx1pRnq1kimU
-KaAy2jaC+ci8zFK7jN4Q6KgqzC1zZs8BTE8DCgEvXQM2dTIVr72bEPttKOCCbNIs
-9w0dgvDMZINHqX9D7fe3NBLD+3qT6huDlE2ZNwSyc+X8+u2eF2hnNzGpPEhXx/in
-WPQ16QixB5B6rtqjbR5194ASzPcn83Nq3+yCt0kYxyBx2zsH8TS1gkkMWhH+ryVi
-qityQ40gZWuWRd8gfBbCoN4OslA5NohCqtIm+5YasOdyzw==
-                    
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.accamargo.org.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafe.accamargo.org.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">ACC - A.C.Camargo Cancer Center</OrganizationName>
-    <OrganizationName xml:lang="pt-br">ACC - A.C.Camargo Cancer Center</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">ACC - A.C.Camargo Cancer Center</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="pt-br">ACC - A.C.Camargo Cancer Center</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.accamargo.org.br/</OrganizationURL>
-    <OrganizationURL xml:lang="pt-br">http://www.accamargo.org.br/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Bruno Alencar</SurName>
-    <EmailAddress>infra@accamargo.org.br</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/cafe.fucape.br-idp-shibboleth.xml b/swamid-interfederations-2.0/cafe.fucape.br-idp-shibboleth.xml
deleted file mode 100644
index abbd0cb3..00000000
--- a/swamid-interfederations-2.0/cafe.fucape.br-idp-shibboleth.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.fucape.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">fucape.br</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">FUCAPE - Fundacao Instituto Capixaba de Pesquisa em Contabilidade, Economia e Financas</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="pt-br">FUCAPE - Fundacao Instituto Capixaba de Pesquisa em Contabilidade, Economia e Financas</mdui:DisplayName>
-        <mdui:Description xml:lang="en">FUCAPE - Fundacao Instituto Capixaba de Pesquisa em Contabilidade, Economia e Financas</mdui:Description>
-        <mdui:Description xml:lang="pt-br">FUCAPE - Fundacao Instituto Capixaba de Pesquisa em Contabilidade, Economia e Financas</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.fucape.br/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="pt-br">http://www.fucape.br/</mdui:InformationURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-    MIIDkjCCAnoCAQAwDQYJKoZIhvcNAQEFBQAwgY4xDzANBgNVBAoTBkZVQ0FQRTEL
-MAkGA1UECxMCVEkxHTAbBgkqhkiG9w0BCQEWDmFsYW5AZnVjYXBlLmJyMRAwDgYD
-VQQHEwdWaXRvcmlhMRcwFQYDVQQIEw5Fc3Bpcml0byBTYW50bzELMAkGA1UEBhMC
-QlIxFzAVBgNVBAMTDmNhZmUuZnVjYXBlLmJyMB4XDTE0MDcyMTE0MTQzMloXDTE3
-MDcyMDE0MTQzMlowgY4xDzANBgNVBAoTBkZVQ0FQRTELMAkGA1UECxMCVEkxHTAb
-BgkqhkiG9w0BCQEWDmFsYW5AZnVjYXBlLmJyMRAwDgYDVQQHEwdWaXRvcmlhMRcw
-FQYDVQQIEw5Fc3Bpcml0byBTYW50bzELMAkGA1UEBhMCQlIxFzAVBgNVBAMTDmNh
-ZmUuZnVjYXBlLmJyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuelJ
-x+b7r1a3vz6ppasqWtnuIEm4peG1175sZV5n4Oi1Ue2l3RLaFIQCuN3QgMOX9aRw
-bHdyPcmVMx00V6h6+O5d9jEgQMAKmNaaZnk+Np0g9foDhas88QqGzOSiuVqqfM2t
-xKUeCrmtpcWfkA3m45bMqsJn6dXqw2ab1aAE4Q1IomGbEaKihPXeYjiTmUV/1Hi0
-Y1hNRA61k2nitSWQejfoWpwLtK70k+Puk9ATckYzEGxwnAdi9weymfGEvS/EOyf/
-SPJA9guZLqk1hI/+CuiBzJhtZCS4pKEHH+QLMCzUL9jkEoANkZdbRPrPiul9iQJ6
-eFiY+E1qLkm3UjAYDwIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQBDrq/iLpDIlO2N
-88cHM2THmN2Dxn7ZuQRr19FJCIirSSky4GOIsSB/14+BdR4eQoEbyEs5Uvm3ieF9
-61fcpTjzz++aO5InnG7lHizf7UWr9nzF2fU2IkGLwQxVfeaHDistKOK76rnI95mu
-E4OdkYGgyf+LHp/aUhHln+NTuJQpxrXdtXsIcPa3iZQqKRmeJRr1lOL8yyxtI/40
-dHLpEb2GiAkHQNRQKTTCQg+yOAk/nWBTzmu+TBpkzC5TnO3uDVKxdmt5T3OuWjdQ
-qMubODGxkJq4vSSeMKiYsZ5fRXyphXm3D/XUeBWkDNpllO0vCbW9BomAeLeAUJgj
-zD1vw9HJ
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.fucape.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafe.fucape.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.fucape.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cafe.fucape.br/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://cafe.fucape.br/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://cafe.fucape.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">fucape.br</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-      
-MIIDkjCCAnoCAQAwDQYJKoZIhvcNAQEFBQAwgY4xDzANBgNVBAoTBkZVQ0FQRTEL
-MAkGA1UECxMCVEkxHTAbBgkqhkiG9w0BCQEWDmFsYW5AZnVjYXBlLmJyMRAwDgYD
-VQQHEwdWaXRvcmlhMRcwFQYDVQQIEw5Fc3Bpcml0byBTYW50bzELMAkGA1UEBhMC
-QlIxFzAVBgNVBAMTDmNhZmUuZnVjYXBlLmJyMB4XDTE0MDcyMTE0MTQzMloXDTE3
-MDcyMDE0MTQzMlowgY4xDzANBgNVBAoTBkZVQ0FQRTELMAkGA1UECxMCVEkxHTAb
-BgkqhkiG9w0BCQEWDmFsYW5AZnVjYXBlLmJyMRAwDgYDVQQHEwdWaXRvcmlhMRcw
-FQYDVQQIEw5Fc3Bpcml0byBTYW50bzELMAkGA1UEBhMCQlIxFzAVBgNVBAMTDmNh
-ZmUuZnVjYXBlLmJyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuelJ
-x+b7r1a3vz6ppasqWtnuIEm4peG1175sZV5n4Oi1Ue2l3RLaFIQCuN3QgMOX9aRw
-bHdyPcmVMx00V6h6+O5d9jEgQMAKmNaaZnk+Np0g9foDhas88QqGzOSiuVqqfM2t
-xKUeCrmtpcWfkA3m45bMqsJn6dXqw2ab1aAE4Q1IomGbEaKihPXeYjiTmUV/1Hi0
-Y1hNRA61k2nitSWQejfoWpwLtK70k+Puk9ATckYzEGxwnAdi9weymfGEvS/EOyf/
-SPJA9guZLqk1hI/+CuiBzJhtZCS4pKEHH+QLMCzUL9jkEoANkZdbRPrPiul9iQJ6
-eFiY+E1qLkm3UjAYDwIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQBDrq/iLpDIlO2N
-88cHM2THmN2Dxn7ZuQRr19FJCIirSSky4GOIsSB/14+BdR4eQoEbyEs5Uvm3ieF9
-61fcpTjzz++aO5InnG7lHizf7UWr9nzF2fU2IkGLwQxVfeaHDistKOK76rnI95mu
-E4OdkYGgyf+LHp/aUhHln+NTuJQpxrXdtXsIcPa3iZQqKRmeJRr1lOL8yyxtI/40
-dHLpEb2GiAkHQNRQKTTCQg+yOAk/nWBTzmu+TBpkzC5TnO3uDVKxdmt5T3OuWjdQ
-qMubODGxkJq4vSSeMKiYsZ5fRXyphXm3D/XUeBWkDNpllO0vCbW9BomAeLeAUJgj
-zD1vw9HJ
-                    
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.fucape.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafe.fucape.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">FUCAPE - Fundacao Instituto Capixaba de Pesquisa em Contabilidade, Economia e Financas</OrganizationName>
-    <OrganizationName xml:lang="pt-br">FUCAPE - Fundacao Instituto Capixaba de Pesquisa em Contabilidade, Economia e Financas</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">FUCAPE - Fundacao Instituto Capixaba de Pesquisa em Contabilidade, Economia e Financas</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="pt-br">FUCAPE - Fundacao Instituto Capixaba de Pesquisa em Contabilidade, Economia e Financas</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.fucape.br/</OrganizationURL>
-    <OrganizationURL xml:lang="pt-br">http://www.fucape.br/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Alan Ruan</SurName>
-    <EmailAddress>alan@fucape.br</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/cafe.fucape.br.xml b/swamid-interfederations-2.0/cafe.fucape.br.xml
deleted file mode 100644
index abbd0cb3..00000000
--- a/swamid-interfederations-2.0/cafe.fucape.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.fucape.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">fucape.br</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">FUCAPE - Fundacao Instituto Capixaba de Pesquisa em Contabilidade, Economia e Financas</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="pt-br">FUCAPE - Fundacao Instituto Capixaba de Pesquisa em Contabilidade, Economia e Financas</mdui:DisplayName>
-        <mdui:Description xml:lang="en">FUCAPE - Fundacao Instituto Capixaba de Pesquisa em Contabilidade, Economia e Financas</mdui:Description>
-        <mdui:Description xml:lang="pt-br">FUCAPE - Fundacao Instituto Capixaba de Pesquisa em Contabilidade, Economia e Financas</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.fucape.br/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="pt-br">http://www.fucape.br/</mdui:InformationURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-    MIIDkjCCAnoCAQAwDQYJKoZIhvcNAQEFBQAwgY4xDzANBgNVBAoTBkZVQ0FQRTEL
-MAkGA1UECxMCVEkxHTAbBgkqhkiG9w0BCQEWDmFsYW5AZnVjYXBlLmJyMRAwDgYD
-VQQHEwdWaXRvcmlhMRcwFQYDVQQIEw5Fc3Bpcml0byBTYW50bzELMAkGA1UEBhMC
-QlIxFzAVBgNVBAMTDmNhZmUuZnVjYXBlLmJyMB4XDTE0MDcyMTE0MTQzMloXDTE3
-MDcyMDE0MTQzMlowgY4xDzANBgNVBAoTBkZVQ0FQRTELMAkGA1UECxMCVEkxHTAb
-BgkqhkiG9w0BCQEWDmFsYW5AZnVjYXBlLmJyMRAwDgYDVQQHEwdWaXRvcmlhMRcw
-FQYDVQQIEw5Fc3Bpcml0byBTYW50bzELMAkGA1UEBhMCQlIxFzAVBgNVBAMTDmNh
-ZmUuZnVjYXBlLmJyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuelJ
-x+b7r1a3vz6ppasqWtnuIEm4peG1175sZV5n4Oi1Ue2l3RLaFIQCuN3QgMOX9aRw
-bHdyPcmVMx00V6h6+O5d9jEgQMAKmNaaZnk+Np0g9foDhas88QqGzOSiuVqqfM2t
-xKUeCrmtpcWfkA3m45bMqsJn6dXqw2ab1aAE4Q1IomGbEaKihPXeYjiTmUV/1Hi0
-Y1hNRA61k2nitSWQejfoWpwLtK70k+Puk9ATckYzEGxwnAdi9weymfGEvS/EOyf/
-SPJA9guZLqk1hI/+CuiBzJhtZCS4pKEHH+QLMCzUL9jkEoANkZdbRPrPiul9iQJ6
-eFiY+E1qLkm3UjAYDwIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQBDrq/iLpDIlO2N
-88cHM2THmN2Dxn7ZuQRr19FJCIirSSky4GOIsSB/14+BdR4eQoEbyEs5Uvm3ieF9
-61fcpTjzz++aO5InnG7lHizf7UWr9nzF2fU2IkGLwQxVfeaHDistKOK76rnI95mu
-E4OdkYGgyf+LHp/aUhHln+NTuJQpxrXdtXsIcPa3iZQqKRmeJRr1lOL8yyxtI/40
-dHLpEb2GiAkHQNRQKTTCQg+yOAk/nWBTzmu+TBpkzC5TnO3uDVKxdmt5T3OuWjdQ
-qMubODGxkJq4vSSeMKiYsZ5fRXyphXm3D/XUeBWkDNpllO0vCbW9BomAeLeAUJgj
-zD1vw9HJ
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.fucape.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafe.fucape.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.fucape.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cafe.fucape.br/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://cafe.fucape.br/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://cafe.fucape.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">fucape.br</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-      
-MIIDkjCCAnoCAQAwDQYJKoZIhvcNAQEFBQAwgY4xDzANBgNVBAoTBkZVQ0FQRTEL
-MAkGA1UECxMCVEkxHTAbBgkqhkiG9w0BCQEWDmFsYW5AZnVjYXBlLmJyMRAwDgYD
-VQQHEwdWaXRvcmlhMRcwFQYDVQQIEw5Fc3Bpcml0byBTYW50bzELMAkGA1UEBhMC
-QlIxFzAVBgNVBAMTDmNhZmUuZnVjYXBlLmJyMB4XDTE0MDcyMTE0MTQzMloXDTE3
-MDcyMDE0MTQzMlowgY4xDzANBgNVBAoTBkZVQ0FQRTELMAkGA1UECxMCVEkxHTAb
-BgkqhkiG9w0BCQEWDmFsYW5AZnVjYXBlLmJyMRAwDgYDVQQHEwdWaXRvcmlhMRcw
-FQYDVQQIEw5Fc3Bpcml0byBTYW50bzELMAkGA1UEBhMCQlIxFzAVBgNVBAMTDmNh
-ZmUuZnVjYXBlLmJyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuelJ
-x+b7r1a3vz6ppasqWtnuIEm4peG1175sZV5n4Oi1Ue2l3RLaFIQCuN3QgMOX9aRw
-bHdyPcmVMx00V6h6+O5d9jEgQMAKmNaaZnk+Np0g9foDhas88QqGzOSiuVqqfM2t
-xKUeCrmtpcWfkA3m45bMqsJn6dXqw2ab1aAE4Q1IomGbEaKihPXeYjiTmUV/1Hi0
-Y1hNRA61k2nitSWQejfoWpwLtK70k+Puk9ATckYzEGxwnAdi9weymfGEvS/EOyf/
-SPJA9guZLqk1hI/+CuiBzJhtZCS4pKEHH+QLMCzUL9jkEoANkZdbRPrPiul9iQJ6
-eFiY+E1qLkm3UjAYDwIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQBDrq/iLpDIlO2N
-88cHM2THmN2Dxn7ZuQRr19FJCIirSSky4GOIsSB/14+BdR4eQoEbyEs5Uvm3ieF9
-61fcpTjzz++aO5InnG7lHizf7UWr9nzF2fU2IkGLwQxVfeaHDistKOK76rnI95mu
-E4OdkYGgyf+LHp/aUhHln+NTuJQpxrXdtXsIcPa3iZQqKRmeJRr1lOL8yyxtI/40
-dHLpEb2GiAkHQNRQKTTCQg+yOAk/nWBTzmu+TBpkzC5TnO3uDVKxdmt5T3OuWjdQ
-qMubODGxkJq4vSSeMKiYsZ5fRXyphXm3D/XUeBWkDNpllO0vCbW9BomAeLeAUJgj
-zD1vw9HJ
-                    
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.fucape.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafe.fucape.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">FUCAPE - Fundacao Instituto Capixaba de Pesquisa em Contabilidade, Economia e Financas</OrganizationName>
-    <OrganizationName xml:lang="pt-br">FUCAPE - Fundacao Instituto Capixaba de Pesquisa em Contabilidade, Economia e Financas</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">FUCAPE - Fundacao Instituto Capixaba de Pesquisa em Contabilidade, Economia e Financas</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="pt-br">FUCAPE - Fundacao Instituto Capixaba de Pesquisa em Contabilidade, Economia e Financas</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.fucape.br/</OrganizationURL>
-    <OrganizationURL xml:lang="pt-br">http://www.fucape.br/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Alan Ruan</SurName>
-    <EmailAddress>alan@fucape.br</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/cafe.iec.pa.gov.br-idp-shibboleth.xml b/swamid-interfederations-2.0/cafe.iec.pa.gov.br-idp-shibboleth.xml
deleted file mode 100644
index 89b475f9..00000000
--- a/swamid-interfederations-2.0/cafe.iec.pa.gov.br-idp-shibboleth.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.iec.pa.gov.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">iec.pa.gov.br</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">IEC - Instituto Evandro Chagas</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="pt-br">IEC - Instituto Evandro Chagas</mdui:DisplayName>
-        <mdui:Description xml:lang="en">IEC - Instituto Evandro Chagas</mdui:Description>
-        <mdui:Description xml:lang="pt-br">IEC - Instituto Evandro Chagas</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.iec.pa.gov.br/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="pt-br">http://www.iec.pa.gov.br/</mdui:InformationURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-    MIIDuDCCAqACAQAwDQYJKoZIhvcNAQEFBQAwgaExJzAlBgNVBAoTHklFQyAtIElu
-c3RpdHV0byBFdmFuZHJvIENoYWdhczEOMAwGA1UECxMFU09JTkYxITAfBgkqhkiG
-9w0BCQEWEnJlZGVAaWVjLnBhLmdvdi5icjEOMAwGA1UEBxMFYmVsZW0xDTALBgNV
-BAgTBFBBUkExCzAJBgNVBAYTAkJSMRcwFQYDVQQDEw5jYWZlLmllYy5sb2NhbDAe
-Fw0xNDA1MTMxNjIxMzFaFw0xNzA1MTIxNjIxMzFaMIGhMScwJQYDVQQKEx5JRUMg
-LSBJbnN0aXR1dG8gRXZhbmRybyBDaGFnYXMxDjAMBgNVBAsTBVNPSU5GMSEwHwYJ
-KoZIhvcNAQkBFhJyZWRlQGllYy5wYS5nb3YuYnIxDjAMBgNVBAcTBWJlbGVtMQ0w
-CwYDVQQIEwRQQVJBMQswCQYDVQQGEwJCUjEXMBUGA1UEAxMOY2FmZS5pZWMubG9j
-YWwwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC4e4hLNjYvI/xid2cN
-ozfVwKY2flC+dJyQwC+F3i7j+3u8ml5VuAU1P+ZKVchCjARurXRkZIQIQMknTJ2B
-nr5TLIe57cd6yE3vSEui+x/ZhwWxPJtyCWqHtw9emOrZ+X9UmTg+TKWaMaUBnyAd
-b0nCn4P7ohWfrlinhaFPk7+/OPf5rg7DPkUuqGPtOoyrotKFS0BrIE1cyxWPfOUS
-AmQz72t5uOMDuzLIkmgL9CHbSxudTfBsxAyWhwTaTM9ePIHaOyNHnExe+M6sFrwb
-3LitMRN/v94/4Az603CM6neLw/G3MMHna2OtjgpTwhg9+4SwRn2Sjs/A169LuIV/
-qnO5AgMBAAEwDQYJKoZIhvcNAQEFBQADggEBAGw3xN4fIch/7ZemmiIJO4SfcTiA
-MnnYpOL72tvaWm9Cz6jojUy3q5+/qfQKYYpdi0QgmZSD9W7Qi0CfsPTnh5TlKXGQ
-7SOa41lTVz9nWogz7gZjxKfVeC+52vQppkjhJquxpFzP7Vl3oaXoxdMNTMjzCNgG
-R8X+bipsWg0m2NWnZFq12T/qf139XlTRZdube41eU4LrmKaCRCx5LrSUc1ZUxvrY
-6pXgywuLBdDwr8nWSvtjkUszeTmK2s8k5glOmotvqggeFCBlKX5VREDzagTq8plQ
-Bdyy5D7y1xwm3x9CEhmG0/zei8OgU3ir0T/sHAfNMjKZGzA1KJdWQ7hXE40=
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.iec.pa.gov.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafe.iec.pa.gov.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.iec.pa.gov.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cafe.iec.pa.gov.br/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://cafe.iec.pa.gov.br/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://cafe.iec.pa.gov.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">iec.pa.gov.br</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-      
-MIIDuDCCAqACAQAwDQYJKoZIhvcNAQEFBQAwgaExJzAlBgNVBAoTHklFQyAtIElu
-c3RpdHV0byBFdmFuZHJvIENoYWdhczEOMAwGA1UECxMFU09JTkYxITAfBgkqhkiG
-9w0BCQEWEnJlZGVAaWVjLnBhLmdvdi5icjEOMAwGA1UEBxMFYmVsZW0xDTALBgNV
-BAgTBFBBUkExCzAJBgNVBAYTAkJSMRcwFQYDVQQDEw5jYWZlLmllYy5sb2NhbDAe
-Fw0xNDA1MTMxNjIxMzFaFw0xNzA1MTIxNjIxMzFaMIGhMScwJQYDVQQKEx5JRUMg
-LSBJbnN0aXR1dG8gRXZhbmRybyBDaGFnYXMxDjAMBgNVBAsTBVNPSU5GMSEwHwYJ
-KoZIhvcNAQkBFhJyZWRlQGllYy5wYS5nb3YuYnIxDjAMBgNVBAcTBWJlbGVtMQ0w
-CwYDVQQIEwRQQVJBMQswCQYDVQQGEwJCUjEXMBUGA1UEAxMOY2FmZS5pZWMubG9j
-YWwwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC4e4hLNjYvI/xid2cN
-ozfVwKY2flC+dJyQwC+F3i7j+3u8ml5VuAU1P+ZKVchCjARurXRkZIQIQMknTJ2B
-nr5TLIe57cd6yE3vSEui+x/ZhwWxPJtyCWqHtw9emOrZ+X9UmTg+TKWaMaUBnyAd
-b0nCn4P7ohWfrlinhaFPk7+/OPf5rg7DPkUuqGPtOoyrotKFS0BrIE1cyxWPfOUS
-AmQz72t5uOMDuzLIkmgL9CHbSxudTfBsxAyWhwTaTM9ePIHaOyNHnExe+M6sFrwb
-3LitMRN/v94/4Az603CM6neLw/G3MMHna2OtjgpTwhg9+4SwRn2Sjs/A169LuIV/
-qnO5AgMBAAEwDQYJKoZIhvcNAQEFBQADggEBAGw3xN4fIch/7ZemmiIJO4SfcTiA
-MnnYpOL72tvaWm9Cz6jojUy3q5+/qfQKYYpdi0QgmZSD9W7Qi0CfsPTnh5TlKXGQ
-7SOa41lTVz9nWogz7gZjxKfVeC+52vQppkjhJquxpFzP7Vl3oaXoxdMNTMjzCNgG
-R8X+bipsWg0m2NWnZFq12T/qf139XlTRZdube41eU4LrmKaCRCx5LrSUc1ZUxvrY
-6pXgywuLBdDwr8nWSvtjkUszeTmK2s8k5glOmotvqggeFCBlKX5VREDzagTq8plQ
-Bdyy5D7y1xwm3x9CEhmG0/zei8OgU3ir0T/sHAfNMjKZGzA1KJdWQ7hXE40=		
-		
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.iec.pa.gov.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafe.iec.pa.gov.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">IEC - Instituto Evandro Chagas </OrganizationName>
-    <OrganizationName xml:lang="pt-br">IEC - Instituto Evandro Chagas </OrganizationName>
-    <OrganizationDisplayName xml:lang="en">IEC - Instituto Evandro Chagas</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="pt-br">IEC - Instituto Evandro Chagas</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.iec.pa.gov.br/</OrganizationURL>
-    <OrganizationURL xml:lang="pt-br">http://www.iec.pa.gov.br/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Equipe de Operacao da Rede IEC</SurName>
-    <EmailAddress>rede@iec.pa.gov.br</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/cafe.iec.pa.gov.br.xml b/swamid-interfederations-2.0/cafe.iec.pa.gov.br.xml
deleted file mode 100644
index 89b475f9..00000000
--- a/swamid-interfederations-2.0/cafe.iec.pa.gov.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.iec.pa.gov.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">iec.pa.gov.br</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">IEC - Instituto Evandro Chagas</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="pt-br">IEC - Instituto Evandro Chagas</mdui:DisplayName>
-        <mdui:Description xml:lang="en">IEC - Instituto Evandro Chagas</mdui:Description>
-        <mdui:Description xml:lang="pt-br">IEC - Instituto Evandro Chagas</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.iec.pa.gov.br/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="pt-br">http://www.iec.pa.gov.br/</mdui:InformationURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-    MIIDuDCCAqACAQAwDQYJKoZIhvcNAQEFBQAwgaExJzAlBgNVBAoTHklFQyAtIElu
-c3RpdHV0byBFdmFuZHJvIENoYWdhczEOMAwGA1UECxMFU09JTkYxITAfBgkqhkiG
-9w0BCQEWEnJlZGVAaWVjLnBhLmdvdi5icjEOMAwGA1UEBxMFYmVsZW0xDTALBgNV
-BAgTBFBBUkExCzAJBgNVBAYTAkJSMRcwFQYDVQQDEw5jYWZlLmllYy5sb2NhbDAe
-Fw0xNDA1MTMxNjIxMzFaFw0xNzA1MTIxNjIxMzFaMIGhMScwJQYDVQQKEx5JRUMg
-LSBJbnN0aXR1dG8gRXZhbmRybyBDaGFnYXMxDjAMBgNVBAsTBVNPSU5GMSEwHwYJ
-KoZIhvcNAQkBFhJyZWRlQGllYy5wYS5nb3YuYnIxDjAMBgNVBAcTBWJlbGVtMQ0w
-CwYDVQQIEwRQQVJBMQswCQYDVQQGEwJCUjEXMBUGA1UEAxMOY2FmZS5pZWMubG9j
-YWwwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC4e4hLNjYvI/xid2cN
-ozfVwKY2flC+dJyQwC+F3i7j+3u8ml5VuAU1P+ZKVchCjARurXRkZIQIQMknTJ2B
-nr5TLIe57cd6yE3vSEui+x/ZhwWxPJtyCWqHtw9emOrZ+X9UmTg+TKWaMaUBnyAd
-b0nCn4P7ohWfrlinhaFPk7+/OPf5rg7DPkUuqGPtOoyrotKFS0BrIE1cyxWPfOUS
-AmQz72t5uOMDuzLIkmgL9CHbSxudTfBsxAyWhwTaTM9ePIHaOyNHnExe+M6sFrwb
-3LitMRN/v94/4Az603CM6neLw/G3MMHna2OtjgpTwhg9+4SwRn2Sjs/A169LuIV/
-qnO5AgMBAAEwDQYJKoZIhvcNAQEFBQADggEBAGw3xN4fIch/7ZemmiIJO4SfcTiA
-MnnYpOL72tvaWm9Cz6jojUy3q5+/qfQKYYpdi0QgmZSD9W7Qi0CfsPTnh5TlKXGQ
-7SOa41lTVz9nWogz7gZjxKfVeC+52vQppkjhJquxpFzP7Vl3oaXoxdMNTMjzCNgG
-R8X+bipsWg0m2NWnZFq12T/qf139XlTRZdube41eU4LrmKaCRCx5LrSUc1ZUxvrY
-6pXgywuLBdDwr8nWSvtjkUszeTmK2s8k5glOmotvqggeFCBlKX5VREDzagTq8plQ
-Bdyy5D7y1xwm3x9CEhmG0/zei8OgU3ir0T/sHAfNMjKZGzA1KJdWQ7hXE40=
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.iec.pa.gov.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafe.iec.pa.gov.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.iec.pa.gov.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cafe.iec.pa.gov.br/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://cafe.iec.pa.gov.br/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://cafe.iec.pa.gov.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">iec.pa.gov.br</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-      
-MIIDuDCCAqACAQAwDQYJKoZIhvcNAQEFBQAwgaExJzAlBgNVBAoTHklFQyAtIElu
-c3RpdHV0byBFdmFuZHJvIENoYWdhczEOMAwGA1UECxMFU09JTkYxITAfBgkqhkiG
-9w0BCQEWEnJlZGVAaWVjLnBhLmdvdi5icjEOMAwGA1UEBxMFYmVsZW0xDTALBgNV
-BAgTBFBBUkExCzAJBgNVBAYTAkJSMRcwFQYDVQQDEw5jYWZlLmllYy5sb2NhbDAe
-Fw0xNDA1MTMxNjIxMzFaFw0xNzA1MTIxNjIxMzFaMIGhMScwJQYDVQQKEx5JRUMg
-LSBJbnN0aXR1dG8gRXZhbmRybyBDaGFnYXMxDjAMBgNVBAsTBVNPSU5GMSEwHwYJ
-KoZIhvcNAQkBFhJyZWRlQGllYy5wYS5nb3YuYnIxDjAMBgNVBAcTBWJlbGVtMQ0w
-CwYDVQQIEwRQQVJBMQswCQYDVQQGEwJCUjEXMBUGA1UEAxMOY2FmZS5pZWMubG9j
-YWwwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC4e4hLNjYvI/xid2cN
-ozfVwKY2flC+dJyQwC+F3i7j+3u8ml5VuAU1P+ZKVchCjARurXRkZIQIQMknTJ2B
-nr5TLIe57cd6yE3vSEui+x/ZhwWxPJtyCWqHtw9emOrZ+X9UmTg+TKWaMaUBnyAd
-b0nCn4P7ohWfrlinhaFPk7+/OPf5rg7DPkUuqGPtOoyrotKFS0BrIE1cyxWPfOUS
-AmQz72t5uOMDuzLIkmgL9CHbSxudTfBsxAyWhwTaTM9ePIHaOyNHnExe+M6sFrwb
-3LitMRN/v94/4Az603CM6neLw/G3MMHna2OtjgpTwhg9+4SwRn2Sjs/A169LuIV/
-qnO5AgMBAAEwDQYJKoZIhvcNAQEFBQADggEBAGw3xN4fIch/7ZemmiIJO4SfcTiA
-MnnYpOL72tvaWm9Cz6jojUy3q5+/qfQKYYpdi0QgmZSD9W7Qi0CfsPTnh5TlKXGQ
-7SOa41lTVz9nWogz7gZjxKfVeC+52vQppkjhJquxpFzP7Vl3oaXoxdMNTMjzCNgG
-R8X+bipsWg0m2NWnZFq12T/qf139XlTRZdube41eU4LrmKaCRCx5LrSUc1ZUxvrY
-6pXgywuLBdDwr8nWSvtjkUszeTmK2s8k5glOmotvqggeFCBlKX5VREDzagTq8plQ
-Bdyy5D7y1xwm3x9CEhmG0/zei8OgU3ir0T/sHAfNMjKZGzA1KJdWQ7hXE40=		
-		
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.iec.pa.gov.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafe.iec.pa.gov.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">IEC - Instituto Evandro Chagas </OrganizationName>
-    <OrganizationName xml:lang="pt-br">IEC - Instituto Evandro Chagas </OrganizationName>
-    <OrganizationDisplayName xml:lang="en">IEC - Instituto Evandro Chagas</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="pt-br">IEC - Instituto Evandro Chagas</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.iec.pa.gov.br/</OrganizationURL>
-    <OrganizationURL xml:lang="pt-br">http://www.iec.pa.gov.br/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Equipe de Operacao da Rede IEC</SurName>
-    <EmailAddress>rede@iec.pa.gov.br</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/cafe.ifb.edu.br-idp-shibboleth.xml b/swamid-interfederations-2.0/cafe.ifb.edu.br-idp-shibboleth.xml
deleted file mode 100644
index 50809762..00000000
--- a/swamid-interfederations-2.0/cafe.ifb.edu.br-idp-shibboleth.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.ifb.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">edu.br</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">IFB -Instituto Federal de Brasilia</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="pt-br">IFB -Instituto Federal de Brasilia</mdui:DisplayName>
-        <mdui:Description xml:lang="en">IFB -Instituto Federal de Brasilia</mdui:Description>
-        <mdui:Description xml:lang="pt-br">IFB -Instituto Federal de Brasilia</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.ifb.edu.br/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="pt-br">http://www.ifb.edu.br/</mdui:InformationURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-    MIID2DCCAsACAQAwDQYJKoZIhvcNAQEFBQAwgbExJjAkBgNVBAoTHUluc3RpdHV0
-byBGZWRlcmFsIGRlIEJyYXNpbGlhMQwwCgYDVQQLEwNDUEQxJDAiBgkqhkiG9w0B
-CQEWFWh1Z28uZmFyaWFAaWZiLmVkdS5icjERMA8GA1UEBxMIQnJhc2lsaWExGTAX
-BgNVBAgTEERpc3RyaXRvIEZlZGVyYWwxCzAJBgNVBAYTAkJSMRgwFgYDVQQDEw9j
-YWZlLmlmYi5lZHUuYnIwHhcNMTQwNDMwMTIwNjMzWhcNMTkwNDI5MTIwNjMzWjCB
-sTEmMCQGA1UEChMdSW5zdGl0dXRvIEZlZGVyYWwgZGUgQnJhc2lsaWExDDAKBgNV
-BAsTA0NQRDEkMCIGCSqGSIb3DQEJARYVaHVnby5mYXJpYUBpZmIuZWR1LmJyMREw
-DwYDVQQHEwhCcmFzaWxpYTEZMBcGA1UECBMQRGlzdHJpdG8gRmVkZXJhbDELMAkG
-A1UEBhMCQlIxGDAWBgNVBAMTD2NhZmUuaWZiLmVkdS5icjCCASIwDQYJKoZIhvcN
-AQEBBQADggEPADCCAQoCggEBAMl4NkWCkt4LPisjIniHMzV7ad52UPjkndK7dy2P
-PR4zZ4ssQ0em22DdCbv9g/UYtrUZkzbw1pVDuZkmrIEI6IpG235bYis1vdFV6Ezc
-sfqG6cVK07+ov7edKzSUAUL9JPCioRcbh+ol4MYGQ271tNpKI7paE1S3AWmpiiGE
-LKXLItn3SMncuQRjA8XLhYkZWLk76deWt43cKTeUQe4wMQgKjhV/sflk9Yisccnf
-fcqzJKlC7qH5yRm8yNQzUpp43V5sdkQ+yNFPZOJc0LndacUAoyDBle8s3n6rLkkQ
-Pet095bxY+ahltMWtcCZM5NWDVbWd/2WGru5NTtTG5SojbECAwEAATANBgkqhkiG
-9w0BAQUFAAOCAQEAT/zrVbbQSdoaqk2/tut9i+nwzX3jVzbIdj4TFF0oFS9YmojK
-5Tu8s0wR3GdoyOPp367k9AFkrM5oVtdkN/wmzgiMYQzbh65t3bU/sx3/QNpvN1FF
-3ZrCo4vSxwMc0yEmdgT0eYUfyeWL/gqJ08nnsVoY8cmkoV37rjNhMLCz+WRdhoGI
-ziTBHSHSfT19MUBPshQtI8InKtZxzjo9PEPIzfxLyj1GNWzhmNVeAoEwefVjm4Wi
-XuahCg66qDobt3XR77O74guAdjEtcrIFLdXDQpZb/yrA4dCH3l53A6k8PB7Gcqxn
-lfIkoNoppJp00hFJFgb7O6y36a0AO2jY7LDjHA==
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.ifb.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.ifb.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.ifb.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cafe.ifb.edu.br/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://cafe.ifb.edu.br/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://cafe.ifb.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>
-      
-MIID2DCCAsACAQAwDQYJKoZIhvcNAQEFBQAwgbExJjAkBgNVBAoTHUluc3RpdHV0
-byBGZWRlcmFsIGRlIEJyYXNpbGlhMQwwCgYDVQQLEwNDUEQxJDAiBgkqhkiG9w0B
-CQEWFWh1Z28uZmFyaWFAaWZiLmVkdS5icjERMA8GA1UEBxMIQnJhc2lsaWExGTAX
-BgNVBAgTEERpc3RyaXRvIEZlZGVyYWwxCzAJBgNVBAYTAkJSMRgwFgYDVQQDEw9j
-YWZlLmlmYi5lZHUuYnIwHhcNMTQwNDMwMTIwNjMzWhcNMTkwNDI5MTIwNjMzWjCB
-sTEmMCQGA1UEChMdSW5zdGl0dXRvIEZlZGVyYWwgZGUgQnJhc2lsaWExDDAKBgNV
-BAsTA0NQRDEkMCIGCSqGSIb3DQEJARYVaHVnby5mYXJpYUBpZmIuZWR1LmJyMREw
-DwYDVQQHEwhCcmFzaWxpYTEZMBcGA1UECBMQRGlzdHJpdG8gRmVkZXJhbDELMAkG
-A1UEBhMCQlIxGDAWBgNVBAMTD2NhZmUuaWZiLmVkdS5icjCCASIwDQYJKoZIhvcN
-AQEBBQADggEPADCCAQoCggEBAMl4NkWCkt4LPisjIniHMzV7ad52UPjkndK7dy2P
-PR4zZ4ssQ0em22DdCbv9g/UYtrUZkzbw1pVDuZkmrIEI6IpG235bYis1vdFV6Ezc
-sfqG6cVK07+ov7edKzSUAUL9JPCioRcbh+ol4MYGQ271tNpKI7paE1S3AWmpiiGE
-LKXLItn3SMncuQRjA8XLhYkZWLk76deWt43cKTeUQe4wMQgKjhV/sflk9Yisccnf
-fcqzJKlC7qH5yRm8yNQzUpp43V5sdkQ+yNFPZOJc0LndacUAoyDBle8s3n6rLkkQ
-Pet095bxY+ahltMWtcCZM5NWDVbWd/2WGru5NTtTG5SojbECAwEAATANBgkqhkiG
-9w0BAQUFAAOCAQEAT/zrVbbQSdoaqk2/tut9i+nwzX3jVzbIdj4TFF0oFS9YmojK
-5Tu8s0wR3GdoyOPp367k9AFkrM5oVtdkN/wmzgiMYQzbh65t3bU/sx3/QNpvN1FF
-3ZrCo4vSxwMc0yEmdgT0eYUfyeWL/gqJ08nnsVoY8cmkoV37rjNhMLCz+WRdhoGI
-ziTBHSHSfT19MUBPshQtI8InKtZxzjo9PEPIzfxLyj1GNWzhmNVeAoEwefVjm4Wi
-XuahCg66qDobt3XR77O74guAdjEtcrIFLdXDQpZb/yrA4dCH3l53A6k8PB7Gcqxn
-lfIkoNoppJp00hFJFgb7O6y36a0AO2jY7LDjHA==
-                    
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.ifb.edu.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafe.ifb.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">IFB -Instituto Federal de Brasilia </OrganizationName>
-    <OrganizationName xml:lang="pt-br">IFB -Instituto Federal de Brasilia </OrganizationName>
-    <OrganizationDisplayName xml:lang="en">IFB -Instituto Federal de Brasilia</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="pt-br">IFB -Instituto Federal de Brasilia</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.ifb.edu.br/</OrganizationURL>
-    <OrganizationURL xml:lang="pt-br">http://www.ifb.edu.br/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Hugo Faria</SurName>
-    <EmailAddress>hugo.faria@ifb.edu.br</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/cafe.ifb.edu.br.xml b/swamid-interfederations-2.0/cafe.ifb.edu.br.xml
deleted file mode 100644
index 50809762..00000000
--- a/swamid-interfederations-2.0/cafe.ifb.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.ifb.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">edu.br</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">IFB -Instituto Federal de Brasilia</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="pt-br">IFB -Instituto Federal de Brasilia</mdui:DisplayName>
-        <mdui:Description xml:lang="en">IFB -Instituto Federal de Brasilia</mdui:Description>
-        <mdui:Description xml:lang="pt-br">IFB -Instituto Federal de Brasilia</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.ifb.edu.br/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="pt-br">http://www.ifb.edu.br/</mdui:InformationURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-    MIID2DCCAsACAQAwDQYJKoZIhvcNAQEFBQAwgbExJjAkBgNVBAoTHUluc3RpdHV0
-byBGZWRlcmFsIGRlIEJyYXNpbGlhMQwwCgYDVQQLEwNDUEQxJDAiBgkqhkiG9w0B
-CQEWFWh1Z28uZmFyaWFAaWZiLmVkdS5icjERMA8GA1UEBxMIQnJhc2lsaWExGTAX
-BgNVBAgTEERpc3RyaXRvIEZlZGVyYWwxCzAJBgNVBAYTAkJSMRgwFgYDVQQDEw9j
-YWZlLmlmYi5lZHUuYnIwHhcNMTQwNDMwMTIwNjMzWhcNMTkwNDI5MTIwNjMzWjCB
-sTEmMCQGA1UEChMdSW5zdGl0dXRvIEZlZGVyYWwgZGUgQnJhc2lsaWExDDAKBgNV
-BAsTA0NQRDEkMCIGCSqGSIb3DQEJARYVaHVnby5mYXJpYUBpZmIuZWR1LmJyMREw
-DwYDVQQHEwhCcmFzaWxpYTEZMBcGA1UECBMQRGlzdHJpdG8gRmVkZXJhbDELMAkG
-A1UEBhMCQlIxGDAWBgNVBAMTD2NhZmUuaWZiLmVkdS5icjCCASIwDQYJKoZIhvcN
-AQEBBQADggEPADCCAQoCggEBAMl4NkWCkt4LPisjIniHMzV7ad52UPjkndK7dy2P
-PR4zZ4ssQ0em22DdCbv9g/UYtrUZkzbw1pVDuZkmrIEI6IpG235bYis1vdFV6Ezc
-sfqG6cVK07+ov7edKzSUAUL9JPCioRcbh+ol4MYGQ271tNpKI7paE1S3AWmpiiGE
-LKXLItn3SMncuQRjA8XLhYkZWLk76deWt43cKTeUQe4wMQgKjhV/sflk9Yisccnf
-fcqzJKlC7qH5yRm8yNQzUpp43V5sdkQ+yNFPZOJc0LndacUAoyDBle8s3n6rLkkQ
-Pet095bxY+ahltMWtcCZM5NWDVbWd/2WGru5NTtTG5SojbECAwEAATANBgkqhkiG
-9w0BAQUFAAOCAQEAT/zrVbbQSdoaqk2/tut9i+nwzX3jVzbIdj4TFF0oFS9YmojK
-5Tu8s0wR3GdoyOPp367k9AFkrM5oVtdkN/wmzgiMYQzbh65t3bU/sx3/QNpvN1FF
-3ZrCo4vSxwMc0yEmdgT0eYUfyeWL/gqJ08nnsVoY8cmkoV37rjNhMLCz+WRdhoGI
-ziTBHSHSfT19MUBPshQtI8InKtZxzjo9PEPIzfxLyj1GNWzhmNVeAoEwefVjm4Wi
-XuahCg66qDobt3XR77O74guAdjEtcrIFLdXDQpZb/yrA4dCH3l53A6k8PB7Gcqxn
-lfIkoNoppJp00hFJFgb7O6y36a0AO2jY7LDjHA==
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.ifb.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.ifb.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.ifb.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cafe.ifb.edu.br/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://cafe.ifb.edu.br/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://cafe.ifb.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>
-      
-MIID2DCCAsACAQAwDQYJKoZIhvcNAQEFBQAwgbExJjAkBgNVBAoTHUluc3RpdHV0
-byBGZWRlcmFsIGRlIEJyYXNpbGlhMQwwCgYDVQQLEwNDUEQxJDAiBgkqhkiG9w0B
-CQEWFWh1Z28uZmFyaWFAaWZiLmVkdS5icjERMA8GA1UEBxMIQnJhc2lsaWExGTAX
-BgNVBAgTEERpc3RyaXRvIEZlZGVyYWwxCzAJBgNVBAYTAkJSMRgwFgYDVQQDEw9j
-YWZlLmlmYi5lZHUuYnIwHhcNMTQwNDMwMTIwNjMzWhcNMTkwNDI5MTIwNjMzWjCB
-sTEmMCQGA1UEChMdSW5zdGl0dXRvIEZlZGVyYWwgZGUgQnJhc2lsaWExDDAKBgNV
-BAsTA0NQRDEkMCIGCSqGSIb3DQEJARYVaHVnby5mYXJpYUBpZmIuZWR1LmJyMREw
-DwYDVQQHEwhCcmFzaWxpYTEZMBcGA1UECBMQRGlzdHJpdG8gRmVkZXJhbDELMAkG
-A1UEBhMCQlIxGDAWBgNVBAMTD2NhZmUuaWZiLmVkdS5icjCCASIwDQYJKoZIhvcN
-AQEBBQADggEPADCCAQoCggEBAMl4NkWCkt4LPisjIniHMzV7ad52UPjkndK7dy2P
-PR4zZ4ssQ0em22DdCbv9g/UYtrUZkzbw1pVDuZkmrIEI6IpG235bYis1vdFV6Ezc
-sfqG6cVK07+ov7edKzSUAUL9JPCioRcbh+ol4MYGQ271tNpKI7paE1S3AWmpiiGE
-LKXLItn3SMncuQRjA8XLhYkZWLk76deWt43cKTeUQe4wMQgKjhV/sflk9Yisccnf
-fcqzJKlC7qH5yRm8yNQzUpp43V5sdkQ+yNFPZOJc0LndacUAoyDBle8s3n6rLkkQ
-Pet095bxY+ahltMWtcCZM5NWDVbWd/2WGru5NTtTG5SojbECAwEAATANBgkqhkiG
-9w0BAQUFAAOCAQEAT/zrVbbQSdoaqk2/tut9i+nwzX3jVzbIdj4TFF0oFS9YmojK
-5Tu8s0wR3GdoyOPp367k9AFkrM5oVtdkN/wmzgiMYQzbh65t3bU/sx3/QNpvN1FF
-3ZrCo4vSxwMc0yEmdgT0eYUfyeWL/gqJ08nnsVoY8cmkoV37rjNhMLCz+WRdhoGI
-ziTBHSHSfT19MUBPshQtI8InKtZxzjo9PEPIzfxLyj1GNWzhmNVeAoEwefVjm4Wi
-XuahCg66qDobt3XR77O74guAdjEtcrIFLdXDQpZb/yrA4dCH3l53A6k8PB7Gcqxn
-lfIkoNoppJp00hFJFgb7O6y36a0AO2jY7LDjHA==
-                    
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.ifb.edu.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafe.ifb.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">IFB -Instituto Federal de Brasilia </OrganizationName>
-    <OrganizationName xml:lang="pt-br">IFB -Instituto Federal de Brasilia </OrganizationName>
-    <OrganizationDisplayName xml:lang="en">IFB -Instituto Federal de Brasilia</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="pt-br">IFB -Instituto Federal de Brasilia</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.ifb.edu.br/</OrganizationURL>
-    <OrganizationURL xml:lang="pt-br">http://www.ifb.edu.br/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Hugo Faria</SurName>
-    <EmailAddress>hugo.faria@ifb.edu.br</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/cafe.ifes.edu.br-idp-shibboleth.xml b/swamid-interfederations-2.0/cafe.ifes.edu.br-idp-shibboleth.xml
deleted file mode 100644
index c3ce14ad..00000000
--- a/swamid-interfederations-2.0/cafe.ifes.edu.br-idp-shibboleth.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://cafe.ifes.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">edu.br</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">IFES - Instituto Federal do Espirito Santo</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="pt-br">IFES - Instituto Federal do Espirito Santo</mdui:DisplayName>
-        <mdui:Description xml:lang="en">IFES - Instituto Federal do Espirito Santo</mdui:Description>
-        <mdui:Description xml:lang="pt-br">IFES - Instituto Federal do Espirito Santo</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.ifes.edu.br/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="pt-br">http://www.ifes.edu.br/</mdui:InformationURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-    MIIEMjCCAxoCAQAwDQYJKoZIhvcNAQEFBQAwgd4xMzAxBgNVBAoUKklGRVMgLSBJ
-bnN0aXR1dG8gRmVkZXJhbCBkbyBFc3Dtcml0byBTYW50bzE0MDIGA1UECxQrRFRJ
-IC0gRGlyZXRvcmlhIGRlIFRlY25vbG9naWEgZGEgSW5mb3JtYefjbzEeMBwGCSqG
-SIb3DQEJARYPZHRpQGlmZXMuZWR1LmJyMRAwDgYDVQQHFAdWaXTzcmlhMRcwFQYD
-VQQIFA5Fc3Dtcml0byBTYW50bzELMAkGA1UEBhMCQlIxGTAXBgNVBAMTEGNhZmUu
-aWZlcy5lZHUuYnIwHhcNMTQwNjA1MTQyMjE1WhcNMTkwNjA0MTQyMjE1WjCB3jEz
-MDEGA1UEChQqSUZFUyAtIEluc3RpdHV0byBGZWRlcmFsIGRvIEVzcO1yaXRvIFNh
-bnRvMTQwMgYDVQQLFCtEVEkgLSBEaXJldG9yaWEgZGUgVGVjbm9sb2dpYSBkYSBJ
-bmZvcm1h5+NvMR4wHAYJKoZIhvcNAQkBFg9kdGlAaWZlcy5lZHUuYnIxEDAOBgNV
-BAcUB1ZpdPNyaWExFzAVBgNVBAgUDkVzcO1yaXRvIFNhbnRvMQswCQYDVQQGEwJC
-UjEZMBcGA1UEAxMQY2FmZS5pZmVzLmVkdS5icjCCASIwDQYJKoZIhvcNAQEBBQAD
-ggEPADCCAQoCggEBAOHrqlb5GFzgkBCiLEWBJHGcs6rIx3oSP7uXDldH7x5jXC47
-v5TyzCba+wZiOHG2rUrnVi/xozlrPc0W5Fk7ajPTxYDeefNprMJssFUl14DwbZIl
-3Truyemx8q9CRDVTqFlsieYF8HKshB1Z6KIUTmvWNXnHQnxo5o7ZQ/BLYKTuxN66
-omqnTU6IsojGiawP9hCYzedDHZeSJ5xsZl0UYktxxjsnAv6Ka+yBt+oXrXr0QNiR
-2NBbyosaTlKxt9riq8MzL7J383/eJGLSvxGdNsBXryf5Tjfx4GrCP9ka2Y/vbwcU
-mR2T1JXphD3AoeQtsKVnucp/mstxKYe+tSmrIXECAwEAATANBgkqhkiG9w0BAQUF
-AAOCAQEAPIVYpq1VJYhgJj65T7FcHROuwQkBKqqKjaHzEU2lCkwG/7KJj/BOb6nX
-H+wB+qKq44kqXJ2VB7FMuSk0NtCN/tas+iOqc5yXFCZh9X/d1aZQQXQ0t6jy65FC
-R3Hy4SgTU1uPfnUSTIeyg0yTON9YFIIyV4lKSTX4BiwqJiXWN4dHHVPBl/TkUp/F
-HXdqdhP5InrMMw5qWDvhEi3o0x0HRUo7jJft95JrR4yfX21sDFTCgqx+/ZPX8fOL
-mbkxXly2hawK1GQT+ghSrScruQDw6XX6zpokaEqkh/Zc8JDjkB2Drx2aWZfGL460
-sp005gwvb2/MIN7OTddNkm6l3VeaXQ==
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.ifes.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.ifes.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.ifes.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cafe.ifes.edu.br/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://cafe.ifes.edu.br/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://cafe.ifes.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>
-      
-MIIEMjCCAxoCAQAwDQYJKoZIhvcNAQEFBQAwgd4xMzAxBgNVBAoUKklGRVMgLSBJ
-bnN0aXR1dG8gRmVkZXJhbCBkbyBFc3Dtcml0byBTYW50bzE0MDIGA1UECxQrRFRJ
-IC0gRGlyZXRvcmlhIGRlIFRlY25vbG9naWEgZGEgSW5mb3JtYefjbzEeMBwGCSqG
-SIb3DQEJARYPZHRpQGlmZXMuZWR1LmJyMRAwDgYDVQQHFAdWaXTzcmlhMRcwFQYD
-VQQIFA5Fc3Dtcml0byBTYW50bzELMAkGA1UEBhMCQlIxGTAXBgNVBAMTEGNhZmUu
-aWZlcy5lZHUuYnIwHhcNMTQwNjA1MTQyMjE1WhcNMTkwNjA0MTQyMjE1WjCB3jEz
-MDEGA1UEChQqSUZFUyAtIEluc3RpdHV0byBGZWRlcmFsIGRvIEVzcO1yaXRvIFNh
-bnRvMTQwMgYDVQQLFCtEVEkgLSBEaXJldG9yaWEgZGUgVGVjbm9sb2dpYSBkYSBJ
-bmZvcm1h5+NvMR4wHAYJKoZIhvcNAQkBFg9kdGlAaWZlcy5lZHUuYnIxEDAOBgNV
-BAcUB1ZpdPNyaWExFzAVBgNVBAgUDkVzcO1yaXRvIFNhbnRvMQswCQYDVQQGEwJC
-UjEZMBcGA1UEAxMQY2FmZS5pZmVzLmVkdS5icjCCASIwDQYJKoZIhvcNAQEBBQAD
-ggEPADCCAQoCggEBAOHrqlb5GFzgkBCiLEWBJHGcs6rIx3oSP7uXDldH7x5jXC47
-v5TyzCba+wZiOHG2rUrnVi/xozlrPc0W5Fk7ajPTxYDeefNprMJssFUl14DwbZIl
-3Truyemx8q9CRDVTqFlsieYF8HKshB1Z6KIUTmvWNXnHQnxo5o7ZQ/BLYKTuxN66
-omqnTU6IsojGiawP9hCYzedDHZeSJ5xsZl0UYktxxjsnAv6Ka+yBt+oXrXr0QNiR
-2NBbyosaTlKxt9riq8MzL7J383/eJGLSvxGdNsBXryf5Tjfx4GrCP9ka2Y/vbwcU
-mR2T1JXphD3AoeQtsKVnucp/mstxKYe+tSmrIXECAwEAATANBgkqhkiG9w0BAQUF
-AAOCAQEAPIVYpq1VJYhgJj65T7FcHROuwQkBKqqKjaHzEU2lCkwG/7KJj/BOb6nX
-H+wB+qKq44kqXJ2VB7FMuSk0NtCN/tas+iOqc5yXFCZh9X/d1aZQQXQ0t6jy65FC
-R3Hy4SgTU1uPfnUSTIeyg0yTON9YFIIyV4lKSTX4BiwqJiXWN4dHHVPBl/TkUp/F
-HXdqdhP5InrMMw5qWDvhEi3o0x0HRUo7jJft95JrR4yfX21sDFTCgqx+/ZPX8fOL
-mbkxXly2hawK1GQT+ghSrScruQDw6XX6zpokaEqkh/Zc8JDjkB2Drx2aWZfGL460
-sp005gwvb2/MIN7OTddNkm6l3VeaXQ==
-                    
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.ifes.edu.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafe.ifes.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">IFES - Instituto Federal do Espirito Santo</OrganizationName>
-    <OrganizationName xml:lang="pt-br">IFES - Instituto Federal do Espirito Santo</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">IFES - Instituto Federal do Espirito Santo</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="pt-br">IFES - Instituto Federal do Espirito Santo</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.ifes.edu.br/</OrganizationURL>
-    <OrganizationURL xml:lang="pt-br">http://www.ifes.edu.br/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Ramon Ramos</SurName>
-    <EmailAddress>ramon.ramos@ifes.edu.br</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/cafe.ifes.edu.br.xml b/swamid-interfederations-2.0/cafe.ifes.edu.br.xml
deleted file mode 100644
index c3ce14ad..00000000
--- a/swamid-interfederations-2.0/cafe.ifes.edu.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://cafe.ifes.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">edu.br</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">IFES - Instituto Federal do Espirito Santo</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="pt-br">IFES - Instituto Federal do Espirito Santo</mdui:DisplayName>
-        <mdui:Description xml:lang="en">IFES - Instituto Federal do Espirito Santo</mdui:Description>
-        <mdui:Description xml:lang="pt-br">IFES - Instituto Federal do Espirito Santo</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.ifes.edu.br/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="pt-br">http://www.ifes.edu.br/</mdui:InformationURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-    MIIEMjCCAxoCAQAwDQYJKoZIhvcNAQEFBQAwgd4xMzAxBgNVBAoUKklGRVMgLSBJ
-bnN0aXR1dG8gRmVkZXJhbCBkbyBFc3Dtcml0byBTYW50bzE0MDIGA1UECxQrRFRJ
-IC0gRGlyZXRvcmlhIGRlIFRlY25vbG9naWEgZGEgSW5mb3JtYefjbzEeMBwGCSqG
-SIb3DQEJARYPZHRpQGlmZXMuZWR1LmJyMRAwDgYDVQQHFAdWaXTzcmlhMRcwFQYD
-VQQIFA5Fc3Dtcml0byBTYW50bzELMAkGA1UEBhMCQlIxGTAXBgNVBAMTEGNhZmUu
-aWZlcy5lZHUuYnIwHhcNMTQwNjA1MTQyMjE1WhcNMTkwNjA0MTQyMjE1WjCB3jEz
-MDEGA1UEChQqSUZFUyAtIEluc3RpdHV0byBGZWRlcmFsIGRvIEVzcO1yaXRvIFNh
-bnRvMTQwMgYDVQQLFCtEVEkgLSBEaXJldG9yaWEgZGUgVGVjbm9sb2dpYSBkYSBJ
-bmZvcm1h5+NvMR4wHAYJKoZIhvcNAQkBFg9kdGlAaWZlcy5lZHUuYnIxEDAOBgNV
-BAcUB1ZpdPNyaWExFzAVBgNVBAgUDkVzcO1yaXRvIFNhbnRvMQswCQYDVQQGEwJC
-UjEZMBcGA1UEAxMQY2FmZS5pZmVzLmVkdS5icjCCASIwDQYJKoZIhvcNAQEBBQAD
-ggEPADCCAQoCggEBAOHrqlb5GFzgkBCiLEWBJHGcs6rIx3oSP7uXDldH7x5jXC47
-v5TyzCba+wZiOHG2rUrnVi/xozlrPc0W5Fk7ajPTxYDeefNprMJssFUl14DwbZIl
-3Truyemx8q9CRDVTqFlsieYF8HKshB1Z6KIUTmvWNXnHQnxo5o7ZQ/BLYKTuxN66
-omqnTU6IsojGiawP9hCYzedDHZeSJ5xsZl0UYktxxjsnAv6Ka+yBt+oXrXr0QNiR
-2NBbyosaTlKxt9riq8MzL7J383/eJGLSvxGdNsBXryf5Tjfx4GrCP9ka2Y/vbwcU
-mR2T1JXphD3AoeQtsKVnucp/mstxKYe+tSmrIXECAwEAATANBgkqhkiG9w0BAQUF
-AAOCAQEAPIVYpq1VJYhgJj65T7FcHROuwQkBKqqKjaHzEU2lCkwG/7KJj/BOb6nX
-H+wB+qKq44kqXJ2VB7FMuSk0NtCN/tas+iOqc5yXFCZh9X/d1aZQQXQ0t6jy65FC
-R3Hy4SgTU1uPfnUSTIeyg0yTON9YFIIyV4lKSTX4BiwqJiXWN4dHHVPBl/TkUp/F
-HXdqdhP5InrMMw5qWDvhEi3o0x0HRUo7jJft95JrR4yfX21sDFTCgqx+/ZPX8fOL
-mbkxXly2hawK1GQT+ghSrScruQDw6XX6zpokaEqkh/Zc8JDjkB2Drx2aWZfGL460
-sp005gwvb2/MIN7OTddNkm6l3VeaXQ==
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.ifes.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.ifes.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.ifes.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cafe.ifes.edu.br/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://cafe.ifes.edu.br/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://cafe.ifes.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>
-      
-MIIEMjCCAxoCAQAwDQYJKoZIhvcNAQEFBQAwgd4xMzAxBgNVBAoUKklGRVMgLSBJ
-bnN0aXR1dG8gRmVkZXJhbCBkbyBFc3Dtcml0byBTYW50bzE0MDIGA1UECxQrRFRJ
-IC0gRGlyZXRvcmlhIGRlIFRlY25vbG9naWEgZGEgSW5mb3JtYefjbzEeMBwGCSqG
-SIb3DQEJARYPZHRpQGlmZXMuZWR1LmJyMRAwDgYDVQQHFAdWaXTzcmlhMRcwFQYD
-VQQIFA5Fc3Dtcml0byBTYW50bzELMAkGA1UEBhMCQlIxGTAXBgNVBAMTEGNhZmUu
-aWZlcy5lZHUuYnIwHhcNMTQwNjA1MTQyMjE1WhcNMTkwNjA0MTQyMjE1WjCB3jEz
-MDEGA1UEChQqSUZFUyAtIEluc3RpdHV0byBGZWRlcmFsIGRvIEVzcO1yaXRvIFNh
-bnRvMTQwMgYDVQQLFCtEVEkgLSBEaXJldG9yaWEgZGUgVGVjbm9sb2dpYSBkYSBJ
-bmZvcm1h5+NvMR4wHAYJKoZIhvcNAQkBFg9kdGlAaWZlcy5lZHUuYnIxEDAOBgNV
-BAcUB1ZpdPNyaWExFzAVBgNVBAgUDkVzcO1yaXRvIFNhbnRvMQswCQYDVQQGEwJC
-UjEZMBcGA1UEAxMQY2FmZS5pZmVzLmVkdS5icjCCASIwDQYJKoZIhvcNAQEBBQAD
-ggEPADCCAQoCggEBAOHrqlb5GFzgkBCiLEWBJHGcs6rIx3oSP7uXDldH7x5jXC47
-v5TyzCba+wZiOHG2rUrnVi/xozlrPc0W5Fk7ajPTxYDeefNprMJssFUl14DwbZIl
-3Truyemx8q9CRDVTqFlsieYF8HKshB1Z6KIUTmvWNXnHQnxo5o7ZQ/BLYKTuxN66
-omqnTU6IsojGiawP9hCYzedDHZeSJ5xsZl0UYktxxjsnAv6Ka+yBt+oXrXr0QNiR
-2NBbyosaTlKxt9riq8MzL7J383/eJGLSvxGdNsBXryf5Tjfx4GrCP9ka2Y/vbwcU
-mR2T1JXphD3AoeQtsKVnucp/mstxKYe+tSmrIXECAwEAATANBgkqhkiG9w0BAQUF
-AAOCAQEAPIVYpq1VJYhgJj65T7FcHROuwQkBKqqKjaHzEU2lCkwG/7KJj/BOb6nX
-H+wB+qKq44kqXJ2VB7FMuSk0NtCN/tas+iOqc5yXFCZh9X/d1aZQQXQ0t6jy65FC
-R3Hy4SgTU1uPfnUSTIeyg0yTON9YFIIyV4lKSTX4BiwqJiXWN4dHHVPBl/TkUp/F
-HXdqdhP5InrMMw5qWDvhEi3o0x0HRUo7jJft95JrR4yfX21sDFTCgqx+/ZPX8fOL
-mbkxXly2hawK1GQT+ghSrScruQDw6XX6zpokaEqkh/Zc8JDjkB2Drx2aWZfGL460
-sp005gwvb2/MIN7OTddNkm6l3VeaXQ==
-                    
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.ifes.edu.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafe.ifes.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">IFES - Instituto Federal do Espirito Santo</OrganizationName>
-    <OrganizationName xml:lang="pt-br">IFES - Instituto Federal do Espirito Santo</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">IFES - Instituto Federal do Espirito Santo</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="pt-br">IFES - Instituto Federal do Espirito Santo</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.ifes.edu.br/</OrganizationURL>
-    <OrganizationURL xml:lang="pt-br">http://www.ifes.edu.br/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Ramon Ramos</SurName>
-    <EmailAddress>ramon.ramos@ifes.edu.br</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/cafe.ifg.edu.br-idp-shibboleth.xml b/swamid-interfederations-2.0/cafe.ifg.edu.br-idp-shibboleth.xml
deleted file mode 100644
index d6790d73..00000000
--- a/swamid-interfederations-2.0/cafe.ifg.edu.br-idp-shibboleth.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.ifg.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">ifg.edu.br</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">IFG - Instituto Federal de Goias</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="pt-br">IFG - Instituto Federal de Goias</mdui:DisplayName>
-        <mdui:Description xml:lang="en">IFG - Instituto Federal de Goias</mdui:Description>
-        <mdui:Description xml:lang="pt-br">IFG - Instituto Federal de Goias</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.ifg.edu.br/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="pt-br">http://www.ifg.edu.br/</mdui:InformationURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-    MIIDrDCCApQCAQAwDQYJKoZIhvcNAQEFBQAwgZsxIzAhBgNVBAoTGkluc3RpdHV0
-byBGZWRlcmFsIGRlIEdvaWFzMQwwCgYDVQQLEwNDUEQxHTAbBgkqhkiG9w0BCQEW
-DmR0aUBpZmcuZWR1LmJyMRAwDgYDVQQHEwdHb2lhbmlhMQ4wDAYDVQQIEwVHb2lh
-czELMAkGA1UEBhMCQlIxGDAWBgNVBAMTD2NhZmUuaWZnLmVkdS5icjAeFw0xNDA0
-MjIxMTM4MThaFw0xOTA0MjExMTM4MThaMIGbMSMwIQYDVQQKExpJbnN0aXR1dG8g
-RmVkZXJhbCBkZSBHb2lhczEMMAoGA1UECxMDQ1BEMR0wGwYJKoZIhvcNAQkBFg5k
-dGlAaWZnLmVkdS5icjEQMA4GA1UEBxMHR29pYW5pYTEOMAwGA1UECBMFR29pYXMx
-CzAJBgNVBAYTAkJSMRgwFgYDVQQDEw9jYWZlLmlmZy5lZHUuYnIwggEiMA0GCSqG
-SIb3DQEBAQUAA4IBDwAwggEKAoIBAQDRTiGyg+AdoDTPTJWvRBL6Sx3OCpG0jjT5
-HUyXwsYB/VkDFC/IXLVwSQGCJ8+kzGaIAknzdL0QG1ZfY00neU6HmngzYE9t0NWC
-/UAySjQFlMZPyHmkZyCEIpiOKs1XR7WJgmxz/ga3LiLeNUY16J8ywVG61Gpl31TJ
-3kW3T/qupvrvg55tdc28PwKeAV3AgYY7a3xI2lgpr7ZsthXcsG2MO7xZ7tv/AcKd
-VUukgU90h3NfQz2cX96dqL5RfrdhCDH9Q8vF+ULVMKwoYUbIyY2oCDtNqM3UZyA0
-QjBAyHeKc/AAZKDnwHZb/UNAmURaRHC7Hm9bHjmwxRywNvrF3pZFAgMBAAEwDQYJ
-KoZIhvcNAQEFBQADggEBAAsfixGI4x76q6PWV9pcCHEgtZwIHrbPXsVArUNw1tg1
-1ep86wzlRXWO3D4kHTwtbdJZHM/+DwOvRHow1Y75IS3ndB5SIFJJS4lYeQ0q9t/+
-GMoYs56Ao+iYSH+PjZ67buLhY6GEMV2GGfhblEeyOUZpjNS8hZxYrot5cIt4QqJm
-Fr6OhJD9LojPSNej7PHW49bbS6OZXE4KBsrq0s+uSjZ71LWsm7T3cJA09kF5rOTg
-E7qGH9SEZjeQ2U4XmVmCygCYiG1oFvG3lzh9cl7V9F3W0cW2nwSX6cYI93NJYUxY
-YvkC3d/bl14ZFppaITiyaqXSbOEud5hfZr+tbxOeGOQ=
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.ifg.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.ifg.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.ifg.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cafe.ifg.edu.br/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://cafe.ifg.edu.br/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://cafe.ifg.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>
-      
-MIIDrDCCApQCAQAwDQYJKoZIhvcNAQEFBQAwgZsxIzAhBgNVBAoTGkluc3RpdHV0
-byBGZWRlcmFsIGRlIEdvaWFzMQwwCgYDVQQLEwNDUEQxHTAbBgkqhkiG9w0BCQEW
-DmR0aUBpZmcuZWR1LmJyMRAwDgYDVQQHEwdHb2lhbmlhMQ4wDAYDVQQIEwVHb2lh
-czELMAkGA1UEBhMCQlIxGDAWBgNVBAMTD2NhZmUuaWZnLmVkdS5icjAeFw0xNDA0
-MjIxMTM4MThaFw0xOTA0MjExMTM4MThaMIGbMSMwIQYDVQQKExpJbnN0aXR1dG8g
-RmVkZXJhbCBkZSBHb2lhczEMMAoGA1UECxMDQ1BEMR0wGwYJKoZIhvcNAQkBFg5k
-dGlAaWZnLmVkdS5icjEQMA4GA1UEBxMHR29pYW5pYTEOMAwGA1UECBMFR29pYXMx
-CzAJBgNVBAYTAkJSMRgwFgYDVQQDEw9jYWZlLmlmZy5lZHUuYnIwggEiMA0GCSqG
-SIb3DQEBAQUAA4IBDwAwggEKAoIBAQDRTiGyg+AdoDTPTJWvRBL6Sx3OCpG0jjT5
-HUyXwsYB/VkDFC/IXLVwSQGCJ8+kzGaIAknzdL0QG1ZfY00neU6HmngzYE9t0NWC
-/UAySjQFlMZPyHmkZyCEIpiOKs1XR7WJgmxz/ga3LiLeNUY16J8ywVG61Gpl31TJ
-3kW3T/qupvrvg55tdc28PwKeAV3AgYY7a3xI2lgpr7ZsthXcsG2MO7xZ7tv/AcKd
-VUukgU90h3NfQz2cX96dqL5RfrdhCDH9Q8vF+ULVMKwoYUbIyY2oCDtNqM3UZyA0
-QjBAyHeKc/AAZKDnwHZb/UNAmURaRHC7Hm9bHjmwxRywNvrF3pZFAgMBAAEwDQYJ
-KoZIhvcNAQEFBQADggEBAAsfixGI4x76q6PWV9pcCHEgtZwIHrbPXsVArUNw1tg1
-1ep86wzlRXWO3D4kHTwtbdJZHM/+DwOvRHow1Y75IS3ndB5SIFJJS4lYeQ0q9t/+
-GMoYs56Ao+iYSH+PjZ67buLhY6GEMV2GGfhblEeyOUZpjNS8hZxYrot5cIt4QqJm
-Fr6OhJD9LojPSNej7PHW49bbS6OZXE4KBsrq0s+uSjZ71LWsm7T3cJA09kF5rOTg
-E7qGH9SEZjeQ2U4XmVmCygCYiG1oFvG3lzh9cl7V9F3W0cW2nwSX6cYI93NJYUxY
-YvkC3d/bl14ZFppaITiyaqXSbOEud5hfZr+tbxOeGOQ=
-                    
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.ifg.edu.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafe.ifg.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">IFG - Instituto Federal de Goias</OrganizationName>
-    <OrganizationName xml:lang="pt-br">IFG - Instituto Federal de Goias</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">IFG - Instituto Federal de Goias</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="pt-br">IFG - Instituto Federal de Goias</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.ifg.edu.br/</OrganizationURL>
-    <OrganizationURL xml:lang="pt-br">http://www.ifg.edu.br/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Diretoria de Tecnologia da Informacao</SurName>
-    <EmailAddress>dti@ifg.edu.br</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/cafe.ifg.edu.br.xml b/swamid-interfederations-2.0/cafe.ifg.edu.br.xml
deleted file mode 100644
index d6790d73..00000000
--- a/swamid-interfederations-2.0/cafe.ifg.edu.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.ifg.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">ifg.edu.br</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">IFG - Instituto Federal de Goias</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="pt-br">IFG - Instituto Federal de Goias</mdui:DisplayName>
-        <mdui:Description xml:lang="en">IFG - Instituto Federal de Goias</mdui:Description>
-        <mdui:Description xml:lang="pt-br">IFG - Instituto Federal de Goias</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.ifg.edu.br/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="pt-br">http://www.ifg.edu.br/</mdui:InformationURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-    MIIDrDCCApQCAQAwDQYJKoZIhvcNAQEFBQAwgZsxIzAhBgNVBAoTGkluc3RpdHV0
-byBGZWRlcmFsIGRlIEdvaWFzMQwwCgYDVQQLEwNDUEQxHTAbBgkqhkiG9w0BCQEW
-DmR0aUBpZmcuZWR1LmJyMRAwDgYDVQQHEwdHb2lhbmlhMQ4wDAYDVQQIEwVHb2lh
-czELMAkGA1UEBhMCQlIxGDAWBgNVBAMTD2NhZmUuaWZnLmVkdS5icjAeFw0xNDA0
-MjIxMTM4MThaFw0xOTA0MjExMTM4MThaMIGbMSMwIQYDVQQKExpJbnN0aXR1dG8g
-RmVkZXJhbCBkZSBHb2lhczEMMAoGA1UECxMDQ1BEMR0wGwYJKoZIhvcNAQkBFg5k
-dGlAaWZnLmVkdS5icjEQMA4GA1UEBxMHR29pYW5pYTEOMAwGA1UECBMFR29pYXMx
-CzAJBgNVBAYTAkJSMRgwFgYDVQQDEw9jYWZlLmlmZy5lZHUuYnIwggEiMA0GCSqG
-SIb3DQEBAQUAA4IBDwAwggEKAoIBAQDRTiGyg+AdoDTPTJWvRBL6Sx3OCpG0jjT5
-HUyXwsYB/VkDFC/IXLVwSQGCJ8+kzGaIAknzdL0QG1ZfY00neU6HmngzYE9t0NWC
-/UAySjQFlMZPyHmkZyCEIpiOKs1XR7WJgmxz/ga3LiLeNUY16J8ywVG61Gpl31TJ
-3kW3T/qupvrvg55tdc28PwKeAV3AgYY7a3xI2lgpr7ZsthXcsG2MO7xZ7tv/AcKd
-VUukgU90h3NfQz2cX96dqL5RfrdhCDH9Q8vF+ULVMKwoYUbIyY2oCDtNqM3UZyA0
-QjBAyHeKc/AAZKDnwHZb/UNAmURaRHC7Hm9bHjmwxRywNvrF3pZFAgMBAAEwDQYJ
-KoZIhvcNAQEFBQADggEBAAsfixGI4x76q6PWV9pcCHEgtZwIHrbPXsVArUNw1tg1
-1ep86wzlRXWO3D4kHTwtbdJZHM/+DwOvRHow1Y75IS3ndB5SIFJJS4lYeQ0q9t/+
-GMoYs56Ao+iYSH+PjZ67buLhY6GEMV2GGfhblEeyOUZpjNS8hZxYrot5cIt4QqJm
-Fr6OhJD9LojPSNej7PHW49bbS6OZXE4KBsrq0s+uSjZ71LWsm7T3cJA09kF5rOTg
-E7qGH9SEZjeQ2U4XmVmCygCYiG1oFvG3lzh9cl7V9F3W0cW2nwSX6cYI93NJYUxY
-YvkC3d/bl14ZFppaITiyaqXSbOEud5hfZr+tbxOeGOQ=
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.ifg.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.ifg.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.ifg.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cafe.ifg.edu.br/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://cafe.ifg.edu.br/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://cafe.ifg.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>
-      
-MIIDrDCCApQCAQAwDQYJKoZIhvcNAQEFBQAwgZsxIzAhBgNVBAoTGkluc3RpdHV0
-byBGZWRlcmFsIGRlIEdvaWFzMQwwCgYDVQQLEwNDUEQxHTAbBgkqhkiG9w0BCQEW
-DmR0aUBpZmcuZWR1LmJyMRAwDgYDVQQHEwdHb2lhbmlhMQ4wDAYDVQQIEwVHb2lh
-czELMAkGA1UEBhMCQlIxGDAWBgNVBAMTD2NhZmUuaWZnLmVkdS5icjAeFw0xNDA0
-MjIxMTM4MThaFw0xOTA0MjExMTM4MThaMIGbMSMwIQYDVQQKExpJbnN0aXR1dG8g
-RmVkZXJhbCBkZSBHb2lhczEMMAoGA1UECxMDQ1BEMR0wGwYJKoZIhvcNAQkBFg5k
-dGlAaWZnLmVkdS5icjEQMA4GA1UEBxMHR29pYW5pYTEOMAwGA1UECBMFR29pYXMx
-CzAJBgNVBAYTAkJSMRgwFgYDVQQDEw9jYWZlLmlmZy5lZHUuYnIwggEiMA0GCSqG
-SIb3DQEBAQUAA4IBDwAwggEKAoIBAQDRTiGyg+AdoDTPTJWvRBL6Sx3OCpG0jjT5
-HUyXwsYB/VkDFC/IXLVwSQGCJ8+kzGaIAknzdL0QG1ZfY00neU6HmngzYE9t0NWC
-/UAySjQFlMZPyHmkZyCEIpiOKs1XR7WJgmxz/ga3LiLeNUY16J8ywVG61Gpl31TJ
-3kW3T/qupvrvg55tdc28PwKeAV3AgYY7a3xI2lgpr7ZsthXcsG2MO7xZ7tv/AcKd
-VUukgU90h3NfQz2cX96dqL5RfrdhCDH9Q8vF+ULVMKwoYUbIyY2oCDtNqM3UZyA0
-QjBAyHeKc/AAZKDnwHZb/UNAmURaRHC7Hm9bHjmwxRywNvrF3pZFAgMBAAEwDQYJ
-KoZIhvcNAQEFBQADggEBAAsfixGI4x76q6PWV9pcCHEgtZwIHrbPXsVArUNw1tg1
-1ep86wzlRXWO3D4kHTwtbdJZHM/+DwOvRHow1Y75IS3ndB5SIFJJS4lYeQ0q9t/+
-GMoYs56Ao+iYSH+PjZ67buLhY6GEMV2GGfhblEeyOUZpjNS8hZxYrot5cIt4QqJm
-Fr6OhJD9LojPSNej7PHW49bbS6OZXE4KBsrq0s+uSjZ71LWsm7T3cJA09kF5rOTg
-E7qGH9SEZjeQ2U4XmVmCygCYiG1oFvG3lzh9cl7V9F3W0cW2nwSX6cYI93NJYUxY
-YvkC3d/bl14ZFppaITiyaqXSbOEud5hfZr+tbxOeGOQ=
-                    
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.ifg.edu.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafe.ifg.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">IFG - Instituto Federal de Goias</OrganizationName>
-    <OrganizationName xml:lang="pt-br">IFG - Instituto Federal de Goias</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">IFG - Instituto Federal de Goias</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="pt-br">IFG - Instituto Federal de Goias</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.ifg.edu.br/</OrganizationURL>
-    <OrganizationURL xml:lang="pt-br">http://www.ifg.edu.br/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Diretoria de Tecnologia da Informacao</SurName>
-    <EmailAddress>dti@ifg.edu.br</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/cafe.ifnmg.edu.br-idp-shibboleth.xml b/swamid-interfederations-2.0/cafe.ifnmg.edu.br-idp-shibboleth.xml
deleted file mode 100644
index 27e156ac..00000000
--- a/swamid-interfederations-2.0/cafe.ifnmg.edu.br-idp-shibboleth.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://cafe.ifnmg.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">edu.br</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">IFNMG - Instituto Federal Do Norte De Minas Gerais</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="pt-br">IFNMG - Instituto Federal Do Norte De Minas Gerais</mdui:DisplayName>
-        <mdui:Description xml:lang="en">IFNMG - Instituto Federal Do Norte De Minas Gerais</mdui:Description>
-        <mdui:Description xml:lang="pt-br">IFNMG - Instituto Federal Do Norte De Minas Gerais</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.ifnmg.edu.br/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="pt-br">http://www.ifnmg.edu.br/</mdui:InformationURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-    MIIEqjCCA5ICAQAwDQYJKoZIhvcNAQEFBQAwggEZMTswOQYDVQQKEzJJRk5NRyAt
-IEluc3RpdHV0byBGZWRlcmFsIGRvIE5vcnRlIGRlIE1pbmFzIEdlcmFpczFBMD8G
-A1UECxQ4REdUSSAtIERpcmV0b3JpYSBkZSBHZXN0w6NvIGUgVGVjbm9sb2dpYSBk
-YSBJbmZvcm1hw6fDo28xITAfBgkqhkiG9w0BCQEWEmFkbWluQGlmbm1nLmVkdS5i
-cjEWMBQGA1UEBxMNTW9udGVzIENsYXJvczEzMDEGA1UECBMqSW5zdGl0dXRvIEZl
-ZGVyYWwgZG8gTm9ydGUgZGUgTWluYXMgR2VyYWlzMQswCQYDVQQGEwJCUjEaMBgG
-A1UEAxMRY2FmZS5pZm5tZy5lZHUuYnIwHhcNMTQwNzMxMjAyMDAwWhcNMTkwNzMw
-MjAyMDAwWjCCARkxOzA5BgNVBAoTMklGTk1HIC0gSW5zdGl0dXRvIEZlZGVyYWwg
-ZG8gTm9ydGUgZGUgTWluYXMgR2VyYWlzMUEwPwYDVQQLFDhER1RJIC0gRGlyZXRv
-cmlhIGRlIEdlc3TDo28gZSBUZWNub2xvZ2lhIGRhIEluZm9ybWHDp8OjbzEhMB8G
-CSqGSIb3DQEJARYSYWRtaW5AaWZubWcuZWR1LmJyMRYwFAYDVQQHEw1Nb250ZXMg
-Q2xhcm9zMTMwMQYDVQQIEypJbnN0aXR1dG8gRmVkZXJhbCBkbyBOb3J0ZSBkZSBN
-aW5hcyBHZXJhaXMxCzAJBgNVBAYTAkJSMRowGAYDVQQDExFjYWZlLmlmbm1nLmVk
-dS5icjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAK9uROMCbnEj8V6d
-i0FPFPgvZEkK/maZkaMPAeWFWBIsWdvvVcUYLPm/TKSgkEL3LA9gqD6LupuNHtuq
-VbihU2FRJ63ld57t/TI4K2hm1VwN9le1ajyf/GXgEcrSMkjpxbHI3rFF2PMoFR4y
-Xmt3FVdyEXrMnIg35viPKdWZyNSjdZjctPTDHoU5LZEVbdCJSm547nQdthFBUXnM
-xcHzsZwfx/duHrvlQaFDPTCKZpvy9RGTwEJ0B2iYnPz5eR8SbspvKefhQJUYRgCn
-ljf8x5qGRmzWQoT8Fy+4/mvZmg+nrpvA7fOJt1nz3fMTujY3nFM78hybPM5Rc9Ks
-PmRmLsECAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAILjGqJqbxuulyeZRx5CDoILr
-d0l3/ulycfHSx1KuL3z/pq74Qnsd/bx5i+9t61ilDgjzaPfrSa2R/819VXOsDxXK
-9d43R7YMCLh7cHCLSxhTgZex3lGpV0EVoKUlk7nFuKR0l5WNIojSI9Hns2f7rRR0
-V3FOyySr+3VwErgEtQx6L2tsMIe+PXa0f1OmK2WXiYKjTVi12u8J3rNG9g7i357A
-a6ENAoHeYilId0ZTYlna/9aQ8wYmKM4WPGwG3XU3jdecq117R5+N0tfqoNXtCuri
-zG6SmyYA5YmlEzJQS1UXZtuchEwQlVajzGdGZAeQm2bPcbCgSrAx6EnU4ZLKIQ==
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.ifnmg.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.ifnmg.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.ifnmg.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cafe.ifnmg.edu.br/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://cafe.ifnmg.edu.br/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://cafe.ifnmg.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>
-      
-MIIEqjCCA5ICAQAwDQYJKoZIhvcNAQEFBQAwggEZMTswOQYDVQQKEzJJRk5NRyAt
-IEluc3RpdHV0byBGZWRlcmFsIGRvIE5vcnRlIGRlIE1pbmFzIEdlcmFpczFBMD8G
-A1UECxQ4REdUSSAtIERpcmV0b3JpYSBkZSBHZXN0w6NvIGUgVGVjbm9sb2dpYSBk
-YSBJbmZvcm1hw6fDo28xITAfBgkqhkiG9w0BCQEWEmFkbWluQGlmbm1nLmVkdS5i
-cjEWMBQGA1UEBxMNTW9udGVzIENsYXJvczEzMDEGA1UECBMqSW5zdGl0dXRvIEZl
-ZGVyYWwgZG8gTm9ydGUgZGUgTWluYXMgR2VyYWlzMQswCQYDVQQGEwJCUjEaMBgG
-A1UEAxMRY2FmZS5pZm5tZy5lZHUuYnIwHhcNMTQwNzMxMjAyMDAwWhcNMTkwNzMw
-MjAyMDAwWjCCARkxOzA5BgNVBAoTMklGTk1HIC0gSW5zdGl0dXRvIEZlZGVyYWwg
-ZG8gTm9ydGUgZGUgTWluYXMgR2VyYWlzMUEwPwYDVQQLFDhER1RJIC0gRGlyZXRv
-cmlhIGRlIEdlc3TDo28gZSBUZWNub2xvZ2lhIGRhIEluZm9ybWHDp8OjbzEhMB8G
-CSqGSIb3DQEJARYSYWRtaW5AaWZubWcuZWR1LmJyMRYwFAYDVQQHEw1Nb250ZXMg
-Q2xhcm9zMTMwMQYDVQQIEypJbnN0aXR1dG8gRmVkZXJhbCBkbyBOb3J0ZSBkZSBN
-aW5hcyBHZXJhaXMxCzAJBgNVBAYTAkJSMRowGAYDVQQDExFjYWZlLmlmbm1nLmVk
-dS5icjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAK9uROMCbnEj8V6d
-i0FPFPgvZEkK/maZkaMPAeWFWBIsWdvvVcUYLPm/TKSgkEL3LA9gqD6LupuNHtuq
-VbihU2FRJ63ld57t/TI4K2hm1VwN9le1ajyf/GXgEcrSMkjpxbHI3rFF2PMoFR4y
-Xmt3FVdyEXrMnIg35viPKdWZyNSjdZjctPTDHoU5LZEVbdCJSm547nQdthFBUXnM
-xcHzsZwfx/duHrvlQaFDPTCKZpvy9RGTwEJ0B2iYnPz5eR8SbspvKefhQJUYRgCn
-ljf8x5qGRmzWQoT8Fy+4/mvZmg+nrpvA7fOJt1nz3fMTujY3nFM78hybPM5Rc9Ks
-PmRmLsECAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAILjGqJqbxuulyeZRx5CDoILr
-d0l3/ulycfHSx1KuL3z/pq74Qnsd/bx5i+9t61ilDgjzaPfrSa2R/819VXOsDxXK
-9d43R7YMCLh7cHCLSxhTgZex3lGpV0EVoKUlk7nFuKR0l5WNIojSI9Hns2f7rRR0
-V3FOyySr+3VwErgEtQx6L2tsMIe+PXa0f1OmK2WXiYKjTVi12u8J3rNG9g7i357A
-a6ENAoHeYilId0ZTYlna/9aQ8wYmKM4WPGwG3XU3jdecq117R5+N0tfqoNXtCuri
-zG6SmyYA5YmlEzJQS1UXZtuchEwQlVajzGdGZAeQm2bPcbCgSrAx6EnU4ZLKIQ==
-                    
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.ifnmg.edu.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafe.ifnmg.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">IFNMG - Instituto Federal Do Norte De Minas Gerais</OrganizationName>
-    <OrganizationName xml:lang="pt-br">IFNMG - Instituto Federal Do Norte De Minas Gerais</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">IFNMG - Instituto Federal Do Norte De Minas Gerais</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="pt-br">IFNMG - Instituto Federal Do Norte De Minas Gerais</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.ifnmg.edu.br/</OrganizationURL>
-    <OrganizationURL xml:lang="pt-br">http://www.ifnmg.edu.br/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Christopher Mota</SurName>
-    <EmailAddress>christopher.mota@ifnmg.edu.br</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/cafe.ifnmg.edu.br.xml b/swamid-interfederations-2.0/cafe.ifnmg.edu.br.xml
deleted file mode 100644
index 27e156ac..00000000
--- a/swamid-interfederations-2.0/cafe.ifnmg.edu.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://cafe.ifnmg.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">edu.br</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">IFNMG - Instituto Federal Do Norte De Minas Gerais</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="pt-br">IFNMG - Instituto Federal Do Norte De Minas Gerais</mdui:DisplayName>
-        <mdui:Description xml:lang="en">IFNMG - Instituto Federal Do Norte De Minas Gerais</mdui:Description>
-        <mdui:Description xml:lang="pt-br">IFNMG - Instituto Federal Do Norte De Minas Gerais</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.ifnmg.edu.br/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="pt-br">http://www.ifnmg.edu.br/</mdui:InformationURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-    MIIEqjCCA5ICAQAwDQYJKoZIhvcNAQEFBQAwggEZMTswOQYDVQQKEzJJRk5NRyAt
-IEluc3RpdHV0byBGZWRlcmFsIGRvIE5vcnRlIGRlIE1pbmFzIEdlcmFpczFBMD8G
-A1UECxQ4REdUSSAtIERpcmV0b3JpYSBkZSBHZXN0w6NvIGUgVGVjbm9sb2dpYSBk
-YSBJbmZvcm1hw6fDo28xITAfBgkqhkiG9w0BCQEWEmFkbWluQGlmbm1nLmVkdS5i
-cjEWMBQGA1UEBxMNTW9udGVzIENsYXJvczEzMDEGA1UECBMqSW5zdGl0dXRvIEZl
-ZGVyYWwgZG8gTm9ydGUgZGUgTWluYXMgR2VyYWlzMQswCQYDVQQGEwJCUjEaMBgG
-A1UEAxMRY2FmZS5pZm5tZy5lZHUuYnIwHhcNMTQwNzMxMjAyMDAwWhcNMTkwNzMw
-MjAyMDAwWjCCARkxOzA5BgNVBAoTMklGTk1HIC0gSW5zdGl0dXRvIEZlZGVyYWwg
-ZG8gTm9ydGUgZGUgTWluYXMgR2VyYWlzMUEwPwYDVQQLFDhER1RJIC0gRGlyZXRv
-cmlhIGRlIEdlc3TDo28gZSBUZWNub2xvZ2lhIGRhIEluZm9ybWHDp8OjbzEhMB8G
-CSqGSIb3DQEJARYSYWRtaW5AaWZubWcuZWR1LmJyMRYwFAYDVQQHEw1Nb250ZXMg
-Q2xhcm9zMTMwMQYDVQQIEypJbnN0aXR1dG8gRmVkZXJhbCBkbyBOb3J0ZSBkZSBN
-aW5hcyBHZXJhaXMxCzAJBgNVBAYTAkJSMRowGAYDVQQDExFjYWZlLmlmbm1nLmVk
-dS5icjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAK9uROMCbnEj8V6d
-i0FPFPgvZEkK/maZkaMPAeWFWBIsWdvvVcUYLPm/TKSgkEL3LA9gqD6LupuNHtuq
-VbihU2FRJ63ld57t/TI4K2hm1VwN9le1ajyf/GXgEcrSMkjpxbHI3rFF2PMoFR4y
-Xmt3FVdyEXrMnIg35viPKdWZyNSjdZjctPTDHoU5LZEVbdCJSm547nQdthFBUXnM
-xcHzsZwfx/duHrvlQaFDPTCKZpvy9RGTwEJ0B2iYnPz5eR8SbspvKefhQJUYRgCn
-ljf8x5qGRmzWQoT8Fy+4/mvZmg+nrpvA7fOJt1nz3fMTujY3nFM78hybPM5Rc9Ks
-PmRmLsECAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAILjGqJqbxuulyeZRx5CDoILr
-d0l3/ulycfHSx1KuL3z/pq74Qnsd/bx5i+9t61ilDgjzaPfrSa2R/819VXOsDxXK
-9d43R7YMCLh7cHCLSxhTgZex3lGpV0EVoKUlk7nFuKR0l5WNIojSI9Hns2f7rRR0
-V3FOyySr+3VwErgEtQx6L2tsMIe+PXa0f1OmK2WXiYKjTVi12u8J3rNG9g7i357A
-a6ENAoHeYilId0ZTYlna/9aQ8wYmKM4WPGwG3XU3jdecq117R5+N0tfqoNXtCuri
-zG6SmyYA5YmlEzJQS1UXZtuchEwQlVajzGdGZAeQm2bPcbCgSrAx6EnU4ZLKIQ==
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.ifnmg.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.ifnmg.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.ifnmg.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cafe.ifnmg.edu.br/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://cafe.ifnmg.edu.br/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://cafe.ifnmg.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>
-      
-MIIEqjCCA5ICAQAwDQYJKoZIhvcNAQEFBQAwggEZMTswOQYDVQQKEzJJRk5NRyAt
-IEluc3RpdHV0byBGZWRlcmFsIGRvIE5vcnRlIGRlIE1pbmFzIEdlcmFpczFBMD8G
-A1UECxQ4REdUSSAtIERpcmV0b3JpYSBkZSBHZXN0w6NvIGUgVGVjbm9sb2dpYSBk
-YSBJbmZvcm1hw6fDo28xITAfBgkqhkiG9w0BCQEWEmFkbWluQGlmbm1nLmVkdS5i
-cjEWMBQGA1UEBxMNTW9udGVzIENsYXJvczEzMDEGA1UECBMqSW5zdGl0dXRvIEZl
-ZGVyYWwgZG8gTm9ydGUgZGUgTWluYXMgR2VyYWlzMQswCQYDVQQGEwJCUjEaMBgG
-A1UEAxMRY2FmZS5pZm5tZy5lZHUuYnIwHhcNMTQwNzMxMjAyMDAwWhcNMTkwNzMw
-MjAyMDAwWjCCARkxOzA5BgNVBAoTMklGTk1HIC0gSW5zdGl0dXRvIEZlZGVyYWwg
-ZG8gTm9ydGUgZGUgTWluYXMgR2VyYWlzMUEwPwYDVQQLFDhER1RJIC0gRGlyZXRv
-cmlhIGRlIEdlc3TDo28gZSBUZWNub2xvZ2lhIGRhIEluZm9ybWHDp8OjbzEhMB8G
-CSqGSIb3DQEJARYSYWRtaW5AaWZubWcuZWR1LmJyMRYwFAYDVQQHEw1Nb250ZXMg
-Q2xhcm9zMTMwMQYDVQQIEypJbnN0aXR1dG8gRmVkZXJhbCBkbyBOb3J0ZSBkZSBN
-aW5hcyBHZXJhaXMxCzAJBgNVBAYTAkJSMRowGAYDVQQDExFjYWZlLmlmbm1nLmVk
-dS5icjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAK9uROMCbnEj8V6d
-i0FPFPgvZEkK/maZkaMPAeWFWBIsWdvvVcUYLPm/TKSgkEL3LA9gqD6LupuNHtuq
-VbihU2FRJ63ld57t/TI4K2hm1VwN9le1ajyf/GXgEcrSMkjpxbHI3rFF2PMoFR4y
-Xmt3FVdyEXrMnIg35viPKdWZyNSjdZjctPTDHoU5LZEVbdCJSm547nQdthFBUXnM
-xcHzsZwfx/duHrvlQaFDPTCKZpvy9RGTwEJ0B2iYnPz5eR8SbspvKefhQJUYRgCn
-ljf8x5qGRmzWQoT8Fy+4/mvZmg+nrpvA7fOJt1nz3fMTujY3nFM78hybPM5Rc9Ks
-PmRmLsECAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAILjGqJqbxuulyeZRx5CDoILr
-d0l3/ulycfHSx1KuL3z/pq74Qnsd/bx5i+9t61ilDgjzaPfrSa2R/819VXOsDxXK
-9d43R7YMCLh7cHCLSxhTgZex3lGpV0EVoKUlk7nFuKR0l5WNIojSI9Hns2f7rRR0
-V3FOyySr+3VwErgEtQx6L2tsMIe+PXa0f1OmK2WXiYKjTVi12u8J3rNG9g7i357A
-a6ENAoHeYilId0ZTYlna/9aQ8wYmKM4WPGwG3XU3jdecq117R5+N0tfqoNXtCuri
-zG6SmyYA5YmlEzJQS1UXZtuchEwQlVajzGdGZAeQm2bPcbCgSrAx6EnU4ZLKIQ==
-                    
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.ifnmg.edu.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafe.ifnmg.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">IFNMG - Instituto Federal Do Norte De Minas Gerais</OrganizationName>
-    <OrganizationName xml:lang="pt-br">IFNMG - Instituto Federal Do Norte De Minas Gerais</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">IFNMG - Instituto Federal Do Norte De Minas Gerais</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="pt-br">IFNMG - Instituto Federal Do Norte De Minas Gerais</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.ifnmg.edu.br/</OrganizationURL>
-    <OrganizationURL xml:lang="pt-br">http://www.ifnmg.edu.br/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Christopher Mota</SurName>
-    <EmailAddress>christopher.mota@ifnmg.edu.br</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/cafe.ifpa.edu.br-idp-shibboleth.xml b/swamid-interfederations-2.0/cafe.ifpa.edu.br-idp-shibboleth.xml
deleted file mode 100644
index 11855095..00000000
--- a/swamid-interfederations-2.0/cafe.ifpa.edu.br-idp-shibboleth.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.ifpa.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">edu.br</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">IFPA - Instituto Federal do Para</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="pt-br">IFPA - Instituto Federal do Para</mdui:DisplayName>
-        <mdui:Description xml:lang="en">IFPA - Instituto Federal do Para</mdui:Description>
-        <mdui:Description xml:lang="pt-br">IFPA - Instituto Federal do Para</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.ifpa.edu.br</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="pt-br">http://www.ifpa.edu.br</mdui:InformationURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-    MIIDyDCCArACAQAwDQYJKoZIhvcNAQEFBQAwgakxIzAhBgNVBAoUGkluc3RpdHV0
-byBGZWRlcmFsIGRvIFBhcsOhMQwwCgYDVQQLEwNEVEkxKzApBgkqhkiG9w0BCQEW
-HGFuZGVyc29uLmFsbWVpZGFAaWZwYS5lZHUuYnIxDzANBgNVBAcUBkJlbMOpbTEO
-MAwGA1UECBQFUGFyw6ExCzAJBgNVBAYTAkJSMRkwFwYDVQQDExBjYWZlLmlmcGEu
-ZWR1LmJyMB4XDTE0MDQwOTE4MzkxN1oXDTE5MDQwODE4MzkxN1owgakxIzAhBgNV
-BAoUGkluc3RpdHV0byBGZWRlcmFsIGRvIFBhcsOhMQwwCgYDVQQLEwNEVEkxKzAp
-BgkqhkiG9w0BCQEWHGFuZGVyc29uLmFsbWVpZGFAaWZwYS5lZHUuYnIxDzANBgNV
-BAcUBkJlbMOpbTEOMAwGA1UECBQFUGFyw6ExCzAJBgNVBAYTAkJSMRkwFwYDVQQD
-ExBjYWZlLmlmcGEuZWR1LmJyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
-AQEAuHQSNZdfuckLdr/4W1qtvMa3cS/lKPM3tSZY1UVTLH+KPn76aBWk+zOd92C+
-UgdL+WtJn8qdpX7a16SGfTLwwWtlKJdiC7AxTkPHv6v4HnVBYXBep/re7Yt7ztO3
-4D/6jgj99HMfbz8jtfl2RV6m+rFupKth8gU9hTcaVTtBKUc5Lx+SSYk5Ik3jjOXJ
-s3I/aluVe47GIuJcZAErB/8aCDlUkChGRF4262nzW92xqK5dmXbqd76uVNG5U5dV
-hhc1KlBaZD3kuinuMVlOqBRQoHU4HzDAGWbQ9Jguf6M/cSSQEVtGQp3ZIl6s+YK5
-Zgxdsxs56Sx5qcLQx+0GhRkpdQIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQCtxGdM
-SOa6Hj20lqQ04V855D6JVI5kbVoOjlBZ1UlxeO8BoD3535GhnGE2Ajik7MXfYYYF
-ByZEG/WX8TjiL1jVYNQS/XdrXbz/38XJM2O3q32G1eZ0AhtQEpAEYSN/owrFolbq
-hJx+tdKdIJ3hatboJsrZHX60LcvMz76lXtjb10GVj4g7Kpix7l13mOQgPZl4Ard3
-l7joZ5SsO3GzjI5ZNLiKafLrjpPqHMA1NdJ/OkaIiMuGqAC50ob3iXE87pfvQ7iZ
-Tsz8wWmk1P302VHoBrUz2NJmrpmvd2jCoMXmTdDfn3nKw/U0Is+nIgn1HnvHzgOQ
-IGfcjJxQ/HcjSANz
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.ifpa.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.ifpa.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.ifpa.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cafe.ifpa.edu.br/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://cafe.ifpa.edu.br/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://cafe.ifpa.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>
-      
-MIIDyDCCArACAQAwDQYJKoZIhvcNAQEFBQAwgakxIzAhBgNVBAoUGkluc3RpdHV0
-byBGZWRlcmFsIGRvIFBhcsOhMQwwCgYDVQQLEwNEVEkxKzApBgkqhkiG9w0BCQEW
-HGFuZGVyc29uLmFsbWVpZGFAaWZwYS5lZHUuYnIxDzANBgNVBAcUBkJlbMOpbTEO
-MAwGA1UECBQFUGFyw6ExCzAJBgNVBAYTAkJSMRkwFwYDVQQDExBjYWZlLmlmcGEu
-ZWR1LmJyMB4XDTE0MDQwOTE4MzkxN1oXDTE5MDQwODE4MzkxN1owgakxIzAhBgNV
-BAoUGkluc3RpdHV0byBGZWRlcmFsIGRvIFBhcsOhMQwwCgYDVQQLEwNEVEkxKzAp
-BgkqhkiG9w0BCQEWHGFuZGVyc29uLmFsbWVpZGFAaWZwYS5lZHUuYnIxDzANBgNV
-BAcUBkJlbMOpbTEOMAwGA1UECBQFUGFyw6ExCzAJBgNVBAYTAkJSMRkwFwYDVQQD
-ExBjYWZlLmlmcGEuZWR1LmJyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
-AQEAuHQSNZdfuckLdr/4W1qtvMa3cS/lKPM3tSZY1UVTLH+KPn76aBWk+zOd92C+
-UgdL+WtJn8qdpX7a16SGfTLwwWtlKJdiC7AxTkPHv6v4HnVBYXBep/re7Yt7ztO3
-4D/6jgj99HMfbz8jtfl2RV6m+rFupKth8gU9hTcaVTtBKUc5Lx+SSYk5Ik3jjOXJ
-s3I/aluVe47GIuJcZAErB/8aCDlUkChGRF4262nzW92xqK5dmXbqd76uVNG5U5dV
-hhc1KlBaZD3kuinuMVlOqBRQoHU4HzDAGWbQ9Jguf6M/cSSQEVtGQp3ZIl6s+YK5
-Zgxdsxs56Sx5qcLQx+0GhRkpdQIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQCtxGdM
-SOa6Hj20lqQ04V855D6JVI5kbVoOjlBZ1UlxeO8BoD3535GhnGE2Ajik7MXfYYYF
-ByZEG/WX8TjiL1jVYNQS/XdrXbz/38XJM2O3q32G1eZ0AhtQEpAEYSN/owrFolbq
-hJx+tdKdIJ3hatboJsrZHX60LcvMz76lXtjb10GVj4g7Kpix7l13mOQgPZl4Ard3
-l7joZ5SsO3GzjI5ZNLiKafLrjpPqHMA1NdJ/OkaIiMuGqAC50ob3iXE87pfvQ7iZ
-Tsz8wWmk1P302VHoBrUz2NJmrpmvd2jCoMXmTdDfn3nKw/U0Is+nIgn1HnvHzgOQ
-IGfcjJxQ/HcjSANz
-                    
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.ifpa.edu.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafe.ifpa.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">IFPA - Instituto Federal do Para</OrganizationName>
-    <OrganizationName xml:lang="pt-br">IFPA - Instituto Federal do Para</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">IFPA - Instituto Federal do Para</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="pt-br">IFPA - Instituto Federal do Para</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.ifpa.edu.br</OrganizationURL>
-    <OrganizationURL xml:lang="pt-br">http://www.ifpa.edu.br</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Anderson Almeida</SurName>
-    <EmailAddress>anderson.almeida@ifpa.edu.br</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/cafe.ifpa.edu.br.xml b/swamid-interfederations-2.0/cafe.ifpa.edu.br.xml
deleted file mode 100644
index 11855095..00000000
--- a/swamid-interfederations-2.0/cafe.ifpa.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.ifpa.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">edu.br</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">IFPA - Instituto Federal do Para</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="pt-br">IFPA - Instituto Federal do Para</mdui:DisplayName>
-        <mdui:Description xml:lang="en">IFPA - Instituto Federal do Para</mdui:Description>
-        <mdui:Description xml:lang="pt-br">IFPA - Instituto Federal do Para</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.ifpa.edu.br</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="pt-br">http://www.ifpa.edu.br</mdui:InformationURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-    MIIDyDCCArACAQAwDQYJKoZIhvcNAQEFBQAwgakxIzAhBgNVBAoUGkluc3RpdHV0
-byBGZWRlcmFsIGRvIFBhcsOhMQwwCgYDVQQLEwNEVEkxKzApBgkqhkiG9w0BCQEW
-HGFuZGVyc29uLmFsbWVpZGFAaWZwYS5lZHUuYnIxDzANBgNVBAcUBkJlbMOpbTEO
-MAwGA1UECBQFUGFyw6ExCzAJBgNVBAYTAkJSMRkwFwYDVQQDExBjYWZlLmlmcGEu
-ZWR1LmJyMB4XDTE0MDQwOTE4MzkxN1oXDTE5MDQwODE4MzkxN1owgakxIzAhBgNV
-BAoUGkluc3RpdHV0byBGZWRlcmFsIGRvIFBhcsOhMQwwCgYDVQQLEwNEVEkxKzAp
-BgkqhkiG9w0BCQEWHGFuZGVyc29uLmFsbWVpZGFAaWZwYS5lZHUuYnIxDzANBgNV
-BAcUBkJlbMOpbTEOMAwGA1UECBQFUGFyw6ExCzAJBgNVBAYTAkJSMRkwFwYDVQQD
-ExBjYWZlLmlmcGEuZWR1LmJyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
-AQEAuHQSNZdfuckLdr/4W1qtvMa3cS/lKPM3tSZY1UVTLH+KPn76aBWk+zOd92C+
-UgdL+WtJn8qdpX7a16SGfTLwwWtlKJdiC7AxTkPHv6v4HnVBYXBep/re7Yt7ztO3
-4D/6jgj99HMfbz8jtfl2RV6m+rFupKth8gU9hTcaVTtBKUc5Lx+SSYk5Ik3jjOXJ
-s3I/aluVe47GIuJcZAErB/8aCDlUkChGRF4262nzW92xqK5dmXbqd76uVNG5U5dV
-hhc1KlBaZD3kuinuMVlOqBRQoHU4HzDAGWbQ9Jguf6M/cSSQEVtGQp3ZIl6s+YK5
-Zgxdsxs56Sx5qcLQx+0GhRkpdQIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQCtxGdM
-SOa6Hj20lqQ04V855D6JVI5kbVoOjlBZ1UlxeO8BoD3535GhnGE2Ajik7MXfYYYF
-ByZEG/WX8TjiL1jVYNQS/XdrXbz/38XJM2O3q32G1eZ0AhtQEpAEYSN/owrFolbq
-hJx+tdKdIJ3hatboJsrZHX60LcvMz76lXtjb10GVj4g7Kpix7l13mOQgPZl4Ard3
-l7joZ5SsO3GzjI5ZNLiKafLrjpPqHMA1NdJ/OkaIiMuGqAC50ob3iXE87pfvQ7iZ
-Tsz8wWmk1P302VHoBrUz2NJmrpmvd2jCoMXmTdDfn3nKw/U0Is+nIgn1HnvHzgOQ
-IGfcjJxQ/HcjSANz
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.ifpa.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.ifpa.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.ifpa.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cafe.ifpa.edu.br/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://cafe.ifpa.edu.br/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://cafe.ifpa.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>
-      
-MIIDyDCCArACAQAwDQYJKoZIhvcNAQEFBQAwgakxIzAhBgNVBAoUGkluc3RpdHV0
-byBGZWRlcmFsIGRvIFBhcsOhMQwwCgYDVQQLEwNEVEkxKzApBgkqhkiG9w0BCQEW
-HGFuZGVyc29uLmFsbWVpZGFAaWZwYS5lZHUuYnIxDzANBgNVBAcUBkJlbMOpbTEO
-MAwGA1UECBQFUGFyw6ExCzAJBgNVBAYTAkJSMRkwFwYDVQQDExBjYWZlLmlmcGEu
-ZWR1LmJyMB4XDTE0MDQwOTE4MzkxN1oXDTE5MDQwODE4MzkxN1owgakxIzAhBgNV
-BAoUGkluc3RpdHV0byBGZWRlcmFsIGRvIFBhcsOhMQwwCgYDVQQLEwNEVEkxKzAp
-BgkqhkiG9w0BCQEWHGFuZGVyc29uLmFsbWVpZGFAaWZwYS5lZHUuYnIxDzANBgNV
-BAcUBkJlbMOpbTEOMAwGA1UECBQFUGFyw6ExCzAJBgNVBAYTAkJSMRkwFwYDVQQD
-ExBjYWZlLmlmcGEuZWR1LmJyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
-AQEAuHQSNZdfuckLdr/4W1qtvMa3cS/lKPM3tSZY1UVTLH+KPn76aBWk+zOd92C+
-UgdL+WtJn8qdpX7a16SGfTLwwWtlKJdiC7AxTkPHv6v4HnVBYXBep/re7Yt7ztO3
-4D/6jgj99HMfbz8jtfl2RV6m+rFupKth8gU9hTcaVTtBKUc5Lx+SSYk5Ik3jjOXJ
-s3I/aluVe47GIuJcZAErB/8aCDlUkChGRF4262nzW92xqK5dmXbqd76uVNG5U5dV
-hhc1KlBaZD3kuinuMVlOqBRQoHU4HzDAGWbQ9Jguf6M/cSSQEVtGQp3ZIl6s+YK5
-Zgxdsxs56Sx5qcLQx+0GhRkpdQIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQCtxGdM
-SOa6Hj20lqQ04V855D6JVI5kbVoOjlBZ1UlxeO8BoD3535GhnGE2Ajik7MXfYYYF
-ByZEG/WX8TjiL1jVYNQS/XdrXbz/38XJM2O3q32G1eZ0AhtQEpAEYSN/owrFolbq
-hJx+tdKdIJ3hatboJsrZHX60LcvMz76lXtjb10GVj4g7Kpix7l13mOQgPZl4Ard3
-l7joZ5SsO3GzjI5ZNLiKafLrjpPqHMA1NdJ/OkaIiMuGqAC50ob3iXE87pfvQ7iZ
-Tsz8wWmk1P302VHoBrUz2NJmrpmvd2jCoMXmTdDfn3nKw/U0Is+nIgn1HnvHzgOQ
-IGfcjJxQ/HcjSANz
-                    
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.ifpa.edu.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafe.ifpa.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">IFPA - Instituto Federal do Para</OrganizationName>
-    <OrganizationName xml:lang="pt-br">IFPA - Instituto Federal do Para</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">IFPA - Instituto Federal do Para</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="pt-br">IFPA - Instituto Federal do Para</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.ifpa.edu.br</OrganizationURL>
-    <OrganizationURL xml:lang="pt-br">http://www.ifpa.edu.br</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Anderson Almeida</SurName>
-    <EmailAddress>anderson.almeida@ifpa.edu.br</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/cafe.ifro.edu.br-idp-shibboleth.xml b/swamid-interfederations-2.0/cafe.ifro.edu.br-idp-shibboleth.xml
deleted file mode 100644
index 615bce45..00000000
--- a/swamid-interfederations-2.0/cafe.ifro.edu.br-idp-shibboleth.xml
+++ /dev/null
@@ -1,100 +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.ifro.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">edu.br</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">IFRO</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="pt-br">IFRO</mdui:DisplayName>
-        <mdui:Description xml:lang="en">IFRO</mdui:Description>
-        <mdui:Description xml:lang="pt-br">IFRO</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.ifro.edu.br</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="pt-br">http://www.ifro.edu.br</mdui:InformationURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-    MIICyjCCAbICAQAwDQYJKoZIhvcNAQEFBQAwKzENMAsGA1UECxMEREdUSTELMAkG
-A1UEBhMCQlIxDTALBgNVBAMTBGNhZmUwHhcNMTQwNzI0MTkxNzEwWhcNMTkwNzIz
-MTkxNzEwWjArMQ0wCwYDVQQLEwRER1RJMQswCQYDVQQGEwJCUjENMAsGA1UEAxME
-Y2FmZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAN6ZCm5rnhEwPjrr
-hJeWHqx+5Uj4/0xBuiU+7EIDJfkCWGAjmo3wyn7fnl9NkAsBzf+CKrWSOPEcgOS5
-p2EPsP4XL+/AH24s86tdFN/5GNY9gYVv9HdgxHXX5CsS+35X1J3vtVMbyc40+UNp
-YgLlocluN+xyYYFgi4hjXo64YGgWfAEOVkpQaQftVJTd5B06PlfI3zRV+s4yD+1r
-1hcz9coOSmsE/fZX7QRJQ1imxm6w6xBj5xP95hw3knOZ4G7m7YzApEg8P0nak2fs
-EYYYOnMSKnKB2Ss9Y57hffnvvXsBScSP+u28mJB6eFz92WMyH7hrhyttR9mVn8pj
-v/pqK00CAwEAATANBgkqhkiG9w0BAQUFAAOCAQEATr5qM9J/dGnTA81HMB10gQ78
-V9o++8gwlRqjK+TEM5XdUqu1Fw6ela0etECzoaWQpuFbU2S3tkP0VrN5ONabgPGK
-lx9s8N+uY80QUzUaAIAePVA77dYaQK/nC+lRWtOSRig5ZfYW8nrbPkwe9YN/Z0Yl
-a5oKJj745bgtCC4E8ymffGQNW45/cbLXGGkZ/uxUyHWUhBg4GVmCa1sjXTJDBzDN
-iOLJsZO2Byu4nNTDHzRbtrIZDNsJ0M12sjEO2AVCOP4hXDoRFoZJtzCq+4q4f3lh
-zDUAzBmzpM9dLuP2WBQkKjZNg6PwOzmIF0JRBaGx4PaRAha3GWG91vo5zI+lVg==
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.ifro.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.ifro.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.ifro.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cafe.ifro.edu.br/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://cafe.ifro.edu.br/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://cafe.ifro.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>
-      
-MIICyjCCAbICAQAwDQYJKoZIhvcNAQEFBQAwKzENMAsGA1UECxMEREdUSTELMAkG
-A1UEBhMCQlIxDTALBgNVBAMTBGNhZmUwHhcNMTQwNzI0MTkxNzEwWhcNMTkwNzIz
-MTkxNzEwWjArMQ0wCwYDVQQLEwRER1RJMQswCQYDVQQGEwJCUjENMAsGA1UEAxME
-Y2FmZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAN6ZCm5rnhEwPjrr
-hJeWHqx+5Uj4/0xBuiU+7EIDJfkCWGAjmo3wyn7fnl9NkAsBzf+CKrWSOPEcgOS5
-p2EPsP4XL+/AH24s86tdFN/5GNY9gYVv9HdgxHXX5CsS+35X1J3vtVMbyc40+UNp
-YgLlocluN+xyYYFgi4hjXo64YGgWfAEOVkpQaQftVJTd5B06PlfI3zRV+s4yD+1r
-1hcz9coOSmsE/fZX7QRJQ1imxm6w6xBj5xP95hw3knOZ4G7m7YzApEg8P0nak2fs
-EYYYOnMSKnKB2Ss9Y57hffnvvXsBScSP+u28mJB6eFz92WMyH7hrhyttR9mVn8pj
-v/pqK00CAwEAATANBgkqhkiG9w0BAQUFAAOCAQEATr5qM9J/dGnTA81HMB10gQ78
-V9o++8gwlRqjK+TEM5XdUqu1Fw6ela0etECzoaWQpuFbU2S3tkP0VrN5ONabgPGK
-lx9s8N+uY80QUzUaAIAePVA77dYaQK/nC+lRWtOSRig5ZfYW8nrbPkwe9YN/Z0Yl
-a5oKJj745bgtCC4E8ymffGQNW45/cbLXGGkZ/uxUyHWUhBg4GVmCa1sjXTJDBzDN
-iOLJsZO2Byu4nNTDHzRbtrIZDNsJ0M12sjEO2AVCOP4hXDoRFoZJtzCq+4q4f3lh
-zDUAzBmzpM9dLuP2WBQkKjZNg6PwOzmIF0JRBaGx4PaRAha3GWG91vo5zI+lVg==
-                    
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.ifro.edu.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafe.ifro.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">IFRO</OrganizationName>
-    <OrganizationName xml:lang="pt-br">IFRO</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">IFRO</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="pt-br">IFRO</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.ifro.edu.br</OrganizationURL>
-    <OrganizationURL xml:lang="pt-br">http://www.ifro.edu.br</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Joilson Dantas</SurName>
-    <EmailAddress>suporte.reitoria@ifro.edu.br</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/cafe.ifro.edu.br.xml b/swamid-interfederations-2.0/cafe.ifro.edu.br.xml
deleted file mode 100644
index 615bce45..00000000
--- a/swamid-interfederations-2.0/cafe.ifro.edu.br.xml
+++ /dev/null
@@ -1,100 +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.ifro.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">edu.br</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">IFRO</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="pt-br">IFRO</mdui:DisplayName>
-        <mdui:Description xml:lang="en">IFRO</mdui:Description>
-        <mdui:Description xml:lang="pt-br">IFRO</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.ifro.edu.br</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="pt-br">http://www.ifro.edu.br</mdui:InformationURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-    MIICyjCCAbICAQAwDQYJKoZIhvcNAQEFBQAwKzENMAsGA1UECxMEREdUSTELMAkG
-A1UEBhMCQlIxDTALBgNVBAMTBGNhZmUwHhcNMTQwNzI0MTkxNzEwWhcNMTkwNzIz
-MTkxNzEwWjArMQ0wCwYDVQQLEwRER1RJMQswCQYDVQQGEwJCUjENMAsGA1UEAxME
-Y2FmZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAN6ZCm5rnhEwPjrr
-hJeWHqx+5Uj4/0xBuiU+7EIDJfkCWGAjmo3wyn7fnl9NkAsBzf+CKrWSOPEcgOS5
-p2EPsP4XL+/AH24s86tdFN/5GNY9gYVv9HdgxHXX5CsS+35X1J3vtVMbyc40+UNp
-YgLlocluN+xyYYFgi4hjXo64YGgWfAEOVkpQaQftVJTd5B06PlfI3zRV+s4yD+1r
-1hcz9coOSmsE/fZX7QRJQ1imxm6w6xBj5xP95hw3knOZ4G7m7YzApEg8P0nak2fs
-EYYYOnMSKnKB2Ss9Y57hffnvvXsBScSP+u28mJB6eFz92WMyH7hrhyttR9mVn8pj
-v/pqK00CAwEAATANBgkqhkiG9w0BAQUFAAOCAQEATr5qM9J/dGnTA81HMB10gQ78
-V9o++8gwlRqjK+TEM5XdUqu1Fw6ela0etECzoaWQpuFbU2S3tkP0VrN5ONabgPGK
-lx9s8N+uY80QUzUaAIAePVA77dYaQK/nC+lRWtOSRig5ZfYW8nrbPkwe9YN/Z0Yl
-a5oKJj745bgtCC4E8ymffGQNW45/cbLXGGkZ/uxUyHWUhBg4GVmCa1sjXTJDBzDN
-iOLJsZO2Byu4nNTDHzRbtrIZDNsJ0M12sjEO2AVCOP4hXDoRFoZJtzCq+4q4f3lh
-zDUAzBmzpM9dLuP2WBQkKjZNg6PwOzmIF0JRBaGx4PaRAha3GWG91vo5zI+lVg==
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.ifro.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.ifro.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.ifro.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cafe.ifro.edu.br/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://cafe.ifro.edu.br/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://cafe.ifro.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>
-      
-MIICyjCCAbICAQAwDQYJKoZIhvcNAQEFBQAwKzENMAsGA1UECxMEREdUSTELMAkG
-A1UEBhMCQlIxDTALBgNVBAMTBGNhZmUwHhcNMTQwNzI0MTkxNzEwWhcNMTkwNzIz
-MTkxNzEwWjArMQ0wCwYDVQQLEwRER1RJMQswCQYDVQQGEwJCUjENMAsGA1UEAxME
-Y2FmZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAN6ZCm5rnhEwPjrr
-hJeWHqx+5Uj4/0xBuiU+7EIDJfkCWGAjmo3wyn7fnl9NkAsBzf+CKrWSOPEcgOS5
-p2EPsP4XL+/AH24s86tdFN/5GNY9gYVv9HdgxHXX5CsS+35X1J3vtVMbyc40+UNp
-YgLlocluN+xyYYFgi4hjXo64YGgWfAEOVkpQaQftVJTd5B06PlfI3zRV+s4yD+1r
-1hcz9coOSmsE/fZX7QRJQ1imxm6w6xBj5xP95hw3knOZ4G7m7YzApEg8P0nak2fs
-EYYYOnMSKnKB2Ss9Y57hffnvvXsBScSP+u28mJB6eFz92WMyH7hrhyttR9mVn8pj
-v/pqK00CAwEAATANBgkqhkiG9w0BAQUFAAOCAQEATr5qM9J/dGnTA81HMB10gQ78
-V9o++8gwlRqjK+TEM5XdUqu1Fw6ela0etECzoaWQpuFbU2S3tkP0VrN5ONabgPGK
-lx9s8N+uY80QUzUaAIAePVA77dYaQK/nC+lRWtOSRig5ZfYW8nrbPkwe9YN/Z0Yl
-a5oKJj745bgtCC4E8ymffGQNW45/cbLXGGkZ/uxUyHWUhBg4GVmCa1sjXTJDBzDN
-iOLJsZO2Byu4nNTDHzRbtrIZDNsJ0M12sjEO2AVCOP4hXDoRFoZJtzCq+4q4f3lh
-zDUAzBmzpM9dLuP2WBQkKjZNg6PwOzmIF0JRBaGx4PaRAha3GWG91vo5zI+lVg==
-                    
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.ifro.edu.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafe.ifro.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">IFRO</OrganizationName>
-    <OrganizationName xml:lang="pt-br">IFRO</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">IFRO</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="pt-br">IFRO</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.ifro.edu.br</OrganizationURL>
-    <OrganizationURL xml:lang="pt-br">http://www.ifro.edu.br</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Joilson Dantas</SurName>
-    <EmailAddress>suporte.reitoria@ifro.edu.br</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/cafe.ifrs.edu.br-idp-shibboleth.xml b/swamid-interfederations-2.0/cafe.ifrs.edu.br-idp-shibboleth.xml
deleted file mode 100644
index caf05827..00000000
--- a/swamid-interfederations-2.0/cafe.ifrs.edu.br-idp-shibboleth.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.ifrs.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">edu.br</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">IFRS - Instituto Federal de Educacao, Ciencia e Tecnologia do Rio Grande do Sul</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="pt-br">IFRS - Instituto Federal de Educacao, Ciencia e Tecnologia do Rio Grande do Sul</mdui:DisplayName>
-        <mdui:Description xml:lang="en">IFRS - Instituto Federal de Educacao, Ciencia e Tecnologia do Rio Grande do Sul</mdui:Description>
-        <mdui:Description xml:lang="pt-br">IFRS - Instituto Federal de Educacao, Ciencia e Tecnologia do Rio Grande do Sul</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.ifrs.edu.br/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="pt-br">http://www.ifrs.edu.br/</mdui:InformationURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-    MIIDsDCCApgCAQAwDQYJKoZIhvcNAQEFBQAwgZ0xDTALBgNVBAoTBElGUlMxDDAK
-BgNVBAsTA0RUSTEfMB0GCSqGSIb3DQEJARYQY2FmZUBpZnJzLmVkdS5icjEZMBcG
-A1UEBxQQQmVudG8gR29uw6dhbHZlczEaMBgGA1UECBMRUmlvIEdyYW5kZSBkbyBT
-dWwxCzAJBgNVBAYTAkJSMRkwFwYDVQQDExBjYWZlLmlmcnMuZWR1LmJyMB4XDTE0
-MDQwOTE2MTkxNFoXDTE5MDQwODE2MTkxNFowgZ0xDTALBgNVBAoTBElGUlMxDDAK
-BgNVBAsTA0RUSTEfMB0GCSqGSIb3DQEJARYQY2FmZUBpZnJzLmVkdS5icjEZMBcG
-A1UEBxQQQmVudG8gR29uw6dhbHZlczEaMBgGA1UECBMRUmlvIEdyYW5kZSBkbyBT
-dWwxCzAJBgNVBAYTAkJSMRkwFwYDVQQDExBjYWZlLmlmcnMuZWR1LmJyMIIBIjAN
-BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsXUlkSu36bt4LJdQ5za7kB40dJlD
-HAV+9CCRoUmQnFvCbu2xKdnY5Ou518/dn0sKLNRFJSj2xGpUV2Z3R7dMvOhyOSqb
-VB1lnkeAyeTd238ZVJgvHokWBdP2ykUuHN1snMNtVExME2Ie7jqUKSQrhB+8ImZV
-7AU7v76pY5Yu5AysvBL0GCBmhatWeMLpXdFJxCP6WviVeoRIBPJKYElvcH1kZn4D
-QTL8Org4tTWCsp83PkjLN/LE0xYpxQyGCx/oeUTwLt2tY/csyk5z7yLxEPxcxpj9
-OOjmpT0CU7Q6t0s846BxVNYuv2QQOwBqAhf7bWtz0EO+n8qnsVEgicLGawIDAQAB
-MA0GCSqGSIb3DQEBBQUAA4IBAQBJznGzZ6tpuPdLyTRk4t1o+26fAwLxRcNbjlVq
-MzlEWuUo6CJOXcFSiDDDzK47m8nG+SzSaJLbJTrBxO8MNWUzlVWlJ0sQhZzhxmGv
-9MRcUDf/1rfmrVTimpJ2mxupcFZr25Xwa/kWsjOtY50OJSJgMBY8YbpXhuQfdKS+
-vCFaVKqsdaeWU96/w8n5XdlN7qOCU9mNTFL5o1Hya0N6gE9XOFYJG+Bl9GYirlNv
-1BPl9cuCCtZpNRiW1UZXcEvyq4dwGW/1eNg/LjWQTerR/y4u0eLcJaBZDz9GDztr
-wI2yGmmso+W7sduE4zoAK9icH9XtpZV+vwVSSxqUI1yK+/pg
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.ifrs.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.ifrs.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.ifrs.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cafe.ifrs.edu.br/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://cafe.ifrs.edu.br/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://cafe.ifrs.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>
-      
-MIIDsDCCApgCAQAwDQYJKoZIhvcNAQEFBQAwgZ0xDTALBgNVBAoTBElGUlMxDDAK
-BgNVBAsTA0RUSTEfMB0GCSqGSIb3DQEJARYQY2FmZUBpZnJzLmVkdS5icjEZMBcG
-A1UEBxQQQmVudG8gR29uw6dhbHZlczEaMBgGA1UECBMRUmlvIEdyYW5kZSBkbyBT
-dWwxCzAJBgNVBAYTAkJSMRkwFwYDVQQDExBjYWZlLmlmcnMuZWR1LmJyMB4XDTE0
-MDQwOTE2MTkxNFoXDTE5MDQwODE2MTkxNFowgZ0xDTALBgNVBAoTBElGUlMxDDAK
-BgNVBAsTA0RUSTEfMB0GCSqGSIb3DQEJARYQY2FmZUBpZnJzLmVkdS5icjEZMBcG
-A1UEBxQQQmVudG8gR29uw6dhbHZlczEaMBgGA1UECBMRUmlvIEdyYW5kZSBkbyBT
-dWwxCzAJBgNVBAYTAkJSMRkwFwYDVQQDExBjYWZlLmlmcnMuZWR1LmJyMIIBIjAN
-BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsXUlkSu36bt4LJdQ5za7kB40dJlD
-HAV+9CCRoUmQnFvCbu2xKdnY5Ou518/dn0sKLNRFJSj2xGpUV2Z3R7dMvOhyOSqb
-VB1lnkeAyeTd238ZVJgvHokWBdP2ykUuHN1snMNtVExME2Ie7jqUKSQrhB+8ImZV
-7AU7v76pY5Yu5AysvBL0GCBmhatWeMLpXdFJxCP6WviVeoRIBPJKYElvcH1kZn4D
-QTL8Org4tTWCsp83PkjLN/LE0xYpxQyGCx/oeUTwLt2tY/csyk5z7yLxEPxcxpj9
-OOjmpT0CU7Q6t0s846BxVNYuv2QQOwBqAhf7bWtz0EO+n8qnsVEgicLGawIDAQAB
-MA0GCSqGSIb3DQEBBQUAA4IBAQBJznGzZ6tpuPdLyTRk4t1o+26fAwLxRcNbjlVq
-MzlEWuUo6CJOXcFSiDDDzK47m8nG+SzSaJLbJTrBxO8MNWUzlVWlJ0sQhZzhxmGv
-9MRcUDf/1rfmrVTimpJ2mxupcFZr25Xwa/kWsjOtY50OJSJgMBY8YbpXhuQfdKS+
-vCFaVKqsdaeWU96/w8n5XdlN7qOCU9mNTFL5o1Hya0N6gE9XOFYJG+Bl9GYirlNv
-1BPl9cuCCtZpNRiW1UZXcEvyq4dwGW/1eNg/LjWQTerR/y4u0eLcJaBZDz9GDztr
-wI2yGmmso+W7sduE4zoAK9icH9XtpZV+vwVSSxqUI1yK+/pg
-                    
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.ifrs.edu.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafe.ifrs.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">IFRS - Instituto Federal de Educacao, Ciencia e Tecnologia do Rio Grande do Sul</OrganizationName>
-    <OrganizationName xml:lang="pt-br">IFRS - Instituto Federal de Educacao, Ciencia e Tecnologia do Rio Grande do Sul</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">IFRS - Instituto Federal de Educacao, Ciencia e Tecnologia do Rio Grande do Sul</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="pt-br">IFRS - Instituto Federal de Educacao, Ciencia e Tecnologia do Rio Grande do Sul</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.ifrs.edu.br/</OrganizationURL>
-    <OrganizationURL xml:lang="pt-br">http://www.ifrs.edu.br/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Suporte CAFe IFRS</SurName>
-    <EmailAddress>cafe@ifrs.edu.br</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/cafe.ifrs.edu.br.xml b/swamid-interfederations-2.0/cafe.ifrs.edu.br.xml
deleted file mode 100644
index caf05827..00000000
--- a/swamid-interfederations-2.0/cafe.ifrs.edu.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.ifrs.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">edu.br</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">IFRS - Instituto Federal de Educacao, Ciencia e Tecnologia do Rio Grande do Sul</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="pt-br">IFRS - Instituto Federal de Educacao, Ciencia e Tecnologia do Rio Grande do Sul</mdui:DisplayName>
-        <mdui:Description xml:lang="en">IFRS - Instituto Federal de Educacao, Ciencia e Tecnologia do Rio Grande do Sul</mdui:Description>
-        <mdui:Description xml:lang="pt-br">IFRS - Instituto Federal de Educacao, Ciencia e Tecnologia do Rio Grande do Sul</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.ifrs.edu.br/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="pt-br">http://www.ifrs.edu.br/</mdui:InformationURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-    MIIDsDCCApgCAQAwDQYJKoZIhvcNAQEFBQAwgZ0xDTALBgNVBAoTBElGUlMxDDAK
-BgNVBAsTA0RUSTEfMB0GCSqGSIb3DQEJARYQY2FmZUBpZnJzLmVkdS5icjEZMBcG
-A1UEBxQQQmVudG8gR29uw6dhbHZlczEaMBgGA1UECBMRUmlvIEdyYW5kZSBkbyBT
-dWwxCzAJBgNVBAYTAkJSMRkwFwYDVQQDExBjYWZlLmlmcnMuZWR1LmJyMB4XDTE0
-MDQwOTE2MTkxNFoXDTE5MDQwODE2MTkxNFowgZ0xDTALBgNVBAoTBElGUlMxDDAK
-BgNVBAsTA0RUSTEfMB0GCSqGSIb3DQEJARYQY2FmZUBpZnJzLmVkdS5icjEZMBcG
-A1UEBxQQQmVudG8gR29uw6dhbHZlczEaMBgGA1UECBMRUmlvIEdyYW5kZSBkbyBT
-dWwxCzAJBgNVBAYTAkJSMRkwFwYDVQQDExBjYWZlLmlmcnMuZWR1LmJyMIIBIjAN
-BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsXUlkSu36bt4LJdQ5za7kB40dJlD
-HAV+9CCRoUmQnFvCbu2xKdnY5Ou518/dn0sKLNRFJSj2xGpUV2Z3R7dMvOhyOSqb
-VB1lnkeAyeTd238ZVJgvHokWBdP2ykUuHN1snMNtVExME2Ie7jqUKSQrhB+8ImZV
-7AU7v76pY5Yu5AysvBL0GCBmhatWeMLpXdFJxCP6WviVeoRIBPJKYElvcH1kZn4D
-QTL8Org4tTWCsp83PkjLN/LE0xYpxQyGCx/oeUTwLt2tY/csyk5z7yLxEPxcxpj9
-OOjmpT0CU7Q6t0s846BxVNYuv2QQOwBqAhf7bWtz0EO+n8qnsVEgicLGawIDAQAB
-MA0GCSqGSIb3DQEBBQUAA4IBAQBJznGzZ6tpuPdLyTRk4t1o+26fAwLxRcNbjlVq
-MzlEWuUo6CJOXcFSiDDDzK47m8nG+SzSaJLbJTrBxO8MNWUzlVWlJ0sQhZzhxmGv
-9MRcUDf/1rfmrVTimpJ2mxupcFZr25Xwa/kWsjOtY50OJSJgMBY8YbpXhuQfdKS+
-vCFaVKqsdaeWU96/w8n5XdlN7qOCU9mNTFL5o1Hya0N6gE9XOFYJG+Bl9GYirlNv
-1BPl9cuCCtZpNRiW1UZXcEvyq4dwGW/1eNg/LjWQTerR/y4u0eLcJaBZDz9GDztr
-wI2yGmmso+W7sduE4zoAK9icH9XtpZV+vwVSSxqUI1yK+/pg
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.ifrs.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.ifrs.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.ifrs.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cafe.ifrs.edu.br/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://cafe.ifrs.edu.br/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://cafe.ifrs.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>
-      
-MIIDsDCCApgCAQAwDQYJKoZIhvcNAQEFBQAwgZ0xDTALBgNVBAoTBElGUlMxDDAK
-BgNVBAsTA0RUSTEfMB0GCSqGSIb3DQEJARYQY2FmZUBpZnJzLmVkdS5icjEZMBcG
-A1UEBxQQQmVudG8gR29uw6dhbHZlczEaMBgGA1UECBMRUmlvIEdyYW5kZSBkbyBT
-dWwxCzAJBgNVBAYTAkJSMRkwFwYDVQQDExBjYWZlLmlmcnMuZWR1LmJyMB4XDTE0
-MDQwOTE2MTkxNFoXDTE5MDQwODE2MTkxNFowgZ0xDTALBgNVBAoTBElGUlMxDDAK
-BgNVBAsTA0RUSTEfMB0GCSqGSIb3DQEJARYQY2FmZUBpZnJzLmVkdS5icjEZMBcG
-A1UEBxQQQmVudG8gR29uw6dhbHZlczEaMBgGA1UECBMRUmlvIEdyYW5kZSBkbyBT
-dWwxCzAJBgNVBAYTAkJSMRkwFwYDVQQDExBjYWZlLmlmcnMuZWR1LmJyMIIBIjAN
-BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsXUlkSu36bt4LJdQ5za7kB40dJlD
-HAV+9CCRoUmQnFvCbu2xKdnY5Ou518/dn0sKLNRFJSj2xGpUV2Z3R7dMvOhyOSqb
-VB1lnkeAyeTd238ZVJgvHokWBdP2ykUuHN1snMNtVExME2Ie7jqUKSQrhB+8ImZV
-7AU7v76pY5Yu5AysvBL0GCBmhatWeMLpXdFJxCP6WviVeoRIBPJKYElvcH1kZn4D
-QTL8Org4tTWCsp83PkjLN/LE0xYpxQyGCx/oeUTwLt2tY/csyk5z7yLxEPxcxpj9
-OOjmpT0CU7Q6t0s846BxVNYuv2QQOwBqAhf7bWtz0EO+n8qnsVEgicLGawIDAQAB
-MA0GCSqGSIb3DQEBBQUAA4IBAQBJznGzZ6tpuPdLyTRk4t1o+26fAwLxRcNbjlVq
-MzlEWuUo6CJOXcFSiDDDzK47m8nG+SzSaJLbJTrBxO8MNWUzlVWlJ0sQhZzhxmGv
-9MRcUDf/1rfmrVTimpJ2mxupcFZr25Xwa/kWsjOtY50OJSJgMBY8YbpXhuQfdKS+
-vCFaVKqsdaeWU96/w8n5XdlN7qOCU9mNTFL5o1Hya0N6gE9XOFYJG+Bl9GYirlNv
-1BPl9cuCCtZpNRiW1UZXcEvyq4dwGW/1eNg/LjWQTerR/y4u0eLcJaBZDz9GDztr
-wI2yGmmso+W7sduE4zoAK9icH9XtpZV+vwVSSxqUI1yK+/pg
-                    
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.ifrs.edu.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafe.ifrs.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">IFRS - Instituto Federal de Educacao, Ciencia e Tecnologia do Rio Grande do Sul</OrganizationName>
-    <OrganizationName xml:lang="pt-br">IFRS - Instituto Federal de Educacao, Ciencia e Tecnologia do Rio Grande do Sul</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">IFRS - Instituto Federal de Educacao, Ciencia e Tecnologia do Rio Grande do Sul</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="pt-br">IFRS - Instituto Federal de Educacao, Ciencia e Tecnologia do Rio Grande do Sul</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.ifrs.edu.br/</OrganizationURL>
-    <OrganizationURL xml:lang="pt-br">http://www.ifrs.edu.br/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Suporte CAFe IFRS</SurName>
-    <EmailAddress>cafe@ifrs.edu.br</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/cafe.ifsp.edu.br-idp-shibboleth.xml b/swamid-interfederations-2.0/cafe.ifsp.edu.br-idp-shibboleth.xml
deleted file mode 100644
index b2ed9c51..00000000
--- a/swamid-interfederations-2.0/cafe.ifsp.edu.br-idp-shibboleth.xml
+++ /dev/null
@@ -1,102 +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.ifsp.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">edu.br</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">IFSP - Instituto Federal de Sao Paulo</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="pt-br">IFSP - Instituto Federal de Sao Paulo</mdui:DisplayName>
-        <mdui:Description xml:lang="en">IFSP - Instituto Federal de Sao Paulo</mdui:Description>
-        <mdui:Description xml:lang="pt-br">IFSP - Instituto Federal de Sao Paulo</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.ifsp.edu.br</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="pt-br">http://www.ifsp.edu.br</mdui:InformationURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-    MIICyDCCAbACAQAwDQYJKoZIhvcNAQEFBQAwKjEMMAoGA1UECxMDQ1BEMQswCQYD
-VQQGEwJCUjENMAsGA1UEAxMEY2FmZTAeFw0xNDA4MTUxODU4NDNaFw0xOTA4MTQx
-ODU4NDNaMCoxDDAKBgNVBAsTA0NQRDELMAkGA1UEBhMCQlIxDTALBgNVBAMTBGNh
-ZmUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDoCA9jrziW3ypnZTNf
-ul1zcAvMpA2Wi0snGxd81AffY2WeOUzn9JreTYiGfaagoi1nz6bCcq+YQUbbYOW1
-pdut7EQf+oY56pT/VNsfgvJUQ5d8QEl8tB4kvlQmffD0XGqWNF3td/QwdHD6Ffgv
-IDjywdiKIoWdoVv6LhuqgfhDTKvTamE25KxD217xnSlttA1hxFoCXqGF+F2oEDoG
-KEXx4guEptgqaIhr/jPtgGVjNROmYTsbs3p0a9hm+TYAh/CkljKCx3YAm7GKLG8G
-vFbyxNMBplRGQ2q57TUGHcE3/2KxzkL/IcTalFYwQeb6rBL8V0vhqodYF4zz0gTW
-YfUlAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBAIZXXTx3ywiElOXzDM7KjW4zILSz
-MyBqXN484rGXtrihqYPsRJusIS0SV8lf1wBc0ijhAckF31ktkiC5k/OKL2yJK1Ta
-pOi833wAhZSMfiDFQhSLZY0BC3K4nVTixprPgk51s3yx+N3d/FxmpSdyr+Ujs58P
-mcDAYwVa+FOEyaGFxby9oZT5wccbgIfnbGiKhMrAAnpsTKYRoT64yYqwZXLhA0h2
-arTHpzzgz+iz/2pgcGh039pwEbfs2+e2U9Ij2NRcvgYyp/paJBqYIXWeRx4zW2vO
-TEF9OsunACQdf0GwmnVXynHUtCJQN9QOAgoLLBvt7oF1mDNt0u6ZPKOzDII=
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.ifsp.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.ifsp.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.ifsp.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cafe.ifsp.edu.br/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://cafe.ifsp.edu.br/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://cafe.ifsp.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>
-      
-
-MIICyDCCAbACAQAwDQYJKoZIhvcNAQEFBQAwKjEMMAoGA1UECxMDQ1BEMQswCQYD
-VQQGEwJCUjENMAsGA1UEAxMEY2FmZTAeFw0xNDA4MTUxODU4NDNaFw0xOTA4MTQx
-ODU4NDNaMCoxDDAKBgNVBAsTA0NQRDELMAkGA1UEBhMCQlIxDTALBgNVBAMTBGNh
-ZmUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDoCA9jrziW3ypnZTNf
-ul1zcAvMpA2Wi0snGxd81AffY2WeOUzn9JreTYiGfaagoi1nz6bCcq+YQUbbYOW1
-pdut7EQf+oY56pT/VNsfgvJUQ5d8QEl8tB4kvlQmffD0XGqWNF3td/QwdHD6Ffgv
-IDjywdiKIoWdoVv6LhuqgfhDTKvTamE25KxD217xnSlttA1hxFoCXqGF+F2oEDoG
-KEXx4guEptgqaIhr/jPtgGVjNROmYTsbs3p0a9hm+TYAh/CkljKCx3YAm7GKLG8G
-vFbyxNMBplRGQ2q57TUGHcE3/2KxzkL/IcTalFYwQeb6rBL8V0vhqodYF4zz0gTW
-YfUlAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBAIZXXTx3ywiElOXzDM7KjW4zILSz
-MyBqXN484rGXtrihqYPsRJusIS0SV8lf1wBc0ijhAckF31ktkiC5k/OKL2yJK1Ta
-pOi833wAhZSMfiDFQhSLZY0BC3K4nVTixprPgk51s3yx+N3d/FxmpSdyr+Ujs58P
-mcDAYwVa+FOEyaGFxby9oZT5wccbgIfnbGiKhMrAAnpsTKYRoT64yYqwZXLhA0h2
-arTHpzzgz+iz/2pgcGh039pwEbfs2+e2U9Ij2NRcvgYyp/paJBqYIXWeRx4zW2vO
-TEF9OsunACQdf0GwmnVXynHUtCJQN9QOAgoLLBvt7oF1mDNt0u6ZPKOzDII=
-
-                    
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.ifsp.edu.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafe.ifsp.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">IFSP - Instituto Federal de Sao Paulo</OrganizationName>
-    <OrganizationName xml:lang="pt-br">IFSP - Instituto Federal de Sao Paulo</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">IFSP - Instituto Federal de Sao Paulo</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="pt-br">IFSP - Instituto Federal de Sao Paulo</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.ifsp.edu.br</OrganizationURL>
-    <OrganizationURL xml:lang="pt-br">http://www.ifsp.edu.br</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Paulo Orlando Ricarte Kawachi</SurName>
-    <EmailAddress>infra@ifsp.edu.br</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/cafe.ifsp.edu.br.xml b/swamid-interfederations-2.0/cafe.ifsp.edu.br.xml
deleted file mode 100644
index b2ed9c51..00000000
--- a/swamid-interfederations-2.0/cafe.ifsp.edu.br.xml
+++ /dev/null
@@ -1,102 +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.ifsp.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">edu.br</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">IFSP - Instituto Federal de Sao Paulo</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="pt-br">IFSP - Instituto Federal de Sao Paulo</mdui:DisplayName>
-        <mdui:Description xml:lang="en">IFSP - Instituto Federal de Sao Paulo</mdui:Description>
-        <mdui:Description xml:lang="pt-br">IFSP - Instituto Federal de Sao Paulo</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.ifsp.edu.br</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="pt-br">http://www.ifsp.edu.br</mdui:InformationURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-    MIICyDCCAbACAQAwDQYJKoZIhvcNAQEFBQAwKjEMMAoGA1UECxMDQ1BEMQswCQYD
-VQQGEwJCUjENMAsGA1UEAxMEY2FmZTAeFw0xNDA4MTUxODU4NDNaFw0xOTA4MTQx
-ODU4NDNaMCoxDDAKBgNVBAsTA0NQRDELMAkGA1UEBhMCQlIxDTALBgNVBAMTBGNh
-ZmUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDoCA9jrziW3ypnZTNf
-ul1zcAvMpA2Wi0snGxd81AffY2WeOUzn9JreTYiGfaagoi1nz6bCcq+YQUbbYOW1
-pdut7EQf+oY56pT/VNsfgvJUQ5d8QEl8tB4kvlQmffD0XGqWNF3td/QwdHD6Ffgv
-IDjywdiKIoWdoVv6LhuqgfhDTKvTamE25KxD217xnSlttA1hxFoCXqGF+F2oEDoG
-KEXx4guEptgqaIhr/jPtgGVjNROmYTsbs3p0a9hm+TYAh/CkljKCx3YAm7GKLG8G
-vFbyxNMBplRGQ2q57TUGHcE3/2KxzkL/IcTalFYwQeb6rBL8V0vhqodYF4zz0gTW
-YfUlAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBAIZXXTx3ywiElOXzDM7KjW4zILSz
-MyBqXN484rGXtrihqYPsRJusIS0SV8lf1wBc0ijhAckF31ktkiC5k/OKL2yJK1Ta
-pOi833wAhZSMfiDFQhSLZY0BC3K4nVTixprPgk51s3yx+N3d/FxmpSdyr+Ujs58P
-mcDAYwVa+FOEyaGFxby9oZT5wccbgIfnbGiKhMrAAnpsTKYRoT64yYqwZXLhA0h2
-arTHpzzgz+iz/2pgcGh039pwEbfs2+e2U9Ij2NRcvgYyp/paJBqYIXWeRx4zW2vO
-TEF9OsunACQdf0GwmnVXynHUtCJQN9QOAgoLLBvt7oF1mDNt0u6ZPKOzDII=
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.ifsp.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.ifsp.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.ifsp.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cafe.ifsp.edu.br/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://cafe.ifsp.edu.br/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://cafe.ifsp.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>
-      
-
-MIICyDCCAbACAQAwDQYJKoZIhvcNAQEFBQAwKjEMMAoGA1UECxMDQ1BEMQswCQYD
-VQQGEwJCUjENMAsGA1UEAxMEY2FmZTAeFw0xNDA4MTUxODU4NDNaFw0xOTA4MTQx
-ODU4NDNaMCoxDDAKBgNVBAsTA0NQRDELMAkGA1UEBhMCQlIxDTALBgNVBAMTBGNh
-ZmUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDoCA9jrziW3ypnZTNf
-ul1zcAvMpA2Wi0snGxd81AffY2WeOUzn9JreTYiGfaagoi1nz6bCcq+YQUbbYOW1
-pdut7EQf+oY56pT/VNsfgvJUQ5d8QEl8tB4kvlQmffD0XGqWNF3td/QwdHD6Ffgv
-IDjywdiKIoWdoVv6LhuqgfhDTKvTamE25KxD217xnSlttA1hxFoCXqGF+F2oEDoG
-KEXx4guEptgqaIhr/jPtgGVjNROmYTsbs3p0a9hm+TYAh/CkljKCx3YAm7GKLG8G
-vFbyxNMBplRGQ2q57TUGHcE3/2KxzkL/IcTalFYwQeb6rBL8V0vhqodYF4zz0gTW
-YfUlAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBAIZXXTx3ywiElOXzDM7KjW4zILSz
-MyBqXN484rGXtrihqYPsRJusIS0SV8lf1wBc0ijhAckF31ktkiC5k/OKL2yJK1Ta
-pOi833wAhZSMfiDFQhSLZY0BC3K4nVTixprPgk51s3yx+N3d/FxmpSdyr+Ujs58P
-mcDAYwVa+FOEyaGFxby9oZT5wccbgIfnbGiKhMrAAnpsTKYRoT64yYqwZXLhA0h2
-arTHpzzgz+iz/2pgcGh039pwEbfs2+e2U9Ij2NRcvgYyp/paJBqYIXWeRx4zW2vO
-TEF9OsunACQdf0GwmnVXynHUtCJQN9QOAgoLLBvt7oF1mDNt0u6ZPKOzDII=
-
-                    
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.ifsp.edu.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafe.ifsp.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">IFSP - Instituto Federal de Sao Paulo</OrganizationName>
-    <OrganizationName xml:lang="pt-br">IFSP - Instituto Federal de Sao Paulo</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">IFSP - Instituto Federal de Sao Paulo</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="pt-br">IFSP - Instituto Federal de Sao Paulo</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.ifsp.edu.br</OrganizationURL>
-    <OrganizationURL xml:lang="pt-br">http://www.ifsp.edu.br</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Paulo Orlando Ricarte Kawachi</SurName>
-    <EmailAddress>infra@ifsp.edu.br</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/cafe.on.br-idp-shibboleth.xml b/swamid-interfederations-2.0/cafe.on.br-idp-shibboleth.xml
deleted file mode 100644
index 39978e74..00000000
--- a/swamid-interfederations-2.0/cafe.on.br-idp-shibboleth.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.on.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">on.br</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">ON - Observatorio Nacional</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="pt-br">ON - Observatorio Nacional</mdui:DisplayName>
-        <mdui:Description xml:lang="en">ON - Observatorio Nacional</mdui:Description>
-        <mdui:Description xml:lang="pt-br">ON - Observatorio Nacional</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.on.br/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="pt-br">http://www.on.br/</mdui:InformationURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-    MIIDwDCCAqgCAQAwDQYJKoZIhvcNAQEFBQAwgaUxIzAhBgNVBAoTGk9OIC0gT2Jz
-ZXJ2YXRvcmlvIE5hY2lvbmFsMQ0wCwYDVQQLEwREVElOMRswGQYJKoZIhvcNAQkB
-FgxrYW50ZXJAb24uYnIxFzAVBgNVBAcTDlJpbyBkZSBKYW5laXJvMRcwFQYDVQQI
-Ew5SaW8gZGUgSmFuZWlybzELMAkGA1UEBhMCQlIxEzARBgNVBAMTCmNhZmUub24u
-YnIwHhcNMTQwMzEwMTgxMDEwWhcNMTcwMzA5MTgxMDEwWjCBpTEjMCEGA1UEChMa
-T04gLSBPYnNlcnZhdG9yaW8gTmFjaW9uYWwxDTALBgNVBAsTBERUSU4xGzAZBgkq
-hkiG9w0BCQEWDGthbnRlckBvbi5icjEXMBUGA1UEBxMOUmlvIGRlIEphbmVpcm8x
-FzAVBgNVBAgTDlJpbyBkZSBKYW5laXJvMQswCQYDVQQGEwJCUjETMBEGA1UEAxMK
-Y2FmZS5vbi5icjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMROHVXk
-EXBIpMbnBW0YSLczCP9rKrGpzhXvP/TmLy+cB/XPdsqEewNT+jCXrqDANL4qR2KL
-yPC2XS/ce+heyQG8aFgFuoyWSkupef9HR5LLq7NX5kvFG/iiYcJa0RGBn23rUudR
-MLP1HFn50htCjDbPV6zSyxt29J+8otWdoc7KeHOd50hq1Wcr+OdxyTQV4nXCxWsq
-6yy9mGg4SFo3csLepNs2IRI75uW+Wwq/zYRvvYJ2iBXC1Pcqw/xpAEepzquMJQQr
-hycQHBeSlmeNig7KRmX/gzTokaifcyXzz8inwvMSrSskkZEvuXO8j9H5QwAknfi2
-H8++d0LMUYaz5isCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAcY1w75rvSUZcTZq0
-MZvWHdSUhkE0RTbJgVVEiMOZMe/IViFNzh4RVFH3KWd/dOI9TL+hQLQ9MqdRCsvO
-+9cj0vzf+0w8ZDbNB9EnSSRYFGSiYUilmZkPsK3FbuzsHgPFQRz4BJTvcu5WeJFH
-TFVaH7ESNc1aH+i7L8sApWBcJgpULtmdaIzK9Ipqva+5MLaCVKqU4vyhXfLg9LUa
-EdrSKYPZgsPA2cXQrKTg2BGpAE0cjEzQGh5L29JEpEixQjVLIaM2cLzEVpafZFc/
-mZGQjPivv0WXt2G/6594Gt3zwARJoqiPVGV7ppz8jQX5oQCVfSGXh4ztJsJYZLzM
-mncIMA==
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.on.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafe.on.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.on.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cafe.on.br/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://cafe.on.br/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://cafe.on.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">on.br</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-      
-MIIDwDCCAqgCAQAwDQYJKoZIhvcNAQEFBQAwgaUxIzAhBgNVBAoTGk9OIC0gT2Jz
-ZXJ2YXRvcmlvIE5hY2lvbmFsMQ0wCwYDVQQLEwREVElOMRswGQYJKoZIhvcNAQkB
-FgxrYW50ZXJAb24uYnIxFzAVBgNVBAcTDlJpbyBkZSBKYW5laXJvMRcwFQYDVQQI
-Ew5SaW8gZGUgSmFuZWlybzELMAkGA1UEBhMCQlIxEzARBgNVBAMTCmNhZmUub24u
-YnIwHhcNMTQwMzEwMTgxMDEwWhcNMTcwMzA5MTgxMDEwWjCBpTEjMCEGA1UEChMa
-T04gLSBPYnNlcnZhdG9yaW8gTmFjaW9uYWwxDTALBgNVBAsTBERUSU4xGzAZBgkq
-hkiG9w0BCQEWDGthbnRlckBvbi5icjEXMBUGA1UEBxMOUmlvIGRlIEphbmVpcm8x
-FzAVBgNVBAgTDlJpbyBkZSBKYW5laXJvMQswCQYDVQQGEwJCUjETMBEGA1UEAxMK
-Y2FmZS5vbi5icjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMROHVXk
-EXBIpMbnBW0YSLczCP9rKrGpzhXvP/TmLy+cB/XPdsqEewNT+jCXrqDANL4qR2KL
-yPC2XS/ce+heyQG8aFgFuoyWSkupef9HR5LLq7NX5kvFG/iiYcJa0RGBn23rUudR
-MLP1HFn50htCjDbPV6zSyxt29J+8otWdoc7KeHOd50hq1Wcr+OdxyTQV4nXCxWsq
-6yy9mGg4SFo3csLepNs2IRI75uW+Wwq/zYRvvYJ2iBXC1Pcqw/xpAEepzquMJQQr
-hycQHBeSlmeNig7KRmX/gzTokaifcyXzz8inwvMSrSskkZEvuXO8j9H5QwAknfi2
-H8++d0LMUYaz5isCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAcY1w75rvSUZcTZq0
-MZvWHdSUhkE0RTbJgVVEiMOZMe/IViFNzh4RVFH3KWd/dOI9TL+hQLQ9MqdRCsvO
-+9cj0vzf+0w8ZDbNB9EnSSRYFGSiYUilmZkPsK3FbuzsHgPFQRz4BJTvcu5WeJFH
-TFVaH7ESNc1aH+i7L8sApWBcJgpULtmdaIzK9Ipqva+5MLaCVKqU4vyhXfLg9LUa
-EdrSKYPZgsPA2cXQrKTg2BGpAE0cjEzQGh5L29JEpEixQjVLIaM2cLzEVpafZFc/
-mZGQjPivv0WXt2G/6594Gt3zwARJoqiPVGV7ppz8jQX5oQCVfSGXh4ztJsJYZLzM
-mncIMA==
-	
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.on.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafe.on.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">ON - Observatorio Nacional</OrganizationName>
-    <OrganizationName xml:lang="pt-br">ON - Observatorio Nacional</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">ON - Observatorio Nacional</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="pt-br">ON - Observatorio Nacional</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.on.br/</OrganizationURL>
-    <OrganizationURL xml:lang="pt-br">http://www.on.br/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>luisriera</SurName>
-    <EmailAddress>luisriera@on.br</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/cafe.on.br.xml b/swamid-interfederations-2.0/cafe.on.br.xml
deleted file mode 100644
index 39978e74..00000000
--- a/swamid-interfederations-2.0/cafe.on.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.on.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">on.br</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">ON - Observatorio Nacional</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="pt-br">ON - Observatorio Nacional</mdui:DisplayName>
-        <mdui:Description xml:lang="en">ON - Observatorio Nacional</mdui:Description>
-        <mdui:Description xml:lang="pt-br">ON - Observatorio Nacional</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.on.br/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="pt-br">http://www.on.br/</mdui:InformationURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-    MIIDwDCCAqgCAQAwDQYJKoZIhvcNAQEFBQAwgaUxIzAhBgNVBAoTGk9OIC0gT2Jz
-ZXJ2YXRvcmlvIE5hY2lvbmFsMQ0wCwYDVQQLEwREVElOMRswGQYJKoZIhvcNAQkB
-FgxrYW50ZXJAb24uYnIxFzAVBgNVBAcTDlJpbyBkZSBKYW5laXJvMRcwFQYDVQQI
-Ew5SaW8gZGUgSmFuZWlybzELMAkGA1UEBhMCQlIxEzARBgNVBAMTCmNhZmUub24u
-YnIwHhcNMTQwMzEwMTgxMDEwWhcNMTcwMzA5MTgxMDEwWjCBpTEjMCEGA1UEChMa
-T04gLSBPYnNlcnZhdG9yaW8gTmFjaW9uYWwxDTALBgNVBAsTBERUSU4xGzAZBgkq
-hkiG9w0BCQEWDGthbnRlckBvbi5icjEXMBUGA1UEBxMOUmlvIGRlIEphbmVpcm8x
-FzAVBgNVBAgTDlJpbyBkZSBKYW5laXJvMQswCQYDVQQGEwJCUjETMBEGA1UEAxMK
-Y2FmZS5vbi5icjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMROHVXk
-EXBIpMbnBW0YSLczCP9rKrGpzhXvP/TmLy+cB/XPdsqEewNT+jCXrqDANL4qR2KL
-yPC2XS/ce+heyQG8aFgFuoyWSkupef9HR5LLq7NX5kvFG/iiYcJa0RGBn23rUudR
-MLP1HFn50htCjDbPV6zSyxt29J+8otWdoc7KeHOd50hq1Wcr+OdxyTQV4nXCxWsq
-6yy9mGg4SFo3csLepNs2IRI75uW+Wwq/zYRvvYJ2iBXC1Pcqw/xpAEepzquMJQQr
-hycQHBeSlmeNig7KRmX/gzTokaifcyXzz8inwvMSrSskkZEvuXO8j9H5QwAknfi2
-H8++d0LMUYaz5isCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAcY1w75rvSUZcTZq0
-MZvWHdSUhkE0RTbJgVVEiMOZMe/IViFNzh4RVFH3KWd/dOI9TL+hQLQ9MqdRCsvO
-+9cj0vzf+0w8ZDbNB9EnSSRYFGSiYUilmZkPsK3FbuzsHgPFQRz4BJTvcu5WeJFH
-TFVaH7ESNc1aH+i7L8sApWBcJgpULtmdaIzK9Ipqva+5MLaCVKqU4vyhXfLg9LUa
-EdrSKYPZgsPA2cXQrKTg2BGpAE0cjEzQGh5L29JEpEixQjVLIaM2cLzEVpafZFc/
-mZGQjPivv0WXt2G/6594Gt3zwARJoqiPVGV7ppz8jQX5oQCVfSGXh4ztJsJYZLzM
-mncIMA==
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.on.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafe.on.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.on.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cafe.on.br/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://cafe.on.br/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://cafe.on.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">on.br</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-      
-MIIDwDCCAqgCAQAwDQYJKoZIhvcNAQEFBQAwgaUxIzAhBgNVBAoTGk9OIC0gT2Jz
-ZXJ2YXRvcmlvIE5hY2lvbmFsMQ0wCwYDVQQLEwREVElOMRswGQYJKoZIhvcNAQkB
-FgxrYW50ZXJAb24uYnIxFzAVBgNVBAcTDlJpbyBkZSBKYW5laXJvMRcwFQYDVQQI
-Ew5SaW8gZGUgSmFuZWlybzELMAkGA1UEBhMCQlIxEzARBgNVBAMTCmNhZmUub24u
-YnIwHhcNMTQwMzEwMTgxMDEwWhcNMTcwMzA5MTgxMDEwWjCBpTEjMCEGA1UEChMa
-T04gLSBPYnNlcnZhdG9yaW8gTmFjaW9uYWwxDTALBgNVBAsTBERUSU4xGzAZBgkq
-hkiG9w0BCQEWDGthbnRlckBvbi5icjEXMBUGA1UEBxMOUmlvIGRlIEphbmVpcm8x
-FzAVBgNVBAgTDlJpbyBkZSBKYW5laXJvMQswCQYDVQQGEwJCUjETMBEGA1UEAxMK
-Y2FmZS5vbi5icjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMROHVXk
-EXBIpMbnBW0YSLczCP9rKrGpzhXvP/TmLy+cB/XPdsqEewNT+jCXrqDANL4qR2KL
-yPC2XS/ce+heyQG8aFgFuoyWSkupef9HR5LLq7NX5kvFG/iiYcJa0RGBn23rUudR
-MLP1HFn50htCjDbPV6zSyxt29J+8otWdoc7KeHOd50hq1Wcr+OdxyTQV4nXCxWsq
-6yy9mGg4SFo3csLepNs2IRI75uW+Wwq/zYRvvYJ2iBXC1Pcqw/xpAEepzquMJQQr
-hycQHBeSlmeNig7KRmX/gzTokaifcyXzz8inwvMSrSskkZEvuXO8j9H5QwAknfi2
-H8++d0LMUYaz5isCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAcY1w75rvSUZcTZq0
-MZvWHdSUhkE0RTbJgVVEiMOZMe/IViFNzh4RVFH3KWd/dOI9TL+hQLQ9MqdRCsvO
-+9cj0vzf+0w8ZDbNB9EnSSRYFGSiYUilmZkPsK3FbuzsHgPFQRz4BJTvcu5WeJFH
-TFVaH7ESNc1aH+i7L8sApWBcJgpULtmdaIzK9Ipqva+5MLaCVKqU4vyhXfLg9LUa
-EdrSKYPZgsPA2cXQrKTg2BGpAE0cjEzQGh5L29JEpEixQjVLIaM2cLzEVpafZFc/
-mZGQjPivv0WXt2G/6594Gt3zwARJoqiPVGV7ppz8jQX5oQCVfSGXh4ztJsJYZLzM
-mncIMA==
-	
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.on.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafe.on.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">ON - Observatorio Nacional</OrganizationName>
-    <OrganizationName xml:lang="pt-br">ON - Observatorio Nacional</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">ON - Observatorio Nacional</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="pt-br">ON - Observatorio Nacional</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.on.br/</OrganizationURL>
-    <OrganizationURL xml:lang="pt-br">http://www.on.br/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>luisriera</SurName>
-    <EmailAddress>luisriera@on.br</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/cafe.pucminas.br-idp-shibboleth.xml b/swamid-interfederations-2.0/cafe.pucminas.br-idp-shibboleth.xml
deleted file mode 100644
index 9c5524b4..00000000
--- a/swamid-interfederations-2.0/cafe.pucminas.br-idp-shibboleth.xml
+++ /dev/null
@@ -1,102 +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.pucminas.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">pucminas.br</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">PUCMINAS - Pontificia Universidade Catolica de Minas Gerais</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="pt-br">PUCMINAS - Pontificia Universidade Catolica de Minas Gerais</mdui:DisplayName>
-        <mdui:Description xml:lang="en">PUCMINAS - Pontificia Universidade Catolica de Minas Gerais</mdui:Description>
-        <mdui:Description xml:lang="pt-br">PUCMINAS - Pontificia Universidade Catolica de Minas Gerais</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.pucminas.br/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="pt-br">http://www.pucminas.br/</mdui:InformationURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-    MIIC7DCCAdQCAQAwDQYJKoZIhvcNAQEFBQAwPDESMBAGA1UECxMJUFVDIE1pbmFz
-MQswCQYDVQQGEwJCUjEZMBcGA1UEAxMQY2FmZS5wdWNtaW5hcy5icjAeFw0xNDA4
-MDExNzI5MzVaFw0xNzA3MzExNzI5MzVaMDwxEjAQBgNVBAsTCVBVQyBNaW5hczEL
-MAkGA1UEBhMCQlIxGTAXBgNVBAMTEGNhZmUucHVjbWluYXMuYnIwggEiMA0GCSqG
-SIb3DQEBAQUAA4IBDwAwggEKAoIBAQCwbRSZhSFejHJ757yOpWBXE63J1mukrT3E
-1LaOkUfCDgJgNSOpQDxvT3FgBv9LCRRY+X+z+vRAoT6ab7C+WS8Nuk4UzddO2sqJ
-VedwmDew2yvdaUCPSQ6VZwSca53rsWPYo1gbsz1p+RZMpHe/qoixw3Q2aAsNpx8w
-cBrdR0NUoA1Ud4sRyEd7585VIj7X3dkY/ae+QtbJx+dadjWw+EX4Ry3Ep8dvImMm
-fgOVOuunnKXLop5tRCeIJl6Oi6jQhYtOZld/FXTWufkcO0H+KLmA/gfoWaGN8scy
-XEhXQRMii8brZ/S2IXYCsQvBBgqvgsbT7a2u4C6iP7R8E7fiQeoPAgMBAAEwDQYJ
-KoZIhvcNAQEFBQADggEBAGCmcvJ2ABwJPHZmxZxs/g51NPBgVuIthLckq7GPOv+i
-WwqVIwVoca9PqdUEc2AdG5J7ceQwU2COrq9DLumJAdsJuh/AvnjeF1XBUDGKXR3a
-SD624LId5gwTm4SZzyozjFoZG/WRzbEp3QXoZ0UgzzEFSZsd0K3Mu83qhyJRkNzG
-XhYRvX8ydDIygfAtw6+kMa4v+4Ak5usVOP2BD17H11TEU/Dw3I3LAk0aLwici1/o
-UUBMSFKVKhgKv5eBJYcujVACXvdM8XAxAnIwocuj/0uOVh0BwpEp4xqSTYtV7v/l
-ABmiz2DXLugHeiOCiOTKAhg8YLcH/wknW7uULQGn+O0=
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.pucminas.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafe.pucminas.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.pucminas.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cafe.pucminas.br/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://cafe.pucminas.br/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://cafe.pucminas.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">pucminas.br</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-      
-MIIC7DCCAdQCAQAwDQYJKoZIhvcNAQEFBQAwPDESMBAGA1UECxMJUFVDIE1pbmFz
-MQswCQYDVQQGEwJCUjEZMBcGA1UEAxMQY2FmZS5wdWNtaW5hcy5icjAeFw0xNDA4
-MDExNzI5MzVaFw0xNzA3MzExNzI5MzVaMDwxEjAQBgNVBAsTCVBVQyBNaW5hczEL
-MAkGA1UEBhMCQlIxGTAXBgNVBAMTEGNhZmUucHVjbWluYXMuYnIwggEiMA0GCSqG
-SIb3DQEBAQUAA4IBDwAwggEKAoIBAQCwbRSZhSFejHJ757yOpWBXE63J1mukrT3E
-1LaOkUfCDgJgNSOpQDxvT3FgBv9LCRRY+X+z+vRAoT6ab7C+WS8Nuk4UzddO2sqJ
-VedwmDew2yvdaUCPSQ6VZwSca53rsWPYo1gbsz1p+RZMpHe/qoixw3Q2aAsNpx8w
-cBrdR0NUoA1Ud4sRyEd7585VIj7X3dkY/ae+QtbJx+dadjWw+EX4Ry3Ep8dvImMm
-fgOVOuunnKXLop5tRCeIJl6Oi6jQhYtOZld/FXTWufkcO0H+KLmA/gfoWaGN8scy
-XEhXQRMii8brZ/S2IXYCsQvBBgqvgsbT7a2u4C6iP7R8E7fiQeoPAgMBAAEwDQYJ
-KoZIhvcNAQEFBQADggEBAGCmcvJ2ABwJPHZmxZxs/g51NPBgVuIthLckq7GPOv+i
-WwqVIwVoca9PqdUEc2AdG5J7ceQwU2COrq9DLumJAdsJuh/AvnjeF1XBUDGKXR3a
-SD624LId5gwTm4SZzyozjFoZG/WRzbEp3QXoZ0UgzzEFSZsd0K3Mu83qhyJRkNzG
-XhYRvX8ydDIygfAtw6+kMa4v+4Ak5usVOP2BD17H11TEU/Dw3I3LAk0aLwici1/o
-UUBMSFKVKhgKv5eBJYcujVACXvdM8XAxAnIwocuj/0uOVh0BwpEp4xqSTYtV7v/l
-ABmiz2DXLugHeiOCiOTKAhg8YLcH/wknW7uULQGn+O0=
-		
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.pucminas.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafe.pucminas.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">PUCMINAS - Pontificia Universidade Catolica de Minas Gerais</OrganizationName>
-    <OrganizationName xml:lang="pt-br">PUCMINAS - Pontificia Universidade Catolica de Minas Gerais</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">PUCMINAS - Pontificia Universidade Catolica de Minas Gerais</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="pt-br">PUCMINAS - Pontificia Universidade Catolica de Minas Gerais</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.pucminas.br/</OrganizationURL>
-    <OrganizationURL xml:lang="pt-br">http://www.pucminas.br/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Jose Teixeira Horta Junior</SurName>
-    <EmailAddress>noc@pucminas.br</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/cafe.pucminas.br.xml b/swamid-interfederations-2.0/cafe.pucminas.br.xml
deleted file mode 100644
index 9c5524b4..00000000
--- a/swamid-interfederations-2.0/cafe.pucminas.br.xml
+++ /dev/null
@@ -1,102 +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.pucminas.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">pucminas.br</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">PUCMINAS - Pontificia Universidade Catolica de Minas Gerais</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="pt-br">PUCMINAS - Pontificia Universidade Catolica de Minas Gerais</mdui:DisplayName>
-        <mdui:Description xml:lang="en">PUCMINAS - Pontificia Universidade Catolica de Minas Gerais</mdui:Description>
-        <mdui:Description xml:lang="pt-br">PUCMINAS - Pontificia Universidade Catolica de Minas Gerais</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.pucminas.br/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="pt-br">http://www.pucminas.br/</mdui:InformationURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-    MIIC7DCCAdQCAQAwDQYJKoZIhvcNAQEFBQAwPDESMBAGA1UECxMJUFVDIE1pbmFz
-MQswCQYDVQQGEwJCUjEZMBcGA1UEAxMQY2FmZS5wdWNtaW5hcy5icjAeFw0xNDA4
-MDExNzI5MzVaFw0xNzA3MzExNzI5MzVaMDwxEjAQBgNVBAsTCVBVQyBNaW5hczEL
-MAkGA1UEBhMCQlIxGTAXBgNVBAMTEGNhZmUucHVjbWluYXMuYnIwggEiMA0GCSqG
-SIb3DQEBAQUAA4IBDwAwggEKAoIBAQCwbRSZhSFejHJ757yOpWBXE63J1mukrT3E
-1LaOkUfCDgJgNSOpQDxvT3FgBv9LCRRY+X+z+vRAoT6ab7C+WS8Nuk4UzddO2sqJ
-VedwmDew2yvdaUCPSQ6VZwSca53rsWPYo1gbsz1p+RZMpHe/qoixw3Q2aAsNpx8w
-cBrdR0NUoA1Ud4sRyEd7585VIj7X3dkY/ae+QtbJx+dadjWw+EX4Ry3Ep8dvImMm
-fgOVOuunnKXLop5tRCeIJl6Oi6jQhYtOZld/FXTWufkcO0H+KLmA/gfoWaGN8scy
-XEhXQRMii8brZ/S2IXYCsQvBBgqvgsbT7a2u4C6iP7R8E7fiQeoPAgMBAAEwDQYJ
-KoZIhvcNAQEFBQADggEBAGCmcvJ2ABwJPHZmxZxs/g51NPBgVuIthLckq7GPOv+i
-WwqVIwVoca9PqdUEc2AdG5J7ceQwU2COrq9DLumJAdsJuh/AvnjeF1XBUDGKXR3a
-SD624LId5gwTm4SZzyozjFoZG/WRzbEp3QXoZ0UgzzEFSZsd0K3Mu83qhyJRkNzG
-XhYRvX8ydDIygfAtw6+kMa4v+4Ak5usVOP2BD17H11TEU/Dw3I3LAk0aLwici1/o
-UUBMSFKVKhgKv5eBJYcujVACXvdM8XAxAnIwocuj/0uOVh0BwpEp4xqSTYtV7v/l
-ABmiz2DXLugHeiOCiOTKAhg8YLcH/wknW7uULQGn+O0=
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.pucminas.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafe.pucminas.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.pucminas.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cafe.pucminas.br/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://cafe.pucminas.br/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://cafe.pucminas.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">pucminas.br</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-      
-MIIC7DCCAdQCAQAwDQYJKoZIhvcNAQEFBQAwPDESMBAGA1UECxMJUFVDIE1pbmFz
-MQswCQYDVQQGEwJCUjEZMBcGA1UEAxMQY2FmZS5wdWNtaW5hcy5icjAeFw0xNDA4
-MDExNzI5MzVaFw0xNzA3MzExNzI5MzVaMDwxEjAQBgNVBAsTCVBVQyBNaW5hczEL
-MAkGA1UEBhMCQlIxGTAXBgNVBAMTEGNhZmUucHVjbWluYXMuYnIwggEiMA0GCSqG
-SIb3DQEBAQUAA4IBDwAwggEKAoIBAQCwbRSZhSFejHJ757yOpWBXE63J1mukrT3E
-1LaOkUfCDgJgNSOpQDxvT3FgBv9LCRRY+X+z+vRAoT6ab7C+WS8Nuk4UzddO2sqJ
-VedwmDew2yvdaUCPSQ6VZwSca53rsWPYo1gbsz1p+RZMpHe/qoixw3Q2aAsNpx8w
-cBrdR0NUoA1Ud4sRyEd7585VIj7X3dkY/ae+QtbJx+dadjWw+EX4Ry3Ep8dvImMm
-fgOVOuunnKXLop5tRCeIJl6Oi6jQhYtOZld/FXTWufkcO0H+KLmA/gfoWaGN8scy
-XEhXQRMii8brZ/S2IXYCsQvBBgqvgsbT7a2u4C6iP7R8E7fiQeoPAgMBAAEwDQYJ
-KoZIhvcNAQEFBQADggEBAGCmcvJ2ABwJPHZmxZxs/g51NPBgVuIthLckq7GPOv+i
-WwqVIwVoca9PqdUEc2AdG5J7ceQwU2COrq9DLumJAdsJuh/AvnjeF1XBUDGKXR3a
-SD624LId5gwTm4SZzyozjFoZG/WRzbEp3QXoZ0UgzzEFSZsd0K3Mu83qhyJRkNzG
-XhYRvX8ydDIygfAtw6+kMa4v+4Ak5usVOP2BD17H11TEU/Dw3I3LAk0aLwici1/o
-UUBMSFKVKhgKv5eBJYcujVACXvdM8XAxAnIwocuj/0uOVh0BwpEp4xqSTYtV7v/l
-ABmiz2DXLugHeiOCiOTKAhg8YLcH/wknW7uULQGn+O0=
-		
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.pucminas.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafe.pucminas.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">PUCMINAS - Pontificia Universidade Catolica de Minas Gerais</OrganizationName>
-    <OrganizationName xml:lang="pt-br">PUCMINAS - Pontificia Universidade Catolica de Minas Gerais</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">PUCMINAS - Pontificia Universidade Catolica de Minas Gerais</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="pt-br">PUCMINAS - Pontificia Universidade Catolica de Minas Gerais</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.pucminas.br/</OrganizationURL>
-    <OrganizationURL xml:lang="pt-br">http://www.pucminas.br/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Jose Teixeira Horta Junior</SurName>
-    <EmailAddress>noc@pucminas.br</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/cafe.sti.uff.br-idp-shibboleth.xml b/swamid-interfederations-2.0/cafe.sti.uff.br-idp-shibboleth.xml
deleted file mode 100644
index 1acc37e4..00000000
--- a/swamid-interfederations-2.0/cafe.sti.uff.br-idp-shibboleth.xml
+++ /dev/null
@@ -1,108 +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.sti.uff.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">uff.br</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">UFF - Universidade Federal Fluminense</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="pt-br">UFF - Universidade Federal Fluminense</mdui:DisplayName>
-        <mdui:Description xml:lang="en">UFF - Universidade Federal Fluminense</mdui:Description>
-        <mdui:Description xml:lang="pt-br">UFF - Universidade Federal Fluminense</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.uff.br/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="pt-br">http://www.uff.br/</mdui:InformationURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-    MIIDfDCCAmQCAQAwDQYJKoZIhvcNAQEFBQAwgYMxLjAsBgNVBAoTJVVGRiAtIFVu
-aXZlcnNpZGFkZSBGZWRlcmFsIEZsdW1pbmVuc2UxNTAzBgNVBAsTLFN1cGVyaW50
-ZW5kZW5jaWEgZGUgdGVjbm9sb2dpYSBkYSBpbmZvcm1hY2FvMQswCQYDVQQGEwJC
-UjENMAsGA1UEAxMEY2FmZTAeFw0xMjA1MzAxOTAwMzJaFw0xNTA1MzAxOTAwMzJa
-MIGDMS4wLAYDVQQKEyVVRkYgLSBVbml2ZXJzaWRhZGUgRmVkZXJhbCBGbHVtaW5l
-bnNlMTUwMwYDVQQLEyxTdXBlcmludGVuZGVuY2lhIGRlIHRlY25vbG9naWEgZGEg
-aW5mb3JtYWNhbzELMAkGA1UEBhMCQlIxDTALBgNVBAMTBGNhZmUwggEiMA0GCSqG
-SIb3DQEBAQUAA4IBDwAwggEKAoIBAQDXvhof7zm8y1QIVmLEpVVqC080Hx0Ow5nL
-XJ+gG23l2hBtMn3jSwR9lqpXtmx5lTLDOSLnLBdvV7E9ZUhFx9ybgxerRb0Brj45
-tLj4ycHbisfMA5MH2CoPa+2vnTRptHuQqaiP8N6WKcZnfJCay9M4sWfQ71Mf52xW
-4l4XscaQaGqZfvs8ZIGSKLb6U7VlUFqno1Npy7wfsYQr1yLlCOXjFdhoMKrxJezQ
-yzSmxLMb77CnLLI9X1arao2YsZXHFd36FbBDAKJ4thzc+4T2N4ORYl7xrbkC+PBO
-agiiHJhyI7DY/7ea43g+jOfpMzegVXDxybjWNOK5AmxTLGMUMDJPAgMBAAEwDQYJ
-KoZIhvcNAQEFBQADggEBAGdHVzV4ZXlOL3dxQOoE001RPT4o15E2I4yOmU7819wG
-l4knZ6JQGYNU3uXfoGyaBB8465GH/9k8xJNn2lZyTTy2+R3nDmzFlPFkYvbs59Sl
-wHibg8abfHxRZx+eK551Ivw0Jnr5j7x1LHVDLAfzvuNPIBNpAhOIsaDoaitF49/x
-qIVZUFdkyoVjbeop384xKzfA3hFv4D5YS068QWCTsKrFXtcMCEBkL/dW0ywTlQK5
-Z/ihA7LfMSqo2t4kV+EBk1/AWTefxu107RBwojV9NHfgIVV3oVjgX/o0Le5wDKef
-KKWuTj9blE41waKTWtJSzqXi4LjSHeH+VhSn9b+8Llg=
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.sti.uff.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafe.sti.uff.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.sti.uff.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cafe.sti.uff.br/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://cafe.sti.uff.br/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://cafe.sti.uff.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">uff.br</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-      
-MIIDfDCCAmQCAQAwDQYJKoZIhvcNAQEFBQAwgYMxLjAsBgNVBAoTJVVGRiAtIFVu
-aXZlcnNpZGFkZSBGZWRlcmFsIEZsdW1pbmVuc2UxNTAzBgNVBAsTLFN1cGVyaW50
-ZW5kZW5jaWEgZGUgdGVjbm9sb2dpYSBkYSBpbmZvcm1hY2FvMQswCQYDVQQGEwJC
-UjENMAsGA1UEAxMEY2FmZTAeFw0xMjA1MzAxOTAwMzJaFw0xNTA1MzAxOTAwMzJa
-MIGDMS4wLAYDVQQKEyVVRkYgLSBVbml2ZXJzaWRhZGUgRmVkZXJhbCBGbHVtaW5l
-bnNlMTUwMwYDVQQLEyxTdXBlcmludGVuZGVuY2lhIGRlIHRlY25vbG9naWEgZGEg
-aW5mb3JtYWNhbzELMAkGA1UEBhMCQlIxDTALBgNVBAMTBGNhZmUwggEiMA0GCSqG
-SIb3DQEBAQUAA4IBDwAwggEKAoIBAQDXvhof7zm8y1QIVmLEpVVqC080Hx0Ow5nL
-XJ+gG23l2hBtMn3jSwR9lqpXtmx5lTLDOSLnLBdvV7E9ZUhFx9ybgxerRb0Brj45
-tLj4ycHbisfMA5MH2CoPa+2vnTRptHuQqaiP8N6WKcZnfJCay9M4sWfQ71Mf52xW
-4l4XscaQaGqZfvs8ZIGSKLb6U7VlUFqno1Npy7wfsYQr1yLlCOXjFdhoMKrxJezQ
-yzSmxLMb77CnLLI9X1arao2YsZXHFd36FbBDAKJ4thzc+4T2N4ORYl7xrbkC+PBO
-agiiHJhyI7DY/7ea43g+jOfpMzegVXDxybjWNOK5AmxTLGMUMDJPAgMBAAEwDQYJ
-KoZIhvcNAQEFBQADggEBAGdHVzV4ZXlOL3dxQOoE001RPT4o15E2I4yOmU7819wG
-l4knZ6JQGYNU3uXfoGyaBB8465GH/9k8xJNn2lZyTTy2+R3nDmzFlPFkYvbs59Sl
-wHibg8abfHxRZx+eK551Ivw0Jnr5j7x1LHVDLAfzvuNPIBNpAhOIsaDoaitF49/x
-qIVZUFdkyoVjbeop384xKzfA3hFv4D5YS068QWCTsKrFXtcMCEBkL/dW0ywTlQK5
-Z/ihA7LfMSqo2t4kV+EBk1/AWTefxu107RBwojV9NHfgIVV3oVjgX/o0Le5wDKef
-KKWuTj9blE41waKTWtJSzqXi4LjSHeH+VhSn9b+8Llg=
-                    
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.sti.uff.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafe.sti.uff.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">UFF - Universidade Federal Fluminense</OrganizationName>
-    <OrganizationName xml:lang="pt-br">UFF - Universidade Federal Fluminense</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">UFF - Universidade Federal Fluminense</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="pt-br">UFF - Universidade Federal Fluminense</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.uff.br/</OrganizationURL>
-    <OrganizationURL xml:lang="pt-br">http://www.uff.br/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Uenes Vilaca</SurName>
-    <EmailAddress>uenesvilaca@id.uff.br</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/cafe.sti.uff.br.xml b/swamid-interfederations-2.0/cafe.sti.uff.br.xml
deleted file mode 100644
index 1acc37e4..00000000
--- a/swamid-interfederations-2.0/cafe.sti.uff.br.xml
+++ /dev/null
@@ -1,108 +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.sti.uff.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">uff.br</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">UFF - Universidade Federal Fluminense</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="pt-br">UFF - Universidade Federal Fluminense</mdui:DisplayName>
-        <mdui:Description xml:lang="en">UFF - Universidade Federal Fluminense</mdui:Description>
-        <mdui:Description xml:lang="pt-br">UFF - Universidade Federal Fluminense</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.uff.br/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="pt-br">http://www.uff.br/</mdui:InformationURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-    MIIDfDCCAmQCAQAwDQYJKoZIhvcNAQEFBQAwgYMxLjAsBgNVBAoTJVVGRiAtIFVu
-aXZlcnNpZGFkZSBGZWRlcmFsIEZsdW1pbmVuc2UxNTAzBgNVBAsTLFN1cGVyaW50
-ZW5kZW5jaWEgZGUgdGVjbm9sb2dpYSBkYSBpbmZvcm1hY2FvMQswCQYDVQQGEwJC
-UjENMAsGA1UEAxMEY2FmZTAeFw0xMjA1MzAxOTAwMzJaFw0xNTA1MzAxOTAwMzJa
-MIGDMS4wLAYDVQQKEyVVRkYgLSBVbml2ZXJzaWRhZGUgRmVkZXJhbCBGbHVtaW5l
-bnNlMTUwMwYDVQQLEyxTdXBlcmludGVuZGVuY2lhIGRlIHRlY25vbG9naWEgZGEg
-aW5mb3JtYWNhbzELMAkGA1UEBhMCQlIxDTALBgNVBAMTBGNhZmUwggEiMA0GCSqG
-SIb3DQEBAQUAA4IBDwAwggEKAoIBAQDXvhof7zm8y1QIVmLEpVVqC080Hx0Ow5nL
-XJ+gG23l2hBtMn3jSwR9lqpXtmx5lTLDOSLnLBdvV7E9ZUhFx9ybgxerRb0Brj45
-tLj4ycHbisfMA5MH2CoPa+2vnTRptHuQqaiP8N6WKcZnfJCay9M4sWfQ71Mf52xW
-4l4XscaQaGqZfvs8ZIGSKLb6U7VlUFqno1Npy7wfsYQr1yLlCOXjFdhoMKrxJezQ
-yzSmxLMb77CnLLI9X1arao2YsZXHFd36FbBDAKJ4thzc+4T2N4ORYl7xrbkC+PBO
-agiiHJhyI7DY/7ea43g+jOfpMzegVXDxybjWNOK5AmxTLGMUMDJPAgMBAAEwDQYJ
-KoZIhvcNAQEFBQADggEBAGdHVzV4ZXlOL3dxQOoE001RPT4o15E2I4yOmU7819wG
-l4knZ6JQGYNU3uXfoGyaBB8465GH/9k8xJNn2lZyTTy2+R3nDmzFlPFkYvbs59Sl
-wHibg8abfHxRZx+eK551Ivw0Jnr5j7x1LHVDLAfzvuNPIBNpAhOIsaDoaitF49/x
-qIVZUFdkyoVjbeop384xKzfA3hFv4D5YS068QWCTsKrFXtcMCEBkL/dW0ywTlQK5
-Z/ihA7LfMSqo2t4kV+EBk1/AWTefxu107RBwojV9NHfgIVV3oVjgX/o0Le5wDKef
-KKWuTj9blE41waKTWtJSzqXi4LjSHeH+VhSn9b+8Llg=
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.sti.uff.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafe.sti.uff.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.sti.uff.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cafe.sti.uff.br/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://cafe.sti.uff.br/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://cafe.sti.uff.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">uff.br</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-      
-MIIDfDCCAmQCAQAwDQYJKoZIhvcNAQEFBQAwgYMxLjAsBgNVBAoTJVVGRiAtIFVu
-aXZlcnNpZGFkZSBGZWRlcmFsIEZsdW1pbmVuc2UxNTAzBgNVBAsTLFN1cGVyaW50
-ZW5kZW5jaWEgZGUgdGVjbm9sb2dpYSBkYSBpbmZvcm1hY2FvMQswCQYDVQQGEwJC
-UjENMAsGA1UEAxMEY2FmZTAeFw0xMjA1MzAxOTAwMzJaFw0xNTA1MzAxOTAwMzJa
-MIGDMS4wLAYDVQQKEyVVRkYgLSBVbml2ZXJzaWRhZGUgRmVkZXJhbCBGbHVtaW5l
-bnNlMTUwMwYDVQQLEyxTdXBlcmludGVuZGVuY2lhIGRlIHRlY25vbG9naWEgZGEg
-aW5mb3JtYWNhbzELMAkGA1UEBhMCQlIxDTALBgNVBAMTBGNhZmUwggEiMA0GCSqG
-SIb3DQEBAQUAA4IBDwAwggEKAoIBAQDXvhof7zm8y1QIVmLEpVVqC080Hx0Ow5nL
-XJ+gG23l2hBtMn3jSwR9lqpXtmx5lTLDOSLnLBdvV7E9ZUhFx9ybgxerRb0Brj45
-tLj4ycHbisfMA5MH2CoPa+2vnTRptHuQqaiP8N6WKcZnfJCay9M4sWfQ71Mf52xW
-4l4XscaQaGqZfvs8ZIGSKLb6U7VlUFqno1Npy7wfsYQr1yLlCOXjFdhoMKrxJezQ
-yzSmxLMb77CnLLI9X1arao2YsZXHFd36FbBDAKJ4thzc+4T2N4ORYl7xrbkC+PBO
-agiiHJhyI7DY/7ea43g+jOfpMzegVXDxybjWNOK5AmxTLGMUMDJPAgMBAAEwDQYJ
-KoZIhvcNAQEFBQADggEBAGdHVzV4ZXlOL3dxQOoE001RPT4o15E2I4yOmU7819wG
-l4knZ6JQGYNU3uXfoGyaBB8465GH/9k8xJNn2lZyTTy2+R3nDmzFlPFkYvbs59Sl
-wHibg8abfHxRZx+eK551Ivw0Jnr5j7x1LHVDLAfzvuNPIBNpAhOIsaDoaitF49/x
-qIVZUFdkyoVjbeop384xKzfA3hFv4D5YS068QWCTsKrFXtcMCEBkL/dW0ywTlQK5
-Z/ihA7LfMSqo2t4kV+EBk1/AWTefxu107RBwojV9NHfgIVV3oVjgX/o0Le5wDKef
-KKWuTj9blE41waKTWtJSzqXi4LjSHeH+VhSn9b+8Llg=
-                    
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.sti.uff.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafe.sti.uff.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">UFF - Universidade Federal Fluminense</OrganizationName>
-    <OrganizationName xml:lang="pt-br">UFF - Universidade Federal Fluminense</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">UFF - Universidade Federal Fluminense</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="pt-br">UFF - Universidade Federal Fluminense</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.uff.br/</OrganizationURL>
-    <OrganizationURL xml:lang="pt-br">http://www.uff.br/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Uenes Vilaca</SurName>
-    <EmailAddress>uenesvilaca@id.uff.br</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/cafe.udesc.br-idp-shibboleth.xml b/swamid-interfederations-2.0/cafe.udesc.br-idp-shibboleth.xml
deleted file mode 100644
index 09904ac8..00000000
--- a/swamid-interfederations-2.0/cafe.udesc.br-idp-shibboleth.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://cafe.udesc.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">udesc.br</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">UDESC - Universidade do Estado de Santa Catarina</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="pt-br">UDESC - Universidade do Estado de Santa Catarina</mdui:DisplayName>
-        <mdui:Description xml:lang="en">UDESC - Universidade do Estado de Santa Catarina</mdui:Description>
-        <mdui:Description xml:lang="pt-br">UDESC - Universidade do Estado de Santa Catarina</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.udesc.br/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="pt-br">http://www.udesc.br/</mdui:InformationURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-    MIIEgDCCA2gCAQAwDQYJKoZIhvcNAQEFBQAwggEEMTkwNwYDVQQKEzBVREVTQyAt
-IFVuaXZlcnNpZGFkZSBkbyBFc3RhZG8gZGUgU2FudGEgQ2F0YXJpbmExSTBHBgNV
-BAsUQFNFVElDIC0gU2VjcmV0YXJpYSBkZSBUZWNub2xvZ2lhIGRhIEluZm9ybWHD
-p8OjbyBlIENvbXVuaWNhw6fDo28xJTAjBgkqhkiG9w0BCQEWFnNlaW5mcmEuc2V0
-aWNAdWRlc2MuYnIxFzAVBgNVBAcUDkZsb3JpYW7Ds3BvbGlzMRcwFQYDVQQIEw5T
-YW50YSBDYXRhcmluYTELMAkGA1UEBhMCQlIxFjAUBgNVBAMTDWNhZmUudWRlc2Mu
-YnIwHhcNMTQwNTE1MjAxMjEyWhcNMTcwNTE0MjAxMjEyWjCCAQQxOTA3BgNVBAoT
-MFVERVNDIC0gVW5pdmVyc2lkYWRlIGRvIEVzdGFkbyBkZSBTYW50YSBDYXRhcmlu
-YTFJMEcGA1UECxRAU0VUSUMgLSBTZWNyZXRhcmlhIGRlIFRlY25vbG9naWEgZGEg
-SW5mb3JtYcOnw6NvIGUgQ29tdW5pY2HDp8OjbzElMCMGCSqGSIb3DQEJARYWc2Vp
-bmZyYS5zZXRpY0B1ZGVzYy5icjEXMBUGA1UEBxQORmxvcmlhbsOzcG9saXMxFzAV
-BgNVBAgTDlNhbnRhIENhdGFyaW5hMQswCQYDVQQGEwJCUjEWMBQGA1UEAxMNY2Fm
-ZS51ZGVzYy5icjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAL9PTe5l
-WC7jplN9PsFwipaPk1bB5UPXxEOeJgr/6xf5RMT//l1L6T/X4uOj+lK6KI8a4pRc
-oD+a83AlKb8cvYzDIQEBCDOPqjruIy+TyTwQ358x45mPM/aNivkugPKMaK8Aidma
-nUgeiRuZ1rtFyVqenDkH7qs9SwExR4NnJ/1l7DNkP6znKksBq7PGlYkj0mryxNCV
-1CAEZT6zEIyptWwd0TRHaybJc2uDD5Kl8HE54IvCwxfdKgJVQ/9FK2W9vvZowUQl
-bOGdUHqFvtudcU6VWOPxuRv4NgmkFGRaNBisnfZ3XfUah8yMIvlYXgkAevQNBjnz
-g3P3o8BU5YU6ieECAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAUu6oCJTJ51HQeuiD
-06G3V1HddwBdddkaHK+WVNux+s8fVQH1Z6ZvkIH2xgmi9ZI9jK7OoBv1H0TfM27g
-4i8RC4jkVM9SHJFR5YFlNs/5tMaohIMZ2zURG72tRLtq603OqSzaeZPIthDasWww
-VEfbfbckLrCcjuLzb608J8d0brg+Cgn8YxQY17r/4GbkXYuC9k9zYshOCZelS703
-C7ZdXXJuI6/VXffvbqifT9BsY3SmAPw/JQAiSxpp2+ZTwauq3YLwxDcIq9b5YX35
-qcmfM3D3mVPH/aUvLhgtMSlmaGYm8o1mD9LUIR5b5C4A+j/qmzu1IIf3JYqMjb/V
-WiKadQ==
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.udesc.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafe.udesc.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.udesc.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cafe.udesc.br/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://cafe.udesc.br/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://cafe.udesc.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">udesc.br</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-      
-MIIEgDCCA2gCAQAwDQYJKoZIhvcNAQEFBQAwggEEMTkwNwYDVQQKEzBVREVTQyAt
-IFVuaXZlcnNpZGFkZSBkbyBFc3RhZG8gZGUgU2FudGEgQ2F0YXJpbmExSTBHBgNV
-BAsUQFNFVElDIC0gU2VjcmV0YXJpYSBkZSBUZWNub2xvZ2lhIGRhIEluZm9ybWHD
-p8OjbyBlIENvbXVuaWNhw6fDo28xJTAjBgkqhkiG9w0BCQEWFnNlaW5mcmEuc2V0
-aWNAdWRlc2MuYnIxFzAVBgNVBAcUDkZsb3JpYW7Ds3BvbGlzMRcwFQYDVQQIEw5T
-YW50YSBDYXRhcmluYTELMAkGA1UEBhMCQlIxFjAUBgNVBAMTDWNhZmUudWRlc2Mu
-YnIwHhcNMTQwNTE1MjAxMjEyWhcNMTcwNTE0MjAxMjEyWjCCAQQxOTA3BgNVBAoT
-MFVERVNDIC0gVW5pdmVyc2lkYWRlIGRvIEVzdGFkbyBkZSBTYW50YSBDYXRhcmlu
-YTFJMEcGA1UECxRAU0VUSUMgLSBTZWNyZXRhcmlhIGRlIFRlY25vbG9naWEgZGEg
-SW5mb3JtYcOnw6NvIGUgQ29tdW5pY2HDp8OjbzElMCMGCSqGSIb3DQEJARYWc2Vp
-bmZyYS5zZXRpY0B1ZGVzYy5icjEXMBUGA1UEBxQORmxvcmlhbsOzcG9saXMxFzAV
-BgNVBAgTDlNhbnRhIENhdGFyaW5hMQswCQYDVQQGEwJCUjEWMBQGA1UEAxMNY2Fm
-ZS51ZGVzYy5icjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAL9PTe5l
-WC7jplN9PsFwipaPk1bB5UPXxEOeJgr/6xf5RMT//l1L6T/X4uOj+lK6KI8a4pRc
-oD+a83AlKb8cvYzDIQEBCDOPqjruIy+TyTwQ358x45mPM/aNivkugPKMaK8Aidma
-nUgeiRuZ1rtFyVqenDkH7qs9SwExR4NnJ/1l7DNkP6znKksBq7PGlYkj0mryxNCV
-1CAEZT6zEIyptWwd0TRHaybJc2uDD5Kl8HE54IvCwxfdKgJVQ/9FK2W9vvZowUQl
-bOGdUHqFvtudcU6VWOPxuRv4NgmkFGRaNBisnfZ3XfUah8yMIvlYXgkAevQNBjnz
-g3P3o8BU5YU6ieECAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAUu6oCJTJ51HQeuiD
-06G3V1HddwBdddkaHK+WVNux+s8fVQH1Z6ZvkIH2xgmi9ZI9jK7OoBv1H0TfM27g
-4i8RC4jkVM9SHJFR5YFlNs/5tMaohIMZ2zURG72tRLtq603OqSzaeZPIthDasWww
-VEfbfbckLrCcjuLzb608J8d0brg+Cgn8YxQY17r/4GbkXYuC9k9zYshOCZelS703
-C7ZdXXJuI6/VXffvbqifT9BsY3SmAPw/JQAiSxpp2+ZTwauq3YLwxDcIq9b5YX35
-qcmfM3D3mVPH/aUvLhgtMSlmaGYm8o1mD9LUIR5b5C4A+j/qmzu1IIf3JYqMjb/V
-WiKadQ==
-                    
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.udesc.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafe.udesc.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">UDESC - Universidade do Estado de Santa Catarina</OrganizationName>
-    <OrganizationName xml:lang="pt-br">UDESC - Universidade do Estado de Santa Catarina</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">UDESC - Universidade do Estado de Santa Catarina</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="pt-br">UDESC - Universidade do Estado de Santa Catarina</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.udesc.br/</OrganizationURL>
-    <OrganizationURL xml:lang="pt-br">http://www.udesc.br/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Setor de Infraestrutura - SETIC</SurName>
-    <EmailAddress>seinfra.setic@udesc.br</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/cafe.udesc.br.xml b/swamid-interfederations-2.0/cafe.udesc.br.xml
deleted file mode 100644
index 09904ac8..00000000
--- a/swamid-interfederations-2.0/cafe.udesc.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://cafe.udesc.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">udesc.br</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">UDESC - Universidade do Estado de Santa Catarina</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="pt-br">UDESC - Universidade do Estado de Santa Catarina</mdui:DisplayName>
-        <mdui:Description xml:lang="en">UDESC - Universidade do Estado de Santa Catarina</mdui:Description>
-        <mdui:Description xml:lang="pt-br">UDESC - Universidade do Estado de Santa Catarina</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.udesc.br/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="pt-br">http://www.udesc.br/</mdui:InformationURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-    MIIEgDCCA2gCAQAwDQYJKoZIhvcNAQEFBQAwggEEMTkwNwYDVQQKEzBVREVTQyAt
-IFVuaXZlcnNpZGFkZSBkbyBFc3RhZG8gZGUgU2FudGEgQ2F0YXJpbmExSTBHBgNV
-BAsUQFNFVElDIC0gU2VjcmV0YXJpYSBkZSBUZWNub2xvZ2lhIGRhIEluZm9ybWHD
-p8OjbyBlIENvbXVuaWNhw6fDo28xJTAjBgkqhkiG9w0BCQEWFnNlaW5mcmEuc2V0
-aWNAdWRlc2MuYnIxFzAVBgNVBAcUDkZsb3JpYW7Ds3BvbGlzMRcwFQYDVQQIEw5T
-YW50YSBDYXRhcmluYTELMAkGA1UEBhMCQlIxFjAUBgNVBAMTDWNhZmUudWRlc2Mu
-YnIwHhcNMTQwNTE1MjAxMjEyWhcNMTcwNTE0MjAxMjEyWjCCAQQxOTA3BgNVBAoT
-MFVERVNDIC0gVW5pdmVyc2lkYWRlIGRvIEVzdGFkbyBkZSBTYW50YSBDYXRhcmlu
-YTFJMEcGA1UECxRAU0VUSUMgLSBTZWNyZXRhcmlhIGRlIFRlY25vbG9naWEgZGEg
-SW5mb3JtYcOnw6NvIGUgQ29tdW5pY2HDp8OjbzElMCMGCSqGSIb3DQEJARYWc2Vp
-bmZyYS5zZXRpY0B1ZGVzYy5icjEXMBUGA1UEBxQORmxvcmlhbsOzcG9saXMxFzAV
-BgNVBAgTDlNhbnRhIENhdGFyaW5hMQswCQYDVQQGEwJCUjEWMBQGA1UEAxMNY2Fm
-ZS51ZGVzYy5icjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAL9PTe5l
-WC7jplN9PsFwipaPk1bB5UPXxEOeJgr/6xf5RMT//l1L6T/X4uOj+lK6KI8a4pRc
-oD+a83AlKb8cvYzDIQEBCDOPqjruIy+TyTwQ358x45mPM/aNivkugPKMaK8Aidma
-nUgeiRuZ1rtFyVqenDkH7qs9SwExR4NnJ/1l7DNkP6znKksBq7PGlYkj0mryxNCV
-1CAEZT6zEIyptWwd0TRHaybJc2uDD5Kl8HE54IvCwxfdKgJVQ/9FK2W9vvZowUQl
-bOGdUHqFvtudcU6VWOPxuRv4NgmkFGRaNBisnfZ3XfUah8yMIvlYXgkAevQNBjnz
-g3P3o8BU5YU6ieECAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAUu6oCJTJ51HQeuiD
-06G3V1HddwBdddkaHK+WVNux+s8fVQH1Z6ZvkIH2xgmi9ZI9jK7OoBv1H0TfM27g
-4i8RC4jkVM9SHJFR5YFlNs/5tMaohIMZ2zURG72tRLtq603OqSzaeZPIthDasWww
-VEfbfbckLrCcjuLzb608J8d0brg+Cgn8YxQY17r/4GbkXYuC9k9zYshOCZelS703
-C7ZdXXJuI6/VXffvbqifT9BsY3SmAPw/JQAiSxpp2+ZTwauq3YLwxDcIq9b5YX35
-qcmfM3D3mVPH/aUvLhgtMSlmaGYm8o1mD9LUIR5b5C4A+j/qmzu1IIf3JYqMjb/V
-WiKadQ==
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.udesc.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafe.udesc.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.udesc.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cafe.udesc.br/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://cafe.udesc.br/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://cafe.udesc.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">udesc.br</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-      
-MIIEgDCCA2gCAQAwDQYJKoZIhvcNAQEFBQAwggEEMTkwNwYDVQQKEzBVREVTQyAt
-IFVuaXZlcnNpZGFkZSBkbyBFc3RhZG8gZGUgU2FudGEgQ2F0YXJpbmExSTBHBgNV
-BAsUQFNFVElDIC0gU2VjcmV0YXJpYSBkZSBUZWNub2xvZ2lhIGRhIEluZm9ybWHD
-p8OjbyBlIENvbXVuaWNhw6fDo28xJTAjBgkqhkiG9w0BCQEWFnNlaW5mcmEuc2V0
-aWNAdWRlc2MuYnIxFzAVBgNVBAcUDkZsb3JpYW7Ds3BvbGlzMRcwFQYDVQQIEw5T
-YW50YSBDYXRhcmluYTELMAkGA1UEBhMCQlIxFjAUBgNVBAMTDWNhZmUudWRlc2Mu
-YnIwHhcNMTQwNTE1MjAxMjEyWhcNMTcwNTE0MjAxMjEyWjCCAQQxOTA3BgNVBAoT
-MFVERVNDIC0gVW5pdmVyc2lkYWRlIGRvIEVzdGFkbyBkZSBTYW50YSBDYXRhcmlu
-YTFJMEcGA1UECxRAU0VUSUMgLSBTZWNyZXRhcmlhIGRlIFRlY25vbG9naWEgZGEg
-SW5mb3JtYcOnw6NvIGUgQ29tdW5pY2HDp8OjbzElMCMGCSqGSIb3DQEJARYWc2Vp
-bmZyYS5zZXRpY0B1ZGVzYy5icjEXMBUGA1UEBxQORmxvcmlhbsOzcG9saXMxFzAV
-BgNVBAgTDlNhbnRhIENhdGFyaW5hMQswCQYDVQQGEwJCUjEWMBQGA1UEAxMNY2Fm
-ZS51ZGVzYy5icjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAL9PTe5l
-WC7jplN9PsFwipaPk1bB5UPXxEOeJgr/6xf5RMT//l1L6T/X4uOj+lK6KI8a4pRc
-oD+a83AlKb8cvYzDIQEBCDOPqjruIy+TyTwQ358x45mPM/aNivkugPKMaK8Aidma
-nUgeiRuZ1rtFyVqenDkH7qs9SwExR4NnJ/1l7DNkP6znKksBq7PGlYkj0mryxNCV
-1CAEZT6zEIyptWwd0TRHaybJc2uDD5Kl8HE54IvCwxfdKgJVQ/9FK2W9vvZowUQl
-bOGdUHqFvtudcU6VWOPxuRv4NgmkFGRaNBisnfZ3XfUah8yMIvlYXgkAevQNBjnz
-g3P3o8BU5YU6ieECAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAUu6oCJTJ51HQeuiD
-06G3V1HddwBdddkaHK+WVNux+s8fVQH1Z6ZvkIH2xgmi9ZI9jK7OoBv1H0TfM27g
-4i8RC4jkVM9SHJFR5YFlNs/5tMaohIMZ2zURG72tRLtq603OqSzaeZPIthDasWww
-VEfbfbckLrCcjuLzb608J8d0brg+Cgn8YxQY17r/4GbkXYuC9k9zYshOCZelS703
-C7ZdXXJuI6/VXffvbqifT9BsY3SmAPw/JQAiSxpp2+ZTwauq3YLwxDcIq9b5YX35
-qcmfM3D3mVPH/aUvLhgtMSlmaGYm8o1mD9LUIR5b5C4A+j/qmzu1IIf3JYqMjb/V
-WiKadQ==
-                    
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.udesc.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafe.udesc.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">UDESC - Universidade do Estado de Santa Catarina</OrganizationName>
-    <OrganizationName xml:lang="pt-br">UDESC - Universidade do Estado de Santa Catarina</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">UDESC - Universidade do Estado de Santa Catarina</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="pt-br">UDESC - Universidade do Estado de Santa Catarina</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.udesc.br/</OrganizationURL>
-    <OrganizationURL xml:lang="pt-br">http://www.udesc.br/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Setor de Infraestrutura - SETIC</SurName>
-    <EmailAddress>seinfra.setic@udesc.br</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/cafe.uesb.br-idp-shibboleth.xml b/swamid-interfederations-2.0/cafe.uesb.br-idp-shibboleth.xml
deleted file mode 100644
index 5e9c8c17..00000000
--- a/swamid-interfederations-2.0/cafe.uesb.br-idp-shibboleth.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.uesb.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">edu.br</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">UESB - Universidade Estadual do Sudoeste da Bahia</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="pt-br">UESB - Universidade Estadual do Sudoeste da Bahia</mdui:DisplayName>
-        <mdui:Description xml:lang="en">UESB - Universidade Estadual do Sudoeste da Bahia</mdui:Description>
-        <mdui:Description xml:lang="pt-br">UESB - Universidade Estadual do Sudoeste da Bahia</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.uesb.br/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="pt-br">http://www.uesb.br/</mdui:InformationURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-    MIIDoDCCAogCAQAwDQYJKoZIhvcNAQEFBQAwgZUxDTALBgNVBAoTBFVFU0IxDzAN
-BgNVBAsTBlVJTkZPUjEjMCEGCSqGSIb3DQEJARYUbGVvbmFyZG9AdWVzYi5lZHUu
-YnIxHTAbBgNVBAcTFFZpdG9yaWEgZGEgQ29ucXVpc3RhMQswCQYDVQQIEwJCQTEL
-MAkGA1UEBhMCQlIxFTATBgNVBAMTDGNhZmUudWVzYi5icjAeFw0xMzA5MjAxODIz
-MjFaFw0xNjA5MTkxODIzMjFaMIGVMQ0wCwYDVQQKEwRVRVNCMQ8wDQYDVQQLEwZV
-SU5GT1IxIzAhBgkqhkiG9w0BCQEWFGxlb25hcmRvQHVlc2IuZWR1LmJyMR0wGwYD
-VQQHExRWaXRvcmlhIGRhIENvbnF1aXN0YTELMAkGA1UECBMCQkExCzAJBgNVBAYT
-AkJSMRUwEwYDVQQDEwxjYWZlLnVlc2IuYnIwggEiMA0GCSqGSIb3DQEBAQUAA4IB
-DwAwggEKAoIBAQDX5Qd680PTIaF0ZaDfpTfPIdAIp+ydojMhCd34S3idsFGwSKiJ
-NnfOn65iPMJFynxfQuqoo9wWnPAcS22fudOTuqdwf6NFl3sUM6fXh1UmQn2pyHxe
-UrJCwViQDV6ZplF0Uw3ABnYew3gZfUk/34NR8kkB2NdBs6jp7PD+nWn9fPLNd23p
-thdpumkzbkkzRM9SweDmFbbCwJcrn0JR2H1xtUlqT/Aq9Vb8BT3JD44mZypxKU4d
-jI2/Kr9ZqaidQTcOqloiBoT1Az/fKmd1xXDDH8VFJvCGOSaXyWdEPR5kazOTLYyL
-QAq5KdWcpqU23keAklg0tw41kt1Wl1E+rb9fAgMBAAEwDQYJKoZIhvcNAQEFBQAD
-ggEBAE0BAVExopeUKLY/yXZhQ+rw6uYi+JY64Y3w2qp3o4TKqgN9j5ziZge76fWL
-4zMh7PO1TsZLnlWPcP4oP1OQNc4EiiiNGgLT4DfNU3NtpFFhVCKU5v3JUcw/ZHGj
-J4diZ6Rb6Q2TCcBJV02Gz7p6U6nhXE0blVlyqWuZ4GZWg2PSTHgaG2JzHUHC+wzf
-7OaEuX3loT+wlm2Jq2ebDBlm+Yoth1pwE+puOluSk23P6aa71SkQjxb4pEv9sx8A
-W8Xj75F/MRL9CKazIOsUVwMSJnhDgZCDc/XxD29lBYLycFS5AJiCngmO+nYI61bv
-f+RldW1MxS+H81kufj7Rum74V4I=
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.uesb.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafe.uesb.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.uesb.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cafe.uesb.br/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://cafe.uesb.br/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://cafe.uesb.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>
-      
-MIIDoDCCAogCAQAwDQYJKoZIhvcNAQEFBQAwgZUxDTALBgNVBAoTBFVFU0IxDzAN
-BgNVBAsTBlVJTkZPUjEjMCEGCSqGSIb3DQEJARYUbGVvbmFyZG9AdWVzYi5lZHUu
-YnIxHTAbBgNVBAcTFFZpdG9yaWEgZGEgQ29ucXVpc3RhMQswCQYDVQQIEwJCQTEL
-MAkGA1UEBhMCQlIxFTATBgNVBAMTDGNhZmUudWVzYi5icjAeFw0xMzA5MjAxODIz
-MjFaFw0xNjA5MTkxODIzMjFaMIGVMQ0wCwYDVQQKEwRVRVNCMQ8wDQYDVQQLEwZV
-SU5GT1IxIzAhBgkqhkiG9w0BCQEWFGxlb25hcmRvQHVlc2IuZWR1LmJyMR0wGwYD
-VQQHExRWaXRvcmlhIGRhIENvbnF1aXN0YTELMAkGA1UECBMCQkExCzAJBgNVBAYT
-AkJSMRUwEwYDVQQDEwxjYWZlLnVlc2IuYnIwggEiMA0GCSqGSIb3DQEBAQUAA4IB
-DwAwggEKAoIBAQDX5Qd680PTIaF0ZaDfpTfPIdAIp+ydojMhCd34S3idsFGwSKiJ
-NnfOn65iPMJFynxfQuqoo9wWnPAcS22fudOTuqdwf6NFl3sUM6fXh1UmQn2pyHxe
-UrJCwViQDV6ZplF0Uw3ABnYew3gZfUk/34NR8kkB2NdBs6jp7PD+nWn9fPLNd23p
-thdpumkzbkkzRM9SweDmFbbCwJcrn0JR2H1xtUlqT/Aq9Vb8BT3JD44mZypxKU4d
-jI2/Kr9ZqaidQTcOqloiBoT1Az/fKmd1xXDDH8VFJvCGOSaXyWdEPR5kazOTLYyL
-QAq5KdWcpqU23keAklg0tw41kt1Wl1E+rb9fAgMBAAEwDQYJKoZIhvcNAQEFBQAD
-ggEBAE0BAVExopeUKLY/yXZhQ+rw6uYi+JY64Y3w2qp3o4TKqgN9j5ziZge76fWL
-4zMh7PO1TsZLnlWPcP4oP1OQNc4EiiiNGgLT4DfNU3NtpFFhVCKU5v3JUcw/ZHGj
-J4diZ6Rb6Q2TCcBJV02Gz7p6U6nhXE0blVlyqWuZ4GZWg2PSTHgaG2JzHUHC+wzf
-7OaEuX3loT+wlm2Jq2ebDBlm+Yoth1pwE+puOluSk23P6aa71SkQjxb4pEv9sx8A
-W8Xj75F/MRL9CKazIOsUVwMSJnhDgZCDc/XxD29lBYLycFS5AJiCngmO+nYI61bv
-f+RldW1MxS+H81kufj7Rum74V4I=
-                    
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.uesb.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafe.uesb.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">UESB - Universidade Estadual do Sudoeste da Bahia</OrganizationName>
-    <OrganizationName xml:lang="pt-br">UESB - Universidade Estadual do Sudoeste da Bahia</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">UESB - Universidade Estadual do Sudoeste da Bahia</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="pt-br">UESB - Universidade Estadual do Sudoeste da Bahia</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.uesb.br/</OrganizationURL>
-    <OrganizationURL xml:lang="pt-br">http://www.uesb.br/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Leonardo</SurName>
-    <EmailAddress>leonardo@uesb.edu.br</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/cafe.uesb.br.xml b/swamid-interfederations-2.0/cafe.uesb.br.xml
deleted file mode 100644
index 5e9c8c17..00000000
--- a/swamid-interfederations-2.0/cafe.uesb.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.uesb.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">edu.br</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">UESB - Universidade Estadual do Sudoeste da Bahia</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="pt-br">UESB - Universidade Estadual do Sudoeste da Bahia</mdui:DisplayName>
-        <mdui:Description xml:lang="en">UESB - Universidade Estadual do Sudoeste da Bahia</mdui:Description>
-        <mdui:Description xml:lang="pt-br">UESB - Universidade Estadual do Sudoeste da Bahia</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.uesb.br/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="pt-br">http://www.uesb.br/</mdui:InformationURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-    MIIDoDCCAogCAQAwDQYJKoZIhvcNAQEFBQAwgZUxDTALBgNVBAoTBFVFU0IxDzAN
-BgNVBAsTBlVJTkZPUjEjMCEGCSqGSIb3DQEJARYUbGVvbmFyZG9AdWVzYi5lZHUu
-YnIxHTAbBgNVBAcTFFZpdG9yaWEgZGEgQ29ucXVpc3RhMQswCQYDVQQIEwJCQTEL
-MAkGA1UEBhMCQlIxFTATBgNVBAMTDGNhZmUudWVzYi5icjAeFw0xMzA5MjAxODIz
-MjFaFw0xNjA5MTkxODIzMjFaMIGVMQ0wCwYDVQQKEwRVRVNCMQ8wDQYDVQQLEwZV
-SU5GT1IxIzAhBgkqhkiG9w0BCQEWFGxlb25hcmRvQHVlc2IuZWR1LmJyMR0wGwYD
-VQQHExRWaXRvcmlhIGRhIENvbnF1aXN0YTELMAkGA1UECBMCQkExCzAJBgNVBAYT
-AkJSMRUwEwYDVQQDEwxjYWZlLnVlc2IuYnIwggEiMA0GCSqGSIb3DQEBAQUAA4IB
-DwAwggEKAoIBAQDX5Qd680PTIaF0ZaDfpTfPIdAIp+ydojMhCd34S3idsFGwSKiJ
-NnfOn65iPMJFynxfQuqoo9wWnPAcS22fudOTuqdwf6NFl3sUM6fXh1UmQn2pyHxe
-UrJCwViQDV6ZplF0Uw3ABnYew3gZfUk/34NR8kkB2NdBs6jp7PD+nWn9fPLNd23p
-thdpumkzbkkzRM9SweDmFbbCwJcrn0JR2H1xtUlqT/Aq9Vb8BT3JD44mZypxKU4d
-jI2/Kr9ZqaidQTcOqloiBoT1Az/fKmd1xXDDH8VFJvCGOSaXyWdEPR5kazOTLYyL
-QAq5KdWcpqU23keAklg0tw41kt1Wl1E+rb9fAgMBAAEwDQYJKoZIhvcNAQEFBQAD
-ggEBAE0BAVExopeUKLY/yXZhQ+rw6uYi+JY64Y3w2qp3o4TKqgN9j5ziZge76fWL
-4zMh7PO1TsZLnlWPcP4oP1OQNc4EiiiNGgLT4DfNU3NtpFFhVCKU5v3JUcw/ZHGj
-J4diZ6Rb6Q2TCcBJV02Gz7p6U6nhXE0blVlyqWuZ4GZWg2PSTHgaG2JzHUHC+wzf
-7OaEuX3loT+wlm2Jq2ebDBlm+Yoth1pwE+puOluSk23P6aa71SkQjxb4pEv9sx8A
-W8Xj75F/MRL9CKazIOsUVwMSJnhDgZCDc/XxD29lBYLycFS5AJiCngmO+nYI61bv
-f+RldW1MxS+H81kufj7Rum74V4I=
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.uesb.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafe.uesb.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.uesb.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cafe.uesb.br/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://cafe.uesb.br/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://cafe.uesb.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>
-      
-MIIDoDCCAogCAQAwDQYJKoZIhvcNAQEFBQAwgZUxDTALBgNVBAoTBFVFU0IxDzAN
-BgNVBAsTBlVJTkZPUjEjMCEGCSqGSIb3DQEJARYUbGVvbmFyZG9AdWVzYi5lZHUu
-YnIxHTAbBgNVBAcTFFZpdG9yaWEgZGEgQ29ucXVpc3RhMQswCQYDVQQIEwJCQTEL
-MAkGA1UEBhMCQlIxFTATBgNVBAMTDGNhZmUudWVzYi5icjAeFw0xMzA5MjAxODIz
-MjFaFw0xNjA5MTkxODIzMjFaMIGVMQ0wCwYDVQQKEwRVRVNCMQ8wDQYDVQQLEwZV
-SU5GT1IxIzAhBgkqhkiG9w0BCQEWFGxlb25hcmRvQHVlc2IuZWR1LmJyMR0wGwYD
-VQQHExRWaXRvcmlhIGRhIENvbnF1aXN0YTELMAkGA1UECBMCQkExCzAJBgNVBAYT
-AkJSMRUwEwYDVQQDEwxjYWZlLnVlc2IuYnIwggEiMA0GCSqGSIb3DQEBAQUAA4IB
-DwAwggEKAoIBAQDX5Qd680PTIaF0ZaDfpTfPIdAIp+ydojMhCd34S3idsFGwSKiJ
-NnfOn65iPMJFynxfQuqoo9wWnPAcS22fudOTuqdwf6NFl3sUM6fXh1UmQn2pyHxe
-UrJCwViQDV6ZplF0Uw3ABnYew3gZfUk/34NR8kkB2NdBs6jp7PD+nWn9fPLNd23p
-thdpumkzbkkzRM9SweDmFbbCwJcrn0JR2H1xtUlqT/Aq9Vb8BT3JD44mZypxKU4d
-jI2/Kr9ZqaidQTcOqloiBoT1Az/fKmd1xXDDH8VFJvCGOSaXyWdEPR5kazOTLYyL
-QAq5KdWcpqU23keAklg0tw41kt1Wl1E+rb9fAgMBAAEwDQYJKoZIhvcNAQEFBQAD
-ggEBAE0BAVExopeUKLY/yXZhQ+rw6uYi+JY64Y3w2qp3o4TKqgN9j5ziZge76fWL
-4zMh7PO1TsZLnlWPcP4oP1OQNc4EiiiNGgLT4DfNU3NtpFFhVCKU5v3JUcw/ZHGj
-J4diZ6Rb6Q2TCcBJV02Gz7p6U6nhXE0blVlyqWuZ4GZWg2PSTHgaG2JzHUHC+wzf
-7OaEuX3loT+wlm2Jq2ebDBlm+Yoth1pwE+puOluSk23P6aa71SkQjxb4pEv9sx8A
-W8Xj75F/MRL9CKazIOsUVwMSJnhDgZCDc/XxD29lBYLycFS5AJiCngmO+nYI61bv
-f+RldW1MxS+H81kufj7Rum74V4I=
-                    
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.uesb.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafe.uesb.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">UESB - Universidade Estadual do Sudoeste da Bahia</OrganizationName>
-    <OrganizationName xml:lang="pt-br">UESB - Universidade Estadual do Sudoeste da Bahia</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">UESB - Universidade Estadual do Sudoeste da Bahia</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="pt-br">UESB - Universidade Estadual do Sudoeste da Bahia</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.uesb.br/</OrganizationURL>
-    <OrganizationURL xml:lang="pt-br">http://www.uesb.br/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Leonardo</SurName>
-    <EmailAddress>leonardo@uesb.edu.br</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/cafe.uesc.br-idp-shibboleth.xml b/swamid-interfederations-2.0/cafe.uesc.br-idp-shibboleth.xml
deleted file mode 100644
index ae1e5cb2..00000000
--- a/swamid-interfederations-2.0/cafe.uesc.br-idp-shibboleth.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.uesc.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">uesc.br</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">UESC - Universidade Estadual de Santa Cruz</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="pt-br">UESC - Universidade Estadual de Santa Cruz</mdui:DisplayName>
-        <mdui:Description xml:lang="en">UESC - Universidade Estadual de Santa Cruz</mdui:Description>
-        <mdui:Description xml:lang="pt-br">UESC - Universidade Estadual de Santa Cruz</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.uesc.br/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="pt-br">http://www.uesc.br/</mdui:InformationURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-    MIIDvjCCAqYCAQAwDQYJKoZIhvcNAQEFBQAwgaQxMzAxBgNVBAoTKlVFU0MgLSBV
-TklWRVJTSURBREUgRVNUQURVQUwgREUgU0FOVEEgQ1JVWjEMMAoGA1UECxMDQ09J
-MRowGAYJKoZIhvcNAQkBFgtDT0lAVUVTQy5CUjEPMA0GA1UEBxMGSUxIRVVTMQ4w
-DAYDVQQIEwVCQUhJQTELMAkGA1UEBhMCQlIxFTATBgNVBAMTDGNhZmUudWVzYy5i
-cjAeFw0xNDA0MTAxMjAyMzRaFw0xOTA0MDkxMjAyMzRaMIGkMTMwMQYDVQQKEypV
-RVNDIC0gVU5JVkVSU0lEQURFIEVTVEFEVUFMIERFIFNBTlRBIENSVVoxDDAKBgNV
-BAsTA0NPSTEaMBgGCSqGSIb3DQEJARYLQ09JQFVFU0MuQlIxDzANBgNVBAcTBklM
-SEVVUzEOMAwGA1UECBMFQkFISUExCzAJBgNVBAYTAkJSMRUwEwYDVQQDEwxjYWZl
-LnVlc2MuYnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC72oVZgtPa
-vTAXBK6xUApNT4lZl9nN7GnX9MELpR6d9Nd9Hdh2HiK82IFucx1Ma6o48gp2IMoM
-CeMvP9gE+nNh8dTsV949z/EkesXTLqfSx8ZyZkAbULVeBkfjvZ8B4Tc8kFG0FVka
-3niIPQZNV+ojIWUkpCvFE8F5f1Fg/AuGPT7ClVTd/wmJnaCzVeBOv1igIcPIcyUB
-FcJ8pLOhFCP+YOrhen+XEO0B7kMVAfkwFzic7odExmiknQ311Sdt/QaPMF2EWZ7r
-QcBRayAbIx13GYbKiVNZDHv2jSbfrqjbrACLxP17IHtKTjAHTq9zUbtTiaGcwwL8
-F6hxMk3iZrsfAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBACAUW1b9UNotRq7BlSiy
-C4ATLQ4qidg/8vCZu1AqreLXU71C3SHnOFl+C+JhorczJyo4lLVJmoIZRvjmedZT
-RNpeSsT4NBPxFpfhjk+e5RbrQJFa2qw4AansX/ErUhvRDaI9yy5gE1YdiOeK58Pc
-Yr8RJQdsCybLWTCSlVWJbRzvv05uUlJNnNSuxvYBeY727sDomtaj6WsPy99HPEY+
-r5nqp5LUU4AWUhpm8faNRFZia439GTSibCoICMRy4WBe1HvAi2ljKA4uRXKgJQsq
-Vv4jw5WtdCEE2lDlRADuHz5lbijCzXEikhEBFAcDWGmdFTtXMvcAUqaCTVUkQDUE
-9N8=
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.uesc.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafe.uesc.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.uesc.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cafe.uesc.br/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://cafe.uesc.br/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://cafe.uesc.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">uesc.br</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-      
-MIIDvjCCAqYCAQAwDQYJKoZIhvcNAQEFBQAwgaQxMzAxBgNVBAoTKlVFU0MgLSBV
-TklWRVJTSURBREUgRVNUQURVQUwgREUgU0FOVEEgQ1JVWjEMMAoGA1UECxMDQ09J
-MRowGAYJKoZIhvcNAQkBFgtDT0lAVUVTQy5CUjEPMA0GA1UEBxMGSUxIRVVTMQ4w
-DAYDVQQIEwVCQUhJQTELMAkGA1UEBhMCQlIxFTATBgNVBAMTDGNhZmUudWVzYy5i
-cjAeFw0xNDA0MTAxMjAyMzRaFw0xOTA0MDkxMjAyMzRaMIGkMTMwMQYDVQQKEypV
-RVNDIC0gVU5JVkVSU0lEQURFIEVTVEFEVUFMIERFIFNBTlRBIENSVVoxDDAKBgNV
-BAsTA0NPSTEaMBgGCSqGSIb3DQEJARYLQ09JQFVFU0MuQlIxDzANBgNVBAcTBklM
-SEVVUzEOMAwGA1UECBMFQkFISUExCzAJBgNVBAYTAkJSMRUwEwYDVQQDEwxjYWZl
-LnVlc2MuYnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC72oVZgtPa
-vTAXBK6xUApNT4lZl9nN7GnX9MELpR6d9Nd9Hdh2HiK82IFucx1Ma6o48gp2IMoM
-CeMvP9gE+nNh8dTsV949z/EkesXTLqfSx8ZyZkAbULVeBkfjvZ8B4Tc8kFG0FVka
-3niIPQZNV+ojIWUkpCvFE8F5f1Fg/AuGPT7ClVTd/wmJnaCzVeBOv1igIcPIcyUB
-FcJ8pLOhFCP+YOrhen+XEO0B7kMVAfkwFzic7odExmiknQ311Sdt/QaPMF2EWZ7r
-QcBRayAbIx13GYbKiVNZDHv2jSbfrqjbrACLxP17IHtKTjAHTq9zUbtTiaGcwwL8
-F6hxMk3iZrsfAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBACAUW1b9UNotRq7BlSiy
-C4ATLQ4qidg/8vCZu1AqreLXU71C3SHnOFl+C+JhorczJyo4lLVJmoIZRvjmedZT
-RNpeSsT4NBPxFpfhjk+e5RbrQJFa2qw4AansX/ErUhvRDaI9yy5gE1YdiOeK58Pc
-Yr8RJQdsCybLWTCSlVWJbRzvv05uUlJNnNSuxvYBeY727sDomtaj6WsPy99HPEY+
-r5nqp5LUU4AWUhpm8faNRFZia439GTSibCoICMRy4WBe1HvAi2ljKA4uRXKgJQsq
-Vv4jw5WtdCEE2lDlRADuHz5lbijCzXEikhEBFAcDWGmdFTtXMvcAUqaCTVUkQDUE
-9N8=
-                    
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.uesc.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafe.uesc.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">UESC - Universidade Estadual de Santa Cruz</OrganizationName>
-    <OrganizationName xml:lang="pt-br">UESC - Universidade Estadual de Santa Cruz</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">UESC - Universidade Estadual de Santa Cruz</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="pt-br">UESC - Universidade Estadual de Santa Cruz</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.uesc.br/</OrganizationURL>
-    <OrganizationURL xml:lang="pt-br">http://www.uesc.br/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>UDO/COI</SurName>
-    <EmailAddress>coi@uesc.br</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/cafe.uesc.br.xml b/swamid-interfederations-2.0/cafe.uesc.br.xml
deleted file mode 100644
index ae1e5cb2..00000000
--- a/swamid-interfederations-2.0/cafe.uesc.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.uesc.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">uesc.br</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">UESC - Universidade Estadual de Santa Cruz</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="pt-br">UESC - Universidade Estadual de Santa Cruz</mdui:DisplayName>
-        <mdui:Description xml:lang="en">UESC - Universidade Estadual de Santa Cruz</mdui:Description>
-        <mdui:Description xml:lang="pt-br">UESC - Universidade Estadual de Santa Cruz</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.uesc.br/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="pt-br">http://www.uesc.br/</mdui:InformationURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-    MIIDvjCCAqYCAQAwDQYJKoZIhvcNAQEFBQAwgaQxMzAxBgNVBAoTKlVFU0MgLSBV
-TklWRVJTSURBREUgRVNUQURVQUwgREUgU0FOVEEgQ1JVWjEMMAoGA1UECxMDQ09J
-MRowGAYJKoZIhvcNAQkBFgtDT0lAVUVTQy5CUjEPMA0GA1UEBxMGSUxIRVVTMQ4w
-DAYDVQQIEwVCQUhJQTELMAkGA1UEBhMCQlIxFTATBgNVBAMTDGNhZmUudWVzYy5i
-cjAeFw0xNDA0MTAxMjAyMzRaFw0xOTA0MDkxMjAyMzRaMIGkMTMwMQYDVQQKEypV
-RVNDIC0gVU5JVkVSU0lEQURFIEVTVEFEVUFMIERFIFNBTlRBIENSVVoxDDAKBgNV
-BAsTA0NPSTEaMBgGCSqGSIb3DQEJARYLQ09JQFVFU0MuQlIxDzANBgNVBAcTBklM
-SEVVUzEOMAwGA1UECBMFQkFISUExCzAJBgNVBAYTAkJSMRUwEwYDVQQDEwxjYWZl
-LnVlc2MuYnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC72oVZgtPa
-vTAXBK6xUApNT4lZl9nN7GnX9MELpR6d9Nd9Hdh2HiK82IFucx1Ma6o48gp2IMoM
-CeMvP9gE+nNh8dTsV949z/EkesXTLqfSx8ZyZkAbULVeBkfjvZ8B4Tc8kFG0FVka
-3niIPQZNV+ojIWUkpCvFE8F5f1Fg/AuGPT7ClVTd/wmJnaCzVeBOv1igIcPIcyUB
-FcJ8pLOhFCP+YOrhen+XEO0B7kMVAfkwFzic7odExmiknQ311Sdt/QaPMF2EWZ7r
-QcBRayAbIx13GYbKiVNZDHv2jSbfrqjbrACLxP17IHtKTjAHTq9zUbtTiaGcwwL8
-F6hxMk3iZrsfAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBACAUW1b9UNotRq7BlSiy
-C4ATLQ4qidg/8vCZu1AqreLXU71C3SHnOFl+C+JhorczJyo4lLVJmoIZRvjmedZT
-RNpeSsT4NBPxFpfhjk+e5RbrQJFa2qw4AansX/ErUhvRDaI9yy5gE1YdiOeK58Pc
-Yr8RJQdsCybLWTCSlVWJbRzvv05uUlJNnNSuxvYBeY727sDomtaj6WsPy99HPEY+
-r5nqp5LUU4AWUhpm8faNRFZia439GTSibCoICMRy4WBe1HvAi2ljKA4uRXKgJQsq
-Vv4jw5WtdCEE2lDlRADuHz5lbijCzXEikhEBFAcDWGmdFTtXMvcAUqaCTVUkQDUE
-9N8=
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.uesc.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafe.uesc.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.uesc.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cafe.uesc.br/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://cafe.uesc.br/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://cafe.uesc.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">uesc.br</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-      
-MIIDvjCCAqYCAQAwDQYJKoZIhvcNAQEFBQAwgaQxMzAxBgNVBAoTKlVFU0MgLSBV
-TklWRVJTSURBREUgRVNUQURVQUwgREUgU0FOVEEgQ1JVWjEMMAoGA1UECxMDQ09J
-MRowGAYJKoZIhvcNAQkBFgtDT0lAVUVTQy5CUjEPMA0GA1UEBxMGSUxIRVVTMQ4w
-DAYDVQQIEwVCQUhJQTELMAkGA1UEBhMCQlIxFTATBgNVBAMTDGNhZmUudWVzYy5i
-cjAeFw0xNDA0MTAxMjAyMzRaFw0xOTA0MDkxMjAyMzRaMIGkMTMwMQYDVQQKEypV
-RVNDIC0gVU5JVkVSU0lEQURFIEVTVEFEVUFMIERFIFNBTlRBIENSVVoxDDAKBgNV
-BAsTA0NPSTEaMBgGCSqGSIb3DQEJARYLQ09JQFVFU0MuQlIxDzANBgNVBAcTBklM
-SEVVUzEOMAwGA1UECBMFQkFISUExCzAJBgNVBAYTAkJSMRUwEwYDVQQDEwxjYWZl
-LnVlc2MuYnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC72oVZgtPa
-vTAXBK6xUApNT4lZl9nN7GnX9MELpR6d9Nd9Hdh2HiK82IFucx1Ma6o48gp2IMoM
-CeMvP9gE+nNh8dTsV949z/EkesXTLqfSx8ZyZkAbULVeBkfjvZ8B4Tc8kFG0FVka
-3niIPQZNV+ojIWUkpCvFE8F5f1Fg/AuGPT7ClVTd/wmJnaCzVeBOv1igIcPIcyUB
-FcJ8pLOhFCP+YOrhen+XEO0B7kMVAfkwFzic7odExmiknQ311Sdt/QaPMF2EWZ7r
-QcBRayAbIx13GYbKiVNZDHv2jSbfrqjbrACLxP17IHtKTjAHTq9zUbtTiaGcwwL8
-F6hxMk3iZrsfAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBACAUW1b9UNotRq7BlSiy
-C4ATLQ4qidg/8vCZu1AqreLXU71C3SHnOFl+C+JhorczJyo4lLVJmoIZRvjmedZT
-RNpeSsT4NBPxFpfhjk+e5RbrQJFa2qw4AansX/ErUhvRDaI9yy5gE1YdiOeK58Pc
-Yr8RJQdsCybLWTCSlVWJbRzvv05uUlJNnNSuxvYBeY727sDomtaj6WsPy99HPEY+
-r5nqp5LUU4AWUhpm8faNRFZia439GTSibCoICMRy4WBe1HvAi2ljKA4uRXKgJQsq
-Vv4jw5WtdCEE2lDlRADuHz5lbijCzXEikhEBFAcDWGmdFTtXMvcAUqaCTVUkQDUE
-9N8=
-                    
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.uesc.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafe.uesc.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">UESC - Universidade Estadual de Santa Cruz</OrganizationName>
-    <OrganizationName xml:lang="pt-br">UESC - Universidade Estadual de Santa Cruz</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">UESC - Universidade Estadual de Santa Cruz</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="pt-br">UESC - Universidade Estadual de Santa Cruz</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.uesc.br/</OrganizationURL>
-    <OrganizationURL xml:lang="pt-br">http://www.uesc.br/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>UDO/COI</SurName>
-    <EmailAddress>coi@uesc.br</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/cafe.ufba.br-idp-shibboleth.xml b/swamid-interfederations-2.0/cafe.ufba.br-idp-shibboleth.xml
deleted file mode 100644
index 244a589f..00000000
--- a/swamid-interfederations-2.0/cafe.ufba.br-idp-shibboleth.xml
+++ /dev/null
@@ -1,108 +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.ufba.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">br</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">UFBA - Universidade Federal da Bahia</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="pt-br">UFBA - Universidade Federal da Bahia</mdui:DisplayName>
-        <mdui:Description xml:lang="en">UFBA - Universidade Federal da Bahia</mdui:Description>
-        <mdui:Description xml:lang="pt-br">UFBA - Universidade Federal da Bahia</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.ufba.br/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="pt-br">http://www.ufba.br/</mdui:InformationURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-    MIIDgDCCAmgCAQAwDQYJKoZIhvcNAQEFBQAwgYUxDTALBgNVBAoTBFVGQkExDDAK
-BgNVBAsTA1NUSTEfMB0GCSqGSIb3DQEJARYQbWVuZG9uY2FAdWZiYS5icjERMA8G
-A1UEBxMIU2FsdmFkb3IxDjAMBgNVBAgTBUJhaGlhMQswCQYDVQQGEwJCUjEVMBMG
-A1UEAxMMY2FmZS51ZmJhLmJyMB4XDTE0MDcyNDAxMzAwN1oXDTE3MDcyMzAxMzAw
-N1owgYUxDTALBgNVBAoTBFVGQkExDDAKBgNVBAsTA1NUSTEfMB0GCSqGSIb3DQEJ
-ARYQbWVuZG9uY2FAdWZiYS5icjERMA8GA1UEBxMIU2FsdmFkb3IxDjAMBgNVBAgT
-BUJhaGlhMQswCQYDVQQGEwJCUjEVMBMGA1UEAxMMY2FmZS51ZmJhLmJyMIIBIjAN
-BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA1qVhH59Vq+x6Y9+AFa83YNVlkPHI
-5T1cCm3cYa9OLbhZejBLRSDPhVwDwsP1Uzb9y+N8PdlINCNQMptN7L9aeaSrC9xt
-ph4CpE56+TPwfu60ndQkog0QDB/toqHRJ4QQ59ZoEShA3MNW1oEJ3DyW4KDnhwpr
-3wOS5WdWTXm1mAmNMgck+P7IWn6o03SUAcI8a0f+cu7bgUjNQV8gEs6L32dzBtV4
-bwdz8REiMb+3NPG0naJ63xsZoOKl0wQirDqJgTbjSyGKGXIvxs7xX99ev0l9Pt/s
-1SY3CMnTFYADOTj+A12mvjtj+I7Cprt/nSqSK2TlvHJ9vQs4RL7nc3D4pwIDAQAB
-MA0GCSqGSIb3DQEBBQUAA4IBAQDI4L2+vFnSaJEJDtXWOV5H0kRIy1DTPh39akWD
-TROWtqBhh3HJY2ia5I4J2HRAknCJi24ta4g8j9YMU3Dou3EJDUqSa3O8HxdGo9tp
-U7obTptHVzzLtEfDZSkhvMbQCfJG9G/kEN+cYetbEtxbypxoL2Khr7H2K5gD3SNB
-cGltkj8LUBoqdpeJE/yTDJ70OEbUjJUMypAt4bGCvodZxcDhxd9yAUqCyloUQ7aa
-cm/Zg111Mv04BDIY5e/J/5p4p2p1Iu1kwT23Rn+x5aF6/f4Lc65Qcvg40DamlFvq
-yM/4Rp+8JZktR/Az29BLMxaebhQH6kofiy2CD4hFt7+GwwwH
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.ufba.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafe.ufba.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.ufba.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cafe.ufba.br/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://cafe.ufba.br/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://cafe.ufba.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>
-      
-MIIDgDCCAmgCAQAwDQYJKoZIhvcNAQEFBQAwgYUxDTALBgNVBAoTBFVGQkExDDAK
-BgNVBAsTA1NUSTEfMB0GCSqGSIb3DQEJARYQbWVuZG9uY2FAdWZiYS5icjERMA8G
-A1UEBxMIU2FsdmFkb3IxDjAMBgNVBAgTBUJhaGlhMQswCQYDVQQGEwJCUjEVMBMG
-A1UEAxMMY2FmZS51ZmJhLmJyMB4XDTE0MDcyNDAxMzAwN1oXDTE3MDcyMzAxMzAw
-N1owgYUxDTALBgNVBAoTBFVGQkExDDAKBgNVBAsTA1NUSTEfMB0GCSqGSIb3DQEJ
-ARYQbWVuZG9uY2FAdWZiYS5icjERMA8GA1UEBxMIU2FsdmFkb3IxDjAMBgNVBAgT
-BUJhaGlhMQswCQYDVQQGEwJCUjEVMBMGA1UEAxMMY2FmZS51ZmJhLmJyMIIBIjAN
-BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA1qVhH59Vq+x6Y9+AFa83YNVlkPHI
-5T1cCm3cYa9OLbhZejBLRSDPhVwDwsP1Uzb9y+N8PdlINCNQMptN7L9aeaSrC9xt
-ph4CpE56+TPwfu60ndQkog0QDB/toqHRJ4QQ59ZoEShA3MNW1oEJ3DyW4KDnhwpr
-3wOS5WdWTXm1mAmNMgck+P7IWn6o03SUAcI8a0f+cu7bgUjNQV8gEs6L32dzBtV4
-bwdz8REiMb+3NPG0naJ63xsZoOKl0wQirDqJgTbjSyGKGXIvxs7xX99ev0l9Pt/s
-1SY3CMnTFYADOTj+A12mvjtj+I7Cprt/nSqSK2TlvHJ9vQs4RL7nc3D4pwIDAQAB
-MA0GCSqGSIb3DQEBBQUAA4IBAQDI4L2+vFnSaJEJDtXWOV5H0kRIy1DTPh39akWD
-TROWtqBhh3HJY2ia5I4J2HRAknCJi24ta4g8j9YMU3Dou3EJDUqSa3O8HxdGo9tp
-U7obTptHVzzLtEfDZSkhvMbQCfJG9G/kEN+cYetbEtxbypxoL2Khr7H2K5gD3SNB
-cGltkj8LUBoqdpeJE/yTDJ70OEbUjJUMypAt4bGCvodZxcDhxd9yAUqCyloUQ7aa
-cm/Zg111Mv04BDIY5e/J/5p4p2p1Iu1kwT23Rn+x5aF6/f4Lc65Qcvg40DamlFvq
-yM/4Rp+8JZktR/Az29BLMxaebhQH6kofiy2CD4hFt7+GwwwH
-                    
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.ufba.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafe.ufba.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">UFBA - Universidade Federal da Bahia</OrganizationName>
-    <OrganizationName xml:lang="pt-br">UFBA - Universidade Federal da Bahia</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">UFBA - Universidade Federal da Bahia</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="pt-br">UFBA - Universidade Federal da Bahia</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.ufba.br/</OrganizationURL>
-    <OrganizationURL xml:lang="pt-br">http://www.ufba.br/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Luiz Claudio Mendonca</SurName>
-    <EmailAddress>mendonca@ufba.br</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/cafe.ufba.br.xml b/swamid-interfederations-2.0/cafe.ufba.br.xml
deleted file mode 100644
index 244a589f..00000000
--- a/swamid-interfederations-2.0/cafe.ufba.br.xml
+++ /dev/null
@@ -1,108 +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.ufba.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">br</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">UFBA - Universidade Federal da Bahia</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="pt-br">UFBA - Universidade Federal da Bahia</mdui:DisplayName>
-        <mdui:Description xml:lang="en">UFBA - Universidade Federal da Bahia</mdui:Description>
-        <mdui:Description xml:lang="pt-br">UFBA - Universidade Federal da Bahia</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.ufba.br/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="pt-br">http://www.ufba.br/</mdui:InformationURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-    MIIDgDCCAmgCAQAwDQYJKoZIhvcNAQEFBQAwgYUxDTALBgNVBAoTBFVGQkExDDAK
-BgNVBAsTA1NUSTEfMB0GCSqGSIb3DQEJARYQbWVuZG9uY2FAdWZiYS5icjERMA8G
-A1UEBxMIU2FsdmFkb3IxDjAMBgNVBAgTBUJhaGlhMQswCQYDVQQGEwJCUjEVMBMG
-A1UEAxMMY2FmZS51ZmJhLmJyMB4XDTE0MDcyNDAxMzAwN1oXDTE3MDcyMzAxMzAw
-N1owgYUxDTALBgNVBAoTBFVGQkExDDAKBgNVBAsTA1NUSTEfMB0GCSqGSIb3DQEJ
-ARYQbWVuZG9uY2FAdWZiYS5icjERMA8GA1UEBxMIU2FsdmFkb3IxDjAMBgNVBAgT
-BUJhaGlhMQswCQYDVQQGEwJCUjEVMBMGA1UEAxMMY2FmZS51ZmJhLmJyMIIBIjAN
-BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA1qVhH59Vq+x6Y9+AFa83YNVlkPHI
-5T1cCm3cYa9OLbhZejBLRSDPhVwDwsP1Uzb9y+N8PdlINCNQMptN7L9aeaSrC9xt
-ph4CpE56+TPwfu60ndQkog0QDB/toqHRJ4QQ59ZoEShA3MNW1oEJ3DyW4KDnhwpr
-3wOS5WdWTXm1mAmNMgck+P7IWn6o03SUAcI8a0f+cu7bgUjNQV8gEs6L32dzBtV4
-bwdz8REiMb+3NPG0naJ63xsZoOKl0wQirDqJgTbjSyGKGXIvxs7xX99ev0l9Pt/s
-1SY3CMnTFYADOTj+A12mvjtj+I7Cprt/nSqSK2TlvHJ9vQs4RL7nc3D4pwIDAQAB
-MA0GCSqGSIb3DQEBBQUAA4IBAQDI4L2+vFnSaJEJDtXWOV5H0kRIy1DTPh39akWD
-TROWtqBhh3HJY2ia5I4J2HRAknCJi24ta4g8j9YMU3Dou3EJDUqSa3O8HxdGo9tp
-U7obTptHVzzLtEfDZSkhvMbQCfJG9G/kEN+cYetbEtxbypxoL2Khr7H2K5gD3SNB
-cGltkj8LUBoqdpeJE/yTDJ70OEbUjJUMypAt4bGCvodZxcDhxd9yAUqCyloUQ7aa
-cm/Zg111Mv04BDIY5e/J/5p4p2p1Iu1kwT23Rn+x5aF6/f4Lc65Qcvg40DamlFvq
-yM/4Rp+8JZktR/Az29BLMxaebhQH6kofiy2CD4hFt7+GwwwH
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.ufba.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafe.ufba.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.ufba.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cafe.ufba.br/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://cafe.ufba.br/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://cafe.ufba.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>
-      
-MIIDgDCCAmgCAQAwDQYJKoZIhvcNAQEFBQAwgYUxDTALBgNVBAoTBFVGQkExDDAK
-BgNVBAsTA1NUSTEfMB0GCSqGSIb3DQEJARYQbWVuZG9uY2FAdWZiYS5icjERMA8G
-A1UEBxMIU2FsdmFkb3IxDjAMBgNVBAgTBUJhaGlhMQswCQYDVQQGEwJCUjEVMBMG
-A1UEAxMMY2FmZS51ZmJhLmJyMB4XDTE0MDcyNDAxMzAwN1oXDTE3MDcyMzAxMzAw
-N1owgYUxDTALBgNVBAoTBFVGQkExDDAKBgNVBAsTA1NUSTEfMB0GCSqGSIb3DQEJ
-ARYQbWVuZG9uY2FAdWZiYS5icjERMA8GA1UEBxMIU2FsdmFkb3IxDjAMBgNVBAgT
-BUJhaGlhMQswCQYDVQQGEwJCUjEVMBMGA1UEAxMMY2FmZS51ZmJhLmJyMIIBIjAN
-BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA1qVhH59Vq+x6Y9+AFa83YNVlkPHI
-5T1cCm3cYa9OLbhZejBLRSDPhVwDwsP1Uzb9y+N8PdlINCNQMptN7L9aeaSrC9xt
-ph4CpE56+TPwfu60ndQkog0QDB/toqHRJ4QQ59ZoEShA3MNW1oEJ3DyW4KDnhwpr
-3wOS5WdWTXm1mAmNMgck+P7IWn6o03SUAcI8a0f+cu7bgUjNQV8gEs6L32dzBtV4
-bwdz8REiMb+3NPG0naJ63xsZoOKl0wQirDqJgTbjSyGKGXIvxs7xX99ev0l9Pt/s
-1SY3CMnTFYADOTj+A12mvjtj+I7Cprt/nSqSK2TlvHJ9vQs4RL7nc3D4pwIDAQAB
-MA0GCSqGSIb3DQEBBQUAA4IBAQDI4L2+vFnSaJEJDtXWOV5H0kRIy1DTPh39akWD
-TROWtqBhh3HJY2ia5I4J2HRAknCJi24ta4g8j9YMU3Dou3EJDUqSa3O8HxdGo9tp
-U7obTptHVzzLtEfDZSkhvMbQCfJG9G/kEN+cYetbEtxbypxoL2Khr7H2K5gD3SNB
-cGltkj8LUBoqdpeJE/yTDJ70OEbUjJUMypAt4bGCvodZxcDhxd9yAUqCyloUQ7aa
-cm/Zg111Mv04BDIY5e/J/5p4p2p1Iu1kwT23Rn+x5aF6/f4Lc65Qcvg40DamlFvq
-yM/4Rp+8JZktR/Az29BLMxaebhQH6kofiy2CD4hFt7+GwwwH
-                    
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.ufba.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafe.ufba.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">UFBA - Universidade Federal da Bahia</OrganizationName>
-    <OrganizationName xml:lang="pt-br">UFBA - Universidade Federal da Bahia</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">UFBA - Universidade Federal da Bahia</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="pt-br">UFBA - Universidade Federal da Bahia</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.ufba.br/</OrganizationURL>
-    <OrganizationURL xml:lang="pt-br">http://www.ufba.br/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Luiz Claudio Mendonca</SurName>
-    <EmailAddress>mendonca@ufba.br</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/cafe.ufop.br-idp-shibboleth.xml b/swamid-interfederations-2.0/cafe.ufop.br-idp-shibboleth.xml
deleted file mode 100644
index 2aed2eb4..00000000
--- a/swamid-interfederations-2.0/cafe.ufop.br-idp-shibboleth.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.ufop.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">ufop.br</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">UFOP - Universidade Federal de Ouro Preto</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="pt-br">UFOP - Universidade Federal de Ouro Preto</mdui:DisplayName>
-        <mdui:Description xml:lang="en">UFOP - Universidade Federal de Ouro Preto</mdui:Description>
-        <mdui:Description xml:lang="pt-br">UFOP - Universidade Federal de Ouro Preto</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.ufop.br</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="pt-br">http://www.ufop.br</mdui:InformationURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-    MIIDxjCCAq4CAQAwDQYJKoZIhvcNAQEFBQAwgagxKzApBgNVBAoTIlVuaXZlcnNp
-ZGFkZSBGZWRlcmFsIGRlIE91cm8gUHJldG8xDDAKBgNVBAsTA05USTEbMBkGCSqG
-SIb3DQEJARYMY2FmZUB1Zm9wLmJyMRMwEQYDVQQHEwpPdXJvIFByZXRvMRUwEwYD
-VQQIEwxNaW5hcyBHZXJhaXMxCzAJBgNVBAYTAkJSMRUwEwYDVQQDEwxjYWZlLnVm
-b3AuYnIwHhcNMTQwNzE1MTgzMjAwWhcNMTcwNzE0MTgzMjAwWjCBqDErMCkGA1UE
-ChMiVW5pdmVyc2lkYWRlIEZlZGVyYWwgZGUgT3VybyBQcmV0bzEMMAoGA1UECxMD
-TlRJMRswGQYJKoZIhvcNAQkBFgxjYWZlQHVmb3AuYnIxEzARBgNVBAcTCk91cm8g
-UHJldG8xFTATBgNVBAgTDE1pbmFzIEdlcmFpczELMAkGA1UEBhMCQlIxFTATBgNV
-BAMTDGNhZmUudWZvcC5icjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
-AJ8tn2QtCdQheOm0AeLjxH+NHHvU+hboU5XLY3FOaO4esNLWPm3ekToB/QKM7kK2
-JXUlx6iaqC57hOq3zQgwRBDiq9NJidn57BLyxTcbxu9j/2+gyQPmOPgynrxHGN9Y
-8z1WtuVWlTXZ9XmFKYvPvtch/FYAA9+dvCc4/42V6DaosCXzGyiSLRDk4A9mOTaU
-i/juNLFuYbFN7lKTjFiK75Z8xonEvsQ/4QDUPDt5WREuDqKU7JgGwv0Rwkn/h1YR
-9n1SvINCKLpLnRtOk0Ts4RsdiPRKx4Q/G6GmsjuQSTHkEpqVbvZsindPWvFeDAj7
-pPv2sGYa7TUxh4cEcFN37F8CAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAdeSNmRaI
-55vnAf58XCUuOU60fYasvHysDTjbymaWiJjZ8St7QcgkspVrGcK0CzTltuquGck6
-Jy+t/sQOBU1h+qfWzbCDgHS7/vVFIa42yLzPBeibyVFeSaJU1xUXR+h3DxiEaHrK
-zPzQtr3obCWYOxj5tZF9G+QfDX4qRCHkF4EvYAsOMHr43Ic/Co9d4p+GV/O6QvMg
-0IdYi/CRmGBkMfaySFvMMgIgBSm5q+PZmwguZjBGn0FkaNWF4FYusfCLswUxifIA
-oY4ZtXsMxilW39DT5joXhgfwtd6JMxzzkXkmv+JBPxSj1+Xt4Ayuz13PFd1ylV++
-vL4JpRO/Msu6Zw==
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.ufop.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafe.ufop.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.ufop.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cafe.ufop.br/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://cafe.ufop.br/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://cafe.ufop.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">ufop.br</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-      
-MIIDxjCCAq4CAQAwDQYJKoZIhvcNAQEFBQAwgagxKzApBgNVBAoTIlVuaXZlcnNp
-ZGFkZSBGZWRlcmFsIGRlIE91cm8gUHJldG8xDDAKBgNVBAsTA05USTEbMBkGCSqG
-SIb3DQEJARYMY2FmZUB1Zm9wLmJyMRMwEQYDVQQHEwpPdXJvIFByZXRvMRUwEwYD
-VQQIEwxNaW5hcyBHZXJhaXMxCzAJBgNVBAYTAkJSMRUwEwYDVQQDEwxjYWZlLnVm
-b3AuYnIwHhcNMTQwNzE1MTgzMjAwWhcNMTcwNzE0MTgzMjAwWjCBqDErMCkGA1UE
-ChMiVW5pdmVyc2lkYWRlIEZlZGVyYWwgZGUgT3VybyBQcmV0bzEMMAoGA1UECxMD
-TlRJMRswGQYJKoZIhvcNAQkBFgxjYWZlQHVmb3AuYnIxEzARBgNVBAcTCk91cm8g
-UHJldG8xFTATBgNVBAgTDE1pbmFzIEdlcmFpczELMAkGA1UEBhMCQlIxFTATBgNV
-BAMTDGNhZmUudWZvcC5icjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
-AJ8tn2QtCdQheOm0AeLjxH+NHHvU+hboU5XLY3FOaO4esNLWPm3ekToB/QKM7kK2
-JXUlx6iaqC57hOq3zQgwRBDiq9NJidn57BLyxTcbxu9j/2+gyQPmOPgynrxHGN9Y
-8z1WtuVWlTXZ9XmFKYvPvtch/FYAA9+dvCc4/42V6DaosCXzGyiSLRDk4A9mOTaU
-i/juNLFuYbFN7lKTjFiK75Z8xonEvsQ/4QDUPDt5WREuDqKU7JgGwv0Rwkn/h1YR
-9n1SvINCKLpLnRtOk0Ts4RsdiPRKx4Q/G6GmsjuQSTHkEpqVbvZsindPWvFeDAj7
-pPv2sGYa7TUxh4cEcFN37F8CAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAdeSNmRaI
-55vnAf58XCUuOU60fYasvHysDTjbymaWiJjZ8St7QcgkspVrGcK0CzTltuquGck6
-Jy+t/sQOBU1h+qfWzbCDgHS7/vVFIa42yLzPBeibyVFeSaJU1xUXR+h3DxiEaHrK
-zPzQtr3obCWYOxj5tZF9G+QfDX4qRCHkF4EvYAsOMHr43Ic/Co9d4p+GV/O6QvMg
-0IdYi/CRmGBkMfaySFvMMgIgBSm5q+PZmwguZjBGn0FkaNWF4FYusfCLswUxifIA
-oY4ZtXsMxilW39DT5joXhgfwtd6JMxzzkXkmv+JBPxSj1+Xt4Ayuz13PFd1ylV++
-vL4JpRO/Msu6Zw==
-                    
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.ufop.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafe.ufop.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">UFOP - Universidade Federal de Ouro Preto</OrganizationName>
-    <OrganizationName xml:lang="pt-br">UFOP - Universidade Federal de Ouro Preto</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">UFOP - Universidade Federal de Ouro Preto</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="pt-br">UFOP - Universidade Federal de Ouro Preto</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.ufop.br</OrganizationURL>
-    <OrganizationURL xml:lang="pt-br">http://www.ufop.br</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Daniel Magalhaes Bicalho</SurName>
-    <EmailAddress>daniel.bicalho@nti.ufop.br</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/cafe.ufop.br.xml b/swamid-interfederations-2.0/cafe.ufop.br.xml
deleted file mode 100644
index 2aed2eb4..00000000
--- a/swamid-interfederations-2.0/cafe.ufop.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.ufop.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">ufop.br</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">UFOP - Universidade Federal de Ouro Preto</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="pt-br">UFOP - Universidade Federal de Ouro Preto</mdui:DisplayName>
-        <mdui:Description xml:lang="en">UFOP - Universidade Federal de Ouro Preto</mdui:Description>
-        <mdui:Description xml:lang="pt-br">UFOP - Universidade Federal de Ouro Preto</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.ufop.br</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="pt-br">http://www.ufop.br</mdui:InformationURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-    MIIDxjCCAq4CAQAwDQYJKoZIhvcNAQEFBQAwgagxKzApBgNVBAoTIlVuaXZlcnNp
-ZGFkZSBGZWRlcmFsIGRlIE91cm8gUHJldG8xDDAKBgNVBAsTA05USTEbMBkGCSqG
-SIb3DQEJARYMY2FmZUB1Zm9wLmJyMRMwEQYDVQQHEwpPdXJvIFByZXRvMRUwEwYD
-VQQIEwxNaW5hcyBHZXJhaXMxCzAJBgNVBAYTAkJSMRUwEwYDVQQDEwxjYWZlLnVm
-b3AuYnIwHhcNMTQwNzE1MTgzMjAwWhcNMTcwNzE0MTgzMjAwWjCBqDErMCkGA1UE
-ChMiVW5pdmVyc2lkYWRlIEZlZGVyYWwgZGUgT3VybyBQcmV0bzEMMAoGA1UECxMD
-TlRJMRswGQYJKoZIhvcNAQkBFgxjYWZlQHVmb3AuYnIxEzARBgNVBAcTCk91cm8g
-UHJldG8xFTATBgNVBAgTDE1pbmFzIEdlcmFpczELMAkGA1UEBhMCQlIxFTATBgNV
-BAMTDGNhZmUudWZvcC5icjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
-AJ8tn2QtCdQheOm0AeLjxH+NHHvU+hboU5XLY3FOaO4esNLWPm3ekToB/QKM7kK2
-JXUlx6iaqC57hOq3zQgwRBDiq9NJidn57BLyxTcbxu9j/2+gyQPmOPgynrxHGN9Y
-8z1WtuVWlTXZ9XmFKYvPvtch/FYAA9+dvCc4/42V6DaosCXzGyiSLRDk4A9mOTaU
-i/juNLFuYbFN7lKTjFiK75Z8xonEvsQ/4QDUPDt5WREuDqKU7JgGwv0Rwkn/h1YR
-9n1SvINCKLpLnRtOk0Ts4RsdiPRKx4Q/G6GmsjuQSTHkEpqVbvZsindPWvFeDAj7
-pPv2sGYa7TUxh4cEcFN37F8CAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAdeSNmRaI
-55vnAf58XCUuOU60fYasvHysDTjbymaWiJjZ8St7QcgkspVrGcK0CzTltuquGck6
-Jy+t/sQOBU1h+qfWzbCDgHS7/vVFIa42yLzPBeibyVFeSaJU1xUXR+h3DxiEaHrK
-zPzQtr3obCWYOxj5tZF9G+QfDX4qRCHkF4EvYAsOMHr43Ic/Co9d4p+GV/O6QvMg
-0IdYi/CRmGBkMfaySFvMMgIgBSm5q+PZmwguZjBGn0FkaNWF4FYusfCLswUxifIA
-oY4ZtXsMxilW39DT5joXhgfwtd6JMxzzkXkmv+JBPxSj1+Xt4Ayuz13PFd1ylV++
-vL4JpRO/Msu6Zw==
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.ufop.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafe.ufop.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.ufop.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cafe.ufop.br/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://cafe.ufop.br/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://cafe.ufop.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">ufop.br</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-      
-MIIDxjCCAq4CAQAwDQYJKoZIhvcNAQEFBQAwgagxKzApBgNVBAoTIlVuaXZlcnNp
-ZGFkZSBGZWRlcmFsIGRlIE91cm8gUHJldG8xDDAKBgNVBAsTA05USTEbMBkGCSqG
-SIb3DQEJARYMY2FmZUB1Zm9wLmJyMRMwEQYDVQQHEwpPdXJvIFByZXRvMRUwEwYD
-VQQIEwxNaW5hcyBHZXJhaXMxCzAJBgNVBAYTAkJSMRUwEwYDVQQDEwxjYWZlLnVm
-b3AuYnIwHhcNMTQwNzE1MTgzMjAwWhcNMTcwNzE0MTgzMjAwWjCBqDErMCkGA1UE
-ChMiVW5pdmVyc2lkYWRlIEZlZGVyYWwgZGUgT3VybyBQcmV0bzEMMAoGA1UECxMD
-TlRJMRswGQYJKoZIhvcNAQkBFgxjYWZlQHVmb3AuYnIxEzARBgNVBAcTCk91cm8g
-UHJldG8xFTATBgNVBAgTDE1pbmFzIEdlcmFpczELMAkGA1UEBhMCQlIxFTATBgNV
-BAMTDGNhZmUudWZvcC5icjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
-AJ8tn2QtCdQheOm0AeLjxH+NHHvU+hboU5XLY3FOaO4esNLWPm3ekToB/QKM7kK2
-JXUlx6iaqC57hOq3zQgwRBDiq9NJidn57BLyxTcbxu9j/2+gyQPmOPgynrxHGN9Y
-8z1WtuVWlTXZ9XmFKYvPvtch/FYAA9+dvCc4/42V6DaosCXzGyiSLRDk4A9mOTaU
-i/juNLFuYbFN7lKTjFiK75Z8xonEvsQ/4QDUPDt5WREuDqKU7JgGwv0Rwkn/h1YR
-9n1SvINCKLpLnRtOk0Ts4RsdiPRKx4Q/G6GmsjuQSTHkEpqVbvZsindPWvFeDAj7
-pPv2sGYa7TUxh4cEcFN37F8CAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAdeSNmRaI
-55vnAf58XCUuOU60fYasvHysDTjbymaWiJjZ8St7QcgkspVrGcK0CzTltuquGck6
-Jy+t/sQOBU1h+qfWzbCDgHS7/vVFIa42yLzPBeibyVFeSaJU1xUXR+h3DxiEaHrK
-zPzQtr3obCWYOxj5tZF9G+QfDX4qRCHkF4EvYAsOMHr43Ic/Co9d4p+GV/O6QvMg
-0IdYi/CRmGBkMfaySFvMMgIgBSm5q+PZmwguZjBGn0FkaNWF4FYusfCLswUxifIA
-oY4ZtXsMxilW39DT5joXhgfwtd6JMxzzkXkmv+JBPxSj1+Xt4Ayuz13PFd1ylV++
-vL4JpRO/Msu6Zw==
-                    
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.ufop.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafe.ufop.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">UFOP - Universidade Federal de Ouro Preto</OrganizationName>
-    <OrganizationName xml:lang="pt-br">UFOP - Universidade Federal de Ouro Preto</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">UFOP - Universidade Federal de Ouro Preto</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="pt-br">UFOP - Universidade Federal de Ouro Preto</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.ufop.br</OrganizationURL>
-    <OrganizationURL xml:lang="pt-br">http://www.ufop.br</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Daniel Magalhaes Bicalho</SurName>
-    <EmailAddress>daniel.bicalho@nti.ufop.br</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/cafe.ufra.edu.br-idp-shibboleth.xml b/swamid-interfederations-2.0/cafe.ufra.edu.br-idp-shibboleth.xml
deleted file mode 100644
index 8c37c66c..00000000
--- a/swamid-interfederations-2.0/cafe.ufra.edu.br-idp-shibboleth.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.ufra.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">edu.br</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">UFRA - Universidade  Federal Rural da Amazonia</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="pt-br">UFRA - Universidade  Federal Rural da Amazonia</mdui:DisplayName>
-        <mdui:Description xml:lang="en">UFRA - Universidade  Federal Rural da Amazonia</mdui:Description>
-        <mdui:Description xml:lang="pt-br">UFRA - Universidade  Federal Rural da Amazonia</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.ufra.edu.br</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="pt-br">http://www.ufra.edu.br</mdui:InformationURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-    MIID3jCCAsYCAQAwDQYJKoZIhvcNAQEFBQAwgbQxODA2BgNVBAoUL1VGUkEgLSBV
-bml2ZXJzaWRhZGUgIEZlZGVyYWwgUnVyYWwgZGEgQW1hesO0bmlhMQ0wCwYDVQQL
-EwREU0lUMSAwHgYJKoZIhvcNAQkBFhFhZG1pbkB1ZnJhLmVkdS5icjEPMA0GA1UE
-BxQGQmVsw6ltMQ4wDAYDVQQIFAVQYXLDoTELMAkGA1UEBhMCQlIxGTAXBgNVBAMT
-EGNhZmUudWZyYS5lZHUuYnIwHhcNMTQwNTAyMTk1MDEzWhcNMTcwNTAxMTk1MDEz
-WjCBtDE4MDYGA1UEChQvVUZSQSAtIFVuaXZlcnNpZGFkZSAgRmVkZXJhbCBSdXJh
-bCBkYSBBbWF6w7RuaWExDTALBgNVBAsTBERTSVQxIDAeBgkqhkiG9w0BCQEWEWFk
-bWluQHVmcmEuZWR1LmJyMQ8wDQYDVQQHFAZCZWzDqW0xDjAMBgNVBAgUBVBhcsOh
-MQswCQYDVQQGEwJCUjEZMBcGA1UEAxMQY2FmZS51ZnJhLmVkdS5icjCCASIwDQYJ
-KoZIhvcNAQEBBQADggEPADCCAQoCggEBAMDVPqQ0G2bqZ/6smSUXSXB+th/U25PH
-OQG7iM6MURKF8d9KSn7ZHagmMwhz+HqUyEJCYvHqy2q+uVQY3V8mQm0u27edFGwA
-sou14eWzswMIWb1dg2WYoto6nVG0t0qcazhKBQbXlsKh2lZeT00ZtAz7WeG0t9QJ
-zxQxXFdHpiBlc10Mcr2/Zd3aCDeZI6RpwcQvieR077bcr5JktYuVOSlUdrVpQsiO
-hJFlW6hNN35xranD/bhJ173ZiKnr1v8KiPSE1xoe/Lhwe9kYOvrD5yg8UFy6c4Wb
-sAow+RzjMkqnO84NbRh/CDaCfGDaxWqNELxh14FBWql0EgGqQooPpU0CAwEAATAN
-BgkqhkiG9w0BAQUFAAOCAQEAtfE2fyL0C7xtbLJj/sQBAF0u/hmWSBCWjXjk+SET
-8ePbEIoHqrU8fu8sC7E9ixxSRpM71PZWAGpjaQD/pyJ0+3LDwPkVHTMz0pr917sN
-MtFr1T2LBAWC2FqPqulfaSxOc9AXstEldQuCp7ybMnqfuNXvBdQSp59kI64E3tt8
-zEnRgfjLnrfJG5/JNuDturpl6Oe2dE/SpPfstuJmNiM+twnpQpzOeTy7cyzV+SAp
-3u2CPoRhQiGaU87rID1OGhuCVaFnwLhatJ57eciDz88mxFLFxpRPsONJuIJqaCU9
-QUYJSI9AcSx1WqcLuKp3O1uujnxU6X43oDXEsST7Hq4Ewg==
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.ufra.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.ufra.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.ufra.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cafe.ufra.edu.br/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://cafe.ufra.edu.br/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://cafe.ufra.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>
-      
-MIID3jCCAsYCAQAwDQYJKoZIhvcNAQEFBQAwgbQxODA2BgNVBAoUL1VGUkEgLSBV
-bml2ZXJzaWRhZGUgIEZlZGVyYWwgUnVyYWwgZGEgQW1hesO0bmlhMQ0wCwYDVQQL
-EwREU0lUMSAwHgYJKoZIhvcNAQkBFhFhZG1pbkB1ZnJhLmVkdS5icjEPMA0GA1UE
-BxQGQmVsw6ltMQ4wDAYDVQQIFAVQYXLDoTELMAkGA1UEBhMCQlIxGTAXBgNVBAMT
-EGNhZmUudWZyYS5lZHUuYnIwHhcNMTQwNTAyMTk1MDEzWhcNMTcwNTAxMTk1MDEz
-WjCBtDE4MDYGA1UEChQvVUZSQSAtIFVuaXZlcnNpZGFkZSAgRmVkZXJhbCBSdXJh
-bCBkYSBBbWF6w7RuaWExDTALBgNVBAsTBERTSVQxIDAeBgkqhkiG9w0BCQEWEWFk
-bWluQHVmcmEuZWR1LmJyMQ8wDQYDVQQHFAZCZWzDqW0xDjAMBgNVBAgUBVBhcsOh
-MQswCQYDVQQGEwJCUjEZMBcGA1UEAxMQY2FmZS51ZnJhLmVkdS5icjCCASIwDQYJ
-KoZIhvcNAQEBBQADggEPADCCAQoCggEBAMDVPqQ0G2bqZ/6smSUXSXB+th/U25PH
-OQG7iM6MURKF8d9KSn7ZHagmMwhz+HqUyEJCYvHqy2q+uVQY3V8mQm0u27edFGwA
-sou14eWzswMIWb1dg2WYoto6nVG0t0qcazhKBQbXlsKh2lZeT00ZtAz7WeG0t9QJ
-zxQxXFdHpiBlc10Mcr2/Zd3aCDeZI6RpwcQvieR077bcr5JktYuVOSlUdrVpQsiO
-hJFlW6hNN35xranD/bhJ173ZiKnr1v8KiPSE1xoe/Lhwe9kYOvrD5yg8UFy6c4Wb
-sAow+RzjMkqnO84NbRh/CDaCfGDaxWqNELxh14FBWql0EgGqQooPpU0CAwEAATAN
-BgkqhkiG9w0BAQUFAAOCAQEAtfE2fyL0C7xtbLJj/sQBAF0u/hmWSBCWjXjk+SET
-8ePbEIoHqrU8fu8sC7E9ixxSRpM71PZWAGpjaQD/pyJ0+3LDwPkVHTMz0pr917sN
-MtFr1T2LBAWC2FqPqulfaSxOc9AXstEldQuCp7ybMnqfuNXvBdQSp59kI64E3tt8
-zEnRgfjLnrfJG5/JNuDturpl6Oe2dE/SpPfstuJmNiM+twnpQpzOeTy7cyzV+SAp
-3u2CPoRhQiGaU87rID1OGhuCVaFnwLhatJ57eciDz88mxFLFxpRPsONJuIJqaCU9
-QUYJSI9AcSx1WqcLuKp3O1uujnxU6X43oDXEsST7Hq4Ewg==
-                    
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.ufra.edu.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafe.ufra.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">UFRA - Universidade  Federal Rural da Amazonia</OrganizationName>
-    <OrganizationName xml:lang="pt-br">UFRA - Universidade  Federal Rural da Amazonia</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">UFRA - Universidade  Federal Rural da Amazonia</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="pt-br">UFRA - Universidade  Federal Rural da Amazonia</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.ufra.edu.br</OrganizationURL>
-    <OrganizationURL xml:lang="pt-br">http://www.ufra.edu.br</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Joaquim de Jesus Soares</SurName>
-    <EmailAddress>admin@ufra.edu.br</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/cafe.ufra.edu.br.xml b/swamid-interfederations-2.0/cafe.ufra.edu.br.xml
deleted file mode 100644
index 8c37c66c..00000000
--- a/swamid-interfederations-2.0/cafe.ufra.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.ufra.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">edu.br</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">UFRA - Universidade  Federal Rural da Amazonia</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="pt-br">UFRA - Universidade  Federal Rural da Amazonia</mdui:DisplayName>
-        <mdui:Description xml:lang="en">UFRA - Universidade  Federal Rural da Amazonia</mdui:Description>
-        <mdui:Description xml:lang="pt-br">UFRA - Universidade  Federal Rural da Amazonia</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.ufra.edu.br</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="pt-br">http://www.ufra.edu.br</mdui:InformationURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-    MIID3jCCAsYCAQAwDQYJKoZIhvcNAQEFBQAwgbQxODA2BgNVBAoUL1VGUkEgLSBV
-bml2ZXJzaWRhZGUgIEZlZGVyYWwgUnVyYWwgZGEgQW1hesO0bmlhMQ0wCwYDVQQL
-EwREU0lUMSAwHgYJKoZIhvcNAQkBFhFhZG1pbkB1ZnJhLmVkdS5icjEPMA0GA1UE
-BxQGQmVsw6ltMQ4wDAYDVQQIFAVQYXLDoTELMAkGA1UEBhMCQlIxGTAXBgNVBAMT
-EGNhZmUudWZyYS5lZHUuYnIwHhcNMTQwNTAyMTk1MDEzWhcNMTcwNTAxMTk1MDEz
-WjCBtDE4MDYGA1UEChQvVUZSQSAtIFVuaXZlcnNpZGFkZSAgRmVkZXJhbCBSdXJh
-bCBkYSBBbWF6w7RuaWExDTALBgNVBAsTBERTSVQxIDAeBgkqhkiG9w0BCQEWEWFk
-bWluQHVmcmEuZWR1LmJyMQ8wDQYDVQQHFAZCZWzDqW0xDjAMBgNVBAgUBVBhcsOh
-MQswCQYDVQQGEwJCUjEZMBcGA1UEAxMQY2FmZS51ZnJhLmVkdS5icjCCASIwDQYJ
-KoZIhvcNAQEBBQADggEPADCCAQoCggEBAMDVPqQ0G2bqZ/6smSUXSXB+th/U25PH
-OQG7iM6MURKF8d9KSn7ZHagmMwhz+HqUyEJCYvHqy2q+uVQY3V8mQm0u27edFGwA
-sou14eWzswMIWb1dg2WYoto6nVG0t0qcazhKBQbXlsKh2lZeT00ZtAz7WeG0t9QJ
-zxQxXFdHpiBlc10Mcr2/Zd3aCDeZI6RpwcQvieR077bcr5JktYuVOSlUdrVpQsiO
-hJFlW6hNN35xranD/bhJ173ZiKnr1v8KiPSE1xoe/Lhwe9kYOvrD5yg8UFy6c4Wb
-sAow+RzjMkqnO84NbRh/CDaCfGDaxWqNELxh14FBWql0EgGqQooPpU0CAwEAATAN
-BgkqhkiG9w0BAQUFAAOCAQEAtfE2fyL0C7xtbLJj/sQBAF0u/hmWSBCWjXjk+SET
-8ePbEIoHqrU8fu8sC7E9ixxSRpM71PZWAGpjaQD/pyJ0+3LDwPkVHTMz0pr917sN
-MtFr1T2LBAWC2FqPqulfaSxOc9AXstEldQuCp7ybMnqfuNXvBdQSp59kI64E3tt8
-zEnRgfjLnrfJG5/JNuDturpl6Oe2dE/SpPfstuJmNiM+twnpQpzOeTy7cyzV+SAp
-3u2CPoRhQiGaU87rID1OGhuCVaFnwLhatJ57eciDz88mxFLFxpRPsONJuIJqaCU9
-QUYJSI9AcSx1WqcLuKp3O1uujnxU6X43oDXEsST7Hq4Ewg==
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.ufra.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.ufra.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.ufra.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cafe.ufra.edu.br/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://cafe.ufra.edu.br/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://cafe.ufra.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>
-      
-MIID3jCCAsYCAQAwDQYJKoZIhvcNAQEFBQAwgbQxODA2BgNVBAoUL1VGUkEgLSBV
-bml2ZXJzaWRhZGUgIEZlZGVyYWwgUnVyYWwgZGEgQW1hesO0bmlhMQ0wCwYDVQQL
-EwREU0lUMSAwHgYJKoZIhvcNAQkBFhFhZG1pbkB1ZnJhLmVkdS5icjEPMA0GA1UE
-BxQGQmVsw6ltMQ4wDAYDVQQIFAVQYXLDoTELMAkGA1UEBhMCQlIxGTAXBgNVBAMT
-EGNhZmUudWZyYS5lZHUuYnIwHhcNMTQwNTAyMTk1MDEzWhcNMTcwNTAxMTk1MDEz
-WjCBtDE4MDYGA1UEChQvVUZSQSAtIFVuaXZlcnNpZGFkZSAgRmVkZXJhbCBSdXJh
-bCBkYSBBbWF6w7RuaWExDTALBgNVBAsTBERTSVQxIDAeBgkqhkiG9w0BCQEWEWFk
-bWluQHVmcmEuZWR1LmJyMQ8wDQYDVQQHFAZCZWzDqW0xDjAMBgNVBAgUBVBhcsOh
-MQswCQYDVQQGEwJCUjEZMBcGA1UEAxMQY2FmZS51ZnJhLmVkdS5icjCCASIwDQYJ
-KoZIhvcNAQEBBQADggEPADCCAQoCggEBAMDVPqQ0G2bqZ/6smSUXSXB+th/U25PH
-OQG7iM6MURKF8d9KSn7ZHagmMwhz+HqUyEJCYvHqy2q+uVQY3V8mQm0u27edFGwA
-sou14eWzswMIWb1dg2WYoto6nVG0t0qcazhKBQbXlsKh2lZeT00ZtAz7WeG0t9QJ
-zxQxXFdHpiBlc10Mcr2/Zd3aCDeZI6RpwcQvieR077bcr5JktYuVOSlUdrVpQsiO
-hJFlW6hNN35xranD/bhJ173ZiKnr1v8KiPSE1xoe/Lhwe9kYOvrD5yg8UFy6c4Wb
-sAow+RzjMkqnO84NbRh/CDaCfGDaxWqNELxh14FBWql0EgGqQooPpU0CAwEAATAN
-BgkqhkiG9w0BAQUFAAOCAQEAtfE2fyL0C7xtbLJj/sQBAF0u/hmWSBCWjXjk+SET
-8ePbEIoHqrU8fu8sC7E9ixxSRpM71PZWAGpjaQD/pyJ0+3LDwPkVHTMz0pr917sN
-MtFr1T2LBAWC2FqPqulfaSxOc9AXstEldQuCp7ybMnqfuNXvBdQSp59kI64E3tt8
-zEnRgfjLnrfJG5/JNuDturpl6Oe2dE/SpPfstuJmNiM+twnpQpzOeTy7cyzV+SAp
-3u2CPoRhQiGaU87rID1OGhuCVaFnwLhatJ57eciDz88mxFLFxpRPsONJuIJqaCU9
-QUYJSI9AcSx1WqcLuKp3O1uujnxU6X43oDXEsST7Hq4Ewg==
-                    
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.ufra.edu.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafe.ufra.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">UFRA - Universidade  Federal Rural da Amazonia</OrganizationName>
-    <OrganizationName xml:lang="pt-br">UFRA - Universidade  Federal Rural da Amazonia</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">UFRA - Universidade  Federal Rural da Amazonia</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="pt-br">UFRA - Universidade  Federal Rural da Amazonia</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.ufra.edu.br</OrganizationURL>
-    <OrganizationURL xml:lang="pt-br">http://www.ufra.edu.br</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Joaquim de Jesus Soares</SurName>
-    <EmailAddress>admin@ufra.edu.br</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/cafe.unicentro.br-idp-shibboleth.xml b/swamid-interfederations-2.0/cafe.unicentro.br-idp-shibboleth.xml
deleted file mode 100644
index 8960bf5d..00000000
--- a/swamid-interfederations-2.0/cafe.unicentro.br-idp-shibboleth.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://cafe.unicentro.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">unicentro.br</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">UNICENTRO - Universidade Estadual do Centro-Oeste do Parana</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="pt-br">UNICENTRO - Universidade Estadual do Centro-Oeste do Parana</mdui:DisplayName>
-        <mdui:Description xml:lang="en">UNICENTRO - Universidade Estadual do Centro-Oeste do Parana</mdui:Description>
-        <mdui:Description xml:lang="pt-br">UNICENTRO - Universidade Estadual do Centro-Oeste do Parana</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.unicentro.br/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="pt-br">http://www.unicentro.br/</mdui:InformationURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-    MIIERjCCAy4CAQAwDQYJKoZIhvcNAQEFBQAwgegxOjA4BgNVBAoTMVVOSUNFTlRS
-TyAtIFVuaXZlcnNpZGFkZSBFc3RhZHVhbCBkbyBDZW50cm8tT2VzdGUxOjA4BgNV
-BAsTMUNPT1JUSSAtIENvb3JkZW5hZG9yaWEgZGUgVGVjbm9sb2dpYSBlIEluZm9y
-bWFjYW8xHzAdBgkqhkiG9w0BCQEWEHdlYkB1bmljZW50cm8uYnIxEzARBgNVBAcT
-Ckd1YXJhcHVhdmExDzANBgNVBAgTBlBhcmFuYTELMAkGA1UEBhMCQlIxGjAYBgNV
-BAMTEWNhZmUudW5pY2VudHJvLmJyMB4XDTE0MDYwNTEyMDk0OFoXDTE5MDYwNDEy
-MDk0OFowgegxOjA4BgNVBAoTMVVOSUNFTlRSTyAtIFVuaXZlcnNpZGFkZSBFc3Rh
-ZHVhbCBkbyBDZW50cm8tT2VzdGUxOjA4BgNVBAsTMUNPT1JUSSAtIENvb3JkZW5h
-ZG9yaWEgZGUgVGVjbm9sb2dpYSBlIEluZm9ybWFjYW8xHzAdBgkqhkiG9w0BCQEW
-EHdlYkB1bmljZW50cm8uYnIxEzARBgNVBAcTCkd1YXJhcHVhdmExDzANBgNVBAgT
-BlBhcmFuYTELMAkGA1UEBhMCQlIxGjAYBgNVBAMTEWNhZmUudW5pY2VudHJvLmJy
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAutO0H5MeExCmIS65KP1n
-na/QnEWYcUxMCNYEokJ0dY07R+LXIl8yWFoS2kTGsl8Hb++/dDDYg3/nUKsMMiFV
-1EE8k8b7f2QVx7g83RSeeVGqs8XC+uD6cYbP0FKBbfvyDtnjloDpgHI+EeKInmy+
-tlCV0ojFFUOrbJmRY4lZwkd223/72iX59AL+dE4bepX9AUDnWiroP5YVaaLm15fh
-dfYB/usJ3vhnTMam+Bk7izZYiYlz5DAzyswBegzMB67jos+sy8702AJVSLDpR3Ea
-RyQ/T5u8JvcULWw6TWW0Wp7WXNN3Gtr6806T7TIUWVsoo9XI8MOfBsUV8qyy9fNC
-RwIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQAgz6S24xp8M29UhvObecU6I6PzMyz1
-DAWDwEGzdGeKTcoz/5nEEyEj+dBS7EfRV5ySjwls1Mhn09YpWtAgop/QvFHnC5s3
-2SOplajl3jfHgo08KywWZ3WVC3va/swyX1J7UtA2/gfqBMxE15YtB90NCJCMvw6f
-eT/0dWL7GrUU9fKzIZofFuGYcTS/AaoKOLv64SR9eeQkZWcQIv+rEA+/T1tY+/G1
-x5HA6F3s6LdZljTwzEQbSxQ0CumkcxpWVartEoUtZm7wXFnFEfbVnMuugnTdKsFl
-lGDbaAdH5q9/YdTmP3n91RELgSyB9oIB/Wzcmig21BMgPyBFA3zosbKV
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.unicentro.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafe.unicentro.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.unicentro.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cafe.unicentro.br/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://cafe.unicentro.br/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://cafe.unicentro.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">unicentro.br</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-      
-MIIERjCCAy4CAQAwDQYJKoZIhvcNAQEFBQAwgegxOjA4BgNVBAoTMVVOSUNFTlRS
-TyAtIFVuaXZlcnNpZGFkZSBFc3RhZHVhbCBkbyBDZW50cm8tT2VzdGUxOjA4BgNV
-BAsTMUNPT1JUSSAtIENvb3JkZW5hZG9yaWEgZGUgVGVjbm9sb2dpYSBlIEluZm9y
-bWFjYW8xHzAdBgkqhkiG9w0BCQEWEHdlYkB1bmljZW50cm8uYnIxEzARBgNVBAcT
-Ckd1YXJhcHVhdmExDzANBgNVBAgTBlBhcmFuYTELMAkGA1UEBhMCQlIxGjAYBgNV
-BAMTEWNhZmUudW5pY2VudHJvLmJyMB4XDTE0MDYwNTEyMDk0OFoXDTE5MDYwNDEy
-MDk0OFowgegxOjA4BgNVBAoTMVVOSUNFTlRSTyAtIFVuaXZlcnNpZGFkZSBFc3Rh
-ZHVhbCBkbyBDZW50cm8tT2VzdGUxOjA4BgNVBAsTMUNPT1JUSSAtIENvb3JkZW5h
-ZG9yaWEgZGUgVGVjbm9sb2dpYSBlIEluZm9ybWFjYW8xHzAdBgkqhkiG9w0BCQEW
-EHdlYkB1bmljZW50cm8uYnIxEzARBgNVBAcTCkd1YXJhcHVhdmExDzANBgNVBAgT
-BlBhcmFuYTELMAkGA1UEBhMCQlIxGjAYBgNVBAMTEWNhZmUudW5pY2VudHJvLmJy
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAutO0H5MeExCmIS65KP1n
-na/QnEWYcUxMCNYEokJ0dY07R+LXIl8yWFoS2kTGsl8Hb++/dDDYg3/nUKsMMiFV
-1EE8k8b7f2QVx7g83RSeeVGqs8XC+uD6cYbP0FKBbfvyDtnjloDpgHI+EeKInmy+
-tlCV0ojFFUOrbJmRY4lZwkd223/72iX59AL+dE4bepX9AUDnWiroP5YVaaLm15fh
-dfYB/usJ3vhnTMam+Bk7izZYiYlz5DAzyswBegzMB67jos+sy8702AJVSLDpR3Ea
-RyQ/T5u8JvcULWw6TWW0Wp7WXNN3Gtr6806T7TIUWVsoo9XI8MOfBsUV8qyy9fNC
-RwIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQAgz6S24xp8M29UhvObecU6I6PzMyz1
-DAWDwEGzdGeKTcoz/5nEEyEj+dBS7EfRV5ySjwls1Mhn09YpWtAgop/QvFHnC5s3
-2SOplajl3jfHgo08KywWZ3WVC3va/swyX1J7UtA2/gfqBMxE15YtB90NCJCMvw6f
-eT/0dWL7GrUU9fKzIZofFuGYcTS/AaoKOLv64SR9eeQkZWcQIv+rEA+/T1tY+/G1
-x5HA6F3s6LdZljTwzEQbSxQ0CumkcxpWVartEoUtZm7wXFnFEfbVnMuugnTdKsFl
-lGDbaAdH5q9/YdTmP3n91RELgSyB9oIB/Wzcmig21BMgPyBFA3zosbKV
-                    
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.unicentro.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafe.unicentro.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">UNICENTRO - Universidade Estadual do Centro-Oeste do Parana</OrganizationName>
-    <OrganizationName xml:lang="pt-br">UNICENTRO - Universidade Estadual do Centro-Oeste do Parana</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">UNICENTRO - Universidade Estadual do Centro-Oeste do Parana</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="pt-br">UNICENTRO - Universidade Estadual do Centro-Oeste do Parana</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.unicentro.br/</OrganizationURL>
-    <OrganizationURL xml:lang="pt-br">http://www.unicentro.br/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Mauricio Adriano Teixeira</SurName>
-    <EmailAddress>madriano@unicentro.br</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/cafe.unicentro.br.xml b/swamid-interfederations-2.0/cafe.unicentro.br.xml
deleted file mode 100644
index 8960bf5d..00000000
--- a/swamid-interfederations-2.0/cafe.unicentro.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://cafe.unicentro.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">unicentro.br</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">UNICENTRO - Universidade Estadual do Centro-Oeste do Parana</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="pt-br">UNICENTRO - Universidade Estadual do Centro-Oeste do Parana</mdui:DisplayName>
-        <mdui:Description xml:lang="en">UNICENTRO - Universidade Estadual do Centro-Oeste do Parana</mdui:Description>
-        <mdui:Description xml:lang="pt-br">UNICENTRO - Universidade Estadual do Centro-Oeste do Parana</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.unicentro.br/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="pt-br">http://www.unicentro.br/</mdui:InformationURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-    MIIERjCCAy4CAQAwDQYJKoZIhvcNAQEFBQAwgegxOjA4BgNVBAoTMVVOSUNFTlRS
-TyAtIFVuaXZlcnNpZGFkZSBFc3RhZHVhbCBkbyBDZW50cm8tT2VzdGUxOjA4BgNV
-BAsTMUNPT1JUSSAtIENvb3JkZW5hZG9yaWEgZGUgVGVjbm9sb2dpYSBlIEluZm9y
-bWFjYW8xHzAdBgkqhkiG9w0BCQEWEHdlYkB1bmljZW50cm8uYnIxEzARBgNVBAcT
-Ckd1YXJhcHVhdmExDzANBgNVBAgTBlBhcmFuYTELMAkGA1UEBhMCQlIxGjAYBgNV
-BAMTEWNhZmUudW5pY2VudHJvLmJyMB4XDTE0MDYwNTEyMDk0OFoXDTE5MDYwNDEy
-MDk0OFowgegxOjA4BgNVBAoTMVVOSUNFTlRSTyAtIFVuaXZlcnNpZGFkZSBFc3Rh
-ZHVhbCBkbyBDZW50cm8tT2VzdGUxOjA4BgNVBAsTMUNPT1JUSSAtIENvb3JkZW5h
-ZG9yaWEgZGUgVGVjbm9sb2dpYSBlIEluZm9ybWFjYW8xHzAdBgkqhkiG9w0BCQEW
-EHdlYkB1bmljZW50cm8uYnIxEzARBgNVBAcTCkd1YXJhcHVhdmExDzANBgNVBAgT
-BlBhcmFuYTELMAkGA1UEBhMCQlIxGjAYBgNVBAMTEWNhZmUudW5pY2VudHJvLmJy
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAutO0H5MeExCmIS65KP1n
-na/QnEWYcUxMCNYEokJ0dY07R+LXIl8yWFoS2kTGsl8Hb++/dDDYg3/nUKsMMiFV
-1EE8k8b7f2QVx7g83RSeeVGqs8XC+uD6cYbP0FKBbfvyDtnjloDpgHI+EeKInmy+
-tlCV0ojFFUOrbJmRY4lZwkd223/72iX59AL+dE4bepX9AUDnWiroP5YVaaLm15fh
-dfYB/usJ3vhnTMam+Bk7izZYiYlz5DAzyswBegzMB67jos+sy8702AJVSLDpR3Ea
-RyQ/T5u8JvcULWw6TWW0Wp7WXNN3Gtr6806T7TIUWVsoo9XI8MOfBsUV8qyy9fNC
-RwIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQAgz6S24xp8M29UhvObecU6I6PzMyz1
-DAWDwEGzdGeKTcoz/5nEEyEj+dBS7EfRV5ySjwls1Mhn09YpWtAgop/QvFHnC5s3
-2SOplajl3jfHgo08KywWZ3WVC3va/swyX1J7UtA2/gfqBMxE15YtB90NCJCMvw6f
-eT/0dWL7GrUU9fKzIZofFuGYcTS/AaoKOLv64SR9eeQkZWcQIv+rEA+/T1tY+/G1
-x5HA6F3s6LdZljTwzEQbSxQ0CumkcxpWVartEoUtZm7wXFnFEfbVnMuugnTdKsFl
-lGDbaAdH5q9/YdTmP3n91RELgSyB9oIB/Wzcmig21BMgPyBFA3zosbKV
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.unicentro.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafe.unicentro.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.unicentro.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cafe.unicentro.br/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://cafe.unicentro.br/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://cafe.unicentro.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">unicentro.br</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-      
-MIIERjCCAy4CAQAwDQYJKoZIhvcNAQEFBQAwgegxOjA4BgNVBAoTMVVOSUNFTlRS
-TyAtIFVuaXZlcnNpZGFkZSBFc3RhZHVhbCBkbyBDZW50cm8tT2VzdGUxOjA4BgNV
-BAsTMUNPT1JUSSAtIENvb3JkZW5hZG9yaWEgZGUgVGVjbm9sb2dpYSBlIEluZm9y
-bWFjYW8xHzAdBgkqhkiG9w0BCQEWEHdlYkB1bmljZW50cm8uYnIxEzARBgNVBAcT
-Ckd1YXJhcHVhdmExDzANBgNVBAgTBlBhcmFuYTELMAkGA1UEBhMCQlIxGjAYBgNV
-BAMTEWNhZmUudW5pY2VudHJvLmJyMB4XDTE0MDYwNTEyMDk0OFoXDTE5MDYwNDEy
-MDk0OFowgegxOjA4BgNVBAoTMVVOSUNFTlRSTyAtIFVuaXZlcnNpZGFkZSBFc3Rh
-ZHVhbCBkbyBDZW50cm8tT2VzdGUxOjA4BgNVBAsTMUNPT1JUSSAtIENvb3JkZW5h
-ZG9yaWEgZGUgVGVjbm9sb2dpYSBlIEluZm9ybWFjYW8xHzAdBgkqhkiG9w0BCQEW
-EHdlYkB1bmljZW50cm8uYnIxEzARBgNVBAcTCkd1YXJhcHVhdmExDzANBgNVBAgT
-BlBhcmFuYTELMAkGA1UEBhMCQlIxGjAYBgNVBAMTEWNhZmUudW5pY2VudHJvLmJy
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAutO0H5MeExCmIS65KP1n
-na/QnEWYcUxMCNYEokJ0dY07R+LXIl8yWFoS2kTGsl8Hb++/dDDYg3/nUKsMMiFV
-1EE8k8b7f2QVx7g83RSeeVGqs8XC+uD6cYbP0FKBbfvyDtnjloDpgHI+EeKInmy+
-tlCV0ojFFUOrbJmRY4lZwkd223/72iX59AL+dE4bepX9AUDnWiroP5YVaaLm15fh
-dfYB/usJ3vhnTMam+Bk7izZYiYlz5DAzyswBegzMB67jos+sy8702AJVSLDpR3Ea
-RyQ/T5u8JvcULWw6TWW0Wp7WXNN3Gtr6806T7TIUWVsoo9XI8MOfBsUV8qyy9fNC
-RwIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQAgz6S24xp8M29UhvObecU6I6PzMyz1
-DAWDwEGzdGeKTcoz/5nEEyEj+dBS7EfRV5ySjwls1Mhn09YpWtAgop/QvFHnC5s3
-2SOplajl3jfHgo08KywWZ3WVC3va/swyX1J7UtA2/gfqBMxE15YtB90NCJCMvw6f
-eT/0dWL7GrUU9fKzIZofFuGYcTS/AaoKOLv64SR9eeQkZWcQIv+rEA+/T1tY+/G1
-x5HA6F3s6LdZljTwzEQbSxQ0CumkcxpWVartEoUtZm7wXFnFEfbVnMuugnTdKsFl
-lGDbaAdH5q9/YdTmP3n91RELgSyB9oIB/Wzcmig21BMgPyBFA3zosbKV
-                    
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.unicentro.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafe.unicentro.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">UNICENTRO - Universidade Estadual do Centro-Oeste do Parana</OrganizationName>
-    <OrganizationName xml:lang="pt-br">UNICENTRO - Universidade Estadual do Centro-Oeste do Parana</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">UNICENTRO - Universidade Estadual do Centro-Oeste do Parana</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="pt-br">UNICENTRO - Universidade Estadual do Centro-Oeste do Parana</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.unicentro.br/</OrganizationURL>
-    <OrganizationURL xml:lang="pt-br">http://www.unicentro.br/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Mauricio Adriano Teixeira</SurName>
-    <EmailAddress>madriano@unicentro.br</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/cafe.unifap.br-idp-shibboleth.xml b/swamid-interfederations-2.0/cafe.unifap.br-idp-shibboleth.xml
deleted file mode 100644
index 75eb65ad..00000000
--- a/swamid-interfederations-2.0/cafe.unifap.br-idp-shibboleth.xml
+++ /dev/null
@@ -1,114 +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.unifap.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">unifap.br</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">UNIFAP -  Universidade Federal do Amapa</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="pt-br">UNIFAP -  Universidade Federal do Amapa</mdui:DisplayName>
-        <mdui:Description xml:lang="en">UNIFAP -  Universidade Federal do Amapa</mdui:Description>
-        <mdui:Description xml:lang="pt-br">UNIFAP -  Universidade Federal do Amapa</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.unifap.br/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="pt-br">http://www.unifap.br/</mdui:InformationURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-    MIIEAjCCAuoCAQAwDQYJKoZIhvcNAQEFBQAwgcYxLzAtBgNVBAoTJlVOSUZBUCAt
-IFVuaXZlcnNpZGFkZSBGZWRlcmFsIGRvIEFtYXBhMSwwKgYDVQQLEyNESU5GTyAt
-IERlcGFydGFtZW50byBkZSBJbmZvcm1hdGljYTEeMBwGCSqGSIb3DQEJARYPZGlu
-Zm9AdW5pZmFwLmJyMQ8wDQYDVQQHEwZNYWNhcGExDjAMBgNVBAgTBUFtYXBhMQsw
-CQYDVQQGEwJCUjEXMBUGA1UEAxMOY2FmZS51bmlmYXAuYnIwHhcNMTIwNDE3MjAw
-NDI2WhcNMTUwNDE3MjAwNDI2WjCBxjEvMC0GA1UEChMmVU5JRkFQIC0gVW5pdmVy
-c2lkYWRlIEZlZGVyYWwgZG8gQW1hcGExLDAqBgNVBAsTI0RJTkZPIC0gRGVwYXJ0
-YW1lbnRvIGRlIEluZm9ybWF0aWNhMR4wHAYJKoZIhvcNAQkBFg9kaW5mb0B1bmlm
-YXAuYnIxDzANBgNVBAcTBk1hY2FwYTEOMAwGA1UECBMFQW1hcGExCzAJBgNVBAYT
-AkJSMRcwFQYDVQQDEw5jYWZlLnVuaWZhcC5icjCCASIwDQYJKoZIhvcNAQEBBQAD
-ggEPADCCAQoCggEBALnDpFayIMY6LGSN8rr9/GpzUSfmzFcVRt1KF6NqMOIL4HFP
-OdaLWcWOsKNaUQBbJBiOPD4TDc/1ihU6X53UbtX7MCLJoizR7vk7NQqlhxwfuoCE
-di7Vaq2SRjTgX5oLV+ObOxjTqySJyZeF/9yj4w0/MzE1igT9Q/5N+E9dDbBza32m
-G3NcjSyPLH2/yNnq+xgROnT9plGKE0yWekscu0xvl4HVh6hC0QZmzHfHDsQnOPs2
-+HoWK+NDK+Q13dPyTnRQ2dUpyXUdl3NjkFknkGtJkEhNk8te4gHfkdLZ/EMSYQt3
-rAm4Cv73Cx8ISOXScuaBUwsfc9Rvstd4p/7AF1ECAwEAATANBgkqhkiG9w0BAQUF
-AAOCAQEATSZBo/wzBEE/vxbHhBDDXRkXy6DjnOgOhc5u4cbon7HHJsgxOftZyA4H
-l7XR4R42245J6iV9BHcmCWMQaCNqjRW2LgANxpI1uKq8kDRwambPoCzhic66Jjnx
-DOcc/tR4Lop5El1G2a1lluD6Ogvk/ri7GUPQq/tBnNx6L9zTaCKB4Xkm07v4FHP+
-kQsvZVaeSRCj6TFU4UndfZx3G0HveTwTjkdEJb4u/VK1uHUgUScVz1oODMv0mCDF
-NUWidpyQsguPTdgzSCi4ztO1chZiTGRrY8BxRhBGsfkMirRVfhgdYLg0g89SP3ja
-AWH4N7Emw+Xy4wjbo3OMjdWiW0S0GQ==
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.unifap.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafe.unifap.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.unifap.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cafe.unifap.br/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://cafe.unifap.br/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://cafe.unifap.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">unifap.br</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-      
-MIIEAjCCAuoCAQAwDQYJKoZIhvcNAQEFBQAwgcYxLzAtBgNVBAoTJlVOSUZBUCAt
-IFVuaXZlcnNpZGFkZSBGZWRlcmFsIGRvIEFtYXBhMSwwKgYDVQQLEyNESU5GTyAt
-IERlcGFydGFtZW50byBkZSBJbmZvcm1hdGljYTEeMBwGCSqGSIb3DQEJARYPZGlu
-Zm9AdW5pZmFwLmJyMQ8wDQYDVQQHEwZNYWNhcGExDjAMBgNVBAgTBUFtYXBhMQsw
-CQYDVQQGEwJCUjEXMBUGA1UEAxMOY2FmZS51bmlmYXAuYnIwHhcNMTIwNDE3MjAw
-NDI2WhcNMTUwNDE3MjAwNDI2WjCBxjEvMC0GA1UEChMmVU5JRkFQIC0gVW5pdmVy
-c2lkYWRlIEZlZGVyYWwgZG8gQW1hcGExLDAqBgNVBAsTI0RJTkZPIC0gRGVwYXJ0
-YW1lbnRvIGRlIEluZm9ybWF0aWNhMR4wHAYJKoZIhvcNAQkBFg9kaW5mb0B1bmlm
-YXAuYnIxDzANBgNVBAcTBk1hY2FwYTEOMAwGA1UECBMFQW1hcGExCzAJBgNVBAYT
-AkJSMRcwFQYDVQQDEw5jYWZlLnVuaWZhcC5icjCCASIwDQYJKoZIhvcNAQEBBQAD
-ggEPADCCAQoCggEBALnDpFayIMY6LGSN8rr9/GpzUSfmzFcVRt1KF6NqMOIL4HFP
-OdaLWcWOsKNaUQBbJBiOPD4TDc/1ihU6X53UbtX7MCLJoizR7vk7NQqlhxwfuoCE
-di7Vaq2SRjTgX5oLV+ObOxjTqySJyZeF/9yj4w0/MzE1igT9Q/5N+E9dDbBza32m
-G3NcjSyPLH2/yNnq+xgROnT9plGKE0yWekscu0xvl4HVh6hC0QZmzHfHDsQnOPs2
-+HoWK+NDK+Q13dPyTnRQ2dUpyXUdl3NjkFknkGtJkEhNk8te4gHfkdLZ/EMSYQt3
-rAm4Cv73Cx8ISOXScuaBUwsfc9Rvstd4p/7AF1ECAwEAATANBgkqhkiG9w0BAQUF
-AAOCAQEATSZBo/wzBEE/vxbHhBDDXRkXy6DjnOgOhc5u4cbon7HHJsgxOftZyA4H
-l7XR4R42245J6iV9BHcmCWMQaCNqjRW2LgANxpI1uKq8kDRwambPoCzhic66Jjnx
-DOcc/tR4Lop5El1G2a1lluD6Ogvk/ri7GUPQq/tBnNx6L9zTaCKB4Xkm07v4FHP+
-kQsvZVaeSRCj6TFU4UndfZx3G0HveTwTjkdEJb4u/VK1uHUgUScVz1oODMv0mCDF
-NUWidpyQsguPTdgzSCi4ztO1chZiTGRrY8BxRhBGsfkMirRVfhgdYLg0g89SP3ja
-AWH4N7Emw+Xy4wjbo3OMjdWiW0S0GQ==
-                    
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.unifap.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafe.unifap.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">UNIFAP - Universidade Federal do Amapa</OrganizationName>
-    <OrganizationName xml:lang="pt-br">UNIFAP - Universidade Federal do Amapa</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">UNIFAP -  Universidade Federal do Amapa</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="pt-br">UNIFAP -  Universidade Federal do Amapa</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.unifap.br/</OrganizationURL>
-    <OrganizationURL xml:lang="pt-br">http://www.unifap.br/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Samir Patrice</SurName>
-    <EmailAddress>samir@unifap.br</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/cafe.unifap.br.xml b/swamid-interfederations-2.0/cafe.unifap.br.xml
deleted file mode 100644
index 75eb65ad..00000000
--- a/swamid-interfederations-2.0/cafe.unifap.br.xml
+++ /dev/null
@@ -1,114 +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.unifap.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">unifap.br</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">UNIFAP -  Universidade Federal do Amapa</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="pt-br">UNIFAP -  Universidade Federal do Amapa</mdui:DisplayName>
-        <mdui:Description xml:lang="en">UNIFAP -  Universidade Federal do Amapa</mdui:Description>
-        <mdui:Description xml:lang="pt-br">UNIFAP -  Universidade Federal do Amapa</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.unifap.br/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="pt-br">http://www.unifap.br/</mdui:InformationURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-    MIIEAjCCAuoCAQAwDQYJKoZIhvcNAQEFBQAwgcYxLzAtBgNVBAoTJlVOSUZBUCAt
-IFVuaXZlcnNpZGFkZSBGZWRlcmFsIGRvIEFtYXBhMSwwKgYDVQQLEyNESU5GTyAt
-IERlcGFydGFtZW50byBkZSBJbmZvcm1hdGljYTEeMBwGCSqGSIb3DQEJARYPZGlu
-Zm9AdW5pZmFwLmJyMQ8wDQYDVQQHEwZNYWNhcGExDjAMBgNVBAgTBUFtYXBhMQsw
-CQYDVQQGEwJCUjEXMBUGA1UEAxMOY2FmZS51bmlmYXAuYnIwHhcNMTIwNDE3MjAw
-NDI2WhcNMTUwNDE3MjAwNDI2WjCBxjEvMC0GA1UEChMmVU5JRkFQIC0gVW5pdmVy
-c2lkYWRlIEZlZGVyYWwgZG8gQW1hcGExLDAqBgNVBAsTI0RJTkZPIC0gRGVwYXJ0
-YW1lbnRvIGRlIEluZm9ybWF0aWNhMR4wHAYJKoZIhvcNAQkBFg9kaW5mb0B1bmlm
-YXAuYnIxDzANBgNVBAcTBk1hY2FwYTEOMAwGA1UECBMFQW1hcGExCzAJBgNVBAYT
-AkJSMRcwFQYDVQQDEw5jYWZlLnVuaWZhcC5icjCCASIwDQYJKoZIhvcNAQEBBQAD
-ggEPADCCAQoCggEBALnDpFayIMY6LGSN8rr9/GpzUSfmzFcVRt1KF6NqMOIL4HFP
-OdaLWcWOsKNaUQBbJBiOPD4TDc/1ihU6X53UbtX7MCLJoizR7vk7NQqlhxwfuoCE
-di7Vaq2SRjTgX5oLV+ObOxjTqySJyZeF/9yj4w0/MzE1igT9Q/5N+E9dDbBza32m
-G3NcjSyPLH2/yNnq+xgROnT9plGKE0yWekscu0xvl4HVh6hC0QZmzHfHDsQnOPs2
-+HoWK+NDK+Q13dPyTnRQ2dUpyXUdl3NjkFknkGtJkEhNk8te4gHfkdLZ/EMSYQt3
-rAm4Cv73Cx8ISOXScuaBUwsfc9Rvstd4p/7AF1ECAwEAATANBgkqhkiG9w0BAQUF
-AAOCAQEATSZBo/wzBEE/vxbHhBDDXRkXy6DjnOgOhc5u4cbon7HHJsgxOftZyA4H
-l7XR4R42245J6iV9BHcmCWMQaCNqjRW2LgANxpI1uKq8kDRwambPoCzhic66Jjnx
-DOcc/tR4Lop5El1G2a1lluD6Ogvk/ri7GUPQq/tBnNx6L9zTaCKB4Xkm07v4FHP+
-kQsvZVaeSRCj6TFU4UndfZx3G0HveTwTjkdEJb4u/VK1uHUgUScVz1oODMv0mCDF
-NUWidpyQsguPTdgzSCi4ztO1chZiTGRrY8BxRhBGsfkMirRVfhgdYLg0g89SP3ja
-AWH4N7Emw+Xy4wjbo3OMjdWiW0S0GQ==
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.unifap.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafe.unifap.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.unifap.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cafe.unifap.br/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://cafe.unifap.br/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://cafe.unifap.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">unifap.br</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-      
-MIIEAjCCAuoCAQAwDQYJKoZIhvcNAQEFBQAwgcYxLzAtBgNVBAoTJlVOSUZBUCAt
-IFVuaXZlcnNpZGFkZSBGZWRlcmFsIGRvIEFtYXBhMSwwKgYDVQQLEyNESU5GTyAt
-IERlcGFydGFtZW50byBkZSBJbmZvcm1hdGljYTEeMBwGCSqGSIb3DQEJARYPZGlu
-Zm9AdW5pZmFwLmJyMQ8wDQYDVQQHEwZNYWNhcGExDjAMBgNVBAgTBUFtYXBhMQsw
-CQYDVQQGEwJCUjEXMBUGA1UEAxMOY2FmZS51bmlmYXAuYnIwHhcNMTIwNDE3MjAw
-NDI2WhcNMTUwNDE3MjAwNDI2WjCBxjEvMC0GA1UEChMmVU5JRkFQIC0gVW5pdmVy
-c2lkYWRlIEZlZGVyYWwgZG8gQW1hcGExLDAqBgNVBAsTI0RJTkZPIC0gRGVwYXJ0
-YW1lbnRvIGRlIEluZm9ybWF0aWNhMR4wHAYJKoZIhvcNAQkBFg9kaW5mb0B1bmlm
-YXAuYnIxDzANBgNVBAcTBk1hY2FwYTEOMAwGA1UECBMFQW1hcGExCzAJBgNVBAYT
-AkJSMRcwFQYDVQQDEw5jYWZlLnVuaWZhcC5icjCCASIwDQYJKoZIhvcNAQEBBQAD
-ggEPADCCAQoCggEBALnDpFayIMY6LGSN8rr9/GpzUSfmzFcVRt1KF6NqMOIL4HFP
-OdaLWcWOsKNaUQBbJBiOPD4TDc/1ihU6X53UbtX7MCLJoizR7vk7NQqlhxwfuoCE
-di7Vaq2SRjTgX5oLV+ObOxjTqySJyZeF/9yj4w0/MzE1igT9Q/5N+E9dDbBza32m
-G3NcjSyPLH2/yNnq+xgROnT9plGKE0yWekscu0xvl4HVh6hC0QZmzHfHDsQnOPs2
-+HoWK+NDK+Q13dPyTnRQ2dUpyXUdl3NjkFknkGtJkEhNk8te4gHfkdLZ/EMSYQt3
-rAm4Cv73Cx8ISOXScuaBUwsfc9Rvstd4p/7AF1ECAwEAATANBgkqhkiG9w0BAQUF
-AAOCAQEATSZBo/wzBEE/vxbHhBDDXRkXy6DjnOgOhc5u4cbon7HHJsgxOftZyA4H
-l7XR4R42245J6iV9BHcmCWMQaCNqjRW2LgANxpI1uKq8kDRwambPoCzhic66Jjnx
-DOcc/tR4Lop5El1G2a1lluD6Ogvk/ri7GUPQq/tBnNx6L9zTaCKB4Xkm07v4FHP+
-kQsvZVaeSRCj6TFU4UndfZx3G0HveTwTjkdEJb4u/VK1uHUgUScVz1oODMv0mCDF
-NUWidpyQsguPTdgzSCi4ztO1chZiTGRrY8BxRhBGsfkMirRVfhgdYLg0g89SP3ja
-AWH4N7Emw+Xy4wjbo3OMjdWiW0S0GQ==
-                    
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.unifap.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafe.unifap.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">UNIFAP - Universidade Federal do Amapa</OrganizationName>
-    <OrganizationName xml:lang="pt-br">UNIFAP - Universidade Federal do Amapa</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">UNIFAP -  Universidade Federal do Amapa</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="pt-br">UNIFAP -  Universidade Federal do Amapa</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.unifap.br/</OrganizationURL>
-    <OrganizationURL xml:lang="pt-br">http://www.unifap.br/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Samir Patrice</SurName>
-    <EmailAddress>samir@unifap.br</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/cafe.unifran.br-idp-shibboleth.xml b/swamid-interfederations-2.0/cafe.unifran.br-idp-shibboleth.xml
deleted file mode 100644
index e3907784..00000000
--- a/swamid-interfederations-2.0/cafe.unifran.br-idp-shibboleth.xml
+++ /dev/null
@@ -1,114 +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.unifran.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">unifran.br</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">UNIFRAN - Universidade de Franca</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="pt-br">UNIFRAN - Universidade de Franca</mdui:DisplayName>
-        <mdui:Description xml:lang="en">UNIFRAN - Universidade de Franca</mdui:Description>
-        <mdui:Description xml:lang="pt-br">UNIFRAN - Universidade de Franca</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.unifran.br/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="pt-br">http://www.unifran.br/</mdui:InformationURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-    MIID8DCCAtgCAQAwDQYJKoZIhvcNAQEFBQAwgb0xKTAnBgNVBAoTIFVOSUZSQU4g
-LSBVbml2ZXJzaWRhZGUgZGUgRnJhbmNhMSYwJAYDVQQLEx1USSAtIFRlY25vbG9n
-aWEgZGEgSW5mb3JtYWNhbzEcMBoGCSqGSIb3DQEJARYNdGlAdW5pZnJhbi5icjEP
-MA0GA1UEBxMGRnJhbmNhMRIwEAYDVQQIEwlTYW8gUGF1bG8xCzAJBgNVBAYTAkJS
-MRgwFgYDVQQDEw9jYWZlLnVuaWZyYW4uYnIwHhcNMTQwNDIzMTk1MTE4WhcNMTkw
-NDIyMTk1MTE4WjCBvTEpMCcGA1UEChMgVU5JRlJBTiAtIFVuaXZlcnNpZGFkZSBk
-ZSBGcmFuY2ExJjAkBgNVBAsTHVRJIC0gVGVjbm9sb2dpYSBkYSBJbmZvcm1hY2Fv
-MRwwGgYJKoZIhvcNAQkBFg10aUB1bmlmcmFuLmJyMQ8wDQYDVQQHEwZGcmFuY2Ex
-EjAQBgNVBAgTCVNhbyBQYXVsbzELMAkGA1UEBhMCQlIxGDAWBgNVBAMTD2NhZmUu
-dW5pZnJhbi5icjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKkqnGsj
-sJuGEO2HQO+byfGIGEvSQFGpWFn8aVT0C/hp9lbkA+KwJQ2frWlQKwF5CgOWw7gK
-9gY4Nm4UBMAQUkQPpzq9uARYEJ3PQr74h/EU8Tpq9+Req3LAYUanFkUjoQW5l/d8
-e0jLd4rZutqcGMJQzy1SeES8LPRYQbLWO4jWhZuoJaR/Wcm1Bir8ugkuLLCh9SbA
-i8tq6ZmWA/POw47YB+oFsd/WxY9HEiHdqb/BQyHa/mgAQtTVl2HzK8qvKT8vrtLW
-oLG+EBSzjxBik+gv94mLQ6dr3TY3wgdWu4V4dcJSdaq3WW4TIuAYTCKFGnpIabUd
-eSBTOpFYX01+UO8CAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAM8bz6vOOM8+NYRfS
-6Abk23tz9pKQXuewaotokabpY5f9dRS6jTtDTJ8dv6GCyCRFkI90p2/YtKbHp5mw
-kCTE4rv25tUv6kCFLvMREH9fLF6k8EwzSI+ijabecmi78+ZyQ+0xs3G6W1kysWz5
-ETrzYQq6QHiUEtAexRUwR7kyqiVbJuKolCQol6Fo4qO0PU++hhdwC6VizSRmgxRF
-WS+JFIULo6HkhHUl4THGBod5kdVdN210MW+v4yYIIf3LXTSejHTMaoX4KHiXxaLY
-NOFGKfeVT06NqrVbrXVXVS/FXK2inwE22JiuY0PDbxaFexqdkA7pZ8rgJKASXvCS
-KNS9lg==
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.unifran.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafe.unifran.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.unifran.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cafe.unifran.br/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://cafe.unifran.br/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://cafe.unifran.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">unifran.br</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-      
-MIID8DCCAtgCAQAwDQYJKoZIhvcNAQEFBQAwgb0xKTAnBgNVBAoTIFVOSUZSQU4g
-LSBVbml2ZXJzaWRhZGUgZGUgRnJhbmNhMSYwJAYDVQQLEx1USSAtIFRlY25vbG9n
-aWEgZGEgSW5mb3JtYWNhbzEcMBoGCSqGSIb3DQEJARYNdGlAdW5pZnJhbi5icjEP
-MA0GA1UEBxMGRnJhbmNhMRIwEAYDVQQIEwlTYW8gUGF1bG8xCzAJBgNVBAYTAkJS
-MRgwFgYDVQQDEw9jYWZlLnVuaWZyYW4uYnIwHhcNMTQwNDIzMTk1MTE4WhcNMTkw
-NDIyMTk1MTE4WjCBvTEpMCcGA1UEChMgVU5JRlJBTiAtIFVuaXZlcnNpZGFkZSBk
-ZSBGcmFuY2ExJjAkBgNVBAsTHVRJIC0gVGVjbm9sb2dpYSBkYSBJbmZvcm1hY2Fv
-MRwwGgYJKoZIhvcNAQkBFg10aUB1bmlmcmFuLmJyMQ8wDQYDVQQHEwZGcmFuY2Ex
-EjAQBgNVBAgTCVNhbyBQYXVsbzELMAkGA1UEBhMCQlIxGDAWBgNVBAMTD2NhZmUu
-dW5pZnJhbi5icjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKkqnGsj
-sJuGEO2HQO+byfGIGEvSQFGpWFn8aVT0C/hp9lbkA+KwJQ2frWlQKwF5CgOWw7gK
-9gY4Nm4UBMAQUkQPpzq9uARYEJ3PQr74h/EU8Tpq9+Req3LAYUanFkUjoQW5l/d8
-e0jLd4rZutqcGMJQzy1SeES8LPRYQbLWO4jWhZuoJaR/Wcm1Bir8ugkuLLCh9SbA
-i8tq6ZmWA/POw47YB+oFsd/WxY9HEiHdqb/BQyHa/mgAQtTVl2HzK8qvKT8vrtLW
-oLG+EBSzjxBik+gv94mLQ6dr3TY3wgdWu4V4dcJSdaq3WW4TIuAYTCKFGnpIabUd
-eSBTOpFYX01+UO8CAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAM8bz6vOOM8+NYRfS
-6Abk23tz9pKQXuewaotokabpY5f9dRS6jTtDTJ8dv6GCyCRFkI90p2/YtKbHp5mw
-kCTE4rv25tUv6kCFLvMREH9fLF6k8EwzSI+ijabecmi78+ZyQ+0xs3G6W1kysWz5
-ETrzYQq6QHiUEtAexRUwR7kyqiVbJuKolCQol6Fo4qO0PU++hhdwC6VizSRmgxRF
-WS+JFIULo6HkhHUl4THGBod5kdVdN210MW+v4yYIIf3LXTSejHTMaoX4KHiXxaLY
-NOFGKfeVT06NqrVbrXVXVS/FXK2inwE22JiuY0PDbxaFexqdkA7pZ8rgJKASXvCS
-KNS9lg==
-                    
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.unifran.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafe.unifran.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">UNIFRAN - Universidade de Franca</OrganizationName>
-    <OrganizationName xml:lang="pt-br">UNIFRAN - Universidade de Franca</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">UNIFRAN - Universidade de Franca</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="pt-br">UNIFRAN - Universidade de Franca</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.unifran.br/</OrganizationURL>
-    <OrganizationURL xml:lang="pt-br">http://www.unifran.br/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Gustavo Carrijo</SurName>
-    <EmailAddress>gustavo@unifran.br</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/cafe.unifran.br.xml b/swamid-interfederations-2.0/cafe.unifran.br.xml
deleted file mode 100644
index e3907784..00000000
--- a/swamid-interfederations-2.0/cafe.unifran.br.xml
+++ /dev/null
@@ -1,114 +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.unifran.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">unifran.br</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">UNIFRAN - Universidade de Franca</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="pt-br">UNIFRAN - Universidade de Franca</mdui:DisplayName>
-        <mdui:Description xml:lang="en">UNIFRAN - Universidade de Franca</mdui:Description>
-        <mdui:Description xml:lang="pt-br">UNIFRAN - Universidade de Franca</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.unifran.br/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="pt-br">http://www.unifran.br/</mdui:InformationURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-    MIID8DCCAtgCAQAwDQYJKoZIhvcNAQEFBQAwgb0xKTAnBgNVBAoTIFVOSUZSQU4g
-LSBVbml2ZXJzaWRhZGUgZGUgRnJhbmNhMSYwJAYDVQQLEx1USSAtIFRlY25vbG9n
-aWEgZGEgSW5mb3JtYWNhbzEcMBoGCSqGSIb3DQEJARYNdGlAdW5pZnJhbi5icjEP
-MA0GA1UEBxMGRnJhbmNhMRIwEAYDVQQIEwlTYW8gUGF1bG8xCzAJBgNVBAYTAkJS
-MRgwFgYDVQQDEw9jYWZlLnVuaWZyYW4uYnIwHhcNMTQwNDIzMTk1MTE4WhcNMTkw
-NDIyMTk1MTE4WjCBvTEpMCcGA1UEChMgVU5JRlJBTiAtIFVuaXZlcnNpZGFkZSBk
-ZSBGcmFuY2ExJjAkBgNVBAsTHVRJIC0gVGVjbm9sb2dpYSBkYSBJbmZvcm1hY2Fv
-MRwwGgYJKoZIhvcNAQkBFg10aUB1bmlmcmFuLmJyMQ8wDQYDVQQHEwZGcmFuY2Ex
-EjAQBgNVBAgTCVNhbyBQYXVsbzELMAkGA1UEBhMCQlIxGDAWBgNVBAMTD2NhZmUu
-dW5pZnJhbi5icjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKkqnGsj
-sJuGEO2HQO+byfGIGEvSQFGpWFn8aVT0C/hp9lbkA+KwJQ2frWlQKwF5CgOWw7gK
-9gY4Nm4UBMAQUkQPpzq9uARYEJ3PQr74h/EU8Tpq9+Req3LAYUanFkUjoQW5l/d8
-e0jLd4rZutqcGMJQzy1SeES8LPRYQbLWO4jWhZuoJaR/Wcm1Bir8ugkuLLCh9SbA
-i8tq6ZmWA/POw47YB+oFsd/WxY9HEiHdqb/BQyHa/mgAQtTVl2HzK8qvKT8vrtLW
-oLG+EBSzjxBik+gv94mLQ6dr3TY3wgdWu4V4dcJSdaq3WW4TIuAYTCKFGnpIabUd
-eSBTOpFYX01+UO8CAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAM8bz6vOOM8+NYRfS
-6Abk23tz9pKQXuewaotokabpY5f9dRS6jTtDTJ8dv6GCyCRFkI90p2/YtKbHp5mw
-kCTE4rv25tUv6kCFLvMREH9fLF6k8EwzSI+ijabecmi78+ZyQ+0xs3G6W1kysWz5
-ETrzYQq6QHiUEtAexRUwR7kyqiVbJuKolCQol6Fo4qO0PU++hhdwC6VizSRmgxRF
-WS+JFIULo6HkhHUl4THGBod5kdVdN210MW+v4yYIIf3LXTSejHTMaoX4KHiXxaLY
-NOFGKfeVT06NqrVbrXVXVS/FXK2inwE22JiuY0PDbxaFexqdkA7pZ8rgJKASXvCS
-KNS9lg==
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.unifran.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafe.unifran.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.unifran.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cafe.unifran.br/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://cafe.unifran.br/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://cafe.unifran.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">unifran.br</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-      
-MIID8DCCAtgCAQAwDQYJKoZIhvcNAQEFBQAwgb0xKTAnBgNVBAoTIFVOSUZSQU4g
-LSBVbml2ZXJzaWRhZGUgZGUgRnJhbmNhMSYwJAYDVQQLEx1USSAtIFRlY25vbG9n
-aWEgZGEgSW5mb3JtYWNhbzEcMBoGCSqGSIb3DQEJARYNdGlAdW5pZnJhbi5icjEP
-MA0GA1UEBxMGRnJhbmNhMRIwEAYDVQQIEwlTYW8gUGF1bG8xCzAJBgNVBAYTAkJS
-MRgwFgYDVQQDEw9jYWZlLnVuaWZyYW4uYnIwHhcNMTQwNDIzMTk1MTE4WhcNMTkw
-NDIyMTk1MTE4WjCBvTEpMCcGA1UEChMgVU5JRlJBTiAtIFVuaXZlcnNpZGFkZSBk
-ZSBGcmFuY2ExJjAkBgNVBAsTHVRJIC0gVGVjbm9sb2dpYSBkYSBJbmZvcm1hY2Fv
-MRwwGgYJKoZIhvcNAQkBFg10aUB1bmlmcmFuLmJyMQ8wDQYDVQQHEwZGcmFuY2Ex
-EjAQBgNVBAgTCVNhbyBQYXVsbzELMAkGA1UEBhMCQlIxGDAWBgNVBAMTD2NhZmUu
-dW5pZnJhbi5icjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKkqnGsj
-sJuGEO2HQO+byfGIGEvSQFGpWFn8aVT0C/hp9lbkA+KwJQ2frWlQKwF5CgOWw7gK
-9gY4Nm4UBMAQUkQPpzq9uARYEJ3PQr74h/EU8Tpq9+Req3LAYUanFkUjoQW5l/d8
-e0jLd4rZutqcGMJQzy1SeES8LPRYQbLWO4jWhZuoJaR/Wcm1Bir8ugkuLLCh9SbA
-i8tq6ZmWA/POw47YB+oFsd/WxY9HEiHdqb/BQyHa/mgAQtTVl2HzK8qvKT8vrtLW
-oLG+EBSzjxBik+gv94mLQ6dr3TY3wgdWu4V4dcJSdaq3WW4TIuAYTCKFGnpIabUd
-eSBTOpFYX01+UO8CAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAM8bz6vOOM8+NYRfS
-6Abk23tz9pKQXuewaotokabpY5f9dRS6jTtDTJ8dv6GCyCRFkI90p2/YtKbHp5mw
-kCTE4rv25tUv6kCFLvMREH9fLF6k8EwzSI+ijabecmi78+ZyQ+0xs3G6W1kysWz5
-ETrzYQq6QHiUEtAexRUwR7kyqiVbJuKolCQol6Fo4qO0PU++hhdwC6VizSRmgxRF
-WS+JFIULo6HkhHUl4THGBod5kdVdN210MW+v4yYIIf3LXTSejHTMaoX4KHiXxaLY
-NOFGKfeVT06NqrVbrXVXVS/FXK2inwE22JiuY0PDbxaFexqdkA7pZ8rgJKASXvCS
-KNS9lg==
-                    
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.unifran.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafe.unifran.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">UNIFRAN - Universidade de Franca</OrganizationName>
-    <OrganizationName xml:lang="pt-br">UNIFRAN - Universidade de Franca</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">UNIFRAN - Universidade de Franca</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="pt-br">UNIFRAN - Universidade de Franca</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.unifran.br/</OrganizationURL>
-    <OrganizationURL xml:lang="pt-br">http://www.unifran.br/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Gustavo Carrijo</SurName>
-    <EmailAddress>gustavo@unifran.br</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/cafe.unisc.br-idp-shibboleth.xml b/swamid-interfederations-2.0/cafe.unisc.br-idp-shibboleth.xml
deleted file mode 100644
index 66d7227f..00000000
--- a/swamid-interfederations-2.0/cafe.unisc.br-idp-shibboleth.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.unisc.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">unisc.br</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">UNISC - Universidade de Santa Cruz do Sul</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="pt-br">UNISC - Universidade de Santa Cruz do Sul</mdui:DisplayName>
-        <mdui:Description xml:lang="en">UNISC - Universidade de Santa Cruz do Sul</mdui:Description>
-        <mdui:Description xml:lang="pt-br">UNISC - Universidade de Santa Cruz do Sul</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.unisc.br/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="pt-br">http://www.unisc.br/</mdui:InformationURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-    MIID4DCCAsgCAQAwDQYJKoZIhvcNAQEFBQAwgbUxMjAwBgNVBAoTKVVuaXNjIC0g
-VW5pdmVyc2lkYWRlIGRlIFNhbnRhIENydXogZG8gU3VsMQ0wCwYDVQQLEwRTaW5m
-MRwwGgYJKoZIhvcNAQkBFg1yZWRlQHVuaXNjLmJyMRowGAYDVQQHExFTYW50YSBD
-cnV6IGRvIHN1bDEaMBgGA1UECBMRUmlvIEdyYW5kZSBkbyBTdWwxCzAJBgNVBAYT
-AkJSMQ0wCwYDVQQDEwRjYWZlMB4XDTE0MDQxNzEzMTIyM1oXDTE5MDQxNjEzMTIy
-M1owgbUxMjAwBgNVBAoTKVVuaXNjIC0gVW5pdmVyc2lkYWRlIGRlIFNhbnRhIENy
-dXogZG8gU3VsMQ0wCwYDVQQLEwRTaW5mMRwwGgYJKoZIhvcNAQkBFg1yZWRlQHVu
-aXNjLmJyMRowGAYDVQQHExFTYW50YSBDcnV6IGRvIHN1bDEaMBgGA1UECBMRUmlv
-IEdyYW5kZSBkbyBTdWwxCzAJBgNVBAYTAkJSMQ0wCwYDVQQDEwRjYWZlMIIBIjAN
-BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvEDiskDVSzfG170Jdhxh+TEf+SY6
-wTWP030Gpxy5ZXzBJW4yRDxXwkNICb4zK9dOy7pzCGgZ5Zm278PAXO9LBfy9pdex
-IUUrH5YHpC2Y6pZfasRyfpnqcY0TjW9spgfzGbvWB7js1tMuSUkyXomdHypdqOvh
-7ApHiZyxnSbFrfGKLtovPkx54TRNBPg31hfyiQTwUAM1MKHducLt4RyNiGBs/vVU
-NlEkW4ceIiaf68ETZ1+wsXyxFZszyGFSRR9kS7fPmsNy2MfpNd92RYPYNTWRFKl3
-pnFuqgmwGthMZGUs3zcKQ2z+kzI/fJDYJDn/weEfkyHuqBG48DYedbJ73QIDAQAB
-MA0GCSqGSIb3DQEBBQUAA4IBAQA8U3vYfawqzdWKtXKlFBJDe/cyGt35ZaS3STUp
-uMJCyF5+LHZ0Wg63F7p/rCe2K3I1n4YEOsc7838Egj2SQTBDamk+JkjKkBlXJTeZ
-c/q1x5wFGcYe1cPPWaN9IRomPWV1PBejZGqRAhuE1iU/jMX26OL9ll1UpHa3TFSb
-qgLKYYAOySR6bHBjKyTWhzb+7J19MkWfJlQelwJmMQN2oWhmTyzp24dVCwaRVO16
-7vKl+BQtSYOdanuO0JBC0/91A5GvLH6/O2Dkb0bI18KZPamN+9gBKu14fiK0j+Fp
-nj+u1r3qFps5kydBvlBDl3JOZA34f1F5ZkrjnWjRokMdjiXl
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.unisc.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafe.unisc.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.unisc.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cafe.unisc.br/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://cafe.unisc.br/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://cafe.unisc.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">unisc.br</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-      
-MIID4DCCAsgCAQAwDQYJKoZIhvcNAQEFBQAwgbUxMjAwBgNVBAoTKVVuaXNjIC0g
-VW5pdmVyc2lkYWRlIGRlIFNhbnRhIENydXogZG8gU3VsMQ0wCwYDVQQLEwRTaW5m
-MRwwGgYJKoZIhvcNAQkBFg1yZWRlQHVuaXNjLmJyMRowGAYDVQQHExFTYW50YSBD
-cnV6IGRvIHN1bDEaMBgGA1UECBMRUmlvIEdyYW5kZSBkbyBTdWwxCzAJBgNVBAYT
-AkJSMQ0wCwYDVQQDEwRjYWZlMB4XDTE0MDQxNzEzMTIyM1oXDTE5MDQxNjEzMTIy
-M1owgbUxMjAwBgNVBAoTKVVuaXNjIC0gVW5pdmVyc2lkYWRlIGRlIFNhbnRhIENy
-dXogZG8gU3VsMQ0wCwYDVQQLEwRTaW5mMRwwGgYJKoZIhvcNAQkBFg1yZWRlQHVu
-aXNjLmJyMRowGAYDVQQHExFTYW50YSBDcnV6IGRvIHN1bDEaMBgGA1UECBMRUmlv
-IEdyYW5kZSBkbyBTdWwxCzAJBgNVBAYTAkJSMQ0wCwYDVQQDEwRjYWZlMIIBIjAN
-BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvEDiskDVSzfG170Jdhxh+TEf+SY6
-wTWP030Gpxy5ZXzBJW4yRDxXwkNICb4zK9dOy7pzCGgZ5Zm278PAXO9LBfy9pdex
-IUUrH5YHpC2Y6pZfasRyfpnqcY0TjW9spgfzGbvWB7js1tMuSUkyXomdHypdqOvh
-7ApHiZyxnSbFrfGKLtovPkx54TRNBPg31hfyiQTwUAM1MKHducLt4RyNiGBs/vVU
-NlEkW4ceIiaf68ETZ1+wsXyxFZszyGFSRR9kS7fPmsNy2MfpNd92RYPYNTWRFKl3
-pnFuqgmwGthMZGUs3zcKQ2z+kzI/fJDYJDn/weEfkyHuqBG48DYedbJ73QIDAQAB
-MA0GCSqGSIb3DQEBBQUAA4IBAQA8U3vYfawqzdWKtXKlFBJDe/cyGt35ZaS3STUp
-uMJCyF5+LHZ0Wg63F7p/rCe2K3I1n4YEOsc7838Egj2SQTBDamk+JkjKkBlXJTeZ
-c/q1x5wFGcYe1cPPWaN9IRomPWV1PBejZGqRAhuE1iU/jMX26OL9ll1UpHa3TFSb
-qgLKYYAOySR6bHBjKyTWhzb+7J19MkWfJlQelwJmMQN2oWhmTyzp24dVCwaRVO16
-7vKl+BQtSYOdanuO0JBC0/91A5GvLH6/O2Dkb0bI18KZPamN+9gBKu14fiK0j+Fp
-nj+u1r3qFps5kydBvlBDl3JOZA34f1F5ZkrjnWjRokMdjiXl
-                    
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.unisc.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafe.unisc.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">UNISC - Universidade de Santa Cruz do Sul</OrganizationName>
-    <OrganizationName xml:lang="pt-br">UNISC - Universidade de Santa Cruz do Sul</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">UNISC - Universidade de Santa Cruz do Sul</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="pt-br">UNISC - Universidade de Santa Cruz do Sul</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.unisc.br/</OrganizationURL>
-    <OrganizationURL xml:lang="pt-br">http://www.unisc.br/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Cristiano Maynart</SurName>
-    <EmailAddress>rede@unisc.br</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/cafe.unisc.br.xml b/swamid-interfederations-2.0/cafe.unisc.br.xml
deleted file mode 100644
index 66d7227f..00000000
--- a/swamid-interfederations-2.0/cafe.unisc.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.unisc.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">unisc.br</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">UNISC - Universidade de Santa Cruz do Sul</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="pt-br">UNISC - Universidade de Santa Cruz do Sul</mdui:DisplayName>
-        <mdui:Description xml:lang="en">UNISC - Universidade de Santa Cruz do Sul</mdui:Description>
-        <mdui:Description xml:lang="pt-br">UNISC - Universidade de Santa Cruz do Sul</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.unisc.br/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="pt-br">http://www.unisc.br/</mdui:InformationURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-    MIID4DCCAsgCAQAwDQYJKoZIhvcNAQEFBQAwgbUxMjAwBgNVBAoTKVVuaXNjIC0g
-VW5pdmVyc2lkYWRlIGRlIFNhbnRhIENydXogZG8gU3VsMQ0wCwYDVQQLEwRTaW5m
-MRwwGgYJKoZIhvcNAQkBFg1yZWRlQHVuaXNjLmJyMRowGAYDVQQHExFTYW50YSBD
-cnV6IGRvIHN1bDEaMBgGA1UECBMRUmlvIEdyYW5kZSBkbyBTdWwxCzAJBgNVBAYT
-AkJSMQ0wCwYDVQQDEwRjYWZlMB4XDTE0MDQxNzEzMTIyM1oXDTE5MDQxNjEzMTIy
-M1owgbUxMjAwBgNVBAoTKVVuaXNjIC0gVW5pdmVyc2lkYWRlIGRlIFNhbnRhIENy
-dXogZG8gU3VsMQ0wCwYDVQQLEwRTaW5mMRwwGgYJKoZIhvcNAQkBFg1yZWRlQHVu
-aXNjLmJyMRowGAYDVQQHExFTYW50YSBDcnV6IGRvIHN1bDEaMBgGA1UECBMRUmlv
-IEdyYW5kZSBkbyBTdWwxCzAJBgNVBAYTAkJSMQ0wCwYDVQQDEwRjYWZlMIIBIjAN
-BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvEDiskDVSzfG170Jdhxh+TEf+SY6
-wTWP030Gpxy5ZXzBJW4yRDxXwkNICb4zK9dOy7pzCGgZ5Zm278PAXO9LBfy9pdex
-IUUrH5YHpC2Y6pZfasRyfpnqcY0TjW9spgfzGbvWB7js1tMuSUkyXomdHypdqOvh
-7ApHiZyxnSbFrfGKLtovPkx54TRNBPg31hfyiQTwUAM1MKHducLt4RyNiGBs/vVU
-NlEkW4ceIiaf68ETZ1+wsXyxFZszyGFSRR9kS7fPmsNy2MfpNd92RYPYNTWRFKl3
-pnFuqgmwGthMZGUs3zcKQ2z+kzI/fJDYJDn/weEfkyHuqBG48DYedbJ73QIDAQAB
-MA0GCSqGSIb3DQEBBQUAA4IBAQA8U3vYfawqzdWKtXKlFBJDe/cyGt35ZaS3STUp
-uMJCyF5+LHZ0Wg63F7p/rCe2K3I1n4YEOsc7838Egj2SQTBDamk+JkjKkBlXJTeZ
-c/q1x5wFGcYe1cPPWaN9IRomPWV1PBejZGqRAhuE1iU/jMX26OL9ll1UpHa3TFSb
-qgLKYYAOySR6bHBjKyTWhzb+7J19MkWfJlQelwJmMQN2oWhmTyzp24dVCwaRVO16
-7vKl+BQtSYOdanuO0JBC0/91A5GvLH6/O2Dkb0bI18KZPamN+9gBKu14fiK0j+Fp
-nj+u1r3qFps5kydBvlBDl3JOZA34f1F5ZkrjnWjRokMdjiXl
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.unisc.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafe.unisc.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.unisc.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cafe.unisc.br/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://cafe.unisc.br/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://cafe.unisc.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">unisc.br</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-      
-MIID4DCCAsgCAQAwDQYJKoZIhvcNAQEFBQAwgbUxMjAwBgNVBAoTKVVuaXNjIC0g
-VW5pdmVyc2lkYWRlIGRlIFNhbnRhIENydXogZG8gU3VsMQ0wCwYDVQQLEwRTaW5m
-MRwwGgYJKoZIhvcNAQkBFg1yZWRlQHVuaXNjLmJyMRowGAYDVQQHExFTYW50YSBD
-cnV6IGRvIHN1bDEaMBgGA1UECBMRUmlvIEdyYW5kZSBkbyBTdWwxCzAJBgNVBAYT
-AkJSMQ0wCwYDVQQDEwRjYWZlMB4XDTE0MDQxNzEzMTIyM1oXDTE5MDQxNjEzMTIy
-M1owgbUxMjAwBgNVBAoTKVVuaXNjIC0gVW5pdmVyc2lkYWRlIGRlIFNhbnRhIENy
-dXogZG8gU3VsMQ0wCwYDVQQLEwRTaW5mMRwwGgYJKoZIhvcNAQkBFg1yZWRlQHVu
-aXNjLmJyMRowGAYDVQQHExFTYW50YSBDcnV6IGRvIHN1bDEaMBgGA1UECBMRUmlv
-IEdyYW5kZSBkbyBTdWwxCzAJBgNVBAYTAkJSMQ0wCwYDVQQDEwRjYWZlMIIBIjAN
-BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvEDiskDVSzfG170Jdhxh+TEf+SY6
-wTWP030Gpxy5ZXzBJW4yRDxXwkNICb4zK9dOy7pzCGgZ5Zm278PAXO9LBfy9pdex
-IUUrH5YHpC2Y6pZfasRyfpnqcY0TjW9spgfzGbvWB7js1tMuSUkyXomdHypdqOvh
-7ApHiZyxnSbFrfGKLtovPkx54TRNBPg31hfyiQTwUAM1MKHducLt4RyNiGBs/vVU
-NlEkW4ceIiaf68ETZ1+wsXyxFZszyGFSRR9kS7fPmsNy2MfpNd92RYPYNTWRFKl3
-pnFuqgmwGthMZGUs3zcKQ2z+kzI/fJDYJDn/weEfkyHuqBG48DYedbJ73QIDAQAB
-MA0GCSqGSIb3DQEBBQUAA4IBAQA8U3vYfawqzdWKtXKlFBJDe/cyGt35ZaS3STUp
-uMJCyF5+LHZ0Wg63F7p/rCe2K3I1n4YEOsc7838Egj2SQTBDamk+JkjKkBlXJTeZ
-c/q1x5wFGcYe1cPPWaN9IRomPWV1PBejZGqRAhuE1iU/jMX26OL9ll1UpHa3TFSb
-qgLKYYAOySR6bHBjKyTWhzb+7J19MkWfJlQelwJmMQN2oWhmTyzp24dVCwaRVO16
-7vKl+BQtSYOdanuO0JBC0/91A5GvLH6/O2Dkb0bI18KZPamN+9gBKu14fiK0j+Fp
-nj+u1r3qFps5kydBvlBDl3JOZA34f1F5ZkrjnWjRokMdjiXl
-                    
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.unisc.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafe.unisc.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">UNISC - Universidade de Santa Cruz do Sul</OrganizationName>
-    <OrganizationName xml:lang="pt-br">UNISC - Universidade de Santa Cruz do Sul</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">UNISC - Universidade de Santa Cruz do Sul</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="pt-br">UNISC - Universidade de Santa Cruz do Sul</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.unisc.br/</OrganizationURL>
-    <OrganizationURL xml:lang="pt-br">http://www.unisc.br/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Cristiano Maynart</SurName>
-    <EmailAddress>rede@unisc.br</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/cafe.upf.br-idp-shibboleth.xml b/swamid-interfederations-2.0/cafe.upf.br-idp-shibboleth.xml
deleted file mode 100644
index 5717c51b..00000000
--- a/swamid-interfederations-2.0/cafe.upf.br-idp-shibboleth.xml
+++ /dev/null
@@ -1,105 +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.upf.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">upf.br</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">UPF - Universidade de Passo Fundo</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="pt-br">UPF - Universidade de Passo Fundo</mdui:DisplayName>
-        <mdui:Description xml:lang="en">UPF - Universidade de Passo Fundo</mdui:Description>
-        <mdui:Description xml:lang="pt-br">UPF - Universidade de Passo Fundo</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.upf.br/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="pt-br">http://www.upf.br/</mdui:InformationURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-    MIIDGDCCAgCgAwIBAgIVAKX43u2xOk6GZiZYCBjCZkKXx2/9MA0GCSqGSIb3DQEB
-BQUAMBYxFDASBgNVBAMTC2NhZmUudXBmLmJyMB4XDTEyMDcxODEzMzMwMFoXDTMy
-MDcxODEzMzMwMFowFjEUMBIGA1UEAxMLY2FmZS51cGYuYnIwggEiMA0GCSqGSIb3
-DQEBAQUAA4IBDwAwggEKAoIBAQDQ4M1p+I5ah6Aw+O5/z9Be++lnk9Vs/F1rXbKj
-tP4ZLt+1ubEXIstFvgYbaQegfjGCmbSTLjeAhoKqQa+9oqHztvJCyi8tAAxm+DkR
-YUVjK7jdg+WhLSIXXjUw8kLQ7/0j9WoR5kANYpb0zgLX5txa6ag0yuiy3SZJdem5
-OxWcRMIgM9IT93D0Vtn4KOy33LuT1nJnlfXRe0e/6Uk3io8eX/sU1bFbYGSIoaBC
-wavXQpYI6doyMwp6jQ0ZTHMgPveJ9RgJVI1UjxPNarlfpkD3tbBoMW6jKzysuNza
-fdE/zhufAdpf1dEJLvW6NqFQhV/IntZ9uikpaZb0qYfccb+FAgMBAAGjXTBbMDoG
-A1UdEQQzMDGCC2NhZmUudXBmLmJyhiJodHRwczovL2NhZmUudXBmLmJyL2lkcC9z
-aGliYm9sZXRoMB0GA1UdDgQWBBQzZ13hyDuXco93Ne8aOzsxQ7pkVDANBgkqhkiG
-9w0BAQUFAAOCAQEAxN0o+TiTOnQ9DyT3sLjL7t08L2DXXzZS808wUPm9gxAxaKBy
-RP6v52aY5JQl+5KDp4kcYWcJ2HbmY93pdJr/ySf38ZnfDhE8/VtxTPN8i8flLpo6
-hAXpIVHrpchg/6A6wG94q2hoJHJlkjdMAUaqRluRVqUf3LCh9z0L2JYggLMO8t4i
-dZva6wWLqVLrj290MtPM6VyBwky4PyopG92JhFkovN6fO+N0XBOXO95k7vRhXHMq
-Q7lzc5HBe7iHhhH8bMVnNU4rnC5y/mAtB8RlGKu9xkgHFzxpk+Rf8ZvvI6hdpmCD
-CiIzIL92AYqWu+1Ec6sT4NbrfVhJlpfh0jshog==
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.upf.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafe.upf.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.upf.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cafe.upf.br/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://cafe.upf.br/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://cafe.upf.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">upf.br</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-      
-MIIDGDCCAgCgAwIBAgIVAKX43u2xOk6GZiZYCBjCZkKXx2/9MA0GCSqGSIb3DQEB
-BQUAMBYxFDASBgNVBAMTC2NhZmUudXBmLmJyMB4XDTEyMDcxODEzMzMwMFoXDTMy
-MDcxODEzMzMwMFowFjEUMBIGA1UEAxMLY2FmZS51cGYuYnIwggEiMA0GCSqGSIb3
-DQEBAQUAA4IBDwAwggEKAoIBAQDQ4M1p+I5ah6Aw+O5/z9Be++lnk9Vs/F1rXbKj
-tP4ZLt+1ubEXIstFvgYbaQegfjGCmbSTLjeAhoKqQa+9oqHztvJCyi8tAAxm+DkR
-YUVjK7jdg+WhLSIXXjUw8kLQ7/0j9WoR5kANYpb0zgLX5txa6ag0yuiy3SZJdem5
-OxWcRMIgM9IT93D0Vtn4KOy33LuT1nJnlfXRe0e/6Uk3io8eX/sU1bFbYGSIoaBC
-wavXQpYI6doyMwp6jQ0ZTHMgPveJ9RgJVI1UjxPNarlfpkD3tbBoMW6jKzysuNza
-fdE/zhufAdpf1dEJLvW6NqFQhV/IntZ9uikpaZb0qYfccb+FAgMBAAGjXTBbMDoG
-A1UdEQQzMDGCC2NhZmUudXBmLmJyhiJodHRwczovL2NhZmUudXBmLmJyL2lkcC9z
-aGliYm9sZXRoMB0GA1UdDgQWBBQzZ13hyDuXco93Ne8aOzsxQ7pkVDANBgkqhkiG
-9w0BAQUFAAOCAQEAxN0o+TiTOnQ9DyT3sLjL7t08L2DXXzZS808wUPm9gxAxaKBy
-RP6v52aY5JQl+5KDp4kcYWcJ2HbmY93pdJr/ySf38ZnfDhE8/VtxTPN8i8flLpo6
-hAXpIVHrpchg/6A6wG94q2hoJHJlkjdMAUaqRluRVqUf3LCh9z0L2JYggLMO8t4i
-dZva6wWLqVLrj290MtPM6VyBwky4PyopG92JhFkovN6fO+N0XBOXO95k7vRhXHMq
-Q7lzc5HBe7iHhhH8bMVnNU4rnC5y/mAtB8RlGKu9xkgHFzxpk+Rf8ZvvI6hdpmCD
-CiIzIL92AYqWu+1Ec6sT4NbrfVhJlpfh0jshog==
-
-                    
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.upf.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafe.upf.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">UPF - Universidade de Passo Fundo</OrganizationName>
-    <OrganizationName xml:lang="pt-br">UPF - Universidade de Passo Fundo</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">UPF - Universidade de Passo Fundo</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="pt-br">UPF - Universidade de Passo Fundo</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.upf.br/</OrganizationURL>
-    <OrganizationURL xml:lang="pt-br">http://www.upf.br/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>GTI/RNP</SurName>
-    <EmailAddress>servnac@rnp.br</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/cafe.upf.br.xml b/swamid-interfederations-2.0/cafe.upf.br.xml
deleted file mode 100644
index 5717c51b..00000000
--- a/swamid-interfederations-2.0/cafe.upf.br.xml
+++ /dev/null
@@ -1,105 +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.upf.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">upf.br</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">UPF - Universidade de Passo Fundo</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="pt-br">UPF - Universidade de Passo Fundo</mdui:DisplayName>
-        <mdui:Description xml:lang="en">UPF - Universidade de Passo Fundo</mdui:Description>
-        <mdui:Description xml:lang="pt-br">UPF - Universidade de Passo Fundo</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.upf.br/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="pt-br">http://www.upf.br/</mdui:InformationURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-    MIIDGDCCAgCgAwIBAgIVAKX43u2xOk6GZiZYCBjCZkKXx2/9MA0GCSqGSIb3DQEB
-BQUAMBYxFDASBgNVBAMTC2NhZmUudXBmLmJyMB4XDTEyMDcxODEzMzMwMFoXDTMy
-MDcxODEzMzMwMFowFjEUMBIGA1UEAxMLY2FmZS51cGYuYnIwggEiMA0GCSqGSIb3
-DQEBAQUAA4IBDwAwggEKAoIBAQDQ4M1p+I5ah6Aw+O5/z9Be++lnk9Vs/F1rXbKj
-tP4ZLt+1ubEXIstFvgYbaQegfjGCmbSTLjeAhoKqQa+9oqHztvJCyi8tAAxm+DkR
-YUVjK7jdg+WhLSIXXjUw8kLQ7/0j9WoR5kANYpb0zgLX5txa6ag0yuiy3SZJdem5
-OxWcRMIgM9IT93D0Vtn4KOy33LuT1nJnlfXRe0e/6Uk3io8eX/sU1bFbYGSIoaBC
-wavXQpYI6doyMwp6jQ0ZTHMgPveJ9RgJVI1UjxPNarlfpkD3tbBoMW6jKzysuNza
-fdE/zhufAdpf1dEJLvW6NqFQhV/IntZ9uikpaZb0qYfccb+FAgMBAAGjXTBbMDoG
-A1UdEQQzMDGCC2NhZmUudXBmLmJyhiJodHRwczovL2NhZmUudXBmLmJyL2lkcC9z
-aGliYm9sZXRoMB0GA1UdDgQWBBQzZ13hyDuXco93Ne8aOzsxQ7pkVDANBgkqhkiG
-9w0BAQUFAAOCAQEAxN0o+TiTOnQ9DyT3sLjL7t08L2DXXzZS808wUPm9gxAxaKBy
-RP6v52aY5JQl+5KDp4kcYWcJ2HbmY93pdJr/ySf38ZnfDhE8/VtxTPN8i8flLpo6
-hAXpIVHrpchg/6A6wG94q2hoJHJlkjdMAUaqRluRVqUf3LCh9z0L2JYggLMO8t4i
-dZva6wWLqVLrj290MtPM6VyBwky4PyopG92JhFkovN6fO+N0XBOXO95k7vRhXHMq
-Q7lzc5HBe7iHhhH8bMVnNU4rnC5y/mAtB8RlGKu9xkgHFzxpk+Rf8ZvvI6hdpmCD
-CiIzIL92AYqWu+1Ec6sT4NbrfVhJlpfh0jshog==
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.upf.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafe.upf.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.upf.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cafe.upf.br/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://cafe.upf.br/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://cafe.upf.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">upf.br</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-      
-MIIDGDCCAgCgAwIBAgIVAKX43u2xOk6GZiZYCBjCZkKXx2/9MA0GCSqGSIb3DQEB
-BQUAMBYxFDASBgNVBAMTC2NhZmUudXBmLmJyMB4XDTEyMDcxODEzMzMwMFoXDTMy
-MDcxODEzMzMwMFowFjEUMBIGA1UEAxMLY2FmZS51cGYuYnIwggEiMA0GCSqGSIb3
-DQEBAQUAA4IBDwAwggEKAoIBAQDQ4M1p+I5ah6Aw+O5/z9Be++lnk9Vs/F1rXbKj
-tP4ZLt+1ubEXIstFvgYbaQegfjGCmbSTLjeAhoKqQa+9oqHztvJCyi8tAAxm+DkR
-YUVjK7jdg+WhLSIXXjUw8kLQ7/0j9WoR5kANYpb0zgLX5txa6ag0yuiy3SZJdem5
-OxWcRMIgM9IT93D0Vtn4KOy33LuT1nJnlfXRe0e/6Uk3io8eX/sU1bFbYGSIoaBC
-wavXQpYI6doyMwp6jQ0ZTHMgPveJ9RgJVI1UjxPNarlfpkD3tbBoMW6jKzysuNza
-fdE/zhufAdpf1dEJLvW6NqFQhV/IntZ9uikpaZb0qYfccb+FAgMBAAGjXTBbMDoG
-A1UdEQQzMDGCC2NhZmUudXBmLmJyhiJodHRwczovL2NhZmUudXBmLmJyL2lkcC9z
-aGliYm9sZXRoMB0GA1UdDgQWBBQzZ13hyDuXco93Ne8aOzsxQ7pkVDANBgkqhkiG
-9w0BAQUFAAOCAQEAxN0o+TiTOnQ9DyT3sLjL7t08L2DXXzZS808wUPm9gxAxaKBy
-RP6v52aY5JQl+5KDp4kcYWcJ2HbmY93pdJr/ySf38ZnfDhE8/VtxTPN8i8flLpo6
-hAXpIVHrpchg/6A6wG94q2hoJHJlkjdMAUaqRluRVqUf3LCh9z0L2JYggLMO8t4i
-dZva6wWLqVLrj290MtPM6VyBwky4PyopG92JhFkovN6fO+N0XBOXO95k7vRhXHMq
-Q7lzc5HBe7iHhhH8bMVnNU4rnC5y/mAtB8RlGKu9xkgHFzxpk+Rf8ZvvI6hdpmCD
-CiIzIL92AYqWu+1Ec6sT4NbrfVhJlpfh0jshog==
-
-                    
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.upf.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafe.upf.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">UPF - Universidade de Passo Fundo</OrganizationName>
-    <OrganizationName xml:lang="pt-br">UPF - Universidade de Passo Fundo</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">UPF - Universidade de Passo Fundo</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="pt-br">UPF - Universidade de Passo Fundo</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.upf.br/</OrganizationURL>
-    <OrganizationURL xml:lang="pt-br">http://www.upf.br/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>GTI/RNP</SurName>
-    <EmailAddress>servnac@rnp.br</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/cafe.uscs.edu.br-idp-shibboleth.xml b/swamid-interfederations-2.0/cafe.uscs.edu.br-idp-shibboleth.xml
deleted file mode 100644
index d0810370..00000000
--- a/swamid-interfederations-2.0/cafe.uscs.edu.br-idp-shibboleth.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.uscs.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">uscs.edu.br</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">USCS - Universidade Municipal de Sao Caetano do Sul</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="pt-br">USCS - Universidade Municipal de Sao Caetano do Sul</mdui:DisplayName>
-        <mdui:Description xml:lang="en">USCS - Universidade Municipal de Sao Caetano do Sul</mdui:Description>
-        <mdui:Description xml:lang="pt-br">USCS - Universidade Municipal de Sao Caetano do Sul</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.uscs.edu.br/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="pt-br">http://www.uscs.edu.br/</mdui:InformationURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-    MIIDzjCCArYCAQAwDQYJKoZIhvcNAQEFBQAwgawxPTA7BgNVBAoUNFVTQ1MgLSBV
-bml2ZXJzaWRhZGUgTXVuaWNpcGFsIGRlIFPDo28gQ2FldGFubyBkbyBTdWwxHDAa
-BgNVBAsTE0RlcGFydGFtZW50byBkZSBUSUMxHDAaBgNVBAcUE1PDo28gQ2FldGFu
-byBkbyBTdWwxEzARBgNVBAgUClPDo28gUGF1bG8xCzAJBgNVBAYTAkJSMQ0wCwYD
-VQQDEwRjYWZlMB4XDTE0MDQyMzEyMjkwOVoXDTE5MDQyMjEyMjkwOVowgawxPTA7
-BgNVBAoUNFVTQ1MgLSBVbml2ZXJzaWRhZGUgTXVuaWNpcGFsIGRlIFPDo28gQ2Fl
-dGFubyBkbyBTdWwxHDAaBgNVBAsTE0RlcGFydGFtZW50byBkZSBUSUMxHDAaBgNV
-BAcUE1PDo28gQ2FldGFubyBkbyBTdWwxEzARBgNVBAgUClPDo28gUGF1bG8xCzAJ
-BgNVBAYTAkJSMQ0wCwYDVQQDEwRjYWZlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
-MIIBCgKCAQEAnMgoOOS1q469sjuekkG6hOjIo0N0JLw+RFj20LasNRbdxpGNmlUu
-EO7/tXNMWs78BTtONVF9buyTZMOKUB2+Tw5qiZQ5w2y6B4quFS1zDv+jb361ZRhw
-/YHr17DZqYevPZfoIsMyr8PeXxGvpZvXIRxRWixFYXK6cSzxjZabK/HalaChWsok
-abWJvmtk3RUaNFDUg7m5fdysgCmMu1tXTIUqcCigHKvjIAi9VvUoTqs1sCFT916M
-PcORbfc+FpbNYbM+wW8nIJcwXTI94GhWiR1jJ4P8JfNRusbF6oaCOZe6WHIaysRN
-nuUwed10kYrBjIeh0+gH6WrvGi09VCbvFwIDAQABMA0GCSqGSIb3DQEBBQUAA4IB
-AQBEI/TESsgFK6AN0nrNrdcnqoGCf0P3yS1THvE0Q48I0RRCows+U07LTj+W4sm6
-sN9bM16I1nIwZPWSbBB49L0+JkJHkmUAId8vamN1qHG5hjU13HaIY6g2PSZNYM61
-4nL8Hf18QK/WD5etufceyiqTWImfFPq3/6bUEeZCCIcW9gnY2GjOC9a8hhWu9GV0
-9id1ZjXEhJYRnD4N42qPDTc6I9QtnbDJo5QN7+BEB7dFZ9x/WsZWk5B9Na5r69d5
-DsvS7Z5Hdoz1fHcgr6M82y0DzBOCJYFv37NBx/o8iQ/0AeWPGP75Al9b3qzAzQmS
-QEjzHAKqUpXAKTtGQ1Gp7AIE
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.uscs.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.uscs.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.uscs.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cafe.uscs.edu.br/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://cafe.uscs.edu.br/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://cafe.uscs.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">uscs.edu.br</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-      
-MIIDzjCCArYCAQAwDQYJKoZIhvcNAQEFBQAwgawxPTA7BgNVBAoUNFVTQ1MgLSBV
-bml2ZXJzaWRhZGUgTXVuaWNpcGFsIGRlIFPDo28gQ2FldGFubyBkbyBTdWwxHDAa
-BgNVBAsTE0RlcGFydGFtZW50byBkZSBUSUMxHDAaBgNVBAcUE1PDo28gQ2FldGFu
-byBkbyBTdWwxEzARBgNVBAgUClPDo28gUGF1bG8xCzAJBgNVBAYTAkJSMQ0wCwYD
-VQQDEwRjYWZlMB4XDTE0MDQyMzEyMjkwOVoXDTE5MDQyMjEyMjkwOVowgawxPTA7
-BgNVBAoUNFVTQ1MgLSBVbml2ZXJzaWRhZGUgTXVuaWNpcGFsIGRlIFPDo28gQ2Fl
-dGFubyBkbyBTdWwxHDAaBgNVBAsTE0RlcGFydGFtZW50byBkZSBUSUMxHDAaBgNV
-BAcUE1PDo28gQ2FldGFubyBkbyBTdWwxEzARBgNVBAgUClPDo28gUGF1bG8xCzAJ
-BgNVBAYTAkJSMQ0wCwYDVQQDEwRjYWZlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
-MIIBCgKCAQEAnMgoOOS1q469sjuekkG6hOjIo0N0JLw+RFj20LasNRbdxpGNmlUu
-EO7/tXNMWs78BTtONVF9buyTZMOKUB2+Tw5qiZQ5w2y6B4quFS1zDv+jb361ZRhw
-/YHr17DZqYevPZfoIsMyr8PeXxGvpZvXIRxRWixFYXK6cSzxjZabK/HalaChWsok
-abWJvmtk3RUaNFDUg7m5fdysgCmMu1tXTIUqcCigHKvjIAi9VvUoTqs1sCFT916M
-PcORbfc+FpbNYbM+wW8nIJcwXTI94GhWiR1jJ4P8JfNRusbF6oaCOZe6WHIaysRN
-nuUwed10kYrBjIeh0+gH6WrvGi09VCbvFwIDAQABMA0GCSqGSIb3DQEBBQUAA4IB
-AQBEI/TESsgFK6AN0nrNrdcnqoGCf0P3yS1THvE0Q48I0RRCows+U07LTj+W4sm6
-sN9bM16I1nIwZPWSbBB49L0+JkJHkmUAId8vamN1qHG5hjU13HaIY6g2PSZNYM61
-4nL8Hf18QK/WD5etufceyiqTWImfFPq3/6bUEeZCCIcW9gnY2GjOC9a8hhWu9GV0
-9id1ZjXEhJYRnD4N42qPDTc6I9QtnbDJo5QN7+BEB7dFZ9x/WsZWk5B9Na5r69d5
-DsvS7Z5Hdoz1fHcgr6M82y0DzBOCJYFv37NBx/o8iQ/0AeWPGP75Al9b3qzAzQmS
-QEjzHAKqUpXAKTtGQ1Gp7AIE
-					
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.uscs.edu.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafe.uscs.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">USCS - Universidade Municipal de Sao Caetano do Sul</OrganizationName>
-    <OrganizationName xml:lang="pt-br">USCS - Universidade Municipal de Sao Caetano do Sul</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">USCS - Universidade Municipal de Sao Caetano do Sul</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="pt-br">USCS - Universidade Municipal de Sao Caetano do Sul</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.uscs.edu.br/</OrganizationURL>
-    <OrganizationURL xml:lang="pt-br">http://www.uscs.edu.br/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Eduardo dos Santos</SurName>
-    <EmailAddress>eduardo@uscs.edu.br</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/cafe.uscs.edu.br.xml b/swamid-interfederations-2.0/cafe.uscs.edu.br.xml
deleted file mode 100644
index d0810370..00000000
--- a/swamid-interfederations-2.0/cafe.uscs.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.uscs.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">uscs.edu.br</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">USCS - Universidade Municipal de Sao Caetano do Sul</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="pt-br">USCS - Universidade Municipal de Sao Caetano do Sul</mdui:DisplayName>
-        <mdui:Description xml:lang="en">USCS - Universidade Municipal de Sao Caetano do Sul</mdui:Description>
-        <mdui:Description xml:lang="pt-br">USCS - Universidade Municipal de Sao Caetano do Sul</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.uscs.edu.br/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="pt-br">http://www.uscs.edu.br/</mdui:InformationURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-    MIIDzjCCArYCAQAwDQYJKoZIhvcNAQEFBQAwgawxPTA7BgNVBAoUNFVTQ1MgLSBV
-bml2ZXJzaWRhZGUgTXVuaWNpcGFsIGRlIFPDo28gQ2FldGFubyBkbyBTdWwxHDAa
-BgNVBAsTE0RlcGFydGFtZW50byBkZSBUSUMxHDAaBgNVBAcUE1PDo28gQ2FldGFu
-byBkbyBTdWwxEzARBgNVBAgUClPDo28gUGF1bG8xCzAJBgNVBAYTAkJSMQ0wCwYD
-VQQDEwRjYWZlMB4XDTE0MDQyMzEyMjkwOVoXDTE5MDQyMjEyMjkwOVowgawxPTA7
-BgNVBAoUNFVTQ1MgLSBVbml2ZXJzaWRhZGUgTXVuaWNpcGFsIGRlIFPDo28gQ2Fl
-dGFubyBkbyBTdWwxHDAaBgNVBAsTE0RlcGFydGFtZW50byBkZSBUSUMxHDAaBgNV
-BAcUE1PDo28gQ2FldGFubyBkbyBTdWwxEzARBgNVBAgUClPDo28gUGF1bG8xCzAJ
-BgNVBAYTAkJSMQ0wCwYDVQQDEwRjYWZlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
-MIIBCgKCAQEAnMgoOOS1q469sjuekkG6hOjIo0N0JLw+RFj20LasNRbdxpGNmlUu
-EO7/tXNMWs78BTtONVF9buyTZMOKUB2+Tw5qiZQ5w2y6B4quFS1zDv+jb361ZRhw
-/YHr17DZqYevPZfoIsMyr8PeXxGvpZvXIRxRWixFYXK6cSzxjZabK/HalaChWsok
-abWJvmtk3RUaNFDUg7m5fdysgCmMu1tXTIUqcCigHKvjIAi9VvUoTqs1sCFT916M
-PcORbfc+FpbNYbM+wW8nIJcwXTI94GhWiR1jJ4P8JfNRusbF6oaCOZe6WHIaysRN
-nuUwed10kYrBjIeh0+gH6WrvGi09VCbvFwIDAQABMA0GCSqGSIb3DQEBBQUAA4IB
-AQBEI/TESsgFK6AN0nrNrdcnqoGCf0P3yS1THvE0Q48I0RRCows+U07LTj+W4sm6
-sN9bM16I1nIwZPWSbBB49L0+JkJHkmUAId8vamN1qHG5hjU13HaIY6g2PSZNYM61
-4nL8Hf18QK/WD5etufceyiqTWImfFPq3/6bUEeZCCIcW9gnY2GjOC9a8hhWu9GV0
-9id1ZjXEhJYRnD4N42qPDTc6I9QtnbDJo5QN7+BEB7dFZ9x/WsZWk5B9Na5r69d5
-DsvS7Z5Hdoz1fHcgr6M82y0DzBOCJYFv37NBx/o8iQ/0AeWPGP75Al9b3qzAzQmS
-QEjzHAKqUpXAKTtGQ1Gp7AIE
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.uscs.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.uscs.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.uscs.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cafe.uscs.edu.br/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://cafe.uscs.edu.br/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://cafe.uscs.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">uscs.edu.br</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-      
-MIIDzjCCArYCAQAwDQYJKoZIhvcNAQEFBQAwgawxPTA7BgNVBAoUNFVTQ1MgLSBV
-bml2ZXJzaWRhZGUgTXVuaWNpcGFsIGRlIFPDo28gQ2FldGFubyBkbyBTdWwxHDAa
-BgNVBAsTE0RlcGFydGFtZW50byBkZSBUSUMxHDAaBgNVBAcUE1PDo28gQ2FldGFu
-byBkbyBTdWwxEzARBgNVBAgUClPDo28gUGF1bG8xCzAJBgNVBAYTAkJSMQ0wCwYD
-VQQDEwRjYWZlMB4XDTE0MDQyMzEyMjkwOVoXDTE5MDQyMjEyMjkwOVowgawxPTA7
-BgNVBAoUNFVTQ1MgLSBVbml2ZXJzaWRhZGUgTXVuaWNpcGFsIGRlIFPDo28gQ2Fl
-dGFubyBkbyBTdWwxHDAaBgNVBAsTE0RlcGFydGFtZW50byBkZSBUSUMxHDAaBgNV
-BAcUE1PDo28gQ2FldGFubyBkbyBTdWwxEzARBgNVBAgUClPDo28gUGF1bG8xCzAJ
-BgNVBAYTAkJSMQ0wCwYDVQQDEwRjYWZlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
-MIIBCgKCAQEAnMgoOOS1q469sjuekkG6hOjIo0N0JLw+RFj20LasNRbdxpGNmlUu
-EO7/tXNMWs78BTtONVF9buyTZMOKUB2+Tw5qiZQ5w2y6B4quFS1zDv+jb361ZRhw
-/YHr17DZqYevPZfoIsMyr8PeXxGvpZvXIRxRWixFYXK6cSzxjZabK/HalaChWsok
-abWJvmtk3RUaNFDUg7m5fdysgCmMu1tXTIUqcCigHKvjIAi9VvUoTqs1sCFT916M
-PcORbfc+FpbNYbM+wW8nIJcwXTI94GhWiR1jJ4P8JfNRusbF6oaCOZe6WHIaysRN
-nuUwed10kYrBjIeh0+gH6WrvGi09VCbvFwIDAQABMA0GCSqGSIb3DQEBBQUAA4IB
-AQBEI/TESsgFK6AN0nrNrdcnqoGCf0P3yS1THvE0Q48I0RRCows+U07LTj+W4sm6
-sN9bM16I1nIwZPWSbBB49L0+JkJHkmUAId8vamN1qHG5hjU13HaIY6g2PSZNYM61
-4nL8Hf18QK/WD5etufceyiqTWImfFPq3/6bUEeZCCIcW9gnY2GjOC9a8hhWu9GV0
-9id1ZjXEhJYRnD4N42qPDTc6I9QtnbDJo5QN7+BEB7dFZ9x/WsZWk5B9Na5r69d5
-DsvS7Z5Hdoz1fHcgr6M82y0DzBOCJYFv37NBx/o8iQ/0AeWPGP75Al9b3qzAzQmS
-QEjzHAKqUpXAKTtGQ1Gp7AIE
-					
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.uscs.edu.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafe.uscs.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">USCS - Universidade Municipal de Sao Caetano do Sul</OrganizationName>
-    <OrganizationName xml:lang="pt-br">USCS - Universidade Municipal de Sao Caetano do Sul</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">USCS - Universidade Municipal de Sao Caetano do Sul</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="pt-br">USCS - Universidade Municipal de Sao Caetano do Sul</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.uscs.edu.br/</OrganizationURL>
-    <OrganizationURL xml:lang="pt-br">http://www.uscs.edu.br/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Eduardo dos Santos</SurName>
-    <EmailAddress>eduardo@uscs.edu.br</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/cafe01.unicamp.br-idp-shibboleth.xml b/swamid-interfederations-2.0/cafe01.unicamp.br-idp-shibboleth.xml
deleted file mode 100644
index 9118b5d6..00000000
--- a/swamid-interfederations-2.0/cafe01.unicamp.br-idp-shibboleth.xml
+++ /dev/null
@@ -1,114 +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://cafe01.unicamp.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">unicamp.br</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">UNICAMP - UNIVERSIDADE ESTADUAL DE CAMPINAS</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="pt-br">UNICAMP - UNIVERSIDADE ESTADUAL DE CAMPINAS</mdui:DisplayName>
-        <mdui:Description xml:lang="en">UNICAMP - UNIVERSIDADE ESTADUAL DE CAMPINAS</mdui:Description>
-        <mdui:Description xml:lang="pt-br">UNICAMP - UNIVERSIDADE ESTADUAL DE CAMPINAS</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.unicamp.br/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="pt-br">http://www.unicamp.br/</mdui:InformationURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-    MIID9DCCAtwCAQAwDQYJKoZIhvcNAQEFBQAwgb8xNDAyBgNVBAoTK1VOSUNBTVAg
-LSBVbml2ZXJzaWRhZGUgRXN0YWR1YWwgZGUgQ2FtcGluYXMxDjAMBgNVBAsTBUND
-VUVDMScwJQYJKoZIhvcNAQkBFhhzdXBvcnRlQGNjdWVjLnVuaWNhbXAuYnIxETAP
-BgNVBAcTCENhbXBpbmFzMRIwEAYDVQQIEwlTYW8gUGF1bG8xCzAJBgNVBAYTAkJS
-MRowGAYDVQQDExFjYWZlMDEudW5pY2FtcC5icjAeFw0xNDA0MjIxNDIwNDJaFw0x
-OTA0MjExNDIwNDJaMIG/MTQwMgYDVQQKEytVTklDQU1QIC0gVW5pdmVyc2lkYWRl
-IEVzdGFkdWFsIGRlIENhbXBpbmFzMQ4wDAYDVQQLEwVDQ1VFQzEnMCUGCSqGSIb3
-DQEJARYYc3Vwb3J0ZUBjY3VlYy51bmljYW1wLmJyMREwDwYDVQQHEwhDYW1waW5h
-czESMBAGA1UECBMJU2FvIFBhdWxvMQswCQYDVQQGEwJCUjEaMBgGA1UEAxMRY2Fm
-ZTAxLnVuaWNhbXAuYnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCM
-iF3EtUDFn5jggzd0bF2+qrBLzCd51ZQEA8drersbboKF1nO6nhlX1ctexqn5AWXh
-OjY9U66/2bQ0+B0e69pG9Kb0ZZeFXdMVqOry2xy9WAixZhG1Xb5JtkvA3GHhuMZy
-wqjLZ26IlVIzTrRFQZAu+ok6v6tkM04JH/6QWRczmsGSfmjkFlYLoQ/ze5tAz1lH
-4iudmVYLoxXnsY4dTQYptS3T38J3Pgv/5ujOgur/WPH+wEQVel6uW9x/zO+yvy4E
-zH+dsS1B4BlF2I5jQLuheL8Wxx8V2GChe9KjzcgQJV1ttLCvChXmJC42Q7vh5x2S
-wbl2/tZVhKhQjchiWZtJAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBAGvAZ6zGUDpF
-Uye+8JwpFrVID+b/hGg/dw1xJ2FBeqmB7/i0hs56pT+A28W6MmNARBYChfnyuVo3
-AYIQWiSQKY02JyrVyfMCNdXWjV4VEobiR/hkRVgYuzzCWb0VIB0hIKyCxZMaWqpz
-MWWaZI9IbZ56UOjaTPHEstHi5q3bsVGSx7DRY5U2itCiIzduHYpkWtUqyenCiOy0
-AUE5FIGX0MTZ2r8rF+PcfZtM3FzDUkOyokBASjD/JL8kiEeQzMKJDo5FmAvOkvKx
-cwWHnFzf8pZJSYNAlGeL3BlK59YjqH9bRHzhp+Wc4gJpzFSUuA1waEuHkUeqcYCg
-FB2LP25VwJA=
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe01.unicamp.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafe01.unicamp.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://cafe01.unicamp.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cafe01.unicamp.br/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://cafe01.unicamp.br/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://cafe01.unicamp.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">unicamp.br</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-      
-MIID9DCCAtwCAQAwDQYJKoZIhvcNAQEFBQAwgb8xNDAyBgNVBAoTK1VOSUNBTVAg
-LSBVbml2ZXJzaWRhZGUgRXN0YWR1YWwgZGUgQ2FtcGluYXMxDjAMBgNVBAsTBUND
-VUVDMScwJQYJKoZIhvcNAQkBFhhzdXBvcnRlQGNjdWVjLnVuaWNhbXAuYnIxETAP
-BgNVBAcTCENhbXBpbmFzMRIwEAYDVQQIEwlTYW8gUGF1bG8xCzAJBgNVBAYTAkJS
-MRowGAYDVQQDExFjYWZlMDEudW5pY2FtcC5icjAeFw0xNDA0MjIxNDIwNDJaFw0x
-OTA0MjExNDIwNDJaMIG/MTQwMgYDVQQKEytVTklDQU1QIC0gVW5pdmVyc2lkYWRl
-IEVzdGFkdWFsIGRlIENhbXBpbmFzMQ4wDAYDVQQLEwVDQ1VFQzEnMCUGCSqGSIb3
-DQEJARYYc3Vwb3J0ZUBjY3VlYy51bmljYW1wLmJyMREwDwYDVQQHEwhDYW1waW5h
-czESMBAGA1UECBMJU2FvIFBhdWxvMQswCQYDVQQGEwJCUjEaMBgGA1UEAxMRY2Fm
-ZTAxLnVuaWNhbXAuYnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCM
-iF3EtUDFn5jggzd0bF2+qrBLzCd51ZQEA8drersbboKF1nO6nhlX1ctexqn5AWXh
-OjY9U66/2bQ0+B0e69pG9Kb0ZZeFXdMVqOry2xy9WAixZhG1Xb5JtkvA3GHhuMZy
-wqjLZ26IlVIzTrRFQZAu+ok6v6tkM04JH/6QWRczmsGSfmjkFlYLoQ/ze5tAz1lH
-4iudmVYLoxXnsY4dTQYptS3T38J3Pgv/5ujOgur/WPH+wEQVel6uW9x/zO+yvy4E
-zH+dsS1B4BlF2I5jQLuheL8Wxx8V2GChe9KjzcgQJV1ttLCvChXmJC42Q7vh5x2S
-wbl2/tZVhKhQjchiWZtJAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBAGvAZ6zGUDpF
-Uye+8JwpFrVID+b/hGg/dw1xJ2FBeqmB7/i0hs56pT+A28W6MmNARBYChfnyuVo3
-AYIQWiSQKY02JyrVyfMCNdXWjV4VEobiR/hkRVgYuzzCWb0VIB0hIKyCxZMaWqpz
-MWWaZI9IbZ56UOjaTPHEstHi5q3bsVGSx7DRY5U2itCiIzduHYpkWtUqyenCiOy0
-AUE5FIGX0MTZ2r8rF+PcfZtM3FzDUkOyokBASjD/JL8kiEeQzMKJDo5FmAvOkvKx
-cwWHnFzf8pZJSYNAlGeL3BlK59YjqH9bRHzhp+Wc4gJpzFSUuA1waEuHkUeqcYCg
-FB2LP25VwJA=
-                    
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe01.unicamp.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafe01.unicamp.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">UNICAMP - UNIVERSIDADE ESTADUAL DE CAMPINAS</OrganizationName>
-    <OrganizationName xml:lang="pt-br">UNICAMP - UNIVERSIDADE ESTADUAL DE CAMPINAS</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">UNICAMP - UNIVERSIDADE ESTADUAL DE CAMPINAS</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="pt-br">UNICAMP - UNIVERSIDADE ESTADUAL DE CAMPINAS</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.unicamp.br/</OrganizationURL>
-    <OrganizationURL xml:lang="pt-br">http://www.unicamp.br/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Sandra Regina de Souza</SurName>
-    <EmailAddress>sandra@ccuec.unicamp.br</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/cafe01.unicamp.br.xml b/swamid-interfederations-2.0/cafe01.unicamp.br.xml
deleted file mode 100644
index 9118b5d6..00000000
--- a/swamid-interfederations-2.0/cafe01.unicamp.br.xml
+++ /dev/null
@@ -1,114 +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://cafe01.unicamp.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">unicamp.br</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">UNICAMP - UNIVERSIDADE ESTADUAL DE CAMPINAS</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="pt-br">UNICAMP - UNIVERSIDADE ESTADUAL DE CAMPINAS</mdui:DisplayName>
-        <mdui:Description xml:lang="en">UNICAMP - UNIVERSIDADE ESTADUAL DE CAMPINAS</mdui:Description>
-        <mdui:Description xml:lang="pt-br">UNICAMP - UNIVERSIDADE ESTADUAL DE CAMPINAS</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.unicamp.br/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="pt-br">http://www.unicamp.br/</mdui:InformationURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-    MIID9DCCAtwCAQAwDQYJKoZIhvcNAQEFBQAwgb8xNDAyBgNVBAoTK1VOSUNBTVAg
-LSBVbml2ZXJzaWRhZGUgRXN0YWR1YWwgZGUgQ2FtcGluYXMxDjAMBgNVBAsTBUND
-VUVDMScwJQYJKoZIhvcNAQkBFhhzdXBvcnRlQGNjdWVjLnVuaWNhbXAuYnIxETAP
-BgNVBAcTCENhbXBpbmFzMRIwEAYDVQQIEwlTYW8gUGF1bG8xCzAJBgNVBAYTAkJS
-MRowGAYDVQQDExFjYWZlMDEudW5pY2FtcC5icjAeFw0xNDA0MjIxNDIwNDJaFw0x
-OTA0MjExNDIwNDJaMIG/MTQwMgYDVQQKEytVTklDQU1QIC0gVW5pdmVyc2lkYWRl
-IEVzdGFkdWFsIGRlIENhbXBpbmFzMQ4wDAYDVQQLEwVDQ1VFQzEnMCUGCSqGSIb3
-DQEJARYYc3Vwb3J0ZUBjY3VlYy51bmljYW1wLmJyMREwDwYDVQQHEwhDYW1waW5h
-czESMBAGA1UECBMJU2FvIFBhdWxvMQswCQYDVQQGEwJCUjEaMBgGA1UEAxMRY2Fm
-ZTAxLnVuaWNhbXAuYnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCM
-iF3EtUDFn5jggzd0bF2+qrBLzCd51ZQEA8drersbboKF1nO6nhlX1ctexqn5AWXh
-OjY9U66/2bQ0+B0e69pG9Kb0ZZeFXdMVqOry2xy9WAixZhG1Xb5JtkvA3GHhuMZy
-wqjLZ26IlVIzTrRFQZAu+ok6v6tkM04JH/6QWRczmsGSfmjkFlYLoQ/ze5tAz1lH
-4iudmVYLoxXnsY4dTQYptS3T38J3Pgv/5ujOgur/WPH+wEQVel6uW9x/zO+yvy4E
-zH+dsS1B4BlF2I5jQLuheL8Wxx8V2GChe9KjzcgQJV1ttLCvChXmJC42Q7vh5x2S
-wbl2/tZVhKhQjchiWZtJAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBAGvAZ6zGUDpF
-Uye+8JwpFrVID+b/hGg/dw1xJ2FBeqmB7/i0hs56pT+A28W6MmNARBYChfnyuVo3
-AYIQWiSQKY02JyrVyfMCNdXWjV4VEobiR/hkRVgYuzzCWb0VIB0hIKyCxZMaWqpz
-MWWaZI9IbZ56UOjaTPHEstHi5q3bsVGSx7DRY5U2itCiIzduHYpkWtUqyenCiOy0
-AUE5FIGX0MTZ2r8rF+PcfZtM3FzDUkOyokBASjD/JL8kiEeQzMKJDo5FmAvOkvKx
-cwWHnFzf8pZJSYNAlGeL3BlK59YjqH9bRHzhp+Wc4gJpzFSUuA1waEuHkUeqcYCg
-FB2LP25VwJA=
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe01.unicamp.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafe01.unicamp.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://cafe01.unicamp.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cafe01.unicamp.br/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://cafe01.unicamp.br/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://cafe01.unicamp.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">unicamp.br</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-      
-MIID9DCCAtwCAQAwDQYJKoZIhvcNAQEFBQAwgb8xNDAyBgNVBAoTK1VOSUNBTVAg
-LSBVbml2ZXJzaWRhZGUgRXN0YWR1YWwgZGUgQ2FtcGluYXMxDjAMBgNVBAsTBUND
-VUVDMScwJQYJKoZIhvcNAQkBFhhzdXBvcnRlQGNjdWVjLnVuaWNhbXAuYnIxETAP
-BgNVBAcTCENhbXBpbmFzMRIwEAYDVQQIEwlTYW8gUGF1bG8xCzAJBgNVBAYTAkJS
-MRowGAYDVQQDExFjYWZlMDEudW5pY2FtcC5icjAeFw0xNDA0MjIxNDIwNDJaFw0x
-OTA0MjExNDIwNDJaMIG/MTQwMgYDVQQKEytVTklDQU1QIC0gVW5pdmVyc2lkYWRl
-IEVzdGFkdWFsIGRlIENhbXBpbmFzMQ4wDAYDVQQLEwVDQ1VFQzEnMCUGCSqGSIb3
-DQEJARYYc3Vwb3J0ZUBjY3VlYy51bmljYW1wLmJyMREwDwYDVQQHEwhDYW1waW5h
-czESMBAGA1UECBMJU2FvIFBhdWxvMQswCQYDVQQGEwJCUjEaMBgGA1UEAxMRY2Fm
-ZTAxLnVuaWNhbXAuYnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCM
-iF3EtUDFn5jggzd0bF2+qrBLzCd51ZQEA8drersbboKF1nO6nhlX1ctexqn5AWXh
-OjY9U66/2bQ0+B0e69pG9Kb0ZZeFXdMVqOry2xy9WAixZhG1Xb5JtkvA3GHhuMZy
-wqjLZ26IlVIzTrRFQZAu+ok6v6tkM04JH/6QWRczmsGSfmjkFlYLoQ/ze5tAz1lH
-4iudmVYLoxXnsY4dTQYptS3T38J3Pgv/5ujOgur/WPH+wEQVel6uW9x/zO+yvy4E
-zH+dsS1B4BlF2I5jQLuheL8Wxx8V2GChe9KjzcgQJV1ttLCvChXmJC42Q7vh5x2S
-wbl2/tZVhKhQjchiWZtJAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBAGvAZ6zGUDpF
-Uye+8JwpFrVID+b/hGg/dw1xJ2FBeqmB7/i0hs56pT+A28W6MmNARBYChfnyuVo3
-AYIQWiSQKY02JyrVyfMCNdXWjV4VEobiR/hkRVgYuzzCWb0VIB0hIKyCxZMaWqpz
-MWWaZI9IbZ56UOjaTPHEstHi5q3bsVGSx7DRY5U2itCiIzduHYpkWtUqyenCiOy0
-AUE5FIGX0MTZ2r8rF+PcfZtM3FzDUkOyokBASjD/JL8kiEeQzMKJDo5FmAvOkvKx
-cwWHnFzf8pZJSYNAlGeL3BlK59YjqH9bRHzhp+Wc4gJpzFSUuA1waEuHkUeqcYCg
-FB2LP25VwJA=
-                    
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe01.unicamp.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafe01.unicamp.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">UNICAMP - UNIVERSIDADE ESTADUAL DE CAMPINAS</OrganizationName>
-    <OrganizationName xml:lang="pt-br">UNICAMP - UNIVERSIDADE ESTADUAL DE CAMPINAS</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">UNICAMP - UNIVERSIDADE ESTADUAL DE CAMPINAS</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="pt-br">UNICAMP - UNIVERSIDADE ESTADUAL DE CAMPINAS</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.unicamp.br/</OrganizationURL>
-    <OrganizationURL xml:lang="pt-br">http://www.unicamp.br/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Sandra Regina de Souza</SurName>
-    <EmailAddress>sandra@ccuec.unicamp.br</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/cafe1.ufes.br-idp-shibboleth.xml b/swamid-interfederations-2.0/cafe1.ufes.br-idp-shibboleth.xml
deleted file mode 100644
index b12be60b..00000000
--- a/swamid-interfederations-2.0/cafe1.ufes.br-idp-shibboleth.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://cafe1.ufes.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">ufes.br</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">UFES - Universidade Federal do Espirito Santo</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="pt-br">UFES - Universidade Federal do Espirito Santo</mdui:DisplayName>
-        <mdui:Description xml:lang="en">UFES - Universidade Federal do Espirito Santo</mdui:Description>
-        <mdui:Description xml:lang="pt-br">UFES - Universidade Federal do Espirito Santo</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.ufes.br/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="pt-br">http://www.ufes.br/</mdui:InformationURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-    MIIDpDCCAowCAQAwDQYJKoZIhvcNAQEFBQAwgZcxDTALBgNVBAoTBFVGRVMxDDAK
-BgNVBAsTA05QRDEnMCUGCSqGSIb3DQEJARYYaW5mcmEtbnBkQGdydXBvcy51ZmVz
-LmJyMRAwDgYDVQQHEwdWaXRvcmlhMRgwFgYDVQQIFA9Fc3DDrXJpdG8gU2FudG8x
-CzAJBgNVBAYTAkJSMRYwFAYDVQQDEw1jYWZlMS51ZmVzLmJyMB4XDTE0MDYwNjE2
-MzcxNloXDTE5MDYwNTE2MzcxNlowgZcxDTALBgNVBAoTBFVGRVMxDDAKBgNVBAsT
-A05QRDEnMCUGCSqGSIb3DQEJARYYaW5mcmEtbnBkQGdydXBvcy51ZmVzLmJyMRAw
-DgYDVQQHEwdWaXRvcmlhMRgwFgYDVQQIFA9Fc3DDrXJpdG8gU2FudG8xCzAJBgNV
-BAYTAkJSMRYwFAYDVQQDEw1jYWZlMS51ZmVzLmJyMIIBIjANBgkqhkiG9w0BAQEF
-AAOCAQ8AMIIBCgKCAQEA3L9QbE4UFs3lk6ICYFIG1N7VOFFDrh410wfABV8SFQEQ
-dUVcpLE+MBQuUNrSl76op/xOJui5pHaisCS49QkXrXBHONUc9EXuSfPxIzhPtwVE
-F1fetagySEPOg6ZeoysY2qSFgl3eHy6AhdFiyCRtbX/THAJCt/UoB8vSJkGU4DfH
-JbGNxjpvhVNh11HFfVuYg4e+W+W8jfmApksXq5yx66cnlSM9N2UXiX7DV4QEiaaB
-QM6FjUzKIu1q1MER67wekTY6t3UCa2+V1AvPCMH0OddsvVupFHk5usmVSdDHolKI
-B5E4KWmgpWpfVcTyMr2U1d/F2n5Yxq87LNgwNsalLwIDAQABMA0GCSqGSIb3DQEB
-BQUAA4IBAQBwLgsV4H4JvYOYtmHnaRqo6g2zmdO3bYT3XQ8BnUUH2xmm2mKQg9FA
-vuGK3Cg4q1GHQdZncFwAfPElXlf4t1a3pQxY9Ngosx8ksJluVbYa+M3TIGx6AH4o
-1fO8GLWExqFIJT23dBO/DwZe2cGh/Q4Eds72DKckX6QfT+7Nv/jUtXXjCbeXgbwJ
-dSjY0/TMh5yN5NHCwIuTtGpOf+X48vK298k2zH9MG3uuEP3JJT4kFu5Hog/Gpfhl
-sPyxikyiJUi3kdknbyfSpxw7RffbGfIqdB9tXapoJ0/QwG8d8bApWGekB90nD4WM
-KhLLqANoAKrZfLUN/lkAJIA9zXnzo7oR
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe1.ufes.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafe1.ufes.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://cafe1.ufes.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cafe1.ufes.br/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://cafe1.ufes.br/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://cafe1.ufes.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">ufes.br</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-      
-MIIDpDCCAowCAQAwDQYJKoZIhvcNAQEFBQAwgZcxDTALBgNVBAoTBFVGRVMxDDAK
-BgNVBAsTA05QRDEnMCUGCSqGSIb3DQEJARYYaW5mcmEtbnBkQGdydXBvcy51ZmVz
-LmJyMRAwDgYDVQQHEwdWaXRvcmlhMRgwFgYDVQQIFA9Fc3DDrXJpdG8gU2FudG8x
-CzAJBgNVBAYTAkJSMRYwFAYDVQQDEw1jYWZlMS51ZmVzLmJyMB4XDTE0MDYwNjE2
-MzcxNloXDTE5MDYwNTE2MzcxNlowgZcxDTALBgNVBAoTBFVGRVMxDDAKBgNVBAsT
-A05QRDEnMCUGCSqGSIb3DQEJARYYaW5mcmEtbnBkQGdydXBvcy51ZmVzLmJyMRAw
-DgYDVQQHEwdWaXRvcmlhMRgwFgYDVQQIFA9Fc3DDrXJpdG8gU2FudG8xCzAJBgNV
-BAYTAkJSMRYwFAYDVQQDEw1jYWZlMS51ZmVzLmJyMIIBIjANBgkqhkiG9w0BAQEF
-AAOCAQ8AMIIBCgKCAQEA3L9QbE4UFs3lk6ICYFIG1N7VOFFDrh410wfABV8SFQEQ
-dUVcpLE+MBQuUNrSl76op/xOJui5pHaisCS49QkXrXBHONUc9EXuSfPxIzhPtwVE
-F1fetagySEPOg6ZeoysY2qSFgl3eHy6AhdFiyCRtbX/THAJCt/UoB8vSJkGU4DfH
-JbGNxjpvhVNh11HFfVuYg4e+W+W8jfmApksXq5yx66cnlSM9N2UXiX7DV4QEiaaB
-QM6FjUzKIu1q1MER67wekTY6t3UCa2+V1AvPCMH0OddsvVupFHk5usmVSdDHolKI
-B5E4KWmgpWpfVcTyMr2U1d/F2n5Yxq87LNgwNsalLwIDAQABMA0GCSqGSIb3DQEB
-BQUAA4IBAQBwLgsV4H4JvYOYtmHnaRqo6g2zmdO3bYT3XQ8BnUUH2xmm2mKQg9FA
-vuGK3Cg4q1GHQdZncFwAfPElXlf4t1a3pQxY9Ngosx8ksJluVbYa+M3TIGx6AH4o
-1fO8GLWExqFIJT23dBO/DwZe2cGh/Q4Eds72DKckX6QfT+7Nv/jUtXXjCbeXgbwJ
-dSjY0/TMh5yN5NHCwIuTtGpOf+X48vK298k2zH9MG3uuEP3JJT4kFu5Hog/Gpfhl
-sPyxikyiJUi3kdknbyfSpxw7RffbGfIqdB9tXapoJ0/QwG8d8bApWGekB90nD4WM
-KhLLqANoAKrZfLUN/lkAJIA9zXnzo7oR
-                    
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe1.ufes.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafe1.ufes.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">UFES - Universidade Federal do Espirito Santo</OrganizationName>
-    <OrganizationName xml:lang="pt-br">UFES - Universidade Federal do Espirito Santo</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">UFES - Universidade Federal do Espirito Santo</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="pt-br">UFES - Universidade Federal do Espirito Santo</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.ufes.br/</OrganizationURL>
-    <OrganizationURL xml:lang="pt-br">http://www.ufes.br/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Renan Manola</SurName>
-    <EmailAddress>renan.manola@ufes.br</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/cafe1.ufes.br.xml b/swamid-interfederations-2.0/cafe1.ufes.br.xml
deleted file mode 100644
index b12be60b..00000000
--- a/swamid-interfederations-2.0/cafe1.ufes.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://cafe1.ufes.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">ufes.br</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">UFES - Universidade Federal do Espirito Santo</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="pt-br">UFES - Universidade Federal do Espirito Santo</mdui:DisplayName>
-        <mdui:Description xml:lang="en">UFES - Universidade Federal do Espirito Santo</mdui:Description>
-        <mdui:Description xml:lang="pt-br">UFES - Universidade Federal do Espirito Santo</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.ufes.br/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="pt-br">http://www.ufes.br/</mdui:InformationURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-    MIIDpDCCAowCAQAwDQYJKoZIhvcNAQEFBQAwgZcxDTALBgNVBAoTBFVGRVMxDDAK
-BgNVBAsTA05QRDEnMCUGCSqGSIb3DQEJARYYaW5mcmEtbnBkQGdydXBvcy51ZmVz
-LmJyMRAwDgYDVQQHEwdWaXRvcmlhMRgwFgYDVQQIFA9Fc3DDrXJpdG8gU2FudG8x
-CzAJBgNVBAYTAkJSMRYwFAYDVQQDEw1jYWZlMS51ZmVzLmJyMB4XDTE0MDYwNjE2
-MzcxNloXDTE5MDYwNTE2MzcxNlowgZcxDTALBgNVBAoTBFVGRVMxDDAKBgNVBAsT
-A05QRDEnMCUGCSqGSIb3DQEJARYYaW5mcmEtbnBkQGdydXBvcy51ZmVzLmJyMRAw
-DgYDVQQHEwdWaXRvcmlhMRgwFgYDVQQIFA9Fc3DDrXJpdG8gU2FudG8xCzAJBgNV
-BAYTAkJSMRYwFAYDVQQDEw1jYWZlMS51ZmVzLmJyMIIBIjANBgkqhkiG9w0BAQEF
-AAOCAQ8AMIIBCgKCAQEA3L9QbE4UFs3lk6ICYFIG1N7VOFFDrh410wfABV8SFQEQ
-dUVcpLE+MBQuUNrSl76op/xOJui5pHaisCS49QkXrXBHONUc9EXuSfPxIzhPtwVE
-F1fetagySEPOg6ZeoysY2qSFgl3eHy6AhdFiyCRtbX/THAJCt/UoB8vSJkGU4DfH
-JbGNxjpvhVNh11HFfVuYg4e+W+W8jfmApksXq5yx66cnlSM9N2UXiX7DV4QEiaaB
-QM6FjUzKIu1q1MER67wekTY6t3UCa2+V1AvPCMH0OddsvVupFHk5usmVSdDHolKI
-B5E4KWmgpWpfVcTyMr2U1d/F2n5Yxq87LNgwNsalLwIDAQABMA0GCSqGSIb3DQEB
-BQUAA4IBAQBwLgsV4H4JvYOYtmHnaRqo6g2zmdO3bYT3XQ8BnUUH2xmm2mKQg9FA
-vuGK3Cg4q1GHQdZncFwAfPElXlf4t1a3pQxY9Ngosx8ksJluVbYa+M3TIGx6AH4o
-1fO8GLWExqFIJT23dBO/DwZe2cGh/Q4Eds72DKckX6QfT+7Nv/jUtXXjCbeXgbwJ
-dSjY0/TMh5yN5NHCwIuTtGpOf+X48vK298k2zH9MG3uuEP3JJT4kFu5Hog/Gpfhl
-sPyxikyiJUi3kdknbyfSpxw7RffbGfIqdB9tXapoJ0/QwG8d8bApWGekB90nD4WM
-KhLLqANoAKrZfLUN/lkAJIA9zXnzo7oR
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe1.ufes.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafe1.ufes.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://cafe1.ufes.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cafe1.ufes.br/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://cafe1.ufes.br/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://cafe1.ufes.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">ufes.br</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-      
-MIIDpDCCAowCAQAwDQYJKoZIhvcNAQEFBQAwgZcxDTALBgNVBAoTBFVGRVMxDDAK
-BgNVBAsTA05QRDEnMCUGCSqGSIb3DQEJARYYaW5mcmEtbnBkQGdydXBvcy51ZmVz
-LmJyMRAwDgYDVQQHEwdWaXRvcmlhMRgwFgYDVQQIFA9Fc3DDrXJpdG8gU2FudG8x
-CzAJBgNVBAYTAkJSMRYwFAYDVQQDEw1jYWZlMS51ZmVzLmJyMB4XDTE0MDYwNjE2
-MzcxNloXDTE5MDYwNTE2MzcxNlowgZcxDTALBgNVBAoTBFVGRVMxDDAKBgNVBAsT
-A05QRDEnMCUGCSqGSIb3DQEJARYYaW5mcmEtbnBkQGdydXBvcy51ZmVzLmJyMRAw
-DgYDVQQHEwdWaXRvcmlhMRgwFgYDVQQIFA9Fc3DDrXJpdG8gU2FudG8xCzAJBgNV
-BAYTAkJSMRYwFAYDVQQDEw1jYWZlMS51ZmVzLmJyMIIBIjANBgkqhkiG9w0BAQEF
-AAOCAQ8AMIIBCgKCAQEA3L9QbE4UFs3lk6ICYFIG1N7VOFFDrh410wfABV8SFQEQ
-dUVcpLE+MBQuUNrSl76op/xOJui5pHaisCS49QkXrXBHONUc9EXuSfPxIzhPtwVE
-F1fetagySEPOg6ZeoysY2qSFgl3eHy6AhdFiyCRtbX/THAJCt/UoB8vSJkGU4DfH
-JbGNxjpvhVNh11HFfVuYg4e+W+W8jfmApksXq5yx66cnlSM9N2UXiX7DV4QEiaaB
-QM6FjUzKIu1q1MER67wekTY6t3UCa2+V1AvPCMH0OddsvVupFHk5usmVSdDHolKI
-B5E4KWmgpWpfVcTyMr2U1d/F2n5Yxq87LNgwNsalLwIDAQABMA0GCSqGSIb3DQEB
-BQUAA4IBAQBwLgsV4H4JvYOYtmHnaRqo6g2zmdO3bYT3XQ8BnUUH2xmm2mKQg9FA
-vuGK3Cg4q1GHQdZncFwAfPElXlf4t1a3pQxY9Ngosx8ksJluVbYa+M3TIGx6AH4o
-1fO8GLWExqFIJT23dBO/DwZe2cGh/Q4Eds72DKckX6QfT+7Nv/jUtXXjCbeXgbwJ
-dSjY0/TMh5yN5NHCwIuTtGpOf+X48vK298k2zH9MG3uuEP3JJT4kFu5Hog/Gpfhl
-sPyxikyiJUi3kdknbyfSpxw7RffbGfIqdB9tXapoJ0/QwG8d8bApWGekB90nD4WM
-KhLLqANoAKrZfLUN/lkAJIA9zXnzo7oR
-                    
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe1.ufes.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafe1.ufes.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">UFES - Universidade Federal do Espirito Santo</OrganizationName>
-    <OrganizationName xml:lang="pt-br">UFES - Universidade Federal do Espirito Santo</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">UFES - Universidade Federal do Espirito Santo</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="pt-br">UFES - Universidade Federal do Espirito Santo</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.ufes.br/</OrganizationURL>
-    <OrganizationURL xml:lang="pt-br">http://www.ufes.br/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Renan Manola</SurName>
-    <EmailAddress>renan.manola@ufes.br</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/cafernp.insa.gov.br-idp-shibboleth.xml b/swamid-interfederations-2.0/cafernp.insa.gov.br-idp-shibboleth.xml
deleted file mode 100644
index d7c242e2..00000000
--- a/swamid-interfederations-2.0/cafernp.insa.gov.br-idp-shibboleth.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://cafernp.insa.gov.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">insa.gov.br</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">INSA - Instituto Nacional do Semiarido</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="pt-br">INSA - Instituto Nacional do Semiarido</mdui:DisplayName>
-        <mdui:Description xml:lang="en">INSA - Instituto Nacional do Semiarido</mdui:Description>
-        <mdui:Description xml:lang="pt-br">INSA - Instituto Nacional do Semiarido</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.insa.gov.br/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="pt-br">http://www.insa.gov.br/</mdui:InformationURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-    MIIDpjCCAo4CAQAwDQYJKoZIhvcNAQEFBQAwgZgxDTALBgNVBAoTBElOU0ExDDAK
-BgNVBAsTA0NQRDEjMCEGCSqGSIb3DQEJARYUcHBhY2hlY29AaW5zYS5nb3YuYnIx
-FzAVBgNVBAcTDkNhbXBpbmEgR3JhbmRlMRAwDgYDVQQIEwdQYXJhaWJhMQswCQYD
-VQQGEwJCUjEcMBoGA1UEAxMTY2FmZXJucC5pbnNhLmdvdi5icjAeFw0xMzA5MDUx
-MTQ3MDRaFw0xNjA5MDQxMTQ3MDRaMIGYMQ0wCwYDVQQKEwRJTlNBMQwwCgYDVQQL
-EwNDUEQxIzAhBgkqhkiG9w0BCQEWFHBwYWNoZWNvQGluc2EuZ292LmJyMRcwFQYD
-VQQHEw5DYW1waW5hIEdyYW5kZTEQMA4GA1UECBMHUGFyYWliYTELMAkGA1UEBhMC
-QlIxHDAaBgNVBAMTE2NhZmVybnAuaW5zYS5nb3YuYnIwggEiMA0GCSqGSIb3DQEB
-AQUAA4IBDwAwggEKAoIBAQC6e7hlynC3DhhZh4vMpmlAGM9jGjQIRJNXmDIBU+YN
-TVhwfM8+HzMGuUhqPdoFL2aGJmJVn5TRsOjAIlK6TuHYPVJjZFrV5CGaimuXDkqH
-6nFgKoFLI6Zg0+vNUOGIQvfT1TpZaonPRqIu4MpKEDEtEk8bFkfsqxq55ivcLLYp
-GwGTZMGGBcaAztR0GRBooh3WDLIQR9gkzhxeTHEPiwF5jXGLIFZNR+kxo1ddmg4j
-svohDefVHSkTQZt6QptsGVa408tn2pokQ4K8Enmi9zMdR6LuKvdhoC8Rs1Cc8rlJ
-7Kj5KOMmOjniR03aokncdqNoBIUBijfV0gI58L1Uca53AgMBAAEwDQYJKoZIhvcN
-AQEFBQADggEBAGVgBV46eVFwW+kASWxOC3FprDP5q/1GDcaD3rKu471uU+nd/L5n
-p5xIKFBVIhx42FbAW7wpLRvhjPDCRDlXVKBgthbWGFawAyjtfPwJvR0aAowP0xHX
-QFFg7t0AXj88u89109tEaxLXpm7tzPHUiuk/D/ZtFy1JtJxZfLPHII5q53ioxF7A
-GgD+wSudqXEc3gKs2bynFcvlWgiali2b3dxNWZ5qRP652Mebtdl4H67/bSsKnhEX
-CcE/6M9wD9oWIdgaoL49rKZnU3ubSz0A5AwNhZiqGk70SbcAYrVWfZH1ApyBnt+8
-jMogdK5eP4afg8zXeCSXaDF45MMQP7+gRsY=
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafernp.insa.gov.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafernp.insa.gov.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://cafernp.insa.gov.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cafernp.insa.gov.br/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://cafernp.insa.gov.br/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://cafernp.insa.gov.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">insa.gov.br</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-      
-MIIDpjCCAo4CAQAwDQYJKoZIhvcNAQEFBQAwgZgxDTALBgNVBAoTBElOU0ExDDAK
-BgNVBAsTA0NQRDEjMCEGCSqGSIb3DQEJARYUcHBhY2hlY29AaW5zYS5nb3YuYnIx
-FzAVBgNVBAcTDkNhbXBpbmEgR3JhbmRlMRAwDgYDVQQIEwdQYXJhaWJhMQswCQYD
-VQQGEwJCUjEcMBoGA1UEAxMTY2FmZXJucC5pbnNhLmdvdi5icjAeFw0xMzA5MDUx
-MTQ3MDRaFw0xNjA5MDQxMTQ3MDRaMIGYMQ0wCwYDVQQKEwRJTlNBMQwwCgYDVQQL
-EwNDUEQxIzAhBgkqhkiG9w0BCQEWFHBwYWNoZWNvQGluc2EuZ292LmJyMRcwFQYD
-VQQHEw5DYW1waW5hIEdyYW5kZTEQMA4GA1UECBMHUGFyYWliYTELMAkGA1UEBhMC
-QlIxHDAaBgNVBAMTE2NhZmVybnAuaW5zYS5nb3YuYnIwggEiMA0GCSqGSIb3DQEB
-AQUAA4IBDwAwggEKAoIBAQC6e7hlynC3DhhZh4vMpmlAGM9jGjQIRJNXmDIBU+YN
-TVhwfM8+HzMGuUhqPdoFL2aGJmJVn5TRsOjAIlK6TuHYPVJjZFrV5CGaimuXDkqH
-6nFgKoFLI6Zg0+vNUOGIQvfT1TpZaonPRqIu4MpKEDEtEk8bFkfsqxq55ivcLLYp
-GwGTZMGGBcaAztR0GRBooh3WDLIQR9gkzhxeTHEPiwF5jXGLIFZNR+kxo1ddmg4j
-svohDefVHSkTQZt6QptsGVa408tn2pokQ4K8Enmi9zMdR6LuKvdhoC8Rs1Cc8rlJ
-7Kj5KOMmOjniR03aokncdqNoBIUBijfV0gI58L1Uca53AgMBAAEwDQYJKoZIhvcN
-AQEFBQADggEBAGVgBV46eVFwW+kASWxOC3FprDP5q/1GDcaD3rKu471uU+nd/L5n
-p5xIKFBVIhx42FbAW7wpLRvhjPDCRDlXVKBgthbWGFawAyjtfPwJvR0aAowP0xHX
-QFFg7t0AXj88u89109tEaxLXpm7tzPHUiuk/D/ZtFy1JtJxZfLPHII5q53ioxF7A
-GgD+wSudqXEc3gKs2bynFcvlWgiali2b3dxNWZ5qRP652Mebtdl4H67/bSsKnhEX
-CcE/6M9wD9oWIdgaoL49rKZnU3ubSz0A5AwNhZiqGk70SbcAYrVWfZH1ApyBnt+8
-jMogdK5eP4afg8zXeCSXaDF45MMQP7+gRsY=
-                    
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafernp.insa.gov.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafernp.insa.gov.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">INSA - Instituto Nacional do Semiarido</OrganizationName>
-    <OrganizationName xml:lang="pt-br">INSA - Instituto Nacional do Semiarido</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">INSA - Instituto Nacional do Semiarido</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="pt-br">INSA - Instituto Nacional do Semiarido</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.insa.gov.br/</OrganizationURL>
-    <OrganizationURL xml:lang="pt-br">http://www.insa.gov.br/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Pedro Pacheco</SurName>
-    <EmailAddress>ppacheco@insa.gov.br</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/cafernp.insa.gov.br.xml b/swamid-interfederations-2.0/cafernp.insa.gov.br.xml
deleted file mode 100644
index d7c242e2..00000000
--- a/swamid-interfederations-2.0/cafernp.insa.gov.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://cafernp.insa.gov.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">insa.gov.br</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">INSA - Instituto Nacional do Semiarido</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="pt-br">INSA - Instituto Nacional do Semiarido</mdui:DisplayName>
-        <mdui:Description xml:lang="en">INSA - Instituto Nacional do Semiarido</mdui:Description>
-        <mdui:Description xml:lang="pt-br">INSA - Instituto Nacional do Semiarido</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.insa.gov.br/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="pt-br">http://www.insa.gov.br/</mdui:InformationURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-    MIIDpjCCAo4CAQAwDQYJKoZIhvcNAQEFBQAwgZgxDTALBgNVBAoTBElOU0ExDDAK
-BgNVBAsTA0NQRDEjMCEGCSqGSIb3DQEJARYUcHBhY2hlY29AaW5zYS5nb3YuYnIx
-FzAVBgNVBAcTDkNhbXBpbmEgR3JhbmRlMRAwDgYDVQQIEwdQYXJhaWJhMQswCQYD
-VQQGEwJCUjEcMBoGA1UEAxMTY2FmZXJucC5pbnNhLmdvdi5icjAeFw0xMzA5MDUx
-MTQ3MDRaFw0xNjA5MDQxMTQ3MDRaMIGYMQ0wCwYDVQQKEwRJTlNBMQwwCgYDVQQL
-EwNDUEQxIzAhBgkqhkiG9w0BCQEWFHBwYWNoZWNvQGluc2EuZ292LmJyMRcwFQYD
-VQQHEw5DYW1waW5hIEdyYW5kZTEQMA4GA1UECBMHUGFyYWliYTELMAkGA1UEBhMC
-QlIxHDAaBgNVBAMTE2NhZmVybnAuaW5zYS5nb3YuYnIwggEiMA0GCSqGSIb3DQEB
-AQUAA4IBDwAwggEKAoIBAQC6e7hlynC3DhhZh4vMpmlAGM9jGjQIRJNXmDIBU+YN
-TVhwfM8+HzMGuUhqPdoFL2aGJmJVn5TRsOjAIlK6TuHYPVJjZFrV5CGaimuXDkqH
-6nFgKoFLI6Zg0+vNUOGIQvfT1TpZaonPRqIu4MpKEDEtEk8bFkfsqxq55ivcLLYp
-GwGTZMGGBcaAztR0GRBooh3WDLIQR9gkzhxeTHEPiwF5jXGLIFZNR+kxo1ddmg4j
-svohDefVHSkTQZt6QptsGVa408tn2pokQ4K8Enmi9zMdR6LuKvdhoC8Rs1Cc8rlJ
-7Kj5KOMmOjniR03aokncdqNoBIUBijfV0gI58L1Uca53AgMBAAEwDQYJKoZIhvcN
-AQEFBQADggEBAGVgBV46eVFwW+kASWxOC3FprDP5q/1GDcaD3rKu471uU+nd/L5n
-p5xIKFBVIhx42FbAW7wpLRvhjPDCRDlXVKBgthbWGFawAyjtfPwJvR0aAowP0xHX
-QFFg7t0AXj88u89109tEaxLXpm7tzPHUiuk/D/ZtFy1JtJxZfLPHII5q53ioxF7A
-GgD+wSudqXEc3gKs2bynFcvlWgiali2b3dxNWZ5qRP652Mebtdl4H67/bSsKnhEX
-CcE/6M9wD9oWIdgaoL49rKZnU3ubSz0A5AwNhZiqGk70SbcAYrVWfZH1ApyBnt+8
-jMogdK5eP4afg8zXeCSXaDF45MMQP7+gRsY=
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafernp.insa.gov.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafernp.insa.gov.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://cafernp.insa.gov.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cafernp.insa.gov.br/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://cafernp.insa.gov.br/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://cafernp.insa.gov.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">insa.gov.br</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-      
-MIIDpjCCAo4CAQAwDQYJKoZIhvcNAQEFBQAwgZgxDTALBgNVBAoTBElOU0ExDDAK
-BgNVBAsTA0NQRDEjMCEGCSqGSIb3DQEJARYUcHBhY2hlY29AaW5zYS5nb3YuYnIx
-FzAVBgNVBAcTDkNhbXBpbmEgR3JhbmRlMRAwDgYDVQQIEwdQYXJhaWJhMQswCQYD
-VQQGEwJCUjEcMBoGA1UEAxMTY2FmZXJucC5pbnNhLmdvdi5icjAeFw0xMzA5MDUx
-MTQ3MDRaFw0xNjA5MDQxMTQ3MDRaMIGYMQ0wCwYDVQQKEwRJTlNBMQwwCgYDVQQL
-EwNDUEQxIzAhBgkqhkiG9w0BCQEWFHBwYWNoZWNvQGluc2EuZ292LmJyMRcwFQYD
-VQQHEw5DYW1waW5hIEdyYW5kZTEQMA4GA1UECBMHUGFyYWliYTELMAkGA1UEBhMC
-QlIxHDAaBgNVBAMTE2NhZmVybnAuaW5zYS5nb3YuYnIwggEiMA0GCSqGSIb3DQEB
-AQUAA4IBDwAwggEKAoIBAQC6e7hlynC3DhhZh4vMpmlAGM9jGjQIRJNXmDIBU+YN
-TVhwfM8+HzMGuUhqPdoFL2aGJmJVn5TRsOjAIlK6TuHYPVJjZFrV5CGaimuXDkqH
-6nFgKoFLI6Zg0+vNUOGIQvfT1TpZaonPRqIu4MpKEDEtEk8bFkfsqxq55ivcLLYp
-GwGTZMGGBcaAztR0GRBooh3WDLIQR9gkzhxeTHEPiwF5jXGLIFZNR+kxo1ddmg4j
-svohDefVHSkTQZt6QptsGVa408tn2pokQ4K8Enmi9zMdR6LuKvdhoC8Rs1Cc8rlJ
-7Kj5KOMmOjniR03aokncdqNoBIUBijfV0gI58L1Uca53AgMBAAEwDQYJKoZIhvcN
-AQEFBQADggEBAGVgBV46eVFwW+kASWxOC3FprDP5q/1GDcaD3rKu471uU+nd/L5n
-p5xIKFBVIhx42FbAW7wpLRvhjPDCRDlXVKBgthbWGFawAyjtfPwJvR0aAowP0xHX
-QFFg7t0AXj88u89109tEaxLXpm7tzPHUiuk/D/ZtFy1JtJxZfLPHII5q53ioxF7A
-GgD+wSudqXEc3gKs2bynFcvlWgiali2b3dxNWZ5qRP652Mebtdl4H67/bSsKnhEX
-CcE/6M9wD9oWIdgaoL49rKZnU3ubSz0A5AwNhZiqGk70SbcAYrVWfZH1ApyBnt+8
-jMogdK5eP4afg8zXeCSXaDF45MMQP7+gRsY=
-                    
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafernp.insa.gov.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafernp.insa.gov.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">INSA - Instituto Nacional do Semiarido</OrganizationName>
-    <OrganizationName xml:lang="pt-br">INSA - Instituto Nacional do Semiarido</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">INSA - Instituto Nacional do Semiarido</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="pt-br">INSA - Instituto Nacional do Semiarido</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.insa.gov.br/</OrganizationURL>
-    <OrganizationURL xml:lang="pt-br">http://www.insa.gov.br/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Pedro Pacheco</SurName>
-    <EmailAddress>ppacheco@insa.gov.br</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/cafetools.ufpi.br-idp-shibboleth.xml b/swamid-interfederations-2.0/cafetools.ufpi.br-idp-shibboleth.xml
deleted file mode 100644
index f3684dde..00000000
--- a/swamid-interfederations-2.0/cafetools.ufpi.br-idp-shibboleth.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://cafetools.ufpi.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">ufpi.br</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">UFPI - Universidade Federal do Piaui</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="pt-br">UFPI - Universidade Federal do Piaui</mdui:DisplayName>
-        <mdui:Description xml:lang="en">UFPI - Universidade Federal do Piaui</mdui:Description>
-        <mdui:Description xml:lang="pt-br">UFPI - Universidade Federal do Piaui</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.ufpi.br/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="pt-br">http://www.ufpi.br/</mdui:InformationURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-    MIIDqjCCApICAQAwDQYJKoZIhvcNAQEFBQAwgZoxJjAkBgNVBAoTHVVuaXZlcnNp
-ZGFkZSBGZWRlcmFsIGRvIFBpYXVpMQwwCgYDVQQLEwNOVEkxHjAcBgkqhkiG9w0B
-CQEWD250aUB1ZnBpLmVkdS5icjERMA8GA1UEBxMIVGVyZXNpbmExDjAMBgNVBAgT
-BVBpYXVpMQswCQYDVQQGEwJCUjESMBAGA1UEAxMJY2FmZXRvb2xzMB4XDTEzMDcx
-NTE4NDUxMVoXDTE2MDcxNDE4NDUxMVowgZoxJjAkBgNVBAoTHVVuaXZlcnNpZGFk
-ZSBGZWRlcmFsIGRvIFBpYXVpMQwwCgYDVQQLEwNOVEkxHjAcBgkqhkiG9w0BCQEW
-D250aUB1ZnBpLmVkdS5icjERMA8GA1UEBxMIVGVyZXNpbmExDjAMBgNVBAgTBVBp
-YXVpMQswCQYDVQQGEwJCUjESMBAGA1UEAxMJY2FmZXRvb2xzMIIBIjANBgkqhkiG
-9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqkjRNJykzf+pYQwfB+HpWRnkVcg+lLI/wjQj
-CNfcjNeSFsXRVaPCrWzVJ6DlMnYM1sxkp9b+We5B5/t4P92XM+ZeFLvFEd5kbi50
-JlAqFLVQxVBjLJdJ9AvUxMn55bQAh9mw4ANMb0U0iYcB25POJ6vWjxCuQR68xV4t
-nqgYOk8/d299pXxeZd8VMPfasfazzov1fa2aqpdrb8dqX+6/RMJm71d3nBHsPJuO
-y5ixRrE3HHYS8K52Eah59GY0NBF3EpearDjCI/W2KVmMJE6kNtMDkq8cjOGLZCsb
-7sEb/uLpWn0Sxd7NPc6VkRzN5m1eFe4dQB3rz1dy9ngEa+GQjwIDAQABMA0GCSqG
-SIb3DQEBBQUAA4IBAQBfGXW54W7Y8WE5naezc3cFKrxErBdQ5ZvViX77Bsc3uNal
-EE2cXAkaYQbwKRa9Pp2zpkkr/wSKu2gZ1OwH4y8tWZf3kKzwxZa41fj2drWHYC88
-+d4igeWI86UWoIA9HcQ9LZtY6gZSqpkaeOeKniFR/xTXrOwFOtreWkkZ6w4mhCAj
-EEK4mjitPz1kjBkaaZcnDOYysPjZ7Iq5mrEFwVvW6xXSs0LnGevKMig8Bi8Kr+nW
-UXJvN7r9gpaML2SGcEcAmqVExt2IuPrtUGvIS7CaN3+gaFAC53gmK+30nwLwvBkC
-DqmYcKWK/3TMzk3nUXEJx2H36Knb+Hv/Hig1rx35
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafetools.ufpi.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafetools.ufpi.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://cafetools.ufpi.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cafetools.ufpi.br/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://cafetools.ufpi.br/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://cafetools.ufpi.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">ufpi.br</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-      
-MIIDqjCCApICAQAwDQYJKoZIhvcNAQEFBQAwgZoxJjAkBgNVBAoTHVVuaXZlcnNp
-ZGFkZSBGZWRlcmFsIGRvIFBpYXVpMQwwCgYDVQQLEwNOVEkxHjAcBgkqhkiG9w0B
-CQEWD250aUB1ZnBpLmVkdS5icjERMA8GA1UEBxMIVGVyZXNpbmExDjAMBgNVBAgT
-BVBpYXVpMQswCQYDVQQGEwJCUjESMBAGA1UEAxMJY2FmZXRvb2xzMB4XDTEzMDcx
-NTE4NDUxMVoXDTE2MDcxNDE4NDUxMVowgZoxJjAkBgNVBAoTHVVuaXZlcnNpZGFk
-ZSBGZWRlcmFsIGRvIFBpYXVpMQwwCgYDVQQLEwNOVEkxHjAcBgkqhkiG9w0BCQEW
-D250aUB1ZnBpLmVkdS5icjERMA8GA1UEBxMIVGVyZXNpbmExDjAMBgNVBAgTBVBp
-YXVpMQswCQYDVQQGEwJCUjESMBAGA1UEAxMJY2FmZXRvb2xzMIIBIjANBgkqhkiG
-9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqkjRNJykzf+pYQwfB+HpWRnkVcg+lLI/wjQj
-CNfcjNeSFsXRVaPCrWzVJ6DlMnYM1sxkp9b+We5B5/t4P92XM+ZeFLvFEd5kbi50
-JlAqFLVQxVBjLJdJ9AvUxMn55bQAh9mw4ANMb0U0iYcB25POJ6vWjxCuQR68xV4t
-nqgYOk8/d299pXxeZd8VMPfasfazzov1fa2aqpdrb8dqX+6/RMJm71d3nBHsPJuO
-y5ixRrE3HHYS8K52Eah59GY0NBF3EpearDjCI/W2KVmMJE6kNtMDkq8cjOGLZCsb
-7sEb/uLpWn0Sxd7NPc6VkRzN5m1eFe4dQB3rz1dy9ngEa+GQjwIDAQABMA0GCSqG
-SIb3DQEBBQUAA4IBAQBfGXW54W7Y8WE5naezc3cFKrxErBdQ5ZvViX77Bsc3uNal
-EE2cXAkaYQbwKRa9Pp2zpkkr/wSKu2gZ1OwH4y8tWZf3kKzwxZa41fj2drWHYC88
-+d4igeWI86UWoIA9HcQ9LZtY6gZSqpkaeOeKniFR/xTXrOwFOtreWkkZ6w4mhCAj
-EEK4mjitPz1kjBkaaZcnDOYysPjZ7Iq5mrEFwVvW6xXSs0LnGevKMig8Bi8Kr+nW
-UXJvN7r9gpaML2SGcEcAmqVExt2IuPrtUGvIS7CaN3+gaFAC53gmK+30nwLwvBkC
-DqmYcKWK/3TMzk3nUXEJx2H36Knb+Hv/Hig1rx35
-                    
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafetools.ufpi.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafetools.ufpi.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">UFPI - Univerisdade Federal do Piaui</OrganizationName>
-    <OrganizationName xml:lang="pt-br">UFPI - Univerisdade Federal do Piaui</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">UFPI - Universidade Federal do Piaui</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="pt-br">UFPI - Universidade Federal do Piaui</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.ufpi.br/</OrganizationURL>
-    <OrganizationURL xml:lang="pt-br">http://www.ufpi.br/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Arinaldo Silva</SurName>
-    <EmailAddress>arinaldo@ufpi.edu.br</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/cafetools.ufpi.br.xml b/swamid-interfederations-2.0/cafetools.ufpi.br.xml
deleted file mode 100644
index f3684dde..00000000
--- a/swamid-interfederations-2.0/cafetools.ufpi.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://cafetools.ufpi.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">ufpi.br</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">UFPI - Universidade Federal do Piaui</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="pt-br">UFPI - Universidade Federal do Piaui</mdui:DisplayName>
-        <mdui:Description xml:lang="en">UFPI - Universidade Federal do Piaui</mdui:Description>
-        <mdui:Description xml:lang="pt-br">UFPI - Universidade Federal do Piaui</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.ufpi.br/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="pt-br">http://www.ufpi.br/</mdui:InformationURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-    MIIDqjCCApICAQAwDQYJKoZIhvcNAQEFBQAwgZoxJjAkBgNVBAoTHVVuaXZlcnNp
-ZGFkZSBGZWRlcmFsIGRvIFBpYXVpMQwwCgYDVQQLEwNOVEkxHjAcBgkqhkiG9w0B
-CQEWD250aUB1ZnBpLmVkdS5icjERMA8GA1UEBxMIVGVyZXNpbmExDjAMBgNVBAgT
-BVBpYXVpMQswCQYDVQQGEwJCUjESMBAGA1UEAxMJY2FmZXRvb2xzMB4XDTEzMDcx
-NTE4NDUxMVoXDTE2MDcxNDE4NDUxMVowgZoxJjAkBgNVBAoTHVVuaXZlcnNpZGFk
-ZSBGZWRlcmFsIGRvIFBpYXVpMQwwCgYDVQQLEwNOVEkxHjAcBgkqhkiG9w0BCQEW
-D250aUB1ZnBpLmVkdS5icjERMA8GA1UEBxMIVGVyZXNpbmExDjAMBgNVBAgTBVBp
-YXVpMQswCQYDVQQGEwJCUjESMBAGA1UEAxMJY2FmZXRvb2xzMIIBIjANBgkqhkiG
-9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqkjRNJykzf+pYQwfB+HpWRnkVcg+lLI/wjQj
-CNfcjNeSFsXRVaPCrWzVJ6DlMnYM1sxkp9b+We5B5/t4P92XM+ZeFLvFEd5kbi50
-JlAqFLVQxVBjLJdJ9AvUxMn55bQAh9mw4ANMb0U0iYcB25POJ6vWjxCuQR68xV4t
-nqgYOk8/d299pXxeZd8VMPfasfazzov1fa2aqpdrb8dqX+6/RMJm71d3nBHsPJuO
-y5ixRrE3HHYS8K52Eah59GY0NBF3EpearDjCI/W2KVmMJE6kNtMDkq8cjOGLZCsb
-7sEb/uLpWn0Sxd7NPc6VkRzN5m1eFe4dQB3rz1dy9ngEa+GQjwIDAQABMA0GCSqG
-SIb3DQEBBQUAA4IBAQBfGXW54W7Y8WE5naezc3cFKrxErBdQ5ZvViX77Bsc3uNal
-EE2cXAkaYQbwKRa9Pp2zpkkr/wSKu2gZ1OwH4y8tWZf3kKzwxZa41fj2drWHYC88
-+d4igeWI86UWoIA9HcQ9LZtY6gZSqpkaeOeKniFR/xTXrOwFOtreWkkZ6w4mhCAj
-EEK4mjitPz1kjBkaaZcnDOYysPjZ7Iq5mrEFwVvW6xXSs0LnGevKMig8Bi8Kr+nW
-UXJvN7r9gpaML2SGcEcAmqVExt2IuPrtUGvIS7CaN3+gaFAC53gmK+30nwLwvBkC
-DqmYcKWK/3TMzk3nUXEJx2H36Knb+Hv/Hig1rx35
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafetools.ufpi.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafetools.ufpi.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://cafetools.ufpi.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cafetools.ufpi.br/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://cafetools.ufpi.br/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://cafetools.ufpi.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">ufpi.br</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-      
-MIIDqjCCApICAQAwDQYJKoZIhvcNAQEFBQAwgZoxJjAkBgNVBAoTHVVuaXZlcnNp
-ZGFkZSBGZWRlcmFsIGRvIFBpYXVpMQwwCgYDVQQLEwNOVEkxHjAcBgkqhkiG9w0B
-CQEWD250aUB1ZnBpLmVkdS5icjERMA8GA1UEBxMIVGVyZXNpbmExDjAMBgNVBAgT
-BVBpYXVpMQswCQYDVQQGEwJCUjESMBAGA1UEAxMJY2FmZXRvb2xzMB4XDTEzMDcx
-NTE4NDUxMVoXDTE2MDcxNDE4NDUxMVowgZoxJjAkBgNVBAoTHVVuaXZlcnNpZGFk
-ZSBGZWRlcmFsIGRvIFBpYXVpMQwwCgYDVQQLEwNOVEkxHjAcBgkqhkiG9w0BCQEW
-D250aUB1ZnBpLmVkdS5icjERMA8GA1UEBxMIVGVyZXNpbmExDjAMBgNVBAgTBVBp
-YXVpMQswCQYDVQQGEwJCUjESMBAGA1UEAxMJY2FmZXRvb2xzMIIBIjANBgkqhkiG
-9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqkjRNJykzf+pYQwfB+HpWRnkVcg+lLI/wjQj
-CNfcjNeSFsXRVaPCrWzVJ6DlMnYM1sxkp9b+We5B5/t4P92XM+ZeFLvFEd5kbi50
-JlAqFLVQxVBjLJdJ9AvUxMn55bQAh9mw4ANMb0U0iYcB25POJ6vWjxCuQR68xV4t
-nqgYOk8/d299pXxeZd8VMPfasfazzov1fa2aqpdrb8dqX+6/RMJm71d3nBHsPJuO
-y5ixRrE3HHYS8K52Eah59GY0NBF3EpearDjCI/W2KVmMJE6kNtMDkq8cjOGLZCsb
-7sEb/uLpWn0Sxd7NPc6VkRzN5m1eFe4dQB3rz1dy9ngEa+GQjwIDAQABMA0GCSqG
-SIb3DQEBBQUAA4IBAQBfGXW54W7Y8WE5naezc3cFKrxErBdQ5ZvViX77Bsc3uNal
-EE2cXAkaYQbwKRa9Pp2zpkkr/wSKu2gZ1OwH4y8tWZf3kKzwxZa41fj2drWHYC88
-+d4igeWI86UWoIA9HcQ9LZtY6gZSqpkaeOeKniFR/xTXrOwFOtreWkkZ6w4mhCAj
-EEK4mjitPz1kjBkaaZcnDOYysPjZ7Iq5mrEFwVvW6xXSs0LnGevKMig8Bi8Kr+nW
-UXJvN7r9gpaML2SGcEcAmqVExt2IuPrtUGvIS7CaN3+gaFAC53gmK+30nwLwvBkC
-DqmYcKWK/3TMzk3nUXEJx2H36Knb+Hv/Hig1rx35
-                    
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafetools.ufpi.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafetools.ufpi.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">UFPI - Univerisdade Federal do Piaui</OrganizationName>
-    <OrganizationName xml:lang="pt-br">UFPI - Univerisdade Federal do Piaui</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">UFPI - Universidade Federal do Piaui</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="pt-br">UFPI - Universidade Federal do Piaui</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.ufpi.br/</OrganizationURL>
-    <OrganizationURL xml:lang="pt-br">http://www.ufpi.br/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Arinaldo Silva</SurName>
-    <EmailAddress>arinaldo@ufpi.edu.br</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/capuccino.iff.edu.br-idp-shibboleth.xml b/swamid-interfederations-2.0/capuccino.iff.edu.br-idp-shibboleth.xml
deleted file mode 100644
index 23d2cca4..00000000
--- a/swamid-interfederations-2.0/capuccino.iff.edu.br-idp-shibboleth.xml
+++ /dev/null
@@ -1,122 +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://capuccino.iff.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">edu.br</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">IFF - Instituto Federal Fluminense</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="pt-br">IFF - Instituto Federal Fluminense</mdui:DisplayName>
-        <mdui:Description xml:lang="en">IFF - Instituto Federal Fluminense</mdui:Description>
-        <mdui:Description xml:lang="pt-br">IFF - Instituto Federal Fluminense</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.iff.edu.br/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="pt-br">http://www.iff.edu.br/</mdui:InformationURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-    MIIExTCCA62gAwIBAgIBADANBgkqhkiG9w0BAQUFADCBojELMAkGA1UEBhMCQlIx
-FzAVBgNVBAgTDlJpbyBkZSBKYW5laXJvMR4wHAYDVQQHExVDYW1wb3MgZG9zIEdv
-eXRhY2F6ZXMxDDAKBgNVBAoTA0lGRjENMAsGA1UECxMEREdUSTEdMBsGA1UEAxMU
-Y2FwdWNjaW5vLmlmZi5lZHUuYnIxHjAcBgkqhkiG9w0BCQEWD2RndGlAaWZmLmVk
-dS5icjAeFw0xNDA1MDYxODI1MjlaFw0xNzA1MDUxODI1MjlaMIGiMQswCQYDVQQG
-EwJCUjEXMBUGA1UECBMOUmlvIGRlIEphbmVpcm8xHjAcBgNVBAcTFUNhbXBvcyBk
-b3MgR295dGFjYXplczEMMAoGA1UEChMDSUZGMQ0wCwYDVQQLEwRER1RJMR0wGwYD
-VQQDExRjYXB1Y2Npbm8uaWZmLmVkdS5icjEeMBwGCSqGSIb3DQEJARYPZGd0aUBp
-ZmYuZWR1LmJyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA80pYCh/E
-audRt7/Kf2qHUJkoKEfQNUa4FKh/ysAT6E5FqvzomTo3uTSqCJiLEuz8MOKnuJm5
-/ly7CVJxwZ2X0JNol8dcP1o7sPpJHToICVBaPUuw1a+fmoMaXxuLiDp88ROwcW3S
-Pyp9s2QT3p18KkwmBUrCqrVAXA4GjMtUU5LWSpWVS9F05EAJGt6P5BUroFodEZbf
-CRd7lNBCOjTRUCaybY+/gPqPQmKw46FS9m00jy5WWe/zlsm+G0ibHRN51jCf5iMK
-0fsfLSC3xOHeXvJiBadb/Aiv8GPAdh41maXz/JvO6LMnTubrLGgw2rNUHTQgXmPj
-oaJdj0DUuYhXyQIDAQABo4IBAjCB/zAdBgNVHQ4EFgQUOHBSiatQxvVy78q6INXo
-i8IPZcYwgc8GA1UdIwSBxzCBxIAUOHBSiatQxvVy78q6INXoi8IPZcahgaikgaUw
-gaIxCzAJBgNVBAYTAkJSMRcwFQYDVQQIEw5SaW8gZGUgSmFuZWlybzEeMBwGA1UE
-BxMVQ2FtcG9zIGRvcyBHb3l0YWNhemVzMQwwCgYDVQQKEwNJRkYxDTALBgNVBAsT
-BERHVEkxHTAbBgNVBAMTFGNhcHVjY2luby5pZmYuZWR1LmJyMR4wHAYJKoZIhvcN
-AQkBFg9kZ3RpQGlmZi5lZHUuYnKCAQAwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0B
-AQUFAAOCAQEAidU39xZ6oiq7cuPC91caVg4grC5SoZ7MAYHuQ5MNbgQgF1bQBJ1E
-tGnpBVyJTf1nwYltymxwGov4FAo0qFiqxoDOat3pkgV9CxQSBI59fC9WNb7iS+DY
-X30fDa0t4i9bGTjjpCbuU7Sp5+MHcTJVXyA13dDRWaB+TaQn/NLjz+ilBe9/Tp1N
-QKwp2MNTYTRBCoVqIIrFhLQu2nb9AAMriuJ57gVEo8tdtgRLf5K2vjoipFCUc+R9
-uWZR1Bn1QFTSbPtu9lvgvdTlm8z0HwuDYFE5gbEvWllAHtzwNzz1NMz/S6hBw8W9
-pd0Oo1Kztbb+S9VqyAL+jGb+Hha5Kefw8g==
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://capuccino.iff.edu.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://capuccino.iff.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://capuccino.iff.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://capuccino.iff.edu.br/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://capuccino.iff.edu.br/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://capuccino.iff.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>
-      
-MIIExTCCA62gAwIBAgIBADANBgkqhkiG9w0BAQUFADCBojELMAkGA1UEBhMCQlIx
-FzAVBgNVBAgTDlJpbyBkZSBKYW5laXJvMR4wHAYDVQQHExVDYW1wb3MgZG9zIEdv
-eXRhY2F6ZXMxDDAKBgNVBAoTA0lGRjENMAsGA1UECxMEREdUSTEdMBsGA1UEAxMU
-Y2FwdWNjaW5vLmlmZi5lZHUuYnIxHjAcBgkqhkiG9w0BCQEWD2RndGlAaWZmLmVk
-dS5icjAeFw0xNDA1MDYxODI1MjlaFw0xNzA1MDUxODI1MjlaMIGiMQswCQYDVQQG
-EwJCUjEXMBUGA1UECBMOUmlvIGRlIEphbmVpcm8xHjAcBgNVBAcTFUNhbXBvcyBk
-b3MgR295dGFjYXplczEMMAoGA1UEChMDSUZGMQ0wCwYDVQQLEwRER1RJMR0wGwYD
-VQQDExRjYXB1Y2Npbm8uaWZmLmVkdS5icjEeMBwGCSqGSIb3DQEJARYPZGd0aUBp
-ZmYuZWR1LmJyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA80pYCh/E
-audRt7/Kf2qHUJkoKEfQNUa4FKh/ysAT6E5FqvzomTo3uTSqCJiLEuz8MOKnuJm5
-/ly7CVJxwZ2X0JNol8dcP1o7sPpJHToICVBaPUuw1a+fmoMaXxuLiDp88ROwcW3S
-Pyp9s2QT3p18KkwmBUrCqrVAXA4GjMtUU5LWSpWVS9F05EAJGt6P5BUroFodEZbf
-CRd7lNBCOjTRUCaybY+/gPqPQmKw46FS9m00jy5WWe/zlsm+G0ibHRN51jCf5iMK
-0fsfLSC3xOHeXvJiBadb/Aiv8GPAdh41maXz/JvO6LMnTubrLGgw2rNUHTQgXmPj
-oaJdj0DUuYhXyQIDAQABo4IBAjCB/zAdBgNVHQ4EFgQUOHBSiatQxvVy78q6INXo
-i8IPZcYwgc8GA1UdIwSBxzCBxIAUOHBSiatQxvVy78q6INXoi8IPZcahgaikgaUw
-gaIxCzAJBgNVBAYTAkJSMRcwFQYDVQQIEw5SaW8gZGUgSmFuZWlybzEeMBwGA1UE
-BxMVQ2FtcG9zIGRvcyBHb3l0YWNhemVzMQwwCgYDVQQKEwNJRkYxDTALBgNVBAsT
-BERHVEkxHTAbBgNVBAMTFGNhcHVjY2luby5pZmYuZWR1LmJyMR4wHAYJKoZIhvcN
-AQkBFg9kZ3RpQGlmZi5lZHUuYnKCAQAwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0B
-AQUFAAOCAQEAidU39xZ6oiq7cuPC91caVg4grC5SoZ7MAYHuQ5MNbgQgF1bQBJ1E
-tGnpBVyJTf1nwYltymxwGov4FAo0qFiqxoDOat3pkgV9CxQSBI59fC9WNb7iS+DY
-X30fDa0t4i9bGTjjpCbuU7Sp5+MHcTJVXyA13dDRWaB+TaQn/NLjz+ilBe9/Tp1N
-QKwp2MNTYTRBCoVqIIrFhLQu2nb9AAMriuJ57gVEo8tdtgRLf5K2vjoipFCUc+R9
-uWZR1Bn1QFTSbPtu9lvgvdTlm8z0HwuDYFE5gbEvWllAHtzwNzz1NMz/S6hBw8W9
-pd0Oo1Kztbb+S9VqyAL+jGb+Hha5Kefw8g==
-                    
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://capuccino.iff.edu.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://capuccino.iff.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">IFF - Instituto Federal Fluminense</OrganizationName>
-    <OrganizationName xml:lang="pt-br">IFF - Instituto Federal Fluminense</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">IFF - Instituto Federal Fluminense</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="pt-br">IFF - Instituto Federal Fluminense</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.iff.edu.br/</OrganizationURL>
-    <OrganizationURL xml:lang="pt-br">http://www.iff.edu.br/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Andre de Azevedo Cunha</SurName>
-    <EmailAddress>acunha@iff.edu.br</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/capuccino.iff.edu.br.xml b/swamid-interfederations-2.0/capuccino.iff.edu.br.xml
deleted file mode 100644
index 23d2cca4..00000000
--- a/swamid-interfederations-2.0/capuccino.iff.edu.br.xml
+++ /dev/null
@@ -1,122 +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://capuccino.iff.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">edu.br</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">IFF - Instituto Federal Fluminense</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="pt-br">IFF - Instituto Federal Fluminense</mdui:DisplayName>
-        <mdui:Description xml:lang="en">IFF - Instituto Federal Fluminense</mdui:Description>
-        <mdui:Description xml:lang="pt-br">IFF - Instituto Federal Fluminense</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.iff.edu.br/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="pt-br">http://www.iff.edu.br/</mdui:InformationURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-    MIIExTCCA62gAwIBAgIBADANBgkqhkiG9w0BAQUFADCBojELMAkGA1UEBhMCQlIx
-FzAVBgNVBAgTDlJpbyBkZSBKYW5laXJvMR4wHAYDVQQHExVDYW1wb3MgZG9zIEdv
-eXRhY2F6ZXMxDDAKBgNVBAoTA0lGRjENMAsGA1UECxMEREdUSTEdMBsGA1UEAxMU
-Y2FwdWNjaW5vLmlmZi5lZHUuYnIxHjAcBgkqhkiG9w0BCQEWD2RndGlAaWZmLmVk
-dS5icjAeFw0xNDA1MDYxODI1MjlaFw0xNzA1MDUxODI1MjlaMIGiMQswCQYDVQQG
-EwJCUjEXMBUGA1UECBMOUmlvIGRlIEphbmVpcm8xHjAcBgNVBAcTFUNhbXBvcyBk
-b3MgR295dGFjYXplczEMMAoGA1UEChMDSUZGMQ0wCwYDVQQLEwRER1RJMR0wGwYD
-VQQDExRjYXB1Y2Npbm8uaWZmLmVkdS5icjEeMBwGCSqGSIb3DQEJARYPZGd0aUBp
-ZmYuZWR1LmJyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA80pYCh/E
-audRt7/Kf2qHUJkoKEfQNUa4FKh/ysAT6E5FqvzomTo3uTSqCJiLEuz8MOKnuJm5
-/ly7CVJxwZ2X0JNol8dcP1o7sPpJHToICVBaPUuw1a+fmoMaXxuLiDp88ROwcW3S
-Pyp9s2QT3p18KkwmBUrCqrVAXA4GjMtUU5LWSpWVS9F05EAJGt6P5BUroFodEZbf
-CRd7lNBCOjTRUCaybY+/gPqPQmKw46FS9m00jy5WWe/zlsm+G0ibHRN51jCf5iMK
-0fsfLSC3xOHeXvJiBadb/Aiv8GPAdh41maXz/JvO6LMnTubrLGgw2rNUHTQgXmPj
-oaJdj0DUuYhXyQIDAQABo4IBAjCB/zAdBgNVHQ4EFgQUOHBSiatQxvVy78q6INXo
-i8IPZcYwgc8GA1UdIwSBxzCBxIAUOHBSiatQxvVy78q6INXoi8IPZcahgaikgaUw
-gaIxCzAJBgNVBAYTAkJSMRcwFQYDVQQIEw5SaW8gZGUgSmFuZWlybzEeMBwGA1UE
-BxMVQ2FtcG9zIGRvcyBHb3l0YWNhemVzMQwwCgYDVQQKEwNJRkYxDTALBgNVBAsT
-BERHVEkxHTAbBgNVBAMTFGNhcHVjY2luby5pZmYuZWR1LmJyMR4wHAYJKoZIhvcN
-AQkBFg9kZ3RpQGlmZi5lZHUuYnKCAQAwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0B
-AQUFAAOCAQEAidU39xZ6oiq7cuPC91caVg4grC5SoZ7MAYHuQ5MNbgQgF1bQBJ1E
-tGnpBVyJTf1nwYltymxwGov4FAo0qFiqxoDOat3pkgV9CxQSBI59fC9WNb7iS+DY
-X30fDa0t4i9bGTjjpCbuU7Sp5+MHcTJVXyA13dDRWaB+TaQn/NLjz+ilBe9/Tp1N
-QKwp2MNTYTRBCoVqIIrFhLQu2nb9AAMriuJ57gVEo8tdtgRLf5K2vjoipFCUc+R9
-uWZR1Bn1QFTSbPtu9lvgvdTlm8z0HwuDYFE5gbEvWllAHtzwNzz1NMz/S6hBw8W9
-pd0Oo1Kztbb+S9VqyAL+jGb+Hha5Kefw8g==
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://capuccino.iff.edu.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://capuccino.iff.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://capuccino.iff.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://capuccino.iff.edu.br/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://capuccino.iff.edu.br/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://capuccino.iff.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>
-      
-MIIExTCCA62gAwIBAgIBADANBgkqhkiG9w0BAQUFADCBojELMAkGA1UEBhMCQlIx
-FzAVBgNVBAgTDlJpbyBkZSBKYW5laXJvMR4wHAYDVQQHExVDYW1wb3MgZG9zIEdv
-eXRhY2F6ZXMxDDAKBgNVBAoTA0lGRjENMAsGA1UECxMEREdUSTEdMBsGA1UEAxMU
-Y2FwdWNjaW5vLmlmZi5lZHUuYnIxHjAcBgkqhkiG9w0BCQEWD2RndGlAaWZmLmVk
-dS5icjAeFw0xNDA1MDYxODI1MjlaFw0xNzA1MDUxODI1MjlaMIGiMQswCQYDVQQG
-EwJCUjEXMBUGA1UECBMOUmlvIGRlIEphbmVpcm8xHjAcBgNVBAcTFUNhbXBvcyBk
-b3MgR295dGFjYXplczEMMAoGA1UEChMDSUZGMQ0wCwYDVQQLEwRER1RJMR0wGwYD
-VQQDExRjYXB1Y2Npbm8uaWZmLmVkdS5icjEeMBwGCSqGSIb3DQEJARYPZGd0aUBp
-ZmYuZWR1LmJyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA80pYCh/E
-audRt7/Kf2qHUJkoKEfQNUa4FKh/ysAT6E5FqvzomTo3uTSqCJiLEuz8MOKnuJm5
-/ly7CVJxwZ2X0JNol8dcP1o7sPpJHToICVBaPUuw1a+fmoMaXxuLiDp88ROwcW3S
-Pyp9s2QT3p18KkwmBUrCqrVAXA4GjMtUU5LWSpWVS9F05EAJGt6P5BUroFodEZbf
-CRd7lNBCOjTRUCaybY+/gPqPQmKw46FS9m00jy5WWe/zlsm+G0ibHRN51jCf5iMK
-0fsfLSC3xOHeXvJiBadb/Aiv8GPAdh41maXz/JvO6LMnTubrLGgw2rNUHTQgXmPj
-oaJdj0DUuYhXyQIDAQABo4IBAjCB/zAdBgNVHQ4EFgQUOHBSiatQxvVy78q6INXo
-i8IPZcYwgc8GA1UdIwSBxzCBxIAUOHBSiatQxvVy78q6INXoi8IPZcahgaikgaUw
-gaIxCzAJBgNVBAYTAkJSMRcwFQYDVQQIEw5SaW8gZGUgSmFuZWlybzEeMBwGA1UE
-BxMVQ2FtcG9zIGRvcyBHb3l0YWNhemVzMQwwCgYDVQQKEwNJRkYxDTALBgNVBAsT
-BERHVEkxHTAbBgNVBAMTFGNhcHVjY2luby5pZmYuZWR1LmJyMR4wHAYJKoZIhvcN
-AQkBFg9kZ3RpQGlmZi5lZHUuYnKCAQAwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0B
-AQUFAAOCAQEAidU39xZ6oiq7cuPC91caVg4grC5SoZ7MAYHuQ5MNbgQgF1bQBJ1E
-tGnpBVyJTf1nwYltymxwGov4FAo0qFiqxoDOat3pkgV9CxQSBI59fC9WNb7iS+DY
-X30fDa0t4i9bGTjjpCbuU7Sp5+MHcTJVXyA13dDRWaB+TaQn/NLjz+ilBe9/Tp1N
-QKwp2MNTYTRBCoVqIIrFhLQu2nb9AAMriuJ57gVEo8tdtgRLf5K2vjoipFCUc+R9
-uWZR1Bn1QFTSbPtu9lvgvdTlm8z0HwuDYFE5gbEvWllAHtzwNzz1NMz/S6hBw8W9
-pd0Oo1Kztbb+S9VqyAL+jGb+Hha5Kefw8g==
-                    
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://capuccino.iff.edu.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://capuccino.iff.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">IFF - Instituto Federal Fluminense</OrganizationName>
-    <OrganizationName xml:lang="pt-br">IFF - Instituto Federal Fluminense</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">IFF - Instituto Federal Fluminense</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="pt-br">IFF - Instituto Federal Fluminense</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.iff.edu.br/</OrganizationURL>
-    <OrganizationURL xml:lang="pt-br">http://www.iff.edu.br/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Andre de Azevedo Cunha</SurName>
-    <EmailAddress>acunha@iff.edu.br</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/capuccino.info.ufrn.br-idp-shibboleth.xml b/swamid-interfederations-2.0/capuccino.info.ufrn.br-idp-shibboleth.xml
deleted file mode 100644
index 603aae3e..00000000
--- a/swamid-interfederations-2.0/capuccino.info.ufrn.br-idp-shibboleth.xml
+++ /dev/null
@@ -1,102 +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://capuccino.info.ufrn.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">ufrn.br</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">UFRN - Universidade Federal do Rio Grande do Norte</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="pt-br">UFRN - Universidade Federal do Rio Grande do Norte</mdui:DisplayName>
-        <mdui:Description xml:lang="en">UFRN - Universidade Federal do Rio Grande do Norte</mdui:Description>
-        <mdui:Description xml:lang="pt-br">UFRN - Universidade Federal do Rio Grande do Norte</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.ufrn.br/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="pt-br">http://www.ufrn.br/</mdui:InformationURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-    MIIC0jCCAboCAQAwDQYJKoZIhvcNAQEFBQAwLzEMMAoGA1UECxMDQ1BEMQswCQYD
-               VQQGEwJCUjESMBAGA1UEAxMJY2FwdWNjaW5vMB4XDTE0MDYwNTEzMTQ0OVoXDTE5
-               MDYwNDEzMTQ0OVowLzEMMAoGA1UECxMDQ1BEMQswCQYDVQQGEwJCUjESMBAGA1UE
-               AxMJY2FwdWNjaW5vMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA1tLx
-               +5Q99cvQ6T4dFLqtoXnaeVtePhdogMKFxJsNwxWL901s+NPJT3f4dkEJ9rMry6g2
-               Wg9U+f96mY5iViRSP09RF6IPyHwU0xUh6gZE2ggvLKKbddkU9I380M3n0SJWRSXe
-               rMZwL1qiVEA+Ysgvh1CS+NWKmTzn1GC3MCUjB4mA8fdZ+Xh+SlCbSEtbTo0nQxqt
-               g2xx+t+jO2YZIawYp+pYEza5gMWTI58csYXijWzWV/SqaUXDN7nEd08UpLVyzKEf
-               rtFsA/U5/v3cqdQ3f9czTABbp6RQuN8sXJ1z/rpID+og2W3o0QmIaJ/GtocyEWtK
-               U8KkFewao0aPe2OITQIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQAv43rE0bYSXgqb
-               PUkmyZn/EfLe9dsr6RFGfRWU3eSPIbcaZTf6cXuwWBc3sMURUMjRRNX1DsNpK9Yr
-               pFrHXusucXsnBz/1owJyFSNq2m0NZhSabKJvXS8KgvH237db1OP4hbqbZZ7PcTm/
-               CjCtIiYSn4O/xil76jd7B0vFMcICdWmojoJXJOuVuMGGERXhpI2pFC2X9LVafY1q
-               HiaTJ8XDtqq27T9Q2BYJBQoIjPPBF9wF3L4OCAJUCIs/I2vTaG3oR6gPVRo4AP01
-               XkH1cct5hhIN0719bcHVK1Rp9xpSWZT3DFO0qggrszg/du71sHZOQgW+z0tGH3BK
-               EnZQnP4F
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://capuccino.info.ufrn.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://capuccino.info.ufrn.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://capuccino.info.ufrn.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://capuccino.info.ufrn.br/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://capuccino.info.ufrn.br/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://capuccino.info.ufrn.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">ufrn.br</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-      
-               MIIC0jCCAboCAQAwDQYJKoZIhvcNAQEFBQAwLzEMMAoGA1UECxMDQ1BEMQswCQYD
-               VQQGEwJCUjESMBAGA1UEAxMJY2FwdWNjaW5vMB4XDTE0MDYwNTEzMTQ0OVoXDTE5
-               MDYwNDEzMTQ0OVowLzEMMAoGA1UECxMDQ1BEMQswCQYDVQQGEwJCUjESMBAGA1UE
-               AxMJY2FwdWNjaW5vMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA1tLx
-               +5Q99cvQ6T4dFLqtoXnaeVtePhdogMKFxJsNwxWL901s+NPJT3f4dkEJ9rMry6g2
-               Wg9U+f96mY5iViRSP09RF6IPyHwU0xUh6gZE2ggvLKKbddkU9I380M3n0SJWRSXe
-               rMZwL1qiVEA+Ysgvh1CS+NWKmTzn1GC3MCUjB4mA8fdZ+Xh+SlCbSEtbTo0nQxqt
-               g2xx+t+jO2YZIawYp+pYEza5gMWTI58csYXijWzWV/SqaUXDN7nEd08UpLVyzKEf
-               rtFsA/U5/v3cqdQ3f9czTABbp6RQuN8sXJ1z/rpID+og2W3o0QmIaJ/GtocyEWtK
-               U8KkFewao0aPe2OITQIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQAv43rE0bYSXgqb
-               PUkmyZn/EfLe9dsr6RFGfRWU3eSPIbcaZTf6cXuwWBc3sMURUMjRRNX1DsNpK9Yr
-               pFrHXusucXsnBz/1owJyFSNq2m0NZhSabKJvXS8KgvH237db1OP4hbqbZZ7PcTm/
-               CjCtIiYSn4O/xil76jd7B0vFMcICdWmojoJXJOuVuMGGERXhpI2pFC2X9LVafY1q
-               HiaTJ8XDtqq27T9Q2BYJBQoIjPPBF9wF3L4OCAJUCIs/I2vTaG3oR6gPVRo4AP01
-               XkH1cct5hhIN0719bcHVK1Rp9xpSWZT3DFO0qggrszg/du71sHZOQgW+z0tGH3BK
-               EnZQnP4F	
-	           
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://capuccino.info.ufrn.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://capuccino.info.ufrn.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">UFRN - Universidade Federal do Rio Grande do Norte</OrganizationName>
-    <OrganizationName xml:lang="pt-br">UFRN - Universidade Federal do Rio Grande do Norte</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">UFRN - Universidade Federal do Rio Grande do Norte</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="pt-br">UFRN - Universidade Federal do Rio Grande do Norte</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.ufrn.br/</OrganizationURL>
-    <OrganizationURL xml:lang="pt-br">http://www.ufrn.br/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>SINFO</SurName>
-    <EmailAddress>redes@info.ufrn.br</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/capuccino.info.ufrn.br.xml b/swamid-interfederations-2.0/capuccino.info.ufrn.br.xml
deleted file mode 100644
index 603aae3e..00000000
--- a/swamid-interfederations-2.0/capuccino.info.ufrn.br.xml
+++ /dev/null
@@ -1,102 +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://capuccino.info.ufrn.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">ufrn.br</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">UFRN - Universidade Federal do Rio Grande do Norte</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="pt-br">UFRN - Universidade Federal do Rio Grande do Norte</mdui:DisplayName>
-        <mdui:Description xml:lang="en">UFRN - Universidade Federal do Rio Grande do Norte</mdui:Description>
-        <mdui:Description xml:lang="pt-br">UFRN - Universidade Federal do Rio Grande do Norte</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.ufrn.br/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="pt-br">http://www.ufrn.br/</mdui:InformationURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-    MIIC0jCCAboCAQAwDQYJKoZIhvcNAQEFBQAwLzEMMAoGA1UECxMDQ1BEMQswCQYD
-               VQQGEwJCUjESMBAGA1UEAxMJY2FwdWNjaW5vMB4XDTE0MDYwNTEzMTQ0OVoXDTE5
-               MDYwNDEzMTQ0OVowLzEMMAoGA1UECxMDQ1BEMQswCQYDVQQGEwJCUjESMBAGA1UE
-               AxMJY2FwdWNjaW5vMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA1tLx
-               +5Q99cvQ6T4dFLqtoXnaeVtePhdogMKFxJsNwxWL901s+NPJT3f4dkEJ9rMry6g2
-               Wg9U+f96mY5iViRSP09RF6IPyHwU0xUh6gZE2ggvLKKbddkU9I380M3n0SJWRSXe
-               rMZwL1qiVEA+Ysgvh1CS+NWKmTzn1GC3MCUjB4mA8fdZ+Xh+SlCbSEtbTo0nQxqt
-               g2xx+t+jO2YZIawYp+pYEza5gMWTI58csYXijWzWV/SqaUXDN7nEd08UpLVyzKEf
-               rtFsA/U5/v3cqdQ3f9czTABbp6RQuN8sXJ1z/rpID+og2W3o0QmIaJ/GtocyEWtK
-               U8KkFewao0aPe2OITQIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQAv43rE0bYSXgqb
-               PUkmyZn/EfLe9dsr6RFGfRWU3eSPIbcaZTf6cXuwWBc3sMURUMjRRNX1DsNpK9Yr
-               pFrHXusucXsnBz/1owJyFSNq2m0NZhSabKJvXS8KgvH237db1OP4hbqbZZ7PcTm/
-               CjCtIiYSn4O/xil76jd7B0vFMcICdWmojoJXJOuVuMGGERXhpI2pFC2X9LVafY1q
-               HiaTJ8XDtqq27T9Q2BYJBQoIjPPBF9wF3L4OCAJUCIs/I2vTaG3oR6gPVRo4AP01
-               XkH1cct5hhIN0719bcHVK1Rp9xpSWZT3DFO0qggrszg/du71sHZOQgW+z0tGH3BK
-               EnZQnP4F
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://capuccino.info.ufrn.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://capuccino.info.ufrn.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://capuccino.info.ufrn.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://capuccino.info.ufrn.br/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://capuccino.info.ufrn.br/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://capuccino.info.ufrn.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">ufrn.br</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-      
-               MIIC0jCCAboCAQAwDQYJKoZIhvcNAQEFBQAwLzEMMAoGA1UECxMDQ1BEMQswCQYD
-               VQQGEwJCUjESMBAGA1UEAxMJY2FwdWNjaW5vMB4XDTE0MDYwNTEzMTQ0OVoXDTE5
-               MDYwNDEzMTQ0OVowLzEMMAoGA1UECxMDQ1BEMQswCQYDVQQGEwJCUjESMBAGA1UE
-               AxMJY2FwdWNjaW5vMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA1tLx
-               +5Q99cvQ6T4dFLqtoXnaeVtePhdogMKFxJsNwxWL901s+NPJT3f4dkEJ9rMry6g2
-               Wg9U+f96mY5iViRSP09RF6IPyHwU0xUh6gZE2ggvLKKbddkU9I380M3n0SJWRSXe
-               rMZwL1qiVEA+Ysgvh1CS+NWKmTzn1GC3MCUjB4mA8fdZ+Xh+SlCbSEtbTo0nQxqt
-               g2xx+t+jO2YZIawYp+pYEza5gMWTI58csYXijWzWV/SqaUXDN7nEd08UpLVyzKEf
-               rtFsA/U5/v3cqdQ3f9czTABbp6RQuN8sXJ1z/rpID+og2W3o0QmIaJ/GtocyEWtK
-               U8KkFewao0aPe2OITQIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQAv43rE0bYSXgqb
-               PUkmyZn/EfLe9dsr6RFGfRWU3eSPIbcaZTf6cXuwWBc3sMURUMjRRNX1DsNpK9Yr
-               pFrHXusucXsnBz/1owJyFSNq2m0NZhSabKJvXS8KgvH237db1OP4hbqbZZ7PcTm/
-               CjCtIiYSn4O/xil76jd7B0vFMcICdWmojoJXJOuVuMGGERXhpI2pFC2X9LVafY1q
-               HiaTJ8XDtqq27T9Q2BYJBQoIjPPBF9wF3L4OCAJUCIs/I2vTaG3oR6gPVRo4AP01
-               XkH1cct5hhIN0719bcHVK1Rp9xpSWZT3DFO0qggrszg/du71sHZOQgW+z0tGH3BK
-               EnZQnP4F	
-	           
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://capuccino.info.ufrn.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://capuccino.info.ufrn.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">UFRN - Universidade Federal do Rio Grande do Norte</OrganizationName>
-    <OrganizationName xml:lang="pt-br">UFRN - Universidade Federal do Rio Grande do Norte</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">UFRN - Universidade Federal do Rio Grande do Norte</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="pt-br">UFRN - Universidade Federal do Rio Grande do Norte</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.ufrn.br/</OrganizationURL>
-    <OrganizationURL xml:lang="pt-br">http://www.ufrn.br/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>SINFO</SurName>
-    <EmailAddress>redes@info.ufrn.br</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/cas.ac-martinique.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/cas.ac-martinique.fr-idp-shibboleth.xml
deleted file mode 100644
index 90e2a700..00000000
--- a/swamid-interfederations-2.0/cas.ac-martinique.fr-idp-shibboleth.xml
+++ /dev/null
@@ -1,207 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://cas.ac-martinique.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2012-10-11T17:08:55Z">
-      <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">ac-martinique.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">Rectorat de la Martinique</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIGWTCCBEGgAwIBAgIRAMqZetbGt8ukR4mFPKQv5A8wDQYJKoZIhvcNAQEFBQAw
-cTELMAkGA1UEBhMCRlIxLzAtBgNVBAoTJk1pbmlzdGVyZSBlZHVjYXRpb24gbmF0
-aW9uYWxlIChNRU5FU1IpMRQwEgYDVQQLEwsxMTAgMDQzIDAxNTEbMBkGA1UEAxMS
-QUMgSW5mcmFzdHJ1Y3R1cmVzMB4XDTE0MDQwODA2MjIyMloXDTE2MDQwODA2MjIy
-MlowgYsxCzAJBgNVBAYTAkZSMS8wLQYDVQQKEyZNaW5pc3RlcmUgRWR1Y2F0aW9u
-IE5hdGlvbmFsZSAoTUVORVNSKTEUMBIGA1UECxMLMTEwIDA0MyAwMTUxFjAUBgNV
-BAsTDWFjLW1hcnRpbmlxdWUxHTAbBgNVBAMTFGNhcy5hYy1tYXJ0aW5pcXVlLmZy
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAk1caNqvUqxiNHJbirx+D
-8HeBeamvHd1aZNtfmXeWKCLYLyT0nREx0zB3B5HWMHyAH/NW5UcDuViszF0Me9Js
-XG/lcfi5EBfoT6XRIxYMcN7mIKQoYg03/ySLMQrCZZGqaHy4J6HHzqHxL6IfY3Zh
-oEjkhDdRloSYEKya7XTN7UUzzDzUHH0Vlj8m+6f9PBac2aEDUbjGTDfDGajAY+A+
-B5V90WtUXd/S9Tf6OrcCP/VPzM+olJTXEypJoGao7X9jFaMddbubaX8vBBVeYy2K
-oNgvVghw9WoN6LClGLNT6TlvKRF6FFUEeWFwIXqdn8cYQrNVFysT9s94Im8BoD7V
-QQIDAQABo4IBzzCCAcswVQYDVR0RBE4wTIIUY2FzLmFjLW1hcnRpbmlxdWUuZnKC
-GWlkcC1wZXJzLmFjLW1hcnRpbmlxdWUuZnKCGXNzby1wZXJzLmFjLW1hcnRpbmlx
-dWUuZnIwSwYIKwYBBQUHAQEEPzA9MDsGCCsGAQUFBzAChi9odHRwOi8vd3d3Lmln
-Yy5lZHVjYXRpb24uZnIvSW5mcmFzdHJ1Y3R1cmVzLmNydDAfBgNVHSMEGDAWgBS+
-OCJ/ckap1oQVn9XIKH9cswIgyzAaBgNVHSAEEzARMA8GDSsGAQQBgZ5mRQEBBAEw
-gaoGA1UdHwSBojCBnzCBnKCBmaCBloYwaHR0cDovL2NybDEuaWdjLmVkdWNhdGlv
-bi5mci9JbmZyYXN0cnVjdHVyZXMuY3JshjBodHRwOi8vY3JsMi5pZ2MuZWR1Y2F0
-aW9uLmZyL0luZnJhc3RydWN0dXJlcy5jcmyGMGh0dHA6Ly9jcmwzLmlnYy5lZHVj
-YXRpb24uZnIvSW5mcmFzdHJ1Y3R1cmVzLmNybDATBgNVHSUEDDAKBggrBgEFBQcD
-ATAOBgNVHQ8BAf8EBAMCBaAwFgYDVR0OBA8EDUFVVE9fR0VORVJBVEUwDQYJKoZI
-hvcNAQEFBQADggIBACuEO2wSfgICblnd2LxPdpJsEdI//LRlzJF2ZHzL/l3PIgwd
-qflidLMDxQX2B2D/ELmHBicsdMH2S8GV4F72q0erECOlnPKYB+rAvmw8O57M8tsF
-xviveOe6DYd+jSyr7BgDymdzafrT624OrtmyfgRHAV7YZ2qjFLQVAIM4hVNP61S0
-dSsvoYV+swhHrfh7G6ZRYryL7WazgDBmyUMY5Lqo/THZAEC7u/7MCWfi4vwPoT9U
-3MOrJ3KGBG4tQ8xHXTCSvNV9FmLzb8QBEYaptdJhOu0if80KnPrjNM0EHWaFSgn6
-AnPSejCNgq/gT40FB4LnhLzqgFKEnRyqMCo8VVingDbkkTUdrymvtT/aYB2p01+i
-aN55n6XGzqdnBjgYk6/9tnEPUUSSYxINzmVBSHhyo/tNSob7dQO6kvq2NJqGID5M
-zYhjljK8wzOeMLjuv0bux7H/ojZQ0D/p2+YRaAlMQ2PrzbxL/dGCkD/yJcV1OMH5
-KLUe+w+8yPaPoTRCx47sYGA3OUiryiqCY5f34O9zDb1X+ric/zHCVrBhOdwS8V9R
-i/lo0Nch+3DxMyQVk7r4zqwqqjkuaPNn7qdyr03MfFMEqus5NFxaS0il4rg2ytF8
-bcdfuJUQwiErRhOCrnU4LNKkVeSIUkAQ0uA2GHwAy7ltey5aEv2LuQ4LRwXJ
-					    </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>
-					      MIIGYDCCBEigAwIBAgIQTm3n7ppMPdFiwgEO8rUaNzANBgkqhkiG9w0BAQUFADBx
-MQswCQYDVQQGEwJGUjEvMC0GA1UEChMmTWluaXN0ZXJlIGVkdWNhdGlvbiBuYXRp
-b25hbGUgKE1FTkVTUikxFDASBgNVBAsTCzExMCAwNDMgMDE1MRswGQYDVQQDExJB
-QyBJbmZyYXN0cnVjdHVyZXMwHhcNMTIwMzMwMTcwNzIzWhcNMTQwMzMwMTcwNzIz
-WjCBizELMAkGA1UEBhMCRlIxLzAtBgNVBAoTJk1pbmlzdGVyZSBFZHVjYXRpb24g
-TmF0aW9uYWxlIChNRU5FU1IpMRQwEgYDVQQLEwsxMTAgMDQzIDAxNTEWMBQGA1UE
-CxMNYWMtbWFydGluaXF1ZTEdMBsGA1UEAxMUY2FzLmFjLW1hcnRpbmlxdWUuZnIw
-ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQClCwy1npXP58lr6jKwI6XM
-LuBOJqRdPqKkXTB7EjxzGQxHoklm2Fa5N57tZlcUKNJPyO1XpKmzra/FtGsJQF8p
-DCclirl54I7XU6fMwWEyYTb2udWiGQXVyVNg+Ph2ictCz6YV3UK55Ynvu3vG4VmH
-zjl4Q6tn96+6pGea3rJZMNG8NKPH2W1evPDlKoOnD8437n4/uXjE8tt9Aqv7S9We
-R276kj38bs4HJ6M3LlKRq6+Pg+bX7cf3JAzEaCkd+Vl8FrVk+e1rvrfeeAWS/ABe
-Ie63FN3luP0FZE5vcAPQ93aK2cq23PwtOK08w5kS3eqlnRwF0wVMHHj25qLJnDDR
-AgMBAAGjggHXMIIB0zATBgNVHSUEDDAKBggrBgEFBQcDATAPBgNVHQ8BAf8EBQMD
-B6AAMFUGA1UdEQROMEyCFGNhcy5hYy1tYXJ0aW5pcXVlLmZyghlpZHAtcGVycy5h
-Yy1tYXJ0aW5pcXVlLmZyghlzc28tcGVycy5hYy1tYXJ0aW5pcXVlLmZyMEsGCCsG
-AQUFBwEBBD8wPTA7BggrBgEFBQcwAoYvaHR0cDovL3d3dy5pZ2MuZWR1Y2F0aW9u
-LmZyL0luZnJhc3RydWN0dXJlcy5jcnQwHwYDVR0jBBgwFoAUvjgif3JGqdaEFZ/V
-yCh/XLMCIMswGgYDVR0gBBMwETAPBg0rBgEEAYGeZkUBAQQBMIGqBgNVHR8EgaIw
-gZ8wgZyggZmggZaGMGh0dHA6Ly9jcmwxLmlnYy5lZHVjYXRpb24uZnIvSW5mcmFz
-dHJ1Y3R1cmVzLmNybIYwaHR0cDovL2NybDIuaWdjLmVkdWNhdGlvbi5mci9JbmZy
-YXN0cnVjdHVyZXMuY3JshjBodHRwOi8vY3JsMy5pZ2MuZWR1Y2F0aW9uLmZyL0lu
-ZnJhc3RydWN0dXJlcy5jcmwwHQYDVR0OBBYEFKy50amMEtWidJwOS3Ei8807iy9J
-MA0GCSqGSIb3DQEBBQUAA4ICAQBRtVZPiYYhMTqk0oPFNs5K/fHi909O+ATFJgav
-jI4wT2oY18uxPKBKSpchQ6nst6Y6OnHjZpufj0kO0B+2i5Wdd+98uFHVaRt1t6BT
-LWttIH1g2KSwzjTSGPhxmXOm+Cvfkjz7LpqtxSghDVIKKbHbsNAfd5CbEBLa4iEF
-WnE29FcscjXq/C/CXNn2jxJ1M7Tsa5jI07OgTDVORj0SftkxxfWyIOh01bm60DKS
-uSaGQbf6E6/+Mr1a+ReHloJtjt11EBenxLMCr+xPyvXvMs3/yjHBtDhIBV6bclbx
-tBMk695YhVZecIklJa2ZxsBfgLKXwBF0fAHqek4s933BSZ9YzZcYJcgOaXnUsmoo
-Cdm6ckM3AJKQmJ7Qm8ZON3xpRkCGME/LJZ0I5VyVH4LmwLjdxaPG/rlCkWGS7tZ2
-CCHsZyQl9nrFJr4hm5BnqR4OElWPgTgauuE/V/MgYutY5ddRSEZDGhQExrEWuUpD
-dp/IrK9QdMCUVExBLM3ytZF4o0h03QP+j6VooHxRfGnx8+oOmdrPqJwbaWVLIuN7
-M+N1xlI2Z97otMSsv58stg+5rn8YcurPuRLJj+Jrjy5msO5nTV8dOvbGX+KZtVh9
-ryE9kH5PnJp1K9rPo0fcFHuZ1FbypgMMWTXqcC6CeXNLifzWHmizh5LLIz77CwT3
-EcFaog==
-					    </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://cas.ac-martinique.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://cas.ac-martinique.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://cas.ac-martinique.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">ac-martinique.fr</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIGWTCCBEGgAwIBAgIRAMqZetbGt8ukR4mFPKQv5A8wDQYJKoZIhvcNAQEFBQAw
-cTELMAkGA1UEBhMCRlIxLzAtBgNVBAoTJk1pbmlzdGVyZSBlZHVjYXRpb24gbmF0
-aW9uYWxlIChNRU5FU1IpMRQwEgYDVQQLEwsxMTAgMDQzIDAxNTEbMBkGA1UEAxMS
-QUMgSW5mcmFzdHJ1Y3R1cmVzMB4XDTE0MDQwODA2MjIyMloXDTE2MDQwODA2MjIy
-MlowgYsxCzAJBgNVBAYTAkZSMS8wLQYDVQQKEyZNaW5pc3RlcmUgRWR1Y2F0aW9u
-IE5hdGlvbmFsZSAoTUVORVNSKTEUMBIGA1UECxMLMTEwIDA0MyAwMTUxFjAUBgNV
-BAsTDWFjLW1hcnRpbmlxdWUxHTAbBgNVBAMTFGNhcy5hYy1tYXJ0aW5pcXVlLmZy
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAk1caNqvUqxiNHJbirx+D
-8HeBeamvHd1aZNtfmXeWKCLYLyT0nREx0zB3B5HWMHyAH/NW5UcDuViszF0Me9Js
-XG/lcfi5EBfoT6XRIxYMcN7mIKQoYg03/ySLMQrCZZGqaHy4J6HHzqHxL6IfY3Zh
-oEjkhDdRloSYEKya7XTN7UUzzDzUHH0Vlj8m+6f9PBac2aEDUbjGTDfDGajAY+A+
-B5V90WtUXd/S9Tf6OrcCP/VPzM+olJTXEypJoGao7X9jFaMddbubaX8vBBVeYy2K
-oNgvVghw9WoN6LClGLNT6TlvKRF6FFUEeWFwIXqdn8cYQrNVFysT9s94Im8BoD7V
-QQIDAQABo4IBzzCCAcswVQYDVR0RBE4wTIIUY2FzLmFjLW1hcnRpbmlxdWUuZnKC
-GWlkcC1wZXJzLmFjLW1hcnRpbmlxdWUuZnKCGXNzby1wZXJzLmFjLW1hcnRpbmlx
-dWUuZnIwSwYIKwYBBQUHAQEEPzA9MDsGCCsGAQUFBzAChi9odHRwOi8vd3d3Lmln
-Yy5lZHVjYXRpb24uZnIvSW5mcmFzdHJ1Y3R1cmVzLmNydDAfBgNVHSMEGDAWgBS+
-OCJ/ckap1oQVn9XIKH9cswIgyzAaBgNVHSAEEzARMA8GDSsGAQQBgZ5mRQEBBAEw
-gaoGA1UdHwSBojCBnzCBnKCBmaCBloYwaHR0cDovL2NybDEuaWdjLmVkdWNhdGlv
-bi5mci9JbmZyYXN0cnVjdHVyZXMuY3JshjBodHRwOi8vY3JsMi5pZ2MuZWR1Y2F0
-aW9uLmZyL0luZnJhc3RydWN0dXJlcy5jcmyGMGh0dHA6Ly9jcmwzLmlnYy5lZHVj
-YXRpb24uZnIvSW5mcmFzdHJ1Y3R1cmVzLmNybDATBgNVHSUEDDAKBggrBgEFBQcD
-ATAOBgNVHQ8BAf8EBAMCBaAwFgYDVR0OBA8EDUFVVE9fR0VORVJBVEUwDQYJKoZI
-hvcNAQEFBQADggIBACuEO2wSfgICblnd2LxPdpJsEdI//LRlzJF2ZHzL/l3PIgwd
-qflidLMDxQX2B2D/ELmHBicsdMH2S8GV4F72q0erECOlnPKYB+rAvmw8O57M8tsF
-xviveOe6DYd+jSyr7BgDymdzafrT624OrtmyfgRHAV7YZ2qjFLQVAIM4hVNP61S0
-dSsvoYV+swhHrfh7G6ZRYryL7WazgDBmyUMY5Lqo/THZAEC7u/7MCWfi4vwPoT9U
-3MOrJ3KGBG4tQ8xHXTCSvNV9FmLzb8QBEYaptdJhOu0if80KnPrjNM0EHWaFSgn6
-AnPSejCNgq/gT40FB4LnhLzqgFKEnRyqMCo8VVingDbkkTUdrymvtT/aYB2p01+i
-aN55n6XGzqdnBjgYk6/9tnEPUUSSYxINzmVBSHhyo/tNSob7dQO6kvq2NJqGID5M
-zYhjljK8wzOeMLjuv0bux7H/ojZQ0D/p2+YRaAlMQ2PrzbxL/dGCkD/yJcV1OMH5
-KLUe+w+8yPaPoTRCx47sYGA3OUiryiqCY5f34O9zDb1X+ric/zHCVrBhOdwS8V9R
-i/lo0Nch+3DxMyQVk7r4zqwqqjkuaPNn7qdyr03MfFMEqus5NFxaS0il4rg2ytF8
-bcdfuJUQwiErRhOCrnU4LNKkVeSIUkAQ0uA2GHwAy7ltey5aEv2LuQ4LRwXJ
-					    </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>
-					      MIIGYDCCBEigAwIBAgIQTm3n7ppMPdFiwgEO8rUaNzANBgkqhkiG9w0BAQUFADBx
-MQswCQYDVQQGEwJGUjEvMC0GA1UEChMmTWluaXN0ZXJlIGVkdWNhdGlvbiBuYXRp
-b25hbGUgKE1FTkVTUikxFDASBgNVBAsTCzExMCAwNDMgMDE1MRswGQYDVQQDExJB
-QyBJbmZyYXN0cnVjdHVyZXMwHhcNMTIwMzMwMTcwNzIzWhcNMTQwMzMwMTcwNzIz
-WjCBizELMAkGA1UEBhMCRlIxLzAtBgNVBAoTJk1pbmlzdGVyZSBFZHVjYXRpb24g
-TmF0aW9uYWxlIChNRU5FU1IpMRQwEgYDVQQLEwsxMTAgMDQzIDAxNTEWMBQGA1UE
-CxMNYWMtbWFydGluaXF1ZTEdMBsGA1UEAxMUY2FzLmFjLW1hcnRpbmlxdWUuZnIw
-ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQClCwy1npXP58lr6jKwI6XM
-LuBOJqRdPqKkXTB7EjxzGQxHoklm2Fa5N57tZlcUKNJPyO1XpKmzra/FtGsJQF8p
-DCclirl54I7XU6fMwWEyYTb2udWiGQXVyVNg+Ph2ictCz6YV3UK55Ynvu3vG4VmH
-zjl4Q6tn96+6pGea3rJZMNG8NKPH2W1evPDlKoOnD8437n4/uXjE8tt9Aqv7S9We
-R276kj38bs4HJ6M3LlKRq6+Pg+bX7cf3JAzEaCkd+Vl8FrVk+e1rvrfeeAWS/ABe
-Ie63FN3luP0FZE5vcAPQ93aK2cq23PwtOK08w5kS3eqlnRwF0wVMHHj25qLJnDDR
-AgMBAAGjggHXMIIB0zATBgNVHSUEDDAKBggrBgEFBQcDATAPBgNVHQ8BAf8EBQMD
-B6AAMFUGA1UdEQROMEyCFGNhcy5hYy1tYXJ0aW5pcXVlLmZyghlpZHAtcGVycy5h
-Yy1tYXJ0aW5pcXVlLmZyghlzc28tcGVycy5hYy1tYXJ0aW5pcXVlLmZyMEsGCCsG
-AQUFBwEBBD8wPTA7BggrBgEFBQcwAoYvaHR0cDovL3d3dy5pZ2MuZWR1Y2F0aW9u
-LmZyL0luZnJhc3RydWN0dXJlcy5jcnQwHwYDVR0jBBgwFoAUvjgif3JGqdaEFZ/V
-yCh/XLMCIMswGgYDVR0gBBMwETAPBg0rBgEEAYGeZkUBAQQBMIGqBgNVHR8EgaIw
-gZ8wgZyggZmggZaGMGh0dHA6Ly9jcmwxLmlnYy5lZHVjYXRpb24uZnIvSW5mcmFz
-dHJ1Y3R1cmVzLmNybIYwaHR0cDovL2NybDIuaWdjLmVkdWNhdGlvbi5mci9JbmZy
-YXN0cnVjdHVyZXMuY3JshjBodHRwOi8vY3JsMy5pZ2MuZWR1Y2F0aW9uLmZyL0lu
-ZnJhc3RydWN0dXJlcy5jcmwwHQYDVR0OBBYEFKy50amMEtWidJwOS3Ei8807iy9J
-MA0GCSqGSIb3DQEBBQUAA4ICAQBRtVZPiYYhMTqk0oPFNs5K/fHi909O+ATFJgav
-jI4wT2oY18uxPKBKSpchQ6nst6Y6OnHjZpufj0kO0B+2i5Wdd+98uFHVaRt1t6BT
-LWttIH1g2KSwzjTSGPhxmXOm+Cvfkjz7LpqtxSghDVIKKbHbsNAfd5CbEBLa4iEF
-WnE29FcscjXq/C/CXNn2jxJ1M7Tsa5jI07OgTDVORj0SftkxxfWyIOh01bm60DKS
-uSaGQbf6E6/+Mr1a+ReHloJtjt11EBenxLMCr+xPyvXvMs3/yjHBtDhIBV6bclbx
-tBMk695YhVZecIklJa2ZxsBfgLKXwBF0fAHqek4s933BSZ9YzZcYJcgOaXnUsmoo
-Cdm6ckM3AJKQmJ7Qm8ZON3xpRkCGME/LJZ0I5VyVH4LmwLjdxaPG/rlCkWGS7tZ2
-CCHsZyQl9nrFJr4hm5BnqR4OElWPgTgauuE/V/MgYutY5ddRSEZDGhQExrEWuUpD
-dp/IrK9QdMCUVExBLM3ytZF4o0h03QP+j6VooHxRfGnx8+oOmdrPqJwbaWVLIuN7
-M+N1xlI2Z97otMSsv58stg+5rn8YcurPuRLJj+Jrjy5msO5nTV8dOvbGX+KZtVh9
-ryE9kH5PnJp1K9rPo0fcFHuZ1FbypgMMWTXqcC6CeXNLifzWHmizh5LLIz77CwT3
-EcFaog==
-					    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cas.ac-martinique.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">Rectorat de la Martinique</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Rectorat de la Martinique</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <EmailAddress>dsi@ac-martinique.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/cas.ac-martinique.fr.xml b/swamid-interfederations-2.0/cas.ac-martinique.fr.xml
deleted file mode 100644
index 90e2a700..00000000
--- a/swamid-interfederations-2.0/cas.ac-martinique.fr.xml
+++ /dev/null
@@ -1,207 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://cas.ac-martinique.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2012-10-11T17:08:55Z">
-      <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">ac-martinique.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">Rectorat de la Martinique</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIGWTCCBEGgAwIBAgIRAMqZetbGt8ukR4mFPKQv5A8wDQYJKoZIhvcNAQEFBQAw
-cTELMAkGA1UEBhMCRlIxLzAtBgNVBAoTJk1pbmlzdGVyZSBlZHVjYXRpb24gbmF0
-aW9uYWxlIChNRU5FU1IpMRQwEgYDVQQLEwsxMTAgMDQzIDAxNTEbMBkGA1UEAxMS
-QUMgSW5mcmFzdHJ1Y3R1cmVzMB4XDTE0MDQwODA2MjIyMloXDTE2MDQwODA2MjIy
-MlowgYsxCzAJBgNVBAYTAkZSMS8wLQYDVQQKEyZNaW5pc3RlcmUgRWR1Y2F0aW9u
-IE5hdGlvbmFsZSAoTUVORVNSKTEUMBIGA1UECxMLMTEwIDA0MyAwMTUxFjAUBgNV
-BAsTDWFjLW1hcnRpbmlxdWUxHTAbBgNVBAMTFGNhcy5hYy1tYXJ0aW5pcXVlLmZy
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAk1caNqvUqxiNHJbirx+D
-8HeBeamvHd1aZNtfmXeWKCLYLyT0nREx0zB3B5HWMHyAH/NW5UcDuViszF0Me9Js
-XG/lcfi5EBfoT6XRIxYMcN7mIKQoYg03/ySLMQrCZZGqaHy4J6HHzqHxL6IfY3Zh
-oEjkhDdRloSYEKya7XTN7UUzzDzUHH0Vlj8m+6f9PBac2aEDUbjGTDfDGajAY+A+
-B5V90WtUXd/S9Tf6OrcCP/VPzM+olJTXEypJoGao7X9jFaMddbubaX8vBBVeYy2K
-oNgvVghw9WoN6LClGLNT6TlvKRF6FFUEeWFwIXqdn8cYQrNVFysT9s94Im8BoD7V
-QQIDAQABo4IBzzCCAcswVQYDVR0RBE4wTIIUY2FzLmFjLW1hcnRpbmlxdWUuZnKC
-GWlkcC1wZXJzLmFjLW1hcnRpbmlxdWUuZnKCGXNzby1wZXJzLmFjLW1hcnRpbmlx
-dWUuZnIwSwYIKwYBBQUHAQEEPzA9MDsGCCsGAQUFBzAChi9odHRwOi8vd3d3Lmln
-Yy5lZHVjYXRpb24uZnIvSW5mcmFzdHJ1Y3R1cmVzLmNydDAfBgNVHSMEGDAWgBS+
-OCJ/ckap1oQVn9XIKH9cswIgyzAaBgNVHSAEEzARMA8GDSsGAQQBgZ5mRQEBBAEw
-gaoGA1UdHwSBojCBnzCBnKCBmaCBloYwaHR0cDovL2NybDEuaWdjLmVkdWNhdGlv
-bi5mci9JbmZyYXN0cnVjdHVyZXMuY3JshjBodHRwOi8vY3JsMi5pZ2MuZWR1Y2F0
-aW9uLmZyL0luZnJhc3RydWN0dXJlcy5jcmyGMGh0dHA6Ly9jcmwzLmlnYy5lZHVj
-YXRpb24uZnIvSW5mcmFzdHJ1Y3R1cmVzLmNybDATBgNVHSUEDDAKBggrBgEFBQcD
-ATAOBgNVHQ8BAf8EBAMCBaAwFgYDVR0OBA8EDUFVVE9fR0VORVJBVEUwDQYJKoZI
-hvcNAQEFBQADggIBACuEO2wSfgICblnd2LxPdpJsEdI//LRlzJF2ZHzL/l3PIgwd
-qflidLMDxQX2B2D/ELmHBicsdMH2S8GV4F72q0erECOlnPKYB+rAvmw8O57M8tsF
-xviveOe6DYd+jSyr7BgDymdzafrT624OrtmyfgRHAV7YZ2qjFLQVAIM4hVNP61S0
-dSsvoYV+swhHrfh7G6ZRYryL7WazgDBmyUMY5Lqo/THZAEC7u/7MCWfi4vwPoT9U
-3MOrJ3KGBG4tQ8xHXTCSvNV9FmLzb8QBEYaptdJhOu0if80KnPrjNM0EHWaFSgn6
-AnPSejCNgq/gT40FB4LnhLzqgFKEnRyqMCo8VVingDbkkTUdrymvtT/aYB2p01+i
-aN55n6XGzqdnBjgYk6/9tnEPUUSSYxINzmVBSHhyo/tNSob7dQO6kvq2NJqGID5M
-zYhjljK8wzOeMLjuv0bux7H/ojZQ0D/p2+YRaAlMQ2PrzbxL/dGCkD/yJcV1OMH5
-KLUe+w+8yPaPoTRCx47sYGA3OUiryiqCY5f34O9zDb1X+ric/zHCVrBhOdwS8V9R
-i/lo0Nch+3DxMyQVk7r4zqwqqjkuaPNn7qdyr03MfFMEqus5NFxaS0il4rg2ytF8
-bcdfuJUQwiErRhOCrnU4LNKkVeSIUkAQ0uA2GHwAy7ltey5aEv2LuQ4LRwXJ
-					    </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>
-					      MIIGYDCCBEigAwIBAgIQTm3n7ppMPdFiwgEO8rUaNzANBgkqhkiG9w0BAQUFADBx
-MQswCQYDVQQGEwJGUjEvMC0GA1UEChMmTWluaXN0ZXJlIGVkdWNhdGlvbiBuYXRp
-b25hbGUgKE1FTkVTUikxFDASBgNVBAsTCzExMCAwNDMgMDE1MRswGQYDVQQDExJB
-QyBJbmZyYXN0cnVjdHVyZXMwHhcNMTIwMzMwMTcwNzIzWhcNMTQwMzMwMTcwNzIz
-WjCBizELMAkGA1UEBhMCRlIxLzAtBgNVBAoTJk1pbmlzdGVyZSBFZHVjYXRpb24g
-TmF0aW9uYWxlIChNRU5FU1IpMRQwEgYDVQQLEwsxMTAgMDQzIDAxNTEWMBQGA1UE
-CxMNYWMtbWFydGluaXF1ZTEdMBsGA1UEAxMUY2FzLmFjLW1hcnRpbmlxdWUuZnIw
-ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQClCwy1npXP58lr6jKwI6XM
-LuBOJqRdPqKkXTB7EjxzGQxHoklm2Fa5N57tZlcUKNJPyO1XpKmzra/FtGsJQF8p
-DCclirl54I7XU6fMwWEyYTb2udWiGQXVyVNg+Ph2ictCz6YV3UK55Ynvu3vG4VmH
-zjl4Q6tn96+6pGea3rJZMNG8NKPH2W1evPDlKoOnD8437n4/uXjE8tt9Aqv7S9We
-R276kj38bs4HJ6M3LlKRq6+Pg+bX7cf3JAzEaCkd+Vl8FrVk+e1rvrfeeAWS/ABe
-Ie63FN3luP0FZE5vcAPQ93aK2cq23PwtOK08w5kS3eqlnRwF0wVMHHj25qLJnDDR
-AgMBAAGjggHXMIIB0zATBgNVHSUEDDAKBggrBgEFBQcDATAPBgNVHQ8BAf8EBQMD
-B6AAMFUGA1UdEQROMEyCFGNhcy5hYy1tYXJ0aW5pcXVlLmZyghlpZHAtcGVycy5h
-Yy1tYXJ0aW5pcXVlLmZyghlzc28tcGVycy5hYy1tYXJ0aW5pcXVlLmZyMEsGCCsG
-AQUFBwEBBD8wPTA7BggrBgEFBQcwAoYvaHR0cDovL3d3dy5pZ2MuZWR1Y2F0aW9u
-LmZyL0luZnJhc3RydWN0dXJlcy5jcnQwHwYDVR0jBBgwFoAUvjgif3JGqdaEFZ/V
-yCh/XLMCIMswGgYDVR0gBBMwETAPBg0rBgEEAYGeZkUBAQQBMIGqBgNVHR8EgaIw
-gZ8wgZyggZmggZaGMGh0dHA6Ly9jcmwxLmlnYy5lZHVjYXRpb24uZnIvSW5mcmFz
-dHJ1Y3R1cmVzLmNybIYwaHR0cDovL2NybDIuaWdjLmVkdWNhdGlvbi5mci9JbmZy
-YXN0cnVjdHVyZXMuY3JshjBodHRwOi8vY3JsMy5pZ2MuZWR1Y2F0aW9uLmZyL0lu
-ZnJhc3RydWN0dXJlcy5jcmwwHQYDVR0OBBYEFKy50amMEtWidJwOS3Ei8807iy9J
-MA0GCSqGSIb3DQEBBQUAA4ICAQBRtVZPiYYhMTqk0oPFNs5K/fHi909O+ATFJgav
-jI4wT2oY18uxPKBKSpchQ6nst6Y6OnHjZpufj0kO0B+2i5Wdd+98uFHVaRt1t6BT
-LWttIH1g2KSwzjTSGPhxmXOm+Cvfkjz7LpqtxSghDVIKKbHbsNAfd5CbEBLa4iEF
-WnE29FcscjXq/C/CXNn2jxJ1M7Tsa5jI07OgTDVORj0SftkxxfWyIOh01bm60DKS
-uSaGQbf6E6/+Mr1a+ReHloJtjt11EBenxLMCr+xPyvXvMs3/yjHBtDhIBV6bclbx
-tBMk695YhVZecIklJa2ZxsBfgLKXwBF0fAHqek4s933BSZ9YzZcYJcgOaXnUsmoo
-Cdm6ckM3AJKQmJ7Qm8ZON3xpRkCGME/LJZ0I5VyVH4LmwLjdxaPG/rlCkWGS7tZ2
-CCHsZyQl9nrFJr4hm5BnqR4OElWPgTgauuE/V/MgYutY5ddRSEZDGhQExrEWuUpD
-dp/IrK9QdMCUVExBLM3ytZF4o0h03QP+j6VooHxRfGnx8+oOmdrPqJwbaWVLIuN7
-M+N1xlI2Z97otMSsv58stg+5rn8YcurPuRLJj+Jrjy5msO5nTV8dOvbGX+KZtVh9
-ryE9kH5PnJp1K9rPo0fcFHuZ1FbypgMMWTXqcC6CeXNLifzWHmizh5LLIz77CwT3
-EcFaog==
-					    </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://cas.ac-martinique.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://cas.ac-martinique.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://cas.ac-martinique.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">ac-martinique.fr</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIGWTCCBEGgAwIBAgIRAMqZetbGt8ukR4mFPKQv5A8wDQYJKoZIhvcNAQEFBQAw
-cTELMAkGA1UEBhMCRlIxLzAtBgNVBAoTJk1pbmlzdGVyZSBlZHVjYXRpb24gbmF0
-aW9uYWxlIChNRU5FU1IpMRQwEgYDVQQLEwsxMTAgMDQzIDAxNTEbMBkGA1UEAxMS
-QUMgSW5mcmFzdHJ1Y3R1cmVzMB4XDTE0MDQwODA2MjIyMloXDTE2MDQwODA2MjIy
-MlowgYsxCzAJBgNVBAYTAkZSMS8wLQYDVQQKEyZNaW5pc3RlcmUgRWR1Y2F0aW9u
-IE5hdGlvbmFsZSAoTUVORVNSKTEUMBIGA1UECxMLMTEwIDA0MyAwMTUxFjAUBgNV
-BAsTDWFjLW1hcnRpbmlxdWUxHTAbBgNVBAMTFGNhcy5hYy1tYXJ0aW5pcXVlLmZy
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAk1caNqvUqxiNHJbirx+D
-8HeBeamvHd1aZNtfmXeWKCLYLyT0nREx0zB3B5HWMHyAH/NW5UcDuViszF0Me9Js
-XG/lcfi5EBfoT6XRIxYMcN7mIKQoYg03/ySLMQrCZZGqaHy4J6HHzqHxL6IfY3Zh
-oEjkhDdRloSYEKya7XTN7UUzzDzUHH0Vlj8m+6f9PBac2aEDUbjGTDfDGajAY+A+
-B5V90WtUXd/S9Tf6OrcCP/VPzM+olJTXEypJoGao7X9jFaMddbubaX8vBBVeYy2K
-oNgvVghw9WoN6LClGLNT6TlvKRF6FFUEeWFwIXqdn8cYQrNVFysT9s94Im8BoD7V
-QQIDAQABo4IBzzCCAcswVQYDVR0RBE4wTIIUY2FzLmFjLW1hcnRpbmlxdWUuZnKC
-GWlkcC1wZXJzLmFjLW1hcnRpbmlxdWUuZnKCGXNzby1wZXJzLmFjLW1hcnRpbmlx
-dWUuZnIwSwYIKwYBBQUHAQEEPzA9MDsGCCsGAQUFBzAChi9odHRwOi8vd3d3Lmln
-Yy5lZHVjYXRpb24uZnIvSW5mcmFzdHJ1Y3R1cmVzLmNydDAfBgNVHSMEGDAWgBS+
-OCJ/ckap1oQVn9XIKH9cswIgyzAaBgNVHSAEEzARMA8GDSsGAQQBgZ5mRQEBBAEw
-gaoGA1UdHwSBojCBnzCBnKCBmaCBloYwaHR0cDovL2NybDEuaWdjLmVkdWNhdGlv
-bi5mci9JbmZyYXN0cnVjdHVyZXMuY3JshjBodHRwOi8vY3JsMi5pZ2MuZWR1Y2F0
-aW9uLmZyL0luZnJhc3RydWN0dXJlcy5jcmyGMGh0dHA6Ly9jcmwzLmlnYy5lZHVj
-YXRpb24uZnIvSW5mcmFzdHJ1Y3R1cmVzLmNybDATBgNVHSUEDDAKBggrBgEFBQcD
-ATAOBgNVHQ8BAf8EBAMCBaAwFgYDVR0OBA8EDUFVVE9fR0VORVJBVEUwDQYJKoZI
-hvcNAQEFBQADggIBACuEO2wSfgICblnd2LxPdpJsEdI//LRlzJF2ZHzL/l3PIgwd
-qflidLMDxQX2B2D/ELmHBicsdMH2S8GV4F72q0erECOlnPKYB+rAvmw8O57M8tsF
-xviveOe6DYd+jSyr7BgDymdzafrT624OrtmyfgRHAV7YZ2qjFLQVAIM4hVNP61S0
-dSsvoYV+swhHrfh7G6ZRYryL7WazgDBmyUMY5Lqo/THZAEC7u/7MCWfi4vwPoT9U
-3MOrJ3KGBG4tQ8xHXTCSvNV9FmLzb8QBEYaptdJhOu0if80KnPrjNM0EHWaFSgn6
-AnPSejCNgq/gT40FB4LnhLzqgFKEnRyqMCo8VVingDbkkTUdrymvtT/aYB2p01+i
-aN55n6XGzqdnBjgYk6/9tnEPUUSSYxINzmVBSHhyo/tNSob7dQO6kvq2NJqGID5M
-zYhjljK8wzOeMLjuv0bux7H/ojZQ0D/p2+YRaAlMQ2PrzbxL/dGCkD/yJcV1OMH5
-KLUe+w+8yPaPoTRCx47sYGA3OUiryiqCY5f34O9zDb1X+ric/zHCVrBhOdwS8V9R
-i/lo0Nch+3DxMyQVk7r4zqwqqjkuaPNn7qdyr03MfFMEqus5NFxaS0il4rg2ytF8
-bcdfuJUQwiErRhOCrnU4LNKkVeSIUkAQ0uA2GHwAy7ltey5aEv2LuQ4LRwXJ
-					    </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>
-					      MIIGYDCCBEigAwIBAgIQTm3n7ppMPdFiwgEO8rUaNzANBgkqhkiG9w0BAQUFADBx
-MQswCQYDVQQGEwJGUjEvMC0GA1UEChMmTWluaXN0ZXJlIGVkdWNhdGlvbiBuYXRp
-b25hbGUgKE1FTkVTUikxFDASBgNVBAsTCzExMCAwNDMgMDE1MRswGQYDVQQDExJB
-QyBJbmZyYXN0cnVjdHVyZXMwHhcNMTIwMzMwMTcwNzIzWhcNMTQwMzMwMTcwNzIz
-WjCBizELMAkGA1UEBhMCRlIxLzAtBgNVBAoTJk1pbmlzdGVyZSBFZHVjYXRpb24g
-TmF0aW9uYWxlIChNRU5FU1IpMRQwEgYDVQQLEwsxMTAgMDQzIDAxNTEWMBQGA1UE
-CxMNYWMtbWFydGluaXF1ZTEdMBsGA1UEAxMUY2FzLmFjLW1hcnRpbmlxdWUuZnIw
-ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQClCwy1npXP58lr6jKwI6XM
-LuBOJqRdPqKkXTB7EjxzGQxHoklm2Fa5N57tZlcUKNJPyO1XpKmzra/FtGsJQF8p
-DCclirl54I7XU6fMwWEyYTb2udWiGQXVyVNg+Ph2ictCz6YV3UK55Ynvu3vG4VmH
-zjl4Q6tn96+6pGea3rJZMNG8NKPH2W1evPDlKoOnD8437n4/uXjE8tt9Aqv7S9We
-R276kj38bs4HJ6M3LlKRq6+Pg+bX7cf3JAzEaCkd+Vl8FrVk+e1rvrfeeAWS/ABe
-Ie63FN3luP0FZE5vcAPQ93aK2cq23PwtOK08w5kS3eqlnRwF0wVMHHj25qLJnDDR
-AgMBAAGjggHXMIIB0zATBgNVHSUEDDAKBggrBgEFBQcDATAPBgNVHQ8BAf8EBQMD
-B6AAMFUGA1UdEQROMEyCFGNhcy5hYy1tYXJ0aW5pcXVlLmZyghlpZHAtcGVycy5h
-Yy1tYXJ0aW5pcXVlLmZyghlzc28tcGVycy5hYy1tYXJ0aW5pcXVlLmZyMEsGCCsG
-AQUFBwEBBD8wPTA7BggrBgEFBQcwAoYvaHR0cDovL3d3dy5pZ2MuZWR1Y2F0aW9u
-LmZyL0luZnJhc3RydWN0dXJlcy5jcnQwHwYDVR0jBBgwFoAUvjgif3JGqdaEFZ/V
-yCh/XLMCIMswGgYDVR0gBBMwETAPBg0rBgEEAYGeZkUBAQQBMIGqBgNVHR8EgaIw
-gZ8wgZyggZmggZaGMGh0dHA6Ly9jcmwxLmlnYy5lZHVjYXRpb24uZnIvSW5mcmFz
-dHJ1Y3R1cmVzLmNybIYwaHR0cDovL2NybDIuaWdjLmVkdWNhdGlvbi5mci9JbmZy
-YXN0cnVjdHVyZXMuY3JshjBodHRwOi8vY3JsMy5pZ2MuZWR1Y2F0aW9uLmZyL0lu
-ZnJhc3RydWN0dXJlcy5jcmwwHQYDVR0OBBYEFKy50amMEtWidJwOS3Ei8807iy9J
-MA0GCSqGSIb3DQEBBQUAA4ICAQBRtVZPiYYhMTqk0oPFNs5K/fHi909O+ATFJgav
-jI4wT2oY18uxPKBKSpchQ6nst6Y6OnHjZpufj0kO0B+2i5Wdd+98uFHVaRt1t6BT
-LWttIH1g2KSwzjTSGPhxmXOm+Cvfkjz7LpqtxSghDVIKKbHbsNAfd5CbEBLa4iEF
-WnE29FcscjXq/C/CXNn2jxJ1M7Tsa5jI07OgTDVORj0SftkxxfWyIOh01bm60DKS
-uSaGQbf6E6/+Mr1a+ReHloJtjt11EBenxLMCr+xPyvXvMs3/yjHBtDhIBV6bclbx
-tBMk695YhVZecIklJa2ZxsBfgLKXwBF0fAHqek4s933BSZ9YzZcYJcgOaXnUsmoo
-Cdm6ckM3AJKQmJ7Qm8ZON3xpRkCGME/LJZ0I5VyVH4LmwLjdxaPG/rlCkWGS7tZ2
-CCHsZyQl9nrFJr4hm5BnqR4OElWPgTgauuE/V/MgYutY5ddRSEZDGhQExrEWuUpD
-dp/IrK9QdMCUVExBLM3ytZF4o0h03QP+j6VooHxRfGnx8+oOmdrPqJwbaWVLIuN7
-M+N1xlI2Z97otMSsv58stg+5rn8YcurPuRLJj+Jrjy5msO5nTV8dOvbGX+KZtVh9
-ryE9kH5PnJp1K9rPo0fcFHuZ1FbypgMMWTXqcC6CeXNLifzWHmizh5LLIz77CwT3
-EcFaog==
-					    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cas.ac-martinique.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">Rectorat de la Martinique</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Rectorat de la Martinique</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <EmailAddress>dsi@ac-martinique.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/cas.crous-lyon.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/cas.crous-lyon.fr-idp-shibboleth.xml
deleted file mode 100644
index 3667afee..00000000
--- a/swamid-interfederations-2.0/cas.crous-lyon.fr-idp-shibboleth.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://cas.crous-lyon.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2014-02-28T18:15:13Z">
-      <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">crous-lyon.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">CROUS de Lyon</mdui:DisplayName>
-        <mdui:Description xml:lang="en">personnel</mdui:Description>
-        <mdui:DisplayName xml:lang="fr">CROUS de Lyon</mdui:DisplayName>
-        <mdui:Description xml:lang="fr">personnel</mdui:Description>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIEazCCA1OgAwIBAgIQD/r9mkyd7FHhm+Vn+HXu9jANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTEzMDQyMzAwMDAwMFoXDTE2MDUxNDIzNTk1OVowPTEhMB8GA1UE
-CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRgwFgYDVQQDFA8qLmNyb3VzLWx5
-b24uZnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDUOIWis87bcAu0
-3sB8o4vXr6O54YuPdJM1wwn5uwyLl1BEXx4CytKCUAiNz4uNmVihqfxJo7inPsd/
-uysY1gqBoc7XDn8F3pbQUAOBGjyiGxNjgoo0a6d+8x48sOdC4kRgij+amXI0Y43J
-97x4UAVxjseFA/8vKnMt+sCVdHwrE5nHZuO4x4FkL3Y7Asg7ErEuXkyyUcGtpwk4
-t2mUw5GtZiUCT7V/Y5tmQAc9VeenXQWDouGLuJAoqa+3lPSOs6hNE/bFoxnKMNfI
-oThE10jbIyVJt3SxYMYvlYwFLAICjdgVoJo/8dsqSYsSz7rIzBoKnoRcdcQi4Q3h
-nhlCyMdfAgMBAAGjggFsMIIBaDAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3V0fq
-kOO57TAdBgNVHQ4EFgQUtZ9U7PnM4ivE9Akwvduvc11ew0owDgYDVR0PAQH/BAQD
-AgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMC
-MCIGA1UdIAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQIBMDoGA1UdHwQzMDEw
-L6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3Js
-MG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50Y3MudGVy
-ZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9vY3Nw
-LnRjcy50ZXJlbmEub3JnMBoGA1UdEQQTMBGCDyouY3JvdXMtbHlvbi5mcjANBgkq
-hkiG9w0BAQUFAAOCAQEAXsM+FOuM52ITtsVPjcayktwJxdMf+rF10sniHA9/q/7Q
-UXroyYOBXnDheMdvYu+CLjQDWRAaMek6oS1vQNJ4fNiRdlmvMFz1EGqPp2wTIUn7
-xx+NsR8asSFGRzdzmgzjQq/KyQRjXndfJLh+Lcw4WVRCSdQx12zo2XGoRWjKPMBx
-Olm9t5o1HQY/jMoFY86UBrph2N/3JZfSsOM/ZMWv+fvTy9ctSWvurG5GPlqL6s9Y
-wnk2bbaPLI1Ph9DUkTrS0hRDCo6BkiEzzEkHAXWHIeKaibJgcqMLQWk6eU468EbX
-h7cEmTn+zP3Mcv2/sPPJum0wXY7GawIUe3rgFBenoA==
-					    </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://cas.crous-lyon.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://cas.crous-lyon.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://cas.crous-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">crous-lyon.fr</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIEazCCA1OgAwIBAgIQD/r9mkyd7FHhm+Vn+HXu9jANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTEzMDQyMzAwMDAwMFoXDTE2MDUxNDIzNTk1OVowPTEhMB8GA1UE
-CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRgwFgYDVQQDFA8qLmNyb3VzLWx5
-b24uZnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDUOIWis87bcAu0
-3sB8o4vXr6O54YuPdJM1wwn5uwyLl1BEXx4CytKCUAiNz4uNmVihqfxJo7inPsd/
-uysY1gqBoc7XDn8F3pbQUAOBGjyiGxNjgoo0a6d+8x48sOdC4kRgij+amXI0Y43J
-97x4UAVxjseFA/8vKnMt+sCVdHwrE5nHZuO4x4FkL3Y7Asg7ErEuXkyyUcGtpwk4
-t2mUw5GtZiUCT7V/Y5tmQAc9VeenXQWDouGLuJAoqa+3lPSOs6hNE/bFoxnKMNfI
-oThE10jbIyVJt3SxYMYvlYwFLAICjdgVoJo/8dsqSYsSz7rIzBoKnoRcdcQi4Q3h
-nhlCyMdfAgMBAAGjggFsMIIBaDAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3V0fq
-kOO57TAdBgNVHQ4EFgQUtZ9U7PnM4ivE9Akwvduvc11ew0owDgYDVR0PAQH/BAQD
-AgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMC
-MCIGA1UdIAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQIBMDoGA1UdHwQzMDEw
-L6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3Js
-MG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50Y3MudGVy
-ZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9vY3Nw
-LnRjcy50ZXJlbmEub3JnMBoGA1UdEQQTMBGCDyouY3JvdXMtbHlvbi5mcjANBgkq
-hkiG9w0BAQUFAAOCAQEAXsM+FOuM52ITtsVPjcayktwJxdMf+rF10sniHA9/q/7Q
-UXroyYOBXnDheMdvYu+CLjQDWRAaMek6oS1vQNJ4fNiRdlmvMFz1EGqPp2wTIUn7
-xx+NsR8asSFGRzdzmgzjQq/KyQRjXndfJLh+Lcw4WVRCSdQx12zo2XGoRWjKPMBx
-Olm9t5o1HQY/jMoFY86UBrph2N/3JZfSsOM/ZMWv+fvTy9ctSWvurG5GPlqL6s9Y
-wnk2bbaPLI1Ph9DUkTrS0hRDCo6BkiEzzEkHAXWHIeKaibJgcqMLQWk6eU468EbX
-h7cEmTn+zP3Mcv2/sPPJum0wXY7GawIUe3rgFBenoA==
-					    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cas.crous-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">CROUS de Lyon</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">CROUS de Lyon</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <EmailAddress>sinfo@crous-lyon.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/cas.crous-lyon.fr.xml b/swamid-interfederations-2.0/cas.crous-lyon.fr.xml
deleted file mode 100644
index 3667afee..00000000
--- a/swamid-interfederations-2.0/cas.crous-lyon.fr.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://cas.crous-lyon.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2014-02-28T18:15:13Z">
-      <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">crous-lyon.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">CROUS de Lyon</mdui:DisplayName>
-        <mdui:Description xml:lang="en">personnel</mdui:Description>
-        <mdui:DisplayName xml:lang="fr">CROUS de Lyon</mdui:DisplayName>
-        <mdui:Description xml:lang="fr">personnel</mdui:Description>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIEazCCA1OgAwIBAgIQD/r9mkyd7FHhm+Vn+HXu9jANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTEzMDQyMzAwMDAwMFoXDTE2MDUxNDIzNTk1OVowPTEhMB8GA1UE
-CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRgwFgYDVQQDFA8qLmNyb3VzLWx5
-b24uZnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDUOIWis87bcAu0
-3sB8o4vXr6O54YuPdJM1wwn5uwyLl1BEXx4CytKCUAiNz4uNmVihqfxJo7inPsd/
-uysY1gqBoc7XDn8F3pbQUAOBGjyiGxNjgoo0a6d+8x48sOdC4kRgij+amXI0Y43J
-97x4UAVxjseFA/8vKnMt+sCVdHwrE5nHZuO4x4FkL3Y7Asg7ErEuXkyyUcGtpwk4
-t2mUw5GtZiUCT7V/Y5tmQAc9VeenXQWDouGLuJAoqa+3lPSOs6hNE/bFoxnKMNfI
-oThE10jbIyVJt3SxYMYvlYwFLAICjdgVoJo/8dsqSYsSz7rIzBoKnoRcdcQi4Q3h
-nhlCyMdfAgMBAAGjggFsMIIBaDAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3V0fq
-kOO57TAdBgNVHQ4EFgQUtZ9U7PnM4ivE9Akwvduvc11ew0owDgYDVR0PAQH/BAQD
-AgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMC
-MCIGA1UdIAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQIBMDoGA1UdHwQzMDEw
-L6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3Js
-MG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50Y3MudGVy
-ZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9vY3Nw
-LnRjcy50ZXJlbmEub3JnMBoGA1UdEQQTMBGCDyouY3JvdXMtbHlvbi5mcjANBgkq
-hkiG9w0BAQUFAAOCAQEAXsM+FOuM52ITtsVPjcayktwJxdMf+rF10sniHA9/q/7Q
-UXroyYOBXnDheMdvYu+CLjQDWRAaMek6oS1vQNJ4fNiRdlmvMFz1EGqPp2wTIUn7
-xx+NsR8asSFGRzdzmgzjQq/KyQRjXndfJLh+Lcw4WVRCSdQx12zo2XGoRWjKPMBx
-Olm9t5o1HQY/jMoFY86UBrph2N/3JZfSsOM/ZMWv+fvTy9ctSWvurG5GPlqL6s9Y
-wnk2bbaPLI1Ph9DUkTrS0hRDCo6BkiEzzEkHAXWHIeKaibJgcqMLQWk6eU468EbX
-h7cEmTn+zP3Mcv2/sPPJum0wXY7GawIUe3rgFBenoA==
-					    </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://cas.crous-lyon.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://cas.crous-lyon.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://cas.crous-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">crous-lyon.fr</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIEazCCA1OgAwIBAgIQD/r9mkyd7FHhm+Vn+HXu9jANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTEzMDQyMzAwMDAwMFoXDTE2MDUxNDIzNTk1OVowPTEhMB8GA1UE
-CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRgwFgYDVQQDFA8qLmNyb3VzLWx5
-b24uZnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDUOIWis87bcAu0
-3sB8o4vXr6O54YuPdJM1wwn5uwyLl1BEXx4CytKCUAiNz4uNmVihqfxJo7inPsd/
-uysY1gqBoc7XDn8F3pbQUAOBGjyiGxNjgoo0a6d+8x48sOdC4kRgij+amXI0Y43J
-97x4UAVxjseFA/8vKnMt+sCVdHwrE5nHZuO4x4FkL3Y7Asg7ErEuXkyyUcGtpwk4
-t2mUw5GtZiUCT7V/Y5tmQAc9VeenXQWDouGLuJAoqa+3lPSOs6hNE/bFoxnKMNfI
-oThE10jbIyVJt3SxYMYvlYwFLAICjdgVoJo/8dsqSYsSz7rIzBoKnoRcdcQi4Q3h
-nhlCyMdfAgMBAAGjggFsMIIBaDAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3V0fq
-kOO57TAdBgNVHQ4EFgQUtZ9U7PnM4ivE9Akwvduvc11ew0owDgYDVR0PAQH/BAQD
-AgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMC
-MCIGA1UdIAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQIBMDoGA1UdHwQzMDEw
-L6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3Js
-MG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50Y3MudGVy
-ZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9vY3Nw
-LnRjcy50ZXJlbmEub3JnMBoGA1UdEQQTMBGCDyouY3JvdXMtbHlvbi5mcjANBgkq
-hkiG9w0BAQUFAAOCAQEAXsM+FOuM52ITtsVPjcayktwJxdMf+rF10sniHA9/q/7Q
-UXroyYOBXnDheMdvYu+CLjQDWRAaMek6oS1vQNJ4fNiRdlmvMFz1EGqPp2wTIUn7
-xx+NsR8asSFGRzdzmgzjQq/KyQRjXndfJLh+Lcw4WVRCSdQx12zo2XGoRWjKPMBx
-Olm9t5o1HQY/jMoFY86UBrph2N/3JZfSsOM/ZMWv+fvTy9ctSWvurG5GPlqL6s9Y
-wnk2bbaPLI1Ph9DUkTrS0hRDCo6BkiEzzEkHAXWHIeKaibJgcqMLQWk6eU468EbX
-h7cEmTn+zP3Mcv2/sPPJum0wXY7GawIUe3rgFBenoA==
-					    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cas.crous-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">CROUS de Lyon</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">CROUS de Lyon</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <EmailAddress>sinfo@crous-lyon.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/cas.cuni.cz-idp-shibboleth.xml b/swamid-interfederations-2.0/cas.cuni.cz-idp-shibboleth.xml
deleted file mode 100644
index 3b9699b7..00000000
--- a/swamid-interfederations-2.0/cas.cuni.cz-idp-shibboleth.xml
+++ /dev/null
@@ -1,118 +0,0 @@
-<?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://cas.cuni.cz/idp/shibboleth">
-  <md:Extensions xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata">
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/" registrationInstant="2010-09-21T15:24:17Z">
-      <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>
-    <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://eduid.cz/uri/idp-group/university</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md: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">cuni.cz</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Charles University in Prague</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="cs">Univerzita Karlova v Praze</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Identity Provider for Charles University students and staff</mdui:Description>
-        <mdui:Description xml:lang="cs">Identity Provider pro studenty a zaměstance Univerzity Karlovy v Praze</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.cuni.cz/UKENG-1.html</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="cs">http://www.cuni.cz/</mdui:InformationURL>
-        <mdui:Logo height="40" width="41">https://ldap.cuni.cz/images/UK_logo_40.png</mdui:Logo>
-        <mdui:Logo height="89" width="91">https://ldap.cuni.cz/images/UK_logo.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>
-MIIDMTCCAhmgAwIBAgIJAIg6vQLFes01MA0GCSqGSIb3DQEBBQUAMEoxCzAJBgNV
-BAYTAkNaMSUwIwYDVQQKExxDaGFybGVzIFVuaXZlcnNpdHkgaW4gUHJhZ3VlMRQw
-EgYDVQQDEwtjYXMuY3VuaS5jejAeFw0xMDAxMTgxMjI5NDBaFw0xNTAxMTcxMjI5
-NDBaMEoxCzAJBgNVBAYTAkNaMSUwIwYDVQQKExxDaGFybGVzIFVuaXZlcnNpdHkg
-aW4gUHJhZ3VlMRQwEgYDVQQDEwtjYXMuY3VuaS5jejCCASIwDQYJKoZIhvcNAQEB
-BQADggEPADCCAQoCggEBAMitOw5poPyXXhWeoWH0Mv7Vh3LzebgJXTB0hD5RX8zh
-m5ark9nTZWjURtq8scacbnu8Nn2GN6HIF4gTLuxLMWgupLr42da+npTZLMGQVxw8
-OXAGEt+zFKMcXYyJpxbCX3u97U5ck/ldjA6F1Wkr7IOrRlwElAagbCBtDFgUGUpd
-fqis+CN6J8RknhOxK2f2K1RvI3LqIBHyH8KVMtzD9NohFhoAwyn+5B+IgY2ELz12
-z/g3LMGT1Kfk60l48N2XJ8yVcqMawO3SSqQvexzwYzXkxXEZQ7AsK/4pcOS/37nl
-wp2Y9nMbr1EwBYtcOqMJsQBigCMQopLUsFa+MFHUlu0CAwEAAaMaMBgwFgYDVR0R
-BA8wDYILY2FzLmN1bmkuY3owDQYJKoZIhvcNAQEFBQADggEBABLSe4N6jpCVYOzi
-uiXPPMUzwIAoB0Pt+SnAw8+B72TjDqSjcIfep2OHUQfIu1CEoIz8eBtAQfEledH7
-8Y17rdxORqvWoFTLHmqBQ9odZyBUeQxuIPjdfG7bffrJQQ2AmcP6oV9Cu9o6f8c/
-SqAclnKkc8CPh81rPMdi16uL6zXd4kOshNmLWq0RQjnnDC7ycY721kqB1t0zkJie
-NS5+gGbsQg+/38B48iSW046pedzrbguM0wi7x0gjDmYtjspE9RNl7LYEojXGV4I3
-slrydvu/w8Xr7BtsmNkU7jsyAj8iNC4CAwDPk0qE/Qlhxlcv/Ieis1hmGzNgqZAg
-dXLpqi4=
-		   </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cas.cuni.cz:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cas.cuni.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>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://cas.cuni.cz/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cas.cuni.cz/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://cas.cuni.cz/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://cas.cuni.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">cuni.cz</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDMTCCAhmgAwIBAgIJAIg6vQLFes01MA0GCSqGSIb3DQEBBQUAMEoxCzAJBgNV
-BAYTAkNaMSUwIwYDVQQKExxDaGFybGVzIFVuaXZlcnNpdHkgaW4gUHJhZ3VlMRQw
-EgYDVQQDEwtjYXMuY3VuaS5jejAeFw0xMDAxMTgxMjI5NDBaFw0xNTAxMTcxMjI5
-NDBaMEoxCzAJBgNVBAYTAkNaMSUwIwYDVQQKExxDaGFybGVzIFVuaXZlcnNpdHkg
-aW4gUHJhZ3VlMRQwEgYDVQQDEwtjYXMuY3VuaS5jejCCASIwDQYJKoZIhvcNAQEB
-BQADggEPADCCAQoCggEBAMitOw5poPyXXhWeoWH0Mv7Vh3LzebgJXTB0hD5RX8zh
-m5ark9nTZWjURtq8scacbnu8Nn2GN6HIF4gTLuxLMWgupLr42da+npTZLMGQVxw8
-OXAGEt+zFKMcXYyJpxbCX3u97U5ck/ldjA6F1Wkr7IOrRlwElAagbCBtDFgUGUpd
-fqis+CN6J8RknhOxK2f2K1RvI3LqIBHyH8KVMtzD9NohFhoAwyn+5B+IgY2ELz12
-z/g3LMGT1Kfk60l48N2XJ8yVcqMawO3SSqQvexzwYzXkxXEZQ7AsK/4pcOS/37nl
-wp2Y9nMbr1EwBYtcOqMJsQBigCMQopLUsFa+MFHUlu0CAwEAAaMaMBgwFgYDVR0R
-BA8wDYILY2FzLmN1bmkuY3owDQYJKoZIhvcNAQEFBQADggEBABLSe4N6jpCVYOzi
-uiXPPMUzwIAoB0Pt+SnAw8+B72TjDqSjcIfep2OHUQfIu1CEoIz8eBtAQfEledH7
-8Y17rdxORqvWoFTLHmqBQ9odZyBUeQxuIPjdfG7bffrJQQ2AmcP6oV9Cu9o6f8c/
-SqAclnKkc8CPh81rPMdi16uL6zXd4kOshNmLWq0RQjnnDC7ycY721kqB1t0zkJie
-NS5+gGbsQg+/38B48iSW046pedzrbguM0wi7x0gjDmYtjspE9RNl7LYEojXGV4I3
-slrydvu/w8Xr7BtsmNkU7jsyAj8iNC4CAwDPk0qE/Qlhxlcv/Ieis1hmGzNgqZAg
-dXLpqi4=
-		   </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cas.cuni.cz:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cas.cuni.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>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="cs">Univerzita Karlova v Praze</OrganizationName>
-    <OrganizationName xml:lang="en">Charles University in Prague</OrganizationName>
-    <OrganizationDisplayName xml:lang="cs">Univerzita Karlova v Praze</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">Charles University in Prague</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.cuni.cz/UKENG-1.html</OrganizationURL>
-    <OrganizationURL xml:lang="cs">http://www.cuni.cz/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Michal</GivenName>
-    <SurName>Vocu</SurName>
-    <EmailAddress>michal@cuni.cz</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/cas.cuni.cz.xml b/swamid-interfederations-2.0/cas.cuni.cz.xml
deleted file mode 100644
index 3b9699b7..00000000
--- a/swamid-interfederations-2.0/cas.cuni.cz.xml
+++ /dev/null
@@ -1,118 +0,0 @@
-<?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://cas.cuni.cz/idp/shibboleth">
-  <md:Extensions xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata">
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/" registrationInstant="2010-09-21T15:24:17Z">
-      <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>
-    <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://eduid.cz/uri/idp-group/university</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md: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">cuni.cz</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Charles University in Prague</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="cs">Univerzita Karlova v Praze</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Identity Provider for Charles University students and staff</mdui:Description>
-        <mdui:Description xml:lang="cs">Identity Provider pro studenty a zaměstance Univerzity Karlovy v Praze</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.cuni.cz/UKENG-1.html</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="cs">http://www.cuni.cz/</mdui:InformationURL>
-        <mdui:Logo height="40" width="41">https://ldap.cuni.cz/images/UK_logo_40.png</mdui:Logo>
-        <mdui:Logo height="89" width="91">https://ldap.cuni.cz/images/UK_logo.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>
-MIIDMTCCAhmgAwIBAgIJAIg6vQLFes01MA0GCSqGSIb3DQEBBQUAMEoxCzAJBgNV
-BAYTAkNaMSUwIwYDVQQKExxDaGFybGVzIFVuaXZlcnNpdHkgaW4gUHJhZ3VlMRQw
-EgYDVQQDEwtjYXMuY3VuaS5jejAeFw0xMDAxMTgxMjI5NDBaFw0xNTAxMTcxMjI5
-NDBaMEoxCzAJBgNVBAYTAkNaMSUwIwYDVQQKExxDaGFybGVzIFVuaXZlcnNpdHkg
-aW4gUHJhZ3VlMRQwEgYDVQQDEwtjYXMuY3VuaS5jejCCASIwDQYJKoZIhvcNAQEB
-BQADggEPADCCAQoCggEBAMitOw5poPyXXhWeoWH0Mv7Vh3LzebgJXTB0hD5RX8zh
-m5ark9nTZWjURtq8scacbnu8Nn2GN6HIF4gTLuxLMWgupLr42da+npTZLMGQVxw8
-OXAGEt+zFKMcXYyJpxbCX3u97U5ck/ldjA6F1Wkr7IOrRlwElAagbCBtDFgUGUpd
-fqis+CN6J8RknhOxK2f2K1RvI3LqIBHyH8KVMtzD9NohFhoAwyn+5B+IgY2ELz12
-z/g3LMGT1Kfk60l48N2XJ8yVcqMawO3SSqQvexzwYzXkxXEZQ7AsK/4pcOS/37nl
-wp2Y9nMbr1EwBYtcOqMJsQBigCMQopLUsFa+MFHUlu0CAwEAAaMaMBgwFgYDVR0R
-BA8wDYILY2FzLmN1bmkuY3owDQYJKoZIhvcNAQEFBQADggEBABLSe4N6jpCVYOzi
-uiXPPMUzwIAoB0Pt+SnAw8+B72TjDqSjcIfep2OHUQfIu1CEoIz8eBtAQfEledH7
-8Y17rdxORqvWoFTLHmqBQ9odZyBUeQxuIPjdfG7bffrJQQ2AmcP6oV9Cu9o6f8c/
-SqAclnKkc8CPh81rPMdi16uL6zXd4kOshNmLWq0RQjnnDC7ycY721kqB1t0zkJie
-NS5+gGbsQg+/38B48iSW046pedzrbguM0wi7x0gjDmYtjspE9RNl7LYEojXGV4I3
-slrydvu/w8Xr7BtsmNkU7jsyAj8iNC4CAwDPk0qE/Qlhxlcv/Ieis1hmGzNgqZAg
-dXLpqi4=
-		   </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cas.cuni.cz:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cas.cuni.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>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://cas.cuni.cz/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cas.cuni.cz/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://cas.cuni.cz/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://cas.cuni.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">cuni.cz</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDMTCCAhmgAwIBAgIJAIg6vQLFes01MA0GCSqGSIb3DQEBBQUAMEoxCzAJBgNV
-BAYTAkNaMSUwIwYDVQQKExxDaGFybGVzIFVuaXZlcnNpdHkgaW4gUHJhZ3VlMRQw
-EgYDVQQDEwtjYXMuY3VuaS5jejAeFw0xMDAxMTgxMjI5NDBaFw0xNTAxMTcxMjI5
-NDBaMEoxCzAJBgNVBAYTAkNaMSUwIwYDVQQKExxDaGFybGVzIFVuaXZlcnNpdHkg
-aW4gUHJhZ3VlMRQwEgYDVQQDEwtjYXMuY3VuaS5jejCCASIwDQYJKoZIhvcNAQEB
-BQADggEPADCCAQoCggEBAMitOw5poPyXXhWeoWH0Mv7Vh3LzebgJXTB0hD5RX8zh
-m5ark9nTZWjURtq8scacbnu8Nn2GN6HIF4gTLuxLMWgupLr42da+npTZLMGQVxw8
-OXAGEt+zFKMcXYyJpxbCX3u97U5ck/ldjA6F1Wkr7IOrRlwElAagbCBtDFgUGUpd
-fqis+CN6J8RknhOxK2f2K1RvI3LqIBHyH8KVMtzD9NohFhoAwyn+5B+IgY2ELz12
-z/g3LMGT1Kfk60l48N2XJ8yVcqMawO3SSqQvexzwYzXkxXEZQ7AsK/4pcOS/37nl
-wp2Y9nMbr1EwBYtcOqMJsQBigCMQopLUsFa+MFHUlu0CAwEAAaMaMBgwFgYDVR0R
-BA8wDYILY2FzLmN1bmkuY3owDQYJKoZIhvcNAQEFBQADggEBABLSe4N6jpCVYOzi
-uiXPPMUzwIAoB0Pt+SnAw8+B72TjDqSjcIfep2OHUQfIu1CEoIz8eBtAQfEledH7
-8Y17rdxORqvWoFTLHmqBQ9odZyBUeQxuIPjdfG7bffrJQQ2AmcP6oV9Cu9o6f8c/
-SqAclnKkc8CPh81rPMdi16uL6zXd4kOshNmLWq0RQjnnDC7ycY721kqB1t0zkJie
-NS5+gGbsQg+/38B48iSW046pedzrbguM0wi7x0gjDmYtjspE9RNl7LYEojXGV4I3
-slrydvu/w8Xr7BtsmNkU7jsyAj8iNC4CAwDPk0qE/Qlhxlcv/Ieis1hmGzNgqZAg
-dXLpqi4=
-		   </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cas.cuni.cz:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cas.cuni.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>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="cs">Univerzita Karlova v Praze</OrganizationName>
-    <OrganizationName xml:lang="en">Charles University in Prague</OrganizationName>
-    <OrganizationDisplayName xml:lang="cs">Univerzita Karlova v Praze</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">Charles University in Prague</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.cuni.cz/UKENG-1.html</OrganizationURL>
-    <OrganizationURL xml:lang="cs">http://www.cuni.cz/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Michal</GivenName>
-    <SurName>Vocu</SurName>
-    <EmailAddress>michal@cuni.cz</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/cas.educagri.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/cas.educagri.fr-idp-shibboleth.xml
deleted file mode 100644
index 97476642..00000000
--- a/swamid-interfederations-2.0/cas.educagri.fr-idp-shibboleth.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://cas.educagri.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2009-11-09T00:11:17Z">
-      <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">educagri.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">Educagri - Enseignement Agricole</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIEezCCA2OgAwIBAgIQHUcS+wnPV7LSIqe5j3rVeTANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTEzMDEwOTAwMDAwMFoXDTE2MDExMTIzNTk1OVowVzELMAkGA1UE
-BhMCRlIxFjAUBgNVBAoTDUFncm9zdXAgRGlqb24xFjAUBgNVBAsTDUVkdXRlci1D
-TkVSVEExGDAWBgNVBAMTD2Nhcy5lZHVjYWdyaS5mcjCCASIwDQYJKoZIhvcNAQEB
-BQADggEPADCCAQoCggEBALl111vi6dSX6qzz49BucGGumOP7B0OL7Rjjvctkyl65
-d6ECbrm8EloAQMfz1Ne43VzDoxiiWI9Unu+W4Reu0miOFIQDPDjZI0zRzYd2+bHs
-f/YWQygnCuiUHIAhFsMdnIW3yDC64xumVjZgGzTVby4hHEAY4CTYtm+FN8QXz1tm
-9uKDqkRbciLz0UBBgx0AGMfUmB4VhvjCJ6zIcQ1ePLTBZt4omT3h6HHYM3iVx4u2
-XBuOJhlnSl2BtcFz/Rwebyi6DWv/QprL0oJD5Fd8g9J1COfS5MKobZ24lKhFH2D6
-4ie40FVEFqf8ZK7gGaUV7l6WtN31AUULuk2a1unlAJkCAwEAAaOCAWIwggFeMB8G
-A1UdIwQYMBaAFAy9k2gM896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBSv1jHfEt61
-xKbsudGwlFVU2Mh/TDAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNV
-HSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwGAYDVR0gBBEwDzANBgsrBgEEAbIx
-AQICHTA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3Jn
-L1RFUkVOQVNTTENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0
-dHA6Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUF
-BzABhhpodHRwOi8vb2NzcC50Y3MudGVyZW5hLm9yZzAaBgNVHREEEzARgg9jYXMu
-ZWR1Y2FncmkuZnIwDQYJKoZIhvcNAQEFBQADggEBABCKlz2uACI8H84L4XplIWXJ
-TpIHfFtWPiP2WtdmEdLoTcEOYffqULFaKPuJyNZjTOo8K4iB/bZIQxFhKXdosRiY
-vJp5LNr3XZcFwoIvYB8BmLLE4eNpdSpYtaPx5cnZDafuRwM/uWnjQRxoXQLhVuX9
-aEvmYbWSSh7ZEJutIyLgZMsXRUQR1lbnsvYit1u+BlBkOhsbDDzl5kw+F9TbR8uN
-GG2aPW9m3f9ndjoLUdCVg4D54KSiUTPDihaPSk2Ye2zo5BU4f8VLWCoDR7bFSs39
-lFt/OsRU7CWuaoEe+asPiuldDQ+7HxNUbXAXIWXZrc3svUj75V3wSRbPlSDmYUg=
-					    </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://cas.educagri.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://cas.educagri.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://cas.educagri.fr/idp/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Educagri - Enseignement Agricole</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Educagri - Enseignement Agricole</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Albaro HOLGADO</SurName>
-    <EmailAddress>albaro.holgado@educagri.fr</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <SurName>Khalid FARRAHE</SurName>
-    <EmailAddress>khalid.farrahe@educagri.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/cas.educagri.fr.xml b/swamid-interfederations-2.0/cas.educagri.fr.xml
deleted file mode 100644
index 97476642..00000000
--- a/swamid-interfederations-2.0/cas.educagri.fr.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://cas.educagri.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2009-11-09T00:11:17Z">
-      <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">educagri.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">Educagri - Enseignement Agricole</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIEezCCA2OgAwIBAgIQHUcS+wnPV7LSIqe5j3rVeTANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTEzMDEwOTAwMDAwMFoXDTE2MDExMTIzNTk1OVowVzELMAkGA1UE
-BhMCRlIxFjAUBgNVBAoTDUFncm9zdXAgRGlqb24xFjAUBgNVBAsTDUVkdXRlci1D
-TkVSVEExGDAWBgNVBAMTD2Nhcy5lZHVjYWdyaS5mcjCCASIwDQYJKoZIhvcNAQEB
-BQADggEPADCCAQoCggEBALl111vi6dSX6qzz49BucGGumOP7B0OL7Rjjvctkyl65
-d6ECbrm8EloAQMfz1Ne43VzDoxiiWI9Unu+W4Reu0miOFIQDPDjZI0zRzYd2+bHs
-f/YWQygnCuiUHIAhFsMdnIW3yDC64xumVjZgGzTVby4hHEAY4CTYtm+FN8QXz1tm
-9uKDqkRbciLz0UBBgx0AGMfUmB4VhvjCJ6zIcQ1ePLTBZt4omT3h6HHYM3iVx4u2
-XBuOJhlnSl2BtcFz/Rwebyi6DWv/QprL0oJD5Fd8g9J1COfS5MKobZ24lKhFH2D6
-4ie40FVEFqf8ZK7gGaUV7l6WtN31AUULuk2a1unlAJkCAwEAAaOCAWIwggFeMB8G
-A1UdIwQYMBaAFAy9k2gM896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBSv1jHfEt61
-xKbsudGwlFVU2Mh/TDAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNV
-HSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwGAYDVR0gBBEwDzANBgsrBgEEAbIx
-AQICHTA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3Jn
-L1RFUkVOQVNTTENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0
-dHA6Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUF
-BzABhhpodHRwOi8vb2NzcC50Y3MudGVyZW5hLm9yZzAaBgNVHREEEzARgg9jYXMu
-ZWR1Y2FncmkuZnIwDQYJKoZIhvcNAQEFBQADggEBABCKlz2uACI8H84L4XplIWXJ
-TpIHfFtWPiP2WtdmEdLoTcEOYffqULFaKPuJyNZjTOo8K4iB/bZIQxFhKXdosRiY
-vJp5LNr3XZcFwoIvYB8BmLLE4eNpdSpYtaPx5cnZDafuRwM/uWnjQRxoXQLhVuX9
-aEvmYbWSSh7ZEJutIyLgZMsXRUQR1lbnsvYit1u+BlBkOhsbDDzl5kw+F9TbR8uN
-GG2aPW9m3f9ndjoLUdCVg4D54KSiUTPDihaPSk2Ye2zo5BU4f8VLWCoDR7bFSs39
-lFt/OsRU7CWuaoEe+asPiuldDQ+7HxNUbXAXIWXZrc3svUj75V3wSRbPlSDmYUg=
-					    </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://cas.educagri.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://cas.educagri.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://cas.educagri.fr/idp/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Educagri - Enseignement Agricole</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Educagri - Enseignement Agricole</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Albaro HOLGADO</SurName>
-    <EmailAddress>albaro.holgado@educagri.fr</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <SurName>Khalid FARRAHE</SurName>
-    <EmailAddress>khalid.farrahe@educagri.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/cas.ent-etrs.net-idp-shibboleth.xml b/swamid-interfederations-2.0/cas.ent-etrs.net-idp-shibboleth.xml
deleted file mode 100644
index 5c61963f..00000000
--- a/swamid-interfederations-2.0/cas.ent-etrs.net-idp-shibboleth.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://cas.ent-etrs.net/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2011-03-24T16:19:23Z">
-      <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">ent-etrs.net</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">Ecole des Transmissions - Cesson Sévigné</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDKzCCAhOgAwIBAgIUXvJvEuE8bWQyAkG8bh3m7vmoqzgwDQYJKoZIhvcNAQEF
-BQAwGzEZMBcGA1UEAxMQY2FzLmVudC1ldHJzLm5ldDAeFw0xMTAzMjMxMTMzMDJa
-Fw0xNjAzMjMxMTMzMDJaMBsxGTAXBgNVBAMTEGNhcy5lbnQtZXRycy5uZXQwggEi
-MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCHJPDrl8egS/TqUaTu75zjeaWy
-7EEl0GgROrdoy4vrvKYOmofMHol90Epqd2e6HVhqUOnqWuUhm95lHfThMezBIPBo
-0qOY1QcGstS5allQ/iRY+ODRe3e0CCraHt6JGkckseVDrwlRmZImpJqZkpQyk1Yc
-fL9mlOrnC9lPrN5THoaazjcREicc0crehoyLkzoZzWWP6vzNMmyW2L9zqUqhbWhP
-UG6hZQ4c+pRUpjE+EEedzgMnpPy+M5BNcCRyCUCNwL11EvoYEYhcMNvR1x/qS+l0
-qqNR2qurS7W/hChAbBjyFw0nWzsAwS6NtiUYgjJ4I3uhOSg54hBQ5lqUTeNbAgMB
-AAGjZzBlMEQGA1UdEQQ9MDuCEGNhcy5lbnQtZXRycy5uZXSGJ2h0dHBzOi8vY2Fz
-LmVudC1ldHJzLm5ldC9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUiY4Lpt2DpIZo
-pwRHJPz4FWXDEcowDQYJKoZIhvcNAQEFBQADggEBAFGniMt16npf3zfKPwWo/bXn
-bivyG35m82xTRKspKLhUHkmXYN3ZaKz9Z44DShDGPlpddzaM7vFZqiEPQwu4Cw8G
-c3I06F53JEzhZgD9bScVrvONkZD4Si2WLqBpJX6vld2VJ6ptj+Sp0NpuO68tBYV3
-8kLkqSXtbGoPO+BmYG+1giEDSxIX/trYzzkzCtJgfZbPlnF0osjOl+vcyBdzwBdF
-Ww4LysygxWHWOWMRfDDZBdWiXN5hxqwt2AlXbg7bVUVs6yN077J+Cvrs3fJfSARB
-GE/cxG6DtyEQnF1mr7LZN8U7uNLg0uff90fHQPYL2y0ERDV04Ve9P0DVA0YjWuQ=
-					    </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://cas.ent-etrs.net/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://cas.ent-etrs.net/idp/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Ecole des Transmissions - Cesson Sévigné</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Ecole des Transmissions - Cesson Sévigné</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Patrick JAOUEN</SurName>
-    <EmailAddress>patrick.jaouen@ent-etrs.net</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <SurName>Dominique MULLER</SurName>
-    <EmailAddress>dominique.muller@ent-etrs.net</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/cas.ent-etrs.net.xml b/swamid-interfederations-2.0/cas.ent-etrs.net.xml
deleted file mode 100644
index 5c61963f..00000000
--- a/swamid-interfederations-2.0/cas.ent-etrs.net.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://cas.ent-etrs.net/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2011-03-24T16:19:23Z">
-      <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">ent-etrs.net</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">Ecole des Transmissions - Cesson Sévigné</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDKzCCAhOgAwIBAgIUXvJvEuE8bWQyAkG8bh3m7vmoqzgwDQYJKoZIhvcNAQEF
-BQAwGzEZMBcGA1UEAxMQY2FzLmVudC1ldHJzLm5ldDAeFw0xMTAzMjMxMTMzMDJa
-Fw0xNjAzMjMxMTMzMDJaMBsxGTAXBgNVBAMTEGNhcy5lbnQtZXRycy5uZXQwggEi
-MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCHJPDrl8egS/TqUaTu75zjeaWy
-7EEl0GgROrdoy4vrvKYOmofMHol90Epqd2e6HVhqUOnqWuUhm95lHfThMezBIPBo
-0qOY1QcGstS5allQ/iRY+ODRe3e0CCraHt6JGkckseVDrwlRmZImpJqZkpQyk1Yc
-fL9mlOrnC9lPrN5THoaazjcREicc0crehoyLkzoZzWWP6vzNMmyW2L9zqUqhbWhP
-UG6hZQ4c+pRUpjE+EEedzgMnpPy+M5BNcCRyCUCNwL11EvoYEYhcMNvR1x/qS+l0
-qqNR2qurS7W/hChAbBjyFw0nWzsAwS6NtiUYgjJ4I3uhOSg54hBQ5lqUTeNbAgMB
-AAGjZzBlMEQGA1UdEQQ9MDuCEGNhcy5lbnQtZXRycy5uZXSGJ2h0dHBzOi8vY2Fz
-LmVudC1ldHJzLm5ldC9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUiY4Lpt2DpIZo
-pwRHJPz4FWXDEcowDQYJKoZIhvcNAQEFBQADggEBAFGniMt16npf3zfKPwWo/bXn
-bivyG35m82xTRKspKLhUHkmXYN3ZaKz9Z44DShDGPlpddzaM7vFZqiEPQwu4Cw8G
-c3I06F53JEzhZgD9bScVrvONkZD4Si2WLqBpJX6vld2VJ6ptj+Sp0NpuO68tBYV3
-8kLkqSXtbGoPO+BmYG+1giEDSxIX/trYzzkzCtJgfZbPlnF0osjOl+vcyBdzwBdF
-Ww4LysygxWHWOWMRfDDZBdWiXN5hxqwt2AlXbg7bVUVs6yN077J+Cvrs3fJfSARB
-GE/cxG6DtyEQnF1mr7LZN8U7uNLg0uff90fHQPYL2y0ERDV04Ve9P0DVA0YjWuQ=
-					    </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://cas.ent-etrs.net/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://cas.ent-etrs.net/idp/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Ecole des Transmissions - Cesson Sévigné</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Ecole des Transmissions - Cesson Sévigné</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Patrick JAOUEN</SurName>
-    <EmailAddress>patrick.jaouen@ent-etrs.net</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <SurName>Dominique MULLER</SurName>
-    <EmailAddress>dominique.muller@ent-etrs.net</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/cas.st-cyr.terre.defense.gouv.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/cas.st-cyr.terre.defense.gouv.fr-idp-shibboleth.xml
deleted file mode 100644
index fcaf9a1a..00000000
--- a/swamid-interfederations-2.0/cas.st-cyr.terre.defense.gouv.fr-idp-shibboleth.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://cas.st-cyr.terre.defense.gouv.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2009-03-04T11:02:29Z">
-      <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">st-cyr.terre.defense.gouv.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">Ecoles de Saint- Cyr Coëtquidan</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDbjCCAlagAwIBAgIVANw8PR6YH5T2dmzYa0+BVTWT8L5xMA0GCSqGSIb3DQEB
-BQUAMCsxKTAnBgNVBAMTIGNhcy5zdC1jeXIudGVycmUuZGVmZW5zZS5nb3V2LmZy
-MB4XDTA5MDIyNDE0MDgyMVoXDTI5MDIyNDE0MDgyMVowKzEpMCcGA1UEAxMgY2Fz
-LnN0LWN5ci50ZXJyZS5kZWZlbnNlLmdvdXYuZnIwggEiMA0GCSqGSIb3DQEBAQUA
-A4IBDwAwggEKAoIBAQCglhUEpGlM6njWTwNSv9YQJYSOjElt/d+t+zf7DodWanAz
-74WSJKLiARClYxevIXiRe3YWSlPbMnNpwMhycQMStSZVIuW5WKNXyLNm3sdgilEi
-tElL5FTnTb5PF58yKlJSWxlol0lqoEg3tO0sYU/4iRlo7ImcLvkDVGPmoUgYGrmy
-7gsBPlf7Xb06Naa4xRvo7j0wzlnPy4PD8SXEaHkkYyEehoJa5u907Zxl+P1AZMzs
-3SNlu99Gm9CfghmHzEmtpaF+9bwioDzOyMABzGqncrq3l+hqnDi6K2+lVieHaUf1
-0yHmlXKTNGgjXc2wBM2c60PQhFnU9beRpPT2Qa1bAgMBAAGjgYgwgYUwZAYDVR0R
-BF0wW4IgY2FzLnN0LWN5ci50ZXJyZS5kZWZlbnNlLmdvdXYuZnKGN2h0dHBzOi8v
-Y2FzLnN0LWN5ci50ZXJyZS5kZWZlbnNlLmdvdXYuZnIvaWRwL3NoaWJib2xldGgw
-HQYDVR0OBBYEFDE7bJFpR9H+7WO303Wj5a7aE9G9MA0GCSqGSIb3DQEBBQUAA4IB
-AQBR6BJEnGM+Y0/Dkw+6DKqJAs+ryXRyCL9lUWWaLT39RItOmZmPljt1LCIPn/6v
-NiwLtdbGYF5HmL5l9soaVhTO4ZHcSuBFH7NYOLPJtDXxinfT3CY9dWkNBDUl9p9V
-GgqanKTbB/HT8VHKwVULufd1RHiNfm+9MlJx1jln+KZGZbd8M4iwWOiG5z4f4lCD
-El4VVe053i2Bn8on/zvrUj3FvJRRt1xRgPecVrUrTTNAWYQGHH7KvsPNFqx8DA4L
-6N0Zw+YCL1OhzCoW18pc3yhVpXYCuuEvoFY0mlB74OpfULQ0cyoGE/641IcnitTV
-AyNij5Syavi1Vz/fsHxnh3gq
-					    </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://cas.st-cyr.terre.defense.gouv.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://cas.st-cyr.terre.defense.gouv.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://cas.st-cyr.terre.defense.gouv.fr/idp/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Ecoles de Saint- Cyr Coëtquidan</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Ecoles de Saint- Cyr Coëtquidan</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Patrick Jaouen</SurName>
-    <EmailAddress>patrick.jaouen@st-cyr.terre-net.defense.gouv.fr</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <SurName>Franck Le Calloch</SurName>
-    <EmailAddress>franck.lecalloch@st-cyr.terre-net.defense.gouv.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/cas.st-cyr.terre.defense.gouv.fr.xml b/swamid-interfederations-2.0/cas.st-cyr.terre.defense.gouv.fr.xml
deleted file mode 100644
index fcaf9a1a..00000000
--- a/swamid-interfederations-2.0/cas.st-cyr.terre.defense.gouv.fr.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://cas.st-cyr.terre.defense.gouv.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2009-03-04T11:02:29Z">
-      <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">st-cyr.terre.defense.gouv.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">Ecoles de Saint- Cyr Coëtquidan</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDbjCCAlagAwIBAgIVANw8PR6YH5T2dmzYa0+BVTWT8L5xMA0GCSqGSIb3DQEB
-BQUAMCsxKTAnBgNVBAMTIGNhcy5zdC1jeXIudGVycmUuZGVmZW5zZS5nb3V2LmZy
-MB4XDTA5MDIyNDE0MDgyMVoXDTI5MDIyNDE0MDgyMVowKzEpMCcGA1UEAxMgY2Fz
-LnN0LWN5ci50ZXJyZS5kZWZlbnNlLmdvdXYuZnIwggEiMA0GCSqGSIb3DQEBAQUA
-A4IBDwAwggEKAoIBAQCglhUEpGlM6njWTwNSv9YQJYSOjElt/d+t+zf7DodWanAz
-74WSJKLiARClYxevIXiRe3YWSlPbMnNpwMhycQMStSZVIuW5WKNXyLNm3sdgilEi
-tElL5FTnTb5PF58yKlJSWxlol0lqoEg3tO0sYU/4iRlo7ImcLvkDVGPmoUgYGrmy
-7gsBPlf7Xb06Naa4xRvo7j0wzlnPy4PD8SXEaHkkYyEehoJa5u907Zxl+P1AZMzs
-3SNlu99Gm9CfghmHzEmtpaF+9bwioDzOyMABzGqncrq3l+hqnDi6K2+lVieHaUf1
-0yHmlXKTNGgjXc2wBM2c60PQhFnU9beRpPT2Qa1bAgMBAAGjgYgwgYUwZAYDVR0R
-BF0wW4IgY2FzLnN0LWN5ci50ZXJyZS5kZWZlbnNlLmdvdXYuZnKGN2h0dHBzOi8v
-Y2FzLnN0LWN5ci50ZXJyZS5kZWZlbnNlLmdvdXYuZnIvaWRwL3NoaWJib2xldGgw
-HQYDVR0OBBYEFDE7bJFpR9H+7WO303Wj5a7aE9G9MA0GCSqGSIb3DQEBBQUAA4IB
-AQBR6BJEnGM+Y0/Dkw+6DKqJAs+ryXRyCL9lUWWaLT39RItOmZmPljt1LCIPn/6v
-NiwLtdbGYF5HmL5l9soaVhTO4ZHcSuBFH7NYOLPJtDXxinfT3CY9dWkNBDUl9p9V
-GgqanKTbB/HT8VHKwVULufd1RHiNfm+9MlJx1jln+KZGZbd8M4iwWOiG5z4f4lCD
-El4VVe053i2Bn8on/zvrUj3FvJRRt1xRgPecVrUrTTNAWYQGHH7KvsPNFqx8DA4L
-6N0Zw+YCL1OhzCoW18pc3yhVpXYCuuEvoFY0mlB74OpfULQ0cyoGE/641IcnitTV
-AyNij5Syavi1Vz/fsHxnh3gq
-					    </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://cas.st-cyr.terre.defense.gouv.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://cas.st-cyr.terre.defense.gouv.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://cas.st-cyr.terre.defense.gouv.fr/idp/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Ecoles de Saint- Cyr Coëtquidan</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Ecoles de Saint- Cyr Coëtquidan</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Patrick Jaouen</SurName>
-    <EmailAddress>patrick.jaouen@st-cyr.terre-net.defense.gouv.fr</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <SurName>Franck Le Calloch</SurName>
-    <EmailAddress>franck.lecalloch@st-cyr.terre-net.defense.gouv.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/cerbere2.mines-douai.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/cerbere2.mines-douai.fr-idp-shibboleth.xml
deleted file mode 100644
index b71b6486..00000000
--- a/swamid-interfederations-2.0/cerbere2.mines-douai.fr-idp-shibboleth.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://cerbere2.mines-douai.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2013-10-03T09:42:09Z">
-      <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">mines-douai.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">Mines Douai</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDSDCCAjCgAwIBAgIVAPf+z/Alo2UGcIQMpD8+yoRE9DjEMA0GCSqGSIb3DQEB
-BQUAMCIxIDAeBgNVBAMTF2NlcmJlcmUyLm1pbmVzLWRvdWFpLmZyMB4XDTEzMDkz
-MDEyMTA0N1oXDTMzMDkzMDEyMTA0N1owIjEgMB4GA1UEAxMXY2VyYmVyZTIubWlu
-ZXMtZG91YWkuZnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCsehUd
-QZAcFM8YQRAuQ4MSbuE5yrEu7ZpH8ICDmKMlVudlEWSLSkCZqrbtNYOev8gdHQTh
-OvKd5IzIph5TaRjY1qQI5v2ud/ov+Xk0JLWkYWnh2wMIQ07LoQ66zQqHxVbfq6lR
-lNtaHXhcPNPp/61j4OOoHNbztglqpAeVnkgUqMksnDofsjVsVMYG+9naGfwHKJlH
-I9HW7aUEvYYl/mUKrHbu9+QWpLsJukiJEF6hyRgijs/kr2pm0pBB4djy1NTgrqfz
-qjYmCzxtkbogHsOs0KGdoMg6R5PmHojtQ00beeKC8/hfHP+sU3wnNO+Hb14B/NLB
-veexLjO3AQpMtMY5AgMBAAGjdTBzMFIGA1UdEQRLMEmCF2NlcmJlcmUyLm1pbmVz
-LWRvdWFpLmZyhi5odHRwczovL2NlcmJlcmUyLm1pbmVzLWRvdWFpLmZyL2lkcC9z
-aGliYm9sZXRoMB0GA1UdDgQWBBTHtKE6G3SkaEo+yuSQU4KTB9wxkDANBgkqhkiG
-9w0BAQUFAAOCAQEAqXrF4OYsvzcJ6djLo7hq52yqhYJtEdSGJkJ4n7CKX4WrHs5M
-YwWM3B6qbIjni0+cel8TJTCPG94ZZZOKZIPRv6eS2j77sRgnsht+mYpl9o4+zjrE
-CPVr99SlBCSuArEnnqDe26EJyV5M0fALwgHaBTPUlHhObgUuPuzlQQGEZKpoSlGT
-Hx5ewqQ+m/jii2h1IOzex/1uFA3euE8trn5LMmNZpvQ24yRBCVQ1LyTmmdTkNeHk
-GiluYTYk7G0sXbJWur7gK8jpHdojNfR2SUay9Z2lAllZ2V/cwxVOgOMgaFkaHAq1
-1Zj4drFJWcGthEvZ8uVYsc6wJoIy1fbrkBcMng==
-					    </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://cerbere2.mines-douai.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://cerbere2.mines-douai.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://cerbere2.mines-douai.fr/idp/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Mines Douai</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Mines Douai</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <EmailAddress>net.supervision@mines-douai.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/cerbere2.mines-douai.fr.xml b/swamid-interfederations-2.0/cerbere2.mines-douai.fr.xml
deleted file mode 100644
index b71b6486..00000000
--- a/swamid-interfederations-2.0/cerbere2.mines-douai.fr.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://cerbere2.mines-douai.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2013-10-03T09:42:09Z">
-      <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">mines-douai.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">Mines Douai</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDSDCCAjCgAwIBAgIVAPf+z/Alo2UGcIQMpD8+yoRE9DjEMA0GCSqGSIb3DQEB
-BQUAMCIxIDAeBgNVBAMTF2NlcmJlcmUyLm1pbmVzLWRvdWFpLmZyMB4XDTEzMDkz
-MDEyMTA0N1oXDTMzMDkzMDEyMTA0N1owIjEgMB4GA1UEAxMXY2VyYmVyZTIubWlu
-ZXMtZG91YWkuZnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCsehUd
-QZAcFM8YQRAuQ4MSbuE5yrEu7ZpH8ICDmKMlVudlEWSLSkCZqrbtNYOev8gdHQTh
-OvKd5IzIph5TaRjY1qQI5v2ud/ov+Xk0JLWkYWnh2wMIQ07LoQ66zQqHxVbfq6lR
-lNtaHXhcPNPp/61j4OOoHNbztglqpAeVnkgUqMksnDofsjVsVMYG+9naGfwHKJlH
-I9HW7aUEvYYl/mUKrHbu9+QWpLsJukiJEF6hyRgijs/kr2pm0pBB4djy1NTgrqfz
-qjYmCzxtkbogHsOs0KGdoMg6R5PmHojtQ00beeKC8/hfHP+sU3wnNO+Hb14B/NLB
-veexLjO3AQpMtMY5AgMBAAGjdTBzMFIGA1UdEQRLMEmCF2NlcmJlcmUyLm1pbmVz
-LWRvdWFpLmZyhi5odHRwczovL2NlcmJlcmUyLm1pbmVzLWRvdWFpLmZyL2lkcC9z
-aGliYm9sZXRoMB0GA1UdDgQWBBTHtKE6G3SkaEo+yuSQU4KTB9wxkDANBgkqhkiG
-9w0BAQUFAAOCAQEAqXrF4OYsvzcJ6djLo7hq52yqhYJtEdSGJkJ4n7CKX4WrHs5M
-YwWM3B6qbIjni0+cel8TJTCPG94ZZZOKZIPRv6eS2j77sRgnsht+mYpl9o4+zjrE
-CPVr99SlBCSuArEnnqDe26EJyV5M0fALwgHaBTPUlHhObgUuPuzlQQGEZKpoSlGT
-Hx5ewqQ+m/jii2h1IOzex/1uFA3euE8trn5LMmNZpvQ24yRBCVQ1LyTmmdTkNeHk
-GiluYTYk7G0sXbJWur7gK8jpHdojNfR2SUay9Z2lAllZ2V/cwxVOgOMgaFkaHAq1
-1Zj4drFJWcGthEvZ8uVYsc6wJoIy1fbrkBcMng==
-					    </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://cerbere2.mines-douai.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://cerbere2.mines-douai.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://cerbere2.mines-douai.fr/idp/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Mines Douai</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Mines Douai</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <EmailAddress>net.supervision@mines-douai.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/cern.ch-login.xml b/swamid-interfederations-2.0/cern.ch-login.xml
deleted file mode 100644
index 6a4da73f..00000000
--- a/swamid-interfederations-2.0/cern.ch-login.xml
+++ /dev/null
@@ -1,184 +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: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:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://cern.ch/login" xsi:schemaLocation="urn:oasis:names:tc:SAML:2.0:metadata saml-schema-metadata-2.0.xsd urn:mace:shibboleth:metadata:1.0 shibboleth-metadata-1.0.xsd http://www.w3.org/2000/09/xmldsig# xmldsig-core-schema.xsd">
-  <Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://rr.aai.switch.ch/" registrationInstant="2014-07-29T13:17:52Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.switch.ch/aai/federation/switchaai/metadata-registration-practice-statement-20110711.txt</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </Extensions>
-  <SPSSODescriptor errorURL="http://cern.ch/serviceportal" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="en">CERN Service Provider Proxy</mdui:DisplayName>
-        <mdui:Description xml:lang="en">CERN Service Provider Proxy</mdui:Description>
-        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAABPElEQVR42pVT21HDQAx0B5RACSkB25N/SqAEPs+ZfFACJaSElOAPrHwxQwmUkBKMdk+S5YRk4GYuj9NqT7vSNY2tbfl8aMvptRtk1D3/dTO5Kx+bbpi+mVzkGWT9Xh7bMr0bcMRZkxZyeIYPJPeDHDxYKwGhkeK7yLkd5C0IlJgEOATIAyBS8Fe3Oz1leUY2I1b/R/kK1rJ5M8gM0FwsVNUXORqeO0pZdMk537zSrOeUqt64LysCApz1JoHMRjCGZy7BAOMtAvNqbnfTC36HoTQNTt8h4K2Qp3G0Fl7Ak9QyLQ0GeWvSouNaJeMmk2Q6B8sQ8UADTgSgbpJbzIlXBmb3OXmqL/c79z37cNWprMmGJN4DNNeRrlNJbJrIMGnlOCqx0fXtmtmxO92K5DDpt46k4ftX8vKQ8Lgq5geGpVRM3R4TeQAAAABJRU5ErkJggg==</mdui:Logo>
-        <mdui:Logo height="60" width="60">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADwAAAA8CAIAAAC1nk4lAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAACC9JREFUeNrsmk1MVFcUxxHF1EEqCR8pWNCkGaGatg6JjdUGSRq6GBa0iY26qEmLi0ZrohtoUk1MYAMbm/iRLqCLdlH7kTYsYFG6ABRjJWG6EANM0iBEsQ4aCIgNNKa/945c3rzvNzwbTXyZmJnLfff+77n/8z/nnuu63Z/8mPW8PdlZz+HzAvQL0C7PuhDH2hjJ2Vaez5ep6YWp6YfPIuiqyqKqiuJYZdG2snzgPtOWBt/B2m3xvVtKCnMxZ3/iTveV8an7aXaNluVHy/P3xTbzvS9xu3tgfGgk5T4s/fN8r3xNIJ0+Ur/jQG2UL10D4z/0JD05wG7E926t27t1aDTV0TnsCT1k0Ni19fM92KOj8+alnrH5hSX/c/BuQ/12oLPO9s7hQO/aPmtfjX3k2Qms7V++x2Qnz17+/frk4tLjQHPwIixKjKaO7n8Tzly78Xcg3Kw2LzcH5w7A6erY5tbje+DDV9//6X8yrFtSGMFTjY3NHYM0wvhA2gIhu9K9Yp2njU837OKdlo5BPxPQnzmqKooAzc/kxMzco5V1QhIx/NDolq4rt/oTt32Ombw041c9EIqLjTVDo/f8IMbnGup3ABegcBfP44vtDtCnuqqU3cPeeAgWCVPysPHcwmKzF2JwnGrYBRSAHmvrdZcIgHbxGRhnQ/Ii608c2on5W74ZdHorqkersQl/lobKfADhzmP6yNo84Vp3BnIfbes9Ur/9QmMNJkdYrN1EvE0YHHOPE4fe6vIKCvg1u0z4OHymJ6gGs4FYGjFpOncV+mFvtsuGohvW+02YQMOms3p3xKeWfTQD6eUVqA9J8BwGYdkswIqbZAbW+QKNo+DansLErD5VxfYhSIGYxYvOQBVb3L4szUAwFUlyf1OUezWBTQ86twW04GZAflbrSYs8rxRGrLazcURJdEwiykCSdqKA0FdlofLMLSwxJb6lWvB34QwgjKImLyoH6B+6g2kl9xJDkDbi2R823pPX+VNixAc9ouk04ucvbfED70fBwdCIMdMwMS5PMkTMo0WsRYsu1cUnDu78ta1O4gudlS0FBN3Uzz7dNNWxUtUiu0ciGUyntQi0rIsSXxhacRdjSIjm+5Ocs9PA8t+SbBFk7Tn/QcnyzgpNxd6miIM56VNdtRn3MDmopGXIf4dFCm0snbchR6kBRgK3ibsuDjr/aFHTYD3lmFseBLgme6eNdn8BZCYHlamDWVqxEClNLrPTRssP7pSI9c6nP6kW+YL6KqPKLhntbRtrFNGZrk93UHJDazh0jIhGlFGDw5kexNXU0t55kwg3Njlj8mMjbnvQFcXG8ATx6hprZAesJsu2TQ/Eh0QrJDn0q2KPFpvOX0V/OOOY/gRu/NsJd7R8k/EnCwArSmK7ydm2JDO+zIaqU5YsgCxHfdeOt/pHnQ5Zc7Melq2kbDo3YE39cCFe4UVTO9vF4vnXH+jphzGD4mIhHBEHv9BUwwe24N1zWk6cohGN4yPhgBYxDNygD2EVJ6ZREYy/EvZMzJEjnK5Iucb2hB4N/Dri3emFfYaYJN5jdaBjrb0uLUpwTN3AjY8a/U+t1vZEk7DLw2wsDY9Zoov/hfiwRQDlw6TGgKrcyW/uIV5sZWSdXgwIG3Sp6FpyYtbWTLbQ7bM89kvCiol88XfDBI1p4bEQT7N0eoiRTNp4CPcALU5gSgCgXUlBJETQeLA6SkoEMRqb9EaCvH9LP5Fno0cb9Xv1T52WbK3kFfOSJxqMTVJqq3fOoHVtx9jGWCBDmNwl4/oqYm86zjF+mqXL8hMORzjHM6KWN4+mWLqKbZKEVKerYWbPRT07NeVhQFSWZktZQJ9DYcQRNOk5DG5Jj22MYsx9M3vYPQA1nR8whWgsDVbxfmaBjbaVE3dLpxiCgYyJZbeeTGfMEOEbQ2Fj6+lddlLSWtxJpDBYsUYWyn5hbGIkkxHbmYxGzetHeoMiVnVXKRPb9sFGWCQvkkNnpz4eVdMtJS9XVRZrxxNNmGYPxysx0sWfbxRseomk6sHsP4GKiM2f7QYKQ31hCOOmp7Qwd8drBWxIcnKm27lc5nZRRGaDpYVk/XpFhrFaj+/RkpuCXJ98YJ0cMdEKDcrEDImeS38JMXik+znfrZYnwkfyJEELwpDrSKFRyofQjj6sxBQC4ACCRZYnBBXVlxTPvawjIWbq/kP3bh6lXuaDysYUD5QQGmPj4KSmTucDvZ57T3O40RRUpsUTsVzTSG7tXmTzAI3wsbMtWYO2p5t5ve5Ibm264zFeyX17ppaefhBLWVkLDpVFLl6Y5Xn5iTDDRVuNw4rAvdBYg3l08698FGIpxIDYSXFVSAexHHnoaT3FBLtzWVx6DKb1OWuv3bhr56l3NKbufwORgdkmPQEx77ojxiKoysfxyp7rkyfPXma6xX8fI1PdA7dcdsb7oujW3TnGSjrkLsN/PQB67dtlRHuMmpyclck8EQP3cPx10cHTX//xXfeItLPyI1ocSDGvE6Q1Yf1/D7aYgC9BQZSOqGQ9pGlkqyhGWORER2frBR8nUSlGZuiI/h85R0p9H99lSk4McmjAXzdGtIyeZEZdILV3DtPflgPodMw1UwjzQl+HlaupjV7ikAJVtHyTIAZKQtfQMeeSlVJruQf7P0DL3YBihbtsuQcHU6EsmOQFRQzQDK7YrIHJtnwTMmhCg5xEVnk3sJKmTs64JMDZoSA21bBX/0CMp2jpp4FYLG0tlIUDWhCTuYeLWBWMnIydOWjCBOmbnq8OPI2KmWROYYKWuxg/KXLmDEkvg6wWtCD2kyKv1hcdiqD/CTAAuHBP9rdH3GwAAAAASUVORK5CYII=</mdui:Logo>
-        <mdui:InformationURL xml:lang="en">http://www.cern.ch</mdui:InformationURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIIEjCCBfqgAwIBAgIKLYgjvQAAAAAAMDANBgkqhkiG9w0BAQsFADBRMRIwEAYK
-CZImiZPyLGQBGRYCY2gxFDASBgoJkiaJk/IsZAEZFgRjZXJuMSUwIwYDVQQDExxD
-RVJOIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MB4XDTEzMTEwODA4Mzg1NVoXDTIz
-MDcyOTA5MTkzOFowVjESMBAGCgmSJomT8ixkARkWAmNoMRQwEgYKCZImiZPyLGQB
-GRYEY2VybjESMBAGA1UECxMJY29tcHV0ZXJzMRYwFAYDVQQDEw1sb2dpbi5jZXJu
-LmNoMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAp6t1C0SGlLddL2M+
-ltffGioTnDT3eztOxlA9bAGuvB8/Rjym8en6+ET9boM02CyoR5Vpn8iElXVWccAE
-xPIQEq70D6LPe86vb+tYhuKPeLfuICN9Z0SMQ4f+57vk61Co1/uw/8kPvXlyd+Ai
-8Dsn/G0hpH67bBI9VOQKfpJqclcSJuSlUB5PJffvMUpr29B0eRx8LKFnIHbDILSu
-6nVbFLcadtWIjbYvoKorXg3J6urtkz+zEDeYMTvA6ZGOFf/Xy5eGtroSq9csSC97
-6tx+umKEPhXBA9AcpiCV9Cj5axN03Aaa+iTE36jpnjcd9d02dy5Q9jE2nUN6KXnB
-6qF6eQIDAQABo4ID5TCCA+EwPQYJKwYBBAGCNxUHBDAwLgYmKwYBBAGCNxUIg73Q
-CYLtjQ2G7Ysrgd71N4WA0GIehd2yb4Wu9TkCAWQCARkwHQYDVR0lBBYwFAYIKwYB
-BQUHAwIGCCsGAQUFBwMBMA4GA1UdDwEB/wQEAwIFoDBoBgNVHSAEYTBfMF0GCisG
-AQQBYAoEAQEwTzBNBggrBgEFBQcCARZBaHR0cDovL2NhLWRvY3MuY2Vybi5jaC9j
-YS1kb2NzL2NwLWNwcy9jZXJuLXRydXN0ZWQtY2EyLWNwLWNwcy5wZGYwJwYJKwYB
-BAGCNxUKBBowGDAKBggrBgEFBQcDAjAKBggrBgEFBQcDATAdBgNVHQ4EFgQUqtJc
-wUXasyM6sRaO5nCMFoFDenMwGAYDVR0RBBEwD4INbG9naW4uY2Vybi5jaDAfBgNV
-HSMEGDAWgBQdkBnqyM7MPI0UsUzZ7BTiYUADYTCCASoGA1UdHwSCASEwggEdMIIB
-GaCCARWgggERhkdodHRwOi8vY2FmaWxlcy5jZXJuLmNoL2NhZmlsZXMvY3JsL0NF
-Uk4lMjBDZXJ0aWZpY2F0aW9uJTIwQXV0aG9yaXR5LmNybIaBxWxkYXA6Ly8vQ049
-Q0VSTiUyMENlcnRpZmljYXRpb24lMjBBdXRob3JpdHksQ049Q0VSTlBLSTA3LENO
-PUNEUCxDTj1QdWJsaWMlMjBLZXklMjBTZXJ2aWNlcyxDTj1TZXJ2aWNlcyxDTj1D
-b25maWd1cmF0aW9uLERDPWNlcm4sREM9Y2g/Y2VydGlmaWNhdGVSZXZvY2F0aW9u
-TGlzdD9iYXNlP29iamVjdENsYXNzPWNSTERpc3RyaWJ1dGlvblBvaW50MIIBVAYI
-KwYBBQUHAQEEggFGMIIBQjBcBggrBgEFBQcwAoZQaHR0cDovL2NhZmlsZXMuY2Vy
-bi5jaC9jYWZpbGVzL2NlcnRpZmljYXRlcy9DRVJOJTIwQ2VydGlmaWNhdGlvbiUy
-MEF1dGhvcml0eS5jcnQwgbsGCCsGAQUFBzAChoGubGRhcDovLy9DTj1DRVJOJTIw
-Q2VydGlmaWNhdGlvbiUyMEF1dGhvcml0eSxDTj1BSUEsQ049UHVibGljJTIwS2V5
-JTIwU2VydmljZXMsQ049U2VydmljZXMsQ049Q29uZmlndXJhdGlvbixEQz1jZXJu
-LERDPWNoP2NBQ2VydGlmaWNhdGU/YmFzZT9vYmplY3RDbGFzcz1jZXJ0aWZpY2F0
-aW9uQXV0aG9yaXR5MCQGCCsGAQUFBzABhhhodHRwOi8vb2NzcC5jZXJuLmNoL29j
-c3AwDQYJKoZIhvcNAQELBQADggIBAGKZ3bknTCfNuh4TMaL3PuvBFjU8LQ5NKY9G
-LZvY2ibYMRk5Is6eWRgyUsy1UJRQdaQQPnnysqrGq8VRw/NIFotBBsA978/+jj7v
-4e5Kr4o8HvwAQNLBxNmF6XkDytpLL701FcNEGRqIsoIhNzihi2VBADLC9HxljEyP
-T52IR767TMk/+xTOqClceq3sq6WRD4m+xaWRUJyOhn+Pqr+wbhXIw4wzHC6X0hcL
-j8P9Povtm6VmKkN9JPuymMo/0+zSrUt2+TYfmbbEKYJSP0+sceQ76IKxxmSdKAr1
-qDNE8v+c3DvPM2PKmfivwaV2l44FdP8ulzqTgphkYcN1daa9Oc+qJeyu/eL7xWzk
-6Zq5R+jVrMlM0p1y2XczI7Hoc96TMOcbVnwgMcVqRM9p57VItn6XubYPR0C33i1y
-UZjkWbIfqEjq6Vev6lVgngOyzu+hqC/8SDyORA3dlF9aZOD13kPZdF/JRphHREQt
-aRydAiYRlE/WHTvOcY52jujDftUR6oY0eWaWkwSHbX+kDFx8IlR8UtQCUgkGHBGw
-nOYLIGu7SRDGSfOBOiVhxKoHWVk/pL6eKY2SkmyOmmgO4JnQGg95qeAOMG/EQZt/
-2x8GAavUqGvYy9dPFwFf08678hQqkjNSuex7UD0ku8OP1QKvpP44l6vZhFc6A5Xq
-jdU9lus1
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.cern.ch/adfs/ls/"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.cern.ch/adfs/ls/"/>
-    <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://login.cern.ch/adfs/ls/" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://login.cern.ch/adfs/ls/" index="1"/>
-    <AttributeConsumingService index="1">
-      <ServiceName xml:lang="en">CERN Service Provider Proxy</ServiceName>
-      <ServiceDescription xml:lang="en">CERN Service Provider Proxy</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="swissEduPersonHomeOrganization" Name="urn:oid:2.16.756.1.2.5.1.1.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <RequestedAttribute FriendlyName="swissEduPersonHomeOrganizationType" Name="urn:oid:2.16.756.1.2.5.1.1.5" 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="true"/>
-      <RequestedAttribute FriendlyName="swissEduPersonUniqueID" Name="urn:oid:2.16.756.1.2.5.1.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <RequestedAttribute FriendlyName="surname" Name="urn:oid:2.5.4.4" 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" isRequired="true"/>
-      <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="true"/>
-      <RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <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="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"/>
-      <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"/>
-    </AttributeConsumingService>
-  </SPSSODescriptor>
-  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">cern.ch</shibmd:Scope>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="en">CERN</mdui:DisplayName>
-        <mdui:Description xml:lang="en">CERN Identity Provider</mdui:Description>
-        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAABPElEQVR42pVT21HDQAx0B5RACSkB25N/SqAEPs+ZfFACJaSElOAPrHwxQwmUkBKMdk+S5YRk4GYuj9NqT7vSNY2tbfl8aMvptRtk1D3/dTO5Kx+bbpi+mVzkGWT9Xh7bMr0bcMRZkxZyeIYPJPeDHDxYKwGhkeK7yLkd5C0IlJgEOATIAyBS8Fe3Oz1leUY2I1b/R/kK1rJ5M8gM0FwsVNUXORqeO0pZdMk537zSrOeUqt64LysCApz1JoHMRjCGZy7BAOMtAvNqbnfTC36HoTQNTt8h4K2Qp3G0Fl7Ak9QyLQ0GeWvSouNaJeMmk2Q6B8sQ8UADTgSgbpJbzIlXBmb3OXmqL/c79z37cNWprMmGJN4DNNeRrlNJbJrIMGnlOCqx0fXtmtmxO92K5DDpt46k4ftX8vKQ8Lgq5geGpVRM3R4TeQAAAABJRU5ErkJggg==</mdui:Logo>
-        <mdui:Logo height="60" width="60">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADwAAAA8CAIAAAC1nk4lAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAACC9JREFUeNrsmk1MVFcUxxHF1EEqCR8pWNCkGaGatg6JjdUGSRq6GBa0iY26qEmLi0ZrohtoUk1MYAMbm/iRLqCLdlH7kTYsYFG6ABRjJWG6EANM0iBEsQ4aCIgNNKa/945c3rzvNzwbTXyZmJnLfff+77n/8z/nnuu63Z/8mPW8PdlZz+HzAvQL0C7PuhDH2hjJ2Vaez5ep6YWp6YfPIuiqyqKqiuJYZdG2snzgPtOWBt/B2m3xvVtKCnMxZ3/iTveV8an7aXaNluVHy/P3xTbzvS9xu3tgfGgk5T4s/fN8r3xNIJ0+Ur/jQG2UL10D4z/0JD05wG7E926t27t1aDTV0TnsCT1k0Ni19fM92KOj8+alnrH5hSX/c/BuQ/12oLPO9s7hQO/aPmtfjX3k2Qms7V++x2Qnz17+/frk4tLjQHPwIixKjKaO7n8Tzly78Xcg3Kw2LzcH5w7A6erY5tbje+DDV9//6X8yrFtSGMFTjY3NHYM0wvhA2gIhu9K9Yp2njU837OKdlo5BPxPQnzmqKooAzc/kxMzco5V1QhIx/NDolq4rt/oTt32Ombw041c9EIqLjTVDo/f8IMbnGup3ABegcBfP44vtDtCnuqqU3cPeeAgWCVPysPHcwmKzF2JwnGrYBRSAHmvrdZcIgHbxGRhnQ/Ii608c2on5W74ZdHorqkersQl/lobKfADhzmP6yNo84Vp3BnIfbes9Ur/9QmMNJkdYrN1EvE0YHHOPE4fe6vIKCvg1u0z4OHymJ6gGs4FYGjFpOncV+mFvtsuGohvW+02YQMOms3p3xKeWfTQD6eUVqA9J8BwGYdkswIqbZAbW+QKNo+DansLErD5VxfYhSIGYxYvOQBVb3L4szUAwFUlyf1OUezWBTQ86twW04GZAflbrSYs8rxRGrLazcURJdEwiykCSdqKA0FdlofLMLSwxJb6lWvB34QwgjKImLyoH6B+6g2kl9xJDkDbi2R823pPX+VNixAc9ouk04ucvbfED70fBwdCIMdMwMS5PMkTMo0WsRYsu1cUnDu78ta1O4gudlS0FBN3Uzz7dNNWxUtUiu0ciGUyntQi0rIsSXxhacRdjSIjm+5Ocs9PA8t+SbBFk7Tn/QcnyzgpNxd6miIM56VNdtRn3MDmopGXIf4dFCm0snbchR6kBRgK3ibsuDjr/aFHTYD3lmFseBLgme6eNdn8BZCYHlamDWVqxEClNLrPTRssP7pSI9c6nP6kW+YL6KqPKLhntbRtrFNGZrk93UHJDazh0jIhGlFGDw5kexNXU0t55kwg3Njlj8mMjbnvQFcXG8ATx6hprZAesJsu2TQ/Eh0QrJDn0q2KPFpvOX0V/OOOY/gRu/NsJd7R8k/EnCwArSmK7ydm2JDO+zIaqU5YsgCxHfdeOt/pHnQ5Zc7Melq2kbDo3YE39cCFe4UVTO9vF4vnXH+jphzGD4mIhHBEHv9BUwwe24N1zWk6cohGN4yPhgBYxDNygD2EVJ6ZREYy/EvZMzJEjnK5Iucb2hB4N/Dri3emFfYaYJN5jdaBjrb0uLUpwTN3AjY8a/U+t1vZEk7DLw2wsDY9Zoov/hfiwRQDlw6TGgKrcyW/uIV5sZWSdXgwIG3Sp6FpyYtbWTLbQ7bM89kvCiol88XfDBI1p4bEQT7N0eoiRTNp4CPcALU5gSgCgXUlBJETQeLA6SkoEMRqb9EaCvH9LP5Fno0cb9Xv1T52WbK3kFfOSJxqMTVJqq3fOoHVtx9jGWCBDmNwl4/oqYm86zjF+mqXL8hMORzjHM6KWN4+mWLqKbZKEVKerYWbPRT07NeVhQFSWZktZQJ9DYcQRNOk5DG5Jj22MYsx9M3vYPQA1nR8whWgsDVbxfmaBjbaVE3dLpxiCgYyJZbeeTGfMEOEbQ2Fj6+lddlLSWtxJpDBYsUYWyn5hbGIkkxHbmYxGzetHeoMiVnVXKRPb9sFGWCQvkkNnpz4eVdMtJS9XVRZrxxNNmGYPxysx0sWfbxRseomk6sHsP4GKiM2f7QYKQ31hCOOmp7Qwd8drBWxIcnKm27lc5nZRRGaDpYVk/XpFhrFaj+/RkpuCXJ98YJ0cMdEKDcrEDImeS38JMXik+znfrZYnwkfyJEELwpDrSKFRyofQjj6sxBQC4ACCRZYnBBXVlxTPvawjIWbq/kP3bh6lXuaDysYUD5QQGmPj4KSmTucDvZ57T3O40RRUpsUTsVzTSG7tXmTzAI3wsbMtWYO2p5t5ve5Ibm264zFeyX17ppaefhBLWVkLDpVFLl6Y5Xn5iTDDRVuNw4rAvdBYg3l08698FGIpxIDYSXFVSAexHHnoaT3FBLtzWVx6DKb1OWuv3bhr56l3NKbufwORgdkmPQEx77ojxiKoysfxyp7rkyfPXma6xX8fI1PdA7dcdsb7oujW3TnGSjrkLsN/PQB67dtlRHuMmpyclck8EQP3cPx10cHTX//xXfeItLPyI1ocSDGvE6Q1Yf1/D7aYgC9BQZSOqGQ9pGlkqyhGWORER2frBR8nUSlGZuiI/h85R0p9H99lSk4McmjAXzdGtIyeZEZdILV3DtPflgPodMw1UwjzQl+HlaupjV7ikAJVtHyTIAZKQtfQMeeSlVJruQf7P0DL3YBihbtsuQcHU6EsmOQFRQzQDK7YrIHJtnwTMmhCg5xEVnk3sJKmTs64JMDZoSA21bBX/0CMp2jpp4FYLG0tlIUDWhCTuYeLWBWMnIydOWjCBOmbnq8OPI2KmWROYYKWuxg/KXLmDEkvg6wWtCD2kyKv1hcdiqD/CTAAuHBP9rdH3GwAAAAASUVORK5CYII=</mdui:Logo>
-        <mdui:InformationURL xml:lang="en">http://www.cern.ch</mdui:InformationURL>
-      </mdui:UIInfo>
-      <mdui:DiscoHints>
-        <mdui:IPHint>128.141.0.0/16</mdui:IPHint>
-        <mdui:DomainHint>cern.ch</mdui:DomainHint>
-        <mdui:GeolocationHint>geo:46.23304,6.05528</mdui:GeolocationHint>
-      </mdui:DiscoHints>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIIEjCCBfqgAwIBAgIKLYgjvQAAAAAAMDANBgkqhkiG9w0BAQsFADBRMRIwEAYK
-CZImiZPyLGQBGRYCY2gxFDASBgoJkiaJk/IsZAEZFgRjZXJuMSUwIwYDVQQDExxD
-RVJOIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MB4XDTEzMTEwODA4Mzg1NVoXDTIz
-MDcyOTA5MTkzOFowVjESMBAGCgmSJomT8ixkARkWAmNoMRQwEgYKCZImiZPyLGQB
-GRYEY2VybjESMBAGA1UECxMJY29tcHV0ZXJzMRYwFAYDVQQDEw1sb2dpbi5jZXJu
-LmNoMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAp6t1C0SGlLddL2M+
-ltffGioTnDT3eztOxlA9bAGuvB8/Rjym8en6+ET9boM02CyoR5Vpn8iElXVWccAE
-xPIQEq70D6LPe86vb+tYhuKPeLfuICN9Z0SMQ4f+57vk61Co1/uw/8kPvXlyd+Ai
-8Dsn/G0hpH67bBI9VOQKfpJqclcSJuSlUB5PJffvMUpr29B0eRx8LKFnIHbDILSu
-6nVbFLcadtWIjbYvoKorXg3J6urtkz+zEDeYMTvA6ZGOFf/Xy5eGtroSq9csSC97
-6tx+umKEPhXBA9AcpiCV9Cj5axN03Aaa+iTE36jpnjcd9d02dy5Q9jE2nUN6KXnB
-6qF6eQIDAQABo4ID5TCCA+EwPQYJKwYBBAGCNxUHBDAwLgYmKwYBBAGCNxUIg73Q
-CYLtjQ2G7Ysrgd71N4WA0GIehd2yb4Wu9TkCAWQCARkwHQYDVR0lBBYwFAYIKwYB
-BQUHAwIGCCsGAQUFBwMBMA4GA1UdDwEB/wQEAwIFoDBoBgNVHSAEYTBfMF0GCisG
-AQQBYAoEAQEwTzBNBggrBgEFBQcCARZBaHR0cDovL2NhLWRvY3MuY2Vybi5jaC9j
-YS1kb2NzL2NwLWNwcy9jZXJuLXRydXN0ZWQtY2EyLWNwLWNwcy5wZGYwJwYJKwYB
-BAGCNxUKBBowGDAKBggrBgEFBQcDAjAKBggrBgEFBQcDATAdBgNVHQ4EFgQUqtJc
-wUXasyM6sRaO5nCMFoFDenMwGAYDVR0RBBEwD4INbG9naW4uY2Vybi5jaDAfBgNV
-HSMEGDAWgBQdkBnqyM7MPI0UsUzZ7BTiYUADYTCCASoGA1UdHwSCASEwggEdMIIB
-GaCCARWgggERhkdodHRwOi8vY2FmaWxlcy5jZXJuLmNoL2NhZmlsZXMvY3JsL0NF
-Uk4lMjBDZXJ0aWZpY2F0aW9uJTIwQXV0aG9yaXR5LmNybIaBxWxkYXA6Ly8vQ049
-Q0VSTiUyMENlcnRpZmljYXRpb24lMjBBdXRob3JpdHksQ049Q0VSTlBLSTA3LENO
-PUNEUCxDTj1QdWJsaWMlMjBLZXklMjBTZXJ2aWNlcyxDTj1TZXJ2aWNlcyxDTj1D
-b25maWd1cmF0aW9uLERDPWNlcm4sREM9Y2g/Y2VydGlmaWNhdGVSZXZvY2F0aW9u
-TGlzdD9iYXNlP29iamVjdENsYXNzPWNSTERpc3RyaWJ1dGlvblBvaW50MIIBVAYI
-KwYBBQUHAQEEggFGMIIBQjBcBggrBgEFBQcwAoZQaHR0cDovL2NhZmlsZXMuY2Vy
-bi5jaC9jYWZpbGVzL2NlcnRpZmljYXRlcy9DRVJOJTIwQ2VydGlmaWNhdGlvbiUy
-MEF1dGhvcml0eS5jcnQwgbsGCCsGAQUFBzAChoGubGRhcDovLy9DTj1DRVJOJTIw
-Q2VydGlmaWNhdGlvbiUyMEF1dGhvcml0eSxDTj1BSUEsQ049UHVibGljJTIwS2V5
-JTIwU2VydmljZXMsQ049U2VydmljZXMsQ049Q29uZmlndXJhdGlvbixEQz1jZXJu
-LERDPWNoP2NBQ2VydGlmaWNhdGU/YmFzZT9vYmplY3RDbGFzcz1jZXJ0aWZpY2F0
-aW9uQXV0aG9yaXR5MCQGCCsGAQUFBzABhhhodHRwOi8vb2NzcC5jZXJuLmNoL29j
-c3AwDQYJKoZIhvcNAQELBQADggIBAGKZ3bknTCfNuh4TMaL3PuvBFjU8LQ5NKY9G
-LZvY2ibYMRk5Is6eWRgyUsy1UJRQdaQQPnnysqrGq8VRw/NIFotBBsA978/+jj7v
-4e5Kr4o8HvwAQNLBxNmF6XkDytpLL701FcNEGRqIsoIhNzihi2VBADLC9HxljEyP
-T52IR767TMk/+xTOqClceq3sq6WRD4m+xaWRUJyOhn+Pqr+wbhXIw4wzHC6X0hcL
-j8P9Povtm6VmKkN9JPuymMo/0+zSrUt2+TYfmbbEKYJSP0+sceQ76IKxxmSdKAr1
-qDNE8v+c3DvPM2PKmfivwaV2l44FdP8ulzqTgphkYcN1daa9Oc+qJeyu/eL7xWzk
-6Zq5R+jVrMlM0p1y2XczI7Hoc96TMOcbVnwgMcVqRM9p57VItn6XubYPR0C33i1y
-UZjkWbIfqEjq6Vev6lVgngOyzu+hqC/8SDyORA3dlF9aZOD13kPZdF/JRphHREQt
-aRydAiYRlE/WHTvOcY52jujDftUR6oY0eWaWkwSHbX+kDFx8IlR8UtQCUgkGHBGw
-nOYLIGu7SRDGSfOBOiVhxKoHWVk/pL6eKY2SkmyOmmgO4JnQGg95qeAOMG/EQZt/
-2x8GAavUqGvYy9dPFwFf08678hQqkjNSuex7UD0ku8OP1QKvpP44l6vZhFc6A5Xq
-jdU9lus1
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.cern.ch/adfs/ls/"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.cern.ch/adfs/ls/"/>
-    <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:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.cern.ch/adfs/ls/"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.cern.ch/adfs/ls/"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">cern.ch</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">CERN</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.cern.ch/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>CERN</GivenName>
-    <SurName>Service Desk</SurName>
-    <EmailAddress>mailto:service-desk@cern.ch</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>CERN</GivenName>
-    <SurName>Service Desk</SurName>
-    <EmailAddress>mailto:service-desk@cern.ch</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/cern.ch.xml b/swamid-interfederations-2.0/cern.ch.xml
deleted file mode 100644
index 6a4da73f..00000000
--- a/swamid-interfederations-2.0/cern.ch.xml
+++ /dev/null
@@ -1,184 +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: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:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://cern.ch/login" xsi:schemaLocation="urn:oasis:names:tc:SAML:2.0:metadata saml-schema-metadata-2.0.xsd urn:mace:shibboleth:metadata:1.0 shibboleth-metadata-1.0.xsd http://www.w3.org/2000/09/xmldsig# xmldsig-core-schema.xsd">
-  <Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://rr.aai.switch.ch/" registrationInstant="2014-07-29T13:17:52Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.switch.ch/aai/federation/switchaai/metadata-registration-practice-statement-20110711.txt</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </Extensions>
-  <SPSSODescriptor errorURL="http://cern.ch/serviceportal" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="en">CERN Service Provider Proxy</mdui:DisplayName>
-        <mdui:Description xml:lang="en">CERN Service Provider Proxy</mdui:Description>
-        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAABPElEQVR42pVT21HDQAx0B5RACSkB25N/SqAEPs+ZfFACJaSElOAPrHwxQwmUkBKMdk+S5YRk4GYuj9NqT7vSNY2tbfl8aMvptRtk1D3/dTO5Kx+bbpi+mVzkGWT9Xh7bMr0bcMRZkxZyeIYPJPeDHDxYKwGhkeK7yLkd5C0IlJgEOATIAyBS8Fe3Oz1leUY2I1b/R/kK1rJ5M8gM0FwsVNUXORqeO0pZdMk537zSrOeUqt64LysCApz1JoHMRjCGZy7BAOMtAvNqbnfTC36HoTQNTt8h4K2Qp3G0Fl7Ak9QyLQ0GeWvSouNaJeMmk2Q6B8sQ8UADTgSgbpJbzIlXBmb3OXmqL/c79z37cNWprMmGJN4DNNeRrlNJbJrIMGnlOCqx0fXtmtmxO92K5DDpt46k4ftX8vKQ8Lgq5geGpVRM3R4TeQAAAABJRU5ErkJggg==</mdui:Logo>
-        <mdui:Logo height="60" width="60">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADwAAAA8CAIAAAC1nk4lAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAACC9JREFUeNrsmk1MVFcUxxHF1EEqCR8pWNCkGaGatg6JjdUGSRq6GBa0iY26qEmLi0ZrohtoUk1MYAMbm/iRLqCLdlH7kTYsYFG6ABRjJWG6EANM0iBEsQ4aCIgNNKa/945c3rzvNzwbTXyZmJnLfff+77n/8z/nnuu63Z/8mPW8PdlZz+HzAvQL0C7PuhDH2hjJ2Vaez5ep6YWp6YfPIuiqyqKqiuJYZdG2snzgPtOWBt/B2m3xvVtKCnMxZ3/iTveV8an7aXaNluVHy/P3xTbzvS9xu3tgfGgk5T4s/fN8r3xNIJ0+Ur/jQG2UL10D4z/0JD05wG7E926t27t1aDTV0TnsCT1k0Ni19fM92KOj8+alnrH5hSX/c/BuQ/12oLPO9s7hQO/aPmtfjX3k2Qms7V++x2Qnz17+/frk4tLjQHPwIixKjKaO7n8Tzly78Xcg3Kw2LzcH5w7A6erY5tbje+DDV9//6X8yrFtSGMFTjY3NHYM0wvhA2gIhu9K9Yp2njU837OKdlo5BPxPQnzmqKooAzc/kxMzco5V1QhIx/NDolq4rt/oTt32Ombw041c9EIqLjTVDo/f8IMbnGup3ABegcBfP44vtDtCnuqqU3cPeeAgWCVPysPHcwmKzF2JwnGrYBRSAHmvrdZcIgHbxGRhnQ/Ii608c2on5W74ZdHorqkersQl/lobKfADhzmP6yNo84Vp3BnIfbes9Ur/9QmMNJkdYrN1EvE0YHHOPE4fe6vIKCvg1u0z4OHymJ6gGs4FYGjFpOncV+mFvtsuGohvW+02YQMOms3p3xKeWfTQD6eUVqA9J8BwGYdkswIqbZAbW+QKNo+DansLErD5VxfYhSIGYxYvOQBVb3L4szUAwFUlyf1OUezWBTQ86twW04GZAflbrSYs8rxRGrLazcURJdEwiykCSdqKA0FdlofLMLSwxJb6lWvB34QwgjKImLyoH6B+6g2kl9xJDkDbi2R823pPX+VNixAc9ouk04ucvbfED70fBwdCIMdMwMS5PMkTMo0WsRYsu1cUnDu78ta1O4gudlS0FBN3Uzz7dNNWxUtUiu0ciGUyntQi0rIsSXxhacRdjSIjm+5Ocs9PA8t+SbBFk7Tn/QcnyzgpNxd6miIM56VNdtRn3MDmopGXIf4dFCm0snbchR6kBRgK3ibsuDjr/aFHTYD3lmFseBLgme6eNdn8BZCYHlamDWVqxEClNLrPTRssP7pSI9c6nP6kW+YL6KqPKLhntbRtrFNGZrk93UHJDazh0jIhGlFGDw5kexNXU0t55kwg3Njlj8mMjbnvQFcXG8ATx6hprZAesJsu2TQ/Eh0QrJDn0q2KPFpvOX0V/OOOY/gRu/NsJd7R8k/EnCwArSmK7ydm2JDO+zIaqU5YsgCxHfdeOt/pHnQ5Zc7Melq2kbDo3YE39cCFe4UVTO9vF4vnXH+jphzGD4mIhHBEHv9BUwwe24N1zWk6cohGN4yPhgBYxDNygD2EVJ6ZREYy/EvZMzJEjnK5Iucb2hB4N/Dri3emFfYaYJN5jdaBjrb0uLUpwTN3AjY8a/U+t1vZEk7DLw2wsDY9Zoov/hfiwRQDlw6TGgKrcyW/uIV5sZWSdXgwIG3Sp6FpyYtbWTLbQ7bM89kvCiol88XfDBI1p4bEQT7N0eoiRTNp4CPcALU5gSgCgXUlBJETQeLA6SkoEMRqb9EaCvH9LP5Fno0cb9Xv1T52WbK3kFfOSJxqMTVJqq3fOoHVtx9jGWCBDmNwl4/oqYm86zjF+mqXL8hMORzjHM6KWN4+mWLqKbZKEVKerYWbPRT07NeVhQFSWZktZQJ9DYcQRNOk5DG5Jj22MYsx9M3vYPQA1nR8whWgsDVbxfmaBjbaVE3dLpxiCgYyJZbeeTGfMEOEbQ2Fj6+lddlLSWtxJpDBYsUYWyn5hbGIkkxHbmYxGzetHeoMiVnVXKRPb9sFGWCQvkkNnpz4eVdMtJS9XVRZrxxNNmGYPxysx0sWfbxRseomk6sHsP4GKiM2f7QYKQ31hCOOmp7Qwd8drBWxIcnKm27lc5nZRRGaDpYVk/XpFhrFaj+/RkpuCXJ98YJ0cMdEKDcrEDImeS38JMXik+znfrZYnwkfyJEELwpDrSKFRyofQjj6sxBQC4ACCRZYnBBXVlxTPvawjIWbq/kP3bh6lXuaDysYUD5QQGmPj4KSmTucDvZ57T3O40RRUpsUTsVzTSG7tXmTzAI3wsbMtWYO2p5t5ve5Ibm264zFeyX17ppaefhBLWVkLDpVFLl6Y5Xn5iTDDRVuNw4rAvdBYg3l08698FGIpxIDYSXFVSAexHHnoaT3FBLtzWVx6DKb1OWuv3bhr56l3NKbufwORgdkmPQEx77ojxiKoysfxyp7rkyfPXma6xX8fI1PdA7dcdsb7oujW3TnGSjrkLsN/PQB67dtlRHuMmpyclck8EQP3cPx10cHTX//xXfeItLPyI1ocSDGvE6Q1Yf1/D7aYgC9BQZSOqGQ9pGlkqyhGWORER2frBR8nUSlGZuiI/h85R0p9H99lSk4McmjAXzdGtIyeZEZdILV3DtPflgPodMw1UwjzQl+HlaupjV7ikAJVtHyTIAZKQtfQMeeSlVJruQf7P0DL3YBihbtsuQcHU6EsmOQFRQzQDK7YrIHJtnwTMmhCg5xEVnk3sJKmTs64JMDZoSA21bBX/0CMp2jpp4FYLG0tlIUDWhCTuYeLWBWMnIydOWjCBOmbnq8OPI2KmWROYYKWuxg/KXLmDEkvg6wWtCD2kyKv1hcdiqD/CTAAuHBP9rdH3GwAAAAASUVORK5CYII=</mdui:Logo>
-        <mdui:InformationURL xml:lang="en">http://www.cern.ch</mdui:InformationURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIIEjCCBfqgAwIBAgIKLYgjvQAAAAAAMDANBgkqhkiG9w0BAQsFADBRMRIwEAYK
-CZImiZPyLGQBGRYCY2gxFDASBgoJkiaJk/IsZAEZFgRjZXJuMSUwIwYDVQQDExxD
-RVJOIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MB4XDTEzMTEwODA4Mzg1NVoXDTIz
-MDcyOTA5MTkzOFowVjESMBAGCgmSJomT8ixkARkWAmNoMRQwEgYKCZImiZPyLGQB
-GRYEY2VybjESMBAGA1UECxMJY29tcHV0ZXJzMRYwFAYDVQQDEw1sb2dpbi5jZXJu
-LmNoMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAp6t1C0SGlLddL2M+
-ltffGioTnDT3eztOxlA9bAGuvB8/Rjym8en6+ET9boM02CyoR5Vpn8iElXVWccAE
-xPIQEq70D6LPe86vb+tYhuKPeLfuICN9Z0SMQ4f+57vk61Co1/uw/8kPvXlyd+Ai
-8Dsn/G0hpH67bBI9VOQKfpJqclcSJuSlUB5PJffvMUpr29B0eRx8LKFnIHbDILSu
-6nVbFLcadtWIjbYvoKorXg3J6urtkz+zEDeYMTvA6ZGOFf/Xy5eGtroSq9csSC97
-6tx+umKEPhXBA9AcpiCV9Cj5axN03Aaa+iTE36jpnjcd9d02dy5Q9jE2nUN6KXnB
-6qF6eQIDAQABo4ID5TCCA+EwPQYJKwYBBAGCNxUHBDAwLgYmKwYBBAGCNxUIg73Q
-CYLtjQ2G7Ysrgd71N4WA0GIehd2yb4Wu9TkCAWQCARkwHQYDVR0lBBYwFAYIKwYB
-BQUHAwIGCCsGAQUFBwMBMA4GA1UdDwEB/wQEAwIFoDBoBgNVHSAEYTBfMF0GCisG
-AQQBYAoEAQEwTzBNBggrBgEFBQcCARZBaHR0cDovL2NhLWRvY3MuY2Vybi5jaC9j
-YS1kb2NzL2NwLWNwcy9jZXJuLXRydXN0ZWQtY2EyLWNwLWNwcy5wZGYwJwYJKwYB
-BAGCNxUKBBowGDAKBggrBgEFBQcDAjAKBggrBgEFBQcDATAdBgNVHQ4EFgQUqtJc
-wUXasyM6sRaO5nCMFoFDenMwGAYDVR0RBBEwD4INbG9naW4uY2Vybi5jaDAfBgNV
-HSMEGDAWgBQdkBnqyM7MPI0UsUzZ7BTiYUADYTCCASoGA1UdHwSCASEwggEdMIIB
-GaCCARWgggERhkdodHRwOi8vY2FmaWxlcy5jZXJuLmNoL2NhZmlsZXMvY3JsL0NF
-Uk4lMjBDZXJ0aWZpY2F0aW9uJTIwQXV0aG9yaXR5LmNybIaBxWxkYXA6Ly8vQ049
-Q0VSTiUyMENlcnRpZmljYXRpb24lMjBBdXRob3JpdHksQ049Q0VSTlBLSTA3LENO
-PUNEUCxDTj1QdWJsaWMlMjBLZXklMjBTZXJ2aWNlcyxDTj1TZXJ2aWNlcyxDTj1D
-b25maWd1cmF0aW9uLERDPWNlcm4sREM9Y2g/Y2VydGlmaWNhdGVSZXZvY2F0aW9u
-TGlzdD9iYXNlP29iamVjdENsYXNzPWNSTERpc3RyaWJ1dGlvblBvaW50MIIBVAYI
-KwYBBQUHAQEEggFGMIIBQjBcBggrBgEFBQcwAoZQaHR0cDovL2NhZmlsZXMuY2Vy
-bi5jaC9jYWZpbGVzL2NlcnRpZmljYXRlcy9DRVJOJTIwQ2VydGlmaWNhdGlvbiUy
-MEF1dGhvcml0eS5jcnQwgbsGCCsGAQUFBzAChoGubGRhcDovLy9DTj1DRVJOJTIw
-Q2VydGlmaWNhdGlvbiUyMEF1dGhvcml0eSxDTj1BSUEsQ049UHVibGljJTIwS2V5
-JTIwU2VydmljZXMsQ049U2VydmljZXMsQ049Q29uZmlndXJhdGlvbixEQz1jZXJu
-LERDPWNoP2NBQ2VydGlmaWNhdGU/YmFzZT9vYmplY3RDbGFzcz1jZXJ0aWZpY2F0
-aW9uQXV0aG9yaXR5MCQGCCsGAQUFBzABhhhodHRwOi8vb2NzcC5jZXJuLmNoL29j
-c3AwDQYJKoZIhvcNAQELBQADggIBAGKZ3bknTCfNuh4TMaL3PuvBFjU8LQ5NKY9G
-LZvY2ibYMRk5Is6eWRgyUsy1UJRQdaQQPnnysqrGq8VRw/NIFotBBsA978/+jj7v
-4e5Kr4o8HvwAQNLBxNmF6XkDytpLL701FcNEGRqIsoIhNzihi2VBADLC9HxljEyP
-T52IR767TMk/+xTOqClceq3sq6WRD4m+xaWRUJyOhn+Pqr+wbhXIw4wzHC6X0hcL
-j8P9Povtm6VmKkN9JPuymMo/0+zSrUt2+TYfmbbEKYJSP0+sceQ76IKxxmSdKAr1
-qDNE8v+c3DvPM2PKmfivwaV2l44FdP8ulzqTgphkYcN1daa9Oc+qJeyu/eL7xWzk
-6Zq5R+jVrMlM0p1y2XczI7Hoc96TMOcbVnwgMcVqRM9p57VItn6XubYPR0C33i1y
-UZjkWbIfqEjq6Vev6lVgngOyzu+hqC/8SDyORA3dlF9aZOD13kPZdF/JRphHREQt
-aRydAiYRlE/WHTvOcY52jujDftUR6oY0eWaWkwSHbX+kDFx8IlR8UtQCUgkGHBGw
-nOYLIGu7SRDGSfOBOiVhxKoHWVk/pL6eKY2SkmyOmmgO4JnQGg95qeAOMG/EQZt/
-2x8GAavUqGvYy9dPFwFf08678hQqkjNSuex7UD0ku8OP1QKvpP44l6vZhFc6A5Xq
-jdU9lus1
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.cern.ch/adfs/ls/"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.cern.ch/adfs/ls/"/>
-    <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://login.cern.ch/adfs/ls/" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://login.cern.ch/adfs/ls/" index="1"/>
-    <AttributeConsumingService index="1">
-      <ServiceName xml:lang="en">CERN Service Provider Proxy</ServiceName>
-      <ServiceDescription xml:lang="en">CERN Service Provider Proxy</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="swissEduPersonHomeOrganization" Name="urn:oid:2.16.756.1.2.5.1.1.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <RequestedAttribute FriendlyName="swissEduPersonHomeOrganizationType" Name="urn:oid:2.16.756.1.2.5.1.1.5" 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="true"/>
-      <RequestedAttribute FriendlyName="swissEduPersonUniqueID" Name="urn:oid:2.16.756.1.2.5.1.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <RequestedAttribute FriendlyName="surname" Name="urn:oid:2.5.4.4" 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" isRequired="true"/>
-      <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="true"/>
-      <RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <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="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"/>
-      <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"/>
-    </AttributeConsumingService>
-  </SPSSODescriptor>
-  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">cern.ch</shibmd:Scope>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="en">CERN</mdui:DisplayName>
-        <mdui:Description xml:lang="en">CERN Identity Provider</mdui:Description>
-        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAABPElEQVR42pVT21HDQAx0B5RACSkB25N/SqAEPs+ZfFACJaSElOAPrHwxQwmUkBKMdk+S5YRk4GYuj9NqT7vSNY2tbfl8aMvptRtk1D3/dTO5Kx+bbpi+mVzkGWT9Xh7bMr0bcMRZkxZyeIYPJPeDHDxYKwGhkeK7yLkd5C0IlJgEOATIAyBS8Fe3Oz1leUY2I1b/R/kK1rJ5M8gM0FwsVNUXORqeO0pZdMk537zSrOeUqt64LysCApz1JoHMRjCGZy7BAOMtAvNqbnfTC36HoTQNTt8h4K2Qp3G0Fl7Ak9QyLQ0GeWvSouNaJeMmk2Q6B8sQ8UADTgSgbpJbzIlXBmb3OXmqL/c79z37cNWprMmGJN4DNNeRrlNJbJrIMGnlOCqx0fXtmtmxO92K5DDpt46k4ftX8vKQ8Lgq5geGpVRM3R4TeQAAAABJRU5ErkJggg==</mdui:Logo>
-        <mdui:Logo height="60" width="60">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADwAAAA8CAIAAAC1nk4lAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAACC9JREFUeNrsmk1MVFcUxxHF1EEqCR8pWNCkGaGatg6JjdUGSRq6GBa0iY26qEmLi0ZrohtoUk1MYAMbm/iRLqCLdlH7kTYsYFG6ABRjJWG6EANM0iBEsQ4aCIgNNKa/945c3rzvNzwbTXyZmJnLfff+77n/8z/nnuu63Z/8mPW8PdlZz+HzAvQL0C7PuhDH2hjJ2Vaez5ep6YWp6YfPIuiqyqKqiuJYZdG2snzgPtOWBt/B2m3xvVtKCnMxZ3/iTveV8an7aXaNluVHy/P3xTbzvS9xu3tgfGgk5T4s/fN8r3xNIJ0+Ur/jQG2UL10D4z/0JD05wG7E926t27t1aDTV0TnsCT1k0Ni19fM92KOj8+alnrH5hSX/c/BuQ/12oLPO9s7hQO/aPmtfjX3k2Qms7V++x2Qnz17+/frk4tLjQHPwIixKjKaO7n8Tzly78Xcg3Kw2LzcH5w7A6erY5tbje+DDV9//6X8yrFtSGMFTjY3NHYM0wvhA2gIhu9K9Yp2njU837OKdlo5BPxPQnzmqKooAzc/kxMzco5V1QhIx/NDolq4rt/oTt32Ombw041c9EIqLjTVDo/f8IMbnGup3ABegcBfP44vtDtCnuqqU3cPeeAgWCVPysPHcwmKzF2JwnGrYBRSAHmvrdZcIgHbxGRhnQ/Ii608c2on5W74ZdHorqkersQl/lobKfADhzmP6yNo84Vp3BnIfbes9Ur/9QmMNJkdYrN1EvE0YHHOPE4fe6vIKCvg1u0z4OHymJ6gGs4FYGjFpOncV+mFvtsuGohvW+02YQMOms3p3xKeWfTQD6eUVqA9J8BwGYdkswIqbZAbW+QKNo+DansLErD5VxfYhSIGYxYvOQBVb3L4szUAwFUlyf1OUezWBTQ86twW04GZAflbrSYs8rxRGrLazcURJdEwiykCSdqKA0FdlofLMLSwxJb6lWvB34QwgjKImLyoH6B+6g2kl9xJDkDbi2R823pPX+VNixAc9ouk04ucvbfED70fBwdCIMdMwMS5PMkTMo0WsRYsu1cUnDu78ta1O4gudlS0FBN3Uzz7dNNWxUtUiu0ciGUyntQi0rIsSXxhacRdjSIjm+5Ocs9PA8t+SbBFk7Tn/QcnyzgpNxd6miIM56VNdtRn3MDmopGXIf4dFCm0snbchR6kBRgK3ibsuDjr/aFHTYD3lmFseBLgme6eNdn8BZCYHlamDWVqxEClNLrPTRssP7pSI9c6nP6kW+YL6KqPKLhntbRtrFNGZrk93UHJDazh0jIhGlFGDw5kexNXU0t55kwg3Njlj8mMjbnvQFcXG8ATx6hprZAesJsu2TQ/Eh0QrJDn0q2KPFpvOX0V/OOOY/gRu/NsJd7R8k/EnCwArSmK7ydm2JDO+zIaqU5YsgCxHfdeOt/pHnQ5Zc7Melq2kbDo3YE39cCFe4UVTO9vF4vnXH+jphzGD4mIhHBEHv9BUwwe24N1zWk6cohGN4yPhgBYxDNygD2EVJ6ZREYy/EvZMzJEjnK5Iucb2hB4N/Dri3emFfYaYJN5jdaBjrb0uLUpwTN3AjY8a/U+t1vZEk7DLw2wsDY9Zoov/hfiwRQDlw6TGgKrcyW/uIV5sZWSdXgwIG3Sp6FpyYtbWTLbQ7bM89kvCiol88XfDBI1p4bEQT7N0eoiRTNp4CPcALU5gSgCgXUlBJETQeLA6SkoEMRqb9EaCvH9LP5Fno0cb9Xv1T52WbK3kFfOSJxqMTVJqq3fOoHVtx9jGWCBDmNwl4/oqYm86zjF+mqXL8hMORzjHM6KWN4+mWLqKbZKEVKerYWbPRT07NeVhQFSWZktZQJ9DYcQRNOk5DG5Jj22MYsx9M3vYPQA1nR8whWgsDVbxfmaBjbaVE3dLpxiCgYyJZbeeTGfMEOEbQ2Fj6+lddlLSWtxJpDBYsUYWyn5hbGIkkxHbmYxGzetHeoMiVnVXKRPb9sFGWCQvkkNnpz4eVdMtJS9XVRZrxxNNmGYPxysx0sWfbxRseomk6sHsP4GKiM2f7QYKQ31hCOOmp7Qwd8drBWxIcnKm27lc5nZRRGaDpYVk/XpFhrFaj+/RkpuCXJ98YJ0cMdEKDcrEDImeS38JMXik+znfrZYnwkfyJEELwpDrSKFRyofQjj6sxBQC4ACCRZYnBBXVlxTPvawjIWbq/kP3bh6lXuaDysYUD5QQGmPj4KSmTucDvZ57T3O40RRUpsUTsVzTSG7tXmTzAI3wsbMtWYO2p5t5ve5Ibm264zFeyX17ppaefhBLWVkLDpVFLl6Y5Xn5iTDDRVuNw4rAvdBYg3l08698FGIpxIDYSXFVSAexHHnoaT3FBLtzWVx6DKb1OWuv3bhr56l3NKbufwORgdkmPQEx77ojxiKoysfxyp7rkyfPXma6xX8fI1PdA7dcdsb7oujW3TnGSjrkLsN/PQB67dtlRHuMmpyclck8EQP3cPx10cHTX//xXfeItLPyI1ocSDGvE6Q1Yf1/D7aYgC9BQZSOqGQ9pGlkqyhGWORER2frBR8nUSlGZuiI/h85R0p9H99lSk4McmjAXzdGtIyeZEZdILV3DtPflgPodMw1UwjzQl+HlaupjV7ikAJVtHyTIAZKQtfQMeeSlVJruQf7P0DL3YBihbtsuQcHU6EsmOQFRQzQDK7YrIHJtnwTMmhCg5xEVnk3sJKmTs64JMDZoSA21bBX/0CMp2jpp4FYLG0tlIUDWhCTuYeLWBWMnIydOWjCBOmbnq8OPI2KmWROYYKWuxg/KXLmDEkvg6wWtCD2kyKv1hcdiqD/CTAAuHBP9rdH3GwAAAAASUVORK5CYII=</mdui:Logo>
-        <mdui:InformationURL xml:lang="en">http://www.cern.ch</mdui:InformationURL>
-      </mdui:UIInfo>
-      <mdui:DiscoHints>
-        <mdui:IPHint>128.141.0.0/16</mdui:IPHint>
-        <mdui:DomainHint>cern.ch</mdui:DomainHint>
-        <mdui:GeolocationHint>geo:46.23304,6.05528</mdui:GeolocationHint>
-      </mdui:DiscoHints>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIIEjCCBfqgAwIBAgIKLYgjvQAAAAAAMDANBgkqhkiG9w0BAQsFADBRMRIwEAYK
-CZImiZPyLGQBGRYCY2gxFDASBgoJkiaJk/IsZAEZFgRjZXJuMSUwIwYDVQQDExxD
-RVJOIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MB4XDTEzMTEwODA4Mzg1NVoXDTIz
-MDcyOTA5MTkzOFowVjESMBAGCgmSJomT8ixkARkWAmNoMRQwEgYKCZImiZPyLGQB
-GRYEY2VybjESMBAGA1UECxMJY29tcHV0ZXJzMRYwFAYDVQQDEw1sb2dpbi5jZXJu
-LmNoMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAp6t1C0SGlLddL2M+
-ltffGioTnDT3eztOxlA9bAGuvB8/Rjym8en6+ET9boM02CyoR5Vpn8iElXVWccAE
-xPIQEq70D6LPe86vb+tYhuKPeLfuICN9Z0SMQ4f+57vk61Co1/uw/8kPvXlyd+Ai
-8Dsn/G0hpH67bBI9VOQKfpJqclcSJuSlUB5PJffvMUpr29B0eRx8LKFnIHbDILSu
-6nVbFLcadtWIjbYvoKorXg3J6urtkz+zEDeYMTvA6ZGOFf/Xy5eGtroSq9csSC97
-6tx+umKEPhXBA9AcpiCV9Cj5axN03Aaa+iTE36jpnjcd9d02dy5Q9jE2nUN6KXnB
-6qF6eQIDAQABo4ID5TCCA+EwPQYJKwYBBAGCNxUHBDAwLgYmKwYBBAGCNxUIg73Q
-CYLtjQ2G7Ysrgd71N4WA0GIehd2yb4Wu9TkCAWQCARkwHQYDVR0lBBYwFAYIKwYB
-BQUHAwIGCCsGAQUFBwMBMA4GA1UdDwEB/wQEAwIFoDBoBgNVHSAEYTBfMF0GCisG
-AQQBYAoEAQEwTzBNBggrBgEFBQcCARZBaHR0cDovL2NhLWRvY3MuY2Vybi5jaC9j
-YS1kb2NzL2NwLWNwcy9jZXJuLXRydXN0ZWQtY2EyLWNwLWNwcy5wZGYwJwYJKwYB
-BAGCNxUKBBowGDAKBggrBgEFBQcDAjAKBggrBgEFBQcDATAdBgNVHQ4EFgQUqtJc
-wUXasyM6sRaO5nCMFoFDenMwGAYDVR0RBBEwD4INbG9naW4uY2Vybi5jaDAfBgNV
-HSMEGDAWgBQdkBnqyM7MPI0UsUzZ7BTiYUADYTCCASoGA1UdHwSCASEwggEdMIIB
-GaCCARWgggERhkdodHRwOi8vY2FmaWxlcy5jZXJuLmNoL2NhZmlsZXMvY3JsL0NF
-Uk4lMjBDZXJ0aWZpY2F0aW9uJTIwQXV0aG9yaXR5LmNybIaBxWxkYXA6Ly8vQ049
-Q0VSTiUyMENlcnRpZmljYXRpb24lMjBBdXRob3JpdHksQ049Q0VSTlBLSTA3LENO
-PUNEUCxDTj1QdWJsaWMlMjBLZXklMjBTZXJ2aWNlcyxDTj1TZXJ2aWNlcyxDTj1D
-b25maWd1cmF0aW9uLERDPWNlcm4sREM9Y2g/Y2VydGlmaWNhdGVSZXZvY2F0aW9u
-TGlzdD9iYXNlP29iamVjdENsYXNzPWNSTERpc3RyaWJ1dGlvblBvaW50MIIBVAYI
-KwYBBQUHAQEEggFGMIIBQjBcBggrBgEFBQcwAoZQaHR0cDovL2NhZmlsZXMuY2Vy
-bi5jaC9jYWZpbGVzL2NlcnRpZmljYXRlcy9DRVJOJTIwQ2VydGlmaWNhdGlvbiUy
-MEF1dGhvcml0eS5jcnQwgbsGCCsGAQUFBzAChoGubGRhcDovLy9DTj1DRVJOJTIw
-Q2VydGlmaWNhdGlvbiUyMEF1dGhvcml0eSxDTj1BSUEsQ049UHVibGljJTIwS2V5
-JTIwU2VydmljZXMsQ049U2VydmljZXMsQ049Q29uZmlndXJhdGlvbixEQz1jZXJu
-LERDPWNoP2NBQ2VydGlmaWNhdGU/YmFzZT9vYmplY3RDbGFzcz1jZXJ0aWZpY2F0
-aW9uQXV0aG9yaXR5MCQGCCsGAQUFBzABhhhodHRwOi8vb2NzcC5jZXJuLmNoL29j
-c3AwDQYJKoZIhvcNAQELBQADggIBAGKZ3bknTCfNuh4TMaL3PuvBFjU8LQ5NKY9G
-LZvY2ibYMRk5Is6eWRgyUsy1UJRQdaQQPnnysqrGq8VRw/NIFotBBsA978/+jj7v
-4e5Kr4o8HvwAQNLBxNmF6XkDytpLL701FcNEGRqIsoIhNzihi2VBADLC9HxljEyP
-T52IR767TMk/+xTOqClceq3sq6WRD4m+xaWRUJyOhn+Pqr+wbhXIw4wzHC6X0hcL
-j8P9Povtm6VmKkN9JPuymMo/0+zSrUt2+TYfmbbEKYJSP0+sceQ76IKxxmSdKAr1
-qDNE8v+c3DvPM2PKmfivwaV2l44FdP8ulzqTgphkYcN1daa9Oc+qJeyu/eL7xWzk
-6Zq5R+jVrMlM0p1y2XczI7Hoc96TMOcbVnwgMcVqRM9p57VItn6XubYPR0C33i1y
-UZjkWbIfqEjq6Vev6lVgngOyzu+hqC/8SDyORA3dlF9aZOD13kPZdF/JRphHREQt
-aRydAiYRlE/WHTvOcY52jujDftUR6oY0eWaWkwSHbX+kDFx8IlR8UtQCUgkGHBGw
-nOYLIGu7SRDGSfOBOiVhxKoHWVk/pL6eKY2SkmyOmmgO4JnQGg95qeAOMG/EQZt/
-2x8GAavUqGvYy9dPFwFf08678hQqkjNSuex7UD0ku8OP1QKvpP44l6vZhFc6A5Xq
-jdU9lus1
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.cern.ch/adfs/ls/"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.cern.ch/adfs/ls/"/>
-    <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:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.cern.ch/adfs/ls/"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.cern.ch/adfs/ls/"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">cern.ch</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">CERN</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.cern.ch/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>CERN</GivenName>
-    <SurName>Service Desk</SurName>
-    <EmailAddress>mailto:service-desk@cern.ch</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>CERN</GivenName>
-    <SurName>Service Desk</SurName>
-    <EmailAddress>mailto:service-desk@cern.ch</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/clarin.ids-mannheim.de-shibboleth.xml b/swamid-interfederations-2.0/clarin.ids-mannheim.de-shibboleth.xml
deleted file mode 100644
index ef5c0ea6..00000000
--- a/swamid-interfederations-2.0/clarin.ids-mannheim.de-shibboleth.xml
+++ /dev/null
@@ -1,144 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://clarin.ids-mannheim.de/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2013-10-24T13:14:25Z">
-      <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://clarin.ids-mannheim.de/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="de">Institut für Deutsche Sprache (IDS) - CLARIN Dienste</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Institut für Deutsche Sprache (IDS) - CLARIN services</mdui:DisplayName>
-        <mdui:Description xml:lang="de">Verschiedene Dienste des Institut für Deutsche Sprache (IDS) im Rahmen der CLARIN-Initiative.</mdui:Description>
-        <mdui:Description xml:lang="en">Various services provided by the Institut für Deutsche Sprache (IDS) in the context of the CLARIN initiative.</mdui:Description>
-        <mdui:InformationURL xml:lang="de">http://www.ids-mannheim.de</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">http://www.ids-mannheim.de</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://clarin.ids-mannheim.de/privacy.html</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>clarin.ids-mannheim.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=clarin.ids-mannheim.de,OU=DFN-PKI,O=DFN-Verein,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFDTCCA/WgAwIBAgIEEGkCyTANBgkqhkiG9w0BAQUFADBVMQswCQYDVQQGEwJE
-RTETMBEGA1UEChMKREZOLVZlcmVpbjEQMA4GA1UECxMHREZOLVBLSTEfMB0GA1UE
-AxMWREZOLVZlcmVpbiBDQSBTZXJ2aWNlczAeFw0xMDA3MjMxMjA0MDlaFw0xNTA3
-MjIxMjA0MDlaMFUxCzAJBgNVBAYTAkRFMRMwEQYDVQQKEwpERk4tVmVyZWluMRAw
-DgYDVQQLEwdERk4tUEtJMR8wHQYDVQQDExZjbGFyaW4uaWRzLW1hbm5oZWltLmRl
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2HSq1u4QtWz4jz2ZsYrw
-HLTxxq3PIxmkC/byX/fcdo68NYovgdpHmp1FzR2ZTSULPOvRUf/sgwgRcoSwu2Ar
-7qYuMg8BJx/tKkN1kL4UYSI5eNuENw6tsdLm0HVbuszMCAgQaMHouFa5d0jHMdsG
-sh/UKzztdaUE9CiYQ2s6pbNse5A0f0c8tU8OqQdxRDHgmSLCEsUO7MRz8x2y8gST
-uroXAyqgw177Gj+HEyRDLiOciJRP1Mo9k9WlqQKd0NkozGfa9l/cHGkgx4bRscoh
-G+KssEE6zZ4lgeMHp6gCZrIq6xuhmSMb5+LTjbLcRT1B3SCUMmldleDlfCNjCD+i
-mQIDAQABo4IB4zCCAd8wCQYDVR0TBAIwADALBgNVHQ8EBAMCBeAwHQYDVR0lBBYw
-FAYIKwYBBQUHAwIGCCsGAQUFBwMBMB0GA1UdDgQWBBSpwD4M10rk6JzMwjRV+pON
-rTYX0TAfBgNVHSMEGDAWgBQdqfGGJnZNz139UKNu6/G8InVt6zAlBgNVHREEHjAc
-gRpzY2hvbmVmZWxkQGlkcy1tYW5uaGVpbS5kZTCBkQYDVR0fBIGJMIGGMEGgP6A9
-hjtodHRwOi8vY2RwMS5wY2EuZGZuLmRlL2dsb2JhbC1zZXJ2aWNlcy1jYS9wdWIv
-Y3JsL2NhY3JsLmNybDBBoD+gPYY7aHR0cDovL2NkcDIucGNhLmRmbi5kZS9nbG9i
-YWwtc2VydmljZXMtY2EvcHViL2NybC9jYWNybC5jcmwwgaoGCCsGAQUFBwEBBIGd
-MIGaMEsGCCsGAQUFBzAChj9odHRwOi8vY2RwMS5wY2EuZGZuLmRlL2dsb2JhbC1z
-ZXJ2aWNlcy1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwSwYIKwYBBQUHMAKGP2h0
-dHA6Ly9jZHAyLnBjYS5kZm4uZGUvZ2xvYmFsLXNlcnZpY2VzLWNhL3B1Yi9jYWNl
-cnQvY2FjZXJ0LmNydDANBgkqhkiG9w0BAQUFAAOCAQEAIfABIseLPXh8WgPco+Pk
-uDdU8lbUkY7mwTUd2hOYz/uLAUcqXu24TPUlw2PR++EkoHpM6ocoRHrV/Pz9RcdK
-+HXk4df5XPRrMMUu3WkOkZ+ea+ZWehS+AIrfVGz0+eoJraxF4B20571PFlamI7K7
-/zGhNTTHgB6d74dCcS9qCqP7hBaDqTDnN4DAm+gv+wFLVECh13YZyDlkvWKk7RZP
-kcFj6qC0guBXN8wZN7fSiOZUxTAxhD5Z04yjCiMcoXQKg5VMlCR+eLE/W/9gc58P
-sYKNO2ByhVB/TVmh+1gYoPCId/EM4DmonEQXRp3wEm6n+vhIqRShGjbi7FWDPimB
-Ew==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>clarin.ids-mannheim.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=clarin.ids-mannheim.de,OU=DFN-PKI,O=DFN-Verein,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFDTCCA/WgAwIBAgIEEGkCyTANBgkqhkiG9w0BAQUFADBVMQswCQYDVQQGEwJE
-RTETMBEGA1UEChMKREZOLVZlcmVpbjEQMA4GA1UECxMHREZOLVBLSTEfMB0GA1UE
-AxMWREZOLVZlcmVpbiBDQSBTZXJ2aWNlczAeFw0xMDA3MjMxMjA0MDlaFw0xNTA3
-MjIxMjA0MDlaMFUxCzAJBgNVBAYTAkRFMRMwEQYDVQQKEwpERk4tVmVyZWluMRAw
-DgYDVQQLEwdERk4tUEtJMR8wHQYDVQQDExZjbGFyaW4uaWRzLW1hbm5oZWltLmRl
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2HSq1u4QtWz4jz2ZsYrw
-HLTxxq3PIxmkC/byX/fcdo68NYovgdpHmp1FzR2ZTSULPOvRUf/sgwgRcoSwu2Ar
-7qYuMg8BJx/tKkN1kL4UYSI5eNuENw6tsdLm0HVbuszMCAgQaMHouFa5d0jHMdsG
-sh/UKzztdaUE9CiYQ2s6pbNse5A0f0c8tU8OqQdxRDHgmSLCEsUO7MRz8x2y8gST
-uroXAyqgw177Gj+HEyRDLiOciJRP1Mo9k9WlqQKd0NkozGfa9l/cHGkgx4bRscoh
-G+KssEE6zZ4lgeMHp6gCZrIq6xuhmSMb5+LTjbLcRT1B3SCUMmldleDlfCNjCD+i
-mQIDAQABo4IB4zCCAd8wCQYDVR0TBAIwADALBgNVHQ8EBAMCBeAwHQYDVR0lBBYw
-FAYIKwYBBQUHAwIGCCsGAQUFBwMBMB0GA1UdDgQWBBSpwD4M10rk6JzMwjRV+pON
-rTYX0TAfBgNVHSMEGDAWgBQdqfGGJnZNz139UKNu6/G8InVt6zAlBgNVHREEHjAc
-gRpzY2hvbmVmZWxkQGlkcy1tYW5uaGVpbS5kZTCBkQYDVR0fBIGJMIGGMEGgP6A9
-hjtodHRwOi8vY2RwMS5wY2EuZGZuLmRlL2dsb2JhbC1zZXJ2aWNlcy1jYS9wdWIv
-Y3JsL2NhY3JsLmNybDBBoD+gPYY7aHR0cDovL2NkcDIucGNhLmRmbi5kZS9nbG9i
-YWwtc2VydmljZXMtY2EvcHViL2NybC9jYWNybC5jcmwwgaoGCCsGAQUFBwEBBIGd
-MIGaMEsGCCsGAQUFBzAChj9odHRwOi8vY2RwMS5wY2EuZGZuLmRlL2dsb2JhbC1z
-ZXJ2aWNlcy1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwSwYIKwYBBQUHMAKGP2h0
-dHA6Ly9jZHAyLnBjYS5kZm4uZGUvZ2xvYmFsLXNlcnZpY2VzLWNhL3B1Yi9jYWNl
-cnQvY2FjZXJ0LmNydDANBgkqhkiG9w0BAQUFAAOCAQEAIfABIseLPXh8WgPco+Pk
-uDdU8lbUkY7mwTUd2hOYz/uLAUcqXu24TPUlw2PR++EkoHpM6ocoRHrV/Pz9RcdK
-+HXk4df5XPRrMMUu3WkOkZ+ea+ZWehS+AIrfVGz0+eoJraxF4B20571PFlamI7K7
-/zGhNTTHgB6d74dCcS9qCqP7hBaDqTDnN4DAm+gv+wFLVECh13YZyDlkvWKk7RZP
-kcFj6qC0guBXN8wZN7fSiOZUxTAxhD5Z04yjCiMcoXQKg5VMlCR+eLE/W/9gc58P
-sYKNO2ByhVB/TVmh+1gYoPCId/EM4DmonEQXRp3wEm6n+vhIqRShGjbi7FWDPimB
-Ew==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://clarin.ids-mannheim.de/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://clarin.ids-mannheim.de/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://clarin.ids-mannheim.de/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://clarin.ids-mannheim.de/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://clarin.ids-mannheim.de/Shibboleth.sso/SAML2/POST" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://clarin.ids-mannheim.de/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://clarin.ids-mannheim.de/Shibboleth.sso/SAML2/Artifact" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://clarin.ids-mannheim.de/Shibboleth.sso/SAML2/ECP" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://clarin.ids-mannheim.de/Shibboleth.sso/SAML/POST" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://clarin.ids-mannheim.de/Shibboleth.sso/SAML/Artifact" index="5"/>
-    <AttributeConsumingService index="1">
-      <ServiceName xml:lang="de">Institut für Deutsche Sprache (IDS) - CLARIN Dienste</ServiceName>
-      <ServiceName xml:lang="en">Institut für Deutsche Sprache (IDS) - CLARIN services</ServiceName>
-      <ServiceDescription xml:lang="de">Verschiedene Dienste des Institut für Deutsche Sprache (IDS) im Rahmen der CLARIN-Initiative.</ServiceDescription>
-      <ServiceDescription xml:lang="en">Various services provided by the Institut für Deutsche Sprache (IDS) in the context of the CLARIN initiative.</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="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" 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="false"/>
-    </AttributeConsumingService>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">e217</OrganizationName>
-    <OrganizationName xml:lang="en">e217</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">Institut für Deutsche Sprache (IDS)</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">Institut für Deutsche Sprache (IDS)</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.ids-mannheim.de</OrganizationURL>
-    <OrganizationURL xml:lang="en">http://www.ids-mannheim.de</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Oliver</GivenName>
-    <SurName>Schonefeld</SurName>
-    <EmailAddress>mailto:schonefeld@ids-mannheim.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="administrative">
-    <GivenName>Andreas</GivenName>
-    <SurName>Witt</SurName>
-    <EmailAddress>mailto:witt@ids-mannheim.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="support">
-    <GivenName>AAI</GivenName>
-    <SurName>Team</SurName>
-    <EmailAddress>mailto:aai@ids-mannheim.de</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/clarin.ids-mannheim.de.xml b/swamid-interfederations-2.0/clarin.ids-mannheim.de.xml
deleted file mode 100644
index ef5c0ea6..00000000
--- a/swamid-interfederations-2.0/clarin.ids-mannheim.de.xml
+++ /dev/null
@@ -1,144 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://clarin.ids-mannheim.de/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2013-10-24T13:14:25Z">
-      <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://clarin.ids-mannheim.de/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="de">Institut für Deutsche Sprache (IDS) - CLARIN Dienste</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Institut für Deutsche Sprache (IDS) - CLARIN services</mdui:DisplayName>
-        <mdui:Description xml:lang="de">Verschiedene Dienste des Institut für Deutsche Sprache (IDS) im Rahmen der CLARIN-Initiative.</mdui:Description>
-        <mdui:Description xml:lang="en">Various services provided by the Institut für Deutsche Sprache (IDS) in the context of the CLARIN initiative.</mdui:Description>
-        <mdui:InformationURL xml:lang="de">http://www.ids-mannheim.de</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">http://www.ids-mannheim.de</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://clarin.ids-mannheim.de/privacy.html</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>clarin.ids-mannheim.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=clarin.ids-mannheim.de,OU=DFN-PKI,O=DFN-Verein,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFDTCCA/WgAwIBAgIEEGkCyTANBgkqhkiG9w0BAQUFADBVMQswCQYDVQQGEwJE
-RTETMBEGA1UEChMKREZOLVZlcmVpbjEQMA4GA1UECxMHREZOLVBLSTEfMB0GA1UE
-AxMWREZOLVZlcmVpbiBDQSBTZXJ2aWNlczAeFw0xMDA3MjMxMjA0MDlaFw0xNTA3
-MjIxMjA0MDlaMFUxCzAJBgNVBAYTAkRFMRMwEQYDVQQKEwpERk4tVmVyZWluMRAw
-DgYDVQQLEwdERk4tUEtJMR8wHQYDVQQDExZjbGFyaW4uaWRzLW1hbm5oZWltLmRl
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2HSq1u4QtWz4jz2ZsYrw
-HLTxxq3PIxmkC/byX/fcdo68NYovgdpHmp1FzR2ZTSULPOvRUf/sgwgRcoSwu2Ar
-7qYuMg8BJx/tKkN1kL4UYSI5eNuENw6tsdLm0HVbuszMCAgQaMHouFa5d0jHMdsG
-sh/UKzztdaUE9CiYQ2s6pbNse5A0f0c8tU8OqQdxRDHgmSLCEsUO7MRz8x2y8gST
-uroXAyqgw177Gj+HEyRDLiOciJRP1Mo9k9WlqQKd0NkozGfa9l/cHGkgx4bRscoh
-G+KssEE6zZ4lgeMHp6gCZrIq6xuhmSMb5+LTjbLcRT1B3SCUMmldleDlfCNjCD+i
-mQIDAQABo4IB4zCCAd8wCQYDVR0TBAIwADALBgNVHQ8EBAMCBeAwHQYDVR0lBBYw
-FAYIKwYBBQUHAwIGCCsGAQUFBwMBMB0GA1UdDgQWBBSpwD4M10rk6JzMwjRV+pON
-rTYX0TAfBgNVHSMEGDAWgBQdqfGGJnZNz139UKNu6/G8InVt6zAlBgNVHREEHjAc
-gRpzY2hvbmVmZWxkQGlkcy1tYW5uaGVpbS5kZTCBkQYDVR0fBIGJMIGGMEGgP6A9
-hjtodHRwOi8vY2RwMS5wY2EuZGZuLmRlL2dsb2JhbC1zZXJ2aWNlcy1jYS9wdWIv
-Y3JsL2NhY3JsLmNybDBBoD+gPYY7aHR0cDovL2NkcDIucGNhLmRmbi5kZS9nbG9i
-YWwtc2VydmljZXMtY2EvcHViL2NybC9jYWNybC5jcmwwgaoGCCsGAQUFBwEBBIGd
-MIGaMEsGCCsGAQUFBzAChj9odHRwOi8vY2RwMS5wY2EuZGZuLmRlL2dsb2JhbC1z
-ZXJ2aWNlcy1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwSwYIKwYBBQUHMAKGP2h0
-dHA6Ly9jZHAyLnBjYS5kZm4uZGUvZ2xvYmFsLXNlcnZpY2VzLWNhL3B1Yi9jYWNl
-cnQvY2FjZXJ0LmNydDANBgkqhkiG9w0BAQUFAAOCAQEAIfABIseLPXh8WgPco+Pk
-uDdU8lbUkY7mwTUd2hOYz/uLAUcqXu24TPUlw2PR++EkoHpM6ocoRHrV/Pz9RcdK
-+HXk4df5XPRrMMUu3WkOkZ+ea+ZWehS+AIrfVGz0+eoJraxF4B20571PFlamI7K7
-/zGhNTTHgB6d74dCcS9qCqP7hBaDqTDnN4DAm+gv+wFLVECh13YZyDlkvWKk7RZP
-kcFj6qC0guBXN8wZN7fSiOZUxTAxhD5Z04yjCiMcoXQKg5VMlCR+eLE/W/9gc58P
-sYKNO2ByhVB/TVmh+1gYoPCId/EM4DmonEQXRp3wEm6n+vhIqRShGjbi7FWDPimB
-Ew==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>clarin.ids-mannheim.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=clarin.ids-mannheim.de,OU=DFN-PKI,O=DFN-Verein,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFDTCCA/WgAwIBAgIEEGkCyTANBgkqhkiG9w0BAQUFADBVMQswCQYDVQQGEwJE
-RTETMBEGA1UEChMKREZOLVZlcmVpbjEQMA4GA1UECxMHREZOLVBLSTEfMB0GA1UE
-AxMWREZOLVZlcmVpbiBDQSBTZXJ2aWNlczAeFw0xMDA3MjMxMjA0MDlaFw0xNTA3
-MjIxMjA0MDlaMFUxCzAJBgNVBAYTAkRFMRMwEQYDVQQKEwpERk4tVmVyZWluMRAw
-DgYDVQQLEwdERk4tUEtJMR8wHQYDVQQDExZjbGFyaW4uaWRzLW1hbm5oZWltLmRl
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2HSq1u4QtWz4jz2ZsYrw
-HLTxxq3PIxmkC/byX/fcdo68NYovgdpHmp1FzR2ZTSULPOvRUf/sgwgRcoSwu2Ar
-7qYuMg8BJx/tKkN1kL4UYSI5eNuENw6tsdLm0HVbuszMCAgQaMHouFa5d0jHMdsG
-sh/UKzztdaUE9CiYQ2s6pbNse5A0f0c8tU8OqQdxRDHgmSLCEsUO7MRz8x2y8gST
-uroXAyqgw177Gj+HEyRDLiOciJRP1Mo9k9WlqQKd0NkozGfa9l/cHGkgx4bRscoh
-G+KssEE6zZ4lgeMHp6gCZrIq6xuhmSMb5+LTjbLcRT1B3SCUMmldleDlfCNjCD+i
-mQIDAQABo4IB4zCCAd8wCQYDVR0TBAIwADALBgNVHQ8EBAMCBeAwHQYDVR0lBBYw
-FAYIKwYBBQUHAwIGCCsGAQUFBwMBMB0GA1UdDgQWBBSpwD4M10rk6JzMwjRV+pON
-rTYX0TAfBgNVHSMEGDAWgBQdqfGGJnZNz139UKNu6/G8InVt6zAlBgNVHREEHjAc
-gRpzY2hvbmVmZWxkQGlkcy1tYW5uaGVpbS5kZTCBkQYDVR0fBIGJMIGGMEGgP6A9
-hjtodHRwOi8vY2RwMS5wY2EuZGZuLmRlL2dsb2JhbC1zZXJ2aWNlcy1jYS9wdWIv
-Y3JsL2NhY3JsLmNybDBBoD+gPYY7aHR0cDovL2NkcDIucGNhLmRmbi5kZS9nbG9i
-YWwtc2VydmljZXMtY2EvcHViL2NybC9jYWNybC5jcmwwgaoGCCsGAQUFBwEBBIGd
-MIGaMEsGCCsGAQUFBzAChj9odHRwOi8vY2RwMS5wY2EuZGZuLmRlL2dsb2JhbC1z
-ZXJ2aWNlcy1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwSwYIKwYBBQUHMAKGP2h0
-dHA6Ly9jZHAyLnBjYS5kZm4uZGUvZ2xvYmFsLXNlcnZpY2VzLWNhL3B1Yi9jYWNl
-cnQvY2FjZXJ0LmNydDANBgkqhkiG9w0BAQUFAAOCAQEAIfABIseLPXh8WgPco+Pk
-uDdU8lbUkY7mwTUd2hOYz/uLAUcqXu24TPUlw2PR++EkoHpM6ocoRHrV/Pz9RcdK
-+HXk4df5XPRrMMUu3WkOkZ+ea+ZWehS+AIrfVGz0+eoJraxF4B20571PFlamI7K7
-/zGhNTTHgB6d74dCcS9qCqP7hBaDqTDnN4DAm+gv+wFLVECh13YZyDlkvWKk7RZP
-kcFj6qC0guBXN8wZN7fSiOZUxTAxhD5Z04yjCiMcoXQKg5VMlCR+eLE/W/9gc58P
-sYKNO2ByhVB/TVmh+1gYoPCId/EM4DmonEQXRp3wEm6n+vhIqRShGjbi7FWDPimB
-Ew==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://clarin.ids-mannheim.de/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://clarin.ids-mannheim.de/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://clarin.ids-mannheim.de/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://clarin.ids-mannheim.de/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://clarin.ids-mannheim.de/Shibboleth.sso/SAML2/POST" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://clarin.ids-mannheim.de/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://clarin.ids-mannheim.de/Shibboleth.sso/SAML2/Artifact" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://clarin.ids-mannheim.de/Shibboleth.sso/SAML2/ECP" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://clarin.ids-mannheim.de/Shibboleth.sso/SAML/POST" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://clarin.ids-mannheim.de/Shibboleth.sso/SAML/Artifact" index="5"/>
-    <AttributeConsumingService index="1">
-      <ServiceName xml:lang="de">Institut für Deutsche Sprache (IDS) - CLARIN Dienste</ServiceName>
-      <ServiceName xml:lang="en">Institut für Deutsche Sprache (IDS) - CLARIN services</ServiceName>
-      <ServiceDescription xml:lang="de">Verschiedene Dienste des Institut für Deutsche Sprache (IDS) im Rahmen der CLARIN-Initiative.</ServiceDescription>
-      <ServiceDescription xml:lang="en">Various services provided by the Institut für Deutsche Sprache (IDS) in the context of the CLARIN initiative.</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="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" 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="false"/>
-    </AttributeConsumingService>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">e217</OrganizationName>
-    <OrganizationName xml:lang="en">e217</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">Institut für Deutsche Sprache (IDS)</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">Institut für Deutsche Sprache (IDS)</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.ids-mannheim.de</OrganizationURL>
-    <OrganizationURL xml:lang="en">http://www.ids-mannheim.de</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Oliver</GivenName>
-    <SurName>Schonefeld</SurName>
-    <EmailAddress>mailto:schonefeld@ids-mannheim.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="administrative">
-    <GivenName>Andreas</GivenName>
-    <SurName>Witt</SurName>
-    <EmailAddress>mailto:witt@ids-mannheim.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="support">
-    <GivenName>AAI</GivenName>
-    <SurName>Team</SurName>
-    <EmailAddress>mailto:aai@ids-mannheim.de</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/clarin.oeaw.ac.at-shibboleth.xml b/swamid-interfederations-2.0/clarin.oeaw.ac.at-shibboleth.xml
deleted file mode 100644
index 41b19c73..00000000
--- a/swamid-interfederations-2.0/clarin.oeaw.ac.at-shibboleth.xml
+++ /dev/null
@@ -1,119 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" 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://clarin.oeaw.ac.at/shibboleth">
-  <md:Extensions>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://eduid.at" registrationInstant="2014-01-23T16:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://eduid.at/policy/mdrps-20140606</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://refeds.org/category/research-and-scholarship</saml:AttributeValue>
-        <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:Extensions>
-      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://clarin.oeaw.ac.at/Shibboleth.sso/Login"/>
-      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://clarin.oeaw.ac.at/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="de">CLARIN Centre Vienna</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">CLARIN Centre Vienna</mdui:DisplayName>
-        <mdui:Description xml:lang="de">Ein Repositorium für Archivieren und Publizieren von Sprachressourcen und Technologien und andere Dienste für digitale Geisteswissenschaften.</mdui:Description>
-        <mdui:Description xml:lang="en">A repository for depositing and publishing of language resources and technology and other infrastructure services for digital humanities.</mdui:Description>
-        <mdui:InformationURL xml:lang="de">https://clarin.oeaw.ac.at/ccv/</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://clarin.oeaw.ac.at/ccv/privacy</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDBjCCAe6gAwIBAgIJAI3rKBVKUcUJMA0GCSqGSIb3DQEBBQUAMCAxHjAcBgNV
-BAMTFWNsYXJpbi5hcnoub2Vhdy5hYy5hdDAeFw0xNDAxMjAxNDU3MThaFw0yNDAx
-MTgxNDU3MThaMCAxHjAcBgNVBAMTFWNsYXJpbi5hcnoub2Vhdy5hYy5hdDCCASIw
-DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMJ8B6WyydvbvIHJ1Cb34h8838G5
-JItPpmJC+D/K+6MI3YiydVKKlhaGh/GqcWcz0Qw30W7WYilUZ5IkzZA12QY1CF1g
-cJPNUmYibzP3sAZ9KrvaCEMxlseoldh0yc+8Q8eplQH9id4u5G+J8SvTBejt261y
-ATb6pIANsRQkOLMvxtq7/NrEnAmZQOM5obsshHxLlXlJ0qixakaYXWKCIuUUOEFY
-FT13vhWrUC4BWW0OGimoR1cBnyEJtS9kRNWQ85+03VVVvLk9AssoHWxOJVJ7HE1m
-5/xgMrmpOv1vbqDKDljrY19zheNOoFr3RdaSCb1Eh8lWCNigUgOwK8Mm7VECAwEA
-AaNDMEEwIAYDVR0RBBkwF4IVY2xhcmluLmFyei5vZWF3LmFjLmF0MB0GA1UdDgQW
-BBQ6IH3aND4GFYEEgrR0IKf/d4QEcDANBgkqhkiG9w0BAQUFAAOCAQEAhdcxQ+7/
-1WYPCTVz2HOk8J3eM3ZJylGdTnfgNDDGkBo0CGmyiulX8m+nimBKh7UNMkRkU8cH
-NUldSGR70wi0iQlx7t868V5pmkqxnaDu4+lo1QU59s5c7MRJXZ6OcbKB57O/d5l+
-+kX3/YW9WAQkmwcyVWDbcmk4DZK5kqqTk+u3fS48cLqai5YVcj8pDDoUx6/ZkwDv
-Yqvva2v4+vhzX9SW3QyiChOgFo9sP/UD1U8JAZG0sds5ugwjwiXPPB41hwHdbdEj
-QZRW2NR0HHMFp0FZeSziXOeaap21wc/W1Nk7wpRI7jYdzLRJHmzhvWz95p0WSnt+
-rI8v6OTvibpLrg==
-</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://clarin.oeaw.ac.at/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://clarin.oeaw.ac.at/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://clarin.oeaw.ac.at/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://clarin.oeaw.ac.at/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://clarin.oeaw.ac.at/Shibboleth.sso/SLO/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://clarin.oeaw.ac.at/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://clarin.oeaw.ac.at/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://clarin.oeaw.ac.at/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://clarin.oeaw.ac.at/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://clarin.oeaw.ac.at/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://clarin.oeaw.ac.at/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <md:AttributeConsumingService index="1">
-      <md:ServiceName xml:lang="en">CLARIN Centre Vienna / Language Resources Portal</md:ServiceName>
-      <md:ServiceDescription xml:lang="de">Ein Repositorium für Archivieren und Publizieren von Sprachressourcen und Technologien und andere Dienste für digitale Geisteswissenschaften.</md:ServiceDescription>
-      <md:ServiceDescription xml:lang="en">A repository for depositing and publishing of language resources and technology and other infrastructure services for digital humanities.</md:ServiceDescription>
-      <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="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="false"/>
-      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-      <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-      <md:RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-      <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-      <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="de">Institut für Corpuslinguistik und Texttechnologie, Österreichische Akademie der Wissenschaften</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">Institute for Corpus Linguistics und Text Technology, Austrian Academy of Sciences</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="de">Institut für Corpuslinguistik und Texttechnologie</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Institute for Corpus Linguistics und Text Technology</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.oeaw.ac.at/icltt</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Matej</md:GivenName>
-    <md:SurName>Durco</md:SurName>
-    <md:EmailAddress>matej.durco@oeaw.ac.at</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Karlheinz</md:GivenName>
-    <md:SurName>Mörth</md:SurName>
-    <md:EmailAddress>karlheinz.moerth@oeaw.ac.at</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>ICLTT-tech</md:GivenName>
-    <md:SurName>Office</md:SurName>
-    <md:EmailAddress>icltt-tech@oeaw.ac.at</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Akademie-Rechenzentrum</md:GivenName>
-    <md:SurName>Helpdesk</md:SurName>
-    <md:EmailAddress>helpdesk@oeaw.ac.at</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/clarin.oeaw.ac.at.xml b/swamid-interfederations-2.0/clarin.oeaw.ac.at.xml
deleted file mode 100644
index 41b19c73..00000000
--- a/swamid-interfederations-2.0/clarin.oeaw.ac.at.xml
+++ /dev/null
@@ -1,119 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" 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://clarin.oeaw.ac.at/shibboleth">
-  <md:Extensions>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://eduid.at" registrationInstant="2014-01-23T16:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://eduid.at/policy/mdrps-20140606</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://refeds.org/category/research-and-scholarship</saml:AttributeValue>
-        <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:Extensions>
-      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://clarin.oeaw.ac.at/Shibboleth.sso/Login"/>
-      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://clarin.oeaw.ac.at/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="de">CLARIN Centre Vienna</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">CLARIN Centre Vienna</mdui:DisplayName>
-        <mdui:Description xml:lang="de">Ein Repositorium für Archivieren und Publizieren von Sprachressourcen und Technologien und andere Dienste für digitale Geisteswissenschaften.</mdui:Description>
-        <mdui:Description xml:lang="en">A repository for depositing and publishing of language resources and technology and other infrastructure services for digital humanities.</mdui:Description>
-        <mdui:InformationURL xml:lang="de">https://clarin.oeaw.ac.at/ccv/</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://clarin.oeaw.ac.at/ccv/privacy</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDBjCCAe6gAwIBAgIJAI3rKBVKUcUJMA0GCSqGSIb3DQEBBQUAMCAxHjAcBgNV
-BAMTFWNsYXJpbi5hcnoub2Vhdy5hYy5hdDAeFw0xNDAxMjAxNDU3MThaFw0yNDAx
-MTgxNDU3MThaMCAxHjAcBgNVBAMTFWNsYXJpbi5hcnoub2Vhdy5hYy5hdDCCASIw
-DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMJ8B6WyydvbvIHJ1Cb34h8838G5
-JItPpmJC+D/K+6MI3YiydVKKlhaGh/GqcWcz0Qw30W7WYilUZ5IkzZA12QY1CF1g
-cJPNUmYibzP3sAZ9KrvaCEMxlseoldh0yc+8Q8eplQH9id4u5G+J8SvTBejt261y
-ATb6pIANsRQkOLMvxtq7/NrEnAmZQOM5obsshHxLlXlJ0qixakaYXWKCIuUUOEFY
-FT13vhWrUC4BWW0OGimoR1cBnyEJtS9kRNWQ85+03VVVvLk9AssoHWxOJVJ7HE1m
-5/xgMrmpOv1vbqDKDljrY19zheNOoFr3RdaSCb1Eh8lWCNigUgOwK8Mm7VECAwEA
-AaNDMEEwIAYDVR0RBBkwF4IVY2xhcmluLmFyei5vZWF3LmFjLmF0MB0GA1UdDgQW
-BBQ6IH3aND4GFYEEgrR0IKf/d4QEcDANBgkqhkiG9w0BAQUFAAOCAQEAhdcxQ+7/
-1WYPCTVz2HOk8J3eM3ZJylGdTnfgNDDGkBo0CGmyiulX8m+nimBKh7UNMkRkU8cH
-NUldSGR70wi0iQlx7t868V5pmkqxnaDu4+lo1QU59s5c7MRJXZ6OcbKB57O/d5l+
-+kX3/YW9WAQkmwcyVWDbcmk4DZK5kqqTk+u3fS48cLqai5YVcj8pDDoUx6/ZkwDv
-Yqvva2v4+vhzX9SW3QyiChOgFo9sP/UD1U8JAZG0sds5ugwjwiXPPB41hwHdbdEj
-QZRW2NR0HHMFp0FZeSziXOeaap21wc/W1Nk7wpRI7jYdzLRJHmzhvWz95p0WSnt+
-rI8v6OTvibpLrg==
-</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://clarin.oeaw.ac.at/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://clarin.oeaw.ac.at/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://clarin.oeaw.ac.at/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://clarin.oeaw.ac.at/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://clarin.oeaw.ac.at/Shibboleth.sso/SLO/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://clarin.oeaw.ac.at/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://clarin.oeaw.ac.at/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://clarin.oeaw.ac.at/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://clarin.oeaw.ac.at/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://clarin.oeaw.ac.at/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://clarin.oeaw.ac.at/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <md:AttributeConsumingService index="1">
-      <md:ServiceName xml:lang="en">CLARIN Centre Vienna / Language Resources Portal</md:ServiceName>
-      <md:ServiceDescription xml:lang="de">Ein Repositorium für Archivieren und Publizieren von Sprachressourcen und Technologien und andere Dienste für digitale Geisteswissenschaften.</md:ServiceDescription>
-      <md:ServiceDescription xml:lang="en">A repository for depositing and publishing of language resources and technology and other infrastructure services for digital humanities.</md:ServiceDescription>
-      <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="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="false"/>
-      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-      <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-      <md:RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-      <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-      <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="de">Institut für Corpuslinguistik und Texttechnologie, Österreichische Akademie der Wissenschaften</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">Institute for Corpus Linguistics und Text Technology, Austrian Academy of Sciences</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="de">Institut für Corpuslinguistik und Texttechnologie</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Institute for Corpus Linguistics und Text Technology</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.oeaw.ac.at/icltt</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Matej</md:GivenName>
-    <md:SurName>Durco</md:SurName>
-    <md:EmailAddress>matej.durco@oeaw.ac.at</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Karlheinz</md:GivenName>
-    <md:SurName>Mörth</md:SurName>
-    <md:EmailAddress>karlheinz.moerth@oeaw.ac.at</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>ICLTT-tech</md:GivenName>
-    <md:SurName>Office</md:SurName>
-    <md:EmailAddress>icltt-tech@oeaw.ac.at</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Akademie-Rechenzentrum</md:GivenName>
-    <md:SurName>Helpdesk</md:SurName>
-    <md:EmailAddress>helpdesk@oeaw.ac.at</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/clarino.uib.no-.xml b/swamid-interfederations-2.0/clarino.uib.no-.xml
deleted file mode 100644
index 03ed1317..00000000
--- a/swamid-interfederations-2.0/clarino.uib.no-.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="https://clarino.uib.no/">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://feide.no/" registrationInstant="2013-08-20T06:55:04Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://www.feide.no/files/feide/metadata-registration-practice-statement.pdf</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">Clarino, UiB</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="no">Clarino, UiB</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Norwegian research infrastructure for language data and services, linked to the European CLARIN initiative.</mdui:Description>
-        <mdui:Description xml:lang="no">Norsk forskningsinfrastruktur for språkdata og -tjenester, knyttet til det europeiske CLARIN-initiativet.</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>MIIEdzCCA1+gAwIBAgIQCA4E94tJ3rEzJC1noMhpNzANBgkqhkiG9w0BAQUFADA2MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEgU1NMIENBMB4XDTEzMDUwODAwMDAwMFoXDTE2MDUwNzIzNTk1OVowPDEhMB8GA1UECxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRcwFQYDVQQDEw5jbGFyaW5vLnVpYi5ubzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALIQNT7Lca7R0tFZmm4Fes8xdGlJrbxiuA/A1e/dMXaHm/C65zZ2ZFbUXnIe+bq+9AlJPO1gr7vyMaiXDsEYGlBBL/oNeroJfv+DAInweaOkatmOGMCBDAmCY76M89Vshk0qDNTEbZwc15frhNGCJTUiHSToCFtvwDI4/0dbsUwNfCML0jRvi2QFnrgXh0QxTTNfcFdh72uL2WChsbteCE2P4/T1H5yL1P3YJvpDX0iAMszaG+ZntYmATVMm91ivcE6mRCDI+qcHJdDWdy2E8NOBNCr8aQle2P6txXC9w5hzoE49Bw0oAF49EHx3MroBEA47ECGbOJ0Hpb8RpiXnX6ECAwEAAaOCAXkwggF1MB8GA1UdIwQYMBaAFAy9k2gM896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBR5vbqCMC3rno6VxasCvrYHZy/fkDAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwIgYDVR0gBBswGTANBgsrBgEEAbIxAQICHTAIBgZngQwBAgEwOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwJwYDVR0RBCAwHoIOY2xhcmluby51aWIubm+CDGluZXNzLnVpYi5ubzANBgkqhkiG9w0BAQUFAAOCAQEAOjOxk+g90GHRP56AovDdtglU77Xx9Cd7Xx5hvbGMQRVFshLn4YXpbi4UFnGru0A+k0Cy+7tfQ4i82ITL3f0epz9N5JB820waQRPTT55gk0iSAOSO5MhKeE6e+gf8RlDwF/p2y3RmalvxY/D+G6NKcwwbTe60Qd0b3DGOyN710RHzBLwtbIF3JmFw1M6m6w4Z433+XY/KiGMwpEGIw1J7I6XV1QeB7L7gZLFe+cry47IAqstheKHR0iUyR3+YgTVgS6pszAlhl46YYthpqSUiN0vpKB7EzRhPjli9gmQycjHS4iXBKe2aeFPsV5Cd7njw2oa9cmxMysqK+zjWJ4F1vQ==</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>MIIEdzCCA1+gAwIBAgIQCA4E94tJ3rEzJC1noMhpNzANBgkqhkiG9w0BAQUFADA2MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEgU1NMIENBMB4XDTEzMDUwODAwMDAwMFoXDTE2MDUwNzIzNTk1OVowPDEhMB8GA1UECxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRcwFQYDVQQDEw5jbGFyaW5vLnVpYi5ubzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALIQNT7Lca7R0tFZmm4Fes8xdGlJrbxiuA/A1e/dMXaHm/C65zZ2ZFbUXnIe+bq+9AlJPO1gr7vyMaiXDsEYGlBBL/oNeroJfv+DAInweaOkatmOGMCBDAmCY76M89Vshk0qDNTEbZwc15frhNGCJTUiHSToCFtvwDI4/0dbsUwNfCML0jRvi2QFnrgXh0QxTTNfcFdh72uL2WChsbteCE2P4/T1H5yL1P3YJvpDX0iAMszaG+ZntYmATVMm91ivcE6mRCDI+qcHJdDWdy2E8NOBNCr8aQle2P6txXC9w5hzoE49Bw0oAF49EHx3MroBEA47ECGbOJ0Hpb8RpiXnX6ECAwEAAaOCAXkwggF1MB8GA1UdIwQYMBaAFAy9k2gM896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBR5vbqCMC3rno6VxasCvrYHZy/fkDAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwIgYDVR0gBBswGTANBgsrBgEEAbIxAQICHTAIBgZngQwBAgEwOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwJwYDVR0RBCAwHoIOY2xhcmluby51aWIubm+CDGluZXNzLnVpYi5ubzANBgkqhkiG9w0BAQUFAAOCAQEAOjOxk+g90GHRP56AovDdtglU77Xx9Cd7Xx5hvbGMQRVFshLn4YXpbi4UFnGru0A+k0Cy+7tfQ4i82ITL3f0epz9N5JB820waQRPTT55gk0iSAOSO5MhKeE6e+gf8RlDwF/p2y3RmalvxY/D+G6NKcwwbTe60Qd0b3DGOyN710RHzBLwtbIF3JmFw1M6m6w4Z433+XY/KiGMwpEGIw1J7I6XV1QeB7L7gZLFe+cry47IAqstheKHR0iUyR3+YgTVgS6pszAlhl46YYthpqSUiN0vpKB7EzRhPjli9gmQycjHS4iXBKe2aeFPsV5Cd7njw2oa9cmxMysqK+zjWJ4F1vQ==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://clarino.uib.no/feide/single-logout"/>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://clarino.uib.no/feide/assertion-consumer" index="0"/>
-    <md:AttributeConsumingService index="0">
-      <md:ServiceName xml:lang="en">Clarino, UiB</md:ServiceName>
-      <md:ServiceName xml:lang="no">Clarino, UiB</md:ServiceName>
-      <md:ServiceDescription xml:lang="en">Norwegian research infrastructure for language data and services, linked to the European CLARIN initiative.</md:ServiceDescription>
-      <md:ServiceDescription xml:lang="no">Norsk forskningsinfrastruktur for språkdata og -tjenester, knyttet til det europeiske CLARIN-initiativet.</md:ServiceDescription>
-      <md:RequestedAttribute FriendlyName="cn" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="eduPersonAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="eduPersonEntitlement" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.7" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">University of Bergen</md:OrganizationName>
-    <md:OrganizationName xml:lang="no">Universitetet i Bergen</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">University of Bergen</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="no">Universitetet i Bergen</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.uib.no/en</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="no">http://www.uib.no/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Paul</md:GivenName>
-    <md:SurName>Meurer</md:SurName>
-    <md:EmailAddress>paul.meurer@uni.no</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/clarino.uib.no.xml b/swamid-interfederations-2.0/clarino.uib.no.xml
deleted file mode 100644
index 03ed1317..00000000
--- a/swamid-interfederations-2.0/clarino.uib.no.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="https://clarino.uib.no/">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://feide.no/" registrationInstant="2013-08-20T06:55:04Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://www.feide.no/files/feide/metadata-registration-practice-statement.pdf</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">Clarino, UiB</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="no">Clarino, UiB</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Norwegian research infrastructure for language data and services, linked to the European CLARIN initiative.</mdui:Description>
-        <mdui:Description xml:lang="no">Norsk forskningsinfrastruktur for språkdata og -tjenester, knyttet til det europeiske CLARIN-initiativet.</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>MIIEdzCCA1+gAwIBAgIQCA4E94tJ3rEzJC1noMhpNzANBgkqhkiG9w0BAQUFADA2MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEgU1NMIENBMB4XDTEzMDUwODAwMDAwMFoXDTE2MDUwNzIzNTk1OVowPDEhMB8GA1UECxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRcwFQYDVQQDEw5jbGFyaW5vLnVpYi5ubzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALIQNT7Lca7R0tFZmm4Fes8xdGlJrbxiuA/A1e/dMXaHm/C65zZ2ZFbUXnIe+bq+9AlJPO1gr7vyMaiXDsEYGlBBL/oNeroJfv+DAInweaOkatmOGMCBDAmCY76M89Vshk0qDNTEbZwc15frhNGCJTUiHSToCFtvwDI4/0dbsUwNfCML0jRvi2QFnrgXh0QxTTNfcFdh72uL2WChsbteCE2P4/T1H5yL1P3YJvpDX0iAMszaG+ZntYmATVMm91ivcE6mRCDI+qcHJdDWdy2E8NOBNCr8aQle2P6txXC9w5hzoE49Bw0oAF49EHx3MroBEA47ECGbOJ0Hpb8RpiXnX6ECAwEAAaOCAXkwggF1MB8GA1UdIwQYMBaAFAy9k2gM896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBR5vbqCMC3rno6VxasCvrYHZy/fkDAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwIgYDVR0gBBswGTANBgsrBgEEAbIxAQICHTAIBgZngQwBAgEwOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwJwYDVR0RBCAwHoIOY2xhcmluby51aWIubm+CDGluZXNzLnVpYi5ubzANBgkqhkiG9w0BAQUFAAOCAQEAOjOxk+g90GHRP56AovDdtglU77Xx9Cd7Xx5hvbGMQRVFshLn4YXpbi4UFnGru0A+k0Cy+7tfQ4i82ITL3f0epz9N5JB820waQRPTT55gk0iSAOSO5MhKeE6e+gf8RlDwF/p2y3RmalvxY/D+G6NKcwwbTe60Qd0b3DGOyN710RHzBLwtbIF3JmFw1M6m6w4Z433+XY/KiGMwpEGIw1J7I6XV1QeB7L7gZLFe+cry47IAqstheKHR0iUyR3+YgTVgS6pszAlhl46YYthpqSUiN0vpKB7EzRhPjli9gmQycjHS4iXBKe2aeFPsV5Cd7njw2oa9cmxMysqK+zjWJ4F1vQ==</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>MIIEdzCCA1+gAwIBAgIQCA4E94tJ3rEzJC1noMhpNzANBgkqhkiG9w0BAQUFADA2MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEgU1NMIENBMB4XDTEzMDUwODAwMDAwMFoXDTE2MDUwNzIzNTk1OVowPDEhMB8GA1UECxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRcwFQYDVQQDEw5jbGFyaW5vLnVpYi5ubzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALIQNT7Lca7R0tFZmm4Fes8xdGlJrbxiuA/A1e/dMXaHm/C65zZ2ZFbUXnIe+bq+9AlJPO1gr7vyMaiXDsEYGlBBL/oNeroJfv+DAInweaOkatmOGMCBDAmCY76M89Vshk0qDNTEbZwc15frhNGCJTUiHSToCFtvwDI4/0dbsUwNfCML0jRvi2QFnrgXh0QxTTNfcFdh72uL2WChsbteCE2P4/T1H5yL1P3YJvpDX0iAMszaG+ZntYmATVMm91ivcE6mRCDI+qcHJdDWdy2E8NOBNCr8aQle2P6txXC9w5hzoE49Bw0oAF49EHx3MroBEA47ECGbOJ0Hpb8RpiXnX6ECAwEAAaOCAXkwggF1MB8GA1UdIwQYMBaAFAy9k2gM896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBR5vbqCMC3rno6VxasCvrYHZy/fkDAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwIgYDVR0gBBswGTANBgsrBgEEAbIxAQICHTAIBgZngQwBAgEwOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwJwYDVR0RBCAwHoIOY2xhcmluby51aWIubm+CDGluZXNzLnVpYi5ubzANBgkqhkiG9w0BAQUFAAOCAQEAOjOxk+g90GHRP56AovDdtglU77Xx9Cd7Xx5hvbGMQRVFshLn4YXpbi4UFnGru0A+k0Cy+7tfQ4i82ITL3f0epz9N5JB820waQRPTT55gk0iSAOSO5MhKeE6e+gf8RlDwF/p2y3RmalvxY/D+G6NKcwwbTe60Qd0b3DGOyN710RHzBLwtbIF3JmFw1M6m6w4Z433+XY/KiGMwpEGIw1J7I6XV1QeB7L7gZLFe+cry47IAqstheKHR0iUyR3+YgTVgS6pszAlhl46YYthpqSUiN0vpKB7EzRhPjli9gmQycjHS4iXBKe2aeFPsV5Cd7njw2oa9cmxMysqK+zjWJ4F1vQ==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://clarino.uib.no/feide/single-logout"/>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://clarino.uib.no/feide/assertion-consumer" index="0"/>
-    <md:AttributeConsumingService index="0">
-      <md:ServiceName xml:lang="en">Clarino, UiB</md:ServiceName>
-      <md:ServiceName xml:lang="no">Clarino, UiB</md:ServiceName>
-      <md:ServiceDescription xml:lang="en">Norwegian research infrastructure for language data and services, linked to the European CLARIN initiative.</md:ServiceDescription>
-      <md:ServiceDescription xml:lang="no">Norsk forskningsinfrastruktur for språkdata og -tjenester, knyttet til det europeiske CLARIN-initiativet.</md:ServiceDescription>
-      <md:RequestedAttribute FriendlyName="cn" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="eduPersonAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="eduPersonEntitlement" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.7" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">University of Bergen</md:OrganizationName>
-    <md:OrganizationName xml:lang="no">Universitetet i Bergen</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">University of Bergen</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="no">Universitetet i Bergen</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.uib.no/en</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="no">http://www.uib.no/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Paul</md:GivenName>
-    <md:SurName>Meurer</md:SurName>
-    <md:EmailAddress>paul.meurer@uni.no</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/cloudidp1.canarie.ca.xml b/swamid-interfederations-2.0/cloudidp1.canarie.ca.xml
deleted file mode 100644
index dbe77c4e..00000000
--- a/swamid-interfederations-2.0/cloudidp1.canarie.ca.xml
+++ /dev/null
@@ -1,107 +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://cloudidp1.canarie.ca/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.canarie.ca" registrationInstant="2013-03-25T00:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">
-http://www.canarie.ca/templates/services/docs/CAF_join_en.pdf
-</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </Extensions>
-  <IDPSSODescriptor errorURL="https://cloudidp1.canarie.ca/identity/feedback.htm" 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">cloudidp1.canarie.ca</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">CANARIE Fournisseur nuagique d'identité</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">CANARIE Cloud Identity Provider</mdui:DisplayName>
-        <mdui:Description xml:lang="en">CANARIE - CAF Canada's Advanced Research and Innovation Network </mdui:Description>
-        <mdui:Description xml:lang="fr">CANARIE - CAF-FCA Le réseau évolué de recherche et d'innovation du Canada </mdui:Description>
-        <mdui:InformationURL xml:lang="fr">http://www.canarie.ca/fr/a-propos/quinoussommes</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">http://www.canarie.ca/en/about/aboutus</mdui:InformationURL>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DomainHint>canarie.ca</mdui:DomainHint>
-      </mdui:DiscoHints>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDSjCCAjICCQCmkqQ0nApLQzANBgkqhkiG9w0BAQUFADBnMR0wGwYDVQQDDBRj
-bG91ZGlkcDEuY2FuYXJpZS5jYTEbMBkGA1UECgwSQ2FuYXJpZSBGZWRlcmF0aW9u
-MQswCQYDVQQGEwJDQTELMAkGA1UECAwCT04xDzANBgNVBAcMBk90dGF3YTAeFw0x
-MzAyMjYxMDM2MTJaFw0xNDAyMjYxMDM2MTJaMGcxHTAbBgNVBAMMFGNsb3VkaWRw
-MS5jYW5hcmllLmNhMRswGQYDVQQKDBJDYW5hcmllIEZlZGVyYXRpb24xCzAJBgNV
-BAYTAkNBMQswCQYDVQQIDAJPTjEPMA0GA1UEBwwGT3R0YXdhMIIBIjANBgkqhkiG
-9w0BAQEFAAOCAQ8AMIIBCgKCAQEAoQbo4L3ZJ29BmswAzMZNQXzpvsdUR8laZaDn
-q1UjYN0XmUC4zE9QWc7LYxPjubkH9SzRkTVTYMVSCFo0Ja40hXIQBSQ+oE9Em2BN
-HV2qsBHvynbnj3/8bcbG0T9GCdCIobRy2pRcpGaUvkiDrilnwKG7r3alGTeiPRwI
-7zD+Hx32+NaAb4OrdxWwKrRyagWuTdIboR+FkS03St0Pc/Wa5Y5ZsyWVETtVEO0Z
-0MC7bsZWy34Wz0+7TQvJ3YUw3+PVf36AgwcxKkHWIaf1g8NRCJ9Vg3SnGT6Ecbo1
-kV+P/0qjtHonVwp8lQb6nD5OcnWsoxRArsrRwZ/rGGQXXVyYeQIDAQABMA0GCSqG
-SIb3DQEBBQUAA4IBAQA8BuR3/QCpFRsYs6wIWi5N4naU3MXdP7Rbg+GzEnJD9j7d
-ltHmQoFIHOpgLmlYpiJjhwJvY4FE++2FCxeYCzGDcoZJnavs5ZiYjjw+AdRlyG7D
-VkkjnmRW7d+iJIMH2olC5O57wwxSQb1FON9KU2c7EjbhrWUJx4RfJy1O8jPMA0XC
-KL4ynk0Gqiuf5X4ll8scRVv2sWP7Zh8a5O09Q6Teghc8VBlitkhVl7Z9Ylle6IHt
-/GajqsEZjDVbsn3fjdIFZJSuUq/q8+TpRzBqOMB4yFAXrGKXcrcQwR721Ol+SDOj
-HOB2BJCb3Ue9NzqIlgXpyc2LpPt2RRlYaJm45zod</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cloudidp1.canarie.ca:9443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cloudidp1.canarie.ca:9443/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://cloudidp1.canarie.ca/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cloudidp1.canarie.ca/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://cloudidp1.canarie.ca/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://cloudidp1.canarie.ca/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">cloudidp1.canarie.ca</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDSjCCAjICCQCmkqQ0nApLQzANBgkqhkiG9w0BAQUFADBnMR0wGwYDVQQDDBRj
-bG91ZGlkcDEuY2FuYXJpZS5jYTEbMBkGA1UECgwSQ2FuYXJpZSBGZWRlcmF0aW9u
-MQswCQYDVQQGEwJDQTELMAkGA1UECAwCT04xDzANBgNVBAcMBk90dGF3YTAeFw0x
-MzAyMjYxMDM2MTJaFw0xNDAyMjYxMDM2MTJaMGcxHTAbBgNVBAMMFGNsb3VkaWRw
-MS5jYW5hcmllLmNhMRswGQYDVQQKDBJDYW5hcmllIEZlZGVyYXRpb24xCzAJBgNV
-BAYTAkNBMQswCQYDVQQIDAJPTjEPMA0GA1UEBwwGT3R0YXdhMIIBIjANBgkqhkiG
-9w0BAQEFAAOCAQ8AMIIBCgKCAQEAoQbo4L3ZJ29BmswAzMZNQXzpvsdUR8laZaDn
-q1UjYN0XmUC4zE9QWc7LYxPjubkH9SzRkTVTYMVSCFo0Ja40hXIQBSQ+oE9Em2BN
-HV2qsBHvynbnj3/8bcbG0T9GCdCIobRy2pRcpGaUvkiDrilnwKG7r3alGTeiPRwI
-7zD+Hx32+NaAb4OrdxWwKrRyagWuTdIboR+FkS03St0Pc/Wa5Y5ZsyWVETtVEO0Z
-0MC7bsZWy34Wz0+7TQvJ3YUw3+PVf36AgwcxKkHWIaf1g8NRCJ9Vg3SnGT6Ecbo1
-kV+P/0qjtHonVwp8lQb6nD5OcnWsoxRArsrRwZ/rGGQXXVyYeQIDAQABMA0GCSqG
-SIb3DQEBBQUAA4IBAQA8BuR3/QCpFRsYs6wIWi5N4naU3MXdP7Rbg+GzEnJD9j7d
-ltHmQoFIHOpgLmlYpiJjhwJvY4FE++2FCxeYCzGDcoZJnavs5ZiYjjw+AdRlyG7D
-VkkjnmRW7d+iJIMH2olC5O57wwxSQb1FON9KU2c7EjbhrWUJx4RfJy1O8jPMA0XC
-KL4ynk0Gqiuf5X4ll8scRVv2sWP7Zh8a5O09Q6Teghc8VBlitkhVl7Z9Ylle6IHt
-/GajqsEZjDVbsn3fjdIFZJSuUq/q8+TpRzBqOMB4yFAXrGKXcrcQwR721Ol+SDOj
-HOB2BJCb3Ue9NzqIlgXpyc2LpPt2RRlYaJm45zod</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cloudidp1.canarie.ca:9443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cloudidp1.canarie.ca:9443/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">CANARIE</OrganizationName>
-    <OrganizationName xml:lang="fr">CANARIE</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">CANARIE - CAF Cloud IdP - Canada's Advanced Research and Innovation Network</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="fr">
-CANARIE - CAF-FCA - Fournisseur nuagique d'identité - Le réseau évolué de recherche et d'innovation du Canada
-</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.canarie.ca/en/about/aboutus</OrganizationURL>
-    <OrganizationURL xml:lang="fr">http://www.canarie.ca/fr/a-propos/quinoussommes</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Network Operations Center</SurName>
-    <EmailAddress>noc@canarie.ca</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/colreg.de.dariah.eu-colreg.xml b/swamid-interfederations-2.0/colreg.de.dariah.eu-colreg.xml
deleted file mode 100644
index c8a89781..00000000
--- a/swamid-interfederations-2.0/colreg.de.dariah.eu-colreg.xml
+++ /dev/null
@@ -1,143 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://colreg.de.dariah.eu/colreg">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2014-04-11T07:18:24Z">
-      <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: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://colreg.de.dariah.eu:443/colreg/saml/login/alias/colreg.de.dariah.eu?disco=true" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="de">Collection Registry</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Collection Registry</mdui:DisplayName>
-        <mdui:Description xml:lang="de">Collection Registry</mdui:Description>
-        <mdui:Description xml:lang="en">Collection Registry</mdui:Description>
-        <mdui:InformationURL xml:lang="de">http://dariah.eu/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">http://dariah.eu/</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://de.dariah.eu/ServicePrivacyPolicy</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>colreg.de.dariah.eu</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=colreg.de.dariah.eu,O=Georg-August-Universitaet Goettingen,L=Goettingen,ST=Niedersachsen,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIGAjCCBOqgAwIBAgIHFwXXzebkpDANBgkqhkiG9w0BAQUFADCBrjELMAkGA1UE
-BhMCREUxFjAUBgNVBAgTDU5pZWRlcnNhY2hzZW4xEzARBgNVBAcTCkdvZXR0aW5n
-ZW4xLTArBgNVBAoTJEdlb3JnLUF1Z3VzdC1Vbml2ZXJzaXRhZXQgR29ldHRpbmdl
-bjEjMCEGA1UEAxMaVW5pdmVyc2l0YWV0LUdvZXR0aW5nZW4gQ0ExHjAcBgkqhkiG
-9w0BCQEWD2d3ZGctY2FAZ3dkZy5kZTAeFw0xNDAxMjcxMzA4MTRaFw0xOTAxMjYx
-MzA4MTRaMIGHMQswCQYDVQQGEwJERTEWMBQGA1UECBMNTmllZGVyc2FjaHNlbjET
-MBEGA1UEBxMKR29ldHRpbmdlbjEtMCsGA1UEChMkR2VvcmctQXVndXN0LVVuaXZl
-cnNpdGFldCBHb2V0dGluZ2VuMRwwGgYDVQQDExNjb2xyZWcuZGUuZGFyaWFoLmV1
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApXYpUGfB4grgZ+pP1qQR
-JKoSxfMrmmlt3F6gJuoe8vaun+GDn0j3AOhviZ+/HiasTMQv1VJ9/Zvc8rJEp/Sm
-9cYq15OoZo9LNC+kQsJo5jNpyljERgZniMN3NylNPUBiK9YPSt/oApycg1teAwif
-P0D85gmX5LtZPN4NKUa9ofEIjZARnOgNuS9uvWUiMYLRc+MUeXsbMlcijHs4rNwh
-PjQD4T1q/zX9rwcqqoqRfJQLsSRHjCXL8gFqcoA15ggis6gU1EZqm1mk7Ajb0Bpw
-tnJnfhRN/7n2CPthDUThf4lHcR84G4kchRwa/rT2RuydzW3fxTeNm9VbIqLPRrWZ
-2QIDAQABo4ICSDCCAkQwOQYDVR0gBDIwMDARBg8rBgEEAYGtIYIsAQEEAwEwEQYP
-KwYBBAGBrSGCLAIBBAMBMAgGBmeBDAECAjAJBgNVHRMEAjAAMAsGA1UdDwQEAwIE
-8DAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwHQYDVR0OBBYEFHEEs1fV
-g2shQl4/1DvRorTIy4bRMB8GA1UdIwQYMBaAFB29c8xt7m4cdHDZoxs6uqgn3rzr
-MB4GA1UdEQQXMBWCE2NvbHJlZy5kZS5kYXJpYWguZXUwgY8GA1UdHwSBhzCBhDBA
-oD6gPIY6aHR0cDovL2NkcDEucGNhLmRmbi5kZS91bmktZ29ldHRpbmdlbi1jYS9w
-dWIvY3JsL2NhY3JsLmNybDBAoD6gPIY6aHR0cDovL2NkcDIucGNhLmRmbi5kZS91
-bmktZ29ldHRpbmdlbi1jYS9wdWIvY3JsL2NhY3JsLmNybDCB3QYIKwYBBQUHAQEE
-gdAwgc0wMwYIKwYBBQUHMAGGJ2h0dHA6Ly9vY3NwLnBjYS5kZm4uZGUvT0NTUC1T
-ZXJ2ZXIvT0NTUDBKBggrBgEFBQcwAoY+aHR0cDovL2NkcDEucGNhLmRmbi5kZS91
-bmktZ29ldHRpbmdlbi1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwSgYIKwYBBQUH
-MAKGPmh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvdW5pLWdvZXR0aW5nZW4tY2EvcHVi
-L2NhY2VydC9jYWNlcnQuY3J0MA0GCSqGSIb3DQEBBQUAA4IBAQArMbCKkxkHsDeW
-C9CIVjoHqiYBNssKRbj1PECib/UkUsKYlKAyYl1UZ+BnZsyyVzXyKxXjkVgxIShX
-8ejR+rX2TAzweW5eJ9fUU+556HTTz2dLcSkv4uX5aVbd349F/3tavsyeaH8HTpiv
-8rA27qnqAih/4vbHV7WksLaLlqeCWskk8bh83NhpwEvMawuFH6CSRdJ+Ci04utIg
-NUFnuv92ZKKPuVTZNLN24s3fOiD9zotzRbDZ9p1yRVhFgCk+WK3HCMRLN0Oz60F+
-H7llf2BUo5B61cwTXmpYDfXTCTPO6x/L5lp6vnbRdeQWDVcDVXuNh4QNSzBoxAPg
-n+48kUsN
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>colreg.de.dariah.eu</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=colreg.de.dariah.eu,O=Georg-August-Universitaet Goettingen,L=Goettingen,ST=Niedersachsen,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIGAjCCBOqgAwIBAgIHFwXXzebkpDANBgkqhkiG9w0BAQUFADCBrjELMAkGA1UE
-BhMCREUxFjAUBgNVBAgTDU5pZWRlcnNhY2hzZW4xEzARBgNVBAcTCkdvZXR0aW5n
-ZW4xLTArBgNVBAoTJEdlb3JnLUF1Z3VzdC1Vbml2ZXJzaXRhZXQgR29ldHRpbmdl
-bjEjMCEGA1UEAxMaVW5pdmVyc2l0YWV0LUdvZXR0aW5nZW4gQ0ExHjAcBgkqhkiG
-9w0BCQEWD2d3ZGctY2FAZ3dkZy5kZTAeFw0xNDAxMjcxMzA4MTRaFw0xOTAxMjYx
-MzA4MTRaMIGHMQswCQYDVQQGEwJERTEWMBQGA1UECBMNTmllZGVyc2FjaHNlbjET
-MBEGA1UEBxMKR29ldHRpbmdlbjEtMCsGA1UEChMkR2VvcmctQXVndXN0LVVuaXZl
-cnNpdGFldCBHb2V0dGluZ2VuMRwwGgYDVQQDExNjb2xyZWcuZGUuZGFyaWFoLmV1
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApXYpUGfB4grgZ+pP1qQR
-JKoSxfMrmmlt3F6gJuoe8vaun+GDn0j3AOhviZ+/HiasTMQv1VJ9/Zvc8rJEp/Sm
-9cYq15OoZo9LNC+kQsJo5jNpyljERgZniMN3NylNPUBiK9YPSt/oApycg1teAwif
-P0D85gmX5LtZPN4NKUa9ofEIjZARnOgNuS9uvWUiMYLRc+MUeXsbMlcijHs4rNwh
-PjQD4T1q/zX9rwcqqoqRfJQLsSRHjCXL8gFqcoA15ggis6gU1EZqm1mk7Ajb0Bpw
-tnJnfhRN/7n2CPthDUThf4lHcR84G4kchRwa/rT2RuydzW3fxTeNm9VbIqLPRrWZ
-2QIDAQABo4ICSDCCAkQwOQYDVR0gBDIwMDARBg8rBgEEAYGtIYIsAQEEAwEwEQYP
-KwYBBAGBrSGCLAIBBAMBMAgGBmeBDAECAjAJBgNVHRMEAjAAMAsGA1UdDwQEAwIE
-8DAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwHQYDVR0OBBYEFHEEs1fV
-g2shQl4/1DvRorTIy4bRMB8GA1UdIwQYMBaAFB29c8xt7m4cdHDZoxs6uqgn3rzr
-MB4GA1UdEQQXMBWCE2NvbHJlZy5kZS5kYXJpYWguZXUwgY8GA1UdHwSBhzCBhDBA
-oD6gPIY6aHR0cDovL2NkcDEucGNhLmRmbi5kZS91bmktZ29ldHRpbmdlbi1jYS9w
-dWIvY3JsL2NhY3JsLmNybDBAoD6gPIY6aHR0cDovL2NkcDIucGNhLmRmbi5kZS91
-bmktZ29ldHRpbmdlbi1jYS9wdWIvY3JsL2NhY3JsLmNybDCB3QYIKwYBBQUHAQEE
-gdAwgc0wMwYIKwYBBQUHMAGGJ2h0dHA6Ly9vY3NwLnBjYS5kZm4uZGUvT0NTUC1T
-ZXJ2ZXIvT0NTUDBKBggrBgEFBQcwAoY+aHR0cDovL2NkcDEucGNhLmRmbi5kZS91
-bmktZ29ldHRpbmdlbi1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwSgYIKwYBBQUH
-MAKGPmh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvdW5pLWdvZXR0aW5nZW4tY2EvcHVi
-L2NhY2VydC9jYWNlcnQuY3J0MA0GCSqGSIb3DQEBBQUAA4IBAQArMbCKkxkHsDeW
-C9CIVjoHqiYBNssKRbj1PECib/UkUsKYlKAyYl1UZ+BnZsyyVzXyKxXjkVgxIShX
-8ejR+rX2TAzweW5eJ9fUU+556HTTz2dLcSkv4uX5aVbd349F/3tavsyeaH8HTpiv
-8rA27qnqAih/4vbHV7WksLaLlqeCWskk8bh83NhpwEvMawuFH6CSRdJ+Ci04utIg
-NUFnuv92ZKKPuVTZNLN24s3fOiD9zotzRbDZ9p1yRVhFgCk+WK3HCMRLN0Oz60F+
-H7llf2BUo5B61cwTXmpYDfXTCTPO6x/L5lp6vnbRdeQWDVcDVXuNh4QNSzBoxAPg
-n+48kUsN
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://colreg.de.dariah.eu:443/colreg/saml/SingleLogout/alias/colreg.de.dariah.eu"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://colreg.de.dariah.eu:443/colreg/saml/SingleLogout/alias/colreg.de.dariah.eu"/>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://colreg.de.dariah.eu:443/colreg/saml/SSO/alias/colreg.de.dariah.eu" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://colreg.de.dariah.eu:443/colreg/saml/SSO/alias/colreg.de.dariah.eu" index="1"/>
-    <AttributeConsumingService index="1">
-      <ServiceName xml:lang="de">Collection Registry</ServiceName>
-      <ServiceName xml:lang="en">Collection Registry</ServiceName>
-      <ServiceDescription xml:lang="de">Collection Registry</ServiceDescription>
-      <ServiceDescription xml:lang="en">Collection Registry</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"/>
-    </AttributeConsumingService>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">e112</OrganizationName>
-    <OrganizationName xml:lang="en">e112</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">Gesellschaft für wissenschaftliche Datenverarbeitung mbH</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">Gesellschaft für wissenschaftliche Datenverarbeitung mbH</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.gwdg.de</OrganizationURL>
-    <OrganizationURL xml:lang="en">http://www.gwdg.de</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Tobias</GivenName>
-    <SurName>Gradl</SurName>
-    <EmailAddress>mailto:tobias.gradl@uni-bamberg.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="support">
-    <GivenName>Dariah</GivenName>
-    <SurName>Support</SurName>
-    <EmailAddress>mailto:register@dariah.eu</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/colreg.de.dariah.eu.xml b/swamid-interfederations-2.0/colreg.de.dariah.eu.xml
deleted file mode 100644
index c8a89781..00000000
--- a/swamid-interfederations-2.0/colreg.de.dariah.eu.xml
+++ /dev/null
@@ -1,143 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://colreg.de.dariah.eu/colreg">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2014-04-11T07:18:24Z">
-      <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: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://colreg.de.dariah.eu:443/colreg/saml/login/alias/colreg.de.dariah.eu?disco=true" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="de">Collection Registry</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Collection Registry</mdui:DisplayName>
-        <mdui:Description xml:lang="de">Collection Registry</mdui:Description>
-        <mdui:Description xml:lang="en">Collection Registry</mdui:Description>
-        <mdui:InformationURL xml:lang="de">http://dariah.eu/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">http://dariah.eu/</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://de.dariah.eu/ServicePrivacyPolicy</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>colreg.de.dariah.eu</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=colreg.de.dariah.eu,O=Georg-August-Universitaet Goettingen,L=Goettingen,ST=Niedersachsen,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIGAjCCBOqgAwIBAgIHFwXXzebkpDANBgkqhkiG9w0BAQUFADCBrjELMAkGA1UE
-BhMCREUxFjAUBgNVBAgTDU5pZWRlcnNhY2hzZW4xEzARBgNVBAcTCkdvZXR0aW5n
-ZW4xLTArBgNVBAoTJEdlb3JnLUF1Z3VzdC1Vbml2ZXJzaXRhZXQgR29ldHRpbmdl
-bjEjMCEGA1UEAxMaVW5pdmVyc2l0YWV0LUdvZXR0aW5nZW4gQ0ExHjAcBgkqhkiG
-9w0BCQEWD2d3ZGctY2FAZ3dkZy5kZTAeFw0xNDAxMjcxMzA4MTRaFw0xOTAxMjYx
-MzA4MTRaMIGHMQswCQYDVQQGEwJERTEWMBQGA1UECBMNTmllZGVyc2FjaHNlbjET
-MBEGA1UEBxMKR29ldHRpbmdlbjEtMCsGA1UEChMkR2VvcmctQXVndXN0LVVuaXZl
-cnNpdGFldCBHb2V0dGluZ2VuMRwwGgYDVQQDExNjb2xyZWcuZGUuZGFyaWFoLmV1
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApXYpUGfB4grgZ+pP1qQR
-JKoSxfMrmmlt3F6gJuoe8vaun+GDn0j3AOhviZ+/HiasTMQv1VJ9/Zvc8rJEp/Sm
-9cYq15OoZo9LNC+kQsJo5jNpyljERgZniMN3NylNPUBiK9YPSt/oApycg1teAwif
-P0D85gmX5LtZPN4NKUa9ofEIjZARnOgNuS9uvWUiMYLRc+MUeXsbMlcijHs4rNwh
-PjQD4T1q/zX9rwcqqoqRfJQLsSRHjCXL8gFqcoA15ggis6gU1EZqm1mk7Ajb0Bpw
-tnJnfhRN/7n2CPthDUThf4lHcR84G4kchRwa/rT2RuydzW3fxTeNm9VbIqLPRrWZ
-2QIDAQABo4ICSDCCAkQwOQYDVR0gBDIwMDARBg8rBgEEAYGtIYIsAQEEAwEwEQYP
-KwYBBAGBrSGCLAIBBAMBMAgGBmeBDAECAjAJBgNVHRMEAjAAMAsGA1UdDwQEAwIE
-8DAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwHQYDVR0OBBYEFHEEs1fV
-g2shQl4/1DvRorTIy4bRMB8GA1UdIwQYMBaAFB29c8xt7m4cdHDZoxs6uqgn3rzr
-MB4GA1UdEQQXMBWCE2NvbHJlZy5kZS5kYXJpYWguZXUwgY8GA1UdHwSBhzCBhDBA
-oD6gPIY6aHR0cDovL2NkcDEucGNhLmRmbi5kZS91bmktZ29ldHRpbmdlbi1jYS9w
-dWIvY3JsL2NhY3JsLmNybDBAoD6gPIY6aHR0cDovL2NkcDIucGNhLmRmbi5kZS91
-bmktZ29ldHRpbmdlbi1jYS9wdWIvY3JsL2NhY3JsLmNybDCB3QYIKwYBBQUHAQEE
-gdAwgc0wMwYIKwYBBQUHMAGGJ2h0dHA6Ly9vY3NwLnBjYS5kZm4uZGUvT0NTUC1T
-ZXJ2ZXIvT0NTUDBKBggrBgEFBQcwAoY+aHR0cDovL2NkcDEucGNhLmRmbi5kZS91
-bmktZ29ldHRpbmdlbi1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwSgYIKwYBBQUH
-MAKGPmh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvdW5pLWdvZXR0aW5nZW4tY2EvcHVi
-L2NhY2VydC9jYWNlcnQuY3J0MA0GCSqGSIb3DQEBBQUAA4IBAQArMbCKkxkHsDeW
-C9CIVjoHqiYBNssKRbj1PECib/UkUsKYlKAyYl1UZ+BnZsyyVzXyKxXjkVgxIShX
-8ejR+rX2TAzweW5eJ9fUU+556HTTz2dLcSkv4uX5aVbd349F/3tavsyeaH8HTpiv
-8rA27qnqAih/4vbHV7WksLaLlqeCWskk8bh83NhpwEvMawuFH6CSRdJ+Ci04utIg
-NUFnuv92ZKKPuVTZNLN24s3fOiD9zotzRbDZ9p1yRVhFgCk+WK3HCMRLN0Oz60F+
-H7llf2BUo5B61cwTXmpYDfXTCTPO6x/L5lp6vnbRdeQWDVcDVXuNh4QNSzBoxAPg
-n+48kUsN
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>colreg.de.dariah.eu</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=colreg.de.dariah.eu,O=Georg-August-Universitaet Goettingen,L=Goettingen,ST=Niedersachsen,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIGAjCCBOqgAwIBAgIHFwXXzebkpDANBgkqhkiG9w0BAQUFADCBrjELMAkGA1UE
-BhMCREUxFjAUBgNVBAgTDU5pZWRlcnNhY2hzZW4xEzARBgNVBAcTCkdvZXR0aW5n
-ZW4xLTArBgNVBAoTJEdlb3JnLUF1Z3VzdC1Vbml2ZXJzaXRhZXQgR29ldHRpbmdl
-bjEjMCEGA1UEAxMaVW5pdmVyc2l0YWV0LUdvZXR0aW5nZW4gQ0ExHjAcBgkqhkiG
-9w0BCQEWD2d3ZGctY2FAZ3dkZy5kZTAeFw0xNDAxMjcxMzA4MTRaFw0xOTAxMjYx
-MzA4MTRaMIGHMQswCQYDVQQGEwJERTEWMBQGA1UECBMNTmllZGVyc2FjaHNlbjET
-MBEGA1UEBxMKR29ldHRpbmdlbjEtMCsGA1UEChMkR2VvcmctQXVndXN0LVVuaXZl
-cnNpdGFldCBHb2V0dGluZ2VuMRwwGgYDVQQDExNjb2xyZWcuZGUuZGFyaWFoLmV1
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApXYpUGfB4grgZ+pP1qQR
-JKoSxfMrmmlt3F6gJuoe8vaun+GDn0j3AOhviZ+/HiasTMQv1VJ9/Zvc8rJEp/Sm
-9cYq15OoZo9LNC+kQsJo5jNpyljERgZniMN3NylNPUBiK9YPSt/oApycg1teAwif
-P0D85gmX5LtZPN4NKUa9ofEIjZARnOgNuS9uvWUiMYLRc+MUeXsbMlcijHs4rNwh
-PjQD4T1q/zX9rwcqqoqRfJQLsSRHjCXL8gFqcoA15ggis6gU1EZqm1mk7Ajb0Bpw
-tnJnfhRN/7n2CPthDUThf4lHcR84G4kchRwa/rT2RuydzW3fxTeNm9VbIqLPRrWZ
-2QIDAQABo4ICSDCCAkQwOQYDVR0gBDIwMDARBg8rBgEEAYGtIYIsAQEEAwEwEQYP
-KwYBBAGBrSGCLAIBBAMBMAgGBmeBDAECAjAJBgNVHRMEAjAAMAsGA1UdDwQEAwIE
-8DAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwHQYDVR0OBBYEFHEEs1fV
-g2shQl4/1DvRorTIy4bRMB8GA1UdIwQYMBaAFB29c8xt7m4cdHDZoxs6uqgn3rzr
-MB4GA1UdEQQXMBWCE2NvbHJlZy5kZS5kYXJpYWguZXUwgY8GA1UdHwSBhzCBhDBA
-oD6gPIY6aHR0cDovL2NkcDEucGNhLmRmbi5kZS91bmktZ29ldHRpbmdlbi1jYS9w
-dWIvY3JsL2NhY3JsLmNybDBAoD6gPIY6aHR0cDovL2NkcDIucGNhLmRmbi5kZS91
-bmktZ29ldHRpbmdlbi1jYS9wdWIvY3JsL2NhY3JsLmNybDCB3QYIKwYBBQUHAQEE
-gdAwgc0wMwYIKwYBBQUHMAGGJ2h0dHA6Ly9vY3NwLnBjYS5kZm4uZGUvT0NTUC1T
-ZXJ2ZXIvT0NTUDBKBggrBgEFBQcwAoY+aHR0cDovL2NkcDEucGNhLmRmbi5kZS91
-bmktZ29ldHRpbmdlbi1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwSgYIKwYBBQUH
-MAKGPmh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvdW5pLWdvZXR0aW5nZW4tY2EvcHVi
-L2NhY2VydC9jYWNlcnQuY3J0MA0GCSqGSIb3DQEBBQUAA4IBAQArMbCKkxkHsDeW
-C9CIVjoHqiYBNssKRbj1PECib/UkUsKYlKAyYl1UZ+BnZsyyVzXyKxXjkVgxIShX
-8ejR+rX2TAzweW5eJ9fUU+556HTTz2dLcSkv4uX5aVbd349F/3tavsyeaH8HTpiv
-8rA27qnqAih/4vbHV7WksLaLlqeCWskk8bh83NhpwEvMawuFH6CSRdJ+Ci04utIg
-NUFnuv92ZKKPuVTZNLN24s3fOiD9zotzRbDZ9p1yRVhFgCk+WK3HCMRLN0Oz60F+
-H7llf2BUo5B61cwTXmpYDfXTCTPO6x/L5lp6vnbRdeQWDVcDVXuNh4QNSzBoxAPg
-n+48kUsN
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://colreg.de.dariah.eu:443/colreg/saml/SingleLogout/alias/colreg.de.dariah.eu"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://colreg.de.dariah.eu:443/colreg/saml/SingleLogout/alias/colreg.de.dariah.eu"/>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://colreg.de.dariah.eu:443/colreg/saml/SSO/alias/colreg.de.dariah.eu" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://colreg.de.dariah.eu:443/colreg/saml/SSO/alias/colreg.de.dariah.eu" index="1"/>
-    <AttributeConsumingService index="1">
-      <ServiceName xml:lang="de">Collection Registry</ServiceName>
-      <ServiceName xml:lang="en">Collection Registry</ServiceName>
-      <ServiceDescription xml:lang="de">Collection Registry</ServiceDescription>
-      <ServiceDescription xml:lang="en">Collection Registry</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"/>
-    </AttributeConsumingService>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">e112</OrganizationName>
-    <OrganizationName xml:lang="en">e112</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">Gesellschaft für wissenschaftliche Datenverarbeitung mbH</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">Gesellschaft für wissenschaftliche Datenverarbeitung mbH</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.gwdg.de</OrganizationURL>
-    <OrganizationURL xml:lang="en">http://www.gwdg.de</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Tobias</GivenName>
-    <SurName>Gradl</SurName>
-    <EmailAddress>mailto:tobias.gradl@uni-bamberg.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="support">
-    <GivenName>Dariah</GivenName>
-    <SurName>Support</SurName>
-    <EmailAddress>mailto:register@dariah.eu</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/community.ja.net-shibboleth.xml b/swamid-interfederations-2.0/community.ja.net-shibboleth.xml
deleted file mode 100644
index 1bd9eebb..00000000
--- a/swamid-interfederations-2.0/community.ja.net-shibboleth.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://community.ja.net/shibboleth">
-  <!--
-		This is a Janet Community Shibboleth 2 SP for JISC Collections and Janet Limited.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-02-14T17:37:40Z">
-      <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>
-      <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://community.ja.net/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://community.ja.net/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">The Janet Community</mdui:DisplayName>
-        <mdui:Description xml:lang="en">The community driven, social business, support, and information website for Janet products and services.</mdui:Description>
-        <mdui:Logo height="227" width="500">https://community.ja.net/sites/all/themes/janetbootstrap/logo_500x227.png</mdui:Logo>
-        <mdui:Logo height="109" width="240">https://community.ja.net/sites/all/themes/janetbootstrap/logo_240x109.png</mdui:Logo>
-        <mdui:Logo height="45" width="100">https://community.ja.net/sites/all/themes/janetbootstrap/logo_100x45.png</mdui:Logo>
-        <mdui:Logo height="75" width="75">https://community.ja.net/sites/all/themes/janetbootstrap/logo_75x75.png</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIC9zCCAd+gAwIBAgIJAK3QNCbDRJQ8MA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
-						BAMTEGNvbW11bml0eS5qYS5uZXQwHhcNMTIwMjEwMTEyMzUzWhcNMjIwMjA3MTEy
-						MzUzWjAbMRkwFwYDVQQDExBjb21tdW5pdHkuamEubmV0MIIBIjANBgkqhkiG9w0B
-						AQEFAAOCAQ8AMIIBCgKCAQEAw39KjoNd8jwDOrw9GjxK6BGgk6YqR9CRd0YVbtlp
-						Kfpai5oueTqApoBfwQYiGQWloLbtCk6GG6j8YRpvlwrlOjoOR0+gUvz0yp+q6igx
-						o6lgJU2zzWWrTbt+oT9BGhFyYUj2EMbLkX8VWzyebKr3kS8ioVZlLjQ3ZWJcHa8Z
-						Dx7EVFEb/w/tEeIZP5ytz4/j5OLUA2oJzEO2U07dMsVTkpKVdQwatG5REgPrbC6B
-						+/QZOoURlABAav3m0v4++spVgYbzVJSRbQ1v5sxwVSGuSS0JoY4YADG7mxMv2e69
-						PkThTkxO36boOpZe1NJxrwKJXHSg8UoroG2iW4Rz/7OWhQIDAQABoz4wPDAbBgNV
-						HREEFDASghBjb21tdW5pdHkuamEubmV0MB0GA1UdDgQWBBTMN93e5HUiaDJVqZ8F
-						9SsogJ0U9DANBgkqhkiG9w0BAQUFAAOCAQEAKTkm2So0rhPk13AB436H0YnSVC24
-						braQWHHqQQOFMrszM/2ThzPnsYQXqKmX9kgCBy7yfufZiLhkYMSU61lGSeWdhVo5
-						v3bVshCenq42mWNM5LE0B5VPCY8WeM9dx7r36FfQRdjXtr85rE3a1ZYNwuu9ZsCS
-						+YO2x3amxRkdmkfCs0hxwu0QOkAjL0fACG0i6fnEYcwWS8ZIawKxYLKe1ktyG5uq
-						PuhVktg4i0oQ8Uk2GlzgvAClfrZqNSi48BTWrKX4GA5zgEhf8HcBaBQhr5q6ONZi
-						0B+wkoo8xl+IxAjKKhkoQxl+Bl9d/rxHOgvMGe/C+83bJ204rfCMdLgGzA==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://community.ja.net/Shibboleth.sso/Artifact/SOAP" index="0"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://community.ja.net/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://community.ja.net/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://community.ja.net/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://community.ja.net/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://community.ja.net/Shibboleth.sso/SAML2/POST" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://community.ja.net/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://community.ja.net/Shibboleth.sso/SAML2/Artifact" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://community.ja.net/Shibboleth.sso/SAML2/ECP" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://community.ja.net/Shibboleth.sso/SAML/POST" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://community.ja.net/Shibboleth.sso/SAML/Artifact" index="5"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">JISC Collections and Janet Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">The Janet Community</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.ja.net/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Login Helpdesk</GivenName>
-    <EmailAddress>mailto:web-submit@ja.net</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Technical Support</GivenName>
-    <EmailAddress>mailto:web-submit@ja.net</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/community.ja.net.xml b/swamid-interfederations-2.0/community.ja.net.xml
deleted file mode 100644
index 1bd9eebb..00000000
--- a/swamid-interfederations-2.0/community.ja.net.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://community.ja.net/shibboleth">
-  <!--
-		This is a Janet Community Shibboleth 2 SP for JISC Collections and Janet Limited.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-02-14T17:37:40Z">
-      <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>
-      <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://community.ja.net/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://community.ja.net/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">The Janet Community</mdui:DisplayName>
-        <mdui:Description xml:lang="en">The community driven, social business, support, and information website for Janet products and services.</mdui:Description>
-        <mdui:Logo height="227" width="500">https://community.ja.net/sites/all/themes/janetbootstrap/logo_500x227.png</mdui:Logo>
-        <mdui:Logo height="109" width="240">https://community.ja.net/sites/all/themes/janetbootstrap/logo_240x109.png</mdui:Logo>
-        <mdui:Logo height="45" width="100">https://community.ja.net/sites/all/themes/janetbootstrap/logo_100x45.png</mdui:Logo>
-        <mdui:Logo height="75" width="75">https://community.ja.net/sites/all/themes/janetbootstrap/logo_75x75.png</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIC9zCCAd+gAwIBAgIJAK3QNCbDRJQ8MA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
-						BAMTEGNvbW11bml0eS5qYS5uZXQwHhcNMTIwMjEwMTEyMzUzWhcNMjIwMjA3MTEy
-						MzUzWjAbMRkwFwYDVQQDExBjb21tdW5pdHkuamEubmV0MIIBIjANBgkqhkiG9w0B
-						AQEFAAOCAQ8AMIIBCgKCAQEAw39KjoNd8jwDOrw9GjxK6BGgk6YqR9CRd0YVbtlp
-						Kfpai5oueTqApoBfwQYiGQWloLbtCk6GG6j8YRpvlwrlOjoOR0+gUvz0yp+q6igx
-						o6lgJU2zzWWrTbt+oT9BGhFyYUj2EMbLkX8VWzyebKr3kS8ioVZlLjQ3ZWJcHa8Z
-						Dx7EVFEb/w/tEeIZP5ytz4/j5OLUA2oJzEO2U07dMsVTkpKVdQwatG5REgPrbC6B
-						+/QZOoURlABAav3m0v4++spVgYbzVJSRbQ1v5sxwVSGuSS0JoY4YADG7mxMv2e69
-						PkThTkxO36boOpZe1NJxrwKJXHSg8UoroG2iW4Rz/7OWhQIDAQABoz4wPDAbBgNV
-						HREEFDASghBjb21tdW5pdHkuamEubmV0MB0GA1UdDgQWBBTMN93e5HUiaDJVqZ8F
-						9SsogJ0U9DANBgkqhkiG9w0BAQUFAAOCAQEAKTkm2So0rhPk13AB436H0YnSVC24
-						braQWHHqQQOFMrszM/2ThzPnsYQXqKmX9kgCBy7yfufZiLhkYMSU61lGSeWdhVo5
-						v3bVshCenq42mWNM5LE0B5VPCY8WeM9dx7r36FfQRdjXtr85rE3a1ZYNwuu9ZsCS
-						+YO2x3amxRkdmkfCs0hxwu0QOkAjL0fACG0i6fnEYcwWS8ZIawKxYLKe1ktyG5uq
-						PuhVktg4i0oQ8Uk2GlzgvAClfrZqNSi48BTWrKX4GA5zgEhf8HcBaBQhr5q6ONZi
-						0B+wkoo8xl+IxAjKKhkoQxl+Bl9d/rxHOgvMGe/C+83bJ204rfCMdLgGzA==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://community.ja.net/Shibboleth.sso/Artifact/SOAP" index="0"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://community.ja.net/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://community.ja.net/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://community.ja.net/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://community.ja.net/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://community.ja.net/Shibboleth.sso/SAML2/POST" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://community.ja.net/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://community.ja.net/Shibboleth.sso/SAML2/Artifact" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://community.ja.net/Shibboleth.sso/SAML2/ECP" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://community.ja.net/Shibboleth.sso/SAML/POST" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://community.ja.net/Shibboleth.sso/SAML/Artifact" index="5"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">JISC Collections and Janet Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">The Janet Community</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.ja.net/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Login Helpdesk</GivenName>
-    <EmailAddress>mailto:web-submit@ja.net</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Technical Support</GivenName>
-    <EmailAddress>mailto:web-submit@ja.net</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/connect-beta.sunet.se-shibboleth.xml b/swamid-interfederations-2.0/connect-beta.sunet.se-shibboleth.xml
deleted file mode 100644
index ac3be1a1..00000000
--- a/swamid-interfederations-2.0/connect-beta.sunet.se-shibboleth.xml
+++ /dev/null
@@ -1,109 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" 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://refeds.org/category/research-and-scholarship</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"/>
-    </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-beta.sunet.se.xml b/swamid-interfederations-2.0/connect-beta.sunet.se.xml
deleted file mode 100644
index ac3be1a1..00000000
--- a/swamid-interfederations-2.0/connect-beta.sunet.se.xml
+++ /dev/null
@@ -1,109 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" 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://refeds.org/category/research-and-scholarship</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"/>
-    </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.sunet.se-shibboleth.xml b/swamid-interfederations-2.0/connect.sunet.se-shibboleth.xml
deleted file mode 100644
index b2f84347..00000000
--- a/swamid-interfederations-2.0/connect.sunet.se-shibboleth.xml
+++ /dev/null
@@ -1,112 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://connect.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/nren-service</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
-        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol 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.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.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.sunet.se/Shibboleth.sso/DS/nordu.net" 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.sunet.se/Shibboleth.sso/DS/kalmar2" index="4"/>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>connect01.acp.sunet.se</ds:KeyName>
-        <ds:KeyName>https://connect.sunet.se/shibboleth</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=connect01.acp.sunet.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDLjCCAhagAwIBAgIJALJTE8wpfDmAMA0GCSqGSIb3DQEBBQUAMCExHzAdBgNV
-BAMTFmNvbm5lY3QwMS5hY3Auc3VuZXQuc2UwHhcNMDkwOTAyMTIwNTIwWhcNMTkw
-ODMxMTIwNTIwWjAhMR8wHQYDVQQDExZjb25uZWN0MDEuYWNwLnN1bmV0LnNlMIIB
-IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAzaNMBLHGgzRrAHLQDUiM+xu6
-ghKwdRqBcg171qVDeA4wSoVJLVeAY2xWKjudYzXtcwqL7qkDcHD3wOd0FLQSFfxE
-o67z4chBMNrkK9b9NgdHWp/Nb8gsdYNZt2ZjJVOD/oWTFXRHZDJhqkXFvVjL1gKu
-E3a2vDK6LRqYCLx5cyFleuRoqBvMrDxKLHvmqxo+Qt2e+ntL1sDVyKeMxgZc2s0/
-xGYFFzSVDT08XrWlgpN0AmxhfC0ULDb8YzQiJxsdeZ3C57RnC0InabCCvzPQsy9t
-c1VU/TNXkkXQn3H5aC+LUu8olnYndtFac56k/OaAUPe15/1MQVXvL8vbGG6JkQID
-AQABo2kwZzBGBgNVHREEPzA9ghZjb25uZWN0MDEuYWNwLnN1bmV0LnNlhiNodHRw
-czovL2Nvbm5lY3Quc3VuZXQuc2Uvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUxPAGA++l
-tPOMkUezKJJrwSNAz/0wDQYJKoZIhvcNAQEFBQADggEBADJJgcI6VADyB8749iGB
-UbK97Zav6/YoX3jMH21tpO0+iZyPlfCxlDmNIBSSrHmNIs7g8sBSi+z8ko2IaSKS
-Ya0fI0N+cvBoi+3Wfszq0LpUSu/5pMWiw3DacOCNesR76h+FKD/UPgUL+LDw7ebz
-K3aeVvtsIjPijrcCaUKrZg5dv/5CRx/oQLbV20L3xk5UTTO/RNrR1gef37yEowDd
-d8hQaQgw5uujjjdkr/6u03kjO6rEZAySsiBPGcpBDXAbk4lnJVQltP0MBE4pu+es
-0oZu+lC7LltiBjJxdh/7SaqdLbn7G7cApwQKqXHVFITX9ncVMM04FtM9MzMc9d4y
-bUs=
-</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>connect01.acp.sunet.se</ds:KeyName>
-        <ds:KeyName>https://connect.sunet.se/shibboleth</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=connect01.acp.sunet.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDLjCCAhagAwIBAgIJALJTE8wpfDmAMA0GCSqGSIb3DQEBBQUAMCExHzAdBgNV
-BAMTFmNvbm5lY3QwMS5hY3Auc3VuZXQuc2UwHhcNMDkwOTAyMTIwNTIwWhcNMTkw
-ODMxMTIwNTIwWjAhMR8wHQYDVQQDExZjb25uZWN0MDEuYWNwLnN1bmV0LnNlMIIB
-IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAzaNMBLHGgzRrAHLQDUiM+xu6
-ghKwdRqBcg171qVDeA4wSoVJLVeAY2xWKjudYzXtcwqL7qkDcHD3wOd0FLQSFfxE
-o67z4chBMNrkK9b9NgdHWp/Nb8gsdYNZt2ZjJVOD/oWTFXRHZDJhqkXFvVjL1gKu
-E3a2vDK6LRqYCLx5cyFleuRoqBvMrDxKLHvmqxo+Qt2e+ntL1sDVyKeMxgZc2s0/
-xGYFFzSVDT08XrWlgpN0AmxhfC0ULDb8YzQiJxsdeZ3C57RnC0InabCCvzPQsy9t
-c1VU/TNXkkXQn3H5aC+LUu8olnYndtFac56k/OaAUPe15/1MQVXvL8vbGG6JkQID
-AQABo2kwZzBGBgNVHREEPzA9ghZjb25uZWN0MDEuYWNwLnN1bmV0LnNlhiNodHRw
-czovL2Nvbm5lY3Quc3VuZXQuc2Uvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUxPAGA++l
-tPOMkUezKJJrwSNAz/0wDQYJKoZIhvcNAQEFBQADggEBADJJgcI6VADyB8749iGB
-UbK97Zav6/YoX3jMH21tpO0+iZyPlfCxlDmNIBSSrHmNIs7g8sBSi+z8ko2IaSKS
-Ya0fI0N+cvBoi+3Wfszq0LpUSu/5pMWiw3DacOCNesR76h+FKD/UPgUL+LDw7ebz
-K3aeVvtsIjPijrcCaUKrZg5dv/5CRx/oQLbV20L3xk5UTTO/RNrR1gef37yEowDd
-d8hQaQgw5uujjjdkr/6u03kjO6rEZAySsiBPGcpBDXAbk4lnJVQltP0MBE4pu+es
-0oZu+lC7LltiBjJxdh/7SaqdLbn7G7cApwQKqXHVFITX9ncVMM04FtM9MzMc9d4y
-bUs=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://connect.sunet.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://connect.sunet.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://connect.sunet.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://connect.sunet.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://connect.sunet.se/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://connect.sunet.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://connect.sunet.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://connect.sunet.se/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://connect.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.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.sunet.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://connect.sunet.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://connect.sunet.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://connect.sunet.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <md:AttributeConsumingService index="0">
-      <md:ServiceName xml:lang="en">SUNET E-Meeting Service</md:ServiceName>
-      <md:ServiceDescription xml:lang="en">SUNET E-Meeting Service (Adobe Connect Pro)</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" isRequired="true"/>
-      <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <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" isRequired="true"/>
-      <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" isRequired="true"/>
-    </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.sunet.se.xml b/swamid-interfederations-2.0/connect.sunet.se.xml
deleted file mode 100644
index b2f84347..00000000
--- a/swamid-interfederations-2.0/connect.sunet.se.xml
+++ /dev/null
@@ -1,112 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://connect.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/nren-service</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
-        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol 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.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.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.sunet.se/Shibboleth.sso/DS/nordu.net" 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.sunet.se/Shibboleth.sso/DS/kalmar2" index="4"/>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>connect01.acp.sunet.se</ds:KeyName>
-        <ds:KeyName>https://connect.sunet.se/shibboleth</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=connect01.acp.sunet.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDLjCCAhagAwIBAgIJALJTE8wpfDmAMA0GCSqGSIb3DQEBBQUAMCExHzAdBgNV
-BAMTFmNvbm5lY3QwMS5hY3Auc3VuZXQuc2UwHhcNMDkwOTAyMTIwNTIwWhcNMTkw
-ODMxMTIwNTIwWjAhMR8wHQYDVQQDExZjb25uZWN0MDEuYWNwLnN1bmV0LnNlMIIB
-IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAzaNMBLHGgzRrAHLQDUiM+xu6
-ghKwdRqBcg171qVDeA4wSoVJLVeAY2xWKjudYzXtcwqL7qkDcHD3wOd0FLQSFfxE
-o67z4chBMNrkK9b9NgdHWp/Nb8gsdYNZt2ZjJVOD/oWTFXRHZDJhqkXFvVjL1gKu
-E3a2vDK6LRqYCLx5cyFleuRoqBvMrDxKLHvmqxo+Qt2e+ntL1sDVyKeMxgZc2s0/
-xGYFFzSVDT08XrWlgpN0AmxhfC0ULDb8YzQiJxsdeZ3C57RnC0InabCCvzPQsy9t
-c1VU/TNXkkXQn3H5aC+LUu8olnYndtFac56k/OaAUPe15/1MQVXvL8vbGG6JkQID
-AQABo2kwZzBGBgNVHREEPzA9ghZjb25uZWN0MDEuYWNwLnN1bmV0LnNlhiNodHRw
-czovL2Nvbm5lY3Quc3VuZXQuc2Uvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUxPAGA++l
-tPOMkUezKJJrwSNAz/0wDQYJKoZIhvcNAQEFBQADggEBADJJgcI6VADyB8749iGB
-UbK97Zav6/YoX3jMH21tpO0+iZyPlfCxlDmNIBSSrHmNIs7g8sBSi+z8ko2IaSKS
-Ya0fI0N+cvBoi+3Wfszq0LpUSu/5pMWiw3DacOCNesR76h+FKD/UPgUL+LDw7ebz
-K3aeVvtsIjPijrcCaUKrZg5dv/5CRx/oQLbV20L3xk5UTTO/RNrR1gef37yEowDd
-d8hQaQgw5uujjjdkr/6u03kjO6rEZAySsiBPGcpBDXAbk4lnJVQltP0MBE4pu+es
-0oZu+lC7LltiBjJxdh/7SaqdLbn7G7cApwQKqXHVFITX9ncVMM04FtM9MzMc9d4y
-bUs=
-</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>connect01.acp.sunet.se</ds:KeyName>
-        <ds:KeyName>https://connect.sunet.se/shibboleth</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=connect01.acp.sunet.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDLjCCAhagAwIBAgIJALJTE8wpfDmAMA0GCSqGSIb3DQEBBQUAMCExHzAdBgNV
-BAMTFmNvbm5lY3QwMS5hY3Auc3VuZXQuc2UwHhcNMDkwOTAyMTIwNTIwWhcNMTkw
-ODMxMTIwNTIwWjAhMR8wHQYDVQQDExZjb25uZWN0MDEuYWNwLnN1bmV0LnNlMIIB
-IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAzaNMBLHGgzRrAHLQDUiM+xu6
-ghKwdRqBcg171qVDeA4wSoVJLVeAY2xWKjudYzXtcwqL7qkDcHD3wOd0FLQSFfxE
-o67z4chBMNrkK9b9NgdHWp/Nb8gsdYNZt2ZjJVOD/oWTFXRHZDJhqkXFvVjL1gKu
-E3a2vDK6LRqYCLx5cyFleuRoqBvMrDxKLHvmqxo+Qt2e+ntL1sDVyKeMxgZc2s0/
-xGYFFzSVDT08XrWlgpN0AmxhfC0ULDb8YzQiJxsdeZ3C57RnC0InabCCvzPQsy9t
-c1VU/TNXkkXQn3H5aC+LUu8olnYndtFac56k/OaAUPe15/1MQVXvL8vbGG6JkQID
-AQABo2kwZzBGBgNVHREEPzA9ghZjb25uZWN0MDEuYWNwLnN1bmV0LnNlhiNodHRw
-czovL2Nvbm5lY3Quc3VuZXQuc2Uvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUxPAGA++l
-tPOMkUezKJJrwSNAz/0wDQYJKoZIhvcNAQEFBQADggEBADJJgcI6VADyB8749iGB
-UbK97Zav6/YoX3jMH21tpO0+iZyPlfCxlDmNIBSSrHmNIs7g8sBSi+z8ko2IaSKS
-Ya0fI0N+cvBoi+3Wfszq0LpUSu/5pMWiw3DacOCNesR76h+FKD/UPgUL+LDw7ebz
-K3aeVvtsIjPijrcCaUKrZg5dv/5CRx/oQLbV20L3xk5UTTO/RNrR1gef37yEowDd
-d8hQaQgw5uujjjdkr/6u03kjO6rEZAySsiBPGcpBDXAbk4lnJVQltP0MBE4pu+es
-0oZu+lC7LltiBjJxdh/7SaqdLbn7G7cApwQKqXHVFITX9ncVMM04FtM9MzMc9d4y
-bUs=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://connect.sunet.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://connect.sunet.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://connect.sunet.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://connect.sunet.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://connect.sunet.se/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://connect.sunet.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://connect.sunet.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://connect.sunet.se/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://connect.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.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.sunet.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://connect.sunet.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://connect.sunet.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://connect.sunet.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <md:AttributeConsumingService index="0">
-      <md:ServiceName xml:lang="en">SUNET E-Meeting Service</md:ServiceName>
-      <md:ServiceDescription xml:lang="en">SUNET E-Meeting Service (Adobe Connect Pro)</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" isRequired="true"/>
-      <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <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" isRequired="true"/>
-      <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" isRequired="true"/>
-    </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/core.uwap.org-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml b/swamid-interfederations-2.0/core.uwap.org-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
index 8039d387..ac7aacde 100644
--- a/swamid-interfederations-2.0/core.uwap.org-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
+++ b/swamid-interfederations-2.0/core.uwap.org-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
@@ -1,33 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://core.uwap.org/simplesaml/module.php/saml/sp/metadata.php/default-sp">
-  <md:Extensions>
-    <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 xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://feide.no/" registrationInstant="2013-10-17T11:25:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://www.feide.no/files/feide/metadata-registration-practice-statement.pdf</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </md:Extensions>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" 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://core.uwap.org/simplesaml/module.php/saml/sp/metadata.php/default-sp">
   <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:UIInfo>
         <mdui:DisplayName xml:lang="en">UWAP</mdui:DisplayName>
         <mdui:DisplayName xml:lang="no">UWAP</mdui:DisplayName>
         <mdui:Description xml:lang="en">The service platform of UNINETT for next generation collaboration tools for higher education.</mdui:Description>
         <mdui:Description xml:lang="no">UNINETTs tjenesteplattform for neste generasjons samarbeidsverktøy for høyere utdanning.</mdui:Description>
       </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">norway</saml:AttributeValue>
+      </saml:Attribute>
     </md:Extensions>
     <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+      <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>MIID9zCCAt+gAwIBAgIJAK6OQWf0KU3yMA0GCSqGSIb3DQEBBQUAMFoxCzAJBgNVBAYTAk5PMRIwEAYDVQQIEwlUcm9uZGhlaW0xEjAQBgNVBAcTCVRyb25kaGVpbTETMBEGA1UEChMKVU5JTkVUVCBBUzEOMAwGA1UECxMFRmVpZGUwHhcNMTMxMDE3MTA0NzMxWhcNMjMxMDE3MTA0NzMxWjBaMQswCQYDVQQGEwJOTzESMBAGA1UECBMJVHJvbmRoZWltMRIwEAYDVQQHEwlUcm9uZGhlaW0xEzARBgNVBAoTClVOSU5FVFQgQVMxDjAMBgNVBAsTBUZlaWRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA6QRUddKwIJVwc2QvcDEyV+OZR9wLv1wpY6196HNixA1N21uFcy5KdnyUvpCBr/MaNFBXiJEKayr3Ugo48eGNvdkkyXu9hP6PUMXvd/86eFyEDYhnaIYyVIpK9dINBno8uUd3TuEXu9DQP2M+ifOwMy0Ng3yofHItiqQk1tXpoLvi3B8YZ9qn+iYa9wT13npCjB2mH7g9OY8vjUa7Dy/ZUE4SB/ZwqAIIPOrIgHzOX1X4+zzgVgIhi4FdiUVZRrVo48ukKnR5D1QhpEc3M1gDFiDxZAFaff4h+/GCYrkd2yVfN2IwHNXBNwjOWnsQMyf7YQdViMoEG5biKMXvuuLB9QIDAQABo4G/MIG8MB0GA1UdDgQWBBTeHFJiZGcXgAdUJXKbWsv/ZzVQ4DCBjAYDVR0jBIGEMIGBgBTeHFJiZGcXgAdUJXKbWsv/ZzVQ4KFepFwwWjELMAkGA1UEBhMCTk8xEjAQBgNVBAgTCVRyb25kaGVpbTESMBAGA1UEBxMJVHJvbmRoZWltMRMwEQYDVQQKEwpVTklORVRUIEFTMQ4wDAYDVQQLEwVGZWlkZYIJAK6OQWf0KU3yMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAKL3nPuAspxcApatUIYesIfDrrX5ATo+Wi2nB6lq4ZZNLYUQRM4ca+ACKebZgg4TLzmCg697IB65GIZvFgh3/lz+W1ZfoAPkNgF4td2J1+IkfwDvBMh9Zq2ML/WRtkTQzvLjSzLvYQZMy7q++M8NC13YODtWY5H8IWeRqrsrvxXF634NZWPky7Gwi3orRK09U0lxZmEDJnCN5ac9nEO0BlYwBszHy0tBtIFX11tUmxa3QpG0IHspFX3z8+CmQQmFreA3zul3GngBBykEtHhoJ7YbDe2bcpnk3Mn1nxLrlQLLjqWhmfxpslJhrIXCS4m4wVaOVad72+n+/To1r78QlVw=</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
     <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+      <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>MIID9zCCAt+gAwIBAgIJAK6OQWf0KU3yMA0GCSqGSIb3DQEBBQUAMFoxCzAJBgNVBAYTAk5PMRIwEAYDVQQIEwlUcm9uZGhlaW0xEjAQBgNVBAcTCVRyb25kaGVpbTETMBEGA1UEChMKVU5JTkVUVCBBUzEOMAwGA1UECxMFRmVpZGUwHhcNMTMxMDE3MTA0NzMxWhcNMjMxMDE3MTA0NzMxWjBaMQswCQYDVQQGEwJOTzESMBAGA1UECBMJVHJvbmRoZWltMRIwEAYDVQQHEwlUcm9uZGhlaW0xEzARBgNVBAoTClVOSU5FVFQgQVMxDjAMBgNVBAsTBUZlaWRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA6QRUddKwIJVwc2QvcDEyV+OZR9wLv1wpY6196HNixA1N21uFcy5KdnyUvpCBr/MaNFBXiJEKayr3Ugo48eGNvdkkyXu9hP6PUMXvd/86eFyEDYhnaIYyVIpK9dINBno8uUd3TuEXu9DQP2M+ifOwMy0Ng3yofHItiqQk1tXpoLvi3B8YZ9qn+iYa9wT13npCjB2mH7g9OY8vjUa7Dy/ZUE4SB/ZwqAIIPOrIgHzOX1X4+zzgVgIhi4FdiUVZRrVo48ukKnR5D1QhpEc3M1gDFiDxZAFaff4h+/GCYrkd2yVfN2IwHNXBNwjOWnsQMyf7YQdViMoEG5biKMXvuuLB9QIDAQABo4G/MIG8MB0GA1UdDgQWBBTeHFJiZGcXgAdUJXKbWsv/ZzVQ4DCBjAYDVR0jBIGEMIGBgBTeHFJiZGcXgAdUJXKbWsv/ZzVQ4KFepFwwWjELMAkGA1UEBhMCTk8xEjAQBgNVBAgTCVRyb25kaGVpbTESMBAGA1UEBxMJVHJvbmRoZWltMRMwEQYDVQQKEwpVTklORVRUIEFTMQ4wDAYDVQQLEwVGZWlkZYIJAK6OQWf0KU3yMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAKL3nPuAspxcApatUIYesIfDrrX5ATo+Wi2nB6lq4ZZNLYUQRM4ca+ACKebZgg4TLzmCg697IB65GIZvFgh3/lz+W1ZfoAPkNgF4td2J1+IkfwDvBMh9Zq2ML/WRtkTQzvLjSzLvYQZMy7q++M8NC13YODtWY5H8IWeRqrsrvxXF634NZWPky7Gwi3orRK09U0lxZmEDJnCN5ac9nEO0BlYwBszHy0tBtIFX11tUmxa3QpG0IHspFX3z8+CmQQmFreA3zul3GngBBykEtHhoJ7YbDe2bcpnk3Mn1nxLrlQLLjqWhmfxpslJhrIXCS4m4wVaOVad72+n+/To1r78QlVw=</ds:X509Certificate>
         </ds:X509Data>
diff --git a/swamid-interfederations-2.0/core.uwap.org.xml b/swamid-interfederations-2.0/core.uwap.org.xml
deleted file mode 100644
index 8039d387..00000000
--- a/swamid-interfederations-2.0/core.uwap.org.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://core.uwap.org/simplesaml/module.php/saml/sp/metadata.php/default-sp">
-  <md:Extensions>
-    <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 xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://feide.no/" registrationInstant="2013-10-17T11:25:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://www.feide.no/files/feide/metadata-registration-practice-statement.pdf</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">UWAP</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="no">UWAP</mdui:DisplayName>
-        <mdui:Description xml:lang="en">The service platform of UNINETT for next generation collaboration tools for higher education.</mdui:Description>
-        <mdui:Description xml:lang="no">UNINETTs tjenesteplattform for neste generasjons samarbeidsverktøy for høyere utdanning.</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>MIID9zCCAt+gAwIBAgIJAK6OQWf0KU3yMA0GCSqGSIb3DQEBBQUAMFoxCzAJBgNVBAYTAk5PMRIwEAYDVQQIEwlUcm9uZGhlaW0xEjAQBgNVBAcTCVRyb25kaGVpbTETMBEGA1UEChMKVU5JTkVUVCBBUzEOMAwGA1UECxMFRmVpZGUwHhcNMTMxMDE3MTA0NzMxWhcNMjMxMDE3MTA0NzMxWjBaMQswCQYDVQQGEwJOTzESMBAGA1UECBMJVHJvbmRoZWltMRIwEAYDVQQHEwlUcm9uZGhlaW0xEzARBgNVBAoTClVOSU5FVFQgQVMxDjAMBgNVBAsTBUZlaWRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA6QRUddKwIJVwc2QvcDEyV+OZR9wLv1wpY6196HNixA1N21uFcy5KdnyUvpCBr/MaNFBXiJEKayr3Ugo48eGNvdkkyXu9hP6PUMXvd/86eFyEDYhnaIYyVIpK9dINBno8uUd3TuEXu9DQP2M+ifOwMy0Ng3yofHItiqQk1tXpoLvi3B8YZ9qn+iYa9wT13npCjB2mH7g9OY8vjUa7Dy/ZUE4SB/ZwqAIIPOrIgHzOX1X4+zzgVgIhi4FdiUVZRrVo48ukKnR5D1QhpEc3M1gDFiDxZAFaff4h+/GCYrkd2yVfN2IwHNXBNwjOWnsQMyf7YQdViMoEG5biKMXvuuLB9QIDAQABo4G/MIG8MB0GA1UdDgQWBBTeHFJiZGcXgAdUJXKbWsv/ZzVQ4DCBjAYDVR0jBIGEMIGBgBTeHFJiZGcXgAdUJXKbWsv/ZzVQ4KFepFwwWjELMAkGA1UEBhMCTk8xEjAQBgNVBAgTCVRyb25kaGVpbTESMBAGA1UEBxMJVHJvbmRoZWltMRMwEQYDVQQKEwpVTklORVRUIEFTMQ4wDAYDVQQLEwVGZWlkZYIJAK6OQWf0KU3yMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAKL3nPuAspxcApatUIYesIfDrrX5ATo+Wi2nB6lq4ZZNLYUQRM4ca+ACKebZgg4TLzmCg697IB65GIZvFgh3/lz+W1ZfoAPkNgF4td2J1+IkfwDvBMh9Zq2ML/WRtkTQzvLjSzLvYQZMy7q++M8NC13YODtWY5H8IWeRqrsrvxXF634NZWPky7Gwi3orRK09U0lxZmEDJnCN5ac9nEO0BlYwBszHy0tBtIFX11tUmxa3QpG0IHspFX3z8+CmQQmFreA3zul3GngBBykEtHhoJ7YbDe2bcpnk3Mn1nxLrlQLLjqWhmfxpslJhrIXCS4m4wVaOVad72+n+/To1r78QlVw=</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>MIID9zCCAt+gAwIBAgIJAK6OQWf0KU3yMA0GCSqGSIb3DQEBBQUAMFoxCzAJBgNVBAYTAk5PMRIwEAYDVQQIEwlUcm9uZGhlaW0xEjAQBgNVBAcTCVRyb25kaGVpbTETMBEGA1UEChMKVU5JTkVUVCBBUzEOMAwGA1UECxMFRmVpZGUwHhcNMTMxMDE3MTA0NzMxWhcNMjMxMDE3MTA0NzMxWjBaMQswCQYDVQQGEwJOTzESMBAGA1UECBMJVHJvbmRoZWltMRIwEAYDVQQHEwlUcm9uZGhlaW0xEzARBgNVBAoTClVOSU5FVFQgQVMxDjAMBgNVBAsTBUZlaWRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA6QRUddKwIJVwc2QvcDEyV+OZR9wLv1wpY6196HNixA1N21uFcy5KdnyUvpCBr/MaNFBXiJEKayr3Ugo48eGNvdkkyXu9hP6PUMXvd/86eFyEDYhnaIYyVIpK9dINBno8uUd3TuEXu9DQP2M+ifOwMy0Ng3yofHItiqQk1tXpoLvi3B8YZ9qn+iYa9wT13npCjB2mH7g9OY8vjUa7Dy/ZUE4SB/ZwqAIIPOrIgHzOX1X4+zzgVgIhi4FdiUVZRrVo48ukKnR5D1QhpEc3M1gDFiDxZAFaff4h+/GCYrkd2yVfN2IwHNXBNwjOWnsQMyf7YQdViMoEG5biKMXvuuLB9QIDAQABo4G/MIG8MB0GA1UdDgQWBBTeHFJiZGcXgAdUJXKbWsv/ZzVQ4DCBjAYDVR0jBIGEMIGBgBTeHFJiZGcXgAdUJXKbWsv/ZzVQ4KFepFwwWjELMAkGA1UEBhMCTk8xEjAQBgNVBAgTCVRyb25kaGVpbTESMBAGA1UEBxMJVHJvbmRoZWltMRMwEQYDVQQKEwpVTklORVRUIEFTMQ4wDAYDVQQLEwVGZWlkZYIJAK6OQWf0KU3yMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAKL3nPuAspxcApatUIYesIfDrrX5ATo+Wi2nB6lq4ZZNLYUQRM4ca+ACKebZgg4TLzmCg697IB65GIZvFgh3/lz+W1ZfoAPkNgF4td2J1+IkfwDvBMh9Zq2ML/WRtkTQzvLjSzLvYQZMy7q++M8NC13YODtWY5H8IWeRqrsrvxXF634NZWPky7Gwi3orRK09U0lxZmEDJnCN5ac9nEO0BlYwBszHy0tBtIFX11tUmxa3QpG0IHspFX3z8+CmQQmFreA3zul3GngBBykEtHhoJ7YbDe2bcpnk3Mn1nxLrlQLLjqWhmfxpslJhrIXCS4m4wVaOVad72+n+/To1r78QlVw=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://core.uwap.org/simplesaml/module.php/saml/sp/saml2-logout.php/default-sp"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://core.uwap.org/simplesaml/module.php/saml/sp/saml2-acs.php/default-sp" index="0"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://core.uwap.org/simplesaml/module.php/saml/sp/saml1-acs.php/default-sp" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://core.uwap.org/simplesaml/module.php/saml/sp/saml2-acs.php/default-sp" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://core.uwap.org/simplesaml/module.php/saml/sp/saml1-acs.php/default-sp/artifact" index="3"/>
-    <md:AttributeConsumingService index="0">
-      <md:ServiceName xml:lang="en">UWAP</md:ServiceName>
-      <md:ServiceName xml:lang="no">UWAP</md:ServiceName>
-      <md:ServiceDescription xml:lang="en">The service platform of UNINETT for next generation collaboration tools for higher education.</md:ServiceDescription>
-      <md:ServiceDescription xml:lang="no">UNINETTs tjenesteplattform for neste generasjons samarbeidsverktøy for høyere utdanning.</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.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.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">UNINETT</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">UNINETT</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://uninett.no/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Andreas</md:GivenName>
-    <md:SurName>Åkre Solberg</md:SurName>
-    <md:EmailAddress>andreas.solberg@uninett.no</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/customers.myunidays.com-shibboleth.xml b/swamid-interfederations-2.0/customers.myunidays.com-shibboleth.xml
deleted file mode 100644
index 54f35092..00000000
--- a/swamid-interfederations-2.0/customers.myunidays.com-shibboleth.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://customers.myunidays.com/shibboleth">
-  <!--
-		This is a "UNiDAYS - Perks of Student Life - Customers" Shibboleth SP for MYUNiDAYS Limited.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2011-09-16T17:03:00Z">
-      <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>
-      <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://customers.myunidays.com/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://customers.myunidays.com/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://customers.myunidays.com/Shibboleth.sso/Login" 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://customers.myunidays.com/Shibboleth.sso/Login"/>
-      <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://customers.myunidays.com/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://customers.myunidays.com/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://customers.myunidays.com/Shibboleth.sso/DS" index="3"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">UNiDAYS</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Delivering online student discount and promotions from the biggest retailers for free to students.</mdui:Description>
-        <mdui:Logo height="100" width="300">https://d2hltel0toual2.cloudfront.net/images/wayf/logo_300x100px.png</mdui:Logo>
-        <mdui:Logo height="16" width="80">https://d2hltel0toual2.cloudfront.net/images/wayf/logo_80x16px.png</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDKDCCAhACCQC8EjoQK/aL7jANBgkqhkiG9w0BAQUFADBWMQswCQYDVQQGEwJH
-						QjETMBEGA1UECBMKU29tZS1TdGF0ZTEQMA4GA1UEChMHVW5pRGF5czEgMB4GA1UE
-						AxMXY3VzdG9tZXJzLm15dW5pZGF5cy5jb20wHhcNMTIwMzIwMDk0NzUyWhcNMzIw
-						MzE1MDk0NzUyWjBWMQswCQYDVQQGEwJHQjETMBEGA1UECBMKU29tZS1TdGF0ZTEQ
-						MA4GA1UEChMHVW5pRGF5czEgMB4GA1UEAxMXY3VzdG9tZXJzLm15dW5pZGF5cy5j
-						b20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCwMJfrb7y+eVIjMnMj
-						KQEaWZWX9omtsMmrkxgOAEO5snjni2OJfWShhGmTKpBHClE8AmomOdDr3grEW6Nd
-						5J0+yDh21A7bW6cdaxpwvr2FRZGaIkJFob0Lh7pnH59UIwfeO36fEUa/QfVWafZJ
-						JeWZe4gKcdI+ndY0tMvK4m/pMcO6rxy4AwsJdvxM0bE9R3WNlB8lgcxmbP4pjoZC
-						B29buyOS5/CmFzbA5IffwyJcyk+8dHVF7tbZ0CyjjOsXIrjCryUzsqDOdBLt5yup
-						n6BcBzob6bU8AMojnVT10NCxOWqL+O9i1VScJ/dzyiDbR05iWDa2VQ+/Ya9UpD4d
-						Pl5bAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBAKp/yt95eag2/oZdvxaIWLzjljEd
-						lZdlxzZVSXgI67Ci+RhBp+jrBAgNrk/2QxEtau8t54Ufy4hxCFh4o/YvQ3F/Rmaz
-						t7jz51Xj4/DeQ0Y/b5Kb+8MaZF8ZCNseU8Fd92c1Io+sAPQPtFqgR+kzxMOQAWET
-						L/IOUn+DhRh434WBVEciLUduGIpP+sI3gaszurWQIJslPrxOEf+X9aDjOSvLqJvw
-						jPsDxBi12zyperdHQgdNr6Jbd1h110XCpJzwCGXElxlNd+Z3R/sMW0wn7lCLYQA7
-						xmBjp1ntxjW8jWQiW/3pb5t/HODL79ntP17sTv4kT8EURtMRgYxttfreDdg=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://customers.myunidays.com/Shibboleth.sso/Artifact/SOAP" index="0"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://customers.myunidays.com/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://customers.myunidays.com/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://customers.myunidays.com/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://customers.myunidays.com/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://customers.myunidays.com/Shibboleth.sso/SAML2/POST" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://customers.myunidays.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://customers.myunidays.com/Shibboleth.sso/SAML2/Artifact" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://customers.myunidays.com/Shibboleth.sso/SAML2/ECP" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://customers.myunidays.com/Shibboleth.sso/SAML/POST" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://customers.myunidays.com/Shibboleth.sso/SAML/Artifact" index="5"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">MYUNiDAYS Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">UNiDAYS - Perks of Student Life - Customers</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.myunidays.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Andrew</GivenName>
-    <SurName>Bullock</SurName>
-    <EmailAddress>mailto:andrew@myunidays.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Andrew</GivenName>
-    <SurName>Bullock</SurName>
-    <EmailAddress>mailto:andrew@myunidays.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/customers.myunidays.com.xml b/swamid-interfederations-2.0/customers.myunidays.com.xml
deleted file mode 100644
index 54f35092..00000000
--- a/swamid-interfederations-2.0/customers.myunidays.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://customers.myunidays.com/shibboleth">
-  <!--
-		This is a "UNiDAYS - Perks of Student Life - Customers" Shibboleth SP for MYUNiDAYS Limited.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2011-09-16T17:03:00Z">
-      <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>
-      <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://customers.myunidays.com/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://customers.myunidays.com/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://customers.myunidays.com/Shibboleth.sso/Login" 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://customers.myunidays.com/Shibboleth.sso/Login"/>
-      <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://customers.myunidays.com/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://customers.myunidays.com/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://customers.myunidays.com/Shibboleth.sso/DS" index="3"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">UNiDAYS</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Delivering online student discount and promotions from the biggest retailers for free to students.</mdui:Description>
-        <mdui:Logo height="100" width="300">https://d2hltel0toual2.cloudfront.net/images/wayf/logo_300x100px.png</mdui:Logo>
-        <mdui:Logo height="16" width="80">https://d2hltel0toual2.cloudfront.net/images/wayf/logo_80x16px.png</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDKDCCAhACCQC8EjoQK/aL7jANBgkqhkiG9w0BAQUFADBWMQswCQYDVQQGEwJH
-						QjETMBEGA1UECBMKU29tZS1TdGF0ZTEQMA4GA1UEChMHVW5pRGF5czEgMB4GA1UE
-						AxMXY3VzdG9tZXJzLm15dW5pZGF5cy5jb20wHhcNMTIwMzIwMDk0NzUyWhcNMzIw
-						MzE1MDk0NzUyWjBWMQswCQYDVQQGEwJHQjETMBEGA1UECBMKU29tZS1TdGF0ZTEQ
-						MA4GA1UEChMHVW5pRGF5czEgMB4GA1UEAxMXY3VzdG9tZXJzLm15dW5pZGF5cy5j
-						b20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCwMJfrb7y+eVIjMnMj
-						KQEaWZWX9omtsMmrkxgOAEO5snjni2OJfWShhGmTKpBHClE8AmomOdDr3grEW6Nd
-						5J0+yDh21A7bW6cdaxpwvr2FRZGaIkJFob0Lh7pnH59UIwfeO36fEUa/QfVWafZJ
-						JeWZe4gKcdI+ndY0tMvK4m/pMcO6rxy4AwsJdvxM0bE9R3WNlB8lgcxmbP4pjoZC
-						B29buyOS5/CmFzbA5IffwyJcyk+8dHVF7tbZ0CyjjOsXIrjCryUzsqDOdBLt5yup
-						n6BcBzob6bU8AMojnVT10NCxOWqL+O9i1VScJ/dzyiDbR05iWDa2VQ+/Ya9UpD4d
-						Pl5bAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBAKp/yt95eag2/oZdvxaIWLzjljEd
-						lZdlxzZVSXgI67Ci+RhBp+jrBAgNrk/2QxEtau8t54Ufy4hxCFh4o/YvQ3F/Rmaz
-						t7jz51Xj4/DeQ0Y/b5Kb+8MaZF8ZCNseU8Fd92c1Io+sAPQPtFqgR+kzxMOQAWET
-						L/IOUn+DhRh434WBVEciLUduGIpP+sI3gaszurWQIJslPrxOEf+X9aDjOSvLqJvw
-						jPsDxBi12zyperdHQgdNr6Jbd1h110XCpJzwCGXElxlNd+Z3R/sMW0wn7lCLYQA7
-						xmBjp1ntxjW8jWQiW/3pb5t/HODL79ntP17sTv4kT8EURtMRgYxttfreDdg=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://customers.myunidays.com/Shibboleth.sso/Artifact/SOAP" index="0"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://customers.myunidays.com/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://customers.myunidays.com/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://customers.myunidays.com/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://customers.myunidays.com/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://customers.myunidays.com/Shibboleth.sso/SAML2/POST" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://customers.myunidays.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://customers.myunidays.com/Shibboleth.sso/SAML2/Artifact" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://customers.myunidays.com/Shibboleth.sso/SAML2/ECP" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://customers.myunidays.com/Shibboleth.sso/SAML/POST" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://customers.myunidays.com/Shibboleth.sso/SAML/Artifact" index="5"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">MYUNiDAYS Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">UNiDAYS - Perks of Student Life - Customers</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.myunidays.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Andrew</GivenName>
-    <SurName>Bullock</SurName>
-    <EmailAddress>mailto:andrew@myunidays.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Andrew</GivenName>
-    <SurName>Bullock</SurName>
-    <EmailAddress>mailto:andrew@myunidays.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/de.dariah.eu-shibboleth.xml b/swamid-interfederations-2.0/de.dariah.eu-shibboleth.xml
deleted file mode 100644
index 1f116991..00000000
--- a/swamid-interfederations-2.0/de.dariah.eu-shibboleth.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://de.dariah.eu/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2014-04-11T07:20:08Z">
-      <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: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://de.dariah.eu/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="de">DARIAH DE Portal</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">DARIAH DE Portal</mdui:DisplayName>
-        <mdui:Description xml:lang="de">DARIAH DE Portal</mdui:Description>
-        <mdui:Description xml:lang="en">DARIAH DE Portal</mdui:Description>
-        <mdui:InformationURL xml:lang="de">http://www.dariah.eu</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">http://www.dariah.eu</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://de.dariah.eu/ServicePrivacyPolicy</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>de.dariah.eu</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=de.dariah.eu,O=Georg-August-Universitaet Goettingen,L=Goettingen,ST=Niedersachsen,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIF9DCCBNygAwIBAgIHF2tAZ4KASTANBgkqhkiG9w0BAQUFADCBrjELMAkGA1UE
-BhMCREUxFjAUBgNVBAgTDU5pZWRlcnNhY2hzZW4xEzARBgNVBAcTCkdvZXR0aW5n
-ZW4xLTArBgNVBAoTJEdlb3JnLUF1Z3VzdC1Vbml2ZXJzaXRhZXQgR29ldHRpbmdl
-bjEjMCEGA1UEAxMaVW5pdmVyc2l0YWV0LUdvZXR0aW5nZW4gQ0ExHjAcBgkqhkiG
-9w0BCQEWD2d3ZGctY2FAZ3dkZy5kZTAeFw0xNDA0MTQxMTEzMjdaFw0xOTA0MTMx
-MTEzMjdaMIGAMQswCQYDVQQGEwJERTEWMBQGA1UECBMNTmllZGVyc2FjaHNlbjET
-MBEGA1UEBxMKR29ldHRpbmdlbjEtMCsGA1UEChMkR2VvcmctQXVndXN0LVVuaXZl
-cnNpdGFldCBHb2V0dGluZ2VuMRUwEwYDVQQDEwxkZS5kYXJpYWguZXUwggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCZp/ckQV5+5fVFKklNcaWwsXE1aqd7
-elspcZIWG9GFjZFXi1h9MW93AdkD23JsC2F9Go1YPkdyYJ80m5cGT6Bya7bk8Ofr
-tD8NYgqPrnVJTGOrr/u/rdtKqU7JCLp7/iP7XhahmAreLxSUYtZbfyNK9IH+Ngow
-hQTQ8CZsK/c2TQtLENN6LwBM45070Clxqzi05CyQPk9XN6pKyjfoA1uetfoIEhXE
-Qc2WE2yWaGo13bs+dRsRCYRbMofUSF3nv3BjKZ+7GqXlgY8zaI1ClzyFYWcc0VKg
-o/Xsto8RBi0mNIiG5QEacE6E9xlnd9PESmgHKzWySgJgaaF7ok55xym9AgMBAAGj
-ggJBMIICPTA5BgNVHSAEMjAwMBEGDysGAQQBga0hgiwBAQQDATARBg8rBgEEAYGt
-IYIsAgEEAwEwCAYGZ4EMAQICMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgTwMB0GA1Ud
-JQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAdBgNVHQ4EFgQUfJtiHWEOr3E4ysMy
-D3UlMdMiCuUwHwYDVR0jBBgwFoAUHb1zzG3ubhx0cNmjGzq6qCfevOswFwYDVR0R
-BBAwDoIMZGUuZGFyaWFoLmV1MIGPBgNVHR8EgYcwgYQwQKA+oDyGOmh0dHA6Ly9j
-ZHAxLnBjYS5kZm4uZGUvdW5pLWdvZXR0aW5nZW4tY2EvcHViL2NybC9jYWNybC5j
-cmwwQKA+oDyGOmh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvdW5pLWdvZXR0aW5nZW4t
-Y2EvcHViL2NybC9jYWNybC5jcmwwgd0GCCsGAQUFBwEBBIHQMIHNMDMGCCsGAQUF
-BzABhidodHRwOi8vb2NzcC5wY2EuZGZuLmRlL09DU1AtU2VydmVyL09DU1AwSgYI
-KwYBBQUHMAKGPmh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvdW5pLWdvZXR0aW5nZW4t
-Y2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MEoGCCsGAQUFBzAChj5odHRwOi8vY2Rw
-Mi5wY2EuZGZuLmRlL3VuaS1nb2V0dGluZ2VuLWNhL3B1Yi9jYWNlcnQvY2FjZXJ0
-LmNydDANBgkqhkiG9w0BAQUFAAOCAQEAjw9a18eRFlOY5CnWL0Dyv6iEr4JATxEM
-FhY4cwF+olbhh3FVRLIGe8DDJyeaJfXYEhWUF2TVZCG0W8Cv9Xi2bq5UNbCPzW1S
-Pw4FUAugElJ6xUAd1ENPRTI4ZxRCl2qA2ekta3ScdEq8yqyqvm1sr1AeeVTvVFUr
-IWOh5Xg8l6YkutMWCBczP0ziDxZg61X3qfZqwula8tCE9ntQIqs7Gdn41vOM5JF0
-7J1LhauZnorelWVLa9TJ0a+ZB1ksp6mSzU8miS48I16V8Hh33ZofOHEUe6IaON7h
-mE3K+QQokez7ktDhl8RWvR1efVjD76e6vIB2fItZVnP3Hxvt/ikRBw==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://de.dariah.eu/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://de.dariah.eu/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://de.dariah.eu/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://de.dariah.eu/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://de.dariah.eu/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://de.dariah.eu/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://de.dariah.eu/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://de.dariah.eu/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://de.dariah.eu/Shibboleth.sso/SAML2/POST" index="5"/>
-    <AttributeConsumingService index="1">
-      <ServiceName xml:lang="de">DARIAH DE Portal</ServiceName>
-      <ServiceName xml:lang="en">DARIAH DE Portal</ServiceName>
-      <ServiceDescription xml:lang="de">DARIAH DE Portal</ServiceDescription>
-      <ServiceDescription xml:lang="en">DARIAH DE Portal</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="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"/>
-    </AttributeConsumingService>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">e112</OrganizationName>
-    <OrganizationName xml:lang="en">e112</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">Gesellschaft für wissenschaftliche Datenverarbeitung mbH</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">Gesellschaft für wissenschaftliche Datenverarbeitung mbH</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.gwdg.de</OrganizationURL>
-    <OrganizationURL xml:lang="en">http://www.gwdg.de</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Bernd</GivenName>
-    <SurName>Schloer</SurName>
-    <EmailAddress>mailto:bernd.schloer@sub.uni-goettingen.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="support">
-    <GivenName>Dariah</GivenName>
-    <SurName>Support</SurName>
-    <EmailAddress>mailto:register@dariah.eu</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/de.dariah.eu.xml b/swamid-interfederations-2.0/de.dariah.eu.xml
deleted file mode 100644
index 1f116991..00000000
--- a/swamid-interfederations-2.0/de.dariah.eu.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://de.dariah.eu/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2014-04-11T07:20:08Z">
-      <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: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://de.dariah.eu/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="de">DARIAH DE Portal</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">DARIAH DE Portal</mdui:DisplayName>
-        <mdui:Description xml:lang="de">DARIAH DE Portal</mdui:Description>
-        <mdui:Description xml:lang="en">DARIAH DE Portal</mdui:Description>
-        <mdui:InformationURL xml:lang="de">http://www.dariah.eu</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">http://www.dariah.eu</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://de.dariah.eu/ServicePrivacyPolicy</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>de.dariah.eu</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=de.dariah.eu,O=Georg-August-Universitaet Goettingen,L=Goettingen,ST=Niedersachsen,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIF9DCCBNygAwIBAgIHF2tAZ4KASTANBgkqhkiG9w0BAQUFADCBrjELMAkGA1UE
-BhMCREUxFjAUBgNVBAgTDU5pZWRlcnNhY2hzZW4xEzARBgNVBAcTCkdvZXR0aW5n
-ZW4xLTArBgNVBAoTJEdlb3JnLUF1Z3VzdC1Vbml2ZXJzaXRhZXQgR29ldHRpbmdl
-bjEjMCEGA1UEAxMaVW5pdmVyc2l0YWV0LUdvZXR0aW5nZW4gQ0ExHjAcBgkqhkiG
-9w0BCQEWD2d3ZGctY2FAZ3dkZy5kZTAeFw0xNDA0MTQxMTEzMjdaFw0xOTA0MTMx
-MTEzMjdaMIGAMQswCQYDVQQGEwJERTEWMBQGA1UECBMNTmllZGVyc2FjaHNlbjET
-MBEGA1UEBxMKR29ldHRpbmdlbjEtMCsGA1UEChMkR2VvcmctQXVndXN0LVVuaXZl
-cnNpdGFldCBHb2V0dGluZ2VuMRUwEwYDVQQDEwxkZS5kYXJpYWguZXUwggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCZp/ckQV5+5fVFKklNcaWwsXE1aqd7
-elspcZIWG9GFjZFXi1h9MW93AdkD23JsC2F9Go1YPkdyYJ80m5cGT6Bya7bk8Ofr
-tD8NYgqPrnVJTGOrr/u/rdtKqU7JCLp7/iP7XhahmAreLxSUYtZbfyNK9IH+Ngow
-hQTQ8CZsK/c2TQtLENN6LwBM45070Clxqzi05CyQPk9XN6pKyjfoA1uetfoIEhXE
-Qc2WE2yWaGo13bs+dRsRCYRbMofUSF3nv3BjKZ+7GqXlgY8zaI1ClzyFYWcc0VKg
-o/Xsto8RBi0mNIiG5QEacE6E9xlnd9PESmgHKzWySgJgaaF7ok55xym9AgMBAAGj
-ggJBMIICPTA5BgNVHSAEMjAwMBEGDysGAQQBga0hgiwBAQQDATARBg8rBgEEAYGt
-IYIsAgEEAwEwCAYGZ4EMAQICMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgTwMB0GA1Ud
-JQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAdBgNVHQ4EFgQUfJtiHWEOr3E4ysMy
-D3UlMdMiCuUwHwYDVR0jBBgwFoAUHb1zzG3ubhx0cNmjGzq6qCfevOswFwYDVR0R
-BBAwDoIMZGUuZGFyaWFoLmV1MIGPBgNVHR8EgYcwgYQwQKA+oDyGOmh0dHA6Ly9j
-ZHAxLnBjYS5kZm4uZGUvdW5pLWdvZXR0aW5nZW4tY2EvcHViL2NybC9jYWNybC5j
-cmwwQKA+oDyGOmh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvdW5pLWdvZXR0aW5nZW4t
-Y2EvcHViL2NybC9jYWNybC5jcmwwgd0GCCsGAQUFBwEBBIHQMIHNMDMGCCsGAQUF
-BzABhidodHRwOi8vb2NzcC5wY2EuZGZuLmRlL09DU1AtU2VydmVyL09DU1AwSgYI
-KwYBBQUHMAKGPmh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvdW5pLWdvZXR0aW5nZW4t
-Y2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MEoGCCsGAQUFBzAChj5odHRwOi8vY2Rw
-Mi5wY2EuZGZuLmRlL3VuaS1nb2V0dGluZ2VuLWNhL3B1Yi9jYWNlcnQvY2FjZXJ0
-LmNydDANBgkqhkiG9w0BAQUFAAOCAQEAjw9a18eRFlOY5CnWL0Dyv6iEr4JATxEM
-FhY4cwF+olbhh3FVRLIGe8DDJyeaJfXYEhWUF2TVZCG0W8Cv9Xi2bq5UNbCPzW1S
-Pw4FUAugElJ6xUAd1ENPRTI4ZxRCl2qA2ekta3ScdEq8yqyqvm1sr1AeeVTvVFUr
-IWOh5Xg8l6YkutMWCBczP0ziDxZg61X3qfZqwula8tCE9ntQIqs7Gdn41vOM5JF0
-7J1LhauZnorelWVLa9TJ0a+ZB1ksp6mSzU8miS48I16V8Hh33ZofOHEUe6IaON7h
-mE3K+QQokez7ktDhl8RWvR1efVjD76e6vIB2fItZVnP3Hxvt/ikRBw==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://de.dariah.eu/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://de.dariah.eu/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://de.dariah.eu/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://de.dariah.eu/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://de.dariah.eu/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://de.dariah.eu/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://de.dariah.eu/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://de.dariah.eu/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://de.dariah.eu/Shibboleth.sso/SAML2/POST" index="5"/>
-    <AttributeConsumingService index="1">
-      <ServiceName xml:lang="de">DARIAH DE Portal</ServiceName>
-      <ServiceName xml:lang="en">DARIAH DE Portal</ServiceName>
-      <ServiceDescription xml:lang="de">DARIAH DE Portal</ServiceDescription>
-      <ServiceDescription xml:lang="en">DARIAH DE Portal</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="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"/>
-    </AttributeConsumingService>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">e112</OrganizationName>
-    <OrganizationName xml:lang="en">e112</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">Gesellschaft für wissenschaftliche Datenverarbeitung mbH</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">Gesellschaft für wissenschaftliche Datenverarbeitung mbH</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.gwdg.de</OrganizationURL>
-    <OrganizationURL xml:lang="en">http://www.gwdg.de</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Bernd</GivenName>
-    <SurName>Schloer</SurName>
-    <EmailAddress>mailto:bernd.schloer@sub.uni-goettingen.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="support">
-    <GivenName>Dariah</GivenName>
-    <SurName>Support</SurName>
-    <EmailAddress>mailto:register@dariah.eu</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/dev.emeraldinsight.com-entity.xml b/swamid-interfederations-2.0/dev.emeraldinsight.com-entity.xml
deleted file mode 100644
index 803bf9de..00000000
--- a/swamid-interfederations-2.0/dev.emeraldinsight.com-entity.xml
+++ /dev/null
@@ -1,151 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://dev.emeraldinsight.com/entity">
-  <!--
-		This is a Shibboleth SP for Emerald Group Publishing Ltd.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2011-05-09T12:25:06Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </Extensions>
-  <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">
-    <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://dev.emeraldinsight.com/Shibboleth.sso/auth/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://dev.emeraldinsight.com/Shibboleth.sso/auth/DS/UKFederation" 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://dev.emeraldinsight.com/Shibboleth.sso/auth/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://dev.emeraldinsight.com/Shibboleth.sso/auth/DS/Kalmar2" 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://dev.emeraldinsight.com/Shibboleth.sso/auth/DS/Wayf"/>
-      <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://dev.emeraldinsight.com/Shibboleth.sso/auth/DS/Wayf" 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://dev.emeraldinsight.com/Shibboleth.sso/auth/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://dev.emeraldinsight.com/Shibboleth.sso/auth/TestShib"/>
-      <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://dev.emeraldinsight.com/Shibboleth.sso/auth/wayf-test"/>
-      <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://dev.emeraldinsight.com/Shibboleth.sso/auth/dfn-test"/>
-      <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://dev.emeraldinsight.com/Shibboleth.sso/auth/dfn-test2"/>
-      <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://dev.emeraldinsight.com/Shibboleth.sso/auth/abu"/>
-      <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://dev.emeraldinsight.com/Shibboleth.sso/auth/asc"/>
-      <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://dev.emeraldinsight.com/Shibboleth.sso/auth/aru"/>
-      <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://dev.emeraldinsight.com/Shibboleth.sso/auth/asu"/>
-      <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://dev.emeraldinsight.com/Shibboleth.sso/auth/bsu"/>
-      <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://dev.emeraldinsight.com/Shibboleth.sso/auth/bmu"/>
-      <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://dev.emeraldinsight.com/Shibboleth.sso/auth/blc"/>
-      <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://dev.emeraldinsight.com/Shibboleth.sso/auth/bfc"/>
-      <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://dev.emeraldinsight.com/Shibboleth.sso/auth/brc"/>
-      <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://dev.emeraldinsight.com/Shibboleth.sso/auth/bru"/>
-      <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://dev.emeraldinsight.com/Shibboleth.sso/auth/bnu"/>
-      <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://dev.emeraldinsight.com/Shibboleth.sso/auth/cac"/>
-      <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://dev.emeraldinsight.com/Shibboleth.sso/auth/chc"/>
-      <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://dev.emeraldinsight.com/Shibboleth.sso/auth/cmj"/>
-      <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://dev.emeraldinsight.com/Shibboleth.sso/auth/cru"/>
-      <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://dev.emeraldinsight.com/Shibboleth.sso/auth/dmu"/>
-      <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://dev.emeraldinsight.com/Shibboleth.sso/auth/doc"/>
-      <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://dev.emeraldinsight.com/Shibboleth.sso/auth/enu"/>
-      <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://dev.emeraldinsight.com/Shibboleth.sso/auth/icl"/>
-      <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://dev.emeraldinsight.com/Shibboleth.sso/auth/kiu"/>
-      <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://dev.emeraldinsight.com/Shibboleth.sso/auth/lsbu"/>
-      <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://dev.emeraldinsight.com/Shibboleth.sso/auth/mmu"/>
-      <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://dev.emeraldinsight.com/Shibboleth.sso/auth/nec"/>
-      <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://dev.emeraldinsight.com/Shibboleth.sso/auth/ncn"/>
-      <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://dev.emeraldinsight.com/Shibboleth.sso/auth/nrc"/>
-      <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://dev.emeraldinsight.com/Shibboleth.sso/auth/nou"/>
-      <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://dev.emeraldinsight.com/Shibboleth.sso/auth/ntu"/>
-      <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://dev.emeraldinsight.com/Shibboleth.sso/auth/qmu"/>
-      <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://dev.emeraldinsight.com/Shibboleth.sso/auth/qmul"/>
-      <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://dev.emeraldinsight.com/Shibboleth.sso/auth/rgu"/>
-      <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://dev.emeraldinsight.com/Shibboleth.sso/auth/rou"/>
-      <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://dev.emeraldinsight.com/Shibboleth.sso/auth/shu"/>
-      <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://dev.emeraldinsight.com/Shibboleth.sso/auth/ssu"/>
-      <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://dev.emeraldinsight.com/Shibboleth.sso/auth/shu"/>
-      <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://dev.emeraldinsight.com/Shibboleth.sso/auth/tvu"/>
-      <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://dev.emeraldinsight.com/Shibboleth.sso/auth/uls"/>
-      <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://dev.emeraldinsight.com/Shibboleth.sso/auth/umi"/>
-      <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://dev.emeraldinsight.com/Shibboleth.sso/auth/urhb"/>
-      <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://dev.emeraldinsight.com/Shibboleth.sso/auth/uab"/>
-      <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://dev.emeraldinsight.com/Shibboleth.sso/auth/uad"/>
-      <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://dev.emeraldinsight.com/Shibboleth.sso/auth/ube"/>
-      <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://dev.emeraldinsight.com/Shibboleth.sso/auth/ubi"/>
-      <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://dev.emeraldinsight.com/Shibboleth.sso/auth/ubr"/>
-      <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://dev.emeraldinsight.com/Shibboleth.sso/auth/ubri"/>
-      <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://dev.emeraldinsight.com/Shibboleth.sso/auth/uco"/>
-      <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://dev.emeraldinsight.com/Shibboleth.sso/auth/ucu"/>
-      <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://dev.emeraldinsight.com/Shibboleth.sso/auth/ugl"/>
-      <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://dev.emeraldinsight.com/Shibboleth.sso/auth/uglo"/>
-      <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://dev.emeraldinsight.com/Shibboleth.sso/auth/ulo"/>
-      <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://dev.emeraldinsight.com/Shibboleth.sso/auth/uma"/>
-      <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://dev.emeraldinsight.com/Shibboleth.sso/auth/unut"/>
-      <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://dev.emeraldinsight.com/Shibboleth.sso/auth/uno"/>
-      <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://dev.emeraldinsight.com/Shibboleth.sso/auth/upo"/>
-      <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://dev.emeraldinsight.com/Shibboleth.sso/auth/ure"/>
-      <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://dev.emeraldinsight.com/Shibboleth.sso/auth/uso"/>
-      <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://dev.emeraldinsight.com/Shibboleth.sso/auth/usa"/>
-      <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://dev.emeraldinsight.com/Shibboleth.sso/auth/ust"/>
-      <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://dev.emeraldinsight.com/Shibboleth.sso/auth/ustr"/>
-      <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://dev.emeraldinsight.com/Shibboleth.sso/auth/ute"/>
-      <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://dev.emeraldinsight.com/Shibboleth.sso/auth/ual"/>
-      <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://dev.emeraldinsight.com/Shibboleth.sso/auth/uwi"/>
-      <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://dev.emeraldinsight.com/Shibboleth.sso/auth/uwne"/>
-      <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://dev.emeraldinsight.com/Shibboleth.sso/auth/uwtsd"/>
-      <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://dev.emeraldinsight.com/Shibboleth.sso/auth/uwa"/>
-      <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://dev.emeraldinsight.com/Shibboleth.sso/auth/uwe"/>
-      <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://dev.emeraldinsight.com/Shibboleth.sso/auth/uyo"/>
-      <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://dev.emeraldinsight.com/Shibboleth.sso/auth/wac"/>
-      <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://dev.emeraldinsight.com/Shibboleth.sso/auth/wel"/>
-      <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://dev.emeraldinsight.com/Shibboleth.sso/auth/wcc"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDSzCCAjOgAwIBAgIJAPL5yXP0XbhAMA0GCSqGSIb3DQEBBQUAMCoxKDAmBgNV
-						BAMTH2VtLWwxLXJoLXVhdC5lbWVyYWxkaW5zaWdodC5jb20wHhcNMTEwNTA1MDc1
-						MjEyWhcNMjEwNTAyMDc1MjEyWjAqMSgwJgYDVQQDEx9lbS1sMS1yaC11YXQuZW1l
-						cmFsZGluc2lnaHQuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
-						1cPpwOpncLWxjS6YxesBuUjX7wyxMf01E7nIcYbdxYYiINMnd2j4Mi3uzdG8qqbp
-						INCMvPIgzL2827k28SktsY3AftMAYsAiBDzhFwcUce4mrK3QxofpP+aoH3/oswlZ
-						ur3rxHLJYWy/0aO9NqJvd9M5hh2K8L4TlD/FvedqRfrFuviNXoXzC5WqoSGxuT4R
-						gMP1ChbxzcWvJbhkdHuX/TrDH7lq+NUflJHjXDNsBYO0Ko9IPx9GTwfo0tNth9Ym
-						4PZfz6VY5nl4zlDxMktwcOI9ofzAtjAi2MUTDw9YnETqME9I9ums57ke84HCMXSW
-						0ToxuMcWkyjGsb2TEi4jqwIDAQABo3QwcjBRBgNVHREESjBIgh9lbS1sMS1yaC11
-						YXQuZW1lcmFsZGluc2lnaHQuY29thiVodHRwczovL2Rldi5lbWVyYWxkaW5zaWdo
-						dC5jb20vZW50aXR5MB0GA1UdDgQWBBSZx0zhhju5QWnvVBzwzb1HMBk2tTANBgkq
-						hkiG9w0BAQUFAAOCAQEAbw4E1yg5C8G5wWcWqPi/c8gG2kIyYdUtAoMxoVrF0NCe
-						x0YZUDMLIhUNdHKh1RZMbgKG19pTqUmEjPhfE9VXwfsSIv9QrJiJ2zFH7LbnA7bh
-						qnGVhPzee8x88rpS19GcxYitMzifqMxJ7K2bC2++kN87Z5niseL2nSYntB7EmwJp
-						EvutgzIJJoH7Xg8KieuPVJKaia1RHpcA4QAeuWPgyZ2Ez+zuszlq2650KCXgQreL
-						m0sivyuWv7TZVl8D+cLucd23bwknQLioqhhpdwmXrpcKyRHPaRrf3iznD/cHd0Ps
-						lHVWGtQ0Nh/tJIKoMcDif+nTn+Hm4+au0NFb1pX40A==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dev.emeraldinsight.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dev.emeraldinsight.com/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://dev.emeraldinsight.com/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dev.emeraldinsight.com/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dev.emeraldinsight.com/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dev.emeraldinsight.com/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://dev.emeraldinsight.com/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dev.emeraldinsight.com/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dev.emeraldinsight.com/Shibboleth.sso/NIM/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dev.emeraldinsight.com/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://dev.emeraldinsight.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dev.emeraldinsight.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://dev.emeraldinsight.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://dev.emeraldinsight.com/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://dev.emeraldinsight.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Emerald Group Publishing Ltd</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Emerald Group Publishing Ltd: Emerald Development Site</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://dev.emeraldinsight.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Rob</GivenName>
-    <SurName>Wood</SurName>
-    <EmailAddress>mailto:rwood@emeraldinsight.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Laurence</GivenName>
-    <SurName>Parkin</SurName>
-    <EmailAddress>mailto:lparkin@emeraldinsight.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/dev.emeraldinsight.com.xml b/swamid-interfederations-2.0/dev.emeraldinsight.com.xml
deleted file mode 100644
index 803bf9de..00000000
--- a/swamid-interfederations-2.0/dev.emeraldinsight.com.xml
+++ /dev/null
@@ -1,151 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://dev.emeraldinsight.com/entity">
-  <!--
-		This is a Shibboleth SP for Emerald Group Publishing Ltd.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2011-05-09T12:25:06Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </Extensions>
-  <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">
-    <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://dev.emeraldinsight.com/Shibboleth.sso/auth/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://dev.emeraldinsight.com/Shibboleth.sso/auth/DS/UKFederation" 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://dev.emeraldinsight.com/Shibboleth.sso/auth/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://dev.emeraldinsight.com/Shibboleth.sso/auth/DS/Kalmar2" 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://dev.emeraldinsight.com/Shibboleth.sso/auth/DS/Wayf"/>
-      <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://dev.emeraldinsight.com/Shibboleth.sso/auth/DS/Wayf" 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://dev.emeraldinsight.com/Shibboleth.sso/auth/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://dev.emeraldinsight.com/Shibboleth.sso/auth/TestShib"/>
-      <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://dev.emeraldinsight.com/Shibboleth.sso/auth/wayf-test"/>
-      <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://dev.emeraldinsight.com/Shibboleth.sso/auth/dfn-test"/>
-      <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://dev.emeraldinsight.com/Shibboleth.sso/auth/dfn-test2"/>
-      <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://dev.emeraldinsight.com/Shibboleth.sso/auth/abu"/>
-      <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://dev.emeraldinsight.com/Shibboleth.sso/auth/asc"/>
-      <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://dev.emeraldinsight.com/Shibboleth.sso/auth/aru"/>
-      <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://dev.emeraldinsight.com/Shibboleth.sso/auth/asu"/>
-      <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://dev.emeraldinsight.com/Shibboleth.sso/auth/bsu"/>
-      <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://dev.emeraldinsight.com/Shibboleth.sso/auth/bmu"/>
-      <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://dev.emeraldinsight.com/Shibboleth.sso/auth/blc"/>
-      <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://dev.emeraldinsight.com/Shibboleth.sso/auth/bfc"/>
-      <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://dev.emeraldinsight.com/Shibboleth.sso/auth/brc"/>
-      <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://dev.emeraldinsight.com/Shibboleth.sso/auth/bru"/>
-      <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://dev.emeraldinsight.com/Shibboleth.sso/auth/bnu"/>
-      <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://dev.emeraldinsight.com/Shibboleth.sso/auth/cac"/>
-      <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://dev.emeraldinsight.com/Shibboleth.sso/auth/chc"/>
-      <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://dev.emeraldinsight.com/Shibboleth.sso/auth/cmj"/>
-      <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://dev.emeraldinsight.com/Shibboleth.sso/auth/cru"/>
-      <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://dev.emeraldinsight.com/Shibboleth.sso/auth/dmu"/>
-      <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://dev.emeraldinsight.com/Shibboleth.sso/auth/doc"/>
-      <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://dev.emeraldinsight.com/Shibboleth.sso/auth/enu"/>
-      <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://dev.emeraldinsight.com/Shibboleth.sso/auth/icl"/>
-      <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://dev.emeraldinsight.com/Shibboleth.sso/auth/kiu"/>
-      <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://dev.emeraldinsight.com/Shibboleth.sso/auth/lsbu"/>
-      <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://dev.emeraldinsight.com/Shibboleth.sso/auth/mmu"/>
-      <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://dev.emeraldinsight.com/Shibboleth.sso/auth/nec"/>
-      <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://dev.emeraldinsight.com/Shibboleth.sso/auth/ncn"/>
-      <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://dev.emeraldinsight.com/Shibboleth.sso/auth/nrc"/>
-      <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://dev.emeraldinsight.com/Shibboleth.sso/auth/nou"/>
-      <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://dev.emeraldinsight.com/Shibboleth.sso/auth/ntu"/>
-      <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://dev.emeraldinsight.com/Shibboleth.sso/auth/qmu"/>
-      <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://dev.emeraldinsight.com/Shibboleth.sso/auth/qmul"/>
-      <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://dev.emeraldinsight.com/Shibboleth.sso/auth/rgu"/>
-      <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://dev.emeraldinsight.com/Shibboleth.sso/auth/rou"/>
-      <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://dev.emeraldinsight.com/Shibboleth.sso/auth/shu"/>
-      <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://dev.emeraldinsight.com/Shibboleth.sso/auth/ssu"/>
-      <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://dev.emeraldinsight.com/Shibboleth.sso/auth/shu"/>
-      <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://dev.emeraldinsight.com/Shibboleth.sso/auth/tvu"/>
-      <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://dev.emeraldinsight.com/Shibboleth.sso/auth/uls"/>
-      <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://dev.emeraldinsight.com/Shibboleth.sso/auth/umi"/>
-      <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://dev.emeraldinsight.com/Shibboleth.sso/auth/urhb"/>
-      <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://dev.emeraldinsight.com/Shibboleth.sso/auth/uab"/>
-      <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://dev.emeraldinsight.com/Shibboleth.sso/auth/uad"/>
-      <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://dev.emeraldinsight.com/Shibboleth.sso/auth/ube"/>
-      <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://dev.emeraldinsight.com/Shibboleth.sso/auth/ubi"/>
-      <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://dev.emeraldinsight.com/Shibboleth.sso/auth/ubr"/>
-      <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://dev.emeraldinsight.com/Shibboleth.sso/auth/ubri"/>
-      <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://dev.emeraldinsight.com/Shibboleth.sso/auth/uco"/>
-      <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://dev.emeraldinsight.com/Shibboleth.sso/auth/ucu"/>
-      <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://dev.emeraldinsight.com/Shibboleth.sso/auth/ugl"/>
-      <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://dev.emeraldinsight.com/Shibboleth.sso/auth/uglo"/>
-      <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://dev.emeraldinsight.com/Shibboleth.sso/auth/ulo"/>
-      <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://dev.emeraldinsight.com/Shibboleth.sso/auth/uma"/>
-      <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://dev.emeraldinsight.com/Shibboleth.sso/auth/unut"/>
-      <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://dev.emeraldinsight.com/Shibboleth.sso/auth/uno"/>
-      <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://dev.emeraldinsight.com/Shibboleth.sso/auth/upo"/>
-      <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://dev.emeraldinsight.com/Shibboleth.sso/auth/ure"/>
-      <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://dev.emeraldinsight.com/Shibboleth.sso/auth/uso"/>
-      <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://dev.emeraldinsight.com/Shibboleth.sso/auth/usa"/>
-      <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://dev.emeraldinsight.com/Shibboleth.sso/auth/ust"/>
-      <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://dev.emeraldinsight.com/Shibboleth.sso/auth/ustr"/>
-      <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://dev.emeraldinsight.com/Shibboleth.sso/auth/ute"/>
-      <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://dev.emeraldinsight.com/Shibboleth.sso/auth/ual"/>
-      <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://dev.emeraldinsight.com/Shibboleth.sso/auth/uwi"/>
-      <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://dev.emeraldinsight.com/Shibboleth.sso/auth/uwne"/>
-      <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://dev.emeraldinsight.com/Shibboleth.sso/auth/uwtsd"/>
-      <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://dev.emeraldinsight.com/Shibboleth.sso/auth/uwa"/>
-      <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://dev.emeraldinsight.com/Shibboleth.sso/auth/uwe"/>
-      <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://dev.emeraldinsight.com/Shibboleth.sso/auth/uyo"/>
-      <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://dev.emeraldinsight.com/Shibboleth.sso/auth/wac"/>
-      <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://dev.emeraldinsight.com/Shibboleth.sso/auth/wel"/>
-      <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://dev.emeraldinsight.com/Shibboleth.sso/auth/wcc"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDSzCCAjOgAwIBAgIJAPL5yXP0XbhAMA0GCSqGSIb3DQEBBQUAMCoxKDAmBgNV
-						BAMTH2VtLWwxLXJoLXVhdC5lbWVyYWxkaW5zaWdodC5jb20wHhcNMTEwNTA1MDc1
-						MjEyWhcNMjEwNTAyMDc1MjEyWjAqMSgwJgYDVQQDEx9lbS1sMS1yaC11YXQuZW1l
-						cmFsZGluc2lnaHQuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
-						1cPpwOpncLWxjS6YxesBuUjX7wyxMf01E7nIcYbdxYYiINMnd2j4Mi3uzdG8qqbp
-						INCMvPIgzL2827k28SktsY3AftMAYsAiBDzhFwcUce4mrK3QxofpP+aoH3/oswlZ
-						ur3rxHLJYWy/0aO9NqJvd9M5hh2K8L4TlD/FvedqRfrFuviNXoXzC5WqoSGxuT4R
-						gMP1ChbxzcWvJbhkdHuX/TrDH7lq+NUflJHjXDNsBYO0Ko9IPx9GTwfo0tNth9Ym
-						4PZfz6VY5nl4zlDxMktwcOI9ofzAtjAi2MUTDw9YnETqME9I9ums57ke84HCMXSW
-						0ToxuMcWkyjGsb2TEi4jqwIDAQABo3QwcjBRBgNVHREESjBIgh9lbS1sMS1yaC11
-						YXQuZW1lcmFsZGluc2lnaHQuY29thiVodHRwczovL2Rldi5lbWVyYWxkaW5zaWdo
-						dC5jb20vZW50aXR5MB0GA1UdDgQWBBSZx0zhhju5QWnvVBzwzb1HMBk2tTANBgkq
-						hkiG9w0BAQUFAAOCAQEAbw4E1yg5C8G5wWcWqPi/c8gG2kIyYdUtAoMxoVrF0NCe
-						x0YZUDMLIhUNdHKh1RZMbgKG19pTqUmEjPhfE9VXwfsSIv9QrJiJ2zFH7LbnA7bh
-						qnGVhPzee8x88rpS19GcxYitMzifqMxJ7K2bC2++kN87Z5niseL2nSYntB7EmwJp
-						EvutgzIJJoH7Xg8KieuPVJKaia1RHpcA4QAeuWPgyZ2Ez+zuszlq2650KCXgQreL
-						m0sivyuWv7TZVl8D+cLucd23bwknQLioqhhpdwmXrpcKyRHPaRrf3iznD/cHd0Ps
-						lHVWGtQ0Nh/tJIKoMcDif+nTn+Hm4+au0NFb1pX40A==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dev.emeraldinsight.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dev.emeraldinsight.com/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://dev.emeraldinsight.com/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dev.emeraldinsight.com/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dev.emeraldinsight.com/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dev.emeraldinsight.com/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://dev.emeraldinsight.com/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dev.emeraldinsight.com/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dev.emeraldinsight.com/Shibboleth.sso/NIM/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dev.emeraldinsight.com/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://dev.emeraldinsight.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dev.emeraldinsight.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://dev.emeraldinsight.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://dev.emeraldinsight.com/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://dev.emeraldinsight.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Emerald Group Publishing Ltd</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Emerald Group Publishing Ltd: Emerald Development Site</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://dev.emeraldinsight.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Rob</GivenName>
-    <SurName>Wood</SurName>
-    <EmailAddress>mailto:rwood@emeraldinsight.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Laurence</GivenName>
-    <SurName>Parkin</SurName>
-    <EmailAddress>mailto:lparkin@emeraldinsight.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/dev1.redclara.net-shibboleth.xml b/swamid-interfederations-2.0/dev1.redclara.net-shibboleth.xml
deleted file mode 100644
index c2f139ff..00000000
--- a/swamid-interfederations-2.0/dev1.redclara.net-shibboleth.xml
+++ /dev/null
@@ -1,145 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" 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>dev1.redclara.net</ds:KeyName>
-        <ds:KeyName>redclara.net</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>emailAddress=webmaster@redclara.net,CN=dev1.redclara.net,C=CO,description=QPUmXyZ3gm091N6p</ds:X509SubjectName>
-          <ds:X509Certificate>MIIGWzCCBUOgAwIBAgIDEL2nMA0GCSqGSIb3DQEBBQUAMIGMMQswCQYDVQQGEwJJ
-TDEWMBQGA1UEChMNU3RhcnRDb20gTHRkLjErMCkGA1UECxMiU2VjdXJlIERpZ2l0
-YWwgQ2VydGlmaWNhdGUgU2lnbmluZzE4MDYGA1UEAxMvU3RhcnRDb20gQ2xhc3Mg
-MSBQcmltYXJ5IEludGVybWVkaWF0ZSBTZXJ2ZXIgQ0EwHhcNMTQwNTI2MjMxMTM2
-WhcNMTUwNTI4MTI0NTI3WjBrMRkwFwYDVQQNExBRUFVtWHlaM2dtMDkxTjZwMQsw
-CQYDVQQGEwJDTzEaMBgGA1UEAxMRZGV2MS5yZWRjbGFyYS5uZXQxJTAjBgkqhkiG
-9w0BCQEWFndlYm1hc3RlckByZWRjbGFyYS5uZXQwggEiMA0GCSqGSIb3DQEBAQUA
-A4IBDwAwggEKAoIBAQDbnJsFWPS0QzTxLy/QljN+fdU69hUiChmyPx8c6asT0cy+
-daDvHXpRqTZXB7DuZdd4B8JVCdSth52/oyBpgQpIhF19bpzvVNmyBtS0Xp6w5NN7
-GfIoEA8MGO4H9VdUNio1sJLUTE8a/J33DJdk1RkH5ucJLYdK0nph1yasusWHnSBJ
-VOC3Ea9Hv/yJxoSlHrOs0Sr4UxucVTmgQSU7Wd/0Mq86cHXJ1/lOaWl4+VwbBGXt
-CTCTpUBIHJa8ufH9kyAMtLb4gCXCR48aWIF18SaM8J5/HgXABpwKuVePUqg4TTkU
-c0SSy1gpFA7IKhW4e8jODE89UrEpaLBi+/ke1Ba7AgMBAAGjggLkMIIC4DAJBgNV
-HRMEAjAAMAsGA1UdDwQEAwIDqDATBgNVHSUEDDAKBggrBgEFBQcDATAdBgNVHQ4E
-FgQUYk4lJIBf4VCDLPFliL5UPeZFtlswHwYDVR0jBBgwFoAU60I00Jiwq5/0G2sI
-98xkLu8OLEUwKgYDVR0RBCMwIYIRZGV2MS5yZWRjbGFyYS5uZXSCDHJlZGNsYXJh
-Lm5ldDCCAVYGA1UdIASCAU0wggFJMAgGBmeBDAECATCCATsGCysGAQQBgbU3AQID
-MIIBKjAuBggrBgEFBQcCARYiaHR0cDovL3d3dy5zdGFydHNzbC5jb20vcG9saWN5
-LnBkZjCB9wYIKwYBBQUHAgIwgeowJxYgU3RhcnRDb20gQ2VydGlmaWNhdGlvbiBB
-dXRob3JpdHkwAwIBARqBvlRoaXMgY2VydGlmaWNhdGUgd2FzIGlzc3VlZCBhY2Nv
-cmRpbmcgdG8gdGhlIENsYXNzIDEgVmFsaWRhdGlvbiByZXF1aXJlbWVudHMgb2Yg
-dGhlIFN0YXJ0Q29tIENBIHBvbGljeSwgcmVsaWFuY2Ugb25seSBmb3IgdGhlIGlu
-dGVuZGVkIHB1cnBvc2UgaW4gY29tcGxpYW5jZSBvZiB0aGUgcmVseWluZyBwYXJ0
-eSBvYmxpZ2F0aW9ucy4wNQYDVR0fBC4wLDAqoCigJoYkaHR0cDovL2NybC5zdGFy
-dHNzbC5jb20vY3J0MS1jcmwuY3JsMIGOBggrBgEFBQcBAQSBgTB/MDkGCCsGAQUF
-BzABhi1odHRwOi8vb2NzcC5zdGFydHNzbC5jb20vc3ViL2NsYXNzMS9zZXJ2ZXIv
-Y2EwQgYIKwYBBQUHMAKGNmh0dHA6Ly9haWEuc3RhcnRzc2wuY29tL2NlcnRzL3N1
-Yi5jbGFzczEuc2VydmVyLmNhLmNydDAjBgNVHRIEHDAahhhodHRwOi8vd3d3LnN0
-YXJ0c3NsLmNvbS8wDQYJKoZIhvcNAQEFBQADggEBADsAzhJo+3OBmR08KLDzjjJY
-cuTq6CMwo8j6PELtWnr97Dr4TBcWXTRPXkXGnWERfKqOEhPAgsbkitcQV6/kF3wg
-r75AanfGFXEperOnsACBtiHf7MExrtlZRP1VmktJha6wJwSo4r8BX1YVcNoLUxre
-5AVtbXzVouJwK+nTzeiUGJg+nw0unobLasACKJeTVfmSjBGjtavax0u2nPNNHwiG
-cXDDrP+n+KWYguTeN55pKswkK7N0ow76p1/SgqYtsubspQYP/rLIECOwGo0vxwgA
-+9mTyRFXs+eBLhsogDkCQFvEalTpa/7Ac0gRCeUI5Dw4JozFo+eqGV5lrJAiMh8=
-</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>dev1.redclara.net</ds:KeyName>
-        <ds:KeyName>redclara.net</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>emailAddress=webmaster@redclara.net,CN=dev1.redclara.net,C=CO,description=QPUmXyZ3gm091N6p</ds:X509SubjectName>
-          <ds:X509Certificate>MIIGWzCCBUOgAwIBAgIDEL2nMA0GCSqGSIb3DQEBBQUAMIGMMQswCQYDVQQGEwJJ
-TDEWMBQGA1UEChMNU3RhcnRDb20gTHRkLjErMCkGA1UECxMiU2VjdXJlIERpZ2l0
-YWwgQ2VydGlmaWNhdGUgU2lnbmluZzE4MDYGA1UEAxMvU3RhcnRDb20gQ2xhc3Mg
-MSBQcmltYXJ5IEludGVybWVkaWF0ZSBTZXJ2ZXIgQ0EwHhcNMTQwNTI2MjMxMTM2
-WhcNMTUwNTI4MTI0NTI3WjBrMRkwFwYDVQQNExBRUFVtWHlaM2dtMDkxTjZwMQsw
-CQYDVQQGEwJDTzEaMBgGA1UEAxMRZGV2MS5yZWRjbGFyYS5uZXQxJTAjBgkqhkiG
-9w0BCQEWFndlYm1hc3RlckByZWRjbGFyYS5uZXQwggEiMA0GCSqGSIb3DQEBAQUA
-A4IBDwAwggEKAoIBAQDbnJsFWPS0QzTxLy/QljN+fdU69hUiChmyPx8c6asT0cy+
-daDvHXpRqTZXB7DuZdd4B8JVCdSth52/oyBpgQpIhF19bpzvVNmyBtS0Xp6w5NN7
-GfIoEA8MGO4H9VdUNio1sJLUTE8a/J33DJdk1RkH5ucJLYdK0nph1yasusWHnSBJ
-VOC3Ea9Hv/yJxoSlHrOs0Sr4UxucVTmgQSU7Wd/0Mq86cHXJ1/lOaWl4+VwbBGXt
-CTCTpUBIHJa8ufH9kyAMtLb4gCXCR48aWIF18SaM8J5/HgXABpwKuVePUqg4TTkU
-c0SSy1gpFA7IKhW4e8jODE89UrEpaLBi+/ke1Ba7AgMBAAGjggLkMIIC4DAJBgNV
-HRMEAjAAMAsGA1UdDwQEAwIDqDATBgNVHSUEDDAKBggrBgEFBQcDATAdBgNVHQ4E
-FgQUYk4lJIBf4VCDLPFliL5UPeZFtlswHwYDVR0jBBgwFoAU60I00Jiwq5/0G2sI
-98xkLu8OLEUwKgYDVR0RBCMwIYIRZGV2MS5yZWRjbGFyYS5uZXSCDHJlZGNsYXJh
-Lm5ldDCCAVYGA1UdIASCAU0wggFJMAgGBmeBDAECATCCATsGCysGAQQBgbU3AQID
-MIIBKjAuBggrBgEFBQcCARYiaHR0cDovL3d3dy5zdGFydHNzbC5jb20vcG9saWN5
-LnBkZjCB9wYIKwYBBQUHAgIwgeowJxYgU3RhcnRDb20gQ2VydGlmaWNhdGlvbiBB
-dXRob3JpdHkwAwIBARqBvlRoaXMgY2VydGlmaWNhdGUgd2FzIGlzc3VlZCBhY2Nv
-cmRpbmcgdG8gdGhlIENsYXNzIDEgVmFsaWRhdGlvbiByZXF1aXJlbWVudHMgb2Yg
-dGhlIFN0YXJ0Q29tIENBIHBvbGljeSwgcmVsaWFuY2Ugb25seSBmb3IgdGhlIGlu
-dGVuZGVkIHB1cnBvc2UgaW4gY29tcGxpYW5jZSBvZiB0aGUgcmVseWluZyBwYXJ0
-eSBvYmxpZ2F0aW9ucy4wNQYDVR0fBC4wLDAqoCigJoYkaHR0cDovL2NybC5zdGFy
-dHNzbC5jb20vY3J0MS1jcmwuY3JsMIGOBggrBgEFBQcBAQSBgTB/MDkGCCsGAQUF
-BzABhi1odHRwOi8vb2NzcC5zdGFydHNzbC5jb20vc3ViL2NsYXNzMS9zZXJ2ZXIv
-Y2EwQgYIKwYBBQUHMAKGNmh0dHA6Ly9haWEuc3RhcnRzc2wuY29tL2NlcnRzL3N1
-Yi5jbGFzczEuc2VydmVyLmNhLmNydDAjBgNVHRIEHDAahhhodHRwOi8vd3d3LnN0
-YXJ0c3NsLmNvbS8wDQYJKoZIhvcNAQEFBQADggEBADsAzhJo+3OBmR08KLDzjjJY
-cuTq6CMwo8j6PELtWnr97Dr4TBcWXTRPXkXGnWERfKqOEhPAgsbkitcQV6/kF3wg
-r75AanfGFXEperOnsACBtiHf7MExrtlZRP1VmktJha6wJwSo4r8BX1YVcNoLUxre
-5AVtbXzVouJwK+nTzeiUGJg+nw0unobLasACKJeTVfmSjBGjtavax0u2nPNNHwiG
-cXDDrP+n+KWYguTeN55pKswkK7N0ow76p1/SgqYtsubspQYP/rLIECOwGo0vxwgA
-+9mTyRFXs+eBLhsogDkCQFvEalTpa/7Ac0gRCeUI5Dw4JozFo+eqGV5lrJAiMh8=
-</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/dev1.redclara.net.xml b/swamid-interfederations-2.0/dev1.redclara.net.xml
deleted file mode 100644
index c2f139ff..00000000
--- a/swamid-interfederations-2.0/dev1.redclara.net.xml
+++ /dev/null
@@ -1,145 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" 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>dev1.redclara.net</ds:KeyName>
-        <ds:KeyName>redclara.net</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>emailAddress=webmaster@redclara.net,CN=dev1.redclara.net,C=CO,description=QPUmXyZ3gm091N6p</ds:X509SubjectName>
-          <ds:X509Certificate>MIIGWzCCBUOgAwIBAgIDEL2nMA0GCSqGSIb3DQEBBQUAMIGMMQswCQYDVQQGEwJJ
-TDEWMBQGA1UEChMNU3RhcnRDb20gTHRkLjErMCkGA1UECxMiU2VjdXJlIERpZ2l0
-YWwgQ2VydGlmaWNhdGUgU2lnbmluZzE4MDYGA1UEAxMvU3RhcnRDb20gQ2xhc3Mg
-MSBQcmltYXJ5IEludGVybWVkaWF0ZSBTZXJ2ZXIgQ0EwHhcNMTQwNTI2MjMxMTM2
-WhcNMTUwNTI4MTI0NTI3WjBrMRkwFwYDVQQNExBRUFVtWHlaM2dtMDkxTjZwMQsw
-CQYDVQQGEwJDTzEaMBgGA1UEAxMRZGV2MS5yZWRjbGFyYS5uZXQxJTAjBgkqhkiG
-9w0BCQEWFndlYm1hc3RlckByZWRjbGFyYS5uZXQwggEiMA0GCSqGSIb3DQEBAQUA
-A4IBDwAwggEKAoIBAQDbnJsFWPS0QzTxLy/QljN+fdU69hUiChmyPx8c6asT0cy+
-daDvHXpRqTZXB7DuZdd4B8JVCdSth52/oyBpgQpIhF19bpzvVNmyBtS0Xp6w5NN7
-GfIoEA8MGO4H9VdUNio1sJLUTE8a/J33DJdk1RkH5ucJLYdK0nph1yasusWHnSBJ
-VOC3Ea9Hv/yJxoSlHrOs0Sr4UxucVTmgQSU7Wd/0Mq86cHXJ1/lOaWl4+VwbBGXt
-CTCTpUBIHJa8ufH9kyAMtLb4gCXCR48aWIF18SaM8J5/HgXABpwKuVePUqg4TTkU
-c0SSy1gpFA7IKhW4e8jODE89UrEpaLBi+/ke1Ba7AgMBAAGjggLkMIIC4DAJBgNV
-HRMEAjAAMAsGA1UdDwQEAwIDqDATBgNVHSUEDDAKBggrBgEFBQcDATAdBgNVHQ4E
-FgQUYk4lJIBf4VCDLPFliL5UPeZFtlswHwYDVR0jBBgwFoAU60I00Jiwq5/0G2sI
-98xkLu8OLEUwKgYDVR0RBCMwIYIRZGV2MS5yZWRjbGFyYS5uZXSCDHJlZGNsYXJh
-Lm5ldDCCAVYGA1UdIASCAU0wggFJMAgGBmeBDAECATCCATsGCysGAQQBgbU3AQID
-MIIBKjAuBggrBgEFBQcCARYiaHR0cDovL3d3dy5zdGFydHNzbC5jb20vcG9saWN5
-LnBkZjCB9wYIKwYBBQUHAgIwgeowJxYgU3RhcnRDb20gQ2VydGlmaWNhdGlvbiBB
-dXRob3JpdHkwAwIBARqBvlRoaXMgY2VydGlmaWNhdGUgd2FzIGlzc3VlZCBhY2Nv
-cmRpbmcgdG8gdGhlIENsYXNzIDEgVmFsaWRhdGlvbiByZXF1aXJlbWVudHMgb2Yg
-dGhlIFN0YXJ0Q29tIENBIHBvbGljeSwgcmVsaWFuY2Ugb25seSBmb3IgdGhlIGlu
-dGVuZGVkIHB1cnBvc2UgaW4gY29tcGxpYW5jZSBvZiB0aGUgcmVseWluZyBwYXJ0
-eSBvYmxpZ2F0aW9ucy4wNQYDVR0fBC4wLDAqoCigJoYkaHR0cDovL2NybC5zdGFy
-dHNzbC5jb20vY3J0MS1jcmwuY3JsMIGOBggrBgEFBQcBAQSBgTB/MDkGCCsGAQUF
-BzABhi1odHRwOi8vb2NzcC5zdGFydHNzbC5jb20vc3ViL2NsYXNzMS9zZXJ2ZXIv
-Y2EwQgYIKwYBBQUHMAKGNmh0dHA6Ly9haWEuc3RhcnRzc2wuY29tL2NlcnRzL3N1
-Yi5jbGFzczEuc2VydmVyLmNhLmNydDAjBgNVHRIEHDAahhhodHRwOi8vd3d3LnN0
-YXJ0c3NsLmNvbS8wDQYJKoZIhvcNAQEFBQADggEBADsAzhJo+3OBmR08KLDzjjJY
-cuTq6CMwo8j6PELtWnr97Dr4TBcWXTRPXkXGnWERfKqOEhPAgsbkitcQV6/kF3wg
-r75AanfGFXEperOnsACBtiHf7MExrtlZRP1VmktJha6wJwSo4r8BX1YVcNoLUxre
-5AVtbXzVouJwK+nTzeiUGJg+nw0unobLasACKJeTVfmSjBGjtavax0u2nPNNHwiG
-cXDDrP+n+KWYguTeN55pKswkK7N0ow76p1/SgqYtsubspQYP/rLIECOwGo0vxwgA
-+9mTyRFXs+eBLhsogDkCQFvEalTpa/7Ac0gRCeUI5Dw4JozFo+eqGV5lrJAiMh8=
-</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>dev1.redclara.net</ds:KeyName>
-        <ds:KeyName>redclara.net</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>emailAddress=webmaster@redclara.net,CN=dev1.redclara.net,C=CO,description=QPUmXyZ3gm091N6p</ds:X509SubjectName>
-          <ds:X509Certificate>MIIGWzCCBUOgAwIBAgIDEL2nMA0GCSqGSIb3DQEBBQUAMIGMMQswCQYDVQQGEwJJ
-TDEWMBQGA1UEChMNU3RhcnRDb20gTHRkLjErMCkGA1UECxMiU2VjdXJlIERpZ2l0
-YWwgQ2VydGlmaWNhdGUgU2lnbmluZzE4MDYGA1UEAxMvU3RhcnRDb20gQ2xhc3Mg
-MSBQcmltYXJ5IEludGVybWVkaWF0ZSBTZXJ2ZXIgQ0EwHhcNMTQwNTI2MjMxMTM2
-WhcNMTUwNTI4MTI0NTI3WjBrMRkwFwYDVQQNExBRUFVtWHlaM2dtMDkxTjZwMQsw
-CQYDVQQGEwJDTzEaMBgGA1UEAxMRZGV2MS5yZWRjbGFyYS5uZXQxJTAjBgkqhkiG
-9w0BCQEWFndlYm1hc3RlckByZWRjbGFyYS5uZXQwggEiMA0GCSqGSIb3DQEBAQUA
-A4IBDwAwggEKAoIBAQDbnJsFWPS0QzTxLy/QljN+fdU69hUiChmyPx8c6asT0cy+
-daDvHXpRqTZXB7DuZdd4B8JVCdSth52/oyBpgQpIhF19bpzvVNmyBtS0Xp6w5NN7
-GfIoEA8MGO4H9VdUNio1sJLUTE8a/J33DJdk1RkH5ucJLYdK0nph1yasusWHnSBJ
-VOC3Ea9Hv/yJxoSlHrOs0Sr4UxucVTmgQSU7Wd/0Mq86cHXJ1/lOaWl4+VwbBGXt
-CTCTpUBIHJa8ufH9kyAMtLb4gCXCR48aWIF18SaM8J5/HgXABpwKuVePUqg4TTkU
-c0SSy1gpFA7IKhW4e8jODE89UrEpaLBi+/ke1Ba7AgMBAAGjggLkMIIC4DAJBgNV
-HRMEAjAAMAsGA1UdDwQEAwIDqDATBgNVHSUEDDAKBggrBgEFBQcDATAdBgNVHQ4E
-FgQUYk4lJIBf4VCDLPFliL5UPeZFtlswHwYDVR0jBBgwFoAU60I00Jiwq5/0G2sI
-98xkLu8OLEUwKgYDVR0RBCMwIYIRZGV2MS5yZWRjbGFyYS5uZXSCDHJlZGNsYXJh
-Lm5ldDCCAVYGA1UdIASCAU0wggFJMAgGBmeBDAECATCCATsGCysGAQQBgbU3AQID
-MIIBKjAuBggrBgEFBQcCARYiaHR0cDovL3d3dy5zdGFydHNzbC5jb20vcG9saWN5
-LnBkZjCB9wYIKwYBBQUHAgIwgeowJxYgU3RhcnRDb20gQ2VydGlmaWNhdGlvbiBB
-dXRob3JpdHkwAwIBARqBvlRoaXMgY2VydGlmaWNhdGUgd2FzIGlzc3VlZCBhY2Nv
-cmRpbmcgdG8gdGhlIENsYXNzIDEgVmFsaWRhdGlvbiByZXF1aXJlbWVudHMgb2Yg
-dGhlIFN0YXJ0Q29tIENBIHBvbGljeSwgcmVsaWFuY2Ugb25seSBmb3IgdGhlIGlu
-dGVuZGVkIHB1cnBvc2UgaW4gY29tcGxpYW5jZSBvZiB0aGUgcmVseWluZyBwYXJ0
-eSBvYmxpZ2F0aW9ucy4wNQYDVR0fBC4wLDAqoCigJoYkaHR0cDovL2NybC5zdGFy
-dHNzbC5jb20vY3J0MS1jcmwuY3JsMIGOBggrBgEFBQcBAQSBgTB/MDkGCCsGAQUF
-BzABhi1odHRwOi8vb2NzcC5zdGFydHNzbC5jb20vc3ViL2NsYXNzMS9zZXJ2ZXIv
-Y2EwQgYIKwYBBQUHMAKGNmh0dHA6Ly9haWEuc3RhcnRzc2wuY29tL2NlcnRzL3N1
-Yi5jbGFzczEuc2VydmVyLmNhLmNydDAjBgNVHRIEHDAahhhodHRwOi8vd3d3LnN0
-YXJ0c3NsLmNvbS8wDQYJKoZIhvcNAQEFBQADggEBADsAzhJo+3OBmR08KLDzjjJY
-cuTq6CMwo8j6PELtWnr97Dr4TBcWXTRPXkXGnWERfKqOEhPAgsbkitcQV6/kF3wg
-r75AanfGFXEperOnsACBtiHf7MExrtlZRP1VmktJha6wJwSo4r8BX1YVcNoLUxre
-5AVtbXzVouJwK+nTzeiUGJg+nw0unobLasACKJeTVfmSjBGjtavax0u2nPNNHwiG
-cXDDrP+n+KWYguTeN55pKswkK7N0ow76p1/SgqYtsubspQYP/rLIECOwGo0vxwgA
-+9mTyRFXs+eBLhsogDkCQFvEalTpa/7Ac0gRCeUI5Dw4JozFo+eqGV5lrJAiMh8=
-</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/dev2.dariah.eu-shibboleth.xml b/swamid-interfederations-2.0/dev2.dariah.eu-shibboleth.xml
deleted file mode 100644
index 1a2ed256..00000000
--- a/swamid-interfederations-2.0/dev2.dariah.eu-shibboleth.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://dev2.dariah.eu/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2014-04-11T07:19:21Z">
-      <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://dev2.dariah.eu/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="de">Dariah Wiki</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Dariah Wiki</mdui:DisplayName>
-        <mdui:Description xml:lang="de">DARIAH-DE Wiki</mdui:Description>
-        <mdui:Description xml:lang="en">DARIAH-DE Wiki</mdui:Description>
-        <mdui:Logo height="16" width="16">https://ldap-dariah.esc.rzg.mpg.de/images/DARIAH_flower_icon.png</mdui:Logo>
-        <mdui:Logo height="154" width="160">https://ldap-dariah.esc.rzg.mpg.de/images/DARIAH_flower.png</mdui:Logo>
-        <mdui:InformationURL xml:lang="de">http://www.dariah.eu/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">http://www.dariah.eu/</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://de.dariah.eu/ServicePrivacyPolicy</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>wiki.de.dariah.eu</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=wiki.de.dariah.eu,O=Georg-August-Universitaet Goettingen,L=Goettingen,ST=Niedersachsen,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIF/jCCBOagAwIBAgIHF2tAlMzjKDANBgkqhkiG9w0BAQUFADCBrjELMAkGA1UE
-BhMCREUxFjAUBgNVBAgTDU5pZWRlcnNhY2hzZW4xEzARBgNVBAcTCkdvZXR0aW5n
-ZW4xLTArBgNVBAoTJEdlb3JnLUF1Z3VzdC1Vbml2ZXJzaXRhZXQgR29ldHRpbmdl
-bjEjMCEGA1UEAxMaVW5pdmVyc2l0YWV0LUdvZXR0aW5nZW4gQ0ExHjAcBgkqhkiG
-9w0BCQEWD2d3ZGctY2FAZ3dkZy5kZTAeFw0xNDA0MTQxMTE0MTJaFw0xOTA0MTMx
-MTE0MTJaMIGFMQswCQYDVQQGEwJERTEWMBQGA1UECBMNTmllZGVyc2FjaHNlbjET
-MBEGA1UEBxMKR29ldHRpbmdlbjEtMCsGA1UEChMkR2VvcmctQXVndXN0LVVuaXZl
-cnNpdGFldCBHb2V0dGluZ2VuMRowGAYDVQQDExF3aWtpLmRlLmRhcmlhaC5ldTCC
-ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANGNzmj1hudMzfTvXsltAAWT
-fmN0YgnhUCSbZ67cUp487ZvCicwFdhcg2uLHxtbQO3HbLagQg4Xa8oWA/4odBWfW
-+CC3erj6Amqf+ypSVd/Rssd2Bq6Sm6zVNYC34cs0MOZaT06WQDyY9ygJyYhl4g04
-qAiCISpAbVy9TA81qwE0SCMfcj4mczClVg5nJHV93lRZZc7rzsC7xSWg2Akpv9TS
-uAfp5Ee0QfHeZl1Zsw9fWQAtumdFBlqU2uXBHBlwUN2xjwgX2j7vQJtllbOmQIDp
-ZkZjk26TIgbwrI7WPXjKAoTAEy+qAr7YL2b1oQbe+7BcJ4zhaM3yK3HOXRD1KAkC
-AwEAAaOCAkYwggJCMDkGA1UdIAQyMDAwEQYPKwYBBAGBrSGCLAEBBAMBMBEGDysG
-AQQBga0hgiwCAQQDATAIBgZngQwBAgIwCQYDVR0TBAIwADALBgNVHQ8EBAMCBPAw
-HQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMB0GA1UdDgQWBBQn2EIzO3GM
-hnk0ubTuQl5owPwJpDAfBgNVHSMEGDAWgBQdvXPMbe5uHHRw2aMbOrqoJ9686zAc
-BgNVHREEFTATghF3aWtpLmRlLmRhcmlhaC5ldTCBjwYDVR0fBIGHMIGEMECgPqA8
-hjpodHRwOi8vY2RwMS5wY2EuZGZuLmRlL3VuaS1nb2V0dGluZ2VuLWNhL3B1Yi9j
-cmwvY2FjcmwuY3JsMECgPqA8hjpodHRwOi8vY2RwMi5wY2EuZGZuLmRlL3VuaS1n
-b2V0dGluZ2VuLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMIHdBggrBgEFBQcBAQSB0DCB
-zTAzBggrBgEFBQcwAYYnaHR0cDovL29jc3AucGNhLmRmbi5kZS9PQ1NQLVNlcnZl
-ci9PQ1NQMEoGCCsGAQUFBzAChj5odHRwOi8vY2RwMS5wY2EuZGZuLmRlL3VuaS1n
-b2V0dGluZ2VuLWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDBKBggrBgEFBQcwAoY+
-aHR0cDovL2NkcDIucGNhLmRmbi5kZS91bmktZ29ldHRpbmdlbi1jYS9wdWIvY2Fj
-ZXJ0L2NhY2VydC5jcnQwDQYJKoZIhvcNAQEFBQADggEBADS62Nr+Hh7LJ50zukIm
-JcNJ4BIMP255g5DnYmpaaJ+IDLPvNPRAxT+zqMlFdDGr3xrb+cp4BDY1OQswZaoj
-AMLxXsjv1VAv3bhBGkl+NEyTa7qIGdayIuSutArAo8WXlLfMwR7yNmpiJ3QY8BEj
-CqGJcXyswPLLU7G7v+ChZSJbe4YJOy4IJ8OD9PgTR3FMteX6f6WGr5nWWBO0tZNP
-Fr2Mggyxt/CGpTSZ4kAkQJni1qqJ+QPEPQF59/fNNg4WQ4WBbd0wzKVmc4ikpcmI
-O+llrInqXrOgVYgVxBhaxDOQcWkF8zLxl/C+XbEtG4Z+YPH43usoid2uq541zAb5
-9B0=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dev2.dariah.eu/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://dev2.dariah.eu/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dev2.dariah.eu/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dev2.dariah.eu/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dev2.dariah.eu/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://dev2.dariah.eu/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dev2.dariah.eu/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://dev2.dariah.eu/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://dev2.dariah.eu/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://dev2.dariah.eu/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wiki.dariah.eu/Shibboleth.sso/SAML2/POST" index="7"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wiki.de.dariah.eu/Shibboleth.sso/SAML2/POST" index="8"/>
-    <AttributeConsumingService index="1">
-      <ServiceName xml:lang="de">Dariah Wiki</ServiceName>
-      <ServiceName xml:lang="en">Dariah Wiki</ServiceName>
-      <ServiceDescription xml:lang="de">DARIAH-DE Wiki</ServiceDescription>
-      <ServiceDescription xml:lang="en">DARIAH-DE Wiki</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="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"/>
-    </AttributeConsumingService>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">e112</OrganizationName>
-    <OrganizationName xml:lang="en">e112</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">Gesellschaft für wissenschaftliche Datenverarbeitung mbH</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">Gesellschaft für wissenschaftliche Datenverarbeitung mbH</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.gwdg.de</OrganizationURL>
-    <OrganizationURL xml:lang="en">http://www.gwdg.de</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Bernd</GivenName>
-    <SurName>Schlör</SurName>
-    <EmailAddress>mailto:bernd.schloer@sub.uni-goettingen.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="support">
-    <GivenName>Dariah</GivenName>
-    <SurName>Support</SurName>
-    <EmailAddress>mailto:register@dariah.eu</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/dev2.dariah.eu.xml b/swamid-interfederations-2.0/dev2.dariah.eu.xml
deleted file mode 100644
index 1a2ed256..00000000
--- a/swamid-interfederations-2.0/dev2.dariah.eu.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://dev2.dariah.eu/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2014-04-11T07:19:21Z">
-      <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://dev2.dariah.eu/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="de">Dariah Wiki</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Dariah Wiki</mdui:DisplayName>
-        <mdui:Description xml:lang="de">DARIAH-DE Wiki</mdui:Description>
-        <mdui:Description xml:lang="en">DARIAH-DE Wiki</mdui:Description>
-        <mdui:Logo height="16" width="16">https://ldap-dariah.esc.rzg.mpg.de/images/DARIAH_flower_icon.png</mdui:Logo>
-        <mdui:Logo height="154" width="160">https://ldap-dariah.esc.rzg.mpg.de/images/DARIAH_flower.png</mdui:Logo>
-        <mdui:InformationURL xml:lang="de">http://www.dariah.eu/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">http://www.dariah.eu/</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://de.dariah.eu/ServicePrivacyPolicy</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>wiki.de.dariah.eu</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=wiki.de.dariah.eu,O=Georg-August-Universitaet Goettingen,L=Goettingen,ST=Niedersachsen,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIF/jCCBOagAwIBAgIHF2tAlMzjKDANBgkqhkiG9w0BAQUFADCBrjELMAkGA1UE
-BhMCREUxFjAUBgNVBAgTDU5pZWRlcnNhY2hzZW4xEzARBgNVBAcTCkdvZXR0aW5n
-ZW4xLTArBgNVBAoTJEdlb3JnLUF1Z3VzdC1Vbml2ZXJzaXRhZXQgR29ldHRpbmdl
-bjEjMCEGA1UEAxMaVW5pdmVyc2l0YWV0LUdvZXR0aW5nZW4gQ0ExHjAcBgkqhkiG
-9w0BCQEWD2d3ZGctY2FAZ3dkZy5kZTAeFw0xNDA0MTQxMTE0MTJaFw0xOTA0MTMx
-MTE0MTJaMIGFMQswCQYDVQQGEwJERTEWMBQGA1UECBMNTmllZGVyc2FjaHNlbjET
-MBEGA1UEBxMKR29ldHRpbmdlbjEtMCsGA1UEChMkR2VvcmctQXVndXN0LVVuaXZl
-cnNpdGFldCBHb2V0dGluZ2VuMRowGAYDVQQDExF3aWtpLmRlLmRhcmlhaC5ldTCC
-ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANGNzmj1hudMzfTvXsltAAWT
-fmN0YgnhUCSbZ67cUp487ZvCicwFdhcg2uLHxtbQO3HbLagQg4Xa8oWA/4odBWfW
-+CC3erj6Amqf+ypSVd/Rssd2Bq6Sm6zVNYC34cs0MOZaT06WQDyY9ygJyYhl4g04
-qAiCISpAbVy9TA81qwE0SCMfcj4mczClVg5nJHV93lRZZc7rzsC7xSWg2Akpv9TS
-uAfp5Ee0QfHeZl1Zsw9fWQAtumdFBlqU2uXBHBlwUN2xjwgX2j7vQJtllbOmQIDp
-ZkZjk26TIgbwrI7WPXjKAoTAEy+qAr7YL2b1oQbe+7BcJ4zhaM3yK3HOXRD1KAkC
-AwEAAaOCAkYwggJCMDkGA1UdIAQyMDAwEQYPKwYBBAGBrSGCLAEBBAMBMBEGDysG
-AQQBga0hgiwCAQQDATAIBgZngQwBAgIwCQYDVR0TBAIwADALBgNVHQ8EBAMCBPAw
-HQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMB0GA1UdDgQWBBQn2EIzO3GM
-hnk0ubTuQl5owPwJpDAfBgNVHSMEGDAWgBQdvXPMbe5uHHRw2aMbOrqoJ9686zAc
-BgNVHREEFTATghF3aWtpLmRlLmRhcmlhaC5ldTCBjwYDVR0fBIGHMIGEMECgPqA8
-hjpodHRwOi8vY2RwMS5wY2EuZGZuLmRlL3VuaS1nb2V0dGluZ2VuLWNhL3B1Yi9j
-cmwvY2FjcmwuY3JsMECgPqA8hjpodHRwOi8vY2RwMi5wY2EuZGZuLmRlL3VuaS1n
-b2V0dGluZ2VuLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMIHdBggrBgEFBQcBAQSB0DCB
-zTAzBggrBgEFBQcwAYYnaHR0cDovL29jc3AucGNhLmRmbi5kZS9PQ1NQLVNlcnZl
-ci9PQ1NQMEoGCCsGAQUFBzAChj5odHRwOi8vY2RwMS5wY2EuZGZuLmRlL3VuaS1n
-b2V0dGluZ2VuLWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDBKBggrBgEFBQcwAoY+
-aHR0cDovL2NkcDIucGNhLmRmbi5kZS91bmktZ29ldHRpbmdlbi1jYS9wdWIvY2Fj
-ZXJ0L2NhY2VydC5jcnQwDQYJKoZIhvcNAQEFBQADggEBADS62Nr+Hh7LJ50zukIm
-JcNJ4BIMP255g5DnYmpaaJ+IDLPvNPRAxT+zqMlFdDGr3xrb+cp4BDY1OQswZaoj
-AMLxXsjv1VAv3bhBGkl+NEyTa7qIGdayIuSutArAo8WXlLfMwR7yNmpiJ3QY8BEj
-CqGJcXyswPLLU7G7v+ChZSJbe4YJOy4IJ8OD9PgTR3FMteX6f6WGr5nWWBO0tZNP
-Fr2Mggyxt/CGpTSZ4kAkQJni1qqJ+QPEPQF59/fNNg4WQ4WBbd0wzKVmc4ikpcmI
-O+llrInqXrOgVYgVxBhaxDOQcWkF8zLxl/C+XbEtG4Z+YPH43usoid2uq541zAb5
-9B0=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dev2.dariah.eu/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://dev2.dariah.eu/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dev2.dariah.eu/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dev2.dariah.eu/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dev2.dariah.eu/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://dev2.dariah.eu/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dev2.dariah.eu/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://dev2.dariah.eu/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://dev2.dariah.eu/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://dev2.dariah.eu/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wiki.dariah.eu/Shibboleth.sso/SAML2/POST" index="7"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wiki.de.dariah.eu/Shibboleth.sso/SAML2/POST" index="8"/>
-    <AttributeConsumingService index="1">
-      <ServiceName xml:lang="de">Dariah Wiki</ServiceName>
-      <ServiceName xml:lang="en">Dariah Wiki</ServiceName>
-      <ServiceDescription xml:lang="de">DARIAH-DE Wiki</ServiceDescription>
-      <ServiceDescription xml:lang="en">DARIAH-DE Wiki</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="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"/>
-    </AttributeConsumingService>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">e112</OrganizationName>
-    <OrganizationName xml:lang="en">e112</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">Gesellschaft für wissenschaftliche Datenverarbeitung mbH</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">Gesellschaft für wissenschaftliche Datenverarbeitung mbH</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.gwdg.de</OrganizationURL>
-    <OrganizationURL xml:lang="en">http://www.gwdg.de</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Bernd</GivenName>
-    <SurName>Schlör</SurName>
-    <EmailAddress>mailto:bernd.schloer@sub.uni-goettingen.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="support">
-    <GivenName>Dariah</GivenName>
-    <SurName>Support</SurName>
-    <EmailAddress>mailto:register@dariah.eu</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/dimorus.intranet.ifrj.edu.br-idp-shibboleth.xml b/swamid-interfederations-2.0/dimorus.intranet.ifrj.edu.br-idp-shibboleth.xml
deleted file mode 100644
index 03f072ae..00000000
--- a/swamid-interfederations-2.0/dimorus.intranet.ifrj.edu.br-idp-shibboleth.xml
+++ /dev/null
@@ -1,102 +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://dimorus.intranet.ifrj.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">edu.br</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">IFRJ - Instituto Federal do Rio de Janeiro</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="pt-br">IFRJ - Instituto Federal do Rio de Janeiro</mdui:DisplayName>
-        <mdui:Description xml:lang="en">IFRJ - Instituto Federal do Rio de Janeiro</mdui:Description>
-        <mdui:Description xml:lang="pt-br">IFRJ - Instituto Federal do Rio de Janeiro</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.ifrj.edu.br</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="pt-br">http://www.ifrj.edu.br</mdui:InformationURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-    MIIC0DCCAbgCAQAwDQYJKoZIhvcNAQEFBQAwLjENMAsGA1UECxMEREdUSTELMAkG
-A1UEBhMCQlIxEDAOBgNVBAMTB2RpbW9ydXMwHhcNMTQwNDA5MTcwMTQ3WhcNMTkw
-NDA4MTcwMTQ3WjAuMQ0wCwYDVQQLEwRER1RJMQswCQYDVQQGEwJCUjEQMA4GA1UE
-AxMHZGltb3J1czCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAN+zv7Fr
-iJbUyXPbTej3P+7DuIYOC/YhVThF56xHKmntH1m8Qof5ehdEe3OAxPzh9PeleDXv
-qycvCDGZK5BRJkPhb8kC0N6oJy9DMuSLFgrPVJAmdka1tuIoADCKZ3Cq2bjMmTJH
-El5bc5GLmGc3J2BYYHIOIidVDXbNb52aqO71KP2ZoohTw2tHv0KseLqAqs4N1tn6
-U90x5zPrBxH4Q/wyV9yiaAjfY+ZEt4yG79lU0bwEpMQUF4Rgeq3ix44z3YYa/sY0
-Tlw//U3AbIpbfUKFj4eTZVeo/JJzSf+yRIz7OM/seE5IGOcXy+VnEM8GMq9/sCxx
-byFREAOJlFuSuDUCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAlN7MaEE3P59cno17
-nLTjRIIx7+IGaaOliaLqrD9MKtfNpc9AQNxh911C9/wP7ax1H/Q9un7WdzKOSpjt
-4iDmdOUkdZYXRP7DQvPgaH+xM3D/FlfjzlGmlXFl2VBRN5PaYDr9UGIJ8MBWp5La
-H65ef+sYS/MDc3GsIJocQdeKj1gRIUrBHHdy7vPn8Mk5kxCMddrPr5qA/jaKQOcY
-ZDJp0MNni0s8IGKGWgE6NrBSRTlI+T0vhjBMaTyWu/ypieYfqx2k80H31QuruJP4
-9nhL66LJ5uOeEkGubA7gBXLLjgv98TqdIw0MvFJPjfaK0RO5TUy79N7rSpp+Bk9e
-w/aOYw==
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dimorus.intranet.ifrj.edu.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://dimorus.intranet.ifrj.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://dimorus.intranet.ifrj.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dimorus.intranet.ifrj.edu.br/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://dimorus.intranet.ifrj.edu.br/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://dimorus.intranet.ifrj.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>
-      
-MIIC0DCCAbgCAQAwDQYJKoZIhvcNAQEFBQAwLjENMAsGA1UECxMEREdUSTELMAkG
-A1UEBhMCQlIxEDAOBgNVBAMTB2RpbW9ydXMwHhcNMTQwNDA5MTcwMTQ3WhcNMTkw
-NDA4MTcwMTQ3WjAuMQ0wCwYDVQQLEwRER1RJMQswCQYDVQQGEwJCUjEQMA4GA1UE
-AxMHZGltb3J1czCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAN+zv7Fr
-iJbUyXPbTej3P+7DuIYOC/YhVThF56xHKmntH1m8Qof5ehdEe3OAxPzh9PeleDXv
-qycvCDGZK5BRJkPhb8kC0N6oJy9DMuSLFgrPVJAmdka1tuIoADCKZ3Cq2bjMmTJH
-El5bc5GLmGc3J2BYYHIOIidVDXbNb52aqO71KP2ZoohTw2tHv0KseLqAqs4N1tn6
-U90x5zPrBxH4Q/wyV9yiaAjfY+ZEt4yG79lU0bwEpMQUF4Rgeq3ix44z3YYa/sY0
-Tlw//U3AbIpbfUKFj4eTZVeo/JJzSf+yRIz7OM/seE5IGOcXy+VnEM8GMq9/sCxx
-byFREAOJlFuSuDUCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAlN7MaEE3P59cno17
-nLTjRIIx7+IGaaOliaLqrD9MKtfNpc9AQNxh911C9/wP7ax1H/Q9un7WdzKOSpjt
-4iDmdOUkdZYXRP7DQvPgaH+xM3D/FlfjzlGmlXFl2VBRN5PaYDr9UGIJ8MBWp5La
-H65ef+sYS/MDc3GsIJocQdeKj1gRIUrBHHdy7vPn8Mk5kxCMddrPr5qA/jaKQOcY
-ZDJp0MNni0s8IGKGWgE6NrBSRTlI+T0vhjBMaTyWu/ypieYfqx2k80H31QuruJP4
-9nhL66LJ5uOeEkGubA7gBXLLjgv98TqdIw0MvFJPjfaK0RO5TUy79N7rSpp+Bk9e
-w/aOYw==
-                    
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dimorus.intranet.ifrj.edu.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://dimorus.intranet.ifrj.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">IFRJ - Instituto Federal do Rio de Janeiro</OrganizationName>
-    <OrganizationName xml:lang="pt-br">IFRJ - Instituto Federal do Rio de Janeiro</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">IFRJ - Instituto Federal do Rio de Janeiro</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="pt-br">IFRJ - Instituto Federal do Rio de Janeiro</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.ifrj.edu.br</OrganizationURL>
-    <OrganizationURL xml:lang="pt-br">http://www.ifrj.edu.br</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Marcos Velten</SurName>
-    <EmailAddress>suporte@ifrj.edu.br</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/dimorus.intranet.ifrj.edu.br.xml b/swamid-interfederations-2.0/dimorus.intranet.ifrj.edu.br.xml
deleted file mode 100644
index 03f072ae..00000000
--- a/swamid-interfederations-2.0/dimorus.intranet.ifrj.edu.br.xml
+++ /dev/null
@@ -1,102 +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://dimorus.intranet.ifrj.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">edu.br</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">IFRJ - Instituto Federal do Rio de Janeiro</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="pt-br">IFRJ - Instituto Federal do Rio de Janeiro</mdui:DisplayName>
-        <mdui:Description xml:lang="en">IFRJ - Instituto Federal do Rio de Janeiro</mdui:Description>
-        <mdui:Description xml:lang="pt-br">IFRJ - Instituto Federal do Rio de Janeiro</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.ifrj.edu.br</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="pt-br">http://www.ifrj.edu.br</mdui:InformationURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-    MIIC0DCCAbgCAQAwDQYJKoZIhvcNAQEFBQAwLjENMAsGA1UECxMEREdUSTELMAkG
-A1UEBhMCQlIxEDAOBgNVBAMTB2RpbW9ydXMwHhcNMTQwNDA5MTcwMTQ3WhcNMTkw
-NDA4MTcwMTQ3WjAuMQ0wCwYDVQQLEwRER1RJMQswCQYDVQQGEwJCUjEQMA4GA1UE
-AxMHZGltb3J1czCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAN+zv7Fr
-iJbUyXPbTej3P+7DuIYOC/YhVThF56xHKmntH1m8Qof5ehdEe3OAxPzh9PeleDXv
-qycvCDGZK5BRJkPhb8kC0N6oJy9DMuSLFgrPVJAmdka1tuIoADCKZ3Cq2bjMmTJH
-El5bc5GLmGc3J2BYYHIOIidVDXbNb52aqO71KP2ZoohTw2tHv0KseLqAqs4N1tn6
-U90x5zPrBxH4Q/wyV9yiaAjfY+ZEt4yG79lU0bwEpMQUF4Rgeq3ix44z3YYa/sY0
-Tlw//U3AbIpbfUKFj4eTZVeo/JJzSf+yRIz7OM/seE5IGOcXy+VnEM8GMq9/sCxx
-byFREAOJlFuSuDUCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAlN7MaEE3P59cno17
-nLTjRIIx7+IGaaOliaLqrD9MKtfNpc9AQNxh911C9/wP7ax1H/Q9un7WdzKOSpjt
-4iDmdOUkdZYXRP7DQvPgaH+xM3D/FlfjzlGmlXFl2VBRN5PaYDr9UGIJ8MBWp5La
-H65ef+sYS/MDc3GsIJocQdeKj1gRIUrBHHdy7vPn8Mk5kxCMddrPr5qA/jaKQOcY
-ZDJp0MNni0s8IGKGWgE6NrBSRTlI+T0vhjBMaTyWu/ypieYfqx2k80H31QuruJP4
-9nhL66LJ5uOeEkGubA7gBXLLjgv98TqdIw0MvFJPjfaK0RO5TUy79N7rSpp+Bk9e
-w/aOYw==
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dimorus.intranet.ifrj.edu.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://dimorus.intranet.ifrj.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://dimorus.intranet.ifrj.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dimorus.intranet.ifrj.edu.br/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://dimorus.intranet.ifrj.edu.br/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://dimorus.intranet.ifrj.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>
-      
-MIIC0DCCAbgCAQAwDQYJKoZIhvcNAQEFBQAwLjENMAsGA1UECxMEREdUSTELMAkG
-A1UEBhMCQlIxEDAOBgNVBAMTB2RpbW9ydXMwHhcNMTQwNDA5MTcwMTQ3WhcNMTkw
-NDA4MTcwMTQ3WjAuMQ0wCwYDVQQLEwRER1RJMQswCQYDVQQGEwJCUjEQMA4GA1UE
-AxMHZGltb3J1czCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAN+zv7Fr
-iJbUyXPbTej3P+7DuIYOC/YhVThF56xHKmntH1m8Qof5ehdEe3OAxPzh9PeleDXv
-qycvCDGZK5BRJkPhb8kC0N6oJy9DMuSLFgrPVJAmdka1tuIoADCKZ3Cq2bjMmTJH
-El5bc5GLmGc3J2BYYHIOIidVDXbNb52aqO71KP2ZoohTw2tHv0KseLqAqs4N1tn6
-U90x5zPrBxH4Q/wyV9yiaAjfY+ZEt4yG79lU0bwEpMQUF4Rgeq3ix44z3YYa/sY0
-Tlw//U3AbIpbfUKFj4eTZVeo/JJzSf+yRIz7OM/seE5IGOcXy+VnEM8GMq9/sCxx
-byFREAOJlFuSuDUCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAlN7MaEE3P59cno17
-nLTjRIIx7+IGaaOliaLqrD9MKtfNpc9AQNxh911C9/wP7ax1H/Q9un7WdzKOSpjt
-4iDmdOUkdZYXRP7DQvPgaH+xM3D/FlfjzlGmlXFl2VBRN5PaYDr9UGIJ8MBWp5La
-H65ef+sYS/MDc3GsIJocQdeKj1gRIUrBHHdy7vPn8Mk5kxCMddrPr5qA/jaKQOcY
-ZDJp0MNni0s8IGKGWgE6NrBSRTlI+T0vhjBMaTyWu/ypieYfqx2k80H31QuruJP4
-9nhL66LJ5uOeEkGubA7gBXLLjgv98TqdIw0MvFJPjfaK0RO5TUy79N7rSpp+Bk9e
-w/aOYw==
-                    
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dimorus.intranet.ifrj.edu.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://dimorus.intranet.ifrj.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">IFRJ - Instituto Federal do Rio de Janeiro</OrganizationName>
-    <OrganizationName xml:lang="pt-br">IFRJ - Instituto Federal do Rio de Janeiro</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">IFRJ - Instituto Federal do Rio de Janeiro</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="pt-br">IFRJ - Instituto Federal do Rio de Janeiro</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.ifrj.edu.br</OrganizationURL>
-    <OrganizationURL xml:lang="pt-br">http://www.ifrj.edu.br</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Marcos Velten</SurName>
-    <EmailAddress>suporte@ifrj.edu.br</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/doccom.iml.unibe.ch-shibboleth.xml b/swamid-interfederations-2.0/doccom.iml.unibe.ch-shibboleth.xml
deleted file mode 100644
index 40531cb7..00000000
--- a/swamid-interfederations-2.0/doccom.iml.unibe.ch-shibboleth.xml
+++ /dev/null
@@ -1,88 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://doccom.iml.unibe.ch/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://rr.aai.switch.ch/" registrationInstant="2014-09-08T10:55:32Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.switch.ch/aai/federation/switchaai/metadata-registration-practice-statement-20110711.txt</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:2.0:protocol">
-    <Extensions>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="de">DOCCOM  Deutsch Universität Bern</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">DOCCOM  German University Bern</mdui:DisplayName>
-        <mdui:Description xml:lang="de">DOCCOM Deutsch, Institut für medezinische Lehre, Universität Bern</mdui:Description>
-        <mdui:Description xml:lang="en">DOCCOM German, Institute for medical Education, University Bern</mdui:Description>
-        <mdui:PrivacyStatementURL xml:lang="en">https://doccom.iml.unibe.ch/Customizing/global/agreement/privacypolicy_en.html</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDKDCCAhCgAwIBAgIJAMU8stHHiSQ3MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE2RvY2NvbS5pbWwudW5pYmUuY2gwHhcNMTQwNDEwMDc1NzI5WhcNMTcwNDA5
-MDc1NzI5WjAeMRwwGgYDVQQDExNkb2Njb20uaW1sLnVuaWJlLmNoMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA081f+9+P/zwCwB/xPFLGYr/Olry6Ald8
-/VCcXHiO9V9OAezmSzMRfILyPLcpKZNl4rKmy3vcc67UzuJ+xA0SgzrsyqsOmxJc
-eAnPh58vkrhTooaP6JyXSV9rvrxA01m6TZMFjFJmljZ+5kmixjZ4F+zY9eBsXTXD
-utznEzh0DP1Ds6pL+eYeFezHlSSke4OhWDNVvCUSR3wE4IyImhc0afNhm7g8TOOm
-v/XavhPEw7xJBk40ivm9as/VjEe/Hu52C6McfJAUH2dyyG29jgqsFuMRDJd2zaU5
-1H+2Oxn7qLilqJ0nnbRck2RL5A2z/nOt8X4pBT6g4nBfrj+2zFA+PQIDAQABo2kw
-ZzBGBgNVHREEPzA9ghNkb2Njb20uaW1sLnVuaWJlLmNohiZodHRwczovL2RvY2Nv
-bS5pbWwudW5pYmUuY2gvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUIDmYnT2lN75n/KwN
-hAKm76KxX8swDQYJKoZIhvcNAQEFBQADggEBAJBf6iPfVq31qU4vL420UVjKdmMu
-lHAknUBiQgTiUsySUaAVPnPJcpzxlxKRBSd0s0/DbJQYmbCEEbGPZ6i2eLTMSocb
-kSy7D8uh0ZNtOAiTfeWc+76of+BHlXlq027rN5amd21nV4cdXmXMBuMyCidh4iNV
-zMKI709D+kxZvkCdIUlDM1TWd1v8aVViHnxNrlQ54wDFP4jRB9uDHAxUjtFfbdIL
-HpeGPZUR5zOfAiIl+zASdutD9TQVu20kr+/xSJybhXINXLj+r+x4P9xS8eYTQkLJ
-FLSCieH5zHtHuRj8cSafaBgJoQvFTOkZoD8D8N9CcCIKBUQleyBNpRBIfc0=
-						</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <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://doccom.iml.unibe.ch/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://doccom.iml.unibe.ch/Shibboleth.sso/SAML2/Artifact" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://doccom.iml.unibe.ch/Shibboleth.sso/SAML2/ECP" index="3"/>
-    <AttributeConsumingService index="1">
-      <ServiceName xml:lang="de">DOCCOM  Deutsch Universität Bern</ServiceName>
-      <ServiceName xml:lang="en">DOCCOM  German University Bern</ServiceName>
-      <ServiceDescription xml:lang="de">DOCCOM Deutsch, Institut für medezinische Lehre, Universität Bern</ServiceDescription>
-      <ServiceDescription xml:lang="en">DOCCOM German, Institute for medical Education, University Bern</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="true"/>
-      <RequestedAttribute FriendlyName="surname" Name="urn:oid:2.5.4.4" 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" isRequired="true"/>
-      <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="true"/>
-      <RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <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="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"/>
-      <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"/>
-    </AttributeConsumingService>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">unibe.ch</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">Universität Bern</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">University of Bern</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.unibe.ch/</OrganizationURL>
-    <OrganizationURL xml:lang="en">http://www.unibe.ch/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Michel</GivenName>
-    <SurName>Adrian</SurName>
-    <EmailAddress>mailto:adrian.michel@iml.unibe.ch</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Hahn</GivenName>
-    <SurName>Axel</SurName>
-    <EmailAddress>mailto:sysadmin@iml.unibe.ch</EmailAddress>
-    <TelephoneNumber>+41 031 631 58 53</TelephoneNumber>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/doccom.iml.unibe.ch.xml b/swamid-interfederations-2.0/doccom.iml.unibe.ch.xml
deleted file mode 100644
index 40531cb7..00000000
--- a/swamid-interfederations-2.0/doccom.iml.unibe.ch.xml
+++ /dev/null
@@ -1,88 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://doccom.iml.unibe.ch/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://rr.aai.switch.ch/" registrationInstant="2014-09-08T10:55:32Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.switch.ch/aai/federation/switchaai/metadata-registration-practice-statement-20110711.txt</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:2.0:protocol">
-    <Extensions>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="de">DOCCOM  Deutsch Universität Bern</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">DOCCOM  German University Bern</mdui:DisplayName>
-        <mdui:Description xml:lang="de">DOCCOM Deutsch, Institut für medezinische Lehre, Universität Bern</mdui:Description>
-        <mdui:Description xml:lang="en">DOCCOM German, Institute for medical Education, University Bern</mdui:Description>
-        <mdui:PrivacyStatementURL xml:lang="en">https://doccom.iml.unibe.ch/Customizing/global/agreement/privacypolicy_en.html</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDKDCCAhCgAwIBAgIJAMU8stHHiSQ3MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE2RvY2NvbS5pbWwudW5pYmUuY2gwHhcNMTQwNDEwMDc1NzI5WhcNMTcwNDA5
-MDc1NzI5WjAeMRwwGgYDVQQDExNkb2Njb20uaW1sLnVuaWJlLmNoMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA081f+9+P/zwCwB/xPFLGYr/Olry6Ald8
-/VCcXHiO9V9OAezmSzMRfILyPLcpKZNl4rKmy3vcc67UzuJ+xA0SgzrsyqsOmxJc
-eAnPh58vkrhTooaP6JyXSV9rvrxA01m6TZMFjFJmljZ+5kmixjZ4F+zY9eBsXTXD
-utznEzh0DP1Ds6pL+eYeFezHlSSke4OhWDNVvCUSR3wE4IyImhc0afNhm7g8TOOm
-v/XavhPEw7xJBk40ivm9as/VjEe/Hu52C6McfJAUH2dyyG29jgqsFuMRDJd2zaU5
-1H+2Oxn7qLilqJ0nnbRck2RL5A2z/nOt8X4pBT6g4nBfrj+2zFA+PQIDAQABo2kw
-ZzBGBgNVHREEPzA9ghNkb2Njb20uaW1sLnVuaWJlLmNohiZodHRwczovL2RvY2Nv
-bS5pbWwudW5pYmUuY2gvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUIDmYnT2lN75n/KwN
-hAKm76KxX8swDQYJKoZIhvcNAQEFBQADggEBAJBf6iPfVq31qU4vL420UVjKdmMu
-lHAknUBiQgTiUsySUaAVPnPJcpzxlxKRBSd0s0/DbJQYmbCEEbGPZ6i2eLTMSocb
-kSy7D8uh0ZNtOAiTfeWc+76of+BHlXlq027rN5amd21nV4cdXmXMBuMyCidh4iNV
-zMKI709D+kxZvkCdIUlDM1TWd1v8aVViHnxNrlQ54wDFP4jRB9uDHAxUjtFfbdIL
-HpeGPZUR5zOfAiIl+zASdutD9TQVu20kr+/xSJybhXINXLj+r+x4P9xS8eYTQkLJ
-FLSCieH5zHtHuRj8cSafaBgJoQvFTOkZoD8D8N9CcCIKBUQleyBNpRBIfc0=
-						</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <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://doccom.iml.unibe.ch/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://doccom.iml.unibe.ch/Shibboleth.sso/SAML2/Artifact" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://doccom.iml.unibe.ch/Shibboleth.sso/SAML2/ECP" index="3"/>
-    <AttributeConsumingService index="1">
-      <ServiceName xml:lang="de">DOCCOM  Deutsch Universität Bern</ServiceName>
-      <ServiceName xml:lang="en">DOCCOM  German University Bern</ServiceName>
-      <ServiceDescription xml:lang="de">DOCCOM Deutsch, Institut für medezinische Lehre, Universität Bern</ServiceDescription>
-      <ServiceDescription xml:lang="en">DOCCOM German, Institute for medical Education, University Bern</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="true"/>
-      <RequestedAttribute FriendlyName="surname" Name="urn:oid:2.5.4.4" 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" isRequired="true"/>
-      <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="true"/>
-      <RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <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="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"/>
-      <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"/>
-    </AttributeConsumingService>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">unibe.ch</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">Universität Bern</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">University of Bern</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.unibe.ch/</OrganizationURL>
-    <OrganizationURL xml:lang="en">http://www.unibe.ch/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Michel</GivenName>
-    <SurName>Adrian</SurName>
-    <EmailAddress>mailto:adrian.michel@iml.unibe.ch</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Hahn</GivenName>
-    <SurName>Axel</SurName>
-    <EmailAddress>mailto:sysadmin@iml.unibe.ch</EmailAddress>
-    <TelephoneNumber>+41 031 631 58 53</TelephoneNumber>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/doit.swisdom.org-shibboleth.xml b/swamid-interfederations-2.0/doit.swisdom.org-shibboleth.xml
deleted file mode 100644
index 9a7b4c9c..00000000
--- a/swamid-interfederations-2.0/doit.swisdom.org-shibboleth.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://doit.swisdom.org/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://rr.aai.switch.ch/" registrationInstant="2014-08-25T12:32:55Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.switch.ch/aai/federation/switchaai/metadata-registration-practice-statement-20110711.txt</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </Extensions>
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
-    <Extensions>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">DOIT - Dermatology eLearning</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Dermatology Online with Interactive Technology</mdui:Description>
-        <mdui:Keywords xml:lang="it">elearning dermatologie</mdui:Keywords>
-        <mdui:Keywords xml:lang="fr">dermatologie elearning</mdui:Keywords>
-        <mdui:Keywords xml:lang="en">elearning dermatology</mdui:Keywords>
-        <mdui:Keywords xml:lang="de">elearning dermatologie</mdui:Keywords>
-        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAD72lDQ1BJQ0NQcm9maWxlAAB4nI1V3W/bVBQ/iW9cpBY/oLGODhWLr1VTW7kbGq3GBkmTpelCGrnN2CqkyXVuGlPXNrbTbVWf9gJvDPgDgLIHHpB4QhoMxPay7QG0SVNBFdUkpD102kBok/aCqnCur1O7Xca4ka9/Oed3Pu/RNUDHV5rjmEkZYN7yXTWfkY+fmJY7ViEJz0En9ECnpntOulwuAi7GhUfWw18hwd43B9rr/3N1VqmnAySeQmxXPX0e8WmAlKk7rg8g3kb58CnfQdzxPOIdLiaIWGF4luMswzMcHw84U+ooYpaLpNe1KuIlxP0zMflsDPMcgrUjTy3qGrrMelF27Zph0li6T1D/zzVvNlrxevHp8uYmj+K7j9Ved8fUEH+ua7lJxC8jvub4GSZ/FfG9xlwljXgvQPKZmnukwvnJNxbrU+8g3om4aviFqVC+aM2UJrhtcnnOPqqGnGu6N4o9gxcR36rTQpHnI0CVZnOsX4h7642x0L8w7i1M5lp+FuujJe5HcN/TxsuIexB/6NrqBM9ZWKZmXuX+hSuOXw5zENYts1TkPolEvaDGQO7Xp8a4LTng4yFyWzJdM44UQv6SYwaziLmR825DrYScG5qby3M/5D61KqHP1K6qlmW9HUR8GI4lNKBgwwzuOliwATKokIcMvh1wUVMDA0yUUNRSlBiJp2EOZe155YDDccSYDazXmTVGac/hEe6EHJt0E4Xsx+cgKZJDZJiMgEzeJG+RwySL0hFycNO2HIvPYt3Z9PM+NNAr4x2DzLmeRl8U76x70tCvf/T3Fmv7kZxpK594B8DDDrSYA/H6ry79sCvysUIuvHuz6+oSTDypv6nbqfXUCu6rqbWIkfo9tYa/VUhjbmaQ0Tw+RpCHF8sgXsNlfHzQcP8DeXaMtyVizTrXE2lYJ+gHpYclONsfSZXflD+VFeUL5bxyd1uX23ZJ+FT4VvhR+E74XvgZZOGScFn4SbgifCNcjJ3V4+dj8+yDelvVMk27XlMwpYy0W3pJykovSK9Ixcif1C0NSWPSHtTs3jy3eLx4LQacwL3V1faxOK+CWgNOBRV4QYctOLNt/kNr0kuGSGHb1A6zWW4xxJyYFdMgi3vFEXFIHGe4lZ+4B3UjuOe2TJ3+mApojBWvcyCYOjarzHoh0HlAfXraZxftqO2ccY3Zui/vU5TX5TR+qqhcsPTBflkzTTlQebJLPeou0OogsO8gv6IfqMH3LbHzeiTz3wY49BfeWTci2XQD4GsPoPu1SNaHd+KznwFcOKA33IXwzk8kfgHwavv38X9dGbybbjWbD/C+6vgEYOPjZvOf5WZz40v0vwZwyfwXWQBxeO6COJEAAAkjaVRYdFhNTDpjb20uYWRvYmUueG1wAAAAAAA8P3hwYWNrZXQgYmVnaW49Iu+7vyIgaWQ9Ilc1TTBNcENlaGlIenJlU3pOVGN6a2M5ZCI/Pgo8eDp4bXBtZXRhIHhtbG5zOng9ImFkb2JlOm5zOm1ldGEvIiB4OnhtcHRrPSJYTVAgQ29yZSA0LjQuMCI+CiAgIDxyZGY6UkRGIHhtbG5zOnJkZj0iaHR0cDovL3d3dy53My5vcmcvMTk5OS8wMi8yMi1yZGYtc3ludGF4LW5zIyI+CiAgICAgIDxyZGY6RGVzY3JpcHRpb24gcmRmOmFib3V0PSIiLz4KICAgPC9yZGY6UkRGPgo8L3g6eG1wbWV0YT4KICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgIAo8P3hwYWNrZXQgZW5kPSJ3Ij8+p930kgAAACF0RVh0U29mdHdhcmUAR3JhcGhpY0NvbnZlcnRlciAoSW50ZWwpd4f6GQAAAW5JREFUeJzUUT+rgnAUtSL6EC1tDY0hro5hZUtFLS0NDUFDkEGNImIQkvQHgjIjHCIoKKOkNxgOBQ1+g77KOz3DF+5veHe7v3vuueecH0H8eYVCoUAg4LXFYnE0GlmWdTgcRFHMZDLeKBwOB4PBd1MqlSaTyfF4PJ1O0+m0Wq02Gg1N0y6Xi2maiqJks9k3tFKpnM/n/X4/GAwKhYLHl06nwZLL5Vqt1nw+32w2vV4vHo8TgiA8n8/FYsGy7KfUTqeDCzirqqpt2xC5XC6j0ehrRtP0eDx+PB6O42CzVqu5O6lUiuf53W5nGAbDMJDXbreJSCTijmFgOBxKkgQbXz+1Xq+bzWa5XMYFAEC6Wq1+NQABDrwiqEQiQVFUPp+fzWYA3e93AEAHJy+oG2symeQ4Dpnebrftdgtt1+u13+/X63WSJAGQZRmJvek9YW7eiEXX9Vgs5osBYfr/8XPT13a7Xbj3L/zH+gYAAP//AwCk1qMzXSJnzgAAAABJRU5ErkJggg==</mdui:Logo>
-        <mdui:Logo height="25" width="68">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEQAAAAZCAIAAAAHYR/MAAAD72lDQ1BJQ0NQcm9maWxlAAB4nI1V3W/bVBQ/iW9cpBY/oLGODhWLr1VTW7kbGq3GBkmTpelCGrnN2CqkyXVuGlPXNrbTbVWf9gJvDPgDgLIHHpB4QhoMxPay7QG0SVNBFdUkpD102kBok/aCqnCur1O7Xca4ka9/Oed3Pu/RNUDHV5rjmEkZYN7yXTWfkY+fmJY7ViEJz0En9ECnpntOulwuAi7GhUfWw18hwd43B9rr/3N1VqmnAySeQmxXPX0e8WmAlKk7rg8g3kb58CnfQdzxPOIdLiaIWGF4luMswzMcHw84U+ooYpaLpNe1KuIlxP0zMflsDPMcgrUjTy3qGrrMelF27Zph0li6T1D/zzVvNlrxevHp8uYmj+K7j9Ved8fUEH+ua7lJxC8jvub4GSZ/FfG9xlwljXgvQPKZmnukwvnJNxbrU+8g3om4aviFqVC+aM2UJrhtcnnOPqqGnGu6N4o9gxcR36rTQpHnI0CVZnOsX4h7642x0L8w7i1M5lp+FuujJe5HcN/TxsuIexB/6NrqBM9ZWKZmXuX+hSuOXw5zENYts1TkPolEvaDGQO7Xp8a4LTng4yFyWzJdM44UQv6SYwaziLmR825DrYScG5qby3M/5D61KqHP1K6qlmW9HUR8GI4lNKBgwwzuOliwATKokIcMvh1wUVMDA0yUUNRSlBiJp2EOZe155YDDccSYDazXmTVGac/hEe6EHJt0E4Xsx+cgKZJDZJiMgEzeJG+RwySL0hFycNO2HIvPYt3Z9PM+NNAr4x2DzLmeRl8U76x70tCvf/T3Fmv7kZxpK594B8DDDrSYA/H6ry79sCvysUIuvHuz6+oSTDypv6nbqfXUCu6rqbWIkfo9tYa/VUhjbmaQ0Tw+RpCHF8sgXsNlfHzQcP8DeXaMtyVizTrXE2lYJ+gHpYclONsfSZXflD+VFeUL5bxyd1uX23ZJ+FT4VvhR+E74XvgZZOGScFn4SbgifCNcjJ3V4+dj8+yDelvVMk27XlMwpYy0W3pJykovSK9Ixcif1C0NSWPSHtTs3jy3eLx4LQacwL3V1faxOK+CWgNOBRV4QYctOLNt/kNr0kuGSGHb1A6zWW4xxJyYFdMgi3vFEXFIHGe4lZ+4B3UjuOe2TJ3+mApojBWvcyCYOjarzHoh0HlAfXraZxftqO2ccY3Zui/vU5TX5TR+qqhcsPTBflkzTTlQebJLPeou0OogsO8gv6IfqMH3LbHzeiTz3wY49BfeWTci2XQD4GsPoPu1SNaHd+KznwFcOKA33IXwzk8kfgHwavv38X9dGbybbjWbD/C+6vgEYOPjZvOf5WZz40v0vwZwyfwXWQBxeO6COJEAAAkjaVRYdFhNTDpjb20uYWRvYmUueG1wAAAAAAA8P3hwYWNrZXQgYmVnaW49Iu+7vyIgaWQ9Ilc1TTBNcENlaGlIenJlU3pOVGN6a2M5ZCI/Pgo8eDp4bXBtZXRhIHhtbG5zOng9ImFkb2JlOm5zOm1ldGEvIiB4OnhtcHRrPSJYTVAgQ29yZSA0LjQuMCI+CiAgIDxyZGY6UkRGIHhtbG5zOnJkZj0iaHR0cDovL3d3dy53My5vcmcvMTk5OS8wMi8yMi1yZGYtc3ludGF4LW5zIyI+CiAgICAgIDxyZGY6RGVzY3JpcHRpb24gcmRmOmFib3V0PSIiLz4KICAgPC9yZGY6UkRGPgo8L3g6eG1wbWV0YT4KICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgIAo8P3hwYWNrZXQgZW5kPSJ3Ij8+p930kgAAACF0RVh0U29mdHdhcmUAR3JhcGhpY0NvbnZlcnRlciAoSW50ZWwpd4f6GQAAA/VJREFUeJzslkko7XEUxy1tLdmRDfU2NjJEylDGkqFMKQtEWCjKEJJcLwtKEYkioSRD5ikZHxEyZRYSC0UpFu99uqf36/b/33vfu1Kvp3sWt9895/zO7/c9w/f3d3Cwi13sYheL4u/v39XVtby8fHl5ubu7OzMzU15e7urq+q/vZYvExMT09fUdHh4+PT0tLCzU19f7+vrGxcX19vZubW29vr5ub2+zBqr1OG5ubg0NDXt7e9+NUlNTExYWZtbTycmpra1tYGDAz89PNI6Ojs3NzQaDQf39ZpTo6OiCggJSPDc3V1hYaPHsqKiowcHBi4uL29vbsbGxzMxMQujdPDw8amtrFxcXn5+fAdzR0eHl5aV3Ky4uBvZPnbAlMjJSuVVVVR0cHNzd3Yn1/v5eKg9y/k5OTjY2NuqDkOXh4WFnZ2czMEpLS/f39wVDSkqKRbi6dAJ4enp6Z2eHVkxLSzO11tXVzc/PczBlTE1NraiomJ2dFXjkS9JEjt/f39vb2yMiIqg/a6xNTU2YqKSAGRoaIjgdzi+a9fV1b29vi3cKDAyUhLm4uFi5OtHxOTs7+2EULgoMDkPPXd3d3RMSEjSVRE9k7qE0+fn5ktr09HT+Hh8fX11dqV0TExOYCMuayKzBaXoBZbUmtM3JycnLywsTkpWVZba7ROgBGjcoKCg5ObmysnJzc5Nmo6q0R3x8vB6//niaCiUmWoAFs6dMJSUlCryAwU0TDf0fwIgkJibSZjSboIK4zDel0ZMsktfOzk5p8dHR0ZWVFbNgNMdTVZRFRUVsYZGRkaFMUklogDUp0IAZGRmxAYxIUlLS29sbJ9HZtDidCqV4enpSLnI5Pj4OhqWlpZycHGgKSLKLsjCUfwPm/Pyc2SCgzICPj48yyazL0FIf1sBTVqmVbWCAsbGxIeuAgADagL/0EoHg5dbWVthMrGVlZTc3N7KGhXHQPEECZmpqSmlCQkLQwIQOv0tkWhnYlhGS9eeAIQopDw8Ph6ws+dB+TA6TRnSlZI1SD4YrKg1c9PDwIFS+traGtb+/X0zUivaGAz8TDE0FmT4+PtIMR0dH3d3dCpU8ZNfX1xQKWltdXWVmTMGQAj0Y2hXwNA9DxXuieII3DSsAePvYCDEAVe0VMLy5GjDwuw1glNAz8BWXhql4BBh6qPn09DQ7O9usvyaRSGxsrLwMjJMsSL+yBgcHg0S9g3wumfKNgDGldYgBDcz5ETAiVKOlpYXbwAo9PT1WWJvvNw0YnMkCheXe8Ip+S15eHjRAxSi4JnJ1dTXsYvptkZubiydbPg5GhCrxeWbdRw/mP5YvBYbp+jpgQkNDrbC5XezyBeQXAAAA//8DAMcQPBACQuP6AAAAAElFTkSuQmCC</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDHDCCAgSgAwIBAgIJAJHcXT05fMs7MA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
-BAMTEGRvaXQuc3dpc2RvbS5vcmcwHhcNMTQwODI1MTE1ODExWhcNMTcwODI0MTE1
-ODExWjAbMRkwFwYDVQQDExBkb2l0LnN3aXNkb20ub3JnMIIBIjANBgkqhkiG9w0B
-AQEFAAOCAQ8AMIIBCgKCAQEA7yfqRa1uZXzzBaC10gq40/I7xws9oK3wsbwFTlho
-4LQ1W3Ph48PlJGH0VIUEhCZE+ZEKY4QBB3a+ZZU7TWdiu0L2RZDm+pM60pfLaMZv
-sWEC5QwQQyJ27GuECU+mmXYfo7yXTdNu7JA797H7xpWdzLz37cBX6BlF5OvlkHQ2
-ViFO/xNLrw4JiBlRJkX0A+DETgutcyK6RwzQ0jstj1e/U8w9HMxYkuhJ79jcUJQx
-9F5rzfhXg9qHD0VtA9iiwlgbAdqChfyUXxQrOptaE0G3t/fuI2rwYJ3QoX7xQnwF
-arngEtm1LyfpeXWuI5IlzYrjVDs3Ba4TTYLUMuNDDFG/jQIDAQABo2MwYTBABgNV
-HREEOTA3ghBkb2l0LnN3aXNkb20ub3JnhiNodHRwczovL2RvaXQuc3dpc2RvbS5v
-cmcvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUwAvg3JPnWCqyc595uuwFXNv2QScwDQYJ
-KoZIhvcNAQEFBQADggEBANPmBQZ+uWR42Q7Q32iCHn40YYGK0iLyyVsGYqVFjklF
-JQcQ5QiATQiLBMiXzGB8NO1LEVIEPuMQ/c0kQhBICPc+CUJkHpvIQziHwcM/GVNb
-3A60JjpG4L1hNJs+Upc6xUSYi3bteUsXE67c1pGdF5DB7IAWJjGyeM5q4BG6AmSv
-aAGKF8PQrkdLm2KLzgZIBCf+O/yVz6Yn1Jqb1JW6+TRLkWFF7eaYYAGH5YMQ8mwk
-Pu/Y3XLZI21tZN3bVaj/FW0nvSakrF6Ic+90NF+5i891xXjypJOthoe20x1ulX78
-nAvioAXLKLyPxl70a9Yj0TSJVsCSAk2bTcgY6WOnsBQ=
-						</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://aai.cyberderm.net/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cyberderm.net/Shibboleth.sso/SAML2/POST" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://doit.mironet.ch/Shibboleth.sso/SAML2/POST" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://doit.swisdom.org/Shibboleth.sso/SAML2/POST" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://aai.cyberderm.net/Shibboleth.sso/SAML2/Artifact" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://cyberderm.net/Shibboleth.sso/SAML2/Artifact" index="6"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://doit.mironet.ch/Shibboleth.sso/SAML2/Artifact" index="7"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://doit.swisdom.org/Shibboleth.sso/SAML2/Artifact" index="8"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://aai.cyberderm.net/Shibboleth.sso/SAML2/ECP" index="9"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://cyberderm.net/Shibboleth.sso/SAML2/ECP" index="10"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://doit.mironet.ch/Shibboleth.sso/SAML2/ECP" index="11"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://doit.swisdom.org/Shibboleth.sso/SAML2/ECP" index="12"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://aai.cyberderm.net/Shibboleth.sso/SAML/POST" index="13"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://cyberderm.net/Shibboleth.sso/SAML/POST" index="14"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://doit.mironet.ch/Shibboleth.sso/SAML/POST" index="15"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://doit.swisdom.org/Shibboleth.sso/SAML/POST" index="16"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://aai.cyberderm.net/Shibboleth.sso/SAML/Artifact" index="17"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://cyberderm.net/Shibboleth.sso/SAML/Artifact" index="18"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://doit.mironet.ch/Shibboleth.sso/SAML/Artifact" index="19"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://doit.swisdom.org/Shibboleth.sso/SAML/Artifact" index="20"/>
-    <AttributeConsumingService index="1">
-      <ServiceName xml:lang="en">DOIT - Dermatology eLearning</ServiceName>
-      <ServiceDescription xml:lang="en">Dermatology Online with Interactive Technology</ServiceDescription>
-      <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" isRequired="false"/>
-      <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="homePostalAddress" Name="urn:oid:0.9.2342.19200300.100.1.39" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-      <RequestedAttribute FriendlyName="postalAddress" Name="urn:oid:2.5.4.16" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-      <RequestedAttribute FriendlyName="eduPersonAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <RequestedAttribute FriendlyName="surname" Name="urn:oid:2.5.4.4" 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" 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="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <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"/>
-      <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="false"/>
-    </AttributeConsumingService>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">uzh.ch</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">Universität Zürich</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">University of Zurich</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.uzh.ch/</OrganizationURL>
-    <OrganizationURL xml:lang="en">http://www.uzh.ch/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Vahid</GivenName>
-    <SurName>Djamei</SurName>
-    <EmailAddress>mailto:vahid.djamei@uzh.ch</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>DOIT</GivenName>
-    <SurName>Support</SurName>
-    <EmailAddress>mailto:vahid.djamei@uzh.ch</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/doit.swisdom.org.xml b/swamid-interfederations-2.0/doit.swisdom.org.xml
deleted file mode 100644
index 9a7b4c9c..00000000
--- a/swamid-interfederations-2.0/doit.swisdom.org.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://doit.swisdom.org/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://rr.aai.switch.ch/" registrationInstant="2014-08-25T12:32:55Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.switch.ch/aai/federation/switchaai/metadata-registration-practice-statement-20110711.txt</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </Extensions>
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
-    <Extensions>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">DOIT - Dermatology eLearning</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Dermatology Online with Interactive Technology</mdui:Description>
-        <mdui:Keywords xml:lang="it">elearning dermatologie</mdui:Keywords>
-        <mdui:Keywords xml:lang="fr">dermatologie elearning</mdui:Keywords>
-        <mdui:Keywords xml:lang="en">elearning dermatology</mdui:Keywords>
-        <mdui:Keywords xml:lang="de">elearning dermatologie</mdui:Keywords>
-        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAD72lDQ1BJQ0NQcm9maWxlAAB4nI1V3W/bVBQ/iW9cpBY/oLGODhWLr1VTW7kbGq3GBkmTpelCGrnN2CqkyXVuGlPXNrbTbVWf9gJvDPgDgLIHHpB4QhoMxPay7QG0SVNBFdUkpD102kBok/aCqnCur1O7Xca4ka9/Oed3Pu/RNUDHV5rjmEkZYN7yXTWfkY+fmJY7ViEJz0En9ECnpntOulwuAi7GhUfWw18hwd43B9rr/3N1VqmnAySeQmxXPX0e8WmAlKk7rg8g3kb58CnfQdzxPOIdLiaIWGF4luMswzMcHw84U+ooYpaLpNe1KuIlxP0zMflsDPMcgrUjTy3qGrrMelF27Zph0li6T1D/zzVvNlrxevHp8uYmj+K7j9Ved8fUEH+ua7lJxC8jvub4GSZ/FfG9xlwljXgvQPKZmnukwvnJNxbrU+8g3om4aviFqVC+aM2UJrhtcnnOPqqGnGu6N4o9gxcR36rTQpHnI0CVZnOsX4h7642x0L8w7i1M5lp+FuujJe5HcN/TxsuIexB/6NrqBM9ZWKZmXuX+hSuOXw5zENYts1TkPolEvaDGQO7Xp8a4LTng4yFyWzJdM44UQv6SYwaziLmR825DrYScG5qby3M/5D61KqHP1K6qlmW9HUR8GI4lNKBgwwzuOliwATKokIcMvh1wUVMDA0yUUNRSlBiJp2EOZe155YDDccSYDazXmTVGac/hEe6EHJt0E4Xsx+cgKZJDZJiMgEzeJG+RwySL0hFycNO2HIvPYt3Z9PM+NNAr4x2DzLmeRl8U76x70tCvf/T3Fmv7kZxpK594B8DDDrSYA/H6ry79sCvysUIuvHuz6+oSTDypv6nbqfXUCu6rqbWIkfo9tYa/VUhjbmaQ0Tw+RpCHF8sgXsNlfHzQcP8DeXaMtyVizTrXE2lYJ+gHpYclONsfSZXflD+VFeUL5bxyd1uX23ZJ+FT4VvhR+E74XvgZZOGScFn4SbgifCNcjJ3V4+dj8+yDelvVMk27XlMwpYy0W3pJykovSK9Ixcif1C0NSWPSHtTs3jy3eLx4LQacwL3V1faxOK+CWgNOBRV4QYctOLNt/kNr0kuGSGHb1A6zWW4xxJyYFdMgi3vFEXFIHGe4lZ+4B3UjuOe2TJ3+mApojBWvcyCYOjarzHoh0HlAfXraZxftqO2ccY3Zui/vU5TX5TR+qqhcsPTBflkzTTlQebJLPeou0OogsO8gv6IfqMH3LbHzeiTz3wY49BfeWTci2XQD4GsPoPu1SNaHd+KznwFcOKA33IXwzk8kfgHwavv38X9dGbybbjWbD/C+6vgEYOPjZvOf5WZz40v0vwZwyfwXWQBxeO6COJEAAAkjaVRYdFhNTDpjb20uYWRvYmUueG1wAAAAAAA8P3hwYWNrZXQgYmVnaW49Iu+7vyIgaWQ9Ilc1TTBNcENlaGlIenJlU3pOVGN6a2M5ZCI/Pgo8eDp4bXBtZXRhIHhtbG5zOng9ImFkb2JlOm5zOm1ldGEvIiB4OnhtcHRrPSJYTVAgQ29yZSA0LjQuMCI+CiAgIDxyZGY6UkRGIHhtbG5zOnJkZj0iaHR0cDovL3d3dy53My5vcmcvMTk5OS8wMi8yMi1yZGYtc3ludGF4LW5zIyI+CiAgICAgIDxyZGY6RGVzY3JpcHRpb24gcmRmOmFib3V0PSIiLz4KICAgPC9yZGY6UkRGPgo8L3g6eG1wbWV0YT4KICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgIAo8P3hwYWNrZXQgZW5kPSJ3Ij8+p930kgAAACF0RVh0U29mdHdhcmUAR3JhcGhpY0NvbnZlcnRlciAoSW50ZWwpd4f6GQAAAW5JREFUeJzUUT+rgnAUtSL6EC1tDY0hro5hZUtFLS0NDUFDkEGNImIQkvQHgjIjHCIoKKOkNxgOBQ1+g77KOz3DF+5veHe7v3vuueecH0H8eYVCoUAg4LXFYnE0GlmWdTgcRFHMZDLeKBwOB4PBd1MqlSaTyfF4PJ1O0+m0Wq02Gg1N0y6Xi2maiqJks9k3tFKpnM/n/X4/GAwKhYLHl06nwZLL5Vqt1nw+32w2vV4vHo8TgiA8n8/FYsGy7KfUTqeDCzirqqpt2xC5XC6j0ehrRtP0eDx+PB6O42CzVqu5O6lUiuf53W5nGAbDMJDXbreJSCTijmFgOBxKkgQbXz+1Xq+bzWa5XMYFAEC6Wq1+NQABDrwiqEQiQVFUPp+fzWYA3e93AEAHJy+oG2symeQ4Dpnebrftdgtt1+u13+/X63WSJAGQZRmJvek9YW7eiEXX9Vgs5osBYfr/8XPT13a7Xbj3L/zH+gYAAP//AwCk1qMzXSJnzgAAAABJRU5ErkJggg==</mdui:Logo>
-        <mdui:Logo height="25" width="68">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEQAAAAZCAIAAAAHYR/MAAAD72lDQ1BJQ0NQcm9maWxlAAB4nI1V3W/bVBQ/iW9cpBY/oLGODhWLr1VTW7kbGq3GBkmTpelCGrnN2CqkyXVuGlPXNrbTbVWf9gJvDPgDgLIHHpB4QhoMxPay7QG0SVNBFdUkpD102kBok/aCqnCur1O7Xca4ka9/Oed3Pu/RNUDHV5rjmEkZYN7yXTWfkY+fmJY7ViEJz0En9ECnpntOulwuAi7GhUfWw18hwd43B9rr/3N1VqmnAySeQmxXPX0e8WmAlKk7rg8g3kb58CnfQdzxPOIdLiaIWGF4luMswzMcHw84U+ooYpaLpNe1KuIlxP0zMflsDPMcgrUjTy3qGrrMelF27Zph0li6T1D/zzVvNlrxevHp8uYmj+K7j9Ved8fUEH+ua7lJxC8jvub4GSZ/FfG9xlwljXgvQPKZmnukwvnJNxbrU+8g3om4aviFqVC+aM2UJrhtcnnOPqqGnGu6N4o9gxcR36rTQpHnI0CVZnOsX4h7642x0L8w7i1M5lp+FuujJe5HcN/TxsuIexB/6NrqBM9ZWKZmXuX+hSuOXw5zENYts1TkPolEvaDGQO7Xp8a4LTng4yFyWzJdM44UQv6SYwaziLmR825DrYScG5qby3M/5D61KqHP1K6qlmW9HUR8GI4lNKBgwwzuOliwATKokIcMvh1wUVMDA0yUUNRSlBiJp2EOZe155YDDccSYDazXmTVGac/hEe6EHJt0E4Xsx+cgKZJDZJiMgEzeJG+RwySL0hFycNO2HIvPYt3Z9PM+NNAr4x2DzLmeRl8U76x70tCvf/T3Fmv7kZxpK594B8DDDrSYA/H6ry79sCvysUIuvHuz6+oSTDypv6nbqfXUCu6rqbWIkfo9tYa/VUhjbmaQ0Tw+RpCHF8sgXsNlfHzQcP8DeXaMtyVizTrXE2lYJ+gHpYclONsfSZXflD+VFeUL5bxyd1uX23ZJ+FT4VvhR+E74XvgZZOGScFn4SbgifCNcjJ3V4+dj8+yDelvVMk27XlMwpYy0W3pJykovSK9Ixcif1C0NSWPSHtTs3jy3eLx4LQacwL3V1faxOK+CWgNOBRV4QYctOLNt/kNr0kuGSGHb1A6zWW4xxJyYFdMgi3vFEXFIHGe4lZ+4B3UjuOe2TJ3+mApojBWvcyCYOjarzHoh0HlAfXraZxftqO2ccY3Zui/vU5TX5TR+qqhcsPTBflkzTTlQebJLPeou0OogsO8gv6IfqMH3LbHzeiTz3wY49BfeWTci2XQD4GsPoPu1SNaHd+KznwFcOKA33IXwzk8kfgHwavv38X9dGbybbjWbD/C+6vgEYOPjZvOf5WZz40v0vwZwyfwXWQBxeO6COJEAAAkjaVRYdFhNTDpjb20uYWRvYmUueG1wAAAAAAA8P3hwYWNrZXQgYmVnaW49Iu+7vyIgaWQ9Ilc1TTBNcENlaGlIenJlU3pOVGN6a2M5ZCI/Pgo8eDp4bXBtZXRhIHhtbG5zOng9ImFkb2JlOm5zOm1ldGEvIiB4OnhtcHRrPSJYTVAgQ29yZSA0LjQuMCI+CiAgIDxyZGY6UkRGIHhtbG5zOnJkZj0iaHR0cDovL3d3dy53My5vcmcvMTk5OS8wMi8yMi1yZGYtc3ludGF4LW5zIyI+CiAgICAgIDxyZGY6RGVzY3JpcHRpb24gcmRmOmFib3V0PSIiLz4KICAgPC9yZGY6UkRGPgo8L3g6eG1wbWV0YT4KICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgIAo8P3hwYWNrZXQgZW5kPSJ3Ij8+p930kgAAACF0RVh0U29mdHdhcmUAR3JhcGhpY0NvbnZlcnRlciAoSW50ZWwpd4f6GQAAA/VJREFUeJzslkko7XEUxy1tLdmRDfU2NjJEylDGkqFMKQtEWCjKEJJcLwtKEYkioSRD5ikZHxEyZRYSC0UpFu99uqf36/b/33vfu1Kvp3sWt9895/zO7/c9w/f3d3Cwi13sYheL4u/v39XVtby8fHl5ubu7OzMzU15e7urq+q/vZYvExMT09fUdHh4+PT0tLCzU19f7+vrGxcX19vZubW29vr5ub2+zBqr1OG5ubg0NDXt7e9+NUlNTExYWZtbTycmpra1tYGDAz89PNI6Ojs3NzQaDQf39ZpTo6OiCggJSPDc3V1hYaPHsqKiowcHBi4uL29vbsbGxzMxMQujdPDw8amtrFxcXn5+fAdzR0eHl5aV3Ky4uBvZPnbAlMjJSuVVVVR0cHNzd3Yn1/v5eKg9y/k5OTjY2NuqDkOXh4WFnZ2czMEpLS/f39wVDSkqKRbi6dAJ4enp6Z2eHVkxLSzO11tXVzc/PczBlTE1NraiomJ2dFXjkS9JEjt/f39vb2yMiIqg/a6xNTU2YqKSAGRoaIjgdzi+a9fV1b29vi3cKDAyUhLm4uFi5OtHxOTs7+2EULgoMDkPPXd3d3RMSEjSVRE9k7qE0+fn5ktr09HT+Hh8fX11dqV0TExOYCMuayKzBaXoBZbUmtM3JycnLywsTkpWVZba7ROgBGjcoKCg5ObmysnJzc5Nmo6q0R3x8vB6//niaCiUmWoAFs6dMJSUlCryAwU0TDf0fwIgkJibSZjSboIK4zDel0ZMsktfOzk5p8dHR0ZWVFbNgNMdTVZRFRUVsYZGRkaFMUklogDUp0IAZGRmxAYxIUlLS29sbJ9HZtDidCqV4enpSLnI5Pj4OhqWlpZycHGgKSLKLsjCUfwPm/Pyc2SCgzICPj48yyazL0FIf1sBTVqmVbWCAsbGxIeuAgADagL/0EoHg5dbWVthMrGVlZTc3N7KGhXHQPEECZmpqSmlCQkLQwIQOv0tkWhnYlhGS9eeAIQopDw8Ph6ws+dB+TA6TRnSlZI1SD4YrKg1c9PDwIFS+traGtb+/X0zUivaGAz8TDE0FmT4+PtIMR0dH3d3dCpU8ZNfX1xQKWltdXWVmTMGQAj0Y2hXwNA9DxXuieII3DSsAePvYCDEAVe0VMLy5GjDwuw1glNAz8BWXhql4BBh6qPn09DQ7O9usvyaRSGxsrLwMjJMsSL+yBgcHg0S9g3wumfKNgDGldYgBDcz5ETAiVKOlpYXbwAo9PT1WWJvvNw0YnMkCheXe8Ip+S15eHjRAxSi4JnJ1dTXsYvptkZubiydbPg5GhCrxeWbdRw/mP5YvBYbp+jpgQkNDrbC5XezyBeQXAAAA//8DAMcQPBACQuP6AAAAAElFTkSuQmCC</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDHDCCAgSgAwIBAgIJAJHcXT05fMs7MA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
-BAMTEGRvaXQuc3dpc2RvbS5vcmcwHhcNMTQwODI1MTE1ODExWhcNMTcwODI0MTE1
-ODExWjAbMRkwFwYDVQQDExBkb2l0LnN3aXNkb20ub3JnMIIBIjANBgkqhkiG9w0B
-AQEFAAOCAQ8AMIIBCgKCAQEA7yfqRa1uZXzzBaC10gq40/I7xws9oK3wsbwFTlho
-4LQ1W3Ph48PlJGH0VIUEhCZE+ZEKY4QBB3a+ZZU7TWdiu0L2RZDm+pM60pfLaMZv
-sWEC5QwQQyJ27GuECU+mmXYfo7yXTdNu7JA797H7xpWdzLz37cBX6BlF5OvlkHQ2
-ViFO/xNLrw4JiBlRJkX0A+DETgutcyK6RwzQ0jstj1e/U8w9HMxYkuhJ79jcUJQx
-9F5rzfhXg9qHD0VtA9iiwlgbAdqChfyUXxQrOptaE0G3t/fuI2rwYJ3QoX7xQnwF
-arngEtm1LyfpeXWuI5IlzYrjVDs3Ba4TTYLUMuNDDFG/jQIDAQABo2MwYTBABgNV
-HREEOTA3ghBkb2l0LnN3aXNkb20ub3JnhiNodHRwczovL2RvaXQuc3dpc2RvbS5v
-cmcvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUwAvg3JPnWCqyc595uuwFXNv2QScwDQYJ
-KoZIhvcNAQEFBQADggEBANPmBQZ+uWR42Q7Q32iCHn40YYGK0iLyyVsGYqVFjklF
-JQcQ5QiATQiLBMiXzGB8NO1LEVIEPuMQ/c0kQhBICPc+CUJkHpvIQziHwcM/GVNb
-3A60JjpG4L1hNJs+Upc6xUSYi3bteUsXE67c1pGdF5DB7IAWJjGyeM5q4BG6AmSv
-aAGKF8PQrkdLm2KLzgZIBCf+O/yVz6Yn1Jqb1JW6+TRLkWFF7eaYYAGH5YMQ8mwk
-Pu/Y3XLZI21tZN3bVaj/FW0nvSakrF6Ic+90NF+5i891xXjypJOthoe20x1ulX78
-nAvioAXLKLyPxl70a9Yj0TSJVsCSAk2bTcgY6WOnsBQ=
-						</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://aai.cyberderm.net/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cyberderm.net/Shibboleth.sso/SAML2/POST" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://doit.mironet.ch/Shibboleth.sso/SAML2/POST" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://doit.swisdom.org/Shibboleth.sso/SAML2/POST" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://aai.cyberderm.net/Shibboleth.sso/SAML2/Artifact" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://cyberderm.net/Shibboleth.sso/SAML2/Artifact" index="6"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://doit.mironet.ch/Shibboleth.sso/SAML2/Artifact" index="7"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://doit.swisdom.org/Shibboleth.sso/SAML2/Artifact" index="8"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://aai.cyberderm.net/Shibboleth.sso/SAML2/ECP" index="9"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://cyberderm.net/Shibboleth.sso/SAML2/ECP" index="10"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://doit.mironet.ch/Shibboleth.sso/SAML2/ECP" index="11"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://doit.swisdom.org/Shibboleth.sso/SAML2/ECP" index="12"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://aai.cyberderm.net/Shibboleth.sso/SAML/POST" index="13"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://cyberderm.net/Shibboleth.sso/SAML/POST" index="14"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://doit.mironet.ch/Shibboleth.sso/SAML/POST" index="15"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://doit.swisdom.org/Shibboleth.sso/SAML/POST" index="16"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://aai.cyberderm.net/Shibboleth.sso/SAML/Artifact" index="17"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://cyberderm.net/Shibboleth.sso/SAML/Artifact" index="18"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://doit.mironet.ch/Shibboleth.sso/SAML/Artifact" index="19"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://doit.swisdom.org/Shibboleth.sso/SAML/Artifact" index="20"/>
-    <AttributeConsumingService index="1">
-      <ServiceName xml:lang="en">DOIT - Dermatology eLearning</ServiceName>
-      <ServiceDescription xml:lang="en">Dermatology Online with Interactive Technology</ServiceDescription>
-      <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" isRequired="false"/>
-      <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="homePostalAddress" Name="urn:oid:0.9.2342.19200300.100.1.39" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-      <RequestedAttribute FriendlyName="postalAddress" Name="urn:oid:2.5.4.16" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-      <RequestedAttribute FriendlyName="eduPersonAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <RequestedAttribute FriendlyName="surname" Name="urn:oid:2.5.4.4" 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" 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="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <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"/>
-      <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="false"/>
-    </AttributeConsumingService>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">uzh.ch</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">Universität Zürich</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">University of Zurich</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.uzh.ch/</OrganizationURL>
-    <OrganizationURL xml:lang="en">http://www.uzh.ch/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Vahid</GivenName>
-    <SurName>Djamei</SurName>
-    <EmailAddress>mailto:vahid.djamei@uzh.ch</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>DOIT</GivenName>
-    <SurName>Support</SurName>
-    <EmailAddress>mailto:vahid.djamei@uzh.ch</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/dourado.ufs.br-idp-shibboleth.xml b/swamid-interfederations-2.0/dourado.ufs.br-idp-shibboleth.xml
deleted file mode 100644
index ac0f9de0..00000000
--- a/swamid-interfederations-2.0/dourado.ufs.br-idp-shibboleth.xml
+++ /dev/null
@@ -1,114 +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://dourado.ufs.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">ufs.br</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">UFS - Universidade Federal de Sergipe</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="pt-br">UFS - Universidade Federal de Sergipe</mdui:DisplayName>
-        <mdui:Description xml:lang="en">UFS - Universidade Federal de Sergipe</mdui:Description>
-        <mdui:Description xml:lang="pt-br">UFS - Universidade Federal de Sergipe</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.ufs.br/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="pt-br">http://www.ufs.br/</mdui:InformationURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-    MIIEBjCCAu4CAQAwDQYJKoZIhvcNAQEFBQAwgcgxLDAqBgNVBAoTI1VGUy1Vbml2
-ZXJzaWRhZGUgRmVkZXJhbCBkZSBTZXJnaXBlMTIwMAYDVQQLFClOVEktTsO6Y2xl
-byBkZSBUZWNub2xvZ2lhIGRhIEluZm9ybWHDp8OjbzEaMBgGCSqGSIb3DQEJARYL
-Y2FmZUB1ZnMuYnIxEDAOBgNVBAcTB0FyYWNhanUxEDAOBgNVBAgTB1NlcmdpcGUx
-CzAJBgNVBAYTAkJSMRcwFQYDVQQDEw5kb3VyYWRvLnVmcy5icjAeFw0xNDA0MTAx
-MjMxNDFaFw0xOTA0MDkxMjMxNDFaMIHIMSwwKgYDVQQKEyNVRlMtVW5pdmVyc2lk
-YWRlIEZlZGVyYWwgZGUgU2VyZ2lwZTEyMDAGA1UECxQpTlRJLU7DumNsZW8gZGUg
-VGVjbm9sb2dpYSBkYSBJbmZvcm1hw6fDo28xGjAYBgkqhkiG9w0BCQEWC2NhZmVA
-dWZzLmJyMRAwDgYDVQQHEwdBcmFjYWp1MRAwDgYDVQQIEwdTZXJnaXBlMQswCQYD
-VQQGEwJCUjEXMBUGA1UEAxMOZG91cmFkby51ZnMuYnIwggEiMA0GCSqGSIb3DQEB
-AQUAA4IBDwAwggEKAoIBAQCuuogQEudWqFoQPdA7n9TrUUYXXauTI4yRaEuEoeyv
-KultDI/HnZDCQ1so3QIjjlWgY5bLTOuYZR/+bw1ufVCtQNH8zCgEmnbjZVuG01q2
-eoOzCyLjL7I/HwhFHTXOKoXNLyC6K2JgF4QYDISAcVG7XkhbD5dA6PGtwyCu+43h
-VKg42zu8R7KUJjj3Iu5FUTB9txGt4gM5j3twqDde6iNUXILh3Gf/V01JdGgIhLls
-Mf3d0ac1sH4Ks0KkaQsnhkc4Rt7fHDFlS3NkOTNt95oYyiOTSK/QZzbOr6TVOuC0
-8Y+ya8BE2spu37VBaUCuers4FbfFp2WIu/XO8hfG9MJTAgMBAAEwDQYJKoZIhvcN
-AQEFBQADggEBAH8eyp2vC7zx5oFdqWzFqZXkjGRQyih+grWeiNb3qCviPcCacyUl
-YQ2NuQEEDqManKPBPxAscO7UP1Rr9g3Ggh0vkL6KAxQqEFRwWxUkCnRd3z/TUrys
-aIt7WrF0J0mZx8qZQPasestDbSehM74s+pNsACQxY/zlbXD2Ybft9Mj62kxSdeMx
-JjjUtWoCYJwdzXAklw8r0ot7/TnVx1nNZRCV1mwFtzcKuwz8M5JDcI9sBlH+/oRd
-d6xRz2iXP9guO9SjSdWIz/LP3Px/E+ASWZ1LZBMwv8tTBmYbo9tEdUzG4DWEMwS2
-ppG+3mm7IVx2FODAFkApZmdPV4osxno36Ww=
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dourado.ufs.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://dourado.ufs.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://dourado.ufs.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dourado.ufs.br/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://dourado.ufs.br/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://dourado.ufs.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">ufs.br</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-      
-MIIEBjCCAu4CAQAwDQYJKoZIhvcNAQEFBQAwgcgxLDAqBgNVBAoTI1VGUy1Vbml2
-ZXJzaWRhZGUgRmVkZXJhbCBkZSBTZXJnaXBlMTIwMAYDVQQLFClOVEktTsO6Y2xl
-byBkZSBUZWNub2xvZ2lhIGRhIEluZm9ybWHDp8OjbzEaMBgGCSqGSIb3DQEJARYL
-Y2FmZUB1ZnMuYnIxEDAOBgNVBAcTB0FyYWNhanUxEDAOBgNVBAgTB1NlcmdpcGUx
-CzAJBgNVBAYTAkJSMRcwFQYDVQQDEw5kb3VyYWRvLnVmcy5icjAeFw0xNDA0MTAx
-MjMxNDFaFw0xOTA0MDkxMjMxNDFaMIHIMSwwKgYDVQQKEyNVRlMtVW5pdmVyc2lk
-YWRlIEZlZGVyYWwgZGUgU2VyZ2lwZTEyMDAGA1UECxQpTlRJLU7DumNsZW8gZGUg
-VGVjbm9sb2dpYSBkYSBJbmZvcm1hw6fDo28xGjAYBgkqhkiG9w0BCQEWC2NhZmVA
-dWZzLmJyMRAwDgYDVQQHEwdBcmFjYWp1MRAwDgYDVQQIEwdTZXJnaXBlMQswCQYD
-VQQGEwJCUjEXMBUGA1UEAxMOZG91cmFkby51ZnMuYnIwggEiMA0GCSqGSIb3DQEB
-AQUAA4IBDwAwggEKAoIBAQCuuogQEudWqFoQPdA7n9TrUUYXXauTI4yRaEuEoeyv
-KultDI/HnZDCQ1so3QIjjlWgY5bLTOuYZR/+bw1ufVCtQNH8zCgEmnbjZVuG01q2
-eoOzCyLjL7I/HwhFHTXOKoXNLyC6K2JgF4QYDISAcVG7XkhbD5dA6PGtwyCu+43h
-VKg42zu8R7KUJjj3Iu5FUTB9txGt4gM5j3twqDde6iNUXILh3Gf/V01JdGgIhLls
-Mf3d0ac1sH4Ks0KkaQsnhkc4Rt7fHDFlS3NkOTNt95oYyiOTSK/QZzbOr6TVOuC0
-8Y+ya8BE2spu37VBaUCuers4FbfFp2WIu/XO8hfG9MJTAgMBAAEwDQYJKoZIhvcN
-AQEFBQADggEBAH8eyp2vC7zx5oFdqWzFqZXkjGRQyih+grWeiNb3qCviPcCacyUl
-YQ2NuQEEDqManKPBPxAscO7UP1Rr9g3Ggh0vkL6KAxQqEFRwWxUkCnRd3z/TUrys
-aIt7WrF0J0mZx8qZQPasestDbSehM74s+pNsACQxY/zlbXD2Ybft9Mj62kxSdeMx
-JjjUtWoCYJwdzXAklw8r0ot7/TnVx1nNZRCV1mwFtzcKuwz8M5JDcI9sBlH+/oRd
-d6xRz2iXP9guO9SjSdWIz/LP3Px/E+ASWZ1LZBMwv8tTBmYbo9tEdUzG4DWEMwS2
-ppG+3mm7IVx2FODAFkApZmdPV4osxno36Ww=
-                    
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dourado.ufs.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://dourado.ufs.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">UFS - Universidade Federal de Sergipe</OrganizationName>
-    <OrganizationName xml:lang="pt-br">UFS - Universidade Federal de Sergipe</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">UFS - Universidade Federal de Sergipe</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="pt-br">UFS - Universidade Federal de Sergipe</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.ufs.br/</OrganizationURL>
-    <OrganizationURL xml:lang="pt-br">http://www.ufs.br/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Rodrigus Oliveira Feitosa</SurName>
-    <EmailAddress>rodrigus@ufs.br</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/dourado.ufs.br.xml b/swamid-interfederations-2.0/dourado.ufs.br.xml
deleted file mode 100644
index ac0f9de0..00000000
--- a/swamid-interfederations-2.0/dourado.ufs.br.xml
+++ /dev/null
@@ -1,114 +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://dourado.ufs.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">ufs.br</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">UFS - Universidade Federal de Sergipe</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="pt-br">UFS - Universidade Federal de Sergipe</mdui:DisplayName>
-        <mdui:Description xml:lang="en">UFS - Universidade Federal de Sergipe</mdui:Description>
-        <mdui:Description xml:lang="pt-br">UFS - Universidade Federal de Sergipe</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.ufs.br/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="pt-br">http://www.ufs.br/</mdui:InformationURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-    MIIEBjCCAu4CAQAwDQYJKoZIhvcNAQEFBQAwgcgxLDAqBgNVBAoTI1VGUy1Vbml2
-ZXJzaWRhZGUgRmVkZXJhbCBkZSBTZXJnaXBlMTIwMAYDVQQLFClOVEktTsO6Y2xl
-byBkZSBUZWNub2xvZ2lhIGRhIEluZm9ybWHDp8OjbzEaMBgGCSqGSIb3DQEJARYL
-Y2FmZUB1ZnMuYnIxEDAOBgNVBAcTB0FyYWNhanUxEDAOBgNVBAgTB1NlcmdpcGUx
-CzAJBgNVBAYTAkJSMRcwFQYDVQQDEw5kb3VyYWRvLnVmcy5icjAeFw0xNDA0MTAx
-MjMxNDFaFw0xOTA0MDkxMjMxNDFaMIHIMSwwKgYDVQQKEyNVRlMtVW5pdmVyc2lk
-YWRlIEZlZGVyYWwgZGUgU2VyZ2lwZTEyMDAGA1UECxQpTlRJLU7DumNsZW8gZGUg
-VGVjbm9sb2dpYSBkYSBJbmZvcm1hw6fDo28xGjAYBgkqhkiG9w0BCQEWC2NhZmVA
-dWZzLmJyMRAwDgYDVQQHEwdBcmFjYWp1MRAwDgYDVQQIEwdTZXJnaXBlMQswCQYD
-VQQGEwJCUjEXMBUGA1UEAxMOZG91cmFkby51ZnMuYnIwggEiMA0GCSqGSIb3DQEB
-AQUAA4IBDwAwggEKAoIBAQCuuogQEudWqFoQPdA7n9TrUUYXXauTI4yRaEuEoeyv
-KultDI/HnZDCQ1so3QIjjlWgY5bLTOuYZR/+bw1ufVCtQNH8zCgEmnbjZVuG01q2
-eoOzCyLjL7I/HwhFHTXOKoXNLyC6K2JgF4QYDISAcVG7XkhbD5dA6PGtwyCu+43h
-VKg42zu8R7KUJjj3Iu5FUTB9txGt4gM5j3twqDde6iNUXILh3Gf/V01JdGgIhLls
-Mf3d0ac1sH4Ks0KkaQsnhkc4Rt7fHDFlS3NkOTNt95oYyiOTSK/QZzbOr6TVOuC0
-8Y+ya8BE2spu37VBaUCuers4FbfFp2WIu/XO8hfG9MJTAgMBAAEwDQYJKoZIhvcN
-AQEFBQADggEBAH8eyp2vC7zx5oFdqWzFqZXkjGRQyih+grWeiNb3qCviPcCacyUl
-YQ2NuQEEDqManKPBPxAscO7UP1Rr9g3Ggh0vkL6KAxQqEFRwWxUkCnRd3z/TUrys
-aIt7WrF0J0mZx8qZQPasestDbSehM74s+pNsACQxY/zlbXD2Ybft9Mj62kxSdeMx
-JjjUtWoCYJwdzXAklw8r0ot7/TnVx1nNZRCV1mwFtzcKuwz8M5JDcI9sBlH+/oRd
-d6xRz2iXP9guO9SjSdWIz/LP3Px/E+ASWZ1LZBMwv8tTBmYbo9tEdUzG4DWEMwS2
-ppG+3mm7IVx2FODAFkApZmdPV4osxno36Ww=
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dourado.ufs.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://dourado.ufs.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://dourado.ufs.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dourado.ufs.br/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://dourado.ufs.br/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://dourado.ufs.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">ufs.br</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-      
-MIIEBjCCAu4CAQAwDQYJKoZIhvcNAQEFBQAwgcgxLDAqBgNVBAoTI1VGUy1Vbml2
-ZXJzaWRhZGUgRmVkZXJhbCBkZSBTZXJnaXBlMTIwMAYDVQQLFClOVEktTsO6Y2xl
-byBkZSBUZWNub2xvZ2lhIGRhIEluZm9ybWHDp8OjbzEaMBgGCSqGSIb3DQEJARYL
-Y2FmZUB1ZnMuYnIxEDAOBgNVBAcTB0FyYWNhanUxEDAOBgNVBAgTB1NlcmdpcGUx
-CzAJBgNVBAYTAkJSMRcwFQYDVQQDEw5kb3VyYWRvLnVmcy5icjAeFw0xNDA0MTAx
-MjMxNDFaFw0xOTA0MDkxMjMxNDFaMIHIMSwwKgYDVQQKEyNVRlMtVW5pdmVyc2lk
-YWRlIEZlZGVyYWwgZGUgU2VyZ2lwZTEyMDAGA1UECxQpTlRJLU7DumNsZW8gZGUg
-VGVjbm9sb2dpYSBkYSBJbmZvcm1hw6fDo28xGjAYBgkqhkiG9w0BCQEWC2NhZmVA
-dWZzLmJyMRAwDgYDVQQHEwdBcmFjYWp1MRAwDgYDVQQIEwdTZXJnaXBlMQswCQYD
-VQQGEwJCUjEXMBUGA1UEAxMOZG91cmFkby51ZnMuYnIwggEiMA0GCSqGSIb3DQEB
-AQUAA4IBDwAwggEKAoIBAQCuuogQEudWqFoQPdA7n9TrUUYXXauTI4yRaEuEoeyv
-KultDI/HnZDCQ1so3QIjjlWgY5bLTOuYZR/+bw1ufVCtQNH8zCgEmnbjZVuG01q2
-eoOzCyLjL7I/HwhFHTXOKoXNLyC6K2JgF4QYDISAcVG7XkhbD5dA6PGtwyCu+43h
-VKg42zu8R7KUJjj3Iu5FUTB9txGt4gM5j3twqDde6iNUXILh3Gf/V01JdGgIhLls
-Mf3d0ac1sH4Ks0KkaQsnhkc4Rt7fHDFlS3NkOTNt95oYyiOTSK/QZzbOr6TVOuC0
-8Y+ya8BE2spu37VBaUCuers4FbfFp2WIu/XO8hfG9MJTAgMBAAEwDQYJKoZIhvcN
-AQEFBQADggEBAH8eyp2vC7zx5oFdqWzFqZXkjGRQyih+grWeiNb3qCviPcCacyUl
-YQ2NuQEEDqManKPBPxAscO7UP1Rr9g3Ggh0vkL6KAxQqEFRwWxUkCnRd3z/TUrys
-aIt7WrF0J0mZx8qZQPasestDbSehM74s+pNsACQxY/zlbXD2Ybft9Mj62kxSdeMx
-JjjUtWoCYJwdzXAklw8r0ot7/TnVx1nNZRCV1mwFtzcKuwz8M5JDcI9sBlH+/oRd
-d6xRz2iXP9guO9SjSdWIz/LP3Px/E+ASWZ1LZBMwv8tTBmYbo9tEdUzG4DWEMwS2
-ppG+3mm7IVx2FODAFkApZmdPV4osxno36Ww=
-                    
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dourado.ufs.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://dourado.ufs.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">UFS - Universidade Federal de Sergipe</OrganizationName>
-    <OrganizationName xml:lang="pt-br">UFS - Universidade Federal de Sergipe</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">UFS - Universidade Federal de Sergipe</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="pt-br">UFS - Universidade Federal de Sergipe</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.ufs.br/</OrganizationURL>
-    <OrganizationURL xml:lang="pt-br">http://www.ufs.br/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Rodrigus Oliveira Feitosa</SurName>
-    <EmailAddress>rodrigus@ufs.br</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/du-idp.lanet.lv.xml b/swamid-interfederations-2.0/du-idp.lanet.lv.xml
deleted file mode 100644
index ddce5935..00000000
--- a/swamid-interfederations-2.0/du-idp.lanet.lv.xml
+++ /dev/null
@@ -1,41 +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://du-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/" registrationInstant="2013-10-10T10:10:10Z">
-      <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>
-MIIDhjCCAm4CCQC8Px9pbIuxGDANBgkqhkiG9w0BAQUFADCBhDELMAkGA1UEBhMCTFYxDTALBgNVBAgMBFJpZ2ExDTALBgNVBAcMBFJpZ2ExCzAJBgNVBAoMAkxVMQwwCgYDVQQLDANJVEQxFTATBgNVBAMMDGx1LWlkcC5sdS5sdjElMCMGCSqGSIb3DQEJARYWaXRzZXJ2aXNzIGF0IGx1IGRvdCBsdjAeFw0xMzEyMjAxMDU3MDJaFw0yOTAzMDYxMDU3MDJaMIGEMQswCQYDVQQGEwJMVjENMAsGA1UECAwEUmlnYTENMAsGA1UEBwwEUmlnYTELMAkGA1UECgwCTFUxDDAKBgNVBAsMA0lURDEVMBMGA1UEAwwMbHUtaWRwLmx1Lmx2MSUwIwYJKoZIhvcNAQkBFhZpdHNlcnZpc3MgYXQgbHUgZG90IGx2MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuAy8ri5VknGxy21iuW6kalPwg7VPZBWOuV/jVjRre44tHFd5FinCQUCuzQZn37AU3ZNZg07RRyDhkAzzpsBRQf48VcbnQFRjERuQTKUfT9hzFMxgbjxW2Dayg2Ru2LkGcIUeHilOwfmRn1NIRBN+0UyJIluRvB8YGdHSSHYSMimyw9uYEuMkU9aqewwW78w7TeasCWlB6jiGfJ/SGVtPRThJ6X6KVqoU2gwIY+V7YJkG4b5TOw4HLaIsdOmU4h1Ep3igy+Zsc/7zPn+80iwm1Jk9Q8zGlEwikjPn1N3enMOxR8wpQfAQwm5lIaHNXYFcXCj3mVQ3yQ9EzB/hRC8tHwIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQCFRpI7U/lTwoUW/HwDb2gAmjb0RSmS+5lUWDgmjP/rJwYdh672plabNcY12DiqchtBaSeTOf4qANCqEme+YBAmssFUeLx6O1J+5aXeXfCwAA9GlswGDVeC8ZnTVmQupnbvL0T+ZU8WtkltlLEJdD6o9BtEOqk3+Rspu+94d6FUwmvWB/YWypAOfzXkkSxi+87nsadiFEOyCzTW8fZotOrZMzba52ELLJgCx3IzGLUzV80PSJwLzKYHVp0VluH2DzrxfMKC01bMklG46n1nhEo1UU2KA4vzoScmrXzD+m7nKFZ3GHFjyQvtxqG7gA34qg1Vj2o2O0vN/kvjX73SR5s4
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDhjCCAm4CCQC8Px9pbIuxGDANBgkqhkiG9w0BAQUFADCBhDELMAkGA1UEBhMCTFYxDTALBgNVBAgMBFJpZ2ExDTALBgNVBAcMBFJpZ2ExCzAJBgNVBAoMAkxVMQwwCgYDVQQLDANJVEQxFTATBgNVBAMMDGx1LWlkcC5sdS5sdjElMCMGCSqGSIb3DQEJARYWaXRzZXJ2aXNzIGF0IGx1IGRvdCBsdjAeFw0xMzEyMjAxMDU3MDJaFw0yOTAzMDYxMDU3MDJaMIGEMQswCQYDVQQGEwJMVjENMAsGA1UECAwEUmlnYTENMAsGA1UEBwwEUmlnYTELMAkGA1UECgwCTFUxDDAKBgNVBAsMA0lURDEVMBMGA1UEAwwMbHUtaWRwLmx1Lmx2MSUwIwYJKoZIhvcNAQkBFhZpdHNlcnZpc3MgYXQgbHUgZG90IGx2MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuAy8ri5VknGxy21iuW6kalPwg7VPZBWOuV/jVjRre44tHFd5FinCQUCuzQZn37AU3ZNZg07RRyDhkAzzpsBRQf48VcbnQFRjERuQTKUfT9hzFMxgbjxW2Dayg2Ru2LkGcIUeHilOwfmRn1NIRBN+0UyJIluRvB8YGdHSSHYSMimyw9uYEuMkU9aqewwW78w7TeasCWlB6jiGfJ/SGVtPRThJ6X6KVqoU2gwIY+V7YJkG4b5TOw4HLaIsdOmU4h1Ep3igy+Zsc/7zPn+80iwm1Jk9Q8zGlEwikjPn1N3enMOxR8wpQfAQwm5lIaHNXYFcXCj3mVQ3yQ9EzB/hRC8tHwIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQCFRpI7U/lTwoUW/HwDb2gAmjb0RSmS+5lUWDgmjP/rJwYdh672plabNcY12DiqchtBaSeTOf4qANCqEme+YBAmssFUeLx6O1J+5aXeXfCwAA9GlswGDVeC8ZnTVmQupnbvL0T+ZU8WtkltlLEJdD6o9BtEOqk3+Rspu+94d6FUwmvWB/YWypAOfzXkkSxi+87nsadiFEOyCzTW8fZotOrZMzba52ELLJgCx3IzGLUzV80PSJwLzKYHVp0VluH2DzrxfMKC01bMklG46n1nhEo1UU2KA4vzoScmrXzD+m7nKFZ3GHFjyQvtxqG7gA34qg1Vj2o2O0vN/kvjX73SR5s4
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://du-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://du-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 - DU</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Daugavpils University - DU IDP</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://laife.lanet.lv/</OrganizationURL>
-    <OrganizationURL xml:lang="lv">http://www.du.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/e-localcourses.unibo.it.xml b/swamid-interfederations-2.0/e-localcourses.unibo.it.xml
deleted file mode 100644
index 193acefb..00000000
--- a/swamid-interfederations-2.0/e-localcourses.unibo.it.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" entityID="https://e-localcourses.unibo.it">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2014-02-17T11:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">
-                    https://www.idem.garr.it/idem-metadata-registration-practice-statement
-                </mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </Extensions>
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="en">E-LOCAL courses of languages and cultures.</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="it">Corsi E-LOCAL di lingue e culture.</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Language and culture courses of Dutch, Finnish, Hungarian, Italian, Polish and Portuguese.</mdui:Description>
-        <mdui:Description xml:lang="it">Corsi di lingua e cultura finlandese, italiana, nederlandese, polacca, portoghese e ungherese. </mdui:Description>
-        <mdui:InformationURL xml:lang="en">https://e-localcourses.unibo.it/mod/resource/view.php?id=291</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="it">https://e-localcourses.unibo.it/mod/resource/view.php?id=292</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://e-localcourses.unibo.it/mod/resource/view.php?id=289</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="it">https://e-localcourses.unibo.it/mod/resource/view.php?id=290</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://e-localcourses.unibo.it/Shibboleth.sso/UniboAuth"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDDDCCAfSgAwIBAgIJAJQYlu3GGLHwMA0GCSqGSIb3DQEBBQUAMCIxIDAeBgNV
-BAMTF2UtbG9jYWxjb3Vyc2VzLnVuaWJvLml0MB4XDTEzMDkzMDE1MzU1NVoXDTE4
-MDkyOTE1MzU1NVowIjEgMB4GA1UEAxMXZS1sb2NhbGNvdXJzZXMudW5pYm8uaXQw
-ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDAWEo6p5B59kOr233RKoan
-vSs7+6MP9DMeLgFE2IGbhiTtr8E9FAvCw2lWB1Xew5GHzQ1rVZl9DHQB3xYj3K1b
-vQ6ZTsgITqh65VJHtNguLWezB98rl8LkxPRP0iUH1BLfoL4Dg9BPm/PIxUCv0+Bf
-Hl5G8aLzSrdTnrd7tAIw8aLsy0At/5v5ShlU8KcM4K5mqrCS7SSZ7micIp6IFQkH
-L6Ctqu8u9NznYvhEBmtz7N/z4CIk2yUTx7zjwPs68Ke79T/rAbvuAb8dTSwrgKDq
-MtTR9Romp57roAfS60NH8fVOs+wsGD/q36fV7Gd98SsP9nmHwf1z+dlt6VXSA+Px
-AgMBAAGjRTBDMCIGA1UdEQQbMBmCF2UtbG9jYWxjb3Vyc2VzLnVuaWJvLml0MB0G
-A1UdDgQWBBT+SDB/78eV3AEQ1vDdZeTY+VBHQDANBgkqhkiG9w0BAQUFAAOCAQEA
-hTIVSita3rHPnKHeMKo17BjlrAZWihiAqKQe8WYxlkH/84FC3ZX0Y9U5rP41bYEV
-AjWaF22S1/zbVIxexnYLSiClxRykeEF/wsvFlDmLWSNaPFU8lEwlRUWPg3QOQOX0
-cX4GWkWRbeqjJNk9glo03imCXd6b8YVFJS5TxWTSzpzRrNkS3RMGRGKNZENWbyI5
-breUwiWdYuGgtTg4LZAjpb/ZygN0jF9b53lmKFpUEWXKblRluTcQQCss5Y8/Q82O
-XV33ikbzfFfZt6+Vl/jpXoforcFOpiiAbgKIsBnd95VtuBsBvRl+pzh3xdA2YQXS
-VrUi/sMWebysPZ53w+Pc5Q==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://e-localcourses.unibo.it/Shibboleth.sso/SLO/Redirect"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://e-localcourses.unibo.it/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AttributeConsumingService index="1">
-      <ServiceName xml:lang="en">&gt;E-LOCAL courses of languages and cultures.</ServiceName>
-      <ServiceDescription xml:lang="en">Language and culture courses of Dutch, Finnish, Hungarian, Italian, Polish and Portuguese.</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"/>
-      <RequestedAttribute FriendlyName="cn" Name="urn:oid:2.5.4.3" 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"/>
-    </AttributeConsumingService>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Bologna</OrganizationName>
-    <OrganizationName xml:lang="it">Università di Bologna</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">E-LOCAL courses of languages and cultures provided by University of Bologna</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="it">Corsi E-LOCAL di lingue e culture erogato da Università di Bologna</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.unibo.it</OrganizationURL>
-    <OrganizationURL xml:lang="it">http://www.unibo.it</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <EmailAddress>cesia-sso-support@unibo.it</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/e5.onthehub.com.xml b/swamid-interfederations-2.0/e5.onthehub.com.xml
deleted file mode 100644
index 8f554887..00000000
--- a/swamid-interfederations-2.0/e5.onthehub.com.xml
+++ /dev/null
@@ -1,152 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://e5.onthehub.com">
-  <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/eu-adequate-protection</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>e5.onthehub.com</ds:KeyName>
-        <ds:KeyName>https://e5.onthehub.com</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=e5.onthehub.com</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDDTCCAfWgAwIBAgIJAKbfgH7m+qqbMA0GCSqGSIb3DQEBBQUAMBoxGDAWBgNV
-BAMTD2U1Lm9udGhlaHViLmNvbTAeFw0xMzAyMTQxNjU2MjJaFw0yMzAyMTIxNjU2
-MjJaMBoxGDAWBgNVBAMTD2U1Lm9udGhlaHViLmNvbTCCASIwDQYJKoZIhvcNAQEB
-BQADggEPADCCAQoCggEBAMPdcbl3hSq/42be9Xa5j7utNC0Ul1yS4JGLq4nEOP00
-VKMpzHAPTVZyc4h/vffPvVo0sEJ8s6qpcb9dnPZpKj4S2Jg5tWBtmJaZw6TsyOn0
-CHLox9NCwxS8Zz6DIRfuVY2ra+X8a5FR45voE80yeuB6AXH6hfOt81a6EYYAcCe2
-C8PocbRBBabRttUC8mMlcwBd22zO3k9guOJtpfMnCrBrl777h4g9zecLkVcdKwMB
-kmiGRxxYsCNeJUV5rVp6dwbVxPCnktRfavF43Fs8F7W11XKUoa4oS+BONM7IXtz5
-BirkXphcFit7KOFpeXENIXs2AKBwfcp5AvYZy6M6BX8CAwEAAaNWMFQwMwYDVR0R
-BCwwKoIPZTUub250aGVodWIuY29thhdodHRwczovL2U1Lm9udGhlaHViLmNvbTAd
-BgNVHQ4EFgQU5L1EIH24QVlXj4VDtjBocWPsrXEwDQYJKoZIhvcNAQEFBQADggEB
-AGAqH+9sP0Msq8iAj4AZv/TUHziUzCqwNQtfjKSHRkuT1mM5y7M78CVfdPpMYdCc
-kcnYDc3O2S8lliPcTKSrnEE24gPonVxoALCgdLf+oWaA+1BP1T66HDuXkM7NOuH5
-wySxOT3jXmNxymoGsVrT4f2k5Zt9+JCiLIiEJDXzqpJ+6H9k39YBtnUR+EooQr9m
-27vpFCFJWdvxCaRAJzB6ALkdtepu6GAn2ZR+jlJKB2ZheIFcEpuxphtbqFNc37S0
-/RHXXZ7eJ4LIqg7QHc+bvhjPRwx74BajIntgwn5YbOyYWvBU2rEYS41bdNo/6p4S
-tsXRh8I9G2b+om6fhCjEUmM=
-</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>e5.onthehub.com</ds:KeyName>
-        <ds:KeyName>https://e5.onthehub.com</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=e5.onthehub.com</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDDTCCAfWgAwIBAgIJAKiojggOXwYSMA0GCSqGSIb3DQEBBQUAMBoxGDAWBgNV
-BAMTD2U1Lm9udGhlaHViLmNvbTAeFw0xMDAzMTkxODA0MjlaFw0xMzAzMTgxODA0
-MjlaMBoxGDAWBgNVBAMTD2U1Lm9udGhlaHViLmNvbTCCASIwDQYJKoZIhvcNAQEB
-BQADggEPADCCAQoCggEBALQ7NHoOjHN6VTNmMUBqlDXcbEbgjPcrjlMrW5s3JNWh
-61NT+AD+8+K0m4288Rc4yTuyaYcCc6K+erCPkivkktudh4rVProuClfpXTgEl+IF
-YkfHbeZHEc2tMLMrQ6zWpcUBiSPdKjhEgVWGe6q/lW2KWRsmbx2lCufhtSfAwyCb
-j/+Nt8tlF8+Tmi5SEZ1HbUhSRMdIKHU8epMkeRd7fPXgO/lqzKF1TIi3eO+L63KW
-4zC0O39Uh6ftULWvCvpyxVAhiQGId092CV8CxuqQPY4lXPDtTKcS0pZLtvlAAD3X
-UhdVOszNxL43oEVQyv/Vr5abab4C1ghZQ26KGaWpqDkCAwEAAaNWMFQwMwYDVR0R
-BCwwKoIPZTUub250aGVodWIuY29thhdodHRwczovL2U1Lm9udGhlaHViLmNvbTAd
-BgNVHQ4EFgQUiAUx8mQA/+5rLbZsyk/QgfTIKRgwDQYJKoZIhvcNAQEFBQADggEB
-AFl0fsWKeym+vqb8O7lPxICZpAMcr9hXn0/XA7FzTluuno4/+uRTljBn3rsPFoe5
-gxl+CtDFQnZ/ZKd6PAv6ulbj1w86JXiQ2dVjzPTSHnIzy408NLHiUKj5p7KmtvP6
-VUBknIxbt6krRtkAHWqpA4ykvAW5TyPSk7DFwFI+/lNlcegmMwlk9bVhIB9s6HdI
-K1+Mvw3ek0GCAlo2ucgpEIFXrRwMLLnucXLdWVug9w+ScsmKp19DlnpS2UMmRMfq
-eWPEpGoM/tepFG/JensNMEA41WKCXmmbruIGlh3TWFRE8s0JG3b8jy8aB3mgzq9T
-l8qQhkUldJphTqx2PEHORBM=
-</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>e5.onthehub.com</ds:KeyName>
-        <ds:KeyName>https://e5.onthehub.com</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=e5.onthehub.com</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDDTCCAfWgAwIBAgIJAKbfgH7m+qqbMA0GCSqGSIb3DQEBBQUAMBoxGDAWBgNV
-BAMTD2U1Lm9udGhlaHViLmNvbTAeFw0xMzAyMTQxNjU2MjJaFw0yMzAyMTIxNjU2
-MjJaMBoxGDAWBgNVBAMTD2U1Lm9udGhlaHViLmNvbTCCASIwDQYJKoZIhvcNAQEB
-BQADggEPADCCAQoCggEBAMPdcbl3hSq/42be9Xa5j7utNC0Ul1yS4JGLq4nEOP00
-VKMpzHAPTVZyc4h/vffPvVo0sEJ8s6qpcb9dnPZpKj4S2Jg5tWBtmJaZw6TsyOn0
-CHLox9NCwxS8Zz6DIRfuVY2ra+X8a5FR45voE80yeuB6AXH6hfOt81a6EYYAcCe2
-C8PocbRBBabRttUC8mMlcwBd22zO3k9guOJtpfMnCrBrl777h4g9zecLkVcdKwMB
-kmiGRxxYsCNeJUV5rVp6dwbVxPCnktRfavF43Fs8F7W11XKUoa4oS+BONM7IXtz5
-BirkXphcFit7KOFpeXENIXs2AKBwfcp5AvYZy6M6BX8CAwEAAaNWMFQwMwYDVR0R
-BCwwKoIPZTUub250aGVodWIuY29thhdodHRwczovL2U1Lm9udGhlaHViLmNvbTAd
-BgNVHQ4EFgQU5L1EIH24QVlXj4VDtjBocWPsrXEwDQYJKoZIhvcNAQEFBQADggEB
-AGAqH+9sP0Msq8iAj4AZv/TUHziUzCqwNQtfjKSHRkuT1mM5y7M78CVfdPpMYdCc
-kcnYDc3O2S8lliPcTKSrnEE24gPonVxoALCgdLf+oWaA+1BP1T66HDuXkM7NOuH5
-wySxOT3jXmNxymoGsVrT4f2k5Zt9+JCiLIiEJDXzqpJ+6H9k39YBtnUR+EooQr9m
-27vpFCFJWdvxCaRAJzB6ALkdtepu6GAn2ZR+jlJKB2ZheIFcEpuxphtbqFNc37S0
-/RHXXZ7eJ4LIqg7QHc+bvhjPRwx74BajIntgwn5YbOyYWvBU2rEYS41bdNo/6p4S
-tsXRh8I9G2b+om6fhCjEUmM=
-</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>e5.onthehub.com</ds:KeyName>
-        <ds:KeyName>https://e5.onthehub.com</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=e5.onthehub.com</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDDTCCAfWgAwIBAgIJAKiojggOXwYSMA0GCSqGSIb3DQEBBQUAMBoxGDAWBgNV
-BAMTD2U1Lm9udGhlaHViLmNvbTAeFw0xMDAzMTkxODA0MjlaFw0xMzAzMTgxODA0
-MjlaMBoxGDAWBgNVBAMTD2U1Lm9udGhlaHViLmNvbTCCASIwDQYJKoZIhvcNAQEB
-BQADggEPADCCAQoCggEBALQ7NHoOjHN6VTNmMUBqlDXcbEbgjPcrjlMrW5s3JNWh
-61NT+AD+8+K0m4288Rc4yTuyaYcCc6K+erCPkivkktudh4rVProuClfpXTgEl+IF
-YkfHbeZHEc2tMLMrQ6zWpcUBiSPdKjhEgVWGe6q/lW2KWRsmbx2lCufhtSfAwyCb
-j/+Nt8tlF8+Tmi5SEZ1HbUhSRMdIKHU8epMkeRd7fPXgO/lqzKF1TIi3eO+L63KW
-4zC0O39Uh6ftULWvCvpyxVAhiQGId092CV8CxuqQPY4lXPDtTKcS0pZLtvlAAD3X
-UhdVOszNxL43oEVQyv/Vr5abab4C1ghZQ26KGaWpqDkCAwEAAaNWMFQwMwYDVR0R
-BCwwKoIPZTUub250aGVodWIuY29thhdodHRwczovL2U1Lm9udGhlaHViLmNvbTAd
-BgNVHQ4EFgQUiAUx8mQA/+5rLbZsyk/QgfTIKRgwDQYJKoZIhvcNAQEFBQADggEB
-AFl0fsWKeym+vqb8O7lPxICZpAMcr9hXn0/XA7FzTluuno4/+uRTljBn3rsPFoe5
-gxl+CtDFQnZ/ZKd6PAv6ulbj1w86JXiQ2dVjzPTSHnIzy408NLHiUKj5p7KmtvP6
-VUBknIxbt6krRtkAHWqpA4ykvAW5TyPSk7DFwFI+/lNlcegmMwlk9bVhIB9s6HdI
-K1+Mvw3ek0GCAlo2ucgpEIFXrRwMLLnucXLdWVug9w+ScsmKp19DlnpS2UMmRMfq
-eWPEpGoM/tepFG/JensNMEA41WKCXmmbruIGlh3TWFRE8s0JG3b8jy8aB3mgzq9T
-l8qQhkUldJphTqx2PEHORBM=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://e5.onthehub.com/WebStore/Security/Shibboleth/SWAMID/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://e5.onthehub.com/WebStore/Security/Shibboleth/SWAMID/Shibboleth.sso/SLO/Artifact"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://e5.onthehub.com/WebStore/Security/Shibboleth/SWAMID/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://e5.onthehub.com/WebStore/Security/Shibboleth/SWAMID/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://e5.onthehub.com/WebStore/Security/Shibboleth/SWAMID/Shibboleth.sso/SLO/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://e5.onthehub.com/WebStore/Security/Shibboleth/SWAMID/Shibboleth.sso/NIM/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://e5.onthehub.com/WebStore/Security/Shibboleth/SWAMID/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://e5.onthehub.com/WebStore/Security/Shibboleth/SWAMID/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://e5.onthehub.com/WebStore/Security/Shibboleth/SWAMID/Shibboleth.sso/NIM/SOAP"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://e5.onthehub.com/WebStore/Security/Shibboleth/SWAMID/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://e5.onthehub.com/WebStore/Security/Shibboleth/SWAMID/Shibboleth.sso/SAML/POST" index="7"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://e5.onthehub.com/WebStore/Security/Shibboleth/SWAMID/Shibboleth.sso/SAML2/Artifact" index="8"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://e5.onthehub.com/WebStore/Security/Shibboleth/SWAMID/Shibboleth.sso/SAML2/ECP" index="9"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://e5.onthehub.com/WebStore/Security/Shibboleth/SWAMID/Shibboleth.sso/SAML2/POST" index="10"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://e5.onthehub.com/WebStore/Security/Shibboleth/SWAMID/Shibboleth.sso/SAML2/POST-SimpleSign" index="11"/>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">e-academy,Inc</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">e-academy</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.e-academy.com</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Shibboleth Technical Team</md:GivenName>
-    <md:EmailAddress>Shibboleth@e-academy.com</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Shibboleth Administration Team</md:GivenName>
-    <md:EmailAddress>Shibboleth@e-academy.com</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/earthserver-sg.consorzio-cometa.it-shibboleth.xml b/swamid-interfederations-2.0/earthserver-sg.consorzio-cometa.it-shibboleth.xml
deleted file mode 100644
index 186861f5..00000000
--- a/swamid-interfederations-2.0/earthserver-sg.consorzio-cometa.it-shibboleth.xml
+++ /dev/null
@@ -1,99 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" entityID="https://earthserver-sg.consorzio-cometa.it/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2012-04-11T15:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement
-                </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>
-        <mdui:DisplayName xml:lang="en">EarthServer Science Gateway</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="it">EarthServer Science Gateway</mdui:DisplayName>
-        <mdui:Description xml:lang="en">This service allows to use on a Grid infrastructure the applications of the EarthServer project which provides Earth and planetary science researchers with tools to achieve barrier-free "mix and match" access to multi-source, any-size, multi-dimensional spatio-temporal data based on open standards.</mdui:Description>
-        <mdui:Description xml:lang="it">Questo servizio permette l'accesso e l'uso delle applicazioni/servizi sviluppati per il progetto europeo EarthServer che ha come obiettivo quello di fornire a ricercatori sui problemi della terra e degli astri tool l'accesso senza limiti ad un mix di dati provenienti da diverse sorgenti, con differenti dimensione e spazio-temporali, basati su open standards.</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://earthserver-sg.consorzio-cometa.it/service</mdui:InformationURL>
-      </mdui:UIInfo>
-      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://earthserver-sg.consorzio-cometa.it/Shibboleth.sso/DS"/>
-      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://earthserver-sg.consorzio-cometa.it/Shibboleth.sso/DS" index="1"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIF0TCCBLmgAwIBAgIRAJjvs9uxU/ydSPVPqQh6szEwDQYJKoZIhvcNAQEFBQAw
-NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-IFNTTCBDQTAeFw0xMzAxMDcwMDAwMDBaFw0xNjAxMDcyMzU5NTlaMIHFMQswCQYD
-VQQGEwJJVDEOMAwGA1UEERMFOTUxMjMxDjAMBgNVBAgTBUl0YWx5MRAwDgYDVQQH
-EwdDYXRhbmlhMRkwFwYDVQQJExBWaWEgUy5Tb2ZpYSBuLjY0MS4wLAYDVQQKEyVJ
-c3RpdHV0byBOYXppb25hbGUgZGkgRmlzaWNhIE51Y2xlYXJlMQ8wDQYDVQQLEwZD
-T01FVEExKDAmBgNVBAMTH3d3dy5jYXRhbmlhLXNjaWVuY2UtZ2F0ZXdheXMuaXQw
-ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDMR2RMw4cNImWSKdvZjDhz
-3JuO7/pMOnGw4hF6uu09cqX8qqBpkU/gd33xq7J254ojywwiIlLT7QaTce4YQU2W
-O5mPyqdHjnpA+C0fJWrQgRyJEXsOzwpxyUG42tim/9jgNNDaUuNSGgrMLGlzl0sU
-i3Cq04AY0hukrtFGe6DFvDsm8xoNwfV8jmO3IipWJdJdezRnCGDgTZqgIWj3yrHo
-LjfgLbs85AJ31plMahcEni1jDZYgzu7FurbKpO4FGSLUEI8VUxncdYx3IWidqYBD
-TjxFGIiRIcD59DTIBxZYT4IgGHhG1whnUtE7nZhtuxFvnxfH4gPi7mPcRwidNHg9
-AgMBAAGjggJIMIICRDAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3V0fqkOO57TAd
-BgNVHQ4EFgQU+qOkofxo+Ei3aGD2lLEkM4L7LS0wDgYDVR0PAQH/BAQDAgWgMAwG
-A1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMCIGA1Ud
-IAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQICMDoGA1UdHwQzMDEwL6AtoCuG
-KWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3JsMG0GCCsG
-AQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50Y3MudGVyZW5hLm9y
-Zy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9vY3NwLnRjcy50
-ZXJlbmEub3JnMIH1BgNVHREEge0wgeqCH3d3dy5jYXRhbmlhLXNjaWVuY2UtZ2F0
-ZXdheXMuaXSCFWFnaW5mcmEtc2cuY3QuaW5mbi5pdIIVY29naXRvLW1lZC5jdC5p
-bmZuLml0giJlYXJ0aHNlcnZlci1zZy5jb25zb3J6aW8tY29tZXRhLml0gg5lY3Nn
-LmRjaC1ycC5ldYISZ2Fyci1zZy5jdC5pbmZuLml0ghBrbGlvcy5jdC5pbmZuLml0
-ghNsaWZlcmF5Mi5jdC5pbmZuLml0ghNzZ3cuYWZyaWNhLWdyaWQub3JnghV3d3cu
-cHJvZ2V0dG8taWNhcm8uaXQwDQYJKoZIhvcNAQEFBQADggEBAIzikPZKDI8rXlUU
-iF8KUeEVYZMyBfRtl0sQYBZCprDoVpCr74CPTxQ72Jrh2mD8oAz0ZYVgOA19AbM8
-PskJlhx4bmDJvWU/C2FrOgYDNg9Tl7dqLnr18GDt7DuC0KXCDupgtBmwy7mayNgA
-n2jbIaYsfMI7k1msS1XoaVX7kBMgmeGY3V11Om9Te7iMWKFOhpavI2hbf741ODtV
-zBen58Q2WzjVEKVQYbY7UgtcYzOM44GhMcdS65lLsBviK7HzyB6I5Iu3TR0bcpFE
-2V4bd6L5foq3Qn+WO9wqOwnOk3qfD/TQId7NWv0ZE2vp8fPPaaRF2XcA7Qh5xltt
-j/MCNlE=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://earthserver-sg.consorzio-cometa.it/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://earthserver-sg.consorzio-cometa.it/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://earthserver-sg.consorzio-cometa.it/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://earthserver-sg.consorzio-cometa.it/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://earthserver-sg.consorzio-cometa.it/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://earthserver-sg.consorzio-cometa.it/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://earthserver-sg.consorzio-cometa.it/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://earthserver-sg.consorzio-cometa.it/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://earthserver-sg.consorzio-cometa.it/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://earthserver-sg.consorzio-cometa.it/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://earthserver-sg.consorzio-cometa.it/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <AttributeConsumingService index="1">
-      <ServiceName xml:lang="en">EarthServer Science Gateway</ServiceName>
-      <ServiceDescription xml:lang="en">This service allows to use on a Grid infrastructure the applications of the EarthServer project which provides Earth and planetary science researchers with tools to achieve barrier-free "mix and match" access to multi-source, any-size, multi-dimensional spatio-temporal data based on open standards.</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"/>
-    </AttributeConsumingService>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Consorzio COMETA</OrganizationName>
-    <OrganizationName xml:lang="it">Consorzio COMETA</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Earth Server Science Gateway provided by Consorzio COMETA</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="it">Earth Server Science Gateway erogato da Consorzio COMETA</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.consorzio-cometa.it/en/home</OrganizationURL>
-    <OrganizationURL xml:lang="it">http://www.consorzio-cometa.it/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Riccardo</GivenName>
-    <SurName>Bruno</SurName>
-    <EmailAddress>riccardo.bruno@ct.infn.it</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <EmailAddress>credentials-admin@ct.infn.it</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="administrative">
-    <GivenName>Roberto</GivenName>
-    <SurName>Barbera</SurName>
-    <EmailAddress>roberto.barbera@ct.infn.it</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/earthserver-sg.consorzio-cometa.it.xml b/swamid-interfederations-2.0/earthserver-sg.consorzio-cometa.it.xml
deleted file mode 100644
index 186861f5..00000000
--- a/swamid-interfederations-2.0/earthserver-sg.consorzio-cometa.it.xml
+++ /dev/null
@@ -1,99 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" entityID="https://earthserver-sg.consorzio-cometa.it/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2012-04-11T15:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement
-                </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>
-        <mdui:DisplayName xml:lang="en">EarthServer Science Gateway</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="it">EarthServer Science Gateway</mdui:DisplayName>
-        <mdui:Description xml:lang="en">This service allows to use on a Grid infrastructure the applications of the EarthServer project which provides Earth and planetary science researchers with tools to achieve barrier-free "mix and match" access to multi-source, any-size, multi-dimensional spatio-temporal data based on open standards.</mdui:Description>
-        <mdui:Description xml:lang="it">Questo servizio permette l'accesso e l'uso delle applicazioni/servizi sviluppati per il progetto europeo EarthServer che ha come obiettivo quello di fornire a ricercatori sui problemi della terra e degli astri tool l'accesso senza limiti ad un mix di dati provenienti da diverse sorgenti, con differenti dimensione e spazio-temporali, basati su open standards.</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://earthserver-sg.consorzio-cometa.it/service</mdui:InformationURL>
-      </mdui:UIInfo>
-      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://earthserver-sg.consorzio-cometa.it/Shibboleth.sso/DS"/>
-      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://earthserver-sg.consorzio-cometa.it/Shibboleth.sso/DS" index="1"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIF0TCCBLmgAwIBAgIRAJjvs9uxU/ydSPVPqQh6szEwDQYJKoZIhvcNAQEFBQAw
-NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-IFNTTCBDQTAeFw0xMzAxMDcwMDAwMDBaFw0xNjAxMDcyMzU5NTlaMIHFMQswCQYD
-VQQGEwJJVDEOMAwGA1UEERMFOTUxMjMxDjAMBgNVBAgTBUl0YWx5MRAwDgYDVQQH
-EwdDYXRhbmlhMRkwFwYDVQQJExBWaWEgUy5Tb2ZpYSBuLjY0MS4wLAYDVQQKEyVJ
-c3RpdHV0byBOYXppb25hbGUgZGkgRmlzaWNhIE51Y2xlYXJlMQ8wDQYDVQQLEwZD
-T01FVEExKDAmBgNVBAMTH3d3dy5jYXRhbmlhLXNjaWVuY2UtZ2F0ZXdheXMuaXQw
-ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDMR2RMw4cNImWSKdvZjDhz
-3JuO7/pMOnGw4hF6uu09cqX8qqBpkU/gd33xq7J254ojywwiIlLT7QaTce4YQU2W
-O5mPyqdHjnpA+C0fJWrQgRyJEXsOzwpxyUG42tim/9jgNNDaUuNSGgrMLGlzl0sU
-i3Cq04AY0hukrtFGe6DFvDsm8xoNwfV8jmO3IipWJdJdezRnCGDgTZqgIWj3yrHo
-LjfgLbs85AJ31plMahcEni1jDZYgzu7FurbKpO4FGSLUEI8VUxncdYx3IWidqYBD
-TjxFGIiRIcD59DTIBxZYT4IgGHhG1whnUtE7nZhtuxFvnxfH4gPi7mPcRwidNHg9
-AgMBAAGjggJIMIICRDAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3V0fqkOO57TAd
-BgNVHQ4EFgQU+qOkofxo+Ei3aGD2lLEkM4L7LS0wDgYDVR0PAQH/BAQDAgWgMAwG
-A1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMCIGA1Ud
-IAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQICMDoGA1UdHwQzMDEwL6AtoCuG
-KWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3JsMG0GCCsG
-AQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50Y3MudGVyZW5hLm9y
-Zy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9vY3NwLnRjcy50
-ZXJlbmEub3JnMIH1BgNVHREEge0wgeqCH3d3dy5jYXRhbmlhLXNjaWVuY2UtZ2F0
-ZXdheXMuaXSCFWFnaW5mcmEtc2cuY3QuaW5mbi5pdIIVY29naXRvLW1lZC5jdC5p
-bmZuLml0giJlYXJ0aHNlcnZlci1zZy5jb25zb3J6aW8tY29tZXRhLml0gg5lY3Nn
-LmRjaC1ycC5ldYISZ2Fyci1zZy5jdC5pbmZuLml0ghBrbGlvcy5jdC5pbmZuLml0
-ghNsaWZlcmF5Mi5jdC5pbmZuLml0ghNzZ3cuYWZyaWNhLWdyaWQub3JnghV3d3cu
-cHJvZ2V0dG8taWNhcm8uaXQwDQYJKoZIhvcNAQEFBQADggEBAIzikPZKDI8rXlUU
-iF8KUeEVYZMyBfRtl0sQYBZCprDoVpCr74CPTxQ72Jrh2mD8oAz0ZYVgOA19AbM8
-PskJlhx4bmDJvWU/C2FrOgYDNg9Tl7dqLnr18GDt7DuC0KXCDupgtBmwy7mayNgA
-n2jbIaYsfMI7k1msS1XoaVX7kBMgmeGY3V11Om9Te7iMWKFOhpavI2hbf741ODtV
-zBen58Q2WzjVEKVQYbY7UgtcYzOM44GhMcdS65lLsBviK7HzyB6I5Iu3TR0bcpFE
-2V4bd6L5foq3Qn+WO9wqOwnOk3qfD/TQId7NWv0ZE2vp8fPPaaRF2XcA7Qh5xltt
-j/MCNlE=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://earthserver-sg.consorzio-cometa.it/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://earthserver-sg.consorzio-cometa.it/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://earthserver-sg.consorzio-cometa.it/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://earthserver-sg.consorzio-cometa.it/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://earthserver-sg.consorzio-cometa.it/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://earthserver-sg.consorzio-cometa.it/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://earthserver-sg.consorzio-cometa.it/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://earthserver-sg.consorzio-cometa.it/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://earthserver-sg.consorzio-cometa.it/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://earthserver-sg.consorzio-cometa.it/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://earthserver-sg.consorzio-cometa.it/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <AttributeConsumingService index="1">
-      <ServiceName xml:lang="en">EarthServer Science Gateway</ServiceName>
-      <ServiceDescription xml:lang="en">This service allows to use on a Grid infrastructure the applications of the EarthServer project which provides Earth and planetary science researchers with tools to achieve barrier-free "mix and match" access to multi-source, any-size, multi-dimensional spatio-temporal data based on open standards.</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"/>
-    </AttributeConsumingService>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Consorzio COMETA</OrganizationName>
-    <OrganizationName xml:lang="it">Consorzio COMETA</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Earth Server Science Gateway provided by Consorzio COMETA</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="it">Earth Server Science Gateway erogato da Consorzio COMETA</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.consorzio-cometa.it/en/home</OrganizationURL>
-    <OrganizationURL xml:lang="it">http://www.consorzio-cometa.it/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Riccardo</GivenName>
-    <SurName>Bruno</SurName>
-    <EmailAddress>riccardo.bruno@ct.infn.it</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <EmailAddress>credentials-admin@ct.infn.it</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="administrative">
-    <GivenName>Roberto</GivenName>
-    <SurName>Barbera</SurName>
-    <EmailAddress>roberto.barbera@ct.infn.it</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/easydb.geschkult.fu-berlin.de-shibboleth.xml b/swamid-interfederations-2.0/easydb.geschkult.fu-berlin.de-shibboleth.xml
deleted file mode 100644
index f3f2241a..00000000
--- a/swamid-interfederations-2.0/easydb.geschkult.fu-berlin.de-shibboleth.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://easydb.geschkult.fu-berlin.de/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2014-10-21T05:40:43Z">
-      <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">EasyDB (Digitale Diathek) an der FU Berlin</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">EasyDB (Digitale Diathek) an der FU Berlin</mdui:DisplayName>
-        <mdui:Description xml:lang="de">EasyDB ist die gemeinsame Bilddatenbank der archäologischen und die kunsthistorischen Fächer des Fachbereich Geschichts- und Kulturwissenschaften der Freien Universität Berlin. Sie bietet Zugriff auf derzeit 250.000 Bilder für Forschung und Lehre.</mdui:Description>
-        <mdui:Description xml:lang="en">EasyDB ist die gemeinsame Bilddatenbank der archäologischen und die kunsthistorischen Fächer des Fachbereich Geschichts- und Kulturwissenschaften der Freien Universität Berlin. Sie bietet Zugriff auf derzeit 250.000 Bilder für Forschung und Lehre.</mdui:Description>
-        <mdui:InformationURL xml:lang="de">http://www.geschkult.fu-berlin.de/e/khi/diathek/digitale_diathek/index.html</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">http://www.geschkult.fu-berlin.de/e/khi/diathek/digitale_diathek/index.html</mdui:InformationURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>easydb.geschkult.fu-berlin.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=easydb.geschkult.fu-berlin.de,OU=Fachbereich Geschichts- und Kulturwissenschaften,O=Freie Universitaet Berlin,L=Berlin,ST=Berlin,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFkzCCBHugAwIBAgIHE7TczjDCKjANBgkqhkiG9w0BAQUFADCBtTELMAkGA1UE
-BhMCREUxDzANBgNVBAgTBkJlcmxpbjEPMA0GA1UEBxMGQmVybGluMSIwIAYDVQQK
-ExlGcmVpZSBVbml2ZXJzaXRhZXQgQmVybGluMQ4wDAYDVQQLEwVaRURBVDEwMC4G
-A1UEAxMnRnJlaWUgVW5pdmVyc2l0YWV0IEJlcmxpbiAtIEZVLUNBIC0gRzAxMR4w
-HAYJKoZIhvcNAQkBFg9jYUBGVS1CZXJsaW4uREUwHhcNMTIwNDIzMTM1NTEwWhcN
-MTcwNDIyMTM1NTEwWjCBtjELMAkGA1UEBhMCREUxDzANBgNVBAgTBkJlcmxpbjEP
-MA0GA1UEBxMGQmVybGluMSIwIAYDVQQKExlGcmVpZSBVbml2ZXJzaXRhZXQgQmVy
-bGluMTkwNwYDVQQLEzBGYWNoYmVyZWljaCBHZXNjaGljaHRzLSB1bmQgS3VsdHVy
-d2lzc2Vuc2NoYWZ0ZW4xJjAkBgNVBAMTHWVhc3lkYi5nZXNjaGt1bHQuZnUtYmVy
-bGluLmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApP7F9ySZ1qMs
-Pm1YPt3amWqd9NpjBxQdGSvWW8s5YO5yc/zM7K6s6jp71J9BEq6gQbCOb1J1Rkwu
-ANyZIbKF9YPzKixntzebSUt228zxCZmBL2zSvIVBOKxX0SXoRc3te93w4yhd1wK0
-zIkN/r4r7sCEbM7GUScLVnwn6vgVT0amPJ973sd1NEpkFiDqgvnOp9MbVRmejlVy
-OIcgeWBO7k+kR6wk8pZKhHv1EeUSI0MdN5NcuhcHLJqlTCS9mtao5wjHbKqOrsZq
-3+2BhAK+YsmU8kBAEWTJuGL295e0JUHg+n13/9TApNFckOgezXF3LTrQuht0aV8c
-AqYhXz7W6wIDAQABo4IBozCCAZ8wHAYDVR0gBBUwEzARBg8rBgEEAYGtIYIsAQEE
-AgIwCQYDVR0TBAIwADALBgNVHQ8EBAMCBeAwHQYDVR0lBBYwFAYIKwYBBQUHAwIG
-CCsGAQUFBwMBMB0GA1UdDgQWBBTDwIXCByjCQwen9jTvzxD9U2HzlTAfBgNVHSME
-GDAWgBQG4T30b/Qwt3o7V7AxBYl7DVhabDB1BgNVHR8EbjBsMDSgMqAwhi5odHRw
-Oi8vY2RwMS5wY2EuZGZuLmRlL2Z1LWNhL3B1Yi9jcmwvY2FjcmwuY3JsMDSgMqAw
-hi5odHRwOi8vY2RwMi5wY2EuZGZuLmRlL2Z1LWNhL3B1Yi9jcmwvY2FjcmwuY3Js
-MIGQBggrBgEFBQcBAQSBgzCBgDA+BggrBgEFBQcwAoYyaHR0cDovL2NkcDEucGNh
-LmRmbi5kZS9mdS1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwPgYIKwYBBQUHMAKG
-Mmh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvZnUtY2EvcHViL2NhY2VydC9jYWNlcnQu
-Y3J0MA0GCSqGSIb3DQEBBQUAA4IBAQBpQGFGtc2dC1+eoRR9ULUohMVt4uQLucbz
-qKueAVHWDlHOb1GwehouIMAjmff5thm2O3DtpF2XzhMgVfsWArozAzpNBOBuvn25
-gyUQvDcwNzd4p07EacdtCO4L3DWKbbaSCRiYETC+Z5JZRVHlGKfJezIT0165eyOD
-7Avdrp64lqZHvJgdunrn3dHHjhG9W33hWkUo1b3yVWnxy3gwK0LcVPGIRc43Jtx2
-Qin/U8AZ72GKn3mx2zhB4rPMC2hlSVd+uRl/tYJ+XCxQBlTr20lFE+YugukP64HY
-DrH/2UPUl2lUMBXA64UsRXgFovJd0H/EXzNJhEdFsrRUOQLx+GzD
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>easydb.geschkult.fu-berlin.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=easydb.geschkult.fu-berlin.de,OU=Fachbereich Geschichts- und Kulturwissenschaften,O=Freie Universitaet Berlin,L=Berlin,ST=Berlin,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFkzCCBHugAwIBAgIHE7TczjDCKjANBgkqhkiG9w0BAQUFADCBtTELMAkGA1UE
-BhMCREUxDzANBgNVBAgTBkJlcmxpbjEPMA0GA1UEBxMGQmVybGluMSIwIAYDVQQK
-ExlGcmVpZSBVbml2ZXJzaXRhZXQgQmVybGluMQ4wDAYDVQQLEwVaRURBVDEwMC4G
-A1UEAxMnRnJlaWUgVW5pdmVyc2l0YWV0IEJlcmxpbiAtIEZVLUNBIC0gRzAxMR4w
-HAYJKoZIhvcNAQkBFg9jYUBGVS1CZXJsaW4uREUwHhcNMTIwNDIzMTM1NTEwWhcN
-MTcwNDIyMTM1NTEwWjCBtjELMAkGA1UEBhMCREUxDzANBgNVBAgTBkJlcmxpbjEP
-MA0GA1UEBxMGQmVybGluMSIwIAYDVQQKExlGcmVpZSBVbml2ZXJzaXRhZXQgQmVy
-bGluMTkwNwYDVQQLEzBGYWNoYmVyZWljaCBHZXNjaGljaHRzLSB1bmQgS3VsdHVy
-d2lzc2Vuc2NoYWZ0ZW4xJjAkBgNVBAMTHWVhc3lkYi5nZXNjaGt1bHQuZnUtYmVy
-bGluLmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApP7F9ySZ1qMs
-Pm1YPt3amWqd9NpjBxQdGSvWW8s5YO5yc/zM7K6s6jp71J9BEq6gQbCOb1J1Rkwu
-ANyZIbKF9YPzKixntzebSUt228zxCZmBL2zSvIVBOKxX0SXoRc3te93w4yhd1wK0
-zIkN/r4r7sCEbM7GUScLVnwn6vgVT0amPJ973sd1NEpkFiDqgvnOp9MbVRmejlVy
-OIcgeWBO7k+kR6wk8pZKhHv1EeUSI0MdN5NcuhcHLJqlTCS9mtao5wjHbKqOrsZq
-3+2BhAK+YsmU8kBAEWTJuGL295e0JUHg+n13/9TApNFckOgezXF3LTrQuht0aV8c
-AqYhXz7W6wIDAQABo4IBozCCAZ8wHAYDVR0gBBUwEzARBg8rBgEEAYGtIYIsAQEE
-AgIwCQYDVR0TBAIwADALBgNVHQ8EBAMCBeAwHQYDVR0lBBYwFAYIKwYBBQUHAwIG
-CCsGAQUFBwMBMB0GA1UdDgQWBBTDwIXCByjCQwen9jTvzxD9U2HzlTAfBgNVHSME
-GDAWgBQG4T30b/Qwt3o7V7AxBYl7DVhabDB1BgNVHR8EbjBsMDSgMqAwhi5odHRw
-Oi8vY2RwMS5wY2EuZGZuLmRlL2Z1LWNhL3B1Yi9jcmwvY2FjcmwuY3JsMDSgMqAw
-hi5odHRwOi8vY2RwMi5wY2EuZGZuLmRlL2Z1LWNhL3B1Yi9jcmwvY2FjcmwuY3Js
-MIGQBggrBgEFBQcBAQSBgzCBgDA+BggrBgEFBQcwAoYyaHR0cDovL2NkcDEucGNh
-LmRmbi5kZS9mdS1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwPgYIKwYBBQUHMAKG
-Mmh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvZnUtY2EvcHViL2NhY2VydC9jYWNlcnQu
-Y3J0MA0GCSqGSIb3DQEBBQUAA4IBAQBpQGFGtc2dC1+eoRR9ULUohMVt4uQLucbz
-qKueAVHWDlHOb1GwehouIMAjmff5thm2O3DtpF2XzhMgVfsWArozAzpNBOBuvn25
-gyUQvDcwNzd4p07EacdtCO4L3DWKbbaSCRiYETC+Z5JZRVHlGKfJezIT0165eyOD
-7Avdrp64lqZHvJgdunrn3dHHjhG9W33hWkUo1b3yVWnxy3gwK0LcVPGIRc43Jtx2
-Qin/U8AZ72GKn3mx2zhB4rPMC2hlSVd+uRl/tYJ+XCxQBlTr20lFE+YugukP64HY
-DrH/2UPUl2lUMBXA64UsRXgFovJd0H/EXzNJhEdFsrRUOQLx+GzD
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://easydb.geschkult.fu-berlin.de/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://easydb.geschkult.fu-berlin.de/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://easydb.geschkult.fu-berlin.de/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://easydb.geschkult.fu-berlin.de/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://easydb.geschkult.fu-berlin.de/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://easydb.geschkult.fu-berlin.de/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://easydb.geschkult.fu-berlin.de/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://easydb.geschkult.fu-berlin.de/Shibboleth.sso/NIM/Artifact"/>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://easydb.geschkult.fu-berlin.de/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://easydb.geschkult.fu-berlin.de/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://easydb.geschkult.fu-berlin.de/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://easydb.geschkult.fu-berlin.de/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://easydb.geschkult.fu-berlin.de/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://easydb.geschkult.fu-berlin.de/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <AttributeConsumingService index="1">
-      <ServiceName xml:lang="de">EasyDB (Digitale Diathek) an der FU Berlin</ServiceName>
-      <ServiceName xml:lang="en">EasyDB (Digitale Diathek) an der FU Berlin</ServiceName>
-      <ServiceDescription xml:lang="de">EasyDB ist die gemeinsame Bilddatenbank der archäologischen und die kunsthistorischen Fächer des Fachbereich Geschichts- und Kulturwissenschaften der Freien Universität Berlin. Sie bietet Zugriff auf derzeit 250.000 Bilder für Forschung und Lehre.</ServiceDescription>
-      <ServiceDescription xml:lang="en">EasyDB ist die gemeinsame Bilddatenbank der archäologischen und die kunsthistorischen Fächer des Fachbereich Geschichts- und Kulturwissenschaften der Freien Universität Berlin. Sie bietet Zugriff auf derzeit 250.000 Bilder für Forschung und Lehre.</ServiceDescription>
-      <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"/>
-    </AttributeConsumingService>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">e5</OrganizationName>
-    <OrganizationName xml:lang="en">e5</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">Freie Universität Berlin</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">Freie Universität Berlin</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">https://identity.fu-berlin.de/idp-fub/</OrganizationURL>
-    <OrganizationURL xml:lang="en">https://identity.fu-berlin.de/idp-fub/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Johannes</GivenName>
-    <SurName>Posel</SurName>
-    <EmailAddress>mailto:support@geschkult.fu-berlin.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Steffen</GivenName>
-    <SurName>Hofmann</SurName>
-    <EmailAddress>mailto:fudis@zedat.fu-berlin.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="administrative">
-    <GivenName>Johannes</GivenName>
-    <SurName>Posel</SurName>
-    <EmailAddress>mailto:support@geschkult.fu-berlin.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="support">
-    <GivenName>Johannes</GivenName>
-    <SurName>Posel</SurName>
-    <EmailAddress>mailto:support@geschkult.fu-berlin.de</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/easydb.geschkult.fu-berlin.de.xml b/swamid-interfederations-2.0/easydb.geschkult.fu-berlin.de.xml
deleted file mode 100644
index f3f2241a..00000000
--- a/swamid-interfederations-2.0/easydb.geschkult.fu-berlin.de.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://easydb.geschkult.fu-berlin.de/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2014-10-21T05:40:43Z">
-      <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">EasyDB (Digitale Diathek) an der FU Berlin</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">EasyDB (Digitale Diathek) an der FU Berlin</mdui:DisplayName>
-        <mdui:Description xml:lang="de">EasyDB ist die gemeinsame Bilddatenbank der archäologischen und die kunsthistorischen Fächer des Fachbereich Geschichts- und Kulturwissenschaften der Freien Universität Berlin. Sie bietet Zugriff auf derzeit 250.000 Bilder für Forschung und Lehre.</mdui:Description>
-        <mdui:Description xml:lang="en">EasyDB ist die gemeinsame Bilddatenbank der archäologischen und die kunsthistorischen Fächer des Fachbereich Geschichts- und Kulturwissenschaften der Freien Universität Berlin. Sie bietet Zugriff auf derzeit 250.000 Bilder für Forschung und Lehre.</mdui:Description>
-        <mdui:InformationURL xml:lang="de">http://www.geschkult.fu-berlin.de/e/khi/diathek/digitale_diathek/index.html</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">http://www.geschkult.fu-berlin.de/e/khi/diathek/digitale_diathek/index.html</mdui:InformationURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>easydb.geschkult.fu-berlin.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=easydb.geschkult.fu-berlin.de,OU=Fachbereich Geschichts- und Kulturwissenschaften,O=Freie Universitaet Berlin,L=Berlin,ST=Berlin,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFkzCCBHugAwIBAgIHE7TczjDCKjANBgkqhkiG9w0BAQUFADCBtTELMAkGA1UE
-BhMCREUxDzANBgNVBAgTBkJlcmxpbjEPMA0GA1UEBxMGQmVybGluMSIwIAYDVQQK
-ExlGcmVpZSBVbml2ZXJzaXRhZXQgQmVybGluMQ4wDAYDVQQLEwVaRURBVDEwMC4G
-A1UEAxMnRnJlaWUgVW5pdmVyc2l0YWV0IEJlcmxpbiAtIEZVLUNBIC0gRzAxMR4w
-HAYJKoZIhvcNAQkBFg9jYUBGVS1CZXJsaW4uREUwHhcNMTIwNDIzMTM1NTEwWhcN
-MTcwNDIyMTM1NTEwWjCBtjELMAkGA1UEBhMCREUxDzANBgNVBAgTBkJlcmxpbjEP
-MA0GA1UEBxMGQmVybGluMSIwIAYDVQQKExlGcmVpZSBVbml2ZXJzaXRhZXQgQmVy
-bGluMTkwNwYDVQQLEzBGYWNoYmVyZWljaCBHZXNjaGljaHRzLSB1bmQgS3VsdHVy
-d2lzc2Vuc2NoYWZ0ZW4xJjAkBgNVBAMTHWVhc3lkYi5nZXNjaGt1bHQuZnUtYmVy
-bGluLmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApP7F9ySZ1qMs
-Pm1YPt3amWqd9NpjBxQdGSvWW8s5YO5yc/zM7K6s6jp71J9BEq6gQbCOb1J1Rkwu
-ANyZIbKF9YPzKixntzebSUt228zxCZmBL2zSvIVBOKxX0SXoRc3te93w4yhd1wK0
-zIkN/r4r7sCEbM7GUScLVnwn6vgVT0amPJ973sd1NEpkFiDqgvnOp9MbVRmejlVy
-OIcgeWBO7k+kR6wk8pZKhHv1EeUSI0MdN5NcuhcHLJqlTCS9mtao5wjHbKqOrsZq
-3+2BhAK+YsmU8kBAEWTJuGL295e0JUHg+n13/9TApNFckOgezXF3LTrQuht0aV8c
-AqYhXz7W6wIDAQABo4IBozCCAZ8wHAYDVR0gBBUwEzARBg8rBgEEAYGtIYIsAQEE
-AgIwCQYDVR0TBAIwADALBgNVHQ8EBAMCBeAwHQYDVR0lBBYwFAYIKwYBBQUHAwIG
-CCsGAQUFBwMBMB0GA1UdDgQWBBTDwIXCByjCQwen9jTvzxD9U2HzlTAfBgNVHSME
-GDAWgBQG4T30b/Qwt3o7V7AxBYl7DVhabDB1BgNVHR8EbjBsMDSgMqAwhi5odHRw
-Oi8vY2RwMS5wY2EuZGZuLmRlL2Z1LWNhL3B1Yi9jcmwvY2FjcmwuY3JsMDSgMqAw
-hi5odHRwOi8vY2RwMi5wY2EuZGZuLmRlL2Z1LWNhL3B1Yi9jcmwvY2FjcmwuY3Js
-MIGQBggrBgEFBQcBAQSBgzCBgDA+BggrBgEFBQcwAoYyaHR0cDovL2NkcDEucGNh
-LmRmbi5kZS9mdS1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwPgYIKwYBBQUHMAKG
-Mmh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvZnUtY2EvcHViL2NhY2VydC9jYWNlcnQu
-Y3J0MA0GCSqGSIb3DQEBBQUAA4IBAQBpQGFGtc2dC1+eoRR9ULUohMVt4uQLucbz
-qKueAVHWDlHOb1GwehouIMAjmff5thm2O3DtpF2XzhMgVfsWArozAzpNBOBuvn25
-gyUQvDcwNzd4p07EacdtCO4L3DWKbbaSCRiYETC+Z5JZRVHlGKfJezIT0165eyOD
-7Avdrp64lqZHvJgdunrn3dHHjhG9W33hWkUo1b3yVWnxy3gwK0LcVPGIRc43Jtx2
-Qin/U8AZ72GKn3mx2zhB4rPMC2hlSVd+uRl/tYJ+XCxQBlTr20lFE+YugukP64HY
-DrH/2UPUl2lUMBXA64UsRXgFovJd0H/EXzNJhEdFsrRUOQLx+GzD
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>easydb.geschkult.fu-berlin.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=easydb.geschkult.fu-berlin.de,OU=Fachbereich Geschichts- und Kulturwissenschaften,O=Freie Universitaet Berlin,L=Berlin,ST=Berlin,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFkzCCBHugAwIBAgIHE7TczjDCKjANBgkqhkiG9w0BAQUFADCBtTELMAkGA1UE
-BhMCREUxDzANBgNVBAgTBkJlcmxpbjEPMA0GA1UEBxMGQmVybGluMSIwIAYDVQQK
-ExlGcmVpZSBVbml2ZXJzaXRhZXQgQmVybGluMQ4wDAYDVQQLEwVaRURBVDEwMC4G
-A1UEAxMnRnJlaWUgVW5pdmVyc2l0YWV0IEJlcmxpbiAtIEZVLUNBIC0gRzAxMR4w
-HAYJKoZIhvcNAQkBFg9jYUBGVS1CZXJsaW4uREUwHhcNMTIwNDIzMTM1NTEwWhcN
-MTcwNDIyMTM1NTEwWjCBtjELMAkGA1UEBhMCREUxDzANBgNVBAgTBkJlcmxpbjEP
-MA0GA1UEBxMGQmVybGluMSIwIAYDVQQKExlGcmVpZSBVbml2ZXJzaXRhZXQgQmVy
-bGluMTkwNwYDVQQLEzBGYWNoYmVyZWljaCBHZXNjaGljaHRzLSB1bmQgS3VsdHVy
-d2lzc2Vuc2NoYWZ0ZW4xJjAkBgNVBAMTHWVhc3lkYi5nZXNjaGt1bHQuZnUtYmVy
-bGluLmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApP7F9ySZ1qMs
-Pm1YPt3amWqd9NpjBxQdGSvWW8s5YO5yc/zM7K6s6jp71J9BEq6gQbCOb1J1Rkwu
-ANyZIbKF9YPzKixntzebSUt228zxCZmBL2zSvIVBOKxX0SXoRc3te93w4yhd1wK0
-zIkN/r4r7sCEbM7GUScLVnwn6vgVT0amPJ973sd1NEpkFiDqgvnOp9MbVRmejlVy
-OIcgeWBO7k+kR6wk8pZKhHv1EeUSI0MdN5NcuhcHLJqlTCS9mtao5wjHbKqOrsZq
-3+2BhAK+YsmU8kBAEWTJuGL295e0JUHg+n13/9TApNFckOgezXF3LTrQuht0aV8c
-AqYhXz7W6wIDAQABo4IBozCCAZ8wHAYDVR0gBBUwEzARBg8rBgEEAYGtIYIsAQEE
-AgIwCQYDVR0TBAIwADALBgNVHQ8EBAMCBeAwHQYDVR0lBBYwFAYIKwYBBQUHAwIG
-CCsGAQUFBwMBMB0GA1UdDgQWBBTDwIXCByjCQwen9jTvzxD9U2HzlTAfBgNVHSME
-GDAWgBQG4T30b/Qwt3o7V7AxBYl7DVhabDB1BgNVHR8EbjBsMDSgMqAwhi5odHRw
-Oi8vY2RwMS5wY2EuZGZuLmRlL2Z1LWNhL3B1Yi9jcmwvY2FjcmwuY3JsMDSgMqAw
-hi5odHRwOi8vY2RwMi5wY2EuZGZuLmRlL2Z1LWNhL3B1Yi9jcmwvY2FjcmwuY3Js
-MIGQBggrBgEFBQcBAQSBgzCBgDA+BggrBgEFBQcwAoYyaHR0cDovL2NkcDEucGNh
-LmRmbi5kZS9mdS1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwPgYIKwYBBQUHMAKG
-Mmh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvZnUtY2EvcHViL2NhY2VydC9jYWNlcnQu
-Y3J0MA0GCSqGSIb3DQEBBQUAA4IBAQBpQGFGtc2dC1+eoRR9ULUohMVt4uQLucbz
-qKueAVHWDlHOb1GwehouIMAjmff5thm2O3DtpF2XzhMgVfsWArozAzpNBOBuvn25
-gyUQvDcwNzd4p07EacdtCO4L3DWKbbaSCRiYETC+Z5JZRVHlGKfJezIT0165eyOD
-7Avdrp64lqZHvJgdunrn3dHHjhG9W33hWkUo1b3yVWnxy3gwK0LcVPGIRc43Jtx2
-Qin/U8AZ72GKn3mx2zhB4rPMC2hlSVd+uRl/tYJ+XCxQBlTr20lFE+YugukP64HY
-DrH/2UPUl2lUMBXA64UsRXgFovJd0H/EXzNJhEdFsrRUOQLx+GzD
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://easydb.geschkult.fu-berlin.de/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://easydb.geschkult.fu-berlin.de/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://easydb.geschkult.fu-berlin.de/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://easydb.geschkult.fu-berlin.de/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://easydb.geschkult.fu-berlin.de/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://easydb.geschkult.fu-berlin.de/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://easydb.geschkult.fu-berlin.de/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://easydb.geschkult.fu-berlin.de/Shibboleth.sso/NIM/Artifact"/>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://easydb.geschkult.fu-berlin.de/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://easydb.geschkult.fu-berlin.de/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://easydb.geschkult.fu-berlin.de/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://easydb.geschkult.fu-berlin.de/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://easydb.geschkult.fu-berlin.de/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://easydb.geschkult.fu-berlin.de/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <AttributeConsumingService index="1">
-      <ServiceName xml:lang="de">EasyDB (Digitale Diathek) an der FU Berlin</ServiceName>
-      <ServiceName xml:lang="en">EasyDB (Digitale Diathek) an der FU Berlin</ServiceName>
-      <ServiceDescription xml:lang="de">EasyDB ist die gemeinsame Bilddatenbank der archäologischen und die kunsthistorischen Fächer des Fachbereich Geschichts- und Kulturwissenschaften der Freien Universität Berlin. Sie bietet Zugriff auf derzeit 250.000 Bilder für Forschung und Lehre.</ServiceDescription>
-      <ServiceDescription xml:lang="en">EasyDB ist die gemeinsame Bilddatenbank der archäologischen und die kunsthistorischen Fächer des Fachbereich Geschichts- und Kulturwissenschaften der Freien Universität Berlin. Sie bietet Zugriff auf derzeit 250.000 Bilder für Forschung und Lehre.</ServiceDescription>
-      <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"/>
-    </AttributeConsumingService>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">e5</OrganizationName>
-    <OrganizationName xml:lang="en">e5</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">Freie Universität Berlin</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">Freie Universität Berlin</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">https://identity.fu-berlin.de/idp-fub/</OrganizationURL>
-    <OrganizationURL xml:lang="en">https://identity.fu-berlin.de/idp-fub/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Johannes</GivenName>
-    <SurName>Posel</SurName>
-    <EmailAddress>mailto:support@geschkult.fu-berlin.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Steffen</GivenName>
-    <SurName>Hofmann</SurName>
-    <EmailAddress>mailto:fudis@zedat.fu-berlin.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="administrative">
-    <GivenName>Johannes</GivenName>
-    <SurName>Posel</SurName>
-    <EmailAddress>mailto:support@geschkult.fu-berlin.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="support">
-    <GivenName>Johannes</GivenName>
-    <SurName>Posel</SurName>
-    <EmailAddress>mailto:support@geschkult.fu-berlin.de</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/ecsg.dch-rp.eu-shibboleth.xml b/swamid-interfederations-2.0/ecsg.dch-rp.eu-shibboleth.xml
deleted file mode 100644
index f4f2da82..00000000
--- a/swamid-interfederations-2.0/ecsg.dch-rp.eu-shibboleth.xml
+++ /dev/null
@@ -1,104 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" entityID="https://ecsg.dch-rp.eu/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2013-06-10T15:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</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>
-        <mdui:DisplayName xml:lang="en">
-                        e-Culture Science Gateway
-                    </mdui:DisplayName>
-        <mdui:DisplayName xml:lang="it">
-                        e-Culture Science Gateway
-                    </mdui:DisplayName>
-        <mdui:Description xml:lang="en">
-                        This service allows to use on a Grid infrastructure the applications of the DCH-RP Project which provides tools to store and preserve digital cultural heritage.
-                    </mdui:Description>
-        <mdui:Description xml:lang="it">
-                        Questo servizio permette l'accesso e l'uso delle applicazioni/servizi sviluppati per il progetto europeo DCH-RP che ha come obiettivo quello di fornire strumenti per la memo
-                        rizzazione ed il mantenimento del patrimonio culturale
-                    </mdui:Description>
-      </mdui:UIInfo>
-      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://earthserver-sg.consorzio-cometa.it/Shibboleth.sso/DS"/>
-      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://ecsg.dch-rp.eu/Shibboleth.sso/DS" index="1"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIF0TCCBLmgAwIBAgIRAJjvs9uxU/ydSPVPqQh6szEwDQYJKoZIhvcNAQEFBQAw
-NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-IFNTTCBDQTAeFw0xMzAxMDcwMDAwMDBaFw0xNjAxMDcyMzU5NTlaMIHFMQswCQYD
-VQQGEwJJVDEOMAwGA1UEERMFOTUxMjMxDjAMBgNVBAgTBUl0YWx5MRAwDgYDVQQH
-EwdDYXRhbmlhMRkwFwYDVQQJExBWaWEgUy5Tb2ZpYSBuLjY0MS4wLAYDVQQKEyVJ
-c3RpdHV0byBOYXppb25hbGUgZGkgRmlzaWNhIE51Y2xlYXJlMQ8wDQYDVQQLEwZD
-T01FVEExKDAmBgNVBAMTH3d3dy5jYXRhbmlhLXNjaWVuY2UtZ2F0ZXdheXMuaXQw
-ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDMR2RMw4cNImWSKdvZjDhz
-3JuO7/pMOnGw4hF6uu09cqX8qqBpkU/gd33xq7J254ojywwiIlLT7QaTce4YQU2W
-O5mPyqdHjnpA+C0fJWrQgRyJEXsOzwpxyUG42tim/9jgNNDaUuNSGgrMLGlzl0sU
-i3Cq04AY0hukrtFGe6DFvDsm8xoNwfV8jmO3IipWJdJdezRnCGDgTZqgIWj3yrHo
-LjfgLbs85AJ31plMahcEni1jDZYgzu7FurbKpO4FGSLUEI8VUxncdYx3IWidqYBD
-TjxFGIiRIcD59DTIBxZYT4IgGHhG1whnUtE7nZhtuxFvnxfH4gPi7mPcRwidNHg9
-AgMBAAGjggJIMIICRDAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3V0fqkOO57TAd
-BgNVHQ4EFgQU+qOkofxo+Ei3aGD2lLEkM4L7LS0wDgYDVR0PAQH/BAQDAgWgMAwG
-A1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMCIGA1Ud
-IAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQICMDoGA1UdHwQzMDEwL6AtoCuG
-KWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3JsMG0GCCsG
-AQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50Y3MudGVyZW5hLm9y
-Zy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9vY3NwLnRjcy50
-ZXJlbmEub3JnMIH1BgNVHREEge0wgeqCH3d3dy5jYXRhbmlhLXNjaWVuY2UtZ2F0
-ZXdheXMuaXSCFWFnaW5mcmEtc2cuY3QuaW5mbi5pdIIVY29naXRvLW1lZC5jdC5p
-bmZuLml0giJlYXJ0aHNlcnZlci1zZy5jb25zb3J6aW8tY29tZXRhLml0gg5lY3Nn
-LmRjaC1ycC5ldYISZ2Fyci1zZy5jdC5pbmZuLml0ghBrbGlvcy5jdC5pbmZuLml0
-ghNsaWZlcmF5Mi5jdC5pbmZuLml0ghNzZ3cuYWZyaWNhLWdyaWQub3JnghV3d3cu
-cHJvZ2V0dG8taWNhcm8uaXQwDQYJKoZIhvcNAQEFBQADggEBAIzikPZKDI8rXlUU
-iF8KUeEVYZMyBfRtl0sQYBZCprDoVpCr74CPTxQ72Jrh2mD8oAz0ZYVgOA19AbM8
-PskJlhx4bmDJvWU/C2FrOgYDNg9Tl7dqLnr18GDt7DuC0KXCDupgtBmwy7mayNgA
-n2jbIaYsfMI7k1msS1XoaVX7kBMgmeGY3V11Om9Te7iMWKFOhpavI2hbf741ODtV
-zBen58Q2WzjVEKVQYbY7UgtcYzOM44GhMcdS65lLsBviK7HzyB6I5Iu3TR0bcpFE
-2V4bd6L5foq3Qn+WO9wqOwnOk3qfD/TQId7NWv0ZE2vp8fPPaaRF2XcA7Qh5xltt
-j/MCNlE=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ecsg.dch-rp.eu/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ecsg.dch-rp.eu/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ecsg.dch-rp.eu/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ecsg.dch-rp.eu/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ecsg.dch-rp.eu/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ecsg.dch-rp.eu/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ecsg.dch-rp.eu/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ecsg.dch-rp.eu/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ecsg.dch-rp.eu/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ecsg.dch-rp.eu/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ecsg.dch-rp.eu/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <AttributeConsumingService index="1">
-      <ServiceName xml:lang="en">e-Culture Science Gateway</ServiceName>
-      <ServiceDescription xml:lang="en">
-                    This service allows to use on a Grid infrastructure the applications of the DCH-RP Project which provides tools to store and preserve digital cultural heritage.
-                </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"/>
-    </AttributeConsumingService>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">INFN Catania</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">INFN Catania</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.ct.infn.it/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Marco</GivenName>
-    <SurName>Fargetta</SurName>
-    <EmailAddress>mailto:marco.fargetta@ct.infn.it</EmailAddress>
-    <EmailAddress>mailto:credentials-admin@ct.infn.it</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="administrative">
-    <GivenName>Roberto</GivenName>
-    <SurName>Barbera</SurName>
-    <EmailAddress>mailto:roberto.barbera@ct.infn.it</EmailAddress>
-    <EmailAddress>mailto:credentials-admin@ct.infn.it</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/ecsg.dch-rp.eu.xml b/swamid-interfederations-2.0/ecsg.dch-rp.eu.xml
deleted file mode 100644
index f4f2da82..00000000
--- a/swamid-interfederations-2.0/ecsg.dch-rp.eu.xml
+++ /dev/null
@@ -1,104 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" entityID="https://ecsg.dch-rp.eu/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2013-06-10T15:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</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>
-        <mdui:DisplayName xml:lang="en">
-                        e-Culture Science Gateway
-                    </mdui:DisplayName>
-        <mdui:DisplayName xml:lang="it">
-                        e-Culture Science Gateway
-                    </mdui:DisplayName>
-        <mdui:Description xml:lang="en">
-                        This service allows to use on a Grid infrastructure the applications of the DCH-RP Project which provides tools to store and preserve digital cultural heritage.
-                    </mdui:Description>
-        <mdui:Description xml:lang="it">
-                        Questo servizio permette l'accesso e l'uso delle applicazioni/servizi sviluppati per il progetto europeo DCH-RP che ha come obiettivo quello di fornire strumenti per la memo
-                        rizzazione ed il mantenimento del patrimonio culturale
-                    </mdui:Description>
-      </mdui:UIInfo>
-      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://earthserver-sg.consorzio-cometa.it/Shibboleth.sso/DS"/>
-      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://ecsg.dch-rp.eu/Shibboleth.sso/DS" index="1"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIF0TCCBLmgAwIBAgIRAJjvs9uxU/ydSPVPqQh6szEwDQYJKoZIhvcNAQEFBQAw
-NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-IFNTTCBDQTAeFw0xMzAxMDcwMDAwMDBaFw0xNjAxMDcyMzU5NTlaMIHFMQswCQYD
-VQQGEwJJVDEOMAwGA1UEERMFOTUxMjMxDjAMBgNVBAgTBUl0YWx5MRAwDgYDVQQH
-EwdDYXRhbmlhMRkwFwYDVQQJExBWaWEgUy5Tb2ZpYSBuLjY0MS4wLAYDVQQKEyVJ
-c3RpdHV0byBOYXppb25hbGUgZGkgRmlzaWNhIE51Y2xlYXJlMQ8wDQYDVQQLEwZD
-T01FVEExKDAmBgNVBAMTH3d3dy5jYXRhbmlhLXNjaWVuY2UtZ2F0ZXdheXMuaXQw
-ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDMR2RMw4cNImWSKdvZjDhz
-3JuO7/pMOnGw4hF6uu09cqX8qqBpkU/gd33xq7J254ojywwiIlLT7QaTce4YQU2W
-O5mPyqdHjnpA+C0fJWrQgRyJEXsOzwpxyUG42tim/9jgNNDaUuNSGgrMLGlzl0sU
-i3Cq04AY0hukrtFGe6DFvDsm8xoNwfV8jmO3IipWJdJdezRnCGDgTZqgIWj3yrHo
-LjfgLbs85AJ31plMahcEni1jDZYgzu7FurbKpO4FGSLUEI8VUxncdYx3IWidqYBD
-TjxFGIiRIcD59DTIBxZYT4IgGHhG1whnUtE7nZhtuxFvnxfH4gPi7mPcRwidNHg9
-AgMBAAGjggJIMIICRDAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3V0fqkOO57TAd
-BgNVHQ4EFgQU+qOkofxo+Ei3aGD2lLEkM4L7LS0wDgYDVR0PAQH/BAQDAgWgMAwG
-A1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMCIGA1Ud
-IAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQICMDoGA1UdHwQzMDEwL6AtoCuG
-KWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3JsMG0GCCsG
-AQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50Y3MudGVyZW5hLm9y
-Zy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9vY3NwLnRjcy50
-ZXJlbmEub3JnMIH1BgNVHREEge0wgeqCH3d3dy5jYXRhbmlhLXNjaWVuY2UtZ2F0
-ZXdheXMuaXSCFWFnaW5mcmEtc2cuY3QuaW5mbi5pdIIVY29naXRvLW1lZC5jdC5p
-bmZuLml0giJlYXJ0aHNlcnZlci1zZy5jb25zb3J6aW8tY29tZXRhLml0gg5lY3Nn
-LmRjaC1ycC5ldYISZ2Fyci1zZy5jdC5pbmZuLml0ghBrbGlvcy5jdC5pbmZuLml0
-ghNsaWZlcmF5Mi5jdC5pbmZuLml0ghNzZ3cuYWZyaWNhLWdyaWQub3JnghV3d3cu
-cHJvZ2V0dG8taWNhcm8uaXQwDQYJKoZIhvcNAQEFBQADggEBAIzikPZKDI8rXlUU
-iF8KUeEVYZMyBfRtl0sQYBZCprDoVpCr74CPTxQ72Jrh2mD8oAz0ZYVgOA19AbM8
-PskJlhx4bmDJvWU/C2FrOgYDNg9Tl7dqLnr18GDt7DuC0KXCDupgtBmwy7mayNgA
-n2jbIaYsfMI7k1msS1XoaVX7kBMgmeGY3V11Om9Te7iMWKFOhpavI2hbf741ODtV
-zBen58Q2WzjVEKVQYbY7UgtcYzOM44GhMcdS65lLsBviK7HzyB6I5Iu3TR0bcpFE
-2V4bd6L5foq3Qn+WO9wqOwnOk3qfD/TQId7NWv0ZE2vp8fPPaaRF2XcA7Qh5xltt
-j/MCNlE=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ecsg.dch-rp.eu/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ecsg.dch-rp.eu/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ecsg.dch-rp.eu/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ecsg.dch-rp.eu/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ecsg.dch-rp.eu/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ecsg.dch-rp.eu/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ecsg.dch-rp.eu/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ecsg.dch-rp.eu/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ecsg.dch-rp.eu/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ecsg.dch-rp.eu/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ecsg.dch-rp.eu/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <AttributeConsumingService index="1">
-      <ServiceName xml:lang="en">e-Culture Science Gateway</ServiceName>
-      <ServiceDescription xml:lang="en">
-                    This service allows to use on a Grid infrastructure the applications of the DCH-RP Project which provides tools to store and preserve digital cultural heritage.
-                </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"/>
-    </AttributeConsumingService>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">INFN Catania</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">INFN Catania</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.ct.infn.it/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Marco</GivenName>
-    <SurName>Fargetta</SurName>
-    <EmailAddress>mailto:marco.fargetta@ct.infn.it</EmailAddress>
-    <EmailAddress>mailto:credentials-admin@ct.infn.it</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="administrative">
-    <GivenName>Roberto</GivenName>
-    <SurName>Barbera</SurName>
-    <EmailAddress>mailto:roberto.barbera@ct.infn.it</EmailAddress>
-    <EmailAddress>mailto:credentials-admin@ct.infn.it</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/edev.cesnet.cz-sp-shibboleth.xml b/swamid-interfederations-2.0/edev.cesnet.cz-sp-shibboleth.xml
deleted file mode 100644
index 30d0e153..00000000
--- a/swamid-interfederations-2.0/edev.cesnet.cz-sp-shibboleth.xml
+++ /dev/null
@@ -1,119 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://edev.cesnet.cz/sp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/" registrationInstant="2012-10-10T20:28:16Z">
-      <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>
-      <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://edev.cesnet.cz/Shibboleth.sso/DS" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Edev SP</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="cs">Edev SP</mdui:DisplayName>
-        <mdui:Description xml:lang="en">CESNET development service provider</mdui:Description>
-        <mdui:Description xml:lang="cs">CESNET development service provider</mdui:Description>
-        <mdui:InformationURL xml:lang="en">https://edev.cesnet.cz/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="cs">https://edev.cesnet.cz/</mdui:InformationURL>
-      </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>edev.cesnet.cz</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=edev.cesnet.cz,O=CESNET,L=Prague,ST=Czech Republic,C=CZ</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDPjCCAiYCCQCOJsi4C7DaXDANBgkqhkiG9w0BAQUFADBhMQswCQYDVQQGEwJD
-WjEXMBUGA1UECBMOQ3plY2ggUmVwdWJsaWMxDzANBgNVBAcTBlByYWd1ZTEPMA0G
-A1UEChMGQ0VTTkVUMRcwFQYDVQQDEw5lZGV2LmNlc25ldC5jejAeFw0xMjEwMTAx
-NzU2NDBaFw0yMjEwMDgxNzU2NDBaMGExCzAJBgNVBAYTAkNaMRcwFQYDVQQIEw5D
-emVjaCBSZXB1YmxpYzEPMA0GA1UEBxMGUHJhZ3VlMQ8wDQYDVQQKEwZDRVNORVQx
-FzAVBgNVBAMTDmVkZXYuY2VzbmV0LmN6MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
-MIIBCgKCAQEAqRDUJ+PwMSlE0IyXab2jcgfP2hT+fGUIOll5bOLvccECzS2GNAXO
-1JyZG2RR5XJdLc8j+8ppGU/eU9KznI/hJK4OLJmJRSujQwnXGw8xbgUWTqL96BIM
-t1++U4PxblhqU13SR1JwILkKIld1YpzmYZeUZSU8McGn0MWTNy52kuKMeGTB/bTG
-yCnAIYymnRC+F7S1O5p00gZ8Y8fLAv4cuKA4gkss1PkbpbAEDl3vMFWYVrHSfQ40
-ervXpIR8d+JjBEipdIi1S6+0XLu18bHuhiACBb0Yxvndi6Kf0x3LhebvDA26Ql3N
-haZtUB18QHbJ1QHePbDrK3xKkt/mlBgOQQIDAQABMA0GCSqGSIb3DQEBBQUAA4IB
-AQA3rep/ITfO4SeXlbpGUZQS/ez6Yjd9mQah/Wve3gRpp9G4FQRy2iuTCX3pDvne
-Y5WdPUYhSdjbhnbvGmpbO5/QFh/gzWTUlXedmdmN5RJmIRzOHpAhdhQ9cCoKB/xL
-TDrAqxoj+yQuQpjpMdTlhawqjkqee+cn7j8zGbR5HXpVM3cJPAMsRQx19sFWpnGX
-QkpkQ90+gQMK2zAPvIXtZfVTK1F0xlZ6+4NYPuoC3C8xklxfwzNoiktEgtqFPzOB
-Eq3JVPaoY+S7mCigJcJM/YAZFL+/m7SfG70iJt51GF5kfKGNQEK0A7t6+GD9RiKo
-qAMOJmOQterSszZaX0mMz1k7
-</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>edev.cesnet.cz</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=edev.cesnet.cz,O=CESNET,L=Prague,ST=Czech Republic,C=CZ</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDPjCCAiYCCQCOJsi4C7DaXDANBgkqhkiG9w0BAQUFADBhMQswCQYDVQQGEwJD
-WjEXMBUGA1UECBMOQ3plY2ggUmVwdWJsaWMxDzANBgNVBAcTBlByYWd1ZTEPMA0G
-A1UEChMGQ0VTTkVUMRcwFQYDVQQDEw5lZGV2LmNlc25ldC5jejAeFw0xMjEwMTAx
-NzU2NDBaFw0yMjEwMDgxNzU2NDBaMGExCzAJBgNVBAYTAkNaMRcwFQYDVQQIEw5D
-emVjaCBSZXB1YmxpYzEPMA0GA1UEBxMGUHJhZ3VlMQ8wDQYDVQQKEwZDRVNORVQx
-FzAVBgNVBAMTDmVkZXYuY2VzbmV0LmN6MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
-MIIBCgKCAQEAqRDUJ+PwMSlE0IyXab2jcgfP2hT+fGUIOll5bOLvccECzS2GNAXO
-1JyZG2RR5XJdLc8j+8ppGU/eU9KznI/hJK4OLJmJRSujQwnXGw8xbgUWTqL96BIM
-t1++U4PxblhqU13SR1JwILkKIld1YpzmYZeUZSU8McGn0MWTNy52kuKMeGTB/bTG
-yCnAIYymnRC+F7S1O5p00gZ8Y8fLAv4cuKA4gkss1PkbpbAEDl3vMFWYVrHSfQ40
-ervXpIR8d+JjBEipdIi1S6+0XLu18bHuhiACBb0Yxvndi6Kf0x3LhebvDA26Ql3N
-haZtUB18QHbJ1QHePbDrK3xKkt/mlBgOQQIDAQABMA0GCSqGSIb3DQEBBQUAA4IB
-AQA3rep/ITfO4SeXlbpGUZQS/ez6Yjd9mQah/Wve3gRpp9G4FQRy2iuTCX3pDvne
-Y5WdPUYhSdjbhnbvGmpbO5/QFh/gzWTUlXedmdmN5RJmIRzOHpAhdhQ9cCoKB/xL
-TDrAqxoj+yQuQpjpMdTlhawqjkqee+cn7j8zGbR5HXpVM3cJPAMsRQx19sFWpnGX
-QkpkQ90+gQMK2zAPvIXtZfVTK1F0xlZ6+4NYPuoC3C8xklxfwzNoiktEgtqFPzOB
-Eq3JVPaoY+S7mCigJcJM/YAZFL+/m7SfG70iJt51GF5kfKGNQEK0A7t6+GD9RiKo
-qAMOJmOQterSszZaX0mMz1k7
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://edev.cesnet.cz/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://edev.cesnet.cz/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://edev.cesnet.cz/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://edev.cesnet.cz/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://edev.cesnet.cz/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://edev.cesnet.cz/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://edev.cesnet.cz/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://edev.cesnet.cz/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://edev.cesnet.cz/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://edev.cesnet.cz/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://edev.cesnet.cz/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://edev.cesnet.cz/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://edev.cesnet.cz/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://edev.cesnet.cz/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://edev.cesnet.cz/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <md:AttributeConsumingService index="0">
-      <md:ServiceName xml:lang="en">Edev 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>
-  <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
-    <OrganizationName xml:lang="en">CESNET</OrganizationName>
-    <OrganizationName xml:lang="cs">CESNET</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">CESNET, a. l. e.</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="cs">CESNET, z. s. p. o.</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.ces.net/</OrganizationURL>
-    <OrganizationURL xml:lang="cs">http://www.cesnet.cz/</OrganizationURL>
-  </Organization>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
-    <GivenName>Ivan</GivenName>
-    <SurName>Novakov</SurName>
-    <EmailAddress>novakoi@fel.cvut.cz</EmailAddress>
-  </ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/edev.cesnet.cz.xml b/swamid-interfederations-2.0/edev.cesnet.cz.xml
deleted file mode 100644
index 30d0e153..00000000
--- a/swamid-interfederations-2.0/edev.cesnet.cz.xml
+++ /dev/null
@@ -1,119 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://edev.cesnet.cz/sp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/" registrationInstant="2012-10-10T20:28:16Z">
-      <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>
-      <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://edev.cesnet.cz/Shibboleth.sso/DS" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Edev SP</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="cs">Edev SP</mdui:DisplayName>
-        <mdui:Description xml:lang="en">CESNET development service provider</mdui:Description>
-        <mdui:Description xml:lang="cs">CESNET development service provider</mdui:Description>
-        <mdui:InformationURL xml:lang="en">https://edev.cesnet.cz/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="cs">https://edev.cesnet.cz/</mdui:InformationURL>
-      </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>edev.cesnet.cz</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=edev.cesnet.cz,O=CESNET,L=Prague,ST=Czech Republic,C=CZ</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDPjCCAiYCCQCOJsi4C7DaXDANBgkqhkiG9w0BAQUFADBhMQswCQYDVQQGEwJD
-WjEXMBUGA1UECBMOQ3plY2ggUmVwdWJsaWMxDzANBgNVBAcTBlByYWd1ZTEPMA0G
-A1UEChMGQ0VTTkVUMRcwFQYDVQQDEw5lZGV2LmNlc25ldC5jejAeFw0xMjEwMTAx
-NzU2NDBaFw0yMjEwMDgxNzU2NDBaMGExCzAJBgNVBAYTAkNaMRcwFQYDVQQIEw5D
-emVjaCBSZXB1YmxpYzEPMA0GA1UEBxMGUHJhZ3VlMQ8wDQYDVQQKEwZDRVNORVQx
-FzAVBgNVBAMTDmVkZXYuY2VzbmV0LmN6MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
-MIIBCgKCAQEAqRDUJ+PwMSlE0IyXab2jcgfP2hT+fGUIOll5bOLvccECzS2GNAXO
-1JyZG2RR5XJdLc8j+8ppGU/eU9KznI/hJK4OLJmJRSujQwnXGw8xbgUWTqL96BIM
-t1++U4PxblhqU13SR1JwILkKIld1YpzmYZeUZSU8McGn0MWTNy52kuKMeGTB/bTG
-yCnAIYymnRC+F7S1O5p00gZ8Y8fLAv4cuKA4gkss1PkbpbAEDl3vMFWYVrHSfQ40
-ervXpIR8d+JjBEipdIi1S6+0XLu18bHuhiACBb0Yxvndi6Kf0x3LhebvDA26Ql3N
-haZtUB18QHbJ1QHePbDrK3xKkt/mlBgOQQIDAQABMA0GCSqGSIb3DQEBBQUAA4IB
-AQA3rep/ITfO4SeXlbpGUZQS/ez6Yjd9mQah/Wve3gRpp9G4FQRy2iuTCX3pDvne
-Y5WdPUYhSdjbhnbvGmpbO5/QFh/gzWTUlXedmdmN5RJmIRzOHpAhdhQ9cCoKB/xL
-TDrAqxoj+yQuQpjpMdTlhawqjkqee+cn7j8zGbR5HXpVM3cJPAMsRQx19sFWpnGX
-QkpkQ90+gQMK2zAPvIXtZfVTK1F0xlZ6+4NYPuoC3C8xklxfwzNoiktEgtqFPzOB
-Eq3JVPaoY+S7mCigJcJM/YAZFL+/m7SfG70iJt51GF5kfKGNQEK0A7t6+GD9RiKo
-qAMOJmOQterSszZaX0mMz1k7
-</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>edev.cesnet.cz</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=edev.cesnet.cz,O=CESNET,L=Prague,ST=Czech Republic,C=CZ</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDPjCCAiYCCQCOJsi4C7DaXDANBgkqhkiG9w0BAQUFADBhMQswCQYDVQQGEwJD
-WjEXMBUGA1UECBMOQ3plY2ggUmVwdWJsaWMxDzANBgNVBAcTBlByYWd1ZTEPMA0G
-A1UEChMGQ0VTTkVUMRcwFQYDVQQDEw5lZGV2LmNlc25ldC5jejAeFw0xMjEwMTAx
-NzU2NDBaFw0yMjEwMDgxNzU2NDBaMGExCzAJBgNVBAYTAkNaMRcwFQYDVQQIEw5D
-emVjaCBSZXB1YmxpYzEPMA0GA1UEBxMGUHJhZ3VlMQ8wDQYDVQQKEwZDRVNORVQx
-FzAVBgNVBAMTDmVkZXYuY2VzbmV0LmN6MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
-MIIBCgKCAQEAqRDUJ+PwMSlE0IyXab2jcgfP2hT+fGUIOll5bOLvccECzS2GNAXO
-1JyZG2RR5XJdLc8j+8ppGU/eU9KznI/hJK4OLJmJRSujQwnXGw8xbgUWTqL96BIM
-t1++U4PxblhqU13SR1JwILkKIld1YpzmYZeUZSU8McGn0MWTNy52kuKMeGTB/bTG
-yCnAIYymnRC+F7S1O5p00gZ8Y8fLAv4cuKA4gkss1PkbpbAEDl3vMFWYVrHSfQ40
-ervXpIR8d+JjBEipdIi1S6+0XLu18bHuhiACBb0Yxvndi6Kf0x3LhebvDA26Ql3N
-haZtUB18QHbJ1QHePbDrK3xKkt/mlBgOQQIDAQABMA0GCSqGSIb3DQEBBQUAA4IB
-AQA3rep/ITfO4SeXlbpGUZQS/ez6Yjd9mQah/Wve3gRpp9G4FQRy2iuTCX3pDvne
-Y5WdPUYhSdjbhnbvGmpbO5/QFh/gzWTUlXedmdmN5RJmIRzOHpAhdhQ9cCoKB/xL
-TDrAqxoj+yQuQpjpMdTlhawqjkqee+cn7j8zGbR5HXpVM3cJPAMsRQx19sFWpnGX
-QkpkQ90+gQMK2zAPvIXtZfVTK1F0xlZ6+4NYPuoC3C8xklxfwzNoiktEgtqFPzOB
-Eq3JVPaoY+S7mCigJcJM/YAZFL+/m7SfG70iJt51GF5kfKGNQEK0A7t6+GD9RiKo
-qAMOJmOQterSszZaX0mMz1k7
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://edev.cesnet.cz/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://edev.cesnet.cz/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://edev.cesnet.cz/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://edev.cesnet.cz/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://edev.cesnet.cz/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://edev.cesnet.cz/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://edev.cesnet.cz/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://edev.cesnet.cz/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://edev.cesnet.cz/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://edev.cesnet.cz/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://edev.cesnet.cz/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://edev.cesnet.cz/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://edev.cesnet.cz/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://edev.cesnet.cz/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://edev.cesnet.cz/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <md:AttributeConsumingService index="0">
-      <md:ServiceName xml:lang="en">Edev 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>
-  <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
-    <OrganizationName xml:lang="en">CESNET</OrganizationName>
-    <OrganizationName xml:lang="cs">CESNET</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">CESNET, a. l. e.</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="cs">CESNET, z. s. p. o.</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.ces.net/</OrganizationURL>
-    <OrganizationURL xml:lang="cs">http://www.cesnet.cz/</OrganizationURL>
-  </Organization>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
-    <GivenName>Ivan</GivenName>
-    <SurName>Novakov</SurName>
-    <EmailAddress>novakoi@fel.cvut.cz</EmailAddress>
-  </ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/educonf-directory.geant.net-simplesaml-module.php-saml-sp-metadata.php-eduCONF.xml b/swamid-interfederations-2.0/educonf-directory.geant.net-simplesaml-module.php-saml-sp-metadata.php-eduCONF.xml
deleted file mode 100644
index 81a6c4ea..00000000
--- a/swamid-interfederations-2.0/educonf-directory.geant.net-simplesaml-module.php-saml-sp-metadata.php-eduCONF.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://educonf-directory.geant.net/simplesaml/module.php/saml/sp/metadata.php/eduCONF">
-  <!--
-		This is a "GÉANT" simpleSAMLphp SP for the Delivery of Advanced Network Technology to Europe Limited.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-05-28T13:11:24Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</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>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">eduCONF</mdui:DisplayName>
-        <mdui:Description xml:lang="en">eduCONF supports and facilitates the use and adoption of videoconferencing, simplifying the videoconference experience and reducing operational costs. It enables further integration of the NRENs’ videoconferencing services within a coherent service, reduces travel costs, environmental impact and increases the awareness of Partners’ videoconferencing services across Europe.</mdui:Description>
-        <mdui:PrivacyStatementURL xml:lang="en">https://educonf-directory.geant.net/privacy_policy.php</mdui:PrivacyStatementURL>
-        <mdui:Logo height="96" width="350" xml:lang="en">https://educonf-directory.geant.net/pic/eduCONF_logo.png</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIECTCCAvGgAwIBAgIJAPAcrGLtMuPXMA0GCSqGSIb3DQEBBAUAMGAxCzAJBgNV
-						BAYTAlBMMRUwEwYDVQQIEwxXaWVsa29wb2xza2ExDzANBgNVBAcTBlBvem5hbjEN
-						MAsGA1UEChMEUFNOQzELMAkGA1UECxMCTkQxDTALBgNVBAMTBFBTTkMwHhcNMTQw
-						MzI1MTI0MTI2WhcNMjQwMzI0MTI0MTI2WjBgMQswCQYDVQQGEwJQTDEVMBMGA1UE
-						CBMMV2llbGtvcG9sc2thMQ8wDQYDVQQHEwZQb3puYW4xDTALBgNVBAoTBFBTTkMx
-						CzAJBgNVBAsTAk5EMQ0wCwYDVQQDEwRQU05DMIIBIjANBgkqhkiG9w0BAQEFAAOC
-						AQ8AMIIBCgKCAQEAprLbGmrldyPqbXlk5Y2mE78VYdLbsn6/LtQEVO4UNuYU6kxK
-						hy38FDjZ20Zrsgjz4fspJxP08yjeyw2qGGVcZXJRZAlJ3IRhjLlq9cZi5t5XDA4A
-						HfD+LSzUFmllZdNRS6oOceLXRkR7BYeHVeMYQHLTc6SABjCSs9oDpGwlxj8iHqbH
-						P50zh7PxBNxRv8PlEgsWEgGZ5Vgk1U1sT0490t7VB7ksqO+ka0BLQORPmZj7JNiJ
-						On20X7w/fXeSTcOgRcoGhf9d5QaOU/k7yP4BPXx1fX6gPsPM63zJzvtKfD/3WCdj
-						tqHHhEC1IP6eYzM3PJNa67N0HMiwzxpjjAPv+wIDAQABo4HFMIHCMB0GA1UdDgQW
-						BBTzO8Ze8XJHf1jHWJ30yMxIB1BpXzCBkgYDVR0jBIGKMIGHgBTzO8Ze8XJHf1jH
-						WJ30yMxIB1BpX6FkpGIwYDELMAkGA1UEBhMCUEwxFTATBgNVBAgTDFdpZWxrb3Bv
-						bHNrYTEPMA0GA1UEBxMGUG96bmFuMQ0wCwYDVQQKEwRQU05DMQswCQYDVQQLEwJO
-						RDENMAsGA1UEAxMEUFNOQ4IJAPAcrGLtMuPXMAwGA1UdEwQFMAMBAf8wDQYJKoZI
-						hvcNAQEEBQADggEBAEUL4IvCbJkcFE976QP/9k+zN5aXOXIIW7CSH1KJLjvCY0UJ
-						Kzz+hzdaYIQ08DYq++SI+P0tUX3joUkPCQPCKiddGtRCaQLtvkl4Jt8S+eqC9rX2
-						l+A/wry/VIjxpntaz+A+Vwz1FEiuUAHrMAchJnuCEaGXOZ9NSLErOTD6d7e2j6+5
-						1Jy2cd/WUFGtxlhkMPD4Zax1uKiJj3Ptw1Q4pBPFKNLsyObFWL2igel2fEVGxxBH
-						AXaXuUUk8l+3BWmYoCbsZdnN36DqXqsK1NLhCCl+VIYEvr62U0B4AWlLcCfyt4Dy
-						7eK+5ZFB6MaRVtCwdykxbQQXWNv60u8dwrbkTqk=
-					</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>
-						MIIECTCCAvGgAwIBAgIJAPAcrGLtMuPXMA0GCSqGSIb3DQEBBAUAMGAxCzAJBgNV
-						BAYTAlBMMRUwEwYDVQQIEwxXaWVsa29wb2xza2ExDzANBgNVBAcTBlBvem5hbjEN
-						MAsGA1UEChMEUFNOQzELMAkGA1UECxMCTkQxDTALBgNVBAMTBFBTTkMwHhcNMTQw
-						MzI1MTI0MTI2WhcNMjQwMzI0MTI0MTI2WjBgMQswCQYDVQQGEwJQTDEVMBMGA1UE
-						CBMMV2llbGtvcG9sc2thMQ8wDQYDVQQHEwZQb3puYW4xDTALBgNVBAoTBFBTTkMx
-						CzAJBgNVBAsTAk5EMQ0wCwYDVQQDEwRQU05DMIIBIjANBgkqhkiG9w0BAQEFAAOC
-						AQ8AMIIBCgKCAQEAprLbGmrldyPqbXlk5Y2mE78VYdLbsn6/LtQEVO4UNuYU6kxK
-						hy38FDjZ20Zrsgjz4fspJxP08yjeyw2qGGVcZXJRZAlJ3IRhjLlq9cZi5t5XDA4A
-						HfD+LSzUFmllZdNRS6oOceLXRkR7BYeHVeMYQHLTc6SABjCSs9oDpGwlxj8iHqbH
-						P50zh7PxBNxRv8PlEgsWEgGZ5Vgk1U1sT0490t7VB7ksqO+ka0BLQORPmZj7JNiJ
-						On20X7w/fXeSTcOgRcoGhf9d5QaOU/k7yP4BPXx1fX6gPsPM63zJzvtKfD/3WCdj
-						tqHHhEC1IP6eYzM3PJNa67N0HMiwzxpjjAPv+wIDAQABo4HFMIHCMB0GA1UdDgQW
-						BBTzO8Ze8XJHf1jHWJ30yMxIB1BpXzCBkgYDVR0jBIGKMIGHgBTzO8Ze8XJHf1jH
-						WJ30yMxIB1BpX6FkpGIwYDELMAkGA1UEBhMCUEwxFTATBgNVBAgTDFdpZWxrb3Bv
-						bHNrYTEPMA0GA1UEBxMGUG96bmFuMQ0wCwYDVQQKEwRQU05DMQswCQYDVQQLEwJO
-						RDENMAsGA1UEAxMEUFNOQ4IJAPAcrGLtMuPXMAwGA1UdEwQFMAMBAf8wDQYJKoZI
-						hvcNAQEEBQADggEBAEUL4IvCbJkcFE976QP/9k+zN5aXOXIIW7CSH1KJLjvCY0UJ
-						Kzz+hzdaYIQ08DYq++SI+P0tUX3joUkPCQPCKiddGtRCaQLtvkl4Jt8S+eqC9rX2
-						l+A/wry/VIjxpntaz+A+Vwz1FEiuUAHrMAchJnuCEaGXOZ9NSLErOTD6d7e2j6+5
-						1Jy2cd/WUFGtxlhkMPD4Zax1uKiJj3Ptw1Q4pBPFKNLsyObFWL2igel2fEVGxxBH
-						AXaXuUUk8l+3BWmYoCbsZdnN36DqXqsK1NLhCCl+VIYEvr62U0B4AWlLcCfyt4Dy
-						7eK+5ZFB6MaRVtCwdykxbQQXWNv60u8dwrbkTqk=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://educonf-directory.geant.net/simplesaml/module.php/saml/sp/saml2-logout.php/eduCONF"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://educonf-directory.geant.net/simplesaml/module.php/saml/sp/saml2-acs.php/eduCONF" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://educonf-directory.geant.net/simplesaml/module.php/saml/sp/saml1-acs.php/eduCONF" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://educonf-directory.geant.net/simplesaml/module.php/saml/sp/saml2-acs.php/eduCONF" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://educonf-directory.geant.net/simplesaml/module.php/saml/sp/saml1-acs.php/eduCONF/artifact" index="3"/>
-    <AttributeConsumingService index="0">
-      <ServiceName xml:lang="en">eduCONF</ServiceName>
-      <ServiceDescription xml:lang="en">eduCONF supports and facilitates the use and adoption of videoconferencing, simplifying the videoconference experience and reducing operational costs. It enables further integration of the NRENs’ videoconferencing services within a coherent service, reduces travel costs, environmental impact and increases the awareness of Partners’ videoconferencing services across Europe.</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="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="givenName" Name="urn:oid:2.5.4.42" 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="true"/>
-      <RequestedAttribute FriendlyName="surname" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <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="true"/>
-    </AttributeConsumingService>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Delivery of Advanced Network Technology to Europe Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">GÉANT Intranet</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.geant.net/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>eduCONF</GivenName>
-    <EmailAddress>mailto:support@geant.net</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>eduCONF VC Team</GivenName>
-    <EmailAddress>mailto:educonf@geant.net</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/educonf-directory.geant.net.xml b/swamid-interfederations-2.0/educonf-directory.geant.net.xml
deleted file mode 100644
index 81a6c4ea..00000000
--- a/swamid-interfederations-2.0/educonf-directory.geant.net.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://educonf-directory.geant.net/simplesaml/module.php/saml/sp/metadata.php/eduCONF">
-  <!--
-		This is a "GÉANT" simpleSAMLphp SP for the Delivery of Advanced Network Technology to Europe Limited.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-05-28T13:11:24Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</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>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">eduCONF</mdui:DisplayName>
-        <mdui:Description xml:lang="en">eduCONF supports and facilitates the use and adoption of videoconferencing, simplifying the videoconference experience and reducing operational costs. It enables further integration of the NRENs’ videoconferencing services within a coherent service, reduces travel costs, environmental impact and increases the awareness of Partners’ videoconferencing services across Europe.</mdui:Description>
-        <mdui:PrivacyStatementURL xml:lang="en">https://educonf-directory.geant.net/privacy_policy.php</mdui:PrivacyStatementURL>
-        <mdui:Logo height="96" width="350" xml:lang="en">https://educonf-directory.geant.net/pic/eduCONF_logo.png</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIECTCCAvGgAwIBAgIJAPAcrGLtMuPXMA0GCSqGSIb3DQEBBAUAMGAxCzAJBgNV
-						BAYTAlBMMRUwEwYDVQQIEwxXaWVsa29wb2xza2ExDzANBgNVBAcTBlBvem5hbjEN
-						MAsGA1UEChMEUFNOQzELMAkGA1UECxMCTkQxDTALBgNVBAMTBFBTTkMwHhcNMTQw
-						MzI1MTI0MTI2WhcNMjQwMzI0MTI0MTI2WjBgMQswCQYDVQQGEwJQTDEVMBMGA1UE
-						CBMMV2llbGtvcG9sc2thMQ8wDQYDVQQHEwZQb3puYW4xDTALBgNVBAoTBFBTTkMx
-						CzAJBgNVBAsTAk5EMQ0wCwYDVQQDEwRQU05DMIIBIjANBgkqhkiG9w0BAQEFAAOC
-						AQ8AMIIBCgKCAQEAprLbGmrldyPqbXlk5Y2mE78VYdLbsn6/LtQEVO4UNuYU6kxK
-						hy38FDjZ20Zrsgjz4fspJxP08yjeyw2qGGVcZXJRZAlJ3IRhjLlq9cZi5t5XDA4A
-						HfD+LSzUFmllZdNRS6oOceLXRkR7BYeHVeMYQHLTc6SABjCSs9oDpGwlxj8iHqbH
-						P50zh7PxBNxRv8PlEgsWEgGZ5Vgk1U1sT0490t7VB7ksqO+ka0BLQORPmZj7JNiJ
-						On20X7w/fXeSTcOgRcoGhf9d5QaOU/k7yP4BPXx1fX6gPsPM63zJzvtKfD/3WCdj
-						tqHHhEC1IP6eYzM3PJNa67N0HMiwzxpjjAPv+wIDAQABo4HFMIHCMB0GA1UdDgQW
-						BBTzO8Ze8XJHf1jHWJ30yMxIB1BpXzCBkgYDVR0jBIGKMIGHgBTzO8Ze8XJHf1jH
-						WJ30yMxIB1BpX6FkpGIwYDELMAkGA1UEBhMCUEwxFTATBgNVBAgTDFdpZWxrb3Bv
-						bHNrYTEPMA0GA1UEBxMGUG96bmFuMQ0wCwYDVQQKEwRQU05DMQswCQYDVQQLEwJO
-						RDENMAsGA1UEAxMEUFNOQ4IJAPAcrGLtMuPXMAwGA1UdEwQFMAMBAf8wDQYJKoZI
-						hvcNAQEEBQADggEBAEUL4IvCbJkcFE976QP/9k+zN5aXOXIIW7CSH1KJLjvCY0UJ
-						Kzz+hzdaYIQ08DYq++SI+P0tUX3joUkPCQPCKiddGtRCaQLtvkl4Jt8S+eqC9rX2
-						l+A/wry/VIjxpntaz+A+Vwz1FEiuUAHrMAchJnuCEaGXOZ9NSLErOTD6d7e2j6+5
-						1Jy2cd/WUFGtxlhkMPD4Zax1uKiJj3Ptw1Q4pBPFKNLsyObFWL2igel2fEVGxxBH
-						AXaXuUUk8l+3BWmYoCbsZdnN36DqXqsK1NLhCCl+VIYEvr62U0B4AWlLcCfyt4Dy
-						7eK+5ZFB6MaRVtCwdykxbQQXWNv60u8dwrbkTqk=
-					</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>
-						MIIECTCCAvGgAwIBAgIJAPAcrGLtMuPXMA0GCSqGSIb3DQEBBAUAMGAxCzAJBgNV
-						BAYTAlBMMRUwEwYDVQQIEwxXaWVsa29wb2xza2ExDzANBgNVBAcTBlBvem5hbjEN
-						MAsGA1UEChMEUFNOQzELMAkGA1UECxMCTkQxDTALBgNVBAMTBFBTTkMwHhcNMTQw
-						MzI1MTI0MTI2WhcNMjQwMzI0MTI0MTI2WjBgMQswCQYDVQQGEwJQTDEVMBMGA1UE
-						CBMMV2llbGtvcG9sc2thMQ8wDQYDVQQHEwZQb3puYW4xDTALBgNVBAoTBFBTTkMx
-						CzAJBgNVBAsTAk5EMQ0wCwYDVQQDEwRQU05DMIIBIjANBgkqhkiG9w0BAQEFAAOC
-						AQ8AMIIBCgKCAQEAprLbGmrldyPqbXlk5Y2mE78VYdLbsn6/LtQEVO4UNuYU6kxK
-						hy38FDjZ20Zrsgjz4fspJxP08yjeyw2qGGVcZXJRZAlJ3IRhjLlq9cZi5t5XDA4A
-						HfD+LSzUFmllZdNRS6oOceLXRkR7BYeHVeMYQHLTc6SABjCSs9oDpGwlxj8iHqbH
-						P50zh7PxBNxRv8PlEgsWEgGZ5Vgk1U1sT0490t7VB7ksqO+ka0BLQORPmZj7JNiJ
-						On20X7w/fXeSTcOgRcoGhf9d5QaOU/k7yP4BPXx1fX6gPsPM63zJzvtKfD/3WCdj
-						tqHHhEC1IP6eYzM3PJNa67N0HMiwzxpjjAPv+wIDAQABo4HFMIHCMB0GA1UdDgQW
-						BBTzO8Ze8XJHf1jHWJ30yMxIB1BpXzCBkgYDVR0jBIGKMIGHgBTzO8Ze8XJHf1jH
-						WJ30yMxIB1BpX6FkpGIwYDELMAkGA1UEBhMCUEwxFTATBgNVBAgTDFdpZWxrb3Bv
-						bHNrYTEPMA0GA1UEBxMGUG96bmFuMQ0wCwYDVQQKEwRQU05DMQswCQYDVQQLEwJO
-						RDENMAsGA1UEAxMEUFNOQ4IJAPAcrGLtMuPXMAwGA1UdEwQFMAMBAf8wDQYJKoZI
-						hvcNAQEEBQADggEBAEUL4IvCbJkcFE976QP/9k+zN5aXOXIIW7CSH1KJLjvCY0UJ
-						Kzz+hzdaYIQ08DYq++SI+P0tUX3joUkPCQPCKiddGtRCaQLtvkl4Jt8S+eqC9rX2
-						l+A/wry/VIjxpntaz+A+Vwz1FEiuUAHrMAchJnuCEaGXOZ9NSLErOTD6d7e2j6+5
-						1Jy2cd/WUFGtxlhkMPD4Zax1uKiJj3Ptw1Q4pBPFKNLsyObFWL2igel2fEVGxxBH
-						AXaXuUUk8l+3BWmYoCbsZdnN36DqXqsK1NLhCCl+VIYEvr62U0B4AWlLcCfyt4Dy
-						7eK+5ZFB6MaRVtCwdykxbQQXWNv60u8dwrbkTqk=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://educonf-directory.geant.net/simplesaml/module.php/saml/sp/saml2-logout.php/eduCONF"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://educonf-directory.geant.net/simplesaml/module.php/saml/sp/saml2-acs.php/eduCONF" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://educonf-directory.geant.net/simplesaml/module.php/saml/sp/saml1-acs.php/eduCONF" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://educonf-directory.geant.net/simplesaml/module.php/saml/sp/saml2-acs.php/eduCONF" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://educonf-directory.geant.net/simplesaml/module.php/saml/sp/saml1-acs.php/eduCONF/artifact" index="3"/>
-    <AttributeConsumingService index="0">
-      <ServiceName xml:lang="en">eduCONF</ServiceName>
-      <ServiceDescription xml:lang="en">eduCONF supports and facilitates the use and adoption of videoconferencing, simplifying the videoconference experience and reducing operational costs. It enables further integration of the NRENs’ videoconferencing services within a coherent service, reduces travel costs, environmental impact and increases the awareness of Partners’ videoconferencing services across Europe.</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="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="givenName" Name="urn:oid:2.5.4.42" 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="true"/>
-      <RequestedAttribute FriendlyName="surname" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <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="true"/>
-    </AttributeConsumingService>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Delivery of Advanced Network Technology to Europe Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">GÉANT Intranet</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.geant.net/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>eduCONF</GivenName>
-    <EmailAddress>mailto:support@geant.net</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>eduCONF VC Team</GivenName>
-    <EmailAddress>mailto:educonf@geant.net</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/edugain-group.cesnet.cz-idp-shibboleth.xml b/swamid-interfederations-2.0/edugain-group.cesnet.cz-idp-shibboleth.xml
deleted file mode 100644
index 7c5d0466..00000000
--- a/swamid-interfederations-2.0/edugain-group.cesnet.cz-idp-shibboleth.xml
+++ /dev/null
@@ -1,81 +0,0 @@
-<?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://edugain-group.cesnet.cz/idp/shibboleth">
-  <md:Extensions xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata">
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/" registrationInstant="2014-10-23T11:20:04Z">
-      <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>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">edugain-group.cesnet.cz</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">eduGAIN Group AA</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="cs">eduGAIN Group AA</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Attribute Authority for eduGAIN Group Sevice.</mdui:Description>
-        <mdui:Description xml:lang="cs">Atributová autorita pro službu eduGAIN skupiny.</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://perun.cesnet.cz/apps/edugain-group/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="cs">http://perun.cesnet.cz/apps/edugain-group/</mdui:InformationURL>
-        <mdui:Logo height="87" width="293">https://perun.cesnet.cz/web/img/logo_color_shades.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>
-MIIEqTCCA5GgAwIBAgIRAKTDcyjAM5LIjbwt/gIRhBMwDQYJKoZIhvcNAQELBQAw
-ZDELMAkGA1UEBhMCTkwxFjAUBgNVBAgTDU5vb3JkLUhvbGxhbmQxEjAQBgNVBAcT
-CUFtc3RlcmRhbTEPMA0GA1UEChMGVEVSRU5BMRgwFgYDVQQDEw9URVJFTkEgU1NM
-IENBIDIwHhcNMTQxMDIxMDAwMDAwWhcNMTcxMDIwMjM1OTU5WjBFMSEwHwYDVQQL
-ExhEb21haW4gQ29udHJvbCBWYWxpZGF0ZWQxIDAeBgNVBAMTF2VkdWdhaW4tZ3Jv
-dXAuY2VzbmV0LmN6MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA7h40
-7VUKwoW/zRyupdmroy6rSeb0t2szy683Ac8zJbFQT7lMEE4LEpBF40CxitQN4zkq
-6rZ1avCDfgUA5UOCqDRsDZiVhVZVHTUsewOWnA4I5cI38oKsi7Ai9eSTmgcWVaeS
-EjluoKZW2ycVmABMGLbOLo1odikKDCmXniNZLYRbXH6mGQrZ4bWYW6vXyGJJAyu7
-i5oJIYXv9G6Ok9PZe/nfs2vlU7D3sUFjBOGeTAarwtDdpEb+MzznB+Y49tF6u9f+
-2LWAVV7cQakXx6RATzcbkNcfCV21z9M4UCzQUbMPYfmkT2MT104L9kOcPIWGdA8z
-x0TdmOaFHJHLhqRjLwIDAQABo4IBczCCAW8wHwYDVR0jBBgwFoAUW9CKHJoyW+C1
-3ZZUG+GGKLD9tr0wHQYDVR0OBBYEFPxW7rdUfjv3tljZIZesDtk45SGsMA4GA1Ud
-DwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggr
-BgEFBQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNV
-HR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnVzZXJ0cnVzdC5jb20vVEVSRU5BU1NM
-Q0EyLmNybDBsBggrBgEFBQcBAQRgMF4wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQu
-dXNlcnRydXN0LmNvbS9URVJFTkFTU0xDQTIuY3J0MCUGCCsGAQUFBzABhhlodHRw
-Oi8vb2NzcC51c2VydHJ1c3QuY29tMCIGA1UdEQQbMBmCF2VkdWdhaW4tZ3JvdXAu
-Y2VzbmV0LmN6MA0GCSqGSIb3DQEBCwUAA4IBAQA8oL553U23dlBWyYfRp1HzcDSy
-tl/UlWh8FSjUi9CIrCkIzfjUgwZeAYOTTQ/Hszl8EtxxdY3WPqDmtm5VkL8KyMqk
-Pnndn1ebFpK5vLjI1304TNRsR4iZU9/ntNREeaSVzAA135kSnfz+F3KiDMpmnjkB
-58KT0EUE/YEv8hAOyZpOAt/cXwkkKUvlcArIrexXGhFDG5S6Iy9KHzDJ9fJDbAcn
-fmkgS5Dai/VEkvtdEN4d2BpXZHCC8EGPQQLU6ajpoe+P+ls7oLfM5B+rH9/EBHXJ
-cU/I3dCI+bvdo7O6bNqXqahLqhpBXuEaFFzDuT+6kbx8N9SRf0urvUNlejHQ
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://edugain-group.cesnet.cz:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://edugain-group.cesnet.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">CESNET</OrganizationName>
-    <OrganizationName xml:lang="cs">CESNET</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">CESNET</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="cs">CESNET z.s.p.o.</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.cesnet.cz/?lang=en</OrganizationURL>
-    <OrganizationURL xml:lang="cs">http://www.cesnet.cz/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Michal</GivenName>
-    <SurName>Prochazka</SurName>
-    <EmailAddress>michalp@ics.muni.cz</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Slávek</GivenName>
-    <SurName>Licehammer</SurName>
-    <EmailAddress>slavek@ics.muni.cz</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/edugain-group.cesnet.cz.xml b/swamid-interfederations-2.0/edugain-group.cesnet.cz.xml
deleted file mode 100644
index 7c5d0466..00000000
--- a/swamid-interfederations-2.0/edugain-group.cesnet.cz.xml
+++ /dev/null
@@ -1,81 +0,0 @@
-<?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://edugain-group.cesnet.cz/idp/shibboleth">
-  <md:Extensions xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata">
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/" registrationInstant="2014-10-23T11:20:04Z">
-      <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>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">edugain-group.cesnet.cz</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">eduGAIN Group AA</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="cs">eduGAIN Group AA</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Attribute Authority for eduGAIN Group Sevice.</mdui:Description>
-        <mdui:Description xml:lang="cs">Atributová autorita pro službu eduGAIN skupiny.</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://perun.cesnet.cz/apps/edugain-group/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="cs">http://perun.cesnet.cz/apps/edugain-group/</mdui:InformationURL>
-        <mdui:Logo height="87" width="293">https://perun.cesnet.cz/web/img/logo_color_shades.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>
-MIIEqTCCA5GgAwIBAgIRAKTDcyjAM5LIjbwt/gIRhBMwDQYJKoZIhvcNAQELBQAw
-ZDELMAkGA1UEBhMCTkwxFjAUBgNVBAgTDU5vb3JkLUhvbGxhbmQxEjAQBgNVBAcT
-CUFtc3RlcmRhbTEPMA0GA1UEChMGVEVSRU5BMRgwFgYDVQQDEw9URVJFTkEgU1NM
-IENBIDIwHhcNMTQxMDIxMDAwMDAwWhcNMTcxMDIwMjM1OTU5WjBFMSEwHwYDVQQL
-ExhEb21haW4gQ29udHJvbCBWYWxpZGF0ZWQxIDAeBgNVBAMTF2VkdWdhaW4tZ3Jv
-dXAuY2VzbmV0LmN6MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA7h40
-7VUKwoW/zRyupdmroy6rSeb0t2szy683Ac8zJbFQT7lMEE4LEpBF40CxitQN4zkq
-6rZ1avCDfgUA5UOCqDRsDZiVhVZVHTUsewOWnA4I5cI38oKsi7Ai9eSTmgcWVaeS
-EjluoKZW2ycVmABMGLbOLo1odikKDCmXniNZLYRbXH6mGQrZ4bWYW6vXyGJJAyu7
-i5oJIYXv9G6Ok9PZe/nfs2vlU7D3sUFjBOGeTAarwtDdpEb+MzznB+Y49tF6u9f+
-2LWAVV7cQakXx6RATzcbkNcfCV21z9M4UCzQUbMPYfmkT2MT104L9kOcPIWGdA8z
-x0TdmOaFHJHLhqRjLwIDAQABo4IBczCCAW8wHwYDVR0jBBgwFoAUW9CKHJoyW+C1
-3ZZUG+GGKLD9tr0wHQYDVR0OBBYEFPxW7rdUfjv3tljZIZesDtk45SGsMA4GA1Ud
-DwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggr
-BgEFBQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNV
-HR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnVzZXJ0cnVzdC5jb20vVEVSRU5BU1NM
-Q0EyLmNybDBsBggrBgEFBQcBAQRgMF4wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQu
-dXNlcnRydXN0LmNvbS9URVJFTkFTU0xDQTIuY3J0MCUGCCsGAQUFBzABhhlodHRw
-Oi8vb2NzcC51c2VydHJ1c3QuY29tMCIGA1UdEQQbMBmCF2VkdWdhaW4tZ3JvdXAu
-Y2VzbmV0LmN6MA0GCSqGSIb3DQEBCwUAA4IBAQA8oL553U23dlBWyYfRp1HzcDSy
-tl/UlWh8FSjUi9CIrCkIzfjUgwZeAYOTTQ/Hszl8EtxxdY3WPqDmtm5VkL8KyMqk
-Pnndn1ebFpK5vLjI1304TNRsR4iZU9/ntNREeaSVzAA135kSnfz+F3KiDMpmnjkB
-58KT0EUE/YEv8hAOyZpOAt/cXwkkKUvlcArIrexXGhFDG5S6Iy9KHzDJ9fJDbAcn
-fmkgS5Dai/VEkvtdEN4d2BpXZHCC8EGPQQLU6ajpoe+P+ls7oLfM5B+rH9/EBHXJ
-cU/I3dCI+bvdo7O6bNqXqahLqhpBXuEaFFzDuT+6kbx8N9SRf0urvUNlejHQ
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://edugain-group.cesnet.cz:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://edugain-group.cesnet.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">CESNET</OrganizationName>
-    <OrganizationName xml:lang="cs">CESNET</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">CESNET</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="cs">CESNET z.s.p.o.</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.cesnet.cz/?lang=en</OrganizationURL>
-    <OrganizationURL xml:lang="cs">http://www.cesnet.cz/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Michal</GivenName>
-    <SurName>Prochazka</SurName>
-    <EmailAddress>michalp@ics.muni.cz</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Slávek</GivenName>
-    <SurName>Licehammer</SurName>
-    <EmailAddress>slavek@ics.muni.cz</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/edugate.heanet.ie-shibboleth.xml b/swamid-interfederations-2.0/edugate.heanet.ie-shibboleth.xml
deleted file mode 100644
index cea1453e..00000000
--- a/swamid-interfederations-2.0/edugate.heanet.ie-shibboleth.xml
+++ /dev/null
@@ -1,118 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://edugate.heanet.ie/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.heanet.ie" registrationInstant="2010-11-01T00:00:00Z"/>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.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://edugate.heanet.ie/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://edugate.heanet.ie/Shibboleth.sso/DS" index="0"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Edugate Resource Registry</mdui:DisplayName>
-        <mdui:Description xml:lang="en">The Edugate Resource Registry website is a central administration tool for managing the Edugate federation and additional bilateral relationships. This website also serves 
-The website will process your userid, name and email address to authorise access. Further data is used for the Whoami section of the website for troubleshooting purposes only and this additional data is not retained after you logout/leave the site.</mdui:Description>
-        <mdui:InformationURL xml:lang="en">https://edugate.heanet.ie/rr3</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://edugate.heanet.ie/rr3/p/page/privacy</mdui:PrivacyStatementURL>
-        <mdui:Logo height="108" width="306">https://edugate.heanet.ie/rr3/logos/edugate.png</mdui:Logo>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIFbjCCA1YCCQCB0T3DNIZANDANBgkqhkiG9w0BAQUFADB5MQswCQYDVQQGEwJJ
-RTEPMA0GA1UECBMGRHVibGluMQ8wDQYDVQQHEwZEdWJsaW4xEzARBgNVBAoTCkhF
-QW5ldCBMdGQxEDAOBgNVBAMTB0VkdWdhdGUxITAfBgkqhkiG9w0BCQEWEnN1cHBv
-cnRAZWR1Z2F0ZS5pZTAeFw0xMDAzMDUxMTEwMTdaFw0yMDAzMDIxMTEwMTdaMHkx
-CzAJBgNVBAYTAklFMQ8wDQYDVQQIEwZEdWJsaW4xDzANBgNVBAcTBkR1YmxpbjET
-MBEGA1UEChMKSEVBbmV0IEx0ZDEQMA4GA1UEAxMHRWR1Z2F0ZTEhMB8GCSqGSIb3
-DQEJARYSc3VwcG9ydEBlZHVnYXRlLmllMIICIjANBgkqhkiG9w0BAQEFAAOCAg8A
-MIICCgKCAgEA01w+k8x58Sqqs+X0a/vScGc2g4BMBO0KE9lXujcNpXX+fwkzAhLK
-kQuvMtp0sSn7/WrsGa5MNSm5Z6+U3yGV3VCNRlUuiPdPe4zzXaMV3lPGDPNZeSTD
-BMlDXGALtzWBlAriQhctfvjamBRYwXrC0KDFkUCNu6DphR8bjBHhWFx9V20oQ75o
-3wLC7irMa09JkJpc82SVg3PqJ3ogt9Y0BTuqUgoiSGZIoTCsLrkLUotSZOkzxRQq
-u3nVL7cEFEWRmVEkaD3qjq6epo4EHDSUO6HB6WCV5gDccgGb0A5yCIvQY7SjEaaY
-hKmVMixwdki44+hNFPP5Qv+4A5NPxUVlAB8WzdRsrTTc4wDW4XDDAF7+0NmNZECc
-wN9/tLZROATQiFg6Fsmzar39DZos5EUo+4L/ozL8yBXOqdTwrTKKwrWmaQQTDpO6
-ASxGFWyXFbWIoun6/iUSpSgTnjRpgTnGVwFRmMV3bI7jd3egNemNhHZgwQ8js88N
-eQK2Uq3kjNa33NSEjpFNYShR7Tg4d8OUmdCdR3olakF/W6huToc46Skfp783+yqo
-L6qQ5xwL6XCeeB9EFtuGyy/J578W70Y5N0QnlIO14ShfBhMH9DL+wxidVuriJlrM
-mx130sELvNIpPJHf4gXpGAWDhxn2QqMAu1QK0+EueWfZTddglzRrk70CAwEAATAN
-BgkqhkiG9w0BAQUFAAOCAgEAhImtRqXMbxZNIog0TgaQvy62DFtbABS0FCM/xMGo
-vuY5l7YF/ot5SNE4MqWYX1pyOQRVIELuvNByH+FLKDmF6jyU9U0c8w9c6Uhf7Zs/
-0lgIfpR8LGvTHiNjbSuy6aCK+0JxGugaZZloSmGkIir9Yi6MQr8HOLdCkRYCISZQ
-pdGJFTwwDEoUDVr0szV4Aupm3wI/MtU80clwrHiVVyY0BoHc63gZ6j3Bn2BiuIb8
-pnxV3nwDnU9pSxkaBAH8Mo6zTo3dM9kdfdXlKvU3VIZ60O/Y8E2FZIKgqUK3enab
-YnX59OpeUExsaEUYRav5CQQlnNoYTOfG5E/foM4ojZhDv8hfeJmnvTjlDvQF4IaC
-WzziDM/1e/mGLjUHShbjv+OaxWBOwQjmPrsqEHTg7iTMTxuHfxnIVnv5/efknDiA
-9QPAVCY5BHH61FMxYfEoIhnLc3qSBGhx1keledDoXRzTyycfZi88Dj2YDBzLCbbT
-KxocVWR5wlAkMpxpFHsLIRp+XYNdc1cG6NQO4eHwoAJ/y1qdGssA9RR9/TEnlKMT
-mUavwgBEqGeMh1w0GwTmXGruoBOZMJNks9WzCmp+3QKsVCjZd/KIxHITq+jNeFRf
-LzMJnF1row2YXqF4AYDluUyCMPo89glxvlX9lDJ3TW5Xz4OJWqrz4WvEyWJIAMZy
-UBY=
-</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://edugate.heanet.ie/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://edugate.heanet.ie/Shibboleth.sso/SAML2/Artifact" index="6"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://edugate.heanet.ie/Shibboleth.sso/SAML2/ECP" index="8"/>
-    <md:AttributeConsumingService index="0">
-      <md:ServiceName xml:lang="en">Edugate Resource Registry</md:ServiceName>
-      <md:ServiceDescription xml:lang="en">The Edugate Resource Registry website is a central administration tool for managing the Edugate federation and additional bilateral relationships. This website also serves 
-The website will process your userid, name and email address to authorise access. Further data is used for the Whoami section of the website for troubleshooting purposes only and this additional data is not retained after you logout/leave the site.</md:ServiceDescription>
-      <md: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" isRequired="false"/>
-      <md:RequestedAttribute FriendlyName="email" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="homePostalAddress" Name="urn:oid:0.9.2342.19200300.100.1.39" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-      <md:RequestedAttribute FriendlyName="postalAddress" Name="urn:oid:2.5.4.16" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-      <md:RequestedAttribute FriendlyName="homePhone" Name="urn:oid:0.9.2342.19200300.100.1.20" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-      <md:RequestedAttribute FriendlyName="telephoneNumber" Name="urn:oid:2.5.4.20" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-      <md:RequestedAttribute FriendlyName="mobile" Name="urn:oid:0.9.2342.19200300.100.1.41" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-      <md:RequestedAttribute FriendlyName="eduPersonAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-      <md:RequestedAttribute FriendlyName="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" isRequired="false"/>
-      <md: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" isRequired="false"/>
-      <md:RequestedAttribute FriendlyName="eduPersonEntitlement" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.7" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-      <md:RequestedAttribute FriendlyName="surname" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="uid" Name="urn:oid:0.9.2342.19200300.100.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-      <md:RequestedAttribute FriendlyName="employeeNumber" Name="urn:oid:2.16.840.1.113730.3.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-      <md:RequestedAttribute FriendlyName="ou" Name="urn:oid:2.5.4.11" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-      <md:RequestedAttribute FriendlyName="organizationName" Name="urn:oid:2.5.4.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="eduPersonAssurance" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.11" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-      <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-      <md:RequestedAttribute FriendlyName="freebusyurl" Name="urn:oid:1.3.6.1.4.1.250.1.57" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-      <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-      <md:RequestedAttribute FriendlyName="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" isRequired="false"/>
-      <md:RequestedAttribute FriendlyName="schacHomeOrganizationType" Name="urn:oid:1.3.6.1.4.1.25178.1.2.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-      <md:RequestedAttribute FriendlyName="schacHomeOrganization" Name="urn:oid:1.3.6.1.4.1.25178.1.2.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-      <md:RequestedAttribute FriendlyName="commonName" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-      <md:RequestedAttribute FriendlyName="RCSidNumber" Name="urn:oid:1.2.840.113556.1.8000.2092.3.8" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-      <md:RequestedAttribute FriendlyName="awsRoles" Name="https://aws.amazon.com/SAML/Attributes/Role" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-      <md:RequestedAttribute FriendlyName="awsRoleSessionName" Name="https://aws.amazon.com/SAML/Attributes/RoleSessionName" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-      <md:RequestedAttribute FriendlyName="sAMAccountName" Name="urn:oid:1.2.840.113556.1.4.221" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">HEAnet</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">HEAnet</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">https://edugate.heanet.ie/rr3</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Glenn</md:GivenName>
-    <md:SurName>Wearen</md:SurName>
-    <md:EmailAddress>glenn.wearen@heanet.ie</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>NOC</md:GivenName>
-    <md:SurName>HEAnet</md:SurName>
-    <md:EmailAddress>noc@heanet.ie</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>NOC</md:GivenName>
-    <md:SurName>HEAnet</md:SurName>
-    <md:EmailAddress>noc@heanet.ie</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/edugate.heanet.ie.xml b/swamid-interfederations-2.0/edugate.heanet.ie.xml
deleted file mode 100644
index cea1453e..00000000
--- a/swamid-interfederations-2.0/edugate.heanet.ie.xml
+++ /dev/null
@@ -1,118 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://edugate.heanet.ie/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.heanet.ie" registrationInstant="2010-11-01T00:00:00Z"/>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.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://edugate.heanet.ie/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://edugate.heanet.ie/Shibboleth.sso/DS" index="0"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Edugate Resource Registry</mdui:DisplayName>
-        <mdui:Description xml:lang="en">The Edugate Resource Registry website is a central administration tool for managing the Edugate federation and additional bilateral relationships. This website also serves 
-The website will process your userid, name and email address to authorise access. Further data is used for the Whoami section of the website for troubleshooting purposes only and this additional data is not retained after you logout/leave the site.</mdui:Description>
-        <mdui:InformationURL xml:lang="en">https://edugate.heanet.ie/rr3</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://edugate.heanet.ie/rr3/p/page/privacy</mdui:PrivacyStatementURL>
-        <mdui:Logo height="108" width="306">https://edugate.heanet.ie/rr3/logos/edugate.png</mdui:Logo>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIFbjCCA1YCCQCB0T3DNIZANDANBgkqhkiG9w0BAQUFADB5MQswCQYDVQQGEwJJ
-RTEPMA0GA1UECBMGRHVibGluMQ8wDQYDVQQHEwZEdWJsaW4xEzARBgNVBAoTCkhF
-QW5ldCBMdGQxEDAOBgNVBAMTB0VkdWdhdGUxITAfBgkqhkiG9w0BCQEWEnN1cHBv
-cnRAZWR1Z2F0ZS5pZTAeFw0xMDAzMDUxMTEwMTdaFw0yMDAzMDIxMTEwMTdaMHkx
-CzAJBgNVBAYTAklFMQ8wDQYDVQQIEwZEdWJsaW4xDzANBgNVBAcTBkR1YmxpbjET
-MBEGA1UEChMKSEVBbmV0IEx0ZDEQMA4GA1UEAxMHRWR1Z2F0ZTEhMB8GCSqGSIb3
-DQEJARYSc3VwcG9ydEBlZHVnYXRlLmllMIICIjANBgkqhkiG9w0BAQEFAAOCAg8A
-MIICCgKCAgEA01w+k8x58Sqqs+X0a/vScGc2g4BMBO0KE9lXujcNpXX+fwkzAhLK
-kQuvMtp0sSn7/WrsGa5MNSm5Z6+U3yGV3VCNRlUuiPdPe4zzXaMV3lPGDPNZeSTD
-BMlDXGALtzWBlAriQhctfvjamBRYwXrC0KDFkUCNu6DphR8bjBHhWFx9V20oQ75o
-3wLC7irMa09JkJpc82SVg3PqJ3ogt9Y0BTuqUgoiSGZIoTCsLrkLUotSZOkzxRQq
-u3nVL7cEFEWRmVEkaD3qjq6epo4EHDSUO6HB6WCV5gDccgGb0A5yCIvQY7SjEaaY
-hKmVMixwdki44+hNFPP5Qv+4A5NPxUVlAB8WzdRsrTTc4wDW4XDDAF7+0NmNZECc
-wN9/tLZROATQiFg6Fsmzar39DZos5EUo+4L/ozL8yBXOqdTwrTKKwrWmaQQTDpO6
-ASxGFWyXFbWIoun6/iUSpSgTnjRpgTnGVwFRmMV3bI7jd3egNemNhHZgwQ8js88N
-eQK2Uq3kjNa33NSEjpFNYShR7Tg4d8OUmdCdR3olakF/W6huToc46Skfp783+yqo
-L6qQ5xwL6XCeeB9EFtuGyy/J578W70Y5N0QnlIO14ShfBhMH9DL+wxidVuriJlrM
-mx130sELvNIpPJHf4gXpGAWDhxn2QqMAu1QK0+EueWfZTddglzRrk70CAwEAATAN
-BgkqhkiG9w0BAQUFAAOCAgEAhImtRqXMbxZNIog0TgaQvy62DFtbABS0FCM/xMGo
-vuY5l7YF/ot5SNE4MqWYX1pyOQRVIELuvNByH+FLKDmF6jyU9U0c8w9c6Uhf7Zs/
-0lgIfpR8LGvTHiNjbSuy6aCK+0JxGugaZZloSmGkIir9Yi6MQr8HOLdCkRYCISZQ
-pdGJFTwwDEoUDVr0szV4Aupm3wI/MtU80clwrHiVVyY0BoHc63gZ6j3Bn2BiuIb8
-pnxV3nwDnU9pSxkaBAH8Mo6zTo3dM9kdfdXlKvU3VIZ60O/Y8E2FZIKgqUK3enab
-YnX59OpeUExsaEUYRav5CQQlnNoYTOfG5E/foM4ojZhDv8hfeJmnvTjlDvQF4IaC
-WzziDM/1e/mGLjUHShbjv+OaxWBOwQjmPrsqEHTg7iTMTxuHfxnIVnv5/efknDiA
-9QPAVCY5BHH61FMxYfEoIhnLc3qSBGhx1keledDoXRzTyycfZi88Dj2YDBzLCbbT
-KxocVWR5wlAkMpxpFHsLIRp+XYNdc1cG6NQO4eHwoAJ/y1qdGssA9RR9/TEnlKMT
-mUavwgBEqGeMh1w0GwTmXGruoBOZMJNks9WzCmp+3QKsVCjZd/KIxHITq+jNeFRf
-LzMJnF1row2YXqF4AYDluUyCMPo89glxvlX9lDJ3TW5Xz4OJWqrz4WvEyWJIAMZy
-UBY=
-</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://edugate.heanet.ie/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://edugate.heanet.ie/Shibboleth.sso/SAML2/Artifact" index="6"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://edugate.heanet.ie/Shibboleth.sso/SAML2/ECP" index="8"/>
-    <md:AttributeConsumingService index="0">
-      <md:ServiceName xml:lang="en">Edugate Resource Registry</md:ServiceName>
-      <md:ServiceDescription xml:lang="en">The Edugate Resource Registry website is a central administration tool for managing the Edugate federation and additional bilateral relationships. This website also serves 
-The website will process your userid, name and email address to authorise access. Further data is used for the Whoami section of the website for troubleshooting purposes only and this additional data is not retained after you logout/leave the site.</md:ServiceDescription>
-      <md: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" isRequired="false"/>
-      <md:RequestedAttribute FriendlyName="email" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="homePostalAddress" Name="urn:oid:0.9.2342.19200300.100.1.39" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-      <md:RequestedAttribute FriendlyName="postalAddress" Name="urn:oid:2.5.4.16" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-      <md:RequestedAttribute FriendlyName="homePhone" Name="urn:oid:0.9.2342.19200300.100.1.20" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-      <md:RequestedAttribute FriendlyName="telephoneNumber" Name="urn:oid:2.5.4.20" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-      <md:RequestedAttribute FriendlyName="mobile" Name="urn:oid:0.9.2342.19200300.100.1.41" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-      <md:RequestedAttribute FriendlyName="eduPersonAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-      <md:RequestedAttribute FriendlyName="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" isRequired="false"/>
-      <md: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" isRequired="false"/>
-      <md:RequestedAttribute FriendlyName="eduPersonEntitlement" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.7" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-      <md:RequestedAttribute FriendlyName="surname" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="uid" Name="urn:oid:0.9.2342.19200300.100.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-      <md:RequestedAttribute FriendlyName="employeeNumber" Name="urn:oid:2.16.840.1.113730.3.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-      <md:RequestedAttribute FriendlyName="ou" Name="urn:oid:2.5.4.11" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-      <md:RequestedAttribute FriendlyName="organizationName" Name="urn:oid:2.5.4.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="eduPersonAssurance" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.11" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-      <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-      <md:RequestedAttribute FriendlyName="freebusyurl" Name="urn:oid:1.3.6.1.4.1.250.1.57" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-      <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-      <md:RequestedAttribute FriendlyName="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" isRequired="false"/>
-      <md:RequestedAttribute FriendlyName="schacHomeOrganizationType" Name="urn:oid:1.3.6.1.4.1.25178.1.2.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-      <md:RequestedAttribute FriendlyName="schacHomeOrganization" Name="urn:oid:1.3.6.1.4.1.25178.1.2.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-      <md:RequestedAttribute FriendlyName="commonName" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-      <md:RequestedAttribute FriendlyName="RCSidNumber" Name="urn:oid:1.2.840.113556.1.8000.2092.3.8" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-      <md:RequestedAttribute FriendlyName="awsRoles" Name="https://aws.amazon.com/SAML/Attributes/Role" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-      <md:RequestedAttribute FriendlyName="awsRoleSessionName" Name="https://aws.amazon.com/SAML/Attributes/RoleSessionName" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-      <md:RequestedAttribute FriendlyName="sAMAccountName" Name="urn:oid:1.2.840.113556.1.4.221" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">HEAnet</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">HEAnet</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">https://edugate.heanet.ie/rr3</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Glenn</md:GivenName>
-    <md:SurName>Wearen</md:SurName>
-    <md:EmailAddress>glenn.wearen@heanet.ie</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>NOC</md:GivenName>
-    <md:SurName>HEAnet</md:SurName>
-    <md:EmailAddress>noc@heanet.ie</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>NOC</md:GivenName>
-    <md:SurName>HEAnet</md:SurName>
-    <md:EmailAddress>noc@heanet.ie</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/edugate.itb.ie-idp-shibboleth.xml b/swamid-interfederations-2.0/edugate.itb.ie-idp-shibboleth.xml
deleted file mode 100644
index 01964839..00000000
--- a/swamid-interfederations-2.0/edugate.itb.ie-idp-shibboleth.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="https://edugate.itb.ie/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.heanet.ie" registrationInstant="2011-03-08T00:00:00Z"/>
-  </md:Extensions>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">itb.ie</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Institute of Technology Blanchardstown</mdui:DisplayName>
-        <mdui:InformationURL xml:lang="en">http://www.itb.ie</mdui:InformationURL>
-        <mdui:Logo height="65" width="235">https://edugate.heanet.ie/rr3/logos/itb.png</mdui:Logo>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:GeolocationHint>geo:53.40572644015631,-6.378046274185181</mdui:GeolocationHint>
-      </mdui:DiscoHints>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDIzCCAgugAwIBAgIUWE0VPYPdB8l/5af8W6PkkZDYFm4wDQYJKoZIhvcNAQEF
-BQAwGTEXMBUGA1UEAxMOZWR1Z2F0ZS5pdGIuaWUwHhcNMTEwNjAxMTQ1NjA1WhcN
-MzEwNjAxMTQ1NjA1WjAZMRcwFQYDVQQDEw5lZHVnYXRlLml0Yi5pZTCCASIwDQYJ
-KoZIhvcNAQEBBQADggEPADCCAQoCggEBAJg3AH4MXYhZXU7pdFdV6lhsNB0/Qjqg
-eYSiWfLoZydHcJXTJw7Tfk2/8iX/NkLiyX+zouYTuw99HJtb+oZ4WzW3vwD0pupy
-eM4eteWkGycQBoW7aE+KAH8Qrsj3xiGSv0A6Yod6wHn7KyCAmxUb7wPOCf/yuj5z
-SvxZwdQWUXRqlirDhJgLsOSedru92hVRXbo8uMvnkdkWbwggBd5UMNGPZsPRBPKN
-P+nw5Ccvw2GWCZkpel4nqoIFu+8GbJVHYOrUliVLgNcv+lL22SlmI4ahqZDHTToC
-AzfRGuYUOtkpHlBp/H3ZQLEQ/61o5HWYB7RAtQNRCMU0u145/2uJ2TcCAwEAAaNj
-MGEwQAYDVR0RBDkwN4IOZWR1Z2F0ZS5pdGIuaWWGJWh0dHBzOi8vZWR1Z2F0ZS5p
-dGIuaWUvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFARmPTDY2ovy8VOaLRwUc5al
-PqZNMA0GCSqGSIb3DQEBBQUAA4IBAQAZIThM8v0IQ++IyxuLKCPziFcDdl3Cptbv
-0LHvMWnVhskz5hxqaFBIyCCXtBwsVOMMGX5gNWtUm+7l+toa3AWC6bvjzDTCU64Z
-LW30XFU05arBASH+s1VNeOVnKHunsK1PN6qDH1VrXKkREyfDNWhQDHm1TE8JlBxY
-gbKMqJzGMLYTLc7xwiEn2qRh4Yh9TaoYwBHlPVTKR0Zd+p4N1xh3Bu5hr/V3MeHD
-6H4JYebKv15gO1dpxnngMQsnFs9lUqkcoMvPsJXj81AAO2WQUK4RC8SH+CL+pzqZ
-hj8bmirIgUuG9EBuz/X57eigHOWaytDx61rjjuvtKOWT2LgfwXqY
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://edugate.itb.ie/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://edugate.itb.ie/idp/profile/SAML2/POST/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Institute of Technology Blanchardstown</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Institute of Technology Blanchardstown</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.itb.ie</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Dave</md:GivenName>
-    <md:SurName>Curran</md:SurName>
-    <md:EmailAddress>dave.curran@itb.ie</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Eamonn</md:GivenName>
-    <md:SurName>O'Brien</md:SurName>
-    <md:EmailAddress>Eamonn.OBrien@itb.ie</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/edugate.itb.ie.xml b/swamid-interfederations-2.0/edugate.itb.ie.xml
deleted file mode 100644
index 01964839..00000000
--- a/swamid-interfederations-2.0/edugate.itb.ie.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="https://edugate.itb.ie/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.heanet.ie" registrationInstant="2011-03-08T00:00:00Z"/>
-  </md:Extensions>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">itb.ie</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Institute of Technology Blanchardstown</mdui:DisplayName>
-        <mdui:InformationURL xml:lang="en">http://www.itb.ie</mdui:InformationURL>
-        <mdui:Logo height="65" width="235">https://edugate.heanet.ie/rr3/logos/itb.png</mdui:Logo>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:GeolocationHint>geo:53.40572644015631,-6.378046274185181</mdui:GeolocationHint>
-      </mdui:DiscoHints>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDIzCCAgugAwIBAgIUWE0VPYPdB8l/5af8W6PkkZDYFm4wDQYJKoZIhvcNAQEF
-BQAwGTEXMBUGA1UEAxMOZWR1Z2F0ZS5pdGIuaWUwHhcNMTEwNjAxMTQ1NjA1WhcN
-MzEwNjAxMTQ1NjA1WjAZMRcwFQYDVQQDEw5lZHVnYXRlLml0Yi5pZTCCASIwDQYJ
-KoZIhvcNAQEBBQADggEPADCCAQoCggEBAJg3AH4MXYhZXU7pdFdV6lhsNB0/Qjqg
-eYSiWfLoZydHcJXTJw7Tfk2/8iX/NkLiyX+zouYTuw99HJtb+oZ4WzW3vwD0pupy
-eM4eteWkGycQBoW7aE+KAH8Qrsj3xiGSv0A6Yod6wHn7KyCAmxUb7wPOCf/yuj5z
-SvxZwdQWUXRqlirDhJgLsOSedru92hVRXbo8uMvnkdkWbwggBd5UMNGPZsPRBPKN
-P+nw5Ccvw2GWCZkpel4nqoIFu+8GbJVHYOrUliVLgNcv+lL22SlmI4ahqZDHTToC
-AzfRGuYUOtkpHlBp/H3ZQLEQ/61o5HWYB7RAtQNRCMU0u145/2uJ2TcCAwEAAaNj
-MGEwQAYDVR0RBDkwN4IOZWR1Z2F0ZS5pdGIuaWWGJWh0dHBzOi8vZWR1Z2F0ZS5p
-dGIuaWUvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFARmPTDY2ovy8VOaLRwUc5al
-PqZNMA0GCSqGSIb3DQEBBQUAA4IBAQAZIThM8v0IQ++IyxuLKCPziFcDdl3Cptbv
-0LHvMWnVhskz5hxqaFBIyCCXtBwsVOMMGX5gNWtUm+7l+toa3AWC6bvjzDTCU64Z
-LW30XFU05arBASH+s1VNeOVnKHunsK1PN6qDH1VrXKkREyfDNWhQDHm1TE8JlBxY
-gbKMqJzGMLYTLc7xwiEn2qRh4Yh9TaoYwBHlPVTKR0Zd+p4N1xh3Bu5hr/V3MeHD
-6H4JYebKv15gO1dpxnngMQsnFs9lUqkcoMvPsJXj81AAO2WQUK4RC8SH+CL+pzqZ
-hj8bmirIgUuG9EBuz/X57eigHOWaytDx61rjjuvtKOWT2LgfwXqY
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://edugate.itb.ie/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://edugate.itb.ie/idp/profile/SAML2/POST/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Institute of Technology Blanchardstown</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Institute of Technology Blanchardstown</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.itb.ie</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Dave</md:GivenName>
-    <md:SurName>Curran</md:SurName>
-    <md:EmailAddress>dave.curran@itb.ie</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Eamonn</md:GivenName>
-    <md:SurName>O'Brien</md:SurName>
-    <md:EmailAddress>Eamonn.OBrien@itb.ie</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/eduspot.ens-cachan.fr-authsaml2-metadata.xml b/swamid-interfederations-2.0/eduspot.ens-cachan.fr-authsaml2-metadata.xml
deleted file mode 100644
index 395be891..00000000
--- a/swamid-interfederations-2.0/eduspot.ens-cachan.fr-authsaml2-metadata.xml
+++ /dev/null
@@ -1,123 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://eduspot.ens-cachan.fr/authsaml2/metadata">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2012-04-12T10:48:28Z">
-      <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.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="fr">ENS de Cachan - Portail Eduspot</mdui:DisplayName>
-        <mdui:Description xml:lang="fr">Accès aux Wifi pour les participants au projet Eduspot via le portail captif Univnautes.</mdui:Description>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIEpDCCA4ygAwIBAgIQeTFgbQWRlGanItIwtJ/w0jANBgkqhkiG9w0BAQsFADBk
-MQswCQYDVQQGEwJOTDEWMBQGA1UECBMNTm9vcmQtSG9sbGFuZDESMBAGA1UEBxMJ
-QW1zdGVyZGFtMQ8wDQYDVQQKEwZURVJFTkExGDAWBgNVBAMTD1RFUkVOQSBTU0wg
-Q0EgMjAeFw0xNDEwMTcwMDAwMDBaFw0xNzEwMTYyMzU5NTlaMEMxITAfBgNVBAsT
-GERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEeMBwGA1UEAxMVZWR1c3BvdC5lbnMt
-Y2FjaGFuLmZyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuNjLcYRU
-VIYvwbFG89dp+n0NMsDR6SrHZ/AMit0airV2ReNm1H+Wcuq0UGQKLsrhytQsL3vK
-lgBCbUi2LbIFlPubTIBx8pNoH8AkBcOyfg1kiN2yJ4z+gaqjoy+gp7zChSKhga3D
-LsIkAfBK2hKiw+t1Cod/LCgbeBdGKnB4gDTZScYf8r3rSIyE1mtDI93VJfsMHkKD
-j3WOmhAnoT1KDXFHI1utdUwyM/u2nGgAjgupEbDTAOfx/N56/yUkR88Q22itXKdS
-Er3v66gp0CJluEPUFTmmCCdklnv12rFR16hrgm/fiZWyj6z9BtRQUW6cC35fDtmq
-9CMXI8aYdpMTEwIDAQABo4IBcTCCAW0wHwYDVR0jBBgwFoAUW9CKHJoyW+C13ZZU
-G+GGKLD9tr0wHQYDVR0OBBYEFHeYAb+69vprObDtE1PM63PWKio0MA4GA1UdDwEB
-/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEF
-BQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNVHR8E
-MzAxMC+gLaArhilodHRwOi8vY3JsLnVzZXJ0cnVzdC5jb20vVEVSRU5BU1NMQ0Ey
-LmNybDBsBggrBgEFBQcBAQRgMF4wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudXNl
-cnRydXN0LmNvbS9URVJFTkFTU0xDQTIuY3J0MCUGCCsGAQUFBzABhhlodHRwOi8v
-b2NzcC51c2VydHJ1c3QuY29tMCAGA1UdEQQZMBeCFWVkdXNwb3QuZW5zLWNhY2hh
-bi5mcjANBgkqhkiG9w0BAQsFAAOCAQEANOYe63FGB6CrqW/Hl8uRbBrJsYHnzknp
-h6NjKRuvnzeOOOrDVW75T3//6AepZzJ0k1ZzzYIYJ0crBavEEo9L5AvwMPvs7mYw
-RAUTEMhGTm/nYQct1jwbCgNKCDgYuydZUcixtiq3LXz1SglHXGNhg+SLGCGXrHrJ
-JxuaneWu5FgReUB3EDUC0bCrM9nx2cHitLtox3aXU/fhiPXCEkP2HV4DnjLu3fBJ
-S5gBayfEa2U6VDzvwdEk71Pw3PKsdEl7f9N5mp3rpjvr36r5TH5LXhbk0utRGo7u
-yn+WFioypXnVKl7dgWzQsVdGI4NnnsfGgmah+vJMEtRPPnBtjRrV3A==
-					    </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>
-					      MIIEpDCCA4ygAwIBAgIQeTFgbQWRlGanItIwtJ/w0jANBgkqhkiG9w0BAQsFADBk
-MQswCQYDVQQGEwJOTDEWMBQGA1UECBMNTm9vcmQtSG9sbGFuZDESMBAGA1UEBxMJ
-QW1zdGVyZGFtMQ8wDQYDVQQKEwZURVJFTkExGDAWBgNVBAMTD1RFUkVOQSBTU0wg
-Q0EgMjAeFw0xNDEwMTcwMDAwMDBaFw0xNzEwMTYyMzU5NTlaMEMxITAfBgNVBAsT
-GERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEeMBwGA1UEAxMVZWR1c3BvdC5lbnMt
-Y2FjaGFuLmZyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuNjLcYRU
-VIYvwbFG89dp+n0NMsDR6SrHZ/AMit0airV2ReNm1H+Wcuq0UGQKLsrhytQsL3vK
-lgBCbUi2LbIFlPubTIBx8pNoH8AkBcOyfg1kiN2yJ4z+gaqjoy+gp7zChSKhga3D
-LsIkAfBK2hKiw+t1Cod/LCgbeBdGKnB4gDTZScYf8r3rSIyE1mtDI93VJfsMHkKD
-j3WOmhAnoT1KDXFHI1utdUwyM/u2nGgAjgupEbDTAOfx/N56/yUkR88Q22itXKdS
-Er3v66gp0CJluEPUFTmmCCdklnv12rFR16hrgm/fiZWyj6z9BtRQUW6cC35fDtmq
-9CMXI8aYdpMTEwIDAQABo4IBcTCCAW0wHwYDVR0jBBgwFoAUW9CKHJoyW+C13ZZU
-G+GGKLD9tr0wHQYDVR0OBBYEFHeYAb+69vprObDtE1PM63PWKio0MA4GA1UdDwEB
-/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEF
-BQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNVHR8E
-MzAxMC+gLaArhilodHRwOi8vY3JsLnVzZXJ0cnVzdC5jb20vVEVSRU5BU1NMQ0Ey
-LmNybDBsBggrBgEFBQcBAQRgMF4wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudXNl
-cnRydXN0LmNvbS9URVJFTkFTU0xDQTIuY3J0MCUGCCsGAQUFBzABhhlodHRwOi8v
-b2NzcC51c2VydHJ1c3QuY29tMCAGA1UdEQQZMBeCFWVkdXNwb3QuZW5zLWNhY2hh
-bi5mcjANBgkqhkiG9w0BAQsFAAOCAQEANOYe63FGB6CrqW/Hl8uRbBrJsYHnzknp
-h6NjKRuvnzeOOOrDVW75T3//6AepZzJ0k1ZzzYIYJ0crBavEEo9L5AvwMPvs7mYw
-RAUTEMhGTm/nYQct1jwbCgNKCDgYuydZUcixtiq3LXz1SglHXGNhg+SLGCGXrHrJ
-JxuaneWu5FgReUB3EDUC0bCrM9nx2cHitLtox3aXU/fhiPXCEkP2HV4DnjLu3fBJ
-S5gBayfEa2U6VDzvwdEk71Pw3PKsdEl7f9N5mp3rpjvr36r5TH5LXhbk0utRGo7u
-yn+WFioypXnVKl7dgWzQsVdGI4NnnsfGgmah+vJMEtRPPnBtjRrV3A==
-					    </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>
-					      MIIDTDCCAjQCCQCR6CZCuHxqRDANBgkqhkiG9w0BAQUFADBoMQswCQYDVQQGEwJG
-UjErMCkGA1UEChMiRUNPTEUgTk9STUFMRSBTVVBFUklFVVJFIERFIENBQ0hBTjEM
-MAoGA1UECxMDRFNJMR4wHAYDVQQDExVlZHVzcG90LmVucy1jYWNoYW4uZnIwHhcN
-MTQwNDE0MTIzNjI4WhcNMTUwNDE0MTIzNjI4WjBoMQswCQYDVQQGEwJGUjErMCkG
-A1UEChMiRUNPTEUgTk9STUFMRSBTVVBFUklFVVJFIERFIENBQ0hBTjEMMAoGA1UE
-CxMDRFNJMR4wHAYDVQQDExVlZHVzcG90LmVucy1jYWNoYW4uZnIwggEiMA0GCSqG
-SIb3DQEBAQUAA4IBDwAwggEKAoIBAQDaN/r/9eegiIWfM7W+cBepylzyQKasGNVV
-pOGqQtClO+RDnHw1e+VjLofvQkCrkXqO0Yk2+3fFluaVEKefRhz87KkfCwqmmMVv
-N7QPL7wdjefp7z0QQQd500er/lWzNEZ16noFKNAKIVQ7L8nwEID2szf2o7lwiHUM
-I0/WYrcHtglX+KFiKCajf8lMQHQlnLvrODzBvZPuY+hcjyPMet8C77jsQs9KcBa/
-WOZ0XHwpfP6qSedCp1feHWNG/6H/ngPhFH+Yfh8dCYvnf8evL+WKL+b2L22s009K
-6pGpup0ZJaS2UbMblHeOCRf9kfT6peLwcOawPi9M7W68vSBtNd4DAgMBAAEwDQYJ
-KoZIhvcNAQEFBQADggEBAAm4J2729rV0T1ZHR7GhruA+x8Kt0SXeXwvng8Zuaijz
-NSNK9Ej3j9Y/NRYKPTPAm2fGCrbbr89lZ+0680b6ZqicZU2c4juHe0u5/5zN1wmV
-h98Us4F37tUL4aT6fvi+FTJUkeHR3ZV/wGkdbzTLWqKqVQ8POO8Q55DZEjIrFiq3
-LmIbOYK8bfdAZTc2XWVsU1bNQyJMY6Qiu2mA1VTc61b5gUI94RmMpfEP0hl7DBgh
-KIz/GZRjl9UB3x6EEgmPi+ihRwPs/tQORLZpaS9pyqdPzrH3NuP/iVO5Dv/D7Ss9
-U3vIxlLV3X9ESLFrZiZgFRyKOqQOri3RHniJ7Yt9v+k=
-					    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://eduspot.ens-cachan.fr/authsaml2/singleSignOnPost" index="1"/>
-    <AttributeConsumingService index="0">
-      <ServiceName xml:lang="fr">ENS de Cachan - Portail Eduspot</ServiceName>
-      <ServiceDescription xml:lang="fr">Accès aux Wifi pour les participants au projet Eduspot via le portail captif Univnautes.</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="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"/>
-    </AttributeConsumingService>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Ecole Normale Supérieure de Cachan</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Ecole Normale Supérieure de Cachan</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <EmailAddress>eduspot@ens-cachan.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/eduspot.ens-cachan.fr.xml b/swamid-interfederations-2.0/eduspot.ens-cachan.fr.xml
deleted file mode 100644
index 395be891..00000000
--- a/swamid-interfederations-2.0/eduspot.ens-cachan.fr.xml
+++ /dev/null
@@ -1,123 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://eduspot.ens-cachan.fr/authsaml2/metadata">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2012-04-12T10:48:28Z">
-      <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.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="fr">ENS de Cachan - Portail Eduspot</mdui:DisplayName>
-        <mdui:Description xml:lang="fr">Accès aux Wifi pour les participants au projet Eduspot via le portail captif Univnautes.</mdui:Description>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIEpDCCA4ygAwIBAgIQeTFgbQWRlGanItIwtJ/w0jANBgkqhkiG9w0BAQsFADBk
-MQswCQYDVQQGEwJOTDEWMBQGA1UECBMNTm9vcmQtSG9sbGFuZDESMBAGA1UEBxMJ
-QW1zdGVyZGFtMQ8wDQYDVQQKEwZURVJFTkExGDAWBgNVBAMTD1RFUkVOQSBTU0wg
-Q0EgMjAeFw0xNDEwMTcwMDAwMDBaFw0xNzEwMTYyMzU5NTlaMEMxITAfBgNVBAsT
-GERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEeMBwGA1UEAxMVZWR1c3BvdC5lbnMt
-Y2FjaGFuLmZyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuNjLcYRU
-VIYvwbFG89dp+n0NMsDR6SrHZ/AMit0airV2ReNm1H+Wcuq0UGQKLsrhytQsL3vK
-lgBCbUi2LbIFlPubTIBx8pNoH8AkBcOyfg1kiN2yJ4z+gaqjoy+gp7zChSKhga3D
-LsIkAfBK2hKiw+t1Cod/LCgbeBdGKnB4gDTZScYf8r3rSIyE1mtDI93VJfsMHkKD
-j3WOmhAnoT1KDXFHI1utdUwyM/u2nGgAjgupEbDTAOfx/N56/yUkR88Q22itXKdS
-Er3v66gp0CJluEPUFTmmCCdklnv12rFR16hrgm/fiZWyj6z9BtRQUW6cC35fDtmq
-9CMXI8aYdpMTEwIDAQABo4IBcTCCAW0wHwYDVR0jBBgwFoAUW9CKHJoyW+C13ZZU
-G+GGKLD9tr0wHQYDVR0OBBYEFHeYAb+69vprObDtE1PM63PWKio0MA4GA1UdDwEB
-/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEF
-BQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNVHR8E
-MzAxMC+gLaArhilodHRwOi8vY3JsLnVzZXJ0cnVzdC5jb20vVEVSRU5BU1NMQ0Ey
-LmNybDBsBggrBgEFBQcBAQRgMF4wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudXNl
-cnRydXN0LmNvbS9URVJFTkFTU0xDQTIuY3J0MCUGCCsGAQUFBzABhhlodHRwOi8v
-b2NzcC51c2VydHJ1c3QuY29tMCAGA1UdEQQZMBeCFWVkdXNwb3QuZW5zLWNhY2hh
-bi5mcjANBgkqhkiG9w0BAQsFAAOCAQEANOYe63FGB6CrqW/Hl8uRbBrJsYHnzknp
-h6NjKRuvnzeOOOrDVW75T3//6AepZzJ0k1ZzzYIYJ0crBavEEo9L5AvwMPvs7mYw
-RAUTEMhGTm/nYQct1jwbCgNKCDgYuydZUcixtiq3LXz1SglHXGNhg+SLGCGXrHrJ
-JxuaneWu5FgReUB3EDUC0bCrM9nx2cHitLtox3aXU/fhiPXCEkP2HV4DnjLu3fBJ
-S5gBayfEa2U6VDzvwdEk71Pw3PKsdEl7f9N5mp3rpjvr36r5TH5LXhbk0utRGo7u
-yn+WFioypXnVKl7dgWzQsVdGI4NnnsfGgmah+vJMEtRPPnBtjRrV3A==
-					    </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>
-					      MIIEpDCCA4ygAwIBAgIQeTFgbQWRlGanItIwtJ/w0jANBgkqhkiG9w0BAQsFADBk
-MQswCQYDVQQGEwJOTDEWMBQGA1UECBMNTm9vcmQtSG9sbGFuZDESMBAGA1UEBxMJ
-QW1zdGVyZGFtMQ8wDQYDVQQKEwZURVJFTkExGDAWBgNVBAMTD1RFUkVOQSBTU0wg
-Q0EgMjAeFw0xNDEwMTcwMDAwMDBaFw0xNzEwMTYyMzU5NTlaMEMxITAfBgNVBAsT
-GERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEeMBwGA1UEAxMVZWR1c3BvdC5lbnMt
-Y2FjaGFuLmZyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuNjLcYRU
-VIYvwbFG89dp+n0NMsDR6SrHZ/AMit0airV2ReNm1H+Wcuq0UGQKLsrhytQsL3vK
-lgBCbUi2LbIFlPubTIBx8pNoH8AkBcOyfg1kiN2yJ4z+gaqjoy+gp7zChSKhga3D
-LsIkAfBK2hKiw+t1Cod/LCgbeBdGKnB4gDTZScYf8r3rSIyE1mtDI93VJfsMHkKD
-j3WOmhAnoT1KDXFHI1utdUwyM/u2nGgAjgupEbDTAOfx/N56/yUkR88Q22itXKdS
-Er3v66gp0CJluEPUFTmmCCdklnv12rFR16hrgm/fiZWyj6z9BtRQUW6cC35fDtmq
-9CMXI8aYdpMTEwIDAQABo4IBcTCCAW0wHwYDVR0jBBgwFoAUW9CKHJoyW+C13ZZU
-G+GGKLD9tr0wHQYDVR0OBBYEFHeYAb+69vprObDtE1PM63PWKio0MA4GA1UdDwEB
-/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEF
-BQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNVHR8E
-MzAxMC+gLaArhilodHRwOi8vY3JsLnVzZXJ0cnVzdC5jb20vVEVSRU5BU1NMQ0Ey
-LmNybDBsBggrBgEFBQcBAQRgMF4wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudXNl
-cnRydXN0LmNvbS9URVJFTkFTU0xDQTIuY3J0MCUGCCsGAQUFBzABhhlodHRwOi8v
-b2NzcC51c2VydHJ1c3QuY29tMCAGA1UdEQQZMBeCFWVkdXNwb3QuZW5zLWNhY2hh
-bi5mcjANBgkqhkiG9w0BAQsFAAOCAQEANOYe63FGB6CrqW/Hl8uRbBrJsYHnzknp
-h6NjKRuvnzeOOOrDVW75T3//6AepZzJ0k1ZzzYIYJ0crBavEEo9L5AvwMPvs7mYw
-RAUTEMhGTm/nYQct1jwbCgNKCDgYuydZUcixtiq3LXz1SglHXGNhg+SLGCGXrHrJ
-JxuaneWu5FgReUB3EDUC0bCrM9nx2cHitLtox3aXU/fhiPXCEkP2HV4DnjLu3fBJ
-S5gBayfEa2U6VDzvwdEk71Pw3PKsdEl7f9N5mp3rpjvr36r5TH5LXhbk0utRGo7u
-yn+WFioypXnVKl7dgWzQsVdGI4NnnsfGgmah+vJMEtRPPnBtjRrV3A==
-					    </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>
-					      MIIDTDCCAjQCCQCR6CZCuHxqRDANBgkqhkiG9w0BAQUFADBoMQswCQYDVQQGEwJG
-UjErMCkGA1UEChMiRUNPTEUgTk9STUFMRSBTVVBFUklFVVJFIERFIENBQ0hBTjEM
-MAoGA1UECxMDRFNJMR4wHAYDVQQDExVlZHVzcG90LmVucy1jYWNoYW4uZnIwHhcN
-MTQwNDE0MTIzNjI4WhcNMTUwNDE0MTIzNjI4WjBoMQswCQYDVQQGEwJGUjErMCkG
-A1UEChMiRUNPTEUgTk9STUFMRSBTVVBFUklFVVJFIERFIENBQ0hBTjEMMAoGA1UE
-CxMDRFNJMR4wHAYDVQQDExVlZHVzcG90LmVucy1jYWNoYW4uZnIwggEiMA0GCSqG
-SIb3DQEBAQUAA4IBDwAwggEKAoIBAQDaN/r/9eegiIWfM7W+cBepylzyQKasGNVV
-pOGqQtClO+RDnHw1e+VjLofvQkCrkXqO0Yk2+3fFluaVEKefRhz87KkfCwqmmMVv
-N7QPL7wdjefp7z0QQQd500er/lWzNEZ16noFKNAKIVQ7L8nwEID2szf2o7lwiHUM
-I0/WYrcHtglX+KFiKCajf8lMQHQlnLvrODzBvZPuY+hcjyPMet8C77jsQs9KcBa/
-WOZ0XHwpfP6qSedCp1feHWNG/6H/ngPhFH+Yfh8dCYvnf8evL+WKL+b2L22s009K
-6pGpup0ZJaS2UbMblHeOCRf9kfT6peLwcOawPi9M7W68vSBtNd4DAgMBAAEwDQYJ
-KoZIhvcNAQEFBQADggEBAAm4J2729rV0T1ZHR7GhruA+x8Kt0SXeXwvng8Zuaijz
-NSNK9Ej3j9Y/NRYKPTPAm2fGCrbbr89lZ+0680b6ZqicZU2c4juHe0u5/5zN1wmV
-h98Us4F37tUL4aT6fvi+FTJUkeHR3ZV/wGkdbzTLWqKqVQ8POO8Q55DZEjIrFiq3
-LmIbOYK8bfdAZTc2XWVsU1bNQyJMY6Qiu2mA1VTc61b5gUI94RmMpfEP0hl7DBgh
-KIz/GZRjl9UB3x6EEgmPi+ihRwPs/tQORLZpaS9pyqdPzrH3NuP/iVO5Dv/D7Ss9
-U3vIxlLV3X9ESLFrZiZgFRyKOqQOri3RHniJ7Yt9v+k=
-					    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://eduspot.ens-cachan.fr/authsaml2/singleSignOnPost" index="1"/>
-    <AttributeConsumingService index="0">
-      <ServiceName xml:lang="fr">ENS de Cachan - Portail Eduspot</ServiceName>
-      <ServiceDescription xml:lang="fr">Accès aux Wifi pour les participants au projet Eduspot via le portail captif Univnautes.</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="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"/>
-    </AttributeConsumingService>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Ecole Normale Supérieure de Cachan</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Ecole Normale Supérieure de Cachan</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <EmailAddress>eduspot@ens-cachan.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/egiswamid.egi.kth.se-shibboleth.xml b/swamid-interfederations-2.0/egiswamid.egi.kth.se-shibboleth.xml
deleted file mode 100644
index e645d46d..00000000
--- a/swamid-interfederations-2.0/egiswamid.egi.kth.se-shibboleth.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://egiswamid.egi.kth.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>
-  </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://egiswamid.egi.kth.se/Shibboleth.sso/Login"/>
-      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://egiswamid.egi.kth.se/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://egiswamid.egi.kth.se/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://egiswamid.egi.kth.se/Shibboleth.sso/DS/ds.swamid.se" index="2"/>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>egiswamid.egi.kth.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=egiswamid.egi.kth.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDAzCCAeugAwIBAgIJAOKn91RkenjIMA0GCSqGSIb3DQEBBQUAMB8xHTAbBgNV
-BAMTFGVnaXN3YW1pZC5lZ2kua3RoLnNlMB4XDTEzMDMwNTExNDU0NFoXDTIzMDMw
-MzExNDU0NFowHzEdMBsGA1UEAxMUZWdpc3dhbWlkLmVnaS5rdGguc2UwggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDa3DK9UMbKQsvIuJuWLUT3nKRpKUfv
-P0hG4Y9YIjNTXuZWjAVt//FHHVyVVFiyOVjdS7ccgKBdlaQAgxz9TlVXWGkImFDr
-3FB2MBKAXZsqdK8goFzb6QKJJyIS7PRLWQgWWrZkUfESf2HZFbOZK4Q5XxdPu8VY
-DZMU/bwOPwGnO2D8NuJhiMUNSvsw652D0fft5iqoMu68T+RqkvHjt6etgOIRjOUe
-x0FEWmNjOEUXfmR8KEILSgE4LLn4MgBLjwS9f4AklfNaJzubq2CoDDKr5+QqObKa
-s4xt7xB5zaI8n2pWFi1Lik453ZjbyGNNrmIMVoKq8YqfbYbScT+dbGPFAgMBAAGj
-QjBAMB8GA1UdEQQYMBaCFGVnaXN3YW1pZC5lZ2kua3RoLnNlMB0GA1UdDgQWBBSe
-YTmnl+7QvxX3lojqwxfovXBD7TANBgkqhkiG9w0BAQUFAAOCAQEAvjYyfsLqwLUA
-l1jw+FSIRQj1ync3bzU0Pw1i79RjYvSMip+TTScKqMlvfCowOaux0zrD9L9Zezbu
-38fVIa/77VZYFRNkt8uzaB5guMvO1O0XJbuCHl7/J9cdsRnhxFFMrGSQEAFKjXS4
-KhnBVBTB618v+Z3Yr3D4A+2ph5GhQreKEyWrEfKUCNLvI2s9IgF3NlnItHT0Z0VL
-PTw0p2GJzoMLwXYaiWVvGMDnJI9hSxIs+cJCtUUb19wCt3p2cILcFRfkHZR7aO1/
-/es1MnuKqzg9hCb7lpizP/bzSTUxfcVYd7rYACatWWZmXTB2INi4BbF8sFrdUYL9
-VESdo2ebFA==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://egiswamid.egi.kth.se/Shibboleth.sso/Artifact/SOAP" index="0"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://egiswamid.egi.kth.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://egiswamid.egi.kth.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://egiswamid.egi.kth.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://egiswamid.egi.kth.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://egiswamid.egi.kth.se/Shibboleth.sso/SAML2/POST" index="0"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://egiswamid.egi.kth.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://egiswamid.egi.kth.se/Shibboleth.sso/SAML2/Artifact" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://egiswamid.egi.kth.se/Shibboleth.sso/SAML2/ECP" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://egiswamid.egi.kth.se/Shibboleth.sso/SAML/POST" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://egiswamid.egi.kth.se/Shibboleth.sso/SAML/Artifact" index="5"/>
-  </md:SPSSODescriptor>
-  <md:ContactPerson contactType="technical">
-    <md:EmailAddress>operations@swamid.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/egiswamid.egi.kth.se.xml b/swamid-interfederations-2.0/egiswamid.egi.kth.se.xml
deleted file mode 100644
index e645d46d..00000000
--- a/swamid-interfederations-2.0/egiswamid.egi.kth.se.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://egiswamid.egi.kth.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>
-  </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://egiswamid.egi.kth.se/Shibboleth.sso/Login"/>
-      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://egiswamid.egi.kth.se/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://egiswamid.egi.kth.se/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://egiswamid.egi.kth.se/Shibboleth.sso/DS/ds.swamid.se" index="2"/>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>egiswamid.egi.kth.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=egiswamid.egi.kth.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDAzCCAeugAwIBAgIJAOKn91RkenjIMA0GCSqGSIb3DQEBBQUAMB8xHTAbBgNV
-BAMTFGVnaXN3YW1pZC5lZ2kua3RoLnNlMB4XDTEzMDMwNTExNDU0NFoXDTIzMDMw
-MzExNDU0NFowHzEdMBsGA1UEAxMUZWdpc3dhbWlkLmVnaS5rdGguc2UwggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDa3DK9UMbKQsvIuJuWLUT3nKRpKUfv
-P0hG4Y9YIjNTXuZWjAVt//FHHVyVVFiyOVjdS7ccgKBdlaQAgxz9TlVXWGkImFDr
-3FB2MBKAXZsqdK8goFzb6QKJJyIS7PRLWQgWWrZkUfESf2HZFbOZK4Q5XxdPu8VY
-DZMU/bwOPwGnO2D8NuJhiMUNSvsw652D0fft5iqoMu68T+RqkvHjt6etgOIRjOUe
-x0FEWmNjOEUXfmR8KEILSgE4LLn4MgBLjwS9f4AklfNaJzubq2CoDDKr5+QqObKa
-s4xt7xB5zaI8n2pWFi1Lik453ZjbyGNNrmIMVoKq8YqfbYbScT+dbGPFAgMBAAGj
-QjBAMB8GA1UdEQQYMBaCFGVnaXN3YW1pZC5lZ2kua3RoLnNlMB0GA1UdDgQWBBSe
-YTmnl+7QvxX3lojqwxfovXBD7TANBgkqhkiG9w0BAQUFAAOCAQEAvjYyfsLqwLUA
-l1jw+FSIRQj1ync3bzU0Pw1i79RjYvSMip+TTScKqMlvfCowOaux0zrD9L9Zezbu
-38fVIa/77VZYFRNkt8uzaB5guMvO1O0XJbuCHl7/J9cdsRnhxFFMrGSQEAFKjXS4
-KhnBVBTB618v+Z3Yr3D4A+2ph5GhQreKEyWrEfKUCNLvI2s9IgF3NlnItHT0Z0VL
-PTw0p2GJzoMLwXYaiWVvGMDnJI9hSxIs+cJCtUUb19wCt3p2cILcFRfkHZR7aO1/
-/es1MnuKqzg9hCb7lpizP/bzSTUxfcVYd7rYACatWWZmXTB2INi4BbF8sFrdUYL9
-VESdo2ebFA==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://egiswamid.egi.kth.se/Shibboleth.sso/Artifact/SOAP" index="0"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://egiswamid.egi.kth.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://egiswamid.egi.kth.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://egiswamid.egi.kth.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://egiswamid.egi.kth.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://egiswamid.egi.kth.se/Shibboleth.sso/SAML2/POST" index="0"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://egiswamid.egi.kth.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://egiswamid.egi.kth.se/Shibboleth.sso/SAML2/Artifact" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://egiswamid.egi.kth.se/Shibboleth.sso/SAML2/ECP" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://egiswamid.egi.kth.se/Shibboleth.sso/SAML/POST" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://egiswamid.egi.kth.se/Shibboleth.sso/SAML/Artifact" index="5"/>
-  </md:SPSSODescriptor>
-  <md:ContactPerson contactType="technical">
-    <md:EmailAddress>operations@swamid.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/eka-idp.lanet.lv.xml b/swamid-interfederations-2.0/eka-idp.lanet.lv.xml
deleted file mode 100644
index a2a9a38e..00000000
--- a/swamid-interfederations-2.0/eka-idp.lanet.lv.xml
+++ /dev/null
@@ -1,41 +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://eka-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/" registrationInstant="2013-10-10T10:10:10Z">
-      <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>
-MIIDhjCCAm4CCQC8Px9pbIuxGDANBgkqhkiG9w0BAQUFADCBhDELMAkGA1UEBhMCTFYxDTALBgNVBAgMBFJpZ2ExDTALBgNVBAcMBFJpZ2ExCzAJBgNVBAoMAkxVMQwwCgYDVQQLDANJVEQxFTATBgNVBAMMDGx1LWlkcC5sdS5sdjElMCMGCSqGSIb3DQEJARYWaXRzZXJ2aXNzIGF0IGx1IGRvdCBsdjAeFw0xMzEyMjAxMDU3MDJaFw0yOTAzMDYxMDU3MDJaMIGEMQswCQYDVQQGEwJMVjENMAsGA1UECAwEUmlnYTENMAsGA1UEBwwEUmlnYTELMAkGA1UECgwCTFUxDDAKBgNVBAsMA0lURDEVMBMGA1UEAwwMbHUtaWRwLmx1Lmx2MSUwIwYJKoZIhvcNAQkBFhZpdHNlcnZpc3MgYXQgbHUgZG90IGx2MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuAy8ri5VknGxy21iuW6kalPwg7VPZBWOuV/jVjRre44tHFd5FinCQUCuzQZn37AU3ZNZg07RRyDhkAzzpsBRQf48VcbnQFRjERuQTKUfT9hzFMxgbjxW2Dayg2Ru2LkGcIUeHilOwfmRn1NIRBN+0UyJIluRvB8YGdHSSHYSMimyw9uYEuMkU9aqewwW78w7TeasCWlB6jiGfJ/SGVtPRThJ6X6KVqoU2gwIY+V7YJkG4b5TOw4HLaIsdOmU4h1Ep3igy+Zsc/7zPn+80iwm1Jk9Q8zGlEwikjPn1N3enMOxR8wpQfAQwm5lIaHNXYFcXCj3mVQ3yQ9EzB/hRC8tHwIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQCFRpI7U/lTwoUW/HwDb2gAmjb0RSmS+5lUWDgmjP/rJwYdh672plabNcY12DiqchtBaSeTOf4qANCqEme+YBAmssFUeLx6O1J+5aXeXfCwAA9GlswGDVeC8ZnTVmQupnbvL0T+ZU8WtkltlLEJdD6o9BtEOqk3+Rspu+94d6FUwmvWB/YWypAOfzXkkSxi+87nsadiFEOyCzTW8fZotOrZMzba52ELLJgCx3IzGLUzV80PSJwLzKYHVp0VluH2DzrxfMKC01bMklG46n1nhEo1UU2KA4vzoScmrXzD+m7nKFZ3GHFjyQvtxqG7gA34qg1Vj2o2O0vN/kvjX73SR5s4
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDhjCCAm4CCQC8Px9pbIuxGDANBgkqhkiG9w0BAQUFADCBhDELMAkGA1UEBhMCTFYxDTALBgNVBAgMBFJpZ2ExDTALBgNVBAcMBFJpZ2ExCzAJBgNVBAoMAkxVMQwwCgYDVQQLDANJVEQxFTATBgNVBAMMDGx1LWlkcC5sdS5sdjElMCMGCSqGSIb3DQEJARYWaXRzZXJ2aXNzIGF0IGx1IGRvdCBsdjAeFw0xMzEyMjAxMDU3MDJaFw0yOTAzMDYxMDU3MDJaMIGEMQswCQYDVQQGEwJMVjENMAsGA1UECAwEUmlnYTENMAsGA1UEBwwEUmlnYTELMAkGA1UECgwCTFUxDDAKBgNVBAsMA0lURDEVMBMGA1UEAwwMbHUtaWRwLmx1Lmx2MSUwIwYJKoZIhvcNAQkBFhZpdHNlcnZpc3MgYXQgbHUgZG90IGx2MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuAy8ri5VknGxy21iuW6kalPwg7VPZBWOuV/jVjRre44tHFd5FinCQUCuzQZn37AU3ZNZg07RRyDhkAzzpsBRQf48VcbnQFRjERuQTKUfT9hzFMxgbjxW2Dayg2Ru2LkGcIUeHilOwfmRn1NIRBN+0UyJIluRvB8YGdHSSHYSMimyw9uYEuMkU9aqewwW78w7TeasCWlB6jiGfJ/SGVtPRThJ6X6KVqoU2gwIY+V7YJkG4b5TOw4HLaIsdOmU4h1Ep3igy+Zsc/7zPn+80iwm1Jk9Q8zGlEwikjPn1N3enMOxR8wpQfAQwm5lIaHNXYFcXCj3mVQ3yQ9EzB/hRC8tHwIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQCFRpI7U/lTwoUW/HwDb2gAmjb0RSmS+5lUWDgmjP/rJwYdh672plabNcY12DiqchtBaSeTOf4qANCqEme+YBAmssFUeLx6O1J+5aXeXfCwAA9GlswGDVeC8ZnTVmQupnbvL0T+ZU8WtkltlLEJdD6o9BtEOqk3+Rspu+94d6FUwmvWB/YWypAOfzXkkSxi+87nsadiFEOyCzTW8fZotOrZMzba52ELLJgCx3IzGLUzV80PSJwLzKYHVp0VluH2DzrxfMKC01bMklG46n1nhEo1UU2KA4vzoScmrXzD+m7nKFZ3GHFjyQvtxqG7gA34qg1Vj2o2O0vN/kvjX73SR5s4
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://eka-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://eka-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 - EKA</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">The University College of Economics and Culture- EKA IDP</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://laife.lanet.lv/</OrganizationURL>
-    <OrganizationURL xml:lang="lv">http://eka.edu.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/eliot.isae.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/eliot.isae.fr-idp-shibboleth.xml
deleted file mode 100644
index 55d01891..00000000
--- a/swamid-interfederations-2.0/eliot.isae.fr-idp-shibboleth.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://eliot.isae.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2014-05-13T08:51:05Z">
-      <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">isae.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">ISAE</mdui:DisplayName>
-        <mdui:Description xml:lang="en">ISAE Employees and students</mdui:Description>
-        <mdui:DisplayName xml:lang="fr">ISAE Institut Supérieur de l'Aéronautique et de l'Espace</mdui:DisplayName>
-        <mdui:Description xml:lang="fr">Employés et étudiants ISAE</mdui:Description>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDHzCCAgegAwIBAgIUUF5LStU9oX9W8OSO7seziErEk2MwDQYJKoZIhvcNAQEF
-BQAwGDEWMBQGA1UEAxMNZWxpb3QuaXNhZS5mcjAeFw0xNDA0MTAwODQxMDRaFw0z
-NDA0MTAwODQxMDRaMBgxFjAUBgNVBAMTDWVsaW90LmlzYWUuZnIwggEiMA0GCSqG
-SIb3DQEBAQUAA4IBDwAwggEKAoIBAQDWVaMV3mMeY0J7vAJiDrPzjoYBBnGlWQCT
-Z5i+9tCVoQ67vjsuFZL4ZoRGkjVQH7Dskk1URknskk4/VYv2xyh84z6uD6w/x7K5
-GLAaZErI3jBim9m+xZyt6fczF5upF835K2M7zygoLqytfw++26LrcKlgcRnIIb43
-au+iLlWmsyn6/LW4W1uyvEnZ++mUTpDWTXnSqBdwPcoCDIZD8Gxa1s6X4fOYwPKJ
-/JG+1rsp1yzoTkR40of9ZoufEAj7JwxfgsGw3D234mttq3NfhWznhG0xLEOXAHrB
-bgHiq8/3bOdDP9RlHRC1xQs6wchEHCkN0J2bDixcfRqY4rwUumjTAgMBAAGjYTBf
-MD4GA1UdEQQ3MDWCDWVsaW90LmlzYWUuZnKGJGh0dHBzOi8vZWxpb3QuaXNhZS5m
-ci9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUo4NH7dIbfnxOrheABU7lrQSs4pQw
-DQYJKoZIhvcNAQEFBQADggEBAAVIAhB9Tzy+3wcWouCFXa4otqppu79egey/moyB
-UmkQbgK/WK/t4Fz8QXSQpxsl6NAgDRoKy2KB853uZ+/5y6Pb52ud4mH5UuO+wET8
-Y+vBglWCCGwAmHXqJCj92bZBmbc2jyCLaB3nwjrhnesvd0gY+QOGCQvIzyBX/5Bo
-n/M8NyW5g94ZiS1rrgfw4yeUcjXdIy8iV0w8PLYlootxA93eTBBBJZmwL5UWOz1d
-vLVV2/HCTPHrGBYGv4LlacaMicPW9OXKWnzG3FNfqXYclvCFDxJJvu4ZojdjgNoT
-b4uZkuDSDQgxcqdqqSriAnunZenW8oqMOHkocH9i2GtE1NA=
-					    </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://eliot.isae.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://eliot.isae.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://eliot.isae.fr/idp/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">ISAE Institut Supérieur de l'Aéronautique et de l'Espace</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">ISAE Institut Supérieur de l'Aéronautique et de l'Espace</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Mouchoir</SurName>
-    <EmailAddress>david.mouchoir@isae.fr</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <SurName>Villemur</SurName>
-    <EmailAddress>jacques.villemur@isae.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/eliot.isae.fr.xml b/swamid-interfederations-2.0/eliot.isae.fr.xml
deleted file mode 100644
index 55d01891..00000000
--- a/swamid-interfederations-2.0/eliot.isae.fr.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://eliot.isae.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2014-05-13T08:51:05Z">
-      <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">isae.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">ISAE</mdui:DisplayName>
-        <mdui:Description xml:lang="en">ISAE Employees and students</mdui:Description>
-        <mdui:DisplayName xml:lang="fr">ISAE Institut Supérieur de l'Aéronautique et de l'Espace</mdui:DisplayName>
-        <mdui:Description xml:lang="fr">Employés et étudiants ISAE</mdui:Description>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDHzCCAgegAwIBAgIUUF5LStU9oX9W8OSO7seziErEk2MwDQYJKoZIhvcNAQEF
-BQAwGDEWMBQGA1UEAxMNZWxpb3QuaXNhZS5mcjAeFw0xNDA0MTAwODQxMDRaFw0z
-NDA0MTAwODQxMDRaMBgxFjAUBgNVBAMTDWVsaW90LmlzYWUuZnIwggEiMA0GCSqG
-SIb3DQEBAQUAA4IBDwAwggEKAoIBAQDWVaMV3mMeY0J7vAJiDrPzjoYBBnGlWQCT
-Z5i+9tCVoQ67vjsuFZL4ZoRGkjVQH7Dskk1URknskk4/VYv2xyh84z6uD6w/x7K5
-GLAaZErI3jBim9m+xZyt6fczF5upF835K2M7zygoLqytfw++26LrcKlgcRnIIb43
-au+iLlWmsyn6/LW4W1uyvEnZ++mUTpDWTXnSqBdwPcoCDIZD8Gxa1s6X4fOYwPKJ
-/JG+1rsp1yzoTkR40of9ZoufEAj7JwxfgsGw3D234mttq3NfhWznhG0xLEOXAHrB
-bgHiq8/3bOdDP9RlHRC1xQs6wchEHCkN0J2bDixcfRqY4rwUumjTAgMBAAGjYTBf
-MD4GA1UdEQQ3MDWCDWVsaW90LmlzYWUuZnKGJGh0dHBzOi8vZWxpb3QuaXNhZS5m
-ci9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUo4NH7dIbfnxOrheABU7lrQSs4pQw
-DQYJKoZIhvcNAQEFBQADggEBAAVIAhB9Tzy+3wcWouCFXa4otqppu79egey/moyB
-UmkQbgK/WK/t4Fz8QXSQpxsl6NAgDRoKy2KB853uZ+/5y6Pb52ud4mH5UuO+wET8
-Y+vBglWCCGwAmHXqJCj92bZBmbc2jyCLaB3nwjrhnesvd0gY+QOGCQvIzyBX/5Bo
-n/M8NyW5g94ZiS1rrgfw4yeUcjXdIy8iV0w8PLYlootxA93eTBBBJZmwL5UWOz1d
-vLVV2/HCTPHrGBYGv4LlacaMicPW9OXKWnzG3FNfqXYclvCFDxJJvu4ZojdjgNoT
-b4uZkuDSDQgxcqdqqSriAnunZenW8oqMOHkocH9i2GtE1NA=
-					    </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://eliot.isae.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://eliot.isae.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://eliot.isae.fr/idp/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">ISAE Institut Supérieur de l'Aéronautique et de l'Espace</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">ISAE Institut Supérieur de l'Aéronautique et de l'Espace</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Mouchoir</SurName>
-    <EmailAddress>david.mouchoir@isae.fr</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <SurName>Villemur</SurName>
-    <EmailAddress>jacques.villemur@isae.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/encecafe.ibge.gov.br-idp-shibboleth.xml b/swamid-interfederations-2.0/encecafe.ibge.gov.br-idp-shibboleth.xml
deleted file mode 100644
index d3a50b79..00000000
--- a/swamid-interfederations-2.0/encecafe.ibge.gov.br-idp-shibboleth.xml
+++ /dev/null
@@ -1,114 +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://encecafe.ibge.gov.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">gov.br</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <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>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-    MIIEGjCCAwICAQAwDQYJKoZIhvcNAQEFBQAwgdIxODA2BgNVBAoTL0VOQ0UgLSBF
-U0NPTEEgTkFDSU9OQUwgREUgQ0lFTkNJQVMgRVNUQVRJU1RJQ0FTMQ4wDAYDVQQL
-EwVDT1RFTDEoMCYGCSqGSIb3DQEJARYZc3Vwb3J0ZS5jb3RlbEBpYmdlLmdvdi5i
-cjEXMBUGA1UEBxMOUklPIERFIEpBTkVJUk8xFzAVBgNVBAgTDlJJTyBERSBKQU5F
-SVJPMQswCQYDVQQGEwJCUjEdMBsGA1UEAxMURU5DRUNBRkUuSUJHRS5HT1YuQlIw
-HhcNMTQwNDE3MTQ1OTQzWhcNMTkwNDE2MTQ1OTQzWjCB0jE4MDYGA1UEChMvRU5D
-RSAtIEVTQ09MQSBOQUNJT05BTCBERSBDSUVOQ0lBUyBFU1RBVElTVElDQVMxDjAM
-BgNVBAsTBUNPVEVMMSgwJgYJKoZIhvcNAQkBFhlzdXBvcnRlLmNvdGVsQGliZ2Uu
-Z292LmJyMRcwFQYDVQQHEw5SSU8gREUgSkFORUlSTzEXMBUGA1UECBMOUklPIERF
-IEpBTkVJUk8xCzAJBgNVBAYTAkJSMR0wGwYDVQQDExRFTkNFQ0FGRS5JQkdFLkdP
-Vi5CUjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKcKBwOhT6Gr6FgQ
-4uSzluNmpMlM/vrmI0pqYr8QI8V1lYQnr4ezAdoUNXlaJx2CMCDUPFi47uIRhlXy
-Gh8OZi4WwAEprrIToui2a0Mv6y+JgD/RR4+pm6JggjIlJjijLDjU5VYxoM3TsVQ4
-Vk6RYx81pPhUgnckZ3IV4A5pNtLzxdsEwkPpnoCNFlsKEAVUkMfTAQokQji0aWwc
-iAwAp+dl045oNY1xRiJ4tCZk7VE/Dm7WoddSxAceYJtbUxvH+oE1xD0ZOW3ts7sj
-E4s1W4Eai1femBRrv19dWTXtPG2RWw6I6bYYLQetAvs1kRSqKrJHiHbVBzZ9InpC
-F/vS8tcCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAC78+ABZ2uxuYLkTI3uPi5Wtc
-/HN58FWUyPq+l8/6RrSDI6/uPJ0g490/j5U3L4B4LdjSs3y9kq4sDQ44MSglLcWS
-3WeHhEDiIwWEYy8ZQkEtQfvAxXMkmEfCBaS57dwwzNNaj7CWpo8OBQrsjjboK9tM
-ohbLi2e2DPJtdWztwGYxjAl/b5f2gQVLYgAuoDFs6NEk8wqjuH3fyjs5BrHigzJD
-y/CFOm3UyxZuE6AXLTDxqEzCzdHDAtZP8tK/32zu7Kv7pCP6OI6RdVphaLOxKn7X
-xG6lNFUhNi72Kxw/UnI9yYKJzYkw2v8rC6VfbJ4UOyenQeR27aELT9w3tGOOYg==
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://encecafe.ibge.gov.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://encecafe.ibge.gov.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://encecafe.ibge.gov.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://encecafe.ibge.gov.br/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://encecafe.ibge.gov.br/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://encecafe.ibge.gov.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">gov.br</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-      
-MIIEGjCCAwICAQAwDQYJKoZIhvcNAQEFBQAwgdIxODA2BgNVBAoTL0VOQ0UgLSBF
-U0NPTEEgTkFDSU9OQUwgREUgQ0lFTkNJQVMgRVNUQVRJU1RJQ0FTMQ4wDAYDVQQL
-EwVDT1RFTDEoMCYGCSqGSIb3DQEJARYZc3Vwb3J0ZS5jb3RlbEBpYmdlLmdvdi5i
-cjEXMBUGA1UEBxMOUklPIERFIEpBTkVJUk8xFzAVBgNVBAgTDlJJTyBERSBKQU5F
-SVJPMQswCQYDVQQGEwJCUjEdMBsGA1UEAxMURU5DRUNBRkUuSUJHRS5HT1YuQlIw
-HhcNMTQwNDE3MTQ1OTQzWhcNMTkwNDE2MTQ1OTQzWjCB0jE4MDYGA1UEChMvRU5D
-RSAtIEVTQ09MQSBOQUNJT05BTCBERSBDSUVOQ0lBUyBFU1RBVElTVElDQVMxDjAM
-BgNVBAsTBUNPVEVMMSgwJgYJKoZIhvcNAQkBFhlzdXBvcnRlLmNvdGVsQGliZ2Uu
-Z292LmJyMRcwFQYDVQQHEw5SSU8gREUgSkFORUlSTzEXMBUGA1UECBMOUklPIERF
-IEpBTkVJUk8xCzAJBgNVBAYTAkJSMR0wGwYDVQQDExRFTkNFQ0FGRS5JQkdFLkdP
-Vi5CUjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKcKBwOhT6Gr6FgQ
-4uSzluNmpMlM/vrmI0pqYr8QI8V1lYQnr4ezAdoUNXlaJx2CMCDUPFi47uIRhlXy
-Gh8OZi4WwAEprrIToui2a0Mv6y+JgD/RR4+pm6JggjIlJjijLDjU5VYxoM3TsVQ4
-Vk6RYx81pPhUgnckZ3IV4A5pNtLzxdsEwkPpnoCNFlsKEAVUkMfTAQokQji0aWwc
-iAwAp+dl045oNY1xRiJ4tCZk7VE/Dm7WoddSxAceYJtbUxvH+oE1xD0ZOW3ts7sj
-E4s1W4Eai1femBRrv19dWTXtPG2RWw6I6bYYLQetAvs1kRSqKrJHiHbVBzZ9InpC
-F/vS8tcCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAC78+ABZ2uxuYLkTI3uPi5Wtc
-/HN58FWUyPq+l8/6RrSDI6/uPJ0g490/j5U3L4B4LdjSs3y9kq4sDQ44MSglLcWS
-3WeHhEDiIwWEYy8ZQkEtQfvAxXMkmEfCBaS57dwwzNNaj7CWpo8OBQrsjjboK9tM
-ohbLi2e2DPJtdWztwGYxjAl/b5f2gQVLYgAuoDFs6NEk8wqjuH3fyjs5BrHigzJD
-y/CFOm3UyxZuE6AXLTDxqEzCzdHDAtZP8tK/32zu7Kv7pCP6OI6RdVphaLOxKn7X
-xG6lNFUhNi72Kxw/UnI9yYKJzYkw2v8rC6VfbJ4UOyenQeR27aELT9w3tGOOYg==
-                    
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://encecafe.ibge.gov.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://encecafe.ibge.gov.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">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>
-  <ContactPerson contactType="technical">
-    <SurName>Mendonca</SurName>
-    <EmailAddress>mauro.mendonca@ibge.gov.br</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
deleted file mode 100644
index d3a50b79..00000000
--- a/swamid-interfederations-2.0/encecafe.ibge.gov.br.xml
+++ /dev/null
@@ -1,114 +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://encecafe.ibge.gov.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">gov.br</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <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>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-    MIIEGjCCAwICAQAwDQYJKoZIhvcNAQEFBQAwgdIxODA2BgNVBAoTL0VOQ0UgLSBF
-U0NPTEEgTkFDSU9OQUwgREUgQ0lFTkNJQVMgRVNUQVRJU1RJQ0FTMQ4wDAYDVQQL
-EwVDT1RFTDEoMCYGCSqGSIb3DQEJARYZc3Vwb3J0ZS5jb3RlbEBpYmdlLmdvdi5i
-cjEXMBUGA1UEBxMOUklPIERFIEpBTkVJUk8xFzAVBgNVBAgTDlJJTyBERSBKQU5F
-SVJPMQswCQYDVQQGEwJCUjEdMBsGA1UEAxMURU5DRUNBRkUuSUJHRS5HT1YuQlIw
-HhcNMTQwNDE3MTQ1OTQzWhcNMTkwNDE2MTQ1OTQzWjCB0jE4MDYGA1UEChMvRU5D
-RSAtIEVTQ09MQSBOQUNJT05BTCBERSBDSUVOQ0lBUyBFU1RBVElTVElDQVMxDjAM
-BgNVBAsTBUNPVEVMMSgwJgYJKoZIhvcNAQkBFhlzdXBvcnRlLmNvdGVsQGliZ2Uu
-Z292LmJyMRcwFQYDVQQHEw5SSU8gREUgSkFORUlSTzEXMBUGA1UECBMOUklPIERF
-IEpBTkVJUk8xCzAJBgNVBAYTAkJSMR0wGwYDVQQDExRFTkNFQ0FGRS5JQkdFLkdP
-Vi5CUjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKcKBwOhT6Gr6FgQ
-4uSzluNmpMlM/vrmI0pqYr8QI8V1lYQnr4ezAdoUNXlaJx2CMCDUPFi47uIRhlXy
-Gh8OZi4WwAEprrIToui2a0Mv6y+JgD/RR4+pm6JggjIlJjijLDjU5VYxoM3TsVQ4
-Vk6RYx81pPhUgnckZ3IV4A5pNtLzxdsEwkPpnoCNFlsKEAVUkMfTAQokQji0aWwc
-iAwAp+dl045oNY1xRiJ4tCZk7VE/Dm7WoddSxAceYJtbUxvH+oE1xD0ZOW3ts7sj
-E4s1W4Eai1femBRrv19dWTXtPG2RWw6I6bYYLQetAvs1kRSqKrJHiHbVBzZ9InpC
-F/vS8tcCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAC78+ABZ2uxuYLkTI3uPi5Wtc
-/HN58FWUyPq+l8/6RrSDI6/uPJ0g490/j5U3L4B4LdjSs3y9kq4sDQ44MSglLcWS
-3WeHhEDiIwWEYy8ZQkEtQfvAxXMkmEfCBaS57dwwzNNaj7CWpo8OBQrsjjboK9tM
-ohbLi2e2DPJtdWztwGYxjAl/b5f2gQVLYgAuoDFs6NEk8wqjuH3fyjs5BrHigzJD
-y/CFOm3UyxZuE6AXLTDxqEzCzdHDAtZP8tK/32zu7Kv7pCP6OI6RdVphaLOxKn7X
-xG6lNFUhNi72Kxw/UnI9yYKJzYkw2v8rC6VfbJ4UOyenQeR27aELT9w3tGOOYg==
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://encecafe.ibge.gov.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://encecafe.ibge.gov.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://encecafe.ibge.gov.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://encecafe.ibge.gov.br/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://encecafe.ibge.gov.br/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://encecafe.ibge.gov.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">gov.br</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-      
-MIIEGjCCAwICAQAwDQYJKoZIhvcNAQEFBQAwgdIxODA2BgNVBAoTL0VOQ0UgLSBF
-U0NPTEEgTkFDSU9OQUwgREUgQ0lFTkNJQVMgRVNUQVRJU1RJQ0FTMQ4wDAYDVQQL
-EwVDT1RFTDEoMCYGCSqGSIb3DQEJARYZc3Vwb3J0ZS5jb3RlbEBpYmdlLmdvdi5i
-cjEXMBUGA1UEBxMOUklPIERFIEpBTkVJUk8xFzAVBgNVBAgTDlJJTyBERSBKQU5F
-SVJPMQswCQYDVQQGEwJCUjEdMBsGA1UEAxMURU5DRUNBRkUuSUJHRS5HT1YuQlIw
-HhcNMTQwNDE3MTQ1OTQzWhcNMTkwNDE2MTQ1OTQzWjCB0jE4MDYGA1UEChMvRU5D
-RSAtIEVTQ09MQSBOQUNJT05BTCBERSBDSUVOQ0lBUyBFU1RBVElTVElDQVMxDjAM
-BgNVBAsTBUNPVEVMMSgwJgYJKoZIhvcNAQkBFhlzdXBvcnRlLmNvdGVsQGliZ2Uu
-Z292LmJyMRcwFQYDVQQHEw5SSU8gREUgSkFORUlSTzEXMBUGA1UECBMOUklPIERF
-IEpBTkVJUk8xCzAJBgNVBAYTAkJSMR0wGwYDVQQDExRFTkNFQ0FGRS5JQkdFLkdP
-Vi5CUjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKcKBwOhT6Gr6FgQ
-4uSzluNmpMlM/vrmI0pqYr8QI8V1lYQnr4ezAdoUNXlaJx2CMCDUPFi47uIRhlXy
-Gh8OZi4WwAEprrIToui2a0Mv6y+JgD/RR4+pm6JggjIlJjijLDjU5VYxoM3TsVQ4
-Vk6RYx81pPhUgnckZ3IV4A5pNtLzxdsEwkPpnoCNFlsKEAVUkMfTAQokQji0aWwc
-iAwAp+dl045oNY1xRiJ4tCZk7VE/Dm7WoddSxAceYJtbUxvH+oE1xD0ZOW3ts7sj
-E4s1W4Eai1femBRrv19dWTXtPG2RWw6I6bYYLQetAvs1kRSqKrJHiHbVBzZ9InpC
-F/vS8tcCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAC78+ABZ2uxuYLkTI3uPi5Wtc
-/HN58FWUyPq+l8/6RrSDI6/uPJ0g490/j5U3L4B4LdjSs3y9kq4sDQ44MSglLcWS
-3WeHhEDiIwWEYy8ZQkEtQfvAxXMkmEfCBaS57dwwzNNaj7CWpo8OBQrsjjboK9tM
-ohbLi2e2DPJtdWztwGYxjAl/b5f2gQVLYgAuoDFs6NEk8wqjuH3fyjs5BrHigzJD
-y/CFOm3UyxZuE6AXLTDxqEzCzdHDAtZP8tK/32zu7Kv7pCP6OI6RdVphaLOxKn7X
-xG6lNFUhNi72Kxw/UnI9yYKJzYkw2v8rC6VfbJ4UOyenQeR27aELT9w3tGOOYg==
-                    
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://encecafe.ibge.gov.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://encecafe.ibge.gov.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">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>
-  <ContactPerson contactType="technical">
-    <SurName>Mendonca</SurName>
-    <EmailAddress>mauro.mendonca@ibge.gov.br</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/engine.jacson.jiscadvance.biz.xml b/swamid-interfederations-2.0/engine.jacson.jiscadvance.biz.xml
deleted file mode 100644
index 5bffe413..00000000
--- a/swamid-interfederations-2.0/engine.jacson.jiscadvance.biz.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://engine.jacson.jiscadvance.biz/authentication/sp/metadata">
-  <!--
-		This is a JACSoN OpenConext SP for the JISC Services Management Company Ltd.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-11-16T10:06:35Z">
-      <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">
-    <Extensions>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:Description xml:lang="en">JACSoN OpenConext SSO Proxy</mdui:Description>
-        <mdui:Description xml:lang="nl">JACSoN OpenConext SSO Proxy</mdui:Description>
-        <mdui:DisplayName xml:lang="en">JACSoN OpenConext Engine</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="nl">JACSoN OpenConext Engine</mdui:DisplayName>
-        <mdui:Logo height="96" width="96">https://static.jacson.jiscadvance.biz/media/conext_logo.png</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDYzCCAkugAwIBAgIJAOVBPNcsTdLgMA0GCSqGSIb3DQEBBQUAMEgxFDASBgNV
-						BAMMC0VuZ2luZUJsb2NrMREwDwYDVQQLDAhTZXJ2aWNlczEQMA4GA1UECgwHU1VS
-						Rm5ldDELMAkGA1UEBhMCTkwwHhcNMTIxMDA0MTAxMTEyWhcNMjIxMDA0MTAxMTEy
-						WjBIMRQwEgYDVQQDDAtFbmdpbmVCbG9jazERMA8GA1UECwwIU2VydmljZXMxEDAO
-						BgNVBAoMB1NVUkZuZXQxCzAJBgNVBAYTAk5MMIIBIjANBgkqhkiG9w0BAQEFAAOC
-						AQ8AMIIBCgKCAQEAywC71qqd4be2BjFRnn1tCfg+zQHH7wD3AwYE3iLyXa65fYrf
-						wuMVXTPUoyEAZEkjDdrdp5M1lxFEjfa5kqkzScVz4b9fAWZKLPPFjnc9rZgg+SWk
-						ExE/Fo5oNw092MqdM4GpwNxYKD4IYEiu1YM34dvsvqZFH/CcK26CSks/vQMwcDPf
-						uprcw4xA/EBH0OwW7nFaTJJ3EjHilrkDblRZRVgm4lLErIUS2u6wUC88uyYH0SlI
-						xYsG5qJkpjEL4bd09sxLFqPZobxTfjU6BDgolqi7cg2MJXXDvOAz5hcvBdkEG59b
-						xSHH8pyuXfQvUBfPFdjyzxhwkZ9vLxaOQvd0KwIDAQABo1AwTjAdBgNVHQ4EFgQU
-						jZbLsyTu6LNRFs2wisIS1T9PkKIwHwYDVR0jBBgwFoAUjZbLsyTu6LNRFs2wisIS
-						1T9PkKIwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAIybyLh8blWnS
-						/aKOONYrNItE/RxNvQ28Ed4twP8ybVD8y3dEMB4j3lpNaYyia8AEEzOmUb8yDLeB
-						gOJ4WPWQI738YJZT3i0CqBH+Cyt1tOYZHqFGYS791dHYGofjetZokkLQT7ftlqpa
-						chcc7jMkdAI8a1mB/ED424oYm2s0shMHdDB858uovU1c9EfUPMQM8aeZ2sVOAp2a
-						3buBTb6QsqgDzc4jUQODmfFU4RYsSJ0oS3t2uvVb6j/DAp5JSjQ7vLZqvHD4be40
-						cuU0RLj5Z0nR6vvjOHTRqTN1cvamgcPEniaWCQd3sJ1wXlLloruoxHmHPAKnlqk+
-						toH/x3TW0g==
-					</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>
-						MIIDYzCCAkugAwIBAgIJAOVBPNcsTdLgMA0GCSqGSIb3DQEBBQUAMEgxFDASBgNV
-						BAMMC0VuZ2luZUJsb2NrMREwDwYDVQQLDAhTZXJ2aWNlczEQMA4GA1UECgwHU1VS
-						Rm5ldDELMAkGA1UEBhMCTkwwHhcNMTIxMDA0MTAxMTEyWhcNMjIxMDA0MTAxMTEy
-						WjBIMRQwEgYDVQQDDAtFbmdpbmVCbG9jazERMA8GA1UECwwIU2VydmljZXMxEDAO
-						BgNVBAoMB1NVUkZuZXQxCzAJBgNVBAYTAk5MMIIBIjANBgkqhkiG9w0BAQEFAAOC
-						AQ8AMIIBCgKCAQEAywC71qqd4be2BjFRnn1tCfg+zQHH7wD3AwYE3iLyXa65fYrf
-						wuMVXTPUoyEAZEkjDdrdp5M1lxFEjfa5kqkzScVz4b9fAWZKLPPFjnc9rZgg+SWk
-						ExE/Fo5oNw092MqdM4GpwNxYKD4IYEiu1YM34dvsvqZFH/CcK26CSks/vQMwcDPf
-						uprcw4xA/EBH0OwW7nFaTJJ3EjHilrkDblRZRVgm4lLErIUS2u6wUC88uyYH0SlI
-						xYsG5qJkpjEL4bd09sxLFqPZobxTfjU6BDgolqi7cg2MJXXDvOAz5hcvBdkEG59b
-						xSHH8pyuXfQvUBfPFdjyzxhwkZ9vLxaOQvd0KwIDAQABo1AwTjAdBgNVHQ4EFgQU
-						jZbLsyTu6LNRFs2wisIS1T9PkKIwHwYDVR0jBBgwFoAUjZbLsyTu6LNRFs2wisIS
-						1T9PkKIwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAIybyLh8blWnS
-						/aKOONYrNItE/RxNvQ28Ed4twP8ybVD8y3dEMB4j3lpNaYyia8AEEzOmUb8yDLeB
-						gOJ4WPWQI738YJZT3i0CqBH+Cyt1tOYZHqFGYS791dHYGofjetZokkLQT7ftlqpa
-						chcc7jMkdAI8a1mB/ED424oYm2s0shMHdDB858uovU1c9EfUPMQM8aeZ2sVOAp2a
-						3buBTb6QsqgDzc4jUQODmfFU4RYsSJ0oS3t2uvVb6j/DAp5JSjQ7vLZqvHD4be40
-						cuU0RLj5Z0nR6vvjOHTRqTN1cvamgcPEniaWCQd3sJ1wXlLloruoxHmHPAKnlqk+
-						toH/x3TW0g==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-1_5"/>
-    </KeyDescriptor>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:unspecified</NameIDFormat>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://engine.jacson.jiscadvance.biz/authentication/sp/consume-assertion" index="0"/>
-    <AttributeConsumingService index="1">
-      <ServiceName xml:lang="en">JACSoN OpenConext Engine</ServiceName>
-      <ServiceName xml:lang="nl">JACSoN OpenConext Engine</ServiceName>
-      <ServiceDescription xml:lang="en">JACSoN OpenConext SSO Proxy</ServiceDescription>
-      <ServiceDescription xml:lang="nl">JACSoN OpenConext SSO Proxy</ServiceDescription>
-      <RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <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" isRequired="true"/>
-      <RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-    </AttributeConsumingService>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">JISC Services Management Company Ltd</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">JACSoN OpenConext Engine</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.jiscadvance.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Carl</GivenName>
-    <SurName>Vincent</SurName>
-    <EmailAddress>mailto:carl.vincent@newcastle.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Sander</GivenName>
-    <SurName>Van der Waal</SurName>
-    <EmailAddress>mailto:sander.vanderwaal@jiscadvance.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/engine.surfconext.nl-authentication-sp-metadata.xml b/swamid-interfederations-2.0/engine.surfconext.nl-authentication-sp-metadata.xml
deleted file mode 100644
index aafa566b..00000000
--- a/swamid-interfederations-2.0/engine.surfconext.nl-authentication-sp-metadata.xml
+++ /dev/null
@@ -1,87 +0,0 @@
-<?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://engine.surfconext.nl/authentication/sp/metadata">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.surfconext.nl/" registrationInstant="2011-06-08T02:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://wiki.surfnetlabs.nl/display/eduGAIN/EduGAIN</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </md:Extensions>
-  <md:SPSSODescriptor WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="nl">SURFconext | SURFnet</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">SURFconext | SURFnet</mdui:DisplayName>
-        <mdui:Description xml:lang="nl">SURFconext is een samenwerkingsinfrastructuur die nieuwe vormen van samenwerken mogelijk maakt door diensten van verschillende aanbieders te combineren.</mdui:Description>
-        <mdui:Description xml:lang="en">SURFconext is a collaboration infrastructure that creates new opportunities to collaborate online based on a combination of applications from different providers.</mdui:Description>
-        <mdui:Logo height="44" width="108">https://static.surfconext.nl/media/idp/surfnet.png</mdui:Logo>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIID3zCCAsegAwIBAgIJAMVC9xn1ZfsuMA0GCSqGSIb3DQEBCwUAMIGFMQswCQYD
-VQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMG
-A1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQD
-DB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTAeFw0xNDA1MDUxNDIyMzVa
-Fw0xOTA1MDUxNDIyMzVaMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNo
-dDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYD
-VQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAy
-MDE0MDUwNTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKthMDbB0jKH
-efPzmRu9t2h7iLP4wAXr42bHpjzTEk6gttHFb4l/hFiz1YBI88TjiH6hVjnozo/Y
-HA2c51us+Y7g0XoS7653lbUN/EHzvDMuyis4Xi2Ijf1A/OUQfH1iFUWttIgtWK9+
-fatXoGUS6tirQvrzVh6ZstEp1xbpo1SF6UoVl+fh7tM81qz+Crr/Kroan0UjpZOF
-TwxPoK6fdLgMAieKSCRmBGpbJHbQ2xxbdykBBrBbdfzIX4CDepfjE9h/40ldw5jR
-n3e392jrS6htk23N9BWWrpBT5QCk0kH3h/6F1Dm6TkyG9CDtt73/anuRkvXbeygI
-4wml9bL3rE8CAwEAAaNQME4wHQYDVR0OBBYEFD+Ac7akFxaMhBQAjVfvgGfY8hNK
-MB8GA1UdIwQYMBaAFD+Ac7akFxaMhBQAjVfvgGfY8hNKMAwGA1UdEwQFMAMBAf8w
-DQYJKoZIhvcNAQELBQADggEBAC8L9D67CxIhGo5aGVu63WqRHBNOdo/FAGI7LURD
-FeRmG5nRw/VXzJLGJksh4FSkx7aPrxNWF1uFiDZ80EuYQuIv7bDLblK31ZEbdg1R
-9LgiZCdYSr464I7yXQY9o6FiNtSKZkQO8EsscJPPy/Zp4uHAnADWACkOUHiCbcKi
-UUFu66dX0Wr/v53Gekz487GgVRs8HEeT9MU1reBKRgdENR8PNg4rbQfLc3YQKLWK
-7yWnn/RenjDpuCiePj8N8/80tGgrNgK/6fzM3zI18sSywnXLswxqDb/J+jgVxnQ6
-MrsTf1urM8MnfcxG/82oHIwfMh/sXPCZpo+DTLkhQxctJ3M=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://engine.surfconext.nl/authentication/sp/consume-assertion" index="0"/>
-    <md:AttributeConsumingService index="0">
-      <md:ServiceName xml:lang="nl">SURFconext - Engine | SURFnet</md:ServiceName>
-      <md:ServiceName xml:lang="en">SURFconext - Engine | SURFnet</md:ServiceName>
-      <md:ServiceDescription xml:lang="nl">SURFconext is een samenwerkingsinfrastructuur die nieuwe vormen van samenwerken mogelijk maakt door diensten van verschillende aanbieders te combineren.</md:ServiceDescription>
-      <md:ServiceDescription xml:lang="en">SURFconext is a collaboration infrastructure that creates new opportunities to collaborate online based on a combination of applications from different providers.</md:ServiceDescription>
-      <md:RequestedAttribute FriendlyName="urn:mace:dir:attribute-def:mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-      <md:RequestedAttribute FriendlyName="urn:mace:dir:attribute-def:displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-      <md:RequestedAttribute FriendlyName="urn:mace:dir:attribute-def:sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-      <md:RequestedAttribute FriendlyName="urn:mace:dir:attribute-def:givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-      <md:RequestedAttribute FriendlyName="urn:mace:terena.org:attribute-def:schacHomeOrganization" Name="urn:oid:1.3.6.1.4.1.25178.1.2.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="urn:mace:dir:attribute-def:uid" Name="urn:oid:0.9.2342.19200300.100.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="urn:mace:dir:attribute-def:cn" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-      <md:RequestedAttribute FriendlyName="urn:mace:dir:attribute-def:eduPersonAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-      <md:RequestedAttribute FriendlyName="urn:mace:dir:attribute-def:eduPersonEntitlement" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.7" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-      <md:RequestedAttribute FriendlyName="urn:mace:dir:attribute-def: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="false"/>
-      <md:RequestedAttribute FriendlyName="urn:mace:dir:attribute-def:preferredLanguage" Name="urn:oid:2.16.840.1.113730.3.1.39" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="nl">SURFnet BV</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">SURFnet BV</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="nl">SURFnet</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">SURFnet</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="nl">http://www.surfnet.nl/nl/Pages/default.aspx</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.surfnet.nl/en/Pages/default.aspx</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>SURFconext</md:GivenName>
-    <md:SurName>Helpdesk</md:SurName>
-    <md:EmailAddress>help@surfconext.nl</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>SURFconext</md:GivenName>
-    <md:SurName>Technical Support</md:SurName>
-    <md:EmailAddress>surfconext-beheer@surfnet.nl</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>SURFconext</md:GivenName>
-    <md:SurName>Administrative Contact</md:SurName>
-    <md:EmailAddress>surfconext-beheer@surfnet.nl</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/engine.surfconext.nl.xml b/swamid-interfederations-2.0/engine.surfconext.nl.xml
deleted file mode 100644
index aafa566b..00000000
--- a/swamid-interfederations-2.0/engine.surfconext.nl.xml
+++ /dev/null
@@ -1,87 +0,0 @@
-<?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://engine.surfconext.nl/authentication/sp/metadata">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.surfconext.nl/" registrationInstant="2011-06-08T02:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://wiki.surfnetlabs.nl/display/eduGAIN/EduGAIN</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </md:Extensions>
-  <md:SPSSODescriptor WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="nl">SURFconext | SURFnet</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">SURFconext | SURFnet</mdui:DisplayName>
-        <mdui:Description xml:lang="nl">SURFconext is een samenwerkingsinfrastructuur die nieuwe vormen van samenwerken mogelijk maakt door diensten van verschillende aanbieders te combineren.</mdui:Description>
-        <mdui:Description xml:lang="en">SURFconext is a collaboration infrastructure that creates new opportunities to collaborate online based on a combination of applications from different providers.</mdui:Description>
-        <mdui:Logo height="44" width="108">https://static.surfconext.nl/media/idp/surfnet.png</mdui:Logo>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIID3zCCAsegAwIBAgIJAMVC9xn1ZfsuMA0GCSqGSIb3DQEBCwUAMIGFMQswCQYD
-VQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMG
-A1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQD
-DB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTAeFw0xNDA1MDUxNDIyMzVa
-Fw0xOTA1MDUxNDIyMzVaMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNo
-dDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYD
-VQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAy
-MDE0MDUwNTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKthMDbB0jKH
-efPzmRu9t2h7iLP4wAXr42bHpjzTEk6gttHFb4l/hFiz1YBI88TjiH6hVjnozo/Y
-HA2c51us+Y7g0XoS7653lbUN/EHzvDMuyis4Xi2Ijf1A/OUQfH1iFUWttIgtWK9+
-fatXoGUS6tirQvrzVh6ZstEp1xbpo1SF6UoVl+fh7tM81qz+Crr/Kroan0UjpZOF
-TwxPoK6fdLgMAieKSCRmBGpbJHbQ2xxbdykBBrBbdfzIX4CDepfjE9h/40ldw5jR
-n3e392jrS6htk23N9BWWrpBT5QCk0kH3h/6F1Dm6TkyG9CDtt73/anuRkvXbeygI
-4wml9bL3rE8CAwEAAaNQME4wHQYDVR0OBBYEFD+Ac7akFxaMhBQAjVfvgGfY8hNK
-MB8GA1UdIwQYMBaAFD+Ac7akFxaMhBQAjVfvgGfY8hNKMAwGA1UdEwQFMAMBAf8w
-DQYJKoZIhvcNAQELBQADggEBAC8L9D67CxIhGo5aGVu63WqRHBNOdo/FAGI7LURD
-FeRmG5nRw/VXzJLGJksh4FSkx7aPrxNWF1uFiDZ80EuYQuIv7bDLblK31ZEbdg1R
-9LgiZCdYSr464I7yXQY9o6FiNtSKZkQO8EsscJPPy/Zp4uHAnADWACkOUHiCbcKi
-UUFu66dX0Wr/v53Gekz487GgVRs8HEeT9MU1reBKRgdENR8PNg4rbQfLc3YQKLWK
-7yWnn/RenjDpuCiePj8N8/80tGgrNgK/6fzM3zI18sSywnXLswxqDb/J+jgVxnQ6
-MrsTf1urM8MnfcxG/82oHIwfMh/sXPCZpo+DTLkhQxctJ3M=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://engine.surfconext.nl/authentication/sp/consume-assertion" index="0"/>
-    <md:AttributeConsumingService index="0">
-      <md:ServiceName xml:lang="nl">SURFconext - Engine | SURFnet</md:ServiceName>
-      <md:ServiceName xml:lang="en">SURFconext - Engine | SURFnet</md:ServiceName>
-      <md:ServiceDescription xml:lang="nl">SURFconext is een samenwerkingsinfrastructuur die nieuwe vormen van samenwerken mogelijk maakt door diensten van verschillende aanbieders te combineren.</md:ServiceDescription>
-      <md:ServiceDescription xml:lang="en">SURFconext is a collaboration infrastructure that creates new opportunities to collaborate online based on a combination of applications from different providers.</md:ServiceDescription>
-      <md:RequestedAttribute FriendlyName="urn:mace:dir:attribute-def:mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-      <md:RequestedAttribute FriendlyName="urn:mace:dir:attribute-def:displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-      <md:RequestedAttribute FriendlyName="urn:mace:dir:attribute-def:sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-      <md:RequestedAttribute FriendlyName="urn:mace:dir:attribute-def:givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-      <md:RequestedAttribute FriendlyName="urn:mace:terena.org:attribute-def:schacHomeOrganization" Name="urn:oid:1.3.6.1.4.1.25178.1.2.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="urn:mace:dir:attribute-def:uid" Name="urn:oid:0.9.2342.19200300.100.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="urn:mace:dir:attribute-def:cn" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-      <md:RequestedAttribute FriendlyName="urn:mace:dir:attribute-def:eduPersonAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-      <md:RequestedAttribute FriendlyName="urn:mace:dir:attribute-def:eduPersonEntitlement" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.7" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-      <md:RequestedAttribute FriendlyName="urn:mace:dir:attribute-def: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="false"/>
-      <md:RequestedAttribute FriendlyName="urn:mace:dir:attribute-def:preferredLanguage" Name="urn:oid:2.16.840.1.113730.3.1.39" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="nl">SURFnet BV</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">SURFnet BV</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="nl">SURFnet</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">SURFnet</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="nl">http://www.surfnet.nl/nl/Pages/default.aspx</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.surfnet.nl/en/Pages/default.aspx</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>SURFconext</md:GivenName>
-    <md:SurName>Helpdesk</md:SurName>
-    <md:EmailAddress>help@surfconext.nl</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>SURFconext</md:GivenName>
-    <md:SurName>Technical Support</md:SurName>
-    <md:EmailAddress>surfconext-beheer@surfnet.nl</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>SURFconext</md:GivenName>
-    <md:SurName>Administrative Contact</md:SurName>
-    <md:EmailAddress>surfconext-beheer@surfnet.nl</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/epoq.compilatio.net-shibboleth.xml b/swamid-interfederations-2.0/epoq.compilatio.net-shibboleth.xml
deleted file mode 100644
index 8547dc84..00000000
--- a/swamid-interfederations-2.0/epoq.compilatio.net-shibboleth.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://epoq.compilatio.net/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2014-02-24T11:36:09Z">
-      <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="fr">Compilatio - Prévention du plagiat</mdui:DisplayName>
-        <mdui:Description xml:lang="fr">Service payant d'analyse de document en ligne mis à la disposition de l'enseignement supérieur et permettant la détection de plagiat dans les travaux étudiants ...</mdui:Description>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIFNjCCBB6gAwIBAgIDEF5UMA0GCSqGSIb3DQEBCwUAMDwxCzAJBgNVBAYTAlVT
-MRcwFQYDVQQKEw5HZW9UcnVzdCwgSW5jLjEUMBIGA1UEAxMLUmFwaWRTU0wgQ0Ew
-HhcNMTQwMTI4MDM0MzI2WhcNMTYwMjI5MTgwMDU1WjCBvzEpMCcGA1UEBRMgOW5L
-LXA1Zkpsam1leVg1aXREZTFMS2VnTHB1WWJtVUQxEzARBgNVBAsTCkdUMjgzMzcw
-OTIxMTAvBgNVBAsTKFNlZSB3d3cucmFwaWRzc2wuY29tL3Jlc291cmNlcy9jcHMg
-KGMpMTQxLzAtBgNVBAsTJkRvbWFpbiBDb250cm9sIFZhbGlkYXRlZCAtIFJhcGlk
-U1NMKFIpMRkwFwYDVQQDDBAqLmNvbXBpbGF0aW8ubmV0MIIBIjANBgkqhkiG9w0B
-AQEFAAOCAQ8AMIIBCgKCAQEAxU1Kzma74qazOCj/66wzcyZHB7XtSgIFEw1LtLq/
-9OA5efe/5yL6nK6H0pZoEpWGDLSzQkQJFP1OlozStQAAf/U0N5mWY5JUqwJce+Y5
-8bA7jg2JIDp8zPDvKMJ3izkeJUxBdYiV6aZW3aRjt22tTlxlXgU3wovicu+acSY9
-YAZLMWkvNoVHfNTmXZA8rzMif2qPSHnv2HIu+vUiTmD39BPxHfbunvCjmmFZWM2f
-O/QEyG2n4/YuttEzNd9yhU7t++KFiK+D1vlCbRRnjffyhQfEhcj6zauCDtfOzadt
-O+LzMSdS+g/B3mx2ic9ixgC0ml2Mw7De29XHzcbhcYuD/wIDAQABo4IBuzCCAbcw
-HwYDVR0jBBgwFoAUa2k9ahhCSt2PAmU5/TUkhniRFjAwDgYDVR0PAQH/BAQDAgWg
-MB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjArBgNVHREEJDAighAqLmNv
-bXBpbGF0aW8ubmV0gg5jb21waWxhdGlvLm5ldDBDBgNVHR8EPDA6MDigNqA0hjJo
-dHRwOi8vcmFwaWRzc2wtY3JsLmdlb3RydXN0LmNvbS9jcmxzL3JhcGlkc3NsLmNy
-bDAdBgNVHQ4EFgQURW26V/eSqhDZz4+cUahkSIp9/XgwDAYDVR0TAQH/BAIwADB4
-BggrBgEFBQcBAQRsMGowLQYIKwYBBQUHMAGGIWh0dHA6Ly9yYXBpZHNzbC1vY3Nw
-Lmdlb3RydXN0LmNvbTA5BggrBgEFBQcwAoYtaHR0cDovL3JhcGlkc3NsLWFpYS5n
-ZW90cnVzdC5jb20vcmFwaWRzc2wuY3J0MEwGA1UdIARFMEMwQQYKYIZIAYb4RQEH
-NjAzMDEGCCsGAQUFBwIBFiVodHRwOi8vd3d3Lmdlb3RydXN0LmNvbS9yZXNvdXJj
-ZXMvY3BzMA0GCSqGSIb3DQEBCwUAA4IBAQAXnQ0EXVz77PiovvYKBMjktoylywL0
-hHKQDl//Uogoq9bTLvp91pfTMagvmGBZwL5l+9CPtal+yJc6ogh2cCjddqWleSAQ
-F2ikd/QRMXaolcSNofFG9M+cmJHPmhFIJPOOqHdfTbcaM54swrgdEXhsKCd56t3X
-hUSa267XqAf+UgSVXa5/9+7niYKbPm6S7ENEdzmJBjzC6xZ3o0IpncmQpC1cPNOy
-v6m7bak466pL1Vevz4zJrf1D/GO7tuEr1UKaACEO7dN9s48BIszFS876vdltnwqo
-6Y+OhZYur/8jg4W7AsT50u4Nm1YhbT4O+wl3P1dAZTirIjdcLJPi1Igc
-
-					    </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>
-					      MIIFNjCCBB6gAwIBAgIDEF5UMA0GCSqGSIb3DQEBCwUAMDwxCzAJBgNVBAYTAlVT
-MRcwFQYDVQQKEw5HZW9UcnVzdCwgSW5jLjEUMBIGA1UEAxMLUmFwaWRTU0wgQ0Ew
-HhcNMTQwMTI4MDM0MzI2WhcNMTYwMjI5MTgwMDU1WjCBvzEpMCcGA1UEBRMgOW5L
-LXA1Zkpsam1leVg1aXREZTFMS2VnTHB1WWJtVUQxEzARBgNVBAsTCkdUMjgzMzcw
-OTIxMTAvBgNVBAsTKFNlZSB3d3cucmFwaWRzc2wuY29tL3Jlc291cmNlcy9jcHMg
-KGMpMTQxLzAtBgNVBAsTJkRvbWFpbiBDb250cm9sIFZhbGlkYXRlZCAtIFJhcGlk
-U1NMKFIpMRkwFwYDVQQDDBAqLmNvbXBpbGF0aW8ubmV0MIIBIjANBgkqhkiG9w0B
-AQEFAAOCAQ8AMIIBCgKCAQEAxU1Kzma74qazOCj/66wzcyZHB7XtSgIFEw1LtLq/
-9OA5efe/5yL6nK6H0pZoEpWGDLSzQkQJFP1OlozStQAAf/U0N5mWY5JUqwJce+Y5
-8bA7jg2JIDp8zPDvKMJ3izkeJUxBdYiV6aZW3aRjt22tTlxlXgU3wovicu+acSY9
-YAZLMWkvNoVHfNTmXZA8rzMif2qPSHnv2HIu+vUiTmD39BPxHfbunvCjmmFZWM2f
-O/QEyG2n4/YuttEzNd9yhU7t++KFiK+D1vlCbRRnjffyhQfEhcj6zauCDtfOzadt
-O+LzMSdS+g/B3mx2ic9ixgC0ml2Mw7De29XHzcbhcYuD/wIDAQABo4IBuzCCAbcw
-HwYDVR0jBBgwFoAUa2k9ahhCSt2PAmU5/TUkhniRFjAwDgYDVR0PAQH/BAQDAgWg
-MB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjArBgNVHREEJDAighAqLmNv
-bXBpbGF0aW8ubmV0gg5jb21waWxhdGlvLm5ldDBDBgNVHR8EPDA6MDigNqA0hjJo
-dHRwOi8vcmFwaWRzc2wtY3JsLmdlb3RydXN0LmNvbS9jcmxzL3JhcGlkc3NsLmNy
-bDAdBgNVHQ4EFgQURW26V/eSqhDZz4+cUahkSIp9/XgwDAYDVR0TAQH/BAIwADB4
-BggrBgEFBQcBAQRsMGowLQYIKwYBBQUHMAGGIWh0dHA6Ly9yYXBpZHNzbC1vY3Nw
-Lmdlb3RydXN0LmNvbTA5BggrBgEFBQcwAoYtaHR0cDovL3JhcGlkc3NsLWFpYS5n
-ZW90cnVzdC5jb20vcmFwaWRzc2wuY3J0MEwGA1UdIARFMEMwQQYKYIZIAYb4RQEH
-NjAzMDEGCCsGAQUFBwIBFiVodHRwOi8vd3d3Lmdlb3RydXN0LmNvbS9yZXNvdXJj
-ZXMvY3BzMA0GCSqGSIb3DQEBCwUAA4IBAQAXnQ0EXVz77PiovvYKBMjktoylywL0
-hHKQDl//Uogoq9bTLvp91pfTMagvmGBZwL5l+9CPtal+yJc6ogh2cCjddqWleSAQ
-F2ikd/QRMXaolcSNofFG9M+cmJHPmhFIJPOOqHdfTbcaM54swrgdEXhsKCd56t3X
-hUSa267XqAf+UgSVXa5/9+7niYKbPm6S7ENEdzmJBjzC6xZ3o0IpncmQpC1cPNOy
-v6m7bak466pL1Vevz4zJrf1D/GO7tuEr1UKaACEO7dN9s48BIszFS876vdltnwqo
-6Y+OhZYur/8jg4W7AsT50u4Nm1YhbT4O+wl3P1dAZTirIjdcLJPi1Igc
-
-					    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://epoq.compilatio.net/shibboleth/Shibboleth.sso/SAML/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://epoq.compilatio.net/shibboleth/Shibboleth.sso/SAML2/POST" index="4"/>
-    <AttributeConsumingService index="0">
-      <ServiceName xml:lang="fr">Compilatio - Prévention du plagiat</ServiceName>
-      <ServiceDescription xml:lang="fr">Service payant d'analyse de document en ligne mis à la disposition de l'enseignement supérieur et permettant la détection de plagiat dans les travaux étudiants ...</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"/>
-      <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="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" isRequired="true"/>
-      <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="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="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="eduPersonAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-    </AttributeConsumingService>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">COMPILATIO</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">COMPILATIO</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <EmailAddress>ent@compilatio.net</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/epoq.compilatio.net.xml b/swamid-interfederations-2.0/epoq.compilatio.net.xml
deleted file mode 100644
index 8547dc84..00000000
--- a/swamid-interfederations-2.0/epoq.compilatio.net.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://epoq.compilatio.net/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2014-02-24T11:36:09Z">
-      <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="fr">Compilatio - Prévention du plagiat</mdui:DisplayName>
-        <mdui:Description xml:lang="fr">Service payant d'analyse de document en ligne mis à la disposition de l'enseignement supérieur et permettant la détection de plagiat dans les travaux étudiants ...</mdui:Description>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIFNjCCBB6gAwIBAgIDEF5UMA0GCSqGSIb3DQEBCwUAMDwxCzAJBgNVBAYTAlVT
-MRcwFQYDVQQKEw5HZW9UcnVzdCwgSW5jLjEUMBIGA1UEAxMLUmFwaWRTU0wgQ0Ew
-HhcNMTQwMTI4MDM0MzI2WhcNMTYwMjI5MTgwMDU1WjCBvzEpMCcGA1UEBRMgOW5L
-LXA1Zkpsam1leVg1aXREZTFMS2VnTHB1WWJtVUQxEzARBgNVBAsTCkdUMjgzMzcw
-OTIxMTAvBgNVBAsTKFNlZSB3d3cucmFwaWRzc2wuY29tL3Jlc291cmNlcy9jcHMg
-KGMpMTQxLzAtBgNVBAsTJkRvbWFpbiBDb250cm9sIFZhbGlkYXRlZCAtIFJhcGlk
-U1NMKFIpMRkwFwYDVQQDDBAqLmNvbXBpbGF0aW8ubmV0MIIBIjANBgkqhkiG9w0B
-AQEFAAOCAQ8AMIIBCgKCAQEAxU1Kzma74qazOCj/66wzcyZHB7XtSgIFEw1LtLq/
-9OA5efe/5yL6nK6H0pZoEpWGDLSzQkQJFP1OlozStQAAf/U0N5mWY5JUqwJce+Y5
-8bA7jg2JIDp8zPDvKMJ3izkeJUxBdYiV6aZW3aRjt22tTlxlXgU3wovicu+acSY9
-YAZLMWkvNoVHfNTmXZA8rzMif2qPSHnv2HIu+vUiTmD39BPxHfbunvCjmmFZWM2f
-O/QEyG2n4/YuttEzNd9yhU7t++KFiK+D1vlCbRRnjffyhQfEhcj6zauCDtfOzadt
-O+LzMSdS+g/B3mx2ic9ixgC0ml2Mw7De29XHzcbhcYuD/wIDAQABo4IBuzCCAbcw
-HwYDVR0jBBgwFoAUa2k9ahhCSt2PAmU5/TUkhniRFjAwDgYDVR0PAQH/BAQDAgWg
-MB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjArBgNVHREEJDAighAqLmNv
-bXBpbGF0aW8ubmV0gg5jb21waWxhdGlvLm5ldDBDBgNVHR8EPDA6MDigNqA0hjJo
-dHRwOi8vcmFwaWRzc2wtY3JsLmdlb3RydXN0LmNvbS9jcmxzL3JhcGlkc3NsLmNy
-bDAdBgNVHQ4EFgQURW26V/eSqhDZz4+cUahkSIp9/XgwDAYDVR0TAQH/BAIwADB4
-BggrBgEFBQcBAQRsMGowLQYIKwYBBQUHMAGGIWh0dHA6Ly9yYXBpZHNzbC1vY3Nw
-Lmdlb3RydXN0LmNvbTA5BggrBgEFBQcwAoYtaHR0cDovL3JhcGlkc3NsLWFpYS5n
-ZW90cnVzdC5jb20vcmFwaWRzc2wuY3J0MEwGA1UdIARFMEMwQQYKYIZIAYb4RQEH
-NjAzMDEGCCsGAQUFBwIBFiVodHRwOi8vd3d3Lmdlb3RydXN0LmNvbS9yZXNvdXJj
-ZXMvY3BzMA0GCSqGSIb3DQEBCwUAA4IBAQAXnQ0EXVz77PiovvYKBMjktoylywL0
-hHKQDl//Uogoq9bTLvp91pfTMagvmGBZwL5l+9CPtal+yJc6ogh2cCjddqWleSAQ
-F2ikd/QRMXaolcSNofFG9M+cmJHPmhFIJPOOqHdfTbcaM54swrgdEXhsKCd56t3X
-hUSa267XqAf+UgSVXa5/9+7niYKbPm6S7ENEdzmJBjzC6xZ3o0IpncmQpC1cPNOy
-v6m7bak466pL1Vevz4zJrf1D/GO7tuEr1UKaACEO7dN9s48BIszFS876vdltnwqo
-6Y+OhZYur/8jg4W7AsT50u4Nm1YhbT4O+wl3P1dAZTirIjdcLJPi1Igc
-
-					    </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>
-					      MIIFNjCCBB6gAwIBAgIDEF5UMA0GCSqGSIb3DQEBCwUAMDwxCzAJBgNVBAYTAlVT
-MRcwFQYDVQQKEw5HZW9UcnVzdCwgSW5jLjEUMBIGA1UEAxMLUmFwaWRTU0wgQ0Ew
-HhcNMTQwMTI4MDM0MzI2WhcNMTYwMjI5MTgwMDU1WjCBvzEpMCcGA1UEBRMgOW5L
-LXA1Zkpsam1leVg1aXREZTFMS2VnTHB1WWJtVUQxEzARBgNVBAsTCkdUMjgzMzcw
-OTIxMTAvBgNVBAsTKFNlZSB3d3cucmFwaWRzc2wuY29tL3Jlc291cmNlcy9jcHMg
-KGMpMTQxLzAtBgNVBAsTJkRvbWFpbiBDb250cm9sIFZhbGlkYXRlZCAtIFJhcGlk
-U1NMKFIpMRkwFwYDVQQDDBAqLmNvbXBpbGF0aW8ubmV0MIIBIjANBgkqhkiG9w0B
-AQEFAAOCAQ8AMIIBCgKCAQEAxU1Kzma74qazOCj/66wzcyZHB7XtSgIFEw1LtLq/
-9OA5efe/5yL6nK6H0pZoEpWGDLSzQkQJFP1OlozStQAAf/U0N5mWY5JUqwJce+Y5
-8bA7jg2JIDp8zPDvKMJ3izkeJUxBdYiV6aZW3aRjt22tTlxlXgU3wovicu+acSY9
-YAZLMWkvNoVHfNTmXZA8rzMif2qPSHnv2HIu+vUiTmD39BPxHfbunvCjmmFZWM2f
-O/QEyG2n4/YuttEzNd9yhU7t++KFiK+D1vlCbRRnjffyhQfEhcj6zauCDtfOzadt
-O+LzMSdS+g/B3mx2ic9ixgC0ml2Mw7De29XHzcbhcYuD/wIDAQABo4IBuzCCAbcw
-HwYDVR0jBBgwFoAUa2k9ahhCSt2PAmU5/TUkhniRFjAwDgYDVR0PAQH/BAQDAgWg
-MB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjArBgNVHREEJDAighAqLmNv
-bXBpbGF0aW8ubmV0gg5jb21waWxhdGlvLm5ldDBDBgNVHR8EPDA6MDigNqA0hjJo
-dHRwOi8vcmFwaWRzc2wtY3JsLmdlb3RydXN0LmNvbS9jcmxzL3JhcGlkc3NsLmNy
-bDAdBgNVHQ4EFgQURW26V/eSqhDZz4+cUahkSIp9/XgwDAYDVR0TAQH/BAIwADB4
-BggrBgEFBQcBAQRsMGowLQYIKwYBBQUHMAGGIWh0dHA6Ly9yYXBpZHNzbC1vY3Nw
-Lmdlb3RydXN0LmNvbTA5BggrBgEFBQcwAoYtaHR0cDovL3JhcGlkc3NsLWFpYS5n
-ZW90cnVzdC5jb20vcmFwaWRzc2wuY3J0MEwGA1UdIARFMEMwQQYKYIZIAYb4RQEH
-NjAzMDEGCCsGAQUFBwIBFiVodHRwOi8vd3d3Lmdlb3RydXN0LmNvbS9yZXNvdXJj
-ZXMvY3BzMA0GCSqGSIb3DQEBCwUAA4IBAQAXnQ0EXVz77PiovvYKBMjktoylywL0
-hHKQDl//Uogoq9bTLvp91pfTMagvmGBZwL5l+9CPtal+yJc6ogh2cCjddqWleSAQ
-F2ikd/QRMXaolcSNofFG9M+cmJHPmhFIJPOOqHdfTbcaM54swrgdEXhsKCd56t3X
-hUSa267XqAf+UgSVXa5/9+7niYKbPm6S7ENEdzmJBjzC6xZ3o0IpncmQpC1cPNOy
-v6m7bak466pL1Vevz4zJrf1D/GO7tuEr1UKaACEO7dN9s48BIszFS876vdltnwqo
-6Y+OhZYur/8jg4W7AsT50u4Nm1YhbT4O+wl3P1dAZTirIjdcLJPi1Igc
-
-					    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://epoq.compilatio.net/shibboleth/Shibboleth.sso/SAML/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://epoq.compilatio.net/shibboleth/Shibboleth.sso/SAML2/POST" index="4"/>
-    <AttributeConsumingService index="0">
-      <ServiceName xml:lang="fr">Compilatio - Prévention du plagiat</ServiceName>
-      <ServiceDescription xml:lang="fr">Service payant d'analyse de document en ligne mis à la disposition de l'enseignement supérieur et permettant la détection de plagiat dans les travaux étudiants ...</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"/>
-      <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="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" isRequired="true"/>
-      <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="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="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="eduPersonAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-    </AttributeConsumingService>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">COMPILATIO</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">COMPILATIO</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <EmailAddress>ent@compilatio.net</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/febe.ufpe.br-idp-shibboleth.xml b/swamid-interfederations-2.0/febe.ufpe.br-idp-shibboleth.xml
deleted file mode 100644
index abda1089..00000000
--- a/swamid-interfederations-2.0/febe.ufpe.br-idp-shibboleth.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://febe.ufpe.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">ufpe.br</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">UFPE - Universidade Federal de Pernambuco</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="pt-br">UFPE - Universidade Federal de Pernambuco</mdui:DisplayName>
-        <mdui:Description xml:lang="en">UFPE - Universidade Federal de Pernambuco</mdui:Description>
-        <mdui:Description xml:lang="pt-br">UFPE - Universidade Federal de Pernambuco</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.ufpe.br/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="pt-br">http://www.ufpe.br/</mdui:InformationURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-    MIIDnjCCAoYCAQAwDQYJKoZIhvcNAQEFBQAwgZQxETAPBgNVBAoTCFVGUEUvTlRJ
-MREwDwYDVQQLEwhVRlBFL05USTEiMCAGCSqGSIb3DQEJARYTbHVpei5ub3ZhZXNA
-dWZwZS5icjEPMA0GA1UEBxMGUmVjaWZlMRMwEQYDVQQIEwpQZXJuYW1idWNvMQsw
-CQYDVQQGEwJCUjEVMBMGA1UEAxMMZmViZS51ZnBlLmJyMB4XDTE0MDIxMDE3NTcx
-NloXDTE5MDIwOTE3NTcxNlowgZQxETAPBgNVBAoTCFVGUEUvTlRJMREwDwYDVQQL
-EwhVRlBFL05USTEiMCAGCSqGSIb3DQEJARYTbHVpei5ub3ZhZXNAdWZwZS5icjEP
-MA0GA1UEBxMGUmVjaWZlMRMwEQYDVQQIEwpQZXJuYW1idWNvMQswCQYDVQQGEwJC
-UjEVMBMGA1UEAxMMZmViZS51ZnBlLmJyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
-MIIBCgKCAQEA8hMgKxpUf115lxMz4k3SC+wUvqRVy9SuTcFYyi5SUixTxYFsp/DC
-RTCC8OOpgyBJWBovYLRGBXJ9JN/KLopSTZeZHHq8WBDccqW1VH3pK08mIrRN2B8S
-KqOTHAKq1Y/LgplsM5iVpP/72EG9x41jlD2VRFdWmLpmGkHynvggRtkXDE7ORpEY
-KG7FjoLuGWq412vXKN/Amug9QHVWhzB+ks5NoS0n9QiV3RHJJkRYo4E5d1J03PKg
-rWwe5iTx1x7kzYOfcBkTMsYbBXbaBvMr3LfihwbNns2jxuzYLZCRc1f1MnEgB7M3
-3/9AVD2V0xXfP6dbfPgHj9mpjtL9X9mYqQIDAQABMA0GCSqGSIb3DQEBBQUAA4IB
-AQByr1Cf89bQB/Tb6DGk8fJfZkgC0FBxc7nTuAvZo2hKArY2eX8s6ohlxgocAwqT
-pcc/5MQvWvEgg7nbEfQvCiQ0dcuTGpuqk9FiWlp/sjQ2KFRjH4na9VmxHVnMORSa
-efvuPMN9KMRPQjz7tDsqHNI/ooFFdZNH4odkOi+zsnvIdzz8alZuiQO3pUSeV48Z
-KzaND6lPrBa/+TPf2i9gLtJ0k2WJyrcqLSKbRBTjLzmeKfkDXdj147LM9242/lO8
-mFuuCvO6D4sRNVCkpuJiKX/QfVJKVhSkWcj1dYSlbmTFP5PIo/E+syTLaqoeBv/V
-bNzNXeVqF1LYziLN8/BFb+Rs
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://febe.ufpe.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://febe.ufpe.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://febe.ufpe.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://febe.ufpe.br/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://febe.ufpe.br/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://febe.ufpe.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">ufpe.br</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-      
-MIIDnjCCAoYCAQAwDQYJKoZIhvcNAQEFBQAwgZQxETAPBgNVBAoTCFVGUEUvTlRJ
-MREwDwYDVQQLEwhVRlBFL05USTEiMCAGCSqGSIb3DQEJARYTbHVpei5ub3ZhZXNA
-dWZwZS5icjEPMA0GA1UEBxMGUmVjaWZlMRMwEQYDVQQIEwpQZXJuYW1idWNvMQsw
-CQYDVQQGEwJCUjEVMBMGA1UEAxMMZmViZS51ZnBlLmJyMB4XDTE0MDIxMDE3NTcx
-NloXDTE5MDIwOTE3NTcxNlowgZQxETAPBgNVBAoTCFVGUEUvTlRJMREwDwYDVQQL
-EwhVRlBFL05USTEiMCAGCSqGSIb3DQEJARYTbHVpei5ub3ZhZXNAdWZwZS5icjEP
-MA0GA1UEBxMGUmVjaWZlMRMwEQYDVQQIEwpQZXJuYW1idWNvMQswCQYDVQQGEwJC
-UjEVMBMGA1UEAxMMZmViZS51ZnBlLmJyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
-MIIBCgKCAQEA8hMgKxpUf115lxMz4k3SC+wUvqRVy9SuTcFYyi5SUixTxYFsp/DC
-RTCC8OOpgyBJWBovYLRGBXJ9JN/KLopSTZeZHHq8WBDccqW1VH3pK08mIrRN2B8S
-KqOTHAKq1Y/LgplsM5iVpP/72EG9x41jlD2VRFdWmLpmGkHynvggRtkXDE7ORpEY
-KG7FjoLuGWq412vXKN/Amug9QHVWhzB+ks5NoS0n9QiV3RHJJkRYo4E5d1J03PKg
-rWwe5iTx1x7kzYOfcBkTMsYbBXbaBvMr3LfihwbNns2jxuzYLZCRc1f1MnEgB7M3
-3/9AVD2V0xXfP6dbfPgHj9mpjtL9X9mYqQIDAQABMA0GCSqGSIb3DQEBBQUAA4IB
-AQByr1Cf89bQB/Tb6DGk8fJfZkgC0FBxc7nTuAvZo2hKArY2eX8s6ohlxgocAwqT
-pcc/5MQvWvEgg7nbEfQvCiQ0dcuTGpuqk9FiWlp/sjQ2KFRjH4na9VmxHVnMORSa
-efvuPMN9KMRPQjz7tDsqHNI/ooFFdZNH4odkOi+zsnvIdzz8alZuiQO3pUSeV48Z
-KzaND6lPrBa/+TPf2i9gLtJ0k2WJyrcqLSKbRBTjLzmeKfkDXdj147LM9242/lO8
-mFuuCvO6D4sRNVCkpuJiKX/QfVJKVhSkWcj1dYSlbmTFP5PIo/E+syTLaqoeBv/V
-bNzNXeVqF1LYziLN8/BFb+Rs
-                    
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://febe.ufpe.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://febe.ufpe.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">UFPE - Universidade Federal de Pernambuco</OrganizationName>
-    <OrganizationName xml:lang="pt-br">UFPE - Universidade Federal de Pernambuco</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">UFPE - Universidade Federal de Pernambuco</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="pt-br">UFPE - Universidade Federal de Pernambuco</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.ufpe.br/</OrganizationURL>
-    <OrganizationURL xml:lang="pt-br">http://www.ufpe.br/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Anderson Queiroz</SurName>
-    <EmailAddress>aalqufpe@gmail.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/febe.ufpe.br.xml b/swamid-interfederations-2.0/febe.ufpe.br.xml
deleted file mode 100644
index abda1089..00000000
--- a/swamid-interfederations-2.0/febe.ufpe.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://febe.ufpe.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">ufpe.br</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">UFPE - Universidade Federal de Pernambuco</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="pt-br">UFPE - Universidade Federal de Pernambuco</mdui:DisplayName>
-        <mdui:Description xml:lang="en">UFPE - Universidade Federal de Pernambuco</mdui:Description>
-        <mdui:Description xml:lang="pt-br">UFPE - Universidade Federal de Pernambuco</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.ufpe.br/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="pt-br">http://www.ufpe.br/</mdui:InformationURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-    MIIDnjCCAoYCAQAwDQYJKoZIhvcNAQEFBQAwgZQxETAPBgNVBAoTCFVGUEUvTlRJ
-MREwDwYDVQQLEwhVRlBFL05USTEiMCAGCSqGSIb3DQEJARYTbHVpei5ub3ZhZXNA
-dWZwZS5icjEPMA0GA1UEBxMGUmVjaWZlMRMwEQYDVQQIEwpQZXJuYW1idWNvMQsw
-CQYDVQQGEwJCUjEVMBMGA1UEAxMMZmViZS51ZnBlLmJyMB4XDTE0MDIxMDE3NTcx
-NloXDTE5MDIwOTE3NTcxNlowgZQxETAPBgNVBAoTCFVGUEUvTlRJMREwDwYDVQQL
-EwhVRlBFL05USTEiMCAGCSqGSIb3DQEJARYTbHVpei5ub3ZhZXNAdWZwZS5icjEP
-MA0GA1UEBxMGUmVjaWZlMRMwEQYDVQQIEwpQZXJuYW1idWNvMQswCQYDVQQGEwJC
-UjEVMBMGA1UEAxMMZmViZS51ZnBlLmJyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
-MIIBCgKCAQEA8hMgKxpUf115lxMz4k3SC+wUvqRVy9SuTcFYyi5SUixTxYFsp/DC
-RTCC8OOpgyBJWBovYLRGBXJ9JN/KLopSTZeZHHq8WBDccqW1VH3pK08mIrRN2B8S
-KqOTHAKq1Y/LgplsM5iVpP/72EG9x41jlD2VRFdWmLpmGkHynvggRtkXDE7ORpEY
-KG7FjoLuGWq412vXKN/Amug9QHVWhzB+ks5NoS0n9QiV3RHJJkRYo4E5d1J03PKg
-rWwe5iTx1x7kzYOfcBkTMsYbBXbaBvMr3LfihwbNns2jxuzYLZCRc1f1MnEgB7M3
-3/9AVD2V0xXfP6dbfPgHj9mpjtL9X9mYqQIDAQABMA0GCSqGSIb3DQEBBQUAA4IB
-AQByr1Cf89bQB/Tb6DGk8fJfZkgC0FBxc7nTuAvZo2hKArY2eX8s6ohlxgocAwqT
-pcc/5MQvWvEgg7nbEfQvCiQ0dcuTGpuqk9FiWlp/sjQ2KFRjH4na9VmxHVnMORSa
-efvuPMN9KMRPQjz7tDsqHNI/ooFFdZNH4odkOi+zsnvIdzz8alZuiQO3pUSeV48Z
-KzaND6lPrBa/+TPf2i9gLtJ0k2WJyrcqLSKbRBTjLzmeKfkDXdj147LM9242/lO8
-mFuuCvO6D4sRNVCkpuJiKX/QfVJKVhSkWcj1dYSlbmTFP5PIo/E+syTLaqoeBv/V
-bNzNXeVqF1LYziLN8/BFb+Rs
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://febe.ufpe.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://febe.ufpe.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://febe.ufpe.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://febe.ufpe.br/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://febe.ufpe.br/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://febe.ufpe.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">ufpe.br</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-      
-MIIDnjCCAoYCAQAwDQYJKoZIhvcNAQEFBQAwgZQxETAPBgNVBAoTCFVGUEUvTlRJ
-MREwDwYDVQQLEwhVRlBFL05USTEiMCAGCSqGSIb3DQEJARYTbHVpei5ub3ZhZXNA
-dWZwZS5icjEPMA0GA1UEBxMGUmVjaWZlMRMwEQYDVQQIEwpQZXJuYW1idWNvMQsw
-CQYDVQQGEwJCUjEVMBMGA1UEAxMMZmViZS51ZnBlLmJyMB4XDTE0MDIxMDE3NTcx
-NloXDTE5MDIwOTE3NTcxNlowgZQxETAPBgNVBAoTCFVGUEUvTlRJMREwDwYDVQQL
-EwhVRlBFL05USTEiMCAGCSqGSIb3DQEJARYTbHVpei5ub3ZhZXNAdWZwZS5icjEP
-MA0GA1UEBxMGUmVjaWZlMRMwEQYDVQQIEwpQZXJuYW1idWNvMQswCQYDVQQGEwJC
-UjEVMBMGA1UEAxMMZmViZS51ZnBlLmJyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
-MIIBCgKCAQEA8hMgKxpUf115lxMz4k3SC+wUvqRVy9SuTcFYyi5SUixTxYFsp/DC
-RTCC8OOpgyBJWBovYLRGBXJ9JN/KLopSTZeZHHq8WBDccqW1VH3pK08mIrRN2B8S
-KqOTHAKq1Y/LgplsM5iVpP/72EG9x41jlD2VRFdWmLpmGkHynvggRtkXDE7ORpEY
-KG7FjoLuGWq412vXKN/Amug9QHVWhzB+ks5NoS0n9QiV3RHJJkRYo4E5d1J03PKg
-rWwe5iTx1x7kzYOfcBkTMsYbBXbaBvMr3LfihwbNns2jxuzYLZCRc1f1MnEgB7M3
-3/9AVD2V0xXfP6dbfPgHj9mpjtL9X9mYqQIDAQABMA0GCSqGSIb3DQEBBQUAA4IB
-AQByr1Cf89bQB/Tb6DGk8fJfZkgC0FBxc7nTuAvZo2hKArY2eX8s6ohlxgocAwqT
-pcc/5MQvWvEgg7nbEfQvCiQ0dcuTGpuqk9FiWlp/sjQ2KFRjH4na9VmxHVnMORSa
-efvuPMN9KMRPQjz7tDsqHNI/ooFFdZNH4odkOi+zsnvIdzz8alZuiQO3pUSeV48Z
-KzaND6lPrBa/+TPf2i9gLtJ0k2WJyrcqLSKbRBTjLzmeKfkDXdj147LM9242/lO8
-mFuuCvO6D4sRNVCkpuJiKX/QfVJKVhSkWcj1dYSlbmTFP5PIo/E+syTLaqoeBv/V
-bNzNXeVqF1LYziLN8/BFb+Rs
-                    
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://febe.ufpe.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://febe.ufpe.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">UFPE - Universidade Federal de Pernambuco</OrganizationName>
-    <OrganizationName xml:lang="pt-br">UFPE - Universidade Federal de Pernambuco</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">UFPE - Universidade Federal de Pernambuco</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="pt-br">UFPE - Universidade Federal de Pernambuco</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.ufpe.br/</OrganizationURL>
-    <OrganizationURL xml:lang="pt-br">http://www.ufpe.br/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Anderson Queiroz</SurName>
-    <EmailAddress>aalqufpe@gmail.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/fed.id.univ-bordeaux.fr-idp_ubx-shibboleth.xml b/swamid-interfederations-2.0/fed.id.univ-bordeaux.fr-idp_ubx-shibboleth.xml
deleted file mode 100644
index 0be8dc23..00000000
--- a/swamid-interfederations-2.0/fed.id.univ-bordeaux.fr-idp_ubx-shibboleth.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://fed.id.univ-bordeaux.fr/idp_ubx/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2011-05-24T11:30:09Z">
-      <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">univ-bordeaux.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">CUEA - Communauté d'universités et d'établissements d'Aquitaine</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDlDCCAnygAwIBAgIJAMmv2toaoAEMMA0GCSqGSIb3DQEBBQUAMDoxCzAJBgNV
-BAYTAkZSMQwwCgYDVQQKEwNVQngxHTAbBgNVBAMTFGlkcC51bml2LWJvcmRlYXV4
-LmZyMB4XDTExMDUxOTEwMTMzMVoXDTMxMDUxNDEwMTMzMVowOjELMAkGA1UEBhMC
-RlIxDDAKBgNVBAoTA1VCeDEdMBsGA1UEAxMUaWRwLnVuaXYtYm9yZGVhdXguZnIw
-ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC/fbuGXQzSGD9NIpWeKHgx
-uUOIFJnnuGTkASR2nUsiLVC5T85Pc23LHd2q+QVuEzrApgZHPaQ/dvwkoyD26K+z
-JPfsVSFNObGxTHIh3erH8ELPVSUWWBTBdxhOqqjsY2Oi6wOiiPRAHJIJ8GtR+WiY
-flaN2pyuP6E6y9klVO1a5A592ClTEJW+TjpcqE3REmcwqjEBcx2rGOlgipwBGRbt
-g2VjDWfP745U9Nu7s77bWbcP1fFlSYX6fY5jlBsS9KiTkjNEyLQv6H7f6gkA4JAf
-vtlg/+wgT5yjoeLnO1PXU94Fg9MiwXw9bmBccrdZEYbRE4Yj7erzk8yAqZkdeRx5
-AgMBAAGjgZwwgZkwHQYDVR0OBBYEFEDi7aDbyQrP92cicg3Ybs52s69CMGoGA1Ud
-IwRjMGGAFEDi7aDbyQrP92cicg3Ybs52s69CoT6kPDA6MQswCQYDVQQGEwJGUjEM
-MAoGA1UEChMDVUJ4MR0wGwYDVQQDExRpZHAudW5pdi1ib3JkZWF1eC5mcoIJAMmv
-2toaoAEMMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAK4ev4MBRPS6
-jZgF6rlty35EfLflTFhQNFtTypW7O/yljgpIs1UNahDNmlJBSBZpw1DeZvuLJwsw
-sK8mb9ldbs3+euCK/6N/zXj48S7/2KIt32jUTsjMcByOvhxqrsax4APYKCqh0ErB
-f5aCPGBKrlMf99jeG4Iegf8YkkU2i+ZCq04GkBDZPawtEWNJL1LTykMvY09Wf1pU
-oiMV0/Zcv53VXdVLsHwCYFg3lf1uIlGcwaJPxb4NCAGAktixPig8B2sqE7ryk8ss
-QiRmgUZzF4TgaBu7lYjlYOmUMvrC+KaOPvT+UlYrWidEok60vOY+kIJ683KK7QhE
-V+xNY9y95Z8=
-					    </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://fed.id.univ-bordeaux.fr/idp_ubx/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://fed.id.univ-bordeaux.fr/idp_ubx/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://fed.id.univ-bordeaux.fr/idp_ubx/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">CUEA - Communauté d'universités et d'établissements d'Aquitaine</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">CUEA - Communauté d'universités et d'établissements d'Aquitaine</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <EmailAddress>ssr@univ-bordeaux.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/fed.id.univ-bordeaux.fr.xml b/swamid-interfederations-2.0/fed.id.univ-bordeaux.fr.xml
deleted file mode 100644
index 0be8dc23..00000000
--- a/swamid-interfederations-2.0/fed.id.univ-bordeaux.fr.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://fed.id.univ-bordeaux.fr/idp_ubx/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2011-05-24T11:30:09Z">
-      <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">univ-bordeaux.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">CUEA - Communauté d'universités et d'établissements d'Aquitaine</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDlDCCAnygAwIBAgIJAMmv2toaoAEMMA0GCSqGSIb3DQEBBQUAMDoxCzAJBgNV
-BAYTAkZSMQwwCgYDVQQKEwNVQngxHTAbBgNVBAMTFGlkcC51bml2LWJvcmRlYXV4
-LmZyMB4XDTExMDUxOTEwMTMzMVoXDTMxMDUxNDEwMTMzMVowOjELMAkGA1UEBhMC
-RlIxDDAKBgNVBAoTA1VCeDEdMBsGA1UEAxMUaWRwLnVuaXYtYm9yZGVhdXguZnIw
-ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC/fbuGXQzSGD9NIpWeKHgx
-uUOIFJnnuGTkASR2nUsiLVC5T85Pc23LHd2q+QVuEzrApgZHPaQ/dvwkoyD26K+z
-JPfsVSFNObGxTHIh3erH8ELPVSUWWBTBdxhOqqjsY2Oi6wOiiPRAHJIJ8GtR+WiY
-flaN2pyuP6E6y9klVO1a5A592ClTEJW+TjpcqE3REmcwqjEBcx2rGOlgipwBGRbt
-g2VjDWfP745U9Nu7s77bWbcP1fFlSYX6fY5jlBsS9KiTkjNEyLQv6H7f6gkA4JAf
-vtlg/+wgT5yjoeLnO1PXU94Fg9MiwXw9bmBccrdZEYbRE4Yj7erzk8yAqZkdeRx5
-AgMBAAGjgZwwgZkwHQYDVR0OBBYEFEDi7aDbyQrP92cicg3Ybs52s69CMGoGA1Ud
-IwRjMGGAFEDi7aDbyQrP92cicg3Ybs52s69CoT6kPDA6MQswCQYDVQQGEwJGUjEM
-MAoGA1UEChMDVUJ4MR0wGwYDVQQDExRpZHAudW5pdi1ib3JkZWF1eC5mcoIJAMmv
-2toaoAEMMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAK4ev4MBRPS6
-jZgF6rlty35EfLflTFhQNFtTypW7O/yljgpIs1UNahDNmlJBSBZpw1DeZvuLJwsw
-sK8mb9ldbs3+euCK/6N/zXj48S7/2KIt32jUTsjMcByOvhxqrsax4APYKCqh0ErB
-f5aCPGBKrlMf99jeG4Iegf8YkkU2i+ZCq04GkBDZPawtEWNJL1LTykMvY09Wf1pU
-oiMV0/Zcv53VXdVLsHwCYFg3lf1uIlGcwaJPxb4NCAGAktixPig8B2sqE7ryk8ss
-QiRmgUZzF4TgaBu7lYjlYOmUMvrC+KaOPvT+UlYrWidEok60vOY+kIJ683KK7QhE
-V+xNY9y95Z8=
-					    </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://fed.id.univ-bordeaux.fr/idp_ubx/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://fed.id.univ-bordeaux.fr/idp_ubx/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://fed.id.univ-bordeaux.fr/idp_ubx/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">CUEA - Communauté d'universités et d'établissements d'Aquitaine</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">CUEA - Communauté d'universités et d'établissements d'Aquitaine</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <EmailAddress>ssr@univ-bordeaux.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/fede.supelec.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/fede.supelec.fr-idp-shibboleth.xml
deleted file mode 100644
index 32c20597..00000000
--- a/swamid-interfederations-2.0/fede.supelec.fr-idp-shibboleth.xml
+++ /dev/null
@@ -1,145 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://fede.supelec.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2014-09-25T17:00:08Z">
-      <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">supelec.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Supélec</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Teachers, Researchers, Staff, Students</mdui:Description>
-        <mdui:DisplayName xml:lang="fr">Supélec</mdui:DisplayName>
-        <mdui:Description xml:lang="fr">Enseignants, Chercheurs, Personnels, Etudiants</mdui:Description>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDKDCCAhCgAwIBAgIVAJM8CQeFJc3xn6Z1VQJmlIUprCAEMA0GCSqGSIb3DQEB
-BQUAMBoxGDAWBgNVBAMMD2ZlZGUuc3VwZWxlYy5mcjAeFw0xNDEwMTYwOTUxNTla
-Fw0zNDEwMTYwOTUxNTlaMBoxGDAWBgNVBAMMD2ZlZGUuc3VwZWxlYy5mcjCCASIw
-DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJUgXB50hjGYdLKHZxLSCPztkFuA
-WtNJocV4c/4dZGMjAiarkeiaWkQ6h+NrsCj5qoYeXekfkVHw+1G2+NbhB0miUnxh
-ex1Y5FJ+7Fet31zqk9whwmU6WbpwCCQRPWj/52qSciK66rZyFlqMnID33MWOR6hW
-86VtXZwWjBl2QmQuqFzHQ0aZU7ihUGW6YyodXc/GA8u72AEgzg74NiUgR9ewHsjW
-3d6rDhq6TOuOVpqfxNWZEdnw5qdIz8RhHKHh3W5fHv5xIp0meruvhv6mmXv7NltA
-S0mVt4iCe4MLcTRBtNtIkA8FvdwHnmfFdrwiZvxt7PW3JbPp27JJ5Ozl7fECAwEA
-AaNlMGMwHQYDVR0OBBYEFJaRXAI+mqD0ehgvH9spPnE6a5AxMEIGA1UdEQQ7MDmC
-D2ZlZGUuc3VwZWxlYy5mcoYmaHR0cHM6Ly9mZWRlLnN1cGVsZWMuZnIvaWRwL3No
-aWJib2xldGgwDQYJKoZIhvcNAQEFBQADggEBAGSd2uPxo+hqnAQjN1fAlVr24vO0
-+PHkWq5/LD836eb8UWgCvlGB1/D5fQZzvszShofbnnBYA3sT/ZA32uQeCnn2JcXD
-Ggl9/kBDXaLe4sDFRvEmme/5aacES06cuHVQOfo1geiU9b0BWZfQ+PhIs7zMD6lW
-oG7DQC+PuWokOA53MCcMZFGkx9Jc7WYE/mDDUwktRKyKdmWkhBhPqX9WG9TiVjQ8
-4es7yiwOGihNdSw+Fo57loP3CpPYNpbirQy38W98qv2UNRabSrnRG26Pnr6Olitl
-0Mk7i7JvwcZoVBdgutFiM5YhZNH2Lm01vGPdFTeoUvatALsHf2c43PtH/PM=
-					    </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>
-					      MIIDJzCCAg+gAwIBAgIUI3GVT0U51zI/+zqt7XjPQwAliqIwDQYJKoZIhvcNAQEF
-BQAwGjEYMBYGA1UEAxMPZmVkZS5zdXBlbGVjLmZyMB4XDTE0MDYxOTA5MzUxOVoX
-DTM0MDYxOTA5MzUxOVowGjEYMBYGA1UEAxMPZmVkZS5zdXBlbGVjLmZyMIIBIjAN
-BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAp4mY5iMIDfdfYOaZfhJ8f1cGJWtW
-nmOqq4X/dpvqIIDS99IpWCL3bDg5v8XtTtywfIdrAStQKiTSW5OXYMvuMpZwQzdX
-lz2b0huK+9h+wK4sEr/VvedRaxR41d2EWCgKRNglSSC8d0je5ohwKBXkdqiscbTN
-/5qRqVR1QPpWRJN0HlLIvE1J0Geb5RRsBtciWMSLAlRxfWKCqFgBZVzL8WlqF624
-cioE1U6K+TUnNXDoZxWdf/Ynn/9VC634ud1KectCNb2dRJO6ywwh4z+Zdd6gVKxu
-YBXngIYRgXdWFfCkhBj1Tj3TaDLkKaKRSZejotINWXUHIrFO0RA0KjWI/QIDAQAB
-o2UwYzBCBgNVHREEOzA5gg9mZWRlLnN1cGVsZWMuZnKGJmh0dHBzOi8vZmVkZS5z
-dXBlbGVjLmZyL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBRNa4jLphWoCFgrx/Pa
-OM2r2uMx5zANBgkqhkiG9w0BAQUFAAOCAQEAGfZyDAr7cL5vT+7jigc0oYdjfPQ+
-CG8shDpjTOwWjRXThxLX32IUhYPF0mZ+EvrCQdyg01CTE2bkMpcDilnDpsmMOoRo
-p820ReMScYoFNB/nQio21BR1Galps7TdErp8XFNvgwbPW6YdFpqXYxAFNm5wWnxz
-u9dm0M2dMSEe1xgJjYRaU2H/BN5qyGuoyM4K0maM8AHOS9iBnRzuzcZQ7WUWA1JP
-VgWhf5jRP9RPKVQUQOLb036aw3uZ51fSvN/ceCPq5ibwqUEHw9gikRWchPerrYnR
-eDUxLltLVzLhUUNHbW5A2MlBwDFMqCWhZy8vqCJFdLUkTAFhRuJ/VVyYzA==
-					    </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://fede.supelec.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://fede.supelec.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://fede.supelec.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">supelec.fr</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDKDCCAhCgAwIBAgIVAJM8CQeFJc3xn6Z1VQJmlIUprCAEMA0GCSqGSIb3DQEB
-BQUAMBoxGDAWBgNVBAMMD2ZlZGUuc3VwZWxlYy5mcjAeFw0xNDEwMTYwOTUxNTla
-Fw0zNDEwMTYwOTUxNTlaMBoxGDAWBgNVBAMMD2ZlZGUuc3VwZWxlYy5mcjCCASIw
-DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJUgXB50hjGYdLKHZxLSCPztkFuA
-WtNJocV4c/4dZGMjAiarkeiaWkQ6h+NrsCj5qoYeXekfkVHw+1G2+NbhB0miUnxh
-ex1Y5FJ+7Fet31zqk9whwmU6WbpwCCQRPWj/52qSciK66rZyFlqMnID33MWOR6hW
-86VtXZwWjBl2QmQuqFzHQ0aZU7ihUGW6YyodXc/GA8u72AEgzg74NiUgR9ewHsjW
-3d6rDhq6TOuOVpqfxNWZEdnw5qdIz8RhHKHh3W5fHv5xIp0meruvhv6mmXv7NltA
-S0mVt4iCe4MLcTRBtNtIkA8FvdwHnmfFdrwiZvxt7PW3JbPp27JJ5Ozl7fECAwEA
-AaNlMGMwHQYDVR0OBBYEFJaRXAI+mqD0ehgvH9spPnE6a5AxMEIGA1UdEQQ7MDmC
-D2ZlZGUuc3VwZWxlYy5mcoYmaHR0cHM6Ly9mZWRlLnN1cGVsZWMuZnIvaWRwL3No
-aWJib2xldGgwDQYJKoZIhvcNAQEFBQADggEBAGSd2uPxo+hqnAQjN1fAlVr24vO0
-+PHkWq5/LD836eb8UWgCvlGB1/D5fQZzvszShofbnnBYA3sT/ZA32uQeCnn2JcXD
-Ggl9/kBDXaLe4sDFRvEmme/5aacES06cuHVQOfo1geiU9b0BWZfQ+PhIs7zMD6lW
-oG7DQC+PuWokOA53MCcMZFGkx9Jc7WYE/mDDUwktRKyKdmWkhBhPqX9WG9TiVjQ8
-4es7yiwOGihNdSw+Fo57loP3CpPYNpbirQy38W98qv2UNRabSrnRG26Pnr6Olitl
-0Mk7i7JvwcZoVBdgutFiM5YhZNH2Lm01vGPdFTeoUvatALsHf2c43PtH/PM=
-					    </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>
-					      MIIDJzCCAg+gAwIBAgIUI3GVT0U51zI/+zqt7XjPQwAliqIwDQYJKoZIhvcNAQEF
-BQAwGjEYMBYGA1UEAxMPZmVkZS5zdXBlbGVjLmZyMB4XDTE0MDYxOTA5MzUxOVoX
-DTM0MDYxOTA5MzUxOVowGjEYMBYGA1UEAxMPZmVkZS5zdXBlbGVjLmZyMIIBIjAN
-BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAp4mY5iMIDfdfYOaZfhJ8f1cGJWtW
-nmOqq4X/dpvqIIDS99IpWCL3bDg5v8XtTtywfIdrAStQKiTSW5OXYMvuMpZwQzdX
-lz2b0huK+9h+wK4sEr/VvedRaxR41d2EWCgKRNglSSC8d0je5ohwKBXkdqiscbTN
-/5qRqVR1QPpWRJN0HlLIvE1J0Geb5RRsBtciWMSLAlRxfWKCqFgBZVzL8WlqF624
-cioE1U6K+TUnNXDoZxWdf/Ynn/9VC634ud1KectCNb2dRJO6ywwh4z+Zdd6gVKxu
-YBXngIYRgXdWFfCkhBj1Tj3TaDLkKaKRSZejotINWXUHIrFO0RA0KjWI/QIDAQAB
-o2UwYzBCBgNVHREEOzA5gg9mZWRlLnN1cGVsZWMuZnKGJmh0dHBzOi8vZmVkZS5z
-dXBlbGVjLmZyL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBRNa4jLphWoCFgrx/Pa
-OM2r2uMx5zANBgkqhkiG9w0BAQUFAAOCAQEAGfZyDAr7cL5vT+7jigc0oYdjfPQ+
-CG8shDpjTOwWjRXThxLX32IUhYPF0mZ+EvrCQdyg01CTE2bkMpcDilnDpsmMOoRo
-p820ReMScYoFNB/nQio21BR1Galps7TdErp8XFNvgwbPW6YdFpqXYxAFNm5wWnxz
-u9dm0M2dMSEe1xgJjYRaU2H/BN5qyGuoyM4K0maM8AHOS9iBnRzuzcZQ7WUWA1JP
-VgWhf5jRP9RPKVQUQOLb036aw3uZ51fSvN/ceCPq5ibwqUEHw9gikRWchPerrYnR
-eDUxLltLVzLhUUNHbW5A2MlBwDFMqCWhZy8vqCJFdLUkTAFhRuJ/VVyYzA==
-					    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://fede.supelec.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">Supélec</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Supélec</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">www.supelec.fr</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Laura NEGRE</SurName>
-    <EmailAddress>laura.negre@supelec.fr</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <SurName>Thibault LE MEUR</SurName>
-    <EmailAddress>thibault.lemeur@supelec.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/fede.supelec.fr.xml b/swamid-interfederations-2.0/fede.supelec.fr.xml
deleted file mode 100644
index 32c20597..00000000
--- a/swamid-interfederations-2.0/fede.supelec.fr.xml
+++ /dev/null
@@ -1,145 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://fede.supelec.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2014-09-25T17:00:08Z">
-      <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">supelec.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Supélec</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Teachers, Researchers, Staff, Students</mdui:Description>
-        <mdui:DisplayName xml:lang="fr">Supélec</mdui:DisplayName>
-        <mdui:Description xml:lang="fr">Enseignants, Chercheurs, Personnels, Etudiants</mdui:Description>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDKDCCAhCgAwIBAgIVAJM8CQeFJc3xn6Z1VQJmlIUprCAEMA0GCSqGSIb3DQEB
-BQUAMBoxGDAWBgNVBAMMD2ZlZGUuc3VwZWxlYy5mcjAeFw0xNDEwMTYwOTUxNTla
-Fw0zNDEwMTYwOTUxNTlaMBoxGDAWBgNVBAMMD2ZlZGUuc3VwZWxlYy5mcjCCASIw
-DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJUgXB50hjGYdLKHZxLSCPztkFuA
-WtNJocV4c/4dZGMjAiarkeiaWkQ6h+NrsCj5qoYeXekfkVHw+1G2+NbhB0miUnxh
-ex1Y5FJ+7Fet31zqk9whwmU6WbpwCCQRPWj/52qSciK66rZyFlqMnID33MWOR6hW
-86VtXZwWjBl2QmQuqFzHQ0aZU7ihUGW6YyodXc/GA8u72AEgzg74NiUgR9ewHsjW
-3d6rDhq6TOuOVpqfxNWZEdnw5qdIz8RhHKHh3W5fHv5xIp0meruvhv6mmXv7NltA
-S0mVt4iCe4MLcTRBtNtIkA8FvdwHnmfFdrwiZvxt7PW3JbPp27JJ5Ozl7fECAwEA
-AaNlMGMwHQYDVR0OBBYEFJaRXAI+mqD0ehgvH9spPnE6a5AxMEIGA1UdEQQ7MDmC
-D2ZlZGUuc3VwZWxlYy5mcoYmaHR0cHM6Ly9mZWRlLnN1cGVsZWMuZnIvaWRwL3No
-aWJib2xldGgwDQYJKoZIhvcNAQEFBQADggEBAGSd2uPxo+hqnAQjN1fAlVr24vO0
-+PHkWq5/LD836eb8UWgCvlGB1/D5fQZzvszShofbnnBYA3sT/ZA32uQeCnn2JcXD
-Ggl9/kBDXaLe4sDFRvEmme/5aacES06cuHVQOfo1geiU9b0BWZfQ+PhIs7zMD6lW
-oG7DQC+PuWokOA53MCcMZFGkx9Jc7WYE/mDDUwktRKyKdmWkhBhPqX9WG9TiVjQ8
-4es7yiwOGihNdSw+Fo57loP3CpPYNpbirQy38W98qv2UNRabSrnRG26Pnr6Olitl
-0Mk7i7JvwcZoVBdgutFiM5YhZNH2Lm01vGPdFTeoUvatALsHf2c43PtH/PM=
-					    </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>
-					      MIIDJzCCAg+gAwIBAgIUI3GVT0U51zI/+zqt7XjPQwAliqIwDQYJKoZIhvcNAQEF
-BQAwGjEYMBYGA1UEAxMPZmVkZS5zdXBlbGVjLmZyMB4XDTE0MDYxOTA5MzUxOVoX
-DTM0MDYxOTA5MzUxOVowGjEYMBYGA1UEAxMPZmVkZS5zdXBlbGVjLmZyMIIBIjAN
-BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAp4mY5iMIDfdfYOaZfhJ8f1cGJWtW
-nmOqq4X/dpvqIIDS99IpWCL3bDg5v8XtTtywfIdrAStQKiTSW5OXYMvuMpZwQzdX
-lz2b0huK+9h+wK4sEr/VvedRaxR41d2EWCgKRNglSSC8d0je5ohwKBXkdqiscbTN
-/5qRqVR1QPpWRJN0HlLIvE1J0Geb5RRsBtciWMSLAlRxfWKCqFgBZVzL8WlqF624
-cioE1U6K+TUnNXDoZxWdf/Ynn/9VC634ud1KectCNb2dRJO6ywwh4z+Zdd6gVKxu
-YBXngIYRgXdWFfCkhBj1Tj3TaDLkKaKRSZejotINWXUHIrFO0RA0KjWI/QIDAQAB
-o2UwYzBCBgNVHREEOzA5gg9mZWRlLnN1cGVsZWMuZnKGJmh0dHBzOi8vZmVkZS5z
-dXBlbGVjLmZyL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBRNa4jLphWoCFgrx/Pa
-OM2r2uMx5zANBgkqhkiG9w0BAQUFAAOCAQEAGfZyDAr7cL5vT+7jigc0oYdjfPQ+
-CG8shDpjTOwWjRXThxLX32IUhYPF0mZ+EvrCQdyg01CTE2bkMpcDilnDpsmMOoRo
-p820ReMScYoFNB/nQio21BR1Galps7TdErp8XFNvgwbPW6YdFpqXYxAFNm5wWnxz
-u9dm0M2dMSEe1xgJjYRaU2H/BN5qyGuoyM4K0maM8AHOS9iBnRzuzcZQ7WUWA1JP
-VgWhf5jRP9RPKVQUQOLb036aw3uZ51fSvN/ceCPq5ibwqUEHw9gikRWchPerrYnR
-eDUxLltLVzLhUUNHbW5A2MlBwDFMqCWhZy8vqCJFdLUkTAFhRuJ/VVyYzA==
-					    </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://fede.supelec.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://fede.supelec.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://fede.supelec.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">supelec.fr</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDKDCCAhCgAwIBAgIVAJM8CQeFJc3xn6Z1VQJmlIUprCAEMA0GCSqGSIb3DQEB
-BQUAMBoxGDAWBgNVBAMMD2ZlZGUuc3VwZWxlYy5mcjAeFw0xNDEwMTYwOTUxNTla
-Fw0zNDEwMTYwOTUxNTlaMBoxGDAWBgNVBAMMD2ZlZGUuc3VwZWxlYy5mcjCCASIw
-DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJUgXB50hjGYdLKHZxLSCPztkFuA
-WtNJocV4c/4dZGMjAiarkeiaWkQ6h+NrsCj5qoYeXekfkVHw+1G2+NbhB0miUnxh
-ex1Y5FJ+7Fet31zqk9whwmU6WbpwCCQRPWj/52qSciK66rZyFlqMnID33MWOR6hW
-86VtXZwWjBl2QmQuqFzHQ0aZU7ihUGW6YyodXc/GA8u72AEgzg74NiUgR9ewHsjW
-3d6rDhq6TOuOVpqfxNWZEdnw5qdIz8RhHKHh3W5fHv5xIp0meruvhv6mmXv7NltA
-S0mVt4iCe4MLcTRBtNtIkA8FvdwHnmfFdrwiZvxt7PW3JbPp27JJ5Ozl7fECAwEA
-AaNlMGMwHQYDVR0OBBYEFJaRXAI+mqD0ehgvH9spPnE6a5AxMEIGA1UdEQQ7MDmC
-D2ZlZGUuc3VwZWxlYy5mcoYmaHR0cHM6Ly9mZWRlLnN1cGVsZWMuZnIvaWRwL3No
-aWJib2xldGgwDQYJKoZIhvcNAQEFBQADggEBAGSd2uPxo+hqnAQjN1fAlVr24vO0
-+PHkWq5/LD836eb8UWgCvlGB1/D5fQZzvszShofbnnBYA3sT/ZA32uQeCnn2JcXD
-Ggl9/kBDXaLe4sDFRvEmme/5aacES06cuHVQOfo1geiU9b0BWZfQ+PhIs7zMD6lW
-oG7DQC+PuWokOA53MCcMZFGkx9Jc7WYE/mDDUwktRKyKdmWkhBhPqX9WG9TiVjQ8
-4es7yiwOGihNdSw+Fo57loP3CpPYNpbirQy38W98qv2UNRabSrnRG26Pnr6Olitl
-0Mk7i7JvwcZoVBdgutFiM5YhZNH2Lm01vGPdFTeoUvatALsHf2c43PtH/PM=
-					    </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>
-					      MIIDJzCCAg+gAwIBAgIUI3GVT0U51zI/+zqt7XjPQwAliqIwDQYJKoZIhvcNAQEF
-BQAwGjEYMBYGA1UEAxMPZmVkZS5zdXBlbGVjLmZyMB4XDTE0MDYxOTA5MzUxOVoX
-DTM0MDYxOTA5MzUxOVowGjEYMBYGA1UEAxMPZmVkZS5zdXBlbGVjLmZyMIIBIjAN
-BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAp4mY5iMIDfdfYOaZfhJ8f1cGJWtW
-nmOqq4X/dpvqIIDS99IpWCL3bDg5v8XtTtywfIdrAStQKiTSW5OXYMvuMpZwQzdX
-lz2b0huK+9h+wK4sEr/VvedRaxR41d2EWCgKRNglSSC8d0je5ohwKBXkdqiscbTN
-/5qRqVR1QPpWRJN0HlLIvE1J0Geb5RRsBtciWMSLAlRxfWKCqFgBZVzL8WlqF624
-cioE1U6K+TUnNXDoZxWdf/Ynn/9VC634ud1KectCNb2dRJO6ywwh4z+Zdd6gVKxu
-YBXngIYRgXdWFfCkhBj1Tj3TaDLkKaKRSZejotINWXUHIrFO0RA0KjWI/QIDAQAB
-o2UwYzBCBgNVHREEOzA5gg9mZWRlLnN1cGVsZWMuZnKGJmh0dHBzOi8vZmVkZS5z
-dXBlbGVjLmZyL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBRNa4jLphWoCFgrx/Pa
-OM2r2uMx5zANBgkqhkiG9w0BAQUFAAOCAQEAGfZyDAr7cL5vT+7jigc0oYdjfPQ+
-CG8shDpjTOwWjRXThxLX32IUhYPF0mZ+EvrCQdyg01CTE2bkMpcDilnDpsmMOoRo
-p820ReMScYoFNB/nQio21BR1Galps7TdErp8XFNvgwbPW6YdFpqXYxAFNm5wWnxz
-u9dm0M2dMSEe1xgJjYRaU2H/BN5qyGuoyM4K0maM8AHOS9iBnRzuzcZQ7WUWA1JP
-VgWhf5jRP9RPKVQUQOLb036aw3uZ51fSvN/ceCPq5ibwqUEHw9gikRWchPerrYnR
-eDUxLltLVzLhUUNHbW5A2MlBwDFMqCWhZy8vqCJFdLUkTAFhRuJ/VVyYzA==
-					    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://fede.supelec.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">Supélec</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Supélec</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">www.supelec.fr</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Laura NEGRE</SurName>
-    <EmailAddress>laura.negre@supelec.fr</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <SurName>Thibault LE MEUR</SurName>
-    <EmailAddress>thibault.lemeur@supelec.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/federacao.ifpi.edu.br-idp-shibboleth.xml b/swamid-interfederations-2.0/federacao.ifpi.edu.br-idp-shibboleth.xml
deleted file mode 100644
index fc607d71..00000000
--- a/swamid-interfederations-2.0/federacao.ifpi.edu.br-idp-shibboleth.xml
+++ /dev/null
@@ -1,104 +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://federacao.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">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>
-    MIIDGDCCAgACAQAwDQYJKoZIhvcNAQEFBQAwUjEMMAoGA1UECxMDRFRJMREwDwYD
-VQQHEwhUZXJlc2luYTEOMAwGA1UECBMFUGlhdWkxCzAJBgNVBAYTAkJSMRIwEAYD
-VQQDEwlmZWRlcmFjYW8wHhcNMTQwNDE2MTYwMzI0WhcNMTkwNDE1MTYwMzI0WjBS
-MQwwCgYDVQQLEwNEVEkxETAPBgNVBAcTCFRlcmVzaW5hMQ4wDAYDVQQIEwVQaWF1
-aTELMAkGA1UEBhMCQlIxEjAQBgNVBAMTCWZlZGVyYWNhbzCCASIwDQYJKoZIhvcN
-AQEBBQADggEPADCCAQoCggEBAM+X6ZVCrx5gqcXZXUuiC5ermIFV+dcDd/6BEQN4
-ufvSfALSdZCOhFuCB2OBn1PZkGKYLMiP9uhsaYFQrNPdX7sNwJahZRnimwbbd9YZ
-uyAp5JN/DFcVxYIDtDy9Xo52pLBteqnNJuW8gWZaGUwivk8sG4IfXKuyRf6HauEK
-vwF8S63cxGG+cWEpr3OXYyhQQGpPq0AgrT/zwXEXBKUGCgWECjgV0xII09RGfkm+
-HedznbHuJc5U0J+rUneiUiTaDH9cUjG+nVuBsMRy+4aeZEolO5MN/Vr7iRP+y5om
-LysxRCvOs77sR/mNlnC8vJr+Y74YFz4I3edxsQ2coBJksasCAwEAATANBgkqhkiG
-9w0BAQUFAAOCAQEApkUH0E14hDpfCakAsJA7Du1zmvgf1uwqJ0Db5iYgjsTuvCZD
-CkyF2tRhXFUd1IgjhT5kScN43BfOfxL+qgcgUeTRaHgxv8tdsoe5H9UIfPJ4/wgs
-YlreWAp7AwLpLUEfxuhRg0jtvd4MOklqaFq+glegAMohgGa2lTZYmTDGTR7/W9v5
-twH+A+m4zbCnd6MfzaglK4+nW2EWz7CPfvyBDcXSe1CRi6U/DAcdu2L17TBt+4Sc
-NTspSiMFvbL4XPaveBG/P2fqDs8BWYdipfJS9PajdrtOVaTSAanU7xW0TUhXd5Z2
-ESiur7i2cJdTtG/Jfbx8BA+uJa12EQx7tup6qQ==
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://federacao.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://federacao.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://federacao.ifpi.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://federacao.ifpi.edu.br/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://federacao.ifpi.edu.br/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://federacao.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>
-      
-MIIDGDCCAgACAQAwDQYJKoZIhvcNAQEFBQAwUjEMMAoGA1UECxMDRFRJMREwDwYD
-VQQHEwhUZXJlc2luYTEOMAwGA1UECBMFUGlhdWkxCzAJBgNVBAYTAkJSMRIwEAYD
-VQQDEwlmZWRlcmFjYW8wHhcNMTQwNDE2MTYwMzI0WhcNMTkwNDE1MTYwMzI0WjBS
-MQwwCgYDVQQLEwNEVEkxETAPBgNVBAcTCFRlcmVzaW5hMQ4wDAYDVQQIEwVQaWF1
-aTELMAkGA1UEBhMCQlIxEjAQBgNVBAMTCWZlZGVyYWNhbzCCASIwDQYJKoZIhvcN
-AQEBBQADggEPADCCAQoCggEBAM+X6ZVCrx5gqcXZXUuiC5ermIFV+dcDd/6BEQN4
-ufvSfALSdZCOhFuCB2OBn1PZkGKYLMiP9uhsaYFQrNPdX7sNwJahZRnimwbbd9YZ
-uyAp5JN/DFcVxYIDtDy9Xo52pLBteqnNJuW8gWZaGUwivk8sG4IfXKuyRf6HauEK
-vwF8S63cxGG+cWEpr3OXYyhQQGpPq0AgrT/zwXEXBKUGCgWECjgV0xII09RGfkm+
-HedznbHuJc5U0J+rUneiUiTaDH9cUjG+nVuBsMRy+4aeZEolO5MN/Vr7iRP+y5om
-LysxRCvOs77sR/mNlnC8vJr+Y74YFz4I3edxsQ2coBJksasCAwEAATANBgkqhkiG
-9w0BAQUFAAOCAQEApkUH0E14hDpfCakAsJA7Du1zmvgf1uwqJ0Db5iYgjsTuvCZD
-CkyF2tRhXFUd1IgjhT5kScN43BfOfxL+qgcgUeTRaHgxv8tdsoe5H9UIfPJ4/wgs
-YlreWAp7AwLpLUEfxuhRg0jtvd4MOklqaFq+glegAMohgGa2lTZYmTDGTR7/W9v5
-twH+A+m4zbCnd6MfzaglK4+nW2EWz7CPfvyBDcXSe1CRi6U/DAcdu2L17TBt+4Sc
-NTspSiMFvbL4XPaveBG/P2fqDs8BWYdipfJS9PajdrtOVaTSAanU7xW0TUhXd5Z2
-ESiur7i2cJdTtG/Jfbx8BA+uJa12EQx7tup6qQ==
-                    
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://federacao.ifpi.edu.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://federacao.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/federacao.ifpi.edu.br.xml b/swamid-interfederations-2.0/federacao.ifpi.edu.br.xml
deleted file mode 100644
index fc607d71..00000000
--- a/swamid-interfederations-2.0/federacao.ifpi.edu.br.xml
+++ /dev/null
@@ -1,104 +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://federacao.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">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>
-    MIIDGDCCAgACAQAwDQYJKoZIhvcNAQEFBQAwUjEMMAoGA1UECxMDRFRJMREwDwYD
-VQQHEwhUZXJlc2luYTEOMAwGA1UECBMFUGlhdWkxCzAJBgNVBAYTAkJSMRIwEAYD
-VQQDEwlmZWRlcmFjYW8wHhcNMTQwNDE2MTYwMzI0WhcNMTkwNDE1MTYwMzI0WjBS
-MQwwCgYDVQQLEwNEVEkxETAPBgNVBAcTCFRlcmVzaW5hMQ4wDAYDVQQIEwVQaWF1
-aTELMAkGA1UEBhMCQlIxEjAQBgNVBAMTCWZlZGVyYWNhbzCCASIwDQYJKoZIhvcN
-AQEBBQADggEPADCCAQoCggEBAM+X6ZVCrx5gqcXZXUuiC5ermIFV+dcDd/6BEQN4
-ufvSfALSdZCOhFuCB2OBn1PZkGKYLMiP9uhsaYFQrNPdX7sNwJahZRnimwbbd9YZ
-uyAp5JN/DFcVxYIDtDy9Xo52pLBteqnNJuW8gWZaGUwivk8sG4IfXKuyRf6HauEK
-vwF8S63cxGG+cWEpr3OXYyhQQGpPq0AgrT/zwXEXBKUGCgWECjgV0xII09RGfkm+
-HedznbHuJc5U0J+rUneiUiTaDH9cUjG+nVuBsMRy+4aeZEolO5MN/Vr7iRP+y5om
-LysxRCvOs77sR/mNlnC8vJr+Y74YFz4I3edxsQ2coBJksasCAwEAATANBgkqhkiG
-9w0BAQUFAAOCAQEApkUH0E14hDpfCakAsJA7Du1zmvgf1uwqJ0Db5iYgjsTuvCZD
-CkyF2tRhXFUd1IgjhT5kScN43BfOfxL+qgcgUeTRaHgxv8tdsoe5H9UIfPJ4/wgs
-YlreWAp7AwLpLUEfxuhRg0jtvd4MOklqaFq+glegAMohgGa2lTZYmTDGTR7/W9v5
-twH+A+m4zbCnd6MfzaglK4+nW2EWz7CPfvyBDcXSe1CRi6U/DAcdu2L17TBt+4Sc
-NTspSiMFvbL4XPaveBG/P2fqDs8BWYdipfJS9PajdrtOVaTSAanU7xW0TUhXd5Z2
-ESiur7i2cJdTtG/Jfbx8BA+uJa12EQx7tup6qQ==
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://federacao.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://federacao.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://federacao.ifpi.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://federacao.ifpi.edu.br/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://federacao.ifpi.edu.br/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://federacao.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>
-      
-MIIDGDCCAgACAQAwDQYJKoZIhvcNAQEFBQAwUjEMMAoGA1UECxMDRFRJMREwDwYD
-VQQHEwhUZXJlc2luYTEOMAwGA1UECBMFUGlhdWkxCzAJBgNVBAYTAkJSMRIwEAYD
-VQQDEwlmZWRlcmFjYW8wHhcNMTQwNDE2MTYwMzI0WhcNMTkwNDE1MTYwMzI0WjBS
-MQwwCgYDVQQLEwNEVEkxETAPBgNVBAcTCFRlcmVzaW5hMQ4wDAYDVQQIEwVQaWF1
-aTELMAkGA1UEBhMCQlIxEjAQBgNVBAMTCWZlZGVyYWNhbzCCASIwDQYJKoZIhvcN
-AQEBBQADggEPADCCAQoCggEBAM+X6ZVCrx5gqcXZXUuiC5ermIFV+dcDd/6BEQN4
-ufvSfALSdZCOhFuCB2OBn1PZkGKYLMiP9uhsaYFQrNPdX7sNwJahZRnimwbbd9YZ
-uyAp5JN/DFcVxYIDtDy9Xo52pLBteqnNJuW8gWZaGUwivk8sG4IfXKuyRf6HauEK
-vwF8S63cxGG+cWEpr3OXYyhQQGpPq0AgrT/zwXEXBKUGCgWECjgV0xII09RGfkm+
-HedznbHuJc5U0J+rUneiUiTaDH9cUjG+nVuBsMRy+4aeZEolO5MN/Vr7iRP+y5om
-LysxRCvOs77sR/mNlnC8vJr+Y74YFz4I3edxsQ2coBJksasCAwEAATANBgkqhkiG
-9w0BAQUFAAOCAQEApkUH0E14hDpfCakAsJA7Du1zmvgf1uwqJ0Db5iYgjsTuvCZD
-CkyF2tRhXFUd1IgjhT5kScN43BfOfxL+qgcgUeTRaHgxv8tdsoe5H9UIfPJ4/wgs
-YlreWAp7AwLpLUEfxuhRg0jtvd4MOklqaFq+glegAMohgGa2lTZYmTDGTR7/W9v5
-twH+A+m4zbCnd6MfzaglK4+nW2EWz7CPfvyBDcXSe1CRi6U/DAcdu2L17TBt+4Sc
-NTspSiMFvbL4XPaveBG/P2fqDs8BWYdipfJS9PajdrtOVaTSAanU7xW0TUhXd5Z2
-ESiur7i2cJdTtG/Jfbx8BA+uJa12EQx7tup6qQ==
-                    
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://federacao.ifpi.edu.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://federacao.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/federacao.uvanet.br.xml b/swamid-interfederations-2.0/federacao.uvanet.br.xml
deleted file mode 100644
index 32d2d6ac..00000000
--- a/swamid-interfederations-2.0/federacao.uvanet.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://federacao.uvanet.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">uvanet.br</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">UVA - Universidade Estadual Vale do Acarau</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="pt-br">UVA - Universidade Estadual Vale do Acarau</mdui:DisplayName>
-        <mdui:Description xml:lang="en">UVA - Universidade Estadual Vale do Acarau</mdui:Description>
-        <mdui:Description xml:lang="pt-br">UVA - Universidade Estadual Vale do Acarau</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.uvanet.br</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="pt-br">http://www.uvanet.br</mdui:InformationURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-    MIIEHjCCAwYCAQAwDQYJKoZIhvcNAQEFBQAwgdQxMzAxBgNVBAoTKlVWQSAtIFVu
-aXZlcnNpZGFkZSBFc3RhZHVhbCBWYWxlIGRvIEFjYXJhdTExMC8GA1UECxMoTlRJ
-IC0gTnVjbGVvIGRlIFRlY25vbG9naWEgZGEgSW5mb3JtYWNhbzEeMBwGCSqGSIb3
-DQEJARYPYWRtaW5AdXZhbmV0LmJyMQ8wDQYDVQQHEwZTb2JyYWwxDjAMBgNVBAgT
-BUNlYXJhMQswCQYDVQQGEwJCUjEcMBoGA1UEAxMTZmVkZXJhY2FvLnV2YW5ldC5i
-cjAeFw0xMTA4MTgxMjU4MzlaFw0xNDA4MTcxMjU4MzlaMIHUMTMwMQYDVQQKEypV
-VkEgLSBVbml2ZXJzaWRhZGUgRXN0YWR1YWwgVmFsZSBkbyBBY2FyYXUxMTAvBgNV
-BAsTKE5USSAtIE51Y2xlbyBkZSBUZWNub2xvZ2lhIGRhIEluZm9ybWFjYW8xHjAc
-BgkqhkiG9w0BCQEWD2FkbWluQHV2YW5ldC5icjEPMA0GA1UEBxMGU29icmFsMQ4w
-DAYDVQQIEwVDZWFyYTELMAkGA1UEBhMCQlIxHDAaBgNVBAMTE2ZlZGVyYWNhby51
-dmFuZXQuYnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDX9eLXkZRs
-QEScuMQFE6Ymg9X8J/W692L3znagWfnz7RWI/ApoAZX2rkVZfYqz6xYG1HyLGXJJ
-fhGPH14IqUQJEABAKmZ+6TV0AbhFwOEGlFZepqq6jzP4IzRN0GeYjm6l4HaRfaaS
-oHjZ22YTiTbDOiCTWJcvw4lV7EUwqPztoLLJw9ls9PY7E0girnJ4i/FoW3LkksyS
-n0u7FUUciLDmPLEVi9iUhzyFW/wYGYSikEH3I1oyx+wjc69P7V1l+3BK/6VBii1H
-V4QKbITQAOXlCo9m/p+inJNO6E/kg8qtmpit6H1er8pqDpN7iXlS8NvnX63SHBGq
-6mw66PajU1/FAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBAMSBhQfPNQOrbPbGtN0F
-WNBGGSNUfkdesvTV9tHBbWgpSIn4EIYDN5rNK8q3iQj9i2WQF531zIp5fOV+R2ZN
-V+5XLkulhtj/gjEnog5/TJ7tzMtUQhEF600HlWXE4o4ixXYpMzMwB4p02I/f+I9O
-pPpZnB0vYkjX9QtejNHcFQf69lOWqdboQZp7FKFAHY3sQLcLgNXW0MMYeMGqKSVj
-mjCYyILaA11HhjJuKlxDQctcDJdDr1svJd069WwqV6nKR4j9UphwIo35zvAQfFHY
-KVSCl0NbXTjhxHNeopXycIvzjwNFcxypw2Ub+zHK2AvNvkL4BpE8NtuV5fpIXsAg
-zPE=
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://federacao.uvanet.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://federacao.uvanet.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://federacao.uvanet.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://federacao.uvanet.br/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://federacao.uvanet.br/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://federacao.uvanet.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">uvanet.br</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-      
-MIIEHjCCAwYCAQAwDQYJKoZIhvcNAQEFBQAwgdQxMzAxBgNVBAoTKlVWQSAtIFVu
-aXZlcnNpZGFkZSBFc3RhZHVhbCBWYWxlIGRvIEFjYXJhdTExMC8GA1UECxMoTlRJ
-IC0gTnVjbGVvIGRlIFRlY25vbG9naWEgZGEgSW5mb3JtYWNhbzEeMBwGCSqGSIb3
-DQEJARYPYWRtaW5AdXZhbmV0LmJyMQ8wDQYDVQQHEwZTb2JyYWwxDjAMBgNVBAgT
-BUNlYXJhMQswCQYDVQQGEwJCUjEcMBoGA1UEAxMTZmVkZXJhY2FvLnV2YW5ldC5i
-cjAeFw0xMTA4MTgxMjU4MzlaFw0xNDA4MTcxMjU4MzlaMIHUMTMwMQYDVQQKEypV
-VkEgLSBVbml2ZXJzaWRhZGUgRXN0YWR1YWwgVmFsZSBkbyBBY2FyYXUxMTAvBgNV
-BAsTKE5USSAtIE51Y2xlbyBkZSBUZWNub2xvZ2lhIGRhIEluZm9ybWFjYW8xHjAc
-BgkqhkiG9w0BCQEWD2FkbWluQHV2YW5ldC5icjEPMA0GA1UEBxMGU29icmFsMQ4w
-DAYDVQQIEwVDZWFyYTELMAkGA1UEBhMCQlIxHDAaBgNVBAMTE2ZlZGVyYWNhby51
-dmFuZXQuYnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDX9eLXkZRs
-QEScuMQFE6Ymg9X8J/W692L3znagWfnz7RWI/ApoAZX2rkVZfYqz6xYG1HyLGXJJ
-fhGPH14IqUQJEABAKmZ+6TV0AbhFwOEGlFZepqq6jzP4IzRN0GeYjm6l4HaRfaaS
-oHjZ22YTiTbDOiCTWJcvw4lV7EUwqPztoLLJw9ls9PY7E0girnJ4i/FoW3LkksyS
-n0u7FUUciLDmPLEVi9iUhzyFW/wYGYSikEH3I1oyx+wjc69P7V1l+3BK/6VBii1H
-V4QKbITQAOXlCo9m/p+inJNO6E/kg8qtmpit6H1er8pqDpN7iXlS8NvnX63SHBGq
-6mw66PajU1/FAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBAMSBhQfPNQOrbPbGtN0F
-WNBGGSNUfkdesvTV9tHBbWgpSIn4EIYDN5rNK8q3iQj9i2WQF531zIp5fOV+R2ZN
-V+5XLkulhtj/gjEnog5/TJ7tzMtUQhEF600HlWXE4o4ixXYpMzMwB4p02I/f+I9O
-pPpZnB0vYkjX9QtejNHcFQf69lOWqdboQZp7FKFAHY3sQLcLgNXW0MMYeMGqKSVj
-mjCYyILaA11HhjJuKlxDQctcDJdDr1svJd069WwqV6nKR4j9UphwIo35zvAQfFHY
-KVSCl0NbXTjhxHNeopXycIvzjwNFcxypw2Ub+zHK2AvNvkL4BpE8NtuV5fpIXsAg
-zPE=
-                    
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://federacao.uvanet.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://federacao.uvanet.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">UVA - Universidade Estadual Vale do Acarau</OrganizationName>
-    <OrganizationName xml:lang="pt-br">UVA - Universidade Estadual Vale do Acarau</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">UVA - Universidade Estadual Vale do Acarau</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="pt-br">UVA - Universidade Estadual Vale do Acarau</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.uvanet.br</OrganizationURL>
-    <OrganizationURL xml:lang="pt-br">http://www.uvanet.br</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Antonio Kleyson Prado Pereira</SurName>
-    <EmailAddress>kleyson.prado@uvanet.br</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/federation-identite.univ-paris13.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/federation-identite.univ-paris13.fr-idp-shibboleth.xml
deleted file mode 100644
index 0d9e1251..00000000
--- a/swamid-interfederations-2.0/federation-identite.univ-paris13.fr-idp-shibboleth.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://federation-identite.univ-paris13.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2010-10-27T17:00:46Z">
-      <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">univ-paris13.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">University Paris 13</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Members of University Paris 13 (Students, Teaching staff, Researchers and Administrative and Technical staff)</mdui:Description>
-        <mdui:DisplayName xml:lang="fr">Université Paris 13</mdui:DisplayName>
-        <mdui:Description xml:lang="fr">Personnes membres de l'Université Paris 13 (Etudiants, Personnels, Enseignants, Enseignants-Chercheurs, Chercheurs).</mdui:Description>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDejCCAmKgAwIBAgIVAK7XWBt0cfWGEv/HUzJRJYhKWFD6MA0GCSqGSIb3DQEB
-BQUAMC4xLDAqBgNVBAMTI2ZlZGVyYXRpb24taWRlbnRpdGUudW5pdi1wYXJpczEz
-LmZyMB4XDTEwMTAyMzEyMTExNFoXDTMwMTAyMzEyMTExNFowLjEsMCoGA1UEAxMj
-ZmVkZXJhdGlvbi1pZGVudGl0ZS51bml2LXBhcmlzMTMuZnIwggEiMA0GCSqGSIb3
-DQEBAQUAA4IBDwAwggEKAoIBAQCc/y6YY56o8yN7kpm+WTki591jEzoyfZhI883X
-RMP54gc9B/YlMvhOX0c3yKxsAA9DGZqhC3IpzhNIwEqZdznaDtLyb8qfExgP37zU
-sKJlqU3fmiZ3PLB1H3MKMu850bQpxcY9mQnboBSfwybTkiggCei2uVls8dgDhr6O
-M/JkWo2JzAnBKYP8B1nEG3Ynabbk1ncktx1XlUb5Ar7L33GXSBHZmZjQczgifXbl
-euOjVRlBJodDaQS0dZMKVvEWxPIU2n0Kd7leiWrVe9UJgIOlc9XPCX0EXfNb90fx
-z5anJggWlCClzAI2BNPM1BlTk+Sf0B4j0Df250uvsqM+6dUjAgMBAAGjgY4wgYsw
-agYDVR0RBGMwYYIjZmVkZXJhdGlvbi1pZGVudGl0ZS51bml2LXBhcmlzMTMuZnKG
-Omh0dHBzOi8vZmVkZXJhdGlvbi1pZGVudGl0ZS51bml2LXBhcmlzMTMuZnIvaWRw
-L3NoaWJib2xldGgwHQYDVR0OBBYEFPPj9MEZxWRXVouk6e4gI+J1lfjsMA0GCSqG
-SIb3DQEBBQUAA4IBAQAIvX5H/FQEOM68IPlr/uhjuDKEhngLhPp/oJB2rewP6ryS
-PtgXpCpFVF2LKK5WJGtoXtpAxHg5DFz1UVvcCG2ELivEtZa0L15DxQNQRCkx9ot2
-z4FPpojZ5AfAzJixC8QxXL6Em97K5iJic1cin5oRNaX5TJBki5VVGpy1HGJuw2jT
-rk2djX0eDw4AXkvCk9v20rg2f/JQtCu7Ai1rlRzHzq1bAhaepZmdXOBedBSiPTlX
-HtqWfXo71mMZC74xUh+ctHhBLqZJ8oKWIif43XpoA5ZXUsgSKKQ11d+l8l9UEFDQ
-0pZI2DZg+vSvz1Lncsgyiuy4FDU0VFXEc+gRL3aZ
-					    </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://federation-identite.univ-paris13.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://federation-identite.univ-paris13.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://federation-identite.univ-paris13.fr/idp/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Université Paris 13</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Université Paris 13</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <EmailAddress>fed-contact@univ-paris13.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/federation-identite.univ-paris13.fr.xml b/swamid-interfederations-2.0/federation-identite.univ-paris13.fr.xml
deleted file mode 100644
index 0d9e1251..00000000
--- a/swamid-interfederations-2.0/federation-identite.univ-paris13.fr.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://federation-identite.univ-paris13.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2010-10-27T17:00:46Z">
-      <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">univ-paris13.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">University Paris 13</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Members of University Paris 13 (Students, Teaching staff, Researchers and Administrative and Technical staff)</mdui:Description>
-        <mdui:DisplayName xml:lang="fr">Université Paris 13</mdui:DisplayName>
-        <mdui:Description xml:lang="fr">Personnes membres de l'Université Paris 13 (Etudiants, Personnels, Enseignants, Enseignants-Chercheurs, Chercheurs).</mdui:Description>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDejCCAmKgAwIBAgIVAK7XWBt0cfWGEv/HUzJRJYhKWFD6MA0GCSqGSIb3DQEB
-BQUAMC4xLDAqBgNVBAMTI2ZlZGVyYXRpb24taWRlbnRpdGUudW5pdi1wYXJpczEz
-LmZyMB4XDTEwMTAyMzEyMTExNFoXDTMwMTAyMzEyMTExNFowLjEsMCoGA1UEAxMj
-ZmVkZXJhdGlvbi1pZGVudGl0ZS51bml2LXBhcmlzMTMuZnIwggEiMA0GCSqGSIb3
-DQEBAQUAA4IBDwAwggEKAoIBAQCc/y6YY56o8yN7kpm+WTki591jEzoyfZhI883X
-RMP54gc9B/YlMvhOX0c3yKxsAA9DGZqhC3IpzhNIwEqZdznaDtLyb8qfExgP37zU
-sKJlqU3fmiZ3PLB1H3MKMu850bQpxcY9mQnboBSfwybTkiggCei2uVls8dgDhr6O
-M/JkWo2JzAnBKYP8B1nEG3Ynabbk1ncktx1XlUb5Ar7L33GXSBHZmZjQczgifXbl
-euOjVRlBJodDaQS0dZMKVvEWxPIU2n0Kd7leiWrVe9UJgIOlc9XPCX0EXfNb90fx
-z5anJggWlCClzAI2BNPM1BlTk+Sf0B4j0Df250uvsqM+6dUjAgMBAAGjgY4wgYsw
-agYDVR0RBGMwYYIjZmVkZXJhdGlvbi1pZGVudGl0ZS51bml2LXBhcmlzMTMuZnKG
-Omh0dHBzOi8vZmVkZXJhdGlvbi1pZGVudGl0ZS51bml2LXBhcmlzMTMuZnIvaWRw
-L3NoaWJib2xldGgwHQYDVR0OBBYEFPPj9MEZxWRXVouk6e4gI+J1lfjsMA0GCSqG
-SIb3DQEBBQUAA4IBAQAIvX5H/FQEOM68IPlr/uhjuDKEhngLhPp/oJB2rewP6ryS
-PtgXpCpFVF2LKK5WJGtoXtpAxHg5DFz1UVvcCG2ELivEtZa0L15DxQNQRCkx9ot2
-z4FPpojZ5AfAzJixC8QxXL6Em97K5iJic1cin5oRNaX5TJBki5VVGpy1HGJuw2jT
-rk2djX0eDw4AXkvCk9v20rg2f/JQtCu7Ai1rlRzHzq1bAhaepZmdXOBedBSiPTlX
-HtqWfXo71mMZC74xUh+ctHhBLqZJ8oKWIif43XpoA5ZXUsgSKKQ11d+l8l9UEFDQ
-0pZI2DZg+vSvz1Lncsgyiuy4FDU0VFXEc+gRL3aZ
-					    </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://federation-identite.univ-paris13.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://federation-identite.univ-paris13.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://federation-identite.univ-paris13.fr/idp/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Université Paris 13</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Université Paris 13</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <EmailAddress>fed-contact@univ-paris13.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/federation.agrocampus-ouest.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/federation.agrocampus-ouest.fr-idp-shibboleth.xml
deleted file mode 100644
index 472e3e32..00000000
--- a/swamid-interfederations-2.0/federation.agrocampus-ouest.fr-idp-shibboleth.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://federation.agrocampus-ouest.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2013-02-27T17:16:43Z">
-      <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">agrocampus-ouest.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">AGROCAMPUS OUEST</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDZjCCAk6gAwIBAgIVALlE+KiCBNQALvnetyzr7WFhuKaRMA0GCSqGSIb3DQEB
-BQUAMCkxJzAlBgNVBAMTHmZlZGVyYXRpb24uYWdyb2NhbXB1cy1vdWVzdC5mcjAe
-Fw0xMjEyMjAxMDE4MzBaFw0zMjEyMjAxMDE4MzBaMCkxJzAlBgNVBAMTHmZlZGVy
-YXRpb24uYWdyb2NhbXB1cy1vdWVzdC5mcjCCASIwDQYJKoZIhvcNAQEBBQADggEP
-ADCCAQoCggEBAMojdY5dsi66PVE/E/BJ+JMLKFX1DXfjr1EhuN6EL2iDQRX6yn3+
-cU4ng5pBxf7f/il3ClFAkshpIoSGbqzcfeS67N9pxhD0yAD/s3ljoFQ7UP5VoCvI
-iYaPcPSCzEmUguCyWoZctNQBSNqZJOiYpy0QJqHtXge3CiD7cF4xQK+lJxxFBtkW
-74vtAG9f0MIyhioBRqAlwfHF1v3WuWk7E+5P6jqWS2iVs6eG88tNZdXfzW9faDPj
-8/h5XMWUsQXzQ2V1c0oT1Zva7aSix6t7+DxW4OwHR8BkeTxs/hVuigr8FcR12KmT
-0DxDCUiiXtefGjgTa+pCagTXoyEklnihrtsCAwEAAaOBhDCBgTBgBgNVHREEWTBX
-gh5mZWRlcmF0aW9uLmFncm9jYW1wdXMtb3Vlc3QuZnKGNWh0dHBzOi8vZmVkZXJh
-dGlvbi5hZ3JvY2FtcHVzLW91ZXN0LmZyL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQW
-BBTXOuWNbcdej3DUhAmdgQvMWVquFDANBgkqhkiG9w0BAQUFAAOCAQEAf6fKMGX4
-N304qzgFikEqzsksyCK0WTN7U5U8FAHUUFbh8Fh026uYbopScyQcZ/ylJdUB7h0N
-CXbbce96Y7WXwZBdtMlMDya7hMzCaCgsuNqFLSXnh1HhuWKG7K5zBy50wLuHEBx+
-McIqs5yi8GpYWmS6sVE8EVZetU62NaiA2t3hgqPkCodjYQkVkd3x576bjaqmhbr6
-XZdv1L/uqqycvp33bKDQ43435KdThNlpjWWtu3LQ1akUBJ31dv8gAwUha2xX6kU8
-2MCUHWkgnXy+8hvKPj5LOXuJ4W44Y6Tvt5LxNGh5Mt8srDpZt8ivktQ9oa+PjXob
-5Adfu8PBDYuGpA==
-					    </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://federation.agrocampus-ouest.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://federation.agrocampus-ouest.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://federation.agrocampus-ouest.fr/idp/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">AGROCAMPUS OUEST</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">AGROCAMPUS OUEST</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Lionel DURANDET</SurName>
-    <EmailAddress>lionel.durandet@agrocampus-ouest.fr</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <SurName>Emmanuel DOLLÉ</SurName>
-    <EmailAddress>emmanuel.dolle@agrocampus-ouest.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/federation.agrocampus-ouest.fr.xml b/swamid-interfederations-2.0/federation.agrocampus-ouest.fr.xml
deleted file mode 100644
index 472e3e32..00000000
--- a/swamid-interfederations-2.0/federation.agrocampus-ouest.fr.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://federation.agrocampus-ouest.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2013-02-27T17:16:43Z">
-      <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">agrocampus-ouest.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">AGROCAMPUS OUEST</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDZjCCAk6gAwIBAgIVALlE+KiCBNQALvnetyzr7WFhuKaRMA0GCSqGSIb3DQEB
-BQUAMCkxJzAlBgNVBAMTHmZlZGVyYXRpb24uYWdyb2NhbXB1cy1vdWVzdC5mcjAe
-Fw0xMjEyMjAxMDE4MzBaFw0zMjEyMjAxMDE4MzBaMCkxJzAlBgNVBAMTHmZlZGVy
-YXRpb24uYWdyb2NhbXB1cy1vdWVzdC5mcjCCASIwDQYJKoZIhvcNAQEBBQADggEP
-ADCCAQoCggEBAMojdY5dsi66PVE/E/BJ+JMLKFX1DXfjr1EhuN6EL2iDQRX6yn3+
-cU4ng5pBxf7f/il3ClFAkshpIoSGbqzcfeS67N9pxhD0yAD/s3ljoFQ7UP5VoCvI
-iYaPcPSCzEmUguCyWoZctNQBSNqZJOiYpy0QJqHtXge3CiD7cF4xQK+lJxxFBtkW
-74vtAG9f0MIyhioBRqAlwfHF1v3WuWk7E+5P6jqWS2iVs6eG88tNZdXfzW9faDPj
-8/h5XMWUsQXzQ2V1c0oT1Zva7aSix6t7+DxW4OwHR8BkeTxs/hVuigr8FcR12KmT
-0DxDCUiiXtefGjgTa+pCagTXoyEklnihrtsCAwEAAaOBhDCBgTBgBgNVHREEWTBX
-gh5mZWRlcmF0aW9uLmFncm9jYW1wdXMtb3Vlc3QuZnKGNWh0dHBzOi8vZmVkZXJh
-dGlvbi5hZ3JvY2FtcHVzLW91ZXN0LmZyL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQW
-BBTXOuWNbcdej3DUhAmdgQvMWVquFDANBgkqhkiG9w0BAQUFAAOCAQEAf6fKMGX4
-N304qzgFikEqzsksyCK0WTN7U5U8FAHUUFbh8Fh026uYbopScyQcZ/ylJdUB7h0N
-CXbbce96Y7WXwZBdtMlMDya7hMzCaCgsuNqFLSXnh1HhuWKG7K5zBy50wLuHEBx+
-McIqs5yi8GpYWmS6sVE8EVZetU62NaiA2t3hgqPkCodjYQkVkd3x576bjaqmhbr6
-XZdv1L/uqqycvp33bKDQ43435KdThNlpjWWtu3LQ1akUBJ31dv8gAwUha2xX6kU8
-2MCUHWkgnXy+8hvKPj5LOXuJ4W44Y6Tvt5LxNGh5Mt8srDpZt8ivktQ9oa+PjXob
-5Adfu8PBDYuGpA==
-					    </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://federation.agrocampus-ouest.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://federation.agrocampus-ouest.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://federation.agrocampus-ouest.fr/idp/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">AGROCAMPUS OUEST</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">AGROCAMPUS OUEST</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Lionel DURANDET</SurName>
-    <EmailAddress>lionel.durandet@agrocampus-ouest.fr</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <SurName>Emmanuel DOLLÉ</SurName>
-    <EmailAddress>emmanuel.dolle@agrocampus-ouest.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/federation.bretagne.iufm.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/federation.bretagne.iufm.fr-idp-shibboleth.xml
deleted file mode 100644
index 01579065..00000000
--- a/swamid-interfederations-2.0/federation.bretagne.iufm.fr-idp-shibboleth.xml
+++ /dev/null
@@ -1,155 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://federation.bretagne.iufm.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2009-10-12T16:14:58Z">
-      <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">bretagne.iufm.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">IUFM de Bretagne</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIErDCCA5SgAwIBAgIQRmz9EXsKgXSG7w3iHBAacTANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTEwMDQwODAwMDAwMFoXDTEzMDQwNzIzNTk1OVowfDELMAkGA1UE
-BhMCRlIxDjAMBgNVBAcTBUJyZXN0MRwwGgYDVQQKExNVTklWRVJTSVRFIERFIEJS
-RVNUMRkwFwYDVQQLExBJVUZNIGRlIEJyZXRhZ25lMSQwIgYDVQQDExtmZWRlcmF0
-aW9uLmJyZXRhZ25lLml1Zm0uZnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
-AoIBAQC9io/anctVdl1XJKVAOdH/smD4k5iu6z/izJwt32LXFSgs5KLYi7pUThAv
-awK8Iky5+60HAXI6Oyxj4GYY9+2mlyjTi+HXeE4BeIUzznGFcp0tL+Iz3WrY5x+P
-HQaR9YdjhRbe72jyGPA0lnS6OI7dxJaI18IXqh8nmcS1uJcxyFBsRG9MGVX2PWWZ
-8hB3TEL3vNybl59VOltoAjm1m2NikQK70Hr6w+TofDEmht0qAubTWLN7c9v2UGos
-+/Z1qfAJTZ5En4eG0V2z2NHDwcqbg8dUjUVgmw05aIkhS1ecIp9EkRLdUzbyh5aY
-yFXaM/6L77+BqHTSswf6X4sKjn9NAgMBAAGjggFuMIIBajAfBgNVHSMEGDAWgBQM
-vZNoDPPeq6NJays3V0fqkOO57TAdBgNVHQ4EFgQUzLxiXZeukJyQudQQyHUqS7vX
-9XwwDgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYB
-BQUHAwEGCCsGAQUFBwMCMBgGA1UdIAQRMA8wDQYLKwYBBAGyMQECAh0wOgYDVR0f
-BDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xD
-QS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRj
-cy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDov
-L29jc3AudGNzLnRlcmVuYS5vcmcwJgYDVR0RBB8wHYIbZmVkZXJhdGlvbi5icmV0
-YWduZS5pdWZtLmZyMA0GCSqGSIb3DQEBBQUAA4IBAQChVtxeBUo5Y/kZfvLjKZB2
-lgotm/dUiZHxscZRh/Rcnb37Eo9NcuA3UbY9IjkUbS3p1VbLtfFQxjK7SEa/z0ry
-qxZy9/94Zs43Ntpm2XijY5uL9x6pykzLVFDLG3ZdpnrnJz3MMC6wtF14VcOTwfjm
-10hAOLHnc4xuPCEKBZMTeeNaBmARfnbrBiv0cdWI74sE0hJbq2W7e3/atzwvH1O4
-LJWCNOb6ewDwXycbnYzCnEvL1z34BTU6GAb4t4yEjQEyPmqOTMbHeE/TD9//7LO6
-HF+7wdprWF0e2/C+accIlza8LuwyPv+M5K2Q6XonBrAbHEuWJTFfJ9CxkzK9oj5+
-					    </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>
-					      MIIDVzCCAj+gAwIBAgIUd6NolqLYTp7E8s7GebWrv9/qRnMwDQYJKoZIhvcNAQEF
-BQAwJjEkMCIGA1UEAxMbZmVkZXJhdGlvbi5icmV0YWduZS5pdWZtLmZyMB4XDTA5
-MDYxMDE1NTQ0OFoXDTI5MDYxMDE1NTQ0OFowJjEkMCIGA1UEAxMbZmVkZXJhdGlv
-bi5icmV0YWduZS5pdWZtLmZyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
-AQEAjDPeB1kiK19n/njLD+Wxu1PEHVzdWJfVqfFQd011OON9Mw1sxL083/rcXrHE
-zPgcgUDHVq98OZfGNFJIRsyQyf+YDqvH8v3xBkSqEgkiypaOSBlrMNFeU5zUsvUm
-R8l4LUAXOTpT7Ok5ZcdAQcqlrEWKBszAkUw4d4ERvAvK3x78pczppg5cD9yfH/2e
-dDC7eZc0X8/mjeN8adSZC1lSfYo1xjCPQm02cGOyGmx8XeWqOr+FrdBjZsec+e5d
-Y0Q0n/aGfEe1SgOlar8FsnZfWCF8STLU0zi6jpqCyDXrmKTsmwcIjI0Gc91NlfwT
-NzpPTfQpB56t1fT3WedN+fUztQIDAQABo30wezBaBgNVHREEUzBRghtmZWRlcmF0
-aW9uLmJyZXRhZ25lLml1Zm0uZnKGMmh0dHBzOi8vZmVkZXJhdGlvbi5icmV0YWdu
-ZS5pdWZtLmZyL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBRtZOuWaCjO08kcj5Vs
-OOPhfUIolDANBgkqhkiG9w0BAQUFAAOCAQEAFUIZfk5kOBw9irRVuZRtdGzTfpB0
-vaqkd8IecQ6zQYJEz9M9WOVdMFQEv5mcEsjyKCyPUiF6SthecpSZElCASqJWu7Vn
-bneyuEHau7RVbzISMwFT+VtFhQfKMXRXWvMV1gpNNUJYg1VCZDYbMhBNfMgnmGVo
-1CJdAUzq9CI3xQlxZlkpoo+eyBbpYMnrXShVH2G8yrBOAX7lkZziJCwnZ0lvv8N0
-bNN2zAnAvAFIkUzRF/Tbl8cx9v95S8o1eI069pS87/eoNI5KUbXmUMlnzYOtLrkm
-VjJTppfg6Lmhe4fn7LzZPUC5m4MO7POVNVZA31BhxIakHzVXuofK0gUjVQ==
-					    </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://federation.bretagne.iufm.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://federation.bretagne.iufm.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://federation.bretagne.iufm.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">bretagne.iufm.fr</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIErDCCA5SgAwIBAgIQRmz9EXsKgXSG7w3iHBAacTANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTEwMDQwODAwMDAwMFoXDTEzMDQwNzIzNTk1OVowfDELMAkGA1UE
-BhMCRlIxDjAMBgNVBAcTBUJyZXN0MRwwGgYDVQQKExNVTklWRVJTSVRFIERFIEJS
-RVNUMRkwFwYDVQQLExBJVUZNIGRlIEJyZXRhZ25lMSQwIgYDVQQDExtmZWRlcmF0
-aW9uLmJyZXRhZ25lLml1Zm0uZnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
-AoIBAQC9io/anctVdl1XJKVAOdH/smD4k5iu6z/izJwt32LXFSgs5KLYi7pUThAv
-awK8Iky5+60HAXI6Oyxj4GYY9+2mlyjTi+HXeE4BeIUzznGFcp0tL+Iz3WrY5x+P
-HQaR9YdjhRbe72jyGPA0lnS6OI7dxJaI18IXqh8nmcS1uJcxyFBsRG9MGVX2PWWZ
-8hB3TEL3vNybl59VOltoAjm1m2NikQK70Hr6w+TofDEmht0qAubTWLN7c9v2UGos
-+/Z1qfAJTZ5En4eG0V2z2NHDwcqbg8dUjUVgmw05aIkhS1ecIp9EkRLdUzbyh5aY
-yFXaM/6L77+BqHTSswf6X4sKjn9NAgMBAAGjggFuMIIBajAfBgNVHSMEGDAWgBQM
-vZNoDPPeq6NJays3V0fqkOO57TAdBgNVHQ4EFgQUzLxiXZeukJyQudQQyHUqS7vX
-9XwwDgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYB
-BQUHAwEGCCsGAQUFBwMCMBgGA1UdIAQRMA8wDQYLKwYBBAGyMQECAh0wOgYDVR0f
-BDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xD
-QS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRj
-cy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDov
-L29jc3AudGNzLnRlcmVuYS5vcmcwJgYDVR0RBB8wHYIbZmVkZXJhdGlvbi5icmV0
-YWduZS5pdWZtLmZyMA0GCSqGSIb3DQEBBQUAA4IBAQChVtxeBUo5Y/kZfvLjKZB2
-lgotm/dUiZHxscZRh/Rcnb37Eo9NcuA3UbY9IjkUbS3p1VbLtfFQxjK7SEa/z0ry
-qxZy9/94Zs43Ntpm2XijY5uL9x6pykzLVFDLG3ZdpnrnJz3MMC6wtF14VcOTwfjm
-10hAOLHnc4xuPCEKBZMTeeNaBmARfnbrBiv0cdWI74sE0hJbq2W7e3/atzwvH1O4
-LJWCNOb6ewDwXycbnYzCnEvL1z34BTU6GAb4t4yEjQEyPmqOTMbHeE/TD9//7LO6
-HF+7wdprWF0e2/C+accIlza8LuwyPv+M5K2Q6XonBrAbHEuWJTFfJ9CxkzK9oj5+
-					    </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>
-					      MIIDVzCCAj+gAwIBAgIUd6NolqLYTp7E8s7GebWrv9/qRnMwDQYJKoZIhvcNAQEF
-BQAwJjEkMCIGA1UEAxMbZmVkZXJhdGlvbi5icmV0YWduZS5pdWZtLmZyMB4XDTA5
-MDYxMDE1NTQ0OFoXDTI5MDYxMDE1NTQ0OFowJjEkMCIGA1UEAxMbZmVkZXJhdGlv
-bi5icmV0YWduZS5pdWZtLmZyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
-AQEAjDPeB1kiK19n/njLD+Wxu1PEHVzdWJfVqfFQd011OON9Mw1sxL083/rcXrHE
-zPgcgUDHVq98OZfGNFJIRsyQyf+YDqvH8v3xBkSqEgkiypaOSBlrMNFeU5zUsvUm
-R8l4LUAXOTpT7Ok5ZcdAQcqlrEWKBszAkUw4d4ERvAvK3x78pczppg5cD9yfH/2e
-dDC7eZc0X8/mjeN8adSZC1lSfYo1xjCPQm02cGOyGmx8XeWqOr+FrdBjZsec+e5d
-Y0Q0n/aGfEe1SgOlar8FsnZfWCF8STLU0zi6jpqCyDXrmKTsmwcIjI0Gc91NlfwT
-NzpPTfQpB56t1fT3WedN+fUztQIDAQABo30wezBaBgNVHREEUzBRghtmZWRlcmF0
-aW9uLmJyZXRhZ25lLml1Zm0uZnKGMmh0dHBzOi8vZmVkZXJhdGlvbi5icmV0YWdu
-ZS5pdWZtLmZyL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBRtZOuWaCjO08kcj5Vs
-OOPhfUIolDANBgkqhkiG9w0BAQUFAAOCAQEAFUIZfk5kOBw9irRVuZRtdGzTfpB0
-vaqkd8IecQ6zQYJEz9M9WOVdMFQEv5mcEsjyKCyPUiF6SthecpSZElCASqJWu7Vn
-bneyuEHau7RVbzISMwFT+VtFhQfKMXRXWvMV1gpNNUJYg1VCZDYbMhBNfMgnmGVo
-1CJdAUzq9CI3xQlxZlkpoo+eyBbpYMnrXShVH2G8yrBOAX7lkZziJCwnZ0lvv8N0
-bNN2zAnAvAFIkUzRF/Tbl8cx9v95S8o1eI069pS87/eoNI5KUbXmUMlnzYOtLrkm
-VjJTppfg6Lmhe4fn7LzZPUC5m4MO7POVNVZA31BhxIakHzVXuofK0gUjVQ==
-					    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://federation.bretagne.iufm.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">IUFM de Bretagne</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">IUFM de Bretagne</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <EmailAddress>federation@espe-bretagne.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/federation.bretagne.iufm.fr.xml b/swamid-interfederations-2.0/federation.bretagne.iufm.fr.xml
deleted file mode 100644
index 01579065..00000000
--- a/swamid-interfederations-2.0/federation.bretagne.iufm.fr.xml
+++ /dev/null
@@ -1,155 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://federation.bretagne.iufm.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2009-10-12T16:14:58Z">
-      <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">bretagne.iufm.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">IUFM de Bretagne</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIErDCCA5SgAwIBAgIQRmz9EXsKgXSG7w3iHBAacTANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTEwMDQwODAwMDAwMFoXDTEzMDQwNzIzNTk1OVowfDELMAkGA1UE
-BhMCRlIxDjAMBgNVBAcTBUJyZXN0MRwwGgYDVQQKExNVTklWRVJTSVRFIERFIEJS
-RVNUMRkwFwYDVQQLExBJVUZNIGRlIEJyZXRhZ25lMSQwIgYDVQQDExtmZWRlcmF0
-aW9uLmJyZXRhZ25lLml1Zm0uZnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
-AoIBAQC9io/anctVdl1XJKVAOdH/smD4k5iu6z/izJwt32LXFSgs5KLYi7pUThAv
-awK8Iky5+60HAXI6Oyxj4GYY9+2mlyjTi+HXeE4BeIUzznGFcp0tL+Iz3WrY5x+P
-HQaR9YdjhRbe72jyGPA0lnS6OI7dxJaI18IXqh8nmcS1uJcxyFBsRG9MGVX2PWWZ
-8hB3TEL3vNybl59VOltoAjm1m2NikQK70Hr6w+TofDEmht0qAubTWLN7c9v2UGos
-+/Z1qfAJTZ5En4eG0V2z2NHDwcqbg8dUjUVgmw05aIkhS1ecIp9EkRLdUzbyh5aY
-yFXaM/6L77+BqHTSswf6X4sKjn9NAgMBAAGjggFuMIIBajAfBgNVHSMEGDAWgBQM
-vZNoDPPeq6NJays3V0fqkOO57TAdBgNVHQ4EFgQUzLxiXZeukJyQudQQyHUqS7vX
-9XwwDgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYB
-BQUHAwEGCCsGAQUFBwMCMBgGA1UdIAQRMA8wDQYLKwYBBAGyMQECAh0wOgYDVR0f
-BDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xD
-QS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRj
-cy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDov
-L29jc3AudGNzLnRlcmVuYS5vcmcwJgYDVR0RBB8wHYIbZmVkZXJhdGlvbi5icmV0
-YWduZS5pdWZtLmZyMA0GCSqGSIb3DQEBBQUAA4IBAQChVtxeBUo5Y/kZfvLjKZB2
-lgotm/dUiZHxscZRh/Rcnb37Eo9NcuA3UbY9IjkUbS3p1VbLtfFQxjK7SEa/z0ry
-qxZy9/94Zs43Ntpm2XijY5uL9x6pykzLVFDLG3ZdpnrnJz3MMC6wtF14VcOTwfjm
-10hAOLHnc4xuPCEKBZMTeeNaBmARfnbrBiv0cdWI74sE0hJbq2W7e3/atzwvH1O4
-LJWCNOb6ewDwXycbnYzCnEvL1z34BTU6GAb4t4yEjQEyPmqOTMbHeE/TD9//7LO6
-HF+7wdprWF0e2/C+accIlza8LuwyPv+M5K2Q6XonBrAbHEuWJTFfJ9CxkzK9oj5+
-					    </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>
-					      MIIDVzCCAj+gAwIBAgIUd6NolqLYTp7E8s7GebWrv9/qRnMwDQYJKoZIhvcNAQEF
-BQAwJjEkMCIGA1UEAxMbZmVkZXJhdGlvbi5icmV0YWduZS5pdWZtLmZyMB4XDTA5
-MDYxMDE1NTQ0OFoXDTI5MDYxMDE1NTQ0OFowJjEkMCIGA1UEAxMbZmVkZXJhdGlv
-bi5icmV0YWduZS5pdWZtLmZyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
-AQEAjDPeB1kiK19n/njLD+Wxu1PEHVzdWJfVqfFQd011OON9Mw1sxL083/rcXrHE
-zPgcgUDHVq98OZfGNFJIRsyQyf+YDqvH8v3xBkSqEgkiypaOSBlrMNFeU5zUsvUm
-R8l4LUAXOTpT7Ok5ZcdAQcqlrEWKBszAkUw4d4ERvAvK3x78pczppg5cD9yfH/2e
-dDC7eZc0X8/mjeN8adSZC1lSfYo1xjCPQm02cGOyGmx8XeWqOr+FrdBjZsec+e5d
-Y0Q0n/aGfEe1SgOlar8FsnZfWCF8STLU0zi6jpqCyDXrmKTsmwcIjI0Gc91NlfwT
-NzpPTfQpB56t1fT3WedN+fUztQIDAQABo30wezBaBgNVHREEUzBRghtmZWRlcmF0
-aW9uLmJyZXRhZ25lLml1Zm0uZnKGMmh0dHBzOi8vZmVkZXJhdGlvbi5icmV0YWdu
-ZS5pdWZtLmZyL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBRtZOuWaCjO08kcj5Vs
-OOPhfUIolDANBgkqhkiG9w0BAQUFAAOCAQEAFUIZfk5kOBw9irRVuZRtdGzTfpB0
-vaqkd8IecQ6zQYJEz9M9WOVdMFQEv5mcEsjyKCyPUiF6SthecpSZElCASqJWu7Vn
-bneyuEHau7RVbzISMwFT+VtFhQfKMXRXWvMV1gpNNUJYg1VCZDYbMhBNfMgnmGVo
-1CJdAUzq9CI3xQlxZlkpoo+eyBbpYMnrXShVH2G8yrBOAX7lkZziJCwnZ0lvv8N0
-bNN2zAnAvAFIkUzRF/Tbl8cx9v95S8o1eI069pS87/eoNI5KUbXmUMlnzYOtLrkm
-VjJTppfg6Lmhe4fn7LzZPUC5m4MO7POVNVZA31BhxIakHzVXuofK0gUjVQ==
-					    </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://federation.bretagne.iufm.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://federation.bretagne.iufm.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://federation.bretagne.iufm.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">bretagne.iufm.fr</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIErDCCA5SgAwIBAgIQRmz9EXsKgXSG7w3iHBAacTANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTEwMDQwODAwMDAwMFoXDTEzMDQwNzIzNTk1OVowfDELMAkGA1UE
-BhMCRlIxDjAMBgNVBAcTBUJyZXN0MRwwGgYDVQQKExNVTklWRVJTSVRFIERFIEJS
-RVNUMRkwFwYDVQQLExBJVUZNIGRlIEJyZXRhZ25lMSQwIgYDVQQDExtmZWRlcmF0
-aW9uLmJyZXRhZ25lLml1Zm0uZnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
-AoIBAQC9io/anctVdl1XJKVAOdH/smD4k5iu6z/izJwt32LXFSgs5KLYi7pUThAv
-awK8Iky5+60HAXI6Oyxj4GYY9+2mlyjTi+HXeE4BeIUzznGFcp0tL+Iz3WrY5x+P
-HQaR9YdjhRbe72jyGPA0lnS6OI7dxJaI18IXqh8nmcS1uJcxyFBsRG9MGVX2PWWZ
-8hB3TEL3vNybl59VOltoAjm1m2NikQK70Hr6w+TofDEmht0qAubTWLN7c9v2UGos
-+/Z1qfAJTZ5En4eG0V2z2NHDwcqbg8dUjUVgmw05aIkhS1ecIp9EkRLdUzbyh5aY
-yFXaM/6L77+BqHTSswf6X4sKjn9NAgMBAAGjggFuMIIBajAfBgNVHSMEGDAWgBQM
-vZNoDPPeq6NJays3V0fqkOO57TAdBgNVHQ4EFgQUzLxiXZeukJyQudQQyHUqS7vX
-9XwwDgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYB
-BQUHAwEGCCsGAQUFBwMCMBgGA1UdIAQRMA8wDQYLKwYBBAGyMQECAh0wOgYDVR0f
-BDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xD
-QS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRj
-cy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDov
-L29jc3AudGNzLnRlcmVuYS5vcmcwJgYDVR0RBB8wHYIbZmVkZXJhdGlvbi5icmV0
-YWduZS5pdWZtLmZyMA0GCSqGSIb3DQEBBQUAA4IBAQChVtxeBUo5Y/kZfvLjKZB2
-lgotm/dUiZHxscZRh/Rcnb37Eo9NcuA3UbY9IjkUbS3p1VbLtfFQxjK7SEa/z0ry
-qxZy9/94Zs43Ntpm2XijY5uL9x6pykzLVFDLG3ZdpnrnJz3MMC6wtF14VcOTwfjm
-10hAOLHnc4xuPCEKBZMTeeNaBmARfnbrBiv0cdWI74sE0hJbq2W7e3/atzwvH1O4
-LJWCNOb6ewDwXycbnYzCnEvL1z34BTU6GAb4t4yEjQEyPmqOTMbHeE/TD9//7LO6
-HF+7wdprWF0e2/C+accIlza8LuwyPv+M5K2Q6XonBrAbHEuWJTFfJ9CxkzK9oj5+
-					    </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>
-					      MIIDVzCCAj+gAwIBAgIUd6NolqLYTp7E8s7GebWrv9/qRnMwDQYJKoZIhvcNAQEF
-BQAwJjEkMCIGA1UEAxMbZmVkZXJhdGlvbi5icmV0YWduZS5pdWZtLmZyMB4XDTA5
-MDYxMDE1NTQ0OFoXDTI5MDYxMDE1NTQ0OFowJjEkMCIGA1UEAxMbZmVkZXJhdGlv
-bi5icmV0YWduZS5pdWZtLmZyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
-AQEAjDPeB1kiK19n/njLD+Wxu1PEHVzdWJfVqfFQd011OON9Mw1sxL083/rcXrHE
-zPgcgUDHVq98OZfGNFJIRsyQyf+YDqvH8v3xBkSqEgkiypaOSBlrMNFeU5zUsvUm
-R8l4LUAXOTpT7Ok5ZcdAQcqlrEWKBszAkUw4d4ERvAvK3x78pczppg5cD9yfH/2e
-dDC7eZc0X8/mjeN8adSZC1lSfYo1xjCPQm02cGOyGmx8XeWqOr+FrdBjZsec+e5d
-Y0Q0n/aGfEe1SgOlar8FsnZfWCF8STLU0zi6jpqCyDXrmKTsmwcIjI0Gc91NlfwT
-NzpPTfQpB56t1fT3WedN+fUztQIDAQABo30wezBaBgNVHREEUzBRghtmZWRlcmF0
-aW9uLmJyZXRhZ25lLml1Zm0uZnKGMmh0dHBzOi8vZmVkZXJhdGlvbi5icmV0YWdu
-ZS5pdWZtLmZyL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBRtZOuWaCjO08kcj5Vs
-OOPhfUIolDANBgkqhkiG9w0BAQUFAAOCAQEAFUIZfk5kOBw9irRVuZRtdGzTfpB0
-vaqkd8IecQ6zQYJEz9M9WOVdMFQEv5mcEsjyKCyPUiF6SthecpSZElCASqJWu7Vn
-bneyuEHau7RVbzISMwFT+VtFhQfKMXRXWvMV1gpNNUJYg1VCZDYbMhBNfMgnmGVo
-1CJdAUzq9CI3xQlxZlkpoo+eyBbpYMnrXShVH2G8yrBOAX7lkZziJCwnZ0lvv8N0
-bNN2zAnAvAFIkUzRF/Tbl8cx9v95S8o1eI069pS87/eoNI5KUbXmUMlnzYOtLrkm
-VjJTppfg6Lmhe4fn7LzZPUC5m4MO7POVNVZA31BhxIakHzVXuofK0gUjVQ==
-					    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://federation.bretagne.iufm.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">IUFM de Bretagne</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">IUFM de Bretagne</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <EmailAddress>federation@espe-bretagne.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/federation.crous-lille.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/federation.crous-lille.fr-idp-shibboleth.xml
deleted file mode 100644
index aaa760ea..00000000
--- a/swamid-interfederations-2.0/federation.crous-lille.fr-idp-shibboleth.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://federation.crous-lille.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2014-10-02T15:28:06Z">
-      <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">crous-lille.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">CROUS Lille</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Staffs</mdui:Description>
-        <mdui:DisplayName xml:lang="fr">CROUS Lille</mdui:DisplayName>
-        <mdui:Description xml:lang="fr">Personnels</mdui:Description>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIEgDCCA2igAwIBAgIRAOe2cWAZ40jrksSS84mgafQwDQYJKoZIhvcNAQEFBQAw
-NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-IFNTTCBDQTAeFw0xNDA5MjUwMDAwMDBaFw0xNjEyMzEyMzU5NTlaMEcxITAfBgNV
-BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEiMCAGA1UEAxMZZmVkZXJhdGlv
-bi5jcm91cy1saWxsZS5mcjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
-ANnI5vHZtv9EG1YcpR+Lu0i2zEHwg9REfT60TKOuRZ4uGEO5HkPz0EZk//g5ANrL
-E/wM6Dc+FzWERy1FIrDEve8rPcSfWjOnei32N0+xmWb470gkXHMHa768JZgYYKPT
-YQtw2w3mO2K6xPSVSgcGp0cToCgeN3Zmj7OjnP1d8FRXQNZfkNbGeTkcE14zTGvn
-il9gGSg6eLp4n+AhzzFqVrsh7nhjDQUVGYSS13gc3QqrbvzhgVA3ezUhuTSf6a2Q
-Ayc/aZ+fsPc2lqBxAN5+CXE+F8hZ2EwT4lS9tPyC9LMmkG6Z/5p2LxjiWD9BAmPs
-8PpBgiv2PQDYpEiImOr7cg8CAwEAAaOCAXYwggFyMB8GA1UdIwQYMBaAFAy9k2gM
-896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBQA6VUfnc6ew1jN4PWrQ88BPAFhLzAO
-BgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcD
-AQYIKwYBBQUHAwIwIgYDVR0gBBswGTANBgsrBgEEAbIxAQICHTAIBgZngQwBAgEw
-OgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJF
-TkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8v
-Y3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYa
-aHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwJAYDVR0RBB0wG4IZZmVkZXJhdGlv
-bi5jcm91cy1saWxsZS5mcjANBgkqhkiG9w0BAQUFAAOCAQEAIgY+7c4wkrbZpY3o
-iGyUJ13AjbqyUReqedYEhOC7a6/QfR+AvhSpsig+qPHGz6ouGx7AbSagW3cUvN9Y
-XKAEMvaZDTvgXldQma8/KHxls7sRAKa/xj52C7KJPNynjZCtry3Ibaf/XVG2436/
-qA1F99mmPzg1kwJTnKvUUpWxazcipfKPxw9diYudxPUSxVKS+k1TCynaP40T5r+F
-Zu+ubcxq2fxvr9Hg44hUNPmDGZUE7UFMb97y2oVl/Wt9M6Uv85P593e9GHh9RO98
-rIzZ+UPSX0Y5lkCcEuqMR9FoY/Hs4jGsVBMrwmWGZJGMM2PlT9xIcY2cCqeKu2E/
-Lfrh4A==
-					    </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://federation.crous-lille.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://federation.crous-lille.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://federation.crous-lille.fr/idp/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">CROUS Lille</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">CROUS Lille</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <EmailAddress>informatique@crous-lille.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/federation.crous-lille.fr.xml b/swamid-interfederations-2.0/federation.crous-lille.fr.xml
deleted file mode 100644
index aaa760ea..00000000
--- a/swamid-interfederations-2.0/federation.crous-lille.fr.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://federation.crous-lille.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2014-10-02T15:28:06Z">
-      <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">crous-lille.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">CROUS Lille</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Staffs</mdui:Description>
-        <mdui:DisplayName xml:lang="fr">CROUS Lille</mdui:DisplayName>
-        <mdui:Description xml:lang="fr">Personnels</mdui:Description>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIEgDCCA2igAwIBAgIRAOe2cWAZ40jrksSS84mgafQwDQYJKoZIhvcNAQEFBQAw
-NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-IFNTTCBDQTAeFw0xNDA5MjUwMDAwMDBaFw0xNjEyMzEyMzU5NTlaMEcxITAfBgNV
-BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEiMCAGA1UEAxMZZmVkZXJhdGlv
-bi5jcm91cy1saWxsZS5mcjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
-ANnI5vHZtv9EG1YcpR+Lu0i2zEHwg9REfT60TKOuRZ4uGEO5HkPz0EZk//g5ANrL
-E/wM6Dc+FzWERy1FIrDEve8rPcSfWjOnei32N0+xmWb470gkXHMHa768JZgYYKPT
-YQtw2w3mO2K6xPSVSgcGp0cToCgeN3Zmj7OjnP1d8FRXQNZfkNbGeTkcE14zTGvn
-il9gGSg6eLp4n+AhzzFqVrsh7nhjDQUVGYSS13gc3QqrbvzhgVA3ezUhuTSf6a2Q
-Ayc/aZ+fsPc2lqBxAN5+CXE+F8hZ2EwT4lS9tPyC9LMmkG6Z/5p2LxjiWD9BAmPs
-8PpBgiv2PQDYpEiImOr7cg8CAwEAAaOCAXYwggFyMB8GA1UdIwQYMBaAFAy9k2gM
-896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBQA6VUfnc6ew1jN4PWrQ88BPAFhLzAO
-BgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcD
-AQYIKwYBBQUHAwIwIgYDVR0gBBswGTANBgsrBgEEAbIxAQICHTAIBgZngQwBAgEw
-OgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJF
-TkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8v
-Y3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYa
-aHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwJAYDVR0RBB0wG4IZZmVkZXJhdGlv
-bi5jcm91cy1saWxsZS5mcjANBgkqhkiG9w0BAQUFAAOCAQEAIgY+7c4wkrbZpY3o
-iGyUJ13AjbqyUReqedYEhOC7a6/QfR+AvhSpsig+qPHGz6ouGx7AbSagW3cUvN9Y
-XKAEMvaZDTvgXldQma8/KHxls7sRAKa/xj52C7KJPNynjZCtry3Ibaf/XVG2436/
-qA1F99mmPzg1kwJTnKvUUpWxazcipfKPxw9diYudxPUSxVKS+k1TCynaP40T5r+F
-Zu+ubcxq2fxvr9Hg44hUNPmDGZUE7UFMb97y2oVl/Wt9M6Uv85P593e9GHh9RO98
-rIzZ+UPSX0Y5lkCcEuqMR9FoY/Hs4jGsVBMrwmWGZJGMM2PlT9xIcY2cCqeKu2E/
-Lfrh4A==
-					    </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://federation.crous-lille.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://federation.crous-lille.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://federation.crous-lille.fr/idp/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">CROUS Lille</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">CROUS Lille</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <EmailAddress>informatique@crous-lille.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/federation.esiee.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/federation.esiee.fr-idp-shibboleth.xml
deleted file mode 100644
index d32faf0c..00000000
--- a/swamid-interfederations-2.0/federation.esiee.fr-idp-shibboleth.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://federation.esiee.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2013-07-26T14:48:28Z">
-      <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">esiee.fr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">edu.esiee.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">ESIEE Paris</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDODCCAiCgAwIBAgIVAKuyv3oaAeA68eduLXR1T/BYmgCRMA0GCSqGSIb3DQEB
-BQUAMB4xHDAaBgNVBAMTE2ZlZGVyYXRpb24uZXNpZWUuZnIwHhcNMTMwNzIyMTYx
-MjQzWhcNMTYwNzIyMTYxMjQzWjAeMRwwGgYDVQQDExNmZWRlcmF0aW9uLmVzaWVl
-LmZyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAg4im4BqmjCQRPDiM
-lU5aRUcI/IgpMyroXGhOVzLwP1GwvBH8DN1WFlJKNWa1C+RuiY63YTaA6OhIeGBh
-geUzFjXOm8apQ0Ll/TuArQYgt3mRX+TECa37tYz0dtVwfX+tJtQRkT58S05NlNU0
-iUEH/1/2JXSRsEfind9jDTrk4LB9FG89Z6Rhgky2BsoaIu+9bjJVj5f4QoNZ/lkV
-YQDrUhCENq7EctTHoVwLFbJixOSPrdJKtEP2dBFHVuiJpm/EaqSBNYMd79f0ULkR
-2oBN6QDFjkzMZK4TpdgJpurEHCeDmu01cXAz09TNqYz4qWLACWUJ0gedae3u43/8
-kd8mWQIDAQABo20wazBKBgNVHREEQzBBghNmZWRlcmF0aW9uLmVzaWVlLmZyhipo
-dHRwczovL2ZlZGVyYXRpb24uZXNpZWUuZnIvaWRwL3NoaWJib2xldGgwHQYDVR0O
-BBYEFCMSL4g1n6Tu2M2FueYzdebfSG2WMA0GCSqGSIb3DQEBBQUAA4IBAQABYo8u
-VOc3nALTBlfjDgoNV1S3/YcqXsoXnQa+LSTqO7cVtpspFWrBKgbv7uJlRG3Xn0li
-GKDq6wfaD3p9d1sPYo8dsSEfkL5qMphAQs35rFtRiuJnMQZIjVZsMOGuicxwsaiT
-9rGdRhKuRwQj9Rk4A2+NI45ZuZSexGVYFWKWFE3habZ5DEGxHpIMTTCKCOPxxpv7
-VUoaiUNEbmH6WsJ3BuERc66xcCT/kB3oV8QfB+Viu/61/17QI6zfMJcEvG4wwFbi
-cXPVzn3z8dnQlFcgDl+GdXleDdRkMRz9GGCepLb3tW8MGx11hkQ2+P0XiM3rqI83
-lLvxcvJ5CJp7Xtli
-					    </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://federation.esiee.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://federation.esiee.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://federation.esiee.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">esiee.fr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">edu.esiee.fr</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDODCCAiCgAwIBAgIVAKuyv3oaAeA68eduLXR1T/BYmgCRMA0GCSqGSIb3DQEB
-BQUAMB4xHDAaBgNVBAMTE2ZlZGVyYXRpb24uZXNpZWUuZnIwHhcNMTMwNzIyMTYx
-MjQzWhcNMTYwNzIyMTYxMjQzWjAeMRwwGgYDVQQDExNmZWRlcmF0aW9uLmVzaWVl
-LmZyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAg4im4BqmjCQRPDiM
-lU5aRUcI/IgpMyroXGhOVzLwP1GwvBH8DN1WFlJKNWa1C+RuiY63YTaA6OhIeGBh
-geUzFjXOm8apQ0Ll/TuArQYgt3mRX+TECa37tYz0dtVwfX+tJtQRkT58S05NlNU0
-iUEH/1/2JXSRsEfind9jDTrk4LB9FG89Z6Rhgky2BsoaIu+9bjJVj5f4QoNZ/lkV
-YQDrUhCENq7EctTHoVwLFbJixOSPrdJKtEP2dBFHVuiJpm/EaqSBNYMd79f0ULkR
-2oBN6QDFjkzMZK4TpdgJpurEHCeDmu01cXAz09TNqYz4qWLACWUJ0gedae3u43/8
-kd8mWQIDAQABo20wazBKBgNVHREEQzBBghNmZWRlcmF0aW9uLmVzaWVlLmZyhipo
-dHRwczovL2ZlZGVyYXRpb24uZXNpZWUuZnIvaWRwL3NoaWJib2xldGgwHQYDVR0O
-BBYEFCMSL4g1n6Tu2M2FueYzdebfSG2WMA0GCSqGSIb3DQEBBQUAA4IBAQABYo8u
-VOc3nALTBlfjDgoNV1S3/YcqXsoXnQa+LSTqO7cVtpspFWrBKgbv7uJlRG3Xn0li
-GKDq6wfaD3p9d1sPYo8dsSEfkL5qMphAQs35rFtRiuJnMQZIjVZsMOGuicxwsaiT
-9rGdRhKuRwQj9Rk4A2+NI45ZuZSexGVYFWKWFE3habZ5DEGxHpIMTTCKCOPxxpv7
-VUoaiUNEbmH6WsJ3BuERc66xcCT/kB3oV8QfB+Viu/61/17QI6zfMJcEvG4wwFbi
-cXPVzn3z8dnQlFcgDl+GdXleDdRkMRz9GGCepLb3tW8MGx11hkQ2+P0XiM3rqI83
-lLvxcvJ5CJp7Xtli
-					    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://federation.esiee.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">ESIEE Paris</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">ESIEE Paris</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <EmailAddress>system@esiee.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/federation.esiee.fr.xml b/swamid-interfederations-2.0/federation.esiee.fr.xml
deleted file mode 100644
index d32faf0c..00000000
--- a/swamid-interfederations-2.0/federation.esiee.fr.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://federation.esiee.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2013-07-26T14:48:28Z">
-      <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">esiee.fr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">edu.esiee.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">ESIEE Paris</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDODCCAiCgAwIBAgIVAKuyv3oaAeA68eduLXR1T/BYmgCRMA0GCSqGSIb3DQEB
-BQUAMB4xHDAaBgNVBAMTE2ZlZGVyYXRpb24uZXNpZWUuZnIwHhcNMTMwNzIyMTYx
-MjQzWhcNMTYwNzIyMTYxMjQzWjAeMRwwGgYDVQQDExNmZWRlcmF0aW9uLmVzaWVl
-LmZyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAg4im4BqmjCQRPDiM
-lU5aRUcI/IgpMyroXGhOVzLwP1GwvBH8DN1WFlJKNWa1C+RuiY63YTaA6OhIeGBh
-geUzFjXOm8apQ0Ll/TuArQYgt3mRX+TECa37tYz0dtVwfX+tJtQRkT58S05NlNU0
-iUEH/1/2JXSRsEfind9jDTrk4LB9FG89Z6Rhgky2BsoaIu+9bjJVj5f4QoNZ/lkV
-YQDrUhCENq7EctTHoVwLFbJixOSPrdJKtEP2dBFHVuiJpm/EaqSBNYMd79f0ULkR
-2oBN6QDFjkzMZK4TpdgJpurEHCeDmu01cXAz09TNqYz4qWLACWUJ0gedae3u43/8
-kd8mWQIDAQABo20wazBKBgNVHREEQzBBghNmZWRlcmF0aW9uLmVzaWVlLmZyhipo
-dHRwczovL2ZlZGVyYXRpb24uZXNpZWUuZnIvaWRwL3NoaWJib2xldGgwHQYDVR0O
-BBYEFCMSL4g1n6Tu2M2FueYzdebfSG2WMA0GCSqGSIb3DQEBBQUAA4IBAQABYo8u
-VOc3nALTBlfjDgoNV1S3/YcqXsoXnQa+LSTqO7cVtpspFWrBKgbv7uJlRG3Xn0li
-GKDq6wfaD3p9d1sPYo8dsSEfkL5qMphAQs35rFtRiuJnMQZIjVZsMOGuicxwsaiT
-9rGdRhKuRwQj9Rk4A2+NI45ZuZSexGVYFWKWFE3habZ5DEGxHpIMTTCKCOPxxpv7
-VUoaiUNEbmH6WsJ3BuERc66xcCT/kB3oV8QfB+Viu/61/17QI6zfMJcEvG4wwFbi
-cXPVzn3z8dnQlFcgDl+GdXleDdRkMRz9GGCepLb3tW8MGx11hkQ2+P0XiM3rqI83
-lLvxcvJ5CJp7Xtli
-					    </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://federation.esiee.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://federation.esiee.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://federation.esiee.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">esiee.fr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">edu.esiee.fr</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDODCCAiCgAwIBAgIVAKuyv3oaAeA68eduLXR1T/BYmgCRMA0GCSqGSIb3DQEB
-BQUAMB4xHDAaBgNVBAMTE2ZlZGVyYXRpb24uZXNpZWUuZnIwHhcNMTMwNzIyMTYx
-MjQzWhcNMTYwNzIyMTYxMjQzWjAeMRwwGgYDVQQDExNmZWRlcmF0aW9uLmVzaWVl
-LmZyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAg4im4BqmjCQRPDiM
-lU5aRUcI/IgpMyroXGhOVzLwP1GwvBH8DN1WFlJKNWa1C+RuiY63YTaA6OhIeGBh
-geUzFjXOm8apQ0Ll/TuArQYgt3mRX+TECa37tYz0dtVwfX+tJtQRkT58S05NlNU0
-iUEH/1/2JXSRsEfind9jDTrk4LB9FG89Z6Rhgky2BsoaIu+9bjJVj5f4QoNZ/lkV
-YQDrUhCENq7EctTHoVwLFbJixOSPrdJKtEP2dBFHVuiJpm/EaqSBNYMd79f0ULkR
-2oBN6QDFjkzMZK4TpdgJpurEHCeDmu01cXAz09TNqYz4qWLACWUJ0gedae3u43/8
-kd8mWQIDAQABo20wazBKBgNVHREEQzBBghNmZWRlcmF0aW9uLmVzaWVlLmZyhipo
-dHRwczovL2ZlZGVyYXRpb24uZXNpZWUuZnIvaWRwL3NoaWJib2xldGgwHQYDVR0O
-BBYEFCMSL4g1n6Tu2M2FueYzdebfSG2WMA0GCSqGSIb3DQEBBQUAA4IBAQABYo8u
-VOc3nALTBlfjDgoNV1S3/YcqXsoXnQa+LSTqO7cVtpspFWrBKgbv7uJlRG3Xn0li
-GKDq6wfaD3p9d1sPYo8dsSEfkL5qMphAQs35rFtRiuJnMQZIjVZsMOGuicxwsaiT
-9rGdRhKuRwQj9Rk4A2+NI45ZuZSexGVYFWKWFE3habZ5DEGxHpIMTTCKCOPxxpv7
-VUoaiUNEbmH6WsJ3BuERc66xcCT/kB3oV8QfB+Viu/61/17QI6zfMJcEvG4wwFbi
-cXPVzn3z8dnQlFcgDl+GdXleDdRkMRz9GGCepLb3tW8MGx11hkQ2+P0XiM3rqI83
-lLvxcvJ5CJp7Xtli
-					    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://federation.esiee.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">ESIEE Paris</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">ESIEE Paris</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <EmailAddress>system@esiee.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/federation.ined.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/federation.ined.fr-idp-shibboleth.xml
deleted file mode 100644
index 0a38db53..00000000
--- a/swamid-interfederations-2.0/federation.ined.fr-idp-shibboleth.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://federation.ined.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2013-09-26T17:01:56Z">
-      <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">ined.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">INED - Institut National d'Etudes Démographiques</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDNDCCAhygAwIBAgIVALSDfGTkP7KOu8osupywHMFeyFANMA0GCSqGSIb3DQEB
-BQUAMB0xGzAZBgNVBAMTEmZlZGVyYXRpb24uaW5lZC5mcjAeFw0xMzA3MjMxNzE3
-MzJaFw0zMzA3MjMxNzE3MzJaMB0xGzAZBgNVBAMTEmZlZGVyYXRpb24uaW5lZC5m
-cjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMJG3Cg6FzR6km9GqLst
-gxKkkLLSsfnfncy+/ulDiS5tu3ueqr2c/dwz6o0kn97WrBLLlrFIiYaQPIZp1Lp3
-gA7utUMZeEs3ABn631suaI4ra+sMdrhIKgPBRmXchfPrWEk0QgqIkZhK7vP+yH4Z
-h4Tx+s5aLIDDmsh3tESGaWvP4OEE4oE6lTXS5coGrD1P3LqRLRBmmD/VBur3YDQG
-MfXKthCrBXfSsawSITjqN/HIRZO+75ZcO8L29BGu3jpDZQJOocvzsXEGcf1Yfzro
-BSf3w9wCRkuTpYqgvSqaIjG0BVxlq5S8V9NpVjgmQSiBBTBjDfXEhQnbvARg9o3i
-/2cCAwEAAaNrMGkwSAYDVR0RBEEwP4ISZmVkZXJhdGlvbi5pbmVkLmZyhilodHRw
-czovL2ZlZGVyYXRpb24uaW5lZC5mci9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQU
-H5JcyQ9+maCLgPuzsi40nhRq8hgwDQYJKoZIhvcNAQEFBQADggEBAGtHb3XbAcb0
-bOuPVgifcFmXV7/AnUciKnhZBaMPSt8Q4brCg7+BPzNsGH0k9FGRfH8EHrHLa2qm
-0xqrBf1dEM3v1vq981fLnuks3rmqTrWApPYvxehrAlmtYRexYMv7QXVH06zECBee
-xgHHvFcGJ/JEHRYO8ZFeytl4dQej4tIKxfeW2WUR8zrrfBZNPKvPeN8Y/sHwO8EL
-NbDmdeOfpc1PjxHHbPkJQDLMdAZuMPTYYRdv7+v4s2saF8T3e7kazMNQOW8tQdwL
-i3VOe/mxnZMuPaIV1sWncTmcvo1hUtT89R4DQIimZCyCorKfPM4DNSPp/4KWB8SE
-SCHrArErnq8=
-					    </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://federation.ined.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://federation.ined.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://federation.ined.fr/idp/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">INED - Institut National d'Etudes Démographiques</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">INED - Institut National d'Etudes Démographiques</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Marc Lamouche</SurName>
-    <EmailAddress>marc.lamouche@ined.fr</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <SurName>Rainer Kugel</SurName>
-    <EmailAddress>rainer.kugel@ined.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/federation.ined.fr.xml b/swamid-interfederations-2.0/federation.ined.fr.xml
deleted file mode 100644
index 0a38db53..00000000
--- a/swamid-interfederations-2.0/federation.ined.fr.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://federation.ined.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2013-09-26T17:01:56Z">
-      <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">ined.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">INED - Institut National d'Etudes Démographiques</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDNDCCAhygAwIBAgIVALSDfGTkP7KOu8osupywHMFeyFANMA0GCSqGSIb3DQEB
-BQUAMB0xGzAZBgNVBAMTEmZlZGVyYXRpb24uaW5lZC5mcjAeFw0xMzA3MjMxNzE3
-MzJaFw0zMzA3MjMxNzE3MzJaMB0xGzAZBgNVBAMTEmZlZGVyYXRpb24uaW5lZC5m
-cjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMJG3Cg6FzR6km9GqLst
-gxKkkLLSsfnfncy+/ulDiS5tu3ueqr2c/dwz6o0kn97WrBLLlrFIiYaQPIZp1Lp3
-gA7utUMZeEs3ABn631suaI4ra+sMdrhIKgPBRmXchfPrWEk0QgqIkZhK7vP+yH4Z
-h4Tx+s5aLIDDmsh3tESGaWvP4OEE4oE6lTXS5coGrD1P3LqRLRBmmD/VBur3YDQG
-MfXKthCrBXfSsawSITjqN/HIRZO+75ZcO8L29BGu3jpDZQJOocvzsXEGcf1Yfzro
-BSf3w9wCRkuTpYqgvSqaIjG0BVxlq5S8V9NpVjgmQSiBBTBjDfXEhQnbvARg9o3i
-/2cCAwEAAaNrMGkwSAYDVR0RBEEwP4ISZmVkZXJhdGlvbi5pbmVkLmZyhilodHRw
-czovL2ZlZGVyYXRpb24uaW5lZC5mci9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQU
-H5JcyQ9+maCLgPuzsi40nhRq8hgwDQYJKoZIhvcNAQEFBQADggEBAGtHb3XbAcb0
-bOuPVgifcFmXV7/AnUciKnhZBaMPSt8Q4brCg7+BPzNsGH0k9FGRfH8EHrHLa2qm
-0xqrBf1dEM3v1vq981fLnuks3rmqTrWApPYvxehrAlmtYRexYMv7QXVH06zECBee
-xgHHvFcGJ/JEHRYO8ZFeytl4dQej4tIKxfeW2WUR8zrrfBZNPKvPeN8Y/sHwO8EL
-NbDmdeOfpc1PjxHHbPkJQDLMdAZuMPTYYRdv7+v4s2saF8T3e7kazMNQOW8tQdwL
-i3VOe/mxnZMuPaIV1sWncTmcvo1hUtT89R4DQIimZCyCorKfPM4DNSPp/4KWB8SE
-SCHrArErnq8=
-					    </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://federation.ined.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://federation.ined.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://federation.ined.fr/idp/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">INED - Institut National d'Etudes Démographiques</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">INED - Institut National d'Etudes Démographiques</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Marc Lamouche</SurName>
-    <EmailAddress>marc.lamouche@ined.fr</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <SurName>Rainer Kugel</SurName>
-    <EmailAddress>rainer.kugel@ined.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/federation.sciences-po.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/federation.sciences-po.fr-idp-shibboleth.xml
deleted file mode 100644
index b15d793a..00000000
--- a/swamid-interfederations-2.0/federation.sciences-po.fr-idp-shibboleth.xml
+++ /dev/null
@@ -1,145 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://federation.sciences-po.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2009-06-26T17:55:00Z">
-      <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">sciences-po.fr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sciences-po.org</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sciencespo.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">Sciences Po Paris</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDUDCCAjigAwIBAgIVAPSayRf4eNPJKhqMWVppnJInJ6XeMA0GCSqGSIb3DQEB
-BQUAMCQxIjAgBgNVBAMTGWZlZGVyYXRpb24uc2NpZW5jZXMtcG8uZnIwHhcNMDkx
-MTA5MTcwMjM1WhcNMjkxMTA5MTcwMjM1WjAkMSIwIAYDVQQDExlmZWRlcmF0aW9u
-LnNjaWVuY2VzLXBvLmZyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
-3uIR9QwANsZZFf0MAGhbhYdMLZRGMijmIN2T/s/dxsQyYDybx7cfQMctEvsWP1NR
-dMEZ6rNR0wD3uyLI3DZUCoezeHkyY/s1vPqeJFIlzoaQvzR5uVm2Is37gqGEDTKs
-/M0tCLiXiTZQkxaOxq+HXypNrhUTw2EkXuhomk8LD6sRdAzaKpxGatqkfwByGUXS
-SkTJqeV0eX5BmC32WPG/vtWqaKUM7H+OjJ/QRQrbfir2znW3Wf4aAAkppJtnvtYY
-ZkUiOjvziKNlbvwI4GyDiDfl5oGvP5JHIzy4vPBCdLW1JBZhnnOnLv7+nca/g9Ke
-RlmoOOR2VGqwkAzmwm+83wIDAQABo3kwdzBWBgNVHREETzBNghlmZWRlcmF0aW9u
-LnNjaWVuY2VzLXBvLmZyhjBodHRwczovL2ZlZGVyYXRpb24uc2NpZW5jZXMtcG8u
-ZnIvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFAFHMcFjXGUqoshwWJhBzgyBC4zL
-MA0GCSqGSIb3DQEBBQUAA4IBAQDKpWas1Dj9IjKV3yYvTDsxGeZ2uFa1WGo5iKdV
-+1US2VwADvq7896oRvLDWCpQmh04X6wNee1T6HgHBLsvnFv9PlAjqRmC0likrtet
-mEf2+tD06zwxnJFj8EwwPTRGXKU5z6vq5QUQtKckCfZTf7W+LhBOd3Oi7/GFHyea
-p8xY8/Xkx+nxiEJk5IPN1oboKWe0b7Liy7ZowGCXqRsWcFf41APBmzxvqiXGuTem
-YLbweS7USGQdYgrw8ZYIBgH59pVjdPORwc8c0tCr9jwAavYehWEDd1Hs8S/rma+Q
-juXUI4qWzUOgFDOh1MiSBezPFp1576XseU8Hiw1T7QZIAhgK
-					    </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>
-					      MIIDUDCCAjigAwIBAgIVALYXRzpnlr2ss74It/kPDT1kzxV4MA0GCSqGSIb3DQEB
-BQUAMCQxIjAgBgNVBAMTGWZlZGVyYXRpb24uc2NpZW5jZXMtcG8uZnIwHhcNMDkw
-NjE5MDk1MTM3WhcNMjkwNjE5MDk1MTM3WjAkMSIwIAYDVQQDExlmZWRlcmF0aW9u
-LnNjaWVuY2VzLXBvLmZyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
-s1g13BW6C5N7THGGpG7yk4HoX1kjbFjPYihbslRlGYSm2zccvivUkf5dENcIqfE6
-qPT3D7uYqvrkeYcELXJ38BiHrtAmuzW3ss9gO/01g+uBjZDaXRguDG3qPz4fgxDl
-SbuahErVw5m7U7l388P/7veoBeaWzFx/eJeTX/hfIHvHa9I0kvnVUfS+D74WQ5vJ
-RjcF4nTL2g2vBQb+aytlC9PHid90ptvG2R9/WPCqz4vwUJVgIgemeJiUsQfOrnj2
-6LkYCg4hd0WAV+fAaH25fE9ggu6iBqJcUfeyQ/mP3pJB00pE6dNjc5QfpXmFA/j7
-jBC9mfHbBQ7KXIjdepwehQIDAQABo3kwdzBWBgNVHREETzBNghlmZWRlcmF0aW9u
-LnNjaWVuY2VzLXBvLmZyhjBodHRwczovL2ZlZGVyYXRpb24uc2NpZW5jZXMtcG8u
-ZnIvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFNuAcsGNTTS7GMoor6NWV6kgG2ys
-MA0GCSqGSIb3DQEBBQUAA4IBAQBJcsldsyHR5MGPmkwziCuf3sM2PwzCa40/Mu3H
-NBbieS8YpQQQNaXsdct1xTCFjkS/gqNRsfd/ngelulZ4xD66h3oVbP1p03t0y3It
-D+x9X+p9S3TCld38H14x51zV3xPRf/fPDQen6bJ5VH7nqg9d7nnuyC1FLDkW6Eql
-HTcgCpmWplZnMsMkTqnvi5davtUgK2IxXvhzhN+pLdPxHELoMN4y4oyxnpRxs3A7
-tKczTo9NPfV3G9zLwdktz35HRkF7mBfBGdZbJYHJZibHALTxeqXtFzkC+FK0R0hM
-RCOmYdr+xspPrnyaTVp1P2oNrHXtLHlWmLvtyoKzr0lGAMA8
-					    </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://federation.sciences-po.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://federation.sciences-po.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://federation.sciences-po.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">sciences-po.fr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sciences-po.org</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sciencespo.fr</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDUDCCAjigAwIBAgIVAPSayRf4eNPJKhqMWVppnJInJ6XeMA0GCSqGSIb3DQEB
-BQUAMCQxIjAgBgNVBAMTGWZlZGVyYXRpb24uc2NpZW5jZXMtcG8uZnIwHhcNMDkx
-MTA5MTcwMjM1WhcNMjkxMTA5MTcwMjM1WjAkMSIwIAYDVQQDExlmZWRlcmF0aW9u
-LnNjaWVuY2VzLXBvLmZyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
-3uIR9QwANsZZFf0MAGhbhYdMLZRGMijmIN2T/s/dxsQyYDybx7cfQMctEvsWP1NR
-dMEZ6rNR0wD3uyLI3DZUCoezeHkyY/s1vPqeJFIlzoaQvzR5uVm2Is37gqGEDTKs
-/M0tCLiXiTZQkxaOxq+HXypNrhUTw2EkXuhomk8LD6sRdAzaKpxGatqkfwByGUXS
-SkTJqeV0eX5BmC32WPG/vtWqaKUM7H+OjJ/QRQrbfir2znW3Wf4aAAkppJtnvtYY
-ZkUiOjvziKNlbvwI4GyDiDfl5oGvP5JHIzy4vPBCdLW1JBZhnnOnLv7+nca/g9Ke
-RlmoOOR2VGqwkAzmwm+83wIDAQABo3kwdzBWBgNVHREETzBNghlmZWRlcmF0aW9u
-LnNjaWVuY2VzLXBvLmZyhjBodHRwczovL2ZlZGVyYXRpb24uc2NpZW5jZXMtcG8u
-ZnIvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFAFHMcFjXGUqoshwWJhBzgyBC4zL
-MA0GCSqGSIb3DQEBBQUAA4IBAQDKpWas1Dj9IjKV3yYvTDsxGeZ2uFa1WGo5iKdV
-+1US2VwADvq7896oRvLDWCpQmh04X6wNee1T6HgHBLsvnFv9PlAjqRmC0likrtet
-mEf2+tD06zwxnJFj8EwwPTRGXKU5z6vq5QUQtKckCfZTf7W+LhBOd3Oi7/GFHyea
-p8xY8/Xkx+nxiEJk5IPN1oboKWe0b7Liy7ZowGCXqRsWcFf41APBmzxvqiXGuTem
-YLbweS7USGQdYgrw8ZYIBgH59pVjdPORwc8c0tCr9jwAavYehWEDd1Hs8S/rma+Q
-juXUI4qWzUOgFDOh1MiSBezPFp1576XseU8Hiw1T7QZIAhgK
-					    </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>
-					      MIIDUDCCAjigAwIBAgIVALYXRzpnlr2ss74It/kPDT1kzxV4MA0GCSqGSIb3DQEB
-BQUAMCQxIjAgBgNVBAMTGWZlZGVyYXRpb24uc2NpZW5jZXMtcG8uZnIwHhcNMDkw
-NjE5MDk1MTM3WhcNMjkwNjE5MDk1MTM3WjAkMSIwIAYDVQQDExlmZWRlcmF0aW9u
-LnNjaWVuY2VzLXBvLmZyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
-s1g13BW6C5N7THGGpG7yk4HoX1kjbFjPYihbslRlGYSm2zccvivUkf5dENcIqfE6
-qPT3D7uYqvrkeYcELXJ38BiHrtAmuzW3ss9gO/01g+uBjZDaXRguDG3qPz4fgxDl
-SbuahErVw5m7U7l388P/7veoBeaWzFx/eJeTX/hfIHvHa9I0kvnVUfS+D74WQ5vJ
-RjcF4nTL2g2vBQb+aytlC9PHid90ptvG2R9/WPCqz4vwUJVgIgemeJiUsQfOrnj2
-6LkYCg4hd0WAV+fAaH25fE9ggu6iBqJcUfeyQ/mP3pJB00pE6dNjc5QfpXmFA/j7
-jBC9mfHbBQ7KXIjdepwehQIDAQABo3kwdzBWBgNVHREETzBNghlmZWRlcmF0aW9u
-LnNjaWVuY2VzLXBvLmZyhjBodHRwczovL2ZlZGVyYXRpb24uc2NpZW5jZXMtcG8u
-ZnIvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFNuAcsGNTTS7GMoor6NWV6kgG2ys
-MA0GCSqGSIb3DQEBBQUAA4IBAQBJcsldsyHR5MGPmkwziCuf3sM2PwzCa40/Mu3H
-NBbieS8YpQQQNaXsdct1xTCFjkS/gqNRsfd/ngelulZ4xD66h3oVbP1p03t0y3It
-D+x9X+p9S3TCld38H14x51zV3xPRf/fPDQen6bJ5VH7nqg9d7nnuyC1FLDkW6Eql
-HTcgCpmWplZnMsMkTqnvi5davtUgK2IxXvhzhN+pLdPxHELoMN4y4oyxnpRxs3A7
-tKczTo9NPfV3G9zLwdktz35HRkF7mBfBGdZbJYHJZibHALTxeqXtFzkC+FK0R0hM
-RCOmYdr+xspPrnyaTVp1P2oNrHXtLHlWmLvtyoKzr0lGAMA8
-					    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://federation.sciences-po.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">Sciences Po Paris</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Sciences Po Paris</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <EmailAddress>prs@sciences-po.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/federation.sciences-po.fr.xml b/swamid-interfederations-2.0/federation.sciences-po.fr.xml
deleted file mode 100644
index b15d793a..00000000
--- a/swamid-interfederations-2.0/federation.sciences-po.fr.xml
+++ /dev/null
@@ -1,145 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://federation.sciences-po.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2009-06-26T17:55:00Z">
-      <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">sciences-po.fr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sciences-po.org</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sciencespo.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">Sciences Po Paris</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDUDCCAjigAwIBAgIVAPSayRf4eNPJKhqMWVppnJInJ6XeMA0GCSqGSIb3DQEB
-BQUAMCQxIjAgBgNVBAMTGWZlZGVyYXRpb24uc2NpZW5jZXMtcG8uZnIwHhcNMDkx
-MTA5MTcwMjM1WhcNMjkxMTA5MTcwMjM1WjAkMSIwIAYDVQQDExlmZWRlcmF0aW9u
-LnNjaWVuY2VzLXBvLmZyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
-3uIR9QwANsZZFf0MAGhbhYdMLZRGMijmIN2T/s/dxsQyYDybx7cfQMctEvsWP1NR
-dMEZ6rNR0wD3uyLI3DZUCoezeHkyY/s1vPqeJFIlzoaQvzR5uVm2Is37gqGEDTKs
-/M0tCLiXiTZQkxaOxq+HXypNrhUTw2EkXuhomk8LD6sRdAzaKpxGatqkfwByGUXS
-SkTJqeV0eX5BmC32WPG/vtWqaKUM7H+OjJ/QRQrbfir2znW3Wf4aAAkppJtnvtYY
-ZkUiOjvziKNlbvwI4GyDiDfl5oGvP5JHIzy4vPBCdLW1JBZhnnOnLv7+nca/g9Ke
-RlmoOOR2VGqwkAzmwm+83wIDAQABo3kwdzBWBgNVHREETzBNghlmZWRlcmF0aW9u
-LnNjaWVuY2VzLXBvLmZyhjBodHRwczovL2ZlZGVyYXRpb24uc2NpZW5jZXMtcG8u
-ZnIvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFAFHMcFjXGUqoshwWJhBzgyBC4zL
-MA0GCSqGSIb3DQEBBQUAA4IBAQDKpWas1Dj9IjKV3yYvTDsxGeZ2uFa1WGo5iKdV
-+1US2VwADvq7896oRvLDWCpQmh04X6wNee1T6HgHBLsvnFv9PlAjqRmC0likrtet
-mEf2+tD06zwxnJFj8EwwPTRGXKU5z6vq5QUQtKckCfZTf7W+LhBOd3Oi7/GFHyea
-p8xY8/Xkx+nxiEJk5IPN1oboKWe0b7Liy7ZowGCXqRsWcFf41APBmzxvqiXGuTem
-YLbweS7USGQdYgrw8ZYIBgH59pVjdPORwc8c0tCr9jwAavYehWEDd1Hs8S/rma+Q
-juXUI4qWzUOgFDOh1MiSBezPFp1576XseU8Hiw1T7QZIAhgK
-					    </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>
-					      MIIDUDCCAjigAwIBAgIVALYXRzpnlr2ss74It/kPDT1kzxV4MA0GCSqGSIb3DQEB
-BQUAMCQxIjAgBgNVBAMTGWZlZGVyYXRpb24uc2NpZW5jZXMtcG8uZnIwHhcNMDkw
-NjE5MDk1MTM3WhcNMjkwNjE5MDk1MTM3WjAkMSIwIAYDVQQDExlmZWRlcmF0aW9u
-LnNjaWVuY2VzLXBvLmZyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
-s1g13BW6C5N7THGGpG7yk4HoX1kjbFjPYihbslRlGYSm2zccvivUkf5dENcIqfE6
-qPT3D7uYqvrkeYcELXJ38BiHrtAmuzW3ss9gO/01g+uBjZDaXRguDG3qPz4fgxDl
-SbuahErVw5m7U7l388P/7veoBeaWzFx/eJeTX/hfIHvHa9I0kvnVUfS+D74WQ5vJ
-RjcF4nTL2g2vBQb+aytlC9PHid90ptvG2R9/WPCqz4vwUJVgIgemeJiUsQfOrnj2
-6LkYCg4hd0WAV+fAaH25fE9ggu6iBqJcUfeyQ/mP3pJB00pE6dNjc5QfpXmFA/j7
-jBC9mfHbBQ7KXIjdepwehQIDAQABo3kwdzBWBgNVHREETzBNghlmZWRlcmF0aW9u
-LnNjaWVuY2VzLXBvLmZyhjBodHRwczovL2ZlZGVyYXRpb24uc2NpZW5jZXMtcG8u
-ZnIvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFNuAcsGNTTS7GMoor6NWV6kgG2ys
-MA0GCSqGSIb3DQEBBQUAA4IBAQBJcsldsyHR5MGPmkwziCuf3sM2PwzCa40/Mu3H
-NBbieS8YpQQQNaXsdct1xTCFjkS/gqNRsfd/ngelulZ4xD66h3oVbP1p03t0y3It
-D+x9X+p9S3TCld38H14x51zV3xPRf/fPDQen6bJ5VH7nqg9d7nnuyC1FLDkW6Eql
-HTcgCpmWplZnMsMkTqnvi5davtUgK2IxXvhzhN+pLdPxHELoMN4y4oyxnpRxs3A7
-tKczTo9NPfV3G9zLwdktz35HRkF7mBfBGdZbJYHJZibHALTxeqXtFzkC+FK0R0hM
-RCOmYdr+xspPrnyaTVp1P2oNrHXtLHlWmLvtyoKzr0lGAMA8
-					    </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://federation.sciences-po.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://federation.sciences-po.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://federation.sciences-po.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">sciences-po.fr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sciences-po.org</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sciencespo.fr</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDUDCCAjigAwIBAgIVAPSayRf4eNPJKhqMWVppnJInJ6XeMA0GCSqGSIb3DQEB
-BQUAMCQxIjAgBgNVBAMTGWZlZGVyYXRpb24uc2NpZW5jZXMtcG8uZnIwHhcNMDkx
-MTA5MTcwMjM1WhcNMjkxMTA5MTcwMjM1WjAkMSIwIAYDVQQDExlmZWRlcmF0aW9u
-LnNjaWVuY2VzLXBvLmZyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
-3uIR9QwANsZZFf0MAGhbhYdMLZRGMijmIN2T/s/dxsQyYDybx7cfQMctEvsWP1NR
-dMEZ6rNR0wD3uyLI3DZUCoezeHkyY/s1vPqeJFIlzoaQvzR5uVm2Is37gqGEDTKs
-/M0tCLiXiTZQkxaOxq+HXypNrhUTw2EkXuhomk8LD6sRdAzaKpxGatqkfwByGUXS
-SkTJqeV0eX5BmC32WPG/vtWqaKUM7H+OjJ/QRQrbfir2znW3Wf4aAAkppJtnvtYY
-ZkUiOjvziKNlbvwI4GyDiDfl5oGvP5JHIzy4vPBCdLW1JBZhnnOnLv7+nca/g9Ke
-RlmoOOR2VGqwkAzmwm+83wIDAQABo3kwdzBWBgNVHREETzBNghlmZWRlcmF0aW9u
-LnNjaWVuY2VzLXBvLmZyhjBodHRwczovL2ZlZGVyYXRpb24uc2NpZW5jZXMtcG8u
-ZnIvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFAFHMcFjXGUqoshwWJhBzgyBC4zL
-MA0GCSqGSIb3DQEBBQUAA4IBAQDKpWas1Dj9IjKV3yYvTDsxGeZ2uFa1WGo5iKdV
-+1US2VwADvq7896oRvLDWCpQmh04X6wNee1T6HgHBLsvnFv9PlAjqRmC0likrtet
-mEf2+tD06zwxnJFj8EwwPTRGXKU5z6vq5QUQtKckCfZTf7W+LhBOd3Oi7/GFHyea
-p8xY8/Xkx+nxiEJk5IPN1oboKWe0b7Liy7ZowGCXqRsWcFf41APBmzxvqiXGuTem
-YLbweS7USGQdYgrw8ZYIBgH59pVjdPORwc8c0tCr9jwAavYehWEDd1Hs8S/rma+Q
-juXUI4qWzUOgFDOh1MiSBezPFp1576XseU8Hiw1T7QZIAhgK
-					    </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>
-					      MIIDUDCCAjigAwIBAgIVALYXRzpnlr2ss74It/kPDT1kzxV4MA0GCSqGSIb3DQEB
-BQUAMCQxIjAgBgNVBAMTGWZlZGVyYXRpb24uc2NpZW5jZXMtcG8uZnIwHhcNMDkw
-NjE5MDk1MTM3WhcNMjkwNjE5MDk1MTM3WjAkMSIwIAYDVQQDExlmZWRlcmF0aW9u
-LnNjaWVuY2VzLXBvLmZyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
-s1g13BW6C5N7THGGpG7yk4HoX1kjbFjPYihbslRlGYSm2zccvivUkf5dENcIqfE6
-qPT3D7uYqvrkeYcELXJ38BiHrtAmuzW3ss9gO/01g+uBjZDaXRguDG3qPz4fgxDl
-SbuahErVw5m7U7l388P/7veoBeaWzFx/eJeTX/hfIHvHa9I0kvnVUfS+D74WQ5vJ
-RjcF4nTL2g2vBQb+aytlC9PHid90ptvG2R9/WPCqz4vwUJVgIgemeJiUsQfOrnj2
-6LkYCg4hd0WAV+fAaH25fE9ggu6iBqJcUfeyQ/mP3pJB00pE6dNjc5QfpXmFA/j7
-jBC9mfHbBQ7KXIjdepwehQIDAQABo3kwdzBWBgNVHREETzBNghlmZWRlcmF0aW9u
-LnNjaWVuY2VzLXBvLmZyhjBodHRwczovL2ZlZGVyYXRpb24uc2NpZW5jZXMtcG8u
-ZnIvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFNuAcsGNTTS7GMoor6NWV6kgG2ys
-MA0GCSqGSIb3DQEBBQUAA4IBAQBJcsldsyHR5MGPmkwziCuf3sM2PwzCa40/Mu3H
-NBbieS8YpQQQNaXsdct1xTCFjkS/gqNRsfd/ngelulZ4xD66h3oVbP1p03t0y3It
-D+x9X+p9S3TCld38H14x51zV3xPRf/fPDQen6bJ5VH7nqg9d7nnuyC1FLDkW6Eql
-HTcgCpmWplZnMsMkTqnvi5davtUgK2IxXvhzhN+pLdPxHELoMN4y4oyxnpRxs3A7
-tKczTo9NPfV3G9zLwdktz35HRkF7mBfBGdZbJYHJZibHALTxeqXtFzkC+FK0R0hM
-RCOmYdr+xspPrnyaTVp1P2oNrHXtLHlWmLvtyoKzr0lGAMA8
-					    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://federation.sciences-po.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">Sciences Po Paris</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Sciences Po Paris</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <EmailAddress>prs@sciences-po.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/federation.u-pem.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/federation.u-pem.fr-idp-shibboleth.xml
deleted file mode 100644
index 2cc78d45..00000000
--- a/swamid-interfederations-2.0/federation.u-pem.fr-idp-shibboleth.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://federation.u-pem.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2014-05-19T12:09:19Z">
-      <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">u-pem.fr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-mlv.fr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">umlv.fr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">etud.u-pem.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Paris-Est Marne-la-Vallée University</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Every university member</mdui:Description>
-        <mdui:DisplayName xml:lang="fr">Université Paris-Est Marne-la-Vallée</mdui:DisplayName>
-        <mdui:Description xml:lang="fr">Tous les membres de l'université</mdui:Description>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDODCCAiCgAwIBAgIVAM2PTKt1TV1kFUzpXmOV0ZzH5/RrMA0GCSqGSIb3DQEB
-BQUAMB4xHDAaBgNVBAMTE2ZlZGVyYXRpb24udS1wZW0uZnIwHhcNMTQwNTE5MTAw
-NzU0WhcNMzQwNTE5MTAwNzU0WjAeMRwwGgYDVQQDExNmZWRlcmF0aW9uLnUtcGVt
-LmZyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA0t2Ou0usGY1JzkfP
-1fqEphJbvG9dCqmyAy3aWE1udBLfjDtjLLjfHfIafRLkm2OVLwjI/5nbY6krNTXk
-nZNO0L8LJuOLImqfMluR75jWUWAJQsXrbJ+hOmsmt2nDfVGIRvkO8E59+vnsOZW4
-mYn+S1qbOxfy+FCff4zrqP6vij73UffoFYwrxg07q8jQP9Dhie/6nRKQtoXfDRwu
-hN7KJVuwBAT8OB1to1td7ETcFHrV3TBdCiykYQONpIQcbc3BJDHjSndn5TZtwmBr
-KoWVe7+FAdoASTriJPUgPSapdnsJS31nQaKwOPxcfqzobysb3FHRZ3c9e+k9s2lj
-pl1qwQIDAQABo20wazBKBgNVHREEQzBBghNmZWRlcmF0aW9uLnUtcGVtLmZyhipo
-dHRwczovL2ZlZGVyYXRpb24udS1wZW0uZnIvaWRwL3NoaWJib2xldGgwHQYDVR0O
-BBYEFKsWCrm5woMmq5whBpJxFE7z3oSdMA0GCSqGSIb3DQEBBQUAA4IBAQA0yHMD
-eBNRPmppFMlR71VZ+30TVxMBE6asRnn/69Ni/cYRxr+7EEVUgMzzxJfT2gwtkocg
-YkZR6nCR+KJmfk3KwR6CFfKV/eLuVA883x8j7tqY4YHmHn7RInFdibHwF6Ka58P7
-zwdoCWFvLZjFjaAWERxqGGjIZex/3FhxtgKEN4rWtUqlRNwhCMJP2ee4BIY84dTK
-rw154uC2Ng7lchO5gbMyUTxxVWX0K/oqpKW4nvpbsj2kkZI5rFSt5FRC/kVwkWJK
-9UTDRWo5w/HbzA8JVAnU0vwax0/E2nDrYSu1pbGOb0F97H+UBSWBMaBqZHoJLkEi
-wDJ2bH/IB8MKNLHT
-					    </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://federation.u-pem.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://federation.u-pem.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://federation.u-pem.fr/idp/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Université Paris-Est Marne-la-Vallée</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Université Paris-Est Marne-la-Vallée</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <EmailAddress>adm-federation@u-pem.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/federation.u-pem.fr.xml b/swamid-interfederations-2.0/federation.u-pem.fr.xml
deleted file mode 100644
index 2cc78d45..00000000
--- a/swamid-interfederations-2.0/federation.u-pem.fr.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://federation.u-pem.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2014-05-19T12:09:19Z">
-      <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">u-pem.fr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-mlv.fr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">umlv.fr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">etud.u-pem.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Paris-Est Marne-la-Vallée University</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Every university member</mdui:Description>
-        <mdui:DisplayName xml:lang="fr">Université Paris-Est Marne-la-Vallée</mdui:DisplayName>
-        <mdui:Description xml:lang="fr">Tous les membres de l'université</mdui:Description>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDODCCAiCgAwIBAgIVAM2PTKt1TV1kFUzpXmOV0ZzH5/RrMA0GCSqGSIb3DQEB
-BQUAMB4xHDAaBgNVBAMTE2ZlZGVyYXRpb24udS1wZW0uZnIwHhcNMTQwNTE5MTAw
-NzU0WhcNMzQwNTE5MTAwNzU0WjAeMRwwGgYDVQQDExNmZWRlcmF0aW9uLnUtcGVt
-LmZyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA0t2Ou0usGY1JzkfP
-1fqEphJbvG9dCqmyAy3aWE1udBLfjDtjLLjfHfIafRLkm2OVLwjI/5nbY6krNTXk
-nZNO0L8LJuOLImqfMluR75jWUWAJQsXrbJ+hOmsmt2nDfVGIRvkO8E59+vnsOZW4
-mYn+S1qbOxfy+FCff4zrqP6vij73UffoFYwrxg07q8jQP9Dhie/6nRKQtoXfDRwu
-hN7KJVuwBAT8OB1to1td7ETcFHrV3TBdCiykYQONpIQcbc3BJDHjSndn5TZtwmBr
-KoWVe7+FAdoASTriJPUgPSapdnsJS31nQaKwOPxcfqzobysb3FHRZ3c9e+k9s2lj
-pl1qwQIDAQABo20wazBKBgNVHREEQzBBghNmZWRlcmF0aW9uLnUtcGVtLmZyhipo
-dHRwczovL2ZlZGVyYXRpb24udS1wZW0uZnIvaWRwL3NoaWJib2xldGgwHQYDVR0O
-BBYEFKsWCrm5woMmq5whBpJxFE7z3oSdMA0GCSqGSIb3DQEBBQUAA4IBAQA0yHMD
-eBNRPmppFMlR71VZ+30TVxMBE6asRnn/69Ni/cYRxr+7EEVUgMzzxJfT2gwtkocg
-YkZR6nCR+KJmfk3KwR6CFfKV/eLuVA883x8j7tqY4YHmHn7RInFdibHwF6Ka58P7
-zwdoCWFvLZjFjaAWERxqGGjIZex/3FhxtgKEN4rWtUqlRNwhCMJP2ee4BIY84dTK
-rw154uC2Ng7lchO5gbMyUTxxVWX0K/oqpKW4nvpbsj2kkZI5rFSt5FRC/kVwkWJK
-9UTDRWo5w/HbzA8JVAnU0vwax0/E2nDrYSu1pbGOb0F97H+UBSWBMaBqZHoJLkEi
-wDJ2bH/IB8MKNLHT
-					    </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://federation.u-pem.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://federation.u-pem.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://federation.u-pem.fr/idp/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Université Paris-Est Marne-la-Vallée</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Université Paris-Est Marne-la-Vallée</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <EmailAddress>adm-federation@u-pem.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/federation.unimes.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/federation.unimes.fr-idp-shibboleth.xml
deleted file mode 100644
index 46998bc3..00000000
--- a/swamid-interfederations-2.0/federation.unimes.fr-idp-shibboleth.xml
+++ /dev/null
@@ -1,170 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://federation.unimes.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2009-09-07T13:55:45Z">
-      <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">unimes.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Université de Nimes</mdui:DisplayName>
-        <mdui:Description xml:lang="en">All members of the UNIMES community: staff, students, library readers, alumni, staff from other institutions working locally, guests, etc.</mdui:Description>
-        <mdui:DisplayName xml:lang="fr">Université de Nimes</mdui:DisplayName>
-        <mdui:Description xml:lang="fr">Tous les membres de la communauté UNIMES : personnels, étudiants, lecteurs des bibliothèques, anciens étudiants, personnels d'autres établissement saillant dans l'université, invités, prestataires, anciens personnels gardant une activité.</mdui:Description>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIEdTCCA12gAwIBAgIQA+x4/gpIpc75aHTaD2HjdjANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTEyMTAyMzAwMDAwMFoXDTE1MTIwOTIzNTk1OVowTDELMAkGA1UE
-BhMCRlIxHjAcBgNVBAoMFVVuaXZlcnNpdMOpIGRlIE7Drm1lczEdMBsGA1UEAxMU
-ZmVkZXJhdGlvbi51bmltZXMuZnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
-AoIBAQDfE7PieWyEg8LeR53J/lE/B59bPXfHLEO+uLd3OBC8jTGkIRWvaqPgM1Gk
-lCzK/efmA1s11KncwGOTvJJJPeWFAOisznFMbNfhI1tPSYDIxlULXQBEnTCy9eUm
-JV2zo3MvCVFw1vJPXgyA7m4KsMu39meUuhK6emBfv0vz1Kh8eABMDR/c945d0TXP
-XCizQ9I3SyU/zVJ18XcaniaZ777mjNaNmT3ZJhqj85cSRQNBH1nAT4/GeLUMuyv1
-5ymGq0ytEhp8QKcWfwRvU5InOQlG17R8z7BxXtJbuvuaG7kk7UO8TJ4bHNU+14T9
-EqCKaalydIILjRBNfwe8fZ6b+ohvAgMBAAGjggFnMIIBYzAfBgNVHSMEGDAWgBQM
-vZNoDPPeq6NJays3V0fqkOO57TAdBgNVHQ4EFgQU720AGcrCuWMx7XX5CLNo5qGm
-JyswDgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYB
-BQUHAwEGCCsGAQUFBwMCMBgGA1UdIAQRMA8wDQYLKwYBBAGyMQECAh0wOgYDVR0f
-BDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xD
-QS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRj
-cy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDov
-L29jc3AudGNzLnRlcmVuYS5vcmcwHwYDVR0RBBgwFoIUZmVkZXJhdGlvbi51bmlt
-ZXMuZnIwDQYJKoZIhvcNAQEFBQADggEBAJJRjU+uJplLJdi4qKubLFQv61lnWLMg
-w3IbQ2icm7u9dEUNIY2nXj8a2nBn6svWzNyPlvipHhEbj/KWkQPwmEIQWSBXz8aK
-cRG0kNEqEvrpkLVFakNWzm/T6pEh6VhRiu85LMQeMHo2zrFGOo92b/OY9NGq+nyX
-8kDchVM7wj/JlMU57UuZ7hCRsE/T+GgghBgCoU1u9Way8ker6s6DvPv38jgOT7/P
-cMz63qOCn2FWBpvJL1ykjw+vu4cL8NXdo51ZgYG+03hcb3lBFv5f3Y2y7Pitgy+K
-R2jCO9a/ZWDePkmPnf1zmgyJ+twxhYqPwTbGDoNozxNNLsXQLOPNSaU=
-					    </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>
-					      MIIEpDCCA4ygAwIBAgIQL1M6BUXb9ey/N5UwsW6q8zANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTA5MTExOTAwMDAwMFoXDTEyMTExODIzNTk1OVowezELMAkGA1UE
-BhMCRlIxDzANBgNVBAcMBk7Drm1lczEeMBwGA1UECgwVVW5pdmVyc2l0w6kgZGUg
-TsOubWVzMRwwGgYDVQQLExN1bml2ZXJzaXRlIGRlIG5pbWVzMR0wGwYDVQQDExRm
-ZWRlcmF0aW9uLnVuaW1lcy5mcjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
-ggEBANHvYAl0+rpik/m50vPpeormI0yeYWtu37gDW9P159zOraMiKjfTBU3r5Oe6
-PUa4jVWXfDuAO97LWdUMX4m1cTRO/v20JYPeSEVVJSOULzazC/kV9W7wPJRqONkt
-btJr7a0VgbGR1ZVVEJ3sZggLafUVT09n0YLhMMwdRPDpsD7iE7tdBQuEc7AlpLS0
-XWHx4P+6vDdIwyhFIJt8nyVkTs+JkZ+troK8wkYgW/l4bktrajcwQjOHiisdk4ZP
-WxRiNEcAdWcH4qp86pi6fG2YXy1deYnMtOIz5xyTTVwcl/7xCpWEnj1hbR2x7wRX
-twgfqAH95T0PhwuioSaj35DShFMCAwEAAaOCAWcwggFjMB8GA1UdIwQYMBaAFAy9
-k2gM896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBTBXcQRRBdoAv1nWM2OU71HTFaZ
-xjAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEF
-BQcDAQYIKwYBBQUHAwIwGAYDVR0gBBEwDzANBgsrBgEEAbIxAQICHTA6BgNVHR8E
-MzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENB
-LmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNz
-LnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8v
-b2NzcC50Y3MudGVyZW5hLm9yZzAfBgNVHREEGDAWghRmZWRlcmF0aW9uLnVuaW1l
-cy5mcjANBgkqhkiG9w0BAQUFAAOCAQEAQi35VtjG2PEd7o4yAWU6acXgddghxls2
-2kqlN7KcFl6PpQ2lpHfUHVmncTmafoQEHmlgjFscWYgagRb1UQZ4pmquoEfr2v8Y
-0Fox/MQHIUV4xCPyRSIiSGOHAI62rG3HOrV2ha6LusjaJPNdNaetCgX+XJFFNKMm
-dnUIrUnxSsaMhx/zACINKnb09Ob2AGDz5KgFvq8V0IRcl09d/qWLE61m/wvIZfaF
-VTP5+9UA1RfGxEIOG3zA4D309fxapoVnb84yM9eRNgtw6hZrzDyZfNWQ1VkSVrFO
-xqaW8/4VYHjxNTVZ2KxsKKVL1ykc/9Gk5YAITiyKeWFjYhP17R9+Cw==
-					    </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://federation.unimes.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://federation.unimes.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://federation.unimes.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">unimes.fr</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIEdTCCA12gAwIBAgIQA+x4/gpIpc75aHTaD2HjdjANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTEyMTAyMzAwMDAwMFoXDTE1MTIwOTIzNTk1OVowTDELMAkGA1UE
-BhMCRlIxHjAcBgNVBAoMFVVuaXZlcnNpdMOpIGRlIE7Drm1lczEdMBsGA1UEAxMU
-ZmVkZXJhdGlvbi51bmltZXMuZnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
-AoIBAQDfE7PieWyEg8LeR53J/lE/B59bPXfHLEO+uLd3OBC8jTGkIRWvaqPgM1Gk
-lCzK/efmA1s11KncwGOTvJJJPeWFAOisznFMbNfhI1tPSYDIxlULXQBEnTCy9eUm
-JV2zo3MvCVFw1vJPXgyA7m4KsMu39meUuhK6emBfv0vz1Kh8eABMDR/c945d0TXP
-XCizQ9I3SyU/zVJ18XcaniaZ777mjNaNmT3ZJhqj85cSRQNBH1nAT4/GeLUMuyv1
-5ymGq0ytEhp8QKcWfwRvU5InOQlG17R8z7BxXtJbuvuaG7kk7UO8TJ4bHNU+14T9
-EqCKaalydIILjRBNfwe8fZ6b+ohvAgMBAAGjggFnMIIBYzAfBgNVHSMEGDAWgBQM
-vZNoDPPeq6NJays3V0fqkOO57TAdBgNVHQ4EFgQU720AGcrCuWMx7XX5CLNo5qGm
-JyswDgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYB
-BQUHAwEGCCsGAQUFBwMCMBgGA1UdIAQRMA8wDQYLKwYBBAGyMQECAh0wOgYDVR0f
-BDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xD
-QS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRj
-cy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDov
-L29jc3AudGNzLnRlcmVuYS5vcmcwHwYDVR0RBBgwFoIUZmVkZXJhdGlvbi51bmlt
-ZXMuZnIwDQYJKoZIhvcNAQEFBQADggEBAJJRjU+uJplLJdi4qKubLFQv61lnWLMg
-w3IbQ2icm7u9dEUNIY2nXj8a2nBn6svWzNyPlvipHhEbj/KWkQPwmEIQWSBXz8aK
-cRG0kNEqEvrpkLVFakNWzm/T6pEh6VhRiu85LMQeMHo2zrFGOo92b/OY9NGq+nyX
-8kDchVM7wj/JlMU57UuZ7hCRsE/T+GgghBgCoU1u9Way8ker6s6DvPv38jgOT7/P
-cMz63qOCn2FWBpvJL1ykjw+vu4cL8NXdo51ZgYG+03hcb3lBFv5f3Y2y7Pitgy+K
-R2jCO9a/ZWDePkmPnf1zmgyJ+twxhYqPwTbGDoNozxNNLsXQLOPNSaU=
-					    </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>
-					      MIIEpDCCA4ygAwIBAgIQL1M6BUXb9ey/N5UwsW6q8zANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTA5MTExOTAwMDAwMFoXDTEyMTExODIzNTk1OVowezELMAkGA1UE
-BhMCRlIxDzANBgNVBAcMBk7Drm1lczEeMBwGA1UECgwVVW5pdmVyc2l0w6kgZGUg
-TsOubWVzMRwwGgYDVQQLExN1bml2ZXJzaXRlIGRlIG5pbWVzMR0wGwYDVQQDExRm
-ZWRlcmF0aW9uLnVuaW1lcy5mcjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
-ggEBANHvYAl0+rpik/m50vPpeormI0yeYWtu37gDW9P159zOraMiKjfTBU3r5Oe6
-PUa4jVWXfDuAO97LWdUMX4m1cTRO/v20JYPeSEVVJSOULzazC/kV9W7wPJRqONkt
-btJr7a0VgbGR1ZVVEJ3sZggLafUVT09n0YLhMMwdRPDpsD7iE7tdBQuEc7AlpLS0
-XWHx4P+6vDdIwyhFIJt8nyVkTs+JkZ+troK8wkYgW/l4bktrajcwQjOHiisdk4ZP
-WxRiNEcAdWcH4qp86pi6fG2YXy1deYnMtOIz5xyTTVwcl/7xCpWEnj1hbR2x7wRX
-twgfqAH95T0PhwuioSaj35DShFMCAwEAAaOCAWcwggFjMB8GA1UdIwQYMBaAFAy9
-k2gM896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBTBXcQRRBdoAv1nWM2OU71HTFaZ
-xjAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEF
-BQcDAQYIKwYBBQUHAwIwGAYDVR0gBBEwDzANBgsrBgEEAbIxAQICHTA6BgNVHR8E
-MzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENB
-LmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNz
-LnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8v
-b2NzcC50Y3MudGVyZW5hLm9yZzAfBgNVHREEGDAWghRmZWRlcmF0aW9uLnVuaW1l
-cy5mcjANBgkqhkiG9w0BAQUFAAOCAQEAQi35VtjG2PEd7o4yAWU6acXgddghxls2
-2kqlN7KcFl6PpQ2lpHfUHVmncTmafoQEHmlgjFscWYgagRb1UQZ4pmquoEfr2v8Y
-0Fox/MQHIUV4xCPyRSIiSGOHAI62rG3HOrV2ha6LusjaJPNdNaetCgX+XJFFNKMm
-dnUIrUnxSsaMhx/zACINKnb09Ob2AGDz5KgFvq8V0IRcl09d/qWLE61m/wvIZfaF
-VTP5+9UA1RfGxEIOG3zA4D309fxapoVnb84yM9eRNgtw6hZrzDyZfNWQ1VkSVrFO
-xqaW8/4VYHjxNTVZ2KxsKKVL1ykc/9Gk5YAITiyKeWFjYhP17R9+Cw==
-					    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://federation.unimes.fr/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">Université de Nimes</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Université de Nimes</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <EmailAddress>reseaux@unimes.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/federation.unimes.fr.xml b/swamid-interfederations-2.0/federation.unimes.fr.xml
deleted file mode 100644
index 46998bc3..00000000
--- a/swamid-interfederations-2.0/federation.unimes.fr.xml
+++ /dev/null
@@ -1,170 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://federation.unimes.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2009-09-07T13:55:45Z">
-      <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">unimes.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Université de Nimes</mdui:DisplayName>
-        <mdui:Description xml:lang="en">All members of the UNIMES community: staff, students, library readers, alumni, staff from other institutions working locally, guests, etc.</mdui:Description>
-        <mdui:DisplayName xml:lang="fr">Université de Nimes</mdui:DisplayName>
-        <mdui:Description xml:lang="fr">Tous les membres de la communauté UNIMES : personnels, étudiants, lecteurs des bibliothèques, anciens étudiants, personnels d'autres établissement saillant dans l'université, invités, prestataires, anciens personnels gardant une activité.</mdui:Description>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIEdTCCA12gAwIBAgIQA+x4/gpIpc75aHTaD2HjdjANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTEyMTAyMzAwMDAwMFoXDTE1MTIwOTIzNTk1OVowTDELMAkGA1UE
-BhMCRlIxHjAcBgNVBAoMFVVuaXZlcnNpdMOpIGRlIE7Drm1lczEdMBsGA1UEAxMU
-ZmVkZXJhdGlvbi51bmltZXMuZnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
-AoIBAQDfE7PieWyEg8LeR53J/lE/B59bPXfHLEO+uLd3OBC8jTGkIRWvaqPgM1Gk
-lCzK/efmA1s11KncwGOTvJJJPeWFAOisznFMbNfhI1tPSYDIxlULXQBEnTCy9eUm
-JV2zo3MvCVFw1vJPXgyA7m4KsMu39meUuhK6emBfv0vz1Kh8eABMDR/c945d0TXP
-XCizQ9I3SyU/zVJ18XcaniaZ777mjNaNmT3ZJhqj85cSRQNBH1nAT4/GeLUMuyv1
-5ymGq0ytEhp8QKcWfwRvU5InOQlG17R8z7BxXtJbuvuaG7kk7UO8TJ4bHNU+14T9
-EqCKaalydIILjRBNfwe8fZ6b+ohvAgMBAAGjggFnMIIBYzAfBgNVHSMEGDAWgBQM
-vZNoDPPeq6NJays3V0fqkOO57TAdBgNVHQ4EFgQU720AGcrCuWMx7XX5CLNo5qGm
-JyswDgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYB
-BQUHAwEGCCsGAQUFBwMCMBgGA1UdIAQRMA8wDQYLKwYBBAGyMQECAh0wOgYDVR0f
-BDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xD
-QS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRj
-cy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDov
-L29jc3AudGNzLnRlcmVuYS5vcmcwHwYDVR0RBBgwFoIUZmVkZXJhdGlvbi51bmlt
-ZXMuZnIwDQYJKoZIhvcNAQEFBQADggEBAJJRjU+uJplLJdi4qKubLFQv61lnWLMg
-w3IbQ2icm7u9dEUNIY2nXj8a2nBn6svWzNyPlvipHhEbj/KWkQPwmEIQWSBXz8aK
-cRG0kNEqEvrpkLVFakNWzm/T6pEh6VhRiu85LMQeMHo2zrFGOo92b/OY9NGq+nyX
-8kDchVM7wj/JlMU57UuZ7hCRsE/T+GgghBgCoU1u9Way8ker6s6DvPv38jgOT7/P
-cMz63qOCn2FWBpvJL1ykjw+vu4cL8NXdo51ZgYG+03hcb3lBFv5f3Y2y7Pitgy+K
-R2jCO9a/ZWDePkmPnf1zmgyJ+twxhYqPwTbGDoNozxNNLsXQLOPNSaU=
-					    </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>
-					      MIIEpDCCA4ygAwIBAgIQL1M6BUXb9ey/N5UwsW6q8zANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTA5MTExOTAwMDAwMFoXDTEyMTExODIzNTk1OVowezELMAkGA1UE
-BhMCRlIxDzANBgNVBAcMBk7Drm1lczEeMBwGA1UECgwVVW5pdmVyc2l0w6kgZGUg
-TsOubWVzMRwwGgYDVQQLExN1bml2ZXJzaXRlIGRlIG5pbWVzMR0wGwYDVQQDExRm
-ZWRlcmF0aW9uLnVuaW1lcy5mcjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
-ggEBANHvYAl0+rpik/m50vPpeormI0yeYWtu37gDW9P159zOraMiKjfTBU3r5Oe6
-PUa4jVWXfDuAO97LWdUMX4m1cTRO/v20JYPeSEVVJSOULzazC/kV9W7wPJRqONkt
-btJr7a0VgbGR1ZVVEJ3sZggLafUVT09n0YLhMMwdRPDpsD7iE7tdBQuEc7AlpLS0
-XWHx4P+6vDdIwyhFIJt8nyVkTs+JkZ+troK8wkYgW/l4bktrajcwQjOHiisdk4ZP
-WxRiNEcAdWcH4qp86pi6fG2YXy1deYnMtOIz5xyTTVwcl/7xCpWEnj1hbR2x7wRX
-twgfqAH95T0PhwuioSaj35DShFMCAwEAAaOCAWcwggFjMB8GA1UdIwQYMBaAFAy9
-k2gM896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBTBXcQRRBdoAv1nWM2OU71HTFaZ
-xjAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEF
-BQcDAQYIKwYBBQUHAwIwGAYDVR0gBBEwDzANBgsrBgEEAbIxAQICHTA6BgNVHR8E
-MzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENB
-LmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNz
-LnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8v
-b2NzcC50Y3MudGVyZW5hLm9yZzAfBgNVHREEGDAWghRmZWRlcmF0aW9uLnVuaW1l
-cy5mcjANBgkqhkiG9w0BAQUFAAOCAQEAQi35VtjG2PEd7o4yAWU6acXgddghxls2
-2kqlN7KcFl6PpQ2lpHfUHVmncTmafoQEHmlgjFscWYgagRb1UQZ4pmquoEfr2v8Y
-0Fox/MQHIUV4xCPyRSIiSGOHAI62rG3HOrV2ha6LusjaJPNdNaetCgX+XJFFNKMm
-dnUIrUnxSsaMhx/zACINKnb09Ob2AGDz5KgFvq8V0IRcl09d/qWLE61m/wvIZfaF
-VTP5+9UA1RfGxEIOG3zA4D309fxapoVnb84yM9eRNgtw6hZrzDyZfNWQ1VkSVrFO
-xqaW8/4VYHjxNTVZ2KxsKKVL1ykc/9Gk5YAITiyKeWFjYhP17R9+Cw==
-					    </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://federation.unimes.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://federation.unimes.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://federation.unimes.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">unimes.fr</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIEdTCCA12gAwIBAgIQA+x4/gpIpc75aHTaD2HjdjANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTEyMTAyMzAwMDAwMFoXDTE1MTIwOTIzNTk1OVowTDELMAkGA1UE
-BhMCRlIxHjAcBgNVBAoMFVVuaXZlcnNpdMOpIGRlIE7Drm1lczEdMBsGA1UEAxMU
-ZmVkZXJhdGlvbi51bmltZXMuZnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
-AoIBAQDfE7PieWyEg8LeR53J/lE/B59bPXfHLEO+uLd3OBC8jTGkIRWvaqPgM1Gk
-lCzK/efmA1s11KncwGOTvJJJPeWFAOisznFMbNfhI1tPSYDIxlULXQBEnTCy9eUm
-JV2zo3MvCVFw1vJPXgyA7m4KsMu39meUuhK6emBfv0vz1Kh8eABMDR/c945d0TXP
-XCizQ9I3SyU/zVJ18XcaniaZ777mjNaNmT3ZJhqj85cSRQNBH1nAT4/GeLUMuyv1
-5ymGq0ytEhp8QKcWfwRvU5InOQlG17R8z7BxXtJbuvuaG7kk7UO8TJ4bHNU+14T9
-EqCKaalydIILjRBNfwe8fZ6b+ohvAgMBAAGjggFnMIIBYzAfBgNVHSMEGDAWgBQM
-vZNoDPPeq6NJays3V0fqkOO57TAdBgNVHQ4EFgQU720AGcrCuWMx7XX5CLNo5qGm
-JyswDgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYB
-BQUHAwEGCCsGAQUFBwMCMBgGA1UdIAQRMA8wDQYLKwYBBAGyMQECAh0wOgYDVR0f
-BDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xD
-QS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRj
-cy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDov
-L29jc3AudGNzLnRlcmVuYS5vcmcwHwYDVR0RBBgwFoIUZmVkZXJhdGlvbi51bmlt
-ZXMuZnIwDQYJKoZIhvcNAQEFBQADggEBAJJRjU+uJplLJdi4qKubLFQv61lnWLMg
-w3IbQ2icm7u9dEUNIY2nXj8a2nBn6svWzNyPlvipHhEbj/KWkQPwmEIQWSBXz8aK
-cRG0kNEqEvrpkLVFakNWzm/T6pEh6VhRiu85LMQeMHo2zrFGOo92b/OY9NGq+nyX
-8kDchVM7wj/JlMU57UuZ7hCRsE/T+GgghBgCoU1u9Way8ker6s6DvPv38jgOT7/P
-cMz63qOCn2FWBpvJL1ykjw+vu4cL8NXdo51ZgYG+03hcb3lBFv5f3Y2y7Pitgy+K
-R2jCO9a/ZWDePkmPnf1zmgyJ+twxhYqPwTbGDoNozxNNLsXQLOPNSaU=
-					    </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>
-					      MIIEpDCCA4ygAwIBAgIQL1M6BUXb9ey/N5UwsW6q8zANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTA5MTExOTAwMDAwMFoXDTEyMTExODIzNTk1OVowezELMAkGA1UE
-BhMCRlIxDzANBgNVBAcMBk7Drm1lczEeMBwGA1UECgwVVW5pdmVyc2l0w6kgZGUg
-TsOubWVzMRwwGgYDVQQLExN1bml2ZXJzaXRlIGRlIG5pbWVzMR0wGwYDVQQDExRm
-ZWRlcmF0aW9uLnVuaW1lcy5mcjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
-ggEBANHvYAl0+rpik/m50vPpeormI0yeYWtu37gDW9P159zOraMiKjfTBU3r5Oe6
-PUa4jVWXfDuAO97LWdUMX4m1cTRO/v20JYPeSEVVJSOULzazC/kV9W7wPJRqONkt
-btJr7a0VgbGR1ZVVEJ3sZggLafUVT09n0YLhMMwdRPDpsD7iE7tdBQuEc7AlpLS0
-XWHx4P+6vDdIwyhFIJt8nyVkTs+JkZ+troK8wkYgW/l4bktrajcwQjOHiisdk4ZP
-WxRiNEcAdWcH4qp86pi6fG2YXy1deYnMtOIz5xyTTVwcl/7xCpWEnj1hbR2x7wRX
-twgfqAH95T0PhwuioSaj35DShFMCAwEAAaOCAWcwggFjMB8GA1UdIwQYMBaAFAy9
-k2gM896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBTBXcQRRBdoAv1nWM2OU71HTFaZ
-xjAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEF
-BQcDAQYIKwYBBQUHAwIwGAYDVR0gBBEwDzANBgsrBgEEAbIxAQICHTA6BgNVHR8E
-MzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENB
-LmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNz
-LnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8v
-b2NzcC50Y3MudGVyZW5hLm9yZzAfBgNVHREEGDAWghRmZWRlcmF0aW9uLnVuaW1l
-cy5mcjANBgkqhkiG9w0BAQUFAAOCAQEAQi35VtjG2PEd7o4yAWU6acXgddghxls2
-2kqlN7KcFl6PpQ2lpHfUHVmncTmafoQEHmlgjFscWYgagRb1UQZ4pmquoEfr2v8Y
-0Fox/MQHIUV4xCPyRSIiSGOHAI62rG3HOrV2ha6LusjaJPNdNaetCgX+XJFFNKMm
-dnUIrUnxSsaMhx/zACINKnb09Ob2AGDz5KgFvq8V0IRcl09d/qWLE61m/wvIZfaF
-VTP5+9UA1RfGxEIOG3zA4D309fxapoVnb84yM9eRNgtw6hZrzDyZfNWQ1VkSVrFO
-xqaW8/4VYHjxNTVZ2KxsKKVL1ykc/9Gk5YAITiyKeWFjYhP17R9+Cw==
-					    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://federation.unimes.fr/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">Université de Nimes</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Université de Nimes</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <EmailAddress>reseaux@unimes.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/federation.upf.pf-idp-shibboleth.xml b/swamid-interfederations-2.0/federation.upf.pf-idp-shibboleth.xml
deleted file mode 100644
index 55b0e7eb..00000000
--- a/swamid-interfederations-2.0/federation.upf.pf-idp-shibboleth.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://federation.upf.pf/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2013-05-31T22:29:12Z">
-      <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">upf.pf</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">University of French Polynesia</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Employee, Student</mdui:Description>
-        <mdui:DisplayName xml:lang="fr">Université de Polynésie française</mdui:DisplayName>
-        <mdui:Description xml:lang="fr">Personnels, Etudiants</mdui:Description>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDLzCCAhegAwIBAgIUFC0XwDnBlYK71GiAUaF7vx7MRXIwDQYJKoZIhvcNAQEF
-BQAwHDEaMBgGA1UEAxMRZmVkZXJhdGlvbi51cGYucGYwHhcNMTMwNDE4MDI1NjA5
-WhcNMzMwNDE4MDI1NjA5WjAcMRowGAYDVQQDExFmZWRlcmF0aW9uLnVwZi5wZjCC
-ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMKdTj5nsNnLZKNJKeb8m9lf
-eGVP3AjbhAJo0Fc0KjE3mFUUOc8ScnvT5ms3tD3fvY4OM57ysI+6fXIfqks+K3fU
-p6dbTUUA7EayO/AXEeEZIYmGobqhFbf/+HL+XbaNj6Fu66otgU83ENyz9hWKsd7L
-UoKc/IpYYb5lxRiZObLsD3cZLkQUdaEKmVqBnsl4QBRFgqbbujg9+b9yGc7S6tWt
-tiz0VU9mmDzYz7RvUg3rlxrt/XHTdv9pyNIBfXyWbHwBl20x9RLWantPh5B/gzMg
-NG9Gsxrg2s6jOJkWExAaJui9udv6ZG4Om006MXimSQQJQjefxaFf5tMPkohQuQMC
-AwEAAaNpMGcwRgYDVR0RBD8wPYIRZmVkZXJhdGlvbi51cGYucGaGKGh0dHBzOi8v
-ZmVkZXJhdGlvbi51cGYucGYvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFErV+rWb
-dP0OnShtmHsMw4ScsryqMA0GCSqGSIb3DQEBBQUAA4IBAQCQtbM/X3jSinJzQ/iM
-GssEbM/bT5sysN1Y1rsSXCn/Voy27ikk5WN5dbfWZZ1KIYnZtFvJwk3JUUpAXvYS
-TjDkoYhatlfdXSR0ZDJUrtGeo+Rpf8s4Y1UX6EuiywKKU/rxUaGs5m4sG94Xixys
-+/WSNcRFx+Oub984KlUVGNJdFsW4QJhLm0SIlzhn1XmHyF8Zk6111bBBVXVGqO7r
-bA2FN5TC8+oLwbU4vngFuLBu3cNt0xDE5C3760iVBLU++kah8FBjAZQsK0dnXyM3
-Jlfc1EsNYvnxkLXlrcZIC5yU8s+4ht45VLUahR9HNHB+sCw9hGlcbV3QigKTlJav
-pbip
-					    </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://federation.upf.pf/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://federation.upf.pf/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://federation.upf.pf/idp/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Université de Polynésie française</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Université de Polynésie française</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <EmailAddress>dsi@upf.pf</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/federation.upf.pf.xml b/swamid-interfederations-2.0/federation.upf.pf.xml
deleted file mode 100644
index 55b0e7eb..00000000
--- a/swamid-interfederations-2.0/federation.upf.pf.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://federation.upf.pf/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2013-05-31T22:29:12Z">
-      <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">upf.pf</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">University of French Polynesia</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Employee, Student</mdui:Description>
-        <mdui:DisplayName xml:lang="fr">Université de Polynésie française</mdui:DisplayName>
-        <mdui:Description xml:lang="fr">Personnels, Etudiants</mdui:Description>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDLzCCAhegAwIBAgIUFC0XwDnBlYK71GiAUaF7vx7MRXIwDQYJKoZIhvcNAQEF
-BQAwHDEaMBgGA1UEAxMRZmVkZXJhdGlvbi51cGYucGYwHhcNMTMwNDE4MDI1NjA5
-WhcNMzMwNDE4MDI1NjA5WjAcMRowGAYDVQQDExFmZWRlcmF0aW9uLnVwZi5wZjCC
-ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMKdTj5nsNnLZKNJKeb8m9lf
-eGVP3AjbhAJo0Fc0KjE3mFUUOc8ScnvT5ms3tD3fvY4OM57ysI+6fXIfqks+K3fU
-p6dbTUUA7EayO/AXEeEZIYmGobqhFbf/+HL+XbaNj6Fu66otgU83ENyz9hWKsd7L
-UoKc/IpYYb5lxRiZObLsD3cZLkQUdaEKmVqBnsl4QBRFgqbbujg9+b9yGc7S6tWt
-tiz0VU9mmDzYz7RvUg3rlxrt/XHTdv9pyNIBfXyWbHwBl20x9RLWantPh5B/gzMg
-NG9Gsxrg2s6jOJkWExAaJui9udv6ZG4Om006MXimSQQJQjefxaFf5tMPkohQuQMC
-AwEAAaNpMGcwRgYDVR0RBD8wPYIRZmVkZXJhdGlvbi51cGYucGaGKGh0dHBzOi8v
-ZmVkZXJhdGlvbi51cGYucGYvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFErV+rWb
-dP0OnShtmHsMw4ScsryqMA0GCSqGSIb3DQEBBQUAA4IBAQCQtbM/X3jSinJzQ/iM
-GssEbM/bT5sysN1Y1rsSXCn/Voy27ikk5WN5dbfWZZ1KIYnZtFvJwk3JUUpAXvYS
-TjDkoYhatlfdXSR0ZDJUrtGeo+Rpf8s4Y1UX6EuiywKKU/rxUaGs5m4sG94Xixys
-+/WSNcRFx+Oub984KlUVGNJdFsW4QJhLm0SIlzhn1XmHyF8Zk6111bBBVXVGqO7r
-bA2FN5TC8+oLwbU4vngFuLBu3cNt0xDE5C3760iVBLU++kah8FBjAZQsK0dnXyM3
-Jlfc1EsNYvnxkLXlrcZIC5yU8s+4ht45VLUahR9HNHB+sCw9hGlcbV3QigKTlJav
-pbip
-					    </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://federation.upf.pf/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://federation.upf.pf/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://federation.upf.pf/idp/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Université de Polynésie française</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Université de Polynésie française</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <EmailAddress>dsi@upf.pf</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/federation.utbm.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/federation.utbm.fr-idp-shibboleth.xml
deleted file mode 100644
index 46ff9b7d..00000000
--- a/swamid-interfederations-2.0/federation.utbm.fr-idp-shibboleth.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://federation.utbm.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2012-12-13T13:48:40Z">
-      <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">utbm.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">Université de Technologie de Belfort-Montbéliard</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDMzCCAhugAwIBAgIUb4XRw/k+kZc+WFwzq1F9FsvDbwEwDQYJKoZIhvcNAQEF
-BQAwHTEbMBkGA1UEAxMSZmVkZXJhdGlvbi51dGJtLmZyMB4XDTEyMDcxMjEyNDEw
-NFoXDTMyMDcxMjEyNDEwNFowHTEbMBkGA1UEAxMSZmVkZXJhdGlvbi51dGJtLmZy
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApR6JQmSaezaESAFmv21B
-sXk5DXZmezdLDuKlPjQJp68eOc/1MDaS+b0UCQzjW9CJGNKRGecNkts0EYlnS+fd
-9I3hukKCpKbQB+fzqyLfEbOktQ8HeSXCOVuZqbKyWn/tAeqRXPWa60j6aouZHGcs
-QsCxdN4A5H3m3BxRBUKZWl9YPhshoYS0X5s1cN3ryEM0F178F4Dx/d7wJSxjcqYp
-TkmwYOYLrDxIG34/12JrWhheephvSV6KHGqylZGm8PieeU/dMfYoqlPDygx3lLmG
-WYJ4czikUXYXutSxa9sx1YqjslDNjN/opVnL5ej/H7L0I6XaBuxvZ7EY8Ez5l8gW
-EwIDAQABo2swaTBIBgNVHREEQTA/ghJmZWRlcmF0aW9uLnV0Ym0uZnKGKWh0dHBz
-Oi8vZmVkZXJhdGlvbi51dGJtLmZyL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBRn
-KDMEILCZOOzXatLQKA9dtx9RMzANBgkqhkiG9w0BAQUFAAOCAQEAAxvjTcRA2lsE
-MdepN1Pw8qgKgIVT8ptE7xspkSp3vbiMbFB6WUCBbmo9OGRXz/ml034OqIEmtOQA
-HD4bLKWak9FlZmvtKisClNpFUblWcHHCdEkw6gHNj+GEuLSREVDiXlyuPMiHIiM/
-NBS2NevXTCRtrWWYtLsy/8/9DIqp5wl+Tw4KhYzbnmAp1HXijhjQTlEU9so74g9M
-p1/I8t00rET4cbu2OgNnsnJsJ7eYlxs2/7r7ym92Brq94Cq+DqlVo6lAsnumtDFY
-pWS70X7hmXF+uwJn5EAqK6m4fQdJouyaQD1Eyosj5vYiQG02H8/+HE+FTthzgvq7
-DM8klPBfXg==
-					    </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://federation.utbm.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://federation.utbm.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://federation.utbm.fr/idp/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Université de Technologie de Belfort-Montbéliard</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Université de Technologie de Belfort-Montbéliard</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Arnaud Sinteff</SurName>
-    <EmailAddress>arnaud.sinteff@utbm.fr</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <SurName>Dominique Dal Ponte</SurName>
-    <EmailAddress>dominique.dalponte@utbm.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/federation.utbm.fr.xml b/swamid-interfederations-2.0/federation.utbm.fr.xml
deleted file mode 100644
index 46ff9b7d..00000000
--- a/swamid-interfederations-2.0/federation.utbm.fr.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://federation.utbm.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2012-12-13T13:48:40Z">
-      <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">utbm.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">Université de Technologie de Belfort-Montbéliard</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDMzCCAhugAwIBAgIUb4XRw/k+kZc+WFwzq1F9FsvDbwEwDQYJKoZIhvcNAQEF
-BQAwHTEbMBkGA1UEAxMSZmVkZXJhdGlvbi51dGJtLmZyMB4XDTEyMDcxMjEyNDEw
-NFoXDTMyMDcxMjEyNDEwNFowHTEbMBkGA1UEAxMSZmVkZXJhdGlvbi51dGJtLmZy
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApR6JQmSaezaESAFmv21B
-sXk5DXZmezdLDuKlPjQJp68eOc/1MDaS+b0UCQzjW9CJGNKRGecNkts0EYlnS+fd
-9I3hukKCpKbQB+fzqyLfEbOktQ8HeSXCOVuZqbKyWn/tAeqRXPWa60j6aouZHGcs
-QsCxdN4A5H3m3BxRBUKZWl9YPhshoYS0X5s1cN3ryEM0F178F4Dx/d7wJSxjcqYp
-TkmwYOYLrDxIG34/12JrWhheephvSV6KHGqylZGm8PieeU/dMfYoqlPDygx3lLmG
-WYJ4czikUXYXutSxa9sx1YqjslDNjN/opVnL5ej/H7L0I6XaBuxvZ7EY8Ez5l8gW
-EwIDAQABo2swaTBIBgNVHREEQTA/ghJmZWRlcmF0aW9uLnV0Ym0uZnKGKWh0dHBz
-Oi8vZmVkZXJhdGlvbi51dGJtLmZyL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBRn
-KDMEILCZOOzXatLQKA9dtx9RMzANBgkqhkiG9w0BAQUFAAOCAQEAAxvjTcRA2lsE
-MdepN1Pw8qgKgIVT8ptE7xspkSp3vbiMbFB6WUCBbmo9OGRXz/ml034OqIEmtOQA
-HD4bLKWak9FlZmvtKisClNpFUblWcHHCdEkw6gHNj+GEuLSREVDiXlyuPMiHIiM/
-NBS2NevXTCRtrWWYtLsy/8/9DIqp5wl+Tw4KhYzbnmAp1HXijhjQTlEU9so74g9M
-p1/I8t00rET4cbu2OgNnsnJsJ7eYlxs2/7r7ym92Brq94Cq+DqlVo6lAsnumtDFY
-pWS70X7hmXF+uwJn5EAqK6m4fQdJouyaQD1Eyosj5vYiQG02H8/+HE+FTthzgvq7
-DM8klPBfXg==
-					    </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://federation.utbm.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://federation.utbm.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://federation.utbm.fr/idp/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Université de Technologie de Belfort-Montbéliard</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Université de Technologie de Belfort-Montbéliard</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Arnaud Sinteff</SurName>
-    <EmailAddress>arnaud.sinteff@utbm.fr</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <SurName>Dominique Dal Ponte</SurName>
-    <EmailAddress>dominique.dalponte@utbm.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/federation2.univ-brest.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/federation2.univ-brest.fr-idp-shibboleth.xml
deleted file mode 100644
index 7e3fe7a1..00000000
--- a/swamid-interfederations-2.0/federation2.univ-brest.fr-idp-shibboleth.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://federation2.univ-brest.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2009-06-26T15:36:06Z">
-      <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">univ-brest.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">Université de Bretagne Occidentale</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDTzCCAjegAwIBAgIUbLNw35nuqDWZoyy6h3P4LlkzPIAwDQYJKoZIhvcNAQEF
-BQAwJDEiMCAGA1UEAxMZZmVkZXJhdGlvbjIudW5pdi1icmVzdC5mcjAeFw0xMzAz
-MTIyMTE1MDVaFw0zMzAzMTIyMTE1MDVaMCQxIjAgBgNVBAMTGWZlZGVyYXRpb24y
-LnVuaXYtYnJlc3QuZnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCe
-kMm2n9YaUsOi8wAXfTnfE7/jehc3Mnc5UP4iR2A9mTF6fZc025FTK/O5O3lEowUh
-FCT8cD2sYjRm+hX+G8qqKDM6zPkvq2IOB5T9WxOMi/M7oaXrhnDUieoc0Bf72R9W
-Q/yBigsLVTCCxFP/qf6lsqpgtaZgQXm9Js4AuHKvcrxoZgJvmwH7r8ON0uJrP2rJ
-fUEgNYsCYx/R3yogLteMYKS01YUSmL0Q6rVUyZRC3VmU8bWJENBNkKhdUfP4dW0w
-eXR6heUDqvoP3xJzpsH0o6bGXYa684T3rbWWt0Kpc1mQVsmTWsxwZMaSrMiPH9OW
-W0J8sZuQjLzex1XcuAjVAgMBAAGjeTB3MFYGA1UdEQRPME2CGWZlZGVyYXRpb24y
-LnVuaXYtYnJlc3QuZnKGMGh0dHBzOi8vZmVkZXJhdGlvbjIudW5pdi1icmVzdC5m
-ci9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUOemOV1cIWomxjeTIq5jtpWN1HEow
-DQYJKoZIhvcNAQEFBQADggEBAD/ZBa+xOskPywe5pYfAusdeil2y0z7Nhse5HcnJ
-Odjkk3n1qeYUE7agiStMzh2i2I4VY2WM5/vmhodmdIn4hYcDpWz8PSj+uLcVBcQO
-czrADiucBs72+PSEYiaOjrEQZOkLuyszWEWLkwID6n8e4nbJoK2NNf5ujIqm9C2s
-2RHyJVXxVHUczOR/0hnZtc2fyrRY5281u6Caenoxgoed88E4ua7FSnzjZnnBb0+T
-YvneR/KwwVHLp54Fg5QDQlLHbcDX3O+H59/Jmi2dRUgl7+SdCyug2APyBTWvNI6K
-V6haQaNennUWPfKNVUx9kRADhvU84XK1fH8ynIIBY7o3zIg=
-					    </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>
-					      MIIDTzCCAjegAwIBAgIUcGVhc58lBOziviLuEFA04RVPhjAwDQYJKoZIhvcNAQEF
-BQAwJDEiMCAGA1UEAxMZZmVkZXJhdGlvbjIudW5pdi1icmVzdC5mcjAeFw0wOTAy
-MDUxMTUxNDFaFw0yOTAyMDUxMTUxNDFaMCQxIjAgBgNVBAMTGWZlZGVyYXRpb24y
-LnVuaXYtYnJlc3QuZnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCW
-RzPe3Vq2lpziOaEyUzKIEfjZXr23PfYVy/rwvT64y+Zk+eKNvgjWHMpSqbuX7nqx
-/2q5G/mox/pk1xaG0iZlsVu97qoUlSJ+POQCp8dAIJNKYpP/vFGUW1RTdE9vzACT
-U8NRNgZz1Df1e/SwwDUyFOfU58xEgsSUhgxc1skKCvJSpkTH8aDavnVvbKGv08Dr
-cjvKakemcoPeil5fV40/REHDGHHLtFgE/k8wHIvtRxw+UZ3qF/Pwss1Yvszph5aU
-b2f/nP9KL6cCIwomwrJYZcQ/llP+ksuwjum6m0V/H0wQYL+EkebIFh1M055RdpAP
-ilBFaCiL5geQo0RSBrqhAgMBAAGjeTB3MFYGA1UdEQRPME2CGWZlZGVyYXRpb24y
-LnVuaXYtYnJlc3QuZnKGMGh0dHBzOi8vZmVkZXJhdGlvbjIudW5pdi1icmVzdC5m
-ci9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUbnsYQCi+qnK7dB3sTYe7ArIKwlQw
-DQYJKoZIhvcNAQEFBQADggEBAIHQBrg0VjCQ1ApOWOBpOVDujQHG7/+oazQ/kJWA
-YxWZCLCzg5yW74ut1rxxwYlSN/c3ZYU5paZRUeok61SiCNs0ggzqEy6pYt4yJqCu
-gdmhUHokWFzxzReL34u+XCXzZjd/g52B3DDvHU8OLKzOqc7EXppiuFLh2hRjffjX
-XIZgjVVgHmtDcih29YmV+LcRlQrHpze8o976ovyXcM/katGaUei8OHAy8LJh7cvu
-9Xvuti2J+axxQXdzeUa4KIQ8Gi7EUEEwQ5PVGE/T0AP/fSWlCHuQWk+y9wESI1NL
-dZkkc0h92MuezOhzNpM1FfXU/7Zb8eYTeQZbOUQhqiLTogg=
-					    </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://federation2.univ-brest.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://federation2.univ-brest.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://federation2.univ-brest.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">univ-brest.fr</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDTzCCAjegAwIBAgIUbLNw35nuqDWZoyy6h3P4LlkzPIAwDQYJKoZIhvcNAQEF
-BQAwJDEiMCAGA1UEAxMZZmVkZXJhdGlvbjIudW5pdi1icmVzdC5mcjAeFw0xMzAz
-MTIyMTE1MDVaFw0zMzAzMTIyMTE1MDVaMCQxIjAgBgNVBAMTGWZlZGVyYXRpb24y
-LnVuaXYtYnJlc3QuZnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCe
-kMm2n9YaUsOi8wAXfTnfE7/jehc3Mnc5UP4iR2A9mTF6fZc025FTK/O5O3lEowUh
-FCT8cD2sYjRm+hX+G8qqKDM6zPkvq2IOB5T9WxOMi/M7oaXrhnDUieoc0Bf72R9W
-Q/yBigsLVTCCxFP/qf6lsqpgtaZgQXm9Js4AuHKvcrxoZgJvmwH7r8ON0uJrP2rJ
-fUEgNYsCYx/R3yogLteMYKS01YUSmL0Q6rVUyZRC3VmU8bWJENBNkKhdUfP4dW0w
-eXR6heUDqvoP3xJzpsH0o6bGXYa684T3rbWWt0Kpc1mQVsmTWsxwZMaSrMiPH9OW
-W0J8sZuQjLzex1XcuAjVAgMBAAGjeTB3MFYGA1UdEQRPME2CGWZlZGVyYXRpb24y
-LnVuaXYtYnJlc3QuZnKGMGh0dHBzOi8vZmVkZXJhdGlvbjIudW5pdi1icmVzdC5m
-ci9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUOemOV1cIWomxjeTIq5jtpWN1HEow
-DQYJKoZIhvcNAQEFBQADggEBAD/ZBa+xOskPywe5pYfAusdeil2y0z7Nhse5HcnJ
-Odjkk3n1qeYUE7agiStMzh2i2I4VY2WM5/vmhodmdIn4hYcDpWz8PSj+uLcVBcQO
-czrADiucBs72+PSEYiaOjrEQZOkLuyszWEWLkwID6n8e4nbJoK2NNf5ujIqm9C2s
-2RHyJVXxVHUczOR/0hnZtc2fyrRY5281u6Caenoxgoed88E4ua7FSnzjZnnBb0+T
-YvneR/KwwVHLp54Fg5QDQlLHbcDX3O+H59/Jmi2dRUgl7+SdCyug2APyBTWvNI6K
-V6haQaNennUWPfKNVUx9kRADhvU84XK1fH8ynIIBY7o3zIg=
-					    </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>
-					      MIIDTzCCAjegAwIBAgIUcGVhc58lBOziviLuEFA04RVPhjAwDQYJKoZIhvcNAQEF
-BQAwJDEiMCAGA1UEAxMZZmVkZXJhdGlvbjIudW5pdi1icmVzdC5mcjAeFw0wOTAy
-MDUxMTUxNDFaFw0yOTAyMDUxMTUxNDFaMCQxIjAgBgNVBAMTGWZlZGVyYXRpb24y
-LnVuaXYtYnJlc3QuZnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCW
-RzPe3Vq2lpziOaEyUzKIEfjZXr23PfYVy/rwvT64y+Zk+eKNvgjWHMpSqbuX7nqx
-/2q5G/mox/pk1xaG0iZlsVu97qoUlSJ+POQCp8dAIJNKYpP/vFGUW1RTdE9vzACT
-U8NRNgZz1Df1e/SwwDUyFOfU58xEgsSUhgxc1skKCvJSpkTH8aDavnVvbKGv08Dr
-cjvKakemcoPeil5fV40/REHDGHHLtFgE/k8wHIvtRxw+UZ3qF/Pwss1Yvszph5aU
-b2f/nP9KL6cCIwomwrJYZcQ/llP+ksuwjum6m0V/H0wQYL+EkebIFh1M055RdpAP
-ilBFaCiL5geQo0RSBrqhAgMBAAGjeTB3MFYGA1UdEQRPME2CGWZlZGVyYXRpb24y
-LnVuaXYtYnJlc3QuZnKGMGh0dHBzOi8vZmVkZXJhdGlvbjIudW5pdi1icmVzdC5m
-ci9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUbnsYQCi+qnK7dB3sTYe7ArIKwlQw
-DQYJKoZIhvcNAQEFBQADggEBAIHQBrg0VjCQ1ApOWOBpOVDujQHG7/+oazQ/kJWA
-YxWZCLCzg5yW74ut1rxxwYlSN/c3ZYU5paZRUeok61SiCNs0ggzqEy6pYt4yJqCu
-gdmhUHokWFzxzReL34u+XCXzZjd/g52B3DDvHU8OLKzOqc7EXppiuFLh2hRjffjX
-XIZgjVVgHmtDcih29YmV+LcRlQrHpze8o976ovyXcM/katGaUei8OHAy8LJh7cvu
-9Xvuti2J+axxQXdzeUa4KIQ8Gi7EUEEwQ5PVGE/T0AP/fSWlCHuQWk+y9wESI1NL
-dZkkc0h92MuezOhzNpM1FfXU/7Zb8eYTeQZbOUQhqiLTogg=
-					    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://federation2.univ-brest.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">Université de Bretagne Occidentale</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Université de Bretagne Occidentale</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <EmailAddress>federation@univ-brest.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/federation2.univ-brest.fr.xml b/swamid-interfederations-2.0/federation2.univ-brest.fr.xml
deleted file mode 100644
index 7e3fe7a1..00000000
--- a/swamid-interfederations-2.0/federation2.univ-brest.fr.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://federation2.univ-brest.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2009-06-26T15:36:06Z">
-      <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">univ-brest.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">Université de Bretagne Occidentale</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDTzCCAjegAwIBAgIUbLNw35nuqDWZoyy6h3P4LlkzPIAwDQYJKoZIhvcNAQEF
-BQAwJDEiMCAGA1UEAxMZZmVkZXJhdGlvbjIudW5pdi1icmVzdC5mcjAeFw0xMzAz
-MTIyMTE1MDVaFw0zMzAzMTIyMTE1MDVaMCQxIjAgBgNVBAMTGWZlZGVyYXRpb24y
-LnVuaXYtYnJlc3QuZnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCe
-kMm2n9YaUsOi8wAXfTnfE7/jehc3Mnc5UP4iR2A9mTF6fZc025FTK/O5O3lEowUh
-FCT8cD2sYjRm+hX+G8qqKDM6zPkvq2IOB5T9WxOMi/M7oaXrhnDUieoc0Bf72R9W
-Q/yBigsLVTCCxFP/qf6lsqpgtaZgQXm9Js4AuHKvcrxoZgJvmwH7r8ON0uJrP2rJ
-fUEgNYsCYx/R3yogLteMYKS01YUSmL0Q6rVUyZRC3VmU8bWJENBNkKhdUfP4dW0w
-eXR6heUDqvoP3xJzpsH0o6bGXYa684T3rbWWt0Kpc1mQVsmTWsxwZMaSrMiPH9OW
-W0J8sZuQjLzex1XcuAjVAgMBAAGjeTB3MFYGA1UdEQRPME2CGWZlZGVyYXRpb24y
-LnVuaXYtYnJlc3QuZnKGMGh0dHBzOi8vZmVkZXJhdGlvbjIudW5pdi1icmVzdC5m
-ci9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUOemOV1cIWomxjeTIq5jtpWN1HEow
-DQYJKoZIhvcNAQEFBQADggEBAD/ZBa+xOskPywe5pYfAusdeil2y0z7Nhse5HcnJ
-Odjkk3n1qeYUE7agiStMzh2i2I4VY2WM5/vmhodmdIn4hYcDpWz8PSj+uLcVBcQO
-czrADiucBs72+PSEYiaOjrEQZOkLuyszWEWLkwID6n8e4nbJoK2NNf5ujIqm9C2s
-2RHyJVXxVHUczOR/0hnZtc2fyrRY5281u6Caenoxgoed88E4ua7FSnzjZnnBb0+T
-YvneR/KwwVHLp54Fg5QDQlLHbcDX3O+H59/Jmi2dRUgl7+SdCyug2APyBTWvNI6K
-V6haQaNennUWPfKNVUx9kRADhvU84XK1fH8ynIIBY7o3zIg=
-					    </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>
-					      MIIDTzCCAjegAwIBAgIUcGVhc58lBOziviLuEFA04RVPhjAwDQYJKoZIhvcNAQEF
-BQAwJDEiMCAGA1UEAxMZZmVkZXJhdGlvbjIudW5pdi1icmVzdC5mcjAeFw0wOTAy
-MDUxMTUxNDFaFw0yOTAyMDUxMTUxNDFaMCQxIjAgBgNVBAMTGWZlZGVyYXRpb24y
-LnVuaXYtYnJlc3QuZnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCW
-RzPe3Vq2lpziOaEyUzKIEfjZXr23PfYVy/rwvT64y+Zk+eKNvgjWHMpSqbuX7nqx
-/2q5G/mox/pk1xaG0iZlsVu97qoUlSJ+POQCp8dAIJNKYpP/vFGUW1RTdE9vzACT
-U8NRNgZz1Df1e/SwwDUyFOfU58xEgsSUhgxc1skKCvJSpkTH8aDavnVvbKGv08Dr
-cjvKakemcoPeil5fV40/REHDGHHLtFgE/k8wHIvtRxw+UZ3qF/Pwss1Yvszph5aU
-b2f/nP9KL6cCIwomwrJYZcQ/llP+ksuwjum6m0V/H0wQYL+EkebIFh1M055RdpAP
-ilBFaCiL5geQo0RSBrqhAgMBAAGjeTB3MFYGA1UdEQRPME2CGWZlZGVyYXRpb24y
-LnVuaXYtYnJlc3QuZnKGMGh0dHBzOi8vZmVkZXJhdGlvbjIudW5pdi1icmVzdC5m
-ci9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUbnsYQCi+qnK7dB3sTYe7ArIKwlQw
-DQYJKoZIhvcNAQEFBQADggEBAIHQBrg0VjCQ1ApOWOBpOVDujQHG7/+oazQ/kJWA
-YxWZCLCzg5yW74ut1rxxwYlSN/c3ZYU5paZRUeok61SiCNs0ggzqEy6pYt4yJqCu
-gdmhUHokWFzxzReL34u+XCXzZjd/g52B3DDvHU8OLKzOqc7EXppiuFLh2hRjffjX
-XIZgjVVgHmtDcih29YmV+LcRlQrHpze8o976ovyXcM/katGaUei8OHAy8LJh7cvu
-9Xvuti2J+axxQXdzeUa4KIQ8Gi7EUEEwQ5PVGE/T0AP/fSWlCHuQWk+y9wESI1NL
-dZkkc0h92MuezOhzNpM1FfXU/7Zb8eYTeQZbOUQhqiLTogg=
-					    </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://federation2.univ-brest.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://federation2.univ-brest.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://federation2.univ-brest.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">univ-brest.fr</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDTzCCAjegAwIBAgIUbLNw35nuqDWZoyy6h3P4LlkzPIAwDQYJKoZIhvcNAQEF
-BQAwJDEiMCAGA1UEAxMZZmVkZXJhdGlvbjIudW5pdi1icmVzdC5mcjAeFw0xMzAz
-MTIyMTE1MDVaFw0zMzAzMTIyMTE1MDVaMCQxIjAgBgNVBAMTGWZlZGVyYXRpb24y
-LnVuaXYtYnJlc3QuZnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCe
-kMm2n9YaUsOi8wAXfTnfE7/jehc3Mnc5UP4iR2A9mTF6fZc025FTK/O5O3lEowUh
-FCT8cD2sYjRm+hX+G8qqKDM6zPkvq2IOB5T9WxOMi/M7oaXrhnDUieoc0Bf72R9W
-Q/yBigsLVTCCxFP/qf6lsqpgtaZgQXm9Js4AuHKvcrxoZgJvmwH7r8ON0uJrP2rJ
-fUEgNYsCYx/R3yogLteMYKS01YUSmL0Q6rVUyZRC3VmU8bWJENBNkKhdUfP4dW0w
-eXR6heUDqvoP3xJzpsH0o6bGXYa684T3rbWWt0Kpc1mQVsmTWsxwZMaSrMiPH9OW
-W0J8sZuQjLzex1XcuAjVAgMBAAGjeTB3MFYGA1UdEQRPME2CGWZlZGVyYXRpb24y
-LnVuaXYtYnJlc3QuZnKGMGh0dHBzOi8vZmVkZXJhdGlvbjIudW5pdi1icmVzdC5m
-ci9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUOemOV1cIWomxjeTIq5jtpWN1HEow
-DQYJKoZIhvcNAQEFBQADggEBAD/ZBa+xOskPywe5pYfAusdeil2y0z7Nhse5HcnJ
-Odjkk3n1qeYUE7agiStMzh2i2I4VY2WM5/vmhodmdIn4hYcDpWz8PSj+uLcVBcQO
-czrADiucBs72+PSEYiaOjrEQZOkLuyszWEWLkwID6n8e4nbJoK2NNf5ujIqm9C2s
-2RHyJVXxVHUczOR/0hnZtc2fyrRY5281u6Caenoxgoed88E4ua7FSnzjZnnBb0+T
-YvneR/KwwVHLp54Fg5QDQlLHbcDX3O+H59/Jmi2dRUgl7+SdCyug2APyBTWvNI6K
-V6haQaNennUWPfKNVUx9kRADhvU84XK1fH8ynIIBY7o3zIg=
-					    </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>
-					      MIIDTzCCAjegAwIBAgIUcGVhc58lBOziviLuEFA04RVPhjAwDQYJKoZIhvcNAQEF
-BQAwJDEiMCAGA1UEAxMZZmVkZXJhdGlvbjIudW5pdi1icmVzdC5mcjAeFw0wOTAy
-MDUxMTUxNDFaFw0yOTAyMDUxMTUxNDFaMCQxIjAgBgNVBAMTGWZlZGVyYXRpb24y
-LnVuaXYtYnJlc3QuZnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCW
-RzPe3Vq2lpziOaEyUzKIEfjZXr23PfYVy/rwvT64y+Zk+eKNvgjWHMpSqbuX7nqx
-/2q5G/mox/pk1xaG0iZlsVu97qoUlSJ+POQCp8dAIJNKYpP/vFGUW1RTdE9vzACT
-U8NRNgZz1Df1e/SwwDUyFOfU58xEgsSUhgxc1skKCvJSpkTH8aDavnVvbKGv08Dr
-cjvKakemcoPeil5fV40/REHDGHHLtFgE/k8wHIvtRxw+UZ3qF/Pwss1Yvszph5aU
-b2f/nP9KL6cCIwomwrJYZcQ/llP+ksuwjum6m0V/H0wQYL+EkebIFh1M055RdpAP
-ilBFaCiL5geQo0RSBrqhAgMBAAGjeTB3MFYGA1UdEQRPME2CGWZlZGVyYXRpb24y
-LnVuaXYtYnJlc3QuZnKGMGh0dHBzOi8vZmVkZXJhdGlvbjIudW5pdi1icmVzdC5m
-ci9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUbnsYQCi+qnK7dB3sTYe7ArIKwlQw
-DQYJKoZIhvcNAQEFBQADggEBAIHQBrg0VjCQ1ApOWOBpOVDujQHG7/+oazQ/kJWA
-YxWZCLCzg5yW74ut1rxxwYlSN/c3ZYU5paZRUeok61SiCNs0ggzqEy6pYt4yJqCu
-gdmhUHokWFzxzReL34u+XCXzZjd/g52B3DDvHU8OLKzOqc7EXppiuFLh2hRjffjX
-XIZgjVVgHmtDcih29YmV+LcRlQrHpze8o976ovyXcM/katGaUei8OHAy8LJh7cvu
-9Xvuti2J+axxQXdzeUa4KIQ8Gi7EUEEwQ5PVGE/T0AP/fSWlCHuQWk+y9wESI1NL
-dZkkc0h92MuezOhzNpM1FfXU/7Zb8eYTeQZbOUQhqiLTogg=
-					    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://federation2.univ-brest.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">Université de Bretagne Occidentale</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Université de Bretagne Occidentale</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <EmailAddress>federation@univ-brest.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/federation2.univ-perp.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/federation2.univ-perp.fr-idp-shibboleth.xml
deleted file mode 100644
index 528adfd9..00000000
--- a/swamid-interfederations-2.0/federation2.univ-perp.fr-idp-shibboleth.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://federation2.univ-perp.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2009-03-31T09:00:43Z">
-      <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">univ-perp.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">Université de Perpignan Via Domitia</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDSzCCAjOgAwIBAgIULLAo5s+4ROzy5UZMrAIGbK8dOywwDQYJKoZIhvcNAQEF
-BQAwIzEhMB8GA1UEAxMYZmVkZXJhdGlvbjIudW5pdi1wZXJwLmZyMB4XDTEwMDYw
-NzE1NDAxMFoXDTMwMDYwNzE1NDAxMFowIzEhMB8GA1UEAxMYZmVkZXJhdGlvbjIu
-dW5pdi1wZXJwLmZyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA4Q5K
-a1AqPThLeQFDdXi+ebPZnmmv5LdDpm+wEUmZYEK+gPyKwsnCOqueO4bf1YJHWRMq
-8hOi16t3RzW85OTuFbkTNfoTSC94Mmq1xM9OiYwYdEhzkSE17k7gngrJhBD/g5gd
-nCENIs1cPJrmuZOPUstg3CDKC10hBHN8p2cBcpqAkbSJJfSWpJus/6mwpL8aC/Sy
-P48MZFkOGfonwtZApKq5LogC9FdA3D+iUK2gX6Gmx87VVdblMz4gy1bMExGlpJh1
-sLZXzFH6lytiwEki3TQ+FVeARP9YEuMjO/MmlsdyTQ59X+InZRneSw+AX707wwbs
-CMeQn65kV9+25CostQIDAQABo3cwdTBUBgNVHREETTBLghhmZWRlcmF0aW9uMi51
-bml2LXBlcnAuZnKGL2h0dHBzOi8vZmVkZXJhdGlvbjIudW5pdi1wZXJwLmZyL2lk
-cC9zaGliYm9sZXRoMB0GA1UdDgQWBBR+rUoTfBcWEnKttfZNC2Ij1kszCDANBgkq
-hkiG9w0BAQUFAAOCAQEAhaevpVw7aySNgUnq2UphJVWGJCnewO9dFjK2puynLYYS
-0N4Kml/TwsPMMqxWYYM59QKnExmXxQiEqaXARBMwGxAFsvIMbhoreXuVCkBPuGNM
-ROvYP6oKNTBWLFZim/NFM0I50TUdhxI9dVgzJfysQZAQ3OAf0u8yBWt8ECqjIAPj
-cK8jIB+jY0Y2xRYsOyjG2ITF7C8QZRl1/N0xLSINbHzPNHZMvxBdJKhiXXbnOYnz
-fBD7fiQYaQ/ngsB/aj4MOLHzcFDOyxUXTf5iO7tXX+zioMpLZ4TWPz4VQRoh9V6X
-GRhvA308h9KMK3qNV6NKcFJeTNJP1BepoG51kFLhSw==
-					    </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://federation2.univ-perp.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://federation2.univ-perp.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://federation2.univ-perp.fr/idp/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Université de Perpignan Via Domitia</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Université de Perpignan Via Domitia</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <EmailAddress>federation@univ-perp.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/federation2.univ-perp.fr.xml b/swamid-interfederations-2.0/federation2.univ-perp.fr.xml
deleted file mode 100644
index 528adfd9..00000000
--- a/swamid-interfederations-2.0/federation2.univ-perp.fr.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://federation2.univ-perp.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2009-03-31T09:00:43Z">
-      <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">univ-perp.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">Université de Perpignan Via Domitia</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDSzCCAjOgAwIBAgIULLAo5s+4ROzy5UZMrAIGbK8dOywwDQYJKoZIhvcNAQEF
-BQAwIzEhMB8GA1UEAxMYZmVkZXJhdGlvbjIudW5pdi1wZXJwLmZyMB4XDTEwMDYw
-NzE1NDAxMFoXDTMwMDYwNzE1NDAxMFowIzEhMB8GA1UEAxMYZmVkZXJhdGlvbjIu
-dW5pdi1wZXJwLmZyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA4Q5K
-a1AqPThLeQFDdXi+ebPZnmmv5LdDpm+wEUmZYEK+gPyKwsnCOqueO4bf1YJHWRMq
-8hOi16t3RzW85OTuFbkTNfoTSC94Mmq1xM9OiYwYdEhzkSE17k7gngrJhBD/g5gd
-nCENIs1cPJrmuZOPUstg3CDKC10hBHN8p2cBcpqAkbSJJfSWpJus/6mwpL8aC/Sy
-P48MZFkOGfonwtZApKq5LogC9FdA3D+iUK2gX6Gmx87VVdblMz4gy1bMExGlpJh1
-sLZXzFH6lytiwEki3TQ+FVeARP9YEuMjO/MmlsdyTQ59X+InZRneSw+AX707wwbs
-CMeQn65kV9+25CostQIDAQABo3cwdTBUBgNVHREETTBLghhmZWRlcmF0aW9uMi51
-bml2LXBlcnAuZnKGL2h0dHBzOi8vZmVkZXJhdGlvbjIudW5pdi1wZXJwLmZyL2lk
-cC9zaGliYm9sZXRoMB0GA1UdDgQWBBR+rUoTfBcWEnKttfZNC2Ij1kszCDANBgkq
-hkiG9w0BAQUFAAOCAQEAhaevpVw7aySNgUnq2UphJVWGJCnewO9dFjK2puynLYYS
-0N4Kml/TwsPMMqxWYYM59QKnExmXxQiEqaXARBMwGxAFsvIMbhoreXuVCkBPuGNM
-ROvYP6oKNTBWLFZim/NFM0I50TUdhxI9dVgzJfysQZAQ3OAf0u8yBWt8ECqjIAPj
-cK8jIB+jY0Y2xRYsOyjG2ITF7C8QZRl1/N0xLSINbHzPNHZMvxBdJKhiXXbnOYnz
-fBD7fiQYaQ/ngsB/aj4MOLHzcFDOyxUXTf5iO7tXX+zioMpLZ4TWPz4VQRoh9V6X
-GRhvA308h9KMK3qNV6NKcFJeTNJP1BepoG51kFLhSw==
-					    </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://federation2.univ-perp.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://federation2.univ-perp.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://federation2.univ-perp.fr/idp/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Université de Perpignan Via Domitia</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Université de Perpignan Via Domitia</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <EmailAddress>federation@univ-perp.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/federationrenater.univ-montp2.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/federationrenater.univ-montp2.fr-idp-shibboleth.xml
deleted file mode 100644
index 0549127d..00000000
--- a/swamid-interfederations-2.0/federationrenater.univ-montp2.fr-idp-shibboleth.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://federationrenater.univ-montp2.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2009-07-02T16:09:31Z">
-      <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">univ-montp2.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">Université de Montpellier 2</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDbTCCAlWgAwIBAgIUd7qthRFKphaqjAKa3OfPkTgoQCgwDQYJKoZIhvcNAQEF
-BQAwKzEpMCcGA1UEAxMgZmVkZXJhdGlvbnJlbmF0ZXIudW5pdi1tb250cDIuZnIw
-HhcNMDkwMTI5MTYwOTI1WhcNMjkwMTI5MTYwOTI1WjArMSkwJwYDVQQDEyBmZWRl
-cmF0aW9ucmVuYXRlci51bml2LW1vbnRwMi5mcjCCASIwDQYJKoZIhvcNAQEBBQAD
-ggEPADCCAQoCggEBAKbCEkUY6PCN5cAR9Xm2tLH78tkAas47YTI8ExEkF7VBiusg
-I+xopi8kCGN3wXufANOyfHI3zsphl3eLlwhdsF6c+IbegBywKSnDfMimvB3YWFbh
-jYOMOZOiFEphCdB2p6hvIKk+YFXH0m4KT1DVHMSzX8CwvXJ2am9lyI6wQdYShFdM
-zlDIqtQJR48n6HUlDQnWwq9jXxS/rXOOUzIe6w53cG6/mNMutXBoGfMVNSIoNSEC
-NHBD9RSwTJ5bzv2S2wiBjnCOj5vOpfysZ+duZgEGWM8JNpapB6M4YLoPr3OhcU+e
-pRahD0suZZUqU0R14hMJgEh2phxXF5pttQM0dwkCAwEAAaOBiDCBhTBkBgNVHREE
-XTBbgiBmZWRlcmF0aW9ucmVuYXRlci51bml2LW1vbnRwMi5mcoY3aHR0cHM6Ly9m
-ZWRlcmF0aW9ucmVuYXRlci51bml2LW1vbnRwMi5mci9pZHAvc2hpYmJvbGV0aDAd
-BgNVHQ4EFgQUWzhOl/tjSF/4azXQikbyjjVrPMEwDQYJKoZIhvcNAQEFBQADggEB
-AB4ts6C72K9/Wi1Tq91wHJdE83rJrfNpAVyZ1qKUSx6Okrkjga2keVBHSBXuNdfr
-eYkjMNbj2xLbX+BxKRxMgUnBjmaAdfOrOJFgsN/cqc3TEYo8BQZ7MiCOvzJWAgPV
-9TVhrm5qRx8AICoXee0NenuxWoSKYzH2pv4VIkGM0IIRVkDrkOxbxTQCk3Y0yUZ4
-iPn+hAxA9eFoYosSr16IJsBRCYiS0Rdr61YUCLgqf87nhWMbpKz5aPc3S0s0SEqa
-do3SW6CiYjzJ2ZYrYdmDzP0OuN/ZZK9gzH2hyOFaKlDJRKQtkdZ7RKb2tik/PPD6
-cHXXZfLohck3GRQ/MJmd5x4=
-					    </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://federationrenater.univ-montp2.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://federationrenater.univ-montp2.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://federationrenater.univ-montp2.fr/idp/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Université de Montpellier 2</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Université de Montpellier 2</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Loïc Bonavent</SurName>
-    <EmailAddress>loic.bonavent@univ-montp2.fr</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <SurName>Nicolas Arles</SurName>
-    <EmailAddress>nicolas.arles@univ-montp2.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/federationrenater.univ-montp2.fr.xml b/swamid-interfederations-2.0/federationrenater.univ-montp2.fr.xml
deleted file mode 100644
index 0549127d..00000000
--- a/swamid-interfederations-2.0/federationrenater.univ-montp2.fr.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://federationrenater.univ-montp2.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2009-07-02T16:09:31Z">
-      <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">univ-montp2.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">Université de Montpellier 2</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDbTCCAlWgAwIBAgIUd7qthRFKphaqjAKa3OfPkTgoQCgwDQYJKoZIhvcNAQEF
-BQAwKzEpMCcGA1UEAxMgZmVkZXJhdGlvbnJlbmF0ZXIudW5pdi1tb250cDIuZnIw
-HhcNMDkwMTI5MTYwOTI1WhcNMjkwMTI5MTYwOTI1WjArMSkwJwYDVQQDEyBmZWRl
-cmF0aW9ucmVuYXRlci51bml2LW1vbnRwMi5mcjCCASIwDQYJKoZIhvcNAQEBBQAD
-ggEPADCCAQoCggEBAKbCEkUY6PCN5cAR9Xm2tLH78tkAas47YTI8ExEkF7VBiusg
-I+xopi8kCGN3wXufANOyfHI3zsphl3eLlwhdsF6c+IbegBywKSnDfMimvB3YWFbh
-jYOMOZOiFEphCdB2p6hvIKk+YFXH0m4KT1DVHMSzX8CwvXJ2am9lyI6wQdYShFdM
-zlDIqtQJR48n6HUlDQnWwq9jXxS/rXOOUzIe6w53cG6/mNMutXBoGfMVNSIoNSEC
-NHBD9RSwTJ5bzv2S2wiBjnCOj5vOpfysZ+duZgEGWM8JNpapB6M4YLoPr3OhcU+e
-pRahD0suZZUqU0R14hMJgEh2phxXF5pttQM0dwkCAwEAAaOBiDCBhTBkBgNVHREE
-XTBbgiBmZWRlcmF0aW9ucmVuYXRlci51bml2LW1vbnRwMi5mcoY3aHR0cHM6Ly9m
-ZWRlcmF0aW9ucmVuYXRlci51bml2LW1vbnRwMi5mci9pZHAvc2hpYmJvbGV0aDAd
-BgNVHQ4EFgQUWzhOl/tjSF/4azXQikbyjjVrPMEwDQYJKoZIhvcNAQEFBQADggEB
-AB4ts6C72K9/Wi1Tq91wHJdE83rJrfNpAVyZ1qKUSx6Okrkjga2keVBHSBXuNdfr
-eYkjMNbj2xLbX+BxKRxMgUnBjmaAdfOrOJFgsN/cqc3TEYo8BQZ7MiCOvzJWAgPV
-9TVhrm5qRx8AICoXee0NenuxWoSKYzH2pv4VIkGM0IIRVkDrkOxbxTQCk3Y0yUZ4
-iPn+hAxA9eFoYosSr16IJsBRCYiS0Rdr61YUCLgqf87nhWMbpKz5aPc3S0s0SEqa
-do3SW6CiYjzJ2ZYrYdmDzP0OuN/ZZK9gzH2hyOFaKlDJRKQtkdZ7RKb2tik/PPD6
-cHXXZfLohck3GRQ/MJmd5x4=
-					    </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://federationrenater.univ-montp2.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://federationrenater.univ-montp2.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://federationrenater.univ-montp2.fr/idp/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Université de Montpellier 2</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Université de Montpellier 2</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Loïc Bonavent</SurName>
-    <EmailAddress>loic.bonavent@univ-montp2.fr</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <SurName>Nicolas Arles</SurName>
-    <EmailAddress>nicolas.arles@univ-montp2.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/filesender.cesnet.cz-saml-sp.xml b/swamid-interfederations-2.0/filesender.cesnet.cz-saml-sp.xml
deleted file mode 100644
index 642874c9..00000000
--- a/swamid-interfederations-2.0/filesender.cesnet.cz-saml-sp.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://filesender.cesnet.cz/saml/sp">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/" registrationInstant="2011-11-04T10:27:36Z">
-      <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: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</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="cs">FileSender</mdui:DisplayName>
-        <mdui:Description xml:lang="en">CESNETs servis for sending files.</mdui:Description>
-        <mdui:Description xml:lang="cs">Cesnetí služba pro posílání souborů.</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://filesender.cesnet.cz/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="cs">http://filesender.cesnet.cz/</mdui:InformationURL>
-      </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>MIIE+TCCA+GgAwIBAgIQSNd+oblTGlgsZGtWhS41ojANBgkqhkiG9w0BAQUFADA/MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMR8wHQYDVQQDExZURVJFTkEgZVNjaWVuY2UgU1NMIENBMB4XDTE0MDIxMjAwMDAwMFoXDTE1MDMxNDIzNTk1OVowgYQxEzARBgoJkiaJk/IsZAEZFgNvcmcxFjAUBgoJkiaJk/IsZAEZFgZ0ZXJlbmExEzARBgoJkiaJk/IsZAEZFgN0Y3MxITAfBgNVBAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEdMBsGA1UEAxMUZmlsZXNlbmRlci5jZXNuZXQuY3owggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC/2knUTg4ipWfMjhM0gyifCNfSxAsF+DYJfETNiUtQ9AIdTQL0qWKTtfDSYcrWo+TRUSNbQfZkT/joe0PKgcHiBLa3jKANQxPVSSiu+XZ2ckYRoWu+fmt3VjXZu8unyjQ5Uyh6vedJ/bcHw0r5ROYhSJu7+4jIQvdRec9ceVE7GgdVICPPUu4QL8pmrfKPN+y4hBznmSPbn2YknVrVdI6klkkj/mqBRLO4GVfPC1jGvZR8hjHF/U42pnaLbgk+UW811R9RwShd5SkyWr8rKF5CdhSucC5J/Upqwq0GlaKg1+H6i4+bxA6YeaqB1clmJiUi8n8zy785ThttSaBNHScJAgMBAAGjggGpMIIBpTAfBgNVHSMEGDAWgBQj05e9wNihlGGIDYW2zHWfyXk7kjAdBgNVHQ4EFgQUpDRUq9ul1wc8XpfXC7Dlj99/FxQwDgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMDAGA1UdIAQpMCcwDQYLKwYBBAGyMQECAh0wDAYKKoZIhvdMBQICATAIBgZngQwBAgEwQgYDVR0fBDswOTA3oDWgM4YxaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFlU2NpZW5jZVNTTENBLmNybDB1BggrBgEFBQcBAQRpMGcwPQYIKwYBBQUHMAKGMWh0dHA6Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BZVNjaWVuY2VTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9vY3NwLnRjcy50ZXJlbmEub3JnMDkGA1UdEQQyMDCCFGZpbGVzZW5kZXIuY2VzbmV0LmN6ghh3d3cuZmlsZXNlbmRlci5jZXNuZXQuY3owDQYJKoZIhvcNAQEFBQADggEBAGS+5katUPWiBklQUKdgCLmy1RTg9P/aQUYgM6k43lJmTXbTE5N/5gL1fdTU2Dakla1mJ10tOAyoZX/wcPk+UXLMp13TsdopMLNGf5V+OQ3qRhlWKXNielx8+HfYJ3/d2rSAJ/ni3tEQfPd2LBvqFtLMyCnpU5A8nsD7DokJvw9tkieokxkGrx+BsW1zWPvmE1YUjhi8k4zF3+/0GZEJWbGdHPczAU9OM4Ei4LEIz2DAEGysWsudOsKWV3w95m7AJYpxB8J5qfNKqq8txmoY7r9b/Qycpglk526Y8WIVBvq8i3F1rImfR35s4vbBiEGcrQdeXQQ/9TGy9hWLsZS2lk8=</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>MIIE+TCCA+GgAwIBAgIQSNd+oblTGlgsZGtWhS41ojANBgkqhkiG9w0BAQUFADA/MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMR8wHQYDVQQDExZURVJFTkEgZVNjaWVuY2UgU1NMIENBMB4XDTE0MDIxMjAwMDAwMFoXDTE1MDMxNDIzNTk1OVowgYQxEzARBgoJkiaJk/IsZAEZFgNvcmcxFjAUBgoJkiaJk/IsZAEZFgZ0ZXJlbmExEzARBgoJkiaJk/IsZAEZFgN0Y3MxITAfBgNVBAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEdMBsGA1UEAxMUZmlsZXNlbmRlci5jZXNuZXQuY3owggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC/2knUTg4ipWfMjhM0gyifCNfSxAsF+DYJfETNiUtQ9AIdTQL0qWKTtfDSYcrWo+TRUSNbQfZkT/joe0PKgcHiBLa3jKANQxPVSSiu+XZ2ckYRoWu+fmt3VjXZu8unyjQ5Uyh6vedJ/bcHw0r5ROYhSJu7+4jIQvdRec9ceVE7GgdVICPPUu4QL8pmrfKPN+y4hBznmSPbn2YknVrVdI6klkkj/mqBRLO4GVfPC1jGvZR8hjHF/U42pnaLbgk+UW811R9RwShd5SkyWr8rKF5CdhSucC5J/Upqwq0GlaKg1+H6i4+bxA6YeaqB1clmJiUi8n8zy785ThttSaBNHScJAgMBAAGjggGpMIIBpTAfBgNVHSMEGDAWgBQj05e9wNihlGGIDYW2zHWfyXk7kjAdBgNVHQ4EFgQUpDRUq9ul1wc8XpfXC7Dlj99/FxQwDgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMDAGA1UdIAQpMCcwDQYLKwYBBAGyMQECAh0wDAYKKoZIhvdMBQICATAIBgZngQwBAgEwQgYDVR0fBDswOTA3oDWgM4YxaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFlU2NpZW5jZVNTTENBLmNybDB1BggrBgEFBQcBAQRpMGcwPQYIKwYBBQUHMAKGMWh0dHA6Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BZVNjaWVuY2VTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9vY3NwLnRjcy50ZXJlbmEub3JnMDkGA1UdEQQyMDCCFGZpbGVzZW5kZXIuY2VzbmV0LmN6ghh3d3cuZmlsZXNlbmRlci5jZXNuZXQuY3owDQYJKoZIhvcNAQEFBQADggEBAGS+5katUPWiBklQUKdgCLmy1RTg9P/aQUYgM6k43lJmTXbTE5N/5gL1fdTU2Dakla1mJ10tOAyoZX/wcPk+UXLMp13TsdopMLNGf5V+OQ3qRhlWKXNielx8+HfYJ3/d2rSAJ/ni3tEQfPd2LBvqFtLMyCnpU5A8nsD7DokJvw9tkieokxkGrx+BsW1zWPvmE1YUjhi8k4zF3+/0GZEJWbGdHPczAU9OM4Ei4LEIz2DAEGysWsudOsKWV3w95m7AJYpxB8J5qfNKqq8txmoY7r9b/Qycpglk526Y8WIVBvq8i3F1rImfR35s4vbBiEGcrQdeXQQ/9TGy9hWLsZS2lk8=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://filesender.cesnet.cz/simplesaml/module.php/saml/sp/saml2-logout.php/filesender.cesnet.cz"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://filesender.du1.cesnet.cz/simplesaml/module.php/saml/sp/saml2-logout.php/filesender.cesnet.cz"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://filesender4elixir.cesnet.cz/simplesaml/module.php/saml/sp/saml2-logout.php/filesender.cesnet.cz"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://filesender6.cesnet.cz/simplesaml/module.php/saml/sp/saml2-logout.php/filesender.cesnet.cz"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://filesender.cesnet.cz/simplesaml/module.php/saml/sp/saml2-acs.php/filesender.cesnet.cz" index="0"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://filesender.cesnet.cz/simplesaml/module.php/saml/sp/saml1-acs.php/filesender.cesnet.cz" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://filesender.cesnet.cz/simplesaml/module.php/saml/sp/saml2-acs.php/filesender.cesnet.cz" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://filesender.cesnet.cz/simplesaml/module.php/saml/sp/saml1-acs.php/filesender.cesnet.cz/artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:profiles:holder-of-key:SSO:browser" Location="https://filesender.cesnet.cz/simplesaml/module.php/saml/sp/saml2-acs.php/filesender.cesnet.cz" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://filesender.du1.cesnet.cz/simplesaml/module.php/saml/sp/saml2-acs.php/filesender.cesnet.cz" index="0"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://filesender.du1.cesnet.cz/simplesaml/module.php/saml/sp/saml1-acs.php/filesender.cesnet.cz" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://filesender.du1.cesnet.cz/simplesaml/module.php/saml/sp/saml2-acs.php/filesender.cesnet.cz" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://filesender.du1.cesnet.cz/simplesaml/module.php/saml/sp/saml1-acs.php/filesender.cesnet.cz/artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:profiles:holder-of-key:SSO:browser" Location="https://filesender.du1.cesnet.cz/simplesaml/module.php/saml/sp/saml2-acs.php/filesender.cesnet.cz" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://filesender4elixir.cesnet.cz/simplesaml/module.php/saml/sp/saml2-acs.php/filesender.cesnet.cz" index="0"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://filesender4elixir.cesnet.cz/simplesaml/module.php/saml/sp/saml1-acs.php/filesender.cesnet.cz" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://filesender4elixir.cesnet.cz/simplesaml/module.php/saml/sp/saml2-acs.php/filesender.cesnet.cz" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://filesender4elixir.cesnet.cz/simplesaml/module.php/saml/sp/saml1-acs.php/filesender.cesnet.cz/artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:profiles:holder-of-key:SSO:browser" Location="https://filesender4elixir.cesnet.cz/simplesaml/module.php/saml/sp/saml2-acs.php/filesender.cesnet.cz" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://filesender6.cesnet.cz/simplesaml/module.php/saml/sp/saml2-acs.php/filesender.cesnet.cz" index="0"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://filesender6.cesnet.cz/simplesaml/module.php/saml/sp/saml1-acs.php/filesender.cesnet.cz" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://filesender6.cesnet.cz/simplesaml/module.php/saml/sp/saml2-acs.php/filesender.cesnet.cz" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://filesender6.cesnet.cz/simplesaml/module.php/saml/sp/saml1-acs.php/filesender.cesnet.cz/artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:profiles:holder-of-key:SSO:browser" Location="https://filesender6.cesnet.cz/simplesaml/module.php/saml/sp/saml2-acs.php/filesender.cesnet.cz" index="4"/>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">CESNET</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">CESNET</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="cs">CESNET</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>Lubos</md:GivenName>
-    <md:SurName>Kopecky</md:SurName>
-    <md:EmailAddress>du-support@cesnet.cz</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/filesender.cesnet.cz.xml b/swamid-interfederations-2.0/filesender.cesnet.cz.xml
deleted file mode 100644
index 642874c9..00000000
--- a/swamid-interfederations-2.0/filesender.cesnet.cz.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://filesender.cesnet.cz/saml/sp">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/" registrationInstant="2011-11-04T10:27:36Z">
-      <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: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</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="cs">FileSender</mdui:DisplayName>
-        <mdui:Description xml:lang="en">CESNETs servis for sending files.</mdui:Description>
-        <mdui:Description xml:lang="cs">Cesnetí služba pro posílání souborů.</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://filesender.cesnet.cz/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="cs">http://filesender.cesnet.cz/</mdui:InformationURL>
-      </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>MIIE+TCCA+GgAwIBAgIQSNd+oblTGlgsZGtWhS41ojANBgkqhkiG9w0BAQUFADA/MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMR8wHQYDVQQDExZURVJFTkEgZVNjaWVuY2UgU1NMIENBMB4XDTE0MDIxMjAwMDAwMFoXDTE1MDMxNDIzNTk1OVowgYQxEzARBgoJkiaJk/IsZAEZFgNvcmcxFjAUBgoJkiaJk/IsZAEZFgZ0ZXJlbmExEzARBgoJkiaJk/IsZAEZFgN0Y3MxITAfBgNVBAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEdMBsGA1UEAxMUZmlsZXNlbmRlci5jZXNuZXQuY3owggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC/2knUTg4ipWfMjhM0gyifCNfSxAsF+DYJfETNiUtQ9AIdTQL0qWKTtfDSYcrWo+TRUSNbQfZkT/joe0PKgcHiBLa3jKANQxPVSSiu+XZ2ckYRoWu+fmt3VjXZu8unyjQ5Uyh6vedJ/bcHw0r5ROYhSJu7+4jIQvdRec9ceVE7GgdVICPPUu4QL8pmrfKPN+y4hBznmSPbn2YknVrVdI6klkkj/mqBRLO4GVfPC1jGvZR8hjHF/U42pnaLbgk+UW811R9RwShd5SkyWr8rKF5CdhSucC5J/Upqwq0GlaKg1+H6i4+bxA6YeaqB1clmJiUi8n8zy785ThttSaBNHScJAgMBAAGjggGpMIIBpTAfBgNVHSMEGDAWgBQj05e9wNihlGGIDYW2zHWfyXk7kjAdBgNVHQ4EFgQUpDRUq9ul1wc8XpfXC7Dlj99/FxQwDgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMDAGA1UdIAQpMCcwDQYLKwYBBAGyMQECAh0wDAYKKoZIhvdMBQICATAIBgZngQwBAgEwQgYDVR0fBDswOTA3oDWgM4YxaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFlU2NpZW5jZVNTTENBLmNybDB1BggrBgEFBQcBAQRpMGcwPQYIKwYBBQUHMAKGMWh0dHA6Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BZVNjaWVuY2VTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9vY3NwLnRjcy50ZXJlbmEub3JnMDkGA1UdEQQyMDCCFGZpbGVzZW5kZXIuY2VzbmV0LmN6ghh3d3cuZmlsZXNlbmRlci5jZXNuZXQuY3owDQYJKoZIhvcNAQEFBQADggEBAGS+5katUPWiBklQUKdgCLmy1RTg9P/aQUYgM6k43lJmTXbTE5N/5gL1fdTU2Dakla1mJ10tOAyoZX/wcPk+UXLMp13TsdopMLNGf5V+OQ3qRhlWKXNielx8+HfYJ3/d2rSAJ/ni3tEQfPd2LBvqFtLMyCnpU5A8nsD7DokJvw9tkieokxkGrx+BsW1zWPvmE1YUjhi8k4zF3+/0GZEJWbGdHPczAU9OM4Ei4LEIz2DAEGysWsudOsKWV3w95m7AJYpxB8J5qfNKqq8txmoY7r9b/Qycpglk526Y8WIVBvq8i3F1rImfR35s4vbBiEGcrQdeXQQ/9TGy9hWLsZS2lk8=</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>MIIE+TCCA+GgAwIBAgIQSNd+oblTGlgsZGtWhS41ojANBgkqhkiG9w0BAQUFADA/MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMR8wHQYDVQQDExZURVJFTkEgZVNjaWVuY2UgU1NMIENBMB4XDTE0MDIxMjAwMDAwMFoXDTE1MDMxNDIzNTk1OVowgYQxEzARBgoJkiaJk/IsZAEZFgNvcmcxFjAUBgoJkiaJk/IsZAEZFgZ0ZXJlbmExEzARBgoJkiaJk/IsZAEZFgN0Y3MxITAfBgNVBAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEdMBsGA1UEAxMUZmlsZXNlbmRlci5jZXNuZXQuY3owggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC/2knUTg4ipWfMjhM0gyifCNfSxAsF+DYJfETNiUtQ9AIdTQL0qWKTtfDSYcrWo+TRUSNbQfZkT/joe0PKgcHiBLa3jKANQxPVSSiu+XZ2ckYRoWu+fmt3VjXZu8unyjQ5Uyh6vedJ/bcHw0r5ROYhSJu7+4jIQvdRec9ceVE7GgdVICPPUu4QL8pmrfKPN+y4hBznmSPbn2YknVrVdI6klkkj/mqBRLO4GVfPC1jGvZR8hjHF/U42pnaLbgk+UW811R9RwShd5SkyWr8rKF5CdhSucC5J/Upqwq0GlaKg1+H6i4+bxA6YeaqB1clmJiUi8n8zy785ThttSaBNHScJAgMBAAGjggGpMIIBpTAfBgNVHSMEGDAWgBQj05e9wNihlGGIDYW2zHWfyXk7kjAdBgNVHQ4EFgQUpDRUq9ul1wc8XpfXC7Dlj99/FxQwDgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMDAGA1UdIAQpMCcwDQYLKwYBBAGyMQECAh0wDAYKKoZIhvdMBQICATAIBgZngQwBAgEwQgYDVR0fBDswOTA3oDWgM4YxaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFlU2NpZW5jZVNTTENBLmNybDB1BggrBgEFBQcBAQRpMGcwPQYIKwYBBQUHMAKGMWh0dHA6Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BZVNjaWVuY2VTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9vY3NwLnRjcy50ZXJlbmEub3JnMDkGA1UdEQQyMDCCFGZpbGVzZW5kZXIuY2VzbmV0LmN6ghh3d3cuZmlsZXNlbmRlci5jZXNuZXQuY3owDQYJKoZIhvcNAQEFBQADggEBAGS+5katUPWiBklQUKdgCLmy1RTg9P/aQUYgM6k43lJmTXbTE5N/5gL1fdTU2Dakla1mJ10tOAyoZX/wcPk+UXLMp13TsdopMLNGf5V+OQ3qRhlWKXNielx8+HfYJ3/d2rSAJ/ni3tEQfPd2LBvqFtLMyCnpU5A8nsD7DokJvw9tkieokxkGrx+BsW1zWPvmE1YUjhi8k4zF3+/0GZEJWbGdHPczAU9OM4Ei4LEIz2DAEGysWsudOsKWV3w95m7AJYpxB8J5qfNKqq8txmoY7r9b/Qycpglk526Y8WIVBvq8i3F1rImfR35s4vbBiEGcrQdeXQQ/9TGy9hWLsZS2lk8=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://filesender.cesnet.cz/simplesaml/module.php/saml/sp/saml2-logout.php/filesender.cesnet.cz"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://filesender.du1.cesnet.cz/simplesaml/module.php/saml/sp/saml2-logout.php/filesender.cesnet.cz"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://filesender4elixir.cesnet.cz/simplesaml/module.php/saml/sp/saml2-logout.php/filesender.cesnet.cz"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://filesender6.cesnet.cz/simplesaml/module.php/saml/sp/saml2-logout.php/filesender.cesnet.cz"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://filesender.cesnet.cz/simplesaml/module.php/saml/sp/saml2-acs.php/filesender.cesnet.cz" index="0"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://filesender.cesnet.cz/simplesaml/module.php/saml/sp/saml1-acs.php/filesender.cesnet.cz" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://filesender.cesnet.cz/simplesaml/module.php/saml/sp/saml2-acs.php/filesender.cesnet.cz" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://filesender.cesnet.cz/simplesaml/module.php/saml/sp/saml1-acs.php/filesender.cesnet.cz/artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:profiles:holder-of-key:SSO:browser" Location="https://filesender.cesnet.cz/simplesaml/module.php/saml/sp/saml2-acs.php/filesender.cesnet.cz" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://filesender.du1.cesnet.cz/simplesaml/module.php/saml/sp/saml2-acs.php/filesender.cesnet.cz" index="0"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://filesender.du1.cesnet.cz/simplesaml/module.php/saml/sp/saml1-acs.php/filesender.cesnet.cz" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://filesender.du1.cesnet.cz/simplesaml/module.php/saml/sp/saml2-acs.php/filesender.cesnet.cz" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://filesender.du1.cesnet.cz/simplesaml/module.php/saml/sp/saml1-acs.php/filesender.cesnet.cz/artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:profiles:holder-of-key:SSO:browser" Location="https://filesender.du1.cesnet.cz/simplesaml/module.php/saml/sp/saml2-acs.php/filesender.cesnet.cz" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://filesender4elixir.cesnet.cz/simplesaml/module.php/saml/sp/saml2-acs.php/filesender.cesnet.cz" index="0"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://filesender4elixir.cesnet.cz/simplesaml/module.php/saml/sp/saml1-acs.php/filesender.cesnet.cz" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://filesender4elixir.cesnet.cz/simplesaml/module.php/saml/sp/saml2-acs.php/filesender.cesnet.cz" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://filesender4elixir.cesnet.cz/simplesaml/module.php/saml/sp/saml1-acs.php/filesender.cesnet.cz/artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:profiles:holder-of-key:SSO:browser" Location="https://filesender4elixir.cesnet.cz/simplesaml/module.php/saml/sp/saml2-acs.php/filesender.cesnet.cz" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://filesender6.cesnet.cz/simplesaml/module.php/saml/sp/saml2-acs.php/filesender.cesnet.cz" index="0"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://filesender6.cesnet.cz/simplesaml/module.php/saml/sp/saml1-acs.php/filesender.cesnet.cz" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://filesender6.cesnet.cz/simplesaml/module.php/saml/sp/saml2-acs.php/filesender.cesnet.cz" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://filesender6.cesnet.cz/simplesaml/module.php/saml/sp/saml1-acs.php/filesender.cesnet.cz/artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:profiles:holder-of-key:SSO:browser" Location="https://filesender6.cesnet.cz/simplesaml/module.php/saml/sp/saml2-acs.php/filesender.cesnet.cz" index="4"/>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">CESNET</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">CESNET</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="cs">CESNET</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>Lubos</md:GivenName>
-    <md:SurName>Kopecky</md:SurName>
-    <md:EmailAddress>du-support@cesnet.cz</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/filesender.du1.cesnet.cz-saml-sp.xml b/swamid-interfederations-2.0/filesender.du1.cesnet.cz-saml-sp.xml
deleted file mode 100644
index 64f64ad0..00000000
--- a/swamid-interfederations-2.0/filesender.du1.cesnet.cz-saml-sp.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://filesender.du1.cesnet.cz/saml/sp">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/" registrationInstant="2014-09-01T17:40:43Z">
-      <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: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</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="cs">FileSender</mdui:DisplayName>
-        <mdui:Description xml:lang="en">CESNETs servis for sending files.</mdui:Description>
-        <mdui:Description xml:lang="cs">Cesnetí služba pro posílání souborů.</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://filesender.du1.cesnet.cz/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="cs">http://filesender.du1.cesnet.cz/</mdui:InformationURL>
-      </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>MIIE+TCCA+GgAwIBAgIQSNd+oblTGlgsZGtWhS41ojANBgkqhkiG9w0BAQUFADA/MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMR8wHQYDVQQDExZURVJFTkEgZVNjaWVuY2UgU1NMIENBMB4XDTE0MDIxMjAwMDAwMFoXDTE1MDMxNDIzNTk1OVowgYQxEzARBgoJkiaJk/IsZAEZFgNvcmcxFjAUBgoJkiaJk/IsZAEZFgZ0ZXJlbmExEzARBgoJkiaJk/IsZAEZFgN0Y3MxITAfBgNVBAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEdMBsGA1UEAxMUZmlsZXNlbmRlci5jZXNuZXQuY3owggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC/2knUTg4ipWfMjhM0gyifCNfSxAsF+DYJfETNiUtQ9AIdTQL0qWKTtfDSYcrWo+TRUSNbQfZkT/joe0PKgcHiBLa3jKANQxPVSSiu+XZ2ckYRoWu+fmt3VjXZu8unyjQ5Uyh6vedJ/bcHw0r5ROYhSJu7+4jIQvdRec9ceVE7GgdVICPPUu4QL8pmrfKPN+y4hBznmSPbn2YknVrVdI6klkkj/mqBRLO4GVfPC1jGvZR8hjHF/U42pnaLbgk+UW811R9RwShd5SkyWr8rKF5CdhSucC5J/Upqwq0GlaKg1+H6i4+bxA6YeaqB1clmJiUi8n8zy785ThttSaBNHScJAgMBAAGjggGpMIIBpTAfBgNVHSMEGDAWgBQj05e9wNihlGGIDYW2zHWfyXk7kjAdBgNVHQ4EFgQUpDRUq9ul1wc8XpfXC7Dlj99/FxQwDgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMDAGA1UdIAQpMCcwDQYLKwYBBAGyMQECAh0wDAYKKoZIhvdMBQICATAIBgZngQwBAgEwQgYDVR0fBDswOTA3oDWgM4YxaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFlU2NpZW5jZVNTTENBLmNybDB1BggrBgEFBQcBAQRpMGcwPQYIKwYBBQUHMAKGMWh0dHA6Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BZVNjaWVuY2VTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9vY3NwLnRjcy50ZXJlbmEub3JnMDkGA1UdEQQyMDCCFGZpbGVzZW5kZXIuY2VzbmV0LmN6ghh3d3cuZmlsZXNlbmRlci5jZXNuZXQuY3owDQYJKoZIhvcNAQEFBQADggEBAGS+5katUPWiBklQUKdgCLmy1RTg9P/aQUYgM6k43lJmTXbTE5N/5gL1fdTU2Dakla1mJ10tOAyoZX/wcPk+UXLMp13TsdopMLNGf5V+OQ3qRhlWKXNielx8+HfYJ3/d2rSAJ/ni3tEQfPd2LBvqFtLMyCnpU5A8nsD7DokJvw9tkieokxkGrx+BsW1zWPvmE1YUjhi8k4zF3+/0GZEJWbGdHPczAU9OM4Ei4LEIz2DAEGysWsudOsKWV3w95m7AJYpxB8J5qfNKqq8txmoY7r9b/Qycpglk526Y8WIVBvq8i3F1rImfR35s4vbBiEGcrQdeXQQ/9TGy9hWLsZS2lk8=</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>MIIE+TCCA+GgAwIBAgIQSNd+oblTGlgsZGtWhS41ojANBgkqhkiG9w0BAQUFADA/MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMR8wHQYDVQQDExZURVJFTkEgZVNjaWVuY2UgU1NMIENBMB4XDTE0MDIxMjAwMDAwMFoXDTE1MDMxNDIzNTk1OVowgYQxEzARBgoJkiaJk/IsZAEZFgNvcmcxFjAUBgoJkiaJk/IsZAEZFgZ0ZXJlbmExEzARBgoJkiaJk/IsZAEZFgN0Y3MxITAfBgNVBAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEdMBsGA1UEAxMUZmlsZXNlbmRlci5jZXNuZXQuY3owggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC/2knUTg4ipWfMjhM0gyifCNfSxAsF+DYJfETNiUtQ9AIdTQL0qWKTtfDSYcrWo+TRUSNbQfZkT/joe0PKgcHiBLa3jKANQxPVSSiu+XZ2ckYRoWu+fmt3VjXZu8unyjQ5Uyh6vedJ/bcHw0r5ROYhSJu7+4jIQvdRec9ceVE7GgdVICPPUu4QL8pmrfKPN+y4hBznmSPbn2YknVrVdI6klkkj/mqBRLO4GVfPC1jGvZR8hjHF/U42pnaLbgk+UW811R9RwShd5SkyWr8rKF5CdhSucC5J/Upqwq0GlaKg1+H6i4+bxA6YeaqB1clmJiUi8n8zy785ThttSaBNHScJAgMBAAGjggGpMIIBpTAfBgNVHSMEGDAWgBQj05e9wNihlGGIDYW2zHWfyXk7kjAdBgNVHQ4EFgQUpDRUq9ul1wc8XpfXC7Dlj99/FxQwDgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMDAGA1UdIAQpMCcwDQYLKwYBBAGyMQECAh0wDAYKKoZIhvdMBQICATAIBgZngQwBAgEwQgYDVR0fBDswOTA3oDWgM4YxaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFlU2NpZW5jZVNTTENBLmNybDB1BggrBgEFBQcBAQRpMGcwPQYIKwYBBQUHMAKGMWh0dHA6Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BZVNjaWVuY2VTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9vY3NwLnRjcy50ZXJlbmEub3JnMDkGA1UdEQQyMDCCFGZpbGVzZW5kZXIuY2VzbmV0LmN6ghh3d3cuZmlsZXNlbmRlci5jZXNuZXQuY3owDQYJKoZIhvcNAQEFBQADggEBAGS+5katUPWiBklQUKdgCLmy1RTg9P/aQUYgM6k43lJmTXbTE5N/5gL1fdTU2Dakla1mJ10tOAyoZX/wcPk+UXLMp13TsdopMLNGf5V+OQ3qRhlWKXNielx8+HfYJ3/d2rSAJ/ni3tEQfPd2LBvqFtLMyCnpU5A8nsD7DokJvw9tkieokxkGrx+BsW1zWPvmE1YUjhi8k4zF3+/0GZEJWbGdHPczAU9OM4Ei4LEIz2DAEGysWsudOsKWV3w95m7AJYpxB8J5qfNKqq8txmoY7r9b/Qycpglk526Y8WIVBvq8i3F1rImfR35s4vbBiEGcrQdeXQQ/9TGy9hWLsZS2lk8=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://filesender.du1.cesnet.cz/simplesaml/module.php/saml/sp/saml2-logout.php/filesender.du1.cesnet.cz"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://filesender.du1.cesnet.cz/simplesaml/module.php/saml/sp/saml2-acs.php/filesender.du1.cesnet.cz" index="0"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://filesender.du1.cesnet.cz/simplesaml/module.php/saml/sp/saml1-acs.php/filesender.du1.cesnet.cz" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://filesender.du1.cesnet.cz/simplesaml/module.php/saml/sp/saml2-acs.php/filesender.du1.cesnet.cz" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://filesender.du1.cesnet.cz/simplesaml/module.php/saml/sp/saml1-acs.php/filesender.du1.cesnet.cz/artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:profiles:holder-of-key:SSO:browser" Location="https://filesender.du1.cesnet.cz/simplesaml/module.php/saml/sp/saml2-acs.php/filesender.du1.cesnet.cz" index="4"/>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">CESNET</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">CESNET</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="cs">CESNET</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>Lubos</md:GivenName>
-    <md:SurName>Kopecky - administrator</md:SurName>
-    <md:EmailAddress>du-support@cesnet.cz</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/filesender.du1.cesnet.cz.xml b/swamid-interfederations-2.0/filesender.du1.cesnet.cz.xml
deleted file mode 100644
index 64f64ad0..00000000
--- a/swamid-interfederations-2.0/filesender.du1.cesnet.cz.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://filesender.du1.cesnet.cz/saml/sp">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/" registrationInstant="2014-09-01T17:40:43Z">
-      <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: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</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="cs">FileSender</mdui:DisplayName>
-        <mdui:Description xml:lang="en">CESNETs servis for sending files.</mdui:Description>
-        <mdui:Description xml:lang="cs">Cesnetí služba pro posílání souborů.</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://filesender.du1.cesnet.cz/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="cs">http://filesender.du1.cesnet.cz/</mdui:InformationURL>
-      </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>MIIE+TCCA+GgAwIBAgIQSNd+oblTGlgsZGtWhS41ojANBgkqhkiG9w0BAQUFADA/MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMR8wHQYDVQQDExZURVJFTkEgZVNjaWVuY2UgU1NMIENBMB4XDTE0MDIxMjAwMDAwMFoXDTE1MDMxNDIzNTk1OVowgYQxEzARBgoJkiaJk/IsZAEZFgNvcmcxFjAUBgoJkiaJk/IsZAEZFgZ0ZXJlbmExEzARBgoJkiaJk/IsZAEZFgN0Y3MxITAfBgNVBAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEdMBsGA1UEAxMUZmlsZXNlbmRlci5jZXNuZXQuY3owggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC/2knUTg4ipWfMjhM0gyifCNfSxAsF+DYJfETNiUtQ9AIdTQL0qWKTtfDSYcrWo+TRUSNbQfZkT/joe0PKgcHiBLa3jKANQxPVSSiu+XZ2ckYRoWu+fmt3VjXZu8unyjQ5Uyh6vedJ/bcHw0r5ROYhSJu7+4jIQvdRec9ceVE7GgdVICPPUu4QL8pmrfKPN+y4hBznmSPbn2YknVrVdI6klkkj/mqBRLO4GVfPC1jGvZR8hjHF/U42pnaLbgk+UW811R9RwShd5SkyWr8rKF5CdhSucC5J/Upqwq0GlaKg1+H6i4+bxA6YeaqB1clmJiUi8n8zy785ThttSaBNHScJAgMBAAGjggGpMIIBpTAfBgNVHSMEGDAWgBQj05e9wNihlGGIDYW2zHWfyXk7kjAdBgNVHQ4EFgQUpDRUq9ul1wc8XpfXC7Dlj99/FxQwDgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMDAGA1UdIAQpMCcwDQYLKwYBBAGyMQECAh0wDAYKKoZIhvdMBQICATAIBgZngQwBAgEwQgYDVR0fBDswOTA3oDWgM4YxaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFlU2NpZW5jZVNTTENBLmNybDB1BggrBgEFBQcBAQRpMGcwPQYIKwYBBQUHMAKGMWh0dHA6Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BZVNjaWVuY2VTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9vY3NwLnRjcy50ZXJlbmEub3JnMDkGA1UdEQQyMDCCFGZpbGVzZW5kZXIuY2VzbmV0LmN6ghh3d3cuZmlsZXNlbmRlci5jZXNuZXQuY3owDQYJKoZIhvcNAQEFBQADggEBAGS+5katUPWiBklQUKdgCLmy1RTg9P/aQUYgM6k43lJmTXbTE5N/5gL1fdTU2Dakla1mJ10tOAyoZX/wcPk+UXLMp13TsdopMLNGf5V+OQ3qRhlWKXNielx8+HfYJ3/d2rSAJ/ni3tEQfPd2LBvqFtLMyCnpU5A8nsD7DokJvw9tkieokxkGrx+BsW1zWPvmE1YUjhi8k4zF3+/0GZEJWbGdHPczAU9OM4Ei4LEIz2DAEGysWsudOsKWV3w95m7AJYpxB8J5qfNKqq8txmoY7r9b/Qycpglk526Y8WIVBvq8i3F1rImfR35s4vbBiEGcrQdeXQQ/9TGy9hWLsZS2lk8=</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>MIIE+TCCA+GgAwIBAgIQSNd+oblTGlgsZGtWhS41ojANBgkqhkiG9w0BAQUFADA/MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMR8wHQYDVQQDExZURVJFTkEgZVNjaWVuY2UgU1NMIENBMB4XDTE0MDIxMjAwMDAwMFoXDTE1MDMxNDIzNTk1OVowgYQxEzARBgoJkiaJk/IsZAEZFgNvcmcxFjAUBgoJkiaJk/IsZAEZFgZ0ZXJlbmExEzARBgoJkiaJk/IsZAEZFgN0Y3MxITAfBgNVBAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEdMBsGA1UEAxMUZmlsZXNlbmRlci5jZXNuZXQuY3owggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC/2knUTg4ipWfMjhM0gyifCNfSxAsF+DYJfETNiUtQ9AIdTQL0qWKTtfDSYcrWo+TRUSNbQfZkT/joe0PKgcHiBLa3jKANQxPVSSiu+XZ2ckYRoWu+fmt3VjXZu8unyjQ5Uyh6vedJ/bcHw0r5ROYhSJu7+4jIQvdRec9ceVE7GgdVICPPUu4QL8pmrfKPN+y4hBznmSPbn2YknVrVdI6klkkj/mqBRLO4GVfPC1jGvZR8hjHF/U42pnaLbgk+UW811R9RwShd5SkyWr8rKF5CdhSucC5J/Upqwq0GlaKg1+H6i4+bxA6YeaqB1clmJiUi8n8zy785ThttSaBNHScJAgMBAAGjggGpMIIBpTAfBgNVHSMEGDAWgBQj05e9wNihlGGIDYW2zHWfyXk7kjAdBgNVHQ4EFgQUpDRUq9ul1wc8XpfXC7Dlj99/FxQwDgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMDAGA1UdIAQpMCcwDQYLKwYBBAGyMQECAh0wDAYKKoZIhvdMBQICATAIBgZngQwBAgEwQgYDVR0fBDswOTA3oDWgM4YxaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFlU2NpZW5jZVNTTENBLmNybDB1BggrBgEFBQcBAQRpMGcwPQYIKwYBBQUHMAKGMWh0dHA6Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BZVNjaWVuY2VTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9vY3NwLnRjcy50ZXJlbmEub3JnMDkGA1UdEQQyMDCCFGZpbGVzZW5kZXIuY2VzbmV0LmN6ghh3d3cuZmlsZXNlbmRlci5jZXNuZXQuY3owDQYJKoZIhvcNAQEFBQADggEBAGS+5katUPWiBklQUKdgCLmy1RTg9P/aQUYgM6k43lJmTXbTE5N/5gL1fdTU2Dakla1mJ10tOAyoZX/wcPk+UXLMp13TsdopMLNGf5V+OQ3qRhlWKXNielx8+HfYJ3/d2rSAJ/ni3tEQfPd2LBvqFtLMyCnpU5A8nsD7DokJvw9tkieokxkGrx+BsW1zWPvmE1YUjhi8k4zF3+/0GZEJWbGdHPczAU9OM4Ei4LEIz2DAEGysWsudOsKWV3w95m7AJYpxB8J5qfNKqq8txmoY7r9b/Qycpglk526Y8WIVBvq8i3F1rImfR35s4vbBiEGcrQdeXQQ/9TGy9hWLsZS2lk8=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://filesender.du1.cesnet.cz/simplesaml/module.php/saml/sp/saml2-logout.php/filesender.du1.cesnet.cz"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://filesender.du1.cesnet.cz/simplesaml/module.php/saml/sp/saml2-acs.php/filesender.du1.cesnet.cz" index="0"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://filesender.du1.cesnet.cz/simplesaml/module.php/saml/sp/saml1-acs.php/filesender.du1.cesnet.cz" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://filesender.du1.cesnet.cz/simplesaml/module.php/saml/sp/saml2-acs.php/filesender.du1.cesnet.cz" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://filesender.du1.cesnet.cz/simplesaml/module.php/saml/sp/saml1-acs.php/filesender.du1.cesnet.cz/artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:profiles:holder-of-key:SSO:browser" Location="https://filesender.du1.cesnet.cz/simplesaml/module.php/saml/sp/saml2-acs.php/filesender.du1.cesnet.cz" index="4"/>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">CESNET</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">CESNET</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="cs">CESNET</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>Lubos</md:GivenName>
-    <md:SurName>Kopecky - administrator</md:SurName>
-    <md:EmailAddress>du-support@cesnet.cz</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/filesender.funet.fi.xml b/swamid-interfederations-2.0/filesender.funet.fi.xml
index 57c474ac..da3a3dbe 100644
--- a/swamid-interfederations-2.0/filesender.funet.fi.xml
+++ b/swamid-interfederations-2.0/filesender.funet.fi.xml
@@ -1,19 +1,9 @@
 <?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#" entityID="https://filesender.funet.fi">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.csc.fi/haka">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://www.csc.fi/english/institutions/haka/instructions/join/eduGAINRegistrationStatement/</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: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://filesender.funet.fi/simplesaml/module.php/saml/disco.php" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+<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://filesender.funet.fi">
+  <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://filesender.funet.fi/simplesaml/module.php/saml/disco.php" index="1"/>
+      <mdui:UIInfo>
         <mdui:DisplayName xml:lang="fi">Funet FileSender</mdui:DisplayName>
         <mdui:DisplayName xml:lang="sv">Funet FileSender</mdui:DisplayName>
         <mdui:DisplayName xml:lang="en">Funet FileSender</mdui:DisplayName>
@@ -24,8 +14,12 @@
         <mdui:PrivacyStatementURL xml:lang="fi">https://filesender.funet.fi/privacypolicy.html</mdui:PrivacyStatementURL>
         <mdui:PrivacyStatementURL xml:lang="en">https://filesender.funet.fi/privacypolicy.html</mdui:PrivacyStatementURL>
       </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
+      <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>MIIE2TCCA8GgAwIBAgIQX2leAqJlB3Q/3iPF8QljNTANBgkqhkiG9w0BAQUFADA2
@@ -56,47 +50,47 @@ NuSoiRuRqUwvjh1crrpK3aEPzrhwALKEQo0tIKOpSHjVUwvGXWtoljY7JJJt94y1
 o9pAScnCYOeqNoQ//wrcSVQcwozZLhGlymlLAyDI0rx/hM9v+8PL1E0iFmf/</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </KeyDescriptor>
-    <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://filesender.funet.fi/simplesaml/module.php/saml/sp/saml2-acs.php/SP" index="1" isDefault="true"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://filesender.funet.fi/simplesaml/module.php/saml/sp/saml2-acs.php/SP" index="2" isDefault="false"/>
-    <AttributeConsumingService index="1" isDefault="true">
-      <ServiceName xml:lang="fi">Funet FileSender</ServiceName>
-      <ServiceName xml:lang="en">Funet FileSender</ServiceName>
-      <ServiceName xml:lang="sv">Funet FileSender</ServiceName>
-      <ServiceDescription xml:lang="fi">Funet FileSender tarjoaa helpon ja turvallisen tavan jakaa suuria tiedostoja.</ServiceDescription>
-      <ServiceDescription xml:lang="en">Funet FileSender offers an easy and a secure way to share large files with anyone.</ServiceDescription>
-      <ServiceDescription xml:lang="sv">Funet FileSender erbjuder en latt och saker satt att dela stora datafilar till vem som helst.</ServiceDescription>
-      <RequestedAttribute FriendlyName="cn" Name="urn:oid:2.5.4.3" 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="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="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-    </AttributeConsumingService>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="fi">CSC - Tieteen tietotekniikan keskus Oy</OrganizationName>
-    <OrganizationName xml:lang="en">CSC - IT Center for Science Ltd.</OrganizationName>
-    <OrganizationName xml:lang="sv">CSC - Tieteen tietotekniikan keskus Oy</OrganizationName>
-    <OrganizationDisplayName xml:lang="fi">CSC - Tieteen tietotekniikan keskus Oy</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">CSC - IT Center for Science Ltd.</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="sv">CSC - Tieteen tietotekniikan keskus Oy</OrganizationDisplayName>
-    <OrganizationURL xml:lang="fi">http://www.csc.fi</OrganizationURL>
-    <OrganizationURL xml:lang="en">http://www.csc.fi</OrganizationURL>
-    <OrganizationURL xml:lang="sv">http://www.csc.fi</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="administrative">
-    <GivenName>Harri</GivenName>
-    <SurName>Kuusisto</SurName>
-    <EmailAddress>mailto:funyht@csc.fi</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Tomi</GivenName>
-    <SurName>Salmi</SurName>
-    <EmailAddress>mailto:noc@funet.fi</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="support">
-    <GivenName>Tomi</GivenName>
-    <SurName>Salmi</SurName>
-    <EmailAddress>mailto:noc@funet.fi</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
+    </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://filesender.funet.fi/simplesaml/module.php/saml/sp/saml2-acs.php/SP" index="1" isDefault="true"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://filesender.funet.fi/simplesaml/module.php/saml/sp/saml2-acs.php/SP" index="2" isDefault="false"/>
+    <md:AttributeConsumingService index="1" isDefault="true">
+      <md:ServiceName xml:lang="fi">Funet FileSender</md:ServiceName>
+      <md:ServiceName xml:lang="en">Funet FileSender</md:ServiceName>
+      <md:ServiceName xml:lang="sv">Funet FileSender</md:ServiceName>
+      <md:ServiceDescription xml:lang="fi">Funet FileSender tarjoaa helpon ja turvallisen tavan jakaa suuria tiedostoja.</md:ServiceDescription>
+      <md:ServiceDescription xml:lang="en">Funet FileSender offers an easy and a secure way to share large files with anyone.</md:ServiceDescription>
+      <md:ServiceDescription xml:lang="sv">Funet FileSender erbjuder en latt och saker satt att dela stora datafilar till vem som helst.</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.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: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>Harri</md:GivenName>
+    <md:SurName>Kuusisto</md:SurName>
+    <md:EmailAddress>mailto:funyht@csc.fi</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Tomi</md:GivenName>
+    <md:SurName>Salmi</md:SurName>
+    <md:EmailAddress>mailto:noc@funet.fi</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Tomi</md:GivenName>
+    <md:SurName>Salmi</md:SurName>
+    <md:EmailAddress>mailto:noc@funet.fi</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/filesender.redclara.net-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml b/swamid-interfederations-2.0/filesender.redclara.net-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
deleted file mode 100644
index 84cbe8c5..00000000
--- a/swamid-interfederations-2.0/filesender.redclara.net-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?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>MIIGaDCCBVCgAwIBAgIDEIKWMA0GCSqGSIb3DQEBBQUAMIGMMQswCQYDVQQGEwJJTDEWMBQGA1UEChMNU3RhcnRDb20gTHRkLjErMCkGA1UECxMiU2VjdXJlIERpZ2l0YWwgQ2VydGlmaWNhdGUgU2lnbmluZzE4MDYGA1UEAxMvU3RhcnRDb20gQ2xhc3MgMSBQcmltYXJ5IEludGVybWVkaWF0ZSBTZXJ2ZXIgQ0EwHhcNMTQwNTE1MDA0MzAyWhcNMTUwNTE1MTgwODE3WjByMRkwFwYDVQQNExB2UDFocXA2bjY3UW1sdFBPMQswCQYDVQQGEwJDTzEgMB4GA1UEAxMXZmlsZXNlbmRlci5yZWRjbGFyYS5uZXQxJjAkBgkqhkiG9w0BCQEWF3Bvc3RtYXN0ZXJAcmVkY2xhcmEubmV0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEArbFVPRwCKFgp3JOvxyxpu+G3ebIaVappz4YkrFc10tvKdIoVaMVQPRvZB13RPGMm2R1avgKlM7keUKOHxgTk9jsN42y4sOcwe+MH2BHKVVIIWSUGqJPa67jEOr6qUzqJEa5nran9BsZek0LIyyuaHXiDph2+3fEElRiiIbTj4Jxmb36zkvYAacrPNbUVShy99lqRDXyCwj6KF3n7sPLIZFnqHabA54OJPUw6Z15rGvhLpmuyvrcmnivgKXjWT5ebItfBcy+u4Xkq6rgfAeJANN4oZnV2WQTjR9g4eAil6Gmkxec+NtQuwvsPB3X8HYtEX5VjeVo3oJ45KqxVgD/F1QIDAQABo4IC6jCCAuYwCQYDVR0TBAIwADALBgNVHQ8EBAMCA6gwEwYDVR0lBAwwCgYIKwYBBQUHAwEwHQYDVR0OBBYEFDAOdKKMb+RgNebeSjlbBNJc32Q5MB8GA1UdIwQYMBaAFOtCNNCYsKuf9BtrCPfMZC7vDixFMDAGA1UdEQQpMCeCF2ZpbGVzZW5kZXIucmVkY2xhcmEubmV0ggxyZWRjbGFyYS5uZXQwggFWBgNVHSAEggFNMIIBSTAIBgZngQwBAgEwggE7BgsrBgEEAYG1NwECAzCCASowLgYIKwYBBQUHAgEWImh0dHA6Ly93d3cuc3RhcnRzc2wuY29tL3BvbGljeS5wZGYwgfcGCCsGAQUFBwICMIHqMCcWIFN0YXJ0Q29tIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MAMCAQEagb5UaGlzIGNlcnRpZmljYXRlIHdhcyBpc3N1ZWQgYWNjb3JkaW5nIHRvIHRoZSBDbGFzcyAxIFZhbGlkYXRpb24gcmVxdWlyZW1lbnRzIG9mIHRoZSBTdGFydENvbSBDQSBwb2xpY3ksIHJlbGlhbmNlIG9ubHkgZm9yIHRoZSBpbnRlbmRlZCBwdXJwb3NlIGluIGNvbXBsaWFuY2Ugb2YgdGhlIHJlbHlpbmcgcGFydHkgb2JsaWdhdGlvbnMuMDUGA1UdHwQuMCwwKqAooCaGJGh0dHA6Ly9jcmwuc3RhcnRzc2wuY29tL2NydDEtY3JsLmNybDCBjgYIKwYBBQUHAQEEgYEwfzA5BggrBgEFBQcwAYYtaHR0cDovL29jc3Auc3RhcnRzc2wuY29tL3N1Yi9jbGFzczEvc2VydmVyL2NhMEIGCCsGAQUFBzAChjZodHRwOi8vYWlhLnN0YXJ0c3NsLmNvbS9jZXJ0cy9zdWIuY2xhc3MxLnNlcnZlci5jYS5jcnQwIwYDVR0SBBwwGoYYaHR0cDovL3d3dy5zdGFydHNzbC5jb20vMA0GCSqGSIb3DQEBBQUAA4IBAQAo0NqRJtzIEGJRodYzwOteBMpjamboDuWM5p+VG7YEHkJFvTrjaRCG+4bucQruojQGgQCP9VAa7iDKpM5axJcBgM/ud5lKMGnECo44t4MGdavIvFVlc1CpDs9gLuniseWdbb+fhXGhoXDtC++fx8Det9SoknpmvlCgoWUJnSetjgo10SG5Zk3DTPh1A8XJUsoYsnqBB6DJ97NdLXMu6hug54NQX1KGLf8DVu58bV3B022e0KEg7VWbMCUE5LTp88tlBJoiSU40uUhsc4xR7OYKiW2CxDmwqP/w1KBcwTQYcjZVJGt0lv79yhplQrfPK5mJjQY+//LYYQRr0/BFJ8UW
-</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>MIIGaDCCBVCgAwIBAgIDEIKWMA0GCSqGSIb3DQEBBQUAMIGMMQswCQYDVQQGEwJJTDEWMBQGA1UEChMNU3RhcnRDb20gTHRkLjErMCkGA1UECxMiU2VjdXJlIERpZ2l0YWwgQ2VydGlmaWNhdGUgU2lnbmluZzE4MDYGA1UEAxMvU3RhcnRDb20gQ2xhc3MgMSBQcmltYXJ5IEludGVybWVkaWF0ZSBTZXJ2ZXIgQ0EwHhcNMTQwNTE1MDA0MzAyWhcNMTUwNTE1MTgwODE3WjByMRkwFwYDVQQNExB2UDFocXA2bjY3UW1sdFBPMQswCQYDVQQGEwJDTzEgMB4GA1UEAxMXZmlsZXNlbmRlci5yZWRjbGFyYS5uZXQxJjAkBgkqhkiG9w0BCQEWF3Bvc3RtYXN0ZXJAcmVkY2xhcmEubmV0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEArbFVPRwCKFgp3JOvxyxpu+G3ebIaVappz4YkrFc10tvKdIoVaMVQPRvZB13RPGMm2R1avgKlM7keUKOHxgTk9jsN42y4sOcwe+MH2BHKVVIIWSUGqJPa67jEOr6qUzqJEa5nran9BsZek0LIyyuaHXiDph2+3fEElRiiIbTj4Jxmb36zkvYAacrPNbUVShy99lqRDXyCwj6KF3n7sPLIZFnqHabA54OJPUw6Z15rGvhLpmuyvrcmnivgKXjWT5ebItfBcy+u4Xkq6rgfAeJANN4oZnV2WQTjR9g4eAil6Gmkxec+NtQuwvsPB3X8HYtEX5VjeVo3oJ45KqxVgD/F1QIDAQABo4IC6jCCAuYwCQYDVR0TBAIwADALBgNVHQ8EBAMCA6gwEwYDVR0lBAwwCgYIKwYBBQUHAwEwHQYDVR0OBBYEFDAOdKKMb+RgNebeSjlbBNJc32Q5MB8GA1UdIwQYMBaAFOtCNNCYsKuf9BtrCPfMZC7vDixFMDAGA1UdEQQpMCeCF2ZpbGVzZW5kZXIucmVkY2xhcmEubmV0ggxyZWRjbGFyYS5uZXQwggFWBgNVHSAEggFNMIIBSTAIBgZngQwBAgEwggE7BgsrBgEEAYG1NwECAzCCASowLgYIKwYBBQUHAgEWImh0dHA6Ly93d3cuc3RhcnRzc2wuY29tL3BvbGljeS5wZGYwgfcGCCsGAQUFBwICMIHqMCcWIFN0YXJ0Q29tIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MAMCAQEagb5UaGlzIGNlcnRpZmljYXRlIHdhcyBpc3N1ZWQgYWNjb3JkaW5nIHRvIHRoZSBDbGFzcyAxIFZhbGlkYXRpb24gcmVxdWlyZW1lbnRzIG9mIHRoZSBTdGFydENvbSBDQSBwb2xpY3ksIHJlbGlhbmNlIG9ubHkgZm9yIHRoZSBpbnRlbmRlZCBwdXJwb3NlIGluIGNvbXBsaWFuY2Ugb2YgdGhlIHJlbHlpbmcgcGFydHkgb2JsaWdhdGlvbnMuMDUGA1UdHwQuMCwwKqAooCaGJGh0dHA6Ly9jcmwuc3RhcnRzc2wuY29tL2NydDEtY3JsLmNybDCBjgYIKwYBBQUHAQEEgYEwfzA5BggrBgEFBQcwAYYtaHR0cDovL29jc3Auc3RhcnRzc2wuY29tL3N1Yi9jbGFzczEvc2VydmVyL2NhMEIGCCsGAQUFBzAChjZodHRwOi8vYWlhLnN0YXJ0c3NsLmNvbS9jZXJ0cy9zdWIuY2xhc3MxLnNlcnZlci5jYS5jcnQwIwYDVR0SBBwwGoYYaHR0cDovL3d3dy5zdGFydHNzbC5jb20vMA0GCSqGSIb3DQEBBQUAA4IBAQAo0NqRJtzIEGJRodYzwOteBMpjamboDuWM5p+VG7YEHkJFvTrjaRCG+4bucQruojQGgQCP9VAa7iDKpM5axJcBgM/ud5lKMGnECo44t4MGdavIvFVlc1CpDs9gLuniseWdbb+fhXGhoXDtC++fx8Det9SoknpmvlCgoWUJnSetjgo10SG5Zk3DTPh1A8XJUsoYsnqBB6DJ97NdLXMu6hug54NQX1KGLf8DVu58bV3B022e0KEg7VWbMCUE5LTp88tlBJoiSU40uUhsc4xR7OYKiW2CxDmwqP/w1KBcwTQYcjZVJGt0lv79yhplQrfPK5mJjQY+//LYYQRr0/BFJ8UW
-</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/filesender.redclara.net.xml b/swamid-interfederations-2.0/filesender.redclara.net.xml
deleted file mode 100644
index 84cbe8c5..00000000
--- a/swamid-interfederations-2.0/filesender.redclara.net.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?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>MIIGaDCCBVCgAwIBAgIDEIKWMA0GCSqGSIb3DQEBBQUAMIGMMQswCQYDVQQGEwJJTDEWMBQGA1UEChMNU3RhcnRDb20gTHRkLjErMCkGA1UECxMiU2VjdXJlIERpZ2l0YWwgQ2VydGlmaWNhdGUgU2lnbmluZzE4MDYGA1UEAxMvU3RhcnRDb20gQ2xhc3MgMSBQcmltYXJ5IEludGVybWVkaWF0ZSBTZXJ2ZXIgQ0EwHhcNMTQwNTE1MDA0MzAyWhcNMTUwNTE1MTgwODE3WjByMRkwFwYDVQQNExB2UDFocXA2bjY3UW1sdFBPMQswCQYDVQQGEwJDTzEgMB4GA1UEAxMXZmlsZXNlbmRlci5yZWRjbGFyYS5uZXQxJjAkBgkqhkiG9w0BCQEWF3Bvc3RtYXN0ZXJAcmVkY2xhcmEubmV0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEArbFVPRwCKFgp3JOvxyxpu+G3ebIaVappz4YkrFc10tvKdIoVaMVQPRvZB13RPGMm2R1avgKlM7keUKOHxgTk9jsN42y4sOcwe+MH2BHKVVIIWSUGqJPa67jEOr6qUzqJEa5nran9BsZek0LIyyuaHXiDph2+3fEElRiiIbTj4Jxmb36zkvYAacrPNbUVShy99lqRDXyCwj6KF3n7sPLIZFnqHabA54OJPUw6Z15rGvhLpmuyvrcmnivgKXjWT5ebItfBcy+u4Xkq6rgfAeJANN4oZnV2WQTjR9g4eAil6Gmkxec+NtQuwvsPB3X8HYtEX5VjeVo3oJ45KqxVgD/F1QIDAQABo4IC6jCCAuYwCQYDVR0TBAIwADALBgNVHQ8EBAMCA6gwEwYDVR0lBAwwCgYIKwYBBQUHAwEwHQYDVR0OBBYEFDAOdKKMb+RgNebeSjlbBNJc32Q5MB8GA1UdIwQYMBaAFOtCNNCYsKuf9BtrCPfMZC7vDixFMDAGA1UdEQQpMCeCF2ZpbGVzZW5kZXIucmVkY2xhcmEubmV0ggxyZWRjbGFyYS5uZXQwggFWBgNVHSAEggFNMIIBSTAIBgZngQwBAgEwggE7BgsrBgEEAYG1NwECAzCCASowLgYIKwYBBQUHAgEWImh0dHA6Ly93d3cuc3RhcnRzc2wuY29tL3BvbGljeS5wZGYwgfcGCCsGAQUFBwICMIHqMCcWIFN0YXJ0Q29tIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MAMCAQEagb5UaGlzIGNlcnRpZmljYXRlIHdhcyBpc3N1ZWQgYWNjb3JkaW5nIHRvIHRoZSBDbGFzcyAxIFZhbGlkYXRpb24gcmVxdWlyZW1lbnRzIG9mIHRoZSBTdGFydENvbSBDQSBwb2xpY3ksIHJlbGlhbmNlIG9ubHkgZm9yIHRoZSBpbnRlbmRlZCBwdXJwb3NlIGluIGNvbXBsaWFuY2Ugb2YgdGhlIHJlbHlpbmcgcGFydHkgb2JsaWdhdGlvbnMuMDUGA1UdHwQuMCwwKqAooCaGJGh0dHA6Ly9jcmwuc3RhcnRzc2wuY29tL2NydDEtY3JsLmNybDCBjgYIKwYBBQUHAQEEgYEwfzA5BggrBgEFBQcwAYYtaHR0cDovL29jc3Auc3RhcnRzc2wuY29tL3N1Yi9jbGFzczEvc2VydmVyL2NhMEIGCCsGAQUFBzAChjZodHRwOi8vYWlhLnN0YXJ0c3NsLmNvbS9jZXJ0cy9zdWIuY2xhc3MxLnNlcnZlci5jYS5jcnQwIwYDVR0SBBwwGoYYaHR0cDovL3d3dy5zdGFydHNzbC5jb20vMA0GCSqGSIb3DQEBBQUAA4IBAQAo0NqRJtzIEGJRodYzwOteBMpjamboDuWM5p+VG7YEHkJFvTrjaRCG+4bucQruojQGgQCP9VAa7iDKpM5axJcBgM/ud5lKMGnECo44t4MGdavIvFVlc1CpDs9gLuniseWdbb+fhXGhoXDtC++fx8Det9SoknpmvlCgoWUJnSetjgo10SG5Zk3DTPh1A8XJUsoYsnqBB6DJ97NdLXMu6hug54NQX1KGLf8DVu58bV3B022e0KEg7VWbMCUE5LTp88tlBJoiSU40uUhsc4xR7OYKiW2CxDmwqP/w1KBcwTQYcjZVJGt0lv79yhplQrfPK5mJjQY+//LYYQRr0/BFJ8UW
-</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>MIIGaDCCBVCgAwIBAgIDEIKWMA0GCSqGSIb3DQEBBQUAMIGMMQswCQYDVQQGEwJJTDEWMBQGA1UEChMNU3RhcnRDb20gTHRkLjErMCkGA1UECxMiU2VjdXJlIERpZ2l0YWwgQ2VydGlmaWNhdGUgU2lnbmluZzE4MDYGA1UEAxMvU3RhcnRDb20gQ2xhc3MgMSBQcmltYXJ5IEludGVybWVkaWF0ZSBTZXJ2ZXIgQ0EwHhcNMTQwNTE1MDA0MzAyWhcNMTUwNTE1MTgwODE3WjByMRkwFwYDVQQNExB2UDFocXA2bjY3UW1sdFBPMQswCQYDVQQGEwJDTzEgMB4GA1UEAxMXZmlsZXNlbmRlci5yZWRjbGFyYS5uZXQxJjAkBgkqhkiG9w0BCQEWF3Bvc3RtYXN0ZXJAcmVkY2xhcmEubmV0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEArbFVPRwCKFgp3JOvxyxpu+G3ebIaVappz4YkrFc10tvKdIoVaMVQPRvZB13RPGMm2R1avgKlM7keUKOHxgTk9jsN42y4sOcwe+MH2BHKVVIIWSUGqJPa67jEOr6qUzqJEa5nran9BsZek0LIyyuaHXiDph2+3fEElRiiIbTj4Jxmb36zkvYAacrPNbUVShy99lqRDXyCwj6KF3n7sPLIZFnqHabA54OJPUw6Z15rGvhLpmuyvrcmnivgKXjWT5ebItfBcy+u4Xkq6rgfAeJANN4oZnV2WQTjR9g4eAil6Gmkxec+NtQuwvsPB3X8HYtEX5VjeVo3oJ45KqxVgD/F1QIDAQABo4IC6jCCAuYwCQYDVR0TBAIwADALBgNVHQ8EBAMCA6gwEwYDVR0lBAwwCgYIKwYBBQUHAwEwHQYDVR0OBBYEFDAOdKKMb+RgNebeSjlbBNJc32Q5MB8GA1UdIwQYMBaAFOtCNNCYsKuf9BtrCPfMZC7vDixFMDAGA1UdEQQpMCeCF2ZpbGVzZW5kZXIucmVkY2xhcmEubmV0ggxyZWRjbGFyYS5uZXQwggFWBgNVHSAEggFNMIIBSTAIBgZngQwBAgEwggE7BgsrBgEEAYG1NwECAzCCASowLgYIKwYBBQUHAgEWImh0dHA6Ly93d3cuc3RhcnRzc2wuY29tL3BvbGljeS5wZGYwgfcGCCsGAQUFBwICMIHqMCcWIFN0YXJ0Q29tIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MAMCAQEagb5UaGlzIGNlcnRpZmljYXRlIHdhcyBpc3N1ZWQgYWNjb3JkaW5nIHRvIHRoZSBDbGFzcyAxIFZhbGlkYXRpb24gcmVxdWlyZW1lbnRzIG9mIHRoZSBTdGFydENvbSBDQSBwb2xpY3ksIHJlbGlhbmNlIG9ubHkgZm9yIHRoZSBpbnRlbmRlZCBwdXJwb3NlIGluIGNvbXBsaWFuY2Ugb2YgdGhlIHJlbHlpbmcgcGFydHkgb2JsaWdhdGlvbnMuMDUGA1UdHwQuMCwwKqAooCaGJGh0dHA6Ly9jcmwuc3RhcnRzc2wuY29tL2NydDEtY3JsLmNybDCBjgYIKwYBBQUHAQEEgYEwfzA5BggrBgEFBQcwAYYtaHR0cDovL29jc3Auc3RhcnRzc2wuY29tL3N1Yi9jbGFzczEvc2VydmVyL2NhMEIGCCsGAQUFBzAChjZodHRwOi8vYWlhLnN0YXJ0c3NsLmNvbS9jZXJ0cy9zdWIuY2xhc3MxLnNlcnZlci5jYS5jcnQwIwYDVR0SBBwwGoYYaHR0cDovL3d3dy5zdGFydHNzbC5jb20vMA0GCSqGSIb3DQEBBQUAA4IBAQAo0NqRJtzIEGJRodYzwOteBMpjamboDuWM5p+VG7YEHkJFvTrjaRCG+4bucQruojQGgQCP9VAa7iDKpM5axJcBgM/ud5lKMGnECo44t4MGdavIvFVlc1CpDs9gLuniseWdbb+fhXGhoXDtC++fx8Det9SoknpmvlCgoWUJnSetjgo10SG5Zk3DTPh1A8XJUsoYsnqBB6DJ97NdLXMu6hug54NQX1KGLf8DVu58bV3B022e0KEg7VWbMCUE5LTp88tlBJoiSU40uUhsc4xR7OYKiW2CxDmwqP/w1KBcwTQYcjZVJGt0lv79yhplQrfPK5mJjQY+//LYYQRr0/BFJ8UW
-</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/fim-hn-02-idp.orion.education.fr.xml b/swamid-interfederations-2.0/fim-hn-02-idp.orion.education.fr.xml
deleted file mode 100644
index a871ae87..00000000
--- a/swamid-interfederations-2.0/fim-hn-02-idp.orion.education.fr.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://fim-hn-02-idp.orion.education.fr">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2014-10-07T09:43:10Z">
-      <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">education.gouv.fr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ac-orleans-tours.fr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">orion.education.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">FRENCH DEPARTMENT OF EDUCATION - HUB HN02</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Employees of french department of education</mdui:Description>
-        <mdui:DisplayName xml:lang="fr">MINISTERE DE L'EDUCATION NATIONALE - HUB HN02</mdui:DisplayName>
-        <mdui:Description xml:lang="fr">Personnel enseignant, non enseignant et scolaire de l'éducation nationale</mdui:Description>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIGCDCCA/CgAwIBAgIQcg8ekp3qju7yFn9efv+bjTANBgkqhkiG9w0BAQUFADBxMQswCQYDVQQG
-EwJGUjEvMC0GA1UEChMmTWluaXN0ZXJlIGVkdWNhdGlvbiBuYXRpb25hbGUgKE1FTkVTUikxFDAS
-BgNVBAsTCzExMCAwNDMgMDE1MRswGQYDVQQDExJBQyBJbmZyYXN0cnVjdHVyZXMwHhcNMTQwNjAz
-MDkwMDUyWhcNMTYwNjAzMDkwMDUyWjCBkjELMAkGA1UEBhMCRlIxLzAtBgNVBAoTJk1pbmlzdGVy
-ZSBFZHVjYXRpb24gTmF0aW9uYWxlIChNRU5FU1IpMRQwEgYDVQQLEwsxMTAgMDQzIDAxNTEjMCEG
-A1UECxMaQ2VudHJlIE5hdGlvbmFsIGRlIFNlcnZpY2UxFzAVBgNVBAMTDmZzLXBobS1naWQtMS4w
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAyplBIXFUapQgLMiL0wrEzFNYodsuIwdg
-tLfelo0uyiLmiG1teQ4/A7glwhPAuKjPj7dSEbQcw3F70ACUn+eu6z+qoFmmKLKDFNQgE6A58lsO
-yu7PoQInNaQPguyh/M1lUdvSWWqEipXblrLk0D/cDPrn3ieYk2l1QNsvD6s5cAfuw2KyjUrAYIGe
-Fz6yKFeu7W6VBjX3uG9KUPbtAw0Eh/rJW+nJZ3h3++i427jbfNZR0A88pL2omut3+r4REYAHE/xX
-KkHj8kpADhztAXlIqbu6o8s901FV0RmSXp9h6Ddqwu4LrDbrzf3QMfDRtHqtdq/2tXWWfk1VSsaT
-GGFGyQIDAQABo4IBeDCCAXQwSwYIKwYBBQUHAQEEPzA9MDsGCCsGAQUFBzAChi9odHRwOi8vd3d3
-LmlnYy5lZHVjYXRpb24uZnIvSW5mcmFzdHJ1Y3R1cmVzLmNydDAfBgNVHSMEGDAWgBS+OCJ/ckap
-1oQVn9XIKH9cswIgyzAaBgNVHSAEEzARMA8GDSsGAQQBgZ5mRQEBBAEwgaoGA1UdHwSBojCBnzCB
-nKCBmaCBloYwaHR0cDovL2NybDEuaWdjLmVkdWNhdGlvbi5mci9JbmZyYXN0cnVjdHVyZXMuY3Js
-hjBodHRwOi8vY3JsMi5pZ2MuZWR1Y2F0aW9uLmZyL0luZnJhc3RydWN0dXJlcy5jcmyGMGh0dHA6
-Ly9jcmwzLmlnYy5lZHVjYXRpb24uZnIvSW5mcmFzdHJ1Y3R1cmVzLmNybDATBgNVHSUEDDAKBggr
-BgEFBQcDATAOBgNVHQ8BAf8EBAMCBaAwFgYDVR0OBA8EDUFVVE9fR0VORVJBVEUwDQYJKoZIhvcN
-AQEFBQADggIBADtUXZmogUZLbB9EQfIpMBBsE2D1EibJdx1leRdnxgH8dr6AuL6NzMBmOIcegISd
-76sXKESJ8Lf2R/ubA03gNILSduygi0POt02lRqzew2zmpd+qMAaa5t4QaWiUeuesdiQ3apHRa58L
-5cEksQ5g8O6ZL21VqHD4PMtnsES5uyVriDniwUbyXRvLNJy3iHPChwVGwpmtzyhw94s7vcFhuHGr
-BzZ7xqAgircBLGDFVvvtnfvowbMwD02lFbPBeTb52FSAhOMouTMjfLaB/BJ+/Bf6zgpB9GWDQ2lk
-yGsbxAXUpUsnervXd7tBG5jjLUm7z2lq+LPuP37fifskeuWwAE+t9hDud0vOl3Qrpfwl1EY9tfXR
-O63bDGvVB7v7rNOhFRAZQZIviqoSf47SUVKvfJOPekoaULk3o24UzBiH/1tSgx1j0Vsgp2CskBl8
-DWVWlAwhKl1opyRNGyRqgGYMf6P0ZhwuL+iSK23tV7bGPT88Z24SxR7aoj6iKON1L2X+YoGXNgi2
-9MFyYqmVEqb68vHgEcQt0qLmUeWgQdwkKAOh+ArsL2VDf/1buKJHlnNkUe65PIc2fvEvhuzRGuC2
-iMR3P/Jy7hd/GHmThaVaWYRSSJ8jMHbr6GwHH17MQaE1JkjB1+poFz5oKv0pMnHxQyqKu76Vr0vn
-u3Uio5jQe/vo
-					    </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://fim-hn-02-idp.orion.education.fr/sso/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://fim-hn-02-idp.orion.education.fr/sso/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://fim-hn-02-idp.orion.education.fr/sso/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">MINISTERE DE L'EDUCATION NATIONALE - HUB HN02</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">MINISTERE DE L'EDUCATION NATIONALE - HUB HN02</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <EmailAddress>pole-hebergement@ac-orleans-tours.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/fire.rettorato.unito.it-shibboleth.xml b/swamid-interfederations-2.0/fire.rettorato.unito.it-shibboleth.xml
deleted file mode 100644
index b382d797..00000000
--- a/swamid-interfederations-2.0/fire.rettorato.unito.it-shibboleth.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" entityID="https://fire.rettorato.unito.it/shibboleth">
-  <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>
-  <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>
-        <mdui:DisplayName xml:lang="en">YouBlog</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="it">YouBlog</mdui:DisplayName>
-        <mdui:Description xml:lang="en">The system after authentication, allow to create one or more blogs, articles and add comments, send private messages to the authors of the blog. It 'a space of interaction, a way to be (virtually) with the other and freely express their creativity, their opinions on various topics and environment interaction that could become a tool for collaboration in institutional activities.</mdui:Description>
-        <mdui:Description xml:lang="it">Questo servizio permette previa autenticazione, di creare uno o più blog, inserire articoli e commenti, inviare messaggi privati agli autori dei blog. E' uno spazio di interazione, un modo per stare (virtualmente) insieme agli altri e per esprimere liberamente la propria creatività, la propria opinione sui più svariati argomenti e un ambiente di interazione che può diventare strumento di collaborazione nell’ambito delle attività istituzionali.</mdui:Description>
-        <mdui:InformationURL xml:lang="en">https://www.serviziweb.unito.it/youblog</mdui:InformationURL>
-      </mdui:UIInfo>
-      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.serviziweb.unito.it/youblog/Shibboleth.sso/DS"/>
-      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.serviziweb.unito.it/youblog/Shibboleth.sso/DS" index="1"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIEjTCCA3WgAwIBAgIRALMOFHysegGUCjSEYcftmJowDQYJKoZIhvcNAQEFBQAw
-NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-IFNTTCBDQTAeFw0xNDA0MTYwMDAwMDBaFw0xNzA0MTUyMzU5NTlaMEExITAfBgNV
-BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEcMBoGA1UEAxMTc2Vydml6aXdl
-Yi51bml0by5pdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAO3e9ULQ
-7Jx4dvGUcStS+blvUigQrfOGh7RUZYWEV71pBHazp8ajnNCCw1gfSi3iF2PSEC1Q
-OFZnhivkLmgJ3GaiAtaIMWb9zhjDV9ILfaKdwHZ6p9Fzb54M7qFNDn0iIJyCNCbe
-wAxyyNPx8mKnQn3KfHfiGCMi73X+u1XDiJLSXTvaOcd6rRJ3ol7335mH6eK+VN1X
-dDJJcIBaUGrhCwSt5zis0n1CH07OdXcbeC62kbxUVQxf7QzgECPsld/E4/bbCNSh
-74i82A6AlKKvAkzd8P/LMDKVjlaok89erKuWQoSWusWSaGegmig34D4/0Mh/m0B6
-kxKnR3QUP4jOCvsCAwEAAaOCAYkwggGFMB8GA1UdIwQYMBaAFAy9k2gM896ro0lr
-KzdXR+qQ47ntMB0GA1UdDgQWBBQIiUxAEj/RAjyl0nYAsamjHHQmbDAOBgNVHQ8B
-Af8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYB
-BQUHAwIwIgYDVR0gBBswGTANBgsrBgEEAbIxAQICHTAIBgZngQwBAgEwOgYDVR0f
-BDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xD
-QS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRj
-cy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDov
-L29jc3AudGNzLnRlcmVuYS5vcmcwNwYDVR0RBDAwLoITc2Vydml6aXdlYi51bml0
-by5pdIIXd3d3LnNlcnZpeml3ZWIudW5pdG8uaXQwDQYJKoZIhvcNAQEFBQADggEB
-ACDeDzqAHJ6FEj6VnX2+MqsnG5qdbfO8f+WDbEUtX1uQEskLl52A6C7fOhUvwb+z
-P1T+LD5OxEDWFOfDuMjOY8p+eqbXjL8Pj6B2c6QVJZoDVI6AJAQdRckAZJepzdzV
-mRwkKgxoOhhJGR/rpzuTjRxQbZugh7iVKKnMPSF52O1hibTJosYRGFyM4ICpo8Yf
-n5E1tth8U9DKoCTXE3pKxiqfWXpJW5cFX2MZcVdo5GTqe9dvelwx93iAdmioJ3RZ
-b0FyxAbrdFq2jGEYvXtRAfJXs04jIpBoJ/0oJyllaZCH4pYM5icvdoQx6vPs53t7
-rzXp6dkn7WJjKlafzxTRso8=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.serviziweb.unito.it/youblog/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.serviziweb.unito.it/youblog/Shibboleth.sso/SLO/Artifact"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.serviziweb.unito.it/youblog/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.serviziweb.unito.it/youblog/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.serviziweb.unito.it/youblog/Shibboleth.sso/SLO/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.serviziweb.unito.it/youblog/Shibboleth.sso/NIM/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.serviziweb.unito.it/youblog/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.serviziweb.unito.it/youblog/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.serviziweb.unito.it/youblog/Shibboleth.sso/NIM/SOAP"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.serviziweb.unito.it/youblog/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.serviziweb.unito.it/youblog/Shibboleth.sso/SAML/POST" index="7"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.serviziweb.unito.it/youblog/Shibboleth.sso/SAML2/Artifact" index="8"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.serviziweb.unito.it/youblog/Shibboleth.sso/SAML2/ECP" index="9"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.serviziweb.unito.it/youblog/Shibboleth.sso/SAML2/POST" index="10"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.serviziweb.unito.it/youblog/Shibboleth.sso/SAML2/POST-SimpleSign" index="11"/>
-    <AttributeConsumingService index="1">
-      <ServiceName xml:lang="en">YouBlog</ServiceName>
-      <ServiceDescription xml:lang="en">The system after authentication, allow to create one or more blogs, articles and add comments, send private messages to the authors of the blog. It 'a space of interaction, a way to be (virtually) with the other and freely express their creativity, their opinions on various topics and environment interaction that could become a tool for collaboration in institutional activities.</ServiceDescription>
-      <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="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <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" isRequired="true"/>
-      <RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-    </AttributeConsumingService>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Università degli Studi di Torino</OrganizationName>
-    <OrganizationName xml:lang="it">Università degli Studi di Torino</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">YouBlog provided by Università degli Studi di Torino</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="it">YouBlog erogato da Università degli Studi di Torino</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.unito.it/</OrganizationURL>
-    <OrganizationURL xml:lang="it">http://www.unito.it</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <EmailAddress>sewi-id@unito.it</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="support">
-    <EmailAddress>sewi-id@unito.it</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
deleted file mode 100644
index b382d797..00000000
--- a/swamid-interfederations-2.0/fire.rettorato.unito.it.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" entityID="https://fire.rettorato.unito.it/shibboleth">
-  <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>
-  <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>
-        <mdui:DisplayName xml:lang="en">YouBlog</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="it">YouBlog</mdui:DisplayName>
-        <mdui:Description xml:lang="en">The system after authentication, allow to create one or more blogs, articles and add comments, send private messages to the authors of the blog. It 'a space of interaction, a way to be (virtually) with the other and freely express their creativity, their opinions on various topics and environment interaction that could become a tool for collaboration in institutional activities.</mdui:Description>
-        <mdui:Description xml:lang="it">Questo servizio permette previa autenticazione, di creare uno o più blog, inserire articoli e commenti, inviare messaggi privati agli autori dei blog. E' uno spazio di interazione, un modo per stare (virtualmente) insieme agli altri e per esprimere liberamente la propria creatività, la propria opinione sui più svariati argomenti e un ambiente di interazione che può diventare strumento di collaborazione nell’ambito delle attività istituzionali.</mdui:Description>
-        <mdui:InformationURL xml:lang="en">https://www.serviziweb.unito.it/youblog</mdui:InformationURL>
-      </mdui:UIInfo>
-      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.serviziweb.unito.it/youblog/Shibboleth.sso/DS"/>
-      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.serviziweb.unito.it/youblog/Shibboleth.sso/DS" index="1"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIEjTCCA3WgAwIBAgIRALMOFHysegGUCjSEYcftmJowDQYJKoZIhvcNAQEFBQAw
-NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-IFNTTCBDQTAeFw0xNDA0MTYwMDAwMDBaFw0xNzA0MTUyMzU5NTlaMEExITAfBgNV
-BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEcMBoGA1UEAxMTc2Vydml6aXdl
-Yi51bml0by5pdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAO3e9ULQ
-7Jx4dvGUcStS+blvUigQrfOGh7RUZYWEV71pBHazp8ajnNCCw1gfSi3iF2PSEC1Q
-OFZnhivkLmgJ3GaiAtaIMWb9zhjDV9ILfaKdwHZ6p9Fzb54M7qFNDn0iIJyCNCbe
-wAxyyNPx8mKnQn3KfHfiGCMi73X+u1XDiJLSXTvaOcd6rRJ3ol7335mH6eK+VN1X
-dDJJcIBaUGrhCwSt5zis0n1CH07OdXcbeC62kbxUVQxf7QzgECPsld/E4/bbCNSh
-74i82A6AlKKvAkzd8P/LMDKVjlaok89erKuWQoSWusWSaGegmig34D4/0Mh/m0B6
-kxKnR3QUP4jOCvsCAwEAAaOCAYkwggGFMB8GA1UdIwQYMBaAFAy9k2gM896ro0lr
-KzdXR+qQ47ntMB0GA1UdDgQWBBQIiUxAEj/RAjyl0nYAsamjHHQmbDAOBgNVHQ8B
-Af8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYB
-BQUHAwIwIgYDVR0gBBswGTANBgsrBgEEAbIxAQICHTAIBgZngQwBAgEwOgYDVR0f
-BDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xD
-QS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRj
-cy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDov
-L29jc3AudGNzLnRlcmVuYS5vcmcwNwYDVR0RBDAwLoITc2Vydml6aXdlYi51bml0
-by5pdIIXd3d3LnNlcnZpeml3ZWIudW5pdG8uaXQwDQYJKoZIhvcNAQEFBQADggEB
-ACDeDzqAHJ6FEj6VnX2+MqsnG5qdbfO8f+WDbEUtX1uQEskLl52A6C7fOhUvwb+z
-P1T+LD5OxEDWFOfDuMjOY8p+eqbXjL8Pj6B2c6QVJZoDVI6AJAQdRckAZJepzdzV
-mRwkKgxoOhhJGR/rpzuTjRxQbZugh7iVKKnMPSF52O1hibTJosYRGFyM4ICpo8Yf
-n5E1tth8U9DKoCTXE3pKxiqfWXpJW5cFX2MZcVdo5GTqe9dvelwx93iAdmioJ3RZ
-b0FyxAbrdFq2jGEYvXtRAfJXs04jIpBoJ/0oJyllaZCH4pYM5icvdoQx6vPs53t7
-rzXp6dkn7WJjKlafzxTRso8=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.serviziweb.unito.it/youblog/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.serviziweb.unito.it/youblog/Shibboleth.sso/SLO/Artifact"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.serviziweb.unito.it/youblog/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.serviziweb.unito.it/youblog/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.serviziweb.unito.it/youblog/Shibboleth.sso/SLO/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.serviziweb.unito.it/youblog/Shibboleth.sso/NIM/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.serviziweb.unito.it/youblog/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.serviziweb.unito.it/youblog/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.serviziweb.unito.it/youblog/Shibboleth.sso/NIM/SOAP"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.serviziweb.unito.it/youblog/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.serviziweb.unito.it/youblog/Shibboleth.sso/SAML/POST" index="7"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.serviziweb.unito.it/youblog/Shibboleth.sso/SAML2/Artifact" index="8"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.serviziweb.unito.it/youblog/Shibboleth.sso/SAML2/ECP" index="9"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.serviziweb.unito.it/youblog/Shibboleth.sso/SAML2/POST" index="10"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.serviziweb.unito.it/youblog/Shibboleth.sso/SAML2/POST-SimpleSign" index="11"/>
-    <AttributeConsumingService index="1">
-      <ServiceName xml:lang="en">YouBlog</ServiceName>
-      <ServiceDescription xml:lang="en">The system after authentication, allow to create one or more blogs, articles and add comments, send private messages to the authors of the blog. It 'a space of interaction, a way to be (virtually) with the other and freely express their creativity, their opinions on various topics and environment interaction that could become a tool for collaboration in institutional activities.</ServiceDescription>
-      <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="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <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" isRequired="true"/>
-      <RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-    </AttributeConsumingService>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Università degli Studi di Torino</OrganizationName>
-    <OrganizationName xml:lang="it">Università degli Studi di Torino</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">YouBlog provided by Università degli Studi di Torino</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="it">YouBlog erogato da Università degli Studi di Torino</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.unito.it/</OrganizationURL>
-    <OrganizationURL xml:lang="it">http://www.unito.it</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <EmailAddress>sewi-id@unito.it</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="support">
-    <EmailAddress>sewi-id@unito.it</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/fod.geant.net-shibboleth.xml b/swamid-interfederations-2.0/fod.geant.net-shibboleth.xml
deleted file mode 100644
index e24e6552..00000000
--- a/swamid-interfederations-2.0/fod.geant.net-shibboleth.xml
+++ /dev/null
@@ -1,110 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://fod.geant.net/shibboleth">
-  <Extensions xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi">
-    <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>
-  <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://fod.geant.net/Shibboleth.sso/Login"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">GÉANT FoD pilot</mdui:DisplayName>
-        <mdui:Description xml:lang="en">GÉANT FoD pilot</mdui:Description>
-        <mdui:InformationURL xml:lang="en">https://fod.geant.net/</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://fod.geant.net/</mdui:PrivacyStatementURL>
-        <mdui:Logo height="45" width="220" xml:lang="en">https://fod.geant.net/static/fodlogo2.png</mdui:Logo>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>fod.geant.net</ds:KeyName>
-        <ds:KeyName>https://fod.geant.net/shibboleth</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=fod.geant.net</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDEDCCAfigAwIBAgIJALpwpqVM41ahMA0GCSqGSIb3DQEBBQUAMBgxFjAUBgNV
-                            BAMTDWZvZC5nZWFudC5uZXQwHhcNMTQwNjIzMTAwMDQ3WhcNMTkwNjIyMTAwMDQ3
-                            WjAYMRYwFAYDVQQDEw1mb2QuZ2VhbnQubmV0MIIBIjANBgkqhkiG9w0BAQEFAAOC
-                            AQ8AMIIBCgKCAQEA7xERTh1Nm2VyuqI9t3nPILhB0OT2gwNZZYQ7S0YWDbwQSZu8
-                            98n9ky46onJm6ie3hA3CQKO86/0IqoF8idhnMFrODrvVNL+MTXj/kfb3oRwm0HzR
-                            ZXOExZM4zCLCaAAmlIvkYASjjRrY8tZnyXkw1IXE/wApfU4foL8as0Wskq3vQgvm
-                            dL9xXc+T7CsR7ZkvzgekLw8IhXT8zwoiKKWzw7cNJMr0yvkow2El0GJevpT4H1n4
-                            B0L4WeipLH3grmBa4vL7fjOnBomnou6mjbfeKy3e0sbeMq64fLeJoJyDdoxx8s3r
-                            uketgyYh5BG7Z6tFpHVrrQ5lxqAk8eSOC+tziwIDAQABo10wWzA6BgNVHREEMzAx
-                            gg1mb2QuZ2VhbnQubmV0hiBodHRwczovL2ZvZC5nZWFudC5uZXQvc2hpYmJvbGV0
-                            aDAdBgNVHQ4EFgQUWYtmspsehNvR1pD1f1+qEUfoDEIwDQYJKoZIhvcNAQEFBQAD
-                            ggEBAHV/TTiiQGeGW3YhuyV5dA+FkSNPMJbYPi38Oy36Vv732NYv22ONtKjop45I
-                            LVz6tPVLtpV+TVwtSGw+Rca79FwDf6g3tu2rLN+xElLk8M7gYtoRY2kdoq1A/UaO
-                            51L2b9wEqYcXQMig2hRwdtxSUgfRcGSwDO75us6b6OsSs3L1UZoWgsHbyynT04Hz
-                            +pgaYx67ZJZZ7Mb26w1ScHJUenjHhFY3Xqr/yG6+cwmA/7ihdnpwyOp8VGLA8kKD
-                            Faf69w08P93wE8CS9U+gcN8RdvhC9W+iYhGRLHCPg7o6gRjeFB+p6zeyb/kNuuLU
-                            VYAFoJvsnMeKzPxMe+iSHgeolLI=
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://fod.geant.net/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://fod.geant.net/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://fod.geant.net/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://fod.geant.net/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://fod.geant.net/Shibboleth.sso/SLO/Artifact"/>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://fod.geant.net/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://fod.geant.net/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://fod.geant.net/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://fod.geant.net/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://fod.geant.net/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://fod.geant.net/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <md:AttributeConsumingService index="0" isDefault="true">
-      <md:ServiceName xml:lang="en">GÉANT FoD pilot</md:ServiceName>
-      <md:ServiceDescription xml:lang="en">GÉANT FoD pilot</md:ServiceDescription>
-      <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="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" 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: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="eduPersonPrincipalName" Name="urn:mace:dir:attribute-def:eduPersonPrincipalName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace: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="eduPersonEntitlement" Name="urn:mace:dir:attribute-def:eduPersonEntitlement" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace: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="mail" Name="urn:mace:dir:attribute-def:mail" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-      <md:RequestedAttribute FriendlyName="cn" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md:RequestedAttribute FriendlyName="cn" Name="urn:mace:dir:attribute-def:cn" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace: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="displayName" Name="urn:mace:dir:attribute-def:displayName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace: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="givenName" Name="urn:mace:dir:attribute-def:givenName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-      <md:RequestedAttribute FriendlyName="surname" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md:RequestedAttribute FriendlyName="surname" Name="urn:mace:dir:attribute-def:sn" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
-    <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 xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
-    <GivenName>Leonidas</GivenName>
-    <SurName>Poulopoulos</SurName>
-    <EmailAddress>leopoul@noc.grnet.gr</EmailAddress>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
-    <GivenName>Leonidas</GivenName>
-    <SurName>Poulopoulos</SurName>
-    <EmailAddress>leopoul@noc.grnet.gr</EmailAddress>
-  </ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/fod.geant.net.xml b/swamid-interfederations-2.0/fod.geant.net.xml
deleted file mode 100644
index e24e6552..00000000
--- a/swamid-interfederations-2.0/fod.geant.net.xml
+++ /dev/null
@@ -1,110 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://fod.geant.net/shibboleth">
-  <Extensions xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi">
-    <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>
-  <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://fod.geant.net/Shibboleth.sso/Login"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">GÉANT FoD pilot</mdui:DisplayName>
-        <mdui:Description xml:lang="en">GÉANT FoD pilot</mdui:Description>
-        <mdui:InformationURL xml:lang="en">https://fod.geant.net/</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://fod.geant.net/</mdui:PrivacyStatementURL>
-        <mdui:Logo height="45" width="220" xml:lang="en">https://fod.geant.net/static/fodlogo2.png</mdui:Logo>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>fod.geant.net</ds:KeyName>
-        <ds:KeyName>https://fod.geant.net/shibboleth</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=fod.geant.net</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDEDCCAfigAwIBAgIJALpwpqVM41ahMA0GCSqGSIb3DQEBBQUAMBgxFjAUBgNV
-                            BAMTDWZvZC5nZWFudC5uZXQwHhcNMTQwNjIzMTAwMDQ3WhcNMTkwNjIyMTAwMDQ3
-                            WjAYMRYwFAYDVQQDEw1mb2QuZ2VhbnQubmV0MIIBIjANBgkqhkiG9w0BAQEFAAOC
-                            AQ8AMIIBCgKCAQEA7xERTh1Nm2VyuqI9t3nPILhB0OT2gwNZZYQ7S0YWDbwQSZu8
-                            98n9ky46onJm6ie3hA3CQKO86/0IqoF8idhnMFrODrvVNL+MTXj/kfb3oRwm0HzR
-                            ZXOExZM4zCLCaAAmlIvkYASjjRrY8tZnyXkw1IXE/wApfU4foL8as0Wskq3vQgvm
-                            dL9xXc+T7CsR7ZkvzgekLw8IhXT8zwoiKKWzw7cNJMr0yvkow2El0GJevpT4H1n4
-                            B0L4WeipLH3grmBa4vL7fjOnBomnou6mjbfeKy3e0sbeMq64fLeJoJyDdoxx8s3r
-                            uketgyYh5BG7Z6tFpHVrrQ5lxqAk8eSOC+tziwIDAQABo10wWzA6BgNVHREEMzAx
-                            gg1mb2QuZ2VhbnQubmV0hiBodHRwczovL2ZvZC5nZWFudC5uZXQvc2hpYmJvbGV0
-                            aDAdBgNVHQ4EFgQUWYtmspsehNvR1pD1f1+qEUfoDEIwDQYJKoZIhvcNAQEFBQAD
-                            ggEBAHV/TTiiQGeGW3YhuyV5dA+FkSNPMJbYPi38Oy36Vv732NYv22ONtKjop45I
-                            LVz6tPVLtpV+TVwtSGw+Rca79FwDf6g3tu2rLN+xElLk8M7gYtoRY2kdoq1A/UaO
-                            51L2b9wEqYcXQMig2hRwdtxSUgfRcGSwDO75us6b6OsSs3L1UZoWgsHbyynT04Hz
-                            +pgaYx67ZJZZ7Mb26w1ScHJUenjHhFY3Xqr/yG6+cwmA/7ihdnpwyOp8VGLA8kKD
-                            Faf69w08P93wE8CS9U+gcN8RdvhC9W+iYhGRLHCPg7o6gRjeFB+p6zeyb/kNuuLU
-                            VYAFoJvsnMeKzPxMe+iSHgeolLI=
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://fod.geant.net/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://fod.geant.net/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://fod.geant.net/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://fod.geant.net/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://fod.geant.net/Shibboleth.sso/SLO/Artifact"/>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://fod.geant.net/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://fod.geant.net/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://fod.geant.net/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://fod.geant.net/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://fod.geant.net/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://fod.geant.net/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <md:AttributeConsumingService index="0" isDefault="true">
-      <md:ServiceName xml:lang="en">GÉANT FoD pilot</md:ServiceName>
-      <md:ServiceDescription xml:lang="en">GÉANT FoD pilot</md:ServiceDescription>
-      <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="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" 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: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="eduPersonPrincipalName" Name="urn:mace:dir:attribute-def:eduPersonPrincipalName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace: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="eduPersonEntitlement" Name="urn:mace:dir:attribute-def:eduPersonEntitlement" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace: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="mail" Name="urn:mace:dir:attribute-def:mail" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-      <md:RequestedAttribute FriendlyName="cn" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md:RequestedAttribute FriendlyName="cn" Name="urn:mace:dir:attribute-def:cn" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace: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="displayName" Name="urn:mace:dir:attribute-def:displayName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace: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="givenName" Name="urn:mace:dir:attribute-def:givenName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-      <md:RequestedAttribute FriendlyName="surname" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md:RequestedAttribute FriendlyName="surname" Name="urn:mace:dir:attribute-def:sn" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
-    <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 xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
-    <GivenName>Leonidas</GivenName>
-    <SurName>Poulopoulos</SurName>
-    <EmailAddress>leopoul@noc.grnet.gr</EmailAddress>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
-    <GivenName>Leonidas</GivenName>
-    <SurName>Poulopoulos</SurName>
-    <EmailAddress>leopoul@noc.grnet.gr</EmailAddress>
-  </ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/foodl.org-simplesaml-module.php-saml-sp-metadata.php-saml.xml b/swamid-interfederations-2.0/foodl.org-simplesaml-module.php-saml-sp-metadata.php-saml.xml
index ba803cd9..91edbfcc 100644
--- a/swamid-interfederations-2.0/foodl.org-simplesaml-module.php-saml-sp-metadata.php-saml.xml
+++ b/swamid-interfederations-2.0/foodl.org-simplesaml-module.php-saml-sp-metadata.php-saml.xml
@@ -1,36 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://foodl.org/simplesaml/module.php/saml/sp/metadata.php/saml">
-  <md:Extensions>
-    <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>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://feide.no/" registrationInstant="2011-05-05T06:16:34Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://www.feide.no/files/feide/metadata-registration-practice-statement.pdf</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </md:Extensions>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://foodl.org/simplesaml/module.php/saml/sp/metadata.php/saml">
   <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">Foodle</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="no">Foodle</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="nn">Foodle</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Foodle is a generic poll and survey tool for deciding meeting dates.</mdui:Description>
-        <mdui:Description xml:lang="no">Foodle er et generisk poll og survey verktøy for å bli enige om møtedatoer.</mdui:Description>
-        <mdui:Description xml:lang="nn">Foodle er eit generisk poll- og survey-verktøy for å verte einige om møtedatoar.</mdui:Description>
-        <mdui:PrivacyStatementURL xml:lang="en">https://rnd.feide.no/software/foodle/foodle-privacy-policy/</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-    </md:Extensions>
     <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+      <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>MIIEAzCCAuugAwIBAgIJAN6InyocvS6WMA0GCSqGSIb3DQEBBQUAMF4xCzAJBgNVBAYTAk5PMRIwEAYDVQQIEwlUcm9uZGhlaW0xEjAQBgNVBAcTCVRyb25kaGVpbTETMBEGA1UEChMKVU5JTkVUVCBBUzESMBAGA1UEAxMJZm9vZGwub3JnMB4XDTEzMTExNTA3MzAzN1oXDTIzMTExNTA3MzAzN1owXjELMAkGA1UEBhMCTk8xEjAQBgNVBAgTCVRyb25kaGVpbTESMBAGA1UEBxMJVHJvbmRoZWltMRMwEQYDVQQKEwpVTklORVRUIEFTMRIwEAYDVQQDEwlmb29kbC5vcmcwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCs9ZRmG1+NCOVT3GA3rSoK2iv4hJg7XLlVWGZgd1YVV07msCVrioenq5EBUQHFf5BZbmDuiml0CTjM2qEXxbgII2KIOtBUsofe9S9qXXErBksVc5mRZrOBg93tYo5yGS2tWglaGra2zdkYpgVOD9CRR+cwWy1eGG9aZwGzBOQ9SJFA47jKtveJhfSedKDYc9ecEHVBS6VYP1rzPBurCSp/zxQmR78GHl7hHiLhoZkuHE2K0X5G3f9dzv+5iJJtyGJoRvSM+m0s+w5j0DMXb/4qCfiDpXnf2O/LIUFdnQZDZcGWHiec2oNcpnBODWdKmVoKH3FwTUPXpKlrtKxzTp0XAgMBAAGjgcMwgcAwHQYDVR0OBBYEFNlwjQzSL6Oy0QdRww1HZY3rFV+aMIGQBgNVHSMEgYgwgYWAFNlwjQzSL6Oy0QdRww1HZY3rFV+aoWKkYDBeMQswCQYDVQQGEwJOTzESMBAGA1UECBMJVHJvbmRoZWltMRIwEAYDVQQHEwlUcm9uZGhlaW0xEzARBgNVBAoTClVOSU5FVFQgQVMxEjAQBgNVBAMTCWZvb2RsLm9yZ4IJAN6InyocvS6WMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAFtWxCyhzpjsGnCARlZPCOR1SPLwDnJjbyrX0pJ+ESfY+kPi41G658WAsu2xxvNgOoV3aas66b1llCtCUBjRyXRCCHZP87nXpmXZMSqD7XNEBB70HoD2KAQ0U7yM/gPNFRTqxKtEKTH7EV9Uv++eYfLusPLq++l+pwkOcsgAFlEkCwr/6QZl54G+WnSlCyuHH4UDUu+e/TJgQoA4/a6GyMO1YBMyHQY8TblE8yfkogzvpgqBHp4EXjc7rvMJpcARmbMT69c0OQ+OoJqooa+pzSJ8WlckT/Kv8YDB/SZTDO38ZAOcwHF74LvVUCqN24kEFkf94mvMMCiZyE5djOyNxhY=</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
     <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+      <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>MIIEAzCCAuugAwIBAgIJAN6InyocvS6WMA0GCSqGSIb3DQEBBQUAMF4xCzAJBgNVBAYTAk5PMRIwEAYDVQQIEwlUcm9uZGhlaW0xEjAQBgNVBAcTCVRyb25kaGVpbTETMBEGA1UEChMKVU5JTkVUVCBBUzESMBAGA1UEAxMJZm9vZGwub3JnMB4XDTEzMTExNTA3MzAzN1oXDTIzMTExNTA3MzAzN1owXjELMAkGA1UEBhMCTk8xEjAQBgNVBAgTCVRyb25kaGVpbTESMBAGA1UEBxMJVHJvbmRoZWltMRMwEQYDVQQKEwpVTklORVRUIEFTMRIwEAYDVQQDEwlmb29kbC5vcmcwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCs9ZRmG1+NCOVT3GA3rSoK2iv4hJg7XLlVWGZgd1YVV07msCVrioenq5EBUQHFf5BZbmDuiml0CTjM2qEXxbgII2KIOtBUsofe9S9qXXErBksVc5mRZrOBg93tYo5yGS2tWglaGra2zdkYpgVOD9CRR+cwWy1eGG9aZwGzBOQ9SJFA47jKtveJhfSedKDYc9ecEHVBS6VYP1rzPBurCSp/zxQmR78GHl7hHiLhoZkuHE2K0X5G3f9dzv+5iJJtyGJoRvSM+m0s+w5j0DMXb/4qCfiDpXnf2O/LIUFdnQZDZcGWHiec2oNcpnBODWdKmVoKH3FwTUPXpKlrtKxzTp0XAgMBAAGjgcMwgcAwHQYDVR0OBBYEFNlwjQzSL6Oy0QdRww1HZY3rFV+aMIGQBgNVHSMEgYgwgYWAFNlwjQzSL6Oy0QdRww1HZY3rFV+aoWKkYDBeMQswCQYDVQQGEwJOTzESMBAGA1UECBMJVHJvbmRoZWltMRIwEAYDVQQHEwlUcm9uZGhlaW0xEzARBgNVBAoTClVOSU5FVFQgQVMxEjAQBgNVBAMTCWZvb2RsLm9yZ4IJAN6InyocvS6WMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAFtWxCyhzpjsGnCARlZPCOR1SPLwDnJjbyrX0pJ+ESfY+kPi41G658WAsu2xxvNgOoV3aas66b1llCtCUBjRyXRCCHZP87nXpmXZMSqD7XNEBB70HoD2KAQ0U7yM/gPNFRTqxKtEKTH7EV9Uv++eYfLusPLq++l+pwkOcsgAFlEkCwr/6QZl54G+WnSlCyuHH4UDUu+e/TJgQoA4/a6GyMO1YBMyHQY8TblE8yfkogzvpgqBHp4EXjc7rvMJpcARmbMT69c0OQ+OoJqooa+pzSJ8WlckT/Kv8YDB/SZTDO38ZAOcwHF74LvVUCqN24kEFkf94mvMMCiZyE5djOyNxhY=</ds:X509Certificate>
         </ds:X509Data>
@@ -43,26 +22,20 @@
       <md:ServiceDescription xml:lang="en">Foodle is a generic poll and survey tool for deciding meeting dates.</md:ServiceDescription>
       <md:ServiceDescription xml:lang="no">Foodle er et generisk poll og survey verktøy for å bli enige om møtedatoer.</md:ServiceDescription>
       <md:ServiceDescription xml:lang="nn">Foodle er eit generisk poll- og survey-verktøy for å verte einige om møtedatoar.</md:ServiceDescription>
-      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <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="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="preferredLanguage" Name="urn:oid:2.16.840.1.113730.3.1.39" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md:RequestedAttribute FriendlyName="cn" Name="urn:oid:2.5.4.3" 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="givenName" Name="urn:oid:2.5.4.42" 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.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: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: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.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="givenName"/>
+      <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:AttributeConsumingService>
   </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">UNINETT</md:OrganizationName>
-    <md:OrganizationName xml:lang="no">UNINETT</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">UNINETT</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="no">UNINETT</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.uninett.no/english</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="no">http://www.uninett.no/</md:OrganizationURL>
-  </md:Organization>
   <md:ContactPerson contactType="technical">
-    <md:GivenName>Feide Support</md:GivenName>
-    <md:EmailAddress>support@feide.no</md:EmailAddress>
+    <md:Company>UNINETT AS</md:Company>
+    <md:GivenName>Andreas</md:GivenName>
+    <md:SurName>Solberg</md:SurName>
+    <md:EmailAddress>andreas.solberg@uninett.no</md:EmailAddress>
+    <md:TelephoneNumber>+47 73557894</md:TelephoneNumber>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/foodl.org.xml b/swamid-interfederations-2.0/foodl.org.xml
deleted file mode 100644
index ba803cd9..00000000
--- a/swamid-interfederations-2.0/foodl.org.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://foodl.org/simplesaml/module.php/saml/sp/metadata.php/saml">
-  <md:Extensions>
-    <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>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://feide.no/" registrationInstant="2011-05-05T06:16:34Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://www.feide.no/files/feide/metadata-registration-practice-statement.pdf</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">Foodle</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="no">Foodle</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="nn">Foodle</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Foodle is a generic poll and survey tool for deciding meeting dates.</mdui:Description>
-        <mdui:Description xml:lang="no">Foodle er et generisk poll og survey verktøy for å bli enige om møtedatoer.</mdui:Description>
-        <mdui:Description xml:lang="nn">Foodle er eit generisk poll- og survey-verktøy for å verte einige om møtedatoar.</mdui:Description>
-        <mdui:PrivacyStatementURL xml:lang="en">https://rnd.feide.no/software/foodle/foodle-privacy-policy/</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIIEAzCCAuugAwIBAgIJAN6InyocvS6WMA0GCSqGSIb3DQEBBQUAMF4xCzAJBgNVBAYTAk5PMRIwEAYDVQQIEwlUcm9uZGhlaW0xEjAQBgNVBAcTCVRyb25kaGVpbTETMBEGA1UEChMKVU5JTkVUVCBBUzESMBAGA1UEAxMJZm9vZGwub3JnMB4XDTEzMTExNTA3MzAzN1oXDTIzMTExNTA3MzAzN1owXjELMAkGA1UEBhMCTk8xEjAQBgNVBAgTCVRyb25kaGVpbTESMBAGA1UEBxMJVHJvbmRoZWltMRMwEQYDVQQKEwpVTklORVRUIEFTMRIwEAYDVQQDEwlmb29kbC5vcmcwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCs9ZRmG1+NCOVT3GA3rSoK2iv4hJg7XLlVWGZgd1YVV07msCVrioenq5EBUQHFf5BZbmDuiml0CTjM2qEXxbgII2KIOtBUsofe9S9qXXErBksVc5mRZrOBg93tYo5yGS2tWglaGra2zdkYpgVOD9CRR+cwWy1eGG9aZwGzBOQ9SJFA47jKtveJhfSedKDYc9ecEHVBS6VYP1rzPBurCSp/zxQmR78GHl7hHiLhoZkuHE2K0X5G3f9dzv+5iJJtyGJoRvSM+m0s+w5j0DMXb/4qCfiDpXnf2O/LIUFdnQZDZcGWHiec2oNcpnBODWdKmVoKH3FwTUPXpKlrtKxzTp0XAgMBAAGjgcMwgcAwHQYDVR0OBBYEFNlwjQzSL6Oy0QdRww1HZY3rFV+aMIGQBgNVHSMEgYgwgYWAFNlwjQzSL6Oy0QdRww1HZY3rFV+aoWKkYDBeMQswCQYDVQQGEwJOTzESMBAGA1UECBMJVHJvbmRoZWltMRIwEAYDVQQHEwlUcm9uZGhlaW0xEzARBgNVBAoTClVOSU5FVFQgQVMxEjAQBgNVBAMTCWZvb2RsLm9yZ4IJAN6InyocvS6WMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAFtWxCyhzpjsGnCARlZPCOR1SPLwDnJjbyrX0pJ+ESfY+kPi41G658WAsu2xxvNgOoV3aas66b1llCtCUBjRyXRCCHZP87nXpmXZMSqD7XNEBB70HoD2KAQ0U7yM/gPNFRTqxKtEKTH7EV9Uv++eYfLusPLq++l+pwkOcsgAFlEkCwr/6QZl54G+WnSlCyuHH4UDUu+e/TJgQoA4/a6GyMO1YBMyHQY8TblE8yfkogzvpgqBHp4EXjc7rvMJpcARmbMT69c0OQ+OoJqooa+pzSJ8WlckT/Kv8YDB/SZTDO38ZAOcwHF74LvVUCqN24kEFkf94mvMMCiZyE5djOyNxhY=</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>MIIEAzCCAuugAwIBAgIJAN6InyocvS6WMA0GCSqGSIb3DQEBBQUAMF4xCzAJBgNVBAYTAk5PMRIwEAYDVQQIEwlUcm9uZGhlaW0xEjAQBgNVBAcTCVRyb25kaGVpbTETMBEGA1UEChMKVU5JTkVUVCBBUzESMBAGA1UEAxMJZm9vZGwub3JnMB4XDTEzMTExNTA3MzAzN1oXDTIzMTExNTA3MzAzN1owXjELMAkGA1UEBhMCTk8xEjAQBgNVBAgTCVRyb25kaGVpbTESMBAGA1UEBxMJVHJvbmRoZWltMRMwEQYDVQQKEwpVTklORVRUIEFTMRIwEAYDVQQDEwlmb29kbC5vcmcwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCs9ZRmG1+NCOVT3GA3rSoK2iv4hJg7XLlVWGZgd1YVV07msCVrioenq5EBUQHFf5BZbmDuiml0CTjM2qEXxbgII2KIOtBUsofe9S9qXXErBksVc5mRZrOBg93tYo5yGS2tWglaGra2zdkYpgVOD9CRR+cwWy1eGG9aZwGzBOQ9SJFA47jKtveJhfSedKDYc9ecEHVBS6VYP1rzPBurCSp/zxQmR78GHl7hHiLhoZkuHE2K0X5G3f9dzv+5iJJtyGJoRvSM+m0s+w5j0DMXb/4qCfiDpXnf2O/LIUFdnQZDZcGWHiec2oNcpnBODWdKmVoKH3FwTUPXpKlrtKxzTp0XAgMBAAGjgcMwgcAwHQYDVR0OBBYEFNlwjQzSL6Oy0QdRww1HZY3rFV+aMIGQBgNVHSMEgYgwgYWAFNlwjQzSL6Oy0QdRww1HZY3rFV+aoWKkYDBeMQswCQYDVQQGEwJOTzESMBAGA1UECBMJVHJvbmRoZWltMRIwEAYDVQQHEwlUcm9uZGhlaW0xEzARBgNVBAoTClVOSU5FVFQgQVMxEjAQBgNVBAMTCWZvb2RsLm9yZ4IJAN6InyocvS6WMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAFtWxCyhzpjsGnCARlZPCOR1SPLwDnJjbyrX0pJ+ESfY+kPi41G658WAsu2xxvNgOoV3aas66b1llCtCUBjRyXRCCHZP87nXpmXZMSqD7XNEBB70HoD2KAQ0U7yM/gPNFRTqxKtEKTH7EV9Uv++eYfLusPLq++l+pwkOcsgAFlEkCwr/6QZl54G+WnSlCyuHH4UDUu+e/TJgQoA4/a6GyMO1YBMyHQY8TblE8yfkogzvpgqBHp4EXjc7rvMJpcARmbMT69c0OQ+OoJqooa+pzSJ8WlckT/Kv8YDB/SZTDO38ZAOcwHF74LvVUCqN24kEFkf94mvMMCiZyE5djOyNxhY=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://foodl.org/simplesaml/module.php/saml/sp/saml2-logout.php/saml"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://foodl.org/simplesaml/module.php/saml/sp/saml2-acs.php/saml" index="0"/>
-    <md:AttributeConsumingService index="0">
-      <md:ServiceName xml:lang="en">Foodle</md:ServiceName>
-      <md:ServiceDescription xml:lang="en">Foodle is a generic poll and survey tool for deciding meeting dates.</md:ServiceDescription>
-      <md:ServiceDescription xml:lang="no">Foodle er et generisk poll og survey verktøy for å bli enige om møtedatoer.</md:ServiceDescription>
-      <md:ServiceDescription xml:lang="nn">Foodle er eit generisk poll- og survey-verktøy for å verte einige om møtedatoar.</md:ServiceDescription>
-      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <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="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="preferredLanguage" Name="urn:oid:2.16.840.1.113730.3.1.39" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md:RequestedAttribute FriendlyName="cn" Name="urn:oid:2.5.4.3" 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="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">UNINETT</md:OrganizationName>
-    <md:OrganizationName xml:lang="no">UNINETT</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">UNINETT</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="no">UNINETT</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.uninett.no/english</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="no">http://www.uninett.no/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Feide Support</md:GivenName>
-    <md:EmailAddress>support@feide.no</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/forge.switch.ch-shibboleth.xml b/swamid-interfederations-2.0/forge.switch.ch-shibboleth.xml
deleted file mode 100644
index d25a467a..00000000
--- a/swamid-interfederations-2.0/forge.switch.ch-shibboleth.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://forge.switch.ch/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://rr.aai.switch.ch/" registrationInstant="2014-10-27T15:54:56Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.switch.ch/aai/federation/switchaai/metadata-registration-practice-statement-20110711.txt</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://refeds.org/category/research-and-scholarship</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </Extensions>
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
-    <Extensions>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Forge: Project Hosting Platform</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Serves as project development and but tracking platform for SWITCH projects</mdui:Description>
-        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAACF0RVh0U29mdHdhcmUAR3JhcGhpY0NvbnZlcnRlciAoSW50ZWwpd4f6GQAAAZJJREFUeJyUk08og2Ecx5+SHNSW/DtQlHKg1MhByjIpLRNx0NZKk0kbbSStHXZdHOVP4bCi5swuXNxQLjiN5UBNc1AzbeR936/39zz7c7B/Dt+e31PP9/P8ft/3eRkARpKPnVDuQsjsy1W2kA8skKwM8tEsEH8tG5QDqEZpqZILdgblbB34+igJygG2RrlRWqsXcqi1pwXKdaAoJLehtk99kJa1wkxrupb9OihPl3lBf6kqiPLg3ThER3BVCRDl8/aI4oC0lFhYGOyiG9nTKIAECjqzQZdMmVqnEbBaAfi0gLeaQ6grGrkkIPqexJjFi+E+PSZGTDANGjHQq8dQdz8CPndhY+Q5hjnPPlirGazDBta5CNakrrVmmGybiETj+UegG3cOz8Gap4V6FgSgYRLthhXcP7zkDzH1/cONmjYrP8xNXXZea9Q6dHELOlPwM1pX98BqxoWRpLZep5uHf/cEic9UwceULaZc22LetGj+eCJZ/lOmYBgzwDizAQrw3z+T2x/E1U24bGNGvwAAAP//AwCkGcs+iePLFQAAAABJRU5ErkJggg==</mdui:Logo>
-        <mdui:Logo height="60" width="80">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFAAAAA8CAIAAAB+RarbAAAC0GlDQ1BJQ0NQcm9maWxlAAB4nI2Uz0sUYRjHv7ONGChBYGZ7iKFDSKhMFmVE5a6/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+hkAAAaRSURBVHic7JZpUFNXFMf92A+dsR8ECrQ6Fq2tlVVELVQEZLNaoSwV1FEsy6CMuyJhFRAQQiAJEBCIiCigaAUFFARZlE0EAReoiiCgLGUnJIQktyc8GpKXSPnUzjzefzKZ9+4979z7u/fcc+4StMi05P+ewH8tEpjoIoGJLhKY6CKBiS4SmOgigYkuEpjoIoGJLhKY6CKBia5FDMyZnLpT/Nzl+FXbgykObmw719TopLKe3hHoEolE2bkN9NTy8XGe9Me37zUHUQu7P4pt0EgHqo5EnRUy7qd56CkLteXBo0AovJRZc7f4BdbTNzAenfgwKqEkGn6sUkZKGS3pYRSrlMoqjaAX5z94Ie3mz/Z+WkrZbs/LtgdT7VzZ9m7snPxnXN60xIA/LUjOqCoqb5UnnOTykzKrwLMM8NgEz9krfc2WsF0uKY4elxzg535J35q63opa19gJBtl5jUqavuysGmlfj2rffrb8hBclR/xSehrRl6G+JpnRXuUg2lL0Oh8ep/gCw12xHt7XsZ62t31We1iWzizrPYnmTqyVm4MNdtC270uycmaZOcZFJpTMrphAeJ5e9K1RqJFNrL27GNXBnf2LS7LGjyFup7N4U9MSKj3LqFMhufLAg8McGHfpGm8ZYFjdlZuCi8tbBQKhxLS98y/tbRfcz2RjA8MCw+uHvlFpdyfP3f58tU99eSliqaOSkzJD8UZR2kZ0yw4JhdgmGNsxvHxzsE6hSARbxOXxebzpzu4hLbMLjNRyWBRogR8YY2aFZa/U1wcw2RVDIxyJY5hkes4TNV3/ipo3EmCDn6O9z+cpBDa2Y6rrBcgAw/Js+ZU5OsbFWZ8Nu+PpcwN7rn/2/iv9QL/IfGkD4FfXjzhmswOlrUGjnTIf1zMR7QvUXYW94YBxTtaZRsRcfCjfFRxzD7rGJ3i49o6uQY3NwUlXZp1zuPwN8wEz8MBGtnSIXtzugSBmpI/KmdC8FRuDnrd+lLahJtd4WpqipxHSjSLOAErUQAVukpZ5gCFTiIGTFAAHUAuM7ZmSDZcItjS/5Pnr9n7J64bt0ZSIO/IexiemTOzjVHX9ZYAhXcHuuRy/llfUUv30XW1jR/PLnvc9w9NSEQ7q6hleaxJ+8ESmSCiSNA6M8K/QqIjbK20pqAwRMVTRYNscMF8MfJiieIe1tl1QuMOB1AITxzh5YJy4XP6mnTG/n8x80tQJk5f8IAGVVLZt3hmjrOkrAwzKvd8CWcHQhg5faptH6phH/mASbr47obahQ9p1fNojFR2/4oq5fMgXoJrCXNHU+JwRcDJVURlF+sP5Qrp3RNMsgqYI2D+qwHQBwLDDP9nSVxmG6lqIZ65jESl+mHkGllWGIV/rB+KB0Uz5gS+HRyY/9o3CIamsfQvwkEVhcyQ2E5wpM8d4C6cEKGNYy+PG3qD99ujV5TlHxUdErFVorGuhwDM7HK0opAOphaaO8QsB3riDdjTg1sDgRO/AWG//GPbfNzDW+qYP1gK/w4+ftDe2dPOnhThHUCchMw8OT0g33n3wUlnbDytRsEZ7j988tssCXd2AuEPi7v5mxFAV1DFwruY/w5/a4aDoQghI4MG1Q6KGip2V24C9cmbOsE+4gjM8PDq51V4uSytr+ULuhj6cNTO1HIBh2XCDOR1K17WIgliorn+nph+SwWCgBGVUFwMrgHKdEVsP8YYWDoyFtMKkFRp7/3vjMMi0uHZILlBZvPxmvc2WpTAFwFhZUsMlLbhvrDYKrW2QqSucSf5vnmmmDnHSIY2pvun9CoMgmM2ew+lwbRBn8gJXxNJAzWmIoYKa2PID/2tI0xQB3y9rVdMLyLhZh2uvqn+33CAoPq1SFnjBZamza8h6byKcctdTWYd8bnh4Z3ucybZwZsEqZN1ukPeCZkr0lzr+yw3OQYYXvw+9RqxvEF0FXdsmvnLICS4VRjb0Q/9UdWlBSK/dGhadWCrfBWsNdxuYBlwEYVZwC4KJ7TuSsXZrOOSRrg/DmBmEtJ5V1OlP3LRg3GXrKDLA4gmPcJipFbqWkUpaFGUtP0jFTofTG5q75F1ggqJ14NhVmM1cRqlnirKtUXuRQnswOxH0R2xyuXwXHJn9RzOu5yleWaFQlHuv5TvjMCVNioq2n9I6CgQ5hMOQVJzDfcHz7PWLGdXyn4+N847637Q5kIwHXiQigYkuEpjoIoGJLhKY6CKBiS4SmOgigYkuEpjoIoGJLhKY6CKBia5FB/w3AAAA//8DABFh2N/+esWhAAAAAElFTkSuQmCC</mdui:Logo>
-        <mdui:InformationURL xml:lang="en">https://forge.switch.ch/</mdui:InformationURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDGDCCAgCgAwIBAgIJAMzTQ7ZX7H85MA0GCSqGSIb3DQEBBQUAMBoxGDAWBgNV
-BAMTD2ZvcmdlLnN3aXRjaC5jaDAeFw0xMzA2MDYwNjM5MjhaFw0xNjA2MDUwNjM5
-MjhaMBoxGDAWBgNVBAMTD2ZvcmdlLnN3aXRjaC5jaDCCASIwDQYJKoZIhvcNAQEB
-BQADggEPADCCAQoCggEBAMRsrEbfa2dByTHw8nNmWXKluBIqNBddjm2OOssE0dIJ
-PHokGICd3fh9TvoRiB1T5xECoGDM3TmzxlFeS8a+KDSeI58lUj3ZOjjMx8c/S/5U
-yyZYkXNBvTTVXKEWVA+3SEDc92aPeUldK6D4vWwx1EeWqVxO/LoNOi5ZlkPES5qL
-5sXEAl6YFEK6Z65WOEO/KVCdBJfCooWUH3vnl2y/k1u9Iybt2sO/ugXL9ltgmdXF
-o+768lPn1mpME6bvaHaJ5QlDrwXYvCusZD6PBeY8eDyeuXbA3QI9TC2L8Nc/EQgL
-LbFOH7qC1zmW5VwPROrTrKb4XTixuju57lwuoWXTz2cCAwEAAaNhMF8wPgYDVR0R
-BDcwNYIPZm9yZ2Uuc3dpdGNoLmNohiJodHRwczovL2ZvcmdlLnN3aXRjaC5jaC9z
-aGliYm9sZXRoMB0GA1UdDgQWBBRInInngJvjyAHf4YVeGVTNbhSHQjANBgkqhkiG
-9w0BAQUFAAOCAQEAHw9YM3UKHdvpA2bMp1MoB765kRHU58ydqf51ydskOCpeZfv8
-pTw+kbvEsE1c2RbjcQ6oB5KXh5qA/jB8Ig/Ur/lN9ben25w70rcNJmt6bxbXKXVn
-BDg+G/oxuX8JS7BTlt9oz7UKuQYA7jcdmai1TgLe/ITzX4ieEWcErlf3CR4QLo6v
-LcIY8wseU5bZaSoQLD3O1sTGsRa68TO8RgJw2REWVPbt/wDRHQut2n/+P/3dam5i
-d3GxkhfzcE0Wj9lX4dzlC6CqKBdAF8UxXYAf3BDVjheesYf2Ps1iy3KW7XBX0Lci
-D5s3OfoyrsZf5VHSjcxoteZ+NQBmcCgYkgjzXQ==
-						</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://forge-dev.switch.ch/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://forge.switch.ch/Shibboleth.sso/SAML2/POST" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://zeya.switch.ch/Shibboleth.sso/SAML2/POST" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://forge-dev.switch.ch/Shibboleth.sso/SAML2/POST-SimpleSign" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://forge.switch.ch/Shibboleth.sso/SAML2/POST-SimpleSign" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://zeya.switch.ch/Shibboleth.sso/SAML2/POST-SimpleSign" index="6"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://forge-dev.switch.ch/Shibboleth.sso/SAML2/Artifact" index="7"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://forge.switch.ch/Shibboleth.sso/SAML2/Artifact" index="8"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://zeya.switch.ch/Shibboleth.sso/SAML2/Artifact" index="9"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://forge-dev.switch.ch/Shibboleth.sso/SAML2/ECP" index="10"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://forge.switch.ch/Shibboleth.sso/SAML2/ECP" index="11"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://zeya.switch.ch/Shibboleth.sso/SAML2/ECP" index="12"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://forge-dev.switch.ch/Shibboleth.sso/SAML/POST" index="13"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://forge.switch.ch/Shibboleth.sso/SAML/POST" index="14"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://zeya.switch.ch/Shibboleth.sso/SAML/POST" index="15"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://forge-dev.switch.ch/Shibboleth.sso/SAML/Artifact" index="16"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://forge.switch.ch/Shibboleth.sso/SAML/Artifact" index="17"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://zeya.switch.ch/Shibboleth.sso/SAML/Artifact" index="18"/>
-    <AttributeConsumingService index="1">
-      <ServiceName xml:lang="en">Forge: Project Hosting Platform</ServiceName>
-      <ServiceDescription xml:lang="en">Serves as project development and but tracking platform for SWITCH projects</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="surname" Name="urn:oid:2.5.4.4" 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" isRequired="true"/>
-    </AttributeConsumingService>
-  </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>
-    <SurName>Team</SurName>
-    <EmailAddress>mailto:aai@switch.ch</EmailAddress>
-    <TelephoneNumber>+41 44 268 15 05</TelephoneNumber>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Lukas</GivenName>
-    <SurName>Hämmerle</SurName>
-    <EmailAddress>mailto:lukas.haemmerle@switch.ch</EmailAddress>
-    <TelephoneNumber>+41 44 268 15 05</TelephoneNumber>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/forge.switch.ch.xml b/swamid-interfederations-2.0/forge.switch.ch.xml
deleted file mode 100644
index d25a467a..00000000
--- a/swamid-interfederations-2.0/forge.switch.ch.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://forge.switch.ch/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://rr.aai.switch.ch/" registrationInstant="2014-10-27T15:54:56Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.switch.ch/aai/federation/switchaai/metadata-registration-practice-statement-20110711.txt</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://refeds.org/category/research-and-scholarship</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </Extensions>
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
-    <Extensions>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Forge: Project Hosting Platform</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Serves as project development and but tracking platform for SWITCH projects</mdui:Description>
-        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAACF0RVh0U29mdHdhcmUAR3JhcGhpY0NvbnZlcnRlciAoSW50ZWwpd4f6GQAAAZJJREFUeJyUk08og2Ecx5+SHNSW/DtQlHKg1MhByjIpLRNx0NZKk0kbbSStHXZdHOVP4bCi5swuXNxQLjiN5UBNc1AzbeR936/39zz7c7B/Dt+e31PP9/P8ft/3eRkARpKPnVDuQsjsy1W2kA8skKwM8tEsEH8tG5QDqEZpqZILdgblbB34+igJygG2RrlRWqsXcqi1pwXKdaAoJLehtk99kJa1wkxrupb9OihPl3lBf6kqiPLg3ThER3BVCRDl8/aI4oC0lFhYGOyiG9nTKIAECjqzQZdMmVqnEbBaAfi0gLeaQ6grGrkkIPqexJjFi+E+PSZGTDANGjHQq8dQdz8CPndhY+Q5hjnPPlirGazDBta5CNakrrVmmGybiETj+UegG3cOz8Gap4V6FgSgYRLthhXcP7zkDzH1/cONmjYrP8xNXXZea9Q6dHELOlPwM1pX98BqxoWRpLZep5uHf/cEic9UwceULaZc22LetGj+eCJZ/lOmYBgzwDizAQrw3z+T2x/E1U24bGNGvwAAAP//AwCkGcs+iePLFQAAAABJRU5ErkJggg==</mdui:Logo>
-        <mdui:Logo height="60" width="80">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFAAAAA8CAIAAAB+RarbAAAC0GlDQ1BJQ0NQcm9maWxlAAB4nI2Uz0sUYRjHv7ONGChBYGZ7iKFDSKhMFmVE5a6/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+hkAAAaRSURBVHic7JZpUFNXFMf92A+dsR8ECrQ6Fq2tlVVELVQEZLNaoSwV1FEsy6CMuyJhFRAQQiAJEBCIiCigaAUFFARZlE0EAReoiiCgLGUnJIQktyc8GpKXSPnUzjzefzKZ9+4979z7u/fcc+4StMi05P+ewH8tEpjoIoGJLhKY6CKBiS4SmOgigYkuEpjoIoGJLhKY6CKBia5FDMyZnLpT/Nzl+FXbgykObmw719TopLKe3hHoEolE2bkN9NTy8XGe9Me37zUHUQu7P4pt0EgHqo5EnRUy7qd56CkLteXBo0AovJRZc7f4BdbTNzAenfgwKqEkGn6sUkZKGS3pYRSrlMoqjaAX5z94Ie3mz/Z+WkrZbs/LtgdT7VzZ9m7snPxnXN60xIA/LUjOqCoqb5UnnOTykzKrwLMM8NgEz9krfc2WsF0uKY4elxzg535J35q63opa19gJBtl5jUqavuysGmlfj2rffrb8hBclR/xSehrRl6G+JpnRXuUg2lL0Oh8ep/gCw12xHt7XsZ62t31We1iWzizrPYnmTqyVm4MNdtC270uycmaZOcZFJpTMrphAeJ5e9K1RqJFNrL27GNXBnf2LS7LGjyFup7N4U9MSKj3LqFMhufLAg8McGHfpGm8ZYFjdlZuCi8tbBQKhxLS98y/tbRfcz2RjA8MCw+uHvlFpdyfP3f58tU99eSliqaOSkzJD8UZR2kZ0yw4JhdgmGNsxvHxzsE6hSARbxOXxebzpzu4hLbMLjNRyWBRogR8YY2aFZa/U1wcw2RVDIxyJY5hkes4TNV3/ipo3EmCDn6O9z+cpBDa2Y6rrBcgAw/Js+ZU5OsbFWZ8Nu+PpcwN7rn/2/iv9QL/IfGkD4FfXjzhmswOlrUGjnTIf1zMR7QvUXYW94YBxTtaZRsRcfCjfFRxzD7rGJ3i49o6uQY3NwUlXZp1zuPwN8wEz8MBGtnSIXtzugSBmpI/KmdC8FRuDnrd+lLahJtd4WpqipxHSjSLOAErUQAVukpZ5gCFTiIGTFAAHUAuM7ZmSDZcItjS/5Pnr9n7J64bt0ZSIO/IexiemTOzjVHX9ZYAhXcHuuRy/llfUUv30XW1jR/PLnvc9w9NSEQ7q6hleaxJ+8ESmSCiSNA6M8K/QqIjbK20pqAwRMVTRYNscMF8MfJiieIe1tl1QuMOB1AITxzh5YJy4XP6mnTG/n8x80tQJk5f8IAGVVLZt3hmjrOkrAwzKvd8CWcHQhg5faptH6phH/mASbr47obahQ9p1fNojFR2/4oq5fMgXoJrCXNHU+JwRcDJVURlF+sP5Qrp3RNMsgqYI2D+qwHQBwLDDP9nSVxmG6lqIZ65jESl+mHkGllWGIV/rB+KB0Uz5gS+HRyY/9o3CIamsfQvwkEVhcyQ2E5wpM8d4C6cEKGNYy+PG3qD99ujV5TlHxUdErFVorGuhwDM7HK0opAOphaaO8QsB3riDdjTg1sDgRO/AWG//GPbfNzDW+qYP1gK/w4+ftDe2dPOnhThHUCchMw8OT0g33n3wUlnbDytRsEZ7j988tssCXd2AuEPi7v5mxFAV1DFwruY/w5/a4aDoQghI4MG1Q6KGip2V24C9cmbOsE+4gjM8PDq51V4uSytr+ULuhj6cNTO1HIBh2XCDOR1K17WIgliorn+nph+SwWCgBGVUFwMrgHKdEVsP8YYWDoyFtMKkFRp7/3vjMMi0uHZILlBZvPxmvc2WpTAFwFhZUsMlLbhvrDYKrW2QqSucSf5vnmmmDnHSIY2pvun9CoMgmM2ew+lwbRBn8gJXxNJAzWmIoYKa2PID/2tI0xQB3y9rVdMLyLhZh2uvqn+33CAoPq1SFnjBZamza8h6byKcctdTWYd8bnh4Z3ucybZwZsEqZN1ukPeCZkr0lzr+yw3OQYYXvw+9RqxvEF0FXdsmvnLICS4VRjb0Q/9UdWlBSK/dGhadWCrfBWsNdxuYBlwEYVZwC4KJ7TuSsXZrOOSRrg/DmBmEtJ5V1OlP3LRg3GXrKDLA4gmPcJipFbqWkUpaFGUtP0jFTofTG5q75F1ggqJ14NhVmM1cRqlnirKtUXuRQnswOxH0R2xyuXwXHJn9RzOu5yleWaFQlHuv5TvjMCVNioq2n9I6CgQ5hMOQVJzDfcHz7PWLGdXyn4+N847637Q5kIwHXiQigYkuEpjoIoGJLhKY6CKBiS4SmOgigYkuEpjoIoGJLhKY6CKBia5FB/w3AAAA//8DABFh2N/+esWhAAAAAElFTkSuQmCC</mdui:Logo>
-        <mdui:InformationURL xml:lang="en">https://forge.switch.ch/</mdui:InformationURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDGDCCAgCgAwIBAgIJAMzTQ7ZX7H85MA0GCSqGSIb3DQEBBQUAMBoxGDAWBgNV
-BAMTD2ZvcmdlLnN3aXRjaC5jaDAeFw0xMzA2MDYwNjM5MjhaFw0xNjA2MDUwNjM5
-MjhaMBoxGDAWBgNVBAMTD2ZvcmdlLnN3aXRjaC5jaDCCASIwDQYJKoZIhvcNAQEB
-BQADggEPADCCAQoCggEBAMRsrEbfa2dByTHw8nNmWXKluBIqNBddjm2OOssE0dIJ
-PHokGICd3fh9TvoRiB1T5xECoGDM3TmzxlFeS8a+KDSeI58lUj3ZOjjMx8c/S/5U
-yyZYkXNBvTTVXKEWVA+3SEDc92aPeUldK6D4vWwx1EeWqVxO/LoNOi5ZlkPES5qL
-5sXEAl6YFEK6Z65WOEO/KVCdBJfCooWUH3vnl2y/k1u9Iybt2sO/ugXL9ltgmdXF
-o+768lPn1mpME6bvaHaJ5QlDrwXYvCusZD6PBeY8eDyeuXbA3QI9TC2L8Nc/EQgL
-LbFOH7qC1zmW5VwPROrTrKb4XTixuju57lwuoWXTz2cCAwEAAaNhMF8wPgYDVR0R
-BDcwNYIPZm9yZ2Uuc3dpdGNoLmNohiJodHRwczovL2ZvcmdlLnN3aXRjaC5jaC9z
-aGliYm9sZXRoMB0GA1UdDgQWBBRInInngJvjyAHf4YVeGVTNbhSHQjANBgkqhkiG
-9w0BAQUFAAOCAQEAHw9YM3UKHdvpA2bMp1MoB765kRHU58ydqf51ydskOCpeZfv8
-pTw+kbvEsE1c2RbjcQ6oB5KXh5qA/jB8Ig/Ur/lN9ben25w70rcNJmt6bxbXKXVn
-BDg+G/oxuX8JS7BTlt9oz7UKuQYA7jcdmai1TgLe/ITzX4ieEWcErlf3CR4QLo6v
-LcIY8wseU5bZaSoQLD3O1sTGsRa68TO8RgJw2REWVPbt/wDRHQut2n/+P/3dam5i
-d3GxkhfzcE0Wj9lX4dzlC6CqKBdAF8UxXYAf3BDVjheesYf2Ps1iy3KW7XBX0Lci
-D5s3OfoyrsZf5VHSjcxoteZ+NQBmcCgYkgjzXQ==
-						</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://forge-dev.switch.ch/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://forge.switch.ch/Shibboleth.sso/SAML2/POST" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://zeya.switch.ch/Shibboleth.sso/SAML2/POST" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://forge-dev.switch.ch/Shibboleth.sso/SAML2/POST-SimpleSign" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://forge.switch.ch/Shibboleth.sso/SAML2/POST-SimpleSign" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://zeya.switch.ch/Shibboleth.sso/SAML2/POST-SimpleSign" index="6"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://forge-dev.switch.ch/Shibboleth.sso/SAML2/Artifact" index="7"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://forge.switch.ch/Shibboleth.sso/SAML2/Artifact" index="8"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://zeya.switch.ch/Shibboleth.sso/SAML2/Artifact" index="9"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://forge-dev.switch.ch/Shibboleth.sso/SAML2/ECP" index="10"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://forge.switch.ch/Shibboleth.sso/SAML2/ECP" index="11"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://zeya.switch.ch/Shibboleth.sso/SAML2/ECP" index="12"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://forge-dev.switch.ch/Shibboleth.sso/SAML/POST" index="13"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://forge.switch.ch/Shibboleth.sso/SAML/POST" index="14"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://zeya.switch.ch/Shibboleth.sso/SAML/POST" index="15"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://forge-dev.switch.ch/Shibboleth.sso/SAML/Artifact" index="16"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://forge.switch.ch/Shibboleth.sso/SAML/Artifact" index="17"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://zeya.switch.ch/Shibboleth.sso/SAML/Artifact" index="18"/>
-    <AttributeConsumingService index="1">
-      <ServiceName xml:lang="en">Forge: Project Hosting Platform</ServiceName>
-      <ServiceDescription xml:lang="en">Serves as project development and but tracking platform for SWITCH projects</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="surname" Name="urn:oid:2.5.4.4" 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" isRequired="true"/>
-    </AttributeConsumingService>
-  </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>
-    <SurName>Team</SurName>
-    <EmailAddress>mailto:aai@switch.ch</EmailAddress>
-    <TelephoneNumber>+41 44 268 15 05</TelephoneNumber>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Lukas</GivenName>
-    <SurName>Hämmerle</SurName>
-    <EmailAddress>mailto:lukas.haemmerle@switch.ch</EmailAddress>
-    <TelephoneNumber>+41 44 268 15 05</TelephoneNumber>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/fortbildung.unibas.ch.xml b/swamid-interfederations-2.0/fortbildung.unibas.ch.xml
deleted file mode 100644
index d910aaa1..00000000
--- a/swamid-interfederations-2.0/fortbildung.unibas.ch.xml
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://fortbildung.unibas.ch/Shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://rr.aai.switch.ch/" registrationInstant="2005-09-01T14:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.switch.ch/aai/federation/switchaai/metadata-registration-practice-statement-20110711.txt</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </Extensions>
-  <SPSSODescriptor 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">University Basel</mdui:DisplayName>
-        <mdui:Description xml:lang="en">further education</mdui:Description>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDMDCCAhigAwIBAgIJANnJ1QgP58F1MA0GCSqGSIb3DQEBBQUAMCAxHjAcBgNV
-BAMTFWZvcnRiaWxkdW5nLnVuaWJhcy5jaDAeFw0xNDA2MTAxNDEyMjZaFw0xNzA2
-MDkxNDEyMjZaMCAxHjAcBgNVBAMTFWZvcnRiaWxkdW5nLnVuaWJhcy5jaDCCASIw
-DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALuIQhaIRM/rhOAKHV9Cu1DwU9K5
-p+YhOMDJx+mv8ggp3F2pc/nw/wiPjAc9OhMqDHVMrs6IaQWdy31DvZ9PxLqmZJlD
-bf/7cVEEWai/lqAoymkac13Bcgc1PgF4fTChCV0F9PyEWRgLwVrBetDpvPr/dkNo
-q9dSKA1mrjRIrOMxWRzv/WR7+zrwuj6ZUiZ2WPrRX7RoieYTYBov2iw9f7osSqT6
-tP5313J93O/KyGwU3bS++BtxDG6aWbIqrMt/xVskozFwVhxdFW944590g0aDYwNj
-hDwZhBB1IWdDAjGw2To12uSfvnUAX9zYHxds3meALvh9LhX9ct7u9F+YdWsCAwEA
-AaNtMGswSgYDVR0RBEMwQYIVZm9ydGJpbGR1bmcudW5pYmFzLmNohihodHRwczov
-L2ZvcnRiaWxkdW5nLnVuaWJhcy5jaC9TaGliYm9sZXRoMB0GA1UdDgQWBBQApJtP
-47MI9o8mbn92AZsHMCXYhDANBgkqhkiG9w0BAQUFAAOCAQEAecHA6G5GBABAdw+9
-FQFinTCDdi9ChOTYhdcv89wx7H8C/o5bG2NKyNYx3JiZuOjgo/4LOp1saiKH+2UY
-yG/uwXTy6GbBKJAkB2NQYIhTkoqKBzOavUvP8i7UymeTzvpfzKuTWNLDRyYhISt7
-6CaLblLHxmlD9PZ5K8hKczEG59E5EcJlEe8L1Nw7MkRFtJwHH+g/JeK4reEbBQqK
-03O00gs2IkRJqKn1ZFmN/xHOjpuqlAEwWAH4Qwj5Ji2wpHhsc8OuYqgr0tmcfri7
-sUHK7oavc8VVHlRMjbCexdPiLH1VU6x0h9ME/s3GAjzbh1dothnjIrZoeDqfyzoU
-VV1F+A==
-
-						</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <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://fortbildung.unibas.ch/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://fortbildung.unibas.ch/Shibboleth.sso/SAML2/Artifact" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://fortbildung.unibas.ch/Shibboleth.sso/SAML2/ECP" index="3"/>
-    <AttributeConsumingService index="1">
-      <ServiceName xml:lang="en">University Basel</ServiceName>
-      <ServiceDescription xml:lang="en">further education</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="true"/>
-      <RequestedAttribute FriendlyName="surname" Name="urn:oid:2.5.4.4" 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" 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"/>
-    </AttributeConsumingService>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">unibas.ch</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">Universität Basel</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">University of Basel</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="fr">Université de Bâle</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.unibas.ch/</OrganizationURL>
-    <OrganizationURL xml:lang="en">http://www.unibas.ch/</OrganizationURL>
-    <OrganizationURL xml:lang="fr">http://www.unibas.ch/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Viviane</GivenName>
-    <SurName>Cantaluppi</SurName>
-    <EmailAddress>mailto:v.cantaluppi@jcssoft.ch</EmailAddress>
-    <TelephoneNumber>+41617069830</TelephoneNumber>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Pascal</GivenName>
-    <SurName>Cantaluppi</SurName>
-    <EmailAddress>mailto:p.cantaluppi@jcssoft.ch</EmailAddress>
-    <TelephoneNumber>+41617069830</TelephoneNumber>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/fs-elcira-srv01.dir.garr.it-simplesamlphp-module.php-saml-sp-metadata.php-default-sp.xml b/swamid-interfederations-2.0/fs-elcira-srv01.dir.garr.it-simplesamlphp-module.php-saml-sp-metadata.php-default-sp.xml
deleted file mode 100644
index 142351b9..00000000
--- a/swamid-interfederations-2.0/fs-elcira-srv01.dir.garr.it-simplesamlphp-module.php-saml-sp-metadata.php-default-sp.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:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" entityID="https://fs-elcira-srv01.dir.garr.it/simplesamlphp/module.php/saml/sp/metadata.php/default-sp">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2014-09-15T12:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <mdattr:EntityAttributes>
-      <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>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="en">Filesender for ELCIRA</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="it">Filesender per ELCIRA</mdui:DisplayName>
-        <mdui:Description xml:lang="en">FileSender ELCIRA by GARR is a secure way to share big files with everybody!</mdui:Description>
-        <mdui:Description xml:lang="it">FileSender ELCIRA da GARR è un modo sicuro di condividere grossi file con tutti!</mdui:Description>
-        <mdui:InformationURL xml:lang="en">https://fs-elcira-srv01.dir.garr.it/elcira/index.html</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="it">https://fs-elcira-srv01.dir.garr.it/elcira/index.html</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://fs-elcira-srv01.dir.garr.it/elcira/privacy_en.html</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="it">https://fs-elcira-srv01.dir.garr.it/elcira/privacy_it.html</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://primo-login.garrbox.garr.it/Shibboleth.sso/DS"/>
-      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://primo-login.garrbox.garr.it/Shibboleth.sso/DS" index="1"/>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDHzCCAgegAwIBAgIJAO2pE5Vwv7FYMA0GCSqGSIb3DQEBBQUAMCYxJDAiBgNV
-BAMMG2ZzLWVsY2lyYS1zcnYwMS5kaXIuZ2Fyci5pdDAeFw0xNDAxMTYwOTU4MDZa
-Fw0zNDAxMTEwOTU4MDZaMCYxJDAiBgNVBAMMG2ZzLWVsY2lyYS1zcnYwMS5kaXIu
-Z2Fyci5pdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANqr3aW47/9U
-URqjOL6HmX1aZ4+5UGQ/CT0PcYJ2GibpuNms31QIEtm6PqRAQ/r3Qc7V4wDclat2
-ww0SfKDT2NxRBah8QagbVxVVwWPFBFu4uvmbehz8jCahq5zia0hBlrR/Y0VgWj0Z
-7HKo7rfUyOhNRU0VxkesatjSqls8e1LxnNHTEM22aLbvrgcwSvX/XvNUclvA+edd
-OzCpWUQb4HJtDFAA0fKmbGueE45vwdvTpyVx1BL2N4PZpsDm5TdTEEr6zsMLtOFX
-+Dq7V9wWTYvILX8i5VaeVnZBH9a1Ou95fy2D+ZDlt+nnDJWo3Wqkr92lvV87oFA+
-0O4TBp4Wx3MCAwEAAaNQME4wHQYDVR0OBBYEFLJde/JWquiDiJENwGPkXggyxJSy
-MB8GA1UdIwQYMBaAFLJde/JWquiDiJENwGPkXggyxJSyMAwGA1UdEwQFMAMBAf8w
-DQYJKoZIhvcNAQEFBQADggEBAL/MIhivMBtcl6mGu2V+JppTsgLfGdrQ7YPBVNr1
-4RKxQjhLUfOY8UXji0aIUHmXXJBRQ3aYtu/n93S5lTMT4iX1bdugLDEL4UWUXgey
-8Ag7LUT8NNXnfoJ5eWcvxX8ijMw1h9I4J9NLosipIOIunRDBvt2YZHqWz6HE6zLk
-PWgsJBLXOn8WzFUQILgE58UNB8FRyszfjwQaMZxbr450A7MLzoocoHruvtyGmU/b
-u+8MvFPZtUgqakjD/z7nC7Xb8sLzvLIl2ImMzcnNvh3w25+kDZiDyhs/HpuLyWp0
-Q1BGI7m2w2Bezwz70P9B1CA26dzfKrAkCDGytwKMtiUwEB4=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDHzCCAgegAwIBAgIJAO2pE5Vwv7FYMA0GCSqGSIb3DQEBBQUAMCYxJDAiBgNV
-BAMMG2ZzLWVsY2lyYS1zcnYwMS5kaXIuZ2Fyci5pdDAeFw0xNDAxMTYwOTU4MDZa
-Fw0zNDAxMTEwOTU4MDZaMCYxJDAiBgNVBAMMG2ZzLWVsY2lyYS1zcnYwMS5kaXIu
-Z2Fyci5pdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANqr3aW47/9U
-URqjOL6HmX1aZ4+5UGQ/CT0PcYJ2GibpuNms31QIEtm6PqRAQ/r3Qc7V4wDclat2
-ww0SfKDT2NxRBah8QagbVxVVwWPFBFu4uvmbehz8jCahq5zia0hBlrR/Y0VgWj0Z
-7HKo7rfUyOhNRU0VxkesatjSqls8e1LxnNHTEM22aLbvrgcwSvX/XvNUclvA+edd
-OzCpWUQb4HJtDFAA0fKmbGueE45vwdvTpyVx1BL2N4PZpsDm5TdTEEr6zsMLtOFX
-+Dq7V9wWTYvILX8i5VaeVnZBH9a1Ou95fy2D+ZDlt+nnDJWo3Wqkr92lvV87oFA+
-0O4TBp4Wx3MCAwEAAaNQME4wHQYDVR0OBBYEFLJde/JWquiDiJENwGPkXggyxJSy
-MB8GA1UdIwQYMBaAFLJde/JWquiDiJENwGPkXggyxJSyMAwGA1UdEwQFMAMBAf8w
-DQYJKoZIhvcNAQEFBQADggEBAL/MIhivMBtcl6mGu2V+JppTsgLfGdrQ7YPBVNr1
-4RKxQjhLUfOY8UXji0aIUHmXXJBRQ3aYtu/n93S5lTMT4iX1bdugLDEL4UWUXgey
-8Ag7LUT8NNXnfoJ5eWcvxX8ijMw1h9I4J9NLosipIOIunRDBvt2YZHqWz6HE6zLk
-PWgsJBLXOn8WzFUQILgE58UNB8FRyszfjwQaMZxbr450A7MLzoocoHruvtyGmU/b
-u+8MvFPZtUgqakjD/z7nC7Xb8sLzvLIl2ImMzcnNvh3w25+kDZiDyhs/HpuLyWp0
-Q1BGI7m2w2Bezwz70P9B1CA26dzfKrAkCDGytwKMtiUwEB4=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://fs-elcira-srv01.dir.garr.it/simplesamlphp/module.php/saml/sp/saml2-logout.php/default-sp"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://fs-elcira-srv01.dir.garr.it/simplesamlphp/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://fs-elcira-srv01.dir.garr.it/simplesamlphp/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://fs-elcira-srv01.dir.garr.it/simplesamlphp/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://fs-elcira-srv01.dir.garr.it/simplesamlphp/module.php/saml/sp/saml1-acs.php/default-sp/artifact" index="3"/>
-    <AttributeConsumingService index="0">
-      <ServiceName xml:lang="it">Filesender erogato da GARR per il progetto ELCIRA</ServiceName>
-      <ServiceName xml:lang="en">Filesender provided by GARR for the ELCIRA project</ServiceName>
-      <RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" 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" isRequired="true"/>
-      <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="cn" Name="urn:oid:2.5.4.3" 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="uid" Name="urn:oid:0.9.2342.19200300.100.1.1" 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="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: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="it">Consortium GARR</OrganizationName>
-    <OrganizationName xml:lang="en">Consortium GARR</OrganizationName>
-    <OrganizationDisplayName xml:lang="it">La rete italiana dell'universitàe della ricerca</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">The Italian Academic and Research Network</OrganizationDisplayName>
-    <OrganizationURL xml:lang="it">http://www.garr.it</OrganizationURL>
-    <OrganizationURL xml:lang="en">http://www.garr.it/b/eng</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Administrator</GivenName>
-    <SurName>GARR</SurName>
-    <EmailAddress>grid-tech@garr.it</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/fs-elcira-srv01.dir.garr.it.xml b/swamid-interfederations-2.0/fs-elcira-srv01.dir.garr.it.xml
deleted file mode 100644
index 142351b9..00000000
--- a/swamid-interfederations-2.0/fs-elcira-srv01.dir.garr.it.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:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" entityID="https://fs-elcira-srv01.dir.garr.it/simplesamlphp/module.php/saml/sp/metadata.php/default-sp">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2014-09-15T12:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <mdattr:EntityAttributes>
-      <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>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="en">Filesender for ELCIRA</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="it">Filesender per ELCIRA</mdui:DisplayName>
-        <mdui:Description xml:lang="en">FileSender ELCIRA by GARR is a secure way to share big files with everybody!</mdui:Description>
-        <mdui:Description xml:lang="it">FileSender ELCIRA da GARR è un modo sicuro di condividere grossi file con tutti!</mdui:Description>
-        <mdui:InformationURL xml:lang="en">https://fs-elcira-srv01.dir.garr.it/elcira/index.html</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="it">https://fs-elcira-srv01.dir.garr.it/elcira/index.html</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://fs-elcira-srv01.dir.garr.it/elcira/privacy_en.html</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="it">https://fs-elcira-srv01.dir.garr.it/elcira/privacy_it.html</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://primo-login.garrbox.garr.it/Shibboleth.sso/DS"/>
-      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://primo-login.garrbox.garr.it/Shibboleth.sso/DS" index="1"/>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDHzCCAgegAwIBAgIJAO2pE5Vwv7FYMA0GCSqGSIb3DQEBBQUAMCYxJDAiBgNV
-BAMMG2ZzLWVsY2lyYS1zcnYwMS5kaXIuZ2Fyci5pdDAeFw0xNDAxMTYwOTU4MDZa
-Fw0zNDAxMTEwOTU4MDZaMCYxJDAiBgNVBAMMG2ZzLWVsY2lyYS1zcnYwMS5kaXIu
-Z2Fyci5pdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANqr3aW47/9U
-URqjOL6HmX1aZ4+5UGQ/CT0PcYJ2GibpuNms31QIEtm6PqRAQ/r3Qc7V4wDclat2
-ww0SfKDT2NxRBah8QagbVxVVwWPFBFu4uvmbehz8jCahq5zia0hBlrR/Y0VgWj0Z
-7HKo7rfUyOhNRU0VxkesatjSqls8e1LxnNHTEM22aLbvrgcwSvX/XvNUclvA+edd
-OzCpWUQb4HJtDFAA0fKmbGueE45vwdvTpyVx1BL2N4PZpsDm5TdTEEr6zsMLtOFX
-+Dq7V9wWTYvILX8i5VaeVnZBH9a1Ou95fy2D+ZDlt+nnDJWo3Wqkr92lvV87oFA+
-0O4TBp4Wx3MCAwEAAaNQME4wHQYDVR0OBBYEFLJde/JWquiDiJENwGPkXggyxJSy
-MB8GA1UdIwQYMBaAFLJde/JWquiDiJENwGPkXggyxJSyMAwGA1UdEwQFMAMBAf8w
-DQYJKoZIhvcNAQEFBQADggEBAL/MIhivMBtcl6mGu2V+JppTsgLfGdrQ7YPBVNr1
-4RKxQjhLUfOY8UXji0aIUHmXXJBRQ3aYtu/n93S5lTMT4iX1bdugLDEL4UWUXgey
-8Ag7LUT8NNXnfoJ5eWcvxX8ijMw1h9I4J9NLosipIOIunRDBvt2YZHqWz6HE6zLk
-PWgsJBLXOn8WzFUQILgE58UNB8FRyszfjwQaMZxbr450A7MLzoocoHruvtyGmU/b
-u+8MvFPZtUgqakjD/z7nC7Xb8sLzvLIl2ImMzcnNvh3w25+kDZiDyhs/HpuLyWp0
-Q1BGI7m2w2Bezwz70P9B1CA26dzfKrAkCDGytwKMtiUwEB4=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDHzCCAgegAwIBAgIJAO2pE5Vwv7FYMA0GCSqGSIb3DQEBBQUAMCYxJDAiBgNV
-BAMMG2ZzLWVsY2lyYS1zcnYwMS5kaXIuZ2Fyci5pdDAeFw0xNDAxMTYwOTU4MDZa
-Fw0zNDAxMTEwOTU4MDZaMCYxJDAiBgNVBAMMG2ZzLWVsY2lyYS1zcnYwMS5kaXIu
-Z2Fyci5pdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANqr3aW47/9U
-URqjOL6HmX1aZ4+5UGQ/CT0PcYJ2GibpuNms31QIEtm6PqRAQ/r3Qc7V4wDclat2
-ww0SfKDT2NxRBah8QagbVxVVwWPFBFu4uvmbehz8jCahq5zia0hBlrR/Y0VgWj0Z
-7HKo7rfUyOhNRU0VxkesatjSqls8e1LxnNHTEM22aLbvrgcwSvX/XvNUclvA+edd
-OzCpWUQb4HJtDFAA0fKmbGueE45vwdvTpyVx1BL2N4PZpsDm5TdTEEr6zsMLtOFX
-+Dq7V9wWTYvILX8i5VaeVnZBH9a1Ou95fy2D+ZDlt+nnDJWo3Wqkr92lvV87oFA+
-0O4TBp4Wx3MCAwEAAaNQME4wHQYDVR0OBBYEFLJde/JWquiDiJENwGPkXggyxJSy
-MB8GA1UdIwQYMBaAFLJde/JWquiDiJENwGPkXggyxJSyMAwGA1UdEwQFMAMBAf8w
-DQYJKoZIhvcNAQEFBQADggEBAL/MIhivMBtcl6mGu2V+JppTsgLfGdrQ7YPBVNr1
-4RKxQjhLUfOY8UXji0aIUHmXXJBRQ3aYtu/n93S5lTMT4iX1bdugLDEL4UWUXgey
-8Ag7LUT8NNXnfoJ5eWcvxX8ijMw1h9I4J9NLosipIOIunRDBvt2YZHqWz6HE6zLk
-PWgsJBLXOn8WzFUQILgE58UNB8FRyszfjwQaMZxbr450A7MLzoocoHruvtyGmU/b
-u+8MvFPZtUgqakjD/z7nC7Xb8sLzvLIl2ImMzcnNvh3w25+kDZiDyhs/HpuLyWp0
-Q1BGI7m2w2Bezwz70P9B1CA26dzfKrAkCDGytwKMtiUwEB4=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://fs-elcira-srv01.dir.garr.it/simplesamlphp/module.php/saml/sp/saml2-logout.php/default-sp"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://fs-elcira-srv01.dir.garr.it/simplesamlphp/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://fs-elcira-srv01.dir.garr.it/simplesamlphp/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://fs-elcira-srv01.dir.garr.it/simplesamlphp/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://fs-elcira-srv01.dir.garr.it/simplesamlphp/module.php/saml/sp/saml1-acs.php/default-sp/artifact" index="3"/>
-    <AttributeConsumingService index="0">
-      <ServiceName xml:lang="it">Filesender erogato da GARR per il progetto ELCIRA</ServiceName>
-      <ServiceName xml:lang="en">Filesender provided by GARR for the ELCIRA project</ServiceName>
-      <RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" 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" isRequired="true"/>
-      <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="cn" Name="urn:oid:2.5.4.3" 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="uid" Name="urn:oid:0.9.2342.19200300.100.1.1" 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="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: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="it">Consortium GARR</OrganizationName>
-    <OrganizationName xml:lang="en">Consortium GARR</OrganizationName>
-    <OrganizationDisplayName xml:lang="it">La rete italiana dell'universitàe della ricerca</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">The Italian Academic and Research Network</OrganizationDisplayName>
-    <OrganizationURL xml:lang="it">http://www.garr.it</OrganizationURL>
-    <OrganizationURL xml:lang="en">http://www.garr.it/b/eng</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Administrator</GivenName>
-    <SurName>GARR</SurName>
-    <EmailAddress>grid-tech@garr.it</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/fse.eduuni.fi.xml b/swamid-interfederations-2.0/fse.eduuni.fi.xml
deleted file mode 100644
index 40e8b13c..00000000
--- a/swamid-interfederations-2.0/fse.eduuni.fi.xml
+++ /dev/null
@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns: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="http://fse.eduuni.fi/adfs/services/trust">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="fi">Eduuni-työtilat</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Eduuni-workspaces</mdui:DisplayName>
-        <mdui:Description xml:lang="fi">Eduuni-työtilat on opetus- ja kulttuuriministeriön toimialan yhteinen sähköisen työskentelyn ja verkostoitumisen alusta.</mdui:Description>
-        <mdui:Description xml:lang="en">Eduuni-workspaces is a shared platform for collaboration and networking in the branch of the Ministry of Education and Culture.</mdui:Description>
-        <mdui:PrivacyStatementURL xml:lang="sv">http://www.eduuni.fi/Eduuni-tietosuojaseloste.pdf</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="en">http://www.eduuni.fi/Eduuni-tietosuojaseloste.pdf</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="fi">http://www.eduuni.fi/Eduuni-tietosuojaseloste.pdf</mdui:PrivacyStatementURL>
-      </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>MIIGBjCCBO6gAwIBAgIEC+2O9DANBgkqhkiG9w0BAQUFADCBhTELMAkGA1UEBhMCRkkxEDAOBgNV
-BAgTB0ZpbmxhbmQxITAfBgNVBAoTGFZhZXN0b3Jla2lzdGVyaWtlc2t1cyBDQTEaMBgGA1UECxMR
-UGFsdmVsdXZhcm1lbnRlZXQxJTAjBgNVBAMTHFZSSyBDQSBmb3IgU2VydmljZSBQcm92aWRlcnMw
-HhcNMTMwODA2MDYwMDAwWhcNMTUwODA2MjA1OTAwWjB0MQswCQYDVQQGEwJGSTEQMA4GA1UECBMH
-VXVzaW1hYTERMA8GA1UEBxMISGVsc2lua2kxKDAmBgNVBAoMH09wZXR1cy0gamEga3VsdHR1dXJp
-bWluaXN0ZXJpw7YxFjAUBgNVBAMTDWZzZS5lZHV1bmkuZmkwggEiMA0GCSqGSIb3DQEBAQUAA4IB
-DwAwggEKAoIBAQCVpaflafuK/FqgOIhrEHiCYysm6LexEQRoPMQy4QyOuTGdnJwQShDVZS2TwxMl
-2V/MweIjUOU67y212bHabkYml6pK74ZfwaCmrJMNvYQIlWLfDt8Q5Y9Yxju0JiD3WWvh6fqAYRVn
-B2l/zU0ZXRSayY6RVM2VAbk0L+8hDiNCiRm3to/y6CI8U0Wb3hmX6/oGWsV555Vz3iHZpu+mPlnP
-2njQQTkgKMlUwK7Ds+BGZNBCIeeYoXTHZkMcr4vgc7PDgjsfHqA2jwhQs4geN3szH8ykTmi6F62t
-NAASH6dmKm6jjrXxms88P8cynUv9GBNKrwTORr0lOHtKU2wRFDtPAgMBAAGjggKMMIICiDAMBgNV
-HRMBAf8EAjAAMIHVBgNVHSAEgc0wgcowCAYGBACPegEDMIG9BgkqgXaEBQEKBAEwga8wgYQGCCsG
-AQUFBwICMHgadlZhcm1lbm5lcG9saXRpaWtrYSBvbiBzYWF0YXZpbGxhIC0gQ2VydGlmaWthdCBw
-b2xpY3kgZmlubnMgLSBDZXJ0aWZpY2F0ZSBwb2xpY3kgaXMgYXZhaWxhYmxlIGh0dHA6Ly93d3cu
-ZmluZWlkLmZpL2NwczMwJgYIKwYBBQUHAgEWGmh0dHA6Ly93d3cuZmluZWlkLmZpL2NwczMvMD8G
-CCsGAQUFBwEBBDMwMTAvBggrBgEFBQcwAoYjaHR0cDovL3Byb3h5LmZpbmVpZC5maS9jYS92cmtz
-cC5jcnQwDgYDVR0PAQH/BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAfBgNV
-HSMEGDAWgBQYNf0kF+5fwkVxbmsZvebuAfU68jCB7wYDVR0fBIHnMIHkMCugKaAnhiVodHRwOi8v
-cHJveHkuZmluZWlkLmZpL2NybC92cmtzcGMuY3JsMIG0oIGxoIGuhoGrbGRhcDovL2xkYXAuZmlu
-ZWlkLmZpOjM4OS9jbiUzZFZSSyUyMENBJTIwZm9yJTIwU2VydmljZSUyMFByb3ZpZGVycyxvdSUz
-ZFBhbHZlbHV2YXJtZW50ZWV0LG8lM2RWYWVzdG9yZWtpc3RlcmlrZXNrdXMlMjBDQSxkbWROYW1l
-JTNkRklORUlELGMlM2RGST9jZXJ0aWZpY2F0ZVJldm9jYXRpb25MaXN0MB0GA1UdDgQWBBSRO2u7
-JPphRe+0kglWmXOdqBprtzANBgkqhkiG9w0BAQUFAAOCAQEAHiFYA/0WHT8MQzBG03EIP22QiRBr
-R4/t203GC0iEnIGQIQ0oupxXakkZgffBVmycKEvg/BnKhgihfBgYKwohCSfgSK4m6BWWS0Ps0Rwj
-FQ1NeCIjRgTp8wdYsGm0rrCoADOjv+8iS6gt6p+MWNXf/04MAkfwcBGX4d9sGzdMEfAAmpUxGsZz
-f6B9o0oFSEWv2qL5Zq0WY9AbEIizSiOukr8cSS9C6AkG+C9+v+Vb1mheyQWbPf8y9zq0OkDekY2O
-e16sDOehPpDU5+eovgud9EmYTgmzhLl8LF0G8o4RBnqFhASYXweVpZ6bRiK/bthf1tNASYGLoQtl
-An5aXL3c9Q==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://fse.eduuni.fi/adfs/ls/"/>
-    <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://fse.eduuni.fi/adfs/ls/" index="1" isDefault="true"/>
-    <md:AttributeConsumingService index="1" isDefault="true">
-      <md:ServiceName xml:lang="fi">Eduuni-tyotilat</md:ServiceName>
-      <md:ServiceName xml:lang="en">Eduuni-workspaces</md:ServiceName>
-      <md:ServiceDescription xml:lang="fi">Eduuni-tyotilat on opetus- ja kulttuuriministerion toimialan yhteinen sahkoisen tyoskentelyn ja verkostoitumisen alusta.</md:ServiceDescription>
-      <md:ServiceDescription xml:lang="en">Eduuni-workspaces is a shared platform for collaboration and networking in the branch of the Ministry of Education and Culture.</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" 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: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.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: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">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="technical">
-    <md:GivenName>Sami</md:GivenName>
-    <md:SurName>Saarikoski</md:SurName>
-    <md:EmailAddress>mailto:asiakaspalvelu@eduuni.fi</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Toni</md:GivenName>
-    <md:SurName>Sormunen</md:SurName>
-    <md:EmailAddress>mailto:asiakaspalvelu@eduuni.fi</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/ghgtool.grnet.gr-shibboleth.xml b/swamid-interfederations-2.0/ghgtool.grnet.gr-shibboleth.xml
deleted file mode 100644
index 7c660dbf..00000000
--- a/swamid-interfederations-2.0/ghgtool.grnet.gr-shibboleth.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://ghgtool.grnet.gr/shibboleth">
-  <Extensions xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi">
-    <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>
-  <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">GHG report tool</mdui:DisplayName>
-        <mdui:Description xml:lang="en">GHG online reporting tool</mdui:Description>
-        <mdui:InformationURL xml:lang="en">https://ghgtool.grnet.gr/about/</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://ghgtool.grnet.gr/about/privacy</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="el">https://ghgtool.grnet.gr/about/privacy#greek</mdui:PrivacyStatementURL>
-        <mdui:Logo height="64" width="250" xml:lang="en">https://ghgtool.grnet.gr/about/ghgtoollogo.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://ghgtool.grnet.gr/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://ghgtool.grnet.gr/Shibboleth.sso/Login" index="1"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIIFwTCCA6mgAwIBAgIJAMzPE0+nt+YbMA0GCSqGSIb3DQEBBQUAMEkxCzAJBgNV
-                            BAYTAkdSMQ4wDAYDVQQIEwVQQVRSQTEMMAoGA1UEBxMDUklPMQ4wDAYDVQQKEwVH
-                            Uk5FVDEMMAoGA1UECxMDUlU2MB4XDTEzMTExMjAxMjI1NloXDTE0MTExMjAxMjI1
-                            NlowSTELMAkGA1UEBhMCR1IxDjAMBgNVBAgTBVBBVFJBMQwwCgYDVQQHEwNSSU8x
-                            DjAMBgNVBAoTBUdSTkVUMQwwCgYDVQQLEwNSVTYwggIiMA0GCSqGSIb3DQEBAQUA
-                            A4ICDwAwggIKAoICAQDCNiDRCIEqgOS4RtYPP04QBw632zSJ9tklRo5VcnzrneYH
-                            r2APRVeUQO4uPUMeJEs3a/MQkh8C/zWctIrTWyJh/RVO77uXhxYFQyptNx3hhg3Y
-                            GABTxJ5Jv6Jkzznhr2+Rq/ayEKLuIxQDt5aG3pcBEX9M59LLjIJa1gtT06wYq2Bn
-                            eHBJshDCeEQvC4N7bZLbcCo60Yge7cPfam67Gyrrvr2e7VW/VJJ0hFSvjbh3bGco
-                            TRYRurdtIyjxKRoUvDMFujcbnP1KaHQS5vZlneWcVanu0FWW3ieOYiDPZcZ5yKUq
-                            MGGY3OzWpEOzrOh2Bmgx7zWmcoye+5Rj+1+NvOmkkNqTJs0x+Y0mKY63xfzpHbzj
-                            1iyzSkfoW0sd4V+3ymd951gUkgigJs7WPpkUz5PMt8QmIUH9e+nxBiU2UPA3TTXw
-                            DWs3i40tiGBSkAKLLEz/7wCOgiA733JgkKAbi6TLUFr0VNAQlRZwlyjzD3j8ixis
-                            qBKjnKJ+3uAJ7T3pRNnZCw9s0Qg9Hj6st3u7DmQ9McH3QFgvmS9pWAVKqW95PPtO
-                            MvIASOCdDDnry8yrMG/sUYmbAc8+Nr2+GZR5e14ZmMaN2ImM7xDdLEUdE9jFqInv
-                            fErEbIu+00EVYYijNmIamywaCrSr09LlXXC6/1vPlZdiGhBcFE/i5KbUeUlwMwID
-                            AQABo4GrMIGoMB0GA1UdDgQWBBTiec00rlpZRRGu2TrFpqW1sjMCRzB5BgNVHSME
-                            cjBwgBTiec00rlpZRRGu2TrFpqW1sjMCR6FNpEswSTELMAkGA1UEBhMCR1IxDjAM
-                            BgNVBAgTBVBBVFJBMQwwCgYDVQQHEwNSSU8xDjAMBgNVBAoTBUdSTkVUMQwwCgYD
-                            VQQLEwNSVTaCCQDMzxNPp7fmGzAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUA
-                            A4ICAQA7Ii3a/ZLBsRavzMBp54dnbC66oSiIPylHo2Xkc413uHVrMJEnroT/o1jk
-                            RKq90Mvqr2sGfTpYjz6fGX3A+LHUOW2XYnqQCTILMcJgvSnqXW3Fxcd00ogSdZWx
-                            0KS5VVNCZ5mPEgsQwr+BtOKdB2sb8PGhWYKnVSKYLCrt4FjX7gJBYLpqUGWxMyoq
-                            fWg2ovutdRW/izFIGuEEW1031+HZ+9f66AMexswnAIUhEeF6Ew14saA2f23Rvoyl
-                            4rFqQ0wbXsnOy+PeS9bnF6QLCEXMVlEkJg+MNPkESPY6Lns98ExIP0gh9rcOSR97
-                            4KHhgFsJMWG6PfcQ328wjeMtQF9ZqThhtb+//5eODBtIZZvZjZfcICh6lEHiwh2a
-                            8pX39iau26q7Oy5WtMXf8lLFS/ECfmc1WLfZZlh9C/cjHRkrFLwqyCiwpQ/QfGFZ
-                            HgfCEKwvZ7gS7UuiT7Aa6gGy8IXwZFC4gwtcQ5n7Fo35K6WBeA9tJ+n2GWwDF/5M
-                            tkmYhp5t+sCXM4ygUfHnvwLvxkLN2yUzFZCpPsoaQwbWOhvmAsvaz4c9ZMlySGia
-                            hr0y8arTsb1cPFQvcM/1xvjWw8nlx3OaoHV4hV3K+B2e+heYkP11DLoY5ZiG2Dh/
-                            eMqY26cZtNFIW4tgT7/uLpwzbeTrVDCG/PuoSyYicbEMLQ+hDA==
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ghgtool.grnet.gr/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ghgtool.grnet.gr/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ghgtool.grnet.gr/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ghgtool.grnet.gr/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ghgtool.grnet.gr/Shibboleth.sso/SLO/Artifact"/>
-    <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" Location="https://ghgtool.grnet.gr/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ghgtool.grnet.gr/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ghgtool.grnet.gr/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ghgtool.grnet.gr/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ghgtool.grnet.gr/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ghgtool.grnet.gr/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <AttributeConsumingService index="0" isDefault="true">
-      <ServiceName xml:lang="en">GHG report tool</ServiceName>
-      <ServiceDescription xml:lang="en">GHG online reporting tool</ServiceDescription>
-      <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="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri" isRequired="true"/>
-      <RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:mace:dir:attribute-def:eduPersonTargetedID" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri" isRequired="true"/>
-      <RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-      <RequestedAttribute FriendlyName="mail" Name="urn:mace:dir:attribute-def:mail" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri" isRequired="false"/>
-      <RequestedAttribute FriendlyName="cn" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <RequestedAttribute FriendlyName="cn" Name="urn:mace:dir:attribute-def:cn" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace: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="displayName" Name="urn:mace:dir:attribute-def:displayName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri" isRequired="true"/>
-      <RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <RequestedAttribute FriendlyName="givenName" Name="urn:mace:dir:attribute-def:givenName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri" isRequired="true"/>
-      <RequestedAttribute FriendlyName="surname" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <RequestedAttribute FriendlyName="surname" Name="urn:mace:dir:attribute-def:sn" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri" isRequired="true"/>
-      <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="eduPersonPrincipalName" Name="urn:mace:dir:attribute-def:eduPersonPrincipalName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri" isRequired="true"/>
-      <RequestedAttribute FriendlyName="shacHomeOrganization" 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"/>
-      <RequestedAttribute FriendlyName="shacHomeOrganization" Name="urn:mace:terena.org:attribute-def:schacHomeOrganization" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri" isRequired="true"/>
-      <RequestedAttribute FriendlyName="orgName" Name="urn:oid:2.5.4.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-      <RequestedAttribute FriendlyName="orgName" Name="urn:mace:dir:attribute-def:o" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri" isRequired="false"/>
-    </AttributeConsumingService>
-  </SPSSODescriptor>
-  <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">
-    <GivenName>Vasiliki Giannikopoulou</GivenName>
-    <EmailAddress>vasilg@admin.grnet.gr</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="support">
-    <GivenName>Constantinos Vassilakis</GivenName>
-    <EmailAddress>cvassilakis@admin.grnet.gr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/ghgtool.grnet.gr.xml b/swamid-interfederations-2.0/ghgtool.grnet.gr.xml
deleted file mode 100644
index 7c660dbf..00000000
--- a/swamid-interfederations-2.0/ghgtool.grnet.gr.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://ghgtool.grnet.gr/shibboleth">
-  <Extensions xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi">
-    <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>
-  <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">GHG report tool</mdui:DisplayName>
-        <mdui:Description xml:lang="en">GHG online reporting tool</mdui:Description>
-        <mdui:InformationURL xml:lang="en">https://ghgtool.grnet.gr/about/</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://ghgtool.grnet.gr/about/privacy</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="el">https://ghgtool.grnet.gr/about/privacy#greek</mdui:PrivacyStatementURL>
-        <mdui:Logo height="64" width="250" xml:lang="en">https://ghgtool.grnet.gr/about/ghgtoollogo.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://ghgtool.grnet.gr/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://ghgtool.grnet.gr/Shibboleth.sso/Login" index="1"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIIFwTCCA6mgAwIBAgIJAMzPE0+nt+YbMA0GCSqGSIb3DQEBBQUAMEkxCzAJBgNV
-                            BAYTAkdSMQ4wDAYDVQQIEwVQQVRSQTEMMAoGA1UEBxMDUklPMQ4wDAYDVQQKEwVH
-                            Uk5FVDEMMAoGA1UECxMDUlU2MB4XDTEzMTExMjAxMjI1NloXDTE0MTExMjAxMjI1
-                            NlowSTELMAkGA1UEBhMCR1IxDjAMBgNVBAgTBVBBVFJBMQwwCgYDVQQHEwNSSU8x
-                            DjAMBgNVBAoTBUdSTkVUMQwwCgYDVQQLEwNSVTYwggIiMA0GCSqGSIb3DQEBAQUA
-                            A4ICDwAwggIKAoICAQDCNiDRCIEqgOS4RtYPP04QBw632zSJ9tklRo5VcnzrneYH
-                            r2APRVeUQO4uPUMeJEs3a/MQkh8C/zWctIrTWyJh/RVO77uXhxYFQyptNx3hhg3Y
-                            GABTxJ5Jv6Jkzznhr2+Rq/ayEKLuIxQDt5aG3pcBEX9M59LLjIJa1gtT06wYq2Bn
-                            eHBJshDCeEQvC4N7bZLbcCo60Yge7cPfam67Gyrrvr2e7VW/VJJ0hFSvjbh3bGco
-                            TRYRurdtIyjxKRoUvDMFujcbnP1KaHQS5vZlneWcVanu0FWW3ieOYiDPZcZ5yKUq
-                            MGGY3OzWpEOzrOh2Bmgx7zWmcoye+5Rj+1+NvOmkkNqTJs0x+Y0mKY63xfzpHbzj
-                            1iyzSkfoW0sd4V+3ymd951gUkgigJs7WPpkUz5PMt8QmIUH9e+nxBiU2UPA3TTXw
-                            DWs3i40tiGBSkAKLLEz/7wCOgiA733JgkKAbi6TLUFr0VNAQlRZwlyjzD3j8ixis
-                            qBKjnKJ+3uAJ7T3pRNnZCw9s0Qg9Hj6st3u7DmQ9McH3QFgvmS9pWAVKqW95PPtO
-                            MvIASOCdDDnry8yrMG/sUYmbAc8+Nr2+GZR5e14ZmMaN2ImM7xDdLEUdE9jFqInv
-                            fErEbIu+00EVYYijNmIamywaCrSr09LlXXC6/1vPlZdiGhBcFE/i5KbUeUlwMwID
-                            AQABo4GrMIGoMB0GA1UdDgQWBBTiec00rlpZRRGu2TrFpqW1sjMCRzB5BgNVHSME
-                            cjBwgBTiec00rlpZRRGu2TrFpqW1sjMCR6FNpEswSTELMAkGA1UEBhMCR1IxDjAM
-                            BgNVBAgTBVBBVFJBMQwwCgYDVQQHEwNSSU8xDjAMBgNVBAoTBUdSTkVUMQwwCgYD
-                            VQQLEwNSVTaCCQDMzxNPp7fmGzAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUA
-                            A4ICAQA7Ii3a/ZLBsRavzMBp54dnbC66oSiIPylHo2Xkc413uHVrMJEnroT/o1jk
-                            RKq90Mvqr2sGfTpYjz6fGX3A+LHUOW2XYnqQCTILMcJgvSnqXW3Fxcd00ogSdZWx
-                            0KS5VVNCZ5mPEgsQwr+BtOKdB2sb8PGhWYKnVSKYLCrt4FjX7gJBYLpqUGWxMyoq
-                            fWg2ovutdRW/izFIGuEEW1031+HZ+9f66AMexswnAIUhEeF6Ew14saA2f23Rvoyl
-                            4rFqQ0wbXsnOy+PeS9bnF6QLCEXMVlEkJg+MNPkESPY6Lns98ExIP0gh9rcOSR97
-                            4KHhgFsJMWG6PfcQ328wjeMtQF9ZqThhtb+//5eODBtIZZvZjZfcICh6lEHiwh2a
-                            8pX39iau26q7Oy5WtMXf8lLFS/ECfmc1WLfZZlh9C/cjHRkrFLwqyCiwpQ/QfGFZ
-                            HgfCEKwvZ7gS7UuiT7Aa6gGy8IXwZFC4gwtcQ5n7Fo35K6WBeA9tJ+n2GWwDF/5M
-                            tkmYhp5t+sCXM4ygUfHnvwLvxkLN2yUzFZCpPsoaQwbWOhvmAsvaz4c9ZMlySGia
-                            hr0y8arTsb1cPFQvcM/1xvjWw8nlx3OaoHV4hV3K+B2e+heYkP11DLoY5ZiG2Dh/
-                            eMqY26cZtNFIW4tgT7/uLpwzbeTrVDCG/PuoSyYicbEMLQ+hDA==
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ghgtool.grnet.gr/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ghgtool.grnet.gr/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ghgtool.grnet.gr/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ghgtool.grnet.gr/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ghgtool.grnet.gr/Shibboleth.sso/SLO/Artifact"/>
-    <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" Location="https://ghgtool.grnet.gr/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ghgtool.grnet.gr/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ghgtool.grnet.gr/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ghgtool.grnet.gr/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ghgtool.grnet.gr/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ghgtool.grnet.gr/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <AttributeConsumingService index="0" isDefault="true">
-      <ServiceName xml:lang="en">GHG report tool</ServiceName>
-      <ServiceDescription xml:lang="en">GHG online reporting tool</ServiceDescription>
-      <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="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri" isRequired="true"/>
-      <RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:mace:dir:attribute-def:eduPersonTargetedID" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri" isRequired="true"/>
-      <RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-      <RequestedAttribute FriendlyName="mail" Name="urn:mace:dir:attribute-def:mail" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri" isRequired="false"/>
-      <RequestedAttribute FriendlyName="cn" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <RequestedAttribute FriendlyName="cn" Name="urn:mace:dir:attribute-def:cn" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace: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="displayName" Name="urn:mace:dir:attribute-def:displayName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri" isRequired="true"/>
-      <RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <RequestedAttribute FriendlyName="givenName" Name="urn:mace:dir:attribute-def:givenName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri" isRequired="true"/>
-      <RequestedAttribute FriendlyName="surname" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <RequestedAttribute FriendlyName="surname" Name="urn:mace:dir:attribute-def:sn" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri" isRequired="true"/>
-      <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="eduPersonPrincipalName" Name="urn:mace:dir:attribute-def:eduPersonPrincipalName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri" isRequired="true"/>
-      <RequestedAttribute FriendlyName="shacHomeOrganization" 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"/>
-      <RequestedAttribute FriendlyName="shacHomeOrganization" Name="urn:mace:terena.org:attribute-def:schacHomeOrganization" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri" isRequired="true"/>
-      <RequestedAttribute FriendlyName="orgName" Name="urn:oid:2.5.4.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-      <RequestedAttribute FriendlyName="orgName" Name="urn:mace:dir:attribute-def:o" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri" isRequired="false"/>
-    </AttributeConsumingService>
-  </SPSSODescriptor>
-  <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">
-    <GivenName>Vasiliki Giannikopoulou</GivenName>
-    <EmailAddress>vasilg@admin.grnet.gr</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="support">
-    <GivenName>Constantinos Vassilakis</GivenName>
-    <EmailAddress>cvassilakis@admin.grnet.gr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/gidp.geant.net.xml b/swamid-interfederations-2.0/gidp.geant.net.xml
deleted file mode 100644
index 6db4290b..00000000
--- a/swamid-interfederations-2.0/gidp.geant.net.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://gidp.geant.net">
-  <!--
-		This is a "GEANT Identity Provider" simpleSAMLphp IdP for Delivery of Advanced Network Technology to Europe Limited.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-05-14T11:50:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gidp.geant.net</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">GEANT Identity Provider</mdui:DisplayName>
-        <mdui:Logo height="69" width="199">https://www.edugain.org/GIdP.png</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIEkzCCA3ugAwIBAgIRAMu+xHPPachtpqZqP5LsTqswDQYJKoZIhvcNAQEFBQAw
-						NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-						IFNTTCBDQTAeFw0xMzEyMTMwMDAwMDBaFw0xNjEyMTIyMzU5NTlaMDwxITAfBgNV
-						BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEXMBUGA1UEAxMOZ2lkcC5nZWFu
-						dC5uZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDGyGX8egmFqg1S
-						BpnwdMh7Gwco3avst57R/6TTgnGeajqjk5q7E6kzT33UHXG37kXJehuA2NBIhwoo
-						S8vBpMfsdhgj1ta98d9VdpjM84vJI8qj5zdOV1t+rQ1RejXxla5Fp0Rpj7BoKFye
-						WQ/vKrdk/G9rhpZS8DiIKqmNtkakxigm9aGse5r3zaYE6rb2Pb7VXBGkEVq96s5v
-						Z/iN6eGWfGy28XopRKboHpjVdR/AkyMARfFd1qLtGh3OddXykKgkwbKfYY3sKUYK
-						rqoeq1J6vF3KYYc1WlHuldnW0X+YjskiwX40USuZklxbv2mXublmhk1H5IgN7F2D
-						X8jJ124bAgMBAAGjggGUMIIBkDAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3V0fq
-						kOO57TAdBgNVHQ4EFgQUCsQex91m+Wk7E+C4/38Sf3T80yAwDgYDVR0PAQH/BAQD
-						AgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMC
-						MCIGA1UdIAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQIBMDoGA1UdHwQzMDEw
-						L6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3Js
-						MG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50Y3MudGVy
-						ZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9vY3Nw
-						LnRjcy50ZXJlbmEub3JnMEIGA1UdEQQ7MDmCDmdpZHAuZ2VhbnQubmV0ghNwcm9k
-						LWdpZHAuZ2VhbnQubmV0ghJ1YXQtZ2lkcC5nZWFudC5uZXQwDQYJKoZIhvcNAQEF
-						BQADggEBAB3iJ9REvIWq6OkRaiGMBN5wrH8RY0QulseOufbf7Cclx58+Y5hqf+bZ
-						1gNQQfGQB8wFw2HaHg/X7RyHA6GRPgjz2w6hLQqI5aWdoKpF26jSbfnQ0Ia+Ko6J
-						9JTawaCJzEqDOYO0vfdK19sOtouZoMpFyj5IGKUhJQfnXl4IxRAKbxOsdmZnlKfC
-						MHfKZ3Hkd137e5Vl6PPCD1SgKKyxklGL7kvUJLaI5H+fmyUZhYdLkabuViam16ok
-						ulsPPNORMXuSAaPbctgKJYdjK3D608c8SiZpm3hV/XBMYgDBb5NBTq3UZBbUsYRm
-						dDPF827oNvkbCcANbb1YmRBmFHWFe+E=
-					</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>
-						MIIEkzCCA3ugAwIBAgIRAMu+xHPPachtpqZqP5LsTqswDQYJKoZIhvcNAQEFBQAw
-						NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-						IFNTTCBDQTAeFw0xMzEyMTMwMDAwMDBaFw0xNjEyMTIyMzU5NTlaMDwxITAfBgNV
-						BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEXMBUGA1UEAxMOZ2lkcC5nZWFu
-						dC5uZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDGyGX8egmFqg1S
-						BpnwdMh7Gwco3avst57R/6TTgnGeajqjk5q7E6kzT33UHXG37kXJehuA2NBIhwoo
-						S8vBpMfsdhgj1ta98d9VdpjM84vJI8qj5zdOV1t+rQ1RejXxla5Fp0Rpj7BoKFye
-						WQ/vKrdk/G9rhpZS8DiIKqmNtkakxigm9aGse5r3zaYE6rb2Pb7VXBGkEVq96s5v
-						Z/iN6eGWfGy28XopRKboHpjVdR/AkyMARfFd1qLtGh3OddXykKgkwbKfYY3sKUYK
-						rqoeq1J6vF3KYYc1WlHuldnW0X+YjskiwX40USuZklxbv2mXublmhk1H5IgN7F2D
-						X8jJ124bAgMBAAGjggGUMIIBkDAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3V0fq
-						kOO57TAdBgNVHQ4EFgQUCsQex91m+Wk7E+C4/38Sf3T80yAwDgYDVR0PAQH/BAQD
-						AgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMC
-						MCIGA1UdIAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQIBMDoGA1UdHwQzMDEw
-						L6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3Js
-						MG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50Y3MudGVy
-						ZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9vY3Nw
-						LnRjcy50ZXJlbmEub3JnMEIGA1UdEQQ7MDmCDmdpZHAuZ2VhbnQubmV0ghNwcm9k
-						LWdpZHAuZ2VhbnQubmV0ghJ1YXQtZ2lkcC5nZWFudC5uZXQwDQYJKoZIhvcNAQEF
-						BQADggEBAB3iJ9REvIWq6OkRaiGMBN5wrH8RY0QulseOufbf7Cclx58+Y5hqf+bZ
-						1gNQQfGQB8wFw2HaHg/X7RyHA6GRPgjz2w6hLQqI5aWdoKpF26jSbfnQ0Ia+Ko6J
-						9JTawaCJzEqDOYO0vfdK19sOtouZoMpFyj5IGKUhJQfnXl4IxRAKbxOsdmZnlKfC
-						MHfKZ3Hkd137e5Vl6PPCD1SgKKyxklGL7kvUJLaI5H+fmyUZhYdLkabuViam16ok
-						ulsPPNORMXuSAaPbctgKJYdjK3D608c8SiZpm3hV/XBMYgDBb5NBTq3UZBbUsYRm
-						dDPF827oNvkbCcANbb1YmRBmFHWFe+E=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://gidp.geant.net/simplesamlphp/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://gidp.geant.net/simplesamlphp/saml2/idp/SSOService.php"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Delivery of Advanced Network Technology to Europe Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">GEANT Identity Provider</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.geant.net/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>eduGAIN OT</GivenName>
-    <EmailAddress>mailto:edugain-ot@geant.net</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>eduGAIN OT</GivenName>
-    <EmailAddress>mailto:edugain-ot@geant.net</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/gisela-gw.ct.infn.it-shibboleth.xml b/swamid-interfederations-2.0/gisela-gw.ct.infn.it-shibboleth.xml
deleted file mode 100644
index f021d599..00000000
--- a/swamid-interfederations-2.0/gisela-gw.ct.infn.it-shibboleth.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:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" entityID="https://gisela-gw.ct.infn.it/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2011-11-30T15:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement
-                </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>
-        <mdui:DisplayName xml:lang="en">GISELA Science Gateway</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="it">GISELA Science Gateway</mdui:DisplayName>
-        <mdui:Description xml:lang="en">
-                        This service provides information for Grid users, Application developers and
-                        Grid site administrators. It is mainly devoted to the people involved in the
-                        GISELA project but many pages are of general interest
-                    </mdui:Description>
-        <mdui:Description xml:lang="it">
-                        Questo servizio fornisce informazioni per utenti Grid, sviluppatori ed amministratori
-                        di siti Grid. Esso è principalmente indirizzato alle persone coinvolte nel progetto europeo
-                        GISELA ma molte informazioni sono di interesse generale
-                    </mdui:Description>
-      </mdui:UIInfo>
-      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://gisela-gw.ct.infn.it/Shibboleth.sso/DS"/>
-      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://gisela-gw.ct.infn.it/Shibboleth.sso/DS" index="1"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIFhDCCBGygAwIBAgIRAOyXU1f6GS689kEaSDAhQPYwDQYJKoZIhvcNAQEFBQAw
-NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-IFNTTCBDQTAeFw0xNDA1MTkwMDAwMDBaFw0xNzA1MTgyMzU5NTlaMEAxITAfBgNV
-BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEbMBkGA1UEAxMSbGlmZXJheS5j
-dC5pbmZuLml0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApizyvtMI
-uoSnnz/fvk7lcXwoDUk11NVAlg5w4zh01YKNvy5SzBu0eRIzRos/ALs4CwmxrmCv
-3JQPA4xxItxVd8x9Q+YElQteEcX+mWXXW5LI5XE3xhPzkdFeQrhkinAK2JreSn6E
-TQk8YO1rOxW3qCpKeYZ2VQF3grAU/JRWbvLF+r2j4zE27n+RzBxnYeZ9rtJ/67gU
-7t1S39DRDTyKit7dJIYl50n9g3atWGALb56QoVnlR+RPRxVI9EFd2hEXfrxWXGdt
-F2v6YIMSAAM5l2/SlEmhQSSkmQ4zXcmPrzC6pte9NWoPOTsQnCnocwMJ16aXsnQy
-BxaoywMtq8NsdwIDAQABo4ICgTCCAn0wHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsr
-N1dH6pDjue0wHQYDVR0OBBYEFCy5dq76F94vaAuznAys6UmGxySTMA4GA1UdDwEB
-/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEF
-BQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNVHR8E
-MzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENB
-LmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNz
-LnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8v
-b2NzcC50Y3MudGVyZW5hLm9yZzCCAS0GA1UdEQSCASQwggEgghJsaWZlcmF5LmN0
-LmluZm4uaXSCGWFwcGxpY2F0aW9ucy5ldS1kZWNpZGUuZXWCGWFwcGxpY2F0aW9u
-cy5ldW1lZGdyaWQuZXWCEGdpbGRhLmN0LmluZm4uaXSCFGdpc2VsYS1ndy5jdC5p
-bmZuLml0gg1ndy5jdC5pbmZuLml0ghNnd2VhdGhlci5jdC5pbmZuLml0ghBnd2xp
-Yi5jdC5pbmZuLml0gh9pbmRpY2F0ZS1ndy5jb25zb3J6aW8tY29tZXRhLml0ghFy
-aWNldmkuY3QuaW5mbi5pdIIUdmlyYWxncmlkLmN0LmluZm4uaXSCFHd3dy5jaGFp
-bi1wcm9qZWN0LmV1ghZ3d3cuc3BlY2lhbC1wcm9qZWN0Lml0MA0GCSqGSIb3DQEB
-BQUAA4IBAQCEZIHNNQPD5WkGSlUhCN/BRSharmQ6dT0NiwjQNmRODCpVqBgwVZY0
-VUlAobHaF186QXeiNYge8ZYSpYY2VhBa4znL7IjFODE3FsaJNseKgsyNFqKR8xNO
-nsOCM//SN9N79hwH8yAxLhGyxbnInpOhE6rEkbhtowTjqhDq26cGGlH8JTTPuYvY
-JhgPGGkxo1286x1nuN4ELKvwZ7RF+YTH/WPOIBMNi+ee+vxrIhWbU6iy97f7k4PA
-2e35ZQ6gutnmX2v/ybFWh0ruO4zszYKiMo+zGyLvYmIpV/+Mjs26KbqqrBOS1jjN
-W3MiH8HMxzzYHExNCvzrAgN1TfB+SCiB
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://gisela-gw.ct.infn.it/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://gisela-gw.ct.infn.it/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://gisela-gw.ct.infn.it/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://gisela-gw.ct.infn.it/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://gisela-gw.ct.infn.it/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://gisela-gw.ct.infn.it/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://gisela-gw.ct.infn.it/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://gisela-gw.ct.infn.it/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://gisela-gw.ct.infn.it/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://gisela-gw.ct.infn.it/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://gisela-gw.ct.infn.it/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <AttributeConsumingService index="1">
-      <ServiceName xml:lang="en">GISELA Science Gateway</ServiceName>
-      <ServiceDescription xml:lang="en">This service provides information for Grid users, Application developers and
-                    Grid site administrators. It is mainly devoted to the people involved in the
-                    GISELA project but many pages are of general interest
-                </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"/>
-    </AttributeConsumingService>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">INFN - the National Institute of Nuclear Physics. Catania division</OrganizationName>
-    <OrganizationName xml:lang="it">INFN - Istituto Nazionale di Fisica Nucleare. Sezione di Catania</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">INFN Catania</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="it">INFN Catania</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.ct.infn.it/en/home</OrganizationURL>
-    <OrganizationURL xml:lang="it">http://www.ct.infn.it/it/home</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Marco</GivenName>
-    <SurName>Fargetta</SurName>
-    <EmailAddress>mailto:marco.fargetta@ct.infn.it</EmailAddress>
-    <EmailAddress>mailto:credentials-admin@ct.infn.it</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Riccardo</GivenName>
-    <SurName>Rotondo</SurName>
-    <EmailAddress>mailto:riccardo.rotondo@ct.infn.it</EmailAddress>
-    <EmailAddress>mailto:credentials-admin@ct.infn.it</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="support">
-    <GivenName>Diego</GivenName>
-    <SurName>Scardaci</SurName>
-    <EmailAddress>mailto:diego.scardaci@ct.infn.it</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="administrative">
-    <GivenName>Roberto</GivenName>
-    <SurName>Barbera</SurName>
-    <EmailAddress>mailto:roberto.barbera@ct.infn.it</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/gisela-gw.ct.infn.it.xml b/swamid-interfederations-2.0/gisela-gw.ct.infn.it.xml
deleted file mode 100644
index f021d599..00000000
--- a/swamid-interfederations-2.0/gisela-gw.ct.infn.it.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:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" entityID="https://gisela-gw.ct.infn.it/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2011-11-30T15:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement
-                </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>
-        <mdui:DisplayName xml:lang="en">GISELA Science Gateway</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="it">GISELA Science Gateway</mdui:DisplayName>
-        <mdui:Description xml:lang="en">
-                        This service provides information for Grid users, Application developers and
-                        Grid site administrators. It is mainly devoted to the people involved in the
-                        GISELA project but many pages are of general interest
-                    </mdui:Description>
-        <mdui:Description xml:lang="it">
-                        Questo servizio fornisce informazioni per utenti Grid, sviluppatori ed amministratori
-                        di siti Grid. Esso è principalmente indirizzato alle persone coinvolte nel progetto europeo
-                        GISELA ma molte informazioni sono di interesse generale
-                    </mdui:Description>
-      </mdui:UIInfo>
-      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://gisela-gw.ct.infn.it/Shibboleth.sso/DS"/>
-      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://gisela-gw.ct.infn.it/Shibboleth.sso/DS" index="1"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIFhDCCBGygAwIBAgIRAOyXU1f6GS689kEaSDAhQPYwDQYJKoZIhvcNAQEFBQAw
-NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-IFNTTCBDQTAeFw0xNDA1MTkwMDAwMDBaFw0xNzA1MTgyMzU5NTlaMEAxITAfBgNV
-BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEbMBkGA1UEAxMSbGlmZXJheS5j
-dC5pbmZuLml0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApizyvtMI
-uoSnnz/fvk7lcXwoDUk11NVAlg5w4zh01YKNvy5SzBu0eRIzRos/ALs4CwmxrmCv
-3JQPA4xxItxVd8x9Q+YElQteEcX+mWXXW5LI5XE3xhPzkdFeQrhkinAK2JreSn6E
-TQk8YO1rOxW3qCpKeYZ2VQF3grAU/JRWbvLF+r2j4zE27n+RzBxnYeZ9rtJ/67gU
-7t1S39DRDTyKit7dJIYl50n9g3atWGALb56QoVnlR+RPRxVI9EFd2hEXfrxWXGdt
-F2v6YIMSAAM5l2/SlEmhQSSkmQ4zXcmPrzC6pte9NWoPOTsQnCnocwMJ16aXsnQy
-BxaoywMtq8NsdwIDAQABo4ICgTCCAn0wHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsr
-N1dH6pDjue0wHQYDVR0OBBYEFCy5dq76F94vaAuznAys6UmGxySTMA4GA1UdDwEB
-/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEF
-BQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNVHR8E
-MzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENB
-LmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNz
-LnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8v
-b2NzcC50Y3MudGVyZW5hLm9yZzCCAS0GA1UdEQSCASQwggEgghJsaWZlcmF5LmN0
-LmluZm4uaXSCGWFwcGxpY2F0aW9ucy5ldS1kZWNpZGUuZXWCGWFwcGxpY2F0aW9u
-cy5ldW1lZGdyaWQuZXWCEGdpbGRhLmN0LmluZm4uaXSCFGdpc2VsYS1ndy5jdC5p
-bmZuLml0gg1ndy5jdC5pbmZuLml0ghNnd2VhdGhlci5jdC5pbmZuLml0ghBnd2xp
-Yi5jdC5pbmZuLml0gh9pbmRpY2F0ZS1ndy5jb25zb3J6aW8tY29tZXRhLml0ghFy
-aWNldmkuY3QuaW5mbi5pdIIUdmlyYWxncmlkLmN0LmluZm4uaXSCFHd3dy5jaGFp
-bi1wcm9qZWN0LmV1ghZ3d3cuc3BlY2lhbC1wcm9qZWN0Lml0MA0GCSqGSIb3DQEB
-BQUAA4IBAQCEZIHNNQPD5WkGSlUhCN/BRSharmQ6dT0NiwjQNmRODCpVqBgwVZY0
-VUlAobHaF186QXeiNYge8ZYSpYY2VhBa4znL7IjFODE3FsaJNseKgsyNFqKR8xNO
-nsOCM//SN9N79hwH8yAxLhGyxbnInpOhE6rEkbhtowTjqhDq26cGGlH8JTTPuYvY
-JhgPGGkxo1286x1nuN4ELKvwZ7RF+YTH/WPOIBMNi+ee+vxrIhWbU6iy97f7k4PA
-2e35ZQ6gutnmX2v/ybFWh0ruO4zszYKiMo+zGyLvYmIpV/+Mjs26KbqqrBOS1jjN
-W3MiH8HMxzzYHExNCvzrAgN1TfB+SCiB
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://gisela-gw.ct.infn.it/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://gisela-gw.ct.infn.it/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://gisela-gw.ct.infn.it/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://gisela-gw.ct.infn.it/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://gisela-gw.ct.infn.it/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://gisela-gw.ct.infn.it/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://gisela-gw.ct.infn.it/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://gisela-gw.ct.infn.it/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://gisela-gw.ct.infn.it/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://gisela-gw.ct.infn.it/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://gisela-gw.ct.infn.it/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <AttributeConsumingService index="1">
-      <ServiceName xml:lang="en">GISELA Science Gateway</ServiceName>
-      <ServiceDescription xml:lang="en">This service provides information for Grid users, Application developers and
-                    Grid site administrators. It is mainly devoted to the people involved in the
-                    GISELA project but many pages are of general interest
-                </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"/>
-    </AttributeConsumingService>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">INFN - the National Institute of Nuclear Physics. Catania division</OrganizationName>
-    <OrganizationName xml:lang="it">INFN - Istituto Nazionale di Fisica Nucleare. Sezione di Catania</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">INFN Catania</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="it">INFN Catania</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.ct.infn.it/en/home</OrganizationURL>
-    <OrganizationURL xml:lang="it">http://www.ct.infn.it/it/home</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Marco</GivenName>
-    <SurName>Fargetta</SurName>
-    <EmailAddress>mailto:marco.fargetta@ct.infn.it</EmailAddress>
-    <EmailAddress>mailto:credentials-admin@ct.infn.it</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Riccardo</GivenName>
-    <SurName>Rotondo</SurName>
-    <EmailAddress>mailto:riccardo.rotondo@ct.infn.it</EmailAddress>
-    <EmailAddress>mailto:credentials-admin@ct.infn.it</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="support">
-    <GivenName>Diego</GivenName>
-    <SurName>Scardaci</SurName>
-    <EmailAddress>mailto:diego.scardaci@ct.infn.it</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="administrative">
-    <GivenName>Roberto</GivenName>
-    <SurName>Barbera</SurName>
-    <EmailAddress>mailto:roberto.barbera@ct.infn.it</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/gitlab-dev.in2p3.fr-sp.xml b/swamid-interfederations-2.0/gitlab-dev.in2p3.fr-sp.xml
deleted file mode 100644
index b7c82fa4..00000000
--- a/swamid-interfederations-2.0/gitlab-dev.in2p3.fr-sp.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://gitlab-dev.in2p3.fr/sp">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2014-09-08T17:43:49Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</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: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">IN2P3 - Gitlab dev</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Git collaborative hosting intended for IN2P3 staff and their associates (test instance).</mdui:Description>
-        <mdui:DisplayName xml:lang="fr">IN2P3 - Gitlab dev</mdui:DisplayName>
-        <mdui:Description xml:lang="fr">Hébergement git collaboratif à l'usage des personnels IN2P3 et de leurs collaborateurs (instance de test).</mdui:Description>
-        <mdui:PrivacyStatementURL xml:lang="en">https://gitlab-dev.in2p3.fr/about/privacy.html</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDIDCCAgigAwIBAgIJAMq3CLil3CmcMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE2dpdGxhYi1kZXYuaW4ycDMuZnIwHhcNMTQxMDE3MDkwMTIyWhcNMjQxMDE0
-MDkwMTIyWjAeMRwwGgYDVQQDExNnaXRsYWItZGV2LmluMnAzLmZyMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAzH82rDfD9niEHMAZXa6gHOxNkW4XSKv7
-7DtPOQ2Ft0z6eYkYrgCIadDx0btS8fCiTINg90OUbjYrrHvStbdWD2hKKOM5OAeo
-xQMRec+yZ93IDt67hrsDo8dqA8eBM+MicwmQbw3pHwQ4pQ73i6/ly3jTK+Iz/UQQ
-06jjuNKmVX7IXA75OFckM7jopUvZ1TuCrA0vg2L14qqp7zkuO3MP8pkX8CwRW1iV
-P0VaFOvztkIxMWT7Amacigqk16msg4M/swnrs5el6j97CAK5VJ/RD/OSvm61GjZF
-kbMPA1W2CRBVqF4+9J7YCOAbt00maZZeoXQPiLtfO1oOYKHBPslzrwIDAQABo2Ew
-XzA+BgNVHREENzA1ghNnaXRsYWItZGV2LmluMnAzLmZyhh5odHRwczovL2dpdGxh
-Yi1kZXYuaW4ycDMuZnIvc3AwHQYDVR0OBBYEFCusYwwMg6gWFnDUd31Yb+blT7lA
-MA0GCSqGSIb3DQEBBQUAA4IBAQBebrDXws3zc1y+MulOe0B17GO68qdSbAaQkNuj
-sBkhPgP+ie1gqlgTvgpT5lO115K8o7ePcqnZ1CiHg1/Q7uyyKj2XX3JaXZkUrGvH
-THNe8fYK+oRCoPth6Zpbho7MKITdjVwIOHhNh5xSsLm5ylvy5JCFyJxcv7QxMJ9L
-0HgVAHcaKrKDVRL2RqhpurBM+IRkepzQzoQuGAadDNnhHHsXvykwztVLWbiEfPLr
-f6D2GT5SNdfCzWafeUc9DseD43+58AMau3h2sBJbmVhkc4gW+2b2r010q67f4uJE
-BoZyB+cmraisCTXvHKNw8Jc97GlS9L5soe6vlTUh50RlVt24
-
-					    </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>
-					      MIIDIDCCAgigAwIBAgIJAMq3CLil3CmcMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE2dpdGxhYi1kZXYuaW4ycDMuZnIwHhcNMTQxMDE3MDkwMTIyWhcNMjQxMDE0
-MDkwMTIyWjAeMRwwGgYDVQQDExNnaXRsYWItZGV2LmluMnAzLmZyMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAzH82rDfD9niEHMAZXa6gHOxNkW4XSKv7
-7DtPOQ2Ft0z6eYkYrgCIadDx0btS8fCiTINg90OUbjYrrHvStbdWD2hKKOM5OAeo
-xQMRec+yZ93IDt67hrsDo8dqA8eBM+MicwmQbw3pHwQ4pQ73i6/ly3jTK+Iz/UQQ
-06jjuNKmVX7IXA75OFckM7jopUvZ1TuCrA0vg2L14qqp7zkuO3MP8pkX8CwRW1iV
-P0VaFOvztkIxMWT7Amacigqk16msg4M/swnrs5el6j97CAK5VJ/RD/OSvm61GjZF
-kbMPA1W2CRBVqF4+9J7YCOAbt00maZZeoXQPiLtfO1oOYKHBPslzrwIDAQABo2Ew
-XzA+BgNVHREENzA1ghNnaXRsYWItZGV2LmluMnAzLmZyhh5odHRwczovL2dpdGxh
-Yi1kZXYuaW4ycDMuZnIvc3AwHQYDVR0OBBYEFCusYwwMg6gWFnDUd31Yb+blT7lA
-MA0GCSqGSIb3DQEBBQUAA4IBAQBebrDXws3zc1y+MulOe0B17GO68qdSbAaQkNuj
-sBkhPgP+ie1gqlgTvgpT5lO115K8o7ePcqnZ1CiHg1/Q7uyyKj2XX3JaXZkUrGvH
-THNe8fYK+oRCoPth6Zpbho7MKITdjVwIOHhNh5xSsLm5ylvy5JCFyJxcv7QxMJ9L
-0HgVAHcaKrKDVRL2RqhpurBM+IRkepzQzoQuGAadDNnhHHsXvykwztVLWbiEfPLr
-f6D2GT5SNdfCzWafeUc9DseD43+58AMau3h2sBJbmVhkc4gW+2b2r010q67f4uJE
-BoZyB+cmraisCTXvHKNw8Jc97GlS9L5soe6vlTUh50RlVt24
-
-					    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://gitlab-dev.in2p3.fr/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://gitlab-dev.in2p3.fr/Shibboleth.sso/SAML/POST" index="5"/>
-    <AttributeConsumingService index="0">
-      <ServiceName xml:lang="fr">IN2P3 - Gitlab dev</ServiceName>
-      <ServiceName xml:lang="en">IN2P3 - Gitlab dev</ServiceName>
-      <ServiceDescription xml:lang="fr">Hébergement git collaboratif à l'usage des personnels IN2P3 et de leurs collaborateurs (instance de test).</ServiceDescription>
-      <ServiceDescription xml:lang="en">Git collaborative hosting intended for IN2P3 staff and their associates (test instance).</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="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="cn" Name="urn:oid:2.5.4.3" 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"/>
-    </AttributeConsumingService>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">CNRS</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">CNRS</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <EmailAddress>webmaster@in2p3.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/gitlab-dev.in2p3.fr.xml b/swamid-interfederations-2.0/gitlab-dev.in2p3.fr.xml
deleted file mode 100644
index b7c82fa4..00000000
--- a/swamid-interfederations-2.0/gitlab-dev.in2p3.fr.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://gitlab-dev.in2p3.fr/sp">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2014-09-08T17:43:49Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</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: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">IN2P3 - Gitlab dev</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Git collaborative hosting intended for IN2P3 staff and their associates (test instance).</mdui:Description>
-        <mdui:DisplayName xml:lang="fr">IN2P3 - Gitlab dev</mdui:DisplayName>
-        <mdui:Description xml:lang="fr">Hébergement git collaboratif à l'usage des personnels IN2P3 et de leurs collaborateurs (instance de test).</mdui:Description>
-        <mdui:PrivacyStatementURL xml:lang="en">https://gitlab-dev.in2p3.fr/about/privacy.html</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDIDCCAgigAwIBAgIJAMq3CLil3CmcMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE2dpdGxhYi1kZXYuaW4ycDMuZnIwHhcNMTQxMDE3MDkwMTIyWhcNMjQxMDE0
-MDkwMTIyWjAeMRwwGgYDVQQDExNnaXRsYWItZGV2LmluMnAzLmZyMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAzH82rDfD9niEHMAZXa6gHOxNkW4XSKv7
-7DtPOQ2Ft0z6eYkYrgCIadDx0btS8fCiTINg90OUbjYrrHvStbdWD2hKKOM5OAeo
-xQMRec+yZ93IDt67hrsDo8dqA8eBM+MicwmQbw3pHwQ4pQ73i6/ly3jTK+Iz/UQQ
-06jjuNKmVX7IXA75OFckM7jopUvZ1TuCrA0vg2L14qqp7zkuO3MP8pkX8CwRW1iV
-P0VaFOvztkIxMWT7Amacigqk16msg4M/swnrs5el6j97CAK5VJ/RD/OSvm61GjZF
-kbMPA1W2CRBVqF4+9J7YCOAbt00maZZeoXQPiLtfO1oOYKHBPslzrwIDAQABo2Ew
-XzA+BgNVHREENzA1ghNnaXRsYWItZGV2LmluMnAzLmZyhh5odHRwczovL2dpdGxh
-Yi1kZXYuaW4ycDMuZnIvc3AwHQYDVR0OBBYEFCusYwwMg6gWFnDUd31Yb+blT7lA
-MA0GCSqGSIb3DQEBBQUAA4IBAQBebrDXws3zc1y+MulOe0B17GO68qdSbAaQkNuj
-sBkhPgP+ie1gqlgTvgpT5lO115K8o7ePcqnZ1CiHg1/Q7uyyKj2XX3JaXZkUrGvH
-THNe8fYK+oRCoPth6Zpbho7MKITdjVwIOHhNh5xSsLm5ylvy5JCFyJxcv7QxMJ9L
-0HgVAHcaKrKDVRL2RqhpurBM+IRkepzQzoQuGAadDNnhHHsXvykwztVLWbiEfPLr
-f6D2GT5SNdfCzWafeUc9DseD43+58AMau3h2sBJbmVhkc4gW+2b2r010q67f4uJE
-BoZyB+cmraisCTXvHKNw8Jc97GlS9L5soe6vlTUh50RlVt24
-
-					    </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>
-					      MIIDIDCCAgigAwIBAgIJAMq3CLil3CmcMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE2dpdGxhYi1kZXYuaW4ycDMuZnIwHhcNMTQxMDE3MDkwMTIyWhcNMjQxMDE0
-MDkwMTIyWjAeMRwwGgYDVQQDExNnaXRsYWItZGV2LmluMnAzLmZyMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAzH82rDfD9niEHMAZXa6gHOxNkW4XSKv7
-7DtPOQ2Ft0z6eYkYrgCIadDx0btS8fCiTINg90OUbjYrrHvStbdWD2hKKOM5OAeo
-xQMRec+yZ93IDt67hrsDo8dqA8eBM+MicwmQbw3pHwQ4pQ73i6/ly3jTK+Iz/UQQ
-06jjuNKmVX7IXA75OFckM7jopUvZ1TuCrA0vg2L14qqp7zkuO3MP8pkX8CwRW1iV
-P0VaFOvztkIxMWT7Amacigqk16msg4M/swnrs5el6j97CAK5VJ/RD/OSvm61GjZF
-kbMPA1W2CRBVqF4+9J7YCOAbt00maZZeoXQPiLtfO1oOYKHBPslzrwIDAQABo2Ew
-XzA+BgNVHREENzA1ghNnaXRsYWItZGV2LmluMnAzLmZyhh5odHRwczovL2dpdGxh
-Yi1kZXYuaW4ycDMuZnIvc3AwHQYDVR0OBBYEFCusYwwMg6gWFnDUd31Yb+blT7lA
-MA0GCSqGSIb3DQEBBQUAA4IBAQBebrDXws3zc1y+MulOe0B17GO68qdSbAaQkNuj
-sBkhPgP+ie1gqlgTvgpT5lO115K8o7ePcqnZ1CiHg1/Q7uyyKj2XX3JaXZkUrGvH
-THNe8fYK+oRCoPth6Zpbho7MKITdjVwIOHhNh5xSsLm5ylvy5JCFyJxcv7QxMJ9L
-0HgVAHcaKrKDVRL2RqhpurBM+IRkepzQzoQuGAadDNnhHHsXvykwztVLWbiEfPLr
-f6D2GT5SNdfCzWafeUc9DseD43+58AMau3h2sBJbmVhkc4gW+2b2r010q67f4uJE
-BoZyB+cmraisCTXvHKNw8Jc97GlS9L5soe6vlTUh50RlVt24
-
-					    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://gitlab-dev.in2p3.fr/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://gitlab-dev.in2p3.fr/Shibboleth.sso/SAML/POST" index="5"/>
-    <AttributeConsumingService index="0">
-      <ServiceName xml:lang="fr">IN2P3 - Gitlab dev</ServiceName>
-      <ServiceName xml:lang="en">IN2P3 - Gitlab dev</ServiceName>
-      <ServiceDescription xml:lang="fr">Hébergement git collaboratif à l'usage des personnels IN2P3 et de leurs collaborateurs (instance de test).</ServiceDescription>
-      <ServiceDescription xml:lang="en">Git collaborative hosting intended for IN2P3 staff and their associates (test instance).</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="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="cn" Name="urn:oid:2.5.4.3" 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"/>
-    </AttributeConsumingService>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">CNRS</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">CNRS</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <EmailAddress>webmaster@in2p3.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/gitlab.in2p3.fr-sp.xml b/swamid-interfederations-2.0/gitlab.in2p3.fr-sp.xml
deleted file mode 100644
index 5ce093c0..00000000
--- a/swamid-interfederations-2.0/gitlab.in2p3.fr-sp.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://gitlab.in2p3.fr/sp">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2014-10-07T17:38:15Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</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: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">IN2P3 - Gitlab</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Git collaborative hosting intended for IN2P3 staff and their associates.</mdui:Description>
-        <mdui:DisplayName xml:lang="fr">IN2P3 - Gitlab</mdui:DisplayName>
-        <mdui:Description xml:lang="fr">Hébergement git collaboratif à l'usage des personnels IN2P3 et de leurs collaborateurs.</mdui:Description>
-        <mdui:PrivacyStatementURL xml:lang="en">https://gitlab.in2p3.fr/about/privacy.html</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDEDCCAfigAwIBAgIJAN4P422/DAqiMA0GCSqGSIb3DQEBBQUAMBoxGDAWBgNV
-BAMTD2dpdGxhYi5pbjJwMy5mcjAeFw0xNDEwMTcwOTAyMjZaFw0yNDEwMTQwOTAy
-MjZaMBoxGDAWBgNVBAMTD2dpdGxhYi5pbjJwMy5mcjCCASIwDQYJKoZIhvcNAQEB
-BQADggEPADCCAQoCggEBALc/8+ereTIUyTcBF7sxZGfRdkl2qGOav3hWPPkrRQd6
-wVsgTFS1IrjSAM+v8SUZXCQmEuCiK11RR4hiGo7jt/mHcorD0I5N/b8PHsYLiBVX
-+rw29uP31ufcvKRKgga0KzYFOjer090e0YNt/h2ybPDJWOCSOsOmfYSgiWuVAq2X
-BnEyswPm9t/TvxQLH+UEFwweyNqVi59XxFICfIBqCJ7O+NfEI+x8uNfr++sjkYVJ
-YybukhEftB8pUDC4iBT+S31YT8vO+u1WMakuETm4N2t6Vi1oCzdTwExfDFeT9ptH
-ZbEkyQ6jK+kVmxYx3jeWZAPlT4yTfLDqEyoJ2d1J1skCAwEAAaNZMFcwNgYDVR0R
-BC8wLYIPZ2l0bGFiLmluMnAzLmZyhhpodHRwczovL2dpdGxhYi5pbjJwMy5mci9z
-cDAdBgNVHQ4EFgQUubCjI0lAVt2nFgU1JGBhOPkiAr8wDQYJKoZIhvcNAQEFBQAD
-ggEBAKzgpHdu8MHO6AmnA6fgbXWLXj+CIcLRGj9yzsyJanRkH1PLetl8QHqcFFDI
-23CYC6DctR6BsjqBW2vFD2sXOqznbp7/yEtkGGjNbFyPrUf9HsDYbUwXPeSF2dbF
-ytVhSgqHurk+LzuoWQtr5ZaidBiv4+G8RtwvMhxM1jvwSng6waF1IpEemDzAubAL
-egooHKMFutA/QLDwwxnNkVFYY0smKOyPGnpTqe2UMDi7k3UB4LqhckWHqZZdBKA7
-nLSPF5+mIbnSL49lmtebY1RDsJOGi17cgKdExkh5+GLBm+A7FWj+uIEE5Rw9tFqW
-iFJVpavS2JG8mIKKAznQiZvqphE=
-
-					    </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>
-					      MIIDEDCCAfigAwIBAgIJAN4P422/DAqiMA0GCSqGSIb3DQEBBQUAMBoxGDAWBgNV
-BAMTD2dpdGxhYi5pbjJwMy5mcjAeFw0xNDEwMTcwOTAyMjZaFw0yNDEwMTQwOTAy
-MjZaMBoxGDAWBgNVBAMTD2dpdGxhYi5pbjJwMy5mcjCCASIwDQYJKoZIhvcNAQEB
-BQADggEPADCCAQoCggEBALc/8+ereTIUyTcBF7sxZGfRdkl2qGOav3hWPPkrRQd6
-wVsgTFS1IrjSAM+v8SUZXCQmEuCiK11RR4hiGo7jt/mHcorD0I5N/b8PHsYLiBVX
-+rw29uP31ufcvKRKgga0KzYFOjer090e0YNt/h2ybPDJWOCSOsOmfYSgiWuVAq2X
-BnEyswPm9t/TvxQLH+UEFwweyNqVi59XxFICfIBqCJ7O+NfEI+x8uNfr++sjkYVJ
-YybukhEftB8pUDC4iBT+S31YT8vO+u1WMakuETm4N2t6Vi1oCzdTwExfDFeT9ptH
-ZbEkyQ6jK+kVmxYx3jeWZAPlT4yTfLDqEyoJ2d1J1skCAwEAAaNZMFcwNgYDVR0R
-BC8wLYIPZ2l0bGFiLmluMnAzLmZyhhpodHRwczovL2dpdGxhYi5pbjJwMy5mci9z
-cDAdBgNVHQ4EFgQUubCjI0lAVt2nFgU1JGBhOPkiAr8wDQYJKoZIhvcNAQEFBQAD
-ggEBAKzgpHdu8MHO6AmnA6fgbXWLXj+CIcLRGj9yzsyJanRkH1PLetl8QHqcFFDI
-23CYC6DctR6BsjqBW2vFD2sXOqznbp7/yEtkGGjNbFyPrUf9HsDYbUwXPeSF2dbF
-ytVhSgqHurk+LzuoWQtr5ZaidBiv4+G8RtwvMhxM1jvwSng6waF1IpEemDzAubAL
-egooHKMFutA/QLDwwxnNkVFYY0smKOyPGnpTqe2UMDi7k3UB4LqhckWHqZZdBKA7
-nLSPF5+mIbnSL49lmtebY1RDsJOGi17cgKdExkh5+GLBm+A7FWj+uIEE5Rw9tFqW
-iFJVpavS2JG8mIKKAznQiZvqphE=
-
-					    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://gitlab.in2p3.fr/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://gitlab.in2p3.fr/Shibboleth.sso/SAML/POST" index="5"/>
-    <AttributeConsumingService index="0">
-      <ServiceName xml:lang="fr">IN2P3 - Gitlab</ServiceName>
-      <ServiceName xml:lang="en">IN2P3 - Gitlab</ServiceName>
-      <ServiceDescription xml:lang="fr">Hébergement git collaboratif à l'usage des personnels IN2P3 et de leurs collaborateurs.</ServiceDescription>
-      <ServiceDescription xml:lang="en">Git collaborative hosting intended for IN2P3 staff and their associates.</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="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="uid" Name="urn:oid:0.9.2342.19200300.100.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-    </AttributeConsumingService>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">CNRS</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">CNRS</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <EmailAddress>webmaster@in2p3.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/gitlab.in2p3.fr.xml b/swamid-interfederations-2.0/gitlab.in2p3.fr.xml
deleted file mode 100644
index 5ce093c0..00000000
--- a/swamid-interfederations-2.0/gitlab.in2p3.fr.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://gitlab.in2p3.fr/sp">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2014-10-07T17:38:15Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</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: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">IN2P3 - Gitlab</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Git collaborative hosting intended for IN2P3 staff and their associates.</mdui:Description>
-        <mdui:DisplayName xml:lang="fr">IN2P3 - Gitlab</mdui:DisplayName>
-        <mdui:Description xml:lang="fr">Hébergement git collaboratif à l'usage des personnels IN2P3 et de leurs collaborateurs.</mdui:Description>
-        <mdui:PrivacyStatementURL xml:lang="en">https://gitlab.in2p3.fr/about/privacy.html</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDEDCCAfigAwIBAgIJAN4P422/DAqiMA0GCSqGSIb3DQEBBQUAMBoxGDAWBgNV
-BAMTD2dpdGxhYi5pbjJwMy5mcjAeFw0xNDEwMTcwOTAyMjZaFw0yNDEwMTQwOTAy
-MjZaMBoxGDAWBgNVBAMTD2dpdGxhYi5pbjJwMy5mcjCCASIwDQYJKoZIhvcNAQEB
-BQADggEPADCCAQoCggEBALc/8+ereTIUyTcBF7sxZGfRdkl2qGOav3hWPPkrRQd6
-wVsgTFS1IrjSAM+v8SUZXCQmEuCiK11RR4hiGo7jt/mHcorD0I5N/b8PHsYLiBVX
-+rw29uP31ufcvKRKgga0KzYFOjer090e0YNt/h2ybPDJWOCSOsOmfYSgiWuVAq2X
-BnEyswPm9t/TvxQLH+UEFwweyNqVi59XxFICfIBqCJ7O+NfEI+x8uNfr++sjkYVJ
-YybukhEftB8pUDC4iBT+S31YT8vO+u1WMakuETm4N2t6Vi1oCzdTwExfDFeT9ptH
-ZbEkyQ6jK+kVmxYx3jeWZAPlT4yTfLDqEyoJ2d1J1skCAwEAAaNZMFcwNgYDVR0R
-BC8wLYIPZ2l0bGFiLmluMnAzLmZyhhpodHRwczovL2dpdGxhYi5pbjJwMy5mci9z
-cDAdBgNVHQ4EFgQUubCjI0lAVt2nFgU1JGBhOPkiAr8wDQYJKoZIhvcNAQEFBQAD
-ggEBAKzgpHdu8MHO6AmnA6fgbXWLXj+CIcLRGj9yzsyJanRkH1PLetl8QHqcFFDI
-23CYC6DctR6BsjqBW2vFD2sXOqznbp7/yEtkGGjNbFyPrUf9HsDYbUwXPeSF2dbF
-ytVhSgqHurk+LzuoWQtr5ZaidBiv4+G8RtwvMhxM1jvwSng6waF1IpEemDzAubAL
-egooHKMFutA/QLDwwxnNkVFYY0smKOyPGnpTqe2UMDi7k3UB4LqhckWHqZZdBKA7
-nLSPF5+mIbnSL49lmtebY1RDsJOGi17cgKdExkh5+GLBm+A7FWj+uIEE5Rw9tFqW
-iFJVpavS2JG8mIKKAznQiZvqphE=
-
-					    </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>
-					      MIIDEDCCAfigAwIBAgIJAN4P422/DAqiMA0GCSqGSIb3DQEBBQUAMBoxGDAWBgNV
-BAMTD2dpdGxhYi5pbjJwMy5mcjAeFw0xNDEwMTcwOTAyMjZaFw0yNDEwMTQwOTAy
-MjZaMBoxGDAWBgNVBAMTD2dpdGxhYi5pbjJwMy5mcjCCASIwDQYJKoZIhvcNAQEB
-BQADggEPADCCAQoCggEBALc/8+ereTIUyTcBF7sxZGfRdkl2qGOav3hWPPkrRQd6
-wVsgTFS1IrjSAM+v8SUZXCQmEuCiK11RR4hiGo7jt/mHcorD0I5N/b8PHsYLiBVX
-+rw29uP31ufcvKRKgga0KzYFOjer090e0YNt/h2ybPDJWOCSOsOmfYSgiWuVAq2X
-BnEyswPm9t/TvxQLH+UEFwweyNqVi59XxFICfIBqCJ7O+NfEI+x8uNfr++sjkYVJ
-YybukhEftB8pUDC4iBT+S31YT8vO+u1WMakuETm4N2t6Vi1oCzdTwExfDFeT9ptH
-ZbEkyQ6jK+kVmxYx3jeWZAPlT4yTfLDqEyoJ2d1J1skCAwEAAaNZMFcwNgYDVR0R
-BC8wLYIPZ2l0bGFiLmluMnAzLmZyhhpodHRwczovL2dpdGxhYi5pbjJwMy5mci9z
-cDAdBgNVHQ4EFgQUubCjI0lAVt2nFgU1JGBhOPkiAr8wDQYJKoZIhvcNAQEFBQAD
-ggEBAKzgpHdu8MHO6AmnA6fgbXWLXj+CIcLRGj9yzsyJanRkH1PLetl8QHqcFFDI
-23CYC6DctR6BsjqBW2vFD2sXOqznbp7/yEtkGGjNbFyPrUf9HsDYbUwXPeSF2dbF
-ytVhSgqHurk+LzuoWQtr5ZaidBiv4+G8RtwvMhxM1jvwSng6waF1IpEemDzAubAL
-egooHKMFutA/QLDwwxnNkVFYY0smKOyPGnpTqe2UMDi7k3UB4LqhckWHqZZdBKA7
-nLSPF5+mIbnSL49lmtebY1RDsJOGi17cgKdExkh5+GLBm+A7FWj+uIEE5Rw9tFqW
-iFJVpavS2JG8mIKKAznQiZvqphE=
-
-					    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://gitlab.in2p3.fr/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://gitlab.in2p3.fr/Shibboleth.sso/SAML/POST" index="5"/>
-    <AttributeConsumingService index="0">
-      <ServiceName xml:lang="fr">IN2P3 - Gitlab</ServiceName>
-      <ServiceName xml:lang="en">IN2P3 - Gitlab</ServiceName>
-      <ServiceDescription xml:lang="fr">Hébergement git collaboratif à l'usage des personnels IN2P3 et de leurs collaborateurs.</ServiceDescription>
-      <ServiceDescription xml:lang="en">Git collaborative hosting intended for IN2P3 staff and their associates.</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="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="uid" Name="urn:oid:0.9.2342.19200300.100.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-    </AttributeConsumingService>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">CNRS</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">CNRS</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <EmailAddress>webmaster@in2p3.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/gn-vho.grnet.gr-idp-shibboleth.xml b/swamid-interfederations-2.0/gn-vho.grnet.gr-idp-shibboleth.xml
deleted file mode 100644
index 7f47d056..00000000
--- a/swamid-interfederations-2.0/gn-vho.grnet.gr-idp-shibboleth.xml
+++ /dev/null
@@ -1,106 +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: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">GRNET Virtual Home Organization (VHO) for GÉANT</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="el">Εικονικός Οικείος Φορέας (VHO) του ΕΔΕΤ για το GÉANT</mdui:DisplayName>
-        <mdui:Description xml:lang="en">GRNET Virtual Home Organization (VHO) for GÉANT</mdui:Description>
-        <mdui:Description xml:lang="el">Εικονικός Οικείος Φορέας (VHO) του ΕΔΕΤ για το GÉANT</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">GRNET Virtual Home Organization (VHO) for GÉANT</OrganizationName>
-    <OrganizationName xml:lang="el">Εικονικός Οικείος Φορέας (VHO) του ΕΔΕΤ για το GÉANT</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">GRNET Virtual Home Organization (VHO) for GÉANT</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="el">Εικονικός Οικείος Φορέας (VHO) του ΕΔΕΤ για το GÉANT</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">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>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/gn-vho.grnet.gr.xml b/swamid-interfederations-2.0/gn-vho.grnet.gr.xml
deleted file mode 100644
index 7f47d056..00000000
--- a/swamid-interfederations-2.0/gn-vho.grnet.gr.xml
+++ /dev/null
@@ -1,106 +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: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">GRNET Virtual Home Organization (VHO) for GÉANT</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="el">Εικονικός Οικείος Φορέας (VHO) του ΕΔΕΤ για το GÉANT</mdui:DisplayName>
-        <mdui:Description xml:lang="en">GRNET Virtual Home Organization (VHO) for GÉANT</mdui:Description>
-        <mdui:Description xml:lang="el">Εικονικός Οικείος Φορέας (VHO) του ΕΔΕΤ για το GÉANT</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">GRNET Virtual Home Organization (VHO) for GÉANT</OrganizationName>
-    <OrganizationName xml:lang="el">Εικονικός Οικείος Φορέας (VHO) του ΕΔΕΤ για το GÉANT</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">GRNET Virtual Home Organization (VHO) for GÉANT</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="el">Εικονικός Οικείος Φορέας (VHO) του ΕΔΕΤ για το GÉANT</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">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>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/groupes.france-bioinformatique.fr-sympa.xml b/swamid-interfederations-2.0/groupes.france-bioinformatique.fr-sympa.xml
deleted file mode 100644
index 8c15440d..00000000
--- a/swamid-interfederations-2.0/groupes.france-bioinformatique.fr-sympa.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://groupes.france-bioinformatique.fr/sympa">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2014-10-20T12:00:53Z">
-      <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">Group service for the French Institute of BioInformatics</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Group service for the French Institute of BioInformatics :
--mailing lists
--wikis
--surveys
--meeting scheduler</mdui:Description>
-        <mdui:DisplayName xml:lang="fr">Service de groupes de l'Institut Français de BioInformatique</mdui:DisplayName>
-        <mdui:Description xml:lang="fr">Service de groupes de l'Institut Français de BioInformatique : 
--listes de diffusions
--wikis
--sondages
--planification de réunion</mdui:Description>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIEKjCCAxKgAwIBAgIJAI2rvCn3oTieMA0GCSqGSIb3DQEBBQUAMGsxCzAJBgNV
-BAYTAkZSMTAwLgYDVQQKDCdJbnN0aXR1dCBGcmFuw4PCp2FpcyBkZSBCaW9pbmZv
-cm1hdGlxdWUxKjAoBgNVBAMTIWdyb3VwZXMuZnJhbmNlLWJpb2luZm9ybWF0aXF1
-ZS5mcjAeFw0xNDEwMjAwOTEyMzdaFw0zNDEwMTUwOTEyMzdaMGsxCzAJBgNVBAYT
-AkZSMTAwLgYDVQQKDCdJbnN0aXR1dCBGcmFuw4PCp2FpcyBkZSBCaW9pbmZvcm1h
-dGlxdWUxKjAoBgNVBAMTIWdyb3VwZXMuZnJhbmNlLWJpb2luZm9ybWF0aXF1ZS5m
-cjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANHjwFnlwrpydxosra2C
-A5wxUhpAShLUknop3e1B4K+x2aIXvbN6sChUkOLV/JKhhH52BMBZwI4qr/tv6ego
-BU6pnhYhWO8QtKKXyvox5NRbgeCX3CI8pQ5PJtWc++pOjq/10v4koBfbJcogsMGc
-3B/khJK4tmKHFvcEngRiwhaHVL4MPO65rYyjisg5Tr6EuDGW1xGD5ETHe1aliLyQ
-uIqN3Pirmqb8h32OlPkqQ/A2jzkYx9sTX2cEgSFFGL3Docr2bB7ie+GuiDgcnm5h
-YyQ5Ej1Of1jjOGF4UcSUKCLphukAbQyswRLqzYNr8No4JzY6ZcL/tSS32wfNG6BV
-7ZECAwEAAaOB0DCBzTAdBgNVHQ4EFgQUGAA0QcYlCVagyA/JmGcP9vm336EwgZ0G
-A1UdIwSBlTCBkoAUGAA0QcYlCVagyA/JmGcP9vm336Ghb6RtMGsxCzAJBgNVBAYT
-AkZSMTAwLgYDVQQKDCdJbnN0aXR1dCBGcmFuw4PCp2FpcyBkZSBCaW9pbmZvcm1h
-dGlxdWUxKjAoBgNVBAMTIWdyb3VwZXMuZnJhbmNlLWJpb2luZm9ybWF0aXF1ZS5m
-coIJAI2rvCn3oTieMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBALrL
-S1BIC0tCkQx5G+ZnI9BGlHMeeqQqd9faGOFPtcyrrl6sUwMj8b1aNrJMICPxnwPG
-3Z9qjLOfihRz96pxhaxI7HYOuv987xRqD2l/ubkz/NF3l8A+k+hNSwILhwR0vjTo
-HSfX+jCW8FBrLlsgSkCv2xxE6Liwl+VcEczBYfMbBffD0kXPDo4KdY/zxs5dHYDI
-bLYBU/O/n+4v/kcj1VwwHX2/Lc40lLAQUe6cN+red1ELmJ7J6afTr5ru6vwG4P0g
-oQoGFWdszAsq/gim7srIxz4+yb9/vCqwQBMxNZEi8522QbhrrC24R+rAeTFjbF1H
-SoGk3gs42M20S05utsA=
-
-					    </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>
-					      MIIEKjCCAxKgAwIBAgIJAI2rvCn3oTieMA0GCSqGSIb3DQEBBQUAMGsxCzAJBgNV
-BAYTAkZSMTAwLgYDVQQKDCdJbnN0aXR1dCBGcmFuw4PCp2FpcyBkZSBCaW9pbmZv
-cm1hdGlxdWUxKjAoBgNVBAMTIWdyb3VwZXMuZnJhbmNlLWJpb2luZm9ybWF0aXF1
-ZS5mcjAeFw0xNDEwMjAwOTEyMzdaFw0zNDEwMTUwOTEyMzdaMGsxCzAJBgNVBAYT
-AkZSMTAwLgYDVQQKDCdJbnN0aXR1dCBGcmFuw4PCp2FpcyBkZSBCaW9pbmZvcm1h
-dGlxdWUxKjAoBgNVBAMTIWdyb3VwZXMuZnJhbmNlLWJpb2luZm9ybWF0aXF1ZS5m
-cjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANHjwFnlwrpydxosra2C
-A5wxUhpAShLUknop3e1B4K+x2aIXvbN6sChUkOLV/JKhhH52BMBZwI4qr/tv6ego
-BU6pnhYhWO8QtKKXyvox5NRbgeCX3CI8pQ5PJtWc++pOjq/10v4koBfbJcogsMGc
-3B/khJK4tmKHFvcEngRiwhaHVL4MPO65rYyjisg5Tr6EuDGW1xGD5ETHe1aliLyQ
-uIqN3Pirmqb8h32OlPkqQ/A2jzkYx9sTX2cEgSFFGL3Docr2bB7ie+GuiDgcnm5h
-YyQ5Ej1Of1jjOGF4UcSUKCLphukAbQyswRLqzYNr8No4JzY6ZcL/tSS32wfNG6BV
-7ZECAwEAAaOB0DCBzTAdBgNVHQ4EFgQUGAA0QcYlCVagyA/JmGcP9vm336EwgZ0G
-A1UdIwSBlTCBkoAUGAA0QcYlCVagyA/JmGcP9vm336Ghb6RtMGsxCzAJBgNVBAYT
-AkZSMTAwLgYDVQQKDCdJbnN0aXR1dCBGcmFuw4PCp2FpcyBkZSBCaW9pbmZvcm1h
-dGlxdWUxKjAoBgNVBAMTIWdyb3VwZXMuZnJhbmNlLWJpb2luZm9ybWF0aXF1ZS5m
-coIJAI2rvCn3oTieMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBALrL
-S1BIC0tCkQx5G+ZnI9BGlHMeeqQqd9faGOFPtcyrrl6sUwMj8b1aNrJMICPxnwPG
-3Z9qjLOfihRz96pxhaxI7HYOuv987xRqD2l/ubkz/NF3l8A+k+hNSwILhwR0vjTo
-HSfX+jCW8FBrLlsgSkCv2xxE6Liwl+VcEczBYfMbBffD0kXPDo4KdY/zxs5dHYDI
-bLYBU/O/n+4v/kcj1VwwHX2/Lc40lLAQUe6cN+red1ELmJ7J6afTr5ru6vwG4P0g
-oQoGFWdszAsq/gim7srIxz4+yb9/vCqwQBMxNZEi8522QbhrrC24R+rAeTFjbF1H
-SoGk3gs42M20S05utsA=
-
-					    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://groupes.france-bioinformatique.fr/sympa/sso_login/federation_cru/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://groupes.france-bioinformatique.fr/sympa/sso_login/federation_cru/Shibboleth.sso/SAML/POST" index="5"/>
-    <AttributeConsumingService index="0">
-      <ServiceName xml:lang="fr">Service de groupes de l'Institut Français de BioInformatique</ServiceName>
-      <ServiceName xml:lang="en">Group service for the French Institute of BioInformatics</ServiceName>
-      <ServiceDescription xml:lang="fr">Service de groupes de l'Institut Français de BioInformatique : 
--listes de diffusions
--wikis
--sondages
--planification de réunion</ServiceDescription>
-      <ServiceDescription xml:lang="en">Group service for the French Institute of BioInformatics :
--mailing lists
--wikis
--surveys
--meeting scheduler</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"/>
-    </AttributeConsumingService>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">RENATER</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">RENATER</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.renater.fr</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <EmailAddress>support@renater.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/groupes.france-bioinformatique.fr.xml b/swamid-interfederations-2.0/groupes.france-bioinformatique.fr.xml
deleted file mode 100644
index 8c15440d..00000000
--- a/swamid-interfederations-2.0/groupes.france-bioinformatique.fr.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://groupes.france-bioinformatique.fr/sympa">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2014-10-20T12:00:53Z">
-      <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">Group service for the French Institute of BioInformatics</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Group service for the French Institute of BioInformatics :
--mailing lists
--wikis
--surveys
--meeting scheduler</mdui:Description>
-        <mdui:DisplayName xml:lang="fr">Service de groupes de l'Institut Français de BioInformatique</mdui:DisplayName>
-        <mdui:Description xml:lang="fr">Service de groupes de l'Institut Français de BioInformatique : 
--listes de diffusions
--wikis
--sondages
--planification de réunion</mdui:Description>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIEKjCCAxKgAwIBAgIJAI2rvCn3oTieMA0GCSqGSIb3DQEBBQUAMGsxCzAJBgNV
-BAYTAkZSMTAwLgYDVQQKDCdJbnN0aXR1dCBGcmFuw4PCp2FpcyBkZSBCaW9pbmZv
-cm1hdGlxdWUxKjAoBgNVBAMTIWdyb3VwZXMuZnJhbmNlLWJpb2luZm9ybWF0aXF1
-ZS5mcjAeFw0xNDEwMjAwOTEyMzdaFw0zNDEwMTUwOTEyMzdaMGsxCzAJBgNVBAYT
-AkZSMTAwLgYDVQQKDCdJbnN0aXR1dCBGcmFuw4PCp2FpcyBkZSBCaW9pbmZvcm1h
-dGlxdWUxKjAoBgNVBAMTIWdyb3VwZXMuZnJhbmNlLWJpb2luZm9ybWF0aXF1ZS5m
-cjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANHjwFnlwrpydxosra2C
-A5wxUhpAShLUknop3e1B4K+x2aIXvbN6sChUkOLV/JKhhH52BMBZwI4qr/tv6ego
-BU6pnhYhWO8QtKKXyvox5NRbgeCX3CI8pQ5PJtWc++pOjq/10v4koBfbJcogsMGc
-3B/khJK4tmKHFvcEngRiwhaHVL4MPO65rYyjisg5Tr6EuDGW1xGD5ETHe1aliLyQ
-uIqN3Pirmqb8h32OlPkqQ/A2jzkYx9sTX2cEgSFFGL3Docr2bB7ie+GuiDgcnm5h
-YyQ5Ej1Of1jjOGF4UcSUKCLphukAbQyswRLqzYNr8No4JzY6ZcL/tSS32wfNG6BV
-7ZECAwEAAaOB0DCBzTAdBgNVHQ4EFgQUGAA0QcYlCVagyA/JmGcP9vm336EwgZ0G
-A1UdIwSBlTCBkoAUGAA0QcYlCVagyA/JmGcP9vm336Ghb6RtMGsxCzAJBgNVBAYT
-AkZSMTAwLgYDVQQKDCdJbnN0aXR1dCBGcmFuw4PCp2FpcyBkZSBCaW9pbmZvcm1h
-dGlxdWUxKjAoBgNVBAMTIWdyb3VwZXMuZnJhbmNlLWJpb2luZm9ybWF0aXF1ZS5m
-coIJAI2rvCn3oTieMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBALrL
-S1BIC0tCkQx5G+ZnI9BGlHMeeqQqd9faGOFPtcyrrl6sUwMj8b1aNrJMICPxnwPG
-3Z9qjLOfihRz96pxhaxI7HYOuv987xRqD2l/ubkz/NF3l8A+k+hNSwILhwR0vjTo
-HSfX+jCW8FBrLlsgSkCv2xxE6Liwl+VcEczBYfMbBffD0kXPDo4KdY/zxs5dHYDI
-bLYBU/O/n+4v/kcj1VwwHX2/Lc40lLAQUe6cN+red1ELmJ7J6afTr5ru6vwG4P0g
-oQoGFWdszAsq/gim7srIxz4+yb9/vCqwQBMxNZEi8522QbhrrC24R+rAeTFjbF1H
-SoGk3gs42M20S05utsA=
-
-					    </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>
-					      MIIEKjCCAxKgAwIBAgIJAI2rvCn3oTieMA0GCSqGSIb3DQEBBQUAMGsxCzAJBgNV
-BAYTAkZSMTAwLgYDVQQKDCdJbnN0aXR1dCBGcmFuw4PCp2FpcyBkZSBCaW9pbmZv
-cm1hdGlxdWUxKjAoBgNVBAMTIWdyb3VwZXMuZnJhbmNlLWJpb2luZm9ybWF0aXF1
-ZS5mcjAeFw0xNDEwMjAwOTEyMzdaFw0zNDEwMTUwOTEyMzdaMGsxCzAJBgNVBAYT
-AkZSMTAwLgYDVQQKDCdJbnN0aXR1dCBGcmFuw4PCp2FpcyBkZSBCaW9pbmZvcm1h
-dGlxdWUxKjAoBgNVBAMTIWdyb3VwZXMuZnJhbmNlLWJpb2luZm9ybWF0aXF1ZS5m
-cjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANHjwFnlwrpydxosra2C
-A5wxUhpAShLUknop3e1B4K+x2aIXvbN6sChUkOLV/JKhhH52BMBZwI4qr/tv6ego
-BU6pnhYhWO8QtKKXyvox5NRbgeCX3CI8pQ5PJtWc++pOjq/10v4koBfbJcogsMGc
-3B/khJK4tmKHFvcEngRiwhaHVL4MPO65rYyjisg5Tr6EuDGW1xGD5ETHe1aliLyQ
-uIqN3Pirmqb8h32OlPkqQ/A2jzkYx9sTX2cEgSFFGL3Docr2bB7ie+GuiDgcnm5h
-YyQ5Ej1Of1jjOGF4UcSUKCLphukAbQyswRLqzYNr8No4JzY6ZcL/tSS32wfNG6BV
-7ZECAwEAAaOB0DCBzTAdBgNVHQ4EFgQUGAA0QcYlCVagyA/JmGcP9vm336EwgZ0G
-A1UdIwSBlTCBkoAUGAA0QcYlCVagyA/JmGcP9vm336Ghb6RtMGsxCzAJBgNVBAYT
-AkZSMTAwLgYDVQQKDCdJbnN0aXR1dCBGcmFuw4PCp2FpcyBkZSBCaW9pbmZvcm1h
-dGlxdWUxKjAoBgNVBAMTIWdyb3VwZXMuZnJhbmNlLWJpb2luZm9ybWF0aXF1ZS5m
-coIJAI2rvCn3oTieMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBALrL
-S1BIC0tCkQx5G+ZnI9BGlHMeeqQqd9faGOFPtcyrrl6sUwMj8b1aNrJMICPxnwPG
-3Z9qjLOfihRz96pxhaxI7HYOuv987xRqD2l/ubkz/NF3l8A+k+hNSwILhwR0vjTo
-HSfX+jCW8FBrLlsgSkCv2xxE6Liwl+VcEczBYfMbBffD0kXPDo4KdY/zxs5dHYDI
-bLYBU/O/n+4v/kcj1VwwHX2/Lc40lLAQUe6cN+red1ELmJ7J6afTr5ru6vwG4P0g
-oQoGFWdszAsq/gim7srIxz4+yb9/vCqwQBMxNZEi8522QbhrrC24R+rAeTFjbF1H
-SoGk3gs42M20S05utsA=
-
-					    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://groupes.france-bioinformatique.fr/sympa/sso_login/federation_cru/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://groupes.france-bioinformatique.fr/sympa/sso_login/federation_cru/Shibboleth.sso/SAML/POST" index="5"/>
-    <AttributeConsumingService index="0">
-      <ServiceName xml:lang="fr">Service de groupes de l'Institut Français de BioInformatique</ServiceName>
-      <ServiceName xml:lang="en">Group service for the French Institute of BioInformatics</ServiceName>
-      <ServiceDescription xml:lang="fr">Service de groupes de l'Institut Français de BioInformatique : 
--listes de diffusions
--wikis
--sondages
--planification de réunion</ServiceDescription>
-      <ServiceDescription xml:lang="en">Group service for the French Institute of BioInformatics :
--mailing lists
--wikis
--surveys
--meeting scheduler</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"/>
-    </AttributeConsumingService>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">RENATER</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">RENATER</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.renater.fr</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <EmailAddress>support@renater.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/gteavirtual.org.xml b/swamid-interfederations-2.0/gteavirtual.org.xml
deleted file mode 100644
index 91b9b491..00000000
--- a/swamid-interfederations-2.0/gteavirtual.org.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://gteavirtual.org">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.rediris.es/" registrationInstant="2012-02-20T15:43:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.rediris.es/sir/edugain/SIR_MRPS.pdf</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIIFyjCCA7ICCQCkUnPQ/PtKmzANBgkqhkiG9w0BAQUFADCBpjELMAkGA1UEBhMCRVMxEjAQBgNVBAgMCUVzcGHDg8KxYTEPMA0GA1UEBwwGTWFsYWdhMSAwHgYDVQQKDBdVbml2ZXJzaWRhZCBkZSBNw4NhbGFnYTENMAsGA1UECwwER1RFQTEYMBYGA1UEAwwPZ3RlYXZpcnR1YWwub3JnMScwJQYJKoZIhvcNAQkBFhhkYW5pZWxjZWJyaWFuckBnbWFpbC5jb20wHhcNMTExMTE5MjMwNTAxWhcNMTYxMTE3MjMwNTAxWjCBpjELMAkGA1UEBhMCRVMxEjAQBgNVBAgMCUVzcGHDg8KxYTEPMA0GA1UEBwwGTWFsYWdhMSAwHgYDVQQKDBdVbml2ZXJzaWRhZCBkZSBNw4NhbGFnYTENMAsGA1UECwwER1RFQTEYMBYGA1UEAwwPZ3RlYXZpcnR1YWwub3JnMScwJQYJKoZIhvcNAQkBFhhkYW5pZWxjZWJyaWFuckBnbWFpbC5jb20wggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDFUagwJ9IvqMmMGKHFQ3XmAr6G7B0suWqbHPMWBfIlyu6cm0NWhH1JsiDxEhUxljmk+B4FZOWI9YcNo1YB1pO8wYJTeviqzrQDNjqURUOsyfYdQn3L2k4f9exQT25cmXhu0h8zybslGQDKWZZPH/S/jMpShPjIlrRx/ARrEbH/CgLHviS1oVKi/IkwZ55Gwd5/ikvUaQL+cmPsVPIzMrKgxGJk37RmFgRKYMvjqsMF8IKzOJRMxm342aJNP7Tka/C4p4E+nmFcqN5ak4rljqpjucjwGGNpKiZ4XZN/7ItpI2Lcj8tmW6UZx6/55r99OjwrmnkLd6bLWnHsavMnABkdp54st5uplhEfkSV9rP67k5MOpGSQFZGFyvSteMUc8atiZjaeZQ8YOugC8HMB/zIg7TGx5/pqHJjYNxYmHp0EkEmw8ahGOS0dsFWxzlHP36OvhSXQ5OQxj9iQLIF2j56RHYfedcJjkb5KbnBanfNVWgOZnPtmsYFy6d1hjWsnvLPd5B1Jt2F+zAsQlFIkJ9jJOWd7+QpeeUi8AC1XMTjHkDnlkEROvk5JQYYNG+CHY9brTH/vCmT7gLHF6pOEBdjtLhoK7G8oB2Flmq7vZUyFbRMSjBvBiBwZZLdMtn1Zj9tEWmWHgcYcVyPN4QeIcjJI63le4UP4RkJKgRZBbspEZwIDAQABMA0GCSqGSIb3DQEBBQUAA4ICAQCVOFINDie1oi7tXIXnvc43aZMxgjojUp0JCkVMpNsbF34X1C09FA5CiIngISYtP4FF7tbMjq08FnbjOUUEzYqhjAWKXCRipEOAED1todVlu14AL4P66HLWXUq5pahuYKwzSs+f7Km3d2Ttfv0GeYHfHEhIc4xOTiEEQ2J2zZpdJaDgRxRVTGIC4GAAh13EGd2DZQi87tK5dxQ4Lrrae/ko+7JxWmHY24emCRQNB97huD4IHMXDU9geiBf4PVwueI7/FSPAiyCanCc5GpZdZMW3JBegsfNi64lm5MjGLhp2pD3dKq33lG4IoDt4kT9ta6TDk/JLLxNIkAAliGMT8qPZlVQMTqkMchKz4NaUZTz0K6cobkSYpo5OLdfT4ukcN/rIup4/ha0kXX7sj7sgDuUV7EtLkUJyNIZOdjphaBRdxyPjXLrrmpaBCyWZxz4CZCu4xhsV8LJvFnfC5nb+r13WpZLN2Mdv74z8LPZ6hxtCaVVgcnlWaO1SslpagDVE2t0s0PpJWivf9+wssIOK5fRyagTAdzSk+nDI0vPxcgnMsim4FfXaragepZomc6jOCELFJFCZ/qdoCbdfndxiKFtyO5vsfnt0+f29C6NJc4GDRdzaKFKY14uXxaK/H6EEqfHKDGdDY8nOi
-							6jCaLPUFw5hY05y5AyqNgwDK26yXPJlcQ==</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>MIIFyjCCA7ICCQCkUnPQ/PtKmzANBgkqhkiG9w0BAQUFADCBpjELMAkGA1UEBhMCRVMxEjAQBgNVBAgMCUVzcGHDg8KxYTEPMA0GA1UEBwwGTWFsYWdhMSAwHgYDVQQKDBdVbml2ZXJzaWRhZCBkZSBNw4NhbGFnYTENMAsGA1UECwwER1RFQTEYMBYGA1UEAwwPZ3RlYXZpcnR1YWwub3JnMScwJQYJKoZIhvcNAQkBFhhkYW5pZWxjZWJyaWFuckBnbWFpbC5jb20wHhcNMTExMTE5MjMwNTAxWhcNMTYxMTE3MjMwNTAxWjCBpjELMAkGA1UEBhMCRVMxEjAQBgNVBAgMCUVzcGHDg8KxYTEPMA0GA1UEBwwGTWFsYWdhMSAwHgYDVQQKDBdVbml2ZXJzaWRhZCBkZSBNw4NhbGFnYTENMAsGA1UECwwER1RFQTEYMBYGA1UEAwwPZ3RlYXZpcnR1YWwub3JnMScwJQYJKoZIhvcNAQkBFhhkYW5pZWxjZWJyaWFuckBnbWFpbC5jb20wggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDFUagwJ9IvqMmMGKHFQ3XmAr6G7B0suWqbHPMWBfIlyu6cm0NWhH1JsiDxEhUxljmk+B4FZOWI9YcNo1YB1pO8wYJTeviqzrQDNjqURUOsyfYdQn3L2k4f9exQT25cmXhu0h8zybslGQDKWZZPH/S/jMpShPjIlrRx/ARrEbH/CgLHviS1oVKi/IkwZ55Gwd5/ikvUaQL+cmPsVPIzMrKgxGJk37RmFgRKYMvjqsMF8IKzOJRMxm342aJNP7Tka/C4p4E+nmFcqN5ak4rljqpjucjwGGNpKiZ4XZN/7ItpI2Lcj8tmW6UZx6/55r99OjwrmnkLd6bLWnHsavMnABkdp54st5uplhEfkSV9rP67k5MOpGSQFZGFyvSteMUc8atiZjaeZQ8YOugC8HMB/zIg7TGx5/pqHJjYNxYmHp0EkEmw8ahGOS0dsFWxzlHP36OvhSXQ5OQxj9iQLIF2j56RHYfedcJjkb5KbnBanfNVWgOZnPtmsYFy6d1hjWsnvLPd5B1Jt2F+zAsQlFIkJ9jJOWd7+QpeeUi8AC1XMTjHkDnlkEROvk5JQYYNG+CHY9brTH/vCmT7gLHF6pOEBdjtLhoK7G8oB2Flmq7vZUyFbRMSjBvBiBwZZLdMtn1Zj9tEWmWHgcYcVyPN4QeIcjJI63le4UP4RkJKgRZBbspEZwIDAQABMA0GCSqGSIb3DQEBBQUAA4ICAQCVOFINDie1oi7tXIXnvc43aZMxgjojUp0JCkVMpNsbF34X1C09FA5CiIngISYtP4FF7tbMjq08FnbjOUUEzYqhjAWKXCRipEOAED1todVlu14AL4P66HLWXUq5pahuYKwzSs+f7Km3d2Ttfv0GeYHfHEhIc4xOTiEEQ2J2zZpdJaDgRxRVTGIC4GAAh13EGd2DZQi87tK5dxQ4Lrrae/ko+7JxWmHY24emCRQNB97huD4IHMXDU9geiBf4PVwueI7/FSPAiyCanCc5GpZdZMW3JBegsfNi64lm5MjGLhp2pD3dKq33lG4IoDt4kT9ta6TDk/JLLxNIkAAliGMT8qPZlVQMTqkMchKz4NaUZTz0K6cobkSYpo5OLdfT4ukcN/rIup4/ha0kXX7sj7sgDuUV7EtLkUJyNIZOdjphaBRdxyPjXLrrmpaBCyWZxz4CZCu4xhsV8LJvFnfC5nb+r13WpZLN2Mdv74z8LPZ6hxtCaVVgcnlWaO1SslpagDVE2t0s0PpJWivf9+wssIOK5fRyagTAdzSk+nDI0vPxcgnMsim4FfXaragepZomc6jOCELFJFCZ/qdoCbdfndxiKFtyO5vsfnt0+f29C6NJc4GDRdzaKFKY14uXxaK/H6EEqfHKDGdDY8nOi
-							6jCaLPUFw5hY05y5AyqNgwDK26yXPJlcQ==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://gteavirtual.org/simplesaml/module.php/saml/sp/saml2-logout.php/default-sp"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://gteavirtual.org/simplesaml/module.php/saml/sp/saml2-acs.php/default-sp" index="0"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://gteavirtual.org/simplesaml/module.php/saml/sp/saml1-acs.php/default-sp" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://gteavirtual.org/simplesaml/module.php/saml/sp/saml2-acs.php/default-sp" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://gteavirtual.org/simplesaml/module.php/saml/sp/saml1-acs.php/default-sp/artifact" index="3"/>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">GTEA - University of Malaga</md:OrganizationName>
-    <md:OrganizationName xml:lang="es">GTEA - Universidad de Málaga</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">GTEA tools</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="es">Herramientas GTEA</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://gtea.uma.es/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="es">http://gtea.uma.es/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Daniel</md:GivenName>
-    <md:SurName>Cebrián Robles</md:SurName>
-    <md:EmailAddress>danielcebrianr@gmail.com</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/gw-astronomy.org-lists-shibboleth-sp.xml b/swamid-interfederations-2.0/gw-astronomy.org-lists-shibboleth-sp.xml
deleted file mode 100644
index 05dfd141..00000000
--- a/swamid-interfederations-2.0/gw-astronomy.org-lists-shibboleth-sp.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://gw-astronomy.org/lists/shibboleth-sp">
-  <Extensions xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi">
-    <mdrpi:RegistrationInfo registrationAuthority="https://incommon.org"/>
-    <mdattr:EntityAttributes>
-      <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://refeds.org/category/research-and-scholarship</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </Extensions>
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata">
-      <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://gw-astronomy.org/lists/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Gravitational Wave Astronomy Community List Server</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Gravitational Wave Astronomy Community list server used to support collaboration across astronomy and astrophysics projects.</mdui:Description>
-        <mdui:InformationURL xml:lang="en">https://gw-astronomy.org/lists/sp-info.html</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://gw-astronomy.org/lists/privacy.html</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIEWDCCA0CgAwIBAgIBPjANBgkqhkiG9w0BAQUFADCBhzETMBEGCgmSJomT8ixk
-ARkWA29yZzEUMBIGCgmSJomT8ixkARkWBGxpZ28xDTALBgNVBAoTBExJR08xIDAe
-BgNVBAsTF0NlcnRpZmljYXRlIEF1dGhvcml0aWVzMRUwEwYDVQQLEwxXZWIgU2Vy
-dmljZXMxEjAQBgNVBAMTCUxJR08gQ0EgMTAeFw0xMTA0MjkxNzI0MTJaFw0yMTA0
-MjgxNzI0MTJaMGoxEzARBgoJkiaJk/IsZAEZFgNvcmcxFDASBgoJkiaJk/IsZAEZ
-FgRsaWdvMQ0wCwYDVQQKEwRMSUdPMRUwEwYDVQQLEwxXZWIgU2VydmljZXMxFzAV
-BgNVBAMTDmd1ZXN0LmxpZ28ub3JnMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
-CgKCAQEApxrDaMIRCnagFhhjD4rY47JBOHKjA4IS6EG1MvqG6kMXm73ZdYRhRraQ
-onVmFMUPPlkR5zTlok+qvb+Iy58s6PqguQe0Tz3eEnfRlVqLaXniKNGxkef5pXFY
-hndYXzkfeoclycdYZGwu12ANoG5wjADhYcWEuiyJKprfWXF/msa65rkczuMd5WFw
-lde6hnpZTXa6FaeYb1Hi8Me36pHFCU3DfhARdup7DQ4t3QDEttQY1mn/pnY6vd2o
-oa/jmL1iHkJbTDT6+EWhk/3XdrC1tfo1VKQ+B4RebTyzRY8Wsgn3CAyAz9K5nA7w
-aYBOYhK26Z6envlE+vXviDI89J/C7QIDAQABo4HqMIHnMAwGA1UdEwEB/wQCMAAw
-DgYDVR0PAQH/BAQDAgSwMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAZ
-BgNVHSAEEjAQMA4GDCsGAQQBgfpGAgECATA5BgNVHR8EMjAwMC6gLKAqhihodHRw
-Oi8vY2EubGlnby5vcmcvNTQxNDA0YzMvNTQxNDA0YzMuY3JsMB8GA1UdIwQYMBaA
-FFJu3Xuqb4VcCCLTl5+tfyNWHmrRMDEGA1UdEQQqMCiCDmd1ZXN0LmxpZ28ub3Jn
-gRZzY290dC5rb3JhbmRhQGxpZ28ub3JnMA0GCSqGSIb3DQEBBQUAA4IBAQBXTyxj
-WEiIQ4kG8I9ujY9AssDMi63g9m4AT7uAm6mbNJVRaYkYVy7lnRi227fBjIXr8rku
-gfUhzwRULi9OUuY5eO713iB/urMn3mysch9R6heciYGzccnn5nN3gWrUN3kZ0AWd
-XaIE5G8rZOACTDp7SCVyNH1eZNkk6apK9LJgblo44XppU8gZk1OIzBzeknCuZhGz
-6Lnu58KItVKI+8w7FepUsXIdF6pHRLevhzW7d61QZ5iW8o2qW0TG24RDY4JJE45m
-y6qIv7HErgRcZZrxupRI6NfHLBxJx22n8rBD7gmVoCLXkAftIKQZ8pBKF4c74ErF
-xWUYS9G3JfMMW9UY
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AssertionConsumerService xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://gw-astronomy.org/lists/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://gw-astronomy.org/lists/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://gw-astronomy.org/lists/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://gw-astronomy.org/lists/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AttributeConsumingService index="1">
-      <ServiceName xml:lang="en">Gravitational Wave Astronomy Community List Server</ServiceName>
-      <ServiceDescription xml:lang="en">Gravitational Wave Astronomy Community list server used to support collaboration across astronomy and astrophysics projects.</ServiceDescription>
-      <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"/>
-    </AttributeConsumingService>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Wisconsin-Milwaukee</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Wisconsin-Milwaukee</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.uwm.edu/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Scott Koranda</GivenName>
-    <EmailAddress>scott.koranda@ligo.org</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="administrative">
-    <GivenName>Warren Anderson</GivenName>
-    <EmailAddress>warren.anderson@ligo.org</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="administrative">
-    <GivenName>Chris Spadanuda</GivenName>
-    <EmailAddress>cspada@uwm.edu</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="support">
-    <GivenName>UWM CGCA Help</GivenName>
-    <EmailAddress>uwm-help@gravity.phys.uwm.edu</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/gw-astronomy.org-shibboleth-sp.xml b/swamid-interfederations-2.0/gw-astronomy.org-shibboleth-sp.xml
deleted file mode 100644
index e4b21227..00000000
--- a/swamid-interfederations-2.0/gw-astronomy.org-shibboleth-sp.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://gw-astronomy.org/shibboleth-sp">
-  <Extensions xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi">
-    <mdrpi:RegistrationInfo registrationAuthority="https://incommon.org"/>
-    <mdattr:EntityAttributes>
-      <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://refeds.org/category/research-and-scholarship</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </Extensions>
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata">
-      <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://gw-astronomy.org/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Gravitational Wave Astronomy Community Registry</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Gravitational Wave Astronomy Community Registry used to support collaboration across astronomy and astrophysics projects.</mdui:Description>
-        <mdui:InformationURL xml:lang="en">https://gw-astronomy.org/registry/pages/public/sp_info</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://gw-astronomy.org/registry/pages/public/privacy_info</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIEWDCCA0CgAwIBAgIBPjANBgkqhkiG9w0BAQUFADCBhzETMBEGCgmSJomT8ixk
-ARkWA29yZzEUMBIGCgmSJomT8ixkARkWBGxpZ28xDTALBgNVBAoTBExJR08xIDAe
-BgNVBAsTF0NlcnRpZmljYXRlIEF1dGhvcml0aWVzMRUwEwYDVQQLEwxXZWIgU2Vy
-dmljZXMxEjAQBgNVBAMTCUxJR08gQ0EgMTAeFw0xMTA0MjkxNzI0MTJaFw0yMTA0
-MjgxNzI0MTJaMGoxEzARBgoJkiaJk/IsZAEZFgNvcmcxFDASBgoJkiaJk/IsZAEZ
-FgRsaWdvMQ0wCwYDVQQKEwRMSUdPMRUwEwYDVQQLEwxXZWIgU2VydmljZXMxFzAV
-BgNVBAMTDmd1ZXN0LmxpZ28ub3JnMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
-CgKCAQEApxrDaMIRCnagFhhjD4rY47JBOHKjA4IS6EG1MvqG6kMXm73ZdYRhRraQ
-onVmFMUPPlkR5zTlok+qvb+Iy58s6PqguQe0Tz3eEnfRlVqLaXniKNGxkef5pXFY
-hndYXzkfeoclycdYZGwu12ANoG5wjADhYcWEuiyJKprfWXF/msa65rkczuMd5WFw
-lde6hnpZTXa6FaeYb1Hi8Me36pHFCU3DfhARdup7DQ4t3QDEttQY1mn/pnY6vd2o
-oa/jmL1iHkJbTDT6+EWhk/3XdrC1tfo1VKQ+B4RebTyzRY8Wsgn3CAyAz9K5nA7w
-aYBOYhK26Z6envlE+vXviDI89J/C7QIDAQABo4HqMIHnMAwGA1UdEwEB/wQCMAAw
-DgYDVR0PAQH/BAQDAgSwMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAZ
-BgNVHSAEEjAQMA4GDCsGAQQBgfpGAgECATA5BgNVHR8EMjAwMC6gLKAqhihodHRw
-Oi8vY2EubGlnby5vcmcvNTQxNDA0YzMvNTQxNDA0YzMuY3JsMB8GA1UdIwQYMBaA
-FFJu3Xuqb4VcCCLTl5+tfyNWHmrRMDEGA1UdEQQqMCiCDmd1ZXN0LmxpZ28ub3Jn
-gRZzY290dC5rb3JhbmRhQGxpZ28ub3JnMA0GCSqGSIb3DQEBBQUAA4IBAQBXTyxj
-WEiIQ4kG8I9ujY9AssDMi63g9m4AT7uAm6mbNJVRaYkYVy7lnRi227fBjIXr8rku
-gfUhzwRULi9OUuY5eO713iB/urMn3mysch9R6heciYGzccnn5nN3gWrUN3kZ0AWd
-XaIE5G8rZOACTDp7SCVyNH1eZNkk6apK9LJgblo44XppU8gZk1OIzBzeknCuZhGz
-6Lnu58KItVKI+8w7FepUsXIdF6pHRLevhzW7d61QZ5iW8o2qW0TG24RDY4JJE45m
-y6qIv7HErgRcZZrxupRI6NfHLBxJx22n8rBD7gmVoCLXkAftIKQZ8pBKF4c74ErF
-xWUYS9G3JfMMW9UY
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AssertionConsumerService xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://gw-astronomy.org/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://gw-astronomy.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://gw-astronomy.org/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://gw-astronomy.org/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AttributeConsumingService index="1">
-      <ServiceName xml:lang="en">Gravitational Wave Astronomy Community Registry</ServiceName>
-      <ServiceDescription xml:lang="en">Gravitational Wave Astronomy Community Registry used to support collaboration across astronomy and astrophysics projects.</ServiceDescription>
-      <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="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="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="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="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"/>
-    </AttributeConsumingService>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Wisconsin-Milwaukee</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Wisconsin-Milwaukee</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.uwm.edu/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Scott Koranda</GivenName>
-    <EmailAddress>skoranda@uwm.edu</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="support">
-    <GivenName>UWM CGCA Help</GivenName>
-    <EmailAddress>uwm-help@gravity.phys.uwm.edu</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="administrative">
-    <GivenName>Chris Spadanuda</GivenName>
-    <EmailAddress>cspada@uwm.edu</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/gw-astronomy.org-wiki-shibboleth-sp.xml b/swamid-interfederations-2.0/gw-astronomy.org-wiki-shibboleth-sp.xml
deleted file mode 100644
index 4b36f849..00000000
--- a/swamid-interfederations-2.0/gw-astronomy.org-wiki-shibboleth-sp.xml
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://gw-astronomy.org/wiki/shibboleth-sp">
-  <Extensions xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi">
-    <mdrpi:RegistrationInfo registrationAuthority="https://incommon.org"/>
-    <mdattr:EntityAttributes>
-      <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://refeds.org/category/research-and-scholarship</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </Extensions>
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata">
-      <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://gw-astronomy.org/wiki/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Gravitational Wave Astronomy Community Wiki</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Gravitational Wave Astronomy Community wiki used to support collaboration across astronomy and astrophysics projects.</mdui:Description>
-        <mdui:InformationURL xml:lang="en">https://gw-astronomy.org/wiki/Main/SPInfo</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://gw-astronomy.org/wiki/Main/SPPrivacy</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIEWDCCA0CgAwIBAgIBPjANBgkqhkiG9w0BAQUFADCBhzETMBEGCgmSJomT8ixk
-ARkWA29yZzEUMBIGCgmSJomT8ixkARkWBGxpZ28xDTALBgNVBAoTBExJR08xIDAe
-BgNVBAsTF0NlcnRpZmljYXRlIEF1dGhvcml0aWVzMRUwEwYDVQQLEwxXZWIgU2Vy
-dmljZXMxEjAQBgNVBAMTCUxJR08gQ0EgMTAeFw0xMTA0MjkxNzI0MTJaFw0yMTA0
-MjgxNzI0MTJaMGoxEzARBgoJkiaJk/IsZAEZFgNvcmcxFDASBgoJkiaJk/IsZAEZ
-FgRsaWdvMQ0wCwYDVQQKEwRMSUdPMRUwEwYDVQQLEwxXZWIgU2VydmljZXMxFzAV
-BgNVBAMTDmd1ZXN0LmxpZ28ub3JnMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
-CgKCAQEApxrDaMIRCnagFhhjD4rY47JBOHKjA4IS6EG1MvqG6kMXm73ZdYRhRraQ
-onVmFMUPPlkR5zTlok+qvb+Iy58s6PqguQe0Tz3eEnfRlVqLaXniKNGxkef5pXFY
-hndYXzkfeoclycdYZGwu12ANoG5wjADhYcWEuiyJKprfWXF/msa65rkczuMd5WFw
-lde6hnpZTXa6FaeYb1Hi8Me36pHFCU3DfhARdup7DQ4t3QDEttQY1mn/pnY6vd2o
-oa/jmL1iHkJbTDT6+EWhk/3XdrC1tfo1VKQ+B4RebTyzRY8Wsgn3CAyAz9K5nA7w
-aYBOYhK26Z6envlE+vXviDI89J/C7QIDAQABo4HqMIHnMAwGA1UdEwEB/wQCMAAw
-DgYDVR0PAQH/BAQDAgSwMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAZ
-BgNVHSAEEjAQMA4GDCsGAQQBgfpGAgECATA5BgNVHR8EMjAwMC6gLKAqhihodHRw
-Oi8vY2EubGlnby5vcmcvNTQxNDA0YzMvNTQxNDA0YzMuY3JsMB8GA1UdIwQYMBaA
-FFJu3Xuqb4VcCCLTl5+tfyNWHmrRMDEGA1UdEQQqMCiCDmd1ZXN0LmxpZ28ub3Jn
-gRZzY290dC5rb3JhbmRhQGxpZ28ub3JnMA0GCSqGSIb3DQEBBQUAA4IBAQBXTyxj
-WEiIQ4kG8I9ujY9AssDMi63g9m4AT7uAm6mbNJVRaYkYVy7lnRi227fBjIXr8rku
-gfUhzwRULi9OUuY5eO713iB/urMn3mysch9R6heciYGzccnn5nN3gWrUN3kZ0AWd
-XaIE5G8rZOACTDp7SCVyNH1eZNkk6apK9LJgblo44XppU8gZk1OIzBzeknCuZhGz
-6Lnu58KItVKI+8w7FepUsXIdF6pHRLevhzW7d61QZ5iW8o2qW0TG24RDY4JJE45m
-y6qIv7HErgRcZZrxupRI6NfHLBxJx22n8rBD7gmVoCLXkAftIKQZ8pBKF4c74ErF
-xWUYS9G3JfMMW9UY
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AssertionConsumerService xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://gw-astronomy.org/wiki/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://gw-astronomy.org/wiki/Shibboleth.sso/SAML2/Artifact" index="2"/>
-    <md:AssertionConsumerService xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://gw-astronomy.org/wiki/Shibboleth.sso/SAML2/ECP" index="3"/>
-    <AttributeConsumingService index="1">
-      <ServiceName xml:lang="en">Gravitational Wave Astronomy Community Wiki</ServiceName>
-      <ServiceDescription xml:lang="en">Gravitational Wave Astronomy Community wiki used to support collaboration across astronomy and astrophysics projects.</ServiceDescription>
-      <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"/>
-    </AttributeConsumingService>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Wisconsin-Milwaukee</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Wisconsin-Milwaukee</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.uwm.edu/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="administrative">
-    <GivenName>Warren Anderson</GivenName>
-    <EmailAddress>warren.anderson@ligo.org</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="administrative">
-    <GivenName>Chris Spadanuda</GivenName>
-    <EmailAddress>cspada@uwm.edu</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Branson Stephens</GivenName>
-    <EmailAddress>branson.stephens@ligo.org</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="support">
-    <GivenName>UWM CGCA Help</GivenName>
-    <EmailAddress>uwm-help@gravity.phys.uwm.edu</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/gw-astronomy.org.xml b/swamid-interfederations-2.0/gw-astronomy.org.xml
deleted file mode 100644
index 4b36f849..00000000
--- a/swamid-interfederations-2.0/gw-astronomy.org.xml
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://gw-astronomy.org/wiki/shibboleth-sp">
-  <Extensions xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi">
-    <mdrpi:RegistrationInfo registrationAuthority="https://incommon.org"/>
-    <mdattr:EntityAttributes>
-      <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://refeds.org/category/research-and-scholarship</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </Extensions>
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata">
-      <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://gw-astronomy.org/wiki/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Gravitational Wave Astronomy Community Wiki</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Gravitational Wave Astronomy Community wiki used to support collaboration across astronomy and astrophysics projects.</mdui:Description>
-        <mdui:InformationURL xml:lang="en">https://gw-astronomy.org/wiki/Main/SPInfo</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://gw-astronomy.org/wiki/Main/SPPrivacy</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIEWDCCA0CgAwIBAgIBPjANBgkqhkiG9w0BAQUFADCBhzETMBEGCgmSJomT8ixk
-ARkWA29yZzEUMBIGCgmSJomT8ixkARkWBGxpZ28xDTALBgNVBAoTBExJR08xIDAe
-BgNVBAsTF0NlcnRpZmljYXRlIEF1dGhvcml0aWVzMRUwEwYDVQQLEwxXZWIgU2Vy
-dmljZXMxEjAQBgNVBAMTCUxJR08gQ0EgMTAeFw0xMTA0MjkxNzI0MTJaFw0yMTA0
-MjgxNzI0MTJaMGoxEzARBgoJkiaJk/IsZAEZFgNvcmcxFDASBgoJkiaJk/IsZAEZ
-FgRsaWdvMQ0wCwYDVQQKEwRMSUdPMRUwEwYDVQQLEwxXZWIgU2VydmljZXMxFzAV
-BgNVBAMTDmd1ZXN0LmxpZ28ub3JnMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
-CgKCAQEApxrDaMIRCnagFhhjD4rY47JBOHKjA4IS6EG1MvqG6kMXm73ZdYRhRraQ
-onVmFMUPPlkR5zTlok+qvb+Iy58s6PqguQe0Tz3eEnfRlVqLaXniKNGxkef5pXFY
-hndYXzkfeoclycdYZGwu12ANoG5wjADhYcWEuiyJKprfWXF/msa65rkczuMd5WFw
-lde6hnpZTXa6FaeYb1Hi8Me36pHFCU3DfhARdup7DQ4t3QDEttQY1mn/pnY6vd2o
-oa/jmL1iHkJbTDT6+EWhk/3XdrC1tfo1VKQ+B4RebTyzRY8Wsgn3CAyAz9K5nA7w
-aYBOYhK26Z6envlE+vXviDI89J/C7QIDAQABo4HqMIHnMAwGA1UdEwEB/wQCMAAw
-DgYDVR0PAQH/BAQDAgSwMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAZ
-BgNVHSAEEjAQMA4GDCsGAQQBgfpGAgECATA5BgNVHR8EMjAwMC6gLKAqhihodHRw
-Oi8vY2EubGlnby5vcmcvNTQxNDA0YzMvNTQxNDA0YzMuY3JsMB8GA1UdIwQYMBaA
-FFJu3Xuqb4VcCCLTl5+tfyNWHmrRMDEGA1UdEQQqMCiCDmd1ZXN0LmxpZ28ub3Jn
-gRZzY290dC5rb3JhbmRhQGxpZ28ub3JnMA0GCSqGSIb3DQEBBQUAA4IBAQBXTyxj
-WEiIQ4kG8I9ujY9AssDMi63g9m4AT7uAm6mbNJVRaYkYVy7lnRi227fBjIXr8rku
-gfUhzwRULi9OUuY5eO713iB/urMn3mysch9R6heciYGzccnn5nN3gWrUN3kZ0AWd
-XaIE5G8rZOACTDp7SCVyNH1eZNkk6apK9LJgblo44XppU8gZk1OIzBzeknCuZhGz
-6Lnu58KItVKI+8w7FepUsXIdF6pHRLevhzW7d61QZ5iW8o2qW0TG24RDY4JJE45m
-y6qIv7HErgRcZZrxupRI6NfHLBxJx22n8rBD7gmVoCLXkAftIKQZ8pBKF4c74ErF
-xWUYS9G3JfMMW9UY
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AssertionConsumerService xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://gw-astronomy.org/wiki/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://gw-astronomy.org/wiki/Shibboleth.sso/SAML2/Artifact" index="2"/>
-    <md:AssertionConsumerService xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://gw-astronomy.org/wiki/Shibboleth.sso/SAML2/ECP" index="3"/>
-    <AttributeConsumingService index="1">
-      <ServiceName xml:lang="en">Gravitational Wave Astronomy Community Wiki</ServiceName>
-      <ServiceDescription xml:lang="en">Gravitational Wave Astronomy Community wiki used to support collaboration across astronomy and astrophysics projects.</ServiceDescription>
-      <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"/>
-    </AttributeConsumingService>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Wisconsin-Milwaukee</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Wisconsin-Milwaukee</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.uwm.edu/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="administrative">
-    <GivenName>Warren Anderson</GivenName>
-    <EmailAddress>warren.anderson@ligo.org</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="administrative">
-    <GivenName>Chris Spadanuda</GivenName>
-    <EmailAddress>cspada@uwm.edu</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Branson Stephens</GivenName>
-    <EmailAddress>branson.stephens@ligo.org</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="support">
-    <GivenName>UWM CGCA Help</GivenName>
-    <EmailAddress>uwm-help@gravity.phys.uwm.edu</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/gw.ct.infn.it-shibboleth.xml b/swamid-interfederations-2.0/gw.ct.infn.it-shibboleth.xml
deleted file mode 100644
index 38ad7b19..00000000
--- a/swamid-interfederations-2.0/gw.ct.infn.it-shibboleth.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:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" entityID="https://gw.ct.infn.it/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2012-05-03T15:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</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>
-        <mdui:DisplayName xml:lang="en">INFN Science Gateway to IGI</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="it">INFN Science Gateway to IGI</mdui:DisplayName>
-        <mdui:Description xml:lang="en">This service provides access to several Grid applications and use case to the Italian Grid community</mdui:Description>
-        <mdui:Description xml:lang="it">Questo servizio fornisce accesso ad un insieme di applicazioni ed use case su Grid alla comunità italiana di Gri</mdui:Description>
-      </mdui:UIInfo>
-      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://gw.ct.infn.it/Shibboleth.sso/DS"/>
-      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://gw.ct.infn.it/Shibboleth.sso/DS" index="1"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIFhDCCBGygAwIBAgIRAOyXU1f6GS689kEaSDAhQPYwDQYJKoZIhvcNAQEFBQAw
-NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-IFNTTCBDQTAeFw0xNDA1MTkwMDAwMDBaFw0xNzA1MTgyMzU5NTlaMEAxITAfBgNV
-BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEbMBkGA1UEAxMSbGlmZXJheS5j
-dC5pbmZuLml0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApizyvtMI
-uoSnnz/fvk7lcXwoDUk11NVAlg5w4zh01YKNvy5SzBu0eRIzRos/ALs4CwmxrmCv
-3JQPA4xxItxVd8x9Q+YElQteEcX+mWXXW5LI5XE3xhPzkdFeQrhkinAK2JreSn6E
-TQk8YO1rOxW3qCpKeYZ2VQF3grAU/JRWbvLF+r2j4zE27n+RzBxnYeZ9rtJ/67gU
-7t1S39DRDTyKit7dJIYl50n9g3atWGALb56QoVnlR+RPRxVI9EFd2hEXfrxWXGdt
-F2v6YIMSAAM5l2/SlEmhQSSkmQ4zXcmPrzC6pte9NWoPOTsQnCnocwMJ16aXsnQy
-BxaoywMtq8NsdwIDAQABo4ICgTCCAn0wHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsr
-N1dH6pDjue0wHQYDVR0OBBYEFCy5dq76F94vaAuznAys6UmGxySTMA4GA1UdDwEB
-/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEF
-BQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNVHR8E
-MzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENB
-LmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNz
-LnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8v
-b2NzcC50Y3MudGVyZW5hLm9yZzCCAS0GA1UdEQSCASQwggEgghJsaWZlcmF5LmN0
-LmluZm4uaXSCGWFwcGxpY2F0aW9ucy5ldS1kZWNpZGUuZXWCGWFwcGxpY2F0aW9u
-cy5ldW1lZGdyaWQuZXWCEGdpbGRhLmN0LmluZm4uaXSCFGdpc2VsYS1ndy5jdC5p
-bmZuLml0gg1ndy5jdC5pbmZuLml0ghNnd2VhdGhlci5jdC5pbmZuLml0ghBnd2xp
-Yi5jdC5pbmZuLml0gh9pbmRpY2F0ZS1ndy5jb25zb3J6aW8tY29tZXRhLml0ghFy
-aWNldmkuY3QuaW5mbi5pdIIUdmlyYWxncmlkLmN0LmluZm4uaXSCFHd3dy5jaGFp
-bi1wcm9qZWN0LmV1ghZ3d3cuc3BlY2lhbC1wcm9qZWN0Lml0MA0GCSqGSIb3DQEB
-BQUAA4IBAQCEZIHNNQPD5WkGSlUhCN/BRSharmQ6dT0NiwjQNmRODCpVqBgwVZY0
-VUlAobHaF186QXeiNYge8ZYSpYY2VhBa4znL7IjFODE3FsaJNseKgsyNFqKR8xNO
-nsOCM//SN9N79hwH8yAxLhGyxbnInpOhE6rEkbhtowTjqhDq26cGGlH8JTTPuYvY
-JhgPGGkxo1286x1nuN4ELKvwZ7RF+YTH/WPOIBMNi+ee+vxrIhWbU6iy97f7k4PA
-2e35ZQ6gutnmX2v/ybFWh0ruO4zszYKiMo+zGyLvYmIpV/+Mjs26KbqqrBOS1jjN
-W3MiH8HMxzzYHExNCvzrAgN1TfB+SCiB
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://gw.ct.infn.it/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://gw.ct.infn.it/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://gw.ct.infn.it/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://gw.ct.infn.it/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://gw.ct.infn.it/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://gw.ct.infn.it/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://gw.ct.infn.it/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://gw.ct.infn.it/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://gw.ct.infn.it/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://gw.ct.infn.it/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://gw.ct.infn.it/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <AttributeConsumingService index="1">
-      <ServiceName xml:lang="en">Science Gateway to IGI </ServiceName>
-      <ServiceDescription xml:lang="en">This service provides access to several Grid applications and use case to the Italian Grid 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"/>
-    </AttributeConsumingService>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">INFN - the National Institute of Nuclear Physics. Catania division</OrganizationName>
-    <OrganizationName xml:lang="it">INFN - Istituto Nazionale di Fisica Nucleare. Sezione di Catania</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Science Gateway to IGI provided by INFN Catania</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="it">Science Gateway to IGI erogato da INFN Catania</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.ct.infn.it/en/home</OrganizationURL>
-    <OrganizationURL xml:lang="it">http://www.ct.infn.it/it/home</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Marco</GivenName>
-    <SurName>Fargetta</SurName>
-    <EmailAddress>marco.fargetta@ct.infn.it</EmailAddress>
-    <EmailAddress>credentials-admin@ct.infn.it</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Riccardo</GivenName>
-    <SurName>Rotondo</SurName>
-    <EmailAddress>riccardo.rotondo@ct.infn.it</EmailAddress>
-    <EmailAddress>credentials-admin@ct.infn.it</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="support">
-    <GivenName>Giuseppe</GivenName>
-    <SurName>Platania</SurName>
-    <EmailAddress>giuseppe.platania@ct.infn.it</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="support">
-    <GivenName>Carlo</GivenName>
-    <SurName>Rocca</SurName>
-    <EmailAddress>carlo.rocca@ct.infn.it</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="administrative">
-    <GivenName>Roberto</GivenName>
-    <SurName>Barbera</SurName>
-    <EmailAddress>roberto.barbera@ct.infn.it</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/gw.ct.infn.it.xml b/swamid-interfederations-2.0/gw.ct.infn.it.xml
deleted file mode 100644
index 38ad7b19..00000000
--- a/swamid-interfederations-2.0/gw.ct.infn.it.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:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" entityID="https://gw.ct.infn.it/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2012-05-03T15:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</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>
-        <mdui:DisplayName xml:lang="en">INFN Science Gateway to IGI</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="it">INFN Science Gateway to IGI</mdui:DisplayName>
-        <mdui:Description xml:lang="en">This service provides access to several Grid applications and use case to the Italian Grid community</mdui:Description>
-        <mdui:Description xml:lang="it">Questo servizio fornisce accesso ad un insieme di applicazioni ed use case su Grid alla comunità italiana di Gri</mdui:Description>
-      </mdui:UIInfo>
-      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://gw.ct.infn.it/Shibboleth.sso/DS"/>
-      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://gw.ct.infn.it/Shibboleth.sso/DS" index="1"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIFhDCCBGygAwIBAgIRAOyXU1f6GS689kEaSDAhQPYwDQYJKoZIhvcNAQEFBQAw
-NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-IFNTTCBDQTAeFw0xNDA1MTkwMDAwMDBaFw0xNzA1MTgyMzU5NTlaMEAxITAfBgNV
-BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEbMBkGA1UEAxMSbGlmZXJheS5j
-dC5pbmZuLml0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApizyvtMI
-uoSnnz/fvk7lcXwoDUk11NVAlg5w4zh01YKNvy5SzBu0eRIzRos/ALs4CwmxrmCv
-3JQPA4xxItxVd8x9Q+YElQteEcX+mWXXW5LI5XE3xhPzkdFeQrhkinAK2JreSn6E
-TQk8YO1rOxW3qCpKeYZ2VQF3grAU/JRWbvLF+r2j4zE27n+RzBxnYeZ9rtJ/67gU
-7t1S39DRDTyKit7dJIYl50n9g3atWGALb56QoVnlR+RPRxVI9EFd2hEXfrxWXGdt
-F2v6YIMSAAM5l2/SlEmhQSSkmQ4zXcmPrzC6pte9NWoPOTsQnCnocwMJ16aXsnQy
-BxaoywMtq8NsdwIDAQABo4ICgTCCAn0wHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsr
-N1dH6pDjue0wHQYDVR0OBBYEFCy5dq76F94vaAuznAys6UmGxySTMA4GA1UdDwEB
-/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEF
-BQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNVHR8E
-MzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENB
-LmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNz
-LnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8v
-b2NzcC50Y3MudGVyZW5hLm9yZzCCAS0GA1UdEQSCASQwggEgghJsaWZlcmF5LmN0
-LmluZm4uaXSCGWFwcGxpY2F0aW9ucy5ldS1kZWNpZGUuZXWCGWFwcGxpY2F0aW9u
-cy5ldW1lZGdyaWQuZXWCEGdpbGRhLmN0LmluZm4uaXSCFGdpc2VsYS1ndy5jdC5p
-bmZuLml0gg1ndy5jdC5pbmZuLml0ghNnd2VhdGhlci5jdC5pbmZuLml0ghBnd2xp
-Yi5jdC5pbmZuLml0gh9pbmRpY2F0ZS1ndy5jb25zb3J6aW8tY29tZXRhLml0ghFy
-aWNldmkuY3QuaW5mbi5pdIIUdmlyYWxncmlkLmN0LmluZm4uaXSCFHd3dy5jaGFp
-bi1wcm9qZWN0LmV1ghZ3d3cuc3BlY2lhbC1wcm9qZWN0Lml0MA0GCSqGSIb3DQEB
-BQUAA4IBAQCEZIHNNQPD5WkGSlUhCN/BRSharmQ6dT0NiwjQNmRODCpVqBgwVZY0
-VUlAobHaF186QXeiNYge8ZYSpYY2VhBa4znL7IjFODE3FsaJNseKgsyNFqKR8xNO
-nsOCM//SN9N79hwH8yAxLhGyxbnInpOhE6rEkbhtowTjqhDq26cGGlH8JTTPuYvY
-JhgPGGkxo1286x1nuN4ELKvwZ7RF+YTH/WPOIBMNi+ee+vxrIhWbU6iy97f7k4PA
-2e35ZQ6gutnmX2v/ybFWh0ruO4zszYKiMo+zGyLvYmIpV/+Mjs26KbqqrBOS1jjN
-W3MiH8HMxzzYHExNCvzrAgN1TfB+SCiB
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://gw.ct.infn.it/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://gw.ct.infn.it/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://gw.ct.infn.it/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://gw.ct.infn.it/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://gw.ct.infn.it/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://gw.ct.infn.it/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://gw.ct.infn.it/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://gw.ct.infn.it/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://gw.ct.infn.it/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://gw.ct.infn.it/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://gw.ct.infn.it/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <AttributeConsumingService index="1">
-      <ServiceName xml:lang="en">Science Gateway to IGI </ServiceName>
-      <ServiceDescription xml:lang="en">This service provides access to several Grid applications and use case to the Italian Grid 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"/>
-    </AttributeConsumingService>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">INFN - the National Institute of Nuclear Physics. Catania division</OrganizationName>
-    <OrganizationName xml:lang="it">INFN - Istituto Nazionale di Fisica Nucleare. Sezione di Catania</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Science Gateway to IGI provided by INFN Catania</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="it">Science Gateway to IGI erogato da INFN Catania</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.ct.infn.it/en/home</OrganizationURL>
-    <OrganizationURL xml:lang="it">http://www.ct.infn.it/it/home</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Marco</GivenName>
-    <SurName>Fargetta</SurName>
-    <EmailAddress>marco.fargetta@ct.infn.it</EmailAddress>
-    <EmailAddress>credentials-admin@ct.infn.it</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Riccardo</GivenName>
-    <SurName>Rotondo</SurName>
-    <EmailAddress>riccardo.rotondo@ct.infn.it</EmailAddress>
-    <EmailAddress>credentials-admin@ct.infn.it</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="support">
-    <GivenName>Giuseppe</GivenName>
-    <SurName>Platania</SurName>
-    <EmailAddress>giuseppe.platania@ct.infn.it</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="support">
-    <GivenName>Carlo</GivenName>
-    <SurName>Rocca</SurName>
-    <EmailAddress>carlo.rocca@ct.infn.it</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="administrative">
-    <GivenName>Roberto</GivenName>
-    <SurName>Barbera</SurName>
-    <EmailAddress>roberto.barbera@ct.infn.it</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/haka.saimia.fi.xml b/swamid-interfederations-2.0/haka.saimia.fi.xml
deleted file mode 100644
index 4fd30a12..00000000
--- a/swamid-interfederations-2.0/haka.saimia.fi.xml
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns: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://haka.saimia.fi/idp/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">saimia.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>MIIDGDCCAgCgAwIBAgIJANwd5owYiwIAMA0GCSqGSIb3DQEBBQUAMBkxFzAVBgNV
-BAMTDmhha2Euc2FpbWlhLmZpMB4XDTE0MDQxNDA3MzM1OFoXDTE3MDQxMzA3MzM1
-OFowGTEXMBUGA1UEAxMOaGFrYS5zYWltaWEuZmkwggEiMA0GCSqGSIb3DQEBAQUA
-A4IBDwAwggEKAoIBAQDd2/hlBilgIQxoFsVWQ4RqpUdfIKhpIh+36HJzA6IpUvjf
-KjTPplQVQbEAUF7BgLX0nmMcjnehPP4r7MFsq6BtGrSo867rNaKovyjkKq1cNJ5I
-DC2zK8Q5NrTiI80Mi3+JdQCSeYBiIPmrlz1dkKZTOp2fVhhb6EKCo/tbAlWnROCs
-sh1NDoW2a8nI7xlrB6VyBEvRNaFL6JX8nVxUuL+SqjXkOiFJDElHq097Q7/wDEPi
-BIOpqT9jGC8VaV1lKmmLcUQMHSKxLnEuky/nhkm1fqW/DCOjLqj1JkFSp3Mq/6yY
-ooys2nCTC7vSJXZdTmYDcTjTBkNcI/kjfAPFRSpxAgMBAAGjYzBhMEAGA1UdEQQ5
-MDeCDmhha2Euc2FpbWlhLmZphiVodHRwczovL2hha2Euc2FpbWlhLmZpL2lkcC9z
-aGliYm9sZXRoMB0GA1UdDgQWBBRRrt/+bZxLw1Xr8XLLszoxN/7ySTANBgkqhkiG
-9w0BAQUFAAOCAQEAYk78PGssKXk/pJDAWNoo3GW7D0kJtcDKffr5YeRDfz0AuPQD
-1SzsZFT7neyjZF9tOkzb1s9qMKJIUqMZPbyZCiXzt6+csXkSRl6UUzY/Wvf8NS6M
-0dj8QU6ony6SspdxU9ZGKq/RWwmcuCX8RJweg4Vq+X1PmFQV8JmDA+816EUX85ht
-E0AuFvgJ1F0sEbvX0R3pEPpin3hQKYtH0SdzPqiddCVCO4QwKzX1pod8lbLt4J7G
-2W+i5q2zvgodt4ULB676EyyD6wMlVMNgnraDv3aFR0GMEishohgRAGcQ6QKktS5D
-PWVldxxCqWr2dfoIUAlsgi/mVd7ifABx15cXzA==</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://haka.saimia.fi/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://haka.saimia.fi/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://haka.saimia.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">saimia.fi</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDGDCCAgCgAwIBAgIJANwd5owYiwIAMA0GCSqGSIb3DQEBBQUAMBkxFzAVBgNV
-BAMTDmhha2Euc2FpbWlhLmZpMB4XDTE0MDQxNDA3MzM1OFoXDTE3MDQxMzA3MzM1
-OFowGTEXMBUGA1UEAxMOaGFrYS5zYWltaWEuZmkwggEiMA0GCSqGSIb3DQEBAQUA
-A4IBDwAwggEKAoIBAQDd2/hlBilgIQxoFsVWQ4RqpUdfIKhpIh+36HJzA6IpUvjf
-KjTPplQVQbEAUF7BgLX0nmMcjnehPP4r7MFsq6BtGrSo867rNaKovyjkKq1cNJ5I
-DC2zK8Q5NrTiI80Mi3+JdQCSeYBiIPmrlz1dkKZTOp2fVhhb6EKCo/tbAlWnROCs
-sh1NDoW2a8nI7xlrB6VyBEvRNaFL6JX8nVxUuL+SqjXkOiFJDElHq097Q7/wDEPi
-BIOpqT9jGC8VaV1lKmmLcUQMHSKxLnEuky/nhkm1fqW/DCOjLqj1JkFSp3Mq/6yY
-ooys2nCTC7vSJXZdTmYDcTjTBkNcI/kjfAPFRSpxAgMBAAGjYzBhMEAGA1UdEQQ5
-MDeCDmhha2Euc2FpbWlhLmZphiVodHRwczovL2hha2Euc2FpbWlhLmZpL2lkcC9z
-aGliYm9sZXRoMB0GA1UdDgQWBBRRrt/+bZxLw1Xr8XLLszoxN/7ySTANBgkqhkiG
-9w0BAQUFAAOCAQEAYk78PGssKXk/pJDAWNoo3GW7D0kJtcDKffr5YeRDfz0AuPQD
-1SzsZFT7neyjZF9tOkzb1s9qMKJIUqMZPbyZCiXzt6+csXkSRl6UUzY/Wvf8NS6M
-0dj8QU6ony6SspdxU9ZGKq/RWwmcuCX8RJweg4Vq+X1PmFQV8JmDA+816EUX85ht
-E0AuFvgJ1F0sEbvX0R3pEPpin3hQKYtH0SdzPqiddCVCO4QwKzX1pod8lbLt4J7G
-2W+i5q2zvgodt4ULB676EyyD6wMlVMNgnraDv3aFR0GMEishohgRAGcQ6QKktS5D
-PWVldxxCqWr2dfoIUAlsgi/mVd7ifABx15cXzA==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://haka.saimia.fi/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://haka.saimia.fi/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">Saimaan ammattikorkeakoulu</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">Saimaa University of Applied Sciences</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">Yrkehögskola Saimaa</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="fi">Saimaan ammattikorkeakoulu</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Saimaa University of Applied Sciences</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="sv">Yrkehögskola Saimaa</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="fi">http://www.saimia.fi</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.saimia.fi</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sv">http://www.saimia.fi</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Ilpo</md:GivenName>
-    <md:SurName>Olkkonen</md:SurName>
-    <md:EmailAddress>mailto:ilpo.olkkonen@saimia.fi</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Saimaan amk</md:GivenName>
-    <md:SurName>IT-palvelut</md:SurName>
-    <md:EmailAddress>mailto:haka-admin@saimia.fi</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Saimaan amk</md:GivenName>
-    <md:SurName>IT-palvelut</md:SurName>
-    <md:EmailAddress>mailto:haka@saimia.fi</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/halfback.cnaf.infn.it-casshib-app2.xml b/swamid-interfederations-2.0/halfback.cnaf.infn.it-casshib-app2.xml
deleted file mode 100644
index e3c978d6..00000000
--- a/swamid-interfederations-2.0/halfback.cnaf.infn.it-casshib-app2.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" entityID="https://halfback.cnaf.infn.it/casshib/app2">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2012-07-04T15:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</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>
-        <mdui:DisplayName xml:lang="en">IGI Grid Portal</mdui:DisplayName>
-        <mdui:Description xml:lang="en">IGI is the Italian Grid infrastructure, run for the benefit of the research and education communities in Italy and worldwide.</mdui:Description>
-        <mdui:InformationURL xml:lang="en">https://wiki.italiangrid.it/IGIPortal</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://wiki.italiangrid.it/IGIPortal/Federation-info</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://halfback.cnaf.infn.it/casshib/shib/app2/Shibboleth.sso/Login"/>
-      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://halfback.cnaf.infn.it/casshib/shib/app2/Shibboleth.sso/Login" index="1"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIEhzCCA2+gAwIBAgIQYJH5E+/63l61Qiby7wHhYjANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTEyMDYyNTAwMDAwMFoXDTE1MDYyNTIzNTk1OVowXTELMAkGA1UE
-BhMCSVQxLjAsBgNVBAoTJUlzdGl0dXRvIE5hemlvbmFsZSBkaSBGaXNpY2EgTnVj
-bGVhcmUxHjAcBgNVBAMTFWhhbGZiYWNrLmNuYWYuaW5mbi5pdDCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBAOH0IRtQc7utWIumhJaEwwBdovpOu3eUH3X5
-DK7/OaQYHpo2+E1tnoHdG1JU+QgZocacuw3oJz74tGdknUsvDj9MCdp2lGYLpPW9
-p4WMK5+ElpVFjLcKdxndPNME8SF0nOcRoM9aMQhpOSnSLX3Ybeov/MO0dT9iVVmW
-KAau3hSeUZ2renaL/oQp+bK3+EoYImYV/5R1rkpTTf0brmaQg3GBdxADnAdwFBgG
-Y93qnKsYQjPsOg7ik7kf0jUSrITGo7rgLHvkElm4ySG01jOOtfw4AoglUppUan2x
-hlHYWrUhdqzNV2uasqHP3t7EA4tITv8IrgJj3k2coinPbB9s1mUCAwEAAaOCAWgw
-ggFkMB8GA1UdIwQYMBaAFAy9k2gM896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBTz
-kh/WAe7TMeep782t7Dy4EX8J/DAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIw
-ADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwGAYDVR0gBBEwDzANBgsr
-BgEEAbIxAQICHTA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJl
-bmEub3JnL1RFUkVOQVNTTENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUH
-MAKGKWh0dHA6Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYG
-CCsGAQUFBzABhhpodHRwOi8vb2NzcC50Y3MudGVyZW5hLm9yZzAgBgNVHREEGTAX
-ghVoYWxmYmFjay5jbmFmLmluZm4uaXQwDQYJKoZIhvcNAQEFBQADggEBAHW8TsHv
-D7EM9iMprOIH+5VeRSh0cYEdttX033scsifCFCArRJvhofIkR/1F23DIWRnc8//4
-7MKSrLoC9PNeIjXa6anC3O9IZNCeBxb9UEcRvPW3Yc1wEe4ATp1aR8EXtH3G2Sef
-EELgyGnKzScgkUSGIbgf9P05XOyok0RuKWTHDvYNHr/GW/NW5optwXz6apDDE2mX
-icFWqRortYglbk+s6VO0hcYN6ORR5UBgOR6VULrT9r6mDQykItMVhBgt4peAeOss
-+6acaFTdJZHMD+Z3KkvA7yfD4IWulPnTaT+o1n7X1V6oAEVHn6SfpuBeP+wXeu+f
-yVxNpwv+OOJLtns=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://halfback.cnaf.infn.it/casshib/shib/app2/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://halfback.cnaf.infn.it/casshib/shib/app2/Shibboleth.sso/SLO/Artifact"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://halfback.cnaf.infn.it/casshib/shib/app2/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://halfback.cnaf.infn.it/casshib/shib/app2/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://halfback.cnaf.infn.it/casshib/shib/app2/Shibboleth.sso/SLO/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://halfback.cnaf.infn.it/casshib/shib/app2/Shibboleth.sso/NIM/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://halfback.cnaf.infn.it/casshib/shib/app2/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://halfback.cnaf.infn.it/casshib/shib/app2/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://halfback.cnaf.infn.it/casshib/shib/app2/Shibboleth.sso/NIM/SOAP"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://halfback.cnaf.infn.it/casshib/shib/app2/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://halfback.cnaf.infn.it/casshib/shib/app2/Shibboleth.sso/SAML/POST" index="7"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://halfback.cnaf.infn.it/casshib/shib/app2/Shibboleth.sso/SAML2/Artifact" index="8"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://halfback.cnaf.infn.it/casshib/shib/app2/Shibboleth.sso/SAML2/ECP" index="9"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://halfback.cnaf.infn.it/casshib/shib/app2/Shibboleth.sso/SAML2/POST" index="10"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://halfback.cnaf.infn.it/casshib/shib/app2/Shibboleth.sso/SAML2/POST-SimpleSign" index="11"/>
-    <AttributeConsumingService index="1">
-      <ServiceName xml:lang="en">IGI Grid Portal provided by INFN</ServiceName>
-      <ServiceDescription xml:lang="en">IGI is the Italian Grid infrastructure, run for the benefit of the research and education communities in Italy and worldwide</ServiceDescription>
-      <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="givenName" Name="urn:oid:2.5.4.42" 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" isRequired="true"/>
-      <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="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="localityName" Name="urn:oid:2.5.4.7" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    </AttributeConsumingService>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="it">Istituto Nazionale di Fisica Nucleare</OrganizationName>
-    <OrganizationName xml:lang="en">Istituto Nazionale di Fisica Nucleare</OrganizationName>
-    <OrganizationDisplayName xml:lang="it">IGI Grid Portal erogato da INFN</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">IGI Grid Portal provided by INFN</OrganizationDisplayName>
-    <OrganizationURL xml:lang="it">http://www.infn.it</OrganizationURL>
-    <OrganizationURL xml:lang="en">http://www.infn.it/indexen.php</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <EmailAddress>igi-portal-admin@lists.italiangrid.it</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/halfback.cnaf.infn.it.xml b/swamid-interfederations-2.0/halfback.cnaf.infn.it.xml
deleted file mode 100644
index e3c978d6..00000000
--- a/swamid-interfederations-2.0/halfback.cnaf.infn.it.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" entityID="https://halfback.cnaf.infn.it/casshib/app2">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2012-07-04T15:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</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>
-        <mdui:DisplayName xml:lang="en">IGI Grid Portal</mdui:DisplayName>
-        <mdui:Description xml:lang="en">IGI is the Italian Grid infrastructure, run for the benefit of the research and education communities in Italy and worldwide.</mdui:Description>
-        <mdui:InformationURL xml:lang="en">https://wiki.italiangrid.it/IGIPortal</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://wiki.italiangrid.it/IGIPortal/Federation-info</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://halfback.cnaf.infn.it/casshib/shib/app2/Shibboleth.sso/Login"/>
-      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://halfback.cnaf.infn.it/casshib/shib/app2/Shibboleth.sso/Login" index="1"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIEhzCCA2+gAwIBAgIQYJH5E+/63l61Qiby7wHhYjANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTEyMDYyNTAwMDAwMFoXDTE1MDYyNTIzNTk1OVowXTELMAkGA1UE
-BhMCSVQxLjAsBgNVBAoTJUlzdGl0dXRvIE5hemlvbmFsZSBkaSBGaXNpY2EgTnVj
-bGVhcmUxHjAcBgNVBAMTFWhhbGZiYWNrLmNuYWYuaW5mbi5pdDCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBAOH0IRtQc7utWIumhJaEwwBdovpOu3eUH3X5
-DK7/OaQYHpo2+E1tnoHdG1JU+QgZocacuw3oJz74tGdknUsvDj9MCdp2lGYLpPW9
-p4WMK5+ElpVFjLcKdxndPNME8SF0nOcRoM9aMQhpOSnSLX3Ybeov/MO0dT9iVVmW
-KAau3hSeUZ2renaL/oQp+bK3+EoYImYV/5R1rkpTTf0brmaQg3GBdxADnAdwFBgG
-Y93qnKsYQjPsOg7ik7kf0jUSrITGo7rgLHvkElm4ySG01jOOtfw4AoglUppUan2x
-hlHYWrUhdqzNV2uasqHP3t7EA4tITv8IrgJj3k2coinPbB9s1mUCAwEAAaOCAWgw
-ggFkMB8GA1UdIwQYMBaAFAy9k2gM896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBTz
-kh/WAe7TMeep782t7Dy4EX8J/DAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIw
-ADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwGAYDVR0gBBEwDzANBgsr
-BgEEAbIxAQICHTA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJl
-bmEub3JnL1RFUkVOQVNTTENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUH
-MAKGKWh0dHA6Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYG
-CCsGAQUFBzABhhpodHRwOi8vb2NzcC50Y3MudGVyZW5hLm9yZzAgBgNVHREEGTAX
-ghVoYWxmYmFjay5jbmFmLmluZm4uaXQwDQYJKoZIhvcNAQEFBQADggEBAHW8TsHv
-D7EM9iMprOIH+5VeRSh0cYEdttX033scsifCFCArRJvhofIkR/1F23DIWRnc8//4
-7MKSrLoC9PNeIjXa6anC3O9IZNCeBxb9UEcRvPW3Yc1wEe4ATp1aR8EXtH3G2Sef
-EELgyGnKzScgkUSGIbgf9P05XOyok0RuKWTHDvYNHr/GW/NW5optwXz6apDDE2mX
-icFWqRortYglbk+s6VO0hcYN6ORR5UBgOR6VULrT9r6mDQykItMVhBgt4peAeOss
-+6acaFTdJZHMD+Z3KkvA7yfD4IWulPnTaT+o1n7X1V6oAEVHn6SfpuBeP+wXeu+f
-yVxNpwv+OOJLtns=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://halfback.cnaf.infn.it/casshib/shib/app2/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://halfback.cnaf.infn.it/casshib/shib/app2/Shibboleth.sso/SLO/Artifact"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://halfback.cnaf.infn.it/casshib/shib/app2/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://halfback.cnaf.infn.it/casshib/shib/app2/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://halfback.cnaf.infn.it/casshib/shib/app2/Shibboleth.sso/SLO/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://halfback.cnaf.infn.it/casshib/shib/app2/Shibboleth.sso/NIM/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://halfback.cnaf.infn.it/casshib/shib/app2/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://halfback.cnaf.infn.it/casshib/shib/app2/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://halfback.cnaf.infn.it/casshib/shib/app2/Shibboleth.sso/NIM/SOAP"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://halfback.cnaf.infn.it/casshib/shib/app2/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://halfback.cnaf.infn.it/casshib/shib/app2/Shibboleth.sso/SAML/POST" index="7"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://halfback.cnaf.infn.it/casshib/shib/app2/Shibboleth.sso/SAML2/Artifact" index="8"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://halfback.cnaf.infn.it/casshib/shib/app2/Shibboleth.sso/SAML2/ECP" index="9"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://halfback.cnaf.infn.it/casshib/shib/app2/Shibboleth.sso/SAML2/POST" index="10"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://halfback.cnaf.infn.it/casshib/shib/app2/Shibboleth.sso/SAML2/POST-SimpleSign" index="11"/>
-    <AttributeConsumingService index="1">
-      <ServiceName xml:lang="en">IGI Grid Portal provided by INFN</ServiceName>
-      <ServiceDescription xml:lang="en">IGI is the Italian Grid infrastructure, run for the benefit of the research and education communities in Italy and worldwide</ServiceDescription>
-      <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="givenName" Name="urn:oid:2.5.4.42" 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" isRequired="true"/>
-      <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="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="localityName" Name="urn:oid:2.5.4.7" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    </AttributeConsumingService>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="it">Istituto Nazionale di Fisica Nucleare</OrganizationName>
-    <OrganizationName xml:lang="en">Istituto Nazionale di Fisica Nucleare</OrganizationName>
-    <OrganizationDisplayName xml:lang="it">IGI Grid Portal erogato da INFN</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">IGI Grid Portal provided by INFN</OrganizationDisplayName>
-    <OrganizationURL xml:lang="it">http://www.infn.it</OrganizationURL>
-    <OrganizationURL xml:lang="en">http://www.infn.it/indexen.php</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <EmailAddress>igi-portal-admin@lists.italiangrid.it</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/hbidp.hb.se-idp-shibboleth.xml b/swamid-interfederations-2.0/hbidp.hb.se-idp-shibboleth.xml
deleted file mode 100644
index 95642b0f..00000000
--- a/swamid-interfederations-2.0/hbidp.hb.se-idp-shibboleth.xml
+++ /dev/null
@@ -1,159 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://hbidp.hb.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">hb.se</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="sv">Högskolan i Borås</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">University of Borås</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Identity Provider för anställda och studenter vid Högskolan i Borås.</mdui:Description>
-        <mdui:Description xml:lang="en">Identity Provider for employees and students at Borås University.</mdui:Description>
-        <mdui:InformationURL xml:lang="sv">http://www.hb.se/Om-hogskolan/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">https://www.hb.se/en/About-UB/</mdui:InformationURL>
-        <mdui:Logo height="90" width="350">https://www.hb.se//PageFiles/41206/HBloggaSwamid.gif</mdui:Logo>
-        <mdui:Logo height="90" width="350" xml:lang="sv">https://www.hb.se//PageFiles/41206/HBloggaSwamid.gif</mdui:Logo>
-        <mdui:Keywords xml:lang="sv">hb högskolan+i+borås hogskolan+i+boras textilhogskolan textilhögskolan bibliotekshogskolan bibliotekshögskolan university+of+borås textile+university+of+borås university+of+boras textile+university+of+boras boras+university+of+library+science borås+university+of+library+science</mdui:Keywords>
-        <mdui:Keywords xml:lang="en">hb högskolan+i+borås hogskolan+i+boras textilhogskolan textilhögskolan bibliotekshogskolan bibliotekshögskolan university+of+borås textile+university+of+borås university+of+boras textile+university+of+boras boras+university+of+library+science borås+university+of+library+science</mdui:Keywords>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DomainHint>hb.se</mdui:DomainHint>
-        <mdui:IPHint>193.10.168.0/24</mdui:IPHint>
-        <mdui:IPHint>193.10.169.0/24</mdui:IPHint>
-        <mdui:IPHint>193.10.170.0/24</mdui:IPHint>
-        <mdui:IPHint>193.10.171.0/24</mdui:IPHint>
-        <mdui:IPHint>193.10.172.0/24</mdui:IPHint>
-        <mdui:IPHint>193.10.173.0/24</mdui:IPHint>
-        <mdui:IPHint>193.10.174.0/24</mdui:IPHint>
-        <mdui:IPHint>193.10.175.0/24</mdui:IPHint>
-        <mdui:IPHint>193.10.245.0/24</mdui:IPHint>
-        <mdui:IPHint>193.10.246.0/24</mdui:IPHint>
-        <mdui:IPHint>193.10.247.0/24</mdui:IPHint>
-        <mdui:IPHint>193.11.64.0/24</mdui:IPHint>
-        <mdui:IPHint>193.11.65.0/24</mdui:IPHint>
-        <mdui:IPHint>193.11.66.0/24</mdui:IPHint>
-        <mdui:IPHint>193.11.67.0/24</mdui:IPHint>
-        <mdui:IPHint>193.11.68.0/24</mdui:IPHint>
-        <mdui:IPHint>193.11.69.0/24</mdui:IPHint>
-        <mdui:IPHint>193.11.70.0/24</mdui:IPHint>
-        <mdui:IPHint>193.11.71.0/24</mdui:IPHint>
-        <mdui:IPHint>193.11.72.0/24</mdui:IPHint>
-        <mdui:IPHint>193.11.73.0/24</mdui:IPHint>
-        <mdui:GeolocationHint>geo:57.724368,12.939918</mdui:GeolocationHint>
-      </mdui:DiscoHints>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIEfjCCA2agAwIBAgIQQh0tAUo8tbGvjLhvMULUFjANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTA5MTAwMTAwMDAwMFoXDTEyMDkzMDIzNTk1OVowTjELMAkGA1UE
-BhMCU0UxHDAaBgNVBAoME0jDtmdza29sYW4gaSBCb3LDpXMxCzAJBgNVBAsTAklU
-MRQwEgYDVQQDEwtoYmlkcC5oYi5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
-AQoCggEBANmhPsWXpER8PlBGqHtoR1hsTeLWqTRGhaFm9Vuc57qf7xd328jkwZ3C
-tyBL65rNHYI/EVrsiA5nNAm/NLuPl5Wh8IOztI26XcHgNhYgqe6Tlpw5kN4pn0ME
-+KAMAGKh1PAaKP2E3sHN2k3QdqHU0hesmaFHRAm+9JqcP++Frkdr1WVIcxYniOBa
-dorbeA+Mui3WaMsUm/tkYTOOQ3QCHi2VT9U6JOIVyuyIjX6slHhS2LkCSAKn4sKD
-DUVaeSyTxWrH12Dx/mMd8BfXV8XkjBbDNzfFizxTzHsdrj8K8y9ggGiv5+g1Mmsf
-2ehMfEhN0TNtVLaiw9Br2N7XSLLGuaMCAwEAAaOCAW4wggFqMB8GA1UdIwQYMBaA
-FAy9k2gM896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBRNDaiYtvTh/NO79ufN3n7k
-Zx6CjjAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggr
-BgEFBQcDAQYIKwYBBQUHAwIwGAYDVR0gBBEwDzANBgsrBgEEAbIxAQICHTA6BgNV
-HR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNT
-TENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQu
-dGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRw
-Oi8vb2NzcC50Y3MudGVyZW5hLm9yZzAmBgNVHREEHzAdggtoYmlkcC5oYi5zZYIO
-dm0taGJpZHAuaGIuc2UwDQYJKoZIhvcNAQEFBQADggEBACUT4mjeYXLYfWz4oKhH
-ou/S52jlhiVtskXArO7Ntxk0Oy6tpSkRYgyBN4NDuaFfS//69Et4kQWfxpe7tS8X
-t2cEEtTRhYhwBpBHCMnixRxcoYyeH60fnHoeCn+w7HmD+ffyRojbtcE86O+7bRTP
-J2xZfZxoRzyEYBVfLBEcBSOYTQrlIBtZmZS/w4whSQs5ruf5X9Wj7BrFLjo8nnli
-rA6Msf8vaeuR1RNKQFHIx/vX3Aj+s2E4rq+L9O3BDAyfc1vKiNy8LLhlvYUFl9If
-NtlzTU8oxWfErMa+Y2BMXWIALruQgeQrFxbO/k4RoPBHRvCul0uUsxak1IFtfT0x
-9Ks=
-
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://hbidp.hb.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://hbidp.hb.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://hbidp.hb.se/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://hbidp.hb.se/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://hbidp.hb.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://hbidp.hb.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">hb.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIEfjCCA2agAwIBAgIQQh0tAUo8tbGvjLhvMULUFjANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTA5MTAwMTAwMDAwMFoXDTEyMDkzMDIzNTk1OVowTjELMAkGA1UE
-BhMCU0UxHDAaBgNVBAoME0jDtmdza29sYW4gaSBCb3LDpXMxCzAJBgNVBAsTAklU
-MRQwEgYDVQQDEwtoYmlkcC5oYi5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
-AQoCggEBANmhPsWXpER8PlBGqHtoR1hsTeLWqTRGhaFm9Vuc57qf7xd328jkwZ3C
-tyBL65rNHYI/EVrsiA5nNAm/NLuPl5Wh8IOztI26XcHgNhYgqe6Tlpw5kN4pn0ME
-+KAMAGKh1PAaKP2E3sHN2k3QdqHU0hesmaFHRAm+9JqcP++Frkdr1WVIcxYniOBa
-dorbeA+Mui3WaMsUm/tkYTOOQ3QCHi2VT9U6JOIVyuyIjX6slHhS2LkCSAKn4sKD
-DUVaeSyTxWrH12Dx/mMd8BfXV8XkjBbDNzfFizxTzHsdrj8K8y9ggGiv5+g1Mmsf
-2ehMfEhN0TNtVLaiw9Br2N7XSLLGuaMCAwEAAaOCAW4wggFqMB8GA1UdIwQYMBaA
-FAy9k2gM896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBRNDaiYtvTh/NO79ufN3n7k
-Zx6CjjAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggr
-BgEFBQcDAQYIKwYBBQUHAwIwGAYDVR0gBBEwDzANBgsrBgEEAbIxAQICHTA6BgNV
-HR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNT
-TENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQu
-dGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRw
-Oi8vb2NzcC50Y3MudGVyZW5hLm9yZzAmBgNVHREEHzAdggtoYmlkcC5oYi5zZYIO
-dm0taGJpZHAuaGIuc2UwDQYJKoZIhvcNAQEFBQADggEBACUT4mjeYXLYfWz4oKhH
-ou/S52jlhiVtskXArO7Ntxk0Oy6tpSkRYgyBN4NDuaFfS//69Et4kQWfxpe7tS8X
-t2cEEtTRhYhwBpBHCMnixRxcoYyeH60fnHoeCn+w7HmD+ffyRojbtcE86O+7bRTP
-J2xZfZxoRzyEYBVfLBEcBSOYTQrlIBtZmZS/w4whSQs5ruf5X9Wj7BrFLjo8nnli
-rA6Msf8vaeuR1RNKQFHIx/vX3Aj+s2E4rq+L9O3BDAyfc1vKiNy8LLhlvYUFl9If
-NtlzTU8oxWfErMa+Y2BMXWIALruQgeQrFxbO/k4RoPBHRvCul0uUsxak1IFtfT0x
-9Ks=
-
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://hbidp.hb.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://hbidp.hb.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">HB</OrganizationName>
-    <OrganizationDisplayName xml:lang="sv">Högskolan i Borås</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">University of Borås</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.hb.se</OrganizationURL>
-  </Organization>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
-    <Company>University of Borås</Company>
-    <SurName>IT-avdelningen</SurName>
-    <EmailAddress>it-avdelningen@hb.se</EmailAddress>
-    <TelephoneNumber>+46 33 435 4690</TelephoneNumber>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
-    <Company>University of Borås</Company>
-    <SurName>Per-Olof Axelsson</SurName>
-    <EmailAddress>Per-Olof.Axelsson@hb.se</EmailAddress>
-    <TelephoneNumber>+46 33 435 4697</TelephoneNumber>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
-    <Company>University of Borås</Company>
-    <SurName>IT-avdelningen</SurName>
-    <EmailAddress>it-avdelningen@hb.se</EmailAddress>
-    <TelephoneNumber>+46 33 435 4690</TelephoneNumber>
-  </ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/hbidp.hb.se.xml b/swamid-interfederations-2.0/hbidp.hb.se.xml
deleted file mode 100644
index 95642b0f..00000000
--- a/swamid-interfederations-2.0/hbidp.hb.se.xml
+++ /dev/null
@@ -1,159 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://hbidp.hb.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">hb.se</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="sv">Högskolan i Borås</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">University of Borås</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Identity Provider för anställda och studenter vid Högskolan i Borås.</mdui:Description>
-        <mdui:Description xml:lang="en">Identity Provider for employees and students at Borås University.</mdui:Description>
-        <mdui:InformationURL xml:lang="sv">http://www.hb.se/Om-hogskolan/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">https://www.hb.se/en/About-UB/</mdui:InformationURL>
-        <mdui:Logo height="90" width="350">https://www.hb.se//PageFiles/41206/HBloggaSwamid.gif</mdui:Logo>
-        <mdui:Logo height="90" width="350" xml:lang="sv">https://www.hb.se//PageFiles/41206/HBloggaSwamid.gif</mdui:Logo>
-        <mdui:Keywords xml:lang="sv">hb högskolan+i+borås hogskolan+i+boras textilhogskolan textilhögskolan bibliotekshogskolan bibliotekshögskolan university+of+borås textile+university+of+borås university+of+boras textile+university+of+boras boras+university+of+library+science borås+university+of+library+science</mdui:Keywords>
-        <mdui:Keywords xml:lang="en">hb högskolan+i+borås hogskolan+i+boras textilhogskolan textilhögskolan bibliotekshogskolan bibliotekshögskolan university+of+borås textile+university+of+borås university+of+boras textile+university+of+boras boras+university+of+library+science borås+university+of+library+science</mdui:Keywords>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DomainHint>hb.se</mdui:DomainHint>
-        <mdui:IPHint>193.10.168.0/24</mdui:IPHint>
-        <mdui:IPHint>193.10.169.0/24</mdui:IPHint>
-        <mdui:IPHint>193.10.170.0/24</mdui:IPHint>
-        <mdui:IPHint>193.10.171.0/24</mdui:IPHint>
-        <mdui:IPHint>193.10.172.0/24</mdui:IPHint>
-        <mdui:IPHint>193.10.173.0/24</mdui:IPHint>
-        <mdui:IPHint>193.10.174.0/24</mdui:IPHint>
-        <mdui:IPHint>193.10.175.0/24</mdui:IPHint>
-        <mdui:IPHint>193.10.245.0/24</mdui:IPHint>
-        <mdui:IPHint>193.10.246.0/24</mdui:IPHint>
-        <mdui:IPHint>193.10.247.0/24</mdui:IPHint>
-        <mdui:IPHint>193.11.64.0/24</mdui:IPHint>
-        <mdui:IPHint>193.11.65.0/24</mdui:IPHint>
-        <mdui:IPHint>193.11.66.0/24</mdui:IPHint>
-        <mdui:IPHint>193.11.67.0/24</mdui:IPHint>
-        <mdui:IPHint>193.11.68.0/24</mdui:IPHint>
-        <mdui:IPHint>193.11.69.0/24</mdui:IPHint>
-        <mdui:IPHint>193.11.70.0/24</mdui:IPHint>
-        <mdui:IPHint>193.11.71.0/24</mdui:IPHint>
-        <mdui:IPHint>193.11.72.0/24</mdui:IPHint>
-        <mdui:IPHint>193.11.73.0/24</mdui:IPHint>
-        <mdui:GeolocationHint>geo:57.724368,12.939918</mdui:GeolocationHint>
-      </mdui:DiscoHints>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIEfjCCA2agAwIBAgIQQh0tAUo8tbGvjLhvMULUFjANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTA5MTAwMTAwMDAwMFoXDTEyMDkzMDIzNTk1OVowTjELMAkGA1UE
-BhMCU0UxHDAaBgNVBAoME0jDtmdza29sYW4gaSBCb3LDpXMxCzAJBgNVBAsTAklU
-MRQwEgYDVQQDEwtoYmlkcC5oYi5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
-AQoCggEBANmhPsWXpER8PlBGqHtoR1hsTeLWqTRGhaFm9Vuc57qf7xd328jkwZ3C
-tyBL65rNHYI/EVrsiA5nNAm/NLuPl5Wh8IOztI26XcHgNhYgqe6Tlpw5kN4pn0ME
-+KAMAGKh1PAaKP2E3sHN2k3QdqHU0hesmaFHRAm+9JqcP++Frkdr1WVIcxYniOBa
-dorbeA+Mui3WaMsUm/tkYTOOQ3QCHi2VT9U6JOIVyuyIjX6slHhS2LkCSAKn4sKD
-DUVaeSyTxWrH12Dx/mMd8BfXV8XkjBbDNzfFizxTzHsdrj8K8y9ggGiv5+g1Mmsf
-2ehMfEhN0TNtVLaiw9Br2N7XSLLGuaMCAwEAAaOCAW4wggFqMB8GA1UdIwQYMBaA
-FAy9k2gM896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBRNDaiYtvTh/NO79ufN3n7k
-Zx6CjjAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggr
-BgEFBQcDAQYIKwYBBQUHAwIwGAYDVR0gBBEwDzANBgsrBgEEAbIxAQICHTA6BgNV
-HR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNT
-TENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQu
-dGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRw
-Oi8vb2NzcC50Y3MudGVyZW5hLm9yZzAmBgNVHREEHzAdggtoYmlkcC5oYi5zZYIO
-dm0taGJpZHAuaGIuc2UwDQYJKoZIhvcNAQEFBQADggEBACUT4mjeYXLYfWz4oKhH
-ou/S52jlhiVtskXArO7Ntxk0Oy6tpSkRYgyBN4NDuaFfS//69Et4kQWfxpe7tS8X
-t2cEEtTRhYhwBpBHCMnixRxcoYyeH60fnHoeCn+w7HmD+ffyRojbtcE86O+7bRTP
-J2xZfZxoRzyEYBVfLBEcBSOYTQrlIBtZmZS/w4whSQs5ruf5X9Wj7BrFLjo8nnli
-rA6Msf8vaeuR1RNKQFHIx/vX3Aj+s2E4rq+L9O3BDAyfc1vKiNy8LLhlvYUFl9If
-NtlzTU8oxWfErMa+Y2BMXWIALruQgeQrFxbO/k4RoPBHRvCul0uUsxak1IFtfT0x
-9Ks=
-
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://hbidp.hb.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://hbidp.hb.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://hbidp.hb.se/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://hbidp.hb.se/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://hbidp.hb.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://hbidp.hb.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">hb.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIEfjCCA2agAwIBAgIQQh0tAUo8tbGvjLhvMULUFjANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTA5MTAwMTAwMDAwMFoXDTEyMDkzMDIzNTk1OVowTjELMAkGA1UE
-BhMCU0UxHDAaBgNVBAoME0jDtmdza29sYW4gaSBCb3LDpXMxCzAJBgNVBAsTAklU
-MRQwEgYDVQQDEwtoYmlkcC5oYi5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
-AQoCggEBANmhPsWXpER8PlBGqHtoR1hsTeLWqTRGhaFm9Vuc57qf7xd328jkwZ3C
-tyBL65rNHYI/EVrsiA5nNAm/NLuPl5Wh8IOztI26XcHgNhYgqe6Tlpw5kN4pn0ME
-+KAMAGKh1PAaKP2E3sHN2k3QdqHU0hesmaFHRAm+9JqcP++Frkdr1WVIcxYniOBa
-dorbeA+Mui3WaMsUm/tkYTOOQ3QCHi2VT9U6JOIVyuyIjX6slHhS2LkCSAKn4sKD
-DUVaeSyTxWrH12Dx/mMd8BfXV8XkjBbDNzfFizxTzHsdrj8K8y9ggGiv5+g1Mmsf
-2ehMfEhN0TNtVLaiw9Br2N7XSLLGuaMCAwEAAaOCAW4wggFqMB8GA1UdIwQYMBaA
-FAy9k2gM896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBRNDaiYtvTh/NO79ufN3n7k
-Zx6CjjAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggr
-BgEFBQcDAQYIKwYBBQUHAwIwGAYDVR0gBBEwDzANBgsrBgEEAbIxAQICHTA6BgNV
-HR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNT
-TENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQu
-dGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRw
-Oi8vb2NzcC50Y3MudGVyZW5hLm9yZzAmBgNVHREEHzAdggtoYmlkcC5oYi5zZYIO
-dm0taGJpZHAuaGIuc2UwDQYJKoZIhvcNAQEFBQADggEBACUT4mjeYXLYfWz4oKhH
-ou/S52jlhiVtskXArO7Ntxk0Oy6tpSkRYgyBN4NDuaFfS//69Et4kQWfxpe7tS8X
-t2cEEtTRhYhwBpBHCMnixRxcoYyeH60fnHoeCn+w7HmD+ffyRojbtcE86O+7bRTP
-J2xZfZxoRzyEYBVfLBEcBSOYTQrlIBtZmZS/w4whSQs5ruf5X9Wj7BrFLjo8nnli
-rA6Msf8vaeuR1RNKQFHIx/vX3Aj+s2E4rq+L9O3BDAyfc1vKiNy8LLhlvYUFl9If
-NtlzTU8oxWfErMa+Y2BMXWIALruQgeQrFxbO/k4RoPBHRvCul0uUsxak1IFtfT0x
-9Ks=
-
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://hbidp.hb.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://hbidp.hb.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">HB</OrganizationName>
-    <OrganizationDisplayName xml:lang="sv">Högskolan i Borås</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">University of Borås</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.hb.se</OrganizationURL>
-  </Organization>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
-    <Company>University of Borås</Company>
-    <SurName>IT-avdelningen</SurName>
-    <EmailAddress>it-avdelningen@hb.se</EmailAddress>
-    <TelephoneNumber>+46 33 435 4690</TelephoneNumber>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
-    <Company>University of Borås</Company>
-    <SurName>Per-Olof Axelsson</SurName>
-    <EmailAddress>Per-Olof.Axelsson@hb.se</EmailAddress>
-    <TelephoneNumber>+46 33 435 4697</TelephoneNumber>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
-    <Company>University of Borås</Company>
-    <SurName>IT-avdelningen</SurName>
-    <EmailAddress>it-avdelningen@hb.se</EmailAddress>
-    <TelephoneNumber>+46 33 435 4690</TelephoneNumber>
-  </ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/homeproj.cesnet.cz.xml b/swamid-interfederations-2.0/homeproj.cesnet.cz.xml
deleted file mode 100644
index 64b36ac8..00000000
--- a/swamid-interfederations-2.0/homeproj.cesnet.cz.xml
+++ /dev/null
@@ -1,187 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://homeproj.cesnet.cz/sp/shibboleth">
-  <md: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>
-  </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>
-      <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://homeproj.cesnet.cz/Shibboleth.sso/DS" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">homeproj.cesnet.cz</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="cs">homeproj.cesnet.cz</mdui:DisplayName>
-        <mdui:Description xml:lang="en">CESNETs repository and colaboration server.</mdui:Description>
-        <mdui:Description xml:lang="cs">CESNETi repozitar a kolaborativni server.</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>homeproj.cesnet.cz</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=homeproj.cesnet.cz,O=CESNET,C=CZ</ds:X509SubjectName>
-          <ds:X509Certificate>MIIEYzCCA0ugAwIBAgIRAPmFxcaH7//BneN4XQLF6/QwDQYJKoZIhvcNAQEFBQAw
-NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-IFNTTCBDQTAeFw0xMDA2MTcwMDAwMDBaFw0xMzA2MTYyMzU5NTlaMDsxCzAJBgNV
-BAYTAkNaMQ8wDQYDVQQKEwZDRVNORVQxGzAZBgNVBAMTEmhvbWVwcm9qLmNlc25l
-dC5jejCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJ9mEv9sT/gctkA+
-46DGs37LwePuU2Kci717IlyyBwj/m6Z3TLbQnRbWg2JIkcKxBr4KGM4F7HugamGs
-sHZqlW83W29bmoeCc4GxrUk/ilp1hfU5pDCYc2VlqxGcI5RiuAL+HjO4zY0u213M
-zhyQ8hafCYF4keDMbSCr+QsSjK4ffMvN9la75JMxNWTOI7LmA7Zddy2Wp8WxYyF9
-saoj4/oZAoQQmeqdwxd7UXkZXmhUq+DWH9csNX6CgT0bEgl0ceph8y8fFQKEDb0G
-Mj464xKiE9bEyOZjLP1mhYgJmZ5KJuDF/VA7FmJc03r1TiQ3oUInorsL6EUVpour
-YZ0AENECAwEAAaOCAWUwggFhMB8GA1UdIwQYMBaAFAy9k2gM896ro0lrKzdXR+qQ
-47ntMB0GA1UdDgQWBBT5kuzyfLmgWQPzUHV0Xa+DeQ3GTDAOBgNVHQ8BAf8EBAMC
-BaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIw
-GAYDVR0gBBEwDzANBgsrBgEEAbIxAQICHTA6BgNVHR8EMzAxMC+gLaArhilodHRw
-Oi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNybDBtBggrBgEFBQcB
-AQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVS
-RU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8vb2NzcC50Y3MudGVyZW5h
-Lm9yZzAdBgNVHREEFjAUghJob21lcHJvai5jZXNuZXQuY3owDQYJKoZIhvcNAQEF
-BQADggEBAD0bRuPv3EZK0qZbANcOPpxXmi/a1Bfo8tuosQs6EuPvPKfPEi4s0nr1
-Fg46hZW0csonglMsxH3cbA0ZwehwWBZn4zYYKIph271Ne4fM8VwEAYW6P3xBxI+k
-S5MM7trK2O5huAHm0+7253Ma2luKJ9y8zSyotHh6CtZ1yTWt/BZRkmQKg067167M
-SD+D5Gi/fMYF7OwfEYfVAAV+qjGgquZHwpstFzd4YtpcejX9rfLg/VsNMZv2HbAN
-nbs3Yo3jtGvgf5E+frLhlvVGXoVH3f8M7B+QmRsMEYDtAGxBn+vCA81wyFHl2YIi
-K1S9YPh9zuhkjLIqJukO/GbQDyMZpOo=
-</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>homeproj-ng.cesnet.cz</ds:KeyName>
-        <ds:KeyName>homeproj.cesnet.cz</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=homeproj.cesnet.cz,O=CESNET,C=CZ</ds:X509SubjectName>
-          <ds:X509Certificate>MIIEeTCCA2GgAwIBAgIQWQRSmw3VFnRkwQ7GwFczsDANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTEzMDExODAwMDAwMFoXDTE2MDExODIzNTk1OVowOzELMAkGA1UE
-BhMCQ1oxDzANBgNVBAoTBkNFU05FVDEbMBkGA1UEAxMSaG9tZXByb2ouY2VzbmV0
-LmN6MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA5jC/vA/pNrHbIn/N
-YYyV8ir/ZWdsx1PhlPhuy0VdKTWkv47pu7xLHdcdjLiN4O2i2LL3IjdChQYHG+pe
-ih9ow2sNP8jJOLUMkpaezcCULSJ334IgH/H4eZtOHVqXB2ycP1DO7lK+cxgl0Kis
-rrw8ntSf4L6Cv3tTMUBBwQ2uZVmFndoAYR8hVQox+2rR0OwZ0wGtpcU3UaIPfgYR
-1sSW6rO9GbzazrkiEBmNAqd4YA5ArRWBxUSIQdpaAGfhTp7ZLDsgcHVLiLQvKMmq
-CGBS7fvdtN70Tm3/p5L+qcUSL6tVp+KPejTzKSFd6OxUyEVCLmYEA7P8wXGtwQ08
-ObuX6QIDAQABo4IBfDCCAXgwHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsrN1dH6pDj
-ue0wHQYDVR0OBBYEFMaHVqZHBUkiSv+8pzj4jnaJhAxHMA4GA1UdDwEB/wQEAwIF
-oDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAY
-BgNVHSAEETAPMA0GCysGAQQBsjEBAgIdMDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6
-Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3JsMG0GCCsGAQUFBwEB
-BGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50Y3MudGVyZW5hLm9yZy9URVJF
-TkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9vY3NwLnRjcy50ZXJlbmEu
-b3JnMDQGA1UdEQQtMCuCEmhvbWVwcm9qLmNlc25ldC5jeoIVaG9tZXByb2otbmcu
-Y2VzbmV0LmN6MA0GCSqGSIb3DQEBBQUAA4IBAQBUkkwUrLVcS2PtUndgvLEaglea
-idhdLIAyMdHn6JbhSlHy1vQIi3ZrW+2bIHAuLtjFiM+S2pC8JOtkxTFDLqVk3B/q
-a0afZGvJ8ADMdwJhMTLFoGswvskn7QsGDJvlhm5wUXxh/MSK7DYzfEeSInfKtYHv
-/lVDr86yhWPKsAnutCITg3Y9Sq9xT+OBlLoNqMBGoY3qV6OxdGWaQ3FUf5x0U8RD
-mlhbeVMv9Ux/N4Ji5GjfZ8QcO6cjmMVjsE24R9XHOX3hdcH2Ou622mC+XJ1/SzN5
-UHGuWn2tXixcUxwXgp/go90sJTeTDbBJQhG4kKEquAdCnAxO1DZN23GVn1w3
-</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>homeproj.cesnet.cz</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=homeproj.cesnet.cz,O=CESNET,C=CZ</ds:X509SubjectName>
-          <ds:X509Certificate>MIIEYzCCA0ugAwIBAgIRAPmFxcaH7//BneN4XQLF6/QwDQYJKoZIhvcNAQEFBQAw
-NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-IFNTTCBDQTAeFw0xMDA2MTcwMDAwMDBaFw0xMzA2MTYyMzU5NTlaMDsxCzAJBgNV
-BAYTAkNaMQ8wDQYDVQQKEwZDRVNORVQxGzAZBgNVBAMTEmhvbWVwcm9qLmNlc25l
-dC5jejCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJ9mEv9sT/gctkA+
-46DGs37LwePuU2Kci717IlyyBwj/m6Z3TLbQnRbWg2JIkcKxBr4KGM4F7HugamGs
-sHZqlW83W29bmoeCc4GxrUk/ilp1hfU5pDCYc2VlqxGcI5RiuAL+HjO4zY0u213M
-zhyQ8hafCYF4keDMbSCr+QsSjK4ffMvN9la75JMxNWTOI7LmA7Zddy2Wp8WxYyF9
-saoj4/oZAoQQmeqdwxd7UXkZXmhUq+DWH9csNX6CgT0bEgl0ceph8y8fFQKEDb0G
-Mj464xKiE9bEyOZjLP1mhYgJmZ5KJuDF/VA7FmJc03r1TiQ3oUInorsL6EUVpour
-YZ0AENECAwEAAaOCAWUwggFhMB8GA1UdIwQYMBaAFAy9k2gM896ro0lrKzdXR+qQ
-47ntMB0GA1UdDgQWBBT5kuzyfLmgWQPzUHV0Xa+DeQ3GTDAOBgNVHQ8BAf8EBAMC
-BaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIw
-GAYDVR0gBBEwDzANBgsrBgEEAbIxAQICHTA6BgNVHR8EMzAxMC+gLaArhilodHRw
-Oi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNybDBtBggrBgEFBQcB
-AQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVS
-RU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8vb2NzcC50Y3MudGVyZW5h
-Lm9yZzAdBgNVHREEFjAUghJob21lcHJvai5jZXNuZXQuY3owDQYJKoZIhvcNAQEF
-BQADggEBAD0bRuPv3EZK0qZbANcOPpxXmi/a1Bfo8tuosQs6EuPvPKfPEi4s0nr1
-Fg46hZW0csonglMsxH3cbA0ZwehwWBZn4zYYKIph271Ne4fM8VwEAYW6P3xBxI+k
-S5MM7trK2O5huAHm0+7253Ma2luKJ9y8zSyotHh6CtZ1yTWt/BZRkmQKg067167M
-SD+D5Gi/fMYF7OwfEYfVAAV+qjGgquZHwpstFzd4YtpcejX9rfLg/VsNMZv2HbAN
-nbs3Yo3jtGvgf5E+frLhlvVGXoVH3f8M7B+QmRsMEYDtAGxBn+vCA81wyFHl2YIi
-K1S9YPh9zuhkjLIqJukO/GbQDyMZpOo=
-</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>homeproj-ng.cesnet.cz</ds:KeyName>
-        <ds:KeyName>homeproj.cesnet.cz</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=homeproj.cesnet.cz,O=CESNET,C=CZ</ds:X509SubjectName>
-          <ds:X509Certificate>MIIEeTCCA2GgAwIBAgIQWQRSmw3VFnRkwQ7GwFczsDANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTEzMDExODAwMDAwMFoXDTE2MDExODIzNTk1OVowOzELMAkGA1UE
-BhMCQ1oxDzANBgNVBAoTBkNFU05FVDEbMBkGA1UEAxMSaG9tZXByb2ouY2VzbmV0
-LmN6MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA5jC/vA/pNrHbIn/N
-YYyV8ir/ZWdsx1PhlPhuy0VdKTWkv47pu7xLHdcdjLiN4O2i2LL3IjdChQYHG+pe
-ih9ow2sNP8jJOLUMkpaezcCULSJ334IgH/H4eZtOHVqXB2ycP1DO7lK+cxgl0Kis
-rrw8ntSf4L6Cv3tTMUBBwQ2uZVmFndoAYR8hVQox+2rR0OwZ0wGtpcU3UaIPfgYR
-1sSW6rO9GbzazrkiEBmNAqd4YA5ArRWBxUSIQdpaAGfhTp7ZLDsgcHVLiLQvKMmq
-CGBS7fvdtN70Tm3/p5L+qcUSL6tVp+KPejTzKSFd6OxUyEVCLmYEA7P8wXGtwQ08
-ObuX6QIDAQABo4IBfDCCAXgwHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsrN1dH6pDj
-ue0wHQYDVR0OBBYEFMaHVqZHBUkiSv+8pzj4jnaJhAxHMA4GA1UdDwEB/wQEAwIF
-oDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAY
-BgNVHSAEETAPMA0GCysGAQQBsjEBAgIdMDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6
-Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3JsMG0GCCsGAQUFBwEB
-BGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50Y3MudGVyZW5hLm9yZy9URVJF
-TkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9vY3NwLnRjcy50ZXJlbmEu
-b3JnMDQGA1UdEQQtMCuCEmhvbWVwcm9qLmNlc25ldC5jeoIVaG9tZXByb2otbmcu
-Y2VzbmV0LmN6MA0GCSqGSIb3DQEBBQUAA4IBAQBUkkwUrLVcS2PtUndgvLEaglea
-idhdLIAyMdHn6JbhSlHy1vQIi3ZrW+2bIHAuLtjFiM+S2pC8JOtkxTFDLqVk3B/q
-a0afZGvJ8ADMdwJhMTLFoGswvskn7QsGDJvlhm5wUXxh/MSK7DYzfEeSInfKtYHv
-/lVDr86yhWPKsAnutCITg3Y9Sq9xT+OBlLoNqMBGoY3qV6OxdGWaQ3FUf5x0U8RD
-mlhbeVMv9Ux/N4Ji5GjfZ8QcO6cjmMVjsE24R9XHOX3hdcH2Ou622mC+XJ1/SzN5
-UHGuWn2tXixcUxwXgp/go90sJTeTDbBJQhG4kKEquAdCnAxO1DZN23GVn1w3
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://homeproj.cesnet.cz/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://homeproj.cesnet.cz/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://homeproj.cesnet.cz/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://homeproj.cesnet.cz/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://homeproj.cesnet.cz/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://homeproj.cesnet.cz/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://homeproj.cesnet.cz/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://homeproj.cesnet.cz/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://homeproj.cesnet.cz/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://homeproj.cesnet.cz/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://homeproj.cesnet.cz/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://homeproj.cesnet.cz/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://homeproj.cesnet.cz/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://homeproj.cesnet.cz/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-  <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
-    <OrganizationName xml:lang="en">CESNET</OrganizationName>
-    <OrganizationDisplayName xml:lang="cs">CESNET</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">CESNET</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.cesnet.cz/</OrganizationURL>
-  </Organization>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
-    <GivenName>Jan</GivenName>
-    <SurName>Mach</SurName>
-    <EmailAddress>jan.mach@cesnet.cz</EmailAddress>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
-    <GivenName>Jan</GivenName>
-    <SurName>Ruzicka</SurName>
-    <EmailAddress>janru@cesnet.cz</EmailAddress>
-  </ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/iam.cf.ac.uk-sp-shibboleth.xml b/swamid-interfederations-2.0/iam.cf.ac.uk-sp-shibboleth.xml
deleted file mode 100644
index e3f54037..00000000
--- a/swamid-interfederations-2.0/iam.cf.ac.uk-sp-shibboleth.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://iam.cf.ac.uk/sp/shibboleth">
-  <!--
-		This is a IAM@Cardiff Shibboleth SP for Cardiff University.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2010-02-22T13:42:00Z">
-      <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>
-      <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://iam.cf.ac.uk/Shibboleth.sso/DS" index="1"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDDzCCAfegAwIBAgIJAMuQ3vgWPWjiMA0GCSqGSIb3DQEBBQUAMBcxFTATBgNV
-						BAMTDGlhbS5jZi5hYy51azAeFw0xMzAyMTUxMDM1MjBaFw0zMzAyMTAxMDM1MjBa
-						MBcxFTATBgNVBAMTDGlhbS5jZi5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEP
-						ADCCAQoCggEBAL6J4304XtLySk3GhICIZf9SWzmwHwtlUDhA+pH+03WiCv6ZWOJl
-						piGglBiTyYB6aOPRSsz89pzGBUoUgApTH4zGvD6tkFrzQsX7QCWmi48UnkrsgSw7
-						bTvwMP6EQOgR/cJH3lftaQGlspt2+CxGj8+inSKdzA5/v24GLWUKrLSI7+vk9z3P
-						HIEVY0mxRWZIomtb9Z3vCaSdESR0fR6egsT6pbRl9X7EdQJVwQmKC0PzL260cBmk
-						JmckbSpY1POebUgOXF2CzJup6tTSiIJrN9ppKY4aLKSNIoQPxEF2Zzl7Lsx5HffV
-						De6GIYKjgp9y0CTsIn4xYdHhlAmUUbV4y/ECAwEAAaNeMFwwOwYDVR0RBDQwMoIM
-						aWFtLmNmLmFjLnVrhiJodHRwczovL2lhbS5jZi5hYy51ay9zcC9zaGliYm9sZXRo
-						MB0GA1UdDgQWBBRpauq5kzBefcX+Qm3CixEbP3/3RDANBgkqhkiG9w0BAQUFAAOC
-						AQEAkrz51AVE6XZK3fq+CX/g+xC58we4jFRkGVA9dmcIpKJsSJMsEaeo78GPFKLq
-						gYiy7pHHqSGFXc+8ySrN5kex7bGqERg1qldhQ2CkVEEV6sVd5X1LOnc9D9uJrl9n
-						jDOiI//2rGM+hR5xCFQ04hVlpgxN+yHwvK/idqxiV2HpoynB2MadfarxAPGEOe+i
-						wmv/9U74Jjd93zhGfQNEfTOXTP/h/dt6v86cJ9Z4DkAtOUnVA6bLi08ANaJDBBgp
-						COS3qN36Vz4ifhyel26f9yBxKvPZaJtwoSBEJHntaS5nbC301TYIRohm2hsmFMnE
-						VwKYG1nWV+7ql4LLn3dcdr+5sw==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://iam.cf.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://iam.cf.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://iam.cf.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://iam.cf.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://iam.cf.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://iam.cf.ac.uk/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://iam.cf.ac.uk/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://iam.cf.ac.uk/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://iam.cf.ac.uk/Shibboleth.sso/NIM/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://iam.cf.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://iam.cf.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://iam.cf.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://iam.cf.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://iam.cf.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://iam.cf.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <AttributeConsumingService index="1">
-      <ServiceName xml:lang="en">Cardiff University IAM Team's Site</ServiceName>
-      <ServiceDescription xml:lang="en">
-				This is the website of the Identity and Access Management team at Cardiff University, including the trac for RAPTOR and WUGEN.
-			</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="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"/>
-    </AttributeConsumingService>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Cardiff University</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Cardiff University: IAM@Cardiff's Site</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://iam.cf.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>INSRV Connect</GivenName>
-    <EmailAddress>mailto:insrvConnect@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/iam.cf.ac.uk.xml b/swamid-interfederations-2.0/iam.cf.ac.uk.xml
deleted file mode 100644
index e3f54037..00000000
--- a/swamid-interfederations-2.0/iam.cf.ac.uk.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://iam.cf.ac.uk/sp/shibboleth">
-  <!--
-		This is a IAM@Cardiff Shibboleth SP for Cardiff University.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2010-02-22T13:42:00Z">
-      <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>
-      <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://iam.cf.ac.uk/Shibboleth.sso/DS" index="1"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDDzCCAfegAwIBAgIJAMuQ3vgWPWjiMA0GCSqGSIb3DQEBBQUAMBcxFTATBgNV
-						BAMTDGlhbS5jZi5hYy51azAeFw0xMzAyMTUxMDM1MjBaFw0zMzAyMTAxMDM1MjBa
-						MBcxFTATBgNVBAMTDGlhbS5jZi5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEP
-						ADCCAQoCggEBAL6J4304XtLySk3GhICIZf9SWzmwHwtlUDhA+pH+03WiCv6ZWOJl
-						piGglBiTyYB6aOPRSsz89pzGBUoUgApTH4zGvD6tkFrzQsX7QCWmi48UnkrsgSw7
-						bTvwMP6EQOgR/cJH3lftaQGlspt2+CxGj8+inSKdzA5/v24GLWUKrLSI7+vk9z3P
-						HIEVY0mxRWZIomtb9Z3vCaSdESR0fR6egsT6pbRl9X7EdQJVwQmKC0PzL260cBmk
-						JmckbSpY1POebUgOXF2CzJup6tTSiIJrN9ppKY4aLKSNIoQPxEF2Zzl7Lsx5HffV
-						De6GIYKjgp9y0CTsIn4xYdHhlAmUUbV4y/ECAwEAAaNeMFwwOwYDVR0RBDQwMoIM
-						aWFtLmNmLmFjLnVrhiJodHRwczovL2lhbS5jZi5hYy51ay9zcC9zaGliYm9sZXRo
-						MB0GA1UdDgQWBBRpauq5kzBefcX+Qm3CixEbP3/3RDANBgkqhkiG9w0BAQUFAAOC
-						AQEAkrz51AVE6XZK3fq+CX/g+xC58we4jFRkGVA9dmcIpKJsSJMsEaeo78GPFKLq
-						gYiy7pHHqSGFXc+8ySrN5kex7bGqERg1qldhQ2CkVEEV6sVd5X1LOnc9D9uJrl9n
-						jDOiI//2rGM+hR5xCFQ04hVlpgxN+yHwvK/idqxiV2HpoynB2MadfarxAPGEOe+i
-						wmv/9U74Jjd93zhGfQNEfTOXTP/h/dt6v86cJ9Z4DkAtOUnVA6bLi08ANaJDBBgp
-						COS3qN36Vz4ifhyel26f9yBxKvPZaJtwoSBEJHntaS5nbC301TYIRohm2hsmFMnE
-						VwKYG1nWV+7ql4LLn3dcdr+5sw==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://iam.cf.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://iam.cf.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://iam.cf.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://iam.cf.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://iam.cf.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://iam.cf.ac.uk/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://iam.cf.ac.uk/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://iam.cf.ac.uk/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://iam.cf.ac.uk/Shibboleth.sso/NIM/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://iam.cf.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://iam.cf.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://iam.cf.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://iam.cf.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://iam.cf.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://iam.cf.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <AttributeConsumingService index="1">
-      <ServiceName xml:lang="en">Cardiff University IAM Team's Site</ServiceName>
-      <ServiceDescription xml:lang="en">
-				This is the website of the Identity and Access Management team at Cardiff University, including the trac for RAPTOR and WUGEN.
-			</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="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"/>
-    </AttributeConsumingService>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Cardiff University</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Cardiff University: IAM@Cardiff's Site</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://iam.cf.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>INSRV Connect</GivenName>
-    <EmailAddress>mailto:insrvConnect@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/id.auf.org-idp-saml2-metadata.xml b/swamid-interfederations-2.0/id.auf.org-idp-saml2-metadata.xml
deleted file mode 100644
index fe458a96..00000000
--- a/swamid-interfederations-2.0/id.auf.org-idp-saml2-metadata.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://id.auf.org/idp/saml2/metadata">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2013-07-10T15:57:47Z">
-      <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">auf.org</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">Agence universitaire de la Francophonie (AUF)</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDIzCCAgugAwIBAgIJAMD4vAdNkHSQMA0GCSqGSIb3DQEBBQUAMBUxEzARBgNV
-BAMTCmlkLmF1Zi5vcmcwHhcNMTIwNDE3MjEyNTE5WhcNMjIwNDE1MjEyNTE5WjAV
-MRMwEQYDVQQDEwppZC5hdWYub3JnMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
-CgKCAQEA9ODvRDmfe5haOQ25r5lUfCb2Cmike2HOZtHGX+3o7hTDcsAnRl+f5Iha
-BO7uNkO/clZlHbwhkg5anAgWJkpySYJ1eo/srDet6kjvR/VhH4HhRYk314UykR/X
-dYXMokox39z/AZGib4+jE1o8Awe8Cgo8Vl1Hq9WBFzrSfqJtv7XzXsMg7/wH7yBX
-pW5JlFiSaEtTjbDdqxUQTwSpJ1StlE34DfHhK6UUf3ZDp6gMRBWBlN/QAR7PJC1R
-RerAPYeL+tD1tOrupvhGSYXOsaYxPE3sPIuLM9pAFG9zr+vh6GgFpKmCL34lI9hl
-65Uxm7h0bLHaGOXcaM5H31mtkpXtmwIDAQABo3YwdDAdBgNVHQ4EFgQUO7LPmMhP
-4Mi7VXHTyPXck0S9NpMwRQYDVR0jBD4wPIAUO7LPmMhP4Mi7VXHTyPXck0S9NpOh
-GaQXMBUxEzARBgNVBAMTCmlkLmF1Zi5vcmeCCQDA+LwHTZB0kDAMBgNVHRMEBTAD
-AQH/MA0GCSqGSIb3DQEBBQUAA4IBAQDNXpdywIIY/5sBr4TwuE+FhlZXM2PSbghs
-PKtp8s+XXzHQ2QwmKU954vLthhaf3Y9Fpy/CAnZ5LtwrqFK/a8OEKjkzipsLCWBG
-cZGPsNoKPnCr+R4Gp0hRFybB4uFgxlxhR4ZAjBoOWiIxOVRdV4+gpqWIy+mzFrwD
-D9kMcuFHcLbJOXb8PgVDZv6v2zSHVd16RJKlzmZYaS5/7Aiv8jUZ7EM6dpcXScfF
-q1HyzPKSsmoqmMtetxB2F6w+m9mTyhqeNue//NZuqHXlv/J3F4qkPUHc0Zlydb5j
-flcTH2tpneZeVm9kXovpBSKYeQ7AUu8asTwVXKY2JopEvxOOo76T
-					    </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://id.auf.org/idp/saml2/sso"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://id.auf.org/idp/saml2/sso"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://id.auf.org/idp/saml2/sso"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Agence universitaire de la Francophonie (AUF)</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Agence universitaire de la Francophonie (AUF)</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Jean Christophe André</SurName>
-    <EmailAddress>jean-christophe.andre@auf.org</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <SurName>Moussa Nombré</SurName>
-    <EmailAddress>moussa.nombre@auf.org</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/id.auf.org.xml b/swamid-interfederations-2.0/id.auf.org.xml
deleted file mode 100644
index fe458a96..00000000
--- a/swamid-interfederations-2.0/id.auf.org.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://id.auf.org/idp/saml2/metadata">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2013-07-10T15:57:47Z">
-      <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">auf.org</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">Agence universitaire de la Francophonie (AUF)</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDIzCCAgugAwIBAgIJAMD4vAdNkHSQMA0GCSqGSIb3DQEBBQUAMBUxEzARBgNV
-BAMTCmlkLmF1Zi5vcmcwHhcNMTIwNDE3MjEyNTE5WhcNMjIwNDE1MjEyNTE5WjAV
-MRMwEQYDVQQDEwppZC5hdWYub3JnMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
-CgKCAQEA9ODvRDmfe5haOQ25r5lUfCb2Cmike2HOZtHGX+3o7hTDcsAnRl+f5Iha
-BO7uNkO/clZlHbwhkg5anAgWJkpySYJ1eo/srDet6kjvR/VhH4HhRYk314UykR/X
-dYXMokox39z/AZGib4+jE1o8Awe8Cgo8Vl1Hq9WBFzrSfqJtv7XzXsMg7/wH7yBX
-pW5JlFiSaEtTjbDdqxUQTwSpJ1StlE34DfHhK6UUf3ZDp6gMRBWBlN/QAR7PJC1R
-RerAPYeL+tD1tOrupvhGSYXOsaYxPE3sPIuLM9pAFG9zr+vh6GgFpKmCL34lI9hl
-65Uxm7h0bLHaGOXcaM5H31mtkpXtmwIDAQABo3YwdDAdBgNVHQ4EFgQUO7LPmMhP
-4Mi7VXHTyPXck0S9NpMwRQYDVR0jBD4wPIAUO7LPmMhP4Mi7VXHTyPXck0S9NpOh
-GaQXMBUxEzARBgNVBAMTCmlkLmF1Zi5vcmeCCQDA+LwHTZB0kDAMBgNVHRMEBTAD
-AQH/MA0GCSqGSIb3DQEBBQUAA4IBAQDNXpdywIIY/5sBr4TwuE+FhlZXM2PSbghs
-PKtp8s+XXzHQ2QwmKU954vLthhaf3Y9Fpy/CAnZ5LtwrqFK/a8OEKjkzipsLCWBG
-cZGPsNoKPnCr+R4Gp0hRFybB4uFgxlxhR4ZAjBoOWiIxOVRdV4+gpqWIy+mzFrwD
-D9kMcuFHcLbJOXb8PgVDZv6v2zSHVd16RJKlzmZYaS5/7Aiv8jUZ7EM6dpcXScfF
-q1HyzPKSsmoqmMtetxB2F6w+m9mTyhqeNue//NZuqHXlv/J3F4qkPUHc0Zlydb5j
-flcTH2tpneZeVm9kXovpBSKYeQ7AUu8asTwVXKY2JopEvxOOo76T
-					    </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://id.auf.org/idp/saml2/sso"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://id.auf.org/idp/saml2/sso"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://id.auf.org/idp/saml2/sso"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Agence universitaire de la Francophonie (AUF)</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Agence universitaire de la Francophonie (AUF)</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Jean Christophe André</SurName>
-    <EmailAddress>jean-christophe.andre@auf.org</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <SurName>Moussa Nombré</SurName>
-    <EmailAddress>moussa.nombre@auf.org</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/id.ucly.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/id.ucly.fr-idp-shibboleth.xml
deleted file mode 100644
index 716813bc..00000000
--- a/swamid-interfederations-2.0/id.ucly.fr-idp-shibboleth.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://id.ucly.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2012-06-25T16:52:35Z">
-      <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">ucly.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">Université Catholique de Lyon</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDFDCCAfygAwIBAgIVALIQSKLiYZiTtbhSIn/FqoqHWb/ZMA0GCSqGSIb3DQEB
-BQUAMBUxEzARBgNVBAMTCmlkLnVjbHkuZnIwHhcNMTIwNTA5MTQ0MzU3WhcNMzIw
-NTA5MTQ0MzU3WjAVMRMwEQYDVQQDEwppZC51Y2x5LmZyMIIBIjANBgkqhkiG9w0B
-AQEFAAOCAQ8AMIIBCgKCAQEApA+WTKh4qbC76TAzEqDdG6i/6gxQLbPiLXGU/mJV
-w46XAgXuxZm3Edm0DEq5pdOwOIN/NDsqTk+aDHsYFxI957r9LLnJ0n1pWsZNluga
-PqwY2MOwyxfquiTkTQmOhK9M1xF+LYLectQ749SXejWTb5B96ys0ttzV4fSPChxL
-/L6puCfpVPGR58A9S15/MuAsMYM9UCLi2FoAF+lHlT99Ahx7VEgicMx1JELeDsYf
-yO0niRcKXEYC4j3KgOP3ADPImYdb2nhx8WHCYgphpMHY151KZv5XdaT2GLOOnJPa
-sDgDd+RcY/M7kKqGEnRUAMUCJnqML/CtYNwqidftlrso0wIDAQABo1swWTA4BgNV
-HREEMTAvggppZC51Y2x5LmZyhiFodHRwczovL2lkLnVjbHkuZnIvaWRwL3NoaWJi
-b2xldGgwHQYDVR0OBBYEFGuAsMRpkg/OYgexd/zImIz8WPTSMA0GCSqGSIb3DQEB
-BQUAA4IBAQAp96dB5+rGpdlCSVU6XZB6hygG5wNWTVm+alAjFtKQW2iqz1RgoVm4
-D2T+28kF/xlbFBUrDha5CNuZ1Dfq8Whfad4SZs9pzm/3I/2DBH/KO6guHXUe5rjT
-icWlXaDm7uvJrZSAQbZky/A9Bgyv0oJK+UHfvtIa2tNo5gjEcc92rRPwoWPDW6Yy
-0+reX1eRTjDbz+ZAkIqg6P/9UQsMzyjKIqfGCJ/YJDRvbJEGiZ2fkrhnIyziYq9a
-n/OTAPlhjqHKZtxHYzJu4AfZBp3arPgA0KW/Mt/HG8bpwymTxUyzxKzgT57qGXPF
-Nux35LKdonFdnt+x6OlpMgxGu0NaExZW
-					    </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://id.ucly.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://id.ucly.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://id.ucly.fr/idp/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Université Catholique de Lyon</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Université Catholique de Lyon</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <EmailAddress>support.informatique@univ-catholyon.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/id.ucly.fr.xml b/swamid-interfederations-2.0/id.ucly.fr.xml
deleted file mode 100644
index 716813bc..00000000
--- a/swamid-interfederations-2.0/id.ucly.fr.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://id.ucly.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2012-06-25T16:52:35Z">
-      <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">ucly.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">Université Catholique de Lyon</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDFDCCAfygAwIBAgIVALIQSKLiYZiTtbhSIn/FqoqHWb/ZMA0GCSqGSIb3DQEB
-BQUAMBUxEzARBgNVBAMTCmlkLnVjbHkuZnIwHhcNMTIwNTA5MTQ0MzU3WhcNMzIw
-NTA5MTQ0MzU3WjAVMRMwEQYDVQQDEwppZC51Y2x5LmZyMIIBIjANBgkqhkiG9w0B
-AQEFAAOCAQ8AMIIBCgKCAQEApA+WTKh4qbC76TAzEqDdG6i/6gxQLbPiLXGU/mJV
-w46XAgXuxZm3Edm0DEq5pdOwOIN/NDsqTk+aDHsYFxI957r9LLnJ0n1pWsZNluga
-PqwY2MOwyxfquiTkTQmOhK9M1xF+LYLectQ749SXejWTb5B96ys0ttzV4fSPChxL
-/L6puCfpVPGR58A9S15/MuAsMYM9UCLi2FoAF+lHlT99Ahx7VEgicMx1JELeDsYf
-yO0niRcKXEYC4j3KgOP3ADPImYdb2nhx8WHCYgphpMHY151KZv5XdaT2GLOOnJPa
-sDgDd+RcY/M7kKqGEnRUAMUCJnqML/CtYNwqidftlrso0wIDAQABo1swWTA4BgNV
-HREEMTAvggppZC51Y2x5LmZyhiFodHRwczovL2lkLnVjbHkuZnIvaWRwL3NoaWJi
-b2xldGgwHQYDVR0OBBYEFGuAsMRpkg/OYgexd/zImIz8WPTSMA0GCSqGSIb3DQEB
-BQUAA4IBAQAp96dB5+rGpdlCSVU6XZB6hygG5wNWTVm+alAjFtKQW2iqz1RgoVm4
-D2T+28kF/xlbFBUrDha5CNuZ1Dfq8Whfad4SZs9pzm/3I/2DBH/KO6guHXUe5rjT
-icWlXaDm7uvJrZSAQbZky/A9Bgyv0oJK+UHfvtIa2tNo5gjEcc92rRPwoWPDW6Yy
-0+reX1eRTjDbz+ZAkIqg6P/9UQsMzyjKIqfGCJ/YJDRvbJEGiZ2fkrhnIyziYq9a
-n/OTAPlhjqHKZtxHYzJu4AfZBp3arPgA0KW/Mt/HG8bpwymTxUyzxKzgT57qGXPF
-Nux35LKdonFdnt+x6OlpMgxGu0NaExZW
-					    </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://id.ucly.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://id.ucly.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://id.ucly.fr/idp/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Université Catholique de Lyon</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Université Catholique de Lyon</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <EmailAddress>support.informatique@univ-catholyon.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/id.vse.cz-idp-shibboleth.xml b/swamid-interfederations-2.0/id.vse.cz-idp-shibboleth.xml
deleted file mode 100644
index e4e77ef2..00000000
--- a/swamid-interfederations-2.0/id.vse.cz-idp-shibboleth.xml
+++ /dev/null
@@ -1,129 +0,0 @@
-<?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>
-    <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/" registrationInstant="2012-01-18T18:57:08Z">
-      <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>
-    <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://eduid.cz/uri/idp-group/university</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>
-      <shibmd:Scope regexp="false">vse.cz</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">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 University of Economics, Prague.</mdui:Description>
-        <mdui:Description xml:lang="cs">Poskytovatel identit (IdP) pro Vysokou školu ekonomickou 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>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIEpDCCAowCCQCHTyuMkLIypDANBgkqhkiG9w0BAQUFADAUMRIwEAYDVQQDEwlp
-ZC52c2UuY3owHhcNMTQwNzAzMTIxMjQ3WhcNMjQwNjMwMTIxMjQ3WjAUMRIwEAYD
-VQQDEwlpZC52c2UuY3owggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDA
-KcUzwd4FJSmiZKSwuDNtK6LXqRsqxID8o+BDYZ2xJEnLHLU0IXV+eUGCdX28aGqC
-uZ0RzwhZVAJHCjJ8kM5c7KxpKRXHXM6KennjFCYJEkwyX0al29wSlpBh9Vce3rST
-OXdU7m3zZ7G6rc276Fg21fNaYFfi5NYqzsR/BXJfsrUzTFztQwbBlSRg+fjRyL5k
-ZxRRNTzVaIoVNmRB9vsB7rRvCAENxckJdndTJ76iBiAviOhFGXvjFfAZRsNmNva5
-xO3MLLx1MLUwwBXJe144ucXg/v1OTDPllgD7Wyc/4rc/XoFB6KrsBfoPNVwg/A0b
-42Im+ArAWZCnXmh/d4Pip+aBaKC5tBeRYtzFSjkMQQlgOtDWbIW91MmHbBBNpdbi
-44nCj1kD2aJxLuXXlsnYQCTnImaC1YeLzXqn+zBVvY2RApD5VPyNGp87bTz0bdKG
-NUzZOylSa4zbDK8tgztconVSXTN288dp+gZ9vtwIuG/sOqYTlMc0tcnJe8DcqL35
-8QVSEqEx+YxEwBxQ3iBD6LcyBFY2lINoqe/kzO/pF8fRQ62cpGjOg0duYDvd+hco
-EA/GbkJYvM04Q9j59d3Zqh1SQ2Sp/Cj6U1fh9DA98alpXss1WZcV7MQVXFwoFhPi
-sSfTCL/tTFbOMM015TowWA6YIw7Bn/Hld5KSAKqFqwIDAQABMA0GCSqGSIb3DQEB
-BQUAA4ICAQC4Rv4jmbW3BA7oLMZjuUF58iSGwMd8YiEqs9YYBO/2ZCDMPfMAyEhl
-iuep69Fy//3RY5/ERyJ4f27dE4eFpVteV38ldDPhEda1XtZH60e4DuqiLmbpP0p/
-PMoNONBSARX/+SfPWrBayggrLekar4+N2Ghb9A22cBmcGh3KZ9c5VI+WKCryUoxV
-V1FLZDUAeRzKITdSvUXLdjG9fobl8/cjicBf5OPcmDRmlF7l1XIRDAj3XdL40OOr
-ZclXpiBDcV4mrtfrIOoKM51TqLVv85uAGwsLIqelivJ5dU7PcZ9zarAyd6JK5jhC
-LBwXc8cFRPFNAS7T+Nj3FvU4ket0wahnvZYsMPXfYjihhIPu3Y1W2eYP6tOld7Dl
-cDGsv4OjlepMz/Xrap7qCwcoSa++HIg2iM/5tgypk/lRGuRzwoHv9jwfHpYndUnc
-ONYmPl02Fc1jPaQwANyGkrLrHWMneYoF5AnplmIDH3WbwOPpv0Wik8MXqBHPL361
-l01SPOCJFlWu0nvMeKsy1uhscAnniafoWL+SLUzJRv4ee4ylw9K5aumIoPp5P1np
-Zp153289Ap8h0heOCVxDY/rtRdtlQRqo1C2KOxcU/qplUQnkibJGM4Vys29QxTqt
-YQ64+nivdRsScVzeuMXntKwi7OYEp9k2pif+9Zt1Jwhr8J4arLgdGA==
-					</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>
-MIIEpDCCAowCCQCHTyuMkLIypDANBgkqhkiG9w0BAQUFADAUMRIwEAYDVQQDEwlp
-ZC52c2UuY3owHhcNMTQwNzAzMTIxMjQ3WhcNMjQwNjMwMTIxMjQ3WjAUMRIwEAYD
-VQQDEwlpZC52c2UuY3owggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDA
-KcUzwd4FJSmiZKSwuDNtK6LXqRsqxID8o+BDYZ2xJEnLHLU0IXV+eUGCdX28aGqC
-uZ0RzwhZVAJHCjJ8kM5c7KxpKRXHXM6KennjFCYJEkwyX0al29wSlpBh9Vce3rST
-OXdU7m3zZ7G6rc276Fg21fNaYFfi5NYqzsR/BXJfsrUzTFztQwbBlSRg+fjRyL5k
-ZxRRNTzVaIoVNmRB9vsB7rRvCAENxckJdndTJ76iBiAviOhFGXvjFfAZRsNmNva5
-xO3MLLx1MLUwwBXJe144ucXg/v1OTDPllgD7Wyc/4rc/XoFB6KrsBfoPNVwg/A0b
-42Im+ArAWZCnXmh/d4Pip+aBaKC5tBeRYtzFSjkMQQlgOtDWbIW91MmHbBBNpdbi
-44nCj1kD2aJxLuXXlsnYQCTnImaC1YeLzXqn+zBVvY2RApD5VPyNGp87bTz0bdKG
-NUzZOylSa4zbDK8tgztconVSXTN288dp+gZ9vtwIuG/sOqYTlMc0tcnJe8DcqL35
-8QVSEqEx+YxEwBxQ3iBD6LcyBFY2lINoqe/kzO/pF8fRQ62cpGjOg0duYDvd+hco
-EA/GbkJYvM04Q9j59d3Zqh1SQ2Sp/Cj6U1fh9DA98alpXss1WZcV7MQVXFwoFhPi
-sSfTCL/tTFbOMM015TowWA6YIw7Bn/Hld5KSAKqFqwIDAQABMA0GCSqGSIb3DQEB
-BQUAA4ICAQC4Rv4jmbW3BA7oLMZjuUF58iSGwMd8YiEqs9YYBO/2ZCDMPfMAyEhl
-iuep69Fy//3RY5/ERyJ4f27dE4eFpVteV38ldDPhEda1XtZH60e4DuqiLmbpP0p/
-PMoNONBSARX/+SfPWrBayggrLekar4+N2Ghb9A22cBmcGh3KZ9c5VI+WKCryUoxV
-V1FLZDUAeRzKITdSvUXLdjG9fobl8/cjicBf5OPcmDRmlF7l1XIRDAj3XdL40OOr
-ZclXpiBDcV4mrtfrIOoKM51TqLVv85uAGwsLIqelivJ5dU7PcZ9zarAyd6JK5jhC
-LBwXc8cFRPFNAS7T+Nj3FvU4ket0wahnvZYsMPXfYjihhIPu3Y1W2eYP6tOld7Dl
-cDGsv4OjlepMz/Xrap7qCwcoSa++HIg2iM/5tgypk/lRGuRzwoHv9jwfHpYndUnc
-ONYmPl02Fc1jPaQwANyGkrLrHWMneYoF5AnplmIDH3WbwOPpv0Wik8MXqBHPL361
-l01SPOCJFlWu0nvMeKsy1uhscAnniafoWL+SLUzJRv4ee4ylw9K5aumIoPp5P1np
-Zp153289Ap8h0heOCVxDY/rtRdtlQRqo1C2KOxcU/qplUQnkibJGM4Vys29QxTqt
-YQ64+nivdRsScVzeuMXntKwi7OYEp9k2pif+9Zt1Jwhr8J4arLgdGA==
-					</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/id.vse.cz.xml b/swamid-interfederations-2.0/id.vse.cz.xml
deleted file mode 100644
index e4e77ef2..00000000
--- a/swamid-interfederations-2.0/id.vse.cz.xml
+++ /dev/null
@@ -1,129 +0,0 @@
-<?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>
-    <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/" registrationInstant="2012-01-18T18:57:08Z">
-      <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>
-    <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://eduid.cz/uri/idp-group/university</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>
-      <shibmd:Scope regexp="false">vse.cz</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">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 University of Economics, Prague.</mdui:Description>
-        <mdui:Description xml:lang="cs">Poskytovatel identit (IdP) pro Vysokou školu ekonomickou 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>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIEpDCCAowCCQCHTyuMkLIypDANBgkqhkiG9w0BAQUFADAUMRIwEAYDVQQDEwlp
-ZC52c2UuY3owHhcNMTQwNzAzMTIxMjQ3WhcNMjQwNjMwMTIxMjQ3WjAUMRIwEAYD
-VQQDEwlpZC52c2UuY3owggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDA
-KcUzwd4FJSmiZKSwuDNtK6LXqRsqxID8o+BDYZ2xJEnLHLU0IXV+eUGCdX28aGqC
-uZ0RzwhZVAJHCjJ8kM5c7KxpKRXHXM6KennjFCYJEkwyX0al29wSlpBh9Vce3rST
-OXdU7m3zZ7G6rc276Fg21fNaYFfi5NYqzsR/BXJfsrUzTFztQwbBlSRg+fjRyL5k
-ZxRRNTzVaIoVNmRB9vsB7rRvCAENxckJdndTJ76iBiAviOhFGXvjFfAZRsNmNva5
-xO3MLLx1MLUwwBXJe144ucXg/v1OTDPllgD7Wyc/4rc/XoFB6KrsBfoPNVwg/A0b
-42Im+ArAWZCnXmh/d4Pip+aBaKC5tBeRYtzFSjkMQQlgOtDWbIW91MmHbBBNpdbi
-44nCj1kD2aJxLuXXlsnYQCTnImaC1YeLzXqn+zBVvY2RApD5VPyNGp87bTz0bdKG
-NUzZOylSa4zbDK8tgztconVSXTN288dp+gZ9vtwIuG/sOqYTlMc0tcnJe8DcqL35
-8QVSEqEx+YxEwBxQ3iBD6LcyBFY2lINoqe/kzO/pF8fRQ62cpGjOg0duYDvd+hco
-EA/GbkJYvM04Q9j59d3Zqh1SQ2Sp/Cj6U1fh9DA98alpXss1WZcV7MQVXFwoFhPi
-sSfTCL/tTFbOMM015TowWA6YIw7Bn/Hld5KSAKqFqwIDAQABMA0GCSqGSIb3DQEB
-BQUAA4ICAQC4Rv4jmbW3BA7oLMZjuUF58iSGwMd8YiEqs9YYBO/2ZCDMPfMAyEhl
-iuep69Fy//3RY5/ERyJ4f27dE4eFpVteV38ldDPhEda1XtZH60e4DuqiLmbpP0p/
-PMoNONBSARX/+SfPWrBayggrLekar4+N2Ghb9A22cBmcGh3KZ9c5VI+WKCryUoxV
-V1FLZDUAeRzKITdSvUXLdjG9fobl8/cjicBf5OPcmDRmlF7l1XIRDAj3XdL40OOr
-ZclXpiBDcV4mrtfrIOoKM51TqLVv85uAGwsLIqelivJ5dU7PcZ9zarAyd6JK5jhC
-LBwXc8cFRPFNAS7T+Nj3FvU4ket0wahnvZYsMPXfYjihhIPu3Y1W2eYP6tOld7Dl
-cDGsv4OjlepMz/Xrap7qCwcoSa++HIg2iM/5tgypk/lRGuRzwoHv9jwfHpYndUnc
-ONYmPl02Fc1jPaQwANyGkrLrHWMneYoF5AnplmIDH3WbwOPpv0Wik8MXqBHPL361
-l01SPOCJFlWu0nvMeKsy1uhscAnniafoWL+SLUzJRv4ee4ylw9K5aumIoPp5P1np
-Zp153289Ap8h0heOCVxDY/rtRdtlQRqo1C2KOxcU/qplUQnkibJGM4Vys29QxTqt
-YQ64+nivdRsScVzeuMXntKwi7OYEp9k2pif+9Zt1Jwhr8J4arLgdGA==
-					</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>
-MIIEpDCCAowCCQCHTyuMkLIypDANBgkqhkiG9w0BAQUFADAUMRIwEAYDVQQDEwlp
-ZC52c2UuY3owHhcNMTQwNzAzMTIxMjQ3WhcNMjQwNjMwMTIxMjQ3WjAUMRIwEAYD
-VQQDEwlpZC52c2UuY3owggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDA
-KcUzwd4FJSmiZKSwuDNtK6LXqRsqxID8o+BDYZ2xJEnLHLU0IXV+eUGCdX28aGqC
-uZ0RzwhZVAJHCjJ8kM5c7KxpKRXHXM6KennjFCYJEkwyX0al29wSlpBh9Vce3rST
-OXdU7m3zZ7G6rc276Fg21fNaYFfi5NYqzsR/BXJfsrUzTFztQwbBlSRg+fjRyL5k
-ZxRRNTzVaIoVNmRB9vsB7rRvCAENxckJdndTJ76iBiAviOhFGXvjFfAZRsNmNva5
-xO3MLLx1MLUwwBXJe144ucXg/v1OTDPllgD7Wyc/4rc/XoFB6KrsBfoPNVwg/A0b
-42Im+ArAWZCnXmh/d4Pip+aBaKC5tBeRYtzFSjkMQQlgOtDWbIW91MmHbBBNpdbi
-44nCj1kD2aJxLuXXlsnYQCTnImaC1YeLzXqn+zBVvY2RApD5VPyNGp87bTz0bdKG
-NUzZOylSa4zbDK8tgztconVSXTN288dp+gZ9vtwIuG/sOqYTlMc0tcnJe8DcqL35
-8QVSEqEx+YxEwBxQ3iBD6LcyBFY2lINoqe/kzO/pF8fRQ62cpGjOg0duYDvd+hco
-EA/GbkJYvM04Q9j59d3Zqh1SQ2Sp/Cj6U1fh9DA98alpXss1WZcV7MQVXFwoFhPi
-sSfTCL/tTFbOMM015TowWA6YIw7Bn/Hld5KSAKqFqwIDAQABMA0GCSqGSIb3DQEB
-BQUAA4ICAQC4Rv4jmbW3BA7oLMZjuUF58iSGwMd8YiEqs9YYBO/2ZCDMPfMAyEhl
-iuep69Fy//3RY5/ERyJ4f27dE4eFpVteV38ldDPhEda1XtZH60e4DuqiLmbpP0p/
-PMoNONBSARX/+SfPWrBayggrLekar4+N2Ghb9A22cBmcGh3KZ9c5VI+WKCryUoxV
-V1FLZDUAeRzKITdSvUXLdjG9fobl8/cjicBf5OPcmDRmlF7l1XIRDAj3XdL40OOr
-ZclXpiBDcV4mrtfrIOoKM51TqLVv85uAGwsLIqelivJ5dU7PcZ9zarAyd6JK5jhC
-LBwXc8cFRPFNAS7T+Nj3FvU4ket0wahnvZYsMPXfYjihhIPu3Y1W2eYP6tOld7Dl
-cDGsv4OjlepMz/Xrap7qCwcoSa++HIg2iM/5tgypk/lRGuRzwoHv9jwfHpYndUnc
-ONYmPl02Fc1jPaQwANyGkrLrHWMneYoF5AnplmIDH3WbwOPpv0Wik8MXqBHPL361
-l01SPOCJFlWu0nvMeKsy1uhscAnniafoWL+SLUzJRv4ee4ylw9K5aumIoPp5P1np
-Zp153289Ap8h0heOCVxDY/rtRdtlQRqo1C2KOxcU/qplUQnkibJGM4Vys29QxTqt
-YQ64+nivdRsScVzeuMXntKwi7OYEp9k2pif+9Zt1Jwhr8J4arLgdGA==
-					</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/idem.ced.inaf.it-idp-shibboleth.xml b/swamid-interfederations-2.0/idem.ced.inaf.it-idp-shibboleth.xml
deleted file mode 100644
index 78d12180..00000000
--- a/swamid-interfederations-2.0/idem.ced.inaf.it-idp-shibboleth.xml
+++ /dev/null
@@ -1,115 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" entityID="https://idem.ced.inaf.it/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2011-03-22T15:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</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">inaf.it</shibmd:Scope>
-      <shibmd:Scope regexp="false">ira.inaf.it</shibmd:Scope>
-      <shibmd:Scope regexp="false">iasfbo.inaf.it</shibmd:Scope>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="en">National Institute for Astrophysics - INAF</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="it">Istituto Nazionale di Astrofisica - INAF</mdui:DisplayName>
-        <mdui:Description xml:lang="en">National Institute for Astrophysics - INAF</mdui:Description>
-        <mdui:Description xml:lang="it">Istituto Nazionale di Astrofisica - INAF</mdui:Description>
-        <mdui:InformationURL xml:lang="it">https://www.ced.inaf.it/idem-info</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="it">https://www.ced.inaf.it/idem-info/idp-privacy.html</mdui:PrivacyStatementURL>
-        <mdui:Logo height="60" width="60" xml:lang="it">https://idem.ced.inaf.it/LogoINAF60.png</mdui:Logo>
-        <mdui:Logo height="100" width="100" xml:lang="it">https://idem.ced.inaf.it/LogoINAF100.png</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDKzCCAhOgAwIBAgIUC8sYEfq/qhT3iv/2z9PwJsH/ZLgwDQYJKoZIhvcNAQEF
-BQAwGzEZMBcGA1UEAxMQaWRlbS5jZWQuaW5hZi5pdDAeFw0xMDEwMDgxMzExNTFa
-Fw0zMDEwMDgxMzExNTFaMBsxGTAXBgNVBAMTEGlkZW0uY2VkLmluYWYuaXQwggEi
-MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCEbHJhnfBE+5sri7Pw8QW6xscD
-2mDzd9WaDDzQMBVXljRzjxZ81/DeqFnwVdMFdZHM+ipUFGIUlmc21AtC+6rrSvDu
-LeYL/5F7JRu9LxAT7GRrQS3dkJkDC3QzGC3BW9SQO8hoXir2QqE5bwkTBy0F8V/F
-eDq8c9cPFd1HlnO7D2K7An3OMI/hkZWOx41e0Vdsr1nUTcnLnLeZ/JXRMfFO8mD6
-rTCLq0XWZA2oRUd1QKeINLk8ERZqfp9MYh0pjfFFlFyFuWKafQtPV1lb+BKua4kn
-cFCn6QS7BpyAb6UGy84ag2Qk/2JumjZqzxfJ+L7mbuogOO+gt+JNuiZbsA2DAgMB
-AAGjZzBlMEQGA1UdEQQ9MDuCEGlkZW0uY2VkLmluYWYuaXSGJ2h0dHBzOi8vaWRl
-bS5jZWQuaW5hZi5pdC9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUypTVjZYa6twi
-vL+dwAqyQszxAZ4wDQYJKoZIhvcNAQEFBQADggEBAEiu9EK1DdBA6V8ZuszZnYLs
-3v983CaxOcMYv8rgAUavlI+hGa/1MPCDgmNsMHjfOvG3aBelwkCK302u+veFwQRa
-je20+UOa2xpYLGaZ8HTEU0qEEip4VHoWHBxLCdfIlBhf5sziVpWdZCwF968QHoFX
-E2fGE0imJGT9OzsZ54C/426VfH8SyiWeQjDkKGPfju5l/DtSKO4p74p2Ak8tTTDp
-V8mh1c6bJCaBrl4PCK/jZeIs+czIeWW5QvizGnIgDlBzXzaXHpkn66jLhzzO3cHs
-S7SNwUd0JmQ3xk5iZ/fzodAp/nzAOXGdcESNdtkrvaOKuVdg112uD1XR/rA4Jmw=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idem.ced.inaf.it:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idem.ced.inaf.it: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://idem.ced.inaf.it/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idem.ced.inaf.it/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idem.ced.inaf.it/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idem.ced.inaf.it/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">inaf.it</shibmd:Scope>
-      <shibmd:Scope regexp="false">ira.inaf.it</shibmd:Scope>
-      <shibmd:Scope regexp="false">iasfbo.inaf.it</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDKzCCAhOgAwIBAgIUC8sYEfq/qhT3iv/2z9PwJsH/ZLgwDQYJKoZIhvcNAQEF
-BQAwGzEZMBcGA1UEAxMQaWRlbS5jZWQuaW5hZi5pdDAeFw0xMDEwMDgxMzExNTFa
-Fw0zMDEwMDgxMzExNTFaMBsxGTAXBgNVBAMTEGlkZW0uY2VkLmluYWYuaXQwggEi
-MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCEbHJhnfBE+5sri7Pw8QW6xscD
-2mDzd9WaDDzQMBVXljRzjxZ81/DeqFnwVdMFdZHM+ipUFGIUlmc21AtC+6rrSvDu
-LeYL/5F7JRu9LxAT7GRrQS3dkJkDC3QzGC3BW9SQO8hoXir2QqE5bwkTBy0F8V/F
-eDq8c9cPFd1HlnO7D2K7An3OMI/hkZWOx41e0Vdsr1nUTcnLnLeZ/JXRMfFO8mD6
-rTCLq0XWZA2oRUd1QKeINLk8ERZqfp9MYh0pjfFFlFyFuWKafQtPV1lb+BKua4kn
-cFCn6QS7BpyAb6UGy84ag2Qk/2JumjZqzxfJ+L7mbuogOO+gt+JNuiZbsA2DAgMB
-AAGjZzBlMEQGA1UdEQQ9MDuCEGlkZW0uY2VkLmluYWYuaXSGJ2h0dHBzOi8vaWRl
-bS5jZWQuaW5hZi5pdC9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUypTVjZYa6twi
-vL+dwAqyQszxAZ4wDQYJKoZIhvcNAQEFBQADggEBAEiu9EK1DdBA6V8ZuszZnYLs
-3v983CaxOcMYv8rgAUavlI+hGa/1MPCDgmNsMHjfOvG3aBelwkCK302u+veFwQRa
-je20+UOa2xpYLGaZ8HTEU0qEEip4VHoWHBxLCdfIlBhf5sziVpWdZCwF968QHoFX
-E2fGE0imJGT9OzsZ54C/426VfH8SyiWeQjDkKGPfju5l/DtSKO4p74p2Ak8tTTDp
-V8mh1c6bJCaBrl4PCK/jZeIs+czIeWW5QvizGnIgDlBzXzaXHpkn66jLhzzO3cHs
-S7SNwUd0JmQ3xk5iZ/fzodAp/nzAOXGdcESNdtkrvaOKuVdg112uD1XR/rA4Jmw=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idem.ced.inaf.it:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idem.ced.inaf.it: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="it">Istituto Nazionale di Astrofisica (INAF)</OrganizationName>
-    <OrganizationName xml:lang="en">National Institute for Astrophysics (INAF)</OrganizationName>
-    <OrganizationDisplayName xml:lang="it">Istituto Nazionale di Astrofisica - INAF</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">National Institute for Astrophysics - INAF</OrganizationDisplayName>
-    <OrganizationURL xml:lang="it">https://www.inaf.it/</OrganizationURL>
-    <OrganizationURL xml:lang="en">http://www.inaf.it/en</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Mauro</GivenName>
-    <SurName>Nanni</SurName>
-    <EmailAddress>m.nanni@ira.inaf.it</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Franco</GivenName>
-    <SurName>Tinarelli</SurName>
-    <EmailAddress>f.tinarelli@ira.inaf.it</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <EmailAddress>inaf-idem@ced.inaf.it</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idem.ced.inaf.it.xml b/swamid-interfederations-2.0/idem.ced.inaf.it.xml
deleted file mode 100644
index 78d12180..00000000
--- a/swamid-interfederations-2.0/idem.ced.inaf.it.xml
+++ /dev/null
@@ -1,115 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" entityID="https://idem.ced.inaf.it/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2011-03-22T15:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</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">inaf.it</shibmd:Scope>
-      <shibmd:Scope regexp="false">ira.inaf.it</shibmd:Scope>
-      <shibmd:Scope regexp="false">iasfbo.inaf.it</shibmd:Scope>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="en">National Institute for Astrophysics - INAF</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="it">Istituto Nazionale di Astrofisica - INAF</mdui:DisplayName>
-        <mdui:Description xml:lang="en">National Institute for Astrophysics - INAF</mdui:Description>
-        <mdui:Description xml:lang="it">Istituto Nazionale di Astrofisica - INAF</mdui:Description>
-        <mdui:InformationURL xml:lang="it">https://www.ced.inaf.it/idem-info</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="it">https://www.ced.inaf.it/idem-info/idp-privacy.html</mdui:PrivacyStatementURL>
-        <mdui:Logo height="60" width="60" xml:lang="it">https://idem.ced.inaf.it/LogoINAF60.png</mdui:Logo>
-        <mdui:Logo height="100" width="100" xml:lang="it">https://idem.ced.inaf.it/LogoINAF100.png</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDKzCCAhOgAwIBAgIUC8sYEfq/qhT3iv/2z9PwJsH/ZLgwDQYJKoZIhvcNAQEF
-BQAwGzEZMBcGA1UEAxMQaWRlbS5jZWQuaW5hZi5pdDAeFw0xMDEwMDgxMzExNTFa
-Fw0zMDEwMDgxMzExNTFaMBsxGTAXBgNVBAMTEGlkZW0uY2VkLmluYWYuaXQwggEi
-MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCEbHJhnfBE+5sri7Pw8QW6xscD
-2mDzd9WaDDzQMBVXljRzjxZ81/DeqFnwVdMFdZHM+ipUFGIUlmc21AtC+6rrSvDu
-LeYL/5F7JRu9LxAT7GRrQS3dkJkDC3QzGC3BW9SQO8hoXir2QqE5bwkTBy0F8V/F
-eDq8c9cPFd1HlnO7D2K7An3OMI/hkZWOx41e0Vdsr1nUTcnLnLeZ/JXRMfFO8mD6
-rTCLq0XWZA2oRUd1QKeINLk8ERZqfp9MYh0pjfFFlFyFuWKafQtPV1lb+BKua4kn
-cFCn6QS7BpyAb6UGy84ag2Qk/2JumjZqzxfJ+L7mbuogOO+gt+JNuiZbsA2DAgMB
-AAGjZzBlMEQGA1UdEQQ9MDuCEGlkZW0uY2VkLmluYWYuaXSGJ2h0dHBzOi8vaWRl
-bS5jZWQuaW5hZi5pdC9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUypTVjZYa6twi
-vL+dwAqyQszxAZ4wDQYJKoZIhvcNAQEFBQADggEBAEiu9EK1DdBA6V8ZuszZnYLs
-3v983CaxOcMYv8rgAUavlI+hGa/1MPCDgmNsMHjfOvG3aBelwkCK302u+veFwQRa
-je20+UOa2xpYLGaZ8HTEU0qEEip4VHoWHBxLCdfIlBhf5sziVpWdZCwF968QHoFX
-E2fGE0imJGT9OzsZ54C/426VfH8SyiWeQjDkKGPfju5l/DtSKO4p74p2Ak8tTTDp
-V8mh1c6bJCaBrl4PCK/jZeIs+czIeWW5QvizGnIgDlBzXzaXHpkn66jLhzzO3cHs
-S7SNwUd0JmQ3xk5iZ/fzodAp/nzAOXGdcESNdtkrvaOKuVdg112uD1XR/rA4Jmw=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idem.ced.inaf.it:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idem.ced.inaf.it: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://idem.ced.inaf.it/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idem.ced.inaf.it/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idem.ced.inaf.it/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idem.ced.inaf.it/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">inaf.it</shibmd:Scope>
-      <shibmd:Scope regexp="false">ira.inaf.it</shibmd:Scope>
-      <shibmd:Scope regexp="false">iasfbo.inaf.it</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDKzCCAhOgAwIBAgIUC8sYEfq/qhT3iv/2z9PwJsH/ZLgwDQYJKoZIhvcNAQEF
-BQAwGzEZMBcGA1UEAxMQaWRlbS5jZWQuaW5hZi5pdDAeFw0xMDEwMDgxMzExNTFa
-Fw0zMDEwMDgxMzExNTFaMBsxGTAXBgNVBAMTEGlkZW0uY2VkLmluYWYuaXQwggEi
-MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCEbHJhnfBE+5sri7Pw8QW6xscD
-2mDzd9WaDDzQMBVXljRzjxZ81/DeqFnwVdMFdZHM+ipUFGIUlmc21AtC+6rrSvDu
-LeYL/5F7JRu9LxAT7GRrQS3dkJkDC3QzGC3BW9SQO8hoXir2QqE5bwkTBy0F8V/F
-eDq8c9cPFd1HlnO7D2K7An3OMI/hkZWOx41e0Vdsr1nUTcnLnLeZ/JXRMfFO8mD6
-rTCLq0XWZA2oRUd1QKeINLk8ERZqfp9MYh0pjfFFlFyFuWKafQtPV1lb+BKua4kn
-cFCn6QS7BpyAb6UGy84ag2Qk/2JumjZqzxfJ+L7mbuogOO+gt+JNuiZbsA2DAgMB
-AAGjZzBlMEQGA1UdEQQ9MDuCEGlkZW0uY2VkLmluYWYuaXSGJ2h0dHBzOi8vaWRl
-bS5jZWQuaW5hZi5pdC9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUypTVjZYa6twi
-vL+dwAqyQszxAZ4wDQYJKoZIhvcNAQEFBQADggEBAEiu9EK1DdBA6V8ZuszZnYLs
-3v983CaxOcMYv8rgAUavlI+hGa/1MPCDgmNsMHjfOvG3aBelwkCK302u+veFwQRa
-je20+UOa2xpYLGaZ8HTEU0qEEip4VHoWHBxLCdfIlBhf5sziVpWdZCwF968QHoFX
-E2fGE0imJGT9OzsZ54C/426VfH8SyiWeQjDkKGPfju5l/DtSKO4p74p2Ak8tTTDp
-V8mh1c6bJCaBrl4PCK/jZeIs+czIeWW5QvizGnIgDlBzXzaXHpkn66jLhzzO3cHs
-S7SNwUd0JmQ3xk5iZ/fzodAp/nzAOXGdcESNdtkrvaOKuVdg112uD1XR/rA4Jmw=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idem.ced.inaf.it:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idem.ced.inaf.it: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="it">Istituto Nazionale di Astrofisica (INAF)</OrganizationName>
-    <OrganizationName xml:lang="en">National Institute for Astrophysics (INAF)</OrganizationName>
-    <OrganizationDisplayName xml:lang="it">Istituto Nazionale di Astrofisica - INAF</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">National Institute for Astrophysics - INAF</OrganizationDisplayName>
-    <OrganizationURL xml:lang="it">https://www.inaf.it/</OrganizationURL>
-    <OrganizationURL xml:lang="en">http://www.inaf.it/en</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Mauro</GivenName>
-    <SurName>Nanni</SurName>
-    <EmailAddress>m.nanni@ira.inaf.it</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Franco</GivenName>
-    <SurName>Tinarelli</SurName>
-    <EmailAddress>f.tinarelli@ira.inaf.it</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <EmailAddress>inaf-idem@ced.inaf.it</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idem.univpm.it-idp-shibboleth.xml b/swamid-interfederations-2.0/idem.univpm.it-idp-shibboleth.xml
deleted file mode 100644
index 3288b012..00000000
--- a/swamid-interfederations-2.0/idem.univpm.it-idp-shibboleth.xml
+++ /dev/null
@@ -1,105 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" entityID="https://idem.univpm.it/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2010-08-06T15:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</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">univpm.it</shibmd:Scope>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="en">Universita' Politecnica delle Marche</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="it">Universita' Politecnica delle Marche</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Identity provider for "UnivPM = Universita' Politecnica delle Marche" users</mdui:Description>
-        <mdui:Description xml:lang="it">Identity provider per gli utenti della "UnivPM = Universita' Politecnica delel Marche"</mdui:Description>
-        <mdui:InformationURL xml:lang="en">https://idem.univpm.it/index_en.html</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="it">https://idem.univpm.it/index.html</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://idem.univpm.it/attributes-released.html</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="it">https://idem.univpm.it/attributi-rilasciati.html</mdui:PrivacyStatementURL>
-        <mdui:Logo height="16" width="16" xml:lang="en">https://idem.univpm.it/logo/16x16.png</mdui:Logo>
-        <mdui:Logo height="16" width="16" xml:lang="it">https://idem.univpm.it/logo/16x16.png</mdui:Logo>
-        <mdui:Logo height="60" width="80" xml:lang="en">https://idem.univpm.it/logo/60x80.png</mdui:Logo>
-        <mdui:Logo height="60" width="80" xml:lang="it">https://idem.univpm.it/logo/60x80.png</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDJDCCAgygAwIBAgIVAJRPddpXPFSzRqSfPdrn/IFdufKtMA0GCSqGSIb3DQEB
-BQUAMBkxFzAVBgNVBAMTDmlkZW0udW5pdnBtLml0MB4XDTEzMDgyNzA4Mjk1MVoX
-DTE2MDgyNzA4Mjk1MVowGTEXMBUGA1UEAxMOaWRlbS51bml2cG0uaXQwggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCrVLl1s2FWb4lmcg+qOwTW/SfzsEEK
-ozdQMTP66NHa/cNfGsIfnJsilNPRXedR7zCdtWzAQ81XZ8Yi0fwUjo3C1tEoNcaH
-GM1asCRUu1jYjGfT72weUEzHHlU+QlGzhlm6mcI9tAU9CJfB3CMwPYotrlufWHTQ
-bbKwNTBHS+9bmICLeSy7P6SqJOyCTqsU7FqF2B3nW7aLwRba7X5u3T1gUyAUYmjW
-7Ej8fTh9IYpCC2tCYgjYy99R9eF3RePUx2znbR8/Kap6fA0OgjN4DuM265HsLXgp
-U9te4k04BcxbFJ6K81yRGGE5qrhowJGvSbcv8qLEP0LKtuK3/RaInmGNAgMBAAGj
-YzBhMEAGA1UdEQQ5MDeCDmlkZW0udW5pdnBtLml0hiVodHRwczovL2lkZW0udW5p
-dnBtLml0L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBRv4qE5cJdI0tWc0PcoXfKY
-BG4YFDANBgkqhkiG9w0BAQUFAAOCAQEAXVsfjXIBRoEQ3AMcYlOcQ5lggDuHFdcB
-PDxVUzYlTDEyxhr4G0Nr/QjyQepInZneIKpSIiQTLN7iWaVz8CTTn5aiphMzF0hb
-dghLRtKuft4+M4ke7dEod8Xdu2vNFCoA9fdS44ycClWo7KlNmEdCKVsSK5UX8CRL
-Ri+HTOO6KSAFxhAfOXVwcaZNst4vTyClGjVeGpV/HxG+5bCBsZOLHE8O2IH0tmjX
-5jpMJJwEvEo9wG4E08QNP09bTRA9VrhdsvTOBnQtgj+ni0EfOJ2T88Y1SmgRJgpz
-ggqcHGSwpbNvAB4pbdMeCIdrPoaW3eZX3trf8/hnZOVxwVsXJey0nQ==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idem.univpm.it:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idem.univpm.it: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://idem.univpm.it/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idem.univpm.it/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idem.univpm.it/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idem.univpm.it/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">univpm.it</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDJDCCAgygAwIBAgIVAJRPddpXPFSzRqSfPdrn/IFdufKtMA0GCSqGSIb3DQEB
-BQUAMBkxFzAVBgNVBAMTDmlkZW0udW5pdnBtLml0MB4XDTEzMDgyNzA4Mjk1MVoX
-DTE2MDgyNzA4Mjk1MVowGTEXMBUGA1UEAxMOaWRlbS51bml2cG0uaXQwggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCrVLl1s2FWb4lmcg+qOwTW/SfzsEEK
-ozdQMTP66NHa/cNfGsIfnJsilNPRXedR7zCdtWzAQ81XZ8Yi0fwUjo3C1tEoNcaH
-GM1asCRUu1jYjGfT72weUEzHHlU+QlGzhlm6mcI9tAU9CJfB3CMwPYotrlufWHTQ
-bbKwNTBHS+9bmICLeSy7P6SqJOyCTqsU7FqF2B3nW7aLwRba7X5u3T1gUyAUYmjW
-7Ej8fTh9IYpCC2tCYgjYy99R9eF3RePUx2znbR8/Kap6fA0OgjN4DuM265HsLXgp
-U9te4k04BcxbFJ6K81yRGGE5qrhowJGvSbcv8qLEP0LKtuK3/RaInmGNAgMBAAGj
-YzBhMEAGA1UdEQQ5MDeCDmlkZW0udW5pdnBtLml0hiVodHRwczovL2lkZW0udW5p
-dnBtLml0L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBRv4qE5cJdI0tWc0PcoXfKY
-BG4YFDANBgkqhkiG9w0BAQUFAAOCAQEAXVsfjXIBRoEQ3AMcYlOcQ5lggDuHFdcB
-PDxVUzYlTDEyxhr4G0Nr/QjyQepInZneIKpSIiQTLN7iWaVz8CTTn5aiphMzF0hb
-dghLRtKuft4+M4ke7dEod8Xdu2vNFCoA9fdS44ycClWo7KlNmEdCKVsSK5UX8CRL
-Ri+HTOO6KSAFxhAfOXVwcaZNst4vTyClGjVeGpV/HxG+5bCBsZOLHE8O2IH0tmjX
-5jpMJJwEvEo9wG4E08QNP09bTRA9VrhdsvTOBnQtgj+ni0EfOJ2T88Y1SmgRJgpz
-ggqcHGSwpbNvAB4pbdMeCIdrPoaW3eZX3trf8/hnZOVxwVsXJey0nQ==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idem.univpm.it:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idem.univpm.it: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">Universita' Politecnica delle Marche</OrganizationName>
-    <OrganizationName xml:lang="it">Universita' Politecnica delle Marche</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Universita' Politecnica delle Marche</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="it">Universita' Politecnica delle Marche</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.univpm.it/English/Engine/RAServePG.php/P/25001ENG0101/L/0</OrganizationURL>
-    <OrganizationURL xml:lang="it">http://www.univpm.it</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <EmailAddress>idem-help@univpm.it</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idem.univpm.it.xml b/swamid-interfederations-2.0/idem.univpm.it.xml
deleted file mode 100644
index 3288b012..00000000
--- a/swamid-interfederations-2.0/idem.univpm.it.xml
+++ /dev/null
@@ -1,105 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" entityID="https://idem.univpm.it/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2010-08-06T15:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</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">univpm.it</shibmd:Scope>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="en">Universita' Politecnica delle Marche</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="it">Universita' Politecnica delle Marche</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Identity provider for "UnivPM = Universita' Politecnica delle Marche" users</mdui:Description>
-        <mdui:Description xml:lang="it">Identity provider per gli utenti della "UnivPM = Universita' Politecnica delel Marche"</mdui:Description>
-        <mdui:InformationURL xml:lang="en">https://idem.univpm.it/index_en.html</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="it">https://idem.univpm.it/index.html</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://idem.univpm.it/attributes-released.html</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="it">https://idem.univpm.it/attributi-rilasciati.html</mdui:PrivacyStatementURL>
-        <mdui:Logo height="16" width="16" xml:lang="en">https://idem.univpm.it/logo/16x16.png</mdui:Logo>
-        <mdui:Logo height="16" width="16" xml:lang="it">https://idem.univpm.it/logo/16x16.png</mdui:Logo>
-        <mdui:Logo height="60" width="80" xml:lang="en">https://idem.univpm.it/logo/60x80.png</mdui:Logo>
-        <mdui:Logo height="60" width="80" xml:lang="it">https://idem.univpm.it/logo/60x80.png</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDJDCCAgygAwIBAgIVAJRPddpXPFSzRqSfPdrn/IFdufKtMA0GCSqGSIb3DQEB
-BQUAMBkxFzAVBgNVBAMTDmlkZW0udW5pdnBtLml0MB4XDTEzMDgyNzA4Mjk1MVoX
-DTE2MDgyNzA4Mjk1MVowGTEXMBUGA1UEAxMOaWRlbS51bml2cG0uaXQwggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCrVLl1s2FWb4lmcg+qOwTW/SfzsEEK
-ozdQMTP66NHa/cNfGsIfnJsilNPRXedR7zCdtWzAQ81XZ8Yi0fwUjo3C1tEoNcaH
-GM1asCRUu1jYjGfT72weUEzHHlU+QlGzhlm6mcI9tAU9CJfB3CMwPYotrlufWHTQ
-bbKwNTBHS+9bmICLeSy7P6SqJOyCTqsU7FqF2B3nW7aLwRba7X5u3T1gUyAUYmjW
-7Ej8fTh9IYpCC2tCYgjYy99R9eF3RePUx2znbR8/Kap6fA0OgjN4DuM265HsLXgp
-U9te4k04BcxbFJ6K81yRGGE5qrhowJGvSbcv8qLEP0LKtuK3/RaInmGNAgMBAAGj
-YzBhMEAGA1UdEQQ5MDeCDmlkZW0udW5pdnBtLml0hiVodHRwczovL2lkZW0udW5p
-dnBtLml0L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBRv4qE5cJdI0tWc0PcoXfKY
-BG4YFDANBgkqhkiG9w0BAQUFAAOCAQEAXVsfjXIBRoEQ3AMcYlOcQ5lggDuHFdcB
-PDxVUzYlTDEyxhr4G0Nr/QjyQepInZneIKpSIiQTLN7iWaVz8CTTn5aiphMzF0hb
-dghLRtKuft4+M4ke7dEod8Xdu2vNFCoA9fdS44ycClWo7KlNmEdCKVsSK5UX8CRL
-Ri+HTOO6KSAFxhAfOXVwcaZNst4vTyClGjVeGpV/HxG+5bCBsZOLHE8O2IH0tmjX
-5jpMJJwEvEo9wG4E08QNP09bTRA9VrhdsvTOBnQtgj+ni0EfOJ2T88Y1SmgRJgpz
-ggqcHGSwpbNvAB4pbdMeCIdrPoaW3eZX3trf8/hnZOVxwVsXJey0nQ==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idem.univpm.it:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idem.univpm.it: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://idem.univpm.it/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idem.univpm.it/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idem.univpm.it/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idem.univpm.it/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">univpm.it</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDJDCCAgygAwIBAgIVAJRPddpXPFSzRqSfPdrn/IFdufKtMA0GCSqGSIb3DQEB
-BQUAMBkxFzAVBgNVBAMTDmlkZW0udW5pdnBtLml0MB4XDTEzMDgyNzA4Mjk1MVoX
-DTE2MDgyNzA4Mjk1MVowGTEXMBUGA1UEAxMOaWRlbS51bml2cG0uaXQwggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCrVLl1s2FWb4lmcg+qOwTW/SfzsEEK
-ozdQMTP66NHa/cNfGsIfnJsilNPRXedR7zCdtWzAQ81XZ8Yi0fwUjo3C1tEoNcaH
-GM1asCRUu1jYjGfT72weUEzHHlU+QlGzhlm6mcI9tAU9CJfB3CMwPYotrlufWHTQ
-bbKwNTBHS+9bmICLeSy7P6SqJOyCTqsU7FqF2B3nW7aLwRba7X5u3T1gUyAUYmjW
-7Ej8fTh9IYpCC2tCYgjYy99R9eF3RePUx2znbR8/Kap6fA0OgjN4DuM265HsLXgp
-U9te4k04BcxbFJ6K81yRGGE5qrhowJGvSbcv8qLEP0LKtuK3/RaInmGNAgMBAAGj
-YzBhMEAGA1UdEQQ5MDeCDmlkZW0udW5pdnBtLml0hiVodHRwczovL2lkZW0udW5p
-dnBtLml0L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBRv4qE5cJdI0tWc0PcoXfKY
-BG4YFDANBgkqhkiG9w0BAQUFAAOCAQEAXVsfjXIBRoEQ3AMcYlOcQ5lggDuHFdcB
-PDxVUzYlTDEyxhr4G0Nr/QjyQepInZneIKpSIiQTLN7iWaVz8CTTn5aiphMzF0hb
-dghLRtKuft4+M4ke7dEod8Xdu2vNFCoA9fdS44ycClWo7KlNmEdCKVsSK5UX8CRL
-Ri+HTOO6KSAFxhAfOXVwcaZNst4vTyClGjVeGpV/HxG+5bCBsZOLHE8O2IH0tmjX
-5jpMJJwEvEo9wG4E08QNP09bTRA9VrhdsvTOBnQtgj+ni0EfOJ2T88Y1SmgRJgpz
-ggqcHGSwpbNvAB4pbdMeCIdrPoaW3eZX3trf8/hnZOVxwVsXJey0nQ==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idem.univpm.it:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idem.univpm.it: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">Universita' Politecnica delle Marche</OrganizationName>
-    <OrganizationName xml:lang="it">Universita' Politecnica delle Marche</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Universita' Politecnica delle Marche</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="it">Universita' Politecnica delle Marche</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.univpm.it/English/Engine/RAServePG.php/P/25001ENG0101/L/0</OrganizationURL>
-    <OrganizationURL xml:lang="it">http://www.univpm.it</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <EmailAddress>idem-help@univpm.it</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idemfero.units.it-idp-shibboleth.xml b/swamid-interfederations-2.0/idemfero.units.it-idp-shibboleth.xml
deleted file mode 100644
index 0240064e..00000000
--- a/swamid-interfederations-2.0/idemfero.units.it-idp-shibboleth.xml
+++ /dev/null
@@ -1,108 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" entityID="https://idemfero.units.it/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2011-10-11T15:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</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">units.it</shibmd:Scope>
-      <shibmd:Scope regexp="false">ds.units.it</shibmd:Scope>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="en">University of Trieste IdP</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="it">Università di Trieste IdP</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Identity Provider for University of Trieste members</mdui:Description>
-        <mdui:Description xml:lang="it">Identity Provider per gli utenti dell'Università di Trieste</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://international.units.it/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="it">http://www.units.it/</mdui:InformationURL>
-        <mdui:Logo height="16" width="16" xml:lang="en">https://idemfero.units.it/unilogo/sigillo16x16.png</mdui:Logo>
-        <mdui:Logo height="16" width="16" xml:lang="it">https://idemfero.units.it/unilogo/sigillo16x16.png</mdui:Logo>
-        <mdui:Logo height="60" width="80" xml:lang="en">https://idemfero.units.it/unilogo/sigillo60x80.png</mdui:Logo>
-        <mdui:Logo height="60" width="80" xml:lang="it">https://idemfero.units.it/unilogo/sigillo60x80.png</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDMDCCAhigAwIBAgIVAIPn0rci7ca2nc6Pd0a8kS35GFVlMA0GCSqGSIb3DQEB
-BQUAMBwxGjAYBgNVBAMTEWlkZW1mZXJvLnVuaXRzLml0MB4XDTExMDYzMDE1Mzgw
-NFoXDTMxMDYzMDE1MzgwNFowHDEaMBgGA1UEAxMRaWRlbWZlcm8udW5pdHMuaXQw
-ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDm2d1TVod551/AHgSkFZa/
-DgfKePtHqC88H9qlcDGhhZfdhN1KCubG7H2sY1awLQ3HwonlfyCN+FjxL15jiTtS
-SGM3bE9tb8p6NoryPTtPSiF4JZraE5Y8PnWN7i49QhhOY/dzsYGUGzKWY8GzSaKB
-BJAA+XXbj2l6s/6Ksj/ii7KGjt/opcJ5rBE0+ttDanuC0w8upUAL29rQ5Yx6n7IG
-FMI7PS2W1IeKrU0Fm93ujdm3Itx9L+5bmd/WQyJInXt9DWQXBhek3oh5ZCK+H7Or
-h9Sk4ld8BxFlgsw96xjVX246jTCBgGcCOlRRW9d21tYmCEn/ew4JVtHHRktnblD3
-AgMBAAGjaTBnMEYGA1UdEQQ/MD2CEWlkZW1mZXJvLnVuaXRzLml0hihodHRwczov
-L2lkZW1mZXJvLnVuaXRzLml0L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBQDNZRh
-1OdCXmX7+5k2XwRmfMQ4iDANBgkqhkiG9w0BAQUFAAOCAQEASeWVPZ+W5q+LxyZP
-uEpGw+uysbNIBbpxglKfli3QX9MQrBOG1S1Y5gQ5Rsi26ipWidgEORbX6mUKtax+
-85NYvi3faIcbLMf87Xbxmn+oYMv/ksfeoevZAkLPXb6DLNjoOEV2UbQuz/03o9bM
-05QJuuY1K9ioCMat4+WZ3XvLxNoKZwRLtERV5Ibr+ffOu1WhXkdoW1PX6K12p044
-Ia4SBEhy9t8ZxoAe2sSE8TTww+wGzJ48+2Ek/Lr/JTCbT1wj3QGvN3vbE++aLrtY
-LWrKlDzFIKXv9Tk8LNWWOGxbRhw3x2OymWGfU9gDlQs0mAWuEKsjr3iUrsDGkkiy
-aQYbJQ==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idemfero.units.it:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idemfero.units.it: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://idemfero.units.it/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idemfero.units.it/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idemfero.units.it/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idemfero.units.it/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">units.it</shibmd:Scope>
-      <shibmd:Scope regexp="false">ds.units.it</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDMDCCAhigAwIBAgIVAIPn0rci7ca2nc6Pd0a8kS35GFVlMA0GCSqGSIb3DQEB
-BQUAMBwxGjAYBgNVBAMTEWlkZW1mZXJvLnVuaXRzLml0MB4XDTExMDYzMDE1Mzgw
-NFoXDTMxMDYzMDE1MzgwNFowHDEaMBgGA1UEAxMRaWRlbWZlcm8udW5pdHMuaXQw
-ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDm2d1TVod551/AHgSkFZa/
-DgfKePtHqC88H9qlcDGhhZfdhN1KCubG7H2sY1awLQ3HwonlfyCN+FjxL15jiTtS
-SGM3bE9tb8p6NoryPTtPSiF4JZraE5Y8PnWN7i49QhhOY/dzsYGUGzKWY8GzSaKB
-BJAA+XXbj2l6s/6Ksj/ii7KGjt/opcJ5rBE0+ttDanuC0w8upUAL29rQ5Yx6n7IG
-FMI7PS2W1IeKrU0Fm93ujdm3Itx9L+5bmd/WQyJInXt9DWQXBhek3oh5ZCK+H7Or
-h9Sk4ld8BxFlgsw96xjVX246jTCBgGcCOlRRW9d21tYmCEn/ew4JVtHHRktnblD3
-AgMBAAGjaTBnMEYGA1UdEQQ/MD2CEWlkZW1mZXJvLnVuaXRzLml0hihodHRwczov
-L2lkZW1mZXJvLnVuaXRzLml0L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBQDNZRh
-1OdCXmX7+5k2XwRmfMQ4iDANBgkqhkiG9w0BAQUFAAOCAQEASeWVPZ+W5q+LxyZP
-uEpGw+uysbNIBbpxglKfli3QX9MQrBOG1S1Y5gQ5Rsi26ipWidgEORbX6mUKtax+
-85NYvi3faIcbLMf87Xbxmn+oYMv/ksfeoevZAkLPXb6DLNjoOEV2UbQuz/03o9bM
-05QJuuY1K9ioCMat4+WZ3XvLxNoKZwRLtERV5Ibr+ffOu1WhXkdoW1PX6K12p044
-Ia4SBEhy9t8ZxoAe2sSE8TTww+wGzJ48+2Ek/Lr/JTCbT1wj3QGvN3vbE++aLrtY
-LWrKlDzFIKXv9Tk8LNWWOGxbRhw3x2OymWGfU9gDlQs0mAWuEKsjr3iUrsDGkkiy
-aQYbJQ==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idemfero.units.it:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idemfero.units.it: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="it">Università degli Studi di Trieste</OrganizationName>
-    <OrganizationName xml:lang="en">University of Trieste</OrganizationName>
-    <OrganizationDisplayName xml:lang="it">Università di Trieste</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">University of Trieste</OrganizationDisplayName>
-    <OrganizationURL xml:lang="it">http://www.units.it/</OrganizationURL>
-    <OrganizationURL xml:lang="en">http://international.units.it/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Staff Tecnico</GivenName>
-    <EmailAddress>idem@units.it</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idemfero.units.it.xml b/swamid-interfederations-2.0/idemfero.units.it.xml
deleted file mode 100644
index 0240064e..00000000
--- a/swamid-interfederations-2.0/idemfero.units.it.xml
+++ /dev/null
@@ -1,108 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" entityID="https://idemfero.units.it/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2011-10-11T15:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</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">units.it</shibmd:Scope>
-      <shibmd:Scope regexp="false">ds.units.it</shibmd:Scope>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="en">University of Trieste IdP</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="it">Università di Trieste IdP</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Identity Provider for University of Trieste members</mdui:Description>
-        <mdui:Description xml:lang="it">Identity Provider per gli utenti dell'Università di Trieste</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://international.units.it/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="it">http://www.units.it/</mdui:InformationURL>
-        <mdui:Logo height="16" width="16" xml:lang="en">https://idemfero.units.it/unilogo/sigillo16x16.png</mdui:Logo>
-        <mdui:Logo height="16" width="16" xml:lang="it">https://idemfero.units.it/unilogo/sigillo16x16.png</mdui:Logo>
-        <mdui:Logo height="60" width="80" xml:lang="en">https://idemfero.units.it/unilogo/sigillo60x80.png</mdui:Logo>
-        <mdui:Logo height="60" width="80" xml:lang="it">https://idemfero.units.it/unilogo/sigillo60x80.png</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDMDCCAhigAwIBAgIVAIPn0rci7ca2nc6Pd0a8kS35GFVlMA0GCSqGSIb3DQEB
-BQUAMBwxGjAYBgNVBAMTEWlkZW1mZXJvLnVuaXRzLml0MB4XDTExMDYzMDE1Mzgw
-NFoXDTMxMDYzMDE1MzgwNFowHDEaMBgGA1UEAxMRaWRlbWZlcm8udW5pdHMuaXQw
-ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDm2d1TVod551/AHgSkFZa/
-DgfKePtHqC88H9qlcDGhhZfdhN1KCubG7H2sY1awLQ3HwonlfyCN+FjxL15jiTtS
-SGM3bE9tb8p6NoryPTtPSiF4JZraE5Y8PnWN7i49QhhOY/dzsYGUGzKWY8GzSaKB
-BJAA+XXbj2l6s/6Ksj/ii7KGjt/opcJ5rBE0+ttDanuC0w8upUAL29rQ5Yx6n7IG
-FMI7PS2W1IeKrU0Fm93ujdm3Itx9L+5bmd/WQyJInXt9DWQXBhek3oh5ZCK+H7Or
-h9Sk4ld8BxFlgsw96xjVX246jTCBgGcCOlRRW9d21tYmCEn/ew4JVtHHRktnblD3
-AgMBAAGjaTBnMEYGA1UdEQQ/MD2CEWlkZW1mZXJvLnVuaXRzLml0hihodHRwczov
-L2lkZW1mZXJvLnVuaXRzLml0L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBQDNZRh
-1OdCXmX7+5k2XwRmfMQ4iDANBgkqhkiG9w0BAQUFAAOCAQEASeWVPZ+W5q+LxyZP
-uEpGw+uysbNIBbpxglKfli3QX9MQrBOG1S1Y5gQ5Rsi26ipWidgEORbX6mUKtax+
-85NYvi3faIcbLMf87Xbxmn+oYMv/ksfeoevZAkLPXb6DLNjoOEV2UbQuz/03o9bM
-05QJuuY1K9ioCMat4+WZ3XvLxNoKZwRLtERV5Ibr+ffOu1WhXkdoW1PX6K12p044
-Ia4SBEhy9t8ZxoAe2sSE8TTww+wGzJ48+2Ek/Lr/JTCbT1wj3QGvN3vbE++aLrtY
-LWrKlDzFIKXv9Tk8LNWWOGxbRhw3x2OymWGfU9gDlQs0mAWuEKsjr3iUrsDGkkiy
-aQYbJQ==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idemfero.units.it:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idemfero.units.it: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://idemfero.units.it/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idemfero.units.it/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idemfero.units.it/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idemfero.units.it/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">units.it</shibmd:Scope>
-      <shibmd:Scope regexp="false">ds.units.it</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDMDCCAhigAwIBAgIVAIPn0rci7ca2nc6Pd0a8kS35GFVlMA0GCSqGSIb3DQEB
-BQUAMBwxGjAYBgNVBAMTEWlkZW1mZXJvLnVuaXRzLml0MB4XDTExMDYzMDE1Mzgw
-NFoXDTMxMDYzMDE1MzgwNFowHDEaMBgGA1UEAxMRaWRlbWZlcm8udW5pdHMuaXQw
-ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDm2d1TVod551/AHgSkFZa/
-DgfKePtHqC88H9qlcDGhhZfdhN1KCubG7H2sY1awLQ3HwonlfyCN+FjxL15jiTtS
-SGM3bE9tb8p6NoryPTtPSiF4JZraE5Y8PnWN7i49QhhOY/dzsYGUGzKWY8GzSaKB
-BJAA+XXbj2l6s/6Ksj/ii7KGjt/opcJ5rBE0+ttDanuC0w8upUAL29rQ5Yx6n7IG
-FMI7PS2W1IeKrU0Fm93ujdm3Itx9L+5bmd/WQyJInXt9DWQXBhek3oh5ZCK+H7Or
-h9Sk4ld8BxFlgsw96xjVX246jTCBgGcCOlRRW9d21tYmCEn/ew4JVtHHRktnblD3
-AgMBAAGjaTBnMEYGA1UdEQQ/MD2CEWlkZW1mZXJvLnVuaXRzLml0hihodHRwczov
-L2lkZW1mZXJvLnVuaXRzLml0L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBQDNZRh
-1OdCXmX7+5k2XwRmfMQ4iDANBgkqhkiG9w0BAQUFAAOCAQEASeWVPZ+W5q+LxyZP
-uEpGw+uysbNIBbpxglKfli3QX9MQrBOG1S1Y5gQ5Rsi26ipWidgEORbX6mUKtax+
-85NYvi3faIcbLMf87Xbxmn+oYMv/ksfeoevZAkLPXb6DLNjoOEV2UbQuz/03o9bM
-05QJuuY1K9ioCMat4+WZ3XvLxNoKZwRLtERV5Ibr+ffOu1WhXkdoW1PX6K12p044
-Ia4SBEhy9t8ZxoAe2sSE8TTww+wGzJ48+2Ek/Lr/JTCbT1wj3QGvN3vbE++aLrtY
-LWrKlDzFIKXv9Tk8LNWWOGxbRhw3x2OymWGfU9gDlQs0mAWuEKsjr3iUrsDGkkiy
-aQYbJQ==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idemfero.units.it:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idemfero.units.it: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="it">Università degli Studi di Trieste</OrganizationName>
-    <OrganizationName xml:lang="en">University of Trieste</OrganizationName>
-    <OrganizationDisplayName xml:lang="it">Università di Trieste</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">University of Trieste</OrganizationDisplayName>
-    <OrganizationURL xml:lang="it">http://www.units.it/</OrganizationURL>
-    <OrganizationURL xml:lang="en">http://international.units.it/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Staff Tecnico</GivenName>
-    <EmailAddress>idem@units.it</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/ident-shib.ensc-rennes.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/ident-shib.ensc-rennes.fr-idp-shibboleth.xml
deleted file mode 100644
index ad202d24..00000000
--- a/swamid-interfederations-2.0/ident-shib.ensc-rennes.fr-idp-shibboleth.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ident-shib.ensc-rennes.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2014-02-05T18:17:51Z">
-      <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">ensc-rennes.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Ecole Nationale Supérieure de Chimie de Rennes</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Students and members of Ecole Nationale Supérieure de Chimie de Rennes</mdui:Description>
-        <mdui:DisplayName xml:lang="fr">Ecole Nationale Supérieure de Chimie de Rennes</mdui:DisplayName>
-        <mdui:Description xml:lang="fr">Étudiants, doctorants et personnels de l'Ecole Nationale Supérieure de Chimie de Rennes</mdui:Description>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDUDCCAjigAwIBAgIVAJzCGVHITFdUQZHToPMuBqK1RWD4MA0GCSqGSIb3DQEB
-BQUAMCQxIjAgBgNVBAMTGWlkZW50LXNoaWIuZW5zYy1yZW5uZXMuZnIwHhcNMTQw
-MjAzMTYxODExWhcNMzQwMjAzMTYxODExWjAkMSIwIAYDVQQDExlpZGVudC1zaGli
-LmVuc2MtcmVubmVzLmZyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
-hIpbRHGHJooNDAMhOEiava+ybI8svFXqhXjfsTxwbfGWvsKD523Ll//RtVnLXAk9
-Z2bYEwHrc/4sfdnMaWpHt2mQ0+eEOvhP0MK34WHfiZgS9RxcHDYZVvzHRhBxBnMO
-AG4WoO1nUrwQqooKN+WmPVqBwYWvMPh44i9grueh7hIau+VXdKtB0CUlZHLksNoa
-HXzRajFTEqfL1AVocovZ9CB+3uBaV12VWpK9IVe0zcsL2fV3/5/bFj4RWIZ3CYzw
-ibKUV0WuuhT7UDOMCVZtgEC71Eio8QYVGHiySF1erOHnypSBN47/n2PqKQrmn10C
-8F4MJ0U/29CG+fbprAAxxwIDAQABo3kwdzBWBgNVHREETzBNghlpZGVudC1zaGli
-LmVuc2MtcmVubmVzLmZyhjBodHRwczovL2lkZW50LXNoaWIuZW5zYy1yZW5uZXMu
-ZnIvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFAOSOecw1ZOscoOQfSu2szw1P0e2
-MA0GCSqGSIb3DQEBBQUAA4IBAQBuFiTaiuedPd3pNbg5I9PIOmDqkbfewLVQiUhW
-Cw/H+wBLeU3Pu1J2I1bGktcXAKrb7NPXhDkqAjFga8DHwhQiwT3VHuO8Oe5JmfeN
-rYT51++eLm4vSoZUuRqBMgceSPoJNZuGzcixdeVnSCEyEohHuOjsEJNTMB4+n3K3
-ycCAtaEV09m6h4P3nzLYrXqAi4GvnLYrdNCPD+2ubiMS2PM10A5riMhYoAXWVIno
-yYXfk+ahSEIh7MdvQtGawI728jaLbr4873IHc1Fo7M1rapKh+QgLeMusOmWXhNSP
-k4wuv1TSugU8yiGa4BGVGS3k4ez0ksS2iWlU4SiAdPE9cT2t
-					    </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://ident-shib.ensc-rennes.fr/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ident-shib.ensc-rennes.fr/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://ident-shib.ensc-rennes.fr/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Ecole Nationale Supérieure de Chimie de Rennes</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Ecole Nationale Supérieure de Chimie de Rennes</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <EmailAddress>fed-admin@listes.univ-rennes1.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/ident-shib.ensc-rennes.fr.xml b/swamid-interfederations-2.0/ident-shib.ensc-rennes.fr.xml
deleted file mode 100644
index ad202d24..00000000
--- a/swamid-interfederations-2.0/ident-shib.ensc-rennes.fr.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ident-shib.ensc-rennes.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2014-02-05T18:17:51Z">
-      <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">ensc-rennes.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Ecole Nationale Supérieure de Chimie de Rennes</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Students and members of Ecole Nationale Supérieure de Chimie de Rennes</mdui:Description>
-        <mdui:DisplayName xml:lang="fr">Ecole Nationale Supérieure de Chimie de Rennes</mdui:DisplayName>
-        <mdui:Description xml:lang="fr">Étudiants, doctorants et personnels de l'Ecole Nationale Supérieure de Chimie de Rennes</mdui:Description>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDUDCCAjigAwIBAgIVAJzCGVHITFdUQZHToPMuBqK1RWD4MA0GCSqGSIb3DQEB
-BQUAMCQxIjAgBgNVBAMTGWlkZW50LXNoaWIuZW5zYy1yZW5uZXMuZnIwHhcNMTQw
-MjAzMTYxODExWhcNMzQwMjAzMTYxODExWjAkMSIwIAYDVQQDExlpZGVudC1zaGli
-LmVuc2MtcmVubmVzLmZyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
-hIpbRHGHJooNDAMhOEiava+ybI8svFXqhXjfsTxwbfGWvsKD523Ll//RtVnLXAk9
-Z2bYEwHrc/4sfdnMaWpHt2mQ0+eEOvhP0MK34WHfiZgS9RxcHDYZVvzHRhBxBnMO
-AG4WoO1nUrwQqooKN+WmPVqBwYWvMPh44i9grueh7hIau+VXdKtB0CUlZHLksNoa
-HXzRajFTEqfL1AVocovZ9CB+3uBaV12VWpK9IVe0zcsL2fV3/5/bFj4RWIZ3CYzw
-ibKUV0WuuhT7UDOMCVZtgEC71Eio8QYVGHiySF1erOHnypSBN47/n2PqKQrmn10C
-8F4MJ0U/29CG+fbprAAxxwIDAQABo3kwdzBWBgNVHREETzBNghlpZGVudC1zaGli
-LmVuc2MtcmVubmVzLmZyhjBodHRwczovL2lkZW50LXNoaWIuZW5zYy1yZW5uZXMu
-ZnIvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFAOSOecw1ZOscoOQfSu2szw1P0e2
-MA0GCSqGSIb3DQEBBQUAA4IBAQBuFiTaiuedPd3pNbg5I9PIOmDqkbfewLVQiUhW
-Cw/H+wBLeU3Pu1J2I1bGktcXAKrb7NPXhDkqAjFga8DHwhQiwT3VHuO8Oe5JmfeN
-rYT51++eLm4vSoZUuRqBMgceSPoJNZuGzcixdeVnSCEyEohHuOjsEJNTMB4+n3K3
-ycCAtaEV09m6h4P3nzLYrXqAi4GvnLYrdNCPD+2ubiMS2PM10A5riMhYoAXWVIno
-yYXfk+ahSEIh7MdvQtGawI728jaLbr4873IHc1Fo7M1rapKh+QgLeMusOmWXhNSP
-k4wuv1TSugU8yiGa4BGVGS3k4ez0ksS2iWlU4SiAdPE9cT2t
-					    </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://ident-shib.ensc-rennes.fr/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ident-shib.ensc-rennes.fr/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://ident-shib.ensc-rennes.fr/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Ecole Nationale Supérieure de Chimie de Rennes</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Ecole Nationale Supérieure de Chimie de Rennes</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <EmailAddress>fed-admin@listes.univ-rennes1.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/ident-shib.sciencespo-rennes.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/ident-shib.sciencespo-rennes.fr-idp-shibboleth.xml
deleted file mode 100644
index 981bb99d..00000000
--- a/swamid-interfederations-2.0/ident-shib.sciencespo-rennes.fr-idp-shibboleth.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ident-shib.sciencespo-rennes.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2014-03-05T16:47:42Z">
-      <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">sciencespo-rennes.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Sciences Po Rennes</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Students and members of Institut d'Etudes Politiques de Rennes</mdui:Description>
-        <mdui:DisplayName xml:lang="fr">Sciences Po Rennes</mdui:DisplayName>
-        <mdui:Description xml:lang="fr">Étudiants et personnels de l'Institut d'Etudes Politiques de Rennes</mdui:Description>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDajCCAlKgAwIBAgIVAPG2ptbp0UjCApRyqdnLPcwZfygNMA0GCSqGSIb3DQEB
-BQUAMCoxKDAmBgNVBAMTH2lkZW50LXNoaWIuc2NpZW5jZXNwby1yZW5uZXMuZnIw
-HhcNMTQwMzA1MDk0NjQxWhcNMzQwMzA1MDk0NjQxWjAqMSgwJgYDVQQDEx9pZGVu
-dC1zaGliLnNjaWVuY2VzcG8tcmVubmVzLmZyMIIBIjANBgkqhkiG9w0BAQEFAAOC
-AQ8AMIIBCgKCAQEAis17JWHBLBfS8PU4tH7WX46gSxcMn1qrK5r7hZgLbyLb2BTJ
-H7S93L3rcoqls2YMcWuziTRweu9vcCalDICVazQlp8VfNQjdGFLqPxuGSbewoimk
-obngfwTck0cb1RHDKFLkzgUc4YJ3rgsriWqTsVlmN+JDz1f/mly0rO3iz7UiYAu5
-EeNwcHgdc+4e4/orknjwp7cWUyRAtwoSXMlQfttYn6ZtQTiZOmF4JSVseP+4Gawj
-VGrZIgysDT+W+9UMwdk8/oFue7wAZaYtoV3imWr0EyrIG7v1FD/58rAQZF8c1Myl
-xsQ3OUC1tAGBLcnoDgVD85N6F8e5v5zAYGepfwIDAQABo4GGMIGDMGIGA1UdEQRb
-MFmCH2lkZW50LXNoaWIuc2NpZW5jZXNwby1yZW5uZXMuZnKGNmh0dHBzOi8vaWRl
-bnQtc2hpYi5zY2llbmNlc3BvLXJlbm5lcy5mci9pZHAvc2hpYmJvbGV0aDAdBgNV
-HQ4EFgQUxhh6YW27b6x27CQ9vu4PZc21OpQwDQYJKoZIhvcNAQEFBQADggEBADXY
-cwvGXPbtQksBGQupD9DIRdE2mmlISK6M3Zuv5c3aPu6QLw1fqHUYGRC5MNas7763
-GLI1ALEfxo7X29gpfXmLfB6hQO2zplYucodgQjI1jQD+Ds5elCgeH8pPAR+g7CDp
-dMQSGjHjulT3jQeJBgcVbH9UaV7X/fOPQ+EWD0E8UOAabzgOtWXCeWHJb/fWYwGD
-iVAdnJJ16ocCmt0N88D7p2ZIJI7bIbPt/WGDoyCNZRfULibmnQLi4S8/gxgdIkTO
-BztWG5dSG8X4uDpNKGFlecW3B4zqa3fGpLv9cwhNaDXlJIw2vgusD7Vtg+HagP5y
-7Av7UaH4E10urfrI2n0=
-					    </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://ident-shib.sciencespo-rennes.fr/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ident-shib.sciencespo-rennes.fr/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://ident-shib.sciencespo-rennes.fr/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Sciences Po Rennes</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Sciences Po Rennes</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <EmailAddress>fed-admin@listes.univ-rennes1.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/ident-shib.sciencespo-rennes.fr.xml b/swamid-interfederations-2.0/ident-shib.sciencespo-rennes.fr.xml
deleted file mode 100644
index 981bb99d..00000000
--- a/swamid-interfederations-2.0/ident-shib.sciencespo-rennes.fr.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ident-shib.sciencespo-rennes.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2014-03-05T16:47:42Z">
-      <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">sciencespo-rennes.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Sciences Po Rennes</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Students and members of Institut d'Etudes Politiques de Rennes</mdui:Description>
-        <mdui:DisplayName xml:lang="fr">Sciences Po Rennes</mdui:DisplayName>
-        <mdui:Description xml:lang="fr">Étudiants et personnels de l'Institut d'Etudes Politiques de Rennes</mdui:Description>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDajCCAlKgAwIBAgIVAPG2ptbp0UjCApRyqdnLPcwZfygNMA0GCSqGSIb3DQEB
-BQUAMCoxKDAmBgNVBAMTH2lkZW50LXNoaWIuc2NpZW5jZXNwby1yZW5uZXMuZnIw
-HhcNMTQwMzA1MDk0NjQxWhcNMzQwMzA1MDk0NjQxWjAqMSgwJgYDVQQDEx9pZGVu
-dC1zaGliLnNjaWVuY2VzcG8tcmVubmVzLmZyMIIBIjANBgkqhkiG9w0BAQEFAAOC
-AQ8AMIIBCgKCAQEAis17JWHBLBfS8PU4tH7WX46gSxcMn1qrK5r7hZgLbyLb2BTJ
-H7S93L3rcoqls2YMcWuziTRweu9vcCalDICVazQlp8VfNQjdGFLqPxuGSbewoimk
-obngfwTck0cb1RHDKFLkzgUc4YJ3rgsriWqTsVlmN+JDz1f/mly0rO3iz7UiYAu5
-EeNwcHgdc+4e4/orknjwp7cWUyRAtwoSXMlQfttYn6ZtQTiZOmF4JSVseP+4Gawj
-VGrZIgysDT+W+9UMwdk8/oFue7wAZaYtoV3imWr0EyrIG7v1FD/58rAQZF8c1Myl
-xsQ3OUC1tAGBLcnoDgVD85N6F8e5v5zAYGepfwIDAQABo4GGMIGDMGIGA1UdEQRb
-MFmCH2lkZW50LXNoaWIuc2NpZW5jZXNwby1yZW5uZXMuZnKGNmh0dHBzOi8vaWRl
-bnQtc2hpYi5zY2llbmNlc3BvLXJlbm5lcy5mci9pZHAvc2hpYmJvbGV0aDAdBgNV
-HQ4EFgQUxhh6YW27b6x27CQ9vu4PZc21OpQwDQYJKoZIhvcNAQEFBQADggEBADXY
-cwvGXPbtQksBGQupD9DIRdE2mmlISK6M3Zuv5c3aPu6QLw1fqHUYGRC5MNas7763
-GLI1ALEfxo7X29gpfXmLfB6hQO2zplYucodgQjI1jQD+Ds5elCgeH8pPAR+g7CDp
-dMQSGjHjulT3jQeJBgcVbH9UaV7X/fOPQ+EWD0E8UOAabzgOtWXCeWHJb/fWYwGD
-iVAdnJJ16ocCmt0N88D7p2ZIJI7bIbPt/WGDoyCNZRfULibmnQLi4S8/gxgdIkTO
-BztWG5dSG8X4uDpNKGFlecW3B4zqa3fGpLv9cwhNaDXlJIw2vgusD7Vtg+HagP5y
-7Av7UaH4E10urfrI2n0=
-					    </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://ident-shib.sciencespo-rennes.fr/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ident-shib.sciencespo-rennes.fr/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://ident-shib.sciencespo-rennes.fr/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Sciences Po Rennes</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Sciences Po Rennes</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <EmailAddress>fed-admin@listes.univ-rennes1.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/ident.ensta-bretagne.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/ident.ensta-bretagne.fr-idp-shibboleth.xml
deleted file mode 100644
index 819dec8e..00000000
--- a/swamid-interfederations-2.0/ident.ensta-bretagne.fr-idp-shibboleth.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ident.ensta-bretagne.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2013-06-25T13:42:46Z">
-      <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">ensta-bretagne.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">ENSTA Bretagne - Ecole Nationale Supérieure des Techniques Avancées</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDPDCCAiSgAwIBAgIVAIEsfLZbOVKR5umlzQTdFNcppbAhMA0GCSqGSIb3DQEB
-BQUAMB8xHTAbBgNVBAMTFGR1bmRlZS5lbnNpZXRhLmVjb2xlMB4XDTEzMDIxNTEy
-MjY1NVoXDTMzMDIxNTEyMjY1NVowHzEdMBsGA1UEAxMUZHVuZGVlLmVuc2lldGEu
-ZWNvbGUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCjkoPRA+/M6G74
-s1PymwU6YHSEJBDhMpYhjm9WmleJqao/BEV1BU1BpSTmbHg0CVo0ZrFZ/kHu5Z9Q
-veqPk3dM4rao4I/a3f1atZh77jQWhxPauiLgRC2EoWWDYDwZi6LfdkeQwDFm8SnN
-Ug+NRspwOWM7lXxo1d4DpU1aeMhosQMyqazzumrBhucT1QbtWrrJth1XN//z/7kW
-xK4hERSTRC4jKG03e4FKEliWG+WTdR0mMgypur+ZuQ2PwASjMV29L2ilm7o9inKK
-OPLbqATNoYgXhNgsMueyRqqfti9sxMo0aRW6wDu5iEBhy9hUo6PMWhBuw7lc+1K9
-SQaQgCU3AgMBAAGjbzBtMEwGA1UdEQRFMEOCFGR1bmRlZS5lbnNpZXRhLmVjb2xl
-hitodHRwczovL2R1bmRlZS5lbnNpZXRhLmVjb2xlL2lkcC9zaGliYm9sZXRoMB0G
-A1UdDgQWBBTOl8EfVH85x42e4K+brZLAl2llFTANBgkqhkiG9w0BAQUFAAOCAQEA
-YZRNdG+23m13Vs/QtqNH9eCRJa2xjWgRhdtgy+O+1V9apu5T2jspd6eI+r8kgv+T
-TcN2NgDOt3WaArJCrOJZ6eFdN7zx19Jcl5BwcRaX/13X4yt/QVqr8lEpmFC/JUFb
-M+YJV34AexxYJ5Trev/8iit0Ihmo0yLPakEvlPil/UOiNPjQMluHliAaBQpGI4xF
-/oMMMCl3sk9TTAPX+16NaqdBBDmUWIglw20NRFR1dHpRjdUIfJGSHhhEcfWbGfik
-gbARW97y4+lEEDGKeDw/vhHIExaTI59muRL9UZY7hr2CRpCzC/DLU6ldzFdDxuvO
-fcIaXtfvCTHeM5bB7Ao7aw==
-					    </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://ident.ensta-bretagne.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ident.ensta-bretagne.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://ident.ensta-bretagne.fr/idp/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">ENSTA Bretagne - Ecole Nationale Supérieure des Techniques Avancées</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">ENSTA Bretagne - Ecole Nationale Supérieure des Techniques Avancées</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Jean-Paul KIRKBRIDE</SurName>
-    <EmailAddress>jean-paul.kirkbride@ensta-bretagne.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/ident.ensta-bretagne.fr.xml b/swamid-interfederations-2.0/ident.ensta-bretagne.fr.xml
deleted file mode 100644
index 819dec8e..00000000
--- a/swamid-interfederations-2.0/ident.ensta-bretagne.fr.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ident.ensta-bretagne.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2013-06-25T13:42:46Z">
-      <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">ensta-bretagne.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">ENSTA Bretagne - Ecole Nationale Supérieure des Techniques Avancées</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDPDCCAiSgAwIBAgIVAIEsfLZbOVKR5umlzQTdFNcppbAhMA0GCSqGSIb3DQEB
-BQUAMB8xHTAbBgNVBAMTFGR1bmRlZS5lbnNpZXRhLmVjb2xlMB4XDTEzMDIxNTEy
-MjY1NVoXDTMzMDIxNTEyMjY1NVowHzEdMBsGA1UEAxMUZHVuZGVlLmVuc2lldGEu
-ZWNvbGUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCjkoPRA+/M6G74
-s1PymwU6YHSEJBDhMpYhjm9WmleJqao/BEV1BU1BpSTmbHg0CVo0ZrFZ/kHu5Z9Q
-veqPk3dM4rao4I/a3f1atZh77jQWhxPauiLgRC2EoWWDYDwZi6LfdkeQwDFm8SnN
-Ug+NRspwOWM7lXxo1d4DpU1aeMhosQMyqazzumrBhucT1QbtWrrJth1XN//z/7kW
-xK4hERSTRC4jKG03e4FKEliWG+WTdR0mMgypur+ZuQ2PwASjMV29L2ilm7o9inKK
-OPLbqATNoYgXhNgsMueyRqqfti9sxMo0aRW6wDu5iEBhy9hUo6PMWhBuw7lc+1K9
-SQaQgCU3AgMBAAGjbzBtMEwGA1UdEQRFMEOCFGR1bmRlZS5lbnNpZXRhLmVjb2xl
-hitodHRwczovL2R1bmRlZS5lbnNpZXRhLmVjb2xlL2lkcC9zaGliYm9sZXRoMB0G
-A1UdDgQWBBTOl8EfVH85x42e4K+brZLAl2llFTANBgkqhkiG9w0BAQUFAAOCAQEA
-YZRNdG+23m13Vs/QtqNH9eCRJa2xjWgRhdtgy+O+1V9apu5T2jspd6eI+r8kgv+T
-TcN2NgDOt3WaArJCrOJZ6eFdN7zx19Jcl5BwcRaX/13X4yt/QVqr8lEpmFC/JUFb
-M+YJV34AexxYJ5Trev/8iit0Ihmo0yLPakEvlPil/UOiNPjQMluHliAaBQpGI4xF
-/oMMMCl3sk9TTAPX+16NaqdBBDmUWIglw20NRFR1dHpRjdUIfJGSHhhEcfWbGfik
-gbARW97y4+lEEDGKeDw/vhHIExaTI59muRL9UZY7hr2CRpCzC/DLU6ldzFdDxuvO
-fcIaXtfvCTHeM5bB7Ao7aw==
-					    </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://ident.ensta-bretagne.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ident.ensta-bretagne.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://ident.ensta-bretagne.fr/idp/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">ENSTA Bretagne - Ecole Nationale Supérieure des Techniques Avancées</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">ENSTA Bretagne - Ecole Nationale Supérieure des Techniques Avancées</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Jean-Paul KIRKBRIDE</SurName>
-    <EmailAddress>jean-paul.kirkbride@ensta-bretagne.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/ident.ensta.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/ident.ensta.fr-idp-shibboleth.xml
deleted file mode 100644
index 1c3bc01a..00000000
--- a/swamid-interfederations-2.0/ident.ensta.fr-idp-shibboleth.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ident.ensta.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2011-08-26T13:19:49Z">
-      <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">ensta.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">ENSTA Paristech - Ecole Nationale Supérieure de Techniques Avancées</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDJDCCAgygAwIBAgIVAIE5ZcyxZPjFLm75fbkW0LiVO5fRMA0GCSqGSIb3DQEB
-BQUAMBkxFzAVBgNVBAMTDmlkZW50LmVuc3RhLmZyMB4XDTExMDgyMjE2MDc0MVoX
-DTMxMDgyMjE2MDc0MVowGTEXMBUGA1UEAxMOaWRlbnQuZW5zdGEuZnIwggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDCLUeb4d/P26zell2IAVzJBcMdqWuw
-qudpEy3TnwNFhIjtE/B9BOu4zSYOXCYhYHk+6aJlttHU3t9nyO/tMQV4eIx/8+Os
-TyiF8RlgB6o/0dNElQArztPxtpQD9bdWzkVijpP8EnoGq/EiVi8BhYUeMsg8kVs7
-8Xj57AGFwqZmcPGIsEl3alykgFRQhgT/CYnudFeVzXSVb5y3ieFpdtv9JH036jQZ
-3IMgNtiASoa7pSiTe4Wmbe/4OlCc5XG7djWIPHE8GycHS6oXKSSCm1Zi6oQX88wn
-PyPP3V7X4VBL7EEuG/qAQf9rw1nheNOsfr1IlN3M23kAICwjf1t/UuWdAgMBAAGj
-YzBhMEAGA1UdEQQ5MDeCDmlkZW50LmVuc3RhLmZyhiVodHRwczovL2lkZW50LmVu
-c3RhLmZyL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBSB9b2goKj1aewRYxlw9Aa6
-LDUomjANBgkqhkiG9w0BAQUFAAOCAQEALeX6AhrW0ejRY6ujqd31yDoIVltDfYBO
-IX+3JAbiCqSVm5b3uWyqxnKv/q+O1Wz0Oe7X8mIJKpu2Pi5Ley23/SfAA2Gf4rEp
-kOXIGlJgDo5hv/WcX374GnMQkUfyT1J9t9ZQecfdlpm4bPTDBkdcATUa/l1YU5zb
-2OeYp+sNAaOEk61WsALn1iJpMd4Ypg9VCQKTZrbfXO+LYKt11rx1WEzFHaBq5He1
-Ym/NOwwHDAo6tnYIm9/t75h/vzsBus+mpzTdC8MDvqlKyvEIM1RLZFhbS8T3lp8u
-90sfMSml1fBmXcLWIQ8d6B0WUCbbEzfGmbj1C7bGbhz1eYRHwLzgew==
-					    </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://ident.ensta.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ident.ensta.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://ident.ensta.fr/idp/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">ENSTA Paristech - Ecole Nationale Supérieure de Techniques Avancées</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">ENSTA Paristech - Ecole Nationale Supérieure de Techniques Avancées</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Alain Paris</SurName>
-    <EmailAddress>alain.paris@ensta-paristech.fr</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <SurName>Joseph LIGIER</SurName>
-    <EmailAddress>joseph.ligier@ensta-paristech.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/ident.ensta.fr.xml b/swamid-interfederations-2.0/ident.ensta.fr.xml
deleted file mode 100644
index 1c3bc01a..00000000
--- a/swamid-interfederations-2.0/ident.ensta.fr.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ident.ensta.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2011-08-26T13:19:49Z">
-      <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">ensta.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">ENSTA Paristech - Ecole Nationale Supérieure de Techniques Avancées</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDJDCCAgygAwIBAgIVAIE5ZcyxZPjFLm75fbkW0LiVO5fRMA0GCSqGSIb3DQEB
-BQUAMBkxFzAVBgNVBAMTDmlkZW50LmVuc3RhLmZyMB4XDTExMDgyMjE2MDc0MVoX
-DTMxMDgyMjE2MDc0MVowGTEXMBUGA1UEAxMOaWRlbnQuZW5zdGEuZnIwggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDCLUeb4d/P26zell2IAVzJBcMdqWuw
-qudpEy3TnwNFhIjtE/B9BOu4zSYOXCYhYHk+6aJlttHU3t9nyO/tMQV4eIx/8+Os
-TyiF8RlgB6o/0dNElQArztPxtpQD9bdWzkVijpP8EnoGq/EiVi8BhYUeMsg8kVs7
-8Xj57AGFwqZmcPGIsEl3alykgFRQhgT/CYnudFeVzXSVb5y3ieFpdtv9JH036jQZ
-3IMgNtiASoa7pSiTe4Wmbe/4OlCc5XG7djWIPHE8GycHS6oXKSSCm1Zi6oQX88wn
-PyPP3V7X4VBL7EEuG/qAQf9rw1nheNOsfr1IlN3M23kAICwjf1t/UuWdAgMBAAGj
-YzBhMEAGA1UdEQQ5MDeCDmlkZW50LmVuc3RhLmZyhiVodHRwczovL2lkZW50LmVu
-c3RhLmZyL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBSB9b2goKj1aewRYxlw9Aa6
-LDUomjANBgkqhkiG9w0BAQUFAAOCAQEALeX6AhrW0ejRY6ujqd31yDoIVltDfYBO
-IX+3JAbiCqSVm5b3uWyqxnKv/q+O1Wz0Oe7X8mIJKpu2Pi5Ley23/SfAA2Gf4rEp
-kOXIGlJgDo5hv/WcX374GnMQkUfyT1J9t9ZQecfdlpm4bPTDBkdcATUa/l1YU5zb
-2OeYp+sNAaOEk61WsALn1iJpMd4Ypg9VCQKTZrbfXO+LYKt11rx1WEzFHaBq5He1
-Ym/NOwwHDAo6tnYIm9/t75h/vzsBus+mpzTdC8MDvqlKyvEIM1RLZFhbS8T3lp8u
-90sfMSml1fBmXcLWIQ8d6B0WUCbbEzfGmbj1C7bGbhz1eYRHwLzgew==
-					    </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://ident.ensta.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ident.ensta.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://ident.ensta.fr/idp/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">ENSTA Paristech - Ecole Nationale Supérieure de Techniques Avancées</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">ENSTA Paristech - Ecole Nationale Supérieure de Techniques Avancées</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Alain Paris</SurName>
-    <EmailAddress>alain.paris@ensta-paristech.fr</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <SurName>Joseph LIGIER</SurName>
-    <EmailAddress>joseph.ligier@ensta-paristech.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/ident.groupe-esa.com-idp-shibboleth.xml b/swamid-interfederations-2.0/ident.groupe-esa.com-idp-shibboleth.xml
deleted file mode 100644
index 94774269..00000000
--- a/swamid-interfederations-2.0/ident.groupe-esa.com-idp-shibboleth.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ident.groupe-esa.com/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2013-09-11T10:07:12Z">
-      <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">groupe-esa.com</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">groupe-esa.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">Ecole Supérieure d'Agriculture d'Angers</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDPDCCAiSgAwIBAgIVAIrbDRCxNtaYnhNe0Q7DpuLVmgMHMA0GCSqGSIb3DQEB
-BQUAMB8xHTAbBgNVBAMTFGlkZW50Lmdyb3VwZS1lc2EuY29tMB4XDTEzMDkxMDA5
-MTI1M1oXDTMzMDkxMDA5MTI1M1owHzEdMBsGA1UEAxMUaWRlbnQuZ3JvdXBlLWVz
-YS5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCvf9ar+jST7FHc
-VUA37MOpTu6ViObVTFdfjSZks2PrsTgKGlq6aUoVHW6+ldF9c7z0gXD37qGmHmP3
-BrWq6W80bjg5rqgYeMpJxQsTXUaGXaEnsjKKiDQbv4rN3mtp9oufLPfPxLP/BC0W
-UCBFizNyP36hnFp6VbCOk2Ljg+1LVIEAEv8hx8kKhvcz93SjZg1P/IXuu8Evr7wk
-JoXb7awSIpfEzHSikaC3lhBg7SRdCUrKzTEG09nMRT8jBaQ6GmoG6A742ocd7FmD
-BJfJlJLmSu9XoY6eNN9Bdt+Cqb58Q9YavgSncLRXuz+9BhNKSwM3cqRO/ENey5Sr
-Bgh1CxQDAgMBAAGjbzBtMEwGA1UdEQRFMEOCFGlkZW50Lmdyb3VwZS1lc2EuY29t
-hitodHRwczovL2lkZW50Lmdyb3VwZS1lc2EuY29tL2lkcC9zaGliYm9sZXRoMB0G
-A1UdDgQWBBTVK5X4uYZ3DYMRinUl83LfoBkQDDANBgkqhkiG9w0BAQUFAAOCAQEA
-PJHMoIiE+3KJVyjhM65mcvjfK/QMr2p3rGCyPOC3Gqe3DC6+ktEBMabL7Mgzhrpg
-44xN+Apygl7D3Vs0d3HbZtxSCr8IZSWXLF852pniTnW3UVFzvgqqxBe2rn5aKkke
-Wmsgnk/M+A+wwiooVjl81aYlOx/kMDa9t+7/AN3V4BC8e2hdii9UdGzZsWrjTngt
-3iJ4ZVI3jadnCbclS68vf9yVy4JtDQ4F1sC9b1tMBx5a9It73GIL6p3RaKP5JjzR
-6+HBk4Fq2MNRK6dEwV9yPazjsuEqwoZHKihAGaINwVnBNdM/9eUfmCAE9MLo83lN
-R1luRGQHNbRzg1OZtwrsHw==
-					    </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://ident.groupe-esa.com/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ident.groupe-esa.com/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://ident.groupe-esa.com/idp/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Ecole Supérieure d'Agriculture d'Angers</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Ecole Supérieure d'Agriculture d'Angers</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <EmailAddress>info@groupe-esa.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/ident.groupe-esa.com.xml b/swamid-interfederations-2.0/ident.groupe-esa.com.xml
deleted file mode 100644
index 94774269..00000000
--- a/swamid-interfederations-2.0/ident.groupe-esa.com.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ident.groupe-esa.com/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2013-09-11T10:07:12Z">
-      <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">groupe-esa.com</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">groupe-esa.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">Ecole Supérieure d'Agriculture d'Angers</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDPDCCAiSgAwIBAgIVAIrbDRCxNtaYnhNe0Q7DpuLVmgMHMA0GCSqGSIb3DQEB
-BQUAMB8xHTAbBgNVBAMTFGlkZW50Lmdyb3VwZS1lc2EuY29tMB4XDTEzMDkxMDA5
-MTI1M1oXDTMzMDkxMDA5MTI1M1owHzEdMBsGA1UEAxMUaWRlbnQuZ3JvdXBlLWVz
-YS5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCvf9ar+jST7FHc
-VUA37MOpTu6ViObVTFdfjSZks2PrsTgKGlq6aUoVHW6+ldF9c7z0gXD37qGmHmP3
-BrWq6W80bjg5rqgYeMpJxQsTXUaGXaEnsjKKiDQbv4rN3mtp9oufLPfPxLP/BC0W
-UCBFizNyP36hnFp6VbCOk2Ljg+1LVIEAEv8hx8kKhvcz93SjZg1P/IXuu8Evr7wk
-JoXb7awSIpfEzHSikaC3lhBg7SRdCUrKzTEG09nMRT8jBaQ6GmoG6A742ocd7FmD
-BJfJlJLmSu9XoY6eNN9Bdt+Cqb58Q9YavgSncLRXuz+9BhNKSwM3cqRO/ENey5Sr
-Bgh1CxQDAgMBAAGjbzBtMEwGA1UdEQRFMEOCFGlkZW50Lmdyb3VwZS1lc2EuY29t
-hitodHRwczovL2lkZW50Lmdyb3VwZS1lc2EuY29tL2lkcC9zaGliYm9sZXRoMB0G
-A1UdDgQWBBTVK5X4uYZ3DYMRinUl83LfoBkQDDANBgkqhkiG9w0BAQUFAAOCAQEA
-PJHMoIiE+3KJVyjhM65mcvjfK/QMr2p3rGCyPOC3Gqe3DC6+ktEBMabL7Mgzhrpg
-44xN+Apygl7D3Vs0d3HbZtxSCr8IZSWXLF852pniTnW3UVFzvgqqxBe2rn5aKkke
-Wmsgnk/M+A+wwiooVjl81aYlOx/kMDa9t+7/AN3V4BC8e2hdii9UdGzZsWrjTngt
-3iJ4ZVI3jadnCbclS68vf9yVy4JtDQ4F1sC9b1tMBx5a9It73GIL6p3RaKP5JjzR
-6+HBk4Fq2MNRK6dEwV9yPazjsuEqwoZHKihAGaINwVnBNdM/9eUfmCAE9MLo83lN
-R1luRGQHNbRzg1OZtwrsHw==
-					    </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://ident.groupe-esa.com/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ident.groupe-esa.com/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://ident.groupe-esa.com/idp/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Ecole Supérieure d'Agriculture d'Angers</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Ecole Supérieure d'Agriculture d'Angers</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <EmailAddress>info@groupe-esa.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/identites.ec-lyon.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/identites.ec-lyon.fr-idp-shibboleth.xml
deleted file mode 100644
index 67e2c238..00000000
--- a/swamid-interfederations-2.0/identites.ec-lyon.fr-idp-shibboleth.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://identites.ec-lyon.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2012-04-20T10:17:21Z">
-      <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">ec-lyon.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">Ecole Centrale de Lyon</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDQDCCAiigAwIBAgIVAJrguR/jXhFque4KJfEyebuerBj4MA0GCSqGSIb3DQEB
-BQUAMCAxHjAcBgNVBAMTFXNoaWJib2xldGguZWMtbHlvbi5mcjAeFw0xMjAzMDcx
-MzUxMDFaFw0zMjAzMDcxMzUxMDFaMCAxHjAcBgNVBAMTFXNoaWJib2xldGguZWMt
-bHlvbi5mcjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMFBE2ZGRJed
-X1yuAPuuFwufY2BHUSXDcF+pYE5e9YpBcljwE9DWgoQLRtBzsEBR7EyRZJDe+XZI
-DGe+gT7p0yrIsNjVXAJld3l9YHo3EKZ2YcTDC9EtUVDF70EqQL1+KFzMqHLmnojr
-/7FYR5iiRwcQ7+dQa8RBLwgXckpTzsjiJyuHzvUrDJmatKMsct5a16Hk/UG/BEjz
-m270xkFclPImp5hgG3Y0yLcuPAVoj/0aydnp8+/ZRaRL03EHbuSt2ewf4OvoQeAm
-J/xtpiOpVFQwApeCx+G7YEgC4W48lo797QlCpaw7fXUPxKhBxU38yDXE27mIt6Zh
-k0/JtUTCCG0CAwEAAaNxMG8wTgYDVR0RBEcwRYIVc2hpYmJvbGV0aC5lYy1seW9u
-LmZyhixodHRwczovL3NoaWJib2xldGguZWMtbHlvbi5mci9pZHAvc2hpYmJvbGV0
-aDAdBgNVHQ4EFgQUQwnjctonyj2JIsIKaPFhCV9oIFEwDQYJKoZIhvcNAQEFBQAD
-ggEBAC0S2ZzH4X+GcKFny1NkFcMz6z1tlJ+iDgcKrv44m1ZyqOtiPm8k91rYYr5f
-NqezE6TGWH/taqN+/Y5+cTnPOjmJKwbIGu56Pt3nilhtcRShgVmW6msVdaKtf5Sr
-2dfNYQTHRm/YBAU+VzBUraMijeL2XnR+PFm3VNE+TdfParaLAMHurmYBE/6tQfXt
-4D6wA3/uLosIJ9ofWuJlPEsmYBTm5RukxnH0Qb1Gb5n2E8V+ZNCImpjZFsxSSrYz
-RiwCcgJOD+DOge8blZpwqnL6EKHFiSVauCzZAQ4B/k+9m0kZBXapgA2Fs3FI8uC3
-ywgk8luEHvdrWWSkFWa4yb2TuI4=
-					    </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://identites.ec-lyon.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://identites.ec-lyon.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://identites.ec-lyon.fr/idp/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Ecole Centrale de Lyon</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Ecole Centrale de Lyon</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Cheval Régis</SurName>
-    <EmailAddress>regis.cheval@ec-lyon.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/identites.ec-lyon.fr.xml b/swamid-interfederations-2.0/identites.ec-lyon.fr.xml
deleted file mode 100644
index 67e2c238..00000000
--- a/swamid-interfederations-2.0/identites.ec-lyon.fr.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://identites.ec-lyon.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2012-04-20T10:17:21Z">
-      <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">ec-lyon.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">Ecole Centrale de Lyon</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDQDCCAiigAwIBAgIVAJrguR/jXhFque4KJfEyebuerBj4MA0GCSqGSIb3DQEB
-BQUAMCAxHjAcBgNVBAMTFXNoaWJib2xldGguZWMtbHlvbi5mcjAeFw0xMjAzMDcx
-MzUxMDFaFw0zMjAzMDcxMzUxMDFaMCAxHjAcBgNVBAMTFXNoaWJib2xldGguZWMt
-bHlvbi5mcjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMFBE2ZGRJed
-X1yuAPuuFwufY2BHUSXDcF+pYE5e9YpBcljwE9DWgoQLRtBzsEBR7EyRZJDe+XZI
-DGe+gT7p0yrIsNjVXAJld3l9YHo3EKZ2YcTDC9EtUVDF70EqQL1+KFzMqHLmnojr
-/7FYR5iiRwcQ7+dQa8RBLwgXckpTzsjiJyuHzvUrDJmatKMsct5a16Hk/UG/BEjz
-m270xkFclPImp5hgG3Y0yLcuPAVoj/0aydnp8+/ZRaRL03EHbuSt2ewf4OvoQeAm
-J/xtpiOpVFQwApeCx+G7YEgC4W48lo797QlCpaw7fXUPxKhBxU38yDXE27mIt6Zh
-k0/JtUTCCG0CAwEAAaNxMG8wTgYDVR0RBEcwRYIVc2hpYmJvbGV0aC5lYy1seW9u
-LmZyhixodHRwczovL3NoaWJib2xldGguZWMtbHlvbi5mci9pZHAvc2hpYmJvbGV0
-aDAdBgNVHQ4EFgQUQwnjctonyj2JIsIKaPFhCV9oIFEwDQYJKoZIhvcNAQEFBQAD
-ggEBAC0S2ZzH4X+GcKFny1NkFcMz6z1tlJ+iDgcKrv44m1ZyqOtiPm8k91rYYr5f
-NqezE6TGWH/taqN+/Y5+cTnPOjmJKwbIGu56Pt3nilhtcRShgVmW6msVdaKtf5Sr
-2dfNYQTHRm/YBAU+VzBUraMijeL2XnR+PFm3VNE+TdfParaLAMHurmYBE/6tQfXt
-4D6wA3/uLosIJ9ofWuJlPEsmYBTm5RukxnH0Qb1Gb5n2E8V+ZNCImpjZFsxSSrYz
-RiwCcgJOD+DOge8blZpwqnL6EKHFiSVauCzZAQ4B/k+9m0kZBXapgA2Fs3FI8uC3
-ywgk8luEHvdrWWSkFWa4yb2TuI4=
-					    </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://identites.ec-lyon.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://identites.ec-lyon.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://identites.ec-lyon.fr/idp/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Ecole Centrale de Lyon</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Ecole Centrale de Lyon</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Cheval Régis</SurName>
-    <EmailAddress>regis.cheval@ec-lyon.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/identites.enim.fr-idp-.xml b/swamid-interfederations-2.0/identites.enim.fr-idp-.xml
deleted file mode 100644
index 00f44c5e..00000000
--- a/swamid-interfederations-2.0/identites.enim.fr-idp-.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://identites.enim.fr/idp/">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2012-12-10T10:41:49Z">
-      <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">enim.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">ENIM</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDFzCCAf+gAwIBAgIUXFUXeBlCuUekINLHfPFZiIPUrsAwDQYJKoZIhvcNAQEF
-BQAwFjEUMBIGA1UEAxMLaWRwLmVuaW0uZnIwHhcNMTIxMTE0MTMzODMyWhcNMzIx
-MTE0MTMzODMyWjAWMRQwEgYDVQQDEwtpZHAuZW5pbS5mcjCCASIwDQYJKoZIhvcN
-AQEBBQADggEPADCCAQoCggEBAPzw0RQQQxTO08j91FfloACjUJPfi7MnbcVZ5wpX
-v7DSZ1FOxQ+4qK6lBnNjqj2d6Y7q/6hfpU/jywg0WMzzUq+mJ+cLBKwBECJcYHt3
-V+EKb5+iLQ7jFIKn2IKOla/xTnNdhAcPhNfYRZ0b9MW5ZvSqB+Ype9cOiAgaE13i
-QszdnZQCt7iZPaWuRILIqOL9r+bzIjBT3ueQK6Pdofe4+D9bCD+Rw7K9ucj//Xwm
-oJtfFUM79Lwtd4mVs+qleXUEwYSCttBnNWh4mIj9+s46JlN9XE2OLdtLE8E4wRla
-wF6s0mbvZIWJ0UMFdlOSANu6qCEusFa+N+a3k1aLbjD3y60CAwEAAaNdMFswOgYD
-VR0RBDMwMYILaWRwLmVuaW0uZnKGImh0dHBzOi8vaWRwLmVuaW0uZnIvaWRwL3No
-aWJib2xldGgwHQYDVR0OBBYEFOexEULHTKANUZhFIldEyXBwm7EiMA0GCSqGSIb3
-DQEBBQUAA4IBAQCx5cOFFV30wtnqGHbRTkwDqRTkNV5DJlYaFIW9YAVuzokQuAym
-lUUBC1QjNusjF2+iI+iKwp8D18sW9ZONF+Kw4D+uPtIfT4SDms1NQWrw4+Huvy30
-lCGjPWut+kDsKco2xhQdG2DoU9NrnoAFrs5uC3SjWYIhWAKAp57VuXt8RhN4BeBt
-IJgOBe5S+60ftF+69kjdQquJLlbpk9nhZTrhJnjcxppDJhXskc2pE1zplKAl98q6
-1yBtIBFoXawK3loQMMGbW+qWhm4+WWATRl3a25GnYmq4+EgUMocSshp/dwVFB6hl
-P69qvJb0PazcY4DgIwXlIliGgHdjRIiFAYNA
-					    </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://authshib.enim.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://authshib.enim.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://authshib.enim.fr/idp/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">ENIM</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">ENIM</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <EmailAddress>admininfo@enim.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/identites.enim.fr.xml b/swamid-interfederations-2.0/identites.enim.fr.xml
deleted file mode 100644
index 00f44c5e..00000000
--- a/swamid-interfederations-2.0/identites.enim.fr.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://identites.enim.fr/idp/">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2012-12-10T10:41:49Z">
-      <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">enim.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">ENIM</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDFzCCAf+gAwIBAgIUXFUXeBlCuUekINLHfPFZiIPUrsAwDQYJKoZIhvcNAQEF
-BQAwFjEUMBIGA1UEAxMLaWRwLmVuaW0uZnIwHhcNMTIxMTE0MTMzODMyWhcNMzIx
-MTE0MTMzODMyWjAWMRQwEgYDVQQDEwtpZHAuZW5pbS5mcjCCASIwDQYJKoZIhvcN
-AQEBBQADggEPADCCAQoCggEBAPzw0RQQQxTO08j91FfloACjUJPfi7MnbcVZ5wpX
-v7DSZ1FOxQ+4qK6lBnNjqj2d6Y7q/6hfpU/jywg0WMzzUq+mJ+cLBKwBECJcYHt3
-V+EKb5+iLQ7jFIKn2IKOla/xTnNdhAcPhNfYRZ0b9MW5ZvSqB+Ype9cOiAgaE13i
-QszdnZQCt7iZPaWuRILIqOL9r+bzIjBT3ueQK6Pdofe4+D9bCD+Rw7K9ucj//Xwm
-oJtfFUM79Lwtd4mVs+qleXUEwYSCttBnNWh4mIj9+s46JlN9XE2OLdtLE8E4wRla
-wF6s0mbvZIWJ0UMFdlOSANu6qCEusFa+N+a3k1aLbjD3y60CAwEAAaNdMFswOgYD
-VR0RBDMwMYILaWRwLmVuaW0uZnKGImh0dHBzOi8vaWRwLmVuaW0uZnIvaWRwL3No
-aWJib2xldGgwHQYDVR0OBBYEFOexEULHTKANUZhFIldEyXBwm7EiMA0GCSqGSIb3
-DQEBBQUAA4IBAQCx5cOFFV30wtnqGHbRTkwDqRTkNV5DJlYaFIW9YAVuzokQuAym
-lUUBC1QjNusjF2+iI+iKwp8D18sW9ZONF+Kw4D+uPtIfT4SDms1NQWrw4+Huvy30
-lCGjPWut+kDsKco2xhQdG2DoU9NrnoAFrs5uC3SjWYIhWAKAp57VuXt8RhN4BeBt
-IJgOBe5S+60ftF+69kjdQquJLlbpk9nhZTrhJnjcxppDJhXskc2pE1zplKAl98q6
-1yBtIBFoXawK3loQMMGbW+qWhm4+WWATRl3a25GnYmq4+EgUMocSshp/dwVFB6hl
-P69qvJb0PazcY4DgIwXlIliGgHdjRIiFAYNA
-					    </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://authshib.enim.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://authshib.enim.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://authshib.enim.fr/idp/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">ENIM</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">ENIM</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <EmailAddress>admininfo@enim.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/identites.ensea.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/identites.ensea.fr-idp-shibboleth.xml
deleted file mode 100644
index eb5e80cc..00000000
--- a/swamid-interfederations-2.0/identites.ensea.fr-idp-shibboleth.xml
+++ /dev/null
@@ -1,165 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://identites.ensea.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2011-05-11T08:50:03Z">
-      <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">ensea.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">ENSEA</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIEcTCCA1mgAwIBAgIQUg9Ih5mPMJpavDCAsMuZqTANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTE0MDQxNTAwMDAwMFoXDTE3MDQxNDIzNTk1OVowQDEhMB8GA1UE
-CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRswGQYDVQQDExJpZGVudGl0ZXMu
-ZW5zZWEuZnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDQWllKmvIV
-9KtnhWX8cmcTAmcq5cxrkRCWzZZJXSyvqZ1Glf5jvvErdyXPBhI1bJ7+wP0AkOVk
-I/WznWeap7PcnDjeDspzDP9FDoEJOAkw8LGsAtuJI64TGfnTBSvjAcxAexubp3zW
-0FjrqL+6oQxkL4GcZ6eaQF1uvFl7CPO7D3lWcFBgg2PRUl0Ig6ZUK0/PBgdjNRbi
-vxhRyQRloYJp3AGhSNn+STyNSAB071vUZG8ChVs2lNZY1insE46cYdVo1YqSgjL5
-t6zdNJaJRHs7aTWq4S7Z700sKJ7W42mlUpF9SCjGUU8gS3xoHlI+9o5vnRmsO3fa
-+j0FPaw+9QZbAgMBAAGjggFvMIIBazAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3
-V0fqkOO57TAdBgNVHQ4EFgQUrahgQ8RDG2G7cIicKcbpWSxYc5MwDgYDVR0PAQH/
-BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUF
-BwMCMCIGA1UdIAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQIBMDoGA1UdHwQz
-MDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0Eu
-Y3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50Y3Mu
-dGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9v
-Y3NwLnRjcy50ZXJlbmEub3JnMB0GA1UdEQQWMBSCEmlkZW50aXRlcy5lbnNlYS5m
-cjANBgkqhkiG9w0BAQUFAAOCAQEAnQAOMurBNe5YOWk6SekHmnTsHcGz0h2aLp36
-IIorkCb3f78T6/oPRvlFWvTIOjVNbxXzFKJrJA4fu7dDRx/6ckPGjVJwXHRb7rOv
-gc9hEfb3v4bMhxWOX7WyvNEyewKe84vrobDxHqpXpL7KU5LAJNPYglZr62yiJI9z
-wKvG/2aZDxc5DdjeTq32zVxO9KE8QDfMA14cHTimjnOhSV8MNIp5uLHv8827pLeT
-SP1F5eWtaNyrocG8x1mL3qMePnZl92Fuj0F4FhHkAnhWCxWjCou9sQa8KeBcCO9W
-QK1LMEX5HeO8HKnIkLfCYBO3LiMoZmq45EvpF/kWQqI9WQacXQ==
-					    </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>
-					      MIIEcTCCA1mgAwIBAgIQG4CD0xtQn3PW9uGm5cYkdzANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTE0MDEyNDAwMDAwMFoXDTE3MDMwODIzNTk1OVowQDEhMB8GA1UE
-CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRswGQYDVQQDExJpZGVudGl0ZXMu
-ZW5zZWEuZnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDF0Ed4XZzY
-rYz4dsdiRwqrHk+MC33vn/BJf+JkwnSBPtfVsOUcFH3BGJ0B051QpD2oCPOIiz2V
-9rzP6E9PFP3MGuuwKtnGZnDBBSMYEp+yKewjehfV07qgoO/VLZtAA3dxjbxQrmal
-C13sqrKaafTJdHtyjhZNUpDzc8Ig5pgEj/rLymcJVgp3mjEAkm3J8fP/upEYdx4e
-EQD2XgIBuBGZThSuJOTOUXtf1qF9JhDswlHst28jHzp31MDybWdZ1xTyUVo3pYwW
-UPStS9HdvfNoz/fR5+Pmdfu+rpXTZ7jjgnMkQy84qHtbH4u/d3vFjKPCx0DZ7UFA
-SHaH/Ue3OQZtAgMBAAGjggFvMIIBazAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3
-V0fqkOO57TAdBgNVHQ4EFgQUhUrcsTUfWA/zwCZFVUrW0BpWBCIwDgYDVR0PAQH/
-BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUF
-BwMCMCIGA1UdIAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQIBMDoGA1UdHwQz
-MDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0Eu
-Y3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50Y3Mu
-dGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9v
-Y3NwLnRjcy50ZXJlbmEub3JnMB0GA1UdEQQWMBSCEmlkZW50aXRlcy5lbnNlYS5m
-cjANBgkqhkiG9w0BAQUFAAOCAQEAgym0ss96sn/udEY0m2qHQ5VNt3gfc1oAlX8w
-o44C1pPjZRbvySLWF+qc7VQP6HrbuiEjA47o1tZoqkh01FntuQfM+9V3naFa74Wl
-KOAbEiTSJsOTZLbmr1j0lovOlxJ4UddRVWMjCIfbgsUw+ZtoRvUqnO16pcZXrLCa
-HMl1RBtfEkwVl+vESzYk/sSOQ+CXJoi6spKXV0tpBS8Lf/I9IRjayHALjWwklb8l
-fbatPd5QbO8MzMD3Oak05pvHRKvtI7ZWxsbQIg/40sT4KmWDxmkLIDLY/2E8hUDN
-aWAcMmjEoKVXB6St7+El4x83Ul04VV3UNYrTOdDO64mVnp8j2A==
-					    </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://identites.ensea.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://identites.ensea.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://identites.ensea.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">ensea.fr</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIEcTCCA1mgAwIBAgIQUg9Ih5mPMJpavDCAsMuZqTANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTE0MDQxNTAwMDAwMFoXDTE3MDQxNDIzNTk1OVowQDEhMB8GA1UE
-CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRswGQYDVQQDExJpZGVudGl0ZXMu
-ZW5zZWEuZnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDQWllKmvIV
-9KtnhWX8cmcTAmcq5cxrkRCWzZZJXSyvqZ1Glf5jvvErdyXPBhI1bJ7+wP0AkOVk
-I/WznWeap7PcnDjeDspzDP9FDoEJOAkw8LGsAtuJI64TGfnTBSvjAcxAexubp3zW
-0FjrqL+6oQxkL4GcZ6eaQF1uvFl7CPO7D3lWcFBgg2PRUl0Ig6ZUK0/PBgdjNRbi
-vxhRyQRloYJp3AGhSNn+STyNSAB071vUZG8ChVs2lNZY1insE46cYdVo1YqSgjL5
-t6zdNJaJRHs7aTWq4S7Z700sKJ7W42mlUpF9SCjGUU8gS3xoHlI+9o5vnRmsO3fa
-+j0FPaw+9QZbAgMBAAGjggFvMIIBazAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3
-V0fqkOO57TAdBgNVHQ4EFgQUrahgQ8RDG2G7cIicKcbpWSxYc5MwDgYDVR0PAQH/
-BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUF
-BwMCMCIGA1UdIAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQIBMDoGA1UdHwQz
-MDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0Eu
-Y3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50Y3Mu
-dGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9v
-Y3NwLnRjcy50ZXJlbmEub3JnMB0GA1UdEQQWMBSCEmlkZW50aXRlcy5lbnNlYS5m
-cjANBgkqhkiG9w0BAQUFAAOCAQEAnQAOMurBNe5YOWk6SekHmnTsHcGz0h2aLp36
-IIorkCb3f78T6/oPRvlFWvTIOjVNbxXzFKJrJA4fu7dDRx/6ckPGjVJwXHRb7rOv
-gc9hEfb3v4bMhxWOX7WyvNEyewKe84vrobDxHqpXpL7KU5LAJNPYglZr62yiJI9z
-wKvG/2aZDxc5DdjeTq32zVxO9KE8QDfMA14cHTimjnOhSV8MNIp5uLHv8827pLeT
-SP1F5eWtaNyrocG8x1mL3qMePnZl92Fuj0F4FhHkAnhWCxWjCou9sQa8KeBcCO9W
-QK1LMEX5HeO8HKnIkLfCYBO3LiMoZmq45EvpF/kWQqI9WQacXQ==
-					    </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>
-					      MIIEcTCCA1mgAwIBAgIQG4CD0xtQn3PW9uGm5cYkdzANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTE0MDEyNDAwMDAwMFoXDTE3MDMwODIzNTk1OVowQDEhMB8GA1UE
-CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRswGQYDVQQDExJpZGVudGl0ZXMu
-ZW5zZWEuZnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDF0Ed4XZzY
-rYz4dsdiRwqrHk+MC33vn/BJf+JkwnSBPtfVsOUcFH3BGJ0B051QpD2oCPOIiz2V
-9rzP6E9PFP3MGuuwKtnGZnDBBSMYEp+yKewjehfV07qgoO/VLZtAA3dxjbxQrmal
-C13sqrKaafTJdHtyjhZNUpDzc8Ig5pgEj/rLymcJVgp3mjEAkm3J8fP/upEYdx4e
-EQD2XgIBuBGZThSuJOTOUXtf1qF9JhDswlHst28jHzp31MDybWdZ1xTyUVo3pYwW
-UPStS9HdvfNoz/fR5+Pmdfu+rpXTZ7jjgnMkQy84qHtbH4u/d3vFjKPCx0DZ7UFA
-SHaH/Ue3OQZtAgMBAAGjggFvMIIBazAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3
-V0fqkOO57TAdBgNVHQ4EFgQUhUrcsTUfWA/zwCZFVUrW0BpWBCIwDgYDVR0PAQH/
-BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUF
-BwMCMCIGA1UdIAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQIBMDoGA1UdHwQz
-MDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0Eu
-Y3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50Y3Mu
-dGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9v
-Y3NwLnRjcy50ZXJlbmEub3JnMB0GA1UdEQQWMBSCEmlkZW50aXRlcy5lbnNlYS5m
-cjANBgkqhkiG9w0BAQUFAAOCAQEAgym0ss96sn/udEY0m2qHQ5VNt3gfc1oAlX8w
-o44C1pPjZRbvySLWF+qc7VQP6HrbuiEjA47o1tZoqkh01FntuQfM+9V3naFa74Wl
-KOAbEiTSJsOTZLbmr1j0lovOlxJ4UddRVWMjCIfbgsUw+ZtoRvUqnO16pcZXrLCa
-HMl1RBtfEkwVl+vESzYk/sSOQ+CXJoi6spKXV0tpBS8Lf/I9IRjayHALjWwklb8l
-fbatPd5QbO8MzMD3Oak05pvHRKvtI7ZWxsbQIg/40sT4KmWDxmkLIDLY/2E8hUDN
-aWAcMmjEoKVXB6St7+El4x83Ul04VV3UNYrTOdDO64mVnp8j2A==
-					    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://identites.ensea.fr/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">ENSEA</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">ENSEA</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <EmailAddress>federation@ensea.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/identites.ensea.fr.xml b/swamid-interfederations-2.0/identites.ensea.fr.xml
deleted file mode 100644
index eb5e80cc..00000000
--- a/swamid-interfederations-2.0/identites.ensea.fr.xml
+++ /dev/null
@@ -1,165 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://identites.ensea.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2011-05-11T08:50:03Z">
-      <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">ensea.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">ENSEA</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIEcTCCA1mgAwIBAgIQUg9Ih5mPMJpavDCAsMuZqTANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTE0MDQxNTAwMDAwMFoXDTE3MDQxNDIzNTk1OVowQDEhMB8GA1UE
-CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRswGQYDVQQDExJpZGVudGl0ZXMu
-ZW5zZWEuZnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDQWllKmvIV
-9KtnhWX8cmcTAmcq5cxrkRCWzZZJXSyvqZ1Glf5jvvErdyXPBhI1bJ7+wP0AkOVk
-I/WznWeap7PcnDjeDspzDP9FDoEJOAkw8LGsAtuJI64TGfnTBSvjAcxAexubp3zW
-0FjrqL+6oQxkL4GcZ6eaQF1uvFl7CPO7D3lWcFBgg2PRUl0Ig6ZUK0/PBgdjNRbi
-vxhRyQRloYJp3AGhSNn+STyNSAB071vUZG8ChVs2lNZY1insE46cYdVo1YqSgjL5
-t6zdNJaJRHs7aTWq4S7Z700sKJ7W42mlUpF9SCjGUU8gS3xoHlI+9o5vnRmsO3fa
-+j0FPaw+9QZbAgMBAAGjggFvMIIBazAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3
-V0fqkOO57TAdBgNVHQ4EFgQUrahgQ8RDG2G7cIicKcbpWSxYc5MwDgYDVR0PAQH/
-BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUF
-BwMCMCIGA1UdIAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQIBMDoGA1UdHwQz
-MDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0Eu
-Y3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50Y3Mu
-dGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9v
-Y3NwLnRjcy50ZXJlbmEub3JnMB0GA1UdEQQWMBSCEmlkZW50aXRlcy5lbnNlYS5m
-cjANBgkqhkiG9w0BAQUFAAOCAQEAnQAOMurBNe5YOWk6SekHmnTsHcGz0h2aLp36
-IIorkCb3f78T6/oPRvlFWvTIOjVNbxXzFKJrJA4fu7dDRx/6ckPGjVJwXHRb7rOv
-gc9hEfb3v4bMhxWOX7WyvNEyewKe84vrobDxHqpXpL7KU5LAJNPYglZr62yiJI9z
-wKvG/2aZDxc5DdjeTq32zVxO9KE8QDfMA14cHTimjnOhSV8MNIp5uLHv8827pLeT
-SP1F5eWtaNyrocG8x1mL3qMePnZl92Fuj0F4FhHkAnhWCxWjCou9sQa8KeBcCO9W
-QK1LMEX5HeO8HKnIkLfCYBO3LiMoZmq45EvpF/kWQqI9WQacXQ==
-					    </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>
-					      MIIEcTCCA1mgAwIBAgIQG4CD0xtQn3PW9uGm5cYkdzANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTE0MDEyNDAwMDAwMFoXDTE3MDMwODIzNTk1OVowQDEhMB8GA1UE
-CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRswGQYDVQQDExJpZGVudGl0ZXMu
-ZW5zZWEuZnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDF0Ed4XZzY
-rYz4dsdiRwqrHk+MC33vn/BJf+JkwnSBPtfVsOUcFH3BGJ0B051QpD2oCPOIiz2V
-9rzP6E9PFP3MGuuwKtnGZnDBBSMYEp+yKewjehfV07qgoO/VLZtAA3dxjbxQrmal
-C13sqrKaafTJdHtyjhZNUpDzc8Ig5pgEj/rLymcJVgp3mjEAkm3J8fP/upEYdx4e
-EQD2XgIBuBGZThSuJOTOUXtf1qF9JhDswlHst28jHzp31MDybWdZ1xTyUVo3pYwW
-UPStS9HdvfNoz/fR5+Pmdfu+rpXTZ7jjgnMkQy84qHtbH4u/d3vFjKPCx0DZ7UFA
-SHaH/Ue3OQZtAgMBAAGjggFvMIIBazAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3
-V0fqkOO57TAdBgNVHQ4EFgQUhUrcsTUfWA/zwCZFVUrW0BpWBCIwDgYDVR0PAQH/
-BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUF
-BwMCMCIGA1UdIAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQIBMDoGA1UdHwQz
-MDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0Eu
-Y3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50Y3Mu
-dGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9v
-Y3NwLnRjcy50ZXJlbmEub3JnMB0GA1UdEQQWMBSCEmlkZW50aXRlcy5lbnNlYS5m
-cjANBgkqhkiG9w0BAQUFAAOCAQEAgym0ss96sn/udEY0m2qHQ5VNt3gfc1oAlX8w
-o44C1pPjZRbvySLWF+qc7VQP6HrbuiEjA47o1tZoqkh01FntuQfM+9V3naFa74Wl
-KOAbEiTSJsOTZLbmr1j0lovOlxJ4UddRVWMjCIfbgsUw+ZtoRvUqnO16pcZXrLCa
-HMl1RBtfEkwVl+vESzYk/sSOQ+CXJoi6spKXV0tpBS8Lf/I9IRjayHALjWwklb8l
-fbatPd5QbO8MzMD3Oak05pvHRKvtI7ZWxsbQIg/40sT4KmWDxmkLIDLY/2E8hUDN
-aWAcMmjEoKVXB6St7+El4x83Ul04VV3UNYrTOdDO64mVnp8j2A==
-					    </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://identites.ensea.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://identites.ensea.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://identites.ensea.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">ensea.fr</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIEcTCCA1mgAwIBAgIQUg9Ih5mPMJpavDCAsMuZqTANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTE0MDQxNTAwMDAwMFoXDTE3MDQxNDIzNTk1OVowQDEhMB8GA1UE
-CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRswGQYDVQQDExJpZGVudGl0ZXMu
-ZW5zZWEuZnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDQWllKmvIV
-9KtnhWX8cmcTAmcq5cxrkRCWzZZJXSyvqZ1Glf5jvvErdyXPBhI1bJ7+wP0AkOVk
-I/WznWeap7PcnDjeDspzDP9FDoEJOAkw8LGsAtuJI64TGfnTBSvjAcxAexubp3zW
-0FjrqL+6oQxkL4GcZ6eaQF1uvFl7CPO7D3lWcFBgg2PRUl0Ig6ZUK0/PBgdjNRbi
-vxhRyQRloYJp3AGhSNn+STyNSAB071vUZG8ChVs2lNZY1insE46cYdVo1YqSgjL5
-t6zdNJaJRHs7aTWq4S7Z700sKJ7W42mlUpF9SCjGUU8gS3xoHlI+9o5vnRmsO3fa
-+j0FPaw+9QZbAgMBAAGjggFvMIIBazAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3
-V0fqkOO57TAdBgNVHQ4EFgQUrahgQ8RDG2G7cIicKcbpWSxYc5MwDgYDVR0PAQH/
-BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUF
-BwMCMCIGA1UdIAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQIBMDoGA1UdHwQz
-MDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0Eu
-Y3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50Y3Mu
-dGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9v
-Y3NwLnRjcy50ZXJlbmEub3JnMB0GA1UdEQQWMBSCEmlkZW50aXRlcy5lbnNlYS5m
-cjANBgkqhkiG9w0BAQUFAAOCAQEAnQAOMurBNe5YOWk6SekHmnTsHcGz0h2aLp36
-IIorkCb3f78T6/oPRvlFWvTIOjVNbxXzFKJrJA4fu7dDRx/6ckPGjVJwXHRb7rOv
-gc9hEfb3v4bMhxWOX7WyvNEyewKe84vrobDxHqpXpL7KU5LAJNPYglZr62yiJI9z
-wKvG/2aZDxc5DdjeTq32zVxO9KE8QDfMA14cHTimjnOhSV8MNIp5uLHv8827pLeT
-SP1F5eWtaNyrocG8x1mL3qMePnZl92Fuj0F4FhHkAnhWCxWjCou9sQa8KeBcCO9W
-QK1LMEX5HeO8HKnIkLfCYBO3LiMoZmq45EvpF/kWQqI9WQacXQ==
-					    </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>
-					      MIIEcTCCA1mgAwIBAgIQG4CD0xtQn3PW9uGm5cYkdzANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTE0MDEyNDAwMDAwMFoXDTE3MDMwODIzNTk1OVowQDEhMB8GA1UE
-CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRswGQYDVQQDExJpZGVudGl0ZXMu
-ZW5zZWEuZnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDF0Ed4XZzY
-rYz4dsdiRwqrHk+MC33vn/BJf+JkwnSBPtfVsOUcFH3BGJ0B051QpD2oCPOIiz2V
-9rzP6E9PFP3MGuuwKtnGZnDBBSMYEp+yKewjehfV07qgoO/VLZtAA3dxjbxQrmal
-C13sqrKaafTJdHtyjhZNUpDzc8Ig5pgEj/rLymcJVgp3mjEAkm3J8fP/upEYdx4e
-EQD2XgIBuBGZThSuJOTOUXtf1qF9JhDswlHst28jHzp31MDybWdZ1xTyUVo3pYwW
-UPStS9HdvfNoz/fR5+Pmdfu+rpXTZ7jjgnMkQy84qHtbH4u/d3vFjKPCx0DZ7UFA
-SHaH/Ue3OQZtAgMBAAGjggFvMIIBazAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3
-V0fqkOO57TAdBgNVHQ4EFgQUhUrcsTUfWA/zwCZFVUrW0BpWBCIwDgYDVR0PAQH/
-BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUF
-BwMCMCIGA1UdIAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQIBMDoGA1UdHwQz
-MDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0Eu
-Y3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50Y3Mu
-dGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9v
-Y3NwLnRjcy50ZXJlbmEub3JnMB0GA1UdEQQWMBSCEmlkZW50aXRlcy5lbnNlYS5m
-cjANBgkqhkiG9w0BAQUFAAOCAQEAgym0ss96sn/udEY0m2qHQ5VNt3gfc1oAlX8w
-o44C1pPjZRbvySLWF+qc7VQP6HrbuiEjA47o1tZoqkh01FntuQfM+9V3naFa74Wl
-KOAbEiTSJsOTZLbmr1j0lovOlxJ4UddRVWMjCIfbgsUw+ZtoRvUqnO16pcZXrLCa
-HMl1RBtfEkwVl+vESzYk/sSOQ+CXJoi6spKXV0tpBS8Lf/I9IRjayHALjWwklb8l
-fbatPd5QbO8MzMD3Oak05pvHRKvtI7ZWxsbQIg/40sT4KmWDxmkLIDLY/2E8hUDN
-aWAcMmjEoKVXB6St7+El4x83Ul04VV3UNYrTOdDO64mVnp8j2A==
-					    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://identites.ensea.fr/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">ENSEA</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">ENSEA</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <EmailAddress>federation@ensea.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/identities.univ-jfc.fr-idp-prod.xml b/swamid-interfederations-2.0/identities.univ-jfc.fr-idp-prod.xml
deleted file mode 100644
index 98ba24c2..00000000
--- a/swamid-interfederations-2.0/identities.univ-jfc.fr-idp-prod.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://identities.univ-jfc.fr/idp/prod">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2011-02-10T15:01:12Z">
-      <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">univ-jfc.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">CUFR Jean-François Champollion</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIEmjCCA4KgAwIBAgIRAJUDuJkaRvWHyWeev34/8hgwDQYJKoZIhvcNAQEFBQAw
-NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-IFNTTCBDQTAeFw0xMTExMjkwMDAwMDBaFw0xNDExMjgyMzU5NTlaMHIxCzAJBgNV
-BAYTAkZSMUYwRAYDVQQKEz1DRU5UUkUgVU5JVkVSU0lUQUlSRSBERSBGT1JNQVRJ
-T04gRVQgUkVDSEVSQ0hFIEpGIENIQU1QT0xMSU9OMRswGQYDVQQDExJjYWJyZWwu
-dW5pdi1qZmMuZnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC3d+Rm
-UDXoUgVRpi6/M8k3JLM+icOPc+m2rVaVzaJ1r1YUtOI9IbQx5WWAJBQiaaOqbZl1
-9dQNaPBgirUCYs6fzEmiN+68Ea+Hl+V9na60PrCtE7f/iNREMsPdr0hyxkxbO5Rq
-XEvTcS4iBFW03z5iaAyPCVRckVFMLQ2wKo6AchS9kAMrkMDVnpe4fbp/viRytHZ0
-8JAzN9xh/XGdIQomMk7XCPBxmvRjaKhTuCaHfhnpQ2WVpxDL4bh+pR6FNm7cyM5q
-RyivGSxzfZzL1UhDyM2mp1JsJPpbMMNIIR73BurbBProSyNbNg0L3W7Y5SqmoziN
-cLxkrPjM/ALj6+o5AgMBAAGjggFlMIIBYTAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJ
-ays3V0fqkOO57TAdBgNVHQ4EFgQUPwIsj+FMgUkCQS2yepLOs8XFoTIwDgYDVR0P
-AQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsG
-AQUFBwMCMBgGA1UdIAQRMA8wDQYLKwYBBAGyMQECAh0wOgYDVR0fBDMwMTAvoC2g
-K4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcmwwbQYI
-KwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRjcy50ZXJlbmEu
-b3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDovL29jc3AudGNz
-LnRlcmVuYS5vcmcwHQYDVR0RBBYwFIISY2FicmVsLnVuaXYtamZjLmZyMA0GCSqG
-SIb3DQEBBQUAA4IBAQBELDfgRtQGFFnCqUo2VOmdlMXrb+9jTvBcv3Uf5cyv9JDk
-lC5y4qKcUpdofmaBvTJ89CX+vRVwmwdSnCs0SmY7MgopBQKSelC6ioPSdo9NpVLG
-8SlCQ0p/bynWt0jAdav2bvOVGtHSkC0xw4Pa+KNkhQxIr+Q4lFEL+lR8glB0MjpI
-NL+Wg4nuXkz1Uk/2f7r0BvSfkVisZMPlTTEpeuAtrosSd6B2RiCR0qiCPQ0SoaqS
-+jyx9pIRcGIlOqogM0g4sPTu7HMo0YnTQMOBEnbsW28spqIS2YwFqhy1g5Ym0f9s
-hCYLgINEWub/bwGC6PX0gJc70qPAaHGV7JYa/Dgd
-					    </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>
-					      MIIEMDCCAxigAwIBAgILAQAAAAABHeOs+yswDQYJKoZIhvcNAQEFBQAwXzELMAkG
-A1UEBhMCQkUxEzARBgNVBAoTCkN5YmVydHJ1c3QxFzAVBgNVBAsTDkVkdWNhdGlv
-bmFsIENBMSIwIAYDVQQDExlDeWJlcnRydXN0IEVkdWNhdGlvbmFsIENBMB4XDTA4
-MTEyODE1MTgzNFoXDTExMTEyODE1MTgzNFowXTELMAkGA1UEBhMCRlIxMTAvBgNV
-BAoTKEN0cmUgVW5pdiBGb3JtYXQgUmVjaGVyIE5lIEV0IE1pZGkgUHlyZW4xGzAZ
-BgNVBAMTEmNhYnJlbC51bml2LWpmYy5mcjCBnzANBgkqhkiG9w0BAQEFAAOBjQAw
-gYkCgYEA87h0etFcI4Olt2Ovzc2Afti/x6J6J1w8epq0NO61Rz7f+W4XsJoPIfZI
-2MGPNHSLtk03kOWc1PUIssj240hmDAWSQVY4a3dnUHzYYwO56gXI4VCaP7oIyJpr
-9hLWhsxsI3zfWcfZTyP1ZT/5aSpGz9/Wyb0PFEPfuoSH1ESZlJUCAwEAAaOCAXEw
-ggFtMFAGA1UdIARJMEcwRQYHKoZIsT4BADA6MDgGCCsGAQUFBwIBFixodHRwOi8v
-d3d3Lmdsb2JhbHNpZ24ubmV0L3JlcG9zaXRvcnkvY3BzLmNmbTAOBgNVHQ8BAf8E
-BAMCBaAwHwYDVR0jBBgwFoAUZWWjPdc7EaMKByU3yUJKW3Z3UOEwHQYDVR0OBBYE
-FI2DDb9K3Z9Sl1OzZJ8byFHO3XoRMDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9j
-cmwuZ2xvYmFsc2lnbi5uZXQvZWR1Y2F0aW9uYWwuY3JsME8GCCsGAQUFBwEBBEMw
-QTA/BggrBgEFBQcwAoYzaHR0cDovL3NlY3VyZS5nbG9iYWxzaWduLm5ldC9jYWNl
-cnQvZWR1Y2F0aW9uYWwuY3J0MB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcD
-AjAdBgNVHREEFjAUghJjYWJyZWwudW5pdi1qZmMuZnIwDQYJKoZIhvcNAQEFBQAD
-ggEBAHAcNQtULq9RLCTn+/g5jl5ENRxVj+3JI4hMDJMPZJmMsebpv896lTApD7ei
-jIFKrnew7hdl2lpDRMxKkQS3Ygxa7/HhuOcGBVoFIKyN35Clix3tWhP7P7GxC/JY
-6fwLQ9mB8hPhJ5uXHA8he5G2/xsInvW9wRtqq6Sfcz9CHLfYNEUXHq2/LbnBreWA
-d8v+cbFAWQvaPSss4LZXujMiDo2QCexGuaBGumJ5mXKKOrOzb0GAMPYBStAoR4zX
-rk3h9JOD0El42/6Z7mwlrGIoUZLC7ZetJegQrcfMUwf2VQp086NFzxhX6oDS3Lod
-OCtecuSNWAaLANEqmwX3BZkVcmQ=
-					    </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://cabrel.univ-jfc.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://cabrel.univ-jfc.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://cabrel.univ-jfc.fr/idp/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">CUFR Jean-François Champollion</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">CUFR Jean-François Champollion</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>J.-M. Kubek</SurName>
-    <EmailAddress>jean-marie.kubek@univ-jfc.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/identities.univ-jfc.fr.xml b/swamid-interfederations-2.0/identities.univ-jfc.fr.xml
deleted file mode 100644
index 98ba24c2..00000000
--- a/swamid-interfederations-2.0/identities.univ-jfc.fr.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://identities.univ-jfc.fr/idp/prod">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2011-02-10T15:01:12Z">
-      <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">univ-jfc.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">CUFR Jean-François Champollion</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIEmjCCA4KgAwIBAgIRAJUDuJkaRvWHyWeev34/8hgwDQYJKoZIhvcNAQEFBQAw
-NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-IFNTTCBDQTAeFw0xMTExMjkwMDAwMDBaFw0xNDExMjgyMzU5NTlaMHIxCzAJBgNV
-BAYTAkZSMUYwRAYDVQQKEz1DRU5UUkUgVU5JVkVSU0lUQUlSRSBERSBGT1JNQVRJ
-T04gRVQgUkVDSEVSQ0hFIEpGIENIQU1QT0xMSU9OMRswGQYDVQQDExJjYWJyZWwu
-dW5pdi1qZmMuZnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC3d+Rm
-UDXoUgVRpi6/M8k3JLM+icOPc+m2rVaVzaJ1r1YUtOI9IbQx5WWAJBQiaaOqbZl1
-9dQNaPBgirUCYs6fzEmiN+68Ea+Hl+V9na60PrCtE7f/iNREMsPdr0hyxkxbO5Rq
-XEvTcS4iBFW03z5iaAyPCVRckVFMLQ2wKo6AchS9kAMrkMDVnpe4fbp/viRytHZ0
-8JAzN9xh/XGdIQomMk7XCPBxmvRjaKhTuCaHfhnpQ2WVpxDL4bh+pR6FNm7cyM5q
-RyivGSxzfZzL1UhDyM2mp1JsJPpbMMNIIR73BurbBProSyNbNg0L3W7Y5SqmoziN
-cLxkrPjM/ALj6+o5AgMBAAGjggFlMIIBYTAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJ
-ays3V0fqkOO57TAdBgNVHQ4EFgQUPwIsj+FMgUkCQS2yepLOs8XFoTIwDgYDVR0P
-AQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsG
-AQUFBwMCMBgGA1UdIAQRMA8wDQYLKwYBBAGyMQECAh0wOgYDVR0fBDMwMTAvoC2g
-K4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcmwwbQYI
-KwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRjcy50ZXJlbmEu
-b3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDovL29jc3AudGNz
-LnRlcmVuYS5vcmcwHQYDVR0RBBYwFIISY2FicmVsLnVuaXYtamZjLmZyMA0GCSqG
-SIb3DQEBBQUAA4IBAQBELDfgRtQGFFnCqUo2VOmdlMXrb+9jTvBcv3Uf5cyv9JDk
-lC5y4qKcUpdofmaBvTJ89CX+vRVwmwdSnCs0SmY7MgopBQKSelC6ioPSdo9NpVLG
-8SlCQ0p/bynWt0jAdav2bvOVGtHSkC0xw4Pa+KNkhQxIr+Q4lFEL+lR8glB0MjpI
-NL+Wg4nuXkz1Uk/2f7r0BvSfkVisZMPlTTEpeuAtrosSd6B2RiCR0qiCPQ0SoaqS
-+jyx9pIRcGIlOqogM0g4sPTu7HMo0YnTQMOBEnbsW28spqIS2YwFqhy1g5Ym0f9s
-hCYLgINEWub/bwGC6PX0gJc70qPAaHGV7JYa/Dgd
-					    </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>
-					      MIIEMDCCAxigAwIBAgILAQAAAAABHeOs+yswDQYJKoZIhvcNAQEFBQAwXzELMAkG
-A1UEBhMCQkUxEzARBgNVBAoTCkN5YmVydHJ1c3QxFzAVBgNVBAsTDkVkdWNhdGlv
-bmFsIENBMSIwIAYDVQQDExlDeWJlcnRydXN0IEVkdWNhdGlvbmFsIENBMB4XDTA4
-MTEyODE1MTgzNFoXDTExMTEyODE1MTgzNFowXTELMAkGA1UEBhMCRlIxMTAvBgNV
-BAoTKEN0cmUgVW5pdiBGb3JtYXQgUmVjaGVyIE5lIEV0IE1pZGkgUHlyZW4xGzAZ
-BgNVBAMTEmNhYnJlbC51bml2LWpmYy5mcjCBnzANBgkqhkiG9w0BAQEFAAOBjQAw
-gYkCgYEA87h0etFcI4Olt2Ovzc2Afti/x6J6J1w8epq0NO61Rz7f+W4XsJoPIfZI
-2MGPNHSLtk03kOWc1PUIssj240hmDAWSQVY4a3dnUHzYYwO56gXI4VCaP7oIyJpr
-9hLWhsxsI3zfWcfZTyP1ZT/5aSpGz9/Wyb0PFEPfuoSH1ESZlJUCAwEAAaOCAXEw
-ggFtMFAGA1UdIARJMEcwRQYHKoZIsT4BADA6MDgGCCsGAQUFBwIBFixodHRwOi8v
-d3d3Lmdsb2JhbHNpZ24ubmV0L3JlcG9zaXRvcnkvY3BzLmNmbTAOBgNVHQ8BAf8E
-BAMCBaAwHwYDVR0jBBgwFoAUZWWjPdc7EaMKByU3yUJKW3Z3UOEwHQYDVR0OBBYE
-FI2DDb9K3Z9Sl1OzZJ8byFHO3XoRMDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9j
-cmwuZ2xvYmFsc2lnbi5uZXQvZWR1Y2F0aW9uYWwuY3JsME8GCCsGAQUFBwEBBEMw
-QTA/BggrBgEFBQcwAoYzaHR0cDovL3NlY3VyZS5nbG9iYWxzaWduLm5ldC9jYWNl
-cnQvZWR1Y2F0aW9uYWwuY3J0MB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcD
-AjAdBgNVHREEFjAUghJjYWJyZWwudW5pdi1qZmMuZnIwDQYJKoZIhvcNAQEFBQAD
-ggEBAHAcNQtULq9RLCTn+/g5jl5ENRxVj+3JI4hMDJMPZJmMsebpv896lTApD7ei
-jIFKrnew7hdl2lpDRMxKkQS3Ygxa7/HhuOcGBVoFIKyN35Clix3tWhP7P7GxC/JY
-6fwLQ9mB8hPhJ5uXHA8he5G2/xsInvW9wRtqq6Sfcz9CHLfYNEUXHq2/LbnBreWA
-d8v+cbFAWQvaPSss4LZXujMiDo2QCexGuaBGumJ5mXKKOrOzb0GAMPYBStAoR4zX
-rk3h9JOD0El42/6Z7mwlrGIoUZLC7ZetJegQrcfMUwf2VQp086NFzxhX6oDS3Lod
-OCtecuSNWAaLANEqmwX3BZkVcmQ=
-					    </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://cabrel.univ-jfc.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://cabrel.univ-jfc.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://cabrel.univ-jfc.fr/idp/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">CUFR Jean-François Champollion</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">CUFR Jean-François Champollion</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>J.-M. Kubek</SurName>
-    <EmailAddress>jean-marie.kubek@univ-jfc.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/identity.mdh.se-idp-shibboleth.xml b/swamid-interfederations-2.0/identity.mdh.se-idp-shibboleth.xml
deleted file mode 100644
index 85b949d5..00000000
--- a/swamid-interfederations-2.0/identity.mdh.se-idp-shibboleth.xml
+++ /dev/null
@@ -1,106 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://identity.mdh.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">mdh.se</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="sv">Mälardalens Högskola</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Mälardalen University</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Identity Provider för anställda och studenter vid Mälardalens högskola.</mdui:Description>
-        <mdui:Description xml:lang="en">The Mälardalen University Identity Provider is used by employees and students at the university.</mdui:Description>
-        <mdui:Logo height="216" width="117">https://identity.mdh.se/img/logo-sv.png</mdui:Logo>
-        <mdui:Keywords xml:lang="sv">mdh vasteras eskilstuna malardalen malardalen+university malardalens+hogskola mälardalens+högskola</mdui:Keywords>
-        <mdui:Keywords xml:lang="en">mdh vasteras eskilstuna malardalen malardalen+university malardalens+hogskola mälardalens+högskola</mdui:Keywords>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DomainHint>mdh.se</mdui:DomainHint>
-        <mdui:GeolocationHint>geo:59.6186,16.5407</mdui:GeolocationHint>
-        <mdui:GeolocationHint>geo:59.3716,16.5085</mdui:GeolocationHint>
-      </mdui:DiscoHints>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDKDCCAhCgAwIBAgIVAIPxTFqNFghYnsNGOQDHDvRnU53tMA0GCSqGSIb3DQEB
-BQUAMBoxGDAWBgNVBAMTD2lkZW50aXR5Lm1kaC5zZTAeFw0wOTA5MDIxMzE5MDRa
-Fw0yOTA5MDIxMzE5MDRaMBoxGDAWBgNVBAMTD2lkZW50aXR5Lm1kaC5zZTCCASIw
-DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALBpGX8JJ+RvjMMMD3q/j01q58p8
-z0R9tuklMD5smW+Tz0JgiG3KDnynWvcYyg3s9DevNRUMmsQqzDBko771ecyhqkHy
-SoCkfVNJ9k7RaQmoaglSGZlR5N9lgcysHNA8qVqJYpUpsSFuQckr1dzS3RjngcTM
-ICcuBjy/JviV8fKzYzF0v7F9HW+BEuJXHH6lhqhDIuI4R4n7I9/lYYxJWvQZVelJ
-F6/Z+RnbqaSzViq1qcMe5AWcnZgC85i0KiIcnaKiImNRJbVrVUN+eniQSj9ROJyf
-uk7Ldhpg8gvqsaUVd2drDY43XymAu7XFVnBBX340JKgb7F8wxpvIK6Gh6ZMCAwEA
-AaNlMGMwQgYDVR0RBDswOYIPaWRlbnRpdHkubWRoLnNlhiZodHRwczovL2lkZW50
-aXR5Lm1kaC5zZS9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQU/qdjANz6BbQi/0eQ
-PgsaI1I0V4MwDQYJKoZIhvcNAQEFBQADggEBAG3OEKV7S8aojN/D7UOqURiCRrjC
-Dk6wEnMLX6uIYAFCv6jc5QdkMWaaDBR0tgGhmgzRZOGnl9pvzT1AjMIhvMu2/luI
-b2oawOhycFG1rECJCpDi+gLDGhxzbQY/E9VIz+AcBAxglBFbDqqIynhFs+GZn+fv
-P7nZB2+XoE3sf8xqd2a9xO7vy1r17Q7bx8PzwklL9GdFppuRnimioYoF3atEQM6R
-7UwSK+MqY42FI27aHfIMAN7ccEun9HViAHU9HT/tng0kSydoF9VOvTI657LX7vpb
-0hhoH3UMUkrHgTwtNYpylgL6YEy/GtQHimQGN/O6aAQt1ZIyXKnuQufcnNk=
-
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://identity.mdh.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://identity.mdh.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://identity.mdh.se/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://identity.mdh.se/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://identity.mdh.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://identity.mdh.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">mdh.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDKDCCAhCgAwIBAgIVAIPxTFqNFghYnsNGOQDHDvRnU53tMA0GCSqGSIb3DQEB
-BQUAMBoxGDAWBgNVBAMTD2lkZW50aXR5Lm1kaC5zZTAeFw0wOTA5MDIxMzE5MDRa
-Fw0yOTA5MDIxMzE5MDRaMBoxGDAWBgNVBAMTD2lkZW50aXR5Lm1kaC5zZTCCASIw
-DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALBpGX8JJ+RvjMMMD3q/j01q58p8
-z0R9tuklMD5smW+Tz0JgiG3KDnynWvcYyg3s9DevNRUMmsQqzDBko771ecyhqkHy
-SoCkfVNJ9k7RaQmoaglSGZlR5N9lgcysHNA8qVqJYpUpsSFuQckr1dzS3RjngcTM
-ICcuBjy/JviV8fKzYzF0v7F9HW+BEuJXHH6lhqhDIuI4R4n7I9/lYYxJWvQZVelJ
-F6/Z+RnbqaSzViq1qcMe5AWcnZgC85i0KiIcnaKiImNRJbVrVUN+eniQSj9ROJyf
-uk7Ldhpg8gvqsaUVd2drDY43XymAu7XFVnBBX340JKgb7F8wxpvIK6Gh6ZMCAwEA
-AaNlMGMwQgYDVR0RBDswOYIPaWRlbnRpdHkubWRoLnNlhiZodHRwczovL2lkZW50
-aXR5Lm1kaC5zZS9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQU/qdjANz6BbQi/0eQ
-PgsaI1I0V4MwDQYJKoZIhvcNAQEFBQADggEBAG3OEKV7S8aojN/D7UOqURiCRrjC
-Dk6wEnMLX6uIYAFCv6jc5QdkMWaaDBR0tgGhmgzRZOGnl9pvzT1AjMIhvMu2/luI
-b2oawOhycFG1rECJCpDi+gLDGhxzbQY/E9VIz+AcBAxglBFbDqqIynhFs+GZn+fv
-P7nZB2+XoE3sf8xqd2a9xO7vy1r17Q7bx8PzwklL9GdFppuRnimioYoF3atEQM6R
-7UwSK+MqY42FI27aHfIMAN7ccEun9HViAHU9HT/tng0kSydoF9VOvTI657LX7vpb
-0hhoH3UMUkrHgTwtNYpylgL6YEy/GtQHimQGN/O6aAQt1ZIyXKnuQufcnNk=
-
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://identity.mdh.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://identity.mdh.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">MDH</OrganizationName>
-    <OrganizationDisplayName xml:lang="sv">Mälardalens Högskola</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">Mälardalen University</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.mdh.se</OrganizationURL>
-  </Organization>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
-    <Company>Mälardalen University</Company>
-    <EmailAddress>peter.falck@mdh.se</EmailAddress>
-  </ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/identity.mdh.se.xml b/swamid-interfederations-2.0/identity.mdh.se.xml
deleted file mode 100644
index 85b949d5..00000000
--- a/swamid-interfederations-2.0/identity.mdh.se.xml
+++ /dev/null
@@ -1,106 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://identity.mdh.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">mdh.se</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="sv">Mälardalens Högskola</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Mälardalen University</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Identity Provider för anställda och studenter vid Mälardalens högskola.</mdui:Description>
-        <mdui:Description xml:lang="en">The Mälardalen University Identity Provider is used by employees and students at the university.</mdui:Description>
-        <mdui:Logo height="216" width="117">https://identity.mdh.se/img/logo-sv.png</mdui:Logo>
-        <mdui:Keywords xml:lang="sv">mdh vasteras eskilstuna malardalen malardalen+university malardalens+hogskola mälardalens+högskola</mdui:Keywords>
-        <mdui:Keywords xml:lang="en">mdh vasteras eskilstuna malardalen malardalen+university malardalens+hogskola mälardalens+högskola</mdui:Keywords>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DomainHint>mdh.se</mdui:DomainHint>
-        <mdui:GeolocationHint>geo:59.6186,16.5407</mdui:GeolocationHint>
-        <mdui:GeolocationHint>geo:59.3716,16.5085</mdui:GeolocationHint>
-      </mdui:DiscoHints>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDKDCCAhCgAwIBAgIVAIPxTFqNFghYnsNGOQDHDvRnU53tMA0GCSqGSIb3DQEB
-BQUAMBoxGDAWBgNVBAMTD2lkZW50aXR5Lm1kaC5zZTAeFw0wOTA5MDIxMzE5MDRa
-Fw0yOTA5MDIxMzE5MDRaMBoxGDAWBgNVBAMTD2lkZW50aXR5Lm1kaC5zZTCCASIw
-DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALBpGX8JJ+RvjMMMD3q/j01q58p8
-z0R9tuklMD5smW+Tz0JgiG3KDnynWvcYyg3s9DevNRUMmsQqzDBko771ecyhqkHy
-SoCkfVNJ9k7RaQmoaglSGZlR5N9lgcysHNA8qVqJYpUpsSFuQckr1dzS3RjngcTM
-ICcuBjy/JviV8fKzYzF0v7F9HW+BEuJXHH6lhqhDIuI4R4n7I9/lYYxJWvQZVelJ
-F6/Z+RnbqaSzViq1qcMe5AWcnZgC85i0KiIcnaKiImNRJbVrVUN+eniQSj9ROJyf
-uk7Ldhpg8gvqsaUVd2drDY43XymAu7XFVnBBX340JKgb7F8wxpvIK6Gh6ZMCAwEA
-AaNlMGMwQgYDVR0RBDswOYIPaWRlbnRpdHkubWRoLnNlhiZodHRwczovL2lkZW50
-aXR5Lm1kaC5zZS9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQU/qdjANz6BbQi/0eQ
-PgsaI1I0V4MwDQYJKoZIhvcNAQEFBQADggEBAG3OEKV7S8aojN/D7UOqURiCRrjC
-Dk6wEnMLX6uIYAFCv6jc5QdkMWaaDBR0tgGhmgzRZOGnl9pvzT1AjMIhvMu2/luI
-b2oawOhycFG1rECJCpDi+gLDGhxzbQY/E9VIz+AcBAxglBFbDqqIynhFs+GZn+fv
-P7nZB2+XoE3sf8xqd2a9xO7vy1r17Q7bx8PzwklL9GdFppuRnimioYoF3atEQM6R
-7UwSK+MqY42FI27aHfIMAN7ccEun9HViAHU9HT/tng0kSydoF9VOvTI657LX7vpb
-0hhoH3UMUkrHgTwtNYpylgL6YEy/GtQHimQGN/O6aAQt1ZIyXKnuQufcnNk=
-
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://identity.mdh.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://identity.mdh.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://identity.mdh.se/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://identity.mdh.se/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://identity.mdh.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://identity.mdh.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">mdh.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDKDCCAhCgAwIBAgIVAIPxTFqNFghYnsNGOQDHDvRnU53tMA0GCSqGSIb3DQEB
-BQUAMBoxGDAWBgNVBAMTD2lkZW50aXR5Lm1kaC5zZTAeFw0wOTA5MDIxMzE5MDRa
-Fw0yOTA5MDIxMzE5MDRaMBoxGDAWBgNVBAMTD2lkZW50aXR5Lm1kaC5zZTCCASIw
-DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALBpGX8JJ+RvjMMMD3q/j01q58p8
-z0R9tuklMD5smW+Tz0JgiG3KDnynWvcYyg3s9DevNRUMmsQqzDBko771ecyhqkHy
-SoCkfVNJ9k7RaQmoaglSGZlR5N9lgcysHNA8qVqJYpUpsSFuQckr1dzS3RjngcTM
-ICcuBjy/JviV8fKzYzF0v7F9HW+BEuJXHH6lhqhDIuI4R4n7I9/lYYxJWvQZVelJ
-F6/Z+RnbqaSzViq1qcMe5AWcnZgC85i0KiIcnaKiImNRJbVrVUN+eniQSj9ROJyf
-uk7Ldhpg8gvqsaUVd2drDY43XymAu7XFVnBBX340JKgb7F8wxpvIK6Gh6ZMCAwEA
-AaNlMGMwQgYDVR0RBDswOYIPaWRlbnRpdHkubWRoLnNlhiZodHRwczovL2lkZW50
-aXR5Lm1kaC5zZS9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQU/qdjANz6BbQi/0eQ
-PgsaI1I0V4MwDQYJKoZIhvcNAQEFBQADggEBAG3OEKV7S8aojN/D7UOqURiCRrjC
-Dk6wEnMLX6uIYAFCv6jc5QdkMWaaDBR0tgGhmgzRZOGnl9pvzT1AjMIhvMu2/luI
-b2oawOhycFG1rECJCpDi+gLDGhxzbQY/E9VIz+AcBAxglBFbDqqIynhFs+GZn+fv
-P7nZB2+XoE3sf8xqd2a9xO7vy1r17Q7bx8PzwklL9GdFppuRnimioYoF3atEQM6R
-7UwSK+MqY42FI27aHfIMAN7ccEun9HViAHU9HT/tng0kSydoF9VOvTI657LX7vpb
-0hhoH3UMUkrHgTwtNYpylgL6YEy/GtQHimQGN/O6aAQt1ZIyXKnuQufcnNk=
-
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://identity.mdh.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://identity.mdh.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">MDH</OrganizationName>
-    <OrganizationDisplayName xml:lang="sv">Mälardalens Högskola</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">Mälardalen University</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.mdh.se</OrganizationURL>
-  </Organization>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
-    <Company>Mälardalen University</Company>
-    <EmailAddress>peter.falck@mdh.se</EmailAddress>
-  </ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/identity.unamur.be-idp-shibboleth.xml b/swamid-interfederations-2.0/identity.unamur.be-idp-shibboleth.xml
deleted file mode 100644
index 8f2088b9..00000000
--- a/swamid-interfederations-2.0/identity.unamur.be-idp-shibboleth.xml
+++ /dev/null
@@ -1,115 +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: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:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://identity.unamur.be/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://federation.belnet.be/" registrationInstant="2012-03-27T12:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://federation.belnet.be/files/Belnet-metadata-registration-practice-statement.txt</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">unamur.be</shibmd:Scope>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="fr">Universite de Namur</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">University of Namur</mdui:DisplayName>
-        <mdui:Description xml:lang="fr">Le personnel et les etudiants de l'Universite de Namur - Belgique</mdui:Description>
-        <mdui:Description xml:lang="en">Staff and students from the University of Namur - Belgium</mdui:Description>
-      </mdui:UIInfo>
-      <mdui:DiscoHints>
-        <mdui:IPHint>138.48.0.0/16</mdui:IPHint>
-        <mdui:IPHint>2001:6a8:3900::/64</mdui:IPHint>
-        <mdui:DomainHint>unamur.be</mdui:DomainHint>
-        <mdui:GeolocationHint>50.466101,4.860253</mdui:GeolocationHint>
-      </mdui:DiscoHints>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDMzCCAhugAwIBAgIUOFEO17meQZ7yZbR00GFaaEZCBIUwDQYJKoZIhvcNAQEF
-BQAwHTEbMBkGA1UEAwwSaWRlbnRpdHkudW5hbXVyLmJlMB4XDTE0MTAwMTExMzAz
-MloXDTM0MTAwMTExMzAzMlowHTEbMBkGA1UEAwwSaWRlbnRpdHkudW5hbXVyLmJl
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAoBOrnhzyOHqWdf3eka1y
-4cQ9PU9DgvGVBKPkBVy8N3vNXrFQIgMbObDS1l9eYYuvyY+hHAPucMS0i1OdP2Aj
-Ev/UE4gx4z2hiXwQb/ne1cdwJ0hocacKwoj8U7VjOcVmb6jkj8iQ+cf4xVm8g4tH
-rdYJ44FWWzyTbhJqdsh7LlxLBl7OiXNib9Mdmgc0/yR21q4z6Gfzq9lAL8n0Qol2
-oa32RWvsOdbvUsfHGH+MzcmI7KENiz/ppbrgmKDqpfWX9RNNDzE4RIDqt4Vh40Is
-EjAuizxuaWGGuGE/aPxdUji6xUB18USEE7/yMm6PGfgsibwxBmFGBiUq8qrS7sH0
-CwIDAQABo2swaTAdBgNVHQ4EFgQUY7BxMDAhCKPAsUtkHiqjikltMpAwSAYDVR0R
-BEEwP4ISaWRlbnRpdHkudW5hbXVyLmJlhilodHRwczovL2lkZW50aXR5LnVuYW11
-ci5iZS9pZHAvc2hpYmJvbGV0aDANBgkqhkiG9w0BAQUFAAOCAQEAjoKO8E/Geoa1
-6W+nbLFir4Fm6k9SW4cJW3Wabnf5yC7M5Qf7CDPQOmt/dC/IwKHLfkMu/AfmbOEe
-8GmK3mrqWZEAU/R7vg/AbiX9ci0PGOeSg1Zg4TE1Gl+vDCx47gBsqNJk/j09EJ0E
-QQrqWCW9oHfWcjENvvErtwTKuYhGV/8BdQNDd9D+ji40xn2JVLhnTyeyCpVYAGFh
-Piz6aamOjjjdutjif20mGC2CWwQOF754FFmYl9Zy11PlcKtxmU8h3rMUO+L6u6jp
-bvVxLwAnn3hdXccfJDUwVmmmeK4ePR3brG0NPafaCdQdFYvSci45kcjQ2bnT13CG
-sAFHfgCexQ==
-
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://identity.unamur.be:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://identity.unamur.be:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://identity.unamur.be/idp/profile/SAML2/Redirect/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://identity.unamur.be/idp/profile/SAML2/POST/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://identity.unamur.be: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://identity.unamur.be/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://identity.unamur.be/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://identity.unamur.be/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://identity.unamur.be/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">unamur.be</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDMzCCAhugAwIBAgIUOFEO17meQZ7yZbR00GFaaEZCBIUwDQYJKoZIhvcNAQEF
-BQAwHTEbMBkGA1UEAwwSaWRlbnRpdHkudW5hbXVyLmJlMB4XDTE0MTAwMTExMzAz
-MloXDTM0MTAwMTExMzAzMlowHTEbMBkGA1UEAwwSaWRlbnRpdHkudW5hbXVyLmJl
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAoBOrnhzyOHqWdf3eka1y
-4cQ9PU9DgvGVBKPkBVy8N3vNXrFQIgMbObDS1l9eYYuvyY+hHAPucMS0i1OdP2Aj
-Ev/UE4gx4z2hiXwQb/ne1cdwJ0hocacKwoj8U7VjOcVmb6jkj8iQ+cf4xVm8g4tH
-rdYJ44FWWzyTbhJqdsh7LlxLBl7OiXNib9Mdmgc0/yR21q4z6Gfzq9lAL8n0Qol2
-oa32RWvsOdbvUsfHGH+MzcmI7KENiz/ppbrgmKDqpfWX9RNNDzE4RIDqt4Vh40Is
-EjAuizxuaWGGuGE/aPxdUji6xUB18USEE7/yMm6PGfgsibwxBmFGBiUq8qrS7sH0
-CwIDAQABo2swaTAdBgNVHQ4EFgQUY7BxMDAhCKPAsUtkHiqjikltMpAwSAYDVR0R
-BEEwP4ISaWRlbnRpdHkudW5hbXVyLmJlhilodHRwczovL2lkZW50aXR5LnVuYW11
-ci5iZS9pZHAvc2hpYmJvbGV0aDANBgkqhkiG9w0BAQUFAAOCAQEAjoKO8E/Geoa1
-6W+nbLFir4Fm6k9SW4cJW3Wabnf5yC7M5Qf7CDPQOmt/dC/IwKHLfkMu/AfmbOEe
-8GmK3mrqWZEAU/R7vg/AbiX9ci0PGOeSg1Zg4TE1Gl+vDCx47gBsqNJk/j09EJ0E
-QQrqWCW9oHfWcjENvvErtwTKuYhGV/8BdQNDd9D+ji40xn2JVLhnTyeyCpVYAGFh
-Piz6aamOjjjdutjif20mGC2CWwQOF754FFmYl9Zy11PlcKtxmU8h3rMUO+L6u6jp
-bvVxLwAnn3hdXccfJDUwVmmmeK4ePR3brG0NPafaCdQdFYvSci45kcjQ2bnT13CG
-sAFHfgCexQ==
-
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://identity.unamur.be:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://identity.unamur.be: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">
-	UNamur
-	</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">
-	Universite de Namur
-	</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">
-	http://www.unamur.be
-	</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Technical Support</GivenName>
-    <SurName>Technical Support</SurName>
-    <EmailAddress>siu-serveurs@unamur.be</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/identity.unamur.be.xml b/swamid-interfederations-2.0/identity.unamur.be.xml
deleted file mode 100644
index 8f2088b9..00000000
--- a/swamid-interfederations-2.0/identity.unamur.be.xml
+++ /dev/null
@@ -1,115 +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: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:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://identity.unamur.be/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://federation.belnet.be/" registrationInstant="2012-03-27T12:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://federation.belnet.be/files/Belnet-metadata-registration-practice-statement.txt</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">unamur.be</shibmd:Scope>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="fr">Universite de Namur</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">University of Namur</mdui:DisplayName>
-        <mdui:Description xml:lang="fr">Le personnel et les etudiants de l'Universite de Namur - Belgique</mdui:Description>
-        <mdui:Description xml:lang="en">Staff and students from the University of Namur - Belgium</mdui:Description>
-      </mdui:UIInfo>
-      <mdui:DiscoHints>
-        <mdui:IPHint>138.48.0.0/16</mdui:IPHint>
-        <mdui:IPHint>2001:6a8:3900::/64</mdui:IPHint>
-        <mdui:DomainHint>unamur.be</mdui:DomainHint>
-        <mdui:GeolocationHint>50.466101,4.860253</mdui:GeolocationHint>
-      </mdui:DiscoHints>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDMzCCAhugAwIBAgIUOFEO17meQZ7yZbR00GFaaEZCBIUwDQYJKoZIhvcNAQEF
-BQAwHTEbMBkGA1UEAwwSaWRlbnRpdHkudW5hbXVyLmJlMB4XDTE0MTAwMTExMzAz
-MloXDTM0MTAwMTExMzAzMlowHTEbMBkGA1UEAwwSaWRlbnRpdHkudW5hbXVyLmJl
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAoBOrnhzyOHqWdf3eka1y
-4cQ9PU9DgvGVBKPkBVy8N3vNXrFQIgMbObDS1l9eYYuvyY+hHAPucMS0i1OdP2Aj
-Ev/UE4gx4z2hiXwQb/ne1cdwJ0hocacKwoj8U7VjOcVmb6jkj8iQ+cf4xVm8g4tH
-rdYJ44FWWzyTbhJqdsh7LlxLBl7OiXNib9Mdmgc0/yR21q4z6Gfzq9lAL8n0Qol2
-oa32RWvsOdbvUsfHGH+MzcmI7KENiz/ppbrgmKDqpfWX9RNNDzE4RIDqt4Vh40Is
-EjAuizxuaWGGuGE/aPxdUji6xUB18USEE7/yMm6PGfgsibwxBmFGBiUq8qrS7sH0
-CwIDAQABo2swaTAdBgNVHQ4EFgQUY7BxMDAhCKPAsUtkHiqjikltMpAwSAYDVR0R
-BEEwP4ISaWRlbnRpdHkudW5hbXVyLmJlhilodHRwczovL2lkZW50aXR5LnVuYW11
-ci5iZS9pZHAvc2hpYmJvbGV0aDANBgkqhkiG9w0BAQUFAAOCAQEAjoKO8E/Geoa1
-6W+nbLFir4Fm6k9SW4cJW3Wabnf5yC7M5Qf7CDPQOmt/dC/IwKHLfkMu/AfmbOEe
-8GmK3mrqWZEAU/R7vg/AbiX9ci0PGOeSg1Zg4TE1Gl+vDCx47gBsqNJk/j09EJ0E
-QQrqWCW9oHfWcjENvvErtwTKuYhGV/8BdQNDd9D+ji40xn2JVLhnTyeyCpVYAGFh
-Piz6aamOjjjdutjif20mGC2CWwQOF754FFmYl9Zy11PlcKtxmU8h3rMUO+L6u6jp
-bvVxLwAnn3hdXccfJDUwVmmmeK4ePR3brG0NPafaCdQdFYvSci45kcjQ2bnT13CG
-sAFHfgCexQ==
-
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://identity.unamur.be:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://identity.unamur.be:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://identity.unamur.be/idp/profile/SAML2/Redirect/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://identity.unamur.be/idp/profile/SAML2/POST/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://identity.unamur.be: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://identity.unamur.be/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://identity.unamur.be/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://identity.unamur.be/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://identity.unamur.be/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">unamur.be</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDMzCCAhugAwIBAgIUOFEO17meQZ7yZbR00GFaaEZCBIUwDQYJKoZIhvcNAQEF
-BQAwHTEbMBkGA1UEAwwSaWRlbnRpdHkudW5hbXVyLmJlMB4XDTE0MTAwMTExMzAz
-MloXDTM0MTAwMTExMzAzMlowHTEbMBkGA1UEAwwSaWRlbnRpdHkudW5hbXVyLmJl
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAoBOrnhzyOHqWdf3eka1y
-4cQ9PU9DgvGVBKPkBVy8N3vNXrFQIgMbObDS1l9eYYuvyY+hHAPucMS0i1OdP2Aj
-Ev/UE4gx4z2hiXwQb/ne1cdwJ0hocacKwoj8U7VjOcVmb6jkj8iQ+cf4xVm8g4tH
-rdYJ44FWWzyTbhJqdsh7LlxLBl7OiXNib9Mdmgc0/yR21q4z6Gfzq9lAL8n0Qol2
-oa32RWvsOdbvUsfHGH+MzcmI7KENiz/ppbrgmKDqpfWX9RNNDzE4RIDqt4Vh40Is
-EjAuizxuaWGGuGE/aPxdUji6xUB18USEE7/yMm6PGfgsibwxBmFGBiUq8qrS7sH0
-CwIDAQABo2swaTAdBgNVHQ4EFgQUY7BxMDAhCKPAsUtkHiqjikltMpAwSAYDVR0R
-BEEwP4ISaWRlbnRpdHkudW5hbXVyLmJlhilodHRwczovL2lkZW50aXR5LnVuYW11
-ci5iZS9pZHAvc2hpYmJvbGV0aDANBgkqhkiG9w0BAQUFAAOCAQEAjoKO8E/Geoa1
-6W+nbLFir4Fm6k9SW4cJW3Wabnf5yC7M5Qf7CDPQOmt/dC/IwKHLfkMu/AfmbOEe
-8GmK3mrqWZEAU/R7vg/AbiX9ci0PGOeSg1Zg4TE1Gl+vDCx47gBsqNJk/j09EJ0E
-QQrqWCW9oHfWcjENvvErtwTKuYhGV/8BdQNDd9D+ji40xn2JVLhnTyeyCpVYAGFh
-Piz6aamOjjjdutjif20mGC2CWwQOF754FFmYl9Zy11PlcKtxmU8h3rMUO+L6u6jp
-bvVxLwAnn3hdXccfJDUwVmmmeK4ePR3brG0NPafaCdQdFYvSci45kcjQ2bnT13CG
-sAFHfgCexQ==
-
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://identity.unamur.be:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://identity.unamur.be: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">
-	UNamur
-	</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">
-	Universite de Namur
-	</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">
-	http://www.unamur.be
-	</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Technical Support</GivenName>
-    <SurName>Technical Support</SurName>
-    <EmailAddress>siu-serveurs@unamur.be</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idm.ics.muni.cz-shibboleth.xml b/swamid-interfederations-2.0/idm.ics.muni.cz-shibboleth.xml
deleted file mode 100644
index fb12e583..00000000
--- a/swamid-interfederations-2.0/idm.ics.muni.cz-shibboleth.xml
+++ /dev/null
@@ -1,100 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idm.ics.muni.cz/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/" registrationInstant="2014-10-21T14:42:07Z">
-      <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>
-      <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://idm.ics.muni.cz/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://idm.ics.muni.cz/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Masaryk University</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="cs">Masarykova univerzita</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Perun instance for Masaryk University</mdui:Description>
-        <mdui:Description xml:lang="cs">Instance Peruna pro Masarykovu universitu</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.muni.cz/?lang=en</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="cs">http://www.muni.cz/</mdui:InformationURL>
-      </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>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idm.ics.muni.cz</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idm.ics.muni.cz,OU=Domain Control Validated</ds:X509SubjectName>
-          <ds:X509Certificate>MIIEmTCCA4GgAwIBAgIRAKRhaOceRup4iuzxkYsqJbowDQYJKoZIhvcNAQELBQAw
-ZDELMAkGA1UEBhMCTkwxFjAUBgNVBAgTDU5vb3JkLUhvbGxhbmQxEjAQBgNVBAcT
-CUFtc3RlcmRhbTEPMA0GA1UEChMGVEVSRU5BMRgwFgYDVQQDEw9URVJFTkEgU1NM
-IENBIDIwHhcNMTQxMDIxMDAwMDAwWhcNMTcxMDIwMjM1OTU5WjA9MSEwHwYDVQQL
-ExhEb21haW4gQ29udHJvbCBWYWxpZGF0ZWQxGDAWBgNVBAMTD2lkbS5pY3MubXVu
-aS5jejCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALm+U00en5+mxTGj
-oF1vryCcv7o8RHQcSVZpeQlNiGq7FBSzcP0RZ33iX52JpVKJNCWIl2PIusZSdfSZ
-Ja6uJuhVor3LA7BmwqcK24SPI7yokqFy2CCSpgWZw91F+KVTg09GEX1x+ocVF/1H
-skSWnCcJlaKsI2yN2j5xfzdyNFo7XFoxucG24/u+qpSIjw9mS+wJM+TRQjZTehPu
-9ZIP6M7j5ao6bxUWS2dh9GaSszSQGGX+6KLM2qFlUqJ1x8hqLdpnRhxleTVSTAD5
-E9/BdL+Gxu/NW/SM3f/7RxllWqDoUaNV9PpM+1VTUjJaBUpVm55m5mV7k25Trj/W
-KAXvjg8CAwEAAaOCAWswggFnMB8GA1UdIwQYMBaAFFvQihyaMlvgtd2WVBvhhiiw
-/ba9MB0GA1UdDgQWBBSLh7sZxQLN+1gVj1CcDggq4Ql1/DAOBgNVHQ8BAf8EBAMC
-BaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIw
-IgYDVR0gBBswGTANBgsrBgEEAbIxAQICHTAIBgZngQwBAgEwOgYDVR0fBDMwMTAv
-oC2gK4YpaHR0cDovL2NybC51c2VydHJ1c3QuY29tL1RFUkVOQVNTTENBMi5jcmww
-bAYIKwYBBQUHAQEEYDBeMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnVzZXJ0cnVz
-dC5jb20vVEVSRU5BU1NMQ0EyLmNydDAlBggrBgEFBQcwAYYZaHR0cDovL29jc3Au
-dXNlcnRydXN0LmNvbTAaBgNVHREEEzARgg9pZG0uaWNzLm11bmkuY3owDQYJKoZI
-hvcNAQELBQADggEBAIptaltbQyIAUiB9nlTHs0xlUa0aTxTwHyhWiHRqa5pbqJ8n
-h2qxi3aNXBM30qzftnXaZvQUyaqW3poFBd2Rw5RJ5dh++z9b20kXVnmN/IyBzGf4
-s4Q5EE0iIZw3KARUqSb0PG3gCtiYeV+SXsnehxvUvaYNNyR8mZ0zUUd+WcHWvazN
-8VFAm3TNxwz92EWGnNvx9p2hHcMbR0Cix4TpxP9cLUwu9m1+am1U+WJkhNMkFoP5
-ZiAG5ldQnA9iQom961Uf1+ltceQpYFkfdgfrmsHMUDyC1Jv25LvFpmZoC7B4Q7cA
-lcxWfmThtT8p0FyfFUzHnFRAn89yyXWWZEhNpe4=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idm.ics.muni.cz/Shibboleth.sso/Artifact/SOAP" index="0"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idm.ics.muni.cz/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idm.ics.muni.cz/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idm.ics.muni.cz/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://idm.ics.muni.cz/Shibboleth.sso/SLO/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idm.ics.muni.cz/Shibboleth.sso/SAML2/POST" index="0"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idm.ics.muni.cz/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://idm.ics.muni.cz/Shibboleth.sso/SAML2/Artifact" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://idm.ics.muni.cz/Shibboleth.sso/SAML2/ECP" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://idm.ics.muni.cz/Shibboleth.sso/SAML/POST" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://idm.ics.muni.cz/Shibboleth.sso/SAML/Artifact" index="5"/>
-    <md:AttributeConsumingService index="0">
-      <md:ServiceName xml:lang="en">Perun instance for Masaryk University</md:ServiceName>
-      <md:ServiceDescription xml:lang="en">Identity and access management system for Masaryk University</md:ServiceDescription>
-      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="email" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="o" Name="urn:oid:2.5.4.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="cn" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-      <md:RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-      <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
-    <OrganizationName xml:lang="cs">Masarykova univerzita</OrganizationName>
-    <OrganizationName xml:lang="en">Masaryk University</OrganizationName>
-    <OrganizationDisplayName xml:lang="cs">Masarykova univerzita</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">Masaryk University</OrganizationDisplayName>
-    <OrganizationURL xml:lang="cs">http://www.muni.cz/</OrganizationURL>
-    <OrganizationURL xml:lang="en">http://www.muni.cz/?lang=en</OrganizationURL>
-  </Organization>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
-    <GivenName>Slavek</GivenName>
-    <SurName>Licehammer</SurName>
-    <EmailAddress>perun@cesnet.cz</EmailAddress>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
-    <GivenName>Michal</GivenName>
-    <SurName>Prochazka</SurName>
-    <EmailAddress>perun@cesnet.cz</EmailAddress>
-  </ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idm.ics.muni.cz.xml b/swamid-interfederations-2.0/idm.ics.muni.cz.xml
deleted file mode 100644
index fb12e583..00000000
--- a/swamid-interfederations-2.0/idm.ics.muni.cz.xml
+++ /dev/null
@@ -1,100 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idm.ics.muni.cz/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/" registrationInstant="2014-10-21T14:42:07Z">
-      <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>
-      <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://idm.ics.muni.cz/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://idm.ics.muni.cz/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Masaryk University</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="cs">Masarykova univerzita</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Perun instance for Masaryk University</mdui:Description>
-        <mdui:Description xml:lang="cs">Instance Peruna pro Masarykovu universitu</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.muni.cz/?lang=en</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="cs">http://www.muni.cz/</mdui:InformationURL>
-      </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>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idm.ics.muni.cz</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idm.ics.muni.cz,OU=Domain Control Validated</ds:X509SubjectName>
-          <ds:X509Certificate>MIIEmTCCA4GgAwIBAgIRAKRhaOceRup4iuzxkYsqJbowDQYJKoZIhvcNAQELBQAw
-ZDELMAkGA1UEBhMCTkwxFjAUBgNVBAgTDU5vb3JkLUhvbGxhbmQxEjAQBgNVBAcT
-CUFtc3RlcmRhbTEPMA0GA1UEChMGVEVSRU5BMRgwFgYDVQQDEw9URVJFTkEgU1NM
-IENBIDIwHhcNMTQxMDIxMDAwMDAwWhcNMTcxMDIwMjM1OTU5WjA9MSEwHwYDVQQL
-ExhEb21haW4gQ29udHJvbCBWYWxpZGF0ZWQxGDAWBgNVBAMTD2lkbS5pY3MubXVu
-aS5jejCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALm+U00en5+mxTGj
-oF1vryCcv7o8RHQcSVZpeQlNiGq7FBSzcP0RZ33iX52JpVKJNCWIl2PIusZSdfSZ
-Ja6uJuhVor3LA7BmwqcK24SPI7yokqFy2CCSpgWZw91F+KVTg09GEX1x+ocVF/1H
-skSWnCcJlaKsI2yN2j5xfzdyNFo7XFoxucG24/u+qpSIjw9mS+wJM+TRQjZTehPu
-9ZIP6M7j5ao6bxUWS2dh9GaSszSQGGX+6KLM2qFlUqJ1x8hqLdpnRhxleTVSTAD5
-E9/BdL+Gxu/NW/SM3f/7RxllWqDoUaNV9PpM+1VTUjJaBUpVm55m5mV7k25Trj/W
-KAXvjg8CAwEAAaOCAWswggFnMB8GA1UdIwQYMBaAFFvQihyaMlvgtd2WVBvhhiiw
-/ba9MB0GA1UdDgQWBBSLh7sZxQLN+1gVj1CcDggq4Ql1/DAOBgNVHQ8BAf8EBAMC
-BaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIw
-IgYDVR0gBBswGTANBgsrBgEEAbIxAQICHTAIBgZngQwBAgEwOgYDVR0fBDMwMTAv
-oC2gK4YpaHR0cDovL2NybC51c2VydHJ1c3QuY29tL1RFUkVOQVNTTENBMi5jcmww
-bAYIKwYBBQUHAQEEYDBeMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnVzZXJ0cnVz
-dC5jb20vVEVSRU5BU1NMQ0EyLmNydDAlBggrBgEFBQcwAYYZaHR0cDovL29jc3Au
-dXNlcnRydXN0LmNvbTAaBgNVHREEEzARgg9pZG0uaWNzLm11bmkuY3owDQYJKoZI
-hvcNAQELBQADggEBAIptaltbQyIAUiB9nlTHs0xlUa0aTxTwHyhWiHRqa5pbqJ8n
-h2qxi3aNXBM30qzftnXaZvQUyaqW3poFBd2Rw5RJ5dh++z9b20kXVnmN/IyBzGf4
-s4Q5EE0iIZw3KARUqSb0PG3gCtiYeV+SXsnehxvUvaYNNyR8mZ0zUUd+WcHWvazN
-8VFAm3TNxwz92EWGnNvx9p2hHcMbR0Cix4TpxP9cLUwu9m1+am1U+WJkhNMkFoP5
-ZiAG5ldQnA9iQom961Uf1+ltceQpYFkfdgfrmsHMUDyC1Jv25LvFpmZoC7B4Q7cA
-lcxWfmThtT8p0FyfFUzHnFRAn89yyXWWZEhNpe4=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idm.ics.muni.cz/Shibboleth.sso/Artifact/SOAP" index="0"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idm.ics.muni.cz/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idm.ics.muni.cz/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idm.ics.muni.cz/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://idm.ics.muni.cz/Shibboleth.sso/SLO/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idm.ics.muni.cz/Shibboleth.sso/SAML2/POST" index="0"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idm.ics.muni.cz/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://idm.ics.muni.cz/Shibboleth.sso/SAML2/Artifact" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://idm.ics.muni.cz/Shibboleth.sso/SAML2/ECP" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://idm.ics.muni.cz/Shibboleth.sso/SAML/POST" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://idm.ics.muni.cz/Shibboleth.sso/SAML/Artifact" index="5"/>
-    <md:AttributeConsumingService index="0">
-      <md:ServiceName xml:lang="en">Perun instance for Masaryk University</md:ServiceName>
-      <md:ServiceDescription xml:lang="en">Identity and access management system for Masaryk University</md:ServiceDescription>
-      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="email" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="o" Name="urn:oid:2.5.4.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="cn" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-      <md:RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-      <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
-    <OrganizationName xml:lang="cs">Masarykova univerzita</OrganizationName>
-    <OrganizationName xml:lang="en">Masaryk University</OrganizationName>
-    <OrganizationDisplayName xml:lang="cs">Masarykova univerzita</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">Masaryk University</OrganizationDisplayName>
-    <OrganizationURL xml:lang="cs">http://www.muni.cz/</OrganizationURL>
-    <OrganizationURL xml:lang="en">http://www.muni.cz/?lang=en</OrganizationURL>
-  </Organization>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
-    <GivenName>Slavek</GivenName>
-    <SurName>Licehammer</SurName>
-    <EmailAddress>perun@cesnet.cz</EmailAddress>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
-    <GivenName>Michal</GivenName>
-    <SurName>Prochazka</SurName>
-    <EmailAddress>perun@cesnet.cz</EmailAddress>
-  </ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp-cafe.ifrr.edu.br-idp-shibboleth.xml b/swamid-interfederations-2.0/idp-cafe.ifrr.edu.br-idp-shibboleth.xml
deleted file mode 100644
index d70e3b88..00000000
--- a/swamid-interfederations-2.0/idp-cafe.ifrr.edu.br-idp-shibboleth.xml
+++ /dev/null
@@ -1,102 +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://idp-cafe.ifrr.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">edu.br</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">IFRR - Instituto Federal de Roraima</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="pt-br">IFRR - Instituto Federal de Roraima</mdui:DisplayName>
-        <mdui:Description xml:lang="en">IFRR - Instituto Federal de Roraima</mdui:Description>
-        <mdui:Description xml:lang="pt-br">IFRR - Instituto Federal de Roraima</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.ifrr.edu.br</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="pt-br">http://www.ifrr.edu.br</mdui:InformationURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-    MIIC0DCCAbgCAQAwDQYJKoZIhvcNAQEFBQAwLjEMMAoGA1UECxMDRFRJMQswCQYD
-VQQGEwJCUjERMA8GA1UEAxMIaWRwLWNhZmUwHhcNMTQwNDA5MTYyNzU1WhcNMTkw
-NDA4MTYyNzU1WjAuMQwwCgYDVQQLEwNEVEkxCzAJBgNVBAYTAkJSMREwDwYDVQQD
-EwhpZHAtY2FmZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAM2QLiQp
-v/NepaRdzlGTeoyC//4t4vPsByuVLTF9BJ9zXfpgb70bFt5Ka4FXaYEafGC76n8H
-uCzk/nWrzEKuNMZMPgQbteCpvhrGm8RziPF7zelZl2Q4FDAORAOQwfw/GIyadsmY
-38BYCGQmuppiCAL5SUvGBHvEPyGwJnLBqnE/f1e66ZXfLvniYqRjKvU1VSsUUF5Y
-BrVE/LqUB6OA7uJEKTtp6uCx8XNUNYGML6hHR9joDZrQuK4wYOocjdWuWn0/1/uw
-hvb8sOYiTgAPap4UtTxTqVZ6XBRWmWVP9fTEjpSNEgeaWBvNpmJx+Ci9Hi5+F0zq
-GZMyVBZZAXsBBj0CAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAl6toGY7toL1HPVtj
-pjGi7ed76phnITf4cHJi6Ny99tsCK29pdkWKGQ4p1F8usGy8QoWCBBLTAo/LhZye
-/AzLnW+zUV9qioGw+guncG8/GCg8SM2FR2nwUt2BXsXUodHg2kl8S8I7NbXcw9p1
-oI8OT1fkM3RcJ5F4XBErp9PI9KK5zaLGYjDgCOm4m09GmIuPbzlIBlx77B8+WZXA
-CX6Zy+sNmrpOzcg/UDotLp5yCOWlJQkcNH4U4gqCMiwbpys3zMLPjKcH+N2th9MB
-DqEeFHCPJJZZTT+MFcUMt4fMrYZ2EKfNZnLbO0cvTEmLXDTxEVU/m9n41DGtxSF0
-NMSiiw==
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-cafe.ifrr.edu.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-cafe.ifrr.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://idp-cafe.ifrr.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-cafe.ifrr.edu.br/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp-cafe.ifrr.edu.br/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-cafe.ifrr.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>
-      
-MIIC0DCCAbgCAQAwDQYJKoZIhvcNAQEFBQAwLjEMMAoGA1UECxMDRFRJMQswCQYD
-VQQGEwJCUjERMA8GA1UEAxMIaWRwLWNhZmUwHhcNMTQwNDA5MTYyNzU1WhcNMTkw
-NDA4MTYyNzU1WjAuMQwwCgYDVQQLEwNEVEkxCzAJBgNVBAYTAkJSMREwDwYDVQQD
-EwhpZHAtY2FmZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAM2QLiQp
-v/NepaRdzlGTeoyC//4t4vPsByuVLTF9BJ9zXfpgb70bFt5Ka4FXaYEafGC76n8H
-uCzk/nWrzEKuNMZMPgQbteCpvhrGm8RziPF7zelZl2Q4FDAORAOQwfw/GIyadsmY
-38BYCGQmuppiCAL5SUvGBHvEPyGwJnLBqnE/f1e66ZXfLvniYqRjKvU1VSsUUF5Y
-BrVE/LqUB6OA7uJEKTtp6uCx8XNUNYGML6hHR9joDZrQuK4wYOocjdWuWn0/1/uw
-hvb8sOYiTgAPap4UtTxTqVZ6XBRWmWVP9fTEjpSNEgeaWBvNpmJx+Ci9Hi5+F0zq
-GZMyVBZZAXsBBj0CAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAl6toGY7toL1HPVtj
-pjGi7ed76phnITf4cHJi6Ny99tsCK29pdkWKGQ4p1F8usGy8QoWCBBLTAo/LhZye
-/AzLnW+zUV9qioGw+guncG8/GCg8SM2FR2nwUt2BXsXUodHg2kl8S8I7NbXcw9p1
-oI8OT1fkM3RcJ5F4XBErp9PI9KK5zaLGYjDgCOm4m09GmIuPbzlIBlx77B8+WZXA
-CX6Zy+sNmrpOzcg/UDotLp5yCOWlJQkcNH4U4gqCMiwbpys3zMLPjKcH+N2th9MB
-DqEeFHCPJJZZTT+MFcUMt4fMrYZ2EKfNZnLbO0cvTEmLXDTxEVU/m9n41DGtxSF0
-NMSiiw==
-                    
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-cafe.ifrr.edu.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-cafe.ifrr.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">IFRR - Instituto Federal de Roraima</OrganizationName>
-    <OrganizationName xml:lang="pt-br">IFRR - Instituto Federal de Roraima</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">IFRR - Instituto Federal de Roraima</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="pt-br">IFRR - Instituto Federal de Roraima</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.ifrr.edu.br</OrganizationURL>
-    <OrganizationURL xml:lang="pt-br">http://www.ifrr.edu.br</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Francisco Cavalcante Filho</SurName>
-    <EmailAddress>francisco.filho@ifrr.edu.br</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp-cafe.ifrr.edu.br.xml b/swamid-interfederations-2.0/idp-cafe.ifrr.edu.br.xml
deleted file mode 100644
index d70e3b88..00000000
--- a/swamid-interfederations-2.0/idp-cafe.ifrr.edu.br.xml
+++ /dev/null
@@ -1,102 +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://idp-cafe.ifrr.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">edu.br</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">IFRR - Instituto Federal de Roraima</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="pt-br">IFRR - Instituto Federal de Roraima</mdui:DisplayName>
-        <mdui:Description xml:lang="en">IFRR - Instituto Federal de Roraima</mdui:Description>
-        <mdui:Description xml:lang="pt-br">IFRR - Instituto Federal de Roraima</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.ifrr.edu.br</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="pt-br">http://www.ifrr.edu.br</mdui:InformationURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-    MIIC0DCCAbgCAQAwDQYJKoZIhvcNAQEFBQAwLjEMMAoGA1UECxMDRFRJMQswCQYD
-VQQGEwJCUjERMA8GA1UEAxMIaWRwLWNhZmUwHhcNMTQwNDA5MTYyNzU1WhcNMTkw
-NDA4MTYyNzU1WjAuMQwwCgYDVQQLEwNEVEkxCzAJBgNVBAYTAkJSMREwDwYDVQQD
-EwhpZHAtY2FmZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAM2QLiQp
-v/NepaRdzlGTeoyC//4t4vPsByuVLTF9BJ9zXfpgb70bFt5Ka4FXaYEafGC76n8H
-uCzk/nWrzEKuNMZMPgQbteCpvhrGm8RziPF7zelZl2Q4FDAORAOQwfw/GIyadsmY
-38BYCGQmuppiCAL5SUvGBHvEPyGwJnLBqnE/f1e66ZXfLvniYqRjKvU1VSsUUF5Y
-BrVE/LqUB6OA7uJEKTtp6uCx8XNUNYGML6hHR9joDZrQuK4wYOocjdWuWn0/1/uw
-hvb8sOYiTgAPap4UtTxTqVZ6XBRWmWVP9fTEjpSNEgeaWBvNpmJx+Ci9Hi5+F0zq
-GZMyVBZZAXsBBj0CAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAl6toGY7toL1HPVtj
-pjGi7ed76phnITf4cHJi6Ny99tsCK29pdkWKGQ4p1F8usGy8QoWCBBLTAo/LhZye
-/AzLnW+zUV9qioGw+guncG8/GCg8SM2FR2nwUt2BXsXUodHg2kl8S8I7NbXcw9p1
-oI8OT1fkM3RcJ5F4XBErp9PI9KK5zaLGYjDgCOm4m09GmIuPbzlIBlx77B8+WZXA
-CX6Zy+sNmrpOzcg/UDotLp5yCOWlJQkcNH4U4gqCMiwbpys3zMLPjKcH+N2th9MB
-DqEeFHCPJJZZTT+MFcUMt4fMrYZ2EKfNZnLbO0cvTEmLXDTxEVU/m9n41DGtxSF0
-NMSiiw==
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-cafe.ifrr.edu.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-cafe.ifrr.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://idp-cafe.ifrr.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-cafe.ifrr.edu.br/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp-cafe.ifrr.edu.br/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-cafe.ifrr.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>
-      
-MIIC0DCCAbgCAQAwDQYJKoZIhvcNAQEFBQAwLjEMMAoGA1UECxMDRFRJMQswCQYD
-VQQGEwJCUjERMA8GA1UEAxMIaWRwLWNhZmUwHhcNMTQwNDA5MTYyNzU1WhcNMTkw
-NDA4MTYyNzU1WjAuMQwwCgYDVQQLEwNEVEkxCzAJBgNVBAYTAkJSMREwDwYDVQQD
-EwhpZHAtY2FmZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAM2QLiQp
-v/NepaRdzlGTeoyC//4t4vPsByuVLTF9BJ9zXfpgb70bFt5Ka4FXaYEafGC76n8H
-uCzk/nWrzEKuNMZMPgQbteCpvhrGm8RziPF7zelZl2Q4FDAORAOQwfw/GIyadsmY
-38BYCGQmuppiCAL5SUvGBHvEPyGwJnLBqnE/f1e66ZXfLvniYqRjKvU1VSsUUF5Y
-BrVE/LqUB6OA7uJEKTtp6uCx8XNUNYGML6hHR9joDZrQuK4wYOocjdWuWn0/1/uw
-hvb8sOYiTgAPap4UtTxTqVZ6XBRWmWVP9fTEjpSNEgeaWBvNpmJx+Ci9Hi5+F0zq
-GZMyVBZZAXsBBj0CAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAl6toGY7toL1HPVtj
-pjGi7ed76phnITf4cHJi6Ny99tsCK29pdkWKGQ4p1F8usGy8QoWCBBLTAo/LhZye
-/AzLnW+zUV9qioGw+guncG8/GCg8SM2FR2nwUt2BXsXUodHg2kl8S8I7NbXcw9p1
-oI8OT1fkM3RcJ5F4XBErp9PI9KK5zaLGYjDgCOm4m09GmIuPbzlIBlx77B8+WZXA
-CX6Zy+sNmrpOzcg/UDotLp5yCOWlJQkcNH4U4gqCMiwbpys3zMLPjKcH+N2th9MB
-DqEeFHCPJJZZTT+MFcUMt4fMrYZ2EKfNZnLbO0cvTEmLXDTxEVU/m9n41DGtxSF0
-NMSiiw==
-                    
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-cafe.ifrr.edu.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-cafe.ifrr.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">IFRR - Instituto Federal de Roraima</OrganizationName>
-    <OrganizationName xml:lang="pt-br">IFRR - Instituto Federal de Roraima</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">IFRR - Instituto Federal de Roraima</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="pt-br">IFRR - Instituto Federal de Roraima</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.ifrr.edu.br</OrganizationURL>
-    <OrganizationURL xml:lang="pt-br">http://www.ifrr.edu.br</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Francisco Cavalcante Filho</SurName>
-    <EmailAddress>francisco.filho@ifrr.edu.br</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp-cafe.unir.br-idp-shibboleth.xml b/swamid-interfederations-2.0/idp-cafe.unir.br-idp-shibboleth.xml
deleted file mode 100644
index b5b2c5ca..00000000
--- a/swamid-interfederations-2.0/idp-cafe.unir.br-idp-shibboleth.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://idp-cafe.unir.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">unir.br</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">UNIR - Universidade Federal de Rondonia</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="pt-br">UNIR - Universidade Federal de Rondonia</mdui:DisplayName>
-        <mdui:Description xml:lang="en">UNIR - Universidade Federal de Rondonia</mdui:Description>
-        <mdui:Description xml:lang="pt-br">UNIR - Universidade Federal de Rondonia</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.unir.br/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="pt-br">http://www.unir.br/</mdui:InformationURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-    MIIEKDCCAxACAQAwDQYJKoZIhvcNAQEFBQAwgdkxMTAvBgNVBAoUKFVOSVIgLSBV
-bml2ZXJzaWRhZGUgRmVkZXJhbCBkZSBSb25kw7RuaWExNjA0BgNVBAsULURUSSAt
-IERpcmV0b3JpYSBkZSBUZWNub2xvZ2lhIGRhIEluZm9ybWHDp8OjbzEaMBgGCSqG
-SIb3DQEJARYLZHRpQHVuaXIuYnIxFDASBgNVBAcTC1BvcnRvIFZlbGhvMRIwEAYD
-VQQIFAlSb25kw7RuaWExCzAJBgNVBAYTAkJSMRkwFwYDVQQDExBpZHAtY2FmZS51
-bmlyLmJyMB4XDTE0MDgyMDEyMDgxOFoXDTE3MDgxOTEyMDgxOFowgdkxMTAvBgNV
-BAoUKFVOSVIgLSBVbml2ZXJzaWRhZGUgRmVkZXJhbCBkZSBSb25kw7RuaWExNjA0
-BgNVBAsULURUSSAtIERpcmV0b3JpYSBkZSBUZWNub2xvZ2lhIGRhIEluZm9ybWHD
-p8OjbzEaMBgGCSqGSIb3DQEJARYLZHRpQHVuaXIuYnIxFDASBgNVBAcTC1BvcnRv
-IFZlbGhvMRIwEAYDVQQIFAlSb25kw7RuaWExCzAJBgNVBAYTAkJSMRkwFwYDVQQD
-ExBpZHAtY2FmZS51bmlyLmJyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
-AQEAsm9YPz01gnftklbFm5tNLpQHVXbLIlku3xGMIxL+8HNJaFV30ZNme68r/Pq9
-Ja10EPKSogvdIY5TPI52OC5rEH7hGMpUKkogcv2Yhq2rIrjZaOf8fML5hyW0/DYm
-jaLiWrpXgmesepXu4TfwxiZ/aJTjXYQhO2LFkP+/ybj5ANuuFj6kk6z98x+zUn/X
-/xHPrS+sXz+NRusK/EMi2y7PJ1d0l2V4t4Zr/T1EQqQJOR1DvKmcKgZ84I6WPk9M
-o1o/m/OOyCuz1q1+TESJ9nuyAOK19Vch7Qh1lIt/kTrM2Ac/Gi9XAuhCLeDbUTxG
-sWdppd2oOgnVcbKNSzvuEuCD0QIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQB3QvGv
-7r93VG+qdmZFkw+6mtkJ6m9dEDmzVf4rzR1Pyra/CmLYQ1S31aVqNXf1IVr+egFV
-DWoxNX1BIHK9lZpcZugnl3i4FQ/fwl7RFwVrYri7cJx4XUL3pT+PVQk8XkarnJ6q
-WhISOtn2v/OKrrVgiwcNcUqdX9kn6YJK+PQWDE7y3lul+0L1SbJQGL8VkQ3zJnnD
-3zPFjycxg3Gu4KLvWlq7ZCkxsw7+DBjGXlXCs2JR188YRl6Oz+LKMkKIucnTQGB9
-/GOiJLIQ0IwVq5i5OTyUaEvXEiDopznRsqPTwbdgFFl9qS8Ilf+nCgmy/E+CBv93
-S/VP03ihbZgT9/Pt
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-cafe.unir.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-cafe.unir.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://idp-cafe.unir.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-cafe.unir.br/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp-cafe.unir.br/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-cafe.unir.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">unir.br</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-      
-MIIEKDCCAxACAQAwDQYJKoZIhvcNAQEFBQAwgdkxMTAvBgNVBAoUKFVOSVIgLSBV
-bml2ZXJzaWRhZGUgRmVkZXJhbCBkZSBSb25kw7RuaWExNjA0BgNVBAsULURUSSAt
-IERpcmV0b3JpYSBkZSBUZWNub2xvZ2lhIGRhIEluZm9ybWHDp8OjbzEaMBgGCSqG
-SIb3DQEJARYLZHRpQHVuaXIuYnIxFDASBgNVBAcTC1BvcnRvIFZlbGhvMRIwEAYD
-VQQIFAlSb25kw7RuaWExCzAJBgNVBAYTAkJSMRkwFwYDVQQDExBpZHAtY2FmZS51
-bmlyLmJyMB4XDTE0MDgyMDEyMDgxOFoXDTE3MDgxOTEyMDgxOFowgdkxMTAvBgNV
-BAoUKFVOSVIgLSBVbml2ZXJzaWRhZGUgRmVkZXJhbCBkZSBSb25kw7RuaWExNjA0
-BgNVBAsULURUSSAtIERpcmV0b3JpYSBkZSBUZWNub2xvZ2lhIGRhIEluZm9ybWHD
-p8OjbzEaMBgGCSqGSIb3DQEJARYLZHRpQHVuaXIuYnIxFDASBgNVBAcTC1BvcnRv
-IFZlbGhvMRIwEAYDVQQIFAlSb25kw7RuaWExCzAJBgNVBAYTAkJSMRkwFwYDVQQD
-ExBpZHAtY2FmZS51bmlyLmJyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
-AQEAsm9YPz01gnftklbFm5tNLpQHVXbLIlku3xGMIxL+8HNJaFV30ZNme68r/Pq9
-Ja10EPKSogvdIY5TPI52OC5rEH7hGMpUKkogcv2Yhq2rIrjZaOf8fML5hyW0/DYm
-jaLiWrpXgmesepXu4TfwxiZ/aJTjXYQhO2LFkP+/ybj5ANuuFj6kk6z98x+zUn/X
-/xHPrS+sXz+NRusK/EMi2y7PJ1d0l2V4t4Zr/T1EQqQJOR1DvKmcKgZ84I6WPk9M
-o1o/m/OOyCuz1q1+TESJ9nuyAOK19Vch7Qh1lIt/kTrM2Ac/Gi9XAuhCLeDbUTxG
-sWdppd2oOgnVcbKNSzvuEuCD0QIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQB3QvGv
-7r93VG+qdmZFkw+6mtkJ6m9dEDmzVf4rzR1Pyra/CmLYQ1S31aVqNXf1IVr+egFV
-DWoxNX1BIHK9lZpcZugnl3i4FQ/fwl7RFwVrYri7cJx4XUL3pT+PVQk8XkarnJ6q
-WhISOtn2v/OKrrVgiwcNcUqdX9kn6YJK+PQWDE7y3lul+0L1SbJQGL8VkQ3zJnnD
-3zPFjycxg3Gu4KLvWlq7ZCkxsw7+DBjGXlXCs2JR188YRl6Oz+LKMkKIucnTQGB9
-/GOiJLIQ0IwVq5i5OTyUaEvXEiDopznRsqPTwbdgFFl9qS8Ilf+nCgmy/E+CBv93
-S/VP03ihbZgT9/Pt
-                  
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-cafe.unir.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-cafe.unir.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">UNIR - Universidade Federal de Rondonia</OrganizationName>
-    <OrganizationName xml:lang="pt-br">UNIR - Universidade Federal de Rondonia</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">UNIR - Universidade Federal de Rondonia</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="pt-br">UNIR - Universidade Federal de Rondonia</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.unir.br/</OrganizationURL>
-    <OrganizationURL xml:lang="pt-br">http://www.unir.br/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Fabio Leite Dias</SurName>
-    <EmailAddress>fabioleite@unir.br</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp-cafe.unir.br.xml b/swamid-interfederations-2.0/idp-cafe.unir.br.xml
deleted file mode 100644
index b5b2c5ca..00000000
--- a/swamid-interfederations-2.0/idp-cafe.unir.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://idp-cafe.unir.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">unir.br</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">UNIR - Universidade Federal de Rondonia</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="pt-br">UNIR - Universidade Federal de Rondonia</mdui:DisplayName>
-        <mdui:Description xml:lang="en">UNIR - Universidade Federal de Rondonia</mdui:Description>
-        <mdui:Description xml:lang="pt-br">UNIR - Universidade Federal de Rondonia</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.unir.br/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="pt-br">http://www.unir.br/</mdui:InformationURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-    MIIEKDCCAxACAQAwDQYJKoZIhvcNAQEFBQAwgdkxMTAvBgNVBAoUKFVOSVIgLSBV
-bml2ZXJzaWRhZGUgRmVkZXJhbCBkZSBSb25kw7RuaWExNjA0BgNVBAsULURUSSAt
-IERpcmV0b3JpYSBkZSBUZWNub2xvZ2lhIGRhIEluZm9ybWHDp8OjbzEaMBgGCSqG
-SIb3DQEJARYLZHRpQHVuaXIuYnIxFDASBgNVBAcTC1BvcnRvIFZlbGhvMRIwEAYD
-VQQIFAlSb25kw7RuaWExCzAJBgNVBAYTAkJSMRkwFwYDVQQDExBpZHAtY2FmZS51
-bmlyLmJyMB4XDTE0MDgyMDEyMDgxOFoXDTE3MDgxOTEyMDgxOFowgdkxMTAvBgNV
-BAoUKFVOSVIgLSBVbml2ZXJzaWRhZGUgRmVkZXJhbCBkZSBSb25kw7RuaWExNjA0
-BgNVBAsULURUSSAtIERpcmV0b3JpYSBkZSBUZWNub2xvZ2lhIGRhIEluZm9ybWHD
-p8OjbzEaMBgGCSqGSIb3DQEJARYLZHRpQHVuaXIuYnIxFDASBgNVBAcTC1BvcnRv
-IFZlbGhvMRIwEAYDVQQIFAlSb25kw7RuaWExCzAJBgNVBAYTAkJSMRkwFwYDVQQD
-ExBpZHAtY2FmZS51bmlyLmJyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
-AQEAsm9YPz01gnftklbFm5tNLpQHVXbLIlku3xGMIxL+8HNJaFV30ZNme68r/Pq9
-Ja10EPKSogvdIY5TPI52OC5rEH7hGMpUKkogcv2Yhq2rIrjZaOf8fML5hyW0/DYm
-jaLiWrpXgmesepXu4TfwxiZ/aJTjXYQhO2LFkP+/ybj5ANuuFj6kk6z98x+zUn/X
-/xHPrS+sXz+NRusK/EMi2y7PJ1d0l2V4t4Zr/T1EQqQJOR1DvKmcKgZ84I6WPk9M
-o1o/m/OOyCuz1q1+TESJ9nuyAOK19Vch7Qh1lIt/kTrM2Ac/Gi9XAuhCLeDbUTxG
-sWdppd2oOgnVcbKNSzvuEuCD0QIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQB3QvGv
-7r93VG+qdmZFkw+6mtkJ6m9dEDmzVf4rzR1Pyra/CmLYQ1S31aVqNXf1IVr+egFV
-DWoxNX1BIHK9lZpcZugnl3i4FQ/fwl7RFwVrYri7cJx4XUL3pT+PVQk8XkarnJ6q
-WhISOtn2v/OKrrVgiwcNcUqdX9kn6YJK+PQWDE7y3lul+0L1SbJQGL8VkQ3zJnnD
-3zPFjycxg3Gu4KLvWlq7ZCkxsw7+DBjGXlXCs2JR188YRl6Oz+LKMkKIucnTQGB9
-/GOiJLIQ0IwVq5i5OTyUaEvXEiDopznRsqPTwbdgFFl9qS8Ilf+nCgmy/E+CBv93
-S/VP03ihbZgT9/Pt
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-cafe.unir.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-cafe.unir.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://idp-cafe.unir.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-cafe.unir.br/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp-cafe.unir.br/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-cafe.unir.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">unir.br</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-      
-MIIEKDCCAxACAQAwDQYJKoZIhvcNAQEFBQAwgdkxMTAvBgNVBAoUKFVOSVIgLSBV
-bml2ZXJzaWRhZGUgRmVkZXJhbCBkZSBSb25kw7RuaWExNjA0BgNVBAsULURUSSAt
-IERpcmV0b3JpYSBkZSBUZWNub2xvZ2lhIGRhIEluZm9ybWHDp8OjbzEaMBgGCSqG
-SIb3DQEJARYLZHRpQHVuaXIuYnIxFDASBgNVBAcTC1BvcnRvIFZlbGhvMRIwEAYD
-VQQIFAlSb25kw7RuaWExCzAJBgNVBAYTAkJSMRkwFwYDVQQDExBpZHAtY2FmZS51
-bmlyLmJyMB4XDTE0MDgyMDEyMDgxOFoXDTE3MDgxOTEyMDgxOFowgdkxMTAvBgNV
-BAoUKFVOSVIgLSBVbml2ZXJzaWRhZGUgRmVkZXJhbCBkZSBSb25kw7RuaWExNjA0
-BgNVBAsULURUSSAtIERpcmV0b3JpYSBkZSBUZWNub2xvZ2lhIGRhIEluZm9ybWHD
-p8OjbzEaMBgGCSqGSIb3DQEJARYLZHRpQHVuaXIuYnIxFDASBgNVBAcTC1BvcnRv
-IFZlbGhvMRIwEAYDVQQIFAlSb25kw7RuaWExCzAJBgNVBAYTAkJSMRkwFwYDVQQD
-ExBpZHAtY2FmZS51bmlyLmJyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
-AQEAsm9YPz01gnftklbFm5tNLpQHVXbLIlku3xGMIxL+8HNJaFV30ZNme68r/Pq9
-Ja10EPKSogvdIY5TPI52OC5rEH7hGMpUKkogcv2Yhq2rIrjZaOf8fML5hyW0/DYm
-jaLiWrpXgmesepXu4TfwxiZ/aJTjXYQhO2LFkP+/ybj5ANuuFj6kk6z98x+zUn/X
-/xHPrS+sXz+NRusK/EMi2y7PJ1d0l2V4t4Zr/T1EQqQJOR1DvKmcKgZ84I6WPk9M
-o1o/m/OOyCuz1q1+TESJ9nuyAOK19Vch7Qh1lIt/kTrM2Ac/Gi9XAuhCLeDbUTxG
-sWdppd2oOgnVcbKNSzvuEuCD0QIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQB3QvGv
-7r93VG+qdmZFkw+6mtkJ6m9dEDmzVf4rzR1Pyra/CmLYQ1S31aVqNXf1IVr+egFV
-DWoxNX1BIHK9lZpcZugnl3i4FQ/fwl7RFwVrYri7cJx4XUL3pT+PVQk8XkarnJ6q
-WhISOtn2v/OKrrVgiwcNcUqdX9kn6YJK+PQWDE7y3lul+0L1SbJQGL8VkQ3zJnnD
-3zPFjycxg3Gu4KLvWlq7ZCkxsw7+DBjGXlXCs2JR188YRl6Oz+LKMkKIucnTQGB9
-/GOiJLIQ0IwVq5i5OTyUaEvXEiDopznRsqPTwbdgFFl9qS8Ilf+nCgmy/E+CBv93
-S/VP03ihbZgT9/Pt
-                  
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-cafe.unir.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-cafe.unir.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">UNIR - Universidade Federal de Rondonia</OrganizationName>
-    <OrganizationName xml:lang="pt-br">UNIR - Universidade Federal de Rondonia</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">UNIR - Universidade Federal de Rondonia</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="pt-br">UNIR - Universidade Federal de Rondonia</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.unir.br/</OrganizationURL>
-    <OrganizationURL xml:lang="pt-br">http://www.unir.br/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Fabio Leite Dias</SurName>
-    <EmailAddress>fabioleite@unir.br</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp-css.irccs.garr.it-idp-shibboleth.xml b/swamid-interfederations-2.0/idp-css.irccs.garr.it-idp-shibboleth.xml
deleted file mode 100644
index 32185c29..00000000
--- a/swamid-interfederations-2.0/idp-css.irccs.garr.it-idp-shibboleth.xml
+++ /dev/null
@@ -1,106 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" entityID="https://idp-css.irccs.garr.it/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2014-03-12T12:15:29Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</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">operapadrepio.it</shibmd:Scope>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="en">IRCCS Casa Sollievo della Sofferenza Research Hospital</mdui:DisplayName>
-        <mdui:Description xml:lang="it">Identity Provider di IRCCS Casa Sollievo della Sofferenza</mdui:Description>
-        <mdui:Description xml:lang="en">Identity Provider of IRCCS Casa Sollievo della Sofferenza Research Hospital</mdui:Description>
-        <mdui:InformationURL xml:lang="it">http://www.operapadrepio.it/it/ricerca-scientifica/news-ricerca-scientifica/97-news-ricerca-scientifica/3719.html</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">http://www.operapadrepio.it/it/ricerca-scientifica/news-ricerca-scientifica/109-generali/3759.html</mdui:InformationURL>
-        <mdui:Logo height="60" width="80" xml:lang="it">https://idp-css.irccs.garr.it/idp/images/logoEnte-160x120_it.png</mdui:Logo>
-        <mdui:Logo height="16" width="16" xml:lang="it">https://idp-css.irccs.garr.it/idp/images/logoEnte-32x32_it.png</mdui:Logo>
-        <mdui:Logo height="60" width="80" xml:lang="en">https://idp-css.irccs.garr.it/idp/images/logoEnte-160x120_en.png</mdui:Logo>
-        <mdui:Logo height="16" width="16" xml:lang="en">https://idp-css.irccs.garr.it/idp/images/logoEnte-32x32_en.png</mdui:Logo>
-        <mdui:PrivacyStatementURL xml:lang="it">http://www.operapadrepio.it/it/privacy-policy.html</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="en">http://www.operapadrepio.it/en/109-generali/3760.html</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDPzCCAiegAwIBAgIUatdmXg8WrEt1In2rF4jLwoE2ExUwDQYJKoZIhvcNAQEF
-BQAwIDEeMBwGA1UEAxMVaWRwLWNzcy5pcmNjcy5nYXJyLml0MB4XDTEzMTIwOTEz
-NDYyMVoXDTMzMTIwOTEzNDYyMVowIDEeMBwGA1UEAxMVaWRwLWNzcy5pcmNjcy5n
-YXJyLml0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA3VFhN4BK8bGv
-OpfsmnkMKK1K64/Ref079D7hERL/AnLWBH3xTR8cXdYmm0zqUIHL224b6WQAa1kx
-1jCrBseoyK/D16PwzmuKaZBtvnXq4hdEonm8jXT4mJnRJpkJtlsBzqxi5c0KdXiC
-ijcHBlgqLDR8wZOBJV1tIN8VyEPkiFtm7W1oabFSzJRBfWgQ40Ku4qvRmcSbcYke
-8DbcRQS1HULWC4Erxx6hR9I9epkWc2ubd4MiYH2HMlrV35IJR2AcoP753rJ+HpLb
-3kr3//8eOEaK0pD52RuRQbo7tYOwS0aINmnEmKrJt18udKmb45XN3Ntw0j+u0peV
-Latd8xQt6wIDAQABo3EwbzBOBgNVHREERzBFghVpZHAtY3NzLmlyY2NzLmdhcnIu
-aXSGLGh0dHBzOi8vaWRwLWNzcy5pcmNjcy5nYXJyLml0L2lkcC9zaGliYm9sZXRo
-MB0GA1UdDgQWBBT/nCGumeHDpDhV5xEzXsEzK3YdFDANBgkqhkiG9w0BAQUFAAOC
-AQEAQrLhSycAVaJvvN4rIhxlZhYMi24tJIG27nMqg5aCnUbwsH97g4fyRC/PJrAU
-yLsvni9innZWp9btFrpZUXSVZTvVB2Kk+Q670m7VKEkPkOyXaWI22M3OeLNQAHs6
-wshwq6xuRHQV9Al7Ksa3VRYO6xXOGa0L7anouGijzpatNQa7FXlHvriVrWI8MJAf
-f85zy1/DrY7aUkXNokxppZUuH70Fu+znNoV9+Yhis8SAETCkWgUjBgqXJgL91/U8
-YPWByb6q+2Zn18fmie++zEPRItO9JpXGetGuOGEAHHnaQoxNn0UgXTqvwxngVDWY
-PeaxmS3Lw5E/7cnXkOo1qLnfhg==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-css.irccs.garr.it:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-css.irccs.garr.it: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-css.irccs.garr.it/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-css.irccs.garr.it/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp-css.irccs.garr.it/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-css.irccs.garr.it/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">operapadrepio.it</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDPzCCAiegAwIBAgIUatdmXg8WrEt1In2rF4jLwoE2ExUwDQYJKoZIhvcNAQEF
-BQAwIDEeMBwGA1UEAxMVaWRwLWNzcy5pcmNjcy5nYXJyLml0MB4XDTEzMTIwOTEz
-NDYyMVoXDTMzMTIwOTEzNDYyMVowIDEeMBwGA1UEAxMVaWRwLWNzcy5pcmNjcy5n
-YXJyLml0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA3VFhN4BK8bGv
-OpfsmnkMKK1K64/Ref079D7hERL/AnLWBH3xTR8cXdYmm0zqUIHL224b6WQAa1kx
-1jCrBseoyK/D16PwzmuKaZBtvnXq4hdEonm8jXT4mJnRJpkJtlsBzqxi5c0KdXiC
-ijcHBlgqLDR8wZOBJV1tIN8VyEPkiFtm7W1oabFSzJRBfWgQ40Ku4qvRmcSbcYke
-8DbcRQS1HULWC4Erxx6hR9I9epkWc2ubd4MiYH2HMlrV35IJR2AcoP753rJ+HpLb
-3kr3//8eOEaK0pD52RuRQbo7tYOwS0aINmnEmKrJt18udKmb45XN3Ntw0j+u0peV
-Latd8xQt6wIDAQABo3EwbzBOBgNVHREERzBFghVpZHAtY3NzLmlyY2NzLmdhcnIu
-aXSGLGh0dHBzOi8vaWRwLWNzcy5pcmNjcy5nYXJyLml0L2lkcC9zaGliYm9sZXRo
-MB0GA1UdDgQWBBT/nCGumeHDpDhV5xEzXsEzK3YdFDANBgkqhkiG9w0BAQUFAAOC
-AQEAQrLhSycAVaJvvN4rIhxlZhYMi24tJIG27nMqg5aCnUbwsH97g4fyRC/PJrAU
-yLsvni9innZWp9btFrpZUXSVZTvVB2Kk+Q670m7VKEkPkOyXaWI22M3OeLNQAHs6
-wshwq6xuRHQV9Al7Ksa3VRYO6xXOGa0L7anouGijzpatNQa7FXlHvriVrWI8MJAf
-f85zy1/DrY7aUkXNokxppZUuH70Fu+znNoV9+Yhis8SAETCkWgUjBgqXJgL91/U8
-YPWByb6q+2Zn18fmie++zEPRItO9JpXGetGuOGEAHHnaQoxNn0UgXTqvwxngVDWY
-PeaxmS3Lw5E/7cnXkOo1qLnfhg==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-css.irccs.garr.it:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-css.irccs.garr.it: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">IRCCS Casa Sollievo della Sofferenza Research Hospital</OrganizationName>
-    <OrganizationName xml:lang="it">IRCCS Casa Sollievo della Sofferenza</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">IRCCS Casa Sollievo della Sofferenza Research Hospital</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="it">IRCCS Casa Sollievo della Sofferenza</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.operapadrepio.it</OrganizationURL>
-    <OrganizationURL xml:lang="it">http://www.operapadrepio.it</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <EmailAddress>idpcloud-service@garr.it</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp-css.irccs.garr.it.xml b/swamid-interfederations-2.0/idp-css.irccs.garr.it.xml
deleted file mode 100644
index 32185c29..00000000
--- a/swamid-interfederations-2.0/idp-css.irccs.garr.it.xml
+++ /dev/null
@@ -1,106 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" entityID="https://idp-css.irccs.garr.it/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2014-03-12T12:15:29Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</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">operapadrepio.it</shibmd:Scope>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="en">IRCCS Casa Sollievo della Sofferenza Research Hospital</mdui:DisplayName>
-        <mdui:Description xml:lang="it">Identity Provider di IRCCS Casa Sollievo della Sofferenza</mdui:Description>
-        <mdui:Description xml:lang="en">Identity Provider of IRCCS Casa Sollievo della Sofferenza Research Hospital</mdui:Description>
-        <mdui:InformationURL xml:lang="it">http://www.operapadrepio.it/it/ricerca-scientifica/news-ricerca-scientifica/97-news-ricerca-scientifica/3719.html</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">http://www.operapadrepio.it/it/ricerca-scientifica/news-ricerca-scientifica/109-generali/3759.html</mdui:InformationURL>
-        <mdui:Logo height="60" width="80" xml:lang="it">https://idp-css.irccs.garr.it/idp/images/logoEnte-160x120_it.png</mdui:Logo>
-        <mdui:Logo height="16" width="16" xml:lang="it">https://idp-css.irccs.garr.it/idp/images/logoEnte-32x32_it.png</mdui:Logo>
-        <mdui:Logo height="60" width="80" xml:lang="en">https://idp-css.irccs.garr.it/idp/images/logoEnte-160x120_en.png</mdui:Logo>
-        <mdui:Logo height="16" width="16" xml:lang="en">https://idp-css.irccs.garr.it/idp/images/logoEnte-32x32_en.png</mdui:Logo>
-        <mdui:PrivacyStatementURL xml:lang="it">http://www.operapadrepio.it/it/privacy-policy.html</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="en">http://www.operapadrepio.it/en/109-generali/3760.html</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDPzCCAiegAwIBAgIUatdmXg8WrEt1In2rF4jLwoE2ExUwDQYJKoZIhvcNAQEF
-BQAwIDEeMBwGA1UEAxMVaWRwLWNzcy5pcmNjcy5nYXJyLml0MB4XDTEzMTIwOTEz
-NDYyMVoXDTMzMTIwOTEzNDYyMVowIDEeMBwGA1UEAxMVaWRwLWNzcy5pcmNjcy5n
-YXJyLml0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA3VFhN4BK8bGv
-OpfsmnkMKK1K64/Ref079D7hERL/AnLWBH3xTR8cXdYmm0zqUIHL224b6WQAa1kx
-1jCrBseoyK/D16PwzmuKaZBtvnXq4hdEonm8jXT4mJnRJpkJtlsBzqxi5c0KdXiC
-ijcHBlgqLDR8wZOBJV1tIN8VyEPkiFtm7W1oabFSzJRBfWgQ40Ku4qvRmcSbcYke
-8DbcRQS1HULWC4Erxx6hR9I9epkWc2ubd4MiYH2HMlrV35IJR2AcoP753rJ+HpLb
-3kr3//8eOEaK0pD52RuRQbo7tYOwS0aINmnEmKrJt18udKmb45XN3Ntw0j+u0peV
-Latd8xQt6wIDAQABo3EwbzBOBgNVHREERzBFghVpZHAtY3NzLmlyY2NzLmdhcnIu
-aXSGLGh0dHBzOi8vaWRwLWNzcy5pcmNjcy5nYXJyLml0L2lkcC9zaGliYm9sZXRo
-MB0GA1UdDgQWBBT/nCGumeHDpDhV5xEzXsEzK3YdFDANBgkqhkiG9w0BAQUFAAOC
-AQEAQrLhSycAVaJvvN4rIhxlZhYMi24tJIG27nMqg5aCnUbwsH97g4fyRC/PJrAU
-yLsvni9innZWp9btFrpZUXSVZTvVB2Kk+Q670m7VKEkPkOyXaWI22M3OeLNQAHs6
-wshwq6xuRHQV9Al7Ksa3VRYO6xXOGa0L7anouGijzpatNQa7FXlHvriVrWI8MJAf
-f85zy1/DrY7aUkXNokxppZUuH70Fu+znNoV9+Yhis8SAETCkWgUjBgqXJgL91/U8
-YPWByb6q+2Zn18fmie++zEPRItO9JpXGetGuOGEAHHnaQoxNn0UgXTqvwxngVDWY
-PeaxmS3Lw5E/7cnXkOo1qLnfhg==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-css.irccs.garr.it:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-css.irccs.garr.it: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-css.irccs.garr.it/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-css.irccs.garr.it/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp-css.irccs.garr.it/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-css.irccs.garr.it/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">operapadrepio.it</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDPzCCAiegAwIBAgIUatdmXg8WrEt1In2rF4jLwoE2ExUwDQYJKoZIhvcNAQEF
-BQAwIDEeMBwGA1UEAxMVaWRwLWNzcy5pcmNjcy5nYXJyLml0MB4XDTEzMTIwOTEz
-NDYyMVoXDTMzMTIwOTEzNDYyMVowIDEeMBwGA1UEAxMVaWRwLWNzcy5pcmNjcy5n
-YXJyLml0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA3VFhN4BK8bGv
-OpfsmnkMKK1K64/Ref079D7hERL/AnLWBH3xTR8cXdYmm0zqUIHL224b6WQAa1kx
-1jCrBseoyK/D16PwzmuKaZBtvnXq4hdEonm8jXT4mJnRJpkJtlsBzqxi5c0KdXiC
-ijcHBlgqLDR8wZOBJV1tIN8VyEPkiFtm7W1oabFSzJRBfWgQ40Ku4qvRmcSbcYke
-8DbcRQS1HULWC4Erxx6hR9I9epkWc2ubd4MiYH2HMlrV35IJR2AcoP753rJ+HpLb
-3kr3//8eOEaK0pD52RuRQbo7tYOwS0aINmnEmKrJt18udKmb45XN3Ntw0j+u0peV
-Latd8xQt6wIDAQABo3EwbzBOBgNVHREERzBFghVpZHAtY3NzLmlyY2NzLmdhcnIu
-aXSGLGh0dHBzOi8vaWRwLWNzcy5pcmNjcy5nYXJyLml0L2lkcC9zaGliYm9sZXRo
-MB0GA1UdDgQWBBT/nCGumeHDpDhV5xEzXsEzK3YdFDANBgkqhkiG9w0BAQUFAAOC
-AQEAQrLhSycAVaJvvN4rIhxlZhYMi24tJIG27nMqg5aCnUbwsH97g4fyRC/PJrAU
-yLsvni9innZWp9btFrpZUXSVZTvVB2Kk+Q670m7VKEkPkOyXaWI22M3OeLNQAHs6
-wshwq6xuRHQV9Al7Ksa3VRYO6xXOGa0L7anouGijzpatNQa7FXlHvriVrWI8MJAf
-f85zy1/DrY7aUkXNokxppZUuH70Fu+znNoV9+Yhis8SAETCkWgUjBgqXJgL91/U8
-YPWByb6q+2Zn18fmie++zEPRItO9JpXGetGuOGEAHHnaQoxNn0UgXTqvwxngVDWY
-PeaxmS3Lw5E/7cnXkOo1qLnfhg==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-css.irccs.garr.it:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-css.irccs.garr.it: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">IRCCS Casa Sollievo della Sofferenza Research Hospital</OrganizationName>
-    <OrganizationName xml:lang="it">IRCCS Casa Sollievo della Sofferenza</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">IRCCS Casa Sollievo della Sofferenza Research Hospital</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="it">IRCCS Casa Sollievo della Sofferenza</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.operapadrepio.it</OrganizationURL>
-    <OrganizationURL xml:lang="it">http://www.operapadrepio.it</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <EmailAddress>idpcloud-service@garr.it</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp-dev.cardiff.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp-dev.cardiff.ac.uk-idp-shibboleth.xml
deleted file mode 100644
index 7d61df0b..00000000
--- a/swamid-interfederations-2.0/idp-dev.cardiff.ac.uk-idp-shibboleth.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://idp-dev.cardiff.ac.uk/idp/shibboleth">
-  <!--
-		This is a Shibboleth 2 test IdP for Cardiff University.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2007-12-20T15:18:56.122159Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol urn:mace:shibboleth:1.0">
-    <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 (Test - Dev)</mdui:DisplayName>
-        <mdui:Logo height="16" width="16">https://iam.cf.ac.uk/images/CU-Dev-logo-16x16.png</mdui:Logo>
-        <mdui:Logo height="60" width="80">https://iam.cf.ac.uk/images/CU-Dev-logo-80x60.png</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDLDCCAhSgAwIBAgIVALNT+AdUt2+81m3rncPOX7CvBavdMA0GCSqGSIb3DQEB
-						BQUAMBsxGTAXBgNVBAMTEGlkcC1kZXYuY2YuYWMudWswHhcNMTEwNjEwMTYzNjE1
-						WhcNMzEwNjEwMTYzNjE1WjAbMRkwFwYDVQQDExBpZHAtZGV2LmNmLmFjLnVrMIIB
-						IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwHK/62C9csv4UEWcGy5lo97k
-						7zXUCDf1wW5k83sn9BzqG4YJoM9G9pefXU2AHFZtEhZjgxQgbOUdG9MdOHmeeuXr
-						8/izvK6BOyFmNFgBi/h2uwjI1T86WHMJG91IQFUTWbRlDm43zAoigsscOYDJ8+Fk
-						6KZWDAngo5Ip0NlwUcKGqjdZbHeWyuLITCwgqU1aQHEg2eLzT+eC2/c+sbTy6GqO
-						5wsTLZGNNSifEPo2JzMi9WvdyklXcHj1X5cVExixeQ9cgb6VeqS6NtKRgG7PvZZU
-						REdZZAQ3yMWZeqOoWyhOteUcnlZQo3yWytLXy7vsVpMZWG6dXw90XTVuLwObTQID
-						AQABo2cwZTBEBgNVHREEPTA7ghBpZHAtZGV2LmNmLmFjLnVrhidodHRwczovL2lk
-						cC1kZXYuY2YuYWMudWsvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFMJ9mnoUnJdL
-						2PYWanl07bVy1yRbMA0GCSqGSIb3DQEBBQUAA4IBAQA0vIW7kIcy6RA+OkshiraI
-						9D8m8H3Q5ye4QgbqdiLAaMy2/pHjHKirdseOl+3XLyrzDelXtl/4DhQCHAbUPssS
-						pgZIVEk4aOVuzjbqKfUOW/Dny9cPYLTVcU/ybhGdMC1FwGikZ499qISPoyJ2zmnC
-						6WH5uvbdmmiBmbvipWBRu6/imITVjzH7hWoz5SMuSFzy68yn5C00t7L9dtI3DgXo
-						zCmMlR+TxITKeAh433Gv+ldwYr4/NRClZBPKtOg4EHun7G7FVjXfEjNYts5aUwfF
-						WlUNTYrQTmfEqypOCvR3sjkLbbv3H/li9NLbE0dCr2DkR0SaOp7mjFqiiXR7z8JT
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-dev.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-dev.cf.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-dev.cf.ac.uk/idp/profile/SAML2/Redirect/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-dev.cf.ac.uk/idp/profile/SAML2/POST/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp-dev.cf.ac.uk/idp/profile/SAML2/POST-SimpleSign/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-dev.cf.ac.uk: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-dev.cf.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-dev.cf.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp-dev.cf.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-dev.cf.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-dev.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>
-						MIIDLDCCAhSgAwIBAgIVALNT+AdUt2+81m3rncPOX7CvBavdMA0GCSqGSIb3DQEB
-						BQUAMBsxGTAXBgNVBAMTEGlkcC1kZXYuY2YuYWMudWswHhcNMTEwNjEwMTYzNjE1
-						WhcNMzEwNjEwMTYzNjE1WjAbMRkwFwYDVQQDExBpZHAtZGV2LmNmLmFjLnVrMIIB
-						IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwHK/62C9csv4UEWcGy5lo97k
-						7zXUCDf1wW5k83sn9BzqG4YJoM9G9pefXU2AHFZtEhZjgxQgbOUdG9MdOHmeeuXr
-						8/izvK6BOyFmNFgBi/h2uwjI1T86WHMJG91IQFUTWbRlDm43zAoigsscOYDJ8+Fk
-						6KZWDAngo5Ip0NlwUcKGqjdZbHeWyuLITCwgqU1aQHEg2eLzT+eC2/c+sbTy6GqO
-						5wsTLZGNNSifEPo2JzMi9WvdyklXcHj1X5cVExixeQ9cgb6VeqS6NtKRgG7PvZZU
-						REdZZAQ3yMWZeqOoWyhOteUcnlZQo3yWytLXy7vsVpMZWG6dXw90XTVuLwObTQID
-						AQABo2cwZTBEBgNVHREEPTA7ghBpZHAtZGV2LmNmLmFjLnVrhidodHRwczovL2lk
-						cC1kZXYuY2YuYWMudWsvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFMJ9mnoUnJdL
-						2PYWanl07bVy1yRbMA0GCSqGSIb3DQEBBQUAA4IBAQA0vIW7kIcy6RA+OkshiraI
-						9D8m8H3Q5ye4QgbqdiLAaMy2/pHjHKirdseOl+3XLyrzDelXtl/4DhQCHAbUPssS
-						pgZIVEk4aOVuzjbqKfUOW/Dny9cPYLTVcU/ybhGdMC1FwGikZ499qISPoyJ2zmnC
-						6WH5uvbdmmiBmbvipWBRu6/imITVjzH7hWoz5SMuSFzy68yn5C00t7L9dtI3DgXo
-						zCmMlR+TxITKeAh433Gv+ldwYr4/NRClZBPKtOg4EHun7G7FVjXfEjNYts5aUwfF
-						WlUNTYrQTmfEqypOCvR3sjkLbbv3H/li9NLbE0dCr2DkR0SaOp7mjFqiiXR7z8JT
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-dev.cf.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-dev.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 (Test - Dev)</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.cardiff.ac.uk/insrv/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Rhys</GivenName>
-    <SurName>Smith</SurName>
-    <EmailAddress>mailto:smith@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-dev.cardiff.ac.uk.xml b/swamid-interfederations-2.0/idp-dev.cardiff.ac.uk.xml
deleted file mode 100644
index 7d61df0b..00000000
--- a/swamid-interfederations-2.0/idp-dev.cardiff.ac.uk.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://idp-dev.cardiff.ac.uk/idp/shibboleth">
-  <!--
-		This is a Shibboleth 2 test IdP for Cardiff University.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2007-12-20T15:18:56.122159Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol urn:mace:shibboleth:1.0">
-    <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 (Test - Dev)</mdui:DisplayName>
-        <mdui:Logo height="16" width="16">https://iam.cf.ac.uk/images/CU-Dev-logo-16x16.png</mdui:Logo>
-        <mdui:Logo height="60" width="80">https://iam.cf.ac.uk/images/CU-Dev-logo-80x60.png</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDLDCCAhSgAwIBAgIVALNT+AdUt2+81m3rncPOX7CvBavdMA0GCSqGSIb3DQEB
-						BQUAMBsxGTAXBgNVBAMTEGlkcC1kZXYuY2YuYWMudWswHhcNMTEwNjEwMTYzNjE1
-						WhcNMzEwNjEwMTYzNjE1WjAbMRkwFwYDVQQDExBpZHAtZGV2LmNmLmFjLnVrMIIB
-						IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwHK/62C9csv4UEWcGy5lo97k
-						7zXUCDf1wW5k83sn9BzqG4YJoM9G9pefXU2AHFZtEhZjgxQgbOUdG9MdOHmeeuXr
-						8/izvK6BOyFmNFgBi/h2uwjI1T86WHMJG91IQFUTWbRlDm43zAoigsscOYDJ8+Fk
-						6KZWDAngo5Ip0NlwUcKGqjdZbHeWyuLITCwgqU1aQHEg2eLzT+eC2/c+sbTy6GqO
-						5wsTLZGNNSifEPo2JzMi9WvdyklXcHj1X5cVExixeQ9cgb6VeqS6NtKRgG7PvZZU
-						REdZZAQ3yMWZeqOoWyhOteUcnlZQo3yWytLXy7vsVpMZWG6dXw90XTVuLwObTQID
-						AQABo2cwZTBEBgNVHREEPTA7ghBpZHAtZGV2LmNmLmFjLnVrhidodHRwczovL2lk
-						cC1kZXYuY2YuYWMudWsvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFMJ9mnoUnJdL
-						2PYWanl07bVy1yRbMA0GCSqGSIb3DQEBBQUAA4IBAQA0vIW7kIcy6RA+OkshiraI
-						9D8m8H3Q5ye4QgbqdiLAaMy2/pHjHKirdseOl+3XLyrzDelXtl/4DhQCHAbUPssS
-						pgZIVEk4aOVuzjbqKfUOW/Dny9cPYLTVcU/ybhGdMC1FwGikZ499qISPoyJ2zmnC
-						6WH5uvbdmmiBmbvipWBRu6/imITVjzH7hWoz5SMuSFzy68yn5C00t7L9dtI3DgXo
-						zCmMlR+TxITKeAh433Gv+ldwYr4/NRClZBPKtOg4EHun7G7FVjXfEjNYts5aUwfF
-						WlUNTYrQTmfEqypOCvR3sjkLbbv3H/li9NLbE0dCr2DkR0SaOp7mjFqiiXR7z8JT
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-dev.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-dev.cf.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-dev.cf.ac.uk/idp/profile/SAML2/Redirect/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-dev.cf.ac.uk/idp/profile/SAML2/POST/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp-dev.cf.ac.uk/idp/profile/SAML2/POST-SimpleSign/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-dev.cf.ac.uk: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-dev.cf.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-dev.cf.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp-dev.cf.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-dev.cf.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-dev.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>
-						MIIDLDCCAhSgAwIBAgIVALNT+AdUt2+81m3rncPOX7CvBavdMA0GCSqGSIb3DQEB
-						BQUAMBsxGTAXBgNVBAMTEGlkcC1kZXYuY2YuYWMudWswHhcNMTEwNjEwMTYzNjE1
-						WhcNMzEwNjEwMTYzNjE1WjAbMRkwFwYDVQQDExBpZHAtZGV2LmNmLmFjLnVrMIIB
-						IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwHK/62C9csv4UEWcGy5lo97k
-						7zXUCDf1wW5k83sn9BzqG4YJoM9G9pefXU2AHFZtEhZjgxQgbOUdG9MdOHmeeuXr
-						8/izvK6BOyFmNFgBi/h2uwjI1T86WHMJG91IQFUTWbRlDm43zAoigsscOYDJ8+Fk
-						6KZWDAngo5Ip0NlwUcKGqjdZbHeWyuLITCwgqU1aQHEg2eLzT+eC2/c+sbTy6GqO
-						5wsTLZGNNSifEPo2JzMi9WvdyklXcHj1X5cVExixeQ9cgb6VeqS6NtKRgG7PvZZU
-						REdZZAQ3yMWZeqOoWyhOteUcnlZQo3yWytLXy7vsVpMZWG6dXw90XTVuLwObTQID
-						AQABo2cwZTBEBgNVHREEPTA7ghBpZHAtZGV2LmNmLmFjLnVrhidodHRwczovL2lk
-						cC1kZXYuY2YuYWMudWsvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFMJ9mnoUnJdL
-						2PYWanl07bVy1yRbMA0GCSqGSIb3DQEBBQUAA4IBAQA0vIW7kIcy6RA+OkshiraI
-						9D8m8H3Q5ye4QgbqdiLAaMy2/pHjHKirdseOl+3XLyrzDelXtl/4DhQCHAbUPssS
-						pgZIVEk4aOVuzjbqKfUOW/Dny9cPYLTVcU/ybhGdMC1FwGikZ499qISPoyJ2zmnC
-						6WH5uvbdmmiBmbvipWBRu6/imITVjzH7hWoz5SMuSFzy68yn5C00t7L9dtI3DgXo
-						zCmMlR+TxITKeAh433Gv+ldwYr4/NRClZBPKtOg4EHun7G7FVjXfEjNYts5aUwfF
-						WlUNTYrQTmfEqypOCvR3sjkLbbv3H/li9NLbE0dCr2DkR0SaOp7mjFqiiXR7z8JT
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-dev.cf.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-dev.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 (Test - Dev)</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.cardiff.ac.uk/insrv/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Rhys</GivenName>
-    <SurName>Smith</SurName>
-    <EmailAddress>mailto:smith@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-dgnocchi.irccs.garr.it-idp-shibboleth.xml b/swamid-interfederations-2.0/idp-dgnocchi.irccs.garr.it-idp-shibboleth.xml
deleted file mode 100644
index 0c26fbe2..00000000
--- a/swamid-interfederations-2.0/idp-dgnocchi.irccs.garr.it-idp-shibboleth.xml
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" entityID="https://idp-dgnocchi.irccs.garr.it/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2014-03-12T12:15:14Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</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">dongnocchi.it</shibmd:Scope>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="en">IRCCS Fondazione Don Carlo Gnocchi Onlus</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="it">IRCCS Fondazione Don Carlo Gnocchi Onlus</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Identity provider for Fondazione Don Carlo Gnocchi Onlus users</mdui:Description>
-        <mdui:Description xml:lang="it">Identity provider per gli utenti della Fondazione Don Carlo Gnocchi Onlus</mdui:Description>
-        <mdui:InformationURL xml:lang="en">https://idp-dgnocchi.irccs.garr.it/idp/info.html</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="it">https://idp-dgnocchi.irccs.garr.it/idp/info.html</mdui:InformationURL>
-        <mdui:Logo height="16" width="16" xml:lang="en">https://idp-dgnocchi.irccs.garr.it/idp/images/logoEnte-32x32_en.png</mdui:Logo>
-        <mdui:Logo height="16" width="16" xml:lang="it">https://idp-dgnocchi.irccs.garr.it/idp/images/logoEnte-32x32_it.png</mdui:Logo>
-        <mdui:Logo height="60" width="80" xml:lang="en">https://idp-dgnocchi.irccs.garr.it/idp/images/logoEnte-160x120_en.png</mdui:Logo>
-        <mdui:Logo height="60" width="80" xml:lang="it">https://idp-dgnocchi.irccs.garr.it/idp/images/logoEnte-160x120_it.png</mdui:Logo>
-        <mdui:PrivacyStatementURL xml:lang="en">https://idp-dgnocchi.irccs.garr.it/idp/privacy.html</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="it">https://idp-dgnocchi.irccs.garr.it/idp/privacy.html</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDUzCCAjugAwIBAgIUP1k5hfSRuNvbFEuq697H3+caJKQwDQYJKoZIhvcNAQEF
-BQAwJTEjMCEGA1UEAxMaaWRwLWRnbm9jY2hpLmlyY2NzLmdhcnIuaXQwHhcNMTMx
-MTI4MTQ0NTI3WhcNMzMxMTI4MTQ0NTI3WjAlMSMwIQYDVQQDExppZHAtZGdub2Nj
-aGkuaXJjY3MuZ2Fyci5pdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
-AJcayGTp5Elhk5nXeuntBEg2r0Le/6nIsQG8FgkNf+qggXSHNVWxhFvw3EblGttY
-9jISmSjGdUwNpGknPPEXdZ3w/RO+czI3zZmMNUxIvF+RBOv45FQRd6JpMojAOBjZ
-blIJ9uxIZl9CTc7AytutChk/JS0uME0bZnCdIxitsMraRITSiUqZw9FDlghcbAPU
-66+EIqmAas0pNzHIgICsTQFpVpR7aOCrGDgLH8ZhnE895Bte5hdTbDwEBVFYZ4NE
-oMGUwgRhly0g9EAh04ercObE4NZLuF9XIrw6L5bUoOAn7AXCiIfGcUHukEt2NbSi
-zwOfrKyshMvwQeUu1QXdr2sCAwEAAaN7MHkwWAYDVR0RBFEwT4IaaWRwLWRnbm9j
-Y2hpLmlyY2NzLmdhcnIuaXSGMWh0dHBzOi8vaWRwLWRnbm9jY2hpLmlyY2NzLmdh
-cnIuaXQvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFMfsRTXhI2SK/tSeRLeojBMD
-y034MA0GCSqGSIb3DQEBBQUAA4IBAQBZTmIO9IWCOi8wbPcBpgyZYhwn39CfeBJp
-qf4NhXa9ZO6IC+qMG3+dZGlg0FkqTkbArc7tTATUL0b7p1zWXsH8GgtyigKjzdKB
-6mKwtYErqp0gF4438G8XpXsolrjF/RyCrxj7aXDzIKktk2cXKVqF9xtMc5H1AAkq
-hnyOXvP4oteo+j+aww+rS4ITijKAXLhgFoNbGIfN3zTfTywBKU46+ZAuuzbLyNa/
-fKX+hJtcp9X9ctp8azb3HudIHe+5YSDOKWYPAgEdXDTlBXdd0/9zrEp1UIZ3jx6I
-MJX+TT5lOVFqu29vcvoiXmH3XIAZi7JIvcAt3STJGs7wZFJzrTrx
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-dgnocchi.irccs.garr.it:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-dgnocchi.irccs.garr.it: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-dgnocchi.irccs.garr.it/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-dgnocchi.irccs.garr.it/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp-dgnocchi.irccs.garr.it/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-dgnocchi.irccs.garr.it/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">dongnocchi.it</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDUzCCAjugAwIBAgIUP1k5hfSRuNvbFEuq697H3+caJKQwDQYJKoZIhvcNAQEF
-BQAwJTEjMCEGA1UEAxMaaWRwLWRnbm9jY2hpLmlyY2NzLmdhcnIuaXQwHhcNMTMx
-MTI4MTQ0NTI3WhcNMzMxMTI4MTQ0NTI3WjAlMSMwIQYDVQQDExppZHAtZGdub2Nj
-aGkuaXJjY3MuZ2Fyci5pdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
-AJcayGTp5Elhk5nXeuntBEg2r0Le/6nIsQG8FgkNf+qggXSHNVWxhFvw3EblGttY
-9jISmSjGdUwNpGknPPEXdZ3w/RO+czI3zZmMNUxIvF+RBOv45FQRd6JpMojAOBjZ
-blIJ9uxIZl9CTc7AytutChk/JS0uME0bZnCdIxitsMraRITSiUqZw9FDlghcbAPU
-66+EIqmAas0pNzHIgICsTQFpVpR7aOCrGDgLH8ZhnE895Bte5hdTbDwEBVFYZ4NE
-oMGUwgRhly0g9EAh04ercObE4NZLuF9XIrw6L5bUoOAn7AXCiIfGcUHukEt2NbSi
-zwOfrKyshMvwQeUu1QXdr2sCAwEAAaN7MHkwWAYDVR0RBFEwT4IaaWRwLWRnbm9j
-Y2hpLmlyY2NzLmdhcnIuaXSGMWh0dHBzOi8vaWRwLWRnbm9jY2hpLmlyY2NzLmdh
-cnIuaXQvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFMfsRTXhI2SK/tSeRLeojBMD
-y034MA0GCSqGSIb3DQEBBQUAA4IBAQBZTmIO9IWCOi8wbPcBpgyZYhwn39CfeBJp
-qf4NhXa9ZO6IC+qMG3+dZGlg0FkqTkbArc7tTATUL0b7p1zWXsH8GgtyigKjzdKB
-6mKwtYErqp0gF4438G8XpXsolrjF/RyCrxj7aXDzIKktk2cXKVqF9xtMc5H1AAkq
-hnyOXvP4oteo+j+aww+rS4ITijKAXLhgFoNbGIfN3zTfTywBKU46+ZAuuzbLyNa/
-fKX+hJtcp9X9ctp8azb3HudIHe+5YSDOKWYPAgEdXDTlBXdd0/9zrEp1UIZ3jx6I
-MJX+TT5lOVFqu29vcvoiXmH3XIAZi7JIvcAt3STJGs7wZFJzrTrx
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-dgnocchi.irccs.garr.it:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-dgnocchi.irccs.garr.it: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">IRCCS Fondazione Don Carlo Gnocchi Onlus</OrganizationName>
-    <OrganizationName xml:lang="it">IRCCS Fondazione Don Carlo Gnocchi Onlus</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">IRCCS Fondazione Don Carlo Gnocchi Onlus</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="it">IRCCS Fondazione Don Carlo Gnocchi Onlus</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.dongnocchi.it/documenti/eng/index_eng.htm</OrganizationURL>
-    <OrganizationURL xml:lang="it">http://www.dongnocchi.it</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <EmailAddress>mailto:idpcloud-service@garr.it</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp-dgnocchi.irccs.garr.it.xml b/swamid-interfederations-2.0/idp-dgnocchi.irccs.garr.it.xml
deleted file mode 100644
index 0c26fbe2..00000000
--- a/swamid-interfederations-2.0/idp-dgnocchi.irccs.garr.it.xml
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" entityID="https://idp-dgnocchi.irccs.garr.it/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2014-03-12T12:15:14Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</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">dongnocchi.it</shibmd:Scope>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="en">IRCCS Fondazione Don Carlo Gnocchi Onlus</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="it">IRCCS Fondazione Don Carlo Gnocchi Onlus</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Identity provider for Fondazione Don Carlo Gnocchi Onlus users</mdui:Description>
-        <mdui:Description xml:lang="it">Identity provider per gli utenti della Fondazione Don Carlo Gnocchi Onlus</mdui:Description>
-        <mdui:InformationURL xml:lang="en">https://idp-dgnocchi.irccs.garr.it/idp/info.html</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="it">https://idp-dgnocchi.irccs.garr.it/idp/info.html</mdui:InformationURL>
-        <mdui:Logo height="16" width="16" xml:lang="en">https://idp-dgnocchi.irccs.garr.it/idp/images/logoEnte-32x32_en.png</mdui:Logo>
-        <mdui:Logo height="16" width="16" xml:lang="it">https://idp-dgnocchi.irccs.garr.it/idp/images/logoEnte-32x32_it.png</mdui:Logo>
-        <mdui:Logo height="60" width="80" xml:lang="en">https://idp-dgnocchi.irccs.garr.it/idp/images/logoEnte-160x120_en.png</mdui:Logo>
-        <mdui:Logo height="60" width="80" xml:lang="it">https://idp-dgnocchi.irccs.garr.it/idp/images/logoEnte-160x120_it.png</mdui:Logo>
-        <mdui:PrivacyStatementURL xml:lang="en">https://idp-dgnocchi.irccs.garr.it/idp/privacy.html</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="it">https://idp-dgnocchi.irccs.garr.it/idp/privacy.html</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDUzCCAjugAwIBAgIUP1k5hfSRuNvbFEuq697H3+caJKQwDQYJKoZIhvcNAQEF
-BQAwJTEjMCEGA1UEAxMaaWRwLWRnbm9jY2hpLmlyY2NzLmdhcnIuaXQwHhcNMTMx
-MTI4MTQ0NTI3WhcNMzMxMTI4MTQ0NTI3WjAlMSMwIQYDVQQDExppZHAtZGdub2Nj
-aGkuaXJjY3MuZ2Fyci5pdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
-AJcayGTp5Elhk5nXeuntBEg2r0Le/6nIsQG8FgkNf+qggXSHNVWxhFvw3EblGttY
-9jISmSjGdUwNpGknPPEXdZ3w/RO+czI3zZmMNUxIvF+RBOv45FQRd6JpMojAOBjZ
-blIJ9uxIZl9CTc7AytutChk/JS0uME0bZnCdIxitsMraRITSiUqZw9FDlghcbAPU
-66+EIqmAas0pNzHIgICsTQFpVpR7aOCrGDgLH8ZhnE895Bte5hdTbDwEBVFYZ4NE
-oMGUwgRhly0g9EAh04ercObE4NZLuF9XIrw6L5bUoOAn7AXCiIfGcUHukEt2NbSi
-zwOfrKyshMvwQeUu1QXdr2sCAwEAAaN7MHkwWAYDVR0RBFEwT4IaaWRwLWRnbm9j
-Y2hpLmlyY2NzLmdhcnIuaXSGMWh0dHBzOi8vaWRwLWRnbm9jY2hpLmlyY2NzLmdh
-cnIuaXQvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFMfsRTXhI2SK/tSeRLeojBMD
-y034MA0GCSqGSIb3DQEBBQUAA4IBAQBZTmIO9IWCOi8wbPcBpgyZYhwn39CfeBJp
-qf4NhXa9ZO6IC+qMG3+dZGlg0FkqTkbArc7tTATUL0b7p1zWXsH8GgtyigKjzdKB
-6mKwtYErqp0gF4438G8XpXsolrjF/RyCrxj7aXDzIKktk2cXKVqF9xtMc5H1AAkq
-hnyOXvP4oteo+j+aww+rS4ITijKAXLhgFoNbGIfN3zTfTywBKU46+ZAuuzbLyNa/
-fKX+hJtcp9X9ctp8azb3HudIHe+5YSDOKWYPAgEdXDTlBXdd0/9zrEp1UIZ3jx6I
-MJX+TT5lOVFqu29vcvoiXmH3XIAZi7JIvcAt3STJGs7wZFJzrTrx
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-dgnocchi.irccs.garr.it:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-dgnocchi.irccs.garr.it: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-dgnocchi.irccs.garr.it/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-dgnocchi.irccs.garr.it/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp-dgnocchi.irccs.garr.it/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-dgnocchi.irccs.garr.it/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">dongnocchi.it</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDUzCCAjugAwIBAgIUP1k5hfSRuNvbFEuq697H3+caJKQwDQYJKoZIhvcNAQEF
-BQAwJTEjMCEGA1UEAxMaaWRwLWRnbm9jY2hpLmlyY2NzLmdhcnIuaXQwHhcNMTMx
-MTI4MTQ0NTI3WhcNMzMxMTI4MTQ0NTI3WjAlMSMwIQYDVQQDExppZHAtZGdub2Nj
-aGkuaXJjY3MuZ2Fyci5pdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
-AJcayGTp5Elhk5nXeuntBEg2r0Le/6nIsQG8FgkNf+qggXSHNVWxhFvw3EblGttY
-9jISmSjGdUwNpGknPPEXdZ3w/RO+czI3zZmMNUxIvF+RBOv45FQRd6JpMojAOBjZ
-blIJ9uxIZl9CTc7AytutChk/JS0uME0bZnCdIxitsMraRITSiUqZw9FDlghcbAPU
-66+EIqmAas0pNzHIgICsTQFpVpR7aOCrGDgLH8ZhnE895Bte5hdTbDwEBVFYZ4NE
-oMGUwgRhly0g9EAh04ercObE4NZLuF9XIrw6L5bUoOAn7AXCiIfGcUHukEt2NbSi
-zwOfrKyshMvwQeUu1QXdr2sCAwEAAaN7MHkwWAYDVR0RBFEwT4IaaWRwLWRnbm9j
-Y2hpLmlyY2NzLmdhcnIuaXSGMWh0dHBzOi8vaWRwLWRnbm9jY2hpLmlyY2NzLmdh
-cnIuaXQvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFMfsRTXhI2SK/tSeRLeojBMD
-y034MA0GCSqGSIb3DQEBBQUAA4IBAQBZTmIO9IWCOi8wbPcBpgyZYhwn39CfeBJp
-qf4NhXa9ZO6IC+qMG3+dZGlg0FkqTkbArc7tTATUL0b7p1zWXsH8GgtyigKjzdKB
-6mKwtYErqp0gF4438G8XpXsolrjF/RyCrxj7aXDzIKktk2cXKVqF9xtMc5H1AAkq
-hnyOXvP4oteo+j+aww+rS4ITijKAXLhgFoNbGIfN3zTfTywBKU46+ZAuuzbLyNa/
-fKX+hJtcp9X9ctp8azb3HudIHe+5YSDOKWYPAgEdXDTlBXdd0/9zrEp1UIZ3jx6I
-MJX+TT5lOVFqu29vcvoiXmH3XIAZi7JIvcAt3STJGs7wZFJzrTrx
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-dgnocchi.irccs.garr.it:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-dgnocchi.irccs.garr.it: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">IRCCS Fondazione Don Carlo Gnocchi Onlus</OrganizationName>
-    <OrganizationName xml:lang="it">IRCCS Fondazione Don Carlo Gnocchi Onlus</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">IRCCS Fondazione Don Carlo Gnocchi Onlus</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="it">IRCCS Fondazione Don Carlo Gnocchi Onlus</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.dongnocchi.it/documenti/eng/index_eng.htm</OrganizationURL>
-    <OrganizationURL xml:lang="it">http://www.dongnocchi.it</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <EmailAddress>mailto:idpcloud-service@garr.it</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp-ensr.ens-rennes.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp-ensr.ens-rennes.fr-idp-shibboleth.xml
deleted file mode 100644
index 852fae0a..00000000
--- a/swamid-interfederations-2.0/idp-ensr.ens-rennes.fr-idp-shibboleth.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp-ensr.ens-rennes.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2014-02-25T13:55:28Z">
-      <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-rennes.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">ENS Rennes</mdui:DisplayName>
-        <mdui:Description xml:lang="fr">Ensemble des utilisateurs de l'ENS Rennes</mdui:Description>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDRDCCAiygAwIBAgIVAMWqxLx7lYiNhlTPapEholL2ajx8MA0GCSqGSIb3DQEB
-BQUAMCExHzAdBgNVBAMTFmlkcC1lbnNyLmVucy1yZW5uZXMuZnIwHhcNMTQwMjI1
-MTgzNDE1WhcNMzQwMjI1MTgzNDE1WjAhMR8wHQYDVQQDExZpZHAtZW5zci5lbnMt
-cmVubmVzLmZyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAmDxunK9B
-VB2RZVJ2YdtrKMLZpQ+7U9dDBnjD2xkwKFyEswtX/U2OK0nALFkJCgK+RSeU2A6e
-kmHZIcYKN4giqcXt0UyAVdXDQP8Ovs6KgL6vdcLofuYthL5mvQeBHG3AtGLffpZp
-7Xg/RpjBtQSC/5R4/O9IMRPYPGD9ZJpQMxl1lBiVw36e+/9zwysyhjpGAIm96h1f
-KkZaYNsMT8Y+aHNmcvYXB/EPKj9iLtFxOYmD19DbIFSVSOrc3N81xtYZSg3w+K9M
-JvBT+jJ8Tr7tXaVoNAUL50qfTR9V8Otftlxlrm+btFQANxOwfmAa6NtLqChTuErG
-ZMZyvh7dvtDFDQIDAQABo3MwcTBQBgNVHREESTBHghZpZHAtZW5zci5lbnMtcmVu
-bmVzLmZyhi1odHRwczovL2lkcC1lbnNyLmVucy1yZW5uZXMuZnIvaWRwL3NoaWJi
-b2xldGgwHQYDVR0OBBYEFMWCwroMGof468uwDOVo9CmJtFCmMA0GCSqGSIb3DQEB
-BQUAA4IBAQBuJkugeq35RQ1eJVCFpQEF1cvz3HI2WNaYJVAzNKVHjQKLTgeEXTAw
-2n0U0wijhjNhLn0KU7RjF/YKq3byxsvmw2V/dkor6Uj/o24QRIS/rnGp0OOAm8md
-KuATxDlbfiUiLZ8P09LWfCj7kBofKAWpdSA3EqK3C1r1ABP3cfgy6bCEAKmImZ/g
-rU56Bc4TlmzKTAcgt6N/Wmwb7jubtPpeoZ3oQuuMjl5SD5kabufWGeLRR3blN2Fc
-067E4nErVpBw181gQpQMwpin/OjW+lbqa+ayBIRJfng4G2t5KcnvpJzfmlJS/Nus
-rfl6FRk/WmuNV0iaMjHeIz48Vet1SQLF
-					    </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://idp-ensr.ens-rennes.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-ensr.ens-rennes.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp-ensr.ens-rennes.fr/idp/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">ENS Rennes</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">ENS Rennes</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <EmailAddress>postmaster@ens-rennes.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp-ensr.ens-rennes.fr.xml b/swamid-interfederations-2.0/idp-ensr.ens-rennes.fr.xml
deleted file mode 100644
index 852fae0a..00000000
--- a/swamid-interfederations-2.0/idp-ensr.ens-rennes.fr.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp-ensr.ens-rennes.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2014-02-25T13:55:28Z">
-      <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-rennes.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">ENS Rennes</mdui:DisplayName>
-        <mdui:Description xml:lang="fr">Ensemble des utilisateurs de l'ENS Rennes</mdui:Description>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDRDCCAiygAwIBAgIVAMWqxLx7lYiNhlTPapEholL2ajx8MA0GCSqGSIb3DQEB
-BQUAMCExHzAdBgNVBAMTFmlkcC1lbnNyLmVucy1yZW5uZXMuZnIwHhcNMTQwMjI1
-MTgzNDE1WhcNMzQwMjI1MTgzNDE1WjAhMR8wHQYDVQQDExZpZHAtZW5zci5lbnMt
-cmVubmVzLmZyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAmDxunK9B
-VB2RZVJ2YdtrKMLZpQ+7U9dDBnjD2xkwKFyEswtX/U2OK0nALFkJCgK+RSeU2A6e
-kmHZIcYKN4giqcXt0UyAVdXDQP8Ovs6KgL6vdcLofuYthL5mvQeBHG3AtGLffpZp
-7Xg/RpjBtQSC/5R4/O9IMRPYPGD9ZJpQMxl1lBiVw36e+/9zwysyhjpGAIm96h1f
-KkZaYNsMT8Y+aHNmcvYXB/EPKj9iLtFxOYmD19DbIFSVSOrc3N81xtYZSg3w+K9M
-JvBT+jJ8Tr7tXaVoNAUL50qfTR9V8Otftlxlrm+btFQANxOwfmAa6NtLqChTuErG
-ZMZyvh7dvtDFDQIDAQABo3MwcTBQBgNVHREESTBHghZpZHAtZW5zci5lbnMtcmVu
-bmVzLmZyhi1odHRwczovL2lkcC1lbnNyLmVucy1yZW5uZXMuZnIvaWRwL3NoaWJi
-b2xldGgwHQYDVR0OBBYEFMWCwroMGof468uwDOVo9CmJtFCmMA0GCSqGSIb3DQEB
-BQUAA4IBAQBuJkugeq35RQ1eJVCFpQEF1cvz3HI2WNaYJVAzNKVHjQKLTgeEXTAw
-2n0U0wijhjNhLn0KU7RjF/YKq3byxsvmw2V/dkor6Uj/o24QRIS/rnGp0OOAm8md
-KuATxDlbfiUiLZ8P09LWfCj7kBofKAWpdSA3EqK3C1r1ABP3cfgy6bCEAKmImZ/g
-rU56Bc4TlmzKTAcgt6N/Wmwb7jubtPpeoZ3oQuuMjl5SD5kabufWGeLRR3blN2Fc
-067E4nErVpBw181gQpQMwpin/OjW+lbqa+ayBIRJfng4G2t5KcnvpJzfmlJS/Nus
-rfl6FRk/WmuNV0iaMjHeIz48Vet1SQLF
-					    </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://idp-ensr.ens-rennes.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-ensr.ens-rennes.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp-ensr.ens-rennes.fr/idp/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">ENS Rennes</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">ENS Rennes</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <EmailAddress>postmaster@ens-rennes.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp-etu.crous-grenoble.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp-etu.crous-grenoble.fr-idp-shibboleth.xml
deleted file mode 100644
index 92fd78e4..00000000
--- a/swamid-interfederations-2.0/idp-etu.crous-grenoble.fr-idp-shibboleth.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://idp-etu.crous-grenoble.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2012-09-04T16:10:14Z">
-      <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">crous-grenoble.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">CROUS Grenoble - étudiants</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDTzCCAjegAwIBAgIUa/WpAhPdXKjK1Y6xsR36dWY2AtEwDQYJKoZIhvcNAQEF
-BQAwJDEiMCAGA1UEAxMZaWRwLWV0dS5jcm91cy1ncmVub2JsZS5mcjAeFw0xMjA5
-MDIwNzAzMDFaFw0zMjA5MDIwNzAzMDFaMCQxIjAgBgNVBAMTGWlkcC1ldHUuY3Jv
-dXMtZ3Jlbm9ibGUuZnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCf
-gyZIiwrGg4ymD1H8U7fRJUPj2EFmjkDfkQxcUmHcp4awF20Mz3+305sfmdmnPuSl
-lJS28Z6Ex/z9YDeLjiJvJ8MHvcssj6sZUCils9Rda1U7P1YzvNTV4njkL78VulU+
-MFCxJ3/Binam+304Vlgi9gsgqvPLiWAtQwB6woPWgwUMgRTOQpUyXrx5X6TfL7M+
-7xxjOCBK/FquKuHPB1EzLEazZdhLnXKIhBTFHXDjjQJq8qCTmv9J1LTQfA5mEKYr
-qyf4qY3T4smCC1I/4PmdjtIVwQvpwdKAn6HuzlgB94EvwCdNqC6S8gUp/JRTPLwL
-wS2MbLjn17IIxcnNBW6bAgMBAAGjeTB3MFYGA1UdEQRPME2CGWlkcC1ldHUuY3Jv
-dXMtZ3Jlbm9ibGUuZnKGMGh0dHBzOi8vaWRwLWV0dS5jcm91cy1ncmVub2JsZS5m
-ci9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUWfgO9igdn2WDjh7y8cL/SHlyC1Aw
-DQYJKoZIhvcNAQEFBQADggEBAJwDc/Gpl87rxpPmFJ4dLpo+6Khq2NGaHnSnw05s
-HYQhqfO4Kl4XxSti4ELAayJp8elDh5ZWHNOOvC9Uxf1s0TXJP8P3xEcIlFsRPBp2
-L3NVouYwx9zlXJSppN0Bx9+zh2iwp2omJPmH0ebqyPSm2sfsD3xA/IYXpRtRC7Aq
-WrU7dAr/V3AtILCrLi6DimBM26rPSsVhjYNcCpvv9Wrqv/j/PcIq/O9AHYTGvNcY
-9ETYn7cWEBKXzgKBfSHJfdsyXuJVrnWC/aRS5TFFdwdfiLKPcsZkOm91NMNCPbgz
-XKhZB5QMwDW1nFHiHsXElQy2l4lLGZGvyCwpjqaqmXBwVvU=
-					    </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://idp-etu.crous-grenoble.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-etu.crous-grenoble.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp-etu.crous-grenoble.fr/idp/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">CROUS Grenoble - étudiants</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">CROUS Grenoble - étudiants</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <EmailAddress>informatique@crous-grenoble.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp-etu.crous-grenoble.fr.xml b/swamid-interfederations-2.0/idp-etu.crous-grenoble.fr.xml
deleted file mode 100644
index 92fd78e4..00000000
--- a/swamid-interfederations-2.0/idp-etu.crous-grenoble.fr.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://idp-etu.crous-grenoble.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2012-09-04T16:10:14Z">
-      <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">crous-grenoble.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">CROUS Grenoble - étudiants</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDTzCCAjegAwIBAgIUa/WpAhPdXKjK1Y6xsR36dWY2AtEwDQYJKoZIhvcNAQEF
-BQAwJDEiMCAGA1UEAxMZaWRwLWV0dS5jcm91cy1ncmVub2JsZS5mcjAeFw0xMjA5
-MDIwNzAzMDFaFw0zMjA5MDIwNzAzMDFaMCQxIjAgBgNVBAMTGWlkcC1ldHUuY3Jv
-dXMtZ3Jlbm9ibGUuZnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCf
-gyZIiwrGg4ymD1H8U7fRJUPj2EFmjkDfkQxcUmHcp4awF20Mz3+305sfmdmnPuSl
-lJS28Z6Ex/z9YDeLjiJvJ8MHvcssj6sZUCils9Rda1U7P1YzvNTV4njkL78VulU+
-MFCxJ3/Binam+304Vlgi9gsgqvPLiWAtQwB6woPWgwUMgRTOQpUyXrx5X6TfL7M+
-7xxjOCBK/FquKuHPB1EzLEazZdhLnXKIhBTFHXDjjQJq8qCTmv9J1LTQfA5mEKYr
-qyf4qY3T4smCC1I/4PmdjtIVwQvpwdKAn6HuzlgB94EvwCdNqC6S8gUp/JRTPLwL
-wS2MbLjn17IIxcnNBW6bAgMBAAGjeTB3MFYGA1UdEQRPME2CGWlkcC1ldHUuY3Jv
-dXMtZ3Jlbm9ibGUuZnKGMGh0dHBzOi8vaWRwLWV0dS5jcm91cy1ncmVub2JsZS5m
-ci9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUWfgO9igdn2WDjh7y8cL/SHlyC1Aw
-DQYJKoZIhvcNAQEFBQADggEBAJwDc/Gpl87rxpPmFJ4dLpo+6Khq2NGaHnSnw05s
-HYQhqfO4Kl4XxSti4ELAayJp8elDh5ZWHNOOvC9Uxf1s0TXJP8P3xEcIlFsRPBp2
-L3NVouYwx9zlXJSppN0Bx9+zh2iwp2omJPmH0ebqyPSm2sfsD3xA/IYXpRtRC7Aq
-WrU7dAr/V3AtILCrLi6DimBM26rPSsVhjYNcCpvv9Wrqv/j/PcIq/O9AHYTGvNcY
-9ETYn7cWEBKXzgKBfSHJfdsyXuJVrnWC/aRS5TFFdwdfiLKPcsZkOm91NMNCPbgz
-XKhZB5QMwDW1nFHiHsXElQy2l4lLGZGvyCwpjqaqmXBwVvU=
-					    </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://idp-etu.crous-grenoble.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-etu.crous-grenoble.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp-etu.crous-grenoble.fr/idp/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">CROUS Grenoble - étudiants</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">CROUS Grenoble - étudiants</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <EmailAddress>informatique@crous-grenoble.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp-preprod.cardiff.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp-preprod.cardiff.ac.uk-idp-shibboleth.xml
deleted file mode 100644
index 82e1bfcf..00000000
--- a/swamid-interfederations-2.0/idp-preprod.cardiff.ac.uk-idp-shibboleth.xml
+++ /dev/null
@@ -1,126 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp-preprod.cardiff.ac.uk/idp/shibboleth">
-  <!--
-		This is a Shibboleth test IdP (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="2009-11-25T18:02: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 (Test - Preprod)</mdui:DisplayName>
-        <mdui:Logo height="16" width="16">https://iam.cf.ac.uk/images/CU-Dev-logo-16x16.png</mdui:Logo>
-        <mdui:Logo height="60" width="80">https://iam.cf.ac.uk/images/CU-Dev-logo-80x60.png</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIErDCCA5SgAwIBAgIRAOYsRgGmDwZDq4ktIsUqyQQwDQYJKoZIhvcNAQEFBQAw
-						NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-						IFNTTCBDQTAeFw0xMzAxMTAwMDAwMDBaFw0xNjAxMTAyMzU5NTlaMHgxCzAJBgNV
-						BAYTAkdCMQ4wDAYDVQQIEwVXYWxlczEbMBkGA1UEChMSQ2FyZGlmZiBVbml2ZXJz
-						aXR5MR0wGwYDVQQLExRJbmZvcm1hdGlvbiBTZXJ2aWNlczEdMBsGA1UEAxMUaWRw
-						LXByZXByb2QuY2YuYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
-						AQDQK7+T3U6Nj6Vc3XKjyiY1fzXA8j1vN91RbPV96DJGnr0vQnls/S5qqY5U8VJi
-						+qzS61+V8TqcpjGUViPYsRnlXISGHnQ7KWccZB2f9lApnJsMhNH6BxCzOYwcLbJw
-						sLbwVoJ11Wxv+O8n3dsO5vr4QSHkXen36WbS1YuVQI9rCri0lzdriB5oy+8J7aQq
-						Gh0azuz7iBc+yFA5RROl7g0cPPXwGpo3p3beWgiVERVdO9Kz5z6sTN306TkT/RKL
-						B5mqHnEN/1GNh8BLJcLPJcYt5CkxJLk+YMiNHs7ssv9QLk7mRzq2OAuQFtbMOlyL
-						TzFBk3EVKcEHYQlWDaSOlQxfAgMBAAGjggFxMIIBbTAfBgNVHSMEGDAWgBQMvZNo
-						DPPeq6NJays3V0fqkOO57TAdBgNVHQ4EFgQUVcZWoy8Sj9k5JJOCpW7IY/XjKYIw
-						DgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUH
-						AwEGCCsGAQUFBwMCMCIGA1UdIAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQIC
-						MDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVS
-						RU5BU1NMQ0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDov
-						L2NydC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGG
-						Gmh0dHA6Ly9vY3NwLnRjcy50ZXJlbmEub3JnMB8GA1UdEQQYMBaCFGlkcC1wcmVw
-						cm9kLmNmLmFjLnVrMA0GCSqGSIb3DQEBBQUAA4IBAQBttEXXeJl3ORiixGzvb3bk
-						B1I4hjBX8lQ+U/W7AytyWOsvF8Qzs7mz6an5bakjinYkl5dIRm4eUzTt2KkS8N4a
-						J7dkThSzTAotQ8QgzsrakajH9twHMcccO0Ol5bt/J6dTJ4LhNMc/ULjcApiRjgl/
-						8Fh6kwPdGEkRjN7q3xzcJuKJPbfPOVq5HVINafV65BR+r41DlJ05Cll7WxZZ4+zy
-						QMstqkzxj6/vm9ycaoWoz2ODk/5GFfWq3OMllgLQoFv+4A/sMH6M5UCgRF/CwFm0
-						POJV6rCq1voBGTr2gforlIfCCsWXBl6BpB8mF2lUzzNRAYrez2/QEO8MceHqR4C7
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-preprod.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-preprod.cf.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-preprod.cf.ac.uk/idp/profile/SAML2/Redirect/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-preprod.cf.ac.uk/idp/profile/SAML2/POST/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp-preprod.cf.ac.uk/idp/profile/SAML2/POST-SimpleSign/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-preprod.cf.ac.uk:8443/idp/profile/SAML2/SOAP/SLO"/>
-    <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://idp-preprod.cf.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-preprod.cf.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp-preprod.cf.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-preprod.cf.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-preprod.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>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIErDCCA5SgAwIBAgIRAOYsRgGmDwZDq4ktIsUqyQQwDQYJKoZIhvcNAQEFBQAw
-						NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-						IFNTTCBDQTAeFw0xMzAxMTAwMDAwMDBaFw0xNjAxMTAyMzU5NTlaMHgxCzAJBgNV
-						BAYTAkdCMQ4wDAYDVQQIEwVXYWxlczEbMBkGA1UEChMSQ2FyZGlmZiBVbml2ZXJz
-						aXR5MR0wGwYDVQQLExRJbmZvcm1hdGlvbiBTZXJ2aWNlczEdMBsGA1UEAxMUaWRw
-						LXByZXByb2QuY2YuYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
-						AQDQK7+T3U6Nj6Vc3XKjyiY1fzXA8j1vN91RbPV96DJGnr0vQnls/S5qqY5U8VJi
-						+qzS61+V8TqcpjGUViPYsRnlXISGHnQ7KWccZB2f9lApnJsMhNH6BxCzOYwcLbJw
-						sLbwVoJ11Wxv+O8n3dsO5vr4QSHkXen36WbS1YuVQI9rCri0lzdriB5oy+8J7aQq
-						Gh0azuz7iBc+yFA5RROl7g0cPPXwGpo3p3beWgiVERVdO9Kz5z6sTN306TkT/RKL
-						B5mqHnEN/1GNh8BLJcLPJcYt5CkxJLk+YMiNHs7ssv9QLk7mRzq2OAuQFtbMOlyL
-						TzFBk3EVKcEHYQlWDaSOlQxfAgMBAAGjggFxMIIBbTAfBgNVHSMEGDAWgBQMvZNo
-						DPPeq6NJays3V0fqkOO57TAdBgNVHQ4EFgQUVcZWoy8Sj9k5JJOCpW7IY/XjKYIw
-						DgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUH
-						AwEGCCsGAQUFBwMCMCIGA1UdIAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQIC
-						MDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVS
-						RU5BU1NMQ0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDov
-						L2NydC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGG
-						Gmh0dHA6Ly9vY3NwLnRjcy50ZXJlbmEub3JnMB8GA1UdEQQYMBaCFGlkcC1wcmVw
-						cm9kLmNmLmFjLnVrMA0GCSqGSIb3DQEBBQUAA4IBAQBttEXXeJl3ORiixGzvb3bk
-						B1I4hjBX8lQ+U/W7AytyWOsvF8Qzs7mz6an5bakjinYkl5dIRm4eUzTt2KkS8N4a
-						J7dkThSzTAotQ8QgzsrakajH9twHMcccO0Ol5bt/J6dTJ4LhNMc/ULjcApiRjgl/
-						8Fh6kwPdGEkRjN7q3xzcJuKJPbfPOVq5HVINafV65BR+r41DlJ05Cll7WxZZ4+zy
-						QMstqkzxj6/vm9ycaoWoz2ODk/5GFfWq3OMllgLQoFv+4A/sMH6M5UCgRF/CwFm0
-						POJV6rCq1voBGTr2gforlIfCCsWXBl6BpB8mF2lUzzNRAYrez2/QEO8MceHqR4C7
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-preprod.cf.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-preprod.cf.ac.uk: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="en">Cardiff University</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Cardiff University (Test - Preprod)</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.cardiff.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Rhys</GivenName>
-    <SurName>Smith</SurName>
-    <EmailAddress>mailto:smith@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-preprod.cardiff.ac.uk.xml b/swamid-interfederations-2.0/idp-preprod.cardiff.ac.uk.xml
deleted file mode 100644
index 82e1bfcf..00000000
--- a/swamid-interfederations-2.0/idp-preprod.cardiff.ac.uk.xml
+++ /dev/null
@@ -1,126 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp-preprod.cardiff.ac.uk/idp/shibboleth">
-  <!--
-		This is a Shibboleth test IdP (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="2009-11-25T18:02: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 (Test - Preprod)</mdui:DisplayName>
-        <mdui:Logo height="16" width="16">https://iam.cf.ac.uk/images/CU-Dev-logo-16x16.png</mdui:Logo>
-        <mdui:Logo height="60" width="80">https://iam.cf.ac.uk/images/CU-Dev-logo-80x60.png</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIErDCCA5SgAwIBAgIRAOYsRgGmDwZDq4ktIsUqyQQwDQYJKoZIhvcNAQEFBQAw
-						NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-						IFNTTCBDQTAeFw0xMzAxMTAwMDAwMDBaFw0xNjAxMTAyMzU5NTlaMHgxCzAJBgNV
-						BAYTAkdCMQ4wDAYDVQQIEwVXYWxlczEbMBkGA1UEChMSQ2FyZGlmZiBVbml2ZXJz
-						aXR5MR0wGwYDVQQLExRJbmZvcm1hdGlvbiBTZXJ2aWNlczEdMBsGA1UEAxMUaWRw
-						LXByZXByb2QuY2YuYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
-						AQDQK7+T3U6Nj6Vc3XKjyiY1fzXA8j1vN91RbPV96DJGnr0vQnls/S5qqY5U8VJi
-						+qzS61+V8TqcpjGUViPYsRnlXISGHnQ7KWccZB2f9lApnJsMhNH6BxCzOYwcLbJw
-						sLbwVoJ11Wxv+O8n3dsO5vr4QSHkXen36WbS1YuVQI9rCri0lzdriB5oy+8J7aQq
-						Gh0azuz7iBc+yFA5RROl7g0cPPXwGpo3p3beWgiVERVdO9Kz5z6sTN306TkT/RKL
-						B5mqHnEN/1GNh8BLJcLPJcYt5CkxJLk+YMiNHs7ssv9QLk7mRzq2OAuQFtbMOlyL
-						TzFBk3EVKcEHYQlWDaSOlQxfAgMBAAGjggFxMIIBbTAfBgNVHSMEGDAWgBQMvZNo
-						DPPeq6NJays3V0fqkOO57TAdBgNVHQ4EFgQUVcZWoy8Sj9k5JJOCpW7IY/XjKYIw
-						DgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUH
-						AwEGCCsGAQUFBwMCMCIGA1UdIAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQIC
-						MDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVS
-						RU5BU1NMQ0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDov
-						L2NydC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGG
-						Gmh0dHA6Ly9vY3NwLnRjcy50ZXJlbmEub3JnMB8GA1UdEQQYMBaCFGlkcC1wcmVw
-						cm9kLmNmLmFjLnVrMA0GCSqGSIb3DQEBBQUAA4IBAQBttEXXeJl3ORiixGzvb3bk
-						B1I4hjBX8lQ+U/W7AytyWOsvF8Qzs7mz6an5bakjinYkl5dIRm4eUzTt2KkS8N4a
-						J7dkThSzTAotQ8QgzsrakajH9twHMcccO0Ol5bt/J6dTJ4LhNMc/ULjcApiRjgl/
-						8Fh6kwPdGEkRjN7q3xzcJuKJPbfPOVq5HVINafV65BR+r41DlJ05Cll7WxZZ4+zy
-						QMstqkzxj6/vm9ycaoWoz2ODk/5GFfWq3OMllgLQoFv+4A/sMH6M5UCgRF/CwFm0
-						POJV6rCq1voBGTr2gforlIfCCsWXBl6BpB8mF2lUzzNRAYrez2/QEO8MceHqR4C7
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-preprod.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-preprod.cf.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-preprod.cf.ac.uk/idp/profile/SAML2/Redirect/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-preprod.cf.ac.uk/idp/profile/SAML2/POST/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp-preprod.cf.ac.uk/idp/profile/SAML2/POST-SimpleSign/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-preprod.cf.ac.uk:8443/idp/profile/SAML2/SOAP/SLO"/>
-    <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://idp-preprod.cf.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-preprod.cf.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp-preprod.cf.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-preprod.cf.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-preprod.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>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIErDCCA5SgAwIBAgIRAOYsRgGmDwZDq4ktIsUqyQQwDQYJKoZIhvcNAQEFBQAw
-						NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-						IFNTTCBDQTAeFw0xMzAxMTAwMDAwMDBaFw0xNjAxMTAyMzU5NTlaMHgxCzAJBgNV
-						BAYTAkdCMQ4wDAYDVQQIEwVXYWxlczEbMBkGA1UEChMSQ2FyZGlmZiBVbml2ZXJz
-						aXR5MR0wGwYDVQQLExRJbmZvcm1hdGlvbiBTZXJ2aWNlczEdMBsGA1UEAxMUaWRw
-						LXByZXByb2QuY2YuYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
-						AQDQK7+T3U6Nj6Vc3XKjyiY1fzXA8j1vN91RbPV96DJGnr0vQnls/S5qqY5U8VJi
-						+qzS61+V8TqcpjGUViPYsRnlXISGHnQ7KWccZB2f9lApnJsMhNH6BxCzOYwcLbJw
-						sLbwVoJ11Wxv+O8n3dsO5vr4QSHkXen36WbS1YuVQI9rCri0lzdriB5oy+8J7aQq
-						Gh0azuz7iBc+yFA5RROl7g0cPPXwGpo3p3beWgiVERVdO9Kz5z6sTN306TkT/RKL
-						B5mqHnEN/1GNh8BLJcLPJcYt5CkxJLk+YMiNHs7ssv9QLk7mRzq2OAuQFtbMOlyL
-						TzFBk3EVKcEHYQlWDaSOlQxfAgMBAAGjggFxMIIBbTAfBgNVHSMEGDAWgBQMvZNo
-						DPPeq6NJays3V0fqkOO57TAdBgNVHQ4EFgQUVcZWoy8Sj9k5JJOCpW7IY/XjKYIw
-						DgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUH
-						AwEGCCsGAQUFBwMCMCIGA1UdIAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQIC
-						MDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVS
-						RU5BU1NMQ0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDov
-						L2NydC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGG
-						Gmh0dHA6Ly9vY3NwLnRjcy50ZXJlbmEub3JnMB8GA1UdEQQYMBaCFGlkcC1wcmVw
-						cm9kLmNmLmFjLnVrMA0GCSqGSIb3DQEBBQUAA4IBAQBttEXXeJl3ORiixGzvb3bk
-						B1I4hjBX8lQ+U/W7AytyWOsvF8Qzs7mz6an5bakjinYkl5dIRm4eUzTt2KkS8N4a
-						J7dkThSzTAotQ8QgzsrakajH9twHMcccO0Ol5bt/J6dTJ4LhNMc/ULjcApiRjgl/
-						8Fh6kwPdGEkRjN7q3xzcJuKJPbfPOVq5HVINafV65BR+r41DlJ05Cll7WxZZ4+zy
-						QMstqkzxj6/vm9ycaoWoz2ODk/5GFfWq3OMllgLQoFv+4A/sMH6M5UCgRF/CwFm0
-						POJV6rCq1voBGTr2gforlIfCCsWXBl6BpB8mF2lUzzNRAYrez2/QEO8MceHqR4C7
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-preprod.cf.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-preprod.cf.ac.uk: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="en">Cardiff University</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Cardiff University (Test - Preprod)</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.cardiff.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Rhys</GivenName>
-    <SurName>Smith</SurName>
-    <EmailAddress>mailto:smith@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-ssbar.beniculturali.garr.it-idp-shibboleth.xml b/swamid-interfederations-2.0/idp-ssbar.beniculturali.garr.it-idp-shibboleth.xml
deleted file mode 100644
index 0fc4d58f..00000000
--- a/swamid-interfederations-2.0/idp-ssbar.beniculturali.garr.it-idp-shibboleth.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:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" entityID="https://idp-ssbar.beniculturali.garr.it/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2014-09-23T06:04:04Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</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">archeoroma.beniculturali.it</shibmd:Scope>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="en">SSBAR - Soprintendenza Archeologica di Roma</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="it">SSBAR - Soprintendenza Archeologica di Roma</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Identity Provider for Soprintendenza Speciale per i Beni Archeologici di Roma</mdui:Description>
-        <mdui:Description xml:lang="it">Identity Provider per gli utenti della Soprintendenza Speciale per i Beni Archeologici di Roma</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://archeoroma.beniculturali.it/en/idem-info</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="it">http://archeoroma.beniculturali.it/idp/info</mdui:InformationURL>
-        <mdui:Logo height="16" width="16" xml:lang="en">https://idp-ssbar.beniculturali.garr.it/idp/images/logoEnte-32x32_en.png</mdui:Logo>
-        <mdui:Logo height="16" width="16" xml:lang="it">https://idp-ssbar.beniculturali.garr.it/idp/images/logoEnte-32x32_it.png</mdui:Logo>
-        <mdui:Logo height="60" width="80" xml:lang="en">https://idp-ssbar.beniculturali.garr.it/idp/images/logoEnte-160x120_en.png</mdui:Logo>
-        <mdui:Logo height="60" width="80" xml:lang="it">https://idp-ssbar.beniculturali.garr.it/idp/images/logoEnte-160x120_it.png</mdui:Logo>
-        <mdui:PrivacyStatementURL xml:lang="en">http://archeoroma.beniculturali.it/en/privacy-0</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="it">http://archeoroma.beniculturali.it/privacy</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDajCCAlKgAwIBAgIVAK1w02d7b+IBhciTHgzqFmh3HoqaMA0GCSqGSIb3DQEB
-BQUAMCoxKDAmBgNVBAMTH2lkcC1zc2Jhci5iZW5pY3VsdHVyYWxpLmdhcnIuaXQw
-HhcNMTQwNTMwMDkwNjUxWhcNMzQwNTMwMDkwNjUxWjAqMSgwJgYDVQQDEx9pZHAt
-c3NiYXIuYmVuaWN1bHR1cmFsaS5nYXJyLml0MIIBIjANBgkqhkiG9w0BAQEFAAOC
-AQ8AMIIBCgKCAQEAtUyDEbuWYgBDLthfID5RiAaqAVV+VVSwK9JsbPyA0WEQG4mU
-wTwk9baImykOzOksmIgWY1XgBOy8jtI/fJ/9VBpz71paCkEjMQH7u6tHGuAVx6ZC
-QcWsSu1Iemktd2K8P+gWNUSW32GwRHOe8IrNVsuAQV0BnDvLKFnOyIaCSxJe1aCA
-mlobazivS7xvZ4fIKScfhmxX2vMcAogy6SlVrk5Nbz1g4ptLSMe2H6eP7pjp9Dw2
-JVCraHiCPlDUfLqKNANYLIcv03k8cY89NT0rEBS8ILawQCT5wdAj+toLOk7Dg9S9
-fc++QHWOnlI9eU6WBNIHnDxer2xep24CE7vHpwIDAQABo4GGMIGDMGIGA1UdEQRb
-MFmCH2lkcC1zc2Jhci5iZW5pY3VsdHVyYWxpLmdhcnIuaXSGNmh0dHBzOi8vaWRw
-LXNzYmFyLmJlbmljdWx0dXJhbGkuZ2Fyci5pdC9pZHAvc2hpYmJvbGV0aDAdBgNV
-HQ4EFgQU5OBUAd7iE3QPu87pd4OJ35n3xDwwDQYJKoZIhvcNAQEFBQADggEBAEtE
-EPZSrzpFbPHz65DWhxm6+FXDuRKYG9jwTabcikn4y19ykhauySmYUYfDE91vmKA/
-cJr4u720j9qvmZ/Z3pO6w8vD+SKrUHG5ez8m4ArGK35sYEEMA1JrW8oV6rcMk46x
-nL/TyhPinDLChZjlYEt5i4m2KlCipHc302KnbtLyjm8HsTAVkMxTibNCQHzI0m0B
-EmVP49peQFE/K1rZTi3f/z9I78UNUEz9SkbZBs4OBaFHd9RGtRuqD3lvWJchPJZ7
-D8mIA/RlAEXaL23Azho0dkiWphN6VkwqAW8btg6BPaeWCE8Z/EDZCinHXWyOE9is
-1UGZpgRi7oyzxW0d230=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-ssbar.beniculturali.garr.it:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-ssbar.beniculturali.garr.it: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-ssbar.beniculturali.garr.it/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-ssbar.beniculturali.garr.it/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp-ssbar.beniculturali.garr.it/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-ssbar.beniculturali.garr.it/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">archeoroma.beniculturali.it</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDajCCAlKgAwIBAgIVAK1w02d7b+IBhciTHgzqFmh3HoqaMA0GCSqGSIb3DQEB
-BQUAMCoxKDAmBgNVBAMTH2lkcC1zc2Jhci5iZW5pY3VsdHVyYWxpLmdhcnIuaXQw
-HhcNMTQwNTMwMDkwNjUxWhcNMzQwNTMwMDkwNjUxWjAqMSgwJgYDVQQDEx9pZHAt
-c3NiYXIuYmVuaWN1bHR1cmFsaS5nYXJyLml0MIIBIjANBgkqhkiG9w0BAQEFAAOC
-AQ8AMIIBCgKCAQEAtUyDEbuWYgBDLthfID5RiAaqAVV+VVSwK9JsbPyA0WEQG4mU
-wTwk9baImykOzOksmIgWY1XgBOy8jtI/fJ/9VBpz71paCkEjMQH7u6tHGuAVx6ZC
-QcWsSu1Iemktd2K8P+gWNUSW32GwRHOe8IrNVsuAQV0BnDvLKFnOyIaCSxJe1aCA
-mlobazivS7xvZ4fIKScfhmxX2vMcAogy6SlVrk5Nbz1g4ptLSMe2H6eP7pjp9Dw2
-JVCraHiCPlDUfLqKNANYLIcv03k8cY89NT0rEBS8ILawQCT5wdAj+toLOk7Dg9S9
-fc++QHWOnlI9eU6WBNIHnDxer2xep24CE7vHpwIDAQABo4GGMIGDMGIGA1UdEQRb
-MFmCH2lkcC1zc2Jhci5iZW5pY3VsdHVyYWxpLmdhcnIuaXSGNmh0dHBzOi8vaWRw
-LXNzYmFyLmJlbmljdWx0dXJhbGkuZ2Fyci5pdC9pZHAvc2hpYmJvbGV0aDAdBgNV
-HQ4EFgQU5OBUAd7iE3QPu87pd4OJ35n3xDwwDQYJKoZIhvcNAQEFBQADggEBAEtE
-EPZSrzpFbPHz65DWhxm6+FXDuRKYG9jwTabcikn4y19ykhauySmYUYfDE91vmKA/
-cJr4u720j9qvmZ/Z3pO6w8vD+SKrUHG5ez8m4ArGK35sYEEMA1JrW8oV6rcMk46x
-nL/TyhPinDLChZjlYEt5i4m2KlCipHc302KnbtLyjm8HsTAVkMxTibNCQHzI0m0B
-EmVP49peQFE/K1rZTi3f/z9I78UNUEz9SkbZBs4OBaFHd9RGtRuqD3lvWJchPJZ7
-D8mIA/RlAEXaL23Azho0dkiWphN6VkwqAW8btg6BPaeWCE8Z/EDZCinHXWyOE9is
-1UGZpgRi7oyzxW0d230=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-ssbar.beniculturali.garr.it:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-ssbar.beniculturali.garr.it: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">SSBAR - Soprintendenza Archeologica di Roma</OrganizationName>
-    <OrganizationName xml:lang="it">SSBAR - Soprintendenza Archeologica di Roma</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">SSBAR - Soprintendenza Archeologica di Roma</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="it">SSBAR - Soprintendenza Archeologica di Roma</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://archeoroma.beniculturali.it/en</OrganizationURL>
-    <OrganizationURL xml:lang="it">http://archeoroma.beniculturali.it</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <EmailAddress>idpcloud-service@garr.it</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp-ssbar.beniculturali.garr.it.xml b/swamid-interfederations-2.0/idp-ssbar.beniculturali.garr.it.xml
deleted file mode 100644
index 0fc4d58f..00000000
--- a/swamid-interfederations-2.0/idp-ssbar.beniculturali.garr.it.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:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" entityID="https://idp-ssbar.beniculturali.garr.it/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2014-09-23T06:04:04Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</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">archeoroma.beniculturali.it</shibmd:Scope>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="en">SSBAR - Soprintendenza Archeologica di Roma</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="it">SSBAR - Soprintendenza Archeologica di Roma</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Identity Provider for Soprintendenza Speciale per i Beni Archeologici di Roma</mdui:Description>
-        <mdui:Description xml:lang="it">Identity Provider per gli utenti della Soprintendenza Speciale per i Beni Archeologici di Roma</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://archeoroma.beniculturali.it/en/idem-info</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="it">http://archeoroma.beniculturali.it/idp/info</mdui:InformationURL>
-        <mdui:Logo height="16" width="16" xml:lang="en">https://idp-ssbar.beniculturali.garr.it/idp/images/logoEnte-32x32_en.png</mdui:Logo>
-        <mdui:Logo height="16" width="16" xml:lang="it">https://idp-ssbar.beniculturali.garr.it/idp/images/logoEnte-32x32_it.png</mdui:Logo>
-        <mdui:Logo height="60" width="80" xml:lang="en">https://idp-ssbar.beniculturali.garr.it/idp/images/logoEnte-160x120_en.png</mdui:Logo>
-        <mdui:Logo height="60" width="80" xml:lang="it">https://idp-ssbar.beniculturali.garr.it/idp/images/logoEnte-160x120_it.png</mdui:Logo>
-        <mdui:PrivacyStatementURL xml:lang="en">http://archeoroma.beniculturali.it/en/privacy-0</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="it">http://archeoroma.beniculturali.it/privacy</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDajCCAlKgAwIBAgIVAK1w02d7b+IBhciTHgzqFmh3HoqaMA0GCSqGSIb3DQEB
-BQUAMCoxKDAmBgNVBAMTH2lkcC1zc2Jhci5iZW5pY3VsdHVyYWxpLmdhcnIuaXQw
-HhcNMTQwNTMwMDkwNjUxWhcNMzQwNTMwMDkwNjUxWjAqMSgwJgYDVQQDEx9pZHAt
-c3NiYXIuYmVuaWN1bHR1cmFsaS5nYXJyLml0MIIBIjANBgkqhkiG9w0BAQEFAAOC
-AQ8AMIIBCgKCAQEAtUyDEbuWYgBDLthfID5RiAaqAVV+VVSwK9JsbPyA0WEQG4mU
-wTwk9baImykOzOksmIgWY1XgBOy8jtI/fJ/9VBpz71paCkEjMQH7u6tHGuAVx6ZC
-QcWsSu1Iemktd2K8P+gWNUSW32GwRHOe8IrNVsuAQV0BnDvLKFnOyIaCSxJe1aCA
-mlobazivS7xvZ4fIKScfhmxX2vMcAogy6SlVrk5Nbz1g4ptLSMe2H6eP7pjp9Dw2
-JVCraHiCPlDUfLqKNANYLIcv03k8cY89NT0rEBS8ILawQCT5wdAj+toLOk7Dg9S9
-fc++QHWOnlI9eU6WBNIHnDxer2xep24CE7vHpwIDAQABo4GGMIGDMGIGA1UdEQRb
-MFmCH2lkcC1zc2Jhci5iZW5pY3VsdHVyYWxpLmdhcnIuaXSGNmh0dHBzOi8vaWRw
-LXNzYmFyLmJlbmljdWx0dXJhbGkuZ2Fyci5pdC9pZHAvc2hpYmJvbGV0aDAdBgNV
-HQ4EFgQU5OBUAd7iE3QPu87pd4OJ35n3xDwwDQYJKoZIhvcNAQEFBQADggEBAEtE
-EPZSrzpFbPHz65DWhxm6+FXDuRKYG9jwTabcikn4y19ykhauySmYUYfDE91vmKA/
-cJr4u720j9qvmZ/Z3pO6w8vD+SKrUHG5ez8m4ArGK35sYEEMA1JrW8oV6rcMk46x
-nL/TyhPinDLChZjlYEt5i4m2KlCipHc302KnbtLyjm8HsTAVkMxTibNCQHzI0m0B
-EmVP49peQFE/K1rZTi3f/z9I78UNUEz9SkbZBs4OBaFHd9RGtRuqD3lvWJchPJZ7
-D8mIA/RlAEXaL23Azho0dkiWphN6VkwqAW8btg6BPaeWCE8Z/EDZCinHXWyOE9is
-1UGZpgRi7oyzxW0d230=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-ssbar.beniculturali.garr.it:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-ssbar.beniculturali.garr.it: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-ssbar.beniculturali.garr.it/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-ssbar.beniculturali.garr.it/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp-ssbar.beniculturali.garr.it/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-ssbar.beniculturali.garr.it/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">archeoroma.beniculturali.it</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDajCCAlKgAwIBAgIVAK1w02d7b+IBhciTHgzqFmh3HoqaMA0GCSqGSIb3DQEB
-BQUAMCoxKDAmBgNVBAMTH2lkcC1zc2Jhci5iZW5pY3VsdHVyYWxpLmdhcnIuaXQw
-HhcNMTQwNTMwMDkwNjUxWhcNMzQwNTMwMDkwNjUxWjAqMSgwJgYDVQQDEx9pZHAt
-c3NiYXIuYmVuaWN1bHR1cmFsaS5nYXJyLml0MIIBIjANBgkqhkiG9w0BAQEFAAOC
-AQ8AMIIBCgKCAQEAtUyDEbuWYgBDLthfID5RiAaqAVV+VVSwK9JsbPyA0WEQG4mU
-wTwk9baImykOzOksmIgWY1XgBOy8jtI/fJ/9VBpz71paCkEjMQH7u6tHGuAVx6ZC
-QcWsSu1Iemktd2K8P+gWNUSW32GwRHOe8IrNVsuAQV0BnDvLKFnOyIaCSxJe1aCA
-mlobazivS7xvZ4fIKScfhmxX2vMcAogy6SlVrk5Nbz1g4ptLSMe2H6eP7pjp9Dw2
-JVCraHiCPlDUfLqKNANYLIcv03k8cY89NT0rEBS8ILawQCT5wdAj+toLOk7Dg9S9
-fc++QHWOnlI9eU6WBNIHnDxer2xep24CE7vHpwIDAQABo4GGMIGDMGIGA1UdEQRb
-MFmCH2lkcC1zc2Jhci5iZW5pY3VsdHVyYWxpLmdhcnIuaXSGNmh0dHBzOi8vaWRw
-LXNzYmFyLmJlbmljdWx0dXJhbGkuZ2Fyci5pdC9pZHAvc2hpYmJvbGV0aDAdBgNV
-HQ4EFgQU5OBUAd7iE3QPu87pd4OJ35n3xDwwDQYJKoZIhvcNAQEFBQADggEBAEtE
-EPZSrzpFbPHz65DWhxm6+FXDuRKYG9jwTabcikn4y19ykhauySmYUYfDE91vmKA/
-cJr4u720j9qvmZ/Z3pO6w8vD+SKrUHG5ez8m4ArGK35sYEEMA1JrW8oV6rcMk46x
-nL/TyhPinDLChZjlYEt5i4m2KlCipHc302KnbtLyjm8HsTAVkMxTibNCQHzI0m0B
-EmVP49peQFE/K1rZTi3f/z9I78UNUEz9SkbZBs4OBaFHd9RGtRuqD3lvWJchPJZ7
-D8mIA/RlAEXaL23Azho0dkiWphN6VkwqAW8btg6BPaeWCE8Z/EDZCinHXWyOE9is
-1UGZpgRi7oyzxW0d230=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-ssbar.beniculturali.garr.it:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-ssbar.beniculturali.garr.it: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">SSBAR - Soprintendenza Archeologica di Roma</OrganizationName>
-    <OrganizationName xml:lang="it">SSBAR - Soprintendenza Archeologica di Roma</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">SSBAR - Soprintendenza Archeologica di Roma</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="it">SSBAR - Soprintendenza Archeologica di Roma</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://archeoroma.beniculturali.it/en</OrganizationURL>
-    <OrganizationURL xml:lang="it">http://archeoroma.beniculturali.it</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <EmailAddress>idpcloud-service@garr.it</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp-stellamaris.irccs.garr.it-idp-shibboleth.xml b/swamid-interfederations-2.0/idp-stellamaris.irccs.garr.it-idp-shibboleth.xml
deleted file mode 100644
index 7d691e55..00000000
--- a/swamid-interfederations-2.0/idp-stellamaris.irccs.garr.it-idp-shibboleth.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:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" entityID="https://idp-stellamaris.irccs.garr.it/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2013-10-29T15:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</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">irccs-stellamaris.it</shibmd:Scope>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="en">IRCCS Fondazione Stella Maris</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="it">IRCCS Fondazione Stella Maris</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Identity Provider for the IRCCS Fondazione Stella Maris</mdui:Description>
-        <mdui:Description xml:lang="it">Identity Provider della IRCCS Fondazione Stella Maris</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.irccs-stellamaris.it/idem/info_en.html</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="it">http://www.irccs-stellamaris.it/idem/info.html</mdui:InformationURL>
-        <mdui:Logo height="16" width="16" xml:lang="en">https://idp-stellamaris.irccs.garr.it/idp/images/logoEnte-16x16_en.png</mdui:Logo>
-        <mdui:Logo height="16" width="16" xml:lang="it">https://idp-stellamaris.irccs.garr.it/idp/images/logoEnte-16x16_it.png</mdui:Logo>
-        <mdui:Logo height="60" width="80" xml:lang="en">https://idp-stellamaris.irccs.garr.it/idp/images/logoEnte-80x60_en.png</mdui:Logo>
-        <mdui:Logo height="60" width="80" xml:lang="it">https://idp-stellamaris.irccs.garr.it/idp/images/logoEnte-80x60_it.png</mdui:Logo>
-        <mdui:PrivacyStatementURL xml:lang="en">http://www.irccs-stellamaris.it/idem/privacy_en.html</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="it">http://www.irccs-stellamaris.it/idem/privacy.html</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDYDCCAkigAwIBAgIUFMkZfuL5qKNNf1/kspMp2S6XOIMwDQYJKoZIhvcNAQEF
-BQAwKDEmMCQGA1UEAxMdaWRwLXN0ZWxsYW1hcmlzLmlyY2NzLmdhcnIuaXQwHhcN
-MTMwOTAzMDkxNTAwWhcNMzMwOTAzMDkxNTAwWjAoMSYwJAYDVQQDEx1pZHAtc3Rl
-bGxhbWFyaXMuaXJjY3MuZ2Fyci5pdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
-AQoCggEBAInbhmdOnasbq+dw01M5N2VHMh3OrBIaHsmgVGOcn8dmWUL2j1WzSYZZ
-Ozgav7kY2dC5rCfFPabqpdfDoaM7OI56R6JTjg6KIHHj+gpVz+nWvBrlgiE0d1IL
-Hk2Xt6yP+0SYv8IjV7OoehHTTT/uvkX0nAKaJb+JjHLwiAE1JJmNrvI5JeURBgw2
-jbG+V4gF5EmN9xaWRyRumCCEYuzAnlB58kdMY6bV2A6n8BMB5MVS5i04dbwuckNQ
-LaibNzSSVyTJ5pyZZEVkRF57drR2FKENxW5bkZ7ipGnLEKoXC5mmADYmXcu0t96b
-TUiIkYIUWXDkS8XJML8y7X0qogM9A28CAwEAAaOBgTB/MF4GA1UdEQRXMFWCHWlk
-cC1zdGVsbGFtYXJpcy5pcmNjcy5nYXJyLml0hjRodHRwczovL2lkcC1zdGVsbGFt
-YXJpcy5pcmNjcy5nYXJyLml0L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBSQ5DrW
-VFYfupI80cbtPn5VpSFKOTANBgkqhkiG9w0BAQUFAAOCAQEADCkGyy6JL919kwGU
-72HLcSUCQ5dd00/B73MQwCRvSikVg5QtE+UiI5TFF6wvLLvGYItGJMTsoh4sWGRK
-XK6uukR2v5/vHcPLCmT34M4kGiSrSSjr/YETB7Ygb5av91u+CwzDJNr4en/rBgVc
-eZEro1ZfDubMkAy/ZjUYe50BzBikWjGbLNVz/yIinTAwaMbpDBfGkl5WYOIYJijy
-PeUvqINSd3PLIyJv5TUyi2Xmr6m1bDLcuE8gt0ocR/sJFkEQGgEVufvLAzBsdmP5
-tJheicSWcYTDZZfsp20xfHPiEyuQPvYatp+5aUfmlfhdWFsifQ5P0N1mdISV6crR
-lKnM7w==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-stellamaris.irccs.garr.it:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-stellamaris.irccs.garr.it: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-stellamaris.irccs.garr.it/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-stellamaris.irccs.garr.it/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp-stellamaris.irccs.garr.it/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-stellamaris.irccs.garr.it/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">irccs-stellamaris.it</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDYDCCAkigAwIBAgIUFMkZfuL5qKNNf1/kspMp2S6XOIMwDQYJKoZIhvcNAQEF
-BQAwKDEmMCQGA1UEAxMdaWRwLXN0ZWxsYW1hcmlzLmlyY2NzLmdhcnIuaXQwHhcN
-MTMwOTAzMDkxNTAwWhcNMzMwOTAzMDkxNTAwWjAoMSYwJAYDVQQDEx1pZHAtc3Rl
-bGxhbWFyaXMuaXJjY3MuZ2Fyci5pdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
-AQoCggEBAInbhmdOnasbq+dw01M5N2VHMh3OrBIaHsmgVGOcn8dmWUL2j1WzSYZZ
-Ozgav7kY2dC5rCfFPabqpdfDoaM7OI56R6JTjg6KIHHj+gpVz+nWvBrlgiE0d1IL
-Hk2Xt6yP+0SYv8IjV7OoehHTTT/uvkX0nAKaJb+JjHLwiAE1JJmNrvI5JeURBgw2
-jbG+V4gF5EmN9xaWRyRumCCEYuzAnlB58kdMY6bV2A6n8BMB5MVS5i04dbwuckNQ
-LaibNzSSVyTJ5pyZZEVkRF57drR2FKENxW5bkZ7ipGnLEKoXC5mmADYmXcu0t96b
-TUiIkYIUWXDkS8XJML8y7X0qogM9A28CAwEAAaOBgTB/MF4GA1UdEQRXMFWCHWlk
-cC1zdGVsbGFtYXJpcy5pcmNjcy5nYXJyLml0hjRodHRwczovL2lkcC1zdGVsbGFt
-YXJpcy5pcmNjcy5nYXJyLml0L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBSQ5DrW
-VFYfupI80cbtPn5VpSFKOTANBgkqhkiG9w0BAQUFAAOCAQEADCkGyy6JL919kwGU
-72HLcSUCQ5dd00/B73MQwCRvSikVg5QtE+UiI5TFF6wvLLvGYItGJMTsoh4sWGRK
-XK6uukR2v5/vHcPLCmT34M4kGiSrSSjr/YETB7Ygb5av91u+CwzDJNr4en/rBgVc
-eZEro1ZfDubMkAy/ZjUYe50BzBikWjGbLNVz/yIinTAwaMbpDBfGkl5WYOIYJijy
-PeUvqINSd3PLIyJv5TUyi2Xmr6m1bDLcuE8gt0ocR/sJFkEQGgEVufvLAzBsdmP5
-tJheicSWcYTDZZfsp20xfHPiEyuQPvYatp+5aUfmlfhdWFsifQ5P0N1mdISV6crR
-lKnM7w==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-stellamaris.irccs.garr.it:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-stellamaris.irccs.garr.it: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">IRCCS Fondazione Stella Maris</OrganizationName>
-    <OrganizationName xml:lang="it">IRCCS Fondazione Stella Maris</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">IRCCS Fondazione Stella Maris</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="it">IRCCS Fondazione Stella Maris</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.irccs-stellamaris.it</OrganizationURL>
-    <OrganizationURL xml:lang="it">http://www.irccs-stellamaris.it</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>technical support</GivenName>
-    <EmailAddress>mailto:ced@irccs-stellamaris.it</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp-stellamaris.irccs.garr.it.xml b/swamid-interfederations-2.0/idp-stellamaris.irccs.garr.it.xml
deleted file mode 100644
index 7d691e55..00000000
--- a/swamid-interfederations-2.0/idp-stellamaris.irccs.garr.it.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:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" entityID="https://idp-stellamaris.irccs.garr.it/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2013-10-29T15:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</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">irccs-stellamaris.it</shibmd:Scope>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="en">IRCCS Fondazione Stella Maris</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="it">IRCCS Fondazione Stella Maris</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Identity Provider for the IRCCS Fondazione Stella Maris</mdui:Description>
-        <mdui:Description xml:lang="it">Identity Provider della IRCCS Fondazione Stella Maris</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.irccs-stellamaris.it/idem/info_en.html</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="it">http://www.irccs-stellamaris.it/idem/info.html</mdui:InformationURL>
-        <mdui:Logo height="16" width="16" xml:lang="en">https://idp-stellamaris.irccs.garr.it/idp/images/logoEnte-16x16_en.png</mdui:Logo>
-        <mdui:Logo height="16" width="16" xml:lang="it">https://idp-stellamaris.irccs.garr.it/idp/images/logoEnte-16x16_it.png</mdui:Logo>
-        <mdui:Logo height="60" width="80" xml:lang="en">https://idp-stellamaris.irccs.garr.it/idp/images/logoEnte-80x60_en.png</mdui:Logo>
-        <mdui:Logo height="60" width="80" xml:lang="it">https://idp-stellamaris.irccs.garr.it/idp/images/logoEnte-80x60_it.png</mdui:Logo>
-        <mdui:PrivacyStatementURL xml:lang="en">http://www.irccs-stellamaris.it/idem/privacy_en.html</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="it">http://www.irccs-stellamaris.it/idem/privacy.html</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDYDCCAkigAwIBAgIUFMkZfuL5qKNNf1/kspMp2S6XOIMwDQYJKoZIhvcNAQEF
-BQAwKDEmMCQGA1UEAxMdaWRwLXN0ZWxsYW1hcmlzLmlyY2NzLmdhcnIuaXQwHhcN
-MTMwOTAzMDkxNTAwWhcNMzMwOTAzMDkxNTAwWjAoMSYwJAYDVQQDEx1pZHAtc3Rl
-bGxhbWFyaXMuaXJjY3MuZ2Fyci5pdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
-AQoCggEBAInbhmdOnasbq+dw01M5N2VHMh3OrBIaHsmgVGOcn8dmWUL2j1WzSYZZ
-Ozgav7kY2dC5rCfFPabqpdfDoaM7OI56R6JTjg6KIHHj+gpVz+nWvBrlgiE0d1IL
-Hk2Xt6yP+0SYv8IjV7OoehHTTT/uvkX0nAKaJb+JjHLwiAE1JJmNrvI5JeURBgw2
-jbG+V4gF5EmN9xaWRyRumCCEYuzAnlB58kdMY6bV2A6n8BMB5MVS5i04dbwuckNQ
-LaibNzSSVyTJ5pyZZEVkRF57drR2FKENxW5bkZ7ipGnLEKoXC5mmADYmXcu0t96b
-TUiIkYIUWXDkS8XJML8y7X0qogM9A28CAwEAAaOBgTB/MF4GA1UdEQRXMFWCHWlk
-cC1zdGVsbGFtYXJpcy5pcmNjcy5nYXJyLml0hjRodHRwczovL2lkcC1zdGVsbGFt
-YXJpcy5pcmNjcy5nYXJyLml0L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBSQ5DrW
-VFYfupI80cbtPn5VpSFKOTANBgkqhkiG9w0BAQUFAAOCAQEADCkGyy6JL919kwGU
-72HLcSUCQ5dd00/B73MQwCRvSikVg5QtE+UiI5TFF6wvLLvGYItGJMTsoh4sWGRK
-XK6uukR2v5/vHcPLCmT34M4kGiSrSSjr/YETB7Ygb5av91u+CwzDJNr4en/rBgVc
-eZEro1ZfDubMkAy/ZjUYe50BzBikWjGbLNVz/yIinTAwaMbpDBfGkl5WYOIYJijy
-PeUvqINSd3PLIyJv5TUyi2Xmr6m1bDLcuE8gt0ocR/sJFkEQGgEVufvLAzBsdmP5
-tJheicSWcYTDZZfsp20xfHPiEyuQPvYatp+5aUfmlfhdWFsifQ5P0N1mdISV6crR
-lKnM7w==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-stellamaris.irccs.garr.it:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-stellamaris.irccs.garr.it: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-stellamaris.irccs.garr.it/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-stellamaris.irccs.garr.it/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp-stellamaris.irccs.garr.it/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-stellamaris.irccs.garr.it/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">irccs-stellamaris.it</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDYDCCAkigAwIBAgIUFMkZfuL5qKNNf1/kspMp2S6XOIMwDQYJKoZIhvcNAQEF
-BQAwKDEmMCQGA1UEAxMdaWRwLXN0ZWxsYW1hcmlzLmlyY2NzLmdhcnIuaXQwHhcN
-MTMwOTAzMDkxNTAwWhcNMzMwOTAzMDkxNTAwWjAoMSYwJAYDVQQDEx1pZHAtc3Rl
-bGxhbWFyaXMuaXJjY3MuZ2Fyci5pdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
-AQoCggEBAInbhmdOnasbq+dw01M5N2VHMh3OrBIaHsmgVGOcn8dmWUL2j1WzSYZZ
-Ozgav7kY2dC5rCfFPabqpdfDoaM7OI56R6JTjg6KIHHj+gpVz+nWvBrlgiE0d1IL
-Hk2Xt6yP+0SYv8IjV7OoehHTTT/uvkX0nAKaJb+JjHLwiAE1JJmNrvI5JeURBgw2
-jbG+V4gF5EmN9xaWRyRumCCEYuzAnlB58kdMY6bV2A6n8BMB5MVS5i04dbwuckNQ
-LaibNzSSVyTJ5pyZZEVkRF57drR2FKENxW5bkZ7ipGnLEKoXC5mmADYmXcu0t96b
-TUiIkYIUWXDkS8XJML8y7X0qogM9A28CAwEAAaOBgTB/MF4GA1UdEQRXMFWCHWlk
-cC1zdGVsbGFtYXJpcy5pcmNjcy5nYXJyLml0hjRodHRwczovL2lkcC1zdGVsbGFt
-YXJpcy5pcmNjcy5nYXJyLml0L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBSQ5DrW
-VFYfupI80cbtPn5VpSFKOTANBgkqhkiG9w0BAQUFAAOCAQEADCkGyy6JL919kwGU
-72HLcSUCQ5dd00/B73MQwCRvSikVg5QtE+UiI5TFF6wvLLvGYItGJMTsoh4sWGRK
-XK6uukR2v5/vHcPLCmT34M4kGiSrSSjr/YETB7Ygb5av91u+CwzDJNr4en/rBgVc
-eZEro1ZfDubMkAy/ZjUYe50BzBikWjGbLNVz/yIinTAwaMbpDBfGkl5WYOIYJijy
-PeUvqINSd3PLIyJv5TUyi2Xmr6m1bDLcuE8gt0ocR/sJFkEQGgEVufvLAzBsdmP5
-tJheicSWcYTDZZfsp20xfHPiEyuQPvYatp+5aUfmlfhdWFsifQ5P0N1mdISV6crR
-lKnM7w==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-stellamaris.irccs.garr.it:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-stellamaris.irccs.garr.it: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">IRCCS Fondazione Stella Maris</OrganizationName>
-    <OrganizationName xml:lang="it">IRCCS Fondazione Stella Maris</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">IRCCS Fondazione Stella Maris</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="it">IRCCS Fondazione Stella Maris</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.irccs-stellamaris.it</OrganizationURL>
-    <OrganizationURL xml:lang="it">http://www.irccs-stellamaris.it</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>technical support</GivenName>
-    <EmailAddress>mailto:ced@irccs-stellamaris.it</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp-test.ucs.ed.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp-test.ucs.ed.ac.uk-idp-shibboleth.xml
deleted file mode 100644
index 98f5ead2..00000000
--- a/swamid-interfederations-2.0/idp-test.ucs.ed.ac.uk-idp-shibboleth.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://idp-test.ucs.ed.ac.uk/idp/shibboleth">
-  <!--
-		This is a Shibboleth IdP for the University of Edinburgh.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2010-04-30T17:05: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">ed.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDQDCCAiigAwIBAgIVANRDl0zVDHZ6OYfXOdpdFYUK94KWMA0GCSqGSIb3DQEB
-						BQUAMCAxHjAcBgNVBAMTFWlkcC10ZXN0LnVjcy5lZC5hYy51azAeFw0xMTA4MTcw
-						ODQ4NDRaFw0zMTA4MTcwODQ4NDRaMCAxHjAcBgNVBAMTFWlkcC10ZXN0LnVjcy5l
-						ZC5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKk0/tK2QdQr
-						T72QiLa3ntSOTJGlFEGDuwAAnhOXxH6T2+4oqy3QsoUCgI+6f4J8meXYmuCpOIHh
-						BrTv32n9SYgXI+KE40BLSym0ToGzWdz+fZAU+IHaX6gixQRjQdYTPPefDCfeLk3U
-						KTFpHZCK5tMJYiflwS/X7abnOF/yNypoeB3ZpI13qbHV+I5v8iHz6lxs8V2yutXE
-						srjCB+YKVuB5dyVU5ettupnpDQI7vzl3QzHVTm46NoT0MiGS3FH+Xkr/zDXl6ynr
-						Fxkg322Re8D3U1XzQTC/rP4WMqx0cc9Im3JaAf7happqm9fDJqeMdxodKqdgAMDI
-						dH1R1b4lyfUCAwEAAaNxMG8wTgYDVR0RBEcwRYIVaWRwLXRlc3QudWNzLmVkLmFj
-						LnVrhixodHRwczovL2lkcC10ZXN0LnVjcy5lZC5hYy51ay9pZHAvc2hpYmJvbGV0
-						aDAdBgNVHQ4EFgQUcMIFOHTjJnX/8pzUK1pZ+4jarLQwDQYJKoZIhvcNAQEFBQAD
-						ggEBAI6diGFybO93xeSV7Ww2N8thw3KZrSKou+SASMkCENS81L2Z2f0c9sAmpWZN
-						8Ewi3i7iPcGOvzxD8WQ6sY+roCvgbPJz/CY0NafC1OwJvZwYrv5MBRvWblilkGAr
-						jHp3oD7zQUgx7UsBSOFEnpVlY/JmXmhXYSwIZcSA6ShmyQTo+TRbM206gGCu6R4C
-						dB+g+QtBW0jl56x/wf7d86zb1KGp4f9/UalrP+7RCkQBqkGqZC714/Ib/GURnDSP
-						MJIL1EfWROWJ0aNTNs6IIU35GiQkDotZL4p43FpksZ6KATV6SDVlCF9b5xFvhZpb
-						ZMO08Pnpl7xrrBG2Gw7MPizq7c4=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-test.ucs.ed.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-test.ucs.ed.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-test.ucs.ed.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-test.ucs.ed.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp-test.ucs.ed.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-test.ucs.ed.ac.uk/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="false">ed.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDQDCCAiigAwIBAgIVANRDl0zVDHZ6OYfXOdpdFYUK94KWMA0GCSqGSIb3DQEB
-						BQUAMCAxHjAcBgNVBAMTFWlkcC10ZXN0LnVjcy5lZC5hYy51azAeFw0xMTA4MTcw
-						ODQ4NDRaFw0zMTA4MTcwODQ4NDRaMCAxHjAcBgNVBAMTFWlkcC10ZXN0LnVjcy5l
-						ZC5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKk0/tK2QdQr
-						T72QiLa3ntSOTJGlFEGDuwAAnhOXxH6T2+4oqy3QsoUCgI+6f4J8meXYmuCpOIHh
-						BrTv32n9SYgXI+KE40BLSym0ToGzWdz+fZAU+IHaX6gixQRjQdYTPPefDCfeLk3U
-						KTFpHZCK5tMJYiflwS/X7abnOF/yNypoeB3ZpI13qbHV+I5v8iHz6lxs8V2yutXE
-						srjCB+YKVuB5dyVU5ettupnpDQI7vzl3QzHVTm46NoT0MiGS3FH+Xkr/zDXl6ynr
-						Fxkg322Re8D3U1XzQTC/rP4WMqx0cc9Im3JaAf7happqm9fDJqeMdxodKqdgAMDI
-						dH1R1b4lyfUCAwEAAaNxMG8wTgYDVR0RBEcwRYIVaWRwLXRlc3QudWNzLmVkLmFj
-						LnVrhixodHRwczovL2lkcC10ZXN0LnVjcy5lZC5hYy51ay9pZHAvc2hpYmJvbGV0
-						aDAdBgNVHQ4EFgQUcMIFOHTjJnX/8pzUK1pZ+4jarLQwDQYJKoZIhvcNAQEFBQAD
-						ggEBAI6diGFybO93xeSV7Ww2N8thw3KZrSKou+SASMkCENS81L2Z2f0c9sAmpWZN
-						8Ewi3i7iPcGOvzxD8WQ6sY+roCvgbPJz/CY0NafC1OwJvZwYrv5MBRvWblilkGAr
-						jHp3oD7zQUgx7UsBSOFEnpVlY/JmXmhXYSwIZcSA6ShmyQTo+TRbM206gGCu6R4C
-						dB+g+QtBW0jl56x/wf7d86zb1KGp4f9/UalrP+7RCkQBqkGqZC714/Ib/GURnDSP
-						MJIL1EfWROWJ0aNTNs6IIU35GiQkDotZL4p43FpksZ6KATV6SDVlCF9b5xFvhZpb
-						ZMO08Pnpl7xrrBG2Gw7MPizq7c4=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-test.ucs.ed.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-test.ucs.ed.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">University of Edinburgh</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Edinburgh: V2 TEST</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.ed.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>shibboleth@ed.ac.uk</GivenName>
-    <EmailAddress>mailto:shibboleth@ed.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>shibboleth@ed.ac.uk</GivenName>
-    <EmailAddress>mailto:shibboleth@ed.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp-test.ucs.ed.ac.uk.xml b/swamid-interfederations-2.0/idp-test.ucs.ed.ac.uk.xml
deleted file mode 100644
index 98f5ead2..00000000
--- a/swamid-interfederations-2.0/idp-test.ucs.ed.ac.uk.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://idp-test.ucs.ed.ac.uk/idp/shibboleth">
-  <!--
-		This is a Shibboleth IdP for the University of Edinburgh.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2010-04-30T17:05: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">ed.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDQDCCAiigAwIBAgIVANRDl0zVDHZ6OYfXOdpdFYUK94KWMA0GCSqGSIb3DQEB
-						BQUAMCAxHjAcBgNVBAMTFWlkcC10ZXN0LnVjcy5lZC5hYy51azAeFw0xMTA4MTcw
-						ODQ4NDRaFw0zMTA4MTcwODQ4NDRaMCAxHjAcBgNVBAMTFWlkcC10ZXN0LnVjcy5l
-						ZC5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKk0/tK2QdQr
-						T72QiLa3ntSOTJGlFEGDuwAAnhOXxH6T2+4oqy3QsoUCgI+6f4J8meXYmuCpOIHh
-						BrTv32n9SYgXI+KE40BLSym0ToGzWdz+fZAU+IHaX6gixQRjQdYTPPefDCfeLk3U
-						KTFpHZCK5tMJYiflwS/X7abnOF/yNypoeB3ZpI13qbHV+I5v8iHz6lxs8V2yutXE
-						srjCB+YKVuB5dyVU5ettupnpDQI7vzl3QzHVTm46NoT0MiGS3FH+Xkr/zDXl6ynr
-						Fxkg322Re8D3U1XzQTC/rP4WMqx0cc9Im3JaAf7happqm9fDJqeMdxodKqdgAMDI
-						dH1R1b4lyfUCAwEAAaNxMG8wTgYDVR0RBEcwRYIVaWRwLXRlc3QudWNzLmVkLmFj
-						LnVrhixodHRwczovL2lkcC10ZXN0LnVjcy5lZC5hYy51ay9pZHAvc2hpYmJvbGV0
-						aDAdBgNVHQ4EFgQUcMIFOHTjJnX/8pzUK1pZ+4jarLQwDQYJKoZIhvcNAQEFBQAD
-						ggEBAI6diGFybO93xeSV7Ww2N8thw3KZrSKou+SASMkCENS81L2Z2f0c9sAmpWZN
-						8Ewi3i7iPcGOvzxD8WQ6sY+roCvgbPJz/CY0NafC1OwJvZwYrv5MBRvWblilkGAr
-						jHp3oD7zQUgx7UsBSOFEnpVlY/JmXmhXYSwIZcSA6ShmyQTo+TRbM206gGCu6R4C
-						dB+g+QtBW0jl56x/wf7d86zb1KGp4f9/UalrP+7RCkQBqkGqZC714/Ib/GURnDSP
-						MJIL1EfWROWJ0aNTNs6IIU35GiQkDotZL4p43FpksZ6KATV6SDVlCF9b5xFvhZpb
-						ZMO08Pnpl7xrrBG2Gw7MPizq7c4=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-test.ucs.ed.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-test.ucs.ed.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-test.ucs.ed.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-test.ucs.ed.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp-test.ucs.ed.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-test.ucs.ed.ac.uk/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="false">ed.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDQDCCAiigAwIBAgIVANRDl0zVDHZ6OYfXOdpdFYUK94KWMA0GCSqGSIb3DQEB
-						BQUAMCAxHjAcBgNVBAMTFWlkcC10ZXN0LnVjcy5lZC5hYy51azAeFw0xMTA4MTcw
-						ODQ4NDRaFw0zMTA4MTcwODQ4NDRaMCAxHjAcBgNVBAMTFWlkcC10ZXN0LnVjcy5l
-						ZC5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKk0/tK2QdQr
-						T72QiLa3ntSOTJGlFEGDuwAAnhOXxH6T2+4oqy3QsoUCgI+6f4J8meXYmuCpOIHh
-						BrTv32n9SYgXI+KE40BLSym0ToGzWdz+fZAU+IHaX6gixQRjQdYTPPefDCfeLk3U
-						KTFpHZCK5tMJYiflwS/X7abnOF/yNypoeB3ZpI13qbHV+I5v8iHz6lxs8V2yutXE
-						srjCB+YKVuB5dyVU5ettupnpDQI7vzl3QzHVTm46NoT0MiGS3FH+Xkr/zDXl6ynr
-						Fxkg322Re8D3U1XzQTC/rP4WMqx0cc9Im3JaAf7happqm9fDJqeMdxodKqdgAMDI
-						dH1R1b4lyfUCAwEAAaNxMG8wTgYDVR0RBEcwRYIVaWRwLXRlc3QudWNzLmVkLmFj
-						LnVrhixodHRwczovL2lkcC10ZXN0LnVjcy5lZC5hYy51ay9pZHAvc2hpYmJvbGV0
-						aDAdBgNVHQ4EFgQUcMIFOHTjJnX/8pzUK1pZ+4jarLQwDQYJKoZIhvcNAQEFBQAD
-						ggEBAI6diGFybO93xeSV7Ww2N8thw3KZrSKou+SASMkCENS81L2Z2f0c9sAmpWZN
-						8Ewi3i7iPcGOvzxD8WQ6sY+roCvgbPJz/CY0NafC1OwJvZwYrv5MBRvWblilkGAr
-						jHp3oD7zQUgx7UsBSOFEnpVlY/JmXmhXYSwIZcSA6ShmyQTo+TRbM206gGCu6R4C
-						dB+g+QtBW0jl56x/wf7d86zb1KGp4f9/UalrP+7RCkQBqkGqZC714/Ib/GURnDSP
-						MJIL1EfWROWJ0aNTNs6IIU35GiQkDotZL4p43FpksZ6KATV6SDVlCF9b5xFvhZpb
-						ZMO08Pnpl7xrrBG2Gw7MPizq7c4=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-test.ucs.ed.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-test.ucs.ed.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">University of Edinburgh</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Edinburgh: V2 TEST</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.ed.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>shibboleth@ed.ac.uk</GivenName>
-    <EmailAddress>mailto:shibboleth@ed.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>shibboleth@ed.ac.uk</GivenName>
-    <EmailAddress>mailto:shibboleth@ed.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp-unito-prod.cineca.it-idp-shibboleth.xml b/swamid-interfederations-2.0/idp-unito-prod.cineca.it-idp-shibboleth.xml
deleted file mode 100644
index 8738aa3e..00000000
--- a/swamid-interfederations-2.0/idp-unito-prod.cineca.it-idp-shibboleth.xml
+++ /dev/null
@@ -1,108 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" entityID="https://idp-unito-prod.cineca.it/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2013-02-18T15:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</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">unito.it</shibmd:Scope>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="en">University of Turin</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="it">Università di Torino</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Identity Provider for users of University of Turin</mdui:Description>
-        <mdui:Description xml:lang="it">Identity PRovider per gli utenti dell'Università di Torino</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.unito.it/unitoWAR/portletlocator/istruzioni_supporto_en</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="it">http://www.unito.it/unitoWAR/portletlocator/istruzioni_supporto</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">http://www.unito.it/unitoWAR/page/istituzionale_en/main/P181600246861349184985899</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="it">http://www.unito.it/unitoWAR/portletlocator/notecopyright</mdui:PrivacyStatementURL>
-        <mdui:Logo height="16" width="16" xml:lang="en">https://www.serviziweb.unito.it/_common/images/logoUnito_16x16.png</mdui:Logo>
-        <mdui:Logo height="16" width="16" xml:lang="it">https://www.serviziweb.unito.it/_common/images/logoUnito_16x16.png</mdui:Logo>
-        <mdui:Logo height="50" width="50" xml:lang="it">https://www.serviziweb.unito.it/_common/images/logoUnito_50x50.png</mdui:Logo>
-        <mdui:Logo height="60" width="80" xml:lang="it">https://www.serviziweb.unito.it/_common/images/logoUnito_80x60.png</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDVDCCAjygAwIBAgIVANS07VaPc/gsZ/51WPOjK7yoKLkxMA0GCSqGSIb3DQEB
-BQUAMCUxIzAhBgNVBAMTGmlkcC1kZXYxLnByaXZhdGUuY2luZWNhLml0MB4XDTA4
-MDUyMjEyMTQzMVoXDTI4MDUyMjEyMTQzMVowJTEjMCEGA1UEAxMaaWRwLWRldjEu
-cHJpdmF0ZS5jaW5lY2EuaXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
-AQCgnlCuoVO1sb9tZmBwkCvQgwNPOpOsYPjA4i1u1AXrsylRET2CX70hT4UK6BK+
-KDOV5uSpuS+NaSWVEBmJ6tC0X8fVzOv29g4qtCmhxEWAI48u4wT6FWFsuKFhTxja
-hs6efm5twHi2mErT6f6lqlSIJ4xO2tCBCNIg5fkrRQ95VuvwMv4DJH3vxh7Df+Uy
-jb4bIOtqf5dvf8Xyex72xF0fJxhA+fSz3bmUrF1JQHmYHbfI+YA9n6iqe12QjZZM
-hIFMh/8EH//KGv6CbKrADzvQcsxp5/E7D9RxMHE+fMZXiAG6G2Ecnr7SGjtZo1bN
-iMkNcmMF1HA8cDS7C9LjX/LrAgMBAAGjezB5MFgGA1UdEQRRME+CGmlkcC1kZXYx
-LnByaXZhdGUuY2luZWNhLml0hjFodHRwczovL2lkcC1kZXYxLnByaXZhdGUuY2lu
-ZWNhLml0L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBQA5cxSUsB+rEi7tszL9OEk
-j0g3UDANBgkqhkiG9w0BAQUFAAOCAQEADhdCzQ4Ykhg8L8cwJkxPqUd5v5r+NDt5
-pDoaiQRYc3fHdtFwM3gP/EjoDaUiVG0Y33ujAiuHUG3xsFdOXD74F4xHukvWi1Ju
-5JLy4jbfiflYlVG+tBnQJLGTs17XlfrCwu7rxkxwYUdoU/HsON+ILktn528x2VOu
-Layzxemfc+eMxAu5A3S3dgZeUsofk6eyfnqid/+HcfX02WrRC4+LO3w1zLbMSpBZ
-rKIhw5Oev5p6kVlaDPyF+Jlm5FaSSpYCKBYnT58GuwOrWx6QDRR8MGGWR537letk
-07bJX5s43M2G37DFfX90r9NG22Fp3CkbS8kiAXgJQP/P5Dy3PL6+uA==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.unito.it:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.unito.it: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.unito.it/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.unito.it/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.unito.it/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.unito.it/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">unito.it</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDVDCCAjygAwIBAgIVANS07VaPc/gsZ/51WPOjK7yoKLkxMA0GCSqGSIb3DQEB
-BQUAMCUxIzAhBgNVBAMTGmlkcC1kZXYxLnByaXZhdGUuY2luZWNhLml0MB4XDTA4
-MDUyMjEyMTQzMVoXDTI4MDUyMjEyMTQzMVowJTEjMCEGA1UEAxMaaWRwLWRldjEu
-cHJpdmF0ZS5jaW5lY2EuaXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
-AQCgnlCuoVO1sb9tZmBwkCvQgwNPOpOsYPjA4i1u1AXrsylRET2CX70hT4UK6BK+
-KDOV5uSpuS+NaSWVEBmJ6tC0X8fVzOv29g4qtCmhxEWAI48u4wT6FWFsuKFhTxja
-hs6efm5twHi2mErT6f6lqlSIJ4xO2tCBCNIg5fkrRQ95VuvwMv4DJH3vxh7Df+Uy
-jb4bIOtqf5dvf8Xyex72xF0fJxhA+fSz3bmUrF1JQHmYHbfI+YA9n6iqe12QjZZM
-hIFMh/8EH//KGv6CbKrADzvQcsxp5/E7D9RxMHE+fMZXiAG6G2Ecnr7SGjtZo1bN
-iMkNcmMF1HA8cDS7C9LjX/LrAgMBAAGjezB5MFgGA1UdEQRRME+CGmlkcC1kZXYx
-LnByaXZhdGUuY2luZWNhLml0hjFodHRwczovL2lkcC1kZXYxLnByaXZhdGUuY2lu
-ZWNhLml0L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBQA5cxSUsB+rEi7tszL9OEk
-j0g3UDANBgkqhkiG9w0BAQUFAAOCAQEADhdCzQ4Ykhg8L8cwJkxPqUd5v5r+NDt5
-pDoaiQRYc3fHdtFwM3gP/EjoDaUiVG0Y33ujAiuHUG3xsFdOXD74F4xHukvWi1Ju
-5JLy4jbfiflYlVG+tBnQJLGTs17XlfrCwu7rxkxwYUdoU/HsON+ILktn528x2VOu
-Layzxemfc+eMxAu5A3S3dgZeUsofk6eyfnqid/+HcfX02WrRC4+LO3w1zLbMSpBZ
-rKIhw5Oev5p6kVlaDPyF+Jlm5FaSSpYCKBYnT58GuwOrWx6QDRR8MGGWR537letk
-07bJX5s43M2G37DFfX90r9NG22Fp3CkbS8kiAXgJQP/P5Dy3PL6+uA==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.unito.it:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.unito.it: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="it">Università di Torino</OrganizationName>
-    <OrganizationName xml:lang="en">University of Turin</OrganizationName>
-    <OrganizationDisplayName xml:lang="it">Università di Torino</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">University of Turin</OrganizationDisplayName>
-    <OrganizationURL xml:lang="it">http://www.unito.it</OrganizationURL>
-    <OrganizationURL xml:lang="en">http://www.unito.it/unitoWAR/portletlocator/home_en</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Technical Support</SurName>
-    <EmailAddress>portale-supporto@unito.it</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp-unito-prod.cineca.it.xml b/swamid-interfederations-2.0/idp-unito-prod.cineca.it.xml
deleted file mode 100644
index 8738aa3e..00000000
--- a/swamid-interfederations-2.0/idp-unito-prod.cineca.it.xml
+++ /dev/null
@@ -1,108 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" entityID="https://idp-unito-prod.cineca.it/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2013-02-18T15:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</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">unito.it</shibmd:Scope>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="en">University of Turin</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="it">Università di Torino</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Identity Provider for users of University of Turin</mdui:Description>
-        <mdui:Description xml:lang="it">Identity PRovider per gli utenti dell'Università di Torino</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.unito.it/unitoWAR/portletlocator/istruzioni_supporto_en</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="it">http://www.unito.it/unitoWAR/portletlocator/istruzioni_supporto</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">http://www.unito.it/unitoWAR/page/istituzionale_en/main/P181600246861349184985899</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="it">http://www.unito.it/unitoWAR/portletlocator/notecopyright</mdui:PrivacyStatementURL>
-        <mdui:Logo height="16" width="16" xml:lang="en">https://www.serviziweb.unito.it/_common/images/logoUnito_16x16.png</mdui:Logo>
-        <mdui:Logo height="16" width="16" xml:lang="it">https://www.serviziweb.unito.it/_common/images/logoUnito_16x16.png</mdui:Logo>
-        <mdui:Logo height="50" width="50" xml:lang="it">https://www.serviziweb.unito.it/_common/images/logoUnito_50x50.png</mdui:Logo>
-        <mdui:Logo height="60" width="80" xml:lang="it">https://www.serviziweb.unito.it/_common/images/logoUnito_80x60.png</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDVDCCAjygAwIBAgIVANS07VaPc/gsZ/51WPOjK7yoKLkxMA0GCSqGSIb3DQEB
-BQUAMCUxIzAhBgNVBAMTGmlkcC1kZXYxLnByaXZhdGUuY2luZWNhLml0MB4XDTA4
-MDUyMjEyMTQzMVoXDTI4MDUyMjEyMTQzMVowJTEjMCEGA1UEAxMaaWRwLWRldjEu
-cHJpdmF0ZS5jaW5lY2EuaXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
-AQCgnlCuoVO1sb9tZmBwkCvQgwNPOpOsYPjA4i1u1AXrsylRET2CX70hT4UK6BK+
-KDOV5uSpuS+NaSWVEBmJ6tC0X8fVzOv29g4qtCmhxEWAI48u4wT6FWFsuKFhTxja
-hs6efm5twHi2mErT6f6lqlSIJ4xO2tCBCNIg5fkrRQ95VuvwMv4DJH3vxh7Df+Uy
-jb4bIOtqf5dvf8Xyex72xF0fJxhA+fSz3bmUrF1JQHmYHbfI+YA9n6iqe12QjZZM
-hIFMh/8EH//KGv6CbKrADzvQcsxp5/E7D9RxMHE+fMZXiAG6G2Ecnr7SGjtZo1bN
-iMkNcmMF1HA8cDS7C9LjX/LrAgMBAAGjezB5MFgGA1UdEQRRME+CGmlkcC1kZXYx
-LnByaXZhdGUuY2luZWNhLml0hjFodHRwczovL2lkcC1kZXYxLnByaXZhdGUuY2lu
-ZWNhLml0L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBQA5cxSUsB+rEi7tszL9OEk
-j0g3UDANBgkqhkiG9w0BAQUFAAOCAQEADhdCzQ4Ykhg8L8cwJkxPqUd5v5r+NDt5
-pDoaiQRYc3fHdtFwM3gP/EjoDaUiVG0Y33ujAiuHUG3xsFdOXD74F4xHukvWi1Ju
-5JLy4jbfiflYlVG+tBnQJLGTs17XlfrCwu7rxkxwYUdoU/HsON+ILktn528x2VOu
-Layzxemfc+eMxAu5A3S3dgZeUsofk6eyfnqid/+HcfX02WrRC4+LO3w1zLbMSpBZ
-rKIhw5Oev5p6kVlaDPyF+Jlm5FaSSpYCKBYnT58GuwOrWx6QDRR8MGGWR537letk
-07bJX5s43M2G37DFfX90r9NG22Fp3CkbS8kiAXgJQP/P5Dy3PL6+uA==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.unito.it:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.unito.it: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.unito.it/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.unito.it/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.unito.it/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.unito.it/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">unito.it</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDVDCCAjygAwIBAgIVANS07VaPc/gsZ/51WPOjK7yoKLkxMA0GCSqGSIb3DQEB
-BQUAMCUxIzAhBgNVBAMTGmlkcC1kZXYxLnByaXZhdGUuY2luZWNhLml0MB4XDTA4
-MDUyMjEyMTQzMVoXDTI4MDUyMjEyMTQzMVowJTEjMCEGA1UEAxMaaWRwLWRldjEu
-cHJpdmF0ZS5jaW5lY2EuaXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
-AQCgnlCuoVO1sb9tZmBwkCvQgwNPOpOsYPjA4i1u1AXrsylRET2CX70hT4UK6BK+
-KDOV5uSpuS+NaSWVEBmJ6tC0X8fVzOv29g4qtCmhxEWAI48u4wT6FWFsuKFhTxja
-hs6efm5twHi2mErT6f6lqlSIJ4xO2tCBCNIg5fkrRQ95VuvwMv4DJH3vxh7Df+Uy
-jb4bIOtqf5dvf8Xyex72xF0fJxhA+fSz3bmUrF1JQHmYHbfI+YA9n6iqe12QjZZM
-hIFMh/8EH//KGv6CbKrADzvQcsxp5/E7D9RxMHE+fMZXiAG6G2Ecnr7SGjtZo1bN
-iMkNcmMF1HA8cDS7C9LjX/LrAgMBAAGjezB5MFgGA1UdEQRRME+CGmlkcC1kZXYx
-LnByaXZhdGUuY2luZWNhLml0hjFodHRwczovL2lkcC1kZXYxLnByaXZhdGUuY2lu
-ZWNhLml0L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBQA5cxSUsB+rEi7tszL9OEk
-j0g3UDANBgkqhkiG9w0BAQUFAAOCAQEADhdCzQ4Ykhg8L8cwJkxPqUd5v5r+NDt5
-pDoaiQRYc3fHdtFwM3gP/EjoDaUiVG0Y33ujAiuHUG3xsFdOXD74F4xHukvWi1Ju
-5JLy4jbfiflYlVG+tBnQJLGTs17XlfrCwu7rxkxwYUdoU/HsON+ILktn528x2VOu
-Layzxemfc+eMxAu5A3S3dgZeUsofk6eyfnqid/+HcfX02WrRC4+LO3w1zLbMSpBZ
-rKIhw5Oev5p6kVlaDPyF+Jlm5FaSSpYCKBYnT58GuwOrWx6QDRR8MGGWR537letk
-07bJX5s43M2G37DFfX90r9NG22Fp3CkbS8kiAXgJQP/P5Dy3PL6+uA==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.unito.it:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.unito.it: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="it">Università di Torino</OrganizationName>
-    <OrganizationName xml:lang="en">University of Turin</OrganizationName>
-    <OrganizationDisplayName xml:lang="it">Università di Torino</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">University of Turin</OrganizationDisplayName>
-    <OrganizationURL xml:lang="it">http://www.unito.it</OrganizationURL>
-    <OrganizationURL xml:lang="en">http://www.unito.it/unitoWAR/portletlocator/home_en</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Technical Support</SurName>
-    <EmailAddress>portale-supporto@unito.it</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.aai.arnes.si-idp-20090116.xml b/swamid-interfederations-2.0/idp.aai.arnes.si-idp-20090116.xml
deleted file mode 100644
index 46662005..00000000
--- a/swamid-interfederations-2.0/idp.aai.arnes.si-idp-20090116.xml
+++ /dev/null
@@ -1,248 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.aai.arnes.si/idp/20090116">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://aai.arnes.si" registrationInstant="2014-08-25T15:08:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://aai.arnes.si/static/doc/ArnesAAI_general.pdf</mdrpi:RegistrationPolicy>
-      <mdrpi:RegistrationPolicy xml:lang="sl">https://aai.arnes.si/static/doc/ArnesAAI_splosni_pogoji.pdf</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </md:Extensions>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">arnes.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">test.arnes.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">guest.arnes.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-pirnice.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">zvkds.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osrace.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ddvic.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">iam.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sola-zetale.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osmalecnik.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-volicina.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vrtec-ljutomer.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vrtec-logatec.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-zelezniki.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ostrzic.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">8talcev.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ososkar.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-bistrica.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ostomaz.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vergerio.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mps.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-gracisce.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-preserjeradomlje.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-dobravlje.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-starse.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vist.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">oscg-info.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-preddvor.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vrtci-brezovica.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-strocjavas.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cufar.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sola-miklavz.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">oslesce.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-dutovlje.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-danilekumar.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osenams.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-hrvatini.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os2ms.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-svjurij.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">seps.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sc-sezana.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osbeltinci.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osmesto.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-breg.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-raka.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">oslava.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-tabor1.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-gpetrovci.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ospg.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osik.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gimnazija-ormoz.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">poldestrazisar.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">11sola.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ossvj.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osormoz.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sola-secovlje.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">oskolezija.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">abesednjak.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ostrojica.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-dornberk.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-iroba.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-cerknica.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">oskoseze.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-laporje.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-dk.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-ljudskivrtptuj.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">oscankova.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-podgrad.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-verzej.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">konsak.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">miroslav-vilhar.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ss-crnomelj.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-franaerjavca.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-brusnice.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-sentjernej.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">oszuzemberk.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-drska.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-cirkovce.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ossmartno-sg.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-gabrovka-dole.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-kapela.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vstp.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-sentjanz.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osgorjup.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-mostnasoci.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cirkulane-zavrc.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osblanca.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gros-radgona.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osdravlje.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osmokronog.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sgtsizola.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osmetlika.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osmsn.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">tsckr.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hrusevec.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osvodmat.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ssjj.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-kutezevo.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vrtec-kamnik.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-ljubecna.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sola-podlehnik.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">helpdesk.arnes.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-dragatus.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osmislinja.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ospuconci.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ospreska.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-kosana.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ospreserje.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">oszalog.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">icp-mb.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-radenci.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">oslucija.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vrteczala.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ospo-slb.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osbakovci.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-divaca.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ekonomska-ms.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hinko-smrekar.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osdragomelj.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sc-s.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">arrs.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sssb.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-dt.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">dos-prosenjakovci.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osbos.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osstopice.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-odranci.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">oshjh-staritrg.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-leon.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-ajdovscina.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-igroharja.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kis.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">o-azilb.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-kanal.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-trebnje.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mklj.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">okrogar.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-kamnica.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osfrsmb.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-dobrna.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-jelsane.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-dobrovo.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osmoravce.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osferdavesela.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ossmartno-tuhinj.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-pivka.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-sladki-vrh.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cdi-univerzum.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-miklavz.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osbohinj.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gimjes.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-brezovica.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">oslimbus.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osorehek.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osmslj.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">oslag.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-loka-crnomelj.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-turnisce.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osgusi.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">oszrece.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">jozmos.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-negova.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bic-lj.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">koseze.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osmjc.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-ivantavcar.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">oskm.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osvp.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osicljutomer.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ospoljane.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osflv.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osfram.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">oskosmac.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osld.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mdj.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ng-slo.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">dssl.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gimidrija.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sszagorje.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fmalgaja.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">slivnica.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osdobje.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vzgojni-zavod-verzej.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">konservatorij-maribor.si</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">ARNES</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="sl">Arnes</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Identity provider for organization Arnes</mdui:Description>
-        <mdui:Description xml:lang="sl">Ponudnik identitet organizacije Arnes</mdui:Description>
-        <mdui:Keywords xml:lang="en">arnes idp identityd</mdui:Keywords>
-        <mdui:Keywords xml:lang="sl">arnes idp identiteta</mdui:Keywords>
-        <mdui:Logo height="135" width="150">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAJYAAACHCAYAAAD0i6DcAAAKymlDQ1BJQ0MgUHJvZmlsZQAASA2tlndU08kWx+f3S2+0QChSQm+C9Cq9BpBeBBshCSSUEBKCiNiQxRVYUVREQF2BpYiCawFkLYgoFhbBhn2DLCrKc7FgQ+X9Akt23ztv/3tzzsx8ft+5c3935tw55wJAHmQKBOmwAgAZ/GxhZIA3fWl8Ah33GOAADMjADNCYLJHAKzw8BPxje38HQNLFmxZSX/9o9r8XFNkcEQsAKBxZTmKLWBkIn0B6O0sgzAYAJfWnvzpbIOXtCCsLkQARrpdyyhx3SjlpjvtnbaIjfRAbCQB4MpMpTAGANIHo9BxWCuKHTEbYis/m8RFejLA7i8tkI5yP8MKMjEwpNyFskvQ3Pyl/YyYzSeaTyUyR8dxZkJ3Ij315IkE6c83sx/9zyEgXI/c123SRkcwVBkYiswZyZzVpmcEy5ieFhs3rPORE88wVB8bMM0vkg9zl3F420zd4nsVpMV7zzBQi9KcNL5sRPc/CzEiZf356aMi8zuUwZMwR+UXN68k8f8Y853Gj4+Y5hxcbOs+itChZDHlcH5kuFEfKYk4W+svOmCFCdv4ZG4v517+yudGB8zqb4+s3zxx+jCweQba3zI8gfTa/Z++Qkx4g00U5UbK92cJomZ7KDJLm66y9IDtcdicgBPiBUEBH5mhgA+yAPTIKwGqAZGM2JxfJPQB8MgVrhLwUbjbdC3ktHDqDz7JcSLexsrYDQPr2pDYAvL07+6YgGv4vLX0ZAI6bkbyWpj191gwkIT5PeACgsO8vzQSHPAd3AM6ZssTCnDk7tHTCACKQB8pAHWgDfWACLJDoHIAr8ESiDgJhSMzxYCVgAS7IAEIk6nywCRSBErAd7AZV4ACoA03gCDgGOsBpcB5cAtfAILgNHgAJGAMvwSR4D6YhCMJBFIgKqUM6kCFkDtlATpA75AeFQJFQPJQIpUB8SAzlQ5uhEqgcqoIOQs3Qz9Ap6Dx0BRqC7kEj0Dj0BvoMo2AyrAxrwUbwItgJ9oKD4Wh4BZwCZ8F5cCG8Da6Ea+HDcDt8Hr4G34Yl8Et4CgVQJBQNpYuyQDmhfFBhqARUMkqIWo8qRlWgalGtqC5UH+omSoKaQH1CY9FUNB1tgXZFB6Jj0Cx0Fno9uhRdhW5Ct6N70TfRI+hJ9DcMBaOJMce4YBiYpZgUzGpMEaYC04A5ibmIuY0Zw7zHYrE0rDHWERuIjcemYtdiS7H7sG3YbuwQdhQ7hcPh1HHmODdcGI6Jy8YV4fbiDuPO4W7gxnAf8SS8Dt4G749PwPPxBfgK/CH8WfwN/DP8NEGBYEhwIYQR2IQ1hDJCPaGLcJ0wRpgmKhKNiW7EaGIqcROxkthKvEh8SHxLIpH0SM6kCBKPtJFUSTpKukwaIX0iK5HNyD7k5WQxeRu5kdxNvkd+S6FQjCielARKNmUbpZlygfKY8lGOKmcpx5Bjy22Qq5Zrl7sh90qeIG8o7yW/Uj5PvkL+uPx1+QkFgoKRgo8CU2G9QrXCKYVhhSlFqqK1YphihmKp4iHFK4rPlXBKRkp+SmylQqU6pQtKo1QUVZ/qQ2VRN1PrqRepY8pYZWNlhnKqconyEeUB5UkVJRU7lViVXJVqlTMqEhqKZkRj0NJpZbRjtDu0z6paql6qHNWtqq2qN1Q/qC1Q81TjqBWrtandVvusTlf3U09T36Heof5IA61hphGhsVpjv8ZFjYkFygtcF7AWFC84tuC+JqxpphmpuVazTrNfc0pLWytAS6C1V+uC1oQ2TdtTO1V7l/ZZ7XEdqo67Dk9nl845nRd0FboXPZ1eSe+lT+pq6gbqinUP6g7oTusZ68XoFei16T3SJ+o76Sfr79Lv0Z800DFYYpBv0GJw35Bg6GTINdxj2Gf4wcjYKM5oi1GH0XNjNWOGcZ5xi/FDE4qJh0mWSa3JLVOsqZNpmuk+00Ez2MzejGtWbXbdHDZ3MOeZ7zMfWohZ6LyQv7B24bAF2cLLIseixWLEkmYZYllg2WH5apHBooRFOxb1LfpmZW+VblVv9cBayTrIusC6y/qNjZkNy6ba5pYtxdbfdoNtp+1rO3M7jt1+u7v2VPsl9lvse+y/Ojg6CB1aHcYdDRwTHWsch52UncKdSp0uO2OcvZ03OJ92/uTi4JLtcszlD1cL1zTXQ67PFxsv5iyuXzzqpufGdDvoJnGnuye6/+gu8dD1YHrUejzx1PdkezZ4PvMy9Ur1Ouz1ytvKW+h90vuDj4vPOp9uX5RvgG+x74Cfkl+MX5XfY389/xT/Fv/JAPuAtQHdgZjA4MAdgcMMLQaL0cyYDHIMWhfUG0wOjgquCn4SYhYiDOlaAi8JWrJzycNQw1B+aEcYCGOE7Qx7FG4cnhX+SwQ2IjyiOuJppHVkfmRfFDVqVdShqPfR3tFl0Q9iTGLEMT2x8rHLY5tjP8T5xpXHSZYuWrpu6bV4jXhefGcCLiE2oSFhapnfst3LxpbbLy9afmeF8YrcFVdWaqxMX3lmlfwq5qrjiZjEuMRDiV+YYcxa5lQSI6kmaZLlw9rDesn2ZO9ij3PcOOWcZ8luyeXJz1PcUnamjHM9uBXcCZ4Pr4r3OjUw9UDqh7SwtMa0mfS49LYMfEZixim+Ej+N35upnZmbOSQwFxQJJFkuWbuzJoXBwgYRJFoh6sxWRoqcfrGJ+DvxSI57TnXOx9Wxq4/nKubyc/vXmK3ZuuZZnn/eT2vRa1lre/J18zflj6zzWndwPbQ+aX3PBv0NhRvGNgZsbNpE3JS26dcCq4Lygneb4zZ3FWoVbiwc/S7gu5YiuSJh0fAW1y0Hvkd/z/t+YKvt1r1bvxWzi6+WWJVUlHwpZZVe/cH6h8ofZrYlbxsocyjbvx27nb/9zg6PHU3liuV55aM7l+xs30XfVbzr3e5Vu69U2FUc2EPcI94jqQyp7NxrsHf73i9V3Krb1d7VbTWaNVtrPuxj77ux33N/6wGtAyUHPv/I+/HuwYCD7bVGtRV12Lqcuqf1sfV9Pzn91Nyg0VDS8LWR3yhpimzqbXZsbj6keaisBW4Rt4wfXn548Ijvkc5Wi9aDbbS2kqPgqPjoi58Tf75zLPhYz3Gn460nDE/UnKSeLG6H2te0T3ZwOySd8Z1Dp4JO9XS5dp38xfKXxtO6p6vPqJwpO0s8W3h25lzeualuQffE+ZTzoz2reh5cWHrhVm9E78DF4IuXL/lfutDn1Xfustvl01dcrpy66nS145rDtfZ++/6Tv9r/enLAYaD9uuP1zkHnwa6hxUNnb3jcOH/T9+alW4xb126H3h66E3Pn7vDyYcld9t3n99Lvvb6fc3/6wcaHmIfFjxQeVTzWfFz7m+lvbRIHyZkR35H+J1FPHoyyRl/+Lvr9y1jhU8rTimc6z5qf2zw/Pe4/Pvhi2Yuxl4KX0xNF/1L8V80rk1cn/vD8o39y6eTYa+HrmTelb9XfNr6ze9czFT71+H3G++kPxR/VPzZ9cvrU9znu87Pp1V9wXyq/mn7t+hb87eFMxsyMgClkztYCKGSEk5MBeNMIACUeAOogAES5udp41gKaq+cRhv7sUvm/eK5+li4gNQSo6wYgGunhGwHY7wmAMQBACZnDkR7tCWBbW1lHVqRNlGxrMwsQqQMpTSpmZt4iNSHOFICvwzMz0x0zM18bkFrnPgDd7+dqcqm1VSsAir5SGqDmSqf/aP8GsNP+fxCsRgoAAAAJcEhZcwAACxMAAAsTAQCanBgAAAGdaVRYdFhNTDpjb20uYWRvYmUueG1wAAAAAAA8eDp4bXBtZXRhIHhtbG5zOng9ImFkb2JlOm5zOm1ldGEvIiB4OnhtcHRrPSJYTVAgQ29yZSA1LjQuMCI+CiAgIDxyZGY6UkRGIHhtbG5zOnJkZj0iaHR0cDovL3d3dy53My5vcmcvMTk5OS8wMi8yMi1yZGYtc3ludGF4LW5zIyI+CiAgICAgIDxyZGY6RGVzY3JpcHRpb24gcmRmOmFib3V0PSIiCiAgICAgICAgICAgIHhtbG5zOmV4aWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20vZXhpZi8xLjAvIj4KICAgICAgICAgPGV4aWY6UGl4ZWxYRGltZW5zaW9uPjUwMDwvZXhpZjpQaXhlbFhEaW1lbnNpb24+CiAgICAgICAgIDxleGlmOlBpeGVsWURpbWVuc2lvbj40NTA8L2V4aWY6UGl4ZWxZRGltZW5zaW9uPgogICAgICA8L3JkZjpEZXNjcmlwdGlvbj4KICAgPC9yZGY6UkRGPgo8L3g6eG1wbWV0YT4K4RlDEgAAJ9RJREFUeAHtXQd4XNWVPm9mNJIly5ZkuclNci+44optbHqHhGyWhARiwBBMEkI22c2GZJNNSHazJdmE0EILNaEHMLjjbuMGuBfcu2RJtmVZlqbv/9/3rjwaRtKMPJJG0rv6Rq/deu5/zzn33PPuM0IIYgebAgmmgCPB+dnZ2RRQFLCBZQOhUShgA6tRyGpnagMrHgxQHbVV0pgoZgMrJjIxEkBlGObPBle9VLOBVS+JiClOnA0JlZVI8EypDa4YaGYDKwYi6SjBU8XiffWXIsGACS5yMTtEpYANrKhkibhJEQiu5cwfIkZ2D/GtfN+MELSBFUGp6ksbWNWkiO0k5ao7xD/vXyVYekzEAfLZ+lZUwtnAikqWKDctruXolCeOcd8V3wdPRIlk39IUsIGlKRHHMWXqrRJY9xsJ7N9qKfLBOFK3jag2sOLpZ821cnuIc/KvxTf79xCFVORtMkaS0aZIJEXqvTYVdtekWyS45i/i373JTBGyuVY46WxghVMjlnNyLQRnz/7iGHmL+Je8ZHOtKHSzgRWFKHXfMk0PkpImzgnflOCKP0rg0C4ziT1DrCadDaxqUsR/4hgwSiRVJPDJwvgTt/IUNrAa0sGmNBRH5x7iuOgbmCH+jwRPnbCXesJoaQMrjBixn5ri0HC3E8fAaRI6cFQC+zZbyW1rPAlhAyt2NEXENAHk6D1EicPg1mW2Eh9GIRtYYcSI79SUh47cPDG6Zkpw95sSPFlkZmEr8TbHig9MYbEtPcvI7gJgXSOhE7skeHSvFcEWhzbHCsNKfKcmsoy0dDE6DxXxw5vmwDYrCwt18WXYqmLbwLqQ7lQizyFGpz4iLgDr8AYJ+TyWr9aFZNzy09rASkAfGh07irihuxcBWDQ7MLRxPasFACtefQXxuW6nfjy3fmZ3R/+v44Sni8U71AKP0bE7uBSKKt90HlixpI9em1ZxN+mB5VvxngRL4FTHEBMXQA/T20D9eG79VAYAXJDKkM880jOBANBxwtMRKQwaoNGAYkUxUtspUWggu2DpUTNdG/8PzSBJA0GEDg+VHpFgUTfhtF6BQHd4ZLV1/PKTEjiC2dm5s5j+HwIXKVfnoYrjIt4yrL9AB3KkiKS0E8OdKZKeK9K+sxjpaeLI6ipGh1wxsvDrkCNGaroJUF2WAjbrFTEeXS51i49DehDUVk+dVys/Jj2wjK75Eiw+iG6YGFNXBAsPSWDDHIAlG7hETzsNMTJSAZIeEvJ0llBVlciZPQDsZxI8DUc9YE1wi8q3pOFHLHUcIUbOUDHyxoijYLg4ewzAzA/2Klja8RQ/BMXJcOQlgKUMNzgPlR4yn0WCj2naUEheYFn9Z2R1k+Ani8wuqauztDsLFoadXByuK/g9EvLiV3FGQnidK1hyVILH9kno8HoJHVsEcGyW0Gks0Rx8TQKrYUlIBUfK+7o4hlwhzoFjxdGznxjwbtAYA3RVaYYTwC0vhu+fXwwXtPk2HJIXWFZnOTp1E3/hRnCbc6ZoUrqOhbraOk6JrCgPLfCJCxyMv/QOIp17irPfSBU55K2UUPExiNLPJbjzYwnueRfA20IWBgPoavHvf1kCc3HZ7y5xjr5FnIMBMniTSopbMTDDnSuhs7tFKs+KZOaAc5niPEpNWv2t5AWWhR1HVicR2IYo4px9BqOz0Cf14Eop43V2HZUhHcE6ATekqDN69BMHfjLhWiji90vg808hWjGB2PMsniNN+yngavPFtwPeo5kp4rz0MbwSBuu7CyA1QM5z4FjeqnqrqEtvrcfkBZbuGuo1nQdJEN4DClgJ6Qkgsxqc1SfIWQMORwBNvZEzKU9cY6+CVf0B8a8BwDb8EhwKj7tPB+BPi3/+tyEWkTR9OP75ASrkF4pQ7vGkrYXkpgAVZATngHES2DgbZ7jW4kw9SfQ/gIL5a11OTfOCAE4q6jBaUu/4hbh/sBU+WA9DNC7FLPMYlPppIhmjASaYMQx4/fm2g7vuP1+x2sTy+Rit8iy5gWWxFUefIfAeeEWCJywbUVN1Vg2QEeQG3oYeJqnfekTcs9aIdIJYLFoGvHNaCUDCPmakDxbfS5eInxMOlR73m6q+SQTRJAeWSSlHt96wLWVJYNvHFukgqpo6VHMxck2HuIZOkLTvvSium16wagIAUZRSz0q9SLzPXSXeBS/jnsVl2xi4khtYHPHoECOtvThG/VT8Kx+HDlOpOlZ1otWlTXrQAAtCRKJe7mu+JY6+N2EmCM8GB7V7gsspRpfx4v/7neJ563dQvayF6TYEruQGlkKMyZ2cwyB2tiyHCzCMmgzN3UkOcihUo7Icdq/PYSSFBZ+g8p/G7wwYlRd+WpMksPhfxPO330Afg7i0BopK2Mr/tQBgmR3o7D1QjL554l/9FvoPi3KaczRXB5l4lxC8RkNF70L89YLifhIuNONgkhgIs8NG1NMDzgVwrXsE4HpEmU3aCriSH1haHMLg6Jj4Ewku+28JHNhuwsmaNTYPtkxkBU5gPRLSWVJgRC07LI7hX5bUWS+IZF8nUvEpwAXO1QngWv8f4nn7f8HJOHs0RXzz1LtpSk1+YCk6mJ3oGjFdren5l7+BDjOV6KYhU7RSTE4a3A/LvJPPUUfcoiXekd0N4HoepogvA1yfmODqfIkElv1MvPP+YmVmpo+Wc2u41zKAZYk9Z+8B4hj7HQms/LUEdqHDGKBEN30giOB5UXVWQntXwMQAfyx/OY4AVrd8VR1HTjdx3/ekSA44VyW8LQKV0Lkmin/2feJbO0+BUA2Opq98k5TYMoBFUpBDYX3PNeFWNYP3LXxSrR82y+ZnJgNVy0zBo2/DKwL6VdUBWONvEyMXIGPAdpKO7K6SOvMpeJdiPdEPNwrYu4zOo8T/2nUSOLgD4AL5m1Wcm1VtjP8tB1iWsdQ5dDws31+T4Gas1a3DyGdophlicA90KKhM4kyDngXFvf80c6Gc9XFAPoKbOrr0FveMlyV0bh8iQvxRv3LniO+Nn6sZpQkuC6lsSysJLQdYSuE1bUeuKXcpH3P/3O8pdxfFtZpMJAIEFIPwtghsmQNfLyyS0yMVE1VnP+2uYwFFbSUZFGf/0ZLytQ/hBPgZ0mJhsd0ACR58S3xLXmslMPpiM1oOsFTdTYXXOWIKXm2/Ey4qx8T73u/wZgxsRE21H6jFHYOHd0tw398Akn4inhJlVnD2hJkhrJ7mqVnnlInXwxPi1/DzWqfEn5EzVvwL7jNnuNagsRK3ikPLApbmWnAZdl31AMAEZrHrCfF91JQj3wSKf9NiVT6t7aGK3eIYeivctsC9yKxYz+qAcwuM7htmQQe7HMbSQqTFfUhL3/w/g9vRBJHArmgm1aC6yThJYGvCs23Ec6sDuFbnHP8rrp5IYO5d4t+83OzQxhSJ7DCAhi93BD/5oxiZw4BsL36YVwyfbjUaF5GBQEO9DNjiUr70CLxMDysAGpnjJbjlUfFvX2umSIQib9XRyjCyJk123fKARdJYIzLlmpkQRYPhrTlEfK9OwwZoOzFU0KTGBBeK929cCs/SgzCKwrmvcp848m+Db/xQq9MAomhBiWoA8KJLxDnpV0i/XnEpA+5m/qUvWFZ5doeln0XLo757FqhCZ0+Ld87TyBigb6bQMoFlcQBHp+6S8hUsTJ/G1N09UrzP331+//VEg0tzqzMlsKP9CW/x9EeXhaDnlYhz3D+enw3WEIORvWqCJuWKO4AwPPPDZJ8xAeL8WfHv2WRGtgZNZMp6r6360bLveeknEMswe8A8owdhvekTHKFlAotEIAdAcI2+XJyX/S/ECzrGWyyeZ74DoBU3GucKrJuP2d0aABn6lPcUdKbRwslETIGgAwBoRHVNfxr1RJ3Vq2gQ5xs+RBYUtQ3oEg0qpK966edYQiqQlMk3mVWqE+gx1bpBkRrQigaV0ziJrNHtvv7bEEd3QgTCq+DUYoDru9hhryhx4LI6jm/z+BeDG2RBt0IIle3CttwP4X3ELiZniKMTXRNugM6VD3CexnE0dK1fSfD4AeSKYLXLvKjnfxioPK//VqRwi7hvfdBMFE8+9RQT7+OWDSzFAaAUt4Nf1Df/AzoP2L87H2/azBHPEzPwousBE1xKKb4A3cWiqm/pa5gBQvF2ZUCMnQHAhopr3DXx0VxzLbyA65z0Y4ATbkDQ1UIVyFIvU8WaI8U98wv4xPPGf0tw1cPivv8589U0tjkOoMdaZKzxWjaw2EqKDhCYi7/ue16Fu8pmKPRDRMq3iefRyyWwG9ZxJV5MMRQrYarjWZ0X2LUBi8g/ApjgFgMLeujkDpg8fqmWbRSHaUAnOsdcqdzkxY9X2zIw29y6EOjyxAYI1gvqQMhTIZ5XfymB+f8q7n/eaXJPVefm7drmLb269y7wRM24YOGGP3rKvWvABTDjSu2GDkoX7+MXi2/1B2YB7HwSPdZAUcLOqygT398fQedD5NG2ULUXovdWcY2/NtacasazQOjM66tezJBy1Dd9nIQOPl2/Xz/rRG6EelHce579Jwks+o24f7RGnL0Gme0jPZo5NH8NEkUAciUQ3TV4grjvXW2Ci0aurEnie+Um8fwVVm/s66CUfkrFmPQPABHBO+85LB29D7D2AVhdaibouvFflAhWndwAbmWmc4hz1NXwkkAhzgwlDgOHMMNVgZWMCFq8oa2BvRvF89jtElz7NN4cWiyuIRPMNiUBqFjr1gMstoYdTHANmySpD4ALVEEsVh1S7wAG1v6bVP3xq+LfugrxzsetFWBKnEAyrV8ggcU/xF4O41X+odK1mIX+Tr1ModIqMcvC4w0maJ0Fw7AcBFB4S+FDD4azh+5AAFV4vhwEWrxBn/ItfVM8fxqNF2cXi/v7izAzvswElZllvBVplPitC1gkkQUu7rHgfhCjPx32plNL4a5yOZzuPhfvU1OUD3qw6JAZ14pfA2DsRIx8ft3L99o1ANUIdCwWmhVIr8cLFHdfeGdYXM7omCuOwbeAC2IQpA/F4vQynMPFhqEaUEAMRV/hQal68afiex12MzBj9/1LxXXxFWGgSh5ktT5gsUPYaQCHs9dgSf3eG2L0/7aEji+G31QfAAxuwmt/JlW/7yfe+S/AlnSiJsACcFNgJ+JDl94X7kHv9cZz9CLZXGWhuL/+WzHaZ6EzAT4LHCyyQYF5IDgHTQTHwglsY6GSxSi7UN1X/1AXKui+ZW+BS03Dm9j/gzaMlJRZn4pr5LSkBBXr3TqBpVqGpgFcDuyrkDrz/8R13VN4exli0FMIDnQp9mEYAm/OuwCwq/H+30vYKumwCRSnE/pZiXie+z5mmPBEwEYf4kiFCQMd+bUPxIltjbR+pDr+gv6ZHMaRh91rMrsiXyxGY1Ko6sJ8A17xb1kpnsdn4lWyr6plJMfgGRgs74sLrjimKGYeZj4XVJUEJzZCCAnOM7myU5zFHD/sJN/bP8R2juuwkQe4BDmO9ySAtAtcCF+ZGPcbcQ6bLP6Pnseb13/GsshY1ZbQsQ14MfUJcd88K7EcgqRHHejb5XnqAQkVLoHzHzY/mfYoFrWnim/hM0LvDW4QF/KUi+vS30nK9fdi0pCpBo2aiCQXtatr0/qBxabqscNOhOjzzn9OAisehvkAIo2L2HydDD7poXIYK6FKGR2wXEMRSCW6YqM4p/5B3F8CB9NB5afHo8Ut1KE2zoG4Onr1CeKGiVLv+0+Kf+ED4KYAc+AcZojbYeMCt/SXQIQPxproE6aSzjqEDRZdpWQ7cim09QfdgRCNBpZfUm/7ifhHXCH+D2Gt3vs21vsg3mCfMrIuRmdDnwpg/s/9GLhvkdqtz6W2MzKwVxdFqzhIttpAFI2cBJG+X32itu7m1pLBo3skeGgjzG7tUS4NpHiTGntAhM7sxKfrfiEp192ndr4xMQmEhs8YdbZJdmwbHCuc6IrbmB3Nfaz8GxZA17oTAAKH0pvdOtvhHB2oOhl2qzOYsZGT5WILyTx4r/YYoRaSDbzmZWRiS8qMDgqAhhveBAp0YQWCu6i9330++L3jrR7uIHiyUEJH4YF6aB2Ob2IWiDd4OvaCFp+DhNCzwLGkw1BJufZH4hp1Ke5BlLcALhXWauW8EX7d+s/JMMC5OOoNVwp0F3InTu8JNnAi+KSHymBLQl8a7eBqDJAZndi5ABr2wwrtfUL823AJ6UkPUCOjB1xfCkyrfHpPGFGxKS7dVRBCeFNHbah77gjAc0wEP3qbqrRghkY7mELSYMdylqn7RgZuOqk/7ceWSfMB4AEmwFl2C+BSqtHWv7bFscJGfbD4iHjf/q0ENz6uXskSJzoVdiqaFByT/gvnZRLc9x50MqAITERttsZdlFP7gjtBZDlgzWSg2CSHCWAVOQDLfvCUOVnjM4LYAS7khK7kRFqYDtRN/1nkvwugxhUwaPS+QxwD4Ki46U1svAvbm9MhqQ8tx/onuBg5pxblzLOFhLahYynxhx7hqId/ue+Tj8T/7kwspRyBaJuKe1DcSzFT7HyppNzxjrLcU/QETz+I+8fhJXEQetBu7NEAMJTiIwEQjYYXCjYBRxMXf8SMhRviSelDYIwh7OcgfvyADwXO9kMgUrF3aQ/M7voMFZoa1DZN2Nyt6sBaLG7PR34FJldlPi00tG5gkUMpEae6Wrku++Y9BS4Ff/XckTA59BU5vRydDyZ0xZ8k5YrboTOBwxAEACFfOBX8nP3N17pC3G0ZVvFQRTm8J0okWFEBkBVBxMFkwW2+fRB9SsyiPLwsYbhTMOtMxyyTuhhEJPeO5y8zC8+gx4UHeH4aqTArsMpOpFPcLTxCyzpvfcBS3MnSSSy9JFh4QHyr3pHgyh8CQcBM3mUQOfCCKKnEvlsPifuqmWASw8yeCxOXSgwplOER8lI7LdOpjz/ppxhVze4mIsODCejwOzXOFYpwh/XkC66p2FgE2DScHU1w1Yjcsi5aB7A0mKq5EzoUPRTA9wP96+dKcM1DalYnWZNhl4K4Ob4E63P3SMr0GeZiMjlEuLjUfah0mwhw6HgEnOJs1vNocZmPjs+j1pVUEvyzgG8Wh2sX9DYAi9Z+tY+8+aBF/m+BwLI61OxVs7PCOjV09pTanC3wKQC17T8hmtAvaUOwm9AOMU6ugv/TQ/Dc/Eesz40+33nhXKq+btTgUCCuLzKe6/j6WFcSmirIsVKzAS5rcmDhtq5kyfgs+YDFka1Gt0WuaFxBj3gVBW/KlJVKAF+WCH6+XgLb54EjfWAmplINYBntuolr4oN46WG6OHv2h5ixmq0BVYNzWOU2x4FyUNU3E+KQMwGGloms5AKWFhfhozuSrnidPngWnyo5VahePgju3wTr+WwJHYH/FZRwfg/HgCmIe1Nxkw7nwHHizMdMDN/WqQ4KUMg4WQClKoYR5KfpAhcd+9g6VnVnXeiJBSpapdVmZvwWjR8b8vvwq4Bt6ORh/E6oT4+EilaLlKJAAgl4Mbpg36wRd4vRbRi+czPQnMJ37oFlEVjEdWD+FJ8EU1IByqqgMqaeMUVhx264CeDrgabb0IKOycWxSDh+3uT4HtNGVAUnJXCoEIyQ/OiRkYXd8rrPwBQer3vBQU46dIWY43S+EyzfEB+RU3gNpnClPlk7B2aKUCWARUaa0zlZaxlzvZIHWBR/AIKjax9x3zgr5gZ8IaKawiMvBiVSrXPzThL+JyeF14Uf7PfcKWVEdeT0sOppPkvCStdbpeQBFqtqgeuLtSY4SOSIEC4qFH7wLxnFXES1a1xa2AlVYB2SFv2sPBhuNcdK9kFRoyU1LvTUo8bNZr0guL7wQ42+cA/xaJ3W9ylDWnAI0Yp/Eg6H3fGuIbdDYmjBTUo+YJkkbUP/TU4cwhKRQBIavceZuqK63XKRZQOr2SFsgidUfFS9UOHsO9yskdIVm71yDa6ADawGky5BCSnKoT8GD28X6Q7p3qO/mbG6n6AymiEbG1jNQPTqIpU5BLA6Vw7fr7n45vR34b5FGxaCDSyTDvb/hlMgyO/x7MEb1qOuMb0cLMA1PMfmT2lzrObvA3wWGF6qcDDlV1xbS7CB1Zw9SXFH957PPoTHxU/VVkyqOi1cDLINNrCaC1iWuAuWYG1067MA1pfNmrTw2aAmpw0sTYkmP5r2q8BO+Nr3vkpc/SwzQyvgViSlDawmB5RVIJeesCWRf+Vz4rrmx/AehTdH+Dpnc9UrQeXawEoQIePKxhJ3gT1b4NgXwK4xU8zkrYRbsTE2sOJCRKIim2T3rXgdbzv/M1yk8XJhK+JWNrAShZN48lEeGZCC/GCA96y4xkwzU7c0r4x62mxzrHoI1FiPQ5VnJeWG78HCDsf8VmAQjaRT23rFPrL1yXCtOFjL9WKojYQ2x6qNMk1xv5WCiqSzgdUUAKqtjFY0C4xsog2sSIrY1wmhgA2shJDRziSSAjawIiliXyeEAjawEkJGO5NICtjAiqSIfZ0QCjTpe4XhW8obTTAjaozyGiNP3ZPheet7iaCTaX/F5ilwqAgneyLy1vWMPDa6gVQTK1oj6noWWdF4rmvLl/ej1SOWvGtLW1tZseSp49SWd6zPdbzIY311q+95ZH7xXDcqsMIJVomtFCvOnsU+H35Ja9dO2me0xxbq3GeIKxoN7/DIxobnde7cOamoOCcpKS7JysLHAmIoSxObcQnC8PxY99KTJ8Xr9Upaapq0b58h7dAWhvB46kYM/3RZGuxnQZ/i4hKprKqUVLdbOnfuLB06mBubxJt/ePzKyio5euyoMH+Wldm+vXTp0gX1xya9COFxY6h2TFEaVRSyEceOHZPVa9bK1q3bJD29nWRkZEjlOexrjreYLx49SsaOvVg1MNbGzVuwQPbs3iPt0tqJKyUFL0PjK13YsDY9PV1uvukmSUtLlRPFxbJgwSLZum27AnJGRroMGjRQbrrhesnMxD6fpmxQRN6NvN6fPVsyQGQHFoIJQtb7LN5Mvv7aa6Vv3wLxYY/2NWvXyvIVq+TMmXJ0UIWK17NHngwePEimTpksHTtim8c4Bkh43EOHDsnKVatVfbt17SqZHTKlrKwMtCuUkSOGy7RLp0jPntjqO8ag82a9P16zRhZ9tESyUL9OueYb1keP4gNUGBxjLx4jl06dCvCaNNEAj7GYOqM1CsfSDdu0abO8+MqrUgVu9c3bvy4XjxltASGAjlonL7z0igweNEDu/OY3JC8vL6aOOXr0qFSAE3ErhzfffkeKS4oBBAdGYab8/GcPy/79++XFl1+Rq6+6UnqhM1asXCXbd+yQcozWsWPGyJ13fEOc/BCTBQICpbCwEJwnTT79bKPMmbdAOqMDDh0+Ij97+MfSu1cv+cOjj6lBcdUVV0gunnnRYatXfyyrP8a2k/jrlJMj3753JrhA5+p866K6Lpsd/9HiJfLue7NRTk+5/favqfI4WBhn9+7d8txfXgT9PHL712+TCePH1Zu/zpvc+uVX/ypbtm6XWffNlCFDBivas16VlZXyzLPPyzbQpW9Bvtx7zz2Sk5Ndb951tSnymfPfESJvXsi1btjJk6fk2ef/Im5wFY7mW26+UXEVEi0F9/r06S3FJ4plH4Cwb/8BGTVypKSmuuttHEVDp06d1G/Hjp1CAlJsdOvWVfK6d5e/vva63A9CDhs2VLKzs1SZK1evVs/2Hzggw4YOVfVhGzlCU1NTVV6s4zlw0i1bt0pOdrbqhGFDh6hOz0ddZ3zrToimXMVxO4DrDRo4UA4fPiwejwfitkKBc/SokQq0ddFP08fvD8hbb78t88BZmf+s+++T7t2wuzLqpOvGdvLe5i1bAfrPhNwsL697nTTS6f/+7nuyYOFi+cH3vyMXDcNHCpCvLpv5Mz9y6OJifIATRQ4ZPLi6XHVygf8azdxQerJUysvPKtFTdOKE7Nu3X1WVjdMN7Nq1C0RXmhQWFcm69diRL4bAtAwBfFeQOk+Q+0rhHjtq9odz5Ctf/hJA1k09ZzwC14WtIXW8ykpwu7DAtEF+oxDBB/Gg8gInycxsLx/Mmat0s1uRJ4POg2W78I2d8ePGyqnTpwHgbNmxc5cQuAy6juqiln+LlyyBmFqnyrny8sskGzpgIMANU82g86AIL8jvjXgd5K13/q50MA0SHVcfdZqDEK1Ll69E/cbIgP7mm9X6GeMehXqy6/Pd4saAdGMwU3Xgcw1Knd+FHBsNWOQeHIkHDx2Gop4BroD90xHCK09u4fWiE6HfbMGopNwPfx6tYfo5jxxpJAjzITGpK5Dl8x7FHTuKuh05Gu8FcZ2enlEjW5UPuKgKzJABR4KH4vPaa69Wt5ie3JbxeWTIgQhk2QQm7x88eFDdr+0f82C8w0eOyLz5C5X4YdsHDhygkjiwN7wOjMf45O59C/pCz/OKB/ShzlRfOAyak5Ydwd1ZP+YTHnLBCQcNGKBAGsCA5ADR5YXHu5DzhCvvuoJU0mfecxcU0OMKVJzhMOjnutJsNEc/R81pKKxdEE93gI5T35F5+rGl5BhMBhg0IZ3YIJZEe+e996WypEouv2ya9IDCzcA0UQP6wAngnITudc3VVyr9qbb6cMQrbmi1oaSE+1fWkbdV4DrolwQRxWi/vn0VV9d11kdG1eUqvQ4DkHrQ5s1bZPq0aXUq3NRB22PCcvjwETkBacEZoM6PXJezwXvuniHHjxeqc+qGDLXSRD2N71/CgaUrSKJQH4qcLvO+JpiuKjkAp8RnIToJrHiCAhVEIjliXvfzoNFEmjp1CjjCQCjcXqVnaW5TZxkAHWeaBfn5KhqqDKJHSWHdY3sIYnZoZNt0Kn2fs71t0A3ZuadPl0n37vhUncUBdVx91G2gqGUcqg2lpaUYhCcUsHS8yCPNIKgxOJwPE5lX5eYbb1BKegoGgs6TZhLOeBsrNAqwWFk2gMTkCHHgnOYFfV83jsQK4SUCXgfwtoofndmQQLFFccuZnQoRKKAuF3dQPuimCInILnpWiKR1MN2+aBHJmU+eOqUmCDS/7N6zV6hosw2R6Ug/cvPCwiI5h5lcMdIeOnJUThSdkP79+tUK4oJ8fI0M9eFk6DR0wCeffkYK8vvIwAH9oZ7kS3dMAGh+0EGDXl8n4thowNKVpa6jAxXsKhj/OIuiLWXT5s1q5LJDQCX8dMz4j0GkZxbRAuvCENlx0eJW36slr+rnDTxhR1PXY13Y7nQai8G9OBHB8KtBAkRR4OnXry9mbYPIhMTr8Uo3cDmGyPbwmm3lzJFc6m+vv6HOO0OnKgIYOftmAeTuBObwi4Yp/U7rYZH5qUIa+K9xgIXKs5K0eu/bvw9K7SE5gpHm8XqUMkndpFfPHkp0FReXKKNmA+tfnQw0rzUkkmC1FhLjAyrVtH2RW3PWfBHMIpdcMinG1DWjRWuXvncZ9Mk0cPDZH8wRmn7aY5ZLpZ26HSdMNDfQcN0P4vBLN98kBQX5CpQ6fc2S4r9KPLDIHQAqWr1nz/5AjsH46INiffMN18ko2HmoL1BXYAMWfbRYGf+0HhZ/9VteCir7OhBcVVDgGTiDDZ8V6ji1HesCADkhn0+aOAHib4CSDJx1H4FxmcZWrk5wBSI72wVOViR/fOxxefA7s6Bz9U0YuM63srYWxHFfiz9auh9/8s/Kgp2BpZbbvvoPMtqasTE7LZpoeSZx21LgIKJhkjRwQOGvwqSFgaCqCyzx0CicphR7l182XaZMvkSBiOD6HDasnbs+V+aLHBiRWZcP586Dhf4+LJMlBhKJycVqNQnDETFn7nxM07MVpyKr1aAyAXVeaFGpp1hoSyE3N1cZRamsp0AxpyLPECuoSMO64nKwcimNRmmuDvTvbyr5Sv3A8lQv/CZNnKjMEMtXrMTS2npVH65LcoGdE536yoilvxLGLkzQCEZFIewjx5W442o6G8agKwssVQc/Z0LUSNtA0GCgTYqKM00T9JDgLJH2rFiCpmG0uJr+S5ctl8cgLRYvWSa//8OjatmJZfO5/jE9bVv/8JVbsQg9WRmC+ayK38dOUEgYsHR9fJjdVC9NADPt8EmSyKCJfBIjhNNpTRQ1ZYmM3Iqu2U62nYvJ9PCgeYSz4xNYM2U4T4eajdb3mfaTTz5Vs+qaMUyORy64c9cu6YFZIY2pNFKjyOrA9Jr2aiaOJ8OHX4SvGQeUKHaFzeCrEzXwJOHAUvUAoNgAEkSvw2niBINmSzlT2bptBxqfrqbdSFEtFHXcaG3Sz/SxZhyLiuHUrBkh6lWNvDQDxVFnU+N5eA5hnaZv61vR0uhOpavNhAnjIAZPY2A55ZNPP9XJa4CLeWgAMMIqeFTMnb9ADcbqBGEnNO10yjG9L8rLy+FycxFEn+luo8sOi65Oz5w5Iz58boXKfMeOps9aZJyGXCccWHQhobGSdhlad7mGx0CFkoTSMx/6N02aOF7d4xJKEIZSHnVcdRLlnyYQicjz8J+2mek4UZJHvaWVXX1UeSImrekM+r66wD+dv1kH85oinfd1G3QcnUYfSQM+4xSf9iZymbXrNsi27dur26LjMh7L5pH+Wu9/8KE8AC8IbXfS8XjUQJ4M0wXzJP2pV+l6EKCMwx/PmS/1sXXrN8DsUSETAXRa7HX9wvNuyHnCgMUGsFI0J9xw/XVqapuGBdAtWASmMsnAOGzMbBCIHXALiMtZSxlGDUFIsUB9g2YIGhIZmGd4oHGV8bmuSDOGSURa7QNwwjsjZzBSqdvFGmhXOgUFmj5KdMEJgaOyjjS40tmP91kXlsPA+rAc1qP8bDlWDIKqE7kE5IN9iPXisg3TRQuaTjSKzrx7hjIHlJ0pkxdefFktMJPTEBT8sYy9e/fJ0888B51pqfzoB99XC9/ROl/nS3ekb8G/jfVfATCuga2K8TVAGY/nzPvNt96RpctWwHftcswaJ0erboPvGSi0Zs81OKuaCWmAW7hosRyHHausrFyGDxsC0GWpWdAIyPUr4TTHRtIiTMc8ekGwKpkYNZwaX3/dtVF9m957f7Zshs8UuaICQADVV6IXX7tNcaulj0HwFqBiWldgWSyfOsnfXn8TSxwd1EI2l5ZUhvhP/Y+SkXrj3TPuVAovgfgS1t9KSkqEa29+gFAR0Oo83iO4rsQUn+uUupzIuuj7HBwUhasAgi2w/XVEPeh3xecEMJfCpiGfy6ZPq+ZUrHd9gQvQCxYuko+x4D1oQH8ZB0/dHAxiWv3pXUEHSOZzI5jApEkTq3XdWPKur2w+bzRgMXOOWgKLo5DcgMsXPXv2BJcyXWSpb1E08tkBuJxwlPJZD3iT1hZo9+GaYm0EYIdQRGlf9Nry0ffZsR7MhmrLT8djfhzpzJ/tYt1r61/GobsLRVZdgfF0uTTTFJ0oklJ4SJDrcp0vt1Ou5MEbg7ZAhvD4seRLkXcMM3RyPc7UtX6bkdFOCgoKpCA/X+lW8eRdV7nhzxoNWHURIfxZ+Hl4xdrSeX004HMGDcJYaFNfnjqPWOPp+LEeGw1YrIBJjy9K2kgCacIxPrlA5PPIxuj4kff1dX3pdTx9rC8/xovMs740kfF1WXUda8uzIXnpcmrLUz+/kLx1HtGOjQqsaAXa99oGBRI2K2wb5LJbGSsFbGDFSik7XlwUsIEVF7nsyLFSwAZWrJSy48VFARtYcZHLjhwrBWxgxUopO15cFLCBFRe57MixUsAGVqyUsuPFRQEbWHGRy44cKwX+H92F5CAaTGppAAAAAElFTkSuQmCC</mdui:Logo>
-        <mdui:InformationURL xml:lang="en">http://www.arnes.si</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="sl">http://www.arnes.si</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>MIIFOTCCAyGgAwIBAgIFLuShxBcwDQYJKoZIhvcNAQEFBQAwNTELMAkGA1UEBhMCU0kxEjAQBgNVBAcMCUxqdWJsamFuYTESMBAGA1UEAwwJQXJuZXMgSWRQMB4XDTE0MDQzMDEyMTQ1MVoXDTM0MDExNTEyMTQ1MVowNTELMAkGA1UEBhMCU0kxEjAQBgNVBAcMCUxqdWJsamFuYTESMBAGA1UEAwwJQXJuZXMgSWRQMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAoEET63gqll3fX1vkDCP57sLm6O5CInZAuarIkMSmbmy/61sNdSI6AtwhGp0PK2pm+MYS+NH/AKKg9vgOxCl1Q/t170popo1r6VIO7PaB3W5bW6pObgKT/VWOrcm/RaXLN9Dn5sOryDmuxbR9W5q4eHmGORH+S/L+hKx/KBWmhCIkB/Jucnn48YSr8je1D5/zFimboAmaNHJcXnfdY1xbaqznDWv4DCUAEU1tl/TB1ccjueyZRnJZR5iK0vBvppVQ+3s6o3tcvj2nUfUsU0gbDGNovhuA+6Siid7HpKlfPE2gC4rAueR9Ex3iPKfDSaqfCgV/Z/TiNFxRG5cYR6EunGh+DoOoOvzdwwYcdzWr839TJXwlSIBRu73sSiOeeer7nD+YEMuTX69YPSaGltpCeYsX9uqmCsnAC0bm9vBbE2vplrmfiOEiYGTZeiqZfzT04QrfX7hqiBNTeuNYQ4EVKENheJ8zsureQ7ERC2BV6/t3DOds8o/zep0G/BkzuxkycKnjDsjWe5joLXZzpN6OlaqBq52EKabfmfHTmZo2VxnOlVNsNf6m2ophM9yvEvEJ2FAKV+Y1lkE8bOPh4nk1nA8OP3HFSoiPiBefJcaw/65MUKgHyrLvBvCW/OjH+KILXpew0Vtiw+U4mS9Q36+p/u6Td9NC3Pa3c1amN8X7cLkCAwEAAaNQME4wHQYDVR0OBBYEFE5p1iUs87ZnzJ9M97U+r6zknMVQMB8GA1UdIwQYMBaAFE5p1iUs87ZnzJ9M97U+r6zknMVQMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggIBAImAjfaQYzXX5Nk7zzfWUaZ3HxtLttcTeiC1e7FvXWfNXXP/Omwxy5vcwOlqpicEqcxUd3mkGUUcP1r9EsaKARCNNWo04j2k9hs11WXrd5JypO0a3DYU6YSfH/wN13P43Ts1HAOEb4iAm+BoUNYguxVa198iqP+1dMMtqR/ML8GL6aHqjdBRN7RhihhruQK1zj/tKCT3vCk0FNxuasNWZHn4laoKXu/d96vqG5pxlepJVsG8F/NXedlcu7ghFl5I3rEWX/B1wECd7/Hot0C7Ue4R9XD/R12cjMed2dSQPuJTWAqn366eQTtCgmMCNmCUXm91MVGx8NsBIFHFZQayAme6ny6ODDx5W3NOYjeQnxls88fhzuMR0k+ob1/9SBdznXHTTWhAi+q+TOa840fO1izkR+kgCKHdEx52Lkxxbfd17z+LZL4FVFsGRCh1dH7Aeu+4P3Vo+ufIJDQ4nbKMSbcLKyPBagRtKEn+xbmRJZijSPwCp7VfQPXt0UrYQ4xs7egxR0Bd1biaOSO/Cjv8wD7dVX6RpJSNspoBWKGRige+FSO5kF4N25UtJvpiXbyiNYr69kAfF4htLK716aPouiKW5Ktu+cLf/YMa69RiB6TPmzY9LbE28C+HBbwd3uXxW2eqVRYV0+FVY6ODNDmCrQnllVBg/qp5mEI5MkDQ0Qb6</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>MIIFOTCCAyGgAwIBAgIFLuShxBcwDQYJKoZIhvcNAQEFBQAwNTELMAkGA1UEBhMCU0kxEjAQBgNVBAcMCUxqdWJsamFuYTESMBAGA1UEAwwJQXJuZXMgSWRQMB4XDTE0MDQzMDEyMTQ1MVoXDTM0MDExNTEyMTQ1MVowNTELMAkGA1UEBhMCU0kxEjAQBgNVBAcMCUxqdWJsamFuYTESMBAGA1UEAwwJQXJuZXMgSWRQMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAoEET63gqll3fX1vkDCP57sLm6O5CInZAuarIkMSmbmy/61sNdSI6AtwhGp0PK2pm+MYS+NH/AKKg9vgOxCl1Q/t170popo1r6VIO7PaB3W5bW6pObgKT/VWOrcm/RaXLN9Dn5sOryDmuxbR9W5q4eHmGORH+S/L+hKx/KBWmhCIkB/Jucnn48YSr8je1D5/zFimboAmaNHJcXnfdY1xbaqznDWv4DCUAEU1tl/TB1ccjueyZRnJZR5iK0vBvppVQ+3s6o3tcvj2nUfUsU0gbDGNovhuA+6Siid7HpKlfPE2gC4rAueR9Ex3iPKfDSaqfCgV/Z/TiNFxRG5cYR6EunGh+DoOoOvzdwwYcdzWr839TJXwlSIBRu73sSiOeeer7nD+YEMuTX69YPSaGltpCeYsX9uqmCsnAC0bm9vBbE2vplrmfiOEiYGTZeiqZfzT04QrfX7hqiBNTeuNYQ4EVKENheJ8zsureQ7ERC2BV6/t3DOds8o/zep0G/BkzuxkycKnjDsjWe5joLXZzpN6OlaqBq52EKabfmfHTmZo2VxnOlVNsNf6m2ophM9yvEvEJ2FAKV+Y1lkE8bOPh4nk1nA8OP3HFSoiPiBefJcaw/65MUKgHyrLvBvCW/OjH+KILXpew0Vtiw+U4mS9Q36+p/u6Td9NC3Pa3c1amN8X7cLkCAwEAAaNQME4wHQYDVR0OBBYEFE5p1iUs87ZnzJ9M97U+r6zknMVQMB8GA1UdIwQYMBaAFE5p1iUs87ZnzJ9M97U+r6zknMVQMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggIBAImAjfaQYzXX5Nk7zzfWUaZ3HxtLttcTeiC1e7FvXWfNXXP/Omwxy5vcwOlqpicEqcxUd3mkGUUcP1r9EsaKARCNNWo04j2k9hs11WXrd5JypO0a3DYU6YSfH/wN13P43Ts1HAOEb4iAm+BoUNYguxVa198iqP+1dMMtqR/ML8GL6aHqjdBRN7RhihhruQK1zj/tKCT3vCk0FNxuasNWZHn4laoKXu/d96vqG5pxlepJVsG8F/NXedlcu7ghFl5I3rEWX/B1wECd7/Hot0C7Ue4R9XD/R12cjMed2dSQPuJTWAqn366eQTtCgmMCNmCUXm91MVGx8NsBIFHFZQayAme6ny6ODDx5W3NOYjeQnxls88fhzuMR0k+ob1/9SBdznXHTTWhAi+q+TOa840fO1izkR+kgCKHdEx52Lkxxbfd17z+LZL4FVFsGRCh1dH7Aeu+4P3Vo+ufIJDQ4nbKMSbcLKyPBagRtKEn+xbmRJZijSPwCp7VfQPXt0UrYQ4xs7egxR0Bd1biaOSO/Cjv8wD7dVX6RpJSNspoBWKGRige+FSO5kF4N25UtJvpiXbyiNYr69kAfF4htLK716aPouiKW5Ktu+cLf/YMa69RiB6TPmzY9LbE28C+HBbwd3uXxW2eqVRYV0+FVY6ODNDmCrQnllVBg/qp5mEI5MkDQ0Qb6</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.aai.arnes.si/simplesaml/saml2/idp/SingleLogoutService.php"/>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.aai.arnes.si/simplesaml/saml2/idp/SSOService.php"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">ARNES</md:OrganizationName>
-    <md:OrganizationName xml:lang="sl">Arnes</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">ARNES</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="sl">Arnes</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.arnes.si/en.html</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sl">http://www.arnes.si/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>AAA</md:GivenName>
-    <md:SurName>Podpora</md:SurName>
-    <md:EmailAddress>mailto:aaa-podpora@arnes.si</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Arnes</md:GivenName>
-    <md:SurName>Helpdesk</md:SurName>
-    <md:EmailAddress>mailto:helpdesk@arnes.si</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Arnes</md:GivenName>
-    <md:SurName>Arnes</md:SurName>
-    <md:EmailAddress>mailto:arnes@arnes.si</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.aai.arnes.si.xml b/swamid-interfederations-2.0/idp.aai.arnes.si.xml
deleted file mode 100644
index 46662005..00000000
--- a/swamid-interfederations-2.0/idp.aai.arnes.si.xml
+++ /dev/null
@@ -1,248 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.aai.arnes.si/idp/20090116">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://aai.arnes.si" registrationInstant="2014-08-25T15:08:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://aai.arnes.si/static/doc/ArnesAAI_general.pdf</mdrpi:RegistrationPolicy>
-      <mdrpi:RegistrationPolicy xml:lang="sl">https://aai.arnes.si/static/doc/ArnesAAI_splosni_pogoji.pdf</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </md:Extensions>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">arnes.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">test.arnes.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">guest.arnes.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-pirnice.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">zvkds.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osrace.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ddvic.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">iam.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sola-zetale.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osmalecnik.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-volicina.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vrtec-ljutomer.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vrtec-logatec.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-zelezniki.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ostrzic.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">8talcev.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ososkar.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-bistrica.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ostomaz.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vergerio.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mps.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-gracisce.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-preserjeradomlje.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-dobravlje.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-starse.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vist.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">oscg-info.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-preddvor.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vrtci-brezovica.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-strocjavas.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cufar.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sola-miklavz.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">oslesce.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-dutovlje.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-danilekumar.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osenams.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-hrvatini.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os2ms.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-svjurij.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">seps.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sc-sezana.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osbeltinci.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osmesto.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-breg.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-raka.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">oslava.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-tabor1.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-gpetrovci.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ospg.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osik.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gimnazija-ormoz.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">poldestrazisar.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">11sola.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ossvj.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osormoz.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sola-secovlje.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">oskolezija.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">abesednjak.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ostrojica.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-dornberk.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-iroba.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-cerknica.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">oskoseze.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-laporje.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-dk.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-ljudskivrtptuj.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">oscankova.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-podgrad.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-verzej.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">konsak.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">miroslav-vilhar.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ss-crnomelj.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-franaerjavca.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-brusnice.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-sentjernej.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">oszuzemberk.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-drska.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-cirkovce.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ossmartno-sg.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-gabrovka-dole.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-kapela.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vstp.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-sentjanz.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osgorjup.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-mostnasoci.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cirkulane-zavrc.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osblanca.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gros-radgona.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osdravlje.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osmokronog.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sgtsizola.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osmetlika.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osmsn.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">tsckr.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hrusevec.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osvodmat.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ssjj.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-kutezevo.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vrtec-kamnik.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-ljubecna.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sola-podlehnik.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">helpdesk.arnes.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-dragatus.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osmislinja.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ospuconci.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ospreska.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-kosana.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ospreserje.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">oszalog.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">icp-mb.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-radenci.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">oslucija.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vrteczala.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ospo-slb.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osbakovci.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-divaca.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ekonomska-ms.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hinko-smrekar.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osdragomelj.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sc-s.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">arrs.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sssb.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-dt.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">dos-prosenjakovci.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osbos.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osstopice.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-odranci.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">oshjh-staritrg.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-leon.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-ajdovscina.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-igroharja.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kis.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">o-azilb.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-kanal.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-trebnje.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mklj.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">okrogar.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-kamnica.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osfrsmb.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-dobrna.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-jelsane.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-dobrovo.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osmoravce.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osferdavesela.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ossmartno-tuhinj.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-pivka.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-sladki-vrh.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cdi-univerzum.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-miklavz.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osbohinj.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gimjes.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-brezovica.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">oslimbus.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osorehek.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osmslj.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">oslag.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-loka-crnomelj.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-turnisce.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osgusi.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">oszrece.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">jozmos.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-negova.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bic-lj.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">koseze.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osmjc.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-ivantavcar.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">oskm.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osvp.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osicljutomer.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ospoljane.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osflv.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osfram.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">oskosmac.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osld.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mdj.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ng-slo.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">dssl.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gimidrija.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sszagorje.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fmalgaja.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">slivnica.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osdobje.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vzgojni-zavod-verzej.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">konservatorij-maribor.si</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">ARNES</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="sl">Arnes</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Identity provider for organization Arnes</mdui:Description>
-        <mdui:Description xml:lang="sl">Ponudnik identitet organizacije Arnes</mdui:Description>
-        <mdui:Keywords xml:lang="en">arnes idp identityd</mdui:Keywords>
-        <mdui:Keywords xml:lang="sl">arnes idp identiteta</mdui:Keywords>
-        <mdui:Logo height="135" width="150">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAJYAAACHCAYAAAD0i6DcAAAKymlDQ1BJQ0MgUHJvZmlsZQAASA2tlndU08kWx+f3S2+0QChSQm+C9Cq9BpBeBBshCSSUEBKCiNiQxRVYUVREQF2BpYiCawFkLYgoFhbBhn2DLCrKc7FgQ+X9Akt23ztv/3tzzsx8ft+5c3935tw55wJAHmQKBOmwAgAZ/GxhZIA3fWl8Ah33GOAADMjADNCYLJHAKzw8BPxje38HQNLFmxZSX/9o9r8XFNkcEQsAKBxZTmKLWBkIn0B6O0sgzAYAJfWnvzpbIOXtCCsLkQARrpdyyhx3SjlpjvtnbaIjfRAbCQB4MpMpTAGANIHo9BxWCuKHTEbYis/m8RFejLA7i8tkI5yP8MKMjEwpNyFskvQ3Pyl/YyYzSeaTyUyR8dxZkJ3Ij315IkE6c83sx/9zyEgXI/c123SRkcwVBkYiswZyZzVpmcEy5ieFhs3rPORE88wVB8bMM0vkg9zl3F420zd4nsVpMV7zzBQi9KcNL5sRPc/CzEiZf356aMi8zuUwZMwR+UXN68k8f8Y853Gj4+Y5hxcbOs+itChZDHlcH5kuFEfKYk4W+svOmCFCdv4ZG4v517+yudGB8zqb4+s3zxx+jCweQba3zI8gfTa/Z++Qkx4g00U5UbK92cJomZ7KDJLm66y9IDtcdicgBPiBUEBH5mhgA+yAPTIKwGqAZGM2JxfJPQB8MgVrhLwUbjbdC3ktHDqDz7JcSLexsrYDQPr2pDYAvL07+6YgGv4vLX0ZAI6bkbyWpj191gwkIT5PeACgsO8vzQSHPAd3AM6ZssTCnDk7tHTCACKQB8pAHWgDfWACLJDoHIAr8ESiDgJhSMzxYCVgAS7IAEIk6nywCRSBErAd7AZV4ACoA03gCDgGOsBpcB5cAtfAILgNHgAJGAMvwSR4D6YhCMJBFIgKqUM6kCFkDtlATpA75AeFQJFQPJQIpUB8SAzlQ5uhEqgcqoIOQs3Qz9Ap6Dx0BRqC7kEj0Dj0BvoMo2AyrAxrwUbwItgJ9oKD4Wh4BZwCZ8F5cCG8Da6Ea+HDcDt8Hr4G34Yl8Et4CgVQJBQNpYuyQDmhfFBhqARUMkqIWo8qRlWgalGtqC5UH+omSoKaQH1CY9FUNB1tgXZFB6Jj0Cx0Fno9uhRdhW5Ct6N70TfRI+hJ9DcMBaOJMce4YBiYpZgUzGpMEaYC04A5ibmIuY0Zw7zHYrE0rDHWERuIjcemYtdiS7H7sG3YbuwQdhQ7hcPh1HHmODdcGI6Jy8YV4fbiDuPO4W7gxnAf8SS8Dt4G749PwPPxBfgK/CH8WfwN/DP8NEGBYEhwIYQR2IQ1hDJCPaGLcJ0wRpgmKhKNiW7EaGIqcROxkthKvEh8SHxLIpH0SM6kCBKPtJFUSTpKukwaIX0iK5HNyD7k5WQxeRu5kdxNvkd+S6FQjCielARKNmUbpZlygfKY8lGOKmcpx5Bjy22Qq5Zrl7sh90qeIG8o7yW/Uj5PvkL+uPx1+QkFgoKRgo8CU2G9QrXCKYVhhSlFqqK1YphihmKp4iHFK4rPlXBKRkp+SmylQqU6pQtKo1QUVZ/qQ2VRN1PrqRepY8pYZWNlhnKqconyEeUB5UkVJRU7lViVXJVqlTMqEhqKZkRj0NJpZbRjtDu0z6paql6qHNWtqq2qN1Q/qC1Q81TjqBWrtandVvusTlf3U09T36Heof5IA61hphGhsVpjv8ZFjYkFygtcF7AWFC84tuC+JqxpphmpuVazTrNfc0pLWytAS6C1V+uC1oQ2TdtTO1V7l/ZZ7XEdqo67Dk9nl845nRd0FboXPZ1eSe+lT+pq6gbqinUP6g7oTusZ68XoFei16T3SJ+o76Sfr79Lv0Z800DFYYpBv0GJw35Bg6GTINdxj2Gf4wcjYKM5oi1GH0XNjNWOGcZ5xi/FDE4qJh0mWSa3JLVOsqZNpmuk+00Ez2MzejGtWbXbdHDZ3MOeZ7zMfWohZ6LyQv7B24bAF2cLLIseixWLEkmYZYllg2WH5apHBooRFOxb1LfpmZW+VblVv9cBayTrIusC6y/qNjZkNy6ba5pYtxdbfdoNtp+1rO3M7jt1+u7v2VPsl9lvse+y/Ojg6CB1aHcYdDRwTHWsch52UncKdSp0uO2OcvZ03OJ92/uTi4JLtcszlD1cL1zTXQ67PFxsv5iyuXzzqpufGdDvoJnGnuye6/+gu8dD1YHrUejzx1PdkezZ4PvMy9Ur1Ouz1ytvKW+h90vuDj4vPOp9uX5RvgG+x74Cfkl+MX5XfY389/xT/Fv/JAPuAtQHdgZjA4MAdgcMMLQaL0cyYDHIMWhfUG0wOjgquCn4SYhYiDOlaAi8JWrJzycNQw1B+aEcYCGOE7Qx7FG4cnhX+SwQ2IjyiOuJppHVkfmRfFDVqVdShqPfR3tFl0Q9iTGLEMT2x8rHLY5tjP8T5xpXHSZYuWrpu6bV4jXhefGcCLiE2oSFhapnfst3LxpbbLy9afmeF8YrcFVdWaqxMX3lmlfwq5qrjiZjEuMRDiV+YYcxa5lQSI6kmaZLlw9rDesn2ZO9ij3PcOOWcZ8luyeXJz1PcUnamjHM9uBXcCZ4Pr4r3OjUw9UDqh7SwtMa0mfS49LYMfEZixim+Ej+N35upnZmbOSQwFxQJJFkuWbuzJoXBwgYRJFoh6sxWRoqcfrGJ+DvxSI57TnXOx9Wxq4/nKubyc/vXmK3ZuuZZnn/eT2vRa1lre/J18zflj6zzWndwPbQ+aX3PBv0NhRvGNgZsbNpE3JS26dcCq4Lygneb4zZ3FWoVbiwc/S7gu5YiuSJh0fAW1y0Hvkd/z/t+YKvt1r1bvxWzi6+WWJVUlHwpZZVe/cH6h8ofZrYlbxsocyjbvx27nb/9zg6PHU3liuV55aM7l+xs30XfVbzr3e5Vu69U2FUc2EPcI94jqQyp7NxrsHf73i9V3Krb1d7VbTWaNVtrPuxj77ux33N/6wGtAyUHPv/I+/HuwYCD7bVGtRV12Lqcuqf1sfV9Pzn91Nyg0VDS8LWR3yhpimzqbXZsbj6keaisBW4Rt4wfXn548Ijvkc5Wi9aDbbS2kqPgqPjoi58Tf75zLPhYz3Gn460nDE/UnKSeLG6H2te0T3ZwOySd8Z1Dp4JO9XS5dp38xfKXxtO6p6vPqJwpO0s8W3h25lzeualuQffE+ZTzoz2reh5cWHrhVm9E78DF4IuXL/lfutDn1Xfustvl01dcrpy66nS145rDtfZ++/6Tv9r/enLAYaD9uuP1zkHnwa6hxUNnb3jcOH/T9+alW4xb126H3h66E3Pn7vDyYcld9t3n99Lvvb6fc3/6wcaHmIfFjxQeVTzWfFz7m+lvbRIHyZkR35H+J1FPHoyyRl/+Lvr9y1jhU8rTimc6z5qf2zw/Pe4/Pvhi2Yuxl4KX0xNF/1L8V80rk1cn/vD8o39y6eTYa+HrmTelb9XfNr6ze9czFT71+H3G++kPxR/VPzZ9cvrU9znu87Pp1V9wXyq/mn7t+hb87eFMxsyMgClkztYCKGSEk5MBeNMIACUeAOogAES5udp41gKaq+cRhv7sUvm/eK5+li4gNQSo6wYgGunhGwHY7wmAMQBACZnDkR7tCWBbW1lHVqRNlGxrMwsQqQMpTSpmZt4iNSHOFICvwzMz0x0zM18bkFrnPgDd7+dqcqm1VSsAir5SGqDmSqf/aP8GsNP+fxCsRgoAAAAJcEhZcwAACxMAAAsTAQCanBgAAAGdaVRYdFhNTDpjb20uYWRvYmUueG1wAAAAAAA8eDp4bXBtZXRhIHhtbG5zOng9ImFkb2JlOm5zOm1ldGEvIiB4OnhtcHRrPSJYTVAgQ29yZSA1LjQuMCI+CiAgIDxyZGY6UkRGIHhtbG5zOnJkZj0iaHR0cDovL3d3dy53My5vcmcvMTk5OS8wMi8yMi1yZGYtc3ludGF4LW5zIyI+CiAgICAgIDxyZGY6RGVzY3JpcHRpb24gcmRmOmFib3V0PSIiCiAgICAgICAgICAgIHhtbG5zOmV4aWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20vZXhpZi8xLjAvIj4KICAgICAgICAgPGV4aWY6UGl4ZWxYRGltZW5zaW9uPjUwMDwvZXhpZjpQaXhlbFhEaW1lbnNpb24+CiAgICAgICAgIDxleGlmOlBpeGVsWURpbWVuc2lvbj40NTA8L2V4aWY6UGl4ZWxZRGltZW5zaW9uPgogICAgICA8L3JkZjpEZXNjcmlwdGlvbj4KICAgPC9yZGY6UkRGPgo8L3g6eG1wbWV0YT4K4RlDEgAAJ9RJREFUeAHtXQd4XNWVPm9mNJIly5ZkuclNci+44optbHqHhGyWhARiwBBMEkI22c2GZJNNSHazJdmE0EILNaEHMLjjbuMGuBfcu2RJtmVZlqbv/9/3rjwaRtKMPJJG0rv6Rq/deu5/zzn33PPuM0IIYgebAgmmgCPB+dnZ2RRQFLCBZQOhUShgA6tRyGpnagMrHgxQHbVV0pgoZgMrJjIxEkBlGObPBle9VLOBVS+JiClOnA0JlZVI8EypDa4YaGYDKwYi6SjBU8XiffWXIsGACS5yMTtEpYANrKhkibhJEQiu5cwfIkZ2D/GtfN+MELSBFUGp6ksbWNWkiO0k5ao7xD/vXyVYekzEAfLZ+lZUwtnAikqWKDctruXolCeOcd8V3wdPRIlk39IUsIGlKRHHMWXqrRJY9xsJ7N9qKfLBOFK3jag2sOLpZ821cnuIc/KvxTf79xCFVORtMkaS0aZIJEXqvTYVdtekWyS45i/i373JTBGyuVY46WxghVMjlnNyLQRnz/7iGHmL+Je8ZHOtKHSzgRWFKHXfMk0PkpImzgnflOCKP0rg0C4ziT1DrCadDaxqUsR/4hgwSiRVJPDJwvgTt/IUNrAa0sGmNBRH5x7iuOgbmCH+jwRPnbCXesJoaQMrjBixn5ri0HC3E8fAaRI6cFQC+zZbyW1rPAlhAyt2NEXENAHk6D1EicPg1mW2Eh9GIRtYYcSI79SUh47cPDG6Zkpw95sSPFlkZmEr8TbHig9MYbEtPcvI7gJgXSOhE7skeHSvFcEWhzbHCsNKfKcmsoy0dDE6DxXxw5vmwDYrCwt18WXYqmLbwLqQ7lQizyFGpz4iLgDr8AYJ+TyWr9aFZNzy09rASkAfGh07irihuxcBWDQ7MLRxPasFACtefQXxuW6nfjy3fmZ3R/+v44Sni8U71AKP0bE7uBSKKt90HlixpI9em1ZxN+mB5VvxngRL4FTHEBMXQA/T20D9eG79VAYAXJDKkM880jOBANBxwtMRKQwaoNGAYkUxUtspUWggu2DpUTNdG/8PzSBJA0GEDg+VHpFgUTfhtF6BQHd4ZLV1/PKTEjiC2dm5s5j+HwIXKVfnoYrjIt4yrL9AB3KkiKS0E8OdKZKeK9K+sxjpaeLI6ipGh1wxsvDrkCNGaroJUF2WAjbrFTEeXS51i49DehDUVk+dVys/Jj2wjK75Eiw+iG6YGFNXBAsPSWDDHIAlG7hETzsNMTJSAZIeEvJ0llBVlciZPQDsZxI8DUc9YE1wi8q3pOFHLHUcIUbOUDHyxoijYLg4ewzAzA/2Klja8RQ/BMXJcOQlgKUMNzgPlR4yn0WCj2naUEheYFn9Z2R1k+Ani8wuqauztDsLFoadXByuK/g9EvLiV3FGQnidK1hyVILH9kno8HoJHVsEcGyW0Gks0Rx8TQKrYUlIBUfK+7o4hlwhzoFjxdGznxjwbtAYA3RVaYYTwC0vhu+fXwwXtPk2HJIXWFZnOTp1E3/hRnCbc6ZoUrqOhbraOk6JrCgPLfCJCxyMv/QOIp17irPfSBU55K2UUPExiNLPJbjzYwnueRfA20IWBgPoavHvf1kCc3HZ7y5xjr5FnIMBMniTSopbMTDDnSuhs7tFKs+KZOaAc5niPEpNWv2t5AWWhR1HVicR2IYo4px9BqOz0Cf14Eop43V2HZUhHcE6ATekqDN69BMHfjLhWiji90vg808hWjGB2PMsniNN+yngavPFtwPeo5kp4rz0MbwSBuu7CyA1QM5z4FjeqnqrqEtvrcfkBZbuGuo1nQdJEN4DClgJ6Qkgsxqc1SfIWQMORwBNvZEzKU9cY6+CVf0B8a8BwDb8EhwKj7tPB+BPi3/+tyEWkTR9OP75ASrkF4pQ7vGkrYXkpgAVZATngHES2DgbZ7jW4kw9SfQ/gIL5a11OTfOCAE4q6jBaUu/4hbh/sBU+WA9DNC7FLPMYlPppIhmjASaYMQx4/fm2g7vuP1+x2sTy+Rit8iy5gWWxFUefIfAeeEWCJywbUVN1Vg2QEeQG3oYeJqnfekTcs9aIdIJYLFoGvHNaCUDCPmakDxbfS5eInxMOlR73m6q+SQTRJAeWSSlHt96wLWVJYNvHFukgqpo6VHMxck2HuIZOkLTvvSium16wagIAUZRSz0q9SLzPXSXeBS/jnsVl2xi4khtYHPHoECOtvThG/VT8Kx+HDlOpOlZ1otWlTXrQAAtCRKJe7mu+JY6+N2EmCM8GB7V7gsspRpfx4v/7neJ563dQvayF6TYEruQGlkKMyZ2cwyB2tiyHCzCMmgzN3UkOcihUo7Icdq/PYSSFBZ+g8p/G7wwYlRd+WpMksPhfxPO330Afg7i0BopK2Mr/tQBgmR3o7D1QjL554l/9FvoPi3KaczRXB5l4lxC8RkNF70L89YLifhIuNONgkhgIs8NG1NMDzgVwrXsE4HpEmU3aCriSH1haHMLg6Jj4Ewku+28JHNhuwsmaNTYPtkxkBU5gPRLSWVJgRC07LI7hX5bUWS+IZF8nUvEpwAXO1QngWv8f4nn7f8HJOHs0RXzz1LtpSk1+YCk6mJ3oGjFdren5l7+BDjOV6KYhU7RSTE4a3A/LvJPPUUfcoiXekd0N4HoepogvA1yfmODqfIkElv1MvPP+YmVmpo+Wc2u41zKAZYk9Z+8B4hj7HQms/LUEdqHDGKBEN30giOB5UXVWQntXwMQAfyx/OY4AVrd8VR1HTjdx3/ekSA44VyW8LQKV0Lkmin/2feJbO0+BUA2Opq98k5TYMoBFUpBDYX3PNeFWNYP3LXxSrR82y+ZnJgNVy0zBo2/DKwL6VdUBWONvEyMXIGPAdpKO7K6SOvMpeJdiPdEPNwrYu4zOo8T/2nUSOLgD4AL5m1Wcm1VtjP8tB1iWsdQ5dDws31+T4Gas1a3DyGdophlicA90KKhM4kyDngXFvf80c6Gc9XFAPoKbOrr0FveMlyV0bh8iQvxRv3LniO+Nn6sZpQkuC6lsSysJLQdYSuE1bUeuKXcpH3P/3O8pdxfFtZpMJAIEFIPwtghsmQNfLyyS0yMVE1VnP+2uYwFFbSUZFGf/0ZLytQ/hBPgZ0mJhsd0ACR58S3xLXmslMPpiM1oOsFTdTYXXOWIKXm2/Ey4qx8T73u/wZgxsRE21H6jFHYOHd0tw398Akn4inhJlVnD2hJkhrJ7mqVnnlInXwxPi1/DzWqfEn5EzVvwL7jNnuNagsRK3ikPLApbmWnAZdl31AMAEZrHrCfF91JQj3wSKf9NiVT6t7aGK3eIYeivctsC9yKxYz+qAcwuM7htmQQe7HMbSQqTFfUhL3/w/g9vRBJHArmgm1aC6yThJYGvCs23Ec6sDuFbnHP8rrp5IYO5d4t+83OzQxhSJ7DCAhi93BD/5oxiZw4BsL36YVwyfbjUaF5GBQEO9DNjiUr70CLxMDysAGpnjJbjlUfFvX2umSIQib9XRyjCyJk123fKARdJYIzLlmpkQRYPhrTlEfK9OwwZoOzFU0KTGBBeK929cCs/SgzCKwrmvcp848m+Db/xQq9MAomhBiWoA8KJLxDnpV0i/XnEpA+5m/qUvWFZ5doeln0XLo757FqhCZ0+Ld87TyBigb6bQMoFlcQBHp+6S8hUsTJ/G1N09UrzP331+//VEg0tzqzMlsKP9CW/x9EeXhaDnlYhz3D+enw3WEIORvWqCJuWKO4AwPPPDZJ8xAeL8WfHv2WRGtgZNZMp6r6360bLveeknEMswe8A8owdhvekTHKFlAotEIAdAcI2+XJyX/S/ECzrGWyyeZ74DoBU3GucKrJuP2d0aABn6lPcUdKbRwslETIGgAwBoRHVNfxr1RJ3Vq2gQ5xs+RBYUtQ3oEg0qpK966edYQiqQlMk3mVWqE+gx1bpBkRrQigaV0ziJrNHtvv7bEEd3QgTCq+DUYoDru9hhryhx4LI6jm/z+BeDG2RBt0IIle3CttwP4X3ELiZniKMTXRNugM6VD3CexnE0dK1fSfD4AeSKYLXLvKjnfxioPK//VqRwi7hvfdBMFE8+9RQT7+OWDSzFAaAUt4Nf1Df/AzoP2L87H2/azBHPEzPwousBE1xKKb4A3cWiqm/pa5gBQvF2ZUCMnQHAhopr3DXx0VxzLbyA65z0Y4ATbkDQ1UIVyFIvU8WaI8U98wv4xPPGf0tw1cPivv8589U0tjkOoMdaZKzxWjaw2EqKDhCYi7/ue16Fu8pmKPRDRMq3iefRyyWwG9ZxJV5MMRQrYarjWZ0X2LUBi8g/ApjgFgMLeujkDpg8fqmWbRSHaUAnOsdcqdzkxY9X2zIw29y6EOjyxAYI1gvqQMhTIZ5XfymB+f8q7n/eaXJPVefm7drmLb269y7wRM24YOGGP3rKvWvABTDjSu2GDkoX7+MXi2/1B2YB7HwSPdZAUcLOqygT398fQedD5NG2ULUXovdWcY2/NtacasazQOjM66tezJBy1Dd9nIQOPl2/Xz/rRG6EelHce579Jwks+o24f7RGnL0Gme0jPZo5NH8NEkUAciUQ3TV4grjvXW2Ci0aurEnie+Um8fwVVm/s66CUfkrFmPQPABHBO+85LB29D7D2AVhdaibouvFflAhWndwAbmWmc4hz1NXwkkAhzgwlDgOHMMNVgZWMCFq8oa2BvRvF89jtElz7NN4cWiyuIRPMNiUBqFjr1gMstoYdTHANmySpD4ALVEEsVh1S7wAG1v6bVP3xq+LfugrxzsetFWBKnEAyrV8ggcU/xF4O41X+odK1mIX+Tr1ModIqMcvC4w0maJ0Fw7AcBFB4S+FDD4azh+5AAFV4vhwEWrxBn/ItfVM8fxqNF2cXi/v7izAzvswElZllvBVplPitC1gkkQUu7rHgfhCjPx32plNL4a5yOZzuPhfvU1OUD3qw6JAZ14pfA2DsRIx8ft3L99o1ANUIdCwWmhVIr8cLFHdfeGdYXM7omCuOwbeAC2IQpA/F4vQynMPFhqEaUEAMRV/hQal68afiex12MzBj9/1LxXXxFWGgSh5ktT5gsUPYaQCHs9dgSf3eG2L0/7aEji+G31QfAAxuwmt/JlW/7yfe+S/AlnSiJsACcFNgJ+JDl94X7kHv9cZz9CLZXGWhuL/+WzHaZ6EzAT4LHCyyQYF5IDgHTQTHwglsY6GSxSi7UN1X/1AXKui+ZW+BS03Dm9j/gzaMlJRZn4pr5LSkBBXr3TqBpVqGpgFcDuyrkDrz/8R13VN4exli0FMIDnQp9mEYAm/OuwCwq/H+30vYKumwCRSnE/pZiXie+z5mmPBEwEYf4kiFCQMd+bUPxIltjbR+pDr+gv6ZHMaRh91rMrsiXyxGY1Ko6sJ8A17xb1kpnsdn4lWyr6plJMfgGRgs74sLrjimKGYeZj4XVJUEJzZCCAnOM7myU5zFHD/sJN/bP8R2juuwkQe4BDmO9ySAtAtcCF+ZGPcbcQ6bLP6Pnseb13/GsshY1ZbQsQ14MfUJcd88K7EcgqRHHejb5XnqAQkVLoHzHzY/mfYoFrWnim/hM0LvDW4QF/KUi+vS30nK9fdi0pCpBo2aiCQXtatr0/qBxabqscNOhOjzzn9OAisehvkAIo2L2HydDD7poXIYK6FKGR2wXEMRSCW6YqM4p/5B3F8CB9NB5afHo8Ut1KE2zoG4Onr1CeKGiVLv+0+Kf+ED4KYAc+AcZojbYeMCt/SXQIQPxproE6aSzjqEDRZdpWQ7cim09QfdgRCNBpZfUm/7ifhHXCH+D2Gt3vs21vsg3mCfMrIuRmdDnwpg/s/9GLhvkdqtz6W2MzKwVxdFqzhIttpAFI2cBJG+X32itu7m1pLBo3skeGgjzG7tUS4NpHiTGntAhM7sxKfrfiEp192ndr4xMQmEhs8YdbZJdmwbHCuc6IrbmB3Nfaz8GxZA17oTAAKH0pvdOtvhHB2oOhl2qzOYsZGT5WILyTx4r/YYoRaSDbzmZWRiS8qMDgqAhhveBAp0YQWCu6i9330++L3jrR7uIHiyUEJH4YF6aB2Ob2IWiDd4OvaCFp+DhNCzwLGkw1BJufZH4hp1Ke5BlLcALhXWauW8EX7d+s/JMMC5OOoNVwp0F3InTu8JNnAi+KSHymBLQl8a7eBqDJAZndi5ABr2wwrtfUL823AJ6UkPUCOjB1xfCkyrfHpPGFGxKS7dVRBCeFNHbah77gjAc0wEP3qbqrRghkY7mELSYMdylqn7RgZuOqk/7ceWSfMB4AEmwFl2C+BSqtHWv7bFscJGfbD4iHjf/q0ENz6uXskSJzoVdiqaFByT/gvnZRLc9x50MqAITERttsZdlFP7gjtBZDlgzWSg2CSHCWAVOQDLfvCUOVnjM4LYAS7khK7kRFqYDtRN/1nkvwugxhUwaPS+QxwD4Ki46U1svAvbm9MhqQ8tx/onuBg5pxblzLOFhLahYynxhx7hqId/ue+Tj8T/7kwspRyBaJuKe1DcSzFT7HyppNzxjrLcU/QETz+I+8fhJXEQetBu7NEAMJTiIwEQjYYXCjYBRxMXf8SMhRviSelDYIwh7OcgfvyADwXO9kMgUrF3aQ/M7voMFZoa1DZN2Nyt6sBaLG7PR34FJldlPi00tG5gkUMpEae6Wrku++Y9BS4Ff/XckTA59BU5vRydDyZ0xZ8k5YrboTOBwxAEACFfOBX8nP3N17pC3G0ZVvFQRTm8J0okWFEBkBVBxMFkwW2+fRB9SsyiPLwsYbhTMOtMxyyTuhhEJPeO5y8zC8+gx4UHeH4aqTArsMpOpFPcLTxCyzpvfcBS3MnSSSy9JFh4QHyr3pHgyh8CQcBM3mUQOfCCKKnEvlsPifuqmWASw8yeCxOXSgwplOER8lI7LdOpjz/ppxhVze4mIsODCejwOzXOFYpwh/XkC66p2FgE2DScHU1w1Yjcsi5aB7A0mKq5EzoUPRTA9wP96+dKcM1DalYnWZNhl4K4Ob4E63P3SMr0GeZiMjlEuLjUfah0mwhw6HgEnOJs1vNocZmPjs+j1pVUEvyzgG8Wh2sX9DYAi9Z+tY+8+aBF/m+BwLI61OxVs7PCOjV09pTanC3wKQC17T8hmtAvaUOwm9AOMU6ugv/TQ/Dc/Eesz40+33nhXKq+btTgUCCuLzKe6/j6WFcSmirIsVKzAS5rcmDhtq5kyfgs+YDFka1Gt0WuaFxBj3gVBW/KlJVKAF+WCH6+XgLb54EjfWAmplINYBntuolr4oN46WG6OHv2h5ixmq0BVYNzWOU2x4FyUNU3E+KQMwGGloms5AKWFhfhozuSrnidPngWnyo5VahePgju3wTr+WwJHYH/FZRwfg/HgCmIe1Nxkw7nwHHizMdMDN/WqQ4KUMg4WQClKoYR5KfpAhcd+9g6VnVnXeiJBSpapdVmZvwWjR8b8vvwq4Bt6ORh/E6oT4+EilaLlKJAAgl4Mbpg36wRd4vRbRi+czPQnMJ37oFlEVjEdWD+FJ8EU1IByqqgMqaeMUVhx264CeDrgabb0IKOycWxSDh+3uT4HtNGVAUnJXCoEIyQ/OiRkYXd8rrPwBQer3vBQU46dIWY43S+EyzfEB+RU3gNpnClPlk7B2aKUCWARUaa0zlZaxlzvZIHWBR/AIKjax9x3zgr5gZ8IaKawiMvBiVSrXPzThL+JyeF14Uf7PfcKWVEdeT0sOppPkvCStdbpeQBFqtqgeuLtSY4SOSIEC4qFH7wLxnFXES1a1xa2AlVYB2SFv2sPBhuNcdK9kFRoyU1LvTUo8bNZr0guL7wQ42+cA/xaJ3W9ylDWnAI0Yp/Eg6H3fGuIbdDYmjBTUo+YJkkbUP/TU4cwhKRQBIavceZuqK63XKRZQOr2SFsgidUfFS9UOHsO9yskdIVm71yDa6ADawGky5BCSnKoT8GD28X6Q7p3qO/mbG6n6AymiEbG1jNQPTqIpU5BLA6Vw7fr7n45vR34b5FGxaCDSyTDvb/hlMgyO/x7MEb1qOuMb0cLMA1PMfmT2lzrObvA3wWGF6qcDDlV1xbS7CB1Zw9SXFH957PPoTHxU/VVkyqOi1cDLINNrCaC1iWuAuWYG1067MA1pfNmrTw2aAmpw0sTYkmP5r2q8BO+Nr3vkpc/SwzQyvgViSlDawmB5RVIJeesCWRf+Vz4rrmx/AehTdH+Dpnc9UrQeXawEoQIePKxhJ3gT1b4NgXwK4xU8zkrYRbsTE2sOJCRKIim2T3rXgdbzv/M1yk8XJhK+JWNrAShZN48lEeGZCC/GCA96y4xkwzU7c0r4x62mxzrHoI1FiPQ5VnJeWG78HCDsf8VmAQjaRT23rFPrL1yXCtOFjL9WKojYQ2x6qNMk1xv5WCiqSzgdUUAKqtjFY0C4xsog2sSIrY1wmhgA2shJDRziSSAjawIiliXyeEAjawEkJGO5NICtjAiqSIfZ0QCjTpe4XhW8obTTAjaozyGiNP3ZPheet7iaCTaX/F5ilwqAgneyLy1vWMPDa6gVQTK1oj6noWWdF4rmvLl/ej1SOWvGtLW1tZseSp49SWd6zPdbzIY311q+95ZH7xXDcqsMIJVomtFCvOnsU+H35Ja9dO2me0xxbq3GeIKxoN7/DIxobnde7cOamoOCcpKS7JysLHAmIoSxObcQnC8PxY99KTJ8Xr9Upaapq0b58h7dAWhvB46kYM/3RZGuxnQZ/i4hKprKqUVLdbOnfuLB06mBubxJt/ePzKyio5euyoMH+Wldm+vXTp0gX1xya9COFxY6h2TFEaVRSyEceOHZPVa9bK1q3bJD29nWRkZEjlOexrjreYLx49SsaOvVg1MNbGzVuwQPbs3iPt0tqJKyUFL0PjK13YsDY9PV1uvukmSUtLlRPFxbJgwSLZum27AnJGRroMGjRQbrrhesnMxD6fpmxQRN6NvN6fPVsyQGQHFoIJQtb7LN5Mvv7aa6Vv3wLxYY/2NWvXyvIVq+TMmXJ0UIWK17NHngwePEimTpksHTtim8c4Bkh43EOHDsnKVatVfbt17SqZHTKlrKwMtCuUkSOGy7RLp0jPntjqO8ag82a9P16zRhZ9tESyUL9OueYb1keP4gNUGBxjLx4jl06dCvCaNNEAj7GYOqM1CsfSDdu0abO8+MqrUgVu9c3bvy4XjxltASGAjlonL7z0igweNEDu/OY3JC8vL6aOOXr0qFSAE3ErhzfffkeKS4oBBAdGYab8/GcPy/79++XFl1+Rq6+6UnqhM1asXCXbd+yQcozWsWPGyJ13fEOc/BCTBQICpbCwEJwnTT79bKPMmbdAOqMDDh0+Ij97+MfSu1cv+cOjj6lBcdUVV0gunnnRYatXfyyrP8a2k/jrlJMj3753JrhA5+p866K6Lpsd/9HiJfLue7NRTk+5/favqfI4WBhn9+7d8txfXgT9PHL712+TCePH1Zu/zpvc+uVX/ypbtm6XWffNlCFDBivas16VlZXyzLPPyzbQpW9Bvtx7zz2Sk5Ndb951tSnymfPfESJvXsi1btjJk6fk2ef/Im5wFY7mW26+UXEVEi0F9/r06S3FJ4plH4Cwb/8BGTVypKSmuuttHEVDp06d1G/Hjp1CAlJsdOvWVfK6d5e/vva63A9CDhs2VLKzs1SZK1evVs/2Hzggw4YOVfVhGzlCU1NTVV6s4zlw0i1bt0pOdrbqhGFDh6hOz0ddZ3zrToimXMVxO4DrDRo4UA4fPiwejwfitkKBc/SokQq0ddFP08fvD8hbb78t88BZmf+s+++T7t2wuzLqpOvGdvLe5i1bAfrPhNwsL697nTTS6f/+7nuyYOFi+cH3vyMXDcNHCpCvLpv5Mz9y6OJifIATRQ4ZPLi6XHVygf8azdxQerJUysvPKtFTdOKE7Nu3X1WVjdMN7Nq1C0RXmhQWFcm69diRL4bAtAwBfFeQOk+Q+0rhHjtq9odz5Ctf/hJA1k09ZzwC14WtIXW8ykpwu7DAtEF+oxDBB/Gg8gInycxsLx/Mmat0s1uRJ4POg2W78I2d8ePGyqnTpwHgbNmxc5cQuAy6juqiln+LlyyBmFqnyrny8sskGzpgIMANU82g86AIL8jvjXgd5K13/q50MA0SHVcfdZqDEK1Ll69E/cbIgP7mm9X6GeMehXqy6/Pd4saAdGMwU3Xgcw1Knd+FHBsNWOQeHIkHDx2Gop4BroD90xHCK09u4fWiE6HfbMGopNwPfx6tYfo5jxxpJAjzITGpK5Dl8x7FHTuKuh05Gu8FcZ2enlEjW5UPuKgKzJABR4KH4vPaa69Wt5ie3JbxeWTIgQhk2QQm7x88eFDdr+0f82C8w0eOyLz5C5X4YdsHDhygkjiwN7wOjMf45O59C/pCz/OKB/ShzlRfOAyak5Ydwd1ZP+YTHnLBCQcNGKBAGsCA5ADR5YXHu5DzhCvvuoJU0mfecxcU0OMKVJzhMOjnutJsNEc/R81pKKxdEE93gI5T35F5+rGl5BhMBhg0IZ3YIJZEe+e996WypEouv2ya9IDCzcA0UQP6wAngnITudc3VVyr9qbb6cMQrbmi1oaSE+1fWkbdV4DrolwQRxWi/vn0VV9d11kdG1eUqvQ4DkHrQ5s1bZPq0aXUq3NRB22PCcvjwETkBacEZoM6PXJezwXvuniHHjxeqc+qGDLXSRD2N71/CgaUrSKJQH4qcLvO+JpiuKjkAp8RnIToJrHiCAhVEIjliXvfzoNFEmjp1CjjCQCjcXqVnaW5TZxkAHWeaBfn5KhqqDKJHSWHdY3sIYnZoZNt0Kn2fs71t0A3ZuadPl0n37vhUncUBdVx91G2gqGUcqg2lpaUYhCcUsHS8yCPNIKgxOJwPE5lX5eYbb1BKegoGgs6TZhLOeBsrNAqwWFk2gMTkCHHgnOYFfV83jsQK4SUCXgfwtoofndmQQLFFccuZnQoRKKAuF3dQPuimCInILnpWiKR1MN2+aBHJmU+eOqUmCDS/7N6zV6hosw2R6Ug/cvPCwiI5h5lcMdIeOnJUThSdkP79+tUK4oJ8fI0M9eFk6DR0wCeffkYK8vvIwAH9oZ7kS3dMAGh+0EGDXl8n4thowNKVpa6jAxXsKhj/OIuiLWXT5s1q5LJDQCX8dMz4j0GkZxbRAuvCENlx0eJW36slr+rnDTxhR1PXY13Y7nQai8G9OBHB8KtBAkRR4OnXry9mbYPIhMTr8Uo3cDmGyPbwmm3lzJFc6m+vv6HOO0OnKgIYOftmAeTuBObwi4Yp/U7rYZH5qUIa+K9xgIXKs5K0eu/bvw9K7SE5gpHm8XqUMkndpFfPHkp0FReXKKNmA+tfnQw0rzUkkmC1FhLjAyrVtH2RW3PWfBHMIpdcMinG1DWjRWuXvncZ9Mk0cPDZH8wRmn7aY5ZLpZ26HSdMNDfQcN0P4vBLN98kBQX5CpQ6fc2S4r9KPLDIHQAqWr1nz/5AjsH46INiffMN18ko2HmoL1BXYAMWfbRYGf+0HhZ/9VteCir7OhBcVVDgGTiDDZ8V6ji1HesCADkhn0+aOAHib4CSDJx1H4FxmcZWrk5wBSI72wVOViR/fOxxefA7s6Bz9U0YuM63srYWxHFfiz9auh9/8s/Kgp2BpZbbvvoPMtqasTE7LZpoeSZx21LgIKJhkjRwQOGvwqSFgaCqCyzx0CicphR7l182XaZMvkSBiOD6HDasnbs+V+aLHBiRWZcP586Dhf4+LJMlBhKJycVqNQnDETFn7nxM07MVpyKr1aAyAXVeaFGpp1hoSyE3N1cZRamsp0AxpyLPECuoSMO64nKwcimNRmmuDvTvbyr5Sv3A8lQv/CZNnKjMEMtXrMTS2npVH65LcoGdE536yoilvxLGLkzQCEZFIewjx5W442o6G8agKwssVQc/Z0LUSNtA0GCgTYqKM00T9JDgLJH2rFiCpmG0uJr+S5ctl8cgLRYvWSa//8OjatmJZfO5/jE9bVv/8JVbsQg9WRmC+ayK38dOUEgYsHR9fJjdVC9NADPt8EmSyKCJfBIjhNNpTRQ1ZYmM3Iqu2U62nYvJ9PCgeYSz4xNYM2U4T4eajdb3mfaTTz5Vs+qaMUyORy64c9cu6YFZIY2pNFKjyOrA9Jr2aiaOJ8OHX4SvGQeUKHaFzeCrEzXwJOHAUvUAoNgAEkSvw2niBINmSzlT2bptBxqfrqbdSFEtFHXcaG3Sz/SxZhyLiuHUrBkh6lWNvDQDxVFnU+N5eA5hnaZv61vR0uhOpavNhAnjIAZPY2A55ZNPP9XJa4CLeWgAMMIqeFTMnb9ADcbqBGEnNO10yjG9L8rLy+FycxFEn+luo8sOi65Oz5w5Iz58boXKfMeOps9aZJyGXCccWHQhobGSdhlad7mGx0CFkoTSMx/6N02aOF7d4xJKEIZSHnVcdRLlnyYQicjz8J+2mek4UZJHvaWVXX1UeSImrekM+r66wD+dv1kH85oinfd1G3QcnUYfSQM+4xSf9iZymbXrNsi27dur26LjMh7L5pH+Wu9/8KE8AC8IbXfS8XjUQJ4M0wXzJP2pV+l6EKCMwx/PmS/1sXXrN8DsUSETAXRa7HX9wvNuyHnCgMUGsFI0J9xw/XVqapuGBdAtWASmMsnAOGzMbBCIHXALiMtZSxlGDUFIsUB9g2YIGhIZmGd4oHGV8bmuSDOGSURa7QNwwjsjZzBSqdvFGmhXOgUFmj5KdMEJgaOyjjS40tmP91kXlsPA+rAc1qP8bDlWDIKqE7kE5IN9iPXisg3TRQuaTjSKzrx7hjIHlJ0pkxdefFktMJPTEBT8sYy9e/fJ0888B51pqfzoB99XC9/ROl/nS3ekb8G/jfVfATCuga2K8TVAGY/nzPvNt96RpctWwHftcswaJ0erboPvGSi0Zs81OKuaCWmAW7hosRyHHausrFyGDxsC0GWpWdAIyPUr4TTHRtIiTMc8ekGwKpkYNZwaX3/dtVF9m957f7Zshs8UuaICQADVV6IXX7tNcaulj0HwFqBiWldgWSyfOsnfXn8TSxwd1EI2l5ZUhvhP/Y+SkXrj3TPuVAovgfgS1t9KSkqEa29+gFAR0Oo83iO4rsQUn+uUupzIuuj7HBwUhasAgi2w/XVEPeh3xecEMJfCpiGfy6ZPq+ZUrHd9gQvQCxYuko+x4D1oQH8ZB0/dHAxiWv3pXUEHSOZzI5jApEkTq3XdWPKur2w+bzRgMXOOWgKLo5DcgMsXPXv2BJcyXWSpb1E08tkBuJxwlPJZD3iT1hZo9+GaYm0EYIdQRGlf9Nry0ffZsR7MhmrLT8djfhzpzJ/tYt1r61/GobsLRVZdgfF0uTTTFJ0oklJ4SJDrcp0vt1Ou5MEbg7ZAhvD4seRLkXcMM3RyPc7UtX6bkdFOCgoKpCA/X+lW8eRdV7nhzxoNWHURIfxZ+Hl4xdrSeX004HMGDcJYaFNfnjqPWOPp+LEeGw1YrIBJjy9K2kgCacIxPrlA5PPIxuj4kff1dX3pdTx9rC8/xovMs740kfF1WXUda8uzIXnpcmrLUz+/kLx1HtGOjQqsaAXa99oGBRI2K2wb5LJbGSsFbGDFSik7XlwUsIEVF7nsyLFSwAZWrJSy48VFARtYcZHLjhwrBWxgxUopO15cFLCBFRe57MixUsAGVqyUsuPFRQEbWHGRy44cKwX+H92F5CAaTGppAAAAAElFTkSuQmCC</mdui:Logo>
-        <mdui:InformationURL xml:lang="en">http://www.arnes.si</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="sl">http://www.arnes.si</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>MIIFOTCCAyGgAwIBAgIFLuShxBcwDQYJKoZIhvcNAQEFBQAwNTELMAkGA1UEBhMCU0kxEjAQBgNVBAcMCUxqdWJsamFuYTESMBAGA1UEAwwJQXJuZXMgSWRQMB4XDTE0MDQzMDEyMTQ1MVoXDTM0MDExNTEyMTQ1MVowNTELMAkGA1UEBhMCU0kxEjAQBgNVBAcMCUxqdWJsamFuYTESMBAGA1UEAwwJQXJuZXMgSWRQMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAoEET63gqll3fX1vkDCP57sLm6O5CInZAuarIkMSmbmy/61sNdSI6AtwhGp0PK2pm+MYS+NH/AKKg9vgOxCl1Q/t170popo1r6VIO7PaB3W5bW6pObgKT/VWOrcm/RaXLN9Dn5sOryDmuxbR9W5q4eHmGORH+S/L+hKx/KBWmhCIkB/Jucnn48YSr8je1D5/zFimboAmaNHJcXnfdY1xbaqznDWv4DCUAEU1tl/TB1ccjueyZRnJZR5iK0vBvppVQ+3s6o3tcvj2nUfUsU0gbDGNovhuA+6Siid7HpKlfPE2gC4rAueR9Ex3iPKfDSaqfCgV/Z/TiNFxRG5cYR6EunGh+DoOoOvzdwwYcdzWr839TJXwlSIBRu73sSiOeeer7nD+YEMuTX69YPSaGltpCeYsX9uqmCsnAC0bm9vBbE2vplrmfiOEiYGTZeiqZfzT04QrfX7hqiBNTeuNYQ4EVKENheJ8zsureQ7ERC2BV6/t3DOds8o/zep0G/BkzuxkycKnjDsjWe5joLXZzpN6OlaqBq52EKabfmfHTmZo2VxnOlVNsNf6m2ophM9yvEvEJ2FAKV+Y1lkE8bOPh4nk1nA8OP3HFSoiPiBefJcaw/65MUKgHyrLvBvCW/OjH+KILXpew0Vtiw+U4mS9Q36+p/u6Td9NC3Pa3c1amN8X7cLkCAwEAAaNQME4wHQYDVR0OBBYEFE5p1iUs87ZnzJ9M97U+r6zknMVQMB8GA1UdIwQYMBaAFE5p1iUs87ZnzJ9M97U+r6zknMVQMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggIBAImAjfaQYzXX5Nk7zzfWUaZ3HxtLttcTeiC1e7FvXWfNXXP/Omwxy5vcwOlqpicEqcxUd3mkGUUcP1r9EsaKARCNNWo04j2k9hs11WXrd5JypO0a3DYU6YSfH/wN13P43Ts1HAOEb4iAm+BoUNYguxVa198iqP+1dMMtqR/ML8GL6aHqjdBRN7RhihhruQK1zj/tKCT3vCk0FNxuasNWZHn4laoKXu/d96vqG5pxlepJVsG8F/NXedlcu7ghFl5I3rEWX/B1wECd7/Hot0C7Ue4R9XD/R12cjMed2dSQPuJTWAqn366eQTtCgmMCNmCUXm91MVGx8NsBIFHFZQayAme6ny6ODDx5W3NOYjeQnxls88fhzuMR0k+ob1/9SBdznXHTTWhAi+q+TOa840fO1izkR+kgCKHdEx52Lkxxbfd17z+LZL4FVFsGRCh1dH7Aeu+4P3Vo+ufIJDQ4nbKMSbcLKyPBagRtKEn+xbmRJZijSPwCp7VfQPXt0UrYQ4xs7egxR0Bd1biaOSO/Cjv8wD7dVX6RpJSNspoBWKGRige+FSO5kF4N25UtJvpiXbyiNYr69kAfF4htLK716aPouiKW5Ktu+cLf/YMa69RiB6TPmzY9LbE28C+HBbwd3uXxW2eqVRYV0+FVY6ODNDmCrQnllVBg/qp5mEI5MkDQ0Qb6</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>MIIFOTCCAyGgAwIBAgIFLuShxBcwDQYJKoZIhvcNAQEFBQAwNTELMAkGA1UEBhMCU0kxEjAQBgNVBAcMCUxqdWJsamFuYTESMBAGA1UEAwwJQXJuZXMgSWRQMB4XDTE0MDQzMDEyMTQ1MVoXDTM0MDExNTEyMTQ1MVowNTELMAkGA1UEBhMCU0kxEjAQBgNVBAcMCUxqdWJsamFuYTESMBAGA1UEAwwJQXJuZXMgSWRQMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAoEET63gqll3fX1vkDCP57sLm6O5CInZAuarIkMSmbmy/61sNdSI6AtwhGp0PK2pm+MYS+NH/AKKg9vgOxCl1Q/t170popo1r6VIO7PaB3W5bW6pObgKT/VWOrcm/RaXLN9Dn5sOryDmuxbR9W5q4eHmGORH+S/L+hKx/KBWmhCIkB/Jucnn48YSr8je1D5/zFimboAmaNHJcXnfdY1xbaqznDWv4DCUAEU1tl/TB1ccjueyZRnJZR5iK0vBvppVQ+3s6o3tcvj2nUfUsU0gbDGNovhuA+6Siid7HpKlfPE2gC4rAueR9Ex3iPKfDSaqfCgV/Z/TiNFxRG5cYR6EunGh+DoOoOvzdwwYcdzWr839TJXwlSIBRu73sSiOeeer7nD+YEMuTX69YPSaGltpCeYsX9uqmCsnAC0bm9vBbE2vplrmfiOEiYGTZeiqZfzT04QrfX7hqiBNTeuNYQ4EVKENheJ8zsureQ7ERC2BV6/t3DOds8o/zep0G/BkzuxkycKnjDsjWe5joLXZzpN6OlaqBq52EKabfmfHTmZo2VxnOlVNsNf6m2ophM9yvEvEJ2FAKV+Y1lkE8bOPh4nk1nA8OP3HFSoiPiBefJcaw/65MUKgHyrLvBvCW/OjH+KILXpew0Vtiw+U4mS9Q36+p/u6Td9NC3Pa3c1amN8X7cLkCAwEAAaNQME4wHQYDVR0OBBYEFE5p1iUs87ZnzJ9M97U+r6zknMVQMB8GA1UdIwQYMBaAFE5p1iUs87ZnzJ9M97U+r6zknMVQMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggIBAImAjfaQYzXX5Nk7zzfWUaZ3HxtLttcTeiC1e7FvXWfNXXP/Omwxy5vcwOlqpicEqcxUd3mkGUUcP1r9EsaKARCNNWo04j2k9hs11WXrd5JypO0a3DYU6YSfH/wN13P43Ts1HAOEb4iAm+BoUNYguxVa198iqP+1dMMtqR/ML8GL6aHqjdBRN7RhihhruQK1zj/tKCT3vCk0FNxuasNWZHn4laoKXu/d96vqG5pxlepJVsG8F/NXedlcu7ghFl5I3rEWX/B1wECd7/Hot0C7Ue4R9XD/R12cjMed2dSQPuJTWAqn366eQTtCgmMCNmCUXm91MVGx8NsBIFHFZQayAme6ny6ODDx5W3NOYjeQnxls88fhzuMR0k+ob1/9SBdznXHTTWhAi+q+TOa840fO1izkR+kgCKHdEx52Lkxxbfd17z+LZL4FVFsGRCh1dH7Aeu+4P3Vo+ufIJDQ4nbKMSbcLKyPBagRtKEn+xbmRJZijSPwCp7VfQPXt0UrYQ4xs7egxR0Bd1biaOSO/Cjv8wD7dVX6RpJSNspoBWKGRige+FSO5kF4N25UtJvpiXbyiNYr69kAfF4htLK716aPouiKW5Ktu+cLf/YMa69RiB6TPmzY9LbE28C+HBbwd3uXxW2eqVRYV0+FVY6ODNDmCrQnllVBg/qp5mEI5MkDQ0Qb6</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.aai.arnes.si/simplesaml/saml2/idp/SingleLogoutService.php"/>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.aai.arnes.si/simplesaml/saml2/idp/SSOService.php"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">ARNES</md:OrganizationName>
-    <md:OrganizationName xml:lang="sl">Arnes</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">ARNES</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="sl">Arnes</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.arnes.si/en.html</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sl">http://www.arnes.si/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>AAA</md:GivenName>
-    <md:SurName>Podpora</md:SurName>
-    <md:EmailAddress>mailto:aaa-podpora@arnes.si</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Arnes</md:GivenName>
-    <md:SurName>Helpdesk</md:SurName>
-    <md:EmailAddress>mailto:helpdesk@arnes.si</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Arnes</md:GivenName>
-    <md:SurName>Arnes</md:SurName>
-    <md:EmailAddress>mailto:arnes@arnes.si</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.aalto.fi.xml b/swamid-interfederations-2.0/idp.aalto.fi.xml
deleted file mode 100644
index 09d7ec24..00000000
--- a/swamid-interfederations-2.0/idp.aalto.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: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.aalto.fi/idp/shibboleth">
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope regexp="false">aalto.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>MIIEZTCCA02gAwIBAgIQfPk0tfjUFfPvbNYjMlu/rDANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTEzMTExMTAwMDAwMFoXDTE2MTExMDIzNTk1OVowOjEhMB8GA1UE
-CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRUwEwYDVQQDEwxpZHAuYWFsdG8u
-ZmkwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCjQ14Y5ls9qgndtooF
-Z9tekHhuETMtovhozaCqvm6HwVE+jEo9ik4zwre42zTGz2QACBOldN5RlFw/A3kJ
-oGK5jEqQZFIw2XG22C+A7NNoZLqgGH7K3BYlYpI1Vpqpx+tk2/QpVUi4JqdIfVxT
-KHQZIW66dV4Zz+JMlAiPR/qzjLBYwUBllE5GG/BMBo7fQvMKqfrdAi3QcPdsiAQG
-Hl39WcchL53Y2tN8xOq2bkk6XOELBEe6byYdVgRzsGi6eyQHPvcWGb/Fl2JPahUj
-WM8Zz1w077omI4tzq/OLhnKAB/J25m9SAh23rq/lCFrnle528tE/nRBqX/yop8Hh
-n++dAgMBAAGjggFpMIIBZTAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3V0fqkOO5
-7TAdBgNVHQ4EFgQU7fL+WKGykn8q5Nden977Qx3neOEwDgYDVR0PAQH/BAQDAgWg
-MAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMCIG
-A1UdIAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQIBMDoGA1UdHwQzMDEwL6At
-oCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3JsMG0G
-CCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50Y3MudGVyZW5h
-Lm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9vY3NwLnRj
-cy50ZXJlbmEub3JnMBcGA1UdEQQQMA6CDGlkcC5hYWx0by5maTANBgkqhkiG9w0B
-AQUFAAOCAQEAMqh4jbB8O648lGCpqemnz15SXeHGdQAyfvC3xDwEVa7eplPzeSg1
-XW1MqufDwc6j7nO5fYtULdMuj7/GM9gXkiU2Zv+qPbymrdADan8zqHQ65Ph+JarH
-U+WwQBqDu5B4ZLpp1188FPxqX+cq/5AdJ0/yxiQjG5yC0o5iPV94AEnUBCrB7Kp1
-Y79B00ak/mPB48aieNaM+iyYfkmyrzg7qlaRcXhh0CsFlL9zDt7l8eUImkesv6UM
-Cxdagkq9pUvFaktXeSRZbrRFcaP2j/TqkPnCtuoK/oQxvwcnllp4PqGQHypWfHOd
-ZxL0Jnn1/d6adGsxw3M6+kdWZG8Iu+3Mzg==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.aalto.fi/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="fi">Aalto-yliopisto</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">Aalto University</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">Aalto-universitetet</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="fi">Aalto-yliopisto</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Aalto University</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="sv">Aalto-universitetet</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="fi">http://www.aalto.fi</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.aalto.fi</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sv">http://www.aalto.fi</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Mika</md:GivenName>
-    <md:SurName>Niemi</md:SurName>
-    <md:EmailAddress>mailto:servicedesk@aalto.fi</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Timo</md:GivenName>
-    <md:SurName>Tunturi</md:SurName>
-    <md:EmailAddress>mailto:servicedesk@aalto.fi</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Timo</md:GivenName>
-    <md:SurName>Tunturi</md:SurName>
-    <md:EmailAddress>mailto:servicedesk@aalto.fi</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.abo.fi.xml b/swamid-interfederations-2.0/idp.abo.fi.xml
deleted file mode 100644
index c373b984..00000000
--- a/swamid-interfederations-2.0/idp.abo.fi.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns: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.abo.fi/idp/shibboleth">
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope regexp="false">abo.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>MIIEYjCCA0qgAwIBAgIRAPtd73PPNmqn8n4RXo42m8MwDQYJKoZIhvcNAQEFBQAw
-NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-IFNTTCBDQTAeFw0xMzA0MDUwMDAwMDBaFw0xNjA0MjUyMzU5NTlaMDgxITAfBgNV
-BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDETMBEGA1UEAxMKaWRwLmFiby5m
-aTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAO5UWgT90vXzUDlkapH5
-CVGFvoVgNDWxVr7WhrH+z2moP5h1wkK/Dnr0CKsglVyNkHycNkLmNH/9CVynp6LN
-sl+CEli5BmskLGNAvc+Q9bQwV52OJZQnXeCDDYSwSgDiIgrrml8niocBehGJEORC
-KW51UErjEf6U//1VfW1vG2r3BydjqM7pqs2GZx9p/US7F6lds8La1Vf/jp1ErW6G
-g1TzHYkx56EYNpqjo2Uin2vHowhidM37grjJQJ+q2qb7JsS4t074EwEQA0fF4wKa
-Yv6coSZyOpPXuuDLDlp3/dfY+beqR2oRml3HMvPnSp8+x/4y3/zEkcXcksmlwVCG
-LBUCAwEAAaOCAWcwggFjMB8GA1UdIwQYMBaAFAy9k2gM896ro0lrKzdXR+qQ47nt
-MB0GA1UdDgQWBBT6OoUGpLGH7zyiXK+pmGrcVKeRnDAOBgNVHQ8BAf8EBAMCBaAw
-DAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwIgYD
-VR0gBBswGTANBgsrBgEEAbIxAQICHTAIBgZngQwBAgEwOgYDVR0fBDMwMTAvoC2g
-K4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcmwwbQYI
-KwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRjcy50ZXJlbmEu
-b3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDovL29jc3AudGNz
-LnRlcmVuYS5vcmcwFQYDVR0RBA4wDIIKaWRwLmFiby5maTANBgkqhkiG9w0BAQUF
-AAOCAQEABsw3n2IGqqaYTvw7lHIvQzk6FmF3TqhJIV3SZv6Pm/sY1gY/RAykgGkM
-Sggdizdzf7LdaKaJRLOkUjj+za2zCGIE2n75XQBG4Qh+fcSfUFyCOdelGAOsoUDX
-nm7SpO8lLINjKr28Z7ll70fYUUvuwntEfYVcWtiZ/dicL8GWrcewROGGMDuKynKy
-UpUufLIUdgHlejsfRYwsV+rOMlDnzI4Mgw06fqiILAHhW1sGAD6yQ6FX2zOR5oVU
-4jIupvZYa1oNsIp/M5Ks7/uTY9T0cOYFlQaesTr6Mb18BK/lhvZ8hUblemAxM5DJ
-eg6LbC2vP3oGU43ehAd8KuMBp3jegA==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.abo.fi/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="fi">Åbo Akademi</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">Åbo Akademi University</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">Åbo Akademi</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="fi">Åbo Akademi</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Åbo Akademi University</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="sv">Åbo Akademi</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="fi">http://www.abo.fi</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.abo.fi</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sv">http://www.abo.fi</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Barbro</md:GivenName>
-    <md:SurName>Sjoblom</md:SurName>
-    <md:EmailAddress>mailto:haka@abo.fi</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Dennis</md:GivenName>
-    <md:SurName>Holtlund</md:SurName>
-    <md:EmailAddress>mailto:haka@abo.fi</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Barbro</md:GivenName>
-    <md:SurName>Sjoblom</md:SurName>
-    <md:EmailAddress>mailto:haka@abo.fi</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Barbro</md:GivenName>
-    <md:SurName>Sjoblom</md:SurName>
-    <md:EmailAddress>mailto:haka@abo.fi</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.aco.net-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.aco.net-idp-shibboleth.xml
deleted file mode 100644
index 11cd1c2c..00000000
--- a/swamid-interfederations-2.0/idp.aco.net-idp-shibboleth.xml
+++ /dev/null
@@ -1,120 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.aco.net/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://eduid.at" registrationInstant="2009-11-23T13:36:52Z"/>
-    <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-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">aco.net</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">ACOnet staff</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="de">ACOnet Team</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Identity Provider for ACOnet staff</mdui:Description>
-        <mdui:Description xml:lang="de">Identity Provider des ACOnet-Teams</mdui:Description>
-        <mdui:Logo height="60" width="137">https://www.aco.net/fileadmin/aconet/Logos/Banner/137x60.gif</mdui:Logo>
-        <mdui:Logo height="16" width="16">https://eduid.at/style/aconet16x16.gif</mdui:Logo>
-        <mdui:InformationURL xml:lang="en">http://www.aco.net/organisation.html?L=1</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="de">http://www.aco.net/organisation.html</mdui:InformationURL>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:IPHint>192.153.174.0/24</mdui:IPHint>
-        <mdui:DomainHint>aco.net</mdui:DomainHint>
-        <mdui:GeolocationHint>geo:48.2132234,16.3581464</mdui:GeolocationHint>
-      </mdui:DiscoHints>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDGDCCAgCgAwIBAgIVAOmKQ6SgpmK/8vtQmiMBkQ1+yZ1XMA0GCSqGSIb3DQEB
-BQUAMBYxFDASBgNVBAMTC2lkcC5hY28ubmV0MB4XDTA5MTEwMzA5MjIzOFoXDTI5
-MTEwMzA5MjIzOFowFjEUMBIGA1UEAxMLaWRwLmFjby5uZXQwggEiMA0GCSqGSIb3
-DQEBAQUAA4IBDwAwggEKAoIBAQDtABRog8uPB0h8aNilZFdYFII8iLgBkDQoAXH1
-AIMLVP8dDaK6dRnwyBfrq4dfEH/BqQxxpmASXK1s6O1YbZcx5X9M48yzzpdKFkGU
-3SIdu4lLNYtR1nfePX0120NTBk9tzCR0R9mmV6YMajFQ8YQkyDzwboTTyILx1E70
-RsFIvmx59QDtdPjP8fi2X5ZsRb1kOFDKeJlI15/SQkWAJGBIjtb7Dhs5K6jlp2lh
-T3R5G+faRrC761qR0ddcmh6qkq6fBGRRydxn85N5L6XkoxfD2evTSEkTB2sKn8UG
-cDNupxjPSD6PIPQhDuQlDyg6sFcMj1N6/PvH6FDhca/WZ72hAgMBAAGjXTBbMDoG
-A1UdEQQzMDGCC2lkcC5hY28ubmV0hiJodHRwczovL2lkcC5hY28ubmV0L2lkcC9z
-aGliYm9sZXRoMB0GA1UdDgQWBBStGKLf2/BAuxR9PAnCFKg1lXw+azANBgkqhkiG
-9w0BAQUFAAOCAQEAcYbfERAghPNJSFLnx4SYwmh19ln2j67IdFaEzGnZ10oNtMF5
-MXbJXqLN/JCEj7QLjRQ7PkhCpIUnKJ14ELCt/7ChnxfUHqwiYDyB3Vtm+FIlaNnJ
-Bhet+AJpiVyb6xce6tLQnQ/UwNmPozPjOwEbuKhz5dO1uftI38FT4hBYzsdo76Hm
-rS4WKwBzWV43OcNVhv2sgDbsxGIi5CGnQm6POICQhXAgvG2BGH+77jwM0PVFNP1b
-CQX+4Ig0MV2Y4WCgu3y2IxpSjGtnHxRxLMyNFblaP0MTo8BROcC74n0jKvnSVXyj
-nWGBQ+FiDBdPEO2Ny3SNjJ3B67hbmXBJSEJw9g==
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.aco.net:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.aco.net:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.aco.net/idp/profile/SAML2/Redirect/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.aco.net/idp/profile/SAML2/POST/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.aco.net:8443/idp/profile/SAML2/SOAP/SLO"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.aco.net/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.aco.net/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.aco.net/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.aco.net/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.aco.net/idp/profile/SAML2/SOAP/ECP"/>
-  </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">aco.net</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDGDCCAgCgAwIBAgIVAOmKQ6SgpmK/8vtQmiMBkQ1+yZ1XMA0GCSqGSIb3DQEB
-BQUAMBYxFDASBgNVBAMTC2lkcC5hY28ubmV0MB4XDTA5MTEwMzA5MjIzOFoXDTI5
-MTEwMzA5MjIzOFowFjEUMBIGA1UEAxMLaWRwLmFjby5uZXQwggEiMA0GCSqGSIb3
-DQEBAQUAA4IBDwAwggEKAoIBAQDtABRog8uPB0h8aNilZFdYFII8iLgBkDQoAXH1
-AIMLVP8dDaK6dRnwyBfrq4dfEH/BqQxxpmASXK1s6O1YbZcx5X9M48yzzpdKFkGU
-3SIdu4lLNYtR1nfePX0120NTBk9tzCR0R9mmV6YMajFQ8YQkyDzwboTTyILx1E70
-RsFIvmx59QDtdPjP8fi2X5ZsRb1kOFDKeJlI15/SQkWAJGBIjtb7Dhs5K6jlp2lh
-T3R5G+faRrC761qR0ddcmh6qkq6fBGRRydxn85N5L6XkoxfD2evTSEkTB2sKn8UG
-cDNupxjPSD6PIPQhDuQlDyg6sFcMj1N6/PvH6FDhca/WZ72hAgMBAAGjXTBbMDoG
-A1UdEQQzMDGCC2lkcC5hY28ubmV0hiJodHRwczovL2lkcC5hY28ubmV0L2lkcC9z
-aGliYm9sZXRoMB0GA1UdDgQWBBStGKLf2/BAuxR9PAnCFKg1lXw+azANBgkqhkiG
-9w0BAQUFAAOCAQEAcYbfERAghPNJSFLnx4SYwmh19ln2j67IdFaEzGnZ10oNtMF5
-MXbJXqLN/JCEj7QLjRQ7PkhCpIUnKJ14ELCt/7ChnxfUHqwiYDyB3Vtm+FIlaNnJ
-Bhet+AJpiVyb6xce6tLQnQ/UwNmPozPjOwEbuKhz5dO1uftI38FT4hBYzsdo76Hm
-rS4WKwBzWV43OcNVhv2sgDbsxGIi5CGnQm6POICQhXAgvG2BGH+77jwM0PVFNP1b
-CQX+4Ig0MV2Y4WCgu3y2IxpSjGtnHxRxLMyNFblaP0MTo8BROcC74n0jKvnSVXyj
-nWGBQ+FiDBdPEO2Ny3SNjJ3B67hbmXBJSEJw9g==
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.aco.net:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.aco.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="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="administrative">
-    <md:GivenName>ACOnet</md:GivenName>
-    <md:SurName>Admin</md:SurName>
-    <md:EmailAddress>mailto:admin@aco.net</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>eduID.at</md:GivenName>
-    <md:SurName>Federation Operator</md:SurName>
-    <md:EmailAddress>mailto:eduid@aco.net</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.aco.net.xml b/swamid-interfederations-2.0/idp.aco.net.xml
deleted file mode 100644
index 11cd1c2c..00000000
--- a/swamid-interfederations-2.0/idp.aco.net.xml
+++ /dev/null
@@ -1,120 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.aco.net/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://eduid.at" registrationInstant="2009-11-23T13:36:52Z"/>
-    <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-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">aco.net</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">ACOnet staff</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="de">ACOnet Team</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Identity Provider for ACOnet staff</mdui:Description>
-        <mdui:Description xml:lang="de">Identity Provider des ACOnet-Teams</mdui:Description>
-        <mdui:Logo height="60" width="137">https://www.aco.net/fileadmin/aconet/Logos/Banner/137x60.gif</mdui:Logo>
-        <mdui:Logo height="16" width="16">https://eduid.at/style/aconet16x16.gif</mdui:Logo>
-        <mdui:InformationURL xml:lang="en">http://www.aco.net/organisation.html?L=1</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="de">http://www.aco.net/organisation.html</mdui:InformationURL>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:IPHint>192.153.174.0/24</mdui:IPHint>
-        <mdui:DomainHint>aco.net</mdui:DomainHint>
-        <mdui:GeolocationHint>geo:48.2132234,16.3581464</mdui:GeolocationHint>
-      </mdui:DiscoHints>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDGDCCAgCgAwIBAgIVAOmKQ6SgpmK/8vtQmiMBkQ1+yZ1XMA0GCSqGSIb3DQEB
-BQUAMBYxFDASBgNVBAMTC2lkcC5hY28ubmV0MB4XDTA5MTEwMzA5MjIzOFoXDTI5
-MTEwMzA5MjIzOFowFjEUMBIGA1UEAxMLaWRwLmFjby5uZXQwggEiMA0GCSqGSIb3
-DQEBAQUAA4IBDwAwggEKAoIBAQDtABRog8uPB0h8aNilZFdYFII8iLgBkDQoAXH1
-AIMLVP8dDaK6dRnwyBfrq4dfEH/BqQxxpmASXK1s6O1YbZcx5X9M48yzzpdKFkGU
-3SIdu4lLNYtR1nfePX0120NTBk9tzCR0R9mmV6YMajFQ8YQkyDzwboTTyILx1E70
-RsFIvmx59QDtdPjP8fi2X5ZsRb1kOFDKeJlI15/SQkWAJGBIjtb7Dhs5K6jlp2lh
-T3R5G+faRrC761qR0ddcmh6qkq6fBGRRydxn85N5L6XkoxfD2evTSEkTB2sKn8UG
-cDNupxjPSD6PIPQhDuQlDyg6sFcMj1N6/PvH6FDhca/WZ72hAgMBAAGjXTBbMDoG
-A1UdEQQzMDGCC2lkcC5hY28ubmV0hiJodHRwczovL2lkcC5hY28ubmV0L2lkcC9z
-aGliYm9sZXRoMB0GA1UdDgQWBBStGKLf2/BAuxR9PAnCFKg1lXw+azANBgkqhkiG
-9w0BAQUFAAOCAQEAcYbfERAghPNJSFLnx4SYwmh19ln2j67IdFaEzGnZ10oNtMF5
-MXbJXqLN/JCEj7QLjRQ7PkhCpIUnKJ14ELCt/7ChnxfUHqwiYDyB3Vtm+FIlaNnJ
-Bhet+AJpiVyb6xce6tLQnQ/UwNmPozPjOwEbuKhz5dO1uftI38FT4hBYzsdo76Hm
-rS4WKwBzWV43OcNVhv2sgDbsxGIi5CGnQm6POICQhXAgvG2BGH+77jwM0PVFNP1b
-CQX+4Ig0MV2Y4WCgu3y2IxpSjGtnHxRxLMyNFblaP0MTo8BROcC74n0jKvnSVXyj
-nWGBQ+FiDBdPEO2Ny3SNjJ3B67hbmXBJSEJw9g==
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.aco.net:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.aco.net:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.aco.net/idp/profile/SAML2/Redirect/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.aco.net/idp/profile/SAML2/POST/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.aco.net:8443/idp/profile/SAML2/SOAP/SLO"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.aco.net/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.aco.net/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.aco.net/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.aco.net/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.aco.net/idp/profile/SAML2/SOAP/ECP"/>
-  </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">aco.net</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDGDCCAgCgAwIBAgIVAOmKQ6SgpmK/8vtQmiMBkQ1+yZ1XMA0GCSqGSIb3DQEB
-BQUAMBYxFDASBgNVBAMTC2lkcC5hY28ubmV0MB4XDTA5MTEwMzA5MjIzOFoXDTI5
-MTEwMzA5MjIzOFowFjEUMBIGA1UEAxMLaWRwLmFjby5uZXQwggEiMA0GCSqGSIb3
-DQEBAQUAA4IBDwAwggEKAoIBAQDtABRog8uPB0h8aNilZFdYFII8iLgBkDQoAXH1
-AIMLVP8dDaK6dRnwyBfrq4dfEH/BqQxxpmASXK1s6O1YbZcx5X9M48yzzpdKFkGU
-3SIdu4lLNYtR1nfePX0120NTBk9tzCR0R9mmV6YMajFQ8YQkyDzwboTTyILx1E70
-RsFIvmx59QDtdPjP8fi2X5ZsRb1kOFDKeJlI15/SQkWAJGBIjtb7Dhs5K6jlp2lh
-T3R5G+faRrC761qR0ddcmh6qkq6fBGRRydxn85N5L6XkoxfD2evTSEkTB2sKn8UG
-cDNupxjPSD6PIPQhDuQlDyg6sFcMj1N6/PvH6FDhca/WZ72hAgMBAAGjXTBbMDoG
-A1UdEQQzMDGCC2lkcC5hY28ubmV0hiJodHRwczovL2lkcC5hY28ubmV0L2lkcC9z
-aGliYm9sZXRoMB0GA1UdDgQWBBStGKLf2/BAuxR9PAnCFKg1lXw+azANBgkqhkiG
-9w0BAQUFAAOCAQEAcYbfERAghPNJSFLnx4SYwmh19ln2j67IdFaEzGnZ10oNtMF5
-MXbJXqLN/JCEj7QLjRQ7PkhCpIUnKJ14ELCt/7ChnxfUHqwiYDyB3Vtm+FIlaNnJ
-Bhet+AJpiVyb6xce6tLQnQ/UwNmPozPjOwEbuKhz5dO1uftI38FT4hBYzsdo76Hm
-rS4WKwBzWV43OcNVhv2sgDbsxGIi5CGnQm6POICQhXAgvG2BGH+77jwM0PVFNP1b
-CQX+4Ig0MV2Y4WCgu3y2IxpSjGtnHxRxLMyNFblaP0MTo8BROcC74n0jKvnSVXyj
-nWGBQ+FiDBdPEO2Ny3SNjJ3B67hbmXBJSEJw9g==
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.aco.net:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.aco.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="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="administrative">
-    <md:GivenName>ACOnet</md:GivenName>
-    <md:SurName>Admin</md:SurName>
-    <md:EmailAddress>mailto:admin@aco.net</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>eduID.at</md:GivenName>
-    <md:SurName>Federation Operator</md:SurName>
-    <md:EmailAddress>mailto:eduid@aco.net</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.admin.grnet.gr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.admin.grnet.gr-idp-shibboleth.xml
deleted file mode 100644
index 8d1cafa3..00000000
--- a/swamid-interfederations-2.0/idp.admin.grnet.gr-idp-shibboleth.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.admin.grnet.gr/idp/shibboleth">
-  <Extensions xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi">
-    <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 xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">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:Logo height="54" width="125">https://idp.admin.grnet.gr/static/mdui_grnet_logo_125x54.png</mdui:Logo>
-        <mdui:Logo height="64" width="65">https://idp.admin.grnet.gr/static/mdui_grnet_logo_65x64.png</mdui:Logo>
-      </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:GeolocationHint>geo:37.98709500,23.765772</mdui:GeolocationHint>
-      </mdui:DiscoHints>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-                            MIIDKDCCAhCgAwIBAgIJAJzvjilzprtbMA0GCSqGSIb3DQEBBQUAMB0xGzAZBgNV
-                            BAMTEmlkcC5hZG1pbi5ncm5ldC5ncjAeFw0xNDA0MDgxNjUyNDhaFw0xOTA0MDcx
-                            NjUyNDhaMB0xGzAZBgNVBAMTEmlkcC5hZG1pbi5ncm5ldC5ncjCCASIwDQYJKoZI
-                            hvcNAQEBBQADggEPADCCAQoCggEBAOzRbV+pz5RuGqwAOzI4jUXUSQXHFy6IYlLr
-                            VjisR2+7ZI24GybJAstcpmmNCtFQsM1CKte1x7TFHZFfDWCVv4IVGqtx9lLw+Jhg
-                            VjV8DzX0EYVIKyJimKWwIEn2BuEKWAcTUMdGehiYVeI4sxS+FgbiJxcWiMgq4bB5
-                            QV4gBoglEbI/S1vfoBBOEdKoEUamM+MAWCR83E2+JrhMXL+BrK+ojunyq/qyoL21
-                            GLTKL8jHTUgYMidSOx0oeMzTly8LzTONRDSs6ABxgQODU+b7qgjIqoCwY/kA1mUk
-                            ziqX/eQkxhK/ycf3HMrUVSwHLyOl5SMfpKWPcPuryTTTuFczmBsCAwEAAaNrMGkw
-                            SAYDVR0RBEEwP4ISaWRwLmFkbWluLmdybmV0LmdyhilodHRwczovL2lkcC5hZG1p
-                            bi5ncm5ldC5nci9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUb4DIDVDxNLIg4MDr
-                            gAyL+erDTzkwDQYJKoZIhvcNAQEFBQADggEBAED8EAttcxvYdQGcE8UpuDYyMqZ1
-                            gH0fSBbs61hh/bv4NjT/2ycWik/xtdiQj5foFcDNRBDD0Z09NteURUqqwaMXZrFX
-                            0YVUlIIZ6Pi7bTFRD4Rv+uX3edLVOZekPL9H28Rkk1ndCHsFLm2cQYd9Rd+DxjS4
-                            KRtNmyH8BYTzE8YKdX173kc2gdYKTAPNpt2Vj1+ctB9OgFybzIoEKwVtGA4upU5Z
-                            9vSsXQxRZQaYacBoPMBhUgU0dY+d7cA1pAwVsMbeXqPigEnmpMHapquvrzfO/a/m
-                            WuVAvsoC7QBvZa5PSfIqJ5NAA5IfvScAfYCKRZ0xEQudPJZ0SjEo44ZsMWo=
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.admin.grnet.gr:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.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>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</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="false">grnet-hq.admin.grnet.gr</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-                            MIIDKDCCAhCgAwIBAgIJAJzvjilzprtbMA0GCSqGSIb3DQEBBQUAMB0xGzAZBgNV
-                            BAMTEmlkcC5hZG1pbi5ncm5ldC5ncjAeFw0xNDA0MDgxNjUyNDhaFw0xOTA0MDcx
-                            NjUyNDhaMB0xGzAZBgNVBAMTEmlkcC5hZG1pbi5ncm5ldC5ncjCCASIwDQYJKoZI
-                            hvcNAQEBBQADggEPADCCAQoCggEBAOzRbV+pz5RuGqwAOzI4jUXUSQXHFy6IYlLr
-                            VjisR2+7ZI24GybJAstcpmmNCtFQsM1CKte1x7TFHZFfDWCVv4IVGqtx9lLw+Jhg
-                            VjV8DzX0EYVIKyJimKWwIEn2BuEKWAcTUMdGehiYVeI4sxS+FgbiJxcWiMgq4bB5
-                            QV4gBoglEbI/S1vfoBBOEdKoEUamM+MAWCR83E2+JrhMXL+BrK+ojunyq/qyoL21
-                            GLTKL8jHTUgYMidSOx0oeMzTly8LzTONRDSs6ABxgQODU+b7qgjIqoCwY/kA1mUk
-                            ziqX/eQkxhK/ycf3HMrUVSwHLyOl5SMfpKWPcPuryTTTuFczmBsCAwEAAaNrMGkw
-                            SAYDVR0RBEEwP4ISaWRwLmFkbWluLmdybmV0LmdyhilodHRwczovL2lkcC5hZG1p
-                            bi5ncm5ldC5nci9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUb4DIDVDxNLIg4MDr
-                            gAyL+erDTzkwDQYJKoZIhvcNAQEFBQADggEBAED8EAttcxvYdQGcE8UpuDYyMqZ1
-                            gH0fSBbs61hh/bv4NjT/2ycWik/xtdiQj5foFcDNRBDD0Z09NteURUqqwaMXZrFX
-                            0YVUlIIZ6Pi7bTFRD4Rv+uX3edLVOZekPL9H28Rkk1ndCHsFLm2cQYd9Rd+DxjS4
-                            KRtNmyH8BYTzE8YKdX173kc2gdYKTAPNpt2Vj1+ctB9OgFybzIoEKwVtGA4upU5Z
-                            9vSsXQxRZQaYacBoPMBhUgU0dY+d7cA1pAwVsMbeXqPigEnmpMHapquvrzfO/a/m
-                            WuVAvsoC7QBvZa5PSfIqJ5NAA5IfvScAfYCKRZ0xEQudPJZ0SjEo44ZsMWo=
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.admin.grnet.gr:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.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>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</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>
-    <TelephoneNumber>+30-2109569181</TelephoneNumber>
-  </ContactPerson>
-  <ContactPerson contactType="support">
-    <Company>GRNET headquarters</Company>
-    <EmailAddress>support@admin.grnet.gr</EmailAddress>
-    <TelephoneNumber>+30-2107474275</TelephoneNumber>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.admin.grnet.gr.xml b/swamid-interfederations-2.0/idp.admin.grnet.gr.xml
deleted file mode 100644
index 8d1cafa3..00000000
--- a/swamid-interfederations-2.0/idp.admin.grnet.gr.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.admin.grnet.gr/idp/shibboleth">
-  <Extensions xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi">
-    <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 xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">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:Logo height="54" width="125">https://idp.admin.grnet.gr/static/mdui_grnet_logo_125x54.png</mdui:Logo>
-        <mdui:Logo height="64" width="65">https://idp.admin.grnet.gr/static/mdui_grnet_logo_65x64.png</mdui:Logo>
-      </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:GeolocationHint>geo:37.98709500,23.765772</mdui:GeolocationHint>
-      </mdui:DiscoHints>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-                            MIIDKDCCAhCgAwIBAgIJAJzvjilzprtbMA0GCSqGSIb3DQEBBQUAMB0xGzAZBgNV
-                            BAMTEmlkcC5hZG1pbi5ncm5ldC5ncjAeFw0xNDA0MDgxNjUyNDhaFw0xOTA0MDcx
-                            NjUyNDhaMB0xGzAZBgNVBAMTEmlkcC5hZG1pbi5ncm5ldC5ncjCCASIwDQYJKoZI
-                            hvcNAQEBBQADggEPADCCAQoCggEBAOzRbV+pz5RuGqwAOzI4jUXUSQXHFy6IYlLr
-                            VjisR2+7ZI24GybJAstcpmmNCtFQsM1CKte1x7TFHZFfDWCVv4IVGqtx9lLw+Jhg
-                            VjV8DzX0EYVIKyJimKWwIEn2BuEKWAcTUMdGehiYVeI4sxS+FgbiJxcWiMgq4bB5
-                            QV4gBoglEbI/S1vfoBBOEdKoEUamM+MAWCR83E2+JrhMXL+BrK+ojunyq/qyoL21
-                            GLTKL8jHTUgYMidSOx0oeMzTly8LzTONRDSs6ABxgQODU+b7qgjIqoCwY/kA1mUk
-                            ziqX/eQkxhK/ycf3HMrUVSwHLyOl5SMfpKWPcPuryTTTuFczmBsCAwEAAaNrMGkw
-                            SAYDVR0RBEEwP4ISaWRwLmFkbWluLmdybmV0LmdyhilodHRwczovL2lkcC5hZG1p
-                            bi5ncm5ldC5nci9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUb4DIDVDxNLIg4MDr
-                            gAyL+erDTzkwDQYJKoZIhvcNAQEFBQADggEBAED8EAttcxvYdQGcE8UpuDYyMqZ1
-                            gH0fSBbs61hh/bv4NjT/2ycWik/xtdiQj5foFcDNRBDD0Z09NteURUqqwaMXZrFX
-                            0YVUlIIZ6Pi7bTFRD4Rv+uX3edLVOZekPL9H28Rkk1ndCHsFLm2cQYd9Rd+DxjS4
-                            KRtNmyH8BYTzE8YKdX173kc2gdYKTAPNpt2Vj1+ctB9OgFybzIoEKwVtGA4upU5Z
-                            9vSsXQxRZQaYacBoPMBhUgU0dY+d7cA1pAwVsMbeXqPigEnmpMHapquvrzfO/a/m
-                            WuVAvsoC7QBvZa5PSfIqJ5NAA5IfvScAfYCKRZ0xEQudPJZ0SjEo44ZsMWo=
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.admin.grnet.gr:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.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>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</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="false">grnet-hq.admin.grnet.gr</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-                            MIIDKDCCAhCgAwIBAgIJAJzvjilzprtbMA0GCSqGSIb3DQEBBQUAMB0xGzAZBgNV
-                            BAMTEmlkcC5hZG1pbi5ncm5ldC5ncjAeFw0xNDA0MDgxNjUyNDhaFw0xOTA0MDcx
-                            NjUyNDhaMB0xGzAZBgNVBAMTEmlkcC5hZG1pbi5ncm5ldC5ncjCCASIwDQYJKoZI
-                            hvcNAQEBBQADggEPADCCAQoCggEBAOzRbV+pz5RuGqwAOzI4jUXUSQXHFy6IYlLr
-                            VjisR2+7ZI24GybJAstcpmmNCtFQsM1CKte1x7TFHZFfDWCVv4IVGqtx9lLw+Jhg
-                            VjV8DzX0EYVIKyJimKWwIEn2BuEKWAcTUMdGehiYVeI4sxS+FgbiJxcWiMgq4bB5
-                            QV4gBoglEbI/S1vfoBBOEdKoEUamM+MAWCR83E2+JrhMXL+BrK+ojunyq/qyoL21
-                            GLTKL8jHTUgYMidSOx0oeMzTly8LzTONRDSs6ABxgQODU+b7qgjIqoCwY/kA1mUk
-                            ziqX/eQkxhK/ycf3HMrUVSwHLyOl5SMfpKWPcPuryTTTuFczmBsCAwEAAaNrMGkw
-                            SAYDVR0RBEEwP4ISaWRwLmFkbWluLmdybmV0LmdyhilodHRwczovL2lkcC5hZG1p
-                            bi5ncm5ldC5nci9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUb4DIDVDxNLIg4MDr
-                            gAyL+erDTzkwDQYJKoZIhvcNAQEFBQADggEBAED8EAttcxvYdQGcE8UpuDYyMqZ1
-                            gH0fSBbs61hh/bv4NjT/2ycWik/xtdiQj5foFcDNRBDD0Z09NteURUqqwaMXZrFX
-                            0YVUlIIZ6Pi7bTFRD4Rv+uX3edLVOZekPL9H28Rkk1ndCHsFLm2cQYd9Rd+DxjS4
-                            KRtNmyH8BYTzE8YKdX173kc2gdYKTAPNpt2Vj1+ctB9OgFybzIoEKwVtGA4upU5Z
-                            9vSsXQxRZQaYacBoPMBhUgU0dY+d7cA1pAwVsMbeXqPigEnmpMHapquvrzfO/a/m
-                            WuVAvsoC7QBvZa5PSfIqJ5NAA5IfvScAfYCKRZ0xEQudPJZ0SjEo44ZsMWo=
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.admin.grnet.gr:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.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>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</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>
-    <TelephoneNumber>+30-2109569181</TelephoneNumber>
-  </ContactPerson>
-  <ContactPerson contactType="support">
-    <Company>GRNET headquarters</Company>
-    <EmailAddress>support@admin.grnet.gr</EmailAddress>
-    <TelephoneNumber>+30-2107474275</TelephoneNumber>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.amue.fr-idp-saml2-metadata.xml b/swamid-interfederations-2.0/idp.amue.fr-idp-saml2-metadata.xml
deleted file mode 100644
index 72220bcb..00000000
--- a/swamid-interfederations-2.0/idp.amue.fr-idp-saml2-metadata.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://idp.amue.fr/idp/saml2/metadata">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2013-11-26T11:26:33Z">
-      <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:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">amue.fr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cpu.fr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">iuf.cpu.fr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">espe.amue.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">AMUE - Agence de Mutualisation des Universités et Etablissements</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDgTCCAmmgAwIBAgIJAJz0e9ITZF9gMA0GCSqGSIb3DQEBBQUAMFcxCzAJBgNV
-BAYTAkZSMRMwEQYDVQQIDApTb21lLVN0YXRlMQ4wDAYDVQQHDAVQYXJpczENMAsG
-A1UECgwEQU1VRTEUMBIGA1UEAwwLaWRwLmFtdWUuZnIwHhcNMTQxMDE1MTQyMjUz
-WhcNMjQxMDE2MTQyMjUzWjBXMQswCQYDVQQGEwJGUjETMBEGA1UECAwKU29tZS1T
-dGF0ZTEOMAwGA1UEBwwFUGFyaXMxDTALBgNVBAoMBEFNVUUxFDASBgNVBAMMC2lk
-cC5hbXVlLmZyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA241uUmwE
-4O95iIpPgHVBmvQsXgqUx6Jz1tKGQn4T2TQntn//Y2P8qRykhQ2YV+qLbJNrYWC9
-UYMlE+/aP4muMF4ChLV7ij3c6gCkxCAigOoHiQZFwLNPDzjiNs/eAxE/RDB9BUcf
-HL+953Q3lL/EEsWkTggPxaqWatyXbtPRaGl4WypVsztziF9D/Kdo5VVP9dElasBO
-aBXRy5HZLVHmGpCaaiOydcMyLf2CO0hA6pxDl3aYvyh1BLF5vcbMTg4tpu7Ks33c
-0H8Gdv8i8FYXZzHrHTghsfHp42obl0f7E7hUuHxRdwOgq7szbMeXIh5HPWm1Yz2S
-XPBwe5LjhuZw3wIDAQABo1AwTjAdBgNVHQ4EFgQUtFPL4vJjppV2NlZrKkczRW4j
-1l8wHwYDVR0jBBgwFoAUtFPL4vJjppV2NlZrKkczRW4j1l8wDAYDVR0TBAUwAwEB
-/zANBgkqhkiG9w0BAQUFAAOCAQEAe3jRuNrsDnBpwD2x6Yep61EPOXTjix12k2iy
-U6x6ggpL3hBjfJuEzMViHB/x2tVc/KaM2QiqRqiIsK73Woa1G00IS7AZvzFm1uyo
-I+tTmgFAcNORr5ucYnCdj3BzirEwLhGbczidsBquyvKL4VzT0oMlVND4jD5DFSlG
-/UFZ57goJxGSNK7pG4RsTi+Eha6CQgm7rNeHMr4lnBLjIOMft37/vkSo1Wx2vXTA
-Y6g6XMXwo2b6mIgK0y4447ZzOokArx1Jy7yvg7LDXTwUVVevrIy2Gb+sQlpGeKmr
-lO2z79XxgAmGiMTqrh2EIm+X9F53PSRqNjOExud+Ge1XjSYNVg==
-					    </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>
-					      MIIDgTCCAmmgAwIBAgIJANYhmQZ/PLaYMA0GCSqGSIb3DQEBBQUAMFcxCzAJBgNV
-BAYTAkZSMRMwEQYDVQQIDApTb21lLVN0YXRlMQ4wDAYDVQQHDAVQYXJpczENMAsG
-A1UECgwEQU1VRTEUMBIGA1UEAwwLaWRwLmFtdWUuZnIwHhcNMTMxMTI1MDk0NzM3
-WhcNMTMxMjI1MDk0NzM3WjBXMQswCQYDVQQGEwJGUjETMBEGA1UECAwKU29tZS1T
-dGF0ZTEOMAwGA1UEBwwFUGFyaXMxDTALBgNVBAoMBEFNVUUxFDASBgNVBAMMC2lk
-cC5hbXVlLmZyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA241uUmwE
-4O95iIpPgHVBmvQsXgqUx6Jz1tKGQn4T2TQntn//Y2P8qRykhQ2YV+qLbJNrYWC9
-UYMlE+/aP4muMF4ChLV7ij3c6gCkxCAigOoHiQZFwLNPDzjiNs/eAxE/RDB9BUcf
-HL+953Q3lL/EEsWkTggPxaqWatyXbtPRaGl4WypVsztziF9D/Kdo5VVP9dElasBO
-aBXRy5HZLVHmGpCaaiOydcMyLf2CO0hA6pxDl3aYvyh1BLF5vcbMTg4tpu7Ks33c
-0H8Gdv8i8FYXZzHrHTghsfHp42obl0f7E7hUuHxRdwOgq7szbMeXIh5HPWm1Yz2S
-XPBwe5LjhuZw3wIDAQABo1AwTjAdBgNVHQ4EFgQUtFPL4vJjppV2NlZrKkczRW4j
-1l8wHwYDVR0jBBgwFoAUtFPL4vJjppV2NlZrKkczRW4j1l8wDAYDVR0TBAUwAwEB
-/zANBgkqhkiG9w0BAQUFAAOCAQEAtHnVQXFET0Lq3wjCqbbJFe7wMf2L2y+R2soV
-hFmVuJPW6e2We5MFw3uzw0LWgjFX4+cddimjw1tTDbQO1GRWV1XQiSUpd4iFcqSL
-UncJxo6pOMwQMU/pptjSEKvzGMfkCuPbs8P7KA3KveDJj7r0h/SAJL3Lq42u1dWE
-HReuVPebHm8bm731uo491q1LdjCfUAaz14UMGYJL2UfigFa0fp3ONfkoZR2aob1w
-zYcZ/I9oT7x7mBJe4Fb1lUMrI9+0A4XBORW0i374j1hzvMprE3UW777QDK+TorKh
-JwghMs3y4HmiEKEylVhTWipavdzRw41b9jbFKmgB7MqdBiCfhQ==
-					    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <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.amue.fr/idp/saml2/sso"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.amue.fr/idp/saml2/sso"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">AMUE - Agence de Mutualisation des Universités et Etablissements</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">AMUE - Agence de Mutualisation des Universités et Etablissements</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Philippe Bader</SurName>
-    <EmailAddress>philippe.bader@amue.fr</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <SurName>Didier Denjean</SurName>
-    <EmailAddress>Didier.denjean@amue.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.amue.fr.xml b/swamid-interfederations-2.0/idp.amue.fr.xml
deleted file mode 100644
index 72220bcb..00000000
--- a/swamid-interfederations-2.0/idp.amue.fr.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://idp.amue.fr/idp/saml2/metadata">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2013-11-26T11:26:33Z">
-      <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:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">amue.fr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cpu.fr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">iuf.cpu.fr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">espe.amue.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">AMUE - Agence de Mutualisation des Universités et Etablissements</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDgTCCAmmgAwIBAgIJAJz0e9ITZF9gMA0GCSqGSIb3DQEBBQUAMFcxCzAJBgNV
-BAYTAkZSMRMwEQYDVQQIDApTb21lLVN0YXRlMQ4wDAYDVQQHDAVQYXJpczENMAsG
-A1UECgwEQU1VRTEUMBIGA1UEAwwLaWRwLmFtdWUuZnIwHhcNMTQxMDE1MTQyMjUz
-WhcNMjQxMDE2MTQyMjUzWjBXMQswCQYDVQQGEwJGUjETMBEGA1UECAwKU29tZS1T
-dGF0ZTEOMAwGA1UEBwwFUGFyaXMxDTALBgNVBAoMBEFNVUUxFDASBgNVBAMMC2lk
-cC5hbXVlLmZyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA241uUmwE
-4O95iIpPgHVBmvQsXgqUx6Jz1tKGQn4T2TQntn//Y2P8qRykhQ2YV+qLbJNrYWC9
-UYMlE+/aP4muMF4ChLV7ij3c6gCkxCAigOoHiQZFwLNPDzjiNs/eAxE/RDB9BUcf
-HL+953Q3lL/EEsWkTggPxaqWatyXbtPRaGl4WypVsztziF9D/Kdo5VVP9dElasBO
-aBXRy5HZLVHmGpCaaiOydcMyLf2CO0hA6pxDl3aYvyh1BLF5vcbMTg4tpu7Ks33c
-0H8Gdv8i8FYXZzHrHTghsfHp42obl0f7E7hUuHxRdwOgq7szbMeXIh5HPWm1Yz2S
-XPBwe5LjhuZw3wIDAQABo1AwTjAdBgNVHQ4EFgQUtFPL4vJjppV2NlZrKkczRW4j
-1l8wHwYDVR0jBBgwFoAUtFPL4vJjppV2NlZrKkczRW4j1l8wDAYDVR0TBAUwAwEB
-/zANBgkqhkiG9w0BAQUFAAOCAQEAe3jRuNrsDnBpwD2x6Yep61EPOXTjix12k2iy
-U6x6ggpL3hBjfJuEzMViHB/x2tVc/KaM2QiqRqiIsK73Woa1G00IS7AZvzFm1uyo
-I+tTmgFAcNORr5ucYnCdj3BzirEwLhGbczidsBquyvKL4VzT0oMlVND4jD5DFSlG
-/UFZ57goJxGSNK7pG4RsTi+Eha6CQgm7rNeHMr4lnBLjIOMft37/vkSo1Wx2vXTA
-Y6g6XMXwo2b6mIgK0y4447ZzOokArx1Jy7yvg7LDXTwUVVevrIy2Gb+sQlpGeKmr
-lO2z79XxgAmGiMTqrh2EIm+X9F53PSRqNjOExud+Ge1XjSYNVg==
-					    </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>
-					      MIIDgTCCAmmgAwIBAgIJANYhmQZ/PLaYMA0GCSqGSIb3DQEBBQUAMFcxCzAJBgNV
-BAYTAkZSMRMwEQYDVQQIDApTb21lLVN0YXRlMQ4wDAYDVQQHDAVQYXJpczENMAsG
-A1UECgwEQU1VRTEUMBIGA1UEAwwLaWRwLmFtdWUuZnIwHhcNMTMxMTI1MDk0NzM3
-WhcNMTMxMjI1MDk0NzM3WjBXMQswCQYDVQQGEwJGUjETMBEGA1UECAwKU29tZS1T
-dGF0ZTEOMAwGA1UEBwwFUGFyaXMxDTALBgNVBAoMBEFNVUUxFDASBgNVBAMMC2lk
-cC5hbXVlLmZyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA241uUmwE
-4O95iIpPgHVBmvQsXgqUx6Jz1tKGQn4T2TQntn//Y2P8qRykhQ2YV+qLbJNrYWC9
-UYMlE+/aP4muMF4ChLV7ij3c6gCkxCAigOoHiQZFwLNPDzjiNs/eAxE/RDB9BUcf
-HL+953Q3lL/EEsWkTggPxaqWatyXbtPRaGl4WypVsztziF9D/Kdo5VVP9dElasBO
-aBXRy5HZLVHmGpCaaiOydcMyLf2CO0hA6pxDl3aYvyh1BLF5vcbMTg4tpu7Ks33c
-0H8Gdv8i8FYXZzHrHTghsfHp42obl0f7E7hUuHxRdwOgq7szbMeXIh5HPWm1Yz2S
-XPBwe5LjhuZw3wIDAQABo1AwTjAdBgNVHQ4EFgQUtFPL4vJjppV2NlZrKkczRW4j
-1l8wHwYDVR0jBBgwFoAUtFPL4vJjppV2NlZrKkczRW4j1l8wDAYDVR0TBAUwAwEB
-/zANBgkqhkiG9w0BAQUFAAOCAQEAtHnVQXFET0Lq3wjCqbbJFe7wMf2L2y+R2soV
-hFmVuJPW6e2We5MFw3uzw0LWgjFX4+cddimjw1tTDbQO1GRWV1XQiSUpd4iFcqSL
-UncJxo6pOMwQMU/pptjSEKvzGMfkCuPbs8P7KA3KveDJj7r0h/SAJL3Lq42u1dWE
-HReuVPebHm8bm731uo491q1LdjCfUAaz14UMGYJL2UfigFa0fp3ONfkoZR2aob1w
-zYcZ/I9oT7x7mBJe4Fb1lUMrI9+0A4XBORW0i374j1hzvMprE3UW777QDK+TorKh
-JwghMs3y4HmiEKEylVhTWipavdzRw41b9jbFKmgB7MqdBiCfhQ==
-					    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <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.amue.fr/idp/saml2/sso"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.amue.fr/idp/saml2/sso"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">AMUE - Agence de Mutualisation des Universités et Etablissements</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">AMUE - Agence de Mutualisation des Universités et Etablissements</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Philippe Bader</SurName>
-    <EmailAddress>philippe.bader@amue.fr</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <SurName>Didier Denjean</SurName>
-    <EmailAddress>Didier.denjean@amue.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.bc.cas.cz-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.bc.cas.cz-idp-shibboleth.xml
deleted file mode 100644
index 2e413732..00000000
--- a/swamid-interfederations-2.0/idp.bc.cas.cz-idp-shibboleth.xml
+++ /dev/null
@@ -1,118 +0,0 @@
-<?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.bc.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/" registrationInstant="2014-05-02T15:40:40Z">
-      <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>
-    <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://eduid.cz/uri/idp-group/avcr</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>
-      <shibmd:Scope regexp="false">bc.cas.cz</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Biology Centre AS CR</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="cs">Biologické centrum AV ČR, AV ČR</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Identity Provider  BC AS CR employees.</mdui:Description>
-        <mdui:Description xml:lang="cs">Identity Provider pro zaměstnance BC AV ČR</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.bc.cas.cz/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="cs">http://www.bc.cas.cz/</mdui:InformationURL>
-        <mdui:Logo height="44" width="74">https://jiftach.cas.cz/loga/logo-bc-44.png</mdui:Logo>
-        <mdui:Logo height="411" width="960">https://jiftach.cas.cz/loga/logo-bc-255.png</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDIDCCAgigAwIBAgIVAPqdd5taKpjAToNxaMGZQFNCCsUiMA0GCSqGSIb3DQEB
-BQUAMBgxFjAUBgNVBAMTDWlkcC5iYy5jYXMuY3owHhcNMTQwNDAxMDk0NTU3WhcN
-MzQwNDAxMDk0NTU3WjAYMRYwFAYDVQQDEw1pZHAuYmMuY2FzLmN6MIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAg+Edl/InvpuZlyI4uXGWWh3byDeowddy
-kgO3jp88IR3C7zBnSD40HavmkPRbhBr85ZcUkOZCAyAWrYu6fseN9cRa+ILGQZtT
-vkgLGYHk8FM/Eo3U3FZn+SM/9i9Zow5u/BZJNO2PtX/GUqb1IC1lL+7l1aN5NZ6n
-nOERRJOhWLnckDCgGpu1lQFMUUb6LdHmZUvw7nV0qCQQL1KzDmAkX7Rowylycf1/
-975mMLKSDvHPeiOlORbYSZEaDKVbg+iV+L7ecZvNR1RxPy1E5JRr/dB+Pw6UjAXN
-O1azxIVdoCkumVjZM9LfIF+vPdaJcSkHoZJiu6T+GSQaS9jKtwjvNQIDAQABo2Ew
-XzA+BgNVHREENzA1gg1pZHAuYmMuY2FzLmN6hiRodHRwczovL2lkcC5iYy5jYXMu
-Y3ovaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFCHLsDXLe66ZYx4c1WiJSKuOD8YW
-MA0GCSqGSIb3DQEBBQUAA4IBAQBQKv6/5c6F4+LPXk6wd40PkPNMilJ2GZAiXhBt
-OIdP6L4sClDnsvs2mIIoOk7rvdt3fUILskSdd+sApjN8MemZXKxfsrXLIKnyrF1Z
-ieIGIzWbbteGotGaSPEadpHy9PKY/mfkNuEoIjfcjitqxMktTCsq40P+Z6EzExpL
-RUxZJa5mDx51/ENu7PSKaQsFNNfdmaLzjb4gtwtTQTnbw1sdSX5NwwMJNZsqt5J6
-6f0TcqgbfoS8WaaylyEOk/mIA5/f7GrLQnwSR3bVkmwsSrQQgIxx18LSLc05bNya
-Q+dMM6gJ5hG79Yj0n643KGUcqRHC2+WXmQadp5voCQC//M44
-
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.bc.cas.cz:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.bc.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.bc.cas.cz/idp/profile/SAML2/Redirect/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.bc.cas.cz/idp/profile/SAML2/POST/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.bc.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.bc.cas.cz/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.bc.cas.cz/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.bc.cas.cz/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.bc.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">bc.cas.cz</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDIDCCAgigAwIBAgIVAPqdd5taKpjAToNxaMGZQFNCCsUiMA0GCSqGSIb3DQEB
-BQUAMBgxFjAUBgNVBAMTDWlkcC5iYy5jYXMuY3owHhcNMTQwNDAxMDk0NTU3WhcN
-MzQwNDAxMDk0NTU3WjAYMRYwFAYDVQQDEw1pZHAuYmMuY2FzLmN6MIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAg+Edl/InvpuZlyI4uXGWWh3byDeowddy
-kgO3jp88IR3C7zBnSD40HavmkPRbhBr85ZcUkOZCAyAWrYu6fseN9cRa+ILGQZtT
-vkgLGYHk8FM/Eo3U3FZn+SM/9i9Zow5u/BZJNO2PtX/GUqb1IC1lL+7l1aN5NZ6n
-nOERRJOhWLnckDCgGpu1lQFMUUb6LdHmZUvw7nV0qCQQL1KzDmAkX7Rowylycf1/
-975mMLKSDvHPeiOlORbYSZEaDKVbg+iV+L7ecZvNR1RxPy1E5JRr/dB+Pw6UjAXN
-O1azxIVdoCkumVjZM9LfIF+vPdaJcSkHoZJiu6T+GSQaS9jKtwjvNQIDAQABo2Ew
-XzA+BgNVHREENzA1gg1pZHAuYmMuY2FzLmN6hiRodHRwczovL2lkcC5iYy5jYXMu
-Y3ovaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFCHLsDXLe66ZYx4c1WiJSKuOD8YW
-MA0GCSqGSIb3DQEBBQUAA4IBAQBQKv6/5c6F4+LPXk6wd40PkPNMilJ2GZAiXhBt
-OIdP6L4sClDnsvs2mIIoOk7rvdt3fUILskSdd+sApjN8MemZXKxfsrXLIKnyrF1Z
-ieIGIzWbbteGotGaSPEadpHy9PKY/mfkNuEoIjfcjitqxMktTCsq40P+Z6EzExpL
-RUxZJa5mDx51/ENu7PSKaQsFNNfdmaLzjb4gtwtTQTnbw1sdSX5NwwMJNZsqt5J6
-6f0TcqgbfoS8WaaylyEOk/mIA5/f7GrLQnwSR3bVkmwsSrQQgIxx18LSLc05bNya
-Q+dMM6gJ5hG79Yj0n643KGUcqRHC2+WXmQadp5voCQC//M44
-
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.bc.cas.cz:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.bc.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">Biology Centre AS CR</OrganizationName>
-    <OrganizationName xml:lang="cs">Biologické centrum AV ČR</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Biology Centre AS CR</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="cs">Biologické centrum AV ČR, v.v.i.</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.bc.cas.cz/</OrganizationURL>
-    <OrganizationURL xml:lang="cs">http://www.bc.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.bc.cas.cz.xml b/swamid-interfederations-2.0/idp.bc.cas.cz.xml
deleted file mode 100644
index 2e413732..00000000
--- a/swamid-interfederations-2.0/idp.bc.cas.cz.xml
+++ /dev/null
@@ -1,118 +0,0 @@
-<?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.bc.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/" registrationInstant="2014-05-02T15:40:40Z">
-      <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>
-    <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://eduid.cz/uri/idp-group/avcr</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>
-      <shibmd:Scope regexp="false">bc.cas.cz</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Biology Centre AS CR</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="cs">Biologické centrum AV ČR, AV ČR</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Identity Provider  BC AS CR employees.</mdui:Description>
-        <mdui:Description xml:lang="cs">Identity Provider pro zaměstnance BC AV ČR</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.bc.cas.cz/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="cs">http://www.bc.cas.cz/</mdui:InformationURL>
-        <mdui:Logo height="44" width="74">https://jiftach.cas.cz/loga/logo-bc-44.png</mdui:Logo>
-        <mdui:Logo height="411" width="960">https://jiftach.cas.cz/loga/logo-bc-255.png</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDIDCCAgigAwIBAgIVAPqdd5taKpjAToNxaMGZQFNCCsUiMA0GCSqGSIb3DQEB
-BQUAMBgxFjAUBgNVBAMTDWlkcC5iYy5jYXMuY3owHhcNMTQwNDAxMDk0NTU3WhcN
-MzQwNDAxMDk0NTU3WjAYMRYwFAYDVQQDEw1pZHAuYmMuY2FzLmN6MIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAg+Edl/InvpuZlyI4uXGWWh3byDeowddy
-kgO3jp88IR3C7zBnSD40HavmkPRbhBr85ZcUkOZCAyAWrYu6fseN9cRa+ILGQZtT
-vkgLGYHk8FM/Eo3U3FZn+SM/9i9Zow5u/BZJNO2PtX/GUqb1IC1lL+7l1aN5NZ6n
-nOERRJOhWLnckDCgGpu1lQFMUUb6LdHmZUvw7nV0qCQQL1KzDmAkX7Rowylycf1/
-975mMLKSDvHPeiOlORbYSZEaDKVbg+iV+L7ecZvNR1RxPy1E5JRr/dB+Pw6UjAXN
-O1azxIVdoCkumVjZM9LfIF+vPdaJcSkHoZJiu6T+GSQaS9jKtwjvNQIDAQABo2Ew
-XzA+BgNVHREENzA1gg1pZHAuYmMuY2FzLmN6hiRodHRwczovL2lkcC5iYy5jYXMu
-Y3ovaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFCHLsDXLe66ZYx4c1WiJSKuOD8YW
-MA0GCSqGSIb3DQEBBQUAA4IBAQBQKv6/5c6F4+LPXk6wd40PkPNMilJ2GZAiXhBt
-OIdP6L4sClDnsvs2mIIoOk7rvdt3fUILskSdd+sApjN8MemZXKxfsrXLIKnyrF1Z
-ieIGIzWbbteGotGaSPEadpHy9PKY/mfkNuEoIjfcjitqxMktTCsq40P+Z6EzExpL
-RUxZJa5mDx51/ENu7PSKaQsFNNfdmaLzjb4gtwtTQTnbw1sdSX5NwwMJNZsqt5J6
-6f0TcqgbfoS8WaaylyEOk/mIA5/f7GrLQnwSR3bVkmwsSrQQgIxx18LSLc05bNya
-Q+dMM6gJ5hG79Yj0n643KGUcqRHC2+WXmQadp5voCQC//M44
-
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.bc.cas.cz:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.bc.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.bc.cas.cz/idp/profile/SAML2/Redirect/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.bc.cas.cz/idp/profile/SAML2/POST/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.bc.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.bc.cas.cz/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.bc.cas.cz/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.bc.cas.cz/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.bc.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">bc.cas.cz</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDIDCCAgigAwIBAgIVAPqdd5taKpjAToNxaMGZQFNCCsUiMA0GCSqGSIb3DQEB
-BQUAMBgxFjAUBgNVBAMTDWlkcC5iYy5jYXMuY3owHhcNMTQwNDAxMDk0NTU3WhcN
-MzQwNDAxMDk0NTU3WjAYMRYwFAYDVQQDEw1pZHAuYmMuY2FzLmN6MIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAg+Edl/InvpuZlyI4uXGWWh3byDeowddy
-kgO3jp88IR3C7zBnSD40HavmkPRbhBr85ZcUkOZCAyAWrYu6fseN9cRa+ILGQZtT
-vkgLGYHk8FM/Eo3U3FZn+SM/9i9Zow5u/BZJNO2PtX/GUqb1IC1lL+7l1aN5NZ6n
-nOERRJOhWLnckDCgGpu1lQFMUUb6LdHmZUvw7nV0qCQQL1KzDmAkX7Rowylycf1/
-975mMLKSDvHPeiOlORbYSZEaDKVbg+iV+L7ecZvNR1RxPy1E5JRr/dB+Pw6UjAXN
-O1azxIVdoCkumVjZM9LfIF+vPdaJcSkHoZJiu6T+GSQaS9jKtwjvNQIDAQABo2Ew
-XzA+BgNVHREENzA1gg1pZHAuYmMuY2FzLmN6hiRodHRwczovL2lkcC5iYy5jYXMu
-Y3ovaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFCHLsDXLe66ZYx4c1WiJSKuOD8YW
-MA0GCSqGSIb3DQEBBQUAA4IBAQBQKv6/5c6F4+LPXk6wd40PkPNMilJ2GZAiXhBt
-OIdP6L4sClDnsvs2mIIoOk7rvdt3fUILskSdd+sApjN8MemZXKxfsrXLIKnyrF1Z
-ieIGIzWbbteGotGaSPEadpHy9PKY/mfkNuEoIjfcjitqxMktTCsq40P+Z6EzExpL
-RUxZJa5mDx51/ENu7PSKaQsFNNfdmaLzjb4gtwtTQTnbw1sdSX5NwwMJNZsqt5J6
-6f0TcqgbfoS8WaaylyEOk/mIA5/f7GrLQnwSR3bVkmwsSrQQgIxx18LSLc05bNya
-Q+dMM6gJ5hG79Yj0n643KGUcqRHC2+WXmQadp5voCQC//M44
-
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.bc.cas.cz:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.bc.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">Biology Centre AS CR</OrganizationName>
-    <OrganizationName xml:lang="cs">Biologické centrum AV ČR</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Biology Centre AS CR</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="cs">Biologické centrum AV ČR, v.v.i.</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.bc.cas.cz/</OrganizationURL>
-    <OrganizationURL xml:lang="cs">http://www.bc.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.bth.se-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.bth.se-idp-shibboleth.xml
deleted file mode 100644
index 9dd5228c..00000000
--- a/swamid-interfederations-2.0/idp.bth.se-idp-shibboleth.xml
+++ /dev/null
@@ -1,119 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.bth.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">bth.se</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="sv">Blekinge Tekniska Högskola - Personal</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Blekinge Institute of Technology - Personnel</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Identity Provider för Blekinge Tekniska Högskola för personal</mdui:Description>
-        <mdui:Description xml:lang="en">Identity Provider for Blekinge Institute of Technology for personnel</mdui:Description>
-        <mdui:InformationURL xml:lang="sv">http://www.bth.se</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">http://www.bth.se/eng</mdui:InformationURL>
-        <mdui:Keywords xml:lang="sv">BTH Blekinge+Tekniska+Högskola Blekinge+Institute+of+Technology </mdui:Keywords>
-        <mdui:Keywords xml:lang="en">BTH Blekinge+Tekniska+Högskola Blekinge+Institute+of+Technology </mdui:Keywords>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DomainHint>bth.se</mdui:DomainHint>
-      </mdui:DiscoHints>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDEzCCAfugAwIBAgIUQgDlaShYZmw+iODFd4PDl1a+3QEwDQYJKoZIhvcNAQEF
-BQAwFTETMBEGA1UEAxMKaWRwLmJ0aC5zZTAeFw0wOTExMDMxMDA0NTFaFw0yOTEx
-MDMxMDA0NTFaMBUxEzARBgNVBAMTCmlkcC5idGguc2UwggEiMA0GCSqGSIb3DQEB
-AQUAA4IBDwAwggEKAoIBAQCNOKwblSFiLSbItG/y118MRAXCguQJ4e7t+/e4bYhD
-fl9Qs5gTx3QJxXRgjISLrha44rc+awS6fr4In3N61ijS/X4Q0qrD5BszzCUw2Lni
-YITovYjH9wzZ3oOt5k67rtXoDL98B+Xqbh/M8lOXkcKba3Slsbz/QKg5Qf6ZCebc
-76rl3J3fM6ebYOyiCseCVTn+avpbqNKMi7sY6vfKDIo/zCkN3ZntH4ibGOi0j9z4
-5NlHLtWLShfwF/QLLKjd2alHTbyBjdDe22li9apxZB3LhZXFVGdYqBCJu0OBeFDP
-ZA4ZSWoxXMqxDbbJofMMbHysc7teqG3mJyDm/FL6hXH/AgMBAAGjWzBZMDgGA1Ud
-EQQxMC+CCmlkcC5idGguc2WGIWh0dHBzOi8vaWRwLmJ0aC5zZS9pZHAvc2hpYmJv
-bGV0aDAdBgNVHQ4EFgQUtNB3i29Xb36JeEa7RhFXM4OYTYYwDQYJKoZIhvcNAQEF
-BQADggEBAEGhHaZmmHhnfrsYc/trO15JWt5hU/UC9J7xhiF2iIk41ymeX+gvm6n5
-h2f4/xEgvmBwV6WM+BlQE+weK+nQNceV+aAO51xTM828O9SrmZ9ZPkw7+TxGiVdM
-SnxSTRcEWngxpJ+CGpgzy1SgV7WqO2NszSP+XRRJHjb0Aw39iKLP+yfvGdR71lu/
-2WPhhxaK7wun8loJJC2WI4ORwsh3mJoYZcVEIOXe/H2Kf+Hj1le8z9j1pxEG7ECY
-DyL5sSS/5Zez+fgoNphWb1E3fB/wSvJkxDe28qOsnvsHl5H6RkSFjPK5nAM5Qfp7
-n9Phr4P3FEL3YKQK+xQiKCJXUb5WgRI=
-
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.bth.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.bth.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://idp.bth.se/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.bth.se/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.bth.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.bth.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">bth.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDEzCCAfugAwIBAgIUQgDlaShYZmw+iODFd4PDl1a+3QEwDQYJKoZIhvcNAQEF
-BQAwFTETMBEGA1UEAxMKaWRwLmJ0aC5zZTAeFw0wOTExMDMxMDA0NTFaFw0yOTEx
-MDMxMDA0NTFaMBUxEzARBgNVBAMTCmlkcC5idGguc2UwggEiMA0GCSqGSIb3DQEB
-AQUAA4IBDwAwggEKAoIBAQCNOKwblSFiLSbItG/y118MRAXCguQJ4e7t+/e4bYhD
-fl9Qs5gTx3QJxXRgjISLrha44rc+awS6fr4In3N61ijS/X4Q0qrD5BszzCUw2Lni
-YITovYjH9wzZ3oOt5k67rtXoDL98B+Xqbh/M8lOXkcKba3Slsbz/QKg5Qf6ZCebc
-76rl3J3fM6ebYOyiCseCVTn+avpbqNKMi7sY6vfKDIo/zCkN3ZntH4ibGOi0j9z4
-5NlHLtWLShfwF/QLLKjd2alHTbyBjdDe22li9apxZB3LhZXFVGdYqBCJu0OBeFDP
-ZA4ZSWoxXMqxDbbJofMMbHysc7teqG3mJyDm/FL6hXH/AgMBAAGjWzBZMDgGA1Ud
-EQQxMC+CCmlkcC5idGguc2WGIWh0dHBzOi8vaWRwLmJ0aC5zZS9pZHAvc2hpYmJv
-bGV0aDAdBgNVHQ4EFgQUtNB3i29Xb36JeEa7RhFXM4OYTYYwDQYJKoZIhvcNAQEF
-BQADggEBAEGhHaZmmHhnfrsYc/trO15JWt5hU/UC9J7xhiF2iIk41ymeX+gvm6n5
-h2f4/xEgvmBwV6WM+BlQE+weK+nQNceV+aAO51xTM828O9SrmZ9ZPkw7+TxGiVdM
-SnxSTRcEWngxpJ+CGpgzy1SgV7WqO2NszSP+XRRJHjb0Aw39iKLP+yfvGdR71lu/
-2WPhhxaK7wun8loJJC2WI4ORwsh3mJoYZcVEIOXe/H2Kf+Hj1le8z9j1pxEG7ECY
-DyL5sSS/5Zez+fgoNphWb1E3fB/wSvJkxDe28qOsnvsHl5H6RkSFjPK5nAM5Qfp7
-n9Phr4P3FEL3YKQK+xQiKCJXUb5WgRI=
-
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.bth.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.bth.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">BTH</OrganizationName>
-    <OrganizationDisplayName xml:lang="sv">Blekinge Tekniska Högskola (Personal)</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">Blekinge Tekniska Högskola (Personal)</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.bth.se</OrganizationURL>
-  </Organization>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
-    <Company>Blekinge Institute of Technology- Personnel</Company>
-    <SurName>IT Helpdesk</SurName>
-    <EmailAddress>ithelpdesk@bth.se</EmailAddress>
-    <TelephoneNumber>+46 455 38 51 00</TelephoneNumber>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
-    <Company>Blekinge Institute of Technology- Personnel</Company>
-    <SurName>IT Helpdesk</SurName>
-    <EmailAddress>ithelpdesk@bth.se</EmailAddress>
-    <TelephoneNumber>+46 455 38 51 00</TelephoneNumber>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
-    <Company>Blekinge Institute of Technology- Personnel</Company>
-    <SurName>IT Helpdesk</SurName>
-    <EmailAddress>ithelpdesk@bth.se</EmailAddress>
-    <TelephoneNumber>+46 455 381500</TelephoneNumber>
-  </ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.bth.se.xml b/swamid-interfederations-2.0/idp.bth.se.xml
deleted file mode 100644
index 9dd5228c..00000000
--- a/swamid-interfederations-2.0/idp.bth.se.xml
+++ /dev/null
@@ -1,119 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.bth.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">bth.se</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="sv">Blekinge Tekniska Högskola - Personal</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Blekinge Institute of Technology - Personnel</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Identity Provider för Blekinge Tekniska Högskola för personal</mdui:Description>
-        <mdui:Description xml:lang="en">Identity Provider for Blekinge Institute of Technology for personnel</mdui:Description>
-        <mdui:InformationURL xml:lang="sv">http://www.bth.se</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">http://www.bth.se/eng</mdui:InformationURL>
-        <mdui:Keywords xml:lang="sv">BTH Blekinge+Tekniska+Högskola Blekinge+Institute+of+Technology </mdui:Keywords>
-        <mdui:Keywords xml:lang="en">BTH Blekinge+Tekniska+Högskola Blekinge+Institute+of+Technology </mdui:Keywords>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DomainHint>bth.se</mdui:DomainHint>
-      </mdui:DiscoHints>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDEzCCAfugAwIBAgIUQgDlaShYZmw+iODFd4PDl1a+3QEwDQYJKoZIhvcNAQEF
-BQAwFTETMBEGA1UEAxMKaWRwLmJ0aC5zZTAeFw0wOTExMDMxMDA0NTFaFw0yOTEx
-MDMxMDA0NTFaMBUxEzARBgNVBAMTCmlkcC5idGguc2UwggEiMA0GCSqGSIb3DQEB
-AQUAA4IBDwAwggEKAoIBAQCNOKwblSFiLSbItG/y118MRAXCguQJ4e7t+/e4bYhD
-fl9Qs5gTx3QJxXRgjISLrha44rc+awS6fr4In3N61ijS/X4Q0qrD5BszzCUw2Lni
-YITovYjH9wzZ3oOt5k67rtXoDL98B+Xqbh/M8lOXkcKba3Slsbz/QKg5Qf6ZCebc
-76rl3J3fM6ebYOyiCseCVTn+avpbqNKMi7sY6vfKDIo/zCkN3ZntH4ibGOi0j9z4
-5NlHLtWLShfwF/QLLKjd2alHTbyBjdDe22li9apxZB3LhZXFVGdYqBCJu0OBeFDP
-ZA4ZSWoxXMqxDbbJofMMbHysc7teqG3mJyDm/FL6hXH/AgMBAAGjWzBZMDgGA1Ud
-EQQxMC+CCmlkcC5idGguc2WGIWh0dHBzOi8vaWRwLmJ0aC5zZS9pZHAvc2hpYmJv
-bGV0aDAdBgNVHQ4EFgQUtNB3i29Xb36JeEa7RhFXM4OYTYYwDQYJKoZIhvcNAQEF
-BQADggEBAEGhHaZmmHhnfrsYc/trO15JWt5hU/UC9J7xhiF2iIk41ymeX+gvm6n5
-h2f4/xEgvmBwV6WM+BlQE+weK+nQNceV+aAO51xTM828O9SrmZ9ZPkw7+TxGiVdM
-SnxSTRcEWngxpJ+CGpgzy1SgV7WqO2NszSP+XRRJHjb0Aw39iKLP+yfvGdR71lu/
-2WPhhxaK7wun8loJJC2WI4ORwsh3mJoYZcVEIOXe/H2Kf+Hj1le8z9j1pxEG7ECY
-DyL5sSS/5Zez+fgoNphWb1E3fB/wSvJkxDe28qOsnvsHl5H6RkSFjPK5nAM5Qfp7
-n9Phr4P3FEL3YKQK+xQiKCJXUb5WgRI=
-
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.bth.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.bth.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://idp.bth.se/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.bth.se/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.bth.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.bth.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">bth.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDEzCCAfugAwIBAgIUQgDlaShYZmw+iODFd4PDl1a+3QEwDQYJKoZIhvcNAQEF
-BQAwFTETMBEGA1UEAxMKaWRwLmJ0aC5zZTAeFw0wOTExMDMxMDA0NTFaFw0yOTEx
-MDMxMDA0NTFaMBUxEzARBgNVBAMTCmlkcC5idGguc2UwggEiMA0GCSqGSIb3DQEB
-AQUAA4IBDwAwggEKAoIBAQCNOKwblSFiLSbItG/y118MRAXCguQJ4e7t+/e4bYhD
-fl9Qs5gTx3QJxXRgjISLrha44rc+awS6fr4In3N61ijS/X4Q0qrD5BszzCUw2Lni
-YITovYjH9wzZ3oOt5k67rtXoDL98B+Xqbh/M8lOXkcKba3Slsbz/QKg5Qf6ZCebc
-76rl3J3fM6ebYOyiCseCVTn+avpbqNKMi7sY6vfKDIo/zCkN3ZntH4ibGOi0j9z4
-5NlHLtWLShfwF/QLLKjd2alHTbyBjdDe22li9apxZB3LhZXFVGdYqBCJu0OBeFDP
-ZA4ZSWoxXMqxDbbJofMMbHysc7teqG3mJyDm/FL6hXH/AgMBAAGjWzBZMDgGA1Ud
-EQQxMC+CCmlkcC5idGguc2WGIWh0dHBzOi8vaWRwLmJ0aC5zZS9pZHAvc2hpYmJv
-bGV0aDAdBgNVHQ4EFgQUtNB3i29Xb36JeEa7RhFXM4OYTYYwDQYJKoZIhvcNAQEF
-BQADggEBAEGhHaZmmHhnfrsYc/trO15JWt5hU/UC9J7xhiF2iIk41ymeX+gvm6n5
-h2f4/xEgvmBwV6WM+BlQE+weK+nQNceV+aAO51xTM828O9SrmZ9ZPkw7+TxGiVdM
-SnxSTRcEWngxpJ+CGpgzy1SgV7WqO2NszSP+XRRJHjb0Aw39iKLP+yfvGdR71lu/
-2WPhhxaK7wun8loJJC2WI4ORwsh3mJoYZcVEIOXe/H2Kf+Hj1le8z9j1pxEG7ECY
-DyL5sSS/5Zez+fgoNphWb1E3fB/wSvJkxDe28qOsnvsHl5H6RkSFjPK5nAM5Qfp7
-n9Phr4P3FEL3YKQK+xQiKCJXUb5WgRI=
-
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.bth.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.bth.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">BTH</OrganizationName>
-    <OrganizationDisplayName xml:lang="sv">Blekinge Tekniska Högskola (Personal)</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">Blekinge Tekniska Högskola (Personal)</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.bth.se</OrganizationURL>
-  </Organization>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
-    <Company>Blekinge Institute of Technology- Personnel</Company>
-    <SurName>IT Helpdesk</SurName>
-    <EmailAddress>ithelpdesk@bth.se</EmailAddress>
-    <TelephoneNumber>+46 455 38 51 00</TelephoneNumber>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
-    <Company>Blekinge Institute of Technology- Personnel</Company>
-    <SurName>IT Helpdesk</SurName>
-    <EmailAddress>ithelpdesk@bth.se</EmailAddress>
-    <TelephoneNumber>+46 455 38 51 00</TelephoneNumber>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
-    <Company>Blekinge Institute of Technology- Personnel</Company>
-    <SurName>IT Helpdesk</SurName>
-    <EmailAddress>ithelpdesk@bth.se</EmailAddress>
-    <TelephoneNumber>+46 455 381500</TelephoneNumber>
-  </ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.canarie.ca-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.canarie.ca-idp-shibboleth.xml
deleted file mode 100644
index 9d3bb4f8..00000000
--- a/swamid-interfederations-2.0/idp.canarie.ca-idp-shibboleth.xml
+++ /dev/null
@@ -1,104 +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://idp.canarie.ca/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.canarie.ca" registrationInstant="2012-08-28T00:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">
-http://www.canarie.ca/templates/services/docs/CAF_join_en.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">canarie.ca</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">CANARIE </mdui:DisplayName>
-        <mdui:DisplayName xml:lang="fr">CANARIE</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Canadaâs Advanced Research and Innovation Network</mdui:Description>
-        <mdui:Description xml:lang="fr">Le réseau évolué de recherche et d'innovation du Canada</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.canarie.ca/en/about/aboutus</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="fr">http://www.canarie.ca/fr/a-propos/quinoussommes</mdui:InformationURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDJDCCAgygAwIBAgIVAJ3fH1HeYIxXxMXYbZ/Bx85j/JgKMA0GCSqGSIb3DQEB
-BQUAMBkxFzAVBgNVBAMTDmlkcC5jYW5hcmllLmNhMB4XDTExMDcwNjE0MzUxMloX
-DTMxMDcwNjE0MzUxMlowGTEXMBUGA1UEAxMOaWRwLmNhbmFyaWUuY2EwggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCcmyqTo01QVuqHI/ZXAdYP+iX6NjP2
-topfFsR4y8TVYFN4vMvb5ZSFWPPjJ8T3O2epI8Hy9q4FWyPn1Pa/CZoFi1EMhu7b
-QJpOmLzeX6FOvf1X/5De2JnWv7JWMpUMeVqupe2YeCtoaXfViHOB9pW0go2zr6R8
-ajvQKxNX46V/o1ND6YwnlKRNsh4hn46cPtl/DNeKYFz4Uj6OHBRSfMHTZCWVENJB
-ife66AS7X5hC6o7o2Sd5VHr0TgY+ZeKrl3/33war+RIGXr6cRW9iA9yEeW0Oi13Q
-3hkjPT7MNkvNJjWpERR7aBogQ3z5Id8Ygl+WASbyfoiXNCHPa3USAaynAgMBAAGj
-YzBhMEAGA1UdEQQ5MDeCDmlkcC5jYW5hcmllLmNhhiVodHRwczovL2lkcC5jYW5h
-cmllLmNhL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBRDEuTlL5Y/HfiEJ/wzCfCz
-otFdxjANBgkqhkiG9w0BAQUFAAOCAQEAD6WiCAdkGjA7Bza59pnn+/z5/Jhwn7Mf
-+WS0WAPz686nIxYjblMBjIVITedkAFvwnEBn0Rs+XNXrc90uRFCNFf4VfSP9NLEf
-7cTPNxHiGt6TqOju2Rg6OBmNwRqAtFNqKG7VeKgoiZ4FcRVU2AdQ8fYnxxtwO4xJ
-8Md//Yp0lGQzj2FpSU7dnbVRGWAEE3g1Ghjrwe9Aj6e6lunZNaIdTZ6Yvnsa5qly
-DngkPipfHlmi56QMo9Iqa3nEKaCv2ykKzTIIUdgDI/M8sHXgitp5tFrAK8f96iBu
-zwZrSXVMnjQppB7E2l48gea/BPyFP4FBlxeN8E6aIXH09uN+HbcohQ==
-
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.canarie.ca:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.canarie.ca: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.canarie.ca/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.canarie.ca/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.canarie.ca/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.canarie.ca/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">canarie.ca</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDJDCCAgygAwIBAgIVAJ3fH1HeYIxXxMXYbZ/Bx85j/JgKMA0GCSqGSIb3DQEB
-BQUAMBkxFzAVBgNVBAMTDmlkcC5jYW5hcmllLmNhMB4XDTExMDcwNjE0MzUxMloX
-DTMxMDcwNjE0MzUxMlowGTEXMBUGA1UEAxMOaWRwLmNhbmFyaWUuY2EwggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCcmyqTo01QVuqHI/ZXAdYP+iX6NjP2
-topfFsR4y8TVYFN4vMvb5ZSFWPPjJ8T3O2epI8Hy9q4FWyPn1Pa/CZoFi1EMhu7b
-QJpOmLzeX6FOvf1X/5De2JnWv7JWMpUMeVqupe2YeCtoaXfViHOB9pW0go2zr6R8
-ajvQKxNX46V/o1ND6YwnlKRNsh4hn46cPtl/DNeKYFz4Uj6OHBRSfMHTZCWVENJB
-ife66AS7X5hC6o7o2Sd5VHr0TgY+ZeKrl3/33war+RIGXr6cRW9iA9yEeW0Oi13Q
-3hkjPT7MNkvNJjWpERR7aBogQ3z5Id8Ygl+WASbyfoiXNCHPa3USAaynAgMBAAGj
-YzBhMEAGA1UdEQQ5MDeCDmlkcC5jYW5hcmllLmNhhiVodHRwczovL2lkcC5jYW5h
-cmllLmNhL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBRDEuTlL5Y/HfiEJ/wzCfCz
-otFdxjANBgkqhkiG9w0BAQUFAAOCAQEAD6WiCAdkGjA7Bza59pnn+/z5/Jhwn7Mf
-+WS0WAPz686nIxYjblMBjIVITedkAFvwnEBn0Rs+XNXrc90uRFCNFf4VfSP9NLEf
-7cTPNxHiGt6TqOju2Rg6OBmNwRqAtFNqKG7VeKgoiZ4FcRVU2AdQ8fYnxxtwO4xJ
-8Md//Yp0lGQzj2FpSU7dnbVRGWAEE3g1Ghjrwe9Aj6e6lunZNaIdTZ6Yvnsa5qly
-DngkPipfHlmi56QMo9Iqa3nEKaCv2ykKzTIIUdgDI/M8sHXgitp5tFrAK8f96iBu
-zwZrSXVMnjQppB7E2l48gea/BPyFP4FBlxeN8E6aIXH09uN+HbcohQ==
-
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.canarie.ca:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.canarie.ca: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">CANARIE</OrganizationName>
-    <OrganizationName xml:lang="fr">CANARIE </OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Canada's Advanced Research and Innovation Network</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="fr">Le réseau évolué de recherche et d'innovation du Canada</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.canarie.ca/en/about/aboutus</OrganizationURL>
-    <OrganizationURL xml:lang="fr">http://www.canarie.ca/fr/a-propos/quinoussommes</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Network Operations Center</SurName>
-    <EmailAddress>noc@canarie.ca</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.canarie.ca.xml b/swamid-interfederations-2.0/idp.canarie.ca.xml
deleted file mode 100644
index 9d3bb4f8..00000000
--- a/swamid-interfederations-2.0/idp.canarie.ca.xml
+++ /dev/null
@@ -1,104 +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://idp.canarie.ca/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.canarie.ca" registrationInstant="2012-08-28T00:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">
-http://www.canarie.ca/templates/services/docs/CAF_join_en.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">canarie.ca</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">CANARIE </mdui:DisplayName>
-        <mdui:DisplayName xml:lang="fr">CANARIE</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Canadaâs Advanced Research and Innovation Network</mdui:Description>
-        <mdui:Description xml:lang="fr">Le réseau évolué de recherche et d'innovation du Canada</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.canarie.ca/en/about/aboutus</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="fr">http://www.canarie.ca/fr/a-propos/quinoussommes</mdui:InformationURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDJDCCAgygAwIBAgIVAJ3fH1HeYIxXxMXYbZ/Bx85j/JgKMA0GCSqGSIb3DQEB
-BQUAMBkxFzAVBgNVBAMTDmlkcC5jYW5hcmllLmNhMB4XDTExMDcwNjE0MzUxMloX
-DTMxMDcwNjE0MzUxMlowGTEXMBUGA1UEAxMOaWRwLmNhbmFyaWUuY2EwggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCcmyqTo01QVuqHI/ZXAdYP+iX6NjP2
-topfFsR4y8TVYFN4vMvb5ZSFWPPjJ8T3O2epI8Hy9q4FWyPn1Pa/CZoFi1EMhu7b
-QJpOmLzeX6FOvf1X/5De2JnWv7JWMpUMeVqupe2YeCtoaXfViHOB9pW0go2zr6R8
-ajvQKxNX46V/o1ND6YwnlKRNsh4hn46cPtl/DNeKYFz4Uj6OHBRSfMHTZCWVENJB
-ife66AS7X5hC6o7o2Sd5VHr0TgY+ZeKrl3/33war+RIGXr6cRW9iA9yEeW0Oi13Q
-3hkjPT7MNkvNJjWpERR7aBogQ3z5Id8Ygl+WASbyfoiXNCHPa3USAaynAgMBAAGj
-YzBhMEAGA1UdEQQ5MDeCDmlkcC5jYW5hcmllLmNhhiVodHRwczovL2lkcC5jYW5h
-cmllLmNhL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBRDEuTlL5Y/HfiEJ/wzCfCz
-otFdxjANBgkqhkiG9w0BAQUFAAOCAQEAD6WiCAdkGjA7Bza59pnn+/z5/Jhwn7Mf
-+WS0WAPz686nIxYjblMBjIVITedkAFvwnEBn0Rs+XNXrc90uRFCNFf4VfSP9NLEf
-7cTPNxHiGt6TqOju2Rg6OBmNwRqAtFNqKG7VeKgoiZ4FcRVU2AdQ8fYnxxtwO4xJ
-8Md//Yp0lGQzj2FpSU7dnbVRGWAEE3g1Ghjrwe9Aj6e6lunZNaIdTZ6Yvnsa5qly
-DngkPipfHlmi56QMo9Iqa3nEKaCv2ykKzTIIUdgDI/M8sHXgitp5tFrAK8f96iBu
-zwZrSXVMnjQppB7E2l48gea/BPyFP4FBlxeN8E6aIXH09uN+HbcohQ==
-
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.canarie.ca:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.canarie.ca: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.canarie.ca/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.canarie.ca/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.canarie.ca/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.canarie.ca/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">canarie.ca</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDJDCCAgygAwIBAgIVAJ3fH1HeYIxXxMXYbZ/Bx85j/JgKMA0GCSqGSIb3DQEB
-BQUAMBkxFzAVBgNVBAMTDmlkcC5jYW5hcmllLmNhMB4XDTExMDcwNjE0MzUxMloX
-DTMxMDcwNjE0MzUxMlowGTEXMBUGA1UEAxMOaWRwLmNhbmFyaWUuY2EwggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCcmyqTo01QVuqHI/ZXAdYP+iX6NjP2
-topfFsR4y8TVYFN4vMvb5ZSFWPPjJ8T3O2epI8Hy9q4FWyPn1Pa/CZoFi1EMhu7b
-QJpOmLzeX6FOvf1X/5De2JnWv7JWMpUMeVqupe2YeCtoaXfViHOB9pW0go2zr6R8
-ajvQKxNX46V/o1ND6YwnlKRNsh4hn46cPtl/DNeKYFz4Uj6OHBRSfMHTZCWVENJB
-ife66AS7X5hC6o7o2Sd5VHr0TgY+ZeKrl3/33war+RIGXr6cRW9iA9yEeW0Oi13Q
-3hkjPT7MNkvNJjWpERR7aBogQ3z5Id8Ygl+WASbyfoiXNCHPa3USAaynAgMBAAGj
-YzBhMEAGA1UdEQQ5MDeCDmlkcC5jYW5hcmllLmNhhiVodHRwczovL2lkcC5jYW5h
-cmllLmNhL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBRDEuTlL5Y/HfiEJ/wzCfCz
-otFdxjANBgkqhkiG9w0BAQUFAAOCAQEAD6WiCAdkGjA7Bza59pnn+/z5/Jhwn7Mf
-+WS0WAPz686nIxYjblMBjIVITedkAFvwnEBn0Rs+XNXrc90uRFCNFf4VfSP9NLEf
-7cTPNxHiGt6TqOju2Rg6OBmNwRqAtFNqKG7VeKgoiZ4FcRVU2AdQ8fYnxxtwO4xJ
-8Md//Yp0lGQzj2FpSU7dnbVRGWAEE3g1Ghjrwe9Aj6e6lunZNaIdTZ6Yvnsa5qly
-DngkPipfHlmi56QMo9Iqa3nEKaCv2ykKzTIIUdgDI/M8sHXgitp5tFrAK8f96iBu
-zwZrSXVMnjQppB7E2l48gea/BPyFP4FBlxeN8E6aIXH09uN+HbcohQ==
-
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.canarie.ca:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.canarie.ca: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">CANARIE</OrganizationName>
-    <OrganizationName xml:lang="fr">CANARIE </OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Canada's Advanced Research and Innovation Network</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="fr">Le réseau évolué de recherche et d'innovation du Canada</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.canarie.ca/en/about/aboutus</OrganizationURL>
-    <OrganizationURL xml:lang="fr">http://www.canarie.ca/fr/a-propos/quinoussommes</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Network Operations Center</SurName>
-    <EmailAddress>noc@canarie.ca</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.capes.gov.br-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.capes.gov.br-idp-shibboleth.xml
deleted file mode 100644
index 93d10b48..00000000
--- a/swamid-interfederations-2.0/idp.capes.gov.br-idp-shibboleth.xml
+++ /dev/null
@@ -1,144 +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://idp.capes.gov.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">gov.br</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">CAPES - Coordenacao de Aperfeicoamento de Pessoal de Nivel Superior</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="pt-br">CAPES - Coordenacao de Aperfeicoamento de Pessoal de Nivel Superior</mdui:DisplayName>
-        <mdui:Description xml:lang="en">CAPES - Coordenacao de Aperfeicoamento de Pessoal de Nivel Superior</mdui:Description>
-        <mdui:Description xml:lang="pt-br">CAPES - Coordenacao de Aperfeicoamento de Pessoal de Nivel Superior</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.capes.gov.br/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="pt-br">http://www.capes.gov.br/</mdui:InformationURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-    MIIG2TCCBcGgAwIBAgIDAX73MA0GCSqGSIb3DQEBBQUAMIGMMQswCQYDVQQGEwJJ
-TDEWMBQGA1UEChMNU3RhcnRDb20gTHRkLjErMCkGA1UECxMiU2VjdXJlIERpZ2l0
-YWwgQ2VydGlmaWNhdGUgU2lnbmluZzE4MDYGA1UEAxMvU3RhcnRDb20gQ2xhc3Mg
-MiBQcmltYXJ5IEludGVybWVkaWF0ZSBTZXJ2ZXIgQ0EwHhcNMTMwNzA4MDUwMDI1
-WhcNMTUwNzA4MTg0NTAyWjCB3zEZMBcGA1UEDRMQWkZUQ0YwM1cybTk4eFRFOTEL
-MAkGA1UEBhMCQlIxGTAXBgNVBAgTEERpc3RyaXRvIEZlZGVyYWwxETAPBgNVBAcU
-CEJyYXPtbGlhMUQwQgYDVQQKFDtDb29yZGVuYefjbyBkZSBBcGVyZmVp529hbWVu
-dG8gZGUgUGVzc29hbCBkZSBO7XZlbCBTdXBlcmlvcjEZMBcGA1UEAxMQaWRwLmNh
-cGVzLmdvdi5icjEmMCQGCSqGSIb3DQEJARYXaG9zdG1hc3RlckBjYXBlcy5nb3Yu
-YnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDAj3RA1SawXYZGlYDg
-NH5QSDR9ciTBLW7bknhlxAhxLILCbGBLu667A9id8A5eQYwZSzrf5kN9GPoSzvkD
-IGvXn6Ke4fmA7gcBv6t9CYJMbPQteHYwJHneMX1hPcKdE/CqR+01R72GCDFCA6xt
-U0aMnpT1kcpMVuQC3LP2GZJUImFIIaH3YeQkLejgFGheyBAq6PnO/yXR7zdJY8rL
-HzOYDxER2xUXVXozHEyjoi47VSglNcnQnrOzYUZiVmTfk+o1r8PGREex0JMDn+ik
-hEeTr4zzSMst5QHsARLom5vyD4OwnNyJo9kJELHKDMUTW8iu6FCmjNMT/FcKCy3W
-N6a/AgMBAAGjggLtMIIC6TAJBgNVHRMEAjAAMAsGA1UdDwQEAwIDqDAdBgNVHSUE
-FjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwHQYDVR0OBBYEFPZEJt0d5X8oAnIEBSoy
-1PfJlikuMB8GA1UdIwQYMBaAFBHbI0X9VMxqcW+EigPXvvcBLyaGMCkGA1UdEQQi
-MCCCEGlkcC5jYXBlcy5nb3YuYnKCDGNhcGVzLmdvdi5icjCCAVYGA1UdIASCAU0w
-ggFJMAgGBmeBDAECAjCCATsGCysGAQQBgbU3AQIDMIIBKjAuBggrBgEFBQcCARYi
-aHR0cDovL3d3dy5zdGFydHNzbC5jb20vcG9saWN5LnBkZjCB9wYIKwYBBQUHAgIw
-geowJxYgU3RhcnRDb20gQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwAwIBARqBvlRo
-aXMgY2VydGlmaWNhdGUgd2FzIGlzc3VlZCBhY2NvcmRpbmcgdG8gdGhlIENsYXNz
-IDIgVmFsaWRhdGlvbiByZXF1aXJlbWVudHMgb2YgdGhlIFN0YXJ0Q29tIENBIHBv
-bGljeSwgcmVsaWFuY2Ugb25seSBmb3IgdGhlIGludGVuZGVkIHB1cnBvc2UgaW4g
-Y29tcGxpYW5jZSBvZiB0aGUgcmVseWluZyBwYXJ0eSBvYmxpZ2F0aW9ucy4wNQYD
-VR0fBC4wLDAqoCigJoYkaHR0cDovL2NybC5zdGFydHNzbC5jb20vY3J0Mi1jcmwu
-Y3JsMIGOBggrBgEFBQcBAQSBgTB/MDkGCCsGAQUFBzABhi1odHRwOi8vb2NzcC5z
-dGFydHNzbC5jb20vc3ViL2NsYXNzMi9zZXJ2ZXIvY2EwQgYIKwYBBQUHMAKGNmh0
-dHA6Ly9haWEuc3RhcnRzc2wuY29tL2NlcnRzL3N1Yi5jbGFzczIuc2VydmVyLmNh
-LmNydDAjBgNVHRIEHDAahhhodHRwOi8vd3d3LnN0YXJ0c3NsLmNvbS8wDQYJKoZI
-hvcNAQEFBQADggEBABj1dE12jEodgbQi96WwcBnlyh8awDTBKNJK9IDqVoeZvrWy
-LwuTxcMYhIqqdZ3swxY0se2xJOLUyrs9R5P6z1hRr3Ey3kkyZYUYZ4d0TTouA8Av
-+MDd/ruXV0DyarkYF+u1evTDcm/hKT9Vp5eqa7iaA8hDK9jFL8OKUprHcmvqy19N
-DjZEt+NigC71L/ssIag3gK1KtjHuIdDRYnc5u2ysCGa282zYO/0u2AA+pFehclYw
-nK56c5pDTUjPkC8FdHv5CneaSpEKD5idpN/VuNhRTYXwA4kt31b7JZfGtQ7o22QW
-inybujlVIVrVxtaJ34R7yirxKZ/Y6VFxLKKuiYw=
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.capes.gov.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.capes.gov.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://idp.capes.gov.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.capes.gov.br/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.capes.gov.br/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.capes.gov.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">gov.br</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-      
-MIIG2TCCBcGgAwIBAgIDAX73MA0GCSqGSIb3DQEBBQUAMIGMMQswCQYDVQQGEwJJ
-TDEWMBQGA1UEChMNU3RhcnRDb20gTHRkLjErMCkGA1UECxMiU2VjdXJlIERpZ2l0
-YWwgQ2VydGlmaWNhdGUgU2lnbmluZzE4MDYGA1UEAxMvU3RhcnRDb20gQ2xhc3Mg
-MiBQcmltYXJ5IEludGVybWVkaWF0ZSBTZXJ2ZXIgQ0EwHhcNMTMwNzA4MDUwMDI1
-WhcNMTUwNzA4MTg0NTAyWjCB3zEZMBcGA1UEDRMQWkZUQ0YwM1cybTk4eFRFOTEL
-MAkGA1UEBhMCQlIxGTAXBgNVBAgTEERpc3RyaXRvIEZlZGVyYWwxETAPBgNVBAcU
-CEJyYXPtbGlhMUQwQgYDVQQKFDtDb29yZGVuYefjbyBkZSBBcGVyZmVp529hbWVu
-dG8gZGUgUGVzc29hbCBkZSBO7XZlbCBTdXBlcmlvcjEZMBcGA1UEAxMQaWRwLmNh
-cGVzLmdvdi5icjEmMCQGCSqGSIb3DQEJARYXaG9zdG1hc3RlckBjYXBlcy5nb3Yu
-YnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDAj3RA1SawXYZGlYDg
-NH5QSDR9ciTBLW7bknhlxAhxLILCbGBLu667A9id8A5eQYwZSzrf5kN9GPoSzvkD
-IGvXn6Ke4fmA7gcBv6t9CYJMbPQteHYwJHneMX1hPcKdE/CqR+01R72GCDFCA6xt
-U0aMnpT1kcpMVuQC3LP2GZJUImFIIaH3YeQkLejgFGheyBAq6PnO/yXR7zdJY8rL
-HzOYDxER2xUXVXozHEyjoi47VSglNcnQnrOzYUZiVmTfk+o1r8PGREex0JMDn+ik
-hEeTr4zzSMst5QHsARLom5vyD4OwnNyJo9kJELHKDMUTW8iu6FCmjNMT/FcKCy3W
-N6a/AgMBAAGjggLtMIIC6TAJBgNVHRMEAjAAMAsGA1UdDwQEAwIDqDAdBgNVHSUE
-FjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwHQYDVR0OBBYEFPZEJt0d5X8oAnIEBSoy
-1PfJlikuMB8GA1UdIwQYMBaAFBHbI0X9VMxqcW+EigPXvvcBLyaGMCkGA1UdEQQi
-MCCCEGlkcC5jYXBlcy5nb3YuYnKCDGNhcGVzLmdvdi5icjCCAVYGA1UdIASCAU0w
-ggFJMAgGBmeBDAECAjCCATsGCysGAQQBgbU3AQIDMIIBKjAuBggrBgEFBQcCARYi
-aHR0cDovL3d3dy5zdGFydHNzbC5jb20vcG9saWN5LnBkZjCB9wYIKwYBBQUHAgIw
-geowJxYgU3RhcnRDb20gQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwAwIBARqBvlRo
-aXMgY2VydGlmaWNhdGUgd2FzIGlzc3VlZCBhY2NvcmRpbmcgdG8gdGhlIENsYXNz
-IDIgVmFsaWRhdGlvbiByZXF1aXJlbWVudHMgb2YgdGhlIFN0YXJ0Q29tIENBIHBv
-bGljeSwgcmVsaWFuY2Ugb25seSBmb3IgdGhlIGludGVuZGVkIHB1cnBvc2UgaW4g
-Y29tcGxpYW5jZSBvZiB0aGUgcmVseWluZyBwYXJ0eSBvYmxpZ2F0aW9ucy4wNQYD
-VR0fBC4wLDAqoCigJoYkaHR0cDovL2NybC5zdGFydHNzbC5jb20vY3J0Mi1jcmwu
-Y3JsMIGOBggrBgEFBQcBAQSBgTB/MDkGCCsGAQUFBzABhi1odHRwOi8vb2NzcC5z
-dGFydHNzbC5jb20vc3ViL2NsYXNzMi9zZXJ2ZXIvY2EwQgYIKwYBBQUHMAKGNmh0
-dHA6Ly9haWEuc3RhcnRzc2wuY29tL2NlcnRzL3N1Yi5jbGFzczIuc2VydmVyLmNh
-LmNydDAjBgNVHRIEHDAahhhodHRwOi8vd3d3LnN0YXJ0c3NsLmNvbS8wDQYJKoZI
-hvcNAQEFBQADggEBABj1dE12jEodgbQi96WwcBnlyh8awDTBKNJK9IDqVoeZvrWy
-LwuTxcMYhIqqdZ3swxY0se2xJOLUyrs9R5P6z1hRr3Ey3kkyZYUYZ4d0TTouA8Av
-+MDd/ruXV0DyarkYF+u1evTDcm/hKT9Vp5eqa7iaA8hDK9jFL8OKUprHcmvqy19N
-DjZEt+NigC71L/ssIag3gK1KtjHuIdDRYnc5u2ysCGa282zYO/0u2AA+pFehclYw
-nK56c5pDTUjPkC8FdHv5CneaSpEKD5idpN/VuNhRTYXwA4kt31b7JZfGtQ7o22QW
-inybujlVIVrVxtaJ34R7yirxKZ/Y6VFxLKKuiYw=
-                    
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.capes.gov.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.capes.gov.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">CAPES - Coordenacao de Aperfeicoamento de Pessoal de Nivel Superior</OrganizationName>
-    <OrganizationName xml:lang="pt-br">CAPES - Coordenacao de Aperfeicoamento de Pessoal de Nivel Superior</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">CAPES - Coordenacao de Aperfeicoamento de Pessoal de Nivel Superior</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="pt-br">CAPES - Coordenacao de Aperfeicoamento de Pessoal de Nivel Superior</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.capes.gov.br/</OrganizationURL>
-    <OrganizationURL xml:lang="pt-br">http://www.capes.gov.br/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Marcio Jesus</SurName>
-    <EmailAddress>marcio.jesus@capes.rnp.br</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.capes.gov.br.xml b/swamid-interfederations-2.0/idp.capes.gov.br.xml
deleted file mode 100644
index 93d10b48..00000000
--- a/swamid-interfederations-2.0/idp.capes.gov.br.xml
+++ /dev/null
@@ -1,144 +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://idp.capes.gov.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">gov.br</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">CAPES - Coordenacao de Aperfeicoamento de Pessoal de Nivel Superior</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="pt-br">CAPES - Coordenacao de Aperfeicoamento de Pessoal de Nivel Superior</mdui:DisplayName>
-        <mdui:Description xml:lang="en">CAPES - Coordenacao de Aperfeicoamento de Pessoal de Nivel Superior</mdui:Description>
-        <mdui:Description xml:lang="pt-br">CAPES - Coordenacao de Aperfeicoamento de Pessoal de Nivel Superior</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.capes.gov.br/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="pt-br">http://www.capes.gov.br/</mdui:InformationURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-    MIIG2TCCBcGgAwIBAgIDAX73MA0GCSqGSIb3DQEBBQUAMIGMMQswCQYDVQQGEwJJ
-TDEWMBQGA1UEChMNU3RhcnRDb20gTHRkLjErMCkGA1UECxMiU2VjdXJlIERpZ2l0
-YWwgQ2VydGlmaWNhdGUgU2lnbmluZzE4MDYGA1UEAxMvU3RhcnRDb20gQ2xhc3Mg
-MiBQcmltYXJ5IEludGVybWVkaWF0ZSBTZXJ2ZXIgQ0EwHhcNMTMwNzA4MDUwMDI1
-WhcNMTUwNzA4MTg0NTAyWjCB3zEZMBcGA1UEDRMQWkZUQ0YwM1cybTk4eFRFOTEL
-MAkGA1UEBhMCQlIxGTAXBgNVBAgTEERpc3RyaXRvIEZlZGVyYWwxETAPBgNVBAcU
-CEJyYXPtbGlhMUQwQgYDVQQKFDtDb29yZGVuYefjbyBkZSBBcGVyZmVp529hbWVu
-dG8gZGUgUGVzc29hbCBkZSBO7XZlbCBTdXBlcmlvcjEZMBcGA1UEAxMQaWRwLmNh
-cGVzLmdvdi5icjEmMCQGCSqGSIb3DQEJARYXaG9zdG1hc3RlckBjYXBlcy5nb3Yu
-YnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDAj3RA1SawXYZGlYDg
-NH5QSDR9ciTBLW7bknhlxAhxLILCbGBLu667A9id8A5eQYwZSzrf5kN9GPoSzvkD
-IGvXn6Ke4fmA7gcBv6t9CYJMbPQteHYwJHneMX1hPcKdE/CqR+01R72GCDFCA6xt
-U0aMnpT1kcpMVuQC3LP2GZJUImFIIaH3YeQkLejgFGheyBAq6PnO/yXR7zdJY8rL
-HzOYDxER2xUXVXozHEyjoi47VSglNcnQnrOzYUZiVmTfk+o1r8PGREex0JMDn+ik
-hEeTr4zzSMst5QHsARLom5vyD4OwnNyJo9kJELHKDMUTW8iu6FCmjNMT/FcKCy3W
-N6a/AgMBAAGjggLtMIIC6TAJBgNVHRMEAjAAMAsGA1UdDwQEAwIDqDAdBgNVHSUE
-FjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwHQYDVR0OBBYEFPZEJt0d5X8oAnIEBSoy
-1PfJlikuMB8GA1UdIwQYMBaAFBHbI0X9VMxqcW+EigPXvvcBLyaGMCkGA1UdEQQi
-MCCCEGlkcC5jYXBlcy5nb3YuYnKCDGNhcGVzLmdvdi5icjCCAVYGA1UdIASCAU0w
-ggFJMAgGBmeBDAECAjCCATsGCysGAQQBgbU3AQIDMIIBKjAuBggrBgEFBQcCARYi
-aHR0cDovL3d3dy5zdGFydHNzbC5jb20vcG9saWN5LnBkZjCB9wYIKwYBBQUHAgIw
-geowJxYgU3RhcnRDb20gQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwAwIBARqBvlRo
-aXMgY2VydGlmaWNhdGUgd2FzIGlzc3VlZCBhY2NvcmRpbmcgdG8gdGhlIENsYXNz
-IDIgVmFsaWRhdGlvbiByZXF1aXJlbWVudHMgb2YgdGhlIFN0YXJ0Q29tIENBIHBv
-bGljeSwgcmVsaWFuY2Ugb25seSBmb3IgdGhlIGludGVuZGVkIHB1cnBvc2UgaW4g
-Y29tcGxpYW5jZSBvZiB0aGUgcmVseWluZyBwYXJ0eSBvYmxpZ2F0aW9ucy4wNQYD
-VR0fBC4wLDAqoCigJoYkaHR0cDovL2NybC5zdGFydHNzbC5jb20vY3J0Mi1jcmwu
-Y3JsMIGOBggrBgEFBQcBAQSBgTB/MDkGCCsGAQUFBzABhi1odHRwOi8vb2NzcC5z
-dGFydHNzbC5jb20vc3ViL2NsYXNzMi9zZXJ2ZXIvY2EwQgYIKwYBBQUHMAKGNmh0
-dHA6Ly9haWEuc3RhcnRzc2wuY29tL2NlcnRzL3N1Yi5jbGFzczIuc2VydmVyLmNh
-LmNydDAjBgNVHRIEHDAahhhodHRwOi8vd3d3LnN0YXJ0c3NsLmNvbS8wDQYJKoZI
-hvcNAQEFBQADggEBABj1dE12jEodgbQi96WwcBnlyh8awDTBKNJK9IDqVoeZvrWy
-LwuTxcMYhIqqdZ3swxY0se2xJOLUyrs9R5P6z1hRr3Ey3kkyZYUYZ4d0TTouA8Av
-+MDd/ruXV0DyarkYF+u1evTDcm/hKT9Vp5eqa7iaA8hDK9jFL8OKUprHcmvqy19N
-DjZEt+NigC71L/ssIag3gK1KtjHuIdDRYnc5u2ysCGa282zYO/0u2AA+pFehclYw
-nK56c5pDTUjPkC8FdHv5CneaSpEKD5idpN/VuNhRTYXwA4kt31b7JZfGtQ7o22QW
-inybujlVIVrVxtaJ34R7yirxKZ/Y6VFxLKKuiYw=
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.capes.gov.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.capes.gov.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://idp.capes.gov.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.capes.gov.br/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.capes.gov.br/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.capes.gov.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">gov.br</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-      
-MIIG2TCCBcGgAwIBAgIDAX73MA0GCSqGSIb3DQEBBQUAMIGMMQswCQYDVQQGEwJJ
-TDEWMBQGA1UEChMNU3RhcnRDb20gTHRkLjErMCkGA1UECxMiU2VjdXJlIERpZ2l0
-YWwgQ2VydGlmaWNhdGUgU2lnbmluZzE4MDYGA1UEAxMvU3RhcnRDb20gQ2xhc3Mg
-MiBQcmltYXJ5IEludGVybWVkaWF0ZSBTZXJ2ZXIgQ0EwHhcNMTMwNzA4MDUwMDI1
-WhcNMTUwNzA4MTg0NTAyWjCB3zEZMBcGA1UEDRMQWkZUQ0YwM1cybTk4eFRFOTEL
-MAkGA1UEBhMCQlIxGTAXBgNVBAgTEERpc3RyaXRvIEZlZGVyYWwxETAPBgNVBAcU
-CEJyYXPtbGlhMUQwQgYDVQQKFDtDb29yZGVuYefjbyBkZSBBcGVyZmVp529hbWVu
-dG8gZGUgUGVzc29hbCBkZSBO7XZlbCBTdXBlcmlvcjEZMBcGA1UEAxMQaWRwLmNh
-cGVzLmdvdi5icjEmMCQGCSqGSIb3DQEJARYXaG9zdG1hc3RlckBjYXBlcy5nb3Yu
-YnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDAj3RA1SawXYZGlYDg
-NH5QSDR9ciTBLW7bknhlxAhxLILCbGBLu667A9id8A5eQYwZSzrf5kN9GPoSzvkD
-IGvXn6Ke4fmA7gcBv6t9CYJMbPQteHYwJHneMX1hPcKdE/CqR+01R72GCDFCA6xt
-U0aMnpT1kcpMVuQC3LP2GZJUImFIIaH3YeQkLejgFGheyBAq6PnO/yXR7zdJY8rL
-HzOYDxER2xUXVXozHEyjoi47VSglNcnQnrOzYUZiVmTfk+o1r8PGREex0JMDn+ik
-hEeTr4zzSMst5QHsARLom5vyD4OwnNyJo9kJELHKDMUTW8iu6FCmjNMT/FcKCy3W
-N6a/AgMBAAGjggLtMIIC6TAJBgNVHRMEAjAAMAsGA1UdDwQEAwIDqDAdBgNVHSUE
-FjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwHQYDVR0OBBYEFPZEJt0d5X8oAnIEBSoy
-1PfJlikuMB8GA1UdIwQYMBaAFBHbI0X9VMxqcW+EigPXvvcBLyaGMCkGA1UdEQQi
-MCCCEGlkcC5jYXBlcy5nb3YuYnKCDGNhcGVzLmdvdi5icjCCAVYGA1UdIASCAU0w
-ggFJMAgGBmeBDAECAjCCATsGCysGAQQBgbU3AQIDMIIBKjAuBggrBgEFBQcCARYi
-aHR0cDovL3d3dy5zdGFydHNzbC5jb20vcG9saWN5LnBkZjCB9wYIKwYBBQUHAgIw
-geowJxYgU3RhcnRDb20gQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwAwIBARqBvlRo
-aXMgY2VydGlmaWNhdGUgd2FzIGlzc3VlZCBhY2NvcmRpbmcgdG8gdGhlIENsYXNz
-IDIgVmFsaWRhdGlvbiByZXF1aXJlbWVudHMgb2YgdGhlIFN0YXJ0Q29tIENBIHBv
-bGljeSwgcmVsaWFuY2Ugb25seSBmb3IgdGhlIGludGVuZGVkIHB1cnBvc2UgaW4g
-Y29tcGxpYW5jZSBvZiB0aGUgcmVseWluZyBwYXJ0eSBvYmxpZ2F0aW9ucy4wNQYD
-VR0fBC4wLDAqoCigJoYkaHR0cDovL2NybC5zdGFydHNzbC5jb20vY3J0Mi1jcmwu
-Y3JsMIGOBggrBgEFBQcBAQSBgTB/MDkGCCsGAQUFBzABhi1odHRwOi8vb2NzcC5z
-dGFydHNzbC5jb20vc3ViL2NsYXNzMi9zZXJ2ZXIvY2EwQgYIKwYBBQUHMAKGNmh0
-dHA6Ly9haWEuc3RhcnRzc2wuY29tL2NlcnRzL3N1Yi5jbGFzczIuc2VydmVyLmNh
-LmNydDAjBgNVHRIEHDAahhhodHRwOi8vd3d3LnN0YXJ0c3NsLmNvbS8wDQYJKoZI
-hvcNAQEFBQADggEBABj1dE12jEodgbQi96WwcBnlyh8awDTBKNJK9IDqVoeZvrWy
-LwuTxcMYhIqqdZ3swxY0se2xJOLUyrs9R5P6z1hRr3Ey3kkyZYUYZ4d0TTouA8Av
-+MDd/ruXV0DyarkYF+u1evTDcm/hKT9Vp5eqa7iaA8hDK9jFL8OKUprHcmvqy19N
-DjZEt+NigC71L/ssIag3gK1KtjHuIdDRYnc5u2ysCGa282zYO/0u2AA+pFehclYw
-nK56c5pDTUjPkC8FdHv5CneaSpEKD5idpN/VuNhRTYXwA4kt31b7JZfGtQ7o22QW
-inybujlVIVrVxtaJ34R7yirxKZ/Y6VFxLKKuiYw=
-                    
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.capes.gov.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.capes.gov.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">CAPES - Coordenacao de Aperfeicoamento de Pessoal de Nivel Superior</OrganizationName>
-    <OrganizationName xml:lang="pt-br">CAPES - Coordenacao de Aperfeicoamento de Pessoal de Nivel Superior</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">CAPES - Coordenacao de Aperfeicoamento de Pessoal de Nivel Superior</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="pt-br">CAPES - Coordenacao de Aperfeicoamento de Pessoal de Nivel Superior</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.capes.gov.br/</OrganizationURL>
-    <OrganizationURL xml:lang="pt-br">http://www.capes.gov.br/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Marcio Jesus</SurName>
-    <EmailAddress>marcio.jesus@capes.rnp.br</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.cardiff.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.cardiff.ac.uk-shibboleth.xml
deleted file mode 100644
index aea025e0..00000000
--- a/swamid-interfederations-2.0/idp.cardiff.ac.uk-shibboleth.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.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>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDHDCCAgSgAwIBAgIUe8wsOBcOivZ/X/QVj8+2Uw+jnbAwDQYJKoZIhvcNAQEF
-						BQAwFzEVMBMGA1UEAxMMaWRwLmNmLmFjLnVrMB4XDTE0MDgxNDEzMTMxNVoXDTM0
-						MDgxNDEzMTMxNVowFzEVMBMGA1UEAxMMaWRwLmNmLmFjLnVrMIIBIjANBgkqhkiG
-						9w0BAQEFAAOCAQ8AMIIBCgKCAQEApqXJD7Pmm0di7+qRkZYSDcc3JLPzVQkylFiV
-						bvpNphN9Rt9cRVv/qvN1nZVMYCanwzDJSz6idD4jip33u1up1szRTn5vfQLT5ta5
-						+PBzZad2lIao4CGH4PzSbUTUxivhldMQShlonsxmtpdFinHOKMjt8WYXB7iF0qDm
-						PQnJJC7tjHku/yc+d1Zh2VgzTG/OQ0fGvvkp5dFywjAAUH/ot/kheCqw4g0F/LHj
-						PlKUMvGFZc7PnmYgVa7Xz9YI0ZJjdc8uCHsvEZfCpoDnTpigUUvqwuuvwdSR7aew
-						SLcJi74+DXEZh/aa23HLVWrxk4xfMojpKVC+SwweohEeg4Wr3QIDAQABo2AwXjA9
-						BgNVHREENjA0ggxpZHAuY2YuYWMudWuGJGh0dHBzOi8vaWRwLmNhcmRpZmYuYWMu
-						dWsvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUGzP0X/B4uf8Nz8c3KPWxG4gG8dQwDQYJ
-						KoZIhvcNAQEFBQADggEBAGfqyC6ItIgEs3LtHUApmqvKDpFT90Uw03q4G5mwYT/Z
-						8V2ml+ppXGJJbz2tdQcyJOXr+Ik2UmFauYvtedsAuc+q2j1i4LMrveo03XP1NrHY
-						BMwMbvsjPqRbHk8398M4XA92712iB448+8kwI8zwu5Nlbayu9JF84eSEsufQHaA3
-						2tEqUYZYw+5SIhUPPL+rJbOTh/sPYy0niY2RVX22MsBGHIH+c93gpSYoCdQI5XBu
-						fj8uW6fP20q8JEagC8olauNbiOgoRFaxjTOjudZKT449m6DrOdbcvPgV0s0vxTlR
-						tSTvwfp+LJO2OrKN2zIzV+mrAeKIWaatx542gFAATg8=
-					</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"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.cf.ac.uk/idp/profile/SAML2/Redirect/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.cf.ac.uk/idp/profile/SAML2/POST/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.cf.ac.uk/idp/profile/SAML2/POST-SimpleSign/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.cf.ac.uk: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.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>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDHDCCAgSgAwIBAgIUe8wsOBcOivZ/X/QVj8+2Uw+jnbAwDQYJKoZIhvcNAQEF
-						BQAwFzEVMBMGA1UEAxMMaWRwLmNmLmFjLnVrMB4XDTE0MDgxNDEzMTMxNVoXDTM0
-						MDgxNDEzMTMxNVowFzEVMBMGA1UEAxMMaWRwLmNmLmFjLnVrMIIBIjANBgkqhkiG
-						9w0BAQEFAAOCAQ8AMIIBCgKCAQEApqXJD7Pmm0di7+qRkZYSDcc3JLPzVQkylFiV
-						bvpNphN9Rt9cRVv/qvN1nZVMYCanwzDJSz6idD4jip33u1up1szRTn5vfQLT5ta5
-						+PBzZad2lIao4CGH4PzSbUTUxivhldMQShlonsxmtpdFinHOKMjt8WYXB7iF0qDm
-						PQnJJC7tjHku/yc+d1Zh2VgzTG/OQ0fGvvkp5dFywjAAUH/ot/kheCqw4g0F/LHj
-						PlKUMvGFZc7PnmYgVa7Xz9YI0ZJjdc8uCHsvEZfCpoDnTpigUUvqwuuvwdSR7aew
-						SLcJi74+DXEZh/aa23HLVWrxk4xfMojpKVC+SwweohEeg4Wr3QIDAQABo2AwXjA9
-						BgNVHREENjA0ggxpZHAuY2YuYWMudWuGJGh0dHBzOi8vaWRwLmNhcmRpZmYuYWMu
-						dWsvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUGzP0X/B4uf8Nz8c3KPWxG4gG8dQwDQYJ
-						KoZIhvcNAQEFBQADggEBAGfqyC6ItIgEs3LtHUApmqvKDpFT90Uw03q4G5mwYT/Z
-						8V2ml+ppXGJJbz2tdQcyJOXr+Ik2UmFauYvtedsAuc+q2j1i4LMrveo03XP1NrHY
-						BMwMbvsjPqRbHk8398M4XA92712iB448+8kwI8zwu5Nlbayu9JF84eSEsufQHaA3
-						2tEqUYZYw+5SIhUPPL+rJbOTh/sPYy0niY2RVX22MsBGHIH+c93gpSYoCdQI5XBu
-						fj8uW6fP20q8JEagC8olauNbiOgoRFaxjTOjudZKT449m6DrOdbcvPgV0s0vxTlR
-						tSTvwfp+LJO2OrKN2zIzV+mrAeKIWaatx542gFAATg8=
-					</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.cardiff.ac.uk.xml b/swamid-interfederations-2.0/idp.cardiff.ac.uk.xml
deleted file mode 100644
index aea025e0..00000000
--- a/swamid-interfederations-2.0/idp.cardiff.ac.uk.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.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>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDHDCCAgSgAwIBAgIUe8wsOBcOivZ/X/QVj8+2Uw+jnbAwDQYJKoZIhvcNAQEF
-						BQAwFzEVMBMGA1UEAxMMaWRwLmNmLmFjLnVrMB4XDTE0MDgxNDEzMTMxNVoXDTM0
-						MDgxNDEzMTMxNVowFzEVMBMGA1UEAxMMaWRwLmNmLmFjLnVrMIIBIjANBgkqhkiG
-						9w0BAQEFAAOCAQ8AMIIBCgKCAQEApqXJD7Pmm0di7+qRkZYSDcc3JLPzVQkylFiV
-						bvpNphN9Rt9cRVv/qvN1nZVMYCanwzDJSz6idD4jip33u1up1szRTn5vfQLT5ta5
-						+PBzZad2lIao4CGH4PzSbUTUxivhldMQShlonsxmtpdFinHOKMjt8WYXB7iF0qDm
-						PQnJJC7tjHku/yc+d1Zh2VgzTG/OQ0fGvvkp5dFywjAAUH/ot/kheCqw4g0F/LHj
-						PlKUMvGFZc7PnmYgVa7Xz9YI0ZJjdc8uCHsvEZfCpoDnTpigUUvqwuuvwdSR7aew
-						SLcJi74+DXEZh/aa23HLVWrxk4xfMojpKVC+SwweohEeg4Wr3QIDAQABo2AwXjA9
-						BgNVHREENjA0ggxpZHAuY2YuYWMudWuGJGh0dHBzOi8vaWRwLmNhcmRpZmYuYWMu
-						dWsvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUGzP0X/B4uf8Nz8c3KPWxG4gG8dQwDQYJ
-						KoZIhvcNAQEFBQADggEBAGfqyC6ItIgEs3LtHUApmqvKDpFT90Uw03q4G5mwYT/Z
-						8V2ml+ppXGJJbz2tdQcyJOXr+Ik2UmFauYvtedsAuc+q2j1i4LMrveo03XP1NrHY
-						BMwMbvsjPqRbHk8398M4XA92712iB448+8kwI8zwu5Nlbayu9JF84eSEsufQHaA3
-						2tEqUYZYw+5SIhUPPL+rJbOTh/sPYy0niY2RVX22MsBGHIH+c93gpSYoCdQI5XBu
-						fj8uW6fP20q8JEagC8olauNbiOgoRFaxjTOjudZKT449m6DrOdbcvPgV0s0vxTlR
-						tSTvwfp+LJO2OrKN2zIzV+mrAeKIWaatx542gFAATg8=
-					</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"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.cf.ac.uk/idp/profile/SAML2/Redirect/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.cf.ac.uk/idp/profile/SAML2/POST/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.cf.ac.uk/idp/profile/SAML2/POST-SimpleSign/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.cf.ac.uk: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.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>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDHDCCAgSgAwIBAgIUe8wsOBcOivZ/X/QVj8+2Uw+jnbAwDQYJKoZIhvcNAQEF
-						BQAwFzEVMBMGA1UEAxMMaWRwLmNmLmFjLnVrMB4XDTE0MDgxNDEzMTMxNVoXDTM0
-						MDgxNDEzMTMxNVowFzEVMBMGA1UEAxMMaWRwLmNmLmFjLnVrMIIBIjANBgkqhkiG
-						9w0BAQEFAAOCAQ8AMIIBCgKCAQEApqXJD7Pmm0di7+qRkZYSDcc3JLPzVQkylFiV
-						bvpNphN9Rt9cRVv/qvN1nZVMYCanwzDJSz6idD4jip33u1up1szRTn5vfQLT5ta5
-						+PBzZad2lIao4CGH4PzSbUTUxivhldMQShlonsxmtpdFinHOKMjt8WYXB7iF0qDm
-						PQnJJC7tjHku/yc+d1Zh2VgzTG/OQ0fGvvkp5dFywjAAUH/ot/kheCqw4g0F/LHj
-						PlKUMvGFZc7PnmYgVa7Xz9YI0ZJjdc8uCHsvEZfCpoDnTpigUUvqwuuvwdSR7aew
-						SLcJi74+DXEZh/aa23HLVWrxk4xfMojpKVC+SwweohEeg4Wr3QIDAQABo2AwXjA9
-						BgNVHREENjA0ggxpZHAuY2YuYWMudWuGJGh0dHBzOi8vaWRwLmNhcmRpZmYuYWMu
-						dWsvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUGzP0X/B4uf8Nz8c3KPWxG4gG8dQwDQYJ
-						KoZIhvcNAQEFBQADggEBAGfqyC6ItIgEs3LtHUApmqvKDpFT90Uw03q4G5mwYT/Z
-						8V2ml+ppXGJJbz2tdQcyJOXr+Ik2UmFauYvtedsAuc+q2j1i4LMrveo03XP1NrHY
-						BMwMbvsjPqRbHk8398M4XA92712iB448+8kwI8zwu5Nlbayu9JF84eSEsufQHaA3
-						2tEqUYZYw+5SIhUPPL+rJbOTh/sPYy0niY2RVX22MsBGHIH+c93gpSYoCdQI5XBu
-						fj8uW6fP20q8JEagC8olauNbiOgoRFaxjTOjudZKT449m6DrOdbcvPgV0s0vxTlR
-						tSTvwfp+LJO2OrKN2zIzV+mrAeKIWaatx542gFAATg8=
-					</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.cedia.org.ec-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.cedia.org.ec-idp-shibboleth.xml
deleted file mode 100644
index 8d2f3717..00000000
--- a/swamid-interfederations-2.0/idp.cedia.org.ec-idp-shibboleth.xml
+++ /dev/null
@@ -1,161 +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://idp.cedia.org.ec/idp/shibboleth">
-  <md:Extensions xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata">
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://minga.cedia.org.ec" registrationInstant="2014-08-28T00:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="es">
-                                http://www.cedia.org.ec/minga
-                        </mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </md:Extensions>
-  <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 xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata">
-      <shibmd:Scope regexp="false">cedia.org.ec</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">CEDIA</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="es">CEDIA</mdui:DisplayName>
-        <mdui:Description xml:lang="en">
-                                CEDIA - Ecuadorean Consortium for Advanced Internet Development
-                        </mdui:Description>
-        <mdui:Description xml:lang="es">
-                                CEDIA - Consorcio Ecuatoriano para el Desarrollo de Internet Avanzado
-                        </mdui:Description>
-        <mdui:InformationURL xml:lang="en">
-                                http://www.cedia.org.ec
-                        </mdui:InformationURL>
-        <mdui:InformationURL xml:lang="es">
-                                http://www.cedia.org.ec
-                        </mdui:InformationURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIHnzCCBYegAwIBAgIBCDANBgkqhkiG9w0BAQUFADCBvzELMAkGA1UEBhMCRUMx
-DjAMBgNVBAgTBUF6dWF5MQ8wDQYDVQQHEwZDdWVuY2ExDjAMBgNVBAoTBUNFRElB
-MUYwRAYDVQQLEz1Db25zb3JjaW8gRWN1YXRvcmlhbm8gcGFyYSBlbCBEZXNhcnJv
-bGxvIGRlIEludGVybmV0IEF2YW56YWRvMRYwFAYDVQQDEw1jYS5lZHVyb2FtLmVj
-MR8wHQYJKoZIhvcNAQkBFhBuZWdAY2VkaWEub3JnLmVjMB4XDTE0MDIwMTAxMjU0
-OFoXDTE2MDIwMTAxMjU0OFowgcIxCzAJBgNVBAYTAkVDMQ4wDAYDVQQIEwVBenVh
-eTEPMA0GA1UEBxMGQ3VlbmNhMQ4wDAYDVQQKEwVDRURJQTFGMEQGA1UECxM9Q29u
-c29yY2lvIEVjdWF0b3JpYW5vIHBhcmEgZWwgRGVzYXJyb2xsbyBkZSBJbnRlcm5l
-dCBBdmFuemFkbzEZMBcGA1UEAxMQaWRwLmNlZGlhLm9yZy5lYzEfMB0GCSqGSIb3
-DQEJARYQbmVnQGNlZGlhLm9yZy5lYzCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCC
-AgoCggIBAKSsCSs49O1Pt5o6DSOaCGd5tzQALUWSn+MaOJEf/T+OlO47Ao1b5mz2
-Qn2+2fKhjNfTmxEaLCGkrtlMfZvGpVCpatYjVOqw1faGHc/MoohcsgjQQhUMEUBd
-Ez9UV9z4ogC5mWE9KoVlUbCT8+z2TfU4qlQgB/nOx0F71Frnex9cRhkmiYI2z8OC
-Gmeio8wxXU0jYvEYv3Hk6/Q+dPOIKwyPItk9rg/gL/aVor2uAZ6B6UJiasU7riOq
-qth/6cnriUymDX04wSJZWGfAX+/IJ1VRwPyYAT/szRMVoBzV/bEWgRnO2zTGjLn0
-/zS76W7JAdVu5i/x3nrZL00dzu8wFAZmC4CurMznL8Rz1CI7u/F/TJjpq6Tgw+fT
-jzL9pBn95sLe0dQzsxWJ4COe/yK/ANO1LhDUUGV83nHVLMphfUsHj9bh2NTtECbt
-uKVmnSRLLtXPION6r+arqXfWqSN0EqfVZGdFK+Z+dAaVtr1BX2sXZVm1pQNpjNeJ
-fcMrpDPGSQXPCLZfVAmfvHGsXvq6VDmv1dXULUFauTGnsXbG1GkRGU70A5CR2oyF
-RWnL/5nMXAnIb8trJmN2u6kIKV+AyjeNKgn3OnT5xSW1XD66nhzTtOhnGzuCPcH/
-2wG0fyUCshwc1gY2Tl2u8YplLndWlTXFvFUMyWzyBXAyKtAR53KhAgMBAAGjggGf
-MIIBmzAJBgNVHRMEAjAAMBEGCWCGSAGG+EIBAQQEAwIGQDArBglghkgBhvhCAQ0E
-HhYcVGlueUNBIEdlbmVyYXRlZCBDZXJ0aWZpY2F0ZTAdBgNVHQ4EFgQUpu+3H1k4
-WykGUu2yNZioiqwV6HAwgfQGA1UdIwSB7DCB6YAUXr5EvOJqnceMOEVQzXKYLF9c
-/jOhgcWkgcIwgb8xCzAJBgNVBAYTAkVDMQ4wDAYDVQQIEwVBenVheTEPMA0GA1UE
-BxMGQ3VlbmNhMQ4wDAYDVQQKEwVDRURJQTFGMEQGA1UECxM9Q29uc29yY2lvIEVj
-dWF0b3JpYW5vIHBhcmEgZWwgRGVzYXJyb2xsbyBkZSBJbnRlcm5ldCBBdmFuemFk
-bzEWMBQGA1UEAxMNY2EuZWR1cm9hbS5lYzEfMB0GCSqGSIb3DQEJARYQbmVnQGNl
-ZGlhLm9yZy5lY4IJANQ3cRbGqAp6MBsGA1UdEgQUMBKBEG5lZ0BjZWRpYS5vcmcu
-ZWMwGwYDVR0RBBQwEoEQbmVnQGNlZGlhLm9yZy5lYzANBgkqhkiG9w0BAQUFAAOC
-AgEAUbDgG1MR04EhdgEQUTt99d2ipr7ehfMKwfm7W3XiaHzqXOmqsogjlOJVBkUo
-4+PWVC0kfy7pOI0CWji7TfmKsh6iW9peM5TT2Iir/NLZD2PJl9EiOgSavmtjlL3N
-Dm0pBh0dpYXxJQpPtWjYntuuP6YLpQHM0PUgOhbGe9N3d3k1DZHOtDaOcA7UjKcW
-PvsCD3+jciSw33//J/asuixqvpoxZO1TUQbFm9HpLgEiw4iPVu/lo7mEsuz4LxQd
-N00udea/m/hhE5xmoQa4HSfvB/SahN3JOzljhpKEVABrPFfgBtMPw57HFI/SY4X0
-+P4Uvc95C/KHisKv56PXq/3YSJs4wWY7nHdMNn7VKajvQ12HMQAZ+9nlUqeo7Crh
-npeGWSfCa3GJLtEYDbdWEIQdj5aJRgsV2EdSplgB23W/o5H4mvip90bWxKJdu0Av
-oeRBRK2PKulEhMstu76LPfv/oAA1hYWaPoIkQGsotqlAl3tvG1+/W9VCwcPuH/nQ
-WHgEVQZSqFt3m+FzghJRRQvGe7foGZoddosgg3tLgrzaWF+Vr8SkzRNlvdBdK/rU
-cJA93fCpqCNEcakWGckj7E/ieF/X9MKTS7c3Ui83BpY2jmQ9U3fX8g+44UsO2w4A
-a8vDEfSWxvi6ARpCFm1bcC8P5WcwHW/f72CcmM1RwWQBLKE=
-
-
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.cedia.org.ec:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.cedia.org.ec:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.cedia.org.ec/idp/profile/SAML2/Redirect/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.cedia.org.ec/idp/profile/SAML2/POST/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.cedia.org.ec: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.cedia.org.ec/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.cedia.org.ec/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.cedia.org.ec/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.cedia.org.ec/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">org.ec</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIHnzCCBYegAwIBAgIBCDANBgkqhkiG9w0BAQUFADCBvzELMAkGA1UEBhMCRUMx
-DjAMBgNVBAgTBUF6dWF5MQ8wDQYDVQQHEwZDdWVuY2ExDjAMBgNVBAoTBUNFRElB
-MUYwRAYDVQQLEz1Db25zb3JjaW8gRWN1YXRvcmlhbm8gcGFyYSBlbCBEZXNhcnJv
-bGxvIGRlIEludGVybmV0IEF2YW56YWRvMRYwFAYDVQQDEw1jYS5lZHVyb2FtLmVj
-MR8wHQYJKoZIhvcNAQkBFhBuZWdAY2VkaWEub3JnLmVjMB4XDTE0MDIwMTAxMjU0
-OFoXDTE2MDIwMTAxMjU0OFowgcIxCzAJBgNVBAYTAkVDMQ4wDAYDVQQIEwVBenVh
-eTEPMA0GA1UEBxMGQ3VlbmNhMQ4wDAYDVQQKEwVDRURJQTFGMEQGA1UECxM9Q29u
-c29yY2lvIEVjdWF0b3JpYW5vIHBhcmEgZWwgRGVzYXJyb2xsbyBkZSBJbnRlcm5l
-dCBBdmFuemFkbzEZMBcGA1UEAxMQaWRwLmNlZGlhLm9yZy5lYzEfMB0GCSqGSIb3
-DQEJARYQbmVnQGNlZGlhLm9yZy5lYzCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCC
-AgoCggIBAKSsCSs49O1Pt5o6DSOaCGd5tzQALUWSn+MaOJEf/T+OlO47Ao1b5mz2
-Qn2+2fKhjNfTmxEaLCGkrtlMfZvGpVCpatYjVOqw1faGHc/MoohcsgjQQhUMEUBd
-Ez9UV9z4ogC5mWE9KoVlUbCT8+z2TfU4qlQgB/nOx0F71Frnex9cRhkmiYI2z8OC
-Gmeio8wxXU0jYvEYv3Hk6/Q+dPOIKwyPItk9rg/gL/aVor2uAZ6B6UJiasU7riOq
-qth/6cnriUymDX04wSJZWGfAX+/IJ1VRwPyYAT/szRMVoBzV/bEWgRnO2zTGjLn0
-/zS76W7JAdVu5i/x3nrZL00dzu8wFAZmC4CurMznL8Rz1CI7u/F/TJjpq6Tgw+fT
-jzL9pBn95sLe0dQzsxWJ4COe/yK/ANO1LhDUUGV83nHVLMphfUsHj9bh2NTtECbt
-uKVmnSRLLtXPION6r+arqXfWqSN0EqfVZGdFK+Z+dAaVtr1BX2sXZVm1pQNpjNeJ
-fcMrpDPGSQXPCLZfVAmfvHGsXvq6VDmv1dXULUFauTGnsXbG1GkRGU70A5CR2oyF
-RWnL/5nMXAnIb8trJmN2u6kIKV+AyjeNKgn3OnT5xSW1XD66nhzTtOhnGzuCPcH/
-2wG0fyUCshwc1gY2Tl2u8YplLndWlTXFvFUMyWzyBXAyKtAR53KhAgMBAAGjggGf
-MIIBmzAJBgNVHRMEAjAAMBEGCWCGSAGG+EIBAQQEAwIGQDArBglghkgBhvhCAQ0E
-HhYcVGlueUNBIEdlbmVyYXRlZCBDZXJ0aWZpY2F0ZTAdBgNVHQ4EFgQUpu+3H1k4
-WykGUu2yNZioiqwV6HAwgfQGA1UdIwSB7DCB6YAUXr5EvOJqnceMOEVQzXKYLF9c
-/jOhgcWkgcIwgb8xCzAJBgNVBAYTAkVDMQ4wDAYDVQQIEwVBenVheTEPMA0GA1UE
-BxMGQ3VlbmNhMQ4wDAYDVQQKEwVDRURJQTFGMEQGA1UECxM9Q29uc29yY2lvIEVj
-dWF0b3JpYW5vIHBhcmEgZWwgRGVzYXJyb2xsbyBkZSBJbnRlcm5ldCBBdmFuemFk
-bzEWMBQGA1UEAxMNY2EuZWR1cm9hbS5lYzEfMB0GCSqGSIb3DQEJARYQbmVnQGNl
-ZGlhLm9yZy5lY4IJANQ3cRbGqAp6MBsGA1UdEgQUMBKBEG5lZ0BjZWRpYS5vcmcu
-ZWMwGwYDVR0RBBQwEoEQbmVnQGNlZGlhLm9yZy5lYzANBgkqhkiG9w0BAQUFAAOC
-AgEAUbDgG1MR04EhdgEQUTt99d2ipr7ehfMKwfm7W3XiaHzqXOmqsogjlOJVBkUo
-4+PWVC0kfy7pOI0CWji7TfmKsh6iW9peM5TT2Iir/NLZD2PJl9EiOgSavmtjlL3N
-Dm0pBh0dpYXxJQpPtWjYntuuP6YLpQHM0PUgOhbGe9N3d3k1DZHOtDaOcA7UjKcW
-PvsCD3+jciSw33//J/asuixqvpoxZO1TUQbFm9HpLgEiw4iPVu/lo7mEsuz4LxQd
-N00udea/m/hhE5xmoQa4HSfvB/SahN3JOzljhpKEVABrPFfgBtMPw57HFI/SY4X0
-+P4Uvc95C/KHisKv56PXq/3YSJs4wWY7nHdMNn7VKajvQ12HMQAZ+9nlUqeo7Crh
-npeGWSfCa3GJLtEYDbdWEIQdj5aJRgsV2EdSplgB23W/o5H4mvip90bWxKJdu0Av
-oeRBRK2PKulEhMstu76LPfv/oAA1hYWaPoIkQGsotqlAl3tvG1+/W9VCwcPuH/nQ
-WHgEVQZSqFt3m+FzghJRRQvGe7foGZoddosgg3tLgrzaWF+Vr8SkzRNlvdBdK/rU
-cJA93fCpqCNEcakWGckj7E/ieF/X9MKTS7c3Ui83BpY2jmQ9U3fX8g+44UsO2w4A
-a8vDEfSWxvi6ARpCFm1bcC8P5WcwHW/f72CcmM1RwWQBLKE=
-
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.cedia.org.ec:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.cedia.org.ec: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">CEDIA - Consorcio Ecuatoriano para el desarrollo de Internet Avanzado</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">CEDIA - Consorcio Ecuatoriano para el desarrollo de Internet Avanzado</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.cedia.org.ec/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Claudio Chacon A</SurName>
-    <EmailAddress>neg@cedia.org.ec</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.cedia.org.ec.xml b/swamid-interfederations-2.0/idp.cedia.org.ec.xml
deleted file mode 100644
index 8d2f3717..00000000
--- a/swamid-interfederations-2.0/idp.cedia.org.ec.xml
+++ /dev/null
@@ -1,161 +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://idp.cedia.org.ec/idp/shibboleth">
-  <md:Extensions xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata">
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://minga.cedia.org.ec" registrationInstant="2014-08-28T00:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="es">
-                                http://www.cedia.org.ec/minga
-                        </mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </md:Extensions>
-  <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 xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata">
-      <shibmd:Scope regexp="false">cedia.org.ec</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">CEDIA</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="es">CEDIA</mdui:DisplayName>
-        <mdui:Description xml:lang="en">
-                                CEDIA - Ecuadorean Consortium for Advanced Internet Development
-                        </mdui:Description>
-        <mdui:Description xml:lang="es">
-                                CEDIA - Consorcio Ecuatoriano para el Desarrollo de Internet Avanzado
-                        </mdui:Description>
-        <mdui:InformationURL xml:lang="en">
-                                http://www.cedia.org.ec
-                        </mdui:InformationURL>
-        <mdui:InformationURL xml:lang="es">
-                                http://www.cedia.org.ec
-                        </mdui:InformationURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIHnzCCBYegAwIBAgIBCDANBgkqhkiG9w0BAQUFADCBvzELMAkGA1UEBhMCRUMx
-DjAMBgNVBAgTBUF6dWF5MQ8wDQYDVQQHEwZDdWVuY2ExDjAMBgNVBAoTBUNFRElB
-MUYwRAYDVQQLEz1Db25zb3JjaW8gRWN1YXRvcmlhbm8gcGFyYSBlbCBEZXNhcnJv
-bGxvIGRlIEludGVybmV0IEF2YW56YWRvMRYwFAYDVQQDEw1jYS5lZHVyb2FtLmVj
-MR8wHQYJKoZIhvcNAQkBFhBuZWdAY2VkaWEub3JnLmVjMB4XDTE0MDIwMTAxMjU0
-OFoXDTE2MDIwMTAxMjU0OFowgcIxCzAJBgNVBAYTAkVDMQ4wDAYDVQQIEwVBenVh
-eTEPMA0GA1UEBxMGQ3VlbmNhMQ4wDAYDVQQKEwVDRURJQTFGMEQGA1UECxM9Q29u
-c29yY2lvIEVjdWF0b3JpYW5vIHBhcmEgZWwgRGVzYXJyb2xsbyBkZSBJbnRlcm5l
-dCBBdmFuemFkbzEZMBcGA1UEAxMQaWRwLmNlZGlhLm9yZy5lYzEfMB0GCSqGSIb3
-DQEJARYQbmVnQGNlZGlhLm9yZy5lYzCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCC
-AgoCggIBAKSsCSs49O1Pt5o6DSOaCGd5tzQALUWSn+MaOJEf/T+OlO47Ao1b5mz2
-Qn2+2fKhjNfTmxEaLCGkrtlMfZvGpVCpatYjVOqw1faGHc/MoohcsgjQQhUMEUBd
-Ez9UV9z4ogC5mWE9KoVlUbCT8+z2TfU4qlQgB/nOx0F71Frnex9cRhkmiYI2z8OC
-Gmeio8wxXU0jYvEYv3Hk6/Q+dPOIKwyPItk9rg/gL/aVor2uAZ6B6UJiasU7riOq
-qth/6cnriUymDX04wSJZWGfAX+/IJ1VRwPyYAT/szRMVoBzV/bEWgRnO2zTGjLn0
-/zS76W7JAdVu5i/x3nrZL00dzu8wFAZmC4CurMznL8Rz1CI7u/F/TJjpq6Tgw+fT
-jzL9pBn95sLe0dQzsxWJ4COe/yK/ANO1LhDUUGV83nHVLMphfUsHj9bh2NTtECbt
-uKVmnSRLLtXPION6r+arqXfWqSN0EqfVZGdFK+Z+dAaVtr1BX2sXZVm1pQNpjNeJ
-fcMrpDPGSQXPCLZfVAmfvHGsXvq6VDmv1dXULUFauTGnsXbG1GkRGU70A5CR2oyF
-RWnL/5nMXAnIb8trJmN2u6kIKV+AyjeNKgn3OnT5xSW1XD66nhzTtOhnGzuCPcH/
-2wG0fyUCshwc1gY2Tl2u8YplLndWlTXFvFUMyWzyBXAyKtAR53KhAgMBAAGjggGf
-MIIBmzAJBgNVHRMEAjAAMBEGCWCGSAGG+EIBAQQEAwIGQDArBglghkgBhvhCAQ0E
-HhYcVGlueUNBIEdlbmVyYXRlZCBDZXJ0aWZpY2F0ZTAdBgNVHQ4EFgQUpu+3H1k4
-WykGUu2yNZioiqwV6HAwgfQGA1UdIwSB7DCB6YAUXr5EvOJqnceMOEVQzXKYLF9c
-/jOhgcWkgcIwgb8xCzAJBgNVBAYTAkVDMQ4wDAYDVQQIEwVBenVheTEPMA0GA1UE
-BxMGQ3VlbmNhMQ4wDAYDVQQKEwVDRURJQTFGMEQGA1UECxM9Q29uc29yY2lvIEVj
-dWF0b3JpYW5vIHBhcmEgZWwgRGVzYXJyb2xsbyBkZSBJbnRlcm5ldCBBdmFuemFk
-bzEWMBQGA1UEAxMNY2EuZWR1cm9hbS5lYzEfMB0GCSqGSIb3DQEJARYQbmVnQGNl
-ZGlhLm9yZy5lY4IJANQ3cRbGqAp6MBsGA1UdEgQUMBKBEG5lZ0BjZWRpYS5vcmcu
-ZWMwGwYDVR0RBBQwEoEQbmVnQGNlZGlhLm9yZy5lYzANBgkqhkiG9w0BAQUFAAOC
-AgEAUbDgG1MR04EhdgEQUTt99d2ipr7ehfMKwfm7W3XiaHzqXOmqsogjlOJVBkUo
-4+PWVC0kfy7pOI0CWji7TfmKsh6iW9peM5TT2Iir/NLZD2PJl9EiOgSavmtjlL3N
-Dm0pBh0dpYXxJQpPtWjYntuuP6YLpQHM0PUgOhbGe9N3d3k1DZHOtDaOcA7UjKcW
-PvsCD3+jciSw33//J/asuixqvpoxZO1TUQbFm9HpLgEiw4iPVu/lo7mEsuz4LxQd
-N00udea/m/hhE5xmoQa4HSfvB/SahN3JOzljhpKEVABrPFfgBtMPw57HFI/SY4X0
-+P4Uvc95C/KHisKv56PXq/3YSJs4wWY7nHdMNn7VKajvQ12HMQAZ+9nlUqeo7Crh
-npeGWSfCa3GJLtEYDbdWEIQdj5aJRgsV2EdSplgB23W/o5H4mvip90bWxKJdu0Av
-oeRBRK2PKulEhMstu76LPfv/oAA1hYWaPoIkQGsotqlAl3tvG1+/W9VCwcPuH/nQ
-WHgEVQZSqFt3m+FzghJRRQvGe7foGZoddosgg3tLgrzaWF+Vr8SkzRNlvdBdK/rU
-cJA93fCpqCNEcakWGckj7E/ieF/X9MKTS7c3Ui83BpY2jmQ9U3fX8g+44UsO2w4A
-a8vDEfSWxvi6ARpCFm1bcC8P5WcwHW/f72CcmM1RwWQBLKE=
-
-
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.cedia.org.ec:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.cedia.org.ec:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.cedia.org.ec/idp/profile/SAML2/Redirect/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.cedia.org.ec/idp/profile/SAML2/POST/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.cedia.org.ec: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.cedia.org.ec/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.cedia.org.ec/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.cedia.org.ec/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.cedia.org.ec/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">org.ec</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIHnzCCBYegAwIBAgIBCDANBgkqhkiG9w0BAQUFADCBvzELMAkGA1UEBhMCRUMx
-DjAMBgNVBAgTBUF6dWF5MQ8wDQYDVQQHEwZDdWVuY2ExDjAMBgNVBAoTBUNFRElB
-MUYwRAYDVQQLEz1Db25zb3JjaW8gRWN1YXRvcmlhbm8gcGFyYSBlbCBEZXNhcnJv
-bGxvIGRlIEludGVybmV0IEF2YW56YWRvMRYwFAYDVQQDEw1jYS5lZHVyb2FtLmVj
-MR8wHQYJKoZIhvcNAQkBFhBuZWdAY2VkaWEub3JnLmVjMB4XDTE0MDIwMTAxMjU0
-OFoXDTE2MDIwMTAxMjU0OFowgcIxCzAJBgNVBAYTAkVDMQ4wDAYDVQQIEwVBenVh
-eTEPMA0GA1UEBxMGQ3VlbmNhMQ4wDAYDVQQKEwVDRURJQTFGMEQGA1UECxM9Q29u
-c29yY2lvIEVjdWF0b3JpYW5vIHBhcmEgZWwgRGVzYXJyb2xsbyBkZSBJbnRlcm5l
-dCBBdmFuemFkbzEZMBcGA1UEAxMQaWRwLmNlZGlhLm9yZy5lYzEfMB0GCSqGSIb3
-DQEJARYQbmVnQGNlZGlhLm9yZy5lYzCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCC
-AgoCggIBAKSsCSs49O1Pt5o6DSOaCGd5tzQALUWSn+MaOJEf/T+OlO47Ao1b5mz2
-Qn2+2fKhjNfTmxEaLCGkrtlMfZvGpVCpatYjVOqw1faGHc/MoohcsgjQQhUMEUBd
-Ez9UV9z4ogC5mWE9KoVlUbCT8+z2TfU4qlQgB/nOx0F71Frnex9cRhkmiYI2z8OC
-Gmeio8wxXU0jYvEYv3Hk6/Q+dPOIKwyPItk9rg/gL/aVor2uAZ6B6UJiasU7riOq
-qth/6cnriUymDX04wSJZWGfAX+/IJ1VRwPyYAT/szRMVoBzV/bEWgRnO2zTGjLn0
-/zS76W7JAdVu5i/x3nrZL00dzu8wFAZmC4CurMznL8Rz1CI7u/F/TJjpq6Tgw+fT
-jzL9pBn95sLe0dQzsxWJ4COe/yK/ANO1LhDUUGV83nHVLMphfUsHj9bh2NTtECbt
-uKVmnSRLLtXPION6r+arqXfWqSN0EqfVZGdFK+Z+dAaVtr1BX2sXZVm1pQNpjNeJ
-fcMrpDPGSQXPCLZfVAmfvHGsXvq6VDmv1dXULUFauTGnsXbG1GkRGU70A5CR2oyF
-RWnL/5nMXAnIb8trJmN2u6kIKV+AyjeNKgn3OnT5xSW1XD66nhzTtOhnGzuCPcH/
-2wG0fyUCshwc1gY2Tl2u8YplLndWlTXFvFUMyWzyBXAyKtAR53KhAgMBAAGjggGf
-MIIBmzAJBgNVHRMEAjAAMBEGCWCGSAGG+EIBAQQEAwIGQDArBglghkgBhvhCAQ0E
-HhYcVGlueUNBIEdlbmVyYXRlZCBDZXJ0aWZpY2F0ZTAdBgNVHQ4EFgQUpu+3H1k4
-WykGUu2yNZioiqwV6HAwgfQGA1UdIwSB7DCB6YAUXr5EvOJqnceMOEVQzXKYLF9c
-/jOhgcWkgcIwgb8xCzAJBgNVBAYTAkVDMQ4wDAYDVQQIEwVBenVheTEPMA0GA1UE
-BxMGQ3VlbmNhMQ4wDAYDVQQKEwVDRURJQTFGMEQGA1UECxM9Q29uc29yY2lvIEVj
-dWF0b3JpYW5vIHBhcmEgZWwgRGVzYXJyb2xsbyBkZSBJbnRlcm5ldCBBdmFuemFk
-bzEWMBQGA1UEAxMNY2EuZWR1cm9hbS5lYzEfMB0GCSqGSIb3DQEJARYQbmVnQGNl
-ZGlhLm9yZy5lY4IJANQ3cRbGqAp6MBsGA1UdEgQUMBKBEG5lZ0BjZWRpYS5vcmcu
-ZWMwGwYDVR0RBBQwEoEQbmVnQGNlZGlhLm9yZy5lYzANBgkqhkiG9w0BAQUFAAOC
-AgEAUbDgG1MR04EhdgEQUTt99d2ipr7ehfMKwfm7W3XiaHzqXOmqsogjlOJVBkUo
-4+PWVC0kfy7pOI0CWji7TfmKsh6iW9peM5TT2Iir/NLZD2PJl9EiOgSavmtjlL3N
-Dm0pBh0dpYXxJQpPtWjYntuuP6YLpQHM0PUgOhbGe9N3d3k1DZHOtDaOcA7UjKcW
-PvsCD3+jciSw33//J/asuixqvpoxZO1TUQbFm9HpLgEiw4iPVu/lo7mEsuz4LxQd
-N00udea/m/hhE5xmoQa4HSfvB/SahN3JOzljhpKEVABrPFfgBtMPw57HFI/SY4X0
-+P4Uvc95C/KHisKv56PXq/3YSJs4wWY7nHdMNn7VKajvQ12HMQAZ+9nlUqeo7Crh
-npeGWSfCa3GJLtEYDbdWEIQdj5aJRgsV2EdSplgB23W/o5H4mvip90bWxKJdu0Av
-oeRBRK2PKulEhMstu76LPfv/oAA1hYWaPoIkQGsotqlAl3tvG1+/W9VCwcPuH/nQ
-WHgEVQZSqFt3m+FzghJRRQvGe7foGZoddosgg3tLgrzaWF+Vr8SkzRNlvdBdK/rU
-cJA93fCpqCNEcakWGckj7E/ieF/X9MKTS7c3Ui83BpY2jmQ9U3fX8g+44UsO2w4A
-a8vDEfSWxvi6ARpCFm1bcC8P5WcwHW/f72CcmM1RwWQBLKE=
-
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.cedia.org.ec:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.cedia.org.ec: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">CEDIA - Consorcio Ecuatoriano para el desarrollo de Internet Avanzado</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">CEDIA - Consorcio Ecuatoriano para el desarrollo de Internet Avanzado</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.cedia.org.ec/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Claudio Chacon A</SurName>
-    <EmailAddress>neg@cedia.org.ec</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.cereq.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.cereq.fr-idp-shibboleth.xml
deleted file mode 100644
index c88a4c48..00000000
--- a/swamid-interfederations-2.0/idp.cereq.fr-idp-shibboleth.xml
+++ /dev/null
@@ -1,88 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.cereq.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2013-10-29T11:42:20Z">
-      <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">cereq.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">CEREQ - Centre d'études et de recherches sur les qualifications</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDHDCCAgSgAwIBAgIVAOjMbhrsfOCDjExPYxhACw4jRvB6MA0GCSqGSIb3DQEB
-BQUAMBcxFTATBgNVBAMTDGlkcC5jZXJlcS5mcjAeFw0xMzA5MjcwOTA0MDJaFw0x
-NjA5MjcwOTA0MDJaMBcxFTATBgNVBAMTDGlkcC5jZXJlcS5mcjCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBAJgjISx2Xe/SFbLNuYAxijARJxrqmqAxSr+h
-l4id6zNomZYbjFZdQYVNhx2L7opOH3/9ADiMO1a8Ve+yG8Gof2fYXl3bMd/XL7Hb
-SS0eBc5a3H0b1U8gGEp9kfDSXYijDYV9HHmstvju8j99RHZejnXrmiUioG6P4qU0
-raMTTBASqFBfDruGS1UiPYPAq/C7cqgnyNI4sm7jSvbzonrGSbs1XlHM0bdhFL+O
-eoZ9yS8fTIMD2vVsZii541/K3V9CMhOAoBG8SA2YAejVWOZwJdMvmpK4X3/GLwoG
-UIF+HUeQYbvc3XZqh8IzWHF81RIjxpU1KGp39T3TUdDK/L9tMasCAwEAAaNfMF0w
-PAYDVR0RBDUwM4IMaWRwLmNlcmVxLmZyhiNodHRwczovL2lkcC5jZXJlcS5mci9p
-ZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQU8nfoSUP0/WYyq31ReN3zCpK32XAwDQYJ
-KoZIhvcNAQEFBQADggEBAIx3XQUabG1j7RIk67rwMEIXqeYNGt1eakcqwwaq4UKG
-4hSJbUUoR+MET7C6PrvKq2lafC4Za14xO9CjFFnuroCReSJ9pfRV6hR+1qnpwhhB
-GhTgaMJY1QPLfvI12pJjFf5deMIZ2Uet70h+haXLyiimkezT3lzsvT3DGVkD8BnK
-OBtxuHB99XtrB8VrDGqpw5x7VuiiApy5MeMlduhrXskS4+V2q5TOs4jbcrEc78iy
-Vhfsf5Rcol2AkYmeLthOcledgXQtj0r0mOxA1FDH3NBuCBKavpg20gnMlZ8gfAG1
-wsA88wxSrNn+0crrQBnCCoFM6QgGRbFes23UYMEEbw0=
-					    </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://idp.cereq.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.cereq.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.cereq.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">cereq.fr</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDHDCCAgSgAwIBAgIVAOjMbhrsfOCDjExPYxhACw4jRvB6MA0GCSqGSIb3DQEB
-BQUAMBcxFTATBgNVBAMTDGlkcC5jZXJlcS5mcjAeFw0xMzA5MjcwOTA0MDJaFw0x
-NjA5MjcwOTA0MDJaMBcxFTATBgNVBAMTDGlkcC5jZXJlcS5mcjCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBAJgjISx2Xe/SFbLNuYAxijARJxrqmqAxSr+h
-l4id6zNomZYbjFZdQYVNhx2L7opOH3/9ADiMO1a8Ve+yG8Gof2fYXl3bMd/XL7Hb
-SS0eBc5a3H0b1U8gGEp9kfDSXYijDYV9HHmstvju8j99RHZejnXrmiUioG6P4qU0
-raMTTBASqFBfDruGS1UiPYPAq/C7cqgnyNI4sm7jSvbzonrGSbs1XlHM0bdhFL+O
-eoZ9yS8fTIMD2vVsZii541/K3V9CMhOAoBG8SA2YAejVWOZwJdMvmpK4X3/GLwoG
-UIF+HUeQYbvc3XZqh8IzWHF81RIjxpU1KGp39T3TUdDK/L9tMasCAwEAAaNfMF0w
-PAYDVR0RBDUwM4IMaWRwLmNlcmVxLmZyhiNodHRwczovL2lkcC5jZXJlcS5mci9p
-ZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQU8nfoSUP0/WYyq31ReN3zCpK32XAwDQYJ
-KoZIhvcNAQEFBQADggEBAIx3XQUabG1j7RIk67rwMEIXqeYNGt1eakcqwwaq4UKG
-4hSJbUUoR+MET7C6PrvKq2lafC4Za14xO9CjFFnuroCReSJ9pfRV6hR+1qnpwhhB
-GhTgaMJY1QPLfvI12pJjFf5deMIZ2Uet70h+haXLyiimkezT3lzsvT3DGVkD8BnK
-OBtxuHB99XtrB8VrDGqpw5x7VuiiApy5MeMlduhrXskS4+V2q5TOs4jbcrEc78iy
-Vhfsf5Rcol2AkYmeLthOcledgXQtj0r0mOxA1FDH3NBuCBKavpg20gnMlZ8gfAG1
-wsA88wxSrNn+0crrQBnCCoFM6QgGRbFes23UYMEEbw0=
-					    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.cereq.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">CEREQ - Centre d'études et de recherches sur les qualifications</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">CEREQ - Centre d'études et de recherches sur les qualifications</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Jean Pele</SurName>
-    <EmailAddress>pele@cereq.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.cereq.fr.xml b/swamid-interfederations-2.0/idp.cereq.fr.xml
deleted file mode 100644
index c88a4c48..00000000
--- a/swamid-interfederations-2.0/idp.cereq.fr.xml
+++ /dev/null
@@ -1,88 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.cereq.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2013-10-29T11:42:20Z">
-      <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">cereq.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">CEREQ - Centre d'études et de recherches sur les qualifications</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDHDCCAgSgAwIBAgIVAOjMbhrsfOCDjExPYxhACw4jRvB6MA0GCSqGSIb3DQEB
-BQUAMBcxFTATBgNVBAMTDGlkcC5jZXJlcS5mcjAeFw0xMzA5MjcwOTA0MDJaFw0x
-NjA5MjcwOTA0MDJaMBcxFTATBgNVBAMTDGlkcC5jZXJlcS5mcjCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBAJgjISx2Xe/SFbLNuYAxijARJxrqmqAxSr+h
-l4id6zNomZYbjFZdQYVNhx2L7opOH3/9ADiMO1a8Ve+yG8Gof2fYXl3bMd/XL7Hb
-SS0eBc5a3H0b1U8gGEp9kfDSXYijDYV9HHmstvju8j99RHZejnXrmiUioG6P4qU0
-raMTTBASqFBfDruGS1UiPYPAq/C7cqgnyNI4sm7jSvbzonrGSbs1XlHM0bdhFL+O
-eoZ9yS8fTIMD2vVsZii541/K3V9CMhOAoBG8SA2YAejVWOZwJdMvmpK4X3/GLwoG
-UIF+HUeQYbvc3XZqh8IzWHF81RIjxpU1KGp39T3TUdDK/L9tMasCAwEAAaNfMF0w
-PAYDVR0RBDUwM4IMaWRwLmNlcmVxLmZyhiNodHRwczovL2lkcC5jZXJlcS5mci9p
-ZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQU8nfoSUP0/WYyq31ReN3zCpK32XAwDQYJ
-KoZIhvcNAQEFBQADggEBAIx3XQUabG1j7RIk67rwMEIXqeYNGt1eakcqwwaq4UKG
-4hSJbUUoR+MET7C6PrvKq2lafC4Za14xO9CjFFnuroCReSJ9pfRV6hR+1qnpwhhB
-GhTgaMJY1QPLfvI12pJjFf5deMIZ2Uet70h+haXLyiimkezT3lzsvT3DGVkD8BnK
-OBtxuHB99XtrB8VrDGqpw5x7VuiiApy5MeMlduhrXskS4+V2q5TOs4jbcrEc78iy
-Vhfsf5Rcol2AkYmeLthOcledgXQtj0r0mOxA1FDH3NBuCBKavpg20gnMlZ8gfAG1
-wsA88wxSrNn+0crrQBnCCoFM6QgGRbFes23UYMEEbw0=
-					    </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://idp.cereq.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.cereq.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.cereq.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">cereq.fr</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDHDCCAgSgAwIBAgIVAOjMbhrsfOCDjExPYxhACw4jRvB6MA0GCSqGSIb3DQEB
-BQUAMBcxFTATBgNVBAMTDGlkcC5jZXJlcS5mcjAeFw0xMzA5MjcwOTA0MDJaFw0x
-NjA5MjcwOTA0MDJaMBcxFTATBgNVBAMTDGlkcC5jZXJlcS5mcjCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBAJgjISx2Xe/SFbLNuYAxijARJxrqmqAxSr+h
-l4id6zNomZYbjFZdQYVNhx2L7opOH3/9ADiMO1a8Ve+yG8Gof2fYXl3bMd/XL7Hb
-SS0eBc5a3H0b1U8gGEp9kfDSXYijDYV9HHmstvju8j99RHZejnXrmiUioG6P4qU0
-raMTTBASqFBfDruGS1UiPYPAq/C7cqgnyNI4sm7jSvbzonrGSbs1XlHM0bdhFL+O
-eoZ9yS8fTIMD2vVsZii541/K3V9CMhOAoBG8SA2YAejVWOZwJdMvmpK4X3/GLwoG
-UIF+HUeQYbvc3XZqh8IzWHF81RIjxpU1KGp39T3TUdDK/L9tMasCAwEAAaNfMF0w
-PAYDVR0RBDUwM4IMaWRwLmNlcmVxLmZyhiNodHRwczovL2lkcC5jZXJlcS5mci9p
-ZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQU8nfoSUP0/WYyq31ReN3zCpK32XAwDQYJ
-KoZIhvcNAQEFBQADggEBAIx3XQUabG1j7RIk67rwMEIXqeYNGt1eakcqwwaq4UKG
-4hSJbUUoR+MET7C6PrvKq2lafC4Za14xO9CjFFnuroCReSJ9pfRV6hR+1qnpwhhB
-GhTgaMJY1QPLfvI12pJjFf5deMIZ2Uet70h+haXLyiimkezT3lzsvT3DGVkD8BnK
-OBtxuHB99XtrB8VrDGqpw5x7VuiiApy5MeMlduhrXskS4+V2q5TOs4jbcrEc78iy
-Vhfsf5Rcol2AkYmeLthOcledgXQtj0r0mOxA1FDH3NBuCBKavpg20gnMlZ8gfAG1
-wsA88wxSrNn+0crrQBnCCoFM6QgGRbFes23UYMEEbw0=
-					    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.cereq.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">CEREQ - Centre d'études et de recherches sur les qualifications</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">CEREQ - Centre d'études et de recherches sur les qualifications</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Jean Pele</SurName>
-    <EmailAddress>pele@cereq.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.cirad.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.cirad.fr-idp-shibboleth.xml
deleted file mode 100644
index d4c196d2..00000000
--- a/swamid-interfederations-2.0/idp.cirad.fr-idp-shibboleth.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://idp.cirad.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2012-01-30T14:52:31Z">
-      <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">cirad.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">CIRAD</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDHDCCAgSgAwIBAgIVAIpsWCg8y/CbjokdRD9xw1tntEMjMA0GCSqGSIb3DQEB
-BQUAMBcxFTATBgNVBAMTDGlkcC5jaXJhZC5mcjAeFw0xMTA5MDkxMjEwMTZaFw0z
-MTA5MDkxMjEwMTZaMBcxFTATBgNVBAMTDGlkcC5jaXJhZC5mcjCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBAIK0BA0EwHBB7StG57NlgpNBqyQEM1Cg9QYw
-pNUPFGF4Jdxkho0yFmo5P++oTVHNl0XAYuDYXDOSShnwBuaqBETJJ2oXmHNtL1/J
-C8T/hXboKgs0gRz8vmSah7xaEFtsGrlhWfomY7JJg0tLfEOioP8gtcXDoujhsnmg
-k31s1ItCWqLMyKfUVJq/UjldS3yO4UHvWaM72Pr8/BhaeboLsAodOVuuARyB53cN
-lK5lbJ+wv/ar/OvKZQ6J+N38jRID9gOfbX9FJpEkxvsw8JrAigyVXoxXqwGeHSt+
-ku5mPLHOkcfeqoDOYlZAGOhr0Dsgq58TdYyfDfd/vvkUjhGXDUECAwEAAaNfMF0w
-PAYDVR0RBDUwM4IMaWRwLmNpcmFkLmZyhiNodHRwczovL2lkcC5jaXJhZC5mci9p
-ZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUqRmJdkayB7m9gT7Hlj7ZWMvTxj4wDQYJ
-KoZIhvcNAQEFBQADggEBACYw1tFvkAe2ITVFgPC+DObsRMo+0IsLTDp04SDoic6p
-8LwkBedIsHMast0CX3oVHM31Wo9n1boW8qDJ+cd5u5adT9ZdxYiqqH6VCF3xSLr9
-I3Fjlm4KLIDYh9w7jhOIPPkvK5491naqIGcyrwxkpmttm2LsdUTrk3Fc0LylLBly
-W/S4lmyzcH5A+zobfOREY1nThRnVvLsAuvmD6W44sRodxDitH6MBst4Cw18LpTHk
-7ZKBQ87Qbdtbk1Se9lrDplk20K5lBisEEM5W+/W6lbqJCim24CPO8s8jq0af2ahM
-RIDZRysGp5esSU0Sm4xoDDASmC49fVStwwYMtq6P+T0=
-					    </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://idp.cirad.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.cirad.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.cirad.fr/idp/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">CIRAD</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">CIRAD</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Frédéric MAZZINI</SurName>
-    <EmailAddress>frederic.mazzini@cirad.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.cirad.fr.xml b/swamid-interfederations-2.0/idp.cirad.fr.xml
deleted file mode 100644
index d4c196d2..00000000
--- a/swamid-interfederations-2.0/idp.cirad.fr.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://idp.cirad.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2012-01-30T14:52:31Z">
-      <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">cirad.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">CIRAD</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDHDCCAgSgAwIBAgIVAIpsWCg8y/CbjokdRD9xw1tntEMjMA0GCSqGSIb3DQEB
-BQUAMBcxFTATBgNVBAMTDGlkcC5jaXJhZC5mcjAeFw0xMTA5MDkxMjEwMTZaFw0z
-MTA5MDkxMjEwMTZaMBcxFTATBgNVBAMTDGlkcC5jaXJhZC5mcjCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBAIK0BA0EwHBB7StG57NlgpNBqyQEM1Cg9QYw
-pNUPFGF4Jdxkho0yFmo5P++oTVHNl0XAYuDYXDOSShnwBuaqBETJJ2oXmHNtL1/J
-C8T/hXboKgs0gRz8vmSah7xaEFtsGrlhWfomY7JJg0tLfEOioP8gtcXDoujhsnmg
-k31s1ItCWqLMyKfUVJq/UjldS3yO4UHvWaM72Pr8/BhaeboLsAodOVuuARyB53cN
-lK5lbJ+wv/ar/OvKZQ6J+N38jRID9gOfbX9FJpEkxvsw8JrAigyVXoxXqwGeHSt+
-ku5mPLHOkcfeqoDOYlZAGOhr0Dsgq58TdYyfDfd/vvkUjhGXDUECAwEAAaNfMF0w
-PAYDVR0RBDUwM4IMaWRwLmNpcmFkLmZyhiNodHRwczovL2lkcC5jaXJhZC5mci9p
-ZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUqRmJdkayB7m9gT7Hlj7ZWMvTxj4wDQYJ
-KoZIhvcNAQEFBQADggEBACYw1tFvkAe2ITVFgPC+DObsRMo+0IsLTDp04SDoic6p
-8LwkBedIsHMast0CX3oVHM31Wo9n1boW8qDJ+cd5u5adT9ZdxYiqqH6VCF3xSLr9
-I3Fjlm4KLIDYh9w7jhOIPPkvK5491naqIGcyrwxkpmttm2LsdUTrk3Fc0LylLBly
-W/S4lmyzcH5A+zobfOREY1nThRnVvLsAuvmD6W44sRodxDitH6MBst4Cw18LpTHk
-7ZKBQ87Qbdtbk1Se9lrDplk20K5lBisEEM5W+/W6lbqJCim24CPO8s8jq0af2ahM
-RIDZRysGp5esSU0Sm4xoDDASmC49fVStwwYMtq6P+T0=
-					    </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://idp.cirad.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.cirad.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.cirad.fr/idp/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">CIRAD</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">CIRAD</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Frédéric MAZZINI</SurName>
-    <EmailAddress>frederic.mazzini@cirad.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.cnous.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.cnous.fr-idp-shibboleth.xml
deleted file mode 100644
index 08b91638..00000000
--- a/swamid-interfederations-2.0/idp.cnous.fr-idp-shibboleth.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.cnous.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2012-05-11T16:41:00Z">
-      <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">cnous.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">CNOUS</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDHDCCAgSgAwIBAgIVAISouLAcDEdM79Z0SpsLrgjU/8rtMA0GCSqGSIb3DQEB
-BQUAMBcxFTATBgNVBAMTDGlkcC5jbm91cy5mcjAeFw0xMjA1MDMxNTU4NTVaFw0z
-MjA1MDMxNTU4NTVaMBcxFTATBgNVBAMTDGlkcC5jbm91cy5mcjCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBALl+NBrwCB2xYd0y4dbi3QADG3oBYfNLiGJw
-rajvTmKUZaTKrQvgjtesfvM04pSOoMwRjkaG2ae3Pp/5fsuYc83zaOakgWSgc5/j
-zZfJOaxk+RGBofTInmWwgoCqDHGZ4WHLYphzwlLnV8VH6Ca7qa5bR+uEsZeLpICw
-C7d22rk2+llioeyFhwPMQBT9IRydChqGr79B7t1iT7ssTHP9v1ZDgtIB29+gkP4S
-YdzA11oZOJzeaGZXl0h9QsUBBnn6cyUgYE0SEgxBMl6+qlmQAuwrWO24pungPYx3
-C1k0i8xuFF3+98we5US4mQkRitgm0JVvB4pn6TtkgG+RTV+/uz8CAwEAAaNfMF0w
-PAYDVR0RBDUwM4IMaWRwLmNub3VzLmZyhiNodHRwczovL2lkcC5jbm91cy5mci9p
-ZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUPLiOl86NYkKW2Dz3T05kKwEcuCQwDQYJ
-KoZIhvcNAQEFBQADggEBAA9/88dlu6RIXF2MsXqLOFguSQcRXyjUe7qRbneRLhk7
-3m5pH/AKRWpgfWPllLy1ui8ZgJ3upJg8NDF9pipAXGm9XXUlYwgO/bD91o591iw+
-ffKTKQATF1SxMVKBwNtUOdR7HUaHNgz38w5DNd5DE0ZEAatVFsCbJdYG1WKgFPhU
-HB02bxkRdxUUgdWRL7WuldON2M3vefzJYqYd+Pu5+gP8I6HvgiLXvySmGroTnb2f
-RC6L4jwyDgp7R4rULrUz94moM+7O7Y95uDRxszNoDpFdKdcwD2yjYhBUrV6dPHHy
-gMoijoNgZZc/CqICHEnTC2xx4c9HR/114ON1vrxiYR4=
-					    </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://idp.cnous.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.cnous.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.cnous.fr/idp/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">CNOUS</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">CNOUS</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Christian Muller</SurName>
-    <EmailAddress>christian.muller@cnous.fr</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <SurName>José tripet</SurName>
-    <EmailAddress>jose.tripet@cnous.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.cnous.fr.xml b/swamid-interfederations-2.0/idp.cnous.fr.xml
deleted file mode 100644
index 08b91638..00000000
--- a/swamid-interfederations-2.0/idp.cnous.fr.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.cnous.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2012-05-11T16:41:00Z">
-      <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">cnous.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">CNOUS</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDHDCCAgSgAwIBAgIVAISouLAcDEdM79Z0SpsLrgjU/8rtMA0GCSqGSIb3DQEB
-BQUAMBcxFTATBgNVBAMTDGlkcC5jbm91cy5mcjAeFw0xMjA1MDMxNTU4NTVaFw0z
-MjA1MDMxNTU4NTVaMBcxFTATBgNVBAMTDGlkcC5jbm91cy5mcjCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBALl+NBrwCB2xYd0y4dbi3QADG3oBYfNLiGJw
-rajvTmKUZaTKrQvgjtesfvM04pSOoMwRjkaG2ae3Pp/5fsuYc83zaOakgWSgc5/j
-zZfJOaxk+RGBofTInmWwgoCqDHGZ4WHLYphzwlLnV8VH6Ca7qa5bR+uEsZeLpICw
-C7d22rk2+llioeyFhwPMQBT9IRydChqGr79B7t1iT7ssTHP9v1ZDgtIB29+gkP4S
-YdzA11oZOJzeaGZXl0h9QsUBBnn6cyUgYE0SEgxBMl6+qlmQAuwrWO24pungPYx3
-C1k0i8xuFF3+98we5US4mQkRitgm0JVvB4pn6TtkgG+RTV+/uz8CAwEAAaNfMF0w
-PAYDVR0RBDUwM4IMaWRwLmNub3VzLmZyhiNodHRwczovL2lkcC5jbm91cy5mci9p
-ZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUPLiOl86NYkKW2Dz3T05kKwEcuCQwDQYJ
-KoZIhvcNAQEFBQADggEBAA9/88dlu6RIXF2MsXqLOFguSQcRXyjUe7qRbneRLhk7
-3m5pH/AKRWpgfWPllLy1ui8ZgJ3upJg8NDF9pipAXGm9XXUlYwgO/bD91o591iw+
-ffKTKQATF1SxMVKBwNtUOdR7HUaHNgz38w5DNd5DE0ZEAatVFsCbJdYG1WKgFPhU
-HB02bxkRdxUUgdWRL7WuldON2M3vefzJYqYd+Pu5+gP8I6HvgiLXvySmGroTnb2f
-RC6L4jwyDgp7R4rULrUz94moM+7O7Y95uDRxszNoDpFdKdcwD2yjYhBUrV6dPHHy
-gMoijoNgZZc/CqICHEnTC2xx4c9HR/114ON1vrxiYR4=
-					    </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://idp.cnous.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.cnous.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.cnous.fr/idp/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">CNOUS</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">CNOUS</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Christian Muller</SurName>
-    <EmailAddress>christian.muller@cnous.fr</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <SurName>José tripet</SurName>
-    <EmailAddress>jose.tripet@cnous.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.company.ja.net-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.company.ja.net-idp-shibboleth.xml
deleted file mode 100644
index 7f61c336..00000000
--- a/swamid-interfederations-2.0/idp.company.ja.net-idp-shibboleth.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.company.ja.net/idp/shibboleth">
-  <!--
-		This is a Janet Shibboleth IdP for JISC Collections and Janet Limited.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2009-09-30T16:21:51Z">
-      <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">company.ja.net</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Janet</mdui:DisplayName>
-        <mdui:Logo height="100" width="220">https://www.ja.net/sites/all/themes/janetbootstrap/logo.png</mdui:Logo>
-        <mdui:Logo height="16" width="16">https://www.ja.net/sites/all/themes/janetbootstrap/favicon_16x16.png</mdui:Logo>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:IPHint>193.62.83.0/24</mdui:IPHint>
-        <mdui:DomainHint>company.ja.net</mdui:DomainHint>
-        <mdui:DomainHint>ukerna.ac.uk</mdui:DomainHint>
-        <mdui:GeolocationHint>geo:51.57732,-1.31070</mdui:GeolocationHint>
-      </mdui:DiscoHints>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDxDCCAqwCCQCSYXHhJnkuQDANBgkqhkiG9w0BAQUFADCBozELMAkGA1UEBhMC                                                                                  
-						R0IxFDASBgNVBAgTC094Zm9yZHNoaXJlMQ8wDQYDVQQHEwZEaWRjb3QxMTAvBgNV                                                                                  
-						BAoTKFRoZSBKTlQgQXNzb2NpYXRpb24gdHJhZGluZyBhcyBKQU5FVChVSykxHTAb                                                                                  
-						BgNVBAsTFEpBTkVUKFVLKSBJUyBTdXBwb3J0MRswGQYDVQQDExJpZHAuY29tcGFu                                                                                  
-						eS5qYS5uZXQwHhcNMTMwODI4MDkzMzQ0WhcNMzMwODIzMDkzMzQ0WjCBozELMAkG                                                                                  
-						A1UEBhMCR0IxFDASBgNVBAgTC094Zm9yZHNoaXJlMQ8wDQYDVQQHEwZEaWRjb3Qx                                                                                  
-						MTAvBgNVBAoTKFRoZSBKTlQgQXNzb2NpYXRpb24gdHJhZGluZyBhcyBKQU5FVChV                                                                                  
-						SykxHTAbBgNVBAsTFEpBTkVUKFVLKSBJUyBTdXBwb3J0MRswGQYDVQQDExJpZHAu                                                                                  
-						Y29tcGFueS5qYS5uZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDA
-						CHs8wVfzqZ7PrFLGngMY/nmawPUO7E0DcwDNsarh+04vbE3jrcQf7iZNsG8lo/ZF
-						Z8NfNvNwHYZ7z40O7cf5Kr7YSpqCNcC+InWsXOjhRo2blpwSpUSQpH1IzHCMf3Xf
-						efm1vG6Ud5zm2M05GJklL8Imz6u2pLQqgcxsLhe7C1aoP5P2GfQCVukgJ8rtcXN/
-						Hh0JggwZ/ZEKTHL8EJQrU0zAj/YSVeffpmOUAmUVOb8Tdy+NL1PHNNTNkmZ/p8Fb
-						vw7i66T0BDgbjmL/s4pq1DhI51Rh/qaMsCaAH6nGmcmnLmi7RpjQ8cMQlCVBpfWM
-						LRVVoHVjZegHjqqZ1f65AgMBAAEwDQYJKoZIhvcNAQEFBQADggEBAEtsQZdMCu0F
-						3VG7uyuu7UwUJPqfrp2DVd+ZW7ZePOzB0HWxsLKPEl0rdpeE+aMrMh3wbyV+1nJu
-						N7P1L0khqg/Tw4N/30tdbAYQKo+TjguzFCThenplL2zC618RtSyWFCOO2ox+4Arl
-						PhqPY3Zo7m2A1nfYkb9dL5VSbIUFztPgH5JpTTzutkJD9lQssw7JbB2cgkmHN+z/
-						F3+Xa4HqsEp30yzUMbAyA6jhduRqxMxmpDKB1micNlYOOQCKU5m9IBsHd6Vv2MYr
-						VeAgBIGPI/3oLSP+OhTm2TadX03on1OYUn1suuC9ypA5+IKSDb4bKJIq0QrHTFW/
-						Wep0+6npqDM=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.company.ja.net:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.company.ja.net: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.company.ja.net/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.company.ja.net/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.company.ja.net/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.company.ja.net/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="false">company.ja.net</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDxDCCAqwCCQCSYXHhJnkuQDANBgkqhkiG9w0BAQUFADCBozELMAkGA1UEBhMC                                                                                  
-						R0IxFDASBgNVBAgTC094Zm9yZHNoaXJlMQ8wDQYDVQQHEwZEaWRjb3QxMTAvBgNV                                                                                  
-						BAoTKFRoZSBKTlQgQXNzb2NpYXRpb24gdHJhZGluZyBhcyBKQU5FVChVSykxHTAb                                                                                  
-						BgNVBAsTFEpBTkVUKFVLKSBJUyBTdXBwb3J0MRswGQYDVQQDExJpZHAuY29tcGFu                                                                                  
-						eS5qYS5uZXQwHhcNMTMwODI4MDkzMzQ0WhcNMzMwODIzMDkzMzQ0WjCBozELMAkG                                                                                  
-						A1UEBhMCR0IxFDASBgNVBAgTC094Zm9yZHNoaXJlMQ8wDQYDVQQHEwZEaWRjb3Qx                                                                                  
-						MTAvBgNVBAoTKFRoZSBKTlQgQXNzb2NpYXRpb24gdHJhZGluZyBhcyBKQU5FVChV                                                                                  
-						SykxHTAbBgNVBAsTFEpBTkVUKFVLKSBJUyBTdXBwb3J0MRswGQYDVQQDExJpZHAu                                                                                  
-						Y29tcGFueS5qYS5uZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDA
-						CHs8wVfzqZ7PrFLGngMY/nmawPUO7E0DcwDNsarh+04vbE3jrcQf7iZNsG8lo/ZF
-						Z8NfNvNwHYZ7z40O7cf5Kr7YSpqCNcC+InWsXOjhRo2blpwSpUSQpH1IzHCMf3Xf
-						efm1vG6Ud5zm2M05GJklL8Imz6u2pLQqgcxsLhe7C1aoP5P2GfQCVukgJ8rtcXN/
-						Hh0JggwZ/ZEKTHL8EJQrU0zAj/YSVeffpmOUAmUVOb8Tdy+NL1PHNNTNkmZ/p8Fb
-						vw7i66T0BDgbjmL/s4pq1DhI51Rh/qaMsCaAH6nGmcmnLmi7RpjQ8cMQlCVBpfWM
-						LRVVoHVjZegHjqqZ1f65AgMBAAEwDQYJKoZIhvcNAQEFBQADggEBAEtsQZdMCu0F
-						3VG7uyuu7UwUJPqfrp2DVd+ZW7ZePOzB0HWxsLKPEl0rdpeE+aMrMh3wbyV+1nJu
-						N7P1L0khqg/Tw4N/30tdbAYQKo+TjguzFCThenplL2zC618RtSyWFCOO2ox+4Arl
-						PhqPY3Zo7m2A1nfYkb9dL5VSbIUFztPgH5JpTTzutkJD9lQssw7JbB2cgkmHN+z/
-						F3+Xa4HqsEp30yzUMbAyA6jhduRqxMxmpDKB1micNlYOOQCKU5m9IBsHd6Vv2MYr
-						VeAgBIGPI/3oLSP+OhTm2TadX03on1OYUn1suuC9ypA5+IKSDb4bKJIq0QrHTFW/
-						Wep0+6npqDM=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.company.ja.net:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.company.ja.net: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">JISC Collections and Janet Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Janet</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.ja.net/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>IT Support</GivenName>
-    <EmailAddress>mailto:it-support@ja.net</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>IT Support</GivenName>
-    <EmailAddress>mailto:it-support@ja.net</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.company.ja.net.xml b/swamid-interfederations-2.0/idp.company.ja.net.xml
deleted file mode 100644
index 7f61c336..00000000
--- a/swamid-interfederations-2.0/idp.company.ja.net.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.company.ja.net/idp/shibboleth">
-  <!--
-		This is a Janet Shibboleth IdP for JISC Collections and Janet Limited.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2009-09-30T16:21:51Z">
-      <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">company.ja.net</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Janet</mdui:DisplayName>
-        <mdui:Logo height="100" width="220">https://www.ja.net/sites/all/themes/janetbootstrap/logo.png</mdui:Logo>
-        <mdui:Logo height="16" width="16">https://www.ja.net/sites/all/themes/janetbootstrap/favicon_16x16.png</mdui:Logo>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:IPHint>193.62.83.0/24</mdui:IPHint>
-        <mdui:DomainHint>company.ja.net</mdui:DomainHint>
-        <mdui:DomainHint>ukerna.ac.uk</mdui:DomainHint>
-        <mdui:GeolocationHint>geo:51.57732,-1.31070</mdui:GeolocationHint>
-      </mdui:DiscoHints>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDxDCCAqwCCQCSYXHhJnkuQDANBgkqhkiG9w0BAQUFADCBozELMAkGA1UEBhMC                                                                                  
-						R0IxFDASBgNVBAgTC094Zm9yZHNoaXJlMQ8wDQYDVQQHEwZEaWRjb3QxMTAvBgNV                                                                                  
-						BAoTKFRoZSBKTlQgQXNzb2NpYXRpb24gdHJhZGluZyBhcyBKQU5FVChVSykxHTAb                                                                                  
-						BgNVBAsTFEpBTkVUKFVLKSBJUyBTdXBwb3J0MRswGQYDVQQDExJpZHAuY29tcGFu                                                                                  
-						eS5qYS5uZXQwHhcNMTMwODI4MDkzMzQ0WhcNMzMwODIzMDkzMzQ0WjCBozELMAkG                                                                                  
-						A1UEBhMCR0IxFDASBgNVBAgTC094Zm9yZHNoaXJlMQ8wDQYDVQQHEwZEaWRjb3Qx                                                                                  
-						MTAvBgNVBAoTKFRoZSBKTlQgQXNzb2NpYXRpb24gdHJhZGluZyBhcyBKQU5FVChV                                                                                  
-						SykxHTAbBgNVBAsTFEpBTkVUKFVLKSBJUyBTdXBwb3J0MRswGQYDVQQDExJpZHAu                                                                                  
-						Y29tcGFueS5qYS5uZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDA
-						CHs8wVfzqZ7PrFLGngMY/nmawPUO7E0DcwDNsarh+04vbE3jrcQf7iZNsG8lo/ZF
-						Z8NfNvNwHYZ7z40O7cf5Kr7YSpqCNcC+InWsXOjhRo2blpwSpUSQpH1IzHCMf3Xf
-						efm1vG6Ud5zm2M05GJklL8Imz6u2pLQqgcxsLhe7C1aoP5P2GfQCVukgJ8rtcXN/
-						Hh0JggwZ/ZEKTHL8EJQrU0zAj/YSVeffpmOUAmUVOb8Tdy+NL1PHNNTNkmZ/p8Fb
-						vw7i66T0BDgbjmL/s4pq1DhI51Rh/qaMsCaAH6nGmcmnLmi7RpjQ8cMQlCVBpfWM
-						LRVVoHVjZegHjqqZ1f65AgMBAAEwDQYJKoZIhvcNAQEFBQADggEBAEtsQZdMCu0F
-						3VG7uyuu7UwUJPqfrp2DVd+ZW7ZePOzB0HWxsLKPEl0rdpeE+aMrMh3wbyV+1nJu
-						N7P1L0khqg/Tw4N/30tdbAYQKo+TjguzFCThenplL2zC618RtSyWFCOO2ox+4Arl
-						PhqPY3Zo7m2A1nfYkb9dL5VSbIUFztPgH5JpTTzutkJD9lQssw7JbB2cgkmHN+z/
-						F3+Xa4HqsEp30yzUMbAyA6jhduRqxMxmpDKB1micNlYOOQCKU5m9IBsHd6Vv2MYr
-						VeAgBIGPI/3oLSP+OhTm2TadX03on1OYUn1suuC9ypA5+IKSDb4bKJIq0QrHTFW/
-						Wep0+6npqDM=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.company.ja.net:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.company.ja.net: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.company.ja.net/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.company.ja.net/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.company.ja.net/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.company.ja.net/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="false">company.ja.net</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDxDCCAqwCCQCSYXHhJnkuQDANBgkqhkiG9w0BAQUFADCBozELMAkGA1UEBhMC                                                                                  
-						R0IxFDASBgNVBAgTC094Zm9yZHNoaXJlMQ8wDQYDVQQHEwZEaWRjb3QxMTAvBgNV                                                                                  
-						BAoTKFRoZSBKTlQgQXNzb2NpYXRpb24gdHJhZGluZyBhcyBKQU5FVChVSykxHTAb                                                                                  
-						BgNVBAsTFEpBTkVUKFVLKSBJUyBTdXBwb3J0MRswGQYDVQQDExJpZHAuY29tcGFu                                                                                  
-						eS5qYS5uZXQwHhcNMTMwODI4MDkzMzQ0WhcNMzMwODIzMDkzMzQ0WjCBozELMAkG                                                                                  
-						A1UEBhMCR0IxFDASBgNVBAgTC094Zm9yZHNoaXJlMQ8wDQYDVQQHEwZEaWRjb3Qx                                                                                  
-						MTAvBgNVBAoTKFRoZSBKTlQgQXNzb2NpYXRpb24gdHJhZGluZyBhcyBKQU5FVChV                                                                                  
-						SykxHTAbBgNVBAsTFEpBTkVUKFVLKSBJUyBTdXBwb3J0MRswGQYDVQQDExJpZHAu                                                                                  
-						Y29tcGFueS5qYS5uZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDA
-						CHs8wVfzqZ7PrFLGngMY/nmawPUO7E0DcwDNsarh+04vbE3jrcQf7iZNsG8lo/ZF
-						Z8NfNvNwHYZ7z40O7cf5Kr7YSpqCNcC+InWsXOjhRo2blpwSpUSQpH1IzHCMf3Xf
-						efm1vG6Ud5zm2M05GJklL8Imz6u2pLQqgcxsLhe7C1aoP5P2GfQCVukgJ8rtcXN/
-						Hh0JggwZ/ZEKTHL8EJQrU0zAj/YSVeffpmOUAmUVOb8Tdy+NL1PHNNTNkmZ/p8Fb
-						vw7i66T0BDgbjmL/s4pq1DhI51Rh/qaMsCaAH6nGmcmnLmi7RpjQ8cMQlCVBpfWM
-						LRVVoHVjZegHjqqZ1f65AgMBAAEwDQYJKoZIhvcNAQEFBQADggEBAEtsQZdMCu0F
-						3VG7uyuu7UwUJPqfrp2DVd+ZW7ZePOzB0HWxsLKPEl0rdpeE+aMrMh3wbyV+1nJu
-						N7P1L0khqg/Tw4N/30tdbAYQKo+TjguzFCThenplL2zC618RtSyWFCOO2ox+4Arl
-						PhqPY3Zo7m2A1nfYkb9dL5VSbIUFztPgH5JpTTzutkJD9lQssw7JbB2cgkmHN+z/
-						F3+Xa4HqsEp30yzUMbAyA6jhduRqxMxmpDKB1micNlYOOQCKU5m9IBsHd6Vv2MYr
-						VeAgBIGPI/3oLSP+OhTm2TadX03on1OYUn1suuC9ypA5+IKSDb4bKJIq0QrHTFW/
-						Wep0+6npqDM=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.company.ja.net:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.company.ja.net: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">JISC Collections and Janet Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Janet</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.ja.net/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>IT Support</GivenName>
-    <EmailAddress>mailto:it-support@ja.net</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>IT Support</GivenName>
-    <EmailAddress>mailto:it-support@ja.net</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.condorcet.be-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.condorcet.be-idp-shibboleth.xml
deleted file mode 100644
index bdb9a1ae..00000000
--- a/swamid-interfederations-2.0/idp.condorcet.be-idp-shibboleth.xml
+++ /dev/null
@@ -1,108 +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: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:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://idp.condorcet.be/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://federation.belnet.be/" registrationInstant="2012-03-27T12:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://federation.belnet.be/files/Belnet-metadata-registration-practice-statement.txt</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">condorcet.be</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIEszCCA5ugAwIBAgIQQTL/jgzwBt0Zt4eFr/Kq/TANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTExMTIwODAwMDAwMFoXDTE0MTIwNzIzNTk1OVowgY0xCzAJBgNV
-BAYTAkJFMRIwEAYDVQQHEwlDaGFybGVyb2kxOzA5BgNVBAoMMkhhdXRlIEVjb2xl
-IFByb3ZpbmNpYWxlIOKAkyBVbml2ZXJzaXTDqSBkdSBUcmF2YWlsMRIwEAYDVQQL
-EwlDb25kb3JjZXQxGTAXBgNVBAMTEGlkcC5jb25kb3JjZXQuYmUwggEiMA0GCSqG
-SIb3DQEBAQUAA4IBDwAwggEKAoIBAQC8IZudPSFwYHUN9qJl0ee4qt2gbtCX5C3b
-Y8CB3OGDUTXXAcfw3Dqr0sYUWWHnMp3KSKCq6d5BGgkvslB+6hgxfOuO0sp+Dble
-KExmCXbL/V4PP8I9KPFRZw4hL5HPUwaXjQF1b3bALi/gNwgOa/bN9TDcx0yR9XQQ
-gp4UvNw1Y8lvL+/FP9nxSviUrZQYS497g5wLdWiuhYaCFhl0Sen6KibTJRiJ4e0/
-ed8cIMEwNEhnuHEPDthWkkbpGR7cjEbxRUNoIa2JCR2JggjeGmkbqSAu8JVC+THu
-QVF3nB0iW4duyPnkgyPghPbKcoTZb36zS9ZF0QBXGkY9CF23MByvAgMBAAGjggFj
-MIIBXzAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3V0fqkOO57TAdBgNVHQ4EFgQU
-UTeSbrbq7beqOidXG1uSokjeL6kwDgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQC
-MAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMBgGA1UdIAQRMA8wDQYL
-KwYBBAGyMQECAh0wOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVy
-ZW5hLm9yZy9URVJFTkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUF
-BzAChilodHRwOi8vY3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAm
-BggrBgEFBQcwAYYaaHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwGwYDVR0RBBQw
-EoIQaWRwLmNvbmRvcmNldC5iZTANBgkqhkiG9w0BAQUFAAOCAQEAMb4GDYuU2fQS
-Ft4HCYoWy6kP5JFiXOjijAl03pgZRipb0GFYDxAKbkHhppBeQKa6Pw6X93psE2L3
-1rm3VjUouX+wL0P9C5rV+cxLNfz6HjySn2vr1S7hip6Yckx8rqJ5wVxFKwWthktG
-0SbR7tWOEjoqiHnDXB0upSmcycbzuo0l3DymN0GimL/BtkeCjTfbDnCenL7JjhkC
-QvV9sXeiGEScuXD4gS4nFwbGMIdonFeoxaLx/Ddo0qNkNa2bevtZpOaI0D7lUltk
-uAUlD9bJAGCVw43tjyIHEHSU/Np3RPZcyRqJGsxG5i5S6wqyH+YVO7y1GANOL2WV
-NJp/Skt7sw==
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.condorcet.be:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.condorcet.be: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.condorcet.be/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.condorcet.be/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.condorcet.be/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.condorcet.be/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">condorcet.be</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIEszCCA5ugAwIBAgIQQTL/jgzwBt0Zt4eFr/Kq/TANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTExMTIwODAwMDAwMFoXDTE0MTIwNzIzNTk1OVowgY0xCzAJBgNV
-BAYTAkJFMRIwEAYDVQQHEwlDaGFybGVyb2kxOzA5BgNVBAoMMkhhdXRlIEVjb2xl
-IFByb3ZpbmNpYWxlIOKAkyBVbml2ZXJzaXTDqSBkdSBUcmF2YWlsMRIwEAYDVQQL
-EwlDb25kb3JjZXQxGTAXBgNVBAMTEGlkcC5jb25kb3JjZXQuYmUwggEiMA0GCSqG
-SIb3DQEBAQUAA4IBDwAwggEKAoIBAQC8IZudPSFwYHUN9qJl0ee4qt2gbtCX5C3b
-Y8CB3OGDUTXXAcfw3Dqr0sYUWWHnMp3KSKCq6d5BGgkvslB+6hgxfOuO0sp+Dble
-KExmCXbL/V4PP8I9KPFRZw4hL5HPUwaXjQF1b3bALi/gNwgOa/bN9TDcx0yR9XQQ
-gp4UvNw1Y8lvL+/FP9nxSviUrZQYS497g5wLdWiuhYaCFhl0Sen6KibTJRiJ4e0/
-ed8cIMEwNEhnuHEPDthWkkbpGR7cjEbxRUNoIa2JCR2JggjeGmkbqSAu8JVC+THu
-QVF3nB0iW4duyPnkgyPghPbKcoTZb36zS9ZF0QBXGkY9CF23MByvAgMBAAGjggFj
-MIIBXzAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3V0fqkOO57TAdBgNVHQ4EFgQU
-UTeSbrbq7beqOidXG1uSokjeL6kwDgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQC
-MAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMBgGA1UdIAQRMA8wDQYL
-KwYBBAGyMQECAh0wOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVy
-ZW5hLm9yZy9URVJFTkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUF
-BzAChilodHRwOi8vY3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAm
-BggrBgEFBQcwAYYaaHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwGwYDVR0RBBQw
-EoIQaWRwLmNvbmRvcmNldC5iZTANBgkqhkiG9w0BAQUFAAOCAQEAMb4GDYuU2fQS
-Ft4HCYoWy6kP5JFiXOjijAl03pgZRipb0GFYDxAKbkHhppBeQKa6Pw6X93psE2L3
-1rm3VjUouX+wL0P9C5rV+cxLNfz6HjySn2vr1S7hip6Yckx8rqJ5wVxFKwWthktG
-0SbR7tWOEjoqiHnDXB0upSmcycbzuo0l3DymN0GimL/BtkeCjTfbDnCenL7JjhkC
-QvV9sXeiGEScuXD4gS4nFwbGMIdonFeoxaLx/Ddo0qNkNa2bevtZpOaI0D7lUltk
-uAUlD9bJAGCVw43tjyIHEHSU/Np3RPZcyRqJGsxG5i5S6wqyH+YVO7y1GANOL2WV
-NJp/Skt7sw==
-                   </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.condorcet.be:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.condorcet.be: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">Haute Ecole Provinciale de Hainaut - Condorcet</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">HEPH-Condorcet</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.condorcet.be</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Technical Support</GivenName>
-    <SurName>Technical Support</SurName>
-    <EmailAddress>webmaster@condorcet.be</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.condorcet.be.xml b/swamid-interfederations-2.0/idp.condorcet.be.xml
deleted file mode 100644
index bdb9a1ae..00000000
--- a/swamid-interfederations-2.0/idp.condorcet.be.xml
+++ /dev/null
@@ -1,108 +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: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:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://idp.condorcet.be/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://federation.belnet.be/" registrationInstant="2012-03-27T12:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://federation.belnet.be/files/Belnet-metadata-registration-practice-statement.txt</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">condorcet.be</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIEszCCA5ugAwIBAgIQQTL/jgzwBt0Zt4eFr/Kq/TANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTExMTIwODAwMDAwMFoXDTE0MTIwNzIzNTk1OVowgY0xCzAJBgNV
-BAYTAkJFMRIwEAYDVQQHEwlDaGFybGVyb2kxOzA5BgNVBAoMMkhhdXRlIEVjb2xl
-IFByb3ZpbmNpYWxlIOKAkyBVbml2ZXJzaXTDqSBkdSBUcmF2YWlsMRIwEAYDVQQL
-EwlDb25kb3JjZXQxGTAXBgNVBAMTEGlkcC5jb25kb3JjZXQuYmUwggEiMA0GCSqG
-SIb3DQEBAQUAA4IBDwAwggEKAoIBAQC8IZudPSFwYHUN9qJl0ee4qt2gbtCX5C3b
-Y8CB3OGDUTXXAcfw3Dqr0sYUWWHnMp3KSKCq6d5BGgkvslB+6hgxfOuO0sp+Dble
-KExmCXbL/V4PP8I9KPFRZw4hL5HPUwaXjQF1b3bALi/gNwgOa/bN9TDcx0yR9XQQ
-gp4UvNw1Y8lvL+/FP9nxSviUrZQYS497g5wLdWiuhYaCFhl0Sen6KibTJRiJ4e0/
-ed8cIMEwNEhnuHEPDthWkkbpGR7cjEbxRUNoIa2JCR2JggjeGmkbqSAu8JVC+THu
-QVF3nB0iW4duyPnkgyPghPbKcoTZb36zS9ZF0QBXGkY9CF23MByvAgMBAAGjggFj
-MIIBXzAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3V0fqkOO57TAdBgNVHQ4EFgQU
-UTeSbrbq7beqOidXG1uSokjeL6kwDgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQC
-MAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMBgGA1UdIAQRMA8wDQYL
-KwYBBAGyMQECAh0wOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVy
-ZW5hLm9yZy9URVJFTkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUF
-BzAChilodHRwOi8vY3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAm
-BggrBgEFBQcwAYYaaHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwGwYDVR0RBBQw
-EoIQaWRwLmNvbmRvcmNldC5iZTANBgkqhkiG9w0BAQUFAAOCAQEAMb4GDYuU2fQS
-Ft4HCYoWy6kP5JFiXOjijAl03pgZRipb0GFYDxAKbkHhppBeQKa6Pw6X93psE2L3
-1rm3VjUouX+wL0P9C5rV+cxLNfz6HjySn2vr1S7hip6Yckx8rqJ5wVxFKwWthktG
-0SbR7tWOEjoqiHnDXB0upSmcycbzuo0l3DymN0GimL/BtkeCjTfbDnCenL7JjhkC
-QvV9sXeiGEScuXD4gS4nFwbGMIdonFeoxaLx/Ddo0qNkNa2bevtZpOaI0D7lUltk
-uAUlD9bJAGCVw43tjyIHEHSU/Np3RPZcyRqJGsxG5i5S6wqyH+YVO7y1GANOL2WV
-NJp/Skt7sw==
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.condorcet.be:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.condorcet.be: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.condorcet.be/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.condorcet.be/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.condorcet.be/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.condorcet.be/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">condorcet.be</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIEszCCA5ugAwIBAgIQQTL/jgzwBt0Zt4eFr/Kq/TANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTExMTIwODAwMDAwMFoXDTE0MTIwNzIzNTk1OVowgY0xCzAJBgNV
-BAYTAkJFMRIwEAYDVQQHEwlDaGFybGVyb2kxOzA5BgNVBAoMMkhhdXRlIEVjb2xl
-IFByb3ZpbmNpYWxlIOKAkyBVbml2ZXJzaXTDqSBkdSBUcmF2YWlsMRIwEAYDVQQL
-EwlDb25kb3JjZXQxGTAXBgNVBAMTEGlkcC5jb25kb3JjZXQuYmUwggEiMA0GCSqG
-SIb3DQEBAQUAA4IBDwAwggEKAoIBAQC8IZudPSFwYHUN9qJl0ee4qt2gbtCX5C3b
-Y8CB3OGDUTXXAcfw3Dqr0sYUWWHnMp3KSKCq6d5BGgkvslB+6hgxfOuO0sp+Dble
-KExmCXbL/V4PP8I9KPFRZw4hL5HPUwaXjQF1b3bALi/gNwgOa/bN9TDcx0yR9XQQ
-gp4UvNw1Y8lvL+/FP9nxSviUrZQYS497g5wLdWiuhYaCFhl0Sen6KibTJRiJ4e0/
-ed8cIMEwNEhnuHEPDthWkkbpGR7cjEbxRUNoIa2JCR2JggjeGmkbqSAu8JVC+THu
-QVF3nB0iW4duyPnkgyPghPbKcoTZb36zS9ZF0QBXGkY9CF23MByvAgMBAAGjggFj
-MIIBXzAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3V0fqkOO57TAdBgNVHQ4EFgQU
-UTeSbrbq7beqOidXG1uSokjeL6kwDgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQC
-MAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMBgGA1UdIAQRMA8wDQYL
-KwYBBAGyMQECAh0wOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVy
-ZW5hLm9yZy9URVJFTkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUF
-BzAChilodHRwOi8vY3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAm
-BggrBgEFBQcwAYYaaHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwGwYDVR0RBBQw
-EoIQaWRwLmNvbmRvcmNldC5iZTANBgkqhkiG9w0BAQUFAAOCAQEAMb4GDYuU2fQS
-Ft4HCYoWy6kP5JFiXOjijAl03pgZRipb0GFYDxAKbkHhppBeQKa6Pw6X93psE2L3
-1rm3VjUouX+wL0P9C5rV+cxLNfz6HjySn2vr1S7hip6Yckx8rqJ5wVxFKwWthktG
-0SbR7tWOEjoqiHnDXB0upSmcycbzuo0l3DymN0GimL/BtkeCjTfbDnCenL7JjhkC
-QvV9sXeiGEScuXD4gS4nFwbGMIdonFeoxaLx/Ddo0qNkNa2bevtZpOaI0D7lUltk
-uAUlD9bJAGCVw43tjyIHEHSU/Np3RPZcyRqJGsxG5i5S6wqyH+YVO7y1GANOL2WV
-NJp/Skt7sw==
-                   </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.condorcet.be:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.condorcet.be: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">Haute Ecole Provinciale de Hainaut - Condorcet</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">HEPH-Condorcet</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.condorcet.be</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Technical Support</GivenName>
-    <SurName>Technical Support</SurName>
-    <EmailAddress>webmaster@condorcet.be</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.cpe.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.cpe.fr-idp-shibboleth.xml
deleted file mode 100644
index 98a66470..00000000
--- a/swamid-interfederations-2.0/idp.cpe.fr-idp-shibboleth.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://idp.cpe.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2011-05-05T09:34:59Z">
-      <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">cpe.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">CPE Lyon</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIEJDCCAwygAwIBAgIJAIuC7i5giNpjMA0GCSqGSIb3DQEBBQUAMGkxEzARBgNV
-BAMTCmlkcC5jcGUuZnIxLjAsBgNVBAoTJUVDT0xFIFNVUCBDSElNSUUgUEhZUyBF
-TEVDVFJPTklRIExZT04xFTATBgNVBAcTDFZJTExFVVJCQU5ORTELMAkGA1UEBhMC
-RlIwHhcNMTQwMjIwMDgwNTA5WhcNMjQwMjE4MDgwNTA5WjBpMRMwEQYDVQQDEwpp
-ZHAuY3BlLmZyMS4wLAYDVQQKEyVFQ09MRSBTVVAgQ0hJTUlFIFBIWVMgRUxFQ1RS
-T05JUSBMWU9OMRUwEwYDVQQHEwxWSUxMRVVSQkFOTkUxCzAJBgNVBAYTAkZSMIIB
-IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAocIpHMAzh/c23VTx4XYN3+LB
-AjUpoogp3vpofbkduSkz/FjaRNPaIkN9ktXTUB2KTDPw6q36znFvSGZmRk75szn5
-QitoLMxjuu3vEappnszPBzUxSOiNkjkeXrhx7wi2DKvPEH9/lnITPGWVTukdyE4Z
-R/5WMSQxrPlJVdiqhh5NL/z7ffHezZczVlOkQTIew9srvWT3tAf3d1taJ163PPJZ
-3O/+tNHSZcnZkBVWrpXGVVZxmEb7xvJVKwLpoHMHbnD2KHw0SGWC1nKFkbr+VxH5
-T7Q+MlIa5DFJLU1XCx9AqMQBoDqDlgNDOb3pskWm3nSbeHf4/WbjfWzRV3a1jwID
-AQABo4HOMIHLMB0GA1UdDgQWBBSMZBt4Ak7Vg2PxKHncCs16Qai6IzCBmwYDVR0j
-BIGTMIGQgBSMZBt4Ak7Vg2PxKHncCs16Qai6I6FtpGswaTETMBEGA1UEAxMKaWRw
-LmNwZS5mcjEuMCwGA1UEChMlRUNPTEUgU1VQIENISU1JRSBQSFlTIEVMRUNUUk9O
-SVEgTFlPTjEVMBMGA1UEBxMMVklMTEVVUkJBTk5FMQswCQYDVQQGEwJGUoIJAIuC
-7i5giNpjMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBABwupHR6LVNW
-pTEB8I6nVYqHYSMduk89SzUK3U9JSqlGDE5L19IaEvYoelfEEGbxZ9UM0RQaneJI
-NcGTD/z3H+eOGAuq2sWew2XbBRGVHBU5Fdgy8H6XQicHSjurL0u+eu+Oul8xH54p
-MD9JupVLbRI/GZghxNmNtyJZQoi2+/PuFnW/c8R0zRoYOfn8fio7nLf7peRpPEdB
-I/Ce+bYCmQLQokoxkd07B/tD6TE+A/wnfI6DzGvM5zxMJHJDe1v7PiRx6GdPRbNT
-zfGHWrfvbx7aQaJ07RVUo4o+AdqHYl0eWuQ3cy+3lXgxuaasrb+XbB/CL+5yisby
-h34f/9zZRRI=
-					    </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://idp.cpe.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.cpe.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.cpe.fr/idp/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">CPE Lyon</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">CPE Lyon</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <EmailAddress>webmaster@cpe.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.cpe.fr.xml b/swamid-interfederations-2.0/idp.cpe.fr.xml
deleted file mode 100644
index 98a66470..00000000
--- a/swamid-interfederations-2.0/idp.cpe.fr.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://idp.cpe.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2011-05-05T09:34:59Z">
-      <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">cpe.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">CPE Lyon</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIEJDCCAwygAwIBAgIJAIuC7i5giNpjMA0GCSqGSIb3DQEBBQUAMGkxEzARBgNV
-BAMTCmlkcC5jcGUuZnIxLjAsBgNVBAoTJUVDT0xFIFNVUCBDSElNSUUgUEhZUyBF
-TEVDVFJPTklRIExZT04xFTATBgNVBAcTDFZJTExFVVJCQU5ORTELMAkGA1UEBhMC
-RlIwHhcNMTQwMjIwMDgwNTA5WhcNMjQwMjE4MDgwNTA5WjBpMRMwEQYDVQQDEwpp
-ZHAuY3BlLmZyMS4wLAYDVQQKEyVFQ09MRSBTVVAgQ0hJTUlFIFBIWVMgRUxFQ1RS
-T05JUSBMWU9OMRUwEwYDVQQHEwxWSUxMRVVSQkFOTkUxCzAJBgNVBAYTAkZSMIIB
-IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAocIpHMAzh/c23VTx4XYN3+LB
-AjUpoogp3vpofbkduSkz/FjaRNPaIkN9ktXTUB2KTDPw6q36znFvSGZmRk75szn5
-QitoLMxjuu3vEappnszPBzUxSOiNkjkeXrhx7wi2DKvPEH9/lnITPGWVTukdyE4Z
-R/5WMSQxrPlJVdiqhh5NL/z7ffHezZczVlOkQTIew9srvWT3tAf3d1taJ163PPJZ
-3O/+tNHSZcnZkBVWrpXGVVZxmEb7xvJVKwLpoHMHbnD2KHw0SGWC1nKFkbr+VxH5
-T7Q+MlIa5DFJLU1XCx9AqMQBoDqDlgNDOb3pskWm3nSbeHf4/WbjfWzRV3a1jwID
-AQABo4HOMIHLMB0GA1UdDgQWBBSMZBt4Ak7Vg2PxKHncCs16Qai6IzCBmwYDVR0j
-BIGTMIGQgBSMZBt4Ak7Vg2PxKHncCs16Qai6I6FtpGswaTETMBEGA1UEAxMKaWRw
-LmNwZS5mcjEuMCwGA1UEChMlRUNPTEUgU1VQIENISU1JRSBQSFlTIEVMRUNUUk9O
-SVEgTFlPTjEVMBMGA1UEBxMMVklMTEVVUkJBTk5FMQswCQYDVQQGEwJGUoIJAIuC
-7i5giNpjMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBABwupHR6LVNW
-pTEB8I6nVYqHYSMduk89SzUK3U9JSqlGDE5L19IaEvYoelfEEGbxZ9UM0RQaneJI
-NcGTD/z3H+eOGAuq2sWew2XbBRGVHBU5Fdgy8H6XQicHSjurL0u+eu+Oul8xH54p
-MD9JupVLbRI/GZghxNmNtyJZQoi2+/PuFnW/c8R0zRoYOfn8fio7nLf7peRpPEdB
-I/Ce+bYCmQLQokoxkd07B/tD6TE+A/wnfI6DzGvM5zxMJHJDe1v7PiRx6GdPRbNT
-zfGHWrfvbx7aQaJ07RVUo4o+AdqHYl0eWuQ3cy+3lXgxuaasrb+XbB/CL+5yisby
-h34f/9zZRRI=
-					    </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://idp.cpe.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.cpe.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.cpe.fr/idp/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">CPE Lyon</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">CPE Lyon</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <EmailAddress>webmaster@cpe.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.craw.eu-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.craw.eu-idp-shibboleth.xml
deleted file mode 100644
index 295aaf73..00000000
--- a/swamid-interfederations-2.0/idp.craw.eu-idp-shibboleth.xml
+++ /dev/null
@@ -1,102 +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: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:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://idp.craw.eu/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://federation.belnet.be/" registrationInstant="2012-03-27T12:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://federation.belnet.be/files/Belnet-metadata-registration-practice-statement.txt</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">cra.wallonie.be</shibmd:Scope>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="en">CRA-W</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Centre Wallon de Recherches Agronomiques</mdui:Description>
-        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyJpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuMC1jMDYxIDY0LjE0MDk0OSwgMjAxMC8xMi8wNy0xMDo1NzowMSAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENTNS4xIFdpbmRvd3MiIHhtcE1NOkluc3RhbmNlSUQ9InhtcC5paWQ6N0UwQjlGOTUzODI3MTFFNDhEQjM5QTkyMDFFMzRCQTIiIHhtcE1NOkRvY3VtZW50SUQ9InhtcC5kaWQ6N0UwQjlGOTYzODI3MTFFNDhEQjM5QTkyMDFFMzRCQTIiPiA8eG1wTU06RGVyaXZlZEZyb20gc3RSZWY6aW5zdGFuY2VJRD0ieG1wLmlpZDo3RTBCOUY5MzM4MjcxMUU0OERCMzlBOTIwMUUzNEJBMiIgc3RSZWY6ZG9jdW1lbnRJRD0ieG1wLmRpZDo3RTBCOUY5NDM4MjcxMUU0OERCMzlBOTIwMUUzNEJBMiIvPiA8L3JkZjpEZXNjcmlwdGlvbj4gPC9yZGY6UkRGPiA8L3g6eG1wbWV0YT4gPD94cGFja2V0IGVuZD0iciI/Pt40DxoAAAKESURBVHjajJJNTBNBFMff7G7brQ20Vr4hiHjQkEjgwAW9yMGPEyHxpjEaDh48cOqBaLw1US9GT97Vix64mBAVoigaDV8JCPiREJEiKIVaWrrd3c6M/ylL0igk7uaX2ex7//9782bY7WeN1OJn1BXUyJW01xMGreDN3wGN/u+5Crp3CxQNBGB7i++DOHB2Cxo6lIkC0aaQVOWzSRZfIpv7yZH6SYSveLmfSoWqoNIaqgVLchrIhiiVOk0uhOrf2apxailLtDvCUPku+KA+dE+YRturBUnFaIAJWsqHKD5/gagQIuI+Gq5vocGOeFhVQkdDWD9j1rTKJU3akhYhxrJtINBQULfJNHKUVzV0+9JyPmrmuFnj11x0pN20kDxqCZrDUUklZKqwN0QudYoG1uh4zRDcfEDvPRhcqys3rDMGafcWXPn6cZbTjCOLWzBKJm54Z5wuQHiqYYAmkp30O3N4vqd6ol4wPvjCEn1zjuyAqBVbMJH7DbwH6zsGx0AfuqiN+FPTRyNTMXPfxsuu2uHQg7SvIsnlCoQB5LwFsyAK2sFH8Irded6oGjoPYhrjwfV89WTUtxWVeuaERvI7I+0WzB/tcg+Uadgw9ZyEw0MkzbrC310XWmxyhH8055ZdS2SbxyJmkirNVRLyn0trg1/Gk4VesoVJy1uNU2n7gBEJJBc23Ug065bbtlXTWb9/+l1/W6wCg6+QUvsJUSVIgo3tC3VjbPukGe8BKyT1MDHRBGbw/xxxc6StamT98pG71yWxWinZEgQXdwwM0q2dltKgGcIM1i/gEFiGSQodjeN7BnUSXmyj9Bip5K43eMEf3h4xOO0rZpD3ac5Tm5tqkPnSQfwRYAD8LgMNnba3AAAAAABJRU5ErkJggg==</mdui:Logo>
-        <mdui:Logo height="75" width="153">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAJkAAABLCAYAAABjqiWeAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyJpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuMC1jMDYxIDY0LjE0MDk0OSwgMjAxMC8xMi8wNy0xMDo1NzowMSAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENTNS4xIFdpbmRvd3MiIHhtcE1NOkluc3RhbmNlSUQ9InhtcC5paWQ6QjE2QUJENUUzODI3MTFFNEIxN0RGQ0MzMEIyNkQwNDEiIHhtcE1NOkRvY3VtZW50SUQ9InhtcC5kaWQ6QjE2QUJENUYzODI3MTFFNEIxN0RGQ0MzMEIyNkQwNDEiPiA8eG1wTU06RGVyaXZlZEZyb20gc3RSZWY6aW5zdGFuY2VJRD0ieG1wLmlpZDpCMTZBQkQ1QzM4MjcxMUU0QjE3REZDQzMwQjI2RDA0MSIgc3RSZWY6ZG9jdW1lbnRJRD0ieG1wLmRpZDpCMTZBQkQ1RDM4MjcxMUU0QjE3REZDQzMwQjI2RDA0MSIvPiA8L3JkZjpEZXNjcmlwdGlvbj4gPC9yZGY6UkRGPiA8L3g6eG1wbWV0YT4gPD94cGFja2V0IGVuZD0iciI/PorMSJ0AABA5SURBVHja7F0JdFTlFb5v9skKSVgDhC3sFRG0uAIWrB7EqoindWldTku1VdEqyvGcWrXWqnVBrFZrq7VQRMFKRQQREKKgrMpq2BMghJiNSTKZN2/ee7133p3wMkySGUjCzOS/OffM5M3/3ryZ973vLv/970i6roMQIW0pFvEVCBEgEyJAJkRIS2KL55N7aUVexO1+dCPHuS0w0iEFn8exXIF6HuozqG16phljDwgm62AyBHUu6nLUS9oaYILJOpa4UB9kzeRt1cJcCmktuZgsPOqYsO0dHmTCXLaOzEJdFQFgJCcEkwk5E0lHfQP1p82MKRcgE3K6koX6X9TLWhhXKkCWoHKWwzVisA9RL41i7BHhkyWgSKhl6lmF2T+iBJiMekyALAHFiigrC+jg08/KB/g16rQox5ahlgiQJehJV2sABxUdbFK7vnU31CdiGH8Q1StAlsCyza8D4gzaEWfTUbvEMH6HiI8SGGTEYMfRL9uBQHO0D8qcqLfEuM8mAbEEZzIC2gZZg6Pon7naHmjnoubHMB4NOmwWEEtwkNHJk7n8rF6HIgSavW2BNjbG8YdQ9wiIJcG0ErHZCU1HoGngQe4g0ymBjh8sNpVazrydE+OprUf1CYglydwlMVgtAmypVw0CjlIcBJlY1CZpkGGvw2OpTcGtb4yn9UlbfV4ibCt/blKHFOdEkCx3C33ZNSDDi8eHw8f77wJd8sd0r3Wy1cLIzCL4Td4yGJhSCj7NHn5dc2I4oAeMCfNWBRaxNrGCjHdBJd5UHryhvPi8AgOgKwXI2gtoOlQobthRPRCvhhzbFdQl+LLsfFhZPgLWXvh7SLP6IKBbzZFlagynsgZaIdMfYixiZnQ7oRgd0AoE12H0P8sRWKGqYHoQIGtXHw2/ciuymMUf+85WGQqr8+HtI+Nh5oDF4FFSQq+4UVNiONL8M/VhiLUoqDmGYNqHT0pUApYRshLoQuYyIa6JcEvDgeaHVw5dBbfmroVMmzfEZikxMBlNI318usxFwPEikvYjsHailiK4AroBrEQBVVI6/q37jShwuKY3fFI2ClJsDSY3jTUa+Q/7ZDGBK+S8b0SHa2GdCssxWi4J6A2vWUV0mWxAU+H14klBc2mRgo5P1yi/K0pZvBErc9E77EIHa1GdBl/JGtToBrBsUrtOmQmQtaOMQ3/OsaF6EOyuzcWLrdC2nlHu+x7q3uh8R+PL34sm8QNkLsrzlWO0aIfEZi3hk7X8XfwVdSpQTkzSzJFDXhT70/hnormrib3IFK5H00iPkAC5LgEykxheTMxXjJayzUO9HrUWjOVstabXB0dxjLfJ6rXkd1WhU/+NT4NCxUhB2KWOcfcmjaiaDbq5SsBp84CsIm4kLdpd/8kAC5GNi/Jmmt6AgCEt7E/L3p5s7kumM9mOqNqEPtcJnv7qCABLOp9M1a2Q4yqD7qlFSGn2aHejGrGfmf63g2519HRVQG93BaUwOkPL1RdUyHikKfaqQF/rY68GK9Hvogy9M0kc+g4JMjKVDqsM52RtQsRFBTJaEPJo2LYAQsCfgsfJsNUjA1mGQvOFijQR/kr4RmIpC5ciUdRYjL6XU+qYkVbSfWZZdcIl3T6DrLRDaKOcLQ2/ELV32DYFdIuc66oChyUAuh7sZdGU1DETKuHsVYqgWkIpCZ8eNJV2CTqsJB3INDSZGY5q+EnfuWCV1JaCgP4RtnnQXFaOy9oFLouf2HFSM/s/RK6Wmb0o57UFo8YPvQZ7OSSRJ0rKz+9T3TC262oY3W0VGr/UWAOfwwhV74j0YgJYb2a7SPIO6msh9iJTWImYpkx9gU9rAJ2QJL7JZM0N1/SZDxnuEsRMk/5Z1amOnXV7J1cljMo8SOU+V0PkOcsvUe8KoZTmFTei70VJ1UOK3uEc+w4LMkpnZGOkeVP+q3jF9abM5qktBFRHwaVoKvullEmKZvtFhH2opPpGmsd2BiNHCEaO69H3UgR7dSyQhcwmRZrDgtGmK9KQsDWRUi3S3ufTeqyncuxxuOGHYeOLUKfYJCixhHwvZC9a/2kXvlfHBFlIJuUuBsmiRGIzmtA+mbHVbCt7pZUcmdx1K9SrzplhY2mh7mRkrz1Vqg4feQ3fS4HknhJqDYn3jD9VP5SdaUpjUKcdyGYbYWc5+vDWRms7nI1uNNXx2p29V0GWveZKTyDlKtO4HThoKvpee3Yja61DcNVqEcFl45TIINQBHL3SZ6B8XBqjnNIeNWC0lNqPug+1kFlSFSBrfxkGxoLa1/ninIZI+KfBZT2WIcjG8nVuWCrS6STAnGuHdS5cfn/fJe461fWc6QCfoSm8FV2u0rUYOdJiYmvjCe1+YDRfmYB6Af/vjtWyM9jWoS4Do3y7UoCsfeRzMNY7bgVjAnoZX4xIRYHEFpmMIGKJhopDv+aC/Mxd0D3tAJTW9TOXZg80IkoLMcisPw6eD+l23x9rA64RnJqYg+bxoeKALq9B9qpQG8DVnXwzMBqvXASx1f9HEnIYR7D+Cozq2o84TbJOgKzt5c9glNE8j/oUGHOEx/lOD/AFzmKAhUBGr3+KOptAqesSpFprYUzXL2DJgYHmYxuOfSDl+RmDFqy7ttvGG2sC7gco6kQwPYCkNZ/AtYt7buA2Yqo7wZhMzznDz6Xw+ZM4oHEZGdWvTWelVU8voi4RIGtbobnB3WD0BevF2pxksl90M+oMYgRFd8DIrA2wtGhacFYAJJ18pGtASS2Y0H3Dw0/mL5joUx3z0DQuRDw9uE/Ri7bKxgIO3DYBI8rf4firYgyWNGZeKgHaycHDYTCqNmr55gE2r3Q+2WCs7yR/bjjr5azEaI8yuwuQtbKQgcrjnNZoMEpq7oxyX6qg+Bc53wHN9pdsZxnkuEuhrA4PJynTIeAqH99t0/WLzntuUopVfcyr2m5B07iAar0QZFS8eiWay3vA+NGHaIUAVIC6lIFRaDbdMUoGm9DxqDeA8bsA1EL0YQ4UBMhaScj87eULfR3qY6hzUB9BvZb9mZaEHPlqi6S9abQjsAwAJX3M4MwD4z8a86zFapHde2T7JbsUjcCVi+Caiuz1cwZ1tPI1+1CLUY+20mf3MFBJ/4Q6CvUOMJbcvcF+qgBZK8qn/EgMQUvOZrH5IFNC0z/U3rxHM+bs7wiywhRbXQHo1qxhOetun9r3Pd+2gBd2y44vqlR1KsJvGvpdVzADRiOUzP0fHRtaecV4E0IB0D38OW9DnclMfTyuTVE8/95lE7+tRH7KIjBKogls1CB4A19wNzvNnfi5nbdTL/0qBNn+ajmrskLuljMoc/tQJMmLalXnZWgXx1jN6YyWhaI/KtemitrvzuJX1I/N6bYZk4qKBJO1nuzkfNTLqDS3OJm305d8gJX8txo4Wa9Pla1dNd0yoLOzIi/HdbyXojlSqcjRGVu2fhez1lyIj/78B1m7CnPZ+uJhc7GKfZVcDg5IJzS3I5Voq3pMi850fp/X2TTKcfh9lMXzxUr0uct3ONf1N1M6oLWEGqZQvRjVk01EfT9OASYc/3YQiuTu4mjrtxyBdj4DRqBasYUcaJQLiAiQhUdelD97nP006qY0kk2pLYIJ9HBURsnSLQwu6vH6faPICIdaLYFgKTc9D2h2COhiTXRHBVlIitnMkaYxyMgxps48GgcEJ1gJUIoZUDqXA9mkANitMvgCKVDq7Q0Vck7weZ+0/dDVfQxsCDxVs4K/5cUqAmTJ8kGCfWKRbewWhcESnCqg6LIQmadQMzn8xEoWSTXtpwXBRdW0Nos/CLNj9b1gU9k42FY5Gkq8fUBVEUzIYE5HFfRKPQT90/fC4E7fwoCM7wSKkhFklqDpMh6DZgxBomgOqPR1gX2e4eDxd8L/7Qg4Pzit9dA7tQiyXGXQ2VmO4wNQKXfBMVkgq47gPObm8ovgBG7zISuNylkX3H/N0Sng9WcbFRu4D1gCQdKTA6mwv2ok7K+4ANa5x8Fjo+/D95DxOKIuNiFBZo/QLZGYp0bJDPpG1QiU495eUFTXH47W5UEJaj0BI1TSH8ozIwjS7R4Ykf01MlAhrDhyHXxfnws6tTEgcGiOBldtT+Vow6oSqGy1ESgTGdCqBttL2S2KQFCig+yl7Y+feo0RGOX13aFeTQUfmTA1JdjvlS56kHGs3ojGtEbJgPUlk2E9xQQNzARGvwxku9My0biv3eIXKEpkkO2rOjciYAyAaMYqpMgAoXnM28HIoSFV6ZuRgebg2G38OgUE0zhFsQKMQkGKRKm/2HIeQ6XTVCY01jgGfMNpkg3GyxrISjoc8AyBH2RvAq+SFgoaaDHwLznIoIpXKhGqCFl6MNpT0bSUuUELFT7ey/z7LhiVFkkjcT13KT1RcDq70QTybL5gq/mCEuioWpHKZWiuk+b8QtNPe/gi0w33NoOTqh0+ByPBS1NJ1AtjKP9P/cuMAkIMBOySH6b0mwsTcxdjYGEjM05zidtN53MrGNNQJDSZvxKMWv7+HAkDv34zP78YTqMadsak+K38STZvdTwYc5rV/JwuKq0RoNZPVLVBU0NUo0WZ+1pObVCOrA8YC0CeBaNKlca9xWCkpXHDmNXotafBmHgPml1Ft8MH+6bDm7tnQrWcTQ1fdpjYEKDxb2PeG/IS4eSPgVHiOFSvth6SoNw62UE2ix+pR8WasNeopuxVMOrzyZQ5mc3uB2MKicq6d/P22Qwqs+c/m1lvGOfeTIGAD7Ycvxxe+PbpYADisMhzTfsRSDOZSc0roG4z3RhdTIwmfLI4li5s9ggYi5sYE4ok8tic+plVzEvRKFk7j1luIrMgjaXCSS+EmuQZ+2WGolKw1UGVryfM3Xt3zYwRf1hqkQLlOlhyeMwENtkO0/vk8/GnmN73QwGy+AcZOfTfsbmMyu2DyP0LbmLmIpCQs+Ph58SCAXboyZR+3Wgvax0Ue4becLAmf/WQztuW+FXnbSaGDbGfZrIgtEimBz9fDkn6U9LJOK3kPEM34HzUfzOwrmBHXWP2Wsls6WDwXX3K3pp1d2l9LxietXWuySRewI/EnFSfT+VJVFRpLu9+R6Qw4l++Z2CQA98XIv/WJK3NVMDcmiAyixFIX+D0RkiIvepMvqzMjnojF9dqr4H8zJ0041DA5zDINIAi1pdQfxQG0CIGcFKKJclAtpZvnPsivJ7G+aee0HztWabJR4rEkk2Laoe89L3QM+UwBDQbvcf7YSPm8OPLYdsXwinNXwTI4lWeYqa6m1MNfRg0lHsq4At5gMFihci/y7A6lHpicyZxmoFWSY01+XKnim4PdhGySQ3NXRbAyQW834KxAh6YtTaafLR5kMSSbCD7CoxO1lTI+AibIUpNfAFGw7vbw6LISP01KOP+Fkeg9EP1+ziYGME5rDqI1BhFt4DbWQ4jszcGJ+dZKCm72cRiAROwQmxGdXDfJDPIktHxX8S+0o85TaBwFLjM5ItRFDeSXwsHDG27g9mFnHyqQ9vAppZWeGdAhHbqoLlgVM4K6JFSDPWNW4g+wIz4boTzpPYKWwBAT2aQxfW0khBhLoUIESATIkAmpIPI/wUYAHgWZETgx0vuAAAAAElFTkSuQmCC</mdui:Logo>
-      </mdui:UIInfo>
-      <mdui:DiscoHints>
-        <mdui:IPHint>193.190.115.0/24</mdui:IPHint>
-        <mdui:IPHint>2001:06a8:3960::/48</mdui:IPHint>
-        <mdui:DomainHint>CRA.WALLONIE.BE</mdui:DomainHint>
-        <mdui:GeolocationHint>geo:50.5662,4.7247</mdui:GeolocationHint>
-      </mdui:DiscoHints>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDGDCCAgCgAwIBAgIVAIP1OBVd297uoZOia+Zqp6HAJ9DDMA0GCSqGSIb3DQEB
-BQUAMBYxFDASBgNVBAMTC2lkcC5jcmF3LmV1MB4XDTEzMDIxNTA3NDMyMVoXDTMz
-MDIxNTA3NDMyMVowFjEUMBIGA1UEAxMLaWRwLmNyYXcuZXUwggEiMA0GCSqGSIb3
-DQEBAQUAA4IBDwAwggEKAoIBAQDuCWtJ/aDFBmejY17mEqrlgFxmetfLJWKCy6vU
-25241tsMqWW42YVuxtPwKP6Z5ure+RCzgUF0ZdddKqyaUpmNxeIq7OC7q21mMeBQ
-yahzvjzq8VgcM2iKcgCw/nNnrSZwkIaJMaej7Aw2U5VVs65rZ6bbztQbMKj51BbJ
-FM28lyTLC96+mTaofJ8hvkn2cPH3IecCFlRwNcx4w5SGuVGIPNEISQ8ypEzd2MNA
-DcnwemG46Ipv/MyILJPWP19xjl7z6VgeBLNHc0iigepBOrSnSq49WXpdwvFlkjMY
-sbPxGD1CQfPXBo6dDBNQdjn3V4cdfWRO5/Dp0J4mkkFsJkzDAgMBAAGjXTBbMDoG
-A1UdEQQzMDGCC2lkcC5jcmF3LmV1hiJodHRwczovL2lkcC5jcmF3LmV1L2lkcC9z
-aGliYm9sZXRoMB0GA1UdDgQWBBQNbK63mDGwrA0LIPx4J3pCP/MHqjANBgkqhkiG
-9w0BAQUFAAOCAQEANbBixgiBQhJ/xB9Et8d+kZwK/OIC+Q08aCUuSlJ8URS7yB8a
-tQlX9xCW1Dj9eBVzsCNEVZQVhUA7SepbCHXwPh3cjim/255V/dboxEa5HtH76Pn5
-RSqOLhoN5SrqZn9JMZfJqIbU8vcLEwR9HqbFT0gDseyCExBdGEZb2cbnidxaTIrr
-yf6vu9LsSxP4gck3NrkfrUAWqxYis+a2qSXTni00wDcj5Si0DxZTIIFUfVeTPm02
-tEQG0fUEqzyBDxdQFuNsput7RfHF9S6iXjAEUyOc8+dXbxLs+kziJteBX01SSNI4
-NuU+VQNtPt46TiTwvP7DiXqrbeMbYZkfPB/jLQ==
-                	</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.craw.eu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.craw.eu: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.craw.eu/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.craw.eu/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.craw.eu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.craw.eu/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">craw.eu</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDGDCCAgCgAwIBAgIVAIP1OBVd297uoZOia+Zqp6HAJ9DDMA0GCSqGSIb3DQEB
-BQUAMBYxFDASBgNVBAMTC2lkcC5jcmF3LmV1MB4XDTEzMDIxNTA3NDMyMVoXDTMz
-MDIxNTA3NDMyMVowFjEUMBIGA1UEAxMLaWRwLmNyYXcuZXUwggEiMA0GCSqGSIb3
-DQEBAQUAA4IBDwAwggEKAoIBAQDuCWtJ/aDFBmejY17mEqrlgFxmetfLJWKCy6vU
-25241tsMqWW42YVuxtPwKP6Z5ure+RCzgUF0ZdddKqyaUpmNxeIq7OC7q21mMeBQ
-yahzvjzq8VgcM2iKcgCw/nNnrSZwkIaJMaej7Aw2U5VVs65rZ6bbztQbMKj51BbJ
-FM28lyTLC96+mTaofJ8hvkn2cPH3IecCFlRwNcx4w5SGuVGIPNEISQ8ypEzd2MNA
-DcnwemG46Ipv/MyILJPWP19xjl7z6VgeBLNHc0iigepBOrSnSq49WXpdwvFlkjMY
-sbPxGD1CQfPXBo6dDBNQdjn3V4cdfWRO5/Dp0J4mkkFsJkzDAgMBAAGjXTBbMDoG
-A1UdEQQzMDGCC2lkcC5jcmF3LmV1hiJodHRwczovL2lkcC5jcmF3LmV1L2lkcC9z
-aGliYm9sZXRoMB0GA1UdDgQWBBQNbK63mDGwrA0LIPx4J3pCP/MHqjANBgkqhkiG
-9w0BAQUFAAOCAQEANbBixgiBQhJ/xB9Et8d+kZwK/OIC+Q08aCUuSlJ8URS7yB8a
-tQlX9xCW1Dj9eBVzsCNEVZQVhUA7SepbCHXwPh3cjim/255V/dboxEa5HtH76Pn5
-RSqOLhoN5SrqZn9JMZfJqIbU8vcLEwR9HqbFT0gDseyCExBdGEZb2cbnidxaTIrr
-yf6vu9LsSxP4gck3NrkfrUAWqxYis+a2qSXTni00wDcj5Si0DxZTIIFUfVeTPm02
-tEQG0fUEqzyBDxdQFuNsput7RfHF9S6iXjAEUyOc8+dXbxLs+kziJteBX01SSNI4
-NuU+VQNtPt46TiTwvP7DiXqrbeMbYZkfPB/jLQ==
-			</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.craw.eu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.craw.eu: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">CRA-W</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">CRA-W</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.cra.wallonie.be</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Mikhael</GivenName>
-    <SurName>Jacquemain</SurName>
-    <EmailAddress>maintenance@cra.wallonie.be</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.craw.eu.xml b/swamid-interfederations-2.0/idp.craw.eu.xml
deleted file mode 100644
index 295aaf73..00000000
--- a/swamid-interfederations-2.0/idp.craw.eu.xml
+++ /dev/null
@@ -1,102 +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: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:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://idp.craw.eu/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://federation.belnet.be/" registrationInstant="2012-03-27T12:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://federation.belnet.be/files/Belnet-metadata-registration-practice-statement.txt</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">cra.wallonie.be</shibmd:Scope>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="en">CRA-W</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Centre Wallon de Recherches Agronomiques</mdui:Description>
-        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyJpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuMC1jMDYxIDY0LjE0MDk0OSwgMjAxMC8xMi8wNy0xMDo1NzowMSAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENTNS4xIFdpbmRvd3MiIHhtcE1NOkluc3RhbmNlSUQ9InhtcC5paWQ6N0UwQjlGOTUzODI3MTFFNDhEQjM5QTkyMDFFMzRCQTIiIHhtcE1NOkRvY3VtZW50SUQ9InhtcC5kaWQ6N0UwQjlGOTYzODI3MTFFNDhEQjM5QTkyMDFFMzRCQTIiPiA8eG1wTU06RGVyaXZlZEZyb20gc3RSZWY6aW5zdGFuY2VJRD0ieG1wLmlpZDo3RTBCOUY5MzM4MjcxMUU0OERCMzlBOTIwMUUzNEJBMiIgc3RSZWY6ZG9jdW1lbnRJRD0ieG1wLmRpZDo3RTBCOUY5NDM4MjcxMUU0OERCMzlBOTIwMUUzNEJBMiIvPiA8L3JkZjpEZXNjcmlwdGlvbj4gPC9yZGY6UkRGPiA8L3g6eG1wbWV0YT4gPD94cGFja2V0IGVuZD0iciI/Pt40DxoAAAKESURBVHjajJJNTBNBFMff7G7brQ20Vr4hiHjQkEjgwAW9yMGPEyHxpjEaDh48cOqBaLw1US9GT97Vix64mBAVoigaDV8JCPiREJEiKIVaWrrd3c6M/ylL0igk7uaX2ex7//9782bY7WeN1OJn1BXUyJW01xMGreDN3wGN/u+5Crp3CxQNBGB7i++DOHB2Cxo6lIkC0aaQVOWzSRZfIpv7yZH6SYSveLmfSoWqoNIaqgVLchrIhiiVOk0uhOrf2apxailLtDvCUPku+KA+dE+YRturBUnFaIAJWsqHKD5/gagQIuI+Gq5vocGOeFhVQkdDWD9j1rTKJU3akhYhxrJtINBQULfJNHKUVzV0+9JyPmrmuFnj11x0pN20kDxqCZrDUUklZKqwN0QudYoG1uh4zRDcfEDvPRhcqys3rDMGafcWXPn6cZbTjCOLWzBKJm54Z5wuQHiqYYAmkp30O3N4vqd6ol4wPvjCEn1zjuyAqBVbMJH7DbwH6zsGx0AfuqiN+FPTRyNTMXPfxsuu2uHQg7SvIsnlCoQB5LwFsyAK2sFH8Irded6oGjoPYhrjwfV89WTUtxWVeuaERvI7I+0WzB/tcg+Uadgw9ZyEw0MkzbrC310XWmxyhH8055ZdS2SbxyJmkirNVRLyn0trg1/Gk4VesoVJy1uNU2n7gBEJJBc23Ug065bbtlXTWb9/+l1/W6wCg6+QUvsJUSVIgo3tC3VjbPukGe8BKyT1MDHRBGbw/xxxc6StamT98pG71yWxWinZEgQXdwwM0q2dltKgGcIM1i/gEFiGSQodjeN7BnUSXmyj9Bip5K43eMEf3h4xOO0rZpD3ac5Tm5tqkPnSQfwRYAD8LgMNnba3AAAAAABJRU5ErkJggg==</mdui:Logo>
-        <mdui:Logo height="75" width="153">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAJkAAABLCAYAAABjqiWeAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyJpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuMC1jMDYxIDY0LjE0MDk0OSwgMjAxMC8xMi8wNy0xMDo1NzowMSAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENTNS4xIFdpbmRvd3MiIHhtcE1NOkluc3RhbmNlSUQ9InhtcC5paWQ6QjE2QUJENUUzODI3MTFFNEIxN0RGQ0MzMEIyNkQwNDEiIHhtcE1NOkRvY3VtZW50SUQ9InhtcC5kaWQ6QjE2QUJENUYzODI3MTFFNEIxN0RGQ0MzMEIyNkQwNDEiPiA8eG1wTU06RGVyaXZlZEZyb20gc3RSZWY6aW5zdGFuY2VJRD0ieG1wLmlpZDpCMTZBQkQ1QzM4MjcxMUU0QjE3REZDQzMwQjI2RDA0MSIgc3RSZWY6ZG9jdW1lbnRJRD0ieG1wLmRpZDpCMTZBQkQ1RDM4MjcxMUU0QjE3REZDQzMwQjI2RDA0MSIvPiA8L3JkZjpEZXNjcmlwdGlvbj4gPC9yZGY6UkRGPiA8L3g6eG1wbWV0YT4gPD94cGFja2V0IGVuZD0iciI/PorMSJ0AABA5SURBVHja7F0JdFTlFb5v9skKSVgDhC3sFRG0uAIWrB7EqoindWldTku1VdEqyvGcWrXWqnVBrFZrq7VQRMFKRQQREKKgrMpq2BMghJiNSTKZN2/ee7133p3wMkySGUjCzOS/OffM5M3/3ryZ973vLv/970i6roMQIW0pFvEVCBEgEyJAJkRIS2KL55N7aUVexO1+dCPHuS0w0iEFn8exXIF6HuozqG16phljDwgm62AyBHUu6nLUS9oaYILJOpa4UB9kzeRt1cJcCmktuZgsPOqYsO0dHmTCXLaOzEJdFQFgJCcEkwk5E0lHfQP1p82MKRcgE3K6koX6X9TLWhhXKkCWoHKWwzVisA9RL41i7BHhkyWgSKhl6lmF2T+iBJiMekyALAHFiigrC+jg08/KB/g16rQox5ahlgiQJehJV2sABxUdbFK7vnU31CdiGH8Q1StAlsCyza8D4gzaEWfTUbvEMH6HiI8SGGTEYMfRL9uBQHO0D8qcqLfEuM8mAbEEZzIC2gZZg6Pon7naHmjnoubHMB4NOmwWEEtwkNHJk7n8rF6HIgSavW2BNjbG8YdQ9wiIJcG0ErHZCU1HoGngQe4g0ymBjh8sNpVazrydE+OprUf1CYglydwlMVgtAmypVw0CjlIcBJlY1CZpkGGvw2OpTcGtb4yn9UlbfV4ibCt/blKHFOdEkCx3C33ZNSDDi8eHw8f77wJd8sd0r3Wy1cLIzCL4Td4yGJhSCj7NHn5dc2I4oAeMCfNWBRaxNrGCjHdBJd5UHryhvPi8AgOgKwXI2gtoOlQobthRPRCvhhzbFdQl+LLsfFhZPgLWXvh7SLP6IKBbzZFlagynsgZaIdMfYixiZnQ7oRgd0AoE12H0P8sRWKGqYHoQIGtXHw2/ciuymMUf+85WGQqr8+HtI+Nh5oDF4FFSQq+4UVNiONL8M/VhiLUoqDmGYNqHT0pUApYRshLoQuYyIa6JcEvDgeaHVw5dBbfmroVMmzfEZikxMBlNI318usxFwPEikvYjsHailiK4AroBrEQBVVI6/q37jShwuKY3fFI2ClJsDSY3jTUa+Q/7ZDGBK+S8b0SHa2GdCssxWi4J6A2vWUV0mWxAU+H14klBc2mRgo5P1yi/K0pZvBErc9E77EIHa1GdBl/JGtToBrBsUrtOmQmQtaOMQ3/OsaF6EOyuzcWLrdC2nlHu+x7q3uh8R+PL34sm8QNkLsrzlWO0aIfEZi3hk7X8XfwVdSpQTkzSzJFDXhT70/hnormrib3IFK5H00iPkAC5LgEykxheTMxXjJayzUO9HrUWjOVstabXB0dxjLfJ6rXkd1WhU/+NT4NCxUhB2KWOcfcmjaiaDbq5SsBp84CsIm4kLdpd/8kAC5GNi/Jmmt6AgCEt7E/L3p5s7kumM9mOqNqEPtcJnv7qCABLOp9M1a2Q4yqD7qlFSGn2aHejGrGfmf63g2519HRVQG93BaUwOkPL1RdUyHikKfaqQF/rY68GK9Hvogy9M0kc+g4JMjKVDqsM52RtQsRFBTJaEPJo2LYAQsCfgsfJsNUjA1mGQvOFijQR/kr4RmIpC5ciUdRYjL6XU+qYkVbSfWZZdcIl3T6DrLRDaKOcLQ2/ELV32DYFdIuc66oChyUAuh7sZdGU1DETKuHsVYqgWkIpCZ8eNJV2CTqsJB3INDSZGY5q+EnfuWCV1JaCgP4RtnnQXFaOy9oFLouf2HFSM/s/RK6Wmb0o57UFo8YPvQZ7OSSRJ0rKz+9T3TC262oY3W0VGr/UWAOfwwhV74j0YgJYb2a7SPIO6msh9iJTWImYpkx9gU9rAJ2QJL7JZM0N1/SZDxnuEsRMk/5Z1amOnXV7J1cljMo8SOU+V0PkOcsvUe8KoZTmFTei70VJ1UOK3uEc+w4LMkpnZGOkeVP+q3jF9abM5qktBFRHwaVoKvullEmKZvtFhH2opPpGmsd2BiNHCEaO69H3UgR7dSyQhcwmRZrDgtGmK9KQsDWRUi3S3ufTeqyncuxxuOGHYeOLUKfYJCixhHwvZC9a/2kXvlfHBFlIJuUuBsmiRGIzmtA+mbHVbCt7pZUcmdx1K9SrzplhY2mh7mRkrz1Vqg4feQ3fS4HknhJqDYn3jD9VP5SdaUpjUKcdyGYbYWc5+vDWRms7nI1uNNXx2p29V0GWveZKTyDlKtO4HThoKvpee3Yja61DcNVqEcFl45TIINQBHL3SZ6B8XBqjnNIeNWC0lNqPug+1kFlSFSBrfxkGxoLa1/ninIZI+KfBZT2WIcjG8nVuWCrS6STAnGuHdS5cfn/fJe461fWc6QCfoSm8FV2u0rUYOdJiYmvjCe1+YDRfmYB6Af/vjtWyM9jWoS4Do3y7UoCsfeRzMNY7bgVjAnoZX4xIRYHEFpmMIGKJhopDv+aC/Mxd0D3tAJTW9TOXZg80IkoLMcisPw6eD+l23x9rA64RnJqYg+bxoeKALq9B9qpQG8DVnXwzMBqvXASx1f9HEnIYR7D+Cozq2o84TbJOgKzt5c9glNE8j/oUGHOEx/lOD/AFzmKAhUBGr3+KOptAqesSpFprYUzXL2DJgYHmYxuOfSDl+RmDFqy7ttvGG2sC7gco6kQwPYCkNZ/AtYt7buA2Yqo7wZhMzznDz6Xw+ZM4oHEZGdWvTWelVU8voi4RIGtbobnB3WD0BevF2pxksl90M+oMYgRFd8DIrA2wtGhacFYAJJ18pGtASS2Y0H3Dw0/mL5joUx3z0DQuRDw9uE/Ri7bKxgIO3DYBI8rf4firYgyWNGZeKgHaycHDYTCqNmr55gE2r3Q+2WCs7yR/bjjr5azEaI8yuwuQtbKQgcrjnNZoMEpq7oxyX6qg+Bc53wHN9pdsZxnkuEuhrA4PJynTIeAqH99t0/WLzntuUopVfcyr2m5B07iAar0QZFS8eiWay3vA+NGHaIUAVIC6lIFRaDbdMUoGm9DxqDeA8bsA1EL0YQ4UBMhaScj87eULfR3qY6hzUB9BvZb9mZaEHPlqi6S9abQjsAwAJX3M4MwD4z8a86zFapHde2T7JbsUjcCVi+Caiuz1cwZ1tPI1+1CLUY+20mf3MFBJ/4Q6CvUOMJbcvcF+qgBZK8qn/EgMQUvOZrH5IFNC0z/U3rxHM+bs7wiywhRbXQHo1qxhOetun9r3Pd+2gBd2y44vqlR1KsJvGvpdVzADRiOUzP0fHRtaecV4E0IB0D38OW9DnclMfTyuTVE8/95lE7+tRH7KIjBKogls1CB4A19wNzvNnfi5nbdTL/0qBNn+ajmrskLuljMoc/tQJMmLalXnZWgXx1jN6YyWhaI/KtemitrvzuJX1I/N6bYZk4qKBJO1nuzkfNTLqDS3OJm305d8gJX8txo4Wa9Pla1dNd0yoLOzIi/HdbyXojlSqcjRGVu2fhez1lyIj/78B1m7CnPZ+uJhc7GKfZVcDg5IJzS3I5Voq3pMi850fp/X2TTKcfh9lMXzxUr0uct3ONf1N1M6oLWEGqZQvRjVk01EfT9OASYc/3YQiuTu4mjrtxyBdj4DRqBasYUcaJQLiAiQhUdelD97nP006qY0kk2pLYIJ9HBURsnSLQwu6vH6faPICIdaLYFgKTc9D2h2COhiTXRHBVlIitnMkaYxyMgxps48GgcEJ1gJUIoZUDqXA9mkANitMvgCKVDq7Q0Vck7weZ+0/dDVfQxsCDxVs4K/5cUqAmTJ8kGCfWKRbewWhcESnCqg6LIQmadQMzn8xEoWSTXtpwXBRdW0Nos/CLNj9b1gU9k42FY5Gkq8fUBVEUzIYE5HFfRKPQT90/fC4E7fwoCM7wSKkhFklqDpMh6DZgxBomgOqPR1gX2e4eDxd8L/7Qg4Pzit9dA7tQiyXGXQ2VmO4wNQKXfBMVkgq47gPObm8ovgBG7zISuNylkX3H/N0Sng9WcbFRu4D1gCQdKTA6mwv2ok7K+4ANa5x8Fjo+/D95DxOKIuNiFBZo/QLZGYp0bJDPpG1QiU495eUFTXH47W5UEJaj0BI1TSH8ozIwjS7R4Ykf01MlAhrDhyHXxfnws6tTEgcGiOBldtT+Vow6oSqGy1ESgTGdCqBttL2S2KQFCig+yl7Y+feo0RGOX13aFeTQUfmTA1JdjvlS56kHGs3ojGtEbJgPUlk2E9xQQNzARGvwxku9My0biv3eIXKEpkkO2rOjciYAyAaMYqpMgAoXnM28HIoSFV6ZuRgebg2G38OgUE0zhFsQKMQkGKRKm/2HIeQ6XTVCY01jgGfMNpkg3GyxrISjoc8AyBH2RvAq+SFgoaaDHwLznIoIpXKhGqCFl6MNpT0bSUuUELFT7ey/z7LhiVFkkjcT13KT1RcDq70QTybL5gq/mCEuioWpHKZWiuk+b8QtNPe/gi0w33NoOTqh0+ByPBS1NJ1AtjKP9P/cuMAkIMBOySH6b0mwsTcxdjYGEjM05zidtN53MrGNNQJDSZvxKMWv7+HAkDv34zP78YTqMadsak+K38STZvdTwYc5rV/JwuKq0RoNZPVLVBU0NUo0WZ+1pObVCOrA8YC0CeBaNKlca9xWCkpXHDmNXotafBmHgPml1Ft8MH+6bDm7tnQrWcTQ1fdpjYEKDxb2PeG/IS4eSPgVHiOFSvth6SoNw62UE2ix+pR8WasNeopuxVMOrzyZQ5mc3uB2MKicq6d/P22Qwqs+c/m1lvGOfeTIGAD7Ycvxxe+PbpYADisMhzTfsRSDOZSc0roG4z3RhdTIwmfLI4li5s9ggYi5sYE4ok8tic+plVzEvRKFk7j1luIrMgjaXCSS+EmuQZ+2WGolKw1UGVryfM3Xt3zYwRf1hqkQLlOlhyeMwENtkO0/vk8/GnmN73QwGy+AcZOfTfsbmMyu2DyP0LbmLmIpCQs+Ph58SCAXboyZR+3Wgvax0Ue4becLAmf/WQztuW+FXnbSaGDbGfZrIgtEimBz9fDkn6U9LJOK3kPEM34HzUfzOwrmBHXWP2Wsls6WDwXX3K3pp1d2l9LxietXWuySRewI/EnFSfT+VJVFRpLu9+R6Qw4l++Z2CQA98XIv/WJK3NVMDcmiAyixFIX+D0RkiIvepMvqzMjnojF9dqr4H8zJ0041DA5zDINIAi1pdQfxQG0CIGcFKKJclAtpZvnPsivJ7G+aee0HztWabJR4rEkk2Laoe89L3QM+UwBDQbvcf7YSPm8OPLYdsXwinNXwTI4lWeYqa6m1MNfRg0lHsq4At5gMFihci/y7A6lHpicyZxmoFWSY01+XKnim4PdhGySQ3NXRbAyQW834KxAh6YtTaafLR5kMSSbCD7CoxO1lTI+AibIUpNfAFGw7vbw6LISP01KOP+Fkeg9EP1+ziYGME5rDqI1BhFt4DbWQ4jszcGJ+dZKCm72cRiAROwQmxGdXDfJDPIktHxX8S+0o85TaBwFLjM5ItRFDeSXwsHDG27g9mFnHyqQ9vAppZWeGdAhHbqoLlgVM4K6JFSDPWNW4g+wIz4boTzpPYKWwBAT2aQxfW0khBhLoUIESATIkAmpIPI/wUYAHgWZETgx0vuAAAAAElFTkSuQmCC</mdui:Logo>
-      </mdui:UIInfo>
-      <mdui:DiscoHints>
-        <mdui:IPHint>193.190.115.0/24</mdui:IPHint>
-        <mdui:IPHint>2001:06a8:3960::/48</mdui:IPHint>
-        <mdui:DomainHint>CRA.WALLONIE.BE</mdui:DomainHint>
-        <mdui:GeolocationHint>geo:50.5662,4.7247</mdui:GeolocationHint>
-      </mdui:DiscoHints>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDGDCCAgCgAwIBAgIVAIP1OBVd297uoZOia+Zqp6HAJ9DDMA0GCSqGSIb3DQEB
-BQUAMBYxFDASBgNVBAMTC2lkcC5jcmF3LmV1MB4XDTEzMDIxNTA3NDMyMVoXDTMz
-MDIxNTA3NDMyMVowFjEUMBIGA1UEAxMLaWRwLmNyYXcuZXUwggEiMA0GCSqGSIb3
-DQEBAQUAA4IBDwAwggEKAoIBAQDuCWtJ/aDFBmejY17mEqrlgFxmetfLJWKCy6vU
-25241tsMqWW42YVuxtPwKP6Z5ure+RCzgUF0ZdddKqyaUpmNxeIq7OC7q21mMeBQ
-yahzvjzq8VgcM2iKcgCw/nNnrSZwkIaJMaej7Aw2U5VVs65rZ6bbztQbMKj51BbJ
-FM28lyTLC96+mTaofJ8hvkn2cPH3IecCFlRwNcx4w5SGuVGIPNEISQ8ypEzd2MNA
-DcnwemG46Ipv/MyILJPWP19xjl7z6VgeBLNHc0iigepBOrSnSq49WXpdwvFlkjMY
-sbPxGD1CQfPXBo6dDBNQdjn3V4cdfWRO5/Dp0J4mkkFsJkzDAgMBAAGjXTBbMDoG
-A1UdEQQzMDGCC2lkcC5jcmF3LmV1hiJodHRwczovL2lkcC5jcmF3LmV1L2lkcC9z
-aGliYm9sZXRoMB0GA1UdDgQWBBQNbK63mDGwrA0LIPx4J3pCP/MHqjANBgkqhkiG
-9w0BAQUFAAOCAQEANbBixgiBQhJ/xB9Et8d+kZwK/OIC+Q08aCUuSlJ8URS7yB8a
-tQlX9xCW1Dj9eBVzsCNEVZQVhUA7SepbCHXwPh3cjim/255V/dboxEa5HtH76Pn5
-RSqOLhoN5SrqZn9JMZfJqIbU8vcLEwR9HqbFT0gDseyCExBdGEZb2cbnidxaTIrr
-yf6vu9LsSxP4gck3NrkfrUAWqxYis+a2qSXTni00wDcj5Si0DxZTIIFUfVeTPm02
-tEQG0fUEqzyBDxdQFuNsput7RfHF9S6iXjAEUyOc8+dXbxLs+kziJteBX01SSNI4
-NuU+VQNtPt46TiTwvP7DiXqrbeMbYZkfPB/jLQ==
-                	</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.craw.eu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.craw.eu: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.craw.eu/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.craw.eu/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.craw.eu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.craw.eu/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">craw.eu</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDGDCCAgCgAwIBAgIVAIP1OBVd297uoZOia+Zqp6HAJ9DDMA0GCSqGSIb3DQEB
-BQUAMBYxFDASBgNVBAMTC2lkcC5jcmF3LmV1MB4XDTEzMDIxNTA3NDMyMVoXDTMz
-MDIxNTA3NDMyMVowFjEUMBIGA1UEAxMLaWRwLmNyYXcuZXUwggEiMA0GCSqGSIb3
-DQEBAQUAA4IBDwAwggEKAoIBAQDuCWtJ/aDFBmejY17mEqrlgFxmetfLJWKCy6vU
-25241tsMqWW42YVuxtPwKP6Z5ure+RCzgUF0ZdddKqyaUpmNxeIq7OC7q21mMeBQ
-yahzvjzq8VgcM2iKcgCw/nNnrSZwkIaJMaej7Aw2U5VVs65rZ6bbztQbMKj51BbJ
-FM28lyTLC96+mTaofJ8hvkn2cPH3IecCFlRwNcx4w5SGuVGIPNEISQ8ypEzd2MNA
-DcnwemG46Ipv/MyILJPWP19xjl7z6VgeBLNHc0iigepBOrSnSq49WXpdwvFlkjMY
-sbPxGD1CQfPXBo6dDBNQdjn3V4cdfWRO5/Dp0J4mkkFsJkzDAgMBAAGjXTBbMDoG
-A1UdEQQzMDGCC2lkcC5jcmF3LmV1hiJodHRwczovL2lkcC5jcmF3LmV1L2lkcC9z
-aGliYm9sZXRoMB0GA1UdDgQWBBQNbK63mDGwrA0LIPx4J3pCP/MHqjANBgkqhkiG
-9w0BAQUFAAOCAQEANbBixgiBQhJ/xB9Et8d+kZwK/OIC+Q08aCUuSlJ8URS7yB8a
-tQlX9xCW1Dj9eBVzsCNEVZQVhUA7SepbCHXwPh3cjim/255V/dboxEa5HtH76Pn5
-RSqOLhoN5SrqZn9JMZfJqIbU8vcLEwR9HqbFT0gDseyCExBdGEZb2cbnidxaTIrr
-yf6vu9LsSxP4gck3NrkfrUAWqxYis+a2qSXTni00wDcj5Si0DxZTIIFUfVeTPm02
-tEQG0fUEqzyBDxdQFuNsput7RfHF9S6iXjAEUyOc8+dXbxLs+kziJteBX01SSNI4
-NuU+VQNtPt46TiTwvP7DiXqrbeMbYZkfPB/jLQ==
-			</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.craw.eu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.craw.eu: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">CRA-W</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">CRA-W</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.cra.wallonie.be</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Mikhael</GivenName>
-    <SurName>Jacquemain</SurName>
-    <EmailAddress>maintenance@cra.wallonie.be</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.crihan.fr-saml2-idp-metadata.php.xml b/swamid-interfederations-2.0/idp.crihan.fr-saml2-idp-metadata.php.xml
deleted file mode 100644
index ac88dc9c..00000000
--- a/swamid-interfederations-2.0/idp.crihan.fr-saml2-idp-metadata.php.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.crihan.fr/saml2/idp/metadata.php">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2013-02-26T22:24:07Z">
-      <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">crihan.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">CRIHAN</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="fr">CRIHAN</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDuTCCAqGgAwIBAgIJAOLMseq7bx2/MA0GCSqGSIb3DQEBBQUAMHMxCzAJBgNV
-BAYTAkZSMRgwFgYDVQQIDA9IYXV0ZS1Ob3JtYW5kaWUxITAfBgNVBAcMGFNhaW50
-LUV0aWVubmUgZHUgUm91dnJheTEPMA0GA1UECgwGQ1JJSEFOMRYwFAYDVQQDDA1p
-ZHAuY3JpaGFuLmZyMB4XDTE0MDMzMDIwMzMwOVoXDTE1MDMzMDIwMzMwOVowczEL
-MAkGA1UEBhMCRlIxGDAWBgNVBAgMD0hhdXRlLU5vcm1hbmRpZTEhMB8GA1UEBwwY
-U2FpbnQtRXRpZW5uZSBkdSBSb3V2cmF5MQ8wDQYDVQQKDAZDUklIQU4xFjAUBgNV
-BAMMDWlkcC5jcmloYW4uZnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
-AQDYz/YtjOJXUDjxiYvZ7DgydKh6SprShSQNGmnuGPiSG3gy/BGu3o4RdYcwpjjb
-juNiOfO3NO/d5CRd0Q/+/oZ+U428dR7TZ4KXLIeNq1Uc1yArkCw5C1PKATvhIrYf
-mfkeTSm5fVTidjpPTyausemv2tfL3TVRsQCWN/AvM60X2W2c1urXUF1z0j1aujGf
-ZagdEN/cZqd5vfr9gzt4z+h37Pfu2l2VFbrYvwUmqocAxJtbK9VGh1iy2Bwv7XFo
-xB0ARBIAo5NiKvimN+yDeckZUuxnOiy4DypabitPZxW7EkrQFZnn8xlFxFltAR5A
-alP/+NiJo5LTAbjVAcgumBx7AgMBAAGjUDBOMB0GA1UdDgQWBBTDMtkGXCjC/fQO
-Qo5ghr96ywqGJzAfBgNVHSMEGDAWgBTDMtkGXCjC/fQOQo5ghr96ywqGJzAMBgNV
-HRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQAGtApy7G1jQfy7qR3mvdEgj1ky
-UbunBQDtVIZf+OvrkhA225cnTFmrV8GEYiBKh5HWqbd1NOcRv3ynmx23u4JuOmLL
-kiXdrp0C7R3hqacCtIhkZqxwWYUsI6+cYSnJZK/hKwHC/FF/bflIwpHdcQchcnZt
-UlVpjCV44kLfXMuY6v6oN/tiyOtNCf20tt37h0O6PwEnbUWLlRXLo/tEMqXCQiGo
-TKaE/UzvPPpWoq0UNSlyvCM6BuzQnjnFVnN1pDTab+7MBvPLwet5hQ5CvoI5OmrW
-Ql1AtWmKiPR7Z3TUg7a1NbLmPHM1WvzuRGxvxvCzG4mMmJcGpbFGYl70P0tL
-					    </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://idp.crihan.fr/saml2/idp/SSOService.php"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.crihan.fr/saml2/idp/SSOService.php"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.crihan.fr/shib13/idp/SSOService.php"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">CRIHAN</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">CRIHAN</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Alain Bidaud</SurName>
-    <EmailAddress>alain.bidaud@crihan.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.crihan.fr.xml b/swamid-interfederations-2.0/idp.crihan.fr.xml
deleted file mode 100644
index ac88dc9c..00000000
--- a/swamid-interfederations-2.0/idp.crihan.fr.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.crihan.fr/saml2/idp/metadata.php">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2013-02-26T22:24:07Z">
-      <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">crihan.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">CRIHAN</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="fr">CRIHAN</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDuTCCAqGgAwIBAgIJAOLMseq7bx2/MA0GCSqGSIb3DQEBBQUAMHMxCzAJBgNV
-BAYTAkZSMRgwFgYDVQQIDA9IYXV0ZS1Ob3JtYW5kaWUxITAfBgNVBAcMGFNhaW50
-LUV0aWVubmUgZHUgUm91dnJheTEPMA0GA1UECgwGQ1JJSEFOMRYwFAYDVQQDDA1p
-ZHAuY3JpaGFuLmZyMB4XDTE0MDMzMDIwMzMwOVoXDTE1MDMzMDIwMzMwOVowczEL
-MAkGA1UEBhMCRlIxGDAWBgNVBAgMD0hhdXRlLU5vcm1hbmRpZTEhMB8GA1UEBwwY
-U2FpbnQtRXRpZW5uZSBkdSBSb3V2cmF5MQ8wDQYDVQQKDAZDUklIQU4xFjAUBgNV
-BAMMDWlkcC5jcmloYW4uZnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
-AQDYz/YtjOJXUDjxiYvZ7DgydKh6SprShSQNGmnuGPiSG3gy/BGu3o4RdYcwpjjb
-juNiOfO3NO/d5CRd0Q/+/oZ+U428dR7TZ4KXLIeNq1Uc1yArkCw5C1PKATvhIrYf
-mfkeTSm5fVTidjpPTyausemv2tfL3TVRsQCWN/AvM60X2W2c1urXUF1z0j1aujGf
-ZagdEN/cZqd5vfr9gzt4z+h37Pfu2l2VFbrYvwUmqocAxJtbK9VGh1iy2Bwv7XFo
-xB0ARBIAo5NiKvimN+yDeckZUuxnOiy4DypabitPZxW7EkrQFZnn8xlFxFltAR5A
-alP/+NiJo5LTAbjVAcgumBx7AgMBAAGjUDBOMB0GA1UdDgQWBBTDMtkGXCjC/fQO
-Qo5ghr96ywqGJzAfBgNVHSMEGDAWgBTDMtkGXCjC/fQOQo5ghr96ywqGJzAMBgNV
-HRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQAGtApy7G1jQfy7qR3mvdEgj1ky
-UbunBQDtVIZf+OvrkhA225cnTFmrV8GEYiBKh5HWqbd1NOcRv3ynmx23u4JuOmLL
-kiXdrp0C7R3hqacCtIhkZqxwWYUsI6+cYSnJZK/hKwHC/FF/bflIwpHdcQchcnZt
-UlVpjCV44kLfXMuY6v6oN/tiyOtNCf20tt37h0O6PwEnbUWLlRXLo/tEMqXCQiGo
-TKaE/UzvPPpWoq0UNSlyvCM6BuzQnjnFVnN1pDTab+7MBvPLwet5hQ5CvoI5OmrW
-Ql1AtWmKiPR7Z3TUg7a1NbLmPHM1WvzuRGxvxvCzG4mMmJcGpbFGYl70P0tL
-					    </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://idp.crihan.fr/saml2/idp/SSOService.php"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.crihan.fr/saml2/idp/SSOService.php"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.crihan.fr/shib13/idp/SSOService.php"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">CRIHAN</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">CRIHAN</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Alain Bidaud</SurName>
-    <EmailAddress>alain.bidaud@crihan.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.crous-antillesguyane.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.crous-antillesguyane.fr-idp-shibboleth.xml
deleted file mode 100644
index a5b85ac7..00000000
--- a/swamid-interfederations-2.0/idp.crous-antillesguyane.fr-idp-shibboleth.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://idp.crous-antillesguyane.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2014-03-24T21:07:26Z">
-      <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">crous-antillesguyane.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">CROUS Antilles-Guyane</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Personnels</mdui:Description>
-        <mdui:DisplayName xml:lang="fr">CROUS Antilles-Guyane</mdui:DisplayName>
-        <mdui:Description xml:lang="fr">Personnels</mdui:Description>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIEgzCCA2ugAwIBAgIQBjZn7mnVRLUqdolaNDbbYTANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTE0MDMxMDAwMDAwMFoXDTE3MDMwOTIzNTk1OVowSTEhMB8GA1UE
-CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMSQwIgYDVQQDExtpZHAuY3JvdXMt
-YW50aWxsZXNndXlhbmUuZnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
-AQDDK7ihTFYb45TPYFb6Iy5q3kl6WzlHN/qK1/fMWkkrVEAsTqo90WRDcuVfcv5/
-6rZwnTMRLGUteLBM9gKPDR/82dQIp5Sv7rzihNl5PcnhFdrq8TFaN5FhhjqfTiOx
-oEzhEQHo+8+bNSFbPkqBRWw+uXNqnX1x3r6Oqp5lbwdHXOkJ6NkhFCigSp//Nx5A
-D6JD1kNJI1fgRwrNyPoms79UnF2bgRB61V+4wooGpyARUPFu2gcYGYKWxuM+aLth
-D5r/s7eE2wfJiAUIos/LIWPnZVq29cNFJLZsVy7q4Ww2mo3pP0PJYQF6kWUX2oay
-vrbs70bwuytOQjR3ZToZtgJ3AgMBAAGjggF4MIIBdDAfBgNVHSMEGDAWgBQMvZNo
-DPPeq6NJays3V0fqkOO57TAdBgNVHQ4EFgQUhS79GiH1iog1fHCKwLFJ0/Xj70Uw
-DgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUH
-AwEGCCsGAQUFBwMCMCIGA1UdIAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQIB
-MDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVS
-RU5BU1NMQ0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDov
-L2NydC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGG
-Gmh0dHA6Ly9vY3NwLnRjcy50ZXJlbmEub3JnMCYGA1UdEQQfMB2CG2lkcC5jcm91
-cy1hbnRpbGxlc2d1eWFuZS5mcjANBgkqhkiG9w0BAQUFAAOCAQEAL8oG09k+jEKj
-MPr0RsBqYHJGB+X7N1UYYZzWaPy382j6ALeOEIIUa9YqGpMlG63b1k41FQb9/mou
-NAXe+SDURvTWzrZ8FHkC5cG05khGCCf+K4NToozehETd8dAHQ3N+KZHXaK2Q/4Xi
-so5n1j85kEn2GToLlZIRcQThcmI0bz4vFsHeoTPL35yTrkIu8uM6gc6gVksxcGHj
-BKSQcPTZ3CzfG17VTAb81JfX9z7Hw0hF7X8YEoENcraKUprpAuESEWfHE1FL96AD
-oMpSA1XVtEvkNZxECd5GZM4ivuqvuZ4ujrlceqO0vgcmvGYd8JLMLDqQSv8hmqRg
-Enlu3NfAgQ==
-					    </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://idp.crous-antillesguyane.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.crous-antillesguyane.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.crous-antillesguyane.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">crous-antillesguyane.fr</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIEgzCCA2ugAwIBAgIQBjZn7mnVRLUqdolaNDbbYTANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTE0MDMxMDAwMDAwMFoXDTE3MDMwOTIzNTk1OVowSTEhMB8GA1UE
-CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMSQwIgYDVQQDExtpZHAuY3JvdXMt
-YW50aWxsZXNndXlhbmUuZnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
-AQDDK7ihTFYb45TPYFb6Iy5q3kl6WzlHN/qK1/fMWkkrVEAsTqo90WRDcuVfcv5/
-6rZwnTMRLGUteLBM9gKPDR/82dQIp5Sv7rzihNl5PcnhFdrq8TFaN5FhhjqfTiOx
-oEzhEQHo+8+bNSFbPkqBRWw+uXNqnX1x3r6Oqp5lbwdHXOkJ6NkhFCigSp//Nx5A
-D6JD1kNJI1fgRwrNyPoms79UnF2bgRB61V+4wooGpyARUPFu2gcYGYKWxuM+aLth
-D5r/s7eE2wfJiAUIos/LIWPnZVq29cNFJLZsVy7q4Ww2mo3pP0PJYQF6kWUX2oay
-vrbs70bwuytOQjR3ZToZtgJ3AgMBAAGjggF4MIIBdDAfBgNVHSMEGDAWgBQMvZNo
-DPPeq6NJays3V0fqkOO57TAdBgNVHQ4EFgQUhS79GiH1iog1fHCKwLFJ0/Xj70Uw
-DgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUH
-AwEGCCsGAQUFBwMCMCIGA1UdIAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQIB
-MDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVS
-RU5BU1NMQ0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDov
-L2NydC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGG
-Gmh0dHA6Ly9vY3NwLnRjcy50ZXJlbmEub3JnMCYGA1UdEQQfMB2CG2lkcC5jcm91
-cy1hbnRpbGxlc2d1eWFuZS5mcjANBgkqhkiG9w0BAQUFAAOCAQEAL8oG09k+jEKj
-MPr0RsBqYHJGB+X7N1UYYZzWaPy382j6ALeOEIIUa9YqGpMlG63b1k41FQb9/mou
-NAXe+SDURvTWzrZ8FHkC5cG05khGCCf+K4NToozehETd8dAHQ3N+KZHXaK2Q/4Xi
-so5n1j85kEn2GToLlZIRcQThcmI0bz4vFsHeoTPL35yTrkIu8uM6gc6gVksxcGHj
-BKSQcPTZ3CzfG17VTAb81JfX9z7Hw0hF7X8YEoENcraKUprpAuESEWfHE1FL96AD
-oMpSA1XVtEvkNZxECd5GZM4ivuqvuZ4ujrlceqO0vgcmvGYd8JLMLDqQSv8hmqRg
-Enlu3NfAgQ==
-					    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.crous-antillesguyane.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">CROUS Antilles-Guyane</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">CROUS Antilles-Guyane</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <EmailAddress>philippe.luce@crous-antillesguyane.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.crous-antillesguyane.fr.xml b/swamid-interfederations-2.0/idp.crous-antillesguyane.fr.xml
deleted file mode 100644
index a5b85ac7..00000000
--- a/swamid-interfederations-2.0/idp.crous-antillesguyane.fr.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://idp.crous-antillesguyane.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2014-03-24T21:07:26Z">
-      <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">crous-antillesguyane.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">CROUS Antilles-Guyane</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Personnels</mdui:Description>
-        <mdui:DisplayName xml:lang="fr">CROUS Antilles-Guyane</mdui:DisplayName>
-        <mdui:Description xml:lang="fr">Personnels</mdui:Description>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIEgzCCA2ugAwIBAgIQBjZn7mnVRLUqdolaNDbbYTANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTE0MDMxMDAwMDAwMFoXDTE3MDMwOTIzNTk1OVowSTEhMB8GA1UE
-CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMSQwIgYDVQQDExtpZHAuY3JvdXMt
-YW50aWxsZXNndXlhbmUuZnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
-AQDDK7ihTFYb45TPYFb6Iy5q3kl6WzlHN/qK1/fMWkkrVEAsTqo90WRDcuVfcv5/
-6rZwnTMRLGUteLBM9gKPDR/82dQIp5Sv7rzihNl5PcnhFdrq8TFaN5FhhjqfTiOx
-oEzhEQHo+8+bNSFbPkqBRWw+uXNqnX1x3r6Oqp5lbwdHXOkJ6NkhFCigSp//Nx5A
-D6JD1kNJI1fgRwrNyPoms79UnF2bgRB61V+4wooGpyARUPFu2gcYGYKWxuM+aLth
-D5r/s7eE2wfJiAUIos/LIWPnZVq29cNFJLZsVy7q4Ww2mo3pP0PJYQF6kWUX2oay
-vrbs70bwuytOQjR3ZToZtgJ3AgMBAAGjggF4MIIBdDAfBgNVHSMEGDAWgBQMvZNo
-DPPeq6NJays3V0fqkOO57TAdBgNVHQ4EFgQUhS79GiH1iog1fHCKwLFJ0/Xj70Uw
-DgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUH
-AwEGCCsGAQUFBwMCMCIGA1UdIAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQIB
-MDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVS
-RU5BU1NMQ0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDov
-L2NydC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGG
-Gmh0dHA6Ly9vY3NwLnRjcy50ZXJlbmEub3JnMCYGA1UdEQQfMB2CG2lkcC5jcm91
-cy1hbnRpbGxlc2d1eWFuZS5mcjANBgkqhkiG9w0BAQUFAAOCAQEAL8oG09k+jEKj
-MPr0RsBqYHJGB+X7N1UYYZzWaPy382j6ALeOEIIUa9YqGpMlG63b1k41FQb9/mou
-NAXe+SDURvTWzrZ8FHkC5cG05khGCCf+K4NToozehETd8dAHQ3N+KZHXaK2Q/4Xi
-so5n1j85kEn2GToLlZIRcQThcmI0bz4vFsHeoTPL35yTrkIu8uM6gc6gVksxcGHj
-BKSQcPTZ3CzfG17VTAb81JfX9z7Hw0hF7X8YEoENcraKUprpAuESEWfHE1FL96AD
-oMpSA1XVtEvkNZxECd5GZM4ivuqvuZ4ujrlceqO0vgcmvGYd8JLMLDqQSv8hmqRg
-Enlu3NfAgQ==
-					    </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://idp.crous-antillesguyane.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.crous-antillesguyane.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.crous-antillesguyane.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">crous-antillesguyane.fr</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIEgzCCA2ugAwIBAgIQBjZn7mnVRLUqdolaNDbbYTANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTE0MDMxMDAwMDAwMFoXDTE3MDMwOTIzNTk1OVowSTEhMB8GA1UE
-CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMSQwIgYDVQQDExtpZHAuY3JvdXMt
-YW50aWxsZXNndXlhbmUuZnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
-AQDDK7ihTFYb45TPYFb6Iy5q3kl6WzlHN/qK1/fMWkkrVEAsTqo90WRDcuVfcv5/
-6rZwnTMRLGUteLBM9gKPDR/82dQIp5Sv7rzihNl5PcnhFdrq8TFaN5FhhjqfTiOx
-oEzhEQHo+8+bNSFbPkqBRWw+uXNqnX1x3r6Oqp5lbwdHXOkJ6NkhFCigSp//Nx5A
-D6JD1kNJI1fgRwrNyPoms79UnF2bgRB61V+4wooGpyARUPFu2gcYGYKWxuM+aLth
-D5r/s7eE2wfJiAUIos/LIWPnZVq29cNFJLZsVy7q4Ww2mo3pP0PJYQF6kWUX2oay
-vrbs70bwuytOQjR3ZToZtgJ3AgMBAAGjggF4MIIBdDAfBgNVHSMEGDAWgBQMvZNo
-DPPeq6NJays3V0fqkOO57TAdBgNVHQ4EFgQUhS79GiH1iog1fHCKwLFJ0/Xj70Uw
-DgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUH
-AwEGCCsGAQUFBwMCMCIGA1UdIAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQIB
-MDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVS
-RU5BU1NMQ0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDov
-L2NydC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGG
-Gmh0dHA6Ly9vY3NwLnRjcy50ZXJlbmEub3JnMCYGA1UdEQQfMB2CG2lkcC5jcm91
-cy1hbnRpbGxlc2d1eWFuZS5mcjANBgkqhkiG9w0BAQUFAAOCAQEAL8oG09k+jEKj
-MPr0RsBqYHJGB+X7N1UYYZzWaPy382j6ALeOEIIUa9YqGpMlG63b1k41FQb9/mou
-NAXe+SDURvTWzrZ8FHkC5cG05khGCCf+K4NToozehETd8dAHQ3N+KZHXaK2Q/4Xi
-so5n1j85kEn2GToLlZIRcQThcmI0bz4vFsHeoTPL35yTrkIu8uM6gc6gVksxcGHj
-BKSQcPTZ3CzfG17VTAb81JfX9z7Hw0hF7X8YEoENcraKUprpAuESEWfHE1FL96AD
-oMpSA1XVtEvkNZxECd5GZM4ivuqvuZ4ujrlceqO0vgcmvGYd8JLMLDqQSv8hmqRg
-Enlu3NfAgQ==
-					    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.crous-antillesguyane.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">CROUS Antilles-Guyane</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">CROUS Antilles-Guyane</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <EmailAddress>philippe.luce@crous-antillesguyane.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.crous-besancon.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.crous-besancon.fr-idp-shibboleth.xml
deleted file mode 100644
index 388604e7..00000000
--- a/swamid-interfederations-2.0/idp.crous-besancon.fr-idp-shibboleth.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://idp.crous-besancon.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2013-01-18T10:49:49Z">
-      <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">crous-besancon.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">CROUS Besançon</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIEdTCCA12gAwIBAgIRAMZII76u8I/UaoGm5SHA9bswDQYJKoZIhvcNAQEFBQAw
-NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-IFNTTCBDQTAeFw0xMzAxMTQwMDAwMDBaFw0xNjAxMTQyMzU5NTlaMEoxCzAJBgNV
-BAYTAkZSMRswGQYDVQQKDBJDUk9VUyBkZSBCZXNhbsOnb24xHjAcBgNVBAMTFWlk
-cC5jcm91cy1iZXNhbmNvbi5mcjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
-ggEBALpNghTEzhTIawLDDjS/sesh2W/WcgCNgVLIzoa1795aVCaY3aDhz+16lMI+
-TKb4kkuyhCeJIXejqsXw4U+Le+kC+sK4gUp5mA5L+uo/BuEhIEGx6zvO7vWatqAa
-D2EuxFJA9rCwP/TVown6joGk02+9uz5Gw8Nfj7vZm8tah/HjGrDO3Vn3d53bICZ5
-T+om3m17qlljZiQ2LWXZTK9jpmE7kWy4mQQaqq2a1Mp7jHusJiYnn8D9IRRY6Ey0
-4qGeY8+VBRujOLyp4PZaK58zaI7Ed4Ss7nNS2CnqK1ltdP4YMFRVbxwQTlYIj2q7
-0Nxre0tUcvJx2oJ24FVDzOPL5D0CAwEAAaOCAWgwggFkMB8GA1UdIwQYMBaAFAy9
-k2gM896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBRdTWXEAZpCffTTzWWVcU5re0Yg
-ETAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEF
-BQcDAQYIKwYBBQUHAwIwGAYDVR0gBBEwDzANBgsrBgEEAbIxAQICHTA6BgNVHR8E
-MzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENB
-LmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNz
-LnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8v
-b2NzcC50Y3MudGVyZW5hLm9yZzAgBgNVHREEGTAXghVpZHAuY3JvdXMtYmVzYW5j
-b24uZnIwDQYJKoZIhvcNAQEFBQADggEBACAPs8z9GwVDKrtfurYVM0G4WqoKRy5g
-WiCF2CPTi5AcVOSurS6xVJg8ROL9eZOvpGh/rQ30RWpKCMoKjKU2pjrMIT7a3+EM
-7GskmRa87RVaBjIIU5ObwYBFVJ8BPoTuNBRM8PqfPSJtOAzAGtV99X+HNv29+E18
-z6UFnzhaE553mUhn77cHzWpV6nXPGkT3XBhj6I8i84tPkvWOc93zkZQNmBnSn5Ih
-2ZK+P9ZxijpVuWiOyRonrEm2hPgZT2hzTEJ1SRqSXCU7nQyu0aTXIt+2hAJMsLYI
-n7hoK/jQFwrxRIsNXyDdM5LA+HYeesO0vSRGBmVDpcZsaQ7AvSiri4U=
-					    </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://idp.crous-besancon.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.crous-besancon.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.crous-besancon.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">crous-besancon.fr</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIEdTCCA12gAwIBAgIRAMZII76u8I/UaoGm5SHA9bswDQYJKoZIhvcNAQEFBQAw
-NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-IFNTTCBDQTAeFw0xMzAxMTQwMDAwMDBaFw0xNjAxMTQyMzU5NTlaMEoxCzAJBgNV
-BAYTAkZSMRswGQYDVQQKDBJDUk9VUyBkZSBCZXNhbsOnb24xHjAcBgNVBAMTFWlk
-cC5jcm91cy1iZXNhbmNvbi5mcjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
-ggEBALpNghTEzhTIawLDDjS/sesh2W/WcgCNgVLIzoa1795aVCaY3aDhz+16lMI+
-TKb4kkuyhCeJIXejqsXw4U+Le+kC+sK4gUp5mA5L+uo/BuEhIEGx6zvO7vWatqAa
-D2EuxFJA9rCwP/TVown6joGk02+9uz5Gw8Nfj7vZm8tah/HjGrDO3Vn3d53bICZ5
-T+om3m17qlljZiQ2LWXZTK9jpmE7kWy4mQQaqq2a1Mp7jHusJiYnn8D9IRRY6Ey0
-4qGeY8+VBRujOLyp4PZaK58zaI7Ed4Ss7nNS2CnqK1ltdP4YMFRVbxwQTlYIj2q7
-0Nxre0tUcvJx2oJ24FVDzOPL5D0CAwEAAaOCAWgwggFkMB8GA1UdIwQYMBaAFAy9
-k2gM896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBRdTWXEAZpCffTTzWWVcU5re0Yg
-ETAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEF
-BQcDAQYIKwYBBQUHAwIwGAYDVR0gBBEwDzANBgsrBgEEAbIxAQICHTA6BgNVHR8E
-MzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENB
-LmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNz
-LnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8v
-b2NzcC50Y3MudGVyZW5hLm9yZzAgBgNVHREEGTAXghVpZHAuY3JvdXMtYmVzYW5j
-b24uZnIwDQYJKoZIhvcNAQEFBQADggEBACAPs8z9GwVDKrtfurYVM0G4WqoKRy5g
-WiCF2CPTi5AcVOSurS6xVJg8ROL9eZOvpGh/rQ30RWpKCMoKjKU2pjrMIT7a3+EM
-7GskmRa87RVaBjIIU5ObwYBFVJ8BPoTuNBRM8PqfPSJtOAzAGtV99X+HNv29+E18
-z6UFnzhaE553mUhn77cHzWpV6nXPGkT3XBhj6I8i84tPkvWOc93zkZQNmBnSn5Ih
-2ZK+P9ZxijpVuWiOyRonrEm2hPgZT2hzTEJ1SRqSXCU7nQyu0aTXIt+2hAJMsLYI
-n7hoK/jQFwrxRIsNXyDdM5LA+HYeesO0vSRGBmVDpcZsaQ7AvSiri4U=
-					    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.crous-besancon.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">CROUS Besançon</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">CROUS Besançon</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Christophe GONZALEZ</SurName>
-    <EmailAddress>christophe.gonzalez@crous-besancon.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.crous-besancon.fr.xml b/swamid-interfederations-2.0/idp.crous-besancon.fr.xml
deleted file mode 100644
index 388604e7..00000000
--- a/swamid-interfederations-2.0/idp.crous-besancon.fr.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://idp.crous-besancon.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2013-01-18T10:49:49Z">
-      <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">crous-besancon.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">CROUS Besançon</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIEdTCCA12gAwIBAgIRAMZII76u8I/UaoGm5SHA9bswDQYJKoZIhvcNAQEFBQAw
-NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-IFNTTCBDQTAeFw0xMzAxMTQwMDAwMDBaFw0xNjAxMTQyMzU5NTlaMEoxCzAJBgNV
-BAYTAkZSMRswGQYDVQQKDBJDUk9VUyBkZSBCZXNhbsOnb24xHjAcBgNVBAMTFWlk
-cC5jcm91cy1iZXNhbmNvbi5mcjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
-ggEBALpNghTEzhTIawLDDjS/sesh2W/WcgCNgVLIzoa1795aVCaY3aDhz+16lMI+
-TKb4kkuyhCeJIXejqsXw4U+Le+kC+sK4gUp5mA5L+uo/BuEhIEGx6zvO7vWatqAa
-D2EuxFJA9rCwP/TVown6joGk02+9uz5Gw8Nfj7vZm8tah/HjGrDO3Vn3d53bICZ5
-T+om3m17qlljZiQ2LWXZTK9jpmE7kWy4mQQaqq2a1Mp7jHusJiYnn8D9IRRY6Ey0
-4qGeY8+VBRujOLyp4PZaK58zaI7Ed4Ss7nNS2CnqK1ltdP4YMFRVbxwQTlYIj2q7
-0Nxre0tUcvJx2oJ24FVDzOPL5D0CAwEAAaOCAWgwggFkMB8GA1UdIwQYMBaAFAy9
-k2gM896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBRdTWXEAZpCffTTzWWVcU5re0Yg
-ETAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEF
-BQcDAQYIKwYBBQUHAwIwGAYDVR0gBBEwDzANBgsrBgEEAbIxAQICHTA6BgNVHR8E
-MzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENB
-LmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNz
-LnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8v
-b2NzcC50Y3MudGVyZW5hLm9yZzAgBgNVHREEGTAXghVpZHAuY3JvdXMtYmVzYW5j
-b24uZnIwDQYJKoZIhvcNAQEFBQADggEBACAPs8z9GwVDKrtfurYVM0G4WqoKRy5g
-WiCF2CPTi5AcVOSurS6xVJg8ROL9eZOvpGh/rQ30RWpKCMoKjKU2pjrMIT7a3+EM
-7GskmRa87RVaBjIIU5ObwYBFVJ8BPoTuNBRM8PqfPSJtOAzAGtV99X+HNv29+E18
-z6UFnzhaE553mUhn77cHzWpV6nXPGkT3XBhj6I8i84tPkvWOc93zkZQNmBnSn5Ih
-2ZK+P9ZxijpVuWiOyRonrEm2hPgZT2hzTEJ1SRqSXCU7nQyu0aTXIt+2hAJMsLYI
-n7hoK/jQFwrxRIsNXyDdM5LA+HYeesO0vSRGBmVDpcZsaQ7AvSiri4U=
-					    </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://idp.crous-besancon.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.crous-besancon.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.crous-besancon.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">crous-besancon.fr</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIEdTCCA12gAwIBAgIRAMZII76u8I/UaoGm5SHA9bswDQYJKoZIhvcNAQEFBQAw
-NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-IFNTTCBDQTAeFw0xMzAxMTQwMDAwMDBaFw0xNjAxMTQyMzU5NTlaMEoxCzAJBgNV
-BAYTAkZSMRswGQYDVQQKDBJDUk9VUyBkZSBCZXNhbsOnb24xHjAcBgNVBAMTFWlk
-cC5jcm91cy1iZXNhbmNvbi5mcjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
-ggEBALpNghTEzhTIawLDDjS/sesh2W/WcgCNgVLIzoa1795aVCaY3aDhz+16lMI+
-TKb4kkuyhCeJIXejqsXw4U+Le+kC+sK4gUp5mA5L+uo/BuEhIEGx6zvO7vWatqAa
-D2EuxFJA9rCwP/TVown6joGk02+9uz5Gw8Nfj7vZm8tah/HjGrDO3Vn3d53bICZ5
-T+om3m17qlljZiQ2LWXZTK9jpmE7kWy4mQQaqq2a1Mp7jHusJiYnn8D9IRRY6Ey0
-4qGeY8+VBRujOLyp4PZaK58zaI7Ed4Ss7nNS2CnqK1ltdP4YMFRVbxwQTlYIj2q7
-0Nxre0tUcvJx2oJ24FVDzOPL5D0CAwEAAaOCAWgwggFkMB8GA1UdIwQYMBaAFAy9
-k2gM896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBRdTWXEAZpCffTTzWWVcU5re0Yg
-ETAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEF
-BQcDAQYIKwYBBQUHAwIwGAYDVR0gBBEwDzANBgsrBgEEAbIxAQICHTA6BgNVHR8E
-MzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENB
-LmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNz
-LnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8v
-b2NzcC50Y3MudGVyZW5hLm9yZzAgBgNVHREEGTAXghVpZHAuY3JvdXMtYmVzYW5j
-b24uZnIwDQYJKoZIhvcNAQEFBQADggEBACAPs8z9GwVDKrtfurYVM0G4WqoKRy5g
-WiCF2CPTi5AcVOSurS6xVJg8ROL9eZOvpGh/rQ30RWpKCMoKjKU2pjrMIT7a3+EM
-7GskmRa87RVaBjIIU5ObwYBFVJ8BPoTuNBRM8PqfPSJtOAzAGtV99X+HNv29+E18
-z6UFnzhaE553mUhn77cHzWpV6nXPGkT3XBhj6I8i84tPkvWOc93zkZQNmBnSn5Ih
-2ZK+P9ZxijpVuWiOyRonrEm2hPgZT2hzTEJ1SRqSXCU7nQyu0aTXIt+2hAJMsLYI
-n7hoK/jQFwrxRIsNXyDdM5LA+HYeesO0vSRGBmVDpcZsaQ7AvSiri4U=
-					    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.crous-besancon.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">CROUS Besançon</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">CROUS Besançon</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Christophe GONZALEZ</SurName>
-    <EmailAddress>christophe.gonzalez@crous-besancon.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.crous-caen.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.crous-caen.fr-idp-shibboleth.xml
deleted file mode 100644
index 8d4b5a93..00000000
--- a/swamid-interfederations-2.0/idp.crous-caen.fr-idp-shibboleth.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://idp.crous-caen.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2014-04-01T14:27:34Z">
-      <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">crous-caen.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Crous Caen</mdui:DisplayName>
-        <mdui:Description xml:lang="en">crous de caen staff</mdui:Description>
-        <mdui:DisplayName xml:lang="fr">CROUS Caen</mdui:DisplayName>
-        <mdui:Description xml:lang="fr">personnels du crous de caen</mdui:Description>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIEcDCCA1igAwIBAgIRAIWsCoLazwNaSeCwR4r4mw8wDQYJKoZIhvcNAQEFBQAw
-NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-IFNTTCBDQTAeFw0xNDAzMzEwMDAwMDBaFw0xNzAzMzAyMzU5NTlaMD8xITAfBgNV
-BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEaMBgGA1UEAxMRaWRwLmNyb3Vz
-LWNhZW4uZnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDTFSohRXDn
-CnvxZd86dGAifbs6BUZuqKHPGWiQcepaxGp4U5Ivls0y+pWqaWJqBcbCO8yH/Yme
-FozWr8YqHtftwydrB2ktVKqs15xqMkodjhFpmJHp3Bkk9n5V9xIWg6pAyUXk3snf
-AaPcBVIGP6ObTer3WKBcAM7rm9QiB6dXGrKsG0q27CY+SToNV5VuRUBiJrwSRoKd
-vWodQksuhrlN+c1sA9coBD6BKketpvv3d4bVJ7NR1ZgDPvMfWyqTBF3jEqkf2+eT
-F4iDsxEQb6DQ0OXhuYH0SBd/UkGsXagxaCNLNGmMsO+n31Mvq2eCVyJKV8f3MWxr
-qs8Z83VR5aZ1AgMBAAGjggFuMIIBajAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3
-V0fqkOO57TAdBgNVHQ4EFgQUJnW8QFQ+qp57ZDxP6o/OTRDBDi8wDgYDVR0PAQH/
-BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUF
-BwMCMCIGA1UdIAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQIBMDoGA1UdHwQz
-MDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0Eu
-Y3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50Y3Mu
-dGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9v
-Y3NwLnRjcy50ZXJlbmEub3JnMBwGA1UdEQQVMBOCEWlkcC5jcm91cy1jYWVuLmZy
-MA0GCSqGSIb3DQEBBQUAA4IBAQArg36XXkJ687hPW1Njtu2rQVExvAilcslSCCjg
-hE6o/dya/QltStjg3QymVlqJhEF+vvYA3aQJbaYtJt1FQ32VEI3zC7PXcAiAkekg
-yCF7zHtMKrE3caHZuKA7X8H6tb3IzX8g55P8sel2rPNPgz/BI1ieEdgE+p1Zgn9G
-e9tdPtPyG4JZnWgfWzhbdZy/0Ne4yB9UTdW1/x6jfnp7KiWqx8+mLctqIZsmGDmx
-XSnVGQ4FP9MQpvTptfEnS6/4wn0Op3gblHgfxmgzfbZMXGlv4gvLsbcf9VBdMkcx
-QbXCZZ1pDB4RQF2ix2wg6j8BRKFrMZk0nz5VF5UtUR3Yk9Tg
-					    </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://idp.crous-caen.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.crous-caen.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.crous-caen.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">crous-caen.fr</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIEcDCCA1igAwIBAgIRAIWsCoLazwNaSeCwR4r4mw8wDQYJKoZIhvcNAQEFBQAw
-NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-IFNTTCBDQTAeFw0xNDAzMzEwMDAwMDBaFw0xNzAzMzAyMzU5NTlaMD8xITAfBgNV
-BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEaMBgGA1UEAxMRaWRwLmNyb3Vz
-LWNhZW4uZnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDTFSohRXDn
-CnvxZd86dGAifbs6BUZuqKHPGWiQcepaxGp4U5Ivls0y+pWqaWJqBcbCO8yH/Yme
-FozWr8YqHtftwydrB2ktVKqs15xqMkodjhFpmJHp3Bkk9n5V9xIWg6pAyUXk3snf
-AaPcBVIGP6ObTer3WKBcAM7rm9QiB6dXGrKsG0q27CY+SToNV5VuRUBiJrwSRoKd
-vWodQksuhrlN+c1sA9coBD6BKketpvv3d4bVJ7NR1ZgDPvMfWyqTBF3jEqkf2+eT
-F4iDsxEQb6DQ0OXhuYH0SBd/UkGsXagxaCNLNGmMsO+n31Mvq2eCVyJKV8f3MWxr
-qs8Z83VR5aZ1AgMBAAGjggFuMIIBajAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3
-V0fqkOO57TAdBgNVHQ4EFgQUJnW8QFQ+qp57ZDxP6o/OTRDBDi8wDgYDVR0PAQH/
-BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUF
-BwMCMCIGA1UdIAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQIBMDoGA1UdHwQz
-MDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0Eu
-Y3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50Y3Mu
-dGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9v
-Y3NwLnRjcy50ZXJlbmEub3JnMBwGA1UdEQQVMBOCEWlkcC5jcm91cy1jYWVuLmZy
-MA0GCSqGSIb3DQEBBQUAA4IBAQArg36XXkJ687hPW1Njtu2rQVExvAilcslSCCjg
-hE6o/dya/QltStjg3QymVlqJhEF+vvYA3aQJbaYtJt1FQ32VEI3zC7PXcAiAkekg
-yCF7zHtMKrE3caHZuKA7X8H6tb3IzX8g55P8sel2rPNPgz/BI1ieEdgE+p1Zgn9G
-e9tdPtPyG4JZnWgfWzhbdZy/0Ne4yB9UTdW1/x6jfnp7KiWqx8+mLctqIZsmGDmx
-XSnVGQ4FP9MQpvTptfEnS6/4wn0Op3gblHgfxmgzfbZMXGlv4gvLsbcf9VBdMkcx
-QbXCZZ1pDB4RQF2ix2wg6j8BRKFrMZk0nz5VF5UtUR3Yk9Tg
-					    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.crous-caen.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">CROUS Caen</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">CROUS Caen</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <EmailAddress>service.informatique@crous-caen.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.crous-caen.fr.xml b/swamid-interfederations-2.0/idp.crous-caen.fr.xml
deleted file mode 100644
index 8d4b5a93..00000000
--- a/swamid-interfederations-2.0/idp.crous-caen.fr.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://idp.crous-caen.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2014-04-01T14:27:34Z">
-      <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">crous-caen.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Crous Caen</mdui:DisplayName>
-        <mdui:Description xml:lang="en">crous de caen staff</mdui:Description>
-        <mdui:DisplayName xml:lang="fr">CROUS Caen</mdui:DisplayName>
-        <mdui:Description xml:lang="fr">personnels du crous de caen</mdui:Description>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIEcDCCA1igAwIBAgIRAIWsCoLazwNaSeCwR4r4mw8wDQYJKoZIhvcNAQEFBQAw
-NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-IFNTTCBDQTAeFw0xNDAzMzEwMDAwMDBaFw0xNzAzMzAyMzU5NTlaMD8xITAfBgNV
-BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEaMBgGA1UEAxMRaWRwLmNyb3Vz
-LWNhZW4uZnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDTFSohRXDn
-CnvxZd86dGAifbs6BUZuqKHPGWiQcepaxGp4U5Ivls0y+pWqaWJqBcbCO8yH/Yme
-FozWr8YqHtftwydrB2ktVKqs15xqMkodjhFpmJHp3Bkk9n5V9xIWg6pAyUXk3snf
-AaPcBVIGP6ObTer3WKBcAM7rm9QiB6dXGrKsG0q27CY+SToNV5VuRUBiJrwSRoKd
-vWodQksuhrlN+c1sA9coBD6BKketpvv3d4bVJ7NR1ZgDPvMfWyqTBF3jEqkf2+eT
-F4iDsxEQb6DQ0OXhuYH0SBd/UkGsXagxaCNLNGmMsO+n31Mvq2eCVyJKV8f3MWxr
-qs8Z83VR5aZ1AgMBAAGjggFuMIIBajAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3
-V0fqkOO57TAdBgNVHQ4EFgQUJnW8QFQ+qp57ZDxP6o/OTRDBDi8wDgYDVR0PAQH/
-BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUF
-BwMCMCIGA1UdIAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQIBMDoGA1UdHwQz
-MDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0Eu
-Y3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50Y3Mu
-dGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9v
-Y3NwLnRjcy50ZXJlbmEub3JnMBwGA1UdEQQVMBOCEWlkcC5jcm91cy1jYWVuLmZy
-MA0GCSqGSIb3DQEBBQUAA4IBAQArg36XXkJ687hPW1Njtu2rQVExvAilcslSCCjg
-hE6o/dya/QltStjg3QymVlqJhEF+vvYA3aQJbaYtJt1FQ32VEI3zC7PXcAiAkekg
-yCF7zHtMKrE3caHZuKA7X8H6tb3IzX8g55P8sel2rPNPgz/BI1ieEdgE+p1Zgn9G
-e9tdPtPyG4JZnWgfWzhbdZy/0Ne4yB9UTdW1/x6jfnp7KiWqx8+mLctqIZsmGDmx
-XSnVGQ4FP9MQpvTptfEnS6/4wn0Op3gblHgfxmgzfbZMXGlv4gvLsbcf9VBdMkcx
-QbXCZZ1pDB4RQF2ix2wg6j8BRKFrMZk0nz5VF5UtUR3Yk9Tg
-					    </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://idp.crous-caen.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.crous-caen.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.crous-caen.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">crous-caen.fr</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIEcDCCA1igAwIBAgIRAIWsCoLazwNaSeCwR4r4mw8wDQYJKoZIhvcNAQEFBQAw
-NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-IFNTTCBDQTAeFw0xNDAzMzEwMDAwMDBaFw0xNzAzMzAyMzU5NTlaMD8xITAfBgNV
-BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEaMBgGA1UEAxMRaWRwLmNyb3Vz
-LWNhZW4uZnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDTFSohRXDn
-CnvxZd86dGAifbs6BUZuqKHPGWiQcepaxGp4U5Ivls0y+pWqaWJqBcbCO8yH/Yme
-FozWr8YqHtftwydrB2ktVKqs15xqMkodjhFpmJHp3Bkk9n5V9xIWg6pAyUXk3snf
-AaPcBVIGP6ObTer3WKBcAM7rm9QiB6dXGrKsG0q27CY+SToNV5VuRUBiJrwSRoKd
-vWodQksuhrlN+c1sA9coBD6BKketpvv3d4bVJ7NR1ZgDPvMfWyqTBF3jEqkf2+eT
-F4iDsxEQb6DQ0OXhuYH0SBd/UkGsXagxaCNLNGmMsO+n31Mvq2eCVyJKV8f3MWxr
-qs8Z83VR5aZ1AgMBAAGjggFuMIIBajAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3
-V0fqkOO57TAdBgNVHQ4EFgQUJnW8QFQ+qp57ZDxP6o/OTRDBDi8wDgYDVR0PAQH/
-BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUF
-BwMCMCIGA1UdIAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQIBMDoGA1UdHwQz
-MDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0Eu
-Y3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50Y3Mu
-dGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9v
-Y3NwLnRjcy50ZXJlbmEub3JnMBwGA1UdEQQVMBOCEWlkcC5jcm91cy1jYWVuLmZy
-MA0GCSqGSIb3DQEBBQUAA4IBAQArg36XXkJ687hPW1Njtu2rQVExvAilcslSCCjg
-hE6o/dya/QltStjg3QymVlqJhEF+vvYA3aQJbaYtJt1FQ32VEI3zC7PXcAiAkekg
-yCF7zHtMKrE3caHZuKA7X8H6tb3IzX8g55P8sel2rPNPgz/BI1ieEdgE+p1Zgn9G
-e9tdPtPyG4JZnWgfWzhbdZy/0Ne4yB9UTdW1/x6jfnp7KiWqx8+mLctqIZsmGDmx
-XSnVGQ4FP9MQpvTptfEnS6/4wn0Op3gblHgfxmgzfbZMXGlv4gvLsbcf9VBdMkcx
-QbXCZZ1pDB4RQF2ix2wg6j8BRKFrMZk0nz5VF5UtUR3Yk9Tg
-					    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.crous-caen.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">CROUS Caen</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">CROUS Caen</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <EmailAddress>service.informatique@crous-caen.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.crous-clermont.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.crous-clermont.fr-idp-shibboleth.xml
deleted file mode 100644
index 5aa2f1bc..00000000
--- a/swamid-interfederations-2.0/idp.crous-clermont.fr-idp-shibboleth.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://idp.crous-clermont.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2013-02-07T15:26:52Z">
-      <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">crous-clermont.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">CROUS Clermont-Ferrand</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIEeDCCA2CgAwIBAgIRALsQfprdKL/wDycsZup+t2UwDQYJKoZIhvcNAQEFBQAw
-NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-IFNTTCBDQTAeFw0xMzAyMDYwMDAwMDBaFw0xNjAyMDYyMzU5NTlaMEMxITAfBgNV
-BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEeMBwGA1UEAxMVaWRwLmNyb3Vz
-LWNsZXJtb250LmZyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAyeWI
-rH5JgGXXLn1toJKE4uQB2O8Inq44XRbzewIM/NHxn3tsreYba2Yce8xPrMf4gYzZ
-Rp+93mlMPk/e9M95bIcPCt46yPk6jVl3TXO5ITrXnsgW5Bs9/Mr23YrBhanNotGs
-o2vKJ7FrLv0Iy7VGcGRT9b5mKQ0Ir5TbfwEC11FEAIgE21mi4FV2TJI+JC4Pj2U7
-u9GWguzZr7Z4k0XQkZuhhf3tpm5wiDI4tDgSJytrv8ypGc3fMhqv3ot5v3i+kbga
-7XyFXFGcRkfaQHwZh/nOCJ4E6WXn1OgBa81tt6ofy3LfWJ18DUf3K1Nkx9pOTDs4
-jSjIbf765ZxttnoyDQIDAQABo4IBcjCCAW4wHwYDVR0jBBgwFoAUDL2TaAzz3quj
-SWsrN1dH6pDjue0wHQYDVR0OBBYEFDwwqrZsAbpKnPY7+y5tue2HeOZGMA4GA1Ud
-DwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggr
-BgEFBQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNV
-HR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNT
-TENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQu
-dGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRw
-Oi8vb2NzcC50Y3MudGVyZW5hLm9yZzAgBgNVHREEGTAXghVpZHAuY3JvdXMtY2xl
-cm1vbnQuZnIwDQYJKoZIhvcNAQEFBQADggEBAGvcMZiDnaj4ancf6aD2HI91jhPn
-kRLo2jkhCLostGVCqtifeF6Iqr8xupBmLHNnT81DHHmgsqpqVa9Mqm9mpdHF6T27
-o2lbKuarjHXj0PXQMvunxVRFZwgUsu0pxIuV4HmydbSaZgHoNcv0+NkwOQ++ulJW
-X/gRzlyJR7PfXIiPu4qmfi2ke60hVg9+c7E2Diyj7y9D0pgZ7KgpodYH7AanQiIF
-kPD96G/i31YlrxNcHekcHT2l/KnzVqvD0Pwc3GLMTvdMtcktTGG68leu+XnrnXuj
-q9mjbunZ1wMETpOgXde+gZJ5/yyLI1G0oAp5fBmOH994BmtO4BCj9f/g/yA=
-					    </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://idp.crous-clermont.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.crous-clermont.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.crous-clermont.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">crous-clermont.fr</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIEeDCCA2CgAwIBAgIRALsQfprdKL/wDycsZup+t2UwDQYJKoZIhvcNAQEFBQAw
-NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-IFNTTCBDQTAeFw0xMzAyMDYwMDAwMDBaFw0xNjAyMDYyMzU5NTlaMEMxITAfBgNV
-BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEeMBwGA1UEAxMVaWRwLmNyb3Vz
-LWNsZXJtb250LmZyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAyeWI
-rH5JgGXXLn1toJKE4uQB2O8Inq44XRbzewIM/NHxn3tsreYba2Yce8xPrMf4gYzZ
-Rp+93mlMPk/e9M95bIcPCt46yPk6jVl3TXO5ITrXnsgW5Bs9/Mr23YrBhanNotGs
-o2vKJ7FrLv0Iy7VGcGRT9b5mKQ0Ir5TbfwEC11FEAIgE21mi4FV2TJI+JC4Pj2U7
-u9GWguzZr7Z4k0XQkZuhhf3tpm5wiDI4tDgSJytrv8ypGc3fMhqv3ot5v3i+kbga
-7XyFXFGcRkfaQHwZh/nOCJ4E6WXn1OgBa81tt6ofy3LfWJ18DUf3K1Nkx9pOTDs4
-jSjIbf765ZxttnoyDQIDAQABo4IBcjCCAW4wHwYDVR0jBBgwFoAUDL2TaAzz3quj
-SWsrN1dH6pDjue0wHQYDVR0OBBYEFDwwqrZsAbpKnPY7+y5tue2HeOZGMA4GA1Ud
-DwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggr
-BgEFBQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNV
-HR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNT
-TENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQu
-dGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRw
-Oi8vb2NzcC50Y3MudGVyZW5hLm9yZzAgBgNVHREEGTAXghVpZHAuY3JvdXMtY2xl
-cm1vbnQuZnIwDQYJKoZIhvcNAQEFBQADggEBAGvcMZiDnaj4ancf6aD2HI91jhPn
-kRLo2jkhCLostGVCqtifeF6Iqr8xupBmLHNnT81DHHmgsqpqVa9Mqm9mpdHF6T27
-o2lbKuarjHXj0PXQMvunxVRFZwgUsu0pxIuV4HmydbSaZgHoNcv0+NkwOQ++ulJW
-X/gRzlyJR7PfXIiPu4qmfi2ke60hVg9+c7E2Diyj7y9D0pgZ7KgpodYH7AanQiIF
-kPD96G/i31YlrxNcHekcHT2l/KnzVqvD0Pwc3GLMTvdMtcktTGG68leu+XnrnXuj
-q9mjbunZ1wMETpOgXde+gZJ5/yyLI1G0oAp5fBmOH994BmtO4BCj9f/g/yA=
-					    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.crous-clermont.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">CROUS Clermont-Ferrand</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">CROUS Clermont-Ferrand</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <EmailAddress>dsi@crous-clermont.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.crous-clermont.fr.xml b/swamid-interfederations-2.0/idp.crous-clermont.fr.xml
deleted file mode 100644
index 5aa2f1bc..00000000
--- a/swamid-interfederations-2.0/idp.crous-clermont.fr.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://idp.crous-clermont.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2013-02-07T15:26:52Z">
-      <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">crous-clermont.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">CROUS Clermont-Ferrand</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIEeDCCA2CgAwIBAgIRALsQfprdKL/wDycsZup+t2UwDQYJKoZIhvcNAQEFBQAw
-NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-IFNTTCBDQTAeFw0xMzAyMDYwMDAwMDBaFw0xNjAyMDYyMzU5NTlaMEMxITAfBgNV
-BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEeMBwGA1UEAxMVaWRwLmNyb3Vz
-LWNsZXJtb250LmZyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAyeWI
-rH5JgGXXLn1toJKE4uQB2O8Inq44XRbzewIM/NHxn3tsreYba2Yce8xPrMf4gYzZ
-Rp+93mlMPk/e9M95bIcPCt46yPk6jVl3TXO5ITrXnsgW5Bs9/Mr23YrBhanNotGs
-o2vKJ7FrLv0Iy7VGcGRT9b5mKQ0Ir5TbfwEC11FEAIgE21mi4FV2TJI+JC4Pj2U7
-u9GWguzZr7Z4k0XQkZuhhf3tpm5wiDI4tDgSJytrv8ypGc3fMhqv3ot5v3i+kbga
-7XyFXFGcRkfaQHwZh/nOCJ4E6WXn1OgBa81tt6ofy3LfWJ18DUf3K1Nkx9pOTDs4
-jSjIbf765ZxttnoyDQIDAQABo4IBcjCCAW4wHwYDVR0jBBgwFoAUDL2TaAzz3quj
-SWsrN1dH6pDjue0wHQYDVR0OBBYEFDwwqrZsAbpKnPY7+y5tue2HeOZGMA4GA1Ud
-DwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggr
-BgEFBQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNV
-HR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNT
-TENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQu
-dGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRw
-Oi8vb2NzcC50Y3MudGVyZW5hLm9yZzAgBgNVHREEGTAXghVpZHAuY3JvdXMtY2xl
-cm1vbnQuZnIwDQYJKoZIhvcNAQEFBQADggEBAGvcMZiDnaj4ancf6aD2HI91jhPn
-kRLo2jkhCLostGVCqtifeF6Iqr8xupBmLHNnT81DHHmgsqpqVa9Mqm9mpdHF6T27
-o2lbKuarjHXj0PXQMvunxVRFZwgUsu0pxIuV4HmydbSaZgHoNcv0+NkwOQ++ulJW
-X/gRzlyJR7PfXIiPu4qmfi2ke60hVg9+c7E2Diyj7y9D0pgZ7KgpodYH7AanQiIF
-kPD96G/i31YlrxNcHekcHT2l/KnzVqvD0Pwc3GLMTvdMtcktTGG68leu+XnrnXuj
-q9mjbunZ1wMETpOgXde+gZJ5/yyLI1G0oAp5fBmOH994BmtO4BCj9f/g/yA=
-					    </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://idp.crous-clermont.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.crous-clermont.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.crous-clermont.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">crous-clermont.fr</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIEeDCCA2CgAwIBAgIRALsQfprdKL/wDycsZup+t2UwDQYJKoZIhvcNAQEFBQAw
-NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-IFNTTCBDQTAeFw0xMzAyMDYwMDAwMDBaFw0xNjAyMDYyMzU5NTlaMEMxITAfBgNV
-BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEeMBwGA1UEAxMVaWRwLmNyb3Vz
-LWNsZXJtb250LmZyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAyeWI
-rH5JgGXXLn1toJKE4uQB2O8Inq44XRbzewIM/NHxn3tsreYba2Yce8xPrMf4gYzZ
-Rp+93mlMPk/e9M95bIcPCt46yPk6jVl3TXO5ITrXnsgW5Bs9/Mr23YrBhanNotGs
-o2vKJ7FrLv0Iy7VGcGRT9b5mKQ0Ir5TbfwEC11FEAIgE21mi4FV2TJI+JC4Pj2U7
-u9GWguzZr7Z4k0XQkZuhhf3tpm5wiDI4tDgSJytrv8ypGc3fMhqv3ot5v3i+kbga
-7XyFXFGcRkfaQHwZh/nOCJ4E6WXn1OgBa81tt6ofy3LfWJ18DUf3K1Nkx9pOTDs4
-jSjIbf765ZxttnoyDQIDAQABo4IBcjCCAW4wHwYDVR0jBBgwFoAUDL2TaAzz3quj
-SWsrN1dH6pDjue0wHQYDVR0OBBYEFDwwqrZsAbpKnPY7+y5tue2HeOZGMA4GA1Ud
-DwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggr
-BgEFBQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNV
-HR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNT
-TENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQu
-dGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRw
-Oi8vb2NzcC50Y3MudGVyZW5hLm9yZzAgBgNVHREEGTAXghVpZHAuY3JvdXMtY2xl
-cm1vbnQuZnIwDQYJKoZIhvcNAQEFBQADggEBAGvcMZiDnaj4ancf6aD2HI91jhPn
-kRLo2jkhCLostGVCqtifeF6Iqr8xupBmLHNnT81DHHmgsqpqVa9Mqm9mpdHF6T27
-o2lbKuarjHXj0PXQMvunxVRFZwgUsu0pxIuV4HmydbSaZgHoNcv0+NkwOQ++ulJW
-X/gRzlyJR7PfXIiPu4qmfi2ke60hVg9+c7E2Diyj7y9D0pgZ7KgpodYH7AanQiIF
-kPD96G/i31YlrxNcHekcHT2l/KnzVqvD0Pwc3GLMTvdMtcktTGG68leu+XnrnXuj
-q9mjbunZ1wMETpOgXde+gZJ5/yyLI1G0oAp5fBmOH994BmtO4BCj9f/g/yA=
-					    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.crous-clermont.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">CROUS Clermont-Ferrand</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">CROUS Clermont-Ferrand</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <EmailAddress>dsi@crous-clermont.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.crous-creteil.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.crous-creteil.fr-idp-shibboleth.xml
deleted file mode 100644
index cdaeaf53..00000000
--- a/swamid-interfederations-2.0/idp.crous-creteil.fr-idp-shibboleth.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.crous-creteil.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2014-03-06T15:51:29Z">
-      <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">crous-creteil.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">CROUS Créteil</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Administratifs</mdui:Description>
-        <mdui:DisplayName xml:lang="fr">CROUS Créteil</mdui:DisplayName>
-        <mdui:Description xml:lang="fr">Administratifs</mdui:Description>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIEdjCCA16gAwIBAgIRAJ5lMINLv4KL948DJ4za9FIwDQYJKoZIhvcNAQEFBQAw
-NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-IFNTTCBDQTAeFw0xNDAzMTAwMDAwMDBaFw0xNzAzMDkyMzU5NTlaMEIxITAfBgNV
-BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEdMBsGA1UEAxMUaWRwLmNyb3Vz
-LWNyZXRlaWwuZnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDhR4WQ
-mTRASe7QJ+SnbMD4o2Ol6ZGgThvO+B7UvPL63IVUydDq1bDO0S7QvFdg/79pX9GP
-+WyALvuCPLDNmLXo0akCstsXmDeDgbwSumE1vgH49bCyo8LsaIm4CGyEv8EyBGIf
-5ocwzeIChFZIz93+ckldwv2cANfPNFeZehC2pprBtQwZWpHaB773p/vkkJB9ZnAc
-FHCGBDZK83Z8diQ0gcGWT5I458Iyy/GsspkboahISiH4E3RXv/crfXA3NPiz1MEl
-0DJ2Fsa5FZbUPWBVrxyITyhr3D6CBS3uPBzr52d/hycV7sIu2yE1IouoMTnrDRix
-gIyzzBOuncz7XqR1AgMBAAGjggFxMIIBbTAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJ
-ays3V0fqkOO57TAdBgNVHQ4EFgQU12L8b6JRjRbvP/2h8rSpSyj/NcwwDgYDVR0P
-AQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsG
-AQUFBwMCMCIGA1UdIAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQIBMDoGA1Ud
-HwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NM
-Q0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50
-Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6
-Ly9vY3NwLnRjcy50ZXJlbmEub3JnMB8GA1UdEQQYMBaCFGlkcC5jcm91cy1jcmV0
-ZWlsLmZyMA0GCSqGSIb3DQEBBQUAA4IBAQB1+6zzpZFAyRF9Sp3qwwPQkuV7bRLV
-5hLkfhEAfCMP25E9DuAMWC9Vb0rldlneSl06dk2pA72AHrQZ+n799wCmynxNzooB
-fJXUOunDwz37fDJAbb729YAXmt4iPPG8NCSlIu2WkueaOhH2GJPJOPatItGQIUEy
-HAJ1OzN3e3zX8iuyXkZJVa+ddsWEeUPrS59CBvjk1Y8SYe2uHRNv+g8DX0wVkjKq
-laTKYcW1rY22QD6/RLQr0EpQ9BXoZbJq7CyGsBDPMs/K80DCYNaaOBxWyWNH1X9A
-Jb3ZR1qKEgKubKYH73VLMDHwl1IEyS+6D44aMSlHdTqE8OJfTRKMANX8
-					    </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://idp.crous-creteil.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.crous-creteil.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.crous-creteil.fr/idp/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">CROUS Créteil</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">CROUS Créteil</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <EmailAddress>informatique@crous-creteil.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.crous-creteil.fr.xml b/swamid-interfederations-2.0/idp.crous-creteil.fr.xml
deleted file mode 100644
index cdaeaf53..00000000
--- a/swamid-interfederations-2.0/idp.crous-creteil.fr.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.crous-creteil.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2014-03-06T15:51:29Z">
-      <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">crous-creteil.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">CROUS Créteil</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Administratifs</mdui:Description>
-        <mdui:DisplayName xml:lang="fr">CROUS Créteil</mdui:DisplayName>
-        <mdui:Description xml:lang="fr">Administratifs</mdui:Description>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIEdjCCA16gAwIBAgIRAJ5lMINLv4KL948DJ4za9FIwDQYJKoZIhvcNAQEFBQAw
-NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-IFNTTCBDQTAeFw0xNDAzMTAwMDAwMDBaFw0xNzAzMDkyMzU5NTlaMEIxITAfBgNV
-BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEdMBsGA1UEAxMUaWRwLmNyb3Vz
-LWNyZXRlaWwuZnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDhR4WQ
-mTRASe7QJ+SnbMD4o2Ol6ZGgThvO+B7UvPL63IVUydDq1bDO0S7QvFdg/79pX9GP
-+WyALvuCPLDNmLXo0akCstsXmDeDgbwSumE1vgH49bCyo8LsaIm4CGyEv8EyBGIf
-5ocwzeIChFZIz93+ckldwv2cANfPNFeZehC2pprBtQwZWpHaB773p/vkkJB9ZnAc
-FHCGBDZK83Z8diQ0gcGWT5I458Iyy/GsspkboahISiH4E3RXv/crfXA3NPiz1MEl
-0DJ2Fsa5FZbUPWBVrxyITyhr3D6CBS3uPBzr52d/hycV7sIu2yE1IouoMTnrDRix
-gIyzzBOuncz7XqR1AgMBAAGjggFxMIIBbTAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJ
-ays3V0fqkOO57TAdBgNVHQ4EFgQU12L8b6JRjRbvP/2h8rSpSyj/NcwwDgYDVR0P
-AQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsG
-AQUFBwMCMCIGA1UdIAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQIBMDoGA1Ud
-HwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NM
-Q0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50
-Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6
-Ly9vY3NwLnRjcy50ZXJlbmEub3JnMB8GA1UdEQQYMBaCFGlkcC5jcm91cy1jcmV0
-ZWlsLmZyMA0GCSqGSIb3DQEBBQUAA4IBAQB1+6zzpZFAyRF9Sp3qwwPQkuV7bRLV
-5hLkfhEAfCMP25E9DuAMWC9Vb0rldlneSl06dk2pA72AHrQZ+n799wCmynxNzooB
-fJXUOunDwz37fDJAbb729YAXmt4iPPG8NCSlIu2WkueaOhH2GJPJOPatItGQIUEy
-HAJ1OzN3e3zX8iuyXkZJVa+ddsWEeUPrS59CBvjk1Y8SYe2uHRNv+g8DX0wVkjKq
-laTKYcW1rY22QD6/RLQr0EpQ9BXoZbJq7CyGsBDPMs/K80DCYNaaOBxWyWNH1X9A
-Jb3ZR1qKEgKubKYH73VLMDHwl1IEyS+6D44aMSlHdTqE8OJfTRKMANX8
-					    </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://idp.crous-creteil.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.crous-creteil.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.crous-creteil.fr/idp/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">CROUS Créteil</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">CROUS Créteil</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <EmailAddress>informatique@crous-creteil.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.crous-dijon.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.crous-dijon.fr-idp-shibboleth.xml
deleted file mode 100644
index d78aec4b..00000000
--- a/swamid-interfederations-2.0/idp.crous-dijon.fr-idp-shibboleth.xml
+++ /dev/null
@@ -1,169 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.crous-dijon.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2012-12-17T13:12:39Z">
-      <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">crous-dijon.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">CROUS Dijon - Personnels</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIEeDCCA2CgAwIBAgIQf+6eC3eoq8nlGO+mc54ogjANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTEyMTIxODAwMDAwMFoXDTE1MTIxODIzNTk1OVowUTELMAkGA1UE
-BhMCRlIxFzAVBgNVBAoTDkNST1VTIGRlIERJSk9OMQwwCgYDVQQLEwNEU0kxGzAZ
-BgNVBAMTEmlkcC5jcm91cy1kaWpvbi5mcjCCASIwDQYJKoZIhvcNAQEBBQADggEP
-ADCCAQoCggEBANyo4kf9llcPjqVcO+vxWaz3i1SkL+QC+CE3tgiUEb46hF2kQHad
-HtTmjHyk990C4cVRFoKq6+Gj2N5axkxRnHUptz0guu33kzk8JxUkWF1vnb5faKdL
-CFtZRHUElPoONAadyHJchqVfb2IfGEsiG60XP23WiCVKOq5c3CRsxSKXig48/PFl
-c4TAwkGuAKB7Y2m4fXcAN6LAMo4WxMRuHay4oDdfDfQe0QvH0B6ZkcI2NGfpddLF
-D8pane6HfZQtyqYkX3GDI6dU5TyjeRComWtbVoAvSfl/rrKwyeTGOnww3mPmf1ES
-LGJed6zMJdxYmqQM+DuqkApNFjBa2j8BEUECAwEAAaOCAWUwggFhMB8GA1UdIwQY
-MBaAFAy9k2gM896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBRQG26cWzC6R1jFe8Gh
-iGyDLnQTAzAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAU
-BggrBgEFBQcDAQYIKwYBBQUHAwIwGAYDVR0gBBEwDzANBgsrBgEEAbIxAQICHTA6
-BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVO
-QVNTTENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9j
-cnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpo
-dHRwOi8vb2NzcC50Y3MudGVyZW5hLm9yZzAdBgNVHREEFjAUghJpZHAuY3JvdXMt
-ZGlqb24uZnIwDQYJKoZIhvcNAQEFBQADggEBAIRuZDitOJc9Xi9K6yuHv2Om0lrD
-wKZvwNq1hGmyO0zy1+uohXCjkfV5P8fNSDPhFom6xGXqDjXO6+S7cvyt8AbBKgjV
-PmJPgCLN54b60fEONGWsbRPlfcrT7rvz0h5ArMRU5ZntA5Yc/YLEmI+o57AKraUp
-ZyADGtvD12IY6WL2zFdjMRwqgGTmpIdz7Ab+lt7rzDDhGUHBkXkCQZZhGQZbgaaR
-FgFdbxqMVJ71Vz+iUOHcHZNmXLC7HBNvh87IGqmSIJUc7lijeaoHUtVovANM8X2W
-rEJaVJ/XHu7r2/Ui5qEpkWkldy75/hdLiLj4Wr5oqPlgHZfwHNvNdy4DoQk=
-					    </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>
-					      MIIErzCCA5egAwIBAgIRAPce78VI0mZGzFqgRgussIEwDQYJKoZIhvcNAQEFBQAw
-NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-IFNTTCBDQTAeFw0xMTAxMTIwMDAwMDBaFw0xNDAxMTEyMzU5NTlaMGAxCzAJBgNV
-BAYTAkZSMQ4wDAYDVQQHEwVEaWpvbjEXMBUGA1UEChMOQ1JPVVMgZGUgRElKT04x
-DDAKBgNVBAsTA0RTSTEaMBgGA1UEAxMRbnMuY3JvdXMtZGlqb24uZnIwggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC4CnU/wibyinuaPI2EqcrvmaWCV9dz
-Z9zkKanUn0KVoPGaFayhJCI/H0c5D+FEJl/lsA0YKzghi8baSc8L+pmq+LV4DF0k
-k3Ke9Yfn9gDr5Y+IadmSo7nmxiE42LJrFZBSzPrqK7HClDKskkgHu6lIXX3vDwX9
-NTUWOITDsqh+iLziudBc4DLim1brrMVwdpZVwCGWixI+pnx+Mn1KaLkW2migteMW
-TvAj7uf37zucUa0RhHXI5IbsmRXsH04r7Xq2et74nQETmGS861kBfEtqNWs8oZNF
-GGT4y7VCq4XIN2ZFp7xZetyzEkrlaGxJyL+2H0PFy2PJkVgU0BRpEA//AgMBAAGj
-ggGMMIIBiDAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3V0fqkOO57TAdBgNVHQ4E
-FgQUkCg4s3FgI7pzpdqRGT3IeDfAkSUwDgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB
-/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMBgGA1UdIAQRMA8w
-DQYLKwYBBAGyMQECAh0wOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3Mu
-dGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsG
-AQUFBzAChilodHRwOi8vY3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNy
-dDAmBggrBgEFBQcwAYYaaHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwRAYDVR0R
-BD0wO4IRbnMuY3JvdXMtZGlqb24uZnKCEmNhcy5jcm91cy1kaWpvbi5mcoISaWRw
-LmNyb3VzLWRpam9uLmZyMA0GCSqGSIb3DQEBBQUAA4IBAQAIUjdnsILs5B0S4r30
-7X842J3m5zaE7xQ2kKKAa8FiF2TNZ+dzQQDbYrB8+nLD85ziWEwLzqGPHulDWbTI
-YxUX6Stt/KMW5frhCXX2i7hEp3gfKazu+jXou9ISXRuqKCU198d2Ic1Pqu8VoxwF
-7BgmqM7TDu+t8FTDF7rufbSKwCIR+yY+3oHtdNlZEdGCvCGOakfBEgqyZ4H6USuH
-WOVN0EpwAIdhLCQfwekeOM9ZulAKFYRB5tEKfmWS1aqo/7wNx71fJdjFV2mOkdcX
-B3ix6dIX1SsZx0ffnk3wPlrx6RGiItqiVD6gPDlUY/BRftSiyH/EEEM00YzHtqO/
-iTNj
-					    </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://idp.crous-dijon.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.crous-dijon.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.crous-dijon.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">crous-dijon.fr</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIEeDCCA2CgAwIBAgIQf+6eC3eoq8nlGO+mc54ogjANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTEyMTIxODAwMDAwMFoXDTE1MTIxODIzNTk1OVowUTELMAkGA1UE
-BhMCRlIxFzAVBgNVBAoTDkNST1VTIGRlIERJSk9OMQwwCgYDVQQLEwNEU0kxGzAZ
-BgNVBAMTEmlkcC5jcm91cy1kaWpvbi5mcjCCASIwDQYJKoZIhvcNAQEBBQADggEP
-ADCCAQoCggEBANyo4kf9llcPjqVcO+vxWaz3i1SkL+QC+CE3tgiUEb46hF2kQHad
-HtTmjHyk990C4cVRFoKq6+Gj2N5axkxRnHUptz0guu33kzk8JxUkWF1vnb5faKdL
-CFtZRHUElPoONAadyHJchqVfb2IfGEsiG60XP23WiCVKOq5c3CRsxSKXig48/PFl
-c4TAwkGuAKB7Y2m4fXcAN6LAMo4WxMRuHay4oDdfDfQe0QvH0B6ZkcI2NGfpddLF
-D8pane6HfZQtyqYkX3GDI6dU5TyjeRComWtbVoAvSfl/rrKwyeTGOnww3mPmf1ES
-LGJed6zMJdxYmqQM+DuqkApNFjBa2j8BEUECAwEAAaOCAWUwggFhMB8GA1UdIwQY
-MBaAFAy9k2gM896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBRQG26cWzC6R1jFe8Gh
-iGyDLnQTAzAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAU
-BggrBgEFBQcDAQYIKwYBBQUHAwIwGAYDVR0gBBEwDzANBgsrBgEEAbIxAQICHTA6
-BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVO
-QVNTTENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9j
-cnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpo
-dHRwOi8vb2NzcC50Y3MudGVyZW5hLm9yZzAdBgNVHREEFjAUghJpZHAuY3JvdXMt
-ZGlqb24uZnIwDQYJKoZIhvcNAQEFBQADggEBAIRuZDitOJc9Xi9K6yuHv2Om0lrD
-wKZvwNq1hGmyO0zy1+uohXCjkfV5P8fNSDPhFom6xGXqDjXO6+S7cvyt8AbBKgjV
-PmJPgCLN54b60fEONGWsbRPlfcrT7rvz0h5ArMRU5ZntA5Yc/YLEmI+o57AKraUp
-ZyADGtvD12IY6WL2zFdjMRwqgGTmpIdz7Ab+lt7rzDDhGUHBkXkCQZZhGQZbgaaR
-FgFdbxqMVJ71Vz+iUOHcHZNmXLC7HBNvh87IGqmSIJUc7lijeaoHUtVovANM8X2W
-rEJaVJ/XHu7r2/Ui5qEpkWkldy75/hdLiLj4Wr5oqPlgHZfwHNvNdy4DoQk=
-					    </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>
-					      MIIErzCCA5egAwIBAgIRAPce78VI0mZGzFqgRgussIEwDQYJKoZIhvcNAQEFBQAw
-NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-IFNTTCBDQTAeFw0xMTAxMTIwMDAwMDBaFw0xNDAxMTEyMzU5NTlaMGAxCzAJBgNV
-BAYTAkZSMQ4wDAYDVQQHEwVEaWpvbjEXMBUGA1UEChMOQ1JPVVMgZGUgRElKT04x
-DDAKBgNVBAsTA0RTSTEaMBgGA1UEAxMRbnMuY3JvdXMtZGlqb24uZnIwggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC4CnU/wibyinuaPI2EqcrvmaWCV9dz
-Z9zkKanUn0KVoPGaFayhJCI/H0c5D+FEJl/lsA0YKzghi8baSc8L+pmq+LV4DF0k
-k3Ke9Yfn9gDr5Y+IadmSo7nmxiE42LJrFZBSzPrqK7HClDKskkgHu6lIXX3vDwX9
-NTUWOITDsqh+iLziudBc4DLim1brrMVwdpZVwCGWixI+pnx+Mn1KaLkW2migteMW
-TvAj7uf37zucUa0RhHXI5IbsmRXsH04r7Xq2et74nQETmGS861kBfEtqNWs8oZNF
-GGT4y7VCq4XIN2ZFp7xZetyzEkrlaGxJyL+2H0PFy2PJkVgU0BRpEA//AgMBAAGj
-ggGMMIIBiDAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3V0fqkOO57TAdBgNVHQ4E
-FgQUkCg4s3FgI7pzpdqRGT3IeDfAkSUwDgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB
-/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMBgGA1UdIAQRMA8w
-DQYLKwYBBAGyMQECAh0wOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3Mu
-dGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsG
-AQUFBzAChilodHRwOi8vY3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNy
-dDAmBggrBgEFBQcwAYYaaHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwRAYDVR0R
-BD0wO4IRbnMuY3JvdXMtZGlqb24uZnKCEmNhcy5jcm91cy1kaWpvbi5mcoISaWRw
-LmNyb3VzLWRpam9uLmZyMA0GCSqGSIb3DQEBBQUAA4IBAQAIUjdnsILs5B0S4r30
-7X842J3m5zaE7xQ2kKKAa8FiF2TNZ+dzQQDbYrB8+nLD85ziWEwLzqGPHulDWbTI
-YxUX6Stt/KMW5frhCXX2i7hEp3gfKazu+jXou9ISXRuqKCU198d2Ic1Pqu8VoxwF
-7BgmqM7TDu+t8FTDF7rufbSKwCIR+yY+3oHtdNlZEdGCvCGOakfBEgqyZ4H6USuH
-WOVN0EpwAIdhLCQfwekeOM9ZulAKFYRB5tEKfmWS1aqo/7wNx71fJdjFV2mOkdcX
-B3ix6dIX1SsZx0ffnk3wPlrx6RGiItqiVD6gPDlUY/BRftSiyH/EEEM00YzHtqO/
-iTNj
-					    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.crous-dijon.fr/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">CROUS Dijon - Personnels</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">CROUS Dijon - Personnels</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <EmailAddress>dsi@crous-dijon.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.crous-dijon.fr.xml b/swamid-interfederations-2.0/idp.crous-dijon.fr.xml
deleted file mode 100644
index d78aec4b..00000000
--- a/swamid-interfederations-2.0/idp.crous-dijon.fr.xml
+++ /dev/null
@@ -1,169 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.crous-dijon.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2012-12-17T13:12:39Z">
-      <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">crous-dijon.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">CROUS Dijon - Personnels</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIEeDCCA2CgAwIBAgIQf+6eC3eoq8nlGO+mc54ogjANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTEyMTIxODAwMDAwMFoXDTE1MTIxODIzNTk1OVowUTELMAkGA1UE
-BhMCRlIxFzAVBgNVBAoTDkNST1VTIGRlIERJSk9OMQwwCgYDVQQLEwNEU0kxGzAZ
-BgNVBAMTEmlkcC5jcm91cy1kaWpvbi5mcjCCASIwDQYJKoZIhvcNAQEBBQADggEP
-ADCCAQoCggEBANyo4kf9llcPjqVcO+vxWaz3i1SkL+QC+CE3tgiUEb46hF2kQHad
-HtTmjHyk990C4cVRFoKq6+Gj2N5axkxRnHUptz0guu33kzk8JxUkWF1vnb5faKdL
-CFtZRHUElPoONAadyHJchqVfb2IfGEsiG60XP23WiCVKOq5c3CRsxSKXig48/PFl
-c4TAwkGuAKB7Y2m4fXcAN6LAMo4WxMRuHay4oDdfDfQe0QvH0B6ZkcI2NGfpddLF
-D8pane6HfZQtyqYkX3GDI6dU5TyjeRComWtbVoAvSfl/rrKwyeTGOnww3mPmf1ES
-LGJed6zMJdxYmqQM+DuqkApNFjBa2j8BEUECAwEAAaOCAWUwggFhMB8GA1UdIwQY
-MBaAFAy9k2gM896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBRQG26cWzC6R1jFe8Gh
-iGyDLnQTAzAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAU
-BggrBgEFBQcDAQYIKwYBBQUHAwIwGAYDVR0gBBEwDzANBgsrBgEEAbIxAQICHTA6
-BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVO
-QVNTTENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9j
-cnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpo
-dHRwOi8vb2NzcC50Y3MudGVyZW5hLm9yZzAdBgNVHREEFjAUghJpZHAuY3JvdXMt
-ZGlqb24uZnIwDQYJKoZIhvcNAQEFBQADggEBAIRuZDitOJc9Xi9K6yuHv2Om0lrD
-wKZvwNq1hGmyO0zy1+uohXCjkfV5P8fNSDPhFom6xGXqDjXO6+S7cvyt8AbBKgjV
-PmJPgCLN54b60fEONGWsbRPlfcrT7rvz0h5ArMRU5ZntA5Yc/YLEmI+o57AKraUp
-ZyADGtvD12IY6WL2zFdjMRwqgGTmpIdz7Ab+lt7rzDDhGUHBkXkCQZZhGQZbgaaR
-FgFdbxqMVJ71Vz+iUOHcHZNmXLC7HBNvh87IGqmSIJUc7lijeaoHUtVovANM8X2W
-rEJaVJ/XHu7r2/Ui5qEpkWkldy75/hdLiLj4Wr5oqPlgHZfwHNvNdy4DoQk=
-					    </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>
-					      MIIErzCCA5egAwIBAgIRAPce78VI0mZGzFqgRgussIEwDQYJKoZIhvcNAQEFBQAw
-NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-IFNTTCBDQTAeFw0xMTAxMTIwMDAwMDBaFw0xNDAxMTEyMzU5NTlaMGAxCzAJBgNV
-BAYTAkZSMQ4wDAYDVQQHEwVEaWpvbjEXMBUGA1UEChMOQ1JPVVMgZGUgRElKT04x
-DDAKBgNVBAsTA0RTSTEaMBgGA1UEAxMRbnMuY3JvdXMtZGlqb24uZnIwggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC4CnU/wibyinuaPI2EqcrvmaWCV9dz
-Z9zkKanUn0KVoPGaFayhJCI/H0c5D+FEJl/lsA0YKzghi8baSc8L+pmq+LV4DF0k
-k3Ke9Yfn9gDr5Y+IadmSo7nmxiE42LJrFZBSzPrqK7HClDKskkgHu6lIXX3vDwX9
-NTUWOITDsqh+iLziudBc4DLim1brrMVwdpZVwCGWixI+pnx+Mn1KaLkW2migteMW
-TvAj7uf37zucUa0RhHXI5IbsmRXsH04r7Xq2et74nQETmGS861kBfEtqNWs8oZNF
-GGT4y7VCq4XIN2ZFp7xZetyzEkrlaGxJyL+2H0PFy2PJkVgU0BRpEA//AgMBAAGj
-ggGMMIIBiDAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3V0fqkOO57TAdBgNVHQ4E
-FgQUkCg4s3FgI7pzpdqRGT3IeDfAkSUwDgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB
-/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMBgGA1UdIAQRMA8w
-DQYLKwYBBAGyMQECAh0wOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3Mu
-dGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsG
-AQUFBzAChilodHRwOi8vY3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNy
-dDAmBggrBgEFBQcwAYYaaHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwRAYDVR0R
-BD0wO4IRbnMuY3JvdXMtZGlqb24uZnKCEmNhcy5jcm91cy1kaWpvbi5mcoISaWRw
-LmNyb3VzLWRpam9uLmZyMA0GCSqGSIb3DQEBBQUAA4IBAQAIUjdnsILs5B0S4r30
-7X842J3m5zaE7xQ2kKKAa8FiF2TNZ+dzQQDbYrB8+nLD85ziWEwLzqGPHulDWbTI
-YxUX6Stt/KMW5frhCXX2i7hEp3gfKazu+jXou9ISXRuqKCU198d2Ic1Pqu8VoxwF
-7BgmqM7TDu+t8FTDF7rufbSKwCIR+yY+3oHtdNlZEdGCvCGOakfBEgqyZ4H6USuH
-WOVN0EpwAIdhLCQfwekeOM9ZulAKFYRB5tEKfmWS1aqo/7wNx71fJdjFV2mOkdcX
-B3ix6dIX1SsZx0ffnk3wPlrx6RGiItqiVD6gPDlUY/BRftSiyH/EEEM00YzHtqO/
-iTNj
-					    </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://idp.crous-dijon.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.crous-dijon.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.crous-dijon.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">crous-dijon.fr</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIEeDCCA2CgAwIBAgIQf+6eC3eoq8nlGO+mc54ogjANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTEyMTIxODAwMDAwMFoXDTE1MTIxODIzNTk1OVowUTELMAkGA1UE
-BhMCRlIxFzAVBgNVBAoTDkNST1VTIGRlIERJSk9OMQwwCgYDVQQLEwNEU0kxGzAZ
-BgNVBAMTEmlkcC5jcm91cy1kaWpvbi5mcjCCASIwDQYJKoZIhvcNAQEBBQADggEP
-ADCCAQoCggEBANyo4kf9llcPjqVcO+vxWaz3i1SkL+QC+CE3tgiUEb46hF2kQHad
-HtTmjHyk990C4cVRFoKq6+Gj2N5axkxRnHUptz0guu33kzk8JxUkWF1vnb5faKdL
-CFtZRHUElPoONAadyHJchqVfb2IfGEsiG60XP23WiCVKOq5c3CRsxSKXig48/PFl
-c4TAwkGuAKB7Y2m4fXcAN6LAMo4WxMRuHay4oDdfDfQe0QvH0B6ZkcI2NGfpddLF
-D8pane6HfZQtyqYkX3GDI6dU5TyjeRComWtbVoAvSfl/rrKwyeTGOnww3mPmf1ES
-LGJed6zMJdxYmqQM+DuqkApNFjBa2j8BEUECAwEAAaOCAWUwggFhMB8GA1UdIwQY
-MBaAFAy9k2gM896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBRQG26cWzC6R1jFe8Gh
-iGyDLnQTAzAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAU
-BggrBgEFBQcDAQYIKwYBBQUHAwIwGAYDVR0gBBEwDzANBgsrBgEEAbIxAQICHTA6
-BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVO
-QVNTTENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9j
-cnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpo
-dHRwOi8vb2NzcC50Y3MudGVyZW5hLm9yZzAdBgNVHREEFjAUghJpZHAuY3JvdXMt
-ZGlqb24uZnIwDQYJKoZIhvcNAQEFBQADggEBAIRuZDitOJc9Xi9K6yuHv2Om0lrD
-wKZvwNq1hGmyO0zy1+uohXCjkfV5P8fNSDPhFom6xGXqDjXO6+S7cvyt8AbBKgjV
-PmJPgCLN54b60fEONGWsbRPlfcrT7rvz0h5ArMRU5ZntA5Yc/YLEmI+o57AKraUp
-ZyADGtvD12IY6WL2zFdjMRwqgGTmpIdz7Ab+lt7rzDDhGUHBkXkCQZZhGQZbgaaR
-FgFdbxqMVJ71Vz+iUOHcHZNmXLC7HBNvh87IGqmSIJUc7lijeaoHUtVovANM8X2W
-rEJaVJ/XHu7r2/Ui5qEpkWkldy75/hdLiLj4Wr5oqPlgHZfwHNvNdy4DoQk=
-					    </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>
-					      MIIErzCCA5egAwIBAgIRAPce78VI0mZGzFqgRgussIEwDQYJKoZIhvcNAQEFBQAw
-NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-IFNTTCBDQTAeFw0xMTAxMTIwMDAwMDBaFw0xNDAxMTEyMzU5NTlaMGAxCzAJBgNV
-BAYTAkZSMQ4wDAYDVQQHEwVEaWpvbjEXMBUGA1UEChMOQ1JPVVMgZGUgRElKT04x
-DDAKBgNVBAsTA0RTSTEaMBgGA1UEAxMRbnMuY3JvdXMtZGlqb24uZnIwggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC4CnU/wibyinuaPI2EqcrvmaWCV9dz
-Z9zkKanUn0KVoPGaFayhJCI/H0c5D+FEJl/lsA0YKzghi8baSc8L+pmq+LV4DF0k
-k3Ke9Yfn9gDr5Y+IadmSo7nmxiE42LJrFZBSzPrqK7HClDKskkgHu6lIXX3vDwX9
-NTUWOITDsqh+iLziudBc4DLim1brrMVwdpZVwCGWixI+pnx+Mn1KaLkW2migteMW
-TvAj7uf37zucUa0RhHXI5IbsmRXsH04r7Xq2et74nQETmGS861kBfEtqNWs8oZNF
-GGT4y7VCq4XIN2ZFp7xZetyzEkrlaGxJyL+2H0PFy2PJkVgU0BRpEA//AgMBAAGj
-ggGMMIIBiDAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3V0fqkOO57TAdBgNVHQ4E
-FgQUkCg4s3FgI7pzpdqRGT3IeDfAkSUwDgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB
-/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMBgGA1UdIAQRMA8w
-DQYLKwYBBAGyMQECAh0wOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3Mu
-dGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsG
-AQUFBzAChilodHRwOi8vY3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNy
-dDAmBggrBgEFBQcwAYYaaHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwRAYDVR0R
-BD0wO4IRbnMuY3JvdXMtZGlqb24uZnKCEmNhcy5jcm91cy1kaWpvbi5mcoISaWRw
-LmNyb3VzLWRpam9uLmZyMA0GCSqGSIb3DQEBBQUAA4IBAQAIUjdnsILs5B0S4r30
-7X842J3m5zaE7xQ2kKKAa8FiF2TNZ+dzQQDbYrB8+nLD85ziWEwLzqGPHulDWbTI
-YxUX6Stt/KMW5frhCXX2i7hEp3gfKazu+jXou9ISXRuqKCU198d2Ic1Pqu8VoxwF
-7BgmqM7TDu+t8FTDF7rufbSKwCIR+yY+3oHtdNlZEdGCvCGOakfBEgqyZ4H6USuH
-WOVN0EpwAIdhLCQfwekeOM9ZulAKFYRB5tEKfmWS1aqo/7wNx71fJdjFV2mOkdcX
-B3ix6dIX1SsZx0ffnk3wPlrx6RGiItqiVD6gPDlUY/BRftSiyH/EEEM00YzHtqO/
-iTNj
-					    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.crous-dijon.fr/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">CROUS Dijon - Personnels</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">CROUS Dijon - Personnels</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <EmailAddress>dsi@crous-dijon.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.crous-grenoble.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.crous-grenoble.fr-idp-shibboleth.xml
deleted file mode 100644
index d46bb7a8..00000000
--- a/swamid-interfederations-2.0/idp.crous-grenoble.fr-idp-shibboleth.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://idp.crous-grenoble.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2011-12-08T22:14:26Z">
-      <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">crous-grenoble.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">CROUS Grenoble - Personnels</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIEdzCCA1+gAwIBAgIQJXNY9IPVDDkw5l9yCMhrQTANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTE0MDkxNTAwMDAwMFoXDTE3MDkxNDIzNTk1OVowQzEhMB8GA1UE
-CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMR4wHAYDVQQDExVpZHAuY3JvdXMt
-Z3Jlbm9ibGUuZnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDHPm9t
-Jjz1cm0wZpVpxnN8vANWsur6N3iue42UeYbyXWTvHRSmO+QZMTYMULmTLf5zhp1r
-zF56kyPMfO7PMtJ5E1xlz22L+mlg7Rd3FQH3JZxlpZPDDVqXAL4mxZH/kPfrHr98
-kkp9tMbuGVC0CKyE6pVVw8HQrp2ZMNLVsHnwta0dMRDxUzOjpY3STs7BQxqO0rhy
-n53wd3jb74oIj5oTi1AW/r2lvu5d2IXTSWjlOxgpAg+Pay+rwT98yv0Ox0G6XdXQ
-8IhPrWdL421/VKIu5xqfDtSKgJeq2JNlamqx0crk7MlBRyUEXGMlOL0CPqzAiPfp
-TBn3LYg95jrVJ5ofAgMBAAGjggFyMIIBbjAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJ
-ays3V0fqkOO57TAdBgNVHQ4EFgQUiAemAdbi7dUgmxf4rUhJVqdgFAIwDgYDVR0P
-AQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsG
-AQUFBwMCMCIGA1UdIAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQIBMDoGA1Ud
-HwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NM
-Q0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50
-Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6
-Ly9vY3NwLnRjcy50ZXJlbmEub3JnMCAGA1UdEQQZMBeCFWlkcC5jcm91cy1ncmVu
-b2JsZS5mcjANBgkqhkiG9w0BAQUFAAOCAQEATZ2G4Kb8XApp47+o/4/GFetVkiZc
-L113ZiOXH4Q/ZD9sfAqh/6G5kvAYDdCLCL5UxmOcOkXH/wkXyoeP82yyFF5GeGzp
-mwKoOpr34+0ux4ctI1T1UZNPz5Bv4AUAEBbru6ZpCsEmw5KwFpSGOjPnlPspkJBT
-r3RAsxa5qG2yMzJRa0PiywpXd8q82JfFk2cHL9P4au0u5p9H9Hin+Cpvmn0StV51
-iEsqhPuQmD3oc87nHEra79A3QGjMSN1zaSbcadRvXZhHdZaez/C9h8yyPKkR9wM2
-rp/TCvQsQDOOiVfOsrZjqiF1nBI3Z/KLRoV9yz3wmtdG59CY0Pf+XM0plg==
-					    </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://idp.crous-grenoble.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.crous-grenoble.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.crous-grenoble.fr/idp/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">CROUS Grenoble - Personnels</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">CROUS Grenoble - Personnels</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Benoit LION</SurName>
-    <EmailAddress>benoit.lion@crous-grenoble.fr</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <SurName>Sébastien LEYRELOUP</SurName>
-    <EmailAddress>sebastien.leyreloup@crous-grenoble.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.crous-grenoble.fr.xml b/swamid-interfederations-2.0/idp.crous-grenoble.fr.xml
deleted file mode 100644
index d46bb7a8..00000000
--- a/swamid-interfederations-2.0/idp.crous-grenoble.fr.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://idp.crous-grenoble.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2011-12-08T22:14:26Z">
-      <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">crous-grenoble.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">CROUS Grenoble - Personnels</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIEdzCCA1+gAwIBAgIQJXNY9IPVDDkw5l9yCMhrQTANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTE0MDkxNTAwMDAwMFoXDTE3MDkxNDIzNTk1OVowQzEhMB8GA1UE
-CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMR4wHAYDVQQDExVpZHAuY3JvdXMt
-Z3Jlbm9ibGUuZnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDHPm9t
-Jjz1cm0wZpVpxnN8vANWsur6N3iue42UeYbyXWTvHRSmO+QZMTYMULmTLf5zhp1r
-zF56kyPMfO7PMtJ5E1xlz22L+mlg7Rd3FQH3JZxlpZPDDVqXAL4mxZH/kPfrHr98
-kkp9tMbuGVC0CKyE6pVVw8HQrp2ZMNLVsHnwta0dMRDxUzOjpY3STs7BQxqO0rhy
-n53wd3jb74oIj5oTi1AW/r2lvu5d2IXTSWjlOxgpAg+Pay+rwT98yv0Ox0G6XdXQ
-8IhPrWdL421/VKIu5xqfDtSKgJeq2JNlamqx0crk7MlBRyUEXGMlOL0CPqzAiPfp
-TBn3LYg95jrVJ5ofAgMBAAGjggFyMIIBbjAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJ
-ays3V0fqkOO57TAdBgNVHQ4EFgQUiAemAdbi7dUgmxf4rUhJVqdgFAIwDgYDVR0P
-AQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsG
-AQUFBwMCMCIGA1UdIAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQIBMDoGA1Ud
-HwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NM
-Q0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50
-Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6
-Ly9vY3NwLnRjcy50ZXJlbmEub3JnMCAGA1UdEQQZMBeCFWlkcC5jcm91cy1ncmVu
-b2JsZS5mcjANBgkqhkiG9w0BAQUFAAOCAQEATZ2G4Kb8XApp47+o/4/GFetVkiZc
-L113ZiOXH4Q/ZD9sfAqh/6G5kvAYDdCLCL5UxmOcOkXH/wkXyoeP82yyFF5GeGzp
-mwKoOpr34+0ux4ctI1T1UZNPz5Bv4AUAEBbru6ZpCsEmw5KwFpSGOjPnlPspkJBT
-r3RAsxa5qG2yMzJRa0PiywpXd8q82JfFk2cHL9P4au0u5p9H9Hin+Cpvmn0StV51
-iEsqhPuQmD3oc87nHEra79A3QGjMSN1zaSbcadRvXZhHdZaez/C9h8yyPKkR9wM2
-rp/TCvQsQDOOiVfOsrZjqiF1nBI3Z/KLRoV9yz3wmtdG59CY0Pf+XM0plg==
-					    </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://idp.crous-grenoble.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.crous-grenoble.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.crous-grenoble.fr/idp/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">CROUS Grenoble - Personnels</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">CROUS Grenoble - Personnels</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Benoit LION</SurName>
-    <EmailAddress>benoit.lion@crous-grenoble.fr</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <SurName>Sébastien LEYRELOUP</SurName>
-    <EmailAddress>sebastien.leyreloup@crous-grenoble.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.crous-limoges.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.crous-limoges.fr-idp-shibboleth.xml
deleted file mode 100644
index 304cc5d0..00000000
--- a/swamid-interfederations-2.0/idp.crous-limoges.fr-idp-shibboleth.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://idp.crous-limoges.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2014-04-15T15:53:51Z">
-      <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">crous-limoges.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">CROUS de Limoges</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Employees</mdui:Description>
-        <mdui:DisplayName xml:lang="fr">CROUS de Limoges</mdui:DisplayName>
-        <mdui:Description xml:lang="fr">Personnels</mdui:Description>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIEdjCCA16gAwIBAgIRALZcQBV2KHd5bIl5Qpk5ONAwDQYJKoZIhvcNAQEFBQAw
-NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-IFNTTCBDQTAeFw0xNDAzMjcwMDAwMDBaFw0xNzAzMjYyMzU5NTlaMEIxITAfBgNV
-BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEdMBsGA1UEAxMUaWRwLmNyb3Vz
-LWxpbW9nZXMuZnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDYnE9D
-NfGEpBj3Iy72odoL+yZSdhS+FsM/IU2BJANw6dbXRpNMFfNnLRkWWPTwdeJh8r4A
-eNmRKLQCMZP+E/NY3zQlnAOakL2c/fgBTv5Oawe3speWTS3N0whStUMtbgzWafBE
-cToI3gFcC4x0JPklum99m+ZZ17D3oLrIttOYZ4fXjsQj2yJwFBp3nJ7qh1rfwfKf
-rAYKF0gxekGUR5YgjFKpU4zbcZSHeIAHaD8WLJRkdEBvEC/tF8gjrBSP2aTAgLUS
-bk81rZWRXXA0CCZynsTpDvtycQhL3/4zMIkUPpV9So68DZz63QXXZTwUIyyjWtOv
-C8ZDw3WvVWTsxdf9AgMBAAGjggFxMIIBbTAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJ
-ays3V0fqkOO57TAdBgNVHQ4EFgQUfiR82eCVOYTgD0HPV8QeEe5jLSIwDgYDVR0P
-AQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsG
-AQUFBwMCMCIGA1UdIAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQIBMDoGA1Ud
-HwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NM
-Q0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50
-Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6
-Ly9vY3NwLnRjcy50ZXJlbmEub3JnMB8GA1UdEQQYMBaCFGlkcC5jcm91cy1saW1v
-Z2VzLmZyMA0GCSqGSIb3DQEBBQUAA4IBAQCQRcYk/yvCdP/VT7R890J3pvAXlEm8
-7/DWetj4M6P3pV41o8wiuZT49jsSvGKvFEiq8QrE3MQjpWO+ASd90WCfKGJGgWta
-9oftaIHINRmEd2mDQ1WMuZMbaXEwOf7lxiSvzlxRXHgAJ3C0oexBx6z16GRPLDMY
-Xm2MIteZK1lI8FEoWX8qXg8EjL/NZdxu1v7dU/jSHL2HlNj8sNVWwh+aUQxL8qBe
-Myun/oIQkNnp0Pdk8+EGzL0g39mOz/aifvbBnk4nBg9YZhbX1PHPcsaTXReB9z48
-ZDIXns+y/xQLIh4KMx/XzIpQHZC0zvB3nMoYPiHZ3L/UUxNGQacmInYV
-					    </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://idp.crous-limoges.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.crous-limoges.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.crous-limoges.fr/cas/login"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">crous-limoges.fr</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIEdjCCA16gAwIBAgIRALZcQBV2KHd5bIl5Qpk5ONAwDQYJKoZIhvcNAQEFBQAw
-NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-IFNTTCBDQTAeFw0xNDAzMjcwMDAwMDBaFw0xNzAzMjYyMzU5NTlaMEIxITAfBgNV
-BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEdMBsGA1UEAxMUaWRwLmNyb3Vz
-LWxpbW9nZXMuZnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDYnE9D
-NfGEpBj3Iy72odoL+yZSdhS+FsM/IU2BJANw6dbXRpNMFfNnLRkWWPTwdeJh8r4A
-eNmRKLQCMZP+E/NY3zQlnAOakL2c/fgBTv5Oawe3speWTS3N0whStUMtbgzWafBE
-cToI3gFcC4x0JPklum99m+ZZ17D3oLrIttOYZ4fXjsQj2yJwFBp3nJ7qh1rfwfKf
-rAYKF0gxekGUR5YgjFKpU4zbcZSHeIAHaD8WLJRkdEBvEC/tF8gjrBSP2aTAgLUS
-bk81rZWRXXA0CCZynsTpDvtycQhL3/4zMIkUPpV9So68DZz63QXXZTwUIyyjWtOv
-C8ZDw3WvVWTsxdf9AgMBAAGjggFxMIIBbTAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJ
-ays3V0fqkOO57TAdBgNVHQ4EFgQUfiR82eCVOYTgD0HPV8QeEe5jLSIwDgYDVR0P
-AQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsG
-AQUFBwMCMCIGA1UdIAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQIBMDoGA1Ud
-HwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NM
-Q0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50
-Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6
-Ly9vY3NwLnRjcy50ZXJlbmEub3JnMB8GA1UdEQQYMBaCFGlkcC5jcm91cy1saW1v
-Z2VzLmZyMA0GCSqGSIb3DQEBBQUAA4IBAQCQRcYk/yvCdP/VT7R890J3pvAXlEm8
-7/DWetj4M6P3pV41o8wiuZT49jsSvGKvFEiq8QrE3MQjpWO+ASd90WCfKGJGgWta
-9oftaIHINRmEd2mDQ1WMuZMbaXEwOf7lxiSvzlxRXHgAJ3C0oexBx6z16GRPLDMY
-Xm2MIteZK1lI8FEoWX8qXg8EjL/NZdxu1v7dU/jSHL2HlNj8sNVWwh+aUQxL8qBe
-Myun/oIQkNnp0Pdk8+EGzL0g39mOz/aifvbBnk4nBg9YZhbX1PHPcsaTXReB9z48
-ZDIXns+y/xQLIh4KMx/XzIpQHZC0zvB3nMoYPiHZ3L/UUxNGQacmInYV
-					    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.crous-limoges.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">CROUS de Limoges</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">CROUS de Limoges</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <EmailAddress>informatique@crous-limoges.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.crous-limoges.fr.xml b/swamid-interfederations-2.0/idp.crous-limoges.fr.xml
deleted file mode 100644
index 304cc5d0..00000000
--- a/swamid-interfederations-2.0/idp.crous-limoges.fr.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://idp.crous-limoges.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2014-04-15T15:53:51Z">
-      <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">crous-limoges.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">CROUS de Limoges</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Employees</mdui:Description>
-        <mdui:DisplayName xml:lang="fr">CROUS de Limoges</mdui:DisplayName>
-        <mdui:Description xml:lang="fr">Personnels</mdui:Description>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIEdjCCA16gAwIBAgIRALZcQBV2KHd5bIl5Qpk5ONAwDQYJKoZIhvcNAQEFBQAw
-NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-IFNTTCBDQTAeFw0xNDAzMjcwMDAwMDBaFw0xNzAzMjYyMzU5NTlaMEIxITAfBgNV
-BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEdMBsGA1UEAxMUaWRwLmNyb3Vz
-LWxpbW9nZXMuZnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDYnE9D
-NfGEpBj3Iy72odoL+yZSdhS+FsM/IU2BJANw6dbXRpNMFfNnLRkWWPTwdeJh8r4A
-eNmRKLQCMZP+E/NY3zQlnAOakL2c/fgBTv5Oawe3speWTS3N0whStUMtbgzWafBE
-cToI3gFcC4x0JPklum99m+ZZ17D3oLrIttOYZ4fXjsQj2yJwFBp3nJ7qh1rfwfKf
-rAYKF0gxekGUR5YgjFKpU4zbcZSHeIAHaD8WLJRkdEBvEC/tF8gjrBSP2aTAgLUS
-bk81rZWRXXA0CCZynsTpDvtycQhL3/4zMIkUPpV9So68DZz63QXXZTwUIyyjWtOv
-C8ZDw3WvVWTsxdf9AgMBAAGjggFxMIIBbTAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJ
-ays3V0fqkOO57TAdBgNVHQ4EFgQUfiR82eCVOYTgD0HPV8QeEe5jLSIwDgYDVR0P
-AQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsG
-AQUFBwMCMCIGA1UdIAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQIBMDoGA1Ud
-HwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NM
-Q0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50
-Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6
-Ly9vY3NwLnRjcy50ZXJlbmEub3JnMB8GA1UdEQQYMBaCFGlkcC5jcm91cy1saW1v
-Z2VzLmZyMA0GCSqGSIb3DQEBBQUAA4IBAQCQRcYk/yvCdP/VT7R890J3pvAXlEm8
-7/DWetj4M6P3pV41o8wiuZT49jsSvGKvFEiq8QrE3MQjpWO+ASd90WCfKGJGgWta
-9oftaIHINRmEd2mDQ1WMuZMbaXEwOf7lxiSvzlxRXHgAJ3C0oexBx6z16GRPLDMY
-Xm2MIteZK1lI8FEoWX8qXg8EjL/NZdxu1v7dU/jSHL2HlNj8sNVWwh+aUQxL8qBe
-Myun/oIQkNnp0Pdk8+EGzL0g39mOz/aifvbBnk4nBg9YZhbX1PHPcsaTXReB9z48
-ZDIXns+y/xQLIh4KMx/XzIpQHZC0zvB3nMoYPiHZ3L/UUxNGQacmInYV
-					    </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://idp.crous-limoges.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.crous-limoges.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.crous-limoges.fr/cas/login"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">crous-limoges.fr</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIEdjCCA16gAwIBAgIRALZcQBV2KHd5bIl5Qpk5ONAwDQYJKoZIhvcNAQEFBQAw
-NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-IFNTTCBDQTAeFw0xNDAzMjcwMDAwMDBaFw0xNzAzMjYyMzU5NTlaMEIxITAfBgNV
-BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEdMBsGA1UEAxMUaWRwLmNyb3Vz
-LWxpbW9nZXMuZnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDYnE9D
-NfGEpBj3Iy72odoL+yZSdhS+FsM/IU2BJANw6dbXRpNMFfNnLRkWWPTwdeJh8r4A
-eNmRKLQCMZP+E/NY3zQlnAOakL2c/fgBTv5Oawe3speWTS3N0whStUMtbgzWafBE
-cToI3gFcC4x0JPklum99m+ZZ17D3oLrIttOYZ4fXjsQj2yJwFBp3nJ7qh1rfwfKf
-rAYKF0gxekGUR5YgjFKpU4zbcZSHeIAHaD8WLJRkdEBvEC/tF8gjrBSP2aTAgLUS
-bk81rZWRXXA0CCZynsTpDvtycQhL3/4zMIkUPpV9So68DZz63QXXZTwUIyyjWtOv
-C8ZDw3WvVWTsxdf9AgMBAAGjggFxMIIBbTAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJ
-ays3V0fqkOO57TAdBgNVHQ4EFgQUfiR82eCVOYTgD0HPV8QeEe5jLSIwDgYDVR0P
-AQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsG
-AQUFBwMCMCIGA1UdIAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQIBMDoGA1Ud
-HwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NM
-Q0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50
-Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6
-Ly9vY3NwLnRjcy50ZXJlbmEub3JnMB8GA1UdEQQYMBaCFGlkcC5jcm91cy1saW1v
-Z2VzLmZyMA0GCSqGSIb3DQEBBQUAA4IBAQCQRcYk/yvCdP/VT7R890J3pvAXlEm8
-7/DWetj4M6P3pV41o8wiuZT49jsSvGKvFEiq8QrE3MQjpWO+ASd90WCfKGJGgWta
-9oftaIHINRmEd2mDQ1WMuZMbaXEwOf7lxiSvzlxRXHgAJ3C0oexBx6z16GRPLDMY
-Xm2MIteZK1lI8FEoWX8qXg8EjL/NZdxu1v7dU/jSHL2HlNj8sNVWwh+aUQxL8qBe
-Myun/oIQkNnp0Pdk8+EGzL0g39mOz/aifvbBnk4nBg9YZhbX1PHPcsaTXReB9z48
-ZDIXns+y/xQLIh4KMx/XzIpQHZC0zvB3nMoYPiHZ3L/UUxNGQacmInYV
-					    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.crous-limoges.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">CROUS de Limoges</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">CROUS de Limoges</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <EmailAddress>informatique@crous-limoges.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.crous-montpellier.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.crous-montpellier.fr-idp-shibboleth.xml
deleted file mode 100644
index ba58d1e9..00000000
--- a/swamid-interfederations-2.0/idp.crous-montpellier.fr-idp-shibboleth.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://idp.crous-montpellier.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2013-09-16T10:39:04Z">
-      <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">crous34.fr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">crous-montpellier.fr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">crous-montpellier.com</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">CROUS Montpellier</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIEfTCCA2WgAwIBAgIQW84RLDvn4CKSrQzHY8mYBDANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTEzMDQwNTAwMDAwMFoXDTE2MDQwNDIzNTk1OVowRjEhMB8GA1UE
-CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMSEwHwYDVQQDExhpZHAuY3JvdXMt
-bW9udHBlbGxpZXIuZnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDN
-ipxZYjH7Okg/AxioyADxQjZ0Nh0Zo53WIWAyFUnC6C+nMgUJ1D/00DAQNyret7d9
-QsWPZ91tpNvJe/TmMF3LEAVmlCKlB0VUM4PDhHSC6oVvQfwmNVfbY6HnxeDaei1V
-MwW5Xyg+84tbKXhflWO7CradjLBhCpcUO4HCXiep9VGbSj/0bAVHxndqJ25n2zRa
-SrqdWPkwXtdr5Ui2ZvsO5Hjv+MbDdmoHOhggKfPYGm19qL+Z7qOwMQBpd0lj017n
-PQM42NBtpNT0BDuBNvtjf5eaBZC8LS7fSMRMQwPf4VhpNY1I70MwdomiDxqNwYXx
-9anx5kqh7PBMZZZ0UIxzAgMBAAGjggF1MIIBcTAfBgNVHSMEGDAWgBQMvZNoDPPe
-q6NJays3V0fqkOO57TAdBgNVHQ4EFgQUe3icn+qHFOTQo351iBCQVUwSD8owDgYD
-VR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEG
-CCsGAQUFBwMCMCIGA1UdIAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQIBMDoG
-A1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5B
-U1NMQ0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2Ny
-dC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0
-dHA6Ly9vY3NwLnRjcy50ZXJlbmEub3JnMCMGA1UdEQQcMBqCGGlkcC5jcm91cy1t
-b250cGVsbGllci5mcjANBgkqhkiG9w0BAQUFAAOCAQEAPUj56pqt4omDji87y4AW
-oSvMlOm2D/BKs05Y+73RGi4uWLJBm5kDFjf1sGz13mBqvDOcRmgVwyvwshoN+ore
-TDXjzlln23EryRcKFR0UWhTr+YJx1gnKKh5l2zkfESbW6GzBWUCNpPET6yfGnYEi
-9zwT4/4fTCyZFQ4Gobp8txuRxEYK04TXMfisRWalUsaN+RvQ4P67PybkKkGpYT2m
-ZYgF8wFNPxv7zYjytnwMsgooqbljTUNZ4l8X3CkWyQtg+fEs/YTq/N6nJxTr9lum
-rfFn3UDbcx+AygODjXAnt3UQ3xAOFeZtQIL55aqo9p7NAdd0cTd3JAQYcCoqUDWT
-IQ==
-					    </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://idp.crous-montpellier.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.crous-montpellier.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.crous-montpellier.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">crous34.fr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">crous-montpellier.fr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">crous-montpellier.com</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIEfTCCA2WgAwIBAgIQW84RLDvn4CKSrQzHY8mYBDANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTEzMDQwNTAwMDAwMFoXDTE2MDQwNDIzNTk1OVowRjEhMB8GA1UE
-CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMSEwHwYDVQQDExhpZHAuY3JvdXMt
-bW9udHBlbGxpZXIuZnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDN
-ipxZYjH7Okg/AxioyADxQjZ0Nh0Zo53WIWAyFUnC6C+nMgUJ1D/00DAQNyret7d9
-QsWPZ91tpNvJe/TmMF3LEAVmlCKlB0VUM4PDhHSC6oVvQfwmNVfbY6HnxeDaei1V
-MwW5Xyg+84tbKXhflWO7CradjLBhCpcUO4HCXiep9VGbSj/0bAVHxndqJ25n2zRa
-SrqdWPkwXtdr5Ui2ZvsO5Hjv+MbDdmoHOhggKfPYGm19qL+Z7qOwMQBpd0lj017n
-PQM42NBtpNT0BDuBNvtjf5eaBZC8LS7fSMRMQwPf4VhpNY1I70MwdomiDxqNwYXx
-9anx5kqh7PBMZZZ0UIxzAgMBAAGjggF1MIIBcTAfBgNVHSMEGDAWgBQMvZNoDPPe
-q6NJays3V0fqkOO57TAdBgNVHQ4EFgQUe3icn+qHFOTQo351iBCQVUwSD8owDgYD
-VR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEG
-CCsGAQUFBwMCMCIGA1UdIAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQIBMDoG
-A1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5B
-U1NMQ0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2Ny
-dC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0
-dHA6Ly9vY3NwLnRjcy50ZXJlbmEub3JnMCMGA1UdEQQcMBqCGGlkcC5jcm91cy1t
-b250cGVsbGllci5mcjANBgkqhkiG9w0BAQUFAAOCAQEAPUj56pqt4omDji87y4AW
-oSvMlOm2D/BKs05Y+73RGi4uWLJBm5kDFjf1sGz13mBqvDOcRmgVwyvwshoN+ore
-TDXjzlln23EryRcKFR0UWhTr+YJx1gnKKh5l2zkfESbW6GzBWUCNpPET6yfGnYEi
-9zwT4/4fTCyZFQ4Gobp8txuRxEYK04TXMfisRWalUsaN+RvQ4P67PybkKkGpYT2m
-ZYgF8wFNPxv7zYjytnwMsgooqbljTUNZ4l8X3CkWyQtg+fEs/YTq/N6nJxTr9lum
-rfFn3UDbcx+AygODjXAnt3UQ3xAOFeZtQIL55aqo9p7NAdd0cTd3JAQYcCoqUDWT
-IQ==
-					    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.crous-montpellier.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">CROUS Montpellier</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">CROUS Montpellier</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Olivier COUADE</SurName>
-    <EmailAddress>olivier.couade@crous-montpellier.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.crous-montpellier.fr.xml b/swamid-interfederations-2.0/idp.crous-montpellier.fr.xml
deleted file mode 100644
index ba58d1e9..00000000
--- a/swamid-interfederations-2.0/idp.crous-montpellier.fr.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://idp.crous-montpellier.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2013-09-16T10:39:04Z">
-      <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">crous34.fr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">crous-montpellier.fr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">crous-montpellier.com</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">CROUS Montpellier</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIEfTCCA2WgAwIBAgIQW84RLDvn4CKSrQzHY8mYBDANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTEzMDQwNTAwMDAwMFoXDTE2MDQwNDIzNTk1OVowRjEhMB8GA1UE
-CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMSEwHwYDVQQDExhpZHAuY3JvdXMt
-bW9udHBlbGxpZXIuZnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDN
-ipxZYjH7Okg/AxioyADxQjZ0Nh0Zo53WIWAyFUnC6C+nMgUJ1D/00DAQNyret7d9
-QsWPZ91tpNvJe/TmMF3LEAVmlCKlB0VUM4PDhHSC6oVvQfwmNVfbY6HnxeDaei1V
-MwW5Xyg+84tbKXhflWO7CradjLBhCpcUO4HCXiep9VGbSj/0bAVHxndqJ25n2zRa
-SrqdWPkwXtdr5Ui2ZvsO5Hjv+MbDdmoHOhggKfPYGm19qL+Z7qOwMQBpd0lj017n
-PQM42NBtpNT0BDuBNvtjf5eaBZC8LS7fSMRMQwPf4VhpNY1I70MwdomiDxqNwYXx
-9anx5kqh7PBMZZZ0UIxzAgMBAAGjggF1MIIBcTAfBgNVHSMEGDAWgBQMvZNoDPPe
-q6NJays3V0fqkOO57TAdBgNVHQ4EFgQUe3icn+qHFOTQo351iBCQVUwSD8owDgYD
-VR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEG
-CCsGAQUFBwMCMCIGA1UdIAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQIBMDoG
-A1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5B
-U1NMQ0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2Ny
-dC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0
-dHA6Ly9vY3NwLnRjcy50ZXJlbmEub3JnMCMGA1UdEQQcMBqCGGlkcC5jcm91cy1t
-b250cGVsbGllci5mcjANBgkqhkiG9w0BAQUFAAOCAQEAPUj56pqt4omDji87y4AW
-oSvMlOm2D/BKs05Y+73RGi4uWLJBm5kDFjf1sGz13mBqvDOcRmgVwyvwshoN+ore
-TDXjzlln23EryRcKFR0UWhTr+YJx1gnKKh5l2zkfESbW6GzBWUCNpPET6yfGnYEi
-9zwT4/4fTCyZFQ4Gobp8txuRxEYK04TXMfisRWalUsaN+RvQ4P67PybkKkGpYT2m
-ZYgF8wFNPxv7zYjytnwMsgooqbljTUNZ4l8X3CkWyQtg+fEs/YTq/N6nJxTr9lum
-rfFn3UDbcx+AygODjXAnt3UQ3xAOFeZtQIL55aqo9p7NAdd0cTd3JAQYcCoqUDWT
-IQ==
-					    </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://idp.crous-montpellier.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.crous-montpellier.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.crous-montpellier.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">crous34.fr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">crous-montpellier.fr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">crous-montpellier.com</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIEfTCCA2WgAwIBAgIQW84RLDvn4CKSrQzHY8mYBDANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTEzMDQwNTAwMDAwMFoXDTE2MDQwNDIzNTk1OVowRjEhMB8GA1UE
-CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMSEwHwYDVQQDExhpZHAuY3JvdXMt
-bW9udHBlbGxpZXIuZnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDN
-ipxZYjH7Okg/AxioyADxQjZ0Nh0Zo53WIWAyFUnC6C+nMgUJ1D/00DAQNyret7d9
-QsWPZ91tpNvJe/TmMF3LEAVmlCKlB0VUM4PDhHSC6oVvQfwmNVfbY6HnxeDaei1V
-MwW5Xyg+84tbKXhflWO7CradjLBhCpcUO4HCXiep9VGbSj/0bAVHxndqJ25n2zRa
-SrqdWPkwXtdr5Ui2ZvsO5Hjv+MbDdmoHOhggKfPYGm19qL+Z7qOwMQBpd0lj017n
-PQM42NBtpNT0BDuBNvtjf5eaBZC8LS7fSMRMQwPf4VhpNY1I70MwdomiDxqNwYXx
-9anx5kqh7PBMZZZ0UIxzAgMBAAGjggF1MIIBcTAfBgNVHSMEGDAWgBQMvZNoDPPe
-q6NJays3V0fqkOO57TAdBgNVHQ4EFgQUe3icn+qHFOTQo351iBCQVUwSD8owDgYD
-VR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEG
-CCsGAQUFBwMCMCIGA1UdIAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQIBMDoG
-A1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5B
-U1NMQ0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2Ny
-dC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0
-dHA6Ly9vY3NwLnRjcy50ZXJlbmEub3JnMCMGA1UdEQQcMBqCGGlkcC5jcm91cy1t
-b250cGVsbGllci5mcjANBgkqhkiG9w0BAQUFAAOCAQEAPUj56pqt4omDji87y4AW
-oSvMlOm2D/BKs05Y+73RGi4uWLJBm5kDFjf1sGz13mBqvDOcRmgVwyvwshoN+ore
-TDXjzlln23EryRcKFR0UWhTr+YJx1gnKKh5l2zkfESbW6GzBWUCNpPET6yfGnYEi
-9zwT4/4fTCyZFQ4Gobp8txuRxEYK04TXMfisRWalUsaN+RvQ4P67PybkKkGpYT2m
-ZYgF8wFNPxv7zYjytnwMsgooqbljTUNZ4l8X3CkWyQtg+fEs/YTq/N6nJxTr9lum
-rfFn3UDbcx+AygODjXAnt3UQ3xAOFeZtQIL55aqo9p7NAdd0cTd3JAQYcCoqUDWT
-IQ==
-					    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.crous-montpellier.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">CROUS Montpellier</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">CROUS Montpellier</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Olivier COUADE</SurName>
-    <EmailAddress>olivier.couade@crous-montpellier.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.crous-nancy-metz.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.crous-nancy-metz.fr-idp-shibboleth.xml
deleted file mode 100644
index 4b7c72f5..00000000
--- a/swamid-interfederations-2.0/idp.crous-nancy-metz.fr-idp-shibboleth.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://idp.crous-nancy-metz.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2013-07-19T10:43:55Z">
-      <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">crous-nancy-metz.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">CROUS Nancy-Metz Lorraine</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIEfDCCA2SgAwIBAgIRAM5o4WD6O95qTaaU1z+tWw4wDQYJKoZIhvcNAQEFBQAw
-NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-IFNTTCBDQTAeFw0xMzAzMjAwMDAwMDBaFw0xNjAzMTkyMzU5NTlaMEUxITAfBgNV
-BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEgMB4GA1UEAxMXaWRwLmNyb3Vz
-LW5hbmN5LW1ldHouZnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDL
-R1c4GL3zTfYfOGNLV5wcJIlhDDYdk1286uSM4zbrXIbWc5C+vxbuYKXCN3BJeOpX
-rxGjVMP0Kz/nJQVsWZGAIOxiejcXo4npAEgnPjnHVl0Y263vS5/QrT0H2ttIQsdt
-HBZy2Gq+AOIO4hUOL4MuIFK6uZBC12yqoARb34+IO2DJ77ElbvSHu03bJAoSGLXG
-ERdGIS3lEO0jJTdVbho3EmPR+ht+GysuVfSGrUNWlQf7ZMrche+fI5unjbUS4LRm
-XB92H+3kJA+51EWrgdslcIB43Yr7oxlZUng3V9WByIY5x7/U4GhXobyI/rkyqISo
-q0lzXR5ZQLBgRkil30FdAgMBAAGjggF0MIIBcDAfBgNVHSMEGDAWgBQMvZNoDPPe
-q6NJays3V0fqkOO57TAdBgNVHQ4EFgQUPqT/EG7DgKwpR5aj+ZaZTv2QOlYwDgYD
-VR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEG
-CCsGAQUFBwMCMCIGA1UdIAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQIBMDoG
-A1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5B
-U1NMQ0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2Ny
-dC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0
-dHA6Ly9vY3NwLnRjcy50ZXJlbmEub3JnMCIGA1UdEQQbMBmCF2lkcC5jcm91cy1u
-YW5jeS1tZXR6LmZyMA0GCSqGSIb3DQEBBQUAA4IBAQAZXnrox99qVZFbXueFnN9l
-uY6MZnN393FnefeNNGadvEWF0gXyI3rdd3AYKz36cob+ByC3RaMyopOMDJZ5yfX/
-yC1aBqSGPHAkmFazWwFevwegau0rDil+QOhZfrMPJT+YTfFSmvym++tbrgIWyOTF
-2tNGJyeSA8S6qxrnnVFqvxt4W6jNupG5axSfrdvX+WETG9Im9B3Ulc81t3cYzItC
-FtoTzmdJCiKJa0dAguaETSDW9qY/9o3pzAQTehDm0Y0OCimTQNK9LlpYirHCxuig
-GLwPKwHbqAiA7alxm3xMxv+C38F2cIaVxgdXen4sWHqqXDc91gJjIXb9hW8uSo6Z
-					    </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://idp.crous-nancy-metz.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.crous-nancy-metz.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.crous-nancy-metz.fr/idp/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">CROUS Nancy-Metz Lorraine</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">CROUS Nancy-Metz Lorraine</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Bernard ZANGA</SurName>
-    <EmailAddress>bernard.zanga@crous-nancy-metz.fr</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <SurName>Bruno LIENARD</SurName>
-    <EmailAddress>bruno.lienard@crous-nancy-metz.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.crous-nancy-metz.fr.xml b/swamid-interfederations-2.0/idp.crous-nancy-metz.fr.xml
deleted file mode 100644
index 4b7c72f5..00000000
--- a/swamid-interfederations-2.0/idp.crous-nancy-metz.fr.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://idp.crous-nancy-metz.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2013-07-19T10:43:55Z">
-      <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">crous-nancy-metz.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">CROUS Nancy-Metz Lorraine</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIEfDCCA2SgAwIBAgIRAM5o4WD6O95qTaaU1z+tWw4wDQYJKoZIhvcNAQEFBQAw
-NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-IFNTTCBDQTAeFw0xMzAzMjAwMDAwMDBaFw0xNjAzMTkyMzU5NTlaMEUxITAfBgNV
-BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEgMB4GA1UEAxMXaWRwLmNyb3Vz
-LW5hbmN5LW1ldHouZnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDL
-R1c4GL3zTfYfOGNLV5wcJIlhDDYdk1286uSM4zbrXIbWc5C+vxbuYKXCN3BJeOpX
-rxGjVMP0Kz/nJQVsWZGAIOxiejcXo4npAEgnPjnHVl0Y263vS5/QrT0H2ttIQsdt
-HBZy2Gq+AOIO4hUOL4MuIFK6uZBC12yqoARb34+IO2DJ77ElbvSHu03bJAoSGLXG
-ERdGIS3lEO0jJTdVbho3EmPR+ht+GysuVfSGrUNWlQf7ZMrche+fI5unjbUS4LRm
-XB92H+3kJA+51EWrgdslcIB43Yr7oxlZUng3V9WByIY5x7/U4GhXobyI/rkyqISo
-q0lzXR5ZQLBgRkil30FdAgMBAAGjggF0MIIBcDAfBgNVHSMEGDAWgBQMvZNoDPPe
-q6NJays3V0fqkOO57TAdBgNVHQ4EFgQUPqT/EG7DgKwpR5aj+ZaZTv2QOlYwDgYD
-VR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEG
-CCsGAQUFBwMCMCIGA1UdIAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQIBMDoG
-A1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5B
-U1NMQ0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2Ny
-dC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0
-dHA6Ly9vY3NwLnRjcy50ZXJlbmEub3JnMCIGA1UdEQQbMBmCF2lkcC5jcm91cy1u
-YW5jeS1tZXR6LmZyMA0GCSqGSIb3DQEBBQUAA4IBAQAZXnrox99qVZFbXueFnN9l
-uY6MZnN393FnefeNNGadvEWF0gXyI3rdd3AYKz36cob+ByC3RaMyopOMDJZ5yfX/
-yC1aBqSGPHAkmFazWwFevwegau0rDil+QOhZfrMPJT+YTfFSmvym++tbrgIWyOTF
-2tNGJyeSA8S6qxrnnVFqvxt4W6jNupG5axSfrdvX+WETG9Im9B3Ulc81t3cYzItC
-FtoTzmdJCiKJa0dAguaETSDW9qY/9o3pzAQTehDm0Y0OCimTQNK9LlpYirHCxuig
-GLwPKwHbqAiA7alxm3xMxv+C38F2cIaVxgdXen4sWHqqXDc91gJjIXb9hW8uSo6Z
-					    </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://idp.crous-nancy-metz.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.crous-nancy-metz.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.crous-nancy-metz.fr/idp/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">CROUS Nancy-Metz Lorraine</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">CROUS Nancy-Metz Lorraine</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Bernard ZANGA</SurName>
-    <EmailAddress>bernard.zanga@crous-nancy-metz.fr</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <SurName>Bruno LIENARD</SurName>
-    <EmailAddress>bruno.lienard@crous-nancy-metz.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.crous-nantes.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.crous-nantes.fr-idp-shibboleth.xml
deleted file mode 100644
index cfaab8b2..00000000
--- a/swamid-interfederations-2.0/idp.crous-nantes.fr-idp-shibboleth.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://idp.crous-nantes.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2014-01-28T09:50:19Z">
-      <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">crous-nantes.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">CROUS of Nantes</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Employees from CROUS of Nantes</mdui:Description>
-        <mdui:DisplayName xml:lang="fr">CROUS de Nantes</mdui:DisplayName>
-        <mdui:Description xml:lang="fr">Administratifs CROUS Nantes</mdui:Description>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDODCCAiCgAwIBAgIVAMI83efvzywvxHitZXX4VZlwTMCTMA0GCSqGSIb3DQEB
-BQUAMB4xHDAaBgNVBAMTE2lkcC5jcm91cy1uYW50ZXMuZnIwHhcNMTQwNDEwMTI1
-NzAyWhcNMzQwNDEwMTI1NzAyWjAeMRwwGgYDVQQDExNpZHAuY3JvdXMtbmFudGVz
-LmZyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqNwp1Kemrmrbq+EJ
-AjqE4/C9R90pS4T5FShT/qCBlZUysiApI0/F1rcYqDfccHINp0Z6wsKAVcM10eOv
-1JokHOc1CKiPRMDTy1GLCjELj7JyLacZeEkg4Tja/6ILXcnWMOe/WrddVCvuOjxN
-nekRqxkrTMsOI44zV2Z5grnGReyhAYmV38VphFBYFn5IFZAbJNcip82rJsJAr6rS
-yN+NtX1u70UyJ9jlZlH0pu796AQX8CnsG7DBrRzSO2bttQySFrvqf1MkQJknDIuC
-rWcCGBNmCgSs5GusevCbRMvJxhLhE2F/19pyKawjM6/2QaG5LhYprQRXWLnBnJY3
-vXzmOQIDAQABo20wazBKBgNVHREEQzBBghNpZHAuY3JvdXMtbmFudGVzLmZyhipo
-dHRwczovL2lkcC5jcm91cy1uYW50ZXMuZnIvaWRwL3NoaWJib2xldGgwHQYDVR0O
-BBYEFA0ym8iOuZOL8OiKnoyrOXIteMCPMA0GCSqGSIb3DQEBBQUAA4IBAQBOElqO
-epb/E6K9bXwf7GFHqGWr4W7qEpqjJWvwbYLD8CUFKQaiEIQnWDywPpOTaVqwY548
-+4vNNu/xab3U8INNmnRf26TD2CuknF2GUqDy5FBPkwwrTHoQbsNp7c1nCABpH3gF
-pM9wqeKv332VzQPVFERNYY2ZtngdmvALe7EGyMntjtYm6J1NFQGAl0w5dx7KRU59
-/NV3jddW4fqkuqKKCNEzWx+mOcunNLWoJMnZwixbLczf1qw5bA3uEdL4qEepqyUe
-b4Va7oIyoH9QLAUtV8dUZNqUOwYBWmRcNKnI4tYCuL3HuIaQulLE9SUGPCotx3mQ
-WtPzHc/Z3g9j7+76
-					    </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>
-					      MIIEdDCCA1ygAwIBAgIRALmCI9KfSplaBaEw3OkzCqswDQYJKoZIhvcNAQEFBQAw
-NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-IFNTTCBDQTAeFw0xMzEyMDQwMDAwMDBaFw0xNjEyMDMyMzU5NTlaMEExITAfBgNV
-BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEcMBoGA1UEAxMTaWRwLmNyb3Vz
-LW5hbnRlcy5mcjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAN7dNk66
-6Q8SjuXbyYGRJDmUcZzfrQbZo2tm93Q6UW0OwyidY+HQ2kwjnfFtAO8k9nYJbUR7
-sbffjlJ6cE7UqvzCCLhdQ+ljv0qMQIUFCdQyq7Qc1JtJ5wDppK7gFFxHi0JkZKzc
-eI5a8MGJ9QmBa9dqeD6bR116TkiF8zBpuUvTz64E9OIb0RuO/auFn0T0fpOh3WlS
-Gl2viccrsMKLBYqYNVESBlKbO2KvfcgYJJF5FcwBL+UWoCms5wo/R4jr4CfyOZ7D
-1S4Em8Id62+3iIVybn17BF0iO1zhuExh8NHGT4HpfZbqfwZh+3i7X1CflXRoZ/bi
-b3xYhYGmkkphqg0CAwEAAaOCAXAwggFsMB8GA1UdIwQYMBaAFAy9k2gM896ro0lr
-KzdXR+qQ47ntMB0GA1UdDgQWBBQ48HcJP0W24khejtyhRVxcWxIkgTAOBgNVHQ8B
-Af8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYB
-BQUHAwIwIgYDVR0gBBswGTANBgsrBgEEAbIxAQICHTAIBgZngQwBAgEwOgYDVR0f
-BDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xD
-QS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRj
-cy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDov
-L29jc3AudGNzLnRlcmVuYS5vcmcwHgYDVR0RBBcwFYITaWRwLmNyb3VzLW5hbnRl
-cy5mcjANBgkqhkiG9w0BAQUFAAOCAQEABJnxgwEeQraM3Xe7rLl95ex0B+QUrBVY
-GCjumdLmvDf8i26sr8V1S/Y7pnFvwOwJutrf4P23tYEcFlMRjxkSZqGhfkzws+A4
-oGEtdmL2SZwX4kkhczWk2VboqCaywOPKhLrZBlsezqwpNODU5MSEs7DHZB4RV1kx
-Y4Lshyv0lVcFjSQyQnYTAPJ9nfZDAAV82/IUlbGEZwO+KcX7DsY7LIfxlMwesRLV
-d3kCluVSx+IUBZZixpFu9/bCBlpuEzHrmXsU/by0WO0w49ICNX3lUCLUkWvMuSlN
-ri7ETEJpUukv03GWujd49DIGtCfo6+64k5DS9OpUUvAbsMfYlvudjQ==
-					    </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://idp.crous-nantes.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.crous-nantes.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.crous-nantes.fr/idp/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">CROUS de Nantes</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">CROUS de Nantes</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <EmailAddress>dsi.exploitation@crous-nantes.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.crous-nantes.fr.xml b/swamid-interfederations-2.0/idp.crous-nantes.fr.xml
deleted file mode 100644
index cfaab8b2..00000000
--- a/swamid-interfederations-2.0/idp.crous-nantes.fr.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://idp.crous-nantes.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2014-01-28T09:50:19Z">
-      <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">crous-nantes.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">CROUS of Nantes</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Employees from CROUS of Nantes</mdui:Description>
-        <mdui:DisplayName xml:lang="fr">CROUS de Nantes</mdui:DisplayName>
-        <mdui:Description xml:lang="fr">Administratifs CROUS Nantes</mdui:Description>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDODCCAiCgAwIBAgIVAMI83efvzywvxHitZXX4VZlwTMCTMA0GCSqGSIb3DQEB
-BQUAMB4xHDAaBgNVBAMTE2lkcC5jcm91cy1uYW50ZXMuZnIwHhcNMTQwNDEwMTI1
-NzAyWhcNMzQwNDEwMTI1NzAyWjAeMRwwGgYDVQQDExNpZHAuY3JvdXMtbmFudGVz
-LmZyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqNwp1Kemrmrbq+EJ
-AjqE4/C9R90pS4T5FShT/qCBlZUysiApI0/F1rcYqDfccHINp0Z6wsKAVcM10eOv
-1JokHOc1CKiPRMDTy1GLCjELj7JyLacZeEkg4Tja/6ILXcnWMOe/WrddVCvuOjxN
-nekRqxkrTMsOI44zV2Z5grnGReyhAYmV38VphFBYFn5IFZAbJNcip82rJsJAr6rS
-yN+NtX1u70UyJ9jlZlH0pu796AQX8CnsG7DBrRzSO2bttQySFrvqf1MkQJknDIuC
-rWcCGBNmCgSs5GusevCbRMvJxhLhE2F/19pyKawjM6/2QaG5LhYprQRXWLnBnJY3
-vXzmOQIDAQABo20wazBKBgNVHREEQzBBghNpZHAuY3JvdXMtbmFudGVzLmZyhipo
-dHRwczovL2lkcC5jcm91cy1uYW50ZXMuZnIvaWRwL3NoaWJib2xldGgwHQYDVR0O
-BBYEFA0ym8iOuZOL8OiKnoyrOXIteMCPMA0GCSqGSIb3DQEBBQUAA4IBAQBOElqO
-epb/E6K9bXwf7GFHqGWr4W7qEpqjJWvwbYLD8CUFKQaiEIQnWDywPpOTaVqwY548
-+4vNNu/xab3U8INNmnRf26TD2CuknF2GUqDy5FBPkwwrTHoQbsNp7c1nCABpH3gF
-pM9wqeKv332VzQPVFERNYY2ZtngdmvALe7EGyMntjtYm6J1NFQGAl0w5dx7KRU59
-/NV3jddW4fqkuqKKCNEzWx+mOcunNLWoJMnZwixbLczf1qw5bA3uEdL4qEepqyUe
-b4Va7oIyoH9QLAUtV8dUZNqUOwYBWmRcNKnI4tYCuL3HuIaQulLE9SUGPCotx3mQ
-WtPzHc/Z3g9j7+76
-					    </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>
-					      MIIEdDCCA1ygAwIBAgIRALmCI9KfSplaBaEw3OkzCqswDQYJKoZIhvcNAQEFBQAw
-NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-IFNTTCBDQTAeFw0xMzEyMDQwMDAwMDBaFw0xNjEyMDMyMzU5NTlaMEExITAfBgNV
-BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEcMBoGA1UEAxMTaWRwLmNyb3Vz
-LW5hbnRlcy5mcjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAN7dNk66
-6Q8SjuXbyYGRJDmUcZzfrQbZo2tm93Q6UW0OwyidY+HQ2kwjnfFtAO8k9nYJbUR7
-sbffjlJ6cE7UqvzCCLhdQ+ljv0qMQIUFCdQyq7Qc1JtJ5wDppK7gFFxHi0JkZKzc
-eI5a8MGJ9QmBa9dqeD6bR116TkiF8zBpuUvTz64E9OIb0RuO/auFn0T0fpOh3WlS
-Gl2viccrsMKLBYqYNVESBlKbO2KvfcgYJJF5FcwBL+UWoCms5wo/R4jr4CfyOZ7D
-1S4Em8Id62+3iIVybn17BF0iO1zhuExh8NHGT4HpfZbqfwZh+3i7X1CflXRoZ/bi
-b3xYhYGmkkphqg0CAwEAAaOCAXAwggFsMB8GA1UdIwQYMBaAFAy9k2gM896ro0lr
-KzdXR+qQ47ntMB0GA1UdDgQWBBQ48HcJP0W24khejtyhRVxcWxIkgTAOBgNVHQ8B
-Af8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYB
-BQUHAwIwIgYDVR0gBBswGTANBgsrBgEEAbIxAQICHTAIBgZngQwBAgEwOgYDVR0f
-BDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xD
-QS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRj
-cy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDov
-L29jc3AudGNzLnRlcmVuYS5vcmcwHgYDVR0RBBcwFYITaWRwLmNyb3VzLW5hbnRl
-cy5mcjANBgkqhkiG9w0BAQUFAAOCAQEABJnxgwEeQraM3Xe7rLl95ex0B+QUrBVY
-GCjumdLmvDf8i26sr8V1S/Y7pnFvwOwJutrf4P23tYEcFlMRjxkSZqGhfkzws+A4
-oGEtdmL2SZwX4kkhczWk2VboqCaywOPKhLrZBlsezqwpNODU5MSEs7DHZB4RV1kx
-Y4Lshyv0lVcFjSQyQnYTAPJ9nfZDAAV82/IUlbGEZwO+KcX7DsY7LIfxlMwesRLV
-d3kCluVSx+IUBZZixpFu9/bCBlpuEzHrmXsU/by0WO0w49ICNX3lUCLUkWvMuSlN
-ri7ETEJpUukv03GWujd49DIGtCfo6+64k5DS9OpUUvAbsMfYlvudjQ==
-					    </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://idp.crous-nantes.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.crous-nantes.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.crous-nantes.fr/idp/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">CROUS de Nantes</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">CROUS de Nantes</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <EmailAddress>dsi.exploitation@crous-nantes.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.crous-nice.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.crous-nice.fr-idp-shibboleth.xml
deleted file mode 100644
index 13b57e1a..00000000
--- a/swamid-interfederations-2.0/idp.crous-nice.fr-idp-shibboleth.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://idp.crous-nice.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2014-05-28T10:27:56Z">
-      <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">crous-nice.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">CROUS de Nice - Employee</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Access to buisiness software via Identity Federation.</mdui:Description>
-        <mdui:DisplayName xml:lang="fr">CROUS de Nice - Personnels</mdui:DisplayName>
-        <mdui:Description xml:lang="fr">Accès aux applications métiers du CNOUS par la fédération d'identité.</mdui:Description>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIEcDCCA1igAwIBAgIRAMHTGdw9yTpb8GTC7eORirkwDQYJKoZIhvcNAQEFBQAw
-NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-IFNTTCBDQTAeFw0xNDA1MjMwMDAwMDBaFw0xNzA1MjIyMzU5NTlaMD8xITAfBgNV
-BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEaMBgGA1UEAxMRaWRwLmNyb3Vz
-LW5pY2UuZnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCnQ3RV1nfN
-L8sIsz8lErI6GirN9Gm96VGgQIlFVdE4MQt1zJ8v8VfPeFH++a/N/I56emmGRc/G
-sihTWAXZ8prWUYisSPtuTmnHXFmAEOJZp4/ajdVUUBT+WMGpJx2XUfIUPfa1+TK+
-w+0eqRpCh6IWtPqyPOLs24lKdDcLV55j65LLcBfyejeUsjtyGrimC64Dy1vXTAJf
-yHVk5GeOvAvcdCBZUO5GRjIhlWiH0YLJJ439MzpbEgXYhIFQvPEVBY+he448SQXS
-anD9JJalMmA9/tmWHqo9qCusDxXVzGUhgW2FHKh49AjMaXp/W5n1p50ZLoicEq7k
-s5NtBCw8jCGDAgMBAAGjggFuMIIBajAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3
-V0fqkOO57TAdBgNVHQ4EFgQUs/OdYrZbtOAjgBXRUwXEVH/bhJ0wDgYDVR0PAQH/
-BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUF
-BwMCMCIGA1UdIAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQIBMDoGA1UdHwQz
-MDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0Eu
-Y3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50Y3Mu
-dGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9v
-Y3NwLnRjcy50ZXJlbmEub3JnMBwGA1UdEQQVMBOCEWlkcC5jcm91cy1uaWNlLmZy
-MA0GCSqGSIb3DQEBBQUAA4IBAQA+TVHB9HB1aQF2emZfL4BKmI+ULDlvSPunwG1w
-BYzKcYeg2pH39CFREkXTGXn/VDFGXdMOmVlvTGvNeQwEWQVbqrHEyFSyney0e7ZE
-KsS81CNBYBd7KTWJC4NpYXsrlGT43cKIeWsbbhVRrG8xv3y66AOrzW8HO0kHbkb5
-BDObTK/AxaaDCf754DBSS+C7OHTihGp4Be+8EbQvQb5drVCgrHdbtP7dd31XXCV1
-PK0bgjuS0OSSCCgiqBftO/Ym7RLAoYif9L8mQLCDcms/4wJzjssdLgnuqSk3VxPx
-tYzHJuh0PK935LA6t7Tt2AiGFlmfSUXmGwwHxCMalr3BgJBN
-					    </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://idp.crous-nice.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.crous-nice.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.crous-nice.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">crous-nice.fr</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIEcDCCA1igAwIBAgIRAMHTGdw9yTpb8GTC7eORirkwDQYJKoZIhvcNAQEFBQAw
-NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-IFNTTCBDQTAeFw0xNDA1MjMwMDAwMDBaFw0xNzA1MjIyMzU5NTlaMD8xITAfBgNV
-BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEaMBgGA1UEAxMRaWRwLmNyb3Vz
-LW5pY2UuZnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCnQ3RV1nfN
-L8sIsz8lErI6GirN9Gm96VGgQIlFVdE4MQt1zJ8v8VfPeFH++a/N/I56emmGRc/G
-sihTWAXZ8prWUYisSPtuTmnHXFmAEOJZp4/ajdVUUBT+WMGpJx2XUfIUPfa1+TK+
-w+0eqRpCh6IWtPqyPOLs24lKdDcLV55j65LLcBfyejeUsjtyGrimC64Dy1vXTAJf
-yHVk5GeOvAvcdCBZUO5GRjIhlWiH0YLJJ439MzpbEgXYhIFQvPEVBY+he448SQXS
-anD9JJalMmA9/tmWHqo9qCusDxXVzGUhgW2FHKh49AjMaXp/W5n1p50ZLoicEq7k
-s5NtBCw8jCGDAgMBAAGjggFuMIIBajAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3
-V0fqkOO57TAdBgNVHQ4EFgQUs/OdYrZbtOAjgBXRUwXEVH/bhJ0wDgYDVR0PAQH/
-BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUF
-BwMCMCIGA1UdIAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQIBMDoGA1UdHwQz
-MDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0Eu
-Y3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50Y3Mu
-dGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9v
-Y3NwLnRjcy50ZXJlbmEub3JnMBwGA1UdEQQVMBOCEWlkcC5jcm91cy1uaWNlLmZy
-MA0GCSqGSIb3DQEBBQUAA4IBAQA+TVHB9HB1aQF2emZfL4BKmI+ULDlvSPunwG1w
-BYzKcYeg2pH39CFREkXTGXn/VDFGXdMOmVlvTGvNeQwEWQVbqrHEyFSyney0e7ZE
-KsS81CNBYBd7KTWJC4NpYXsrlGT43cKIeWsbbhVRrG8xv3y66AOrzW8HO0kHbkb5
-BDObTK/AxaaDCf754DBSS+C7OHTihGp4Be+8EbQvQb5drVCgrHdbtP7dd31XXCV1
-PK0bgjuS0OSSCCgiqBftO/Ym7RLAoYif9L8mQLCDcms/4wJzjssdLgnuqSk3VxPx
-tYzHJuh0PK935LA6t7Tt2AiGFlmfSUXmGwwHxCMalr3BgJBN
-					    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.crous-nice.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">CROUS de Nice - Personnels</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">CROUS de Nice - Personnels</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <EmailAddress>admin@crous-nice.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.crous-nice.fr.xml b/swamid-interfederations-2.0/idp.crous-nice.fr.xml
deleted file mode 100644
index 13b57e1a..00000000
--- a/swamid-interfederations-2.0/idp.crous-nice.fr.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://idp.crous-nice.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2014-05-28T10:27:56Z">
-      <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">crous-nice.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">CROUS de Nice - Employee</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Access to buisiness software via Identity Federation.</mdui:Description>
-        <mdui:DisplayName xml:lang="fr">CROUS de Nice - Personnels</mdui:DisplayName>
-        <mdui:Description xml:lang="fr">Accès aux applications métiers du CNOUS par la fédération d'identité.</mdui:Description>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIEcDCCA1igAwIBAgIRAMHTGdw9yTpb8GTC7eORirkwDQYJKoZIhvcNAQEFBQAw
-NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-IFNTTCBDQTAeFw0xNDA1MjMwMDAwMDBaFw0xNzA1MjIyMzU5NTlaMD8xITAfBgNV
-BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEaMBgGA1UEAxMRaWRwLmNyb3Vz
-LW5pY2UuZnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCnQ3RV1nfN
-L8sIsz8lErI6GirN9Gm96VGgQIlFVdE4MQt1zJ8v8VfPeFH++a/N/I56emmGRc/G
-sihTWAXZ8prWUYisSPtuTmnHXFmAEOJZp4/ajdVUUBT+WMGpJx2XUfIUPfa1+TK+
-w+0eqRpCh6IWtPqyPOLs24lKdDcLV55j65LLcBfyejeUsjtyGrimC64Dy1vXTAJf
-yHVk5GeOvAvcdCBZUO5GRjIhlWiH0YLJJ439MzpbEgXYhIFQvPEVBY+he448SQXS
-anD9JJalMmA9/tmWHqo9qCusDxXVzGUhgW2FHKh49AjMaXp/W5n1p50ZLoicEq7k
-s5NtBCw8jCGDAgMBAAGjggFuMIIBajAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3
-V0fqkOO57TAdBgNVHQ4EFgQUs/OdYrZbtOAjgBXRUwXEVH/bhJ0wDgYDVR0PAQH/
-BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUF
-BwMCMCIGA1UdIAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQIBMDoGA1UdHwQz
-MDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0Eu
-Y3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50Y3Mu
-dGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9v
-Y3NwLnRjcy50ZXJlbmEub3JnMBwGA1UdEQQVMBOCEWlkcC5jcm91cy1uaWNlLmZy
-MA0GCSqGSIb3DQEBBQUAA4IBAQA+TVHB9HB1aQF2emZfL4BKmI+ULDlvSPunwG1w
-BYzKcYeg2pH39CFREkXTGXn/VDFGXdMOmVlvTGvNeQwEWQVbqrHEyFSyney0e7ZE
-KsS81CNBYBd7KTWJC4NpYXsrlGT43cKIeWsbbhVRrG8xv3y66AOrzW8HO0kHbkb5
-BDObTK/AxaaDCf754DBSS+C7OHTihGp4Be+8EbQvQb5drVCgrHdbtP7dd31XXCV1
-PK0bgjuS0OSSCCgiqBftO/Ym7RLAoYif9L8mQLCDcms/4wJzjssdLgnuqSk3VxPx
-tYzHJuh0PK935LA6t7Tt2AiGFlmfSUXmGwwHxCMalr3BgJBN
-					    </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://idp.crous-nice.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.crous-nice.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.crous-nice.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">crous-nice.fr</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIEcDCCA1igAwIBAgIRAMHTGdw9yTpb8GTC7eORirkwDQYJKoZIhvcNAQEFBQAw
-NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-IFNTTCBDQTAeFw0xNDA1MjMwMDAwMDBaFw0xNzA1MjIyMzU5NTlaMD8xITAfBgNV
-BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEaMBgGA1UEAxMRaWRwLmNyb3Vz
-LW5pY2UuZnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCnQ3RV1nfN
-L8sIsz8lErI6GirN9Gm96VGgQIlFVdE4MQt1zJ8v8VfPeFH++a/N/I56emmGRc/G
-sihTWAXZ8prWUYisSPtuTmnHXFmAEOJZp4/ajdVUUBT+WMGpJx2XUfIUPfa1+TK+
-w+0eqRpCh6IWtPqyPOLs24lKdDcLV55j65LLcBfyejeUsjtyGrimC64Dy1vXTAJf
-yHVk5GeOvAvcdCBZUO5GRjIhlWiH0YLJJ439MzpbEgXYhIFQvPEVBY+he448SQXS
-anD9JJalMmA9/tmWHqo9qCusDxXVzGUhgW2FHKh49AjMaXp/W5n1p50ZLoicEq7k
-s5NtBCw8jCGDAgMBAAGjggFuMIIBajAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3
-V0fqkOO57TAdBgNVHQ4EFgQUs/OdYrZbtOAjgBXRUwXEVH/bhJ0wDgYDVR0PAQH/
-BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUF
-BwMCMCIGA1UdIAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQIBMDoGA1UdHwQz
-MDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0Eu
-Y3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50Y3Mu
-dGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9v
-Y3NwLnRjcy50ZXJlbmEub3JnMBwGA1UdEQQVMBOCEWlkcC5jcm91cy1uaWNlLmZy
-MA0GCSqGSIb3DQEBBQUAA4IBAQA+TVHB9HB1aQF2emZfL4BKmI+ULDlvSPunwG1w
-BYzKcYeg2pH39CFREkXTGXn/VDFGXdMOmVlvTGvNeQwEWQVbqrHEyFSyney0e7ZE
-KsS81CNBYBd7KTWJC4NpYXsrlGT43cKIeWsbbhVRrG8xv3y66AOrzW8HO0kHbkb5
-BDObTK/AxaaDCf754DBSS+C7OHTihGp4Be+8EbQvQb5drVCgrHdbtP7dd31XXCV1
-PK0bgjuS0OSSCCgiqBftO/Ym7RLAoYif9L8mQLCDcms/4wJzjssdLgnuqSk3VxPx
-tYzHJuh0PK935LA6t7Tt2AiGFlmfSUXmGwwHxCMalr3BgJBN
-					    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.crous-nice.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">CROUS de Nice - Personnels</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">CROUS de Nice - Personnels</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <EmailAddress>admin@crous-nice.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.crous-orleans-tours.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.crous-orleans-tours.fr-idp-shibboleth.xml
deleted file mode 100644
index f48e16a5..00000000
--- a/swamid-interfederations-2.0/idp.crous-orleans-tours.fr-idp-shibboleth.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.crous-orleans-tours.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2014-06-02T15:51:56Z">
-      <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">crous-orleans-tours.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">CROUS Orléans-Tours - Personnels</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Crous Orléans-Tours staff</mdui:Description>
-        <mdui:DisplayName xml:lang="fr">CROUS Orléans-Tours - Personnels</mdui:DisplayName>
-        <mdui:Description xml:lang="fr">Membres du personnel du Crous d'Orléans-Tours</mdui:Description>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDVDCCAjygAwIBAgIVAMl6t3QQN7SBNiEk1q64K1duI81gMA0GCSqGSIb3DQEB
-BQUAMCUxIzAhBgNVBAMTGmlkcC5jcm91cy1vcmxlYW5zLXRvdXJzLmZyMB4XDTE0
-MDUyNjEzNTUwNVoXDTM0MDUyNjEzNTUwNVowJTEjMCEGA1UEAxMaaWRwLmNyb3Vz
-LW9ybGVhbnMtdG91cnMuZnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
-AQDMVDqwA5RAg6HnDR7KyX0G3DKH0AnRsMZcbL2nU3Kt7eOnn/vKncGA/VoYPW7o
-CPWEPJZ8WsHODOtt//PCIVwfp7REAol0oUDPu2XYRHkKOtbhpp4mqF/CSuWT7bSQ
-EmLv94O9/aPjN5b/D1z8oj6di7EJz7JGr4ARHw9NEcVEgsg5b5gAT87A5wASoNbn
-T0fpOpmJQy2lCNfxAfJsq0O2PSa5Hfxg1KeVI6mDsSSLnlaS/n4uMXLGono7QbeB
-6tXq0D4wy3f2tUF54CiG9epe79VU+VqZQjb+33LO+r+DbizBbl0Q1pqvNHeaN07i
-rMVAuAFYBBquiReXwzXVlZ/pAgMBAAGjezB5MFgGA1UdEQRRME+CGmlkcC5jcm91
-cy1vcmxlYW5zLXRvdXJzLmZyhjFodHRwczovL2lkcC5jcm91cy1vcmxlYW5zLXRv
-dXJzLmZyL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBQteIp+4pKTwpW1QSeCeYi3
-ZwHBdDANBgkqhkiG9w0BAQUFAAOCAQEAa2opfhVRYW/GQmbtQC7HzNd/E5ovBrns
-l3Feh3q6gyL5kZlxcM2LasVUiv99v9hqw4eLmOhZrYtieQyPNTmijxGhFFqCCd+m
-sPQWi85i0R4/y7BKoZ7IkdeBuFxYsT9hGKMYtPXFHu2oNAAF9n19MY48vuVxJse5
-3W4/oX/WiSm1Fj+mDMmo11+zRjk2dwykd8TPKlo4klWxN0rcLrcUc9Zr1BRbZngi
-6wPYkfBTz+RpN3vmE3nMLlNTMS0OaU0BhOaL8hNBJKmPnWE7yJDZCFRE4pP8SojZ
-w7nR324InrWagttK/tkzxBOggWr5VB7dXlu+mc/Bhicd+yCGgLK1tg==
-					    </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://idp.crous-orleans-tours.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.crous-orleans-tours.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.crous-orleans-tours.fr/idp/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">CROUS Orléans-Tours - Personnels</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">CROUS Orléans-Tours - Personnels</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>LEROY Thierry</SurName>
-    <EmailAddress>thierry.leroy@crous-orleans-tours.fr</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <SurName>VINCENT Régis</SurName>
-    <EmailAddress>regis.vincent@crous-orleans-tours.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.crous-orleans-tours.fr.xml b/swamid-interfederations-2.0/idp.crous-orleans-tours.fr.xml
deleted file mode 100644
index f48e16a5..00000000
--- a/swamid-interfederations-2.0/idp.crous-orleans-tours.fr.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.crous-orleans-tours.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2014-06-02T15:51:56Z">
-      <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">crous-orleans-tours.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">CROUS Orléans-Tours - Personnels</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Crous Orléans-Tours staff</mdui:Description>
-        <mdui:DisplayName xml:lang="fr">CROUS Orléans-Tours - Personnels</mdui:DisplayName>
-        <mdui:Description xml:lang="fr">Membres du personnel du Crous d'Orléans-Tours</mdui:Description>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDVDCCAjygAwIBAgIVAMl6t3QQN7SBNiEk1q64K1duI81gMA0GCSqGSIb3DQEB
-BQUAMCUxIzAhBgNVBAMTGmlkcC5jcm91cy1vcmxlYW5zLXRvdXJzLmZyMB4XDTE0
-MDUyNjEzNTUwNVoXDTM0MDUyNjEzNTUwNVowJTEjMCEGA1UEAxMaaWRwLmNyb3Vz
-LW9ybGVhbnMtdG91cnMuZnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
-AQDMVDqwA5RAg6HnDR7KyX0G3DKH0AnRsMZcbL2nU3Kt7eOnn/vKncGA/VoYPW7o
-CPWEPJZ8WsHODOtt//PCIVwfp7REAol0oUDPu2XYRHkKOtbhpp4mqF/CSuWT7bSQ
-EmLv94O9/aPjN5b/D1z8oj6di7EJz7JGr4ARHw9NEcVEgsg5b5gAT87A5wASoNbn
-T0fpOpmJQy2lCNfxAfJsq0O2PSa5Hfxg1KeVI6mDsSSLnlaS/n4uMXLGono7QbeB
-6tXq0D4wy3f2tUF54CiG9epe79VU+VqZQjb+33LO+r+DbizBbl0Q1pqvNHeaN07i
-rMVAuAFYBBquiReXwzXVlZ/pAgMBAAGjezB5MFgGA1UdEQRRME+CGmlkcC5jcm91
-cy1vcmxlYW5zLXRvdXJzLmZyhjFodHRwczovL2lkcC5jcm91cy1vcmxlYW5zLXRv
-dXJzLmZyL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBQteIp+4pKTwpW1QSeCeYi3
-ZwHBdDANBgkqhkiG9w0BAQUFAAOCAQEAa2opfhVRYW/GQmbtQC7HzNd/E5ovBrns
-l3Feh3q6gyL5kZlxcM2LasVUiv99v9hqw4eLmOhZrYtieQyPNTmijxGhFFqCCd+m
-sPQWi85i0R4/y7BKoZ7IkdeBuFxYsT9hGKMYtPXFHu2oNAAF9n19MY48vuVxJse5
-3W4/oX/WiSm1Fj+mDMmo11+zRjk2dwykd8TPKlo4klWxN0rcLrcUc9Zr1BRbZngi
-6wPYkfBTz+RpN3vmE3nMLlNTMS0OaU0BhOaL8hNBJKmPnWE7yJDZCFRE4pP8SojZ
-w7nR324InrWagttK/tkzxBOggWr5VB7dXlu+mc/Bhicd+yCGgLK1tg==
-					    </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://idp.crous-orleans-tours.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.crous-orleans-tours.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.crous-orleans-tours.fr/idp/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">CROUS Orléans-Tours - Personnels</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">CROUS Orléans-Tours - Personnels</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>LEROY Thierry</SurName>
-    <EmailAddress>thierry.leroy@crous-orleans-tours.fr</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <SurName>VINCENT Régis</SurName>
-    <EmailAddress>regis.vincent@crous-orleans-tours.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.crous-paris.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.crous-paris.fr-idp-shibboleth.xml
deleted file mode 100644
index f2adb846..00000000
--- a/swamid-interfederations-2.0/idp.crous-paris.fr-idp-shibboleth.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://idp.crous-paris.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2013-07-02T16:45:08Z">
-      <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">crous-paris.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">CROUS Paris</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Employee</mdui:Description>
-        <mdui:DisplayName xml:lang="fr">CROUS Paris</mdui:DisplayName>
-        <mdui:Description xml:lang="fr">Agents de la fonction publique</mdui:Description>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIEcjCCA1qgAwIBAgIRAM7lNOy1/r/jbhKXln6a66wwDQYJKoZIhvcNAQEFBQAw
-NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-IFNTTCBDQTAeFw0xMzA1MzAwMDAwMDBaFw0xNjA1MjkyMzU5NTlaMEAxITAfBgNV
-BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEbMBkGA1UEAxMSaWRwLmNyb3Vz
-LXBhcmlzLmZyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAzQAmbWEI
-R0hGecLlfeDWLKnX8jIgjvZ6vGpCQSuk+haMglzUgOWhVfOdvJHyUK2FuFcu1KME
-6JtSmgVjI3ooZuzfSS2eTl/Cc/4+6ZwoxhFpIjUHXdlgdG4aLSuduAimH5hPWegU
-Jlt4faTSAiGe6OTvDJLDtbfRYYNCgkXJjV21PQbtGOeTBdrfjFm07y2O+EzygAkM
-xQsz8dRV4uRJOSmUdUcaVOYvAIrnapJtJChfn/peP8kViX6Qe4Po+sdQEtUOlL7c
-uAs+g7YNlvlLglzyLzItAJKlafOK3xU/zwB6JZ86T6cjnalCGQhwErnCWIiMbLY5
-vuR39ofOwLFL8wIDAQABo4IBbzCCAWswHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsr
-N1dH6pDjue0wHQYDVR0OBBYEFEHqA+ucEkHkbVIO5lq71eNIwXeYMA4GA1UdDwEB
-/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEF
-BQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNVHR8E
-MzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENB
-LmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNz
-LnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8v
-b2NzcC50Y3MudGVyZW5hLm9yZzAdBgNVHREEFjAUghJpZHAuY3JvdXMtcGFyaXMu
-ZnIwDQYJKoZIhvcNAQEFBQADggEBAB6Vle1wXkVbFC43JvqOvdraHJP5F7IxnPwd
-h3tIBYhgG8x2+49+OcNy4cOTkp7R7yrkw1r5G0T4vcwWvyBRLL9l8UTdmUv1HRZl
-NXSLMAk1TFxS2Vk6HUa/xGHVvGrzaxWC4s02RWC9HFGnNWCDn2+YbJr2se39+wM+
-2ACLK8Gn8FjSfGoc9hcm6d8ISjP3fQOqMjfrozsuzcWH9wrZpjPdJ/T2PMN8drcV
-CTgq1R0X/PiDgj9XuHMMkN7W6FK3t6TKUZ3gD2DTvZNPrL6Iasuf0TSIy89oHQce
-RQGzRlb3b9mZzx8kOGWx8O/wqV5Rq3m+rl5koGZabWayn6GXzMQ=
-					    </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>
-					      MIIDMzCCAhugAwIBAgIUC3qxigulZwbI9DWJOZsdPNwwYR0wDQYJKoZIhvcNAQEF
-BQAwHTEbMBkGA1UEAxMSaWRwLmNyb3VzLXBhcmlzLmZyMB4XDTEzMDYxNzE0NDEw
-M1oXDTMzMDYxNzE0NDEwM1owHTEbMBkGA1UEAxMSaWRwLmNyb3VzLXBhcmlzLmZy
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAzNUjklU6Rh2sEVjN3AHt
-oB5bghVwXkIVxCfW4SIVH3W1iLYH3dCKEbNNbfJ65kUVWzXTQV2jT4lfx/1BeC3C
-36tS+JGMtb5gvyJw22Pg8sLzOUPHACYncYhfaNDFIyZpUfHiRKfEUCUIyriecWmL
-i4LApNNvjmmV0/8GT1WBv9rQhy5CbJXznLk3fphqAb9Yu/2YYhXfHsSl21kTjApR
-o+EeCmdWAKROC1fn7yV/Velu051YLC8ILaijms2dyEvXLmLVG97MjCsIpnWL0UPJ
-pEwGBWSa6lBzE5/YzHIZZ3HQBXlq8TzMjaEOtjgHuht0t7f1K2i81K7JXheP9muq
-xwIDAQABo2swaTBIBgNVHREEQTA/ghJpZHAuY3JvdXMtcGFyaXMuZnKGKWh0dHBz
-Oi8vaWRwLmNyb3VzLXBhcmlzLmZyL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBTZ
-e98ddDx7TkaHMxapxpn4NmdkkjANBgkqhkiG9w0BAQUFAAOCAQEAb9Vl+xXRr2Zq
-sB7websZjpGg/SiukcN5stPPHEvKoNEMs7YclSDEiW7FyI/IWHjKsE3n1Ah+8jjB
-iLzOO77y2MuY/qOIKD2HT6cXBYGU2Sxss/FEPyMPGpIhEe+tv12D5tRX5B1FG/sW
-FicTUZlz3duoTqsrz/sNoTozpwtThMBvALu1w7yrMLWIZgEa0V+csm/2/cAc4qXt
-3yg0OxbBqyK7V1fBEkL35vL4xZJesk/NdiDq+K1D5fzWFHqvq8d3PCcRu9mZFonS
-AxeOndV48MCF69J2kMLRrHCkAAV2UWaWXEUpCVg20rXNqnLK+xN9Qi/Pj+fuXIyC
-dvKcBjj1lA==
-					    </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://idp.crous-paris.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.crous-paris.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.crous-paris.fr/idp/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">CROUS Paris</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">CROUS Paris</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <EmailAddress>informatique@crous-paris.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.crous-paris.fr.xml b/swamid-interfederations-2.0/idp.crous-paris.fr.xml
deleted file mode 100644
index f2adb846..00000000
--- a/swamid-interfederations-2.0/idp.crous-paris.fr.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://idp.crous-paris.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2013-07-02T16:45:08Z">
-      <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">crous-paris.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">CROUS Paris</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Employee</mdui:Description>
-        <mdui:DisplayName xml:lang="fr">CROUS Paris</mdui:DisplayName>
-        <mdui:Description xml:lang="fr">Agents de la fonction publique</mdui:Description>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIEcjCCA1qgAwIBAgIRAM7lNOy1/r/jbhKXln6a66wwDQYJKoZIhvcNAQEFBQAw
-NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-IFNTTCBDQTAeFw0xMzA1MzAwMDAwMDBaFw0xNjA1MjkyMzU5NTlaMEAxITAfBgNV
-BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEbMBkGA1UEAxMSaWRwLmNyb3Vz
-LXBhcmlzLmZyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAzQAmbWEI
-R0hGecLlfeDWLKnX8jIgjvZ6vGpCQSuk+haMglzUgOWhVfOdvJHyUK2FuFcu1KME
-6JtSmgVjI3ooZuzfSS2eTl/Cc/4+6ZwoxhFpIjUHXdlgdG4aLSuduAimH5hPWegU
-Jlt4faTSAiGe6OTvDJLDtbfRYYNCgkXJjV21PQbtGOeTBdrfjFm07y2O+EzygAkM
-xQsz8dRV4uRJOSmUdUcaVOYvAIrnapJtJChfn/peP8kViX6Qe4Po+sdQEtUOlL7c
-uAs+g7YNlvlLglzyLzItAJKlafOK3xU/zwB6JZ86T6cjnalCGQhwErnCWIiMbLY5
-vuR39ofOwLFL8wIDAQABo4IBbzCCAWswHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsr
-N1dH6pDjue0wHQYDVR0OBBYEFEHqA+ucEkHkbVIO5lq71eNIwXeYMA4GA1UdDwEB
-/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEF
-BQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNVHR8E
-MzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENB
-LmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNz
-LnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8v
-b2NzcC50Y3MudGVyZW5hLm9yZzAdBgNVHREEFjAUghJpZHAuY3JvdXMtcGFyaXMu
-ZnIwDQYJKoZIhvcNAQEFBQADggEBAB6Vle1wXkVbFC43JvqOvdraHJP5F7IxnPwd
-h3tIBYhgG8x2+49+OcNy4cOTkp7R7yrkw1r5G0T4vcwWvyBRLL9l8UTdmUv1HRZl
-NXSLMAk1TFxS2Vk6HUa/xGHVvGrzaxWC4s02RWC9HFGnNWCDn2+YbJr2se39+wM+
-2ACLK8Gn8FjSfGoc9hcm6d8ISjP3fQOqMjfrozsuzcWH9wrZpjPdJ/T2PMN8drcV
-CTgq1R0X/PiDgj9XuHMMkN7W6FK3t6TKUZ3gD2DTvZNPrL6Iasuf0TSIy89oHQce
-RQGzRlb3b9mZzx8kOGWx8O/wqV5Rq3m+rl5koGZabWayn6GXzMQ=
-					    </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>
-					      MIIDMzCCAhugAwIBAgIUC3qxigulZwbI9DWJOZsdPNwwYR0wDQYJKoZIhvcNAQEF
-BQAwHTEbMBkGA1UEAxMSaWRwLmNyb3VzLXBhcmlzLmZyMB4XDTEzMDYxNzE0NDEw
-M1oXDTMzMDYxNzE0NDEwM1owHTEbMBkGA1UEAxMSaWRwLmNyb3VzLXBhcmlzLmZy
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAzNUjklU6Rh2sEVjN3AHt
-oB5bghVwXkIVxCfW4SIVH3W1iLYH3dCKEbNNbfJ65kUVWzXTQV2jT4lfx/1BeC3C
-36tS+JGMtb5gvyJw22Pg8sLzOUPHACYncYhfaNDFIyZpUfHiRKfEUCUIyriecWmL
-i4LApNNvjmmV0/8GT1WBv9rQhy5CbJXznLk3fphqAb9Yu/2YYhXfHsSl21kTjApR
-o+EeCmdWAKROC1fn7yV/Velu051YLC8ILaijms2dyEvXLmLVG97MjCsIpnWL0UPJ
-pEwGBWSa6lBzE5/YzHIZZ3HQBXlq8TzMjaEOtjgHuht0t7f1K2i81K7JXheP9muq
-xwIDAQABo2swaTBIBgNVHREEQTA/ghJpZHAuY3JvdXMtcGFyaXMuZnKGKWh0dHBz
-Oi8vaWRwLmNyb3VzLXBhcmlzLmZyL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBTZ
-e98ddDx7TkaHMxapxpn4NmdkkjANBgkqhkiG9w0BAQUFAAOCAQEAb9Vl+xXRr2Zq
-sB7websZjpGg/SiukcN5stPPHEvKoNEMs7YclSDEiW7FyI/IWHjKsE3n1Ah+8jjB
-iLzOO77y2MuY/qOIKD2HT6cXBYGU2Sxss/FEPyMPGpIhEe+tv12D5tRX5B1FG/sW
-FicTUZlz3duoTqsrz/sNoTozpwtThMBvALu1w7yrMLWIZgEa0V+csm/2/cAc4qXt
-3yg0OxbBqyK7V1fBEkL35vL4xZJesk/NdiDq+K1D5fzWFHqvq8d3PCcRu9mZFonS
-AxeOndV48MCF69J2kMLRrHCkAAV2UWaWXEUpCVg20rXNqnLK+xN9Qi/Pj+fuXIyC
-dvKcBjj1lA==
-					    </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://idp.crous-paris.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.crous-paris.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.crous-paris.fr/idp/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">CROUS Paris</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">CROUS Paris</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <EmailAddress>informatique@crous-paris.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.crous-poitiers.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.crous-poitiers.fr-idp-shibboleth.xml
deleted file mode 100644
index aac4a776..00000000
--- a/swamid-interfederations-2.0/idp.crous-poitiers.fr-idp-shibboleth.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://idp.crous-poitiers.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2013-07-19T15:27:20Z">
-      <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">crous-poitiers.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">CROUS de Poitiers</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIEdzCCA1+gAwIBAgIQN3OORXWc3cChLNqDZoOjGDANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTEzMDcxOTAwMDAwMFoXDTE2MDcxODIzNTk1OVowQzEhMB8GA1UE
-CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMR4wHAYDVQQDExVpZHAuY3JvdXMt
-cG9pdGllcnMuZnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC8oGB5
-P3shavDXjX9yTT/z+7Or9BOJ6YB+bf34xX7Javtb4fze/7mA5dDijJ6khVaULAzT
-YbxZX4uTbnl0V1k8jJofjEv/0dNHJK7tARzS21jn8Uj9qdDnLf0kgNFI9KrzgSOA
-h8orYsEMO9JRaXO5adt9Y6fub/ePGnod73xC4LeG0jQIFJDEN1d/fOamalc4TDUe
-+Bts0Sa9vx/wx+oqBhhrxrgMzXMRDzdR/e2+2EbQITW0V1AIiX7AlX30N3lV4L3b
-LxU9jyHX2XOB5oo3Kaj7RerWSDgXWrgv8+fz8lc1jBd2fyXIKsiC/d7i7FTaTWwt
-r+YAZcyl8NNsxukdAgMBAAGjggFyMIIBbjAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJ
-ays3V0fqkOO57TAdBgNVHQ4EFgQUtazuewoiBQj6dX2wFmouplCmJwAwDgYDVR0P
-AQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsG
-AQUFBwMCMCIGA1UdIAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQIBMDoGA1Ud
-HwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NM
-Q0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50
-Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6
-Ly9vY3NwLnRjcy50ZXJlbmEub3JnMCAGA1UdEQQZMBeCFWlkcC5jcm91cy1wb2l0
-aWVycy5mcjANBgkqhkiG9w0BAQUFAAOCAQEAKJt2lulJryvECmZz04CvNsBtNs1X
-uL/vYf2XCnqNoiOR9UWTir/2Y1pyfq/MG7SdhNVtPia66gt88gU0RHpkgbuTqAjA
-VtMaW02SKhNTJ70Ujbi5YQfRewTA/efsTahZ5jx3qYhGelFuqTWtvRCDcCPjO/4f
-oWltTXNqL752e4pY6MZyVkH1mOqbwnYAQoAxlT84lmnv5p58do2HqVTNikbigwXp
-cr+1iiW5RhIg3fiDuvvFXisB7MnGOJrwR1PDnEcm082UvdlErnvH0JZLvmW0uSJE
-6ybzwV5DMLR8VjRJBJU9KaoOA6dssc/ENDYdFaVc0cGdMhEXf/+KK0UWkg==
-					    </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://idp.crous-poitiers.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.crous-poitiers.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.crous-poitiers.fr/idp/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">CROUS de Poitiers</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">CROUS de Poitiers</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <EmailAddress>crous.informatique@crous-poitiers.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.crous-poitiers.fr.xml b/swamid-interfederations-2.0/idp.crous-poitiers.fr.xml
deleted file mode 100644
index aac4a776..00000000
--- a/swamid-interfederations-2.0/idp.crous-poitiers.fr.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://idp.crous-poitiers.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2013-07-19T15:27:20Z">
-      <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">crous-poitiers.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">CROUS de Poitiers</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIEdzCCA1+gAwIBAgIQN3OORXWc3cChLNqDZoOjGDANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTEzMDcxOTAwMDAwMFoXDTE2MDcxODIzNTk1OVowQzEhMB8GA1UE
-CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMR4wHAYDVQQDExVpZHAuY3JvdXMt
-cG9pdGllcnMuZnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC8oGB5
-P3shavDXjX9yTT/z+7Or9BOJ6YB+bf34xX7Javtb4fze/7mA5dDijJ6khVaULAzT
-YbxZX4uTbnl0V1k8jJofjEv/0dNHJK7tARzS21jn8Uj9qdDnLf0kgNFI9KrzgSOA
-h8orYsEMO9JRaXO5adt9Y6fub/ePGnod73xC4LeG0jQIFJDEN1d/fOamalc4TDUe
-+Bts0Sa9vx/wx+oqBhhrxrgMzXMRDzdR/e2+2EbQITW0V1AIiX7AlX30N3lV4L3b
-LxU9jyHX2XOB5oo3Kaj7RerWSDgXWrgv8+fz8lc1jBd2fyXIKsiC/d7i7FTaTWwt
-r+YAZcyl8NNsxukdAgMBAAGjggFyMIIBbjAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJ
-ays3V0fqkOO57TAdBgNVHQ4EFgQUtazuewoiBQj6dX2wFmouplCmJwAwDgYDVR0P
-AQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsG
-AQUFBwMCMCIGA1UdIAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQIBMDoGA1Ud
-HwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NM
-Q0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50
-Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6
-Ly9vY3NwLnRjcy50ZXJlbmEub3JnMCAGA1UdEQQZMBeCFWlkcC5jcm91cy1wb2l0
-aWVycy5mcjANBgkqhkiG9w0BAQUFAAOCAQEAKJt2lulJryvECmZz04CvNsBtNs1X
-uL/vYf2XCnqNoiOR9UWTir/2Y1pyfq/MG7SdhNVtPia66gt88gU0RHpkgbuTqAjA
-VtMaW02SKhNTJ70Ujbi5YQfRewTA/efsTahZ5jx3qYhGelFuqTWtvRCDcCPjO/4f
-oWltTXNqL752e4pY6MZyVkH1mOqbwnYAQoAxlT84lmnv5p58do2HqVTNikbigwXp
-cr+1iiW5RhIg3fiDuvvFXisB7MnGOJrwR1PDnEcm082UvdlErnvH0JZLvmW0uSJE
-6ybzwV5DMLR8VjRJBJU9KaoOA6dssc/ENDYdFaVc0cGdMhEXf/+KK0UWkg==
-					    </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://idp.crous-poitiers.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.crous-poitiers.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.crous-poitiers.fr/idp/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">CROUS de Poitiers</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">CROUS de Poitiers</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <EmailAddress>crous.informatique@crous-poitiers.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.crous-reims.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.crous-reims.fr-idp-shibboleth.xml
deleted file mode 100644
index dba734bc..00000000
--- a/swamid-interfederations-2.0/idp.crous-reims.fr-idp-shibboleth.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://idp.crous-reims.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2013-01-08T17:28:08Z">
-      <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">crous-reims.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">CROUS Reims</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIEajCCA1KgAwIBAgIQa6ko9Kashh39Z5Tcht03DzANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTEzMDEwODAwMDAwMFoXDTE2MDEwODIzNTk1OVowQzELMAkGA1UE
-BhMCRlIxFzAVBgNVBAoTDkNST1VTIGRlIFJFSU1TMRswGQYDVQQDExJpZHAuY3Jv
-dXMtcmVpbXMuZnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC555WB
-8B1fRb8vSWEVIm0fFonTJazsqrpwELDuWp9zUHdP0bgjSW1AmzSrSyNUWcflmqw2
-yQD7ouaCQ2g8JWNaMo73Z4E9t8ttNVYzpnP4MaMkWATQtsi4eP/EVCRX3v0yaQcR
-yQ8T2YjpJOHviOcI7lfyHG6Nxks3kW7SjzfweWLt9jEW8pH9UE7jYDsLnHwLml0q
-Zp+MglspxeqgziNhk91qS3W/ZtvbnDVLXXLetYjXrlLZGHw08Qo0hq9OYrio3OOZ
-dshYmQL0bD5egtq61kbU3ayzIc1IbrD1mtI3EP2CtZEdVr9JgCRCNrlrcAOEqnfT
-rCfA75FdYGYZROQnAgMBAAGjggFlMIIBYTAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJ
-ays3V0fqkOO57TAdBgNVHQ4EFgQUjAtStb1iJUaE03HYtDq+0Udv1hwwDgYDVR0P
-AQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsG
-AQUFBwMCMBgGA1UdIAQRMA8wDQYLKwYBBAGyMQECAh0wOgYDVR0fBDMwMTAvoC2g
-K4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcmwwbQYI
-KwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRjcy50ZXJlbmEu
-b3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDovL29jc3AudGNz
-LnRlcmVuYS5vcmcwHQYDVR0RBBYwFIISaWRwLmNyb3VzLXJlaW1zLmZyMA0GCSqG
-SIb3DQEBBQUAA4IBAQBP0ba+bGMAePVNe5hvffTp4SW2wRDL6y9gNabJnQrGIln+
-tiitKXKTHYT+uxa3DqTpxYCHr5FtKPPhPKPIS7dyIVIxvkRAWOee+/spfUPC7Y8J
-/Mx3kyMlSZQGXzhDJkRDJqYKkoNVp0F/hEtJMAJKlWq2ERKrVzdF+x2ipvCMkRUQ
-+Ta0RqsMn+JrYiptiNpafPwigC7kYJ4YB1UnrfI94RkWADh3qjyRbj1UZfY5jTjv
-quzYxmp0LyZyMdkQcCQ3FVJ+AxPgSJaRjjDOc8yEDIG2kkxnZf2qoctXs077A4XH
-LgLBAZ0NCQeidPwxsKvCoYW5xQKIBaqW2ZTmqAbG
-					    </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>
-					      MIIDMzCCAhugAwIBAgIUfRwORyarbfU3vwL5jzorKTWH+LcwDQYJKoZIhvcNAQEF
-BQAwHTEbMBkGA1UEAxMSaWRwLmNyb3VzLXJlaW1zLmZyMB4XDTEyMTIxOTE0MTE1
-NFoXDTMyMTIxOTE0MTE1NFowHTEbMBkGA1UEAxMSaWRwLmNyb3VzLXJlaW1zLmZy
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApN9Hhsw5OxO8lOw7AvwU
-+LydZuDCjvPBDhz/UmxKWAjxd3nIgQP1BZAcjU8P2foyQP+dPd3BUqH5MZG/h2gH
-aa9sWo2bmloRyu4IyFsg8eGjU7rkvHXjBsd1UZyDgWTM3XcBd5KDbExrZq9eWLyU
-QRHI/NMo0J2mIICiwwn2d3vGDaGnGnc7pCgl66LedDn9gPl120dLJcsK729Xouey
-r4paGsUvd18Gbwbbcr9LKMXYWeeblq3GfZxlxeH5IQVUPISynAoJXWoN6Vep1eD3
-PQa0nYw8oYWNkxzSctZsu3lrgy9znxdWc2WDDHwkA1CXBaa//PKFDw9HkASBHDtA
-YQIDAQABo2swaTBIBgNVHREEQTA/ghJpZHAuY3JvdXMtcmVpbXMuZnKGKWh0dHBz
-Oi8vaWRwLmNyb3VzLXJlaW1zLmZyL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBTa
-0GLFE02TA2lqS6qSiG+jPjYPgzANBgkqhkiG9w0BAQUFAAOCAQEAF3YzNTu819Lj
-4KCoIa8dN5Zm9v303F0cRTyYlhm/W0+N4nMxobAnRyCa9sLIOyS/Jojgnlw4tU9h
-s7F9orEeUqzJOdWs+XvLBfjt9R2XPqgIHq9JbgzQxyn8I06JcAYXVxm42N7IRlio
-e4+Xu18Ir16E9SYYzi1CqP5/WTX0+Cs0O7EV0n9a2ZpMMSkkrKMWrPjpnux55H39
-ROEeNsBCVGUrYwulnuAByJXiDjvggMTFuORtE9ZgFpvGM/2G76ZG7rDnEE/HDXAb
-0mHlwqsPy6FpFA2w23omABLBcKO/DGwyQVbxBA8lLf3RNgJGQf1bhj3l6srF2y1h
-iFgHP+HFiA==
-					    </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://idp.crous-reims.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.crous-reims.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.crous-reims.fr/idp/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">CROUS Reims</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">CROUS Reims</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>MORETTI Emmanuel</SurName>
-    <EmailAddress>emmanuel.moretti@crous-reims.fr</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <SurName>GADAL Alexandre</SurName>
-    <EmailAddress>alexandre.gadal@crous-reims.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.crous-reims.fr.xml b/swamid-interfederations-2.0/idp.crous-reims.fr.xml
deleted file mode 100644
index dba734bc..00000000
--- a/swamid-interfederations-2.0/idp.crous-reims.fr.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://idp.crous-reims.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2013-01-08T17:28:08Z">
-      <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">crous-reims.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">CROUS Reims</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIEajCCA1KgAwIBAgIQa6ko9Kashh39Z5Tcht03DzANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTEzMDEwODAwMDAwMFoXDTE2MDEwODIzNTk1OVowQzELMAkGA1UE
-BhMCRlIxFzAVBgNVBAoTDkNST1VTIGRlIFJFSU1TMRswGQYDVQQDExJpZHAuY3Jv
-dXMtcmVpbXMuZnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC555WB
-8B1fRb8vSWEVIm0fFonTJazsqrpwELDuWp9zUHdP0bgjSW1AmzSrSyNUWcflmqw2
-yQD7ouaCQ2g8JWNaMo73Z4E9t8ttNVYzpnP4MaMkWATQtsi4eP/EVCRX3v0yaQcR
-yQ8T2YjpJOHviOcI7lfyHG6Nxks3kW7SjzfweWLt9jEW8pH9UE7jYDsLnHwLml0q
-Zp+MglspxeqgziNhk91qS3W/ZtvbnDVLXXLetYjXrlLZGHw08Qo0hq9OYrio3OOZ
-dshYmQL0bD5egtq61kbU3ayzIc1IbrD1mtI3EP2CtZEdVr9JgCRCNrlrcAOEqnfT
-rCfA75FdYGYZROQnAgMBAAGjggFlMIIBYTAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJ
-ays3V0fqkOO57TAdBgNVHQ4EFgQUjAtStb1iJUaE03HYtDq+0Udv1hwwDgYDVR0P
-AQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsG
-AQUFBwMCMBgGA1UdIAQRMA8wDQYLKwYBBAGyMQECAh0wOgYDVR0fBDMwMTAvoC2g
-K4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcmwwbQYI
-KwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRjcy50ZXJlbmEu
-b3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDovL29jc3AudGNz
-LnRlcmVuYS5vcmcwHQYDVR0RBBYwFIISaWRwLmNyb3VzLXJlaW1zLmZyMA0GCSqG
-SIb3DQEBBQUAA4IBAQBP0ba+bGMAePVNe5hvffTp4SW2wRDL6y9gNabJnQrGIln+
-tiitKXKTHYT+uxa3DqTpxYCHr5FtKPPhPKPIS7dyIVIxvkRAWOee+/spfUPC7Y8J
-/Mx3kyMlSZQGXzhDJkRDJqYKkoNVp0F/hEtJMAJKlWq2ERKrVzdF+x2ipvCMkRUQ
-+Ta0RqsMn+JrYiptiNpafPwigC7kYJ4YB1UnrfI94RkWADh3qjyRbj1UZfY5jTjv
-quzYxmp0LyZyMdkQcCQ3FVJ+AxPgSJaRjjDOc8yEDIG2kkxnZf2qoctXs077A4XH
-LgLBAZ0NCQeidPwxsKvCoYW5xQKIBaqW2ZTmqAbG
-					    </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>
-					      MIIDMzCCAhugAwIBAgIUfRwORyarbfU3vwL5jzorKTWH+LcwDQYJKoZIhvcNAQEF
-BQAwHTEbMBkGA1UEAxMSaWRwLmNyb3VzLXJlaW1zLmZyMB4XDTEyMTIxOTE0MTE1
-NFoXDTMyMTIxOTE0MTE1NFowHTEbMBkGA1UEAxMSaWRwLmNyb3VzLXJlaW1zLmZy
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApN9Hhsw5OxO8lOw7AvwU
-+LydZuDCjvPBDhz/UmxKWAjxd3nIgQP1BZAcjU8P2foyQP+dPd3BUqH5MZG/h2gH
-aa9sWo2bmloRyu4IyFsg8eGjU7rkvHXjBsd1UZyDgWTM3XcBd5KDbExrZq9eWLyU
-QRHI/NMo0J2mIICiwwn2d3vGDaGnGnc7pCgl66LedDn9gPl120dLJcsK729Xouey
-r4paGsUvd18Gbwbbcr9LKMXYWeeblq3GfZxlxeH5IQVUPISynAoJXWoN6Vep1eD3
-PQa0nYw8oYWNkxzSctZsu3lrgy9znxdWc2WDDHwkA1CXBaa//PKFDw9HkASBHDtA
-YQIDAQABo2swaTBIBgNVHREEQTA/ghJpZHAuY3JvdXMtcmVpbXMuZnKGKWh0dHBz
-Oi8vaWRwLmNyb3VzLXJlaW1zLmZyL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBTa
-0GLFE02TA2lqS6qSiG+jPjYPgzANBgkqhkiG9w0BAQUFAAOCAQEAF3YzNTu819Lj
-4KCoIa8dN5Zm9v303F0cRTyYlhm/W0+N4nMxobAnRyCa9sLIOyS/Jojgnlw4tU9h
-s7F9orEeUqzJOdWs+XvLBfjt9R2XPqgIHq9JbgzQxyn8I06JcAYXVxm42N7IRlio
-e4+Xu18Ir16E9SYYzi1CqP5/WTX0+Cs0O7EV0n9a2ZpMMSkkrKMWrPjpnux55H39
-ROEeNsBCVGUrYwulnuAByJXiDjvggMTFuORtE9ZgFpvGM/2G76ZG7rDnEE/HDXAb
-0mHlwqsPy6FpFA2w23omABLBcKO/DGwyQVbxBA8lLf3RNgJGQf1bhj3l6srF2y1h
-iFgHP+HFiA==
-					    </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://idp.crous-reims.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.crous-reims.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.crous-reims.fr/idp/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">CROUS Reims</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">CROUS Reims</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>MORETTI Emmanuel</SurName>
-    <EmailAddress>emmanuel.moretti@crous-reims.fr</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <SurName>GADAL Alexandre</SurName>
-    <EmailAddress>alexandre.gadal@crous-reims.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.crous-rennes.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.crous-rennes.fr-idp-shibboleth.xml
deleted file mode 100644
index 61e08c03..00000000
--- a/swamid-interfederations-2.0/idp.crous-rennes.fr-idp-shibboleth.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://idp.crous-rennes.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2014-01-28T15:00:42Z">
-      <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">crous-rennes.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">CROUS Rennes - Personnels</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIEdDCCA1ygAwIBAgIRAL5fVabkZawTDxzKI0ESjOYwDQYJKoZIhvcNAQEFBQAw
-NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-IFNTTCBDQTAeFw0xMzEyMDUwMDAwMDBaFw0xNjEyMDQyMzU5NTlaMEExITAfBgNV
-BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEcMBoGA1UEAxMTaWRwLmNyb3Vz
-LXJlbm5lcy5mcjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMToPjIY
-EKGrNIwJhXle5sZXA9vse+uVBEU2CpCHfx7X+sD2RQCPtIrcw0g2CMQqCJV8ZYLM
-3ZQU22KCDsmmaabvs1xvumWRtXMEEB8CTyveGX+qYMYi2M/a4I+Q+LIpBIBaSdcs
-uNj0ICIbdLM0i6g1qEpG6F+uUFziVqIbzgs0lS+P54AeIS6mKe5JddPQXlwPpgd4
-DYkKYeL9++ItnOpoaCg6Jc3j48G9y4+2R1RcTXwxtvCW+2Tpz9cNGH6UC04NdoUk
-Vd72lwRqA25wubIU7ZVzRnlpkegMX01u/FoeQack5jmlI8pBHZMaLqB0pNLBeFEK
-6eJxAe5fb1DSV78CAwEAAaOCAXAwggFsMB8GA1UdIwQYMBaAFAy9k2gM896ro0lr
-KzdXR+qQ47ntMB0GA1UdDgQWBBQdYX2QH6UnjgYOd4KnbTh8YmDJrTAOBgNVHQ8B
-Af8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYB
-BQUHAwIwIgYDVR0gBBswGTANBgsrBgEEAbIxAQICHTAIBgZngQwBAgEwOgYDVR0f
-BDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xD
-QS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRj
-cy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDov
-L29jc3AudGNzLnRlcmVuYS5vcmcwHgYDVR0RBBcwFYITaWRwLmNyb3VzLXJlbm5l
-cy5mcjANBgkqhkiG9w0BAQUFAAOCAQEAbgsDlas2dzrysn9qqmxmpqXHBGDIoXuq
-GQifopkpEVi51JmrvMl6ztKqyYVXLEdhbv2ZRJmitDyfxtvTvFfFlAU9iJiErVsq
-zbZAATD/8aC8kUoFmuRK6uvzec+chMS5kGlf7AKJSxgPIhTGdBGwllBUof5aE50Q
-BJ1R3SvSeovh8KBplnsI1v9nozPP3Yjc28BdMLs9p5Yeo+6htHVRTsec8SG4GjKQ
-VJWsJn9dlBNT8g9POrU7cyE7qnHs7ErkMFri0sPKSZbwD6vwBjViJ1KU3C9U9B9C
-1uRv0KqVOs4YO9ig3CbOEAszIIxNZvN6p++GOnm771PGXTWTF1DAfw==
-					    </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://idp.crous-rennes.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.crous-rennes.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.crous-rennes.fr/idp/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">CROUS Rennes - Personnels</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">CROUS Rennes - Personnels</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Jean-Louis Allier</SurName>
-    <EmailAddress>jean-louis.allier@crous-rennes.fr</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <SurName>Michel Gaigeard</SurName>
-    <EmailAddress>michel.gaigeard@crous-rennes.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.crous-rennes.fr.xml b/swamid-interfederations-2.0/idp.crous-rennes.fr.xml
deleted file mode 100644
index 61e08c03..00000000
--- a/swamid-interfederations-2.0/idp.crous-rennes.fr.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://idp.crous-rennes.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2014-01-28T15:00:42Z">
-      <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">crous-rennes.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">CROUS Rennes - Personnels</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIEdDCCA1ygAwIBAgIRAL5fVabkZawTDxzKI0ESjOYwDQYJKoZIhvcNAQEFBQAw
-NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-IFNTTCBDQTAeFw0xMzEyMDUwMDAwMDBaFw0xNjEyMDQyMzU5NTlaMEExITAfBgNV
-BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEcMBoGA1UEAxMTaWRwLmNyb3Vz
-LXJlbm5lcy5mcjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMToPjIY
-EKGrNIwJhXle5sZXA9vse+uVBEU2CpCHfx7X+sD2RQCPtIrcw0g2CMQqCJV8ZYLM
-3ZQU22KCDsmmaabvs1xvumWRtXMEEB8CTyveGX+qYMYi2M/a4I+Q+LIpBIBaSdcs
-uNj0ICIbdLM0i6g1qEpG6F+uUFziVqIbzgs0lS+P54AeIS6mKe5JddPQXlwPpgd4
-DYkKYeL9++ItnOpoaCg6Jc3j48G9y4+2R1RcTXwxtvCW+2Tpz9cNGH6UC04NdoUk
-Vd72lwRqA25wubIU7ZVzRnlpkegMX01u/FoeQack5jmlI8pBHZMaLqB0pNLBeFEK
-6eJxAe5fb1DSV78CAwEAAaOCAXAwggFsMB8GA1UdIwQYMBaAFAy9k2gM896ro0lr
-KzdXR+qQ47ntMB0GA1UdDgQWBBQdYX2QH6UnjgYOd4KnbTh8YmDJrTAOBgNVHQ8B
-Af8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYB
-BQUHAwIwIgYDVR0gBBswGTANBgsrBgEEAbIxAQICHTAIBgZngQwBAgEwOgYDVR0f
-BDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xD
-QS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRj
-cy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDov
-L29jc3AudGNzLnRlcmVuYS5vcmcwHgYDVR0RBBcwFYITaWRwLmNyb3VzLXJlbm5l
-cy5mcjANBgkqhkiG9w0BAQUFAAOCAQEAbgsDlas2dzrysn9qqmxmpqXHBGDIoXuq
-GQifopkpEVi51JmrvMl6ztKqyYVXLEdhbv2ZRJmitDyfxtvTvFfFlAU9iJiErVsq
-zbZAATD/8aC8kUoFmuRK6uvzec+chMS5kGlf7AKJSxgPIhTGdBGwllBUof5aE50Q
-BJ1R3SvSeovh8KBplnsI1v9nozPP3Yjc28BdMLs9p5Yeo+6htHVRTsec8SG4GjKQ
-VJWsJn9dlBNT8g9POrU7cyE7qnHs7ErkMFri0sPKSZbwD6vwBjViJ1KU3C9U9B9C
-1uRv0KqVOs4YO9ig3CbOEAszIIxNZvN6p++GOnm771PGXTWTF1DAfw==
-					    </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://idp.crous-rennes.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.crous-rennes.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.crous-rennes.fr/idp/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">CROUS Rennes - Personnels</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">CROUS Rennes - Personnels</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Jean-Louis Allier</SurName>
-    <EmailAddress>jean-louis.allier@crous-rennes.fr</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <SurName>Michel Gaigeard</SurName>
-    <EmailAddress>michel.gaigeard@crous-rennes.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.crous-strasbourg.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.crous-strasbourg.fr-idp-shibboleth.xml
deleted file mode 100644
index f2c736b4..00000000
--- a/swamid-interfederations-2.0/idp.crous-strasbourg.fr-idp-shibboleth.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.crous-strasbourg.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2014-04-28T11:03:43Z">
-      <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">crous-strasbourg.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">CROUS Strasbourg</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Administrative staff CROUS</mdui:Description>
-        <mdui:DisplayName xml:lang="fr">CROUS Strasbourg</mdui:DisplayName>
-        <mdui:Description xml:lang="fr">personnel administratif du CROUS</mdui:Description>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIEezCCA2OgAwIBAgIQeZpbhzUV4+gL9K3eNTs3hDANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTE0MDMyNDAwMDAwMFoXDTE3MDMyMzIzNTk1OVowRTEhMB8GA1UE
-CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMSAwHgYDVQQDExdpZHAuY3JvdXMt
-c3RyYXNib3VyZy5mcjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAL6w
-f8Zbcbh3/fHcTMnr9qtmvV/DDfhwhpMNlZ3WIKp4LDeX3rq/qsS6xVPrfOMOj7+p
-FHvyGJKzY9BKCVVwioRYkx5UG7hZaxJ4vEAfremNqFB/5/BL3iNs//Xgg3J/TdXQ
-RQIrv3Wimj/Fa/2jalr6jPJC2PlBCfxwS9a3vtuqo2qs0v5B3/gDBQGzZYQlHeGP
-aCrJ+luS/dBZDzsMfDE4gqm1hvGT1tabfuUZGmBxXNDpBgoqQRkqbFo7wHzwaTgD
-XBzLUrXz3s2CaAslDF+U/anQ+bMT126KRo+FxrlTvMoRADYYaf9V2GbRzzRQqpG0
-BVqR6KfiAyauyGSysGECAwEAAaOCAXQwggFwMB8GA1UdIwQYMBaAFAy9k2gM896r
-o0lrKzdXR+qQ47ntMB0GA1UdDgQWBBSAAdpSjTa8MV+nybPYNenLhdM5bDAOBgNV
-HQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYI
-KwYBBQUHAwIwIgYDVR0gBBswGTANBgsrBgEEAbIxAQICHTAIBgZngQwBAgEwOgYD
-VR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFT
-U0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0
-LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0
-cDovL29jc3AudGNzLnRlcmVuYS5vcmcwIgYDVR0RBBswGYIXaWRwLmNyb3VzLXN0
-cmFzYm91cmcuZnIwDQYJKoZIhvcNAQEFBQADggEBAHkNtIeJ+9SmBfRSCUGVgfLK
-Lk9TXjYP3kBgfvu/brnuC9XcaNnpWK6bLU6+ok+iVbexVKE0H5+41wfNV2WfTAiI
-FRhT0gAh4Ian/8DVfJTci9AyowV0vNo6jiolia3jrj7pT2JV0zi68D7ia7qCq+8W
-1BcH7QcZhbEla3A4vYWXDL2ZkOGVtHwu8+bISH5kkwbAR1kSj1W6j68WOMHzzk2q
-9Trm+VsJgWqE1qZ2MQ+IDhK8126oFKyh4s4HUWs789FtwQCpaDlGJeD0pyNDvabl
-3Is6+m8rCoctcDmdACGX08QdzxMKStXnVoM31v5H3CDiAroDNYunnrntdief2+I=
-					    </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://idp.crous-strasbourg.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.crous-strasbourg.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.crous-strasbourg.fr/idp/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">CROUS Strasbourg</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">CROUS Strasbourg</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <EmailAddress>serviceinfo@crous.u-strasbg.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.crous-strasbourg.fr.xml b/swamid-interfederations-2.0/idp.crous-strasbourg.fr.xml
deleted file mode 100644
index f2c736b4..00000000
--- a/swamid-interfederations-2.0/idp.crous-strasbourg.fr.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.crous-strasbourg.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2014-04-28T11:03:43Z">
-      <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">crous-strasbourg.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">CROUS Strasbourg</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Administrative staff CROUS</mdui:Description>
-        <mdui:DisplayName xml:lang="fr">CROUS Strasbourg</mdui:DisplayName>
-        <mdui:Description xml:lang="fr">personnel administratif du CROUS</mdui:Description>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIEezCCA2OgAwIBAgIQeZpbhzUV4+gL9K3eNTs3hDANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTE0MDMyNDAwMDAwMFoXDTE3MDMyMzIzNTk1OVowRTEhMB8GA1UE
-CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMSAwHgYDVQQDExdpZHAuY3JvdXMt
-c3RyYXNib3VyZy5mcjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAL6w
-f8Zbcbh3/fHcTMnr9qtmvV/DDfhwhpMNlZ3WIKp4LDeX3rq/qsS6xVPrfOMOj7+p
-FHvyGJKzY9BKCVVwioRYkx5UG7hZaxJ4vEAfremNqFB/5/BL3iNs//Xgg3J/TdXQ
-RQIrv3Wimj/Fa/2jalr6jPJC2PlBCfxwS9a3vtuqo2qs0v5B3/gDBQGzZYQlHeGP
-aCrJ+luS/dBZDzsMfDE4gqm1hvGT1tabfuUZGmBxXNDpBgoqQRkqbFo7wHzwaTgD
-XBzLUrXz3s2CaAslDF+U/anQ+bMT126KRo+FxrlTvMoRADYYaf9V2GbRzzRQqpG0
-BVqR6KfiAyauyGSysGECAwEAAaOCAXQwggFwMB8GA1UdIwQYMBaAFAy9k2gM896r
-o0lrKzdXR+qQ47ntMB0GA1UdDgQWBBSAAdpSjTa8MV+nybPYNenLhdM5bDAOBgNV
-HQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYI
-KwYBBQUHAwIwIgYDVR0gBBswGTANBgsrBgEEAbIxAQICHTAIBgZngQwBAgEwOgYD
-VR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFT
-U0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0
-LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0
-cDovL29jc3AudGNzLnRlcmVuYS5vcmcwIgYDVR0RBBswGYIXaWRwLmNyb3VzLXN0
-cmFzYm91cmcuZnIwDQYJKoZIhvcNAQEFBQADggEBAHkNtIeJ+9SmBfRSCUGVgfLK
-Lk9TXjYP3kBgfvu/brnuC9XcaNnpWK6bLU6+ok+iVbexVKE0H5+41wfNV2WfTAiI
-FRhT0gAh4Ian/8DVfJTci9AyowV0vNo6jiolia3jrj7pT2JV0zi68D7ia7qCq+8W
-1BcH7QcZhbEla3A4vYWXDL2ZkOGVtHwu8+bISH5kkwbAR1kSj1W6j68WOMHzzk2q
-9Trm+VsJgWqE1qZ2MQ+IDhK8126oFKyh4s4HUWs789FtwQCpaDlGJeD0pyNDvabl
-3Is6+m8rCoctcDmdACGX08QdzxMKStXnVoM31v5H3CDiAroDNYunnrntdief2+I=
-					    </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://idp.crous-strasbourg.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.crous-strasbourg.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.crous-strasbourg.fr/idp/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">CROUS Strasbourg</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">CROUS Strasbourg</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <EmailAddress>serviceinfo@crous.u-strasbg.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.cs.cas.cz-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.cs.cas.cz-idp-shibboleth.xml
deleted file mode 100644
index f8f81f5a..00000000
--- a/swamid-interfederations-2.0/idp.cs.cas.cz-idp-shibboleth.xml
+++ /dev/null
@@ -1,118 +0,0 @@
-<?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.cs.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/" registrationInstant="2014-06-17T15:52:29Z">
-      <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>
-    <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://eduid.cz/uri/idp-group/avcr</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>
-      <shibmd:Scope regexp="false">cs.cas.cz</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Institute of Computer Science AS CR</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="cs">Ústav informatiky AV ČR</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Identity Provider ICS AV CR employees.</mdui:Description>
-        <mdui:Description xml:lang="cs">Identity Provider pro zaměstnance UI AV ČR</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.ustavinformatiky.cz/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="cs">http://www.ustavinformatiky.cz/</mdui:InformationURL>
-        <mdui:Logo height="44" width="50">https://jiftach.cas.cz/loga/logo-ui-44.png</mdui:Logo>
-        <mdui:Logo height="400" width="450">https://jiftach.cas.cz/loga/logo-ui-400.png</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDIDCCAgigAwIBAgIVAKK9oHWp4NhakdhRINFSNcMlO+RbMA0GCSqGSIb3DQEB
-BQUAMBgxFjAUBgNVBAMTDWlkcC5jcy5jYXMuY3owHhcNMTQwNDIzMDk0MjA0WhcN
-MzQwNDIzMDk0MjA0WjAYMRYwFAYDVQQDEw1pZHAuY3MuY2FzLmN6MIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAjjkBmvDKH/5+UN1okmPOjP4WiCHwmGw7
-KQ9Zxk/myiYmAgk9qF/0PTHMdli5C4rbSbffG+G+28B6N+hJL8GoCL5+BSfKxjsq
-0EkXH81pbIl6/V9X888aitvMa8sKYcI5SUaTdv5DfO9KPizzDh4q7ckC3pyYvYT9
-fM30sxWOSoNHgMCPEg6kUt7BViZCGqzuucqJ/OIh01GLcsu56YH7FYWSQZ6gxCjk
-mqAPSwsFveWweKxIzv/Fudact5JA2OPv6E0QtxiZl2IrrbszCTfiihqvd4Kkh2gz
-3KAI7B8HS0obOhYoi6VSNVJ2CpyQOff2M1HmIeyTe0up4bEGnbu81QIDAQABo2Ew
-XzA+BgNVHREENzA1gg1pZHAuY3MuY2FzLmN6hiRodHRwczovL2lkcC5jcy5jYXMu
-Y3ovaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFO+bvv+xOMV6uPQ6HEydpZESVVHW
-MA0GCSqGSIb3DQEBBQUAA4IBAQAIvc78aeMLcz35NBrOwdpFTkyjxddzw8In/WkZ
-f460lIhMMqc4wBe2fdqUx6OOkGDOGFTt4nWhLxp5+RI4v6ZwawGmZBxTBWxJgCrI
-2wOrZ+LAjcah4H+dESHtufvkv5GpcpHaqclECIJBSdBw40JO0GaIRHfNAnpLW8Uu
-QMhmIIxoZBWR/Fw+FJbKlseHsLR67FxmkuIrj9a+R3tL63j6xktGkzh3pvmjzTu9
-V7TvWrHG4VLa2B+cw1DTHx53iXciC7lcUmrv6FmsoEn023Vo9SMPCCpyoYGnKmRl
-DWUUP6NhKsUBrx0ErS47MREL3/a9Ck6rJ1bJssJLAir38Sk4
-
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.cs.cas.cz:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.cs.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.cs.cas.cz/idp/profile/SAML2/Redirect/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.cs.cas.cz/idp/profile/SAML2/POST/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.cs.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.cs.cas.cz/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.cs.cas.cz/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.cs.cas.cz/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.cs.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">cs.cas.cz</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDIDCCAgigAwIBAgIVAKK9oHWp4NhakdhRINFSNcMlO+RbMA0GCSqGSIb3DQEB
-BQUAMBgxFjAUBgNVBAMTDWlkcC5jcy5jYXMuY3owHhcNMTQwNDIzMDk0MjA0WhcN
-MzQwNDIzMDk0MjA0WjAYMRYwFAYDVQQDEw1pZHAuY3MuY2FzLmN6MIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAjjkBmvDKH/5+UN1okmPOjP4WiCHwmGw7
-KQ9Zxk/myiYmAgk9qF/0PTHMdli5C4rbSbffG+G+28B6N+hJL8GoCL5+BSfKxjsq
-0EkXH81pbIl6/V9X888aitvMa8sKYcI5SUaTdv5DfO9KPizzDh4q7ckC3pyYvYT9
-fM30sxWOSoNHgMCPEg6kUt7BViZCGqzuucqJ/OIh01GLcsu56YH7FYWSQZ6gxCjk
-mqAPSwsFveWweKxIzv/Fudact5JA2OPv6E0QtxiZl2IrrbszCTfiihqvd4Kkh2gz
-3KAI7B8HS0obOhYoi6VSNVJ2CpyQOff2M1HmIeyTe0up4bEGnbu81QIDAQABo2Ew
-XzA+BgNVHREENzA1gg1pZHAuY3MuY2FzLmN6hiRodHRwczovL2lkcC5jcy5jYXMu
-Y3ovaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFO+bvv+xOMV6uPQ6HEydpZESVVHW
-MA0GCSqGSIb3DQEBBQUAA4IBAQAIvc78aeMLcz35NBrOwdpFTkyjxddzw8In/WkZ
-f460lIhMMqc4wBe2fdqUx6OOkGDOGFTt4nWhLxp5+RI4v6ZwawGmZBxTBWxJgCrI
-2wOrZ+LAjcah4H+dESHtufvkv5GpcpHaqclECIJBSdBw40JO0GaIRHfNAnpLW8Uu
-QMhmIIxoZBWR/Fw+FJbKlseHsLR67FxmkuIrj9a+R3tL63j6xktGkzh3pvmjzTu9
-V7TvWrHG4VLa2B+cw1DTHx53iXciC7lcUmrv6FmsoEn023Vo9SMPCCpyoYGnKmRl
-DWUUP6NhKsUBrx0ErS47MREL3/a9Ck6rJ1bJssJLAir38Sk4
-
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.cs.cas.cz:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.cs.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 Computer Science Academy</OrganizationName>
-    <OrganizationName xml:lang="cs">Ústav informatiky AV ČR</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Institute of Computer Science Academy of Sciences of the Czech Republic</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="cs">Ústav informatiky AV ČR, v.v.i.</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.ustavinformatiky.cz/</OrganizationURL>
-    <OrganizationURL xml:lang="cs">http://www.ustavinformatiky.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.cs.cas.cz.xml b/swamid-interfederations-2.0/idp.cs.cas.cz.xml
deleted file mode 100644
index f8f81f5a..00000000
--- a/swamid-interfederations-2.0/idp.cs.cas.cz.xml
+++ /dev/null
@@ -1,118 +0,0 @@
-<?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.cs.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/" registrationInstant="2014-06-17T15:52:29Z">
-      <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>
-    <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://eduid.cz/uri/idp-group/avcr</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>
-      <shibmd:Scope regexp="false">cs.cas.cz</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Institute of Computer Science AS CR</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="cs">Ústav informatiky AV ČR</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Identity Provider ICS AV CR employees.</mdui:Description>
-        <mdui:Description xml:lang="cs">Identity Provider pro zaměstnance UI AV ČR</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.ustavinformatiky.cz/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="cs">http://www.ustavinformatiky.cz/</mdui:InformationURL>
-        <mdui:Logo height="44" width="50">https://jiftach.cas.cz/loga/logo-ui-44.png</mdui:Logo>
-        <mdui:Logo height="400" width="450">https://jiftach.cas.cz/loga/logo-ui-400.png</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDIDCCAgigAwIBAgIVAKK9oHWp4NhakdhRINFSNcMlO+RbMA0GCSqGSIb3DQEB
-BQUAMBgxFjAUBgNVBAMTDWlkcC5jcy5jYXMuY3owHhcNMTQwNDIzMDk0MjA0WhcN
-MzQwNDIzMDk0MjA0WjAYMRYwFAYDVQQDEw1pZHAuY3MuY2FzLmN6MIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAjjkBmvDKH/5+UN1okmPOjP4WiCHwmGw7
-KQ9Zxk/myiYmAgk9qF/0PTHMdli5C4rbSbffG+G+28B6N+hJL8GoCL5+BSfKxjsq
-0EkXH81pbIl6/V9X888aitvMa8sKYcI5SUaTdv5DfO9KPizzDh4q7ckC3pyYvYT9
-fM30sxWOSoNHgMCPEg6kUt7BViZCGqzuucqJ/OIh01GLcsu56YH7FYWSQZ6gxCjk
-mqAPSwsFveWweKxIzv/Fudact5JA2OPv6E0QtxiZl2IrrbszCTfiihqvd4Kkh2gz
-3KAI7B8HS0obOhYoi6VSNVJ2CpyQOff2M1HmIeyTe0up4bEGnbu81QIDAQABo2Ew
-XzA+BgNVHREENzA1gg1pZHAuY3MuY2FzLmN6hiRodHRwczovL2lkcC5jcy5jYXMu
-Y3ovaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFO+bvv+xOMV6uPQ6HEydpZESVVHW
-MA0GCSqGSIb3DQEBBQUAA4IBAQAIvc78aeMLcz35NBrOwdpFTkyjxddzw8In/WkZ
-f460lIhMMqc4wBe2fdqUx6OOkGDOGFTt4nWhLxp5+RI4v6ZwawGmZBxTBWxJgCrI
-2wOrZ+LAjcah4H+dESHtufvkv5GpcpHaqclECIJBSdBw40JO0GaIRHfNAnpLW8Uu
-QMhmIIxoZBWR/Fw+FJbKlseHsLR67FxmkuIrj9a+R3tL63j6xktGkzh3pvmjzTu9
-V7TvWrHG4VLa2B+cw1DTHx53iXciC7lcUmrv6FmsoEn023Vo9SMPCCpyoYGnKmRl
-DWUUP6NhKsUBrx0ErS47MREL3/a9Ck6rJ1bJssJLAir38Sk4
-
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.cs.cas.cz:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.cs.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.cs.cas.cz/idp/profile/SAML2/Redirect/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.cs.cas.cz/idp/profile/SAML2/POST/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.cs.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.cs.cas.cz/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.cs.cas.cz/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.cs.cas.cz/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.cs.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">cs.cas.cz</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDIDCCAgigAwIBAgIVAKK9oHWp4NhakdhRINFSNcMlO+RbMA0GCSqGSIb3DQEB
-BQUAMBgxFjAUBgNVBAMTDWlkcC5jcy5jYXMuY3owHhcNMTQwNDIzMDk0MjA0WhcN
-MzQwNDIzMDk0MjA0WjAYMRYwFAYDVQQDEw1pZHAuY3MuY2FzLmN6MIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAjjkBmvDKH/5+UN1okmPOjP4WiCHwmGw7
-KQ9Zxk/myiYmAgk9qF/0PTHMdli5C4rbSbffG+G+28B6N+hJL8GoCL5+BSfKxjsq
-0EkXH81pbIl6/V9X888aitvMa8sKYcI5SUaTdv5DfO9KPizzDh4q7ckC3pyYvYT9
-fM30sxWOSoNHgMCPEg6kUt7BViZCGqzuucqJ/OIh01GLcsu56YH7FYWSQZ6gxCjk
-mqAPSwsFveWweKxIzv/Fudact5JA2OPv6E0QtxiZl2IrrbszCTfiihqvd4Kkh2gz
-3KAI7B8HS0obOhYoi6VSNVJ2CpyQOff2M1HmIeyTe0up4bEGnbu81QIDAQABo2Ew
-XzA+BgNVHREENzA1gg1pZHAuY3MuY2FzLmN6hiRodHRwczovL2lkcC5jcy5jYXMu
-Y3ovaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFO+bvv+xOMV6uPQ6HEydpZESVVHW
-MA0GCSqGSIb3DQEBBQUAA4IBAQAIvc78aeMLcz35NBrOwdpFTkyjxddzw8In/WkZ
-f460lIhMMqc4wBe2fdqUx6OOkGDOGFTt4nWhLxp5+RI4v6ZwawGmZBxTBWxJgCrI
-2wOrZ+LAjcah4H+dESHtufvkv5GpcpHaqclECIJBSdBw40JO0GaIRHfNAnpLW8Uu
-QMhmIIxoZBWR/Fw+FJbKlseHsLR67FxmkuIrj9a+R3tL63j6xktGkzh3pvmjzTu9
-V7TvWrHG4VLa2B+cw1DTHx53iXciC7lcUmrv6FmsoEn023Vo9SMPCCpyoYGnKmRl
-DWUUP6NhKsUBrx0ErS47MREL3/a9Ck6rJ1bJssJLAir38Sk4
-
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.cs.cas.cz:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.cs.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 Computer Science Academy</OrganizationName>
-    <OrganizationName xml:lang="cs">Ústav informatiky AV ČR</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Institute of Computer Science Academy of Sciences of the Czech Republic</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="cs">Ústav informatiky AV ČR, v.v.i.</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.ustavinformatiky.cz/</OrganizationURL>
-    <OrganizationURL xml:lang="cs">http://www.ustavinformatiky.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.csc.fi-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.csc.fi-idp-shibboleth.xml
index e65b29bd..d75aeb63 100644
--- a/swamid-interfederations-2.0/idp.csc.fi-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.csc.fi-idp-shibboleth.xml
@@ -1,15 +1,10 @@
 <?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" entityID="https://idp.csc.fi/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.csc.fi/haka">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://www.csc.fi/english/institutions/haka/instructions/join/eduGAINRegistrationStatement/</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" 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://idp.csc.fi/idp/shibboleth">
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
       <shibmd:Scope regexp="false">csc.fi</shibmd:Scope>
       <shibmd:Scope regexp="false">funet.fi</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+      <mdui:UIInfo>
         <mdui:DisplayName xml:lang="fi">CSC - Tieteen tietotekniikan keskus Oy</mdui:DisplayName>
         <mdui:DisplayName xml:lang="sv">CSC - Tieteen tietotekniikan keskus Oy</mdui:DisplayName>
         <mdui:DisplayName xml:lang="en">CSC - IT Center for Science Ltd.</mdui:DisplayName>
@@ -21,13 +16,17 @@
         <mdui:InformationURL xml:lang="en">http://www.csc.fi/english</mdui:InformationURL>
         <mdui:InformationURL xml:lang="sv">http://www.csc.fi/svenska</mdui:InformationURL>
       </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+      <mdui:DiscoHints>
         <mdui:DomainHint>csc.fi</mdui:DomainHint>
         <mdui:GeolocationHint>geo:64.2311008,27.7041552</mdui:GeolocationHint>
         <mdui:GeolocationHint>geo:60.1785928,24.8332895</mdui:GeolocationHint>
       </mdui:DiscoHints>
-    </Extensions>
-    <KeyDescriptor>
+      <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>MIIFxTCCBK2gAwIBAgIRAL73x8HVOpETqtPrUQiDLkowDQYJKoZIhvcNAQEFBQAw
@@ -63,27 +62,27 @@ OrrMi7TzCc5DvLYpuskPWaTstbxW2d+c/wWX+2eaC51BUS4SRgc2QXGj4YgEmYvT
 yfHB/Vk5J4H+DO2SNiPj868WRhf2sTanPMS7LxqSsL+wiOXVBbISe+c=</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </KeyDescriptor>
-    <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.csc.fi/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="fi">CSC - Tieteen tietotekniikan keskus Oy</OrganizationName>
-    <OrganizationName xml:lang="en">CSC - IT Center for Science Ltd.</OrganizationName>
-    <OrganizationName xml:lang="sv">CSC - Tieteen tietotekniikan keskus Oy</OrganizationName>
-    <OrganizationDisplayName xml:lang="fi">CSC - Tieteen tietotekniikan keskus Oy</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">CSC - IT Center for Science Ltd.</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="sv">CSC - Tieteen tietotekniikan keskus Oy</OrganizationDisplayName>
-    <OrganizationURL xml:lang="fi">http://www.csc.fi</OrganizationURL>
-    <OrganizationURL xml:lang="en">http://www.csc.fi</OrganizationURL>
-    <OrganizationURL xml:lang="sv">http://www.csc.fi</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Janne</GivenName>
-    <SurName>Lauros</SurName>
-    <EmailAddress>mailto:haka@csc.fi</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="support">
-    <EmailAddress>mailto:haka@csc.fi</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.csc.fi/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <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="technical">
+    <md:GivenName>Janne</md:GivenName>
+    <md:SurName>Lauros</md:SurName>
+    <md:EmailAddress>mailto:haka@csc.fi</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:EmailAddress>mailto:haka@csc.fi</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.csc.fi.xml b/swamid-interfederations-2.0/idp.csc.fi.xml
deleted file mode 100644
index e65b29bd..00000000
--- a/swamid-interfederations-2.0/idp.csc.fi.xml
+++ /dev/null
@@ -1,89 +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" entityID="https://idp.csc.fi/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.csc.fi/haka">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://www.csc.fi/english/institutions/haka/instructions/join/eduGAINRegistrationStatement/</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">csc.fi</shibmd:Scope>
-      <shibmd:Scope regexp="false">funet.fi</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fi">CSC - Tieteen tietotekniikan keskus Oy</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="sv">CSC - Tieteen tietotekniikan keskus Oy</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">CSC - IT Center for Science Ltd.</mdui:DisplayName>
-        <mdui:Description xml:lang="fi">CSC on opetus- ja kulttuuriministeriön hallinnoima tieteen tietotekniikan keskus.</mdui:Description>
-        <mdui:Description xml:lang="sv">CSC — Tieteen tietotekniikan keskus Oy är IT-centret för vetenskap.</mdui:Description>
-        <mdui:Description xml:lang="en">CSC — IT Center for Science Ltd is administered by the Ministry of Education, Science and Culture.</mdui:Description>
-        <mdui:Logo height="256" width="256">https://idp.csc.fi/idp/img/csc.jpg</mdui:Logo>
-        <mdui:InformationURL xml:lang="fi">http://www.csc.fi/index_html</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">http://www.csc.fi/english</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="sv">http://www.csc.fi/svenska</mdui:InformationURL>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DomainHint>csc.fi</mdui:DomainHint>
-        <mdui:GeolocationHint>geo:64.2311008,27.7041552</mdui:GeolocationHint>
-        <mdui:GeolocationHint>geo:60.1785928,24.8332895</mdui:GeolocationHint>
-      </mdui:DiscoHints>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIFxTCCBK2gAwIBAgIRAL73x8HVOpETqtPrUQiDLkowDQYJKoZIhvcNAQEFBQAw
-NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-IFNTTCBDQTAeFw0xNDA0MDkwMDAwMDBaFw0xNzA0MDgyMzU5NTlaMDgxITAfBgNV
-BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDETMBEGA1UEAxMKaWRwLmNzYy5m
-aTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBALxQbKAbjH1Y6nXZLERE
-+8+VuH3w0K/FXMG3K0ySP36uU5QylaFDTx++DZT+IlEwuEXEHoW673P1ymL/Gg1j
-+SlZdBxH6fFOqSLaT1jFtrpWleIwTWJtupwbB+GVNaPCFvo0snB0u4x1czcisFvG
-kc+GTN99e7dcuLA2kaQsVtoH9BLY99rubto6jbPdAb98htm+1a4yBZ/k3cirpDLo
-TZn2ILV/wEnsU/CdELweBm+3Ws6RcneqS6q+iNX6arA3+/eskksqbvd0PbbWHVl1
-b3r21T82lo+V6AdxBEKyZvlrxek8T8/m15AIAy6Id4GC/dc2crMFfrQV0hjXl//M
-ssOzUnbf5gJsX1ZHg8XrdEb60cssI0kriOOjDahYOCfP7nYYC26XzTrwfqQuQv/s
-3ZADXmQeLcMG42U2iBJaeXoqS1GymnToX08hx/UxabLSi+Hd2xOkurddq7A9x+Y7
-43q/6wKLoByNyFdyDVe+Tczap6vySov/WF5NgSn6mHfiC+EOHDhLQsRISyCTYWh/
-nmECl7nwaslnKfotwh+ax5EIlOF89dWOYgQk99ry6p8PrnJciHp5YsQGFi2uahwX
-Wy0Q0GWwPluh9QPRyV2Msk/xKYfkQV+JGk6jrES+6kHMI3xj6kf47u1jn8hSZmVR
-EbJgpgP8VadStP6zCWMBWbTdAgMBAAGjggHKMIIBxjAfBgNVHSMEGDAWgBQMvZNo
-DPPeq6NJays3V0fqkOO57TAdBgNVHQ4EFgQUT4gxrqHsUIEm8Q6JLQ79lpx1VrIw
-DgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUH
-AwEGCCsGAQUFBwMCMCIGA1UdIAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQIB
-MDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVS
-RU5BU1NMQ0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDov
-L2NydC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGG
-Gmh0dHA6Ly9vY3NwLnRjcy50ZXJlbmEub3JnMHgGA1UdEQRxMG+CCmlkcC5jc2Mu
-ZmmCEWhha2EtaWRwMDEuY3NjLmZpghFoYWthLWlkcDAyLmNzYy5maYIRaGFrYS1p
-ZHAwMy5jc2MuZmmCDGlkcDAxLmNzYy5maYIMaWRwMDIuY3NjLmZpggxpZHAwMy5j
-c2MuZmkwDQYJKoZIhvcNAQEFBQADggEBAHLHoTcTEV6UgJ/RvzuRuQJlcxEURYzs
-Vg5WroFJYpGUa3OPHqHdWWJIAYWjE21oRKoxrOigpr/Ux24AP7z6OEh/ACUtrT86
-nwl2FZsWJOQ/7kkplDs3Yjy+7kkQyUVZoiPcNVE9nRVJuX0J2pwq29dkDibgTiv1
-QsoRrRYbh+Ocsi72e5feCe/vY9ZjnwKQmfQsDmzU72PwaJ5AwHh2bHE+9Eoj7AiN
-OrrMi7TzCc5DvLYpuskPWaTstbxW2d+c/wWX+2eaC51BUS4SRgc2QXGj4YgEmYvT
-yfHB/Vk5J4H+DO2SNiPj868WRhf2sTanPMS7LxqSsL+wiOXVBbISe+c=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <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.csc.fi/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="fi">CSC - Tieteen tietotekniikan keskus Oy</OrganizationName>
-    <OrganizationName xml:lang="en">CSC - IT Center for Science Ltd.</OrganizationName>
-    <OrganizationName xml:lang="sv">CSC - Tieteen tietotekniikan keskus Oy</OrganizationName>
-    <OrganizationDisplayName xml:lang="fi">CSC - Tieteen tietotekniikan keskus Oy</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">CSC - IT Center for Science Ltd.</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="sv">CSC - Tieteen tietotekniikan keskus Oy</OrganizationDisplayName>
-    <OrganizationURL xml:lang="fi">http://www.csc.fi</OrganizationURL>
-    <OrganizationURL xml:lang="en">http://www.csc.fi</OrganizationURL>
-    <OrganizationURL xml:lang="sv">http://www.csc.fi</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Janne</GivenName>
-    <SurName>Lauros</SurName>
-    <EmailAddress>mailto:haka@csc.fi</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="support">
-    <EmailAddress>mailto:haka@csc.fi</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.cue-lillenorddefrance.fr-shibboleth.xml b/swamid-interfederations-2.0/idp.cue-lillenorddefrance.fr-shibboleth.xml
deleted file mode 100644
index 6aef292d..00000000
--- a/swamid-interfederations-2.0/idp.cue-lillenorddefrance.fr-shibboleth.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://idp.cue-lillenorddefrance.fr/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2014-06-16T16:33:41Z">
-      <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">cue-lillenorddefrance.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Communauté d'Universités et d'Etablissements - Lille Nord de France</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Personnels, Formateurs et étudiants</mdui:Description>
-        <mdui:DisplayName xml:lang="fr">Communauté d'Universités et d'Etablissements - Lille Nord de France</mdui:DisplayName>
-        <mdui:Description xml:lang="fr">Personnels, Formateurs et étudiants</mdui:Description>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIEhjCCA26gAwIBAgIRANSLXSw4ru5ryYhm5hf/p58wDQYJKoZIhvcNAQEFBQAw
-NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-IFNTTCBDQTAeFw0xNDA2MTYwMDAwMDBaFw0xNzA2MTUyMzU5NTlaMEoxITAfBgNV
-BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDElMCMGA1UEAxMcaWRwLmN1ZS1s
-aWxsZW5vcmRkZWZyYW5jZS5mcjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
-ggEBAPFaRQj5mYaG4U4ROsOmg7AtHftdd/UNBNDz36zXv99uRcrbhSi+rVrgfsnC
-elpbxwACvNNRYvxov5oxBFR9UeFT9sSzrM+PacXR1Qa435AP8hao5TmGR4O8i4JW
-ahGqQHjwooVCoZt1i0ri2aE5tI4HVp8GBl1lNGRlTPYDWjh4a/irL0JeqMs8DAnN
-swJBuiJ4I1exC3/KIy37cqMleGnpwbx1E1RKPitFtbpHKENiYIgAPmhnNDk1FQOj
-F6O2eIGwKguruSAMJe/ObpYCObIdYXhxBMiSAUX8KQpx5ASBxzE4BgT+rdrOv82q
-9z1Z71Tb2bPSXZ24PzLyTwIMX4sCAwEAAaOCAXkwggF1MB8GA1UdIwQYMBaAFAy9
-k2gM896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBQyUKxCROm0WgHBk0YYobumdPLD
-ejAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEF
-BQcDAQYIKwYBBQUHAwIwIgYDVR0gBBswGTANBgsrBgEEAbIxAQICHTAIBgZngQwB
-AgEwOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9U
-RVJFTkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRw
-Oi8vY3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcw
-AYYaaHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwJwYDVR0RBCAwHoIcaWRwLmN1
-ZS1saWxsZW5vcmRkZWZyYW5jZS5mcjANBgkqhkiG9w0BAQUFAAOCAQEAM5EI+tv8
-A6F8sdy0LjO+LcVeIO7i7QMaaN6CQyn1wh/P+rEBk0mk6kiCqDbjksjAsGTPYYZ7
-Fdq4bS6Bmqd9BQyZMbq4Sm3eFiMqa87oDZHjsuiWWIccmrCKAIWKr447PpDBBs95
-GOL5hwuqjHIPvb1qKFUBvriW0B8ujEdcJl3ja/oy0oBz8xlSmpvCZPS6vNc0cCn+
-Ym0QTm2dtTLNmPUW4DcV32K0eJCsrrT/nNy18Vw5aatD6U3TuggE7Ocgcb+QUsH+
-k3M5769UhOUotF3wRjXyBQsbW81d7LsdsxPvhAF9GQiX3uGrBDEYWK4Uq3KQE0/L
-pjRCf2fUkk8Bag==
-					    </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://idp.cue-lillenorddefrance.fr/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.cue-lillenorddefrance.fr/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.cue-lillenorddefrance.fr/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">cue-lillenorddefrance.fr</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIEhjCCA26gAwIBAgIRANSLXSw4ru5ryYhm5hf/p58wDQYJKoZIhvcNAQEFBQAw
-NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-IFNTTCBDQTAeFw0xNDA2MTYwMDAwMDBaFw0xNzA2MTUyMzU5NTlaMEoxITAfBgNV
-BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDElMCMGA1UEAxMcaWRwLmN1ZS1s
-aWxsZW5vcmRkZWZyYW5jZS5mcjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
-ggEBAPFaRQj5mYaG4U4ROsOmg7AtHftdd/UNBNDz36zXv99uRcrbhSi+rVrgfsnC
-elpbxwACvNNRYvxov5oxBFR9UeFT9sSzrM+PacXR1Qa435AP8hao5TmGR4O8i4JW
-ahGqQHjwooVCoZt1i0ri2aE5tI4HVp8GBl1lNGRlTPYDWjh4a/irL0JeqMs8DAnN
-swJBuiJ4I1exC3/KIy37cqMleGnpwbx1E1RKPitFtbpHKENiYIgAPmhnNDk1FQOj
-F6O2eIGwKguruSAMJe/ObpYCObIdYXhxBMiSAUX8KQpx5ASBxzE4BgT+rdrOv82q
-9z1Z71Tb2bPSXZ24PzLyTwIMX4sCAwEAAaOCAXkwggF1MB8GA1UdIwQYMBaAFAy9
-k2gM896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBQyUKxCROm0WgHBk0YYobumdPLD
-ejAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEF
-BQcDAQYIKwYBBQUHAwIwIgYDVR0gBBswGTANBgsrBgEEAbIxAQICHTAIBgZngQwB
-AgEwOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9U
-RVJFTkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRw
-Oi8vY3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcw
-AYYaaHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwJwYDVR0RBCAwHoIcaWRwLmN1
-ZS1saWxsZW5vcmRkZWZyYW5jZS5mcjANBgkqhkiG9w0BAQUFAAOCAQEAM5EI+tv8
-A6F8sdy0LjO+LcVeIO7i7QMaaN6CQyn1wh/P+rEBk0mk6kiCqDbjksjAsGTPYYZ7
-Fdq4bS6Bmqd9BQyZMbq4Sm3eFiMqa87oDZHjsuiWWIccmrCKAIWKr447PpDBBs95
-GOL5hwuqjHIPvb1qKFUBvriW0B8ujEdcJl3ja/oy0oBz8xlSmpvCZPS6vNc0cCn+
-Ym0QTm2dtTLNmPUW4DcV32K0eJCsrrT/nNy18Vw5aatD6U3TuggE7Ocgcb+QUsH+
-k3M5769UhOUotF3wRjXyBQsbW81d7LsdsxPvhAF9GQiX3uGrBDEYWK4Uq3KQE0/L
-pjRCf2fUkk8Bag==
-					    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.cue-lillenorddefrance.fr/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">Communauté d'Universités et d'Etablissements - Lille Nord de France</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Communauté d'Universités et d'Etablissements - Lille Nord de France</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <EmailAddress>info-infra.dir@espe-lnf.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.cue-lillenorddefrance.fr.xml b/swamid-interfederations-2.0/idp.cue-lillenorddefrance.fr.xml
deleted file mode 100644
index 6aef292d..00000000
--- a/swamid-interfederations-2.0/idp.cue-lillenorddefrance.fr.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://idp.cue-lillenorddefrance.fr/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2014-06-16T16:33:41Z">
-      <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">cue-lillenorddefrance.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Communauté d'Universités et d'Etablissements - Lille Nord de France</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Personnels, Formateurs et étudiants</mdui:Description>
-        <mdui:DisplayName xml:lang="fr">Communauté d'Universités et d'Etablissements - Lille Nord de France</mdui:DisplayName>
-        <mdui:Description xml:lang="fr">Personnels, Formateurs et étudiants</mdui:Description>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIEhjCCA26gAwIBAgIRANSLXSw4ru5ryYhm5hf/p58wDQYJKoZIhvcNAQEFBQAw
-NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-IFNTTCBDQTAeFw0xNDA2MTYwMDAwMDBaFw0xNzA2MTUyMzU5NTlaMEoxITAfBgNV
-BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDElMCMGA1UEAxMcaWRwLmN1ZS1s
-aWxsZW5vcmRkZWZyYW5jZS5mcjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
-ggEBAPFaRQj5mYaG4U4ROsOmg7AtHftdd/UNBNDz36zXv99uRcrbhSi+rVrgfsnC
-elpbxwACvNNRYvxov5oxBFR9UeFT9sSzrM+PacXR1Qa435AP8hao5TmGR4O8i4JW
-ahGqQHjwooVCoZt1i0ri2aE5tI4HVp8GBl1lNGRlTPYDWjh4a/irL0JeqMs8DAnN
-swJBuiJ4I1exC3/KIy37cqMleGnpwbx1E1RKPitFtbpHKENiYIgAPmhnNDk1FQOj
-F6O2eIGwKguruSAMJe/ObpYCObIdYXhxBMiSAUX8KQpx5ASBxzE4BgT+rdrOv82q
-9z1Z71Tb2bPSXZ24PzLyTwIMX4sCAwEAAaOCAXkwggF1MB8GA1UdIwQYMBaAFAy9
-k2gM896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBQyUKxCROm0WgHBk0YYobumdPLD
-ejAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEF
-BQcDAQYIKwYBBQUHAwIwIgYDVR0gBBswGTANBgsrBgEEAbIxAQICHTAIBgZngQwB
-AgEwOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9U
-RVJFTkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRw
-Oi8vY3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcw
-AYYaaHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwJwYDVR0RBCAwHoIcaWRwLmN1
-ZS1saWxsZW5vcmRkZWZyYW5jZS5mcjANBgkqhkiG9w0BAQUFAAOCAQEAM5EI+tv8
-A6F8sdy0LjO+LcVeIO7i7QMaaN6CQyn1wh/P+rEBk0mk6kiCqDbjksjAsGTPYYZ7
-Fdq4bS6Bmqd9BQyZMbq4Sm3eFiMqa87oDZHjsuiWWIccmrCKAIWKr447PpDBBs95
-GOL5hwuqjHIPvb1qKFUBvriW0B8ujEdcJl3ja/oy0oBz8xlSmpvCZPS6vNc0cCn+
-Ym0QTm2dtTLNmPUW4DcV32K0eJCsrrT/nNy18Vw5aatD6U3TuggE7Ocgcb+QUsH+
-k3M5769UhOUotF3wRjXyBQsbW81d7LsdsxPvhAF9GQiX3uGrBDEYWK4Uq3KQE0/L
-pjRCf2fUkk8Bag==
-					    </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://idp.cue-lillenorddefrance.fr/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.cue-lillenorddefrance.fr/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.cue-lillenorddefrance.fr/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">cue-lillenorddefrance.fr</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIEhjCCA26gAwIBAgIRANSLXSw4ru5ryYhm5hf/p58wDQYJKoZIhvcNAQEFBQAw
-NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-IFNTTCBDQTAeFw0xNDA2MTYwMDAwMDBaFw0xNzA2MTUyMzU5NTlaMEoxITAfBgNV
-BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDElMCMGA1UEAxMcaWRwLmN1ZS1s
-aWxsZW5vcmRkZWZyYW5jZS5mcjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
-ggEBAPFaRQj5mYaG4U4ROsOmg7AtHftdd/UNBNDz36zXv99uRcrbhSi+rVrgfsnC
-elpbxwACvNNRYvxov5oxBFR9UeFT9sSzrM+PacXR1Qa435AP8hao5TmGR4O8i4JW
-ahGqQHjwooVCoZt1i0ri2aE5tI4HVp8GBl1lNGRlTPYDWjh4a/irL0JeqMs8DAnN
-swJBuiJ4I1exC3/KIy37cqMleGnpwbx1E1RKPitFtbpHKENiYIgAPmhnNDk1FQOj
-F6O2eIGwKguruSAMJe/ObpYCObIdYXhxBMiSAUX8KQpx5ASBxzE4BgT+rdrOv82q
-9z1Z71Tb2bPSXZ24PzLyTwIMX4sCAwEAAaOCAXkwggF1MB8GA1UdIwQYMBaAFAy9
-k2gM896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBQyUKxCROm0WgHBk0YYobumdPLD
-ejAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEF
-BQcDAQYIKwYBBQUHAwIwIgYDVR0gBBswGTANBgsrBgEEAbIxAQICHTAIBgZngQwB
-AgEwOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9U
-RVJFTkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRw
-Oi8vY3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcw
-AYYaaHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwJwYDVR0RBCAwHoIcaWRwLmN1
-ZS1saWxsZW5vcmRkZWZyYW5jZS5mcjANBgkqhkiG9w0BAQUFAAOCAQEAM5EI+tv8
-A6F8sdy0LjO+LcVeIO7i7QMaaN6CQyn1wh/P+rEBk0mk6kiCqDbjksjAsGTPYYZ7
-Fdq4bS6Bmqd9BQyZMbq4Sm3eFiMqa87oDZHjsuiWWIccmrCKAIWKr447PpDBBs95
-GOL5hwuqjHIPvb1qKFUBvriW0B8ujEdcJl3ja/oy0oBz8xlSmpvCZPS6vNc0cCn+
-Ym0QTm2dtTLNmPUW4DcV32K0eJCsrrT/nNy18Vw5aatD6U3TuggE7Ocgcb+QUsH+
-k3M5769UhOUotF3wRjXyBQsbW81d7LsdsxPvhAF9GQiX3uGrBDEYWK4Uq3KQE0/L
-pjRCf2fUkk8Bag==
-					    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.cue-lillenorddefrance.fr/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">Communauté d'Universités et d'Etablissements - Lille Nord de France</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Communauté d'Universités et d'Etablissements - Lille Nord de France</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <EmailAddress>info-infra.dir@espe-lnf.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.cvgz.cas.cz-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.cvgz.cas.cz-idp-shibboleth.xml
deleted file mode 100644
index 3f4068c6..00000000
--- a/swamid-interfederations-2.0/idp.cvgz.cas.cz-idp-shibboleth.xml
+++ /dev/null
@@ -1,118 +0,0 @@
-<?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.cvgz.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/" registrationInstant="2014-05-06T13:35:26Z">
-      <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>
-    <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://eduid.cz/uri/idp-group/avcr</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>
-      <shibmd:Scope regexp="false">cvgz.cas.cz</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Global Change Research Centre AS CR</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="cs">Centrum výzkumu globální změny AV ČR</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Identity Provider GCRC AV CR employees.</mdui:Description>
-        <mdui:Description xml:lang="cs">Identity Provider pro zaměstnance CVGZ AV ČR</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.czechglobe.cz/en/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="cs">http://www.czechglobe.cz/cs/</mdui:InformationURL>
-        <mdui:Logo height="44" width="74">https://jiftach.cas.cz/loga/logo-cvgz-44.png</mdui:Logo>
-        <mdui:Logo height="411" width="960">https://jiftach.cas.cz/loga/logo-cvgz-148.png</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDKDCCAhCgAwIBAgIVALr7AqT0+uw7MEykFT/aUKQi4cNOMA0GCSqGSIb3DQEB
-BQUAMBoxGDAWBgNVBAMTD2lkcC5jdmd6LmNhcy5jejAeFw0xNDA0MDEwNzU3MDBa
-Fw0zNDA0MDEwNzU3MDBaMBoxGDAWBgNVBAMTD2lkcC5jdmd6LmNhcy5jejCCASIw
-DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMIsJTIygU6zF5Wew+vVaUUCdhol
-bEqlFy8ou2zPpXp7l39eAzUb027Ng0KBZT863EcySGiacYKIdCRdVlZ+uLn6PoBD
-6dkNJHbVzlNXlh5pY5XJFyF6ZZrtVb2V9jo5DCpCWHzUtQdWNmClZIwmG09Xvwef
-OvZax6Q/gJz0NgUCHFNiaQLkVI8iqZncdUyImce2V1RWrxHZMm0DpWLm0/w/MP8d
-c7GAqzBwxMEGyJ2v2SR02sccBg89l4LcBTr4ZzMAAYjX7XgnEARl8Th9eCH/Zo39
-fZNUk8msi0mxIv43LZA9AaPveDFbVf1Q4DJOiqQNK750eG+FzwXepK7aieECAwEA
-AaNlMGMwQgYDVR0RBDswOYIPaWRwLmN2Z3ouY2FzLmN6hiZodHRwczovL2lkcC5j
-dmd6LmNhcy5jei9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUaiD1JRJQWoj+Z/OG
-c0RxmP8OB+0wDQYJKoZIhvcNAQEFBQADggEBAFv+QmlxUptujxtgJ8NHv+9XLlQY
-3Z6ovkPnpBKPLxNWwGBwYtu2g4rtIpfo8yaspDfeF7Os2ZhRhxO5n3SREE2fnyQs
-v2DHJGGD8KTXe4AdE/XV56CgnCPzAWiqHe896F/IzuwNQUo4LsF0xwBtvDPHCfzn
-tBU0C7k4tdoXIGwQZ6tgpaNYIpQB1Y3uCYySgmk0XNGdd485ejnqWNXbYeVMKRlO
-UM+tjeQUjPgXPeezWIm7VketDNfa3jiwmCMorKalCq1A7ZAqrQ9PfWS3rLWpKL8G
-Lkio9BWK20qYnioVmdQhMS9PZ7ZE0a0/waCeF9gfzEvW+7LT1muTh7oLPO8=
-
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.cvgz.cas.cz:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.cvgz.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.cvgz.cas.cz/idp/profile/SAML2/Redirect/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.cvgz.cas.cz/idp/profile/SAML2/POST/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.cvgz.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.cvgz.cas.cz/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.cvgz.cas.cz/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.cvgz.cas.cz/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.cvgz.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">cvgz.cas.cz</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDKDCCAhCgAwIBAgIVALr7AqT0+uw7MEykFT/aUKQi4cNOMA0GCSqGSIb3DQEB
-BQUAMBoxGDAWBgNVBAMTD2lkcC5jdmd6LmNhcy5jejAeFw0xNDA0MDEwNzU3MDBa
-Fw0zNDA0MDEwNzU3MDBaMBoxGDAWBgNVBAMTD2lkcC5jdmd6LmNhcy5jejCCASIw
-DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMIsJTIygU6zF5Wew+vVaUUCdhol
-bEqlFy8ou2zPpXp7l39eAzUb027Ng0KBZT863EcySGiacYKIdCRdVlZ+uLn6PoBD
-6dkNJHbVzlNXlh5pY5XJFyF6ZZrtVb2V9jo5DCpCWHzUtQdWNmClZIwmG09Xvwef
-OvZax6Q/gJz0NgUCHFNiaQLkVI8iqZncdUyImce2V1RWrxHZMm0DpWLm0/w/MP8d
-c7GAqzBwxMEGyJ2v2SR02sccBg89l4LcBTr4ZzMAAYjX7XgnEARl8Th9eCH/Zo39
-fZNUk8msi0mxIv43LZA9AaPveDFbVf1Q4DJOiqQNK750eG+FzwXepK7aieECAwEA
-AaNlMGMwQgYDVR0RBDswOYIPaWRwLmN2Z3ouY2FzLmN6hiZodHRwczovL2lkcC5j
-dmd6LmNhcy5jei9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUaiD1JRJQWoj+Z/OG
-c0RxmP8OB+0wDQYJKoZIhvcNAQEFBQADggEBAFv+QmlxUptujxtgJ8NHv+9XLlQY
-3Z6ovkPnpBKPLxNWwGBwYtu2g4rtIpfo8yaspDfeF7Os2ZhRhxO5n3SREE2fnyQs
-v2DHJGGD8KTXe4AdE/XV56CgnCPzAWiqHe896F/IzuwNQUo4LsF0xwBtvDPHCfzn
-tBU0C7k4tdoXIGwQZ6tgpaNYIpQB1Y3uCYySgmk0XNGdd485ejnqWNXbYeVMKRlO
-UM+tjeQUjPgXPeezWIm7VketDNfa3jiwmCMorKalCq1A7ZAqrQ9PfWS3rLWpKL8G
-Lkio9BWK20qYnioVmdQhMS9PZ7ZE0a0/waCeF9gfzEvW+7LT1muTh7oLPO8=
-
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.cvgz.cas.cz:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.cvgz.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">Global Change Research Centre AS CR</OrganizationName>
-    <OrganizationName xml:lang="cs">Centrum výzkumu globální změny AV ČR</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Global Change Research Centre AS CR, v. v. i.</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="cs">Centrum výzkumu globální změny AV ČR, v. v. i.</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.czechglobe.cz/en/</OrganizationURL>
-    <OrganizationURL xml:lang="cs">http://www.czechglobe.cz/cs/</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.cvgz.cas.cz.xml b/swamid-interfederations-2.0/idp.cvgz.cas.cz.xml
deleted file mode 100644
index 3f4068c6..00000000
--- a/swamid-interfederations-2.0/idp.cvgz.cas.cz.xml
+++ /dev/null
@@ -1,118 +0,0 @@
-<?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.cvgz.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/" registrationInstant="2014-05-06T13:35:26Z">
-      <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>
-    <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://eduid.cz/uri/idp-group/avcr</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>
-      <shibmd:Scope regexp="false">cvgz.cas.cz</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Global Change Research Centre AS CR</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="cs">Centrum výzkumu globální změny AV ČR</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Identity Provider GCRC AV CR employees.</mdui:Description>
-        <mdui:Description xml:lang="cs">Identity Provider pro zaměstnance CVGZ AV ČR</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.czechglobe.cz/en/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="cs">http://www.czechglobe.cz/cs/</mdui:InformationURL>
-        <mdui:Logo height="44" width="74">https://jiftach.cas.cz/loga/logo-cvgz-44.png</mdui:Logo>
-        <mdui:Logo height="411" width="960">https://jiftach.cas.cz/loga/logo-cvgz-148.png</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDKDCCAhCgAwIBAgIVALr7AqT0+uw7MEykFT/aUKQi4cNOMA0GCSqGSIb3DQEB
-BQUAMBoxGDAWBgNVBAMTD2lkcC5jdmd6LmNhcy5jejAeFw0xNDA0MDEwNzU3MDBa
-Fw0zNDA0MDEwNzU3MDBaMBoxGDAWBgNVBAMTD2lkcC5jdmd6LmNhcy5jejCCASIw
-DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMIsJTIygU6zF5Wew+vVaUUCdhol
-bEqlFy8ou2zPpXp7l39eAzUb027Ng0KBZT863EcySGiacYKIdCRdVlZ+uLn6PoBD
-6dkNJHbVzlNXlh5pY5XJFyF6ZZrtVb2V9jo5DCpCWHzUtQdWNmClZIwmG09Xvwef
-OvZax6Q/gJz0NgUCHFNiaQLkVI8iqZncdUyImce2V1RWrxHZMm0DpWLm0/w/MP8d
-c7GAqzBwxMEGyJ2v2SR02sccBg89l4LcBTr4ZzMAAYjX7XgnEARl8Th9eCH/Zo39
-fZNUk8msi0mxIv43LZA9AaPveDFbVf1Q4DJOiqQNK750eG+FzwXepK7aieECAwEA
-AaNlMGMwQgYDVR0RBDswOYIPaWRwLmN2Z3ouY2FzLmN6hiZodHRwczovL2lkcC5j
-dmd6LmNhcy5jei9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUaiD1JRJQWoj+Z/OG
-c0RxmP8OB+0wDQYJKoZIhvcNAQEFBQADggEBAFv+QmlxUptujxtgJ8NHv+9XLlQY
-3Z6ovkPnpBKPLxNWwGBwYtu2g4rtIpfo8yaspDfeF7Os2ZhRhxO5n3SREE2fnyQs
-v2DHJGGD8KTXe4AdE/XV56CgnCPzAWiqHe896F/IzuwNQUo4LsF0xwBtvDPHCfzn
-tBU0C7k4tdoXIGwQZ6tgpaNYIpQB1Y3uCYySgmk0XNGdd485ejnqWNXbYeVMKRlO
-UM+tjeQUjPgXPeezWIm7VketDNfa3jiwmCMorKalCq1A7ZAqrQ9PfWS3rLWpKL8G
-Lkio9BWK20qYnioVmdQhMS9PZ7ZE0a0/waCeF9gfzEvW+7LT1muTh7oLPO8=
-
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.cvgz.cas.cz:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.cvgz.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.cvgz.cas.cz/idp/profile/SAML2/Redirect/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.cvgz.cas.cz/idp/profile/SAML2/POST/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.cvgz.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.cvgz.cas.cz/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.cvgz.cas.cz/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.cvgz.cas.cz/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.cvgz.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">cvgz.cas.cz</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDKDCCAhCgAwIBAgIVALr7AqT0+uw7MEykFT/aUKQi4cNOMA0GCSqGSIb3DQEB
-BQUAMBoxGDAWBgNVBAMTD2lkcC5jdmd6LmNhcy5jejAeFw0xNDA0MDEwNzU3MDBa
-Fw0zNDA0MDEwNzU3MDBaMBoxGDAWBgNVBAMTD2lkcC5jdmd6LmNhcy5jejCCASIw
-DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMIsJTIygU6zF5Wew+vVaUUCdhol
-bEqlFy8ou2zPpXp7l39eAzUb027Ng0KBZT863EcySGiacYKIdCRdVlZ+uLn6PoBD
-6dkNJHbVzlNXlh5pY5XJFyF6ZZrtVb2V9jo5DCpCWHzUtQdWNmClZIwmG09Xvwef
-OvZax6Q/gJz0NgUCHFNiaQLkVI8iqZncdUyImce2V1RWrxHZMm0DpWLm0/w/MP8d
-c7GAqzBwxMEGyJ2v2SR02sccBg89l4LcBTr4ZzMAAYjX7XgnEARl8Th9eCH/Zo39
-fZNUk8msi0mxIv43LZA9AaPveDFbVf1Q4DJOiqQNK750eG+FzwXepK7aieECAwEA
-AaNlMGMwQgYDVR0RBDswOYIPaWRwLmN2Z3ouY2FzLmN6hiZodHRwczovL2lkcC5j
-dmd6LmNhcy5jei9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUaiD1JRJQWoj+Z/OG
-c0RxmP8OB+0wDQYJKoZIhvcNAQEFBQADggEBAFv+QmlxUptujxtgJ8NHv+9XLlQY
-3Z6ovkPnpBKPLxNWwGBwYtu2g4rtIpfo8yaspDfeF7Os2ZhRhxO5n3SREE2fnyQs
-v2DHJGGD8KTXe4AdE/XV56CgnCPzAWiqHe896F/IzuwNQUo4LsF0xwBtvDPHCfzn
-tBU0C7k4tdoXIGwQZ6tgpaNYIpQB1Y3uCYySgmk0XNGdd485ejnqWNXbYeVMKRlO
-UM+tjeQUjPgXPeezWIm7VketDNfa3jiwmCMorKalCq1A7ZAqrQ9PfWS3rLWpKL8G
-Lkio9BWK20qYnioVmdQhMS9PZ7ZE0a0/waCeF9gfzEvW+7LT1muTh7oLPO8=
-
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.cvgz.cas.cz:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.cvgz.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">Global Change Research Centre AS CR</OrganizationName>
-    <OrganizationName xml:lang="cs">Centrum výzkumu globální změny AV ČR</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Global Change Research Centre AS CR, v. v. i.</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="cs">Centrum výzkumu globální změny AV ČR, v. v. i.</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.czechglobe.cz/en/</OrganizationURL>
-    <OrganizationURL xml:lang="cs">http://www.czechglobe.cz/cs/</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.cyceron.fr:8443-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.cyceron.fr:8443-idp-shibboleth.xml
deleted file mode 100644
index c34ce24d..00000000
--- a/swamid-interfederations-2.0/idp.cyceron.fr:8443-idp-shibboleth.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://idp.cyceron.fr:8443/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2014-04-08T12:08:38Z">
-      <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">cyceron.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Cyceron</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Cyceron</mdui:Description>
-        <mdui:DisplayName xml:lang="fr">Cyceron</mdui:DisplayName>
-        <mdui:Description xml:lang="fr">Cyceron</mdui:Description>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDIzCCAgugAwIBAgIUZJvKK5L/LCvXeY1r8fw0trUoarwwDQYJKoZIhvcNAQEF
-BQAwGTEXMBUGA1UEAxMOaWRwLmN5Y2Vyb24uZnIwHhcNMTQwMjE0MTExMTE1WhcN
-MzQwMjE0MTExMTE1WjAZMRcwFQYDVQQDEw5pZHAuY3ljZXJvbi5mcjCCASIwDQYJ
-KoZIhvcNAQEBBQADggEPADCCAQoCggEBALH37gLW5fRWQoGy5KEMNWpao0t2jb3i
-QLtnRqPBL1q8BYL7rjCAfHCi2xxaaBi/Wt+y+YSsqqBXlSx9fCIc9gtVTTmBfVh0
-NaFKBwOpEHRCg0cLePApucYodvIJLpZP9SMdEco5piCOV20Wll1P08h4ZqbV2Mfv
-P6ttEzwKwEfBveuHo20xHQ/F1BNnmMrXaBLR7cVM8M/i/xiFYlpx8sylMnmQx8T7
-ue+aCqiC2C/Kqt6BMUw8V3BjFb2Kia6+XK0xPZnTXZeue9xSYM/7iZnR4ifC9YCu
-2hueKZQt8P9Vxs6er7uUWIzX8ACqchv5Q/OXxiAKj1C1Nob4bt/7pVcCAwEAAaNj
-MGEwQAYDVR0RBDkwN4IOaWRwLmN5Y2Vyb24uZnKGJWh0dHBzOi8vaWRwLmN5Y2Vy
-b24uZnIvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFKxj+M3a/I4mPX0PFe9L6bjc
-JJ/dMA0GCSqGSIb3DQEBBQUAA4IBAQCJyjOIUeLEjgP0QcF0NImz05xlcNMvIZvF
-i/dPtD02FQ70VLz4IbCWCdkThqXJHALUEkiamXTBTFMl8rCuU3VqHVN3ZkLvAIyv
-cpsCYAlcrrK3jKG0jVNaWcBhEdGDxBT7/n7yHLAbWfgTeKJbEi54Sgbw3bVRFcKh
-w7ZW3ahqeRklkTca9Vn4KPEPcZEdUkatXwtLD1ZsAxAjqBDZY3yxip+KP+GYq4S4
-6ZfbLL4duNYFqUmzZnjnwPKH7gwlQf9J5Dc5tPSXT0F9xN1xzbZExr73GSIlM63I
-stLKk6cKIPPqdpryfUa5CBWcfuxb3foFGuu53LZYPjORDsZhYA2O
-					    </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://idp.cyceron.fr:8443/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.cyceron.fr:8443/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.cyceron.fr:8443/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">cyceron.fr</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDIzCCAgugAwIBAgIUZJvKK5L/LCvXeY1r8fw0trUoarwwDQYJKoZIhvcNAQEF
-BQAwGTEXMBUGA1UEAxMOaWRwLmN5Y2Vyb24uZnIwHhcNMTQwMjE0MTExMTE1WhcN
-MzQwMjE0MTExMTE1WjAZMRcwFQYDVQQDEw5pZHAuY3ljZXJvbi5mcjCCASIwDQYJ
-KoZIhvcNAQEBBQADggEPADCCAQoCggEBALH37gLW5fRWQoGy5KEMNWpao0t2jb3i
-QLtnRqPBL1q8BYL7rjCAfHCi2xxaaBi/Wt+y+YSsqqBXlSx9fCIc9gtVTTmBfVh0
-NaFKBwOpEHRCg0cLePApucYodvIJLpZP9SMdEco5piCOV20Wll1P08h4ZqbV2Mfv
-P6ttEzwKwEfBveuHo20xHQ/F1BNnmMrXaBLR7cVM8M/i/xiFYlpx8sylMnmQx8T7
-ue+aCqiC2C/Kqt6BMUw8V3BjFb2Kia6+XK0xPZnTXZeue9xSYM/7iZnR4ifC9YCu
-2hueKZQt8P9Vxs6er7uUWIzX8ACqchv5Q/OXxiAKj1C1Nob4bt/7pVcCAwEAAaNj
-MGEwQAYDVR0RBDkwN4IOaWRwLmN5Y2Vyb24uZnKGJWh0dHBzOi8vaWRwLmN5Y2Vy
-b24uZnIvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFKxj+M3a/I4mPX0PFe9L6bjc
-JJ/dMA0GCSqGSIb3DQEBBQUAA4IBAQCJyjOIUeLEjgP0QcF0NImz05xlcNMvIZvF
-i/dPtD02FQ70VLz4IbCWCdkThqXJHALUEkiamXTBTFMl8rCuU3VqHVN3ZkLvAIyv
-cpsCYAlcrrK3jKG0jVNaWcBhEdGDxBT7/n7yHLAbWfgTeKJbEi54Sgbw3bVRFcKh
-w7ZW3ahqeRklkTca9Vn4KPEPcZEdUkatXwtLD1ZsAxAjqBDZY3yxip+KP+GYq4S4
-6ZfbLL4duNYFqUmzZnjnwPKH7gwlQf9J5Dc5tPSXT0F9xN1xzbZExr73GSIlM63I
-stLKk6cKIPPqdpryfUa5CBWcfuxb3foFGuu53LZYPjORDsZhYA2O
-					    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.cyceron.fr: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">Cyceron</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Cyceron</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Antoine Nourry</SurName>
-    <EmailAddress>nourry@cyceron.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.cyceron.fr:8443.xml b/swamid-interfederations-2.0/idp.cyceron.fr:8443.xml
deleted file mode 100644
index c34ce24d..00000000
--- a/swamid-interfederations-2.0/idp.cyceron.fr:8443.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://idp.cyceron.fr:8443/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2014-04-08T12:08:38Z">
-      <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">cyceron.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Cyceron</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Cyceron</mdui:Description>
-        <mdui:DisplayName xml:lang="fr">Cyceron</mdui:DisplayName>
-        <mdui:Description xml:lang="fr">Cyceron</mdui:Description>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDIzCCAgugAwIBAgIUZJvKK5L/LCvXeY1r8fw0trUoarwwDQYJKoZIhvcNAQEF
-BQAwGTEXMBUGA1UEAxMOaWRwLmN5Y2Vyb24uZnIwHhcNMTQwMjE0MTExMTE1WhcN
-MzQwMjE0MTExMTE1WjAZMRcwFQYDVQQDEw5pZHAuY3ljZXJvbi5mcjCCASIwDQYJ
-KoZIhvcNAQEBBQADggEPADCCAQoCggEBALH37gLW5fRWQoGy5KEMNWpao0t2jb3i
-QLtnRqPBL1q8BYL7rjCAfHCi2xxaaBi/Wt+y+YSsqqBXlSx9fCIc9gtVTTmBfVh0
-NaFKBwOpEHRCg0cLePApucYodvIJLpZP9SMdEco5piCOV20Wll1P08h4ZqbV2Mfv
-P6ttEzwKwEfBveuHo20xHQ/F1BNnmMrXaBLR7cVM8M/i/xiFYlpx8sylMnmQx8T7
-ue+aCqiC2C/Kqt6BMUw8V3BjFb2Kia6+XK0xPZnTXZeue9xSYM/7iZnR4ifC9YCu
-2hueKZQt8P9Vxs6er7uUWIzX8ACqchv5Q/OXxiAKj1C1Nob4bt/7pVcCAwEAAaNj
-MGEwQAYDVR0RBDkwN4IOaWRwLmN5Y2Vyb24uZnKGJWh0dHBzOi8vaWRwLmN5Y2Vy
-b24uZnIvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFKxj+M3a/I4mPX0PFe9L6bjc
-JJ/dMA0GCSqGSIb3DQEBBQUAA4IBAQCJyjOIUeLEjgP0QcF0NImz05xlcNMvIZvF
-i/dPtD02FQ70VLz4IbCWCdkThqXJHALUEkiamXTBTFMl8rCuU3VqHVN3ZkLvAIyv
-cpsCYAlcrrK3jKG0jVNaWcBhEdGDxBT7/n7yHLAbWfgTeKJbEi54Sgbw3bVRFcKh
-w7ZW3ahqeRklkTca9Vn4KPEPcZEdUkatXwtLD1ZsAxAjqBDZY3yxip+KP+GYq4S4
-6ZfbLL4duNYFqUmzZnjnwPKH7gwlQf9J5Dc5tPSXT0F9xN1xzbZExr73GSIlM63I
-stLKk6cKIPPqdpryfUa5CBWcfuxb3foFGuu53LZYPjORDsZhYA2O
-					    </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://idp.cyceron.fr:8443/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.cyceron.fr:8443/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.cyceron.fr:8443/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">cyceron.fr</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDIzCCAgugAwIBAgIUZJvKK5L/LCvXeY1r8fw0trUoarwwDQYJKoZIhvcNAQEF
-BQAwGTEXMBUGA1UEAxMOaWRwLmN5Y2Vyb24uZnIwHhcNMTQwMjE0MTExMTE1WhcN
-MzQwMjE0MTExMTE1WjAZMRcwFQYDVQQDEw5pZHAuY3ljZXJvbi5mcjCCASIwDQYJ
-KoZIhvcNAQEBBQADggEPADCCAQoCggEBALH37gLW5fRWQoGy5KEMNWpao0t2jb3i
-QLtnRqPBL1q8BYL7rjCAfHCi2xxaaBi/Wt+y+YSsqqBXlSx9fCIc9gtVTTmBfVh0
-NaFKBwOpEHRCg0cLePApucYodvIJLpZP9SMdEco5piCOV20Wll1P08h4ZqbV2Mfv
-P6ttEzwKwEfBveuHo20xHQ/F1BNnmMrXaBLR7cVM8M/i/xiFYlpx8sylMnmQx8T7
-ue+aCqiC2C/Kqt6BMUw8V3BjFb2Kia6+XK0xPZnTXZeue9xSYM/7iZnR4ifC9YCu
-2hueKZQt8P9Vxs6er7uUWIzX8ACqchv5Q/OXxiAKj1C1Nob4bt/7pVcCAwEAAaNj
-MGEwQAYDVR0RBDkwN4IOaWRwLmN5Y2Vyb24uZnKGJWh0dHBzOi8vaWRwLmN5Y2Vy
-b24uZnIvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFKxj+M3a/I4mPX0PFe9L6bjc
-JJ/dMA0GCSqGSIb3DQEBBQUAA4IBAQCJyjOIUeLEjgP0QcF0NImz05xlcNMvIZvF
-i/dPtD02FQ70VLz4IbCWCdkThqXJHALUEkiamXTBTFMl8rCuU3VqHVN3ZkLvAIyv
-cpsCYAlcrrK3jKG0jVNaWcBhEdGDxBT7/n7yHLAbWfgTeKJbEi54Sgbw3bVRFcKh
-w7ZW3ahqeRklkTca9Vn4KPEPcZEdUkatXwtLD1ZsAxAjqBDZY3yxip+KP+GYq4S4
-6ZfbLL4duNYFqUmzZnjnwPKH7gwlQf9J5Dc5tPSXT0F9xN1xzbZExr73GSIlM63I
-stLKk6cKIPPqdpryfUa5CBWcfuxb3foFGuu53LZYPjORDsZhYA2O
-					    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.cyceron.fr: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">Cyceron</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Cyceron</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Antoine Nourry</SurName>
-    <EmailAddress>nourry@cyceron.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.dante.net-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.dante.net-idp-shibboleth.xml
deleted file mode 100644
index 69539885..00000000
--- a/swamid-interfederations-2.0/idp.dante.net-idp-shibboleth.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://idp.dante.net/idp/shibboleth">
-  <!--
-		This is a DANTE Shibboleth IdP for Delivery of Advanced Network Technology to Europe Limited.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-01-03T09:32:28Z">
-      <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">dante.net</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">DANTE</mdui:DisplayName>
-        <mdui:Description xml:lang="en">DANTE plans, procures, builds and operates large scale, advanced high speed networks for global research and education.</mdui:Description>
-        <mdui:Logo height="16" width="16">https://idp.dante.net/idp/images/16x16-DANTE.jpg</mdui:Logo>
-        <mdui:Logo height="60" width="80">https://idp.dante.net/idp/images/80x60-DANTE.jpg</mdui:Logo>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DomainHint>dante.net</mdui:DomainHint>
-        <mdui:IPHint>193.63.90.0/24</mdui:IPHint>
-        <mdui:IPHint>2001:630:280::/48</mdui:IPHint>
-        <mdui:GeolocationHint>geo:52.191818,0.133772</mdui:GeolocationHint>
-      </mdui:DiscoHints>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDqjCCApICCQCOEbOuEI0OxzANBgkqhkiG9w0BAQUFADCBljELMAkGA1UEBhMC
-						R0IxFzAVBgNVBAgMDkNhbWJyaWRnZXNoaXJlMRIwEAYDVQQHDAlDYW1icmlkZ2Ux
-						QjBABgNVBAoMOURlbGl2ZXJ5IG9mIEFkdmFuY2VkIE5ldHdvcmsgVGVjaG5vbG9n
-						eSB0byBFdXJvcGUgTGltaXRlZDEWMBQGA1UEAwwNaWRwLmRhbnRlLm5ldDAeFw0x
-						MzEyMjMxMTEzMzlaFw0xNjEyMjIxMTEzMzlaMIGWMQswCQYDVQQGEwJHQjEXMBUG
-						A1UECAwOQ2FtYnJpZGdlc2hpcmUxEjAQBgNVBAcMCUNhbWJyaWRnZTFCMEAGA1UE
-						Cgw5RGVsaXZlcnkgb2YgQWR2YW5jZWQgTmV0d29yayBUZWNobm9sb2d5IHRvIEV1
-						cm9wZSBMaW1pdGVkMRYwFAYDVQQDDA1pZHAuZGFudGUubmV0MIIBIjANBgkqhkiG
-						9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxOW6u4C7wEIQdogPpt/CNjn84HnsdJsadN0s
-						XQQg+SzfJICuxXYGAMDV4k/W9wTGIodOM4Be7O7edGzOdw4RLSJq4vxW5yu4gOuJ
-						yMSYPkEl8nwDOpU4uRTCh2wXE6xe8Eu2eUnXVu+puye4VdKRbQe4Ni1sWgupHO9O
-						+9YWBYkwRN/Gqca9PrPr28nZ+XrX+S/NaSRNwjAHEORgFOUqdcPSztCqq8y2924F
-						dU7PXE6Twh3qx0aEMfKyZGrheuHzSVwb6DC1TMTkY48onXflF84V1CYF9xXbLcSW
-						TZlnzsOW5XbDlQHPEMqFzoyYxfa9zUyd3tNgomu4Ak1t/JO1OQIDAQABMA0GCSqG
-						SIb3DQEBBQUAA4IBAQCTMnPRHLCez8ElwBmqvQaEExeDh4DmPsSnv+M1DdrQ/Da5
-						Bx4xi1lMclBNDMRJ8jTcXDoJAvYkZYAGR1o+doJZrU5dv+JM4QWQsNLVwBJg8gSB
-						ITDrzrpwFUCwVLudO9w/6yDoTbKpyogeMffcGcmiGniKytpI0KK3FhmnFJs+E+0E
-						IA9xqZmnx9NyC2BMTeQqqgKi7wM4Q9oIYk6sbm0a//tsryhXcAjX5GRndGfoKBhY
-						GmwKzvlHvpu3bwazqP56S2ea/AzbBt7s3fsCWTEdWTsCR44JQwvdalxFCvNlEOf6
-						Enuvw8UbosJkAsJVoee8FgQi1WZ/WcIkP0O1hCKz
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.dante.net:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.dante.net:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.dante.net/idp/profile/SAML2/Redirect/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.dante.net/idp/profile/SAML2/POST/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.dante.net: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.dante.net/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.dante.net/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.dante.net/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.dante.net/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="false">dante.net</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDqjCCApICCQCOEbOuEI0OxzANBgkqhkiG9w0BAQUFADCBljELMAkGA1UEBhMC
-						R0IxFzAVBgNVBAgMDkNhbWJyaWRnZXNoaXJlMRIwEAYDVQQHDAlDYW1icmlkZ2Ux
-						QjBABgNVBAoMOURlbGl2ZXJ5IG9mIEFkdmFuY2VkIE5ldHdvcmsgVGVjaG5vbG9n
-						eSB0byBFdXJvcGUgTGltaXRlZDEWMBQGA1UEAwwNaWRwLmRhbnRlLm5ldDAeFw0x
-						MzEyMjMxMTEzMzlaFw0xNjEyMjIxMTEzMzlaMIGWMQswCQYDVQQGEwJHQjEXMBUG
-						A1UECAwOQ2FtYnJpZGdlc2hpcmUxEjAQBgNVBAcMCUNhbWJyaWRnZTFCMEAGA1UE
-						Cgw5RGVsaXZlcnkgb2YgQWR2YW5jZWQgTmV0d29yayBUZWNobm9sb2d5IHRvIEV1
-						cm9wZSBMaW1pdGVkMRYwFAYDVQQDDA1pZHAuZGFudGUubmV0MIIBIjANBgkqhkiG
-						9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxOW6u4C7wEIQdogPpt/CNjn84HnsdJsadN0s
-						XQQg+SzfJICuxXYGAMDV4k/W9wTGIodOM4Be7O7edGzOdw4RLSJq4vxW5yu4gOuJ
-						yMSYPkEl8nwDOpU4uRTCh2wXE6xe8Eu2eUnXVu+puye4VdKRbQe4Ni1sWgupHO9O
-						+9YWBYkwRN/Gqca9PrPr28nZ+XrX+S/NaSRNwjAHEORgFOUqdcPSztCqq8y2924F
-						dU7PXE6Twh3qx0aEMfKyZGrheuHzSVwb6DC1TMTkY48onXflF84V1CYF9xXbLcSW
-						TZlnzsOW5XbDlQHPEMqFzoyYxfa9zUyd3tNgomu4Ak1t/JO1OQIDAQABMA0GCSqG
-						SIb3DQEBBQUAA4IBAQCTMnPRHLCez8ElwBmqvQaEExeDh4DmPsSnv+M1DdrQ/Da5
-						Bx4xi1lMclBNDMRJ8jTcXDoJAvYkZYAGR1o+doJZrU5dv+JM4QWQsNLVwBJg8gSB
-						ITDrzrpwFUCwVLudO9w/6yDoTbKpyogeMffcGcmiGniKytpI0KK3FhmnFJs+E+0E
-						IA9xqZmnx9NyC2BMTeQqqgKi7wM4Q9oIYk6sbm0a//tsryhXcAjX5GRndGfoKBhY
-						GmwKzvlHvpu3bwazqP56S2ea/AzbBt7s3fsCWTEdWTsCR44JQwvdalxFCvNlEOf6
-						Enuvw8UbosJkAsJVoee8FgQi1WZ/WcIkP0O1hCKz
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.dante.net:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.dante.net: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">Delivery of Advanced Network Technology to Europe Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">DANTE</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.dante.net/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>DANTE Support</GivenName>
-    <EmailAddress>mailto:idp-support@dante.net</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>DANTE Support</GivenName>
-    <EmailAddress>mailto:idp-support@dante.net</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.dante.net.xml b/swamid-interfederations-2.0/idp.dante.net.xml
deleted file mode 100644
index 69539885..00000000
--- a/swamid-interfederations-2.0/idp.dante.net.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://idp.dante.net/idp/shibboleth">
-  <!--
-		This is a DANTE Shibboleth IdP for Delivery of Advanced Network Technology to Europe Limited.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-01-03T09:32:28Z">
-      <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">dante.net</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">DANTE</mdui:DisplayName>
-        <mdui:Description xml:lang="en">DANTE plans, procures, builds and operates large scale, advanced high speed networks for global research and education.</mdui:Description>
-        <mdui:Logo height="16" width="16">https://idp.dante.net/idp/images/16x16-DANTE.jpg</mdui:Logo>
-        <mdui:Logo height="60" width="80">https://idp.dante.net/idp/images/80x60-DANTE.jpg</mdui:Logo>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DomainHint>dante.net</mdui:DomainHint>
-        <mdui:IPHint>193.63.90.0/24</mdui:IPHint>
-        <mdui:IPHint>2001:630:280::/48</mdui:IPHint>
-        <mdui:GeolocationHint>geo:52.191818,0.133772</mdui:GeolocationHint>
-      </mdui:DiscoHints>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDqjCCApICCQCOEbOuEI0OxzANBgkqhkiG9w0BAQUFADCBljELMAkGA1UEBhMC
-						R0IxFzAVBgNVBAgMDkNhbWJyaWRnZXNoaXJlMRIwEAYDVQQHDAlDYW1icmlkZ2Ux
-						QjBABgNVBAoMOURlbGl2ZXJ5IG9mIEFkdmFuY2VkIE5ldHdvcmsgVGVjaG5vbG9n
-						eSB0byBFdXJvcGUgTGltaXRlZDEWMBQGA1UEAwwNaWRwLmRhbnRlLm5ldDAeFw0x
-						MzEyMjMxMTEzMzlaFw0xNjEyMjIxMTEzMzlaMIGWMQswCQYDVQQGEwJHQjEXMBUG
-						A1UECAwOQ2FtYnJpZGdlc2hpcmUxEjAQBgNVBAcMCUNhbWJyaWRnZTFCMEAGA1UE
-						Cgw5RGVsaXZlcnkgb2YgQWR2YW5jZWQgTmV0d29yayBUZWNobm9sb2d5IHRvIEV1
-						cm9wZSBMaW1pdGVkMRYwFAYDVQQDDA1pZHAuZGFudGUubmV0MIIBIjANBgkqhkiG
-						9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxOW6u4C7wEIQdogPpt/CNjn84HnsdJsadN0s
-						XQQg+SzfJICuxXYGAMDV4k/W9wTGIodOM4Be7O7edGzOdw4RLSJq4vxW5yu4gOuJ
-						yMSYPkEl8nwDOpU4uRTCh2wXE6xe8Eu2eUnXVu+puye4VdKRbQe4Ni1sWgupHO9O
-						+9YWBYkwRN/Gqca9PrPr28nZ+XrX+S/NaSRNwjAHEORgFOUqdcPSztCqq8y2924F
-						dU7PXE6Twh3qx0aEMfKyZGrheuHzSVwb6DC1TMTkY48onXflF84V1CYF9xXbLcSW
-						TZlnzsOW5XbDlQHPEMqFzoyYxfa9zUyd3tNgomu4Ak1t/JO1OQIDAQABMA0GCSqG
-						SIb3DQEBBQUAA4IBAQCTMnPRHLCez8ElwBmqvQaEExeDh4DmPsSnv+M1DdrQ/Da5
-						Bx4xi1lMclBNDMRJ8jTcXDoJAvYkZYAGR1o+doJZrU5dv+JM4QWQsNLVwBJg8gSB
-						ITDrzrpwFUCwVLudO9w/6yDoTbKpyogeMffcGcmiGniKytpI0KK3FhmnFJs+E+0E
-						IA9xqZmnx9NyC2BMTeQqqgKi7wM4Q9oIYk6sbm0a//tsryhXcAjX5GRndGfoKBhY
-						GmwKzvlHvpu3bwazqP56S2ea/AzbBt7s3fsCWTEdWTsCR44JQwvdalxFCvNlEOf6
-						Enuvw8UbosJkAsJVoee8FgQi1WZ/WcIkP0O1hCKz
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.dante.net:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.dante.net:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.dante.net/idp/profile/SAML2/Redirect/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.dante.net/idp/profile/SAML2/POST/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.dante.net: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.dante.net/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.dante.net/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.dante.net/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.dante.net/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="false">dante.net</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDqjCCApICCQCOEbOuEI0OxzANBgkqhkiG9w0BAQUFADCBljELMAkGA1UEBhMC
-						R0IxFzAVBgNVBAgMDkNhbWJyaWRnZXNoaXJlMRIwEAYDVQQHDAlDYW1icmlkZ2Ux
-						QjBABgNVBAoMOURlbGl2ZXJ5IG9mIEFkdmFuY2VkIE5ldHdvcmsgVGVjaG5vbG9n
-						eSB0byBFdXJvcGUgTGltaXRlZDEWMBQGA1UEAwwNaWRwLmRhbnRlLm5ldDAeFw0x
-						MzEyMjMxMTEzMzlaFw0xNjEyMjIxMTEzMzlaMIGWMQswCQYDVQQGEwJHQjEXMBUG
-						A1UECAwOQ2FtYnJpZGdlc2hpcmUxEjAQBgNVBAcMCUNhbWJyaWRnZTFCMEAGA1UE
-						Cgw5RGVsaXZlcnkgb2YgQWR2YW5jZWQgTmV0d29yayBUZWNobm9sb2d5IHRvIEV1
-						cm9wZSBMaW1pdGVkMRYwFAYDVQQDDA1pZHAuZGFudGUubmV0MIIBIjANBgkqhkiG
-						9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxOW6u4C7wEIQdogPpt/CNjn84HnsdJsadN0s
-						XQQg+SzfJICuxXYGAMDV4k/W9wTGIodOM4Be7O7edGzOdw4RLSJq4vxW5yu4gOuJ
-						yMSYPkEl8nwDOpU4uRTCh2wXE6xe8Eu2eUnXVu+puye4VdKRbQe4Ni1sWgupHO9O
-						+9YWBYkwRN/Gqca9PrPr28nZ+XrX+S/NaSRNwjAHEORgFOUqdcPSztCqq8y2924F
-						dU7PXE6Twh3qx0aEMfKyZGrheuHzSVwb6DC1TMTkY48onXflF84V1CYF9xXbLcSW
-						TZlnzsOW5XbDlQHPEMqFzoyYxfa9zUyd3tNgomu4Ak1t/JO1OQIDAQABMA0GCSqG
-						SIb3DQEBBQUAA4IBAQCTMnPRHLCez8ElwBmqvQaEExeDh4DmPsSnv+M1DdrQ/Da5
-						Bx4xi1lMclBNDMRJ8jTcXDoJAvYkZYAGR1o+doJZrU5dv+JM4QWQsNLVwBJg8gSB
-						ITDrzrpwFUCwVLudO9w/6yDoTbKpyogeMffcGcmiGniKytpI0KK3FhmnFJs+E+0E
-						IA9xqZmnx9NyC2BMTeQqqgKi7wM4Q9oIYk6sbm0a//tsryhXcAjX5GRndGfoKBhY
-						GmwKzvlHvpu3bwazqP56S2ea/AzbBt7s3fsCWTEdWTsCR44JQwvdalxFCvNlEOf6
-						Enuvw8UbosJkAsJVoee8FgQi1WZ/WcIkP0O1hCKz
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.dante.net:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.dante.net: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">Delivery of Advanced Network Technology to Europe Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">DANTE</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.dante.net/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>DANTE Support</GivenName>
-    <EmailAddress>mailto:idp-support@dante.net</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>DANTE Support</GivenName>
-    <EmailAddress>mailto:idp-support@dante.net</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.dfn.de-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.dfn.de-idp-shibboleth.xml
deleted file mode 100644
index 908633c1..00000000
--- a/swamid-interfederations-2.0/idp.dfn.de-idp-shibboleth.xml
+++ /dev/null
@@ -1,159 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.dfn.de/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2009-08-10T13:32:27Z">
-      <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">dfn.de</saml1md:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="de">DFN-Verein Geschäftsstelle</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">DFN Office</mdui:DisplayName>
-        <mdui:Description xml:lang="de">Föderations-Login für MitarbeiterInnen des DFN-Vereins</mdui:Description>
-        <mdui:Description xml:lang="en">Federation login for DFN staff members</mdui:Description>
-        <mdui:Logo height="16" width="16">https://www.aai.dfn.de/fileadmin/pics/dfn_small.png</mdui:Logo>
-        <mdui:Logo height="130" width="236">https://www.aai.dfn.de/fileadmin/pics/dfn_big.png</mdui:Logo>
-        <mdui:InformationURL xml:lang="de">http://www.dfn.de</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">http://www.dfn.de/en/</mdui:InformationURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.dfn.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.dfn.de,OU=Geschaeftsstelle,O=DFN-Verein,L=Berlin,ST=Berlin,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIGmDCCBYCgAwIBAgIHF2OL3fx3djANBgkqhkiG9w0BAQsFADBeMQswCQYDVQQG
-EwJERTETMBEGA1UEChMKREZOLVZlcmVpbjEZMBcGA1UECxMQR2VzY2hhZWZ0c3N0
-ZWxsZTEfMB0GA1UEAxMWREZOLVZlcmVpbi1HUy1DQSAtIEcwMjAeFw0xNDA0MDgx
-NDU3MTdaFw0xODExMzAyMjAwMDBaMHQxCzAJBgNVBAYTAkRFMQ8wDQYDVQQIEwZC
-ZXJsaW4xDzANBgNVBAcTBkJlcmxpbjETMBEGA1UEChMKREZOLVZlcmVpbjEZMBcG
-A1UECxMQR2VzY2hhZWZ0c3N0ZWxsZTETMBEGA1UEAxMKaWRwLmRmbi5kZTCCAiIw
-DQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBANLulBKv3/WE3HhIhXkl+u974zhl
-sQF6VLuZ90e3EDX7jD7Hbb2x9ntefY3whu8rpGKqkP4r6Au9QydnulyRTBg7ss7O
-pEy/hfoTug2QwEZEXRZZgTcxYptkoIUxyoKaZfWxe2/0IFWObSlmNx9jvY3oR1W0
-eVHDCb4FB2NVYoLNaOHLxaOF+pQZKgJnm96emX+JeC/YP9ecdtRi7ZYiFRA2uUXR
-ux0+r3zrYEVmBM7vWu1paHGvGMDpNHG7s+5a33ercMAB31G1MIcgDyXCHiWPuYlj
-p3X3OyYMkL+jGbhJ9Db3ChE9aiG93Lb4Qo5NQuCCcSJs1tz78vkCfJ7tNOBVk5KK
-YJK9i48zwg22+MicX5pPdxllRrEh0Psp6MoVdTNIq8Minyr1BrmdZB9DZBmraMXp
-J6unZoll3KWr2WTlrr43V9QMoFjKjToYEhG+2U1kWeXwK0WM8fTxuUEFvUtqNbEX
-6CAgEFoef/Jf59k2JdTvLvtZZs5DHgWKbH/VR9j8z+91nij8QmPUuBWeuWeyeirt
-UD+G07BSDS7Lebi3OnsumpGPWrxmKWEOHccgGflaRA2pQYCiW8Rv8x7adLcf0sAo
-BDCX7+737ywrDqshRDX5y75tAES6aCm/fARsZKQ4/HiOvx5vNefHElMY3w3YMUKd
-NthdnrYZeKe0WmW1AgMBAAGjggJDMIICPzA5BgNVHSAEMjAwMBEGDysGAQQBga0h
-giwBAQQDATARBg8rBgEEAYGtIYIsAgEEAwEwCAYGZ4EMAQICMAkGA1UdEwQCMAAw
-CwYDVR0PBAQDAgXgMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATAdBgNV
-HQ4EFgQUaWmQ/Clpu7Zdjqw/7viZtheoEiQwHwYDVR0jBBgwFoAUeaJiL87xBjlS
-53ZtYsfem2p1S0kwFQYDVR0RBA4wDIIKaWRwLmRmbi5kZTCBkQYDVR0fBIGJMIGG
-MEGgP6A9hjtodHRwOi8vY2RwMS5wY2EuZGZuLmRlL2Rmbi12ZXJlaW4tZ3MtY2Ev
-cHViL2NybC9nX2NhY3JsLmNybDBBoD+gPYY7aHR0cDovL2NkcDIucGNhLmRmbi5k
-ZS9kZm4tdmVyZWluLWdzLWNhL3B1Yi9jcmwvZ19jYWNybC5jcmwwgd8GCCsGAQUF
-BwEBBIHSMIHPMDMGCCsGAQUFBzABhidodHRwOi8vb2NzcC5wY2EuZGZuLmRlL09D
-U1AtU2VydmVyL09DU1AwSwYIKwYBBQUHMAKGP2h0dHA6Ly9jZHAxLnBjYS5kZm4u
-ZGUvZGZuLXZlcmVpbi1ncy1jYS9wdWIvY2FjZXJ0L2dfY2FjZXJ0LmNydDBLBggr
-BgEFBQcwAoY/aHR0cDovL2NkcDIucGNhLmRmbi5kZS9kZm4tdmVyZWluLWdzLWNh
-L3B1Yi9jYWNlcnQvZ19jYWNlcnQuY3J0MA0GCSqGSIb3DQEBCwUAA4IBAQBhogS0
-luPrkG27IJ+U533cyV407S0PPN2WbiS/i+BqVXJt0JkEz9WP3oFMg5jF3V/R0czH
-2pXqx6sVuRqXUczNCKQ7ayRkQLJJRRKvWBxTk4P3/BivbEmoszIL0m7POge3hZLe
-dH+9WswAHIDwczkPqip77o6kbrjiDeEj8epv8dNBGLnHMHoQuAntnehIb6fr+BF1
-XljtaDnOsSkkwlHPHmsIrjIyHCf5+bAOjvLs9/tOtoR5heDPM3elCSZ0U4+FfGIO
-t19h1FfeHHhQ9zC4DVuQJGVwWD5/ppoQXwA3acoFUdRnwH/ojbx8+plHuxu2Pfz8
-OcCmF2VZ92umABiw
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.dfn.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.dfn.de:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.dfn.de:8443/idp/profile/SAML2/SOAP/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.dfn.de/idp/profile/SAML2/Redirect/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.dfn.de/idp/profile/SAML2/POST/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.dfn.de/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.dfn.de/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.dfn.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.dfn.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">dfn.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.dfn.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.dfn.de,OU=Geschaeftsstelle,O=DFN-Verein,L=Berlin,ST=Berlin,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIGmDCCBYCgAwIBAgIHF2OL3fx3djANBgkqhkiG9w0BAQsFADBeMQswCQYDVQQG
-EwJERTETMBEGA1UEChMKREZOLVZlcmVpbjEZMBcGA1UECxMQR2VzY2hhZWZ0c3N0
-ZWxsZTEfMB0GA1UEAxMWREZOLVZlcmVpbi1HUy1DQSAtIEcwMjAeFw0xNDA0MDgx
-NDU3MTdaFw0xODExMzAyMjAwMDBaMHQxCzAJBgNVBAYTAkRFMQ8wDQYDVQQIEwZC
-ZXJsaW4xDzANBgNVBAcTBkJlcmxpbjETMBEGA1UEChMKREZOLVZlcmVpbjEZMBcG
-A1UECxMQR2VzY2hhZWZ0c3N0ZWxsZTETMBEGA1UEAxMKaWRwLmRmbi5kZTCCAiIw
-DQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBANLulBKv3/WE3HhIhXkl+u974zhl
-sQF6VLuZ90e3EDX7jD7Hbb2x9ntefY3whu8rpGKqkP4r6Au9QydnulyRTBg7ss7O
-pEy/hfoTug2QwEZEXRZZgTcxYptkoIUxyoKaZfWxe2/0IFWObSlmNx9jvY3oR1W0
-eVHDCb4FB2NVYoLNaOHLxaOF+pQZKgJnm96emX+JeC/YP9ecdtRi7ZYiFRA2uUXR
-ux0+r3zrYEVmBM7vWu1paHGvGMDpNHG7s+5a33ercMAB31G1MIcgDyXCHiWPuYlj
-p3X3OyYMkL+jGbhJ9Db3ChE9aiG93Lb4Qo5NQuCCcSJs1tz78vkCfJ7tNOBVk5KK
-YJK9i48zwg22+MicX5pPdxllRrEh0Psp6MoVdTNIq8Minyr1BrmdZB9DZBmraMXp
-J6unZoll3KWr2WTlrr43V9QMoFjKjToYEhG+2U1kWeXwK0WM8fTxuUEFvUtqNbEX
-6CAgEFoef/Jf59k2JdTvLvtZZs5DHgWKbH/VR9j8z+91nij8QmPUuBWeuWeyeirt
-UD+G07BSDS7Lebi3OnsumpGPWrxmKWEOHccgGflaRA2pQYCiW8Rv8x7adLcf0sAo
-BDCX7+737ywrDqshRDX5y75tAES6aCm/fARsZKQ4/HiOvx5vNefHElMY3w3YMUKd
-NthdnrYZeKe0WmW1AgMBAAGjggJDMIICPzA5BgNVHSAEMjAwMBEGDysGAQQBga0h
-giwBAQQDATARBg8rBgEEAYGtIYIsAgEEAwEwCAYGZ4EMAQICMAkGA1UdEwQCMAAw
-CwYDVR0PBAQDAgXgMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATAdBgNV
-HQ4EFgQUaWmQ/Clpu7Zdjqw/7viZtheoEiQwHwYDVR0jBBgwFoAUeaJiL87xBjlS
-53ZtYsfem2p1S0kwFQYDVR0RBA4wDIIKaWRwLmRmbi5kZTCBkQYDVR0fBIGJMIGG
-MEGgP6A9hjtodHRwOi8vY2RwMS5wY2EuZGZuLmRlL2Rmbi12ZXJlaW4tZ3MtY2Ev
-cHViL2NybC9nX2NhY3JsLmNybDBBoD+gPYY7aHR0cDovL2NkcDIucGNhLmRmbi5k
-ZS9kZm4tdmVyZWluLWdzLWNhL3B1Yi9jcmwvZ19jYWNybC5jcmwwgd8GCCsGAQUF
-BwEBBIHSMIHPMDMGCCsGAQUFBzABhidodHRwOi8vb2NzcC5wY2EuZGZuLmRlL09D
-U1AtU2VydmVyL09DU1AwSwYIKwYBBQUHMAKGP2h0dHA6Ly9jZHAxLnBjYS5kZm4u
-ZGUvZGZuLXZlcmVpbi1ncy1jYS9wdWIvY2FjZXJ0L2dfY2FjZXJ0LmNydDBLBggr
-BgEFBQcwAoY/aHR0cDovL2NkcDIucGNhLmRmbi5kZS9kZm4tdmVyZWluLWdzLWNh
-L3B1Yi9jYWNlcnQvZ19jYWNlcnQuY3J0MA0GCSqGSIb3DQEBCwUAA4IBAQBhogS0
-luPrkG27IJ+U533cyV407S0PPN2WbiS/i+BqVXJt0JkEz9WP3oFMg5jF3V/R0czH
-2pXqx6sVuRqXUczNCKQ7ayRkQLJJRRKvWBxTk4P3/BivbEmoszIL0m7POge3hZLe
-dH+9WswAHIDwczkPqip77o6kbrjiDeEj8epv8dNBGLnHMHoQuAntnehIb6fr+BF1
-XljtaDnOsSkkwlHPHmsIrjIyHCf5+bAOjvLs9/tOtoR5heDPM3elCSZ0U4+FfGIO
-t19h1FfeHHhQ9zC4DVuQJGVwWD5/ppoQXwA3acoFUdRnwH/ojbx8+plHuxu2Pfz8
-OcCmF2VZ92umABiw
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.dfn.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.dfn.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">e15</OrganizationName>
-    <OrganizationName xml:lang="en">e15</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">Verein zur Förderung eines Deutschen Forschungsnetzes</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="administrative">
-    <GivenName>Ulrich</GivenName>
-    <SurName>Kähler</SurName>
-    <EmailAddress>mailto:kaehler@dfn.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Raoul</GivenName>
-    <SurName>Borenius</SurName>
-    <EmailAddress>mailto:hotline@aai.dfn.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="support">
-    <GivenName>DFN-AAI</GivenName>
-    <SurName>Hotline</SurName>
-    <EmailAddress>mailto:hotline@aai.dfn.de</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.dfn.de.xml b/swamid-interfederations-2.0/idp.dfn.de.xml
deleted file mode 100644
index 908633c1..00000000
--- a/swamid-interfederations-2.0/idp.dfn.de.xml
+++ /dev/null
@@ -1,159 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.dfn.de/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2009-08-10T13:32:27Z">
-      <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">dfn.de</saml1md:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="de">DFN-Verein Geschäftsstelle</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">DFN Office</mdui:DisplayName>
-        <mdui:Description xml:lang="de">Föderations-Login für MitarbeiterInnen des DFN-Vereins</mdui:Description>
-        <mdui:Description xml:lang="en">Federation login for DFN staff members</mdui:Description>
-        <mdui:Logo height="16" width="16">https://www.aai.dfn.de/fileadmin/pics/dfn_small.png</mdui:Logo>
-        <mdui:Logo height="130" width="236">https://www.aai.dfn.de/fileadmin/pics/dfn_big.png</mdui:Logo>
-        <mdui:InformationURL xml:lang="de">http://www.dfn.de</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">http://www.dfn.de/en/</mdui:InformationURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.dfn.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.dfn.de,OU=Geschaeftsstelle,O=DFN-Verein,L=Berlin,ST=Berlin,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIGmDCCBYCgAwIBAgIHF2OL3fx3djANBgkqhkiG9w0BAQsFADBeMQswCQYDVQQG
-EwJERTETMBEGA1UEChMKREZOLVZlcmVpbjEZMBcGA1UECxMQR2VzY2hhZWZ0c3N0
-ZWxsZTEfMB0GA1UEAxMWREZOLVZlcmVpbi1HUy1DQSAtIEcwMjAeFw0xNDA0MDgx
-NDU3MTdaFw0xODExMzAyMjAwMDBaMHQxCzAJBgNVBAYTAkRFMQ8wDQYDVQQIEwZC
-ZXJsaW4xDzANBgNVBAcTBkJlcmxpbjETMBEGA1UEChMKREZOLVZlcmVpbjEZMBcG
-A1UECxMQR2VzY2hhZWZ0c3N0ZWxsZTETMBEGA1UEAxMKaWRwLmRmbi5kZTCCAiIw
-DQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBANLulBKv3/WE3HhIhXkl+u974zhl
-sQF6VLuZ90e3EDX7jD7Hbb2x9ntefY3whu8rpGKqkP4r6Au9QydnulyRTBg7ss7O
-pEy/hfoTug2QwEZEXRZZgTcxYptkoIUxyoKaZfWxe2/0IFWObSlmNx9jvY3oR1W0
-eVHDCb4FB2NVYoLNaOHLxaOF+pQZKgJnm96emX+JeC/YP9ecdtRi7ZYiFRA2uUXR
-ux0+r3zrYEVmBM7vWu1paHGvGMDpNHG7s+5a33ercMAB31G1MIcgDyXCHiWPuYlj
-p3X3OyYMkL+jGbhJ9Db3ChE9aiG93Lb4Qo5NQuCCcSJs1tz78vkCfJ7tNOBVk5KK
-YJK9i48zwg22+MicX5pPdxllRrEh0Psp6MoVdTNIq8Minyr1BrmdZB9DZBmraMXp
-J6unZoll3KWr2WTlrr43V9QMoFjKjToYEhG+2U1kWeXwK0WM8fTxuUEFvUtqNbEX
-6CAgEFoef/Jf59k2JdTvLvtZZs5DHgWKbH/VR9j8z+91nij8QmPUuBWeuWeyeirt
-UD+G07BSDS7Lebi3OnsumpGPWrxmKWEOHccgGflaRA2pQYCiW8Rv8x7adLcf0sAo
-BDCX7+737ywrDqshRDX5y75tAES6aCm/fARsZKQ4/HiOvx5vNefHElMY3w3YMUKd
-NthdnrYZeKe0WmW1AgMBAAGjggJDMIICPzA5BgNVHSAEMjAwMBEGDysGAQQBga0h
-giwBAQQDATARBg8rBgEEAYGtIYIsAgEEAwEwCAYGZ4EMAQICMAkGA1UdEwQCMAAw
-CwYDVR0PBAQDAgXgMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATAdBgNV
-HQ4EFgQUaWmQ/Clpu7Zdjqw/7viZtheoEiQwHwYDVR0jBBgwFoAUeaJiL87xBjlS
-53ZtYsfem2p1S0kwFQYDVR0RBA4wDIIKaWRwLmRmbi5kZTCBkQYDVR0fBIGJMIGG
-MEGgP6A9hjtodHRwOi8vY2RwMS5wY2EuZGZuLmRlL2Rmbi12ZXJlaW4tZ3MtY2Ev
-cHViL2NybC9nX2NhY3JsLmNybDBBoD+gPYY7aHR0cDovL2NkcDIucGNhLmRmbi5k
-ZS9kZm4tdmVyZWluLWdzLWNhL3B1Yi9jcmwvZ19jYWNybC5jcmwwgd8GCCsGAQUF
-BwEBBIHSMIHPMDMGCCsGAQUFBzABhidodHRwOi8vb2NzcC5wY2EuZGZuLmRlL09D
-U1AtU2VydmVyL09DU1AwSwYIKwYBBQUHMAKGP2h0dHA6Ly9jZHAxLnBjYS5kZm4u
-ZGUvZGZuLXZlcmVpbi1ncy1jYS9wdWIvY2FjZXJ0L2dfY2FjZXJ0LmNydDBLBggr
-BgEFBQcwAoY/aHR0cDovL2NkcDIucGNhLmRmbi5kZS9kZm4tdmVyZWluLWdzLWNh
-L3B1Yi9jYWNlcnQvZ19jYWNlcnQuY3J0MA0GCSqGSIb3DQEBCwUAA4IBAQBhogS0
-luPrkG27IJ+U533cyV407S0PPN2WbiS/i+BqVXJt0JkEz9WP3oFMg5jF3V/R0czH
-2pXqx6sVuRqXUczNCKQ7ayRkQLJJRRKvWBxTk4P3/BivbEmoszIL0m7POge3hZLe
-dH+9WswAHIDwczkPqip77o6kbrjiDeEj8epv8dNBGLnHMHoQuAntnehIb6fr+BF1
-XljtaDnOsSkkwlHPHmsIrjIyHCf5+bAOjvLs9/tOtoR5heDPM3elCSZ0U4+FfGIO
-t19h1FfeHHhQ9zC4DVuQJGVwWD5/ppoQXwA3acoFUdRnwH/ojbx8+plHuxu2Pfz8
-OcCmF2VZ92umABiw
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.dfn.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.dfn.de:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.dfn.de:8443/idp/profile/SAML2/SOAP/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.dfn.de/idp/profile/SAML2/Redirect/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.dfn.de/idp/profile/SAML2/POST/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.dfn.de/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.dfn.de/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.dfn.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.dfn.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">dfn.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.dfn.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.dfn.de,OU=Geschaeftsstelle,O=DFN-Verein,L=Berlin,ST=Berlin,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIGmDCCBYCgAwIBAgIHF2OL3fx3djANBgkqhkiG9w0BAQsFADBeMQswCQYDVQQG
-EwJERTETMBEGA1UEChMKREZOLVZlcmVpbjEZMBcGA1UECxMQR2VzY2hhZWZ0c3N0
-ZWxsZTEfMB0GA1UEAxMWREZOLVZlcmVpbi1HUy1DQSAtIEcwMjAeFw0xNDA0MDgx
-NDU3MTdaFw0xODExMzAyMjAwMDBaMHQxCzAJBgNVBAYTAkRFMQ8wDQYDVQQIEwZC
-ZXJsaW4xDzANBgNVBAcTBkJlcmxpbjETMBEGA1UEChMKREZOLVZlcmVpbjEZMBcG
-A1UECxMQR2VzY2hhZWZ0c3N0ZWxsZTETMBEGA1UEAxMKaWRwLmRmbi5kZTCCAiIw
-DQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBANLulBKv3/WE3HhIhXkl+u974zhl
-sQF6VLuZ90e3EDX7jD7Hbb2x9ntefY3whu8rpGKqkP4r6Au9QydnulyRTBg7ss7O
-pEy/hfoTug2QwEZEXRZZgTcxYptkoIUxyoKaZfWxe2/0IFWObSlmNx9jvY3oR1W0
-eVHDCb4FB2NVYoLNaOHLxaOF+pQZKgJnm96emX+JeC/YP9ecdtRi7ZYiFRA2uUXR
-ux0+r3zrYEVmBM7vWu1paHGvGMDpNHG7s+5a33ercMAB31G1MIcgDyXCHiWPuYlj
-p3X3OyYMkL+jGbhJ9Db3ChE9aiG93Lb4Qo5NQuCCcSJs1tz78vkCfJ7tNOBVk5KK
-YJK9i48zwg22+MicX5pPdxllRrEh0Psp6MoVdTNIq8Minyr1BrmdZB9DZBmraMXp
-J6unZoll3KWr2WTlrr43V9QMoFjKjToYEhG+2U1kWeXwK0WM8fTxuUEFvUtqNbEX
-6CAgEFoef/Jf59k2JdTvLvtZZs5DHgWKbH/VR9j8z+91nij8QmPUuBWeuWeyeirt
-UD+G07BSDS7Lebi3OnsumpGPWrxmKWEOHccgGflaRA2pQYCiW8Rv8x7adLcf0sAo
-BDCX7+737ywrDqshRDX5y75tAES6aCm/fARsZKQ4/HiOvx5vNefHElMY3w3YMUKd
-NthdnrYZeKe0WmW1AgMBAAGjggJDMIICPzA5BgNVHSAEMjAwMBEGDysGAQQBga0h
-giwBAQQDATARBg8rBgEEAYGtIYIsAgEEAwEwCAYGZ4EMAQICMAkGA1UdEwQCMAAw
-CwYDVR0PBAQDAgXgMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATAdBgNV
-HQ4EFgQUaWmQ/Clpu7Zdjqw/7viZtheoEiQwHwYDVR0jBBgwFoAUeaJiL87xBjlS
-53ZtYsfem2p1S0kwFQYDVR0RBA4wDIIKaWRwLmRmbi5kZTCBkQYDVR0fBIGJMIGG
-MEGgP6A9hjtodHRwOi8vY2RwMS5wY2EuZGZuLmRlL2Rmbi12ZXJlaW4tZ3MtY2Ev
-cHViL2NybC9nX2NhY3JsLmNybDBBoD+gPYY7aHR0cDovL2NkcDIucGNhLmRmbi5k
-ZS9kZm4tdmVyZWluLWdzLWNhL3B1Yi9jcmwvZ19jYWNybC5jcmwwgd8GCCsGAQUF
-BwEBBIHSMIHPMDMGCCsGAQUFBzABhidodHRwOi8vb2NzcC5wY2EuZGZuLmRlL09D
-U1AtU2VydmVyL09DU1AwSwYIKwYBBQUHMAKGP2h0dHA6Ly9jZHAxLnBjYS5kZm4u
-ZGUvZGZuLXZlcmVpbi1ncy1jYS9wdWIvY2FjZXJ0L2dfY2FjZXJ0LmNydDBLBggr
-BgEFBQcwAoY/aHR0cDovL2NkcDIucGNhLmRmbi5kZS9kZm4tdmVyZWluLWdzLWNh
-L3B1Yi9jYWNlcnQvZ19jYWNlcnQuY3J0MA0GCSqGSIb3DQEBCwUAA4IBAQBhogS0
-luPrkG27IJ+U533cyV407S0PPN2WbiS/i+BqVXJt0JkEz9WP3oFMg5jF3V/R0czH
-2pXqx6sVuRqXUczNCKQ7ayRkQLJJRRKvWBxTk4P3/BivbEmoszIL0m7POge3hZLe
-dH+9WswAHIDwczkPqip77o6kbrjiDeEj8epv8dNBGLnHMHoQuAntnehIb6fr+BF1
-XljtaDnOsSkkwlHPHmsIrjIyHCf5+bAOjvLs9/tOtoR5heDPM3elCSZ0U4+FfGIO
-t19h1FfeHHhQ9zC4DVuQJGVwWD5/ppoQXwA3acoFUdRnwH/ojbx8+plHuxu2Pfz8
-OcCmF2VZ92umABiw
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.dfn.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.dfn.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">e15</OrganizationName>
-    <OrganizationName xml:lang="en">e15</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">Verein zur Förderung eines Deutschen Forschungsnetzes</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="administrative">
-    <GivenName>Ulrich</GivenName>
-    <SurName>Kähler</SurName>
-    <EmailAddress>mailto:kaehler@dfn.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Raoul</GivenName>
-    <SurName>Borenius</SurName>
-    <EmailAddress>mailto:hotline@aai.dfn.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="support">
-    <GivenName>DFN-AAI</GivenName>
-    <SurName>Hotline</SurName>
-    <EmailAddress>mailto:hotline@aai.dfn.de</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.dias.ie-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.dias.ie-idp-shibboleth.xml
deleted file mode 100644
index c47e9e84..00000000
--- a/swamid-interfederations-2.0/idp.dias.ie-idp-shibboleth.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.dias.ie/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.heanet.ie" registrationInstant="2013-11-15T00:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://www.edugate.ie/welcome-edugate-federation/membership</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </md:Extensions>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">dias.ie</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Dublin Institute for Advanced Studies</mdui:DisplayName>
-        <mdui:InformationURL xml:lang="en">http://www.dias.ie</mdui:InformationURL>
-        <mdui:Logo height="112" width="136">https://edugate.heanet.ie/rr3/logos/dias_logo.png</mdui:Logo>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDFzCCAf+gAwIBAgIUD82Rv6ZhMvwGESzIOJRkEtryOk4wDQYJKoZIhvcNAQEF
-BQAwFjEUMBIGA1UEAxMLaWRwLmRpYXMuaWUwHhcNMTMxMTE1MTAxODExWhcNMzMx
-MTE1MTAxODExWjAWMRQwEgYDVQQDEwtpZHAuZGlhcy5pZTCCASIwDQYJKoZIhvcN
-AQEBBQADggEPADCCAQoCggEBAINbJEvXC7qeIqXcCt3l6qrIw7ckk6FIy/rBBbO0
-0HkzFWd6JsOO3QZ8ymRgVeap9N1SycxIuox63M8sa89KwNVXAvNyDfrbvmbqIxzJ
-T5RmHl4ISgrsQubAWJ7eNiqVXiMvQe+e2A7iPpplPJYGqhvG/TB6F/4QDfGO+G9/
-tK+EdCvntS8wEy/s0UrDVOo+upvJnypzNJLcavfZWWwfjzR57Rcx48jTlRjZRe0R
-4/2rWS5yAJ8UhjBksoGD36ZHIpc1GFI5JeSNbGA7V501qhhjK9X09A+/NAlLGIj3
-s2ZJPfNGMPaY6Uc7u6sfEvwUJoz8kUnIV7Ac8HNw/d8Joi8CAwEAAaNdMFswOgYD
-VR0RBDMwMYILaWRwLmRpYXMuaWWGImh0dHBzOi8vaWRwLmRpYXMuaWUvaWRwL3No
-aWJib2xldGgwHQYDVR0OBBYEFJ8KCzRdsORXHfsuXHNeCrKqR4owMA0GCSqGSIb3
-DQEBBQUAA4IBAQBPyzwZNTdiO9/RRp0f8hBqP0rOsO7mueuDbGvZoCPUEYiBkYiG
-zYB2DHkcfAYQls/vuI7DiuLWQC5COLsoDVgAW59VBrRKTRwpIjktvTM3C2aexomw
-GW7M9XqyiTdArQb3Inyl8Jca4HiniDEorh7OqjGEIakT4cIj8Vfu43b+E0L28otA
-GphiaINCWGdfHDfbsuc6fLoJp4WzSQHxGQEkkHE/XO6zWQLXPNuO9eU3MWwqw+or
-LlHiaoyxj0hM9NnJIllv1huBF7CHL4EadiizxS/nK2mx0vZgJVvQAOG6Kir3lbME
-h8KMdglIpPQmLF1/JtTN3QNn8SZmE7iel3kB
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.dias.ie/idp/profile/Logout"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.dias.ie/idp/profile/Logout"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.dias.ie/idp/profile/Logout"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://idp.dias.ie/idp/profile/Logout"/>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.dias.ie/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.dias.ie/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.dias.ie/idp/profile/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.dias.ie/idp/profile/SAML2/SOAP/ECP"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Dublin Institute for Advanced Studies</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Dublin Institute for Advanced Studies</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.dias.ie</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Jean Francois</md:GivenName>
-    <md:SurName>Bucas</md:SurName>
-    <md:EmailAddress>jfbucas@stp.dias.ie</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Jean Francois</md:GivenName>
-    <md:SurName>Bucas</md:SurName>
-    <md:EmailAddress>jfbucas@stp.dias.ie</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Jean Francois</md:GivenName>
-    <md:SurName>Bucas</md:SurName>
-    <md:EmailAddress>jfbucas@stp.dias.ie</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.dias.ie.xml b/swamid-interfederations-2.0/idp.dias.ie.xml
deleted file mode 100644
index c47e9e84..00000000
--- a/swamid-interfederations-2.0/idp.dias.ie.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.dias.ie/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.heanet.ie" registrationInstant="2013-11-15T00:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://www.edugate.ie/welcome-edugate-federation/membership</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </md:Extensions>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">dias.ie</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Dublin Institute for Advanced Studies</mdui:DisplayName>
-        <mdui:InformationURL xml:lang="en">http://www.dias.ie</mdui:InformationURL>
-        <mdui:Logo height="112" width="136">https://edugate.heanet.ie/rr3/logos/dias_logo.png</mdui:Logo>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDFzCCAf+gAwIBAgIUD82Rv6ZhMvwGESzIOJRkEtryOk4wDQYJKoZIhvcNAQEF
-BQAwFjEUMBIGA1UEAxMLaWRwLmRpYXMuaWUwHhcNMTMxMTE1MTAxODExWhcNMzMx
-MTE1MTAxODExWjAWMRQwEgYDVQQDEwtpZHAuZGlhcy5pZTCCASIwDQYJKoZIhvcN
-AQEBBQADggEPADCCAQoCggEBAINbJEvXC7qeIqXcCt3l6qrIw7ckk6FIy/rBBbO0
-0HkzFWd6JsOO3QZ8ymRgVeap9N1SycxIuox63M8sa89KwNVXAvNyDfrbvmbqIxzJ
-T5RmHl4ISgrsQubAWJ7eNiqVXiMvQe+e2A7iPpplPJYGqhvG/TB6F/4QDfGO+G9/
-tK+EdCvntS8wEy/s0UrDVOo+upvJnypzNJLcavfZWWwfjzR57Rcx48jTlRjZRe0R
-4/2rWS5yAJ8UhjBksoGD36ZHIpc1GFI5JeSNbGA7V501qhhjK9X09A+/NAlLGIj3
-s2ZJPfNGMPaY6Uc7u6sfEvwUJoz8kUnIV7Ac8HNw/d8Joi8CAwEAAaNdMFswOgYD
-VR0RBDMwMYILaWRwLmRpYXMuaWWGImh0dHBzOi8vaWRwLmRpYXMuaWUvaWRwL3No
-aWJib2xldGgwHQYDVR0OBBYEFJ8KCzRdsORXHfsuXHNeCrKqR4owMA0GCSqGSIb3
-DQEBBQUAA4IBAQBPyzwZNTdiO9/RRp0f8hBqP0rOsO7mueuDbGvZoCPUEYiBkYiG
-zYB2DHkcfAYQls/vuI7DiuLWQC5COLsoDVgAW59VBrRKTRwpIjktvTM3C2aexomw
-GW7M9XqyiTdArQb3Inyl8Jca4HiniDEorh7OqjGEIakT4cIj8Vfu43b+E0L28otA
-GphiaINCWGdfHDfbsuc6fLoJp4WzSQHxGQEkkHE/XO6zWQLXPNuO9eU3MWwqw+or
-LlHiaoyxj0hM9NnJIllv1huBF7CHL4EadiizxS/nK2mx0vZgJVvQAOG6Kir3lbME
-h8KMdglIpPQmLF1/JtTN3QNn8SZmE7iel3kB
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.dias.ie/idp/profile/Logout"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.dias.ie/idp/profile/Logout"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.dias.ie/idp/profile/Logout"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://idp.dias.ie/idp/profile/Logout"/>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.dias.ie/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.dias.ie/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.dias.ie/idp/profile/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.dias.ie/idp/profile/SAML2/SOAP/ECP"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Dublin Institute for Advanced Studies</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Dublin Institute for Advanced Studies</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.dias.ie</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Jean Francois</md:GivenName>
-    <md:SurName>Bucas</md:SurName>
-    <md:EmailAddress>jfbucas@stp.dias.ie</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Jean Francois</md:GivenName>
-    <md:SurName>Bucas</md:SurName>
-    <md:EmailAddress>jfbucas@stp.dias.ie</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Jean Francois</md:GivenName>
-    <md:SurName>Bucas</md:SurName>
-    <md:EmailAddress>jfbucas@stp.dias.ie</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.dijon.iufm.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.dijon.iufm.fr-idp-shibboleth.xml
deleted file mode 100644
index a39a1a02..00000000
--- a/swamid-interfederations-2.0/idp.dijon.iufm.fr-idp-shibboleth.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.dijon.iufm.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2013-01-28T12:03:39Z">
-      <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">dijon.iufm.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">ESPE de Bourgogne - Dpt MEEF</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDMDCCAhigAwIBAgIVAPJxU6vXRtyZ2B8/iZhhakdOe/SBMA0GCSqGSIb3DQEB
-BQUAMBwxGjAYBgNVBAMTEWRpcC5kaWpvbi5pdWZtLmZyMB4XDTEyMTAzMTA5MDYz
-OVoXDTMyMTAzMTA5MDYzOVowHDEaMBgGA1UEAxMRZGlwLmRpam9uLml1Zm0uZnIw
-ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDQ2TDr3Xoz5TBEKdyL3ZSS
-oWgPsLaId+qegB3aYnBcLK9/Oge/K8WThAVVAUSX7A/FyFrZdeQBR9HpUqaOb2p3
-UE0MHs0w3h80vQ3btvM4ag6ZxakEZh066VxgSb6bRAD4G1kmwDUbXl/Hm+pypx7O
-kndJYVDWke+M8Y9Hqvjl9F0ZLH58HPwtCwN3Gg9IGfbiSMtvLLZoHfifSc6O2m0R
-kHDGg4LMqbhNoFo2Z9VTwqV/7dd2qy+4+11C0Sd9v9vzdRCB5MawK40ARyhhwwFE
-WoqxXKmndbh+rnvCDZadM0jT3A9QuUm6/PVVhaXnMXGAlm97EWtP+CL8/AdFCm3f
-AgMBAAGjaTBnMEYGA1UdEQQ/MD2CEWRpcC5kaWpvbi5pdWZtLmZyhihodHRwczov
-L2RpcC5kaWpvbi5pdWZtLmZyL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBT1MxRC
-yvoAAjqWbajuVCCe5OQ2OjANBgkqhkiG9w0BAQUFAAOCAQEAiewYRJ5OUQoPEThR
-5JKesIDaeCUz9QoGBsRPUVGudb2FiuKp+iKVLPXZ9CuRidg6ZDk0ejXQjThk/Xaz
-scNJ39+zbOBNqE+v7XhYsCLSG/3DhrfTWz4XosuqKojH9ZwXsBhQqB1Rk/Vebr50
-IUHP0I8OQKilNbv7IYx3eduXIVAicsVOW5DaWYZBQJ2zFa+9we5ZBMeZ/Lq6DkGC
-YpPfDGEAblTPzFEiMw7TlhPvLehjCzmBggW8fG061FZ8J2rBeOzBlTNBRMqekUaf
-V5IHw211pa1xInH+EzE4//vuvfemALnv0wPbbvUbroFeb/qqwNMZP22D9p2r+s9J
-27C2qA==
-					    </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://idp.dijon.iufm.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.dijon.iufm.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.dijon.iufm.fr/idp/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">ESPE de Bourgogne - Dpt MEEF</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">ESPE de Bourgogne - Dpt MEEF</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Bourdin Jean-Michel</SurName>
-    <EmailAddress>jean-michel.bourdin@dijon.iufm.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.dijon.iufm.fr.xml b/swamid-interfederations-2.0/idp.dijon.iufm.fr.xml
deleted file mode 100644
index a39a1a02..00000000
--- a/swamid-interfederations-2.0/idp.dijon.iufm.fr.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.dijon.iufm.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2013-01-28T12:03:39Z">
-      <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">dijon.iufm.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">ESPE de Bourgogne - Dpt MEEF</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDMDCCAhigAwIBAgIVAPJxU6vXRtyZ2B8/iZhhakdOe/SBMA0GCSqGSIb3DQEB
-BQUAMBwxGjAYBgNVBAMTEWRpcC5kaWpvbi5pdWZtLmZyMB4XDTEyMTAzMTA5MDYz
-OVoXDTMyMTAzMTA5MDYzOVowHDEaMBgGA1UEAxMRZGlwLmRpam9uLml1Zm0uZnIw
-ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDQ2TDr3Xoz5TBEKdyL3ZSS
-oWgPsLaId+qegB3aYnBcLK9/Oge/K8WThAVVAUSX7A/FyFrZdeQBR9HpUqaOb2p3
-UE0MHs0w3h80vQ3btvM4ag6ZxakEZh066VxgSb6bRAD4G1kmwDUbXl/Hm+pypx7O
-kndJYVDWke+M8Y9Hqvjl9F0ZLH58HPwtCwN3Gg9IGfbiSMtvLLZoHfifSc6O2m0R
-kHDGg4LMqbhNoFo2Z9VTwqV/7dd2qy+4+11C0Sd9v9vzdRCB5MawK40ARyhhwwFE
-WoqxXKmndbh+rnvCDZadM0jT3A9QuUm6/PVVhaXnMXGAlm97EWtP+CL8/AdFCm3f
-AgMBAAGjaTBnMEYGA1UdEQQ/MD2CEWRpcC5kaWpvbi5pdWZtLmZyhihodHRwczov
-L2RpcC5kaWpvbi5pdWZtLmZyL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBT1MxRC
-yvoAAjqWbajuVCCe5OQ2OjANBgkqhkiG9w0BAQUFAAOCAQEAiewYRJ5OUQoPEThR
-5JKesIDaeCUz9QoGBsRPUVGudb2FiuKp+iKVLPXZ9CuRidg6ZDk0ejXQjThk/Xaz
-scNJ39+zbOBNqE+v7XhYsCLSG/3DhrfTWz4XosuqKojH9ZwXsBhQqB1Rk/Vebr50
-IUHP0I8OQKilNbv7IYx3eduXIVAicsVOW5DaWYZBQJ2zFa+9we5ZBMeZ/Lq6DkGC
-YpPfDGEAblTPzFEiMw7TlhPvLehjCzmBggW8fG061FZ8J2rBeOzBlTNBRMqekUaf
-V5IHw211pa1xInH+EzE4//vuvfemALnv0wPbbvUbroFeb/qqwNMZP22D9p2r+s9J
-27C2qA==
-					    </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://idp.dijon.iufm.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.dijon.iufm.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.dijon.iufm.fr/idp/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">ESPE de Bourgogne - Dpt MEEF</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">ESPE de Bourgogne - Dpt MEEF</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Bourdin Jean-Michel</SurName>
-    <EmailAddress>jean-michel.bourdin@dijon.iufm.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.dir.garr.it-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.dir.garr.it-idp-shibboleth.xml
deleted file mode 100644
index 1bfe5d13..00000000
--- a/swamid-interfederations-2.0/idp.dir.garr.it-idp-shibboleth.xml
+++ /dev/null
@@ -1,101 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" entityID="https://idp.dir.garr.it/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2010-09-30T15:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</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">garr.it</shibmd:Scope>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="en">GARR IdP</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Identity Provider for GARR staff</mdui:Description>
-        <mdui:InformationURL xml:lang="en">https://login.dir.garr.it/IdPSupportPage/index.html</mdui:InformationURL>
-        <mdui:DisplayName xml:lang="it">GARR IdP</mdui:DisplayName>
-        <mdui:Description xml:lang="it">Identity Provider per il personale GARR</mdui:Description>
-        <mdui:InformationURL xml:lang="it">https://login.dir.garr.it/IdPSupportPage/index.html</mdui:InformationURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDJzCCAg+gAwIBAgIUMJUKlH8ou/Aqe5RpN9dGZSep/CQwDQYJKoZIhvcNAQEF
-BQAwGjEYMBYGA1UEAxMPaWRwLmRpci5nYXJyLml0MB4XDTExMTEyMTEwNDY1NloX
-DTMxMTEyMTEwNDY1NlowGjEYMBYGA1UEAxMPaWRwLmRpci5nYXJyLml0MIIBIjAN
-BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtQSmT31kE2g6itpnCjcLrFBCUL04
-LsMioxbBFbCFsMn3vgHOubmhpwuNOUBYhl8MkSIGjoAcYCbDc4hDSucQMSx1fgvF
-X/S2QfJr7Bu6mNxzt9RqMoXWnuqkKKZYZw+DjITqzZp3g2+lB3i3b9x1jOh4AhSe
-OoWoVyXx/x+EQS9WJ55GEw/fKi70GtrrKI5wu4D/z+bigZG5TOg3A3o197mLt0ns
-jwSd51WdtbZ+AccwyTOyQgFCqwRxszQEvqIt2wyNYt0AOcYi2jRUlpc2jnikytXN
-9hsNZPT0Y9Yuxi5IVRxSIkdeIs9eGOxrJqxg6FWwIdFHpNyF9MVjx4eZewIDAQAB
-o2UwYzBCBgNVHREEOzA5gg9pZHAuZGlyLmdhcnIuaXSGJmh0dHBzOi8vaWRwLmRp
-ci5nYXJyLml0L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBRybtrE0ndZvt7hHlAA
-+e035msGLzANBgkqhkiG9w0BAQUFAAOCAQEAWFusaIXa/wOcsEEvKRA83mFVulM/
-R0lA/D+Zm0LH1SxVEprX7/Iv001U1M5c6ySFWHgR6v7CIHHVpNF+aMr1kNw4U2wc
-XMWli2Htykpd8sgrjx7Eg4+3WITxupXwxbvxU86orNntPcJCASVcDVbrBReC6mZ2
-lxawzxIGWbSVbKo24lUcklBeoMKiG8Itw2/ouzjcmdw3defNBMlZ9akWdFSK1z58
-pm4pftMyNdlh91nMxDa0caZ8+7fZcTPs0bFQdivu3vdL1+OcwlAmcloilD54xfiV
-5vGMEoxK1AfQhXgis+ZYJ2VRydbeSS0gEohRmR/53LIOjBfZ6VnKy71yew==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.dir.garr.it:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.dir.garr.it: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.dir.garr.it/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.dir.garr.it/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.dir.garr.it/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.dir.garr.it/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">garr.it</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDJzCCAg+gAwIBAgIUMJUKlH8ou/Aqe5RpN9dGZSep/CQwDQYJKoZIhvcNAQEF
-BQAwGjEYMBYGA1UEAxMPaWRwLmRpci5nYXJyLml0MB4XDTExMTEyMTEwNDY1NloX
-DTMxMTEyMTEwNDY1NlowGjEYMBYGA1UEAxMPaWRwLmRpci5nYXJyLml0MIIBIjAN
-BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtQSmT31kE2g6itpnCjcLrFBCUL04
-LsMioxbBFbCFsMn3vgHOubmhpwuNOUBYhl8MkSIGjoAcYCbDc4hDSucQMSx1fgvF
-X/S2QfJr7Bu6mNxzt9RqMoXWnuqkKKZYZw+DjITqzZp3g2+lB3i3b9x1jOh4AhSe
-OoWoVyXx/x+EQS9WJ55GEw/fKi70GtrrKI5wu4D/z+bigZG5TOg3A3o197mLt0ns
-jwSd51WdtbZ+AccwyTOyQgFCqwRxszQEvqIt2wyNYt0AOcYi2jRUlpc2jnikytXN
-9hsNZPT0Y9Yuxi5IVRxSIkdeIs9eGOxrJqxg6FWwIdFHpNyF9MVjx4eZewIDAQAB
-o2UwYzBCBgNVHREEOzA5gg9pZHAuZGlyLmdhcnIuaXSGJmh0dHBzOi8vaWRwLmRp
-ci5nYXJyLml0L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBRybtrE0ndZvt7hHlAA
-+e035msGLzANBgkqhkiG9w0BAQUFAAOCAQEAWFusaIXa/wOcsEEvKRA83mFVulM/
-R0lA/D+Zm0LH1SxVEprX7/Iv001U1M5c6ySFWHgR6v7CIHHVpNF+aMr1kNw4U2wc
-XMWli2Htykpd8sgrjx7Eg4+3WITxupXwxbvxU86orNntPcJCASVcDVbrBReC6mZ2
-lxawzxIGWbSVbKo24lUcklBeoMKiG8Itw2/ouzjcmdw3defNBMlZ9akWdFSK1z58
-pm4pftMyNdlh91nMxDa0caZ8+7fZcTPs0bFQdivu3vdL1+OcwlAmcloilD54xfiV
-5vGMEoxK1AfQhXgis+ZYJ2VRydbeSS0gEohRmR/53LIOjBfZ6VnKy71yew==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.dir.garr.it:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.dir.garr.it: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">GARR</OrganizationName>
-    <OrganizationName xml:lang="it">GARR</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">GARR</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="it">GARR</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.garr.it/b/eng</OrganizationURL>
-    <OrganizationURL xml:lang="it">http://www.garr.it</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <EmailAddress>
-                system.support@garr.it
-            </EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.dir.garr.it.xml b/swamid-interfederations-2.0/idp.dir.garr.it.xml
deleted file mode 100644
index 1bfe5d13..00000000
--- a/swamid-interfederations-2.0/idp.dir.garr.it.xml
+++ /dev/null
@@ -1,101 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" entityID="https://idp.dir.garr.it/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2010-09-30T15:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</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">garr.it</shibmd:Scope>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="en">GARR IdP</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Identity Provider for GARR staff</mdui:Description>
-        <mdui:InformationURL xml:lang="en">https://login.dir.garr.it/IdPSupportPage/index.html</mdui:InformationURL>
-        <mdui:DisplayName xml:lang="it">GARR IdP</mdui:DisplayName>
-        <mdui:Description xml:lang="it">Identity Provider per il personale GARR</mdui:Description>
-        <mdui:InformationURL xml:lang="it">https://login.dir.garr.it/IdPSupportPage/index.html</mdui:InformationURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDJzCCAg+gAwIBAgIUMJUKlH8ou/Aqe5RpN9dGZSep/CQwDQYJKoZIhvcNAQEF
-BQAwGjEYMBYGA1UEAxMPaWRwLmRpci5nYXJyLml0MB4XDTExMTEyMTEwNDY1NloX
-DTMxMTEyMTEwNDY1NlowGjEYMBYGA1UEAxMPaWRwLmRpci5nYXJyLml0MIIBIjAN
-BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtQSmT31kE2g6itpnCjcLrFBCUL04
-LsMioxbBFbCFsMn3vgHOubmhpwuNOUBYhl8MkSIGjoAcYCbDc4hDSucQMSx1fgvF
-X/S2QfJr7Bu6mNxzt9RqMoXWnuqkKKZYZw+DjITqzZp3g2+lB3i3b9x1jOh4AhSe
-OoWoVyXx/x+EQS9WJ55GEw/fKi70GtrrKI5wu4D/z+bigZG5TOg3A3o197mLt0ns
-jwSd51WdtbZ+AccwyTOyQgFCqwRxszQEvqIt2wyNYt0AOcYi2jRUlpc2jnikytXN
-9hsNZPT0Y9Yuxi5IVRxSIkdeIs9eGOxrJqxg6FWwIdFHpNyF9MVjx4eZewIDAQAB
-o2UwYzBCBgNVHREEOzA5gg9pZHAuZGlyLmdhcnIuaXSGJmh0dHBzOi8vaWRwLmRp
-ci5nYXJyLml0L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBRybtrE0ndZvt7hHlAA
-+e035msGLzANBgkqhkiG9w0BAQUFAAOCAQEAWFusaIXa/wOcsEEvKRA83mFVulM/
-R0lA/D+Zm0LH1SxVEprX7/Iv001U1M5c6ySFWHgR6v7CIHHVpNF+aMr1kNw4U2wc
-XMWli2Htykpd8sgrjx7Eg4+3WITxupXwxbvxU86orNntPcJCASVcDVbrBReC6mZ2
-lxawzxIGWbSVbKo24lUcklBeoMKiG8Itw2/ouzjcmdw3defNBMlZ9akWdFSK1z58
-pm4pftMyNdlh91nMxDa0caZ8+7fZcTPs0bFQdivu3vdL1+OcwlAmcloilD54xfiV
-5vGMEoxK1AfQhXgis+ZYJ2VRydbeSS0gEohRmR/53LIOjBfZ6VnKy71yew==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.dir.garr.it:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.dir.garr.it: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.dir.garr.it/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.dir.garr.it/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.dir.garr.it/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.dir.garr.it/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">garr.it</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDJzCCAg+gAwIBAgIUMJUKlH8ou/Aqe5RpN9dGZSep/CQwDQYJKoZIhvcNAQEF
-BQAwGjEYMBYGA1UEAxMPaWRwLmRpci5nYXJyLml0MB4XDTExMTEyMTEwNDY1NloX
-DTMxMTEyMTEwNDY1NlowGjEYMBYGA1UEAxMPaWRwLmRpci5nYXJyLml0MIIBIjAN
-BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtQSmT31kE2g6itpnCjcLrFBCUL04
-LsMioxbBFbCFsMn3vgHOubmhpwuNOUBYhl8MkSIGjoAcYCbDc4hDSucQMSx1fgvF
-X/S2QfJr7Bu6mNxzt9RqMoXWnuqkKKZYZw+DjITqzZp3g2+lB3i3b9x1jOh4AhSe
-OoWoVyXx/x+EQS9WJ55GEw/fKi70GtrrKI5wu4D/z+bigZG5TOg3A3o197mLt0ns
-jwSd51WdtbZ+AccwyTOyQgFCqwRxszQEvqIt2wyNYt0AOcYi2jRUlpc2jnikytXN
-9hsNZPT0Y9Yuxi5IVRxSIkdeIs9eGOxrJqxg6FWwIdFHpNyF9MVjx4eZewIDAQAB
-o2UwYzBCBgNVHREEOzA5gg9pZHAuZGlyLmdhcnIuaXSGJmh0dHBzOi8vaWRwLmRp
-ci5nYXJyLml0L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBRybtrE0ndZvt7hHlAA
-+e035msGLzANBgkqhkiG9w0BAQUFAAOCAQEAWFusaIXa/wOcsEEvKRA83mFVulM/
-R0lA/D+Zm0LH1SxVEprX7/Iv001U1M5c6ySFWHgR6v7CIHHVpNF+aMr1kNw4U2wc
-XMWli2Htykpd8sgrjx7Eg4+3WITxupXwxbvxU86orNntPcJCASVcDVbrBReC6mZ2
-lxawzxIGWbSVbKo24lUcklBeoMKiG8Itw2/ouzjcmdw3defNBMlZ9akWdFSK1z58
-pm4pftMyNdlh91nMxDa0caZ8+7fZcTPs0bFQdivu3vdL1+OcwlAmcloilD54xfiV
-5vGMEoxK1AfQhXgis+ZYJ2VRydbeSS0gEohRmR/53LIOjBfZ6VnKy71yew==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.dir.garr.it:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.dir.garr.it: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">GARR</OrganizationName>
-    <OrganizationName xml:lang="it">GARR</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">GARR</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="it">GARR</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.garr.it/b/eng</OrganizationURL>
-    <OrganizationURL xml:lang="it">http://www.garr.it</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <EmailAddress>
-                system.support@garr.it
-            </EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.dit.ie-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.dit.ie-idp-shibboleth.xml
deleted file mode 100644
index f0cb69c9..00000000
--- a/swamid-interfederations-2.0/idp.dit.ie-idp-shibboleth.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.dit.ie/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.heanet.ie" registrationInstant="2010-10-07T00:00:00Z"/>
-  </md:Extensions>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">dit.ie</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Dublin Institute of Technology</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="ga">Institiúid Teicneolaíochta Bhaile Atha Cliath</mdui:DisplayName>
-        <mdui:InformationURL xml:lang="en">http://www.dit.ie</mdui:InformationURL>
-        <mdui:Logo height="124" width="124">https://edugate.heanet.ie/rr3/logos/dit.png</mdui:Logo>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:GeolocationHint>geo:53.3386922370051,-6.266900897026062</mdui:GeolocationHint>
-      </mdui:DiscoHints>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDFDCCAfygAwIBAgIVAJ7TJcMtAwNtz/8vec1TyPtNeUveMA0GCSqGSIb3DQEB
-BQUAMBUxEzARBgNVBAMTCmlkcC5kaXQuaWUwHhcNMTAwNjIyMTExNTAwWhcNMzAw
-NjIyMTExNTAwWjAVMRMwEQYDVQQDEwppZHAuZGl0LmllMIIBIjANBgkqhkiG9w0B
-AQEFAAOCAQ8AMIIBCgKCAQEAs8xgb2mE8WJaUYR0fVcH8dEAS7f7bGWpyzrT+SPa
-v5egAD27fcuhUP+QFILf6plDW6YqXBcbymxHE1yPExVYO84v8lfpULEMbii1wRg+
-z/ywHqZ1Bio+aq8OrcCdjrlR84n3fpR/6aaVr21JbwVPR6+sCuc4+q3opXzaGGFa
-LvTT3hcl5C/cGiJQra81rlv9Q1dWwZh6xvmR5wrqzxkKiyJ8mr1KjuePyJV3BOJJ
-zeaki3SYdkB+xM8gO6P19lXkvsVYnkUWVR79E61mFReUWPzr9Bjub0A/aE2Pwzuq
-ZWPedEsVR4NfTZANVhewKCNFDadRDbRFDDRW9W2Lc2v3rwIDAQABo1swWTA4BgNV
-HREEMTAvggppZHAuZGl0LmllhiFodHRwczovL2lkcC5kaXQuaWUvaWRwL3NoaWJi
-b2xldGgwHQYDVR0OBBYEFF6EGb7A7x+2xLW/hEJHpulkdzkYMA0GCSqGSIb3DQEB
-BQUAA4IBAQA2kPu6oYpbBoldko99FX4ePbXa9ty11/I+EamddnzkAsLWsNd2JLQW
-R9wo+2vSkUzaxck11FMBS5hbqNsKdUjqTtscGP2MfmIiQJG+dgN7ThHKVvaxyTpc
-3JPQIvaew08s7L8ShjCuhkjmYmlOa4olGV1Z0aG7SjSI9b5w3MfDwN2lecAAUKVW
-N2vAFMBh3uxWVlSDbivRfNXflXOMYtDqAG1BPHff1UMArvYiSxxiVwM5tNBxmgZy
-N8bWLtABtkfUyrU6ay6E7h6qReHu30iU46r8xDyZkHjLa6iakvGjobWlTBTAF24P
-mANH8mJhMI+endx1YgUmOJJXylP/VAbC
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.dit.ie/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.dit.ie/idp/profile/SAML2/POST/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Dublin Institute of Technology</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Dublin Institute of Technology</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.dit.ie</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Liam</md:GivenName>
-    <md:SurName>Duffy</md:SurName>
-    <md:EmailAddress>liam.duffy@dit.ie</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:SurName>NOC</md:SurName>
-    <md:EmailAddress>noc@dit.ie</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Tracey</md:GivenName>
-    <md:SurName>Roche</md:SurName>
-    <md:EmailAddress>tracey.roche@dit.ie</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.dit.ie.xml b/swamid-interfederations-2.0/idp.dit.ie.xml
deleted file mode 100644
index f0cb69c9..00000000
--- a/swamid-interfederations-2.0/idp.dit.ie.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.dit.ie/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.heanet.ie" registrationInstant="2010-10-07T00:00:00Z"/>
-  </md:Extensions>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">dit.ie</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Dublin Institute of Technology</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="ga">Institiúid Teicneolaíochta Bhaile Atha Cliath</mdui:DisplayName>
-        <mdui:InformationURL xml:lang="en">http://www.dit.ie</mdui:InformationURL>
-        <mdui:Logo height="124" width="124">https://edugate.heanet.ie/rr3/logos/dit.png</mdui:Logo>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:GeolocationHint>geo:53.3386922370051,-6.266900897026062</mdui:GeolocationHint>
-      </mdui:DiscoHints>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDFDCCAfygAwIBAgIVAJ7TJcMtAwNtz/8vec1TyPtNeUveMA0GCSqGSIb3DQEB
-BQUAMBUxEzARBgNVBAMTCmlkcC5kaXQuaWUwHhcNMTAwNjIyMTExNTAwWhcNMzAw
-NjIyMTExNTAwWjAVMRMwEQYDVQQDEwppZHAuZGl0LmllMIIBIjANBgkqhkiG9w0B
-AQEFAAOCAQ8AMIIBCgKCAQEAs8xgb2mE8WJaUYR0fVcH8dEAS7f7bGWpyzrT+SPa
-v5egAD27fcuhUP+QFILf6plDW6YqXBcbymxHE1yPExVYO84v8lfpULEMbii1wRg+
-z/ywHqZ1Bio+aq8OrcCdjrlR84n3fpR/6aaVr21JbwVPR6+sCuc4+q3opXzaGGFa
-LvTT3hcl5C/cGiJQra81rlv9Q1dWwZh6xvmR5wrqzxkKiyJ8mr1KjuePyJV3BOJJ
-zeaki3SYdkB+xM8gO6P19lXkvsVYnkUWVR79E61mFReUWPzr9Bjub0A/aE2Pwzuq
-ZWPedEsVR4NfTZANVhewKCNFDadRDbRFDDRW9W2Lc2v3rwIDAQABo1swWTA4BgNV
-HREEMTAvggppZHAuZGl0LmllhiFodHRwczovL2lkcC5kaXQuaWUvaWRwL3NoaWJi
-b2xldGgwHQYDVR0OBBYEFF6EGb7A7x+2xLW/hEJHpulkdzkYMA0GCSqGSIb3DQEB
-BQUAA4IBAQA2kPu6oYpbBoldko99FX4ePbXa9ty11/I+EamddnzkAsLWsNd2JLQW
-R9wo+2vSkUzaxck11FMBS5hbqNsKdUjqTtscGP2MfmIiQJG+dgN7ThHKVvaxyTpc
-3JPQIvaew08s7L8ShjCuhkjmYmlOa4olGV1Z0aG7SjSI9b5w3MfDwN2lecAAUKVW
-N2vAFMBh3uxWVlSDbivRfNXflXOMYtDqAG1BPHff1UMArvYiSxxiVwM5tNBxmgZy
-N8bWLtABtkfUyrU6ay6E7h6qReHu30iU46r8xDyZkHjLa6iakvGjobWlTBTAF24P
-mANH8mJhMI+endx1YgUmOJJXylP/VAbC
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.dit.ie/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.dit.ie/idp/profile/SAML2/POST/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Dublin Institute of Technology</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Dublin Institute of Technology</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.dit.ie</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Liam</md:GivenName>
-    <md:SurName>Duffy</md:SurName>
-    <md:EmailAddress>liam.duffy@dit.ie</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:SurName>NOC</md:SurName>
-    <md:EmailAddress>noc@dit.ie</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Tracey</md:GivenName>
-    <md:SurName>Roche</md:SurName>
-    <md:EmailAddress>tracey.roche@dit.ie</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.dkit.ie-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.dkit.ie-idp-shibboleth.xml
deleted file mode 100644
index 87194afa..00000000
--- a/swamid-interfederations-2.0/idp.dkit.ie-idp-shibboleth.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="https://idp.dkit.ie/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.heanet.ie" registrationInstant="2010-11-09T00:00:00Z"/>
-  </md:Extensions>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">dkit.ie</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Dundalk Institute of Technology</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="ga">Institiúid Teicneolaíochta Dhún Dealgan</mdui:DisplayName>
-        <mdui:InformationURL xml:lang="en">http://www.dkit.ie</mdui:InformationURL>
-        <mdui:Logo height="98" width="155">https://edugate.heanet.ie/rr3/logos/dkit.png</mdui:Logo>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:GeolocationHint>geo:53.984667,-6.394150</mdui:GeolocationHint>
-      </mdui:DiscoHints>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDFzCCAf+gAwIBAgIUXWnVlumk2ydwS9DRW7Xoxc2vfvcwDQYJKoZIhvcNAQEF
-BQAwFjEUMBIGA1UEAxMLaWRwLmRraXQuaWUwHhcNMDkwODExMTAyNTQ3WhcNMjkw
-ODExMTAyNTQ3WjAWMRQwEgYDVQQDEwtpZHAuZGtpdC5pZTCCASIwDQYJKoZIhvcN
-AQEBBQADggEPADCCAQoCggEBANkYoFuj1yxD2P68jA2zsEtokAAUExRcur1pdVIF
-3iTS3l/vifRLxstc0IVniaOcWvBxWcLKLueZeBMTuWsyePGz5BhecXzs2u6alYZW
-ITUxJTE0jxZ+WfpPQqnWsysa4rIzksw9l7sbccSz7qvZPLFlwdprrU1rMAMqAcXv
-hYg5iJLRPfRHMN9piFrlibi0RM+u9QPj8/KqJnYVjDZ1+oMeVArEdLk787YlMp79
-GaiKbP6u1cJ3FIgtnWmtph4XWhdMNoh3VBVIo30LnxANGSotMEo+pz/UphUarBjF
-wUzy8vyJdF5+L/Lh/3q6JKVIViC064jQe+PsSJYG0R3ynVcCAwEAAaNdMFswOgYD
-VR0RBDMwMYILaWRwLmRraXQuaWWGImh0dHBzOi8vaWRwLmRraXQuaWUvaWRwL3No
-aWJib2xldGgwHQYDVR0OBBYEFHrvvvBubZqHTcyxZa3VdPhPDWX3MA0GCSqGSIb3
-DQEBBQUAA4IBAQAPn2bTK88XJI8cyWVVRvKXQuNTwIY3KLE+dRs+6EGeF46Ipzfn
-fGIF1je7IrsIUAIKs+8KBWoCwoOp0Nasilib/F90OK6NwEXNKqGdwZXQxJLdvOK7
-yHOXKS+J27t05krcLbutSwcNdnOVEdWbtOz7+/qbx2CSxbrOIDSgTcVDwn/wqm7G
-QW48Aoz0QReQV0oYglj3D9zNUfpnshQqcv45i9+toGTLTdkQfFm/4DUMEWQXM/IE
-+hxh2RRIl0wE/qVYfd5hahptuNWfhjSbTtUB4iPaY18z1TMG3JfgQvtKszQeHRa9
-LKIUf4wMQHssUFNv5TXV1zu1W4f9ctYYLexH
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.dkit.ie/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Dundalk Institute of Technology</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Dundalk Institute of Technology</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.dkit.ie</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Andrew</md:GivenName>
-    <md:SurName>Clarke</md:SurName>
-    <md:EmailAddress>andrew.clarke@dkit.ie</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Paul</md:GivenName>
-    <md:SurName>Scollon</md:SurName>
-    <md:EmailAddress>paul.scollon@dkit.ie</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.dkit.ie.xml b/swamid-interfederations-2.0/idp.dkit.ie.xml
deleted file mode 100644
index 87194afa..00000000
--- a/swamid-interfederations-2.0/idp.dkit.ie.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="https://idp.dkit.ie/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.heanet.ie" registrationInstant="2010-11-09T00:00:00Z"/>
-  </md:Extensions>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">dkit.ie</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Dundalk Institute of Technology</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="ga">Institiúid Teicneolaíochta Dhún Dealgan</mdui:DisplayName>
-        <mdui:InformationURL xml:lang="en">http://www.dkit.ie</mdui:InformationURL>
-        <mdui:Logo height="98" width="155">https://edugate.heanet.ie/rr3/logos/dkit.png</mdui:Logo>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:GeolocationHint>geo:53.984667,-6.394150</mdui:GeolocationHint>
-      </mdui:DiscoHints>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDFzCCAf+gAwIBAgIUXWnVlumk2ydwS9DRW7Xoxc2vfvcwDQYJKoZIhvcNAQEF
-BQAwFjEUMBIGA1UEAxMLaWRwLmRraXQuaWUwHhcNMDkwODExMTAyNTQ3WhcNMjkw
-ODExMTAyNTQ3WjAWMRQwEgYDVQQDEwtpZHAuZGtpdC5pZTCCASIwDQYJKoZIhvcN
-AQEBBQADggEPADCCAQoCggEBANkYoFuj1yxD2P68jA2zsEtokAAUExRcur1pdVIF
-3iTS3l/vifRLxstc0IVniaOcWvBxWcLKLueZeBMTuWsyePGz5BhecXzs2u6alYZW
-ITUxJTE0jxZ+WfpPQqnWsysa4rIzksw9l7sbccSz7qvZPLFlwdprrU1rMAMqAcXv
-hYg5iJLRPfRHMN9piFrlibi0RM+u9QPj8/KqJnYVjDZ1+oMeVArEdLk787YlMp79
-GaiKbP6u1cJ3FIgtnWmtph4XWhdMNoh3VBVIo30LnxANGSotMEo+pz/UphUarBjF
-wUzy8vyJdF5+L/Lh/3q6JKVIViC064jQe+PsSJYG0R3ynVcCAwEAAaNdMFswOgYD
-VR0RBDMwMYILaWRwLmRraXQuaWWGImh0dHBzOi8vaWRwLmRraXQuaWUvaWRwL3No
-aWJib2xldGgwHQYDVR0OBBYEFHrvvvBubZqHTcyxZa3VdPhPDWX3MA0GCSqGSIb3
-DQEBBQUAA4IBAQAPn2bTK88XJI8cyWVVRvKXQuNTwIY3KLE+dRs+6EGeF46Ipzfn
-fGIF1je7IrsIUAIKs+8KBWoCwoOp0Nasilib/F90OK6NwEXNKqGdwZXQxJLdvOK7
-yHOXKS+J27t05krcLbutSwcNdnOVEdWbtOz7+/qbx2CSxbrOIDSgTcVDwn/wqm7G
-QW48Aoz0QReQV0oYglj3D9zNUfpnshQqcv45i9+toGTLTdkQfFm/4DUMEWQXM/IE
-+hxh2RRIl0wE/qVYfd5hahptuNWfhjSbTtUB4iPaY18z1TMG3JfgQvtKszQeHRa9
-LKIUf4wMQHssUFNv5TXV1zu1W4f9ctYYLexH
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.dkit.ie/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Dundalk Institute of Technology</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Dundalk Institute of Technology</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.dkit.ie</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Andrew</md:GivenName>
-    <md:SurName>Clarke</md:SurName>
-    <md:EmailAddress>andrew.clarke@dkit.ie</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Paul</md:GivenName>
-    <md:SurName>Scollon</md:SurName>
-    <md:EmailAddress>paul.scollon@dkit.ie</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.ebi.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.ebi.ac.uk-idp-shibboleth.xml
deleted file mode 100644
index 768a0e01..00000000
--- a/swamid-interfederations-2.0/idp.ebi.ac.uk-idp-shibboleth.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="https://idp.ebi.ac.uk/idp/shibboleth">
-  <!--
-		This is a Shibboleth EMBL-EBI IdP for the European Molecular Biology Laboratory.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-09-04T10:43:30Z">
-      <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">ebi.ac.uk</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">European Molecular Biology Laboratory - EBI</mdui:DisplayName>
-        <mdui:Logo height="30" width="95">https://idp.ebi.ac.uk/images/EMBL_EBI_logo_95x30.png</mdui:Logo>
-        <mdui:Logo height="16" width="16">https://idp.ebi.ac.uk/images/EMBL_EBI_icon_16x16.png</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDHzCCAgegAwIBAgIUWQaCmO3/wgoyUm1kMsbfovSvHTcwDQYJKoZIhvcNAQEF
-						BQAwGDEWMBQGA1UEAxMNaWRwLmViaS5hYy51azAeFw0xMjAzMjIxNzE4NTVaFw0z
-						MjAzMjIxNzE4NTVaMBgxFjAUBgNVBAMTDWlkcC5lYmkuYWMudWswggEiMA0GCSqG
-						SIb3DQEBAQUAA4IBDwAwggEKAoIBAQCMiq+DPwgvEvXHVvsqsWViCDVZv/q+qWZf
-						AAFse/KaiA0HPbdailVUaFg/s3ce4elzfWpEbHBoeb+SIVkQPNwmtpVgix92H7dj
-						0YEkYBiSvTDTp54b76yKjFKOpWGGYis+pWY8D8WwWeHce+nHxrCOHB0oCHageY1j
-						bONXdq3AI4153yWAX62za7/F7bdOM+RuDzCj+ezqzRJEk2pP49ZFsaAbVbLfFMqt
-						IgCEclMephDqXLM8MlgP3KIzaq9PhSC4vXS3xxKTbMfRqT+Dzgt1pZvY3jY2T702
-						i99SOhame/gdYXiILCD2XjKnjZhFSNMfvy/FfQDCpx++yFTXEFZzAgMBAAGjYTBf
-						MD4GA1UdEQQ3MDWCDWlkcC5lYmkuYWMudWuGJGh0dHBzOi8vaWRwLmViaS5hYy51
-						ay9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUdskpfLSwe6x0/paoWOMdXjPcSZ4w
-						DQYJKoZIhvcNAQEFBQADggEBAA7P/MO6GYM8Qev0usgkT58VRk1uRQMqFUc+cGUP
-						QEhjFILRIwlAKyQzT5hg6wMRdFcgbye5NSDx23GCL3UqqoNpMmZ/wd/cSNuwd/TZ
-						ZDLn4NCFoBv/MbHzKwQPa0E4lD5eiPtwtm3SlRqfSCAL/FMK2RC5DtmKKVPIzBoN
-						XjfN5xEXaK1Fqt+IcN1iKY7gEs115CL5oeing5GRNtUpW2/FGPKy2OYFhmIQs93n
-						xDj3eBfFJMqdPg8M/NzlVInJNekNUhBnfSMA15q8OUd02msz0euhp0hZeA90XAuV
-						TswW9HqCAz4FI9WefVN4dcmt6/h29ZZTyHBqC8AhQpJlvuc=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ebi.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ebi.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.ebi.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ebi.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.ebi.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ebi.ac.uk/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="false">ebi.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDHzCCAgegAwIBAgIUWQaCmO3/wgoyUm1kMsbfovSvHTcwDQYJKoZIhvcNAQEF
-						BQAwGDEWMBQGA1UEAxMNaWRwLmViaS5hYy51azAeFw0xMjAzMjIxNzE4NTVaFw0z
-						MjAzMjIxNzE4NTVaMBgxFjAUBgNVBAMTDWlkcC5lYmkuYWMudWswggEiMA0GCSqG
-						SIb3DQEBAQUAA4IBDwAwggEKAoIBAQCMiq+DPwgvEvXHVvsqsWViCDVZv/q+qWZf
-						AAFse/KaiA0HPbdailVUaFg/s3ce4elzfWpEbHBoeb+SIVkQPNwmtpVgix92H7dj
-						0YEkYBiSvTDTp54b76yKjFKOpWGGYis+pWY8D8WwWeHce+nHxrCOHB0oCHageY1j
-						bONXdq3AI4153yWAX62za7/F7bdOM+RuDzCj+ezqzRJEk2pP49ZFsaAbVbLfFMqt
-						IgCEclMephDqXLM8MlgP3KIzaq9PhSC4vXS3xxKTbMfRqT+Dzgt1pZvY3jY2T702
-						i99SOhame/gdYXiILCD2XjKnjZhFSNMfvy/FfQDCpx++yFTXEFZzAgMBAAGjYTBf
-						MD4GA1UdEQQ3MDWCDWlkcC5lYmkuYWMudWuGJGh0dHBzOi8vaWRwLmViaS5hYy51
-						ay9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUdskpfLSwe6x0/paoWOMdXjPcSZ4w
-						DQYJKoZIhvcNAQEFBQADggEBAA7P/MO6GYM8Qev0usgkT58VRk1uRQMqFUc+cGUP
-						QEhjFILRIwlAKyQzT5hg6wMRdFcgbye5NSDx23GCL3UqqoNpMmZ/wd/cSNuwd/TZ
-						ZDLn4NCFoBv/MbHzKwQPa0E4lD5eiPtwtm3SlRqfSCAL/FMK2RC5DtmKKVPIzBoN
-						XjfN5xEXaK1Fqt+IcN1iKY7gEs115CL5oeing5GRNtUpW2/FGPKy2OYFhmIQs93n
-						xDj3eBfFJMqdPg8M/NzlVInJNekNUhBnfSMA15q8OUd02msz0euhp0hZeA90XAuV
-						TswW9HqCAz4FI9WefVN4dcmt6/h29ZZTyHBqC8AhQpJlvuc=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ebi.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ebi.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">European Molecular Biology Laboratory</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">European Molecular Biology Laboratory - EBI</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.ebi.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Jenny</GivenName>
-    <SurName>Martin</SurName>
-    <EmailAddress>mailto:jenny@ebi.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Jenny</GivenName>
-    <SurName>Martin</SurName>
-    <EmailAddress>mailto:jenny@ebi.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.ebi.ac.uk.xml b/swamid-interfederations-2.0/idp.ebi.ac.uk.xml
deleted file mode 100644
index 768a0e01..00000000
--- a/swamid-interfederations-2.0/idp.ebi.ac.uk.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="https://idp.ebi.ac.uk/idp/shibboleth">
-  <!--
-		This is a Shibboleth EMBL-EBI IdP for the European Molecular Biology Laboratory.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-09-04T10:43:30Z">
-      <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">ebi.ac.uk</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">European Molecular Biology Laboratory - EBI</mdui:DisplayName>
-        <mdui:Logo height="30" width="95">https://idp.ebi.ac.uk/images/EMBL_EBI_logo_95x30.png</mdui:Logo>
-        <mdui:Logo height="16" width="16">https://idp.ebi.ac.uk/images/EMBL_EBI_icon_16x16.png</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDHzCCAgegAwIBAgIUWQaCmO3/wgoyUm1kMsbfovSvHTcwDQYJKoZIhvcNAQEF
-						BQAwGDEWMBQGA1UEAxMNaWRwLmViaS5hYy51azAeFw0xMjAzMjIxNzE4NTVaFw0z
-						MjAzMjIxNzE4NTVaMBgxFjAUBgNVBAMTDWlkcC5lYmkuYWMudWswggEiMA0GCSqG
-						SIb3DQEBAQUAA4IBDwAwggEKAoIBAQCMiq+DPwgvEvXHVvsqsWViCDVZv/q+qWZf
-						AAFse/KaiA0HPbdailVUaFg/s3ce4elzfWpEbHBoeb+SIVkQPNwmtpVgix92H7dj
-						0YEkYBiSvTDTp54b76yKjFKOpWGGYis+pWY8D8WwWeHce+nHxrCOHB0oCHageY1j
-						bONXdq3AI4153yWAX62za7/F7bdOM+RuDzCj+ezqzRJEk2pP49ZFsaAbVbLfFMqt
-						IgCEclMephDqXLM8MlgP3KIzaq9PhSC4vXS3xxKTbMfRqT+Dzgt1pZvY3jY2T702
-						i99SOhame/gdYXiILCD2XjKnjZhFSNMfvy/FfQDCpx++yFTXEFZzAgMBAAGjYTBf
-						MD4GA1UdEQQ3MDWCDWlkcC5lYmkuYWMudWuGJGh0dHBzOi8vaWRwLmViaS5hYy51
-						ay9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUdskpfLSwe6x0/paoWOMdXjPcSZ4w
-						DQYJKoZIhvcNAQEFBQADggEBAA7P/MO6GYM8Qev0usgkT58VRk1uRQMqFUc+cGUP
-						QEhjFILRIwlAKyQzT5hg6wMRdFcgbye5NSDx23GCL3UqqoNpMmZ/wd/cSNuwd/TZ
-						ZDLn4NCFoBv/MbHzKwQPa0E4lD5eiPtwtm3SlRqfSCAL/FMK2RC5DtmKKVPIzBoN
-						XjfN5xEXaK1Fqt+IcN1iKY7gEs115CL5oeing5GRNtUpW2/FGPKy2OYFhmIQs93n
-						xDj3eBfFJMqdPg8M/NzlVInJNekNUhBnfSMA15q8OUd02msz0euhp0hZeA90XAuV
-						TswW9HqCAz4FI9WefVN4dcmt6/h29ZZTyHBqC8AhQpJlvuc=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ebi.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ebi.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.ebi.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ebi.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.ebi.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ebi.ac.uk/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="false">ebi.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDHzCCAgegAwIBAgIUWQaCmO3/wgoyUm1kMsbfovSvHTcwDQYJKoZIhvcNAQEF
-						BQAwGDEWMBQGA1UEAxMNaWRwLmViaS5hYy51azAeFw0xMjAzMjIxNzE4NTVaFw0z
-						MjAzMjIxNzE4NTVaMBgxFjAUBgNVBAMTDWlkcC5lYmkuYWMudWswggEiMA0GCSqG
-						SIb3DQEBAQUAA4IBDwAwggEKAoIBAQCMiq+DPwgvEvXHVvsqsWViCDVZv/q+qWZf
-						AAFse/KaiA0HPbdailVUaFg/s3ce4elzfWpEbHBoeb+SIVkQPNwmtpVgix92H7dj
-						0YEkYBiSvTDTp54b76yKjFKOpWGGYis+pWY8D8WwWeHce+nHxrCOHB0oCHageY1j
-						bONXdq3AI4153yWAX62za7/F7bdOM+RuDzCj+ezqzRJEk2pP49ZFsaAbVbLfFMqt
-						IgCEclMephDqXLM8MlgP3KIzaq9PhSC4vXS3xxKTbMfRqT+Dzgt1pZvY3jY2T702
-						i99SOhame/gdYXiILCD2XjKnjZhFSNMfvy/FfQDCpx++yFTXEFZzAgMBAAGjYTBf
-						MD4GA1UdEQQ3MDWCDWlkcC5lYmkuYWMudWuGJGh0dHBzOi8vaWRwLmViaS5hYy51
-						ay9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUdskpfLSwe6x0/paoWOMdXjPcSZ4w
-						DQYJKoZIhvcNAQEFBQADggEBAA7P/MO6GYM8Qev0usgkT58VRk1uRQMqFUc+cGUP
-						QEhjFILRIwlAKyQzT5hg6wMRdFcgbye5NSDx23GCL3UqqoNpMmZ/wd/cSNuwd/TZ
-						ZDLn4NCFoBv/MbHzKwQPa0E4lD5eiPtwtm3SlRqfSCAL/FMK2RC5DtmKKVPIzBoN
-						XjfN5xEXaK1Fqt+IcN1iKY7gEs115CL5oeing5GRNtUpW2/FGPKy2OYFhmIQs93n
-						xDj3eBfFJMqdPg8M/NzlVInJNekNUhBnfSMA15q8OUd02msz0euhp0hZeA90XAuV
-						TswW9HqCAz4FI9WefVN4dcmt6/h29ZZTyHBqC8AhQpJlvuc=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ebi.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ebi.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">European Molecular Biology Laboratory</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">European Molecular Biology Laboratory - EBI</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.ebi.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Jenny</GivenName>
-    <SurName>Martin</SurName>
-    <EmailAddress>mailto:jenny@ebi.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Jenny</GivenName>
-    <SurName>Martin</SurName>
-    <EmailAddress>mailto:jenny@ebi.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.ec-lille.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.ec-lille.fr-idp-shibboleth.xml
deleted file mode 100644
index 83795ef3..00000000
--- a/swamid-interfederations-2.0/idp.ec-lille.fr-idp-shibboleth.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.ec-lille.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2012-04-02T09:29:58Z">
-      <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">ec-lille.fr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ig2i.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">Ecole Centrale de LILLE</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDJzCCAg+gAwIBAgIUZqE7Q+IH1nvI8J9EfTCnG/5KwYQwDQYJKoZIhvcNAQEF
-BQAwGjEYMBYGA1UEAxMPaWRwLmVjLWxpbGxlLmZyMB4XDTEyMDMyOTA3MjEwMFoX
-DTMyMDMyOTA3MjEwMFowGjEYMBYGA1UEAxMPaWRwLmVjLWxpbGxlLmZyMIIBIjAN
-BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAurcjSe2yQvV0wftgNyRCtoGWYADp
-MfWXihXrJtPQjLcuI3ipqN5bJz8W5dwKOa1ca6CNtI7J5UO4ORtQhm+GTXSnqKU3
-hNDPcTXvwt8XJ6UhiXxc8k7Rd38ajwobf1hUih3rMJXC34I1pU2REtQrBZls9T32
-B4HjoN1+FR5kCbAGrTpnTzUnEoZUivoXR0aVQdZoNvvyESM4tBnVCFDgVatGAn9/
-ZnkKyk5tyXtF4+eeTo1hDx/rYNvUhYmWXeI2CYVsVYUxmRUp13W6d1+sE1Jajcpr
-X1kwgGNk1H/JIChetxD3KMcTrreF4qEDztzghCs/nMosCe5D0aTzliCqdQIDAQAB
-o2UwYzBCBgNVHREEOzA5gg9pZHAuZWMtbGlsbGUuZnKGJmh0dHBzOi8vaWRwLmVj
-LWxpbGxlLmZyL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBS8k5z2mHglPmRe5mYj
-jPcglb7IxDANBgkqhkiG9w0BAQUFAAOCAQEAiPcyMDpgvPV9HRgodx8GFUQyhrpg
-mkJdDlSTqe3tC6tC84RbAJ1iz1lznmNTtmao4meoZclddh/6xn0GLB6YL7j3e0Zm
-TD40/6j6PL4ECXmqhNLEIUi1gPGGbJk8h1tIlhNLWmQVKQmpR8G3j1EksUsAWCoY
-envB4RkNo6WLpReZj5bRF0iSr6n7+ffuSAl22cis1d8QMYcu/rsL7CKXuCHN2sRb
-IOtBkZ38jQP2f/nTz5h2cliO4tiMckGW+284yHmxNX+6cLriWj6hRsFa5gt8dPSJ
-Kg3NiOUmGq2VSgHAqi8QEVsRCKvmIgZmEyQRzB+NjEoqCqBnhxXKKhqmlA==
-					    </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://idp.ec-lille.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ec-lille.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.ec-lille.fr/idp/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Ecole Centrale de LILLE</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Ecole Centrale de LILLE</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Jonathan Chatriot</SurName>
-    <EmailAddress>jonathan.chatriot@ec-lille.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.ec-lille.fr.xml b/swamid-interfederations-2.0/idp.ec-lille.fr.xml
deleted file mode 100644
index 83795ef3..00000000
--- a/swamid-interfederations-2.0/idp.ec-lille.fr.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.ec-lille.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2012-04-02T09:29:58Z">
-      <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">ec-lille.fr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ig2i.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">Ecole Centrale de LILLE</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDJzCCAg+gAwIBAgIUZqE7Q+IH1nvI8J9EfTCnG/5KwYQwDQYJKoZIhvcNAQEF
-BQAwGjEYMBYGA1UEAxMPaWRwLmVjLWxpbGxlLmZyMB4XDTEyMDMyOTA3MjEwMFoX
-DTMyMDMyOTA3MjEwMFowGjEYMBYGA1UEAxMPaWRwLmVjLWxpbGxlLmZyMIIBIjAN
-BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAurcjSe2yQvV0wftgNyRCtoGWYADp
-MfWXihXrJtPQjLcuI3ipqN5bJz8W5dwKOa1ca6CNtI7J5UO4ORtQhm+GTXSnqKU3
-hNDPcTXvwt8XJ6UhiXxc8k7Rd38ajwobf1hUih3rMJXC34I1pU2REtQrBZls9T32
-B4HjoN1+FR5kCbAGrTpnTzUnEoZUivoXR0aVQdZoNvvyESM4tBnVCFDgVatGAn9/
-ZnkKyk5tyXtF4+eeTo1hDx/rYNvUhYmWXeI2CYVsVYUxmRUp13W6d1+sE1Jajcpr
-X1kwgGNk1H/JIChetxD3KMcTrreF4qEDztzghCs/nMosCe5D0aTzliCqdQIDAQAB
-o2UwYzBCBgNVHREEOzA5gg9pZHAuZWMtbGlsbGUuZnKGJmh0dHBzOi8vaWRwLmVj
-LWxpbGxlLmZyL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBS8k5z2mHglPmRe5mYj
-jPcglb7IxDANBgkqhkiG9w0BAQUFAAOCAQEAiPcyMDpgvPV9HRgodx8GFUQyhrpg
-mkJdDlSTqe3tC6tC84RbAJ1iz1lznmNTtmao4meoZclddh/6xn0GLB6YL7j3e0Zm
-TD40/6j6PL4ECXmqhNLEIUi1gPGGbJk8h1tIlhNLWmQVKQmpR8G3j1EksUsAWCoY
-envB4RkNo6WLpReZj5bRF0iSr6n7+ffuSAl22cis1d8QMYcu/rsL7CKXuCHN2sRb
-IOtBkZ38jQP2f/nTz5h2cliO4tiMckGW+284yHmxNX+6cLriWj6hRsFa5gt8dPSJ
-Kg3NiOUmGq2VSgHAqi8QEVsRCKvmIgZmEyQRzB+NjEoqCqBnhxXKKhqmlA==
-					    </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://idp.ec-lille.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ec-lille.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.ec-lille.fr/idp/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Ecole Centrale de LILLE</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Ecole Centrale de LILLE</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Jonathan Chatriot</SurName>
-    <EmailAddress>jonathan.chatriot@ec-lille.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.ecam.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.ecam.fr-idp-shibboleth.xml
deleted file mode 100644
index 8282f657..00000000
--- a/swamid-interfederations-2.0/idp.ecam.fr-idp-shibboleth.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://idp.ecam.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2014-04-30T18:14:43Z">
-      <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">ecam.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">ECAM Lyon</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Utilisateurs ECAM</mdui:Description>
-        <mdui:DisplayName xml:lang="fr">ECAM Lyon</mdui:DisplayName>
-        <mdui:Description xml:lang="fr">Utilisateurs ECAM</mdui:Description>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDFzCCAf+gAwIBAgIUXFGDVnYfC4TCE7Lq/bUOsxSKIrswDQYJKoZIhvcNAQEF
-BQAwFjEUMBIGA1UEAxMLaWRwLmVjYW0uZnIwHhcNMTQwNDI4MTMxMTQ4WhcNMzQw
-NDI4MTMxMTQ4WjAWMRQwEgYDVQQDEwtpZHAuZWNhbS5mcjCCASIwDQYJKoZIhvcN
-AQEBBQADggEPADCCAQoCggEBAIIMTqPcyJZJxgn7lOirdEZMejGbdNX/90ZcBGYa
-6Ks1nT8smP+xyctNKS2vP7kZ59N+Ml7LB0Mne/teKkH1Qx/IEftRsTeuW70kFU6B
-RUEyHMnAyz5rZAozonbbaxKcLf383RvztwifOfcx04haXs3Du9KFGsIz2D8bYUuQ
-7yoBQy/00lTOhn+C92NSZP2iTWwNVfPAh3cEXj1VZQ47y0fkGUd/dBQIT4p4mii/
-4w3PLI4wnU44JlWcsDJllGZjBa/MQY4dRBeKibxDz8oMHxZj4nqc/ZIQ1MIIKd9v
-T24bBwL+RSa6/kGnk5M0hGwHliXGnsiM4/+4TnFJL0wWAfkCAwEAAaNdMFswOgYD
-VR0RBDMwMYILaWRwLmVjYW0uZnKGImh0dHBzOi8vaWRwLmVjYW0uZnIvaWRwL3No
-aWJib2xldGgwHQYDVR0OBBYEFOtnyyDaZuvbEOS/oJjhfM9qSbeBMA0GCSqGSIb3
-DQEBBQUAA4IBAQAeDlQG75QPvtH7RH4XgFjbtuK0Vx+C+RG+JjelVwtcUz6+P2jx
-/t16CRXS6GYSuKlL8X9hWzfxdMxcSSpdynEeh1s99w/9f19tJEPEsJNQ0AdLB80Q
-bXG9s8yhrIeO8Z7fHM6/23ay0uqXSw/DtAMFQ1dBKpKJ129nhuhELdDyw3IU3lwX
-j64hF1f32hVfNw1lfF3WwUPD7+ePFAsDZ5X0Z6rTlK0pRm/MKfzU+ASmYyJMbbwc
-7o8Ug2yRh/zIA5hfS5mxYt/1anKXSXxB6DIozsy5rWBZdGKTTFiqVZmFPQjOAOQn
-wuRoN+B/HWXuO2OFERHORHrZqV90QV5Sciud
-					    </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://idp.ecam.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ecam.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.ecam.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">ecam.fr</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDFzCCAf+gAwIBAgIUXFGDVnYfC4TCE7Lq/bUOsxSKIrswDQYJKoZIhvcNAQEF
-BQAwFjEUMBIGA1UEAxMLaWRwLmVjYW0uZnIwHhcNMTQwNDI4MTMxMTQ4WhcNMzQw
-NDI4MTMxMTQ4WjAWMRQwEgYDVQQDEwtpZHAuZWNhbS5mcjCCASIwDQYJKoZIhvcN
-AQEBBQADggEPADCCAQoCggEBAIIMTqPcyJZJxgn7lOirdEZMejGbdNX/90ZcBGYa
-6Ks1nT8smP+xyctNKS2vP7kZ59N+Ml7LB0Mne/teKkH1Qx/IEftRsTeuW70kFU6B
-RUEyHMnAyz5rZAozonbbaxKcLf383RvztwifOfcx04haXs3Du9KFGsIz2D8bYUuQ
-7yoBQy/00lTOhn+C92NSZP2iTWwNVfPAh3cEXj1VZQ47y0fkGUd/dBQIT4p4mii/
-4w3PLI4wnU44JlWcsDJllGZjBa/MQY4dRBeKibxDz8oMHxZj4nqc/ZIQ1MIIKd9v
-T24bBwL+RSa6/kGnk5M0hGwHliXGnsiM4/+4TnFJL0wWAfkCAwEAAaNdMFswOgYD
-VR0RBDMwMYILaWRwLmVjYW0uZnKGImh0dHBzOi8vaWRwLmVjYW0uZnIvaWRwL3No
-aWJib2xldGgwHQYDVR0OBBYEFOtnyyDaZuvbEOS/oJjhfM9qSbeBMA0GCSqGSIb3
-DQEBBQUAA4IBAQAeDlQG75QPvtH7RH4XgFjbtuK0Vx+C+RG+JjelVwtcUz6+P2jx
-/t16CRXS6GYSuKlL8X9hWzfxdMxcSSpdynEeh1s99w/9f19tJEPEsJNQ0AdLB80Q
-bXG9s8yhrIeO8Z7fHM6/23ay0uqXSw/DtAMFQ1dBKpKJ129nhuhELdDyw3IU3lwX
-j64hF1f32hVfNw1lfF3WwUPD7+ePFAsDZ5X0Z6rTlK0pRm/MKfzU+ASmYyJMbbwc
-7o8Ug2yRh/zIA5hfS5mxYt/1anKXSXxB6DIozsy5rWBZdGKTTFiqVZmFPQjOAOQn
-wuRoN+B/HWXuO2OFERHORHrZqV90QV5Sciud
-					    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ecam.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">ECAM Lyon</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">ECAM Lyon</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <EmailAddress>sysadmin@ecam.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.ecam.fr.xml b/swamid-interfederations-2.0/idp.ecam.fr.xml
deleted file mode 100644
index 8282f657..00000000
--- a/swamid-interfederations-2.0/idp.ecam.fr.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://idp.ecam.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2014-04-30T18:14:43Z">
-      <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">ecam.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">ECAM Lyon</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Utilisateurs ECAM</mdui:Description>
-        <mdui:DisplayName xml:lang="fr">ECAM Lyon</mdui:DisplayName>
-        <mdui:Description xml:lang="fr">Utilisateurs ECAM</mdui:Description>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDFzCCAf+gAwIBAgIUXFGDVnYfC4TCE7Lq/bUOsxSKIrswDQYJKoZIhvcNAQEF
-BQAwFjEUMBIGA1UEAxMLaWRwLmVjYW0uZnIwHhcNMTQwNDI4MTMxMTQ4WhcNMzQw
-NDI4MTMxMTQ4WjAWMRQwEgYDVQQDEwtpZHAuZWNhbS5mcjCCASIwDQYJKoZIhvcN
-AQEBBQADggEPADCCAQoCggEBAIIMTqPcyJZJxgn7lOirdEZMejGbdNX/90ZcBGYa
-6Ks1nT8smP+xyctNKS2vP7kZ59N+Ml7LB0Mne/teKkH1Qx/IEftRsTeuW70kFU6B
-RUEyHMnAyz5rZAozonbbaxKcLf383RvztwifOfcx04haXs3Du9KFGsIz2D8bYUuQ
-7yoBQy/00lTOhn+C92NSZP2iTWwNVfPAh3cEXj1VZQ47y0fkGUd/dBQIT4p4mii/
-4w3PLI4wnU44JlWcsDJllGZjBa/MQY4dRBeKibxDz8oMHxZj4nqc/ZIQ1MIIKd9v
-T24bBwL+RSa6/kGnk5M0hGwHliXGnsiM4/+4TnFJL0wWAfkCAwEAAaNdMFswOgYD
-VR0RBDMwMYILaWRwLmVjYW0uZnKGImh0dHBzOi8vaWRwLmVjYW0uZnIvaWRwL3No
-aWJib2xldGgwHQYDVR0OBBYEFOtnyyDaZuvbEOS/oJjhfM9qSbeBMA0GCSqGSIb3
-DQEBBQUAA4IBAQAeDlQG75QPvtH7RH4XgFjbtuK0Vx+C+RG+JjelVwtcUz6+P2jx
-/t16CRXS6GYSuKlL8X9hWzfxdMxcSSpdynEeh1s99w/9f19tJEPEsJNQ0AdLB80Q
-bXG9s8yhrIeO8Z7fHM6/23ay0uqXSw/DtAMFQ1dBKpKJ129nhuhELdDyw3IU3lwX
-j64hF1f32hVfNw1lfF3WwUPD7+ePFAsDZ5X0Z6rTlK0pRm/MKfzU+ASmYyJMbbwc
-7o8Ug2yRh/zIA5hfS5mxYt/1anKXSXxB6DIozsy5rWBZdGKTTFiqVZmFPQjOAOQn
-wuRoN+B/HWXuO2OFERHORHrZqV90QV5Sciud
-					    </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://idp.ecam.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ecam.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.ecam.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">ecam.fr</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDFzCCAf+gAwIBAgIUXFGDVnYfC4TCE7Lq/bUOsxSKIrswDQYJKoZIhvcNAQEF
-BQAwFjEUMBIGA1UEAxMLaWRwLmVjYW0uZnIwHhcNMTQwNDI4MTMxMTQ4WhcNMzQw
-NDI4MTMxMTQ4WjAWMRQwEgYDVQQDEwtpZHAuZWNhbS5mcjCCASIwDQYJKoZIhvcN
-AQEBBQADggEPADCCAQoCggEBAIIMTqPcyJZJxgn7lOirdEZMejGbdNX/90ZcBGYa
-6Ks1nT8smP+xyctNKS2vP7kZ59N+Ml7LB0Mne/teKkH1Qx/IEftRsTeuW70kFU6B
-RUEyHMnAyz5rZAozonbbaxKcLf383RvztwifOfcx04haXs3Du9KFGsIz2D8bYUuQ
-7yoBQy/00lTOhn+C92NSZP2iTWwNVfPAh3cEXj1VZQ47y0fkGUd/dBQIT4p4mii/
-4w3PLI4wnU44JlWcsDJllGZjBa/MQY4dRBeKibxDz8oMHxZj4nqc/ZIQ1MIIKd9v
-T24bBwL+RSa6/kGnk5M0hGwHliXGnsiM4/+4TnFJL0wWAfkCAwEAAaNdMFswOgYD
-VR0RBDMwMYILaWRwLmVjYW0uZnKGImh0dHBzOi8vaWRwLmVjYW0uZnIvaWRwL3No
-aWJib2xldGgwHQYDVR0OBBYEFOtnyyDaZuvbEOS/oJjhfM9qSbeBMA0GCSqGSIb3
-DQEBBQUAA4IBAQAeDlQG75QPvtH7RH4XgFjbtuK0Vx+C+RG+JjelVwtcUz6+P2jx
-/t16CRXS6GYSuKlL8X9hWzfxdMxcSSpdynEeh1s99w/9f19tJEPEsJNQ0AdLB80Q
-bXG9s8yhrIeO8Z7fHM6/23ay0uqXSw/DtAMFQ1dBKpKJ129nhuhELdDyw3IU3lwX
-j64hF1f32hVfNw1lfF3WwUPD7+ePFAsDZ5X0Z6rTlK0pRm/MKfzU+ASmYyJMbbwc
-7o8Ug2yRh/zIA5hfS5mxYt/1anKXSXxB6DIozsy5rWBZdGKTTFiqVZmFPQjOAOQn
-wuRoN+B/HWXuO2OFERHORHrZqV90QV5Sciud
-					    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ecam.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">ECAM Lyon</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">ECAM Lyon</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <EmailAddress>sysadmin@ecam.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.ed.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.ed.ac.uk-shibboleth.xml
deleted file mode 100644
index 0a96e7f9..00000000
--- a/swamid-interfederations-2.0/idp.ed.ac.uk-shibboleth.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://idp.ed.ac.uk/shibboleth">
-  <!--
-		This is a Shibboleth IdP for the University of Edinburgh.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2008-04-10T09:51: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">ed.ac.uk</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">University of Edinburgh</mdui:DisplayName>
-        <mdui:Logo height="70" width="315">https://idp.ed.ac.uk/university.gif</mdui:Logo>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:GeolocationHint>geo:55.9213,-3.1726</mdui:GeolocationHint>
-      </mdui:DiscoHints>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDGzCCAgOgAwIBAgIUaNzLeqDgCpvqZ+xdntpj4UryL9AwDQYJKoZIhvcNAQEF
-						BQAwFzEVMBMGA1UEAxMMaWRwLmVkLmFjLnVrMB4XDTEwMDYyMzE0MTIzNFoXDTMw
-						MDYyMzE0MTIzNFowFzEVMBMGA1UEAxMMaWRwLmVkLmFjLnVrMIIBIjANBgkqhkiG
-						9w0BAQEFAAOCAQ8AMIIBCgKCAQEA8RXQWoMfry/rRwfXVCxnRdkS05zIfHerw0/c
-						ObSFOORK8zOShk1QKuv+TevSZFJgD+iu96A1s55q6k0ZtbpW1iKzTAbHLXikt0yT
-						GYg5th2Gp3PqBFdzChse1Sdk8exRou10yOGZaqCyfG61u+BRgdEzefdG6to7PpG4
-						BNWD1njtO6zDl/zzsX9DiV3Kc7Fuo6P7ak+XPHGxztXVNwDRSoKZYiM5K11dpGvG
-						nhyhL2gbIO98AzGMELdkurTf4EYXuELGPY836NNdzhBEZ0Mo+g9EUqvPQ8inFOT4
-						TloSEUtxUzLr530YPOezm55QCDjH7JIS4rc+G4rN1B7b1zTybwIDAQABo18wXTA8
-						BgNVHREENTAzggxpZHAuZWQuYWMudWuGI2h0dHBzOi8vaWRwLmVkLmFjLnVrL2lk
-						cC9zaGliYm9sZXRoMB0GA1UdDgQWBBQmHZOct2bza0v07qT/d1ATgFYrajANBgkq
-						hkiG9w0BAQUFAAOCAQEAEgOOXyutNIWNlWoDj3VKfkZFDpw/2qvrP09EaYGBCwZ+
-						NAmPHWtN+3jlDxfnYBwhTAaCWlZBqfhk4JObVH2Q3xu08zWEHBqo4fr/YGYYWAGp
-						nZ29epYGOJAYbuJcWwwMJ4onFHyygRgmec4xPnz53noB8h6VEMmfP77y0JzZIF86
-						+1icvTyJg4ydkh8iPir4WwZzuP7wj+cPb3uyNTGSusxhghVoREkGIG2YBwgp3cyv
-						zqrzhKEksLsrrxs4mtHKDUDPSS1iArA4OJHFoIqEBMg8UOQFY4FA/FV4BDd6L5Z/
-						u0zH2B9Z0UeGRg5ivQYSOQ9HLX2IeDCQWhcJC33ibQ==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ed.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ed.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.ed.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ed.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.ed.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ed.ac.uk/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="false">ed.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDGzCCAgOgAwIBAgIUaNzLeqDgCpvqZ+xdntpj4UryL9AwDQYJKoZIhvcNAQEF
-						BQAwFzEVMBMGA1UEAxMMaWRwLmVkLmFjLnVrMB4XDTEwMDYyMzE0MTIzNFoXDTMw
-						MDYyMzE0MTIzNFowFzEVMBMGA1UEAxMMaWRwLmVkLmFjLnVrMIIBIjANBgkqhkiG
-						9w0BAQEFAAOCAQ8AMIIBCgKCAQEA8RXQWoMfry/rRwfXVCxnRdkS05zIfHerw0/c
-						ObSFOORK8zOShk1QKuv+TevSZFJgD+iu96A1s55q6k0ZtbpW1iKzTAbHLXikt0yT
-						GYg5th2Gp3PqBFdzChse1Sdk8exRou10yOGZaqCyfG61u+BRgdEzefdG6to7PpG4
-						BNWD1njtO6zDl/zzsX9DiV3Kc7Fuo6P7ak+XPHGxztXVNwDRSoKZYiM5K11dpGvG
-						nhyhL2gbIO98AzGMELdkurTf4EYXuELGPY836NNdzhBEZ0Mo+g9EUqvPQ8inFOT4
-						TloSEUtxUzLr530YPOezm55QCDjH7JIS4rc+G4rN1B7b1zTybwIDAQABo18wXTA8
-						BgNVHREENTAzggxpZHAuZWQuYWMudWuGI2h0dHBzOi8vaWRwLmVkLmFjLnVrL2lk
-						cC9zaGliYm9sZXRoMB0GA1UdDgQWBBQmHZOct2bza0v07qT/d1ATgFYrajANBgkq
-						hkiG9w0BAQUFAAOCAQEAEgOOXyutNIWNlWoDj3VKfkZFDpw/2qvrP09EaYGBCwZ+
-						NAmPHWtN+3jlDxfnYBwhTAaCWlZBqfhk4JObVH2Q3xu08zWEHBqo4fr/YGYYWAGp
-						nZ29epYGOJAYbuJcWwwMJ4onFHyygRgmec4xPnz53noB8h6VEMmfP77y0JzZIF86
-						+1icvTyJg4ydkh8iPir4WwZzuP7wj+cPb3uyNTGSusxhghVoREkGIG2YBwgp3cyv
-						zqrzhKEksLsrrxs4mtHKDUDPSS1iArA4OJHFoIqEBMg8UOQFY4FA/FV4BDd6L5Z/
-						u0zH2B9Z0UeGRg5ivQYSOQ9HLX2IeDCQWhcJC33ibQ==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ed.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ed.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">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">
-    <GivenName>IS Helpline</GivenName>
-    <EmailAddress>mailto:IS.Helpline@ed.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>shibboleth@ed.ac.uk</GivenName>
-    <EmailAddress>mailto:shibboleth@ed.ac.uk</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
deleted file mode 100644
index 0a96e7f9..00000000
--- a/swamid-interfederations-2.0/idp.ed.ac.uk.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://idp.ed.ac.uk/shibboleth">
-  <!--
-		This is a Shibboleth IdP for the University of Edinburgh.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2008-04-10T09:51: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">ed.ac.uk</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">University of Edinburgh</mdui:DisplayName>
-        <mdui:Logo height="70" width="315">https://idp.ed.ac.uk/university.gif</mdui:Logo>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:GeolocationHint>geo:55.9213,-3.1726</mdui:GeolocationHint>
-      </mdui:DiscoHints>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDGzCCAgOgAwIBAgIUaNzLeqDgCpvqZ+xdntpj4UryL9AwDQYJKoZIhvcNAQEF
-						BQAwFzEVMBMGA1UEAxMMaWRwLmVkLmFjLnVrMB4XDTEwMDYyMzE0MTIzNFoXDTMw
-						MDYyMzE0MTIzNFowFzEVMBMGA1UEAxMMaWRwLmVkLmFjLnVrMIIBIjANBgkqhkiG
-						9w0BAQEFAAOCAQ8AMIIBCgKCAQEA8RXQWoMfry/rRwfXVCxnRdkS05zIfHerw0/c
-						ObSFOORK8zOShk1QKuv+TevSZFJgD+iu96A1s55q6k0ZtbpW1iKzTAbHLXikt0yT
-						GYg5th2Gp3PqBFdzChse1Sdk8exRou10yOGZaqCyfG61u+BRgdEzefdG6to7PpG4
-						BNWD1njtO6zDl/zzsX9DiV3Kc7Fuo6P7ak+XPHGxztXVNwDRSoKZYiM5K11dpGvG
-						nhyhL2gbIO98AzGMELdkurTf4EYXuELGPY836NNdzhBEZ0Mo+g9EUqvPQ8inFOT4
-						TloSEUtxUzLr530YPOezm55QCDjH7JIS4rc+G4rN1B7b1zTybwIDAQABo18wXTA8
-						BgNVHREENTAzggxpZHAuZWQuYWMudWuGI2h0dHBzOi8vaWRwLmVkLmFjLnVrL2lk
-						cC9zaGliYm9sZXRoMB0GA1UdDgQWBBQmHZOct2bza0v07qT/d1ATgFYrajANBgkq
-						hkiG9w0BAQUFAAOCAQEAEgOOXyutNIWNlWoDj3VKfkZFDpw/2qvrP09EaYGBCwZ+
-						NAmPHWtN+3jlDxfnYBwhTAaCWlZBqfhk4JObVH2Q3xu08zWEHBqo4fr/YGYYWAGp
-						nZ29epYGOJAYbuJcWwwMJ4onFHyygRgmec4xPnz53noB8h6VEMmfP77y0JzZIF86
-						+1icvTyJg4ydkh8iPir4WwZzuP7wj+cPb3uyNTGSusxhghVoREkGIG2YBwgp3cyv
-						zqrzhKEksLsrrxs4mtHKDUDPSS1iArA4OJHFoIqEBMg8UOQFY4FA/FV4BDd6L5Z/
-						u0zH2B9Z0UeGRg5ivQYSOQ9HLX2IeDCQWhcJC33ibQ==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ed.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ed.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.ed.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ed.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.ed.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ed.ac.uk/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="false">ed.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDGzCCAgOgAwIBAgIUaNzLeqDgCpvqZ+xdntpj4UryL9AwDQYJKoZIhvcNAQEF
-						BQAwFzEVMBMGA1UEAxMMaWRwLmVkLmFjLnVrMB4XDTEwMDYyMzE0MTIzNFoXDTMw
-						MDYyMzE0MTIzNFowFzEVMBMGA1UEAxMMaWRwLmVkLmFjLnVrMIIBIjANBgkqhkiG
-						9w0BAQEFAAOCAQ8AMIIBCgKCAQEA8RXQWoMfry/rRwfXVCxnRdkS05zIfHerw0/c
-						ObSFOORK8zOShk1QKuv+TevSZFJgD+iu96A1s55q6k0ZtbpW1iKzTAbHLXikt0yT
-						GYg5th2Gp3PqBFdzChse1Sdk8exRou10yOGZaqCyfG61u+BRgdEzefdG6to7PpG4
-						BNWD1njtO6zDl/zzsX9DiV3Kc7Fuo6P7ak+XPHGxztXVNwDRSoKZYiM5K11dpGvG
-						nhyhL2gbIO98AzGMELdkurTf4EYXuELGPY836NNdzhBEZ0Mo+g9EUqvPQ8inFOT4
-						TloSEUtxUzLr530YPOezm55QCDjH7JIS4rc+G4rN1B7b1zTybwIDAQABo18wXTA8
-						BgNVHREENTAzggxpZHAuZWQuYWMudWuGI2h0dHBzOi8vaWRwLmVkLmFjLnVrL2lk
-						cC9zaGliYm9sZXRoMB0GA1UdDgQWBBQmHZOct2bza0v07qT/d1ATgFYrajANBgkq
-						hkiG9w0BAQUFAAOCAQEAEgOOXyutNIWNlWoDj3VKfkZFDpw/2qvrP09EaYGBCwZ+
-						NAmPHWtN+3jlDxfnYBwhTAaCWlZBqfhk4JObVH2Q3xu08zWEHBqo4fr/YGYYWAGp
-						nZ29epYGOJAYbuJcWwwMJ4onFHyygRgmec4xPnz53noB8h6VEMmfP77y0JzZIF86
-						+1icvTyJg4ydkh8iPir4WwZzuP7wj+cPb3uyNTGSusxhghVoREkGIG2YBwgp3cyv
-						zqrzhKEksLsrrxs4mtHKDUDPSS1iArA4OJHFoIqEBMg8UOQFY4FA/FV4BDd6L5Z/
-						u0zH2B9Z0UeGRg5ivQYSOQ9HLX2IeDCQWhcJC33ibQ==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ed.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ed.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">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">
-    <GivenName>IS Helpline</GivenName>
-    <EmailAddress>mailto:IS.Helpline@ed.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>shibboleth@ed.ac.uk</GivenName>
-    <EmailAddress>mailto:shibboleth@ed.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.ehess.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.ehess.fr-idp-shibboleth.xml
deleted file mode 100644
index fe3068c6..00000000
--- a/swamid-interfederations-2.0/idp.ehess.fr-idp-shibboleth.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.ehess.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2012-07-12T16:19:22Z">
-      <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">ehess.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">EHESS</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDHDCCAgSgAwIBAgIVALeCOqpROd3E1etW0cL7TxFT+Z3rMA0GCSqGSIb3DQEB
-BQUAMBcxFTATBgNVBAMTDGlkcC5laGVzcy5mcjAeFw0xMTA3MjUxMDMxNThaFw0z
-MTA3MjUxMDMxNThaMBcxFTATBgNVBAMTDGlkcC5laGVzcy5mcjCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBALomrxhDCkuM+MNokRhVvEkg095vk1wsvflA
-wYfTuhsVSW13bZVHcOHTjILhWiHOVz8RZVXy6vOmEEWXl2KWn9Tvovh/Sey2rRe/
-/svsSpIUKgnU2tC3rC41XJ5V/mIJUoSPhcQCKCx5t4CV4xG5eNa4rYJxsJDDUviA
-Pd+jKkiVMUEvDJ4Qt4o/scjjuUGUrKJ1/EmMqZfG2HO7Xqkg5j8z6n1U6KpOXUb0
-kMhL9SKCiWZX9iYt810mkOlx7TNJlAENOqlGybAnMjEY85rJ/LbEnpgTyWEmNEPc
-1BCN84l4VVEJc7F2WxDjtFMG7YQwjWdUIJbVz/dHHvJQgxIoSrUCAwEAAaNfMF0w
-PAYDVR0RBDUwM4IMaWRwLmVoZXNzLmZyhiNodHRwczovL2lkcC5laGVzcy5mci9p
-ZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUL5PgjhSfsllLhl0wF9vbNDc9PpgwDQYJ
-KoZIhvcNAQEFBQADggEBAKARW3uivnFto2JRaKGtnqcaDO5dS3RKj7uf/eIaU/Uq
-Fm3PADZE5gVTUcwlILrDmci0202/Boo03srZ0RCvSZ6HxjZM5gsPGZ0D2SiMf8b3
-UVSLt38rXXyd6Xm0kXvBP2ZsFlRkzanI0G8pa3wOslVGEZccBKY4dmRToIm7cQeB
-OQdqKV2rfZSK5DN7cE5VeUlRfPOqcsYagK5PT0+JiKdBuJTnBFUub+SPLIW+pygx
-ftIG5eTG0zs+8JFROXmVnoVTk6dKHOcL4Ze1HNgC/RQGLQCyY5HY7IjlllWsTteF
-uq8R4YH10wMLWAk+39fV4VIZwj+rc6KKXaPjcpXt+RE=
-					    </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://idp.ehess.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ehess.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.ehess.fr/idp/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">EHESS</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">EHESS</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <EmailAddress>admin@ehess.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.ehess.fr.xml b/swamid-interfederations-2.0/idp.ehess.fr.xml
deleted file mode 100644
index fe3068c6..00000000
--- a/swamid-interfederations-2.0/idp.ehess.fr.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.ehess.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2012-07-12T16:19:22Z">
-      <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">ehess.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">EHESS</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDHDCCAgSgAwIBAgIVALeCOqpROd3E1etW0cL7TxFT+Z3rMA0GCSqGSIb3DQEB
-BQUAMBcxFTATBgNVBAMTDGlkcC5laGVzcy5mcjAeFw0xMTA3MjUxMDMxNThaFw0z
-MTA3MjUxMDMxNThaMBcxFTATBgNVBAMTDGlkcC5laGVzcy5mcjCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBALomrxhDCkuM+MNokRhVvEkg095vk1wsvflA
-wYfTuhsVSW13bZVHcOHTjILhWiHOVz8RZVXy6vOmEEWXl2KWn9Tvovh/Sey2rRe/
-/svsSpIUKgnU2tC3rC41XJ5V/mIJUoSPhcQCKCx5t4CV4xG5eNa4rYJxsJDDUviA
-Pd+jKkiVMUEvDJ4Qt4o/scjjuUGUrKJ1/EmMqZfG2HO7Xqkg5j8z6n1U6KpOXUb0
-kMhL9SKCiWZX9iYt810mkOlx7TNJlAENOqlGybAnMjEY85rJ/LbEnpgTyWEmNEPc
-1BCN84l4VVEJc7F2WxDjtFMG7YQwjWdUIJbVz/dHHvJQgxIoSrUCAwEAAaNfMF0w
-PAYDVR0RBDUwM4IMaWRwLmVoZXNzLmZyhiNodHRwczovL2lkcC5laGVzcy5mci9p
-ZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUL5PgjhSfsllLhl0wF9vbNDc9PpgwDQYJ
-KoZIhvcNAQEFBQADggEBAKARW3uivnFto2JRaKGtnqcaDO5dS3RKj7uf/eIaU/Uq
-Fm3PADZE5gVTUcwlILrDmci0202/Boo03srZ0RCvSZ6HxjZM5gsPGZ0D2SiMf8b3
-UVSLt38rXXyd6Xm0kXvBP2ZsFlRkzanI0G8pa3wOslVGEZccBKY4dmRToIm7cQeB
-OQdqKV2rfZSK5DN7cE5VeUlRfPOqcsYagK5PT0+JiKdBuJTnBFUub+SPLIW+pygx
-ftIG5eTG0zs+8JFROXmVnoVTk6dKHOcL4Ze1HNgC/RQGLQCyY5HY7IjlllWsTteF
-uq8R4YH10wMLWAk+39fV4VIZwj+rc6KKXaPjcpXt+RE=
-					    </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://idp.ehess.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ehess.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.ehess.fr/idp/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">EHESS</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">EHESS</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <EmailAddress>admin@ehess.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.elte.hu-auth-saml2-idp-metadata.php.xml b/swamid-interfederations-2.0/idp.elte.hu-auth-saml2-idp-metadata.php.xml
deleted file mode 100644
index 5959916f..00000000
--- a/swamid-interfederations-2.0/idp.elte.hu-auth-saml2-idp-metadata.php.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.elte.hu/auth/saml2/idp/metadata.php">
-  <Extensions>
-    <ns9:MetadataSet xmlns:ns9="urn:geant:niif.hu:eduid.hu:entity-attributes:processing-info">elte</ns9:MetadataSet>
-    <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>
-    <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">elte.hu</shibmd:Scope>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-        <mdui:GeolocationHint>geo:47.49005,19.05955</mdui:GeolocationHint>
-      </mdui:DiscoHints>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-        <mdui:DisplayName xml:lang="hu">Eötvös Loránd Tudományegyetem</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Eötvös Loránd University Budapest</mdui:DisplayName>
-        <mdui:Description xml:lang="hu">Eötvös Loránd Tudományegyetem</mdui:Description>
-        <mdui:Description xml:lang="en">Eötvös Loránd University Budapest</mdui:Description>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIIFYzCCBEugAwIBAgIQLIaNDr+iCPZ0Iz6P3Q9VqTANBgkqhkiG9w0BAQUFADA2MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEgU1NMIENBMB4XDTE0MDQxMDAwMDAwMFoXDTE3MDQwOTIzNTk1OVowOTEhMB8GA1UECxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRQwEgYDVQQDEwtpZHAuZWx0ZS5odTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBANI/ii7DympWU2khMzlPc5m0zeArm9zB6yLik398aLncEEXj9uAXqmZlzD3PlmEehRV554zhjuzPxGS1poQHM/em9ctBQXH3sdcNmTi3aRUldO0nr3uH/g38SF2lfZdw+A8wlLYHu3e3nxHKrwIFxRR7pNdB1DitfWZ7VArrxt2djsaIOXsECEtos3AyEospySVC/pGwimJv/z3AgykdeBVpHB6X9ftn4ptuM+0/ZQgaN7ktP+sR2mcOdgu+ip28rxLS4hd2NNMmfsb1jy14YMKKD8ryWb0fI0yyaKKz3AC9DBdKB4o8i/jpBQTsjq0MppL6LT6iDEBb1IO7OagN0eAPTt+lMPmW2EPUg3HLZVPYKRHqsaUdE3+gMTTOd8HEc39oRDLaFjsD0H7hoLY9DL3Q/CcwYOyCNYbLdzXFn1Cj04T2Oxj94Xw0zAp2Pw0WE9iIzpi/izca7DW8WiEEFIPLCDVIqi80GY4AZWFEbTV+I3wDCTfF5lNY67XhH7pWhU5dWJaD5XPYahQd1kvejA1+hviqhMQkZvkRTmCMZHpv9amjmFg1CEgk7XGSO5/Rj7fNjSTZ5Ysuh2wjjDWdIn5sIe1UCVJEqEVCZj1iBU3WXvpDv6Kn6Vr2Zz2jgm4S9CjGOIpueB4MjInVoJFOHOsKB63tpuDNSJGj7E/XKCWlAgMBAAGjggFoMIIBZDAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3V0fqkOO57TAdBgNVHQ4EFgQUb9JqTdA6YG8FiGd1gBUvIHMdjA8wDgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMCIGA1UdIAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQIBMDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9vY3NwLnRjcy50ZXJlbmEub3JnMBYGA1UdEQQPMA2CC2lkcC5lbHRlLmh1MA0GCSqGSIb3DQEBBQUAA4IBAQBOvYggdrH+sTjvU6TRdCOUAFs5YOK//s0xCbiC/E1rfb04dSPDSUdjLwOv6bP06N64EugFZakJIweWUPREy5lNP1F3d9JClPMmCJNYlbNJ7R750lWHudqTvJ1AU3emNED+Vgp2iBtdyYZHrHMHi+z296f4HxF3V95hhCswMCMaw3+NC4WTr7Y84ygGprMRQDWhQTwx06glpjl8h59UdtS9EjSB6KBjkgrG/+S37MMUrppeyFis715FtYLoBjz/oLvqNch2KYKThfoW1BrTQZpCq+sot1908yBhyUSJRsLqWra9NGM1E1Y+4NLbGwAHhPtuRMGIYDWks3zoyVFm6PvO</ds:X509Certificate>
-        </ds:X509Data>
-        <ds:KeyName>idp.elte.hu</ds:KeyName>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.elte.hu/auth/saml2/idp/ArtifactResolutionService.php" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.elte.hu/auth/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.elte.hu/auth/saml2/idp/SSOService.php"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="hu">Eötvös Loránd Tudományegyetem</OrganizationName>
-    <OrganizationName xml:lang="en">Eötvös Loránd University Budapest</OrganizationName>
-    <OrganizationDisplayName xml:lang="hu">Eötvös Loránd Tudományegyetem</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">Eötvös Loránd University Budapest</OrganizationDisplayName>
-    <OrganizationURL xml:lang="hu">http://iig.elte.hu</OrganizationURL>
-    <OrganizationURL xml:lang="en">http://iig.elte.hu</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>ELTE IIG Informatikai Szolgáltatási Osztály</SurName>
-    <EmailAddress>mailto:system@caesar.elte.hu</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="administrative">
-    <SurName>ELTE IIG Informatikai Szolgáltatási Osztály</SurName>
-    <EmailAddress>mailto:system@caesar.elte.hu</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="support">
-    <SurName>ELTE IIG Ügyféltámogatási Osztály</SurName>
-    <EmailAddress>mailto:operator@caesar.elte.hu</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.elte.hu.xml b/swamid-interfederations-2.0/idp.elte.hu.xml
deleted file mode 100644
index 5959916f..00000000
--- a/swamid-interfederations-2.0/idp.elte.hu.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.elte.hu/auth/saml2/idp/metadata.php">
-  <Extensions>
-    <ns9:MetadataSet xmlns:ns9="urn:geant:niif.hu:eduid.hu:entity-attributes:processing-info">elte</ns9:MetadataSet>
-    <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>
-    <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">elte.hu</shibmd:Scope>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-        <mdui:GeolocationHint>geo:47.49005,19.05955</mdui:GeolocationHint>
-      </mdui:DiscoHints>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-        <mdui:DisplayName xml:lang="hu">Eötvös Loránd Tudományegyetem</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Eötvös Loránd University Budapest</mdui:DisplayName>
-        <mdui:Description xml:lang="hu">Eötvös Loránd Tudományegyetem</mdui:Description>
-        <mdui:Description xml:lang="en">Eötvös Loránd University Budapest</mdui:Description>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIIFYzCCBEugAwIBAgIQLIaNDr+iCPZ0Iz6P3Q9VqTANBgkqhkiG9w0BAQUFADA2MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEgU1NMIENBMB4XDTE0MDQxMDAwMDAwMFoXDTE3MDQwOTIzNTk1OVowOTEhMB8GA1UECxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRQwEgYDVQQDEwtpZHAuZWx0ZS5odTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBANI/ii7DympWU2khMzlPc5m0zeArm9zB6yLik398aLncEEXj9uAXqmZlzD3PlmEehRV554zhjuzPxGS1poQHM/em9ctBQXH3sdcNmTi3aRUldO0nr3uH/g38SF2lfZdw+A8wlLYHu3e3nxHKrwIFxRR7pNdB1DitfWZ7VArrxt2djsaIOXsECEtos3AyEospySVC/pGwimJv/z3AgykdeBVpHB6X9ftn4ptuM+0/ZQgaN7ktP+sR2mcOdgu+ip28rxLS4hd2NNMmfsb1jy14YMKKD8ryWb0fI0yyaKKz3AC9DBdKB4o8i/jpBQTsjq0MppL6LT6iDEBb1IO7OagN0eAPTt+lMPmW2EPUg3HLZVPYKRHqsaUdE3+gMTTOd8HEc39oRDLaFjsD0H7hoLY9DL3Q/CcwYOyCNYbLdzXFn1Cj04T2Oxj94Xw0zAp2Pw0WE9iIzpi/izca7DW8WiEEFIPLCDVIqi80GY4AZWFEbTV+I3wDCTfF5lNY67XhH7pWhU5dWJaD5XPYahQd1kvejA1+hviqhMQkZvkRTmCMZHpv9amjmFg1CEgk7XGSO5/Rj7fNjSTZ5Ysuh2wjjDWdIn5sIe1UCVJEqEVCZj1iBU3WXvpDv6Kn6Vr2Zz2jgm4S9CjGOIpueB4MjInVoJFOHOsKB63tpuDNSJGj7E/XKCWlAgMBAAGjggFoMIIBZDAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3V0fqkOO57TAdBgNVHQ4EFgQUb9JqTdA6YG8FiGd1gBUvIHMdjA8wDgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMCIGA1UdIAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQIBMDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9vY3NwLnRjcy50ZXJlbmEub3JnMBYGA1UdEQQPMA2CC2lkcC5lbHRlLmh1MA0GCSqGSIb3DQEBBQUAA4IBAQBOvYggdrH+sTjvU6TRdCOUAFs5YOK//s0xCbiC/E1rfb04dSPDSUdjLwOv6bP06N64EugFZakJIweWUPREy5lNP1F3d9JClPMmCJNYlbNJ7R750lWHudqTvJ1AU3emNED+Vgp2iBtdyYZHrHMHi+z296f4HxF3V95hhCswMCMaw3+NC4WTr7Y84ygGprMRQDWhQTwx06glpjl8h59UdtS9EjSB6KBjkgrG/+S37MMUrppeyFis715FtYLoBjz/oLvqNch2KYKThfoW1BrTQZpCq+sot1908yBhyUSJRsLqWra9NGM1E1Y+4NLbGwAHhPtuRMGIYDWks3zoyVFm6PvO</ds:X509Certificate>
-        </ds:X509Data>
-        <ds:KeyName>idp.elte.hu</ds:KeyName>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.elte.hu/auth/saml2/idp/ArtifactResolutionService.php" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.elte.hu/auth/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.elte.hu/auth/saml2/idp/SSOService.php"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="hu">Eötvös Loránd Tudományegyetem</OrganizationName>
-    <OrganizationName xml:lang="en">Eötvös Loránd University Budapest</OrganizationName>
-    <OrganizationDisplayName xml:lang="hu">Eötvös Loránd Tudományegyetem</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">Eötvös Loránd University Budapest</OrganizationDisplayName>
-    <OrganizationURL xml:lang="hu">http://iig.elte.hu</OrganizationURL>
-    <OrganizationURL xml:lang="en">http://iig.elte.hu</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>ELTE IIG Informatikai Szolgáltatási Osztály</SurName>
-    <EmailAddress>mailto:system@caesar.elte.hu</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="administrative">
-    <SurName>ELTE IIG Informatikai Szolgáltatási Osztály</SurName>
-    <EmailAddress>mailto:system@caesar.elte.hu</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="support">
-    <SurName>ELTE IIG Ügyféltámogatási Osztály</SurName>
-    <EmailAddress>mailto:operator@caesar.elte.hu</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.enib.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.enib.fr-idp-shibboleth.xml
deleted file mode 100644
index a88b83b7..00000000
--- a/swamid-interfederations-2.0/idp.enib.fr-idp-shibboleth.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.enib.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2013-01-28T16:44:01Z">
-      <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">enib.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">ENIB - Ecole Nationale d'Ingénieurs de Brest</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDFzCCAf+gAwIBAgIUIH+7zKjLBFasnSwAkq7HW97UJBwwDQYJKoZIhvcNAQEF
-BQAwFjEUMBIGA1UEAxMLaWRwLmVuaWIuZnIwHhcNMTIxMjE0MTYyODAzWhcNMzIx
-MjE0MTYyODAzWjAWMRQwEgYDVQQDEwtpZHAuZW5pYi5mcjCCASIwDQYJKoZIhvcN
-AQEBBQADggEPADCCAQoCggEBAIfAnsjxqLmzoMkWf45AjMNfFXQSOVwc55I6P+JQ
-ACcdaXeUxlT/7MU8GnG1VORPU2Mj/UVUHw3tJ7qDEpcJcX+PW0egZwxGt/R0K+v2
-pcpqjtLT2yQLf+wdQUsU5gMY5s1jmzlqgmQhwkl/5wMNlvkX4rNSvPeWHQ9j0cvB
-goXgzD8ewIhzsXi6kiTU9tjI6xjvOIfSj8GHmmizEkqcR+mSliYQxjP6IxmdsC3Z
-nI2Z91h0IqAhOxsjbaRLPijYcfXPUxePLau7OVUHxI7yC4VsOq5FUy2GwkG0DG9S
-xXzlG4mJ+pZKE3wVIc/xbAJ1so5eC8iYTOQv2yIBbn7hGlsCAwEAAaNdMFswOgYD
-VR0RBDMwMYILaWRwLmVuaWIuZnKGImh0dHBzOi8vaWRwLmVuaWIuZnIvaWRwL3No
-aWJib2xldGgwHQYDVR0OBBYEFLjYoxphKa8kgdOgHBCQQLeS5987MA0GCSqGSIb3
-DQEBBQUAA4IBAQCHpO5p/7gsSJWbZkMq0DI+ryw8U4AGSGNGloV0HTkLjX0m1U/2
-V2N+K5TuSdbwkCYeHyGeTvd56L2Y3bGiLBWrjUiaaWr8g0PgMjlTuQ/WKRl2/DCq
-rxGJLLWkiCrieRzHbbYMGeFFaug8I1KdWhUfIxbvBaiFS9AbYWOlEpKKX1HwnXJ0
-3fjSkupZt66x5W3W+PVomTeRnd8RGTlF/rHwlgHRFaGtuRsJhn284vJDiRi1bJSl
-ngTcqpSdbFthXhhfmqsWKknKcozQblzbtaOeQNoYMHhnlnYEimZn4CubKzwUqo3d
-x9rJLKhFd2hFQM0S0IQ8rMA5jvwxHgI4losj
-					    </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://idp.enib.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.enib.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.enib.fr/idp/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">ENIB - Ecole Nationale d'Ingénieurs de Brest</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">ENIB - Ecole Nationale d'Ingénieurs de Brest</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <EmailAddress>cri@enib.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.enib.fr.xml b/swamid-interfederations-2.0/idp.enib.fr.xml
deleted file mode 100644
index a88b83b7..00000000
--- a/swamid-interfederations-2.0/idp.enib.fr.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.enib.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2013-01-28T16:44:01Z">
-      <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">enib.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">ENIB - Ecole Nationale d'Ingénieurs de Brest</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDFzCCAf+gAwIBAgIUIH+7zKjLBFasnSwAkq7HW97UJBwwDQYJKoZIhvcNAQEF
-BQAwFjEUMBIGA1UEAxMLaWRwLmVuaWIuZnIwHhcNMTIxMjE0MTYyODAzWhcNMzIx
-MjE0MTYyODAzWjAWMRQwEgYDVQQDEwtpZHAuZW5pYi5mcjCCASIwDQYJKoZIhvcN
-AQEBBQADggEPADCCAQoCggEBAIfAnsjxqLmzoMkWf45AjMNfFXQSOVwc55I6P+JQ
-ACcdaXeUxlT/7MU8GnG1VORPU2Mj/UVUHw3tJ7qDEpcJcX+PW0egZwxGt/R0K+v2
-pcpqjtLT2yQLf+wdQUsU5gMY5s1jmzlqgmQhwkl/5wMNlvkX4rNSvPeWHQ9j0cvB
-goXgzD8ewIhzsXi6kiTU9tjI6xjvOIfSj8GHmmizEkqcR+mSliYQxjP6IxmdsC3Z
-nI2Z91h0IqAhOxsjbaRLPijYcfXPUxePLau7OVUHxI7yC4VsOq5FUy2GwkG0DG9S
-xXzlG4mJ+pZKE3wVIc/xbAJ1so5eC8iYTOQv2yIBbn7hGlsCAwEAAaNdMFswOgYD
-VR0RBDMwMYILaWRwLmVuaWIuZnKGImh0dHBzOi8vaWRwLmVuaWIuZnIvaWRwL3No
-aWJib2xldGgwHQYDVR0OBBYEFLjYoxphKa8kgdOgHBCQQLeS5987MA0GCSqGSIb3
-DQEBBQUAA4IBAQCHpO5p/7gsSJWbZkMq0DI+ryw8U4AGSGNGloV0HTkLjX0m1U/2
-V2N+K5TuSdbwkCYeHyGeTvd56L2Y3bGiLBWrjUiaaWr8g0PgMjlTuQ/WKRl2/DCq
-rxGJLLWkiCrieRzHbbYMGeFFaug8I1KdWhUfIxbvBaiFS9AbYWOlEpKKX1HwnXJ0
-3fjSkupZt66x5W3W+PVomTeRnd8RGTlF/rHwlgHRFaGtuRsJhn284vJDiRi1bJSl
-ngTcqpSdbFthXhhfmqsWKknKcozQblzbtaOeQNoYMHhnlnYEimZn4CubKzwUqo3d
-x9rJLKhFd2hFQM0S0IQ8rMA5jvwxHgI4losj
-					    </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://idp.enib.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.enib.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.enib.fr/idp/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">ENIB - Ecole Nationale d'Ingénieurs de Brest</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">ENIB - Ecole Nationale d'Ingénieurs de Brest</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <EmailAddress>cri@enib.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.enit.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.enit.fr-idp-shibboleth.xml
deleted file mode 100644
index 3f52d8b4..00000000
--- a/swamid-interfederations-2.0/idp.enit.fr-idp-shibboleth.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.enit.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2013-10-08T16:39:40Z">
-      <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">enit.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">ENIT Ecole Nationale Ingénieurs Tarbes</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDGDCCAgCgAwIBAgIVAP4SLqi+2pminMR8C652zJZyirCyMA0GCSqGSIb3DQEB
-BQUAMBYxFDASBgNVBAMTC2lkcC5lbml0LmZyMB4XDTExMDYyODEyNTYyMVoXDTMx
-MDYyODEyNTYyMVowFjEUMBIGA1UEAxMLaWRwLmVuaXQuZnIwggEiMA0GCSqGSIb3
-DQEBAQUAA4IBDwAwggEKAoIBAQCBzWn8nDXCVpi+0KdNV9lzB3Q9HfFrZcMiLZaj
-o6rzdI1VtYnTE0fgHOfQX0fwiSBhRFmwaTMVHDy6jRZQWkB8Zg7IxBdvQnEn7tUx
-gLW0/gZ6Pgw4V/ZRimpWUn0Ga/s7EBv7Nsyn7HZhRLse0t7d8dTgAD01TivVHx54
-SEOiZF5b+GFJJjeGJHpxTwj7Dto0Pr0vhmQ+4C3ppPigrrideIc9EaiiW+kAm/q1
-4tNlttLaOUp3u5l+5lDfUlfcPiHYGCgXdmkJ/Hg6iIoYl6A+QdqiSFuUO8z/Jk0G
-mdGixe/BrTC0fWjwOF4EG8b2TbYYjBVU3/BwA319eP4tqdvHAgMBAAGjXTBbMDoG
-A1UdEQQzMDGCC2lkcC5lbml0LmZyhiJodHRwczovL2lkcC5lbml0LmZyL2lkcC9z
-aGliYm9sZXRoMB0GA1UdDgQWBBTidErzqd3TgXkbgGawiY3XHdywljANBgkqhkiG
-9w0BAQUFAAOCAQEAR2vDr33t9oTs96KycknrBoQk+I1nGpvaogo0qNbK1db0/NIW
-HjsiQgteVwvIm2BWsYjeaNiKI3VFAJ2jd0DVTIHASrq4Zuhv73VrEVfPPv/BcAot
-QyZM/38k0QU0zzr/XobhBP2pk5l7CMtYnmYKamQBvQrFq+JWe6mg6rXpLt5dai3q
-sHNSMvsplcRaenBakuEP6IJ5+X73tg4BvnTXHF8gSE5zoE1Fvoo4j8WlzX5VFpnm
-ynWSKIvu7JYtfAV0YXTDZ1JWanatwUv2PFIeGBfg8jh3f+xU7+nOiGsC3sOfr4dK
-YcFtZchDCMTlBKAW8xGvvTVS6hZSzntZe4Z97w==
-					    </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://idp.enit.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.enit.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.enit.fr/idp/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">ENIT Ecole Nationale Ingénieurs Tarbes</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">ENIT Ecole Nationale Ingénieurs Tarbes</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Viret</SurName>
-    <EmailAddress>jean-marc.viret@enit.fr</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <SurName>Barriere</SurName>
-    <EmailAddress>jean-philippe.barriere@enit.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.enit.fr.xml b/swamid-interfederations-2.0/idp.enit.fr.xml
deleted file mode 100644
index 3f52d8b4..00000000
--- a/swamid-interfederations-2.0/idp.enit.fr.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.enit.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2013-10-08T16:39:40Z">
-      <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">enit.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">ENIT Ecole Nationale Ingénieurs Tarbes</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDGDCCAgCgAwIBAgIVAP4SLqi+2pminMR8C652zJZyirCyMA0GCSqGSIb3DQEB
-BQUAMBYxFDASBgNVBAMTC2lkcC5lbml0LmZyMB4XDTExMDYyODEyNTYyMVoXDTMx
-MDYyODEyNTYyMVowFjEUMBIGA1UEAxMLaWRwLmVuaXQuZnIwggEiMA0GCSqGSIb3
-DQEBAQUAA4IBDwAwggEKAoIBAQCBzWn8nDXCVpi+0KdNV9lzB3Q9HfFrZcMiLZaj
-o6rzdI1VtYnTE0fgHOfQX0fwiSBhRFmwaTMVHDy6jRZQWkB8Zg7IxBdvQnEn7tUx
-gLW0/gZ6Pgw4V/ZRimpWUn0Ga/s7EBv7Nsyn7HZhRLse0t7d8dTgAD01TivVHx54
-SEOiZF5b+GFJJjeGJHpxTwj7Dto0Pr0vhmQ+4C3ppPigrrideIc9EaiiW+kAm/q1
-4tNlttLaOUp3u5l+5lDfUlfcPiHYGCgXdmkJ/Hg6iIoYl6A+QdqiSFuUO8z/Jk0G
-mdGixe/BrTC0fWjwOF4EG8b2TbYYjBVU3/BwA319eP4tqdvHAgMBAAGjXTBbMDoG
-A1UdEQQzMDGCC2lkcC5lbml0LmZyhiJodHRwczovL2lkcC5lbml0LmZyL2lkcC9z
-aGliYm9sZXRoMB0GA1UdDgQWBBTidErzqd3TgXkbgGawiY3XHdywljANBgkqhkiG
-9w0BAQUFAAOCAQEAR2vDr33t9oTs96KycknrBoQk+I1nGpvaogo0qNbK1db0/NIW
-HjsiQgteVwvIm2BWsYjeaNiKI3VFAJ2jd0DVTIHASrq4Zuhv73VrEVfPPv/BcAot
-QyZM/38k0QU0zzr/XobhBP2pk5l7CMtYnmYKamQBvQrFq+JWe6mg6rXpLt5dai3q
-sHNSMvsplcRaenBakuEP6IJ5+X73tg4BvnTXHF8gSE5zoE1Fvoo4j8WlzX5VFpnm
-ynWSKIvu7JYtfAV0YXTDZ1JWanatwUv2PFIeGBfg8jh3f+xU7+nOiGsC3sOfr4dK
-YcFtZchDCMTlBKAW8xGvvTVS6hZSzntZe4Z97w==
-					    </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://idp.enit.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.enit.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.enit.fr/idp/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">ENIT Ecole Nationale Ingénieurs Tarbes</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">ENIT Ecole Nationale Ingénieurs Tarbes</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Viret</SurName>
-    <EmailAddress>jean-marc.viret@enit.fr</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <SurName>Barriere</SurName>
-    <EmailAddress>jean-philippe.barriere@enit.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.enitab.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.enitab.fr-idp-shibboleth.xml
deleted file mode 100644
index 46af478a..00000000
--- a/swamid-interfederations-2.0/idp.enitab.fr-idp-shibboleth.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.enitab.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2010-09-15T13:59:18Z">
-      <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">enitab.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">ENITA de Bordeaux</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDHzCCAgegAwIBAgIUE3+YG/RODtnMAftUk+3SD6KCU4cwDQYJKoZIhvcNAQEF
-BQAwGDEWMBQGA1UEAxMNaWRwLmVuaXRhYi5mcjAeFw0xMDA3MDYxNDQzMjZaFw0z
-MDA3MDYxNDQzMjZaMBgxFjAUBgNVBAMTDWlkcC5lbml0YWIuZnIwggEiMA0GCSqG
-SIb3DQEBAQUAA4IBDwAwggEKAoIBAQCmAH5cAW+LbvKpIc1p6okFSKDpURUGUZrz
-58lRZ+/3G6Ec1sP25XXIoQYFH6M+9/SY6dxEKG3KdcdCp5bU7P2x32zuiIFSbefk
-whaKouyaDgqyl04ow0Dt1MsbxQ3f6RKZN1dTJe1B1VBG5xPdvCRX/E3qlslvpl/q
-1zoI73C4buazgandQQbqhlvPJgQHNjD5wPevxhNRdysnywxO3Zo4lmM3vDNv6/R4
-iHUDhyOz0MaJoSyeLLAOAXlOQRqaNJoMC1EDgSD2M8763XvCjTyvs4Wz5/jp3CxP
-fwtDJ0gq9jPFrBj8v8Ls62Ps32p1LS9mEy9Q8wvc06ePY6XQSy+nAgMBAAGjYTBf
-MD4GA1UdEQQ3MDWCDWlkcC5lbml0YWIuZnKGJGh0dHBzOi8vaWRwLmVuaXRhYi5m
-ci9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQULabgfYRKdPMaeTNuFAvY4XAW8p4w
-DQYJKoZIhvcNAQEFBQADggEBAJUlgO7TmUkBy+szO2JL3nc4ZdfPrGzBqkcfSQPq
-JlY3pZjMX9AJOuRUTXfwuc6A5sTZMu56lHoncJZr/crOHXj7NCMiV99V0M9DNk3s
-8iZ7Kdnziura1Btg3158+rNpgbgbtjOxq5tQbxDw41W4M+VOT76ttdJjq3QIiAvQ
-OCuuoL5lcVnAieikeHHCSwqgj6RRMf+EWSMO+eW8YqTlpdMvavscMOAjr3Lqhrlw
-wBA6a+2VH2OCL4wwK43tVucNVmqIEl7ShfcO5MmdRDwvjA03MPIzYO8a415s/2g3
-iq+XHGvfQ2g2DFN4oXfSkv/A0TVmwWxiqyd8SJ77zNILG4o=
-					    </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://idp.enitab.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.enitab.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.enitab.fr/idp/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">ENITA de Bordeaux</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">ENITA de Bordeaux</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>MEUNIER Richard</SurName>
-    <EmailAddress>r-meunier@enitab.fr</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <SurName>PRIOUX Pascal</SurName>
-    <EmailAddress>ppx@enitab.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.enitab.fr.xml b/swamid-interfederations-2.0/idp.enitab.fr.xml
deleted file mode 100644
index 46af478a..00000000
--- a/swamid-interfederations-2.0/idp.enitab.fr.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.enitab.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2010-09-15T13:59:18Z">
-      <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">enitab.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">ENITA de Bordeaux</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDHzCCAgegAwIBAgIUE3+YG/RODtnMAftUk+3SD6KCU4cwDQYJKoZIhvcNAQEF
-BQAwGDEWMBQGA1UEAxMNaWRwLmVuaXRhYi5mcjAeFw0xMDA3MDYxNDQzMjZaFw0z
-MDA3MDYxNDQzMjZaMBgxFjAUBgNVBAMTDWlkcC5lbml0YWIuZnIwggEiMA0GCSqG
-SIb3DQEBAQUAA4IBDwAwggEKAoIBAQCmAH5cAW+LbvKpIc1p6okFSKDpURUGUZrz
-58lRZ+/3G6Ec1sP25XXIoQYFH6M+9/SY6dxEKG3KdcdCp5bU7P2x32zuiIFSbefk
-whaKouyaDgqyl04ow0Dt1MsbxQ3f6RKZN1dTJe1B1VBG5xPdvCRX/E3qlslvpl/q
-1zoI73C4buazgandQQbqhlvPJgQHNjD5wPevxhNRdysnywxO3Zo4lmM3vDNv6/R4
-iHUDhyOz0MaJoSyeLLAOAXlOQRqaNJoMC1EDgSD2M8763XvCjTyvs4Wz5/jp3CxP
-fwtDJ0gq9jPFrBj8v8Ls62Ps32p1LS9mEy9Q8wvc06ePY6XQSy+nAgMBAAGjYTBf
-MD4GA1UdEQQ3MDWCDWlkcC5lbml0YWIuZnKGJGh0dHBzOi8vaWRwLmVuaXRhYi5m
-ci9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQULabgfYRKdPMaeTNuFAvY4XAW8p4w
-DQYJKoZIhvcNAQEFBQADggEBAJUlgO7TmUkBy+szO2JL3nc4ZdfPrGzBqkcfSQPq
-JlY3pZjMX9AJOuRUTXfwuc6A5sTZMu56lHoncJZr/crOHXj7NCMiV99V0M9DNk3s
-8iZ7Kdnziura1Btg3158+rNpgbgbtjOxq5tQbxDw41W4M+VOT76ttdJjq3QIiAvQ
-OCuuoL5lcVnAieikeHHCSwqgj6RRMf+EWSMO+eW8YqTlpdMvavscMOAjr3Lqhrlw
-wBA6a+2VH2OCL4wwK43tVucNVmqIEl7ShfcO5MmdRDwvjA03MPIzYO8a415s/2g3
-iq+XHGvfQ2g2DFN4oXfSkv/A0TVmwWxiqyd8SJ77zNILG4o=
-					    </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://idp.enitab.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.enitab.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.enitab.fr/idp/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">ENITA de Bordeaux</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">ENITA de Bordeaux</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>MEUNIER Richard</SurName>
-    <EmailAddress>r-meunier@enitab.fr</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <SurName>PRIOUX Pascal</SurName>
-    <EmailAddress>ppx@enitab.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.ens-cachan.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.ens-cachan.fr-idp-shibboleth.xml
deleted file mode 100644
index 9a5cb269..00000000
--- a/swamid-interfederations-2.0/idp.ens-cachan.fr-idp-shibboleth.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://idp.ens-cachan.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2012-03-26T11:25:12Z">
-      <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-cachan.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">ENS de Cachan</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIEbzCCA1egAwIBAgIQBrpuBObhBogKlHNCdbsTdDANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTE0MDQwODAwMDAwMFoXDTE3MDQwNzIzNTk1OVowPzEhMB8GA1UE
-CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRowGAYDVQQDExFpZHAuZW5zLWNh
-Y2hhbi5mcjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANEXMkxFCzXc
-0fnyg1iSqsCVQDAQANEoSYEoifDOBrGxyLUs9NeYPWxqZ5eTbTb5Nf0eoQVYfdw1
-7UPguHsYrH8sJCJvt6l6E45QB8c4dms2dq6L5hC/Nte0IE9PnnZZFeZyC0VEc/or
-/QAdp7KqtuSYUMMfcZa9KmKewq5Wk2q450hoJXt1P2SfbMg1d6upGchBaaIzRGfr
-H6EkW9iWkZ59faXV4D/5lQIxFBegQZdc/3aQhRBANOJf+Kns0CFNa4pKdokyOWmN
-QIwqNz/gbDhmoihcO/lFdzyl5wYFm+AyeaN2EJAyJGc05GSZqHJ37xqR9f9k3aSe
-w9wqLwHCnZsCAwEAAaOCAW4wggFqMB8GA1UdIwQYMBaAFAy9k2gM896ro0lrKzdX
-R+qQ47ntMB0GA1UdDgQWBBRY6tyt/yDskMb5Xs6pNDkIhZmCmjAOBgNVHQ8BAf8E
-BAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUH
-AwIwIgYDVR0gBBswGTANBgsrBgEEAbIxAQICHTAIBgZngQwBAgEwOgYDVR0fBDMw
-MTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5j
-cmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRjcy50
-ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDovL29j
-c3AudGNzLnRlcmVuYS5vcmcwHAYDVR0RBBUwE4IRaWRwLmVucy1jYWNoYW4uZnIw
-DQYJKoZIhvcNAQEFBQADggEBAFIGuxBICKfh41j7d4yN5dbJglRPBjA3hR+I17+C
-RGHKYhlnkLIka3w82T1jJFfKrcsBhJOXDuXTMY7gTijYg04cxPj2cQlOX9JRi13F
-wH0xnR1lid85jEmF7hesb8+soZODRltJl23UVA5xlUUNN5fyq/2+u49XDgGC7fCo
-xk4SF1WcnXvDZ6ly2SEhz/HkjpnTTFf44gnL8Xb3eiDdMfHp58Uz6eyqFgv1vG45
-UPahQ2nS0Lvr4xj89XvWXH9lDb5s5n2FT5RO90LBfKxIntzaV8ETBCg82d6YazQ1
-FMAUtMExS5hnbLUzHXkoy/XY1GSOFrdo+xC3J8W5X0qykgE=
-					    </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>
-					      MIIDLzCCAhegAwIBAgIUc0v583FVYdPbzKH4phM2yzqVs+gwDQYJKoZIhvcNAQEF
-BQAwHDEaMBgGA1UEAxMRaWRwLmVucy1jYWNoYW4uZnIwHhcNMTIwMTE4MTUzODA5
-WhcNMzIwMTE4MTUzODA5WjAcMRowGAYDVQQDExFpZHAuZW5zLWNhY2hhbi5mcjCC
-ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJqkeVKNEl2sPzNSgS376od2
-d5WtlpzbZmHWi0r7qolGnFvdsGI17nF+5rrmJQWgOhUk28BscIORdBWmZ+heH2uj
-Vg9kB6ScbWClFwmVSJvs0DKTNblpGKvkoq2K5/O5eGkfxUFk2bVTuS0LCex8pHF7
-dUg4ZT54voceu1rTysufBO75M+VgpdOFSXQE0I2neY7ZsshFJKY9dldlTBGBQczN
-wxk69FKpovZ5Mn8WtRqd11mebDd3lnRrn9r6U3cCo8qarTYde9DPjSJlww33Xp4r
-6ud/Vve++tw26PstOBeiNGEQqlAmSftbTbFBRvExwcVT0c+ej9Ex1S+jV7le/CsC
-AwEAAaNpMGcwRgYDVR0RBD8wPYIRaWRwLmVucy1jYWNoYW4uZnKGKGh0dHBzOi8v
-aWRwLmVucy1jYWNoYW4uZnIvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFPCHdSuO
-sn5GdKlPsFmMdLGKi9fnMA0GCSqGSIb3DQEBBQUAA4IBAQB6F+ZMPSjvDqel8H5g
-hgWoE4y07lxcD/Fq/nlfLMvgZrcWPHvP2Sv6w8VCjPSQ+y6QcXxrxCPbVRqLRScA
-gs9ihdB4n/esZyuX/RAYcpW5sJjq5LEfgxuLNbj5TLpnMpx+pqVzMa/MaOUfwXcp
-cswXnyQAsJBx+5j6t0NPONYAPkjHEFhI0CKHmJ7EJ2Ipln1VPhuoYj1/CbSbpjM5
-Yi2MEZIFtlIvQPeI8ZiBo33ciNakrTjsM8hxVuEdTcmzmBblgQm8O7Rbeh68WgmS
-g/V6L5+BN6Eoy8lbisNWOb+pqQIXDwcjRTqpk/896NzDC+LYe9u3DifcfhIhdD5y
-XnpY
-					    </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://idp.ens-cachan.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ens-cachan.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.ens-cachan.fr/idp/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">ENS de Cachan</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">ENS de Cachan</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Sabrina LOUISON-FRANCOIS</SurName>
-    <EmailAddress>sabrina.louison-francois@ens-cachan.fr</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <SurName>Pascal SOULLARD</SurName>
-    <EmailAddress>pascal.soullard@ens-cachan.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.ens-cachan.fr.xml b/swamid-interfederations-2.0/idp.ens-cachan.fr.xml
deleted file mode 100644
index 9a5cb269..00000000
--- a/swamid-interfederations-2.0/idp.ens-cachan.fr.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://idp.ens-cachan.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2012-03-26T11:25:12Z">
-      <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-cachan.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">ENS de Cachan</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIEbzCCA1egAwIBAgIQBrpuBObhBogKlHNCdbsTdDANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTE0MDQwODAwMDAwMFoXDTE3MDQwNzIzNTk1OVowPzEhMB8GA1UE
-CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRowGAYDVQQDExFpZHAuZW5zLWNh
-Y2hhbi5mcjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANEXMkxFCzXc
-0fnyg1iSqsCVQDAQANEoSYEoifDOBrGxyLUs9NeYPWxqZ5eTbTb5Nf0eoQVYfdw1
-7UPguHsYrH8sJCJvt6l6E45QB8c4dms2dq6L5hC/Nte0IE9PnnZZFeZyC0VEc/or
-/QAdp7KqtuSYUMMfcZa9KmKewq5Wk2q450hoJXt1P2SfbMg1d6upGchBaaIzRGfr
-H6EkW9iWkZ59faXV4D/5lQIxFBegQZdc/3aQhRBANOJf+Kns0CFNa4pKdokyOWmN
-QIwqNz/gbDhmoihcO/lFdzyl5wYFm+AyeaN2EJAyJGc05GSZqHJ37xqR9f9k3aSe
-w9wqLwHCnZsCAwEAAaOCAW4wggFqMB8GA1UdIwQYMBaAFAy9k2gM896ro0lrKzdX
-R+qQ47ntMB0GA1UdDgQWBBRY6tyt/yDskMb5Xs6pNDkIhZmCmjAOBgNVHQ8BAf8E
-BAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUH
-AwIwIgYDVR0gBBswGTANBgsrBgEEAbIxAQICHTAIBgZngQwBAgEwOgYDVR0fBDMw
-MTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5j
-cmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRjcy50
-ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDovL29j
-c3AudGNzLnRlcmVuYS5vcmcwHAYDVR0RBBUwE4IRaWRwLmVucy1jYWNoYW4uZnIw
-DQYJKoZIhvcNAQEFBQADggEBAFIGuxBICKfh41j7d4yN5dbJglRPBjA3hR+I17+C
-RGHKYhlnkLIka3w82T1jJFfKrcsBhJOXDuXTMY7gTijYg04cxPj2cQlOX9JRi13F
-wH0xnR1lid85jEmF7hesb8+soZODRltJl23UVA5xlUUNN5fyq/2+u49XDgGC7fCo
-xk4SF1WcnXvDZ6ly2SEhz/HkjpnTTFf44gnL8Xb3eiDdMfHp58Uz6eyqFgv1vG45
-UPahQ2nS0Lvr4xj89XvWXH9lDb5s5n2FT5RO90LBfKxIntzaV8ETBCg82d6YazQ1
-FMAUtMExS5hnbLUzHXkoy/XY1GSOFrdo+xC3J8W5X0qykgE=
-					    </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>
-					      MIIDLzCCAhegAwIBAgIUc0v583FVYdPbzKH4phM2yzqVs+gwDQYJKoZIhvcNAQEF
-BQAwHDEaMBgGA1UEAxMRaWRwLmVucy1jYWNoYW4uZnIwHhcNMTIwMTE4MTUzODA5
-WhcNMzIwMTE4MTUzODA5WjAcMRowGAYDVQQDExFpZHAuZW5zLWNhY2hhbi5mcjCC
-ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJqkeVKNEl2sPzNSgS376od2
-d5WtlpzbZmHWi0r7qolGnFvdsGI17nF+5rrmJQWgOhUk28BscIORdBWmZ+heH2uj
-Vg9kB6ScbWClFwmVSJvs0DKTNblpGKvkoq2K5/O5eGkfxUFk2bVTuS0LCex8pHF7
-dUg4ZT54voceu1rTysufBO75M+VgpdOFSXQE0I2neY7ZsshFJKY9dldlTBGBQczN
-wxk69FKpovZ5Mn8WtRqd11mebDd3lnRrn9r6U3cCo8qarTYde9DPjSJlww33Xp4r
-6ud/Vve++tw26PstOBeiNGEQqlAmSftbTbFBRvExwcVT0c+ej9Ex1S+jV7le/CsC
-AwEAAaNpMGcwRgYDVR0RBD8wPYIRaWRwLmVucy1jYWNoYW4uZnKGKGh0dHBzOi8v
-aWRwLmVucy1jYWNoYW4uZnIvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFPCHdSuO
-sn5GdKlPsFmMdLGKi9fnMA0GCSqGSIb3DQEBBQUAA4IBAQB6F+ZMPSjvDqel8H5g
-hgWoE4y07lxcD/Fq/nlfLMvgZrcWPHvP2Sv6w8VCjPSQ+y6QcXxrxCPbVRqLRScA
-gs9ihdB4n/esZyuX/RAYcpW5sJjq5LEfgxuLNbj5TLpnMpx+pqVzMa/MaOUfwXcp
-cswXnyQAsJBx+5j6t0NPONYAPkjHEFhI0CKHmJ7EJ2Ipln1VPhuoYj1/CbSbpjM5
-Yi2MEZIFtlIvQPeI8ZiBo33ciNakrTjsM8hxVuEdTcmzmBblgQm8O7Rbeh68WgmS
-g/V6L5+BN6Eoy8lbisNWOb+pqQIXDwcjRTqpk/896NzDC+LYe9u3DifcfhIhdD5y
-XnpY
-					    </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://idp.ens-cachan.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ens-cachan.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.ens-cachan.fr/idp/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">ENS de Cachan</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">ENS de Cachan</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Sabrina LOUISON-FRANCOIS</SurName>
-    <EmailAddress>sabrina.louison-francois@ens-cachan.fr</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <SurName>Pascal SOULLARD</SurName>
-    <EmailAddress>pascal.soullard@ens-cachan.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.ens.fr-idp-idp.xml b/swamid-interfederations-2.0/idp.ens.fr-idp-idp.xml
deleted file mode 100644
index 4d67bbfa..00000000
--- a/swamid-interfederations-2.0/idp.ens.fr-idp-idp.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.ens.fr/idp/idp">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2012-01-18T15:41:42Z">
-      <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.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">Ecole normale supérieure</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDEzCCAfugAwIBAgIUUlGCB1tXdKMlojKQasf9KdmcqBkwDQYJKoZIhvcNAQEF
-BQAwFTETMBEGA1UEAxMKaWRwLmVucy5mcjAeFw0xMTA4MDMwOTIzMDdaFw0zMTA4
-MDMwOTIzMDdaMBUxEzARBgNVBAMTCmlkcC5lbnMuZnIwggEiMA0GCSqGSIb3DQEB
-AQUAA4IBDwAwggEKAoIBAQC7h6xC+WGiUlpC70MJcuYS8Oc9FhxbVbg33IE1bM4R
-4bLY6ve5nNq4yE2EaTtYy1qskb3B55l6M1nSGKxl3Ey5ovh4cBE5r6fd2fjwlkgB
-5hqNxAbZhA9NPoval38EMYlepR6QtJny+faKWmCe9h4G9MRD+I8tP35z7Gq+3bPT
-ivLLgzBjGumdyj0ggNN/qvd1EisO3TPB+DHR9ygtRm6iNcV7om25k4QZVMHqNyKL
-8J/XDkBkyqqZPJv30xM5xfBP6dK6eRYOLXOCvdwuWNwqS5mtItc+b8S3Oj5K5AcR
-EuDXjgEMCRXo8eNxkjbJlGkgD0l2O0pXJhZFjr+ygsclAgMBAAGjWzBZMDgGA1Ud
-EQQxMC+CCmlkcC5lbnMuZnKGIWh0dHBzOi8vaWRwLmVucy5mci9pZHAvc2hpYmJv
-bGV0aDAdBgNVHQ4EFgQUHX2nM2/snLOaYle+MS5sYYpqXWAwDQYJKoZIhvcNAQEF
-BQADggEBAE09V2ugOzVp7Ow5RQWnsKEgkdIqcNiXcjZTLqCTmbHmG3kGlRG6h0vx
-gy83fcPTkzdaI6ZwVWQF8b+T4Pl+0o1x9vk9CrGHMP0I2smHc1vp/Xqsk+d03tRx
-D2hRBVIDMR95A1pa4yFD2NrWQSLcpfzo3I1TyktpQsncW6LGr7DFi0WwiUAKXO2n
-1Vb9HK0GFd1U2HbFaF5Qc0Hu7rB0UCCmMBzu8brmlMsBgI9Y66zu19Rhmbyx/PdM
-xwVSXwnkIA97hjG91++g6nE8RqtobQ6nIiz3Gv/JjedaSpF5QuRNM8nJYS8Uhmpn
-W+Qzc6tGLNnwcdwm81JXYmMju+ipIhM=
-					    </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://idp.ens.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ens.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.ens.fr/idp/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Ecole normale supérieure</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Ecole normale supérieure</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Julien Moutel</SurName>
-    <EmailAddress>julien.moutel@ens.fr</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <SurName>Jean-François Barbé</SurName>
-    <EmailAddress>jean-francois.barbe@ens.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.ens.fr.xml b/swamid-interfederations-2.0/idp.ens.fr.xml
deleted file mode 100644
index 4d67bbfa..00000000
--- a/swamid-interfederations-2.0/idp.ens.fr.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.ens.fr/idp/idp">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2012-01-18T15:41:42Z">
-      <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.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">Ecole normale supérieure</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDEzCCAfugAwIBAgIUUlGCB1tXdKMlojKQasf9KdmcqBkwDQYJKoZIhvcNAQEF
-BQAwFTETMBEGA1UEAxMKaWRwLmVucy5mcjAeFw0xMTA4MDMwOTIzMDdaFw0zMTA4
-MDMwOTIzMDdaMBUxEzARBgNVBAMTCmlkcC5lbnMuZnIwggEiMA0GCSqGSIb3DQEB
-AQUAA4IBDwAwggEKAoIBAQC7h6xC+WGiUlpC70MJcuYS8Oc9FhxbVbg33IE1bM4R
-4bLY6ve5nNq4yE2EaTtYy1qskb3B55l6M1nSGKxl3Ey5ovh4cBE5r6fd2fjwlkgB
-5hqNxAbZhA9NPoval38EMYlepR6QtJny+faKWmCe9h4G9MRD+I8tP35z7Gq+3bPT
-ivLLgzBjGumdyj0ggNN/qvd1EisO3TPB+DHR9ygtRm6iNcV7om25k4QZVMHqNyKL
-8J/XDkBkyqqZPJv30xM5xfBP6dK6eRYOLXOCvdwuWNwqS5mtItc+b8S3Oj5K5AcR
-EuDXjgEMCRXo8eNxkjbJlGkgD0l2O0pXJhZFjr+ygsclAgMBAAGjWzBZMDgGA1Ud
-EQQxMC+CCmlkcC5lbnMuZnKGIWh0dHBzOi8vaWRwLmVucy5mci9pZHAvc2hpYmJv
-bGV0aDAdBgNVHQ4EFgQUHX2nM2/snLOaYle+MS5sYYpqXWAwDQYJKoZIhvcNAQEF
-BQADggEBAE09V2ugOzVp7Ow5RQWnsKEgkdIqcNiXcjZTLqCTmbHmG3kGlRG6h0vx
-gy83fcPTkzdaI6ZwVWQF8b+T4Pl+0o1x9vk9CrGHMP0I2smHc1vp/Xqsk+d03tRx
-D2hRBVIDMR95A1pa4yFD2NrWQSLcpfzo3I1TyktpQsncW6LGr7DFi0WwiUAKXO2n
-1Vb9HK0GFd1U2HbFaF5Qc0Hu7rB0UCCmMBzu8brmlMsBgI9Y66zu19Rhmbyx/PdM
-xwVSXwnkIA97hjG91++g6nE8RqtobQ6nIiz3Gv/JjedaSpF5QuRNM8nJYS8Uhmpn
-W+Qzc6tGLNnwcdwm81JXYmMju+ipIhM=
-					    </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://idp.ens.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ens.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.ens.fr/idp/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Ecole normale supérieure</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Ecole normale supérieure</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Julien Moutel</SurName>
-    <EmailAddress>julien.moutel@ens.fr</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <SurName>Jean-François Barbé</SurName>
-    <EmailAddress>jean-francois.barbe@ens.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.ensai.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.ensai.fr-idp-shibboleth.xml
deleted file mode 100644
index 5e68c26c..00000000
--- a/swamid-interfederations-2.0/idp.ensai.fr-idp-shibboleth.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.ensai.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2011-11-18T16:49:18Z">
-      <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">ensai.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">ENSAI - Ecole Nationale Statistique Analyse de l'Information</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDGzCCAgOgAwIBAgIUBcH+nan7a+sFhj5CUOXlWAboLgAwDQYJKoZIhvcNAQEF
-BQAwFzEVMBMGA1UEAxMMaWRwLmVuc2FpLmZyMB4XDTExMTExNjEwMDc0M1oXDTMx
-MTExNjEwMDc0M1owFzEVMBMGA1UEAxMMaWRwLmVuc2FpLmZyMIIBIjANBgkqhkiG
-9w0BAQEFAAOCAQ8AMIIBCgKCAQEAjFY36uWwrcZiSD/8ZApHmMQ+SEkM+LD2bzJc
-6ydkDt2kbwWD7yj91jKyIcgiPa+npM8yPSUObi5teu1dY9v/xXb3tBfMbrHauNqD
-EDIcYlUBOmmv0hwDeMAPlguEGBf/Ebw8QQf6ndC//6jZh4Lsk/DUmLpko4rGMEd7
-vh7knLGbVRO+1ApqBUzL5qsdpI/xL/aevT02hlDDtjBvSmg7QRe/33T/8UPB63w1
-yef4g8Pe+u2y0SaP1LbHok4yuRDZtAF/lFjx4e8F561gTtvPYAsOWFnMyVo4FIvH
-TvE+wO8y8SSz9LqkU1Yohwez+FCXWoQuE9eYrJR3p53Q7gpcLwIDAQABo18wXTA8
-BgNVHREENTAzggxpZHAuZW5zYWkuZnKGI2h0dHBzOi8vaWRwLmVuc2FpLmZyL2lk
-cC9zaGliYm9sZXRoMB0GA1UdDgQWBBRK4qgy029V/NzztuGy/V9sjOs1+DANBgkq
-hkiG9w0BAQUFAAOCAQEADpOdVAvfnmUypEQYqmevrRFL+06paiEiMUUbS/+pRlvq
-JoaWPqvM2BASwe4WlL3sNgLBwRjybMMgTcGOAFlfLGmYG1JvDjJ5EXPV5CUnKMxs
-B4eJf9U+c24UGeDezM+BE4A3EarzD7k3X7KBO28w4LtNocZgxQ1bIwAnbjJxPL9K
-4+qYNbni8ry6QGE5U7x7VwmAC1IgPbxnSF3Xzao8COx/20E9jvhpdkpLBlgXAWxg
-Ku0oBaOhZYXD5qoSkqQiWBn5DWsGQq5W/1USeHBmmtRHJ7zPGZ0JP9PQ5lzliwMJ
-xBqVx8zWoO5ejvsjqLMYbxXbqd/IdBVG97DCLWYSxA==
-					    </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://idp.ensai.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ensai.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.ensai.fr/idp/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">ENSAI - Ecole Nationale Statistique Analyse de l'Information</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">ENSAI - Ecole Nationale Statistique Analyse de l'Information</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <EmailAddress>dsi@ensai.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.ensai.fr.xml b/swamid-interfederations-2.0/idp.ensai.fr.xml
deleted file mode 100644
index 5e68c26c..00000000
--- a/swamid-interfederations-2.0/idp.ensai.fr.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.ensai.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2011-11-18T16:49:18Z">
-      <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">ensai.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">ENSAI - Ecole Nationale Statistique Analyse de l'Information</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDGzCCAgOgAwIBAgIUBcH+nan7a+sFhj5CUOXlWAboLgAwDQYJKoZIhvcNAQEF
-BQAwFzEVMBMGA1UEAxMMaWRwLmVuc2FpLmZyMB4XDTExMTExNjEwMDc0M1oXDTMx
-MTExNjEwMDc0M1owFzEVMBMGA1UEAxMMaWRwLmVuc2FpLmZyMIIBIjANBgkqhkiG
-9w0BAQEFAAOCAQ8AMIIBCgKCAQEAjFY36uWwrcZiSD/8ZApHmMQ+SEkM+LD2bzJc
-6ydkDt2kbwWD7yj91jKyIcgiPa+npM8yPSUObi5teu1dY9v/xXb3tBfMbrHauNqD
-EDIcYlUBOmmv0hwDeMAPlguEGBf/Ebw8QQf6ndC//6jZh4Lsk/DUmLpko4rGMEd7
-vh7knLGbVRO+1ApqBUzL5qsdpI/xL/aevT02hlDDtjBvSmg7QRe/33T/8UPB63w1
-yef4g8Pe+u2y0SaP1LbHok4yuRDZtAF/lFjx4e8F561gTtvPYAsOWFnMyVo4FIvH
-TvE+wO8y8SSz9LqkU1Yohwez+FCXWoQuE9eYrJR3p53Q7gpcLwIDAQABo18wXTA8
-BgNVHREENTAzggxpZHAuZW5zYWkuZnKGI2h0dHBzOi8vaWRwLmVuc2FpLmZyL2lk
-cC9zaGliYm9sZXRoMB0GA1UdDgQWBBRK4qgy029V/NzztuGy/V9sjOs1+DANBgkq
-hkiG9w0BAQUFAAOCAQEADpOdVAvfnmUypEQYqmevrRFL+06paiEiMUUbS/+pRlvq
-JoaWPqvM2BASwe4WlL3sNgLBwRjybMMgTcGOAFlfLGmYG1JvDjJ5EXPV5CUnKMxs
-B4eJf9U+c24UGeDezM+BE4A3EarzD7k3X7KBO28w4LtNocZgxQ1bIwAnbjJxPL9K
-4+qYNbni8ry6QGE5U7x7VwmAC1IgPbxnSF3Xzao8COx/20E9jvhpdkpLBlgXAWxg
-Ku0oBaOhZYXD5qoSkqQiWBn5DWsGQq5W/1USeHBmmtRHJ7zPGZ0JP9PQ5lzliwMJ
-xBqVx8zWoO5ejvsjqLMYbxXbqd/IdBVG97DCLWYSxA==
-					    </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://idp.ensai.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ensai.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.ensai.fr/idp/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">ENSAI - Ecole Nationale Statistique Analyse de l'Information</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">ENSAI - Ecole Nationale Statistique Analyse de l'Information</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <EmailAddress>dsi@ensai.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.ensait.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.ensait.fr-idp-shibboleth.xml
deleted file mode 100644
index 0f6cd566..00000000
--- a/swamid-interfederations-2.0/idp.ensait.fr-idp-shibboleth.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.ensait.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2012-11-06T17:33:56Z">
-      <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">ensait.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">ENSAIT - Roubaix</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDOzCCAiOgAwIBAgIUQaof2K6agQCF8gpgtk0a0RLQaWQwDQYJKoZIhvcNAQEF
-BQAwHzEdMBsGA1UEAxMUc2hpYmJvbGV0aC5lbnNhaXQuZnIwHhcNMTIwNTMwMjEz
-NDI0WhcNMzIwNTMwMjEzNDI0WjAfMR0wGwYDVQQDExRzaGliYm9sZXRoLmVuc2Fp
-dC5mcjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJbZ3w1hWqsxOWvC
-91NvUAw9j3ZoKxO/oOsMMEvUjqj4ByYVb9eBN62rCT14cjaadGwdKPjQlPZ9HDVs
-QIpjnQxazohlPsKYDzROQSuQEWzSWysl0fUtMTk2tTXn9fshyw2UFaheR/3gzHrw
-B4opDzZLPnaXvW2XfptE8QEt51+YWouoc7ZTGj6O35jWlijguScZmU54aN2KTLAe
-JLPVb/Sj6I70vpCEbTaIu7JKsl/ItbdG2AzCMP84a6Sy30Tb5ZYcJH9angf3KTkT
-QLi/03swqNUBoIk+ETYdrpjfXCv/pnzuyKEy+LDta70lJs7mfu/kngPaq98ntVmo
-XU4wE+0CAwEAAaNvMG0wTAYDVR0RBEUwQ4IUc2hpYmJvbGV0aC5lbnNhaXQuZnKG
-K2h0dHBzOi8vc2hpYmJvbGV0aC5lbnNhaXQuZnIvaWRwL3NoaWJib2xldGgwHQYD
-VR0OBBYEFKYKdm8Oq9xVUEY0k/00dVCpDDdlMA0GCSqGSIb3DQEBBQUAA4IBAQBD
-vKvLHs7gAJOPgG3fy1lfsAtqH6lvv5oEVMFl4Ko0mTvpAq+MBCd4pGVaH8JRMfK4
-OL+CPSRU/HNZ2DaglwXpRsO8eOawWAXRlBDvC62NufoXSEOTEOWrHL/n4KlF7yB9
-1BsDcBcKr3t8WCw1qPOBteOryF16tNw875qjgZrn5AmfobaC/Nw722oIN+I8f3vO
-gpUgOIXaS2fcmAZ4s9BYnfGgBGlP6PXF1FKeJtmO8JOl4CLZbP5y70qoJjb2xdcV
-C43cpFxAJzzjvIOU2iZuq8VgOYfGJhy2JGN1/OcVTzGu0dk31yUz/l1OLvvoIHeh
-LL0sXjeiiyK6lcUES5UR
-					    </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://idp.ensait.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ensait.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.ensait.fr/idp/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">ENSAIT - Roubaix</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">ENSAIT - Roubaix</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Vincent Dubreu</SurName>
-    <EmailAddress>vincent.dubreu@ensait.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.ensait.fr.xml b/swamid-interfederations-2.0/idp.ensait.fr.xml
deleted file mode 100644
index 0f6cd566..00000000
--- a/swamid-interfederations-2.0/idp.ensait.fr.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.ensait.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2012-11-06T17:33:56Z">
-      <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">ensait.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">ENSAIT - Roubaix</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDOzCCAiOgAwIBAgIUQaof2K6agQCF8gpgtk0a0RLQaWQwDQYJKoZIhvcNAQEF
-BQAwHzEdMBsGA1UEAxMUc2hpYmJvbGV0aC5lbnNhaXQuZnIwHhcNMTIwNTMwMjEz
-NDI0WhcNMzIwNTMwMjEzNDI0WjAfMR0wGwYDVQQDExRzaGliYm9sZXRoLmVuc2Fp
-dC5mcjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJbZ3w1hWqsxOWvC
-91NvUAw9j3ZoKxO/oOsMMEvUjqj4ByYVb9eBN62rCT14cjaadGwdKPjQlPZ9HDVs
-QIpjnQxazohlPsKYDzROQSuQEWzSWysl0fUtMTk2tTXn9fshyw2UFaheR/3gzHrw
-B4opDzZLPnaXvW2XfptE8QEt51+YWouoc7ZTGj6O35jWlijguScZmU54aN2KTLAe
-JLPVb/Sj6I70vpCEbTaIu7JKsl/ItbdG2AzCMP84a6Sy30Tb5ZYcJH9angf3KTkT
-QLi/03swqNUBoIk+ETYdrpjfXCv/pnzuyKEy+LDta70lJs7mfu/kngPaq98ntVmo
-XU4wE+0CAwEAAaNvMG0wTAYDVR0RBEUwQ4IUc2hpYmJvbGV0aC5lbnNhaXQuZnKG
-K2h0dHBzOi8vc2hpYmJvbGV0aC5lbnNhaXQuZnIvaWRwL3NoaWJib2xldGgwHQYD
-VR0OBBYEFKYKdm8Oq9xVUEY0k/00dVCpDDdlMA0GCSqGSIb3DQEBBQUAA4IBAQBD
-vKvLHs7gAJOPgG3fy1lfsAtqH6lvv5oEVMFl4Ko0mTvpAq+MBCd4pGVaH8JRMfK4
-OL+CPSRU/HNZ2DaglwXpRsO8eOawWAXRlBDvC62NufoXSEOTEOWrHL/n4KlF7yB9
-1BsDcBcKr3t8WCw1qPOBteOryF16tNw875qjgZrn5AmfobaC/Nw722oIN+I8f3vO
-gpUgOIXaS2fcmAZ4s9BYnfGgBGlP6PXF1FKeJtmO8JOl4CLZbP5y70qoJjb2xdcV
-C43cpFxAJzzjvIOU2iZuq8VgOYfGJhy2JGN1/OcVTzGu0dk31yUz/l1OLvvoIHeh
-LL0sXjeiiyK6lcUES5UR
-					    </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://idp.ensait.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ensait.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.ensait.fr/idp/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">ENSAIT - Roubaix</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">ENSAIT - Roubaix</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Vincent Dubreu</SurName>
-    <EmailAddress>vincent.dubreu@ensait.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.ensma.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.ensma.fr-idp-shibboleth.xml
deleted file mode 100644
index 5aebf336..00000000
--- a/swamid-interfederations-2.0/idp.ensma.fr-idp-shibboleth.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.ensma.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2013-12-05T14:28:28Z">
-      <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">ensma.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">ENSMA - Ecole Nationale Supérieure de Mécanique et d'Aérotechnique</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDHDCCAgSgAwIBAgIVAONDoCnsNCIcCqPLaGuGULtVfBEkMA0GCSqGSIb3DQEB
-BQUAMBcxFTATBgNVBAMTDGlkcC5lbnNtYS5mcjAeFw0xMzA5MDMxNTMzNDlaFw0z
-MzA5MDMxNTMzNDlaMBcxFTATBgNVBAMTDGlkcC5lbnNtYS5mcjCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBANogeeITK3rs1Zr84TOyih09tiR3YRSUNJ9A
-+Zy0IIcIk4qo8XA8j6IVUcjFcWJ6pg/Dted7Sc8O/FF9PGfPROPkWZiV6PVGtfYX
-fQR2x5w7ZrtBNIX5np+b5HlHgQQ8k4RfUmXbG6LolvBb5cHrgtHcdK7fHD2119J2
-sXN/JcF0ybdCJuRdvE05lPMVjMtgBd0Q6OovJBbJDQ6idEJj0j2yxf6jfqDEQaO1
-onzunPr65wMxBqYxhE1q8OC6uymLGwWfboKbPFwrxP5sa53UXHlMuvd7UPEG4mSQ
-VNZnwkGxIWU/RfuBi2mcRVKHP2CwhsPxQXJCFhc/nFELtsqm9/sCAwEAAaNfMF0w
-PAYDVR0RBDUwM4IMaWRwLmVuc21hLmZyhiNodHRwczovL2lkcC5lbnNtYS5mci9p
-ZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUuIffU6QF5T/auaaGjizZ2SlOp8cwDQYJ
-KoZIhvcNAQEFBQADggEBAKmtZ8NR9PcNGoFqlyD2oWq6FtufoSD7zOs8eaPJfaOa
-ZA1m7QwZ0znQnO2eU7d4+2eMtuHRW2g7zYNyRglX1CrkJLAtnOMue/cvWHtj1I42
-j+8FkTeCD1YKFjuXJz28GAivPF77ddBADJny1s+KW5SgNcqi2mpQ+S2wVglyTsJZ
-E02BPdMEqjjPsPpcO7B0HfPQfTk75REehiQGC/i5lR1OJ/9orUpJ8kc/YxOngp0I
-5tAzXV2kr8vn71UxzT2V9Le8UTrbtj4pIusrH7ngHOOt1W733OwN5JJE8iAozyVN
-LsxS0mdANFdLn6+QSsxJcvgWdJIwcB6mBawpewLxXmw=
-					    </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://idp.ensma.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ensma.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.ensma.fr/idp/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">ENSMA - Ecole Nationale Supérieure de Mécanique et d'Aérotechnique</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">ENSMA - Ecole Nationale Supérieure de Mécanique et d'Aérotechnique</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Edouard MOREAU</SurName>
-    <EmailAddress>edouard.moreau@ensma.fr</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <SurName>Patrice ALLARY</SurName>
-    <EmailAddress>patrice.allary@ensma.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.ensma.fr.xml b/swamid-interfederations-2.0/idp.ensma.fr.xml
deleted file mode 100644
index 5aebf336..00000000
--- a/swamid-interfederations-2.0/idp.ensma.fr.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.ensma.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2013-12-05T14:28:28Z">
-      <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">ensma.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">ENSMA - Ecole Nationale Supérieure de Mécanique et d'Aérotechnique</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDHDCCAgSgAwIBAgIVAONDoCnsNCIcCqPLaGuGULtVfBEkMA0GCSqGSIb3DQEB
-BQUAMBcxFTATBgNVBAMTDGlkcC5lbnNtYS5mcjAeFw0xMzA5MDMxNTMzNDlaFw0z
-MzA5MDMxNTMzNDlaMBcxFTATBgNVBAMTDGlkcC5lbnNtYS5mcjCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBANogeeITK3rs1Zr84TOyih09tiR3YRSUNJ9A
-+Zy0IIcIk4qo8XA8j6IVUcjFcWJ6pg/Dted7Sc8O/FF9PGfPROPkWZiV6PVGtfYX
-fQR2x5w7ZrtBNIX5np+b5HlHgQQ8k4RfUmXbG6LolvBb5cHrgtHcdK7fHD2119J2
-sXN/JcF0ybdCJuRdvE05lPMVjMtgBd0Q6OovJBbJDQ6idEJj0j2yxf6jfqDEQaO1
-onzunPr65wMxBqYxhE1q8OC6uymLGwWfboKbPFwrxP5sa53UXHlMuvd7UPEG4mSQ
-VNZnwkGxIWU/RfuBi2mcRVKHP2CwhsPxQXJCFhc/nFELtsqm9/sCAwEAAaNfMF0w
-PAYDVR0RBDUwM4IMaWRwLmVuc21hLmZyhiNodHRwczovL2lkcC5lbnNtYS5mci9p
-ZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUuIffU6QF5T/auaaGjizZ2SlOp8cwDQYJ
-KoZIhvcNAQEFBQADggEBAKmtZ8NR9PcNGoFqlyD2oWq6FtufoSD7zOs8eaPJfaOa
-ZA1m7QwZ0znQnO2eU7d4+2eMtuHRW2g7zYNyRglX1CrkJLAtnOMue/cvWHtj1I42
-j+8FkTeCD1YKFjuXJz28GAivPF77ddBADJny1s+KW5SgNcqi2mpQ+S2wVglyTsJZ
-E02BPdMEqjjPsPpcO7B0HfPQfTk75REehiQGC/i5lR1OJ/9orUpJ8kc/YxOngp0I
-5tAzXV2kr8vn71UxzT2V9Le8UTrbtj4pIusrH7ngHOOt1W733OwN5JJE8iAozyVN
-LsxS0mdANFdLn6+QSsxJcvgWdJIwcB6mBawpewLxXmw=
-					    </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://idp.ensma.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ensma.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.ensma.fr/idp/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">ENSMA - Ecole Nationale Supérieure de Mécanique et d'Aérotechnique</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">ENSMA - Ecole Nationale Supérieure de Mécanique et d'Aérotechnique</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Edouard MOREAU</SurName>
-    <EmailAddress>edouard.moreau@ensma.fr</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <SurName>Patrice ALLARY</SurName>
-    <EmailAddress>patrice.allary@ensma.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.enssib.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.enssib.fr-idp-shibboleth.xml
deleted file mode 100644
index 0530f280..00000000
--- a/swamid-interfederations-2.0/idp.enssib.fr-idp-shibboleth.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://idp.enssib.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2012-02-09T10:26:01Z">
-      <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">enssib.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">ENSSIB</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDIDCCAgigAwIBAgIVAJvmABrY/zRrXJu3cOVw4zlfFh6qMA0GCSqGSIb3DQEB
-BQUAMBgxFjAUBgNVBAMTDWlkcC5lbnNzaWIuZnIwHhcNMTIwMTMxMTYxOTAzWhcN
-MzIwMTMxMTYxOTAzWjAYMRYwFAYDVQQDEw1pZHAuZW5zc2liLmZyMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA03FT48G8rTsowAqD+4Z9CQk8myTkYZje
-+JH0a83a1iYEj4sBBftOlGJMOfbHS4bwidJO6Q1q0c7aQRD5xmNuqQYDudLlFhfg
-bZzaUTKX9CEbyazfvjf0aEUwxkH+ez1ULt5Z8NuECLAmHEUE5R4a3o2jYhpZSMcj
-heizmo+jXZc9rJXjGwe80u65xy+wI0ehV5POFCuML3lLxraBTTcm4sXm8JfpQZoE
-9HkM1gDyn+4+R9/W+Soc1382xwY5ZfgU49rQH9h21jB89LFDlno5H+gAewwLNVah
-+I3SnEm+qhnhOLn4WN5ZiTQXKM3j4OkGffEJH9mHcLA1LyUsJVhYUQIDAQABo2Ew
-XzA+BgNVHREENzA1gg1pZHAuZW5zc2liLmZyhiRodHRwczovL2lkcC5lbnNzaWIu
-ZnIvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFLwMl3n3xOC7r6xGK55bcvAYcnF/
-MA0GCSqGSIb3DQEBBQUAA4IBAQBKk2ZMuISXcOrJOZbRxuxbbKTJn113O4otW7AA
-ldWxlFtUyJrzEoVCu1nEtzS+pVP6hg/7t3lB3iQ17tiLHle7LHfEihkyDwsNVFpk
-W4dlYmetZT4l6CM3DESk2ak0KWUjHbniPHp+NPtK7sAwtfBwoCsJwU9vYF0ysB1S
-VqN43TT+z6fLLkYYkaYCEFJiZ5vhA8dpOfwpqxy0DyThzABg4egUKQbK5GZBixdD
-4YhyZ0Jc32mvyEqTVh4GTyyWn2PK7b+GY9Fd6FCBN1EDNXv4P+m11hiqhABd3Djp
-rAdVc6ukYTipKpuEb2afsqV7HRnwpfVkVt1QieIu1hurHlbR
-					    </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://idp.enssib.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.enssib.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.enssib.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">enssib.fr</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDIDCCAgigAwIBAgIVAJvmABrY/zRrXJu3cOVw4zlfFh6qMA0GCSqGSIb3DQEB
-BQUAMBgxFjAUBgNVBAMTDWlkcC5lbnNzaWIuZnIwHhcNMTIwMTMxMTYxOTAzWhcN
-MzIwMTMxMTYxOTAzWjAYMRYwFAYDVQQDEw1pZHAuZW5zc2liLmZyMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA03FT48G8rTsowAqD+4Z9CQk8myTkYZje
-+JH0a83a1iYEj4sBBftOlGJMOfbHS4bwidJO6Q1q0c7aQRD5xmNuqQYDudLlFhfg
-bZzaUTKX9CEbyazfvjf0aEUwxkH+ez1ULt5Z8NuECLAmHEUE5R4a3o2jYhpZSMcj
-heizmo+jXZc9rJXjGwe80u65xy+wI0ehV5POFCuML3lLxraBTTcm4sXm8JfpQZoE
-9HkM1gDyn+4+R9/W+Soc1382xwY5ZfgU49rQH9h21jB89LFDlno5H+gAewwLNVah
-+I3SnEm+qhnhOLn4WN5ZiTQXKM3j4OkGffEJH9mHcLA1LyUsJVhYUQIDAQABo2Ew
-XzA+BgNVHREENzA1gg1pZHAuZW5zc2liLmZyhiRodHRwczovL2lkcC5lbnNzaWIu
-ZnIvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFLwMl3n3xOC7r6xGK55bcvAYcnF/
-MA0GCSqGSIb3DQEBBQUAA4IBAQBKk2ZMuISXcOrJOZbRxuxbbKTJn113O4otW7AA
-ldWxlFtUyJrzEoVCu1nEtzS+pVP6hg/7t3lB3iQ17tiLHle7LHfEihkyDwsNVFpk
-W4dlYmetZT4l6CM3DESk2ak0KWUjHbniPHp+NPtK7sAwtfBwoCsJwU9vYF0ysB1S
-VqN43TT+z6fLLkYYkaYCEFJiZ5vhA8dpOfwpqxy0DyThzABg4egUKQbK5GZBixdD
-4YhyZ0Jc32mvyEqTVh4GTyyWn2PK7b+GY9Fd6FCBN1EDNXv4P+m11hiqhABd3Djp
-rAdVc6ukYTipKpuEb2afsqV7HRnwpfVkVt1QieIu1hurHlbR
-					    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.enssib.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">ENSSIB</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">ENSSIB</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.enssib.fr</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Sébastien BOUTELIER</SurName>
-    <EmailAddress>sebastien.boutelier@enssib.fr</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <SurName>Isabelle RECH-LE-RECIS</SurName>
-    <EmailAddress>isabelle.rech-le-recis@enssib.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.enssib.fr.xml b/swamid-interfederations-2.0/idp.enssib.fr.xml
deleted file mode 100644
index 0530f280..00000000
--- a/swamid-interfederations-2.0/idp.enssib.fr.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://idp.enssib.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2012-02-09T10:26:01Z">
-      <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">enssib.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">ENSSIB</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDIDCCAgigAwIBAgIVAJvmABrY/zRrXJu3cOVw4zlfFh6qMA0GCSqGSIb3DQEB
-BQUAMBgxFjAUBgNVBAMTDWlkcC5lbnNzaWIuZnIwHhcNMTIwMTMxMTYxOTAzWhcN
-MzIwMTMxMTYxOTAzWjAYMRYwFAYDVQQDEw1pZHAuZW5zc2liLmZyMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA03FT48G8rTsowAqD+4Z9CQk8myTkYZje
-+JH0a83a1iYEj4sBBftOlGJMOfbHS4bwidJO6Q1q0c7aQRD5xmNuqQYDudLlFhfg
-bZzaUTKX9CEbyazfvjf0aEUwxkH+ez1ULt5Z8NuECLAmHEUE5R4a3o2jYhpZSMcj
-heizmo+jXZc9rJXjGwe80u65xy+wI0ehV5POFCuML3lLxraBTTcm4sXm8JfpQZoE
-9HkM1gDyn+4+R9/W+Soc1382xwY5ZfgU49rQH9h21jB89LFDlno5H+gAewwLNVah
-+I3SnEm+qhnhOLn4WN5ZiTQXKM3j4OkGffEJH9mHcLA1LyUsJVhYUQIDAQABo2Ew
-XzA+BgNVHREENzA1gg1pZHAuZW5zc2liLmZyhiRodHRwczovL2lkcC5lbnNzaWIu
-ZnIvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFLwMl3n3xOC7r6xGK55bcvAYcnF/
-MA0GCSqGSIb3DQEBBQUAA4IBAQBKk2ZMuISXcOrJOZbRxuxbbKTJn113O4otW7AA
-ldWxlFtUyJrzEoVCu1nEtzS+pVP6hg/7t3lB3iQ17tiLHle7LHfEihkyDwsNVFpk
-W4dlYmetZT4l6CM3DESk2ak0KWUjHbniPHp+NPtK7sAwtfBwoCsJwU9vYF0ysB1S
-VqN43TT+z6fLLkYYkaYCEFJiZ5vhA8dpOfwpqxy0DyThzABg4egUKQbK5GZBixdD
-4YhyZ0Jc32mvyEqTVh4GTyyWn2PK7b+GY9Fd6FCBN1EDNXv4P+m11hiqhABd3Djp
-rAdVc6ukYTipKpuEb2afsqV7HRnwpfVkVt1QieIu1hurHlbR
-					    </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://idp.enssib.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.enssib.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.enssib.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">enssib.fr</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDIDCCAgigAwIBAgIVAJvmABrY/zRrXJu3cOVw4zlfFh6qMA0GCSqGSIb3DQEB
-BQUAMBgxFjAUBgNVBAMTDWlkcC5lbnNzaWIuZnIwHhcNMTIwMTMxMTYxOTAzWhcN
-MzIwMTMxMTYxOTAzWjAYMRYwFAYDVQQDEw1pZHAuZW5zc2liLmZyMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA03FT48G8rTsowAqD+4Z9CQk8myTkYZje
-+JH0a83a1iYEj4sBBftOlGJMOfbHS4bwidJO6Q1q0c7aQRD5xmNuqQYDudLlFhfg
-bZzaUTKX9CEbyazfvjf0aEUwxkH+ez1ULt5Z8NuECLAmHEUE5R4a3o2jYhpZSMcj
-heizmo+jXZc9rJXjGwe80u65xy+wI0ehV5POFCuML3lLxraBTTcm4sXm8JfpQZoE
-9HkM1gDyn+4+R9/W+Soc1382xwY5ZfgU49rQH9h21jB89LFDlno5H+gAewwLNVah
-+I3SnEm+qhnhOLn4WN5ZiTQXKM3j4OkGffEJH9mHcLA1LyUsJVhYUQIDAQABo2Ew
-XzA+BgNVHREENzA1gg1pZHAuZW5zc2liLmZyhiRodHRwczovL2lkcC5lbnNzaWIu
-ZnIvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFLwMl3n3xOC7r6xGK55bcvAYcnF/
-MA0GCSqGSIb3DQEBBQUAA4IBAQBKk2ZMuISXcOrJOZbRxuxbbKTJn113O4otW7AA
-ldWxlFtUyJrzEoVCu1nEtzS+pVP6hg/7t3lB3iQ17tiLHle7LHfEihkyDwsNVFpk
-W4dlYmetZT4l6CM3DESk2ak0KWUjHbniPHp+NPtK7sAwtfBwoCsJwU9vYF0ysB1S
-VqN43TT+z6fLLkYYkaYCEFJiZ5vhA8dpOfwpqxy0DyThzABg4egUKQbK5GZBixdD
-4YhyZ0Jc32mvyEqTVh4GTyyWn2PK7b+GY9Fd6FCBN1EDNXv4P+m11hiqhABd3Djp
-rAdVc6ukYTipKpuEb2afsqV7HRnwpfVkVt1QieIu1hurHlbR
-					    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.enssib.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">ENSSIB</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">ENSSIB</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.enssib.fr</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Sébastien BOUTELIER</SurName>
-    <EmailAddress>sebastien.boutelier@enssib.fr</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <SurName>Isabelle RECH-LE-RECIS</SurName>
-    <EmailAddress>isabelle.rech-le-recis@enssib.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.ent.dauphine.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.ent.dauphine.fr-idp-shibboleth.xml
deleted file mode 100644
index 515a16f2..00000000
--- a/swamid-interfederations-2.0/idp.ent.dauphine.fr-idp-shibboleth.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.ent.dauphine.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2011-01-28T11:26:21Z">
-      <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">dauphine.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">Université de Paris 9 - Dauphine</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDODCCAiCgAwIBAgIVAL8Gc+NXLeRBFscDZy7qdwGaAlMdMA0GCSqGSIb3DQEB
-BQUAMB4xHDAaBgNVBAMTE2lkcC5lbnQuZGF1cGhpbmUuZnIwHhcNMTEwMTI0MTgw
-ODU4WhcNMzEwMTI0MTgwODU4WjAeMRwwGgYDVQQDExNpZHAuZW50LmRhdXBoaW5l
-LmZyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuglXJZxWOmFxzj1u
-NPB0ExGFjXusnDSm+P3D4tWBIrmxVj1z9DK3S9nVUf4jDkSzslwhunSs1GBU0URt
-MDhQEkKCt9O30Fd4lIGjuH1DoFC/l1KF5plmIbEKkDrr3BMo7BtC+5VHYFm65Jgo
-AY+ZrBFFNj/CxYDx+oZ9gywwxuP2CGT59t9tRH0Sol4IzPJbcqDKBHGBsKrOajN9
-UAjkDxGnx5PjiLVy1raywgE3qKSW9sFy4rukFs6B1TLt1xXSmIhPme9Q2PNmNLsf
-H31l0mO491gWP5F6dz6OXqtrubBWuqjtEZNLcHL3eduHeUybgXnkWF84BV0376l9
-uDEdtwIDAQABo20wazBKBgNVHREEQzBBghNpZHAuZW50LmRhdXBoaW5lLmZyhipo
-dHRwczovL2lkcC5lbnQuZGF1cGhpbmUuZnIvaWRwL3NoaWJib2xldGgwHQYDVR0O
-BBYEFPaZs/R1MZFlljBBXfrcl1Z4jCNBMA0GCSqGSIb3DQEBBQUAA4IBAQBW53Ob
-BRvf38GLJi2TfLH/7HSL7cGlR2aNH2Gin7rumq2TNugtDlqxokdn5lZkr/5+s+Zu
-51/n8bawgIyTQdaSHxd0l46o80xKtVfjiWBUm6e1O2sKJmuahbv+Y5sqMW1wr12u
-th+XQOM174MQMWNMrS7EERMUs9tiBY7qXQTbAPKs+rssU3gRz1APUrZ1MSbwZ3he
-uy4IfdhPh/g3Z0/Xy+hcDYyw+jN4FfjemHHZ/y9No3OYrLBGH5YxpY5oRfEh1E2C
-uZUMXJWvgnx3iOoxoAAORWf106TxENjuBE4MbxOK0r7MOSmXjPINJrMTLue5hzZs
-+M9PCzhKsLPRd3lD
-					    </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://idp.ent.dauphine.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ent.dauphine.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.ent.dauphine.fr/idp/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Université de Paris 9 - Dauphine</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Université de Paris 9 - Dauphine</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Lionel LENOBLE</SurName>
-    <EmailAddress>lionel.lenoble@dauphine.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.ent.dauphine.fr.xml b/swamid-interfederations-2.0/idp.ent.dauphine.fr.xml
deleted file mode 100644
index 515a16f2..00000000
--- a/swamid-interfederations-2.0/idp.ent.dauphine.fr.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.ent.dauphine.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2011-01-28T11:26:21Z">
-      <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">dauphine.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">Université de Paris 9 - Dauphine</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDODCCAiCgAwIBAgIVAL8Gc+NXLeRBFscDZy7qdwGaAlMdMA0GCSqGSIb3DQEB
-BQUAMB4xHDAaBgNVBAMTE2lkcC5lbnQuZGF1cGhpbmUuZnIwHhcNMTEwMTI0MTgw
-ODU4WhcNMzEwMTI0MTgwODU4WjAeMRwwGgYDVQQDExNpZHAuZW50LmRhdXBoaW5l
-LmZyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuglXJZxWOmFxzj1u
-NPB0ExGFjXusnDSm+P3D4tWBIrmxVj1z9DK3S9nVUf4jDkSzslwhunSs1GBU0URt
-MDhQEkKCt9O30Fd4lIGjuH1DoFC/l1KF5plmIbEKkDrr3BMo7BtC+5VHYFm65Jgo
-AY+ZrBFFNj/CxYDx+oZ9gywwxuP2CGT59t9tRH0Sol4IzPJbcqDKBHGBsKrOajN9
-UAjkDxGnx5PjiLVy1raywgE3qKSW9sFy4rukFs6B1TLt1xXSmIhPme9Q2PNmNLsf
-H31l0mO491gWP5F6dz6OXqtrubBWuqjtEZNLcHL3eduHeUybgXnkWF84BV0376l9
-uDEdtwIDAQABo20wazBKBgNVHREEQzBBghNpZHAuZW50LmRhdXBoaW5lLmZyhipo
-dHRwczovL2lkcC5lbnQuZGF1cGhpbmUuZnIvaWRwL3NoaWJib2xldGgwHQYDVR0O
-BBYEFPaZs/R1MZFlljBBXfrcl1Z4jCNBMA0GCSqGSIb3DQEBBQUAA4IBAQBW53Ob
-BRvf38GLJi2TfLH/7HSL7cGlR2aNH2Gin7rumq2TNugtDlqxokdn5lZkr/5+s+Zu
-51/n8bawgIyTQdaSHxd0l46o80xKtVfjiWBUm6e1O2sKJmuahbv+Y5sqMW1wr12u
-th+XQOM174MQMWNMrS7EERMUs9tiBY7qXQTbAPKs+rssU3gRz1APUrZ1MSbwZ3he
-uy4IfdhPh/g3Z0/Xy+hcDYyw+jN4FfjemHHZ/y9No3OYrLBGH5YxpY5oRfEh1E2C
-uZUMXJWvgnx3iOoxoAAORWf106TxENjuBE4MbxOK0r7MOSmXjPINJrMTLue5hzZs
-+M9PCzhKsLPRd3lD
-					    </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://idp.ent.dauphine.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ent.dauphine.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.ent.dauphine.fr/idp/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Université de Paris 9 - Dauphine</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Université de Paris 9 - Dauphine</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Lionel LENOBLE</SurName>
-    <EmailAddress>lionel.lenoble@dauphine.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.entpe.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.entpe.fr-idp-shibboleth.xml
deleted file mode 100644
index c82f54dd..00000000
--- a/swamid-interfederations-2.0/idp.entpe.fr-idp-shibboleth.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://idp.entpe.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2012-10-05T09:54:38Z">
-      <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">entpe.net</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">entpe.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">ENTPE - Vaulx en Velin</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDHDCCAgSgAwIBAgIVAIcupykPhzWwN/P9ju7uKjH1/diEMA0GCSqGSIb3DQEB
-BQUAMBcxFTATBgNVBAMTDGlkcC5lbnRwZS5mcjAeFw0xMjA4MzAxMzQyMzRaFw0z
-MjA4MzAxMzQyMzRaMBcxFTATBgNVBAMTDGlkcC5lbnRwZS5mcjCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBAIBXq+m0dzCNCaWhUxNWKFezemlJDt+bxukb
-a8mtA3V2EXQnENCt8YQUC64SdA3TWwdx8IJ/YRIpTqbX8WssBaNXU2ugWbFkaJ2P
-2LUIAXTycbU+j2XzM1eonxfeqn8qcIEN4Saz65OiHtXBamjm4Uc3H5ICCLJJb+yB
-B96JQeScJU39kQEL26dVIJuaW5kjRNEQa2kZW9r2Ovf1mfiRcyXZBvYss4HTM0jV
-8Jo5xULb3fQXE7+s9dox218g/ITBtYnGBa38Og6dDTurbjuhyJNA/xWq0fbQp6K1
-OVLR64FG6gi/UHkG7SQlA40Jeb7dbi5ehocyfOjvPO5AH0UiUXcCAwEAAaNfMF0w
-PAYDVR0RBDUwM4IMaWRwLmVudHBlLmZyhiNodHRwczovL2lkcC5lbnRwZS5mci9p
-ZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUX9y2zApvJ+zBx2GaVq+hWcrLdTowDQYJ
-KoZIhvcNAQEFBQADggEBAEq1KyPR75ZoWdwLXL/z/dn0SPYRAyhQQizq7Oy9kqTL
-V8VoisIXbe+J1kLrgNTz27n7ly1ulJWT/NZcdAL0xoX4tDpBZLs/eLIfhKHpcyhl
-3GzzFSiFOVjz1NlaVwElBfPf7A4SZqWHgVZkrmKVt0I5Ai6ZKrARayGdQi0cvC43
-gPjZyS2WLKKQr3zO5RYT+D3Z2Cx+0buIdDWpfOawV8cMAVxkub7uvjgnt8LRddDn
-hz5Ka52K32oCM/oo9XNZsXDL7uA83DKl//sRCrRmbrtp0G1xUXzZa+vCbQ2ndUSX
-BY7XFJgwUuyw39r64rK9lOkAjCZntHyPjx/sy8m020A=
-					    </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://idp.entpe.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.entpe.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.entpe.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">entpe.net</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">entpe.fr</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDHDCCAgSgAwIBAgIVAIcupykPhzWwN/P9ju7uKjH1/diEMA0GCSqGSIb3DQEB
-BQUAMBcxFTATBgNVBAMTDGlkcC5lbnRwZS5mcjAeFw0xMjA4MzAxMzQyMzRaFw0z
-MjA4MzAxMzQyMzRaMBcxFTATBgNVBAMTDGlkcC5lbnRwZS5mcjCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBAIBXq+m0dzCNCaWhUxNWKFezemlJDt+bxukb
-a8mtA3V2EXQnENCt8YQUC64SdA3TWwdx8IJ/YRIpTqbX8WssBaNXU2ugWbFkaJ2P
-2LUIAXTycbU+j2XzM1eonxfeqn8qcIEN4Saz65OiHtXBamjm4Uc3H5ICCLJJb+yB
-B96JQeScJU39kQEL26dVIJuaW5kjRNEQa2kZW9r2Ovf1mfiRcyXZBvYss4HTM0jV
-8Jo5xULb3fQXE7+s9dox218g/ITBtYnGBa38Og6dDTurbjuhyJNA/xWq0fbQp6K1
-OVLR64FG6gi/UHkG7SQlA40Jeb7dbi5ehocyfOjvPO5AH0UiUXcCAwEAAaNfMF0w
-PAYDVR0RBDUwM4IMaWRwLmVudHBlLmZyhiNodHRwczovL2lkcC5lbnRwZS5mci9p
-ZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUX9y2zApvJ+zBx2GaVq+hWcrLdTowDQYJ
-KoZIhvcNAQEFBQADggEBAEq1KyPR75ZoWdwLXL/z/dn0SPYRAyhQQizq7Oy9kqTL
-V8VoisIXbe+J1kLrgNTz27n7ly1ulJWT/NZcdAL0xoX4tDpBZLs/eLIfhKHpcyhl
-3GzzFSiFOVjz1NlaVwElBfPf7A4SZqWHgVZkrmKVt0I5Ai6ZKrARayGdQi0cvC43
-gPjZyS2WLKKQr3zO5RYT+D3Z2Cx+0buIdDWpfOawV8cMAVxkub7uvjgnt8LRddDn
-hz5Ka52K32oCM/oo9XNZsXDL7uA83DKl//sRCrRmbrtp0G1xUXzZa+vCbQ2ndUSX
-BY7XFJgwUuyw39r64rK9lOkAjCZntHyPjx/sy8m020A=
-					    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.entpe.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">ENTPE - Vaulx en Velin</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">ENTPE - Vaulx en Velin</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Christian GARDET</SurName>
-    <EmailAddress>christian.gardet@entpe.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.entpe.fr.xml b/swamid-interfederations-2.0/idp.entpe.fr.xml
deleted file mode 100644
index c82f54dd..00000000
--- a/swamid-interfederations-2.0/idp.entpe.fr.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://idp.entpe.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2012-10-05T09:54:38Z">
-      <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">entpe.net</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">entpe.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">ENTPE - Vaulx en Velin</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDHDCCAgSgAwIBAgIVAIcupykPhzWwN/P9ju7uKjH1/diEMA0GCSqGSIb3DQEB
-BQUAMBcxFTATBgNVBAMTDGlkcC5lbnRwZS5mcjAeFw0xMjA4MzAxMzQyMzRaFw0z
-MjA4MzAxMzQyMzRaMBcxFTATBgNVBAMTDGlkcC5lbnRwZS5mcjCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBAIBXq+m0dzCNCaWhUxNWKFezemlJDt+bxukb
-a8mtA3V2EXQnENCt8YQUC64SdA3TWwdx8IJ/YRIpTqbX8WssBaNXU2ugWbFkaJ2P
-2LUIAXTycbU+j2XzM1eonxfeqn8qcIEN4Saz65OiHtXBamjm4Uc3H5ICCLJJb+yB
-B96JQeScJU39kQEL26dVIJuaW5kjRNEQa2kZW9r2Ovf1mfiRcyXZBvYss4HTM0jV
-8Jo5xULb3fQXE7+s9dox218g/ITBtYnGBa38Og6dDTurbjuhyJNA/xWq0fbQp6K1
-OVLR64FG6gi/UHkG7SQlA40Jeb7dbi5ehocyfOjvPO5AH0UiUXcCAwEAAaNfMF0w
-PAYDVR0RBDUwM4IMaWRwLmVudHBlLmZyhiNodHRwczovL2lkcC5lbnRwZS5mci9p
-ZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUX9y2zApvJ+zBx2GaVq+hWcrLdTowDQYJ
-KoZIhvcNAQEFBQADggEBAEq1KyPR75ZoWdwLXL/z/dn0SPYRAyhQQizq7Oy9kqTL
-V8VoisIXbe+J1kLrgNTz27n7ly1ulJWT/NZcdAL0xoX4tDpBZLs/eLIfhKHpcyhl
-3GzzFSiFOVjz1NlaVwElBfPf7A4SZqWHgVZkrmKVt0I5Ai6ZKrARayGdQi0cvC43
-gPjZyS2WLKKQr3zO5RYT+D3Z2Cx+0buIdDWpfOawV8cMAVxkub7uvjgnt8LRddDn
-hz5Ka52K32oCM/oo9XNZsXDL7uA83DKl//sRCrRmbrtp0G1xUXzZa+vCbQ2ndUSX
-BY7XFJgwUuyw39r64rK9lOkAjCZntHyPjx/sy8m020A=
-					    </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://idp.entpe.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.entpe.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.entpe.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">entpe.net</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">entpe.fr</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDHDCCAgSgAwIBAgIVAIcupykPhzWwN/P9ju7uKjH1/diEMA0GCSqGSIb3DQEB
-BQUAMBcxFTATBgNVBAMTDGlkcC5lbnRwZS5mcjAeFw0xMjA4MzAxMzQyMzRaFw0z
-MjA4MzAxMzQyMzRaMBcxFTATBgNVBAMTDGlkcC5lbnRwZS5mcjCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBAIBXq+m0dzCNCaWhUxNWKFezemlJDt+bxukb
-a8mtA3V2EXQnENCt8YQUC64SdA3TWwdx8IJ/YRIpTqbX8WssBaNXU2ugWbFkaJ2P
-2LUIAXTycbU+j2XzM1eonxfeqn8qcIEN4Saz65OiHtXBamjm4Uc3H5ICCLJJb+yB
-B96JQeScJU39kQEL26dVIJuaW5kjRNEQa2kZW9r2Ovf1mfiRcyXZBvYss4HTM0jV
-8Jo5xULb3fQXE7+s9dox218g/ITBtYnGBa38Og6dDTurbjuhyJNA/xWq0fbQp6K1
-OVLR64FG6gi/UHkG7SQlA40Jeb7dbi5ehocyfOjvPO5AH0UiUXcCAwEAAaNfMF0w
-PAYDVR0RBDUwM4IMaWRwLmVudHBlLmZyhiNodHRwczovL2lkcC5lbnRwZS5mci9p
-ZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUX9y2zApvJ+zBx2GaVq+hWcrLdTowDQYJ
-KoZIhvcNAQEFBQADggEBAEq1KyPR75ZoWdwLXL/z/dn0SPYRAyhQQizq7Oy9kqTL
-V8VoisIXbe+J1kLrgNTz27n7ly1ulJWT/NZcdAL0xoX4tDpBZLs/eLIfhKHpcyhl
-3GzzFSiFOVjz1NlaVwElBfPf7A4SZqWHgVZkrmKVt0I5Ai6ZKrARayGdQi0cvC43
-gPjZyS2WLKKQr3zO5RYT+D3Z2Cx+0buIdDWpfOawV8cMAVxkub7uvjgnt8LRddDn
-hz5Ka52K32oCM/oo9XNZsXDL7uA83DKl//sRCrRmbrtp0G1xUXzZa+vCbQ2ndUSX
-BY7XFJgwUuyw39r64rK9lOkAjCZntHyPjx/sy8m020A=
-					    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.entpe.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">ENTPE - Vaulx en Velin</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">ENTPE - Vaulx en Velin</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Christian GARDET</SurName>
-    <EmailAddress>christian.gardet@entpe.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.epfl.ch-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.epfl.ch-idp-shibboleth.xml
deleted file mode 100644
index f08f0909..00000000
--- a/swamid-interfederations-2.0/idp.epfl.ch-idp-shibboleth.xml
+++ /dev/null
@@ -1,147 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.epfl.ch/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://rr.aai.switch.ch/" registrationInstant="2014-09-29T15:25:24Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.switch.ch/aai/federation/switchaai/metadata-registration-practice-statement-20110711.txt</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-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </Extensions>
-  <IDPSSODescriptor errorURL="http://support-it.epfl.ch/" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-    <Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">epfl.ch</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="de">EPFL - EPF Lausanne</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">EPFL - EPF Lausanne</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="fr">EPFL - EPF Lausanne</mdui:DisplayName>
-        <mdui:Description xml:lang="de">Eidgenössische Technische Hochschule Lausanne</mdui:Description>
-        <mdui:Description xml:lang="en">Swiss Federal Institute of Technology Lausanne</mdui:Description>
-        <mdui:Description xml:lang="fr">Ecole Polytechnique Fédérale de Lausanne</mdui:Description>
-        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAe0lEQVQ4Ed2QUQqAMAxDq3j/K08ymhDKnGz4pSBLu/SRLuJXX8ttcPL3Bb1Hb5w2dJibWsa8Y19WAtQw4eYKkg0AXLpZl0UMPbMEZX5czgCPsR1FAMw+QI3Y1Dx9Pq6s6n5vtSBMoMaq+ATge64E6G+ym4Bv1AjYSdEhN3OaFRR7lkw7AAAAAElFTkSuQmCC</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+hkAAAhsSURBVHic7FtpjBRFFH471+7MLPd9ugEFkfsUCMilyOWuiIDArqAiKAiogOCBohGiIqeICkpE8EoMUQLEQIwxiMiRIP7wj/4QY2L0h/EEE5S1Puor+m0zwyE7dHrkJd/2dFV113tfv3r1qrpXKisr5TL+OwJXIOwIXIGwI3AFwo7AFQg7Alcg7AhcgbAjcAXCjsAVCDsCVyDsCFyBsEM+TRVX5hKfG7yZTK0oLCgQI/jzhYHpWX40qGFQwnPgCYN56nyonCnbWHfcoKXBI6o9zqUsFu97KMd2OeScQGPIifJ4oiWNH6WMnc0yP4Exg294fthHXgeDk6xbyTJNYEleEfiZwY5k+r161vsgu2nozwbJLARCHlZlvRWB61l2wqB53hMIIxYmCofRUHjhPzT0BUVKJgI7qrIlLEsZ/Mayber6/CXQxL+fekWjURr6gDL02nMQGDE4xrLtLBuj2o3NewL3GWxNpjen5Yzh+72IV5iFQMhRlu3l+Ws8/8ugOO8JPGjwdGHRVBoZN/iTRm6SqpKNwB9Y9iHPv+b5x77r85PAQ6kalRPj8S40srMycsZ5EFhTvHj5vEEd8WbfZ/4XBO5PFZ/sE426mXacMnLIeRBYqspuFBsz3fkdeU/gXoNPzATSOhJxRs5VRvY1qE0vy0bgBzz/TmxeOFa1Gcfra+c1gbuS6a8aefnfUmVkpSInE4E3iDdc72WbezJcD8QzEVgai/cONYFIoHcm04fregSuvAACOxkMNBhg4FKgORdC4MhYvOfBPCDwiCJwmTJyGAnqk4XATKIJvI/XA+hgvp/AUbF4r1ATiCG8O5X+tolH4CJlZGMfORdKYF9f3XRVhxWMDI3F2oeewD2p4uNtI6dnkanKyB7VTKCesUegoFskWmtfmAkEDhgMisZKaOR1ykh/GnKxBF6t6hagoLHx/N2p4qN7w0wgEunp8cStNBIpy9808tVqJhATza+iNhlQsLEo9db+MBMI5dcVJdeqRe8B8dbCEUXAxRII2cq634XbZDPjhRWXIpXJGYEYPh+l0kebF0Qch48pEgZUM4ETVP0kFLQ3cdDocSzXwzjn+4Hl8cRgGnmleAmy3lCoDgLhdb+wfh8KMIzNCNh8IMwE4n3IO8nUjqS3e7WdRuJ9RosLIHDGOQiE6GS9PwoGRGPdsSbPKYHIl3KJL81kUhFP9KeReKdxgka+Xc0ENjX4g232GBTAC9cUJrccMToc4oiobsiwWGxOLjHCoF80NlxNJpiZ5xN4K1dLnWcjp6tq0yxLG8gI1a4hCpoVRBqUxeLzR+UIZ9HlslyWSyQJsa6fCFqRsAq+BMAuMRbi2LzE2hJ52i1id0yKxL4QR3zCMqwp2+HdbQ3eo4HYbaXxvnuXGyCNuYvn7QwGEZPFJtRYik1h/WiDXvyN/rFzM5T3xkPuwj5KxdvZ7sf7YR8R+SBSGmzgYg5J8NpCsXG0K69JUKcYbevJchz7816lLJsmNgUT9tOROt8vfDu4mJWI85jt3E4vpJ7YnZQi1fEG/l7uI2uJVH3bJrxfI4MHDeobPKrqQCw2GUrE+0oBBq0yqEtlnbjZGYTfzWsc+aN9+jpdnKzmEaRgGdmZ525NDhKwwdFUqq7TZ7F8HusgAw2uETuRzXb2Yq/ueoO2Yl/g+MX/Fu1FHpf5yjeL9RotILADO8bTna7qQMBaqUogBBuq+sU7RKc3IPA2sRsUFeIRouUl8fYM32AZCGxI/eFRE1nuCLxZqr6v6WZwp2QmsCl1xDXypLpoERs4gevjfWwtVbaYx1U+pZfImQIC3f4f3qxtUHWtxT7xErErjbPd6yn123kgBEN6nk9f//XaA2E4RtNGsa8JII5AONBCdV2ZQXuxQ7gDy+DtGFH4rOT0Q18jdjjBQ/D5BEgcz8Zd2SniHZ7OTQatxHoPnjLiE96aIQauExs36iglZtFIJ3hieKoD2AfiFGLKShoIUvHS/FmxwxmCsLFCvDACg7DeHcFz3A/xbBT7B4nLeYxRz2LWu71IhKnH+bucfbt7QS949zL2iXCCfA8hxe0ugdDnpGr4uCw+wXBH7IYTDBT7oGue7QIncNFsKwIn8Mo+52iTL4KJAl4YydYAgRhDCkO4RGx64VwTbo/hjeHiAuwVYt1+jGozUOzwdoKh44YLhunt4n3P0oR9jJWqszbCAYbScLFhQXgNJh6kM/VV227sU4v7DC7K+7v+YAuGbBuxQ9O1Q9/6I6fB6jeGKOJfDdU+wnulxaZj453Ni9kAscblcy6pxiTgdk0wa01hmzm+NvDa+ayD4IHoQK5/p8XLzbTg3lfxNwK4yx1X09i4aotcUc/4qMOmqou/S1WdC/bz2KeLpcj3dNaBSdFNLCCoB+3ZJV5u6nRC+oR4eYoDBGw8/U68YKNSThMIeV28CWOMagOPmCyeR6HuIWWQn0D04U+6p4hHIGQNj9i1maAMh2C06AA+nDpMy9CfIxBe9b7SaRLrXIoylragL6Q5XWgrUryXxU6eFWwLPTFRnUq2XY51Lg9MULFMHthd7NOEkWkqBi9yTzSTB/qXjlPEIxDDZRF/r87Q1u+BeFeMuO1IXypezJrJIx5uK94XaRlWEggNc1lfziNSGXwR4QjEw0F2sl68dAspz2kPRKLpZhe47iZehE6wDY8n0o0G1mebVwxGqjYu3VlGclzuh8wfq4MtYtMA3LcF+4TXN1Qk4APMybwXYibCApZlO8WGhDaq7Uj2hXsMoTGOSJACgqfzOI51Lt8rI2kupsIW5HWLxQsTC0hgO/E+L0E8fJe/sXzEgx0d+L8JhB2BKxB2BK5A2BG4AmFH4AqEHYErEHYErkDYEbgCYUfgCoQdgSsQdgSuQNjxLwAAAP//AwBkyVWrN8BywQAAAABJRU5ErkJggg==</mdui:Logo>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:IPHint>2001:620:618::/48</mdui:IPHint>
-        <mdui:IPHint>192.26.28.0/22</mdui:IPHint>
-        <mdui:IPHint>192.26.28.0/24</mdui:IPHint>
-        <mdui:IPHint>128.178.0.0/15</mdui:IPHint>
-        <mdui:IPHint>192.26.29.0/24</mdui:IPHint>
-        <mdui:IPHint>128.178.0.0/16</mdui:IPHint>
-        <mdui:IPHint>192.26.30.0/24</mdui:IPHint>
-        <mdui:IPHint>128.179.0.0/16</mdui:IPHint>
-        <mdui:IPHint>192.26.31.0/24</mdui:IPHint>
-        <mdui:IPHint>192.26.32.0/20</mdui:IPHint>
-        <mdui:IPHint>192.26.32.0/24</mdui:IPHint>
-        <mdui:IPHint>192.26.33.0/24</mdui:IPHint>
-        <mdui:IPHint>192.26.34.0/24</mdui:IPHint>
-        <mdui:IPHint>192.26.35.0/24</mdui:IPHint>
-        <mdui:IPHint>192.26.36.0/24</mdui:IPHint>
-        <mdui:IPHint>192.26.37.0/24</mdui:IPHint>
-        <mdui:IPHint>192.26.38.0/24</mdui:IPHint>
-        <mdui:IPHint>192.26.39.0/24</mdui:IPHint>
-        <mdui:IPHint>192.26.40.0/24</mdui:IPHint>
-        <mdui:IPHint>192.26.41.0/24</mdui:IPHint>
-        <mdui:IPHint>192.26.42.0/24</mdui:IPHint>
-        <mdui:IPHint>192.26.43.0/24</mdui:IPHint>
-        <mdui:IPHint>192.26.44.0/24</mdui:IPHint>
-        <mdui:IPHint>192.26.46.0/24</mdui:IPHint>
-        <mdui:IPHint>192.26.47.0/24</mdui:IPHint>
-        <mdui:IPHint>192.33.192.0/20</mdui:IPHint>
-        <mdui:IPHint>192.33.208.0/22</mdui:IPHint>
-        <mdui:DomainHint>epfl.ch</mdui:DomainHint>
-        <mdui:GeolocationHint>geo:46.520515,6.565576</mdui:GeolocationHint>
-      </mdui:DiscoHints>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDDDCCAfSgAwIBAgIJAPOb5N7pnCviMA0GCSqGSIb3DQEBBQUAMBYxFDASBgNV
-BAMTC2lkcC5lcGZsLmNoMB4XDTEzMDQxODA5MTM0MFoXDTE2MDQxNzA5MTM0MFow
-FjEUMBIGA1UEAxMLaWRwLmVwZmwuY2gwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
-ggEKAoIBAQDIBrHGK9eROQuDVC8YG/Q1Cv31Fvc8JdezQOgqqkASU6PvymRDEmLQ
-3Y9hNPB6YgkcF5UJzGTPMvoLMnIkqAiT+J11bMpHXrimLz+v6xwFxQb8at8qKbz7
-3LpyUdwGe9fZDoVgyXHCl/fKxTdeUI/yskSD3w1SQIasIKnb5Qr/lDQ+yCqq2iYK
-wNe5PnPd/XVxjfD09FmkXfYRLQVA5h4XH+q1HlhdpchB/DB9qxZcxalwaTQw70mG
-HLOsl+4Flehsi18gCjMyaX/EO6rYzDMbXm1GvhkobZ1YcRzJRvb8J//TjJgxue3K
-VRAyULjs517E1jJHnRBvEBg9yxZLd/9TAgMBAAGjXTBbMDoGA1UdEQQzMDGCC2lk
-cC5lcGZsLmNohiJodHRwczovL2lkcC5lcGZsLmNoL2lkcC9zaGliYm9sZXRoMB0G
-A1UdDgQWBBQ/WGIfS2XSjumGqpYplSwMU52FhTANBgkqhkiG9w0BAQUFAAOCAQEA
-mejhQf4W7YHubVMVqZ7N7Zq6mGRY9TJSp0w88Ehvv0LfLKfyvwbqrrbbTYP9ERr+
-ufnrYUTclvVlSlutkLuGrJ1YkIjhEc6qqPLdtUAHE3cJpAYZMK4zGCmbg64eQBTt
-/UiBgOx6UgoS1m7ix6F7qS37iqGYngwanb0HoNRjYAP2cqAxVdmS8sLGERWRWzn9
-jV9Dj9Wwx4s9vL5rS6OxV8OXi42yQ+dfBR+eih6ebNEs+SbbWhLi83/U60WFwa1P
-btvDbgeRSa7SgaA72pCtk5Blb9fArSq5yBXqARTtXFMaH8hZOd3iu9h4Mnsl8879
-EyP/QDjoD02nYu++815n4g==
-						</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.epfl.ch:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.epfl.ch: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.epfl.ch/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.epfl.ch/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.epfl.ch/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.epfl.ch/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
-    <Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">epfl.ch</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDDDCCAfSgAwIBAgIJAPOb5N7pnCviMA0GCSqGSIb3DQEBBQUAMBYxFDASBgNV
-BAMTC2lkcC5lcGZsLmNoMB4XDTEzMDQxODA5MTM0MFoXDTE2MDQxNzA5MTM0MFow
-FjEUMBIGA1UEAxMLaWRwLmVwZmwuY2gwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
-ggEKAoIBAQDIBrHGK9eROQuDVC8YG/Q1Cv31Fvc8JdezQOgqqkASU6PvymRDEmLQ
-3Y9hNPB6YgkcF5UJzGTPMvoLMnIkqAiT+J11bMpHXrimLz+v6xwFxQb8at8qKbz7
-3LpyUdwGe9fZDoVgyXHCl/fKxTdeUI/yskSD3w1SQIasIKnb5Qr/lDQ+yCqq2iYK
-wNe5PnPd/XVxjfD09FmkXfYRLQVA5h4XH+q1HlhdpchB/DB9qxZcxalwaTQw70mG
-HLOsl+4Flehsi18gCjMyaX/EO6rYzDMbXm1GvhkobZ1YcRzJRvb8J//TjJgxue3K
-VRAyULjs517E1jJHnRBvEBg9yxZLd/9TAgMBAAGjXTBbMDoGA1UdEQQzMDGCC2lk
-cC5lcGZsLmNohiJodHRwczovL2lkcC5lcGZsLmNoL2lkcC9zaGliYm9sZXRoMB0G
-A1UdDgQWBBQ/WGIfS2XSjumGqpYplSwMU52FhTANBgkqhkiG9w0BAQUFAAOCAQEA
-mejhQf4W7YHubVMVqZ7N7Zq6mGRY9TJSp0w88Ehvv0LfLKfyvwbqrrbbTYP9ERr+
-ufnrYUTclvVlSlutkLuGrJ1YkIjhEc6qqPLdtUAHE3cJpAYZMK4zGCmbg64eQBTt
-/UiBgOx6UgoS1m7ix6F7qS37iqGYngwanb0HoNRjYAP2cqAxVdmS8sLGERWRWzn9
-jV9Dj9Wwx4s9vL5rS6OxV8OXi42yQ+dfBR+eih6ebNEs+SbbWhLi83/U60WFwa1P
-btvDbgeRSa7SgaA72pCtk5Blb9fArSq5yBXqARTtXFMaH8hZOd3iu9h4Mnsl8879
-EyP/QDjoD02nYu++815n4g==
-						</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.epfl.ch:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.epfl.ch:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">epfl.ch</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">EPFL - EPF Lausanne</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">EPFL - EPF Lausanne</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="fr">EPFL - EPF Lausanne</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.epfl.ch/</OrganizationURL>
-    <OrganizationURL xml:lang="en">http://www.epfl.ch/</OrganizationURL>
-    <OrganizationURL xml:lang="fr">http://www.epfl.ch/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>AAI</GivenName>
-    <SurName>EPFL Team</SurName>
-    <EmailAddress>mailto:aai@epfl.ch</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>AAI</GivenName>
-    <SurName>EPFL Team</SurName>
-    <EmailAddress>mailto:aai@epfl.ch</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.epfl.ch.xml b/swamid-interfederations-2.0/idp.epfl.ch.xml
deleted file mode 100644
index f08f0909..00000000
--- a/swamid-interfederations-2.0/idp.epfl.ch.xml
+++ /dev/null
@@ -1,147 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.epfl.ch/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://rr.aai.switch.ch/" registrationInstant="2014-09-29T15:25:24Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.switch.ch/aai/federation/switchaai/metadata-registration-practice-statement-20110711.txt</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-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </Extensions>
-  <IDPSSODescriptor errorURL="http://support-it.epfl.ch/" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-    <Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">epfl.ch</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="de">EPFL - EPF Lausanne</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">EPFL - EPF Lausanne</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="fr">EPFL - EPF Lausanne</mdui:DisplayName>
-        <mdui:Description xml:lang="de">Eidgenössische Technische Hochschule Lausanne</mdui:Description>
-        <mdui:Description xml:lang="en">Swiss Federal Institute of Technology Lausanne</mdui:Description>
-        <mdui:Description xml:lang="fr">Ecole Polytechnique Fédérale de Lausanne</mdui:Description>
-        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAe0lEQVQ4Ed2QUQqAMAxDq3j/K08ymhDKnGz4pSBLu/SRLuJXX8ttcPL3Bb1Hb5w2dJibWsa8Y19WAtQw4eYKkg0AXLpZl0UMPbMEZX5czgCPsR1FAMw+QI3Y1Dx9Pq6s6n5vtSBMoMaq+ATge64E6G+ym4Bv1AjYSdEhN3OaFRR7lkw7AAAAAElFTkSuQmCC</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+hkAAAhsSURBVHic7FtpjBRFFH471+7MLPd9ugEFkfsUCMilyOWuiIDArqAiKAiogOCBohGiIqeICkpE8EoMUQLEQIwxiMiRIP7wj/4QY2L0h/EEE5S1Puor+m0zwyE7dHrkJd/2dFV113tfv3r1qrpXKisr5TL+OwJXIOwIXIGwI3AFwo7AFQg7Alcg7AhcgbAjcAXCjsAVCDsCVyDsCFyBsEM+TRVX5hKfG7yZTK0oLCgQI/jzhYHpWX40qGFQwnPgCYN56nyonCnbWHfcoKXBI6o9zqUsFu97KMd2OeScQGPIifJ4oiWNH6WMnc0yP4Exg294fthHXgeDk6xbyTJNYEleEfiZwY5k+r161vsgu2nozwbJLARCHlZlvRWB61l2wqB53hMIIxYmCofRUHjhPzT0BUVKJgI7qrIlLEsZ/Mayber6/CXQxL+fekWjURr6gDL02nMQGDE4xrLtLBuj2o3NewL3GWxNpjen5Yzh+72IV5iFQMhRlu3l+Ws8/8ugOO8JPGjwdGHRVBoZN/iTRm6SqpKNwB9Y9iHPv+b5x77r85PAQ6kalRPj8S40srMycsZ5EFhTvHj5vEEd8WbfZ/4XBO5PFZ/sE426mXacMnLIeRBYqspuFBsz3fkdeU/gXoNPzATSOhJxRs5VRvY1qE0vy0bgBzz/TmxeOFa1Gcfra+c1gbuS6a8aefnfUmVkpSInE4E3iDdc72WbezJcD8QzEVgai/cONYFIoHcm04fregSuvAACOxkMNBhg4FKgORdC4MhYvOfBPCDwiCJwmTJyGAnqk4XATKIJvI/XA+hgvp/AUbF4r1ATiCG8O5X+tolH4CJlZGMfORdKYF9f3XRVhxWMDI3F2oeewD2p4uNtI6dnkanKyB7VTKCesUegoFskWmtfmAkEDhgMisZKaOR1ykh/GnKxBF6t6hagoLHx/N2p4qN7w0wgEunp8cStNBIpy9808tVqJhATza+iNhlQsLEo9db+MBMI5dcVJdeqRe8B8dbCEUXAxRII2cq634XbZDPjhRWXIpXJGYEYPh+l0kebF0Qch48pEgZUM4ETVP0kFLQ3cdDocSzXwzjn+4Hl8cRgGnmleAmy3lCoDgLhdb+wfh8KMIzNCNh8IMwE4n3IO8nUjqS3e7WdRuJ9RosLIHDGOQiE6GS9PwoGRGPdsSbPKYHIl3KJL81kUhFP9KeReKdxgka+Xc0ENjX4g232GBTAC9cUJrccMToc4oiobsiwWGxOLjHCoF80NlxNJpiZ5xN4K1dLnWcjp6tq0yxLG8gI1a4hCpoVRBqUxeLzR+UIZ9HlslyWSyQJsa6fCFqRsAq+BMAuMRbi2LzE2hJ52i1id0yKxL4QR3zCMqwp2+HdbQ3eo4HYbaXxvnuXGyCNuYvn7QwGEZPFJtRYik1h/WiDXvyN/rFzM5T3xkPuwj5KxdvZ7sf7YR8R+SBSGmzgYg5J8NpCsXG0K69JUKcYbevJchz7816lLJsmNgUT9tOROt8vfDu4mJWI85jt3E4vpJ7YnZQi1fEG/l7uI2uJVH3bJrxfI4MHDeobPKrqQCw2GUrE+0oBBq0yqEtlnbjZGYTfzWsc+aN9+jpdnKzmEaRgGdmZ525NDhKwwdFUqq7TZ7F8HusgAw2uETuRzXb2Yq/ueoO2Yl/g+MX/Fu1FHpf5yjeL9RotILADO8bTna7qQMBaqUogBBuq+sU7RKc3IPA2sRsUFeIRouUl8fYM32AZCGxI/eFRE1nuCLxZqr6v6WZwp2QmsCl1xDXypLpoERs4gevjfWwtVbaYx1U+pZfImQIC3f4f3qxtUHWtxT7xErErjbPd6yn123kgBEN6nk9f//XaA2E4RtNGsa8JII5AONBCdV2ZQXuxQ7gDy+DtGFH4rOT0Q18jdjjBQ/D5BEgcz8Zd2SniHZ7OTQatxHoPnjLiE96aIQauExs36iglZtFIJ3hieKoD2AfiFGLKShoIUvHS/FmxwxmCsLFCvDACg7DeHcFz3A/xbBT7B4nLeYxRz2LWu71IhKnH+bucfbt7QS949zL2iXCCfA8hxe0ugdDnpGr4uCw+wXBH7IYTDBT7oGue7QIncNFsKwIn8Mo+52iTL4KJAl4YydYAgRhDCkO4RGx64VwTbo/hjeHiAuwVYt1+jGozUOzwdoKh44YLhunt4n3P0oR9jJWqszbCAYbScLFhQXgNJh6kM/VV227sU4v7DC7K+7v+YAuGbBuxQ9O1Q9/6I6fB6jeGKOJfDdU+wnulxaZj453Ni9kAscblcy6pxiTgdk0wa01hmzm+NvDa+ayD4IHoQK5/p8XLzbTg3lfxNwK4yx1X09i4aotcUc/4qMOmqou/S1WdC/bz2KeLpcj3dNaBSdFNLCCoB+3ZJV5u6nRC+oR4eYoDBGw8/U68YKNSThMIeV28CWOMagOPmCyeR6HuIWWQn0D04U+6p4hHIGQNj9i1maAMh2C06AA+nDpMy9CfIxBe9b7SaRLrXIoylragL6Q5XWgrUryXxU6eFWwLPTFRnUq2XY51Lg9MULFMHthd7NOEkWkqBi9yTzSTB/qXjlPEIxDDZRF/r87Q1u+BeFeMuO1IXypezJrJIx5uK94XaRlWEggNc1lfziNSGXwR4QjEw0F2sl68dAspz2kPRKLpZhe47iZehE6wDY8n0o0G1mebVwxGqjYu3VlGclzuh8wfq4MtYtMA3LcF+4TXN1Qk4APMybwXYibCApZlO8WGhDaq7Uj2hXsMoTGOSJACgqfzOI51Lt8rI2kupsIW5HWLxQsTC0hgO/E+L0E8fJe/sXzEgx0d+L8JhB2BKxB2BK5A2BG4AmFH4AqEHYErEHYErkDYEbgCYUfgCoQdgSsQdgSuQNjxLwAAAP//AwBkyVWrN8BywQAAAABJRU5ErkJggg==</mdui:Logo>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:IPHint>2001:620:618::/48</mdui:IPHint>
-        <mdui:IPHint>192.26.28.0/22</mdui:IPHint>
-        <mdui:IPHint>192.26.28.0/24</mdui:IPHint>
-        <mdui:IPHint>128.178.0.0/15</mdui:IPHint>
-        <mdui:IPHint>192.26.29.0/24</mdui:IPHint>
-        <mdui:IPHint>128.178.0.0/16</mdui:IPHint>
-        <mdui:IPHint>192.26.30.0/24</mdui:IPHint>
-        <mdui:IPHint>128.179.0.0/16</mdui:IPHint>
-        <mdui:IPHint>192.26.31.0/24</mdui:IPHint>
-        <mdui:IPHint>192.26.32.0/20</mdui:IPHint>
-        <mdui:IPHint>192.26.32.0/24</mdui:IPHint>
-        <mdui:IPHint>192.26.33.0/24</mdui:IPHint>
-        <mdui:IPHint>192.26.34.0/24</mdui:IPHint>
-        <mdui:IPHint>192.26.35.0/24</mdui:IPHint>
-        <mdui:IPHint>192.26.36.0/24</mdui:IPHint>
-        <mdui:IPHint>192.26.37.0/24</mdui:IPHint>
-        <mdui:IPHint>192.26.38.0/24</mdui:IPHint>
-        <mdui:IPHint>192.26.39.0/24</mdui:IPHint>
-        <mdui:IPHint>192.26.40.0/24</mdui:IPHint>
-        <mdui:IPHint>192.26.41.0/24</mdui:IPHint>
-        <mdui:IPHint>192.26.42.0/24</mdui:IPHint>
-        <mdui:IPHint>192.26.43.0/24</mdui:IPHint>
-        <mdui:IPHint>192.26.44.0/24</mdui:IPHint>
-        <mdui:IPHint>192.26.46.0/24</mdui:IPHint>
-        <mdui:IPHint>192.26.47.0/24</mdui:IPHint>
-        <mdui:IPHint>192.33.192.0/20</mdui:IPHint>
-        <mdui:IPHint>192.33.208.0/22</mdui:IPHint>
-        <mdui:DomainHint>epfl.ch</mdui:DomainHint>
-        <mdui:GeolocationHint>geo:46.520515,6.565576</mdui:GeolocationHint>
-      </mdui:DiscoHints>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDDDCCAfSgAwIBAgIJAPOb5N7pnCviMA0GCSqGSIb3DQEBBQUAMBYxFDASBgNV
-BAMTC2lkcC5lcGZsLmNoMB4XDTEzMDQxODA5MTM0MFoXDTE2MDQxNzA5MTM0MFow
-FjEUMBIGA1UEAxMLaWRwLmVwZmwuY2gwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
-ggEKAoIBAQDIBrHGK9eROQuDVC8YG/Q1Cv31Fvc8JdezQOgqqkASU6PvymRDEmLQ
-3Y9hNPB6YgkcF5UJzGTPMvoLMnIkqAiT+J11bMpHXrimLz+v6xwFxQb8at8qKbz7
-3LpyUdwGe9fZDoVgyXHCl/fKxTdeUI/yskSD3w1SQIasIKnb5Qr/lDQ+yCqq2iYK
-wNe5PnPd/XVxjfD09FmkXfYRLQVA5h4XH+q1HlhdpchB/DB9qxZcxalwaTQw70mG
-HLOsl+4Flehsi18gCjMyaX/EO6rYzDMbXm1GvhkobZ1YcRzJRvb8J//TjJgxue3K
-VRAyULjs517E1jJHnRBvEBg9yxZLd/9TAgMBAAGjXTBbMDoGA1UdEQQzMDGCC2lk
-cC5lcGZsLmNohiJodHRwczovL2lkcC5lcGZsLmNoL2lkcC9zaGliYm9sZXRoMB0G
-A1UdDgQWBBQ/WGIfS2XSjumGqpYplSwMU52FhTANBgkqhkiG9w0BAQUFAAOCAQEA
-mejhQf4W7YHubVMVqZ7N7Zq6mGRY9TJSp0w88Ehvv0LfLKfyvwbqrrbbTYP9ERr+
-ufnrYUTclvVlSlutkLuGrJ1YkIjhEc6qqPLdtUAHE3cJpAYZMK4zGCmbg64eQBTt
-/UiBgOx6UgoS1m7ix6F7qS37iqGYngwanb0HoNRjYAP2cqAxVdmS8sLGERWRWzn9
-jV9Dj9Wwx4s9vL5rS6OxV8OXi42yQ+dfBR+eih6ebNEs+SbbWhLi83/U60WFwa1P
-btvDbgeRSa7SgaA72pCtk5Blb9fArSq5yBXqARTtXFMaH8hZOd3iu9h4Mnsl8879
-EyP/QDjoD02nYu++815n4g==
-						</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.epfl.ch:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.epfl.ch: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.epfl.ch/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.epfl.ch/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.epfl.ch/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.epfl.ch/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
-    <Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">epfl.ch</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDDDCCAfSgAwIBAgIJAPOb5N7pnCviMA0GCSqGSIb3DQEBBQUAMBYxFDASBgNV
-BAMTC2lkcC5lcGZsLmNoMB4XDTEzMDQxODA5MTM0MFoXDTE2MDQxNzA5MTM0MFow
-FjEUMBIGA1UEAxMLaWRwLmVwZmwuY2gwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
-ggEKAoIBAQDIBrHGK9eROQuDVC8YG/Q1Cv31Fvc8JdezQOgqqkASU6PvymRDEmLQ
-3Y9hNPB6YgkcF5UJzGTPMvoLMnIkqAiT+J11bMpHXrimLz+v6xwFxQb8at8qKbz7
-3LpyUdwGe9fZDoVgyXHCl/fKxTdeUI/yskSD3w1SQIasIKnb5Qr/lDQ+yCqq2iYK
-wNe5PnPd/XVxjfD09FmkXfYRLQVA5h4XH+q1HlhdpchB/DB9qxZcxalwaTQw70mG
-HLOsl+4Flehsi18gCjMyaX/EO6rYzDMbXm1GvhkobZ1YcRzJRvb8J//TjJgxue3K
-VRAyULjs517E1jJHnRBvEBg9yxZLd/9TAgMBAAGjXTBbMDoGA1UdEQQzMDGCC2lk
-cC5lcGZsLmNohiJodHRwczovL2lkcC5lcGZsLmNoL2lkcC9zaGliYm9sZXRoMB0G
-A1UdDgQWBBQ/WGIfS2XSjumGqpYplSwMU52FhTANBgkqhkiG9w0BAQUFAAOCAQEA
-mejhQf4W7YHubVMVqZ7N7Zq6mGRY9TJSp0w88Ehvv0LfLKfyvwbqrrbbTYP9ERr+
-ufnrYUTclvVlSlutkLuGrJ1YkIjhEc6qqPLdtUAHE3cJpAYZMK4zGCmbg64eQBTt
-/UiBgOx6UgoS1m7ix6F7qS37iqGYngwanb0HoNRjYAP2cqAxVdmS8sLGERWRWzn9
-jV9Dj9Wwx4s9vL5rS6OxV8OXi42yQ+dfBR+eih6ebNEs+SbbWhLi83/U60WFwa1P
-btvDbgeRSa7SgaA72pCtk5Blb9fArSq5yBXqARTtXFMaH8hZOd3iu9h4Mnsl8879
-EyP/QDjoD02nYu++815n4g==
-						</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.epfl.ch:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.epfl.ch:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">epfl.ch</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">EPFL - EPF Lausanne</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">EPFL - EPF Lausanne</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="fr">EPFL - EPF Lausanne</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.epfl.ch/</OrganizationURL>
-    <OrganizationURL xml:lang="en">http://www.epfl.ch/</OrganizationURL>
-    <OrganizationURL xml:lang="fr">http://www.epfl.ch/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>AAI</GivenName>
-    <SurName>EPFL Team</SurName>
-    <EmailAddress>mailto:aai@epfl.ch</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>AAI</GivenName>
-    <SurName>EPFL Team</SurName>
-    <EmailAddress>mailto:aai@epfl.ch</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.eso.org-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.eso.org-idp-shibboleth.xml
deleted file mode 100644
index 327bced9..00000000
--- a/swamid-interfederations-2.0/idp.eso.org-idp-shibboleth.xml
+++ /dev/null
@@ -1,149 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.eso.org/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2014-10-22T16:13:35Z">
-      <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">eso.org</saml1md:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="de">ESO - European Southern Observatory</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">ESO - European Southern Observatory</mdui:DisplayName>
-        <mdui:Description xml:lang="de">ESo baut und betreibt astronomische Teleskope</mdui:Description>
-        <mdui:Description xml:lang="en">ESO builds and operates astronomical telescopes</mdui:Description>
-        <mdui:Logo height="16" width="16">https://www.eso.org/images/eso-logo-16x16.png</mdui:Logo>
-        <mdui:Logo height="64" width="64">https://www.eso.org/images/eso-logo.ico</mdui:Logo>
-        <mdui:InformationURL xml:lang="de">https://www.eso.org/public/germany/about-eso/esoglance/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">https://www.eso.org/public/about-eso/esoglance/</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://www.eso.org/public/privacy.html</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.eso.org</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>emailAddress=trustmaster@eso.org,CN=idp.eso.org,O=ESO - European Organisation for Astronomical Research,L=Garching,ST=Bayern,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIGWDCCBUCgAwIBAgIHGGCD/SMRJzANBgkqhkiG9w0BAQsFADCBlzELMAkGA1UE
-BhMCREUxPjA8BgNVBAoTNUVTTyAtIEV1cm9wZWFuIE9yZ2FuaXNhdGlvbiBmb3Ig
-QXN0cm9ub21pY2FsIFJlc2VhcmNoMQwwCgYDVQQLEwNURUMxFjAUBgNVBAMTDUVT
-TyBQS0kgLSBHMDIxIjAgBgkqhkiG9w0BCQEWE3RydXN0bWFzdGVyQGVzby5vcmcw
-HhcNMTQxMDE3MTIwNzA5WhcNMTkwNzA5MjM1OTAwWjCBqzELMAkGA1UEBhMCREUx
-DzANBgNVBAgTBkJheWVybjERMA8GA1UEBxMIR2FyY2hpbmcxPjA8BgNVBAoTNUVT
-TyAtIEV1cm9wZWFuIE9yZ2FuaXNhdGlvbiBmb3IgQXN0cm9ub21pY2FsIFJlc2Vh
-cmNoMRQwEgYDVQQDEwtpZHAuZXNvLm9yZzEiMCAGCSqGSIb3DQEJARYTdHJ1c3Rt
-YXN0ZXJAZXNvLm9yZzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAL/y
-weMbb9mXT+teqXFEevPWlvO48gTjIqNAcrGs9XvZtLCQB91hftXOkS21aNhpO1jD
-pJeU6WRjH7WEU3/oXGGqXztxV3I6giyMm8UB0qNLtDm2MuGhYT4CqIwunIzqYKJG
-nvvhi6NTAqhO2wP+XIK7dCnYhehRPhAivMKwLWabKKHF4SPV1X4R/AIMPbu2QFnK
-lM3grdo6lctuGWGcJ9n2UU/9ywQmiZmczQigimkjPp6K/1GFZI5TmIP5uO+Wv+sD
-JxETIOvsYQK5y+CmU5fl1kSPKUwpa+ssfKldRZIpTc2sukFlnU8XAmMpSmjyzsXL
-wEoojn5FmgPgdHLQrwUCAwEAAaOCApEwggKNME8GA1UdIARIMEYwEQYPKwYBBAGB
-rSGCLAEBBAMCMBEGDysGAQQBga0hgiwCAQQDATAPBg0rBgEEAYGtIYIsAQEEMA0G
-CysGAQQBga0hgiweMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgXgMB0GA1UdJQQWMBQG
-CCsGAQUFBwMCBggrBgEFBQcDATAdBgNVHQ4EFgQUSPnc6DulTXOTEQM+i/fbNpxx
-6OowHwYDVR0jBBgwFoAUsR53NN55AbLmThsm4pt3idg5vn0weAYDVR0RBHEwb4IR
-YXdlYjQwLmhxLmVzby5vcmeCD2lkcC5hZHMuZXNvLm9yZ4ILaWRwLmVzby5vcmeC
-DmlkcC5ocS5lc28ub3Jngg9zZHAuYWRzLmVzby5vcmeCC3NkcC5lc28ub3Jngg5z
-ZHAuaHEuZXNvLm9yZzB7BgNVHR8EdDByMDegNaAzhjFodHRwOi8vY2RwMS5wY2Eu
-ZGZuLmRlL2Vzby1jYS9wdWIvY3JsL2dfY2FjcmwuY3JsMDegNaAzhjFodHRwOi8v
-Y2RwMi5wY2EuZGZuLmRlL2Vzby1jYS9wdWIvY3JsL2dfY2FjcmwuY3JsMIHLBggr
-BgEFBQcBAQSBvjCBuzAzBggrBgEFBQcwAYYnaHR0cDovL29jc3AucGNhLmRmbi5k
-ZS9PQ1NQLVNlcnZlci9PQ1NQMEEGCCsGAQUFBzAChjVodHRwOi8vY2RwMS5wY2Eu
-ZGZuLmRlL2Vzby1jYS9wdWIvY2FjZXJ0L2dfY2FjZXJ0LmNydDBBBggrBgEFBQcw
-AoY1aHR0cDovL2NkcDIucGNhLmRmbi5kZS9lc28tY2EvcHViL2NhY2VydC9nX2Nh
-Y2VydC5jcnQwDQYJKoZIhvcNAQELBQADggEBAL10jELuLO7BfdWD2GV/chZe20xt
-M8NthmUA4i6VG9/MRTIFzhR9qwnl0nBQPGCisGH07EU6DvKH6XVMBtW2XidOL2Xq
-vyw9Ztvs5H2ypRnV6FDUKRf1PdbdY6pqTInn5Yt8cw8Rv9h5FDNCXLoLjkRuBNQf
-xgdPNKcKNSTAAI+bnXftMKiV6JHYQxbxsL+x4qVYlHQT425U12ZWwYuE28GzjhUf
-qkP9zWDiEtC88Nxn/NisXmpRJul/cG0ddb3N9XAfvBvjIMN4+rxLvb1ehqLreZFf
-26ev5dBb9dYdJ92x6RFKiD6kvBVZSNaN7KY5ogvz8WmWnXlllor+GGdxQkA=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.eso.org:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.eso.org:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.eso.org/idp/profile/SAML2/Redirect/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.eso.org/idp/profile/SAML2/POST/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.eso.org: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.eso.org/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.eso.org/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.eso.org/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.eso.org/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">eso.org</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.eso.org</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>emailAddress=trustmaster@eso.org,CN=idp.eso.org,O=ESO - European Organisation for Astronomical Research,L=Garching,ST=Bayern,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIGWDCCBUCgAwIBAgIHGGCD/SMRJzANBgkqhkiG9w0BAQsFADCBlzELMAkGA1UE
-BhMCREUxPjA8BgNVBAoTNUVTTyAtIEV1cm9wZWFuIE9yZ2FuaXNhdGlvbiBmb3Ig
-QXN0cm9ub21pY2FsIFJlc2VhcmNoMQwwCgYDVQQLEwNURUMxFjAUBgNVBAMTDUVT
-TyBQS0kgLSBHMDIxIjAgBgkqhkiG9w0BCQEWE3RydXN0bWFzdGVyQGVzby5vcmcw
-HhcNMTQxMDE3MTIwNzA5WhcNMTkwNzA5MjM1OTAwWjCBqzELMAkGA1UEBhMCREUx
-DzANBgNVBAgTBkJheWVybjERMA8GA1UEBxMIR2FyY2hpbmcxPjA8BgNVBAoTNUVT
-TyAtIEV1cm9wZWFuIE9yZ2FuaXNhdGlvbiBmb3IgQXN0cm9ub21pY2FsIFJlc2Vh
-cmNoMRQwEgYDVQQDEwtpZHAuZXNvLm9yZzEiMCAGCSqGSIb3DQEJARYTdHJ1c3Rt
-YXN0ZXJAZXNvLm9yZzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAL/y
-weMbb9mXT+teqXFEevPWlvO48gTjIqNAcrGs9XvZtLCQB91hftXOkS21aNhpO1jD
-pJeU6WRjH7WEU3/oXGGqXztxV3I6giyMm8UB0qNLtDm2MuGhYT4CqIwunIzqYKJG
-nvvhi6NTAqhO2wP+XIK7dCnYhehRPhAivMKwLWabKKHF4SPV1X4R/AIMPbu2QFnK
-lM3grdo6lctuGWGcJ9n2UU/9ywQmiZmczQigimkjPp6K/1GFZI5TmIP5uO+Wv+sD
-JxETIOvsYQK5y+CmU5fl1kSPKUwpa+ssfKldRZIpTc2sukFlnU8XAmMpSmjyzsXL
-wEoojn5FmgPgdHLQrwUCAwEAAaOCApEwggKNME8GA1UdIARIMEYwEQYPKwYBBAGB
-rSGCLAEBBAMCMBEGDysGAQQBga0hgiwCAQQDATAPBg0rBgEEAYGtIYIsAQEEMA0G
-CysGAQQBga0hgiweMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgXgMB0GA1UdJQQWMBQG
-CCsGAQUFBwMCBggrBgEFBQcDATAdBgNVHQ4EFgQUSPnc6DulTXOTEQM+i/fbNpxx
-6OowHwYDVR0jBBgwFoAUsR53NN55AbLmThsm4pt3idg5vn0weAYDVR0RBHEwb4IR
-YXdlYjQwLmhxLmVzby5vcmeCD2lkcC5hZHMuZXNvLm9yZ4ILaWRwLmVzby5vcmeC
-DmlkcC5ocS5lc28ub3Jngg9zZHAuYWRzLmVzby5vcmeCC3NkcC5lc28ub3Jngg5z
-ZHAuaHEuZXNvLm9yZzB7BgNVHR8EdDByMDegNaAzhjFodHRwOi8vY2RwMS5wY2Eu
-ZGZuLmRlL2Vzby1jYS9wdWIvY3JsL2dfY2FjcmwuY3JsMDegNaAzhjFodHRwOi8v
-Y2RwMi5wY2EuZGZuLmRlL2Vzby1jYS9wdWIvY3JsL2dfY2FjcmwuY3JsMIHLBggr
-BgEFBQcBAQSBvjCBuzAzBggrBgEFBQcwAYYnaHR0cDovL29jc3AucGNhLmRmbi5k
-ZS9PQ1NQLVNlcnZlci9PQ1NQMEEGCCsGAQUFBzAChjVodHRwOi8vY2RwMS5wY2Eu
-ZGZuLmRlL2Vzby1jYS9wdWIvY2FjZXJ0L2dfY2FjZXJ0LmNydDBBBggrBgEFBQcw
-AoY1aHR0cDovL2NkcDIucGNhLmRmbi5kZS9lc28tY2EvcHViL2NhY2VydC9nX2Nh
-Y2VydC5jcnQwDQYJKoZIhvcNAQELBQADggEBAL10jELuLO7BfdWD2GV/chZe20xt
-M8NthmUA4i6VG9/MRTIFzhR9qwnl0nBQPGCisGH07EU6DvKH6XVMBtW2XidOL2Xq
-vyw9Ztvs5H2ypRnV6FDUKRf1PdbdY6pqTInn5Yt8cw8Rv9h5FDNCXLoLjkRuBNQf
-xgdPNKcKNSTAAI+bnXftMKiV6JHYQxbxsL+x4qVYlHQT425U12ZWwYuE28GzjhUf
-qkP9zWDiEtC88Nxn/NisXmpRJul/cG0ddb3N9XAfvBvjIMN4+rxLvb1ehqLreZFf
-26ev5dBb9dYdJ92x6RFKiD6kvBVZSNaN7KY5ogvz8WmWnXlllor+GGdxQkA=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.eso.org:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.eso.org: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">e446</OrganizationName>
-    <OrganizationName xml:lang="en">e446</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">ESO - European Organisation for Astronomical Research</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">ESO - European Organisation for Astronomical Research</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.eso.org</OrganizationURL>
-    <OrganizationURL xml:lang="en">http://www.eso.org</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Michael</GivenName>
-    <SurName>Naumann</SurName>
-    <EmailAddress>mailto:mnaumann@eso.org</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="support">
-    <GivenName>Michael</GivenName>
-    <SurName>Naumann</SurName>
-    <EmailAddress>mailto:mnaumann@eso.org</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.eso.org.xml b/swamid-interfederations-2.0/idp.eso.org.xml
deleted file mode 100644
index 327bced9..00000000
--- a/swamid-interfederations-2.0/idp.eso.org.xml
+++ /dev/null
@@ -1,149 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.eso.org/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2014-10-22T16:13:35Z">
-      <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">eso.org</saml1md:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="de">ESO - European Southern Observatory</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">ESO - European Southern Observatory</mdui:DisplayName>
-        <mdui:Description xml:lang="de">ESo baut und betreibt astronomische Teleskope</mdui:Description>
-        <mdui:Description xml:lang="en">ESO builds and operates astronomical telescopes</mdui:Description>
-        <mdui:Logo height="16" width="16">https://www.eso.org/images/eso-logo-16x16.png</mdui:Logo>
-        <mdui:Logo height="64" width="64">https://www.eso.org/images/eso-logo.ico</mdui:Logo>
-        <mdui:InformationURL xml:lang="de">https://www.eso.org/public/germany/about-eso/esoglance/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">https://www.eso.org/public/about-eso/esoglance/</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://www.eso.org/public/privacy.html</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.eso.org</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>emailAddress=trustmaster@eso.org,CN=idp.eso.org,O=ESO - European Organisation for Astronomical Research,L=Garching,ST=Bayern,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIGWDCCBUCgAwIBAgIHGGCD/SMRJzANBgkqhkiG9w0BAQsFADCBlzELMAkGA1UE
-BhMCREUxPjA8BgNVBAoTNUVTTyAtIEV1cm9wZWFuIE9yZ2FuaXNhdGlvbiBmb3Ig
-QXN0cm9ub21pY2FsIFJlc2VhcmNoMQwwCgYDVQQLEwNURUMxFjAUBgNVBAMTDUVT
-TyBQS0kgLSBHMDIxIjAgBgkqhkiG9w0BCQEWE3RydXN0bWFzdGVyQGVzby5vcmcw
-HhcNMTQxMDE3MTIwNzA5WhcNMTkwNzA5MjM1OTAwWjCBqzELMAkGA1UEBhMCREUx
-DzANBgNVBAgTBkJheWVybjERMA8GA1UEBxMIR2FyY2hpbmcxPjA8BgNVBAoTNUVT
-TyAtIEV1cm9wZWFuIE9yZ2FuaXNhdGlvbiBmb3IgQXN0cm9ub21pY2FsIFJlc2Vh
-cmNoMRQwEgYDVQQDEwtpZHAuZXNvLm9yZzEiMCAGCSqGSIb3DQEJARYTdHJ1c3Rt
-YXN0ZXJAZXNvLm9yZzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAL/y
-weMbb9mXT+teqXFEevPWlvO48gTjIqNAcrGs9XvZtLCQB91hftXOkS21aNhpO1jD
-pJeU6WRjH7WEU3/oXGGqXztxV3I6giyMm8UB0qNLtDm2MuGhYT4CqIwunIzqYKJG
-nvvhi6NTAqhO2wP+XIK7dCnYhehRPhAivMKwLWabKKHF4SPV1X4R/AIMPbu2QFnK
-lM3grdo6lctuGWGcJ9n2UU/9ywQmiZmczQigimkjPp6K/1GFZI5TmIP5uO+Wv+sD
-JxETIOvsYQK5y+CmU5fl1kSPKUwpa+ssfKldRZIpTc2sukFlnU8XAmMpSmjyzsXL
-wEoojn5FmgPgdHLQrwUCAwEAAaOCApEwggKNME8GA1UdIARIMEYwEQYPKwYBBAGB
-rSGCLAEBBAMCMBEGDysGAQQBga0hgiwCAQQDATAPBg0rBgEEAYGtIYIsAQEEMA0G
-CysGAQQBga0hgiweMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgXgMB0GA1UdJQQWMBQG
-CCsGAQUFBwMCBggrBgEFBQcDATAdBgNVHQ4EFgQUSPnc6DulTXOTEQM+i/fbNpxx
-6OowHwYDVR0jBBgwFoAUsR53NN55AbLmThsm4pt3idg5vn0weAYDVR0RBHEwb4IR
-YXdlYjQwLmhxLmVzby5vcmeCD2lkcC5hZHMuZXNvLm9yZ4ILaWRwLmVzby5vcmeC
-DmlkcC5ocS5lc28ub3Jngg9zZHAuYWRzLmVzby5vcmeCC3NkcC5lc28ub3Jngg5z
-ZHAuaHEuZXNvLm9yZzB7BgNVHR8EdDByMDegNaAzhjFodHRwOi8vY2RwMS5wY2Eu
-ZGZuLmRlL2Vzby1jYS9wdWIvY3JsL2dfY2FjcmwuY3JsMDegNaAzhjFodHRwOi8v
-Y2RwMi5wY2EuZGZuLmRlL2Vzby1jYS9wdWIvY3JsL2dfY2FjcmwuY3JsMIHLBggr
-BgEFBQcBAQSBvjCBuzAzBggrBgEFBQcwAYYnaHR0cDovL29jc3AucGNhLmRmbi5k
-ZS9PQ1NQLVNlcnZlci9PQ1NQMEEGCCsGAQUFBzAChjVodHRwOi8vY2RwMS5wY2Eu
-ZGZuLmRlL2Vzby1jYS9wdWIvY2FjZXJ0L2dfY2FjZXJ0LmNydDBBBggrBgEFBQcw
-AoY1aHR0cDovL2NkcDIucGNhLmRmbi5kZS9lc28tY2EvcHViL2NhY2VydC9nX2Nh
-Y2VydC5jcnQwDQYJKoZIhvcNAQELBQADggEBAL10jELuLO7BfdWD2GV/chZe20xt
-M8NthmUA4i6VG9/MRTIFzhR9qwnl0nBQPGCisGH07EU6DvKH6XVMBtW2XidOL2Xq
-vyw9Ztvs5H2ypRnV6FDUKRf1PdbdY6pqTInn5Yt8cw8Rv9h5FDNCXLoLjkRuBNQf
-xgdPNKcKNSTAAI+bnXftMKiV6JHYQxbxsL+x4qVYlHQT425U12ZWwYuE28GzjhUf
-qkP9zWDiEtC88Nxn/NisXmpRJul/cG0ddb3N9XAfvBvjIMN4+rxLvb1ehqLreZFf
-26ev5dBb9dYdJ92x6RFKiD6kvBVZSNaN7KY5ogvz8WmWnXlllor+GGdxQkA=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.eso.org:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.eso.org:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.eso.org/idp/profile/SAML2/Redirect/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.eso.org/idp/profile/SAML2/POST/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.eso.org: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.eso.org/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.eso.org/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.eso.org/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.eso.org/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">eso.org</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.eso.org</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>emailAddress=trustmaster@eso.org,CN=idp.eso.org,O=ESO - European Organisation for Astronomical Research,L=Garching,ST=Bayern,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIGWDCCBUCgAwIBAgIHGGCD/SMRJzANBgkqhkiG9w0BAQsFADCBlzELMAkGA1UE
-BhMCREUxPjA8BgNVBAoTNUVTTyAtIEV1cm9wZWFuIE9yZ2FuaXNhdGlvbiBmb3Ig
-QXN0cm9ub21pY2FsIFJlc2VhcmNoMQwwCgYDVQQLEwNURUMxFjAUBgNVBAMTDUVT
-TyBQS0kgLSBHMDIxIjAgBgkqhkiG9w0BCQEWE3RydXN0bWFzdGVyQGVzby5vcmcw
-HhcNMTQxMDE3MTIwNzA5WhcNMTkwNzA5MjM1OTAwWjCBqzELMAkGA1UEBhMCREUx
-DzANBgNVBAgTBkJheWVybjERMA8GA1UEBxMIR2FyY2hpbmcxPjA8BgNVBAoTNUVT
-TyAtIEV1cm9wZWFuIE9yZ2FuaXNhdGlvbiBmb3IgQXN0cm9ub21pY2FsIFJlc2Vh
-cmNoMRQwEgYDVQQDEwtpZHAuZXNvLm9yZzEiMCAGCSqGSIb3DQEJARYTdHJ1c3Rt
-YXN0ZXJAZXNvLm9yZzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAL/y
-weMbb9mXT+teqXFEevPWlvO48gTjIqNAcrGs9XvZtLCQB91hftXOkS21aNhpO1jD
-pJeU6WRjH7WEU3/oXGGqXztxV3I6giyMm8UB0qNLtDm2MuGhYT4CqIwunIzqYKJG
-nvvhi6NTAqhO2wP+XIK7dCnYhehRPhAivMKwLWabKKHF4SPV1X4R/AIMPbu2QFnK
-lM3grdo6lctuGWGcJ9n2UU/9ywQmiZmczQigimkjPp6K/1GFZI5TmIP5uO+Wv+sD
-JxETIOvsYQK5y+CmU5fl1kSPKUwpa+ssfKldRZIpTc2sukFlnU8XAmMpSmjyzsXL
-wEoojn5FmgPgdHLQrwUCAwEAAaOCApEwggKNME8GA1UdIARIMEYwEQYPKwYBBAGB
-rSGCLAEBBAMCMBEGDysGAQQBga0hgiwCAQQDATAPBg0rBgEEAYGtIYIsAQEEMA0G
-CysGAQQBga0hgiweMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgXgMB0GA1UdJQQWMBQG
-CCsGAQUFBwMCBggrBgEFBQcDATAdBgNVHQ4EFgQUSPnc6DulTXOTEQM+i/fbNpxx
-6OowHwYDVR0jBBgwFoAUsR53NN55AbLmThsm4pt3idg5vn0weAYDVR0RBHEwb4IR
-YXdlYjQwLmhxLmVzby5vcmeCD2lkcC5hZHMuZXNvLm9yZ4ILaWRwLmVzby5vcmeC
-DmlkcC5ocS5lc28ub3Jngg9zZHAuYWRzLmVzby5vcmeCC3NkcC5lc28ub3Jngg5z
-ZHAuaHEuZXNvLm9yZzB7BgNVHR8EdDByMDegNaAzhjFodHRwOi8vY2RwMS5wY2Eu
-ZGZuLmRlL2Vzby1jYS9wdWIvY3JsL2dfY2FjcmwuY3JsMDegNaAzhjFodHRwOi8v
-Y2RwMi5wY2EuZGZuLmRlL2Vzby1jYS9wdWIvY3JsL2dfY2FjcmwuY3JsMIHLBggr
-BgEFBQcBAQSBvjCBuzAzBggrBgEFBQcwAYYnaHR0cDovL29jc3AucGNhLmRmbi5k
-ZS9PQ1NQLVNlcnZlci9PQ1NQMEEGCCsGAQUFBzAChjVodHRwOi8vY2RwMS5wY2Eu
-ZGZuLmRlL2Vzby1jYS9wdWIvY2FjZXJ0L2dfY2FjZXJ0LmNydDBBBggrBgEFBQcw
-AoY1aHR0cDovL2NkcDIucGNhLmRmbi5kZS9lc28tY2EvcHViL2NhY2VydC9nX2Nh
-Y2VydC5jcnQwDQYJKoZIhvcNAQELBQADggEBAL10jELuLO7BfdWD2GV/chZe20xt
-M8NthmUA4i6VG9/MRTIFzhR9qwnl0nBQPGCisGH07EU6DvKH6XVMBtW2XidOL2Xq
-vyw9Ztvs5H2ypRnV6FDUKRf1PdbdY6pqTInn5Yt8cw8Rv9h5FDNCXLoLjkRuBNQf
-xgdPNKcKNSTAAI+bnXftMKiV6JHYQxbxsL+x4qVYlHQT425U12ZWwYuE28GzjhUf
-qkP9zWDiEtC88Nxn/NisXmpRJul/cG0ddb3N9XAfvBvjIMN4+rxLvb1ehqLreZFf
-26ev5dBb9dYdJ92x6RFKiD6kvBVZSNaN7KY5ogvz8WmWnXlllor+GGdxQkA=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.eso.org:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.eso.org: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">e446</OrganizationName>
-    <OrganizationName xml:lang="en">e446</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">ESO - European Organisation for Astronomical Research</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">ESO - European Organisation for Astronomical Research</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.eso.org</OrganizationURL>
-    <OrganizationURL xml:lang="en">http://www.eso.org</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Michael</GivenName>
-    <SurName>Naumann</SurName>
-    <EmailAddress>mailto:mnaumann@eso.org</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="support">
-    <GivenName>Michael</GivenName>
-    <SurName>Naumann</SurName>
-    <EmailAddress>mailto:mnaumann@eso.org</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.eurecom.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.eurecom.fr-idp-shibboleth.xml
deleted file mode 100644
index eb4052a6..00000000
--- a/swamid-interfederations-2.0/idp.eurecom.fr-idp-shibboleth.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://idp.eurecom.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2014-03-20T18:45:57Z">
-      <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">eurecom.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">EURECOM</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Any student, researcher and personal users authenticated by directory server of EURECOM.</mdui:Description>
-        <mdui:DisplayName xml:lang="fr">EURECOM</mdui:DisplayName>
-        <mdui:Description xml:lang="fr">Tout utilisateur de type étudiant, chercheur et personnel authentifié par l'annuaire d'EURECOM.</mdui:Description>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDJDCCAgygAwIBAgIVAL0+FcNd+RBrqwXsGlutpKVVG5BzMA0GCSqGSIb3DQEB
-BQUAMBkxFzAVBgNVBAMTDmlkcC5ldXJlY29tLmZyMB4XDTEzMTIxMjA5NTcyN1oX
-DTMzMTIxMjA5NTcyN1owGTEXMBUGA1UEAxMOaWRwLmV1cmVjb20uZnIwggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDGYpCW+8So7j9MDPjvSzK7ThwTHigN
-9XSgt3xydTOSJdZ2R/0JkZ7mSMoNhb21ZPnOlMntPTG7I5iWKh9O02rHj2/01JzU
-6PmD+hNHI2XWrA6yCarO+6/t38seOPAoBJZJ067UTWQ/Wup7v1aWZ3fgu3Meay0s
-6iwlfUZMVXfDH1DO1kvnhirlXxCBVXwhsXIksje2gsECayHpvPQ7ZyD9pIRGo74I
-NEqXPj5Z9F3XtXngMHdMvDJlWHo3oZ1p/WrQa2jHx0rynFYleEGzms9gtsBWQmtP
-G7JNlLntBsDa2WDmCYc4JoyeH29IVgRSCF8DqHTQpRnFUx1uokFfJjcnAgMBAAGj
-YzBhMEAGA1UdEQQ5MDeCDmlkcC5ldXJlY29tLmZyhiVodHRwczovL2lkcC5ldXJl
-Y29tLmZyL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBQXXN9yiNpwBniygQ4M8be1
-VW+n0jANBgkqhkiG9w0BAQUFAAOCAQEAb1oFFcqPKv/IGgsUQCHrHNB5dG3lWCMC
-RotaqTqIQORT0ittxS8JAv53j+tEo/C5BbdHqX2lwJb6qlqpzOb9IRHsJfAhKuXc
-uIgTN3Hp9gdSnT0sFqlffmdqL09u56nJYpgGXx78IcxZ7Q6uVXvjj9/r72i6cMbF
-yQVYEVSEnTGb6XI/Lk/bF5t5KZPhnNWM3cVC+4qLwcuJTKcO9/mJyU3y0QczeCaR
-DCkMZEunkZO+fnPbVEaY4/a7rRKebhMty9gcJASrTF9seG5IfME0Nz61+Mbjre9V
-wYMMzOpBYP7tCdxld40eG8UXU7Hzw9smDW1QErZqbMYm3Z7Qss1p0Q==
-					    </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://idp.eurecom.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.eurecom.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.eurecom.fr/idp/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">EURECOM</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">EURECOM</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <EmailAddress>shibboleth@eurecom.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.eurecom.fr.xml b/swamid-interfederations-2.0/idp.eurecom.fr.xml
deleted file mode 100644
index eb4052a6..00000000
--- a/swamid-interfederations-2.0/idp.eurecom.fr.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://idp.eurecom.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2014-03-20T18:45:57Z">
-      <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">eurecom.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">EURECOM</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Any student, researcher and personal users authenticated by directory server of EURECOM.</mdui:Description>
-        <mdui:DisplayName xml:lang="fr">EURECOM</mdui:DisplayName>
-        <mdui:Description xml:lang="fr">Tout utilisateur de type étudiant, chercheur et personnel authentifié par l'annuaire d'EURECOM.</mdui:Description>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDJDCCAgygAwIBAgIVAL0+FcNd+RBrqwXsGlutpKVVG5BzMA0GCSqGSIb3DQEB
-BQUAMBkxFzAVBgNVBAMTDmlkcC5ldXJlY29tLmZyMB4XDTEzMTIxMjA5NTcyN1oX
-DTMzMTIxMjA5NTcyN1owGTEXMBUGA1UEAxMOaWRwLmV1cmVjb20uZnIwggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDGYpCW+8So7j9MDPjvSzK7ThwTHigN
-9XSgt3xydTOSJdZ2R/0JkZ7mSMoNhb21ZPnOlMntPTG7I5iWKh9O02rHj2/01JzU
-6PmD+hNHI2XWrA6yCarO+6/t38seOPAoBJZJ067UTWQ/Wup7v1aWZ3fgu3Meay0s
-6iwlfUZMVXfDH1DO1kvnhirlXxCBVXwhsXIksje2gsECayHpvPQ7ZyD9pIRGo74I
-NEqXPj5Z9F3XtXngMHdMvDJlWHo3oZ1p/WrQa2jHx0rynFYleEGzms9gtsBWQmtP
-G7JNlLntBsDa2WDmCYc4JoyeH29IVgRSCF8DqHTQpRnFUx1uokFfJjcnAgMBAAGj
-YzBhMEAGA1UdEQQ5MDeCDmlkcC5ldXJlY29tLmZyhiVodHRwczovL2lkcC5ldXJl
-Y29tLmZyL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBQXXN9yiNpwBniygQ4M8be1
-VW+n0jANBgkqhkiG9w0BAQUFAAOCAQEAb1oFFcqPKv/IGgsUQCHrHNB5dG3lWCMC
-RotaqTqIQORT0ittxS8JAv53j+tEo/C5BbdHqX2lwJb6qlqpzOb9IRHsJfAhKuXc
-uIgTN3Hp9gdSnT0sFqlffmdqL09u56nJYpgGXx78IcxZ7Q6uVXvjj9/r72i6cMbF
-yQVYEVSEnTGb6XI/Lk/bF5t5KZPhnNWM3cVC+4qLwcuJTKcO9/mJyU3y0QczeCaR
-DCkMZEunkZO+fnPbVEaY4/a7rRKebhMty9gcJASrTF9seG5IfME0Nz61+Mbjre9V
-wYMMzOpBYP7tCdxld40eG8UXU7Hzw9smDW1QErZqbMYm3Z7Qss1p0Q==
-					    </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://idp.eurecom.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.eurecom.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.eurecom.fr/idp/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">EURECOM</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">EURECOM</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <EmailAddress>shibboleth@eurecom.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.feide.no.xml b/swamid-interfederations-2.0/idp.feide.no.xml
index b2f3c3ad..5cce1aef 100644
--- a/swamid-interfederations-2.0/idp.feide.no.xml
+++ b/swamid-interfederations-2.0/idp.feide.no.xml
@@ -1,394 +1,385 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.feide.no">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://feide.no/" registrationInstant="2012-10-09T13:08:24Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://www.feide.no/files/feide/metadata-registration-practice-statement.pdf</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </md:Extensions>
+<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.feide.no">
   <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">Feide</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="no">Feide</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="nn">Feide</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Feide is the login system for norwegian educational and research institusions.</mdui:Description>
-        <mdui:Description xml:lang="no">Feide er innloggingssiden for norske utdannings- og forskningsinstitusjoner.</mdui:Description>
-        <mdui:Description xml:lang="nn">Feide er innloggingssida for norske utdannings- og forskningsinstitusjonar.</mdui:Description>
-      </mdui:UIInfo>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">aal.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">agdenes.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">aho.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">alstahaug.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">andebu.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">aremark.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">arendal.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">as-skole.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">asker.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">askim.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">askoy.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">askvoll.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">asnes.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">aure.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">austagderfk.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">austevoll.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">austrheim.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">averoy.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">baerum.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">balestrand.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bamble.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bardu.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bergensskolen.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">betanien.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bfk.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bi.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bibsys.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bo.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">boe.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bokn.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bomlo.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bremanger.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">diakonhjemmet.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">diakonova.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">dmmh.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">donna.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">dovreskulane.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">drammen.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">dvm.iktsenteret.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">eid.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">eideskolen.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">eidfjord.kommune.no</shibmd:Scope>
-      <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">eidsvoll.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>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fedje.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.afjord.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.ahk.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.amot.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.bjugn.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.engerdal.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.farsund.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.harstad.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.holtalen.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.kg.vgs.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.leksvik.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.levanger.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.lorenskog-skole.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.lund.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.mosseskolen.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.nesodden.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.nlm.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.nord-fron.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.oknett.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.orkdal.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.orlandet.kommune.no</shibmd:Scope>
-      <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>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.rygge.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.sarpsborg.com</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.skedsmo.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.ski.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.stor-elvdal.kommune.no</shibmd:Scope>
-      <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">feide.verdal.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>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fjell.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fjellhaug.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">flaa.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">flatanger.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">flesberg.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">flora.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">folkeuniversitetet.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">forde.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">forsand.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fosnes.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">frana.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">frogn.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">froland.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">frosta.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">froya.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fusa.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gaular.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">giske.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gjemnes.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gjerdrum.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gjesdal.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gloppen.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gol.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gran.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">grane.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">granvin.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">grimstad.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">grong.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gs.alesund.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gs.haram.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gs.skodje.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gs.sula.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gulen.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ha.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hadsel.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">haldenskole.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">halsa.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hamar.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hammerfest.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">haraldsplass.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hattfjelldal.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">haugesund.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hbv.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hedmark.org</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hemne.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hemnes.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hemsedal.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">heroy-no.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">heroy.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hfk.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hials.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hib.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hibu.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hig.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hih.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hihm.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hil.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">himolde.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hin.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hinesna.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hint.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hioa.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hiof.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hisf.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hist.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hit.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hitra.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hive.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hivolda.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hjartdal.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hjelmeland.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hobol.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hol.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">holeskolen.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hornindal.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">horten.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hoyanger.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hoylandet.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hsh.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hurdal.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hurum.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hyllestad.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">iktsenteret.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">jolster.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">jondal.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kafjord.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">karmoyskolen.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">khib.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">khio.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">klabu.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">klepp.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kongsberg.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kongsvinger.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kristiansand.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kristiansund.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kvam.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kvanangen.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kvinnherad.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kvn.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lardal.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">larvik.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lavangen.kommune.no</shibmd:Scope>
-      <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">lesjaskulane.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>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lindas.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lomskulane.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">loten.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lunner.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">luster.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lybskole.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lyngdal.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lyngen.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">malselv.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">malvik.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">marker.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">masfjorden.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">meland.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">melhus.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">meraker.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">met.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mf.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mhs.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">midsund.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">midtre-gauldal.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">modalen.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mrfylke.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">namdalseid.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">namsos.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">namsskogan.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nannestad.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">narvik.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">naustdal.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nb.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nedre-eiker.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nes-ak.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nes-bu.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nesset.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nfk.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nhh.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nih.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nith.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nla.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nmbu.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nmh.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nome.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nord-aurdal.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nordkapp.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nordreisa.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nore-og-uvdal.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">notodden.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">notteroy.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ntfk.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ntnu.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nvh.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">oddaskolen.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">oksnes.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">oppdal.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">oppland.org</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-ho.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osteroy.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">overhalla.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ovgs.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ovre-eiker.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">oygarden.kommune.no</shibmd:Scope>
-      <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>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">rennebu.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">rennesoy.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ringebu.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ringsaker.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">rogfk.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">rollag.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">romskog.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">royken.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">royrvik.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">salangen.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">saltdal.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">samfunnsforskning.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sami.vgs.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">samiskhs.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">samnanger.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sande.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sandefjord.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sandnes.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sauda.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sauherad.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">selbu.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">selje.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">seljord.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">selskolene.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sfj.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">skanland.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">skaun.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">skiptvet.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">skjaakskulane.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">skjervoy.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">skole.fredrikstad.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">skole.svk.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">skoler.alta.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">smola.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">snasa.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">snillfjord.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sogndal.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sola.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">solund.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sor-aurdal.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sortland.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sorum.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">spusers.feide.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">spydeberg.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">stange.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">stavanger.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">steinkjer.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">stfk.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">stjordal.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">stokke.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">storfjord.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">stpaul.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">strand.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">stryn.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">suldal.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sund.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sunndal.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">surnadal.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">svelvik.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">t-fk.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">time.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">tingvoll.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">tinn.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">tjome.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">tokke.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">tonsberg.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">torsken.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">trogstad.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">troms.vgs.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">tromso.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">trondheim.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">tydal.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">tysnes.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">tysver.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uia.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uib.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uin.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uio.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uis.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uit.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ullensaker.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ullensvang.herad.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ulvik.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">umb.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uninett.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">utsira.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vaalerskolene.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vaf.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vaga.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vagan.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vagsoy.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vaksdal.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">valer-of.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vang.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vefsn.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vestby.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vestre-slidre.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vestvagoy.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vfk.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vgsa.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vik.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">voss.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">aal.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">agdenes.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">aho.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">alstahaug.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">andebu.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">aremark.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">arendal.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">as-skole.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">asker.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">askim.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">askoy.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">askvoll.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">asnes.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">aure.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">austagderfk.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">austevoll.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">austrheim.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">averoy.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">baerum.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">balestrand.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">bamble.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">bardu.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">bergensskolen.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">betanien.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">bfk.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">bi.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">bibsys.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">bo.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">boe.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">bokn.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">bomlo.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">bremanger.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">diakonhjemmet.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">diakonova.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">dmmh.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">donna.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">dovreskulane.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">drammen.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">dvm.iktsenteret.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">eid.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">eideskolen.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">eidfjord.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">eidsberg.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">eidskog.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">eidsvoll.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">elverum.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">enebakk.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">etne.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">etnedal.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">evenes.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">fedje.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">feide.afjord.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">feide.ahk.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">feide.amot.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">feide.bjugn.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">feide.engerdal.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">feide.farsund.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">feide.harstad.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">feide.holtalen.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">feide.kg.vgs.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">feide.leksvik.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">feide.levanger.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">feide.lorenskog-skole.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">feide.lund.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">feide.mosseskolen.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">feide.nesodden.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">feide.nlm.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">feide.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">feide.nord-fron.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">feide.oknett.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">feide.orkdal.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">feide.orlandet.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">feide.osen.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">feide.osloskolen.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">feide.rade.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">feide.ringerike.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">feide.rissa.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">feide.roan.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">feide.roros.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">feide.rygge.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">feide.sarpsborg.com</shibmd:Scope>
+      <shibmd:Scope regexp="false">feide.skedsmo.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">feide.ski.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">feide.stor-elvdal.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">feide.stord.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">feide.stranda.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">feide.trysil.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">feide.verdal.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">fet.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">ffk.vgs.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">fitjar.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">fjaler.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">fjell.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">fjellhaug.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">flaa.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">flatanger.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">flesberg.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">flora.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">folkeuniversitetet.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">forde.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">forsand.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">fosnes.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">frana.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">frogn.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">froland.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">frosta.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">froya.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">fusa.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">gaular.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">giske.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">gjemnes.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">gjerdrum.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">gjesdal.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">gloppen.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">gol.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">gran.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">grane.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">granvin.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">grimstad.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">grong.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">gs.alesund.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">gs.haram.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">gs.skodje.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">gs.sula.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">gulen.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">ha.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">hadsel.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">haldenskole.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">halsa.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">hamar.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">hammerfest.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">haraldsplass.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">hattfjelldal.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">haugesund.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">hbv.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">hedmark.org</shibmd:Scope>
+      <shibmd:Scope regexp="false">hemne.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">hemnes.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">hemsedal.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">heroy-no.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">heroy.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">hfk.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">hials.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">hib.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">hibu.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">hig.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">hih.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">hihm.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">hil.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">himolde.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">hin.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">hinesna.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">hint.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">hioa.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">hiof.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">hisf.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">hist.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">hit.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">hitra.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">hive.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">hivolda.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">hjartdal.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">hjelmeland.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">hobol.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">hol.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">holeskolen.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">hornindal.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">horten.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">hoyanger.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">hoylandet.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">hsh.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">hurdal.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">hurum.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">hyllestad.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">iktsenteret.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">jolster.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">jondal.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">kafjord.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">karmoyskolen.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">khib.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">khio.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">klabu.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">klepp.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">kongsberg.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">kongsvinger.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">kristiansand.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">kristiansund.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">kvam.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">kvanangen.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">kvinnherad.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">kvn.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">lardal.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">larvik.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">lavangen.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">ldh.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">leikanger.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">leirfjord.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">lenvik.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">lesjaskulane.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">lier.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">lierne.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">lillesand.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">lindas.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">lomskulane.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">loten.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">lunner.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">luster.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">lybskole.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">lyngdal.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">lyngen.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">malselv.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">malvik.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">marker.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">masfjorden.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">meland.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">melhus.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">meraker.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">met.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">mf.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">mhs.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">midsund.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">midtre-gauldal.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">modalen.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">mrfylke.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">namdalseid.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">namsos.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">namsskogan.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">nannestad.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">narvik.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">naustdal.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">nb.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">nedre-eiker.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">nes-ak.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">nes-bu.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">nesset.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">nfk.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">nhh.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">nih.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">nith.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">nla.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">nmbu.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">nmh.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">nome.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">nord-aurdal.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">nordkapp.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">nordreisa.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">nore-og-uvdal.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">notodden.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">notteroy.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">ntfk.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">ntnu.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">nvh.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">oddaskolen.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">oksnes.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">oppdal.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">oppland.org</shibmd:Scope>
+      <shibmd:Scope regexp="false">os-ho.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">osteroy.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">overhalla.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">ovgs.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">ovre-eiker.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">oygarden.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">oystre-slidre.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">phs.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">radoy.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">ralingen.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">rana.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">randaberg.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">rauma.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">rennebu.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">rennesoy.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">ringebu.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">ringsaker.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">rogfk.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">rollag.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">romskog.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">royken.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">royrvik.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">salangen.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">saltdal.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">samfunnsforskning.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">sami.vgs.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">samiskhs.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">samnanger.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">sande.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">sandefjord.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">sandnes.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">sauda.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">sauherad.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">selbu.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">selje.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">seljord.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">selskolene.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">sfj.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">skanland.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">skaun.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">skiptvet.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">skjaakskulane.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">skjervoy.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">skole.fredrikstad.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">skole.svk.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">skoler.alta.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">smola.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">snasa.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">snillfjord.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">sogndal.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">sola.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">solund.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">sor-aurdal.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">sortland.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">sorum.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">spusers.feide.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">spydeberg.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">stange.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">stavanger.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">steinkjer.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">stfk.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">stjordal.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">stokke.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">storfjord.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">stpaul.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">strand.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">stryn.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">suldal.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">sund.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">sunndal.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">surnadal.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">svelvik.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">t-fk.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">time.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">tingvoll.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">tinn.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">tjome.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">tokke.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">tonsberg.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">torsken.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">trogstad.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">troms.vgs.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">tromso.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">trondheim.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">tydal.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">tysnes.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">tysver.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">uia.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">uib.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">uin.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">uio.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">uis.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">uit.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">ullensaker.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">ullensvang.herad.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">ulvik.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">umb.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">uninett.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">utsira.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">vaalerskolene.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">vaf.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">vaga.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">vagan.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">vagsoy.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">vaksdal.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">valer-of.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">vang.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">vefsn.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">vestby.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">vestre-slidre.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">vestvagoy.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">vfk.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">vgsa.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">vik.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">voss.kommune.no</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">norway</saml:AttributeValue>
+      </saml:Attribute>
     </md:Extensions>
     <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+      <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>MIIDhjCCAm4CCQCZwrMQOJ3URzANBgkqhkiG9w0BAQUFADCBhDELMAkGA1UEBhMCTk8xEjAQBgNVBAcTCVRyb25kaGVpbTETMBEGA1UEChMKVW5pbmV0dCBBUzEOMAwGA1UECxMFRkVJREUxFTATBgNVBAMTDGlkcC5mZWlkZS5ubzElMCMGCSqGSIb3DQEJARYWbW9yaWEtZHJpZnRAdW5pbmV0dC5ubzAeFw0xNDA0MTEwOTM1MTBaFw0zNDA0MTEwOTM1MTBaMIGEMQswCQYDVQQGEwJOTzESMBAGA1UEBxMJVHJvbmRoZWltMRMwEQYDVQQKEwpVbmluZXR0IEFTMQ4wDAYDVQQLEwVGRUlERTEVMBMGA1UEAxMMaWRwLmZlaWRlLm5vMSUwIwYJKoZIhvcNAQkBFhZtb3JpYS1kcmlmdEB1bmluZXR0Lm5vMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAr3UtSny6D+DRQzdjWOdd+eQZxa9aKrx/v70Uo+yvnzgenLLS+MsUxbiSLkAPIbkWOO2kLdG9XSZ9sp9S5aGYMnsarxeGEXV1AS6olrpo5QJOZoQStFB0dYEXzBSJifTIsEmyXByd8mE64dkMcdzG90eBzfcFNwU6vKjln0vmoDocJrKZvUoF7d1egD+aUa9o3BneMDylcp8mkCe6XcnPlJ8QqxQ/RBmaly/Hl/zTZei8+pEu7ICRiorD2iHEDM/EhsclOrMKiRFBuZN8yB4sgknhdmAiWRyB/D4CEj74MQDQPp7Mr1B0Vxn7Y7ZeStt19HxEjzxyJGsdC9BMrn+tzwIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQBwZmzNzTgbYAuQGikkRbKInog5OCMo3GhZO82+IrtasJC6rNPrz/+8KHfIOUB83wnfEMnKKygW7ELeSnvlbKUyve6DbNXrHjMJYzjqLG3cdgIKZaFyTfWaQiY8G82qP38Lc7rtgLoh/F7lpqCdunzPfSQBraGH2IAHyP6x3tjlsGGTj/LN8sT20iHRk8IXsBsMGv5DcZ4n+zB2E5hyfxH87sNYu6gaIrpcxcv5N0AK++fvpnrhlEmT0rW7b8wgBB4BmaPfCCb4DbDgHvIBPmG8QF7SNjUGuVPUFJRPTkvhighbeuRtoNpq0W1EVXKq0ZeBO8jJ6Si9LAdFvqwy70D0</ds:X509Certificate>
         </ds:X509Data>
@@ -398,10 +389,10 @@
     <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.feide.no/simplesaml/saml2/idp/SSOService.php"/>
   </md:IDPSSODescriptor>
   <md:Organization>
-    <md:OrganizationName xml:lang="en">Feide</md:OrganizationName>
-    <md:OrganizationName xml:lang="no">Feide</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Feide</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="no">Feide</md:OrganizationDisplayName>
+    <md:OrganizationName xml:lang="en">Feide - Norwegian Educational and Research Institusions</md:OrganizationName>
+    <md:OrganizationName xml:lang="no">Feide - Norske utdannings og forsknings-institusjoner</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Feide - Norwegian Educational and Research Institusions</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="no">Feide - Norske utdannings og forsknings-institusjoner</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="en">http://www.feide.no/introducing-feide</md:OrganizationURL>
     <md:OrganizationURL xml:lang="no">http://www.feide.no/</md:OrganizationURL>
   </md:Organization>
@@ -409,4 +400,8 @@
     <md:GivenName>Feide Support</md:GivenName>
     <md:EmailAddress>support@feide.no</md:EmailAddress>
   </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Feide Support</md:GivenName>
+    <md:EmailAddress>support@feide.no</md:EmailAddress>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.fgu.cas.cz-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.fgu.cas.cz-idp-shibboleth.xml
deleted file mode 100644
index 061ba899..00000000
--- a/swamid-interfederations-2.0/idp.fgu.cas.cz-idp-shibboleth.xml
+++ /dev/null
@@ -1,118 +0,0 @@
-<?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.fgu.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/" registrationInstant="2014-05-29T13:36:13Z">
-      <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>
-    <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://eduid.cz/uri/idp-group/avcr</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>
-      <shibmd:Scope regexp="false">fgu.cas.cz</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Institute of Physiology AS CR</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="cs">Fyziologický ústav AV ČR</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Identity Provider  IOP AV CR employees.</mdui:Description>
-        <mdui:Description xml:lang="cs">Identity Provider pro zaměstnance FGÚ AV ČR</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.fgu.cas.cz/en</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="cs">http://www.fgu.cas.cz/</mdui:InformationURL>
-        <mdui:Logo height="44" width="282">https://jiftach.cas.cz/loga/logo-fgu-44.png</mdui:Logo>
-        <mdui:Logo height="153" width="980">https://jiftach.cas.cz/loga/logo-fgu-153.png</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDIzCCAgugAwIBAgIUW8Fvk+9NuCdYJn9rrxSID4QcQWUwDQYJKoZIhvcNAQEF
-BQAwGTEXMBUGA1UEAxMOaWRwLmZndS5jYXMuY3owHhcNMTQwNTE2MDcwMjEzWhcN
-MzQwNTE2MDcwMjEzWjAZMRcwFQYDVQQDEw5pZHAuZmd1LmNhcy5jejCCASIwDQYJ
-KoZIhvcNAQEBBQADggEPADCCAQoCggEBALqySf+1bTV+w3dZgWBv7N697eGABM+v
-ktmLnnyfLT9jlyGPH/kK/cGHdjVvAObBTP+igmarMWKuZM2TF9E0Onlgv9lwLOrF
-N5mltg3+PH/C1pawJWY80yx2OWB4F9a/6X69TUPPV+ZmYX8O6ivEsvlN6dTCnRma
-Ou4U1lUpVlLGvYMuyDlt6ES+GGW73D+v7TW+oz5FHdidCWIJ8L2hYyjkn21O+IEI
-mFMi9gMYh09tWcPzn6t3H8JBUDY6iovnNAfUtdTY/rcH86YCQ42Hv2snpsjUiDTl
-n2G1TgRMq09iX8OGQSxcY4YDUHx5DzzrYSZcIlERS6MXyFnE+knavisCAwEAAaNj
-MGEwQAYDVR0RBDkwN4IOaWRwLmZndS5jYXMuY3qGJWh0dHBzOi8vaWRwLmZndS5j
-YXMuY3ovaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFCRKRKtvKnxOQZHYF1aSsGu9
-Ge2oMA0GCSqGSIb3DQEBBQUAA4IBAQCJ8ZeUl6jKt3ecQjX0gUsBEePJOREHlTtG
-AAb67oxhH9Mm/Z/5Qu5tvBoI7U+lncj/1gAf8FObQlUu4CSc02f5DeS0F80MAg3h
-/OAvZq85zFMJfhlbBQHdOtNqNROLwIu34JvIz+ukc2DG25weY/lgvU6ulUICkgd9
-9U1V77HhjdIIm5JYfTzKC3Iwss2/OT1WaY5esO+stlchg3D8kyKRlm2bG+WlWqAp
-giXM0j45ZDJZNxmZ/U9kvaKVpmXE5DEYEvyMFGRZqyeo1DaHwiYAWPBbRO+tJp3A
-4O2O0wmUOZ0O6IPd8iDs0Q0eWV11U7mb3fGgeWKOIBS4zmQD2By5
-
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.fgu.cas.cz:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.fgu.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.fgu.cas.cz/idp/profile/SAML2/Redirect/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.fgu.cas.cz/idp/profile/SAML2/POST/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.fgu.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.fgu.cas.cz/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.fgu.cas.cz/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.fgu.cas.cz/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.fgu.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">fgu.cas.cz</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDIzCCAgugAwIBAgIUW8Fvk+9NuCdYJn9rrxSID4QcQWUwDQYJKoZIhvcNAQEF
-BQAwGTEXMBUGA1UEAxMOaWRwLmZndS5jYXMuY3owHhcNMTQwNTE2MDcwMjEzWhcN
-MzQwNTE2MDcwMjEzWjAZMRcwFQYDVQQDEw5pZHAuZmd1LmNhcy5jejCCASIwDQYJ
-KoZIhvcNAQEBBQADggEPADCCAQoCggEBALqySf+1bTV+w3dZgWBv7N697eGABM+v
-ktmLnnyfLT9jlyGPH/kK/cGHdjVvAObBTP+igmarMWKuZM2TF9E0Onlgv9lwLOrF
-N5mltg3+PH/C1pawJWY80yx2OWB4F9a/6X69TUPPV+ZmYX8O6ivEsvlN6dTCnRma
-Ou4U1lUpVlLGvYMuyDlt6ES+GGW73D+v7TW+oz5FHdidCWIJ8L2hYyjkn21O+IEI
-mFMi9gMYh09tWcPzn6t3H8JBUDY6iovnNAfUtdTY/rcH86YCQ42Hv2snpsjUiDTl
-n2G1TgRMq09iX8OGQSxcY4YDUHx5DzzrYSZcIlERS6MXyFnE+knavisCAwEAAaNj
-MGEwQAYDVR0RBDkwN4IOaWRwLmZndS5jYXMuY3qGJWh0dHBzOi8vaWRwLmZndS5j
-YXMuY3ovaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFCRKRKtvKnxOQZHYF1aSsGu9
-Ge2oMA0GCSqGSIb3DQEBBQUAA4IBAQCJ8ZeUl6jKt3ecQjX0gUsBEePJOREHlTtG
-AAb67oxhH9Mm/Z/5Qu5tvBoI7U+lncj/1gAf8FObQlUu4CSc02f5DeS0F80MAg3h
-/OAvZq85zFMJfhlbBQHdOtNqNROLwIu34JvIz+ukc2DG25weY/lgvU6ulUICkgd9
-9U1V77HhjdIIm5JYfTzKC3Iwss2/OT1WaY5esO+stlchg3D8kyKRlm2bG+WlWqAp
-giXM0j45ZDJZNxmZ/U9kvaKVpmXE5DEYEvyMFGRZqyeo1DaHwiYAWPBbRO+tJp3A
-4O2O0wmUOZ0O6IPd8iDs0Q0eWV11U7mb3fGgeWKOIBS4zmQD2By5
-
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.fgu.cas.cz:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.fgu.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 Physiology</OrganizationName>
-    <OrganizationName xml:lang="cs">Fyziologický ústav AV ČR</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Institute of Physiology, Public Research Institution</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="cs">Fyziologický ústav AV ČR, v.v.i.</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.fgu.cas.cz/en</OrganizationURL>
-    <OrganizationURL xml:lang="cs">http://www.fgu.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.fgu.cas.cz.xml b/swamid-interfederations-2.0/idp.fgu.cas.cz.xml
deleted file mode 100644
index 061ba899..00000000
--- a/swamid-interfederations-2.0/idp.fgu.cas.cz.xml
+++ /dev/null
@@ -1,118 +0,0 @@
-<?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.fgu.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/" registrationInstant="2014-05-29T13:36:13Z">
-      <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>
-    <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://eduid.cz/uri/idp-group/avcr</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>
-      <shibmd:Scope regexp="false">fgu.cas.cz</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Institute of Physiology AS CR</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="cs">Fyziologický ústav AV ČR</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Identity Provider  IOP AV CR employees.</mdui:Description>
-        <mdui:Description xml:lang="cs">Identity Provider pro zaměstnance FGÚ AV ČR</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.fgu.cas.cz/en</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="cs">http://www.fgu.cas.cz/</mdui:InformationURL>
-        <mdui:Logo height="44" width="282">https://jiftach.cas.cz/loga/logo-fgu-44.png</mdui:Logo>
-        <mdui:Logo height="153" width="980">https://jiftach.cas.cz/loga/logo-fgu-153.png</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDIzCCAgugAwIBAgIUW8Fvk+9NuCdYJn9rrxSID4QcQWUwDQYJKoZIhvcNAQEF
-BQAwGTEXMBUGA1UEAxMOaWRwLmZndS5jYXMuY3owHhcNMTQwNTE2MDcwMjEzWhcN
-MzQwNTE2MDcwMjEzWjAZMRcwFQYDVQQDEw5pZHAuZmd1LmNhcy5jejCCASIwDQYJ
-KoZIhvcNAQEBBQADggEPADCCAQoCggEBALqySf+1bTV+w3dZgWBv7N697eGABM+v
-ktmLnnyfLT9jlyGPH/kK/cGHdjVvAObBTP+igmarMWKuZM2TF9E0Onlgv9lwLOrF
-N5mltg3+PH/C1pawJWY80yx2OWB4F9a/6X69TUPPV+ZmYX8O6ivEsvlN6dTCnRma
-Ou4U1lUpVlLGvYMuyDlt6ES+GGW73D+v7TW+oz5FHdidCWIJ8L2hYyjkn21O+IEI
-mFMi9gMYh09tWcPzn6t3H8JBUDY6iovnNAfUtdTY/rcH86YCQ42Hv2snpsjUiDTl
-n2G1TgRMq09iX8OGQSxcY4YDUHx5DzzrYSZcIlERS6MXyFnE+knavisCAwEAAaNj
-MGEwQAYDVR0RBDkwN4IOaWRwLmZndS5jYXMuY3qGJWh0dHBzOi8vaWRwLmZndS5j
-YXMuY3ovaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFCRKRKtvKnxOQZHYF1aSsGu9
-Ge2oMA0GCSqGSIb3DQEBBQUAA4IBAQCJ8ZeUl6jKt3ecQjX0gUsBEePJOREHlTtG
-AAb67oxhH9Mm/Z/5Qu5tvBoI7U+lncj/1gAf8FObQlUu4CSc02f5DeS0F80MAg3h
-/OAvZq85zFMJfhlbBQHdOtNqNROLwIu34JvIz+ukc2DG25weY/lgvU6ulUICkgd9
-9U1V77HhjdIIm5JYfTzKC3Iwss2/OT1WaY5esO+stlchg3D8kyKRlm2bG+WlWqAp
-giXM0j45ZDJZNxmZ/U9kvaKVpmXE5DEYEvyMFGRZqyeo1DaHwiYAWPBbRO+tJp3A
-4O2O0wmUOZ0O6IPd8iDs0Q0eWV11U7mb3fGgeWKOIBS4zmQD2By5
-
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.fgu.cas.cz:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.fgu.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.fgu.cas.cz/idp/profile/SAML2/Redirect/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.fgu.cas.cz/idp/profile/SAML2/POST/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.fgu.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.fgu.cas.cz/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.fgu.cas.cz/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.fgu.cas.cz/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.fgu.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">fgu.cas.cz</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDIzCCAgugAwIBAgIUW8Fvk+9NuCdYJn9rrxSID4QcQWUwDQYJKoZIhvcNAQEF
-BQAwGTEXMBUGA1UEAxMOaWRwLmZndS5jYXMuY3owHhcNMTQwNTE2MDcwMjEzWhcN
-MzQwNTE2MDcwMjEzWjAZMRcwFQYDVQQDEw5pZHAuZmd1LmNhcy5jejCCASIwDQYJ
-KoZIhvcNAQEBBQADggEPADCCAQoCggEBALqySf+1bTV+w3dZgWBv7N697eGABM+v
-ktmLnnyfLT9jlyGPH/kK/cGHdjVvAObBTP+igmarMWKuZM2TF9E0Onlgv9lwLOrF
-N5mltg3+PH/C1pawJWY80yx2OWB4F9a/6X69TUPPV+ZmYX8O6ivEsvlN6dTCnRma
-Ou4U1lUpVlLGvYMuyDlt6ES+GGW73D+v7TW+oz5FHdidCWIJ8L2hYyjkn21O+IEI
-mFMi9gMYh09tWcPzn6t3H8JBUDY6iovnNAfUtdTY/rcH86YCQ42Hv2snpsjUiDTl
-n2G1TgRMq09iX8OGQSxcY4YDUHx5DzzrYSZcIlERS6MXyFnE+knavisCAwEAAaNj
-MGEwQAYDVR0RBDkwN4IOaWRwLmZndS5jYXMuY3qGJWh0dHBzOi8vaWRwLmZndS5j
-YXMuY3ovaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFCRKRKtvKnxOQZHYF1aSsGu9
-Ge2oMA0GCSqGSIb3DQEBBQUAA4IBAQCJ8ZeUl6jKt3ecQjX0gUsBEePJOREHlTtG
-AAb67oxhH9Mm/Z/5Qu5tvBoI7U+lncj/1gAf8FObQlUu4CSc02f5DeS0F80MAg3h
-/OAvZq85zFMJfhlbBQHdOtNqNROLwIu34JvIz+ukc2DG25weY/lgvU6ulUICkgd9
-9U1V77HhjdIIm5JYfTzKC3Iwss2/OT1WaY5esO+stlchg3D8kyKRlm2bG+WlWqAp
-giXM0j45ZDJZNxmZ/U9kvaKVpmXE5DEYEvyMFGRZqyeo1DaHwiYAWPBbRO+tJp3A
-4O2O0wmUOZ0O6IPd8iDs0Q0eWV11U7mb3fGgeWKOIBS4zmQD2By5
-
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.fgu.cas.cz:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.fgu.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 Physiology</OrganizationName>
-    <OrganizationName xml:lang="cs">Fyziologický ústav AV ČR</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Institute of Physiology, Public Research Institution</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="cs">Fyziologický ústav AV ČR, v.v.i.</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.fgu.cas.cz/en</OrganizationURL>
-    <OrganizationURL xml:lang="cs">http://www.fgu.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.fh-kaernten.at-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.fh-kaernten.at-idp-shibboleth.xml
deleted file mode 100644
index 67f8b7b8..00000000
--- a/swamid-interfederations-2.0/idp.fh-kaernten.at-idp-shibboleth.xml
+++ /dev/null
@@ -1,108 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.fh-kaernten.at/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://eduid.at" registrationInstant="2012-02-24T17:43:54Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://eduid.at/policy/mdrps-20140606</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-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fh-kaernten.at</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="de">Fachhochschule Kärnten</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Carinthia University of Applied Sciences</mdui:DisplayName>
-        <mdui:Logo height="54" width="200">https://www3.fh-kaernten.at/logo_fh_kaernten.gif</mdui:Logo>
-        <mdui:Logo height="16" width="16">https://www3.fh-kaernten.at/favicon.png</mdui:Logo>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDMzCCAhugAwIBAgIUE3xzrdaog0SOPU1LEoHlaWT6wKAwDQYJKoZIhvcNAQEF
-BQAwHTEbMBkGA1UEAxMSaWRwLmZoLWthZXJudGVuLmF0MB4XDTEyMDIyNDE3MDU0
-MFoXDTMyMDIyNDE3MDU0MFowHTEbMBkGA1UEAxMSaWRwLmZoLWthZXJudGVuLmF0
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA8n3/PizxIqujmwiw9+j2
-L4FvY33oS7zmH5fvav6ueKhloSe5R2S38ZB8lVhYphCefP/xMI1pHpBKfo3zU1Bh
-H4NdBLkwOjVDnzzz1n1R8HkAzLqP8J3WJsGT0THmFayLM/j9a+w7KGuFMy17hsVT
-uQOX+cjld3pygA/963/ot7pFu+VFg7B3SExB0x8HAMk9sNVUkiKFvLvWhJXNo8hG
-771E/qLA75V6nSXrGz0H0dkruetZgMOa26fLfI45uewpOf+HkO0C22QoSyPme8E7
-PacHgOpNfGZ7IOkP3zGpN/FsWOAz6AgzIi2HVB+zzzR1o4Ld+EPqHD6rPTt74iu2
-AQIDAQABo2swaTBIBgNVHREEQTA/ghJpZHAuZmgta2Flcm50ZW4uYXSGKWh0dHBz
-Oi8vaWRwLmZoLWthZXJudGVuLmF0L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBTb
-iBO8Agzf1pKgqIki5BmdLEUXcTANBgkqhkiG9w0BAQUFAAOCAQEAyJQN13Zh7wRl
-msdIw8MJPhHEmdDr5zSrOnGiiXaNgaojdJClYaMHPFPqiVUkna8BGQvOYfqdOY7j
-EsrtrABQxdGExCdsumhUjQXvinZDz0Y/k/gZ+Fmpc7V95ny7CvkC8PA+LiAocJJH
-vIugT+EKzaqw9ctKywduH688+AV3X7ccZA3oCloqnCw4QMW2EP8bFZxwc2LlNrXH
-+w5YzICCMGG1AF0blSU6J81gxv+6r7roN9RqgENrnYfdkAw16bxdp5mRUCkceWmE
-8D6sy7HT9UHrMwXMUq6UXRaA+MBbH6EU9UL9RLQIEkBa7RStiUP5gPZRcgRiXf9a
-CKMOmy35Xw==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.fh-kaernten.at:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.fh-kaernten.at:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://www3.fh-kaernten.at/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www3.fh-kaernten.at/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www3.fh-kaernten.at/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www3.fh-kaernten.at/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">fh-kaernten.at</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDMzCCAhugAwIBAgIUE3xzrdaog0SOPU1LEoHlaWT6wKAwDQYJKoZIhvcNAQEF
-BQAwHTEbMBkGA1UEAxMSaWRwLmZoLWthZXJudGVuLmF0MB4XDTEyMDIyNDE3MDU0
-MFoXDTMyMDIyNDE3MDU0MFowHTEbMBkGA1UEAxMSaWRwLmZoLWthZXJudGVuLmF0
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA8n3/PizxIqujmwiw9+j2
-L4FvY33oS7zmH5fvav6ueKhloSe5R2S38ZB8lVhYphCefP/xMI1pHpBKfo3zU1Bh
-H4NdBLkwOjVDnzzz1n1R8HkAzLqP8J3WJsGT0THmFayLM/j9a+w7KGuFMy17hsVT
-uQOX+cjld3pygA/963/ot7pFu+VFg7B3SExB0x8HAMk9sNVUkiKFvLvWhJXNo8hG
-771E/qLA75V6nSXrGz0H0dkruetZgMOa26fLfI45uewpOf+HkO0C22QoSyPme8E7
-PacHgOpNfGZ7IOkP3zGpN/FsWOAz6AgzIi2HVB+zzzR1o4Ld+EPqHD6rPTt74iu2
-AQIDAQABo2swaTBIBgNVHREEQTA/ghJpZHAuZmgta2Flcm50ZW4uYXSGKWh0dHBz
-Oi8vaWRwLmZoLWthZXJudGVuLmF0L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBTb
-iBO8Agzf1pKgqIki5BmdLEUXcTANBgkqhkiG9w0BAQUFAAOCAQEAyJQN13Zh7wRl
-msdIw8MJPhHEmdDr5zSrOnGiiXaNgaojdJClYaMHPFPqiVUkna8BGQvOYfqdOY7j
-EsrtrABQxdGExCdsumhUjQXvinZDz0Y/k/gZ+Fmpc7V95ny7CvkC8PA+LiAocJJH
-vIugT+EKzaqw9ctKywduH688+AV3X7ccZA3oCloqnCw4QMW2EP8bFZxwc2LlNrXH
-+w5YzICCMGG1AF0blSU6J81gxv+6r7roN9RqgENrnYfdkAw16bxdp5mRUCkceWmE
-8D6sy7HT9UHrMwXMUq6UXRaA+MBbH6EU9UL9RLQIEkBa7RStiUP5gPZRcgRiXf9a
-CKMOmy35Xw==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.fh-kaernten.at:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.fh-kaernten.at:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="de">Fachhochschule Kärnten</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">Carinthia University of Applied Sciences</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="de">Fachhochschule Kärnten</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Carinthia University of Applied Sciences</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="de">http://www.fh-kaernten.at/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.fh-kaernten.at/en.html</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Technical</md:GivenName>
-    <md:SurName>Support</md:SurName>
-    <md:EmailAddress>mailto:shib@fh-kaernten.at</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:SurName>Helpdesk</md:SurName>
-    <md:TelephoneNumber>+43 5 90500 9595</md:TelephoneNumber>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.fh-kaernten.at.xml b/swamid-interfederations-2.0/idp.fh-kaernten.at.xml
deleted file mode 100644
index 67f8b7b8..00000000
--- a/swamid-interfederations-2.0/idp.fh-kaernten.at.xml
+++ /dev/null
@@ -1,108 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.fh-kaernten.at/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://eduid.at" registrationInstant="2012-02-24T17:43:54Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://eduid.at/policy/mdrps-20140606</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-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fh-kaernten.at</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="de">Fachhochschule Kärnten</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Carinthia University of Applied Sciences</mdui:DisplayName>
-        <mdui:Logo height="54" width="200">https://www3.fh-kaernten.at/logo_fh_kaernten.gif</mdui:Logo>
-        <mdui:Logo height="16" width="16">https://www3.fh-kaernten.at/favicon.png</mdui:Logo>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDMzCCAhugAwIBAgIUE3xzrdaog0SOPU1LEoHlaWT6wKAwDQYJKoZIhvcNAQEF
-BQAwHTEbMBkGA1UEAxMSaWRwLmZoLWthZXJudGVuLmF0MB4XDTEyMDIyNDE3MDU0
-MFoXDTMyMDIyNDE3MDU0MFowHTEbMBkGA1UEAxMSaWRwLmZoLWthZXJudGVuLmF0
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA8n3/PizxIqujmwiw9+j2
-L4FvY33oS7zmH5fvav6ueKhloSe5R2S38ZB8lVhYphCefP/xMI1pHpBKfo3zU1Bh
-H4NdBLkwOjVDnzzz1n1R8HkAzLqP8J3WJsGT0THmFayLM/j9a+w7KGuFMy17hsVT
-uQOX+cjld3pygA/963/ot7pFu+VFg7B3SExB0x8HAMk9sNVUkiKFvLvWhJXNo8hG
-771E/qLA75V6nSXrGz0H0dkruetZgMOa26fLfI45uewpOf+HkO0C22QoSyPme8E7
-PacHgOpNfGZ7IOkP3zGpN/FsWOAz6AgzIi2HVB+zzzR1o4Ld+EPqHD6rPTt74iu2
-AQIDAQABo2swaTBIBgNVHREEQTA/ghJpZHAuZmgta2Flcm50ZW4uYXSGKWh0dHBz
-Oi8vaWRwLmZoLWthZXJudGVuLmF0L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBTb
-iBO8Agzf1pKgqIki5BmdLEUXcTANBgkqhkiG9w0BAQUFAAOCAQEAyJQN13Zh7wRl
-msdIw8MJPhHEmdDr5zSrOnGiiXaNgaojdJClYaMHPFPqiVUkna8BGQvOYfqdOY7j
-EsrtrABQxdGExCdsumhUjQXvinZDz0Y/k/gZ+Fmpc7V95ny7CvkC8PA+LiAocJJH
-vIugT+EKzaqw9ctKywduH688+AV3X7ccZA3oCloqnCw4QMW2EP8bFZxwc2LlNrXH
-+w5YzICCMGG1AF0blSU6J81gxv+6r7roN9RqgENrnYfdkAw16bxdp5mRUCkceWmE
-8D6sy7HT9UHrMwXMUq6UXRaA+MBbH6EU9UL9RLQIEkBa7RStiUP5gPZRcgRiXf9a
-CKMOmy35Xw==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.fh-kaernten.at:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.fh-kaernten.at:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://www3.fh-kaernten.at/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www3.fh-kaernten.at/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www3.fh-kaernten.at/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www3.fh-kaernten.at/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">fh-kaernten.at</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDMzCCAhugAwIBAgIUE3xzrdaog0SOPU1LEoHlaWT6wKAwDQYJKoZIhvcNAQEF
-BQAwHTEbMBkGA1UEAxMSaWRwLmZoLWthZXJudGVuLmF0MB4XDTEyMDIyNDE3MDU0
-MFoXDTMyMDIyNDE3MDU0MFowHTEbMBkGA1UEAxMSaWRwLmZoLWthZXJudGVuLmF0
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA8n3/PizxIqujmwiw9+j2
-L4FvY33oS7zmH5fvav6ueKhloSe5R2S38ZB8lVhYphCefP/xMI1pHpBKfo3zU1Bh
-H4NdBLkwOjVDnzzz1n1R8HkAzLqP8J3WJsGT0THmFayLM/j9a+w7KGuFMy17hsVT
-uQOX+cjld3pygA/963/ot7pFu+VFg7B3SExB0x8HAMk9sNVUkiKFvLvWhJXNo8hG
-771E/qLA75V6nSXrGz0H0dkruetZgMOa26fLfI45uewpOf+HkO0C22QoSyPme8E7
-PacHgOpNfGZ7IOkP3zGpN/FsWOAz6AgzIi2HVB+zzzR1o4Ld+EPqHD6rPTt74iu2
-AQIDAQABo2swaTBIBgNVHREEQTA/ghJpZHAuZmgta2Flcm50ZW4uYXSGKWh0dHBz
-Oi8vaWRwLmZoLWthZXJudGVuLmF0L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBTb
-iBO8Agzf1pKgqIki5BmdLEUXcTANBgkqhkiG9w0BAQUFAAOCAQEAyJQN13Zh7wRl
-msdIw8MJPhHEmdDr5zSrOnGiiXaNgaojdJClYaMHPFPqiVUkna8BGQvOYfqdOY7j
-EsrtrABQxdGExCdsumhUjQXvinZDz0Y/k/gZ+Fmpc7V95ny7CvkC8PA+LiAocJJH
-vIugT+EKzaqw9ctKywduH688+AV3X7ccZA3oCloqnCw4QMW2EP8bFZxwc2LlNrXH
-+w5YzICCMGG1AF0blSU6J81gxv+6r7roN9RqgENrnYfdkAw16bxdp5mRUCkceWmE
-8D6sy7HT9UHrMwXMUq6UXRaA+MBbH6EU9UL9RLQIEkBa7RStiUP5gPZRcgRiXf9a
-CKMOmy35Xw==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.fh-kaernten.at:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.fh-kaernten.at:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="de">Fachhochschule Kärnten</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">Carinthia University of Applied Sciences</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="de">Fachhochschule Kärnten</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Carinthia University of Applied Sciences</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="de">http://www.fh-kaernten.at/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.fh-kaernten.at/en.html</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Technical</md:GivenName>
-    <md:SurName>Support</md:SurName>
-    <md:EmailAddress>mailto:shib@fh-kaernten.at</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:SurName>Helpdesk</md:SurName>
-    <md:TelephoneNumber>+43 5 90500 9595</md:TelephoneNumber>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.fh-rosenheim.de-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.fh-rosenheim.de-idp-shibboleth.xml
deleted file mode 100644
index b9e7804b..00000000
--- a/swamid-interfederations-2.0/idp.fh-rosenheim.de-idp-shibboleth.xml
+++ /dev/null
@@ -1,226 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.fh-rosenheim.de/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2013-10-17T07:15:42Z">
-      <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">fh-rosenheim.de</saml1md:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="de">Hochschule Rosenheim</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">University of Applied Sciences Rosenheim</mdui:DisplayName>
-        <mdui:Description xml:lang="de">Identity Provider der Hochschule Rosenheim</mdui:Description>
-        <mdui:Description xml:lang="en">Identity Provider of the University of Applied Sciences Rosenheim</mdui:Description>
-        <mdui:Logo height="40" width="40">https://www.fh-rosenheim.de/fileadmin/user_upload/Fakultaeten_und_Abteilungen/Rechenzentrum/Icons/fh_rosenheim_logo_klein.jpg</mdui:Logo>
-        <mdui:Logo height="75" width="75">https://www.fh-rosenheim.de/fileadmin/user_upload/Fakultaeten_und_Abteilungen/Rechenzentrum/Icons/fh_rosenheim_logo.jpg</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.fh-rosenheim.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.fh-rosenheim.de,OU=Rechenzentrum,O=Hochschule Rosenheim,L=Rosenheim,ST=Bayern,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIF0DCCBLigAwIBAgIHF2RxhsjERzANBgkqhkiG9w0BAQUFADBhMQswCQYDVQQG
-EwJERTEhMB8GA1UEChMYRmFjaGhvY2hzY2h1bGUgUm9zZW5oZWltMRYwFAYDVQQL
-Ew1SZWNoZW56ZW50cnVtMRcwFQYDVQQDEw5GSC1STyBDQSAtIEcwMjAeFw0xNDA0
-MDkwNzE3MTFaFw0xOTAzMTMwMDAwMDBaMIGHMQswCQYDVQQGEwJERTEPMA0GA1UE
-CBMGQmF5ZXJuMRIwEAYDVQQHEwlSb3NlbmhlaW0xHTAbBgNVBAoTFEhvY2hzY2h1
-bGUgUm9zZW5oZWltMRYwFAYDVQQLEw1SZWNoZW56ZW50cnVtMRwwGgYDVQQDExNp
-ZHAuZmgtcm9zZW5oZWltLmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
-AQEAwKgmaIEAqXR+2l8VZY+aoV3rzcik13hBrEsZqFqJeY7rBqc+rQ5Tk+YPeKCk
-8fX0qoZ68TqkNbeMiEztXdAGNwX5uOEP3oSoLU93TE41SUMVmU9HjBuetej33PZy
-tjslCOcApqfRZL1/ilQkkiawYegkfwWTy7jJAKzHyVAelr6TxExuusV216nhRh8t
-SOo2YA0Tr7wH3rIoXtm7rypbttdIQMn28TSAaKwd2pf7sdVbVvRliT9meEWD1A4t
-4VJwutGUcZcrxvFYXcBQY6/0/6ZLQ0mYR5yOk1Qpd0SXXhtbZZKcmF8hgQFjceG1
-YXKUgw8a6UJV21U9Deuy267k8QIDAQABo4ICZDCCAmAwOQYDVR0gBDIwMDARBg8r
-BgEEAYGtIYIsAQEEAwEwEQYPKwYBBAGBrSGCLAIBBAMBMAgGBmeBDAECAjAJBgNV
-HRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUH
-AwEwHQYDVR0OBBYEFL3z1fkYF/NmtM2ZroB49hFsL5q/MB8GA1UdIwQYMBaAFCBm
-biUvqWNNouAnuol/yxW6P66RMDoGA1UdEQQzMDGCE2lkcC5maC1yb3NlbmhlaW0u
-ZGWBGnJ6LXN1cHBvcnRAZmgtcm9zZW5oZWltLmRlMIGPBgNVHR8EgYcwgYQwQKA+
-oDyGOmh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvZmgtcm9zZW5oZWltLWNhL3B1Yi9j
-cmwvZ19jYWNybC5jcmwwQKA+oDyGOmh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvZmgt
-cm9zZW5oZWltLWNhL3B1Yi9jcmwvZ19jYWNybC5jcmwwgd0GCCsGAQUFBwEBBIHQ
-MIHNMDMGCCsGAQUFBzABhidodHRwOi8vb2NzcC5wY2EuZGZuLmRlL09DU1AtU2Vy
-dmVyL09DU1AwSgYIKwYBBQUHMAKGPmh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvZmgt
-cm9zZW5oZWltLWNhL3B1Yi9jYWNlcnQvZ19jYWNlcnQuY3J0MEoGCCsGAQUFBzAC
-hj5odHRwOi8vY2RwMi5wY2EuZGZuLmRlL2ZoLXJvc2VuaGVpbS1jYS9wdWIvY2Fj
-ZXJ0L2dfY2FjZXJ0LmNydDANBgkqhkiG9w0BAQUFAAOCAQEAbPzQZcFemHgov7uQ
-gQe0OiaRLs2+kFDJGXPJSz3itUPX0Lgx1qx2DUcETDHolpKslUUZRD7L7zkjid+/
-oB+JSEowqxuosH+6xTWtok34uVLoCMAkiGD9I0Ccbxe+8q9puWJX8ZSdAN6yf0aB
-yLzKKxpLdoqvTDg3h51FAlBeA0AJnIJTJ1E2peU73xdZAJWLjSV6TMLEAu1WnCcD
-f3kIDrpEHJ90v7y1J3kXNT49/CBsKqp0SrcLo8j507TVCCBuyXBYcZP2Ixj6FyUo
-4A4ZvZgVb6Rt+2SnHFoB1ax0EG75805kZIt7qgCMGwxr0CNpxvpS2Z9q4tpmG+vh
-nflFJg==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.fh-rosenheim.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.fh-rosenheim.de,OU=Rechenzentrum,O=Hochschule Rosenheim,L=Rosenheim,ST=Bayern,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIF0DCCBLigAwIBAgIHF2RxhsjERzANBgkqhkiG9w0BAQUFADBhMQswCQYDVQQG
-EwJERTEhMB8GA1UEChMYRmFjaGhvY2hzY2h1bGUgUm9zZW5oZWltMRYwFAYDVQQL
-Ew1SZWNoZW56ZW50cnVtMRcwFQYDVQQDEw5GSC1STyBDQSAtIEcwMjAeFw0xNDA0
-MDkwNzE3MTFaFw0xOTAzMTMwMDAwMDBaMIGHMQswCQYDVQQGEwJERTEPMA0GA1UE
-CBMGQmF5ZXJuMRIwEAYDVQQHEwlSb3NlbmhlaW0xHTAbBgNVBAoTFEhvY2hzY2h1
-bGUgUm9zZW5oZWltMRYwFAYDVQQLEw1SZWNoZW56ZW50cnVtMRwwGgYDVQQDExNp
-ZHAuZmgtcm9zZW5oZWltLmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
-AQEAwKgmaIEAqXR+2l8VZY+aoV3rzcik13hBrEsZqFqJeY7rBqc+rQ5Tk+YPeKCk
-8fX0qoZ68TqkNbeMiEztXdAGNwX5uOEP3oSoLU93TE41SUMVmU9HjBuetej33PZy
-tjslCOcApqfRZL1/ilQkkiawYegkfwWTy7jJAKzHyVAelr6TxExuusV216nhRh8t
-SOo2YA0Tr7wH3rIoXtm7rypbttdIQMn28TSAaKwd2pf7sdVbVvRliT9meEWD1A4t
-4VJwutGUcZcrxvFYXcBQY6/0/6ZLQ0mYR5yOk1Qpd0SXXhtbZZKcmF8hgQFjceG1
-YXKUgw8a6UJV21U9Deuy267k8QIDAQABo4ICZDCCAmAwOQYDVR0gBDIwMDARBg8r
-BgEEAYGtIYIsAQEEAwEwEQYPKwYBBAGBrSGCLAIBBAMBMAgGBmeBDAECAjAJBgNV
-HRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUH
-AwEwHQYDVR0OBBYEFL3z1fkYF/NmtM2ZroB49hFsL5q/MB8GA1UdIwQYMBaAFCBm
-biUvqWNNouAnuol/yxW6P66RMDoGA1UdEQQzMDGCE2lkcC5maC1yb3NlbmhlaW0u
-ZGWBGnJ6LXN1cHBvcnRAZmgtcm9zZW5oZWltLmRlMIGPBgNVHR8EgYcwgYQwQKA+
-oDyGOmh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvZmgtcm9zZW5oZWltLWNhL3B1Yi9j
-cmwvZ19jYWNybC5jcmwwQKA+oDyGOmh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvZmgt
-cm9zZW5oZWltLWNhL3B1Yi9jcmwvZ19jYWNybC5jcmwwgd0GCCsGAQUFBwEBBIHQ
-MIHNMDMGCCsGAQUFBzABhidodHRwOi8vb2NzcC5wY2EuZGZuLmRlL09DU1AtU2Vy
-dmVyL09DU1AwSgYIKwYBBQUHMAKGPmh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvZmgt
-cm9zZW5oZWltLWNhL3B1Yi9jYWNlcnQvZ19jYWNlcnQuY3J0MEoGCCsGAQUFBzAC
-hj5odHRwOi8vY2RwMi5wY2EuZGZuLmRlL2ZoLXJvc2VuaGVpbS1jYS9wdWIvY2Fj
-ZXJ0L2dfY2FjZXJ0LmNydDANBgkqhkiG9w0BAQUFAAOCAQEAbPzQZcFemHgov7uQ
-gQe0OiaRLs2+kFDJGXPJSz3itUPX0Lgx1qx2DUcETDHolpKslUUZRD7L7zkjid+/
-oB+JSEowqxuosH+6xTWtok34uVLoCMAkiGD9I0Ccbxe+8q9puWJX8ZSdAN6yf0aB
-yLzKKxpLdoqvTDg3h51FAlBeA0AJnIJTJ1E2peU73xdZAJWLjSV6TMLEAu1WnCcD
-f3kIDrpEHJ90v7y1J3kXNT49/CBsKqp0SrcLo8j507TVCCBuyXBYcZP2Ixj6FyUo
-4A4ZvZgVb6Rt+2SnHFoB1ax0EG75805kZIt7qgCMGwxr0CNpxvpS2Z9q4tpmG+vh
-nflFJg==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.fh-rosenheim.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.fh-rosenheim.de:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.fh-rosenheim.de/idp/profile/SAML2/Redirect/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.fh-rosenheim.de/idp/profile/SAML2/POST/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.fh-rosenheim.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>
-    <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-rosenheim.de/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.fh-rosenheim.de/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.fh-rosenheim.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.fh-rosenheim.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-rosenheim.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.fh-rosenheim.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.fh-rosenheim.de,OU=Rechenzentrum,O=Hochschule Rosenheim,L=Rosenheim,ST=Bayern,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIF0DCCBLigAwIBAgIHF2RxhsjERzANBgkqhkiG9w0BAQUFADBhMQswCQYDVQQG
-EwJERTEhMB8GA1UEChMYRmFjaGhvY2hzY2h1bGUgUm9zZW5oZWltMRYwFAYDVQQL
-Ew1SZWNoZW56ZW50cnVtMRcwFQYDVQQDEw5GSC1STyBDQSAtIEcwMjAeFw0xNDA0
-MDkwNzE3MTFaFw0xOTAzMTMwMDAwMDBaMIGHMQswCQYDVQQGEwJERTEPMA0GA1UE
-CBMGQmF5ZXJuMRIwEAYDVQQHEwlSb3NlbmhlaW0xHTAbBgNVBAoTFEhvY2hzY2h1
-bGUgUm9zZW5oZWltMRYwFAYDVQQLEw1SZWNoZW56ZW50cnVtMRwwGgYDVQQDExNp
-ZHAuZmgtcm9zZW5oZWltLmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
-AQEAwKgmaIEAqXR+2l8VZY+aoV3rzcik13hBrEsZqFqJeY7rBqc+rQ5Tk+YPeKCk
-8fX0qoZ68TqkNbeMiEztXdAGNwX5uOEP3oSoLU93TE41SUMVmU9HjBuetej33PZy
-tjslCOcApqfRZL1/ilQkkiawYegkfwWTy7jJAKzHyVAelr6TxExuusV216nhRh8t
-SOo2YA0Tr7wH3rIoXtm7rypbttdIQMn28TSAaKwd2pf7sdVbVvRliT9meEWD1A4t
-4VJwutGUcZcrxvFYXcBQY6/0/6ZLQ0mYR5yOk1Qpd0SXXhtbZZKcmF8hgQFjceG1
-YXKUgw8a6UJV21U9Deuy267k8QIDAQABo4ICZDCCAmAwOQYDVR0gBDIwMDARBg8r
-BgEEAYGtIYIsAQEEAwEwEQYPKwYBBAGBrSGCLAIBBAMBMAgGBmeBDAECAjAJBgNV
-HRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUH
-AwEwHQYDVR0OBBYEFL3z1fkYF/NmtM2ZroB49hFsL5q/MB8GA1UdIwQYMBaAFCBm
-biUvqWNNouAnuol/yxW6P66RMDoGA1UdEQQzMDGCE2lkcC5maC1yb3NlbmhlaW0u
-ZGWBGnJ6LXN1cHBvcnRAZmgtcm9zZW5oZWltLmRlMIGPBgNVHR8EgYcwgYQwQKA+
-oDyGOmh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvZmgtcm9zZW5oZWltLWNhL3B1Yi9j
-cmwvZ19jYWNybC5jcmwwQKA+oDyGOmh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvZmgt
-cm9zZW5oZWltLWNhL3B1Yi9jcmwvZ19jYWNybC5jcmwwgd0GCCsGAQUFBwEBBIHQ
-MIHNMDMGCCsGAQUFBzABhidodHRwOi8vb2NzcC5wY2EuZGZuLmRlL09DU1AtU2Vy
-dmVyL09DU1AwSgYIKwYBBQUHMAKGPmh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvZmgt
-cm9zZW5oZWltLWNhL3B1Yi9jYWNlcnQvZ19jYWNlcnQuY3J0MEoGCCsGAQUFBzAC
-hj5odHRwOi8vY2RwMi5wY2EuZGZuLmRlL2ZoLXJvc2VuaGVpbS1jYS9wdWIvY2Fj
-ZXJ0L2dfY2FjZXJ0LmNydDANBgkqhkiG9w0BAQUFAAOCAQEAbPzQZcFemHgov7uQ
-gQe0OiaRLs2+kFDJGXPJSz3itUPX0Lgx1qx2DUcETDHolpKslUUZRD7L7zkjid+/
-oB+JSEowqxuosH+6xTWtok34uVLoCMAkiGD9I0Ccbxe+8q9puWJX8ZSdAN6yf0aB
-yLzKKxpLdoqvTDg3h51FAlBeA0AJnIJTJ1E2peU73xdZAJWLjSV6TMLEAu1WnCcD
-f3kIDrpEHJ90v7y1J3kXNT49/CBsKqp0SrcLo8j507TVCCBuyXBYcZP2Ixj6FyUo
-4A4ZvZgVb6Rt+2SnHFoB1ax0EG75805kZIt7qgCMGwxr0CNpxvpS2Z9q4tpmG+vh
-nflFJg==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.fh-rosenheim.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.fh-rosenheim.de,OU=Rechenzentrum,O=Hochschule Rosenheim,L=Rosenheim,ST=Bayern,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIF0DCCBLigAwIBAgIHF2RxhsjERzANBgkqhkiG9w0BAQUFADBhMQswCQYDVQQG
-EwJERTEhMB8GA1UEChMYRmFjaGhvY2hzY2h1bGUgUm9zZW5oZWltMRYwFAYDVQQL
-Ew1SZWNoZW56ZW50cnVtMRcwFQYDVQQDEw5GSC1STyBDQSAtIEcwMjAeFw0xNDA0
-MDkwNzE3MTFaFw0xOTAzMTMwMDAwMDBaMIGHMQswCQYDVQQGEwJERTEPMA0GA1UE
-CBMGQmF5ZXJuMRIwEAYDVQQHEwlSb3NlbmhlaW0xHTAbBgNVBAoTFEhvY2hzY2h1
-bGUgUm9zZW5oZWltMRYwFAYDVQQLEw1SZWNoZW56ZW50cnVtMRwwGgYDVQQDExNp
-ZHAuZmgtcm9zZW5oZWltLmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
-AQEAwKgmaIEAqXR+2l8VZY+aoV3rzcik13hBrEsZqFqJeY7rBqc+rQ5Tk+YPeKCk
-8fX0qoZ68TqkNbeMiEztXdAGNwX5uOEP3oSoLU93TE41SUMVmU9HjBuetej33PZy
-tjslCOcApqfRZL1/ilQkkiawYegkfwWTy7jJAKzHyVAelr6TxExuusV216nhRh8t
-SOo2YA0Tr7wH3rIoXtm7rypbttdIQMn28TSAaKwd2pf7sdVbVvRliT9meEWD1A4t
-4VJwutGUcZcrxvFYXcBQY6/0/6ZLQ0mYR5yOk1Qpd0SXXhtbZZKcmF8hgQFjceG1
-YXKUgw8a6UJV21U9Deuy267k8QIDAQABo4ICZDCCAmAwOQYDVR0gBDIwMDARBg8r
-BgEEAYGtIYIsAQEEAwEwEQYPKwYBBAGBrSGCLAIBBAMBMAgGBmeBDAECAjAJBgNV
-HRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUH
-AwEwHQYDVR0OBBYEFL3z1fkYF/NmtM2ZroB49hFsL5q/MB8GA1UdIwQYMBaAFCBm
-biUvqWNNouAnuol/yxW6P66RMDoGA1UdEQQzMDGCE2lkcC5maC1yb3NlbmhlaW0u
-ZGWBGnJ6LXN1cHBvcnRAZmgtcm9zZW5oZWltLmRlMIGPBgNVHR8EgYcwgYQwQKA+
-oDyGOmh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvZmgtcm9zZW5oZWltLWNhL3B1Yi9j
-cmwvZ19jYWNybC5jcmwwQKA+oDyGOmh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvZmgt
-cm9zZW5oZWltLWNhL3B1Yi9jcmwvZ19jYWNybC5jcmwwgd0GCCsGAQUFBwEBBIHQ
-MIHNMDMGCCsGAQUFBzABhidodHRwOi8vb2NzcC5wY2EuZGZuLmRlL09DU1AtU2Vy
-dmVyL09DU1AwSgYIKwYBBQUHMAKGPmh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvZmgt
-cm9zZW5oZWltLWNhL3B1Yi9jYWNlcnQvZ19jYWNlcnQuY3J0MEoGCCsGAQUFBzAC
-hj5odHRwOi8vY2RwMi5wY2EuZGZuLmRlL2ZoLXJvc2VuaGVpbS1jYS9wdWIvY2Fj
-ZXJ0L2dfY2FjZXJ0LmNydDANBgkqhkiG9w0BAQUFAAOCAQEAbPzQZcFemHgov7uQ
-gQe0OiaRLs2+kFDJGXPJSz3itUPX0Lgx1qx2DUcETDHolpKslUUZRD7L7zkjid+/
-oB+JSEowqxuosH+6xTWtok34uVLoCMAkiGD9I0Ccbxe+8q9puWJX8ZSdAN6yf0aB
-yLzKKxpLdoqvTDg3h51FAlBeA0AJnIJTJ1E2peU73xdZAJWLjSV6TMLEAu1WnCcD
-f3kIDrpEHJ90v7y1J3kXNT49/CBsKqp0SrcLo8j507TVCCBuyXBYcZP2Ixj6FyUo
-4A4ZvZgVb6Rt+2SnHFoB1ax0EG75805kZIt7qgCMGwxr0CNpxvpS2Z9q4tpmG+vh
-nflFJg==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.fh-rosenheim.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.fh-rosenheim.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">e360</OrganizationName>
-    <OrganizationName xml:lang="en">e360</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">Hochschule Rosenheim</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">University of Applied Sciences Rosenheim</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.fh-rosenheim.de</OrganizationURL>
-    <OrganizationURL xml:lang="en">http://www.fh-rosenheim.de</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Robert</GivenName>
-    <SurName>Meier</SurName>
-    <EmailAddress>mailto:robert.meier@fh-rosenheim.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="support">
-    <GivenName>Robert</GivenName>
-    <SurName>Meier</SurName>
-    <EmailAddress>mailto:idm-support@fh-rosenheim.de</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.fh-rosenheim.de.xml b/swamid-interfederations-2.0/idp.fh-rosenheim.de.xml
deleted file mode 100644
index b9e7804b..00000000
--- a/swamid-interfederations-2.0/idp.fh-rosenheim.de.xml
+++ /dev/null
@@ -1,226 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.fh-rosenheim.de/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2013-10-17T07:15:42Z">
-      <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">fh-rosenheim.de</saml1md:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="de">Hochschule Rosenheim</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">University of Applied Sciences Rosenheim</mdui:DisplayName>
-        <mdui:Description xml:lang="de">Identity Provider der Hochschule Rosenheim</mdui:Description>
-        <mdui:Description xml:lang="en">Identity Provider of the University of Applied Sciences Rosenheim</mdui:Description>
-        <mdui:Logo height="40" width="40">https://www.fh-rosenheim.de/fileadmin/user_upload/Fakultaeten_und_Abteilungen/Rechenzentrum/Icons/fh_rosenheim_logo_klein.jpg</mdui:Logo>
-        <mdui:Logo height="75" width="75">https://www.fh-rosenheim.de/fileadmin/user_upload/Fakultaeten_und_Abteilungen/Rechenzentrum/Icons/fh_rosenheim_logo.jpg</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.fh-rosenheim.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.fh-rosenheim.de,OU=Rechenzentrum,O=Hochschule Rosenheim,L=Rosenheim,ST=Bayern,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIF0DCCBLigAwIBAgIHF2RxhsjERzANBgkqhkiG9w0BAQUFADBhMQswCQYDVQQG
-EwJERTEhMB8GA1UEChMYRmFjaGhvY2hzY2h1bGUgUm9zZW5oZWltMRYwFAYDVQQL
-Ew1SZWNoZW56ZW50cnVtMRcwFQYDVQQDEw5GSC1STyBDQSAtIEcwMjAeFw0xNDA0
-MDkwNzE3MTFaFw0xOTAzMTMwMDAwMDBaMIGHMQswCQYDVQQGEwJERTEPMA0GA1UE
-CBMGQmF5ZXJuMRIwEAYDVQQHEwlSb3NlbmhlaW0xHTAbBgNVBAoTFEhvY2hzY2h1
-bGUgUm9zZW5oZWltMRYwFAYDVQQLEw1SZWNoZW56ZW50cnVtMRwwGgYDVQQDExNp
-ZHAuZmgtcm9zZW5oZWltLmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
-AQEAwKgmaIEAqXR+2l8VZY+aoV3rzcik13hBrEsZqFqJeY7rBqc+rQ5Tk+YPeKCk
-8fX0qoZ68TqkNbeMiEztXdAGNwX5uOEP3oSoLU93TE41SUMVmU9HjBuetej33PZy
-tjslCOcApqfRZL1/ilQkkiawYegkfwWTy7jJAKzHyVAelr6TxExuusV216nhRh8t
-SOo2YA0Tr7wH3rIoXtm7rypbttdIQMn28TSAaKwd2pf7sdVbVvRliT9meEWD1A4t
-4VJwutGUcZcrxvFYXcBQY6/0/6ZLQ0mYR5yOk1Qpd0SXXhtbZZKcmF8hgQFjceG1
-YXKUgw8a6UJV21U9Deuy267k8QIDAQABo4ICZDCCAmAwOQYDVR0gBDIwMDARBg8r
-BgEEAYGtIYIsAQEEAwEwEQYPKwYBBAGBrSGCLAIBBAMBMAgGBmeBDAECAjAJBgNV
-HRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUH
-AwEwHQYDVR0OBBYEFL3z1fkYF/NmtM2ZroB49hFsL5q/MB8GA1UdIwQYMBaAFCBm
-biUvqWNNouAnuol/yxW6P66RMDoGA1UdEQQzMDGCE2lkcC5maC1yb3NlbmhlaW0u
-ZGWBGnJ6LXN1cHBvcnRAZmgtcm9zZW5oZWltLmRlMIGPBgNVHR8EgYcwgYQwQKA+
-oDyGOmh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvZmgtcm9zZW5oZWltLWNhL3B1Yi9j
-cmwvZ19jYWNybC5jcmwwQKA+oDyGOmh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvZmgt
-cm9zZW5oZWltLWNhL3B1Yi9jcmwvZ19jYWNybC5jcmwwgd0GCCsGAQUFBwEBBIHQ
-MIHNMDMGCCsGAQUFBzABhidodHRwOi8vb2NzcC5wY2EuZGZuLmRlL09DU1AtU2Vy
-dmVyL09DU1AwSgYIKwYBBQUHMAKGPmh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvZmgt
-cm9zZW5oZWltLWNhL3B1Yi9jYWNlcnQvZ19jYWNlcnQuY3J0MEoGCCsGAQUFBzAC
-hj5odHRwOi8vY2RwMi5wY2EuZGZuLmRlL2ZoLXJvc2VuaGVpbS1jYS9wdWIvY2Fj
-ZXJ0L2dfY2FjZXJ0LmNydDANBgkqhkiG9w0BAQUFAAOCAQEAbPzQZcFemHgov7uQ
-gQe0OiaRLs2+kFDJGXPJSz3itUPX0Lgx1qx2DUcETDHolpKslUUZRD7L7zkjid+/
-oB+JSEowqxuosH+6xTWtok34uVLoCMAkiGD9I0Ccbxe+8q9puWJX8ZSdAN6yf0aB
-yLzKKxpLdoqvTDg3h51FAlBeA0AJnIJTJ1E2peU73xdZAJWLjSV6TMLEAu1WnCcD
-f3kIDrpEHJ90v7y1J3kXNT49/CBsKqp0SrcLo8j507TVCCBuyXBYcZP2Ixj6FyUo
-4A4ZvZgVb6Rt+2SnHFoB1ax0EG75805kZIt7qgCMGwxr0CNpxvpS2Z9q4tpmG+vh
-nflFJg==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.fh-rosenheim.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.fh-rosenheim.de,OU=Rechenzentrum,O=Hochschule Rosenheim,L=Rosenheim,ST=Bayern,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIF0DCCBLigAwIBAgIHF2RxhsjERzANBgkqhkiG9w0BAQUFADBhMQswCQYDVQQG
-EwJERTEhMB8GA1UEChMYRmFjaGhvY2hzY2h1bGUgUm9zZW5oZWltMRYwFAYDVQQL
-Ew1SZWNoZW56ZW50cnVtMRcwFQYDVQQDEw5GSC1STyBDQSAtIEcwMjAeFw0xNDA0
-MDkwNzE3MTFaFw0xOTAzMTMwMDAwMDBaMIGHMQswCQYDVQQGEwJERTEPMA0GA1UE
-CBMGQmF5ZXJuMRIwEAYDVQQHEwlSb3NlbmhlaW0xHTAbBgNVBAoTFEhvY2hzY2h1
-bGUgUm9zZW5oZWltMRYwFAYDVQQLEw1SZWNoZW56ZW50cnVtMRwwGgYDVQQDExNp
-ZHAuZmgtcm9zZW5oZWltLmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
-AQEAwKgmaIEAqXR+2l8VZY+aoV3rzcik13hBrEsZqFqJeY7rBqc+rQ5Tk+YPeKCk
-8fX0qoZ68TqkNbeMiEztXdAGNwX5uOEP3oSoLU93TE41SUMVmU9HjBuetej33PZy
-tjslCOcApqfRZL1/ilQkkiawYegkfwWTy7jJAKzHyVAelr6TxExuusV216nhRh8t
-SOo2YA0Tr7wH3rIoXtm7rypbttdIQMn28TSAaKwd2pf7sdVbVvRliT9meEWD1A4t
-4VJwutGUcZcrxvFYXcBQY6/0/6ZLQ0mYR5yOk1Qpd0SXXhtbZZKcmF8hgQFjceG1
-YXKUgw8a6UJV21U9Deuy267k8QIDAQABo4ICZDCCAmAwOQYDVR0gBDIwMDARBg8r
-BgEEAYGtIYIsAQEEAwEwEQYPKwYBBAGBrSGCLAIBBAMBMAgGBmeBDAECAjAJBgNV
-HRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUH
-AwEwHQYDVR0OBBYEFL3z1fkYF/NmtM2ZroB49hFsL5q/MB8GA1UdIwQYMBaAFCBm
-biUvqWNNouAnuol/yxW6P66RMDoGA1UdEQQzMDGCE2lkcC5maC1yb3NlbmhlaW0u
-ZGWBGnJ6LXN1cHBvcnRAZmgtcm9zZW5oZWltLmRlMIGPBgNVHR8EgYcwgYQwQKA+
-oDyGOmh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvZmgtcm9zZW5oZWltLWNhL3B1Yi9j
-cmwvZ19jYWNybC5jcmwwQKA+oDyGOmh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvZmgt
-cm9zZW5oZWltLWNhL3B1Yi9jcmwvZ19jYWNybC5jcmwwgd0GCCsGAQUFBwEBBIHQ
-MIHNMDMGCCsGAQUFBzABhidodHRwOi8vb2NzcC5wY2EuZGZuLmRlL09DU1AtU2Vy
-dmVyL09DU1AwSgYIKwYBBQUHMAKGPmh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvZmgt
-cm9zZW5oZWltLWNhL3B1Yi9jYWNlcnQvZ19jYWNlcnQuY3J0MEoGCCsGAQUFBzAC
-hj5odHRwOi8vY2RwMi5wY2EuZGZuLmRlL2ZoLXJvc2VuaGVpbS1jYS9wdWIvY2Fj
-ZXJ0L2dfY2FjZXJ0LmNydDANBgkqhkiG9w0BAQUFAAOCAQEAbPzQZcFemHgov7uQ
-gQe0OiaRLs2+kFDJGXPJSz3itUPX0Lgx1qx2DUcETDHolpKslUUZRD7L7zkjid+/
-oB+JSEowqxuosH+6xTWtok34uVLoCMAkiGD9I0Ccbxe+8q9puWJX8ZSdAN6yf0aB
-yLzKKxpLdoqvTDg3h51FAlBeA0AJnIJTJ1E2peU73xdZAJWLjSV6TMLEAu1WnCcD
-f3kIDrpEHJ90v7y1J3kXNT49/CBsKqp0SrcLo8j507TVCCBuyXBYcZP2Ixj6FyUo
-4A4ZvZgVb6Rt+2SnHFoB1ax0EG75805kZIt7qgCMGwxr0CNpxvpS2Z9q4tpmG+vh
-nflFJg==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.fh-rosenheim.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.fh-rosenheim.de:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.fh-rosenheim.de/idp/profile/SAML2/Redirect/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.fh-rosenheim.de/idp/profile/SAML2/POST/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.fh-rosenheim.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>
-    <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-rosenheim.de/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.fh-rosenheim.de/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.fh-rosenheim.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.fh-rosenheim.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-rosenheim.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.fh-rosenheim.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.fh-rosenheim.de,OU=Rechenzentrum,O=Hochschule Rosenheim,L=Rosenheim,ST=Bayern,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIF0DCCBLigAwIBAgIHF2RxhsjERzANBgkqhkiG9w0BAQUFADBhMQswCQYDVQQG
-EwJERTEhMB8GA1UEChMYRmFjaGhvY2hzY2h1bGUgUm9zZW5oZWltMRYwFAYDVQQL
-Ew1SZWNoZW56ZW50cnVtMRcwFQYDVQQDEw5GSC1STyBDQSAtIEcwMjAeFw0xNDA0
-MDkwNzE3MTFaFw0xOTAzMTMwMDAwMDBaMIGHMQswCQYDVQQGEwJERTEPMA0GA1UE
-CBMGQmF5ZXJuMRIwEAYDVQQHEwlSb3NlbmhlaW0xHTAbBgNVBAoTFEhvY2hzY2h1
-bGUgUm9zZW5oZWltMRYwFAYDVQQLEw1SZWNoZW56ZW50cnVtMRwwGgYDVQQDExNp
-ZHAuZmgtcm9zZW5oZWltLmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
-AQEAwKgmaIEAqXR+2l8VZY+aoV3rzcik13hBrEsZqFqJeY7rBqc+rQ5Tk+YPeKCk
-8fX0qoZ68TqkNbeMiEztXdAGNwX5uOEP3oSoLU93TE41SUMVmU9HjBuetej33PZy
-tjslCOcApqfRZL1/ilQkkiawYegkfwWTy7jJAKzHyVAelr6TxExuusV216nhRh8t
-SOo2YA0Tr7wH3rIoXtm7rypbttdIQMn28TSAaKwd2pf7sdVbVvRliT9meEWD1A4t
-4VJwutGUcZcrxvFYXcBQY6/0/6ZLQ0mYR5yOk1Qpd0SXXhtbZZKcmF8hgQFjceG1
-YXKUgw8a6UJV21U9Deuy267k8QIDAQABo4ICZDCCAmAwOQYDVR0gBDIwMDARBg8r
-BgEEAYGtIYIsAQEEAwEwEQYPKwYBBAGBrSGCLAIBBAMBMAgGBmeBDAECAjAJBgNV
-HRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUH
-AwEwHQYDVR0OBBYEFL3z1fkYF/NmtM2ZroB49hFsL5q/MB8GA1UdIwQYMBaAFCBm
-biUvqWNNouAnuol/yxW6P66RMDoGA1UdEQQzMDGCE2lkcC5maC1yb3NlbmhlaW0u
-ZGWBGnJ6LXN1cHBvcnRAZmgtcm9zZW5oZWltLmRlMIGPBgNVHR8EgYcwgYQwQKA+
-oDyGOmh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvZmgtcm9zZW5oZWltLWNhL3B1Yi9j
-cmwvZ19jYWNybC5jcmwwQKA+oDyGOmh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvZmgt
-cm9zZW5oZWltLWNhL3B1Yi9jcmwvZ19jYWNybC5jcmwwgd0GCCsGAQUFBwEBBIHQ
-MIHNMDMGCCsGAQUFBzABhidodHRwOi8vb2NzcC5wY2EuZGZuLmRlL09DU1AtU2Vy
-dmVyL09DU1AwSgYIKwYBBQUHMAKGPmh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvZmgt
-cm9zZW5oZWltLWNhL3B1Yi9jYWNlcnQvZ19jYWNlcnQuY3J0MEoGCCsGAQUFBzAC
-hj5odHRwOi8vY2RwMi5wY2EuZGZuLmRlL2ZoLXJvc2VuaGVpbS1jYS9wdWIvY2Fj
-ZXJ0L2dfY2FjZXJ0LmNydDANBgkqhkiG9w0BAQUFAAOCAQEAbPzQZcFemHgov7uQ
-gQe0OiaRLs2+kFDJGXPJSz3itUPX0Lgx1qx2DUcETDHolpKslUUZRD7L7zkjid+/
-oB+JSEowqxuosH+6xTWtok34uVLoCMAkiGD9I0Ccbxe+8q9puWJX8ZSdAN6yf0aB
-yLzKKxpLdoqvTDg3h51FAlBeA0AJnIJTJ1E2peU73xdZAJWLjSV6TMLEAu1WnCcD
-f3kIDrpEHJ90v7y1J3kXNT49/CBsKqp0SrcLo8j507TVCCBuyXBYcZP2Ixj6FyUo
-4A4ZvZgVb6Rt+2SnHFoB1ax0EG75805kZIt7qgCMGwxr0CNpxvpS2Z9q4tpmG+vh
-nflFJg==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.fh-rosenheim.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.fh-rosenheim.de,OU=Rechenzentrum,O=Hochschule Rosenheim,L=Rosenheim,ST=Bayern,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIF0DCCBLigAwIBAgIHF2RxhsjERzANBgkqhkiG9w0BAQUFADBhMQswCQYDVQQG
-EwJERTEhMB8GA1UEChMYRmFjaGhvY2hzY2h1bGUgUm9zZW5oZWltMRYwFAYDVQQL
-Ew1SZWNoZW56ZW50cnVtMRcwFQYDVQQDEw5GSC1STyBDQSAtIEcwMjAeFw0xNDA0
-MDkwNzE3MTFaFw0xOTAzMTMwMDAwMDBaMIGHMQswCQYDVQQGEwJERTEPMA0GA1UE
-CBMGQmF5ZXJuMRIwEAYDVQQHEwlSb3NlbmhlaW0xHTAbBgNVBAoTFEhvY2hzY2h1
-bGUgUm9zZW5oZWltMRYwFAYDVQQLEw1SZWNoZW56ZW50cnVtMRwwGgYDVQQDExNp
-ZHAuZmgtcm9zZW5oZWltLmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
-AQEAwKgmaIEAqXR+2l8VZY+aoV3rzcik13hBrEsZqFqJeY7rBqc+rQ5Tk+YPeKCk
-8fX0qoZ68TqkNbeMiEztXdAGNwX5uOEP3oSoLU93TE41SUMVmU9HjBuetej33PZy
-tjslCOcApqfRZL1/ilQkkiawYegkfwWTy7jJAKzHyVAelr6TxExuusV216nhRh8t
-SOo2YA0Tr7wH3rIoXtm7rypbttdIQMn28TSAaKwd2pf7sdVbVvRliT9meEWD1A4t
-4VJwutGUcZcrxvFYXcBQY6/0/6ZLQ0mYR5yOk1Qpd0SXXhtbZZKcmF8hgQFjceG1
-YXKUgw8a6UJV21U9Deuy267k8QIDAQABo4ICZDCCAmAwOQYDVR0gBDIwMDARBg8r
-BgEEAYGtIYIsAQEEAwEwEQYPKwYBBAGBrSGCLAIBBAMBMAgGBmeBDAECAjAJBgNV
-HRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUH
-AwEwHQYDVR0OBBYEFL3z1fkYF/NmtM2ZroB49hFsL5q/MB8GA1UdIwQYMBaAFCBm
-biUvqWNNouAnuol/yxW6P66RMDoGA1UdEQQzMDGCE2lkcC5maC1yb3NlbmhlaW0u
-ZGWBGnJ6LXN1cHBvcnRAZmgtcm9zZW5oZWltLmRlMIGPBgNVHR8EgYcwgYQwQKA+
-oDyGOmh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvZmgtcm9zZW5oZWltLWNhL3B1Yi9j
-cmwvZ19jYWNybC5jcmwwQKA+oDyGOmh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvZmgt
-cm9zZW5oZWltLWNhL3B1Yi9jcmwvZ19jYWNybC5jcmwwgd0GCCsGAQUFBwEBBIHQ
-MIHNMDMGCCsGAQUFBzABhidodHRwOi8vb2NzcC5wY2EuZGZuLmRlL09DU1AtU2Vy
-dmVyL09DU1AwSgYIKwYBBQUHMAKGPmh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvZmgt
-cm9zZW5oZWltLWNhL3B1Yi9jYWNlcnQvZ19jYWNlcnQuY3J0MEoGCCsGAQUFBzAC
-hj5odHRwOi8vY2RwMi5wY2EuZGZuLmRlL2ZoLXJvc2VuaGVpbS1jYS9wdWIvY2Fj
-ZXJ0L2dfY2FjZXJ0LmNydDANBgkqhkiG9w0BAQUFAAOCAQEAbPzQZcFemHgov7uQ
-gQe0OiaRLs2+kFDJGXPJSz3itUPX0Lgx1qx2DUcETDHolpKslUUZRD7L7zkjid+/
-oB+JSEowqxuosH+6xTWtok34uVLoCMAkiGD9I0Ccbxe+8q9puWJX8ZSdAN6yf0aB
-yLzKKxpLdoqvTDg3h51FAlBeA0AJnIJTJ1E2peU73xdZAJWLjSV6TMLEAu1WnCcD
-f3kIDrpEHJ90v7y1J3kXNT49/CBsKqp0SrcLo8j507TVCCBuyXBYcZP2Ixj6FyUo
-4A4ZvZgVb6Rt+2SnHFoB1ax0EG75805kZIt7qgCMGwxr0CNpxvpS2Z9q4tpmG+vh
-nflFJg==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.fh-rosenheim.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.fh-rosenheim.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">e360</OrganizationName>
-    <OrganizationName xml:lang="en">e360</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">Hochschule Rosenheim</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">University of Applied Sciences Rosenheim</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.fh-rosenheim.de</OrganizationURL>
-    <OrganizationURL xml:lang="en">http://www.fh-rosenheim.de</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Robert</GivenName>
-    <SurName>Meier</SurName>
-    <EmailAddress>mailto:robert.meier@fh-rosenheim.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="support">
-    <GivenName>Robert</GivenName>
-    <SurName>Meier</SurName>
-    <EmailAddress>mailto:idm-support@fh-rosenheim.de</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.fzu.cas.cz-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.fzu.cas.cz-idp-shibboleth.xml
deleted file mode 100644
index b2e9c3d8..00000000
--- a/swamid-interfederations-2.0/idp.fzu.cas.cz-idp-shibboleth.xml
+++ /dev/null
@@ -1,118 +0,0 @@
-<?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.fzu.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/" registrationInstant="2014-03-18T10:07:35Z">
-      <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>
-    <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://eduid.cz/uri/idp-group/avcr</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>
-      <shibmd:Scope regexp="false">fzu.cas.cz</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Institute of Physics AS CR</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="cs">Fyzikální ústav Akademie věd ČR</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Identity Provider FZU AV CR employees.</mdui:Description>
-        <mdui:Description xml:lang="cs">Identity Provider pro zaměstnance FZÚ AV ČR</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.fzu.cz/en</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="cs">http://www.fzu.cz/</mdui:InformationURL>
-        <mdui:Logo height="40" width="40">https://jiftach.cas.cz/loga/logo-fzu-40.png</mdui:Logo>
-        <mdui:Logo height="100" width="100">https://jiftach.cas.cz/loga/logo-fzu-100.png</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDJDCCAgygAwIBAgIVAMXPvsGlLRsX7hPpMRUVsTPL9MPjMA0GCSqGSIb3DQEB
-BQUAMBkxFzAVBgNVBAMTDmlkcC5menUuY2FzLmN6MB4XDTE0MDMxMjExMDc0NloX
-DTM0MDMxMjExMDc0NlowGTEXMBUGA1UEAxMOaWRwLmZ6dS5jYXMuY3owggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCmAUy5v5OguNKkfufBQPmszJ3GgMqf
-tFaLshqlu0D4IPwaHk76cXqMzp0l/tUMuhKyXxaQ1X/3cVPDJKkxqNCjE7etqnj1
-fz1FnRP/rJGpbacmAT2T3IqHKZpatJV6kbWxOOytOdJk4Uadmap4mAyHLISYyhpD
-sgWxcioFCsbtTPmM8GVKfj1IlnGYD19nKm7D9ocF5gCy9dbQZ/QyvOAd+jMDHGJ+
-n59nJD+GjwpdoDOB7agHhn7806Ui98lo8XK1SeSo47FFCMhwgeB59KjUzlySEEDv
-Zn8/HM3nJWQ54/ty/qknoWDnh2cNGLS2EdWCu9FNNGcfdJGg41ipvD0DAgMBAAGj
-YzBhMEAGA1UdEQQ5MDeCDmlkcC5menUuY2FzLmN6hiVodHRwczovL2lkcC5menUu
-Y2FzLmN6L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBQfOSvunhqNoO2v13uWFsFu
-qYqDUzANBgkqhkiG9w0BAQUFAAOCAQEAjTGlMBUwRmH8nt9WDJSKaZU6rRcqY9Yi
-h+GrzpduiAz8WQcMD6ijUcOZuBRNpXZ5vOWPNtIWCoG8W7xxqRBVwROsczGaBQbf
-lo5uEzDGMVBh9tkqhwnXev1YbGai/K/frBQP5Ck1z9OAWwrGvlZnc1OM54ChKFYs
-TvwRI12g6UcV7OCIOc6Iq3xXMtP6H2A71KexofWNosrwMi7GMErnL3p8vc58akrs
-NE5wyp2MfieNYDfUsQsIUqAzYmrXHxfOJF7nPK1j8bcTZWCTcc0K3GAlL3MppJSn
-ZBbnqng3wtUIk0MVMjUGkG8j5FViFkmAI5Nxa6KUAtrrOu/LFh3nIg==
-
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.fzu.cas.cz:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.fzu.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.fzu.cas.cz/idp/profile/SAML2/Redirect/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.fzu.cas.cz/idp/profile/SAML2/POST/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.fzu.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.fzu.cas.cz/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.fzu.cas.cz/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.fzu.cas.cz/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.fzu.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">fzu.cas.cz</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDJDCCAgygAwIBAgIVAMXPvsGlLRsX7hPpMRUVsTPL9MPjMA0GCSqGSIb3DQEB
-BQUAMBkxFzAVBgNVBAMTDmlkcC5menUuY2FzLmN6MB4XDTE0MDMxMjExMDc0NloX
-DTM0MDMxMjExMDc0NlowGTEXMBUGA1UEAxMOaWRwLmZ6dS5jYXMuY3owggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCmAUy5v5OguNKkfufBQPmszJ3GgMqf
-tFaLshqlu0D4IPwaHk76cXqMzp0l/tUMuhKyXxaQ1X/3cVPDJKkxqNCjE7etqnj1
-fz1FnRP/rJGpbacmAT2T3IqHKZpatJV6kbWxOOytOdJk4Uadmap4mAyHLISYyhpD
-sgWxcioFCsbtTPmM8GVKfj1IlnGYD19nKm7D9ocF5gCy9dbQZ/QyvOAd+jMDHGJ+
-n59nJD+GjwpdoDOB7agHhn7806Ui98lo8XK1SeSo47FFCMhwgeB59KjUzlySEEDv
-Zn8/HM3nJWQ54/ty/qknoWDnh2cNGLS2EdWCu9FNNGcfdJGg41ipvD0DAgMBAAGj
-YzBhMEAGA1UdEQQ5MDeCDmlkcC5menUuY2FzLmN6hiVodHRwczovL2lkcC5menUu
-Y2FzLmN6L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBQfOSvunhqNoO2v13uWFsFu
-qYqDUzANBgkqhkiG9w0BAQUFAAOCAQEAjTGlMBUwRmH8nt9WDJSKaZU6rRcqY9Yi
-h+GrzpduiAz8WQcMD6ijUcOZuBRNpXZ5vOWPNtIWCoG8W7xxqRBVwROsczGaBQbf
-lo5uEzDGMVBh9tkqhwnXev1YbGai/K/frBQP5Ck1z9OAWwrGvlZnc1OM54ChKFYs
-TvwRI12g6UcV7OCIOc6Iq3xXMtP6H2A71KexofWNosrwMi7GMErnL3p8vc58akrs
-NE5wyp2MfieNYDfUsQsIUqAzYmrXHxfOJF7nPK1j8bcTZWCTcc0K3GAlL3MppJSn
-ZBbnqng3wtUIk0MVMjUGkG8j5FViFkmAI5Nxa6KUAtrrOu/LFh3nIg==
-
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.fzu.cas.cz:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.fzu.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">Institute of Physics AS CR</OrganizationName>
-    <OrganizationName xml:lang="cs">Fyzikální ústav Akademie věd ČR, v.v.i.</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Institute of Physics AS CR</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="cs">Fyzikální ústav Akademie věd ČR, v.v.i.</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.fzu.cz/en</OrganizationURL>
-    <OrganizationURL xml:lang="cs">http://www.fzu.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.fzu.cas.cz.xml b/swamid-interfederations-2.0/idp.fzu.cas.cz.xml
deleted file mode 100644
index b2e9c3d8..00000000
--- a/swamid-interfederations-2.0/idp.fzu.cas.cz.xml
+++ /dev/null
@@ -1,118 +0,0 @@
-<?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.fzu.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/" registrationInstant="2014-03-18T10:07:35Z">
-      <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>
-    <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://eduid.cz/uri/idp-group/avcr</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>
-      <shibmd:Scope regexp="false">fzu.cas.cz</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Institute of Physics AS CR</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="cs">Fyzikální ústav Akademie věd ČR</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Identity Provider FZU AV CR employees.</mdui:Description>
-        <mdui:Description xml:lang="cs">Identity Provider pro zaměstnance FZÚ AV ČR</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.fzu.cz/en</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="cs">http://www.fzu.cz/</mdui:InformationURL>
-        <mdui:Logo height="40" width="40">https://jiftach.cas.cz/loga/logo-fzu-40.png</mdui:Logo>
-        <mdui:Logo height="100" width="100">https://jiftach.cas.cz/loga/logo-fzu-100.png</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDJDCCAgygAwIBAgIVAMXPvsGlLRsX7hPpMRUVsTPL9MPjMA0GCSqGSIb3DQEB
-BQUAMBkxFzAVBgNVBAMTDmlkcC5menUuY2FzLmN6MB4XDTE0MDMxMjExMDc0NloX
-DTM0MDMxMjExMDc0NlowGTEXMBUGA1UEAxMOaWRwLmZ6dS5jYXMuY3owggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCmAUy5v5OguNKkfufBQPmszJ3GgMqf
-tFaLshqlu0D4IPwaHk76cXqMzp0l/tUMuhKyXxaQ1X/3cVPDJKkxqNCjE7etqnj1
-fz1FnRP/rJGpbacmAT2T3IqHKZpatJV6kbWxOOytOdJk4Uadmap4mAyHLISYyhpD
-sgWxcioFCsbtTPmM8GVKfj1IlnGYD19nKm7D9ocF5gCy9dbQZ/QyvOAd+jMDHGJ+
-n59nJD+GjwpdoDOB7agHhn7806Ui98lo8XK1SeSo47FFCMhwgeB59KjUzlySEEDv
-Zn8/HM3nJWQ54/ty/qknoWDnh2cNGLS2EdWCu9FNNGcfdJGg41ipvD0DAgMBAAGj
-YzBhMEAGA1UdEQQ5MDeCDmlkcC5menUuY2FzLmN6hiVodHRwczovL2lkcC5menUu
-Y2FzLmN6L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBQfOSvunhqNoO2v13uWFsFu
-qYqDUzANBgkqhkiG9w0BAQUFAAOCAQEAjTGlMBUwRmH8nt9WDJSKaZU6rRcqY9Yi
-h+GrzpduiAz8WQcMD6ijUcOZuBRNpXZ5vOWPNtIWCoG8W7xxqRBVwROsczGaBQbf
-lo5uEzDGMVBh9tkqhwnXev1YbGai/K/frBQP5Ck1z9OAWwrGvlZnc1OM54ChKFYs
-TvwRI12g6UcV7OCIOc6Iq3xXMtP6H2A71KexofWNosrwMi7GMErnL3p8vc58akrs
-NE5wyp2MfieNYDfUsQsIUqAzYmrXHxfOJF7nPK1j8bcTZWCTcc0K3GAlL3MppJSn
-ZBbnqng3wtUIk0MVMjUGkG8j5FViFkmAI5Nxa6KUAtrrOu/LFh3nIg==
-
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.fzu.cas.cz:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.fzu.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.fzu.cas.cz/idp/profile/SAML2/Redirect/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.fzu.cas.cz/idp/profile/SAML2/POST/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.fzu.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.fzu.cas.cz/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.fzu.cas.cz/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.fzu.cas.cz/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.fzu.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">fzu.cas.cz</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDJDCCAgygAwIBAgIVAMXPvsGlLRsX7hPpMRUVsTPL9MPjMA0GCSqGSIb3DQEB
-BQUAMBkxFzAVBgNVBAMTDmlkcC5menUuY2FzLmN6MB4XDTE0MDMxMjExMDc0NloX
-DTM0MDMxMjExMDc0NlowGTEXMBUGA1UEAxMOaWRwLmZ6dS5jYXMuY3owggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCmAUy5v5OguNKkfufBQPmszJ3GgMqf
-tFaLshqlu0D4IPwaHk76cXqMzp0l/tUMuhKyXxaQ1X/3cVPDJKkxqNCjE7etqnj1
-fz1FnRP/rJGpbacmAT2T3IqHKZpatJV6kbWxOOytOdJk4Uadmap4mAyHLISYyhpD
-sgWxcioFCsbtTPmM8GVKfj1IlnGYD19nKm7D9ocF5gCy9dbQZ/QyvOAd+jMDHGJ+
-n59nJD+GjwpdoDOB7agHhn7806Ui98lo8XK1SeSo47FFCMhwgeB59KjUzlySEEDv
-Zn8/HM3nJWQ54/ty/qknoWDnh2cNGLS2EdWCu9FNNGcfdJGg41ipvD0DAgMBAAGj
-YzBhMEAGA1UdEQQ5MDeCDmlkcC5menUuY2FzLmN6hiVodHRwczovL2lkcC5menUu
-Y2FzLmN6L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBQfOSvunhqNoO2v13uWFsFu
-qYqDUzANBgkqhkiG9w0BAQUFAAOCAQEAjTGlMBUwRmH8nt9WDJSKaZU6rRcqY9Yi
-h+GrzpduiAz8WQcMD6ijUcOZuBRNpXZ5vOWPNtIWCoG8W7xxqRBVwROsczGaBQbf
-lo5uEzDGMVBh9tkqhwnXev1YbGai/K/frBQP5Ck1z9OAWwrGvlZnc1OM54ChKFYs
-TvwRI12g6UcV7OCIOc6Iq3xXMtP6H2A71KexofWNosrwMi7GMErnL3p8vc58akrs
-NE5wyp2MfieNYDfUsQsIUqAzYmrXHxfOJF7nPK1j8bcTZWCTcc0K3GAlL3MppJSn
-ZBbnqng3wtUIk0MVMjUGkG8j5FViFkmAI5Nxa6KUAtrrOu/LFh3nIg==
-
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.fzu.cas.cz:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.fzu.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">Institute of Physics AS CR</OrganizationName>
-    <OrganizationName xml:lang="cs">Fyzikální ústav Akademie věd ČR, v.v.i.</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Institute of Physics AS CR</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="cs">Fyzikální ústav Akademie věd ČR, v.v.i.</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.fzu.cz/en</OrganizationURL>
-    <OrganizationURL xml:lang="cs">http://www.fzu.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.gakunin.nii.ac.jp-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.gakunin.nii.ac.jp-idp-shibboleth.xml
deleted file mode 100644
index 8c8045e2..00000000
--- a/swamid-interfederations-2.0/idp.gakunin.nii.ac.jp-idp-shibboleth.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.gakunin.nii.ac.jp/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.gakunin.jp" registrationInstant="2011-04-13T00:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.gakunin.jp/en-Join/</mdrpi:RegistrationPolicy>
-      <mdrpi:RegistrationPolicy xml:lang="ja">https://www.gakunin.jp/join/</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">gakunin.nii.ac.jp</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="ja">学認IdP</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">GakuNin IdP</mdui:DisplayName>
-        <mdui:Logo height="64" width="64">https://idp.gakunin.nii.ac.jp/images/gakunin64.png</mdui:Logo>
-        <mdui:Keywords xml:lang="en">category:location:others category:organizationType:others</mdui:Keywords>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:GeolocationHint>geo:35.692558,139.757999</mdui:GeolocationHint>
-      </mdui:DiscoHints>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIIE/DCCA+SgAwIBAgIIHpbHvyrEXQEwDQYJKoZIhvcNAQEFBQAwfTELMAkGA1UE
-BhMCSlAxETAPBgNVBAcTCEFjYWRlbWUyMSowKAYDVQQKEyFOYXRpb25hbCBJbnN0
-aXR1dGUgb2YgSW5mb3JtYXRpY3MxDTALBgNVBAsTBFVQS0kxIDAeBgNVBAsTF05J
-SSBPcGVuIERvbWFpbiBDQSAtIEcyMB4XDTEzMDEyODAzMDgxMloXDTE1MDIyNzAz
-MTgxMlowgaoxCzAJBgNVBAYTAkpQMREwDwYDVQQHEwhBY2FkZW1lMjEqMCgGA1UE
-ChMhTmF0aW9uYWwgSW5zdGl0dXRlIG9mIEluZm9ybWF0aWNzMTwwOgYDVQQLEzND
-eWJlciBTY2llbmNlIEluZnJhc3RydWN0dXJlIERldmVsb3BtZW50IERlcGFydG1l
-bnQxHjAcBgNVBAMTFWlkcC5nYWt1bmluLm5paS5hYy5qcDCCASIwDQYJKoZIhvcN
-AQEBBQADggEPADCCAQoCggEBAMLBjh+F6IRNBBi5+Ag+Qg7GVpArTsh/6jSDI9Ah
-R53bxKhOFl5l3lPcHs80AbfQ/Ti6EYm+OpoSmz6eAI81/FHzFlFp/YYlcIyl++8i
-pmF9nAZLJWbgXk6ov59ooUxFhPZVYXJE0GIiOHY/O48hvoewAZu2oLZcP9JB08az
-CqyyX2pm8XVsjDJwl3vg3rVtdnIWos4ehzIRUO0XxUED8oqxYQtFUIivwAD3VdqK
-ScfFmwCf2PzoVaX6oJ4HaMMrJD81xwjw/h+AIlaX56+C1UTiDFEvgipw8YuR9sOg
-XXOW5Sb+DgXsD4OqJ6tgryRVqltdVId+o8W/xxUo0cvwkmkCAwEAAaOCAVAwggFM
-MA4GA1UdDwEB/wQEAwIFoDATBgNVHSUEDDAKBggrBgEFBQcDATAdBgNVHQ4EFgQU
-R/UG3Pd9rjhd6CWxBzX8S/e/mVswHwYDVR0jBBgwFoAUewoH9xjKjA7W2rxQgGws
-RwLRDfswIAYDVR0RBBkwF4IVaWRwLmdha3VuaW4ubmlpLmFjLmpwMGYGA1UdIARf
-MF0wTQYKKoMIjJweAQICATA/MD0GCCsGAQUFBwIBFjFodHRwczovL3JlcG8xLnNl
-Y29tdHJ1c3QubmV0L3NwY3BwL2Nwcy9pbmRleC5odG1sMAwGCiqDCIybG2SHBQEw
-SAYDVR0fBEEwPzA9oDugOYY3aHR0cDovL3JlcG8xLnNlY29tdHJ1c3QubmV0L3Nw
-cGNhL25paS9vZGNhMi9mdWxsY3JsLmNybDARBglghkgBhvhCAQEEBAMCBkAwDQYJ
-KoZIhvcNAQEFBQADggEBAM+eH9qnj/+9hzzL7RTZO2oRc01Eqd4NqifGzaYfEfSk
-wR+xbS7h6VKR/4X7bZe429eiFFK7GwTD7bwdh+zDxU2pS/ZTZeNbJfTCy3hhAfNZ
-a7iEGe0BVviVF8Bz/Z0el49vGS5nliW59KXIUW7io9xEA9B95CURBl8ETgBWFyrY
-l9SsjlYOiPx1KtUf21UlZPjdbF4aJpXb8omLo/3Mk/qnWzx1qcCKUiGlVDRGPBn8
-UVT6kyMwBnKi5CVVK5v+ZgOlCXO7J0aldTBcH/s28hiUas9yReFyoNmLG2ozboeu
-ZkIzMSzb7JBh32BmlOPf+Ntq0wkxlFhnZM4tNF2J/Nk=</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.gakunin.nii.ac.jp/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.gakunin.nii.ac.jp/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.gakunin.nii.ac.jp/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="false">gakunin.nii.ac.jp</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIIE/DCCA+SgAwIBAgIIHpbHvyrEXQEwDQYJKoZIhvcNAQEFBQAwfTELMAkGA1UE
-BhMCSlAxETAPBgNVBAcTCEFjYWRlbWUyMSowKAYDVQQKEyFOYXRpb25hbCBJbnN0
-aXR1dGUgb2YgSW5mb3JtYXRpY3MxDTALBgNVBAsTBFVQS0kxIDAeBgNVBAsTF05J
-SSBPcGVuIERvbWFpbiBDQSAtIEcyMB4XDTEzMDEyODAzMDgxMloXDTE1MDIyNzAz
-MTgxMlowgaoxCzAJBgNVBAYTAkpQMREwDwYDVQQHEwhBY2FkZW1lMjEqMCgGA1UE
-ChMhTmF0aW9uYWwgSW5zdGl0dXRlIG9mIEluZm9ybWF0aWNzMTwwOgYDVQQLEzND
-eWJlciBTY2llbmNlIEluZnJhc3RydWN0dXJlIERldmVsb3BtZW50IERlcGFydG1l
-bnQxHjAcBgNVBAMTFWlkcC5nYWt1bmluLm5paS5hYy5qcDCCASIwDQYJKoZIhvcN
-AQEBBQADggEPADCCAQoCggEBAMLBjh+F6IRNBBi5+Ag+Qg7GVpArTsh/6jSDI9Ah
-R53bxKhOFl5l3lPcHs80AbfQ/Ti6EYm+OpoSmz6eAI81/FHzFlFp/YYlcIyl++8i
-pmF9nAZLJWbgXk6ov59ooUxFhPZVYXJE0GIiOHY/O48hvoewAZu2oLZcP9JB08az
-CqyyX2pm8XVsjDJwl3vg3rVtdnIWos4ehzIRUO0XxUED8oqxYQtFUIivwAD3VdqK
-ScfFmwCf2PzoVaX6oJ4HaMMrJD81xwjw/h+AIlaX56+C1UTiDFEvgipw8YuR9sOg
-XXOW5Sb+DgXsD4OqJ6tgryRVqltdVId+o8W/xxUo0cvwkmkCAwEAAaOCAVAwggFM
-MA4GA1UdDwEB/wQEAwIFoDATBgNVHSUEDDAKBggrBgEFBQcDATAdBgNVHQ4EFgQU
-R/UG3Pd9rjhd6CWxBzX8S/e/mVswHwYDVR0jBBgwFoAUewoH9xjKjA7W2rxQgGws
-RwLRDfswIAYDVR0RBBkwF4IVaWRwLmdha3VuaW4ubmlpLmFjLmpwMGYGA1UdIARf
-MF0wTQYKKoMIjJweAQICATA/MD0GCCsGAQUFBwIBFjFodHRwczovL3JlcG8xLnNl
-Y29tdHJ1c3QubmV0L3NwY3BwL2Nwcy9pbmRleC5odG1sMAwGCiqDCIybG2SHBQEw
-SAYDVR0fBEEwPzA9oDugOYY3aHR0cDovL3JlcG8xLnNlY29tdHJ1c3QubmV0L3Nw
-cGNhL25paS9vZGNhMi9mdWxsY3JsLmNybDARBglghkgBhvhCAQEEBAMCBkAwDQYJ
-KoZIhvcNAQEFBQADggEBAM+eH9qnj/+9hzzL7RTZO2oRc01Eqd4NqifGzaYfEfSk
-wR+xbS7h6VKR/4X7bZe429eiFFK7GwTD7bwdh+zDxU2pS/ZTZeNbJfTCy3hhAfNZ
-a7iEGe0BVviVF8Bz/Z0el49vGS5nliW59KXIUW7io9xEA9B95CURBl8ETgBWFyrY
-l9SsjlYOiPx1KtUf21UlZPjdbF4aJpXb8omLo/3Mk/qnWzx1qcCKUiGlVDRGPBn8
-UVT6kyMwBnKi5CVVK5v+ZgOlCXO7J0aldTBcH/s28hiUas9yReFyoNmLG2ozboeu
-ZkIzMSzb7JBh32BmlOPf+Ntq0wkxlFhnZM4tNF2J/Nk=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.gakunin.nii.ac.jp:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.gakunin.nii.ac.jp: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">National Institute of Informatics</OrganizationName>
-    <OrganizationName xml:lang="ja">国立情報学研究所</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">GakuNin IdP</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="ja">学認IdP</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">https://www.gakunin.jp/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Hideaki</GivenName>
-    <SurName>NODA</SurName>
-    <EmailAddress>mailto:gakunin-help@nii.ac.jp</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.gakunin.nii.ac.jp.xml b/swamid-interfederations-2.0/idp.gakunin.nii.ac.jp.xml
deleted file mode 100644
index 8c8045e2..00000000
--- a/swamid-interfederations-2.0/idp.gakunin.nii.ac.jp.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.gakunin.nii.ac.jp/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.gakunin.jp" registrationInstant="2011-04-13T00:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.gakunin.jp/en-Join/</mdrpi:RegistrationPolicy>
-      <mdrpi:RegistrationPolicy xml:lang="ja">https://www.gakunin.jp/join/</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">gakunin.nii.ac.jp</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="ja">学認IdP</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">GakuNin IdP</mdui:DisplayName>
-        <mdui:Logo height="64" width="64">https://idp.gakunin.nii.ac.jp/images/gakunin64.png</mdui:Logo>
-        <mdui:Keywords xml:lang="en">category:location:others category:organizationType:others</mdui:Keywords>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:GeolocationHint>geo:35.692558,139.757999</mdui:GeolocationHint>
-      </mdui:DiscoHints>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIIE/DCCA+SgAwIBAgIIHpbHvyrEXQEwDQYJKoZIhvcNAQEFBQAwfTELMAkGA1UE
-BhMCSlAxETAPBgNVBAcTCEFjYWRlbWUyMSowKAYDVQQKEyFOYXRpb25hbCBJbnN0
-aXR1dGUgb2YgSW5mb3JtYXRpY3MxDTALBgNVBAsTBFVQS0kxIDAeBgNVBAsTF05J
-SSBPcGVuIERvbWFpbiBDQSAtIEcyMB4XDTEzMDEyODAzMDgxMloXDTE1MDIyNzAz
-MTgxMlowgaoxCzAJBgNVBAYTAkpQMREwDwYDVQQHEwhBY2FkZW1lMjEqMCgGA1UE
-ChMhTmF0aW9uYWwgSW5zdGl0dXRlIG9mIEluZm9ybWF0aWNzMTwwOgYDVQQLEzND
-eWJlciBTY2llbmNlIEluZnJhc3RydWN0dXJlIERldmVsb3BtZW50IERlcGFydG1l
-bnQxHjAcBgNVBAMTFWlkcC5nYWt1bmluLm5paS5hYy5qcDCCASIwDQYJKoZIhvcN
-AQEBBQADggEPADCCAQoCggEBAMLBjh+F6IRNBBi5+Ag+Qg7GVpArTsh/6jSDI9Ah
-R53bxKhOFl5l3lPcHs80AbfQ/Ti6EYm+OpoSmz6eAI81/FHzFlFp/YYlcIyl++8i
-pmF9nAZLJWbgXk6ov59ooUxFhPZVYXJE0GIiOHY/O48hvoewAZu2oLZcP9JB08az
-CqyyX2pm8XVsjDJwl3vg3rVtdnIWos4ehzIRUO0XxUED8oqxYQtFUIivwAD3VdqK
-ScfFmwCf2PzoVaX6oJ4HaMMrJD81xwjw/h+AIlaX56+C1UTiDFEvgipw8YuR9sOg
-XXOW5Sb+DgXsD4OqJ6tgryRVqltdVId+o8W/xxUo0cvwkmkCAwEAAaOCAVAwggFM
-MA4GA1UdDwEB/wQEAwIFoDATBgNVHSUEDDAKBggrBgEFBQcDATAdBgNVHQ4EFgQU
-R/UG3Pd9rjhd6CWxBzX8S/e/mVswHwYDVR0jBBgwFoAUewoH9xjKjA7W2rxQgGws
-RwLRDfswIAYDVR0RBBkwF4IVaWRwLmdha3VuaW4ubmlpLmFjLmpwMGYGA1UdIARf
-MF0wTQYKKoMIjJweAQICATA/MD0GCCsGAQUFBwIBFjFodHRwczovL3JlcG8xLnNl
-Y29tdHJ1c3QubmV0L3NwY3BwL2Nwcy9pbmRleC5odG1sMAwGCiqDCIybG2SHBQEw
-SAYDVR0fBEEwPzA9oDugOYY3aHR0cDovL3JlcG8xLnNlY29tdHJ1c3QubmV0L3Nw
-cGNhL25paS9vZGNhMi9mdWxsY3JsLmNybDARBglghkgBhvhCAQEEBAMCBkAwDQYJ
-KoZIhvcNAQEFBQADggEBAM+eH9qnj/+9hzzL7RTZO2oRc01Eqd4NqifGzaYfEfSk
-wR+xbS7h6VKR/4X7bZe429eiFFK7GwTD7bwdh+zDxU2pS/ZTZeNbJfTCy3hhAfNZ
-a7iEGe0BVviVF8Bz/Z0el49vGS5nliW59KXIUW7io9xEA9B95CURBl8ETgBWFyrY
-l9SsjlYOiPx1KtUf21UlZPjdbF4aJpXb8omLo/3Mk/qnWzx1qcCKUiGlVDRGPBn8
-UVT6kyMwBnKi5CVVK5v+ZgOlCXO7J0aldTBcH/s28hiUas9yReFyoNmLG2ozboeu
-ZkIzMSzb7JBh32BmlOPf+Ntq0wkxlFhnZM4tNF2J/Nk=</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.gakunin.nii.ac.jp/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.gakunin.nii.ac.jp/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.gakunin.nii.ac.jp/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="false">gakunin.nii.ac.jp</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIIE/DCCA+SgAwIBAgIIHpbHvyrEXQEwDQYJKoZIhvcNAQEFBQAwfTELMAkGA1UE
-BhMCSlAxETAPBgNVBAcTCEFjYWRlbWUyMSowKAYDVQQKEyFOYXRpb25hbCBJbnN0
-aXR1dGUgb2YgSW5mb3JtYXRpY3MxDTALBgNVBAsTBFVQS0kxIDAeBgNVBAsTF05J
-SSBPcGVuIERvbWFpbiBDQSAtIEcyMB4XDTEzMDEyODAzMDgxMloXDTE1MDIyNzAz
-MTgxMlowgaoxCzAJBgNVBAYTAkpQMREwDwYDVQQHEwhBY2FkZW1lMjEqMCgGA1UE
-ChMhTmF0aW9uYWwgSW5zdGl0dXRlIG9mIEluZm9ybWF0aWNzMTwwOgYDVQQLEzND
-eWJlciBTY2llbmNlIEluZnJhc3RydWN0dXJlIERldmVsb3BtZW50IERlcGFydG1l
-bnQxHjAcBgNVBAMTFWlkcC5nYWt1bmluLm5paS5hYy5qcDCCASIwDQYJKoZIhvcN
-AQEBBQADggEPADCCAQoCggEBAMLBjh+F6IRNBBi5+Ag+Qg7GVpArTsh/6jSDI9Ah
-R53bxKhOFl5l3lPcHs80AbfQ/Ti6EYm+OpoSmz6eAI81/FHzFlFp/YYlcIyl++8i
-pmF9nAZLJWbgXk6ov59ooUxFhPZVYXJE0GIiOHY/O48hvoewAZu2oLZcP9JB08az
-CqyyX2pm8XVsjDJwl3vg3rVtdnIWos4ehzIRUO0XxUED8oqxYQtFUIivwAD3VdqK
-ScfFmwCf2PzoVaX6oJ4HaMMrJD81xwjw/h+AIlaX56+C1UTiDFEvgipw8YuR9sOg
-XXOW5Sb+DgXsD4OqJ6tgryRVqltdVId+o8W/xxUo0cvwkmkCAwEAAaOCAVAwggFM
-MA4GA1UdDwEB/wQEAwIFoDATBgNVHSUEDDAKBggrBgEFBQcDATAdBgNVHQ4EFgQU
-R/UG3Pd9rjhd6CWxBzX8S/e/mVswHwYDVR0jBBgwFoAUewoH9xjKjA7W2rxQgGws
-RwLRDfswIAYDVR0RBBkwF4IVaWRwLmdha3VuaW4ubmlpLmFjLmpwMGYGA1UdIARf
-MF0wTQYKKoMIjJweAQICATA/MD0GCCsGAQUFBwIBFjFodHRwczovL3JlcG8xLnNl
-Y29tdHJ1c3QubmV0L3NwY3BwL2Nwcy9pbmRleC5odG1sMAwGCiqDCIybG2SHBQEw
-SAYDVR0fBEEwPzA9oDugOYY3aHR0cDovL3JlcG8xLnNlY29tdHJ1c3QubmV0L3Nw
-cGNhL25paS9vZGNhMi9mdWxsY3JsLmNybDARBglghkgBhvhCAQEEBAMCBkAwDQYJ
-KoZIhvcNAQEFBQADggEBAM+eH9qnj/+9hzzL7RTZO2oRc01Eqd4NqifGzaYfEfSk
-wR+xbS7h6VKR/4X7bZe429eiFFK7GwTD7bwdh+zDxU2pS/ZTZeNbJfTCy3hhAfNZ
-a7iEGe0BVviVF8Bz/Z0el49vGS5nliW59KXIUW7io9xEA9B95CURBl8ETgBWFyrY
-l9SsjlYOiPx1KtUf21UlZPjdbF4aJpXb8omLo/3Mk/qnWzx1qcCKUiGlVDRGPBn8
-UVT6kyMwBnKi5CVVK5v+ZgOlCXO7J0aldTBcH/s28hiUas9yReFyoNmLG2ozboeu
-ZkIzMSzb7JBh32BmlOPf+Ntq0wkxlFhnZM4tNF2J/Nk=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.gakunin.nii.ac.jp:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.gakunin.nii.ac.jp: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">National Institute of Informatics</OrganizationName>
-    <OrganizationName xml:lang="ja">国立情報学研究所</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">GakuNin IdP</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="ja">学認IdP</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">https://www.gakunin.jp/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Hideaki</GivenName>
-    <SurName>NODA</SurName>
-    <EmailAddress>mailto:gakunin-help@nii.ac.jp</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.georgikon.hu-idp-saml2-idp-metadata.php.xml b/swamid-interfederations-2.0/idp.georgikon.hu-idp-saml2-idp-metadata.php.xml
deleted file mode 100644
index 8e9ee20d..00000000
--- a/swamid-interfederations-2.0/idp.georgikon.hu-idp-saml2-idp-metadata.php.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.georgikon.hu/idp/saml2/idp/metadata.php">
-  <Extensions>
-    <ns9:MetadataSet xmlns:ns9="urn:geant:niif.hu:eduid.hu:entity-attributes:processing-info">georgikon</ns9:MetadataSet>
-    <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>
-    <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">georgikon.hu</shibmd:Scope>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-        <mdui:IPHint>193.224.81.0/24</mdui:IPHint>
-        <mdui:GeolocationHint>geo:46.75190,17.2404</mdui:GeolocationHint>
-      </mdui:DiscoHints>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-        <mdui:DisplayName xml:lang="hu">Pannon Egyetem Georgikon Kar</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">University of Pannonia Georgikon Faculty</mdui:DisplayName>
-        <mdui:Description xml:lang="hu">Georgikon - Pannon Egyetem</mdui:Description>
-        <mdui:Description xml:lang="en">Georgikon - University of Pannonia</mdui:Description>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDLDCCAhSgAwIBAgIVAPFqC/HfYvfScTLOiI/sKofsx6MWMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNVBAMTEGlkcC5nZW9yZ2lrb24uaHUwHhcNMDkxMDAyMDgwMTA3WhcNMjkxMDAyMDgwMTA3WjAbMRkwFwYDVQQDExBpZHAuZ2Vvcmdpa29uLmh1MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAgR/NrpE25snvbNy6ICQJHqjtGmFkHIXkVeQPso1xTGO/K0uyNSGuUMWObwm5zAhxINLd+8u52noWtXPcngiFQXp8x1+k1PPZKrhlw7Lsmt5/WYFDkPxdZ90PCpQkpRgRQwBvmnwSdlqGmp/ts7ADTzh6ih++pvHI0jgyy3mMyJg/w3psv6VwNF4YuYY8rUQuPhNYVS7EMrebWlPOttqetcuXyTgZrx9O8W4GpsepmIJHBTlqY85W0H4zFXfUk2+t7IeUkDuxE474JPU5IszmVIfm5suEh1rwDnwKP+wRi5htuxdrbs1ceDrRxkbpDinoLcudn5XGq6LvokUI9HwQHQIDAQABo2cwZTBEBgNVHREEPTA7ghBpZHAuZ2Vvcmdpa29uLmh1hidodHRwczovL2lkcC5nZW9yZ2lrb24uaHUvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFEZzriItWOd2JgNAOtHivus73YOBMA0GCSqGSIb3DQEBBQUAA4IBAQBDovq/Xvd+cFB8KbgCF0Prd3WqhQx+8StGsxZLr3vVwxZYJucnpIpvKXJHj/9kQx2MwunTxlq9zvuyPbHIdnAt46x1tbYVRlyBaQXJQYRfaXeKRBNoO1lm1matIaXT8zaeBncF13S4vL0GcjKAR5bbvCVvdjjrTh9AH1p2g70k58PoW5rbGMshlgZs5Ibcp8EH6BXg3uqOJcZe1kQ6gt3io6iWRRKvaNNdcnqfBFpyP1OXwX64+APWbcGYw+RDMvzoDKi6rikDz6f67v3bI4H+X05T9d9Ijs2cKnI3l6aT1EgTD7EKbo7UkoRIe15g8kZ1Gq+ItOJsNOG820hN1UTJ</ds:X509Certificate>
-        </ds:X509Data>
-        <ds:KeyName>idp.georgikon.hu</ds:KeyName>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.georgikon.hu/idp/saml2/idp/SingleLogoutService.php"/>
-    <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-Redirect" Location="https://idp.georgikon.hu/idp/saml2/idp/SSOService.php"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="hu">Pannon Egyetem Georgikon Kar</OrganizationName>
-    <OrganizationName xml:lang="en">University of Pannonia Georgikon Faculty</OrganizationName>
-    <OrganizationDisplayName xml:lang="hu">Georgikon - Pannon Egyetem</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">Georgikon - University of Pannonia</OrganizationDisplayName>
-    <OrganizationURL xml:lang="hu">http://www.georgikon.hu</OrganizationURL>
-    <OrganizationURL xml:lang="en">http://www.georgikon.hu</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Héder Miklós</SurName>
-    <EmailAddress>mailto:heder@georgikon.hu</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="support">
-    <SurName>Héder Miklós</SurName>
-    <EmailAddress>mailto:heder@georgikon.hu</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="administrative">
-    <SurName>Héder Miklós</SurName>
-    <EmailAddress>mailto:heder@georgikon.hu</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.georgikon.hu.xml b/swamid-interfederations-2.0/idp.georgikon.hu.xml
deleted file mode 100644
index 8e9ee20d..00000000
--- a/swamid-interfederations-2.0/idp.georgikon.hu.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.georgikon.hu/idp/saml2/idp/metadata.php">
-  <Extensions>
-    <ns9:MetadataSet xmlns:ns9="urn:geant:niif.hu:eduid.hu:entity-attributes:processing-info">georgikon</ns9:MetadataSet>
-    <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>
-    <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">georgikon.hu</shibmd:Scope>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-        <mdui:IPHint>193.224.81.0/24</mdui:IPHint>
-        <mdui:GeolocationHint>geo:46.75190,17.2404</mdui:GeolocationHint>
-      </mdui:DiscoHints>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-        <mdui:DisplayName xml:lang="hu">Pannon Egyetem Georgikon Kar</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">University of Pannonia Georgikon Faculty</mdui:DisplayName>
-        <mdui:Description xml:lang="hu">Georgikon - Pannon Egyetem</mdui:Description>
-        <mdui:Description xml:lang="en">Georgikon - University of Pannonia</mdui:Description>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDLDCCAhSgAwIBAgIVAPFqC/HfYvfScTLOiI/sKofsx6MWMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNVBAMTEGlkcC5nZW9yZ2lrb24uaHUwHhcNMDkxMDAyMDgwMTA3WhcNMjkxMDAyMDgwMTA3WjAbMRkwFwYDVQQDExBpZHAuZ2Vvcmdpa29uLmh1MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAgR/NrpE25snvbNy6ICQJHqjtGmFkHIXkVeQPso1xTGO/K0uyNSGuUMWObwm5zAhxINLd+8u52noWtXPcngiFQXp8x1+k1PPZKrhlw7Lsmt5/WYFDkPxdZ90PCpQkpRgRQwBvmnwSdlqGmp/ts7ADTzh6ih++pvHI0jgyy3mMyJg/w3psv6VwNF4YuYY8rUQuPhNYVS7EMrebWlPOttqetcuXyTgZrx9O8W4GpsepmIJHBTlqY85W0H4zFXfUk2+t7IeUkDuxE474JPU5IszmVIfm5suEh1rwDnwKP+wRi5htuxdrbs1ceDrRxkbpDinoLcudn5XGq6LvokUI9HwQHQIDAQABo2cwZTBEBgNVHREEPTA7ghBpZHAuZ2Vvcmdpa29uLmh1hidodHRwczovL2lkcC5nZW9yZ2lrb24uaHUvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFEZzriItWOd2JgNAOtHivus73YOBMA0GCSqGSIb3DQEBBQUAA4IBAQBDovq/Xvd+cFB8KbgCF0Prd3WqhQx+8StGsxZLr3vVwxZYJucnpIpvKXJHj/9kQx2MwunTxlq9zvuyPbHIdnAt46x1tbYVRlyBaQXJQYRfaXeKRBNoO1lm1matIaXT8zaeBncF13S4vL0GcjKAR5bbvCVvdjjrTh9AH1p2g70k58PoW5rbGMshlgZs5Ibcp8EH6BXg3uqOJcZe1kQ6gt3io6iWRRKvaNNdcnqfBFpyP1OXwX64+APWbcGYw+RDMvzoDKi6rikDz6f67v3bI4H+X05T9d9Ijs2cKnI3l6aT1EgTD7EKbo7UkoRIe15g8kZ1Gq+ItOJsNOG820hN1UTJ</ds:X509Certificate>
-        </ds:X509Data>
-        <ds:KeyName>idp.georgikon.hu</ds:KeyName>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.georgikon.hu/idp/saml2/idp/SingleLogoutService.php"/>
-    <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-Redirect" Location="https://idp.georgikon.hu/idp/saml2/idp/SSOService.php"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="hu">Pannon Egyetem Georgikon Kar</OrganizationName>
-    <OrganizationName xml:lang="en">University of Pannonia Georgikon Faculty</OrganizationName>
-    <OrganizationDisplayName xml:lang="hu">Georgikon - Pannon Egyetem</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">Georgikon - University of Pannonia</OrganizationDisplayName>
-    <OrganizationURL xml:lang="hu">http://www.georgikon.hu</OrganizationURL>
-    <OrganizationURL xml:lang="en">http://www.georgikon.hu</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Héder Miklós</SurName>
-    <EmailAddress>mailto:heder@georgikon.hu</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="support">
-    <SurName>Héder Miklós</SurName>
-    <EmailAddress>mailto:heder@georgikon.hu</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="administrative">
-    <SurName>Héder Miklós</SurName>
-    <EmailAddress>mailto:heder@georgikon.hu</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.gli.cas.cz-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.gli.cas.cz-idp-shibboleth.xml
deleted file mode 100644
index 6f61a2dc..00000000
--- a/swamid-interfederations-2.0/idp.gli.cas.cz-idp-shibboleth.xml
+++ /dev/null
@@ -1,118 +0,0 @@
-<?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.gli.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/" registrationInstant="2014-04-09T14:17:34Z">
-      <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>
-    <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://eduid.cz/uri/idp-group/avcr</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>
-      <shibmd:Scope regexp="false">gli.cas.cz</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Institute of Geology AS CR</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="cs">Geologický ústav AV ČR</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Identity Provider GLI AV CR employees.</mdui:Description>
-        <mdui:Description xml:lang="cs">Identity Provider pro zaměstnance GLÚ AV ČR</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.gli.cas.cz/en</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="cs">http://www.gli.cas.cz/cs</mdui:InformationURL>
-        <mdui:Logo height="44" width="74">https://jiftach.cas.cz/loga/logo-gli-44.png</mdui:Logo>
-        <mdui:Logo height="411" width="960">https://jiftach.cas.cz/loga/logo-gli-633.png</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDJDCCAgygAwIBAgIVAPMK1aN36mJ1EI8m5HvYF+VJwrIuMA0GCSqGSIb3DQEB
-BQUAMBkxFzAVBgNVBAMTDmlkcC5nbGkuY2FzLmN6MB4XDTE0MDMzMTEwMDk1NFoX
-DTM0MDMzMTEwMDk1NFowGTEXMBUGA1UEAxMOaWRwLmdsaS5jYXMuY3owggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCiBF7C/8rowWkiRLwXiapiZHyrQYPB
-Cynx/NqI9law0V6tRstdj70DbZwRbzD/FssxN2Ez5FS0TmXXSqXePPW4T4+dGbsH
-MdNHmZ4qmLc/tgsiUiGvSoJKpOw8ME5906LrKyfUuulo0NTgTJFQmV3WLJWIDlZx
-7nONy10/kL1cNesTVwTzq7XrC5IJdTgiHyFjuoyVFI1x+7k4vOHWBjLm4IeyR6fX
-h50G4o+ZxgHvfvaV4fkA29yizjGhAqayNdGZwGVEvB+DG4tppKK96M/tC3U1A92b
-IH1FDFAtWuqyIboV/G8KQyIsV1nEMAarSRsdsHqb8VSBsi5vykNnzI5pAgMBAAGj
-YzBhMEAGA1UdEQQ5MDeCDmlkcC5nbGkuY2FzLmN6hiVodHRwczovL2lkcC5nbGku
-Y2FzLmN6L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBSgWOTsjiPAPp0kphbDPSR2
-1XYcQjANBgkqhkiG9w0BAQUFAAOCAQEAgy760HDnbRkAbbVNgmyuBu+1JIqKJ0Z8
-c0FHADn+b9OX7KyEI03AaxW/PDwAmhxcG7BjYB2vVfQy4UQQy+QICf52azo+9l28
-2YzkH7irI/IqcLFGLj5pQOZJSzjcMtqHUGS/7rXYdvAnurFimMCt7j5xzG+7dogB
-J8Vqj4Ls9PWUN9Vs3/FSbBI8we5AHa5Cjez+H4i+DeBMzztDZ6GWn0Lp+q6vTdRB
-d4uUiiPnJ89y7DjZYozshoLp9P3qtrNo/c/4tiEuWVb6WQxftqfj9gFM2AJ+gnV6
-7qwu6NPxIfpSmbXFNtGUcBgCSOSHBhXUOyDX8PgLlWC5IJA4hfgfOQ==
-
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.gli.cas.cz:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.gli.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.gli.cas.cz/idp/profile/SAML2/Redirect/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.gli.cas.cz/idp/profile/SAML2/POST/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.gli.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.gli.cas.cz/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.gli.cas.cz/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.gli.cas.cz/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.gli.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">gli.cas.cz</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDJDCCAgygAwIBAgIVAPMK1aN36mJ1EI8m5HvYF+VJwrIuMA0GCSqGSIb3DQEB
-BQUAMBkxFzAVBgNVBAMTDmlkcC5nbGkuY2FzLmN6MB4XDTE0MDMzMTEwMDk1NFoX
-DTM0MDMzMTEwMDk1NFowGTEXMBUGA1UEAxMOaWRwLmdsaS5jYXMuY3owggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCiBF7C/8rowWkiRLwXiapiZHyrQYPB
-Cynx/NqI9law0V6tRstdj70DbZwRbzD/FssxN2Ez5FS0TmXXSqXePPW4T4+dGbsH
-MdNHmZ4qmLc/tgsiUiGvSoJKpOw8ME5906LrKyfUuulo0NTgTJFQmV3WLJWIDlZx
-7nONy10/kL1cNesTVwTzq7XrC5IJdTgiHyFjuoyVFI1x+7k4vOHWBjLm4IeyR6fX
-h50G4o+ZxgHvfvaV4fkA29yizjGhAqayNdGZwGVEvB+DG4tppKK96M/tC3U1A92b
-IH1FDFAtWuqyIboV/G8KQyIsV1nEMAarSRsdsHqb8VSBsi5vykNnzI5pAgMBAAGj
-YzBhMEAGA1UdEQQ5MDeCDmlkcC5nbGkuY2FzLmN6hiVodHRwczovL2lkcC5nbGku
-Y2FzLmN6L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBSgWOTsjiPAPp0kphbDPSR2
-1XYcQjANBgkqhkiG9w0BAQUFAAOCAQEAgy760HDnbRkAbbVNgmyuBu+1JIqKJ0Z8
-c0FHADn+b9OX7KyEI03AaxW/PDwAmhxcG7BjYB2vVfQy4UQQy+QICf52azo+9l28
-2YzkH7irI/IqcLFGLj5pQOZJSzjcMtqHUGS/7rXYdvAnurFimMCt7j5xzG+7dogB
-J8Vqj4Ls9PWUN9Vs3/FSbBI8we5AHa5Cjez+H4i+DeBMzztDZ6GWn0Lp+q6vTdRB
-d4uUiiPnJ89y7DjZYozshoLp9P3qtrNo/c/4tiEuWVb6WQxftqfj9gFM2AJ+gnV6
-7qwu6NPxIfpSmbXFNtGUcBgCSOSHBhXUOyDX8PgLlWC5IJA4hfgfOQ==
-
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.gli.cas.cz:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.gli.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 Geology AS CR</OrganizationName>
-    <OrganizationName xml:lang="cs">Geologický ústav AV ČR</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Institute of Geology AS CR, v. v. i.</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="cs">Geologický ústav AV ČR, v. v. i.</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.gli.cas.cz/en</OrganizationURL>
-    <OrganizationURL xml:lang="cs">http://www.gli.cas.cz/cs</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.gli.cas.cz.xml b/swamid-interfederations-2.0/idp.gli.cas.cz.xml
deleted file mode 100644
index 6f61a2dc..00000000
--- a/swamid-interfederations-2.0/idp.gli.cas.cz.xml
+++ /dev/null
@@ -1,118 +0,0 @@
-<?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.gli.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/" registrationInstant="2014-04-09T14:17:34Z">
-      <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>
-    <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://eduid.cz/uri/idp-group/avcr</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>
-      <shibmd:Scope regexp="false">gli.cas.cz</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Institute of Geology AS CR</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="cs">Geologický ústav AV ČR</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Identity Provider GLI AV CR employees.</mdui:Description>
-        <mdui:Description xml:lang="cs">Identity Provider pro zaměstnance GLÚ AV ČR</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.gli.cas.cz/en</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="cs">http://www.gli.cas.cz/cs</mdui:InformationURL>
-        <mdui:Logo height="44" width="74">https://jiftach.cas.cz/loga/logo-gli-44.png</mdui:Logo>
-        <mdui:Logo height="411" width="960">https://jiftach.cas.cz/loga/logo-gli-633.png</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDJDCCAgygAwIBAgIVAPMK1aN36mJ1EI8m5HvYF+VJwrIuMA0GCSqGSIb3DQEB
-BQUAMBkxFzAVBgNVBAMTDmlkcC5nbGkuY2FzLmN6MB4XDTE0MDMzMTEwMDk1NFoX
-DTM0MDMzMTEwMDk1NFowGTEXMBUGA1UEAxMOaWRwLmdsaS5jYXMuY3owggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCiBF7C/8rowWkiRLwXiapiZHyrQYPB
-Cynx/NqI9law0V6tRstdj70DbZwRbzD/FssxN2Ez5FS0TmXXSqXePPW4T4+dGbsH
-MdNHmZ4qmLc/tgsiUiGvSoJKpOw8ME5906LrKyfUuulo0NTgTJFQmV3WLJWIDlZx
-7nONy10/kL1cNesTVwTzq7XrC5IJdTgiHyFjuoyVFI1x+7k4vOHWBjLm4IeyR6fX
-h50G4o+ZxgHvfvaV4fkA29yizjGhAqayNdGZwGVEvB+DG4tppKK96M/tC3U1A92b
-IH1FDFAtWuqyIboV/G8KQyIsV1nEMAarSRsdsHqb8VSBsi5vykNnzI5pAgMBAAGj
-YzBhMEAGA1UdEQQ5MDeCDmlkcC5nbGkuY2FzLmN6hiVodHRwczovL2lkcC5nbGku
-Y2FzLmN6L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBSgWOTsjiPAPp0kphbDPSR2
-1XYcQjANBgkqhkiG9w0BAQUFAAOCAQEAgy760HDnbRkAbbVNgmyuBu+1JIqKJ0Z8
-c0FHADn+b9OX7KyEI03AaxW/PDwAmhxcG7BjYB2vVfQy4UQQy+QICf52azo+9l28
-2YzkH7irI/IqcLFGLj5pQOZJSzjcMtqHUGS/7rXYdvAnurFimMCt7j5xzG+7dogB
-J8Vqj4Ls9PWUN9Vs3/FSbBI8we5AHa5Cjez+H4i+DeBMzztDZ6GWn0Lp+q6vTdRB
-d4uUiiPnJ89y7DjZYozshoLp9P3qtrNo/c/4tiEuWVb6WQxftqfj9gFM2AJ+gnV6
-7qwu6NPxIfpSmbXFNtGUcBgCSOSHBhXUOyDX8PgLlWC5IJA4hfgfOQ==
-
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.gli.cas.cz:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.gli.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.gli.cas.cz/idp/profile/SAML2/Redirect/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.gli.cas.cz/idp/profile/SAML2/POST/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.gli.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.gli.cas.cz/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.gli.cas.cz/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.gli.cas.cz/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.gli.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">gli.cas.cz</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDJDCCAgygAwIBAgIVAPMK1aN36mJ1EI8m5HvYF+VJwrIuMA0GCSqGSIb3DQEB
-BQUAMBkxFzAVBgNVBAMTDmlkcC5nbGkuY2FzLmN6MB4XDTE0MDMzMTEwMDk1NFoX
-DTM0MDMzMTEwMDk1NFowGTEXMBUGA1UEAxMOaWRwLmdsaS5jYXMuY3owggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCiBF7C/8rowWkiRLwXiapiZHyrQYPB
-Cynx/NqI9law0V6tRstdj70DbZwRbzD/FssxN2Ez5FS0TmXXSqXePPW4T4+dGbsH
-MdNHmZ4qmLc/tgsiUiGvSoJKpOw8ME5906LrKyfUuulo0NTgTJFQmV3WLJWIDlZx
-7nONy10/kL1cNesTVwTzq7XrC5IJdTgiHyFjuoyVFI1x+7k4vOHWBjLm4IeyR6fX
-h50G4o+ZxgHvfvaV4fkA29yizjGhAqayNdGZwGVEvB+DG4tppKK96M/tC3U1A92b
-IH1FDFAtWuqyIboV/G8KQyIsV1nEMAarSRsdsHqb8VSBsi5vykNnzI5pAgMBAAGj
-YzBhMEAGA1UdEQQ5MDeCDmlkcC5nbGkuY2FzLmN6hiVodHRwczovL2lkcC5nbGku
-Y2FzLmN6L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBSgWOTsjiPAPp0kphbDPSR2
-1XYcQjANBgkqhkiG9w0BAQUFAAOCAQEAgy760HDnbRkAbbVNgmyuBu+1JIqKJ0Z8
-c0FHADn+b9OX7KyEI03AaxW/PDwAmhxcG7BjYB2vVfQy4UQQy+QICf52azo+9l28
-2YzkH7irI/IqcLFGLj5pQOZJSzjcMtqHUGS/7rXYdvAnurFimMCt7j5xzG+7dogB
-J8Vqj4Ls9PWUN9Vs3/FSbBI8we5AHa5Cjez+H4i+DeBMzztDZ6GWn0Lp+q6vTdRB
-d4uUiiPnJ89y7DjZYozshoLp9P3qtrNo/c/4tiEuWVb6WQxftqfj9gFM2AJ+gnV6
-7qwu6NPxIfpSmbXFNtGUcBgCSOSHBhXUOyDX8PgLlWC5IJA4hfgfOQ==
-
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.gli.cas.cz:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.gli.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 Geology AS CR</OrganizationName>
-    <OrganizationName xml:lang="cs">Geologický ústav AV ČR</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Institute of Geology AS CR, v. v. i.</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="cs">Geologický ústav AV ČR, v. v. i.</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.gli.cas.cz/en</OrganizationURL>
-    <OrganizationURL xml:lang="cs">http://www.gli.cas.cz/cs</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.hainaut-promsoc.be-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.hainaut-promsoc.be-idp-shibboleth.xml
deleted file mode 100644
index 15300949..00000000
--- a/swamid-interfederations-2.0/idp.hainaut-promsoc.be-idp-shibboleth.xml
+++ /dev/null
@@ -1,107 +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: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:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://idp.hainaut-promsoc.be/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://federation.belnet.be/" registrationInstant="2012-03-27T12:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://federation.belnet.be/files/Belnet-metadata-registration-practice-statement.txt</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">hainaut-promsoc.be</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIEejCCA2KgAwIBAgIRAOJDreYdfwftYXxuTiaSgikwDQYJKoZIhvcNAQEFBQAw
-NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-IFNTTCBDQTAeFw0xNDA1MTcwMDAwMDBaFw0xNzA1MTYyMzU5NTlaMEQxITAfBgNV
-BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEfMB0GA1UEAxMWaWRwLmhhaW5h
-dXQtcHJvbXNvYy5iZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALaj
-3QToxwLfTZdKn1LyscWG0WEFxqm4szedeTdv+Z0GN7vzAFkCJ5uIN0TMsS0pI7Bk
-DpgweMIgIjyAic13ibFgdPDK97duAhfqAGMlgxRvYeil42X6kCNC5OaUPszuXU8t
-HBLW2ZTpptKpqud5X0hNijbAghLZDmn7Eb+rQT8+4zQdZJwV4ApYjNT65oTWTmHX
-xj+LI65fYOyTPGW30rYtX9m7TJUoR1GNsaOzhTlulE0wFiXQMct8qWpRA43tnnPJ
-h+LSBtS5tqZeEd7NP0V2FM1FMkpghrDewy1Truj0+WniTcBZJTtnYUbzsImNZIg6
-OCNqkxNKtIkzLLX9h7kCAwEAAaOCAXMwggFvMB8GA1UdIwQYMBaAFAy9k2gM896r
-o0lrKzdXR+qQ47ntMB0GA1UdDgQWBBTsFp6mcbFldk8J8qcZ6VgvqL4y0DAOBgNV
-HQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYI
-KwYBBQUHAwIwIgYDVR0gBBswGTANBgsrBgEEAbIxAQICHTAIBgZngQwBAgEwOgYD
-VR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFT
-U0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0
-LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0
-cDovL29jc3AudGNzLnRlcmVuYS5vcmcwIQYDVR0RBBowGIIWaWRwLmhhaW5hdXQt
-cHJvbXNvYy5iZTANBgkqhkiG9w0BAQUFAAOCAQEAqWXIoIBh/n3Qd92KOkrtLD0O
-MCPdoOlIe+WfzPfEFEre1QcGNIiywbTH5zR7n0GttMvopttilSIEH4JePV9uiX5m
-DdcGukEMCCtMTaahMeXTSiS9v1RE2FGe9tx1zblHOkpI9V43pWLb9zk3hitGWqN4
-Zce+zsOUf6D8xfDHAReHt5RaWtfSmlHENVix51e5kQ8Q5WAkABvSSVEvOtB1Lqlp
-Ce+uSCFKDpGchEC4Wmfb3W3ka1Vi5Q5ARUNvsjPO02XSbXYJ0bTGFUnJcOKytFBp
-HQh46e9lb2vBUoh87RleCYdNpkZRu92tzeY/iD7AHvyiap1fKXUg2tle+ahF2A==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.hainaut-promsoc.be:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.hainaut-promsoc.be:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.hainaut-promsoc.be/idp/profile/SAML2/Redirect/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.hainaut-promsoc.be/idp/profile/SAML2/POST/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.hainaut-promsoc.be: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.hainaut-promsoc.be/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.hainaut-promsoc.be/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.hainaut-promsoc.be/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.hainaut-promsoc.be/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">hainaut-promsoc.be</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIEejCCA2KgAwIBAgIRAOJDreYdfwftYXxuTiaSgikwDQYJKoZIhvcNAQEFBQAw
-NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-IFNTTCBDQTAeFw0xNDA1MTcwMDAwMDBaFw0xNzA1MTYyMzU5NTlaMEQxITAfBgNV
-BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEfMB0GA1UEAxMWaWRwLmhhaW5h
-dXQtcHJvbXNvYy5iZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALaj
-3QToxwLfTZdKn1LyscWG0WEFxqm4szedeTdv+Z0GN7vzAFkCJ5uIN0TMsS0pI7Bk
-DpgweMIgIjyAic13ibFgdPDK97duAhfqAGMlgxRvYeil42X6kCNC5OaUPszuXU8t
-HBLW2ZTpptKpqud5X0hNijbAghLZDmn7Eb+rQT8+4zQdZJwV4ApYjNT65oTWTmHX
-xj+LI65fYOyTPGW30rYtX9m7TJUoR1GNsaOzhTlulE0wFiXQMct8qWpRA43tnnPJ
-h+LSBtS5tqZeEd7NP0V2FM1FMkpghrDewy1Truj0+WniTcBZJTtnYUbzsImNZIg6
-OCNqkxNKtIkzLLX9h7kCAwEAAaOCAXMwggFvMB8GA1UdIwQYMBaAFAy9k2gM896r
-o0lrKzdXR+qQ47ntMB0GA1UdDgQWBBTsFp6mcbFldk8J8qcZ6VgvqL4y0DAOBgNV
-HQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYI
-KwYBBQUHAwIwIgYDVR0gBBswGTANBgsrBgEEAbIxAQICHTAIBgZngQwBAgEwOgYD
-VR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFT
-U0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0
-LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0
-cDovL29jc3AudGNzLnRlcmVuYS5vcmcwIQYDVR0RBBowGIIWaWRwLmhhaW5hdXQt
-cHJvbXNvYy5iZTANBgkqhkiG9w0BAQUFAAOCAQEAqWXIoIBh/n3Qd92KOkrtLD0O
-MCPdoOlIe+WfzPfEFEre1QcGNIiywbTH5zR7n0GttMvopttilSIEH4JePV9uiX5m
-DdcGukEMCCtMTaahMeXTSiS9v1RE2FGe9tx1zblHOkpI9V43pWLb9zk3hitGWqN4
-Zce+zsOUf6D8xfDHAReHt5RaWtfSmlHENVix51e5kQ8Q5WAkABvSSVEvOtB1Lqlp
-Ce+uSCFKDpGchEC4Wmfb3W3ka1Vi5Q5ARUNvsjPO02XSbXYJ0bTGFUnJcOKytFBp
-HQh46e9lb2vBUoh87RleCYdNpkZRu92tzeY/iD7AHvyiap1fKXUg2tle+ahF2A==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.hainaut-promsoc.be:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.hainaut-promsoc.be: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">Enseignement de Promotion Sociale de la Province de Hainaut</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Hainaut-PromSoc</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.hainaut-promsoc.be</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Technical Support</GivenName>
-    <SurName>Technical Support</SurName>
-    <EmailAddress>webmaster@hainaut-promsoc.be</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.hainaut-promsoc.be.xml b/swamid-interfederations-2.0/idp.hainaut-promsoc.be.xml
deleted file mode 100644
index 15300949..00000000
--- a/swamid-interfederations-2.0/idp.hainaut-promsoc.be.xml
+++ /dev/null
@@ -1,107 +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: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:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://idp.hainaut-promsoc.be/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://federation.belnet.be/" registrationInstant="2012-03-27T12:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://federation.belnet.be/files/Belnet-metadata-registration-practice-statement.txt</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">hainaut-promsoc.be</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIEejCCA2KgAwIBAgIRAOJDreYdfwftYXxuTiaSgikwDQYJKoZIhvcNAQEFBQAw
-NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-IFNTTCBDQTAeFw0xNDA1MTcwMDAwMDBaFw0xNzA1MTYyMzU5NTlaMEQxITAfBgNV
-BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEfMB0GA1UEAxMWaWRwLmhhaW5h
-dXQtcHJvbXNvYy5iZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALaj
-3QToxwLfTZdKn1LyscWG0WEFxqm4szedeTdv+Z0GN7vzAFkCJ5uIN0TMsS0pI7Bk
-DpgweMIgIjyAic13ibFgdPDK97duAhfqAGMlgxRvYeil42X6kCNC5OaUPszuXU8t
-HBLW2ZTpptKpqud5X0hNijbAghLZDmn7Eb+rQT8+4zQdZJwV4ApYjNT65oTWTmHX
-xj+LI65fYOyTPGW30rYtX9m7TJUoR1GNsaOzhTlulE0wFiXQMct8qWpRA43tnnPJ
-h+LSBtS5tqZeEd7NP0V2FM1FMkpghrDewy1Truj0+WniTcBZJTtnYUbzsImNZIg6
-OCNqkxNKtIkzLLX9h7kCAwEAAaOCAXMwggFvMB8GA1UdIwQYMBaAFAy9k2gM896r
-o0lrKzdXR+qQ47ntMB0GA1UdDgQWBBTsFp6mcbFldk8J8qcZ6VgvqL4y0DAOBgNV
-HQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYI
-KwYBBQUHAwIwIgYDVR0gBBswGTANBgsrBgEEAbIxAQICHTAIBgZngQwBAgEwOgYD
-VR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFT
-U0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0
-LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0
-cDovL29jc3AudGNzLnRlcmVuYS5vcmcwIQYDVR0RBBowGIIWaWRwLmhhaW5hdXQt
-cHJvbXNvYy5iZTANBgkqhkiG9w0BAQUFAAOCAQEAqWXIoIBh/n3Qd92KOkrtLD0O
-MCPdoOlIe+WfzPfEFEre1QcGNIiywbTH5zR7n0GttMvopttilSIEH4JePV9uiX5m
-DdcGukEMCCtMTaahMeXTSiS9v1RE2FGe9tx1zblHOkpI9V43pWLb9zk3hitGWqN4
-Zce+zsOUf6D8xfDHAReHt5RaWtfSmlHENVix51e5kQ8Q5WAkABvSSVEvOtB1Lqlp
-Ce+uSCFKDpGchEC4Wmfb3W3ka1Vi5Q5ARUNvsjPO02XSbXYJ0bTGFUnJcOKytFBp
-HQh46e9lb2vBUoh87RleCYdNpkZRu92tzeY/iD7AHvyiap1fKXUg2tle+ahF2A==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.hainaut-promsoc.be:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.hainaut-promsoc.be:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.hainaut-promsoc.be/idp/profile/SAML2/Redirect/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.hainaut-promsoc.be/idp/profile/SAML2/POST/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.hainaut-promsoc.be: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.hainaut-promsoc.be/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.hainaut-promsoc.be/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.hainaut-promsoc.be/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.hainaut-promsoc.be/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">hainaut-promsoc.be</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIEejCCA2KgAwIBAgIRAOJDreYdfwftYXxuTiaSgikwDQYJKoZIhvcNAQEFBQAw
-NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-IFNTTCBDQTAeFw0xNDA1MTcwMDAwMDBaFw0xNzA1MTYyMzU5NTlaMEQxITAfBgNV
-BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEfMB0GA1UEAxMWaWRwLmhhaW5h
-dXQtcHJvbXNvYy5iZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALaj
-3QToxwLfTZdKn1LyscWG0WEFxqm4szedeTdv+Z0GN7vzAFkCJ5uIN0TMsS0pI7Bk
-DpgweMIgIjyAic13ibFgdPDK97duAhfqAGMlgxRvYeil42X6kCNC5OaUPszuXU8t
-HBLW2ZTpptKpqud5X0hNijbAghLZDmn7Eb+rQT8+4zQdZJwV4ApYjNT65oTWTmHX
-xj+LI65fYOyTPGW30rYtX9m7TJUoR1GNsaOzhTlulE0wFiXQMct8qWpRA43tnnPJ
-h+LSBtS5tqZeEd7NP0V2FM1FMkpghrDewy1Truj0+WniTcBZJTtnYUbzsImNZIg6
-OCNqkxNKtIkzLLX9h7kCAwEAAaOCAXMwggFvMB8GA1UdIwQYMBaAFAy9k2gM896r
-o0lrKzdXR+qQ47ntMB0GA1UdDgQWBBTsFp6mcbFldk8J8qcZ6VgvqL4y0DAOBgNV
-HQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYI
-KwYBBQUHAwIwIgYDVR0gBBswGTANBgsrBgEEAbIxAQICHTAIBgZngQwBAgEwOgYD
-VR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFT
-U0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0
-LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0
-cDovL29jc3AudGNzLnRlcmVuYS5vcmcwIQYDVR0RBBowGIIWaWRwLmhhaW5hdXQt
-cHJvbXNvYy5iZTANBgkqhkiG9w0BAQUFAAOCAQEAqWXIoIBh/n3Qd92KOkrtLD0O
-MCPdoOlIe+WfzPfEFEre1QcGNIiywbTH5zR7n0GttMvopttilSIEH4JePV9uiX5m
-DdcGukEMCCtMTaahMeXTSiS9v1RE2FGe9tx1zblHOkpI9V43pWLb9zk3hitGWqN4
-Zce+zsOUf6D8xfDHAReHt5RaWtfSmlHENVix51e5kQ8Q5WAkABvSSVEvOtB1Lqlp
-Ce+uSCFKDpGchEC4Wmfb3W3ka1Vi5Q5ARUNvsjPO02XSbXYJ0bTGFUnJcOKytFBp
-HQh46e9lb2vBUoh87RleCYdNpkZRu92tzeY/iD7AHvyiap1fKXUg2tle+ahF2A==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.hainaut-promsoc.be:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.hainaut-promsoc.be: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">Enseignement de Promotion Sociale de la Province de Hainaut</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Hainaut-PromSoc</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.hainaut-promsoc.be</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Technical Support</GivenName>
-    <SurName>Technical Support</SurName>
-    <EmailAddress>webmaster@hainaut-promsoc.be</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.heanet.ie-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.heanet.ie-idp-shibboleth.xml
deleted file mode 100644
index 45c4492b..00000000
--- a/swamid-interfederations-2.0/idp.heanet.ie-idp-shibboleth.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.heanet.ie/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.heanet.ie" registrationInstant="2010-11-01T00:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://www.edugate.ie/welcome-edugate-federation/membership</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </md:Extensions>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">heanet.ie</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">HEAnet Limited.</mdui:DisplayName>
-        <mdui:InformationURL xml:lang="en">http://www.heanet.ie</mdui:InformationURL>
-        <mdui:Logo height="82" width="200">https://edugate.heanet.ie/rr3/logos/heanet.png</mdui:Logo>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:GeolocationHint>geo:53.34964831237833,-6.246660947799683</mdui:GeolocationHint>
-      </mdui:DiscoHints>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDHzCCAgegAwIBAgIUGqvc4DxR6ZObzP+9tjmx/JHShXIwDQYJKoZIhvcNAQEF
-BQAwGDEWMBQGA1UEAxMNaWRwLmhlYW5ldC5pZTAeFw0xMDA0MzAxMDU0MzZaFw0z
-MDA0MzAxMDU0MzZaMBgxFjAUBgNVBAMTDWlkcC5oZWFuZXQuaWUwggEiMA0GCSqG
-SIb3DQEBAQUAA4IBDwAwggEKAoIBAQCzASQpsLEEYKVuaK9JiA66mzcCkx1X50SO
-uEtaPBejFzRZ3i5j7rgE7m+2ku+kjt8JJg9JUOrdnKJ0S/9aVggpKQvDAo9rNvjO
-/dyNge4OfUliuSUHw+LOiyxH0ELMW7DTVknLimzZNlHewmunUD/c/uI54Zb8XGYd
-MpmmfPq7LBeurCxBDZ101ujdj94lvtGTPY2WcnBj3ILoyAd1CquGU4o66ws333Ht
-7vA/NTLIO40qQSvEsMR9Lyb/ZQR+XmcssoJ8TqC6lWf2FfAt4phX904FBB9CHapZ
-dtHRRl6r1AifH9NZ/uh24+ct736MY5eqLyy5C5Wp0GmGac33+Iq5AgMBAAGjYTBf
-MD4GA1UdEQQ3MDWCDWlkcC5oZWFuZXQuaWWGJGh0dHBzOi8vaWRwLmhlYW5ldC5p
-ZS9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUhEdkRl4cvkY8kAeuxgl0TK1i61Mw
-DQYJKoZIhvcNAQEFBQADggEBAKk1EPv3OYkfuvz8js6xl7fI31jPJhDao2yExaeZ
-8P3joqz4YwGmI/Ahm+HNGtqYEXvP8MUpO8yPkkiuJl7L9pHu0Wk2v026XO1B2fZX
-z/4PHuTzo+cpPkcJewzDMKQuNMINzx0gOTpXH2WsSVaHEFBXm0g2OUkk8p4vnY5o
-O1D15tXmi7abFTXObJbvnNrQZJ4+wZAk+wGIfjEd5uKGIMgxET35RJLoUcgQnVxe
-Z0nveWuA2Iu/d6B+48I2J+I0vto6XneJrsVIt8MovKtbjFRs0fAZoD+UtthT+ZVz
-rbgeIIersVLLyLj9SIJrC+FVbLzD3jRnEI4r+mqAxzVNprk=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.heanet.ie/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.heanet.ie/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">HEAnet</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">HEAnet</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">https://idp.heanet.ie/support.htm</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:SurName>Glenn Wearen</md:SurName>
-    <md:EmailAddress>glenn.wearen@heanet.ie</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Janusz Ulanowski</md:SurName>
-    <md:EmailAddress>janusz.ulanowski@heanet.ie</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:SurName>NOC</md:SurName>
-    <md:EmailAddress>noc-middleware@heanet.ie</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.heanet.ie.xml b/swamid-interfederations-2.0/idp.heanet.ie.xml
deleted file mode 100644
index 45c4492b..00000000
--- a/swamid-interfederations-2.0/idp.heanet.ie.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.heanet.ie/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.heanet.ie" registrationInstant="2010-11-01T00:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://www.edugate.ie/welcome-edugate-federation/membership</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </md:Extensions>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">heanet.ie</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">HEAnet Limited.</mdui:DisplayName>
-        <mdui:InformationURL xml:lang="en">http://www.heanet.ie</mdui:InformationURL>
-        <mdui:Logo height="82" width="200">https://edugate.heanet.ie/rr3/logos/heanet.png</mdui:Logo>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:GeolocationHint>geo:53.34964831237833,-6.246660947799683</mdui:GeolocationHint>
-      </mdui:DiscoHints>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDHzCCAgegAwIBAgIUGqvc4DxR6ZObzP+9tjmx/JHShXIwDQYJKoZIhvcNAQEF
-BQAwGDEWMBQGA1UEAxMNaWRwLmhlYW5ldC5pZTAeFw0xMDA0MzAxMDU0MzZaFw0z
-MDA0MzAxMDU0MzZaMBgxFjAUBgNVBAMTDWlkcC5oZWFuZXQuaWUwggEiMA0GCSqG
-SIb3DQEBAQUAA4IBDwAwggEKAoIBAQCzASQpsLEEYKVuaK9JiA66mzcCkx1X50SO
-uEtaPBejFzRZ3i5j7rgE7m+2ku+kjt8JJg9JUOrdnKJ0S/9aVggpKQvDAo9rNvjO
-/dyNge4OfUliuSUHw+LOiyxH0ELMW7DTVknLimzZNlHewmunUD/c/uI54Zb8XGYd
-MpmmfPq7LBeurCxBDZ101ujdj94lvtGTPY2WcnBj3ILoyAd1CquGU4o66ws333Ht
-7vA/NTLIO40qQSvEsMR9Lyb/ZQR+XmcssoJ8TqC6lWf2FfAt4phX904FBB9CHapZ
-dtHRRl6r1AifH9NZ/uh24+ct736MY5eqLyy5C5Wp0GmGac33+Iq5AgMBAAGjYTBf
-MD4GA1UdEQQ3MDWCDWlkcC5oZWFuZXQuaWWGJGh0dHBzOi8vaWRwLmhlYW5ldC5p
-ZS9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUhEdkRl4cvkY8kAeuxgl0TK1i61Mw
-DQYJKoZIhvcNAQEFBQADggEBAKk1EPv3OYkfuvz8js6xl7fI31jPJhDao2yExaeZ
-8P3joqz4YwGmI/Ahm+HNGtqYEXvP8MUpO8yPkkiuJl7L9pHu0Wk2v026XO1B2fZX
-z/4PHuTzo+cpPkcJewzDMKQuNMINzx0gOTpXH2WsSVaHEFBXm0g2OUkk8p4vnY5o
-O1D15tXmi7abFTXObJbvnNrQZJ4+wZAk+wGIfjEd5uKGIMgxET35RJLoUcgQnVxe
-Z0nveWuA2Iu/d6B+48I2J+I0vto6XneJrsVIt8MovKtbjFRs0fAZoD+UtthT+ZVz
-rbgeIIersVLLyLj9SIJrC+FVbLzD3jRnEI4r+mqAxzVNprk=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.heanet.ie/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.heanet.ie/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">HEAnet</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">HEAnet</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">https://idp.heanet.ie/support.htm</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:SurName>Glenn Wearen</md:SurName>
-    <md:EmailAddress>glenn.wearen@heanet.ie</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Janusz Ulanowski</md:SurName>
-    <md:EmailAddress>janusz.ulanowski@heanet.ie</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:SurName>NOC</md:SurName>
-    <md:EmailAddress>noc-middleware@heanet.ie</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.hebis.de-uni-frankfurt.xml b/swamid-interfederations-2.0/idp.hebis.de-uni-frankfurt.xml
deleted file mode 100644
index 24ff9a9c..00000000
--- a/swamid-interfederations-2.0/idp.hebis.de-uni-frankfurt.xml
+++ /dev/null
@@ -1,147 +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">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2014-08-11T07:07:20Z">
-      <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-frankfurt.de</saml1md:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="de">Universität Frankfurt</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Universität Frankfurt</mdui:DisplayName>
-        <mdui:Description xml:lang="de">Identity Provider der Johann Wolfgang Goethe Universität Frankfurt am Main</mdui:Description>
-        <mdui:Description xml:lang="en">Identity Provider of the Johann Wolfgang Goethe Universität Frankfurt am Main</mdui:Description>
-        <mdui:InformationURL xml:lang="de">http://www.uni-frankfurt.de/de?locale=de</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">http://www.uni-frankfurt.de/en?locale=en</mdui:InformationURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.ub.uni-frankfurt.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.ub.uni-frankfurt.de,OU=Hochschulrechenzentrum,O=Johann Wolfgang Goethe-Universitaet Frankfurt am Main,L=Frankfurt am Main,ST=Hessen,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIGQDCCBSigAwIBAgIHFbRIGOhJnDANBgkqhkiG9w0BAQUFADCBoTELMAkGA1UE
-BhMCREUxDzANBgNVBAgTBkhlc3NlbjEaMBgGA1UEBxMRRnJhbmtmdXJ0IGFtIE1h
-aW4xLDAqBgNVBAoTI0pvaGFubiBXb2xmZ2FuZyBHb2V0aGUtVW5pdmVyc2l0YWV0
-MRMwEQYDVQQDEwpVTkktRkZNIENBMSIwIAYJKoZIhvcNAQkBFhNjYUB1bmktZnJh
-bmtmdXJ0LmRlMB4XDTEzMDUxNjEyMDExMloXDTE4MDUxNTEyMDExMlowgb0xCzAJ
-BgNVBAYTAkRFMQ8wDQYDVQQIEwZIZXNzZW4xGjAYBgNVBAcTEUZyYW5rZnVydCBh
-bSBNYWluMT4wPAYDVQQKEzVKb2hhbm4gV29sZmdhbmcgR29ldGhlLVVuaXZlcnNp
-dGFldCBGcmFua2Z1cnQgYW0gTWFpbjEfMB0GA1UECxMWSG9jaHNjaHVscmVjaGVu
-emVudHJ1bTEgMB4GA1UEAxMXaWRwLnViLnVuaS1mcmFua2Z1cnQuZGUwggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDZe39hckwxZcNK8aq2xIs712ekjHp4
-QlSkr4Z1/tOsqwH16in0Iv48CjsLa/zrI3kIKSJYdPmedeu2/WrG/gDRUook/31z
-nIyKUyp/4S+l88ppH2Hc6lcM48hsr+5n2AwlJWXIonvasqRb78j8XdDTSwvmRh//
-2nJmiN4HYLzjF1aV3OJtHeBaIH+LOKw/AHS2ACpjtxUT3g2BItEKrfr8EFWwR9Rt
-hlmUUW9jfNYLg1ZPThvwSnTzaMAw8Lsz/q8s+oH/F3WOtQjLAxhOQlIjt1xif1hp
-AZOGcqIz88VLRBpnUel7Ywf+ZQjC6HdVfGEOZFq4iXh1VQT8dWx5O45lAgMBAAGj
-ggJdMIICWTA5BgNVHSAEMjAwMBEGDysGAQQBga0hgiwBAQQDADARBg8rBgEEAYGt
-IYIsAgEEAwAwCAYGZ4EMAQICMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgXgMB0GA1Ud
-JQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATAdBgNVHQ4EFgQUyfr2wQy7BCFfMtLo
-dF+y6oIYKzQwHwYDVR0jBBgwFoAUY1l3sUZv4earr8LHk/9fcQ1P4P8wNwYDVR0R
-BDAwLoIXaWRwLnViLnVuaS1mcmFua2Z1cnQuZGWBE2NhQHVuaS1mcmFua2Z1cnQu
-ZGUwgY0GA1UdHwSBhTCBgjA/oD2gO4Y5aHR0cDovL2NkcDEucGNhLmRmbi5kZS91
-bmktZnJhbmtmdXJ0LWNhL3B1Yi9jcmwvY2FjcmwuY3JsMD+gPaA7hjlodHRwOi8v
-Y2RwMi5wY2EuZGZuLmRlL3VuaS1mcmFua2Z1cnQtY2EvcHViL2NybC9jYWNybC5j
-cmwwgdsGCCsGAQUFBwEBBIHOMIHLMDMGCCsGAQUFBzABhidodHRwOi8vb2NzcC5w
-Y2EuZGZuLmRlL09DU1AtU2VydmVyL09DU1AwSQYIKwYBBQUHMAKGPWh0dHA6Ly9j
-ZHAxLnBjYS5kZm4uZGUvdW5pLWZyYW5rZnVydC1jYS9wdWIvY2FjZXJ0L2NhY2Vy
-dC5jcnQwSQYIKwYBBQUHMAKGPWh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvdW5pLWZy
-YW5rZnVydC1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwDQYJKoZIhvcNAQEFBQAD
-ggEBAE/mmrj5ekBv1t9rmWIjiAI6fPSvDBd6nGOo5d79icawLK4tHL9idFql8yfS
-zzaWc3AnXXpStqfiWpLlG0grdxEd7hr1KC1/tRQssglgAgaCpCgfuXof6G+Bm1Kj
-PoCd7dl2t3vrbr+9UseeoeZtOppwuSE1IwGjL698U7P/qWzVcqbtt31OwobYg+Ae
-qYGUkYlhILk5ebLbSLy7NjfiHxRh2MU+U4LHmRDOHq64S7NDvy+Ph97wnToRY3IG
-TiKgdY5G49KSG5nGvKH7h/PjrkldHzhRR0eo1hpcrS2I84epUs7bQNQn33Shlfpj
-L3AVMrfe165uaW2pn5pinAUyFec=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ub.uni-frankfurt.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ub.uni-frankfurt.de:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ub.uni-frankfurt.de/idp/profile/SAML2/Redirect/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ub.uni-frankfurt.de/idp/profile/SAML2/POST/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ub.uni-frankfurt.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://idp.ub.uni-frankfurt.de/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ub.uni-frankfurt.de/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.ub.uni-frankfurt.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ub.uni-frankfurt.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-frankfurt.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.ub.uni-frankfurt.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.ub.uni-frankfurt.de,OU=Hochschulrechenzentrum,O=Johann Wolfgang Goethe-Universitaet Frankfurt am Main,L=Frankfurt am Main,ST=Hessen,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIGQDCCBSigAwIBAgIHFbRIGOhJnDANBgkqhkiG9w0BAQUFADCBoTELMAkGA1UE
-BhMCREUxDzANBgNVBAgTBkhlc3NlbjEaMBgGA1UEBxMRRnJhbmtmdXJ0IGFtIE1h
-aW4xLDAqBgNVBAoTI0pvaGFubiBXb2xmZ2FuZyBHb2V0aGUtVW5pdmVyc2l0YWV0
-MRMwEQYDVQQDEwpVTkktRkZNIENBMSIwIAYJKoZIhvcNAQkBFhNjYUB1bmktZnJh
-bmtmdXJ0LmRlMB4XDTEzMDUxNjEyMDExMloXDTE4MDUxNTEyMDExMlowgb0xCzAJ
-BgNVBAYTAkRFMQ8wDQYDVQQIEwZIZXNzZW4xGjAYBgNVBAcTEUZyYW5rZnVydCBh
-bSBNYWluMT4wPAYDVQQKEzVKb2hhbm4gV29sZmdhbmcgR29ldGhlLVVuaXZlcnNp
-dGFldCBGcmFua2Z1cnQgYW0gTWFpbjEfMB0GA1UECxMWSG9jaHNjaHVscmVjaGVu
-emVudHJ1bTEgMB4GA1UEAxMXaWRwLnViLnVuaS1mcmFua2Z1cnQuZGUwggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDZe39hckwxZcNK8aq2xIs712ekjHp4
-QlSkr4Z1/tOsqwH16in0Iv48CjsLa/zrI3kIKSJYdPmedeu2/WrG/gDRUook/31z
-nIyKUyp/4S+l88ppH2Hc6lcM48hsr+5n2AwlJWXIonvasqRb78j8XdDTSwvmRh//
-2nJmiN4HYLzjF1aV3OJtHeBaIH+LOKw/AHS2ACpjtxUT3g2BItEKrfr8EFWwR9Rt
-hlmUUW9jfNYLg1ZPThvwSnTzaMAw8Lsz/q8s+oH/F3WOtQjLAxhOQlIjt1xif1hp
-AZOGcqIz88VLRBpnUel7Ywf+ZQjC6HdVfGEOZFq4iXh1VQT8dWx5O45lAgMBAAGj
-ggJdMIICWTA5BgNVHSAEMjAwMBEGDysGAQQBga0hgiwBAQQDADARBg8rBgEEAYGt
-IYIsAgEEAwAwCAYGZ4EMAQICMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgXgMB0GA1Ud
-JQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATAdBgNVHQ4EFgQUyfr2wQy7BCFfMtLo
-dF+y6oIYKzQwHwYDVR0jBBgwFoAUY1l3sUZv4earr8LHk/9fcQ1P4P8wNwYDVR0R
-BDAwLoIXaWRwLnViLnVuaS1mcmFua2Z1cnQuZGWBE2NhQHVuaS1mcmFua2Z1cnQu
-ZGUwgY0GA1UdHwSBhTCBgjA/oD2gO4Y5aHR0cDovL2NkcDEucGNhLmRmbi5kZS91
-bmktZnJhbmtmdXJ0LWNhL3B1Yi9jcmwvY2FjcmwuY3JsMD+gPaA7hjlodHRwOi8v
-Y2RwMi5wY2EuZGZuLmRlL3VuaS1mcmFua2Z1cnQtY2EvcHViL2NybC9jYWNybC5j
-cmwwgdsGCCsGAQUFBwEBBIHOMIHLMDMGCCsGAQUFBzABhidodHRwOi8vb2NzcC5w
-Y2EuZGZuLmRlL09DU1AtU2VydmVyL09DU1AwSQYIKwYBBQUHMAKGPWh0dHA6Ly9j
-ZHAxLnBjYS5kZm4uZGUvdW5pLWZyYW5rZnVydC1jYS9wdWIvY2FjZXJ0L2NhY2Vy
-dC5jcnQwSQYIKwYBBQUHMAKGPWh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvdW5pLWZy
-YW5rZnVydC1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwDQYJKoZIhvcNAQEFBQAD
-ggEBAE/mmrj5ekBv1t9rmWIjiAI6fPSvDBd6nGOo5d79icawLK4tHL9idFql8yfS
-zzaWc3AnXXpStqfiWpLlG0grdxEd7hr1KC1/tRQssglgAgaCpCgfuXof6G+Bm1Kj
-PoCd7dl2t3vrbr+9UseeoeZtOppwuSE1IwGjL698U7P/qWzVcqbtt31OwobYg+Ae
-qYGUkYlhILk5ebLbSLy7NjfiHxRh2MU+U4LHmRDOHq64S7NDvy+Ph97wnToRY3IG
-TiKgdY5G49KSG5nGvKH7h/PjrkldHzhRR0eo1hpcrS2I84epUs7bQNQn33Shlfpj
-L3AVMrfe165uaW2pn5pinAUyFec=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ub.uni-frankfurt.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ub.uni-frankfurt.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">e35</OrganizationName>
-    <OrganizationName xml:lang="en">e35</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">Johann Wolfgang Goethe-Universität Frankfurt am Main</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">Johann Wolfgang Goethe-Universität Frankfurt am Main</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.uni-frankfurt.de</OrganizationURL>
-    <OrganizationURL xml:lang="en">http://www.uni-frankfurt.de</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Axel</GivenName>
-    <SurName>Doerrer</SurName>
-    <EmailAddress>mailto:a.doerrer@ub.uni-frankfurt.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="support">
-    <GivenName>Axel</GivenName>
-    <SurName>Doerrer</SurName>
-    <EmailAddress>mailto:a.doerrer@ub.uni-frankfurt.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 24ff9a9c..00000000
--- a/swamid-interfederations-2.0/idp.hebis.de.xml
+++ /dev/null
@@ -1,147 +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">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2014-08-11T07:07:20Z">
-      <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-frankfurt.de</saml1md:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="de">Universität Frankfurt</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Universität Frankfurt</mdui:DisplayName>
-        <mdui:Description xml:lang="de">Identity Provider der Johann Wolfgang Goethe Universität Frankfurt am Main</mdui:Description>
-        <mdui:Description xml:lang="en">Identity Provider of the Johann Wolfgang Goethe Universität Frankfurt am Main</mdui:Description>
-        <mdui:InformationURL xml:lang="de">http://www.uni-frankfurt.de/de?locale=de</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">http://www.uni-frankfurt.de/en?locale=en</mdui:InformationURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.ub.uni-frankfurt.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.ub.uni-frankfurt.de,OU=Hochschulrechenzentrum,O=Johann Wolfgang Goethe-Universitaet Frankfurt am Main,L=Frankfurt am Main,ST=Hessen,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIGQDCCBSigAwIBAgIHFbRIGOhJnDANBgkqhkiG9w0BAQUFADCBoTELMAkGA1UE
-BhMCREUxDzANBgNVBAgTBkhlc3NlbjEaMBgGA1UEBxMRRnJhbmtmdXJ0IGFtIE1h
-aW4xLDAqBgNVBAoTI0pvaGFubiBXb2xmZ2FuZyBHb2V0aGUtVW5pdmVyc2l0YWV0
-MRMwEQYDVQQDEwpVTkktRkZNIENBMSIwIAYJKoZIhvcNAQkBFhNjYUB1bmktZnJh
-bmtmdXJ0LmRlMB4XDTEzMDUxNjEyMDExMloXDTE4MDUxNTEyMDExMlowgb0xCzAJ
-BgNVBAYTAkRFMQ8wDQYDVQQIEwZIZXNzZW4xGjAYBgNVBAcTEUZyYW5rZnVydCBh
-bSBNYWluMT4wPAYDVQQKEzVKb2hhbm4gV29sZmdhbmcgR29ldGhlLVVuaXZlcnNp
-dGFldCBGcmFua2Z1cnQgYW0gTWFpbjEfMB0GA1UECxMWSG9jaHNjaHVscmVjaGVu
-emVudHJ1bTEgMB4GA1UEAxMXaWRwLnViLnVuaS1mcmFua2Z1cnQuZGUwggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDZe39hckwxZcNK8aq2xIs712ekjHp4
-QlSkr4Z1/tOsqwH16in0Iv48CjsLa/zrI3kIKSJYdPmedeu2/WrG/gDRUook/31z
-nIyKUyp/4S+l88ppH2Hc6lcM48hsr+5n2AwlJWXIonvasqRb78j8XdDTSwvmRh//
-2nJmiN4HYLzjF1aV3OJtHeBaIH+LOKw/AHS2ACpjtxUT3g2BItEKrfr8EFWwR9Rt
-hlmUUW9jfNYLg1ZPThvwSnTzaMAw8Lsz/q8s+oH/F3WOtQjLAxhOQlIjt1xif1hp
-AZOGcqIz88VLRBpnUel7Ywf+ZQjC6HdVfGEOZFq4iXh1VQT8dWx5O45lAgMBAAGj
-ggJdMIICWTA5BgNVHSAEMjAwMBEGDysGAQQBga0hgiwBAQQDADARBg8rBgEEAYGt
-IYIsAgEEAwAwCAYGZ4EMAQICMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgXgMB0GA1Ud
-JQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATAdBgNVHQ4EFgQUyfr2wQy7BCFfMtLo
-dF+y6oIYKzQwHwYDVR0jBBgwFoAUY1l3sUZv4earr8LHk/9fcQ1P4P8wNwYDVR0R
-BDAwLoIXaWRwLnViLnVuaS1mcmFua2Z1cnQuZGWBE2NhQHVuaS1mcmFua2Z1cnQu
-ZGUwgY0GA1UdHwSBhTCBgjA/oD2gO4Y5aHR0cDovL2NkcDEucGNhLmRmbi5kZS91
-bmktZnJhbmtmdXJ0LWNhL3B1Yi9jcmwvY2FjcmwuY3JsMD+gPaA7hjlodHRwOi8v
-Y2RwMi5wY2EuZGZuLmRlL3VuaS1mcmFua2Z1cnQtY2EvcHViL2NybC9jYWNybC5j
-cmwwgdsGCCsGAQUFBwEBBIHOMIHLMDMGCCsGAQUFBzABhidodHRwOi8vb2NzcC5w
-Y2EuZGZuLmRlL09DU1AtU2VydmVyL09DU1AwSQYIKwYBBQUHMAKGPWh0dHA6Ly9j
-ZHAxLnBjYS5kZm4uZGUvdW5pLWZyYW5rZnVydC1jYS9wdWIvY2FjZXJ0L2NhY2Vy
-dC5jcnQwSQYIKwYBBQUHMAKGPWh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvdW5pLWZy
-YW5rZnVydC1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwDQYJKoZIhvcNAQEFBQAD
-ggEBAE/mmrj5ekBv1t9rmWIjiAI6fPSvDBd6nGOo5d79icawLK4tHL9idFql8yfS
-zzaWc3AnXXpStqfiWpLlG0grdxEd7hr1KC1/tRQssglgAgaCpCgfuXof6G+Bm1Kj
-PoCd7dl2t3vrbr+9UseeoeZtOppwuSE1IwGjL698U7P/qWzVcqbtt31OwobYg+Ae
-qYGUkYlhILk5ebLbSLy7NjfiHxRh2MU+U4LHmRDOHq64S7NDvy+Ph97wnToRY3IG
-TiKgdY5G49KSG5nGvKH7h/PjrkldHzhRR0eo1hpcrS2I84epUs7bQNQn33Shlfpj
-L3AVMrfe165uaW2pn5pinAUyFec=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ub.uni-frankfurt.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ub.uni-frankfurt.de:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ub.uni-frankfurt.de/idp/profile/SAML2/Redirect/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ub.uni-frankfurt.de/idp/profile/SAML2/POST/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ub.uni-frankfurt.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://idp.ub.uni-frankfurt.de/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ub.uni-frankfurt.de/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.ub.uni-frankfurt.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ub.uni-frankfurt.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-frankfurt.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.ub.uni-frankfurt.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.ub.uni-frankfurt.de,OU=Hochschulrechenzentrum,O=Johann Wolfgang Goethe-Universitaet Frankfurt am Main,L=Frankfurt am Main,ST=Hessen,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIGQDCCBSigAwIBAgIHFbRIGOhJnDANBgkqhkiG9w0BAQUFADCBoTELMAkGA1UE
-BhMCREUxDzANBgNVBAgTBkhlc3NlbjEaMBgGA1UEBxMRRnJhbmtmdXJ0IGFtIE1h
-aW4xLDAqBgNVBAoTI0pvaGFubiBXb2xmZ2FuZyBHb2V0aGUtVW5pdmVyc2l0YWV0
-MRMwEQYDVQQDEwpVTkktRkZNIENBMSIwIAYJKoZIhvcNAQkBFhNjYUB1bmktZnJh
-bmtmdXJ0LmRlMB4XDTEzMDUxNjEyMDExMloXDTE4MDUxNTEyMDExMlowgb0xCzAJ
-BgNVBAYTAkRFMQ8wDQYDVQQIEwZIZXNzZW4xGjAYBgNVBAcTEUZyYW5rZnVydCBh
-bSBNYWluMT4wPAYDVQQKEzVKb2hhbm4gV29sZmdhbmcgR29ldGhlLVVuaXZlcnNp
-dGFldCBGcmFua2Z1cnQgYW0gTWFpbjEfMB0GA1UECxMWSG9jaHNjaHVscmVjaGVu
-emVudHJ1bTEgMB4GA1UEAxMXaWRwLnViLnVuaS1mcmFua2Z1cnQuZGUwggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDZe39hckwxZcNK8aq2xIs712ekjHp4
-QlSkr4Z1/tOsqwH16in0Iv48CjsLa/zrI3kIKSJYdPmedeu2/WrG/gDRUook/31z
-nIyKUyp/4S+l88ppH2Hc6lcM48hsr+5n2AwlJWXIonvasqRb78j8XdDTSwvmRh//
-2nJmiN4HYLzjF1aV3OJtHeBaIH+LOKw/AHS2ACpjtxUT3g2BItEKrfr8EFWwR9Rt
-hlmUUW9jfNYLg1ZPThvwSnTzaMAw8Lsz/q8s+oH/F3WOtQjLAxhOQlIjt1xif1hp
-AZOGcqIz88VLRBpnUel7Ywf+ZQjC6HdVfGEOZFq4iXh1VQT8dWx5O45lAgMBAAGj
-ggJdMIICWTA5BgNVHSAEMjAwMBEGDysGAQQBga0hgiwBAQQDADARBg8rBgEEAYGt
-IYIsAgEEAwAwCAYGZ4EMAQICMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgXgMB0GA1Ud
-JQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATAdBgNVHQ4EFgQUyfr2wQy7BCFfMtLo
-dF+y6oIYKzQwHwYDVR0jBBgwFoAUY1l3sUZv4earr8LHk/9fcQ1P4P8wNwYDVR0R
-BDAwLoIXaWRwLnViLnVuaS1mcmFua2Z1cnQuZGWBE2NhQHVuaS1mcmFua2Z1cnQu
-ZGUwgY0GA1UdHwSBhTCBgjA/oD2gO4Y5aHR0cDovL2NkcDEucGNhLmRmbi5kZS91
-bmktZnJhbmtmdXJ0LWNhL3B1Yi9jcmwvY2FjcmwuY3JsMD+gPaA7hjlodHRwOi8v
-Y2RwMi5wY2EuZGZuLmRlL3VuaS1mcmFua2Z1cnQtY2EvcHViL2NybC9jYWNybC5j
-cmwwgdsGCCsGAQUFBwEBBIHOMIHLMDMGCCsGAQUFBzABhidodHRwOi8vb2NzcC5w
-Y2EuZGZuLmRlL09DU1AtU2VydmVyL09DU1AwSQYIKwYBBQUHMAKGPWh0dHA6Ly9j
-ZHAxLnBjYS5kZm4uZGUvdW5pLWZyYW5rZnVydC1jYS9wdWIvY2FjZXJ0L2NhY2Vy
-dC5jcnQwSQYIKwYBBQUHMAKGPWh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvdW5pLWZy
-YW5rZnVydC1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwDQYJKoZIhvcNAQEFBQAD
-ggEBAE/mmrj5ekBv1t9rmWIjiAI6fPSvDBd6nGOo5d79icawLK4tHL9idFql8yfS
-zzaWc3AnXXpStqfiWpLlG0grdxEd7hr1KC1/tRQssglgAgaCpCgfuXof6G+Bm1Kj
-PoCd7dl2t3vrbr+9UseeoeZtOppwuSE1IwGjL698U7P/qWzVcqbtt31OwobYg+Ae
-qYGUkYlhILk5ebLbSLy7NjfiHxRh2MU+U4LHmRDOHq64S7NDvy+Ph97wnToRY3IG
-TiKgdY5G49KSG5nGvKH7h/PjrkldHzhRR0eo1hpcrS2I84epUs7bQNQn33Shlfpj
-L3AVMrfe165uaW2pn5pinAUyFec=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ub.uni-frankfurt.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ub.uni-frankfurt.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">e35</OrganizationName>
-    <OrganizationName xml:lang="en">e35</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">Johann Wolfgang Goethe-Universität Frankfurt am Main</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">Johann Wolfgang Goethe-Universität Frankfurt am Main</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.uni-frankfurt.de</OrganizationURL>
-    <OrganizationURL xml:lang="en">http://www.uni-frankfurt.de</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Axel</GivenName>
-    <SurName>Doerrer</SurName>
-    <EmailAddress>mailto:a.doerrer@ub.uni-frankfurt.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="support">
-    <GivenName>Axel</GivenName>
-    <SurName>Doerrer</SurName>
-    <EmailAddress>mailto:a.doerrer@ub.uni-frankfurt.de</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.hesam.eu-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.hesam.eu-idp-shibboleth.xml
deleted file mode 100644
index f557f568..00000000
--- a/swamid-interfederations-2.0/idp.hesam.eu-idp-shibboleth.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://idp.hesam.eu/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2013-04-22T13:40:54Z">
-      <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">hesam.eu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">PRES HESAM - Hautes Etudes-Sorbonne-Arts et Métiers</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDGzCCAgOgAwIBAgIUcOyBUfV1JWYkzdfbAaltfBkAukQwDQYJKoZIhvcNAQEF
-BQAwFzEVMBMGA1UEAxMMaWRwLmhlc2FtLmV1MB4XDTEzMDQwNTE2MDMzNloXDTMz
-MDQwNTE2MDMzNlowFzEVMBMGA1UEAxMMaWRwLmhlc2FtLmV1MIIBIjANBgkqhkiG
-9w0BAQEFAAOCAQ8AMIIBCgKCAQEAhQP48nRAAh9b78ybhUcTpuXHSXmC2m1hHwqF
-B2jJjgVlHTZTjLa2s95aIgeAt4lwJhlJ7RxZDxj+udG9840FkRAwbvuiufgRmR05
-q+VX2+eejxe1fyP+5XsNA7dUcvCp3wMurRK3f0Z/x3sMEIlh/Nh0pB9fVqwi6TtD
-gyRayTuCFu6wnH1oGhhu6Edrihn4OTJBvUR0vqrg98SY3S1FsYB9OhV03U7vbwfV
-J9sVPu8vbYkbofXuDPpaKdIMYzFWMNIZnnkZvSBY1C6fa/f4pCmwcVBpOjlEW2fA
-1Zj9cxnu8MIhYY6CVV3d0IVrmvXeK9IprM7ixfME59XVnsy4jQIDAQABo18wXTA8
-BgNVHREENTAzggxpZHAuaGVzYW0uZXWGI2h0dHBzOi8vaWRwLmhlc2FtLmV1L2lk
-cC9zaGliYm9sZXRoMB0GA1UdDgQWBBRLm+HxjRffot5ojMgT+q8252oBfDANBgkq
-hkiG9w0BAQUFAAOCAQEAg9CezjS15qvJOTpkIEzGHkk2LfKKqbExgWshU8yYPHlo
-Wefs+Gdj4NEtJy28RYM59KgPG+KvC6xog3l0ZL1CVIx8Xch1rZDSeNUvgUAvbrPu
-UWNzsjEbT22QkvcbyW1vi3/ZgSJg909nvH2GBqASWokEIT7VC30Un+mrEsffqFuZ
-fJe5PTSZ3SGmR0yPPTVQpLqbYLVdWBhE46JP84qFZlsZomBnoVRlCSURARHgJIcF
-q4+smXBAWAFRltJUEQ7hjQKaNCKApYnAdWReOTEhkMkVZZNqbkFYSSeQ1cxlabLV
-3usSDArcclPgsgS25qfJ4XUmUJadJhyAZIJ9zluU0Q==
-					    </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://idp.hesam.eu/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.hesam.eu/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.hesam.eu/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">hesam.eu</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDGzCCAgOgAwIBAgIUcOyBUfV1JWYkzdfbAaltfBkAukQwDQYJKoZIhvcNAQEF
-BQAwFzEVMBMGA1UEAxMMaWRwLmhlc2FtLmV1MB4XDTEzMDQwNTE2MDMzNloXDTMz
-MDQwNTE2MDMzNlowFzEVMBMGA1UEAxMMaWRwLmhlc2FtLmV1MIIBIjANBgkqhkiG
-9w0BAQEFAAOCAQ8AMIIBCgKCAQEAhQP48nRAAh9b78ybhUcTpuXHSXmC2m1hHwqF
-B2jJjgVlHTZTjLa2s95aIgeAt4lwJhlJ7RxZDxj+udG9840FkRAwbvuiufgRmR05
-q+VX2+eejxe1fyP+5XsNA7dUcvCp3wMurRK3f0Z/x3sMEIlh/Nh0pB9fVqwi6TtD
-gyRayTuCFu6wnH1oGhhu6Edrihn4OTJBvUR0vqrg98SY3S1FsYB9OhV03U7vbwfV
-J9sVPu8vbYkbofXuDPpaKdIMYzFWMNIZnnkZvSBY1C6fa/f4pCmwcVBpOjlEW2fA
-1Zj9cxnu8MIhYY6CVV3d0IVrmvXeK9IprM7ixfME59XVnsy4jQIDAQABo18wXTA8
-BgNVHREENTAzggxpZHAuaGVzYW0uZXWGI2h0dHBzOi8vaWRwLmhlc2FtLmV1L2lk
-cC9zaGliYm9sZXRoMB0GA1UdDgQWBBRLm+HxjRffot5ojMgT+q8252oBfDANBgkq
-hkiG9w0BAQUFAAOCAQEAg9CezjS15qvJOTpkIEzGHkk2LfKKqbExgWshU8yYPHlo
-Wefs+Gdj4NEtJy28RYM59KgPG+KvC6xog3l0ZL1CVIx8Xch1rZDSeNUvgUAvbrPu
-UWNzsjEbT22QkvcbyW1vi3/ZgSJg909nvH2GBqASWokEIT7VC30Un+mrEsffqFuZ
-fJe5PTSZ3SGmR0yPPTVQpLqbYLVdWBhE46JP84qFZlsZomBnoVRlCSURARHgJIcF
-q4+smXBAWAFRltJUEQ7hjQKaNCKApYnAdWReOTEhkMkVZZNqbkFYSSeQ1cxlabLV
-3usSDArcclPgsgS25qfJ4XUmUJadJhyAZIJ9zluU0Q==
-					    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.hesam.eu/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">PRES HESAM - Hautes Etudes-Sorbonne-Arts et Métiers</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">PRES HESAM - Hautes Etudes-Sorbonne-Arts et Métiers</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <EmailAddress>fed-admin@univ-paris1.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.hesam.eu.xml b/swamid-interfederations-2.0/idp.hesam.eu.xml
deleted file mode 100644
index f557f568..00000000
--- a/swamid-interfederations-2.0/idp.hesam.eu.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://idp.hesam.eu/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2013-04-22T13:40:54Z">
-      <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">hesam.eu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">PRES HESAM - Hautes Etudes-Sorbonne-Arts et Métiers</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDGzCCAgOgAwIBAgIUcOyBUfV1JWYkzdfbAaltfBkAukQwDQYJKoZIhvcNAQEF
-BQAwFzEVMBMGA1UEAxMMaWRwLmhlc2FtLmV1MB4XDTEzMDQwNTE2MDMzNloXDTMz
-MDQwNTE2MDMzNlowFzEVMBMGA1UEAxMMaWRwLmhlc2FtLmV1MIIBIjANBgkqhkiG
-9w0BAQEFAAOCAQ8AMIIBCgKCAQEAhQP48nRAAh9b78ybhUcTpuXHSXmC2m1hHwqF
-B2jJjgVlHTZTjLa2s95aIgeAt4lwJhlJ7RxZDxj+udG9840FkRAwbvuiufgRmR05
-q+VX2+eejxe1fyP+5XsNA7dUcvCp3wMurRK3f0Z/x3sMEIlh/Nh0pB9fVqwi6TtD
-gyRayTuCFu6wnH1oGhhu6Edrihn4OTJBvUR0vqrg98SY3S1FsYB9OhV03U7vbwfV
-J9sVPu8vbYkbofXuDPpaKdIMYzFWMNIZnnkZvSBY1C6fa/f4pCmwcVBpOjlEW2fA
-1Zj9cxnu8MIhYY6CVV3d0IVrmvXeK9IprM7ixfME59XVnsy4jQIDAQABo18wXTA8
-BgNVHREENTAzggxpZHAuaGVzYW0uZXWGI2h0dHBzOi8vaWRwLmhlc2FtLmV1L2lk
-cC9zaGliYm9sZXRoMB0GA1UdDgQWBBRLm+HxjRffot5ojMgT+q8252oBfDANBgkq
-hkiG9w0BAQUFAAOCAQEAg9CezjS15qvJOTpkIEzGHkk2LfKKqbExgWshU8yYPHlo
-Wefs+Gdj4NEtJy28RYM59KgPG+KvC6xog3l0ZL1CVIx8Xch1rZDSeNUvgUAvbrPu
-UWNzsjEbT22QkvcbyW1vi3/ZgSJg909nvH2GBqASWokEIT7VC30Un+mrEsffqFuZ
-fJe5PTSZ3SGmR0yPPTVQpLqbYLVdWBhE46JP84qFZlsZomBnoVRlCSURARHgJIcF
-q4+smXBAWAFRltJUEQ7hjQKaNCKApYnAdWReOTEhkMkVZZNqbkFYSSeQ1cxlabLV
-3usSDArcclPgsgS25qfJ4XUmUJadJhyAZIJ9zluU0Q==
-					    </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://idp.hesam.eu/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.hesam.eu/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.hesam.eu/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">hesam.eu</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDGzCCAgOgAwIBAgIUcOyBUfV1JWYkzdfbAaltfBkAukQwDQYJKoZIhvcNAQEF
-BQAwFzEVMBMGA1UEAxMMaWRwLmhlc2FtLmV1MB4XDTEzMDQwNTE2MDMzNloXDTMz
-MDQwNTE2MDMzNlowFzEVMBMGA1UEAxMMaWRwLmhlc2FtLmV1MIIBIjANBgkqhkiG
-9w0BAQEFAAOCAQ8AMIIBCgKCAQEAhQP48nRAAh9b78ybhUcTpuXHSXmC2m1hHwqF
-B2jJjgVlHTZTjLa2s95aIgeAt4lwJhlJ7RxZDxj+udG9840FkRAwbvuiufgRmR05
-q+VX2+eejxe1fyP+5XsNA7dUcvCp3wMurRK3f0Z/x3sMEIlh/Nh0pB9fVqwi6TtD
-gyRayTuCFu6wnH1oGhhu6Edrihn4OTJBvUR0vqrg98SY3S1FsYB9OhV03U7vbwfV
-J9sVPu8vbYkbofXuDPpaKdIMYzFWMNIZnnkZvSBY1C6fa/f4pCmwcVBpOjlEW2fA
-1Zj9cxnu8MIhYY6CVV3d0IVrmvXeK9IprM7ixfME59XVnsy4jQIDAQABo18wXTA8
-BgNVHREENTAzggxpZHAuaGVzYW0uZXWGI2h0dHBzOi8vaWRwLmhlc2FtLmV1L2lk
-cC9zaGliYm9sZXRoMB0GA1UdDgQWBBRLm+HxjRffot5ojMgT+q8252oBfDANBgkq
-hkiG9w0BAQUFAAOCAQEAg9CezjS15qvJOTpkIEzGHkk2LfKKqbExgWshU8yYPHlo
-Wefs+Gdj4NEtJy28RYM59KgPG+KvC6xog3l0ZL1CVIx8Xch1rZDSeNUvgUAvbrPu
-UWNzsjEbT22QkvcbyW1vi3/ZgSJg909nvH2GBqASWokEIT7VC30Un+mrEsffqFuZ
-fJe5PTSZ3SGmR0yPPTVQpLqbYLVdWBhE46JP84qFZlsZomBnoVRlCSURARHgJIcF
-q4+smXBAWAFRltJUEQ7hjQKaNCKApYnAdWReOTEhkMkVZZNqbkFYSSeQ1cxlabLV
-3usSDArcclPgsgS25qfJ4XUmUJadJhyAZIJ9zluU0Q==
-					    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.hesam.eu/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">PRES HESAM - Hautes Etudes-Sorbonne-Arts et Métiers</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">PRES HESAM - Hautes Etudes-Sorbonne-Arts et Métiers</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <EmailAddress>fed-admin@univ-paris1.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.hig.se-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.hig.se-idp-shibboleth.xml
deleted file mode 100644
index 39d32d74..00000000
--- a/swamid-interfederations-2.0/idp.hig.se-idp-shibboleth.xml
+++ /dev/null
@@ -1,125 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.hig.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">hig.se</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="sv">Högskolan i Gävle</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">University of Gävle</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Identity Provider för anställda och studenter vid Högskolan i Gävle.</mdui:Description>
-        <mdui:Description xml:lang="en">The University of Gävle Identity Provider is used by employees and students at the university.</mdui:Description>
-        <mdui:Logo height="94" width="83">https://webkonto.student.hig.se/head/loggaengelska.png</mdui:Logo>
-        <mdui:Logo height="94" width="83" xml:lang="sv">https://webkonto.student.hig.se/head/logga3.png</mdui:Logo>
-        <mdui:Logo height="94" width="83" xml:lang="en">https://webkonto.student.hig.se/head/loggaengelska.png</mdui:Logo>
-        <mdui:Keywords xml:lang="sv">gävle gavle hig</mdui:Keywords>
-        <mdui:Keywords xml:lang="en">gävle gavle hig</mdui:Keywords>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DomainHint>hig.se</mdui:DomainHint>
-        <mdui:IPHint>130.243.0.0/20</mdui:IPHint>
-        <mdui:IPHint>193.11.48.0/20</mdui:IPHint>
-        <mdui:IPHint>193.10.163.0/24</mdui:IPHint>
-        <mdui:IPHint>2001:6b0:23::/48</mdui:IPHint>
-        <mdui:GeolocationHint>geo:60.6692,17.1191</mdui:GeolocationHint>
-      </mdui:DiscoHints>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDFDCCAfygAwIBAgIVAKDMK5kO5prtSxBh3prGd9azJDLHMA0GCSqGSIb3DQEB
-BQUAMBUxEzARBgNVBAMTCmlkcC5oaWcuc2UwHhcNMTEwOTE5MTAxMzEzWhcNMzEw
-OTE5MTAxMzEzWjAVMRMwEQYDVQQDEwppZHAuaGlnLnNlMIIBIjANBgkqhkiG9w0B
-AQEFAAOCAQ8AMIIBCgKCAQEAlS0UltW/Niciy2s+KZOXcxBUBhRIwIltiARUzK8l
-/HHgfhDVadKCF6jFS8kYvWSTPGJbPQVtk14WXapOOlSFiUcDAI7JxN4G7wLJZjPc
-VUBIfedZYwzsTGc3XlHYOn6nBGBYIqG/OPHDA39khu/DiMVBoC4iXX7dnKIyLHXX
-ucuhlB3XpBajgzgkPTjp8kJbI0EeTtHn2JenpogOy8+I8mnEveL0p8WWuXr2Ij63
-/+ePtc49AQgEXMgTusGfhQZNqR016I9P32ycF49t4S0Ur2hkv7gm9qL8RwWFN8jH
-YonG4K5Xc7O4T6Q60e+/PDdyf5Po25O3im+aTPMzkEIqwwIDAQABo1swWTA4BgNV
-HREEMTAvggppZHAuaGlnLnNlhiFodHRwczovL2lkcC5oaWcuc2UvaWRwL3NoaWJi
-b2xldGgwHQYDVR0OBBYEFNkNbupRD08lWx3ys8A/KEqKGJtDMA0GCSqGSIb3DQEB
-BQUAA4IBAQBLzzCPKLm+PSGXcyFoM13yGUzhaATV3x1aABalp73Ps22j2BZay5Xq
-exByQFZFJoU279mh6CLTDch679S9WyI0WxQM41jV5mYOv5mllRLEiKMTG3slyyQN
-8P7rBL5OM2DusxFHCCturTlDjnafpybukqOd/YlaRoGeZuhQnzmxx0si07C9pwN4
-SdzIT7rVQJAvwjSNWMoepX0tboWAHFTdbvxEstnlFyi6Vibw5oTy34UxXVP2EmA8
-otLAA/GPqLtaaQ1u9fpDcdN5GjkHR1QyYN/UhhF0iXczvUp4o/D0ELbtdBPA5Rwf
-+eeRni4ggtByVTzg9fALQjDJydWcw0Oy
-
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.hig.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.hig.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://idp.hig.se/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.hig.se/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.hig.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.hig.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">hig.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDFDCCAfygAwIBAgIVAKDMK5kO5prtSxBh3prGd9azJDLHMA0GCSqGSIb3DQEB
-BQUAMBUxEzARBgNVBAMTCmlkcC5oaWcuc2UwHhcNMTEwOTE5MTAxMzEzWhcNMzEw
-OTE5MTAxMzEzWjAVMRMwEQYDVQQDEwppZHAuaGlnLnNlMIIBIjANBgkqhkiG9w0B
-AQEFAAOCAQ8AMIIBCgKCAQEAlS0UltW/Niciy2s+KZOXcxBUBhRIwIltiARUzK8l
-/HHgfhDVadKCF6jFS8kYvWSTPGJbPQVtk14WXapOOlSFiUcDAI7JxN4G7wLJZjPc
-VUBIfedZYwzsTGc3XlHYOn6nBGBYIqG/OPHDA39khu/DiMVBoC4iXX7dnKIyLHXX
-ucuhlB3XpBajgzgkPTjp8kJbI0EeTtHn2JenpogOy8+I8mnEveL0p8WWuXr2Ij63
-/+ePtc49AQgEXMgTusGfhQZNqR016I9P32ycF49t4S0Ur2hkv7gm9qL8RwWFN8jH
-YonG4K5Xc7O4T6Q60e+/PDdyf5Po25O3im+aTPMzkEIqwwIDAQABo1swWTA4BgNV
-HREEMTAvggppZHAuaGlnLnNlhiFodHRwczovL2lkcC5oaWcuc2UvaWRwL3NoaWJi
-b2xldGgwHQYDVR0OBBYEFNkNbupRD08lWx3ys8A/KEqKGJtDMA0GCSqGSIb3DQEB
-BQUAA4IBAQBLzzCPKLm+PSGXcyFoM13yGUzhaATV3x1aABalp73Ps22j2BZay5Xq
-exByQFZFJoU279mh6CLTDch679S9WyI0WxQM41jV5mYOv5mllRLEiKMTG3slyyQN
-8P7rBL5OM2DusxFHCCturTlDjnafpybukqOd/YlaRoGeZuhQnzmxx0si07C9pwN4
-SdzIT7rVQJAvwjSNWMoepX0tboWAHFTdbvxEstnlFyi6Vibw5oTy34UxXVP2EmA8
-otLAA/GPqLtaaQ1u9fpDcdN5GjkHR1QyYN/UhhF0iXczvUp4o/D0ELbtdBPA5Rwf
-+eeRni4ggtByVTzg9fALQjDJydWcw0Oy
-
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.hig.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.hig.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">HIG</OrganizationName>
-    <OrganizationDisplayName xml:lang="sv">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="administrative">
-    <Company>University of Gävle</Company>
-    <SurName>Network Operations</SurName>
-    <EmailAddress>nat@hig.se</EmailAddress>
-    <TelephoneNumber>+46 26 648500</TelephoneNumber>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
-    <Company>University of Gävle</Company>
-    <SurName>Operations</SurName>
-    <EmailAddress>nat@hig.se</EmailAddress>
-    <TelephoneNumber>+46 26 648500</TelephoneNumber>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
-    <Company>University of Gävle</Company>
-    <SurName>IT Support</SurName>
-    <EmailAddress>itsupport@hig.se</EmailAddress>
-    <TelephoneNumber>+46 26 648500</TelephoneNumber>
-  </ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.hig.se.xml b/swamid-interfederations-2.0/idp.hig.se.xml
deleted file mode 100644
index 39d32d74..00000000
--- a/swamid-interfederations-2.0/idp.hig.se.xml
+++ /dev/null
@@ -1,125 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.hig.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">hig.se</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="sv">Högskolan i Gävle</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">University of Gävle</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Identity Provider för anställda och studenter vid Högskolan i Gävle.</mdui:Description>
-        <mdui:Description xml:lang="en">The University of Gävle Identity Provider is used by employees and students at the university.</mdui:Description>
-        <mdui:Logo height="94" width="83">https://webkonto.student.hig.se/head/loggaengelska.png</mdui:Logo>
-        <mdui:Logo height="94" width="83" xml:lang="sv">https://webkonto.student.hig.se/head/logga3.png</mdui:Logo>
-        <mdui:Logo height="94" width="83" xml:lang="en">https://webkonto.student.hig.se/head/loggaengelska.png</mdui:Logo>
-        <mdui:Keywords xml:lang="sv">gävle gavle hig</mdui:Keywords>
-        <mdui:Keywords xml:lang="en">gävle gavle hig</mdui:Keywords>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DomainHint>hig.se</mdui:DomainHint>
-        <mdui:IPHint>130.243.0.0/20</mdui:IPHint>
-        <mdui:IPHint>193.11.48.0/20</mdui:IPHint>
-        <mdui:IPHint>193.10.163.0/24</mdui:IPHint>
-        <mdui:IPHint>2001:6b0:23::/48</mdui:IPHint>
-        <mdui:GeolocationHint>geo:60.6692,17.1191</mdui:GeolocationHint>
-      </mdui:DiscoHints>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDFDCCAfygAwIBAgIVAKDMK5kO5prtSxBh3prGd9azJDLHMA0GCSqGSIb3DQEB
-BQUAMBUxEzARBgNVBAMTCmlkcC5oaWcuc2UwHhcNMTEwOTE5MTAxMzEzWhcNMzEw
-OTE5MTAxMzEzWjAVMRMwEQYDVQQDEwppZHAuaGlnLnNlMIIBIjANBgkqhkiG9w0B
-AQEFAAOCAQ8AMIIBCgKCAQEAlS0UltW/Niciy2s+KZOXcxBUBhRIwIltiARUzK8l
-/HHgfhDVadKCF6jFS8kYvWSTPGJbPQVtk14WXapOOlSFiUcDAI7JxN4G7wLJZjPc
-VUBIfedZYwzsTGc3XlHYOn6nBGBYIqG/OPHDA39khu/DiMVBoC4iXX7dnKIyLHXX
-ucuhlB3XpBajgzgkPTjp8kJbI0EeTtHn2JenpogOy8+I8mnEveL0p8WWuXr2Ij63
-/+ePtc49AQgEXMgTusGfhQZNqR016I9P32ycF49t4S0Ur2hkv7gm9qL8RwWFN8jH
-YonG4K5Xc7O4T6Q60e+/PDdyf5Po25O3im+aTPMzkEIqwwIDAQABo1swWTA4BgNV
-HREEMTAvggppZHAuaGlnLnNlhiFodHRwczovL2lkcC5oaWcuc2UvaWRwL3NoaWJi
-b2xldGgwHQYDVR0OBBYEFNkNbupRD08lWx3ys8A/KEqKGJtDMA0GCSqGSIb3DQEB
-BQUAA4IBAQBLzzCPKLm+PSGXcyFoM13yGUzhaATV3x1aABalp73Ps22j2BZay5Xq
-exByQFZFJoU279mh6CLTDch679S9WyI0WxQM41jV5mYOv5mllRLEiKMTG3slyyQN
-8P7rBL5OM2DusxFHCCturTlDjnafpybukqOd/YlaRoGeZuhQnzmxx0si07C9pwN4
-SdzIT7rVQJAvwjSNWMoepX0tboWAHFTdbvxEstnlFyi6Vibw5oTy34UxXVP2EmA8
-otLAA/GPqLtaaQ1u9fpDcdN5GjkHR1QyYN/UhhF0iXczvUp4o/D0ELbtdBPA5Rwf
-+eeRni4ggtByVTzg9fALQjDJydWcw0Oy
-
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.hig.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.hig.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://idp.hig.se/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.hig.se/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.hig.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.hig.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">hig.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDFDCCAfygAwIBAgIVAKDMK5kO5prtSxBh3prGd9azJDLHMA0GCSqGSIb3DQEB
-BQUAMBUxEzARBgNVBAMTCmlkcC5oaWcuc2UwHhcNMTEwOTE5MTAxMzEzWhcNMzEw
-OTE5MTAxMzEzWjAVMRMwEQYDVQQDEwppZHAuaGlnLnNlMIIBIjANBgkqhkiG9w0B
-AQEFAAOCAQ8AMIIBCgKCAQEAlS0UltW/Niciy2s+KZOXcxBUBhRIwIltiARUzK8l
-/HHgfhDVadKCF6jFS8kYvWSTPGJbPQVtk14WXapOOlSFiUcDAI7JxN4G7wLJZjPc
-VUBIfedZYwzsTGc3XlHYOn6nBGBYIqG/OPHDA39khu/DiMVBoC4iXX7dnKIyLHXX
-ucuhlB3XpBajgzgkPTjp8kJbI0EeTtHn2JenpogOy8+I8mnEveL0p8WWuXr2Ij63
-/+ePtc49AQgEXMgTusGfhQZNqR016I9P32ycF49t4S0Ur2hkv7gm9qL8RwWFN8jH
-YonG4K5Xc7O4T6Q60e+/PDdyf5Po25O3im+aTPMzkEIqwwIDAQABo1swWTA4BgNV
-HREEMTAvggppZHAuaGlnLnNlhiFodHRwczovL2lkcC5oaWcuc2UvaWRwL3NoaWJi
-b2xldGgwHQYDVR0OBBYEFNkNbupRD08lWx3ys8A/KEqKGJtDMA0GCSqGSIb3DQEB
-BQUAA4IBAQBLzzCPKLm+PSGXcyFoM13yGUzhaATV3x1aABalp73Ps22j2BZay5Xq
-exByQFZFJoU279mh6CLTDch679S9WyI0WxQM41jV5mYOv5mllRLEiKMTG3slyyQN
-8P7rBL5OM2DusxFHCCturTlDjnafpybukqOd/YlaRoGeZuhQnzmxx0si07C9pwN4
-SdzIT7rVQJAvwjSNWMoepX0tboWAHFTdbvxEstnlFyi6Vibw5oTy34UxXVP2EmA8
-otLAA/GPqLtaaQ1u9fpDcdN5GjkHR1QyYN/UhhF0iXczvUp4o/D0ELbtdBPA5Rwf
-+eeRni4ggtByVTzg9fALQjDJydWcw0Oy
-
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.hig.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.hig.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">HIG</OrganizationName>
-    <OrganizationDisplayName xml:lang="sv">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="administrative">
-    <Company>University of Gävle</Company>
-    <SurName>Network Operations</SurName>
-    <EmailAddress>nat@hig.se</EmailAddress>
-    <TelephoneNumber>+46 26 648500</TelephoneNumber>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
-    <Company>University of Gävle</Company>
-    <SurName>Operations</SurName>
-    <EmailAddress>nat@hig.se</EmailAddress>
-    <TelephoneNumber>+46 26 648500</TelephoneNumber>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
-    <Company>University of Gävle</Company>
-    <SurName>IT Support</SurName>
-    <EmailAddress>itsupport@hig.se</EmailAddress>
-    <TelephoneNumber>+46 26 648500</TelephoneNumber>
-  </ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.hs-esslingen.de-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.hs-esslingen.de-idp-shibboleth.xml
deleted file mode 100644
index 1294554f..00000000
--- a/swamid-interfederations-2.0/idp.hs-esslingen.de-idp-shibboleth.xml
+++ /dev/null
@@ -1,147 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.hs-esslingen.de/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2009-12-04T16:29:14Z">
-      <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/bwidm-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>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">hs-esslingen.de</saml1md:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="de">Hochschule Esslingen</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Esslingen University of Applied Sciences</mdui:DisplayName>
-        <mdui:Description xml:lang="de">Shibboleth IDP der Hochschule Esslingen innerhalb der DFN-AAI</mdui:Description>
-        <mdui:Description xml:lang="en">Shibboleth IDP der Hochschule Esslingen innerhalb der DFN-AAI</mdui:Description>
-        <mdui:Logo height="16" width="16">https://www2.hs-esslingen.de/favicon.ico</mdui:Logo>
-        <mdui:Logo height="89" width="210">https://www2.hs-esslingen.de/rz/images/he_logo_gross_dfn-aai-metadaten.png</mdui:Logo>
-        <mdui:InformationURL xml:lang="de">http://www.hs-esslingen.de/de/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">http://www.hs-esslingen.de/en/</mdui:InformationURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.hs-esslingen.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.hs-esslingen.de,OU=Rechenzentrum,O=Hochschule Esslingen,L=Esslingen,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIF6zCCBNOgAwIBAgIHF2sVrs652TANBgkqhkiG9w0BAQUFADBaMQswCQYDVQQG
-EwJERTEdMBsGA1UEChMUSG9jaHNjaHVsZSBFc3NsaW5nZW4xFjAUBgNVBAsTDVJl
-Y2hlbnplbnRydW0xFDASBgNVBAMTC0hFIENBIC0gRzAyMB4XDTE0MDQxNDA4MTEx
-MVoXDTE3MDQxMzA4MTExMVowgZMxCzAJBgNVBAYTAkRFMRswGQYDVQQIExJCYWRl
-bi1XdWVydHRlbWJlcmcxEjAQBgNVBAcTCUVzc2xpbmdlbjEdMBsGA1UEChMUSG9j
-aHNjaHVsZSBFc3NsaW5nZW4xFjAUBgNVBAsTDVJlY2hlbnplbnRydW0xHDAaBgNV
-BAMTE2lkcC5ocy1lc3NsaW5nZW4uZGUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
-ggEKAoIBAQCspCw3S2FO3CMSrUY5r2SSxB+3lcvQmqQPc2b59fitJewh+aU+W9ja
-XJfHEn84Hp1iNovLtTE3EpKW4/zxSAhhIjUSTVMtHp69Y2EdcQ3u27vYHdCesX1F
-9/GAl7hEqzuYdJ6Bn4lbOamVH/DbfjpOS1RwpQts4eSrSGHtY09ZDr0/4P0C81SO
-uKgb7YFhMNmbgmHKGGghVxZauqpXmkoRBkT5SPRovqqqw3C7/GR5vg+XX5j1SgYi
-1nNBRldUlHHw7SlnPRuVtNs6WDODtbnkhK0rbshWtPNao6mUeC1YORUTiaox/sLK
-B3tiZMny8ncZHRZVzLfreKAmJuIcI/vtAgMBAAGjggJ6MIICdjA5BgNVHSAEMjAw
-MBEGDysGAQQBga0hgiwBAQQDATARBg8rBgEEAYGtIYIsAgEEAwEwCAYGZ4EMAQIC
-MAkGA1UdEwQCMAAwCwYDVR0PBAQDAgXgMDQGA1UdJQQtMCsGCCsGAQUFBwMCBggr
-BgEFBQcDAQYKKwYBBAGCNwoDAwYJYIZIAYb4QgQBMB0GA1UdDgQWBBRfL4QHSy7M
-Ra5aBHX6NwdXgqe6yjAfBgNVHSMEGDAWgBTjWxe81iwyZTJA3U0XwDfeOk1fXDA5
-BgNVHREEMjAwghNpZHAuaHMtZXNzbGluZ2VuLmRlgRlhYWktYWRtaW5AaHMtZXNz
-bGluZ2VuLmRlMIGPBgNVHR8EgYcwgYQwQKA+oDyGOmh0dHA6Ly9jZHAxLnBjYS5k
-Zm4uZGUvaHMtZXNzbGluZ2VuLWNhL3B1Yi9jcmwvZ19jYWNybC5jcmwwQKA+oDyG
-Omh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvaHMtZXNzbGluZ2VuLWNhL3B1Yi9jcmwv
-Z19jYWNybC5jcmwwgd0GCCsGAQUFBwEBBIHQMIHNMDMGCCsGAQUFBzABhidodHRw
-Oi8vb2NzcC5wY2EuZGZuLmRlL09DU1AtU2VydmVyL09DU1AwSgYIKwYBBQUHMAKG
-Pmh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvaHMtZXNzbGluZ2VuLWNhL3B1Yi9jYWNl
-cnQvZ19jYWNlcnQuY3J0MEoGCCsGAQUFBzAChj5odHRwOi8vY2RwMi5wY2EuZGZu
-LmRlL2hzLWVzc2xpbmdlbi1jYS9wdWIvY2FjZXJ0L2dfY2FjZXJ0LmNydDANBgkq
-hkiG9w0BAQUFAAOCAQEAkVT99Xouvdq+/4srTHpg7sICCCYio5kqAp/kZLwCSvq6
-0gn20Kx4NCWPlvFF5+EDFkvtsagvzaumW9KSeSoG9W1B47BQDwb2cWUWoWjlJ/3j
-VZvIJ8oVKW8UWs4o83fUa4jur1HncMTQTKk66FFU7i6TTTY54XLja1GhPnTy+Qf8
-Me/Op4MuO9z7u18gz/+N92UYDDj+oQ/qxqE59U8JvrmD1DfgGj6eD+aKSrNRdyDH
-NWIt36FgWB/n/nt0VSCHEC5PaGAJLzlzMg/IayNHTTAUh1DL/Arr6rP0UXNN93AU
-Z3vEPDMlRrML5nkyZvylGJJgGIr9TUNxX2xHhi+kIg==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.hs-esslingen.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.hs-esslingen.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-esslingen.de/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.hs-esslingen.de/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.hs-esslingen.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.hs-esslingen.de/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.hs-esslingen.de/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>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">hs-esslingen.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.hs-esslingen.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.hs-esslingen.de,OU=Rechenzentrum,O=Hochschule Esslingen,L=Esslingen,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIF6zCCBNOgAwIBAgIHF2sVrs652TANBgkqhkiG9w0BAQUFADBaMQswCQYDVQQG
-EwJERTEdMBsGA1UEChMUSG9jaHNjaHVsZSBFc3NsaW5nZW4xFjAUBgNVBAsTDVJl
-Y2hlbnplbnRydW0xFDASBgNVBAMTC0hFIENBIC0gRzAyMB4XDTE0MDQxNDA4MTEx
-MVoXDTE3MDQxMzA4MTExMVowgZMxCzAJBgNVBAYTAkRFMRswGQYDVQQIExJCYWRl
-bi1XdWVydHRlbWJlcmcxEjAQBgNVBAcTCUVzc2xpbmdlbjEdMBsGA1UEChMUSG9j
-aHNjaHVsZSBFc3NsaW5nZW4xFjAUBgNVBAsTDVJlY2hlbnplbnRydW0xHDAaBgNV
-BAMTE2lkcC5ocy1lc3NsaW5nZW4uZGUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
-ggEKAoIBAQCspCw3S2FO3CMSrUY5r2SSxB+3lcvQmqQPc2b59fitJewh+aU+W9ja
-XJfHEn84Hp1iNovLtTE3EpKW4/zxSAhhIjUSTVMtHp69Y2EdcQ3u27vYHdCesX1F
-9/GAl7hEqzuYdJ6Bn4lbOamVH/DbfjpOS1RwpQts4eSrSGHtY09ZDr0/4P0C81SO
-uKgb7YFhMNmbgmHKGGghVxZauqpXmkoRBkT5SPRovqqqw3C7/GR5vg+XX5j1SgYi
-1nNBRldUlHHw7SlnPRuVtNs6WDODtbnkhK0rbshWtPNao6mUeC1YORUTiaox/sLK
-B3tiZMny8ncZHRZVzLfreKAmJuIcI/vtAgMBAAGjggJ6MIICdjA5BgNVHSAEMjAw
-MBEGDysGAQQBga0hgiwBAQQDATARBg8rBgEEAYGtIYIsAgEEAwEwCAYGZ4EMAQIC
-MAkGA1UdEwQCMAAwCwYDVR0PBAQDAgXgMDQGA1UdJQQtMCsGCCsGAQUFBwMCBggr
-BgEFBQcDAQYKKwYBBAGCNwoDAwYJYIZIAYb4QgQBMB0GA1UdDgQWBBRfL4QHSy7M
-Ra5aBHX6NwdXgqe6yjAfBgNVHSMEGDAWgBTjWxe81iwyZTJA3U0XwDfeOk1fXDA5
-BgNVHREEMjAwghNpZHAuaHMtZXNzbGluZ2VuLmRlgRlhYWktYWRtaW5AaHMtZXNz
-bGluZ2VuLmRlMIGPBgNVHR8EgYcwgYQwQKA+oDyGOmh0dHA6Ly9jZHAxLnBjYS5k
-Zm4uZGUvaHMtZXNzbGluZ2VuLWNhL3B1Yi9jcmwvZ19jYWNybC5jcmwwQKA+oDyG
-Omh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvaHMtZXNzbGluZ2VuLWNhL3B1Yi9jcmwv
-Z19jYWNybC5jcmwwgd0GCCsGAQUFBwEBBIHQMIHNMDMGCCsGAQUFBzABhidodHRw
-Oi8vb2NzcC5wY2EuZGZuLmRlL09DU1AtU2VydmVyL09DU1AwSgYIKwYBBQUHMAKG
-Pmh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvaHMtZXNzbGluZ2VuLWNhL3B1Yi9jYWNl
-cnQvZ19jYWNlcnQuY3J0MEoGCCsGAQUFBzAChj5odHRwOi8vY2RwMi5wY2EuZGZu
-LmRlL2hzLWVzc2xpbmdlbi1jYS9wdWIvY2FjZXJ0L2dfY2FjZXJ0LmNydDANBgkq
-hkiG9w0BAQUFAAOCAQEAkVT99Xouvdq+/4srTHpg7sICCCYio5kqAp/kZLwCSvq6
-0gn20Kx4NCWPlvFF5+EDFkvtsagvzaumW9KSeSoG9W1B47BQDwb2cWUWoWjlJ/3j
-VZvIJ8oVKW8UWs4o83fUa4jur1HncMTQTKk66FFU7i6TTTY54XLja1GhPnTy+Qf8
-Me/Op4MuO9z7u18gz/+N92UYDDj+oQ/qxqE59U8JvrmD1DfgGj6eD+aKSrNRdyDH
-NWIt36FgWB/n/nt0VSCHEC5PaGAJLzlzMg/IayNHTTAUh1DL/Arr6rP0UXNN93AU
-Z3vEPDMlRrML5nkyZvylGJJgGIr9TUNxX2xHhi+kIg==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.hs-esslingen.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.hs-esslingen.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">e192</OrganizationName>
-    <OrganizationName xml:lang="en">e192</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">Hochschule Esslingen</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">Hochschule Esslingen - University of Applied Sciences</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.hs-esslingen.de/</OrganizationURL>
-    <OrganizationURL xml:lang="en">http://www.hs-esslingen.de/en/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Martin</GivenName>
-    <SurName>Schmid</SurName>
-    <EmailAddress>mailto:admin@hs-esslingen.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="support">
-    <GivenName>HE AAI</GivenName>
-    <SurName>Support</SurName>
-    <EmailAddress>mailto:aai-support@hs-esslingen.de</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.hs-esslingen.de.xml b/swamid-interfederations-2.0/idp.hs-esslingen.de.xml
deleted file mode 100644
index 1294554f..00000000
--- a/swamid-interfederations-2.0/idp.hs-esslingen.de.xml
+++ /dev/null
@@ -1,147 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.hs-esslingen.de/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2009-12-04T16:29:14Z">
-      <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/bwidm-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>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">hs-esslingen.de</saml1md:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="de">Hochschule Esslingen</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Esslingen University of Applied Sciences</mdui:DisplayName>
-        <mdui:Description xml:lang="de">Shibboleth IDP der Hochschule Esslingen innerhalb der DFN-AAI</mdui:Description>
-        <mdui:Description xml:lang="en">Shibboleth IDP der Hochschule Esslingen innerhalb der DFN-AAI</mdui:Description>
-        <mdui:Logo height="16" width="16">https://www2.hs-esslingen.de/favicon.ico</mdui:Logo>
-        <mdui:Logo height="89" width="210">https://www2.hs-esslingen.de/rz/images/he_logo_gross_dfn-aai-metadaten.png</mdui:Logo>
-        <mdui:InformationURL xml:lang="de">http://www.hs-esslingen.de/de/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">http://www.hs-esslingen.de/en/</mdui:InformationURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.hs-esslingen.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.hs-esslingen.de,OU=Rechenzentrum,O=Hochschule Esslingen,L=Esslingen,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIF6zCCBNOgAwIBAgIHF2sVrs652TANBgkqhkiG9w0BAQUFADBaMQswCQYDVQQG
-EwJERTEdMBsGA1UEChMUSG9jaHNjaHVsZSBFc3NsaW5nZW4xFjAUBgNVBAsTDVJl
-Y2hlbnplbnRydW0xFDASBgNVBAMTC0hFIENBIC0gRzAyMB4XDTE0MDQxNDA4MTEx
-MVoXDTE3MDQxMzA4MTExMVowgZMxCzAJBgNVBAYTAkRFMRswGQYDVQQIExJCYWRl
-bi1XdWVydHRlbWJlcmcxEjAQBgNVBAcTCUVzc2xpbmdlbjEdMBsGA1UEChMUSG9j
-aHNjaHVsZSBFc3NsaW5nZW4xFjAUBgNVBAsTDVJlY2hlbnplbnRydW0xHDAaBgNV
-BAMTE2lkcC5ocy1lc3NsaW5nZW4uZGUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
-ggEKAoIBAQCspCw3S2FO3CMSrUY5r2SSxB+3lcvQmqQPc2b59fitJewh+aU+W9ja
-XJfHEn84Hp1iNovLtTE3EpKW4/zxSAhhIjUSTVMtHp69Y2EdcQ3u27vYHdCesX1F
-9/GAl7hEqzuYdJ6Bn4lbOamVH/DbfjpOS1RwpQts4eSrSGHtY09ZDr0/4P0C81SO
-uKgb7YFhMNmbgmHKGGghVxZauqpXmkoRBkT5SPRovqqqw3C7/GR5vg+XX5j1SgYi
-1nNBRldUlHHw7SlnPRuVtNs6WDODtbnkhK0rbshWtPNao6mUeC1YORUTiaox/sLK
-B3tiZMny8ncZHRZVzLfreKAmJuIcI/vtAgMBAAGjggJ6MIICdjA5BgNVHSAEMjAw
-MBEGDysGAQQBga0hgiwBAQQDATARBg8rBgEEAYGtIYIsAgEEAwEwCAYGZ4EMAQIC
-MAkGA1UdEwQCMAAwCwYDVR0PBAQDAgXgMDQGA1UdJQQtMCsGCCsGAQUFBwMCBggr
-BgEFBQcDAQYKKwYBBAGCNwoDAwYJYIZIAYb4QgQBMB0GA1UdDgQWBBRfL4QHSy7M
-Ra5aBHX6NwdXgqe6yjAfBgNVHSMEGDAWgBTjWxe81iwyZTJA3U0XwDfeOk1fXDA5
-BgNVHREEMjAwghNpZHAuaHMtZXNzbGluZ2VuLmRlgRlhYWktYWRtaW5AaHMtZXNz
-bGluZ2VuLmRlMIGPBgNVHR8EgYcwgYQwQKA+oDyGOmh0dHA6Ly9jZHAxLnBjYS5k
-Zm4uZGUvaHMtZXNzbGluZ2VuLWNhL3B1Yi9jcmwvZ19jYWNybC5jcmwwQKA+oDyG
-Omh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvaHMtZXNzbGluZ2VuLWNhL3B1Yi9jcmwv
-Z19jYWNybC5jcmwwgd0GCCsGAQUFBwEBBIHQMIHNMDMGCCsGAQUFBzABhidodHRw
-Oi8vb2NzcC5wY2EuZGZuLmRlL09DU1AtU2VydmVyL09DU1AwSgYIKwYBBQUHMAKG
-Pmh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvaHMtZXNzbGluZ2VuLWNhL3B1Yi9jYWNl
-cnQvZ19jYWNlcnQuY3J0MEoGCCsGAQUFBzAChj5odHRwOi8vY2RwMi5wY2EuZGZu
-LmRlL2hzLWVzc2xpbmdlbi1jYS9wdWIvY2FjZXJ0L2dfY2FjZXJ0LmNydDANBgkq
-hkiG9w0BAQUFAAOCAQEAkVT99Xouvdq+/4srTHpg7sICCCYio5kqAp/kZLwCSvq6
-0gn20Kx4NCWPlvFF5+EDFkvtsagvzaumW9KSeSoG9W1B47BQDwb2cWUWoWjlJ/3j
-VZvIJ8oVKW8UWs4o83fUa4jur1HncMTQTKk66FFU7i6TTTY54XLja1GhPnTy+Qf8
-Me/Op4MuO9z7u18gz/+N92UYDDj+oQ/qxqE59U8JvrmD1DfgGj6eD+aKSrNRdyDH
-NWIt36FgWB/n/nt0VSCHEC5PaGAJLzlzMg/IayNHTTAUh1DL/Arr6rP0UXNN93AU
-Z3vEPDMlRrML5nkyZvylGJJgGIr9TUNxX2xHhi+kIg==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.hs-esslingen.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.hs-esslingen.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-esslingen.de/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.hs-esslingen.de/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.hs-esslingen.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.hs-esslingen.de/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.hs-esslingen.de/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>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">hs-esslingen.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.hs-esslingen.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.hs-esslingen.de,OU=Rechenzentrum,O=Hochschule Esslingen,L=Esslingen,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIF6zCCBNOgAwIBAgIHF2sVrs652TANBgkqhkiG9w0BAQUFADBaMQswCQYDVQQG
-EwJERTEdMBsGA1UEChMUSG9jaHNjaHVsZSBFc3NsaW5nZW4xFjAUBgNVBAsTDVJl
-Y2hlbnplbnRydW0xFDASBgNVBAMTC0hFIENBIC0gRzAyMB4XDTE0MDQxNDA4MTEx
-MVoXDTE3MDQxMzA4MTExMVowgZMxCzAJBgNVBAYTAkRFMRswGQYDVQQIExJCYWRl
-bi1XdWVydHRlbWJlcmcxEjAQBgNVBAcTCUVzc2xpbmdlbjEdMBsGA1UEChMUSG9j
-aHNjaHVsZSBFc3NsaW5nZW4xFjAUBgNVBAsTDVJlY2hlbnplbnRydW0xHDAaBgNV
-BAMTE2lkcC5ocy1lc3NsaW5nZW4uZGUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
-ggEKAoIBAQCspCw3S2FO3CMSrUY5r2SSxB+3lcvQmqQPc2b59fitJewh+aU+W9ja
-XJfHEn84Hp1iNovLtTE3EpKW4/zxSAhhIjUSTVMtHp69Y2EdcQ3u27vYHdCesX1F
-9/GAl7hEqzuYdJ6Bn4lbOamVH/DbfjpOS1RwpQts4eSrSGHtY09ZDr0/4P0C81SO
-uKgb7YFhMNmbgmHKGGghVxZauqpXmkoRBkT5SPRovqqqw3C7/GR5vg+XX5j1SgYi
-1nNBRldUlHHw7SlnPRuVtNs6WDODtbnkhK0rbshWtPNao6mUeC1YORUTiaox/sLK
-B3tiZMny8ncZHRZVzLfreKAmJuIcI/vtAgMBAAGjggJ6MIICdjA5BgNVHSAEMjAw
-MBEGDysGAQQBga0hgiwBAQQDATARBg8rBgEEAYGtIYIsAgEEAwEwCAYGZ4EMAQIC
-MAkGA1UdEwQCMAAwCwYDVR0PBAQDAgXgMDQGA1UdJQQtMCsGCCsGAQUFBwMCBggr
-BgEFBQcDAQYKKwYBBAGCNwoDAwYJYIZIAYb4QgQBMB0GA1UdDgQWBBRfL4QHSy7M
-Ra5aBHX6NwdXgqe6yjAfBgNVHSMEGDAWgBTjWxe81iwyZTJA3U0XwDfeOk1fXDA5
-BgNVHREEMjAwghNpZHAuaHMtZXNzbGluZ2VuLmRlgRlhYWktYWRtaW5AaHMtZXNz
-bGluZ2VuLmRlMIGPBgNVHR8EgYcwgYQwQKA+oDyGOmh0dHA6Ly9jZHAxLnBjYS5k
-Zm4uZGUvaHMtZXNzbGluZ2VuLWNhL3B1Yi9jcmwvZ19jYWNybC5jcmwwQKA+oDyG
-Omh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvaHMtZXNzbGluZ2VuLWNhL3B1Yi9jcmwv
-Z19jYWNybC5jcmwwgd0GCCsGAQUFBwEBBIHQMIHNMDMGCCsGAQUFBzABhidodHRw
-Oi8vb2NzcC5wY2EuZGZuLmRlL09DU1AtU2VydmVyL09DU1AwSgYIKwYBBQUHMAKG
-Pmh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvaHMtZXNzbGluZ2VuLWNhL3B1Yi9jYWNl
-cnQvZ19jYWNlcnQuY3J0MEoGCCsGAQUFBzAChj5odHRwOi8vY2RwMi5wY2EuZGZu
-LmRlL2hzLWVzc2xpbmdlbi1jYS9wdWIvY2FjZXJ0L2dfY2FjZXJ0LmNydDANBgkq
-hkiG9w0BAQUFAAOCAQEAkVT99Xouvdq+/4srTHpg7sICCCYio5kqAp/kZLwCSvq6
-0gn20Kx4NCWPlvFF5+EDFkvtsagvzaumW9KSeSoG9W1B47BQDwb2cWUWoWjlJ/3j
-VZvIJ8oVKW8UWs4o83fUa4jur1HncMTQTKk66FFU7i6TTTY54XLja1GhPnTy+Qf8
-Me/Op4MuO9z7u18gz/+N92UYDDj+oQ/qxqE59U8JvrmD1DfgGj6eD+aKSrNRdyDH
-NWIt36FgWB/n/nt0VSCHEC5PaGAJLzlzMg/IayNHTTAUh1DL/Arr6rP0UXNN93AU
-Z3vEPDMlRrML5nkyZvylGJJgGIr9TUNxX2xHhi+kIg==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.hs-esslingen.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.hs-esslingen.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">e192</OrganizationName>
-    <OrganizationName xml:lang="en">e192</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">Hochschule Esslingen</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">Hochschule Esslingen - University of Applied Sciences</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.hs-esslingen.de/</OrganizationURL>
-    <OrganizationURL xml:lang="en">http://www.hs-esslingen.de/en/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Martin</GivenName>
-    <SurName>Schmid</SurName>
-    <EmailAddress>mailto:admin@hs-esslingen.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="support">
-    <GivenName>HE AAI</GivenName>
-    <SurName>Support</SurName>
-    <EmailAddress>mailto:aai-support@hs-esslingen.de</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.hslu.ch-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.hslu.ch-idp-shibboleth.xml
deleted file mode 100644
index b57a1696..00000000
--- a/swamid-interfederations-2.0/idp.hslu.ch-idp-shibboleth.xml
+++ /dev/null
@@ -1,159 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.hslu.ch/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://rr.aai.switch.ch/" registrationInstant="2014-08-18T09:06:25Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.switch.ch/aai/federation/switchaai/metadata-registration-practice-statement-20110711.txt</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-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </Extensions>
-  <IDPSSODescriptor errorURL="http://hotline.hslu.ch/" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-    <Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hslu.ch</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="de">HSLU - Hochschule Luzern</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">HSLU - Lucerne University of Applied Sciences and Arts</mdui:DisplayName>
-        <mdui:Description xml:lang="de">Hochschule Luzern</mdui:Description>
-        <mdui:Description xml:lang="en">Lucerne University of Applied Sciences and Arts</mdui:Description>
-        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAACF0RVh0U29mdHdhcmUAR3JhcGhpY0NvbnZlcnRlciAoSW50ZWwpd4f6GQAAADVJREFUeJxi+P//PwMlmCLN1DHAxcXlPyV4OBgw8LGQNnPmf2LxcDVg4GOBUgMAAAAA//8DAA5inxcVtjGTAAAAAElFTkSuQmCC</mdui:Logo>
-        <mdui:Logo height="60" width="80">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFAAAAA8CAIAAAB+RarbAAAC0GlDQ1BJQ0NQcm9maWxlAAB4nI2Uz0sUYRjHv7ONGChBYGZ7iKFDSKhMFmVE5a6/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+hkAAAt8SURBVHic7JmHV5RXGsbzz2Sz2c2m7e7ZmE1MTGJiw4KoUYMtRhHUYIkxqFEjRqOigEBAaSIdpAxlaENvAwxl6L333ssMsr/vu2RETPacJEpykPfcM+fO+917v/e597lvmXlh5jmTF/5oAxZalgAvdlkCvNhlCfBilyXAi12WAC92eV4Bd/f2dfX0/qqZja1tE5OTTW3t4xOTQtM/OPRLgweHh0fHxqZ0uicfqQu0AQrlr3r175FZwLmFxXlFJUPDI02t7XVNzZW19dn5RTUNTbEpGdX1jZl5BblFJdGJqe1d3clZuQUl5UyJTEjuHxiMT83kUWRCSllVLZ2SyurGljamM7GqriFNrQFPUVmltrwyIiEZZUVNHQN6+wdGRsfi07JKq2pc/YIZ+QcAVudrG5pbMSIsVuUTGjk8MuoREBoYEROlSgF8VGJKem6+d0iE0z0/xjAF/E2tbXyCHGAR8UkxyelxqZmegWHM4hN4yqQ0jbY0LEalTJIelVTWsF8u3oHjExM5hcXpOZrQmITQGBXnv9CAm9vaH0THV9c3RCempefkl1RUA7K0siYpM4cDaWnv5BCa2zr4TEjL4uSZwmmDJEtTiJ5WXlNH6+zuzS0s6ezpjU3OgCyMZFMSM9Rl1bV1TS0ZufnFFdVsx4zMf7YDXlTU1HM1Fhrwggm0HxhauPN8Uh4Bfvjw4ZOPcTPT09NzNXzV6yXN8Ogo9/D3W8ArxKt/1oCnLo8A+yuUEA92tXV06fX6nr5+fBIHkl9Sho/pGxicmJgcG5+IS8mAwDx1838AY3HRHd09dHiEq9fp9XxCV6xv6+zS6XQGpU520WJZBrd2dDGGZXEZo2PjPPINi6qored6MxF/MTY+zqynvguzgDHC5s694Ki4tBwNTghHhS/hE/ebkJ6lSs++6xuMBhflFxbFbcSsiPhk/BwDcOOpag0XEm/EgMDIWDDgwHDO+HAmKuKSvILDCQHtnd08EisHRcbGyV7NK1jBauzpDRfPEGUCFx4b7j9Q4NU4g8mpqWcCmHewqfgtv/DoSHCqUgIUMVgfm5KuysjGMnf/kKKyivDYRMY0tLRNTelyCorvP4jAxNrG5pTsPEV8EnMLS8tzCrUZeQXo8XwS/ogYzp9HODwAM90/XCnFp9p6toz9CoiI0en0OL+M3AJ2PCw2sbuvXyzrERiKF3wmgAdlRwIMQk5xRRVfeXFf/wAXDPrB8K6evsHhEWJVa0ennms8PU0Mg3U8hYFiDI/ILiYnp7gXnAzM5xMlVx2XLm5+Z3cPrIbDvIsmJTy9fegFqxkPEaAxB84wcqFnRWmDsNl88hIu3tN9059Entdc+vmRJcCLXWYB77K0+ubKLdwm/fLqul2W3xgqGGLP1kMntluc3Gp2/IKNIwmW0OcXl+0+ZvWpuaR38PQVRaK1nfOtu15iADH24OkLeF36eN1T1je2HjrOeBYnbgn3i5c+8d011ucRA8hhUBKrLc5YC79NLNhtaUXgoE/o2nfiXKdcxg4MDn1x6rwqQ02fRAD7iXMGVNkF2m3mJ/YeP7vj8FdYLtpjgF9eYbRujznBhD4R/6/vrwMPfeLhqys3sRc2Lp5XHe++tX671VVbYce7xrt2fXna5o7neRuHf6/dRhmIfueRU+ZnLok1PQND0ZNLEbHMTl9csWXvDWcPxpsePb3d4iuSDYLQ5yfPfbht33Vnj+s/urMgG8dEp/v+b2/YKXaK6uJvK4zIEWbkgvS1lZuoSegTzP65eou/XEhTrmJ/nrbUAJjT2nfi7OsfG1+yc8Zy0R4D/NrHxpv2HxUnzExAiqL3ku2Pq0zNDAtdvOlktMecDknCKx+sp5oVepIEEWY586Pffv8TNRRvb9xJmkm4Xm5sClShn56WMsoZuWB6e8MO6mGhpyYTIF18At8z2U3Mp08thd0U5DNyQfqvNVsJ74Ia7D5ZHf3C0grs18gnZBBo8pbRdgMf51P6zVUmb63fse3QCSi3ft/hNz7ZTM6E/vvbd9buNtf99EvFJVvnjZ8fkdlVxGZT681b7sCp88vW72CRTy1Orty+f8XWvaBiH6H9G5+YrPrsINw7e82etBnGksm8a2xKTj5vkbt+wa9+tIkprMMx8KLMvMJfC5iU7h8fbTQ5eGzzAcsLN53mA35jlcn7W/Zc+9Gdczh12eb1OYDX7bHQ/5SEXLZzmQu4tKp2nq37T55bs8uMRWjQlYMSh0nOREJOfsq7Pzt6+qX31lJvw2oAewSGzAfsGwxdrzjcZZEz1+xeW2k8FzBVx4zkFPqXbfh/gMlSOTZrexdABUQ8+gnpEaWNv/hS9LXllQZKW9u5rNi6b3hEYhpu5ivrG0Z7LGTAhS+/vy5TI9nBVSQrHhiSftCC0scuXBXrUGZAaQAzMTU7r6OrW+jJyblyZO8AXrZhh8HJJWflCk8Jpdl9cb/qGlsMlKbkeOXDDZR09OubJH2A/FuCAJwvG2wQihO49ouU/svytWtMzYTTwv28+O4ajewD6C/bsHO1qRnsMjlgybquvsHyBg/sOHwKPOiN9lq8/vFm4TNgMv5JrMl5vrnaRC4Gx7eYHf/vxs8kqpuffGeTKV9F6ceGwiauEgT++wfr7/gEMdHxnt9/jD4dHJJ2ubSy9qXla9NzNDPyJWe7l2/exSJclk92HqBum5HjBV4WpysZedDy5KXrKClaXnxnNXwWL6U9BvjmnXueQWGCulwSuETSLx6x3DUnN4hx1dE1PC7RsFUk97c9fH9wckOfptYIJW4TbyH6edoSvC5oxZq2rveldZzc7N29RfiZkTN2n9AoVqAxV2TyWflFTl7+E3Kco1rCNoKCGM86t1y9eCkW1jU2CyUkhyaEAGGke4B0R4hk153daShFewzw8yNLgH+rPHxCntbKT1dmAV/zj3NTZurn/F43ODpuE5SgrW0RX/0Sc4NTpHSnqbP3so/ye58Y2hXfmKt+seVNUmB0iUy74idprL2jL3lHX/FV9g2NNnf1XfGJsQmMR894a29ltLpEvKWho5e5rtEZXGM0zhGpGSU1CwfY7JbvRa+ouUU/5h62D8gonjXCJij+dmgSnZ7B4dD0wrD0QkVmUWCyhom5FVIsideUf+kQeCtYFZGlpUVmF4+MT/YMjjgrUi3s/HxVOWEZRd4JanM7P01VI+PLG9uZe/Cmj7ZO2lMrt7DIbO3CAT5s78/2zwNs6RiUWTKbWtg+UDmFp8ydOanTKTK1X9h4F9ZI3pJTsnINi80tnXlciutaj94OGJIrgSm9/rhTsCq/gn5FU8cxp6DznhGOYcnMPeehiFYXPzOYj+S3AMbuVG018I47BUWpiyfkDGF8cupbj4iv74RC6e/uRzV2zv74xnZY2Ps7hCa7KzMdwpKP3A4orW8TgAV4Fqlu7bp4L/JPATirtE58tQtJFIDbewd/8I9lvHe8unvg0X8IAD7rrmBfIrOKoXSvnDYIwAzmOlg6Bh51CMitnK06AczJt3T3c8PdlBkXvQBcstCAp3T6h/IveAIwBsXllT2U/hzQ43XgHvrkoqpDtn7cQDHR4IsB/M3PUbqgupl1BkbG1OX1vCWrrE5MATCn3dU/lFfZyOWnKXPmz30WMgv4iH0A1OLocNeXvZXJhVXcK6+4bI4FDSzltPOrpf/QUoqqzG39UIqG7y1raBeAz7gpoLTkkH1jfvCLFeefXy2dcGe/lGkHp+bjtDxiMgVgqN7a3T+p08Pn/TfuK9ULCJhbh5f+1jOCJh1UnlR56PTTvok5Vm7h5zwVebJrRXIqGs56KMRImpVreJEcurDbMy7TLkRFsw1R3Q5L6h2Uk+GGNlbukftcfq6G8Pa1bd0X7kW290m1VGxu2dd3Q1OK5hebzxDw8yNLgBe7LAFe7LIEeLHLEuDFLkuAF7ssAV7s8j8AAAD//wMAz8BziTNWkGsAAAAASUVORK5CYII=</mdui:Logo>
-        <mdui:InformationURL xml:lang="en">http://english.hslu.ch/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="de">http://www.hslu.ch/</mdui:InformationURL>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:IPHint>147.88.219.232/29</mdui:IPHint>
-        <mdui:IPHint>147.88.220.0/24</mdui:IPHint>
-        <mdui:IPHint>147.88.221.0/24</mdui:IPHint>
-        <mdui:IPHint>147.88.217.218/31</mdui:IPHint>
-        <mdui:IPHint>147.88.222.0/23</mdui:IPHint>
-        <mdui:IPHint>147.88.224.0/24</mdui:IPHint>
-        <mdui:IPHint>147.88.225.0/24</mdui:IPHint>
-        <mdui:IPHint>147.88.226.0/24</mdui:IPHint>
-        <mdui:IPHint>147.88.228.0/23</mdui:IPHint>
-        <mdui:IPHint>147.88.230.0/24</mdui:IPHint>
-        <mdui:IPHint>147.88.231.0/24</mdui:IPHint>
-        <mdui:IPHint>147.88.232.0/22</mdui:IPHint>
-        <mdui:IPHint>147.88.236.0/24</mdui:IPHint>
-        <mdui:IPHint>147.88.237.0/24</mdui:IPHint>
-        <mdui:IPHint>147.88.217.220/30</mdui:IPHint>
-        <mdui:IPHint>147.88.217.224/27</mdui:IPHint>
-        <mdui:IPHint>147.88.238.0/23</mdui:IPHint>
-        <mdui:IPHint>147.88.218.0/25</mdui:IPHint>
-        <mdui:IPHint>147.88.240.0/21</mdui:IPHint>
-        <mdui:IPHint>147.88.254.64/29</mdui:IPHint>
-        <mdui:IPHint>147.88.254.72/29</mdui:IPHint>
-        <mdui:IPHint>147.88.254.80/29</mdui:IPHint>
-        <mdui:IPHint>147.88.254.96/29</mdui:IPHint>
-        <mdui:IPHint>147.88.254.112/29</mdui:IPHint>
-        <mdui:IPHint>2001:620:110::/48</mdui:IPHint>
-        <mdui:IPHint>147.88.218.128/25</mdui:IPHint>
-        <mdui:IPHint>147.88.219.200/29</mdui:IPHint>
-        <mdui:IPHint>147.88.219.208/29</mdui:IPHint>
-        <mdui:IPHint>147.88.219.216/29</mdui:IPHint>
-        <mdui:IPHint>147.88.219.224/29</mdui:IPHint>
-        <mdui:IPHint>147.88.0.0/16</mdui:IPHint>
-        <mdui:IPHint>147.88.216.0/26</mdui:IPHint>
-        <mdui:IPHint>147.88.217.0/25</mdui:IPHint>
-        <mdui:DomainHint>hslu.ch</mdui:DomainHint>
-        <mdui:DomainHint>hochschuleluzern.ch</mdui:DomainHint>
-        <mdui:GeolocationHint>geo:47.046681,8.314912</mdui:GeolocationHint>
-        <mdui:GeolocationHint>geo:47.013434,8.305034</mdui:GeolocationHint>
-        <mdui:GeolocationHint>geo:47.174274,8.512537</mdui:GeolocationHint>
-        <mdui:GeolocationHint>geo:47.060845,8.322106</mdui:GeolocationHint>
-        <mdui:GeolocationHint>geo:47.048388,8.309762</mdui:GeolocationHint>
-        <mdui:GeolocationHint>geo:47.048096,8.314655</mdui:GeolocationHint>
-        <mdui:GeolocationHint>geo:47.054246,8.295853</mdui:GeolocationHint>
-      </mdui:DiscoHints>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDDDCCAfSgAwIBAgIJAOIyvPYAinGuMA0GCSqGSIb3DQEBBQUAMBYxFDASBgNV
-BAMTC2lkcC5oc2x1LmNoMB4XDTE0MDQxMTA4MTM1MVoXDTE3MDQxMDA4MTM1MVow
-FjEUMBIGA1UEAxMLaWRwLmhzbHUuY2gwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
-ggEKAoIBAQCwhrP8yk/+IifeO8mUL2SPCX2Jwze6fiyBxaLFsq9PRUKwu/m6CMk9
-87SAvBV541a0pWRpizrAa/jSRNPXQYQLK9h93/5bTc4VBbf1PfqnluOIAq7y23bG
-RQEkcd7NqOkTMOl404LIys0lsk6yQz/GILg6howVh77wGG07AL8DlBFhyjMaOHTt
-aNHh5Chkk8mEB7EP92uJpB6vISJV/Adj2Y95ZefwWo09vGWlUP1usJr0Rhn2HpYy
-68Q0tKY5vXQYIf2IDyoCmPVXW+Q5GWL/WWc/ZUfmi5Srrueh/DRNzoT4/6tqt39r
-RfiVjjhml9p2w4NPwchEYKkec5/ThxIzAgMBAAGjXTBbMDoGA1UdEQQzMDGCC2lk
-cC5oc2x1LmNohiJodHRwczovL2lkcC5oc2x1LmNoL2lkcC9zaGliYm9sZXRoMB0G
-A1UdDgQWBBRclnGUQ4woRbzyaXdRPmu0afzYDDANBgkqhkiG9w0BAQUFAAOCAQEA
-lxSpDW+8n4O9+VGRxrqir42UFerXSYKlr5TiCzU2vpgUOuecK05hrskCeCrn1Zr+
-s4zkISefcaXayNOVhCOfUEfc/eA3VlefzSTfXk84pGkhIDJ4DTDMlkP1MCQNDYcx
-eMTbruMyKU4AYHbQgvhAqXUuMD6dXqtmkKatWTyWw9jNYjsNi18CCPN0UIq2lqoM
-dKuYJ6IAhWZYLq/vqC4kllYX2rhXxu/F/1A92qfG4FhE9urOu+LVd6LdO2WSwj/N
-IwOpfglNU30kw1y3t08Pwq1wZEmNW+5PUjDbUrGLvnPaLRjjXoXVebzPXoqaGJm0
-7uYGZFS62PnJbFAk9NvN1g==
-						</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.hslu.ch:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.hslu.ch: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.hslu.ch/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.hslu.ch/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.hslu.ch/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.hslu.ch/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
-    <Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hslu.ch</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDDDCCAfSgAwIBAgIJAOIyvPYAinGuMA0GCSqGSIb3DQEBBQUAMBYxFDASBgNV
-BAMTC2lkcC5oc2x1LmNoMB4XDTE0MDQxMTA4MTM1MVoXDTE3MDQxMDA4MTM1MVow
-FjEUMBIGA1UEAxMLaWRwLmhzbHUuY2gwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
-ggEKAoIBAQCwhrP8yk/+IifeO8mUL2SPCX2Jwze6fiyBxaLFsq9PRUKwu/m6CMk9
-87SAvBV541a0pWRpizrAa/jSRNPXQYQLK9h93/5bTc4VBbf1PfqnluOIAq7y23bG
-RQEkcd7NqOkTMOl404LIys0lsk6yQz/GILg6howVh77wGG07AL8DlBFhyjMaOHTt
-aNHh5Chkk8mEB7EP92uJpB6vISJV/Adj2Y95ZefwWo09vGWlUP1usJr0Rhn2HpYy
-68Q0tKY5vXQYIf2IDyoCmPVXW+Q5GWL/WWc/ZUfmi5Srrueh/DRNzoT4/6tqt39r
-RfiVjjhml9p2w4NPwchEYKkec5/ThxIzAgMBAAGjXTBbMDoGA1UdEQQzMDGCC2lk
-cC5oc2x1LmNohiJodHRwczovL2lkcC5oc2x1LmNoL2lkcC9zaGliYm9sZXRoMB0G
-A1UdDgQWBBRclnGUQ4woRbzyaXdRPmu0afzYDDANBgkqhkiG9w0BAQUFAAOCAQEA
-lxSpDW+8n4O9+VGRxrqir42UFerXSYKlr5TiCzU2vpgUOuecK05hrskCeCrn1Zr+
-s4zkISefcaXayNOVhCOfUEfc/eA3VlefzSTfXk84pGkhIDJ4DTDMlkP1MCQNDYcx
-eMTbruMyKU4AYHbQgvhAqXUuMD6dXqtmkKatWTyWw9jNYjsNi18CCPN0UIq2lqoM
-dKuYJ6IAhWZYLq/vqC4kllYX2rhXxu/F/1A92qfG4FhE9urOu+LVd6LdO2WSwj/N
-IwOpfglNU30kw1y3t08Pwq1wZEmNW+5PUjDbUrGLvnPaLRjjXoXVebzPXoqaGJm0
-7uYGZFS62PnJbFAk9NvN1g==
-						</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.hslu.ch:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.hslu.ch:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">hslu.ch</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">HSLU - Hochschule Luzern</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">HSLU - Lucerne University of Applied Sciences and Arts</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.hslu.ch/</OrganizationURL>
-    <OrganizationURL xml:lang="en">http://www.hslu.ch/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Hochschule Luzern - IT Services</GivenName>
-    <SurName>(Hotline)</SurName>
-    <EmailAddress>mailto:informatikhotline@hslu.ch</EmailAddress>
-    <TelephoneNumber>+41 41 228 21 21</TelephoneNumber>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Hochschule Luzern - IT Services</GivenName>
-    <SurName>(AAI Technician)</SurName>
-    <EmailAddress>mailto:aai@hslu.ch</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.hslu.ch.xml b/swamid-interfederations-2.0/idp.hslu.ch.xml
deleted file mode 100644
index b57a1696..00000000
--- a/swamid-interfederations-2.0/idp.hslu.ch.xml
+++ /dev/null
@@ -1,159 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.hslu.ch/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://rr.aai.switch.ch/" registrationInstant="2014-08-18T09:06:25Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.switch.ch/aai/federation/switchaai/metadata-registration-practice-statement-20110711.txt</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-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </Extensions>
-  <IDPSSODescriptor errorURL="http://hotline.hslu.ch/" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-    <Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hslu.ch</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="de">HSLU - Hochschule Luzern</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">HSLU - Lucerne University of Applied Sciences and Arts</mdui:DisplayName>
-        <mdui:Description xml:lang="de">Hochschule Luzern</mdui:Description>
-        <mdui:Description xml:lang="en">Lucerne University of Applied Sciences and Arts</mdui:Description>
-        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAACF0RVh0U29mdHdhcmUAR3JhcGhpY0NvbnZlcnRlciAoSW50ZWwpd4f6GQAAADVJREFUeJxi+P//PwMlmCLN1DHAxcXlPyV4OBgw8LGQNnPmf2LxcDVg4GOBUgMAAAAA//8DAA5inxcVtjGTAAAAAElFTkSuQmCC</mdui:Logo>
-        <mdui:Logo height="60" width="80">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFAAAAA8CAIAAAB+RarbAAAC0GlDQ1BJQ0NQcm9maWxlAAB4nI2Uz0sUYRjHv7ONGChBYGZ7iKFDSKhMFmVE5a6/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+hkAAAt8SURBVHic7JmHV5RXGsbzz2Sz2c2m7e7ZmE1MTGJiw4KoUYMtRhHUYIkxqFEjRqOigEBAaSIdpAxlaENvAwxl6L333ssMsr/vu2RETPacJEpykPfcM+fO+917v/e597lvmXlh5jmTF/5oAxZalgAvdlkCvNhlCfBilyXAi12WAC92eV4Bd/f2dfX0/qqZja1tE5OTTW3t4xOTQtM/OPRLgweHh0fHxqZ0uicfqQu0AQrlr3r175FZwLmFxXlFJUPDI02t7XVNzZW19dn5RTUNTbEpGdX1jZl5BblFJdGJqe1d3clZuQUl5UyJTEjuHxiMT83kUWRCSllVLZ2SyurGljamM7GqriFNrQFPUVmltrwyIiEZZUVNHQN6+wdGRsfi07JKq2pc/YIZ+QcAVudrG5pbMSIsVuUTGjk8MuoREBoYEROlSgF8VGJKem6+d0iE0z0/xjAF/E2tbXyCHGAR8UkxyelxqZmegWHM4hN4yqQ0jbY0LEalTJIelVTWsF8u3oHjExM5hcXpOZrQmITQGBXnv9CAm9vaH0THV9c3RCempefkl1RUA7K0siYpM4cDaWnv5BCa2zr4TEjL4uSZwmmDJEtTiJ5WXlNH6+zuzS0s6ezpjU3OgCyMZFMSM9Rl1bV1TS0ZufnFFdVsx4zMf7YDXlTU1HM1Fhrwggm0HxhauPN8Uh4Bfvjw4ZOPcTPT09NzNXzV6yXN8Ogo9/D3W8ArxKt/1oCnLo8A+yuUEA92tXV06fX6nr5+fBIHkl9Sho/pGxicmJgcG5+IS8mAwDx1838AY3HRHd09dHiEq9fp9XxCV6xv6+zS6XQGpU520WJZBrd2dDGGZXEZo2PjPPINi6qored6MxF/MTY+zqynvguzgDHC5s694Ki4tBwNTghHhS/hE/ebkJ6lSs++6xuMBhflFxbFbcSsiPhk/BwDcOOpag0XEm/EgMDIWDDgwHDO+HAmKuKSvILDCQHtnd08EisHRcbGyV7NK1jBauzpDRfPEGUCFx4b7j9Q4NU4g8mpqWcCmHewqfgtv/DoSHCqUgIUMVgfm5KuysjGMnf/kKKyivDYRMY0tLRNTelyCorvP4jAxNrG5pTsPEV8EnMLS8tzCrUZeQXo8XwS/ogYzp9HODwAM90/XCnFp9p6toz9CoiI0en0OL+M3AJ2PCw2sbuvXyzrERiKF3wmgAdlRwIMQk5xRRVfeXFf/wAXDPrB8K6evsHhEWJVa0ennms8PU0Mg3U8hYFiDI/ILiYnp7gXnAzM5xMlVx2XLm5+Z3cPrIbDvIsmJTy9fegFqxkPEaAxB84wcqFnRWmDsNl88hIu3tN9059Entdc+vmRJcCLXWYB77K0+ubKLdwm/fLqul2W3xgqGGLP1kMntluc3Gp2/IKNIwmW0OcXl+0+ZvWpuaR38PQVRaK1nfOtu15iADH24OkLeF36eN1T1je2HjrOeBYnbgn3i5c+8d011ucRA8hhUBKrLc5YC79NLNhtaUXgoE/o2nfiXKdcxg4MDn1x6rwqQ02fRAD7iXMGVNkF2m3mJ/YeP7vj8FdYLtpjgF9eYbRujznBhD4R/6/vrwMPfeLhqys3sRc2Lp5XHe++tX671VVbYce7xrt2fXna5o7neRuHf6/dRhmIfueRU+ZnLok1PQND0ZNLEbHMTl9csWXvDWcPxpsePb3d4iuSDYLQ5yfPfbht33Vnj+s/urMgG8dEp/v+b2/YKXaK6uJvK4zIEWbkgvS1lZuoSegTzP65eou/XEhTrmJ/nrbUAJjT2nfi7OsfG1+yc8Zy0R4D/NrHxpv2HxUnzExAiqL3ku2Pq0zNDAtdvOlktMecDknCKx+sp5oVepIEEWY586Pffv8TNRRvb9xJmkm4Xm5sClShn56WMsoZuWB6e8MO6mGhpyYTIF18At8z2U3Mp08thd0U5DNyQfqvNVsJ74Ia7D5ZHf3C0grs18gnZBBo8pbRdgMf51P6zVUmb63fse3QCSi3ft/hNz7ZTM6E/vvbd9buNtf99EvFJVvnjZ8fkdlVxGZT681b7sCp88vW72CRTy1Orty+f8XWvaBiH6H9G5+YrPrsINw7e82etBnGksm8a2xKTj5vkbt+wa9+tIkprMMx8KLMvMJfC5iU7h8fbTQ5eGzzAcsLN53mA35jlcn7W/Zc+9Gdczh12eb1OYDX7bHQ/5SEXLZzmQu4tKp2nq37T55bs8uMRWjQlYMSh0nOREJOfsq7Pzt6+qX31lJvw2oAewSGzAfsGwxdrzjcZZEz1+xeW2k8FzBVx4zkFPqXbfh/gMlSOTZrexdABUQ8+gnpEaWNv/hS9LXllQZKW9u5rNi6b3hEYhpu5ivrG0Z7LGTAhS+/vy5TI9nBVSQrHhiSftCC0scuXBXrUGZAaQAzMTU7r6OrW+jJyblyZO8AXrZhh8HJJWflCk8Jpdl9cb/qGlsMlKbkeOXDDZR09OubJH2A/FuCAJwvG2wQihO49ouU/svytWtMzYTTwv28+O4ajewD6C/bsHO1qRnsMjlgybquvsHyBg/sOHwKPOiN9lq8/vFm4TNgMv5JrMl5vrnaRC4Gx7eYHf/vxs8kqpuffGeTKV9F6ceGwiauEgT++wfr7/gEMdHxnt9/jD4dHJJ2ubSy9qXla9NzNDPyJWe7l2/exSJclk92HqBum5HjBV4WpysZedDy5KXrKClaXnxnNXwWL6U9BvjmnXueQWGCulwSuETSLx6x3DUnN4hx1dE1PC7RsFUk97c9fH9wckOfptYIJW4TbyH6edoSvC5oxZq2rveldZzc7N29RfiZkTN2n9AoVqAxV2TyWflFTl7+E3Kco1rCNoKCGM86t1y9eCkW1jU2CyUkhyaEAGGke4B0R4hk153daShFewzw8yNLgH+rPHxCntbKT1dmAV/zj3NTZurn/F43ODpuE5SgrW0RX/0Sc4NTpHSnqbP3so/ye58Y2hXfmKt+seVNUmB0iUy74idprL2jL3lHX/FV9g2NNnf1XfGJsQmMR894a29ltLpEvKWho5e5rtEZXGM0zhGpGSU1CwfY7JbvRa+ouUU/5h62D8gonjXCJij+dmgSnZ7B4dD0wrD0QkVmUWCyhom5FVIsideUf+kQeCtYFZGlpUVmF4+MT/YMjjgrUi3s/HxVOWEZRd4JanM7P01VI+PLG9uZe/Cmj7ZO2lMrt7DIbO3CAT5s78/2zwNs6RiUWTKbWtg+UDmFp8ydOanTKTK1X9h4F9ZI3pJTsnINi80tnXlciutaj94OGJIrgSm9/rhTsCq/gn5FU8cxp6DznhGOYcnMPeehiFYXPzOYj+S3AMbuVG018I47BUWpiyfkDGF8cupbj4iv74RC6e/uRzV2zv74xnZY2Ps7hCa7KzMdwpKP3A4orW8TgAV4Fqlu7bp4L/JPATirtE58tQtJFIDbewd/8I9lvHe8unvg0X8IAD7rrmBfIrOKoXSvnDYIwAzmOlg6Bh51CMitnK06AczJt3T3c8PdlBkXvQBcstCAp3T6h/IveAIwBsXllT2U/hzQ43XgHvrkoqpDtn7cQDHR4IsB/M3PUbqgupl1BkbG1OX1vCWrrE5MATCn3dU/lFfZyOWnKXPmz30WMgv4iH0A1OLocNeXvZXJhVXcK6+4bI4FDSzltPOrpf/QUoqqzG39UIqG7y1raBeAz7gpoLTkkH1jfvCLFeefXy2dcGe/lGkHp+bjtDxiMgVgqN7a3T+p08Pn/TfuK9ULCJhbh5f+1jOCJh1UnlR56PTTvok5Vm7h5zwVebJrRXIqGs56KMRImpVreJEcurDbMy7TLkRFsw1R3Q5L6h2Uk+GGNlbukftcfq6G8Pa1bd0X7kW290m1VGxu2dd3Q1OK5hebzxDw8yNLgBe7LAFe7LIEeLHLEuDFLkuAF7ssAV7s8j8AAAD//wMAz8BziTNWkGsAAAAASUVORK5CYII=</mdui:Logo>
-        <mdui:InformationURL xml:lang="en">http://english.hslu.ch/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="de">http://www.hslu.ch/</mdui:InformationURL>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:IPHint>147.88.219.232/29</mdui:IPHint>
-        <mdui:IPHint>147.88.220.0/24</mdui:IPHint>
-        <mdui:IPHint>147.88.221.0/24</mdui:IPHint>
-        <mdui:IPHint>147.88.217.218/31</mdui:IPHint>
-        <mdui:IPHint>147.88.222.0/23</mdui:IPHint>
-        <mdui:IPHint>147.88.224.0/24</mdui:IPHint>
-        <mdui:IPHint>147.88.225.0/24</mdui:IPHint>
-        <mdui:IPHint>147.88.226.0/24</mdui:IPHint>
-        <mdui:IPHint>147.88.228.0/23</mdui:IPHint>
-        <mdui:IPHint>147.88.230.0/24</mdui:IPHint>
-        <mdui:IPHint>147.88.231.0/24</mdui:IPHint>
-        <mdui:IPHint>147.88.232.0/22</mdui:IPHint>
-        <mdui:IPHint>147.88.236.0/24</mdui:IPHint>
-        <mdui:IPHint>147.88.237.0/24</mdui:IPHint>
-        <mdui:IPHint>147.88.217.220/30</mdui:IPHint>
-        <mdui:IPHint>147.88.217.224/27</mdui:IPHint>
-        <mdui:IPHint>147.88.238.0/23</mdui:IPHint>
-        <mdui:IPHint>147.88.218.0/25</mdui:IPHint>
-        <mdui:IPHint>147.88.240.0/21</mdui:IPHint>
-        <mdui:IPHint>147.88.254.64/29</mdui:IPHint>
-        <mdui:IPHint>147.88.254.72/29</mdui:IPHint>
-        <mdui:IPHint>147.88.254.80/29</mdui:IPHint>
-        <mdui:IPHint>147.88.254.96/29</mdui:IPHint>
-        <mdui:IPHint>147.88.254.112/29</mdui:IPHint>
-        <mdui:IPHint>2001:620:110::/48</mdui:IPHint>
-        <mdui:IPHint>147.88.218.128/25</mdui:IPHint>
-        <mdui:IPHint>147.88.219.200/29</mdui:IPHint>
-        <mdui:IPHint>147.88.219.208/29</mdui:IPHint>
-        <mdui:IPHint>147.88.219.216/29</mdui:IPHint>
-        <mdui:IPHint>147.88.219.224/29</mdui:IPHint>
-        <mdui:IPHint>147.88.0.0/16</mdui:IPHint>
-        <mdui:IPHint>147.88.216.0/26</mdui:IPHint>
-        <mdui:IPHint>147.88.217.0/25</mdui:IPHint>
-        <mdui:DomainHint>hslu.ch</mdui:DomainHint>
-        <mdui:DomainHint>hochschuleluzern.ch</mdui:DomainHint>
-        <mdui:GeolocationHint>geo:47.046681,8.314912</mdui:GeolocationHint>
-        <mdui:GeolocationHint>geo:47.013434,8.305034</mdui:GeolocationHint>
-        <mdui:GeolocationHint>geo:47.174274,8.512537</mdui:GeolocationHint>
-        <mdui:GeolocationHint>geo:47.060845,8.322106</mdui:GeolocationHint>
-        <mdui:GeolocationHint>geo:47.048388,8.309762</mdui:GeolocationHint>
-        <mdui:GeolocationHint>geo:47.048096,8.314655</mdui:GeolocationHint>
-        <mdui:GeolocationHint>geo:47.054246,8.295853</mdui:GeolocationHint>
-      </mdui:DiscoHints>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDDDCCAfSgAwIBAgIJAOIyvPYAinGuMA0GCSqGSIb3DQEBBQUAMBYxFDASBgNV
-BAMTC2lkcC5oc2x1LmNoMB4XDTE0MDQxMTA4MTM1MVoXDTE3MDQxMDA4MTM1MVow
-FjEUMBIGA1UEAxMLaWRwLmhzbHUuY2gwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
-ggEKAoIBAQCwhrP8yk/+IifeO8mUL2SPCX2Jwze6fiyBxaLFsq9PRUKwu/m6CMk9
-87SAvBV541a0pWRpizrAa/jSRNPXQYQLK9h93/5bTc4VBbf1PfqnluOIAq7y23bG
-RQEkcd7NqOkTMOl404LIys0lsk6yQz/GILg6howVh77wGG07AL8DlBFhyjMaOHTt
-aNHh5Chkk8mEB7EP92uJpB6vISJV/Adj2Y95ZefwWo09vGWlUP1usJr0Rhn2HpYy
-68Q0tKY5vXQYIf2IDyoCmPVXW+Q5GWL/WWc/ZUfmi5Srrueh/DRNzoT4/6tqt39r
-RfiVjjhml9p2w4NPwchEYKkec5/ThxIzAgMBAAGjXTBbMDoGA1UdEQQzMDGCC2lk
-cC5oc2x1LmNohiJodHRwczovL2lkcC5oc2x1LmNoL2lkcC9zaGliYm9sZXRoMB0G
-A1UdDgQWBBRclnGUQ4woRbzyaXdRPmu0afzYDDANBgkqhkiG9w0BAQUFAAOCAQEA
-lxSpDW+8n4O9+VGRxrqir42UFerXSYKlr5TiCzU2vpgUOuecK05hrskCeCrn1Zr+
-s4zkISefcaXayNOVhCOfUEfc/eA3VlefzSTfXk84pGkhIDJ4DTDMlkP1MCQNDYcx
-eMTbruMyKU4AYHbQgvhAqXUuMD6dXqtmkKatWTyWw9jNYjsNi18CCPN0UIq2lqoM
-dKuYJ6IAhWZYLq/vqC4kllYX2rhXxu/F/1A92qfG4FhE9urOu+LVd6LdO2WSwj/N
-IwOpfglNU30kw1y3t08Pwq1wZEmNW+5PUjDbUrGLvnPaLRjjXoXVebzPXoqaGJm0
-7uYGZFS62PnJbFAk9NvN1g==
-						</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.hslu.ch:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.hslu.ch: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.hslu.ch/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.hslu.ch/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.hslu.ch/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.hslu.ch/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
-    <Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hslu.ch</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDDDCCAfSgAwIBAgIJAOIyvPYAinGuMA0GCSqGSIb3DQEBBQUAMBYxFDASBgNV
-BAMTC2lkcC5oc2x1LmNoMB4XDTE0MDQxMTA4MTM1MVoXDTE3MDQxMDA4MTM1MVow
-FjEUMBIGA1UEAxMLaWRwLmhzbHUuY2gwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
-ggEKAoIBAQCwhrP8yk/+IifeO8mUL2SPCX2Jwze6fiyBxaLFsq9PRUKwu/m6CMk9
-87SAvBV541a0pWRpizrAa/jSRNPXQYQLK9h93/5bTc4VBbf1PfqnluOIAq7y23bG
-RQEkcd7NqOkTMOl404LIys0lsk6yQz/GILg6howVh77wGG07AL8DlBFhyjMaOHTt
-aNHh5Chkk8mEB7EP92uJpB6vISJV/Adj2Y95ZefwWo09vGWlUP1usJr0Rhn2HpYy
-68Q0tKY5vXQYIf2IDyoCmPVXW+Q5GWL/WWc/ZUfmi5Srrueh/DRNzoT4/6tqt39r
-RfiVjjhml9p2w4NPwchEYKkec5/ThxIzAgMBAAGjXTBbMDoGA1UdEQQzMDGCC2lk
-cC5oc2x1LmNohiJodHRwczovL2lkcC5oc2x1LmNoL2lkcC9zaGliYm9sZXRoMB0G
-A1UdDgQWBBRclnGUQ4woRbzyaXdRPmu0afzYDDANBgkqhkiG9w0BAQUFAAOCAQEA
-lxSpDW+8n4O9+VGRxrqir42UFerXSYKlr5TiCzU2vpgUOuecK05hrskCeCrn1Zr+
-s4zkISefcaXayNOVhCOfUEfc/eA3VlefzSTfXk84pGkhIDJ4DTDMlkP1MCQNDYcx
-eMTbruMyKU4AYHbQgvhAqXUuMD6dXqtmkKatWTyWw9jNYjsNi18CCPN0UIq2lqoM
-dKuYJ6IAhWZYLq/vqC4kllYX2rhXxu/F/1A92qfG4FhE9urOu+LVd6LdO2WSwj/N
-IwOpfglNU30kw1y3t08Pwq1wZEmNW+5PUjDbUrGLvnPaLRjjXoXVebzPXoqaGJm0
-7uYGZFS62PnJbFAk9NvN1g==
-						</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.hslu.ch:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.hslu.ch:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">hslu.ch</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">HSLU - Hochschule Luzern</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">HSLU - Lucerne University of Applied Sciences and Arts</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.hslu.ch/</OrganizationURL>
-    <OrganizationURL xml:lang="en">http://www.hslu.ch/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Hochschule Luzern - IT Services</GivenName>
-    <SurName>(Hotline)</SurName>
-    <EmailAddress>mailto:informatikhotline@hslu.ch</EmailAddress>
-    <TelephoneNumber>+41 41 228 21 21</TelephoneNumber>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Hochschule Luzern - IT Services</GivenName>
-    <SurName>(AAI Technician)</SurName>
-    <EmailAddress>mailto:aai@hslu.ch</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.ibp.cas.cz-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.ibp.cas.cz-idp-shibboleth.xml
deleted file mode 100644
index e25a14c9..00000000
--- a/swamid-interfederations-2.0/idp.ibp.cas.cz-idp-shibboleth.xml
+++ /dev/null
@@ -1,118 +0,0 @@
-<?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.ibp.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/" registrationInstant="2014-07-25T15:25:07Z">
-      <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>
-    <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://eduid.cz/uri/idp-group/avcr</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>
-      <shibmd:Scope regexp="false">ibp.cas.cz</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Institute of Biophysics AS CR</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="cs">Biofyzikální ústav AV ČR</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Identity Provider IBP AV CR employees.</mdui:Description>
-        <mdui:Description xml:lang="cs">Identity Provider pro zaměstnance BFÚ AV ČR</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.ibp.cz/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="cs">http://www.ibp.cz/</mdui:InformationURL>
-        <mdui:Logo height="44" width="81">https://jiftach.cas.cz/loga/logo-ibp-44.png</mdui:Logo>
-        <mdui:Logo height="65" width="120">https://jiftach.cas.cz/loga/logo-ibp-65.png</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDJDCCAgygAwIBAgIVAKW2EZM9liIS9zxSJj2keamQoSWxMA0GCSqGSIb3DQEB
-BQUAMBkxFzAVBgNVBAMTDmlkcC5pYnAuY2FzLmN6MB4XDTE0MDcyNDA5NDU1MFoX
-DTM0MDcyNDA5NDU1MFowGTEXMBUGA1UEAxMOaWRwLmlicC5jYXMuY3owggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDCcjIT8YIRLlcj3VCCeqa2qSwK2Ugb
-ohvyVmx4dldYsP2NpqFM8Hvzmor0Sq+h0CTDAnvsDhpnHTSNC+bWh4nCKahiBZ0b
-GqMMiatHYsq6DawZCRRzI7bKiGmGIxsG5YaqmqBTjvHhsePzkedn5qIp5PEYi+MG
-aL/oQ1UVBsVW0dZGzMpockzxJAbut+kNlC99OsSWoQ/MyDVcPqu36QUaebahQUzF
-hDAB5ZvS+6PylulTmbWHPG5RRtgwNyfGxqpJupbeckt8BN3k5t9ydxNZsI4zyjbn
-ySbdYYhka/8/qOSvGoyg7RAvoqqR2PK417kHc2Ien96u7Q+lMwGKmKOpAgMBAAGj
-YzBhMEAGA1UdEQQ5MDeCDmlkcC5pYnAuY2FzLmN6hiVodHRwczovL2lkcC5pYnAu
-Y2FzLmN6L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBRtafM3sXw4M6AoCL8uynsW
-7CQJQzANBgkqhkiG9w0BAQUFAAOCAQEAlujcijW6c8cVu5QpYIxE2g2AiM9MEf7q
-gBHtO2oSuseSHv6h1ZWNA/9qGg2LPWc1T+QWBQZbT16VyGig5Moxb1J8VPxfv+A0
-eQHoLsBTLVP06npY3NztVm3xogPnpwUcjUagECmar/HKkQ8hMeVatK/o3MR05XRC
-ssOxXuhGNkdEqrBAYJ+ABQSCw0yK9qkA0URqksCGHN4jpmflwa4e+PY/DBlHzn1w
-u9Mna/iP3SHv09aTqAt9DjGGf+3oQRVkybSpdpdgRbXotUyhoGgCazhsWLCSvZke
-zaDcul2ivMCAW6N+57bhddfKSw9fgoTN5yhdbE17rpMTCk3OMSjfNQ==
-
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ibp.cas.cz:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ibp.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.ibp.cas.cz/idp/profile/SAML2/Redirect/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ibp.cas.cz/idp/profile/SAML2/POST/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ibp.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.ibp.cas.cz/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ibp.cas.cz/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.ibp.cas.cz/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ibp.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">ibp.cas.cz</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDJDCCAgygAwIBAgIVAKW2EZM9liIS9zxSJj2keamQoSWxMA0GCSqGSIb3DQEB
-BQUAMBkxFzAVBgNVBAMTDmlkcC5pYnAuY2FzLmN6MB4XDTE0MDcyNDA5NDU1MFoX
-DTM0MDcyNDA5NDU1MFowGTEXMBUGA1UEAxMOaWRwLmlicC5jYXMuY3owggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDCcjIT8YIRLlcj3VCCeqa2qSwK2Ugb
-ohvyVmx4dldYsP2NpqFM8Hvzmor0Sq+h0CTDAnvsDhpnHTSNC+bWh4nCKahiBZ0b
-GqMMiatHYsq6DawZCRRzI7bKiGmGIxsG5YaqmqBTjvHhsePzkedn5qIp5PEYi+MG
-aL/oQ1UVBsVW0dZGzMpockzxJAbut+kNlC99OsSWoQ/MyDVcPqu36QUaebahQUzF
-hDAB5ZvS+6PylulTmbWHPG5RRtgwNyfGxqpJupbeckt8BN3k5t9ydxNZsI4zyjbn
-ySbdYYhka/8/qOSvGoyg7RAvoqqR2PK417kHc2Ien96u7Q+lMwGKmKOpAgMBAAGj
-YzBhMEAGA1UdEQQ5MDeCDmlkcC5pYnAuY2FzLmN6hiVodHRwczovL2lkcC5pYnAu
-Y2FzLmN6L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBRtafM3sXw4M6AoCL8uynsW
-7CQJQzANBgkqhkiG9w0BAQUFAAOCAQEAlujcijW6c8cVu5QpYIxE2g2AiM9MEf7q
-gBHtO2oSuseSHv6h1ZWNA/9qGg2LPWc1T+QWBQZbT16VyGig5Moxb1J8VPxfv+A0
-eQHoLsBTLVP06npY3NztVm3xogPnpwUcjUagECmar/HKkQ8hMeVatK/o3MR05XRC
-ssOxXuhGNkdEqrBAYJ+ABQSCw0yK9qkA0URqksCGHN4jpmflwa4e+PY/DBlHzn1w
-u9Mna/iP3SHv09aTqAt9DjGGf+3oQRVkybSpdpdgRbXotUyhoGgCazhsWLCSvZke
-zaDcul2ivMCAW6N+57bhddfKSw9fgoTN5yhdbE17rpMTCk3OMSjfNQ==
-
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ibp.cas.cz:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ibp.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 Biophysics AS CR</OrganizationName>
-    <OrganizationName xml:lang="cs">Biofyzikální ústav AV ČR</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Institute of Biophysics AS CR, v.v.i.</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="cs">Biofyzikální ústav AV ČR, v.v.i.</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.ibp.cz/</OrganizationURL>
-    <OrganizationURL xml:lang="cs">http://www.ibp.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.ibp.cas.cz.xml b/swamid-interfederations-2.0/idp.ibp.cas.cz.xml
deleted file mode 100644
index e25a14c9..00000000
--- a/swamid-interfederations-2.0/idp.ibp.cas.cz.xml
+++ /dev/null
@@ -1,118 +0,0 @@
-<?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.ibp.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/" registrationInstant="2014-07-25T15:25:07Z">
-      <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>
-    <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://eduid.cz/uri/idp-group/avcr</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>
-      <shibmd:Scope regexp="false">ibp.cas.cz</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Institute of Biophysics AS CR</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="cs">Biofyzikální ústav AV ČR</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Identity Provider IBP AV CR employees.</mdui:Description>
-        <mdui:Description xml:lang="cs">Identity Provider pro zaměstnance BFÚ AV ČR</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.ibp.cz/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="cs">http://www.ibp.cz/</mdui:InformationURL>
-        <mdui:Logo height="44" width="81">https://jiftach.cas.cz/loga/logo-ibp-44.png</mdui:Logo>
-        <mdui:Logo height="65" width="120">https://jiftach.cas.cz/loga/logo-ibp-65.png</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDJDCCAgygAwIBAgIVAKW2EZM9liIS9zxSJj2keamQoSWxMA0GCSqGSIb3DQEB
-BQUAMBkxFzAVBgNVBAMTDmlkcC5pYnAuY2FzLmN6MB4XDTE0MDcyNDA5NDU1MFoX
-DTM0MDcyNDA5NDU1MFowGTEXMBUGA1UEAxMOaWRwLmlicC5jYXMuY3owggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDCcjIT8YIRLlcj3VCCeqa2qSwK2Ugb
-ohvyVmx4dldYsP2NpqFM8Hvzmor0Sq+h0CTDAnvsDhpnHTSNC+bWh4nCKahiBZ0b
-GqMMiatHYsq6DawZCRRzI7bKiGmGIxsG5YaqmqBTjvHhsePzkedn5qIp5PEYi+MG
-aL/oQ1UVBsVW0dZGzMpockzxJAbut+kNlC99OsSWoQ/MyDVcPqu36QUaebahQUzF
-hDAB5ZvS+6PylulTmbWHPG5RRtgwNyfGxqpJupbeckt8BN3k5t9ydxNZsI4zyjbn
-ySbdYYhka/8/qOSvGoyg7RAvoqqR2PK417kHc2Ien96u7Q+lMwGKmKOpAgMBAAGj
-YzBhMEAGA1UdEQQ5MDeCDmlkcC5pYnAuY2FzLmN6hiVodHRwczovL2lkcC5pYnAu
-Y2FzLmN6L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBRtafM3sXw4M6AoCL8uynsW
-7CQJQzANBgkqhkiG9w0BAQUFAAOCAQEAlujcijW6c8cVu5QpYIxE2g2AiM9MEf7q
-gBHtO2oSuseSHv6h1ZWNA/9qGg2LPWc1T+QWBQZbT16VyGig5Moxb1J8VPxfv+A0
-eQHoLsBTLVP06npY3NztVm3xogPnpwUcjUagECmar/HKkQ8hMeVatK/o3MR05XRC
-ssOxXuhGNkdEqrBAYJ+ABQSCw0yK9qkA0URqksCGHN4jpmflwa4e+PY/DBlHzn1w
-u9Mna/iP3SHv09aTqAt9DjGGf+3oQRVkybSpdpdgRbXotUyhoGgCazhsWLCSvZke
-zaDcul2ivMCAW6N+57bhddfKSw9fgoTN5yhdbE17rpMTCk3OMSjfNQ==
-
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ibp.cas.cz:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ibp.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.ibp.cas.cz/idp/profile/SAML2/Redirect/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ibp.cas.cz/idp/profile/SAML2/POST/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ibp.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.ibp.cas.cz/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ibp.cas.cz/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.ibp.cas.cz/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ibp.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">ibp.cas.cz</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDJDCCAgygAwIBAgIVAKW2EZM9liIS9zxSJj2keamQoSWxMA0GCSqGSIb3DQEB
-BQUAMBkxFzAVBgNVBAMTDmlkcC5pYnAuY2FzLmN6MB4XDTE0MDcyNDA5NDU1MFoX
-DTM0MDcyNDA5NDU1MFowGTEXMBUGA1UEAxMOaWRwLmlicC5jYXMuY3owggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDCcjIT8YIRLlcj3VCCeqa2qSwK2Ugb
-ohvyVmx4dldYsP2NpqFM8Hvzmor0Sq+h0CTDAnvsDhpnHTSNC+bWh4nCKahiBZ0b
-GqMMiatHYsq6DawZCRRzI7bKiGmGIxsG5YaqmqBTjvHhsePzkedn5qIp5PEYi+MG
-aL/oQ1UVBsVW0dZGzMpockzxJAbut+kNlC99OsSWoQ/MyDVcPqu36QUaebahQUzF
-hDAB5ZvS+6PylulTmbWHPG5RRtgwNyfGxqpJupbeckt8BN3k5t9ydxNZsI4zyjbn
-ySbdYYhka/8/qOSvGoyg7RAvoqqR2PK417kHc2Ien96u7Q+lMwGKmKOpAgMBAAGj
-YzBhMEAGA1UdEQQ5MDeCDmlkcC5pYnAuY2FzLmN6hiVodHRwczovL2lkcC5pYnAu
-Y2FzLmN6L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBRtafM3sXw4M6AoCL8uynsW
-7CQJQzANBgkqhkiG9w0BAQUFAAOCAQEAlujcijW6c8cVu5QpYIxE2g2AiM9MEf7q
-gBHtO2oSuseSHv6h1ZWNA/9qGg2LPWc1T+QWBQZbT16VyGig5Moxb1J8VPxfv+A0
-eQHoLsBTLVP06npY3NztVm3xogPnpwUcjUagECmar/HKkQ8hMeVatK/o3MR05XRC
-ssOxXuhGNkdEqrBAYJ+ABQSCw0yK9qkA0URqksCGHN4jpmflwa4e+PY/DBlHzn1w
-u9Mna/iP3SHv09aTqAt9DjGGf+3oQRVkybSpdpdgRbXotUyhoGgCazhsWLCSvZke
-zaDcul2ivMCAW6N+57bhddfKSw9fgoTN5yhdbE17rpMTCk3OMSjfNQ==
-
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ibp.cas.cz:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ibp.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 Biophysics AS CR</OrganizationName>
-    <OrganizationName xml:lang="cs">Biofyzikální ústav AV ČR</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Institute of Biophysics AS CR, v.v.i.</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="cs">Biofyzikální ústav AV ČR, v.v.i.</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.ibp.cz/</OrganizationURL>
-    <OrganizationURL xml:lang="cs">http://www.ibp.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.icpf.cas.cz-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.icpf.cas.cz-idp-shibboleth.xml
deleted file mode 100644
index c097c317..00000000
--- a/swamid-interfederations-2.0/idp.icpf.cas.cz-idp-shibboleth.xml
+++ /dev/null
@@ -1,118 +0,0 @@
-<?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.icpf.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/" registrationInstant="2014-03-18T10:21:01Z">
-      <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>
-    <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://eduid.cz/uri/idp-group/avcr</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>
-      <shibmd:Scope regexp="false">icpf.cas.cz</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Institute of Chemical Process Fundamentals of the AS CR</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="cs">Ústav chemických procesů AV ČR</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Identity Provider ICPF AV CR employees.</mdui:Description>
-        <mdui:Description xml:lang="cs">Identity Provider pro zaměstnance ÚCHP AV ČR</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.icpf.cas.cz/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="cs">http://www.icpf.cas.cz/</mdui:InformationURL>
-        <mdui:Logo height="44" width="44">https://jiftach.cas.cz/loga/logo-icpf-44.png</mdui:Logo>
-        <mdui:Logo height="514" width="514">https://jiftach.cas.cz/loga/logo-icpf-514.png</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDJzCCAg+gAwIBAgIULC7Xy9WFiq6Eyaj6NRjS1Y9Jt88wDQYJKoZIhvcNAQEF
-BQAwGjEYMBYGA1UEAxMPaWRwLmljcGYuY2FzLmN6MB4XDTE0MDMxMDA5NDkwMVoX
-DTM0MDMxMDA5NDkwMVowGjEYMBYGA1UEAxMPaWRwLmljcGYuY2FzLmN6MIIBIjAN
-BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsRPjpQTPympllXjrRtBYcrmWxIv+
-vUhf1o/CQTvfDfuSqVvPgudJSv74aUiTrF7T6PrUFqPsJTciWEQgMpxhkudh1GzI
-ALGrlRNAJ6CybJRfWwAgHtKEzNT2YcUSqwkLSTvUj6RKWaSxxtFWnhUHCrKEMyRU
-/XeHUmEu/eiy31dA14UReen3zbvGPcecSJ331HaT3hCvhzHUUvj21NxyHGmHu990
-w+JOnmuAmVMy7wp39qOaCT8baf5jqXHz6RiB7MHNB+lYoeeq6FsH0+Kx7/ITCNV5
-Rgu+i0e9xYHQeoDcoj+9M+KKKtc0kTaEAgrQShvC3s7RNmiT3IAmF5dvzwIDAQAB
-o2UwYzBCBgNVHREEOzA5gg9pZHAuaWNwZi5jYXMuY3qGJmh0dHBzOi8vaWRwLmlj
-cGYuY2FzLmN6L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBRL04il4DX4yVt2YRKw
-yn0RE+jvTjANBgkqhkiG9w0BAQUFAAOCAQEAU8gysmTVfqkh0LLJwGUaYxUN4UZM
-6X9YFsZ0scuhgx6lIbSuqA5Q/cmWlgkk1nnIQEEf5krQ7B/c/LW9SJVvJ2qI3+oy
-Do0R2kOsZJGbYQ86RePMWi/ZrTZ23YWWCEAd3d16t1vyoyPe7pUpUDcH5yMR+ox2
-wmaJjLwBh44Tq/Net8+VU5x1X1Odcm0gKxaUL3wMGkWcmu3TTFVGTW6dQqmk+9vH
-U8aayXh+GW8zLwLWXyJ7e/BcJDDrESDRCMuwNLC40wPec9yhurSX0i8zyVRU+GIy
-TZPDVBpoc7uJtaJLyV/fbDL246MVnkZFwfjs7PwGoHmWANWqpD7ztFH2LQ==
-
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.icpf.cas.cz:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.icpf.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.icpf.cas.cz/idp/profile/SAML2/Redirect/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.icpf.cas.cz/idp/profile/SAML2/POST/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.icpf.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.icpf.cas.cz/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.icpf.cas.cz/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.icpf.cas.cz/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.icpf.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">icpf.cas.cz</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDJzCCAg+gAwIBAgIULC7Xy9WFiq6Eyaj6NRjS1Y9Jt88wDQYJKoZIhvcNAQEF
-BQAwGjEYMBYGA1UEAxMPaWRwLmljcGYuY2FzLmN6MB4XDTE0MDMxMDA5NDkwMVoX
-DTM0MDMxMDA5NDkwMVowGjEYMBYGA1UEAxMPaWRwLmljcGYuY2FzLmN6MIIBIjAN
-BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsRPjpQTPympllXjrRtBYcrmWxIv+
-vUhf1o/CQTvfDfuSqVvPgudJSv74aUiTrF7T6PrUFqPsJTciWEQgMpxhkudh1GzI
-ALGrlRNAJ6CybJRfWwAgHtKEzNT2YcUSqwkLSTvUj6RKWaSxxtFWnhUHCrKEMyRU
-/XeHUmEu/eiy31dA14UReen3zbvGPcecSJ331HaT3hCvhzHUUvj21NxyHGmHu990
-w+JOnmuAmVMy7wp39qOaCT8baf5jqXHz6RiB7MHNB+lYoeeq6FsH0+Kx7/ITCNV5
-Rgu+i0e9xYHQeoDcoj+9M+KKKtc0kTaEAgrQShvC3s7RNmiT3IAmF5dvzwIDAQAB
-o2UwYzBCBgNVHREEOzA5gg9pZHAuaWNwZi5jYXMuY3qGJmh0dHBzOi8vaWRwLmlj
-cGYuY2FzLmN6L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBRL04il4DX4yVt2YRKw
-yn0RE+jvTjANBgkqhkiG9w0BAQUFAAOCAQEAU8gysmTVfqkh0LLJwGUaYxUN4UZM
-6X9YFsZ0scuhgx6lIbSuqA5Q/cmWlgkk1nnIQEEf5krQ7B/c/LW9SJVvJ2qI3+oy
-Do0R2kOsZJGbYQ86RePMWi/ZrTZ23YWWCEAd3d16t1vyoyPe7pUpUDcH5yMR+ox2
-wmaJjLwBh44Tq/Net8+VU5x1X1Odcm0gKxaUL3wMGkWcmu3TTFVGTW6dQqmk+9vH
-U8aayXh+GW8zLwLWXyJ7e/BcJDDrESDRCMuwNLC40wPec9yhurSX0i8zyVRU+GIy
-TZPDVBpoc7uJtaJLyV/fbDL246MVnkZFwfjs7PwGoHmWANWqpD7ztFH2LQ==
-
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.icpf.cas.cz:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.icpf.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">Institute of Chemical Process Fundamentals of the ASCR</OrganizationName>
-    <OrganizationName xml:lang="cs">Ústav chemických procesů AV ČR</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Institute of Chemical Process Fundamentals of the ASCR</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="cs">Ústav chemických procesů AV ČR</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.icpf.cas.cz/</OrganizationURL>
-    <OrganizationURL xml:lang="cs">http://www.icpf.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.icpf.cas.cz.xml b/swamid-interfederations-2.0/idp.icpf.cas.cz.xml
deleted file mode 100644
index c097c317..00000000
--- a/swamid-interfederations-2.0/idp.icpf.cas.cz.xml
+++ /dev/null
@@ -1,118 +0,0 @@
-<?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.icpf.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/" registrationInstant="2014-03-18T10:21:01Z">
-      <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>
-    <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://eduid.cz/uri/idp-group/avcr</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>
-      <shibmd:Scope regexp="false">icpf.cas.cz</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Institute of Chemical Process Fundamentals of the AS CR</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="cs">Ústav chemických procesů AV ČR</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Identity Provider ICPF AV CR employees.</mdui:Description>
-        <mdui:Description xml:lang="cs">Identity Provider pro zaměstnance ÚCHP AV ČR</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.icpf.cas.cz/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="cs">http://www.icpf.cas.cz/</mdui:InformationURL>
-        <mdui:Logo height="44" width="44">https://jiftach.cas.cz/loga/logo-icpf-44.png</mdui:Logo>
-        <mdui:Logo height="514" width="514">https://jiftach.cas.cz/loga/logo-icpf-514.png</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDJzCCAg+gAwIBAgIULC7Xy9WFiq6Eyaj6NRjS1Y9Jt88wDQYJKoZIhvcNAQEF
-BQAwGjEYMBYGA1UEAxMPaWRwLmljcGYuY2FzLmN6MB4XDTE0MDMxMDA5NDkwMVoX
-DTM0MDMxMDA5NDkwMVowGjEYMBYGA1UEAxMPaWRwLmljcGYuY2FzLmN6MIIBIjAN
-BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsRPjpQTPympllXjrRtBYcrmWxIv+
-vUhf1o/CQTvfDfuSqVvPgudJSv74aUiTrF7T6PrUFqPsJTciWEQgMpxhkudh1GzI
-ALGrlRNAJ6CybJRfWwAgHtKEzNT2YcUSqwkLSTvUj6RKWaSxxtFWnhUHCrKEMyRU
-/XeHUmEu/eiy31dA14UReen3zbvGPcecSJ331HaT3hCvhzHUUvj21NxyHGmHu990
-w+JOnmuAmVMy7wp39qOaCT8baf5jqXHz6RiB7MHNB+lYoeeq6FsH0+Kx7/ITCNV5
-Rgu+i0e9xYHQeoDcoj+9M+KKKtc0kTaEAgrQShvC3s7RNmiT3IAmF5dvzwIDAQAB
-o2UwYzBCBgNVHREEOzA5gg9pZHAuaWNwZi5jYXMuY3qGJmh0dHBzOi8vaWRwLmlj
-cGYuY2FzLmN6L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBRL04il4DX4yVt2YRKw
-yn0RE+jvTjANBgkqhkiG9w0BAQUFAAOCAQEAU8gysmTVfqkh0LLJwGUaYxUN4UZM
-6X9YFsZ0scuhgx6lIbSuqA5Q/cmWlgkk1nnIQEEf5krQ7B/c/LW9SJVvJ2qI3+oy
-Do0R2kOsZJGbYQ86RePMWi/ZrTZ23YWWCEAd3d16t1vyoyPe7pUpUDcH5yMR+ox2
-wmaJjLwBh44Tq/Net8+VU5x1X1Odcm0gKxaUL3wMGkWcmu3TTFVGTW6dQqmk+9vH
-U8aayXh+GW8zLwLWXyJ7e/BcJDDrESDRCMuwNLC40wPec9yhurSX0i8zyVRU+GIy
-TZPDVBpoc7uJtaJLyV/fbDL246MVnkZFwfjs7PwGoHmWANWqpD7ztFH2LQ==
-
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.icpf.cas.cz:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.icpf.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.icpf.cas.cz/idp/profile/SAML2/Redirect/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.icpf.cas.cz/idp/profile/SAML2/POST/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.icpf.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.icpf.cas.cz/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.icpf.cas.cz/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.icpf.cas.cz/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.icpf.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">icpf.cas.cz</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDJzCCAg+gAwIBAgIULC7Xy9WFiq6Eyaj6NRjS1Y9Jt88wDQYJKoZIhvcNAQEF
-BQAwGjEYMBYGA1UEAxMPaWRwLmljcGYuY2FzLmN6MB4XDTE0MDMxMDA5NDkwMVoX
-DTM0MDMxMDA5NDkwMVowGjEYMBYGA1UEAxMPaWRwLmljcGYuY2FzLmN6MIIBIjAN
-BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsRPjpQTPympllXjrRtBYcrmWxIv+
-vUhf1o/CQTvfDfuSqVvPgudJSv74aUiTrF7T6PrUFqPsJTciWEQgMpxhkudh1GzI
-ALGrlRNAJ6CybJRfWwAgHtKEzNT2YcUSqwkLSTvUj6RKWaSxxtFWnhUHCrKEMyRU
-/XeHUmEu/eiy31dA14UReen3zbvGPcecSJ331HaT3hCvhzHUUvj21NxyHGmHu990
-w+JOnmuAmVMy7wp39qOaCT8baf5jqXHz6RiB7MHNB+lYoeeq6FsH0+Kx7/ITCNV5
-Rgu+i0e9xYHQeoDcoj+9M+KKKtc0kTaEAgrQShvC3s7RNmiT3IAmF5dvzwIDAQAB
-o2UwYzBCBgNVHREEOzA5gg9pZHAuaWNwZi5jYXMuY3qGJmh0dHBzOi8vaWRwLmlj
-cGYuY2FzLmN6L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBRL04il4DX4yVt2YRKw
-yn0RE+jvTjANBgkqhkiG9w0BAQUFAAOCAQEAU8gysmTVfqkh0LLJwGUaYxUN4UZM
-6X9YFsZ0scuhgx6lIbSuqA5Q/cmWlgkk1nnIQEEf5krQ7B/c/LW9SJVvJ2qI3+oy
-Do0R2kOsZJGbYQ86RePMWi/ZrTZ23YWWCEAd3d16t1vyoyPe7pUpUDcH5yMR+ox2
-wmaJjLwBh44Tq/Net8+VU5x1X1Odcm0gKxaUL3wMGkWcmu3TTFVGTW6dQqmk+9vH
-U8aayXh+GW8zLwLWXyJ7e/BcJDDrESDRCMuwNLC40wPec9yhurSX0i8zyVRU+GIy
-TZPDVBpoc7uJtaJLyV/fbDL246MVnkZFwfjs7PwGoHmWANWqpD7ztFH2LQ==
-
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.icpf.cas.cz:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.icpf.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">Institute of Chemical Process Fundamentals of the ASCR</OrganizationName>
-    <OrganizationName xml:lang="cs">Ústav chemických procesů AV ČR</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Institute of Chemical Process Fundamentals of the ASCR</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="cs">Ústav chemických procesů AV ČR</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.icpf.cas.cz/</OrganizationURL>
-    <OrganizationURL xml:lang="cs">http://www.icpf.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.ids-mannheim.de-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.ids-mannheim.de-idp-shibboleth.xml
deleted file mode 100644
index ea2e29e0..00000000
--- a/swamid-interfederations-2.0/idp.ids-mannheim.de-idp-shibboleth.xml
+++ /dev/null
@@ -1,136 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.ids-mannheim.de/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2009-12-22T10:22:36Z">
-      <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">ids-mannheim.de</saml1md:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="de">Institut für Deutsche Sprache (IDS)</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Institut für Deutsche Sprache (IDS)</mdui:DisplayName>
-        <mdui:Description xml:lang="de">Identity-Provider des Institut für Deutsche Sprache</mdui:Description>
-        <mdui:Description xml:lang="en">Identity-Provider of the Institut für Deutsche Sprache</mdui:Description>
-        <mdui:Logo height="16" width="16">https://idp.ids-mannheim.de/logos/ids-logo-small.png</mdui:Logo>
-        <mdui:Logo height="63" width="318">https://idp.ids-mannheim.de/logos/ids-logo-large.png</mdui:Logo>
-        <mdui:InformationURL xml:lang="de">http://www.ids-mannheim.de</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">http://www.ids-mannheim.de</mdui:InformationURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.ids-mannheim.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.ids-mannheim.de,OU=DFN-PKI,O=DFN-Verein,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIE4zCCA8ugAwIBAgIEDyTTjjANBgkqhkiG9w0BAQUFADBVMQswCQYDVQQGEwJE
-RTETMBEGA1UEChMKREZOLVZlcmVpbjEQMA4GA1UECxMHREZOLVBLSTEfMB0GA1UE
-AxMWREZOLVZlcmVpbiBDQSBTZXJ2aWNlczAeFw0wOTExMTkxNDI4MTVaFw0xNDEx
-MTgxNDI4MTVaMFIxCzAJBgNVBAYTAkRFMRMwEQYDVQQKEwpERk4tVmVyZWluMRAw
-DgYDVQQLEwdERk4tUEtJMRwwGgYDVQQDExNpZHAuaWRzLW1hbm5oZWltLmRlMIIB
-IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAt7L/7N+17/v7lajOiMdvThxk
-NoiCwy2RDzaDi7IEvJtXmT1CkKXVg84uxCneoixdPwO9EZAyphOGfXyvIWiWOEkB
-8135pYTbKNYPuG0+fIYXPvHE1+oFMca3K21GgssvoOZYJfi/wrORLx77iQXRgGYF
-mRllzaspZriQNbIvCwVsKsoL8zt9TeVa0Ltv6A7dRg/36u8XppG4glE4xuuXQgNI
-mj0qpJ9pV76bgzPKUNm2/aXDiyqoI4qvp2h4vM2sFv2MAguPkHI7PPcVXn1L2q3h
-WpylL+gjjNfZm1TdDww+r1HFdeQDORmjSh+Cd4bbdEeA2bWH3NHjSR6xWwCj/wID
-AQABo4IBvDCCAbgwCQYDVR0TBAIwADALBgNVHQ8EBAMCBeAwHQYDVR0lBBYwFAYI
-KwYBBQUHAwIGCCsGAQUFBwMBMB0GA1UdDgQWBBSg5wzZdnXH5hJRlkFfkCXU0cFr
-4TAfBgNVHSMEGDAWgBQdqfGGJnZNz139UKNu6/G8InVt6zCBkQYDVR0fBIGJMIGG
-MEGgP6A9hjtodHRwOi8vY2RwMS5wY2EuZGZuLmRlL2dsb2JhbC1zZXJ2aWNlcy1j
-YS9wdWIvY3JsL2NhY3JsLmNybDBBoD+gPYY7aHR0cDovL2NkcDIucGNhLmRmbi5k
-ZS9nbG9iYWwtc2VydmljZXMtY2EvcHViL2NybC9jYWNybC5jcmwwgaoGCCsGAQUF
-BwEBBIGdMIGaMEsGCCsGAQUFBzAChj9odHRwOi8vY2RwMS5wY2EuZGZuLmRlL2ds
-b2JhbC1zZXJ2aWNlcy1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwSwYIKwYBBQUH
-MAKGP2h0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvZ2xvYmFsLXNlcnZpY2VzLWNhL3B1
-Yi9jYWNlcnQvY2FjZXJ0LmNydDANBgkqhkiG9w0BAQUFAAOCAQEAB1uluFS88lYI
-QPiuEvlALX1GYfNZTNCJogeflb5E59zdd49Y7L5zs9IXbYLUMqSQrbLyv4i4nK4e
-bApMu6sgKRf6qPW/MZUAmW0VXjce+W3elGohc4D0MSVHXZQN48Y3S0Jktc5CVC46
-HzxN+4WnjMpVFIB8d5PoL8Nck6vuKvM/IzQbUKym9VC29qwxUIyzG7/f6OuzwXtJ
-xPmwm/Z3/0myg08CF/awdegYuOaq2NBWi7ZvJefTvunuzhwv8LcNPon2mFomUq+E
-VVbh+FSPaIx4RWUSCYsAX8B5Yx9FCb0PJ8HnemcVzgyA8x4Qh5JYbdo0FiNI04LE
-99YJ9IIzYQ==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ids-mannheim.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ids-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.ids-mannheim.de/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ids-mannheim.de/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.ids-mannheim.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ids-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">ids-mannheim.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.ids-mannheim.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.ids-mannheim.de,OU=DFN-PKI,O=DFN-Verein,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIE4zCCA8ugAwIBAgIEDyTTjjANBgkqhkiG9w0BAQUFADBVMQswCQYDVQQGEwJE
-RTETMBEGA1UEChMKREZOLVZlcmVpbjEQMA4GA1UECxMHREZOLVBLSTEfMB0GA1UE
-AxMWREZOLVZlcmVpbiBDQSBTZXJ2aWNlczAeFw0wOTExMTkxNDI4MTVaFw0xNDEx
-MTgxNDI4MTVaMFIxCzAJBgNVBAYTAkRFMRMwEQYDVQQKEwpERk4tVmVyZWluMRAw
-DgYDVQQLEwdERk4tUEtJMRwwGgYDVQQDExNpZHAuaWRzLW1hbm5oZWltLmRlMIIB
-IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAt7L/7N+17/v7lajOiMdvThxk
-NoiCwy2RDzaDi7IEvJtXmT1CkKXVg84uxCneoixdPwO9EZAyphOGfXyvIWiWOEkB
-8135pYTbKNYPuG0+fIYXPvHE1+oFMca3K21GgssvoOZYJfi/wrORLx77iQXRgGYF
-mRllzaspZriQNbIvCwVsKsoL8zt9TeVa0Ltv6A7dRg/36u8XppG4glE4xuuXQgNI
-mj0qpJ9pV76bgzPKUNm2/aXDiyqoI4qvp2h4vM2sFv2MAguPkHI7PPcVXn1L2q3h
-WpylL+gjjNfZm1TdDww+r1HFdeQDORmjSh+Cd4bbdEeA2bWH3NHjSR6xWwCj/wID
-AQABo4IBvDCCAbgwCQYDVR0TBAIwADALBgNVHQ8EBAMCBeAwHQYDVR0lBBYwFAYI
-KwYBBQUHAwIGCCsGAQUFBwMBMB0GA1UdDgQWBBSg5wzZdnXH5hJRlkFfkCXU0cFr
-4TAfBgNVHSMEGDAWgBQdqfGGJnZNz139UKNu6/G8InVt6zCBkQYDVR0fBIGJMIGG
-MEGgP6A9hjtodHRwOi8vY2RwMS5wY2EuZGZuLmRlL2dsb2JhbC1zZXJ2aWNlcy1j
-YS9wdWIvY3JsL2NhY3JsLmNybDBBoD+gPYY7aHR0cDovL2NkcDIucGNhLmRmbi5k
-ZS9nbG9iYWwtc2VydmljZXMtY2EvcHViL2NybC9jYWNybC5jcmwwgaoGCCsGAQUF
-BwEBBIGdMIGaMEsGCCsGAQUFBzAChj9odHRwOi8vY2RwMS5wY2EuZGZuLmRlL2ds
-b2JhbC1zZXJ2aWNlcy1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwSwYIKwYBBQUH
-MAKGP2h0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvZ2xvYmFsLXNlcnZpY2VzLWNhL3B1
-Yi9jYWNlcnQvY2FjZXJ0LmNydDANBgkqhkiG9w0BAQUFAAOCAQEAB1uluFS88lYI
-QPiuEvlALX1GYfNZTNCJogeflb5E59zdd49Y7L5zs9IXbYLUMqSQrbLyv4i4nK4e
-bApMu6sgKRf6qPW/MZUAmW0VXjce+W3elGohc4D0MSVHXZQN48Y3S0Jktc5CVC46
-HzxN+4WnjMpVFIB8d5PoL8Nck6vuKvM/IzQbUKym9VC29qwxUIyzG7/f6OuzwXtJ
-xPmwm/Z3/0myg08CF/awdegYuOaq2NBWi7ZvJefTvunuzhwv8LcNPon2mFomUq+E
-VVbh+FSPaIx4RWUSCYsAX8B5Yx9FCb0PJ8HnemcVzgyA8x4Qh5JYbdo0FiNI04LE
-99YJ9IIzYQ==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ids-mannheim.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ids-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">e217</OrganizationName>
-    <OrganizationName xml:lang="en">e217</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">Institut für Deutsche Sprache (IDS)</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">Institut für Deutsche Sprache (IDS)</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.ids-mannheim.de</OrganizationURL>
-    <OrganizationURL xml:lang="en">http://www.ids-mannheim.de</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Oliver</GivenName>
-    <SurName>Schonefeld</SurName>
-    <EmailAddress>mailto:schonefeld@ids-mannheim.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="administrative">
-    <GivenName>Andreas</GivenName>
-    <SurName>Witt</SurName>
-    <EmailAddress>mailto:witt@ids-mannheim.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="support">
-    <GivenName>AAI</GivenName>
-    <SurName>Team</SurName>
-    <EmailAddress>mailto:aai@ids-mannheim.de</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.ids-mannheim.de.xml b/swamid-interfederations-2.0/idp.ids-mannheim.de.xml
deleted file mode 100644
index ea2e29e0..00000000
--- a/swamid-interfederations-2.0/idp.ids-mannheim.de.xml
+++ /dev/null
@@ -1,136 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.ids-mannheim.de/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2009-12-22T10:22:36Z">
-      <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">ids-mannheim.de</saml1md:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="de">Institut für Deutsche Sprache (IDS)</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Institut für Deutsche Sprache (IDS)</mdui:DisplayName>
-        <mdui:Description xml:lang="de">Identity-Provider des Institut für Deutsche Sprache</mdui:Description>
-        <mdui:Description xml:lang="en">Identity-Provider of the Institut für Deutsche Sprache</mdui:Description>
-        <mdui:Logo height="16" width="16">https://idp.ids-mannheim.de/logos/ids-logo-small.png</mdui:Logo>
-        <mdui:Logo height="63" width="318">https://idp.ids-mannheim.de/logos/ids-logo-large.png</mdui:Logo>
-        <mdui:InformationURL xml:lang="de">http://www.ids-mannheim.de</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">http://www.ids-mannheim.de</mdui:InformationURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.ids-mannheim.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.ids-mannheim.de,OU=DFN-PKI,O=DFN-Verein,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIE4zCCA8ugAwIBAgIEDyTTjjANBgkqhkiG9w0BAQUFADBVMQswCQYDVQQGEwJE
-RTETMBEGA1UEChMKREZOLVZlcmVpbjEQMA4GA1UECxMHREZOLVBLSTEfMB0GA1UE
-AxMWREZOLVZlcmVpbiBDQSBTZXJ2aWNlczAeFw0wOTExMTkxNDI4MTVaFw0xNDEx
-MTgxNDI4MTVaMFIxCzAJBgNVBAYTAkRFMRMwEQYDVQQKEwpERk4tVmVyZWluMRAw
-DgYDVQQLEwdERk4tUEtJMRwwGgYDVQQDExNpZHAuaWRzLW1hbm5oZWltLmRlMIIB
-IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAt7L/7N+17/v7lajOiMdvThxk
-NoiCwy2RDzaDi7IEvJtXmT1CkKXVg84uxCneoixdPwO9EZAyphOGfXyvIWiWOEkB
-8135pYTbKNYPuG0+fIYXPvHE1+oFMca3K21GgssvoOZYJfi/wrORLx77iQXRgGYF
-mRllzaspZriQNbIvCwVsKsoL8zt9TeVa0Ltv6A7dRg/36u8XppG4glE4xuuXQgNI
-mj0qpJ9pV76bgzPKUNm2/aXDiyqoI4qvp2h4vM2sFv2MAguPkHI7PPcVXn1L2q3h
-WpylL+gjjNfZm1TdDww+r1HFdeQDORmjSh+Cd4bbdEeA2bWH3NHjSR6xWwCj/wID
-AQABo4IBvDCCAbgwCQYDVR0TBAIwADALBgNVHQ8EBAMCBeAwHQYDVR0lBBYwFAYI
-KwYBBQUHAwIGCCsGAQUFBwMBMB0GA1UdDgQWBBSg5wzZdnXH5hJRlkFfkCXU0cFr
-4TAfBgNVHSMEGDAWgBQdqfGGJnZNz139UKNu6/G8InVt6zCBkQYDVR0fBIGJMIGG
-MEGgP6A9hjtodHRwOi8vY2RwMS5wY2EuZGZuLmRlL2dsb2JhbC1zZXJ2aWNlcy1j
-YS9wdWIvY3JsL2NhY3JsLmNybDBBoD+gPYY7aHR0cDovL2NkcDIucGNhLmRmbi5k
-ZS9nbG9iYWwtc2VydmljZXMtY2EvcHViL2NybC9jYWNybC5jcmwwgaoGCCsGAQUF
-BwEBBIGdMIGaMEsGCCsGAQUFBzAChj9odHRwOi8vY2RwMS5wY2EuZGZuLmRlL2ds
-b2JhbC1zZXJ2aWNlcy1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwSwYIKwYBBQUH
-MAKGP2h0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvZ2xvYmFsLXNlcnZpY2VzLWNhL3B1
-Yi9jYWNlcnQvY2FjZXJ0LmNydDANBgkqhkiG9w0BAQUFAAOCAQEAB1uluFS88lYI
-QPiuEvlALX1GYfNZTNCJogeflb5E59zdd49Y7L5zs9IXbYLUMqSQrbLyv4i4nK4e
-bApMu6sgKRf6qPW/MZUAmW0VXjce+W3elGohc4D0MSVHXZQN48Y3S0Jktc5CVC46
-HzxN+4WnjMpVFIB8d5PoL8Nck6vuKvM/IzQbUKym9VC29qwxUIyzG7/f6OuzwXtJ
-xPmwm/Z3/0myg08CF/awdegYuOaq2NBWi7ZvJefTvunuzhwv8LcNPon2mFomUq+E
-VVbh+FSPaIx4RWUSCYsAX8B5Yx9FCb0PJ8HnemcVzgyA8x4Qh5JYbdo0FiNI04LE
-99YJ9IIzYQ==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ids-mannheim.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ids-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.ids-mannheim.de/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ids-mannheim.de/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.ids-mannheim.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ids-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">ids-mannheim.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.ids-mannheim.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.ids-mannheim.de,OU=DFN-PKI,O=DFN-Verein,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIE4zCCA8ugAwIBAgIEDyTTjjANBgkqhkiG9w0BAQUFADBVMQswCQYDVQQGEwJE
-RTETMBEGA1UEChMKREZOLVZlcmVpbjEQMA4GA1UECxMHREZOLVBLSTEfMB0GA1UE
-AxMWREZOLVZlcmVpbiBDQSBTZXJ2aWNlczAeFw0wOTExMTkxNDI4MTVaFw0xNDEx
-MTgxNDI4MTVaMFIxCzAJBgNVBAYTAkRFMRMwEQYDVQQKEwpERk4tVmVyZWluMRAw
-DgYDVQQLEwdERk4tUEtJMRwwGgYDVQQDExNpZHAuaWRzLW1hbm5oZWltLmRlMIIB
-IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAt7L/7N+17/v7lajOiMdvThxk
-NoiCwy2RDzaDi7IEvJtXmT1CkKXVg84uxCneoixdPwO9EZAyphOGfXyvIWiWOEkB
-8135pYTbKNYPuG0+fIYXPvHE1+oFMca3K21GgssvoOZYJfi/wrORLx77iQXRgGYF
-mRllzaspZriQNbIvCwVsKsoL8zt9TeVa0Ltv6A7dRg/36u8XppG4glE4xuuXQgNI
-mj0qpJ9pV76bgzPKUNm2/aXDiyqoI4qvp2h4vM2sFv2MAguPkHI7PPcVXn1L2q3h
-WpylL+gjjNfZm1TdDww+r1HFdeQDORmjSh+Cd4bbdEeA2bWH3NHjSR6xWwCj/wID
-AQABo4IBvDCCAbgwCQYDVR0TBAIwADALBgNVHQ8EBAMCBeAwHQYDVR0lBBYwFAYI
-KwYBBQUHAwIGCCsGAQUFBwMBMB0GA1UdDgQWBBSg5wzZdnXH5hJRlkFfkCXU0cFr
-4TAfBgNVHSMEGDAWgBQdqfGGJnZNz139UKNu6/G8InVt6zCBkQYDVR0fBIGJMIGG
-MEGgP6A9hjtodHRwOi8vY2RwMS5wY2EuZGZuLmRlL2dsb2JhbC1zZXJ2aWNlcy1j
-YS9wdWIvY3JsL2NhY3JsLmNybDBBoD+gPYY7aHR0cDovL2NkcDIucGNhLmRmbi5k
-ZS9nbG9iYWwtc2VydmljZXMtY2EvcHViL2NybC9jYWNybC5jcmwwgaoGCCsGAQUF
-BwEBBIGdMIGaMEsGCCsGAQUFBzAChj9odHRwOi8vY2RwMS5wY2EuZGZuLmRlL2ds
-b2JhbC1zZXJ2aWNlcy1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwSwYIKwYBBQUH
-MAKGP2h0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvZ2xvYmFsLXNlcnZpY2VzLWNhL3B1
-Yi9jYWNlcnQvY2FjZXJ0LmNydDANBgkqhkiG9w0BAQUFAAOCAQEAB1uluFS88lYI
-QPiuEvlALX1GYfNZTNCJogeflb5E59zdd49Y7L5zs9IXbYLUMqSQrbLyv4i4nK4e
-bApMu6sgKRf6qPW/MZUAmW0VXjce+W3elGohc4D0MSVHXZQN48Y3S0Jktc5CVC46
-HzxN+4WnjMpVFIB8d5PoL8Nck6vuKvM/IzQbUKym9VC29qwxUIyzG7/f6OuzwXtJ
-xPmwm/Z3/0myg08CF/awdegYuOaq2NBWi7ZvJefTvunuzhwv8LcNPon2mFomUq+E
-VVbh+FSPaIx4RWUSCYsAX8B5Yx9FCb0PJ8HnemcVzgyA8x4Qh5JYbdo0FiNI04LE
-99YJ9IIzYQ==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ids-mannheim.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ids-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">e217</OrganizationName>
-    <OrganizationName xml:lang="en">e217</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">Institut für Deutsche Sprache (IDS)</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">Institut für Deutsche Sprache (IDS)</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.ids-mannheim.de</OrganizationURL>
-    <OrganizationURL xml:lang="en">http://www.ids-mannheim.de</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Oliver</GivenName>
-    <SurName>Schonefeld</SurName>
-    <EmailAddress>mailto:schonefeld@ids-mannheim.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="administrative">
-    <GivenName>Andreas</GivenName>
-    <SurName>Witt</SurName>
-    <EmailAddress>mailto:witt@ids-mannheim.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="support">
-    <GivenName>AAI</GivenName>
-    <SurName>Team</SurName>
-    <EmailAddress>mailto:aai@ids-mannheim.de</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.ifal.edu.br-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.ifal.edu.br-idp-shibboleth.xml
deleted file mode 100644
index 832b9f63..00000000
--- a/swamid-interfederations-2.0/idp.ifal.edu.br-idp-shibboleth.xml
+++ /dev/null
@@ -1,114 +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://idp.ifal.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">edu.br</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">IFAL - Instituto Federal de Educacao, Ciencia e Tecnologia de Alagoas</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="pt-br">IFAL - Instituto Federal de Educacao, Ciencia e Tecnologia de Alagoas</mdui:DisplayName>
-        <mdui:Description xml:lang="en">IFAL - Instituto Federal de Educacao, Ciencia e Tecnologia de Alagoas</mdui:Description>
-        <mdui:Description xml:lang="pt-br">IFAL - Instituto Federal de Educacao, Ciencia e Tecnologia de Alagoas</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.ifal.edu.br/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="pt-br">http://www.ifal.edu.br/</mdui:InformationURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-    MIIEGDCCAwACAQAwDQYJKoZIhvcNAQEFBQAwgdExLDAqBgNVBAoTI0lGQUwgLSBJ
-bnN0aXR1dG8gRmVkZXJhbCBkZSBBbGFnb2FzMTYwNAYDVQQLFC1EVEkgLSBEaXJl
-dG9yaWEgZGUgVGVjbm9sb2dpYSBkYSBJbmZvcm1hw6fDo28xHjAcBgkqhkiG9w0B
-CQEWD2R0aUBpZmFsLmVkdS5icjEQMA4GA1UEBxQHTWFjZWnDszEQMA4GA1UECBMH
-QWxhZ29hczELMAkGA1UEBhMCQlIxGDAWBgNVBAMTD2lkcC5pZmFsLmVkdS5icjAe
-Fw0xNDA0MDkxNzUwMDdaFw0xOTA0MDgxNzUwMDdaMIHRMSwwKgYDVQQKEyNJRkFM
-IC0gSW5zdGl0dXRvIEZlZGVyYWwgZGUgQWxhZ29hczE2MDQGA1UECxQtRFRJIC0g
-RGlyZXRvcmlhIGRlIFRlY25vbG9naWEgZGEgSW5mb3JtYcOnw6NvMR4wHAYJKoZI
-hvcNAQkBFg9kdGlAaWZhbC5lZHUuYnIxEDAOBgNVBAcUB01hY2Vpw7MxEDAOBgNV
-BAgTB0FsYWdvYXMxCzAJBgNVBAYTAkJSMRgwFgYDVQQDEw9pZHAuaWZhbC5lZHUu
-YnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDMYSN7ZQVR03UfNJEG
-xcyGLGW4iWbmGMuhnua6t+X6HMhU2YFmCB/nVKmPaLZrGdtopkFxO9vvCr9kHRPl
-5xRVT20yWIiSiQVsFZYc76FOS3jTwgYAE0+lwt/4N+6lsSSSD1JByI8PDR/E3v4U
-FEDmJ/SpPQo93OWYlUNyo9LsFGFYJ88U4EX8Tg+LmPpvjP7AKwuOpUtyV8Mdv97x
-HxVvQ6eh2hhibiaS3h/YPhyqBPn7rviM//zUx5/rcjABdlcLRmnguuXF/FCnWWHz
-JNvxikEjpADZw4I9zA+aMr/cJEkfnryEGzRrLRzfMdFa4bP3/MEQYmIdhDIej9+K
-7mZZAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBADYaFXfiCJtLtww2Qwwanyg4qUT2
-B2oYluc4YiHrGNT+ZAsr9g94gumyDyZ+XbZWHhWrrLCfw9qe3h0CrRUDo8imO+sE
-TYGq7XpOcAJWyKQVgcDICWiL6zQENRX/EeOfmOpbkjea/MEaqK0nyRQlaA4pIXYL
-vSvRPNaw93HsFLdGrJOQ0iZIp3wXB/th8NcGeLYC2DVXWfyL+3dTsCusEatFrkWO
-GYTYC2CuhPvNQnW6zntOBvF5+m8u3UE5S7b1ewJNR+bmnyRc5Jn3c+hDby241MxP
-9absP8SAHft1nylCyQlyRb7eDLMdi+iNITGXEKHAyXu20TXapcllySccxOk=
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ifal.edu.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ifal.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://idp.ifal.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ifal.edu.br/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.ifal.edu.br/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ifal.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>
-      
-MIIEGDCCAwACAQAwDQYJKoZIhvcNAQEFBQAwgdExLDAqBgNVBAoTI0lGQUwgLSBJ
-bnN0aXR1dG8gRmVkZXJhbCBkZSBBbGFnb2FzMTYwNAYDVQQLFC1EVEkgLSBEaXJl
-dG9yaWEgZGUgVGVjbm9sb2dpYSBkYSBJbmZvcm1hw6fDo28xHjAcBgkqhkiG9w0B
-CQEWD2R0aUBpZmFsLmVkdS5icjEQMA4GA1UEBxQHTWFjZWnDszEQMA4GA1UECBMH
-QWxhZ29hczELMAkGA1UEBhMCQlIxGDAWBgNVBAMTD2lkcC5pZmFsLmVkdS5icjAe
-Fw0xNDA0MDkxNzUwMDdaFw0xOTA0MDgxNzUwMDdaMIHRMSwwKgYDVQQKEyNJRkFM
-IC0gSW5zdGl0dXRvIEZlZGVyYWwgZGUgQWxhZ29hczE2MDQGA1UECxQtRFRJIC0g
-RGlyZXRvcmlhIGRlIFRlY25vbG9naWEgZGEgSW5mb3JtYcOnw6NvMR4wHAYJKoZI
-hvcNAQkBFg9kdGlAaWZhbC5lZHUuYnIxEDAOBgNVBAcUB01hY2Vpw7MxEDAOBgNV
-BAgTB0FsYWdvYXMxCzAJBgNVBAYTAkJSMRgwFgYDVQQDEw9pZHAuaWZhbC5lZHUu
-YnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDMYSN7ZQVR03UfNJEG
-xcyGLGW4iWbmGMuhnua6t+X6HMhU2YFmCB/nVKmPaLZrGdtopkFxO9vvCr9kHRPl
-5xRVT20yWIiSiQVsFZYc76FOS3jTwgYAE0+lwt/4N+6lsSSSD1JByI8PDR/E3v4U
-FEDmJ/SpPQo93OWYlUNyo9LsFGFYJ88U4EX8Tg+LmPpvjP7AKwuOpUtyV8Mdv97x
-HxVvQ6eh2hhibiaS3h/YPhyqBPn7rviM//zUx5/rcjABdlcLRmnguuXF/FCnWWHz
-JNvxikEjpADZw4I9zA+aMr/cJEkfnryEGzRrLRzfMdFa4bP3/MEQYmIdhDIej9+K
-7mZZAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBADYaFXfiCJtLtww2Qwwanyg4qUT2
-B2oYluc4YiHrGNT+ZAsr9g94gumyDyZ+XbZWHhWrrLCfw9qe3h0CrRUDo8imO+sE
-TYGq7XpOcAJWyKQVgcDICWiL6zQENRX/EeOfmOpbkjea/MEaqK0nyRQlaA4pIXYL
-vSvRPNaw93HsFLdGrJOQ0iZIp3wXB/th8NcGeLYC2DVXWfyL+3dTsCusEatFrkWO
-GYTYC2CuhPvNQnW6zntOBvF5+m8u3UE5S7b1ewJNR+bmnyRc5Jn3c+hDby241MxP
-9absP8SAHft1nylCyQlyRb7eDLMdi+iNITGXEKHAyXu20TXapcllySccxOk=
-                    
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ifal.edu.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ifal.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">IFAL - Instituto Federal de Educacao, Ciencia e Tecnologia de Alagoas</OrganizationName>
-    <OrganizationName xml:lang="pt-br">IFAL - Instituto Federal de Educacao, Ciencia e Tecnologia de Alagoas</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">IFAL - Instituto Federal de Educacao, Ciencia e Tecnologia de Alagoas</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="pt-br">IFAL - Instituto Federal de Educacao, Ciencia e Tecnologia de Alagoas</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.ifal.edu.br/</OrganizationURL>
-    <OrganizationURL xml:lang="pt-br">http://www.ifal.edu.br/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Adriano da Silva Araujo</SurName>
-    <EmailAddress>adriano.araujo@ifal.edu.br</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.ifal.edu.br.xml b/swamid-interfederations-2.0/idp.ifal.edu.br.xml
deleted file mode 100644
index 832b9f63..00000000
--- a/swamid-interfederations-2.0/idp.ifal.edu.br.xml
+++ /dev/null
@@ -1,114 +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://idp.ifal.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">edu.br</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">IFAL - Instituto Federal de Educacao, Ciencia e Tecnologia de Alagoas</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="pt-br">IFAL - Instituto Federal de Educacao, Ciencia e Tecnologia de Alagoas</mdui:DisplayName>
-        <mdui:Description xml:lang="en">IFAL - Instituto Federal de Educacao, Ciencia e Tecnologia de Alagoas</mdui:Description>
-        <mdui:Description xml:lang="pt-br">IFAL - Instituto Federal de Educacao, Ciencia e Tecnologia de Alagoas</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.ifal.edu.br/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="pt-br">http://www.ifal.edu.br/</mdui:InformationURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-    MIIEGDCCAwACAQAwDQYJKoZIhvcNAQEFBQAwgdExLDAqBgNVBAoTI0lGQUwgLSBJ
-bnN0aXR1dG8gRmVkZXJhbCBkZSBBbGFnb2FzMTYwNAYDVQQLFC1EVEkgLSBEaXJl
-dG9yaWEgZGUgVGVjbm9sb2dpYSBkYSBJbmZvcm1hw6fDo28xHjAcBgkqhkiG9w0B
-CQEWD2R0aUBpZmFsLmVkdS5icjEQMA4GA1UEBxQHTWFjZWnDszEQMA4GA1UECBMH
-QWxhZ29hczELMAkGA1UEBhMCQlIxGDAWBgNVBAMTD2lkcC5pZmFsLmVkdS5icjAe
-Fw0xNDA0MDkxNzUwMDdaFw0xOTA0MDgxNzUwMDdaMIHRMSwwKgYDVQQKEyNJRkFM
-IC0gSW5zdGl0dXRvIEZlZGVyYWwgZGUgQWxhZ29hczE2MDQGA1UECxQtRFRJIC0g
-RGlyZXRvcmlhIGRlIFRlY25vbG9naWEgZGEgSW5mb3JtYcOnw6NvMR4wHAYJKoZI
-hvcNAQkBFg9kdGlAaWZhbC5lZHUuYnIxEDAOBgNVBAcUB01hY2Vpw7MxEDAOBgNV
-BAgTB0FsYWdvYXMxCzAJBgNVBAYTAkJSMRgwFgYDVQQDEw9pZHAuaWZhbC5lZHUu
-YnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDMYSN7ZQVR03UfNJEG
-xcyGLGW4iWbmGMuhnua6t+X6HMhU2YFmCB/nVKmPaLZrGdtopkFxO9vvCr9kHRPl
-5xRVT20yWIiSiQVsFZYc76FOS3jTwgYAE0+lwt/4N+6lsSSSD1JByI8PDR/E3v4U
-FEDmJ/SpPQo93OWYlUNyo9LsFGFYJ88U4EX8Tg+LmPpvjP7AKwuOpUtyV8Mdv97x
-HxVvQ6eh2hhibiaS3h/YPhyqBPn7rviM//zUx5/rcjABdlcLRmnguuXF/FCnWWHz
-JNvxikEjpADZw4I9zA+aMr/cJEkfnryEGzRrLRzfMdFa4bP3/MEQYmIdhDIej9+K
-7mZZAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBADYaFXfiCJtLtww2Qwwanyg4qUT2
-B2oYluc4YiHrGNT+ZAsr9g94gumyDyZ+XbZWHhWrrLCfw9qe3h0CrRUDo8imO+sE
-TYGq7XpOcAJWyKQVgcDICWiL6zQENRX/EeOfmOpbkjea/MEaqK0nyRQlaA4pIXYL
-vSvRPNaw93HsFLdGrJOQ0iZIp3wXB/th8NcGeLYC2DVXWfyL+3dTsCusEatFrkWO
-GYTYC2CuhPvNQnW6zntOBvF5+m8u3UE5S7b1ewJNR+bmnyRc5Jn3c+hDby241MxP
-9absP8SAHft1nylCyQlyRb7eDLMdi+iNITGXEKHAyXu20TXapcllySccxOk=
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ifal.edu.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ifal.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://idp.ifal.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ifal.edu.br/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.ifal.edu.br/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ifal.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>
-      
-MIIEGDCCAwACAQAwDQYJKoZIhvcNAQEFBQAwgdExLDAqBgNVBAoTI0lGQUwgLSBJ
-bnN0aXR1dG8gRmVkZXJhbCBkZSBBbGFnb2FzMTYwNAYDVQQLFC1EVEkgLSBEaXJl
-dG9yaWEgZGUgVGVjbm9sb2dpYSBkYSBJbmZvcm1hw6fDo28xHjAcBgkqhkiG9w0B
-CQEWD2R0aUBpZmFsLmVkdS5icjEQMA4GA1UEBxQHTWFjZWnDszEQMA4GA1UECBMH
-QWxhZ29hczELMAkGA1UEBhMCQlIxGDAWBgNVBAMTD2lkcC5pZmFsLmVkdS5icjAe
-Fw0xNDA0MDkxNzUwMDdaFw0xOTA0MDgxNzUwMDdaMIHRMSwwKgYDVQQKEyNJRkFM
-IC0gSW5zdGl0dXRvIEZlZGVyYWwgZGUgQWxhZ29hczE2MDQGA1UECxQtRFRJIC0g
-RGlyZXRvcmlhIGRlIFRlY25vbG9naWEgZGEgSW5mb3JtYcOnw6NvMR4wHAYJKoZI
-hvcNAQkBFg9kdGlAaWZhbC5lZHUuYnIxEDAOBgNVBAcUB01hY2Vpw7MxEDAOBgNV
-BAgTB0FsYWdvYXMxCzAJBgNVBAYTAkJSMRgwFgYDVQQDEw9pZHAuaWZhbC5lZHUu
-YnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDMYSN7ZQVR03UfNJEG
-xcyGLGW4iWbmGMuhnua6t+X6HMhU2YFmCB/nVKmPaLZrGdtopkFxO9vvCr9kHRPl
-5xRVT20yWIiSiQVsFZYc76FOS3jTwgYAE0+lwt/4N+6lsSSSD1JByI8PDR/E3v4U
-FEDmJ/SpPQo93OWYlUNyo9LsFGFYJ88U4EX8Tg+LmPpvjP7AKwuOpUtyV8Mdv97x
-HxVvQ6eh2hhibiaS3h/YPhyqBPn7rviM//zUx5/rcjABdlcLRmnguuXF/FCnWWHz
-JNvxikEjpADZw4I9zA+aMr/cJEkfnryEGzRrLRzfMdFa4bP3/MEQYmIdhDIej9+K
-7mZZAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBADYaFXfiCJtLtww2Qwwanyg4qUT2
-B2oYluc4YiHrGNT+ZAsr9g94gumyDyZ+XbZWHhWrrLCfw9qe3h0CrRUDo8imO+sE
-TYGq7XpOcAJWyKQVgcDICWiL6zQENRX/EeOfmOpbkjea/MEaqK0nyRQlaA4pIXYL
-vSvRPNaw93HsFLdGrJOQ0iZIp3wXB/th8NcGeLYC2DVXWfyL+3dTsCusEatFrkWO
-GYTYC2CuhPvNQnW6zntOBvF5+m8u3UE5S7b1ewJNR+bmnyRc5Jn3c+hDby241MxP
-9absP8SAHft1nylCyQlyRb7eDLMdi+iNITGXEKHAyXu20TXapcllySccxOk=
-                    
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ifal.edu.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ifal.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">IFAL - Instituto Federal de Educacao, Ciencia e Tecnologia de Alagoas</OrganizationName>
-    <OrganizationName xml:lang="pt-br">IFAL - Instituto Federal de Educacao, Ciencia e Tecnologia de Alagoas</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">IFAL - Instituto Federal de Educacao, Ciencia e Tecnologia de Alagoas</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="pt-br">IFAL - Instituto Federal de Educacao, Ciencia e Tecnologia de Alagoas</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.ifal.edu.br/</OrganizationURL>
-    <OrganizationURL xml:lang="pt-br">http://www.ifal.edu.br/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Adriano da Silva Araujo</SurName>
-    <EmailAddress>adriano.araujo@ifal.edu.br</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.ifap.edu.br-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.ifap.edu.br-idp-shibboleth.xml
deleted file mode 100644
index 6eae8191..00000000
--- a/swamid-interfederations-2.0/idp.ifap.edu.br-idp-shibboleth.xml
+++ /dev/null
@@ -1,107 +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://idp.ifap.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">edu.br</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">IFAP - Instituto Federal do Amapa</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="pt-br">IFAP - Instituto Federal do Amapa</mdui:DisplayName>
-        <mdui:Description xml:lang="en">IFAP - Instituto Federal do Amapa</mdui:Description>
-        <mdui:Description xml:lang="pt-br">IFAP - Instituto Federal do Amapa</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.ifap.edu.br</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="pt-br">http://www.ifap.edu.br</mdui:InformationURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-    MIICxjCCAa4CAQAwDQYJKoZIhvcNAQEFBQAwKTEMMAoGA1UECxMDRFRJMQswCQYD
-VQQGEwJCUjEMMAoGA1UEAxMDaWRwMB4XDTE0MDQxMDE2MTEyOFoXDTE5MDQwOTE2
-MTEyOFowKTEMMAoGA1UECxMDRFRJMQswCQYDVQQGEwJCUjEMMAoGA1UEAxMDaWRw
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA6lU1vl2shAmZ5lk9mqgL
-W0fGHYgMHSqS2gQqaTW2KfAoe6wvyEjkmFa2KTTa7gmTjBQBGahHpKjrTpMd1FEq
-MC1Eu9lLlStVvUjqp23DLdwIKzNcR+SnvPKbPWI6168jZlE5ymytgF7wUsJj9PB7
-7i9FpJ8kZgky9iZhHCsBp9AdQVFznpEGn/pwmPwtXEzQBFdwSqXdkUpISlHPe5dB
-ItnNx6Z8YCEcBA+IzOL38By8MG8LMbziCPQpQ7TgXiEE5vLsocJw/UF5DiWqSZ+n
-Z/GLwXx5rkbaB8wQZen2v0q+bghS7nmp3hKAsYKNTlw0jPxji/nitm5nZSReDv1D
-gwIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQDJ9GGFu1uP2xSjX0bEPb/jhKOKU9VD
-LH2vSu9V0zbkH9/uxgGLfOHuP+83QyDLfxEJKa1Ga4Hw+y6o7vyn3mW0RXBBloF/
-GTeDI2aFAmuPNomYl+ijCxk37ur/iQ3ugo0PbvVSZV9hxic8FJbBjGg7ZvyMXwuZ
-1nQfeXL+1qESFEwm5ClCR9G/WNmhaxr1bYanl9uvCS4tmpKJ1zZthDpnCRYLoIdx
-HTc3JBOzycaHMO08/JyQND4i4t4OuiY6iemEsTuGgC2aeOZYRJ9qCyjVnFMQE8lV
-arZrEBblthd0n3nlykz5YYjwsNa9rkr6Yo9NDXv3iorY6fD2Rk8z8JB2
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ifap.edu.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ifap.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://idp.ifap.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ifap.edu.br/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.ifap.edu.br/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ifap.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>
-      
-MIID1DCCArwCAQAwDQYJKoZIhvcNAQEFBQAwga8xKzApBgNVBAoUIklGQVAgLSBJ
-bnN0aXR1dG8gRmVkZXJhbCBkbyBBbWFww6ExDDAKBgNVBAsTA0RUSTEoMCYGCSqG
-SIb3DQEJARYZbWFyY28ucGFudG9qYUBpZmFwLmVkdS5icjEQMA4GA1UEBxQHTWFj
-YXDDoTEPMA0GA1UECBQGQW1hcMOhMQswCQYDVQQGEwJCUjEYMBYGA1UEAxMPaWRw
-LmlmYXAuZWR1LmJyMB4XDTEzMTIxOTE4MDIwM1oXDTE2MTIxODE4MDIwM1owga8x
-KzApBgNVBAoUIklGQVAgLSBJbnN0aXR1dG8gRmVkZXJhbCBkbyBBbWFww6ExDDAK
-BgNVBAsTA0RUSTEoMCYGCSqGSIb3DQEJARYZbWFyY28ucGFudG9qYUBpZmFwLmVk
-dS5icjEQMA4GA1UEBxQHTWFjYXDDoTEPMA0GA1UECBQGQW1hcMOhMQswCQYDVQQG
-EwJCUjEYMBYGA1UEAxMPaWRwLmlmYXAuZWR1LmJyMIIBIjANBgkqhkiG9w0BAQEF
-AAOCAQ8AMIIBCgKCAQEA6lU1vl2shAmZ5lk9mqgLW0fGHYgMHSqS2gQqaTW2KfAo
-e6wvyEjkmFa2KTTa7gmTjBQBGahHpKjrTpMd1FEqMC1Eu9lLlStVvUjqp23DLdwI
-KzNcR+SnvPKbPWI6168jZlE5ymytgF7wUsJj9PB77i9FpJ8kZgky9iZhHCsBp9Ad
-QVFznpEGn/pwmPwtXEzQBFdwSqXdkUpISlHPe5dBItnNx6Z8YCEcBA+IzOL38By8
-MG8LMbziCPQpQ7TgXiEE5vLsocJw/UF5DiWqSZ+nZ/GLwXx5rkbaB8wQZen2v0q+
-bghS7nmp3hKAsYKNTlw0jPxji/nitm5nZSReDv1DgwIDAQABMA0GCSqGSIb3DQEB
-BQUAA4IBAQCj9QDb4QEUtzeU527JnQqF8DGTV275Px5iJWm3+pyv1ScYcJ903JyQ
-PNxPh+WdRkAxBcCMbd1vH4toAVZX6EDMlJv/H9x/nmnWTl+GigzLz4vAOREaab15
-tQPwipCRXVnakkVxYk+1QWrmXyzZPaw3dOLVOg/SSTVk87vnhuX1nvu2r7ZVNDZv
-34WrTP8bVJd5c8yIMuvCMBPp30p4A8NGm1PkZP+OIH5CVO25cNSVq66/OeCSr3Se
-IckFRapAp4rc+PDyWiwSM6Xy8kM9pdraxGWoW0697si+Ji4MsIdah9I7+C6B6XB2
-BoOuGlC2BFe2rK9IG4bntSohpeIVUoLF
-
-                    
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ifap.edu.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ifap.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">IFAP - Instituto Federal do Amapa</OrganizationName>
-    <OrganizationName xml:lang="pt-br">IFAP - Instituto Federal do Amapa</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">IFAP - Instituto Federal do Amapa</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="pt-br">IFAP - Instituto Federal do Amapa</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.ifap.edu.br</OrganizationURL>
-    <OrganizationURL xml:lang="pt-br">http://www.ifap.edu.br</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Marco Pantoja</SurName>
-    <EmailAddress>marco.pantoja@ifap.edu.br</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.ifap.edu.br.xml b/swamid-interfederations-2.0/idp.ifap.edu.br.xml
deleted file mode 100644
index 6eae8191..00000000
--- a/swamid-interfederations-2.0/idp.ifap.edu.br.xml
+++ /dev/null
@@ -1,107 +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://idp.ifap.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">edu.br</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">IFAP - Instituto Federal do Amapa</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="pt-br">IFAP - Instituto Federal do Amapa</mdui:DisplayName>
-        <mdui:Description xml:lang="en">IFAP - Instituto Federal do Amapa</mdui:Description>
-        <mdui:Description xml:lang="pt-br">IFAP - Instituto Federal do Amapa</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.ifap.edu.br</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="pt-br">http://www.ifap.edu.br</mdui:InformationURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-    MIICxjCCAa4CAQAwDQYJKoZIhvcNAQEFBQAwKTEMMAoGA1UECxMDRFRJMQswCQYD
-VQQGEwJCUjEMMAoGA1UEAxMDaWRwMB4XDTE0MDQxMDE2MTEyOFoXDTE5MDQwOTE2
-MTEyOFowKTEMMAoGA1UECxMDRFRJMQswCQYDVQQGEwJCUjEMMAoGA1UEAxMDaWRw
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA6lU1vl2shAmZ5lk9mqgL
-W0fGHYgMHSqS2gQqaTW2KfAoe6wvyEjkmFa2KTTa7gmTjBQBGahHpKjrTpMd1FEq
-MC1Eu9lLlStVvUjqp23DLdwIKzNcR+SnvPKbPWI6168jZlE5ymytgF7wUsJj9PB7
-7i9FpJ8kZgky9iZhHCsBp9AdQVFznpEGn/pwmPwtXEzQBFdwSqXdkUpISlHPe5dB
-ItnNx6Z8YCEcBA+IzOL38By8MG8LMbziCPQpQ7TgXiEE5vLsocJw/UF5DiWqSZ+n
-Z/GLwXx5rkbaB8wQZen2v0q+bghS7nmp3hKAsYKNTlw0jPxji/nitm5nZSReDv1D
-gwIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQDJ9GGFu1uP2xSjX0bEPb/jhKOKU9VD
-LH2vSu9V0zbkH9/uxgGLfOHuP+83QyDLfxEJKa1Ga4Hw+y6o7vyn3mW0RXBBloF/
-GTeDI2aFAmuPNomYl+ijCxk37ur/iQ3ugo0PbvVSZV9hxic8FJbBjGg7ZvyMXwuZ
-1nQfeXL+1qESFEwm5ClCR9G/WNmhaxr1bYanl9uvCS4tmpKJ1zZthDpnCRYLoIdx
-HTc3JBOzycaHMO08/JyQND4i4t4OuiY6iemEsTuGgC2aeOZYRJ9qCyjVnFMQE8lV
-arZrEBblthd0n3nlykz5YYjwsNa9rkr6Yo9NDXv3iorY6fD2Rk8z8JB2
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ifap.edu.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ifap.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://idp.ifap.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ifap.edu.br/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.ifap.edu.br/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ifap.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>
-      
-MIID1DCCArwCAQAwDQYJKoZIhvcNAQEFBQAwga8xKzApBgNVBAoUIklGQVAgLSBJ
-bnN0aXR1dG8gRmVkZXJhbCBkbyBBbWFww6ExDDAKBgNVBAsTA0RUSTEoMCYGCSqG
-SIb3DQEJARYZbWFyY28ucGFudG9qYUBpZmFwLmVkdS5icjEQMA4GA1UEBxQHTWFj
-YXDDoTEPMA0GA1UECBQGQW1hcMOhMQswCQYDVQQGEwJCUjEYMBYGA1UEAxMPaWRw
-LmlmYXAuZWR1LmJyMB4XDTEzMTIxOTE4MDIwM1oXDTE2MTIxODE4MDIwM1owga8x
-KzApBgNVBAoUIklGQVAgLSBJbnN0aXR1dG8gRmVkZXJhbCBkbyBBbWFww6ExDDAK
-BgNVBAsTA0RUSTEoMCYGCSqGSIb3DQEJARYZbWFyY28ucGFudG9qYUBpZmFwLmVk
-dS5icjEQMA4GA1UEBxQHTWFjYXDDoTEPMA0GA1UECBQGQW1hcMOhMQswCQYDVQQG
-EwJCUjEYMBYGA1UEAxMPaWRwLmlmYXAuZWR1LmJyMIIBIjANBgkqhkiG9w0BAQEF
-AAOCAQ8AMIIBCgKCAQEA6lU1vl2shAmZ5lk9mqgLW0fGHYgMHSqS2gQqaTW2KfAo
-e6wvyEjkmFa2KTTa7gmTjBQBGahHpKjrTpMd1FEqMC1Eu9lLlStVvUjqp23DLdwI
-KzNcR+SnvPKbPWI6168jZlE5ymytgF7wUsJj9PB77i9FpJ8kZgky9iZhHCsBp9Ad
-QVFznpEGn/pwmPwtXEzQBFdwSqXdkUpISlHPe5dBItnNx6Z8YCEcBA+IzOL38By8
-MG8LMbziCPQpQ7TgXiEE5vLsocJw/UF5DiWqSZ+nZ/GLwXx5rkbaB8wQZen2v0q+
-bghS7nmp3hKAsYKNTlw0jPxji/nitm5nZSReDv1DgwIDAQABMA0GCSqGSIb3DQEB
-BQUAA4IBAQCj9QDb4QEUtzeU527JnQqF8DGTV275Px5iJWm3+pyv1ScYcJ903JyQ
-PNxPh+WdRkAxBcCMbd1vH4toAVZX6EDMlJv/H9x/nmnWTl+GigzLz4vAOREaab15
-tQPwipCRXVnakkVxYk+1QWrmXyzZPaw3dOLVOg/SSTVk87vnhuX1nvu2r7ZVNDZv
-34WrTP8bVJd5c8yIMuvCMBPp30p4A8NGm1PkZP+OIH5CVO25cNSVq66/OeCSr3Se
-IckFRapAp4rc+PDyWiwSM6Xy8kM9pdraxGWoW0697si+Ji4MsIdah9I7+C6B6XB2
-BoOuGlC2BFe2rK9IG4bntSohpeIVUoLF
-
-                    
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ifap.edu.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ifap.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">IFAP - Instituto Federal do Amapa</OrganizationName>
-    <OrganizationName xml:lang="pt-br">IFAP - Instituto Federal do Amapa</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">IFAP - Instituto Federal do Amapa</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="pt-br">IFAP - Instituto Federal do Amapa</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.ifap.edu.br</OrganizationURL>
-    <OrganizationURL xml:lang="pt-br">http://www.ifap.edu.br</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Marco Pantoja</SurName>
-    <EmailAddress>marco.pantoja@ifap.edu.br</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.ifc.edu.br-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.ifc.edu.br-idp-shibboleth.xml
deleted file mode 100644
index ad72b357..00000000
--- a/swamid-interfederations-2.0/idp.ifc.edu.br-idp-shibboleth.xml
+++ /dev/null
@@ -1,100 +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://idp.ifc.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">edu.br</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">IFC - Instituto Federal Catarinense</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="pt-br">IFC - Instituto Federal Catarinense</mdui:DisplayName>
-        <mdui:Description xml:lang="en">IFC - Instituto Federal Catarinense</mdui:Description>
-        <mdui:Description xml:lang="pt-br">IFC - Instituto Federal Catarinense</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.ifc.edu.br</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="pt-br">http://www.ifc.edu.br</mdui:InformationURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-    MIICxjCCAa4CAQAwDQYJKoZIhvcNAQEFBQAwKTEMMAoGA1UECxMDRFRJMQswCQYD
-VQQGEwJCUjEMMAoGA1UEAxMDaWRwMB4XDTE0MDQwOTE3MzAyN1oXDTE5MDQwODE3
-MzAyN1owKTEMMAoGA1UECxMDRFRJMQswCQYDVQQGEwJCUjEMMAoGA1UEAxMDaWRw
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAweLZ9PCMIFyNRZxpJraU
-tsB76JjKzQtx6QfkHSiDx5uwHTgiTQilQBJFCAlz2NQGlFH46zHGTemNS3S5J2GA
-zcBTuJskMbFFXOnfi33F8jBJTodaCq2V9pGwdjTs3ebPKekDYCeHRPYwhBszPWqj
-eXOCrAzZEfBwdsxallOhle6mqr4mw2tFwx5k67X8kdwVpkFaNjGtUDMfltjhVy6u
-0NiRhgaT9E9WMj/wKrDVzs0rYkxthF6qh+FcoLIIwB9SenqtmiK9uAWhRje7LH3Y
-lsu8G7kTdGyS0/CyABr9+FL8XxJ2VKwIABWEvl6UoinY122zAy/uDxzk4qkq0ge7
-ywIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQCwZr/7KyPjp03yXWWifSpXVOZMWb0k
-RoJyA5upb4YWilPJGH/B5frSuXnzaAY7vSFEGKqjzk2JcpH5hv2M0wLWBYXZgp3c
-X6t16xJB7M0Ob5mOFz7Z0toxyuNHm8egrKjdhUS9od67QempObje5TRgwk8szHhv
-REBeVYn9VTnMBpHvTzVXUqWzvVaULHwo9207emUQPljqP8whQkpMzjp49OsD75ua
-3ejIxW0axzH47H9klC86IALnAXv+Ad5sh41ZHuBX6zz7N/Cenu/W9SFDJ5x1IIsw
-xLSEYO4XtQH/sy1ouM4VkghXlqRSeKDOgynu35E6pd2ZtyqDIjWQlpxk
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ifc.edu.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ifc.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://idp.ifc.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ifc.edu.br/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.ifc.edu.br/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ifc.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>
-      
-MIICxjCCAa4CAQAwDQYJKoZIhvcNAQEFBQAwKTEMMAoGA1UECxMDRFRJMQswCQYD
-VQQGEwJCUjEMMAoGA1UEAxMDaWRwMB4XDTE0MDQwOTE3MzAyN1oXDTE5MDQwODE3
-MzAyN1owKTEMMAoGA1UECxMDRFRJMQswCQYDVQQGEwJCUjEMMAoGA1UEAxMDaWRw
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAweLZ9PCMIFyNRZxpJraU
-tsB76JjKzQtx6QfkHSiDx5uwHTgiTQilQBJFCAlz2NQGlFH46zHGTemNS3S5J2GA
-zcBTuJskMbFFXOnfi33F8jBJTodaCq2V9pGwdjTs3ebPKekDYCeHRPYwhBszPWqj
-eXOCrAzZEfBwdsxallOhle6mqr4mw2tFwx5k67X8kdwVpkFaNjGtUDMfltjhVy6u
-0NiRhgaT9E9WMj/wKrDVzs0rYkxthF6qh+FcoLIIwB9SenqtmiK9uAWhRje7LH3Y
-lsu8G7kTdGyS0/CyABr9+FL8XxJ2VKwIABWEvl6UoinY122zAy/uDxzk4qkq0ge7
-ywIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQCwZr/7KyPjp03yXWWifSpXVOZMWb0k
-RoJyA5upb4YWilPJGH/B5frSuXnzaAY7vSFEGKqjzk2JcpH5hv2M0wLWBYXZgp3c
-X6t16xJB7M0Ob5mOFz7Z0toxyuNHm8egrKjdhUS9od67QempObje5TRgwk8szHhv
-REBeVYn9VTnMBpHvTzVXUqWzvVaULHwo9207emUQPljqP8whQkpMzjp49OsD75ua
-3ejIxW0axzH47H9klC86IALnAXv+Ad5sh41ZHuBX6zz7N/Cenu/W9SFDJ5x1IIsw
-xLSEYO4XtQH/sy1ouM4VkghXlqRSeKDOgynu35E6pd2ZtyqDIjWQlpxk
-                    
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ifc.edu.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ifc.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">IFC - Instituto Federal Catarinense</OrganizationName>
-    <OrganizationName xml:lang="pt-br">IFC - Instituto Federal Catarinense</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">IFC - Instituto Federal Catarinense</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="pt-br">IFC - Instituto Federal Catarinense</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.ifc.edu.br</OrganizationURL>
-    <OrganizationURL xml:lang="pt-br">http://www.ifc.edu.br</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Renato de Souza Muniz</SurName>
-    <EmailAddress>infra@ifc.edu.br</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.ifc.edu.br.xml b/swamid-interfederations-2.0/idp.ifc.edu.br.xml
deleted file mode 100644
index ad72b357..00000000
--- a/swamid-interfederations-2.0/idp.ifc.edu.br.xml
+++ /dev/null
@@ -1,100 +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://idp.ifc.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">edu.br</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">IFC - Instituto Federal Catarinense</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="pt-br">IFC - Instituto Federal Catarinense</mdui:DisplayName>
-        <mdui:Description xml:lang="en">IFC - Instituto Federal Catarinense</mdui:Description>
-        <mdui:Description xml:lang="pt-br">IFC - Instituto Federal Catarinense</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.ifc.edu.br</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="pt-br">http://www.ifc.edu.br</mdui:InformationURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-    MIICxjCCAa4CAQAwDQYJKoZIhvcNAQEFBQAwKTEMMAoGA1UECxMDRFRJMQswCQYD
-VQQGEwJCUjEMMAoGA1UEAxMDaWRwMB4XDTE0MDQwOTE3MzAyN1oXDTE5MDQwODE3
-MzAyN1owKTEMMAoGA1UECxMDRFRJMQswCQYDVQQGEwJCUjEMMAoGA1UEAxMDaWRw
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAweLZ9PCMIFyNRZxpJraU
-tsB76JjKzQtx6QfkHSiDx5uwHTgiTQilQBJFCAlz2NQGlFH46zHGTemNS3S5J2GA
-zcBTuJskMbFFXOnfi33F8jBJTodaCq2V9pGwdjTs3ebPKekDYCeHRPYwhBszPWqj
-eXOCrAzZEfBwdsxallOhle6mqr4mw2tFwx5k67X8kdwVpkFaNjGtUDMfltjhVy6u
-0NiRhgaT9E9WMj/wKrDVzs0rYkxthF6qh+FcoLIIwB9SenqtmiK9uAWhRje7LH3Y
-lsu8G7kTdGyS0/CyABr9+FL8XxJ2VKwIABWEvl6UoinY122zAy/uDxzk4qkq0ge7
-ywIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQCwZr/7KyPjp03yXWWifSpXVOZMWb0k
-RoJyA5upb4YWilPJGH/B5frSuXnzaAY7vSFEGKqjzk2JcpH5hv2M0wLWBYXZgp3c
-X6t16xJB7M0Ob5mOFz7Z0toxyuNHm8egrKjdhUS9od67QempObje5TRgwk8szHhv
-REBeVYn9VTnMBpHvTzVXUqWzvVaULHwo9207emUQPljqP8whQkpMzjp49OsD75ua
-3ejIxW0axzH47H9klC86IALnAXv+Ad5sh41ZHuBX6zz7N/Cenu/W9SFDJ5x1IIsw
-xLSEYO4XtQH/sy1ouM4VkghXlqRSeKDOgynu35E6pd2ZtyqDIjWQlpxk
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ifc.edu.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ifc.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://idp.ifc.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ifc.edu.br/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.ifc.edu.br/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ifc.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>
-      
-MIICxjCCAa4CAQAwDQYJKoZIhvcNAQEFBQAwKTEMMAoGA1UECxMDRFRJMQswCQYD
-VQQGEwJCUjEMMAoGA1UEAxMDaWRwMB4XDTE0MDQwOTE3MzAyN1oXDTE5MDQwODE3
-MzAyN1owKTEMMAoGA1UECxMDRFRJMQswCQYDVQQGEwJCUjEMMAoGA1UEAxMDaWRw
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAweLZ9PCMIFyNRZxpJraU
-tsB76JjKzQtx6QfkHSiDx5uwHTgiTQilQBJFCAlz2NQGlFH46zHGTemNS3S5J2GA
-zcBTuJskMbFFXOnfi33F8jBJTodaCq2V9pGwdjTs3ebPKekDYCeHRPYwhBszPWqj
-eXOCrAzZEfBwdsxallOhle6mqr4mw2tFwx5k67X8kdwVpkFaNjGtUDMfltjhVy6u
-0NiRhgaT9E9WMj/wKrDVzs0rYkxthF6qh+FcoLIIwB9SenqtmiK9uAWhRje7LH3Y
-lsu8G7kTdGyS0/CyABr9+FL8XxJ2VKwIABWEvl6UoinY122zAy/uDxzk4qkq0ge7
-ywIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQCwZr/7KyPjp03yXWWifSpXVOZMWb0k
-RoJyA5upb4YWilPJGH/B5frSuXnzaAY7vSFEGKqjzk2JcpH5hv2M0wLWBYXZgp3c
-X6t16xJB7M0Ob5mOFz7Z0toxyuNHm8egrKjdhUS9od67QempObje5TRgwk8szHhv
-REBeVYn9VTnMBpHvTzVXUqWzvVaULHwo9207emUQPljqP8whQkpMzjp49OsD75ua
-3ejIxW0axzH47H9klC86IALnAXv+Ad5sh41ZHuBX6zz7N/Cenu/W9SFDJ5x1IIsw
-xLSEYO4XtQH/sy1ouM4VkghXlqRSeKDOgynu35E6pd2ZtyqDIjWQlpxk
-                    
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ifc.edu.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ifc.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">IFC - Instituto Federal Catarinense</OrganizationName>
-    <OrganizationName xml:lang="pt-br">IFC - Instituto Federal Catarinense</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">IFC - Instituto Federal Catarinense</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="pt-br">IFC - Instituto Federal Catarinense</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.ifc.edu.br</OrganizationURL>
-    <OrganizationURL xml:lang="pt-br">http://www.ifc.edu.br</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Renato de Souza Muniz</SurName>
-    <EmailAddress>infra@ifc.edu.br</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.ifpb.edu.br-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.ifpb.edu.br-idp-shibboleth.xml
deleted file mode 100644
index 5aeaf5e1..00000000
--- a/swamid-interfederations-2.0/idp.ifpb.edu.br-idp-shibboleth.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://idp.ifpb.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">edu.br</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">IFPB - Instituto Federal da Paraiba</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="pt-br">IFPB - Instituto Federal da Paraiba</mdui:DisplayName>
-        <mdui:Description xml:lang="en">IFPB - Instituto Federal da Paraiba</mdui:Description>
-        <mdui:Description xml:lang="pt-br">IFPB - Instituto Federal da Paraiba</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.ifpb.edu.br</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="pt-br">http://www.ifpb.edu.br</mdui:InformationURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-    MIID5DCCAswCAQAwDQYJKoZIhvcNAQEFBQAwgbcxLDAqBgNVBAoTI0lGUEIgLSBJ
-bnN0aXR1dG8gRmVkZXJhbCBkYSBQYXJhaWJhMQwwCgYDVQQLEwNEVEkxKjAoBgkq
-hkiG9w0BCQEWG2pvc2UuY2F2YWxjYW50aUBpZnBiLmVkdS5icjEUMBIGA1UEBxML
-Sm9hbyBQZXNzb2ExEDAOBgNVBAgTB1BhcmFpYmExCzAJBgNVBAYTAkJSMRgwFgYD
-VQQDEw9pZHAuaWZwYi5lZHUuYnIwHhcNMTQwNDIzMjAzMzE0WhcNMTkwNDIyMjAz
-MzE0WjCBtzEsMCoGA1UEChMjSUZQQiAtIEluc3RpdHV0byBGZWRlcmFsIGRhIFBh
-cmFpYmExDDAKBgNVBAsTA0RUSTEqMCgGCSqGSIb3DQEJARYbam9zZS5jYXZhbGNh
-bnRpQGlmcGIuZWR1LmJyMRQwEgYDVQQHEwtKb2FvIFBlc3NvYTEQMA4GA1UECBMH
-UGFyYWliYTELMAkGA1UEBhMCQlIxGDAWBgNVBAMTD2lkcC5pZnBiLmVkdS5icjCC
-ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANZ5IlaQxWRUtbccktlNZQQB
-AWQi/f86zxT/f8ilpR8Lmss8W3TG3/U5L4MoscHCEQfOfBgAoQqxHsj8V1VDoL8B
-NfR6XAFqeWfKf8B8wcbX8CnNY9FZbgs2g1z2xsNQuAbFYunxUe3Y5A1xwH0aD04g
-8E4ubcEnLisB3an5zK/dWbGdBjUSuNADzgqbhftpFjZFPDi8DYezjYYxHUX5MNv6
-lb5/uQ7JjTWT3QssD0qG6pgNNANpQA8Jl2IWGb1qnNtjb9UbUPwYF2R6k4oXBFo+
-I2XW2cMUFvowftOpiNP/IrAAKIX0BGWuEtjL4VHoKvOtNwnikGw1DQYtUUvxNvkC
-AwEAATANBgkqhkiG9w0BAQUFAAOCAQEAZhN6yFJijeBhyIU+td6IXlEQ9hNJ4CJd
-GXb/jpnyYj5DOYSBKE/0mQd4zPoME7Xc9+Zz8FErWxephrvNVm8sSNmWjKqGJpCt
-vAjhJhL48QkjqgGWQJq0kVyHEfuwFbva3mH22I1oRrsnw44paMVHOrNtcEkf2NL2
-aDYQL1qLooSFjrvndyvfEIlxa+QJP8D9pgD3GLtiyPt4WWcUb4SmXrVc1RpFZSyU
-tVN4EFbgvRCPqHc+GX/5vjxJwTl7tFO9Jqa0C5i/4mRhqW5wRqd7I35KTJTimc/b
-kCPbbyEGhzyWdtZGIWPGqY+fZw8Z6WcAOOr25/JEw/veCHLskaV6GA==
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ifpb.edu.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ifpb.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://idp.ifpb.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ifpb.edu.br/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.ifpb.edu.br/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ifpb.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>
-      
-MIID5DCCAswCAQAwDQYJKoZIhvcNAQEFBQAwgbcxLDAqBgNVBAoTI0lGUEIgLSBJ
-bnN0aXR1dG8gRmVkZXJhbCBkYSBQYXJhaWJhMQwwCgYDVQQLEwNEVEkxKjAoBgkq
-hkiG9w0BCQEWG2pvc2UuY2F2YWxjYW50aUBpZnBiLmVkdS5icjEUMBIGA1UEBxML
-Sm9hbyBQZXNzb2ExEDAOBgNVBAgTB1BhcmFpYmExCzAJBgNVBAYTAkJSMRgwFgYD
-VQQDEw9pZHAuaWZwYi5lZHUuYnIwHhcNMTQwNDIzMjAzMzE0WhcNMTkwNDIyMjAz
-MzE0WjCBtzEsMCoGA1UEChMjSUZQQiAtIEluc3RpdHV0byBGZWRlcmFsIGRhIFBh
-cmFpYmExDDAKBgNVBAsTA0RUSTEqMCgGCSqGSIb3DQEJARYbam9zZS5jYXZhbGNh
-bnRpQGlmcGIuZWR1LmJyMRQwEgYDVQQHEwtKb2FvIFBlc3NvYTEQMA4GA1UECBMH
-UGFyYWliYTELMAkGA1UEBhMCQlIxGDAWBgNVBAMTD2lkcC5pZnBiLmVkdS5icjCC
-ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANZ5IlaQxWRUtbccktlNZQQB
-AWQi/f86zxT/f8ilpR8Lmss8W3TG3/U5L4MoscHCEQfOfBgAoQqxHsj8V1VDoL8B
-NfR6XAFqeWfKf8B8wcbX8CnNY9FZbgs2g1z2xsNQuAbFYunxUe3Y5A1xwH0aD04g
-8E4ubcEnLisB3an5zK/dWbGdBjUSuNADzgqbhftpFjZFPDi8DYezjYYxHUX5MNv6
-lb5/uQ7JjTWT3QssD0qG6pgNNANpQA8Jl2IWGb1qnNtjb9UbUPwYF2R6k4oXBFo+
-I2XW2cMUFvowftOpiNP/IrAAKIX0BGWuEtjL4VHoKvOtNwnikGw1DQYtUUvxNvkC
-AwEAATANBgkqhkiG9w0BAQUFAAOCAQEAZhN6yFJijeBhyIU+td6IXlEQ9hNJ4CJd
-GXb/jpnyYj5DOYSBKE/0mQd4zPoME7Xc9+Zz8FErWxephrvNVm8sSNmWjKqGJpCt
-vAjhJhL48QkjqgGWQJq0kVyHEfuwFbva3mH22I1oRrsnw44paMVHOrNtcEkf2NL2
-aDYQL1qLooSFjrvndyvfEIlxa+QJP8D9pgD3GLtiyPt4WWcUb4SmXrVc1RpFZSyU
-tVN4EFbgvRCPqHc+GX/5vjxJwTl7tFO9Jqa0C5i/4mRhqW5wRqd7I35KTJTimc/b
-kCPbbyEGhzyWdtZGIWPGqY+fZw8Z6WcAOOr25/JEw/veCHLskaV6GA==
-                    
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ifpb.edu.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ifpb.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">IFPB - Instituto Federal da Paraiba</OrganizationName>
-    <OrganizationName xml:lang="pt-br">IFPB - Instituto Federal da Paraiba</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">IFPB - Instituto Federal da Paraiba</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="pt-br">IFPB - Instituto Federal da Paraiba</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.ifpb.edu.br</OrganizationURL>
-    <OrganizationURL xml:lang="pt-br">http://www.ifpb.edu.br</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Jose Hermano Cavalcanti Filho</SurName>
-    <EmailAddress>jose.cavalcanti@ifpb.edu.br</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.ifpb.edu.br.xml b/swamid-interfederations-2.0/idp.ifpb.edu.br.xml
deleted file mode 100644
index 5aeaf5e1..00000000
--- a/swamid-interfederations-2.0/idp.ifpb.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://idp.ifpb.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">edu.br</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">IFPB - Instituto Federal da Paraiba</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="pt-br">IFPB - Instituto Federal da Paraiba</mdui:DisplayName>
-        <mdui:Description xml:lang="en">IFPB - Instituto Federal da Paraiba</mdui:Description>
-        <mdui:Description xml:lang="pt-br">IFPB - Instituto Federal da Paraiba</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.ifpb.edu.br</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="pt-br">http://www.ifpb.edu.br</mdui:InformationURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-    MIID5DCCAswCAQAwDQYJKoZIhvcNAQEFBQAwgbcxLDAqBgNVBAoTI0lGUEIgLSBJ
-bnN0aXR1dG8gRmVkZXJhbCBkYSBQYXJhaWJhMQwwCgYDVQQLEwNEVEkxKjAoBgkq
-hkiG9w0BCQEWG2pvc2UuY2F2YWxjYW50aUBpZnBiLmVkdS5icjEUMBIGA1UEBxML
-Sm9hbyBQZXNzb2ExEDAOBgNVBAgTB1BhcmFpYmExCzAJBgNVBAYTAkJSMRgwFgYD
-VQQDEw9pZHAuaWZwYi5lZHUuYnIwHhcNMTQwNDIzMjAzMzE0WhcNMTkwNDIyMjAz
-MzE0WjCBtzEsMCoGA1UEChMjSUZQQiAtIEluc3RpdHV0byBGZWRlcmFsIGRhIFBh
-cmFpYmExDDAKBgNVBAsTA0RUSTEqMCgGCSqGSIb3DQEJARYbam9zZS5jYXZhbGNh
-bnRpQGlmcGIuZWR1LmJyMRQwEgYDVQQHEwtKb2FvIFBlc3NvYTEQMA4GA1UECBMH
-UGFyYWliYTELMAkGA1UEBhMCQlIxGDAWBgNVBAMTD2lkcC5pZnBiLmVkdS5icjCC
-ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANZ5IlaQxWRUtbccktlNZQQB
-AWQi/f86zxT/f8ilpR8Lmss8W3TG3/U5L4MoscHCEQfOfBgAoQqxHsj8V1VDoL8B
-NfR6XAFqeWfKf8B8wcbX8CnNY9FZbgs2g1z2xsNQuAbFYunxUe3Y5A1xwH0aD04g
-8E4ubcEnLisB3an5zK/dWbGdBjUSuNADzgqbhftpFjZFPDi8DYezjYYxHUX5MNv6
-lb5/uQ7JjTWT3QssD0qG6pgNNANpQA8Jl2IWGb1qnNtjb9UbUPwYF2R6k4oXBFo+
-I2XW2cMUFvowftOpiNP/IrAAKIX0BGWuEtjL4VHoKvOtNwnikGw1DQYtUUvxNvkC
-AwEAATANBgkqhkiG9w0BAQUFAAOCAQEAZhN6yFJijeBhyIU+td6IXlEQ9hNJ4CJd
-GXb/jpnyYj5DOYSBKE/0mQd4zPoME7Xc9+Zz8FErWxephrvNVm8sSNmWjKqGJpCt
-vAjhJhL48QkjqgGWQJq0kVyHEfuwFbva3mH22I1oRrsnw44paMVHOrNtcEkf2NL2
-aDYQL1qLooSFjrvndyvfEIlxa+QJP8D9pgD3GLtiyPt4WWcUb4SmXrVc1RpFZSyU
-tVN4EFbgvRCPqHc+GX/5vjxJwTl7tFO9Jqa0C5i/4mRhqW5wRqd7I35KTJTimc/b
-kCPbbyEGhzyWdtZGIWPGqY+fZw8Z6WcAOOr25/JEw/veCHLskaV6GA==
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ifpb.edu.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ifpb.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://idp.ifpb.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ifpb.edu.br/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.ifpb.edu.br/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ifpb.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>
-      
-MIID5DCCAswCAQAwDQYJKoZIhvcNAQEFBQAwgbcxLDAqBgNVBAoTI0lGUEIgLSBJ
-bnN0aXR1dG8gRmVkZXJhbCBkYSBQYXJhaWJhMQwwCgYDVQQLEwNEVEkxKjAoBgkq
-hkiG9w0BCQEWG2pvc2UuY2F2YWxjYW50aUBpZnBiLmVkdS5icjEUMBIGA1UEBxML
-Sm9hbyBQZXNzb2ExEDAOBgNVBAgTB1BhcmFpYmExCzAJBgNVBAYTAkJSMRgwFgYD
-VQQDEw9pZHAuaWZwYi5lZHUuYnIwHhcNMTQwNDIzMjAzMzE0WhcNMTkwNDIyMjAz
-MzE0WjCBtzEsMCoGA1UEChMjSUZQQiAtIEluc3RpdHV0byBGZWRlcmFsIGRhIFBh
-cmFpYmExDDAKBgNVBAsTA0RUSTEqMCgGCSqGSIb3DQEJARYbam9zZS5jYXZhbGNh
-bnRpQGlmcGIuZWR1LmJyMRQwEgYDVQQHEwtKb2FvIFBlc3NvYTEQMA4GA1UECBMH
-UGFyYWliYTELMAkGA1UEBhMCQlIxGDAWBgNVBAMTD2lkcC5pZnBiLmVkdS5icjCC
-ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANZ5IlaQxWRUtbccktlNZQQB
-AWQi/f86zxT/f8ilpR8Lmss8W3TG3/U5L4MoscHCEQfOfBgAoQqxHsj8V1VDoL8B
-NfR6XAFqeWfKf8B8wcbX8CnNY9FZbgs2g1z2xsNQuAbFYunxUe3Y5A1xwH0aD04g
-8E4ubcEnLisB3an5zK/dWbGdBjUSuNADzgqbhftpFjZFPDi8DYezjYYxHUX5MNv6
-lb5/uQ7JjTWT3QssD0qG6pgNNANpQA8Jl2IWGb1qnNtjb9UbUPwYF2R6k4oXBFo+
-I2XW2cMUFvowftOpiNP/IrAAKIX0BGWuEtjL4VHoKvOtNwnikGw1DQYtUUvxNvkC
-AwEAATANBgkqhkiG9w0BAQUFAAOCAQEAZhN6yFJijeBhyIU+td6IXlEQ9hNJ4CJd
-GXb/jpnyYj5DOYSBKE/0mQd4zPoME7Xc9+Zz8FErWxephrvNVm8sSNmWjKqGJpCt
-vAjhJhL48QkjqgGWQJq0kVyHEfuwFbva3mH22I1oRrsnw44paMVHOrNtcEkf2NL2
-aDYQL1qLooSFjrvndyvfEIlxa+QJP8D9pgD3GLtiyPt4WWcUb4SmXrVc1RpFZSyU
-tVN4EFbgvRCPqHc+GX/5vjxJwTl7tFO9Jqa0C5i/4mRhqW5wRqd7I35KTJTimc/b
-kCPbbyEGhzyWdtZGIWPGqY+fZw8Z6WcAOOr25/JEw/veCHLskaV6GA==
-                    
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ifpb.edu.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ifpb.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">IFPB - Instituto Federal da Paraiba</OrganizationName>
-    <OrganizationName xml:lang="pt-br">IFPB - Instituto Federal da Paraiba</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">IFPB - Instituto Federal da Paraiba</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="pt-br">IFPB - Instituto Federal da Paraiba</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.ifpb.edu.br</OrganizationURL>
-    <OrganizationURL xml:lang="pt-br">http://www.ifpb.edu.br</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Jose Hermano Cavalcanti Filho</SurName>
-    <EmailAddress>jose.cavalcanti@ifpb.edu.br</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.ifremer.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.ifremer.fr-idp-shibboleth.xml
deleted file mode 100644
index 78ae2bcf..00000000
--- a/swamid-interfederations-2.0/idp.ifremer.fr-idp-shibboleth.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://idp.ifremer.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2012-03-09T11:38:30Z">
-      <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">ifremer.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">IFREMER</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIEijCCA3KgAwIBAgIQMyTXXlW9hy8Y6QcUc2/LXzANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTEyMDMxMzAwMDAwMFoXDTE1MDMxMzIzNTk1OVowZzELMAkGA1UE
-BhMCRlIxLTArBgNVBAoTJElOU1QgRlIgUkVDSEVSQ0hFIFBPVVIgTCBFWFBMT0lU
-IE1FUjEQMA4GA1UECxMHSWZyZW1lcjEXMBUGA1UEAxMOaWRwLmlmcmVtZXIuZnIw
-ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQClaKJ3xIXrmlhK6UQmXeUw
-NQI0MCoL8n7ZiamNxs2UajZWwWipFo7bQ9288t/z30re8ngS4M1S0OECMJryDE3N
-fOKuKN4LxzAgExZ4KEGzcOkkuSs+CqGN/l8TG3GrCEQkVb73D7WcnKrQm9cJn1j8
-dxiQjGg+VFaf7PVOSpYlm2QEefevnoium7eyouNLsmQs4uM5zjmxZx1OC42Fam4s
-DMdiDYSZvSgrje7YSPQlc40CT/a1GUeKtrG6EWoyEhL/apg28XDvqTBdzMEqBwvW
-b32r5ZaQOAC0INCUGNArEl+z/rVUEkgzajtEt1eDkFD/3ADGvo/d1gU74SGbv8hL
-AgMBAAGjggFhMIIBXTAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3V0fqkOO57TAd
-BgNVHQ4EFgQUcBgRxOMX8JDcwteMb85Dnf5zOf4wDgYDVR0PAQH/BAQDAgWgMAwG
-A1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMBgGA1Ud
-IAQRMA8wDQYLKwYBBAGyMQECAh0wOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2Ny
-bC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBf
-MDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNT
-TENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcw
-GQYDVR0RBBIwEIIOaWRwLmlmcmVtZXIuZnIwDQYJKoZIhvcNAQEFBQADggEBADWG
-GYNO+95n4uytgs+sIEuzElrSJzDe5Kw1opSo5vTYaSkBYKlTQRGpleab+4kbdeLg
-n4qvMzMPwjCBwcAGdeJHXKk7MeG1bH3uyxSaLFJIzlibDIfolwh+SFOMzlWBt9Z3
-MtreBz7EfY3aa6fBySCmcPEDyeye2V2IsD8QXlI3GuBFkv9c8xYGmI3krHoOAy2g
-hZ2ugMoPK71mFFJPxshrqoIztjyQYSkDfiO2T6rj0rjO8LzOiFjXcK7hOIBYvCrg
-zXV+QCUbY/ybM1SrZ1UoRiD3zdYc12j2G+bNJXA/F/PzcGVm5FCodlgwUs9RH6Xn
-epzgatQFKE2hNWcrgIY=
-					    </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>
-					      MIIDJDCCAgygAwIBAgIVAJ8uLw0iofdd05rXMIJ1IiWOUhA7MA0GCSqGSIb3DQEB
-BQUAMBkxFzAVBgNVBAMTDmlkcC5pZnJlbWVyLmZyMB4XDTEzMDcwNDEzMDExOFoX
-DTMzMDcwNDEzMDExOFowGTEXMBUGA1UEAxMOaWRwLmlmcmVtZXIuZnIwggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC1ClLLTrrWqphf2yvm96RoikBLDouy
-RcC5YGYobGfjjQHl6YwzLIgD/pDFQXWqJkbs1x1gFiaKwAro1Yw6b+nHVhOleyDB
-5C6Lys7RwQUuevJAogsrwSBUZ2b2utRf5Y0Ul9sg+WJcRMBz0VbTsLRFqxGjZ4qQ
-H43WtoRohpzjJtlMkKQlWUoNlhqWZhmUzAWy5yEBp3eXMUZVwbfGp5UljMBuL42j
-kWbkL8cJevSDuU+uGLvMRn/GQY0Sm6Oqo+QKiMLDyxniTfTdXLqj1WZ5q/Md5bEL
-ZRbmh1gqKd2RUBg2ZJPe7t/HLqkfkHCG+ka03veNDV15uS76DSdIJyXrAgMBAAGj
-YzBhMEAGA1UdEQQ5MDeCDmlkcC5pZnJlbWVyLmZyhiVodHRwczovL2lkcC5pZnJl
-bWVyLmZyL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBRnJM2lEdm9x7XDHxYqGbKW
-XAn0lzANBgkqhkiG9w0BAQUFAAOCAQEADpZMeXoBV0lIfYJ6vLPzp6rdROZybxi5
-4S+zIN/bXg1H3FiAhQzR1pnGa6RCvTK1o9qLOZIgiR+GK+vrXz7/TXSMHp6nb0WK
-58OYQEA03qb41lZyubC5ZK2cNl9wS2HWsg7yGWGaaNw0VRcn1rPFmW4V6cDGgta1
-qmsJBwn2iDN/HllrlhPy0hDx356HqywmGqPMwbSlfon11vFqXS08thu9OFGFHYAw
-7v1J1BIO3JCc53qYhVy7WJ5STt6Y9JyB+jIqwRx7VYqxVHxsMmIIq6s8pMxpFwar
-e60xwMlwpLu7RawIAY2W1ThaahfsuUOQovLiv4AwqJYqndeRwqRGgQ==
-					    </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://idp.ifremer.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ifremer.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.ifremer.fr/idp/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">IFREMER</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">IFREMER</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>David Joncourt</SurName>
-    <EmailAddress>david.joncourt@ifremer.fr</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <SurName>Patrick Bossard</SurName>
-    <EmailAddress>Patrick.Bossard@ifremer.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.ifremer.fr.xml b/swamid-interfederations-2.0/idp.ifremer.fr.xml
deleted file mode 100644
index 78ae2bcf..00000000
--- a/swamid-interfederations-2.0/idp.ifremer.fr.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://idp.ifremer.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2012-03-09T11:38:30Z">
-      <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">ifremer.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">IFREMER</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIEijCCA3KgAwIBAgIQMyTXXlW9hy8Y6QcUc2/LXzANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTEyMDMxMzAwMDAwMFoXDTE1MDMxMzIzNTk1OVowZzELMAkGA1UE
-BhMCRlIxLTArBgNVBAoTJElOU1QgRlIgUkVDSEVSQ0hFIFBPVVIgTCBFWFBMT0lU
-IE1FUjEQMA4GA1UECxMHSWZyZW1lcjEXMBUGA1UEAxMOaWRwLmlmcmVtZXIuZnIw
-ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQClaKJ3xIXrmlhK6UQmXeUw
-NQI0MCoL8n7ZiamNxs2UajZWwWipFo7bQ9288t/z30re8ngS4M1S0OECMJryDE3N
-fOKuKN4LxzAgExZ4KEGzcOkkuSs+CqGN/l8TG3GrCEQkVb73D7WcnKrQm9cJn1j8
-dxiQjGg+VFaf7PVOSpYlm2QEefevnoium7eyouNLsmQs4uM5zjmxZx1OC42Fam4s
-DMdiDYSZvSgrje7YSPQlc40CT/a1GUeKtrG6EWoyEhL/apg28XDvqTBdzMEqBwvW
-b32r5ZaQOAC0INCUGNArEl+z/rVUEkgzajtEt1eDkFD/3ADGvo/d1gU74SGbv8hL
-AgMBAAGjggFhMIIBXTAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3V0fqkOO57TAd
-BgNVHQ4EFgQUcBgRxOMX8JDcwteMb85Dnf5zOf4wDgYDVR0PAQH/BAQDAgWgMAwG
-A1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMBgGA1Ud
-IAQRMA8wDQYLKwYBBAGyMQECAh0wOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2Ny
-bC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBf
-MDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNT
-TENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcw
-GQYDVR0RBBIwEIIOaWRwLmlmcmVtZXIuZnIwDQYJKoZIhvcNAQEFBQADggEBADWG
-GYNO+95n4uytgs+sIEuzElrSJzDe5Kw1opSo5vTYaSkBYKlTQRGpleab+4kbdeLg
-n4qvMzMPwjCBwcAGdeJHXKk7MeG1bH3uyxSaLFJIzlibDIfolwh+SFOMzlWBt9Z3
-MtreBz7EfY3aa6fBySCmcPEDyeye2V2IsD8QXlI3GuBFkv9c8xYGmI3krHoOAy2g
-hZ2ugMoPK71mFFJPxshrqoIztjyQYSkDfiO2T6rj0rjO8LzOiFjXcK7hOIBYvCrg
-zXV+QCUbY/ybM1SrZ1UoRiD3zdYc12j2G+bNJXA/F/PzcGVm5FCodlgwUs9RH6Xn
-epzgatQFKE2hNWcrgIY=
-					    </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>
-					      MIIDJDCCAgygAwIBAgIVAJ8uLw0iofdd05rXMIJ1IiWOUhA7MA0GCSqGSIb3DQEB
-BQUAMBkxFzAVBgNVBAMTDmlkcC5pZnJlbWVyLmZyMB4XDTEzMDcwNDEzMDExOFoX
-DTMzMDcwNDEzMDExOFowGTEXMBUGA1UEAxMOaWRwLmlmcmVtZXIuZnIwggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC1ClLLTrrWqphf2yvm96RoikBLDouy
-RcC5YGYobGfjjQHl6YwzLIgD/pDFQXWqJkbs1x1gFiaKwAro1Yw6b+nHVhOleyDB
-5C6Lys7RwQUuevJAogsrwSBUZ2b2utRf5Y0Ul9sg+WJcRMBz0VbTsLRFqxGjZ4qQ
-H43WtoRohpzjJtlMkKQlWUoNlhqWZhmUzAWy5yEBp3eXMUZVwbfGp5UljMBuL42j
-kWbkL8cJevSDuU+uGLvMRn/GQY0Sm6Oqo+QKiMLDyxniTfTdXLqj1WZ5q/Md5bEL
-ZRbmh1gqKd2RUBg2ZJPe7t/HLqkfkHCG+ka03veNDV15uS76DSdIJyXrAgMBAAGj
-YzBhMEAGA1UdEQQ5MDeCDmlkcC5pZnJlbWVyLmZyhiVodHRwczovL2lkcC5pZnJl
-bWVyLmZyL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBRnJM2lEdm9x7XDHxYqGbKW
-XAn0lzANBgkqhkiG9w0BAQUFAAOCAQEADpZMeXoBV0lIfYJ6vLPzp6rdROZybxi5
-4S+zIN/bXg1H3FiAhQzR1pnGa6RCvTK1o9qLOZIgiR+GK+vrXz7/TXSMHp6nb0WK
-58OYQEA03qb41lZyubC5ZK2cNl9wS2HWsg7yGWGaaNw0VRcn1rPFmW4V6cDGgta1
-qmsJBwn2iDN/HllrlhPy0hDx356HqywmGqPMwbSlfon11vFqXS08thu9OFGFHYAw
-7v1J1BIO3JCc53qYhVy7WJ5STt6Y9JyB+jIqwRx7VYqxVHxsMmIIq6s8pMxpFwar
-e60xwMlwpLu7RawIAY2W1ThaahfsuUOQovLiv4AwqJYqndeRwqRGgQ==
-					    </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://idp.ifremer.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ifremer.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.ifremer.fr/idp/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">IFREMER</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">IFREMER</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>David Joncourt</SurName>
-    <EmailAddress>david.joncourt@ifremer.fr</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <SurName>Patrick Bossard</SurName>
-    <EmailAddress>Patrick.Bossard@ifremer.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.ifsudestemg.edu.br-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.ifsudestemg.edu.br-idp-shibboleth.xml
deleted file mode 100644
index f8ae3c9a..00000000
--- a/swamid-interfederations-2.0/idp.ifsudestemg.edu.br-idp-shibboleth.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://idp.ifsudestemg.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">edu.br</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">IFSudesteMG - Instituto Federal do Sudeste de Minas Gerais</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="pt-br">IFSudesteMG - Instituto Federal do Sudeste de Minas Gerais</mdui:DisplayName>
-        <mdui:Description xml:lang="en">IFSudesteMG - Instituto Federal do Sudeste de Minas Gerais</mdui:Description>
-        <mdui:Description xml:lang="pt-br">IFSudesteMG - Instituto Federal do Sudeste de Minas Gerais</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.ifsudestemg.edu.br/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="pt-br">http://www.ifsudestemg.edu.br/</mdui:InformationURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-    MIID3jCCAsYCAQIwDQYJKoZIhvcNAQEFBQAwgbQxFjAUBgNVBAoTDUlGIFN1ZGVz
-dGUgTUcxFzAVBgNVBAsTDlBST0RJL0RHVEkvQ1JJMSUwIwYJKoZIhvcNAQkBFhZj
-cmlAaWZzdWRlc3RlbWcuZWR1LmJyMRUwEwYDVQQHEwxKdWl6IGRlIEZvcmExFTAT
-BgNVBAgTDE1pbmFzIEdlcmFpczELMAkGA1UEBhMCQlIxHzAdBgNVBAMTFmlkcC5p
-ZnN1ZGVzdGVtZy5lZHUuYnIwHhcNMTQwNTI2MTkzNjM4WhcNMTcwNTI1MTkzNjM4
-WjCBtDEWMBQGA1UEChMNSUYgU3VkZXN0ZSBNRzEXMBUGA1UECxMOUFJPREkvREdU
-SS9DUkkxJTAjBgkqhkiG9w0BCQEWFmNyaUBpZnN1ZGVzdGVtZy5lZHUuYnIxFTAT
-BgNVBAcTDEp1aXogZGUgRm9yYTEVMBMGA1UECBMMTWluYXMgR2VyYWlzMQswCQYD
-VQQGEwJCUjEfMB0GA1UEAxMWaWRwLmlmc3VkZXN0ZW1nLmVkdS5icjCCASIwDQYJ
-KoZIhvcNAQEBBQADggEPADCCAQoCggEBAMEoOjQZlyUQUe1L4itiQULFj/VW1LhW
-nUTS1MuWbER1HiWpuT6UJFMY+0q0d/tQ0RPXQakkvpWPC1yxR7iknXgg9oxjSb9T
-9WjLPbdvQCMPFCVe/aBgwUZ9RdLsETcuHagJ+ebD7QB1NnVhco9/rE398YHT+5X7
-OZkFuqOSKaEw7+79Jt5Vc4w6Tc6fPzrCAaT7G7YuXKRq0I8WV3xJClz0OwHZymz8
-eEBB7F/E0kr61/XRQjf3i4+F6pad8UT6FkmWbEvfFr54OtvqaPKL9tZWPnncrg4r
-Shw2qieG3AqcXO2jIGC3Iyk/TSS6lQQHYv1v5ELst87SQ8tSwuO8Yp8CAwEAATAN
-BgkqhkiG9w0BAQUFAAOCAQEAXmh5aRLYZn3vwyFcDKhR2i1SmaDMlJnN73ubJ8Pk
-3gwuyPcj/XdpLSFsCSKNeM2BAljp5D8i93+j9RjR/GvKA4pchq4DdVrw/45gcW57
-bnC1Dux/0kfBgZLy8GUg612ZdWm0F2kttOI/kDWmlWOFERcqmja0LM4cwzs+byj8
-Wum6NyNsy/5XSVhTMA7xUcypbrU/d7S9I2ik9Kope2e4Oihu5GX1YvtapIOzZ2EQ
-0yyvP5Y629IcqIzAMqR5tcYK9dMl2fmFQBhwdGciJKxQaAdyQkKvrXfSkuV/mi0V
-NPp10MrDZ1q+QBfffi16WobvmUBWgpE7UqgwTmJztWx7yA==
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ifsudestemg.edu.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ifsudestemg.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://idp.ifsudestemg.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ifsudestemg.edu.br/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.ifsudestemg.edu.br/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ifsudestemg.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>
-      
-MIID3jCCAsYCAQIwDQYJKoZIhvcNAQEFBQAwgbQxFjAUBgNVBAoTDUlGIFN1ZGVz
-dGUgTUcxFzAVBgNVBAsTDlBST0RJL0RHVEkvQ1JJMSUwIwYJKoZIhvcNAQkBFhZj
-cmlAaWZzdWRlc3RlbWcuZWR1LmJyMRUwEwYDVQQHEwxKdWl6IGRlIEZvcmExFTAT
-BgNVBAgTDE1pbmFzIEdlcmFpczELMAkGA1UEBhMCQlIxHzAdBgNVBAMTFmlkcC5p
-ZnN1ZGVzdGVtZy5lZHUuYnIwHhcNMTQwNTI2MTkzNjM4WhcNMTcwNTI1MTkzNjM4
-WjCBtDEWMBQGA1UEChMNSUYgU3VkZXN0ZSBNRzEXMBUGA1UECxMOUFJPREkvREdU
-SS9DUkkxJTAjBgkqhkiG9w0BCQEWFmNyaUBpZnN1ZGVzdGVtZy5lZHUuYnIxFTAT
-BgNVBAcTDEp1aXogZGUgRm9yYTEVMBMGA1UECBMMTWluYXMgR2VyYWlzMQswCQYD
-VQQGEwJCUjEfMB0GA1UEAxMWaWRwLmlmc3VkZXN0ZW1nLmVkdS5icjCCASIwDQYJ
-KoZIhvcNAQEBBQADggEPADCCAQoCggEBAMEoOjQZlyUQUe1L4itiQULFj/VW1LhW
-nUTS1MuWbER1HiWpuT6UJFMY+0q0d/tQ0RPXQakkvpWPC1yxR7iknXgg9oxjSb9T
-9WjLPbdvQCMPFCVe/aBgwUZ9RdLsETcuHagJ+ebD7QB1NnVhco9/rE398YHT+5X7
-OZkFuqOSKaEw7+79Jt5Vc4w6Tc6fPzrCAaT7G7YuXKRq0I8WV3xJClz0OwHZymz8
-eEBB7F/E0kr61/XRQjf3i4+F6pad8UT6FkmWbEvfFr54OtvqaPKL9tZWPnncrg4r
-Shw2qieG3AqcXO2jIGC3Iyk/TSS6lQQHYv1v5ELst87SQ8tSwuO8Yp8CAwEAATAN
-BgkqhkiG9w0BAQUFAAOCAQEAXmh5aRLYZn3vwyFcDKhR2i1SmaDMlJnN73ubJ8Pk
-3gwuyPcj/XdpLSFsCSKNeM2BAljp5D8i93+j9RjR/GvKA4pchq4DdVrw/45gcW57
-bnC1Dux/0kfBgZLy8GUg612ZdWm0F2kttOI/kDWmlWOFERcqmja0LM4cwzs+byj8
-Wum6NyNsy/5XSVhTMA7xUcypbrU/d7S9I2ik9Kope2e4Oihu5GX1YvtapIOzZ2EQ
-0yyvP5Y629IcqIzAMqR5tcYK9dMl2fmFQBhwdGciJKxQaAdyQkKvrXfSkuV/mi0V
-NPp10MrDZ1q+QBfffi16WobvmUBWgpE7UqgwTmJztWx7yA==
-                    
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ifsudestemg.edu.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ifsudestemg.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">IF Sudeste MG - Instituto Federal de Educacao, Ciencia e Tecnologia do Sudeste de Minas Gerais</OrganizationName>
-    <OrganizationName xml:lang="pt-br">IF Sudeste MG - Instituto Federal de Educacao, Ciencia e Tecnologia do Sudeste de Minas Gerais</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">IFSudesteMG - Instituto Federal do Sudeste de Minas Gerais</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="pt-br">IFSudesteMG - Instituto Federal do Sudeste de Minas Gerais</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.ifsudestemg.edu.br/</OrganizationURL>
-    <OrganizationURL xml:lang="pt-br">http://www.ifsudestemg.edu.br/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Elder Marcelino</SurName>
-    <EmailAddress>elder.marcelino@ifsudestemg.edu.br</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.ifsudestemg.edu.br.xml b/swamid-interfederations-2.0/idp.ifsudestemg.edu.br.xml
deleted file mode 100644
index f8ae3c9a..00000000
--- a/swamid-interfederations-2.0/idp.ifsudestemg.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://idp.ifsudestemg.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">edu.br</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">IFSudesteMG - Instituto Federal do Sudeste de Minas Gerais</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="pt-br">IFSudesteMG - Instituto Federal do Sudeste de Minas Gerais</mdui:DisplayName>
-        <mdui:Description xml:lang="en">IFSudesteMG - Instituto Federal do Sudeste de Minas Gerais</mdui:Description>
-        <mdui:Description xml:lang="pt-br">IFSudesteMG - Instituto Federal do Sudeste de Minas Gerais</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.ifsudestemg.edu.br/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="pt-br">http://www.ifsudestemg.edu.br/</mdui:InformationURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-    MIID3jCCAsYCAQIwDQYJKoZIhvcNAQEFBQAwgbQxFjAUBgNVBAoTDUlGIFN1ZGVz
-dGUgTUcxFzAVBgNVBAsTDlBST0RJL0RHVEkvQ1JJMSUwIwYJKoZIhvcNAQkBFhZj
-cmlAaWZzdWRlc3RlbWcuZWR1LmJyMRUwEwYDVQQHEwxKdWl6IGRlIEZvcmExFTAT
-BgNVBAgTDE1pbmFzIEdlcmFpczELMAkGA1UEBhMCQlIxHzAdBgNVBAMTFmlkcC5p
-ZnN1ZGVzdGVtZy5lZHUuYnIwHhcNMTQwNTI2MTkzNjM4WhcNMTcwNTI1MTkzNjM4
-WjCBtDEWMBQGA1UEChMNSUYgU3VkZXN0ZSBNRzEXMBUGA1UECxMOUFJPREkvREdU
-SS9DUkkxJTAjBgkqhkiG9w0BCQEWFmNyaUBpZnN1ZGVzdGVtZy5lZHUuYnIxFTAT
-BgNVBAcTDEp1aXogZGUgRm9yYTEVMBMGA1UECBMMTWluYXMgR2VyYWlzMQswCQYD
-VQQGEwJCUjEfMB0GA1UEAxMWaWRwLmlmc3VkZXN0ZW1nLmVkdS5icjCCASIwDQYJ
-KoZIhvcNAQEBBQADggEPADCCAQoCggEBAMEoOjQZlyUQUe1L4itiQULFj/VW1LhW
-nUTS1MuWbER1HiWpuT6UJFMY+0q0d/tQ0RPXQakkvpWPC1yxR7iknXgg9oxjSb9T
-9WjLPbdvQCMPFCVe/aBgwUZ9RdLsETcuHagJ+ebD7QB1NnVhco9/rE398YHT+5X7
-OZkFuqOSKaEw7+79Jt5Vc4w6Tc6fPzrCAaT7G7YuXKRq0I8WV3xJClz0OwHZymz8
-eEBB7F/E0kr61/XRQjf3i4+F6pad8UT6FkmWbEvfFr54OtvqaPKL9tZWPnncrg4r
-Shw2qieG3AqcXO2jIGC3Iyk/TSS6lQQHYv1v5ELst87SQ8tSwuO8Yp8CAwEAATAN
-BgkqhkiG9w0BAQUFAAOCAQEAXmh5aRLYZn3vwyFcDKhR2i1SmaDMlJnN73ubJ8Pk
-3gwuyPcj/XdpLSFsCSKNeM2BAljp5D8i93+j9RjR/GvKA4pchq4DdVrw/45gcW57
-bnC1Dux/0kfBgZLy8GUg612ZdWm0F2kttOI/kDWmlWOFERcqmja0LM4cwzs+byj8
-Wum6NyNsy/5XSVhTMA7xUcypbrU/d7S9I2ik9Kope2e4Oihu5GX1YvtapIOzZ2EQ
-0yyvP5Y629IcqIzAMqR5tcYK9dMl2fmFQBhwdGciJKxQaAdyQkKvrXfSkuV/mi0V
-NPp10MrDZ1q+QBfffi16WobvmUBWgpE7UqgwTmJztWx7yA==
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ifsudestemg.edu.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ifsudestemg.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://idp.ifsudestemg.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ifsudestemg.edu.br/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.ifsudestemg.edu.br/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ifsudestemg.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>
-      
-MIID3jCCAsYCAQIwDQYJKoZIhvcNAQEFBQAwgbQxFjAUBgNVBAoTDUlGIFN1ZGVz
-dGUgTUcxFzAVBgNVBAsTDlBST0RJL0RHVEkvQ1JJMSUwIwYJKoZIhvcNAQkBFhZj
-cmlAaWZzdWRlc3RlbWcuZWR1LmJyMRUwEwYDVQQHEwxKdWl6IGRlIEZvcmExFTAT
-BgNVBAgTDE1pbmFzIEdlcmFpczELMAkGA1UEBhMCQlIxHzAdBgNVBAMTFmlkcC5p
-ZnN1ZGVzdGVtZy5lZHUuYnIwHhcNMTQwNTI2MTkzNjM4WhcNMTcwNTI1MTkzNjM4
-WjCBtDEWMBQGA1UEChMNSUYgU3VkZXN0ZSBNRzEXMBUGA1UECxMOUFJPREkvREdU
-SS9DUkkxJTAjBgkqhkiG9w0BCQEWFmNyaUBpZnN1ZGVzdGVtZy5lZHUuYnIxFTAT
-BgNVBAcTDEp1aXogZGUgRm9yYTEVMBMGA1UECBMMTWluYXMgR2VyYWlzMQswCQYD
-VQQGEwJCUjEfMB0GA1UEAxMWaWRwLmlmc3VkZXN0ZW1nLmVkdS5icjCCASIwDQYJ
-KoZIhvcNAQEBBQADggEPADCCAQoCggEBAMEoOjQZlyUQUe1L4itiQULFj/VW1LhW
-nUTS1MuWbER1HiWpuT6UJFMY+0q0d/tQ0RPXQakkvpWPC1yxR7iknXgg9oxjSb9T
-9WjLPbdvQCMPFCVe/aBgwUZ9RdLsETcuHagJ+ebD7QB1NnVhco9/rE398YHT+5X7
-OZkFuqOSKaEw7+79Jt5Vc4w6Tc6fPzrCAaT7G7YuXKRq0I8WV3xJClz0OwHZymz8
-eEBB7F/E0kr61/XRQjf3i4+F6pad8UT6FkmWbEvfFr54OtvqaPKL9tZWPnncrg4r
-Shw2qieG3AqcXO2jIGC3Iyk/TSS6lQQHYv1v5ELst87SQ8tSwuO8Yp8CAwEAATAN
-BgkqhkiG9w0BAQUFAAOCAQEAXmh5aRLYZn3vwyFcDKhR2i1SmaDMlJnN73ubJ8Pk
-3gwuyPcj/XdpLSFsCSKNeM2BAljp5D8i93+j9RjR/GvKA4pchq4DdVrw/45gcW57
-bnC1Dux/0kfBgZLy8GUg612ZdWm0F2kttOI/kDWmlWOFERcqmja0LM4cwzs+byj8
-Wum6NyNsy/5XSVhTMA7xUcypbrU/d7S9I2ik9Kope2e4Oihu5GX1YvtapIOzZ2EQ
-0yyvP5Y629IcqIzAMqR5tcYK9dMl2fmFQBhwdGciJKxQaAdyQkKvrXfSkuV/mi0V
-NPp10MrDZ1q+QBfffi16WobvmUBWgpE7UqgwTmJztWx7yA==
-                    
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ifsudestemg.edu.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ifsudestemg.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">IF Sudeste MG - Instituto Federal de Educacao, Ciencia e Tecnologia do Sudeste de Minas Gerais</OrganizationName>
-    <OrganizationName xml:lang="pt-br">IF Sudeste MG - Instituto Federal de Educacao, Ciencia e Tecnologia do Sudeste de Minas Gerais</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">IFSudesteMG - Instituto Federal do Sudeste de Minas Gerais</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="pt-br">IFSudesteMG - Instituto Federal do Sudeste de Minas Gerais</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.ifsudestemg.edu.br/</OrganizationURL>
-    <OrganizationURL xml:lang="pt-br">http://www.ifsudestemg.edu.br/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Elder Marcelino</SurName>
-    <EmailAddress>elder.marcelino@ifsudestemg.edu.br</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.ifto.edu.br-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.ifto.edu.br-idp-shibboleth.xml
deleted file mode 100644
index ca21033e..00000000
--- a/swamid-interfederations-2.0/idp.ifto.edu.br-idp-shibboleth.xml
+++ /dev/null
@@ -1,100 +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://idp.ifto.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">edu.br</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">IFTO-Instituto Federal do Educacao do Tocantins</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="pt-br">IFTO-Instituto Federal do Educacao do Tocantins</mdui:DisplayName>
-        <mdui:Description xml:lang="en">IFTO-Instituto Federal do Educacao do Tocantins</mdui:Description>
-        <mdui:Description xml:lang="pt-br">IFTO-Instituto Federal do Educacao do Tocantins</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.ifto.edu.br</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="pt-br">http://www.ifto.edu.br</mdui:InformationURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-    MIICxjCCAa4CAQAwDQYJKoZIhvcNAQEFBQAwKTEMMAoGA1UECxMDQ1BEMQswCQYD
-VQQGEwJCUjEMMAoGA1UEAxMDaWRwMB4XDTE0MDQxMDEyMDkxM1oXDTE5MDQwOTEy
-MDkxM1owKTEMMAoGA1UECxMDQ1BEMQswCQYDVQQGEwJCUjEMMAoGA1UEAxMDaWRw
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAyTw62MPvGqETh9JqxpDT
-SEk3yr0pgXrgqsueDBe1fw1+A/xsdd12PL6L+Js5Fmwzr2bi/CwQgS8sus11FfKb
-zNyxeMnK5emZHOVDbw8E2MRk2RwHy1dzt99G/tgRUh2fqQYoKDFiVHvbmKOCtmtY
-GB7teGLk+eXw5dwdrcy0h8pNajTIOoNEoDhYwlIHvreQLGrLP5zEtDRX9QkWqU6o
-Gl4fltzgjFGvh+DNGNVcbZC3dF/kklTLTlK2irSoC4ODYe/8riJkOPHq2/J6LILc
-EPNXpiETPk+eRriDu87GFCyayqKV3dx1OIeTj7p1ZnBu13W0j1YdoPzT8+qc1lb2
-KwIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQBixVogGPehJzerTgHq/OYdxdrB99If
-lVlB8/+hjbDLrSulsX6zKdUdladNg+RuaCl11SrbqoLmCigoCNXcshcg2xgKfRhz
-5Wsuuzr8VZHoPbfEF3rTS0uS+jUTB2BdeXWqek2kjWxpFs54FqFNSQgBoEoLhTvm
-RWwFISF/Zg4HP+PZDzEsK7Q+3Wvif0qhVsrBCGG9n9V0opTDLVtt6fDNX/JxQt6t
-Xsa6qY7j1iHlZ30Ff7sRrhr2jTC47Zgw8cDb3ydsQwoU6rtma0M9eONgIetjuGfn
-t5gva52zrXfpmczFDORrRV/XxIxyGrLbPXyVX99ovMbVvGQPuZDY4cSy
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ifto.edu.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ifto.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://idp.ifto.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ifto.edu.br/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.ifto.edu.br/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ifto.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>
-      
-MIICxjCCAa4CAQAwDQYJKoZIhvcNAQEFBQAwKTEMMAoGA1UECxMDQ1BEMQswCQYD
-VQQGEwJCUjEMMAoGA1UEAxMDaWRwMB4XDTE0MDQxMDEyMDkxM1oXDTE5MDQwOTEy
-MDkxM1owKTEMMAoGA1UECxMDQ1BEMQswCQYDVQQGEwJCUjEMMAoGA1UEAxMDaWRw
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAyTw62MPvGqETh9JqxpDT
-SEk3yr0pgXrgqsueDBe1fw1+A/xsdd12PL6L+Js5Fmwzr2bi/CwQgS8sus11FfKb
-zNyxeMnK5emZHOVDbw8E2MRk2RwHy1dzt99G/tgRUh2fqQYoKDFiVHvbmKOCtmtY
-GB7teGLk+eXw5dwdrcy0h8pNajTIOoNEoDhYwlIHvreQLGrLP5zEtDRX9QkWqU6o
-Gl4fltzgjFGvh+DNGNVcbZC3dF/kklTLTlK2irSoC4ODYe/8riJkOPHq2/J6LILc
-EPNXpiETPk+eRriDu87GFCyayqKV3dx1OIeTj7p1ZnBu13W0j1YdoPzT8+qc1lb2
-KwIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQBixVogGPehJzerTgHq/OYdxdrB99If
-lVlB8/+hjbDLrSulsX6zKdUdladNg+RuaCl11SrbqoLmCigoCNXcshcg2xgKfRhz
-5Wsuuzr8VZHoPbfEF3rTS0uS+jUTB2BdeXWqek2kjWxpFs54FqFNSQgBoEoLhTvm
-RWwFISF/Zg4HP+PZDzEsK7Q+3Wvif0qhVsrBCGG9n9V0opTDLVtt6fDNX/JxQt6t
-Xsa6qY7j1iHlZ30Ff7sRrhr2jTC47Zgw8cDb3ydsQwoU6rtma0M9eONgIetjuGfn
-t5gva52zrXfpmczFDORrRV/XxIxyGrLbPXyVX99ovMbVvGQPuZDY4cSy
-                    
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ifto.edu.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ifto.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">IFTO-Instituto Federal do Educacao do Tocantins</OrganizationName>
-    <OrganizationName xml:lang="pt-br">IFTO-Instituto Federal do Educacao do Tocantins</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">IFTO-Instituto Federal do Educacao do Tocantins</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="pt-br">IFTO-Instituto Federal do Educacao do Tocantins</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.ifto.edu.br</OrganizationURL>
-    <OrganizationURL xml:lang="pt-br">http://www.ifto.edu.br</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Ronaldo Vasconcelos Parente</SurName>
-    <EmailAddress>parente@ifto.edu.br</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.ifto.edu.br.xml b/swamid-interfederations-2.0/idp.ifto.edu.br.xml
deleted file mode 100644
index ca21033e..00000000
--- a/swamid-interfederations-2.0/idp.ifto.edu.br.xml
+++ /dev/null
@@ -1,100 +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://idp.ifto.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">edu.br</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">IFTO-Instituto Federal do Educacao do Tocantins</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="pt-br">IFTO-Instituto Federal do Educacao do Tocantins</mdui:DisplayName>
-        <mdui:Description xml:lang="en">IFTO-Instituto Federal do Educacao do Tocantins</mdui:Description>
-        <mdui:Description xml:lang="pt-br">IFTO-Instituto Federal do Educacao do Tocantins</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.ifto.edu.br</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="pt-br">http://www.ifto.edu.br</mdui:InformationURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-    MIICxjCCAa4CAQAwDQYJKoZIhvcNAQEFBQAwKTEMMAoGA1UECxMDQ1BEMQswCQYD
-VQQGEwJCUjEMMAoGA1UEAxMDaWRwMB4XDTE0MDQxMDEyMDkxM1oXDTE5MDQwOTEy
-MDkxM1owKTEMMAoGA1UECxMDQ1BEMQswCQYDVQQGEwJCUjEMMAoGA1UEAxMDaWRw
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAyTw62MPvGqETh9JqxpDT
-SEk3yr0pgXrgqsueDBe1fw1+A/xsdd12PL6L+Js5Fmwzr2bi/CwQgS8sus11FfKb
-zNyxeMnK5emZHOVDbw8E2MRk2RwHy1dzt99G/tgRUh2fqQYoKDFiVHvbmKOCtmtY
-GB7teGLk+eXw5dwdrcy0h8pNajTIOoNEoDhYwlIHvreQLGrLP5zEtDRX9QkWqU6o
-Gl4fltzgjFGvh+DNGNVcbZC3dF/kklTLTlK2irSoC4ODYe/8riJkOPHq2/J6LILc
-EPNXpiETPk+eRriDu87GFCyayqKV3dx1OIeTj7p1ZnBu13W0j1YdoPzT8+qc1lb2
-KwIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQBixVogGPehJzerTgHq/OYdxdrB99If
-lVlB8/+hjbDLrSulsX6zKdUdladNg+RuaCl11SrbqoLmCigoCNXcshcg2xgKfRhz
-5Wsuuzr8VZHoPbfEF3rTS0uS+jUTB2BdeXWqek2kjWxpFs54FqFNSQgBoEoLhTvm
-RWwFISF/Zg4HP+PZDzEsK7Q+3Wvif0qhVsrBCGG9n9V0opTDLVtt6fDNX/JxQt6t
-Xsa6qY7j1iHlZ30Ff7sRrhr2jTC47Zgw8cDb3ydsQwoU6rtma0M9eONgIetjuGfn
-t5gva52zrXfpmczFDORrRV/XxIxyGrLbPXyVX99ovMbVvGQPuZDY4cSy
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ifto.edu.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ifto.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://idp.ifto.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ifto.edu.br/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.ifto.edu.br/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ifto.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>
-      
-MIICxjCCAa4CAQAwDQYJKoZIhvcNAQEFBQAwKTEMMAoGA1UECxMDQ1BEMQswCQYD
-VQQGEwJCUjEMMAoGA1UEAxMDaWRwMB4XDTE0MDQxMDEyMDkxM1oXDTE5MDQwOTEy
-MDkxM1owKTEMMAoGA1UECxMDQ1BEMQswCQYDVQQGEwJCUjEMMAoGA1UEAxMDaWRw
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAyTw62MPvGqETh9JqxpDT
-SEk3yr0pgXrgqsueDBe1fw1+A/xsdd12PL6L+Js5Fmwzr2bi/CwQgS8sus11FfKb
-zNyxeMnK5emZHOVDbw8E2MRk2RwHy1dzt99G/tgRUh2fqQYoKDFiVHvbmKOCtmtY
-GB7teGLk+eXw5dwdrcy0h8pNajTIOoNEoDhYwlIHvreQLGrLP5zEtDRX9QkWqU6o
-Gl4fltzgjFGvh+DNGNVcbZC3dF/kklTLTlK2irSoC4ODYe/8riJkOPHq2/J6LILc
-EPNXpiETPk+eRriDu87GFCyayqKV3dx1OIeTj7p1ZnBu13W0j1YdoPzT8+qc1lb2
-KwIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQBixVogGPehJzerTgHq/OYdxdrB99If
-lVlB8/+hjbDLrSulsX6zKdUdladNg+RuaCl11SrbqoLmCigoCNXcshcg2xgKfRhz
-5Wsuuzr8VZHoPbfEF3rTS0uS+jUTB2BdeXWqek2kjWxpFs54FqFNSQgBoEoLhTvm
-RWwFISF/Zg4HP+PZDzEsK7Q+3Wvif0qhVsrBCGG9n9V0opTDLVtt6fDNX/JxQt6t
-Xsa6qY7j1iHlZ30Ff7sRrhr2jTC47Zgw8cDb3ydsQwoU6rtma0M9eONgIetjuGfn
-t5gva52zrXfpmczFDORrRV/XxIxyGrLbPXyVX99ovMbVvGQPuZDY4cSy
-                    
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ifto.edu.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ifto.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">IFTO-Instituto Federal do Educacao do Tocantins</OrganizationName>
-    <OrganizationName xml:lang="pt-br">IFTO-Instituto Federal do Educacao do Tocantins</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">IFTO-Instituto Federal do Educacao do Tocantins</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="pt-br">IFTO-Instituto Federal do Educacao do Tocantins</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.ifto.edu.br</OrganizationURL>
-    <OrganizationURL xml:lang="pt-br">http://www.ifto.edu.br</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Ronaldo Vasconcelos Parente</SurName>
-    <EmailAddress>parente@ifto.edu.br</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.iit.it-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.iit.it-idp-shibboleth.xml
deleted file mode 100644
index 6aaafff9..00000000
--- a/swamid-interfederations-2.0/idp.iit.it-idp-shibboleth.xml
+++ /dev/null
@@ -1,115 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" entityID="https://idp.iit.it/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2014-07-24T14:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</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">iit.it</shibmd:Scope>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="en">IIT - Istituto Italiano di Tecnologia</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="it">IIT - Istituto Italiano di Tecnologia</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Identity Provider for staff and students of IIT - Istituto Italiano di Tecnologia</mdui:Description>
-        <mdui:Description xml:lang="it">Identity Provider per personale e studenti del IIT - Istituto Italiano di Tecnologia</mdui:Description>
-        <mdui:InformationURL xml:lang="en">https://idp.iit.it/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="it">https://idp.iit.it/</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://idp.iit.it/</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="it">https://idp.iit.it/</mdui:PrivacyStatementURL>
-        <mdui:Logo height="16" width="16" xml:lang="en">https://idp.iit.it/public/logo16.png</mdui:Logo>
-        <mdui:Logo height="16" width="16" xml:lang="it">https://idp.iit.it/public/logo16.png</mdui:Logo>
-        <mdui:Logo height="60" width="80" xml:lang="en">https://idp.iit.it/public/logo80.png</mdui:Logo>
-        <mdui:Logo height="60" width="80" xml:lang="it">https://idp.iit.it/public/logo80.png</mdui:Logo>
-      </mdui:UIInfo>
-      <mdui:DiscoHints>
-        <mdui:DomainHint>iit.it</mdui:DomainHint>
-        <mdui:IPHint>90.147.14.0/24</mdui:IPHint>
-        <mdui:IPHint>90.147.15.0/24</mdui:IPHint>
-        <mdui:IPHint>90.147.38.0/24</mdui:IPHint>
-      </mdui:DiscoHints>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDEzCCAfugAwIBAgIUHIWbRP4lLaQqLeAOPCDTBpfKvFAwDQYJKoZIhvcNAQEF
-BQAwFTETMBEGA1UEAxMKaWRwLmlpdC5pdDAeFw0xMzA1MzExNjAxMTRaFw0zMzA1
-MzExNjAxMTRaMBUxEzARBgNVBAMTCmlkcC5paXQuaXQwggEiMA0GCSqGSIb3DQEB
-AQUAA4IBDwAwggEKAoIBAQCXtz7N8Q8s8RgmfsMD0oKFSU3Tka0uiSLLb32v1GGU
-BUa/0PJ2JHtGflLSUqat5eY57tgapbmuZ4wcL69dNEysmulLcaXBEJW6N+gZgOEp
-jefydM9yur6LyQFGPJEo8xtjhLgje835g69lRejx5I6uR/xB/ZpsFFezZB0bEiLT
-o++j3feGk41B/9sHtHF1hsXZB1XxACtoF7PSSCXHVzlWaL3Dqqy/7/LHSYRbRM7V
-M7nEbT3rnGIYy7w4127q8EYyO70ehC2x06kNAt7cpEPyT6I86Q9g39KCztAmpAXt
-ar3oBkWq3OTR2til0WqsnAI28PlULIcthqVAn53bp/pLAgMBAAGjWzBZMDgGA1Ud
-EQQxMC+CCmlkcC5paXQuaXSGIWh0dHBzOi8vaWRwLmlpdC5pdC9pZHAvc2hpYmJv
-bGV0aDAdBgNVHQ4EFgQUlm9TS1DW0CQjQP3dOgSB1L9zICkwDQYJKoZIhvcNAQEF
-BQADggEBAAhirHsW76gKfQPyNc1tAUQOu+wt9wlb+lkkthT7sRcBfInpB7JAEABY
-EEL+vARREM0JGlIVjDolnQcfX08+XVkIgmIzte5/8hDKtN8FalpD5FhvdKfOxh+6
-LIzpG+nsuhX+Zg7xlfy1acqfqjT3LutHTDc1+GKnQo/pUoZbTvjzZLtEd1pXibZy
-w1LSYU47K4epzK2OpxXyX85KoNdnjfK4qPH2DOt9RAtcryqL1o0C9vAYspib/Efr
-pMQa1UDXAYBHZUmb72ol+6UtRnrFLWJJOIa/XXL21p1NQ3A17rssS751OfcFmkLP
-roltF87PG3SU/pYmKkSZM7KUtqQHk3U=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.iit.it:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.iit.it:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.iit.it/idp/profile/SAML2/Redirect/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.iit.it/idp/profile/SAML2/POST/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.iit.it: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.iit.it/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.iit.it/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.iit.it/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.iit.it/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">iit.it</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDEzCCAfugAwIBAgIUHIWbRP4lLaQqLeAOPCDTBpfKvFAwDQYJKoZIhvcNAQEF
-BQAwFTETMBEGA1UEAxMKaWRwLmlpdC5pdDAeFw0xMzA1MzExNjAxMTRaFw0zMzA1
-MzExNjAxMTRaMBUxEzARBgNVBAMTCmlkcC5paXQuaXQwggEiMA0GCSqGSIb3DQEB
-AQUAA4IBDwAwggEKAoIBAQCXtz7N8Q8s8RgmfsMD0oKFSU3Tka0uiSLLb32v1GGU
-BUa/0PJ2JHtGflLSUqat5eY57tgapbmuZ4wcL69dNEysmulLcaXBEJW6N+gZgOEp
-jefydM9yur6LyQFGPJEo8xtjhLgje835g69lRejx5I6uR/xB/ZpsFFezZB0bEiLT
-o++j3feGk41B/9sHtHF1hsXZB1XxACtoF7PSSCXHVzlWaL3Dqqy/7/LHSYRbRM7V
-M7nEbT3rnGIYy7w4127q8EYyO70ehC2x06kNAt7cpEPyT6I86Q9g39KCztAmpAXt
-ar3oBkWq3OTR2til0WqsnAI28PlULIcthqVAn53bp/pLAgMBAAGjWzBZMDgGA1Ud
-EQQxMC+CCmlkcC5paXQuaXSGIWh0dHBzOi8vaWRwLmlpdC5pdC9pZHAvc2hpYmJv
-bGV0aDAdBgNVHQ4EFgQUlm9TS1DW0CQjQP3dOgSB1L9zICkwDQYJKoZIhvcNAQEF
-BQADggEBAAhirHsW76gKfQPyNc1tAUQOu+wt9wlb+lkkthT7sRcBfInpB7JAEABY
-EEL+vARREM0JGlIVjDolnQcfX08+XVkIgmIzte5/8hDKtN8FalpD5FhvdKfOxh+6
-LIzpG+nsuhX+Zg7xlfy1acqfqjT3LutHTDc1+GKnQo/pUoZbTvjzZLtEd1pXibZy
-w1LSYU47K4epzK2OpxXyX85KoNdnjfK4qPH2DOt9RAtcryqL1o0C9vAYspib/Efr
-pMQa1UDXAYBHZUmb72ol+6UtRnrFLWJJOIa/XXL21p1NQ3A17rssS751OfcFmkLP
-roltF87PG3SU/pYmKkSZM7KUtqQHk3U=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.iit.it:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.iit.it: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">IIT - Istituto Italiano di Tecnologia</OrganizationName>
-    <OrganizationName xml:lang="it">IIT - Istituto Italiano di Tecnologia</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">IIT - Istituto Italiano di Tecnologia</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="it">IIT - Istituto Italiano di Tecnologia</OrganizationDisplayName>
-    <OrganizationURL xml:lang="it">http://www.iit.it/</OrganizationURL>
-    <OrganizationURL xml:lang="en">http://www.iit.it/en/home.html</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>IIT-Service Desk ICT</GivenName>
-    <EmailAddress>ict_servicedesk@iit.it</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.iit.it.xml b/swamid-interfederations-2.0/idp.iit.it.xml
deleted file mode 100644
index 6aaafff9..00000000
--- a/swamid-interfederations-2.0/idp.iit.it.xml
+++ /dev/null
@@ -1,115 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" entityID="https://idp.iit.it/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2014-07-24T14:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</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">iit.it</shibmd:Scope>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="en">IIT - Istituto Italiano di Tecnologia</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="it">IIT - Istituto Italiano di Tecnologia</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Identity Provider for staff and students of IIT - Istituto Italiano di Tecnologia</mdui:Description>
-        <mdui:Description xml:lang="it">Identity Provider per personale e studenti del IIT - Istituto Italiano di Tecnologia</mdui:Description>
-        <mdui:InformationURL xml:lang="en">https://idp.iit.it/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="it">https://idp.iit.it/</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://idp.iit.it/</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="it">https://idp.iit.it/</mdui:PrivacyStatementURL>
-        <mdui:Logo height="16" width="16" xml:lang="en">https://idp.iit.it/public/logo16.png</mdui:Logo>
-        <mdui:Logo height="16" width="16" xml:lang="it">https://idp.iit.it/public/logo16.png</mdui:Logo>
-        <mdui:Logo height="60" width="80" xml:lang="en">https://idp.iit.it/public/logo80.png</mdui:Logo>
-        <mdui:Logo height="60" width="80" xml:lang="it">https://idp.iit.it/public/logo80.png</mdui:Logo>
-      </mdui:UIInfo>
-      <mdui:DiscoHints>
-        <mdui:DomainHint>iit.it</mdui:DomainHint>
-        <mdui:IPHint>90.147.14.0/24</mdui:IPHint>
-        <mdui:IPHint>90.147.15.0/24</mdui:IPHint>
-        <mdui:IPHint>90.147.38.0/24</mdui:IPHint>
-      </mdui:DiscoHints>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDEzCCAfugAwIBAgIUHIWbRP4lLaQqLeAOPCDTBpfKvFAwDQYJKoZIhvcNAQEF
-BQAwFTETMBEGA1UEAxMKaWRwLmlpdC5pdDAeFw0xMzA1MzExNjAxMTRaFw0zMzA1
-MzExNjAxMTRaMBUxEzARBgNVBAMTCmlkcC5paXQuaXQwggEiMA0GCSqGSIb3DQEB
-AQUAA4IBDwAwggEKAoIBAQCXtz7N8Q8s8RgmfsMD0oKFSU3Tka0uiSLLb32v1GGU
-BUa/0PJ2JHtGflLSUqat5eY57tgapbmuZ4wcL69dNEysmulLcaXBEJW6N+gZgOEp
-jefydM9yur6LyQFGPJEo8xtjhLgje835g69lRejx5I6uR/xB/ZpsFFezZB0bEiLT
-o++j3feGk41B/9sHtHF1hsXZB1XxACtoF7PSSCXHVzlWaL3Dqqy/7/LHSYRbRM7V
-M7nEbT3rnGIYy7w4127q8EYyO70ehC2x06kNAt7cpEPyT6I86Q9g39KCztAmpAXt
-ar3oBkWq3OTR2til0WqsnAI28PlULIcthqVAn53bp/pLAgMBAAGjWzBZMDgGA1Ud
-EQQxMC+CCmlkcC5paXQuaXSGIWh0dHBzOi8vaWRwLmlpdC5pdC9pZHAvc2hpYmJv
-bGV0aDAdBgNVHQ4EFgQUlm9TS1DW0CQjQP3dOgSB1L9zICkwDQYJKoZIhvcNAQEF
-BQADggEBAAhirHsW76gKfQPyNc1tAUQOu+wt9wlb+lkkthT7sRcBfInpB7JAEABY
-EEL+vARREM0JGlIVjDolnQcfX08+XVkIgmIzte5/8hDKtN8FalpD5FhvdKfOxh+6
-LIzpG+nsuhX+Zg7xlfy1acqfqjT3LutHTDc1+GKnQo/pUoZbTvjzZLtEd1pXibZy
-w1LSYU47K4epzK2OpxXyX85KoNdnjfK4qPH2DOt9RAtcryqL1o0C9vAYspib/Efr
-pMQa1UDXAYBHZUmb72ol+6UtRnrFLWJJOIa/XXL21p1NQ3A17rssS751OfcFmkLP
-roltF87PG3SU/pYmKkSZM7KUtqQHk3U=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.iit.it:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.iit.it:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.iit.it/idp/profile/SAML2/Redirect/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.iit.it/idp/profile/SAML2/POST/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.iit.it: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.iit.it/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.iit.it/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.iit.it/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.iit.it/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">iit.it</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDEzCCAfugAwIBAgIUHIWbRP4lLaQqLeAOPCDTBpfKvFAwDQYJKoZIhvcNAQEF
-BQAwFTETMBEGA1UEAxMKaWRwLmlpdC5pdDAeFw0xMzA1MzExNjAxMTRaFw0zMzA1
-MzExNjAxMTRaMBUxEzARBgNVBAMTCmlkcC5paXQuaXQwggEiMA0GCSqGSIb3DQEB
-AQUAA4IBDwAwggEKAoIBAQCXtz7N8Q8s8RgmfsMD0oKFSU3Tka0uiSLLb32v1GGU
-BUa/0PJ2JHtGflLSUqat5eY57tgapbmuZ4wcL69dNEysmulLcaXBEJW6N+gZgOEp
-jefydM9yur6LyQFGPJEo8xtjhLgje835g69lRejx5I6uR/xB/ZpsFFezZB0bEiLT
-o++j3feGk41B/9sHtHF1hsXZB1XxACtoF7PSSCXHVzlWaL3Dqqy/7/LHSYRbRM7V
-M7nEbT3rnGIYy7w4127q8EYyO70ehC2x06kNAt7cpEPyT6I86Q9g39KCztAmpAXt
-ar3oBkWq3OTR2til0WqsnAI28PlULIcthqVAn53bp/pLAgMBAAGjWzBZMDgGA1Ud
-EQQxMC+CCmlkcC5paXQuaXSGIWh0dHBzOi8vaWRwLmlpdC5pdC9pZHAvc2hpYmJv
-bGV0aDAdBgNVHQ4EFgQUlm9TS1DW0CQjQP3dOgSB1L9zICkwDQYJKoZIhvcNAQEF
-BQADggEBAAhirHsW76gKfQPyNc1tAUQOu+wt9wlb+lkkthT7sRcBfInpB7JAEABY
-EEL+vARREM0JGlIVjDolnQcfX08+XVkIgmIzte5/8hDKtN8FalpD5FhvdKfOxh+6
-LIzpG+nsuhX+Zg7xlfy1acqfqjT3LutHTDc1+GKnQo/pUoZbTvjzZLtEd1pXibZy
-w1LSYU47K4epzK2OpxXyX85KoNdnjfK4qPH2DOt9RAtcryqL1o0C9vAYspib/Efr
-pMQa1UDXAYBHZUmb72ol+6UtRnrFLWJJOIa/XXL21p1NQ3A17rssS751OfcFmkLP
-roltF87PG3SU/pYmKkSZM7KUtqQHk3U=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.iit.it:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.iit.it: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">IIT - Istituto Italiano di Tecnologia</OrganizationName>
-    <OrganizationName xml:lang="it">IIT - Istituto Italiano di Tecnologia</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">IIT - Istituto Italiano di Tecnologia</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="it">IIT - Istituto Italiano di Tecnologia</OrganizationDisplayName>
-    <OrganizationURL xml:lang="it">http://www.iit.it/</OrganizationURL>
-    <OrganizationURL xml:lang="en">http://www.iit.it/en/home.html</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>IIT-Service Desk ICT</GivenName>
-    <EmailAddress>ict_servicedesk@iit.it</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.img.cas.cz-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.img.cas.cz-idp-shibboleth.xml
deleted file mode 100644
index ac4c5dea..00000000
--- a/swamid-interfederations-2.0/idp.img.cas.cz-idp-shibboleth.xml
+++ /dev/null
@@ -1,117 +0,0 @@
-<?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.img.cas.cz/idp/shibboleth">
-  <md:Extensions xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata">
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/" registrationInstant="2014-06-09T12:29:04Z">
-      <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>
-    <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://eduid.cz/uri/idp-group/avcr</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md: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">img.cas.cz</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Institute of Molecular Genetics of the ASCR</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="cs">Ústav molekulární genetiky AV ČR</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Identity provider for IMG ASCR employees.</mdui:Description>
-        <mdui:Description xml:lang="cs">Poskytovatel identity pro zaměstnance ÚMG AV ČR.</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.img.cas.cz/en/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="cs">http://www.img.cas.cz/</mdui:InformationURL>
-        <mdui:Logo height="40" width="104">https://idp.img.cas.cz/images/img_logo_small.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>
-MIIDJDCCAgygAwIBAgIVAOD0HnToPYposQvSZOwdUVtqwictMA0GCSqGSIb3DQEB
-BQUAMBkxFzAVBgNVBAMTDmlkcC5pbWcuY2FzLmN6MB4XDTE0MDUyOTA2MjgxOVoX
-DTM0MDUyOTA2MjgxOVowGTEXMBUGA1UEAxMOaWRwLmltZy5jYXMuY3owggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDaG1eJjjOGWyA26l3zWvg7oxWlyxO4
-Xka8cJYUupiV80Swq+oo2PlUqbL8ciHP7g0Vjdw4wTq1/R9i1sA1i1JLj3TRFoy6
-cvCFH4m8aeQKnSjcpUJiQXkGE/rM4Hf1qegyrjKqnbk83azOODv1IbndJMXMdf/9
-7Nl/1+3UDy8LsVsNKkN/8fplSHC2exAOZlPVX/uwlgwXDo5AsM4VvZjhB3fDNeLr
-wcfXmvohMhp3u5KJhQS4oPCpX5ULjo1EPRuRhKsOBCQHX6fH4Ac1E2b8as3HvzJ2
-fgqG1QETTyZZAhlovWHEVRncu8k8jMwbCIq3UgQMP+WK8fGP/sPRbpPnAgMBAAGj
-YzBhMEAGA1UdEQQ5MDeCDmlkcC5pbWcuY2FzLmN6hiVodHRwczovL2lkcC5pbWcu
-Y2FzLmN6L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBRU+/iETTc1Nh9rJ+L2sBT4
-y68xFjANBgkqhkiG9w0BAQUFAAOCAQEAvFtxSjURNIGODMraRKn9En4YjARqtyN1
-3uoXTbgc3GE6O/PgWwu1I1VndTTnIBoOC6bviKSu1sVpe7yhHjkoilR3EuZDuZGl
-0YBnlrmWcwXQOH08zfdiqtApDO761LRtYEaXJnyCTmLFRquMUxQy/Z0NXMCNEOps
-eCR5zkOYQadY9TLPoyrKWidxar0mjW96yK1uWiVKWqt1bU/zWhFxLYPN8bLNB2JU
-RTuMCTO4d4Zdp5uhCbnM4F+Zlipu2ojbhJiHHqJ0SOrsfXWHsdpp8S2nJcPlERgd
-N9KAr6lHQsSuYiw6Lt0HG1Q4TAFYTaPnA40uN+zzOomz27Chnsg/Sw==
-
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.img.cas.cz:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.img.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.img.cas.cz/idp/profile/SAML2/Redirect/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.img.cas.cz/idp/profile/SAML2/POST/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.img.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.img.cas.cz/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.img.cas.cz/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.img.cas.cz/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.img.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">img.cas.cz</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDJDCCAgygAwIBAgIVAOD0HnToPYposQvSZOwdUVtqwictMA0GCSqGSIb3DQEB
-BQUAMBkxFzAVBgNVBAMTDmlkcC5pbWcuY2FzLmN6MB4XDTE0MDUyOTA2MjgxOVoX
-DTM0MDUyOTA2MjgxOVowGTEXMBUGA1UEAxMOaWRwLmltZy5jYXMuY3owggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDaG1eJjjOGWyA26l3zWvg7oxWlyxO4
-Xka8cJYUupiV80Swq+oo2PlUqbL8ciHP7g0Vjdw4wTq1/R9i1sA1i1JLj3TRFoy6
-cvCFH4m8aeQKnSjcpUJiQXkGE/rM4Hf1qegyrjKqnbk83azOODv1IbndJMXMdf/9
-7Nl/1+3UDy8LsVsNKkN/8fplSHC2exAOZlPVX/uwlgwXDo5AsM4VvZjhB3fDNeLr
-wcfXmvohMhp3u5KJhQS4oPCpX5ULjo1EPRuRhKsOBCQHX6fH4Ac1E2b8as3HvzJ2
-fgqG1QETTyZZAhlovWHEVRncu8k8jMwbCIq3UgQMP+WK8fGP/sPRbpPnAgMBAAGj
-YzBhMEAGA1UdEQQ5MDeCDmlkcC5pbWcuY2FzLmN6hiVodHRwczovL2lkcC5pbWcu
-Y2FzLmN6L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBRU+/iETTc1Nh9rJ+L2sBT4
-y68xFjANBgkqhkiG9w0BAQUFAAOCAQEAvFtxSjURNIGODMraRKn9En4YjARqtyN1
-3uoXTbgc3GE6O/PgWwu1I1VndTTnIBoOC6bviKSu1sVpe7yhHjkoilR3EuZDuZGl
-0YBnlrmWcwXQOH08zfdiqtApDO761LRtYEaXJnyCTmLFRquMUxQy/Z0NXMCNEOps
-eCR5zkOYQadY9TLPoyrKWidxar0mjW96yK1uWiVKWqt1bU/zWhFxLYPN8bLNB2JU
-RTuMCTO4d4Zdp5uhCbnM4F+Zlipu2ojbhJiHHqJ0SOrsfXWHsdpp8S2nJcPlERgd
-N9KAr6lHQsSuYiw6Lt0HG1Q4TAFYTaPnA40uN+zzOomz27Chnsg/Sw==
-
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.img.cas.cz:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.img.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">IMG</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Institute of Molecular Genetics of the ASCR, v. v. i.</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="cs">Ústav molekulární genetiky AV ČR, v. v. i.</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.img.cas.cz/en/</OrganizationURL>
-    <OrganizationURL xml:lang="cs">http://www.img.cas.cz/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Michal</GivenName>
-    <SurName>Zacek</SurName>
-    <EmailAddress>michal.zacek@img.cas.cz</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.img.cas.cz.xml b/swamid-interfederations-2.0/idp.img.cas.cz.xml
deleted file mode 100644
index ac4c5dea..00000000
--- a/swamid-interfederations-2.0/idp.img.cas.cz.xml
+++ /dev/null
@@ -1,117 +0,0 @@
-<?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.img.cas.cz/idp/shibboleth">
-  <md:Extensions xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata">
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/" registrationInstant="2014-06-09T12:29:04Z">
-      <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>
-    <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://eduid.cz/uri/idp-group/avcr</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md: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">img.cas.cz</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Institute of Molecular Genetics of the ASCR</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="cs">Ústav molekulární genetiky AV ČR</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Identity provider for IMG ASCR employees.</mdui:Description>
-        <mdui:Description xml:lang="cs">Poskytovatel identity pro zaměstnance ÚMG AV ČR.</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.img.cas.cz/en/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="cs">http://www.img.cas.cz/</mdui:InformationURL>
-        <mdui:Logo height="40" width="104">https://idp.img.cas.cz/images/img_logo_small.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>
-MIIDJDCCAgygAwIBAgIVAOD0HnToPYposQvSZOwdUVtqwictMA0GCSqGSIb3DQEB
-BQUAMBkxFzAVBgNVBAMTDmlkcC5pbWcuY2FzLmN6MB4XDTE0MDUyOTA2MjgxOVoX
-DTM0MDUyOTA2MjgxOVowGTEXMBUGA1UEAxMOaWRwLmltZy5jYXMuY3owggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDaG1eJjjOGWyA26l3zWvg7oxWlyxO4
-Xka8cJYUupiV80Swq+oo2PlUqbL8ciHP7g0Vjdw4wTq1/R9i1sA1i1JLj3TRFoy6
-cvCFH4m8aeQKnSjcpUJiQXkGE/rM4Hf1qegyrjKqnbk83azOODv1IbndJMXMdf/9
-7Nl/1+3UDy8LsVsNKkN/8fplSHC2exAOZlPVX/uwlgwXDo5AsM4VvZjhB3fDNeLr
-wcfXmvohMhp3u5KJhQS4oPCpX5ULjo1EPRuRhKsOBCQHX6fH4Ac1E2b8as3HvzJ2
-fgqG1QETTyZZAhlovWHEVRncu8k8jMwbCIq3UgQMP+WK8fGP/sPRbpPnAgMBAAGj
-YzBhMEAGA1UdEQQ5MDeCDmlkcC5pbWcuY2FzLmN6hiVodHRwczovL2lkcC5pbWcu
-Y2FzLmN6L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBRU+/iETTc1Nh9rJ+L2sBT4
-y68xFjANBgkqhkiG9w0BAQUFAAOCAQEAvFtxSjURNIGODMraRKn9En4YjARqtyN1
-3uoXTbgc3GE6O/PgWwu1I1VndTTnIBoOC6bviKSu1sVpe7yhHjkoilR3EuZDuZGl
-0YBnlrmWcwXQOH08zfdiqtApDO761LRtYEaXJnyCTmLFRquMUxQy/Z0NXMCNEOps
-eCR5zkOYQadY9TLPoyrKWidxar0mjW96yK1uWiVKWqt1bU/zWhFxLYPN8bLNB2JU
-RTuMCTO4d4Zdp5uhCbnM4F+Zlipu2ojbhJiHHqJ0SOrsfXWHsdpp8S2nJcPlERgd
-N9KAr6lHQsSuYiw6Lt0HG1Q4TAFYTaPnA40uN+zzOomz27Chnsg/Sw==
-
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.img.cas.cz:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.img.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.img.cas.cz/idp/profile/SAML2/Redirect/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.img.cas.cz/idp/profile/SAML2/POST/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.img.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.img.cas.cz/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.img.cas.cz/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.img.cas.cz/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.img.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">img.cas.cz</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDJDCCAgygAwIBAgIVAOD0HnToPYposQvSZOwdUVtqwictMA0GCSqGSIb3DQEB
-BQUAMBkxFzAVBgNVBAMTDmlkcC5pbWcuY2FzLmN6MB4XDTE0MDUyOTA2MjgxOVoX
-DTM0MDUyOTA2MjgxOVowGTEXMBUGA1UEAxMOaWRwLmltZy5jYXMuY3owggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDaG1eJjjOGWyA26l3zWvg7oxWlyxO4
-Xka8cJYUupiV80Swq+oo2PlUqbL8ciHP7g0Vjdw4wTq1/R9i1sA1i1JLj3TRFoy6
-cvCFH4m8aeQKnSjcpUJiQXkGE/rM4Hf1qegyrjKqnbk83azOODv1IbndJMXMdf/9
-7Nl/1+3UDy8LsVsNKkN/8fplSHC2exAOZlPVX/uwlgwXDo5AsM4VvZjhB3fDNeLr
-wcfXmvohMhp3u5KJhQS4oPCpX5ULjo1EPRuRhKsOBCQHX6fH4Ac1E2b8as3HvzJ2
-fgqG1QETTyZZAhlovWHEVRncu8k8jMwbCIq3UgQMP+WK8fGP/sPRbpPnAgMBAAGj
-YzBhMEAGA1UdEQQ5MDeCDmlkcC5pbWcuY2FzLmN6hiVodHRwczovL2lkcC5pbWcu
-Y2FzLmN6L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBRU+/iETTc1Nh9rJ+L2sBT4
-y68xFjANBgkqhkiG9w0BAQUFAAOCAQEAvFtxSjURNIGODMraRKn9En4YjARqtyN1
-3uoXTbgc3GE6O/PgWwu1I1VndTTnIBoOC6bviKSu1sVpe7yhHjkoilR3EuZDuZGl
-0YBnlrmWcwXQOH08zfdiqtApDO761LRtYEaXJnyCTmLFRquMUxQy/Z0NXMCNEOps
-eCR5zkOYQadY9TLPoyrKWidxar0mjW96yK1uWiVKWqt1bU/zWhFxLYPN8bLNB2JU
-RTuMCTO4d4Zdp5uhCbnM4F+Zlipu2ojbhJiHHqJ0SOrsfXWHsdpp8S2nJcPlERgd
-N9KAr6lHQsSuYiw6Lt0HG1Q4TAFYTaPnA40uN+zzOomz27Chnsg/Sw==
-
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.img.cas.cz:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.img.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">IMG</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Institute of Molecular Genetics of the ASCR, v. v. i.</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="cs">Ústav molekulární genetiky AV ČR, v. v. i.</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.img.cas.cz/en/</OrganizationURL>
-    <OrganizationURL xml:lang="cs">http://www.img.cas.cz/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Michal</GivenName>
-    <SurName>Zacek</SurName>
-    <EmailAddress>michal.zacek@img.cas.cz</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.inalco.fr-idp.xml b/swamid-interfederations-2.0/idp.inalco.fr-idp.xml
deleted file mode 100644
index 2736f4c9..00000000
--- a/swamid-interfederations-2.0/idp.inalco.fr-idp.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.inalco.fr/idp">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2010-11-10T14:15:50Z">
-      <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">inalco.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">INALCO - Institut National des Langues et Civilisations Orientales</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDJzCCAg+gAwIBAgIUXBzPfYV+3ru5apFeK1Xo5W/wdlowDQYJKoZIhvcNAQEF
-BQAwGjEYMBYGA1UEAxMPbWxkYXAuaW5hbGNvLmZyMB4XDTEwMDkyODE0NTYxOFoX
-DTMwMDkyODE0NTYxOFowGjEYMBYGA1UEAxMPbWxkYXAuaW5hbGNvLmZyMIIBIjAN
-BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAjXFdyCRby1D4CFQW7ynaRKzJCyzz
-nRsnF2qPnGuMExCzuWUM5gBqVAjdI+AZXutcXcxkJq71TC22erYIlAob5A8nWTT5
-rR/dUtVRwawP/4jv9CqKiRC86zeNRFuUgYd0+Wkrn/RADV0wyfeSaT0KHoqwOu4d
-iRlks9CMns7/eFLmGsYQcEMHlw9nGTYpx94IClua3/prJjkc45iCYuoWXnGCLq2j
-MoJDcw3I5u3tSUfzCbp81lWn06oYBIVuzzcZuLRsd0smB41pabVYcS+bbG0yWA4b
-xIn4ZPQ1vja6YpIix6YZmpcCD6hs02xYfm6sWq/BnNS1vtMD1RjmSJhx4QIDAQAB
-o2UwYzBCBgNVHREEOzA5gg9tbGRhcC5pbmFsY28uZnKGJmh0dHBzOi8vbWxkYXAu
-aW5hbGNvLmZyL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBSVnWnWMca1OUkx11t9
-LRaeLMgTWzANBgkqhkiG9w0BAQUFAAOCAQEAfmv+9vLBGqsioIPqwy7pTT54CsbR
-jdvs5Ud7EhkLYDa+EelzwrgmE4z92mmmTFKUixlj070ncHZJjwjdfbDGwcQ/aKT2
-cd597hjiVBd85/biLQ3yTBkzJx2UiXm/Wj2qfyHoJDH9UfcLZOorR8R0b1ObSbHY
-2EsElJHCh/SrRniERFdJdQ1fzTukaSPa6zu/lLO40gYHu13qenRjMgMn9W85g7V8
-e6Kt16MbjbkcX6m9uYJo9HiN5hJ+pP0fV4q8kj2YxAK/av/v0Qp5iXJfBH9QecSK
-BdKgqhQ4XdLkP9D+5i10GGHVDJL3NYCpNbAqNmHeTJGjc+aSG6XpBZPcVw==
-					    </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://idp.inalco.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.inalco.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.inalco.fr/idp/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">INALCO - Institut National des Langues et Civilisations Orientales</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">INALCO - Institut National des Langues et Civilisations Orientales</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Le Pendeven</SurName>
-    <EmailAddress>laurent.le_pendeven@inria.fr</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <SurName>Casasnovas</SurName>
-    <EmailAddress>fabrice.casasnovas@inalco.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.inalco.fr.xml b/swamid-interfederations-2.0/idp.inalco.fr.xml
deleted file mode 100644
index 2736f4c9..00000000
--- a/swamid-interfederations-2.0/idp.inalco.fr.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.inalco.fr/idp">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2010-11-10T14:15:50Z">
-      <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">inalco.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">INALCO - Institut National des Langues et Civilisations Orientales</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDJzCCAg+gAwIBAgIUXBzPfYV+3ru5apFeK1Xo5W/wdlowDQYJKoZIhvcNAQEF
-BQAwGjEYMBYGA1UEAxMPbWxkYXAuaW5hbGNvLmZyMB4XDTEwMDkyODE0NTYxOFoX
-DTMwMDkyODE0NTYxOFowGjEYMBYGA1UEAxMPbWxkYXAuaW5hbGNvLmZyMIIBIjAN
-BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAjXFdyCRby1D4CFQW7ynaRKzJCyzz
-nRsnF2qPnGuMExCzuWUM5gBqVAjdI+AZXutcXcxkJq71TC22erYIlAob5A8nWTT5
-rR/dUtVRwawP/4jv9CqKiRC86zeNRFuUgYd0+Wkrn/RADV0wyfeSaT0KHoqwOu4d
-iRlks9CMns7/eFLmGsYQcEMHlw9nGTYpx94IClua3/prJjkc45iCYuoWXnGCLq2j
-MoJDcw3I5u3tSUfzCbp81lWn06oYBIVuzzcZuLRsd0smB41pabVYcS+bbG0yWA4b
-xIn4ZPQ1vja6YpIix6YZmpcCD6hs02xYfm6sWq/BnNS1vtMD1RjmSJhx4QIDAQAB
-o2UwYzBCBgNVHREEOzA5gg9tbGRhcC5pbmFsY28uZnKGJmh0dHBzOi8vbWxkYXAu
-aW5hbGNvLmZyL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBSVnWnWMca1OUkx11t9
-LRaeLMgTWzANBgkqhkiG9w0BAQUFAAOCAQEAfmv+9vLBGqsioIPqwy7pTT54CsbR
-jdvs5Ud7EhkLYDa+EelzwrgmE4z92mmmTFKUixlj070ncHZJjwjdfbDGwcQ/aKT2
-cd597hjiVBd85/biLQ3yTBkzJx2UiXm/Wj2qfyHoJDH9UfcLZOorR8R0b1ObSbHY
-2EsElJHCh/SrRniERFdJdQ1fzTukaSPa6zu/lLO40gYHu13qenRjMgMn9W85g7V8
-e6Kt16MbjbkcX6m9uYJo9HiN5hJ+pP0fV4q8kj2YxAK/av/v0Qp5iXJfBH9QecSK
-BdKgqhQ4XdLkP9D+5i10GGHVDJL3NYCpNbAqNmHeTJGjc+aSG6XpBZPcVw==
-					    </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://idp.inalco.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.inalco.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.inalco.fr/idp/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">INALCO - Institut National des Langues et Civilisations Orientales</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">INALCO - Institut National des Langues et Civilisations Orientales</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Le Pendeven</SurName>
-    <EmailAddress>laurent.le_pendeven@inria.fr</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <SurName>Casasnovas</SurName>
-    <EmailAddress>fabrice.casasnovas@inalco.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.inha.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.inha.fr-idp-shibboleth.xml
deleted file mode 100644
index 796e2f20..00000000
--- a/swamid-interfederations-2.0/idp.inha.fr-idp-shibboleth.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.inha.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2013-07-04T12:21:05Z">
-      <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">inha.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">INHA - Institut National de l'Histoire de l'Art</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDGDCCAgCgAwIBAgIVAO4pV7sAz3uXoZSchrwj2d0PI981MA0GCSqGSIb3DQEB
-BQUAMBYxFDASBgNVBAMTC2lkcC5pbmhhLmZyMB4XDTEzMDUyNzEzMjk0OVoXDTMz
-MDUyNzEzMjk0OVowFjEUMBIGA1UEAxMLaWRwLmluaGEuZnIwggEiMA0GCSqGSIb3
-DQEBAQUAA4IBDwAwggEKAoIBAQDa2e5fujqS/ViLxvdM+Enmgf5YlLTbv42SVoZ/
-eRbfyjEN50ykyYGrf3TD2a/qzFjOtTWnJFIEkf6jAQj79+axkYST5DxcE6G9q51k
-XmBUbxAOo3qP9an19B1sPuDz9gGZE33Iwu2qcOw8Z0dH69DWF4wNdu1mHZFeXS66
-WyJeww00xeARXo+flW8RvSTLCoU+TcFjYRP0OyGs+5YwMFw+wHQOJuR5hQakp9Lm
-M56083ADhpEXeQvyZUOxyd1QFhVFlUX6e6l6ww7svLStHCB1r5AVZff2qMIHe7v8
-kmfOYWbNgfajUWML3uI0gV84Ye5eHvhAgH/K75UYiL5A759rAgMBAAGjXTBbMDoG
-A1UdEQQzMDGCC2lkcC5pbmhhLmZyhiJodHRwczovL2lkcC5pbmhhLmZyL2lkcC9z
-aGliYm9sZXRoMB0GA1UdDgQWBBT6ICU4qeViyJcpEbrb0Zafyr/q3TANBgkqhkiG
-9w0BAQUFAAOCAQEADTAcGw7sH3vRJyCfv7kdWEzefxYx9nQPmeAY1z7/nL0qV865
-izTHDW7x9CMcQBnbapyuNB+uQbmJzovNW/eLjxNzFoqy4DVCYf2oFq4DX3RpPZj8
-a0Qsmll/OC6LZ1OnsSTg2F38fN+WwhHP9AEPdktsIxt1D0v7qr3gPzipdj1Bz3Z7
-md+a7DpGG/GPiczhrHZbrlwfMsbWTvfM6q4NqEHUWohV5TdJz3SVXnF7VWYjkgy2
-dk/zNZ/MGrjW4UnPGRTom36a+nElGRuRkIoyiOGzXuPyYZv6Phauwd3T5TmT1xi2
-BOkRf1b1DqBCezZIc9+vQAydDa2NLP0u415mxA==
-					    </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://idp.inha.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.inha.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.inha.fr/idp/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">INHA - Institut National de l'Histoire de l'Art</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">INHA - Institut National de l'Histoire de l'Art</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <EmailAddress>admin@inha.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.inha.fr.xml b/swamid-interfederations-2.0/idp.inha.fr.xml
deleted file mode 100644
index 796e2f20..00000000
--- a/swamid-interfederations-2.0/idp.inha.fr.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.inha.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2013-07-04T12:21:05Z">
-      <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">inha.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">INHA - Institut National de l'Histoire de l'Art</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDGDCCAgCgAwIBAgIVAO4pV7sAz3uXoZSchrwj2d0PI981MA0GCSqGSIb3DQEB
-BQUAMBYxFDASBgNVBAMTC2lkcC5pbmhhLmZyMB4XDTEzMDUyNzEzMjk0OVoXDTMz
-MDUyNzEzMjk0OVowFjEUMBIGA1UEAxMLaWRwLmluaGEuZnIwggEiMA0GCSqGSIb3
-DQEBAQUAA4IBDwAwggEKAoIBAQDa2e5fujqS/ViLxvdM+Enmgf5YlLTbv42SVoZ/
-eRbfyjEN50ykyYGrf3TD2a/qzFjOtTWnJFIEkf6jAQj79+axkYST5DxcE6G9q51k
-XmBUbxAOo3qP9an19B1sPuDz9gGZE33Iwu2qcOw8Z0dH69DWF4wNdu1mHZFeXS66
-WyJeww00xeARXo+flW8RvSTLCoU+TcFjYRP0OyGs+5YwMFw+wHQOJuR5hQakp9Lm
-M56083ADhpEXeQvyZUOxyd1QFhVFlUX6e6l6ww7svLStHCB1r5AVZff2qMIHe7v8
-kmfOYWbNgfajUWML3uI0gV84Ye5eHvhAgH/K75UYiL5A759rAgMBAAGjXTBbMDoG
-A1UdEQQzMDGCC2lkcC5pbmhhLmZyhiJodHRwczovL2lkcC5pbmhhLmZyL2lkcC9z
-aGliYm9sZXRoMB0GA1UdDgQWBBT6ICU4qeViyJcpEbrb0Zafyr/q3TANBgkqhkiG
-9w0BAQUFAAOCAQEADTAcGw7sH3vRJyCfv7kdWEzefxYx9nQPmeAY1z7/nL0qV865
-izTHDW7x9CMcQBnbapyuNB+uQbmJzovNW/eLjxNzFoqy4DVCYf2oFq4DX3RpPZj8
-a0Qsmll/OC6LZ1OnsSTg2F38fN+WwhHP9AEPdktsIxt1D0v7qr3gPzipdj1Bz3Z7
-md+a7DpGG/GPiczhrHZbrlwfMsbWTvfM6q4NqEHUWohV5TdJz3SVXnF7VWYjkgy2
-dk/zNZ/MGrjW4UnPGRTom36a+nElGRuRkIoyiOGzXuPyYZv6Phauwd3T5TmT1xi2
-BOkRf1b1DqBCezZIc9+vQAydDa2NLP0u415mxA==
-					    </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://idp.inha.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.inha.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.inha.fr/idp/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">INHA - Institut National de l'Histoire de l'Art</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">INHA - Institut National de l'Histoire de l'Art</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <EmailAddress>admin@inha.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.inp-toulouse.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.inp-toulouse.fr-idp-shibboleth.xml
deleted file mode 100644
index d1cf5de7..00000000
--- a/swamid-interfederations-2.0/idp.inp-toulouse.fr-idp-shibboleth.xml
+++ /dev/null
@@ -1,88 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.inp-toulouse.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2013-09-27T14:12:08Z">
-      <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">inp-toulouse.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">INPT - Institut National Polytechnique de Toulouse</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDNzCCAh+gAwIBAgIUT/ZV7f3Lusa+9lbOZVbS0YCpfgwwDQYJKoZIhvcNAQEF
-BQAwHjEcMBoGA1UEAxMTaWRwLmlucC10b3Vsb3VzZS5mcjAeFw0xMzA5MjcwOTA1
-MzJaFw0zMzA5MjcwOTA1MzJaMB4xHDAaBgNVBAMTE2lkcC5pbnAtdG91bG91c2Uu
-ZnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDCjHZkvuctwIDMU/L1
-5Ob1BjzGWbbGwan/PZ3bilttwf37Ve/ZsFHBfI7YF6tFw8guYRRl1dmAkHxxZCIB
-zo4PGcFQFUkb8K1+hi1ev6f71LP2BOEJWsQ9NsO4HDbpTzqGrCrXgG7LlTGpBhOT
-CRevT5z7hd9qTk6pW+nbG3mY2NnKTm2WpjFaycYZiF07yFJGBWIh5ndkhfyBF21R
-N2D7sHRqByVLBzU4vZfRuo8cG6Ufx76whxZGRqZq8kmTWuU1sBPhore83Y1NuYIs
-cM/BhndXVwdN0GSE3eeJpIHJ3txhPtk8HbU8jz6y7qOHPMgLmnxkpFdMn47hmGCF
-t+lvAgMBAAGjbTBrMEoGA1UdEQRDMEGCE2lkcC5pbnAtdG91bG91c2UuZnKGKmh0
-dHBzOi8vaWRwLmlucC10b3Vsb3VzZS5mci9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4E
-FgQUTWqwiYs7axsJyzXQr+TFjSLuKLEwDQYJKoZIhvcNAQEFBQADggEBAB3fpoVO
-bwmHRurLoU76J1fK/eoaNGL6+TRUW6DlV8nw1qDI+staKmlmbiKlzHCYCXGw8+hX
-NnaHlYPj/89d9A9XnA9UgsTio3p2SxaL+Z2XQg7mmrG4zNGrSDByNRsmG43H0W3U
-I/1OI5Pc27jS97gnIrbgdh7c9W0EuzBMYB1X2n+FXC4IJVRbRap4w5okGxztKYdv
-nJWM2NmnEkHvKTR2q49aCZGjI//t6qrUyOpt03XVabmbBfhYrNbv1ox9cYDWQ6zK
-6ry/CkIwbFwR9jLRuE67WIfLURxILClIr1NlUymiFsuPB4NV90s9HNf1bYPQdJ2C
-lr6eMsR0+Pc7BjU=
-					    </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>
-					      MIIEczCCA1ugAwIBAgIQUvXDGTom14VWyQKZ9c5IAjANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTEzMDkyNzAwMDAwMFoXDTE2MDkyNjIzNTk1OVowQTEhMB8GA1UE
-CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRwwGgYDVQQDExNpZHAuaW5wLXRv
-dWxvdXNlLmZyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA7A4XoLiZ
-KxOT2emX//nkJR8xl1027xOPLZrzxafUvNxSvIiAknbYdq7fqBE2VONDG9/IwRyW
-w76e/jHbYpd+fZppURwGHPXh47gX8DvMOHf3EYFC1WdiaKWT9ZnO3QDKgVUm+uqV
-4aZtQG/NLjfW2lQNjLR59YDCFeLG7KJKXo49yRpSlE9+xG/aw/XYk+GepUiwUkyY
-hF5OfMzvJobYfW2FZFARkfl8hSsumasyTPTNPL2JR0SvjkNdneh8aYDV+o3E8gQM
-hw1aX6xcuAArW576MEtgYHOK+u9jsC24MxNYws5P7Xr8HhwBFdHlcbwv6nTUPhoi
-/HLjV++A91qkOQIDAQABo4IBcDCCAWwwHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsr
-N1dH6pDjue0wHQYDVR0OBBYEFP8muWtxJiygf1agWB042qtYx8P3MA4GA1UdDwEB
-/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEF
-BQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNVHR8E
-MzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENB
-LmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNz
-LnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8v
-b2NzcC50Y3MudGVyZW5hLm9yZzAeBgNVHREEFzAVghNpZHAuaW5wLXRvdWxvdXNl
-LmZyMA0GCSqGSIb3DQEBBQUAA4IBAQDBuKUisPU8fheH+AhEa2g+FBZM77HHMJr6
-LvRgxynTPLStnsMLJ5AvRB5A5lp01OYxVWMUY1MvuJN3qbTbemfYqPrjl/iT6sQW
-SfqE3lvWtl+yqUtFJ5LSU0506dsuQTRoifxnkUKLWLmwnOiSMbO6FMrr8DCirVND
-VOMMA2MQMmQm+e+bKYxc4SFtCWqbMgAtwbYayZ5B1Essntx2tiYZqB4V00BvbBR8
-QitJtSVJ5UEYiVLK35rrj7909QURc7UsgZ9iJeueTGvFsYqo+CY6piFLJR7AH4ig
-gx11BVKtBfjtJ60W2R+4M63zQHh+58b7FR3/AYpWkWtFgxac775M
-					    </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://idp.inp-toulouse.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.inp-toulouse.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.inp-toulouse.fr/idp/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">INPT - Institut National Polytechnique de Toulouse</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">INPT - Institut National Polytechnique de Toulouse</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Vincent CHONG-WING</SurName>
-    <EmailAddress>vincent.chong-wing@inp-toulouse.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.inp-toulouse.fr.xml b/swamid-interfederations-2.0/idp.inp-toulouse.fr.xml
deleted file mode 100644
index d1cf5de7..00000000
--- a/swamid-interfederations-2.0/idp.inp-toulouse.fr.xml
+++ /dev/null
@@ -1,88 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.inp-toulouse.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2013-09-27T14:12:08Z">
-      <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">inp-toulouse.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">INPT - Institut National Polytechnique de Toulouse</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDNzCCAh+gAwIBAgIUT/ZV7f3Lusa+9lbOZVbS0YCpfgwwDQYJKoZIhvcNAQEF
-BQAwHjEcMBoGA1UEAxMTaWRwLmlucC10b3Vsb3VzZS5mcjAeFw0xMzA5MjcwOTA1
-MzJaFw0zMzA5MjcwOTA1MzJaMB4xHDAaBgNVBAMTE2lkcC5pbnAtdG91bG91c2Uu
-ZnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDCjHZkvuctwIDMU/L1
-5Ob1BjzGWbbGwan/PZ3bilttwf37Ve/ZsFHBfI7YF6tFw8guYRRl1dmAkHxxZCIB
-zo4PGcFQFUkb8K1+hi1ev6f71LP2BOEJWsQ9NsO4HDbpTzqGrCrXgG7LlTGpBhOT
-CRevT5z7hd9qTk6pW+nbG3mY2NnKTm2WpjFaycYZiF07yFJGBWIh5ndkhfyBF21R
-N2D7sHRqByVLBzU4vZfRuo8cG6Ufx76whxZGRqZq8kmTWuU1sBPhore83Y1NuYIs
-cM/BhndXVwdN0GSE3eeJpIHJ3txhPtk8HbU8jz6y7qOHPMgLmnxkpFdMn47hmGCF
-t+lvAgMBAAGjbTBrMEoGA1UdEQRDMEGCE2lkcC5pbnAtdG91bG91c2UuZnKGKmh0
-dHBzOi8vaWRwLmlucC10b3Vsb3VzZS5mci9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4E
-FgQUTWqwiYs7axsJyzXQr+TFjSLuKLEwDQYJKoZIhvcNAQEFBQADggEBAB3fpoVO
-bwmHRurLoU76J1fK/eoaNGL6+TRUW6DlV8nw1qDI+staKmlmbiKlzHCYCXGw8+hX
-NnaHlYPj/89d9A9XnA9UgsTio3p2SxaL+Z2XQg7mmrG4zNGrSDByNRsmG43H0W3U
-I/1OI5Pc27jS97gnIrbgdh7c9W0EuzBMYB1X2n+FXC4IJVRbRap4w5okGxztKYdv
-nJWM2NmnEkHvKTR2q49aCZGjI//t6qrUyOpt03XVabmbBfhYrNbv1ox9cYDWQ6zK
-6ry/CkIwbFwR9jLRuE67WIfLURxILClIr1NlUymiFsuPB4NV90s9HNf1bYPQdJ2C
-lr6eMsR0+Pc7BjU=
-					    </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>
-					      MIIEczCCA1ugAwIBAgIQUvXDGTom14VWyQKZ9c5IAjANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTEzMDkyNzAwMDAwMFoXDTE2MDkyNjIzNTk1OVowQTEhMB8GA1UE
-CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRwwGgYDVQQDExNpZHAuaW5wLXRv
-dWxvdXNlLmZyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA7A4XoLiZ
-KxOT2emX//nkJR8xl1027xOPLZrzxafUvNxSvIiAknbYdq7fqBE2VONDG9/IwRyW
-w76e/jHbYpd+fZppURwGHPXh47gX8DvMOHf3EYFC1WdiaKWT9ZnO3QDKgVUm+uqV
-4aZtQG/NLjfW2lQNjLR59YDCFeLG7KJKXo49yRpSlE9+xG/aw/XYk+GepUiwUkyY
-hF5OfMzvJobYfW2FZFARkfl8hSsumasyTPTNPL2JR0SvjkNdneh8aYDV+o3E8gQM
-hw1aX6xcuAArW576MEtgYHOK+u9jsC24MxNYws5P7Xr8HhwBFdHlcbwv6nTUPhoi
-/HLjV++A91qkOQIDAQABo4IBcDCCAWwwHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsr
-N1dH6pDjue0wHQYDVR0OBBYEFP8muWtxJiygf1agWB042qtYx8P3MA4GA1UdDwEB
-/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEF
-BQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNVHR8E
-MzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENB
-LmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNz
-LnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8v
-b2NzcC50Y3MudGVyZW5hLm9yZzAeBgNVHREEFzAVghNpZHAuaW5wLXRvdWxvdXNl
-LmZyMA0GCSqGSIb3DQEBBQUAA4IBAQDBuKUisPU8fheH+AhEa2g+FBZM77HHMJr6
-LvRgxynTPLStnsMLJ5AvRB5A5lp01OYxVWMUY1MvuJN3qbTbemfYqPrjl/iT6sQW
-SfqE3lvWtl+yqUtFJ5LSU0506dsuQTRoifxnkUKLWLmwnOiSMbO6FMrr8DCirVND
-VOMMA2MQMmQm+e+bKYxc4SFtCWqbMgAtwbYayZ5B1Essntx2tiYZqB4V00BvbBR8
-QitJtSVJ5UEYiVLK35rrj7909QURc7UsgZ9iJeueTGvFsYqo+CY6piFLJR7AH4ig
-gx11BVKtBfjtJ60W2R+4M63zQHh+58b7FR3/AYpWkWtFgxac775M
-					    </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://idp.inp-toulouse.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.inp-toulouse.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.inp-toulouse.fr/idp/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">INPT - Institut National Polytechnique de Toulouse</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">INPT - Institut National Polytechnique de Toulouse</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Vincent CHONG-WING</SurName>
-    <EmailAddress>vincent.chong-wing@inp-toulouse.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.inpa.gov.br-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.inpa.gov.br-idp-shibboleth.xml
deleted file mode 100644
index 392875d6..00000000
--- a/swamid-interfederations-2.0/idp.inpa.gov.br-idp-shibboleth.xml
+++ /dev/null
@@ -1,100 +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://idp.inpa.gov.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">gov.br</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">INPA - Instituto Nacional de Pesquisas da Amazonia</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="pt-br">INPA - Instituto Nacional de Pesquisas da Amazonia</mdui:DisplayName>
-        <mdui:Description xml:lang="en">INPA - Instituto Nacional de Pesquisas da Amazonia</mdui:Description>
-        <mdui:Description xml:lang="pt-br">INPA - Instituto Nacional de Pesquisas da Amazonia</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.inpa.gov.br/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="pt-br">http://www.inpa.gov.br/</mdui:InformationURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-    MIICxjCCAa4CAQAwDQYJKoZIhvcNAQEFBQAwKTEMMAoGA1UECxMDTk9DMQswCQYD
-VQQGEwJCUjEMMAoGA1UEAxMDaWRwMB4XDTE0MDgxNTE5NDYwMFoXDTE5MDgxNDE5
-NDYwMFowKTEMMAoGA1UECxMDTk9DMQswCQYDVQQGEwJCUjEMMAoGA1UEAxMDaWRw
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtmFjhQdUJQNQl5+DE1ad
-963h0KuRMRcDjxpGUZpmQOUySdMG8E5NwVY/rTJHvDKPU8+/l2S1vOholz6KR1Lt
-9sAjJSDUJvIeL8T8enkQ+m8TNLWsO5gh+1Bpqy7vAHiUwADwMBXPnM/18tVZ5GFN
-ep5pvHUcNhl2JE1gIg1B1+727ESjdhsuNr7yKdGNnytItcUJmmSYGctv8FyTr7t5
-mtlIfxXVIlL3cn6xGUFr0DqTGyZ9/3iANzqtaHiDEeYCTK0MklxYHZqK5bAakg54
-4+Xt/EPjKKV0ZQrxc8HaGn23b8HVfSY900VPxhS3shuY6egViMYNdB1HnFeZUuEH
-bwIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQCCvZP2uemjlVCQvdFM8COTBI897wuc
-kaKwEj6FLjJAOQ3N3jiKPmcJAK7Ok9NrS5o+OAP2uVONy79rtTyiO6CxYYih5wps
-K8G+dDdYP7WRY6mOsbYU50lTj5kWLs1mGeSaxHR81Flb5G8gNArRiXstIkMhGFrm
-Qa8XtmimqZEmX9iciwjb6vgYzhGKuvxPTsUmX85/lggF8iot3I8OICsUJKtQgyPL
-8/JGoy5GXB3Lx5F69PqY6Z0VRbQ0lK/IVFBlfbovtCdj7RlpDnql3gSeZOLofVa0
-g0fW/6Q/Do6teontpCMnf0O2NOTc3335DHolEG1xpntjeUP8QipEGJeN
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.inpa.gov.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.inpa.gov.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://idp.inpa.gov.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.inpa.gov.br/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.inpa.gov.br/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.inpa.gov.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">gov.br</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-      
-MIICxjCCAa4CAQAwDQYJKoZIhvcNAQEFBQAwKTEMMAoGA1UECxMDTk9DMQswCQYD
-VQQGEwJCUjEMMAoGA1UEAxMDaWRwMB4XDTE0MDgxNTE5NDYwMFoXDTE5MDgxNDE5
-NDYwMFowKTEMMAoGA1UECxMDTk9DMQswCQYDVQQGEwJCUjEMMAoGA1UEAxMDaWRw
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtmFjhQdUJQNQl5+DE1ad
-963h0KuRMRcDjxpGUZpmQOUySdMG8E5NwVY/rTJHvDKPU8+/l2S1vOholz6KR1Lt
-9sAjJSDUJvIeL8T8enkQ+m8TNLWsO5gh+1Bpqy7vAHiUwADwMBXPnM/18tVZ5GFN
-ep5pvHUcNhl2JE1gIg1B1+727ESjdhsuNr7yKdGNnytItcUJmmSYGctv8FyTr7t5
-mtlIfxXVIlL3cn6xGUFr0DqTGyZ9/3iANzqtaHiDEeYCTK0MklxYHZqK5bAakg54
-4+Xt/EPjKKV0ZQrxc8HaGn23b8HVfSY900VPxhS3shuY6egViMYNdB1HnFeZUuEH
-bwIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQCCvZP2uemjlVCQvdFM8COTBI897wuc
-kaKwEj6FLjJAOQ3N3jiKPmcJAK7Ok9NrS5o+OAP2uVONy79rtTyiO6CxYYih5wps
-K8G+dDdYP7WRY6mOsbYU50lTj5kWLs1mGeSaxHR81Flb5G8gNArRiXstIkMhGFrm
-Qa8XtmimqZEmX9iciwjb6vgYzhGKuvxPTsUmX85/lggF8iot3I8OICsUJKtQgyPL
-8/JGoy5GXB3Lx5F69PqY6Z0VRbQ0lK/IVFBlfbovtCdj7RlpDnql3gSeZOLofVa0
-g0fW/6Q/Do6teontpCMnf0O2NOTc3335DHolEG1xpntjeUP8QipEGJeN
-                    
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.inpa.gov.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.inpa.gov.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">INPA - Instituto Nacional de Pesquisas da Amazonia</OrganizationName>
-    <OrganizationName xml:lang="pt-br">INPA - Instituto Nacional de Pesquisas da Amazonia</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">INPA - Instituto Nacional de Pesquisas da Amazonia</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="pt-br">INPA - Instituto Nacional de Pesquisas da Amazonia</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.inpa.gov.br/</OrganizationURL>
-    <OrganizationURL xml:lang="pt-br">http://www.inpa.gov.br/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Paulo Henrique Cardoso Maia</SurName>
-    <EmailAddress>paulo.maia@inpa.gov.br</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.inpa.gov.br.xml b/swamid-interfederations-2.0/idp.inpa.gov.br.xml
deleted file mode 100644
index 392875d6..00000000
--- a/swamid-interfederations-2.0/idp.inpa.gov.br.xml
+++ /dev/null
@@ -1,100 +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://idp.inpa.gov.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">gov.br</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">INPA - Instituto Nacional de Pesquisas da Amazonia</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="pt-br">INPA - Instituto Nacional de Pesquisas da Amazonia</mdui:DisplayName>
-        <mdui:Description xml:lang="en">INPA - Instituto Nacional de Pesquisas da Amazonia</mdui:Description>
-        <mdui:Description xml:lang="pt-br">INPA - Instituto Nacional de Pesquisas da Amazonia</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.inpa.gov.br/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="pt-br">http://www.inpa.gov.br/</mdui:InformationURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-    MIICxjCCAa4CAQAwDQYJKoZIhvcNAQEFBQAwKTEMMAoGA1UECxMDTk9DMQswCQYD
-VQQGEwJCUjEMMAoGA1UEAxMDaWRwMB4XDTE0MDgxNTE5NDYwMFoXDTE5MDgxNDE5
-NDYwMFowKTEMMAoGA1UECxMDTk9DMQswCQYDVQQGEwJCUjEMMAoGA1UEAxMDaWRw
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtmFjhQdUJQNQl5+DE1ad
-963h0KuRMRcDjxpGUZpmQOUySdMG8E5NwVY/rTJHvDKPU8+/l2S1vOholz6KR1Lt
-9sAjJSDUJvIeL8T8enkQ+m8TNLWsO5gh+1Bpqy7vAHiUwADwMBXPnM/18tVZ5GFN
-ep5pvHUcNhl2JE1gIg1B1+727ESjdhsuNr7yKdGNnytItcUJmmSYGctv8FyTr7t5
-mtlIfxXVIlL3cn6xGUFr0DqTGyZ9/3iANzqtaHiDEeYCTK0MklxYHZqK5bAakg54
-4+Xt/EPjKKV0ZQrxc8HaGn23b8HVfSY900VPxhS3shuY6egViMYNdB1HnFeZUuEH
-bwIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQCCvZP2uemjlVCQvdFM8COTBI897wuc
-kaKwEj6FLjJAOQ3N3jiKPmcJAK7Ok9NrS5o+OAP2uVONy79rtTyiO6CxYYih5wps
-K8G+dDdYP7WRY6mOsbYU50lTj5kWLs1mGeSaxHR81Flb5G8gNArRiXstIkMhGFrm
-Qa8XtmimqZEmX9iciwjb6vgYzhGKuvxPTsUmX85/lggF8iot3I8OICsUJKtQgyPL
-8/JGoy5GXB3Lx5F69PqY6Z0VRbQ0lK/IVFBlfbovtCdj7RlpDnql3gSeZOLofVa0
-g0fW/6Q/Do6teontpCMnf0O2NOTc3335DHolEG1xpntjeUP8QipEGJeN
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.inpa.gov.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.inpa.gov.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://idp.inpa.gov.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.inpa.gov.br/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.inpa.gov.br/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.inpa.gov.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">gov.br</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-      
-MIICxjCCAa4CAQAwDQYJKoZIhvcNAQEFBQAwKTEMMAoGA1UECxMDTk9DMQswCQYD
-VQQGEwJCUjEMMAoGA1UEAxMDaWRwMB4XDTE0MDgxNTE5NDYwMFoXDTE5MDgxNDE5
-NDYwMFowKTEMMAoGA1UECxMDTk9DMQswCQYDVQQGEwJCUjEMMAoGA1UEAxMDaWRw
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtmFjhQdUJQNQl5+DE1ad
-963h0KuRMRcDjxpGUZpmQOUySdMG8E5NwVY/rTJHvDKPU8+/l2S1vOholz6KR1Lt
-9sAjJSDUJvIeL8T8enkQ+m8TNLWsO5gh+1Bpqy7vAHiUwADwMBXPnM/18tVZ5GFN
-ep5pvHUcNhl2JE1gIg1B1+727ESjdhsuNr7yKdGNnytItcUJmmSYGctv8FyTr7t5
-mtlIfxXVIlL3cn6xGUFr0DqTGyZ9/3iANzqtaHiDEeYCTK0MklxYHZqK5bAakg54
-4+Xt/EPjKKV0ZQrxc8HaGn23b8HVfSY900VPxhS3shuY6egViMYNdB1HnFeZUuEH
-bwIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQCCvZP2uemjlVCQvdFM8COTBI897wuc
-kaKwEj6FLjJAOQ3N3jiKPmcJAK7Ok9NrS5o+OAP2uVONy79rtTyiO6CxYYih5wps
-K8G+dDdYP7WRY6mOsbYU50lTj5kWLs1mGeSaxHR81Flb5G8gNArRiXstIkMhGFrm
-Qa8XtmimqZEmX9iciwjb6vgYzhGKuvxPTsUmX85/lggF8iot3I8OICsUJKtQgyPL
-8/JGoy5GXB3Lx5F69PqY6Z0VRbQ0lK/IVFBlfbovtCdj7RlpDnql3gSeZOLofVa0
-g0fW/6Q/Do6teontpCMnf0O2NOTc3335DHolEG1xpntjeUP8QipEGJeN
-                    
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.inpa.gov.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.inpa.gov.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">INPA - Instituto Nacional de Pesquisas da Amazonia</OrganizationName>
-    <OrganizationName xml:lang="pt-br">INPA - Instituto Nacional de Pesquisas da Amazonia</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">INPA - Instituto Nacional de Pesquisas da Amazonia</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="pt-br">INPA - Instituto Nacional de Pesquisas da Amazonia</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.inpa.gov.br/</OrganizationURL>
-    <OrganizationURL xml:lang="pt-br">http://www.inpa.gov.br/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Paulo Henrique Cardoso Maia</SurName>
-    <EmailAddress>paulo.maia@inpa.gov.br</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.inra.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.inra.fr-idp-shibboleth.xml
deleted file mode 100644
index 8c34feed..00000000
--- a/swamid-interfederations-2.0/idp.inra.fr-idp-shibboleth.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://idp.inra.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2009-03-17T16:49:46Z">
-      <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">inra.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">INRA - Institut national de la recherche agronomique</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIEJDCCAwygAwIBAgIJAOpqYvYKPY5EMA0GCSqGSIb3DQEBBQUAMGkxCzAJBgNV
-BAYTAkZSMRMwEQYDVQQIEwpTb21lLVN0YXRlMQ0wCwYDVQQKEwRJTlJBMRQwEgYD
-VQQDEwtpZHAuaW5yYS5mcjEgMB4GCSqGSIb3DQEJARYRaXJpc0Bqb3V5LmlucmEu
-ZnIwHhcNMTIxMTEzMTQ0MDM2WhcNMzcwNzMwMTQ0MDM2WjBpMQswCQYDVQQGEwJG
-UjETMBEGA1UECBMKU29tZS1TdGF0ZTENMAsGA1UEChMESU5SQTEUMBIGA1UEAxML
-aWRwLmlucmEuZnIxIDAeBgkqhkiG9w0BCQEWEWlyaXNAam91eS5pbnJhLmZyMIIB
-IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA1JTdk4XTqBi1r68i3u0qYR8P
-4NynVg2F7SoCLDf9ZXrpxMiyik135988ch/8mqyJK451klfCoLTgZfu1YfPQtU4x
-b463LyxSDX0SCnK4XQIBD7W6E+MysAa/hghTs1xamoNZOxZVXGSeRS6iLIZgaMfa
-O4+T/rWciwFJonESjtY2cw6HSx0OSR5lE/Lv/JDnfDMfpyF0dY4hNT8EWFzwwqMv
-q9TyeareTYMI4kd6+rw1bbX1HOWURNTFH3j+bnUx/uH3UMhywueuQTgYdR1wA/+X
-1lGsPy9k9uBQNMhJICL63O8wOLdDxuGWGjKUUF3eOv2W53zm0vA9vPkcnSqayQID
-AQABo4HOMIHLMB0GA1UdDgQWBBQuFYdp2C5bNykoCJKU6Zvck9npFjCBmwYDVR0j
-BIGTMIGQgBQuFYdp2C5bNykoCJKU6Zvck9npFqFtpGswaTELMAkGA1UEBhMCRlIx
-EzARBgNVBAgTClNvbWUtU3RhdGUxDTALBgNVBAoTBElOUkExFDASBgNVBAMTC2lk
-cC5pbnJhLmZyMSAwHgYJKoZIhvcNAQkBFhFpcmlzQGpvdXkuaW5yYS5mcoIJAOpq
-YvYKPY5EMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBACVWt4h6qZXm
-gGA+rFStbfxgVX+S749r9CuN+iwKObnwxI93SiiwNnb2PKO9OStTc8urvfNsgy8O
-vWGAZclkl2aeesV3r5oZxj26Jui2csSAh9SN0qozuTGStVxi7mCw4g+eT757IZs2
-FE2UnVn3QV2keLIsfk6excx9DcdomHhhaZXnqF/o8w8WUWRR8+RgoT8b2S1NjM63
-lJSyrOoagLkgU/k4XV81/NE+fWiQvNQl1GmcvtrN1UZmuza3g/miWRHxf6PgCC/M
-ZbGGM6SI8RhHkV9rmtvlCAbI4nwkIxYP+RX7me4vueKiUCiuod40PJlRQ0D8Wrr7
-UCoh/SWrQNc=
-					    </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://idp.inra.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.inra.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.inra.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">inra.fr</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIEJDCCAwygAwIBAgIJAOpqYvYKPY5EMA0GCSqGSIb3DQEBBQUAMGkxCzAJBgNV
-BAYTAkZSMRMwEQYDVQQIEwpTb21lLVN0YXRlMQ0wCwYDVQQKEwRJTlJBMRQwEgYD
-VQQDEwtpZHAuaW5yYS5mcjEgMB4GCSqGSIb3DQEJARYRaXJpc0Bqb3V5LmlucmEu
-ZnIwHhcNMTIxMTEzMTQ0MDM2WhcNMzcwNzMwMTQ0MDM2WjBpMQswCQYDVQQGEwJG
-UjETMBEGA1UECBMKU29tZS1TdGF0ZTENMAsGA1UEChMESU5SQTEUMBIGA1UEAxML
-aWRwLmlucmEuZnIxIDAeBgkqhkiG9w0BCQEWEWlyaXNAam91eS5pbnJhLmZyMIIB
-IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA1JTdk4XTqBi1r68i3u0qYR8P
-4NynVg2F7SoCLDf9ZXrpxMiyik135988ch/8mqyJK451klfCoLTgZfu1YfPQtU4x
-b463LyxSDX0SCnK4XQIBD7W6E+MysAa/hghTs1xamoNZOxZVXGSeRS6iLIZgaMfa
-O4+T/rWciwFJonESjtY2cw6HSx0OSR5lE/Lv/JDnfDMfpyF0dY4hNT8EWFzwwqMv
-q9TyeareTYMI4kd6+rw1bbX1HOWURNTFH3j+bnUx/uH3UMhywueuQTgYdR1wA/+X
-1lGsPy9k9uBQNMhJICL63O8wOLdDxuGWGjKUUF3eOv2W53zm0vA9vPkcnSqayQID
-AQABo4HOMIHLMB0GA1UdDgQWBBQuFYdp2C5bNykoCJKU6Zvck9npFjCBmwYDVR0j
-BIGTMIGQgBQuFYdp2C5bNykoCJKU6Zvck9npFqFtpGswaTELMAkGA1UEBhMCRlIx
-EzARBgNVBAgTClNvbWUtU3RhdGUxDTALBgNVBAoTBElOUkExFDASBgNVBAMTC2lk
-cC5pbnJhLmZyMSAwHgYJKoZIhvcNAQkBFhFpcmlzQGpvdXkuaW5yYS5mcoIJAOpq
-YvYKPY5EMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBACVWt4h6qZXm
-gGA+rFStbfxgVX+S749r9CuN+iwKObnwxI93SiiwNnb2PKO9OStTc8urvfNsgy8O
-vWGAZclkl2aeesV3r5oZxj26Jui2csSAh9SN0qozuTGStVxi7mCw4g+eT757IZs2
-FE2UnVn3QV2keLIsfk6excx9DcdomHhhaZXnqF/o8w8WUWRR8+RgoT8b2S1NjM63
-lJSyrOoagLkgU/k4XV81/NE+fWiQvNQl1GmcvtrN1UZmuza3g/miWRHxf6PgCC/M
-ZbGGM6SI8RhHkV9rmtvlCAbI4nwkIxYP+RX7me4vueKiUCiuod40PJlRQ0D8Wrr7
-UCoh/SWrQNc=
-					    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.inra.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">INRA - Institut national de la recherche agronomique</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">INRA - Institut national de la recherche agronomique</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <EmailAddress>iris@jouy.inra.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.inra.fr.xml b/swamid-interfederations-2.0/idp.inra.fr.xml
deleted file mode 100644
index 8c34feed..00000000
--- a/swamid-interfederations-2.0/idp.inra.fr.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://idp.inra.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2009-03-17T16:49:46Z">
-      <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">inra.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">INRA - Institut national de la recherche agronomique</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIEJDCCAwygAwIBAgIJAOpqYvYKPY5EMA0GCSqGSIb3DQEBBQUAMGkxCzAJBgNV
-BAYTAkZSMRMwEQYDVQQIEwpTb21lLVN0YXRlMQ0wCwYDVQQKEwRJTlJBMRQwEgYD
-VQQDEwtpZHAuaW5yYS5mcjEgMB4GCSqGSIb3DQEJARYRaXJpc0Bqb3V5LmlucmEu
-ZnIwHhcNMTIxMTEzMTQ0MDM2WhcNMzcwNzMwMTQ0MDM2WjBpMQswCQYDVQQGEwJG
-UjETMBEGA1UECBMKU29tZS1TdGF0ZTENMAsGA1UEChMESU5SQTEUMBIGA1UEAxML
-aWRwLmlucmEuZnIxIDAeBgkqhkiG9w0BCQEWEWlyaXNAam91eS5pbnJhLmZyMIIB
-IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA1JTdk4XTqBi1r68i3u0qYR8P
-4NynVg2F7SoCLDf9ZXrpxMiyik135988ch/8mqyJK451klfCoLTgZfu1YfPQtU4x
-b463LyxSDX0SCnK4XQIBD7W6E+MysAa/hghTs1xamoNZOxZVXGSeRS6iLIZgaMfa
-O4+T/rWciwFJonESjtY2cw6HSx0OSR5lE/Lv/JDnfDMfpyF0dY4hNT8EWFzwwqMv
-q9TyeareTYMI4kd6+rw1bbX1HOWURNTFH3j+bnUx/uH3UMhywueuQTgYdR1wA/+X
-1lGsPy9k9uBQNMhJICL63O8wOLdDxuGWGjKUUF3eOv2W53zm0vA9vPkcnSqayQID
-AQABo4HOMIHLMB0GA1UdDgQWBBQuFYdp2C5bNykoCJKU6Zvck9npFjCBmwYDVR0j
-BIGTMIGQgBQuFYdp2C5bNykoCJKU6Zvck9npFqFtpGswaTELMAkGA1UEBhMCRlIx
-EzARBgNVBAgTClNvbWUtU3RhdGUxDTALBgNVBAoTBElOUkExFDASBgNVBAMTC2lk
-cC5pbnJhLmZyMSAwHgYJKoZIhvcNAQkBFhFpcmlzQGpvdXkuaW5yYS5mcoIJAOpq
-YvYKPY5EMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBACVWt4h6qZXm
-gGA+rFStbfxgVX+S749r9CuN+iwKObnwxI93SiiwNnb2PKO9OStTc8urvfNsgy8O
-vWGAZclkl2aeesV3r5oZxj26Jui2csSAh9SN0qozuTGStVxi7mCw4g+eT757IZs2
-FE2UnVn3QV2keLIsfk6excx9DcdomHhhaZXnqF/o8w8WUWRR8+RgoT8b2S1NjM63
-lJSyrOoagLkgU/k4XV81/NE+fWiQvNQl1GmcvtrN1UZmuza3g/miWRHxf6PgCC/M
-ZbGGM6SI8RhHkV9rmtvlCAbI4nwkIxYP+RX7me4vueKiUCiuod40PJlRQ0D8Wrr7
-UCoh/SWrQNc=
-					    </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://idp.inra.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.inra.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.inra.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">inra.fr</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIEJDCCAwygAwIBAgIJAOpqYvYKPY5EMA0GCSqGSIb3DQEBBQUAMGkxCzAJBgNV
-BAYTAkZSMRMwEQYDVQQIEwpTb21lLVN0YXRlMQ0wCwYDVQQKEwRJTlJBMRQwEgYD
-VQQDEwtpZHAuaW5yYS5mcjEgMB4GCSqGSIb3DQEJARYRaXJpc0Bqb3V5LmlucmEu
-ZnIwHhcNMTIxMTEzMTQ0MDM2WhcNMzcwNzMwMTQ0MDM2WjBpMQswCQYDVQQGEwJG
-UjETMBEGA1UECBMKU29tZS1TdGF0ZTENMAsGA1UEChMESU5SQTEUMBIGA1UEAxML
-aWRwLmlucmEuZnIxIDAeBgkqhkiG9w0BCQEWEWlyaXNAam91eS5pbnJhLmZyMIIB
-IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA1JTdk4XTqBi1r68i3u0qYR8P
-4NynVg2F7SoCLDf9ZXrpxMiyik135988ch/8mqyJK451klfCoLTgZfu1YfPQtU4x
-b463LyxSDX0SCnK4XQIBD7W6E+MysAa/hghTs1xamoNZOxZVXGSeRS6iLIZgaMfa
-O4+T/rWciwFJonESjtY2cw6HSx0OSR5lE/Lv/JDnfDMfpyF0dY4hNT8EWFzwwqMv
-q9TyeareTYMI4kd6+rw1bbX1HOWURNTFH3j+bnUx/uH3UMhywueuQTgYdR1wA/+X
-1lGsPy9k9uBQNMhJICL63O8wOLdDxuGWGjKUUF3eOv2W53zm0vA9vPkcnSqayQID
-AQABo4HOMIHLMB0GA1UdDgQWBBQuFYdp2C5bNykoCJKU6Zvck9npFjCBmwYDVR0j
-BIGTMIGQgBQuFYdp2C5bNykoCJKU6Zvck9npFqFtpGswaTELMAkGA1UEBhMCRlIx
-EzARBgNVBAgTClNvbWUtU3RhdGUxDTALBgNVBAoTBElOUkExFDASBgNVBAMTC2lk
-cC5pbnJhLmZyMSAwHgYJKoZIhvcNAQkBFhFpcmlzQGpvdXkuaW5yYS5mcoIJAOpq
-YvYKPY5EMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBACVWt4h6qZXm
-gGA+rFStbfxgVX+S749r9CuN+iwKObnwxI93SiiwNnb2PKO9OStTc8urvfNsgy8O
-vWGAZclkl2aeesV3r5oZxj26Jui2csSAh9SN0qozuTGStVxi7mCw4g+eT757IZs2
-FE2UnVn3QV2keLIsfk6excx9DcdomHhhaZXnqF/o8w8WUWRR8+RgoT8b2S1NjM63
-lJSyrOoagLkgU/k4XV81/NE+fWiQvNQl1GmcvtrN1UZmuza3g/miWRHxf6PgCC/M
-ZbGGM6SI8RhHkV9rmtvlCAbI4nwkIxYP+RX7me4vueKiUCiuod40PJlRQ0D8Wrr7
-UCoh/SWrQNc=
-					    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.inra.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">INRA - Institut national de la recherche agronomique</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">INRA - Institut national de la recherche agronomique</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <EmailAddress>iris@jouy.inra.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.insa-rennes.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.insa-rennes.fr-idp-shibboleth.xml
deleted file mode 100644
index ad42899b..00000000
--- a/swamid-interfederations-2.0/idp.insa-rennes.fr-idp-shibboleth.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://idp.insa-rennes.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2012-01-09T09:44:23Z">
-      <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">insa-rennes.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">INSA de Rennes</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDNDCCAhygAwIBAgIVAJHTEvJ6v+nlYzV+wkUtFZ6HzcHCMA0GCSqGSIb3DQEB
-BQUAMB0xGzAZBgNVBAMTEmlkcC5pbnNhLXJlbm5lcy5mcjAeFw0xMTExMTgwOTU4
-MzZaFw0zMTExMTgwOTU4MzZaMB0xGzAZBgNVBAMTEmlkcC5pbnNhLXJlbm5lcy5m
-cjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJYlYtRP3NDZSmNJI7aK
-/m/7Mr2Hxk6D7zPWCkgTB+TjG4ZRmHxBQnpWPiceF3FApyRVwERozwzIqQwneJNv
-5l6OyDnzzRrS66gGMoRl3wtUfMwEYQ2C7Ra+9YVQ9jk5KnYtz23eL+aKEuunzGcP
-Q30cQjCp7Ul24A3SxpaEh833HXF99wUOUY2m0eGWbrtrNlfFKccdFC4aP0BJBKwW
-O3jSaYI9+8Li1X6bkYtxckzJXpnT+mFd+YtdheBHervp5LV/UaXLu0gkba2QpPxh
-K1sSF2c9rxHHtsFmz8MLybRhUav+geOptiwdao4x+RADBYqqadBExIfwincN32oj
-DpsCAwEAAaNrMGkwSAYDVR0RBEEwP4ISaWRwLmluc2EtcmVubmVzLmZyhilodHRw
-czovL2lkcC5pbnNhLXJlbm5lcy5mci9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQU
-naVqEfHdJ6MDDzgXACj6bY0JkPQwDQYJKoZIhvcNAQEFBQADggEBAEhzs1y7DS7z
-KOwwwe/r04humZpdbH8a1MSimx1eCEUEKaO1JrQKQFJF7Uirm0AOX6VE0KlWc4rO
-tIJEPylxZcEopP1fbyCh7qk20MQQzlFuDWr14M+UU8jAtLodDafQRG2Vevsyj/hI
-Ru43dYNwSJWuAsKkIgJfrtGFsLzJFGqabyWvaRRxuz04RWMdxdrcMAKsnREo4EZ7
-DS0IzKCW7Qw9cBjhyIPJP1AsVe0qAPzz/+cFYeAhn1IDhFVmDLrWuFMtFEhytPPx
-83jRvkMRYTkV2AdH1UqS1c46r/56fa6YwAGxq90K4mMN1hbdkatVdfF/WUbmW9fU
-R/EORI5dwv0=
-					    </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://idp.insa-rennes.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.insa-rennes.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.insa-rennes.fr/idp/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">INSA de Rennes</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">INSA de Rennes</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <EmailAddress>cri-systeme@insa-rennes.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.insa-rennes.fr.xml b/swamid-interfederations-2.0/idp.insa-rennes.fr.xml
deleted file mode 100644
index ad42899b..00000000
--- a/swamid-interfederations-2.0/idp.insa-rennes.fr.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://idp.insa-rennes.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2012-01-09T09:44:23Z">
-      <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">insa-rennes.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">INSA de Rennes</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDNDCCAhygAwIBAgIVAJHTEvJ6v+nlYzV+wkUtFZ6HzcHCMA0GCSqGSIb3DQEB
-BQUAMB0xGzAZBgNVBAMTEmlkcC5pbnNhLXJlbm5lcy5mcjAeFw0xMTExMTgwOTU4
-MzZaFw0zMTExMTgwOTU4MzZaMB0xGzAZBgNVBAMTEmlkcC5pbnNhLXJlbm5lcy5m
-cjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJYlYtRP3NDZSmNJI7aK
-/m/7Mr2Hxk6D7zPWCkgTB+TjG4ZRmHxBQnpWPiceF3FApyRVwERozwzIqQwneJNv
-5l6OyDnzzRrS66gGMoRl3wtUfMwEYQ2C7Ra+9YVQ9jk5KnYtz23eL+aKEuunzGcP
-Q30cQjCp7Ul24A3SxpaEh833HXF99wUOUY2m0eGWbrtrNlfFKccdFC4aP0BJBKwW
-O3jSaYI9+8Li1X6bkYtxckzJXpnT+mFd+YtdheBHervp5LV/UaXLu0gkba2QpPxh
-K1sSF2c9rxHHtsFmz8MLybRhUav+geOptiwdao4x+RADBYqqadBExIfwincN32oj
-DpsCAwEAAaNrMGkwSAYDVR0RBEEwP4ISaWRwLmluc2EtcmVubmVzLmZyhilodHRw
-czovL2lkcC5pbnNhLXJlbm5lcy5mci9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQU
-naVqEfHdJ6MDDzgXACj6bY0JkPQwDQYJKoZIhvcNAQEFBQADggEBAEhzs1y7DS7z
-KOwwwe/r04humZpdbH8a1MSimx1eCEUEKaO1JrQKQFJF7Uirm0AOX6VE0KlWc4rO
-tIJEPylxZcEopP1fbyCh7qk20MQQzlFuDWr14M+UU8jAtLodDafQRG2Vevsyj/hI
-Ru43dYNwSJWuAsKkIgJfrtGFsLzJFGqabyWvaRRxuz04RWMdxdrcMAKsnREo4EZ7
-DS0IzKCW7Qw9cBjhyIPJP1AsVe0qAPzz/+cFYeAhn1IDhFVmDLrWuFMtFEhytPPx
-83jRvkMRYTkV2AdH1UqS1c46r/56fa6YwAGxq90K4mMN1hbdkatVdfF/WUbmW9fU
-R/EORI5dwv0=
-					    </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://idp.insa-rennes.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.insa-rennes.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.insa-rennes.fr/idp/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">INSA de Rennes</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">INSA de Rennes</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <EmailAddress>cri-systeme@insa-rennes.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.inserm.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.inserm.fr-idp-shibboleth.xml
deleted file mode 100644
index 617a8c8c..00000000
--- a/swamid-interfederations-2.0/idp.inserm.fr-idp-shibboleth.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://idp.inserm.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2010-09-29T14:53:19Z">
-      <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">inserm.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">INSERM</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDHzCCAgegAwIBAgIUPRg4DDJsvsJXUOi8j5yeUXXX7vwwDQYJKoZIhvcNAQEF
-BQAwGDEWMBQGA1UEAxMNaWRwLmluc2VybS5mcjAeFw0xMDA5MjcxMjQwMzVaFw0z
-MDA5MjcxMjQwMzVaMBgxFjAUBgNVBAMTDWlkcC5pbnNlcm0uZnIwggEiMA0GCSqG
-SIb3DQEBAQUAA4IBDwAwggEKAoIBAQCZMeilvtmNQnYydiIIwt449Et+Hpk5lqUg
-6WSjV5CHD7Lz784CjJwXJ3gZ2c2oC6ejVOFxr0RUuxdxmawVY211MZPuyjY8G34i
-sqbxBLYseqBw9SGUQqWKgoPTimcHryL+qj18mzOgevSFYKvVJ/q/nqxDor3/c20V
-KpjVBIL6lMWNqnBrZX63D1O6/clt8RHFDVjOaCHn47IQVBccRfE4AMr9tRCs+q91
-CzvGYMyxSy4hlqyPK/WW+LDY5Hmn3Kp8LZWSKekyBZB8nK1j4qSxOET1zFucd3FU
-MB7pQdtgzs15wbR8JTK1YYO6OJ3ffrY9srenSlcLYdZ3Iud+6pbXAgMBAAGjYTBf
-MD4GA1UdEQQ3MDWCDWlkcC5pbnNlcm0uZnKGJGh0dHBzOi8vaWRwLmluc2VybS5m
-ci9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQU8fCrONu36laDi9nBzT+NIIKejZQw
-DQYJKoZIhvcNAQEFBQADggEBADDcCgGRVAub909ulzl/iYhzl3QhR9XjKxzWV4JH
-4HI7Hb3DAPOcffdbSdG2lLv4qw+Ds9Y08tI9Gof7bDVWE08ye9xFN2BwBTn2KKJz
-lq6FPbfW5Swi289Q0UvCI7J5LbYTAiU+2CYSSgxg0cGer8ho1+hSsKIoLaqXMjz2
-3TMmJK+QuPbnW2jKS3xcdHOUhtZXYKQE+veaHNlNt/8vqF9C7IzCRfSCeT880cHw
-f6ou5oRTltOZOUJfXI1XMhAUNnU7zQvrFeoGrRzGv3zq8AieXbRyWhXY1Eo1mPpS
-4gA/AqUGz/DMMnCEWuy1Dmq9rAOVcoAxntyKDo0ntUiBrUg=
-					    </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://idp.inserm.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.inserm.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.inserm.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">inserm.fr</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDHzCCAgegAwIBAgIUPRg4DDJsvsJXUOi8j5yeUXXX7vwwDQYJKoZIhvcNAQEF
-BQAwGDEWMBQGA1UEAxMNaWRwLmluc2VybS5mcjAeFw0xMDA5MjcxMjQwMzVaFw0z
-MDA5MjcxMjQwMzVaMBgxFjAUBgNVBAMTDWlkcC5pbnNlcm0uZnIwggEiMA0GCSqG
-SIb3DQEBAQUAA4IBDwAwggEKAoIBAQCZMeilvtmNQnYydiIIwt449Et+Hpk5lqUg
-6WSjV5CHD7Lz784CjJwXJ3gZ2c2oC6ejVOFxr0RUuxdxmawVY211MZPuyjY8G34i
-sqbxBLYseqBw9SGUQqWKgoPTimcHryL+qj18mzOgevSFYKvVJ/q/nqxDor3/c20V
-KpjVBIL6lMWNqnBrZX63D1O6/clt8RHFDVjOaCHn47IQVBccRfE4AMr9tRCs+q91
-CzvGYMyxSy4hlqyPK/WW+LDY5Hmn3Kp8LZWSKekyBZB8nK1j4qSxOET1zFucd3FU
-MB7pQdtgzs15wbR8JTK1YYO6OJ3ffrY9srenSlcLYdZ3Iud+6pbXAgMBAAGjYTBf
-MD4GA1UdEQQ3MDWCDWlkcC5pbnNlcm0uZnKGJGh0dHBzOi8vaWRwLmluc2VybS5m
-ci9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQU8fCrONu36laDi9nBzT+NIIKejZQw
-DQYJKoZIhvcNAQEFBQADggEBADDcCgGRVAub909ulzl/iYhzl3QhR9XjKxzWV4JH
-4HI7Hb3DAPOcffdbSdG2lLv4qw+Ds9Y08tI9Gof7bDVWE08ye9xFN2BwBTn2KKJz
-lq6FPbfW5Swi289Q0UvCI7J5LbYTAiU+2CYSSgxg0cGer8ho1+hSsKIoLaqXMjz2
-3TMmJK+QuPbnW2jKS3xcdHOUhtZXYKQE+veaHNlNt/8vqF9C7IzCRfSCeT880cHw
-f6ou5oRTltOZOUJfXI1XMhAUNnU7zQvrFeoGrRzGv3zq8AieXbRyWhXY1Eo1mPpS
-4gA/AqUGz/DMMnCEWuy1Dmq9rAOVcoAxntyKDo0ntUiBrUg=
-					    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.inserm.fr/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">INSERM</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">INSERM</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <EmailAddress>resnat.dsi@inserm.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.inserm.fr.xml b/swamid-interfederations-2.0/idp.inserm.fr.xml
deleted file mode 100644
index 617a8c8c..00000000
--- a/swamid-interfederations-2.0/idp.inserm.fr.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://idp.inserm.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2010-09-29T14:53:19Z">
-      <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">inserm.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">INSERM</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDHzCCAgegAwIBAgIUPRg4DDJsvsJXUOi8j5yeUXXX7vwwDQYJKoZIhvcNAQEF
-BQAwGDEWMBQGA1UEAxMNaWRwLmluc2VybS5mcjAeFw0xMDA5MjcxMjQwMzVaFw0z
-MDA5MjcxMjQwMzVaMBgxFjAUBgNVBAMTDWlkcC5pbnNlcm0uZnIwggEiMA0GCSqG
-SIb3DQEBAQUAA4IBDwAwggEKAoIBAQCZMeilvtmNQnYydiIIwt449Et+Hpk5lqUg
-6WSjV5CHD7Lz784CjJwXJ3gZ2c2oC6ejVOFxr0RUuxdxmawVY211MZPuyjY8G34i
-sqbxBLYseqBw9SGUQqWKgoPTimcHryL+qj18mzOgevSFYKvVJ/q/nqxDor3/c20V
-KpjVBIL6lMWNqnBrZX63D1O6/clt8RHFDVjOaCHn47IQVBccRfE4AMr9tRCs+q91
-CzvGYMyxSy4hlqyPK/WW+LDY5Hmn3Kp8LZWSKekyBZB8nK1j4qSxOET1zFucd3FU
-MB7pQdtgzs15wbR8JTK1YYO6OJ3ffrY9srenSlcLYdZ3Iud+6pbXAgMBAAGjYTBf
-MD4GA1UdEQQ3MDWCDWlkcC5pbnNlcm0uZnKGJGh0dHBzOi8vaWRwLmluc2VybS5m
-ci9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQU8fCrONu36laDi9nBzT+NIIKejZQw
-DQYJKoZIhvcNAQEFBQADggEBADDcCgGRVAub909ulzl/iYhzl3QhR9XjKxzWV4JH
-4HI7Hb3DAPOcffdbSdG2lLv4qw+Ds9Y08tI9Gof7bDVWE08ye9xFN2BwBTn2KKJz
-lq6FPbfW5Swi289Q0UvCI7J5LbYTAiU+2CYSSgxg0cGer8ho1+hSsKIoLaqXMjz2
-3TMmJK+QuPbnW2jKS3xcdHOUhtZXYKQE+veaHNlNt/8vqF9C7IzCRfSCeT880cHw
-f6ou5oRTltOZOUJfXI1XMhAUNnU7zQvrFeoGrRzGv3zq8AieXbRyWhXY1Eo1mPpS
-4gA/AqUGz/DMMnCEWuy1Dmq9rAOVcoAxntyKDo0ntUiBrUg=
-					    </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://idp.inserm.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.inserm.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.inserm.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">inserm.fr</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDHzCCAgegAwIBAgIUPRg4DDJsvsJXUOi8j5yeUXXX7vwwDQYJKoZIhvcNAQEF
-BQAwGDEWMBQGA1UEAxMNaWRwLmluc2VybS5mcjAeFw0xMDA5MjcxMjQwMzVaFw0z
-MDA5MjcxMjQwMzVaMBgxFjAUBgNVBAMTDWlkcC5pbnNlcm0uZnIwggEiMA0GCSqG
-SIb3DQEBAQUAA4IBDwAwggEKAoIBAQCZMeilvtmNQnYydiIIwt449Et+Hpk5lqUg
-6WSjV5CHD7Lz784CjJwXJ3gZ2c2oC6ejVOFxr0RUuxdxmawVY211MZPuyjY8G34i
-sqbxBLYseqBw9SGUQqWKgoPTimcHryL+qj18mzOgevSFYKvVJ/q/nqxDor3/c20V
-KpjVBIL6lMWNqnBrZX63D1O6/clt8RHFDVjOaCHn47IQVBccRfE4AMr9tRCs+q91
-CzvGYMyxSy4hlqyPK/WW+LDY5Hmn3Kp8LZWSKekyBZB8nK1j4qSxOET1zFucd3FU
-MB7pQdtgzs15wbR8JTK1YYO6OJ3ffrY9srenSlcLYdZ3Iud+6pbXAgMBAAGjYTBf
-MD4GA1UdEQQ3MDWCDWlkcC5pbnNlcm0uZnKGJGh0dHBzOi8vaWRwLmluc2VybS5m
-ci9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQU8fCrONu36laDi9nBzT+NIIKejZQw
-DQYJKoZIhvcNAQEFBQADggEBADDcCgGRVAub909ulzl/iYhzl3QhR9XjKxzWV4JH
-4HI7Hb3DAPOcffdbSdG2lLv4qw+Ds9Y08tI9Gof7bDVWE08ye9xFN2BwBTn2KKJz
-lq6FPbfW5Swi289Q0UvCI7J5LbYTAiU+2CYSSgxg0cGer8ho1+hSsKIoLaqXMjz2
-3TMmJK+QuPbnW2jKS3xcdHOUhtZXYKQE+veaHNlNt/8vqF9C7IzCRfSCeT880cHw
-f6ou5oRTltOZOUJfXI1XMhAUNnU7zQvrFeoGrRzGv3zq8AieXbRyWhXY1Eo1mPpS
-4gA/AqUGz/DMMnCEWuy1Dmq9rAOVcoAxntyKDo0ntUiBrUg=
-					    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.inserm.fr/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">INSERM</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">INSERM</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <EmailAddress>resnat.dsi@inserm.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.ipa.ie-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.ipa.ie-idp-shibboleth.xml
deleted file mode 100644
index 65958354..00000000
--- a/swamid-interfederations-2.0/idp.ipa.ie-idp-shibboleth.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.ipa.ie/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.heanet.ie" registrationInstant="2011-11-28T00:00:00Z"/>
-  </md:Extensions>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ipa.ie</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Institute of Public Administration</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="ga">An Foras Riarachaín</mdui:DisplayName>
-        <mdui:InformationURL xml:lang="en">http://www.ipa.ie</mdui:InformationURL>
-        <mdui:Logo height="120" width="130">https://edugate.heanet.ie/rr3/logos/ipa.png</mdui:Logo>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:GeolocationHint>geo:53.3337363,-6.2300127</mdui:GeolocationHint>
-      </mdui:DiscoHints>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDFDCCAfygAwIBAgIVAI3sMWxFvjpe4FwTUUSZvm2vGfvVMA0GCSqGSIb3DQEB
-BQUAMBUxEzARBgNVBAMTCmlkcC5pcGEuaWUwHhcNMTExMTI1MTczNTQxWhcNMzEx
-MTI1MTczNTQxWjAVMRMwEQYDVQQDEwppZHAuaXBhLmllMIIBIjANBgkqhkiG9w0B
-AQEFAAOCAQ8AMIIBCgKCAQEAtRddMdHqEdiL5NPjnqqt4VZZtuNNq1xslTEzOoKW
-4fJ7uKbxw0TOnUVgeqoBJEIVhxDvilQXkonb+jDCFZCbyrNsh/ENr0bbqtOwvMYP
-Q4ODxnxK4D+Qjbf/Ld0ki0jjUvZ8v9J6aO2AKk6IPVlvwXi1GoEGy2Ds46DVq3Gl
-V54v/cu6A8vatOpRgF3keOkL1nLW37mjiy9Xu7+8/C5uK+UBzjb/bX5qzjbHbVOG
-hnamqwgRN0QyzQPU1OyNK4b88DIw+gqUi0qo2tlcc+Hn6He3O56uSsTprNwoNKrr
-MvlkEL1pY0lfgAcadJGGrQ9FEi0Ty+GeeyoT0agvHlq0jwIDAQABo1swWTA4BgNV
-HREEMTAvggppZHAuaXBhLmllhiFodHRwczovL2lkcC5pcGEuaWUvaWRwL3NoaWJi
-b2xldGgwHQYDVR0OBBYEFJhKeTQ7ebYvmIRcYtOY8b9L1zhaMA0GCSqGSIb3DQEB
-BQUAA4IBAQANi1lNeUhqvdVK7q7dotF3EPg6C2PJLYUXjInHfHKLHbDDfYGEVf19
-nz2pasKmdfo0bv9kssbuwVfn7tUro8Igdt661gq/0/eriKaMg83qeo5MOoJa0I5t
-94y8/mZAhz3SUReGR3zEhbZIXEx+zdbbz992k6FjMCi4MQpfoN1LD6uqIHqjAu0P
-A2dPT+rM2JRZ/li0YmTLUcvE0IP1q7VuihtEXBKbndKPe4sEIy4LVfpPDs2oYjg6
-0VDwE1ENoiu+3TYEkP/ZZpu2Z68FG7Ygpedl96CjXFm5qufuU8UUpz7SRMf2gEv/
-NkaVXN/aXmq6gSQ+gfVeKU+eqHo2TR51
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ipa.ie/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ipa.ie/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.ipa.ie/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Institute of Public Administration</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Institute of Public Administration</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.ipa.ie</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Peter</md:GivenName>
-    <md:SurName>Sisk</md:SurName>
-    <md:EmailAddress>psisk@ipa.ie</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Peter</md:GivenName>
-    <md:SurName>Sisk</md:SurName>
-    <md:EmailAddress>psisk@ipa.ie</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.ipa.ie.xml b/swamid-interfederations-2.0/idp.ipa.ie.xml
deleted file mode 100644
index 65958354..00000000
--- a/swamid-interfederations-2.0/idp.ipa.ie.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.ipa.ie/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.heanet.ie" registrationInstant="2011-11-28T00:00:00Z"/>
-  </md:Extensions>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ipa.ie</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Institute of Public Administration</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="ga">An Foras Riarachaín</mdui:DisplayName>
-        <mdui:InformationURL xml:lang="en">http://www.ipa.ie</mdui:InformationURL>
-        <mdui:Logo height="120" width="130">https://edugate.heanet.ie/rr3/logos/ipa.png</mdui:Logo>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:GeolocationHint>geo:53.3337363,-6.2300127</mdui:GeolocationHint>
-      </mdui:DiscoHints>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDFDCCAfygAwIBAgIVAI3sMWxFvjpe4FwTUUSZvm2vGfvVMA0GCSqGSIb3DQEB
-BQUAMBUxEzARBgNVBAMTCmlkcC5pcGEuaWUwHhcNMTExMTI1MTczNTQxWhcNMzEx
-MTI1MTczNTQxWjAVMRMwEQYDVQQDEwppZHAuaXBhLmllMIIBIjANBgkqhkiG9w0B
-AQEFAAOCAQ8AMIIBCgKCAQEAtRddMdHqEdiL5NPjnqqt4VZZtuNNq1xslTEzOoKW
-4fJ7uKbxw0TOnUVgeqoBJEIVhxDvilQXkonb+jDCFZCbyrNsh/ENr0bbqtOwvMYP
-Q4ODxnxK4D+Qjbf/Ld0ki0jjUvZ8v9J6aO2AKk6IPVlvwXi1GoEGy2Ds46DVq3Gl
-V54v/cu6A8vatOpRgF3keOkL1nLW37mjiy9Xu7+8/C5uK+UBzjb/bX5qzjbHbVOG
-hnamqwgRN0QyzQPU1OyNK4b88DIw+gqUi0qo2tlcc+Hn6He3O56uSsTprNwoNKrr
-MvlkEL1pY0lfgAcadJGGrQ9FEi0Ty+GeeyoT0agvHlq0jwIDAQABo1swWTA4BgNV
-HREEMTAvggppZHAuaXBhLmllhiFodHRwczovL2lkcC5pcGEuaWUvaWRwL3NoaWJi
-b2xldGgwHQYDVR0OBBYEFJhKeTQ7ebYvmIRcYtOY8b9L1zhaMA0GCSqGSIb3DQEB
-BQUAA4IBAQANi1lNeUhqvdVK7q7dotF3EPg6C2PJLYUXjInHfHKLHbDDfYGEVf19
-nz2pasKmdfo0bv9kssbuwVfn7tUro8Igdt661gq/0/eriKaMg83qeo5MOoJa0I5t
-94y8/mZAhz3SUReGR3zEhbZIXEx+zdbbz992k6FjMCi4MQpfoN1LD6uqIHqjAu0P
-A2dPT+rM2JRZ/li0YmTLUcvE0IP1q7VuihtEXBKbndKPe4sEIy4LVfpPDs2oYjg6
-0VDwE1ENoiu+3TYEkP/ZZpu2Z68FG7Ygpedl96CjXFm5qufuU8UUpz7SRMf2gEv/
-NkaVXN/aXmq6gSQ+gfVeKU+eqHo2TR51
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ipa.ie/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ipa.ie/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.ipa.ie/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Institute of Public Administration</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Institute of Public Administration</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.ipa.ie</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Peter</md:GivenName>
-    <md:SurName>Sisk</md:SurName>
-    <md:EmailAddress>psisk@ipa.ie</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Peter</md:GivenName>
-    <md:SurName>Sisk</md:SurName>
-    <md:EmailAddress>psisk@ipa.ie</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.ipb.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.ipb.fr-idp-shibboleth.xml
deleted file mode 100644
index 15f53c2a..00000000
--- a/swamid-interfederations-2.0/idp.ipb.fr-idp-shibboleth.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://idp.ipb.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2011-08-29T14:12:44Z">
-      <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">ipb.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">IPB - Bordeaux INP</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIEYjCCA0qgAwIBAgIRALgbEIwRuh3U84klcQg/9UAwDQYJKoZIhvcNAQEFBQAw
-NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-IFNTTCBDQTAeFw0xNDA1MjgwMDAwMDBaFw0xNzA1MjcyMzU5NTlaMDgxITAfBgNV
-BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDETMBEGA1UEAxMKaWRwLmlwYi5m
-cjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAK4nVfui+Zt1Trzesy1o
-2T60W4uaIWixKu80BtFxgCW8wacQ9wOwFYWm4LfKRILmNI0p8OnXD+9wHaBOnx44
-wof+tuWZJjXVqvdgq9WIZ+3VSEJkI/wvA7KgHdPaVSPWX6OHDU0K1gm74OjEdHb+
-hFPBiyZ3VW8GALHDUWWjYjDJGUoqOKf/Y0nymNWREKN7y18BqcFhW3JMTHRoepse
-fu5uRqhYU/0YHaZD97oW7fo25N3EF3Ca59uWPYG/1Twhd/OwlIBpTzAbPt903YNk
-RtchHYflp1oJKqkz/dW1h7ueGPKz6QZj4ebM7pwF4fL0TwDtsre67jL8KjtFodvj
-vEcCAwEAAaOCAWcwggFjMB8GA1UdIwQYMBaAFAy9k2gM896ro0lrKzdXR+qQ47nt
-MB0GA1UdDgQWBBTnzkMBxq38x6wZ8nj2FKqHYXDW6DAOBgNVHQ8BAf8EBAMCBaAw
-DAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwIgYD
-VR0gBBswGTANBgsrBgEEAbIxAQICHTAIBgZngQwBAgEwOgYDVR0fBDMwMTAvoC2g
-K4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcmwwbQYI
-KwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRjcy50ZXJlbmEu
-b3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDovL29jc3AudGNz
-LnRlcmVuYS5vcmcwFQYDVR0RBA4wDIIKaWRwLmlwYi5mcjANBgkqhkiG9w0BAQUF
-AAOCAQEAe8v3WPdLO5+RWtLXf40JeFjGPbFgf9pdsJwpnHCkD7up8PapvqwxENzD
-Pj6laE+YWc6GXI1IeCX7Niye/09BBtn4SW4KVIp8u9qLiDQsrmb9c56xosPQP2/l
-9fC8VzlwnAQ/hrQjyXOA6WaEGRMK5LeWDXZfkos+afU0m/gVl4i57rRNM/B1AgO2
-wORHtv4Q51ZnfSkDLOjKG98VQKN2RTtPvrnj4TnIvp8KSFbfH7ETyJq8l5nA2lHs
-ZKgUrRmjDmCf5UuCYHwMtOgFzULqTmmHdveUn/tYTyooHhj9tGz0NOXuzji6RUPt
-6XlibuDkkJwzRII2QYI3FB+8/h7Vqg==
-					    </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://idp.ipb.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ipb.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.ipb.fr/idp/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">IPB - Bordeaux INP</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">IPB - Bordeaux INP</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Moniez</SurName>
-    <EmailAddress>philippe.moniez@ipb.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.ipb.fr.xml b/swamid-interfederations-2.0/idp.ipb.fr.xml
deleted file mode 100644
index 15f53c2a..00000000
--- a/swamid-interfederations-2.0/idp.ipb.fr.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://idp.ipb.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2011-08-29T14:12:44Z">
-      <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">ipb.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">IPB - Bordeaux INP</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIEYjCCA0qgAwIBAgIRALgbEIwRuh3U84klcQg/9UAwDQYJKoZIhvcNAQEFBQAw
-NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-IFNTTCBDQTAeFw0xNDA1MjgwMDAwMDBaFw0xNzA1MjcyMzU5NTlaMDgxITAfBgNV
-BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDETMBEGA1UEAxMKaWRwLmlwYi5m
-cjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAK4nVfui+Zt1Trzesy1o
-2T60W4uaIWixKu80BtFxgCW8wacQ9wOwFYWm4LfKRILmNI0p8OnXD+9wHaBOnx44
-wof+tuWZJjXVqvdgq9WIZ+3VSEJkI/wvA7KgHdPaVSPWX6OHDU0K1gm74OjEdHb+
-hFPBiyZ3VW8GALHDUWWjYjDJGUoqOKf/Y0nymNWREKN7y18BqcFhW3JMTHRoepse
-fu5uRqhYU/0YHaZD97oW7fo25N3EF3Ca59uWPYG/1Twhd/OwlIBpTzAbPt903YNk
-RtchHYflp1oJKqkz/dW1h7ueGPKz6QZj4ebM7pwF4fL0TwDtsre67jL8KjtFodvj
-vEcCAwEAAaOCAWcwggFjMB8GA1UdIwQYMBaAFAy9k2gM896ro0lrKzdXR+qQ47nt
-MB0GA1UdDgQWBBTnzkMBxq38x6wZ8nj2FKqHYXDW6DAOBgNVHQ8BAf8EBAMCBaAw
-DAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwIgYD
-VR0gBBswGTANBgsrBgEEAbIxAQICHTAIBgZngQwBAgEwOgYDVR0fBDMwMTAvoC2g
-K4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcmwwbQYI
-KwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRjcy50ZXJlbmEu
-b3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDovL29jc3AudGNz
-LnRlcmVuYS5vcmcwFQYDVR0RBA4wDIIKaWRwLmlwYi5mcjANBgkqhkiG9w0BAQUF
-AAOCAQEAe8v3WPdLO5+RWtLXf40JeFjGPbFgf9pdsJwpnHCkD7up8PapvqwxENzD
-Pj6laE+YWc6GXI1IeCX7Niye/09BBtn4SW4KVIp8u9qLiDQsrmb9c56xosPQP2/l
-9fC8VzlwnAQ/hrQjyXOA6WaEGRMK5LeWDXZfkos+afU0m/gVl4i57rRNM/B1AgO2
-wORHtv4Q51ZnfSkDLOjKG98VQKN2RTtPvrnj4TnIvp8KSFbfH7ETyJq8l5nA2lHs
-ZKgUrRmjDmCf5UuCYHwMtOgFzULqTmmHdveUn/tYTyooHhj9tGz0NOXuzji6RUPt
-6XlibuDkkJwzRII2QYI3FB+8/h7Vqg==
-					    </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://idp.ipb.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ipb.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.ipb.fr/idp/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">IPB - Bordeaux INP</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">IPB - Bordeaux INP</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Moniez</SurName>
-    <EmailAddress>philippe.moniez@ipb.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.ipm.cas.cz-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.ipm.cas.cz-idp-shibboleth.xml
deleted file mode 100644
index fcebe74a..00000000
--- a/swamid-interfederations-2.0/idp.ipm.cas.cz-idp-shibboleth.xml
+++ /dev/null
@@ -1,118 +0,0 @@
-<?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.ipm.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/" registrationInstant="2014-05-02T15:43:18Z">
-      <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>
-    <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://eduid.cz/uri/idp-group/avcr</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>
-      <shibmd:Scope regexp="false">ipm.cas.cz</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Institute of Physics of Materials of the AS CR</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="cs">Ústav fyziky materiálů AV ČR</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Identity Provider IPM AV CR employees.</mdui:Description>
-        <mdui:Description xml:lang="cs">Identity Provider pro zaměstnance ÚFM AV ČR</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.ipm.cz/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="cs">http://www.ipm.cz/</mdui:InformationURL>
-        <mdui:Logo height="44" width="74">https://jiftach.cas.cz/loga/logo-ipm-44.png</mdui:Logo>
-        <mdui:Logo height="411" width="960">https://jiftach.cas.cz/loga/logo-ipm-129.png</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDIzCCAgugAwIBAgIUHoc4WAOOS8FXFJOqANPx0dZofskwDQYJKoZIhvcNAQEF
-BQAwGTEXMBUGA1UEAxMOaWRwLmlwbS5jYXMuY3owHhcNMTQwMzMxMTEzNjMwWhcN
-MzQwMzMxMTEzNjMwWjAZMRcwFQYDVQQDEw5pZHAuaXBtLmNhcy5jejCCASIwDQYJ
-KoZIhvcNAQEBBQADggEPADCCAQoCggEBAKtVmqQC+tS6991zGEb00Rpy9QTbyaqb
-/ImfelKGHYprdU+8gF7WQSldgVncAMSY+z2agvh4ojTqcGnDcMFp4MqLrK2+e2jF
-+9rNCGnj3NZoklOJbXDw3YAbqRgpAEeGqv7nribQEN0lkvwQHvSlU05oXmpqe2m+
-qgdMPznUxESq9hymiGfnINn3YRb57fYArbp1FaUvJ+S5sSjcREsvxvzmCrUfAcBZ
-xwK3gqrVrirVPAMFklKNLvIqHTOsnOqm+spc9OcdoyXDCGEpwOQ8868AY7Dat7SO
-gkrM0+zf1Ut9Fe/oRkMQ34Ozt07KsaV6P0rLXoT7elG5HoPAO8sWJRUCAwEAAaNj
-MGEwQAYDVR0RBDkwN4IOaWRwLmlwbS5jYXMuY3qGJWh0dHBzOi8vaWRwLmlwbS5j
-YXMuY3ovaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFNmaGF8aU8MkTc6UkiWbbnad
-065mMA0GCSqGSIb3DQEBBQUAA4IBAQBQE0fUf6bV/7fscYI7zqh2nFV8qKcjP0jd
-dAKy17PaVFSkCGHgTX39K3kuacWA4a1SZBfN39KmQ9sj1GDF7Zci0V+tS/tbckbv
-1ME/Z+MyQTQTodGorOTdDsJKKdHbIIOVPOvO9IhX77ej4gFRX5+POQVSqtA/1Syp
-3oTa1zV9s/UD+WifYFmlUlF50Kw1hE9XXf/Mg4Aj664moUWKWk/ZoiEoa3fS4gyI
-U3lLI0Wpl9gNT3J89dwcansCYLHrppaXrp9ppEwnQe+gECcTLsGgytjJxS9vq5Qo
-HWJ2rutN+DemwFxa01O3ukfKoIRYNyWNajx2Ey8kS2kfoycp9Jgx
-
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ipm.cas.cz:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ipm.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.ipm.cas.cz/idp/profile/SAML2/Redirect/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ipm.cas.cz/idp/profile/SAML2/POST/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ipm.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.ipm.cas.cz/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ipm.cas.cz/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.ipm.cas.cz/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ipm.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">ipm.cas.cz</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDIzCCAgugAwIBAgIUHoc4WAOOS8FXFJOqANPx0dZofskwDQYJKoZIhvcNAQEF
-BQAwGTEXMBUGA1UEAxMOaWRwLmlwbS5jYXMuY3owHhcNMTQwMzMxMTEzNjMwWhcN
-MzQwMzMxMTEzNjMwWjAZMRcwFQYDVQQDEw5pZHAuaXBtLmNhcy5jejCCASIwDQYJ
-KoZIhvcNAQEBBQADggEPADCCAQoCggEBAKtVmqQC+tS6991zGEb00Rpy9QTbyaqb
-/ImfelKGHYprdU+8gF7WQSldgVncAMSY+z2agvh4ojTqcGnDcMFp4MqLrK2+e2jF
-+9rNCGnj3NZoklOJbXDw3YAbqRgpAEeGqv7nribQEN0lkvwQHvSlU05oXmpqe2m+
-qgdMPznUxESq9hymiGfnINn3YRb57fYArbp1FaUvJ+S5sSjcREsvxvzmCrUfAcBZ
-xwK3gqrVrirVPAMFklKNLvIqHTOsnOqm+spc9OcdoyXDCGEpwOQ8868AY7Dat7SO
-gkrM0+zf1Ut9Fe/oRkMQ34Ozt07KsaV6P0rLXoT7elG5HoPAO8sWJRUCAwEAAaNj
-MGEwQAYDVR0RBDkwN4IOaWRwLmlwbS5jYXMuY3qGJWh0dHBzOi8vaWRwLmlwbS5j
-YXMuY3ovaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFNmaGF8aU8MkTc6UkiWbbnad
-065mMA0GCSqGSIb3DQEBBQUAA4IBAQBQE0fUf6bV/7fscYI7zqh2nFV8qKcjP0jd
-dAKy17PaVFSkCGHgTX39K3kuacWA4a1SZBfN39KmQ9sj1GDF7Zci0V+tS/tbckbv
-1ME/Z+MyQTQTodGorOTdDsJKKdHbIIOVPOvO9IhX77ej4gFRX5+POQVSqtA/1Syp
-3oTa1zV9s/UD+WifYFmlUlF50Kw1hE9XXf/Mg4Aj664moUWKWk/ZoiEoa3fS4gyI
-U3lLI0Wpl9gNT3J89dwcansCYLHrppaXrp9ppEwnQe+gECcTLsGgytjJxS9vq5Qo
-HWJ2rutN+DemwFxa01O3ukfKoIRYNyWNajx2Ey8kS2kfoycp9Jgx
-
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ipm.cas.cz:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ipm.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 Physics of Materials</OrganizationName>
-    <OrganizationName xml:lang="cs">Ústav fyziky materiálů Akademie věd České republiky</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Institute of Physics of Materials of the Academy of Sciences of the Czech Republic, v. v. i.</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="cs">Ústav fyziky materiálů Akademie věd České republiky, v.v.i.</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.ipm.cz/</OrganizationURL>
-    <OrganizationURL xml:lang="cs">http://www.ipm.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.ipm.cas.cz.xml b/swamid-interfederations-2.0/idp.ipm.cas.cz.xml
deleted file mode 100644
index fcebe74a..00000000
--- a/swamid-interfederations-2.0/idp.ipm.cas.cz.xml
+++ /dev/null
@@ -1,118 +0,0 @@
-<?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.ipm.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/" registrationInstant="2014-05-02T15:43:18Z">
-      <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>
-    <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://eduid.cz/uri/idp-group/avcr</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>
-      <shibmd:Scope regexp="false">ipm.cas.cz</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Institute of Physics of Materials of the AS CR</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="cs">Ústav fyziky materiálů AV ČR</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Identity Provider IPM AV CR employees.</mdui:Description>
-        <mdui:Description xml:lang="cs">Identity Provider pro zaměstnance ÚFM AV ČR</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.ipm.cz/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="cs">http://www.ipm.cz/</mdui:InformationURL>
-        <mdui:Logo height="44" width="74">https://jiftach.cas.cz/loga/logo-ipm-44.png</mdui:Logo>
-        <mdui:Logo height="411" width="960">https://jiftach.cas.cz/loga/logo-ipm-129.png</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDIzCCAgugAwIBAgIUHoc4WAOOS8FXFJOqANPx0dZofskwDQYJKoZIhvcNAQEF
-BQAwGTEXMBUGA1UEAxMOaWRwLmlwbS5jYXMuY3owHhcNMTQwMzMxMTEzNjMwWhcN
-MzQwMzMxMTEzNjMwWjAZMRcwFQYDVQQDEw5pZHAuaXBtLmNhcy5jejCCASIwDQYJ
-KoZIhvcNAQEBBQADggEPADCCAQoCggEBAKtVmqQC+tS6991zGEb00Rpy9QTbyaqb
-/ImfelKGHYprdU+8gF7WQSldgVncAMSY+z2agvh4ojTqcGnDcMFp4MqLrK2+e2jF
-+9rNCGnj3NZoklOJbXDw3YAbqRgpAEeGqv7nribQEN0lkvwQHvSlU05oXmpqe2m+
-qgdMPznUxESq9hymiGfnINn3YRb57fYArbp1FaUvJ+S5sSjcREsvxvzmCrUfAcBZ
-xwK3gqrVrirVPAMFklKNLvIqHTOsnOqm+spc9OcdoyXDCGEpwOQ8868AY7Dat7SO
-gkrM0+zf1Ut9Fe/oRkMQ34Ozt07KsaV6P0rLXoT7elG5HoPAO8sWJRUCAwEAAaNj
-MGEwQAYDVR0RBDkwN4IOaWRwLmlwbS5jYXMuY3qGJWh0dHBzOi8vaWRwLmlwbS5j
-YXMuY3ovaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFNmaGF8aU8MkTc6UkiWbbnad
-065mMA0GCSqGSIb3DQEBBQUAA4IBAQBQE0fUf6bV/7fscYI7zqh2nFV8qKcjP0jd
-dAKy17PaVFSkCGHgTX39K3kuacWA4a1SZBfN39KmQ9sj1GDF7Zci0V+tS/tbckbv
-1ME/Z+MyQTQTodGorOTdDsJKKdHbIIOVPOvO9IhX77ej4gFRX5+POQVSqtA/1Syp
-3oTa1zV9s/UD+WifYFmlUlF50Kw1hE9XXf/Mg4Aj664moUWKWk/ZoiEoa3fS4gyI
-U3lLI0Wpl9gNT3J89dwcansCYLHrppaXrp9ppEwnQe+gECcTLsGgytjJxS9vq5Qo
-HWJ2rutN+DemwFxa01O3ukfKoIRYNyWNajx2Ey8kS2kfoycp9Jgx
-
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ipm.cas.cz:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ipm.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.ipm.cas.cz/idp/profile/SAML2/Redirect/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ipm.cas.cz/idp/profile/SAML2/POST/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ipm.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.ipm.cas.cz/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ipm.cas.cz/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.ipm.cas.cz/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ipm.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">ipm.cas.cz</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDIzCCAgugAwIBAgIUHoc4WAOOS8FXFJOqANPx0dZofskwDQYJKoZIhvcNAQEF
-BQAwGTEXMBUGA1UEAxMOaWRwLmlwbS5jYXMuY3owHhcNMTQwMzMxMTEzNjMwWhcN
-MzQwMzMxMTEzNjMwWjAZMRcwFQYDVQQDEw5pZHAuaXBtLmNhcy5jejCCASIwDQYJ
-KoZIhvcNAQEBBQADggEPADCCAQoCggEBAKtVmqQC+tS6991zGEb00Rpy9QTbyaqb
-/ImfelKGHYprdU+8gF7WQSldgVncAMSY+z2agvh4ojTqcGnDcMFp4MqLrK2+e2jF
-+9rNCGnj3NZoklOJbXDw3YAbqRgpAEeGqv7nribQEN0lkvwQHvSlU05oXmpqe2m+
-qgdMPznUxESq9hymiGfnINn3YRb57fYArbp1FaUvJ+S5sSjcREsvxvzmCrUfAcBZ
-xwK3gqrVrirVPAMFklKNLvIqHTOsnOqm+spc9OcdoyXDCGEpwOQ8868AY7Dat7SO
-gkrM0+zf1Ut9Fe/oRkMQ34Ozt07KsaV6P0rLXoT7elG5HoPAO8sWJRUCAwEAAaNj
-MGEwQAYDVR0RBDkwN4IOaWRwLmlwbS5jYXMuY3qGJWh0dHBzOi8vaWRwLmlwbS5j
-YXMuY3ovaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFNmaGF8aU8MkTc6UkiWbbnad
-065mMA0GCSqGSIb3DQEBBQUAA4IBAQBQE0fUf6bV/7fscYI7zqh2nFV8qKcjP0jd
-dAKy17PaVFSkCGHgTX39K3kuacWA4a1SZBfN39KmQ9sj1GDF7Zci0V+tS/tbckbv
-1ME/Z+MyQTQTodGorOTdDsJKKdHbIIOVPOvO9IhX77ej4gFRX5+POQVSqtA/1Syp
-3oTa1zV9s/UD+WifYFmlUlF50Kw1hE9XXf/Mg4Aj664moUWKWk/ZoiEoa3fS4gyI
-U3lLI0Wpl9gNT3J89dwcansCYLHrppaXrp9ppEwnQe+gECcTLsGgytjJxS9vq5Qo
-HWJ2rutN+DemwFxa01O3ukfKoIRYNyWNajx2Ey8kS2kfoycp9Jgx
-
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ipm.cas.cz:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ipm.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 Physics of Materials</OrganizationName>
-    <OrganizationName xml:lang="cs">Ústav fyziky materiálů Akademie věd České republiky</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Institute of Physics of Materials of the Academy of Sciences of the Czech Republic, v. v. i.</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="cs">Ústav fyziky materiálů Akademie věd České republiky, v.v.i.</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.ipm.cz/</OrganizationURL>
-    <OrganizationURL xml:lang="cs">http://www.ipm.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.irstea.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.irstea.fr-idp-shibboleth.xml
deleted file mode 100644
index 2e2184d4..00000000
--- a/swamid-interfederations-2.0/idp.irstea.fr-idp-shibboleth.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.irstea.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2013-09-17T15:52:14Z">
-      <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">irstea.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">IRSTEA - Institut national de recherche en sciences et technologies pour l'environnement et l'agriculture</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDIDCCAgigAwIBAgIVAINKG8UKonnXc9QRha4KV5urgO0WMA0GCSqGSIb3DQEB
-BQUAMBgxFjAUBgNVBAMTDWlkcC5pcnN0ZWEuZnIwHhcNMTMwNDExMDkxMDE3WhcN
-MzMwNDExMDkxMDE3WjAYMRYwFAYDVQQDEw1pZHAuaXJzdGVhLmZyMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAjoVm6ET1G+LU/Bs+d24QZXmBDqxgmcmb
-j4TtylC1j9nsS6eo3hiiMewADQqRCeilde/NB2lO4WNtEwSopYDVN+qQBJXLeyIH
-nxMSDhjofcuYOLrvKEC68r5wksj4ASgdNZH26w682vmyCQK1BXM+BnDgK+8JVQYM
-fxaEhUZVqK+mKeFlKuIloGX8vqMYSR+9933ZaBgg6tRy7x1f8HXGKlJOHqfyonni
-NFLrODFiQ7iYzCO3Re+tMW7fGYT0vWBvI3ONlPWZOCcLD1T1+uVk6s4gyAm1loPS
-kUCQ4U8AyR7ai3BiQ2FJo9nL0M1dk4wa3ww/mq7M9z5A9YD32dS18QIDAQABo2Ew
-XzA+BgNVHREENzA1gg1pZHAuaXJzdGVhLmZyhiRodHRwczovL2lkcC5pcnN0ZWEu
-ZnIvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFMZx2MPfMr2fV2uFJRTLZdgetgkN
-MA0GCSqGSIb3DQEBBQUAA4IBAQAmUhJ+9NVBiJS/bTle1Kbq3FU2JgpaCiTMu/Hi
-M1tKHcXGleAryzUX/yHazsFYGtGQ0XyWWdbbkc0J194/6tDxHqm6nEblm2kdGEoc
-5owRFCbVwCaTMt7NflbYQJC1EPdsMycyEw39WMx/Pk9bEAxItQaogAA9y+V0n/Mp
-zs1YMK99JgGR3A7GKIoZGi5pOgWL10ugmSPEYG7wQZwcX+S9px4BGzxJ1sgMqxyU
-ekqCqNunsUWxdTSksZHzVPhHOoRpnOvy2B8CI6XDJo7D7iHhGki66kUsGuHMd/1I
-7CnuMGR/VZ7zf1lkTbIVv4J+xugV9IYQOb/hnoai7lHX658a
-					    </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://idp.irstea.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.irstea.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.irstea.fr/idp/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">IRSTEA - Institut national de recherche en sciences et technologies pour l'environnement et l'agriculture</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">IRSTEA - Institut national de recherche en sciences et technologies pour l'environnement et l'agriculture</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <EmailAddress>federation.contact@lists.irstea.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.irstea.fr.xml b/swamid-interfederations-2.0/idp.irstea.fr.xml
deleted file mode 100644
index 2e2184d4..00000000
--- a/swamid-interfederations-2.0/idp.irstea.fr.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.irstea.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2013-09-17T15:52:14Z">
-      <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">irstea.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">IRSTEA - Institut national de recherche en sciences et technologies pour l'environnement et l'agriculture</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDIDCCAgigAwIBAgIVAINKG8UKonnXc9QRha4KV5urgO0WMA0GCSqGSIb3DQEB
-BQUAMBgxFjAUBgNVBAMTDWlkcC5pcnN0ZWEuZnIwHhcNMTMwNDExMDkxMDE3WhcN
-MzMwNDExMDkxMDE3WjAYMRYwFAYDVQQDEw1pZHAuaXJzdGVhLmZyMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAjoVm6ET1G+LU/Bs+d24QZXmBDqxgmcmb
-j4TtylC1j9nsS6eo3hiiMewADQqRCeilde/NB2lO4WNtEwSopYDVN+qQBJXLeyIH
-nxMSDhjofcuYOLrvKEC68r5wksj4ASgdNZH26w682vmyCQK1BXM+BnDgK+8JVQYM
-fxaEhUZVqK+mKeFlKuIloGX8vqMYSR+9933ZaBgg6tRy7x1f8HXGKlJOHqfyonni
-NFLrODFiQ7iYzCO3Re+tMW7fGYT0vWBvI3ONlPWZOCcLD1T1+uVk6s4gyAm1loPS
-kUCQ4U8AyR7ai3BiQ2FJo9nL0M1dk4wa3ww/mq7M9z5A9YD32dS18QIDAQABo2Ew
-XzA+BgNVHREENzA1gg1pZHAuaXJzdGVhLmZyhiRodHRwczovL2lkcC5pcnN0ZWEu
-ZnIvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFMZx2MPfMr2fV2uFJRTLZdgetgkN
-MA0GCSqGSIb3DQEBBQUAA4IBAQAmUhJ+9NVBiJS/bTle1Kbq3FU2JgpaCiTMu/Hi
-M1tKHcXGleAryzUX/yHazsFYGtGQ0XyWWdbbkc0J194/6tDxHqm6nEblm2kdGEoc
-5owRFCbVwCaTMt7NflbYQJC1EPdsMycyEw39WMx/Pk9bEAxItQaogAA9y+V0n/Mp
-zs1YMK99JgGR3A7GKIoZGi5pOgWL10ugmSPEYG7wQZwcX+S9px4BGzxJ1sgMqxyU
-ekqCqNunsUWxdTSksZHzVPhHOoRpnOvy2B8CI6XDJo7D7iHhGki66kUsGuHMd/1I
-7CnuMGR/VZ7zf1lkTbIVv4J+xugV9IYQOb/hnoai7lHX658a
-					    </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://idp.irstea.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.irstea.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.irstea.fr/idp/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">IRSTEA - Institut national de recherche en sciences et technologies pour l'environnement et l'agriculture</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">IRSTEA - Institut national de recherche en sciences et technologies pour l'environnement et l'agriculture</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <EmailAddress>federation.contact@lists.irstea.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.isibrno.cas.cz-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.isibrno.cas.cz-idp-shibboleth.xml
deleted file mode 100644
index 38b3e537..00000000
--- a/swamid-interfederations-2.0/idp.isibrno.cas.cz-idp-shibboleth.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:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://idp.isibrno.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/" registrationInstant="2014-10-03T16:09:05Z">
-      <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>
-    <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://eduid.cz/uri/idp-group/avcr</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>
-      <shibmd:Scope regexp="false">isibrno.cas.cz</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Institute of Scientific Instruments of the ASCR</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="cs">Ústav přístrojové techniky AV ČR</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Identity Provider ISI ASCR employees.</mdui:Description>
-        <mdui:Description xml:lang="cs">Identity Provider pro zaměstnance ÚPT AV ČR</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.isibrno.cz/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="cs">http://www.isibrno.cz/</mdui:InformationURL>
-        <mdui:Logo height="44" width="54">https://jiftach.cas.cz/loga/logo-upt-44.png</mdui:Logo>
-        <mdui:Logo height="90" width="110">https://jiftach.cas.cz/loga/logo-upt-90.png</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDNDCCAhygAwIBAgIVAN6/dlQMJzTi2IACxc9aB2vEh51LMA0GCSqGSIb3DQEB
-BQUAMB0xGzAZBgNVBAMTEmlkcC5pc2licm5vLmNhcy5jejAeFw0xNDA2MTcxMTI0
-MjdaFw0zNDA2MTcxMTI0MjdaMB0xGzAZBgNVBAMTEmlkcC5pc2licm5vLmNhcy5j
-ejCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMRKrMNqsBK9lmn6mspW
-Ckqe4oN79quQnbIO8oALicbusGp8fNDB+TKoqWvSYnGm7PpMRAzEXEHUDuRGmu/i
-sO932HYgT03IAJ2Hod0QX6FmASRSFzFzA1XOBmvH7owojKb7RsmMgy41ZWpJr1TZ
-yUzYue5oY046L5LNrRA/gwFMFy03Xx5Dg1KR6Q6+iXK59hbJ68myITGRd4hLjEQ2
-EEztzKlgJbjIwuYR/nTLxzMm7eFmGovsuEw5P2m9+/33V1qegfkQ2hKSWjYTmYhO
-v6ebjThZirBV0+vj4tvz3EBPsBCmukeoJ1D8RG4MOnCCXC6Ez8pOg8G43W7hfMJP
-V2UCAwEAAaNrMGkwSAYDVR0RBEEwP4ISaWRwLmlzaWJybm8uY2FzLmN6hilodHRw
-czovL2lkcC5pc2licm5vLmNhcy5jei9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQU
-iklO2sw6SHSChxpzcIXV4qssHbQwDQYJKoZIhvcNAQEFBQADggEBALAS8YLsozYH
-OtqA0t3RtJGaBr5M5NOjxvNgofWyTY87UekbzSLoCeGopxPbF1SX4rt3Ys/FX296
-cQaWR7XpGj3Amyw5nLqKxh8jqWBHgzqujSZ+bHPgwvrPZl7FwOzCgr8utIQMGfxO
-vZBbs86W8wZILHNwmlMnZeWEvfrWOL4cJZPNwLp8PnacVszM5aXtr7xtP0lbjBEX
-XWVV2/B9cP9lAuouGum+k7CjvXJEL/Rtzl9lKJgumhwSuaNZkR1LqaNsWAxlWasg
-0LYAs3q2iyLbcWXFezedoHcpzyQzOA42LhjKoy1+OtSOv7BwwdvyxGBozM1WK8nf
-AsEuKAX9NA8=
-
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.isibrno.cas.cz:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.isibrno.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.isibrno.cas.cz/idp/profile/SAML2/Redirect/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.isibrno.cas.cz/idp/profile/SAML2/POST/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.isibrno.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.isibrno.cas.cz/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.isibrno.cas.cz/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.isibrno.cas.cz/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.isibrno.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">isibrno.cas.cz</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDNDCCAhygAwIBAgIVAN6/dlQMJzTi2IACxc9aB2vEh51LMA0GCSqGSIb3DQEB
-BQUAMB0xGzAZBgNVBAMTEmlkcC5pc2licm5vLmNhcy5jejAeFw0xNDA2MTcxMTI0
-MjdaFw0zNDA2MTcxMTI0MjdaMB0xGzAZBgNVBAMTEmlkcC5pc2licm5vLmNhcy5j
-ejCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMRKrMNqsBK9lmn6mspW
-Ckqe4oN79quQnbIO8oALicbusGp8fNDB+TKoqWvSYnGm7PpMRAzEXEHUDuRGmu/i
-sO932HYgT03IAJ2Hod0QX6FmASRSFzFzA1XOBmvH7owojKb7RsmMgy41ZWpJr1TZ
-yUzYue5oY046L5LNrRA/gwFMFy03Xx5Dg1KR6Q6+iXK59hbJ68myITGRd4hLjEQ2
-EEztzKlgJbjIwuYR/nTLxzMm7eFmGovsuEw5P2m9+/33V1qegfkQ2hKSWjYTmYhO
-v6ebjThZirBV0+vj4tvz3EBPsBCmukeoJ1D8RG4MOnCCXC6Ez8pOg8G43W7hfMJP
-V2UCAwEAAaNrMGkwSAYDVR0RBEEwP4ISaWRwLmlzaWJybm8uY2FzLmN6hilodHRw
-czovL2lkcC5pc2licm5vLmNhcy5jei9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQU
-iklO2sw6SHSChxpzcIXV4qssHbQwDQYJKoZIhvcNAQEFBQADggEBALAS8YLsozYH
-OtqA0t3RtJGaBr5M5NOjxvNgofWyTY87UekbzSLoCeGopxPbF1SX4rt3Ys/FX296
-cQaWR7XpGj3Amyw5nLqKxh8jqWBHgzqujSZ+bHPgwvrPZl7FwOzCgr8utIQMGfxO
-vZBbs86W8wZILHNwmlMnZeWEvfrWOL4cJZPNwLp8PnacVszM5aXtr7xtP0lbjBEX
-XWVV2/B9cP9lAuouGum+k7CjvXJEL/Rtzl9lKJgumhwSuaNZkR1LqaNsWAxlWasg
-0LYAs3q2iyLbcWXFezedoHcpzyQzOA42LhjKoy1+OtSOv7BwwdvyxGBozM1WK8nf
-AsEuKAX9NA8=
-
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.isibrno.cas.cz:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.isibrno.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 Scientific Instruments of the ASCR</OrganizationName>
-    <OrganizationName xml:lang="cs">Ústav přístrojové techniky AV ČR</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Institute of Scientific Instruments of the ASCR, v. v. i.</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="cs">Ústav přístrojové techniky AV ČR, v. v. i.</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.isibrno.cz/</OrganizationURL>
-    <OrganizationURL xml:lang="cs">http://www.isibrno.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.isibrno.cas.cz.xml b/swamid-interfederations-2.0/idp.isibrno.cas.cz.xml
deleted file mode 100644
index 38b3e537..00000000
--- a/swamid-interfederations-2.0/idp.isibrno.cas.cz.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:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://idp.isibrno.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/" registrationInstant="2014-10-03T16:09:05Z">
-      <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>
-    <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://eduid.cz/uri/idp-group/avcr</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>
-      <shibmd:Scope regexp="false">isibrno.cas.cz</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Institute of Scientific Instruments of the ASCR</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="cs">Ústav přístrojové techniky AV ČR</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Identity Provider ISI ASCR employees.</mdui:Description>
-        <mdui:Description xml:lang="cs">Identity Provider pro zaměstnance ÚPT AV ČR</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.isibrno.cz/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="cs">http://www.isibrno.cz/</mdui:InformationURL>
-        <mdui:Logo height="44" width="54">https://jiftach.cas.cz/loga/logo-upt-44.png</mdui:Logo>
-        <mdui:Logo height="90" width="110">https://jiftach.cas.cz/loga/logo-upt-90.png</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDNDCCAhygAwIBAgIVAN6/dlQMJzTi2IACxc9aB2vEh51LMA0GCSqGSIb3DQEB
-BQUAMB0xGzAZBgNVBAMTEmlkcC5pc2licm5vLmNhcy5jejAeFw0xNDA2MTcxMTI0
-MjdaFw0zNDA2MTcxMTI0MjdaMB0xGzAZBgNVBAMTEmlkcC5pc2licm5vLmNhcy5j
-ejCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMRKrMNqsBK9lmn6mspW
-Ckqe4oN79quQnbIO8oALicbusGp8fNDB+TKoqWvSYnGm7PpMRAzEXEHUDuRGmu/i
-sO932HYgT03IAJ2Hod0QX6FmASRSFzFzA1XOBmvH7owojKb7RsmMgy41ZWpJr1TZ
-yUzYue5oY046L5LNrRA/gwFMFy03Xx5Dg1KR6Q6+iXK59hbJ68myITGRd4hLjEQ2
-EEztzKlgJbjIwuYR/nTLxzMm7eFmGovsuEw5P2m9+/33V1qegfkQ2hKSWjYTmYhO
-v6ebjThZirBV0+vj4tvz3EBPsBCmukeoJ1D8RG4MOnCCXC6Ez8pOg8G43W7hfMJP
-V2UCAwEAAaNrMGkwSAYDVR0RBEEwP4ISaWRwLmlzaWJybm8uY2FzLmN6hilodHRw
-czovL2lkcC5pc2licm5vLmNhcy5jei9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQU
-iklO2sw6SHSChxpzcIXV4qssHbQwDQYJKoZIhvcNAQEFBQADggEBALAS8YLsozYH
-OtqA0t3RtJGaBr5M5NOjxvNgofWyTY87UekbzSLoCeGopxPbF1SX4rt3Ys/FX296
-cQaWR7XpGj3Amyw5nLqKxh8jqWBHgzqujSZ+bHPgwvrPZl7FwOzCgr8utIQMGfxO
-vZBbs86W8wZILHNwmlMnZeWEvfrWOL4cJZPNwLp8PnacVszM5aXtr7xtP0lbjBEX
-XWVV2/B9cP9lAuouGum+k7CjvXJEL/Rtzl9lKJgumhwSuaNZkR1LqaNsWAxlWasg
-0LYAs3q2iyLbcWXFezedoHcpzyQzOA42LhjKoy1+OtSOv7BwwdvyxGBozM1WK8nf
-AsEuKAX9NA8=
-
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.isibrno.cas.cz:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.isibrno.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.isibrno.cas.cz/idp/profile/SAML2/Redirect/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.isibrno.cas.cz/idp/profile/SAML2/POST/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.isibrno.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.isibrno.cas.cz/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.isibrno.cas.cz/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.isibrno.cas.cz/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.isibrno.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">isibrno.cas.cz</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDNDCCAhygAwIBAgIVAN6/dlQMJzTi2IACxc9aB2vEh51LMA0GCSqGSIb3DQEB
-BQUAMB0xGzAZBgNVBAMTEmlkcC5pc2licm5vLmNhcy5jejAeFw0xNDA2MTcxMTI0
-MjdaFw0zNDA2MTcxMTI0MjdaMB0xGzAZBgNVBAMTEmlkcC5pc2licm5vLmNhcy5j
-ejCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMRKrMNqsBK9lmn6mspW
-Ckqe4oN79quQnbIO8oALicbusGp8fNDB+TKoqWvSYnGm7PpMRAzEXEHUDuRGmu/i
-sO932HYgT03IAJ2Hod0QX6FmASRSFzFzA1XOBmvH7owojKb7RsmMgy41ZWpJr1TZ
-yUzYue5oY046L5LNrRA/gwFMFy03Xx5Dg1KR6Q6+iXK59hbJ68myITGRd4hLjEQ2
-EEztzKlgJbjIwuYR/nTLxzMm7eFmGovsuEw5P2m9+/33V1qegfkQ2hKSWjYTmYhO
-v6ebjThZirBV0+vj4tvz3EBPsBCmukeoJ1D8RG4MOnCCXC6Ez8pOg8G43W7hfMJP
-V2UCAwEAAaNrMGkwSAYDVR0RBEEwP4ISaWRwLmlzaWJybm8uY2FzLmN6hilodHRw
-czovL2lkcC5pc2licm5vLmNhcy5jei9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQU
-iklO2sw6SHSChxpzcIXV4qssHbQwDQYJKoZIhvcNAQEFBQADggEBALAS8YLsozYH
-OtqA0t3RtJGaBr5M5NOjxvNgofWyTY87UekbzSLoCeGopxPbF1SX4rt3Ys/FX296
-cQaWR7XpGj3Amyw5nLqKxh8jqWBHgzqujSZ+bHPgwvrPZl7FwOzCgr8utIQMGfxO
-vZBbs86W8wZILHNwmlMnZeWEvfrWOL4cJZPNwLp8PnacVszM5aXtr7xtP0lbjBEX
-XWVV2/B9cP9lAuouGum+k7CjvXJEL/Rtzl9lKJgumhwSuaNZkR1LqaNsWAxlWasg
-0LYAs3q2iyLbcWXFezedoHcpzyQzOA42LhjKoy1+OtSOv7BwwdvyxGBozM1WK8nf
-AsEuKAX9NA8=
-
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.isibrno.cas.cz:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.isibrno.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 Scientific Instruments of the ASCR</OrganizationName>
-    <OrganizationName xml:lang="cs">Ústav přístrojové techniky AV ČR</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Institute of Scientific Instruments of the ASCR, v. v. i.</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="cs">Ústav přístrojové techniky AV ČR, v. v. i.</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.isibrno.cz/</OrganizationURL>
-    <OrganizationURL xml:lang="cs">http://www.isibrno.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.it-tallaght.ie-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.it-tallaght.ie-idp-shibboleth.xml
deleted file mode 100644
index 59cc55c6..00000000
--- a/swamid-interfederations-2.0/idp.it-tallaght.ie-idp-shibboleth.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.it-tallaght.ie/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.heanet.ie" registrationInstant="2010-11-08T00:00:00Z"/>
-  </md:Extensions>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">it-tallaght.ie</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Institute of Technology Tallaght</mdui:DisplayName>
-        <mdui:InformationURL xml:lang="en">http://www.it-tallaght.ie/contactus</mdui:InformationURL>
-        <mdui:Logo height="100" width="152">https://edugate.heanet.ie/rr3/logos/itta.png</mdui:Logo>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:GeolocationHint>geo:53.2903000,-6.3631789</mdui:GeolocationHint>
-      </mdui:DiscoHints>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDMzCCAhugAwIBAgIUYPVjSYp7op9s7Ie2DtEL+5ZzoCIwDQYJKoZIhvcNAQEF
-BQAwHTEbMBkGA1UEAxMSaWRwLml0LXRhbGxhZ2h0LmllMB4XDTExMDcyODEyMTQz
-OVoXDTMxMDcyODEyMTQzOVowHTEbMBkGA1UEAxMSaWRwLml0LXRhbGxhZ2h0Lmll
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAmSmY3owkK4unuAmRmEZT
-EaRtCmksLa2Okjl9ulhhboHYNubqTfLt/12Jxd95Md9lUi7+KdyakU60kwgImj2w
-CBtFQAhP2MNXdvFB+wSbETyFfYacKdeyPRF6BONAnkn1QUZxmQQOGO0xjxjPccJm
-SPVknQW5xE6B7ZGuvQfnM3HxAE5tXCd5L2ZDBS6MkEX+KZnDmyhltlzJpvpeb23/
-j0sYHNPeBgIhByp7bTK6blVJO0UNMK+Ts9Fi118r7fJlP6VEGPFKPtyRnrACBamx
-NfRF2ncBOBfxla8mIx9XwNJkvaX2UMCrUrcN1WBoUTfKeQae55lTisaps7auln/5
-mwIDAQABo2swaTBIBgNVHREEQTA/ghJpZHAuaXQtdGFsbGFnaHQuaWWGKWh0dHBz
-Oi8vaWRwLml0LXRhbGxhZ2h0LmllL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBTo
-un8552N5PrTaJaM2AOMIuyJykTANBgkqhkiG9w0BAQUFAAOCAQEARXS+XY144D9N
-K1uz60zUXXF4Ij90+ljigGxOjcce0EMRI+Zqhfiq0mYGRr3z/yyir9/WDv8/U1bo
-ivvfNqimHVEl821GC1Jnjw3sLwCCvwBaq91Y2Pqfu13nv9dpGOVIxsCeNGGFM4mv
-MORRBvK+bkMmhm5rNZb1zEDkCkSKGgdQLzd4sQO7M/f46XJmqffhNjQ6FysjZYyO
-fvQkMgjKXKvMuOcowJFd2qlyR5s9mkU/vlsuG/8X03M/XC7fQ9g/Z5AZiBmT5UR7
-Tz1+RVaB+0GP8hZXw6p8CGDihXoX8rV0N4aSrnG/7oJOBsdL+liIEINf0MKqSHGH
-Bf7NsJw2jQ==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.it-tallaght.ie/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.it-tallaght.ie/idp/profile/SAML2/POST/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Institute of Technology Tallaght</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Institute of Technology Tallaght</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.it-tallaght.ie/contactus</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Martin</md:GivenName>
-    <md:SurName>McCarrick</md:SurName>
-    <md:EmailAddress>Martin.McCarrick@it-tallaght.ie</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Martin</md:GivenName>
-    <md:SurName>McCarrick</md:SurName>
-    <md:EmailAddress>Martin.McCarrick@it-tallaght.ie</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.it-tallaght.ie.xml b/swamid-interfederations-2.0/idp.it-tallaght.ie.xml
deleted file mode 100644
index 59cc55c6..00000000
--- a/swamid-interfederations-2.0/idp.it-tallaght.ie.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.it-tallaght.ie/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.heanet.ie" registrationInstant="2010-11-08T00:00:00Z"/>
-  </md:Extensions>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">it-tallaght.ie</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Institute of Technology Tallaght</mdui:DisplayName>
-        <mdui:InformationURL xml:lang="en">http://www.it-tallaght.ie/contactus</mdui:InformationURL>
-        <mdui:Logo height="100" width="152">https://edugate.heanet.ie/rr3/logos/itta.png</mdui:Logo>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:GeolocationHint>geo:53.2903000,-6.3631789</mdui:GeolocationHint>
-      </mdui:DiscoHints>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDMzCCAhugAwIBAgIUYPVjSYp7op9s7Ie2DtEL+5ZzoCIwDQYJKoZIhvcNAQEF
-BQAwHTEbMBkGA1UEAxMSaWRwLml0LXRhbGxhZ2h0LmllMB4XDTExMDcyODEyMTQz
-OVoXDTMxMDcyODEyMTQzOVowHTEbMBkGA1UEAxMSaWRwLml0LXRhbGxhZ2h0Lmll
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAmSmY3owkK4unuAmRmEZT
-EaRtCmksLa2Okjl9ulhhboHYNubqTfLt/12Jxd95Md9lUi7+KdyakU60kwgImj2w
-CBtFQAhP2MNXdvFB+wSbETyFfYacKdeyPRF6BONAnkn1QUZxmQQOGO0xjxjPccJm
-SPVknQW5xE6B7ZGuvQfnM3HxAE5tXCd5L2ZDBS6MkEX+KZnDmyhltlzJpvpeb23/
-j0sYHNPeBgIhByp7bTK6blVJO0UNMK+Ts9Fi118r7fJlP6VEGPFKPtyRnrACBamx
-NfRF2ncBOBfxla8mIx9XwNJkvaX2UMCrUrcN1WBoUTfKeQae55lTisaps7auln/5
-mwIDAQABo2swaTBIBgNVHREEQTA/ghJpZHAuaXQtdGFsbGFnaHQuaWWGKWh0dHBz
-Oi8vaWRwLml0LXRhbGxhZ2h0LmllL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBTo
-un8552N5PrTaJaM2AOMIuyJykTANBgkqhkiG9w0BAQUFAAOCAQEARXS+XY144D9N
-K1uz60zUXXF4Ij90+ljigGxOjcce0EMRI+Zqhfiq0mYGRr3z/yyir9/WDv8/U1bo
-ivvfNqimHVEl821GC1Jnjw3sLwCCvwBaq91Y2Pqfu13nv9dpGOVIxsCeNGGFM4mv
-MORRBvK+bkMmhm5rNZb1zEDkCkSKGgdQLzd4sQO7M/f46XJmqffhNjQ6FysjZYyO
-fvQkMgjKXKvMuOcowJFd2qlyR5s9mkU/vlsuG/8X03M/XC7fQ9g/Z5AZiBmT5UR7
-Tz1+RVaB+0GP8hZXw6p8CGDihXoX8rV0N4aSrnG/7oJOBsdL+liIEINf0MKqSHGH
-Bf7NsJw2jQ==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.it-tallaght.ie/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.it-tallaght.ie/idp/profile/SAML2/POST/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Institute of Technology Tallaght</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Institute of Technology Tallaght</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.it-tallaght.ie/contactus</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Martin</md:GivenName>
-    <md:SurName>McCarrick</md:SurName>
-    <md:EmailAddress>Martin.McCarrick@it-tallaght.ie</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Martin</md:GivenName>
-    <md:SurName>McCarrick</md:SurName>
-    <md:EmailAddress>Martin.McCarrick@it-tallaght.ie</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.it.gu.se-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.it.gu.se-idp-shibboleth.xml
deleted file mode 100644
index 55d4a223..00000000
--- a/swamid-interfederations-2.0/idp.it.gu.se-idp-shibboleth.xml
+++ /dev/null
@@ -1,117 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.it.gu.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">gu.se</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="sv">Göteborgs Universitet</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">University of Gothenburg</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Identity Provider för anställda och studenter vid Göteborgs universitet.</mdui:Description>
-        <mdui:Description xml:lang="en">The University of Gothenburg Identity Provider is used by employees and students at the university.</mdui:Description>
-        <mdui:Logo height="50" width="344" xml:lang="sv">https://www.gu.se/digitalAssets/1374/1374690_lo_gu_left.png</mdui:Logo>
-        <mdui:Logo height="50" width="376" xml:lang="en">https://www.gu.se/digitalAssets/1374/1374690_lo_gu_left.png</mdui:Logo>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DomainHint>gu.se</mdui:DomainHint>
-        <mdui:GeolocationHint>geo:57.6986,11.9712</mdui:GeolocationHint>
-      </mdui:DiscoHints>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDGzCCAgOgAwIBAgIUGLU4YqWFYHboh+F+iLNYkBw8XNAwDQYJKoZIhvcNAQEF
-BQAwFzEVMBMGA1UEAxMMaWRwLml0Lmd1LnNlMB4XDTA5MDgyNDExMzA1OFoXDTI5
-MDgyNDExMzA1OFowFzEVMBMGA1UEAxMMaWRwLml0Lmd1LnNlMIIBIjANBgkqhkiG
-9w0BAQEFAAOCAQ8AMIIBCgKCAQEApOVkzaHuTCe+7lf79UnQ5iQ/8OLbJpwOxPTF
-wEPIHbMMU/aCVnxoZnwNApblqvpP2uOsQvh8d0uDv2iVC5BMN0ff9M+9rN7D/gAo
-L+w8CmWiHRudKyZLu8Gu89SGxyQ59AVCbJzGaEE9h/CmMYHCj/ONJ8mtjG9uw6u+
-Vj+L8PHXsPHQsLvcl3/D7duIYH/xHRbPzXS0imux+r/OcSCR3aCPCx3uuAfVPxGS
-9Y/ifynV586V3szIM7O15SeXKenFMKjQhzA23ZPcHhDSxWnVGUDWFDRDNAXfD7BF
-KRBCaUlWZvczqsV3eGtW8XgOmuW/7yJT5REfrrSLOKprAK8yoQIDAQABo18wXTA8
-BgNVHREENTAzggxpZHAuaXQuZ3Uuc2WGI2h0dHBzOi8vaWRwLml0Lmd1LnNlL2lk
-cC9zaGliYm9sZXRoMB0GA1UdDgQWBBSpKDUl7ZRxhQ1/HRmVbFd+NbwxmzANBgkq
-hkiG9w0BAQUFAAOCAQEAXfaYlHQj4KRaJmMbWFV0XyNUlHNio8010vLv3t6WztlZ
-jZFL/hTQIFhmYEA04Davdk+1/1JvcRePSpg2VCxT/QwHyOR3eimmQ6FKXWls/zO/
-V01sJrlLdf/53pzXYsVSOf50UK+GtrSB3hhzrFmeaBALOysGqk2h2/UdYISXxa/e
-MyQ/aOI5u+0Wlq2RdIXF8MrtnwBTRhNXLcXYzz4fPsdjd4TmmJLQLXLmFLE/IA+/
-CP9nuvekzvPla7AXlXPwPvbUunwZIZkN3aHzMY/08FKIYRLb9VmqInKXw8tIBSqG
-MoX9SCDPBh2j39QZupTaPkylXDshurod7B2XtXdHPg==
-
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.it.gu.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.it.gu.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://idp.it.gu.se/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.it.gu.se/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.it.gu.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.it.gu.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">gu.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDGzCCAgOgAwIBAgIUGLU4YqWFYHboh+F+iLNYkBw8XNAwDQYJKoZIhvcNAQEF
-BQAwFzEVMBMGA1UEAxMMaWRwLml0Lmd1LnNlMB4XDTA5MDgyNDExMzA1OFoXDTI5
-MDgyNDExMzA1OFowFzEVMBMGA1UEAxMMaWRwLml0Lmd1LnNlMIIBIjANBgkqhkiG
-9w0BAQEFAAOCAQ8AMIIBCgKCAQEApOVkzaHuTCe+7lf79UnQ5iQ/8OLbJpwOxPTF
-wEPIHbMMU/aCVnxoZnwNApblqvpP2uOsQvh8d0uDv2iVC5BMN0ff9M+9rN7D/gAo
-L+w8CmWiHRudKyZLu8Gu89SGxyQ59AVCbJzGaEE9h/CmMYHCj/ONJ8mtjG9uw6u+
-Vj+L8PHXsPHQsLvcl3/D7duIYH/xHRbPzXS0imux+r/OcSCR3aCPCx3uuAfVPxGS
-9Y/ifynV586V3szIM7O15SeXKenFMKjQhzA23ZPcHhDSxWnVGUDWFDRDNAXfD7BF
-KRBCaUlWZvczqsV3eGtW8XgOmuW/7yJT5REfrrSLOKprAK8yoQIDAQABo18wXTA8
-BgNVHREENTAzggxpZHAuaXQuZ3Uuc2WGI2h0dHBzOi8vaWRwLml0Lmd1LnNlL2lk
-cC9zaGliYm9sZXRoMB0GA1UdDgQWBBSpKDUl7ZRxhQ1/HRmVbFd+NbwxmzANBgkq
-hkiG9w0BAQUFAAOCAQEAXfaYlHQj4KRaJmMbWFV0XyNUlHNio8010vLv3t6WztlZ
-jZFL/hTQIFhmYEA04Davdk+1/1JvcRePSpg2VCxT/QwHyOR3eimmQ6FKXWls/zO/
-V01sJrlLdf/53pzXYsVSOf50UK+GtrSB3hhzrFmeaBALOysGqk2h2/UdYISXxa/e
-MyQ/aOI5u+0Wlq2RdIXF8MrtnwBTRhNXLcXYzz4fPsdjd4TmmJLQLXLmFLE/IA+/
-CP9nuvekzvPla7AXlXPwPvbUunwZIZkN3aHzMY/08FKIYRLb9VmqInKXw8tIBSqG
-MoX9SCDPBh2j39QZupTaPkylXDshurod7B2XtXdHPg==
-
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.it.gu.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.it.gu.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">GU</OrganizationName>
-    <OrganizationDisplayName xml:lang="sv">Göteborgs Universitet</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">University of Gothenburg</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.gu.se</OrganizationURL>
-  </Organization>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
-    <Company>University of Gothenburg</Company>
-    <SurName>Lena Ström</SurName>
-    <EmailAddress>lena.strom@gu.se</EmailAddress>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
-    <Company>University of Gothenburg</Company>
-    <SurName>Pablo Millet</SurName>
-    <EmailAddress>pablo.millet@gu.se</EmailAddress>
-    <TelephoneNumber>+46707104070</TelephoneNumber>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
-    <Company>University of Gothenburg</Company>
-    <SurName>GU-Support</SurName>
-    <EmailAddress>support@gu.se</EmailAddress>
-    <TelephoneNumber>+46317862020</TelephoneNumber>
-  </ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.it.gu.se.xml b/swamid-interfederations-2.0/idp.it.gu.se.xml
deleted file mode 100644
index 55d4a223..00000000
--- a/swamid-interfederations-2.0/idp.it.gu.se.xml
+++ /dev/null
@@ -1,117 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.it.gu.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">gu.se</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="sv">Göteborgs Universitet</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">University of Gothenburg</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Identity Provider för anställda och studenter vid Göteborgs universitet.</mdui:Description>
-        <mdui:Description xml:lang="en">The University of Gothenburg Identity Provider is used by employees and students at the university.</mdui:Description>
-        <mdui:Logo height="50" width="344" xml:lang="sv">https://www.gu.se/digitalAssets/1374/1374690_lo_gu_left.png</mdui:Logo>
-        <mdui:Logo height="50" width="376" xml:lang="en">https://www.gu.se/digitalAssets/1374/1374690_lo_gu_left.png</mdui:Logo>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DomainHint>gu.se</mdui:DomainHint>
-        <mdui:GeolocationHint>geo:57.6986,11.9712</mdui:GeolocationHint>
-      </mdui:DiscoHints>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDGzCCAgOgAwIBAgIUGLU4YqWFYHboh+F+iLNYkBw8XNAwDQYJKoZIhvcNAQEF
-BQAwFzEVMBMGA1UEAxMMaWRwLml0Lmd1LnNlMB4XDTA5MDgyNDExMzA1OFoXDTI5
-MDgyNDExMzA1OFowFzEVMBMGA1UEAxMMaWRwLml0Lmd1LnNlMIIBIjANBgkqhkiG
-9w0BAQEFAAOCAQ8AMIIBCgKCAQEApOVkzaHuTCe+7lf79UnQ5iQ/8OLbJpwOxPTF
-wEPIHbMMU/aCVnxoZnwNApblqvpP2uOsQvh8d0uDv2iVC5BMN0ff9M+9rN7D/gAo
-L+w8CmWiHRudKyZLu8Gu89SGxyQ59AVCbJzGaEE9h/CmMYHCj/ONJ8mtjG9uw6u+
-Vj+L8PHXsPHQsLvcl3/D7duIYH/xHRbPzXS0imux+r/OcSCR3aCPCx3uuAfVPxGS
-9Y/ifynV586V3szIM7O15SeXKenFMKjQhzA23ZPcHhDSxWnVGUDWFDRDNAXfD7BF
-KRBCaUlWZvczqsV3eGtW8XgOmuW/7yJT5REfrrSLOKprAK8yoQIDAQABo18wXTA8
-BgNVHREENTAzggxpZHAuaXQuZ3Uuc2WGI2h0dHBzOi8vaWRwLml0Lmd1LnNlL2lk
-cC9zaGliYm9sZXRoMB0GA1UdDgQWBBSpKDUl7ZRxhQ1/HRmVbFd+NbwxmzANBgkq
-hkiG9w0BAQUFAAOCAQEAXfaYlHQj4KRaJmMbWFV0XyNUlHNio8010vLv3t6WztlZ
-jZFL/hTQIFhmYEA04Davdk+1/1JvcRePSpg2VCxT/QwHyOR3eimmQ6FKXWls/zO/
-V01sJrlLdf/53pzXYsVSOf50UK+GtrSB3hhzrFmeaBALOysGqk2h2/UdYISXxa/e
-MyQ/aOI5u+0Wlq2RdIXF8MrtnwBTRhNXLcXYzz4fPsdjd4TmmJLQLXLmFLE/IA+/
-CP9nuvekzvPla7AXlXPwPvbUunwZIZkN3aHzMY/08FKIYRLb9VmqInKXw8tIBSqG
-MoX9SCDPBh2j39QZupTaPkylXDshurod7B2XtXdHPg==
-
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.it.gu.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.it.gu.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://idp.it.gu.se/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.it.gu.se/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.it.gu.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.it.gu.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">gu.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDGzCCAgOgAwIBAgIUGLU4YqWFYHboh+F+iLNYkBw8XNAwDQYJKoZIhvcNAQEF
-BQAwFzEVMBMGA1UEAxMMaWRwLml0Lmd1LnNlMB4XDTA5MDgyNDExMzA1OFoXDTI5
-MDgyNDExMzA1OFowFzEVMBMGA1UEAxMMaWRwLml0Lmd1LnNlMIIBIjANBgkqhkiG
-9w0BAQEFAAOCAQ8AMIIBCgKCAQEApOVkzaHuTCe+7lf79UnQ5iQ/8OLbJpwOxPTF
-wEPIHbMMU/aCVnxoZnwNApblqvpP2uOsQvh8d0uDv2iVC5BMN0ff9M+9rN7D/gAo
-L+w8CmWiHRudKyZLu8Gu89SGxyQ59AVCbJzGaEE9h/CmMYHCj/ONJ8mtjG9uw6u+
-Vj+L8PHXsPHQsLvcl3/D7duIYH/xHRbPzXS0imux+r/OcSCR3aCPCx3uuAfVPxGS
-9Y/ifynV586V3szIM7O15SeXKenFMKjQhzA23ZPcHhDSxWnVGUDWFDRDNAXfD7BF
-KRBCaUlWZvczqsV3eGtW8XgOmuW/7yJT5REfrrSLOKprAK8yoQIDAQABo18wXTA8
-BgNVHREENTAzggxpZHAuaXQuZ3Uuc2WGI2h0dHBzOi8vaWRwLml0Lmd1LnNlL2lk
-cC9zaGliYm9sZXRoMB0GA1UdDgQWBBSpKDUl7ZRxhQ1/HRmVbFd+NbwxmzANBgkq
-hkiG9w0BAQUFAAOCAQEAXfaYlHQj4KRaJmMbWFV0XyNUlHNio8010vLv3t6WztlZ
-jZFL/hTQIFhmYEA04Davdk+1/1JvcRePSpg2VCxT/QwHyOR3eimmQ6FKXWls/zO/
-V01sJrlLdf/53pzXYsVSOf50UK+GtrSB3hhzrFmeaBALOysGqk2h2/UdYISXxa/e
-MyQ/aOI5u+0Wlq2RdIXF8MrtnwBTRhNXLcXYzz4fPsdjd4TmmJLQLXLmFLE/IA+/
-CP9nuvekzvPla7AXlXPwPvbUunwZIZkN3aHzMY/08FKIYRLb9VmqInKXw8tIBSqG
-MoX9SCDPBh2j39QZupTaPkylXDshurod7B2XtXdHPg==
-
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.it.gu.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.it.gu.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">GU</OrganizationName>
-    <OrganizationDisplayName xml:lang="sv">Göteborgs Universitet</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">University of Gothenburg</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.gu.se</OrganizationURL>
-  </Organization>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
-    <Company>University of Gothenburg</Company>
-    <SurName>Lena Ström</SurName>
-    <EmailAddress>lena.strom@gu.se</EmailAddress>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
-    <Company>University of Gothenburg</Company>
-    <SurName>Pablo Millet</SurName>
-    <EmailAddress>pablo.millet@gu.se</EmailAddress>
-    <TelephoneNumber>+46707104070</TelephoneNumber>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
-    <Company>University of Gothenburg</Company>
-    <SurName>GU-Support</SurName>
-    <EmailAddress>support@gu.se</EmailAddress>
-    <TelephoneNumber>+46317862020</TelephoneNumber>
-  </ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.it.su.se-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.it.su.se-idp-shibboleth.xml
deleted file mode 100644
index d567ea44..00000000
--- a/swamid-interfederations-2.0/idp.it.su.se-idp-shibboleth.xml
+++ /dev/null
@@ -1,114 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.it.su.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">su.se</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="sv">Stockholms universitet</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Stockholm University</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Identity Provider för medarbetare och studenter vid Stockholms universitet.</mdui:Description>
-        <mdui:Description xml:lang="en">The Stockholm university Identity Provider is used by employees and students at the university.</mdui:Description>
-        <mdui:InformationURL xml:lang="sv">http://www.su.se</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">http://www.su.se/english/</mdui:InformationURL>
-        <mdui:Logo height="110" width="127" xml:lang="sv">https://idp.it.su.se/idp/img/su-logo-sv_OLD.gif</mdui:Logo>
-        <mdui:Logo height="110" width="127" xml:lang="en">https://idp.it.su.se/idp/img/su-logo-en_OLD.gif</mdui:Logo>
-        <mdui:PrivacyStatementURL xml:lang="sv">http://www.su.se/regelboken/bok-3/teknik</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="en">http://www.su.se/rules/book-3/3-3-technics</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DomainHint>su.se</mdui:DomainHint>
-        <mdui:GeolocationHint>geo:59.3625,18.0586</mdui:GeolocationHint>
-      </mdui:DiscoHints>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIIC6zCCAdOgAwIBAgIJAMGFkfoHjxyVMA0GCSqGSIb3DQEBBQUAMBcxFTATBgNV
-BAMTDGlkcC5pdC5zdS5zZTAeFw0xMDExMDkwODIyMDFaFw0yMDExMDYwODIyMDFa
-MBcxFTATBgNVBAMTDGlkcC5pdC5zdS5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEP
-ADCCAQoCggEBALy4tcsCvWZi8mo07/AwkbbokGh9VLf9Nae6t8AXX+ul9AOfW6nT
-OJS4UsSafJ/fLhNJTjtMr1lXyl2Ah2zhhrhCsFpe0T7iYaX+rKlcZ8/V/BkgVbKm
-5obDh/CGW32dPGS6quDSTw2876X5sOl72IE4h038Z6t9XJCdQwDK9YNPgb5Zu+XH
-PHLJZD/kx+VwAPfx34YoKCpB2C/3U2Nj+KsojMtRcNTLeb+PJ5t0B9vEsGOcOlko
-7VT9EjEuSkyxRPEmssaekotHDlkKB9R3d/LS/OvWdHd4UjgQGJO8YIebTjIYQDk+
-HPs9HhL4mJBUqTYK7aKE/gelBwEKgm9myzkCAwEAAaM6MDgwFwYDVR0RBBAwDoIM
-aWRwLml0LnN1LnNlMB0GA1UdDgQWBBQ3SkZT5Th4yF7H6i2+x0beJnXTEzANBgkq
-hkiG9w0BAQUFAAOCAQEAiatjbM0+PvK1enL0CCoVHoPSBwT45eq5e4YGVabqX2Vt
-kuuZpg3O/POnPI4VUENEPZqrsRQJwjvfVlptgU/0C1IdBdKZbQPdci2kTcNHPtj9
-+AjFPs8D/rRAHufDCO/yUV7v6rDaLwVDlGA+Tof/2OISRubHA+qzWtsmkCij8epu
-zu+8YH3ao8Z9KwXE7lsiugc3fBzFPRLVt3i1Ub9CyHbSNt8zIeoQjdFXnRSFt1aF
-nqSwQqyaQMsQOyHiGNfFl0bcvK3if21MSob/uUwXHgE9wn6wD7fHHp8Ek8Pa7F1Y
-VK8ZglMA+M28yzdAONQ4W2FWoTbAfcBnW8NQSFzZdQ==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.it.su.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.it.su.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://idp.it.su.se/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.it.su.se/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.it.su.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.it.su.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">su.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIIC6zCCAdOgAwIBAgIJAMGFkfoHjxyVMA0GCSqGSIb3DQEBBQUAMBcxFTATBgNV
-BAMTDGlkcC5pdC5zdS5zZTAeFw0xMDExMDkwODIyMDFaFw0yMDExMDYwODIyMDFa
-MBcxFTATBgNVBAMTDGlkcC5pdC5zdS5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEP
-ADCCAQoCggEBALy4tcsCvWZi8mo07/AwkbbokGh9VLf9Nae6t8AXX+ul9AOfW6nT
-OJS4UsSafJ/fLhNJTjtMr1lXyl2Ah2zhhrhCsFpe0T7iYaX+rKlcZ8/V/BkgVbKm
-5obDh/CGW32dPGS6quDSTw2876X5sOl72IE4h038Z6t9XJCdQwDK9YNPgb5Zu+XH
-PHLJZD/kx+VwAPfx34YoKCpB2C/3U2Nj+KsojMtRcNTLeb+PJ5t0B9vEsGOcOlko
-7VT9EjEuSkyxRPEmssaekotHDlkKB9R3d/LS/OvWdHd4UjgQGJO8YIebTjIYQDk+
-HPs9HhL4mJBUqTYK7aKE/gelBwEKgm9myzkCAwEAAaM6MDgwFwYDVR0RBBAwDoIM
-aWRwLml0LnN1LnNlMB0GA1UdDgQWBBQ3SkZT5Th4yF7H6i2+x0beJnXTEzANBgkq
-hkiG9w0BAQUFAAOCAQEAiatjbM0+PvK1enL0CCoVHoPSBwT45eq5e4YGVabqX2Vt
-kuuZpg3O/POnPI4VUENEPZqrsRQJwjvfVlptgU/0C1IdBdKZbQPdci2kTcNHPtj9
-+AjFPs8D/rRAHufDCO/yUV7v6rDaLwVDlGA+Tof/2OISRubHA+qzWtsmkCij8epu
-zu+8YH3ao8Z9KwXE7lsiugc3fBzFPRLVt3i1Ub9CyHbSNt8zIeoQjdFXnRSFt1aF
-nqSwQqyaQMsQOyHiGNfFl0bcvK3if21MSob/uUwXHgE9wn6wD7fHHp8Ek8Pa7F1Y
-VK8ZglMA+M28yzdAONQ4W2FWoTbAfcBnW8NQSFzZdQ==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.it.su.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.it.su.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">SU</OrganizationName>
-    <OrganizationDisplayName xml:lang="sv">Stockholms Universitet</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">Stockholm University</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.su.se</OrganizationURL>
-  </Organization>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
-    <Company>Stockholm University</Company>
-    <SurName>Helpdesk</SurName>
-    <EmailAddress>helpdesk@su.se</EmailAddress>
-    <TelephoneNumber>+46 8 16 1999</TelephoneNumber>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
-    <Company>Stockholm University</Company>
-    <SurName>Helpdesk</SurName>
-    <EmailAddress>helpdesk@su.se</EmailAddress>
-    <TelephoneNumber>+46 8 16 1999</TelephoneNumber>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
-    <Company>Stockholm University</Company>
-    <SurName>Helpdesk</SurName>
-    <EmailAddress>helpdesk@su.se</EmailAddress>
-    <TelephoneNumber>+46 8 16 1999</TelephoneNumber>
-  </ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.it.su.se.xml b/swamid-interfederations-2.0/idp.it.su.se.xml
deleted file mode 100644
index d567ea44..00000000
--- a/swamid-interfederations-2.0/idp.it.su.se.xml
+++ /dev/null
@@ -1,114 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.it.su.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">su.se</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="sv">Stockholms universitet</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Stockholm University</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Identity Provider för medarbetare och studenter vid Stockholms universitet.</mdui:Description>
-        <mdui:Description xml:lang="en">The Stockholm university Identity Provider is used by employees and students at the university.</mdui:Description>
-        <mdui:InformationURL xml:lang="sv">http://www.su.se</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">http://www.su.se/english/</mdui:InformationURL>
-        <mdui:Logo height="110" width="127" xml:lang="sv">https://idp.it.su.se/idp/img/su-logo-sv_OLD.gif</mdui:Logo>
-        <mdui:Logo height="110" width="127" xml:lang="en">https://idp.it.su.se/idp/img/su-logo-en_OLD.gif</mdui:Logo>
-        <mdui:PrivacyStatementURL xml:lang="sv">http://www.su.se/regelboken/bok-3/teknik</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="en">http://www.su.se/rules/book-3/3-3-technics</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DomainHint>su.se</mdui:DomainHint>
-        <mdui:GeolocationHint>geo:59.3625,18.0586</mdui:GeolocationHint>
-      </mdui:DiscoHints>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIIC6zCCAdOgAwIBAgIJAMGFkfoHjxyVMA0GCSqGSIb3DQEBBQUAMBcxFTATBgNV
-BAMTDGlkcC5pdC5zdS5zZTAeFw0xMDExMDkwODIyMDFaFw0yMDExMDYwODIyMDFa
-MBcxFTATBgNVBAMTDGlkcC5pdC5zdS5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEP
-ADCCAQoCggEBALy4tcsCvWZi8mo07/AwkbbokGh9VLf9Nae6t8AXX+ul9AOfW6nT
-OJS4UsSafJ/fLhNJTjtMr1lXyl2Ah2zhhrhCsFpe0T7iYaX+rKlcZ8/V/BkgVbKm
-5obDh/CGW32dPGS6quDSTw2876X5sOl72IE4h038Z6t9XJCdQwDK9YNPgb5Zu+XH
-PHLJZD/kx+VwAPfx34YoKCpB2C/3U2Nj+KsojMtRcNTLeb+PJ5t0B9vEsGOcOlko
-7VT9EjEuSkyxRPEmssaekotHDlkKB9R3d/LS/OvWdHd4UjgQGJO8YIebTjIYQDk+
-HPs9HhL4mJBUqTYK7aKE/gelBwEKgm9myzkCAwEAAaM6MDgwFwYDVR0RBBAwDoIM
-aWRwLml0LnN1LnNlMB0GA1UdDgQWBBQ3SkZT5Th4yF7H6i2+x0beJnXTEzANBgkq
-hkiG9w0BAQUFAAOCAQEAiatjbM0+PvK1enL0CCoVHoPSBwT45eq5e4YGVabqX2Vt
-kuuZpg3O/POnPI4VUENEPZqrsRQJwjvfVlptgU/0C1IdBdKZbQPdci2kTcNHPtj9
-+AjFPs8D/rRAHufDCO/yUV7v6rDaLwVDlGA+Tof/2OISRubHA+qzWtsmkCij8epu
-zu+8YH3ao8Z9KwXE7lsiugc3fBzFPRLVt3i1Ub9CyHbSNt8zIeoQjdFXnRSFt1aF
-nqSwQqyaQMsQOyHiGNfFl0bcvK3if21MSob/uUwXHgE9wn6wD7fHHp8Ek8Pa7F1Y
-VK8ZglMA+M28yzdAONQ4W2FWoTbAfcBnW8NQSFzZdQ==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.it.su.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.it.su.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://idp.it.su.se/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.it.su.se/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.it.su.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.it.su.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">su.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIIC6zCCAdOgAwIBAgIJAMGFkfoHjxyVMA0GCSqGSIb3DQEBBQUAMBcxFTATBgNV
-BAMTDGlkcC5pdC5zdS5zZTAeFw0xMDExMDkwODIyMDFaFw0yMDExMDYwODIyMDFa
-MBcxFTATBgNVBAMTDGlkcC5pdC5zdS5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEP
-ADCCAQoCggEBALy4tcsCvWZi8mo07/AwkbbokGh9VLf9Nae6t8AXX+ul9AOfW6nT
-OJS4UsSafJ/fLhNJTjtMr1lXyl2Ah2zhhrhCsFpe0T7iYaX+rKlcZ8/V/BkgVbKm
-5obDh/CGW32dPGS6quDSTw2876X5sOl72IE4h038Z6t9XJCdQwDK9YNPgb5Zu+XH
-PHLJZD/kx+VwAPfx34YoKCpB2C/3U2Nj+KsojMtRcNTLeb+PJ5t0B9vEsGOcOlko
-7VT9EjEuSkyxRPEmssaekotHDlkKB9R3d/LS/OvWdHd4UjgQGJO8YIebTjIYQDk+
-HPs9HhL4mJBUqTYK7aKE/gelBwEKgm9myzkCAwEAAaM6MDgwFwYDVR0RBBAwDoIM
-aWRwLml0LnN1LnNlMB0GA1UdDgQWBBQ3SkZT5Th4yF7H6i2+x0beJnXTEzANBgkq
-hkiG9w0BAQUFAAOCAQEAiatjbM0+PvK1enL0CCoVHoPSBwT45eq5e4YGVabqX2Vt
-kuuZpg3O/POnPI4VUENEPZqrsRQJwjvfVlptgU/0C1IdBdKZbQPdci2kTcNHPtj9
-+AjFPs8D/rRAHufDCO/yUV7v6rDaLwVDlGA+Tof/2OISRubHA+qzWtsmkCij8epu
-zu+8YH3ao8Z9KwXE7lsiugc3fBzFPRLVt3i1Ub9CyHbSNt8zIeoQjdFXnRSFt1aF
-nqSwQqyaQMsQOyHiGNfFl0bcvK3if21MSob/uUwXHgE9wn6wD7fHHp8Ek8Pa7F1Y
-VK8ZglMA+M28yzdAONQ4W2FWoTbAfcBnW8NQSFzZdQ==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.it.su.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.it.su.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">SU</OrganizationName>
-    <OrganizationDisplayName xml:lang="sv">Stockholms Universitet</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">Stockholm University</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.su.se</OrganizationURL>
-  </Organization>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
-    <Company>Stockholm University</Company>
-    <SurName>Helpdesk</SurName>
-    <EmailAddress>helpdesk@su.se</EmailAddress>
-    <TelephoneNumber>+46 8 16 1999</TelephoneNumber>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
-    <Company>Stockholm University</Company>
-    <SurName>Helpdesk</SurName>
-    <EmailAddress>helpdesk@su.se</EmailAddress>
-    <TelephoneNumber>+46 8 16 1999</TelephoneNumber>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
-    <Company>Stockholm University</Company>
-    <SurName>Helpdesk</SurName>
-    <EmailAddress>helpdesk@su.se</EmailAddress>
-    <TelephoneNumber>+46 8 16 1999</TelephoneNumber>
-  </ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.itam.cas.cz-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.itam.cas.cz-idp-shibboleth.xml
deleted file mode 100644
index a509d98b..00000000
--- a/swamid-interfederations-2.0/idp.itam.cas.cz-idp-shibboleth.xml
+++ /dev/null
@@ -1,118 +0,0 @@
-<?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.itam.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/" registrationInstant="2014-10-24T16:47:06Z">
-      <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>
-    <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://eduid.cz/uri/idp-group/avcr</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>
-      <shibmd:Scope regexp="false">itam.cas.cz</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Institute of Theoretical and Applied Mechanics AS CR</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="cs">Ústav teoretické a aplikované mechaniky AV ČR</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Identity Provider ITAM AS CR employees.</mdui:Description>
-        <mdui:Description xml:lang="cs">Identity Provider pro zaměstnance ÚTAM AV ČR</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.itam.cas.cz/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="cs">http://www.itam.cas.cz/</mdui:InformationURL>
-        <mdui:Logo height="44" width="42">https://jiftach.cas.cz/loga/logo-itam-44.png</mdui:Logo>
-        <mdui:Logo height="1095" width="1044">https://jiftach.cas.cz/loga/logo-itam-1095.png</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDJzCCAg+gAwIBAgIUEsBKg0xdOetjiFaXL+mfQFs6ERcwDQYJKoZIhvcNAQEF
-BQAwGjEYMBYGA1UEAxMPaWRwLml0YW0uY2FzLmN6MB4XDTE0MTAyMjA3MDMxOFoX
-DTM0MTAyMjA3MDMxOFowGjEYMBYGA1UEAxMPaWRwLml0YW0uY2FzLmN6MIIBIjAN
-BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxAvwUCh/S8mxj1tvJq+Q+wssQ91g
-V83jKtGHeZnM+ADZ2iFNglHPE+BBBYb1bj9pqsP2BRwWIPWHeJ8bz1sLVeC90t23
-xLOudYs1ACIskNK7gvcKF1QBGGopHlUXmAgxibLTT+4+ZcBbzOdCMakBlxQd4wr5
-gSB35AD8SR7Qe5t3PoE5SQ3PK224l6DALOW9YdZ5bI0VfUJAqQjiDp9/hfmBXaod
-Kzx2N+G12Jyay7VTnq7HCqUCwkWmMk2ZPmRUFwJ5abxOQtO3ClfDRoGHgVQSlR9O
-Lwe0Ee3wFxvcCvGlTFdJ6WHgV5mhIB4PHxGyHADIW1BGG3Vd8WgX3w/2oQIDAQAB
-o2UwYzBCBgNVHREEOzA5gg9pZHAuaXRhbS5jYXMuY3qGJmh0dHBzOi8vaWRwLml0
-YW0uY2FzLmN6L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBQ34hoPcWC9wTBNpEun
-P6HH6dsWFDANBgkqhkiG9w0BAQUFAAOCAQEAJ0emvpLRJ3uJgfwgdXNI56Gi7zw/
-VtqXMmeuioY4Hqn3il10yOxvyM9FJCbgsGmCSpyUiIQzvMbZhJXjG/XSM17G3OdB
-t0gXjqSZ8XUzQ76xxGi4pBVlqTr50XpC6tlbOxZ8GflFX5DCGNTOSW/QKZUjnqB/
-ttna9+UdDjmShQa2JBMmJ+mRM6m8RFEy2WQZplChLZkoZqLIWD48YY3GjGtOQ6FP
-2qO9lehSxJNgnAqM7raKBHwJIsZqYuTMaDU1Xm7JVg0eD9ht2Lvzmax69VjL1soY
-G0bWc5sh8gUEJyktAyE0P2pKMYNPDEfIv8LruQtOG9uU2F62xtvp+hJoyg==
-
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.itam.cas.cz:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.itam.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.itam.cas.cz/idp/profile/SAML2/Redirect/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.itam.cas.cz/idp/profile/SAML2/POST/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.itam.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.itam.cas.cz/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.itam.cas.cz/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.itam.cas.cz/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.itam.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">itam.cas.cz</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDJzCCAg+gAwIBAgIUEsBKg0xdOetjiFaXL+mfQFs6ERcwDQYJKoZIhvcNAQEF
-BQAwGjEYMBYGA1UEAxMPaWRwLml0YW0uY2FzLmN6MB4XDTE0MTAyMjA3MDMxOFoX
-DTM0MTAyMjA3MDMxOFowGjEYMBYGA1UEAxMPaWRwLml0YW0uY2FzLmN6MIIBIjAN
-BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxAvwUCh/S8mxj1tvJq+Q+wssQ91g
-V83jKtGHeZnM+ADZ2iFNglHPE+BBBYb1bj9pqsP2BRwWIPWHeJ8bz1sLVeC90t23
-xLOudYs1ACIskNK7gvcKF1QBGGopHlUXmAgxibLTT+4+ZcBbzOdCMakBlxQd4wr5
-gSB35AD8SR7Qe5t3PoE5SQ3PK224l6DALOW9YdZ5bI0VfUJAqQjiDp9/hfmBXaod
-Kzx2N+G12Jyay7VTnq7HCqUCwkWmMk2ZPmRUFwJ5abxOQtO3ClfDRoGHgVQSlR9O
-Lwe0Ee3wFxvcCvGlTFdJ6WHgV5mhIB4PHxGyHADIW1BGG3Vd8WgX3w/2oQIDAQAB
-o2UwYzBCBgNVHREEOzA5gg9pZHAuaXRhbS5jYXMuY3qGJmh0dHBzOi8vaWRwLml0
-YW0uY2FzLmN6L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBQ34hoPcWC9wTBNpEun
-P6HH6dsWFDANBgkqhkiG9w0BAQUFAAOCAQEAJ0emvpLRJ3uJgfwgdXNI56Gi7zw/
-VtqXMmeuioY4Hqn3il10yOxvyM9FJCbgsGmCSpyUiIQzvMbZhJXjG/XSM17G3OdB
-t0gXjqSZ8XUzQ76xxGi4pBVlqTr50XpC6tlbOxZ8GflFX5DCGNTOSW/QKZUjnqB/
-ttna9+UdDjmShQa2JBMmJ+mRM6m8RFEy2WQZplChLZkoZqLIWD48YY3GjGtOQ6FP
-2qO9lehSxJNgnAqM7raKBHwJIsZqYuTMaDU1Xm7JVg0eD9ht2Lvzmax69VjL1soY
-G0bWc5sh8gUEJyktAyE0P2pKMYNPDEfIv8LruQtOG9uU2F62xtvp+hJoyg==
-
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.itam.cas.cz:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.itam.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 Theoretical and Applied Mechanics AS CR</OrganizationName>
-    <OrganizationName xml:lang="cs">Ústav teoretické a aplikované mechaniky AV ČR</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Institute of Theoretical and Applied Mechanics AS CR, v.v.i.</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="cs">Ústav teoretické a aplikované mechaniky AV ČR, v.v.i.</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.itam.cas.cz/</OrganizationURL>
-    <OrganizationURL xml:lang="cs">http://www.itam.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.itam.cas.cz.xml b/swamid-interfederations-2.0/idp.itam.cas.cz.xml
deleted file mode 100644
index a509d98b..00000000
--- a/swamid-interfederations-2.0/idp.itam.cas.cz.xml
+++ /dev/null
@@ -1,118 +0,0 @@
-<?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.itam.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/" registrationInstant="2014-10-24T16:47:06Z">
-      <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>
-    <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://eduid.cz/uri/idp-group/avcr</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>
-      <shibmd:Scope regexp="false">itam.cas.cz</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Institute of Theoretical and Applied Mechanics AS CR</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="cs">Ústav teoretické a aplikované mechaniky AV ČR</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Identity Provider ITAM AS CR employees.</mdui:Description>
-        <mdui:Description xml:lang="cs">Identity Provider pro zaměstnance ÚTAM AV ČR</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.itam.cas.cz/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="cs">http://www.itam.cas.cz/</mdui:InformationURL>
-        <mdui:Logo height="44" width="42">https://jiftach.cas.cz/loga/logo-itam-44.png</mdui:Logo>
-        <mdui:Logo height="1095" width="1044">https://jiftach.cas.cz/loga/logo-itam-1095.png</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDJzCCAg+gAwIBAgIUEsBKg0xdOetjiFaXL+mfQFs6ERcwDQYJKoZIhvcNAQEF
-BQAwGjEYMBYGA1UEAxMPaWRwLml0YW0uY2FzLmN6MB4XDTE0MTAyMjA3MDMxOFoX
-DTM0MTAyMjA3MDMxOFowGjEYMBYGA1UEAxMPaWRwLml0YW0uY2FzLmN6MIIBIjAN
-BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxAvwUCh/S8mxj1tvJq+Q+wssQ91g
-V83jKtGHeZnM+ADZ2iFNglHPE+BBBYb1bj9pqsP2BRwWIPWHeJ8bz1sLVeC90t23
-xLOudYs1ACIskNK7gvcKF1QBGGopHlUXmAgxibLTT+4+ZcBbzOdCMakBlxQd4wr5
-gSB35AD8SR7Qe5t3PoE5SQ3PK224l6DALOW9YdZ5bI0VfUJAqQjiDp9/hfmBXaod
-Kzx2N+G12Jyay7VTnq7HCqUCwkWmMk2ZPmRUFwJ5abxOQtO3ClfDRoGHgVQSlR9O
-Lwe0Ee3wFxvcCvGlTFdJ6WHgV5mhIB4PHxGyHADIW1BGG3Vd8WgX3w/2oQIDAQAB
-o2UwYzBCBgNVHREEOzA5gg9pZHAuaXRhbS5jYXMuY3qGJmh0dHBzOi8vaWRwLml0
-YW0uY2FzLmN6L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBQ34hoPcWC9wTBNpEun
-P6HH6dsWFDANBgkqhkiG9w0BAQUFAAOCAQEAJ0emvpLRJ3uJgfwgdXNI56Gi7zw/
-VtqXMmeuioY4Hqn3il10yOxvyM9FJCbgsGmCSpyUiIQzvMbZhJXjG/XSM17G3OdB
-t0gXjqSZ8XUzQ76xxGi4pBVlqTr50XpC6tlbOxZ8GflFX5DCGNTOSW/QKZUjnqB/
-ttna9+UdDjmShQa2JBMmJ+mRM6m8RFEy2WQZplChLZkoZqLIWD48YY3GjGtOQ6FP
-2qO9lehSxJNgnAqM7raKBHwJIsZqYuTMaDU1Xm7JVg0eD9ht2Lvzmax69VjL1soY
-G0bWc5sh8gUEJyktAyE0P2pKMYNPDEfIv8LruQtOG9uU2F62xtvp+hJoyg==
-
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.itam.cas.cz:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.itam.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.itam.cas.cz/idp/profile/SAML2/Redirect/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.itam.cas.cz/idp/profile/SAML2/POST/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.itam.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.itam.cas.cz/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.itam.cas.cz/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.itam.cas.cz/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.itam.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">itam.cas.cz</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDJzCCAg+gAwIBAgIUEsBKg0xdOetjiFaXL+mfQFs6ERcwDQYJKoZIhvcNAQEF
-BQAwGjEYMBYGA1UEAxMPaWRwLml0YW0uY2FzLmN6MB4XDTE0MTAyMjA3MDMxOFoX
-DTM0MTAyMjA3MDMxOFowGjEYMBYGA1UEAxMPaWRwLml0YW0uY2FzLmN6MIIBIjAN
-BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxAvwUCh/S8mxj1tvJq+Q+wssQ91g
-V83jKtGHeZnM+ADZ2iFNglHPE+BBBYb1bj9pqsP2BRwWIPWHeJ8bz1sLVeC90t23
-xLOudYs1ACIskNK7gvcKF1QBGGopHlUXmAgxibLTT+4+ZcBbzOdCMakBlxQd4wr5
-gSB35AD8SR7Qe5t3PoE5SQ3PK224l6DALOW9YdZ5bI0VfUJAqQjiDp9/hfmBXaod
-Kzx2N+G12Jyay7VTnq7HCqUCwkWmMk2ZPmRUFwJ5abxOQtO3ClfDRoGHgVQSlR9O
-Lwe0Ee3wFxvcCvGlTFdJ6WHgV5mhIB4PHxGyHADIW1BGG3Vd8WgX3w/2oQIDAQAB
-o2UwYzBCBgNVHREEOzA5gg9pZHAuaXRhbS5jYXMuY3qGJmh0dHBzOi8vaWRwLml0
-YW0uY2FzLmN6L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBQ34hoPcWC9wTBNpEun
-P6HH6dsWFDANBgkqhkiG9w0BAQUFAAOCAQEAJ0emvpLRJ3uJgfwgdXNI56Gi7zw/
-VtqXMmeuioY4Hqn3il10yOxvyM9FJCbgsGmCSpyUiIQzvMbZhJXjG/XSM17G3OdB
-t0gXjqSZ8XUzQ76xxGi4pBVlqTr50XpC6tlbOxZ8GflFX5DCGNTOSW/QKZUjnqB/
-ttna9+UdDjmShQa2JBMmJ+mRM6m8RFEy2WQZplChLZkoZqLIWD48YY3GjGtOQ6FP
-2qO9lehSxJNgnAqM7raKBHwJIsZqYuTMaDU1Xm7JVg0eD9ht2Lvzmax69VjL1soY
-G0bWc5sh8gUEJyktAyE0P2pKMYNPDEfIv8LruQtOG9uU2F62xtvp+hJoyg==
-
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.itam.cas.cz:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.itam.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 Theoretical and Applied Mechanics AS CR</OrganizationName>
-    <OrganizationName xml:lang="cs">Ústav teoretické a aplikované mechaniky AV ČR</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Institute of Theoretical and Applied Mechanics AS CR, v.v.i.</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="cs">Ústav teoretické a aplikované mechaniky AV ČR, v.v.i.</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.itam.cas.cz/</OrganizationURL>
-    <OrganizationURL xml:lang="cs">http://www.itam.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.its.fz-juelich.de-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.its.fz-juelich.de-idp-shibboleth.xml
deleted file mode 100644
index 255aae0d..00000000
--- a/swamid-interfederations-2.0/idp.its.fz-juelich.de-idp-shibboleth.xml
+++ /dev/null
@@ -1,224 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.its.fz-juelich.de/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2010-08-13T10:04:08Z">
-      <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">fz-juelich.de</saml1md:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="de">Forschungszentrum Jülich GmbH</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Forschungszentrum Jülich GmbH</mdui:DisplayName>
-        <mdui:Description xml:lang="de">Identity-Provider der Forschungszentrum Jülich GmbH</mdui:Description>
-        <mdui:Description xml:lang="en">Identity-Provider der Forschungszentrum Jülich GmbH</mdui:Description>
-        <mdui:InformationURL xml:lang="de">http://www.fz-juelich.de</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">http://www.fz-juelich.de</mdui:InformationURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.its.fz-juelich.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.its.fz-juelich.de,O=Forschungszentrum Juelich GmbH,L=Juelich,ST=Nordrhein-Westfalen,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFwDCCBKigAwIBAgIHF2Szd19csjANBgkqhkiG9w0BAQUFADCBgzELMAkGA1UE
-BhMCREUxJzAlBgNVBAoTHkZvcnNjaHVuZ3N6ZW50cnVtIEp1ZWxpY2ggR21iSDEq
-MCgGA1UEAxMhRlpKIENlcnRpZmljYXRpb24gQXV0aG9yaXR5IC0gRzAyMR8wHQYJ
-KoZIhvcNAQkBFhBjYUBmei1qdWVsaWNoLmRlMB4XDTE0MDQwOTExNTgzMloXDTE5
-MDQwODExNTgzMlowgYYxCzAJBgNVBAYTAkRFMRwwGgYDVQQIExNOb3JkcmhlaW4t
-V2VzdGZhbGVuMRAwDgYDVQQHEwdKdWVsaWNoMScwJQYDVQQKEx5Gb3JzY2h1bmdz
-emVudHJ1bSBKdWVsaWNoIEdtYkgxHjAcBgNVBAMTFWlkcC5pdHMuZnotanVlbGlj
-aC5kZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALyEZ4OJwh5/R7ZB
-NcfP+r4rGj11okOTedH/va1+NvjqXbOD3704Xb9t67RvvMh9opZ2PRlfINmf/JuE
-RB6OuXH6mZRIZQbfsTP6F1npxeh4yPc+psoFdBu45CGX8+drBhNX9RlsNE6pmEvE
-pPPMRO9gBbScEFBmZty+h0Su2/JgKtqyC2alBP6QperUm8zNJ3y3bnRJWfuFnUfJ
-z4FVsxPwYsyY3lh756nGq2ihcEQzmGZ+oRUDxyjeRFWZrlgGyN6oD7ZVFnbFhI8H
-qa7CkvAy/owny/FQuGO6JC4To1bqeSX+Zcn/TV6HuZg6ybE/zUR9dHeU28qKIRPj
-NKGftvkCAwEAAaOCAjIwggIuMDkGA1UdIAQyMDAwEQYPKwYBBAGBrSGCLAEBBAMB
-MBEGDysGAQQBga0hgiwCAQQDATAIBgZngQwBAgIwCQYDVR0TBAIwADALBgNVHQ8E
-BAMCBPAwEwYDVR0lBAwwCgYIKwYBBQUHAwEwHQYDVR0OBBYEFPnubw0XZJS8MA74
-FBf+epBbXm05MB8GA1UdIwQYMBaAFCC9cYmlySozLxHgH+WUJlYPEQIlMDkGA1Ud
-EQQyMDCCFWlkcC5pdHMuZnotanVlbGljaC5kZYEXd2VibWFzdGVyQGZ6LWp1ZWxp
-Y2guZGUwewYDVR0fBHQwcjA3oDWgM4YxaHR0cDovL2NkcDEucGNhLmRmbi5kZS9m
-emotY2EvcHViL2NybC9nX2NhY3JsLmNybDA3oDWgM4YxaHR0cDovL2NkcDIucGNh
-LmRmbi5kZS9memotY2EvcHViL2NybC9nX2NhY3JsLmNybDCBywYIKwYBBQUHAQEE
-gb4wgbswMwYIKwYBBQUHMAGGJ2h0dHA6Ly9vY3NwLnBjYS5kZm4uZGUvT0NTUC1T
-ZXJ2ZXIvT0NTUDBBBggrBgEFBQcwAoY1aHR0cDovL2NkcDEucGNhLmRmbi5kZS9m
-emotY2EvcHViL2NhY2VydC9nX2NhY2VydC5jcnQwQQYIKwYBBQUHMAKGNWh0dHA6
-Ly9jZHAyLnBjYS5kZm4uZGUvZnpqLWNhL3B1Yi9jYWNlcnQvZ19jYWNlcnQuY3J0
-MA0GCSqGSIb3DQEBBQUAA4IBAQCAv/nuosclU7sm5SDc5LZW8K032GuWk33S7ZAH
-kCmkNB9rPbEBQcKZxEIzIH8TwrMPPTmqZMNPTuhHBdcEmeVnWkr5F1omxxHUn3GF
-MDXMffSER54HMfWSc/D0f8VyyoKHwotD6dYEwSQSWKtPV0Rv4OCf2LGzAukDAXOO
-JaSL11iVqzuAYlUMYQ9TrFmCtf/xr0gbiKL9QgDzOe6P4k2nDid/G7bWZYswbmb7
-nzmhmPE5BMRvs/TBhoqLTzhrLdUyOIToUS5IMkynRqM1Ylf8d4PImgeC7Wyb30IP
-W70+0kLcZsWMkom+vyzZuZjO/6mIzKUUKJeySUawrqBfZK4L
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.its.fz-juelich.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>emailAddress=webmaster@fz-juelich.de,CN=idp.its.fz-juelich.de,O=Forschungszentrum Juelich GmbH,L=Juelich,ST=Nordrhein-Westfalen,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIF5TCCBM2gAwIBAgIHGFschQrLkzANBgkqhkiG9w0BAQsFADCBgzELMAkGA1UE
-BhMCREUxJzAlBgNVBAoTHkZvcnNjaHVuZ3N6ZW50cnVtIEp1ZWxpY2ggR21iSDEq
-MCgGA1UEAxMhRlpKIENlcnRpZmljYXRpb24gQXV0aG9yaXR5IC0gRzAyMR8wHQYJ
-KoZIhvcNAQkBFhBjYUBmei1qdWVsaWNoLmRlMB4XDTE0MTAxMzA5NDQyMVoXDTE5
-MDcwOTIzNTkwMFowga4xCzAJBgNVBAYTAkRFMRwwGgYDVQQIExNOb3JkcmhlaW4t
-V2VzdGZhbGVuMRAwDgYDVQQHEwdKdWVsaWNoMScwJQYDVQQKEx5Gb3JzY2h1bmdz
-emVudHJ1bSBKdWVsaWNoIEdtYkgxHjAcBgNVBAMTFWlkcC5pdHMuZnotanVlbGlj
-aC5kZTEmMCQGCSqGSIb3DQEJARYXd2VibWFzdGVyQGZ6LWp1ZWxpY2guZGUwggEi
-MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC5t9fIu0COttZeG5Xo6y/zqMfv
-vIwH5FNJaX0kelKKx49rxcxUxbt2gOEcrAemc+KMsTI4xmOSEzJIkInQUoXXkAkR
-qI7KaUZ/ZzZFLiIdVT7DdTx1cQkzj6Q/yDZA9vv/yHTocq66ujPJZngtemu7PWWo
-nqxd11bkMuCbFOsWUhZ8tTCwiDAOdpXCZH+mqLZCSNu2cr55zO+bHdHlQegOrPeF
-8/GDyMtPVk9ByPcW9msCAhiKsGGYU85Q650/IO6IIDZddCwr1zHNu+QeO/4U52Kg
-A2PWoxBsr2VTqfJPDQBupxm1nuxjL89UnRYqmI4WxcTCtP7abFlsGSEjMrkJAgMB
-AAGjggIvMIICKzBPBgNVHSAESDBGMBEGDysGAQQBga0hgiwBAQQDAjARBg8rBgEE
-AYGtIYIsAgEEAwEwDwYNKwYBBAGBrSGCLAEBBDANBgsrBgEEAYGtIYIsHjAJBgNV
-HRMEAjAAMAsGA1UdDwQEAwIE8DATBgNVHSUEDDAKBggrBgEFBQcDATAdBgNVHQ4E
-FgQUNlyp1PKKm1tbM/BJ6zblU9W9IocwHwYDVR0jBBgwFoAUIL1xiaXJKjMvEeAf
-5ZQmVg8RAiUwIAYDVR0RBBkwF4IVaWRwLml0cy5mei1qdWVsaWNoLmRlMHsGA1Ud
-HwR0MHIwN6A1oDOGMWh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvZnpqLWNhL3B1Yi9j
-cmwvZ19jYWNybC5jcmwwN6A1oDOGMWh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvZnpq
-LWNhL3B1Yi9jcmwvZ19jYWNybC5jcmwwgcsGCCsGAQUFBwEBBIG+MIG7MDMGCCsG
-AQUFBzABhidodHRwOi8vb2NzcC5wY2EuZGZuLmRlL09DU1AtU2VydmVyL09DU1Aw
-QQYIKwYBBQUHMAKGNWh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvZnpqLWNhL3B1Yi9j
-YWNlcnQvZ19jYWNlcnQuY3J0MEEGCCsGAQUFBzAChjVodHRwOi8vY2RwMi5wY2Eu
-ZGZuLmRlL2Z6ai1jYS9wdWIvY2FjZXJ0L2dfY2FjZXJ0LmNydDANBgkqhkiG9w0B
-AQsFAAOCAQEAjQatrjj9D0sreu0Dj3GsN3NLBiBxwTxyRAApzAiZuGu1960JhtvL
-DsnGukFCe++xd6qco82ZIrwCWrbjK2SQoAexiQqH4TXWqQaPcIr8zDwj0WKv63mN
-LhzmBIePWsND5pIb6qS3a4RvRK9u9BViQllWSQYUlkBNoA8HtulmqNkgVCgt7De9
-ZhDGRZAiGhA+N67ts/h9zW6fT6SqHgCgcTSG6mVSMX2ZR9XTocoAXCfwEV7VkGl7
-L9aUnCact8MBZGMgWHR8NVFyhEofMTBIiXwGawBgzB+bU/xOcBp/3ulxy2K3mfEK
-WsS4+1PQhtDqnQMdqkPWm1zlseEGiXqFtw==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.its.fz-juelich.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.its.fz-juelich.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.its.fz-juelich.de/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.its.fz-juelich.de/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.its.fz-juelich.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.its.fz-juelich.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">fz-juelich.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.its.fz-juelich.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.its.fz-juelich.de,O=Forschungszentrum Juelich GmbH,L=Juelich,ST=Nordrhein-Westfalen,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFwDCCBKigAwIBAgIHF2Szd19csjANBgkqhkiG9w0BAQUFADCBgzELMAkGA1UE
-BhMCREUxJzAlBgNVBAoTHkZvcnNjaHVuZ3N6ZW50cnVtIEp1ZWxpY2ggR21iSDEq
-MCgGA1UEAxMhRlpKIENlcnRpZmljYXRpb24gQXV0aG9yaXR5IC0gRzAyMR8wHQYJ
-KoZIhvcNAQkBFhBjYUBmei1qdWVsaWNoLmRlMB4XDTE0MDQwOTExNTgzMloXDTE5
-MDQwODExNTgzMlowgYYxCzAJBgNVBAYTAkRFMRwwGgYDVQQIExNOb3JkcmhlaW4t
-V2VzdGZhbGVuMRAwDgYDVQQHEwdKdWVsaWNoMScwJQYDVQQKEx5Gb3JzY2h1bmdz
-emVudHJ1bSBKdWVsaWNoIEdtYkgxHjAcBgNVBAMTFWlkcC5pdHMuZnotanVlbGlj
-aC5kZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALyEZ4OJwh5/R7ZB
-NcfP+r4rGj11okOTedH/va1+NvjqXbOD3704Xb9t67RvvMh9opZ2PRlfINmf/JuE
-RB6OuXH6mZRIZQbfsTP6F1npxeh4yPc+psoFdBu45CGX8+drBhNX9RlsNE6pmEvE
-pPPMRO9gBbScEFBmZty+h0Su2/JgKtqyC2alBP6QperUm8zNJ3y3bnRJWfuFnUfJ
-z4FVsxPwYsyY3lh756nGq2ihcEQzmGZ+oRUDxyjeRFWZrlgGyN6oD7ZVFnbFhI8H
-qa7CkvAy/owny/FQuGO6JC4To1bqeSX+Zcn/TV6HuZg6ybE/zUR9dHeU28qKIRPj
-NKGftvkCAwEAAaOCAjIwggIuMDkGA1UdIAQyMDAwEQYPKwYBBAGBrSGCLAEBBAMB
-MBEGDysGAQQBga0hgiwCAQQDATAIBgZngQwBAgIwCQYDVR0TBAIwADALBgNVHQ8E
-BAMCBPAwEwYDVR0lBAwwCgYIKwYBBQUHAwEwHQYDVR0OBBYEFPnubw0XZJS8MA74
-FBf+epBbXm05MB8GA1UdIwQYMBaAFCC9cYmlySozLxHgH+WUJlYPEQIlMDkGA1Ud
-EQQyMDCCFWlkcC5pdHMuZnotanVlbGljaC5kZYEXd2VibWFzdGVyQGZ6LWp1ZWxp
-Y2guZGUwewYDVR0fBHQwcjA3oDWgM4YxaHR0cDovL2NkcDEucGNhLmRmbi5kZS9m
-emotY2EvcHViL2NybC9nX2NhY3JsLmNybDA3oDWgM4YxaHR0cDovL2NkcDIucGNh
-LmRmbi5kZS9memotY2EvcHViL2NybC9nX2NhY3JsLmNybDCBywYIKwYBBQUHAQEE
-gb4wgbswMwYIKwYBBQUHMAGGJ2h0dHA6Ly9vY3NwLnBjYS5kZm4uZGUvT0NTUC1T
-ZXJ2ZXIvT0NTUDBBBggrBgEFBQcwAoY1aHR0cDovL2NkcDEucGNhLmRmbi5kZS9m
-emotY2EvcHViL2NhY2VydC9nX2NhY2VydC5jcnQwQQYIKwYBBQUHMAKGNWh0dHA6
-Ly9jZHAyLnBjYS5kZm4uZGUvZnpqLWNhL3B1Yi9jYWNlcnQvZ19jYWNlcnQuY3J0
-MA0GCSqGSIb3DQEBBQUAA4IBAQCAv/nuosclU7sm5SDc5LZW8K032GuWk33S7ZAH
-kCmkNB9rPbEBQcKZxEIzIH8TwrMPPTmqZMNPTuhHBdcEmeVnWkr5F1omxxHUn3GF
-MDXMffSER54HMfWSc/D0f8VyyoKHwotD6dYEwSQSWKtPV0Rv4OCf2LGzAukDAXOO
-JaSL11iVqzuAYlUMYQ9TrFmCtf/xr0gbiKL9QgDzOe6P4k2nDid/G7bWZYswbmb7
-nzmhmPE5BMRvs/TBhoqLTzhrLdUyOIToUS5IMkynRqM1Ylf8d4PImgeC7Wyb30IP
-W70+0kLcZsWMkom+vyzZuZjO/6mIzKUUKJeySUawrqBfZK4L
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.its.fz-juelich.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>emailAddress=webmaster@fz-juelich.de,CN=idp.its.fz-juelich.de,O=Forschungszentrum Juelich GmbH,L=Juelich,ST=Nordrhein-Westfalen,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIF5TCCBM2gAwIBAgIHGFschQrLkzANBgkqhkiG9w0BAQsFADCBgzELMAkGA1UE
-BhMCREUxJzAlBgNVBAoTHkZvcnNjaHVuZ3N6ZW50cnVtIEp1ZWxpY2ggR21iSDEq
-MCgGA1UEAxMhRlpKIENlcnRpZmljYXRpb24gQXV0aG9yaXR5IC0gRzAyMR8wHQYJ
-KoZIhvcNAQkBFhBjYUBmei1qdWVsaWNoLmRlMB4XDTE0MTAxMzA5NDQyMVoXDTE5
-MDcwOTIzNTkwMFowga4xCzAJBgNVBAYTAkRFMRwwGgYDVQQIExNOb3JkcmhlaW4t
-V2VzdGZhbGVuMRAwDgYDVQQHEwdKdWVsaWNoMScwJQYDVQQKEx5Gb3JzY2h1bmdz
-emVudHJ1bSBKdWVsaWNoIEdtYkgxHjAcBgNVBAMTFWlkcC5pdHMuZnotanVlbGlj
-aC5kZTEmMCQGCSqGSIb3DQEJARYXd2VibWFzdGVyQGZ6LWp1ZWxpY2guZGUwggEi
-MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC5t9fIu0COttZeG5Xo6y/zqMfv
-vIwH5FNJaX0kelKKx49rxcxUxbt2gOEcrAemc+KMsTI4xmOSEzJIkInQUoXXkAkR
-qI7KaUZ/ZzZFLiIdVT7DdTx1cQkzj6Q/yDZA9vv/yHTocq66ujPJZngtemu7PWWo
-nqxd11bkMuCbFOsWUhZ8tTCwiDAOdpXCZH+mqLZCSNu2cr55zO+bHdHlQegOrPeF
-8/GDyMtPVk9ByPcW9msCAhiKsGGYU85Q650/IO6IIDZddCwr1zHNu+QeO/4U52Kg
-A2PWoxBsr2VTqfJPDQBupxm1nuxjL89UnRYqmI4WxcTCtP7abFlsGSEjMrkJAgMB
-AAGjggIvMIICKzBPBgNVHSAESDBGMBEGDysGAQQBga0hgiwBAQQDAjARBg8rBgEE
-AYGtIYIsAgEEAwEwDwYNKwYBBAGBrSGCLAEBBDANBgsrBgEEAYGtIYIsHjAJBgNV
-HRMEAjAAMAsGA1UdDwQEAwIE8DATBgNVHSUEDDAKBggrBgEFBQcDATAdBgNVHQ4E
-FgQUNlyp1PKKm1tbM/BJ6zblU9W9IocwHwYDVR0jBBgwFoAUIL1xiaXJKjMvEeAf
-5ZQmVg8RAiUwIAYDVR0RBBkwF4IVaWRwLml0cy5mei1qdWVsaWNoLmRlMHsGA1Ud
-HwR0MHIwN6A1oDOGMWh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvZnpqLWNhL3B1Yi9j
-cmwvZ19jYWNybC5jcmwwN6A1oDOGMWh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvZnpq
-LWNhL3B1Yi9jcmwvZ19jYWNybC5jcmwwgcsGCCsGAQUFBwEBBIG+MIG7MDMGCCsG
-AQUFBzABhidodHRwOi8vb2NzcC5wY2EuZGZuLmRlL09DU1AtU2VydmVyL09DU1Aw
-QQYIKwYBBQUHMAKGNWh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvZnpqLWNhL3B1Yi9j
-YWNlcnQvZ19jYWNlcnQuY3J0MEEGCCsGAQUFBzAChjVodHRwOi8vY2RwMi5wY2Eu
-ZGZuLmRlL2Z6ai1jYS9wdWIvY2FjZXJ0L2dfY2FjZXJ0LmNydDANBgkqhkiG9w0B
-AQsFAAOCAQEAjQatrjj9D0sreu0Dj3GsN3NLBiBxwTxyRAApzAiZuGu1960JhtvL
-DsnGukFCe++xd6qco82ZIrwCWrbjK2SQoAexiQqH4TXWqQaPcIr8zDwj0WKv63mN
-LhzmBIePWsND5pIb6qS3a4RvRK9u9BViQllWSQYUlkBNoA8HtulmqNkgVCgt7De9
-ZhDGRZAiGhA+N67ts/h9zW6fT6SqHgCgcTSG6mVSMX2ZR9XTocoAXCfwEV7VkGl7
-L9aUnCact8MBZGMgWHR8NVFyhEofMTBIiXwGawBgzB+bU/xOcBp/3ulxy2K3mfEK
-WsS4+1PQhtDqnQMdqkPWm1zlseEGiXqFtw==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.its.fz-juelich.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.its.fz-juelich.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">e234</OrganizationName>
-    <OrganizationName xml:lang="en">e234</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">Forschungszentrum Jülich GmbH</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">Forschungszentrum Jülich GmbH</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.fz-juelich.de</OrganizationURL>
-    <OrganizationURL xml:lang="en">http://www.fz-juelich.de</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Jens</GivenName>
-    <SurName>Heidbüchel</SurName>
-    <EmailAddress>mailto:j.heidbuechel@fz-juelich.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="administrative">
-    <GivenName>Jens</GivenName>
-    <SurName>Heidbüchel</SurName>
-    <EmailAddress>mailto:j.heidbuechel@fz-juelich.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="support">
-    <GivenName>ITS Service Desk</GivenName>
-    <SurName>Forschungszentrum Jülich GmbH</SurName>
-    <EmailAddress>mailto:it-services@fz-juelich.de</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.its.fz-juelich.de.xml b/swamid-interfederations-2.0/idp.its.fz-juelich.de.xml
deleted file mode 100644
index 255aae0d..00000000
--- a/swamid-interfederations-2.0/idp.its.fz-juelich.de.xml
+++ /dev/null
@@ -1,224 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.its.fz-juelich.de/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2010-08-13T10:04:08Z">
-      <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">fz-juelich.de</saml1md:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="de">Forschungszentrum Jülich GmbH</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Forschungszentrum Jülich GmbH</mdui:DisplayName>
-        <mdui:Description xml:lang="de">Identity-Provider der Forschungszentrum Jülich GmbH</mdui:Description>
-        <mdui:Description xml:lang="en">Identity-Provider der Forschungszentrum Jülich GmbH</mdui:Description>
-        <mdui:InformationURL xml:lang="de">http://www.fz-juelich.de</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">http://www.fz-juelich.de</mdui:InformationURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.its.fz-juelich.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.its.fz-juelich.de,O=Forschungszentrum Juelich GmbH,L=Juelich,ST=Nordrhein-Westfalen,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFwDCCBKigAwIBAgIHF2Szd19csjANBgkqhkiG9w0BAQUFADCBgzELMAkGA1UE
-BhMCREUxJzAlBgNVBAoTHkZvcnNjaHVuZ3N6ZW50cnVtIEp1ZWxpY2ggR21iSDEq
-MCgGA1UEAxMhRlpKIENlcnRpZmljYXRpb24gQXV0aG9yaXR5IC0gRzAyMR8wHQYJ
-KoZIhvcNAQkBFhBjYUBmei1qdWVsaWNoLmRlMB4XDTE0MDQwOTExNTgzMloXDTE5
-MDQwODExNTgzMlowgYYxCzAJBgNVBAYTAkRFMRwwGgYDVQQIExNOb3JkcmhlaW4t
-V2VzdGZhbGVuMRAwDgYDVQQHEwdKdWVsaWNoMScwJQYDVQQKEx5Gb3JzY2h1bmdz
-emVudHJ1bSBKdWVsaWNoIEdtYkgxHjAcBgNVBAMTFWlkcC5pdHMuZnotanVlbGlj
-aC5kZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALyEZ4OJwh5/R7ZB
-NcfP+r4rGj11okOTedH/va1+NvjqXbOD3704Xb9t67RvvMh9opZ2PRlfINmf/JuE
-RB6OuXH6mZRIZQbfsTP6F1npxeh4yPc+psoFdBu45CGX8+drBhNX9RlsNE6pmEvE
-pPPMRO9gBbScEFBmZty+h0Su2/JgKtqyC2alBP6QperUm8zNJ3y3bnRJWfuFnUfJ
-z4FVsxPwYsyY3lh756nGq2ihcEQzmGZ+oRUDxyjeRFWZrlgGyN6oD7ZVFnbFhI8H
-qa7CkvAy/owny/FQuGO6JC4To1bqeSX+Zcn/TV6HuZg6ybE/zUR9dHeU28qKIRPj
-NKGftvkCAwEAAaOCAjIwggIuMDkGA1UdIAQyMDAwEQYPKwYBBAGBrSGCLAEBBAMB
-MBEGDysGAQQBga0hgiwCAQQDATAIBgZngQwBAgIwCQYDVR0TBAIwADALBgNVHQ8E
-BAMCBPAwEwYDVR0lBAwwCgYIKwYBBQUHAwEwHQYDVR0OBBYEFPnubw0XZJS8MA74
-FBf+epBbXm05MB8GA1UdIwQYMBaAFCC9cYmlySozLxHgH+WUJlYPEQIlMDkGA1Ud
-EQQyMDCCFWlkcC5pdHMuZnotanVlbGljaC5kZYEXd2VibWFzdGVyQGZ6LWp1ZWxp
-Y2guZGUwewYDVR0fBHQwcjA3oDWgM4YxaHR0cDovL2NkcDEucGNhLmRmbi5kZS9m
-emotY2EvcHViL2NybC9nX2NhY3JsLmNybDA3oDWgM4YxaHR0cDovL2NkcDIucGNh
-LmRmbi5kZS9memotY2EvcHViL2NybC9nX2NhY3JsLmNybDCBywYIKwYBBQUHAQEE
-gb4wgbswMwYIKwYBBQUHMAGGJ2h0dHA6Ly9vY3NwLnBjYS5kZm4uZGUvT0NTUC1T
-ZXJ2ZXIvT0NTUDBBBggrBgEFBQcwAoY1aHR0cDovL2NkcDEucGNhLmRmbi5kZS9m
-emotY2EvcHViL2NhY2VydC9nX2NhY2VydC5jcnQwQQYIKwYBBQUHMAKGNWh0dHA6
-Ly9jZHAyLnBjYS5kZm4uZGUvZnpqLWNhL3B1Yi9jYWNlcnQvZ19jYWNlcnQuY3J0
-MA0GCSqGSIb3DQEBBQUAA4IBAQCAv/nuosclU7sm5SDc5LZW8K032GuWk33S7ZAH
-kCmkNB9rPbEBQcKZxEIzIH8TwrMPPTmqZMNPTuhHBdcEmeVnWkr5F1omxxHUn3GF
-MDXMffSER54HMfWSc/D0f8VyyoKHwotD6dYEwSQSWKtPV0Rv4OCf2LGzAukDAXOO
-JaSL11iVqzuAYlUMYQ9TrFmCtf/xr0gbiKL9QgDzOe6P4k2nDid/G7bWZYswbmb7
-nzmhmPE5BMRvs/TBhoqLTzhrLdUyOIToUS5IMkynRqM1Ylf8d4PImgeC7Wyb30IP
-W70+0kLcZsWMkom+vyzZuZjO/6mIzKUUKJeySUawrqBfZK4L
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.its.fz-juelich.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>emailAddress=webmaster@fz-juelich.de,CN=idp.its.fz-juelich.de,O=Forschungszentrum Juelich GmbH,L=Juelich,ST=Nordrhein-Westfalen,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIF5TCCBM2gAwIBAgIHGFschQrLkzANBgkqhkiG9w0BAQsFADCBgzELMAkGA1UE
-BhMCREUxJzAlBgNVBAoTHkZvcnNjaHVuZ3N6ZW50cnVtIEp1ZWxpY2ggR21iSDEq
-MCgGA1UEAxMhRlpKIENlcnRpZmljYXRpb24gQXV0aG9yaXR5IC0gRzAyMR8wHQYJ
-KoZIhvcNAQkBFhBjYUBmei1qdWVsaWNoLmRlMB4XDTE0MTAxMzA5NDQyMVoXDTE5
-MDcwOTIzNTkwMFowga4xCzAJBgNVBAYTAkRFMRwwGgYDVQQIExNOb3JkcmhlaW4t
-V2VzdGZhbGVuMRAwDgYDVQQHEwdKdWVsaWNoMScwJQYDVQQKEx5Gb3JzY2h1bmdz
-emVudHJ1bSBKdWVsaWNoIEdtYkgxHjAcBgNVBAMTFWlkcC5pdHMuZnotanVlbGlj
-aC5kZTEmMCQGCSqGSIb3DQEJARYXd2VibWFzdGVyQGZ6LWp1ZWxpY2guZGUwggEi
-MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC5t9fIu0COttZeG5Xo6y/zqMfv
-vIwH5FNJaX0kelKKx49rxcxUxbt2gOEcrAemc+KMsTI4xmOSEzJIkInQUoXXkAkR
-qI7KaUZ/ZzZFLiIdVT7DdTx1cQkzj6Q/yDZA9vv/yHTocq66ujPJZngtemu7PWWo
-nqxd11bkMuCbFOsWUhZ8tTCwiDAOdpXCZH+mqLZCSNu2cr55zO+bHdHlQegOrPeF
-8/GDyMtPVk9ByPcW9msCAhiKsGGYU85Q650/IO6IIDZddCwr1zHNu+QeO/4U52Kg
-A2PWoxBsr2VTqfJPDQBupxm1nuxjL89UnRYqmI4WxcTCtP7abFlsGSEjMrkJAgMB
-AAGjggIvMIICKzBPBgNVHSAESDBGMBEGDysGAQQBga0hgiwBAQQDAjARBg8rBgEE
-AYGtIYIsAgEEAwEwDwYNKwYBBAGBrSGCLAEBBDANBgsrBgEEAYGtIYIsHjAJBgNV
-HRMEAjAAMAsGA1UdDwQEAwIE8DATBgNVHSUEDDAKBggrBgEFBQcDATAdBgNVHQ4E
-FgQUNlyp1PKKm1tbM/BJ6zblU9W9IocwHwYDVR0jBBgwFoAUIL1xiaXJKjMvEeAf
-5ZQmVg8RAiUwIAYDVR0RBBkwF4IVaWRwLml0cy5mei1qdWVsaWNoLmRlMHsGA1Ud
-HwR0MHIwN6A1oDOGMWh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvZnpqLWNhL3B1Yi9j
-cmwvZ19jYWNybC5jcmwwN6A1oDOGMWh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvZnpq
-LWNhL3B1Yi9jcmwvZ19jYWNybC5jcmwwgcsGCCsGAQUFBwEBBIG+MIG7MDMGCCsG
-AQUFBzABhidodHRwOi8vb2NzcC5wY2EuZGZuLmRlL09DU1AtU2VydmVyL09DU1Aw
-QQYIKwYBBQUHMAKGNWh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvZnpqLWNhL3B1Yi9j
-YWNlcnQvZ19jYWNlcnQuY3J0MEEGCCsGAQUFBzAChjVodHRwOi8vY2RwMi5wY2Eu
-ZGZuLmRlL2Z6ai1jYS9wdWIvY2FjZXJ0L2dfY2FjZXJ0LmNydDANBgkqhkiG9w0B
-AQsFAAOCAQEAjQatrjj9D0sreu0Dj3GsN3NLBiBxwTxyRAApzAiZuGu1960JhtvL
-DsnGukFCe++xd6qco82ZIrwCWrbjK2SQoAexiQqH4TXWqQaPcIr8zDwj0WKv63mN
-LhzmBIePWsND5pIb6qS3a4RvRK9u9BViQllWSQYUlkBNoA8HtulmqNkgVCgt7De9
-ZhDGRZAiGhA+N67ts/h9zW6fT6SqHgCgcTSG6mVSMX2ZR9XTocoAXCfwEV7VkGl7
-L9aUnCact8MBZGMgWHR8NVFyhEofMTBIiXwGawBgzB+bU/xOcBp/3ulxy2K3mfEK
-WsS4+1PQhtDqnQMdqkPWm1zlseEGiXqFtw==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.its.fz-juelich.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.its.fz-juelich.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.its.fz-juelich.de/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.its.fz-juelich.de/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.its.fz-juelich.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.its.fz-juelich.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">fz-juelich.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.its.fz-juelich.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.its.fz-juelich.de,O=Forschungszentrum Juelich GmbH,L=Juelich,ST=Nordrhein-Westfalen,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFwDCCBKigAwIBAgIHF2Szd19csjANBgkqhkiG9w0BAQUFADCBgzELMAkGA1UE
-BhMCREUxJzAlBgNVBAoTHkZvcnNjaHVuZ3N6ZW50cnVtIEp1ZWxpY2ggR21iSDEq
-MCgGA1UEAxMhRlpKIENlcnRpZmljYXRpb24gQXV0aG9yaXR5IC0gRzAyMR8wHQYJ
-KoZIhvcNAQkBFhBjYUBmei1qdWVsaWNoLmRlMB4XDTE0MDQwOTExNTgzMloXDTE5
-MDQwODExNTgzMlowgYYxCzAJBgNVBAYTAkRFMRwwGgYDVQQIExNOb3JkcmhlaW4t
-V2VzdGZhbGVuMRAwDgYDVQQHEwdKdWVsaWNoMScwJQYDVQQKEx5Gb3JzY2h1bmdz
-emVudHJ1bSBKdWVsaWNoIEdtYkgxHjAcBgNVBAMTFWlkcC5pdHMuZnotanVlbGlj
-aC5kZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALyEZ4OJwh5/R7ZB
-NcfP+r4rGj11okOTedH/va1+NvjqXbOD3704Xb9t67RvvMh9opZ2PRlfINmf/JuE
-RB6OuXH6mZRIZQbfsTP6F1npxeh4yPc+psoFdBu45CGX8+drBhNX9RlsNE6pmEvE
-pPPMRO9gBbScEFBmZty+h0Su2/JgKtqyC2alBP6QperUm8zNJ3y3bnRJWfuFnUfJ
-z4FVsxPwYsyY3lh756nGq2ihcEQzmGZ+oRUDxyjeRFWZrlgGyN6oD7ZVFnbFhI8H
-qa7CkvAy/owny/FQuGO6JC4To1bqeSX+Zcn/TV6HuZg6ybE/zUR9dHeU28qKIRPj
-NKGftvkCAwEAAaOCAjIwggIuMDkGA1UdIAQyMDAwEQYPKwYBBAGBrSGCLAEBBAMB
-MBEGDysGAQQBga0hgiwCAQQDATAIBgZngQwBAgIwCQYDVR0TBAIwADALBgNVHQ8E
-BAMCBPAwEwYDVR0lBAwwCgYIKwYBBQUHAwEwHQYDVR0OBBYEFPnubw0XZJS8MA74
-FBf+epBbXm05MB8GA1UdIwQYMBaAFCC9cYmlySozLxHgH+WUJlYPEQIlMDkGA1Ud
-EQQyMDCCFWlkcC5pdHMuZnotanVlbGljaC5kZYEXd2VibWFzdGVyQGZ6LWp1ZWxp
-Y2guZGUwewYDVR0fBHQwcjA3oDWgM4YxaHR0cDovL2NkcDEucGNhLmRmbi5kZS9m
-emotY2EvcHViL2NybC9nX2NhY3JsLmNybDA3oDWgM4YxaHR0cDovL2NkcDIucGNh
-LmRmbi5kZS9memotY2EvcHViL2NybC9nX2NhY3JsLmNybDCBywYIKwYBBQUHAQEE
-gb4wgbswMwYIKwYBBQUHMAGGJ2h0dHA6Ly9vY3NwLnBjYS5kZm4uZGUvT0NTUC1T
-ZXJ2ZXIvT0NTUDBBBggrBgEFBQcwAoY1aHR0cDovL2NkcDEucGNhLmRmbi5kZS9m
-emotY2EvcHViL2NhY2VydC9nX2NhY2VydC5jcnQwQQYIKwYBBQUHMAKGNWh0dHA6
-Ly9jZHAyLnBjYS5kZm4uZGUvZnpqLWNhL3B1Yi9jYWNlcnQvZ19jYWNlcnQuY3J0
-MA0GCSqGSIb3DQEBBQUAA4IBAQCAv/nuosclU7sm5SDc5LZW8K032GuWk33S7ZAH
-kCmkNB9rPbEBQcKZxEIzIH8TwrMPPTmqZMNPTuhHBdcEmeVnWkr5F1omxxHUn3GF
-MDXMffSER54HMfWSc/D0f8VyyoKHwotD6dYEwSQSWKtPV0Rv4OCf2LGzAukDAXOO
-JaSL11iVqzuAYlUMYQ9TrFmCtf/xr0gbiKL9QgDzOe6P4k2nDid/G7bWZYswbmb7
-nzmhmPE5BMRvs/TBhoqLTzhrLdUyOIToUS5IMkynRqM1Ylf8d4PImgeC7Wyb30IP
-W70+0kLcZsWMkom+vyzZuZjO/6mIzKUUKJeySUawrqBfZK4L
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.its.fz-juelich.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>emailAddress=webmaster@fz-juelich.de,CN=idp.its.fz-juelich.de,O=Forschungszentrum Juelich GmbH,L=Juelich,ST=Nordrhein-Westfalen,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIF5TCCBM2gAwIBAgIHGFschQrLkzANBgkqhkiG9w0BAQsFADCBgzELMAkGA1UE
-BhMCREUxJzAlBgNVBAoTHkZvcnNjaHVuZ3N6ZW50cnVtIEp1ZWxpY2ggR21iSDEq
-MCgGA1UEAxMhRlpKIENlcnRpZmljYXRpb24gQXV0aG9yaXR5IC0gRzAyMR8wHQYJ
-KoZIhvcNAQkBFhBjYUBmei1qdWVsaWNoLmRlMB4XDTE0MTAxMzA5NDQyMVoXDTE5
-MDcwOTIzNTkwMFowga4xCzAJBgNVBAYTAkRFMRwwGgYDVQQIExNOb3JkcmhlaW4t
-V2VzdGZhbGVuMRAwDgYDVQQHEwdKdWVsaWNoMScwJQYDVQQKEx5Gb3JzY2h1bmdz
-emVudHJ1bSBKdWVsaWNoIEdtYkgxHjAcBgNVBAMTFWlkcC5pdHMuZnotanVlbGlj
-aC5kZTEmMCQGCSqGSIb3DQEJARYXd2VibWFzdGVyQGZ6LWp1ZWxpY2guZGUwggEi
-MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC5t9fIu0COttZeG5Xo6y/zqMfv
-vIwH5FNJaX0kelKKx49rxcxUxbt2gOEcrAemc+KMsTI4xmOSEzJIkInQUoXXkAkR
-qI7KaUZ/ZzZFLiIdVT7DdTx1cQkzj6Q/yDZA9vv/yHTocq66ujPJZngtemu7PWWo
-nqxd11bkMuCbFOsWUhZ8tTCwiDAOdpXCZH+mqLZCSNu2cr55zO+bHdHlQegOrPeF
-8/GDyMtPVk9ByPcW9msCAhiKsGGYU85Q650/IO6IIDZddCwr1zHNu+QeO/4U52Kg
-A2PWoxBsr2VTqfJPDQBupxm1nuxjL89UnRYqmI4WxcTCtP7abFlsGSEjMrkJAgMB
-AAGjggIvMIICKzBPBgNVHSAESDBGMBEGDysGAQQBga0hgiwBAQQDAjARBg8rBgEE
-AYGtIYIsAgEEAwEwDwYNKwYBBAGBrSGCLAEBBDANBgsrBgEEAYGtIYIsHjAJBgNV
-HRMEAjAAMAsGA1UdDwQEAwIE8DATBgNVHSUEDDAKBggrBgEFBQcDATAdBgNVHQ4E
-FgQUNlyp1PKKm1tbM/BJ6zblU9W9IocwHwYDVR0jBBgwFoAUIL1xiaXJKjMvEeAf
-5ZQmVg8RAiUwIAYDVR0RBBkwF4IVaWRwLml0cy5mei1qdWVsaWNoLmRlMHsGA1Ud
-HwR0MHIwN6A1oDOGMWh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvZnpqLWNhL3B1Yi9j
-cmwvZ19jYWNybC5jcmwwN6A1oDOGMWh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvZnpq
-LWNhL3B1Yi9jcmwvZ19jYWNybC5jcmwwgcsGCCsGAQUFBwEBBIG+MIG7MDMGCCsG
-AQUFBzABhidodHRwOi8vb2NzcC5wY2EuZGZuLmRlL09DU1AtU2VydmVyL09DU1Aw
-QQYIKwYBBQUHMAKGNWh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvZnpqLWNhL3B1Yi9j
-YWNlcnQvZ19jYWNlcnQuY3J0MEEGCCsGAQUFBzAChjVodHRwOi8vY2RwMi5wY2Eu
-ZGZuLmRlL2Z6ai1jYS9wdWIvY2FjZXJ0L2dfY2FjZXJ0LmNydDANBgkqhkiG9w0B
-AQsFAAOCAQEAjQatrjj9D0sreu0Dj3GsN3NLBiBxwTxyRAApzAiZuGu1960JhtvL
-DsnGukFCe++xd6qco82ZIrwCWrbjK2SQoAexiQqH4TXWqQaPcIr8zDwj0WKv63mN
-LhzmBIePWsND5pIb6qS3a4RvRK9u9BViQllWSQYUlkBNoA8HtulmqNkgVCgt7De9
-ZhDGRZAiGhA+N67ts/h9zW6fT6SqHgCgcTSG6mVSMX2ZR9XTocoAXCfwEV7VkGl7
-L9aUnCact8MBZGMgWHR8NVFyhEofMTBIiXwGawBgzB+bU/xOcBp/3ulxy2K3mfEK
-WsS4+1PQhtDqnQMdqkPWm1zlseEGiXqFtw==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.its.fz-juelich.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.its.fz-juelich.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">e234</OrganizationName>
-    <OrganizationName xml:lang="en">e234</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">Forschungszentrum Jülich GmbH</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">Forschungszentrum Jülich GmbH</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.fz-juelich.de</OrganizationURL>
-    <OrganizationURL xml:lang="en">http://www.fz-juelich.de</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Jens</GivenName>
-    <SurName>Heidbüchel</SurName>
-    <EmailAddress>mailto:j.heidbuechel@fz-juelich.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="administrative">
-    <GivenName>Jens</GivenName>
-    <SurName>Heidbüchel</SurName>
-    <EmailAddress>mailto:j.heidbuechel@fz-juelich.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="support">
-    <GivenName>ITS Service Desk</GivenName>
-    <SurName>Forschungszentrum Jülich GmbH</SurName>
-    <EmailAddress>mailto:it-services@fz-juelich.de</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.itsligo.ie-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.itsligo.ie-idp-shibboleth.xml
deleted file mode 100644
index b832f31c..00000000
--- a/swamid-interfederations-2.0/idp.itsligo.ie-idp-shibboleth.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.itsligo.ie/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.heanet.ie" registrationInstant="2011-07-07T00:00:00Z"/>
-  </md:Extensions>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">itsligo.ie</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Institute of Technology Sligo</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="ga">An Institiúid Teicneolaíochta, Sligeach</mdui:DisplayName>
-        <mdui:InformationURL xml:lang="en">http://www.itsligo.ie</mdui:InformationURL>
-        <mdui:Logo height="68" width="224">https://edugate.heanet.ie/rr3/logos/its.png</mdui:Logo>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:GeolocationHint>geo:54.2769291,-8.4651857</mdui:GeolocationHint>
-      </mdui:DiscoHints>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDJDCCAgygAwIBAgIVAM0cwxuTuo+doAYLQTZ+F9Kh2xiQMA0GCSqGSIb3DQEB
-BQUAMBkxFzAVBgNVBAMTDmlkcC5pdHNsaWdvLmllMB4XDTExMDcyNjA3NTc0NVoX
-DTMxMDcyNjA3NTc0NVowGTEXMBUGA1UEAxMOaWRwLml0c2xpZ28uaWUwggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDQz7PoJrvZxLSnvg6ZaRmqMStCmR5w
-6i3JklsDuILt/HaYtlKpbZtjb5j86rgDcyp2CK6YNm3k7xn/9nfScn/LnGKSW87r
-lwiSXePGAJ2OgCbVks+bQQIO4ALm3EKNao07x5EsyFrlbSzyw6/l0d3Vmd6HtRRQ
-F9+nA9uqvOSofbhYexl7KB2Ahebmp+d6SxuEU7gUkZScJ7Re9jd1z2cWBuSwRvkT
-WUcCa8i7YfiDvTq7BvVE+rHSkQAC2tUpH5kGHFr25P8J6f6Mr+flO44eNgo+pbJ8
-3KGETRjM/Fug7wAkDWu5JP+pJk7LOHVuuxg0NW/7jny6H6Bzkmc2ypMlAgMBAAGj
-YzBhMEAGA1UdEQQ5MDeCDmlkcC5pdHNsaWdvLmllhiVodHRwczovL2lkcC5pdHNs
-aWdvLmllL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBSqqAIq1XMY1iF8IG8Nrqws
-BTWwrDANBgkqhkiG9w0BAQUFAAOCAQEAgu0p4z0DPoFXijkpdX0OqB7CVQMqjIqY
-CTlQqZ56bKGKdQP7NpUHD5tiRHh4pB1LNLSh2xqKOgudqFo2lAHGQKf8nMtCi++K
-jy7Q+vVmTnTXvQrYm32l9Rz94LI87vJTUATa8/4sCpUCw2xxT3EfhQpdssprrygj
-QIetzxpSXXz3n8tdU8r0wql2IbivjLdPKS0QOD+RAnTzVVBbKR0lXGBsVfR5oI2Z
-k3pnLaUJBrOCfFJMyrbTiKAOM4VDp8biKKxnYH0hs+hnDDOmKhRH1aqC9JuQ96xk
-AzsGEoivSwmcdqqwrTDW9ILcLk9Z7EsHRPKz1erD1ItJqsdN5EHsFA==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.itsligo.ie/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.itsligo.ie/idp/profile/SAML2/POST/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Institute of Technology Sligo</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Institute of Technology Sligo</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.itsligo.ie</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Kieran</md:GivenName>
-    <md:SurName>Kennedy</md:SurName>
-    <md:EmailAddress>kennedy.kieran@itsligo.ie</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.itsligo.ie.xml b/swamid-interfederations-2.0/idp.itsligo.ie.xml
deleted file mode 100644
index b832f31c..00000000
--- a/swamid-interfederations-2.0/idp.itsligo.ie.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.itsligo.ie/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.heanet.ie" registrationInstant="2011-07-07T00:00:00Z"/>
-  </md:Extensions>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">itsligo.ie</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Institute of Technology Sligo</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="ga">An Institiúid Teicneolaíochta, Sligeach</mdui:DisplayName>
-        <mdui:InformationURL xml:lang="en">http://www.itsligo.ie</mdui:InformationURL>
-        <mdui:Logo height="68" width="224">https://edugate.heanet.ie/rr3/logos/its.png</mdui:Logo>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:GeolocationHint>geo:54.2769291,-8.4651857</mdui:GeolocationHint>
-      </mdui:DiscoHints>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDJDCCAgygAwIBAgIVAM0cwxuTuo+doAYLQTZ+F9Kh2xiQMA0GCSqGSIb3DQEB
-BQUAMBkxFzAVBgNVBAMTDmlkcC5pdHNsaWdvLmllMB4XDTExMDcyNjA3NTc0NVoX
-DTMxMDcyNjA3NTc0NVowGTEXMBUGA1UEAxMOaWRwLml0c2xpZ28uaWUwggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDQz7PoJrvZxLSnvg6ZaRmqMStCmR5w
-6i3JklsDuILt/HaYtlKpbZtjb5j86rgDcyp2CK6YNm3k7xn/9nfScn/LnGKSW87r
-lwiSXePGAJ2OgCbVks+bQQIO4ALm3EKNao07x5EsyFrlbSzyw6/l0d3Vmd6HtRRQ
-F9+nA9uqvOSofbhYexl7KB2Ahebmp+d6SxuEU7gUkZScJ7Re9jd1z2cWBuSwRvkT
-WUcCa8i7YfiDvTq7BvVE+rHSkQAC2tUpH5kGHFr25P8J6f6Mr+flO44eNgo+pbJ8
-3KGETRjM/Fug7wAkDWu5JP+pJk7LOHVuuxg0NW/7jny6H6Bzkmc2ypMlAgMBAAGj
-YzBhMEAGA1UdEQQ5MDeCDmlkcC5pdHNsaWdvLmllhiVodHRwczovL2lkcC5pdHNs
-aWdvLmllL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBSqqAIq1XMY1iF8IG8Nrqws
-BTWwrDANBgkqhkiG9w0BAQUFAAOCAQEAgu0p4z0DPoFXijkpdX0OqB7CVQMqjIqY
-CTlQqZ56bKGKdQP7NpUHD5tiRHh4pB1LNLSh2xqKOgudqFo2lAHGQKf8nMtCi++K
-jy7Q+vVmTnTXvQrYm32l9Rz94LI87vJTUATa8/4sCpUCw2xxT3EfhQpdssprrygj
-QIetzxpSXXz3n8tdU8r0wql2IbivjLdPKS0QOD+RAnTzVVBbKR0lXGBsVfR5oI2Z
-k3pnLaUJBrOCfFJMyrbTiKAOM4VDp8biKKxnYH0hs+hnDDOmKhRH1aqC9JuQ96xk
-AzsGEoivSwmcdqqwrTDW9ILcLk9Z7EsHRPKz1erD1ItJqsdN5EHsFA==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.itsligo.ie/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.itsligo.ie/idp/profile/SAML2/POST/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Institute of Technology Sligo</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Institute of Technology Sligo</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.itsligo.ie</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Kieran</md:GivenName>
-    <md:SurName>Kennedy</md:SurName>
-    <md:EmailAddress>kennedy.kieran@itsligo.ie</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.ittralee.ie-idp.xml b/swamid-interfederations-2.0/idp.ittralee.ie-idp.xml
deleted file mode 100644
index 24012353..00000000
--- a/swamid-interfederations-2.0/idp.ittralee.ie-idp.xml
+++ /dev/null
@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.ittralee.ie/idp">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.heanet.ie" registrationInstant="2010-11-04T00:00:00Z"/>
-  </md:Extensions>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ittralee.ie</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Institute of Technology Tralee</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="ga">Institiúid Teicneolaíochta, Trá Lí</mdui:DisplayName>
-        <mdui:InformationURL xml:lang="en">http://www.ittralee.ie</mdui:InformationURL>
-        <mdui:Logo height="62" width="248">https://edugate.heanet.ie/rr3/logos/ittra.png</mdui:Logo>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:GeolocationHint>geo:52.28620934512703,-9.67296838760376</mdui:GeolocationHint>
-      </mdui:DiscoHints>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIHHjCCBgagAwIBAgIRAICl/N1E7wMHQx0BHxXzfIcwDQYJKoZIhvcNAQEFBQAw
-NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-IFNTTCBDQTAeFw0xMjA2MTUwMDAwMDBaFw0xNTA2MTUyMzU5NTlaMGwxCzAJBgNV
-BAYTAklFMScwJQYDVQQKEx5JbnN0aXR1dGUgb2YgVGVjaG5vbG9neSBUcmFsZWUx
-GjAYBgNVBAsTEUNvbXB1dGVyIFNlcnZpY2VzMRgwFgYDVQQDEw9pZHAuaXR0cmFs
-ZWUuaWUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCxKUs5pMtPd67K
-ZMFt/99ej/P5VoPJbUbOXFiszLIPkrFQ85+D+mVHmw/jwjSsAcfVNRySyoV3j73n
-mNAS6LsQz/sWiphhe2xIgf5dlqS9zzUKmM4ClCZFq43cszbVx+1Jskqa5jGktNR7
-ZwETDmxOkb2LgbxVLANTwxQS0LrkhH0kzHRSho3zw/OeVJ2aBWWfSmQ/8J4s8oDn
-isSkYDo2J0jCOfxL6bKjA/tAwMIE4KELWfTMojeu5apwwdQ7is2sxj5HD4krrlzX
-n06EtBBural5RW8KJKuy/ck4vp4YEh3V79T5wpmcE/y2Lnux6bdBl8bZwhZOPhTe
-naEC7crfAgMBAAGjggPvMIID6zAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3V0fq
-kOO57TAdBgNVHQ4EFgQUekxTs3jqasbfKOoDk/nBK6pIDCswDgYDVR0PAQH/BAQD
-AgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMC
-MBgGA1UdIAQRMA8wDQYLKwYBBAGyMQECAh0wOgYDVR0fBDMwMTAvoC2gK4YpaHR0
-cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcmwwbQYIKwYBBQUH
-AQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRjcy50ZXJlbmEub3JnL1RF
-UkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDovL29jc3AudGNzLnRlcmVu
-YS5vcmcwggKlBgNVHREEggKcMIICmIIPaWRwLml0dHJhbGVlLmllghNlZHVnYXRl
-Lml0dHJhbGVlLmllghllZHVnYXRlLnN0YWZmLml0dHJhbGVlLmllghxlZHVnYXRl
-LnN0dWRlbnRzLml0dHJhbGVlLmllghhlZHVnYXRlLnRlY2guaXR0cmFsZWUuaWWC
-E2VkdXJvYW0uaXR0cmFsZWUuaWWCGWVkdXJvYW0uc3RhZmYuaXR0cmFsZWUuaWWC
-HGVkdXJvYW0uc3R1ZGVudHMuaXR0cmFsZWUuaWWCGGVkdXJvYW0udGVjaC5pdHRy
-YWxlZS5pZYIVaWRwLnN0YWZmLml0dHJhbGVlLmllghhpZHAuc3R1ZGVudHMuaXR0
-cmFsZWUuaWWCFGlkcC50ZWNoLml0dHJhbGVlLmllghlpdHQtZWR1Z2F0ZS0xLml0
-dHJhbGVlLmllgh9pdHQtZWR1Z2F0ZS0xLnN0YWZmLml0dHJhbGVlLmllgiJpdHQt
-ZWR1Z2F0ZS0xLnN0dWRlbnRzLml0dHJhbGVlLmllgh5pdHQtZWR1Z2F0ZS0xLnRl
-Y2guaXR0cmFsZWUuaWWCGWl0dC1lZHVyb2FtLTEuaXR0cmFsZWUuaWWCH2l0dC1l
-ZHVyb2FtLTEuc3RhZmYuaXR0cmFsZWUuaWWCIml0dC1lZHVyb2FtLTEuc3R1ZGVu
-dHMuaXR0cmFsZWUuaWWCHml0dC1lZHVyb2FtLTEudGVjaC5pdHRyYWxlZS5pZYIV
-aXR0LWlkcC0xLml0dHJhbGVlLmllghtpdHQtaWRwLTEuc3RhZmYuaXR0cmFsZWUu
-aWWCHml0dC1pZHAtMS5zdHVkZW50cy5pdHRyYWxlZS5pZYIaaXR0LWlkcC0xLnRl
-Y2guaXR0cmFsZWUuaWUwDQYJKoZIhvcNAQEFBQADggEBAHjXLPk9KPTqPI80e5zR
-qz4gwcjPCrQqryNpQGmytbbfCL4QW7c0PTy/c43ju3gq4MbAttEf1ge77Nl3Yfrq
-CsjKmNYc964eEEYYO7iYix7JyAQLmeu5bkoRFFFUQKnkzl7c3tIf3fDS6d7Sx6D7
-C12B9qDv2qG/nShGhJ2VvpOy+4xynYIjDiwDzpwPbzkXMxrLi0ijaxh6HHcKzhq4
-ZVgVNZ07Tys+K3tmsfmfooBSu5eK68j203D3QHTHI9qbuaYq5E/yWp5+a1NcVRNF
-l8LhNdF4JciKYZNIq8wIAaLgToUhXbzAbMKZhq+FXAxncLCA3bbd+7LrMQW5lAmF
-TVY=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ittralee.ie/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ittralee.ie/idp/profile/SAML2/POST/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Institute of Technology Tralee</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Institute of Technology Tralee</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.ittralee.ie</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Andrew</md:GivenName>
-    <md:SurName>Quirke</md:SurName>
-    <md:EmailAddress>andrew.quirke@staff.ittralee.ie</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Chris</md:GivenName>
-    <md:SurName>Bradshaw</md:SurName>
-    <md:EmailAddress>chris.bradshaw@staff.ittralee.ie</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Padraig</md:GivenName>
-    <md:SurName>Dineen</md:SurName>
-    <md:EmailAddress>padraig.dineen@staff.ittralee.ie</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.ittralee.ie.xml b/swamid-interfederations-2.0/idp.ittralee.ie.xml
deleted file mode 100644
index 24012353..00000000
--- a/swamid-interfederations-2.0/idp.ittralee.ie.xml
+++ /dev/null
@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.ittralee.ie/idp">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.heanet.ie" registrationInstant="2010-11-04T00:00:00Z"/>
-  </md:Extensions>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ittralee.ie</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Institute of Technology Tralee</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="ga">Institiúid Teicneolaíochta, Trá Lí</mdui:DisplayName>
-        <mdui:InformationURL xml:lang="en">http://www.ittralee.ie</mdui:InformationURL>
-        <mdui:Logo height="62" width="248">https://edugate.heanet.ie/rr3/logos/ittra.png</mdui:Logo>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:GeolocationHint>geo:52.28620934512703,-9.67296838760376</mdui:GeolocationHint>
-      </mdui:DiscoHints>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIHHjCCBgagAwIBAgIRAICl/N1E7wMHQx0BHxXzfIcwDQYJKoZIhvcNAQEFBQAw
-NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-IFNTTCBDQTAeFw0xMjA2MTUwMDAwMDBaFw0xNTA2MTUyMzU5NTlaMGwxCzAJBgNV
-BAYTAklFMScwJQYDVQQKEx5JbnN0aXR1dGUgb2YgVGVjaG5vbG9neSBUcmFsZWUx
-GjAYBgNVBAsTEUNvbXB1dGVyIFNlcnZpY2VzMRgwFgYDVQQDEw9pZHAuaXR0cmFs
-ZWUuaWUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCxKUs5pMtPd67K
-ZMFt/99ej/P5VoPJbUbOXFiszLIPkrFQ85+D+mVHmw/jwjSsAcfVNRySyoV3j73n
-mNAS6LsQz/sWiphhe2xIgf5dlqS9zzUKmM4ClCZFq43cszbVx+1Jskqa5jGktNR7
-ZwETDmxOkb2LgbxVLANTwxQS0LrkhH0kzHRSho3zw/OeVJ2aBWWfSmQ/8J4s8oDn
-isSkYDo2J0jCOfxL6bKjA/tAwMIE4KELWfTMojeu5apwwdQ7is2sxj5HD4krrlzX
-n06EtBBural5RW8KJKuy/ck4vp4YEh3V79T5wpmcE/y2Lnux6bdBl8bZwhZOPhTe
-naEC7crfAgMBAAGjggPvMIID6zAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3V0fq
-kOO57TAdBgNVHQ4EFgQUekxTs3jqasbfKOoDk/nBK6pIDCswDgYDVR0PAQH/BAQD
-AgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMC
-MBgGA1UdIAQRMA8wDQYLKwYBBAGyMQECAh0wOgYDVR0fBDMwMTAvoC2gK4YpaHR0
-cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcmwwbQYIKwYBBQUH
-AQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRjcy50ZXJlbmEub3JnL1RF
-UkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDovL29jc3AudGNzLnRlcmVu
-YS5vcmcwggKlBgNVHREEggKcMIICmIIPaWRwLml0dHJhbGVlLmllghNlZHVnYXRl
-Lml0dHJhbGVlLmllghllZHVnYXRlLnN0YWZmLml0dHJhbGVlLmllghxlZHVnYXRl
-LnN0dWRlbnRzLml0dHJhbGVlLmllghhlZHVnYXRlLnRlY2guaXR0cmFsZWUuaWWC
-E2VkdXJvYW0uaXR0cmFsZWUuaWWCGWVkdXJvYW0uc3RhZmYuaXR0cmFsZWUuaWWC
-HGVkdXJvYW0uc3R1ZGVudHMuaXR0cmFsZWUuaWWCGGVkdXJvYW0udGVjaC5pdHRy
-YWxlZS5pZYIVaWRwLnN0YWZmLml0dHJhbGVlLmllghhpZHAuc3R1ZGVudHMuaXR0
-cmFsZWUuaWWCFGlkcC50ZWNoLml0dHJhbGVlLmllghlpdHQtZWR1Z2F0ZS0xLml0
-dHJhbGVlLmllgh9pdHQtZWR1Z2F0ZS0xLnN0YWZmLml0dHJhbGVlLmllgiJpdHQt
-ZWR1Z2F0ZS0xLnN0dWRlbnRzLml0dHJhbGVlLmllgh5pdHQtZWR1Z2F0ZS0xLnRl
-Y2guaXR0cmFsZWUuaWWCGWl0dC1lZHVyb2FtLTEuaXR0cmFsZWUuaWWCH2l0dC1l
-ZHVyb2FtLTEuc3RhZmYuaXR0cmFsZWUuaWWCIml0dC1lZHVyb2FtLTEuc3R1ZGVu
-dHMuaXR0cmFsZWUuaWWCHml0dC1lZHVyb2FtLTEudGVjaC5pdHRyYWxlZS5pZYIV
-aXR0LWlkcC0xLml0dHJhbGVlLmllghtpdHQtaWRwLTEuc3RhZmYuaXR0cmFsZWUu
-aWWCHml0dC1pZHAtMS5zdHVkZW50cy5pdHRyYWxlZS5pZYIaaXR0LWlkcC0xLnRl
-Y2guaXR0cmFsZWUuaWUwDQYJKoZIhvcNAQEFBQADggEBAHjXLPk9KPTqPI80e5zR
-qz4gwcjPCrQqryNpQGmytbbfCL4QW7c0PTy/c43ju3gq4MbAttEf1ge77Nl3Yfrq
-CsjKmNYc964eEEYYO7iYix7JyAQLmeu5bkoRFFFUQKnkzl7c3tIf3fDS6d7Sx6D7
-C12B9qDv2qG/nShGhJ2VvpOy+4xynYIjDiwDzpwPbzkXMxrLi0ijaxh6HHcKzhq4
-ZVgVNZ07Tys+K3tmsfmfooBSu5eK68j203D3QHTHI9qbuaYq5E/yWp5+a1NcVRNF
-l8LhNdF4JciKYZNIq8wIAaLgToUhXbzAbMKZhq+FXAxncLCA3bbd+7LrMQW5lAmF
-TVY=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ittralee.ie/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ittralee.ie/idp/profile/SAML2/POST/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Institute of Technology Tralee</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Institute of Technology Tralee</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.ittralee.ie</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Andrew</md:GivenName>
-    <md:SurName>Quirke</md:SurName>
-    <md:EmailAddress>andrew.quirke@staff.ittralee.ie</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Chris</md:GivenName>
-    <md:SurName>Bradshaw</md:SurName>
-    <md:EmailAddress>chris.bradshaw@staff.ittralee.ie</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Padraig</md:GivenName>
-    <md:SurName>Dineen</md:SurName>
-    <md:EmailAddress>padraig.dineen@staff.ittralee.ie</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.izs.it-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.izs.it-idp-shibboleth.xml
deleted file mode 100644
index 38a556a0..00000000
--- a/swamid-interfederations-2.0/idp.izs.it-idp-shibboleth.xml
+++ /dev/null
@@ -1,111 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" entityID="https://idp.izs.it/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2014-10-27T16:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</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">izs.it</shibmd:Scope>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="it">Istituto Zooprofilattico Sperimentale dell'Abruzzo e del Molise "G. Caporale"</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Istituto Zooprofilattico Sperimentale dell'Abruzzo e del Molise "G. Caporale"</mdui:DisplayName>
-        <mdui:Description xml:lang="it">Identity Provider per gli utenti dell' Istituto Zooprofilattico Sperimentale dell'Abruzzo e del Molise "G. Caporale"</mdui:Description>
-        <mdui:Description xml:lang="en">Identity Provider for the user of Istituto Zooprofilattico Sperimentale dell'Abruzzo e del Molise "G. Caporale"</mdui:Description>
-        <mdui:InformationURL xml:lang="it">http://www.izs.it/IZS/Engine/RAServePG.php/P/695510010701/W/0/L/0</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">http://www.izs.it/IZS/Engine/RAServePG.php/P/695510010701/W/0/L/1</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="it">http://www.izs.it/IZS/Engine/RAServePG.php/P/695610010701/W/0/L/0</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="en">http://www.izs.it/IZS/Engine/RAServePG.php/P/695610010701/W/0/L/1</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDEzCCAfugAwIBAgIUZ8t3b8eAjLbPx7nCcmtLRNfMP/wwDQYJKoZIhvcNAQEF
-BQAwFTETMBEGA1UEAxMKaWRwLml6cy5pdDAeFw0xNDAzMjQxMjI2NTBaFw0zNDAz
-MjQxMjI2NTBaMBUxEzARBgNVBAMTCmlkcC5penMuaXQwggEiMA0GCSqGSIb3DQEB
-AQUAA4IBDwAwggEKAoIBAQCEZQogi++nPZ4OO1lklIcyCvA0W9NCyKLvVybJh1XM
-RT7jCoYa/rcsTS0mXt8sQIhRgC/mYAjIUMAophRaxewLjXiUBzFEdgc2ssP/ooYm
-O90nK5u3huiOav0KjNyS2Noei06yO57Iqx3L7ZJfWj2ligNrdN2HvIv+zMLe6m+d
-5g0tNWeP1Fya2kC9rY4O2yOR826vkJ/B4CLg8nQcOIWFnYWxBfNGWalShUR0K5+o
-RS3FWEda1ngg5ZxuLRKHVbGPU3eF513ZLGBS77aw9/L2dkFuaa8P+s/OQgTGI2Lp
-1CDAysIcxAZldY61BTxUfChYA99zgeQltvLmQMVr4YoPAgMBAAGjWzBZMDgGA1Ud
-EQQxMC+CCmlkcC5penMuaXSGIWh0dHBzOi8vaWRwLml6cy5pdC9pZHAvc2hpYmJv
-bGV0aDAdBgNVHQ4EFgQUgQniglbaB0PJ8a6mBBEG7QB+Z80wDQYJKoZIhvcNAQEF
-BQADggEBACey/uQv50Tla66zVhm4C9Rj6zVJp/QMMNwO0j7BeihE3h4YRVqBrL79
-VhChAhnV8CTuP2g4iSx8ssk/ypw9/vIt54hnEgk16/gc+Fe/5IUk8Sd0ACtrX83u
-wHBi/QTBY+ja7HHUqG1OOItHTOdSkaEA3wMrRICIAem+tc6riyqt7Rdq+TyPVukg
-55oCYkYmDX6wPU/0yWOuR6ZbDthggmsKATteRrT//mM5qLhW0Ddiv5wWqCIlt3Oo
-F0PKMvSLcp+4wF7XpaoMsHY6biufInIY2o4pb+Qie/4VeXMbYG4OEahvxXZl1ugp
-z+ag8yGYGtSO0bWu0ysZBLnaYCV2HDA=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.izs.it:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.izs.it:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.izs.it/idp/profile/SAML2/Redirect/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.izs.it/idp/profile/SAML2/POST/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.izs.it: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.izs.it/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.izs.it/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.izs.it/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.izs.it/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">izs.it</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDEzCCAfugAwIBAgIUZ8t3b8eAjLbPx7nCcmtLRNfMP/wwDQYJKoZIhvcNAQEF
-BQAwFTETMBEGA1UEAxMKaWRwLml6cy5pdDAeFw0xNDAzMjQxMjI2NTBaFw0zNDAz
-MjQxMjI2NTBaMBUxEzARBgNVBAMTCmlkcC5penMuaXQwggEiMA0GCSqGSIb3DQEB
-AQUAA4IBDwAwggEKAoIBAQCEZQogi++nPZ4OO1lklIcyCvA0W9NCyKLvVybJh1XM
-RT7jCoYa/rcsTS0mXt8sQIhRgC/mYAjIUMAophRaxewLjXiUBzFEdgc2ssP/ooYm
-O90nK5u3huiOav0KjNyS2Noei06yO57Iqx3L7ZJfWj2ligNrdN2HvIv+zMLe6m+d
-5g0tNWeP1Fya2kC9rY4O2yOR826vkJ/B4CLg8nQcOIWFnYWxBfNGWalShUR0K5+o
-RS3FWEda1ngg5ZxuLRKHVbGPU3eF513ZLGBS77aw9/L2dkFuaa8P+s/OQgTGI2Lp
-1CDAysIcxAZldY61BTxUfChYA99zgeQltvLmQMVr4YoPAgMBAAGjWzBZMDgGA1Ud
-EQQxMC+CCmlkcC5penMuaXSGIWh0dHBzOi8vaWRwLml6cy5pdC9pZHAvc2hpYmJv
-bGV0aDAdBgNVHQ4EFgQUgQniglbaB0PJ8a6mBBEG7QB+Z80wDQYJKoZIhvcNAQEF
-BQADggEBACey/uQv50Tla66zVhm4C9Rj6zVJp/QMMNwO0j7BeihE3h4YRVqBrL79
-VhChAhnV8CTuP2g4iSx8ssk/ypw9/vIt54hnEgk16/gc+Fe/5IUk8Sd0ACtrX83u
-wHBi/QTBY+ja7HHUqG1OOItHTOdSkaEA3wMrRICIAem+tc6riyqt7Rdq+TyPVukg
-55oCYkYmDX6wPU/0yWOuR6ZbDthggmsKATteRrT//mM5qLhW0Ddiv5wWqCIlt3Oo
-F0PKMvSLcp+4wF7XpaoMsHY6biufInIY2o4pb+Qie/4VeXMbYG4OEahvxXZl1ugp
-z+ag8yGYGtSO0bWu0ysZBLnaYCV2HDA=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.izs.it:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.izs.it: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="it">Istituto Zooprofilattico Sperimentale dell'Abruzzo e del Molise "G. Caporale"</OrganizationName>
-    <OrganizationName xml:lang="en">Istituto Zooprofilattico Sperimentale dell'Abruzzo e del Molise "G. Caporale"</OrganizationName>
-    <OrganizationDisplayName xml:lang="it">Istituto Zooprofilattico Sperimentale dell'Abruzzo e del Molise "G. Caporale"</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">Istituto Zooprofilattico Sperimentale dell'Abruzzo e del Molise "G. Caporale"</OrganizationDisplayName>
-    <OrganizationURL xml:lang="it">http://www.izs.it</OrganizationURL>
-    <OrganizationURL xml:lang="en">http://www.izs.it</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Fabrizio</GivenName>
-    <SurName>Quaranta</SurName>
-    <EmailAddress>idem@izs.it</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Daniele</GivenName>
-    <SurName>Zippo</SurName>
-    <EmailAddress>idem@izs.it</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.izs.it.xml b/swamid-interfederations-2.0/idp.izs.it.xml
deleted file mode 100644
index 38a556a0..00000000
--- a/swamid-interfederations-2.0/idp.izs.it.xml
+++ /dev/null
@@ -1,111 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" entityID="https://idp.izs.it/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2014-10-27T16:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</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">izs.it</shibmd:Scope>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="it">Istituto Zooprofilattico Sperimentale dell'Abruzzo e del Molise "G. Caporale"</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Istituto Zooprofilattico Sperimentale dell'Abruzzo e del Molise "G. Caporale"</mdui:DisplayName>
-        <mdui:Description xml:lang="it">Identity Provider per gli utenti dell' Istituto Zooprofilattico Sperimentale dell'Abruzzo e del Molise "G. Caporale"</mdui:Description>
-        <mdui:Description xml:lang="en">Identity Provider for the user of Istituto Zooprofilattico Sperimentale dell'Abruzzo e del Molise "G. Caporale"</mdui:Description>
-        <mdui:InformationURL xml:lang="it">http://www.izs.it/IZS/Engine/RAServePG.php/P/695510010701/W/0/L/0</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">http://www.izs.it/IZS/Engine/RAServePG.php/P/695510010701/W/0/L/1</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="it">http://www.izs.it/IZS/Engine/RAServePG.php/P/695610010701/W/0/L/0</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="en">http://www.izs.it/IZS/Engine/RAServePG.php/P/695610010701/W/0/L/1</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDEzCCAfugAwIBAgIUZ8t3b8eAjLbPx7nCcmtLRNfMP/wwDQYJKoZIhvcNAQEF
-BQAwFTETMBEGA1UEAxMKaWRwLml6cy5pdDAeFw0xNDAzMjQxMjI2NTBaFw0zNDAz
-MjQxMjI2NTBaMBUxEzARBgNVBAMTCmlkcC5penMuaXQwggEiMA0GCSqGSIb3DQEB
-AQUAA4IBDwAwggEKAoIBAQCEZQogi++nPZ4OO1lklIcyCvA0W9NCyKLvVybJh1XM
-RT7jCoYa/rcsTS0mXt8sQIhRgC/mYAjIUMAophRaxewLjXiUBzFEdgc2ssP/ooYm
-O90nK5u3huiOav0KjNyS2Noei06yO57Iqx3L7ZJfWj2ligNrdN2HvIv+zMLe6m+d
-5g0tNWeP1Fya2kC9rY4O2yOR826vkJ/B4CLg8nQcOIWFnYWxBfNGWalShUR0K5+o
-RS3FWEda1ngg5ZxuLRKHVbGPU3eF513ZLGBS77aw9/L2dkFuaa8P+s/OQgTGI2Lp
-1CDAysIcxAZldY61BTxUfChYA99zgeQltvLmQMVr4YoPAgMBAAGjWzBZMDgGA1Ud
-EQQxMC+CCmlkcC5penMuaXSGIWh0dHBzOi8vaWRwLml6cy5pdC9pZHAvc2hpYmJv
-bGV0aDAdBgNVHQ4EFgQUgQniglbaB0PJ8a6mBBEG7QB+Z80wDQYJKoZIhvcNAQEF
-BQADggEBACey/uQv50Tla66zVhm4C9Rj6zVJp/QMMNwO0j7BeihE3h4YRVqBrL79
-VhChAhnV8CTuP2g4iSx8ssk/ypw9/vIt54hnEgk16/gc+Fe/5IUk8Sd0ACtrX83u
-wHBi/QTBY+ja7HHUqG1OOItHTOdSkaEA3wMrRICIAem+tc6riyqt7Rdq+TyPVukg
-55oCYkYmDX6wPU/0yWOuR6ZbDthggmsKATteRrT//mM5qLhW0Ddiv5wWqCIlt3Oo
-F0PKMvSLcp+4wF7XpaoMsHY6biufInIY2o4pb+Qie/4VeXMbYG4OEahvxXZl1ugp
-z+ag8yGYGtSO0bWu0ysZBLnaYCV2HDA=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.izs.it:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.izs.it:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.izs.it/idp/profile/SAML2/Redirect/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.izs.it/idp/profile/SAML2/POST/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.izs.it: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.izs.it/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.izs.it/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.izs.it/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.izs.it/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">izs.it</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDEzCCAfugAwIBAgIUZ8t3b8eAjLbPx7nCcmtLRNfMP/wwDQYJKoZIhvcNAQEF
-BQAwFTETMBEGA1UEAxMKaWRwLml6cy5pdDAeFw0xNDAzMjQxMjI2NTBaFw0zNDAz
-MjQxMjI2NTBaMBUxEzARBgNVBAMTCmlkcC5penMuaXQwggEiMA0GCSqGSIb3DQEB
-AQUAA4IBDwAwggEKAoIBAQCEZQogi++nPZ4OO1lklIcyCvA0W9NCyKLvVybJh1XM
-RT7jCoYa/rcsTS0mXt8sQIhRgC/mYAjIUMAophRaxewLjXiUBzFEdgc2ssP/ooYm
-O90nK5u3huiOav0KjNyS2Noei06yO57Iqx3L7ZJfWj2ligNrdN2HvIv+zMLe6m+d
-5g0tNWeP1Fya2kC9rY4O2yOR826vkJ/B4CLg8nQcOIWFnYWxBfNGWalShUR0K5+o
-RS3FWEda1ngg5ZxuLRKHVbGPU3eF513ZLGBS77aw9/L2dkFuaa8P+s/OQgTGI2Lp
-1CDAysIcxAZldY61BTxUfChYA99zgeQltvLmQMVr4YoPAgMBAAGjWzBZMDgGA1Ud
-EQQxMC+CCmlkcC5penMuaXSGIWh0dHBzOi8vaWRwLml6cy5pdC9pZHAvc2hpYmJv
-bGV0aDAdBgNVHQ4EFgQUgQniglbaB0PJ8a6mBBEG7QB+Z80wDQYJKoZIhvcNAQEF
-BQADggEBACey/uQv50Tla66zVhm4C9Rj6zVJp/QMMNwO0j7BeihE3h4YRVqBrL79
-VhChAhnV8CTuP2g4iSx8ssk/ypw9/vIt54hnEgk16/gc+Fe/5IUk8Sd0ACtrX83u
-wHBi/QTBY+ja7HHUqG1OOItHTOdSkaEA3wMrRICIAem+tc6riyqt7Rdq+TyPVukg
-55oCYkYmDX6wPU/0yWOuR6ZbDthggmsKATteRrT//mM5qLhW0Ddiv5wWqCIlt3Oo
-F0PKMvSLcp+4wF7XpaoMsHY6biufInIY2o4pb+Qie/4VeXMbYG4OEahvxXZl1ugp
-z+ag8yGYGtSO0bWu0ysZBLnaYCV2HDA=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.izs.it:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.izs.it: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="it">Istituto Zooprofilattico Sperimentale dell'Abruzzo e del Molise "G. Caporale"</OrganizationName>
-    <OrganizationName xml:lang="en">Istituto Zooprofilattico Sperimentale dell'Abruzzo e del Molise "G. Caporale"</OrganizationName>
-    <OrganizationDisplayName xml:lang="it">Istituto Zooprofilattico Sperimentale dell'Abruzzo e del Molise "G. Caporale"</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">Istituto Zooprofilattico Sperimentale dell'Abruzzo e del Molise "G. Caporale"</OrganizationDisplayName>
-    <OrganizationURL xml:lang="it">http://www.izs.it</OrganizationURL>
-    <OrganizationURL xml:lang="en">http://www.izs.it</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Fabrizio</GivenName>
-    <SurName>Quaranta</SurName>
-    <EmailAddress>idem@izs.it</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Daniele</GivenName>
-    <SurName>Zippo</SurName>
-    <EmailAddress>idem@izs.it</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.kb.se-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.kb.se-idp-shibboleth.xml
deleted file mode 100644
index 6bb74f83..00000000
--- a/swamid-interfederations-2.0/idp.kb.se-idp-shibboleth.xml
+++ /dev/null
@@ -1,119 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.kb.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">kb.se</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="sv">Kungliga biblioteket</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">National Library of Sweden</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Identity Provider för Kungliga biblioteket.</mdui:Description>
-        <mdui:Description xml:lang="en">Identity Provider for National Library of Sweden.</mdui:Description>
-        <mdui:Logo height="100" width="86">https://idp.kb.se/idp/images/kb-logo.png</mdui:Logo>
-        <mdui:Keywords xml:lang="sv">Kungliga+biblioteket national+library+of+sweden </mdui:Keywords>
-        <mdui:Keywords xml:lang="en">Kungliga+biblioteket national+library+of+sweden </mdui:Keywords>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DomainHint>kb.se</mdui:DomainHint>
-        <mdui:IPHint>193.10.249.131/32</mdui:IPHint>
-        <mdui:GeolocationHint>geo:59.33822,18.0722617</mdui:GeolocationHint>
-      </mdui:DiscoHints>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDEDCCAfigAwIBAgIVANtF15ZO6H7sUe14fLarTWN68i+6MA0GCSqGSIb3DQEB
-BQUAMBQxEjAQBgNVBAMTCWlkcC5rYi5zZTAeFw0xMjA1MTUwODE2MTZaFw0xMzA1
-MTUwODE2MTZaMBQxEjAQBgNVBAMTCWlkcC5rYi5zZTCCASIwDQYJKoZIhvcNAQEB
-BQADggEPADCCAQoCggEBAI5hTWyo9FvDJLFCHChRYSL1wZ7AsiL+RkBl+ath46EZ
-X4tcmMLg9T5qkveFqR5HQF8BK2+i3XcBmnXYqqCyYCUXc7oiKm83xrssgcP4xlAd
-L2H6rNBOaIG5sUqaU1nNb9BmL0Z8fJaamyX9+rqQSGj5JCGdwwR2CMi14bbJvz2W
-fQsGI8HHqTrAp/1RwG3dHsDXjQUHlaOAF3WWX+P/fYJepJPtHPVaurSllD00GQXf
-fswG4IBz+sdv/rId6ydAHMWc8M+oBVkVLzeOjcNOxrm6xpMjXhlsgJkQVcEVgP99
-MLY4FZ0RNVfzrSNB7WUbOnANFOyYEFdaZOAP6Ff6NS8CAwEAAaNZMFcwNgYDVR0R
-BC8wLYIJaWRwLmtiLnNlhiBodHRwczovL2lkcC5rYi5zZS9pZHAvc2hpYmJvbGV0
-aDAdBgNVHQ4EFgQUXOR57Uvaf5MNiogvbh+Pr2X35FUwDQYJKoZIhvcNAQEFBQAD
-ggEBABf3IMAt91LKUJoNU2VoSaHa+JYfjUkJp29lO1+GacoPrsbMkt4f09ALaqUB
-D3uTAP8IYWyxboESqHNXmk+rFKIYS4j1n6nx+Nomqs4bcY5qUcXOjTEUSKj67D3A
-eqmzb8ICVXHuejQqf1qA0nxSmDqO4ci13W7pF8Sy15J6WY+gi/qvwQLuCE7zD3qM
-FgBz0aBdSFpgIPo6Y7PLEyfutclknp+AE4S/Mzkxyrl72hoyWoct6fPuRVfROFxN
-eXhXEiHIleIlDkOMy3mgyjg2l2azS/K4Um12iEbCxONc8UvQipy2nzJ6XT8qp483
-HoPbenzIMS3KvKqUl64+5qwAZhM=
-
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.kb.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.kb.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://idp.kb.se/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.kb.se/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.kb.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.kb.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">kb.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDEDCCAfigAwIBAgIVANtF15ZO6H7sUe14fLarTWN68i+6MA0GCSqGSIb3DQEB
-BQUAMBQxEjAQBgNVBAMTCWlkcC5rYi5zZTAeFw0xMjA1MTUwODE2MTZaFw0xMzA1
-MTUwODE2MTZaMBQxEjAQBgNVBAMTCWlkcC5rYi5zZTCCASIwDQYJKoZIhvcNAQEB
-BQADggEPADCCAQoCggEBAI5hTWyo9FvDJLFCHChRYSL1wZ7AsiL+RkBl+ath46EZ
-X4tcmMLg9T5qkveFqR5HQF8BK2+i3XcBmnXYqqCyYCUXc7oiKm83xrssgcP4xlAd
-L2H6rNBOaIG5sUqaU1nNb9BmL0Z8fJaamyX9+rqQSGj5JCGdwwR2CMi14bbJvz2W
-fQsGI8HHqTrAp/1RwG3dHsDXjQUHlaOAF3WWX+P/fYJepJPtHPVaurSllD00GQXf
-fswG4IBz+sdv/rId6ydAHMWc8M+oBVkVLzeOjcNOxrm6xpMjXhlsgJkQVcEVgP99
-MLY4FZ0RNVfzrSNB7WUbOnANFOyYEFdaZOAP6Ff6NS8CAwEAAaNZMFcwNgYDVR0R
-BC8wLYIJaWRwLmtiLnNlhiBodHRwczovL2lkcC5rYi5zZS9pZHAvc2hpYmJvbGV0
-aDAdBgNVHQ4EFgQUXOR57Uvaf5MNiogvbh+Pr2X35FUwDQYJKoZIhvcNAQEFBQAD
-ggEBABf3IMAt91LKUJoNU2VoSaHa+JYfjUkJp29lO1+GacoPrsbMkt4f09ALaqUB
-D3uTAP8IYWyxboESqHNXmk+rFKIYS4j1n6nx+Nomqs4bcY5qUcXOjTEUSKj67D3A
-eqmzb8ICVXHuejQqf1qA0nxSmDqO4ci13W7pF8Sy15J6WY+gi/qvwQLuCE7zD3qM
-FgBz0aBdSFpgIPo6Y7PLEyfutclknp+AE4S/Mzkxyrl72hoyWoct6fPuRVfROFxN
-eXhXEiHIleIlDkOMy3mgyjg2l2azS/K4Um12iEbCxONc8UvQipy2nzJ6XT8qp483
-HoPbenzIMS3KvKqUl64+5qwAZhM=
-
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.kb.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.kb.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">KB</OrganizationName>
-    <OrganizationDisplayName xml:lang="sv">Kungliga biblioteket</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">National Library of Sweden</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://kb.se</OrganizationURL>
-  </Organization>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
-    <Company>National Library of Sweden</Company>
-    <SurName>Mattias Olsson</SurName>
-    <EmailAddress>mattias.olsson@kb.se</EmailAddress>
-    <TelephoneNumber>+46700073534</TelephoneNumber>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
-    <Company>National Library of Sweden</Company>
-    <SurName>Mattias Olsson</SurName>
-    <EmailAddress>swamid@kb.se</EmailAddress>
-    <TelephoneNumber>+46700073534</TelephoneNumber>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
-    <Company>National Library of Sweden</Company>
-    <SurName>swamid@kb.se</SurName>
-    <EmailAddress>swamid@kb.se</EmailAddress>
-  </ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.kb.se.xml b/swamid-interfederations-2.0/idp.kb.se.xml
deleted file mode 100644
index 6bb74f83..00000000
--- a/swamid-interfederations-2.0/idp.kb.se.xml
+++ /dev/null
@@ -1,119 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.kb.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">kb.se</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="sv">Kungliga biblioteket</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">National Library of Sweden</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Identity Provider för Kungliga biblioteket.</mdui:Description>
-        <mdui:Description xml:lang="en">Identity Provider for National Library of Sweden.</mdui:Description>
-        <mdui:Logo height="100" width="86">https://idp.kb.se/idp/images/kb-logo.png</mdui:Logo>
-        <mdui:Keywords xml:lang="sv">Kungliga+biblioteket national+library+of+sweden </mdui:Keywords>
-        <mdui:Keywords xml:lang="en">Kungliga+biblioteket national+library+of+sweden </mdui:Keywords>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DomainHint>kb.se</mdui:DomainHint>
-        <mdui:IPHint>193.10.249.131/32</mdui:IPHint>
-        <mdui:GeolocationHint>geo:59.33822,18.0722617</mdui:GeolocationHint>
-      </mdui:DiscoHints>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDEDCCAfigAwIBAgIVANtF15ZO6H7sUe14fLarTWN68i+6MA0GCSqGSIb3DQEB
-BQUAMBQxEjAQBgNVBAMTCWlkcC5rYi5zZTAeFw0xMjA1MTUwODE2MTZaFw0xMzA1
-MTUwODE2MTZaMBQxEjAQBgNVBAMTCWlkcC5rYi5zZTCCASIwDQYJKoZIhvcNAQEB
-BQADggEPADCCAQoCggEBAI5hTWyo9FvDJLFCHChRYSL1wZ7AsiL+RkBl+ath46EZ
-X4tcmMLg9T5qkveFqR5HQF8BK2+i3XcBmnXYqqCyYCUXc7oiKm83xrssgcP4xlAd
-L2H6rNBOaIG5sUqaU1nNb9BmL0Z8fJaamyX9+rqQSGj5JCGdwwR2CMi14bbJvz2W
-fQsGI8HHqTrAp/1RwG3dHsDXjQUHlaOAF3WWX+P/fYJepJPtHPVaurSllD00GQXf
-fswG4IBz+sdv/rId6ydAHMWc8M+oBVkVLzeOjcNOxrm6xpMjXhlsgJkQVcEVgP99
-MLY4FZ0RNVfzrSNB7WUbOnANFOyYEFdaZOAP6Ff6NS8CAwEAAaNZMFcwNgYDVR0R
-BC8wLYIJaWRwLmtiLnNlhiBodHRwczovL2lkcC5rYi5zZS9pZHAvc2hpYmJvbGV0
-aDAdBgNVHQ4EFgQUXOR57Uvaf5MNiogvbh+Pr2X35FUwDQYJKoZIhvcNAQEFBQAD
-ggEBABf3IMAt91LKUJoNU2VoSaHa+JYfjUkJp29lO1+GacoPrsbMkt4f09ALaqUB
-D3uTAP8IYWyxboESqHNXmk+rFKIYS4j1n6nx+Nomqs4bcY5qUcXOjTEUSKj67D3A
-eqmzb8ICVXHuejQqf1qA0nxSmDqO4ci13W7pF8Sy15J6WY+gi/qvwQLuCE7zD3qM
-FgBz0aBdSFpgIPo6Y7PLEyfutclknp+AE4S/Mzkxyrl72hoyWoct6fPuRVfROFxN
-eXhXEiHIleIlDkOMy3mgyjg2l2azS/K4Um12iEbCxONc8UvQipy2nzJ6XT8qp483
-HoPbenzIMS3KvKqUl64+5qwAZhM=
-
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.kb.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.kb.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://idp.kb.se/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.kb.se/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.kb.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.kb.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">kb.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDEDCCAfigAwIBAgIVANtF15ZO6H7sUe14fLarTWN68i+6MA0GCSqGSIb3DQEB
-BQUAMBQxEjAQBgNVBAMTCWlkcC5rYi5zZTAeFw0xMjA1MTUwODE2MTZaFw0xMzA1
-MTUwODE2MTZaMBQxEjAQBgNVBAMTCWlkcC5rYi5zZTCCASIwDQYJKoZIhvcNAQEB
-BQADggEPADCCAQoCggEBAI5hTWyo9FvDJLFCHChRYSL1wZ7AsiL+RkBl+ath46EZ
-X4tcmMLg9T5qkveFqR5HQF8BK2+i3XcBmnXYqqCyYCUXc7oiKm83xrssgcP4xlAd
-L2H6rNBOaIG5sUqaU1nNb9BmL0Z8fJaamyX9+rqQSGj5JCGdwwR2CMi14bbJvz2W
-fQsGI8HHqTrAp/1RwG3dHsDXjQUHlaOAF3WWX+P/fYJepJPtHPVaurSllD00GQXf
-fswG4IBz+sdv/rId6ydAHMWc8M+oBVkVLzeOjcNOxrm6xpMjXhlsgJkQVcEVgP99
-MLY4FZ0RNVfzrSNB7WUbOnANFOyYEFdaZOAP6Ff6NS8CAwEAAaNZMFcwNgYDVR0R
-BC8wLYIJaWRwLmtiLnNlhiBodHRwczovL2lkcC5rYi5zZS9pZHAvc2hpYmJvbGV0
-aDAdBgNVHQ4EFgQUXOR57Uvaf5MNiogvbh+Pr2X35FUwDQYJKoZIhvcNAQEFBQAD
-ggEBABf3IMAt91LKUJoNU2VoSaHa+JYfjUkJp29lO1+GacoPrsbMkt4f09ALaqUB
-D3uTAP8IYWyxboESqHNXmk+rFKIYS4j1n6nx+Nomqs4bcY5qUcXOjTEUSKj67D3A
-eqmzb8ICVXHuejQqf1qA0nxSmDqO4ci13W7pF8Sy15J6WY+gi/qvwQLuCE7zD3qM
-FgBz0aBdSFpgIPo6Y7PLEyfutclknp+AE4S/Mzkxyrl72hoyWoct6fPuRVfROFxN
-eXhXEiHIleIlDkOMy3mgyjg2l2azS/K4Um12iEbCxONc8UvQipy2nzJ6XT8qp483
-HoPbenzIMS3KvKqUl64+5qwAZhM=
-
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.kb.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.kb.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">KB</OrganizationName>
-    <OrganizationDisplayName xml:lang="sv">Kungliga biblioteket</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">National Library of Sweden</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://kb.se</OrganizationURL>
-  </Organization>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
-    <Company>National Library of Sweden</Company>
-    <SurName>Mattias Olsson</SurName>
-    <EmailAddress>mattias.olsson@kb.se</EmailAddress>
-    <TelephoneNumber>+46700073534</TelephoneNumber>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
-    <Company>National Library of Sweden</Company>
-    <SurName>Mattias Olsson</SurName>
-    <EmailAddress>swamid@kb.se</EmailAddress>
-    <TelephoneNumber>+46700073534</TelephoneNumber>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
-    <Company>National Library of Sweden</Company>
-    <SurName>swamid@kb.se</SurName>
-    <EmailAddress>swamid@kb.se</EmailAddress>
-  </ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.lapinamk.fi.xml b/swamid-interfederations-2.0/idp.lapinamk.fi.xml
deleted file mode 100644
index e1e1e9e7..00000000
--- a/swamid-interfederations-2.0/idp.lapinamk.fi.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" 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://idp.lapinamk.fi/idp/shibboleth">
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope regexp="false">edu.tokem.fi</shibmd:Scope>
-      <shibmd:Scope regexp="false">lapinamk.fi</shibmd:Scope>
-      <shibmd:Scope regexp="false">ramk.fi</shibmd:Scope>
-      <shibmd:Scope regexp="false">tokem.fi</shibmd:Scope>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="fi">Lapin ammattikorkeakoulu</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="sv">Lapplands YH</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Lapland UAS</mdui:DisplayName>
-      </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>MIIEbDCCA1SgAwIBAgIRAPU41ovbqC7No8q/JafFb+0wDQYJKoZIhvcNAQEFBQAw
-NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-IFNTTCBDQTAeFw0xNDAxMjMwMDAwMDBaFw0xNzAxMjIyMzU5NTlaMD0xITAfBgNV
-BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEYMBYGA1UEAxMPaWRwLmxhcGlu
-YW1rLmZpMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAr050+KUHu9a+
-je75uUh/iQCBuoBdOtTRN5NHKK4cRKfM2+0+10zSvCxbcbul0T+yKbiHL5fVVOmm
-T3EZ0M0uInzjgICg63u5HmaF90DjFLpBtaZX/TTaWzvdFODFgqnZabyW/30ea7Zq
-5/8b0NK5Q/klEFYO4TIgkkBVwIlI6pGU/X9V596iEPHfyylR2dEIARviYTeqdQg3
-GVig/DngKBcan11pmEu3mhjVJl+yXRQeGhdeNXC7k8e3XMwEn/L2TEFy909qgHdT
-3Jm2y0g7SHzRoPt4UGJVx0t5dYFRPSEfJcxlP6/B5boU0RpYMa3AjBv7Nnk12+Ww
-vNQAf8Mt3wIDAQABo4IBbDCCAWgwHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsrN1dH
-6pDjue0wHQYDVR0OBBYEFBghh/DvfWtZXDg/l/liGeY0dFwlMA4GA1UdDwEB/wQE
-AwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcD
-AjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNVHR8EMzAx
-MC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNy
-bDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNzLnRl
-cmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8vb2Nz
-cC50Y3MudGVyZW5hLm9yZzAaBgNVHREEEzARgg9pZHAubGFwaW5hbWsuZmkwDQYJ
-KoZIhvcNAQEFBQADggEBACI8smMl17k5l6eOmo1E9yZkF/QasMOd7NaiNT7Cmddt
-nAHtPG7nNFJX+Vj7aOhxZb6Dicp8aPueeswp1tX36PLj4QImXwLs/MoZ0DRUpsAI
-dqBucmey2exV/eIsfLoEOGnoe9aJJHbf1FS/0c4JR7PUfKShp7mYrROKmVZ+N/ya
-ohzJ/hrZTS8lhx46mWsy8WJoZyvV8SSU7SJTblRU1rbjhMIwXWGpAXgq69Oa72IY
-SUNstvZgVwotwKijIBs0iDamz8pzrMKBN1Qft+gzNRC19ijM3S+Ydrx23uBOJz9S
-iBFAJu7GLakQ21kx0iJw7Cvw3dG4QswwoiTV55pAx6g=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.lapinamk.fi/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="fi">Lapin amk</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">Lapland University of Applied Sciences</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">Lapplands Yrkeshögskola</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="fi">Lapin amk</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Lapland University of Applied Sciences</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="sv">Lapplands Yrkeshögskola</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="fi">http://www.lapinamk.fi</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.lapinamk.fi</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sv">http://www.lapinamk.fi</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Markku</md:GivenName>
-    <md:SurName>Taipale</md:SurName>
-    <md:EmailAddress>mailto:markku.taipale@lapinamk.fi</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Jukka</md:GivenName>
-    <md:SurName>Heikkila</md:SurName>
-    <md:EmailAddress>mailto:jukka.heikkila@lapinamk.fi</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.lib.cas.cz-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.lib.cas.cz-idp-shibboleth.xml
deleted file mode 100644
index 3bc40c70..00000000
--- a/swamid-interfederations-2.0/idp.lib.cas.cz-idp-shibboleth.xml
+++ /dev/null
@@ -1,129 +0,0 @@
-<?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.lib.cas.cz/idp/shibboleth">
-  <md:Extensions xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata">
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/" registrationInstant="2010-09-15T13:21:26Z">
-      <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>
-    <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://eduid.cz/uri/idp-group/library</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md: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">lib.cas.cz</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Academy of Sciences Library</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="cs">Knihovna AV ČR</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Identity Provider for registered readers the Academy of Sciences Library</mdui:Description>
-        <mdui:Description xml:lang="cs">Identity Provider pro registrované čtenáře Knihovny AV ČR, v. v. i.</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.lib.cas.cz/en/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="cs">http://www.lib.cas.cz/</mdui:InformationURL>
-        <mdui:Logo height="160" width="160">https://www2.eduid.cz/idp-loga/kav.jpg</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>
-MIIEajCCA1KgAwIBAgIRANDI+WBJrLja3Za/spT310swDQYJKoZIhvcNAQEFBQAw
-NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-IFNTTCBDQTAeFw0xMzExMDYwMDAwMDBaFw0xNjExMDUyMzU5NTlaMDwxITAfBgNV
-BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEXMBUGA1UEAxMOaWRwLmxpYi5j
-YXMuY3owggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC2UiWcB63g2umI
-piuSQxJCqI1o14aO+Mw8olLBRIzlXILWvNLERmiGpoJLi/St+mtSBIGkfCglX2EB
-a3BSRu8y39Az8ZRjZIuG/VTnuAMKD9wJZceL8TVFnfX1zlj1SgLWvwnAyp2SFSh5
-y27JjbgBp8ClksUClyOUylzJZXybgaYHkDeCyZn7pAlxZyEeVFZwiC4hjoFXJ2gm
-OujJsC0X447F8Kvc6ke5c0UgoFILkXQoms658pgDBu2qHXuUh4A5lW6ODrylKibk
-ZChPVjRWBOSt7gehbgbAWV5zazX3+7uZ3afmAUer7FSQdreuOGIaWy/8U73KEe58
-LtwxyiO7AgMBAAGjggFrMIIBZzAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3V0fq
-kOO57TAdBgNVHQ4EFgQUMY5I3fB9tUmaTSXXXh11pvaZPUswDgYDVR0PAQH/BAQD
-AgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMC
-MCIGA1UdIAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQIBMDoGA1UdHwQzMDEw
-L6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3Js
-MG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50Y3MudGVy
-ZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9vY3Nw
-LnRjcy50ZXJlbmEub3JnMBkGA1UdEQQSMBCCDmlkcC5saWIuY2FzLmN6MA0GCSqG
-SIb3DQEBBQUAA4IBAQA+Vri4AZx75skYb+IXgYCSE1STg5WzXh8F8yNlU4I2bNc0
-dB+0yKtsx2NUOi5nQfri4D+2m6t8rH8XfB2EPZw8cgYBwtCG9WiZbWPOoq9rJA0y
-L25v25ABvthARggMuToDzEwGmyiAxYC+eBp/FxgluZ4XHCDYz867+t/LkrlzgIH8
-CyKrEqjEQonEbsjXcmQR3x6RAi15ZsMtSfBaZsNsX8/GnetwKXnZ08MSkKkttzpr
-QKFpdZa8ynMvul92d7lW3wfdKHolmbmRHBzRGLvuVgAGNYTSB4CdiW9rfFtB6mkL
-MZs3uXaOQApwJdtTtWG5OieRs7RQptTPuExaKZdb
-		    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.lib.cas.cz:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.lib.cas.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>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.lib.cas.cz/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.lib.cas.cz/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.lib.cas.cz/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.lib.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">lib.cas.cz</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIEajCCA1KgAwIBAgIRANDI+WBJrLja3Za/spT310swDQYJKoZIhvcNAQEFBQAw
-NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-IFNTTCBDQTAeFw0xMzExMDYwMDAwMDBaFw0xNjExMDUyMzU5NTlaMDwxITAfBgNV
-BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEXMBUGA1UEAxMOaWRwLmxpYi5j
-YXMuY3owggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC2UiWcB63g2umI
-piuSQxJCqI1o14aO+Mw8olLBRIzlXILWvNLERmiGpoJLi/St+mtSBIGkfCglX2EB
-a3BSRu8y39Az8ZRjZIuG/VTnuAMKD9wJZceL8TVFnfX1zlj1SgLWvwnAyp2SFSh5
-y27JjbgBp8ClksUClyOUylzJZXybgaYHkDeCyZn7pAlxZyEeVFZwiC4hjoFXJ2gm
-OujJsC0X447F8Kvc6ke5c0UgoFILkXQoms658pgDBu2qHXuUh4A5lW6ODrylKibk
-ZChPVjRWBOSt7gehbgbAWV5zazX3+7uZ3afmAUer7FSQdreuOGIaWy/8U73KEe58
-LtwxyiO7AgMBAAGjggFrMIIBZzAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3V0fq
-kOO57TAdBgNVHQ4EFgQUMY5I3fB9tUmaTSXXXh11pvaZPUswDgYDVR0PAQH/BAQD
-AgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMC
-MCIGA1UdIAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQIBMDoGA1UdHwQzMDEw
-L6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3Js
-MG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50Y3MudGVy
-ZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9vY3Nw
-LnRjcy50ZXJlbmEub3JnMBkGA1UdEQQSMBCCDmlkcC5saWIuY2FzLmN6MA0GCSqG
-SIb3DQEBBQUAA4IBAQA+Vri4AZx75skYb+IXgYCSE1STg5WzXh8F8yNlU4I2bNc0
-dB+0yKtsx2NUOi5nQfri4D+2m6t8rH8XfB2EPZw8cgYBwtCG9WiZbWPOoq9rJA0y
-L25v25ABvthARggMuToDzEwGmyiAxYC+eBp/FxgluZ4XHCDYz867+t/LkrlzgIH8
-CyKrEqjEQonEbsjXcmQR3x6RAi15ZsMtSfBaZsNsX8/GnetwKXnZ08MSkKkttzpr
-QKFpdZa8ynMvul92d7lW3wfdKHolmbmRHBzRGLvuVgAGNYTSB4CdiW9rfFtB6mkL
-MZs3uXaOQApwJdtTtWG5OieRs7RQptTPuExaKZdb
-		    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.lib.cas.cz:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.lib.cas.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>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Academy of Sciences Library</OrganizationName>
-    <OrganizationName xml:lang="cs">Knihovna AV ČR, v. v. i.</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Academy of Sciences Library</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="cs">Knihovna AV ČR, v. v. i.</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.lib.cas.cz/</OrganizationURL>
-    <OrganizationURL xml:lang="cs">http://www.lib.cas.cz/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Martin</GivenName>
-    <SurName>Duda</SurName>
-    <EmailAddress>duda@lib.cas.cz</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.lib.cas.cz.xml b/swamid-interfederations-2.0/idp.lib.cas.cz.xml
deleted file mode 100644
index 3bc40c70..00000000
--- a/swamid-interfederations-2.0/idp.lib.cas.cz.xml
+++ /dev/null
@@ -1,129 +0,0 @@
-<?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.lib.cas.cz/idp/shibboleth">
-  <md:Extensions xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata">
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/" registrationInstant="2010-09-15T13:21:26Z">
-      <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>
-    <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://eduid.cz/uri/idp-group/library</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md: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">lib.cas.cz</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Academy of Sciences Library</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="cs">Knihovna AV ČR</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Identity Provider for registered readers the Academy of Sciences Library</mdui:Description>
-        <mdui:Description xml:lang="cs">Identity Provider pro registrované čtenáře Knihovny AV ČR, v. v. i.</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.lib.cas.cz/en/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="cs">http://www.lib.cas.cz/</mdui:InformationURL>
-        <mdui:Logo height="160" width="160">https://www2.eduid.cz/idp-loga/kav.jpg</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>
-MIIEajCCA1KgAwIBAgIRANDI+WBJrLja3Za/spT310swDQYJKoZIhvcNAQEFBQAw
-NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-IFNTTCBDQTAeFw0xMzExMDYwMDAwMDBaFw0xNjExMDUyMzU5NTlaMDwxITAfBgNV
-BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEXMBUGA1UEAxMOaWRwLmxpYi5j
-YXMuY3owggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC2UiWcB63g2umI
-piuSQxJCqI1o14aO+Mw8olLBRIzlXILWvNLERmiGpoJLi/St+mtSBIGkfCglX2EB
-a3BSRu8y39Az8ZRjZIuG/VTnuAMKD9wJZceL8TVFnfX1zlj1SgLWvwnAyp2SFSh5
-y27JjbgBp8ClksUClyOUylzJZXybgaYHkDeCyZn7pAlxZyEeVFZwiC4hjoFXJ2gm
-OujJsC0X447F8Kvc6ke5c0UgoFILkXQoms658pgDBu2qHXuUh4A5lW6ODrylKibk
-ZChPVjRWBOSt7gehbgbAWV5zazX3+7uZ3afmAUer7FSQdreuOGIaWy/8U73KEe58
-LtwxyiO7AgMBAAGjggFrMIIBZzAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3V0fq
-kOO57TAdBgNVHQ4EFgQUMY5I3fB9tUmaTSXXXh11pvaZPUswDgYDVR0PAQH/BAQD
-AgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMC
-MCIGA1UdIAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQIBMDoGA1UdHwQzMDEw
-L6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3Js
-MG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50Y3MudGVy
-ZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9vY3Nw
-LnRjcy50ZXJlbmEub3JnMBkGA1UdEQQSMBCCDmlkcC5saWIuY2FzLmN6MA0GCSqG
-SIb3DQEBBQUAA4IBAQA+Vri4AZx75skYb+IXgYCSE1STg5WzXh8F8yNlU4I2bNc0
-dB+0yKtsx2NUOi5nQfri4D+2m6t8rH8XfB2EPZw8cgYBwtCG9WiZbWPOoq9rJA0y
-L25v25ABvthARggMuToDzEwGmyiAxYC+eBp/FxgluZ4XHCDYz867+t/LkrlzgIH8
-CyKrEqjEQonEbsjXcmQR3x6RAi15ZsMtSfBaZsNsX8/GnetwKXnZ08MSkKkttzpr
-QKFpdZa8ynMvul92d7lW3wfdKHolmbmRHBzRGLvuVgAGNYTSB4CdiW9rfFtB6mkL
-MZs3uXaOQApwJdtTtWG5OieRs7RQptTPuExaKZdb
-		    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.lib.cas.cz:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.lib.cas.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>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.lib.cas.cz/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.lib.cas.cz/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.lib.cas.cz/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.lib.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">lib.cas.cz</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIEajCCA1KgAwIBAgIRANDI+WBJrLja3Za/spT310swDQYJKoZIhvcNAQEFBQAw
-NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-IFNTTCBDQTAeFw0xMzExMDYwMDAwMDBaFw0xNjExMDUyMzU5NTlaMDwxITAfBgNV
-BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEXMBUGA1UEAxMOaWRwLmxpYi5j
-YXMuY3owggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC2UiWcB63g2umI
-piuSQxJCqI1o14aO+Mw8olLBRIzlXILWvNLERmiGpoJLi/St+mtSBIGkfCglX2EB
-a3BSRu8y39Az8ZRjZIuG/VTnuAMKD9wJZceL8TVFnfX1zlj1SgLWvwnAyp2SFSh5
-y27JjbgBp8ClksUClyOUylzJZXybgaYHkDeCyZn7pAlxZyEeVFZwiC4hjoFXJ2gm
-OujJsC0X447F8Kvc6ke5c0UgoFILkXQoms658pgDBu2qHXuUh4A5lW6ODrylKibk
-ZChPVjRWBOSt7gehbgbAWV5zazX3+7uZ3afmAUer7FSQdreuOGIaWy/8U73KEe58
-LtwxyiO7AgMBAAGjggFrMIIBZzAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3V0fq
-kOO57TAdBgNVHQ4EFgQUMY5I3fB9tUmaTSXXXh11pvaZPUswDgYDVR0PAQH/BAQD
-AgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMC
-MCIGA1UdIAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQIBMDoGA1UdHwQzMDEw
-L6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3Js
-MG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50Y3MudGVy
-ZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9vY3Nw
-LnRjcy50ZXJlbmEub3JnMBkGA1UdEQQSMBCCDmlkcC5saWIuY2FzLmN6MA0GCSqG
-SIb3DQEBBQUAA4IBAQA+Vri4AZx75skYb+IXgYCSE1STg5WzXh8F8yNlU4I2bNc0
-dB+0yKtsx2NUOi5nQfri4D+2m6t8rH8XfB2EPZw8cgYBwtCG9WiZbWPOoq9rJA0y
-L25v25ABvthARggMuToDzEwGmyiAxYC+eBp/FxgluZ4XHCDYz867+t/LkrlzgIH8
-CyKrEqjEQonEbsjXcmQR3x6RAi15ZsMtSfBaZsNsX8/GnetwKXnZ08MSkKkttzpr
-QKFpdZa8ynMvul92d7lW3wfdKHolmbmRHBzRGLvuVgAGNYTSB4CdiW9rfFtB6mkL
-MZs3uXaOQApwJdtTtWG5OieRs7RQptTPuExaKZdb
-		    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.lib.cas.cz:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.lib.cas.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>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Academy of Sciences Library</OrganizationName>
-    <OrganizationName xml:lang="cs">Knihovna AV ČR, v. v. i.</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Academy of Sciences Library</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="cs">Knihovna AV ČR, v. v. i.</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.lib.cas.cz/</OrganizationURL>
-    <OrganizationURL xml:lang="cs">http://www.lib.cas.cz/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Martin</GivenName>
-    <SurName>Duda</SurName>
-    <EmailAddress>duda@lib.cas.cz</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.lrz.de-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.lrz.de-idp-shibboleth.xml
deleted file mode 100644
index 072eb4e5..00000000
--- a/swamid-interfederations-2.0/idp.lrz.de-idp-shibboleth.xml
+++ /dev/null
@@ -1,236 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.lrz.de/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2009-05-27T12:36:25Z">
-      <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">lrz.de</saml1md:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="de">Leibniz-Rechenzentrum (LRZ)</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Leibniz Supercomputing Centre (LRZ)</mdui:DisplayName>
-        <mdui:Description xml:lang="de">Der LRZ Identity Provider bedient Benutzer und Mitarbeiter des Leibniz-Rechenzentrums, insb. auch Supercomputing-Kunden</mdui:Description>
-        <mdui:Description xml:lang="en">The LRZ Identity Provider is used by staff members and users of Leibniz Supercomputing Centre, especially users of supercomputing systems.</mdui:Description>
-        <mdui:Logo height="70" width="360">https://idp.lrz.de/idp/images/lrzlogo.png</mdui:Logo>
-        <mdui:InformationURL xml:lang="de">http://www.lrz.de</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">http://www.lrz.de</mdui:InformationURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>lrzidp.lrz.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=lrzidp.lrz.de,OU=Leibniz-Rechenzentrum,O=Bayerische Akademie der Wissenschaften,L=Garching b. Muenchen,ST=Bayern,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIGTzCCBTegAwIBAgIHGEI+4YLsVDANBgkqhkiG9w0BAQsFADCBnTELMAkGA1UE
-BhMCREUxDzANBgNVBAgTBkJheWVybjERMA8GA1UEBxMITXVlbmNoZW4xHjAcBgNV
-BAoTFUxlaWJuaXotUmVjaGVuemVudHJ1bTEPMA0GA1UECxMGTFJaLUNBMRUwEwYD
-VQQDEwxMUlotQ0EgLSBHMDExIjAgBgkqhkiG9w0BCQEWE3BraUBscnotbXVlbmNo
-ZW4uZGUwHhcNMTQwOTI0MTMwNDE4WhcNMTkwNzA5MjM1OTAwWjCBpjELMAkGA1UE
-BhMCREUxDzANBgNVBAgTBkJheWVybjEdMBsGA1UEBxMUR2FyY2hpbmcgYi4gTXVl
-bmNoZW4xLzAtBgNVBAoTJkJheWVyaXNjaGUgQWthZGVtaWUgZGVyIFdpc3NlbnNj
-aGFmdGVuMR4wHAYDVQQLExVMZWlibml6LVJlY2hlbnplbnRydW0xFjAUBgNVBAMT
-DWxyemlkcC5scnouZGUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCx
-t8+GWafraqMospDHenrOrAISX5HeJurj9I5SVF5gwJVrcgHy6/AOyU/MbrCBL/2O
-tlJCDsg4s8eBZQwx6a1nBbRHzxSmthMr6JDA0+y0FwGzOgUhF/XjEvHMHlIR49HR
-3f5LkO/ZBGWhWulJwD3ERQN0/1BcZMXvRceyqgqpwsLzNBwLwp2YUjoZwRnDMWdu
-Uzy5e0l41lXPhLu+99lO0XnYO5bMai1px2u//w8wtVYxkYRqJ6g1EvrpWJXVTGq2
-E5ezNX80ErAt2ttPP2YAchLxHOax/FOlor8q5Wwo60jkQxIIBTbY9W5ab19WHU52
-32z126AigkiXCMEkcz15AgMBAAGjggKHMIICgzBPBgNVHSAESDBGMBEGDysGAQQB
-ga0hgiwBAQQDAjARBg8rBgEEAYGtIYIsAgEEAwEwDwYNKwYBBAGBrSGCLAEBBDAN
-BgsrBgEEAYGtIYIsHjAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAU
-BggrBgEFBQcDAgYIKwYBBQUHAwEwHQYDVR0OBBYEFL7jMwPY5/3ueZLsMMbBt+vZ
-IbKwMB8GA1UdIwQYMBaAFJZbTHC7b/yc77U/pHr7k/8J6mp2MHYGA1UdEQRvMG2C
-CmlkcC5scnouZGWCC2lkcDEubHJ6LmRlggtpZHAyLmxyei5kZYINbHJ6aWRwLmxy
-ei5kZYIObHJ6aWRwMS5scnouZGWCDmxyemlkcDIubHJ6LmRlgRZ6YnZ3LWNlcnQt
-YWRtaW5AbHJ6LmRlMHcGA1UdHwRwMG4wNaAzoDGGL2h0dHA6Ly9jZHAxLnBjYS5k
-Zm4uZGUvbHJ6LWNhL3B1Yi9jcmwvY2FjcmwuY3JsMDWgM6Axhi9odHRwOi8vY2Rw
-Mi5wY2EuZGZuLmRlL2xyei1jYS9wdWIvY3JsL2NhY3JsLmNybDCBxwYIKwYBBQUH
-AQEEgbowgbcwMwYIKwYBBQUHMAGGJ2h0dHA6Ly9vY3NwLnBjYS5kZm4uZGUvT0NT
-UC1TZXJ2ZXIvT0NTUDA/BggrBgEFBQcwAoYzaHR0cDovL2NkcDEucGNhLmRmbi5k
-ZS9scnotY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MD8GCCsGAQUFBzAChjNodHRw
-Oi8vY2RwMi5wY2EuZGZuLmRlL2xyei1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQw
-DQYJKoZIhvcNAQELBQADggEBADrPD4GN7XpZSyxGBvHy+7fMrJNxyWybTsHkyiAI
-XGUF/jn9m7Bnvucb60PzyzJ5aD63AsaeSxSXDyYpNzne93O1aEtXyveTeFhbRyx1
-Wcf5G1KbRbljULRatUJSOggUWO4HerToAobx4xXyFrD7aPQkGGFVnqemjOnE4A4e
-rl8OfaKkOu43F4KbxVUf2zcSQ5h4qdbwORNXCxNNGfKlzphRMpq7V4B6Z8+i7FCx
-BDOcL0w+IjJuDkD8Jf5DMiEGUIppU2vYOylvYENKX2Mdd4ZMcOw2d1jqC0xC/8qj
-RXNKbj96BedS8e05bbrOSj9H7/qX5osIxDaY+rr6g3HF+2c=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>lrzidp.lrz.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=lrzidp.lrz.de,OU=Leibniz-Rechenzentrum,O=Bayerische Akademie der Wissenschaften,L=Garching b. Muenchen,ST=Bayern,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIGTzCCBTegAwIBAgIHGEI+4YLsVDANBgkqhkiG9w0BAQsFADCBnTELMAkGA1UE
-BhMCREUxDzANBgNVBAgTBkJheWVybjERMA8GA1UEBxMITXVlbmNoZW4xHjAcBgNV
-BAoTFUxlaWJuaXotUmVjaGVuemVudHJ1bTEPMA0GA1UECxMGTFJaLUNBMRUwEwYD
-VQQDEwxMUlotQ0EgLSBHMDExIjAgBgkqhkiG9w0BCQEWE3BraUBscnotbXVlbmNo
-ZW4uZGUwHhcNMTQwOTI0MTMwNDE4WhcNMTkwNzA5MjM1OTAwWjCBpjELMAkGA1UE
-BhMCREUxDzANBgNVBAgTBkJheWVybjEdMBsGA1UEBxMUR2FyY2hpbmcgYi4gTXVl
-bmNoZW4xLzAtBgNVBAoTJkJheWVyaXNjaGUgQWthZGVtaWUgZGVyIFdpc3NlbnNj
-aGFmdGVuMR4wHAYDVQQLExVMZWlibml6LVJlY2hlbnplbnRydW0xFjAUBgNVBAMT
-DWxyemlkcC5scnouZGUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCx
-t8+GWafraqMospDHenrOrAISX5HeJurj9I5SVF5gwJVrcgHy6/AOyU/MbrCBL/2O
-tlJCDsg4s8eBZQwx6a1nBbRHzxSmthMr6JDA0+y0FwGzOgUhF/XjEvHMHlIR49HR
-3f5LkO/ZBGWhWulJwD3ERQN0/1BcZMXvRceyqgqpwsLzNBwLwp2YUjoZwRnDMWdu
-Uzy5e0l41lXPhLu+99lO0XnYO5bMai1px2u//w8wtVYxkYRqJ6g1EvrpWJXVTGq2
-E5ezNX80ErAt2ttPP2YAchLxHOax/FOlor8q5Wwo60jkQxIIBTbY9W5ab19WHU52
-32z126AigkiXCMEkcz15AgMBAAGjggKHMIICgzBPBgNVHSAESDBGMBEGDysGAQQB
-ga0hgiwBAQQDAjARBg8rBgEEAYGtIYIsAgEEAwEwDwYNKwYBBAGBrSGCLAEBBDAN
-BgsrBgEEAYGtIYIsHjAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAU
-BggrBgEFBQcDAgYIKwYBBQUHAwEwHQYDVR0OBBYEFL7jMwPY5/3ueZLsMMbBt+vZ
-IbKwMB8GA1UdIwQYMBaAFJZbTHC7b/yc77U/pHr7k/8J6mp2MHYGA1UdEQRvMG2C
-CmlkcC5scnouZGWCC2lkcDEubHJ6LmRlggtpZHAyLmxyei5kZYINbHJ6aWRwLmxy
-ei5kZYIObHJ6aWRwMS5scnouZGWCDmxyemlkcDIubHJ6LmRlgRZ6YnZ3LWNlcnQt
-YWRtaW5AbHJ6LmRlMHcGA1UdHwRwMG4wNaAzoDGGL2h0dHA6Ly9jZHAxLnBjYS5k
-Zm4uZGUvbHJ6LWNhL3B1Yi9jcmwvY2FjcmwuY3JsMDWgM6Axhi9odHRwOi8vY2Rw
-Mi5wY2EuZGZuLmRlL2xyei1jYS9wdWIvY3JsL2NhY3JsLmNybDCBxwYIKwYBBQUH
-AQEEgbowgbcwMwYIKwYBBQUHMAGGJ2h0dHA6Ly9vY3NwLnBjYS5kZm4uZGUvT0NT
-UC1TZXJ2ZXIvT0NTUDA/BggrBgEFBQcwAoYzaHR0cDovL2NkcDEucGNhLmRmbi5k
-ZS9scnotY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MD8GCCsGAQUFBzAChjNodHRw
-Oi8vY2RwMi5wY2EuZGZuLmRlL2xyei1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQw
-DQYJKoZIhvcNAQELBQADggEBADrPD4GN7XpZSyxGBvHy+7fMrJNxyWybTsHkyiAI
-XGUF/jn9m7Bnvucb60PzyzJ5aD63AsaeSxSXDyYpNzne93O1aEtXyveTeFhbRyx1
-Wcf5G1KbRbljULRatUJSOggUWO4HerToAobx4xXyFrD7aPQkGGFVnqemjOnE4A4e
-rl8OfaKkOu43F4KbxVUf2zcSQ5h4qdbwORNXCxNNGfKlzphRMpq7V4B6Z8+i7FCx
-BDOcL0w+IjJuDkD8Jf5DMiEGUIppU2vYOylvYENKX2Mdd4ZMcOw2d1jqC0xC/8qj
-RXNKbj96BedS8e05bbrOSj9H7/qX5osIxDaY+rr6g3HF+2c=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.lrz.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.lrz.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.lrz.de/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.lrz.de/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.lrz.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">lrz.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>lrzidp.lrz.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=lrzidp.lrz.de,OU=Leibniz-Rechenzentrum,O=Bayerische Akademie der Wissenschaften,L=Garching b. Muenchen,ST=Bayern,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIGTzCCBTegAwIBAgIHGEI+4YLsVDANBgkqhkiG9w0BAQsFADCBnTELMAkGA1UE
-BhMCREUxDzANBgNVBAgTBkJheWVybjERMA8GA1UEBxMITXVlbmNoZW4xHjAcBgNV
-BAoTFUxlaWJuaXotUmVjaGVuemVudHJ1bTEPMA0GA1UECxMGTFJaLUNBMRUwEwYD
-VQQDEwxMUlotQ0EgLSBHMDExIjAgBgkqhkiG9w0BCQEWE3BraUBscnotbXVlbmNo
-ZW4uZGUwHhcNMTQwOTI0MTMwNDE4WhcNMTkwNzA5MjM1OTAwWjCBpjELMAkGA1UE
-BhMCREUxDzANBgNVBAgTBkJheWVybjEdMBsGA1UEBxMUR2FyY2hpbmcgYi4gTXVl
-bmNoZW4xLzAtBgNVBAoTJkJheWVyaXNjaGUgQWthZGVtaWUgZGVyIFdpc3NlbnNj
-aGFmdGVuMR4wHAYDVQQLExVMZWlibml6LVJlY2hlbnplbnRydW0xFjAUBgNVBAMT
-DWxyemlkcC5scnouZGUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCx
-t8+GWafraqMospDHenrOrAISX5HeJurj9I5SVF5gwJVrcgHy6/AOyU/MbrCBL/2O
-tlJCDsg4s8eBZQwx6a1nBbRHzxSmthMr6JDA0+y0FwGzOgUhF/XjEvHMHlIR49HR
-3f5LkO/ZBGWhWulJwD3ERQN0/1BcZMXvRceyqgqpwsLzNBwLwp2YUjoZwRnDMWdu
-Uzy5e0l41lXPhLu+99lO0XnYO5bMai1px2u//w8wtVYxkYRqJ6g1EvrpWJXVTGq2
-E5ezNX80ErAt2ttPP2YAchLxHOax/FOlor8q5Wwo60jkQxIIBTbY9W5ab19WHU52
-32z126AigkiXCMEkcz15AgMBAAGjggKHMIICgzBPBgNVHSAESDBGMBEGDysGAQQB
-ga0hgiwBAQQDAjARBg8rBgEEAYGtIYIsAgEEAwEwDwYNKwYBBAGBrSGCLAEBBDAN
-BgsrBgEEAYGtIYIsHjAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAU
-BggrBgEFBQcDAgYIKwYBBQUHAwEwHQYDVR0OBBYEFL7jMwPY5/3ueZLsMMbBt+vZ
-IbKwMB8GA1UdIwQYMBaAFJZbTHC7b/yc77U/pHr7k/8J6mp2MHYGA1UdEQRvMG2C
-CmlkcC5scnouZGWCC2lkcDEubHJ6LmRlggtpZHAyLmxyei5kZYINbHJ6aWRwLmxy
-ei5kZYIObHJ6aWRwMS5scnouZGWCDmxyemlkcDIubHJ6LmRlgRZ6YnZ3LWNlcnQt
-YWRtaW5AbHJ6LmRlMHcGA1UdHwRwMG4wNaAzoDGGL2h0dHA6Ly9jZHAxLnBjYS5k
-Zm4uZGUvbHJ6LWNhL3B1Yi9jcmwvY2FjcmwuY3JsMDWgM6Axhi9odHRwOi8vY2Rw
-Mi5wY2EuZGZuLmRlL2xyei1jYS9wdWIvY3JsL2NhY3JsLmNybDCBxwYIKwYBBQUH
-AQEEgbowgbcwMwYIKwYBBQUHMAGGJ2h0dHA6Ly9vY3NwLnBjYS5kZm4uZGUvT0NT
-UC1TZXJ2ZXIvT0NTUDA/BggrBgEFBQcwAoYzaHR0cDovL2NkcDEucGNhLmRmbi5k
-ZS9scnotY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MD8GCCsGAQUFBzAChjNodHRw
-Oi8vY2RwMi5wY2EuZGZuLmRlL2xyei1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQw
-DQYJKoZIhvcNAQELBQADggEBADrPD4GN7XpZSyxGBvHy+7fMrJNxyWybTsHkyiAI
-XGUF/jn9m7Bnvucb60PzyzJ5aD63AsaeSxSXDyYpNzne93O1aEtXyveTeFhbRyx1
-Wcf5G1KbRbljULRatUJSOggUWO4HerToAobx4xXyFrD7aPQkGGFVnqemjOnE4A4e
-rl8OfaKkOu43F4KbxVUf2zcSQ5h4qdbwORNXCxNNGfKlzphRMpq7V4B6Z8+i7FCx
-BDOcL0w+IjJuDkD8Jf5DMiEGUIppU2vYOylvYENKX2Mdd4ZMcOw2d1jqC0xC/8qj
-RXNKbj96BedS8e05bbrOSj9H7/qX5osIxDaY+rr6g3HF+2c=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>lrzidp.lrz.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=lrzidp.lrz.de,OU=Leibniz-Rechenzentrum,O=Bayerische Akademie der Wissenschaften,L=Garching b. Muenchen,ST=Bayern,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIGTzCCBTegAwIBAgIHGEI+4YLsVDANBgkqhkiG9w0BAQsFADCBnTELMAkGA1UE
-BhMCREUxDzANBgNVBAgTBkJheWVybjERMA8GA1UEBxMITXVlbmNoZW4xHjAcBgNV
-BAoTFUxlaWJuaXotUmVjaGVuemVudHJ1bTEPMA0GA1UECxMGTFJaLUNBMRUwEwYD
-VQQDEwxMUlotQ0EgLSBHMDExIjAgBgkqhkiG9w0BCQEWE3BraUBscnotbXVlbmNo
-ZW4uZGUwHhcNMTQwOTI0MTMwNDE4WhcNMTkwNzA5MjM1OTAwWjCBpjELMAkGA1UE
-BhMCREUxDzANBgNVBAgTBkJheWVybjEdMBsGA1UEBxMUR2FyY2hpbmcgYi4gTXVl
-bmNoZW4xLzAtBgNVBAoTJkJheWVyaXNjaGUgQWthZGVtaWUgZGVyIFdpc3NlbnNj
-aGFmdGVuMR4wHAYDVQQLExVMZWlibml6LVJlY2hlbnplbnRydW0xFjAUBgNVBAMT
-DWxyemlkcC5scnouZGUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCx
-t8+GWafraqMospDHenrOrAISX5HeJurj9I5SVF5gwJVrcgHy6/AOyU/MbrCBL/2O
-tlJCDsg4s8eBZQwx6a1nBbRHzxSmthMr6JDA0+y0FwGzOgUhF/XjEvHMHlIR49HR
-3f5LkO/ZBGWhWulJwD3ERQN0/1BcZMXvRceyqgqpwsLzNBwLwp2YUjoZwRnDMWdu
-Uzy5e0l41lXPhLu+99lO0XnYO5bMai1px2u//w8wtVYxkYRqJ6g1EvrpWJXVTGq2
-E5ezNX80ErAt2ttPP2YAchLxHOax/FOlor8q5Wwo60jkQxIIBTbY9W5ab19WHU52
-32z126AigkiXCMEkcz15AgMBAAGjggKHMIICgzBPBgNVHSAESDBGMBEGDysGAQQB
-ga0hgiwBAQQDAjARBg8rBgEEAYGtIYIsAgEEAwEwDwYNKwYBBAGBrSGCLAEBBDAN
-BgsrBgEEAYGtIYIsHjAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAU
-BggrBgEFBQcDAgYIKwYBBQUHAwEwHQYDVR0OBBYEFL7jMwPY5/3ueZLsMMbBt+vZ
-IbKwMB8GA1UdIwQYMBaAFJZbTHC7b/yc77U/pHr7k/8J6mp2MHYGA1UdEQRvMG2C
-CmlkcC5scnouZGWCC2lkcDEubHJ6LmRlggtpZHAyLmxyei5kZYINbHJ6aWRwLmxy
-ei5kZYIObHJ6aWRwMS5scnouZGWCDmxyemlkcDIubHJ6LmRlgRZ6YnZ3LWNlcnQt
-YWRtaW5AbHJ6LmRlMHcGA1UdHwRwMG4wNaAzoDGGL2h0dHA6Ly9jZHAxLnBjYS5k
-Zm4uZGUvbHJ6LWNhL3B1Yi9jcmwvY2FjcmwuY3JsMDWgM6Axhi9odHRwOi8vY2Rw
-Mi5wY2EuZGZuLmRlL2xyei1jYS9wdWIvY3JsL2NhY3JsLmNybDCBxwYIKwYBBQUH
-AQEEgbowgbcwMwYIKwYBBQUHMAGGJ2h0dHA6Ly9vY3NwLnBjYS5kZm4uZGUvT0NT
-UC1TZXJ2ZXIvT0NTUDA/BggrBgEFBQcwAoYzaHR0cDovL2NkcDEucGNhLmRmbi5k
-ZS9scnotY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MD8GCCsGAQUFBzAChjNodHRw
-Oi8vY2RwMi5wY2EuZGZuLmRlL2xyei1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQw
-DQYJKoZIhvcNAQELBQADggEBADrPD4GN7XpZSyxGBvHy+7fMrJNxyWybTsHkyiAI
-XGUF/jn9m7Bnvucb60PzyzJ5aD63AsaeSxSXDyYpNzne93O1aEtXyveTeFhbRyx1
-Wcf5G1KbRbljULRatUJSOggUWO4HerToAobx4xXyFrD7aPQkGGFVnqemjOnE4A4e
-rl8OfaKkOu43F4KbxVUf2zcSQ5h4qdbwORNXCxNNGfKlzphRMpq7V4B6Z8+i7FCx
-BDOcL0w+IjJuDkD8Jf5DMiEGUIppU2vYOylvYENKX2Mdd4ZMcOw2d1jqC0xC/8qj
-RXNKbj96BedS8e05bbrOSj9H7/qX5osIxDaY+rr6g3HF+2c=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.lrz.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.lrz.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">e38</OrganizationName>
-    <OrganizationName xml:lang="en">e38</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">Leibniz-Rechenzentrum der Bayerischen Akademie der Wissenschaften</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">Leibniz Supercomputing Centre (LRZ) of the Bavarian Academy of Sciences and Humanities</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.lrz.de</OrganizationURL>
-    <OrganizationURL xml:lang="en">http://www.lrz.de/english/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="administrative">
-    <GivenName>Ralf</GivenName>
-    <SurName>Ebner</SurName>
-    <EmailAddress>mailto:shibboleth@lrz.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Ralf</GivenName>
-    <SurName>Ebner</SurName>
-    <EmailAddress>mailto:shibboleth@lrz.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="support">
-    <GivenName>Ralf</GivenName>
-    <SurName>Ebner</SurName>
-    <EmailAddress>mailto:shibboleth@lrz.de</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.lrz.de.xml b/swamid-interfederations-2.0/idp.lrz.de.xml
deleted file mode 100644
index 072eb4e5..00000000
--- a/swamid-interfederations-2.0/idp.lrz.de.xml
+++ /dev/null
@@ -1,236 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.lrz.de/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2009-05-27T12:36:25Z">
-      <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">lrz.de</saml1md:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="de">Leibniz-Rechenzentrum (LRZ)</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Leibniz Supercomputing Centre (LRZ)</mdui:DisplayName>
-        <mdui:Description xml:lang="de">Der LRZ Identity Provider bedient Benutzer und Mitarbeiter des Leibniz-Rechenzentrums, insb. auch Supercomputing-Kunden</mdui:Description>
-        <mdui:Description xml:lang="en">The LRZ Identity Provider is used by staff members and users of Leibniz Supercomputing Centre, especially users of supercomputing systems.</mdui:Description>
-        <mdui:Logo height="70" width="360">https://idp.lrz.de/idp/images/lrzlogo.png</mdui:Logo>
-        <mdui:InformationURL xml:lang="de">http://www.lrz.de</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">http://www.lrz.de</mdui:InformationURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>lrzidp.lrz.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=lrzidp.lrz.de,OU=Leibniz-Rechenzentrum,O=Bayerische Akademie der Wissenschaften,L=Garching b. Muenchen,ST=Bayern,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIGTzCCBTegAwIBAgIHGEI+4YLsVDANBgkqhkiG9w0BAQsFADCBnTELMAkGA1UE
-BhMCREUxDzANBgNVBAgTBkJheWVybjERMA8GA1UEBxMITXVlbmNoZW4xHjAcBgNV
-BAoTFUxlaWJuaXotUmVjaGVuemVudHJ1bTEPMA0GA1UECxMGTFJaLUNBMRUwEwYD
-VQQDEwxMUlotQ0EgLSBHMDExIjAgBgkqhkiG9w0BCQEWE3BraUBscnotbXVlbmNo
-ZW4uZGUwHhcNMTQwOTI0MTMwNDE4WhcNMTkwNzA5MjM1OTAwWjCBpjELMAkGA1UE
-BhMCREUxDzANBgNVBAgTBkJheWVybjEdMBsGA1UEBxMUR2FyY2hpbmcgYi4gTXVl
-bmNoZW4xLzAtBgNVBAoTJkJheWVyaXNjaGUgQWthZGVtaWUgZGVyIFdpc3NlbnNj
-aGFmdGVuMR4wHAYDVQQLExVMZWlibml6LVJlY2hlbnplbnRydW0xFjAUBgNVBAMT
-DWxyemlkcC5scnouZGUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCx
-t8+GWafraqMospDHenrOrAISX5HeJurj9I5SVF5gwJVrcgHy6/AOyU/MbrCBL/2O
-tlJCDsg4s8eBZQwx6a1nBbRHzxSmthMr6JDA0+y0FwGzOgUhF/XjEvHMHlIR49HR
-3f5LkO/ZBGWhWulJwD3ERQN0/1BcZMXvRceyqgqpwsLzNBwLwp2YUjoZwRnDMWdu
-Uzy5e0l41lXPhLu+99lO0XnYO5bMai1px2u//w8wtVYxkYRqJ6g1EvrpWJXVTGq2
-E5ezNX80ErAt2ttPP2YAchLxHOax/FOlor8q5Wwo60jkQxIIBTbY9W5ab19WHU52
-32z126AigkiXCMEkcz15AgMBAAGjggKHMIICgzBPBgNVHSAESDBGMBEGDysGAQQB
-ga0hgiwBAQQDAjARBg8rBgEEAYGtIYIsAgEEAwEwDwYNKwYBBAGBrSGCLAEBBDAN
-BgsrBgEEAYGtIYIsHjAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAU
-BggrBgEFBQcDAgYIKwYBBQUHAwEwHQYDVR0OBBYEFL7jMwPY5/3ueZLsMMbBt+vZ
-IbKwMB8GA1UdIwQYMBaAFJZbTHC7b/yc77U/pHr7k/8J6mp2MHYGA1UdEQRvMG2C
-CmlkcC5scnouZGWCC2lkcDEubHJ6LmRlggtpZHAyLmxyei5kZYINbHJ6aWRwLmxy
-ei5kZYIObHJ6aWRwMS5scnouZGWCDmxyemlkcDIubHJ6LmRlgRZ6YnZ3LWNlcnQt
-YWRtaW5AbHJ6LmRlMHcGA1UdHwRwMG4wNaAzoDGGL2h0dHA6Ly9jZHAxLnBjYS5k
-Zm4uZGUvbHJ6LWNhL3B1Yi9jcmwvY2FjcmwuY3JsMDWgM6Axhi9odHRwOi8vY2Rw
-Mi5wY2EuZGZuLmRlL2xyei1jYS9wdWIvY3JsL2NhY3JsLmNybDCBxwYIKwYBBQUH
-AQEEgbowgbcwMwYIKwYBBQUHMAGGJ2h0dHA6Ly9vY3NwLnBjYS5kZm4uZGUvT0NT
-UC1TZXJ2ZXIvT0NTUDA/BggrBgEFBQcwAoYzaHR0cDovL2NkcDEucGNhLmRmbi5k
-ZS9scnotY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MD8GCCsGAQUFBzAChjNodHRw
-Oi8vY2RwMi5wY2EuZGZuLmRlL2xyei1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQw
-DQYJKoZIhvcNAQELBQADggEBADrPD4GN7XpZSyxGBvHy+7fMrJNxyWybTsHkyiAI
-XGUF/jn9m7Bnvucb60PzyzJ5aD63AsaeSxSXDyYpNzne93O1aEtXyveTeFhbRyx1
-Wcf5G1KbRbljULRatUJSOggUWO4HerToAobx4xXyFrD7aPQkGGFVnqemjOnE4A4e
-rl8OfaKkOu43F4KbxVUf2zcSQ5h4qdbwORNXCxNNGfKlzphRMpq7V4B6Z8+i7FCx
-BDOcL0w+IjJuDkD8Jf5DMiEGUIppU2vYOylvYENKX2Mdd4ZMcOw2d1jqC0xC/8qj
-RXNKbj96BedS8e05bbrOSj9H7/qX5osIxDaY+rr6g3HF+2c=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>lrzidp.lrz.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=lrzidp.lrz.de,OU=Leibniz-Rechenzentrum,O=Bayerische Akademie der Wissenschaften,L=Garching b. Muenchen,ST=Bayern,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIGTzCCBTegAwIBAgIHGEI+4YLsVDANBgkqhkiG9w0BAQsFADCBnTELMAkGA1UE
-BhMCREUxDzANBgNVBAgTBkJheWVybjERMA8GA1UEBxMITXVlbmNoZW4xHjAcBgNV
-BAoTFUxlaWJuaXotUmVjaGVuemVudHJ1bTEPMA0GA1UECxMGTFJaLUNBMRUwEwYD
-VQQDEwxMUlotQ0EgLSBHMDExIjAgBgkqhkiG9w0BCQEWE3BraUBscnotbXVlbmNo
-ZW4uZGUwHhcNMTQwOTI0MTMwNDE4WhcNMTkwNzA5MjM1OTAwWjCBpjELMAkGA1UE
-BhMCREUxDzANBgNVBAgTBkJheWVybjEdMBsGA1UEBxMUR2FyY2hpbmcgYi4gTXVl
-bmNoZW4xLzAtBgNVBAoTJkJheWVyaXNjaGUgQWthZGVtaWUgZGVyIFdpc3NlbnNj
-aGFmdGVuMR4wHAYDVQQLExVMZWlibml6LVJlY2hlbnplbnRydW0xFjAUBgNVBAMT
-DWxyemlkcC5scnouZGUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCx
-t8+GWafraqMospDHenrOrAISX5HeJurj9I5SVF5gwJVrcgHy6/AOyU/MbrCBL/2O
-tlJCDsg4s8eBZQwx6a1nBbRHzxSmthMr6JDA0+y0FwGzOgUhF/XjEvHMHlIR49HR
-3f5LkO/ZBGWhWulJwD3ERQN0/1BcZMXvRceyqgqpwsLzNBwLwp2YUjoZwRnDMWdu
-Uzy5e0l41lXPhLu+99lO0XnYO5bMai1px2u//w8wtVYxkYRqJ6g1EvrpWJXVTGq2
-E5ezNX80ErAt2ttPP2YAchLxHOax/FOlor8q5Wwo60jkQxIIBTbY9W5ab19WHU52
-32z126AigkiXCMEkcz15AgMBAAGjggKHMIICgzBPBgNVHSAESDBGMBEGDysGAQQB
-ga0hgiwBAQQDAjARBg8rBgEEAYGtIYIsAgEEAwEwDwYNKwYBBAGBrSGCLAEBBDAN
-BgsrBgEEAYGtIYIsHjAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAU
-BggrBgEFBQcDAgYIKwYBBQUHAwEwHQYDVR0OBBYEFL7jMwPY5/3ueZLsMMbBt+vZ
-IbKwMB8GA1UdIwQYMBaAFJZbTHC7b/yc77U/pHr7k/8J6mp2MHYGA1UdEQRvMG2C
-CmlkcC5scnouZGWCC2lkcDEubHJ6LmRlggtpZHAyLmxyei5kZYINbHJ6aWRwLmxy
-ei5kZYIObHJ6aWRwMS5scnouZGWCDmxyemlkcDIubHJ6LmRlgRZ6YnZ3LWNlcnQt
-YWRtaW5AbHJ6LmRlMHcGA1UdHwRwMG4wNaAzoDGGL2h0dHA6Ly9jZHAxLnBjYS5k
-Zm4uZGUvbHJ6LWNhL3B1Yi9jcmwvY2FjcmwuY3JsMDWgM6Axhi9odHRwOi8vY2Rw
-Mi5wY2EuZGZuLmRlL2xyei1jYS9wdWIvY3JsL2NhY3JsLmNybDCBxwYIKwYBBQUH
-AQEEgbowgbcwMwYIKwYBBQUHMAGGJ2h0dHA6Ly9vY3NwLnBjYS5kZm4uZGUvT0NT
-UC1TZXJ2ZXIvT0NTUDA/BggrBgEFBQcwAoYzaHR0cDovL2NkcDEucGNhLmRmbi5k
-ZS9scnotY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MD8GCCsGAQUFBzAChjNodHRw
-Oi8vY2RwMi5wY2EuZGZuLmRlL2xyei1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQw
-DQYJKoZIhvcNAQELBQADggEBADrPD4GN7XpZSyxGBvHy+7fMrJNxyWybTsHkyiAI
-XGUF/jn9m7Bnvucb60PzyzJ5aD63AsaeSxSXDyYpNzne93O1aEtXyveTeFhbRyx1
-Wcf5G1KbRbljULRatUJSOggUWO4HerToAobx4xXyFrD7aPQkGGFVnqemjOnE4A4e
-rl8OfaKkOu43F4KbxVUf2zcSQ5h4qdbwORNXCxNNGfKlzphRMpq7V4B6Z8+i7FCx
-BDOcL0w+IjJuDkD8Jf5DMiEGUIppU2vYOylvYENKX2Mdd4ZMcOw2d1jqC0xC/8qj
-RXNKbj96BedS8e05bbrOSj9H7/qX5osIxDaY+rr6g3HF+2c=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.lrz.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.lrz.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.lrz.de/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.lrz.de/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.lrz.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">lrz.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>lrzidp.lrz.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=lrzidp.lrz.de,OU=Leibniz-Rechenzentrum,O=Bayerische Akademie der Wissenschaften,L=Garching b. Muenchen,ST=Bayern,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIGTzCCBTegAwIBAgIHGEI+4YLsVDANBgkqhkiG9w0BAQsFADCBnTELMAkGA1UE
-BhMCREUxDzANBgNVBAgTBkJheWVybjERMA8GA1UEBxMITXVlbmNoZW4xHjAcBgNV
-BAoTFUxlaWJuaXotUmVjaGVuemVudHJ1bTEPMA0GA1UECxMGTFJaLUNBMRUwEwYD
-VQQDEwxMUlotQ0EgLSBHMDExIjAgBgkqhkiG9w0BCQEWE3BraUBscnotbXVlbmNo
-ZW4uZGUwHhcNMTQwOTI0MTMwNDE4WhcNMTkwNzA5MjM1OTAwWjCBpjELMAkGA1UE
-BhMCREUxDzANBgNVBAgTBkJheWVybjEdMBsGA1UEBxMUR2FyY2hpbmcgYi4gTXVl
-bmNoZW4xLzAtBgNVBAoTJkJheWVyaXNjaGUgQWthZGVtaWUgZGVyIFdpc3NlbnNj
-aGFmdGVuMR4wHAYDVQQLExVMZWlibml6LVJlY2hlbnplbnRydW0xFjAUBgNVBAMT
-DWxyemlkcC5scnouZGUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCx
-t8+GWafraqMospDHenrOrAISX5HeJurj9I5SVF5gwJVrcgHy6/AOyU/MbrCBL/2O
-tlJCDsg4s8eBZQwx6a1nBbRHzxSmthMr6JDA0+y0FwGzOgUhF/XjEvHMHlIR49HR
-3f5LkO/ZBGWhWulJwD3ERQN0/1BcZMXvRceyqgqpwsLzNBwLwp2YUjoZwRnDMWdu
-Uzy5e0l41lXPhLu+99lO0XnYO5bMai1px2u//w8wtVYxkYRqJ6g1EvrpWJXVTGq2
-E5ezNX80ErAt2ttPP2YAchLxHOax/FOlor8q5Wwo60jkQxIIBTbY9W5ab19WHU52
-32z126AigkiXCMEkcz15AgMBAAGjggKHMIICgzBPBgNVHSAESDBGMBEGDysGAQQB
-ga0hgiwBAQQDAjARBg8rBgEEAYGtIYIsAgEEAwEwDwYNKwYBBAGBrSGCLAEBBDAN
-BgsrBgEEAYGtIYIsHjAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAU
-BggrBgEFBQcDAgYIKwYBBQUHAwEwHQYDVR0OBBYEFL7jMwPY5/3ueZLsMMbBt+vZ
-IbKwMB8GA1UdIwQYMBaAFJZbTHC7b/yc77U/pHr7k/8J6mp2MHYGA1UdEQRvMG2C
-CmlkcC5scnouZGWCC2lkcDEubHJ6LmRlggtpZHAyLmxyei5kZYINbHJ6aWRwLmxy
-ei5kZYIObHJ6aWRwMS5scnouZGWCDmxyemlkcDIubHJ6LmRlgRZ6YnZ3LWNlcnQt
-YWRtaW5AbHJ6LmRlMHcGA1UdHwRwMG4wNaAzoDGGL2h0dHA6Ly9jZHAxLnBjYS5k
-Zm4uZGUvbHJ6LWNhL3B1Yi9jcmwvY2FjcmwuY3JsMDWgM6Axhi9odHRwOi8vY2Rw
-Mi5wY2EuZGZuLmRlL2xyei1jYS9wdWIvY3JsL2NhY3JsLmNybDCBxwYIKwYBBQUH
-AQEEgbowgbcwMwYIKwYBBQUHMAGGJ2h0dHA6Ly9vY3NwLnBjYS5kZm4uZGUvT0NT
-UC1TZXJ2ZXIvT0NTUDA/BggrBgEFBQcwAoYzaHR0cDovL2NkcDEucGNhLmRmbi5k
-ZS9scnotY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MD8GCCsGAQUFBzAChjNodHRw
-Oi8vY2RwMi5wY2EuZGZuLmRlL2xyei1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQw
-DQYJKoZIhvcNAQELBQADggEBADrPD4GN7XpZSyxGBvHy+7fMrJNxyWybTsHkyiAI
-XGUF/jn9m7Bnvucb60PzyzJ5aD63AsaeSxSXDyYpNzne93O1aEtXyveTeFhbRyx1
-Wcf5G1KbRbljULRatUJSOggUWO4HerToAobx4xXyFrD7aPQkGGFVnqemjOnE4A4e
-rl8OfaKkOu43F4KbxVUf2zcSQ5h4qdbwORNXCxNNGfKlzphRMpq7V4B6Z8+i7FCx
-BDOcL0w+IjJuDkD8Jf5DMiEGUIppU2vYOylvYENKX2Mdd4ZMcOw2d1jqC0xC/8qj
-RXNKbj96BedS8e05bbrOSj9H7/qX5osIxDaY+rr6g3HF+2c=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>lrzidp.lrz.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=lrzidp.lrz.de,OU=Leibniz-Rechenzentrum,O=Bayerische Akademie der Wissenschaften,L=Garching b. Muenchen,ST=Bayern,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIGTzCCBTegAwIBAgIHGEI+4YLsVDANBgkqhkiG9w0BAQsFADCBnTELMAkGA1UE
-BhMCREUxDzANBgNVBAgTBkJheWVybjERMA8GA1UEBxMITXVlbmNoZW4xHjAcBgNV
-BAoTFUxlaWJuaXotUmVjaGVuemVudHJ1bTEPMA0GA1UECxMGTFJaLUNBMRUwEwYD
-VQQDEwxMUlotQ0EgLSBHMDExIjAgBgkqhkiG9w0BCQEWE3BraUBscnotbXVlbmNo
-ZW4uZGUwHhcNMTQwOTI0MTMwNDE4WhcNMTkwNzA5MjM1OTAwWjCBpjELMAkGA1UE
-BhMCREUxDzANBgNVBAgTBkJheWVybjEdMBsGA1UEBxMUR2FyY2hpbmcgYi4gTXVl
-bmNoZW4xLzAtBgNVBAoTJkJheWVyaXNjaGUgQWthZGVtaWUgZGVyIFdpc3NlbnNj
-aGFmdGVuMR4wHAYDVQQLExVMZWlibml6LVJlY2hlbnplbnRydW0xFjAUBgNVBAMT
-DWxyemlkcC5scnouZGUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCx
-t8+GWafraqMospDHenrOrAISX5HeJurj9I5SVF5gwJVrcgHy6/AOyU/MbrCBL/2O
-tlJCDsg4s8eBZQwx6a1nBbRHzxSmthMr6JDA0+y0FwGzOgUhF/XjEvHMHlIR49HR
-3f5LkO/ZBGWhWulJwD3ERQN0/1BcZMXvRceyqgqpwsLzNBwLwp2YUjoZwRnDMWdu
-Uzy5e0l41lXPhLu+99lO0XnYO5bMai1px2u//w8wtVYxkYRqJ6g1EvrpWJXVTGq2
-E5ezNX80ErAt2ttPP2YAchLxHOax/FOlor8q5Wwo60jkQxIIBTbY9W5ab19WHU52
-32z126AigkiXCMEkcz15AgMBAAGjggKHMIICgzBPBgNVHSAESDBGMBEGDysGAQQB
-ga0hgiwBAQQDAjARBg8rBgEEAYGtIYIsAgEEAwEwDwYNKwYBBAGBrSGCLAEBBDAN
-BgsrBgEEAYGtIYIsHjAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAU
-BggrBgEFBQcDAgYIKwYBBQUHAwEwHQYDVR0OBBYEFL7jMwPY5/3ueZLsMMbBt+vZ
-IbKwMB8GA1UdIwQYMBaAFJZbTHC7b/yc77U/pHr7k/8J6mp2MHYGA1UdEQRvMG2C
-CmlkcC5scnouZGWCC2lkcDEubHJ6LmRlggtpZHAyLmxyei5kZYINbHJ6aWRwLmxy
-ei5kZYIObHJ6aWRwMS5scnouZGWCDmxyemlkcDIubHJ6LmRlgRZ6YnZ3LWNlcnQt
-YWRtaW5AbHJ6LmRlMHcGA1UdHwRwMG4wNaAzoDGGL2h0dHA6Ly9jZHAxLnBjYS5k
-Zm4uZGUvbHJ6LWNhL3B1Yi9jcmwvY2FjcmwuY3JsMDWgM6Axhi9odHRwOi8vY2Rw
-Mi5wY2EuZGZuLmRlL2xyei1jYS9wdWIvY3JsL2NhY3JsLmNybDCBxwYIKwYBBQUH
-AQEEgbowgbcwMwYIKwYBBQUHMAGGJ2h0dHA6Ly9vY3NwLnBjYS5kZm4uZGUvT0NT
-UC1TZXJ2ZXIvT0NTUDA/BggrBgEFBQcwAoYzaHR0cDovL2NkcDEucGNhLmRmbi5k
-ZS9scnotY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MD8GCCsGAQUFBzAChjNodHRw
-Oi8vY2RwMi5wY2EuZGZuLmRlL2xyei1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQw
-DQYJKoZIhvcNAQELBQADggEBADrPD4GN7XpZSyxGBvHy+7fMrJNxyWybTsHkyiAI
-XGUF/jn9m7Bnvucb60PzyzJ5aD63AsaeSxSXDyYpNzne93O1aEtXyveTeFhbRyx1
-Wcf5G1KbRbljULRatUJSOggUWO4HerToAobx4xXyFrD7aPQkGGFVnqemjOnE4A4e
-rl8OfaKkOu43F4KbxVUf2zcSQ5h4qdbwORNXCxNNGfKlzphRMpq7V4B6Z8+i7FCx
-BDOcL0w+IjJuDkD8Jf5DMiEGUIppU2vYOylvYENKX2Mdd4ZMcOw2d1jqC0xC/8qj
-RXNKbj96BedS8e05bbrOSj9H7/qX5osIxDaY+rr6g3HF+2c=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.lrz.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.lrz.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">e38</OrganizationName>
-    <OrganizationName xml:lang="en">e38</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">Leibniz-Rechenzentrum der Bayerischen Akademie der Wissenschaften</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">Leibniz Supercomputing Centre (LRZ) of the Bavarian Academy of Sciences and Humanities</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.lrz.de</OrganizationURL>
-    <OrganizationURL xml:lang="en">http://www.lrz.de/english/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="administrative">
-    <GivenName>Ralf</GivenName>
-    <SurName>Ebner</SurName>
-    <EmailAddress>mailto:shibboleth@lrz.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Ralf</GivenName>
-    <SurName>Ebner</SurName>
-    <EmailAddress>mailto:shibboleth@lrz.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="support">
-    <GivenName>Ralf</GivenName>
-    <SurName>Ebner</SurName>
-    <EmailAddress>mailto:shibboleth@lrz.de</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.mast.br-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.mast.br-idp-shibboleth.xml
deleted file mode 100644
index bb5c70a7..00000000
--- a/swamid-interfederations-2.0/idp.mast.br-idp-shibboleth.xml
+++ /dev/null
@@ -1,100 +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://idp.mast.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">mast.br</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">MAST - Museu de Astronomia e Ciencias Afins</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="pt-br">MAST - Museu de Astronomia e Ciencias Afins</mdui:DisplayName>
-        <mdui:Description xml:lang="en">MAST - Museu de Astronomia e Ciencias Afins</mdui:Description>
-        <mdui:Description xml:lang="pt-br">MAST - Museu de Astronomia e Ciencias Afins</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.mast.br/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="pt-br">http://www.mast.br/</mdui:InformationURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-    MIICxjCCAa4CAQAwDQYJKoZIhvcNAQEFBQAwKTEMMAoGA1UECxMDQ1BEMQswCQYD
-VQQGEwJCUjEMMAoGA1UEAxMDaWRwMB4XDTE0MDcwMTE2MzUwNFoXDTE5MDYzMDE2
-MzUwNFowKTEMMAoGA1UECxMDQ1BEMQswCQYDVQQGEwJCUjEMMAoGA1UEAxMDaWRw
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAur8m2rnBlm6u6jFL3Eeq
-srFLXzgEHspopsbiAN6szuLp+PP0WoeI56fPNw9/HxArf+PHXfwZ4uH5XvEiEpua
-QAKg5q6BVcX22RrkPwJPTRtZBveSBUTij8IQ1T7QtdNgPVWoj4Q9CG3A61sCkxyq
-A2mXXV6tOJyiujYRRJs3C+Tt6+cfbwjY5HkzIK9zdUqZBg95tJltmnskOFME9v8S
-HndIkLSQette8ACFUTInhE1qHtoPksQ3TMSwKe4GjzZdLGvJ3lD2aNjEXxx3lsYo
-4ox4/KV7cQxR9KDcT/xWKO6BIs3deZqvL1A2mckSkr829CXytEpXgfxJCKuJHfyc
-iwIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQAT3ZKzQhDdBFgu7VLJ0GiQ6kEf0kdR
-SNg7hYWpyKG+DdPVsR7xKNSeNaLmFhXqKwRxIyLtmGDlSMOVcCvo2ekKxzNwgjwg
-Rji211WOOyaqCKYwm6uStfrnt3QFoMaeORAspXElQv53CQU7HFvREEi2Zo6fJ5Fc
-qKtjaM50D240z40M9X+0p8U6Tpfx55DXntfVKPbhDu5AbrewaViSNq4PNdTno1tD
-eDx/vYT88tTDClBXMGL9de+zKpodeKd6NmQcGkqNz0Y62cg3uAcp5J8Dt9skdSmj
-08dyKGEknfITw3O8/pJo0cxq2CY0bYSlltquU3oEaaQcFM/Wjifp7mSd
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.mast.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.mast.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://idp.mast.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.mast.br/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.mast.br/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.mast.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">mast.br</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-      
-MIICxjCCAa4CAQAwDQYJKoZIhvcNAQEFBQAwKTEMMAoGA1UECxMDQ1BEMQswCQYD
-VQQGEwJCUjEMMAoGA1UEAxMDaWRwMB4XDTE0MDcwMTE2MzUwNFoXDTE5MDYzMDE2
-MzUwNFowKTEMMAoGA1UECxMDQ1BEMQswCQYDVQQGEwJCUjEMMAoGA1UEAxMDaWRw
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAur8m2rnBlm6u6jFL3Eeq
-srFLXzgEHspopsbiAN6szuLp+PP0WoeI56fPNw9/HxArf+PHXfwZ4uH5XvEiEpua
-QAKg5q6BVcX22RrkPwJPTRtZBveSBUTij8IQ1T7QtdNgPVWoj4Q9CG3A61sCkxyq
-A2mXXV6tOJyiujYRRJs3C+Tt6+cfbwjY5HkzIK9zdUqZBg95tJltmnskOFME9v8S
-HndIkLSQette8ACFUTInhE1qHtoPksQ3TMSwKe4GjzZdLGvJ3lD2aNjEXxx3lsYo
-4ox4/KV7cQxR9KDcT/xWKO6BIs3deZqvL1A2mckSkr829CXytEpXgfxJCKuJHfyc
-iwIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQAT3ZKzQhDdBFgu7VLJ0GiQ6kEf0kdR
-SNg7hYWpyKG+DdPVsR7xKNSeNaLmFhXqKwRxIyLtmGDlSMOVcCvo2ekKxzNwgjwg
-Rji211WOOyaqCKYwm6uStfrnt3QFoMaeORAspXElQv53CQU7HFvREEi2Zo6fJ5Fc
-qKtjaM50D240z40M9X+0p8U6Tpfx55DXntfVKPbhDu5AbrewaViSNq4PNdTno1tD
-eDx/vYT88tTDClBXMGL9de+zKpodeKd6NmQcGkqNz0Y62cg3uAcp5J8Dt9skdSmj
-08dyKGEknfITw3O8/pJo0cxq2CY0bYSlltquU3oEaaQcFM/Wjifp7mSd
-                    
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.mast.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.mast.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">MAST - Museu de Astronomia e Ciencias Afins</OrganizationName>
-    <OrganizationName xml:lang="pt-br">MAST - Museu de Astronomia e Ciencias Afins</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">MAST - Museu de Astronomia e Ciencias Afins</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="pt-br">MAST - Museu de Astronomia e Ciencias Afins</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.mast.br/</OrganizationURL>
-    <OrganizationURL xml:lang="pt-br">http://www.mast.br/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Leonardo Cardozo</SurName>
-    <EmailAddress>leonardo@mast.br</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.mast.br.xml b/swamid-interfederations-2.0/idp.mast.br.xml
deleted file mode 100644
index bb5c70a7..00000000
--- a/swamid-interfederations-2.0/idp.mast.br.xml
+++ /dev/null
@@ -1,100 +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://idp.mast.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">mast.br</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">MAST - Museu de Astronomia e Ciencias Afins</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="pt-br">MAST - Museu de Astronomia e Ciencias Afins</mdui:DisplayName>
-        <mdui:Description xml:lang="en">MAST - Museu de Astronomia e Ciencias Afins</mdui:Description>
-        <mdui:Description xml:lang="pt-br">MAST - Museu de Astronomia e Ciencias Afins</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.mast.br/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="pt-br">http://www.mast.br/</mdui:InformationURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-    MIICxjCCAa4CAQAwDQYJKoZIhvcNAQEFBQAwKTEMMAoGA1UECxMDQ1BEMQswCQYD
-VQQGEwJCUjEMMAoGA1UEAxMDaWRwMB4XDTE0MDcwMTE2MzUwNFoXDTE5MDYzMDE2
-MzUwNFowKTEMMAoGA1UECxMDQ1BEMQswCQYDVQQGEwJCUjEMMAoGA1UEAxMDaWRw
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAur8m2rnBlm6u6jFL3Eeq
-srFLXzgEHspopsbiAN6szuLp+PP0WoeI56fPNw9/HxArf+PHXfwZ4uH5XvEiEpua
-QAKg5q6BVcX22RrkPwJPTRtZBveSBUTij8IQ1T7QtdNgPVWoj4Q9CG3A61sCkxyq
-A2mXXV6tOJyiujYRRJs3C+Tt6+cfbwjY5HkzIK9zdUqZBg95tJltmnskOFME9v8S
-HndIkLSQette8ACFUTInhE1qHtoPksQ3TMSwKe4GjzZdLGvJ3lD2aNjEXxx3lsYo
-4ox4/KV7cQxR9KDcT/xWKO6BIs3deZqvL1A2mckSkr829CXytEpXgfxJCKuJHfyc
-iwIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQAT3ZKzQhDdBFgu7VLJ0GiQ6kEf0kdR
-SNg7hYWpyKG+DdPVsR7xKNSeNaLmFhXqKwRxIyLtmGDlSMOVcCvo2ekKxzNwgjwg
-Rji211WOOyaqCKYwm6uStfrnt3QFoMaeORAspXElQv53CQU7HFvREEi2Zo6fJ5Fc
-qKtjaM50D240z40M9X+0p8U6Tpfx55DXntfVKPbhDu5AbrewaViSNq4PNdTno1tD
-eDx/vYT88tTDClBXMGL9de+zKpodeKd6NmQcGkqNz0Y62cg3uAcp5J8Dt9skdSmj
-08dyKGEknfITw3O8/pJo0cxq2CY0bYSlltquU3oEaaQcFM/Wjifp7mSd
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.mast.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.mast.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://idp.mast.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.mast.br/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.mast.br/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.mast.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">mast.br</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-      
-MIICxjCCAa4CAQAwDQYJKoZIhvcNAQEFBQAwKTEMMAoGA1UECxMDQ1BEMQswCQYD
-VQQGEwJCUjEMMAoGA1UEAxMDaWRwMB4XDTE0MDcwMTE2MzUwNFoXDTE5MDYzMDE2
-MzUwNFowKTEMMAoGA1UECxMDQ1BEMQswCQYDVQQGEwJCUjEMMAoGA1UEAxMDaWRw
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAur8m2rnBlm6u6jFL3Eeq
-srFLXzgEHspopsbiAN6szuLp+PP0WoeI56fPNw9/HxArf+PHXfwZ4uH5XvEiEpua
-QAKg5q6BVcX22RrkPwJPTRtZBveSBUTij8IQ1T7QtdNgPVWoj4Q9CG3A61sCkxyq
-A2mXXV6tOJyiujYRRJs3C+Tt6+cfbwjY5HkzIK9zdUqZBg95tJltmnskOFME9v8S
-HndIkLSQette8ACFUTInhE1qHtoPksQ3TMSwKe4GjzZdLGvJ3lD2aNjEXxx3lsYo
-4ox4/KV7cQxR9KDcT/xWKO6BIs3deZqvL1A2mckSkr829CXytEpXgfxJCKuJHfyc
-iwIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQAT3ZKzQhDdBFgu7VLJ0GiQ6kEf0kdR
-SNg7hYWpyKG+DdPVsR7xKNSeNaLmFhXqKwRxIyLtmGDlSMOVcCvo2ekKxzNwgjwg
-Rji211WOOyaqCKYwm6uStfrnt3QFoMaeORAspXElQv53CQU7HFvREEi2Zo6fJ5Fc
-qKtjaM50D240z40M9X+0p8U6Tpfx55DXntfVKPbhDu5AbrewaViSNq4PNdTno1tD
-eDx/vYT88tTDClBXMGL9de+zKpodeKd6NmQcGkqNz0Y62cg3uAcp5J8Dt9skdSmj
-08dyKGEknfITw3O8/pJo0cxq2CY0bYSlltquU3oEaaQcFM/Wjifp7mSd
-                    
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.mast.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.mast.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">MAST - Museu de Astronomia e Ciencias Afins</OrganizationName>
-    <OrganizationName xml:lang="pt-br">MAST - Museu de Astronomia e Ciencias Afins</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">MAST - Museu de Astronomia e Ciencias Afins</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="pt-br">MAST - Museu de Astronomia e Ciencias Afins</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.mast.br/</OrganizationURL>
-    <OrganizationURL xml:lang="pt-br">http://www.mast.br/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Leonardo Cardozo</SurName>
-    <EmailAddress>leonardo@mast.br</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.mbu.cas.cz-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.mbu.cas.cz-idp-shibboleth.xml
deleted file mode 100644
index 30a198f8..00000000
--- a/swamid-interfederations-2.0/idp.mbu.cas.cz-idp-shibboleth.xml
+++ /dev/null
@@ -1,118 +0,0 @@
-<?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.mbu.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/" registrationInstant="2014-09-08T13:24:31Z">
-      <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>
-    <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://eduid.cz/uri/idp-group/avcr</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>
-      <shibmd:Scope regexp="false">mbu.cas.cz</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Institute of Microbiology AS CR</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="cs">Mikrobiologický ústav AV ČR</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Identity Provider IMIC AV CR employees.</mdui:Description>
-        <mdui:Description xml:lang="cs">Identity Provider pro zaměstnance MBŮ AV ČR</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.mbu.cas.cz/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="cs">http://www.mbu.cas.cz/</mdui:InformationURL>
-        <mdui:Logo height="44" width="60">https://jiftach.cas.cz/loga/logo-mbu-44.png</mdui:Logo>
-        <mdui:Logo height="100" width="137">https://jiftach.cas.cz/loga/logo-mbu-100.png</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDIzCCAgugAwIBAgIUYdcHhLDHNl2QZ3A36tC8tB4N+0YwDQYJKoZIhvcNAQEF
-BQAwGTEXMBUGA1UEAxMOaWRwLm1idS5jYXMuY3owHhcNMTQwNTA5MDk0ODE3WhcN
-MzQwNTA5MDk0ODE3WjAZMRcwFQYDVQQDEw5pZHAubWJ1LmNhcy5jejCCASIwDQYJ
-KoZIhvcNAQEBBQADggEPADCCAQoCggEBAKvELL+7e19R7w9WNnuLbvd9MI9Y6emS
-0o4NDUddY65/SqZeeNaTqsdCQO8htLIIvzwm2vh9geeNEVwpRejz1N1kzcVLIpxa
-9udowrfSKKAuavwFiSYyrznKAtD2/G00U+Ity4Mi6IjxpdNocIQgSfaD/cVOvg3k
-Qw2B0jOSYdEAu0nG8I6LlUp9T6aSI7jqUDcAIAB6CMOxGL6/+GwEuPYMNBxGrAAZ
-pWPGUO4mBaK0eVrMyq++fImM5yab6B42nfe4RvA9C2Lt50OgvOia8LKRjtVGaATI
-DUOOiX2B5sWVYAHFfsXCFuS9CjjYMxMMT5t5A1guNOhd86rPCayVfJ0CAwEAAaNj
-MGEwQAYDVR0RBDkwN4IOaWRwLm1idS5jYXMuY3qGJWh0dHBzOi8vaWRwLm1idS5j
-YXMuY3ovaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFA/LgQ/gox/xI5+K8hQ6Nrq5
-y0R3MA0GCSqGSIb3DQEBBQUAA4IBAQAxf9HYNhASVDz1dbW/OMXd7mtFoxk7v5bP
-JgXz3W7kW8HyERpcssEbJhB1mmrWTnM/5qiPf6OuBQ7Loa3Wtthx7tei2bXXBwKb
-RE5DK04UiRufSq8G6yioadxyMG4lpt+mSSkyYDdP+4DnBgJcrPLORCpkcZaFvZWy
-rgr4jGpkpj7QnuJR5O/mUpLZSxEqspE7TWOgFFWhWfddhKRiThLI/KLysYWaFBOp
-FTr/8tfzH95qtEgw+8NoX7xWbKp42mN27+MCYLdK+gS6RqIv4i+KnDyNO2gYssjq
-eL/EaqTf+uStC8AdxobBI9SwoXW5JUfxiorsYdYvY8cX9JxnJLbA
-
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.mbu.cas.cz:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.mbu.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.mbu.cas.cz/idp/profile/SAML2/Redirect/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.mbu.cas.cz/idp/profile/SAML2/POST/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.mbu.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.mbu.cas.cz/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.mbu.cas.cz/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.mbu.cas.cz/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.mbu.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">mbu.cas.cz</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDIzCCAgugAwIBAgIUYdcHhLDHNl2QZ3A36tC8tB4N+0YwDQYJKoZIhvcNAQEF
-BQAwGTEXMBUGA1UEAxMOaWRwLm1idS5jYXMuY3owHhcNMTQwNTA5MDk0ODE3WhcN
-MzQwNTA5MDk0ODE3WjAZMRcwFQYDVQQDEw5pZHAubWJ1LmNhcy5jejCCASIwDQYJ
-KoZIhvcNAQEBBQADggEPADCCAQoCggEBAKvELL+7e19R7w9WNnuLbvd9MI9Y6emS
-0o4NDUddY65/SqZeeNaTqsdCQO8htLIIvzwm2vh9geeNEVwpRejz1N1kzcVLIpxa
-9udowrfSKKAuavwFiSYyrznKAtD2/G00U+Ity4Mi6IjxpdNocIQgSfaD/cVOvg3k
-Qw2B0jOSYdEAu0nG8I6LlUp9T6aSI7jqUDcAIAB6CMOxGL6/+GwEuPYMNBxGrAAZ
-pWPGUO4mBaK0eVrMyq++fImM5yab6B42nfe4RvA9C2Lt50OgvOia8LKRjtVGaATI
-DUOOiX2B5sWVYAHFfsXCFuS9CjjYMxMMT5t5A1guNOhd86rPCayVfJ0CAwEAAaNj
-MGEwQAYDVR0RBDkwN4IOaWRwLm1idS5jYXMuY3qGJWh0dHBzOi8vaWRwLm1idS5j
-YXMuY3ovaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFA/LgQ/gox/xI5+K8hQ6Nrq5
-y0R3MA0GCSqGSIb3DQEBBQUAA4IBAQAxf9HYNhASVDz1dbW/OMXd7mtFoxk7v5bP
-JgXz3W7kW8HyERpcssEbJhB1mmrWTnM/5qiPf6OuBQ7Loa3Wtthx7tei2bXXBwKb
-RE5DK04UiRufSq8G6yioadxyMG4lpt+mSSkyYDdP+4DnBgJcrPLORCpkcZaFvZWy
-rgr4jGpkpj7QnuJR5O/mUpLZSxEqspE7TWOgFFWhWfddhKRiThLI/KLysYWaFBOp
-FTr/8tfzH95qtEgw+8NoX7xWbKp42mN27+MCYLdK+gS6RqIv4i+KnDyNO2gYssjq
-eL/EaqTf+uStC8AdxobBI9SwoXW5JUfxiorsYdYvY8cX9JxnJLbA
-
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.mbu.cas.cz:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.mbu.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 Microbiology  AS CR</OrganizationName>
-    <OrganizationName xml:lang="cs">Mikrobiologický ústav AV ČR</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Institute of Microbiology  AS CR, v.v.i.</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="cs">Mikrobiologický ústav AV ČR, v.v.i.</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.mbu.cas.cz/</OrganizationURL>
-    <OrganizationURL xml:lang="cs">http://www.mbu.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.mbu.cas.cz.xml b/swamid-interfederations-2.0/idp.mbu.cas.cz.xml
deleted file mode 100644
index 30a198f8..00000000
--- a/swamid-interfederations-2.0/idp.mbu.cas.cz.xml
+++ /dev/null
@@ -1,118 +0,0 @@
-<?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.mbu.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/" registrationInstant="2014-09-08T13:24:31Z">
-      <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>
-    <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://eduid.cz/uri/idp-group/avcr</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>
-      <shibmd:Scope regexp="false">mbu.cas.cz</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Institute of Microbiology AS CR</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="cs">Mikrobiologický ústav AV ČR</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Identity Provider IMIC AV CR employees.</mdui:Description>
-        <mdui:Description xml:lang="cs">Identity Provider pro zaměstnance MBŮ AV ČR</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.mbu.cas.cz/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="cs">http://www.mbu.cas.cz/</mdui:InformationURL>
-        <mdui:Logo height="44" width="60">https://jiftach.cas.cz/loga/logo-mbu-44.png</mdui:Logo>
-        <mdui:Logo height="100" width="137">https://jiftach.cas.cz/loga/logo-mbu-100.png</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDIzCCAgugAwIBAgIUYdcHhLDHNl2QZ3A36tC8tB4N+0YwDQYJKoZIhvcNAQEF
-BQAwGTEXMBUGA1UEAxMOaWRwLm1idS5jYXMuY3owHhcNMTQwNTA5MDk0ODE3WhcN
-MzQwNTA5MDk0ODE3WjAZMRcwFQYDVQQDEw5pZHAubWJ1LmNhcy5jejCCASIwDQYJ
-KoZIhvcNAQEBBQADggEPADCCAQoCggEBAKvELL+7e19R7w9WNnuLbvd9MI9Y6emS
-0o4NDUddY65/SqZeeNaTqsdCQO8htLIIvzwm2vh9geeNEVwpRejz1N1kzcVLIpxa
-9udowrfSKKAuavwFiSYyrznKAtD2/G00U+Ity4Mi6IjxpdNocIQgSfaD/cVOvg3k
-Qw2B0jOSYdEAu0nG8I6LlUp9T6aSI7jqUDcAIAB6CMOxGL6/+GwEuPYMNBxGrAAZ
-pWPGUO4mBaK0eVrMyq++fImM5yab6B42nfe4RvA9C2Lt50OgvOia8LKRjtVGaATI
-DUOOiX2B5sWVYAHFfsXCFuS9CjjYMxMMT5t5A1guNOhd86rPCayVfJ0CAwEAAaNj
-MGEwQAYDVR0RBDkwN4IOaWRwLm1idS5jYXMuY3qGJWh0dHBzOi8vaWRwLm1idS5j
-YXMuY3ovaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFA/LgQ/gox/xI5+K8hQ6Nrq5
-y0R3MA0GCSqGSIb3DQEBBQUAA4IBAQAxf9HYNhASVDz1dbW/OMXd7mtFoxk7v5bP
-JgXz3W7kW8HyERpcssEbJhB1mmrWTnM/5qiPf6OuBQ7Loa3Wtthx7tei2bXXBwKb
-RE5DK04UiRufSq8G6yioadxyMG4lpt+mSSkyYDdP+4DnBgJcrPLORCpkcZaFvZWy
-rgr4jGpkpj7QnuJR5O/mUpLZSxEqspE7TWOgFFWhWfddhKRiThLI/KLysYWaFBOp
-FTr/8tfzH95qtEgw+8NoX7xWbKp42mN27+MCYLdK+gS6RqIv4i+KnDyNO2gYssjq
-eL/EaqTf+uStC8AdxobBI9SwoXW5JUfxiorsYdYvY8cX9JxnJLbA
-
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.mbu.cas.cz:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.mbu.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.mbu.cas.cz/idp/profile/SAML2/Redirect/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.mbu.cas.cz/idp/profile/SAML2/POST/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.mbu.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.mbu.cas.cz/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.mbu.cas.cz/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.mbu.cas.cz/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.mbu.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">mbu.cas.cz</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDIzCCAgugAwIBAgIUYdcHhLDHNl2QZ3A36tC8tB4N+0YwDQYJKoZIhvcNAQEF
-BQAwGTEXMBUGA1UEAxMOaWRwLm1idS5jYXMuY3owHhcNMTQwNTA5MDk0ODE3WhcN
-MzQwNTA5MDk0ODE3WjAZMRcwFQYDVQQDEw5pZHAubWJ1LmNhcy5jejCCASIwDQYJ
-KoZIhvcNAQEBBQADggEPADCCAQoCggEBAKvELL+7e19R7w9WNnuLbvd9MI9Y6emS
-0o4NDUddY65/SqZeeNaTqsdCQO8htLIIvzwm2vh9geeNEVwpRejz1N1kzcVLIpxa
-9udowrfSKKAuavwFiSYyrznKAtD2/G00U+Ity4Mi6IjxpdNocIQgSfaD/cVOvg3k
-Qw2B0jOSYdEAu0nG8I6LlUp9T6aSI7jqUDcAIAB6CMOxGL6/+GwEuPYMNBxGrAAZ
-pWPGUO4mBaK0eVrMyq++fImM5yab6B42nfe4RvA9C2Lt50OgvOia8LKRjtVGaATI
-DUOOiX2B5sWVYAHFfsXCFuS9CjjYMxMMT5t5A1guNOhd86rPCayVfJ0CAwEAAaNj
-MGEwQAYDVR0RBDkwN4IOaWRwLm1idS5jYXMuY3qGJWh0dHBzOi8vaWRwLm1idS5j
-YXMuY3ovaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFA/LgQ/gox/xI5+K8hQ6Nrq5
-y0R3MA0GCSqGSIb3DQEBBQUAA4IBAQAxf9HYNhASVDz1dbW/OMXd7mtFoxk7v5bP
-JgXz3W7kW8HyERpcssEbJhB1mmrWTnM/5qiPf6OuBQ7Loa3Wtthx7tei2bXXBwKb
-RE5DK04UiRufSq8G6yioadxyMG4lpt+mSSkyYDdP+4DnBgJcrPLORCpkcZaFvZWy
-rgr4jGpkpj7QnuJR5O/mUpLZSxEqspE7TWOgFFWhWfddhKRiThLI/KLysYWaFBOp
-FTr/8tfzH95qtEgw+8NoX7xWbKp42mN27+MCYLdK+gS6RqIv4i+KnDyNO2gYssjq
-eL/EaqTf+uStC8AdxobBI9SwoXW5JUfxiorsYdYvY8cX9JxnJLbA
-
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.mbu.cas.cz:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.mbu.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 Microbiology  AS CR</OrganizationName>
-    <OrganizationName xml:lang="cs">Mikrobiologický ústav AV ČR</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Institute of Microbiology  AS CR, v.v.i.</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="cs">Mikrobiologický ústav AV ČR, v.v.i.</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.mbu.cas.cz/</OrganizationURL>
-    <OrganizationURL xml:lang="cs">http://www.mbu.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.mci4me.at-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.mci4me.at-idp-shibboleth.xml
deleted file mode 100644
index af7a4f7d..00000000
--- a/swamid-interfederations-2.0/idp.mci4me.at-idp-shibboleth.xml
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.mci4me.at/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://eduid.at" registrationInstant="2009-08-26T15:09:20Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://eduid.at/policy/mdrps-20140606</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">mci4me.at</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="de">Management Center Innsbruck</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Management Center Innsbruck</mdui:DisplayName>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDHzCCAgegAwIBAgIUHNJty3oyEoy9tOTNEmmE7qV74C8wDQYJKoZIhvcNAQEF
-BQAwGDEWMBQGA1UEAxMNaWRwLm1jaTRtZS5hdDAeFw0wOTA5MDcwODIzMDVaFw0y
-OTA5MDcwODIzMDVaMBgxFjAUBgNVBAMTDWlkcC5tY2k0bWUuYXQwggEiMA0GCSqG
-SIb3DQEBAQUAA4IBDwAwggEKAoIBAQC3S9fUpbeg9WH5JftrPezNOvW2YkH8/MgG
-HV9RrmZbcoKwLTzwPrZPaumhFJQArvLmrk3dtVCaih1RMAIVFi8HoYac7fDUurwx
-RbVQx7nskAb3iZx1O8JEX8TgoqKt+uUdzUIGBz9rHytawAUnIiArMtINNumyvFhV
-QJqKRi9Hwo/aGs7B7FAwrJZSV9hQSXJq8xhPMTQARJSBACCZwEyPRQ15o/MWOpjd
-0D2PAnAtBVNfY+4B/Imt5JTQ+XYp+Q4WVY1WeuMzjC4ucw/y5aYZTL+xMGzg0HmG
-0/Owi2SF3vmgXAROFTcxfmJqyYsxI75pQDAfH3NEKvE8fmmJ4DAbAgMBAAGjYTBf
-MD4GA1UdEQQ3MDWCDWlkcC5tY2k0bWUuYXSGJGh0dHBzOi8vaWRwLm1jaTRtZS5h
-dC9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUl+LCOAVAc0ZekJaOO94O2tbedggw
-DQYJKoZIhvcNAQEFBQADggEBADkTysuQZsgEXD9k3dqUgQLAl/FWTwbhwzpkWtf6
-FAkJkBOmpV9Bxufiyt0t2jMPAxHQ7ijRof+YVsL4pSPB0EuB6yDGbaaKOP0S0xUp
-llwQbIGwW5EX/wq8S5xpJbyl2qyK2c/3xiBA37q42/7TTDp8CsrzkiZ5wV6Quu4W
-5i3Ncd3DlSCWC+KQiNUERUnol8zG7LnX+TDm+CmJDBGZTe2rP2VBHufwx99NWJqa
-JIEn8kvka7bij40K7rv3FooRr0J932Few8rdknd0bgFh83YuE+0RI2RSFugH/5QD
-FkV0gy5C/RWb/tKzq9CLPMhkyBCIIS9TjHeEWOUmCN08iic=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.mci4me.at:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.mci4me.at:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.mci4me.at/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.mci4me.at/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.mci4me.at/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.mci4me.at/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">mci4me.at</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDHzCCAgegAwIBAgIUHNJty3oyEoy9tOTNEmmE7qV74C8wDQYJKoZIhvcNAQEF
-BQAwGDEWMBQGA1UEAxMNaWRwLm1jaTRtZS5hdDAeFw0wOTA5MDcwODIzMDVaFw0y
-OTA5MDcwODIzMDVaMBgxFjAUBgNVBAMTDWlkcC5tY2k0bWUuYXQwggEiMA0GCSqG
-SIb3DQEBAQUAA4IBDwAwggEKAoIBAQC3S9fUpbeg9WH5JftrPezNOvW2YkH8/MgG
-HV9RrmZbcoKwLTzwPrZPaumhFJQArvLmrk3dtVCaih1RMAIVFi8HoYac7fDUurwx
-RbVQx7nskAb3iZx1O8JEX8TgoqKt+uUdzUIGBz9rHytawAUnIiArMtINNumyvFhV
-QJqKRi9Hwo/aGs7B7FAwrJZSV9hQSXJq8xhPMTQARJSBACCZwEyPRQ15o/MWOpjd
-0D2PAnAtBVNfY+4B/Imt5JTQ+XYp+Q4WVY1WeuMzjC4ucw/y5aYZTL+xMGzg0HmG
-0/Owi2SF3vmgXAROFTcxfmJqyYsxI75pQDAfH3NEKvE8fmmJ4DAbAgMBAAGjYTBf
-MD4GA1UdEQQ3MDWCDWlkcC5tY2k0bWUuYXSGJGh0dHBzOi8vaWRwLm1jaTRtZS5h
-dC9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUl+LCOAVAc0ZekJaOO94O2tbedggw
-DQYJKoZIhvcNAQEFBQADggEBADkTysuQZsgEXD9k3dqUgQLAl/FWTwbhwzpkWtf6
-FAkJkBOmpV9Bxufiyt0t2jMPAxHQ7ijRof+YVsL4pSPB0EuB6yDGbaaKOP0S0xUp
-llwQbIGwW5EX/wq8S5xpJbyl2qyK2c/3xiBA37q42/7TTDp8CsrzkiZ5wV6Quu4W
-5i3Ncd3DlSCWC+KQiNUERUnol8zG7LnX+TDm+CmJDBGZTe2rP2VBHufwx99NWJqa
-JIEn8kvka7bij40K7rv3FooRr0J932Few8rdknd0bgFh83YuE+0RI2RSFugH/5QD
-FkV0gy5C/RWb/tKzq9CLPMhkyBCIIS9TjHeEWOUmCN08iic=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.mci4me.at:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.mci4me.at: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="de">Management Center Innsbruck</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">Management Center Innsbruck</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="de">Management Center Innsbruck</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Management Center Innsbruck</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="de">http://www.mci4me.at/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">https://www.mci4me.at/index.php?lang=en</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Florian</md:GivenName>
-    <md:SurName>Lechner</md:SurName>
-    <md:EmailAddress>mailto:florian.lechner@mci.edu</md:EmailAddress>
-    <md:TelephoneNumber>+43 512 2070 1407</md:TelephoneNumber>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.mci4me.at.xml b/swamid-interfederations-2.0/idp.mci4me.at.xml
deleted file mode 100644
index af7a4f7d..00000000
--- a/swamid-interfederations-2.0/idp.mci4me.at.xml
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.mci4me.at/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://eduid.at" registrationInstant="2009-08-26T15:09:20Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://eduid.at/policy/mdrps-20140606</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">mci4me.at</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="de">Management Center Innsbruck</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Management Center Innsbruck</mdui:DisplayName>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDHzCCAgegAwIBAgIUHNJty3oyEoy9tOTNEmmE7qV74C8wDQYJKoZIhvcNAQEF
-BQAwGDEWMBQGA1UEAxMNaWRwLm1jaTRtZS5hdDAeFw0wOTA5MDcwODIzMDVaFw0y
-OTA5MDcwODIzMDVaMBgxFjAUBgNVBAMTDWlkcC5tY2k0bWUuYXQwggEiMA0GCSqG
-SIb3DQEBAQUAA4IBDwAwggEKAoIBAQC3S9fUpbeg9WH5JftrPezNOvW2YkH8/MgG
-HV9RrmZbcoKwLTzwPrZPaumhFJQArvLmrk3dtVCaih1RMAIVFi8HoYac7fDUurwx
-RbVQx7nskAb3iZx1O8JEX8TgoqKt+uUdzUIGBz9rHytawAUnIiArMtINNumyvFhV
-QJqKRi9Hwo/aGs7B7FAwrJZSV9hQSXJq8xhPMTQARJSBACCZwEyPRQ15o/MWOpjd
-0D2PAnAtBVNfY+4B/Imt5JTQ+XYp+Q4WVY1WeuMzjC4ucw/y5aYZTL+xMGzg0HmG
-0/Owi2SF3vmgXAROFTcxfmJqyYsxI75pQDAfH3NEKvE8fmmJ4DAbAgMBAAGjYTBf
-MD4GA1UdEQQ3MDWCDWlkcC5tY2k0bWUuYXSGJGh0dHBzOi8vaWRwLm1jaTRtZS5h
-dC9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUl+LCOAVAc0ZekJaOO94O2tbedggw
-DQYJKoZIhvcNAQEFBQADggEBADkTysuQZsgEXD9k3dqUgQLAl/FWTwbhwzpkWtf6
-FAkJkBOmpV9Bxufiyt0t2jMPAxHQ7ijRof+YVsL4pSPB0EuB6yDGbaaKOP0S0xUp
-llwQbIGwW5EX/wq8S5xpJbyl2qyK2c/3xiBA37q42/7TTDp8CsrzkiZ5wV6Quu4W
-5i3Ncd3DlSCWC+KQiNUERUnol8zG7LnX+TDm+CmJDBGZTe2rP2VBHufwx99NWJqa
-JIEn8kvka7bij40K7rv3FooRr0J932Few8rdknd0bgFh83YuE+0RI2RSFugH/5QD
-FkV0gy5C/RWb/tKzq9CLPMhkyBCIIS9TjHeEWOUmCN08iic=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.mci4me.at:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.mci4me.at:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.mci4me.at/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.mci4me.at/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.mci4me.at/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.mci4me.at/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">mci4me.at</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDHzCCAgegAwIBAgIUHNJty3oyEoy9tOTNEmmE7qV74C8wDQYJKoZIhvcNAQEF
-BQAwGDEWMBQGA1UEAxMNaWRwLm1jaTRtZS5hdDAeFw0wOTA5MDcwODIzMDVaFw0y
-OTA5MDcwODIzMDVaMBgxFjAUBgNVBAMTDWlkcC5tY2k0bWUuYXQwggEiMA0GCSqG
-SIb3DQEBAQUAA4IBDwAwggEKAoIBAQC3S9fUpbeg9WH5JftrPezNOvW2YkH8/MgG
-HV9RrmZbcoKwLTzwPrZPaumhFJQArvLmrk3dtVCaih1RMAIVFi8HoYac7fDUurwx
-RbVQx7nskAb3iZx1O8JEX8TgoqKt+uUdzUIGBz9rHytawAUnIiArMtINNumyvFhV
-QJqKRi9Hwo/aGs7B7FAwrJZSV9hQSXJq8xhPMTQARJSBACCZwEyPRQ15o/MWOpjd
-0D2PAnAtBVNfY+4B/Imt5JTQ+XYp+Q4WVY1WeuMzjC4ucw/y5aYZTL+xMGzg0HmG
-0/Owi2SF3vmgXAROFTcxfmJqyYsxI75pQDAfH3NEKvE8fmmJ4DAbAgMBAAGjYTBf
-MD4GA1UdEQQ3MDWCDWlkcC5tY2k0bWUuYXSGJGh0dHBzOi8vaWRwLm1jaTRtZS5h
-dC9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUl+LCOAVAc0ZekJaOO94O2tbedggw
-DQYJKoZIhvcNAQEFBQADggEBADkTysuQZsgEXD9k3dqUgQLAl/FWTwbhwzpkWtf6
-FAkJkBOmpV9Bxufiyt0t2jMPAxHQ7ijRof+YVsL4pSPB0EuB6yDGbaaKOP0S0xUp
-llwQbIGwW5EX/wq8S5xpJbyl2qyK2c/3xiBA37q42/7TTDp8CsrzkiZ5wV6Quu4W
-5i3Ncd3DlSCWC+KQiNUERUnol8zG7LnX+TDm+CmJDBGZTe2rP2VBHufwx99NWJqa
-JIEn8kvka7bij40K7rv3FooRr0J932Few8rdknd0bgFh83YuE+0RI2RSFugH/5QD
-FkV0gy5C/RWb/tKzq9CLPMhkyBCIIS9TjHeEWOUmCN08iic=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.mci4me.at:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.mci4me.at: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="de">Management Center Innsbruck</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">Management Center Innsbruck</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="de">Management Center Innsbruck</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Management Center Innsbruck</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="de">http://www.mci4me.at/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">https://www.mci4me.at/index.php?lang=en</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Florian</md:GivenName>
-    <md:SurName>Lechner</md:SurName>
-    <md:EmailAddress>mailto:florian.lechner@mci.edu</md:EmailAddress>
-    <md:TelephoneNumber>+43 512 2070 1407</md:TelephoneNumber>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.meduniwien.ac.at-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.meduniwien.ac.at-idp-shibboleth.xml
deleted file mode 100644
index 6f709f60..00000000
--- a/swamid-interfederations-2.0/idp.meduniwien.ac.at-idp-shibboleth.xml
+++ /dev/null
@@ -1,108 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.meduniwien.ac.at/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://eduid.at" registrationInstant="2008-09-03T14:46:35Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://eduid.at/policy/mdrps-20140606</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">meduniwien.ac.at</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Medical University of Vienna</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="de">Medizinische Universität Wien</mdui:DisplayName>
-        <mdui:Logo height="82" width="172">https://idp.meduniwien.ac.at/idp/images/meduni_logo.gif</mdui:Logo>
-        <mdui:Logo height="16" width="16">https://idp.meduniwien.ac.at/idp/favicon.ico</mdui:Logo>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDOzCCAiOgAwIBAgIULLvePur8kLbXZX40PB9OXf5KCxwwDQYJKoZIhvcNAQEF
-BQAwHzEdMBsGA1UEAxMUaWRwLm1lZHVuaXdpZW4uYWMuYXQwHhcNMDgwODIxMDMz
-MTE3WhcNMjgwODIxMDMzMTE3WjAfMR0wGwYDVQQDExRpZHAubWVkdW5pd2llbi5h
-Yy5hdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKHIbWnRpzxgF785
-09wKk/EY2jf54pPrmFNdkD5a4ZDDZG9amhY945W3BACuGa929DdfcERcVkngRLoy
-SXjMxMTQDZjTvuJV0Pxyb71rihKhdZ+waJ223fip9ZotThmhkrGa40SIFldBaJs9
-Rup1VK6R7G46opQARTPQdpwKYBqBeOE5pPmrczYT6mM6nnMgpStth+DImHN+Cwxl
-DIjqiCwHjeWq3FGUR828H6JzQ5Hdb4nDWoGfne8jaL/n0GWALes1rFibnZfI812I
-JV0KDiomfFvdPntOrZ64Eq/52BXwzKc94oi2s1YJ1wr2pFlXh7Q2F8AZpnLfhwk6
-4OFfsiUCAwEAAaNvMG0wTAYDVR0RBEUwQ4IUaWRwLm1lZHVuaXdpZW4uYWMuYXSG
-K2h0dHBzOi8vaWRwLm1lZHVuaXdpZW4uYWMuYXQvaWRwL3NoaWJib2xldGgwHQYD
-VR0OBBYEFLNFilq1Hc56vgAhtuFB6wxI4ZqYMA0GCSqGSIb3DQEBBQUAA4IBAQAN
-5F9raRlQBYLorrPWPlYIiljnznJAFLDw62LFYRh/ovPY7FiJrcZ0rEKpyIYgNjpd
-5CcIf/gvFoDP6P4dsCQ2kDF1nUMd9eC4LVBHVw9iTQboiH94SegSfiuFP6r0jQyp
-9JyxE9Qwb7QJepmyubRewHy2srKTO2W6BIbwQaqHSYT3R42vmKLteZKN5kKVxYZj
-NSMYR5rudqBBzTUAo5qe/9UX3Hp9//vK9rkPHSMpFUd/9dfp59VOtimG95Onr9K7
-jatEfpnMS4nv+9dyJBBzqAjL/AxoqapRDix1pFU6DnnI6NjEK0ycSBdl0GbUWX/+
-OKQ7j1Bqsv6B43xMHff+
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.meduniwien.ac.at:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.meduniwien.ac.at: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:1.1:nameid-format:unspecified</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.meduniwien.ac.at/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.meduniwien.ac.at/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.meduniwien.ac.at/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.meduniwien.ac.at/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">meduniwien.ac.at</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDOzCCAiOgAwIBAgIULLvePur8kLbXZX40PB9OXf5KCxwwDQYJKoZIhvcNAQEF
-BQAwHzEdMBsGA1UEAxMUaWRwLm1lZHVuaXdpZW4uYWMuYXQwHhcNMDgwODIxMDMz
-MTE3WhcNMjgwODIxMDMzMTE3WjAfMR0wGwYDVQQDExRpZHAubWVkdW5pd2llbi5h
-Yy5hdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKHIbWnRpzxgF785
-09wKk/EY2jf54pPrmFNdkD5a4ZDDZG9amhY945W3BACuGa929DdfcERcVkngRLoy
-SXjMxMTQDZjTvuJV0Pxyb71rihKhdZ+waJ223fip9ZotThmhkrGa40SIFldBaJs9
-Rup1VK6R7G46opQARTPQdpwKYBqBeOE5pPmrczYT6mM6nnMgpStth+DImHN+Cwxl
-DIjqiCwHjeWq3FGUR828H6JzQ5Hdb4nDWoGfne8jaL/n0GWALes1rFibnZfI812I
-JV0KDiomfFvdPntOrZ64Eq/52BXwzKc94oi2s1YJ1wr2pFlXh7Q2F8AZpnLfhwk6
-4OFfsiUCAwEAAaNvMG0wTAYDVR0RBEUwQ4IUaWRwLm1lZHVuaXdpZW4uYWMuYXSG
-K2h0dHBzOi8vaWRwLm1lZHVuaXdpZW4uYWMuYXQvaWRwL3NoaWJib2xldGgwHQYD
-VR0OBBYEFLNFilq1Hc56vgAhtuFB6wxI4ZqYMA0GCSqGSIb3DQEBBQUAA4IBAQAN
-5F9raRlQBYLorrPWPlYIiljnznJAFLDw62LFYRh/ovPY7FiJrcZ0rEKpyIYgNjpd
-5CcIf/gvFoDP6P4dsCQ2kDF1nUMd9eC4LVBHVw9iTQboiH94SegSfiuFP6r0jQyp
-9JyxE9Qwb7QJepmyubRewHy2srKTO2W6BIbwQaqHSYT3R42vmKLteZKN5kKVxYZj
-NSMYR5rudqBBzTUAo5qe/9UX3Hp9//vK9rkPHSMpFUd/9dfp59VOtimG95Onr9K7
-jatEfpnMS4nv+9dyJBBzqAjL/AxoqapRDix1pFU6DnnI6NjEK0ycSBdl0GbUWX/+
-OKQ7j1Bqsv6B43xMHff+
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.meduniwien.ac.at:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.meduniwien.ac.at:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="de">Medizinische Universität Wien</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">Medical University of Vienna</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="de">Medizinische Universität Wien</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Medical University of Vienna</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="de">http://www.meduniwien.ac.at/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.meduniwien.ac.at/homepage/1/homepage/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Herbert</md:GivenName>
-    <md:SurName>Jacubetz</md:SurName>
-    <md:EmailAddress>mailto:netadmin@meduniwien.ac.at</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Thomas</md:GivenName>
-    <md:SurName>Amsuess</md:SurName>
-    <md:EmailAddress>mailto:netadmin@meduniwien.ac.at</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.meduniwien.ac.at.xml b/swamid-interfederations-2.0/idp.meduniwien.ac.at.xml
deleted file mode 100644
index 6f709f60..00000000
--- a/swamid-interfederations-2.0/idp.meduniwien.ac.at.xml
+++ /dev/null
@@ -1,108 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.meduniwien.ac.at/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://eduid.at" registrationInstant="2008-09-03T14:46:35Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://eduid.at/policy/mdrps-20140606</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">meduniwien.ac.at</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Medical University of Vienna</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="de">Medizinische Universität Wien</mdui:DisplayName>
-        <mdui:Logo height="82" width="172">https://idp.meduniwien.ac.at/idp/images/meduni_logo.gif</mdui:Logo>
-        <mdui:Logo height="16" width="16">https://idp.meduniwien.ac.at/idp/favicon.ico</mdui:Logo>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDOzCCAiOgAwIBAgIULLvePur8kLbXZX40PB9OXf5KCxwwDQYJKoZIhvcNAQEF
-BQAwHzEdMBsGA1UEAxMUaWRwLm1lZHVuaXdpZW4uYWMuYXQwHhcNMDgwODIxMDMz
-MTE3WhcNMjgwODIxMDMzMTE3WjAfMR0wGwYDVQQDExRpZHAubWVkdW5pd2llbi5h
-Yy5hdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKHIbWnRpzxgF785
-09wKk/EY2jf54pPrmFNdkD5a4ZDDZG9amhY945W3BACuGa929DdfcERcVkngRLoy
-SXjMxMTQDZjTvuJV0Pxyb71rihKhdZ+waJ223fip9ZotThmhkrGa40SIFldBaJs9
-Rup1VK6R7G46opQARTPQdpwKYBqBeOE5pPmrczYT6mM6nnMgpStth+DImHN+Cwxl
-DIjqiCwHjeWq3FGUR828H6JzQ5Hdb4nDWoGfne8jaL/n0GWALes1rFibnZfI812I
-JV0KDiomfFvdPntOrZ64Eq/52BXwzKc94oi2s1YJ1wr2pFlXh7Q2F8AZpnLfhwk6
-4OFfsiUCAwEAAaNvMG0wTAYDVR0RBEUwQ4IUaWRwLm1lZHVuaXdpZW4uYWMuYXSG
-K2h0dHBzOi8vaWRwLm1lZHVuaXdpZW4uYWMuYXQvaWRwL3NoaWJib2xldGgwHQYD
-VR0OBBYEFLNFilq1Hc56vgAhtuFB6wxI4ZqYMA0GCSqGSIb3DQEBBQUAA4IBAQAN
-5F9raRlQBYLorrPWPlYIiljnznJAFLDw62LFYRh/ovPY7FiJrcZ0rEKpyIYgNjpd
-5CcIf/gvFoDP6P4dsCQ2kDF1nUMd9eC4LVBHVw9iTQboiH94SegSfiuFP6r0jQyp
-9JyxE9Qwb7QJepmyubRewHy2srKTO2W6BIbwQaqHSYT3R42vmKLteZKN5kKVxYZj
-NSMYR5rudqBBzTUAo5qe/9UX3Hp9//vK9rkPHSMpFUd/9dfp59VOtimG95Onr9K7
-jatEfpnMS4nv+9dyJBBzqAjL/AxoqapRDix1pFU6DnnI6NjEK0ycSBdl0GbUWX/+
-OKQ7j1Bqsv6B43xMHff+
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.meduniwien.ac.at:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.meduniwien.ac.at: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:1.1:nameid-format:unspecified</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.meduniwien.ac.at/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.meduniwien.ac.at/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.meduniwien.ac.at/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.meduniwien.ac.at/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">meduniwien.ac.at</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDOzCCAiOgAwIBAgIULLvePur8kLbXZX40PB9OXf5KCxwwDQYJKoZIhvcNAQEF
-BQAwHzEdMBsGA1UEAxMUaWRwLm1lZHVuaXdpZW4uYWMuYXQwHhcNMDgwODIxMDMz
-MTE3WhcNMjgwODIxMDMzMTE3WjAfMR0wGwYDVQQDExRpZHAubWVkdW5pd2llbi5h
-Yy5hdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKHIbWnRpzxgF785
-09wKk/EY2jf54pPrmFNdkD5a4ZDDZG9amhY945W3BACuGa929DdfcERcVkngRLoy
-SXjMxMTQDZjTvuJV0Pxyb71rihKhdZ+waJ223fip9ZotThmhkrGa40SIFldBaJs9
-Rup1VK6R7G46opQARTPQdpwKYBqBeOE5pPmrczYT6mM6nnMgpStth+DImHN+Cwxl
-DIjqiCwHjeWq3FGUR828H6JzQ5Hdb4nDWoGfne8jaL/n0GWALes1rFibnZfI812I
-JV0KDiomfFvdPntOrZ64Eq/52BXwzKc94oi2s1YJ1wr2pFlXh7Q2F8AZpnLfhwk6
-4OFfsiUCAwEAAaNvMG0wTAYDVR0RBEUwQ4IUaWRwLm1lZHVuaXdpZW4uYWMuYXSG
-K2h0dHBzOi8vaWRwLm1lZHVuaXdpZW4uYWMuYXQvaWRwL3NoaWJib2xldGgwHQYD
-VR0OBBYEFLNFilq1Hc56vgAhtuFB6wxI4ZqYMA0GCSqGSIb3DQEBBQUAA4IBAQAN
-5F9raRlQBYLorrPWPlYIiljnznJAFLDw62LFYRh/ovPY7FiJrcZ0rEKpyIYgNjpd
-5CcIf/gvFoDP6P4dsCQ2kDF1nUMd9eC4LVBHVw9iTQboiH94SegSfiuFP6r0jQyp
-9JyxE9Qwb7QJepmyubRewHy2srKTO2W6BIbwQaqHSYT3R42vmKLteZKN5kKVxYZj
-NSMYR5rudqBBzTUAo5qe/9UX3Hp9//vK9rkPHSMpFUd/9dfp59VOtimG95Onr9K7
-jatEfpnMS4nv+9dyJBBzqAjL/AxoqapRDix1pFU6DnnI6NjEK0ycSBdl0GbUWX/+
-OKQ7j1Bqsv6B43xMHff+
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.meduniwien.ac.at:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.meduniwien.ac.at:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="de">Medizinische Universität Wien</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">Medical University of Vienna</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="de">Medizinische Universität Wien</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Medical University of Vienna</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="de">http://www.meduniwien.ac.at/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.meduniwien.ac.at/homepage/1/homepage/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Herbert</md:GivenName>
-    <md:SurName>Jacubetz</md:SurName>
-    <md:EmailAddress>mailto:netadmin@meduniwien.ac.at</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Thomas</md:GivenName>
-    <md:SurName>Amsuess</md:SurName>
-    <md:EmailAddress>mailto:netadmin@meduniwien.ac.at</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.metropolia.fi.xml b/swamid-interfederations-2.0/idp.metropolia.fi.xml
deleted file mode 100644
index 840bd980..00000000
--- a/swamid-interfederations-2.0/idp.metropolia.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.metropolia.fi/idp">
-  <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">metropolia.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>MIIEbzCCA1egAwIBAgIQCc/9tdLS4HQLd5HGhihrEDANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTE0MDQxMTAwMDAwMFoXDTE3MDQxMDIzNTk1OVowPzEhMB8GA1UE
-CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRowGAYDVQQDExFpZHAubWV0cm9w
-b2xpYS5maTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMhuaEYcvTxQ
-wONs2/tCwUNGN3cvP03SK+v4Gm+y3gezXXrISULJjY+sAz4qbuCtyQjewsLe3QL/
-P+fgrF8iWwLxvFANqT0PU3NbiTfweYw4imGF71uB1+BTDeTkVisCbg3ki+owshif
-aKFbO0ukOTUTx5vlBBkw1xFMAAMkttThMWZaAzTFDqnDuNhHnSP9botMOT7MDNJG
-YZh0cXRpyHRRSYmjvcI59iPJwC/zQIoGWskwc3+UyhlFFSX1zF5cKOLQXo1i+VBc
-bqf3/4VJiABIKPeyxsVvFIdo2pkylqUmm8E+wppKfPhnuK5dW8afApaqU/A4p8eh
-9hWDMofDicMCAwEAAaOCAW4wggFqMB8GA1UdIwQYMBaAFAy9k2gM896ro0lrKzdX
-R+qQ47ntMB0GA1UdDgQWBBTgVJX1n83Ge6l78jjijOdYXkXNhTAOBgNVHQ8BAf8E
-BAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUH
-AwIwIgYDVR0gBBswGTANBgsrBgEEAbIxAQICHTAIBgZngQwBAgEwOgYDVR0fBDMw
-MTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5j
-cmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRjcy50
-ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDovL29j
-c3AudGNzLnRlcmVuYS5vcmcwHAYDVR0RBBUwE4IRaWRwLm1ldHJvcG9saWEuZmkw
-DQYJKoZIhvcNAQEFBQADggEBAL7QxHjz3sE9LRXAFbxufA3DLDOvlzotP/x01Czh
-7kVp5CdUsMFZU1lPQ9Kxc5kAa+doh9m4ZEamsBdLdGx3eFZEmzq41n86EImHZhGb
-tWiMfx2qRTWga8WcYgAXW+6TzYP5CAxKxY4eBKKpvE9fsKxE5rKfByt+ZTQ51LgG
-b8SiSXWGmD5k1VIVZ0Y0W2OTmOuAk52Sq4QwaAaJaHWRMvvmX7HxeIDLHpAqxDcc
-qgNggMzs4qK6OjBIA6gCWwre1eRyeS2H1vC0rOhqqmLO5Y6vXw2odVYnKfD5pZHJ
-G+Dx7F2feFhAdfZyEz66oAuniAeUWSFMijlxsqfDKgfg5YY=</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.metropolia.fi/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.metropolia.fi/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.metropolia.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">metropolia.fi</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIEbzCCA1egAwIBAgIQCc/9tdLS4HQLd5HGhihrEDANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTE0MDQxMTAwMDAwMFoXDTE3MDQxMDIzNTk1OVowPzEhMB8GA1UE
-CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRowGAYDVQQDExFpZHAubWV0cm9w
-b2xpYS5maTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMhuaEYcvTxQ
-wONs2/tCwUNGN3cvP03SK+v4Gm+y3gezXXrISULJjY+sAz4qbuCtyQjewsLe3QL/
-P+fgrF8iWwLxvFANqT0PU3NbiTfweYw4imGF71uB1+BTDeTkVisCbg3ki+owshif
-aKFbO0ukOTUTx5vlBBkw1xFMAAMkttThMWZaAzTFDqnDuNhHnSP9botMOT7MDNJG
-YZh0cXRpyHRRSYmjvcI59iPJwC/zQIoGWskwc3+UyhlFFSX1zF5cKOLQXo1i+VBc
-bqf3/4VJiABIKPeyxsVvFIdo2pkylqUmm8E+wppKfPhnuK5dW8afApaqU/A4p8eh
-9hWDMofDicMCAwEAAaOCAW4wggFqMB8GA1UdIwQYMBaAFAy9k2gM896ro0lrKzdX
-R+qQ47ntMB0GA1UdDgQWBBTgVJX1n83Ge6l78jjijOdYXkXNhTAOBgNVHQ8BAf8E
-BAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUH
-AwIwIgYDVR0gBBswGTANBgsrBgEEAbIxAQICHTAIBgZngQwBAgEwOgYDVR0fBDMw
-MTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5j
-cmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRjcy50
-ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDovL29j
-c3AudGNzLnRlcmVuYS5vcmcwHAYDVR0RBBUwE4IRaWRwLm1ldHJvcG9saWEuZmkw
-DQYJKoZIhvcNAQEFBQADggEBAL7QxHjz3sE9LRXAFbxufA3DLDOvlzotP/x01Czh
-7kVp5CdUsMFZU1lPQ9Kxc5kAa+doh9m4ZEamsBdLdGx3eFZEmzq41n86EImHZhGb
-tWiMfx2qRTWga8WcYgAXW+6TzYP5CAxKxY4eBKKpvE9fsKxE5rKfByt+ZTQ51LgG
-b8SiSXWGmD5k1VIVZ0Y0W2OTmOuAk52Sq4QwaAaJaHWRMvvmX7HxeIDLHpAqxDcc
-qgNggMzs4qK6OjBIA6gCWwre1eRyeS2H1vC0rOhqqmLO5Y6vXw2odVYnKfD5pZHJ
-G+Dx7F2feFhAdfZyEz66oAuniAeUWSFMijlxsqfDKgfg5YY=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.metropolia.fi/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.metropolia.fi/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">Metropolia-ammattikorkeakoulu</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">Helsinki Metropolia University of Applied Sciences</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">Metropolia yrkeshögskola</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="fi">Metropolia-ammattikorkeakoulu</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Helsinki Metropolia University of Applied Sciences</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="sv">Metropolia yrkeshögskola</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="fi">http://www.metropolia.fi</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.metropolia.fi</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sv">http://www.metropolia.fi</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Jani</md:GivenName>
-    <md:SurName>Kaljunen</md:SurName>
-    <md:EmailAddress>mailto:jani.kaljunen@metropolia.fi</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Jukka</md:GivenName>
-    <md:SurName>Veikkolainen</md:SurName>
-    <md:EmailAddress>mailto:jukka.veikkolainen@metropolia.fi</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.mnhn.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.mnhn.fr-idp-shibboleth.xml
deleted file mode 100644
index ca335175..00000000
--- a/swamid-interfederations-2.0/idp.mnhn.fr-idp-shibboleth.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.mnhn.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2011-05-24T10:42:58Z">
-      <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">mnhn.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">Muséum National d'Histoire Naturelle (MNHN)</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDGDCCAgCgAwIBAgIVAN2WCywAfMl5MJ8cVRoKFLyV+pBoMA0GCSqGSIb3DQEB
-BQUAMBYxFDASBgNVBAMTC2lkcC5tbmhuLmZyMB4XDTExMDUyMzA4NTUyNloXDTMx
-MDUyMzA4NTUyNlowFjEUMBIGA1UEAxMLaWRwLm1uaG4uZnIwggEiMA0GCSqGSIb3
-DQEBAQUAA4IBDwAwggEKAoIBAQCmAwtKt4Gn/OnH/ER/RWlu+XXXicirD/hyUooa
-K5KKEsbiRAr//R+vzCwC3svUQJ5F6f9mMaLoPC06cALnyMmylUJhT1D7XW2mJQMX
-XroZC1fa+UCmxtdvZIM7qjesRIfLYEZMoa4/weBEbEElUfuqPkoqShTp5kbO/L5Y
-/phmvhYV0MnReY5UYOH59yzCHcZ1N9vDu4K5HwvaK56nYTc/yVfAlhK7T2KTZldP
-+yf8tU2UBdhympcm4WCaH2wbZSlVt5Vr4V0CgQmF3AkkSmmr+l2z0WmIyj5DqYc5
-UwVu5q/YteHRNqy2HD0BpyFnWd+OumQRRtMLOQYqqTmMVtBHAgMBAAGjXTBbMDoG
-A1UdEQQzMDGCC2lkcC5tbmhuLmZyhiJodHRwczovL2lkcC5tbmhuLmZyL2lkcC9z
-aGliYm9sZXRoMB0GA1UdDgQWBBTwc9EzS0upzHexvPHSjyyBXtJRzzANBgkqhkiG
-9w0BAQUFAAOCAQEAUjcVU43UjPS2yZa2B98B2GixtGn5JcBnE1QLt5pgGsnr4CIx
-I8cC/jZT5L7NXrTNt/6nPGMCycxAWv7tlueZ0WdzZ+UGtB/rRYkL2r469oLZ3rYa
-+UjhcWk/BF913fSK/FsRHrdp/Ml4qKsgePY0XovshBV95lfyRSfO2fOYkOE9DqWi
-xFPoC+FB1H96Xlqm9MNJTjVHOlK/dsWepngeGtSThDfw6Zu2YBffGKmjUxZupnz/
-x1tBulh4y7eU//huta68Wi6YRz4yzVlzbowBI/RxtKs0bme6vXeCkL1b5TCJBpHy
-vRrHv8r51u7XXy3b5wfo2T+mRkq36Qzb3+UX7w==
-					    </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://idp.mnhn.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.mnhn.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.mnhn.fr/idp/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Muséum National d'Histoire Naturelle (MNHN)</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Muséum National d'Histoire Naturelle (MNHN)</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <EmailAddress>zyxad@mnhn.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.mnhn.fr.xml b/swamid-interfederations-2.0/idp.mnhn.fr.xml
deleted file mode 100644
index ca335175..00000000
--- a/swamid-interfederations-2.0/idp.mnhn.fr.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.mnhn.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2011-05-24T10:42:58Z">
-      <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">mnhn.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">Muséum National d'Histoire Naturelle (MNHN)</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDGDCCAgCgAwIBAgIVAN2WCywAfMl5MJ8cVRoKFLyV+pBoMA0GCSqGSIb3DQEB
-BQUAMBYxFDASBgNVBAMTC2lkcC5tbmhuLmZyMB4XDTExMDUyMzA4NTUyNloXDTMx
-MDUyMzA4NTUyNlowFjEUMBIGA1UEAxMLaWRwLm1uaG4uZnIwggEiMA0GCSqGSIb3
-DQEBAQUAA4IBDwAwggEKAoIBAQCmAwtKt4Gn/OnH/ER/RWlu+XXXicirD/hyUooa
-K5KKEsbiRAr//R+vzCwC3svUQJ5F6f9mMaLoPC06cALnyMmylUJhT1D7XW2mJQMX
-XroZC1fa+UCmxtdvZIM7qjesRIfLYEZMoa4/weBEbEElUfuqPkoqShTp5kbO/L5Y
-/phmvhYV0MnReY5UYOH59yzCHcZ1N9vDu4K5HwvaK56nYTc/yVfAlhK7T2KTZldP
-+yf8tU2UBdhympcm4WCaH2wbZSlVt5Vr4V0CgQmF3AkkSmmr+l2z0WmIyj5DqYc5
-UwVu5q/YteHRNqy2HD0BpyFnWd+OumQRRtMLOQYqqTmMVtBHAgMBAAGjXTBbMDoG
-A1UdEQQzMDGCC2lkcC5tbmhuLmZyhiJodHRwczovL2lkcC5tbmhuLmZyL2lkcC9z
-aGliYm9sZXRoMB0GA1UdDgQWBBTwc9EzS0upzHexvPHSjyyBXtJRzzANBgkqhkiG
-9w0BAQUFAAOCAQEAUjcVU43UjPS2yZa2B98B2GixtGn5JcBnE1QLt5pgGsnr4CIx
-I8cC/jZT5L7NXrTNt/6nPGMCycxAWv7tlueZ0WdzZ+UGtB/rRYkL2r469oLZ3rYa
-+UjhcWk/BF913fSK/FsRHrdp/Ml4qKsgePY0XovshBV95lfyRSfO2fOYkOE9DqWi
-xFPoC+FB1H96Xlqm9MNJTjVHOlK/dsWepngeGtSThDfw6Zu2YBffGKmjUxZupnz/
-x1tBulh4y7eU//huta68Wi6YRz4yzVlzbowBI/RxtKs0bme6vXeCkL1b5TCJBpHy
-vRrHv8r51u7XXy3b5wfo2T+mRkq36Qzb3+UX7w==
-					    </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://idp.mnhn.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.mnhn.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.mnhn.fr/idp/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Muséum National d'Histoire Naturelle (MNHN)</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Muséum National d'Histoire Naturelle (MNHN)</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <EmailAddress>zyxad@mnhn.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.mta.hu-idp-saml2-idp-metadata.php.xml b/swamid-interfederations-2.0/idp.mta.hu-idp-saml2-idp-metadata.php.xml
deleted file mode 100644
index 86785727..00000000
--- a/swamid-interfederations-2.0/idp.mta.hu-idp-saml2-idp-metadata.php.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?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"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-        <mdui:DisplayName xml:lang="hu">MTA Titkárság</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">MTA Titkárság</mdui:DisplayName>
-        <mdui:Description xml:lang="hu">MTA Akadémiai Adattár (AAT)</mdui:Description>
-        <mdui:Description xml:lang="en">MTA Akadémiai Adattár (AAT)</mdui:Description>
-      </mdui:UIInfo>
-    </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.mta.hu.xml b/swamid-interfederations-2.0/idp.mta.hu.xml
deleted file mode 100644
index 86785727..00000000
--- a/swamid-interfederations-2.0/idp.mta.hu.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?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"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-        <mdui:DisplayName xml:lang="hu">MTA Titkárság</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">MTA Titkárság</mdui:DisplayName>
-        <mdui:Description xml:lang="hu">MTA Akadémiai Adattár (AAT)</mdui:Description>
-        <mdui:Description xml:lang="en">MTA Akadémiai Adattár (AAT)</mdui:Description>
-      </mdui:UIInfo>
-    </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.ncirl.ie-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.ncirl.ie-idp-shibboleth.xml
deleted file mode 100644
index 295c7705..00000000
--- a/swamid-interfederations-2.0/idp.ncirl.ie-idp-shibboleth.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.ncirl.ie/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.heanet.ie" registrationInstant="2011-02-09T00:00:00Z"/>
-  </md:Extensions>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ncirl.ie</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">National College of Ireland</mdui:DisplayName>
-        <mdui:Description xml:lang="en">National College of Ireland</mdui:Description>
-        <mdui:InformationURL xml:lang="en">https://nci360.ncirl.ie/</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">http://www.ncirl.ie/Legal/Privacy.aspx</mdui:PrivacyStatementURL>
-        <mdui:Logo height="124" width="124">https://edugate.heanet.ie/rr3/logos/nci.png</mdui:Logo>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:GeolocationHint>geo:53.34900526916922,-6.243662238121033</mdui:GeolocationHint>
-      </mdui:DiscoHints>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDGzCCAgOgAwIBAgIUDymT+0qnFpj+1wBK67kpD4GOwBQwDQYJKoZIhvcNAQEF
-BQAwFzEVMBMGA1UEAxMMaWRwLm5jaXJsLmllMB4XDTE0MDExNTEzNTQ0NloXDTM0
-MDExNTEzNTQ0NlowFzEVMBMGA1UEAxMMaWRwLm5jaXJsLmllMIIBIjANBgkqhkiG
-9w0BAQEFAAOCAQ8AMIIBCgKCAQEAypTiVM40mgEF79m5GylKgp+UZRRghVs6iPOc
-dClQNg52UCyORYQ/N5PPOJzJRUR97zeqlmNeH9su0tAgfZgbncw/vXklXJIAxIcL
-nwGyaZdTGyj/VDBtnxj5u8hLm5/5WwqEw2Jo6Jma5qfBmNFpSAOTfkSvtMxWCtqe
-o8h1ni0AN4jKHaijAjrzLMutrlwHpgZDN+21s/9InCTdrWGlfUp3Mbl0yCxizPax
-IH3gGsO6nFt55/CNsA4ZTXVK1NzYWpuAubWzeuqM4DMLw0lMCOxCZ0/TTKNKft3p
-2gftS6oJriXVcd05tLVG0Th2bAQicl1mZ+OXkFc/a13kcR368wIDAQABo18wXTA8
-BgNVHREENTAzggxpZHAubmNpcmwuaWWGI2h0dHBzOi8vaWRwLm5jaXJsLmllL2lk
-cC9zaGliYm9sZXRoMB0GA1UdDgQWBBQ1LNq1zEuMDzz7DnnOZ6nDSsxoVTANBgkq
-hkiG9w0BAQUFAAOCAQEAxaOejgfPiAEhBHErNLiWdvmzaxtjRp6zKfrIFVcFKEQx
-eex6fyCNQ0XQMfPeber7EtAuk2AdidMxlYAgBMNp57oZnBuvYipO8LVn6qPpotoQ
-uqMQX4MYtEcIHnDdwZErO3CzKWG76PC5C5CM2G9eh7sahmP2F7EZshX+Wz45il1j
-vELnlgNrvB9nRAbI8OfYuUhrHCEQpoEcvGNoXtZfbRCYoA0RSKZzoLMP8+mtgrMN
-QoD56UPu/9sTcUyhMp+wrXLZE2YuAru5feZwGSOWMk+CKosq75DBJ6xlJKMEMpYe
-EpAWVSexjo2IWj8KAOEJOpUl5z8XsVybIWIR1IUvYw==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</md:NameIDFormat>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ncirl.ie/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ncirl.ie/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.ncirl.ie/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ncirl.ie/idp/profile/SAML2/SOAP/ECP"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.ncirl.ie/idp/profile/Shibboleth/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">National College of Ireland</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">National College of Ireland</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">https://nci360.ncirl.ie</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Robert</md:GivenName>
-    <md:SurName>Duncan</md:SurName>
-    <md:EmailAddress>robert.duncan@ncirl.ie</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Robert</md:GivenName>
-    <md:SurName>Duncan</md:SurName>
-    <md:EmailAddress>robert.duncan@ncirl.ie</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Robert</md:GivenName>
-    <md:SurName>Duncan</md:SurName>
-    <md:EmailAddress>robert.duncan@ncirl.ie</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.ncirl.ie.xml b/swamid-interfederations-2.0/idp.ncirl.ie.xml
deleted file mode 100644
index 295c7705..00000000
--- a/swamid-interfederations-2.0/idp.ncirl.ie.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.ncirl.ie/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.heanet.ie" registrationInstant="2011-02-09T00:00:00Z"/>
-  </md:Extensions>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ncirl.ie</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">National College of Ireland</mdui:DisplayName>
-        <mdui:Description xml:lang="en">National College of Ireland</mdui:Description>
-        <mdui:InformationURL xml:lang="en">https://nci360.ncirl.ie/</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">http://www.ncirl.ie/Legal/Privacy.aspx</mdui:PrivacyStatementURL>
-        <mdui:Logo height="124" width="124">https://edugate.heanet.ie/rr3/logos/nci.png</mdui:Logo>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:GeolocationHint>geo:53.34900526916922,-6.243662238121033</mdui:GeolocationHint>
-      </mdui:DiscoHints>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDGzCCAgOgAwIBAgIUDymT+0qnFpj+1wBK67kpD4GOwBQwDQYJKoZIhvcNAQEF
-BQAwFzEVMBMGA1UEAxMMaWRwLm5jaXJsLmllMB4XDTE0MDExNTEzNTQ0NloXDTM0
-MDExNTEzNTQ0NlowFzEVMBMGA1UEAxMMaWRwLm5jaXJsLmllMIIBIjANBgkqhkiG
-9w0BAQEFAAOCAQ8AMIIBCgKCAQEAypTiVM40mgEF79m5GylKgp+UZRRghVs6iPOc
-dClQNg52UCyORYQ/N5PPOJzJRUR97zeqlmNeH9su0tAgfZgbncw/vXklXJIAxIcL
-nwGyaZdTGyj/VDBtnxj5u8hLm5/5WwqEw2Jo6Jma5qfBmNFpSAOTfkSvtMxWCtqe
-o8h1ni0AN4jKHaijAjrzLMutrlwHpgZDN+21s/9InCTdrWGlfUp3Mbl0yCxizPax
-IH3gGsO6nFt55/CNsA4ZTXVK1NzYWpuAubWzeuqM4DMLw0lMCOxCZ0/TTKNKft3p
-2gftS6oJriXVcd05tLVG0Th2bAQicl1mZ+OXkFc/a13kcR368wIDAQABo18wXTA8
-BgNVHREENTAzggxpZHAubmNpcmwuaWWGI2h0dHBzOi8vaWRwLm5jaXJsLmllL2lk
-cC9zaGliYm9sZXRoMB0GA1UdDgQWBBQ1LNq1zEuMDzz7DnnOZ6nDSsxoVTANBgkq
-hkiG9w0BAQUFAAOCAQEAxaOejgfPiAEhBHErNLiWdvmzaxtjRp6zKfrIFVcFKEQx
-eex6fyCNQ0XQMfPeber7EtAuk2AdidMxlYAgBMNp57oZnBuvYipO8LVn6qPpotoQ
-uqMQX4MYtEcIHnDdwZErO3CzKWG76PC5C5CM2G9eh7sahmP2F7EZshX+Wz45il1j
-vELnlgNrvB9nRAbI8OfYuUhrHCEQpoEcvGNoXtZfbRCYoA0RSKZzoLMP8+mtgrMN
-QoD56UPu/9sTcUyhMp+wrXLZE2YuAru5feZwGSOWMk+CKosq75DBJ6xlJKMEMpYe
-EpAWVSexjo2IWj8KAOEJOpUl5z8XsVybIWIR1IUvYw==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</md:NameIDFormat>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ncirl.ie/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ncirl.ie/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.ncirl.ie/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ncirl.ie/idp/profile/SAML2/SOAP/ECP"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.ncirl.ie/idp/profile/Shibboleth/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">National College of Ireland</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">National College of Ireland</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">https://nci360.ncirl.ie</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Robert</md:GivenName>
-    <md:SurName>Duncan</md:SurName>
-    <md:EmailAddress>robert.duncan@ncirl.ie</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Robert</md:GivenName>
-    <md:SurName>Duncan</md:SurName>
-    <md:EmailAddress>robert.duncan@ncirl.ie</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Robert</md:GivenName>
-    <md:SurName>Duncan</md:SurName>
-    <md:EmailAddress>robert.duncan@ncirl.ie</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.nesc.gla.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.nesc.gla.ac.uk-idp-shibboleth.xml
deleted file mode 100644
index 32c71a1b..00000000
--- a/swamid-interfederations-2.0/idp.nesc.gla.ac.uk-idp-shibboleth.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://idp.nesc.gla.ac.uk/idp/shibboleth">
-  <!--
-		This is a Shibboleth IdP for the National e-Science Centre, University of Glasgow.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2010-01-29T14:17:30Z">
-      <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">nesc.gla.ac.uk</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">National e-Science Centre Hub (Glasgow)</mdui:DisplayName>
-        <mdui:Logo height="168" width="198">https://idp.nesc.gla.ac.uk:8444/nescgla.gif</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDNDCCAhygAwIBAgIVAPq1QpqioWHeh0ScXnahkNLcLb9SMA0GCSqGSIb3DQEB
-						BQUAMB0xGzAZBgNVBAMTEmlkcC5uZXNjLmdsYS5hYy51azAeFw0xMDAxMjgxMjQ2
-						MzZaFw0zMDAxMjgxMjQ2MzZaMB0xGzAZBgNVBAMTEmlkcC5uZXNjLmdsYS5hYy51
-						azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAIzMo/jm/4YdOcraBypo
-						44Pt5VVSsq362JfQUcuONHVVncUV4WD/60FMjJRIeEzFfFpzbAne6pUnixb9Z1B6
-						fcSpTVN6YhO81LqwnYNumOOlYmYPwDYPObyvpIhcUI4fB/qUbSyURXisbIXlgjow
-						vNbrjxT94otpChHh/MDDf/av1Js96tHUW9qHeE6hCtjKsBOgQRc4F7O4jAwkstlX
-						An0p6uImBE29Dp28XPl2pvGmCX3nXFOxWFNA8/hLaP2WwLwj1We4x9sKrQ36nHXx
-						Vs96YJBQ57UaaXBPciLX0OLi789yuXGBFQVfze1bB+nwg6jyBBYNVRfowcf52tDe
-						ZCUCAwEAAaNrMGkwSAYDVR0RBEEwP4ISaWRwLm5lc2MuZ2xhLmFjLnVrhilodHRw
-						czovL2lkcC5uZXNjLmdsYS5hYy51ay9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQU
-						Bp6Cv9b7k/vjHWMzMz9WVf7A/FUwDQYJKoZIhvcNAQEFBQADggEBAHrb5/goxXFy
-						YTItKSfhHvqYKdLMBYrGDn8c0mXOm3vy1rC4osncx9TjPbjLAJg+i6rZxdfCzgN3
-						Cjlg1FyMEpsRkscPRSQlg9gge2Ecd/iWSoq8Md25feH1Xm7AA91Q3S81mheSXqx/
-						As0WUNFBp9tvIYHCBUMujQzw/O0s3qI8COnjAFpj4K1Hp+0zrjjE860ezhKuGs3c
-						v+9IVxUpfm8spl6EnuWbPGY0+J8N4DqL14G1SuOsMJNMB+qw9JFikzNy0YfHD9YK
-						Gcw5OSlSkClxFLW1fQ3aMDYjRi65tmArCZ4p3utYdqEWy4qzitl/helnRtPojX0b
-						XuZK6AuQhAE=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.nesc.gla.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.nesc.gla.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.nesc.gla.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.nesc.gla.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.nesc.gla.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.nesc.gla.ac.uk/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="false">nesc.gla.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDNDCCAhygAwIBAgIVAPq1QpqioWHeh0ScXnahkNLcLb9SMA0GCSqGSIb3DQEB
-						BQUAMB0xGzAZBgNVBAMTEmlkcC5uZXNjLmdsYS5hYy51azAeFw0xMDAxMjgxMjQ2
-						MzZaFw0zMDAxMjgxMjQ2MzZaMB0xGzAZBgNVBAMTEmlkcC5uZXNjLmdsYS5hYy51
-						azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAIzMo/jm/4YdOcraBypo
-						44Pt5VVSsq362JfQUcuONHVVncUV4WD/60FMjJRIeEzFfFpzbAne6pUnixb9Z1B6
-						fcSpTVN6YhO81LqwnYNumOOlYmYPwDYPObyvpIhcUI4fB/qUbSyURXisbIXlgjow
-						vNbrjxT94otpChHh/MDDf/av1Js96tHUW9qHeE6hCtjKsBOgQRc4F7O4jAwkstlX
-						An0p6uImBE29Dp28XPl2pvGmCX3nXFOxWFNA8/hLaP2WwLwj1We4x9sKrQ36nHXx
-						Vs96YJBQ57UaaXBPciLX0OLi789yuXGBFQVfze1bB+nwg6jyBBYNVRfowcf52tDe
-						ZCUCAwEAAaNrMGkwSAYDVR0RBEEwP4ISaWRwLm5lc2MuZ2xhLmFjLnVrhilodHRw
-						czovL2lkcC5uZXNjLmdsYS5hYy51ay9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQU
-						Bp6Cv9b7k/vjHWMzMz9WVf7A/FUwDQYJKoZIhvcNAQEFBQADggEBAHrb5/goxXFy
-						YTItKSfhHvqYKdLMBYrGDn8c0mXOm3vy1rC4osncx9TjPbjLAJg+i6rZxdfCzgN3
-						Cjlg1FyMEpsRkscPRSQlg9gge2Ecd/iWSoq8Md25feH1Xm7AA91Q3S81mheSXqx/
-						As0WUNFBp9tvIYHCBUMujQzw/O0s3qI8COnjAFpj4K1Hp+0zrjjE860ezhKuGs3c
-						v+9IVxUpfm8spl6EnuWbPGY0+J8N4DqL14G1SuOsMJNMB+qw9JFikzNy0YfHD9YK
-						Gcw5OSlSkClxFLW1fQ3aMDYjRi65tmArCZ4p3utYdqEWy4qzitl/helnRtPojX0b
-						XuZK6AuQhAE=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.nesc.gla.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.nesc.gla.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">University of Glasgow</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">National e-Science Centre Hub (Glasgow)</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.nesc.ac.uk/hub/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>John</GivenName>
-    <SurName>Watt</SurName>
-    <EmailAddress>mailto:John.Watt@glasgow.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>John</GivenName>
-    <SurName>Watt</SurName>
-    <EmailAddress>mailto:John.Watt@glasgow.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.nesc.gla.ac.uk.xml b/swamid-interfederations-2.0/idp.nesc.gla.ac.uk.xml
deleted file mode 100644
index 32c71a1b..00000000
--- a/swamid-interfederations-2.0/idp.nesc.gla.ac.uk.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://idp.nesc.gla.ac.uk/idp/shibboleth">
-  <!--
-		This is a Shibboleth IdP for the National e-Science Centre, University of Glasgow.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2010-01-29T14:17:30Z">
-      <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">nesc.gla.ac.uk</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">National e-Science Centre Hub (Glasgow)</mdui:DisplayName>
-        <mdui:Logo height="168" width="198">https://idp.nesc.gla.ac.uk:8444/nescgla.gif</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDNDCCAhygAwIBAgIVAPq1QpqioWHeh0ScXnahkNLcLb9SMA0GCSqGSIb3DQEB
-						BQUAMB0xGzAZBgNVBAMTEmlkcC5uZXNjLmdsYS5hYy51azAeFw0xMDAxMjgxMjQ2
-						MzZaFw0zMDAxMjgxMjQ2MzZaMB0xGzAZBgNVBAMTEmlkcC5uZXNjLmdsYS5hYy51
-						azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAIzMo/jm/4YdOcraBypo
-						44Pt5VVSsq362JfQUcuONHVVncUV4WD/60FMjJRIeEzFfFpzbAne6pUnixb9Z1B6
-						fcSpTVN6YhO81LqwnYNumOOlYmYPwDYPObyvpIhcUI4fB/qUbSyURXisbIXlgjow
-						vNbrjxT94otpChHh/MDDf/av1Js96tHUW9qHeE6hCtjKsBOgQRc4F7O4jAwkstlX
-						An0p6uImBE29Dp28XPl2pvGmCX3nXFOxWFNA8/hLaP2WwLwj1We4x9sKrQ36nHXx
-						Vs96YJBQ57UaaXBPciLX0OLi789yuXGBFQVfze1bB+nwg6jyBBYNVRfowcf52tDe
-						ZCUCAwEAAaNrMGkwSAYDVR0RBEEwP4ISaWRwLm5lc2MuZ2xhLmFjLnVrhilodHRw
-						czovL2lkcC5uZXNjLmdsYS5hYy51ay9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQU
-						Bp6Cv9b7k/vjHWMzMz9WVf7A/FUwDQYJKoZIhvcNAQEFBQADggEBAHrb5/goxXFy
-						YTItKSfhHvqYKdLMBYrGDn8c0mXOm3vy1rC4osncx9TjPbjLAJg+i6rZxdfCzgN3
-						Cjlg1FyMEpsRkscPRSQlg9gge2Ecd/iWSoq8Md25feH1Xm7AA91Q3S81mheSXqx/
-						As0WUNFBp9tvIYHCBUMujQzw/O0s3qI8COnjAFpj4K1Hp+0zrjjE860ezhKuGs3c
-						v+9IVxUpfm8spl6EnuWbPGY0+J8N4DqL14G1SuOsMJNMB+qw9JFikzNy0YfHD9YK
-						Gcw5OSlSkClxFLW1fQ3aMDYjRi65tmArCZ4p3utYdqEWy4qzitl/helnRtPojX0b
-						XuZK6AuQhAE=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.nesc.gla.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.nesc.gla.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.nesc.gla.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.nesc.gla.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.nesc.gla.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.nesc.gla.ac.uk/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="false">nesc.gla.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDNDCCAhygAwIBAgIVAPq1QpqioWHeh0ScXnahkNLcLb9SMA0GCSqGSIb3DQEB
-						BQUAMB0xGzAZBgNVBAMTEmlkcC5uZXNjLmdsYS5hYy51azAeFw0xMDAxMjgxMjQ2
-						MzZaFw0zMDAxMjgxMjQ2MzZaMB0xGzAZBgNVBAMTEmlkcC5uZXNjLmdsYS5hYy51
-						azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAIzMo/jm/4YdOcraBypo
-						44Pt5VVSsq362JfQUcuONHVVncUV4WD/60FMjJRIeEzFfFpzbAne6pUnixb9Z1B6
-						fcSpTVN6YhO81LqwnYNumOOlYmYPwDYPObyvpIhcUI4fB/qUbSyURXisbIXlgjow
-						vNbrjxT94otpChHh/MDDf/av1Js96tHUW9qHeE6hCtjKsBOgQRc4F7O4jAwkstlX
-						An0p6uImBE29Dp28XPl2pvGmCX3nXFOxWFNA8/hLaP2WwLwj1We4x9sKrQ36nHXx
-						Vs96YJBQ57UaaXBPciLX0OLi789yuXGBFQVfze1bB+nwg6jyBBYNVRfowcf52tDe
-						ZCUCAwEAAaNrMGkwSAYDVR0RBEEwP4ISaWRwLm5lc2MuZ2xhLmFjLnVrhilodHRw
-						czovL2lkcC5uZXNjLmdsYS5hYy51ay9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQU
-						Bp6Cv9b7k/vjHWMzMz9WVf7A/FUwDQYJKoZIhvcNAQEFBQADggEBAHrb5/goxXFy
-						YTItKSfhHvqYKdLMBYrGDn8c0mXOm3vy1rC4osncx9TjPbjLAJg+i6rZxdfCzgN3
-						Cjlg1FyMEpsRkscPRSQlg9gge2Ecd/iWSoq8Md25feH1Xm7AA91Q3S81mheSXqx/
-						As0WUNFBp9tvIYHCBUMujQzw/O0s3qI8COnjAFpj4K1Hp+0zrjjE860ezhKuGs3c
-						v+9IVxUpfm8spl6EnuWbPGY0+J8N4DqL14G1SuOsMJNMB+qw9JFikzNy0YfHD9YK
-						Gcw5OSlSkClxFLW1fQ3aMDYjRi65tmArCZ4p3utYdqEWy4qzitl/helnRtPojX0b
-						XuZK6AuQhAE=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.nesc.gla.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.nesc.gla.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">University of Glasgow</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">National e-Science Centre Hub (Glasgow)</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.nesc.ac.uk/hub/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>John</GivenName>
-    <SurName>Watt</SurName>
-    <EmailAddress>mailto:John.Watt@glasgow.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>John</GivenName>
-    <SurName>Watt</SurName>
-    <EmailAddress>mailto:John.Watt@glasgow.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.niif.hu-shibboleth.xml b/swamid-interfederations-2.0/idp.niif.hu-shibboleth.xml
deleted file mode 100644
index be32d6f2..00000000
--- a/swamid-interfederations-2.0/idp.niif.hu-shibboleth.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://idp.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</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">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">
-    <Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">niif.hu</shibmd:Scope>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-        <mdui:IPHint>193.6.222.0/24</mdui:IPHint>
-        <mdui:IPHint>193.6.223.0/24</mdui:IPHint>
-        <mdui:GeolocationHint>geo:47.518209,19.055394</mdui:GeolocationHint>
-      </mdui:DiscoHints>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-        <mdui:DisplayName xml:lang="hu">NIIF - Nemzeti Információs Infrastruktúra Fejlesztési Intézet</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">NIIF Institute - National Information Infrastructure Development</mdui:DisplayName>
-        <mdui:Description xml:lang="hu">NIIF Intézet</mdui:Description>
-        <mdui:Description xml:lang="en">NIIF Institute</mdui:Description>
-        <mdui:Logo height="86" width="150">https://idp.niif.hu/niifi.png</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIID3zCCAsegAwIBAgIJAPlKCyW+F3hqMA0GCSqGSIb3DQEBBQUAMIGFMQswCQYDVQQGEwJIVTETMBEGA1UECAwKU29tZS1TdGF0ZTERMA8GA1UEBwwIQnVkYXBlc3QxDjAMBgNVBAoMBU5JSUZJMQwwCgYDVQQLDANBQUkxFDASBgNVBAMMC2lkcC5uaWlmLmh1MRowGAYJKoZIhvcNAQkBFgthYWlAbmlpZi5odTAeFw0xNDA0MTAwNzA4NDVaFw0zMzA2MDkwNzA4NDVaMIGFMQswCQYDVQQGEwJIVTETMBEGA1UECAwKU29tZS1TdGF0ZTERMA8GA1UEBwwIQnVkYXBlc3QxDjAMBgNVBAoMBU5JSUZJMQwwCgYDVQQLDANBQUkxFDASBgNVBAMMC2lkcC5uaWlmLmh1MRowGAYJKoZIhvcNAQkBFgthYWlAbmlpZi5odTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALa3pkANdEGmJ/CXbDCeH+UKbqvMmpSga+dUpaJ8X0KpIbb+gZBUgj3IqLZTtlf3A2CEUI9LLcAEbQln8rB5KMAMzsyyX6JUJzGsSkpKuu0Oticw3oXooNd4a9FYsdZON8iiSFrquzSiuov9Q1qslwafOxGhkwJr15HqChRfxcXI61Sid0FEAfSocrgMkdxoCq2YIWug17egIqA6gzKbThOmtAJe5Cw4gAVY2QBDut9e/F6q4kM9ukfEQwwnlC1ghP+5T6kMq7uKAd98yZv6/s95Eqiy7C7T2BiAmCqJy6Ef/I9tRKD3lvpcm32tlhprfpetBHq4OLG14Ieqhj8rZaMCAwEAAaNQME4wHQYDVR0OBBYEFDkbK3v2IgzSeNCN1LrKR75aStlYMB8GA1UdIwQYMBaAFDkbK3v2IgzSeNCN1LrKR75aStlYMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBABPM/c1QSk2ZHHUkgM60+yvrDVtMtKIdxGgpulksHUDRoCiP/1wxjCS0EFS4t/4rYogokaEfCo8Wi9VuoJS8xVlBFKe8XD3LrqKy5lbKZp10rb2e4PiCb7WlAL04kLdtogrNJfYfH13yHwYGuxOJN95SLaXw8hj7fhf6NtocI7zTAIoMeizsQ6KjhKSNiYfokAhYzsrLydmeNnVZmYL06YOS289Z6pFmarOuhDycAuZDBV7AND592hCKqwh3KyTxhlzzxVAQZXb/s9kwVqaNWZ7ChO23REDrHfbpi14tty1WFi42/RHginxT1yPRvX3PwXnwrQP4CvYMSsXEhu3Otgo=</ds:X509Certificate>
-        </ds:X509Data>
-        <ds:KeyName>idp.niif.hu</ds:KeyName>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.niif.hu/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://idp.niif.hu/simplesaml/saml2/idp/SSOService.php"/>
-  </IDPSSODescriptor>
-  <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 Intézet</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">NIIF Institute</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/idp.niif.hu.xml b/swamid-interfederations-2.0/idp.niif.hu.xml
deleted file mode 100644
index be32d6f2..00000000
--- a/swamid-interfederations-2.0/idp.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://idp.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</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">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">
-    <Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">niif.hu</shibmd:Scope>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-        <mdui:IPHint>193.6.222.0/24</mdui:IPHint>
-        <mdui:IPHint>193.6.223.0/24</mdui:IPHint>
-        <mdui:GeolocationHint>geo:47.518209,19.055394</mdui:GeolocationHint>
-      </mdui:DiscoHints>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-        <mdui:DisplayName xml:lang="hu">NIIF - Nemzeti Információs Infrastruktúra Fejlesztési Intézet</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">NIIF Institute - National Information Infrastructure Development</mdui:DisplayName>
-        <mdui:Description xml:lang="hu">NIIF Intézet</mdui:Description>
-        <mdui:Description xml:lang="en">NIIF Institute</mdui:Description>
-        <mdui:Logo height="86" width="150">https://idp.niif.hu/niifi.png</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIID3zCCAsegAwIBAgIJAPlKCyW+F3hqMA0GCSqGSIb3DQEBBQUAMIGFMQswCQYDVQQGEwJIVTETMBEGA1UECAwKU29tZS1TdGF0ZTERMA8GA1UEBwwIQnVkYXBlc3QxDjAMBgNVBAoMBU5JSUZJMQwwCgYDVQQLDANBQUkxFDASBgNVBAMMC2lkcC5uaWlmLmh1MRowGAYJKoZIhvcNAQkBFgthYWlAbmlpZi5odTAeFw0xNDA0MTAwNzA4NDVaFw0zMzA2MDkwNzA4NDVaMIGFMQswCQYDVQQGEwJIVTETMBEGA1UECAwKU29tZS1TdGF0ZTERMA8GA1UEBwwIQnVkYXBlc3QxDjAMBgNVBAoMBU5JSUZJMQwwCgYDVQQLDANBQUkxFDASBgNVBAMMC2lkcC5uaWlmLmh1MRowGAYJKoZIhvcNAQkBFgthYWlAbmlpZi5odTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALa3pkANdEGmJ/CXbDCeH+UKbqvMmpSga+dUpaJ8X0KpIbb+gZBUgj3IqLZTtlf3A2CEUI9LLcAEbQln8rB5KMAMzsyyX6JUJzGsSkpKuu0Oticw3oXooNd4a9FYsdZON8iiSFrquzSiuov9Q1qslwafOxGhkwJr15HqChRfxcXI61Sid0FEAfSocrgMkdxoCq2YIWug17egIqA6gzKbThOmtAJe5Cw4gAVY2QBDut9e/F6q4kM9ukfEQwwnlC1ghP+5T6kMq7uKAd98yZv6/s95Eqiy7C7T2BiAmCqJy6Ef/I9tRKD3lvpcm32tlhprfpetBHq4OLG14Ieqhj8rZaMCAwEAAaNQME4wHQYDVR0OBBYEFDkbK3v2IgzSeNCN1LrKR75aStlYMB8GA1UdIwQYMBaAFDkbK3v2IgzSeNCN1LrKR75aStlYMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBABPM/c1QSk2ZHHUkgM60+yvrDVtMtKIdxGgpulksHUDRoCiP/1wxjCS0EFS4t/4rYogokaEfCo8Wi9VuoJS8xVlBFKe8XD3LrqKy5lbKZp10rb2e4PiCb7WlAL04kLdtogrNJfYfH13yHwYGuxOJN95SLaXw8hj7fhf6NtocI7zTAIoMeizsQ6KjhKSNiYfokAhYzsrLydmeNnVZmYL06YOS289Z6pFmarOuhDycAuZDBV7AND592hCKqwh3KyTxhlzzxVAQZXb/s9kwVqaNWZ7ChO23REDrHfbpi14tty1WFi42/RHginxT1yPRvX3PwXnwrQP4CvYMSsXEhu3Otgo=</ds:X509Certificate>
-        </ds:X509Data>
-        <ds:KeyName>idp.niif.hu</ds:KeyName>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.niif.hu/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://idp.niif.hu/simplesaml/saml2/idp/SSOService.php"/>
-  </IDPSSODescriptor>
-  <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 Intézet</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">NIIF Institute</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/idp.nordu.net-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.nordu.net-idp-shibboleth.xml
deleted file mode 100644
index 5bb03322..00000000
--- a/swamid-interfederations-2.0/idp.nordu.net-idp-shibboleth.xml
+++ /dev/null
@@ -1,114 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.nordu.net/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">nordu.net</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="sv">NORDUnet</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">NORDUnet</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">NORDUnet A/S Identitetsutfärdare används av anställda och gäster vid NORDUnet</mdui:Description>
-        <mdui:Description xml:lang="en">The NORDUnet A/S Identity Provider is used by employees and guests of NORDUnet.</mdui:Description>
-        <mdui:Logo height="46" width="203">https://www.nordu.net/resources/NORDUnet2.jpg</mdui:Logo>
-        <mdui:Logo height="46" width="203" xml:lang="sv">https://www.nordu.net/resources/NORDUnet2.jpg</mdui:Logo>
-        <mdui:Logo height="46" width="203" xml:lang="en">https://www.nordu.net/resources/NORDUnet2.jpg</mdui:Logo>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DomainHint>nordu.net</mdui:DomainHint>
-      </mdui:DiscoHints>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDHzCCAgegAwIBAgIUbYzFMX2BKRKmZwRSWg0HZ3/MQQwwDQYJKoZIhvcNAQEF
-BQAwGDEWMBQGA1UEAxMNaWRwLm5vcmR1Lm5ldDAeFw0wOTA5MDMxOTI4NDlaFw0y
-OTA5MDMxOTI4NDlaMBgxFjAUBgNVBAMTDWlkcC5ub3JkdS5uZXQwggEiMA0GCSqG
-SIb3DQEBAQUAA4IBDwAwggEKAoIBAQCSypIpdblxznunPXiwKCqwOYmj99u5S9f7
-RTR+s8EDs01uwJ8buJs0MId+s96mD8MIkobE4iwn/B6xlafbMr3/BF+XxxH8Q5WX
-Bf3aQV3ohBqur6+mRQ2C+EenzPMGHmV/FCz0cbmTsIAQHZ9Vy16H+x5uWOBVd44i
-CMLM+fgjKyYcpcEUJP9Jkn/+d36L3mdXbyqAQS2UPN+S1g37xrgR2kWW+s1lMEiR
-M/f5L+PuA3l5DxIBmK0tFo+ZPLxbr6OBWOdH6EUbfdkvfciFCVNbWBGRW5MC2aru
-ATCdtf/Vev3OngUYBGSR/94eTgMcs3Oww/ppxRS6dzntGnnCT1sPAgMBAAGjYTBf
-MD4GA1UdEQQ3MDWCDWlkcC5ub3JkdS5uZXSGJGh0dHBzOi8vaWRwLm5vcmR1Lm5l
-dC9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUwPXuksUpm5OdopeWHdoRcs6wCu0w
-DQYJKoZIhvcNAQEFBQADggEBAHiPOKmhiLnx8ecuQHmwmh4DUZvarhZXNtgxyasU
-bZAfPoZn8YiELiqYQoA/j+hoAfWcCEafMgjm8nkQO9aad1cwpGY66SIRKPAKBgsW
-nOugnrREWwYl1tXG3VWYzpgygycziYzkmwc4ysHQATKjCYdulA1tZ09YiAnZOIzY
-Q93/gA7X177nVKnAbmSkY1Nap4/rbkHIvQqk8RPSYs5AwasThkEFVk4OQpPtoTOn
-aOBLkJxpXY7rZDixrz59ny629qmOOakSCsuVkNwDPmbLQy9dKmHXTcge2xP0mDK7
-JiNCTXH29oP8kWBEBVaDxrDIrfDv53VjURS+KXqpBLjsuVE=
-
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.nordu.net:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.nordu.net: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.nordu.net/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.nordu.net/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.nordu.net/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.nordu.net/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">nordu.net</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDHzCCAgegAwIBAgIUbYzFMX2BKRKmZwRSWg0HZ3/MQQwwDQYJKoZIhvcNAQEF
-BQAwGDEWMBQGA1UEAxMNaWRwLm5vcmR1Lm5ldDAeFw0wOTA5MDMxOTI4NDlaFw0y
-OTA5MDMxOTI4NDlaMBgxFjAUBgNVBAMTDWlkcC5ub3JkdS5uZXQwggEiMA0GCSqG
-SIb3DQEBAQUAA4IBDwAwggEKAoIBAQCSypIpdblxznunPXiwKCqwOYmj99u5S9f7
-RTR+s8EDs01uwJ8buJs0MId+s96mD8MIkobE4iwn/B6xlafbMr3/BF+XxxH8Q5WX
-Bf3aQV3ohBqur6+mRQ2C+EenzPMGHmV/FCz0cbmTsIAQHZ9Vy16H+x5uWOBVd44i
-CMLM+fgjKyYcpcEUJP9Jkn/+d36L3mdXbyqAQS2UPN+S1g37xrgR2kWW+s1lMEiR
-M/f5L+PuA3l5DxIBmK0tFo+ZPLxbr6OBWOdH6EUbfdkvfciFCVNbWBGRW5MC2aru
-ATCdtf/Vev3OngUYBGSR/94eTgMcs3Oww/ppxRS6dzntGnnCT1sPAgMBAAGjYTBf
-MD4GA1UdEQQ3MDWCDWlkcC5ub3JkdS5uZXSGJGh0dHBzOi8vaWRwLm5vcmR1Lm5l
-dC9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUwPXuksUpm5OdopeWHdoRcs6wCu0w
-DQYJKoZIhvcNAQEFBQADggEBAHiPOKmhiLnx8ecuQHmwmh4DUZvarhZXNtgxyasU
-bZAfPoZn8YiELiqYQoA/j+hoAfWcCEafMgjm8nkQO9aad1cwpGY66SIRKPAKBgsW
-nOugnrREWwYl1tXG3VWYzpgygycziYzkmwc4ysHQATKjCYdulA1tZ09YiAnZOIzY
-Q93/gA7X177nVKnAbmSkY1Nap4/rbkHIvQqk8RPSYs5AwasThkEFVk4OQpPtoTOn
-aOBLkJxpXY7rZDixrz59ny629qmOOakSCsuVkNwDPmbLQy9dKmHXTcge2xP0mDK7
-JiNCTXH29oP8kWBEBVaDxrDIrfDv53VjURS+KXqpBLjsuVE=
-
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.nordu.net:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.nordu.net: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">NORDUnet</OrganizationName>
-    <OrganizationDisplayName xml:lang="sv">NORDUnet</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">NORDUnet</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.nordu.net</OrganizationURL>
-  </Organization>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
-    <Company>NORDUnet</Company>
-    <SurName>noc@nordu.net</SurName>
-    <EmailAddress>noc@nordu.net</EmailAddress>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
-    <Company>NORDUnet</Company>
-    <EmailAddress>noc@nordu.net</EmailAddress>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
-    <Company>NORDUnet</Company>
-    <SurName>NUNOC</SurName>
-    <EmailAddress>noc@nordu.net</EmailAddress>
-  </ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.nordu.net.xml b/swamid-interfederations-2.0/idp.nordu.net.xml
deleted file mode 100644
index 5bb03322..00000000
--- a/swamid-interfederations-2.0/idp.nordu.net.xml
+++ /dev/null
@@ -1,114 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.nordu.net/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">nordu.net</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="sv">NORDUnet</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">NORDUnet</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">NORDUnet A/S Identitetsutfärdare används av anställda och gäster vid NORDUnet</mdui:Description>
-        <mdui:Description xml:lang="en">The NORDUnet A/S Identity Provider is used by employees and guests of NORDUnet.</mdui:Description>
-        <mdui:Logo height="46" width="203">https://www.nordu.net/resources/NORDUnet2.jpg</mdui:Logo>
-        <mdui:Logo height="46" width="203" xml:lang="sv">https://www.nordu.net/resources/NORDUnet2.jpg</mdui:Logo>
-        <mdui:Logo height="46" width="203" xml:lang="en">https://www.nordu.net/resources/NORDUnet2.jpg</mdui:Logo>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DomainHint>nordu.net</mdui:DomainHint>
-      </mdui:DiscoHints>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDHzCCAgegAwIBAgIUbYzFMX2BKRKmZwRSWg0HZ3/MQQwwDQYJKoZIhvcNAQEF
-BQAwGDEWMBQGA1UEAxMNaWRwLm5vcmR1Lm5ldDAeFw0wOTA5MDMxOTI4NDlaFw0y
-OTA5MDMxOTI4NDlaMBgxFjAUBgNVBAMTDWlkcC5ub3JkdS5uZXQwggEiMA0GCSqG
-SIb3DQEBAQUAA4IBDwAwggEKAoIBAQCSypIpdblxznunPXiwKCqwOYmj99u5S9f7
-RTR+s8EDs01uwJ8buJs0MId+s96mD8MIkobE4iwn/B6xlafbMr3/BF+XxxH8Q5WX
-Bf3aQV3ohBqur6+mRQ2C+EenzPMGHmV/FCz0cbmTsIAQHZ9Vy16H+x5uWOBVd44i
-CMLM+fgjKyYcpcEUJP9Jkn/+d36L3mdXbyqAQS2UPN+S1g37xrgR2kWW+s1lMEiR
-M/f5L+PuA3l5DxIBmK0tFo+ZPLxbr6OBWOdH6EUbfdkvfciFCVNbWBGRW5MC2aru
-ATCdtf/Vev3OngUYBGSR/94eTgMcs3Oww/ppxRS6dzntGnnCT1sPAgMBAAGjYTBf
-MD4GA1UdEQQ3MDWCDWlkcC5ub3JkdS5uZXSGJGh0dHBzOi8vaWRwLm5vcmR1Lm5l
-dC9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUwPXuksUpm5OdopeWHdoRcs6wCu0w
-DQYJKoZIhvcNAQEFBQADggEBAHiPOKmhiLnx8ecuQHmwmh4DUZvarhZXNtgxyasU
-bZAfPoZn8YiELiqYQoA/j+hoAfWcCEafMgjm8nkQO9aad1cwpGY66SIRKPAKBgsW
-nOugnrREWwYl1tXG3VWYzpgygycziYzkmwc4ysHQATKjCYdulA1tZ09YiAnZOIzY
-Q93/gA7X177nVKnAbmSkY1Nap4/rbkHIvQqk8RPSYs5AwasThkEFVk4OQpPtoTOn
-aOBLkJxpXY7rZDixrz59ny629qmOOakSCsuVkNwDPmbLQy9dKmHXTcge2xP0mDK7
-JiNCTXH29oP8kWBEBVaDxrDIrfDv53VjURS+KXqpBLjsuVE=
-
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.nordu.net:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.nordu.net: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.nordu.net/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.nordu.net/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.nordu.net/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.nordu.net/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">nordu.net</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDHzCCAgegAwIBAgIUbYzFMX2BKRKmZwRSWg0HZ3/MQQwwDQYJKoZIhvcNAQEF
-BQAwGDEWMBQGA1UEAxMNaWRwLm5vcmR1Lm5ldDAeFw0wOTA5MDMxOTI4NDlaFw0y
-OTA5MDMxOTI4NDlaMBgxFjAUBgNVBAMTDWlkcC5ub3JkdS5uZXQwggEiMA0GCSqG
-SIb3DQEBAQUAA4IBDwAwggEKAoIBAQCSypIpdblxznunPXiwKCqwOYmj99u5S9f7
-RTR+s8EDs01uwJ8buJs0MId+s96mD8MIkobE4iwn/B6xlafbMr3/BF+XxxH8Q5WX
-Bf3aQV3ohBqur6+mRQ2C+EenzPMGHmV/FCz0cbmTsIAQHZ9Vy16H+x5uWOBVd44i
-CMLM+fgjKyYcpcEUJP9Jkn/+d36L3mdXbyqAQS2UPN+S1g37xrgR2kWW+s1lMEiR
-M/f5L+PuA3l5DxIBmK0tFo+ZPLxbr6OBWOdH6EUbfdkvfciFCVNbWBGRW5MC2aru
-ATCdtf/Vev3OngUYBGSR/94eTgMcs3Oww/ppxRS6dzntGnnCT1sPAgMBAAGjYTBf
-MD4GA1UdEQQ3MDWCDWlkcC5ub3JkdS5uZXSGJGh0dHBzOi8vaWRwLm5vcmR1Lm5l
-dC9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUwPXuksUpm5OdopeWHdoRcs6wCu0w
-DQYJKoZIhvcNAQEFBQADggEBAHiPOKmhiLnx8ecuQHmwmh4DUZvarhZXNtgxyasU
-bZAfPoZn8YiELiqYQoA/j+hoAfWcCEafMgjm8nkQO9aad1cwpGY66SIRKPAKBgsW
-nOugnrREWwYl1tXG3VWYzpgygycziYzkmwc4ysHQATKjCYdulA1tZ09YiAnZOIzY
-Q93/gA7X177nVKnAbmSkY1Nap4/rbkHIvQqk8RPSYs5AwasThkEFVk4OQpPtoTOn
-aOBLkJxpXY7rZDixrz59ny629qmOOakSCsuVkNwDPmbLQy9dKmHXTcge2xP0mDK7
-JiNCTXH29oP8kWBEBVaDxrDIrfDv53VjURS+KXqpBLjsuVE=
-
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.nordu.net:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.nordu.net: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">NORDUnet</OrganizationName>
-    <OrganizationDisplayName xml:lang="sv">NORDUnet</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">NORDUnet</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.nordu.net</OrganizationURL>
-  </Organization>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
-    <Company>NORDUnet</Company>
-    <SurName>noc@nordu.net</SurName>
-    <EmailAddress>noc@nordu.net</EmailAddress>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
-    <Company>NORDUnet</Company>
-    <EmailAddress>noc@nordu.net</EmailAddress>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
-    <Company>NORDUnet</Company>
-    <SurName>NUNOC</SurName>
-    <EmailAddress>noc@nordu.net</EmailAddress>
-  </ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.normandie-univ.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.normandie-univ.fr-idp-shibboleth.xml
deleted file mode 100644
index 78d19c45..00000000
--- a/swamid-interfederations-2.0/idp.normandie-univ.fr-idp-shibboleth.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://idp.normandie-univ.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2013-10-03T17:47:41Z">
-      <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">normandie-univ.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">Normandie Université</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDLzCCAhegAwIBAgIUfjtraZCnuk4ayIJfZ7jOPQ0/p80wDQYJKoZIhvcNAQEF
-BQAwHDEaMBgGA1UEAxMRaWRwcHAudW5yLXJ1bm4uZnIwHhcNMTMwMjIxMTQwODMw
-WhcNMzMwMjIxMTQwODMwWjAcMRowGAYDVQQDExFpZHBwcC51bnItcnVubi5mcjCC
-ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAN2HpbBKeZVmYAS0cQ+9Sv6R
-0EqFnIcPr1gk3F3TSlOwKfptwg/YcC5i0sgQYeNCsVKeOclPPIS60eerF5RdiUbs
-WLKsrkHWja7virusalMVQZJA6o+A5zu3+y7BuZRi8/cEnpUjz3S5N1TarB9lYSsD
-/dxPB1bboefJbLfEQFAQc+SOobBineniffnGahR03jAoaJni9DUERtF8fSo4+s4m
-5I6MeiBV6GNfkGHamCtEdNQ/u0HjQYYv8+BB9SbYpEY4FvYq2oelE5ET01vxogQr
-ZYkAcuOfZVWqNX2mH5aBZewDcaE0DTfMDd5WR9Wjvv7MRF3uTOIF1jLxks/5eIkC
-AwEAAaNpMGcwRgYDVR0RBD8wPYIRaWRwcHAudW5yLXJ1bm4uZnKGKGh0dHBzOi8v
-aWRwcHAudW5yLXJ1bm4uZnIvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFP25fp7f
-nTtS3FfVhWpKfZa6X3BoMA0GCSqGSIb3DQEBBQUAA4IBAQBhqb/05bggrq/L5c1e
-LNnETROqzlxr47ECX/6vcOEov37EV2PCvIjMj1TOuEVSyy3LfOzYswy6d2fzG7Om
-NIXxg7m8CjccJ3F4H2Kp4pZDdqoI+O4oqGHLuqBAxF+B0qHlnGzL7OF6eIv3yCkR
-6uIuKyRiYpH1jAPbE1RHEzYHbB521IkdlCuoA3D41OmQzhVH48UEK+KUmqqTguEW
-yRCIhApqHi9Zy2lgW794ZMOtzPiNJ1Glj48RKGvexub/yT8ete5sk2hfDn06Z+ef
-GOF9hV4E1rvASF9pmubrSBzfuRDcwF7YEVvjUIdS0bdulO2oE+pmwowZkEEoTq9t
-7qXl
-					    </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://idp.normandie-univ.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.normandie-univ.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.normandie-univ.fr/idp/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Normandie Université</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Normandie Université</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Gallot Jérôme</SurName>
-    <EmailAddress>jerome.gallot@normandie-univ.fr</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <SurName>Houdelette Arnaud</SurName>
-    <EmailAddress>arnaud.houdelette@normandie-univ.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.normandie-univ.fr.xml b/swamid-interfederations-2.0/idp.normandie-univ.fr.xml
deleted file mode 100644
index 78d19c45..00000000
--- a/swamid-interfederations-2.0/idp.normandie-univ.fr.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://idp.normandie-univ.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2013-10-03T17:47:41Z">
-      <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">normandie-univ.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">Normandie Université</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDLzCCAhegAwIBAgIUfjtraZCnuk4ayIJfZ7jOPQ0/p80wDQYJKoZIhvcNAQEF
-BQAwHDEaMBgGA1UEAxMRaWRwcHAudW5yLXJ1bm4uZnIwHhcNMTMwMjIxMTQwODMw
-WhcNMzMwMjIxMTQwODMwWjAcMRowGAYDVQQDExFpZHBwcC51bnItcnVubi5mcjCC
-ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAN2HpbBKeZVmYAS0cQ+9Sv6R
-0EqFnIcPr1gk3F3TSlOwKfptwg/YcC5i0sgQYeNCsVKeOclPPIS60eerF5RdiUbs
-WLKsrkHWja7virusalMVQZJA6o+A5zu3+y7BuZRi8/cEnpUjz3S5N1TarB9lYSsD
-/dxPB1bboefJbLfEQFAQc+SOobBineniffnGahR03jAoaJni9DUERtF8fSo4+s4m
-5I6MeiBV6GNfkGHamCtEdNQ/u0HjQYYv8+BB9SbYpEY4FvYq2oelE5ET01vxogQr
-ZYkAcuOfZVWqNX2mH5aBZewDcaE0DTfMDd5WR9Wjvv7MRF3uTOIF1jLxks/5eIkC
-AwEAAaNpMGcwRgYDVR0RBD8wPYIRaWRwcHAudW5yLXJ1bm4uZnKGKGh0dHBzOi8v
-aWRwcHAudW5yLXJ1bm4uZnIvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFP25fp7f
-nTtS3FfVhWpKfZa6X3BoMA0GCSqGSIb3DQEBBQUAA4IBAQBhqb/05bggrq/L5c1e
-LNnETROqzlxr47ECX/6vcOEov37EV2PCvIjMj1TOuEVSyy3LfOzYswy6d2fzG7Om
-NIXxg7m8CjccJ3F4H2Kp4pZDdqoI+O4oqGHLuqBAxF+B0qHlnGzL7OF6eIv3yCkR
-6uIuKyRiYpH1jAPbE1RHEzYHbB521IkdlCuoA3D41OmQzhVH48UEK+KUmqqTguEW
-yRCIhApqHi9Zy2lgW794ZMOtzPiNJ1Glj48RKGvexub/yT8ete5sk2hfDn06Z+ef
-GOF9hV4E1rvASF9pmubrSBzfuRDcwF7YEVvjUIdS0bdulO2oE+pmwowZkEEoTq9t
-7qXl
-					    </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://idp.normandie-univ.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.normandie-univ.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.normandie-univ.fr/idp/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Normandie Université</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Normandie Université</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Gallot Jérôme</SurName>
-    <EmailAddress>jerome.gallot@normandie-univ.fr</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <SurName>Houdelette Arnaud</SurName>
-    <EmailAddress>arnaud.houdelette@normandie-univ.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.nuigalway.ie-shibboleth.xml b/swamid-interfederations-2.0/idp.nuigalway.ie-shibboleth.xml
deleted file mode 100644
index 1f667bc9..00000000
--- a/swamid-interfederations-2.0/idp.nuigalway.ie-shibboleth.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.nuigalway.ie/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.heanet.ie" registrationInstant="2010-10-01T00:00:00Z"/>
-  </md:Extensions>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nuigalway.ie</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">National University of Ireland, Galway</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="ga">OÉ Gaillimh</mdui:DisplayName>
-        <mdui:InformationURL xml:lang="en">http://nuigalway.ie</mdui:InformationURL>
-        <mdui:Logo height="68" width="225">https://edugate.heanet.ie/rr3/logos/nuig.png</mdui:Logo>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:GeolocationHint>geo:53.278923955103785,-9.060437679290771</mdui:GeolocationHint>
-      </mdui:DiscoHints>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDKzCCAhOgAwIBAgIUaZj83WML6Ro0NOTyru/oCY9DaWcwDQYJKoZIhvcNAQEF
-BQAwGzEZMBcGA1UEAxMQaWRwLm51aWdhbHdheS5pZTAeFw0xMDA4MzAxNDUyMjJa
-Fw0zMDA4MzAxNDUyMjJaMBsxGTAXBgNVBAMTEGlkcC5udWlnYWx3YXkuaWUwggEi
-MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCVTQr39i7dOPz//U7kaSk61ADv
-8zczZ4deMcSfUXGtBXwm1G913PqpjDkphmI5A5ehg7tOLjc1I/QXQI/MOi5EW5p8
-9mlrjtjuikIEZ1QJFnM0sGP2wNXUmFnfD3SX78lZbd6pqTDh/EyyO21q/6/7nIH3
-8Ds/R51LWZ4SHLXiVUj+xoLh9PaIWb1j2X9AS6t7FoUTfkQDTrNc78HNpTRy/RPN
-RKfzVUWsqmCbgCrVgz2k8ie5j9YDJ0IpFfGbdBOGUqaZuu53gyMzRTJ2KCmKIirH
-hMtk4fkx3lh9qaWMvpep9Ys9fcvv7h9ODKBDycRxoVJhfvKpRct3OmU38DFnAgMB
-AAGjZzBlMEQGA1UdEQQ9MDuCEGlkcC5udWlnYWx3YXkuaWWGJ2h0dHBzOi8vaWRw
-Lm51aWdhbHdheS5pZS9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUoSgXUY0R/R/L
-Weanf9/oteOvIL4wDQYJKoZIhvcNAQEFBQADggEBACenzaISa4sjW40cKZAdYMYp
-Aj/83wlM5r5jNvK4XML3DuQdgvVfgDhU7DLbeQTPvcySE2Mfn87PHT7wdCXZoOu0
-COH3D94Tc3/G3bu1uLg/VV6TGsNDHL7WqoUNnmHniZVOi6khONlufFLj4TbR3a8u
-xS/b1aO8RapnJUXY0Vhem17h/8bHmpw1RurScX0lXL1JA0PPEaF9nTCW5KfIOBVE
-YnwBW7s4pF85szVB4cSNiz6pRVenAw6s6bJ5AVYSXYGmkDRpm5OCzdVNzOzjlmrF
-kun2ue2G3ICbbxLefYZY3Y2Z8ASfN3caaadnEwn9ya6o47MywXTzmzIIbq1mvWc=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.nuigalway.ie/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.nuigalway.ie/idp/profile/SAML2/POST/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">National University of Ireland, Galway</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">National University of Ireland, Galway</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://nuigalway.ie</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Diarmuid Murray</md:SurName>
-    <md:EmailAddress>diarmuid.murray@nuigalway.ie</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:SurName>Diarmuid Murray</md:SurName>
-    <md:EmailAddress>diarmuid.murray@nuigalway.ie</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:SurName>ISS Service Desk</md:SurName>
-    <md:EmailAddress>servicedesk@nuigalway.ie</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.nuigalway.ie.xml b/swamid-interfederations-2.0/idp.nuigalway.ie.xml
deleted file mode 100644
index 1f667bc9..00000000
--- a/swamid-interfederations-2.0/idp.nuigalway.ie.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.nuigalway.ie/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.heanet.ie" registrationInstant="2010-10-01T00:00:00Z"/>
-  </md:Extensions>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nuigalway.ie</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">National University of Ireland, Galway</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="ga">OÉ Gaillimh</mdui:DisplayName>
-        <mdui:InformationURL xml:lang="en">http://nuigalway.ie</mdui:InformationURL>
-        <mdui:Logo height="68" width="225">https://edugate.heanet.ie/rr3/logos/nuig.png</mdui:Logo>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:GeolocationHint>geo:53.278923955103785,-9.060437679290771</mdui:GeolocationHint>
-      </mdui:DiscoHints>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDKzCCAhOgAwIBAgIUaZj83WML6Ro0NOTyru/oCY9DaWcwDQYJKoZIhvcNAQEF
-BQAwGzEZMBcGA1UEAxMQaWRwLm51aWdhbHdheS5pZTAeFw0xMDA4MzAxNDUyMjJa
-Fw0zMDA4MzAxNDUyMjJaMBsxGTAXBgNVBAMTEGlkcC5udWlnYWx3YXkuaWUwggEi
-MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCVTQr39i7dOPz//U7kaSk61ADv
-8zczZ4deMcSfUXGtBXwm1G913PqpjDkphmI5A5ehg7tOLjc1I/QXQI/MOi5EW5p8
-9mlrjtjuikIEZ1QJFnM0sGP2wNXUmFnfD3SX78lZbd6pqTDh/EyyO21q/6/7nIH3
-8Ds/R51LWZ4SHLXiVUj+xoLh9PaIWb1j2X9AS6t7FoUTfkQDTrNc78HNpTRy/RPN
-RKfzVUWsqmCbgCrVgz2k8ie5j9YDJ0IpFfGbdBOGUqaZuu53gyMzRTJ2KCmKIirH
-hMtk4fkx3lh9qaWMvpep9Ys9fcvv7h9ODKBDycRxoVJhfvKpRct3OmU38DFnAgMB
-AAGjZzBlMEQGA1UdEQQ9MDuCEGlkcC5udWlnYWx3YXkuaWWGJ2h0dHBzOi8vaWRw
-Lm51aWdhbHdheS5pZS9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUoSgXUY0R/R/L
-Weanf9/oteOvIL4wDQYJKoZIhvcNAQEFBQADggEBACenzaISa4sjW40cKZAdYMYp
-Aj/83wlM5r5jNvK4XML3DuQdgvVfgDhU7DLbeQTPvcySE2Mfn87PHT7wdCXZoOu0
-COH3D94Tc3/G3bu1uLg/VV6TGsNDHL7WqoUNnmHniZVOi6khONlufFLj4TbR3a8u
-xS/b1aO8RapnJUXY0Vhem17h/8bHmpw1RurScX0lXL1JA0PPEaF9nTCW5KfIOBVE
-YnwBW7s4pF85szVB4cSNiz6pRVenAw6s6bJ5AVYSXYGmkDRpm5OCzdVNzOzjlmrF
-kun2ue2G3ICbbxLefYZY3Y2Z8ASfN3caaadnEwn9ya6o47MywXTzmzIIbq1mvWc=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.nuigalway.ie/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.nuigalway.ie/idp/profile/SAML2/POST/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">National University of Ireland, Galway</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">National University of Ireland, Galway</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://nuigalway.ie</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Diarmuid Murray</md:SurName>
-    <md:EmailAddress>diarmuid.murray@nuigalway.ie</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:SurName>Diarmuid Murray</md:SurName>
-    <md:EmailAddress>diarmuid.murray@nuigalway.ie</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:SurName>ISS Service Desk</md:SurName>
-    <md:EmailAddress>servicedesk@nuigalway.ie</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.oamk.fi.xml b/swamid-interfederations-2.0/idp.oamk.fi.xml
deleted file mode 100644
index c2536800..00000000
--- a/swamid-interfederations-2.0/idp.oamk.fi.xml
+++ /dev/null
@@ -1,60 +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.oamk.fi/idp/shibboleth">
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope regexp="false">oamk.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>MIIEJDCCAwygAwIBAgIRAJDZbv9JChO1v4c2PegLC3gwDQYJKoZIhvcNAQEFBQAwOTELMAkGA1UE
-BhMCRkkxDzANBgNVBAoTBlNvbmVyYTEZMBcGA1UEAxMQU29uZXJhIENsYXNzMiBDQTAeFw0xMjAx
-MjQwOTA0MjNaFw0xNTAxMjMwOTA0MjNaMGoxCzAJBgNVBAYTAmZpMSkwJwYDVQQKDCBPdWx1biBz
-ZXVkdW4ga291bHV0dXNrdW50YXlodHltYTEUMBIGA1UEAwwLaWRwLm9hbWsuZmkxGjAYBgkqhkiG
-9w0BCQEWC25vY0BvYW1rLmZpMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAz1pmmgwq
-ddeiMWmthZP0W34WIKx4g5csiP/9p6DigzhNGn5+sZgsh7gb6FS1VtXWhwCFnCZCb/f0vm0AEqc2
-H9IQHTKPWWeM33S3uCOUBh1Jf7B9/3ysa70gZIdPFMkt+tX0Fd8hByeybu8FDyRwq95la1L3kPuQ
-qX6do0Ks2kEmALSHwPP9aMfCB8Mr4hZx0YpECVheIS2NgISbCtvx5F9IvfUds7FNr5eVHbz5j1dm
-gSalDjSGZN2HAwMw8EW91d314SYDtwdEC2PdvUCdbjdOnTXoHsftcDtS9PoWGzqZjLoptDjalc1z
-j8Q3UUVyqXDX9HGwDq9p+ZdEaYokPwIDAQABo4H1MIHyMBMGA1UdIwQMMAqACEqgqliE0148MBkG
-A1UdIAQSMBAwDgYMKwYBBAGCDwIDAQECMHIGA1UdHwRrMGkwZ6BloGOGYWxkYXA6Ly8xOTQuMjUy
-LjEyNC4yNDE6Mzg5L2NuPVNvbmVyYSUyMENsYXNzMiUyMENBLG89U29uZXJhLGM9Rkk/Y2VydGlm
-aWNhdGVyZXZvY2F0aW9ubGlzdDtiaW5hcnkwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMC
-MA4GA1UdDwEB/wQEAwIEsDAdBgNVHQ4EFgQUAuG1dJ173cm7/fePBi906Va3TdUwDQYJKoZIhvcN
-AQEFBQADggEBAHSh0AVK4D+979981GuW1T+gEsp7vGBH1x9TiFPc8WI25UJ46eSf14wSzB+f3irK
-T4s6CyvMJr2lZylvZF61orVJ/p2Ii21z8l/SEbk3ZbAT/vawdKU0dffypy4FhwWfTXADHAc9Li7z
-K3YfRLJLUxYw8nt/3XjqiZ0q6CkEu7ZOZ163ew27oGv8TpNTjQAFh1ZX5xkKrwMhrhaykpO2Ww3E
-Df2IYPvrPLtJYSHAn0aZ1UIn5dl8+/tFu9dpYn7p12/c9IBiBzyOUEn6uczxGlyf7NG35lscHuwR
-Ry8FNbWVwbylLohU2Ms9XOSxHmexafsdLuZYGASMnCUQQgdzX/E=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.oamk.fi/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="fi">Oulun ammattikorkeakoulu</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">Oulu University of Applied Sciences</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">Yrkeshögskolan i Uleåborg</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="fi">Oulun ammattikorkeakoulu</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Oulu University of Applied Sciences</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="sv">Yrkeshögskolan i Uleåborg</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="fi">http://www.oamk.fi</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.oamk.fi</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sv">http://www.oamk.fi</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Panu</md:GivenName>
-    <md:SurName>Jylha</md:SurName>
-    <md:EmailAddress>mailto:haka_admin@oamk.fi</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Panu</md:GivenName>
-    <md:SurName>Jylha</md:SurName>
-    <md:EmailAddress>mailto:haka_admin@oamk.fi</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.parisdescartes.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.parisdescartes.fr-idp-shibboleth.xml
deleted file mode 100644
index 80fbd12e..00000000
--- a/swamid-interfederations-2.0/idp.parisdescartes.fr-idp-shibboleth.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.parisdescartes.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2011-09-09T17:29:16Z">
-      <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">parisdescartes.fr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-paris5.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">Université de Paris 5 - Paris Descartes</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDPzCCAiegAwIBAgIUCeX+1RyxljYfEToWmdNXc2pDXeEwDQYJKoZIhvcNAQEF
-BQAwIDEeMBwGA1UEAxMVaWRwLnBhcmlzZGVzY2FydGVzLmZyMB4XDTExMDcxODA5
-NDAxN1oXDTMxMDcxODA5NDAxN1owIDEeMBwGA1UEAxMVaWRwLnBhcmlzZGVzY2Fy
-dGVzLmZyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApzgVP4bVQvl3
-hlaeglS/rp6q1fosBpoKU/jKxkQICkcK4HchoSD0RVwToWNdM8f8JojRjJmp3TeN
-7Kmdsu2xJEZMfsGa65AoVdhAvcgsNzMfhJ7DU8XkRjxL28bwa7lPOb6oBmWqUvnb
-Qbbdy2H3nSjnVTy/9EldAyWETvUfkwsRuC7i7mB2efJmomCLByq3mUrk99qrTgH1
-xucnBhbinTknGsjFgbHokkvwxom4+OQdG+zKZweSN/idCzRPw5zBDffocZ13+z33
-CPkiTPhG/AcDlfya2/P7/VS1Q+C3+H2S/l+gSmLojWPkiTRWNZ/C3WOJPkMNpGM7
-aQ8tqXfS3wIDAQABo3EwbzBOBgNVHREERzBFghVpZHAucGFyaXNkZXNjYXJ0ZXMu
-ZnKGLGh0dHBzOi8vaWRwLnBhcmlzZGVzY2FydGVzLmZyL2lkcC9zaGliYm9sZXRo
-MB0GA1UdDgQWBBQXUqz0RpnQqx46u1clGA9UWxcPlDANBgkqhkiG9w0BAQUFAAOC
-AQEAYo3b9PwJ6jwuAQPliMg0MSdgmb71MVDmPp3OatPxwWGbOqHUgo3G3x8trtRn
-agcy/HgFnOO47EkdLmNzBjISH1LX9JucHrhEeYKHloviYB3xvq7h0v7hDNZMBWJG
-ojtsnvw3I3/6jj6JRcNsp3Qlbi7lsrYlqIPtuzdNR3YcDu+XpBfhl3geqTrCjS2O
-4j7fvgpptJEtZPWF29JmHMc4rLS6NM/2BqRSNkFE1HO8hE0WGg68ffk5+8qb+qGr
-Hmjpc9MLvwXTRloHXrKPzQo7qBSID6wZnNC/cArK2ZYK6XiUR5I0AqOI2i5bWSYe
-26qh1S8ToVhwUvbZyVO+SyqjLw==
-					    </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://idp.parisdescartes.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.parisdescartes.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.parisdescartes.fr/idp/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Université de Paris 5 - Paris Descartes</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Université de Paris 5 - Paris Descartes</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <EmailAddress>adm-fed@parisdescartes.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.parisdescartes.fr.xml b/swamid-interfederations-2.0/idp.parisdescartes.fr.xml
deleted file mode 100644
index 80fbd12e..00000000
--- a/swamid-interfederations-2.0/idp.parisdescartes.fr.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.parisdescartes.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2011-09-09T17:29:16Z">
-      <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">parisdescartes.fr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-paris5.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">Université de Paris 5 - Paris Descartes</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDPzCCAiegAwIBAgIUCeX+1RyxljYfEToWmdNXc2pDXeEwDQYJKoZIhvcNAQEF
-BQAwIDEeMBwGA1UEAxMVaWRwLnBhcmlzZGVzY2FydGVzLmZyMB4XDTExMDcxODA5
-NDAxN1oXDTMxMDcxODA5NDAxN1owIDEeMBwGA1UEAxMVaWRwLnBhcmlzZGVzY2Fy
-dGVzLmZyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApzgVP4bVQvl3
-hlaeglS/rp6q1fosBpoKU/jKxkQICkcK4HchoSD0RVwToWNdM8f8JojRjJmp3TeN
-7Kmdsu2xJEZMfsGa65AoVdhAvcgsNzMfhJ7DU8XkRjxL28bwa7lPOb6oBmWqUvnb
-Qbbdy2H3nSjnVTy/9EldAyWETvUfkwsRuC7i7mB2efJmomCLByq3mUrk99qrTgH1
-xucnBhbinTknGsjFgbHokkvwxom4+OQdG+zKZweSN/idCzRPw5zBDffocZ13+z33
-CPkiTPhG/AcDlfya2/P7/VS1Q+C3+H2S/l+gSmLojWPkiTRWNZ/C3WOJPkMNpGM7
-aQ8tqXfS3wIDAQABo3EwbzBOBgNVHREERzBFghVpZHAucGFyaXNkZXNjYXJ0ZXMu
-ZnKGLGh0dHBzOi8vaWRwLnBhcmlzZGVzY2FydGVzLmZyL2lkcC9zaGliYm9sZXRo
-MB0GA1UdDgQWBBQXUqz0RpnQqx46u1clGA9UWxcPlDANBgkqhkiG9w0BAQUFAAOC
-AQEAYo3b9PwJ6jwuAQPliMg0MSdgmb71MVDmPp3OatPxwWGbOqHUgo3G3x8trtRn
-agcy/HgFnOO47EkdLmNzBjISH1LX9JucHrhEeYKHloviYB3xvq7h0v7hDNZMBWJG
-ojtsnvw3I3/6jj6JRcNsp3Qlbi7lsrYlqIPtuzdNR3YcDu+XpBfhl3geqTrCjS2O
-4j7fvgpptJEtZPWF29JmHMc4rLS6NM/2BqRSNkFE1HO8hE0WGg68ffk5+8qb+qGr
-Hmjpc9MLvwXTRloHXrKPzQo7qBSID6wZnNC/cArK2ZYK6XiUR5I0AqOI2i5bWSYe
-26qh1S8ToVhwUvbZyVO+SyqjLw==
-					    </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://idp.parisdescartes.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.parisdescartes.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.parisdescartes.fr/idp/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Université de Paris 5 - Paris Descartes</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Université de Paris 5 - Paris Descartes</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <EmailAddress>adm-fed@parisdescartes.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.ppke.hu-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.ppke.hu-idp-shibboleth.xml
deleted file mode 100644
index 3eaf6e66..00000000
--- a/swamid-interfederations-2.0/idp.ppke.hu-idp-shibboleth.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.ppke.hu/idp/shibboleth">
-  <Extensions>
-    <ns9:MetadataSet xmlns:ns9="urn:geant:niif.hu:eduid.hu:entity-attributes:processing-info">ppke</ns9:MetadataSet>
-    <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">sotelib-vs-ppke</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">ppke.hu</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">login.ppke.hu</shibmd:Scope>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-        <mdui:IPHint>193.225.109.0/24</mdui:IPHint>
-        <mdui:GeolocationHint>geo:47.48841,19.0784</mdui:GeolocationHint>
-      </mdui:DiscoHints>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-        <mdui:DisplayName xml:lang="hu">Pázmány Péter Katolikus Egyetem</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Pazmany Peter Catholic University</mdui:DisplayName>
-        <mdui:Description xml:lang="hu">PPKE - Pázmány Péter Katolikus Egyetem</mdui:Description>
-        <mdui:Description xml:lang="en">PPKE - Pázmány Péter Catholic University</mdui:Description>
-        <mdui:Logo height="86" width="86">https://idp.ppke.hu/logo.png</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDGDCCAgCgAwIBAgIVALqsFrR4I9Bs0KO2BfLx5BkiO3BEMA0GCSqGSIb3DQEBBQUAMBYxFDASBgNVBAMTC2lkcC5wcGtlLmh1MB4XDTA5MDkyNDA4NTEyMloXDTI5MDkyNDA4NTEyMlowFjEUMBIGA1UEAxMLaWRwLnBwa2UuaHUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC2OUIJ85ChB9LqQ+KHBXLtCODAr4phVIYGiTp3qDMHOOtGBNUKoyq9AMyVb8nk+coIA0+v5yHOdWHB2ZLz7T7BE2XqWYP/LjW4o6ImBcPnZO3CMYH+EWaxgqvpoS12DlEd9dCJqGqNmL7NYFM/+gX4FeHOCIIKN86ol8Kqup/OVvF9KpzNVaPiVB5UitWO7FG3ZStIGa7kXM3VZW6DpN1Hfs4eQxNPzl0L9em1SMh1KybUde8w0eDaTJHWDvC8W+jwz+3Qc0HHX2BO0SX7LjrJ0/sjU6fEWEP/Q6tApcb4pKxtcWPBC5cdRawyXx5eixirnHafNmWXZf3vqCbd4u67AgMBAAGjXTBbMDoGA1UdEQQzMDGCC2lkcC5wcGtlLmh1hiJodHRwczovL2lkcC5wcGtlLmh1L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBQVA2Fh1jDMY7aRgf+BHStRAVdNkjANBgkqhkiG9w0BAQUFAAOCAQEAQkTajo9mUk/O/yyDv19cb3e9du0FH8TSY5YYYUEsW8xQf5tj7JKavI82FK0ixQnBW9E9I2GEtefMzk11g7DGHujhEyPR8OYoCpCH5UpsxHR06+ZH5kf7bVRxj3FahhgFYCjKQJ8gkmuem8wVd8BkEvnFjt4aP61+Afe+mcNjTm3IYN5iBZPMn/4xpHqDvH7tong+nXD58mMBtDv+JlwVfn7uq9C+OoPMaHWKgt+Y3Rp15/pdTmVzZFjzHxc2OKGM6TRP1woQ6CEx3M3qiCXtP57nApLg0XNLtrMM3jUpEECXyrM4vr6mdBVJqDJAHkr0Ej85ZP84waSs/Ojj5U5etQ==</ds:X509Certificate>
-        </ds:X509Data>
-        <ds:KeyName>idp.ppke.hu</ds:KeyName>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ppke.hu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ppke.hu/idp/profile/SAML2/Redirect/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ppke.hu/idp/profile/SAML2/POST/SLO"/>
-    <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-Redirect" Location="https://idp.ppke.hu/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ppke.hu/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.ppke.hu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="hu">Pázmány Péter Katolikus Egyetem</OrganizationName>
-    <OrganizationName xml:lang="en">Pazmany Peter Catholic University</OrganizationName>
-    <OrganizationDisplayName xml:lang="hu">PPKE - Pázmány Péter Katolikus Egyetem</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">PPKE - Pázmány Péter Catholic University</OrganizationDisplayName>
-    <OrganizationURL xml:lang="hu">https://info.ppke.hu</OrganizationURL>
-    <OrganizationURL xml:lang="en">https://info.ppke.hu</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Csillag Tamás</SurName>
-    <EmailAddress>mailto:cstamas@digitus.itk.ppke.hu</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="support">
-    <SurName>Csillag Tamás</SurName>
-    <EmailAddress>mailto:cstamas@digitus.itk.ppke.hu</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="administrative">
-    <SurName>Csillag Tamás</SurName>
-    <EmailAddress>mailto:cstamas@digitus.itk.ppke.hu</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.ppke.hu.xml b/swamid-interfederations-2.0/idp.ppke.hu.xml
deleted file mode 100644
index 3eaf6e66..00000000
--- a/swamid-interfederations-2.0/idp.ppke.hu.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.ppke.hu/idp/shibboleth">
-  <Extensions>
-    <ns9:MetadataSet xmlns:ns9="urn:geant:niif.hu:eduid.hu:entity-attributes:processing-info">ppke</ns9:MetadataSet>
-    <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">sotelib-vs-ppke</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">ppke.hu</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">login.ppke.hu</shibmd:Scope>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-        <mdui:IPHint>193.225.109.0/24</mdui:IPHint>
-        <mdui:GeolocationHint>geo:47.48841,19.0784</mdui:GeolocationHint>
-      </mdui:DiscoHints>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-        <mdui:DisplayName xml:lang="hu">Pázmány Péter Katolikus Egyetem</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Pazmany Peter Catholic University</mdui:DisplayName>
-        <mdui:Description xml:lang="hu">PPKE - Pázmány Péter Katolikus Egyetem</mdui:Description>
-        <mdui:Description xml:lang="en">PPKE - Pázmány Péter Catholic University</mdui:Description>
-        <mdui:Logo height="86" width="86">https://idp.ppke.hu/logo.png</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDGDCCAgCgAwIBAgIVALqsFrR4I9Bs0KO2BfLx5BkiO3BEMA0GCSqGSIb3DQEBBQUAMBYxFDASBgNVBAMTC2lkcC5wcGtlLmh1MB4XDTA5MDkyNDA4NTEyMloXDTI5MDkyNDA4NTEyMlowFjEUMBIGA1UEAxMLaWRwLnBwa2UuaHUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC2OUIJ85ChB9LqQ+KHBXLtCODAr4phVIYGiTp3qDMHOOtGBNUKoyq9AMyVb8nk+coIA0+v5yHOdWHB2ZLz7T7BE2XqWYP/LjW4o6ImBcPnZO3CMYH+EWaxgqvpoS12DlEd9dCJqGqNmL7NYFM/+gX4FeHOCIIKN86ol8Kqup/OVvF9KpzNVaPiVB5UitWO7FG3ZStIGa7kXM3VZW6DpN1Hfs4eQxNPzl0L9em1SMh1KybUde8w0eDaTJHWDvC8W+jwz+3Qc0HHX2BO0SX7LjrJ0/sjU6fEWEP/Q6tApcb4pKxtcWPBC5cdRawyXx5eixirnHafNmWXZf3vqCbd4u67AgMBAAGjXTBbMDoGA1UdEQQzMDGCC2lkcC5wcGtlLmh1hiJodHRwczovL2lkcC5wcGtlLmh1L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBQVA2Fh1jDMY7aRgf+BHStRAVdNkjANBgkqhkiG9w0BAQUFAAOCAQEAQkTajo9mUk/O/yyDv19cb3e9du0FH8TSY5YYYUEsW8xQf5tj7JKavI82FK0ixQnBW9E9I2GEtefMzk11g7DGHujhEyPR8OYoCpCH5UpsxHR06+ZH5kf7bVRxj3FahhgFYCjKQJ8gkmuem8wVd8BkEvnFjt4aP61+Afe+mcNjTm3IYN5iBZPMn/4xpHqDvH7tong+nXD58mMBtDv+JlwVfn7uq9C+OoPMaHWKgt+Y3Rp15/pdTmVzZFjzHxc2OKGM6TRP1woQ6CEx3M3qiCXtP57nApLg0XNLtrMM3jUpEECXyrM4vr6mdBVJqDJAHkr0Ej85ZP84waSs/Ojj5U5etQ==</ds:X509Certificate>
-        </ds:X509Data>
-        <ds:KeyName>idp.ppke.hu</ds:KeyName>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ppke.hu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ppke.hu/idp/profile/SAML2/Redirect/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ppke.hu/idp/profile/SAML2/POST/SLO"/>
-    <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-Redirect" Location="https://idp.ppke.hu/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ppke.hu/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.ppke.hu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="hu">Pázmány Péter Katolikus Egyetem</OrganizationName>
-    <OrganizationName xml:lang="en">Pazmany Peter Catholic University</OrganizationName>
-    <OrganizationDisplayName xml:lang="hu">PPKE - Pázmány Péter Katolikus Egyetem</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">PPKE - Pázmány Péter Catholic University</OrganizationDisplayName>
-    <OrganizationURL xml:lang="hu">https://info.ppke.hu</OrganizationURL>
-    <OrganizationURL xml:lang="en">https://info.ppke.hu</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Csillag Tamás</SurName>
-    <EmailAddress>mailto:cstamas@digitus.itk.ppke.hu</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="support">
-    <SurName>Csillag Tamás</SurName>
-    <EmailAddress>mailto:cstamas@digitus.itk.ppke.hu</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="administrative">
-    <SurName>Csillag Tamás</SurName>
-    <EmailAddress>mailto:cstamas@digitus.itk.ppke.hu</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.psu.cas.cz-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.psu.cas.cz-idp-shibboleth.xml
deleted file mode 100644
index 13ba0248..00000000
--- a/swamid-interfederations-2.0/idp.psu.cas.cz-idp-shibboleth.xml
+++ /dev/null
@@ -1,118 +0,0 @@
-<?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.psu.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/" registrationInstant="2014-07-25T15:25:07Z">
-      <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>
-    <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://eduid.cz/uri/idp-group/avcr</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>
-      <shibmd:Scope regexp="false">psu.cas.cz</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">The Institute of Psychology of Academy of Science of Czech Republic</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="cs">Psychologický ústav Akademie věd České republiky</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Identity Provider PSU AV CR employees.</mdui:Description>
-        <mdui:Description xml:lang="cs">Identity Provider pro zaměstnance PSÚ AV ČR</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.psu.cas.cz/about</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="cs">http://www.psu.cas.cz/about</mdui:InformationURL>
-        <mdui:Logo height="44" width="43">https://jiftach.cas.cz/loga/logo-psu-44.png</mdui:Logo>
-        <mdui:Logo height="200" width="197">https://jiftach.cas.cz/loga/logo-psu-200.png</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDIzCCAgugAwIBAgIUJGJLo8LBNXH49TIdHVPulwy9J78wDQYJKoZIhvcNAQEF
-BQAwGTEXMBUGA1UEAxMOaWRwLnBzdS5jYXMuY3owHhcNMTQwNzIzMTAwNDMwWhcN
-MzQwNzIzMTAwNDMwWjAZMRcwFQYDVQQDEw5pZHAucHN1LmNhcy5jejCCASIwDQYJ
-KoZIhvcNAQEBBQADggEPADCCAQoCggEBAL2AIx+TNI7QvJF1A6csMa/+bCQRPmGL
-ZjJ9YGzaByJwp65HsVh4wmHdPVFenJVtwUuPT0R7WN401XPGNGPtE+D/gf7LQ32g
-xAfwEIBJ8L5ascYnjnhfj4pfK11z+ZQVriLZeF+88FoTtCTUz/L/dqN4w7tcD1JJ
-iY23LggwPGffurHurleuqXMYkctQ3PKMiH0XiA96SsHVqaVi21ukw3i3I6gTctuD
-Per1Sl0psU8UVu9TOyrzNN5hcFxs97U2mUdJXu2CswnWEKOJI7M0tWwaD0es3ouj
-RklNEuzYPahlJYCvaeAoGyIOXoPVCsiJdwOv7hA8D2aCBFNZBEp7MisCAwEAAaNj
-MGEwQAYDVR0RBDkwN4IOaWRwLnBzdS5jYXMuY3qGJWh0dHBzOi8vaWRwLnBzdS5j
-YXMuY3ovaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFNju9u5qEk5CMlhp6s/bAYgs
-N7EwMA0GCSqGSIb3DQEBBQUAA4IBAQB5BMqqwq6+5hXdwidcN14ZSrDwrk2xCRPB
-Xz22tBS/OzKn0QYSWbkuTR1bo2pb84HDRDC8ZMA08R8ymdtf/MZvP79v5SNoCmrh
-TBWW4bNGxDiytE7v9ebKE0pySrWs9fGvYCkUEpZ2U8uPayNazaBmbXRfxbwWx9af
-qRVSx7QU0HO9BlqrIqJeNIGvKuzFaSSzEuprRFTqwTwZE8u/1ysuY/yOARMfyNNU
-SEBa4KldPbiyJ1lbTk5Lckt7Se3n1riY1wIy8jTfPGiytQqupxBwrKHSQHRa10Au
-RzpU/YfIzxlDG61GIAa1poZ/OlrgKIhdI13Gh9EWt2fMYAd7WP50
-
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.psu.cas.cz:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.psu.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.psu.cas.cz/idp/profile/SAML2/Redirect/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.psu.cas.cz/idp/profile/SAML2/POST/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.psu.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.psu.cas.cz/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.psu.cas.cz/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.psu.cas.cz/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.psu.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">psu.cas.cz</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDIzCCAgugAwIBAgIUJGJLo8LBNXH49TIdHVPulwy9J78wDQYJKoZIhvcNAQEF
-BQAwGTEXMBUGA1UEAxMOaWRwLnBzdS5jYXMuY3owHhcNMTQwNzIzMTAwNDMwWhcN
-MzQwNzIzMTAwNDMwWjAZMRcwFQYDVQQDEw5pZHAucHN1LmNhcy5jejCCASIwDQYJ
-KoZIhvcNAQEBBQADggEPADCCAQoCggEBAL2AIx+TNI7QvJF1A6csMa/+bCQRPmGL
-ZjJ9YGzaByJwp65HsVh4wmHdPVFenJVtwUuPT0R7WN401XPGNGPtE+D/gf7LQ32g
-xAfwEIBJ8L5ascYnjnhfj4pfK11z+ZQVriLZeF+88FoTtCTUz/L/dqN4w7tcD1JJ
-iY23LggwPGffurHurleuqXMYkctQ3PKMiH0XiA96SsHVqaVi21ukw3i3I6gTctuD
-Per1Sl0psU8UVu9TOyrzNN5hcFxs97U2mUdJXu2CswnWEKOJI7M0tWwaD0es3ouj
-RklNEuzYPahlJYCvaeAoGyIOXoPVCsiJdwOv7hA8D2aCBFNZBEp7MisCAwEAAaNj
-MGEwQAYDVR0RBDkwN4IOaWRwLnBzdS5jYXMuY3qGJWh0dHBzOi8vaWRwLnBzdS5j
-YXMuY3ovaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFNju9u5qEk5CMlhp6s/bAYgs
-N7EwMA0GCSqGSIb3DQEBBQUAA4IBAQB5BMqqwq6+5hXdwidcN14ZSrDwrk2xCRPB
-Xz22tBS/OzKn0QYSWbkuTR1bo2pb84HDRDC8ZMA08R8ymdtf/MZvP79v5SNoCmrh
-TBWW4bNGxDiytE7v9ebKE0pySrWs9fGvYCkUEpZ2U8uPayNazaBmbXRfxbwWx9af
-qRVSx7QU0HO9BlqrIqJeNIGvKuzFaSSzEuprRFTqwTwZE8u/1ysuY/yOARMfyNNU
-SEBa4KldPbiyJ1lbTk5Lckt7Se3n1riY1wIy8jTfPGiytQqupxBwrKHSQHRa10Au
-RzpU/YfIzxlDG61GIAa1poZ/OlrgKIhdI13Gh9EWt2fMYAd7WP50
-
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.psu.cas.cz:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.psu.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">The Institute of Psychology of Academy of Science of Czech Republic</OrganizationName>
-    <OrganizationName xml:lang="cs">Psychologický ústav Akademie věd České republiky</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">The Institute of Psychology of Academy of Science of Czech Republic, Public Research Institution</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="cs">Psychologický ústav Akademie věd České republiky, v.v.i. </OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.psu.cas.cz/about</OrganizationURL>
-    <OrganizationURL xml:lang="cs">http://www.psu.cas.cz/about</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.psu.cas.cz.xml b/swamid-interfederations-2.0/idp.psu.cas.cz.xml
deleted file mode 100644
index 13ba0248..00000000
--- a/swamid-interfederations-2.0/idp.psu.cas.cz.xml
+++ /dev/null
@@ -1,118 +0,0 @@
-<?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.psu.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/" registrationInstant="2014-07-25T15:25:07Z">
-      <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>
-    <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://eduid.cz/uri/idp-group/avcr</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>
-      <shibmd:Scope regexp="false">psu.cas.cz</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">The Institute of Psychology of Academy of Science of Czech Republic</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="cs">Psychologický ústav Akademie věd České republiky</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Identity Provider PSU AV CR employees.</mdui:Description>
-        <mdui:Description xml:lang="cs">Identity Provider pro zaměstnance PSÚ AV ČR</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.psu.cas.cz/about</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="cs">http://www.psu.cas.cz/about</mdui:InformationURL>
-        <mdui:Logo height="44" width="43">https://jiftach.cas.cz/loga/logo-psu-44.png</mdui:Logo>
-        <mdui:Logo height="200" width="197">https://jiftach.cas.cz/loga/logo-psu-200.png</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDIzCCAgugAwIBAgIUJGJLo8LBNXH49TIdHVPulwy9J78wDQYJKoZIhvcNAQEF
-BQAwGTEXMBUGA1UEAxMOaWRwLnBzdS5jYXMuY3owHhcNMTQwNzIzMTAwNDMwWhcN
-MzQwNzIzMTAwNDMwWjAZMRcwFQYDVQQDEw5pZHAucHN1LmNhcy5jejCCASIwDQYJ
-KoZIhvcNAQEBBQADggEPADCCAQoCggEBAL2AIx+TNI7QvJF1A6csMa/+bCQRPmGL
-ZjJ9YGzaByJwp65HsVh4wmHdPVFenJVtwUuPT0R7WN401XPGNGPtE+D/gf7LQ32g
-xAfwEIBJ8L5ascYnjnhfj4pfK11z+ZQVriLZeF+88FoTtCTUz/L/dqN4w7tcD1JJ
-iY23LggwPGffurHurleuqXMYkctQ3PKMiH0XiA96SsHVqaVi21ukw3i3I6gTctuD
-Per1Sl0psU8UVu9TOyrzNN5hcFxs97U2mUdJXu2CswnWEKOJI7M0tWwaD0es3ouj
-RklNEuzYPahlJYCvaeAoGyIOXoPVCsiJdwOv7hA8D2aCBFNZBEp7MisCAwEAAaNj
-MGEwQAYDVR0RBDkwN4IOaWRwLnBzdS5jYXMuY3qGJWh0dHBzOi8vaWRwLnBzdS5j
-YXMuY3ovaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFNju9u5qEk5CMlhp6s/bAYgs
-N7EwMA0GCSqGSIb3DQEBBQUAA4IBAQB5BMqqwq6+5hXdwidcN14ZSrDwrk2xCRPB
-Xz22tBS/OzKn0QYSWbkuTR1bo2pb84HDRDC8ZMA08R8ymdtf/MZvP79v5SNoCmrh
-TBWW4bNGxDiytE7v9ebKE0pySrWs9fGvYCkUEpZ2U8uPayNazaBmbXRfxbwWx9af
-qRVSx7QU0HO9BlqrIqJeNIGvKuzFaSSzEuprRFTqwTwZE8u/1ysuY/yOARMfyNNU
-SEBa4KldPbiyJ1lbTk5Lckt7Se3n1riY1wIy8jTfPGiytQqupxBwrKHSQHRa10Au
-RzpU/YfIzxlDG61GIAa1poZ/OlrgKIhdI13Gh9EWt2fMYAd7WP50
-
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.psu.cas.cz:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.psu.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.psu.cas.cz/idp/profile/SAML2/Redirect/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.psu.cas.cz/idp/profile/SAML2/POST/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.psu.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.psu.cas.cz/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.psu.cas.cz/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.psu.cas.cz/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.psu.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">psu.cas.cz</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDIzCCAgugAwIBAgIUJGJLo8LBNXH49TIdHVPulwy9J78wDQYJKoZIhvcNAQEF
-BQAwGTEXMBUGA1UEAxMOaWRwLnBzdS5jYXMuY3owHhcNMTQwNzIzMTAwNDMwWhcN
-MzQwNzIzMTAwNDMwWjAZMRcwFQYDVQQDEw5pZHAucHN1LmNhcy5jejCCASIwDQYJ
-KoZIhvcNAQEBBQADggEPADCCAQoCggEBAL2AIx+TNI7QvJF1A6csMa/+bCQRPmGL
-ZjJ9YGzaByJwp65HsVh4wmHdPVFenJVtwUuPT0R7WN401XPGNGPtE+D/gf7LQ32g
-xAfwEIBJ8L5ascYnjnhfj4pfK11z+ZQVriLZeF+88FoTtCTUz/L/dqN4w7tcD1JJ
-iY23LggwPGffurHurleuqXMYkctQ3PKMiH0XiA96SsHVqaVi21ukw3i3I6gTctuD
-Per1Sl0psU8UVu9TOyrzNN5hcFxs97U2mUdJXu2CswnWEKOJI7M0tWwaD0es3ouj
-RklNEuzYPahlJYCvaeAoGyIOXoPVCsiJdwOv7hA8D2aCBFNZBEp7MisCAwEAAaNj
-MGEwQAYDVR0RBDkwN4IOaWRwLnBzdS5jYXMuY3qGJWh0dHBzOi8vaWRwLnBzdS5j
-YXMuY3ovaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFNju9u5qEk5CMlhp6s/bAYgs
-N7EwMA0GCSqGSIb3DQEBBQUAA4IBAQB5BMqqwq6+5hXdwidcN14ZSrDwrk2xCRPB
-Xz22tBS/OzKn0QYSWbkuTR1bo2pb84HDRDC8ZMA08R8ymdtf/MZvP79v5SNoCmrh
-TBWW4bNGxDiytE7v9ebKE0pySrWs9fGvYCkUEpZ2U8uPayNazaBmbXRfxbwWx9af
-qRVSx7QU0HO9BlqrIqJeNIGvKuzFaSSzEuprRFTqwTwZE8u/1ysuY/yOARMfyNNU
-SEBa4KldPbiyJ1lbTk5Lckt7Se3n1riY1wIy8jTfPGiytQqupxBwrKHSQHRa10Au
-RzpU/YfIzxlDG61GIAa1poZ/OlrgKIhdI13Gh9EWt2fMYAd7WP50
-
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.psu.cas.cz:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.psu.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">The Institute of Psychology of Academy of Science of Czech Republic</OrganizationName>
-    <OrganizationName xml:lang="cs">Psychologický ústav Akademie věd České republiky</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">The Institute of Psychology of Academy of Science of Czech Republic, Public Research Institution</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="cs">Psychologický ústav Akademie věd České republiky, v.v.i. </OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.psu.cas.cz/about</OrganizationURL>
-    <OrganizationURL xml:lang="cs">http://www.psu.cas.cz/about</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.puc-campinas.edu.br-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.puc-campinas.edu.br-idp-shibboleth.xml
deleted file mode 100644
index 37bb406b..00000000
--- a/swamid-interfederations-2.0/idp.puc-campinas.edu.br-idp-shibboleth.xml
+++ /dev/null
@@ -1,114 +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://idp.puc-campinas.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">edu.br</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">PUCC - PONTIFICIA UNIVERSIDADE CATOLICA DE CAMPINAS</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="pt-br">PUCC - PONTIFICIA UNIVERSIDADE CATOLICA DE CAMPINAS</mdui:DisplayName>
-        <mdui:Description xml:lang="en">PUCC - PONTIFICIA UNIVERSIDADE CATOLICA DE CAMPINAS</mdui:Description>
-        <mdui:Description xml:lang="pt-br">PUCC - PONTIFICIA UNIVERSIDADE CATOLICA DE CAMPINAS</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.puc-campinas.edu.br/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="pt-br">http://www.puc-campinas.edu.br/</mdui:InformationURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-    MIIEFDCCAvwCAQAwDQYJKoZIhvcNAQEFBQAwgc8xPDA6BgNVBAoTM1BVQ0MgLSBQ
-T05USUZJQ0lBIFVOSVZFUlNJREFERSBDQVRPTElDQSBERSBDQU1QSU5BUzENMAsG
-A1UECxMETlRJQzEqMCgGCSqGSIb3DQEJARYbdGVsZWNvbUBwdWMtY2FtcGluYXMu
-ZWR1LmJyMREwDwYDVQQHEwhDQU1QSU5BUzESMBAGA1UECBMJU0FPIFBBVUxPMQsw
-CQYDVQQGEwJCUjEgMB4GA1UEAxMXaWRwLnB1Yy1jYW1waW5hcy5lZHUuYnIwHhcN
-MTQwNjA1MTQyOTE1WhcNMTkwNjA0MTQyOTE1WjCBzzE8MDoGA1UEChMzUFVDQyAt
-IFBPTlRJRklDSUEgVU5JVkVSU0lEQURFIENBVE9MSUNBIERFIENBTVBJTkFTMQ0w
-CwYDVQQLEwROVElDMSowKAYJKoZIhvcNAQkBFht0ZWxlY29tQHB1Yy1jYW1waW5h
-cy5lZHUuYnIxETAPBgNVBAcTCENBTVBJTkFTMRIwEAYDVQQIEwlTQU8gUEFVTE8x
-CzAJBgNVBAYTAkJSMSAwHgYDVQQDExdpZHAucHVjLWNhbXBpbmFzLmVkdS5icjCC
-ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALNo4ffCB7RXNl8+27biVdUU
-i8DdBAOm2d1yem94W/Bz29deIgpdXAtm+F9sugoPaHXdgKTqaoz8XOPLOkLH18hk
-5SlN96Qghp9VjW3Spx+kVU+SI1V0kw/L5Q7TBc1yq/bx29MKtIVCdaFdPqk99Xfx
-bSqX+bmXlUPVI6CTKf9cseQEmKop8aHKad8wKL6b6AH9IO2kfXbKIO7U0AEtnX4J
-knqIl4LHhykFA72Bkv9s5zaNVa4J9PykQKOHW3oIqZqYGyZVQOz7rV8wWxvBcHi5
-KdLal6phc3ecGZ5uBzRXhNY9iGgOch7IJihGvUKUT7MhU8EajCY7fxvglesV2rkC
-AwEAATANBgkqhkiG9w0BAQUFAAOCAQEAiUQvx+gr71M1aU8WOW+vn91QDmWfU6yf
-VS/w4sRDpOyagvK59B42w9nMlCjPv9RQ07o0SFSAwELAd/PUIDh7cT7LUmPVqaWZ
-BZQArltphjHtpGOlPjSLIwbbCzToMRCpksnsM3w7Hu+yMI9AR8XCqw36PVKJSkOY
-RAac9Nwp2wbumAbKlymXLN1W7UUpMtp1Af7GhbO/aryiMktlOKUg3K15fOevZqsm
-TwNT0xF7TKbSHFN+g6zksLj0yAXD/ZSvwdV8OwzEtj+jBIfy2iFJz9I7cT/NRmLu
-myTHlotGeDZJUn6x2TGCGQiNVu09lXCJBGqp4ffJGRACkMxOMqtwYw==
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.puc-campinas.edu.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.puc-campinas.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://idp.puc-campinas.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.puc-campinas.edu.br/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.puc-campinas.edu.br/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.puc-campinas.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>
-      
-MIIEFDCCAvwCAQAwDQYJKoZIhvcNAQEFBQAwgc8xPDA6BgNVBAoTM1BVQ0MgLSBQ
-T05USUZJQ0lBIFVOSVZFUlNJREFERSBDQVRPTElDQSBERSBDQU1QSU5BUzENMAsG
-A1UECxMETlRJQzEqMCgGCSqGSIb3DQEJARYbdGVsZWNvbUBwdWMtY2FtcGluYXMu
-ZWR1LmJyMREwDwYDVQQHEwhDQU1QSU5BUzESMBAGA1UECBMJU0FPIFBBVUxPMQsw
-CQYDVQQGEwJCUjEgMB4GA1UEAxMXaWRwLnB1Yy1jYW1waW5hcy5lZHUuYnIwHhcN
-MTQwNjA1MTQyOTE1WhcNMTkwNjA0MTQyOTE1WjCBzzE8MDoGA1UEChMzUFVDQyAt
-IFBPTlRJRklDSUEgVU5JVkVSU0lEQURFIENBVE9MSUNBIERFIENBTVBJTkFTMQ0w
-CwYDVQQLEwROVElDMSowKAYJKoZIhvcNAQkBFht0ZWxlY29tQHB1Yy1jYW1waW5h
-cy5lZHUuYnIxETAPBgNVBAcTCENBTVBJTkFTMRIwEAYDVQQIEwlTQU8gUEFVTE8x
-CzAJBgNVBAYTAkJSMSAwHgYDVQQDExdpZHAucHVjLWNhbXBpbmFzLmVkdS5icjCC
-ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALNo4ffCB7RXNl8+27biVdUU
-i8DdBAOm2d1yem94W/Bz29deIgpdXAtm+F9sugoPaHXdgKTqaoz8XOPLOkLH18hk
-5SlN96Qghp9VjW3Spx+kVU+SI1V0kw/L5Q7TBc1yq/bx29MKtIVCdaFdPqk99Xfx
-bSqX+bmXlUPVI6CTKf9cseQEmKop8aHKad8wKL6b6AH9IO2kfXbKIO7U0AEtnX4J
-knqIl4LHhykFA72Bkv9s5zaNVa4J9PykQKOHW3oIqZqYGyZVQOz7rV8wWxvBcHi5
-KdLal6phc3ecGZ5uBzRXhNY9iGgOch7IJihGvUKUT7MhU8EajCY7fxvglesV2rkC
-AwEAATANBgkqhkiG9w0BAQUFAAOCAQEAiUQvx+gr71M1aU8WOW+vn91QDmWfU6yf
-VS/w4sRDpOyagvK59B42w9nMlCjPv9RQ07o0SFSAwELAd/PUIDh7cT7LUmPVqaWZ
-BZQArltphjHtpGOlPjSLIwbbCzToMRCpksnsM3w7Hu+yMI9AR8XCqw36PVKJSkOY
-RAac9Nwp2wbumAbKlymXLN1W7UUpMtp1Af7GhbO/aryiMktlOKUg3K15fOevZqsm
-TwNT0xF7TKbSHFN+g6zksLj0yAXD/ZSvwdV8OwzEtj+jBIfy2iFJz9I7cT/NRmLu
-myTHlotGeDZJUn6x2TGCGQiNVu09lXCJBGqp4ffJGRACkMxOMqtwYw==
-                    
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.puc-campinas.edu.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.puc-campinas.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">PUCC - PONTIFICIA UNIVERSIDADE CATOLICA DE CAMPINAS</OrganizationName>
-    <OrganizationName xml:lang="pt-br">PUCC - PONTIFICIA UNIVERSIDADE CATOLICA DE CAMPINAS</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">PUCC - PONTIFICIA UNIVERSIDADE CATOLICA DE CAMPINAS</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="pt-br">PUCC - PONTIFICIA UNIVERSIDADE CATOLICA DE CAMPINAS</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.puc-campinas.edu.br/</OrganizationURL>
-    <OrganizationURL xml:lang="pt-br">http://www.puc-campinas.edu.br/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Carlos Cesar Braga</SurName>
-    <EmailAddress>cesar@puc-campinas.edu.br</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.puc-campinas.edu.br.xml b/swamid-interfederations-2.0/idp.puc-campinas.edu.br.xml
deleted file mode 100644
index 37bb406b..00000000
--- a/swamid-interfederations-2.0/idp.puc-campinas.edu.br.xml
+++ /dev/null
@@ -1,114 +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://idp.puc-campinas.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">edu.br</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">PUCC - PONTIFICIA UNIVERSIDADE CATOLICA DE CAMPINAS</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="pt-br">PUCC - PONTIFICIA UNIVERSIDADE CATOLICA DE CAMPINAS</mdui:DisplayName>
-        <mdui:Description xml:lang="en">PUCC - PONTIFICIA UNIVERSIDADE CATOLICA DE CAMPINAS</mdui:Description>
-        <mdui:Description xml:lang="pt-br">PUCC - PONTIFICIA UNIVERSIDADE CATOLICA DE CAMPINAS</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.puc-campinas.edu.br/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="pt-br">http://www.puc-campinas.edu.br/</mdui:InformationURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-    MIIEFDCCAvwCAQAwDQYJKoZIhvcNAQEFBQAwgc8xPDA6BgNVBAoTM1BVQ0MgLSBQ
-T05USUZJQ0lBIFVOSVZFUlNJREFERSBDQVRPTElDQSBERSBDQU1QSU5BUzENMAsG
-A1UECxMETlRJQzEqMCgGCSqGSIb3DQEJARYbdGVsZWNvbUBwdWMtY2FtcGluYXMu
-ZWR1LmJyMREwDwYDVQQHEwhDQU1QSU5BUzESMBAGA1UECBMJU0FPIFBBVUxPMQsw
-CQYDVQQGEwJCUjEgMB4GA1UEAxMXaWRwLnB1Yy1jYW1waW5hcy5lZHUuYnIwHhcN
-MTQwNjA1MTQyOTE1WhcNMTkwNjA0MTQyOTE1WjCBzzE8MDoGA1UEChMzUFVDQyAt
-IFBPTlRJRklDSUEgVU5JVkVSU0lEQURFIENBVE9MSUNBIERFIENBTVBJTkFTMQ0w
-CwYDVQQLEwROVElDMSowKAYJKoZIhvcNAQkBFht0ZWxlY29tQHB1Yy1jYW1waW5h
-cy5lZHUuYnIxETAPBgNVBAcTCENBTVBJTkFTMRIwEAYDVQQIEwlTQU8gUEFVTE8x
-CzAJBgNVBAYTAkJSMSAwHgYDVQQDExdpZHAucHVjLWNhbXBpbmFzLmVkdS5icjCC
-ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALNo4ffCB7RXNl8+27biVdUU
-i8DdBAOm2d1yem94W/Bz29deIgpdXAtm+F9sugoPaHXdgKTqaoz8XOPLOkLH18hk
-5SlN96Qghp9VjW3Spx+kVU+SI1V0kw/L5Q7TBc1yq/bx29MKtIVCdaFdPqk99Xfx
-bSqX+bmXlUPVI6CTKf9cseQEmKop8aHKad8wKL6b6AH9IO2kfXbKIO7U0AEtnX4J
-knqIl4LHhykFA72Bkv9s5zaNVa4J9PykQKOHW3oIqZqYGyZVQOz7rV8wWxvBcHi5
-KdLal6phc3ecGZ5uBzRXhNY9iGgOch7IJihGvUKUT7MhU8EajCY7fxvglesV2rkC
-AwEAATANBgkqhkiG9w0BAQUFAAOCAQEAiUQvx+gr71M1aU8WOW+vn91QDmWfU6yf
-VS/w4sRDpOyagvK59B42w9nMlCjPv9RQ07o0SFSAwELAd/PUIDh7cT7LUmPVqaWZ
-BZQArltphjHtpGOlPjSLIwbbCzToMRCpksnsM3w7Hu+yMI9AR8XCqw36PVKJSkOY
-RAac9Nwp2wbumAbKlymXLN1W7UUpMtp1Af7GhbO/aryiMktlOKUg3K15fOevZqsm
-TwNT0xF7TKbSHFN+g6zksLj0yAXD/ZSvwdV8OwzEtj+jBIfy2iFJz9I7cT/NRmLu
-myTHlotGeDZJUn6x2TGCGQiNVu09lXCJBGqp4ffJGRACkMxOMqtwYw==
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.puc-campinas.edu.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.puc-campinas.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://idp.puc-campinas.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.puc-campinas.edu.br/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.puc-campinas.edu.br/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.puc-campinas.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>
-      
-MIIEFDCCAvwCAQAwDQYJKoZIhvcNAQEFBQAwgc8xPDA6BgNVBAoTM1BVQ0MgLSBQ
-T05USUZJQ0lBIFVOSVZFUlNJREFERSBDQVRPTElDQSBERSBDQU1QSU5BUzENMAsG
-A1UECxMETlRJQzEqMCgGCSqGSIb3DQEJARYbdGVsZWNvbUBwdWMtY2FtcGluYXMu
-ZWR1LmJyMREwDwYDVQQHEwhDQU1QSU5BUzESMBAGA1UECBMJU0FPIFBBVUxPMQsw
-CQYDVQQGEwJCUjEgMB4GA1UEAxMXaWRwLnB1Yy1jYW1waW5hcy5lZHUuYnIwHhcN
-MTQwNjA1MTQyOTE1WhcNMTkwNjA0MTQyOTE1WjCBzzE8MDoGA1UEChMzUFVDQyAt
-IFBPTlRJRklDSUEgVU5JVkVSU0lEQURFIENBVE9MSUNBIERFIENBTVBJTkFTMQ0w
-CwYDVQQLEwROVElDMSowKAYJKoZIhvcNAQkBFht0ZWxlY29tQHB1Yy1jYW1waW5h
-cy5lZHUuYnIxETAPBgNVBAcTCENBTVBJTkFTMRIwEAYDVQQIEwlTQU8gUEFVTE8x
-CzAJBgNVBAYTAkJSMSAwHgYDVQQDExdpZHAucHVjLWNhbXBpbmFzLmVkdS5icjCC
-ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALNo4ffCB7RXNl8+27biVdUU
-i8DdBAOm2d1yem94W/Bz29deIgpdXAtm+F9sugoPaHXdgKTqaoz8XOPLOkLH18hk
-5SlN96Qghp9VjW3Spx+kVU+SI1V0kw/L5Q7TBc1yq/bx29MKtIVCdaFdPqk99Xfx
-bSqX+bmXlUPVI6CTKf9cseQEmKop8aHKad8wKL6b6AH9IO2kfXbKIO7U0AEtnX4J
-knqIl4LHhykFA72Bkv9s5zaNVa4J9PykQKOHW3oIqZqYGyZVQOz7rV8wWxvBcHi5
-KdLal6phc3ecGZ5uBzRXhNY9iGgOch7IJihGvUKUT7MhU8EajCY7fxvglesV2rkC
-AwEAATANBgkqhkiG9w0BAQUFAAOCAQEAiUQvx+gr71M1aU8WOW+vn91QDmWfU6yf
-VS/w4sRDpOyagvK59B42w9nMlCjPv9RQ07o0SFSAwELAd/PUIDh7cT7LUmPVqaWZ
-BZQArltphjHtpGOlPjSLIwbbCzToMRCpksnsM3w7Hu+yMI9AR8XCqw36PVKJSkOY
-RAac9Nwp2wbumAbKlymXLN1W7UUpMtp1Af7GhbO/aryiMktlOKUg3K15fOevZqsm
-TwNT0xF7TKbSHFN+g6zksLj0yAXD/ZSvwdV8OwzEtj+jBIfy2iFJz9I7cT/NRmLu
-myTHlotGeDZJUn6x2TGCGQiNVu09lXCJBGqp4ffJGRACkMxOMqtwYw==
-                    
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.puc-campinas.edu.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.puc-campinas.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">PUCC - PONTIFICIA UNIVERSIDADE CATOLICA DE CAMPINAS</OrganizationName>
-    <OrganizationName xml:lang="pt-br">PUCC - PONTIFICIA UNIVERSIDADE CATOLICA DE CAMPINAS</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">PUCC - PONTIFICIA UNIVERSIDADE CATOLICA DE CAMPINAS</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="pt-br">PUCC - PONTIFICIA UNIVERSIDADE CATOLICA DE CAMPINAS</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.puc-campinas.edu.br/</OrganizationURL>
-    <OrganizationURL xml:lang="pt-br">http://www.puc-campinas.edu.br/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Carlos Cesar Braga</SurName>
-    <EmailAddress>cesar@puc-campinas.edu.br</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.renater.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.renater.fr-idp-shibboleth.xml
deleted file mode 100644
index 35ee3b94..00000000
--- a/swamid-interfederations-2.0/idp.renater.fr-idp-shibboleth.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.renater.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2010-10-15T16:51: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">renater.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">GIP RENATER</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDJDCCAgygAwIBAgIVAOKBqJWqJFq6T2dHTEfrhVJRssecMA0GCSqGSIb3DQEB
-BQUAMBkxFzAVBgNVBAMTDmlkcC5yZW5hdGVyLmZyMB4XDTEzMDMwMTEwMjUwNVoX
-DTMzMDMwMTEwMjUwNVowGTEXMBUGA1UEAxMOaWRwLnJlbmF0ZXIuZnIwggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCo6i0pn7lTyN4PkneU7/zJAG4k0P/W
-vBzSmAnTQuNtq9z4GsZztrXofycWCF/ekQcWPOK17NNx1zcE28Fhun3/lNWjE+X+
-tDqoB14T5M2lOGdlk5JIuE6N240cuaZGQmvIvCgvup9ESEEDjdyx6V7KR1s5rz3n
-diaTygk2FU51vknOqoMvHWOZjp2tbYo7KVHrauxKxbXbVewmKcN8LKeRL+qZs5wQ
-5Yrd1/juM99r37kF+1QVVGa3/OQicHal1qJG+UNlH3FuUHu3TCmLxWP4WW1WtKCi
-BP+RIm/WHaWD7bPPDH/XTYLFfJqJ0ZbXLA92jlo1dZ7qhiehl7ubk2KRAgMBAAGj
-YzBhMEAGA1UdEQQ5MDeCDmlkcC5yZW5hdGVyLmZyhiVodHRwczovL2lkcC5yZW5h
-dGVyLmZyL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBQYy83Ve884R0jR3BqE159U
-zbFhDzANBgkqhkiG9w0BAQUFAAOCAQEAOxYs5vfum4LbmsePdGng6mKi8PFcpGKh
-dcFvxOxggLD1YX+R4C1MooN69a3Nf+YY1GzYZO8rUKd+3YL/BhJb0ouE31CzxwLP
-uXCctT3re8BW6GKy3JGju9H3sJ8AJUog3rHCegIJrA7PYarIAQUokEgCzaE5M/sT
-xY7nHrrdSo+QUQSyIYb/Ue7003/wr+8yRc42lx/hbHAcj9vIkrVvFpPCAg86rS0N
-Ber/c4EoBOTHkNkGxaFSWKA8trRJUecsobHum/jjuwwJBahR8Jvf+p0a0ADCrsqN
-JA+a0emlAOfEnZeRkpSunkghdezhsTvs0DB3QVZyrFRKmxA5IiORVg==
-					    </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://idp.renater.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.renater.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.renater.fr/idp/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">GIP RENATER</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">GIP RENATER</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.renater.fr</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <EmailAddress>support@support.renater.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.renater.fr.xml b/swamid-interfederations-2.0/idp.renater.fr.xml
deleted file mode 100644
index 35ee3b94..00000000
--- a/swamid-interfederations-2.0/idp.renater.fr.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.renater.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2010-10-15T16:51: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">renater.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">GIP RENATER</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDJDCCAgygAwIBAgIVAOKBqJWqJFq6T2dHTEfrhVJRssecMA0GCSqGSIb3DQEB
-BQUAMBkxFzAVBgNVBAMTDmlkcC5yZW5hdGVyLmZyMB4XDTEzMDMwMTEwMjUwNVoX
-DTMzMDMwMTEwMjUwNVowGTEXMBUGA1UEAxMOaWRwLnJlbmF0ZXIuZnIwggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCo6i0pn7lTyN4PkneU7/zJAG4k0P/W
-vBzSmAnTQuNtq9z4GsZztrXofycWCF/ekQcWPOK17NNx1zcE28Fhun3/lNWjE+X+
-tDqoB14T5M2lOGdlk5JIuE6N240cuaZGQmvIvCgvup9ESEEDjdyx6V7KR1s5rz3n
-diaTygk2FU51vknOqoMvHWOZjp2tbYo7KVHrauxKxbXbVewmKcN8LKeRL+qZs5wQ
-5Yrd1/juM99r37kF+1QVVGa3/OQicHal1qJG+UNlH3FuUHu3TCmLxWP4WW1WtKCi
-BP+RIm/WHaWD7bPPDH/XTYLFfJqJ0ZbXLA92jlo1dZ7qhiehl7ubk2KRAgMBAAGj
-YzBhMEAGA1UdEQQ5MDeCDmlkcC5yZW5hdGVyLmZyhiVodHRwczovL2lkcC5yZW5h
-dGVyLmZyL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBQYy83Ve884R0jR3BqE159U
-zbFhDzANBgkqhkiG9w0BAQUFAAOCAQEAOxYs5vfum4LbmsePdGng6mKi8PFcpGKh
-dcFvxOxggLD1YX+R4C1MooN69a3Nf+YY1GzYZO8rUKd+3YL/BhJb0ouE31CzxwLP
-uXCctT3re8BW6GKy3JGju9H3sJ8AJUog3rHCegIJrA7PYarIAQUokEgCzaE5M/sT
-xY7nHrrdSo+QUQSyIYb/Ue7003/wr+8yRc42lx/hbHAcj9vIkrVvFpPCAg86rS0N
-Ber/c4EoBOTHkNkGxaFSWKA8trRJUecsobHum/jjuwwJBahR8Jvf+p0a0ADCrsqN
-JA+a0emlAOfEnZeRkpSunkghdezhsTvs0DB3QVZyrFRKmxA5IiORVg==
-					    </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://idp.renater.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.renater.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.renater.fr/idp/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">GIP RENATER</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">GIP RENATER</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.renater.fr</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <EmailAddress>support@support.renater.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.reuna.cl-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.reuna.cl-idp-shibboleth.xml
deleted file mode 100644
index 5791c843..00000000
--- a/swamid-interfederations-2.0/idp.reuna.cl-idp-shibboleth.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-<?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="2012-01-01T00: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">reuna.cl</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">REUNA</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="es">REUNA</mdui:DisplayName>
-        <mdui:Description xml:lang="en">REUNA</mdui:Description>
-        <mdui:Description xml:lang="es">REUNA</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>
-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: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"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.reuna.cl/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">reuna.cl</shibmd:Scope>
-    </md:Extensions>
-    <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: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:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">REUNA</md:OrganizationName>
-    <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">
-    <md:GivenName>REUNA NOC</md:GivenName>
-    <md:EmailAddress>operaciones@reuna.cl</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Alejandro</md:GivenName>
-    <md:SurName>Lara</md:SurName>
-    <md:EmailAddress>cofre@reuna.cl</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.reuna.cl.xml b/swamid-interfederations-2.0/idp.reuna.cl.xml
deleted file mode 100644
index 5791c843..00000000
--- a/swamid-interfederations-2.0/idp.reuna.cl.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-<?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="2012-01-01T00: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">reuna.cl</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">REUNA</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="es">REUNA</mdui:DisplayName>
-        <mdui:Description xml:lang="en">REUNA</mdui:Description>
-        <mdui:Description xml:lang="es">REUNA</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>
-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: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"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.reuna.cl/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">reuna.cl</shibmd:Scope>
-    </md:Extensions>
-    <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: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:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">REUNA</md:OrganizationName>
-    <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">
-    <md:GivenName>REUNA NOC</md:GivenName>
-    <md:EmailAddress>operaciones@reuna.cl</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Alejandro</md:GivenName>
-    <md:SurName>Lara</md:SurName>
-    <md:EmailAddress>cofre@reuna.cl</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.rnp.br-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.rnp.br-idp-shibboleth.xml
deleted file mode 100644
index 35561afa..00000000
--- a/swamid-interfederations-2.0/idp.rnp.br-idp-shibboleth.xml
+++ /dev/null
@@ -1,102 +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://idp.rnp.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">rnp.br</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">RNP - Rede Nacional de Ensino e Pesquisa</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="pt-br">RNP - Rede Nacional de Ensino e Pesquisa</mdui:DisplayName>
-        <mdui:Description xml:lang="en">RNP - Rede Nacional de Ensino e Pesquisa</mdui:Description>
-        <mdui:Description xml:lang="pt-br">RNP - Rede Nacional de Ensino e Pesquisa</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.rnp.br/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="pt-br">http://www.rnp.br/</mdui:InformationURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-    MIIC1DCCAbwCAQAwDQYJKoZIhvcNAQEFBQAwMDEMMAoGA1UECxMDR1RJMQswCQYD
-VQQGEwJCUjETMBEGA1UEAxMKaWRwLnJucC5icjAeFw0xMzEyMDYxODQzMzVaFw0x
-NjEyMDUxODQzMzVaMDAxDDAKBgNVBAsTA0dUSTELMAkGA1UEBhMCQlIxEzARBgNV
-BAMTCmlkcC5ybnAuYnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCp
-wcuNgUWHb0fw6PeIrPUaOtMTIEQ5qeOJPvOYAAzwmcu8pwb6sdvLJC/NtKK8NGkv
-zT4JL/ZHoNNK1bYtYT4temrGaUmJ4QsP7eZjISLljX/NwSQH4D4Gf8iKG+yGpbpM
-eSAMGMQjlZYQasJorFijzc92N5nyW/yVNrbviASeRBgQJubEvbOg3pp2wiib3kLG
-LyZCMPCGRGBZoa7+Da55D846zyr2Ck4srIA/oTgRSujQn5of7ocSFchewrYUtMPk
-lUtW9XJgwE5RcfVXSmZiAK20miqiBlvBHqnrh1EGNduwKirg5hCI172kv7pfyUrx
-ayzJpuluiwd+HEVm1SDLAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBAC73q9t8XD44
-EFN4Zvw/K6ffWlEShuT1Q6cQArv0sn7Z0m10bgjW2EyO3nM/iF/X7RhToyeov3Q4
-r+3en+9JMRnwFuA1ReqQR/2jjInkfvOV1a6YOn2hsqLXpskjCg+wQEyOhyOg/bUN
-l/J1fBDwIDL9ym+4vG7ujnE5vE8vbQqWIjlQV+xXvk/vQBmmmxEG6bHFwxHW5AP3
-kkjlVbW5hU4Mwj9Ac1259yulrX3viPzOkW5+Kf823GNI16LbOLNIjw98gZ6didxX
-IkwnKZWu8klBLzPjr8I4K8C4kr3SktVY1ddGNTfEUBAx54uU1T55fWFR4ZW0WO4E
-ktvi8RxRxbw=
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.rnp.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.rnp.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://idp.rnp.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.rnp.br/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.rnp.br/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.rnp.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">rnp.br</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-      
-MIIC1DCCAbwCAQAwDQYJKoZIhvcNAQEFBQAwMDEMMAoGA1UECxMDR1RJMQswCQYD
-VQQGEwJCUjETMBEGA1UEAxMKaWRwLnJucC5icjAeFw0xMzEyMDYxODQzMzVaFw0x
-NjEyMDUxODQzMzVaMDAxDDAKBgNVBAsTA0dUSTELMAkGA1UEBhMCQlIxEzARBgNV
-BAMTCmlkcC5ybnAuYnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCp
-wcuNgUWHb0fw6PeIrPUaOtMTIEQ5qeOJPvOYAAzwmcu8pwb6sdvLJC/NtKK8NGkv
-zT4JL/ZHoNNK1bYtYT4temrGaUmJ4QsP7eZjISLljX/NwSQH4D4Gf8iKG+yGpbpM
-eSAMGMQjlZYQasJorFijzc92N5nyW/yVNrbviASeRBgQJubEvbOg3pp2wiib3kLG
-LyZCMPCGRGBZoa7+Da55D846zyr2Ck4srIA/oTgRSujQn5of7ocSFchewrYUtMPk
-lUtW9XJgwE5RcfVXSmZiAK20miqiBlvBHqnrh1EGNduwKirg5hCI172kv7pfyUrx
-ayzJpuluiwd+HEVm1SDLAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBAC73q9t8XD44
-EFN4Zvw/K6ffWlEShuT1Q6cQArv0sn7Z0m10bgjW2EyO3nM/iF/X7RhToyeov3Q4
-r+3en+9JMRnwFuA1ReqQR/2jjInkfvOV1a6YOn2hsqLXpskjCg+wQEyOhyOg/bUN
-l/J1fBDwIDL9ym+4vG7ujnE5vE8vbQqWIjlQV+xXvk/vQBmmmxEG6bHFwxHW5AP3
-kkjlVbW5hU4Mwj9Ac1259yulrX3viPzOkW5+Kf823GNI16LbOLNIjw98gZ6didxX
-IkwnKZWu8klBLzPjr8I4K8C4kr3SktVY1ddGNTfEUBAx54uU1T55fWFR4ZW0WO4E
-ktvi8RxRxbw=
-                    
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.rnp.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.rnp.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">RNP - Rede Nacional de Ensino e Pesquisa</OrganizationName>
-    <OrganizationName xml:lang="pt-br">RNP - Rede Nacional de Ensino e Pesquisa</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">RNP - Rede Nacional de Ensino e Pesquisa</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="pt-br">RNP - Rede Nacional de Ensino e Pesquisa</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.rnp.br/</OrganizationURL>
-    <OrganizationURL xml:lang="pt-br">http://www.rnp.br/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>GTI/RNP</SurName>
-    <EmailAddress>servnac@rnp.br</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.rnp.br.xml b/swamid-interfederations-2.0/idp.rnp.br.xml
deleted file mode 100644
index 35561afa..00000000
--- a/swamid-interfederations-2.0/idp.rnp.br.xml
+++ /dev/null
@@ -1,102 +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://idp.rnp.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">rnp.br</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">RNP - Rede Nacional de Ensino e Pesquisa</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="pt-br">RNP - Rede Nacional de Ensino e Pesquisa</mdui:DisplayName>
-        <mdui:Description xml:lang="en">RNP - Rede Nacional de Ensino e Pesquisa</mdui:Description>
-        <mdui:Description xml:lang="pt-br">RNP - Rede Nacional de Ensino e Pesquisa</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.rnp.br/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="pt-br">http://www.rnp.br/</mdui:InformationURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-    MIIC1DCCAbwCAQAwDQYJKoZIhvcNAQEFBQAwMDEMMAoGA1UECxMDR1RJMQswCQYD
-VQQGEwJCUjETMBEGA1UEAxMKaWRwLnJucC5icjAeFw0xMzEyMDYxODQzMzVaFw0x
-NjEyMDUxODQzMzVaMDAxDDAKBgNVBAsTA0dUSTELMAkGA1UEBhMCQlIxEzARBgNV
-BAMTCmlkcC5ybnAuYnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCp
-wcuNgUWHb0fw6PeIrPUaOtMTIEQ5qeOJPvOYAAzwmcu8pwb6sdvLJC/NtKK8NGkv
-zT4JL/ZHoNNK1bYtYT4temrGaUmJ4QsP7eZjISLljX/NwSQH4D4Gf8iKG+yGpbpM
-eSAMGMQjlZYQasJorFijzc92N5nyW/yVNrbviASeRBgQJubEvbOg3pp2wiib3kLG
-LyZCMPCGRGBZoa7+Da55D846zyr2Ck4srIA/oTgRSujQn5of7ocSFchewrYUtMPk
-lUtW9XJgwE5RcfVXSmZiAK20miqiBlvBHqnrh1EGNduwKirg5hCI172kv7pfyUrx
-ayzJpuluiwd+HEVm1SDLAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBAC73q9t8XD44
-EFN4Zvw/K6ffWlEShuT1Q6cQArv0sn7Z0m10bgjW2EyO3nM/iF/X7RhToyeov3Q4
-r+3en+9JMRnwFuA1ReqQR/2jjInkfvOV1a6YOn2hsqLXpskjCg+wQEyOhyOg/bUN
-l/J1fBDwIDL9ym+4vG7ujnE5vE8vbQqWIjlQV+xXvk/vQBmmmxEG6bHFwxHW5AP3
-kkjlVbW5hU4Mwj9Ac1259yulrX3viPzOkW5+Kf823GNI16LbOLNIjw98gZ6didxX
-IkwnKZWu8klBLzPjr8I4K8C4kr3SktVY1ddGNTfEUBAx54uU1T55fWFR4ZW0WO4E
-ktvi8RxRxbw=
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.rnp.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.rnp.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://idp.rnp.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.rnp.br/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.rnp.br/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.rnp.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">rnp.br</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-      
-MIIC1DCCAbwCAQAwDQYJKoZIhvcNAQEFBQAwMDEMMAoGA1UECxMDR1RJMQswCQYD
-VQQGEwJCUjETMBEGA1UEAxMKaWRwLnJucC5icjAeFw0xMzEyMDYxODQzMzVaFw0x
-NjEyMDUxODQzMzVaMDAxDDAKBgNVBAsTA0dUSTELMAkGA1UEBhMCQlIxEzARBgNV
-BAMTCmlkcC5ybnAuYnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCp
-wcuNgUWHb0fw6PeIrPUaOtMTIEQ5qeOJPvOYAAzwmcu8pwb6sdvLJC/NtKK8NGkv
-zT4JL/ZHoNNK1bYtYT4temrGaUmJ4QsP7eZjISLljX/NwSQH4D4Gf8iKG+yGpbpM
-eSAMGMQjlZYQasJorFijzc92N5nyW/yVNrbviASeRBgQJubEvbOg3pp2wiib3kLG
-LyZCMPCGRGBZoa7+Da55D846zyr2Ck4srIA/oTgRSujQn5of7ocSFchewrYUtMPk
-lUtW9XJgwE5RcfVXSmZiAK20miqiBlvBHqnrh1EGNduwKirg5hCI172kv7pfyUrx
-ayzJpuluiwd+HEVm1SDLAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBAC73q9t8XD44
-EFN4Zvw/K6ffWlEShuT1Q6cQArv0sn7Z0m10bgjW2EyO3nM/iF/X7RhToyeov3Q4
-r+3en+9JMRnwFuA1ReqQR/2jjInkfvOV1a6YOn2hsqLXpskjCg+wQEyOhyOg/bUN
-l/J1fBDwIDL9ym+4vG7ujnE5vE8vbQqWIjlQV+xXvk/vQBmmmxEG6bHFwxHW5AP3
-kkjlVbW5hU4Mwj9Ac1259yulrX3viPzOkW5+Kf823GNI16LbOLNIjw98gZ6didxX
-IkwnKZWu8klBLzPjr8I4K8C4kr3SktVY1ddGNTfEUBAx54uU1T55fWFR4ZW0WO4E
-ktvi8RxRxbw=
-                    
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.rnp.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.rnp.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">RNP - Rede Nacional de Ensino e Pesquisa</OrganizationName>
-    <OrganizationName xml:lang="pt-br">RNP - Rede Nacional de Ensino e Pesquisa</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">RNP - Rede Nacional de Ensino e Pesquisa</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="pt-br">RNP - Rede Nacional de Ensino e Pesquisa</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.rnp.br/</OrganizationURL>
-    <OrganizationURL xml:lang="pt-br">http://www.rnp.br/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>GTI/RNP</SurName>
-    <EmailAddress>servnac@rnp.br</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.scc.kit.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.scc.kit.edu-idp-shibboleth.xml
deleted file mode 100644
index 86e2630e..00000000
--- a/swamid-interfederations-2.0/idp.scc.kit.edu-idp-shibboleth.xml
+++ /dev/null
@@ -1,158 +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">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2010-03-15T10:30:11Z">
-      <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/bwidm-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>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">kit.edu</saml1md:Scope>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">student.kit.edu</saml1md:Scope>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">partner.kit.edu</saml1md:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="de">Karlsruher Institut für Technologie (KIT)</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Karlsruhe Institute of Technology (KIT)</mdui:DisplayName>
-        <mdui:Description xml:lang="de">Karlsruher Institut für Technologie - Universität des Landes Baden-Württemberg und nationales Forschungszentrum in der Helmholtz-Gemeinschaft</mdui:Description>
-        <mdui:Description xml:lang="en">Karlsruhe Institute of Technology - University of the State of Baden-Wuerttemberg and National Research Center of the Helmholtz Association</mdui:Description>
-        <mdui:Logo height="16" width="16">https://idp.scc.kit.edu/logo/kit-logo-small.png</mdui:Logo>
-        <mdui:Logo height="120" width="260">https://idp.scc.kit.edu/logo/kit-logo.png</mdui:Logo>
-        <mdui:InformationURL xml:lang="de">http://www.scc.kit.edu/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">http://www.scc.kit.edu/</mdui:InformationURL>
-      </mdui:UIInfo>
-    </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>MIIF0zCCBLugAwIBAgIHFEQ62Bgd/zANBgkqhkiG9w0BAQUFADCBvzELMAkGA1UE
-BhMCREUxGzAZBgNVBAgTEkJhZGVuLVd1ZXJ0dGVtYmVyZzESMBAGA1UEBxMJS2Fy
-bHNydWhlMSowKAYDVQQKEyFLYXJsc3J1aGUgSW5zdGl0dXRlIG9mIFRlY2hub2xv
-Z3kxJzAlBgNVBAsTHlN0ZWluYnVjaCBDZW50cmUgZm9yIENvbXB1dGluZzEPMA0G
-A1UEAxMGS0lULUNBMRkwFwYJKoZIhvcNAQkBFgpjYUBraXQuZWR1MB4XDTEyMDgx
-MDA3NTAzM1oXDTE1MDgxMDA3NTAzM1owgYQxCzAJBgNVBAYTAkRFMRswGQYDVQQI
-ExJCYWRlbi1XdWVydHRlbWJlcmcxEjAQBgNVBAcTCUthcmxzcnVoZTEqMCgGA1UE
-ChMhS2FybHNydWhlIEluc3RpdHV0ZSBvZiBUZWNobm9sb2d5MRgwFgYDVQQDEw9p
-ZHAuc2NjLmtpdC5lZHUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDD
-HcGGowpLtsHCqYcecx7WpHHnzd0RLJgUK74CkF5o18ZR6qe6Y/Ok0byxAYtwLLig
-PZqZvSctPGmBB+xIptl59ROz0y/iX1rJ8YojPxUZPw8O78vEuVy+auiwkxHs84mn
-mdAxObiCrePfysL9fOBYsY07Byvn/zxZfWFrFe+Ijl6kbLDpfL7Bl1/h6oL17ywF
-MlDa6PvZvLbq1JlOdrXoq3lPvF40+D15KBI61xooauMtkJhapDi842Dk6EVQuy+M
-fiEe3hwMy6k1N4KEkOmRsuFg3McpoTRrS6cScwaLZxrWPgG32gpvfM5WJsLfSnHq
-MT6UKugmWNSM/w+HEdwrAgMBAAGjggILMIICBzAvBgNVHSAEKDAmMBEGDysGAQQB
-ga0hgiwBAQQCAzARBg8rBgEEAYGtIYIsAgEEAgMwCQYDVR0TBAIwADALBgNVHQ8E
-BAMCBeAwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMB0GA1UdDgQWBBSJ
-mWca+U0inH4Ylhqt3Txayi6rmzAfBgNVHSMEGDAWgBQfdGX0mh169jHp32EbcysN
-bdAzSTAaBgNVHREEEzARgg9pZHAuc2NjLmtpdC5lZHUwdwYDVR0fBHAwbjA1oDOg
-MYYvaHR0cDovL2NkcDEucGNhLmRmbi5kZS9raXQtY2EvcHViL2NybC9jYWNybC5j
-cmwwNaAzoDGGL2h0dHA6Ly9jZHAyLnBjYS5kZm4uZGUva2l0LWNhL3B1Yi9jcmwv
-Y2FjcmwuY3JsMIHHBggrBgEFBQcBAQSBujCBtzAzBggrBgEFBQcwAYYnaHR0cDov
-L29jc3AucGNhLmRmbi5kZS9PQ1NQLVNlcnZlci9PQ1NQMD8GCCsGAQUFBzAChjNo
-dHRwOi8vY2RwMS5wY2EuZGZuLmRlL2tpdC1jYS9wdWIvY2FjZXJ0L2NhY2VydC5j
-cnQwPwYIKwYBBQUHMAKGM2h0dHA6Ly9jZHAyLnBjYS5kZm4uZGUva2l0LWNhL3B1
-Yi9jYWNlcnQvY2FjZXJ0LmNydDANBgkqhkiG9w0BAQUFAAOCAQEAFngSGNNctEwO
-JEE88p/7h80qo7dcB7Xu4xAQMvBj3YzuwuT/h/ufgMheWxYxArwP87NWmquMYyhw
-yFO0dOlk94r991S7BGpwr5ULo4nltQkWOVkuFK/tooHgTfcAMW3Jg9GDjyYXQOQr
-kGlg4rrkKm6hyRlSxeDBrkjZOFgNL/nExWwW1bhM4wziNVppNhesvHgnvZOtf26x
-ixMFJ/A/tuJKo1upH0VuEK8iMbYkZusbevLABorQS02C2c/j5JD5Z0M8peykc4xz
-ArKnesWTUvcbcwMLgZhl8GnJZGr8UWkSpPH/IeTn3PTDjkf4M6+Sw6yopkcM4Ci8
-zea6MPIosg==
-</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"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.scc.kit.edu/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>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">kit.edu</saml1md:Scope>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">student.kit.edu</saml1md:Scope>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">partner.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>MIIF0zCCBLugAwIBAgIHFEQ62Bgd/zANBgkqhkiG9w0BAQUFADCBvzELMAkGA1UE
-BhMCREUxGzAZBgNVBAgTEkJhZGVuLVd1ZXJ0dGVtYmVyZzESMBAGA1UEBxMJS2Fy
-bHNydWhlMSowKAYDVQQKEyFLYXJsc3J1aGUgSW5zdGl0dXRlIG9mIFRlY2hub2xv
-Z3kxJzAlBgNVBAsTHlN0ZWluYnVjaCBDZW50cmUgZm9yIENvbXB1dGluZzEPMA0G
-A1UEAxMGS0lULUNBMRkwFwYJKoZIhvcNAQkBFgpjYUBraXQuZWR1MB4XDTEyMDgx
-MDA3NTAzM1oXDTE1MDgxMDA3NTAzM1owgYQxCzAJBgNVBAYTAkRFMRswGQYDVQQI
-ExJCYWRlbi1XdWVydHRlbWJlcmcxEjAQBgNVBAcTCUthcmxzcnVoZTEqMCgGA1UE
-ChMhS2FybHNydWhlIEluc3RpdHV0ZSBvZiBUZWNobm9sb2d5MRgwFgYDVQQDEw9p
-ZHAuc2NjLmtpdC5lZHUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDD
-HcGGowpLtsHCqYcecx7WpHHnzd0RLJgUK74CkF5o18ZR6qe6Y/Ok0byxAYtwLLig
-PZqZvSctPGmBB+xIptl59ROz0y/iX1rJ8YojPxUZPw8O78vEuVy+auiwkxHs84mn
-mdAxObiCrePfysL9fOBYsY07Byvn/zxZfWFrFe+Ijl6kbLDpfL7Bl1/h6oL17ywF
-MlDa6PvZvLbq1JlOdrXoq3lPvF40+D15KBI61xooauMtkJhapDi842Dk6EVQuy+M
-fiEe3hwMy6k1N4KEkOmRsuFg3McpoTRrS6cScwaLZxrWPgG32gpvfM5WJsLfSnHq
-MT6UKugmWNSM/w+HEdwrAgMBAAGjggILMIICBzAvBgNVHSAEKDAmMBEGDysGAQQB
-ga0hgiwBAQQCAzARBg8rBgEEAYGtIYIsAgEEAgMwCQYDVR0TBAIwADALBgNVHQ8E
-BAMCBeAwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMB0GA1UdDgQWBBSJ
-mWca+U0inH4Ylhqt3Txayi6rmzAfBgNVHSMEGDAWgBQfdGX0mh169jHp32EbcysN
-bdAzSTAaBgNVHREEEzARgg9pZHAuc2NjLmtpdC5lZHUwdwYDVR0fBHAwbjA1oDOg
-MYYvaHR0cDovL2NkcDEucGNhLmRmbi5kZS9raXQtY2EvcHViL2NybC9jYWNybC5j
-cmwwNaAzoDGGL2h0dHA6Ly9jZHAyLnBjYS5kZm4uZGUva2l0LWNhL3B1Yi9jcmwv
-Y2FjcmwuY3JsMIHHBggrBgEFBQcBAQSBujCBtzAzBggrBgEFBQcwAYYnaHR0cDov
-L29jc3AucGNhLmRmbi5kZS9PQ1NQLVNlcnZlci9PQ1NQMD8GCCsGAQUFBzAChjNo
-dHRwOi8vY2RwMS5wY2EuZGZuLmRlL2tpdC1jYS9wdWIvY2FjZXJ0L2NhY2VydC5j
-cnQwPwYIKwYBBQUHMAKGM2h0dHA6Ly9jZHAyLnBjYS5kZm4uZGUva2l0LWNhL3B1
-Yi9jYWNlcnQvY2FjZXJ0LmNydDANBgkqhkiG9w0BAQUFAAOCAQEAFngSGNNctEwO
-JEE88p/7h80qo7dcB7Xu4xAQMvBj3YzuwuT/h/ufgMheWxYxArwP87NWmquMYyhw
-yFO0dOlk94r991S7BGpwr5ULo4nltQkWOVkuFK/tooHgTfcAMW3Jg9GDjyYXQOQr
-kGlg4rrkKm6hyRlSxeDBrkjZOFgNL/nExWwW1bhM4wziNVppNhesvHgnvZOtf26x
-ixMFJ/A/tuJKo1upH0VuEK8iMbYkZusbevLABorQS02C2c/j5JD5Z0M8peykc4xz
-ArKnesWTUvcbcwMLgZhl8GnJZGr8UWkSpPH/IeTn3PTDjkf4M6+Sw6yopkcM4Ci8
-zea6MPIosg==
-</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">e148</OrganizationName>
-    <OrganizationName xml:lang="en">e148</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">Karlsruher Institut für Technologie (KIT)</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">Karlsruhe Institute of Technology (KIT)</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.scc.kit.edu/</OrganizationURL>
-    <OrganizationURL xml:lang="en">http://www.scc.kit.edu/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Michael</GivenName>
-    <SurName>Simon</SurName>
-    <EmailAddress>mailto:simon@kit.edu</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="administrative">
-    <GivenName>Sebastian</GivenName>
-    <SurName>Labitzke</SurName>
-    <EmailAddress>mailto:labitzke@kit.edu</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="support">
-    <GivenName>SCC</GivenName>
-    <SurName>Servicedesk</SurName>
-    <EmailAddress>mailto:servicedesk@scc.kit.edu</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 86e2630e..00000000
--- a/swamid-interfederations-2.0/idp.scc.kit.edu.xml
+++ /dev/null
@@ -1,158 +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">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2010-03-15T10:30:11Z">
-      <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/bwidm-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>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">kit.edu</saml1md:Scope>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">student.kit.edu</saml1md:Scope>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">partner.kit.edu</saml1md:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="de">Karlsruher Institut für Technologie (KIT)</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Karlsruhe Institute of Technology (KIT)</mdui:DisplayName>
-        <mdui:Description xml:lang="de">Karlsruher Institut für Technologie - Universität des Landes Baden-Württemberg und nationales Forschungszentrum in der Helmholtz-Gemeinschaft</mdui:Description>
-        <mdui:Description xml:lang="en">Karlsruhe Institute of Technology - University of the State of Baden-Wuerttemberg and National Research Center of the Helmholtz Association</mdui:Description>
-        <mdui:Logo height="16" width="16">https://idp.scc.kit.edu/logo/kit-logo-small.png</mdui:Logo>
-        <mdui:Logo height="120" width="260">https://idp.scc.kit.edu/logo/kit-logo.png</mdui:Logo>
-        <mdui:InformationURL xml:lang="de">http://www.scc.kit.edu/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">http://www.scc.kit.edu/</mdui:InformationURL>
-      </mdui:UIInfo>
-    </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>MIIF0zCCBLugAwIBAgIHFEQ62Bgd/zANBgkqhkiG9w0BAQUFADCBvzELMAkGA1UE
-BhMCREUxGzAZBgNVBAgTEkJhZGVuLVd1ZXJ0dGVtYmVyZzESMBAGA1UEBxMJS2Fy
-bHNydWhlMSowKAYDVQQKEyFLYXJsc3J1aGUgSW5zdGl0dXRlIG9mIFRlY2hub2xv
-Z3kxJzAlBgNVBAsTHlN0ZWluYnVjaCBDZW50cmUgZm9yIENvbXB1dGluZzEPMA0G
-A1UEAxMGS0lULUNBMRkwFwYJKoZIhvcNAQkBFgpjYUBraXQuZWR1MB4XDTEyMDgx
-MDA3NTAzM1oXDTE1MDgxMDA3NTAzM1owgYQxCzAJBgNVBAYTAkRFMRswGQYDVQQI
-ExJCYWRlbi1XdWVydHRlbWJlcmcxEjAQBgNVBAcTCUthcmxzcnVoZTEqMCgGA1UE
-ChMhS2FybHNydWhlIEluc3RpdHV0ZSBvZiBUZWNobm9sb2d5MRgwFgYDVQQDEw9p
-ZHAuc2NjLmtpdC5lZHUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDD
-HcGGowpLtsHCqYcecx7WpHHnzd0RLJgUK74CkF5o18ZR6qe6Y/Ok0byxAYtwLLig
-PZqZvSctPGmBB+xIptl59ROz0y/iX1rJ8YojPxUZPw8O78vEuVy+auiwkxHs84mn
-mdAxObiCrePfysL9fOBYsY07Byvn/zxZfWFrFe+Ijl6kbLDpfL7Bl1/h6oL17ywF
-MlDa6PvZvLbq1JlOdrXoq3lPvF40+D15KBI61xooauMtkJhapDi842Dk6EVQuy+M
-fiEe3hwMy6k1N4KEkOmRsuFg3McpoTRrS6cScwaLZxrWPgG32gpvfM5WJsLfSnHq
-MT6UKugmWNSM/w+HEdwrAgMBAAGjggILMIICBzAvBgNVHSAEKDAmMBEGDysGAQQB
-ga0hgiwBAQQCAzARBg8rBgEEAYGtIYIsAgEEAgMwCQYDVR0TBAIwADALBgNVHQ8E
-BAMCBeAwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMB0GA1UdDgQWBBSJ
-mWca+U0inH4Ylhqt3Txayi6rmzAfBgNVHSMEGDAWgBQfdGX0mh169jHp32EbcysN
-bdAzSTAaBgNVHREEEzARgg9pZHAuc2NjLmtpdC5lZHUwdwYDVR0fBHAwbjA1oDOg
-MYYvaHR0cDovL2NkcDEucGNhLmRmbi5kZS9raXQtY2EvcHViL2NybC9jYWNybC5j
-cmwwNaAzoDGGL2h0dHA6Ly9jZHAyLnBjYS5kZm4uZGUva2l0LWNhL3B1Yi9jcmwv
-Y2FjcmwuY3JsMIHHBggrBgEFBQcBAQSBujCBtzAzBggrBgEFBQcwAYYnaHR0cDov
-L29jc3AucGNhLmRmbi5kZS9PQ1NQLVNlcnZlci9PQ1NQMD8GCCsGAQUFBzAChjNo
-dHRwOi8vY2RwMS5wY2EuZGZuLmRlL2tpdC1jYS9wdWIvY2FjZXJ0L2NhY2VydC5j
-cnQwPwYIKwYBBQUHMAKGM2h0dHA6Ly9jZHAyLnBjYS5kZm4uZGUva2l0LWNhL3B1
-Yi9jYWNlcnQvY2FjZXJ0LmNydDANBgkqhkiG9w0BAQUFAAOCAQEAFngSGNNctEwO
-JEE88p/7h80qo7dcB7Xu4xAQMvBj3YzuwuT/h/ufgMheWxYxArwP87NWmquMYyhw
-yFO0dOlk94r991S7BGpwr5ULo4nltQkWOVkuFK/tooHgTfcAMW3Jg9GDjyYXQOQr
-kGlg4rrkKm6hyRlSxeDBrkjZOFgNL/nExWwW1bhM4wziNVppNhesvHgnvZOtf26x
-ixMFJ/A/tuJKo1upH0VuEK8iMbYkZusbevLABorQS02C2c/j5JD5Z0M8peykc4xz
-ArKnesWTUvcbcwMLgZhl8GnJZGr8UWkSpPH/IeTn3PTDjkf4M6+Sw6yopkcM4Ci8
-zea6MPIosg==
-</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"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.scc.kit.edu/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>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">kit.edu</saml1md:Scope>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">student.kit.edu</saml1md:Scope>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">partner.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>MIIF0zCCBLugAwIBAgIHFEQ62Bgd/zANBgkqhkiG9w0BAQUFADCBvzELMAkGA1UE
-BhMCREUxGzAZBgNVBAgTEkJhZGVuLVd1ZXJ0dGVtYmVyZzESMBAGA1UEBxMJS2Fy
-bHNydWhlMSowKAYDVQQKEyFLYXJsc3J1aGUgSW5zdGl0dXRlIG9mIFRlY2hub2xv
-Z3kxJzAlBgNVBAsTHlN0ZWluYnVjaCBDZW50cmUgZm9yIENvbXB1dGluZzEPMA0G
-A1UEAxMGS0lULUNBMRkwFwYJKoZIhvcNAQkBFgpjYUBraXQuZWR1MB4XDTEyMDgx
-MDA3NTAzM1oXDTE1MDgxMDA3NTAzM1owgYQxCzAJBgNVBAYTAkRFMRswGQYDVQQI
-ExJCYWRlbi1XdWVydHRlbWJlcmcxEjAQBgNVBAcTCUthcmxzcnVoZTEqMCgGA1UE
-ChMhS2FybHNydWhlIEluc3RpdHV0ZSBvZiBUZWNobm9sb2d5MRgwFgYDVQQDEw9p
-ZHAuc2NjLmtpdC5lZHUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDD
-HcGGowpLtsHCqYcecx7WpHHnzd0RLJgUK74CkF5o18ZR6qe6Y/Ok0byxAYtwLLig
-PZqZvSctPGmBB+xIptl59ROz0y/iX1rJ8YojPxUZPw8O78vEuVy+auiwkxHs84mn
-mdAxObiCrePfysL9fOBYsY07Byvn/zxZfWFrFe+Ijl6kbLDpfL7Bl1/h6oL17ywF
-MlDa6PvZvLbq1JlOdrXoq3lPvF40+D15KBI61xooauMtkJhapDi842Dk6EVQuy+M
-fiEe3hwMy6k1N4KEkOmRsuFg3McpoTRrS6cScwaLZxrWPgG32gpvfM5WJsLfSnHq
-MT6UKugmWNSM/w+HEdwrAgMBAAGjggILMIICBzAvBgNVHSAEKDAmMBEGDysGAQQB
-ga0hgiwBAQQCAzARBg8rBgEEAYGtIYIsAgEEAgMwCQYDVR0TBAIwADALBgNVHQ8E
-BAMCBeAwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMB0GA1UdDgQWBBSJ
-mWca+U0inH4Ylhqt3Txayi6rmzAfBgNVHSMEGDAWgBQfdGX0mh169jHp32EbcysN
-bdAzSTAaBgNVHREEEzARgg9pZHAuc2NjLmtpdC5lZHUwdwYDVR0fBHAwbjA1oDOg
-MYYvaHR0cDovL2NkcDEucGNhLmRmbi5kZS9raXQtY2EvcHViL2NybC9jYWNybC5j
-cmwwNaAzoDGGL2h0dHA6Ly9jZHAyLnBjYS5kZm4uZGUva2l0LWNhL3B1Yi9jcmwv
-Y2FjcmwuY3JsMIHHBggrBgEFBQcBAQSBujCBtzAzBggrBgEFBQcwAYYnaHR0cDov
-L29jc3AucGNhLmRmbi5kZS9PQ1NQLVNlcnZlci9PQ1NQMD8GCCsGAQUFBzAChjNo
-dHRwOi8vY2RwMS5wY2EuZGZuLmRlL2tpdC1jYS9wdWIvY2FjZXJ0L2NhY2VydC5j
-cnQwPwYIKwYBBQUHMAKGM2h0dHA6Ly9jZHAyLnBjYS5kZm4uZGUva2l0LWNhL3B1
-Yi9jYWNlcnQvY2FjZXJ0LmNydDANBgkqhkiG9w0BAQUFAAOCAQEAFngSGNNctEwO
-JEE88p/7h80qo7dcB7Xu4xAQMvBj3YzuwuT/h/ufgMheWxYxArwP87NWmquMYyhw
-yFO0dOlk94r991S7BGpwr5ULo4nltQkWOVkuFK/tooHgTfcAMW3Jg9GDjyYXQOQr
-kGlg4rrkKm6hyRlSxeDBrkjZOFgNL/nExWwW1bhM4wziNVppNhesvHgnvZOtf26x
-ixMFJ/A/tuJKo1upH0VuEK8iMbYkZusbevLABorQS02C2c/j5JD5Z0M8peykc4xz
-ArKnesWTUvcbcwMLgZhl8GnJZGr8UWkSpPH/IeTn3PTDjkf4M6+Sw6yopkcM4Ci8
-zea6MPIosg==
-</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">e148</OrganizationName>
-    <OrganizationName xml:lang="en">e148</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">Karlsruher Institut für Technologie (KIT)</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">Karlsruhe Institute of Technology (KIT)</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.scc.kit.edu/</OrganizationURL>
-    <OrganizationURL xml:lang="en">http://www.scc.kit.edu/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Michael</GivenName>
-    <SurName>Simon</SurName>
-    <EmailAddress>mailto:simon@kit.edu</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="administrative">
-    <GivenName>Sebastian</GivenName>
-    <SurName>Labitzke</SurName>
-    <EmailAddress>mailto:labitzke@kit.edu</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="support">
-    <GivenName>SCC</GivenName>
-    <SurName>Servicedesk</SurName>
-    <EmailAddress>mailto:servicedesk@scc.kit.edu</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.sciencespobordeaux.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.sciencespobordeaux.fr-idp-shibboleth.xml
deleted file mode 100644
index b3b7e9d7..00000000
--- a/swamid-interfederations-2.0/idp.sciencespobordeaux.fr-idp-shibboleth.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://idp.sciencespobordeaux.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2011-04-29T13:03:14Z">
-      <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">sciencespobordeaux.fr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">scpobx.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">Sciences Po Bordeaux</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIEuzCCA6OgAwIBAgIRAJ6cVoL9srwAECkklTq3u2gwDQYJKoZIhvcNAQEFBQAw
-NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-IFNTTCBDQTAeFw0xNDAxMDkwMDAwMDBaFw0xNzAxMDgyMzU5NTlaMEcxITAfBgNV
-BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEiMCAGA1UEAxMZaWRwLnNjaWVu
-Y2VzcG9ib3JkZWF1eC5mcjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
-AP3E230Ei838R9qQO32a5tkzyJemr9fmhArIZKTQsQpr9TwEPoIyaDYTQELhcuMG
-bKEojJ716N+8hRNhghNFKGLMO0lGE0TZyxBC28MmttMmad6TLtOEZFv9Py/TTFrq
-pgOy5v0Vb3v/81JwMYT1U9gTU256OSOZg9NSZUxsNbEbyibq0icxtzDceOotn7Bz
-pBTjUtOxZ00igLSoWS7SLPZUyjX2jfgefrDOtZ0/hxrLo3Klx7YC2uJlrrCVZA0s
-87rMSCt0Ra7ECME4JGdNxs5l9EpjGvqvi7zqV9Sg9RtsWKc/Y+me7r7B+SVz3QoY
-pSrgKTSG316/JcEYf6GeFkUCAwEAAaOCAbEwggGtMB8GA1UdIwQYMBaAFAy9k2gM
-896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBT0hWtM6+5tMUzDBzmPbfKO5mK3DzAO
-BgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcD
-AQYIKwYBBQUHAwIwIgYDVR0gBBswGTANBgsrBgEEAbIxAQICHTAIBgZngQwBAgEw
-OgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJF
-TkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8v
-Y3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYa
-aHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwXwYDVR0RBFgwVoIZaWRwLnNjaWVu
-Y2VzcG9ib3JkZWF1eC5mcoIbbGRhcDIuc2NpZW5jZXNwb2JvcmRlYXV4LmZyghxz
-cnZpZHAuc2NpZW5jZXNwb2JvcmRlYXV4LmZyMA0GCSqGSIb3DQEBBQUAA4IBAQCU
-ORaZfIPKIh9EZsSb+jKw2rZaU8E0l1j9RhtphhaxcXJND0CgjYdplldUDghacRk9
-aYG3rlC6KLcGsUThOx70QbBZrX3MCYkhjNzRnxwm07aj/nV/GB5jYlgK7aMAT7PB
-qiZBvL/hVr86AIxZvzIzphIpy9Qq4GEnItVFhGOycQklELgKWE0nkfAqPfVEa6et
-6/0VcjuF7/2icJmG8FguWm8Bhjc7++RNdCN+XW0GMSNb7cJNIdrhV9pDPg9YUUuW
-xeoFJ3AMgEwyT4aPKYtJjFlKbGLLtW/CicdeXeWR7THWoA8uDWm1AnilOO6+YgM2
-BplU9dtwphlM6oz1pTHl
-					    </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>
-					      MIIEkDCCA3igAwIBAgIRAJzjTT6bg4+QhDI8IGescp8wDQYJKoZIhvcNAQEFBQAw
-NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-IFNTTCBDQTAeFw0xMTAyMDgwMDAwMDBaFw0xNDAyMDcyMzU5NTlaMGExCzAJBgNV
-BAYTAkZSMQ8wDQYDVQQHEwZQZXNzYWMxHTAbBgNVBAoTFFNjaWVuY2VzIFBvIEJv
-cmRlYXV4MSIwIAYDVQQDExlpZHAuc2NpZW5jZXNwb2JvcmRlYXV4LmZyMIIBIjAN
-BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA0y1w1SapxrGmZ0kcubJtxA+a+DH/
-nv0R2Qg4WdacENkzIyNVOdzrwYzHyo4Qux1M+mpWF+0A34ILNTtZyD09uRoYnj5F
-7JmY6Rdd3sjliL+b8V0+gr68Hu6g6c/KD+VtYuW8OiapKLWcP6dHHSkLPt7Aipb+
-BaYAeV7zsKergliVKn9vdcTN4qFSYbZLsFCCq+TLWcb5Zt24soRf0Aig4ATEMO5X
-z8qZAHShZ/83yR5Ql5ChhnaH95ldUhyfVcbC2lcOUGol4UKIr9Ndl3WA2LRE4Y+Y
-slyGbVOt9v6hk3cAsJgw7T3K5E+AIi6SuL7k6p3x/yuiHquRUZjT8Owj3wIDAQAB
-o4IBbDCCAWgwHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsrN1dH6pDjue0wHQYDVR0O
-BBYEFLJC1NFm9gAudgj7xxJCW095Qwl1MA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMB
-Af8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAYBgNVHSAEETAP
-MA0GCysGAQQBsjEBAgIdMDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNz
-LnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1Bggr
-BgEFBQcwAoYpaHR0cDovL2NydC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5j
-cnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9vY3NwLnRjcy50ZXJlbmEub3JnMCQGA1Ud
-EQQdMBuCGWlkcC5zY2llbmNlc3BvYm9yZGVhdXguZnIwDQYJKoZIhvcNAQEFBQAD
-ggEBABM5crkQbXiRohcjJgae3y9MPJZcWT5EKLKVc751iA8KXo3wVF8rdwVhESQ8
-cmd2BV7qYQBh19mPfWA9A3nNRhc92ElackeBhF9nOQAoeiWCtTwyqQFlY+Sy9t7/
-o+wpprhtqiBgLIVTduiDGGnlKasbWG9Gu5dX9SZ99YSRrYKN8bJAnyKgnhhPLpcz
-YKnhDvtia42oMyL42dNmMt3WC6fgacHKK5gn854jExb1zxOZ0EZ5Se0nWmUift1I
-xr6/zUxLKQsLBvsoMidrpEdtqp9m/OkQh5w2yKN4SzxuPzZsfMWK5p/jEgm7MMY5
-qdkYclgdqLgBlFr/yaGI1mcNQMY=
-					    </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://idp.sciencespobordeaux.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.sciencespobordeaux.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.sciencespobordeaux.fr/idp/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Sciences Po Bordeaux</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Sciences Po Bordeaux</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Rouger</SurName>
-    <EmailAddress>p.rouger@sciencespobordeaux.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.sciencespobordeaux.fr.xml b/swamid-interfederations-2.0/idp.sciencespobordeaux.fr.xml
deleted file mode 100644
index b3b7e9d7..00000000
--- a/swamid-interfederations-2.0/idp.sciencespobordeaux.fr.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://idp.sciencespobordeaux.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2011-04-29T13:03:14Z">
-      <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">sciencespobordeaux.fr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">scpobx.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">Sciences Po Bordeaux</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIEuzCCA6OgAwIBAgIRAJ6cVoL9srwAECkklTq3u2gwDQYJKoZIhvcNAQEFBQAw
-NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-IFNTTCBDQTAeFw0xNDAxMDkwMDAwMDBaFw0xNzAxMDgyMzU5NTlaMEcxITAfBgNV
-BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEiMCAGA1UEAxMZaWRwLnNjaWVu
-Y2VzcG9ib3JkZWF1eC5mcjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
-AP3E230Ei838R9qQO32a5tkzyJemr9fmhArIZKTQsQpr9TwEPoIyaDYTQELhcuMG
-bKEojJ716N+8hRNhghNFKGLMO0lGE0TZyxBC28MmttMmad6TLtOEZFv9Py/TTFrq
-pgOy5v0Vb3v/81JwMYT1U9gTU256OSOZg9NSZUxsNbEbyibq0icxtzDceOotn7Bz
-pBTjUtOxZ00igLSoWS7SLPZUyjX2jfgefrDOtZ0/hxrLo3Klx7YC2uJlrrCVZA0s
-87rMSCt0Ra7ECME4JGdNxs5l9EpjGvqvi7zqV9Sg9RtsWKc/Y+me7r7B+SVz3QoY
-pSrgKTSG316/JcEYf6GeFkUCAwEAAaOCAbEwggGtMB8GA1UdIwQYMBaAFAy9k2gM
-896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBT0hWtM6+5tMUzDBzmPbfKO5mK3DzAO
-BgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcD
-AQYIKwYBBQUHAwIwIgYDVR0gBBswGTANBgsrBgEEAbIxAQICHTAIBgZngQwBAgEw
-OgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJF
-TkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8v
-Y3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYa
-aHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwXwYDVR0RBFgwVoIZaWRwLnNjaWVu
-Y2VzcG9ib3JkZWF1eC5mcoIbbGRhcDIuc2NpZW5jZXNwb2JvcmRlYXV4LmZyghxz
-cnZpZHAuc2NpZW5jZXNwb2JvcmRlYXV4LmZyMA0GCSqGSIb3DQEBBQUAA4IBAQCU
-ORaZfIPKIh9EZsSb+jKw2rZaU8E0l1j9RhtphhaxcXJND0CgjYdplldUDghacRk9
-aYG3rlC6KLcGsUThOx70QbBZrX3MCYkhjNzRnxwm07aj/nV/GB5jYlgK7aMAT7PB
-qiZBvL/hVr86AIxZvzIzphIpy9Qq4GEnItVFhGOycQklELgKWE0nkfAqPfVEa6et
-6/0VcjuF7/2icJmG8FguWm8Bhjc7++RNdCN+XW0GMSNb7cJNIdrhV9pDPg9YUUuW
-xeoFJ3AMgEwyT4aPKYtJjFlKbGLLtW/CicdeXeWR7THWoA8uDWm1AnilOO6+YgM2
-BplU9dtwphlM6oz1pTHl
-					    </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>
-					      MIIEkDCCA3igAwIBAgIRAJzjTT6bg4+QhDI8IGescp8wDQYJKoZIhvcNAQEFBQAw
-NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-IFNTTCBDQTAeFw0xMTAyMDgwMDAwMDBaFw0xNDAyMDcyMzU5NTlaMGExCzAJBgNV
-BAYTAkZSMQ8wDQYDVQQHEwZQZXNzYWMxHTAbBgNVBAoTFFNjaWVuY2VzIFBvIEJv
-cmRlYXV4MSIwIAYDVQQDExlpZHAuc2NpZW5jZXNwb2JvcmRlYXV4LmZyMIIBIjAN
-BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA0y1w1SapxrGmZ0kcubJtxA+a+DH/
-nv0R2Qg4WdacENkzIyNVOdzrwYzHyo4Qux1M+mpWF+0A34ILNTtZyD09uRoYnj5F
-7JmY6Rdd3sjliL+b8V0+gr68Hu6g6c/KD+VtYuW8OiapKLWcP6dHHSkLPt7Aipb+
-BaYAeV7zsKergliVKn9vdcTN4qFSYbZLsFCCq+TLWcb5Zt24soRf0Aig4ATEMO5X
-z8qZAHShZ/83yR5Ql5ChhnaH95ldUhyfVcbC2lcOUGol4UKIr9Ndl3WA2LRE4Y+Y
-slyGbVOt9v6hk3cAsJgw7T3K5E+AIi6SuL7k6p3x/yuiHquRUZjT8Owj3wIDAQAB
-o4IBbDCCAWgwHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsrN1dH6pDjue0wHQYDVR0O
-BBYEFLJC1NFm9gAudgj7xxJCW095Qwl1MA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMB
-Af8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAYBgNVHSAEETAP
-MA0GCysGAQQBsjEBAgIdMDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNz
-LnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1Bggr
-BgEFBQcwAoYpaHR0cDovL2NydC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5j
-cnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9vY3NwLnRjcy50ZXJlbmEub3JnMCQGA1Ud
-EQQdMBuCGWlkcC5zY2llbmNlc3BvYm9yZGVhdXguZnIwDQYJKoZIhvcNAQEFBQAD
-ggEBABM5crkQbXiRohcjJgae3y9MPJZcWT5EKLKVc751iA8KXo3wVF8rdwVhESQ8
-cmd2BV7qYQBh19mPfWA9A3nNRhc92ElackeBhF9nOQAoeiWCtTwyqQFlY+Sy9t7/
-o+wpprhtqiBgLIVTduiDGGnlKasbWG9Gu5dX9SZ99YSRrYKN8bJAnyKgnhhPLpcz
-YKnhDvtia42oMyL42dNmMt3WC6fgacHKK5gn854jExb1zxOZ0EZ5Se0nWmUift1I
-xr6/zUxLKQsLBvsoMidrpEdtqp9m/OkQh5w2yKN4SzxuPzZsfMWK5p/jEgm7MMY5
-qdkYclgdqLgBlFr/yaGI1mcNQMY=
-					    </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://idp.sciencespobordeaux.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.sciencespobordeaux.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.sciencespobordeaux.fr/idp/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Sciences Po Bordeaux</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Sciences Po Bordeaux</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Rouger</SurName>
-    <EmailAddress>p.rouger@sciencespobordeaux.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.sgi.cefetmg.br-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.sgi.cefetmg.br-idp-shibboleth.xml
deleted file mode 100644
index eddb22ad..00000000
--- a/swamid-interfederations-2.0/idp.sgi.cefetmg.br-idp-shibboleth.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://idp.sgi.cefetmg.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">cefetmg.br</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">CEFET-MG - Centro Federal de Educacao Tecnologica de Minas Gerais</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="pt-br">CEFET-MG - Centro Federal de Educacao Tecnologica de Minas Gerais</mdui:DisplayName>
-        <mdui:Description xml:lang="en">CEFET-MG - Centro Federal de Educacao Tecnologica de Minas Gerais</mdui:Description>
-        <mdui:Description xml:lang="pt-br">CEFET-MG - Centro Federal de Educacao Tecnologica de Minas Gerais</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.cefetmg.br/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="pt-br">http://www.cefetmg.br/</mdui:InformationURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-    MIIDzjCCArYCAQAwDQYJKoZIhvcNAQEFBQAwgawxETAPBgNVBAoTCENFRkVULU1H
-MQ4wDAYDVQQLEwVESVRJQzEhMB8GCSqGSIb3DQEJARYSZHJpQGRyaS5jZWZldG1n
-LmJyMRcwFQYDVQQHEw5CZWxvIEhvcml6b250ZTEVMBMGA1UECBMMTWluYXMgR2Vy
-YWlzMQswCQYDVQQGEwJCUjEnMCUGA1UEAxMedm0taWRwLTAxLmRpdGljLnNnaS5j
-ZWZldG1nLmJyMB4XDTE0MDMyNTIzNDk0N1oXDTE3MDMyNDIzNDk0N1owgawxETAP
-BgNVBAoTCENFRkVULU1HMQ4wDAYDVQQLEwVESVRJQzEhMB8GCSqGSIb3DQEJARYS
-ZHJpQGRyaS5jZWZldG1nLmJyMRcwFQYDVQQHEw5CZWxvIEhvcml6b250ZTEVMBMG
-A1UECBMMTWluYXMgR2VyYWlzMQswCQYDVQQGEwJCUjEnMCUGA1UEAxMedm0taWRw
-LTAxLmRpdGljLnNnaS5jZWZldG1nLmJyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
-MIIBCgKCAQEAtjvu8RATCClfOz5ybFBuDzvJsg8O5duGMG19Iabw50a8CkDHfY9A
-fxks+v7f0pZdu+vQ65NsWtOaesFxIX6XXKnfjn/rLBtwoZ9j1EL3sbHxHJbKPydn
-alC12MEzOaaqWcSV2GmV3541oo03MiscRJtrdIrceIjUmVBw6nputht/XSwXUPHP
-j2vQncW5ora9WSwCSW2Ey4IRNxEsQ8JcW3YM8+ISuhIaRjyLzeHSBZ6OtjcD91+m
-/PKpuQL7eXwAmQ8QxzIdKoY+UnL7SEvofzvPSNTn3N2+39ZHu9Wb09o+Y/JhZwC/
-QoO8awGk11AcF4dbo5ReHHtPvQR+LwXfWwIDAQABMA0GCSqGSIb3DQEBBQUAA4IB
-AQB5IP7x25abYH9B0dJaQ6O2+EqavE+GMCjESrNTYgjboe4fPssr21EPe0Ye0O8F
-kbSVlULVwIU8jYpYSb6atr8J/eFeJCbVOeSjRSPByxLbuxgTgWuqhVEFgxeHbL6n
-hcmxB+ghnILB19VvRA2f2qGT3WVdL25D0lZW+APn0XmooTqUaxJHstr9uxgfMUmA
-YCq8RxeRlzv+nC8jsKRLX0f/MkoViUs8SqSUVwbFd/9m2aWfwm083pQCjHMxPJ6R
-AmQ7M4Sp8I/jlW+U3rinliikdU8/OtJfK5ul3VJJwDdiZSSKBTpgMK7I0ErMdGge
-ygq02Y9TwNW87ZDtaYEO9eei
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.sgi.cefetmg.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.sgi.cefetmg.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://idp.sgi.cefetmg.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.sgi.cefetmg.br/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.sgi.cefetmg.br/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.sgi.cefetmg.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">cefetmg.br</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-      
-MIIDzjCCArYCAQAwDQYJKoZIhvcNAQEFBQAwgawxETAPBgNVBAoTCENFRkVULU1H
-MQ4wDAYDVQQLEwVESVRJQzEhMB8GCSqGSIb3DQEJARYSZHJpQGRyaS5jZWZldG1n
-LmJyMRcwFQYDVQQHEw5CZWxvIEhvcml6b250ZTEVMBMGA1UECBMMTWluYXMgR2Vy
-YWlzMQswCQYDVQQGEwJCUjEnMCUGA1UEAxMedm0taWRwLTAxLmRpdGljLnNnaS5j
-ZWZldG1nLmJyMB4XDTE0MDMyNTIzNDk0N1oXDTE3MDMyNDIzNDk0N1owgawxETAP
-BgNVBAoTCENFRkVULU1HMQ4wDAYDVQQLEwVESVRJQzEhMB8GCSqGSIb3DQEJARYS
-ZHJpQGRyaS5jZWZldG1nLmJyMRcwFQYDVQQHEw5CZWxvIEhvcml6b250ZTEVMBMG
-A1UECBMMTWluYXMgR2VyYWlzMQswCQYDVQQGEwJCUjEnMCUGA1UEAxMedm0taWRw
-LTAxLmRpdGljLnNnaS5jZWZldG1nLmJyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
-MIIBCgKCAQEAtjvu8RATCClfOz5ybFBuDzvJsg8O5duGMG19Iabw50a8CkDHfY9A
-fxks+v7f0pZdu+vQ65NsWtOaesFxIX6XXKnfjn/rLBtwoZ9j1EL3sbHxHJbKPydn
-alC12MEzOaaqWcSV2GmV3541oo03MiscRJtrdIrceIjUmVBw6nputht/XSwXUPHP
-j2vQncW5ora9WSwCSW2Ey4IRNxEsQ8JcW3YM8+ISuhIaRjyLzeHSBZ6OtjcD91+m
-/PKpuQL7eXwAmQ8QxzIdKoY+UnL7SEvofzvPSNTn3N2+39ZHu9Wb09o+Y/JhZwC/
-QoO8awGk11AcF4dbo5ReHHtPvQR+LwXfWwIDAQABMA0GCSqGSIb3DQEBBQUAA4IB
-AQB5IP7x25abYH9B0dJaQ6O2+EqavE+GMCjESrNTYgjboe4fPssr21EPe0Ye0O8F
-kbSVlULVwIU8jYpYSb6atr8J/eFeJCbVOeSjRSPByxLbuxgTgWuqhVEFgxeHbL6n
-hcmxB+ghnILB19VvRA2f2qGT3WVdL25D0lZW+APn0XmooTqUaxJHstr9uxgfMUmA
-YCq8RxeRlzv+nC8jsKRLX0f/MkoViUs8SqSUVwbFd/9m2aWfwm083pQCjHMxPJ6R
-AmQ7M4Sp8I/jlW+U3rinliikdU8/OtJfK5ul3VJJwDdiZSSKBTpgMK7I0ErMdGge
-ygq02Y9TwNW87ZDtaYEO9eei
-                    
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.sgi.cefetmg.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.sgi.cefetmg.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">CEFET-MG - Centro Federal de Educacao Tecnologica de Minas Gerais</OrganizationName>
-    <OrganizationName xml:lang="pt-br">CEFET-MG - Centro Federal de Educacao Tecnologica de Minas Gerais</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">CEFET-MG - Centro Federal de Educacao Tecnologica de Minas Gerais</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="pt-br">CEFET-MG - Centro Federal de Educacao Tecnologica de Minas Gerais</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.cefetmg.br/</OrganizationURL>
-    <OrganizationURL xml:lang="pt-br">http://www.cefetmg.br/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Clever de O. Junior</SurName>
-    <EmailAddress>clever@dri.cefetmg.br</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.sgi.cefetmg.br.xml b/swamid-interfederations-2.0/idp.sgi.cefetmg.br.xml
deleted file mode 100644
index eddb22ad..00000000
--- a/swamid-interfederations-2.0/idp.sgi.cefetmg.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://idp.sgi.cefetmg.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">cefetmg.br</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">CEFET-MG - Centro Federal de Educacao Tecnologica de Minas Gerais</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="pt-br">CEFET-MG - Centro Federal de Educacao Tecnologica de Minas Gerais</mdui:DisplayName>
-        <mdui:Description xml:lang="en">CEFET-MG - Centro Federal de Educacao Tecnologica de Minas Gerais</mdui:Description>
-        <mdui:Description xml:lang="pt-br">CEFET-MG - Centro Federal de Educacao Tecnologica de Minas Gerais</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.cefetmg.br/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="pt-br">http://www.cefetmg.br/</mdui:InformationURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-    MIIDzjCCArYCAQAwDQYJKoZIhvcNAQEFBQAwgawxETAPBgNVBAoTCENFRkVULU1H
-MQ4wDAYDVQQLEwVESVRJQzEhMB8GCSqGSIb3DQEJARYSZHJpQGRyaS5jZWZldG1n
-LmJyMRcwFQYDVQQHEw5CZWxvIEhvcml6b250ZTEVMBMGA1UECBMMTWluYXMgR2Vy
-YWlzMQswCQYDVQQGEwJCUjEnMCUGA1UEAxMedm0taWRwLTAxLmRpdGljLnNnaS5j
-ZWZldG1nLmJyMB4XDTE0MDMyNTIzNDk0N1oXDTE3MDMyNDIzNDk0N1owgawxETAP
-BgNVBAoTCENFRkVULU1HMQ4wDAYDVQQLEwVESVRJQzEhMB8GCSqGSIb3DQEJARYS
-ZHJpQGRyaS5jZWZldG1nLmJyMRcwFQYDVQQHEw5CZWxvIEhvcml6b250ZTEVMBMG
-A1UECBMMTWluYXMgR2VyYWlzMQswCQYDVQQGEwJCUjEnMCUGA1UEAxMedm0taWRw
-LTAxLmRpdGljLnNnaS5jZWZldG1nLmJyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
-MIIBCgKCAQEAtjvu8RATCClfOz5ybFBuDzvJsg8O5duGMG19Iabw50a8CkDHfY9A
-fxks+v7f0pZdu+vQ65NsWtOaesFxIX6XXKnfjn/rLBtwoZ9j1EL3sbHxHJbKPydn
-alC12MEzOaaqWcSV2GmV3541oo03MiscRJtrdIrceIjUmVBw6nputht/XSwXUPHP
-j2vQncW5ora9WSwCSW2Ey4IRNxEsQ8JcW3YM8+ISuhIaRjyLzeHSBZ6OtjcD91+m
-/PKpuQL7eXwAmQ8QxzIdKoY+UnL7SEvofzvPSNTn3N2+39ZHu9Wb09o+Y/JhZwC/
-QoO8awGk11AcF4dbo5ReHHtPvQR+LwXfWwIDAQABMA0GCSqGSIb3DQEBBQUAA4IB
-AQB5IP7x25abYH9B0dJaQ6O2+EqavE+GMCjESrNTYgjboe4fPssr21EPe0Ye0O8F
-kbSVlULVwIU8jYpYSb6atr8J/eFeJCbVOeSjRSPByxLbuxgTgWuqhVEFgxeHbL6n
-hcmxB+ghnILB19VvRA2f2qGT3WVdL25D0lZW+APn0XmooTqUaxJHstr9uxgfMUmA
-YCq8RxeRlzv+nC8jsKRLX0f/MkoViUs8SqSUVwbFd/9m2aWfwm083pQCjHMxPJ6R
-AmQ7M4Sp8I/jlW+U3rinliikdU8/OtJfK5ul3VJJwDdiZSSKBTpgMK7I0ErMdGge
-ygq02Y9TwNW87ZDtaYEO9eei
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.sgi.cefetmg.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.sgi.cefetmg.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://idp.sgi.cefetmg.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.sgi.cefetmg.br/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.sgi.cefetmg.br/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.sgi.cefetmg.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">cefetmg.br</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-      
-MIIDzjCCArYCAQAwDQYJKoZIhvcNAQEFBQAwgawxETAPBgNVBAoTCENFRkVULU1H
-MQ4wDAYDVQQLEwVESVRJQzEhMB8GCSqGSIb3DQEJARYSZHJpQGRyaS5jZWZldG1n
-LmJyMRcwFQYDVQQHEw5CZWxvIEhvcml6b250ZTEVMBMGA1UECBMMTWluYXMgR2Vy
-YWlzMQswCQYDVQQGEwJCUjEnMCUGA1UEAxMedm0taWRwLTAxLmRpdGljLnNnaS5j
-ZWZldG1nLmJyMB4XDTE0MDMyNTIzNDk0N1oXDTE3MDMyNDIzNDk0N1owgawxETAP
-BgNVBAoTCENFRkVULU1HMQ4wDAYDVQQLEwVESVRJQzEhMB8GCSqGSIb3DQEJARYS
-ZHJpQGRyaS5jZWZldG1nLmJyMRcwFQYDVQQHEw5CZWxvIEhvcml6b250ZTEVMBMG
-A1UECBMMTWluYXMgR2VyYWlzMQswCQYDVQQGEwJCUjEnMCUGA1UEAxMedm0taWRw
-LTAxLmRpdGljLnNnaS5jZWZldG1nLmJyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
-MIIBCgKCAQEAtjvu8RATCClfOz5ybFBuDzvJsg8O5duGMG19Iabw50a8CkDHfY9A
-fxks+v7f0pZdu+vQ65NsWtOaesFxIX6XXKnfjn/rLBtwoZ9j1EL3sbHxHJbKPydn
-alC12MEzOaaqWcSV2GmV3541oo03MiscRJtrdIrceIjUmVBw6nputht/XSwXUPHP
-j2vQncW5ora9WSwCSW2Ey4IRNxEsQ8JcW3YM8+ISuhIaRjyLzeHSBZ6OtjcD91+m
-/PKpuQL7eXwAmQ8QxzIdKoY+UnL7SEvofzvPSNTn3N2+39ZHu9Wb09o+Y/JhZwC/
-QoO8awGk11AcF4dbo5ReHHtPvQR+LwXfWwIDAQABMA0GCSqGSIb3DQEBBQUAA4IB
-AQB5IP7x25abYH9B0dJaQ6O2+EqavE+GMCjESrNTYgjboe4fPssr21EPe0Ye0O8F
-kbSVlULVwIU8jYpYSb6atr8J/eFeJCbVOeSjRSPByxLbuxgTgWuqhVEFgxeHbL6n
-hcmxB+ghnILB19VvRA2f2qGT3WVdL25D0lZW+APn0XmooTqUaxJHstr9uxgfMUmA
-YCq8RxeRlzv+nC8jsKRLX0f/MkoViUs8SqSUVwbFd/9m2aWfwm083pQCjHMxPJ6R
-AmQ7M4Sp8I/jlW+U3rinliikdU8/OtJfK5ul3VJJwDdiZSSKBTpgMK7I0ErMdGge
-ygq02Y9TwNW87ZDtaYEO9eei
-                    
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.sgi.cefetmg.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.sgi.cefetmg.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">CEFET-MG - Centro Federal de Educacao Tecnologica de Minas Gerais</OrganizationName>
-    <OrganizationName xml:lang="pt-br">CEFET-MG - Centro Federal de Educacao Tecnologica de Minas Gerais</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">CEFET-MG - Centro Federal de Educacao Tecnologica de Minas Gerais</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="pt-br">CEFET-MG - Centro Federal de Educacao Tecnologica de Minas Gerais</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.cefetmg.br/</OrganizationURL>
-    <OrganizationURL xml:lang="pt-br">http://www.cefetmg.br/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Clever de O. Junior</SurName>
-    <EmailAddress>clever@dri.cefetmg.br</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.shh.fi.xml b/swamid-interfederations-2.0/idp.shh.fi.xml
deleted file mode 100644
index 4e0db6ad..00000000
--- a/swamid-interfederations-2.0/idp.shh.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: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.shh.fi/idp/shibboleth">
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope regexp="false">hanken.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>MIIEYTCCA0mgAwIBAgIQR1F2IKk/FGfCBPi7E7Lr9DANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTEzMTAxODAwMDAwMFoXDTE2MTExMjIzNTk1OVowODEhMB8GA1UE
-CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRMwEQYDVQQDEwppZHAuc2hoLmZp
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA0tjmJ1ERx/Za5uVfPURB
-8eTAKK0QEXJD/++dCZcVSrIpau8jiLkmi+kzweI531JVBDrpT24jFGXn2cKnzUIB
-xpOWEUKLQSkYdA3LoKD1gJjjFxF8Y3J237Zlg3QL/dmNnfCLxs8SsXbCsjxpuPAP
-wYRR1ZEL2SjdU3zEDc4iqMqkk5wS4lzjB1SMNFaaKRRsW97BAKATyHRwp4a01nB4
-o0MDNn4iGcIoE3kO9X83H7smurBXGqVzc4dnfH3yLOXF+NMpRbH9upSrSBe2EoZU
-jc+Vi4/fsEXRmr/u+8IOb1ERpYNLCd6L+mD9ppbA3ZeRJe/LRaq7MFQX3VzMR5mn
-xwIDAQABo4IBZzCCAWMwHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsrN1dH6pDjue0w
-HQYDVR0OBBYEFH9BqIu5UIBGpznMYuQP3dJQ6f7zMA4GA1UdDwEB/wQEAwIFoDAM
-BgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAiBgNV
-HSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNVHR8EMzAxMC+gLaAr
-hilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNybDBtBggr
-BgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNzLnRlcmVuYS5v
-cmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8vb2NzcC50Y3Mu
-dGVyZW5hLm9yZzAVBgNVHREEDjAMggppZHAuc2hoLmZpMA0GCSqGSIb3DQEBBQUA
-A4IBAQBk7DXTXfwZCTrFUVB73h4TzHF2zrIUm83SFCNcn5BBA9qKRL/TfozD4ZwK
-1zfaVtcc8gpS4tUE+T3dOa2zKvUgYSuDScC7cInBht1wLUrukBhQCDIU+0lKaBJv
-A17KXHxowqua95sMKkN3tDUB7lbLCuPxhJyWzE2E9TrJ2oTYQ35C3cGd5FbnLEWk
-9ceS4WR5+t1lpvC4uwWrc0DYgb0ADv9TDW52/qssZKNLbVu5BwRKI6ToAZTgnNbf
-aeNbuslxAJn11gg6nMy8yRVZMTOMZoLK5j4vNXhp8YngrWxdGBDIaEtLvLWfIs99
-nAiHebdvpVCIMaM703zAuuDVImHf</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.shh.fi/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="fi">Hanken Svenska handelshögskolan</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">Hanken School of Economics</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">Hanken Svenska handelshögskolan</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="fi">Hanken Svenska handelshögskolan</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Hanken School of Economics</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="sv">Hanken Svenska handelshögskolan</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="fi">http://www.hanken.fi</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.hanken.fi</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sv">http://www.hanken.fi</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Kuno</md:GivenName>
-    <md:SurName>Ohrman</md:SurName>
-    <md:EmailAddress>mailto:shibboservice@hanken.fi</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Johan</md:GivenName>
-    <md:SurName>Isaksson</md:SurName>
-    <md:EmailAddress>mailto:shibboservice@hanken.fi</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Hanken</md:GivenName>
-    <md:SurName>Helpdesk</md:SurName>
-    <md:EmailAddress>mailto:help@hanken.fi</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.shibboleth.net-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.shibboleth.net-idp-shibboleth.xml
deleted file mode 100644
index 676a22e2..00000000
--- a/swamid-interfederations-2.0/idp.shibboleth.net-idp-shibboleth.xml
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.shibboleth.net/idp/shibboleth">
-  <!--
-		This is a shibboleth.net Shibboleth IdP for JISC Collections and Janet 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/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/2000/09/xmldsig#rsa-sha1"/>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2011-01-06T16:22:29Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">shibboleth.net</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Shibboleth.net</mdui:DisplayName>
-        <mdui:Description xml:lang="en">An identity provider hosted and used by the
-					developers of Shibboleth.</mdui:Description>
-        <mdui:Logo height="82" width="64">https://shibboleth.net/images/gryphon_64x82.png</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDNDCCAhygAwIBAgIVAKyBWnv1/h1U11C7kHvV33FIrEsJMA0GCSqGSIb3DQEB
-						BQUAMB0xGzAZBgNVBAMTEmlkcC5zaGliYm9sZXRoLm5ldDAeFw0xMDEyMjkwMDA5
-						MTlaFw0zMDEyMjkwMDA5MTlaMB0xGzAZBgNVBAMTEmlkcC5zaGliYm9sZXRoLm5l
-						dDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKjWAdpUx/82FUzrRMfA
-						M63PkZZYCm3RnT3eiL+DeJcbGdcEJx/o+32vgHXJgJOBt14YdVam5GErIYgk4SGq
-						5Z5RYl0PpQn6HQG/9prGnYCu6p5zfb0557o51Eh8TcVehS6Y2ruyCjAF0jgVMwh5
-						/0Oh8EE9wG93pSpm70DAiiaTVCb8WoT1aZYtxbBmmuH10bU+wge/NMmaHuVAe599
-						pyezFIL4FoI2g+1Q6nG4Yl1Z07I81tTApXKVMWRt/4/M3m2D7PUMOQ9qsxthp2L/
-						LovIeNo0bTyeW290T2Y/JRZhKOgeDqkhuu82DPri2Vm5G/unB69KfRB7CF9QWIc3
-						y80CAwEAAaNrMGkwSAYDVR0RBEEwP4ISaWRwLnNoaWJib2xldGgubmV0hilodHRw
-						czovL2lkcC5zaGliYm9sZXRoLm5ldC9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQU
-						3uZ32tKXJBzPCTp2dtHSLV0FvGgwDQYJKoZIhvcNAQEFBQADggEBAAYXYuzp0UTj
-						3yLRvUCbEtaw9b80+weOELkVv3WFY3QAG8pIKEblrMMtzrzLFWZwYwwMZDab/HnH
-						egmgjZBthrOedEmoJ+OHRmIiS8zdZxVGEadJhTUaeIkO6kwK7Ht3nQePoiXV7TI5
-						+A9SpmZGoukC85Za4wGDw4xWGs5t5l6tBuuV+1s0oC6T8ih5n/NyThfpbihSW0d7
-						iBfSUickgpoM2BLM3FCnbO8HOsX1rGV4ypG9ZGDDvr2jrzalXXmc05gSlL2qd9ce
-						Q1M+9vavusPCqlj2zZf2/HfzhyiFcb/OgA0oTFWW2ynXji6UarIV5QaPoi/XmGmx
-						BXD36HfGBXk=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-    </KeyDescriptor>
-    <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.net/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.net/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.net/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">JISC Collections and Janet Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Shibboleth.net</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.shibboleth.net/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Shibboleth.Net Technical Support</GivenName>
-    <EmailAddress>mailto:contact@shibboleth.net</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Scott</GivenName>
-    <SurName>Cantor</SurName>
-    <EmailAddress>mailto:cantor.2@osu.edu</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/idp.shibboleth.net.xml b/swamid-interfederations-2.0/idp.shibboleth.net.xml
deleted file mode 100644
index 676a22e2..00000000
--- a/swamid-interfederations-2.0/idp.shibboleth.net.xml
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.shibboleth.net/idp/shibboleth">
-  <!--
-		This is a shibboleth.net Shibboleth IdP for JISC Collections and Janet 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/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/2000/09/xmldsig#rsa-sha1"/>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2011-01-06T16:22:29Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">shibboleth.net</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Shibboleth.net</mdui:DisplayName>
-        <mdui:Description xml:lang="en">An identity provider hosted and used by the
-					developers of Shibboleth.</mdui:Description>
-        <mdui:Logo height="82" width="64">https://shibboleth.net/images/gryphon_64x82.png</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDNDCCAhygAwIBAgIVAKyBWnv1/h1U11C7kHvV33FIrEsJMA0GCSqGSIb3DQEB
-						BQUAMB0xGzAZBgNVBAMTEmlkcC5zaGliYm9sZXRoLm5ldDAeFw0xMDEyMjkwMDA5
-						MTlaFw0zMDEyMjkwMDA5MTlaMB0xGzAZBgNVBAMTEmlkcC5zaGliYm9sZXRoLm5l
-						dDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKjWAdpUx/82FUzrRMfA
-						M63PkZZYCm3RnT3eiL+DeJcbGdcEJx/o+32vgHXJgJOBt14YdVam5GErIYgk4SGq
-						5Z5RYl0PpQn6HQG/9prGnYCu6p5zfb0557o51Eh8TcVehS6Y2ruyCjAF0jgVMwh5
-						/0Oh8EE9wG93pSpm70DAiiaTVCb8WoT1aZYtxbBmmuH10bU+wge/NMmaHuVAe599
-						pyezFIL4FoI2g+1Q6nG4Yl1Z07I81tTApXKVMWRt/4/M3m2D7PUMOQ9qsxthp2L/
-						LovIeNo0bTyeW290T2Y/JRZhKOgeDqkhuu82DPri2Vm5G/unB69KfRB7CF9QWIc3
-						y80CAwEAAaNrMGkwSAYDVR0RBEEwP4ISaWRwLnNoaWJib2xldGgubmV0hilodHRw
-						czovL2lkcC5zaGliYm9sZXRoLm5ldC9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQU
-						3uZ32tKXJBzPCTp2dtHSLV0FvGgwDQYJKoZIhvcNAQEFBQADggEBAAYXYuzp0UTj
-						3yLRvUCbEtaw9b80+weOELkVv3WFY3QAG8pIKEblrMMtzrzLFWZwYwwMZDab/HnH
-						egmgjZBthrOedEmoJ+OHRmIiS8zdZxVGEadJhTUaeIkO6kwK7Ht3nQePoiXV7TI5
-						+A9SpmZGoukC85Za4wGDw4xWGs5t5l6tBuuV+1s0oC6T8ih5n/NyThfpbihSW0d7
-						iBfSUickgpoM2BLM3FCnbO8HOsX1rGV4ypG9ZGDDvr2jrzalXXmc05gSlL2qd9ce
-						Q1M+9vavusPCqlj2zZf2/HfzhyiFcb/OgA0oTFWW2ynXji6UarIV5QaPoi/XmGmx
-						BXD36HfGBXk=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-    </KeyDescriptor>
-    <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.net/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.net/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.net/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">JISC Collections and Janet Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Shibboleth.net</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.shibboleth.net/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Shibboleth.Net Technical Support</GivenName>
-    <EmailAddress>mailto:contact@shibboleth.net</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Scott</GivenName>
-    <SurName>Cantor</SurName>
-    <EmailAddress>mailto:cantor.2@osu.edu</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/idp.sissa.it-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.sissa.it-idp-shibboleth.xml
deleted file mode 100644
index 69b6134f..00000000
--- a/swamid-interfederations-2.0/idp.sissa.it-idp-shibboleth.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:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" entityID="https://idp.sissa.it/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2013-07-03T15:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">
-                    https://www.idem.garr.it/idem-metadata-registration-practice-statement
-                </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">sissa.it</shibmd:Scope>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="en">SISSA</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="it">SISSA</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Scuola Internazionale Superiore di Studi Avanzati</mdui:Description>
-        <mdui:Description xml:lang="it">Scuola Internazionale Superiore di Studi Avanzati</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.itcs.sissa.it/services/idem</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">http://www.itcs.sissa.it/services/idem</mdui:PrivacyStatementURL>
-        <mdui:Logo height="16" width="16" xml:lang="en">https://idp.sissa.it/img/logo16x16.png</mdui:Logo>
-        <mdui:Logo height="16" width="16" xml:lang="it">https://idp.sissa.it/img/logo16x16.png</mdui:Logo>
-        <mdui:Logo height="60" width="80" xml:lang="en">https://idp.sissa.it/img/logo80x60.png</mdui:Logo>
-        <mdui:Logo height="60" width="80" xml:lang="it">https://idp.sissa.it/img/logo80x60.png</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDGzCCAgOgAwIBAgIUBDNUKHsGJPdh6XQWcjVI7QsO2fUwDQYJKoZIhvcNAQEF
-BQAwFzEVMBMGA1UEAxMMaWRwLnNpc3NhLml0MB4XDTEwMTExMTEyMTAyNVoXDTMw
-MTExMTEyMTAyNVowFzEVMBMGA1UEAxMMaWRwLnNpc3NhLml0MIIBIjANBgkqhkiG
-9w0BAQEFAAOCAQ8AMIIBCgKCAQEAijIA8AmcGKkBom6g4javpNcollJH9oq+13Fd
-wvNPUJTXPNDRrmNO9jhgY7Jcx2+I8jkOryP7ifpKtlmEt3k3W0o08Om/jKbdayKx
-I8phZMe2/fKiUVtUJz1zQ9cE02Cmd0vTb8421Y7JnmKcf7uwNLQnU4elT079Clak
-3gwk2VJJja+yzrB9DMLhHs+rRZp4cqgJaH1LqcLtrp435xcFEr+NL15Ei2dFWtym
-pGgf/wLASEgqws2RSdvEu2Kz+m2vDIox6N9mZN/FW2chyjSJ/scv9pkYXeZAyaOB
-PtmGF50A7HOZDFUnQQ62EEQ74QmE/mhgSyPSGUjs/i+utY96PQIDAQABo18wXTA8
-BgNVHREENTAzggxpZHAuc2lzc2EuaXSGI2h0dHBzOi8vaWRwLnNpc3NhLml0L2lk
-cC9zaGliYm9sZXRoMB0GA1UdDgQWBBRVL7DD1CdWBVf38sDt3Plq+UeOzzANBgkq
-hkiG9w0BAQUFAAOCAQEADshw70QDPxPI3c9iJReHPp9xpkTrCV4i+oqK2ChSp3UT
-P2guauh6zdXbOMCBD1Zs+rMP5/LinkJpT7P9dM0jQgmD8uXbi6livyB4Brf49P0r
-jtKgeiplWeXSXzKnAwELHEDa5ixsvMT/WfBWVCNfrnTE/fR0YjGw35SqYgYiUfpE
-j/oS9mPKY09i92fgmfmVjtGvhY5ZD+nWpzdO+quvwKsYUyU9gfrB2EwW5eh+G1oF
-NWYprJEp7gYuge/L84Gq90zXkCvRlN+pYFDOHwQqPkaQZ8B1anEoH/5/wpI5CGlI
-Dqa9SIiHIzb6oiTRzBRED+zbqd+EzvCwEdoMBnarPQ==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.sissa.it:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.sissa.it: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.sissa.it/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.sissa.it/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.sissa.it/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.sissa.it/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">sissa.it</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDGzCCAgOgAwIBAgIUBDNUKHsGJPdh6XQWcjVI7QsO2fUwDQYJKoZIhvcNAQEF
-BQAwFzEVMBMGA1UEAxMMaWRwLnNpc3NhLml0MB4XDTEwMTExMTEyMTAyNVoXDTMw
-MTExMTEyMTAyNVowFzEVMBMGA1UEAxMMaWRwLnNpc3NhLml0MIIBIjANBgkqhkiG
-9w0BAQEFAAOCAQ8AMIIBCgKCAQEAijIA8AmcGKkBom6g4javpNcollJH9oq+13Fd
-wvNPUJTXPNDRrmNO9jhgY7Jcx2+I8jkOryP7ifpKtlmEt3k3W0o08Om/jKbdayKx
-I8phZMe2/fKiUVtUJz1zQ9cE02Cmd0vTb8421Y7JnmKcf7uwNLQnU4elT079Clak
-3gwk2VJJja+yzrB9DMLhHs+rRZp4cqgJaH1LqcLtrp435xcFEr+NL15Ei2dFWtym
-pGgf/wLASEgqws2RSdvEu2Kz+m2vDIox6N9mZN/FW2chyjSJ/scv9pkYXeZAyaOB
-PtmGF50A7HOZDFUnQQ62EEQ74QmE/mhgSyPSGUjs/i+utY96PQIDAQABo18wXTA8
-BgNVHREENTAzggxpZHAuc2lzc2EuaXSGI2h0dHBzOi8vaWRwLnNpc3NhLml0L2lk
-cC9zaGliYm9sZXRoMB0GA1UdDgQWBBRVL7DD1CdWBVf38sDt3Plq+UeOzzANBgkq
-hkiG9w0BAQUFAAOCAQEADshw70QDPxPI3c9iJReHPp9xpkTrCV4i+oqK2ChSp3UT
-P2guauh6zdXbOMCBD1Zs+rMP5/LinkJpT7P9dM0jQgmD8uXbi6livyB4Brf49P0r
-jtKgeiplWeXSXzKnAwELHEDa5ixsvMT/WfBWVCNfrnTE/fR0YjGw35SqYgYiUfpE
-j/oS9mPKY09i92fgmfmVjtGvhY5ZD+nWpzdO+quvwKsYUyU9gfrB2EwW5eh+G1oF
-NWYprJEp7gYuge/L84Gq90zXkCvRlN+pYFDOHwQqPkaQZ8B1anEoH/5/wpI5CGlI
-Dqa9SIiHIzb6oiTRzBRED+zbqd+EzvCwEdoMBnarPQ==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.sissa.it:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.sissa.it: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">Scuola Internazionale Superiore di Studi Avanzati</OrganizationName>
-    <OrganizationName xml:lang="it">Scuola Internazionale Superiore di Studi Avanzati</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">SISSA</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="it">SISSA</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.sissa.it/</OrganizationURL>
-    <OrganizationURL xml:lang="it">http://www.sissa.it/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Massimiliano</GivenName>
-    <SurName>Ritossa</SurName>
-    <EmailAddress>helpdesk@sissa.it</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="support">
-    <EmailAddress>helpdesk@sissa.it</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.sissa.it.xml b/swamid-interfederations-2.0/idp.sissa.it.xml
deleted file mode 100644
index 69b6134f..00000000
--- a/swamid-interfederations-2.0/idp.sissa.it.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:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" entityID="https://idp.sissa.it/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2013-07-03T15:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">
-                    https://www.idem.garr.it/idem-metadata-registration-practice-statement
-                </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">sissa.it</shibmd:Scope>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="en">SISSA</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="it">SISSA</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Scuola Internazionale Superiore di Studi Avanzati</mdui:Description>
-        <mdui:Description xml:lang="it">Scuola Internazionale Superiore di Studi Avanzati</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.itcs.sissa.it/services/idem</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">http://www.itcs.sissa.it/services/idem</mdui:PrivacyStatementURL>
-        <mdui:Logo height="16" width="16" xml:lang="en">https://idp.sissa.it/img/logo16x16.png</mdui:Logo>
-        <mdui:Logo height="16" width="16" xml:lang="it">https://idp.sissa.it/img/logo16x16.png</mdui:Logo>
-        <mdui:Logo height="60" width="80" xml:lang="en">https://idp.sissa.it/img/logo80x60.png</mdui:Logo>
-        <mdui:Logo height="60" width="80" xml:lang="it">https://idp.sissa.it/img/logo80x60.png</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDGzCCAgOgAwIBAgIUBDNUKHsGJPdh6XQWcjVI7QsO2fUwDQYJKoZIhvcNAQEF
-BQAwFzEVMBMGA1UEAxMMaWRwLnNpc3NhLml0MB4XDTEwMTExMTEyMTAyNVoXDTMw
-MTExMTEyMTAyNVowFzEVMBMGA1UEAxMMaWRwLnNpc3NhLml0MIIBIjANBgkqhkiG
-9w0BAQEFAAOCAQ8AMIIBCgKCAQEAijIA8AmcGKkBom6g4javpNcollJH9oq+13Fd
-wvNPUJTXPNDRrmNO9jhgY7Jcx2+I8jkOryP7ifpKtlmEt3k3W0o08Om/jKbdayKx
-I8phZMe2/fKiUVtUJz1zQ9cE02Cmd0vTb8421Y7JnmKcf7uwNLQnU4elT079Clak
-3gwk2VJJja+yzrB9DMLhHs+rRZp4cqgJaH1LqcLtrp435xcFEr+NL15Ei2dFWtym
-pGgf/wLASEgqws2RSdvEu2Kz+m2vDIox6N9mZN/FW2chyjSJ/scv9pkYXeZAyaOB
-PtmGF50A7HOZDFUnQQ62EEQ74QmE/mhgSyPSGUjs/i+utY96PQIDAQABo18wXTA8
-BgNVHREENTAzggxpZHAuc2lzc2EuaXSGI2h0dHBzOi8vaWRwLnNpc3NhLml0L2lk
-cC9zaGliYm9sZXRoMB0GA1UdDgQWBBRVL7DD1CdWBVf38sDt3Plq+UeOzzANBgkq
-hkiG9w0BAQUFAAOCAQEADshw70QDPxPI3c9iJReHPp9xpkTrCV4i+oqK2ChSp3UT
-P2guauh6zdXbOMCBD1Zs+rMP5/LinkJpT7P9dM0jQgmD8uXbi6livyB4Brf49P0r
-jtKgeiplWeXSXzKnAwELHEDa5ixsvMT/WfBWVCNfrnTE/fR0YjGw35SqYgYiUfpE
-j/oS9mPKY09i92fgmfmVjtGvhY5ZD+nWpzdO+quvwKsYUyU9gfrB2EwW5eh+G1oF
-NWYprJEp7gYuge/L84Gq90zXkCvRlN+pYFDOHwQqPkaQZ8B1anEoH/5/wpI5CGlI
-Dqa9SIiHIzb6oiTRzBRED+zbqd+EzvCwEdoMBnarPQ==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.sissa.it:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.sissa.it: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.sissa.it/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.sissa.it/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.sissa.it/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.sissa.it/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">sissa.it</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDGzCCAgOgAwIBAgIUBDNUKHsGJPdh6XQWcjVI7QsO2fUwDQYJKoZIhvcNAQEF
-BQAwFzEVMBMGA1UEAxMMaWRwLnNpc3NhLml0MB4XDTEwMTExMTEyMTAyNVoXDTMw
-MTExMTEyMTAyNVowFzEVMBMGA1UEAxMMaWRwLnNpc3NhLml0MIIBIjANBgkqhkiG
-9w0BAQEFAAOCAQ8AMIIBCgKCAQEAijIA8AmcGKkBom6g4javpNcollJH9oq+13Fd
-wvNPUJTXPNDRrmNO9jhgY7Jcx2+I8jkOryP7ifpKtlmEt3k3W0o08Om/jKbdayKx
-I8phZMe2/fKiUVtUJz1zQ9cE02Cmd0vTb8421Y7JnmKcf7uwNLQnU4elT079Clak
-3gwk2VJJja+yzrB9DMLhHs+rRZp4cqgJaH1LqcLtrp435xcFEr+NL15Ei2dFWtym
-pGgf/wLASEgqws2RSdvEu2Kz+m2vDIox6N9mZN/FW2chyjSJ/scv9pkYXeZAyaOB
-PtmGF50A7HOZDFUnQQ62EEQ74QmE/mhgSyPSGUjs/i+utY96PQIDAQABo18wXTA8
-BgNVHREENTAzggxpZHAuc2lzc2EuaXSGI2h0dHBzOi8vaWRwLnNpc3NhLml0L2lk
-cC9zaGliYm9sZXRoMB0GA1UdDgQWBBRVL7DD1CdWBVf38sDt3Plq+UeOzzANBgkq
-hkiG9w0BAQUFAAOCAQEADshw70QDPxPI3c9iJReHPp9xpkTrCV4i+oqK2ChSp3UT
-P2guauh6zdXbOMCBD1Zs+rMP5/LinkJpT7P9dM0jQgmD8uXbi6livyB4Brf49P0r
-jtKgeiplWeXSXzKnAwELHEDa5ixsvMT/WfBWVCNfrnTE/fR0YjGw35SqYgYiUfpE
-j/oS9mPKY09i92fgmfmVjtGvhY5ZD+nWpzdO+quvwKsYUyU9gfrB2EwW5eh+G1oF
-NWYprJEp7gYuge/L84Gq90zXkCvRlN+pYFDOHwQqPkaQZ8B1anEoH/5/wpI5CGlI
-Dqa9SIiHIzb6oiTRzBRED+zbqd+EzvCwEdoMBnarPQ==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.sissa.it:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.sissa.it: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">Scuola Internazionale Superiore di Studi Avanzati</OrganizationName>
-    <OrganizationName xml:lang="it">Scuola Internazionale Superiore di Studi Avanzati</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">SISSA</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="it">SISSA</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.sissa.it/</OrganizationURL>
-    <OrganizationURL xml:lang="it">http://www.sissa.it/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Massimiliano</GivenName>
-    <SurName>Ritossa</SurName>
-    <EmailAddress>helpdesk@sissa.it</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="support">
-    <EmailAddress>helpdesk@sissa.it</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.soc.cas.cz-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.soc.cas.cz-idp-shibboleth.xml
deleted file mode 100644
index a04c91ce..00000000
--- a/swamid-interfederations-2.0/idp.soc.cas.cz-idp-shibboleth.xml
+++ /dev/null
@@ -1,118 +0,0 @@
-<?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.soc.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/" registrationInstant="2014-07-24T14:09:34Z">
-      <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>
-    <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://eduid.cz/uri/idp-group/avcr</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>
-      <shibmd:Scope regexp="false">soc.cas.cz</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Institute of Sociology AS CR</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="cs">Sociologický ústav AV ČR</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Identity Provider SOU AV CR employees.</mdui:Description>
-        <mdui:Description xml:lang="cs">Identity Provider pro zaměstnance SOÚ AV ČR</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.soc.cas.cz/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="cs">http://www.soc.cas.cz/</mdui:InformationURL>
-        <mdui:Logo height="44" width="70">https://jiftach.cas.cz/loga/logo-soc-44.png</mdui:Logo>
-        <mdui:Logo height="1237" width="1959">https://jiftach.cas.cz/loga/logo-soc-1237.png</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDJDCCAgygAwIBAgIVALbz3ZMe+jLBrE4lIU9+JcxfX6G1MA0GCSqGSIb3DQEB
-BQUAMBkxFzAVBgNVBAMTDmlkcC5zb2MuY2FzLmN6MB4XDTE0MDYwNDA3NTk0N1oX
-DTM0MDYwNDA3NTk0N1owGTEXMBUGA1UEAxMOaWRwLnNvYy5jYXMuY3owggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCb17jsUD7gY8vMDwIgjf3Gc8HIGatp
-dVo0qPKs2kIwbOpNxtfiK3QFGoj6zFNcCbDXwcRJM/2AqrMRAj+WgnHQrjctYB5o
-400kvDKluqce92qZI0luJzxBZR1UVeC5gSy8JUd6rorDYqNDcXyl8Mb1iutbxids
-87Pb+SOpSurSC5LE0hy24WFQnkAf2rZneZD4iH6E6kNTDJIf9rTyavwjeIGpSNd+
-8BjD8Qj4bcxm6VPGrB++LVYNgn4Ml7dU4KoLf51tfeeP8u0Z8xfSXkus+LKlaVTc
-J4GZJ2Ey6Lk14yV69ymgGtJPc59xINg7GkE4BudWhqAROnt+P3olyTA/AgMBAAGj
-YzBhMEAGA1UdEQQ5MDeCDmlkcC5zb2MuY2FzLmN6hiVodHRwczovL2lkcC5zb2Mu
-Y2FzLmN6L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBTA+sWvwXfF656DdVRMXO8T
-QkaZQjANBgkqhkiG9w0BAQUFAAOCAQEAYYB87sKunI6qPwmASoXHNGDyUhqiGOs6
-jZBxKmcJdoeQMWvjBuQ4kRUo/F8MedGeEYnLkmmN4tMBtQH5FK6dAHDuhkLNXR5Q
-G3DrhuVv4F8kBTkee/6Buhd0mF/+XMcWaY7GIvnDH6bNIdTfO8EbjvuHRlr+ggVc
-xET2sHeYcwo+slmPebr/5fOYzpaE3ypqNyyTfiz44HQOAsOz7SL6t3wBTexdDlB3
-O7+c6VYyjsE8KPx9JoSjkoD05nPA06Irj0aAXPUrTHXk0UaFU8uHGzh06u/mtlVK
-IaV6L2n5KTVFbtfvJSuGFGB/t3VqhVLT7svoSLCvwetSHRXNmlLnqg==
-
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.soc.cas.cz:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.soc.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.soc.cas.cz/idp/profile/SAML2/Redirect/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.soc.cas.cz/idp/profile/SAML2/POST/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.soc.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.soc.cas.cz/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.soc.cas.cz/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.soc.cas.cz/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.soc.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">soc.cas.cz</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDJDCCAgygAwIBAgIVALbz3ZMe+jLBrE4lIU9+JcxfX6G1MA0GCSqGSIb3DQEB
-BQUAMBkxFzAVBgNVBAMTDmlkcC5zb2MuY2FzLmN6MB4XDTE0MDYwNDA3NTk0N1oX
-DTM0MDYwNDA3NTk0N1owGTEXMBUGA1UEAxMOaWRwLnNvYy5jYXMuY3owggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCb17jsUD7gY8vMDwIgjf3Gc8HIGatp
-dVo0qPKs2kIwbOpNxtfiK3QFGoj6zFNcCbDXwcRJM/2AqrMRAj+WgnHQrjctYB5o
-400kvDKluqce92qZI0luJzxBZR1UVeC5gSy8JUd6rorDYqNDcXyl8Mb1iutbxids
-87Pb+SOpSurSC5LE0hy24WFQnkAf2rZneZD4iH6E6kNTDJIf9rTyavwjeIGpSNd+
-8BjD8Qj4bcxm6VPGrB++LVYNgn4Ml7dU4KoLf51tfeeP8u0Z8xfSXkus+LKlaVTc
-J4GZJ2Ey6Lk14yV69ymgGtJPc59xINg7GkE4BudWhqAROnt+P3olyTA/AgMBAAGj
-YzBhMEAGA1UdEQQ5MDeCDmlkcC5zb2MuY2FzLmN6hiVodHRwczovL2lkcC5zb2Mu
-Y2FzLmN6L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBTA+sWvwXfF656DdVRMXO8T
-QkaZQjANBgkqhkiG9w0BAQUFAAOCAQEAYYB87sKunI6qPwmASoXHNGDyUhqiGOs6
-jZBxKmcJdoeQMWvjBuQ4kRUo/F8MedGeEYnLkmmN4tMBtQH5FK6dAHDuhkLNXR5Q
-G3DrhuVv4F8kBTkee/6Buhd0mF/+XMcWaY7GIvnDH6bNIdTfO8EbjvuHRlr+ggVc
-xET2sHeYcwo+slmPebr/5fOYzpaE3ypqNyyTfiz44HQOAsOz7SL6t3wBTexdDlB3
-O7+c6VYyjsE8KPx9JoSjkoD05nPA06Irj0aAXPUrTHXk0UaFU8uHGzh06u/mtlVK
-IaV6L2n5KTVFbtfvJSuGFGB/t3VqhVLT7svoSLCvwetSHRXNmlLnqg==
-
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.soc.cas.cz:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.soc.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 Sociology of the Academy of Sciences of the Czech Republic</OrganizationName>
-    <OrganizationName xml:lang="cs">Sociologický ústav AV ČR</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Institute of Sociology, Public Research Institution</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="cs">Sociologický ústav AV ČR, v.v.i.</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.soc.cas.cz/</OrganizationURL>
-    <OrganizationURL xml:lang="cs">http://www.soc.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.soc.cas.cz.xml b/swamid-interfederations-2.0/idp.soc.cas.cz.xml
deleted file mode 100644
index a04c91ce..00000000
--- a/swamid-interfederations-2.0/idp.soc.cas.cz.xml
+++ /dev/null
@@ -1,118 +0,0 @@
-<?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.soc.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/" registrationInstant="2014-07-24T14:09:34Z">
-      <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>
-    <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://eduid.cz/uri/idp-group/avcr</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>
-      <shibmd:Scope regexp="false">soc.cas.cz</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Institute of Sociology AS CR</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="cs">Sociologický ústav AV ČR</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Identity Provider SOU AV CR employees.</mdui:Description>
-        <mdui:Description xml:lang="cs">Identity Provider pro zaměstnance SOÚ AV ČR</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.soc.cas.cz/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="cs">http://www.soc.cas.cz/</mdui:InformationURL>
-        <mdui:Logo height="44" width="70">https://jiftach.cas.cz/loga/logo-soc-44.png</mdui:Logo>
-        <mdui:Logo height="1237" width="1959">https://jiftach.cas.cz/loga/logo-soc-1237.png</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDJDCCAgygAwIBAgIVALbz3ZMe+jLBrE4lIU9+JcxfX6G1MA0GCSqGSIb3DQEB
-BQUAMBkxFzAVBgNVBAMTDmlkcC5zb2MuY2FzLmN6MB4XDTE0MDYwNDA3NTk0N1oX
-DTM0MDYwNDA3NTk0N1owGTEXMBUGA1UEAxMOaWRwLnNvYy5jYXMuY3owggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCb17jsUD7gY8vMDwIgjf3Gc8HIGatp
-dVo0qPKs2kIwbOpNxtfiK3QFGoj6zFNcCbDXwcRJM/2AqrMRAj+WgnHQrjctYB5o
-400kvDKluqce92qZI0luJzxBZR1UVeC5gSy8JUd6rorDYqNDcXyl8Mb1iutbxids
-87Pb+SOpSurSC5LE0hy24WFQnkAf2rZneZD4iH6E6kNTDJIf9rTyavwjeIGpSNd+
-8BjD8Qj4bcxm6VPGrB++LVYNgn4Ml7dU4KoLf51tfeeP8u0Z8xfSXkus+LKlaVTc
-J4GZJ2Ey6Lk14yV69ymgGtJPc59xINg7GkE4BudWhqAROnt+P3olyTA/AgMBAAGj
-YzBhMEAGA1UdEQQ5MDeCDmlkcC5zb2MuY2FzLmN6hiVodHRwczovL2lkcC5zb2Mu
-Y2FzLmN6L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBTA+sWvwXfF656DdVRMXO8T
-QkaZQjANBgkqhkiG9w0BAQUFAAOCAQEAYYB87sKunI6qPwmASoXHNGDyUhqiGOs6
-jZBxKmcJdoeQMWvjBuQ4kRUo/F8MedGeEYnLkmmN4tMBtQH5FK6dAHDuhkLNXR5Q
-G3DrhuVv4F8kBTkee/6Buhd0mF/+XMcWaY7GIvnDH6bNIdTfO8EbjvuHRlr+ggVc
-xET2sHeYcwo+slmPebr/5fOYzpaE3ypqNyyTfiz44HQOAsOz7SL6t3wBTexdDlB3
-O7+c6VYyjsE8KPx9JoSjkoD05nPA06Irj0aAXPUrTHXk0UaFU8uHGzh06u/mtlVK
-IaV6L2n5KTVFbtfvJSuGFGB/t3VqhVLT7svoSLCvwetSHRXNmlLnqg==
-
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.soc.cas.cz:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.soc.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.soc.cas.cz/idp/profile/SAML2/Redirect/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.soc.cas.cz/idp/profile/SAML2/POST/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.soc.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.soc.cas.cz/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.soc.cas.cz/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.soc.cas.cz/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.soc.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">soc.cas.cz</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDJDCCAgygAwIBAgIVALbz3ZMe+jLBrE4lIU9+JcxfX6G1MA0GCSqGSIb3DQEB
-BQUAMBkxFzAVBgNVBAMTDmlkcC5zb2MuY2FzLmN6MB4XDTE0MDYwNDA3NTk0N1oX
-DTM0MDYwNDA3NTk0N1owGTEXMBUGA1UEAxMOaWRwLnNvYy5jYXMuY3owggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCb17jsUD7gY8vMDwIgjf3Gc8HIGatp
-dVo0qPKs2kIwbOpNxtfiK3QFGoj6zFNcCbDXwcRJM/2AqrMRAj+WgnHQrjctYB5o
-400kvDKluqce92qZI0luJzxBZR1UVeC5gSy8JUd6rorDYqNDcXyl8Mb1iutbxids
-87Pb+SOpSurSC5LE0hy24WFQnkAf2rZneZD4iH6E6kNTDJIf9rTyavwjeIGpSNd+
-8BjD8Qj4bcxm6VPGrB++LVYNgn4Ml7dU4KoLf51tfeeP8u0Z8xfSXkus+LKlaVTc
-J4GZJ2Ey6Lk14yV69ymgGtJPc59xINg7GkE4BudWhqAROnt+P3olyTA/AgMBAAGj
-YzBhMEAGA1UdEQQ5MDeCDmlkcC5zb2MuY2FzLmN6hiVodHRwczovL2lkcC5zb2Mu
-Y2FzLmN6L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBTA+sWvwXfF656DdVRMXO8T
-QkaZQjANBgkqhkiG9w0BAQUFAAOCAQEAYYB87sKunI6qPwmASoXHNGDyUhqiGOs6
-jZBxKmcJdoeQMWvjBuQ4kRUo/F8MedGeEYnLkmmN4tMBtQH5FK6dAHDuhkLNXR5Q
-G3DrhuVv4F8kBTkee/6Buhd0mF/+XMcWaY7GIvnDH6bNIdTfO8EbjvuHRlr+ggVc
-xET2sHeYcwo+slmPebr/5fOYzpaE3ypqNyyTfiz44HQOAsOz7SL6t3wBTexdDlB3
-O7+c6VYyjsE8KPx9JoSjkoD05nPA06Irj0aAXPUrTHXk0UaFU8uHGzh06u/mtlVK
-IaV6L2n5KTVFbtfvJSuGFGB/t3VqhVLT7svoSLCvwetSHRXNmlLnqg==
-
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.soc.cas.cz:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.soc.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 Sociology of the Academy of Sciences of the Czech Republic</OrganizationName>
-    <OrganizationName xml:lang="cs">Sociologický ústav AV ČR</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Institute of Sociology, Public Research Institution</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="cs">Sociologický ústav AV ČR, v.v.i.</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.soc.cas.cz/</OrganizationURL>
-    <OrganizationURL xml:lang="cs">http://www.soc.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.ssc.cas.cz-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.ssc.cas.cz-idp-shibboleth.xml
deleted file mode 100644
index d3ab96b9..00000000
--- a/swamid-interfederations-2.0/idp.ssc.cas.cz-idp-shibboleth.xml
+++ /dev/null
@@ -1,118 +0,0 @@
-<?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/" registrationInstant="2014-03-06T11:08:18Z">
-      <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>
-    <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://eduid.cz/uri/idp-group/avcr</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>
-      <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">Centre of Administration and Operations of AS CR</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="cs">Středisko společných činností 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.ssc.cas.cz.xml b/swamid-interfederations-2.0/idp.ssc.cas.cz.xml
deleted file mode 100644
index d3ab96b9..00000000
--- a/swamid-interfederations-2.0/idp.ssc.cas.cz.xml
+++ /dev/null
@@ -1,118 +0,0 @@
-<?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/" registrationInstant="2014-03-06T11:08:18Z">
-      <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>
-    <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://eduid.cz/uri/idp-group/avcr</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>
-      <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">Centre of Administration and Operations of AS CR</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="cs">Středisko společných činností 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.sssup.it-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.sssup.it-idp-shibboleth.xml
deleted file mode 100644
index 9413ddc5..00000000
--- a/swamid-interfederations-2.0/idp.sssup.it-idp-shibboleth.xml
+++ /dev/null
@@ -1,101 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" entityID="https://idp.sssup.it/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2014-10-08T10:30:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</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">sssup.it</shibmd:Scope>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="en">Scuola Superiore Sant'Anna</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="it">Scuola Superiore Sant'Anna</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Identity provider for Scuola Superiore Sant'Anna users</mdui:Description>
-        <mdui:Description xml:lang="it">Identity provider per gli utenti della Scuola Superiore Sant'Anna</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.sssup.it/idem/idem.en.html</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="it">http://www.sssup.it/idem/idem.html</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">http://www.sssup.it/idem/privacy.en.html</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="it">http://www.sssup.it/idem/privacy.html</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDGzCCAgOgAwIBAgIUZ0H4Pz2dfwqiTQgEDudEffWgc8gwDQYJKoZIhvcNAQEF
-BQAwFzEVMBMGA1UEAxMMaWRwLnNzc3VwLml0MB4XDTEwMDUxMTExMzAyMFoXDTMw
-MDUxMTExMzAyMFowFzEVMBMGA1UEAxMMaWRwLnNzc3VwLml0MIIBIjANBgkqhkiG
-9w0BAQEFAAOCAQ8AMIIBCgKCAQEAjmtnry6/PMlG+TnohAUy1szeBK2LtInYyhAV
-62GVLtgRj91lu+Ylv1DoVM/W+/F5qqDivYFepFH/ROaBxYnGIQPN9hbIQWW6y+2u
-a4SN8MsC2NF5TGt4hOa558TDXy8AvrN1XWYavVxyZnCFbUG7xnvaksHgn8r+EqXa
-33t3g27DCqr8gZ2mKL4DdqMEqYaWYFvQcsSGFI7R7k2FlpwrkN0XV0J6sJziw7NX
-xMMyPEzSA+hWf9MNPqfSPq+IXyRwJLChGGbKAnVHmNFP0uAi30rNoTWaniHoeHrj
-/QxNpIE+bFarIxmSm03CTCtPUhOUHScz3WHWNp5RF6Af3GnWcwIDAQABo18wXTA8
-BgNVHREENTAzggxpZHAuc3NzdXAuaXSGI2h0dHBzOi8vaWRwLnNzc3VwLml0L2lk
-cC9zaGliYm9sZXRoMB0GA1UdDgQWBBQBxI1S8NHoUaJu90/HWsDurxXT6zANBgkq
-hkiG9w0BAQUFAAOCAQEAUaTYopotKd4yJbt9MzZJwBS0NBQRrNkADwWSZ6ztfRTf
-Pbf5ZaDncxgw5GKdJZVY2VXkdSubhgBd0OPH37ah8iqeMftj7W6R+MVrd8v+Snv6
-Rfw6VfKlWgbHOchBj9qVJeXYMlxME7fKrhLcgzEV3xcsv/o5Li3GGBd4H+ybQMI7
-eKmkLMLVatoixFReLXPIiqVo79MkEVyVGlrK4dYrOJcJ594hstk9F3vcdY/U42LP
-AewSvVJLiwSwBXI+SE51+MTKSLnFgaysxCtFXAaO/yD62zA24gn7zju09SpRaRug
-O2Tf736AClLCgVeKQWYHIWrtjstpgmVbC1kZC/7hrA==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.sssup.it:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.sssup.it: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.sssup.it/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.sssup.it/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.sssup.it/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.sssup.it/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">sssup.it</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDGzCCAgOgAwIBAgIUZ0H4Pz2dfwqiTQgEDudEffWgc8gwDQYJKoZIhvcNAQEF
-BQAwFzEVMBMGA1UEAxMMaWRwLnNzc3VwLml0MB4XDTEwMDUxMTExMzAyMFoXDTMw
-MDUxMTExMzAyMFowFzEVMBMGA1UEAxMMaWRwLnNzc3VwLml0MIIBIjANBgkqhkiG
-9w0BAQEFAAOCAQ8AMIIBCgKCAQEAjmtnry6/PMlG+TnohAUy1szeBK2LtInYyhAV
-62GVLtgRj91lu+Ylv1DoVM/W+/F5qqDivYFepFH/ROaBxYnGIQPN9hbIQWW6y+2u
-a4SN8MsC2NF5TGt4hOa558TDXy8AvrN1XWYavVxyZnCFbUG7xnvaksHgn8r+EqXa
-33t3g27DCqr8gZ2mKL4DdqMEqYaWYFvQcsSGFI7R7k2FlpwrkN0XV0J6sJziw7NX
-xMMyPEzSA+hWf9MNPqfSPq+IXyRwJLChGGbKAnVHmNFP0uAi30rNoTWaniHoeHrj
-/QxNpIE+bFarIxmSm03CTCtPUhOUHScz3WHWNp5RF6Af3GnWcwIDAQABo18wXTA8
-BgNVHREENTAzggxpZHAuc3NzdXAuaXSGI2h0dHBzOi8vaWRwLnNzc3VwLml0L2lk
-cC9zaGliYm9sZXRoMB0GA1UdDgQWBBQBxI1S8NHoUaJu90/HWsDurxXT6zANBgkq
-hkiG9w0BAQUFAAOCAQEAUaTYopotKd4yJbt9MzZJwBS0NBQRrNkADwWSZ6ztfRTf
-Pbf5ZaDncxgw5GKdJZVY2VXkdSubhgBd0OPH37ah8iqeMftj7W6R+MVrd8v+Snv6
-Rfw6VfKlWgbHOchBj9qVJeXYMlxME7fKrhLcgzEV3xcsv/o5Li3GGBd4H+ybQMI7
-eKmkLMLVatoixFReLXPIiqVo79MkEVyVGlrK4dYrOJcJ594hstk9F3vcdY/U42LP
-AewSvVJLiwSwBXI+SE51+MTKSLnFgaysxCtFXAaO/yD62zA24gn7zju09SpRaRug
-O2Tf736AClLCgVeKQWYHIWrtjstpgmVbC1kZC/7hrA==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.sssup.it:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.sssup.it: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">Scuola Superiore Sant'Anna di Studi Universitari e di Perfezionamento</OrganizationName>
-    <OrganizationName xml:lang="it">Scuola Superiore Sant'Anna di Studi Universitari e di Perfezionamento</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Scuola Superiore Sant'Anna</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="it">Scuola Superiore Sant'Anna</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.santannaschool.eu</OrganizationURL>
-    <OrganizationURL xml:lang="it">http://www.sssup.it</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <EmailAddress>helpdesk@sssup.it</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.sssup.it.xml b/swamid-interfederations-2.0/idp.sssup.it.xml
deleted file mode 100644
index 9413ddc5..00000000
--- a/swamid-interfederations-2.0/idp.sssup.it.xml
+++ /dev/null
@@ -1,101 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" entityID="https://idp.sssup.it/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2014-10-08T10:30:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</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">sssup.it</shibmd:Scope>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="en">Scuola Superiore Sant'Anna</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="it">Scuola Superiore Sant'Anna</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Identity provider for Scuola Superiore Sant'Anna users</mdui:Description>
-        <mdui:Description xml:lang="it">Identity provider per gli utenti della Scuola Superiore Sant'Anna</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.sssup.it/idem/idem.en.html</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="it">http://www.sssup.it/idem/idem.html</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">http://www.sssup.it/idem/privacy.en.html</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="it">http://www.sssup.it/idem/privacy.html</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDGzCCAgOgAwIBAgIUZ0H4Pz2dfwqiTQgEDudEffWgc8gwDQYJKoZIhvcNAQEF
-BQAwFzEVMBMGA1UEAxMMaWRwLnNzc3VwLml0MB4XDTEwMDUxMTExMzAyMFoXDTMw
-MDUxMTExMzAyMFowFzEVMBMGA1UEAxMMaWRwLnNzc3VwLml0MIIBIjANBgkqhkiG
-9w0BAQEFAAOCAQ8AMIIBCgKCAQEAjmtnry6/PMlG+TnohAUy1szeBK2LtInYyhAV
-62GVLtgRj91lu+Ylv1DoVM/W+/F5qqDivYFepFH/ROaBxYnGIQPN9hbIQWW6y+2u
-a4SN8MsC2NF5TGt4hOa558TDXy8AvrN1XWYavVxyZnCFbUG7xnvaksHgn8r+EqXa
-33t3g27DCqr8gZ2mKL4DdqMEqYaWYFvQcsSGFI7R7k2FlpwrkN0XV0J6sJziw7NX
-xMMyPEzSA+hWf9MNPqfSPq+IXyRwJLChGGbKAnVHmNFP0uAi30rNoTWaniHoeHrj
-/QxNpIE+bFarIxmSm03CTCtPUhOUHScz3WHWNp5RF6Af3GnWcwIDAQABo18wXTA8
-BgNVHREENTAzggxpZHAuc3NzdXAuaXSGI2h0dHBzOi8vaWRwLnNzc3VwLml0L2lk
-cC9zaGliYm9sZXRoMB0GA1UdDgQWBBQBxI1S8NHoUaJu90/HWsDurxXT6zANBgkq
-hkiG9w0BAQUFAAOCAQEAUaTYopotKd4yJbt9MzZJwBS0NBQRrNkADwWSZ6ztfRTf
-Pbf5ZaDncxgw5GKdJZVY2VXkdSubhgBd0OPH37ah8iqeMftj7W6R+MVrd8v+Snv6
-Rfw6VfKlWgbHOchBj9qVJeXYMlxME7fKrhLcgzEV3xcsv/o5Li3GGBd4H+ybQMI7
-eKmkLMLVatoixFReLXPIiqVo79MkEVyVGlrK4dYrOJcJ594hstk9F3vcdY/U42LP
-AewSvVJLiwSwBXI+SE51+MTKSLnFgaysxCtFXAaO/yD62zA24gn7zju09SpRaRug
-O2Tf736AClLCgVeKQWYHIWrtjstpgmVbC1kZC/7hrA==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.sssup.it:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.sssup.it: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.sssup.it/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.sssup.it/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.sssup.it/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.sssup.it/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">sssup.it</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDGzCCAgOgAwIBAgIUZ0H4Pz2dfwqiTQgEDudEffWgc8gwDQYJKoZIhvcNAQEF
-BQAwFzEVMBMGA1UEAxMMaWRwLnNzc3VwLml0MB4XDTEwMDUxMTExMzAyMFoXDTMw
-MDUxMTExMzAyMFowFzEVMBMGA1UEAxMMaWRwLnNzc3VwLml0MIIBIjANBgkqhkiG
-9w0BAQEFAAOCAQ8AMIIBCgKCAQEAjmtnry6/PMlG+TnohAUy1szeBK2LtInYyhAV
-62GVLtgRj91lu+Ylv1DoVM/W+/F5qqDivYFepFH/ROaBxYnGIQPN9hbIQWW6y+2u
-a4SN8MsC2NF5TGt4hOa558TDXy8AvrN1XWYavVxyZnCFbUG7xnvaksHgn8r+EqXa
-33t3g27DCqr8gZ2mKL4DdqMEqYaWYFvQcsSGFI7R7k2FlpwrkN0XV0J6sJziw7NX
-xMMyPEzSA+hWf9MNPqfSPq+IXyRwJLChGGbKAnVHmNFP0uAi30rNoTWaniHoeHrj
-/QxNpIE+bFarIxmSm03CTCtPUhOUHScz3WHWNp5RF6Af3GnWcwIDAQABo18wXTA8
-BgNVHREENTAzggxpZHAuc3NzdXAuaXSGI2h0dHBzOi8vaWRwLnNzc3VwLml0L2lk
-cC9zaGliYm9sZXRoMB0GA1UdDgQWBBQBxI1S8NHoUaJu90/HWsDurxXT6zANBgkq
-hkiG9w0BAQUFAAOCAQEAUaTYopotKd4yJbt9MzZJwBS0NBQRrNkADwWSZ6ztfRTf
-Pbf5ZaDncxgw5GKdJZVY2VXkdSubhgBd0OPH37ah8iqeMftj7W6R+MVrd8v+Snv6
-Rfw6VfKlWgbHOchBj9qVJeXYMlxME7fKrhLcgzEV3xcsv/o5Li3GGBd4H+ybQMI7
-eKmkLMLVatoixFReLXPIiqVo79MkEVyVGlrK4dYrOJcJ594hstk9F3vcdY/U42LP
-AewSvVJLiwSwBXI+SE51+MTKSLnFgaysxCtFXAaO/yD62zA24gn7zju09SpRaRug
-O2Tf736AClLCgVeKQWYHIWrtjstpgmVbC1kZC/7hrA==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.sssup.it:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.sssup.it: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">Scuola Superiore Sant'Anna di Studi Universitari e di Perfezionamento</OrganizationName>
-    <OrganizationName xml:lang="it">Scuola Superiore Sant'Anna di Studi Universitari e di Perfezionamento</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Scuola Superiore Sant'Anna</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="it">Scuola Superiore Sant'Anna</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.santannaschool.eu</OrganizationURL>
-    <OrganizationURL xml:lang="it">http://www.sssup.it</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <EmailAddress>helpdesk@sssup.it</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.strasbourg.archi.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.strasbourg.archi.fr-idp-shibboleth.xml
deleted file mode 100644
index 20b9122a..00000000
--- a/swamid-interfederations-2.0/idp.strasbourg.archi.fr-idp-shibboleth.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://idp.strasbourg.archi.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2014-05-13T15:09:26Z">
-      <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:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">strasbourg.archi.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">ENSA Strasbourg</mdui:DisplayName>
-        <mdui:Description xml:lang="en">ENSAS' students, teachers and staff</mdui:Description>
-        <mdui:DisplayName xml:lang="fr">Ecole Nationale Supérieure d'Architecture de Strasbourg</mdui:DisplayName>
-        <mdui:Description xml:lang="fr">Etudiants, enseignants et personnel ATOS de l'ENSAS</mdui:Description>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIEezCCA2OgAwIBAgIQFl8uHwbutP9D8H8eK6oUajANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTE0MDQxNzAwMDAwMFoXDTE3MDQxNjIzNTk1OVowRTEhMB8GA1UE
-CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMSAwHgYDVQQDExdpZHAuc3RyYXNi
-b3VyZy5hcmNoaS5mcjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMEW
-0E5QGJCSB3Ba7fVLIk1yCGEqE26Toca9CPHo6wio489qJYKcvvpcZZmONMEU1uL5
-Z5gCONsRfISTnlZu8R0RJLA4+nFiK3pnl5Qxb8GumPfo4Zy09qq1ldqQZ0aQ5p9l
-eekm9cjui6trtn23gYADfL3lgcdXbkkENvxQiSPC4Wy+TnQHKZzscbTfvPn2YAnD
-zTURuz0egxuJts1IPgfhGpyNL2nXMRJtEAUGAh6hEztZClJU1CZcP+gwfOYc0tdp
-95+rjQ9nl9+ECw+dPA7n4JP9+R3gRmh0hsf1Kwra5UHB97lBoTj6k4DnOJaHKYcW
-thOStNfuJHAy/uzBTr0CAwEAAaOCAXQwggFwMB8GA1UdIwQYMBaAFAy9k2gM896r
-o0lrKzdXR+qQ47ntMB0GA1UdDgQWBBQORU9i5o45EyY7F8g9y3s3qyy+jTAOBgNV
-HQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYI
-KwYBBQUHAwIwIgYDVR0gBBswGTANBgsrBgEEAbIxAQICHTAIBgZngQwBAgEwOgYD
-VR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFT
-U0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0
-LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0
-cDovL29jc3AudGNzLnRlcmVuYS5vcmcwIgYDVR0RBBswGYIXaWRwLnN0cmFzYm91
-cmcuYXJjaGkuZnIwDQYJKoZIhvcNAQEFBQADggEBADcUZO7J6TsDIcHiWvf8Uoyz
-N0XZHA5XAN/AJAphS/Vz7HTLFjXfXrx0Khcg2OLlQyBC4c8h1ns1YZoFa1dvF89H
-neK+NGkypljJSB7V8V4jIH38Y40YRsHo4rh0labd+mQ0vwRXrVdHzSVU//gngaeD
-ICFIMEAht/4ZWBBBgV+WuAq/8l5s+dF5tNpX1mKZaB9n2Id5QqVQGK9vhNzfRhYx
-UZEkRNOijgmcRNgjllmGqE3kD69a7KxcvedRPDRt3bweBdgFw2Gw2hLjYxn4ojMm
-ade38YYscP19cjJ5xgSciH1tHTO7eNq7iirrjgxn9nM1Cxpq716Kv1DwnyFT9IA=
-					    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <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.strasbourg.archi.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.strasbourg.archi.fr/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Ecole Nationale Supérieure d'Architecture de Strasbourg</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Ecole Nationale Supérieure d'Architecture de Strasbourg</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <EmailAddress>informatique@strasbourg.archi.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.strasbourg.archi.fr.xml b/swamid-interfederations-2.0/idp.strasbourg.archi.fr.xml
deleted file mode 100644
index 20b9122a..00000000
--- a/swamid-interfederations-2.0/idp.strasbourg.archi.fr.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://idp.strasbourg.archi.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2014-05-13T15:09:26Z">
-      <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:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">strasbourg.archi.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">ENSA Strasbourg</mdui:DisplayName>
-        <mdui:Description xml:lang="en">ENSAS' students, teachers and staff</mdui:Description>
-        <mdui:DisplayName xml:lang="fr">Ecole Nationale Supérieure d'Architecture de Strasbourg</mdui:DisplayName>
-        <mdui:Description xml:lang="fr">Etudiants, enseignants et personnel ATOS de l'ENSAS</mdui:Description>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIEezCCA2OgAwIBAgIQFl8uHwbutP9D8H8eK6oUajANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTE0MDQxNzAwMDAwMFoXDTE3MDQxNjIzNTk1OVowRTEhMB8GA1UE
-CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMSAwHgYDVQQDExdpZHAuc3RyYXNi
-b3VyZy5hcmNoaS5mcjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMEW
-0E5QGJCSB3Ba7fVLIk1yCGEqE26Toca9CPHo6wio489qJYKcvvpcZZmONMEU1uL5
-Z5gCONsRfISTnlZu8R0RJLA4+nFiK3pnl5Qxb8GumPfo4Zy09qq1ldqQZ0aQ5p9l
-eekm9cjui6trtn23gYADfL3lgcdXbkkENvxQiSPC4Wy+TnQHKZzscbTfvPn2YAnD
-zTURuz0egxuJts1IPgfhGpyNL2nXMRJtEAUGAh6hEztZClJU1CZcP+gwfOYc0tdp
-95+rjQ9nl9+ECw+dPA7n4JP9+R3gRmh0hsf1Kwra5UHB97lBoTj6k4DnOJaHKYcW
-thOStNfuJHAy/uzBTr0CAwEAAaOCAXQwggFwMB8GA1UdIwQYMBaAFAy9k2gM896r
-o0lrKzdXR+qQ47ntMB0GA1UdDgQWBBQORU9i5o45EyY7F8g9y3s3qyy+jTAOBgNV
-HQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYI
-KwYBBQUHAwIwIgYDVR0gBBswGTANBgsrBgEEAbIxAQICHTAIBgZngQwBAgEwOgYD
-VR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFT
-U0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0
-LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0
-cDovL29jc3AudGNzLnRlcmVuYS5vcmcwIgYDVR0RBBswGYIXaWRwLnN0cmFzYm91
-cmcuYXJjaGkuZnIwDQYJKoZIhvcNAQEFBQADggEBADcUZO7J6TsDIcHiWvf8Uoyz
-N0XZHA5XAN/AJAphS/Vz7HTLFjXfXrx0Khcg2OLlQyBC4c8h1ns1YZoFa1dvF89H
-neK+NGkypljJSB7V8V4jIH38Y40YRsHo4rh0labd+mQ0vwRXrVdHzSVU//gngaeD
-ICFIMEAht/4ZWBBBgV+WuAq/8l5s+dF5tNpX1mKZaB9n2Id5QqVQGK9vhNzfRhYx
-UZEkRNOijgmcRNgjllmGqE3kD69a7KxcvedRPDRt3bweBdgFw2Gw2hLjYxn4ojMm
-ade38YYscP19cjJ5xgSciH1tHTO7eNq7iirrjgxn9nM1Cxpq716Kv1DwnyFT9IA=
-					    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <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.strasbourg.archi.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.strasbourg.archi.fr/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Ecole Nationale Supérieure d'Architecture de Strasbourg</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Ecole Nationale Supérieure d'Architecture de Strasbourg</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <EmailAddress>informatique@strasbourg.archi.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.student.bth.se-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.student.bth.se-idp-shibboleth.xml
deleted file mode 100644
index 54eb8c63..00000000
--- a/swamid-interfederations-2.0/idp.student.bth.se-idp-shibboleth.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://idp.student.bth.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">bth.se</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="sv">Blekinge Tekniska Högskola - Studenter</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Blekinge Institute of Technology - Students</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Identity Provider för Blekinge Tekniska Högskola för studenter</mdui:Description>
-        <mdui:Description xml:lang="en">Identity Provider for Blekinge Institute of Technology for students</mdui:Description>
-        <mdui:InformationURL xml:lang="sv">http://www.bth.se</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">http://www.bth.se/eng</mdui:InformationURL>
-        <mdui:Keywords xml:lang="sv">Blekinge+Tekniska+Högskola BTH</mdui:Keywords>
-        <mdui:Keywords xml:lang="en">Blekinge+Tekniska+Högskola BTH</mdui:Keywords>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DomainHint>bth.se</mdui:DomainHint>
-      </mdui:DiscoHints>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDMzCCAhugAwIBAgIUXtEpwm2skeWeBBMWVN7MATD1VK8wDQYJKoZIhvcNAQEF
-BQAwHTEbMBkGA1UEAxMSaWRwLnN0dWRlbnQuYnRoLnNlMB4XDTEwMDgyNTIwMDU0
-OFoXDTMwMDgyNTIwMDU0OFowHTEbMBkGA1UEAxMSaWRwLnN0dWRlbnQuYnRoLnNl
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsO+nW3r0Rzu0ojoCY0Jm
-R/GuN73dy9gDYOtvgwtFJkVdQBuEGDvVYgD4WUzCnSSy5b4EGFwAaBLIfZ4UAL2c
-fWIWJknPrfSxFqR9dLJJo9hkHMX8VBumjhzYHVZqYSm/JVGh4GYewhQmRO0iSG9a
-it5fe6ZyVG67TduhnwzFC8azRSfIgnEjaRGP2qVEiUIbfuiRRr2J88rwxyxrYCa5
-ZVMLjR9wSBRqG8P+00UDolT3Q0lvawF3pj+kEbZ2p+Y6UxZHghHi5EKMkvy1OfKy
-RYkfxXbGk2JEXGcgb3MyRLmdZoqrH0BedH2udrwzOEGUdb/cElqmpFMOyZBdwEVO
-/QIDAQABo2swaTBIBgNVHREEQTA/ghJpZHAuc3R1ZGVudC5idGguc2WGKWh0dHBz
-Oi8vaWRwLnN0dWRlbnQuYnRoLnNlL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBRA
-vpCow9+jy11YKdmATEMN1KY1dTANBgkqhkiG9w0BAQUFAAOCAQEALbZz8voHJMiE
-Tjc7RYskFIOAx7k1fmPsF4kSdPyDK8RkyHBfGHa5uJ9wBh4w5BPCp9Wy7SY5+q/y
-E9tDiISVD0NEU8KQX8u8pC1d4OdfT2x6tn+w3Ww5cNaQ3CUsD+VqefiX6Acr3ssX
-0ahszKKVCL8v7ifCqxr1q2dbABB6GV9iwKHB+vfXLIp2Upt6+y3i5+iC1C8uXul0
-TAimxX3igYDGippzeyBoy+es/c7shtdBfj3y3zhfcz/KKJvXFPVF0lwYsW8n2BM3
-nH4GzdNBUhBostxPfU/hk7XiQOMXNvgHzG2y53Vaa+RZPC45VHuFmyixxGFxktsF
-4NzN1iC8kg==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.student.bth.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.student.bth.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://idp.student.bth.se/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.student.bth.se/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.student.bth.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.student.bth.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">bth.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDMzCCAhugAwIBAgIUXtEpwm2skeWeBBMWVN7MATD1VK8wDQYJKoZIhvcNAQEF
-BQAwHTEbMBkGA1UEAxMSaWRwLnN0dWRlbnQuYnRoLnNlMB4XDTEwMDgyNTIwMDU0
-OFoXDTMwMDgyNTIwMDU0OFowHTEbMBkGA1UEAxMSaWRwLnN0dWRlbnQuYnRoLnNl
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsO+nW3r0Rzu0ojoCY0Jm
-R/GuN73dy9gDYOtvgwtFJkVdQBuEGDvVYgD4WUzCnSSy5b4EGFwAaBLIfZ4UAL2c
-fWIWJknPrfSxFqR9dLJJo9hkHMX8VBumjhzYHVZqYSm/JVGh4GYewhQmRO0iSG9a
-it5fe6ZyVG67TduhnwzFC8azRSfIgnEjaRGP2qVEiUIbfuiRRr2J88rwxyxrYCa5
-ZVMLjR9wSBRqG8P+00UDolT3Q0lvawF3pj+kEbZ2p+Y6UxZHghHi5EKMkvy1OfKy
-RYkfxXbGk2JEXGcgb3MyRLmdZoqrH0BedH2udrwzOEGUdb/cElqmpFMOyZBdwEVO
-/QIDAQABo2swaTBIBgNVHREEQTA/ghJpZHAuc3R1ZGVudC5idGguc2WGKWh0dHBz
-Oi8vaWRwLnN0dWRlbnQuYnRoLnNlL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBRA
-vpCow9+jy11YKdmATEMN1KY1dTANBgkqhkiG9w0BAQUFAAOCAQEALbZz8voHJMiE
-Tjc7RYskFIOAx7k1fmPsF4kSdPyDK8RkyHBfGHa5uJ9wBh4w5BPCp9Wy7SY5+q/y
-E9tDiISVD0NEU8KQX8u8pC1d4OdfT2x6tn+w3Ww5cNaQ3CUsD+VqefiX6Acr3ssX
-0ahszKKVCL8v7ifCqxr1q2dbABB6GV9iwKHB+vfXLIp2Upt6+y3i5+iC1C8uXul0
-TAimxX3igYDGippzeyBoy+es/c7shtdBfj3y3zhfcz/KKJvXFPVF0lwYsW8n2BM3
-nH4GzdNBUhBostxPfU/hk7XiQOMXNvgHzG2y53Vaa+RZPC45VHuFmyixxGFxktsF
-4NzN1iC8kg==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.student.bth.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.student.bth.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">STUDENTS-BTH</OrganizationName>
-    <OrganizationDisplayName xml:lang="sv">Blekinge Tekniska Högskola (Studenter)</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">Blekinge Tekniska Högskola (Studenter)</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.bth.se</OrganizationURL>
-  </Organization>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
-    <Company>Blekinge Institute of Technology - Students</Company>
-    <SurName>IT Help Desk</SurName>
-    <EmailAddress>ithelpdesk@bth.se</EmailAddress>
-    <TelephoneNumber>+46 455 38 51 00</TelephoneNumber>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
-    <Company>Blekinge Institute of Technology - Students</Company>
-    <SurName>IT Help Desk</SurName>
-    <EmailAddress>ithelpdesk@bth.se</EmailAddress>
-    <TelephoneNumber>+46 455 38 51 00</TelephoneNumber>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
-    <Company>Blekinge Institute of Technology - Students</Company>
-    <SurName>IT Help Desk</SurName>
-    <EmailAddress>ithelpdesk@bth.se</EmailAddress>
-    <TelephoneNumber>+46 455 38 51 00</TelephoneNumber>
-  </ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.student.bth.se.xml b/swamid-interfederations-2.0/idp.student.bth.se.xml
deleted file mode 100644
index 54eb8c63..00000000
--- a/swamid-interfederations-2.0/idp.student.bth.se.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://idp.student.bth.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">bth.se</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="sv">Blekinge Tekniska Högskola - Studenter</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Blekinge Institute of Technology - Students</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Identity Provider för Blekinge Tekniska Högskola för studenter</mdui:Description>
-        <mdui:Description xml:lang="en">Identity Provider for Blekinge Institute of Technology for students</mdui:Description>
-        <mdui:InformationURL xml:lang="sv">http://www.bth.se</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">http://www.bth.se/eng</mdui:InformationURL>
-        <mdui:Keywords xml:lang="sv">Blekinge+Tekniska+Högskola BTH</mdui:Keywords>
-        <mdui:Keywords xml:lang="en">Blekinge+Tekniska+Högskola BTH</mdui:Keywords>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DomainHint>bth.se</mdui:DomainHint>
-      </mdui:DiscoHints>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDMzCCAhugAwIBAgIUXtEpwm2skeWeBBMWVN7MATD1VK8wDQYJKoZIhvcNAQEF
-BQAwHTEbMBkGA1UEAxMSaWRwLnN0dWRlbnQuYnRoLnNlMB4XDTEwMDgyNTIwMDU0
-OFoXDTMwMDgyNTIwMDU0OFowHTEbMBkGA1UEAxMSaWRwLnN0dWRlbnQuYnRoLnNl
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsO+nW3r0Rzu0ojoCY0Jm
-R/GuN73dy9gDYOtvgwtFJkVdQBuEGDvVYgD4WUzCnSSy5b4EGFwAaBLIfZ4UAL2c
-fWIWJknPrfSxFqR9dLJJo9hkHMX8VBumjhzYHVZqYSm/JVGh4GYewhQmRO0iSG9a
-it5fe6ZyVG67TduhnwzFC8azRSfIgnEjaRGP2qVEiUIbfuiRRr2J88rwxyxrYCa5
-ZVMLjR9wSBRqG8P+00UDolT3Q0lvawF3pj+kEbZ2p+Y6UxZHghHi5EKMkvy1OfKy
-RYkfxXbGk2JEXGcgb3MyRLmdZoqrH0BedH2udrwzOEGUdb/cElqmpFMOyZBdwEVO
-/QIDAQABo2swaTBIBgNVHREEQTA/ghJpZHAuc3R1ZGVudC5idGguc2WGKWh0dHBz
-Oi8vaWRwLnN0dWRlbnQuYnRoLnNlL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBRA
-vpCow9+jy11YKdmATEMN1KY1dTANBgkqhkiG9w0BAQUFAAOCAQEALbZz8voHJMiE
-Tjc7RYskFIOAx7k1fmPsF4kSdPyDK8RkyHBfGHa5uJ9wBh4w5BPCp9Wy7SY5+q/y
-E9tDiISVD0NEU8KQX8u8pC1d4OdfT2x6tn+w3Ww5cNaQ3CUsD+VqefiX6Acr3ssX
-0ahszKKVCL8v7ifCqxr1q2dbABB6GV9iwKHB+vfXLIp2Upt6+y3i5+iC1C8uXul0
-TAimxX3igYDGippzeyBoy+es/c7shtdBfj3y3zhfcz/KKJvXFPVF0lwYsW8n2BM3
-nH4GzdNBUhBostxPfU/hk7XiQOMXNvgHzG2y53Vaa+RZPC45VHuFmyixxGFxktsF
-4NzN1iC8kg==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.student.bth.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.student.bth.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://idp.student.bth.se/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.student.bth.se/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.student.bth.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.student.bth.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">bth.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDMzCCAhugAwIBAgIUXtEpwm2skeWeBBMWVN7MATD1VK8wDQYJKoZIhvcNAQEF
-BQAwHTEbMBkGA1UEAxMSaWRwLnN0dWRlbnQuYnRoLnNlMB4XDTEwMDgyNTIwMDU0
-OFoXDTMwMDgyNTIwMDU0OFowHTEbMBkGA1UEAxMSaWRwLnN0dWRlbnQuYnRoLnNl
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsO+nW3r0Rzu0ojoCY0Jm
-R/GuN73dy9gDYOtvgwtFJkVdQBuEGDvVYgD4WUzCnSSy5b4EGFwAaBLIfZ4UAL2c
-fWIWJknPrfSxFqR9dLJJo9hkHMX8VBumjhzYHVZqYSm/JVGh4GYewhQmRO0iSG9a
-it5fe6ZyVG67TduhnwzFC8azRSfIgnEjaRGP2qVEiUIbfuiRRr2J88rwxyxrYCa5
-ZVMLjR9wSBRqG8P+00UDolT3Q0lvawF3pj+kEbZ2p+Y6UxZHghHi5EKMkvy1OfKy
-RYkfxXbGk2JEXGcgb3MyRLmdZoqrH0BedH2udrwzOEGUdb/cElqmpFMOyZBdwEVO
-/QIDAQABo2swaTBIBgNVHREEQTA/ghJpZHAuc3R1ZGVudC5idGguc2WGKWh0dHBz
-Oi8vaWRwLnN0dWRlbnQuYnRoLnNlL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBRA
-vpCow9+jy11YKdmATEMN1KY1dTANBgkqhkiG9w0BAQUFAAOCAQEALbZz8voHJMiE
-Tjc7RYskFIOAx7k1fmPsF4kSdPyDK8RkyHBfGHa5uJ9wBh4w5BPCp9Wy7SY5+q/y
-E9tDiISVD0NEU8KQX8u8pC1d4OdfT2x6tn+w3Ww5cNaQ3CUsD+VqefiX6Acr3ssX
-0ahszKKVCL8v7ifCqxr1q2dbABB6GV9iwKHB+vfXLIp2Upt6+y3i5+iC1C8uXul0
-TAimxX3igYDGippzeyBoy+es/c7shtdBfj3y3zhfcz/KKJvXFPVF0lwYsW8n2BM3
-nH4GzdNBUhBostxPfU/hk7XiQOMXNvgHzG2y53Vaa+RZPC45VHuFmyixxGFxktsF
-4NzN1iC8kg==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.student.bth.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.student.bth.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">STUDENTS-BTH</OrganizationName>
-    <OrganizationDisplayName xml:lang="sv">Blekinge Tekniska Högskola (Studenter)</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">Blekinge Tekniska Högskola (Studenter)</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.bth.se</OrganizationURL>
-  </Organization>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
-    <Company>Blekinge Institute of Technology - Students</Company>
-    <SurName>IT Help Desk</SurName>
-    <EmailAddress>ithelpdesk@bth.se</EmailAddress>
-    <TelephoneNumber>+46 455 38 51 00</TelephoneNumber>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
-    <Company>Blekinge Institute of Technology - Students</Company>
-    <SurName>IT Help Desk</SurName>
-    <EmailAddress>ithelpdesk@bth.se</EmailAddress>
-    <TelephoneNumber>+46 455 38 51 00</TelephoneNumber>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
-    <Company>Blekinge Institute of Technology - Students</Company>
-    <SurName>IT Help Desk</SurName>
-    <EmailAddress>ithelpdesk@bth.se</EmailAddress>
-    <TelephoneNumber>+46 455 38 51 00</TelephoneNumber>
-  </ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.surfnet.nl.xml b/swamid-interfederations-2.0/idp.surfnet.nl.xml
deleted file mode 100644
index 52cc20e7..00000000
--- a/swamid-interfederations-2.0/idp.surfnet.nl.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" entityID="https://idp.surfnet.nl">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.surfconext.nl/" registrationInstant="2011-06-08T00:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://wiki.surfnetlabs.nl/display/eduGAIN/EduGAIN</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </md:Extensions>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">surfnet.nl</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="nl">SURFnet bv</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">SURFnet bv</mdui:DisplayName>
-        <mdui:Description xml:lang="nl">SURFnet bv</mdui:Description>
-        <mdui:Description xml:lang="en">SURFnet bv</mdui:Description>
-        <mdui:Logo height="44" width="108">https://static.surfconext.nl/media/idp/surfnet.png</mdui:Logo>
-        <mdui:Keywords xml:lang="nl">SURFnet bv SURF konijn powered by</mdui:Keywords>
-        <mdui:Keywords xml:lang="en">SURFnet bv SURF konijn surf surfnet powered by</mdui:Keywords>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor xmlns:ds="http://www.w3.org/2000/09/xmldsig#" use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIID3zCCAsegAwIBAgIJAMVC9xn1ZfsuMA0GCSqGSIb3DQEBCwUAMIGFMQswCQYD
-VQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMG
-A1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQD
-DB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTAeFw0xNDA1MDUxNDIyMzVa
-Fw0xOTA1MDUxNDIyMzVaMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNo
-dDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYD
-VQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAy
-MDE0MDUwNTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKthMDbB0jKH
-efPzmRu9t2h7iLP4wAXr42bHpjzTEk6gttHFb4l/hFiz1YBI88TjiH6hVjnozo/Y
-HA2c51us+Y7g0XoS7653lbUN/EHzvDMuyis4Xi2Ijf1A/OUQfH1iFUWttIgtWK9+
-fatXoGUS6tirQvrzVh6ZstEp1xbpo1SF6UoVl+fh7tM81qz+Crr/Kroan0UjpZOF
-TwxPoK6fdLgMAieKSCRmBGpbJHbQ2xxbdykBBrBbdfzIX4CDepfjE9h/40ldw5jR
-n3e392jrS6htk23N9BWWrpBT5QCk0kH3h/6F1Dm6TkyG9CDtt73/anuRkvXbeygI
-4wml9bL3rE8CAwEAAaNQME4wHQYDVR0OBBYEFD+Ac7akFxaMhBQAjVfvgGfY8hNK
-MB8GA1UdIwQYMBaAFD+Ac7akFxaMhBQAjVfvgGfY8hNKMAwGA1UdEwQFMAMBAf8w
-DQYJKoZIhvcNAQELBQADggEBAC8L9D67CxIhGo5aGVu63WqRHBNOdo/FAGI7LURD
-FeRmG5nRw/VXzJLGJksh4FSkx7aPrxNWF1uFiDZ80EuYQuIv7bDLblK31ZEbdg1R
-9LgiZCdYSr464I7yXQY9o6FiNtSKZkQO8EsscJPPy/Zp4uHAnADWACkOUHiCbcKi
-UUFu66dX0Wr/v53Gekz487GgVRs8HEeT9MU1reBKRgdENR8PNg4rbQfLc3YQKLWK
-7yWnn/RenjDpuCiePj8N8/80tGgrNgK/6fzM3zI18sSywnXLswxqDb/J+jgVxnQ6
-MrsTf1urM8MnfcxG/82oHIwfMh/sXPCZpo+DTLkhQxctJ3M=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:NameIDFormat xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:NameIDFormat xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">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://engine.surfconext.nl/authentication/idp/single-sign-on/ba573f07093978e3852ddef0d2465b84"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">SURFnet bv</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">SURFnet bv</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.surfnet.nl/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>SURFconext-beheer</md:GivenName>
-    <md:EmailAddress>SURFconext-beheer@surfnet.nl</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>SURFconext-beheer</md:GivenName>
-    <md:EmailAddress>SURFconext-beheer@surfnet.nl</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>SURFconext support</md:GivenName>
-    <md:EmailAddress>help@surfconext.nl</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.sze.hu-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.sze.hu-idp-shibboleth.xml
deleted file mode 100644
index 64358877..00000000
--- a/swamid-interfederations-2.0/idp.sze.hu-idp-shibboleth.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://idp.sze.hu/idp/shibboleth">
-  <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">sze</ns9:MetadataSet>
-    <ns9:MetadataSet xmlns:ns9="urn:geant:niif.hu:eduid.hu:entity-attributes:processing-info">href-idps</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">sze.hu</shibmd:Scope>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-        <mdui:DisplayName xml:lang="hu">Széchenyi István Egyetem</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Széchenyi István University</mdui:DisplayName>
-        <mdui:Description xml:lang="hu">Széchenyi István Egyetem</mdui:Description>
-        <mdui:Description xml:lang="en">Széchenyi István University</mdui:Description>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDFDCCAfygAwIBAgIVAOdmgiuOmsyG0E988guPIMBUjJtTMA0GCSqGSIb3DQEBBQUAMBUxEzARBgNVBAMTCmlkcC5zemUuaHUwHhcNMTEwNTA1MDg0ODAxWhcNMzEwNTA1MDg0ODAxWjAVMRMwEQYDVQQDEwppZHAuc3plLmh1MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApcyXIVSgRNHxWV+T1wJwWoGT5tIcb90UUX+US7PT8pT9OjTj8Ihx1UW6nVWwf2VhSwYoRGrDkzPKwSd6mDbmQr1fmlxPRByxJw1jJWY3Qz4lVEazNK7WDlNswqxQdDNjS/iQOMYAj9s4SerZGnNLuhIQM7DSh2dxpyidGyjJouhqq3cqpzUk/5WEcoUblXhJlX22iCBeSjay7MzVoIHfSSaWCeQCD4hEScQDDfJXSDOF9edhOCogA51eMZR/j/HzvP+G0E7E4v25HUKl1r2a+/wSRziv5v4b79B0pwwEQzQ7Riq8kCyxJRRF2BRj0eGNaoC2aM8nh+u7UxqVqlP8nQIDAQABo1swWTA4BgNVHREEMTAvggppZHAuc3plLmh1hiFodHRwczovL2lkcC5zemUuaHUvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFLEnpKVtW3BAbuNKj5XjDx4dgkpCMA0GCSqGSIb3DQEBBQUAA4IBAQAwn6lCoBZp10wWRdbxDffHh19pPhdV21WqA2PmdfHcoQMVKQyZJEUsjYr6CDdf/IvTAnm4rS9pLPJYR/OH+5Qbmaxh3fnrloC31V5m4grHjtC3vpdopzXKq0ybme0lyT/nx/bgjrWg+TEEc5BRNr0maOARkbhd3pmY6Cf5xY0IgdoNmmXyL74V/ZRa7RtjFMyDJvDXdrpv4ltJEh6x+Obn9AHspTBfOOGLVeNOmP+jxQARDoqbuRLrOSuW+Ic/02Yf5OzC2P/EXX4ZgKla1bfKGxI3tL/aEzSL4TUXsy/FLdnWt3YnUqjG5yWCQ9QnXtlAO1oCYYabYMKqmVcBQAYg</ds:X509Certificate>
-        </ds:X509Data>
-        <ds:KeyName>idp.sze.hu</ds:KeyName>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.sze.hu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.sze.hu/idp/profile/SAML2/Redirect/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.sze.hu/idp/profile/SAML2/POST/SLO"/>
-    <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.sze.hu/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.sze.hu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.sze.hu/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sze.hu</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDFDCCAfygAwIBAgIVAOdmgiuOmsyG0E988guPIMBUjJtTMA0GCSqGSIb3DQEBBQUAMBUxEzARBgNVBAMTCmlkcC5zemUuaHUwHhcNMTEwNTA1MDg0ODAxWhcNMzEwNTA1MDg0ODAxWjAVMRMwEQYDVQQDEwppZHAuc3plLmh1MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApcyXIVSgRNHxWV+T1wJwWoGT5tIcb90UUX+US7PT8pT9OjTj8Ihx1UW6nVWwf2VhSwYoRGrDkzPKwSd6mDbmQr1fmlxPRByxJw1jJWY3Qz4lVEazNK7WDlNswqxQdDNjS/iQOMYAj9s4SerZGnNLuhIQM7DSh2dxpyidGyjJouhqq3cqpzUk/5WEcoUblXhJlX22iCBeSjay7MzVoIHfSSaWCeQCD4hEScQDDfJXSDOF9edhOCogA51eMZR/j/HzvP+G0E7E4v25HUKl1r2a+/wSRziv5v4b79B0pwwEQzQ7Riq8kCyxJRRF2BRj0eGNaoC2aM8nh+u7UxqVqlP8nQIDAQABo1swWTA4BgNVHREEMTAvggppZHAuc3plLmh1hiFodHRwczovL2lkcC5zemUuaHUvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFLEnpKVtW3BAbuNKj5XjDx4dgkpCMA0GCSqGSIb3DQEBBQUAA4IBAQAwn6lCoBZp10wWRdbxDffHh19pPhdV21WqA2PmdfHcoQMVKQyZJEUsjYr6CDdf/IvTAnm4rS9pLPJYR/OH+5Qbmaxh3fnrloC31V5m4grHjtC3vpdopzXKq0ybme0lyT/nx/bgjrWg+TEEc5BRNr0maOARkbhd3pmY6Cf5xY0IgdoNmmXyL74V/ZRa7RtjFMyDJvDXdrpv4ltJEh6x+Obn9AHspTBfOOGLVeNOmP+jxQARDoqbuRLrOSuW+Ic/02Yf5OzC2P/EXX4ZgKla1bfKGxI3tL/aEzSL4TUXsy/FLdnWt3YnUqjG5yWCQ9QnXtlAO1oCYYabYMKqmVcBQAYg</ds:X509Certificate>
-        </ds:X509Data>
-        <ds:KeyName>idp.sze.hu</ds:KeyName>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.sze.hu: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="hu">Széchenyi István Egyetem</OrganizationName>
-    <OrganizationName xml:lang="en">Széchenyi István University</OrganizationName>
-    <OrganizationDisplayName xml:lang="hu">Széchenyi István Egyetem</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">Széchenyi István University</OrganizationDisplayName>
-    <OrganizationURL xml:lang="hu">http://www.sze.hu</OrganizationURL>
-    <OrganizationURL xml:lang="en">http://www.sze.hu</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Csábi Béla</SurName>
-    <EmailAddress>mailto:csabi@sze.hu</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="support">
-    <SurName>Csábi Béla</SurName>
-    <EmailAddress>mailto:csabi@sze.hu</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="administrative">
-    <SurName>Csábi Béla</SurName>
-    <EmailAddress>mailto:csabi@sze.hu</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.sze.hu.xml b/swamid-interfederations-2.0/idp.sze.hu.xml
deleted file mode 100644
index 64358877..00000000
--- a/swamid-interfederations-2.0/idp.sze.hu.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://idp.sze.hu/idp/shibboleth">
-  <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">sze</ns9:MetadataSet>
-    <ns9:MetadataSet xmlns:ns9="urn:geant:niif.hu:eduid.hu:entity-attributes:processing-info">href-idps</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">sze.hu</shibmd:Scope>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-        <mdui:DisplayName xml:lang="hu">Széchenyi István Egyetem</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Széchenyi István University</mdui:DisplayName>
-        <mdui:Description xml:lang="hu">Széchenyi István Egyetem</mdui:Description>
-        <mdui:Description xml:lang="en">Széchenyi István University</mdui:Description>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDFDCCAfygAwIBAgIVAOdmgiuOmsyG0E988guPIMBUjJtTMA0GCSqGSIb3DQEBBQUAMBUxEzARBgNVBAMTCmlkcC5zemUuaHUwHhcNMTEwNTA1MDg0ODAxWhcNMzEwNTA1MDg0ODAxWjAVMRMwEQYDVQQDEwppZHAuc3plLmh1MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApcyXIVSgRNHxWV+T1wJwWoGT5tIcb90UUX+US7PT8pT9OjTj8Ihx1UW6nVWwf2VhSwYoRGrDkzPKwSd6mDbmQr1fmlxPRByxJw1jJWY3Qz4lVEazNK7WDlNswqxQdDNjS/iQOMYAj9s4SerZGnNLuhIQM7DSh2dxpyidGyjJouhqq3cqpzUk/5WEcoUblXhJlX22iCBeSjay7MzVoIHfSSaWCeQCD4hEScQDDfJXSDOF9edhOCogA51eMZR/j/HzvP+G0E7E4v25HUKl1r2a+/wSRziv5v4b79B0pwwEQzQ7Riq8kCyxJRRF2BRj0eGNaoC2aM8nh+u7UxqVqlP8nQIDAQABo1swWTA4BgNVHREEMTAvggppZHAuc3plLmh1hiFodHRwczovL2lkcC5zemUuaHUvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFLEnpKVtW3BAbuNKj5XjDx4dgkpCMA0GCSqGSIb3DQEBBQUAA4IBAQAwn6lCoBZp10wWRdbxDffHh19pPhdV21WqA2PmdfHcoQMVKQyZJEUsjYr6CDdf/IvTAnm4rS9pLPJYR/OH+5Qbmaxh3fnrloC31V5m4grHjtC3vpdopzXKq0ybme0lyT/nx/bgjrWg+TEEc5BRNr0maOARkbhd3pmY6Cf5xY0IgdoNmmXyL74V/ZRa7RtjFMyDJvDXdrpv4ltJEh6x+Obn9AHspTBfOOGLVeNOmP+jxQARDoqbuRLrOSuW+Ic/02Yf5OzC2P/EXX4ZgKla1bfKGxI3tL/aEzSL4TUXsy/FLdnWt3YnUqjG5yWCQ9QnXtlAO1oCYYabYMKqmVcBQAYg</ds:X509Certificate>
-        </ds:X509Data>
-        <ds:KeyName>idp.sze.hu</ds:KeyName>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.sze.hu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.sze.hu/idp/profile/SAML2/Redirect/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.sze.hu/idp/profile/SAML2/POST/SLO"/>
-    <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.sze.hu/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.sze.hu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.sze.hu/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sze.hu</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDFDCCAfygAwIBAgIVAOdmgiuOmsyG0E988guPIMBUjJtTMA0GCSqGSIb3DQEBBQUAMBUxEzARBgNVBAMTCmlkcC5zemUuaHUwHhcNMTEwNTA1MDg0ODAxWhcNMzEwNTA1MDg0ODAxWjAVMRMwEQYDVQQDEwppZHAuc3plLmh1MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApcyXIVSgRNHxWV+T1wJwWoGT5tIcb90UUX+US7PT8pT9OjTj8Ihx1UW6nVWwf2VhSwYoRGrDkzPKwSd6mDbmQr1fmlxPRByxJw1jJWY3Qz4lVEazNK7WDlNswqxQdDNjS/iQOMYAj9s4SerZGnNLuhIQM7DSh2dxpyidGyjJouhqq3cqpzUk/5WEcoUblXhJlX22iCBeSjay7MzVoIHfSSaWCeQCD4hEScQDDfJXSDOF9edhOCogA51eMZR/j/HzvP+G0E7E4v25HUKl1r2a+/wSRziv5v4b79B0pwwEQzQ7Riq8kCyxJRRF2BRj0eGNaoC2aM8nh+u7UxqVqlP8nQIDAQABo1swWTA4BgNVHREEMTAvggppZHAuc3plLmh1hiFodHRwczovL2lkcC5zemUuaHUvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFLEnpKVtW3BAbuNKj5XjDx4dgkpCMA0GCSqGSIb3DQEBBQUAA4IBAQAwn6lCoBZp10wWRdbxDffHh19pPhdV21WqA2PmdfHcoQMVKQyZJEUsjYr6CDdf/IvTAnm4rS9pLPJYR/OH+5Qbmaxh3fnrloC31V5m4grHjtC3vpdopzXKq0ybme0lyT/nx/bgjrWg+TEEc5BRNr0maOARkbhd3pmY6Cf5xY0IgdoNmmXyL74V/ZRa7RtjFMyDJvDXdrpv4ltJEh6x+Obn9AHspTBfOOGLVeNOmP+jxQARDoqbuRLrOSuW+Ic/02Yf5OzC2P/EXX4ZgKla1bfKGxI3tL/aEzSL4TUXsy/FLdnWt3YnUqjG5yWCQ9QnXtlAO1oCYYabYMKqmVcBQAYg</ds:X509Certificate>
-        </ds:X509Data>
-        <ds:KeyName>idp.sze.hu</ds:KeyName>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.sze.hu: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="hu">Széchenyi István Egyetem</OrganizationName>
-    <OrganizationName xml:lang="en">Széchenyi István University</OrganizationName>
-    <OrganizationDisplayName xml:lang="hu">Széchenyi István Egyetem</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">Széchenyi István University</OrganizationDisplayName>
-    <OrganizationURL xml:lang="hu">http://www.sze.hu</OrganizationURL>
-    <OrganizationURL xml:lang="en">http://www.sze.hu</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Csábi Béla</SurName>
-    <EmailAddress>mailto:csabi@sze.hu</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="support">
-    <SurName>Csábi Béla</SurName>
-    <EmailAddress>mailto:csabi@sze.hu</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="administrative">
-    <SurName>Csábi Béla</SurName>
-    <EmailAddress>mailto:csabi@sze.hu</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.szie.hu-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.szie.hu-idp-shibboleth.xml
deleted file mode 100644
index bb1911c7..00000000
--- a/swamid-interfederations-2.0/idp.szie.hu-idp-shibboleth.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://idp.szie.hu/idp/shibboleth">
-  <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">szie</ns9:MetadataSet>
-    <ns9:MetadataSet xmlns:ns9="urn:geant:niif.hu:eduid.hu:entity-attributes:processing-info">href-idps</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">szie.hu</shibmd:Scope>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-        <mdui:DisplayName xml:lang="hu">Szent István Egyetem</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Szent István University</mdui:DisplayName>
-        <mdui:Description xml:lang="hu">Szent István Egyetem</mdui:Description>
-        <mdui:Description xml:lang="en">Szent István University</mdui:Description>
-        <mdui:Logo height="78" width="111">https://idp.szie.hu/idp/szie-logo.png</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDFzCCAf+gAwIBAgIUSscIknb+7vqGVUw6Kl9kxz2bcWAwDQYJKoZIhvcNAQEFBQAwFjEUMBIGA1UEAxMLaWRwLnN6aWUuaHUwHhcNMTAxMTA4MTExOTEzWhcNMzAxMTA4MTExOTEzWjAWMRQwEgYDVQQDEwtpZHAuc3ppZS5odTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJ3NmFZGZxB5neVKIfq5+RTZO1apk0MNGinQYVD8T9PXXm4g4d8ZkNAdY/eUW8z3IdkStf0I/7imKjnnC4Px5ImUJ4tOblJ1n1DDYmqYf7ivNuM89gpt8yE+ffGa/EZeGizeVLJLDT0X3+k22otLEZt3s/gDgCRBal80VtiE0IPT9y2L9XOyzzawRAWlfnjCxBrQiJb35OlUnctOHGc4004Jp+3O9xCr9lOqO/UaQPKpTUFQvK9NIBaV8VqCA62+SQsiSjWtg8Rc/AcdBjrmVcMrU8mia26VyRwtZ0vZpIlpiUhKnuwmWuFMJvAymXI74OwrmYkudzqGgvbk+N10snMCAwEAAaNdMFswOgYDVR0RBDMwMYILaWRwLnN6aWUuaHWGImh0dHBzOi8vaWRwLnN6aWUuaHUvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFJ/ZbxqsxhPifPOOGn+OHtet0wYvMA0GCSqGSIb3DQEBBQUAA4IBAQBHjf0B9D8VtyZu2zstLmGw9Mw+f/dRxOBhzXLJVMxHa3XDykxX1MeG70nKFlSz/UsFy/2jH1zU8E/2WLQDGPu6kZtjuxD1xihyJ5bPTHWfn5IlNHjydMoOt4CnC1xTYB9ObhKqATdVFJMXdRegCpasOV4gLfdFGIneU9YhSB9WFCISjvE76iUJbwsitPtRcDfIqsTFnrwDWbeZhEtlmHp0W71JSkrmCOP9tbiyfH7ujW/DLHuHRa1rxiZYGDKvI3sfwjqRnHkBOTWvs/h7xIQxDUJWwkX0JyVSIp4YuhfSTxVq+cWmtLHfaisY7nSEECcM4m6U2T5YmnogM2Rw8Vqc</ds:X509Certificate>
-        </ds:X509Data>
-        <ds:KeyName>idp.szie.hu</ds:KeyName>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.szie.hu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.szie.hu/idp/profile/SAML2/Redirect/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.szie.hu/idp/profile/SAML2/POST/SLO"/>
-    <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.szie.hu/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.szie.hu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.szie.hu/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="hu">Szent István Egyetem</OrganizationName>
-    <OrganizationName xml:lang="en">Szent István University</OrganizationName>
-    <OrganizationDisplayName xml:lang="hu">Szent István Egyetem</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">Szent István University</OrganizationDisplayName>
-    <OrganizationURL xml:lang="hu">http://www.szie.hu</OrganizationURL>
-    <OrganizationURL xml:lang="en">http://www.szie.hu</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Cseh Vendel</SurName>
-    <EmailAddress>mailto:cseh.vendel@ih.szie.hu</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="support">
-    <SurName>Cseh Vendel</SurName>
-    <EmailAddress>mailto:cseh.vendel@ih.szie.hu</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="administrative">
-    <SurName>Cseh Vendel</SurName>
-    <EmailAddress>mailto:cseh.vendel@ih.szie.hu</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.szie.hu.xml b/swamid-interfederations-2.0/idp.szie.hu.xml
deleted file mode 100644
index bb1911c7..00000000
--- a/swamid-interfederations-2.0/idp.szie.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://idp.szie.hu/idp/shibboleth">
-  <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">szie</ns9:MetadataSet>
-    <ns9:MetadataSet xmlns:ns9="urn:geant:niif.hu:eduid.hu:entity-attributes:processing-info">href-idps</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">szie.hu</shibmd:Scope>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-        <mdui:DisplayName xml:lang="hu">Szent István Egyetem</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Szent István University</mdui:DisplayName>
-        <mdui:Description xml:lang="hu">Szent István Egyetem</mdui:Description>
-        <mdui:Description xml:lang="en">Szent István University</mdui:Description>
-        <mdui:Logo height="78" width="111">https://idp.szie.hu/idp/szie-logo.png</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDFzCCAf+gAwIBAgIUSscIknb+7vqGVUw6Kl9kxz2bcWAwDQYJKoZIhvcNAQEFBQAwFjEUMBIGA1UEAxMLaWRwLnN6aWUuaHUwHhcNMTAxMTA4MTExOTEzWhcNMzAxMTA4MTExOTEzWjAWMRQwEgYDVQQDEwtpZHAuc3ppZS5odTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJ3NmFZGZxB5neVKIfq5+RTZO1apk0MNGinQYVD8T9PXXm4g4d8ZkNAdY/eUW8z3IdkStf0I/7imKjnnC4Px5ImUJ4tOblJ1n1DDYmqYf7ivNuM89gpt8yE+ffGa/EZeGizeVLJLDT0X3+k22otLEZt3s/gDgCRBal80VtiE0IPT9y2L9XOyzzawRAWlfnjCxBrQiJb35OlUnctOHGc4004Jp+3O9xCr9lOqO/UaQPKpTUFQvK9NIBaV8VqCA62+SQsiSjWtg8Rc/AcdBjrmVcMrU8mia26VyRwtZ0vZpIlpiUhKnuwmWuFMJvAymXI74OwrmYkudzqGgvbk+N10snMCAwEAAaNdMFswOgYDVR0RBDMwMYILaWRwLnN6aWUuaHWGImh0dHBzOi8vaWRwLnN6aWUuaHUvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFJ/ZbxqsxhPifPOOGn+OHtet0wYvMA0GCSqGSIb3DQEBBQUAA4IBAQBHjf0B9D8VtyZu2zstLmGw9Mw+f/dRxOBhzXLJVMxHa3XDykxX1MeG70nKFlSz/UsFy/2jH1zU8E/2WLQDGPu6kZtjuxD1xihyJ5bPTHWfn5IlNHjydMoOt4CnC1xTYB9ObhKqATdVFJMXdRegCpasOV4gLfdFGIneU9YhSB9WFCISjvE76iUJbwsitPtRcDfIqsTFnrwDWbeZhEtlmHp0W71JSkrmCOP9tbiyfH7ujW/DLHuHRa1rxiZYGDKvI3sfwjqRnHkBOTWvs/h7xIQxDUJWwkX0JyVSIp4YuhfSTxVq+cWmtLHfaisY7nSEECcM4m6U2T5YmnogM2Rw8Vqc</ds:X509Certificate>
-        </ds:X509Data>
-        <ds:KeyName>idp.szie.hu</ds:KeyName>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.szie.hu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.szie.hu/idp/profile/SAML2/Redirect/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.szie.hu/idp/profile/SAML2/POST/SLO"/>
-    <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.szie.hu/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.szie.hu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.szie.hu/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="hu">Szent István Egyetem</OrganizationName>
-    <OrganizationName xml:lang="en">Szent István University</OrganizationName>
-    <OrganizationDisplayName xml:lang="hu">Szent István Egyetem</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">Szent István University</OrganizationDisplayName>
-    <OrganizationURL xml:lang="hu">http://www.szie.hu</OrganizationURL>
-    <OrganizationURL xml:lang="en">http://www.szie.hu</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Cseh Vendel</SurName>
-    <EmailAddress>mailto:cseh.vendel@ih.szie.hu</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="support">
-    <SurName>Cseh Vendel</SurName>
-    <EmailAddress>mailto:cseh.vendel@ih.szie.hu</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="administrative">
-    <SurName>Cseh Vendel</SurName>
-    <EmailAddress>mailto:cseh.vendel@ih.szie.hu</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.telecom-bretagne.eu-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.telecom-bretagne.eu-idp-shibboleth.xml
deleted file mode 100644
index cf2ba771..00000000
--- a/swamid-interfederations-2.0/idp.telecom-bretagne.eu-idp-shibboleth.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://idp.telecom-bretagne.eu/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2010-02-10T18:09:45Z">
-      <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">telecom-bretagne.eu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">Télécom Bretagne</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDSDCCAjCgAwIBAgIVAMDsjMGGzs74lgEgGP3m2lZR6SMhMA0GCSqGSIb3DQEB
-BQUAMCIxIDAeBgNVBAMTF2lkcC50ZWxlY29tLWJyZXRhZ25lLmV1MB4XDTEwMDIx
-MDA5NTgyNFoXDTMwMDIxMDA5NTgyNFowIjEgMB4GA1UEAxMXaWRwLnRlbGVjb20t
-YnJldGFnbmUuZXUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDDyA3F
-PUpmxBhBziOEouQX8lgfErTEM0EFV5Fg0lNc8NPn/nWmBtyQxbY1yqkmf34Te5ef
-SdNp39QQ9X6W+y3/p+9k+x6GgVwtvDcGB6fPPtncPHBVMo5V+EeoIE20vUN6TW4H
-g/RJHoqpZEn1x/G01bprZWCBdadbr2BaZcE5jabTB11wu1zu/7mBXVUtBPMTdHh7
-n4M872F8vTeTPVce4WcoDm5ac7qJOnE55t1RyYj7rryDrwThT//NY3sg2IguJn4B
-+SGImQDS3C688SsdM42OiOD2xnmwgWU+dkLuPLz1w/fZmK5l5Vb2YWdyyHKshU4+
-FcIQFwgXpnKgTREJAgMBAAGjdTBzMFIGA1UdEQRLMEmCF2lkcC50ZWxlY29tLWJy
-ZXRhZ25lLmV1hi5odHRwczovL2lkcC50ZWxlY29tLWJyZXRhZ25lLmV1L2lkcC9z
-aGliYm9sZXRoMB0GA1UdDgQWBBSzMnv76CtVAByMD9L8/3CVVLT2WjANBgkqhkiG
-9w0BAQUFAAOCAQEAa5ho6vHycEIXOcmcfgpj60G6tS9vNKWLJ+H5zdXf+BcsLuky
-W5xQkgM519BghwJ72xDo4YVyEdp4kEGVKMo6+Vu0bz4AREb4SmMm+N2FCamhK6D8
-+9YLDw76+x5xlUVaV0bVGkDAG9IlOzg6gPhoRiJrwg3pzgAiFiysBTTZSPLorTgU
-BqA6X8hXjbPat/Ry48AOmlkbSSuPKbc8Ij78VcDg9HlAurDJ8lyPKL72VBJdT0JY
-f7EOBt1e8Cf7GwVdtvHq3LW88y9UTshQMpZtNxk9lXr6FMwcMG0wM1aOn5HRlGSs
-bm2IAM4xlcyiwzG22vG6NmR4y7NYNG9q6YyiOw==
-					    </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://idp.telecom-bretagne.eu/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.telecom-bretagne.eu/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.telecom-bretagne.eu/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">telecom-bretagne.eu</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDSDCCAjCgAwIBAgIVAMDsjMGGzs74lgEgGP3m2lZR6SMhMA0GCSqGSIb3DQEB
-BQUAMCIxIDAeBgNVBAMTF2lkcC50ZWxlY29tLWJyZXRhZ25lLmV1MB4XDTEwMDIx
-MDA5NTgyNFoXDTMwMDIxMDA5NTgyNFowIjEgMB4GA1UEAxMXaWRwLnRlbGVjb20t
-YnJldGFnbmUuZXUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDDyA3F
-PUpmxBhBziOEouQX8lgfErTEM0EFV5Fg0lNc8NPn/nWmBtyQxbY1yqkmf34Te5ef
-SdNp39QQ9X6W+y3/p+9k+x6GgVwtvDcGB6fPPtncPHBVMo5V+EeoIE20vUN6TW4H
-g/RJHoqpZEn1x/G01bprZWCBdadbr2BaZcE5jabTB11wu1zu/7mBXVUtBPMTdHh7
-n4M872F8vTeTPVce4WcoDm5ac7qJOnE55t1RyYj7rryDrwThT//NY3sg2IguJn4B
-+SGImQDS3C688SsdM42OiOD2xnmwgWU+dkLuPLz1w/fZmK5l5Vb2YWdyyHKshU4+
-FcIQFwgXpnKgTREJAgMBAAGjdTBzMFIGA1UdEQRLMEmCF2lkcC50ZWxlY29tLWJy
-ZXRhZ25lLmV1hi5odHRwczovL2lkcC50ZWxlY29tLWJyZXRhZ25lLmV1L2lkcC9z
-aGliYm9sZXRoMB0GA1UdDgQWBBSzMnv76CtVAByMD9L8/3CVVLT2WjANBgkqhkiG
-9w0BAQUFAAOCAQEAa5ho6vHycEIXOcmcfgpj60G6tS9vNKWLJ+H5zdXf+BcsLuky
-W5xQkgM519BghwJ72xDo4YVyEdp4kEGVKMo6+Vu0bz4AREb4SmMm+N2FCamhK6D8
-+9YLDw76+x5xlUVaV0bVGkDAG9IlOzg6gPhoRiJrwg3pzgAiFiysBTTZSPLorTgU
-BqA6X8hXjbPat/Ry48AOmlkbSSuPKbc8Ij78VcDg9HlAurDJ8lyPKL72VBJdT0JY
-f7EOBt1e8Cf7GwVdtvHq3LW88y9UTshQMpZtNxk9lXr6FMwcMG0wM1aOn5HRlGSs
-bm2IAM4xlcyiwzG22vG6NmR4y7NYNG9q6YyiOw==
-					    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.telecom-bretagne.eu/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">Télécom Bretagne</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Télécom Bretagne</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <EmailAddress>idp-contact@telecom-bretagne.eu</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.telecom-bretagne.eu.xml b/swamid-interfederations-2.0/idp.telecom-bretagne.eu.xml
deleted file mode 100644
index cf2ba771..00000000
--- a/swamid-interfederations-2.0/idp.telecom-bretagne.eu.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://idp.telecom-bretagne.eu/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2010-02-10T18:09:45Z">
-      <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">telecom-bretagne.eu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">Télécom Bretagne</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDSDCCAjCgAwIBAgIVAMDsjMGGzs74lgEgGP3m2lZR6SMhMA0GCSqGSIb3DQEB
-BQUAMCIxIDAeBgNVBAMTF2lkcC50ZWxlY29tLWJyZXRhZ25lLmV1MB4XDTEwMDIx
-MDA5NTgyNFoXDTMwMDIxMDA5NTgyNFowIjEgMB4GA1UEAxMXaWRwLnRlbGVjb20t
-YnJldGFnbmUuZXUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDDyA3F
-PUpmxBhBziOEouQX8lgfErTEM0EFV5Fg0lNc8NPn/nWmBtyQxbY1yqkmf34Te5ef
-SdNp39QQ9X6W+y3/p+9k+x6GgVwtvDcGB6fPPtncPHBVMo5V+EeoIE20vUN6TW4H
-g/RJHoqpZEn1x/G01bprZWCBdadbr2BaZcE5jabTB11wu1zu/7mBXVUtBPMTdHh7
-n4M872F8vTeTPVce4WcoDm5ac7qJOnE55t1RyYj7rryDrwThT//NY3sg2IguJn4B
-+SGImQDS3C688SsdM42OiOD2xnmwgWU+dkLuPLz1w/fZmK5l5Vb2YWdyyHKshU4+
-FcIQFwgXpnKgTREJAgMBAAGjdTBzMFIGA1UdEQRLMEmCF2lkcC50ZWxlY29tLWJy
-ZXRhZ25lLmV1hi5odHRwczovL2lkcC50ZWxlY29tLWJyZXRhZ25lLmV1L2lkcC9z
-aGliYm9sZXRoMB0GA1UdDgQWBBSzMnv76CtVAByMD9L8/3CVVLT2WjANBgkqhkiG
-9w0BAQUFAAOCAQEAa5ho6vHycEIXOcmcfgpj60G6tS9vNKWLJ+H5zdXf+BcsLuky
-W5xQkgM519BghwJ72xDo4YVyEdp4kEGVKMo6+Vu0bz4AREb4SmMm+N2FCamhK6D8
-+9YLDw76+x5xlUVaV0bVGkDAG9IlOzg6gPhoRiJrwg3pzgAiFiysBTTZSPLorTgU
-BqA6X8hXjbPat/Ry48AOmlkbSSuPKbc8Ij78VcDg9HlAurDJ8lyPKL72VBJdT0JY
-f7EOBt1e8Cf7GwVdtvHq3LW88y9UTshQMpZtNxk9lXr6FMwcMG0wM1aOn5HRlGSs
-bm2IAM4xlcyiwzG22vG6NmR4y7NYNG9q6YyiOw==
-					    </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://idp.telecom-bretagne.eu/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.telecom-bretagne.eu/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.telecom-bretagne.eu/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">telecom-bretagne.eu</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDSDCCAjCgAwIBAgIVAMDsjMGGzs74lgEgGP3m2lZR6SMhMA0GCSqGSIb3DQEB
-BQUAMCIxIDAeBgNVBAMTF2lkcC50ZWxlY29tLWJyZXRhZ25lLmV1MB4XDTEwMDIx
-MDA5NTgyNFoXDTMwMDIxMDA5NTgyNFowIjEgMB4GA1UEAxMXaWRwLnRlbGVjb20t
-YnJldGFnbmUuZXUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDDyA3F
-PUpmxBhBziOEouQX8lgfErTEM0EFV5Fg0lNc8NPn/nWmBtyQxbY1yqkmf34Te5ef
-SdNp39QQ9X6W+y3/p+9k+x6GgVwtvDcGB6fPPtncPHBVMo5V+EeoIE20vUN6TW4H
-g/RJHoqpZEn1x/G01bprZWCBdadbr2BaZcE5jabTB11wu1zu/7mBXVUtBPMTdHh7
-n4M872F8vTeTPVce4WcoDm5ac7qJOnE55t1RyYj7rryDrwThT//NY3sg2IguJn4B
-+SGImQDS3C688SsdM42OiOD2xnmwgWU+dkLuPLz1w/fZmK5l5Vb2YWdyyHKshU4+
-FcIQFwgXpnKgTREJAgMBAAGjdTBzMFIGA1UdEQRLMEmCF2lkcC50ZWxlY29tLWJy
-ZXRhZ25lLmV1hi5odHRwczovL2lkcC50ZWxlY29tLWJyZXRhZ25lLmV1L2lkcC9z
-aGliYm9sZXRoMB0GA1UdDgQWBBSzMnv76CtVAByMD9L8/3CVVLT2WjANBgkqhkiG
-9w0BAQUFAAOCAQEAa5ho6vHycEIXOcmcfgpj60G6tS9vNKWLJ+H5zdXf+BcsLuky
-W5xQkgM519BghwJ72xDo4YVyEdp4kEGVKMo6+Vu0bz4AREb4SmMm+N2FCamhK6D8
-+9YLDw76+x5xlUVaV0bVGkDAG9IlOzg6gPhoRiJrwg3pzgAiFiysBTTZSPLorTgU
-BqA6X8hXjbPat/Ry48AOmlkbSSuPKbc8Ij78VcDg9HlAurDJ8lyPKL72VBJdT0JY
-f7EOBt1e8Cf7GwVdtvHq3LW88y9UTshQMpZtNxk9lXr6FMwcMG0wM1aOn5HRlGSs
-bm2IAM4xlcyiwzG22vG6NmR4y7NYNG9q6YyiOw==
-					    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.telecom-bretagne.eu/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">Télécom Bretagne</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Télécom Bretagne</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <EmailAddress>idp-contact@telecom-bretagne.eu</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.telecom-lille1.eu-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.telecom-lille1.eu-idp-shibboleth.xml
deleted file mode 100644
index 026de149..00000000
--- a/swamid-interfederations-2.0/idp.telecom-lille1.eu-idp-shibboleth.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://idp.telecom-lille1.eu/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2009-12-04T10:53:26Z">
-      <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">telecom-lille1.eu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">Telecom Lille1</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDPzCCAiegAwIBAgIUJLHfF/BYKnVTAfbCyG7p6neXmikwDQYJKoZIhvcNAQEF
-BQAwIDEeMBwGA1UEAxMVaWRwLnRlbGVjb20tbGlsbGUxLmV1MB4XDTA5MTAxMzEy
-NTE1NVoXDTI5MTAxMzEyNTE1NVowIDEeMBwGA1UEAxMVaWRwLnRlbGVjb20tbGls
-bGUxLmV1MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAke9f/k5yNntZ
-mKHJse2R1dALp2yQ431GM7WgcwLz61E10KQFp4QvHcRnOA28aQ2ftOdDYXF8Ce/g
-l/f/gzmfLI3UkV33VQnu7wTUcG7qnA4ixmSz1wXshiBNiCqy+DlvzxxFa1rrrhTK
-DCGNxJEsNcT42xnnoL739jJt7hhwOzNTR6jd+PtnkBBJkULj0JNU3lgVVLaic61Z
-2sqqbp976AE81I5Peu/uNwBEQEze3JZFq4lPMftIT1qCrpZueUzZJe/IaB8gckur
-U+ts8Qk7X6LaWA9rHLz3M1cS5I/nFgxX5BzNTpJac8YEFl4rN0j8VVNKMuQ8NPoz
-lMSlVexERQIDAQABo3EwbzBOBgNVHREERzBFghVpZHAudGVsZWNvbS1saWxsZTEu
-ZXWGLGh0dHBzOi8vaWRwLnRlbGVjb20tbGlsbGUxLmV1L2lkcC9zaGliYm9sZXRo
-MB0GA1UdDgQWBBRIcbHtrFzmqsjXU8/WEtUyCjUm+DANBgkqhkiG9w0BAQUFAAOC
-AQEAfeUGRk0BupcoO20DeNRmBokqCZn0N7n5mmco4eJWjl4CD0dvxcNmTHmO9nYS
-FPVBNASEjmnaU12RSAIM0mVnLwo6kXAQsbKa2xKGL6l3jkmsvcEj8F1Dg5e0QGBe
-eSdYLGI2mGbAoIQWeK3majTQXZ+UyzVXKjzJ2JCk96MvEwKODd4HGX+Z8eMRE/0A
-SoP9I+z1FYAuXjOeKazq+UY3jbiSx/UDBAA0g7FHkzJRaFiws0BZiiOkqPMHLGlB
-cjxHOjLM8xkrkI3+w28uv1nrNWH82728WeyMt5PWqVTyKg8SjPViZWusJF0KUkS/
-/jKovrhBMghl87+BWkzQTRzSyw==
-					    </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://idp.telecom-lille1.eu/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.telecom-lille1.eu/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.telecom-lille1.eu/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">telecom-lille1.eu</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDPzCCAiegAwIBAgIUJLHfF/BYKnVTAfbCyG7p6neXmikwDQYJKoZIhvcNAQEF
-BQAwIDEeMBwGA1UEAxMVaWRwLnRlbGVjb20tbGlsbGUxLmV1MB4XDTA5MTAxMzEy
-NTE1NVoXDTI5MTAxMzEyNTE1NVowIDEeMBwGA1UEAxMVaWRwLnRlbGVjb20tbGls
-bGUxLmV1MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAke9f/k5yNntZ
-mKHJse2R1dALp2yQ431GM7WgcwLz61E10KQFp4QvHcRnOA28aQ2ftOdDYXF8Ce/g
-l/f/gzmfLI3UkV33VQnu7wTUcG7qnA4ixmSz1wXshiBNiCqy+DlvzxxFa1rrrhTK
-DCGNxJEsNcT42xnnoL739jJt7hhwOzNTR6jd+PtnkBBJkULj0JNU3lgVVLaic61Z
-2sqqbp976AE81I5Peu/uNwBEQEze3JZFq4lPMftIT1qCrpZueUzZJe/IaB8gckur
-U+ts8Qk7X6LaWA9rHLz3M1cS5I/nFgxX5BzNTpJac8YEFl4rN0j8VVNKMuQ8NPoz
-lMSlVexERQIDAQABo3EwbzBOBgNVHREERzBFghVpZHAudGVsZWNvbS1saWxsZTEu
-ZXWGLGh0dHBzOi8vaWRwLnRlbGVjb20tbGlsbGUxLmV1L2lkcC9zaGliYm9sZXRo
-MB0GA1UdDgQWBBRIcbHtrFzmqsjXU8/WEtUyCjUm+DANBgkqhkiG9w0BAQUFAAOC
-AQEAfeUGRk0BupcoO20DeNRmBokqCZn0N7n5mmco4eJWjl4CD0dvxcNmTHmO9nYS
-FPVBNASEjmnaU12RSAIM0mVnLwo6kXAQsbKa2xKGL6l3jkmsvcEj8F1Dg5e0QGBe
-eSdYLGI2mGbAoIQWeK3majTQXZ+UyzVXKjzJ2JCk96MvEwKODd4HGX+Z8eMRE/0A
-SoP9I+z1FYAuXjOeKazq+UY3jbiSx/UDBAA0g7FHkzJRaFiws0BZiiOkqPMHLGlB
-cjxHOjLM8xkrkI3+w28uv1nrNWH82728WeyMt5PWqVTyKg8SjPViZWusJF0KUkS/
-/jKovrhBMghl87+BWkzQTRzSyw==
-					    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.telecom-lille1.eu/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">Telecom Lille1</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Telecom Lille1</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Landru</SurName>
-    <EmailAddress>jacques.landru@telecom-lille1.eu</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <SurName>Sion</SurName>
-    <EmailAddress>martine.sion@telecom-lille1.eu</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.telecom-lille1.eu.xml b/swamid-interfederations-2.0/idp.telecom-lille1.eu.xml
deleted file mode 100644
index 026de149..00000000
--- a/swamid-interfederations-2.0/idp.telecom-lille1.eu.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://idp.telecom-lille1.eu/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2009-12-04T10:53:26Z">
-      <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">telecom-lille1.eu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">Telecom Lille1</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDPzCCAiegAwIBAgIUJLHfF/BYKnVTAfbCyG7p6neXmikwDQYJKoZIhvcNAQEF
-BQAwIDEeMBwGA1UEAxMVaWRwLnRlbGVjb20tbGlsbGUxLmV1MB4XDTA5MTAxMzEy
-NTE1NVoXDTI5MTAxMzEyNTE1NVowIDEeMBwGA1UEAxMVaWRwLnRlbGVjb20tbGls
-bGUxLmV1MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAke9f/k5yNntZ
-mKHJse2R1dALp2yQ431GM7WgcwLz61E10KQFp4QvHcRnOA28aQ2ftOdDYXF8Ce/g
-l/f/gzmfLI3UkV33VQnu7wTUcG7qnA4ixmSz1wXshiBNiCqy+DlvzxxFa1rrrhTK
-DCGNxJEsNcT42xnnoL739jJt7hhwOzNTR6jd+PtnkBBJkULj0JNU3lgVVLaic61Z
-2sqqbp976AE81I5Peu/uNwBEQEze3JZFq4lPMftIT1qCrpZueUzZJe/IaB8gckur
-U+ts8Qk7X6LaWA9rHLz3M1cS5I/nFgxX5BzNTpJac8YEFl4rN0j8VVNKMuQ8NPoz
-lMSlVexERQIDAQABo3EwbzBOBgNVHREERzBFghVpZHAudGVsZWNvbS1saWxsZTEu
-ZXWGLGh0dHBzOi8vaWRwLnRlbGVjb20tbGlsbGUxLmV1L2lkcC9zaGliYm9sZXRo
-MB0GA1UdDgQWBBRIcbHtrFzmqsjXU8/WEtUyCjUm+DANBgkqhkiG9w0BAQUFAAOC
-AQEAfeUGRk0BupcoO20DeNRmBokqCZn0N7n5mmco4eJWjl4CD0dvxcNmTHmO9nYS
-FPVBNASEjmnaU12RSAIM0mVnLwo6kXAQsbKa2xKGL6l3jkmsvcEj8F1Dg5e0QGBe
-eSdYLGI2mGbAoIQWeK3majTQXZ+UyzVXKjzJ2JCk96MvEwKODd4HGX+Z8eMRE/0A
-SoP9I+z1FYAuXjOeKazq+UY3jbiSx/UDBAA0g7FHkzJRaFiws0BZiiOkqPMHLGlB
-cjxHOjLM8xkrkI3+w28uv1nrNWH82728WeyMt5PWqVTyKg8SjPViZWusJF0KUkS/
-/jKovrhBMghl87+BWkzQTRzSyw==
-					    </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://idp.telecom-lille1.eu/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.telecom-lille1.eu/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.telecom-lille1.eu/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">telecom-lille1.eu</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDPzCCAiegAwIBAgIUJLHfF/BYKnVTAfbCyG7p6neXmikwDQYJKoZIhvcNAQEF
-BQAwIDEeMBwGA1UEAxMVaWRwLnRlbGVjb20tbGlsbGUxLmV1MB4XDTA5MTAxMzEy
-NTE1NVoXDTI5MTAxMzEyNTE1NVowIDEeMBwGA1UEAxMVaWRwLnRlbGVjb20tbGls
-bGUxLmV1MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAke9f/k5yNntZ
-mKHJse2R1dALp2yQ431GM7WgcwLz61E10KQFp4QvHcRnOA28aQ2ftOdDYXF8Ce/g
-l/f/gzmfLI3UkV33VQnu7wTUcG7qnA4ixmSz1wXshiBNiCqy+DlvzxxFa1rrrhTK
-DCGNxJEsNcT42xnnoL739jJt7hhwOzNTR6jd+PtnkBBJkULj0JNU3lgVVLaic61Z
-2sqqbp976AE81I5Peu/uNwBEQEze3JZFq4lPMftIT1qCrpZueUzZJe/IaB8gckur
-U+ts8Qk7X6LaWA9rHLz3M1cS5I/nFgxX5BzNTpJac8YEFl4rN0j8VVNKMuQ8NPoz
-lMSlVexERQIDAQABo3EwbzBOBgNVHREERzBFghVpZHAudGVsZWNvbS1saWxsZTEu
-ZXWGLGh0dHBzOi8vaWRwLnRlbGVjb20tbGlsbGUxLmV1L2lkcC9zaGliYm9sZXRo
-MB0GA1UdDgQWBBRIcbHtrFzmqsjXU8/WEtUyCjUm+DANBgkqhkiG9w0BAQUFAAOC
-AQEAfeUGRk0BupcoO20DeNRmBokqCZn0N7n5mmco4eJWjl4CD0dvxcNmTHmO9nYS
-FPVBNASEjmnaU12RSAIM0mVnLwo6kXAQsbKa2xKGL6l3jkmsvcEj8F1Dg5e0QGBe
-eSdYLGI2mGbAoIQWeK3majTQXZ+UyzVXKjzJ2JCk96MvEwKODd4HGX+Z8eMRE/0A
-SoP9I+z1FYAuXjOeKazq+UY3jbiSx/UDBAA0g7FHkzJRaFiws0BZiiOkqPMHLGlB
-cjxHOjLM8xkrkI3+w28uv1nrNWH82728WeyMt5PWqVTyKg8SjPViZWusJF0KUkS/
-/jKovrhBMghl87+BWkzQTRzSyw==
-					    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.telecom-lille1.eu/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">Telecom Lille1</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Telecom Lille1</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Landru</SurName>
-    <EmailAddress>jacques.landru@telecom-lille1.eu</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <SurName>Sion</SurName>
-    <EmailAddress>martine.sion@telecom-lille1.eu</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.telecom-paristech.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.telecom-paristech.fr-idp-shibboleth.xml
deleted file mode 100644
index 56f54d83..00000000
--- a/swamid-interfederations-2.0/idp.telecom-paristech.fr-idp-shibboleth.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://idp.telecom-paristech.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2010-09-06T11:36:26Z">
-      <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">telecom-paristech.fr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mines-telecom.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">Télécom ParisTech</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDSzCCAjOgAwIBAgIUOdyX2dtbQ38bYSsIYvHC27pbOf4wDQYJKoZIhvcNAQEF
-BQAwIzEhMB8GA1UEAxMYaWRwLnRlbGVjb20tcGFyaXN0ZWNoLmZyMB4XDTEwMDEy
-ODE3MDA0MVoXDTMwMDEyODE3MDA0MVowIzEhMB8GA1UEAxMYaWRwLnRlbGVjb20t
-cGFyaXN0ZWNoLmZyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAiVSP
-MWN9NGSu79LJ5CEhhDAWfKTaaXQRrk26/3axPDtaDJVO9KhJ9oie3SZjlogVvmuE
-UHiONGqWhO4H1eKXfPKQIpq5e+JpR9Nxr8WMsjhXnToCcMZsSes6E44S3YXWVblv
-EmWKE3JFUYWO/cpVGZWjdnWierXziUPo8UcRI8BPBqoCgMQzDkVtJngqNPWim0/M
-S7LbyZmrYbDlwqM74CNFFRK+cknv221xr36sSTVAf9QdbL+zfvxCOxR4vmUxSTG5
-FKD89Js9ELMZoadpJYWEkdIJuvZ0R12dtlXn+rYKpqpOuP/X/kjtJM40WpchSWn7
-o2z0KwtUVkkugtUN/QIDAQABo3cwdTBUBgNVHREETTBLghhpZHAudGVsZWNvbS1w
-YXJpc3RlY2guZnKGL2h0dHBzOi8vaWRwLnRlbGVjb20tcGFyaXN0ZWNoLmZyL2lk
-cC9zaGliYm9sZXRoMB0GA1UdDgQWBBSzcODCJpeqAD7OPTNA7Uf6rJ/73DANBgkq
-hkiG9w0BAQUFAAOCAQEAPkpw2TRt9SQdGPslqaoEq+/Y+3qdoPAFEipXUxEsexVU
-RZiHCQm90wLhAV4+IGmk5XuVVKN5M+3kQVDq/iql3W9IoShV71mQhDEqNQJkztGK
-1XPWYZu2Qgzui0YessRn7F8/Ts3cRm6L43oAKWJvSR0Zad9L4Eeli/ymCZ+3VO86
-hx8qX90cpGu6iYMPfbu+Dl+dFRxJkNY5SGbNGHvv9ZH3FF7f5cN7R8BtWVgo0rTR
-DmlnOFBrEU8tBkHNwNS0wwdZkOuQjoafB1QOZ39oH7koG+DICom7vxCLTWxcAMj+
-4QsS7+VwhxDRJdfBoQvr3mrm+hxwrCDEGlU3qCaenA==
-					    </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://idp.telecom-paristech.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.telecom-paristech.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.telecom-paristech.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">telecom-paristech.fr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mines-telecom.fr</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDSzCCAjOgAwIBAgIUOdyX2dtbQ38bYSsIYvHC27pbOf4wDQYJKoZIhvcNAQEF
-BQAwIzEhMB8GA1UEAxMYaWRwLnRlbGVjb20tcGFyaXN0ZWNoLmZyMB4XDTEwMDEy
-ODE3MDA0MVoXDTMwMDEyODE3MDA0MVowIzEhMB8GA1UEAxMYaWRwLnRlbGVjb20t
-cGFyaXN0ZWNoLmZyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAiVSP
-MWN9NGSu79LJ5CEhhDAWfKTaaXQRrk26/3axPDtaDJVO9KhJ9oie3SZjlogVvmuE
-UHiONGqWhO4H1eKXfPKQIpq5e+JpR9Nxr8WMsjhXnToCcMZsSes6E44S3YXWVblv
-EmWKE3JFUYWO/cpVGZWjdnWierXziUPo8UcRI8BPBqoCgMQzDkVtJngqNPWim0/M
-S7LbyZmrYbDlwqM74CNFFRK+cknv221xr36sSTVAf9QdbL+zfvxCOxR4vmUxSTG5
-FKD89Js9ELMZoadpJYWEkdIJuvZ0R12dtlXn+rYKpqpOuP/X/kjtJM40WpchSWn7
-o2z0KwtUVkkugtUN/QIDAQABo3cwdTBUBgNVHREETTBLghhpZHAudGVsZWNvbS1w
-YXJpc3RlY2guZnKGL2h0dHBzOi8vaWRwLnRlbGVjb20tcGFyaXN0ZWNoLmZyL2lk
-cC9zaGliYm9sZXRoMB0GA1UdDgQWBBSzcODCJpeqAD7OPTNA7Uf6rJ/73DANBgkq
-hkiG9w0BAQUFAAOCAQEAPkpw2TRt9SQdGPslqaoEq+/Y+3qdoPAFEipXUxEsexVU
-RZiHCQm90wLhAV4+IGmk5XuVVKN5M+3kQVDq/iql3W9IoShV71mQhDEqNQJkztGK
-1XPWYZu2Qgzui0YessRn7F8/Ts3cRm6L43oAKWJvSR0Zad9L4Eeli/ymCZ+3VO86
-hx8qX90cpGu6iYMPfbu+Dl+dFRxJkNY5SGbNGHvv9ZH3FF7f5cN7R8BtWVgo0rTR
-DmlnOFBrEU8tBkHNwNS0wwdZkOuQjoafB1QOZ39oH7koG+DICom7vxCLTWxcAMj+
-4QsS7+VwhxDRJdfBoQvr3mrm+hxwrCDEGlU3qCaenA==
-					    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.telecom-paristech.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">Télécom ParisTech</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Télécom ParisTech</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <EmailAddress>shibboleth@enst.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.telecom-paristech.fr.xml b/swamid-interfederations-2.0/idp.telecom-paristech.fr.xml
deleted file mode 100644
index 56f54d83..00000000
--- a/swamid-interfederations-2.0/idp.telecom-paristech.fr.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://idp.telecom-paristech.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2010-09-06T11:36:26Z">
-      <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">telecom-paristech.fr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mines-telecom.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">Télécom ParisTech</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDSzCCAjOgAwIBAgIUOdyX2dtbQ38bYSsIYvHC27pbOf4wDQYJKoZIhvcNAQEF
-BQAwIzEhMB8GA1UEAxMYaWRwLnRlbGVjb20tcGFyaXN0ZWNoLmZyMB4XDTEwMDEy
-ODE3MDA0MVoXDTMwMDEyODE3MDA0MVowIzEhMB8GA1UEAxMYaWRwLnRlbGVjb20t
-cGFyaXN0ZWNoLmZyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAiVSP
-MWN9NGSu79LJ5CEhhDAWfKTaaXQRrk26/3axPDtaDJVO9KhJ9oie3SZjlogVvmuE
-UHiONGqWhO4H1eKXfPKQIpq5e+JpR9Nxr8WMsjhXnToCcMZsSes6E44S3YXWVblv
-EmWKE3JFUYWO/cpVGZWjdnWierXziUPo8UcRI8BPBqoCgMQzDkVtJngqNPWim0/M
-S7LbyZmrYbDlwqM74CNFFRK+cknv221xr36sSTVAf9QdbL+zfvxCOxR4vmUxSTG5
-FKD89Js9ELMZoadpJYWEkdIJuvZ0R12dtlXn+rYKpqpOuP/X/kjtJM40WpchSWn7
-o2z0KwtUVkkugtUN/QIDAQABo3cwdTBUBgNVHREETTBLghhpZHAudGVsZWNvbS1w
-YXJpc3RlY2guZnKGL2h0dHBzOi8vaWRwLnRlbGVjb20tcGFyaXN0ZWNoLmZyL2lk
-cC9zaGliYm9sZXRoMB0GA1UdDgQWBBSzcODCJpeqAD7OPTNA7Uf6rJ/73DANBgkq
-hkiG9w0BAQUFAAOCAQEAPkpw2TRt9SQdGPslqaoEq+/Y+3qdoPAFEipXUxEsexVU
-RZiHCQm90wLhAV4+IGmk5XuVVKN5M+3kQVDq/iql3W9IoShV71mQhDEqNQJkztGK
-1XPWYZu2Qgzui0YessRn7F8/Ts3cRm6L43oAKWJvSR0Zad9L4Eeli/ymCZ+3VO86
-hx8qX90cpGu6iYMPfbu+Dl+dFRxJkNY5SGbNGHvv9ZH3FF7f5cN7R8BtWVgo0rTR
-DmlnOFBrEU8tBkHNwNS0wwdZkOuQjoafB1QOZ39oH7koG+DICom7vxCLTWxcAMj+
-4QsS7+VwhxDRJdfBoQvr3mrm+hxwrCDEGlU3qCaenA==
-					    </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://idp.telecom-paristech.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.telecom-paristech.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.telecom-paristech.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">telecom-paristech.fr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mines-telecom.fr</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDSzCCAjOgAwIBAgIUOdyX2dtbQ38bYSsIYvHC27pbOf4wDQYJKoZIhvcNAQEF
-BQAwIzEhMB8GA1UEAxMYaWRwLnRlbGVjb20tcGFyaXN0ZWNoLmZyMB4XDTEwMDEy
-ODE3MDA0MVoXDTMwMDEyODE3MDA0MVowIzEhMB8GA1UEAxMYaWRwLnRlbGVjb20t
-cGFyaXN0ZWNoLmZyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAiVSP
-MWN9NGSu79LJ5CEhhDAWfKTaaXQRrk26/3axPDtaDJVO9KhJ9oie3SZjlogVvmuE
-UHiONGqWhO4H1eKXfPKQIpq5e+JpR9Nxr8WMsjhXnToCcMZsSes6E44S3YXWVblv
-EmWKE3JFUYWO/cpVGZWjdnWierXziUPo8UcRI8BPBqoCgMQzDkVtJngqNPWim0/M
-S7LbyZmrYbDlwqM74CNFFRK+cknv221xr36sSTVAf9QdbL+zfvxCOxR4vmUxSTG5
-FKD89Js9ELMZoadpJYWEkdIJuvZ0R12dtlXn+rYKpqpOuP/X/kjtJM40WpchSWn7
-o2z0KwtUVkkugtUN/QIDAQABo3cwdTBUBgNVHREETTBLghhpZHAudGVsZWNvbS1w
-YXJpc3RlY2guZnKGL2h0dHBzOi8vaWRwLnRlbGVjb20tcGFyaXN0ZWNoLmZyL2lk
-cC9zaGliYm9sZXRoMB0GA1UdDgQWBBSzcODCJpeqAD7OPTNA7Uf6rJ/73DANBgkq
-hkiG9w0BAQUFAAOCAQEAPkpw2TRt9SQdGPslqaoEq+/Y+3qdoPAFEipXUxEsexVU
-RZiHCQm90wLhAV4+IGmk5XuVVKN5M+3kQVDq/iql3W9IoShV71mQhDEqNQJkztGK
-1XPWYZu2Qgzui0YessRn7F8/Ts3cRm6L43oAKWJvSR0Zad9L4Eeli/ymCZ+3VO86
-hx8qX90cpGu6iYMPfbu+Dl+dFRxJkNY5SGbNGHvv9ZH3FF7f5cN7R8BtWVgo0rTR
-DmlnOFBrEU8tBkHNwNS0wwdZkOuQjoafB1QOZ39oH7koG+DICom7vxCLTWxcAMj+
-4QsS7+VwhxDRJdfBoQvr3mrm+hxwrCDEGlU3qCaenA==
-					    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.telecom-paristech.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">Télécom ParisTech</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Télécom ParisTech</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <EmailAddress>shibboleth@enst.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.tut.fi.xml b/swamid-interfederations-2.0/idp.tut.fi.xml
deleted file mode 100644
index 8fe21a38..00000000
--- a/swamid-interfederations-2.0/idp.tut.fi.xml
+++ /dev/null
@@ -1,100 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns: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.tut.fi/shibboleth2">
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope regexp="false">tut.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>MIIEYTCCA0mgAwIBAgIQTO185Oil7C75C/tFRdicDDANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTE0MDQxMDAwMDAwMFoXDTE3MDQwOTIzNTk1OVowODEhMB8GA1UE
-CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRMwEQYDVQQDEwppZHAudHV0LmZp
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApz4MIT6HA16a4IVjVYld
-TdYEickxDC6fItsAwAwd3JlQSYJTKTApegd7+YyMtTBQzHARGWAAA0UFoEnfCrt6
-1/dKp52O93pH3E2flgD2SPsNgYCndqT80F2ddB9GnoP1nIroctTsyT6fG/9ETyln
-mDnuD3dk2RElEqq0sfP1anar039Dikl3s3ejyx71t3AP55rdDejgVbtSCI4psv2R
-jUsxYkc//ib6EAKS0aDGU/BjHKuyWXHPCzQ7gDx/fEXnEwLEhlhs13GMLUaAVo4q
-c1qsVX18ZYroUj8QokcZKgoPEEa8lB6EJDmTNtMAyW5MBtjGifyu267k+pXtz92V
-iQIDAQABo4IBZzCCAWMwHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsrN1dH6pDjue0w
-HQYDVR0OBBYEFMBs3AXDyvNaBP4G37RtoMViq+UXMA4GA1UdDwEB/wQEAwIFoDAM
-BgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAiBgNV
-HSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNVHR8EMzAxMC+gLaAr
-hilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNybDBtBggr
-BgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNzLnRlcmVuYS5v
-cmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8vb2NzcC50Y3Mu
-dGVyZW5hLm9yZzAVBgNVHREEDjAMggppZHAudHV0LmZpMA0GCSqGSIb3DQEBBQUA
-A4IBAQBDxV7R20F2QLA7iG4KqYmfTogCZH40kRnOR2bOZr6WtYSflhhNv3otGgZA
-R9NIo5nDX+5spMJzlWV9nvJyYczwMPOn89V032XqSs8OFkvsdKClL7PYzSAu4lAG
-Cj4/xx7pvgz9SHv2SayMjSGZIoitGEU68qBPP1oZpRdmvXmQVHxuDTw778VdIzM4
-7cSZOVQdyVEocSioH757tQktT5bbY4MuYdtPjDX+ICBS/OsXEGzUeTOnQHw2UU6e
-DVju6E0NmdQxPsN3Q0wLMgnLm4CcKxHsIsNWU+xyos9Sk1FnupZbxCFyBipOX7RY
-ov0reXszINweUWTYJchavcG3Dfyx</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.tut.fi/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.tut.fi/idp/profile/SAML2/POST/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope regexp="false">tut.fi</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIEYTCCA0mgAwIBAgIQTO185Oil7C75C/tFRdicDDANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTE0MDQxMDAwMDAwMFoXDTE3MDQwOTIzNTk1OVowODEhMB8GA1UE
-CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRMwEQYDVQQDEwppZHAudHV0LmZp
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApz4MIT6HA16a4IVjVYld
-TdYEickxDC6fItsAwAwd3JlQSYJTKTApegd7+YyMtTBQzHARGWAAA0UFoEnfCrt6
-1/dKp52O93pH3E2flgD2SPsNgYCndqT80F2ddB9GnoP1nIroctTsyT6fG/9ETyln
-mDnuD3dk2RElEqq0sfP1anar039Dikl3s3ejyx71t3AP55rdDejgVbtSCI4psv2R
-jUsxYkc//ib6EAKS0aDGU/BjHKuyWXHPCzQ7gDx/fEXnEwLEhlhs13GMLUaAVo4q
-c1qsVX18ZYroUj8QokcZKgoPEEa8lB6EJDmTNtMAyW5MBtjGifyu267k+pXtz92V
-iQIDAQABo4IBZzCCAWMwHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsrN1dH6pDjue0w
-HQYDVR0OBBYEFMBs3AXDyvNaBP4G37RtoMViq+UXMA4GA1UdDwEB/wQEAwIFoDAM
-BgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAiBgNV
-HSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNVHR8EMzAxMC+gLaAr
-hilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNybDBtBggr
-BgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNzLnRlcmVuYS5v
-cmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8vb2NzcC50Y3Mu
-dGVyZW5hLm9yZzAVBgNVHREEDjAMggppZHAudHV0LmZpMA0GCSqGSIb3DQEBBQUA
-A4IBAQBDxV7R20F2QLA7iG4KqYmfTogCZH40kRnOR2bOZr6WtYSflhhNv3otGgZA
-R9NIo5nDX+5spMJzlWV9nvJyYczwMPOn89V032XqSs8OFkvsdKClL7PYzSAu4lAG
-Cj4/xx7pvgz9SHv2SayMjSGZIoitGEU68qBPP1oZpRdmvXmQVHxuDTw778VdIzM4
-7cSZOVQdyVEocSioH757tQktT5bbY4MuYdtPjDX+ICBS/OsXEGzUeTOnQHw2UU6e
-DVju6E0NmdQxPsN3Q0wLMgnLm4CcKxHsIsNWU+xyos9Sk1FnupZbxCFyBipOX7RY
-ov0reXszINweUWTYJchavcG3Dfyx</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.tut.fi:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="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>mailto:idp-support@tut.fi</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.u-bordeaux-montaigne.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.u-bordeaux-montaigne.fr-idp-shibboleth.xml
deleted file mode 100644
index 22422b69..00000000
--- a/swamid-interfederations-2.0/idp.u-bordeaux-montaigne.fr-idp-shibboleth.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.u-bordeaux-montaigne.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2014-04-07T17:16:06Z">
-      <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">u-bordeaux-montaigne.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">Université Bordeaux Montaigne</mdui:DisplayName>
-        <mdui:Description xml:lang="fr">Toute la communauté de l'université Bordeaux Montaigne</mdui:Description>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDVzCCAj+gAwIBAgIUHPBrysVhtt7R/gvuIk4VwxtbXfUwDQYJKoZIhvcNAQEF
-BQAwJjEkMCIGA1UEAxMbaWRwLnUtYm9yZGVhdXgtbW9udGFpZ25lLmZyMB4XDTE0
-MDQwNzE0MzczMVoXDTM0MDQwNzE0MzczMVowJjEkMCIGA1UEAxMbaWRwLnUtYm9y
-ZGVhdXgtbW9udGFpZ25lLmZyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
-AQEAzoBNnucktebQfAKs+CzNFw3DJjZqiBl63mrILfJ54L/5x99825pcWwpBoXIR
-/9hrEAvgM6bKVnICQSb8ES0D0kV8aCQBltm4Bw/JmvmQDuCfmRombFAYKA+KLx+4
-6VuuXKOWH9EqrQIFsc4418Ln8zqTIvNunT9rxFN0D7uWPtElxuID2tz9CnvkWw5w
-rvQPKEqpCEJlMugBQISlvm70Q6TCeWMeeZ317jAtpXi9ELx7mTokJ1qENDzTUPkb
-uJN5aH8JZ/LjKIkXqmj658/gnTyuWWMw1bCiwDtJVvsAOJOa7QVma4Ph55O84biN
-s9Zwj/g8GmDnkoRYQxQO8w/krwIDAQABo30wezBaBgNVHREEUzBRghtpZHAudS1i
-b3JkZWF1eC1tb250YWlnbmUuZnKGMmh0dHBzOi8vaWRwLnUtYm9yZGVhdXgtbW9u
-dGFpZ25lLmZyL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBRd5DOByJ5+rahWNtvg
-/Wsz2LJy/jANBgkqhkiG9w0BAQUFAAOCAQEAC1PLClY7gYSkCJebDPsplSGUcJiw
-X8gEe7G8tsmNnE0bNuCWvnmJuHEuHWkFb7VQSbC4nLVaapnmP2d+IgPRRBwXzeAA
-8bG9Mh6rGbWvi61NExqw7PWZ+HLVbFv400q/C4NZENCAM2nleI97G+Zcn6iNmVXO
-xvmptgBpVcFa3iDcheYOKngb9JxI1+b31/RyCqYKqUOXVtmdnybefoRFBSaf13D/
-LlzyjzOOYDvl5zBkEX4V5HaZpY2mEPRM6paKiVrxzExfzZL8X8q5OGbg5G3fbNMv
-rCJ2i9qLyjorUvRNPm7ihuZZGUIn0qiv9WaZ9iEbRCGLWjE6oZrGbOecbw==
-					    </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://idp.u-bordeaux-montaigne.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.u-bordeaux-montaigne.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.u-bordeaux-montaigne.fr/idp/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Université Bordeaux Montaigne</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Université Bordeaux Montaigne</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <EmailAddress>reseau@u-bordeaux-montaigne.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.u-bordeaux-montaigne.fr.xml b/swamid-interfederations-2.0/idp.u-bordeaux-montaigne.fr.xml
deleted file mode 100644
index 22422b69..00000000
--- a/swamid-interfederations-2.0/idp.u-bordeaux-montaigne.fr.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.u-bordeaux-montaigne.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2014-04-07T17:16:06Z">
-      <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">u-bordeaux-montaigne.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">Université Bordeaux Montaigne</mdui:DisplayName>
-        <mdui:Description xml:lang="fr">Toute la communauté de l'université Bordeaux Montaigne</mdui:Description>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDVzCCAj+gAwIBAgIUHPBrysVhtt7R/gvuIk4VwxtbXfUwDQYJKoZIhvcNAQEF
-BQAwJjEkMCIGA1UEAxMbaWRwLnUtYm9yZGVhdXgtbW9udGFpZ25lLmZyMB4XDTE0
-MDQwNzE0MzczMVoXDTM0MDQwNzE0MzczMVowJjEkMCIGA1UEAxMbaWRwLnUtYm9y
-ZGVhdXgtbW9udGFpZ25lLmZyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
-AQEAzoBNnucktebQfAKs+CzNFw3DJjZqiBl63mrILfJ54L/5x99825pcWwpBoXIR
-/9hrEAvgM6bKVnICQSb8ES0D0kV8aCQBltm4Bw/JmvmQDuCfmRombFAYKA+KLx+4
-6VuuXKOWH9EqrQIFsc4418Ln8zqTIvNunT9rxFN0D7uWPtElxuID2tz9CnvkWw5w
-rvQPKEqpCEJlMugBQISlvm70Q6TCeWMeeZ317jAtpXi9ELx7mTokJ1qENDzTUPkb
-uJN5aH8JZ/LjKIkXqmj658/gnTyuWWMw1bCiwDtJVvsAOJOa7QVma4Ph55O84biN
-s9Zwj/g8GmDnkoRYQxQO8w/krwIDAQABo30wezBaBgNVHREEUzBRghtpZHAudS1i
-b3JkZWF1eC1tb250YWlnbmUuZnKGMmh0dHBzOi8vaWRwLnUtYm9yZGVhdXgtbW9u
-dGFpZ25lLmZyL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBRd5DOByJ5+rahWNtvg
-/Wsz2LJy/jANBgkqhkiG9w0BAQUFAAOCAQEAC1PLClY7gYSkCJebDPsplSGUcJiw
-X8gEe7G8tsmNnE0bNuCWvnmJuHEuHWkFb7VQSbC4nLVaapnmP2d+IgPRRBwXzeAA
-8bG9Mh6rGbWvi61NExqw7PWZ+HLVbFv400q/C4NZENCAM2nleI97G+Zcn6iNmVXO
-xvmptgBpVcFa3iDcheYOKngb9JxI1+b31/RyCqYKqUOXVtmdnybefoRFBSaf13D/
-LlzyjzOOYDvl5zBkEX4V5HaZpY2mEPRM6paKiVrxzExfzZL8X8q5OGbg5G3fbNMv
-rCJ2i9qLyjorUvRNPm7ihuZZGUIn0qiv9WaZ9iEbRCGLWjE6oZrGbOecbw==
-					    </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://idp.u-bordeaux-montaigne.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.u-bordeaux-montaigne.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.u-bordeaux-montaigne.fr/idp/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Université Bordeaux Montaigne</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Université Bordeaux Montaigne</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <EmailAddress>reseau@u-bordeaux-montaigne.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.u-bordeaux.fr-idp_ubx-shibboleth.xml b/swamid-interfederations-2.0/idp.u-bordeaux.fr-idp_ubx-shibboleth.xml
deleted file mode 100644
index b7592a9b..00000000
--- a/swamid-interfederations-2.0/idp.u-bordeaux.fr-idp_ubx-shibboleth.xml
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.u-bordeaux.fr/idp_ubx/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2013-12-10T11:43:22Z">
-      <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">u-bordeaux.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">Université de Bordeaux</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDSDCCAjCgAwIBAgIJAPEVvQl9sqJ0MA0GCSqGSIb3DQEBBQUAMCQxIjAgBgNV
-BAMTGXYtaWRwMDEuc3J2LnUtYm9yZGVhdXguZnIwHhcNMTQwNDE0MDc1NjE5WhcN
-MjQwNDExMDc1NjE5WjAkMSIwIAYDVQQDExl2LWlkcDAxLnNydi51LWJvcmRlYXV4
-LmZyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA1AStm5TtjTJEnbVB
-Kxe+Qjkh9z7V1Td2uUiWbswYVIfFlw2mDhj9Gq3clTRiyPhebB4qTeRzJKNnxVBw
-lzk+JmRnJd+JPwIyX3ctN+XZRaeFjbspP1Xl9sjsa5LBFVZ43LrXPlQH2o8Z3jZJ
-g9WaTj++SbUa4xKnqJ6bJm4voykhCG4cAyQ9jpV3Qivofwa9VHC5KauXR9JeHMr4
-gjOZBxfh8e9iTRSt1fUHDrHpgx00zvVIXBi5d9DRENPjyCNzSHR/32UUxnJOomEY
-eyf1Ux8yr3xiucqY8ht90n/LtvxBGl33uGZZPu2oBuJGj8F48VqJwKyKdZi72Lqo
-sauYUQIDAQABo30wezBaBgNVHREEUzBRghl2LWlkcDAxLnNydi51LWJvcmRlYXV4
-LmZyhjRodHRwczovL3YtaWRwMDEuc3J2LnUtYm9yZGVhdXguZnIvaWRwX3VieC9z
-aGliYm9sZXRoMB0GA1UdDgQWBBS2KmA2aaKd0lRemau76adcI936lzANBgkqhkiG
-9w0BAQUFAAOCAQEAXoRdSclj17K5pHqZC+MYjFQgRpZ9Gq7Sdk/kEXyH10SJuc5r
-eApBAWYFIJvWAXKBhtvPxnkgoDkQ84Rrho/jR4RzkqCEEiUHjLzObVuHtcHE1dAV
-X5iaAObzXlNr5aDAPPPjaZXQpZOvNDwrhVQrZWoeupQogoP1VYEJtCag2tgLD7ZW
-wuQY8NfjOSmMrG1NsCIia2C4gWqEqKwFwuknaueT95GubIrz4ayqz5WYEe2KTNSy
-1KI84uKzIgymoedQ2eibLzfcTg3aEs24aWfjpKhLYERBgUGeoymuqTT2WPnH21IT
-Rl74R0YddDzKj3NOCjggOxW2tAPCCd5pPprTRQ==
-					    </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>
-					      MIIDTzCCAjegAwIBAgIUE1/WgEZpWyPYXsF/fURZlGXutGUwDQYJKoZIhvcNAQEF
-BQAwJDEiMCAGA1UEAxMZdi1pZHAwMS5zcnYudS1ib3JkZWF1eC5mcjAeFw0xMzEy
-MTAwODA5NDFaFw0xNjEyMTAwODA5NDFaMCQxIjAgBgNVBAMTGXYtaWRwMDEuc3J2
-LnUtYm9yZGVhdXguZnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCd
-Wezh53yFD4rbJyj74HT7VOJpNorPhQGoqEAMZOQWuT182+2XRq373xcOZ6suy0NS
-YbOoxKdFQn+o/bIQwpvnN708YVU7rcVUcxzpYwyPdIwMgm9xqC5hBE902mErUHNP
-VOqkgmnIf5YDm92fSzIEoE/klpQwCSsG88qlfTxwmB+sWh/2UcG8RZXyjowP4zHh
-hjhC3weBXQltSktL92Xg92F3nnBiTY6YKZ+8UQx34WGzTC+DjAXbE7d84LTufMkA
-pckM01O9LY3S6QHxsZ8AdZmWIe8/yxF7mDTstEZR44IXCAff3p4r7BeI8t6G5pDj
-8TxLlKEdRzF8jtPJ1rm5AgMBAAGjeTB3MFYGA1UdEQRPME2CGXYtaWRwMDEuc3J2
-LnUtYm9yZGVhdXguZnKGMGh0dHBzOi8vdi1pZHAwMS5zcnYudS1ib3JkZWF1eC5m
-ci9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUKnhNaI/fipTjD6bWLF0lcbs6rMsw
-DQYJKoZIhvcNAQEFBQADggEBAF0Dd1Fvi1mSzozQ1zF+ynVD+Vno7QyhIIQG+yKe
-0W5/ZLrF8ddiAvHku+lXJakRi+7zI45+O85YN1ZmrL8LHtkmoz39YSGBXtQL92PR
-6jLOaQ4AAXG/Co3ONAmT7Qtr8wUBdCdLI1PiHKUoWg5U6CFTROE/1x5TwoALbO1H
-e3NB3eRNWIn9CMUNYgz3BEHSM36bb+I4pZ3iG2yLIFZ9FpnAHbuBkbE2hdPgppYw
-xq57ToMq1Btju+x6evFlV0uqCSszQMxTU/Tleid5iZfL4ae9IgM6xqEvYZ4xr6fr
-VkBzyAKX8s3JZo9lM7GdA2PXiIodtHSyeNvrRmVpGN63REs=
-					    </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://idp.u-bordeaux.fr/idp_ubx/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.u-bordeaux.fr/idp_ubx/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.u-bordeaux.fr/idp_ubx/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Université de Bordeaux</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Université de Bordeaux</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <EmailAddress>noc@univ-bordeaux.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.u-bordeaux.fr.xml b/swamid-interfederations-2.0/idp.u-bordeaux.fr.xml
deleted file mode 100644
index b7592a9b..00000000
--- a/swamid-interfederations-2.0/idp.u-bordeaux.fr.xml
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.u-bordeaux.fr/idp_ubx/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2013-12-10T11:43:22Z">
-      <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">u-bordeaux.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">Université de Bordeaux</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDSDCCAjCgAwIBAgIJAPEVvQl9sqJ0MA0GCSqGSIb3DQEBBQUAMCQxIjAgBgNV
-BAMTGXYtaWRwMDEuc3J2LnUtYm9yZGVhdXguZnIwHhcNMTQwNDE0MDc1NjE5WhcN
-MjQwNDExMDc1NjE5WjAkMSIwIAYDVQQDExl2LWlkcDAxLnNydi51LWJvcmRlYXV4
-LmZyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA1AStm5TtjTJEnbVB
-Kxe+Qjkh9z7V1Td2uUiWbswYVIfFlw2mDhj9Gq3clTRiyPhebB4qTeRzJKNnxVBw
-lzk+JmRnJd+JPwIyX3ctN+XZRaeFjbspP1Xl9sjsa5LBFVZ43LrXPlQH2o8Z3jZJ
-g9WaTj++SbUa4xKnqJ6bJm4voykhCG4cAyQ9jpV3Qivofwa9VHC5KauXR9JeHMr4
-gjOZBxfh8e9iTRSt1fUHDrHpgx00zvVIXBi5d9DRENPjyCNzSHR/32UUxnJOomEY
-eyf1Ux8yr3xiucqY8ht90n/LtvxBGl33uGZZPu2oBuJGj8F48VqJwKyKdZi72Lqo
-sauYUQIDAQABo30wezBaBgNVHREEUzBRghl2LWlkcDAxLnNydi51LWJvcmRlYXV4
-LmZyhjRodHRwczovL3YtaWRwMDEuc3J2LnUtYm9yZGVhdXguZnIvaWRwX3VieC9z
-aGliYm9sZXRoMB0GA1UdDgQWBBS2KmA2aaKd0lRemau76adcI936lzANBgkqhkiG
-9w0BAQUFAAOCAQEAXoRdSclj17K5pHqZC+MYjFQgRpZ9Gq7Sdk/kEXyH10SJuc5r
-eApBAWYFIJvWAXKBhtvPxnkgoDkQ84Rrho/jR4RzkqCEEiUHjLzObVuHtcHE1dAV
-X5iaAObzXlNr5aDAPPPjaZXQpZOvNDwrhVQrZWoeupQogoP1VYEJtCag2tgLD7ZW
-wuQY8NfjOSmMrG1NsCIia2C4gWqEqKwFwuknaueT95GubIrz4ayqz5WYEe2KTNSy
-1KI84uKzIgymoedQ2eibLzfcTg3aEs24aWfjpKhLYERBgUGeoymuqTT2WPnH21IT
-Rl74R0YddDzKj3NOCjggOxW2tAPCCd5pPprTRQ==
-					    </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>
-					      MIIDTzCCAjegAwIBAgIUE1/WgEZpWyPYXsF/fURZlGXutGUwDQYJKoZIhvcNAQEF
-BQAwJDEiMCAGA1UEAxMZdi1pZHAwMS5zcnYudS1ib3JkZWF1eC5mcjAeFw0xMzEy
-MTAwODA5NDFaFw0xNjEyMTAwODA5NDFaMCQxIjAgBgNVBAMTGXYtaWRwMDEuc3J2
-LnUtYm9yZGVhdXguZnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCd
-Wezh53yFD4rbJyj74HT7VOJpNorPhQGoqEAMZOQWuT182+2XRq373xcOZ6suy0NS
-YbOoxKdFQn+o/bIQwpvnN708YVU7rcVUcxzpYwyPdIwMgm9xqC5hBE902mErUHNP
-VOqkgmnIf5YDm92fSzIEoE/klpQwCSsG88qlfTxwmB+sWh/2UcG8RZXyjowP4zHh
-hjhC3weBXQltSktL92Xg92F3nnBiTY6YKZ+8UQx34WGzTC+DjAXbE7d84LTufMkA
-pckM01O9LY3S6QHxsZ8AdZmWIe8/yxF7mDTstEZR44IXCAff3p4r7BeI8t6G5pDj
-8TxLlKEdRzF8jtPJ1rm5AgMBAAGjeTB3MFYGA1UdEQRPME2CGXYtaWRwMDEuc3J2
-LnUtYm9yZGVhdXguZnKGMGh0dHBzOi8vdi1pZHAwMS5zcnYudS1ib3JkZWF1eC5m
-ci9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUKnhNaI/fipTjD6bWLF0lcbs6rMsw
-DQYJKoZIhvcNAQEFBQADggEBAF0Dd1Fvi1mSzozQ1zF+ynVD+Vno7QyhIIQG+yKe
-0W5/ZLrF8ddiAvHku+lXJakRi+7zI45+O85YN1ZmrL8LHtkmoz39YSGBXtQL92PR
-6jLOaQ4AAXG/Co3ONAmT7Qtr8wUBdCdLI1PiHKUoWg5U6CFTROE/1x5TwoALbO1H
-e3NB3eRNWIn9CMUNYgz3BEHSM36bb+I4pZ3iG2yLIFZ9FpnAHbuBkbE2hdPgppYw
-xq57ToMq1Btju+x6evFlV0uqCSszQMxTU/Tleid5iZfL4ae9IgM6xqEvYZ4xr6fr
-VkBzyAKX8s3JZo9lM7GdA2PXiIodtHSyeNvrRmVpGN63REs=
-					    </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://idp.u-bordeaux.fr/idp_ubx/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.u-bordeaux.fr/idp_ubx/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.u-bordeaux.fr/idp_ubx/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Université de Bordeaux</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Université de Bordeaux</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <EmailAddress>noc@univ-bordeaux.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.u-bordeaux1.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.u-bordeaux1.fr-idp-shibboleth.xml
deleted file mode 100644
index 74a0791f..00000000
--- a/swamid-interfederations-2.0/idp.u-bordeaux1.fr-idp-shibboleth.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://idp.u-bordeaux1.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2009-11-10T09:27:33Z">
-      <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">u-bordeaux1.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">Université de Bordeaux 1</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDMzCCAhugAwIBAgIUYibTz+Dskx28GtVQ2//RrkKDqr8wDQYJKoZIhvcNAQEF
-BQAwHTEbMBkGA1UEAxMSaWRwLnUtYm9yZGVhdXgxLmZyMB4XDTA5MTEwOTA4NDcx
-M1oXDTI5MTEwOTA4NDcxM1owHTEbMBkGA1UEAxMSaWRwLnUtYm9yZGVhdXgxLmZy
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAzOR5TePy0ieJG9TAQBKb
-HxfHdPm7Js3sfkvHdCcM0YKVO2S9XmCgR3SLs8Cu6/MZPosaDmz9qE6xD3RdHA+h
-OZck8PDUOkmlZmJP56XR5LJ5GWkfNFj5spYc330kkmd/pHc1Gvkpg/UTUZHxQ2oC
-S4a86CvRRLxYV2DJw9Xs6xTQdmq3htBjD1UZt1DdEAfKAB+pAym201O09HtVUKEi
-f6rF2/V1aPzBiOLkUI/qjFd0Nxv1AmrfzR6iikCwQow0RixV0JSe4fd3L8OsRl4+
-Og+HvxMgT1gGtS0l0IxskwBadNORi0izo/+QI72KjQuhwlo4qpHz+5IZQxGG7ZBF
-fwIDAQABo2swaTBIBgNVHREEQTA/ghJpZHAudS1ib3JkZWF1eDEuZnKGKWh0dHBz
-Oi8vaWRwLnUtYm9yZGVhdXgxLmZyL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBR8
-ZWiS0Xn8gBy8RcQS0rxq2mv18DANBgkqhkiG9w0BAQUFAAOCAQEAfBUQ2pwfnv8r
-DT1XgVFPYNqDHwAg34D4iiFiD/LxSBxVucCUGNTvBD6G3r/Q7aKpHmQdxhqZgqKF
-mij0A7JKugv/mXFdjmyA9/GiqPabfQJdDi3QIMgfBb5Vpvcoth+yxRnJ2MzpKAxH
-BeaIdvQ7FXzDhW7vTFDfbpkC1mLEI5/febpi7CAvMkE6AFa9YpnCNvN2MiW9n/jP
-bxoITGkd9gp938GswozJ4c8CLWVPt85EOPdpOqNCVXtL661myHQdSYltGFvT+jgd
-yaUfAtl8hB0qTx/dI2xOtYJa5ROvs2OVSp0mi8otLv2fgDnkRDISwt8QpRTqsMaP
-PuVhZrOujQ==
-					    </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://idp.u-bordeaux1.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.u-bordeaux1.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.u-bordeaux1.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">u-bordeaux1.fr</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDMzCCAhugAwIBAgIUYibTz+Dskx28GtVQ2//RrkKDqr8wDQYJKoZIhvcNAQEF
-BQAwHTEbMBkGA1UEAxMSaWRwLnUtYm9yZGVhdXgxLmZyMB4XDTA5MTEwOTA4NDcx
-M1oXDTI5MTEwOTA4NDcxM1owHTEbMBkGA1UEAxMSaWRwLnUtYm9yZGVhdXgxLmZy
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAzOR5TePy0ieJG9TAQBKb
-HxfHdPm7Js3sfkvHdCcM0YKVO2S9XmCgR3SLs8Cu6/MZPosaDmz9qE6xD3RdHA+h
-OZck8PDUOkmlZmJP56XR5LJ5GWkfNFj5spYc330kkmd/pHc1Gvkpg/UTUZHxQ2oC
-S4a86CvRRLxYV2DJw9Xs6xTQdmq3htBjD1UZt1DdEAfKAB+pAym201O09HtVUKEi
-f6rF2/V1aPzBiOLkUI/qjFd0Nxv1AmrfzR6iikCwQow0RixV0JSe4fd3L8OsRl4+
-Og+HvxMgT1gGtS0l0IxskwBadNORi0izo/+QI72KjQuhwlo4qpHz+5IZQxGG7ZBF
-fwIDAQABo2swaTBIBgNVHREEQTA/ghJpZHAudS1ib3JkZWF1eDEuZnKGKWh0dHBz
-Oi8vaWRwLnUtYm9yZGVhdXgxLmZyL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBR8
-ZWiS0Xn8gBy8RcQS0rxq2mv18DANBgkqhkiG9w0BAQUFAAOCAQEAfBUQ2pwfnv8r
-DT1XgVFPYNqDHwAg34D4iiFiD/LxSBxVucCUGNTvBD6G3r/Q7aKpHmQdxhqZgqKF
-mij0A7JKugv/mXFdjmyA9/GiqPabfQJdDi3QIMgfBb5Vpvcoth+yxRnJ2MzpKAxH
-BeaIdvQ7FXzDhW7vTFDfbpkC1mLEI5/febpi7CAvMkE6AFa9YpnCNvN2MiW9n/jP
-bxoITGkd9gp938GswozJ4c8CLWVPt85EOPdpOqNCVXtL661myHQdSYltGFvT+jgd
-yaUfAtl8hB0qTx/dI2xOtYJa5ROvs2OVSp0mi8otLv2fgDnkRDISwt8QpRTqsMaP
-PuVhZrOujQ==
-					    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.u-bordeaux1.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">Université de Bordeaux 1</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Université de Bordeaux 1</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>RAYNAL Karen</SurName>
-    <EmailAddress>karen.raynal@u-bordeaux1.fr</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <SurName>BONNET Pascal</SurName>
-    <EmailAddress>pascal.bonnet@u-bordeaux1.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.u-bordeaux1.fr.xml b/swamid-interfederations-2.0/idp.u-bordeaux1.fr.xml
deleted file mode 100644
index 74a0791f..00000000
--- a/swamid-interfederations-2.0/idp.u-bordeaux1.fr.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://idp.u-bordeaux1.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2009-11-10T09:27:33Z">
-      <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">u-bordeaux1.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">Université de Bordeaux 1</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDMzCCAhugAwIBAgIUYibTz+Dskx28GtVQ2//RrkKDqr8wDQYJKoZIhvcNAQEF
-BQAwHTEbMBkGA1UEAxMSaWRwLnUtYm9yZGVhdXgxLmZyMB4XDTA5MTEwOTA4NDcx
-M1oXDTI5MTEwOTA4NDcxM1owHTEbMBkGA1UEAxMSaWRwLnUtYm9yZGVhdXgxLmZy
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAzOR5TePy0ieJG9TAQBKb
-HxfHdPm7Js3sfkvHdCcM0YKVO2S9XmCgR3SLs8Cu6/MZPosaDmz9qE6xD3RdHA+h
-OZck8PDUOkmlZmJP56XR5LJ5GWkfNFj5spYc330kkmd/pHc1Gvkpg/UTUZHxQ2oC
-S4a86CvRRLxYV2DJw9Xs6xTQdmq3htBjD1UZt1DdEAfKAB+pAym201O09HtVUKEi
-f6rF2/V1aPzBiOLkUI/qjFd0Nxv1AmrfzR6iikCwQow0RixV0JSe4fd3L8OsRl4+
-Og+HvxMgT1gGtS0l0IxskwBadNORi0izo/+QI72KjQuhwlo4qpHz+5IZQxGG7ZBF
-fwIDAQABo2swaTBIBgNVHREEQTA/ghJpZHAudS1ib3JkZWF1eDEuZnKGKWh0dHBz
-Oi8vaWRwLnUtYm9yZGVhdXgxLmZyL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBR8
-ZWiS0Xn8gBy8RcQS0rxq2mv18DANBgkqhkiG9w0BAQUFAAOCAQEAfBUQ2pwfnv8r
-DT1XgVFPYNqDHwAg34D4iiFiD/LxSBxVucCUGNTvBD6G3r/Q7aKpHmQdxhqZgqKF
-mij0A7JKugv/mXFdjmyA9/GiqPabfQJdDi3QIMgfBb5Vpvcoth+yxRnJ2MzpKAxH
-BeaIdvQ7FXzDhW7vTFDfbpkC1mLEI5/febpi7CAvMkE6AFa9YpnCNvN2MiW9n/jP
-bxoITGkd9gp938GswozJ4c8CLWVPt85EOPdpOqNCVXtL661myHQdSYltGFvT+jgd
-yaUfAtl8hB0qTx/dI2xOtYJa5ROvs2OVSp0mi8otLv2fgDnkRDISwt8QpRTqsMaP
-PuVhZrOujQ==
-					    </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://idp.u-bordeaux1.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.u-bordeaux1.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.u-bordeaux1.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">u-bordeaux1.fr</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDMzCCAhugAwIBAgIUYibTz+Dskx28GtVQ2//RrkKDqr8wDQYJKoZIhvcNAQEF
-BQAwHTEbMBkGA1UEAxMSaWRwLnUtYm9yZGVhdXgxLmZyMB4XDTA5MTEwOTA4NDcx
-M1oXDTI5MTEwOTA4NDcxM1owHTEbMBkGA1UEAxMSaWRwLnUtYm9yZGVhdXgxLmZy
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAzOR5TePy0ieJG9TAQBKb
-HxfHdPm7Js3sfkvHdCcM0YKVO2S9XmCgR3SLs8Cu6/MZPosaDmz9qE6xD3RdHA+h
-OZck8PDUOkmlZmJP56XR5LJ5GWkfNFj5spYc330kkmd/pHc1Gvkpg/UTUZHxQ2oC
-S4a86CvRRLxYV2DJw9Xs6xTQdmq3htBjD1UZt1DdEAfKAB+pAym201O09HtVUKEi
-f6rF2/V1aPzBiOLkUI/qjFd0Nxv1AmrfzR6iikCwQow0RixV0JSe4fd3L8OsRl4+
-Og+HvxMgT1gGtS0l0IxskwBadNORi0izo/+QI72KjQuhwlo4qpHz+5IZQxGG7ZBF
-fwIDAQABo2swaTBIBgNVHREEQTA/ghJpZHAudS1ib3JkZWF1eDEuZnKGKWh0dHBz
-Oi8vaWRwLnUtYm9yZGVhdXgxLmZyL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBR8
-ZWiS0Xn8gBy8RcQS0rxq2mv18DANBgkqhkiG9w0BAQUFAAOCAQEAfBUQ2pwfnv8r
-DT1XgVFPYNqDHwAg34D4iiFiD/LxSBxVucCUGNTvBD6G3r/Q7aKpHmQdxhqZgqKF
-mij0A7JKugv/mXFdjmyA9/GiqPabfQJdDi3QIMgfBb5Vpvcoth+yxRnJ2MzpKAxH
-BeaIdvQ7FXzDhW7vTFDfbpkC1mLEI5/febpi7CAvMkE6AFa9YpnCNvN2MiW9n/jP
-bxoITGkd9gp938GswozJ4c8CLWVPt85EOPdpOqNCVXtL661myHQdSYltGFvT+jgd
-yaUfAtl8hB0qTx/dI2xOtYJa5ROvs2OVSp0mi8otLv2fgDnkRDISwt8QpRTqsMaP
-PuVhZrOujQ==
-					    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.u-bordeaux1.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">Université de Bordeaux 1</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Université de Bordeaux 1</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>RAYNAL Karen</SurName>
-    <EmailAddress>karen.raynal@u-bordeaux1.fr</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <SurName>BONNET Pascal</SurName>
-    <EmailAddress>pascal.bonnet@u-bordeaux1.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.u-bordeaux2.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.u-bordeaux2.fr-idp-shibboleth.xml
deleted file mode 100644
index e6dfc9cb..00000000
--- a/swamid-interfederations-2.0/idp.u-bordeaux2.fr-idp-shibboleth.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://idp.u-bordeaux2.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2009-07-22T13:59:16Z">
-      <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">u-bordeaux2.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">Université de Bordeaux 2 - Victor Segalen</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDMzCCAhugAwIBAgIUc4KqBCpHPbcVzlUyb7nDoJn4CK0wDQYJKoZIhvcNAQEF
-BQAwHTEbMBkGA1UEAxMSaWRwLnUtYm9yZGVhdXgyLmZyMB4XDTA5MDYyMzA5MTUy
-MVoXDTI5MDYyMzA5MTUyMVowHTEbMBkGA1UEAxMSaWRwLnUtYm9yZGVhdXgyLmZy
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAktJPvpXPKI/6Nl1dysLc
-oZZCrvCg9QhUW+ELfNLGBR4p8FmkXC/1RT7osvEt6MsFVhjtOO/3idpbQkqXhlMD
-ORfcm4hSPDCoEM1OmlwlfHBqeVVb+rfLzEswAQt/v+/IGo3cY9ISa+zUbIEOy5Nu
-+LXG1qYd8/tadV7kgsv+kgvCpkspwdqQArParmjboeGYnGD2E1AL3XgU42R/G3Vn
-+kNDevHVc1dk6ZKz+7ZqJy5V1pkco5+g9ydAgoTRH6si+AZc975mrzJhAfiwQsoh
-qwpm546ZLaaPXjzJim7S+jA1clc8R/ljGTBZFaWhVIUqJupj5ynAngeOW4OxECGZ
-fwIDAQABo2swaTBIBgNVHREEQTA/ghJpZHAudS1ib3JkZWF1eDIuZnKGKWh0dHBz
-Oi8vaWRwLnUtYm9yZGVhdXgyLmZyL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBQ3
-TXyR0d3UvTuQcCnpnWw/mqJyzjANBgkqhkiG9w0BAQUFAAOCAQEAWYtEQih5OA9S
-Apst2Etm8TTDUAttPVxTPkTf263R/An4g8GLngITxCBE4zySoux8KbqPAhQDoFmT
-opRajsYbdzHdQJhNXegBeFbjdr3xaPgVq10mAGk0ZHzsdjivyW2XhSDnzXXn79Xa
-etxfQrJS7o3K992BFAeje6QvjLD3428BBLS6zxMapBPQi07Qufc7Jy7cSLI8xjAj
-xnCcpD6NEdTmHoD7i4krgmzByDoFLNCnAWQAvwze60yOwOaTZy1ccnKheRE/MGuZ
-CDJF+BVT5M2AwByRtc/852lumMNLljK4Jmg9SMPqvjKJUrg6xov89NVIF5I+vOBn
-fNrBEZFRlQ==
-					    </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://idp.u-bordeaux2.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.u-bordeaux2.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.u-bordeaux2.fr/idp/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Université de Bordeaux 2 - Victor Segalen</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Université de Bordeaux 2 - Victor Segalen</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Laurent LAVAUD</SurName>
-    <EmailAddress>laurent.lavaud@u-bordeaux2.fr</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <SurName>Doris CHAUVET</SurName>
-    <EmailAddress>doris.chauvet@u-bordeaux2.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.u-bordeaux2.fr.xml b/swamid-interfederations-2.0/idp.u-bordeaux2.fr.xml
deleted file mode 100644
index e6dfc9cb..00000000
--- a/swamid-interfederations-2.0/idp.u-bordeaux2.fr.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://idp.u-bordeaux2.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2009-07-22T13:59:16Z">
-      <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">u-bordeaux2.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">Université de Bordeaux 2 - Victor Segalen</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDMzCCAhugAwIBAgIUc4KqBCpHPbcVzlUyb7nDoJn4CK0wDQYJKoZIhvcNAQEF
-BQAwHTEbMBkGA1UEAxMSaWRwLnUtYm9yZGVhdXgyLmZyMB4XDTA5MDYyMzA5MTUy
-MVoXDTI5MDYyMzA5MTUyMVowHTEbMBkGA1UEAxMSaWRwLnUtYm9yZGVhdXgyLmZy
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAktJPvpXPKI/6Nl1dysLc
-oZZCrvCg9QhUW+ELfNLGBR4p8FmkXC/1RT7osvEt6MsFVhjtOO/3idpbQkqXhlMD
-ORfcm4hSPDCoEM1OmlwlfHBqeVVb+rfLzEswAQt/v+/IGo3cY9ISa+zUbIEOy5Nu
-+LXG1qYd8/tadV7kgsv+kgvCpkspwdqQArParmjboeGYnGD2E1AL3XgU42R/G3Vn
-+kNDevHVc1dk6ZKz+7ZqJy5V1pkco5+g9ydAgoTRH6si+AZc975mrzJhAfiwQsoh
-qwpm546ZLaaPXjzJim7S+jA1clc8R/ljGTBZFaWhVIUqJupj5ynAngeOW4OxECGZ
-fwIDAQABo2swaTBIBgNVHREEQTA/ghJpZHAudS1ib3JkZWF1eDIuZnKGKWh0dHBz
-Oi8vaWRwLnUtYm9yZGVhdXgyLmZyL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBQ3
-TXyR0d3UvTuQcCnpnWw/mqJyzjANBgkqhkiG9w0BAQUFAAOCAQEAWYtEQih5OA9S
-Apst2Etm8TTDUAttPVxTPkTf263R/An4g8GLngITxCBE4zySoux8KbqPAhQDoFmT
-opRajsYbdzHdQJhNXegBeFbjdr3xaPgVq10mAGk0ZHzsdjivyW2XhSDnzXXn79Xa
-etxfQrJS7o3K992BFAeje6QvjLD3428BBLS6zxMapBPQi07Qufc7Jy7cSLI8xjAj
-xnCcpD6NEdTmHoD7i4krgmzByDoFLNCnAWQAvwze60yOwOaTZy1ccnKheRE/MGuZ
-CDJF+BVT5M2AwByRtc/852lumMNLljK4Jmg9SMPqvjKJUrg6xov89NVIF5I+vOBn
-fNrBEZFRlQ==
-					    </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://idp.u-bordeaux2.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.u-bordeaux2.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.u-bordeaux2.fr/idp/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Université de Bordeaux 2 - Victor Segalen</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Université de Bordeaux 2 - Victor Segalen</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Laurent LAVAUD</SurName>
-    <EmailAddress>laurent.lavaud@u-bordeaux2.fr</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <SurName>Doris CHAUVET</SurName>
-    <EmailAddress>doris.chauvet@u-bordeaux2.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.u-bordeaux3.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.u-bordeaux3.fr-idp-shibboleth.xml
deleted file mode 100644
index c648004d..00000000
--- a/swamid-interfederations-2.0/idp.u-bordeaux3.fr-idp-shibboleth.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://idp.u-bordeaux3.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2011-03-03T16:23:59Z">
-      <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">u-bordeaux3.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">Université de Bordeaux 3</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIEcjCCA1qgAwIBAgIRAIA4wqJMJlgNhR1cuTMjrPwwDQYJKoZIhvcNAQEFBQAw
-NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-IFNTTCBDQTAeFw0xNDAxMjcwMDAwMDBaFw0xNzAyMDQyMzU5NTlaMEAxITAfBgNV
-BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEbMBkGA1UEAxMSaWRwLnUtYm9y
-ZGVhdXgzLmZyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA6WG1Lr+3
-bgs3SpaycblGA81MTDhqytZBDkFWVKxqG80PygkxJC7elmNW8vmiYr05q3DhKJvU
-qWMVcoELB92ae0u2VU0uAWrZ9F1uoJothG+ZSPEqMB8/lMnfb5mFiDdODWTDaoqr
-+ON+76ln4UJ1A1B/OnYRIXoaQNck8EszUEJ/l8joUj6B6PpQyXbr/oQvgDRLqP+f
-MyG13K0WIJ58gsHSOJ5A56GgfXIyiUhl1dw02ymTmXbEbvmUqskWZmUJKAEWWpSI
-SaMzJjsduob6LDGgf9rW1ZQI/ZjebSklu6pvgfhYRcneOLFc1Himw+vWIqjLR3J6
-R/jcaI/S6z6XGwIDAQABo4IBbzCCAWswHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsr
-N1dH6pDjue0wHQYDVR0OBBYEFAlvLXNjRgJ+SoPvSDhB7HHqENWvMA4GA1UdDwEB
-/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEF
-BQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNVHR8E
-MzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENB
-LmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNz
-LnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8v
-b2NzcC50Y3MudGVyZW5hLm9yZzAdBgNVHREEFjAUghJpZHAudS1ib3JkZWF1eDMu
-ZnIwDQYJKoZIhvcNAQEFBQADggEBAMEoeBmDgbEabFzNFNi64ltc67lfluV+0yFU
-Bv9wDCEpE/oX8gwToDpLPrwLTyyRL/hPXYlGb9Q/aY0PoTny//z78wF/fG714Vu8
-H++rAbnOnWoljZM+HwMfYqiwwo2cDFenKGHmpjxWp8yRzfsQIMg3a9xPuLVcA71L
-cuLvdtOQMqlfgwDLfs/vpHElIWPht/ev3rx8iJRwIWHa2OTiBYA/BJURgonZvfFE
-oTHRaJENWStkW9NhhC+D6vYX9C3R2jHTiJy7ELRI9goY0PfzWFwO9uURJT6Q0Tm+
-y9Lo5MJ5yNmEDB5+h/7fJyAcRzIuprZEv/c0v+d4qbevTm3iIRM=
-					    </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://idp.u-bordeaux3.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.u-bordeaux3.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.u-bordeaux3.fr/idp/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Université de Bordeaux 3</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Université de Bordeaux 3</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <EmailAddress>reseau@u-bordeaux-montaigne.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.u-bordeaux3.fr.xml b/swamid-interfederations-2.0/idp.u-bordeaux3.fr.xml
deleted file mode 100644
index c648004d..00000000
--- a/swamid-interfederations-2.0/idp.u-bordeaux3.fr.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://idp.u-bordeaux3.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2011-03-03T16:23:59Z">
-      <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">u-bordeaux3.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">Université de Bordeaux 3</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIEcjCCA1qgAwIBAgIRAIA4wqJMJlgNhR1cuTMjrPwwDQYJKoZIhvcNAQEFBQAw
-NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-IFNTTCBDQTAeFw0xNDAxMjcwMDAwMDBaFw0xNzAyMDQyMzU5NTlaMEAxITAfBgNV
-BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEbMBkGA1UEAxMSaWRwLnUtYm9y
-ZGVhdXgzLmZyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA6WG1Lr+3
-bgs3SpaycblGA81MTDhqytZBDkFWVKxqG80PygkxJC7elmNW8vmiYr05q3DhKJvU
-qWMVcoELB92ae0u2VU0uAWrZ9F1uoJothG+ZSPEqMB8/lMnfb5mFiDdODWTDaoqr
-+ON+76ln4UJ1A1B/OnYRIXoaQNck8EszUEJ/l8joUj6B6PpQyXbr/oQvgDRLqP+f
-MyG13K0WIJ58gsHSOJ5A56GgfXIyiUhl1dw02ymTmXbEbvmUqskWZmUJKAEWWpSI
-SaMzJjsduob6LDGgf9rW1ZQI/ZjebSklu6pvgfhYRcneOLFc1Himw+vWIqjLR3J6
-R/jcaI/S6z6XGwIDAQABo4IBbzCCAWswHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsr
-N1dH6pDjue0wHQYDVR0OBBYEFAlvLXNjRgJ+SoPvSDhB7HHqENWvMA4GA1UdDwEB
-/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEF
-BQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNVHR8E
-MzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENB
-LmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNz
-LnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8v
-b2NzcC50Y3MudGVyZW5hLm9yZzAdBgNVHREEFjAUghJpZHAudS1ib3JkZWF1eDMu
-ZnIwDQYJKoZIhvcNAQEFBQADggEBAMEoeBmDgbEabFzNFNi64ltc67lfluV+0yFU
-Bv9wDCEpE/oX8gwToDpLPrwLTyyRL/hPXYlGb9Q/aY0PoTny//z78wF/fG714Vu8
-H++rAbnOnWoljZM+HwMfYqiwwo2cDFenKGHmpjxWp8yRzfsQIMg3a9xPuLVcA71L
-cuLvdtOQMqlfgwDLfs/vpHElIWPht/ev3rx8iJRwIWHa2OTiBYA/BJURgonZvfFE
-oTHRaJENWStkW9NhhC+D6vYX9C3R2jHTiJy7ELRI9goY0PfzWFwO9uURJT6Q0Tm+
-y9Lo5MJ5yNmEDB5+h/7fJyAcRzIuprZEv/c0v+d4qbevTm3iIRM=
-					    </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://idp.u-bordeaux3.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.u-bordeaux3.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.u-bordeaux3.fr/idp/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Université de Bordeaux 3</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Université de Bordeaux 3</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <EmailAddress>reseau@u-bordeaux-montaigne.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.u-bordeaux4.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.u-bordeaux4.fr-idp-shibboleth.xml
deleted file mode 100644
index f06a600d..00000000
--- a/swamid-interfederations-2.0/idp.u-bordeaux4.fr-idp-shibboleth.xml
+++ /dev/null
@@ -1,164 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.u-bordeaux4.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2009-06-19T16:44:21Z">
-      <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">u-bordeaux4.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">Université de Bordeaux IV - Montesquieu</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIEcTCCA1mgAwIBAgIQe/xNXBd/8nI5WdMYC8tEVTANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTE0MDEyNzAwMDAwMFoXDTE3MDIwMTIzNTk1OVowQDEhMB8GA1UE
-CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRswGQYDVQQDExJpZHAudS1ib3Jk
-ZWF1eDQuZnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDUm20TitE1
-eSHNsQsX3IIxBv3MO1wSuM5m6EZR47cQcXBw8G67R5aMb3VPpISDUhGrwIEChBA3
-TuzLIQg8krOO3O2q8Ci42EvR39yLd7RL4bySff6kqXjthY9ZrNMTidhaesrWYM1X
-LjpRfp6cYzxDm3tUnh1BOmzhTOpkTFWVKm7I/5H31G9Jsk4GoJLrQABYmXWKUkgE
-qDZFpmL1PaWBCfc0nI8yJTBJaNoDTvg8hyuYp2eqzYxeSYvUmiR1qB0XWSBcsGxI
-qj8Nwf8ZhG/svARsl8NHHtUUkouzRNceMizOW+4fYNWIAfN1usbILJhRH5x1W92G
-oYeft0ajN571AgMBAAGjggFvMIIBazAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3
-V0fqkOO57TAdBgNVHQ4EFgQU/ItUXC+Ogoq75dzOPDlSQzTrJ5swDgYDVR0PAQH/
-BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUF
-BwMCMCIGA1UdIAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQIBMDoGA1UdHwQz
-MDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0Eu
-Y3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50Y3Mu
-dGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9v
-Y3NwLnRjcy50ZXJlbmEub3JnMB0GA1UdEQQWMBSCEmlkcC51LWJvcmRlYXV4NC5m
-cjANBgkqhkiG9w0BAQUFAAOCAQEAqNFLvqI7svZtmwNEM2d6z4aRgLeNYYPUqwF4
-2DFOqEN6k4fwhfnM8S8qVvOawcufDp9Im0VAz+Km0Z26vz8wxknx5S47wABjQlJW
-XwIqwNROkistKPhifvb0y1dZCRC39X3ccRhrKpKeSxSCZIu9kJNyKlzmC4u8DcjL
-QHYdg931OMJTkXoWWNbHRJ5vVtk3kHnYCvv9sZrGpU1DQV6uVKpIKA5ELPGy/1Gj
-xxG5U3bUoJZkhqQTOeSBhoEDjxVDtn0d5cK8XkI3D4w5rHIhOaX5zGb6RBiMEKWN
-p3uNJNwuPeKlsQM3XwQJZVa6oIGNXHNpbTnKBA19nLCIhVIkzg==
-					    </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>
-					      MIIELDCCAxSgAwIBAgILAQAAAAABGgGKLagwDQYJKoZIhvcNAQEFBQAwXzELMAkG
-A1UEBhMCQkUxEzARBgNVBAoTCkN5YmVydHJ1c3QxFzAVBgNVBAsTDkVkdWNhdGlv
-bmFsIENBMSIwIAYDVQQDExlDeWJlcnRydXN0IEVkdWNhdGlvbmFsIENBMB4XDTA4
-MDUxOTE0MTY0MFoXDTExMDUxOTE0MTY0MFowUzELMAkGA1UEBhMCRlIxITAfBgNV
-BAoTGFVuaXZlcnNpdGUgZGUgQm9yZGVhdXggSTEhMB8GA1UEAxMYZmVkZXJhdGlv
-bi51LWJvcmRlYXV4LmZyMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDBXbfu
-j9ECYz1i9mB1ngG+owir54YduGNtw7+H5N8zXJ0eGnBJ46ckksm5fKk7Mbqw7fpy
-HxIkIcse78NBDPby+7szRy6to+LrEWLEQ4HZsuhBvN+k3WMbTsOysnWiYqhok4HT
-0gD5aGmW4f+vGHp8dIzP/zy8A+Kh3VST3giAHQIDAQABo4IBdzCCAXMwUAYDVR0g
-BEkwRzBFBgcqhkixPgEAMDowOAYIKwYBBQUHAgEWLGh0dHA6Ly93d3cuZ2xvYmFs
-c2lnbi5uZXQvcmVwb3NpdG9yeS9jcHMuY2ZtMA4GA1UdDwEB/wQEAwIFoDAfBgNV
-HSMEGDAWgBRlZaM91zsRowoHJTfJQkpbdndQ4TAdBgNVHQ4EFgQUzUMWQ1mtrjc1
-slM6B/4/w0r3aWswOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC5nbG9iYWxz
-aWduLm5ldC9lZHVjYXRpb25hbC5jcmwwTwYIKwYBBQUHAQEEQzBBMD8GCCsGAQUF
-BzAChjNodHRwOi8vc2VjdXJlLmdsb2JhbHNpZ24ubmV0L2NhY2VydC9lZHVjYXRp
-b25hbC5jcnQwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMCMGA1UdEQQc
-MBqCGGZlZGVyYXRpb24udS1ib3JkZWF1eC5mcjANBgkqhkiG9w0BAQUFAAOCAQEA
-PE0zsF/dzWiL+cDDZYKUpOh/hQjXx0pO6Aqpi3vW2N6S+FR5bm+jKI6C7fAYylOJ
-Rd4ZEMRjbCj6ttLlh0JHfr0fL+T4UhM8A2wJxIglMotc/bExITkGSbggtH6q8K2R
-tspC1yMPGzSdBCNMdAStJpvY9F8m9qcGioONc4aIcDOhr9WLGt9qlqXki2Faz+Yk
-qfeKlgSHRs/2w95X2X5ZYewPGZQRbrozPO6E8sYyD8PDHPRvYdemWBchBAg5vXHx
-BLp1hVyPYOp2E2ciIAxni5cb4RwWUEmud+VI8a8V6Q+HQNPFIEfcNO7azovMdh/K
-DwR9zqqffVjNz5LbLeGi7g==
-					    </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://idp.u-bordeaux4.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.u-bordeaux4.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.u-bordeaux4.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">u-bordeaux4.fr</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIEcTCCA1mgAwIBAgIQe/xNXBd/8nI5WdMYC8tEVTANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTE0MDEyNzAwMDAwMFoXDTE3MDIwMTIzNTk1OVowQDEhMB8GA1UE
-CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRswGQYDVQQDExJpZHAudS1ib3Jk
-ZWF1eDQuZnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDUm20TitE1
-eSHNsQsX3IIxBv3MO1wSuM5m6EZR47cQcXBw8G67R5aMb3VPpISDUhGrwIEChBA3
-TuzLIQg8krOO3O2q8Ci42EvR39yLd7RL4bySff6kqXjthY9ZrNMTidhaesrWYM1X
-LjpRfp6cYzxDm3tUnh1BOmzhTOpkTFWVKm7I/5H31G9Jsk4GoJLrQABYmXWKUkgE
-qDZFpmL1PaWBCfc0nI8yJTBJaNoDTvg8hyuYp2eqzYxeSYvUmiR1qB0XWSBcsGxI
-qj8Nwf8ZhG/svARsl8NHHtUUkouzRNceMizOW+4fYNWIAfN1usbILJhRH5x1W92G
-oYeft0ajN571AgMBAAGjggFvMIIBazAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3
-V0fqkOO57TAdBgNVHQ4EFgQU/ItUXC+Ogoq75dzOPDlSQzTrJ5swDgYDVR0PAQH/
-BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUF
-BwMCMCIGA1UdIAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQIBMDoGA1UdHwQz
-MDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0Eu
-Y3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50Y3Mu
-dGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9v
-Y3NwLnRjcy50ZXJlbmEub3JnMB0GA1UdEQQWMBSCEmlkcC51LWJvcmRlYXV4NC5m
-cjANBgkqhkiG9w0BAQUFAAOCAQEAqNFLvqI7svZtmwNEM2d6z4aRgLeNYYPUqwF4
-2DFOqEN6k4fwhfnM8S8qVvOawcufDp9Im0VAz+Km0Z26vz8wxknx5S47wABjQlJW
-XwIqwNROkistKPhifvb0y1dZCRC39X3ccRhrKpKeSxSCZIu9kJNyKlzmC4u8DcjL
-QHYdg931OMJTkXoWWNbHRJ5vVtk3kHnYCvv9sZrGpU1DQV6uVKpIKA5ELPGy/1Gj
-xxG5U3bUoJZkhqQTOeSBhoEDjxVDtn0d5cK8XkI3D4w5rHIhOaX5zGb6RBiMEKWN
-p3uNJNwuPeKlsQM3XwQJZVa6oIGNXHNpbTnKBA19nLCIhVIkzg==
-					    </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>
-					      MIIELDCCAxSgAwIBAgILAQAAAAABGgGKLagwDQYJKoZIhvcNAQEFBQAwXzELMAkG
-A1UEBhMCQkUxEzARBgNVBAoTCkN5YmVydHJ1c3QxFzAVBgNVBAsTDkVkdWNhdGlv
-bmFsIENBMSIwIAYDVQQDExlDeWJlcnRydXN0IEVkdWNhdGlvbmFsIENBMB4XDTA4
-MDUxOTE0MTY0MFoXDTExMDUxOTE0MTY0MFowUzELMAkGA1UEBhMCRlIxITAfBgNV
-BAoTGFVuaXZlcnNpdGUgZGUgQm9yZGVhdXggSTEhMB8GA1UEAxMYZmVkZXJhdGlv
-bi51LWJvcmRlYXV4LmZyMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDBXbfu
-j9ECYz1i9mB1ngG+owir54YduGNtw7+H5N8zXJ0eGnBJ46ckksm5fKk7Mbqw7fpy
-HxIkIcse78NBDPby+7szRy6to+LrEWLEQ4HZsuhBvN+k3WMbTsOysnWiYqhok4HT
-0gD5aGmW4f+vGHp8dIzP/zy8A+Kh3VST3giAHQIDAQABo4IBdzCCAXMwUAYDVR0g
-BEkwRzBFBgcqhkixPgEAMDowOAYIKwYBBQUHAgEWLGh0dHA6Ly93d3cuZ2xvYmFs
-c2lnbi5uZXQvcmVwb3NpdG9yeS9jcHMuY2ZtMA4GA1UdDwEB/wQEAwIFoDAfBgNV
-HSMEGDAWgBRlZaM91zsRowoHJTfJQkpbdndQ4TAdBgNVHQ4EFgQUzUMWQ1mtrjc1
-slM6B/4/w0r3aWswOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC5nbG9iYWxz
-aWduLm5ldC9lZHVjYXRpb25hbC5jcmwwTwYIKwYBBQUHAQEEQzBBMD8GCCsGAQUF
-BzAChjNodHRwOi8vc2VjdXJlLmdsb2JhbHNpZ24ubmV0L2NhY2VydC9lZHVjYXRp
-b25hbC5jcnQwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMCMGA1UdEQQc
-MBqCGGZlZGVyYXRpb24udS1ib3JkZWF1eC5mcjANBgkqhkiG9w0BAQUFAAOCAQEA
-PE0zsF/dzWiL+cDDZYKUpOh/hQjXx0pO6Aqpi3vW2N6S+FR5bm+jKI6C7fAYylOJ
-Rd4ZEMRjbCj6ttLlh0JHfr0fL+T4UhM8A2wJxIglMotc/bExITkGSbggtH6q8K2R
-tspC1yMPGzSdBCNMdAStJpvY9F8m9qcGioONc4aIcDOhr9WLGt9qlqXki2Faz+Yk
-qfeKlgSHRs/2w95X2X5ZYewPGZQRbrozPO6E8sYyD8PDHPRvYdemWBchBAg5vXHx
-BLp1hVyPYOp2E2ciIAxni5cb4RwWUEmud+VI8a8V6Q+HQNPFIEfcNO7azovMdh/K
-DwR9zqqffVjNz5LbLeGi7g==
-					    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.u-bordeaux4.fr/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">Université de Bordeaux IV - Montesquieu</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Université de Bordeaux IV - Montesquieu</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Coussy</SurName>
-    <EmailAddress>helene.coussy@u-bordeaux4.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.u-bordeaux4.fr.xml b/swamid-interfederations-2.0/idp.u-bordeaux4.fr.xml
deleted file mode 100644
index f06a600d..00000000
--- a/swamid-interfederations-2.0/idp.u-bordeaux4.fr.xml
+++ /dev/null
@@ -1,164 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.u-bordeaux4.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2009-06-19T16:44:21Z">
-      <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">u-bordeaux4.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">Université de Bordeaux IV - Montesquieu</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIEcTCCA1mgAwIBAgIQe/xNXBd/8nI5WdMYC8tEVTANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTE0MDEyNzAwMDAwMFoXDTE3MDIwMTIzNTk1OVowQDEhMB8GA1UE
-CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRswGQYDVQQDExJpZHAudS1ib3Jk
-ZWF1eDQuZnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDUm20TitE1
-eSHNsQsX3IIxBv3MO1wSuM5m6EZR47cQcXBw8G67R5aMb3VPpISDUhGrwIEChBA3
-TuzLIQg8krOO3O2q8Ci42EvR39yLd7RL4bySff6kqXjthY9ZrNMTidhaesrWYM1X
-LjpRfp6cYzxDm3tUnh1BOmzhTOpkTFWVKm7I/5H31G9Jsk4GoJLrQABYmXWKUkgE
-qDZFpmL1PaWBCfc0nI8yJTBJaNoDTvg8hyuYp2eqzYxeSYvUmiR1qB0XWSBcsGxI
-qj8Nwf8ZhG/svARsl8NHHtUUkouzRNceMizOW+4fYNWIAfN1usbILJhRH5x1W92G
-oYeft0ajN571AgMBAAGjggFvMIIBazAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3
-V0fqkOO57TAdBgNVHQ4EFgQU/ItUXC+Ogoq75dzOPDlSQzTrJ5swDgYDVR0PAQH/
-BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUF
-BwMCMCIGA1UdIAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQIBMDoGA1UdHwQz
-MDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0Eu
-Y3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50Y3Mu
-dGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9v
-Y3NwLnRjcy50ZXJlbmEub3JnMB0GA1UdEQQWMBSCEmlkcC51LWJvcmRlYXV4NC5m
-cjANBgkqhkiG9w0BAQUFAAOCAQEAqNFLvqI7svZtmwNEM2d6z4aRgLeNYYPUqwF4
-2DFOqEN6k4fwhfnM8S8qVvOawcufDp9Im0VAz+Km0Z26vz8wxknx5S47wABjQlJW
-XwIqwNROkistKPhifvb0y1dZCRC39X3ccRhrKpKeSxSCZIu9kJNyKlzmC4u8DcjL
-QHYdg931OMJTkXoWWNbHRJ5vVtk3kHnYCvv9sZrGpU1DQV6uVKpIKA5ELPGy/1Gj
-xxG5U3bUoJZkhqQTOeSBhoEDjxVDtn0d5cK8XkI3D4w5rHIhOaX5zGb6RBiMEKWN
-p3uNJNwuPeKlsQM3XwQJZVa6oIGNXHNpbTnKBA19nLCIhVIkzg==
-					    </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>
-					      MIIELDCCAxSgAwIBAgILAQAAAAABGgGKLagwDQYJKoZIhvcNAQEFBQAwXzELMAkG
-A1UEBhMCQkUxEzARBgNVBAoTCkN5YmVydHJ1c3QxFzAVBgNVBAsTDkVkdWNhdGlv
-bmFsIENBMSIwIAYDVQQDExlDeWJlcnRydXN0IEVkdWNhdGlvbmFsIENBMB4XDTA4
-MDUxOTE0MTY0MFoXDTExMDUxOTE0MTY0MFowUzELMAkGA1UEBhMCRlIxITAfBgNV
-BAoTGFVuaXZlcnNpdGUgZGUgQm9yZGVhdXggSTEhMB8GA1UEAxMYZmVkZXJhdGlv
-bi51LWJvcmRlYXV4LmZyMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDBXbfu
-j9ECYz1i9mB1ngG+owir54YduGNtw7+H5N8zXJ0eGnBJ46ckksm5fKk7Mbqw7fpy
-HxIkIcse78NBDPby+7szRy6to+LrEWLEQ4HZsuhBvN+k3WMbTsOysnWiYqhok4HT
-0gD5aGmW4f+vGHp8dIzP/zy8A+Kh3VST3giAHQIDAQABo4IBdzCCAXMwUAYDVR0g
-BEkwRzBFBgcqhkixPgEAMDowOAYIKwYBBQUHAgEWLGh0dHA6Ly93d3cuZ2xvYmFs
-c2lnbi5uZXQvcmVwb3NpdG9yeS9jcHMuY2ZtMA4GA1UdDwEB/wQEAwIFoDAfBgNV
-HSMEGDAWgBRlZaM91zsRowoHJTfJQkpbdndQ4TAdBgNVHQ4EFgQUzUMWQ1mtrjc1
-slM6B/4/w0r3aWswOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC5nbG9iYWxz
-aWduLm5ldC9lZHVjYXRpb25hbC5jcmwwTwYIKwYBBQUHAQEEQzBBMD8GCCsGAQUF
-BzAChjNodHRwOi8vc2VjdXJlLmdsb2JhbHNpZ24ubmV0L2NhY2VydC9lZHVjYXRp
-b25hbC5jcnQwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMCMGA1UdEQQc
-MBqCGGZlZGVyYXRpb24udS1ib3JkZWF1eC5mcjANBgkqhkiG9w0BAQUFAAOCAQEA
-PE0zsF/dzWiL+cDDZYKUpOh/hQjXx0pO6Aqpi3vW2N6S+FR5bm+jKI6C7fAYylOJ
-Rd4ZEMRjbCj6ttLlh0JHfr0fL+T4UhM8A2wJxIglMotc/bExITkGSbggtH6q8K2R
-tspC1yMPGzSdBCNMdAStJpvY9F8m9qcGioONc4aIcDOhr9WLGt9qlqXki2Faz+Yk
-qfeKlgSHRs/2w95X2X5ZYewPGZQRbrozPO6E8sYyD8PDHPRvYdemWBchBAg5vXHx
-BLp1hVyPYOp2E2ciIAxni5cb4RwWUEmud+VI8a8V6Q+HQNPFIEfcNO7azovMdh/K
-DwR9zqqffVjNz5LbLeGi7g==
-					    </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://idp.u-bordeaux4.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.u-bordeaux4.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.u-bordeaux4.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">u-bordeaux4.fr</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIEcTCCA1mgAwIBAgIQe/xNXBd/8nI5WdMYC8tEVTANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTE0MDEyNzAwMDAwMFoXDTE3MDIwMTIzNTk1OVowQDEhMB8GA1UE
-CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRswGQYDVQQDExJpZHAudS1ib3Jk
-ZWF1eDQuZnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDUm20TitE1
-eSHNsQsX3IIxBv3MO1wSuM5m6EZR47cQcXBw8G67R5aMb3VPpISDUhGrwIEChBA3
-TuzLIQg8krOO3O2q8Ci42EvR39yLd7RL4bySff6kqXjthY9ZrNMTidhaesrWYM1X
-LjpRfp6cYzxDm3tUnh1BOmzhTOpkTFWVKm7I/5H31G9Jsk4GoJLrQABYmXWKUkgE
-qDZFpmL1PaWBCfc0nI8yJTBJaNoDTvg8hyuYp2eqzYxeSYvUmiR1qB0XWSBcsGxI
-qj8Nwf8ZhG/svARsl8NHHtUUkouzRNceMizOW+4fYNWIAfN1usbILJhRH5x1W92G
-oYeft0ajN571AgMBAAGjggFvMIIBazAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3
-V0fqkOO57TAdBgNVHQ4EFgQU/ItUXC+Ogoq75dzOPDlSQzTrJ5swDgYDVR0PAQH/
-BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUF
-BwMCMCIGA1UdIAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQIBMDoGA1UdHwQz
-MDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0Eu
-Y3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50Y3Mu
-dGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9v
-Y3NwLnRjcy50ZXJlbmEub3JnMB0GA1UdEQQWMBSCEmlkcC51LWJvcmRlYXV4NC5m
-cjANBgkqhkiG9w0BAQUFAAOCAQEAqNFLvqI7svZtmwNEM2d6z4aRgLeNYYPUqwF4
-2DFOqEN6k4fwhfnM8S8qVvOawcufDp9Im0VAz+Km0Z26vz8wxknx5S47wABjQlJW
-XwIqwNROkistKPhifvb0y1dZCRC39X3ccRhrKpKeSxSCZIu9kJNyKlzmC4u8DcjL
-QHYdg931OMJTkXoWWNbHRJ5vVtk3kHnYCvv9sZrGpU1DQV6uVKpIKA5ELPGy/1Gj
-xxG5U3bUoJZkhqQTOeSBhoEDjxVDtn0d5cK8XkI3D4w5rHIhOaX5zGb6RBiMEKWN
-p3uNJNwuPeKlsQM3XwQJZVa6oIGNXHNpbTnKBA19nLCIhVIkzg==
-					    </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>
-					      MIIELDCCAxSgAwIBAgILAQAAAAABGgGKLagwDQYJKoZIhvcNAQEFBQAwXzELMAkG
-A1UEBhMCQkUxEzARBgNVBAoTCkN5YmVydHJ1c3QxFzAVBgNVBAsTDkVkdWNhdGlv
-bmFsIENBMSIwIAYDVQQDExlDeWJlcnRydXN0IEVkdWNhdGlvbmFsIENBMB4XDTA4
-MDUxOTE0MTY0MFoXDTExMDUxOTE0MTY0MFowUzELMAkGA1UEBhMCRlIxITAfBgNV
-BAoTGFVuaXZlcnNpdGUgZGUgQm9yZGVhdXggSTEhMB8GA1UEAxMYZmVkZXJhdGlv
-bi51LWJvcmRlYXV4LmZyMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDBXbfu
-j9ECYz1i9mB1ngG+owir54YduGNtw7+H5N8zXJ0eGnBJ46ckksm5fKk7Mbqw7fpy
-HxIkIcse78NBDPby+7szRy6to+LrEWLEQ4HZsuhBvN+k3WMbTsOysnWiYqhok4HT
-0gD5aGmW4f+vGHp8dIzP/zy8A+Kh3VST3giAHQIDAQABo4IBdzCCAXMwUAYDVR0g
-BEkwRzBFBgcqhkixPgEAMDowOAYIKwYBBQUHAgEWLGh0dHA6Ly93d3cuZ2xvYmFs
-c2lnbi5uZXQvcmVwb3NpdG9yeS9jcHMuY2ZtMA4GA1UdDwEB/wQEAwIFoDAfBgNV
-HSMEGDAWgBRlZaM91zsRowoHJTfJQkpbdndQ4TAdBgNVHQ4EFgQUzUMWQ1mtrjc1
-slM6B/4/w0r3aWswOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC5nbG9iYWxz
-aWduLm5ldC9lZHVjYXRpb25hbC5jcmwwTwYIKwYBBQUHAQEEQzBBMD8GCCsGAQUF
-BzAChjNodHRwOi8vc2VjdXJlLmdsb2JhbHNpZ24ubmV0L2NhY2VydC9lZHVjYXRp
-b25hbC5jcnQwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMCMGA1UdEQQc
-MBqCGGZlZGVyYXRpb24udS1ib3JkZWF1eC5mcjANBgkqhkiG9w0BAQUFAAOCAQEA
-PE0zsF/dzWiL+cDDZYKUpOh/hQjXx0pO6Aqpi3vW2N6S+FR5bm+jKI6C7fAYylOJ
-Rd4ZEMRjbCj6ttLlh0JHfr0fL+T4UhM8A2wJxIglMotc/bExITkGSbggtH6q8K2R
-tspC1yMPGzSdBCNMdAStJpvY9F8m9qcGioONc4aIcDOhr9WLGt9qlqXki2Faz+Yk
-qfeKlgSHRs/2w95X2X5ZYewPGZQRbrozPO6E8sYyD8PDHPRvYdemWBchBAg5vXHx
-BLp1hVyPYOp2E2ciIAxni5cb4RwWUEmud+VI8a8V6Q+HQNPFIEfcNO7azovMdh/K
-DwR9zqqffVjNz5LbLeGi7g==
-					    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.u-bordeaux4.fr/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">Université de Bordeaux IV - Montesquieu</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Université de Bordeaux IV - Montesquieu</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Coussy</SurName>
-    <EmailAddress>helene.coussy@u-bordeaux4.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.u-cergy.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.u-cergy.fr-idp-shibboleth.xml
deleted file mode 100644
index 058465bd..00000000
--- a/swamid-interfederations-2.0/idp.u-cergy.fr-idp-shibboleth.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.u-cergy.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2009-11-27T10:43:24Z">
-      <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">u-cergy.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">Université de Cergy Pontoise</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDJDCCAgygAwIBAgIVAL5VX/FyJxE+QaVPYflgTRs+IqDyMA0GCSqGSIb3DQEB
-BQUAMBkxFzAVBgNVBAMTDmlkcC51LWNlcmd5LmZyMB4XDTA5MTEyMDE1MTIyNVoX
-DTI5MTEyMDE1MTIyNVowGTEXMBUGA1UEAxMOaWRwLnUtY2VyZ3kuZnIwggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC7KhqnXYp0okpZLWhOZfE0/a6hGLOB
-08hVe7wynrKu5rBBXl290/67ral6I2o2Vb2moNpJ+/4Jfoq/dS6pJqGsAQAIIiuJ
-B7Cg1OI0xFSBCNlOw7Pl8790IeX+hDxwlmFCiedz8yU4QaqDypmr8minfUIrcLjE
-Q18eRsHCkRI9yHm6CzZ9qyX9I3pHvkYYwjrOcZ3MR4aWzG+c5IT73Th8SL0Wy6xF
-8BKsR5QFb2Lu4lbcIr3PQCmUTetj/4BbOucZG3s1T9T16I5jqLhfraAxkl6rlV5o
-dRN32vJqMIHWTHBt01SK1h0ox1vfClR86QGFsJDerIy3TRd9AvNwBLkFAgMBAAGj
-YzBhMEAGA1UdEQQ5MDeCDmlkcC51LWNlcmd5LmZyhiVodHRwczovL2lkcC51LWNl
-cmd5LmZyL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBSRFHgF1B3bXQf6voF95osf
-xbAbhDANBgkqhkiG9w0BAQUFAAOCAQEAtiS/TRfjM8+Ush2VSL/y73Qk6FSExEjQ
-ZEFb5YmXCwpnAmrzKTlTVDhaDyYPB5vMQf0PWN8MB1fOy9J7fnN1ENr0oUVwpgkZ
-88THCKybJbsY2NHhxSGVRIkxuIAKh1ofvR3A/9vwteGkzCZYTVloqUR85CBD2qWq
-zE7fqzssOVC0HYf0fuvZyEV1ix45zxhCVtuSjL/39ttUDNcAe0hbc4J+XdtseBXE
-+aj1Ghr+XBI3dG4FUhea8Ic6pTg3BPgSdEZVq2xumojU8lKa+1LzF4IY6YKATkz8
-o7TC7JeLaEP9IIl444TjCDusYcOd5ESjG4zw6KiQaO9Jpp2jOL/jMg==
-					    </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://idp.u-cergy.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.u-cergy.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.u-cergy.fr/idp/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Université de Cergy Pontoise</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Université de Cergy Pontoise</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <EmailAddress>disi-infra-systeme@ml.u-cergy.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.u-cergy.fr.xml b/swamid-interfederations-2.0/idp.u-cergy.fr.xml
deleted file mode 100644
index 058465bd..00000000
--- a/swamid-interfederations-2.0/idp.u-cergy.fr.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.u-cergy.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2009-11-27T10:43:24Z">
-      <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">u-cergy.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">Université de Cergy Pontoise</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDJDCCAgygAwIBAgIVAL5VX/FyJxE+QaVPYflgTRs+IqDyMA0GCSqGSIb3DQEB
-BQUAMBkxFzAVBgNVBAMTDmlkcC51LWNlcmd5LmZyMB4XDTA5MTEyMDE1MTIyNVoX
-DTI5MTEyMDE1MTIyNVowGTEXMBUGA1UEAxMOaWRwLnUtY2VyZ3kuZnIwggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC7KhqnXYp0okpZLWhOZfE0/a6hGLOB
-08hVe7wynrKu5rBBXl290/67ral6I2o2Vb2moNpJ+/4Jfoq/dS6pJqGsAQAIIiuJ
-B7Cg1OI0xFSBCNlOw7Pl8790IeX+hDxwlmFCiedz8yU4QaqDypmr8minfUIrcLjE
-Q18eRsHCkRI9yHm6CzZ9qyX9I3pHvkYYwjrOcZ3MR4aWzG+c5IT73Th8SL0Wy6xF
-8BKsR5QFb2Lu4lbcIr3PQCmUTetj/4BbOucZG3s1T9T16I5jqLhfraAxkl6rlV5o
-dRN32vJqMIHWTHBt01SK1h0ox1vfClR86QGFsJDerIy3TRd9AvNwBLkFAgMBAAGj
-YzBhMEAGA1UdEQQ5MDeCDmlkcC51LWNlcmd5LmZyhiVodHRwczovL2lkcC51LWNl
-cmd5LmZyL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBSRFHgF1B3bXQf6voF95osf
-xbAbhDANBgkqhkiG9w0BAQUFAAOCAQEAtiS/TRfjM8+Ush2VSL/y73Qk6FSExEjQ
-ZEFb5YmXCwpnAmrzKTlTVDhaDyYPB5vMQf0PWN8MB1fOy9J7fnN1ENr0oUVwpgkZ
-88THCKybJbsY2NHhxSGVRIkxuIAKh1ofvR3A/9vwteGkzCZYTVloqUR85CBD2qWq
-zE7fqzssOVC0HYf0fuvZyEV1ix45zxhCVtuSjL/39ttUDNcAe0hbc4J+XdtseBXE
-+aj1Ghr+XBI3dG4FUhea8Ic6pTg3BPgSdEZVq2xumojU8lKa+1LzF4IY6YKATkz8
-o7TC7JeLaEP9IIl444TjCDusYcOd5ESjG4zw6KiQaO9Jpp2jOL/jMg==
-					    </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://idp.u-cergy.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.u-cergy.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.u-cergy.fr/idp/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Université de Cergy Pontoise</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Université de Cergy Pontoise</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <EmailAddress>disi-infra-systeme@ml.u-cergy.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.u-clermont1.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.u-clermont1.fr-idp-shibboleth.xml
deleted file mode 100644
index a88eb565..00000000
--- a/swamid-interfederations-2.0/idp.u-clermont1.fr-idp-shibboleth.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://idp.u-clermont1.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2009-04-16T09:12:33Z">
-      <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">u-clermont1.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">Université de Clermont Ferrand 1 - Auvergne</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDMzCCAhugAwIBAgIUNwZDNaZ3tdkFE1H1v5fQOZ0h7xIwDQYJKoZIhvcNAQEF
-BQAwHTEbMBkGA1UEAxMSaWRwLnUtY2xlcm1vbnQxLmZyMB4XDTA4MTEyNjA4MjQy
-OFoXDTI4MTEyNjA4MjQyOFowHTEbMBkGA1UEAxMSaWRwLnUtY2xlcm1vbnQxLmZy
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAoz9+2ei+Cj+D9fmqSgXV
-iDUF2Fv9KCEoRmxpIVmQJExVgGpBPzAToKzPu6vP0UXnJTItEGq0cQiOZvdkiwjb
-i9lYCJTzp6NA8kSjfI0F7/U3DMAOaqBMIv5NaLkZTH+6YPAqMOBQOb1oBs4YsjW+
-elFvesreBaPmbSotHWCYgfnb29OLAg37CgAmqDjL7ymPAsE0tPgr9USyjtUhWXsI
-kz2A2OPd3Qy+EizPJevne5gNu/2nfa0RwxTUG7p9Q2FXhJj1Jg3Ijs0PwWpqSM/q
-qrmKActd9uzeHenor13kprK47Ep+K+xIV3CC0gFlRxbZohFrpqvXUun4Gyk3dOuq
-/QIDAQABo2swaTBIBgNVHREEQTA/ghJpZHAudS1jbGVybW9udDEuZnKGKWh0dHBz
-Oi8vaWRwLnUtY2xlcm1vbnQxLmZyL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBTP
-x7ipW2IlVbBux4f/glTdrZcq8zANBgkqhkiG9w0BAQUFAAOCAQEAAUqxVk6Dm5ZS
-jQl1fY+x4Qcc7kSE7vksmWNlhO5WC7NMftDOSzJaoyOlPlP15ONoSPaH/0R2rBRE
-FTvvQNQ7Mpckur1lnTFvLpkAaZ9YSe+wiksHeXQhxN8vb6PYT4Td1CS98efueae4
-1bFIzour2gi4h4e86Zgv18YAr5eBmp38mYYOghxwk67uVdwU2trVIi2EjSbE4AWL
-+tu/H6jCK1dMSPCt0UZnv0jSOGU+eCtDPOhD2P/338GEPw2NfwpB85TlGIOf5u0a
-KmDbVb0p+dFwUH3zICKCDJM7OBcUNDM/fcHMBWJ64r17AiGtdZ5Cj0dZQt4ClMC9
-Mcelq5/l9A==
-					    </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://idp.u-clermont1.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.u-clermont1.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.u-clermont1.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">u-clermont1.fr</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDMzCCAhugAwIBAgIUNwZDNaZ3tdkFE1H1v5fQOZ0h7xIwDQYJKoZIhvcNAQEF
-BQAwHTEbMBkGA1UEAxMSaWRwLnUtY2xlcm1vbnQxLmZyMB4XDTA4MTEyNjA4MjQy
-OFoXDTI4MTEyNjA4MjQyOFowHTEbMBkGA1UEAxMSaWRwLnUtY2xlcm1vbnQxLmZy
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAoz9+2ei+Cj+D9fmqSgXV
-iDUF2Fv9KCEoRmxpIVmQJExVgGpBPzAToKzPu6vP0UXnJTItEGq0cQiOZvdkiwjb
-i9lYCJTzp6NA8kSjfI0F7/U3DMAOaqBMIv5NaLkZTH+6YPAqMOBQOb1oBs4YsjW+
-elFvesreBaPmbSotHWCYgfnb29OLAg37CgAmqDjL7ymPAsE0tPgr9USyjtUhWXsI
-kz2A2OPd3Qy+EizPJevne5gNu/2nfa0RwxTUG7p9Q2FXhJj1Jg3Ijs0PwWpqSM/q
-qrmKActd9uzeHenor13kprK47Ep+K+xIV3CC0gFlRxbZohFrpqvXUun4Gyk3dOuq
-/QIDAQABo2swaTBIBgNVHREEQTA/ghJpZHAudS1jbGVybW9udDEuZnKGKWh0dHBz
-Oi8vaWRwLnUtY2xlcm1vbnQxLmZyL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBTP
-x7ipW2IlVbBux4f/glTdrZcq8zANBgkqhkiG9w0BAQUFAAOCAQEAAUqxVk6Dm5ZS
-jQl1fY+x4Qcc7kSE7vksmWNlhO5WC7NMftDOSzJaoyOlPlP15ONoSPaH/0R2rBRE
-FTvvQNQ7Mpckur1lnTFvLpkAaZ9YSe+wiksHeXQhxN8vb6PYT4Td1CS98efueae4
-1bFIzour2gi4h4e86Zgv18YAr5eBmp38mYYOghxwk67uVdwU2trVIi2EjSbE4AWL
-+tu/H6jCK1dMSPCt0UZnv0jSOGU+eCtDPOhD2P/338GEPw2NfwpB85TlGIOf5u0a
-KmDbVb0p+dFwUH3zICKCDJM7OBcUNDM/fcHMBWJ64r17AiGtdZ5Cj0dZQt4ClMC9
-Mcelq5/l9A==
-					    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.u-clermont1.fr/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">Université de Clermont Ferrand 1 - Auvergne</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Université de Clermont Ferrand 1 - Auvergne</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <EmailAddress>Fed-Admin@u-clermont1.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.u-clermont1.fr.xml b/swamid-interfederations-2.0/idp.u-clermont1.fr.xml
deleted file mode 100644
index a88eb565..00000000
--- a/swamid-interfederations-2.0/idp.u-clermont1.fr.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://idp.u-clermont1.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2009-04-16T09:12:33Z">
-      <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">u-clermont1.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">Université de Clermont Ferrand 1 - Auvergne</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDMzCCAhugAwIBAgIUNwZDNaZ3tdkFE1H1v5fQOZ0h7xIwDQYJKoZIhvcNAQEF
-BQAwHTEbMBkGA1UEAxMSaWRwLnUtY2xlcm1vbnQxLmZyMB4XDTA4MTEyNjA4MjQy
-OFoXDTI4MTEyNjA4MjQyOFowHTEbMBkGA1UEAxMSaWRwLnUtY2xlcm1vbnQxLmZy
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAoz9+2ei+Cj+D9fmqSgXV
-iDUF2Fv9KCEoRmxpIVmQJExVgGpBPzAToKzPu6vP0UXnJTItEGq0cQiOZvdkiwjb
-i9lYCJTzp6NA8kSjfI0F7/U3DMAOaqBMIv5NaLkZTH+6YPAqMOBQOb1oBs4YsjW+
-elFvesreBaPmbSotHWCYgfnb29OLAg37CgAmqDjL7ymPAsE0tPgr9USyjtUhWXsI
-kz2A2OPd3Qy+EizPJevne5gNu/2nfa0RwxTUG7p9Q2FXhJj1Jg3Ijs0PwWpqSM/q
-qrmKActd9uzeHenor13kprK47Ep+K+xIV3CC0gFlRxbZohFrpqvXUun4Gyk3dOuq
-/QIDAQABo2swaTBIBgNVHREEQTA/ghJpZHAudS1jbGVybW9udDEuZnKGKWh0dHBz
-Oi8vaWRwLnUtY2xlcm1vbnQxLmZyL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBTP
-x7ipW2IlVbBux4f/glTdrZcq8zANBgkqhkiG9w0BAQUFAAOCAQEAAUqxVk6Dm5ZS
-jQl1fY+x4Qcc7kSE7vksmWNlhO5WC7NMftDOSzJaoyOlPlP15ONoSPaH/0R2rBRE
-FTvvQNQ7Mpckur1lnTFvLpkAaZ9YSe+wiksHeXQhxN8vb6PYT4Td1CS98efueae4
-1bFIzour2gi4h4e86Zgv18YAr5eBmp38mYYOghxwk67uVdwU2trVIi2EjSbE4AWL
-+tu/H6jCK1dMSPCt0UZnv0jSOGU+eCtDPOhD2P/338GEPw2NfwpB85TlGIOf5u0a
-KmDbVb0p+dFwUH3zICKCDJM7OBcUNDM/fcHMBWJ64r17AiGtdZ5Cj0dZQt4ClMC9
-Mcelq5/l9A==
-					    </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://idp.u-clermont1.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.u-clermont1.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.u-clermont1.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">u-clermont1.fr</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDMzCCAhugAwIBAgIUNwZDNaZ3tdkFE1H1v5fQOZ0h7xIwDQYJKoZIhvcNAQEF
-BQAwHTEbMBkGA1UEAxMSaWRwLnUtY2xlcm1vbnQxLmZyMB4XDTA4MTEyNjA4MjQy
-OFoXDTI4MTEyNjA4MjQyOFowHTEbMBkGA1UEAxMSaWRwLnUtY2xlcm1vbnQxLmZy
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAoz9+2ei+Cj+D9fmqSgXV
-iDUF2Fv9KCEoRmxpIVmQJExVgGpBPzAToKzPu6vP0UXnJTItEGq0cQiOZvdkiwjb
-i9lYCJTzp6NA8kSjfI0F7/U3DMAOaqBMIv5NaLkZTH+6YPAqMOBQOb1oBs4YsjW+
-elFvesreBaPmbSotHWCYgfnb29OLAg37CgAmqDjL7ymPAsE0tPgr9USyjtUhWXsI
-kz2A2OPd3Qy+EizPJevne5gNu/2nfa0RwxTUG7p9Q2FXhJj1Jg3Ijs0PwWpqSM/q
-qrmKActd9uzeHenor13kprK47Ep+K+xIV3CC0gFlRxbZohFrpqvXUun4Gyk3dOuq
-/QIDAQABo2swaTBIBgNVHREEQTA/ghJpZHAudS1jbGVybW9udDEuZnKGKWh0dHBz
-Oi8vaWRwLnUtY2xlcm1vbnQxLmZyL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBTP
-x7ipW2IlVbBux4f/glTdrZcq8zANBgkqhkiG9w0BAQUFAAOCAQEAAUqxVk6Dm5ZS
-jQl1fY+x4Qcc7kSE7vksmWNlhO5WC7NMftDOSzJaoyOlPlP15ONoSPaH/0R2rBRE
-FTvvQNQ7Mpckur1lnTFvLpkAaZ9YSe+wiksHeXQhxN8vb6PYT4Td1CS98efueae4
-1bFIzour2gi4h4e86Zgv18YAr5eBmp38mYYOghxwk67uVdwU2trVIi2EjSbE4AWL
-+tu/H6jCK1dMSPCt0UZnv0jSOGU+eCtDPOhD2P/338GEPw2NfwpB85TlGIOf5u0a
-KmDbVb0p+dFwUH3zICKCDJM7OBcUNDM/fcHMBWJ64r17AiGtdZ5Cj0dZQt4ClMC9
-Mcelq5/l9A==
-					    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.u-clermont1.fr/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">Université de Clermont Ferrand 1 - Auvergne</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Université de Clermont Ferrand 1 - Auvergne</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <EmailAddress>Fed-Admin@u-clermont1.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.u-paris2.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.u-paris2.fr-idp-shibboleth.xml
deleted file mode 100644
index ea081388..00000000
--- a/swamid-interfederations-2.0/idp.u-paris2.fr-idp-shibboleth.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.u-paris2.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2010-05-04T13:52:38Z">
-      <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">u-paris2.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">Université de Paris 2 - Panthéon Assas</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDKDCCAhCgAwIBAgIVAINFA2whEjq7dIPf8YLpG746hePRMA0GCSqGSIb3DQEB
-BQUAMBoxGDAWBgNVBAMTD2lkcC51LXBhcmlzMi5mcjAeFw0xNDA0MjkwNzQ4MjJa
-Fw0zNDA0MjkwNzQ4MjJaMBoxGDAWBgNVBAMTD2lkcC51LXBhcmlzMi5mcjCCASIw
-DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANXXoMeffbh8zBylAJsvJYWVAvsl
-1i1KpJ4xVDftwXJAAc2rpzSH2vWZ4qXKm677GYWyrD6U5SC7tFrYKhnCIuTKyzyg
-Wa93DyjDngc92+ci6ESR3DbpTkLtu5QqCzp+MNy1X7ggo24YagZHwYSpu+ftIZtr
-bZhK0xou+sEXg7kap+QTCYI1WHs/S84p53FRzKdDENg3JwLY8bVSwHK/Ikdanq0S
-4HpCVS7nIxh/Pxj0dL7X7GqclJS5CQZWTvNgGfeI5pbtuN9EvUyYzIn7DL/ADhRh
-60Q8RAmFx6i7touVzWuLAaIOYKrQhf2BKZnRrRj27mxHfee9vWPryla0UBUCAwEA
-AaNlMGMwQgYDVR0RBDswOYIPaWRwLnUtcGFyaXMyLmZyhiZodHRwczovL2lkcC51
-LXBhcmlzMi5mci9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQU0UgDCtUMhwUc/VRK
-AG2CRoL4NpMwDQYJKoZIhvcNAQEFBQADggEBALyLQEriutI0U1ObNVQPGIT7qien
-9mvExaFkO4B0a4lIEpK19Mv2nVLxuJgd3Ov32GACN8kF8M+rldrlNEVNd6l3kW2I
-XhHLjOr4MHhWp9bzAOYZ6Nr28iOwcylDloHAcEUo+8iBwgiCrfcMAeF5EhRbyTIw
-pwo+ghS3u/1WiZwpZV7rQVaEWkW/fwaZBmELmI6C9clq9+qG0/a86tU1Caqjn34g
-xrX/4JKfdKHNuguH4eowRTHgjvkQKyTDcphzAnOr6CE8islttFut36iPvYYJO7t9
-ZOq3IDpQLAcll+GhtVWTmM1041GbGkbqzThB/ADpE/wl5efhlsP7vQEcOkE=
-					    </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://idp.u-paris2.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.u-paris2.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.u-paris2.fr/idp/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Université de Paris 2 - Panthéon Assas</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Université de Paris 2 - Panthéon Assas</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <EmailAddress>ssri@u-paris2.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.u-paris2.fr.xml b/swamid-interfederations-2.0/idp.u-paris2.fr.xml
deleted file mode 100644
index ea081388..00000000
--- a/swamid-interfederations-2.0/idp.u-paris2.fr.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.u-paris2.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2010-05-04T13:52:38Z">
-      <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">u-paris2.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">Université de Paris 2 - Panthéon Assas</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDKDCCAhCgAwIBAgIVAINFA2whEjq7dIPf8YLpG746hePRMA0GCSqGSIb3DQEB
-BQUAMBoxGDAWBgNVBAMTD2lkcC51LXBhcmlzMi5mcjAeFw0xNDA0MjkwNzQ4MjJa
-Fw0zNDA0MjkwNzQ4MjJaMBoxGDAWBgNVBAMTD2lkcC51LXBhcmlzMi5mcjCCASIw
-DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANXXoMeffbh8zBylAJsvJYWVAvsl
-1i1KpJ4xVDftwXJAAc2rpzSH2vWZ4qXKm677GYWyrD6U5SC7tFrYKhnCIuTKyzyg
-Wa93DyjDngc92+ci6ESR3DbpTkLtu5QqCzp+MNy1X7ggo24YagZHwYSpu+ftIZtr
-bZhK0xou+sEXg7kap+QTCYI1WHs/S84p53FRzKdDENg3JwLY8bVSwHK/Ikdanq0S
-4HpCVS7nIxh/Pxj0dL7X7GqclJS5CQZWTvNgGfeI5pbtuN9EvUyYzIn7DL/ADhRh
-60Q8RAmFx6i7touVzWuLAaIOYKrQhf2BKZnRrRj27mxHfee9vWPryla0UBUCAwEA
-AaNlMGMwQgYDVR0RBDswOYIPaWRwLnUtcGFyaXMyLmZyhiZodHRwczovL2lkcC51
-LXBhcmlzMi5mci9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQU0UgDCtUMhwUc/VRK
-AG2CRoL4NpMwDQYJKoZIhvcNAQEFBQADggEBALyLQEriutI0U1ObNVQPGIT7qien
-9mvExaFkO4B0a4lIEpK19Mv2nVLxuJgd3Ov32GACN8kF8M+rldrlNEVNd6l3kW2I
-XhHLjOr4MHhWp9bzAOYZ6Nr28iOwcylDloHAcEUo+8iBwgiCrfcMAeF5EhRbyTIw
-pwo+ghS3u/1WiZwpZV7rQVaEWkW/fwaZBmELmI6C9clq9+qG0/a86tU1Caqjn34g
-xrX/4JKfdKHNuguH4eowRTHgjvkQKyTDcphzAnOr6CE8islttFut36iPvYYJO7t9
-ZOq3IDpQLAcll+GhtVWTmM1041GbGkbqzThB/ADpE/wl5efhlsP7vQEcOkE=
-					    </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://idp.u-paris2.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.u-paris2.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.u-paris2.fr/idp/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Université de Paris 2 - Panthéon Assas</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Université de Paris 2 - Panthéon Assas</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <EmailAddress>ssri@u-paris2.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.u-picardie.fr-shibboleth.xml b/swamid-interfederations-2.0/idp.u-picardie.fr-shibboleth.xml
deleted file mode 100644
index a5296a3d..00000000
--- a/swamid-interfederations-2.0/idp.u-picardie.fr-shibboleth.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://idp.u-picardie.fr/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2011-11-30T17:34:18Z">
-      <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">u-picardie.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">Université de Picardie Jules Verne</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDLzCCAhegAwIBAgIUc8NfuYdK4dyRrkHm6/tLQySUqJIwDQYJKoZIhvcNAQEF
-BQAwHDEaMBgGA1UEAwwRaWRwLnUtcGljYXJkaWUuZnIwHhcNMTQxMDE2MDcwNzMz
-WhcNMzQxMDE2MDcwNzMzWjAcMRowGAYDVQQDDBFpZHAudS1waWNhcmRpZS5mcjCC
-ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAIXETB/OTBKk7/ZYdhwaXv/C
-aOZF3gT6kl41CEjA7l5cqbL92LV6FSxW0QnvoRogXqGsNoO54HfepaFWWAg9bTJR
-Jdb7SRGQGOhWcuYFag3Q6i5s6/GJaaeapAX5o0Rzld3/2/uPyeTQBtkfYYU//vgZ
-tE8Lf3HDYMJD1B9HuerE8glmEDLB0N/bxAAZI7T2BRmg8+PXnJOZ4SIk77eHMnP1
-Ae5JfKWeqfF8AgLxnP4JD7zHuQT8lB2JbfmAyf1bOSa7ivCEeDOh48rNnBV78uw5
-1N1cMRsIoc+bbd+jkElU8jCu4pbvRfU17pMePbfUnD7I8g0P8r7VJiUIxG7DIvMC
-AwEAAaNpMGcwHQYDVR0OBBYEFNIgDO/aawjPE0CQ0GfmqjVnE6GRMEYGA1UdEQQ/
-MD2CEWlkcC51LXBpY2FyZGllLmZyhihodHRwczovL2lkcC51LXBpY2FyZGllLmZy
-L2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3DQEBBQUAA4IBAQADjxTKGUIdJMklNUpE
-LiNIGAjS1VDb6B5HEzm6up7LejLhoHlyuioAUN44fxvCL1ohHxdIRw0x8KhGjdy1
-2U8GF3nFdW54Mq4UqAXeCcJ2l2zKhAwScsTvN/8M1tAD1u7nm/0gb8H82NPxsF3V
-M7WZ6QFH8UhZZ9a+oZOsLDokNV6RnkvSINxmNYzDFhe9QtYP07xjkOAYIwwS6nYz
-U+g/1EeMs9SHCFLDY5mjMXLXXLDCVFhQDN8ek//VqmEx+gTUDUcmMkxy+7rEMrIw
-zKSuEobTpLGYSGzMJJYF0NU6sMHnkurmFxA1S6tfm3DPniPJwR0RlSBpBeuJkqPg
-oubj
-					    </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>
-					      MIIDajCCAlKgAwIBAgIVANKhuMi11QAW10TrFPegvTUOqn3bMA0GCSqGSIb3DQEB
-BQUAMCoxKDAmBgNVBAMTH3NoaWJib2xldGgtMDEud2ViLnUtcGljYXJkaWUuZnIw
-HhcNMTEwNjE2MTE0MzAyWhcNMzEwNjE2MTE0MzAyWjAqMSgwJgYDVQQDEx9zaGli
-Ym9sZXRoLTAxLndlYi51LXBpY2FyZGllLmZyMIIBIjANBgkqhkiG9w0BAQEFAAOC
-AQ8AMIIBCgKCAQEAqE10/hCWipQR0b5yUl7RBSKmdCR7FaKoKlItTYH6cUg+4VtL
-ch6TfC3a5sKWxUpvaiIxhGFY9tJLAOZBIPhCmxDL9qVhEWrDSDSVZlrRDk0gcz6s
-1seesw5PfBV5NFrSdAcm5kXq06w7Q4zU+Zp3SMxpO1NwacYxqGSJkbB+PzuB0HXK
-VDTxRpLCuBIW/YVPSQLGasX/eyfz0w+ZL5h4aH3iQ4KGX+hfWAWLTOqFoTrtnUvc
-0g39O8X4F1hvT5sa+EHH6zcKgFGsAdTJ9DJ8EP7vrC0hpaoZ+v44+nQVDu3U21gU
-of0STgejsbENg90Ry5ETJ8FFeJjD8aYBL4hQnwIDAQABo4GGMIGDMGIGA1UdEQRb
-MFmCH3NoaWJib2xldGgtMDEud2ViLnUtcGljYXJkaWUuZnKGNmh0dHBzOi8vc2hp
-YmJvbGV0aC0wMS53ZWIudS1waWNhcmRpZS5mci9pZHAvc2hpYmJvbGV0aDAdBgNV
-HQ4EFgQUlFARoLe/bZx6V/mwyt/kNXyC1CgwDQYJKoZIhvcNAQEFBQADggEBAAHn
-NetmyI9pEXPUOCLCBuZqddqeNpZi1vE5QUH7N0C+W1ntw8aM4G0lT0CKCUfMMcqY
-lWeP/+dHv2pFi3imv1VosjP8K0eeUAoi4PWJd2kcTJ5SnTL+Qw6ZXLWstgGcWtKZ
-cj7epGci4G2/mw/9k7FR51Yt9FrFZJDc84jwAbO5W+EJNO88hbkm+bRJNiM9Z/3m
-QGrTBMYBD3Ut9DV1bjYzfCVAB1UkYOJLtLYIk+BxT0WJw5eiAGycuu4IXiGiTWrH
-r+QqS3A3s1MpUhjcsw8FjQI13dTP9JbxHe7m/B44rp2myRaIj5iL9OBrd/Wgmu3d
-6zEip/VxKw2xk8VatR4=
-					    </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://idp.u-picardie.fr/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.u-picardie.fr/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.u-picardie.fr/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Université de Picardie Jules Verne</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Université de Picardie Jules Verne</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Jean Charles Delépine</SurName>
-    <EmailAddress>delepine@u-picardie.fr</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <SurName>Julien Marignale</SurName>
-    <EmailAddress>Julien.Marignale@u-picardie.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.u-picardie.fr.xml b/swamid-interfederations-2.0/idp.u-picardie.fr.xml
deleted file mode 100644
index a5296a3d..00000000
--- a/swamid-interfederations-2.0/idp.u-picardie.fr.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://idp.u-picardie.fr/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2011-11-30T17:34:18Z">
-      <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">u-picardie.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">Université de Picardie Jules Verne</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDLzCCAhegAwIBAgIUc8NfuYdK4dyRrkHm6/tLQySUqJIwDQYJKoZIhvcNAQEF
-BQAwHDEaMBgGA1UEAwwRaWRwLnUtcGljYXJkaWUuZnIwHhcNMTQxMDE2MDcwNzMz
-WhcNMzQxMDE2MDcwNzMzWjAcMRowGAYDVQQDDBFpZHAudS1waWNhcmRpZS5mcjCC
-ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAIXETB/OTBKk7/ZYdhwaXv/C
-aOZF3gT6kl41CEjA7l5cqbL92LV6FSxW0QnvoRogXqGsNoO54HfepaFWWAg9bTJR
-Jdb7SRGQGOhWcuYFag3Q6i5s6/GJaaeapAX5o0Rzld3/2/uPyeTQBtkfYYU//vgZ
-tE8Lf3HDYMJD1B9HuerE8glmEDLB0N/bxAAZI7T2BRmg8+PXnJOZ4SIk77eHMnP1
-Ae5JfKWeqfF8AgLxnP4JD7zHuQT8lB2JbfmAyf1bOSa7ivCEeDOh48rNnBV78uw5
-1N1cMRsIoc+bbd+jkElU8jCu4pbvRfU17pMePbfUnD7I8g0P8r7VJiUIxG7DIvMC
-AwEAAaNpMGcwHQYDVR0OBBYEFNIgDO/aawjPE0CQ0GfmqjVnE6GRMEYGA1UdEQQ/
-MD2CEWlkcC51LXBpY2FyZGllLmZyhihodHRwczovL2lkcC51LXBpY2FyZGllLmZy
-L2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3DQEBBQUAA4IBAQADjxTKGUIdJMklNUpE
-LiNIGAjS1VDb6B5HEzm6up7LejLhoHlyuioAUN44fxvCL1ohHxdIRw0x8KhGjdy1
-2U8GF3nFdW54Mq4UqAXeCcJ2l2zKhAwScsTvN/8M1tAD1u7nm/0gb8H82NPxsF3V
-M7WZ6QFH8UhZZ9a+oZOsLDokNV6RnkvSINxmNYzDFhe9QtYP07xjkOAYIwwS6nYz
-U+g/1EeMs9SHCFLDY5mjMXLXXLDCVFhQDN8ek//VqmEx+gTUDUcmMkxy+7rEMrIw
-zKSuEobTpLGYSGzMJJYF0NU6sMHnkurmFxA1S6tfm3DPniPJwR0RlSBpBeuJkqPg
-oubj
-					    </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>
-					      MIIDajCCAlKgAwIBAgIVANKhuMi11QAW10TrFPegvTUOqn3bMA0GCSqGSIb3DQEB
-BQUAMCoxKDAmBgNVBAMTH3NoaWJib2xldGgtMDEud2ViLnUtcGljYXJkaWUuZnIw
-HhcNMTEwNjE2MTE0MzAyWhcNMzEwNjE2MTE0MzAyWjAqMSgwJgYDVQQDEx9zaGli
-Ym9sZXRoLTAxLndlYi51LXBpY2FyZGllLmZyMIIBIjANBgkqhkiG9w0BAQEFAAOC
-AQ8AMIIBCgKCAQEAqE10/hCWipQR0b5yUl7RBSKmdCR7FaKoKlItTYH6cUg+4VtL
-ch6TfC3a5sKWxUpvaiIxhGFY9tJLAOZBIPhCmxDL9qVhEWrDSDSVZlrRDk0gcz6s
-1seesw5PfBV5NFrSdAcm5kXq06w7Q4zU+Zp3SMxpO1NwacYxqGSJkbB+PzuB0HXK
-VDTxRpLCuBIW/YVPSQLGasX/eyfz0w+ZL5h4aH3iQ4KGX+hfWAWLTOqFoTrtnUvc
-0g39O8X4F1hvT5sa+EHH6zcKgFGsAdTJ9DJ8EP7vrC0hpaoZ+v44+nQVDu3U21gU
-of0STgejsbENg90Ry5ETJ8FFeJjD8aYBL4hQnwIDAQABo4GGMIGDMGIGA1UdEQRb
-MFmCH3NoaWJib2xldGgtMDEud2ViLnUtcGljYXJkaWUuZnKGNmh0dHBzOi8vc2hp
-YmJvbGV0aC0wMS53ZWIudS1waWNhcmRpZS5mci9pZHAvc2hpYmJvbGV0aDAdBgNV
-HQ4EFgQUlFARoLe/bZx6V/mwyt/kNXyC1CgwDQYJKoZIhvcNAQEFBQADggEBAAHn
-NetmyI9pEXPUOCLCBuZqddqeNpZi1vE5QUH7N0C+W1ntw8aM4G0lT0CKCUfMMcqY
-lWeP/+dHv2pFi3imv1VosjP8K0eeUAoi4PWJd2kcTJ5SnTL+Qw6ZXLWstgGcWtKZ
-cj7epGci4G2/mw/9k7FR51Yt9FrFZJDc84jwAbO5W+EJNO88hbkm+bRJNiM9Z/3m
-QGrTBMYBD3Ut9DV1bjYzfCVAB1UkYOJLtLYIk+BxT0WJw5eiAGycuu4IXiGiTWrH
-r+QqS3A3s1MpUhjcsw8FjQI13dTP9JbxHe7m/B44rp2myRaIj5iL9OBrd/Wgmu3d
-6zEip/VxKw2xk8VatR4=
-					    </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://idp.u-picardie.fr/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.u-picardie.fr/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.u-picardie.fr/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Université de Picardie Jules Verne</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Université de Picardie Jules Verne</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Jean Charles Delépine</SurName>
-    <EmailAddress>delepine@u-picardie.fr</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <SurName>Julien Marignale</SurName>
-    <EmailAddress>Julien.Marignale@u-picardie.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.ucuenca.edu.ec-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.ucuenca.edu.ec-idp-shibboleth.xml
deleted file mode 100644
index 1967e960..00000000
--- a/swamid-interfederations-2.0/idp.ucuenca.edu.ec-idp-shibboleth.xml
+++ /dev/null
@@ -1,160 +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://idp.ucuenca.edu.ec/idp/shibboleth">
-  <md:Extensions xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata">
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://minga.cedia.org.ec" registrationInstant="2014-10-17T00:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="es">
-                                http://www.cedia.org.ec/minga
-                        </mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </md:Extensions>
-  <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 xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata">
-      <shibmd:Scope regexp="false">ucuenca.edu.ec</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">UCUENCA</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="es">UCUENCA</mdui:DisplayName>
-        <mdui:Description xml:lang="en">
-                                UCUENCA - University of Cuenca
-                        </mdui:Description>
-        <mdui:Description xml:lang="es">
-                                UCUENCA - Universidad de Cuenca
-                        </mdui:Description>
-        <mdui:InformationURL xml:lang="en">
-                                http://www.ucuenca.edu.ec
-                        </mdui:InformationURL>
-        <mdui:InformationURL xml:lang="es">
-                                http://www.ucuenca.edu.ec
-                        </mdui:InformationURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIHfzCCBWegAwIBAgIBCzANBgkqhkiG9w0BAQUFADCBvzELMAkGA1UEBhMCRUMx
-DjAMBgNVBAgTBUF6dWF5MQ8wDQYDVQQHEwZDdWVuY2ExDjAMBgNVBAoTBUNFRElB
-MUYwRAYDVQQLEz1Db25zb3JjaW8gRWN1YXRvcmlhbm8gcGFyYSBlbCBEZXNhcnJv
-bGxvIGRlIEludGVybmV0IEF2YW56YWRvMRYwFAYDVQQDEw1jYS5lZHVyb2FtLmVj
-MR8wHQYJKoZIhvcNAQkBFhBuZWdAY2VkaWEub3JnLmVjMB4XDTE0MDYyNjIyNDcz
-MloXDTE5MDYyNTIyNDczMlowgaAxCzAJBgNVBAYTAkVDMQ4wDAYDVQQIEwVBenVh
-eTEPMA0GA1UEBxMGQ3VlbmNhMRAwDgYDVQQKEwdVY3VlbmNhMR4wHAYDVQQLExVV
-bml2ZXJzaWRhZCBkZSBDdWVuY2ExGzAZBgNVBAMTEmlkcC51Y3VlbmNhLmVkdS5l
-YzEhMB8GCSqGSIb3DQEJARYSbm9jQHVjdWVuY2EuZWR1LmVjMIICIjANBgkqhkiG
-9w0BAQEFAAOCAg8AMIICCgKCAgEArwRQTiod9Z5u4YrlHPdCewpOVYyY194eam5W
-rlJElPDMmGwhwZiU2wj+gidLlzZl8Dg6/Yuz181aScrz44eZLMiHJEXHo/4Re3Gl
-YybeMbAHX6Tjxhr4Nn6iAFFnre6292ZoiKoG6yqEV08AEY5Tcs5dZClEYX+J5+uG
-czIImWWCb0SE/6pGpK7wH9QJqVgWxxcoQKbHmMYyoRvJuEs6Bm0JFOZjBo62UPsF
-6+GFvlNE8JmlJFEAojq/OYZmZh44vu6iFWOc4CoGviScMFQMlL5VhltGNkjGz8EG
-iTqh6rvWB647lLif+W3lc3qIxh5FT+6A2Du0baZFK1oFyZpL7QOw0G9VNmbr168x
-KRpwLyBXSP6rIAuLe9ZSk1sRF3xt2ADL2Z4gaAY20TkFlCz3+wlE2XZaKK5mQOI1
-ZTvLHXiIFqZEXahrH8gJBLUPdjK6nsZbnETqcgiSXtzURX6Uga2/fqsdoFEOFv4s
-M+HvFbwbAtNRZ94i/AidlMGDjfDH3PUDX/Tf1k1IYoL4ElFrUUrC5V82Otoi6leV
-jk86diRPDF0CMZZ75g1A14KQNef/NE+OfVr3ffedJ8HwNfiCx8OXxzkuEehlH2wg
-Hkw3bybRgfQwUAjmRhLzljMYyjyEy1A97C1T7on/L5KjucwELjBsxEOGS2Jbs4aF
-uo4XNqUCAwEAAaOCAaEwggGdMAkGA1UdEwQCMAAwEQYJYIZIAYb4QgEBBAQDAgZA
-MCsGCWCGSAGG+EIBDQQeFhxUaW55Q0EgR2VuZXJhdGVkIENlcnRpZmljYXRlMB0G
-A1UdDgQWBBSoZLhY9p44fdwsaDeKAdjBTM8wgTCB9AYDVR0jBIHsMIHpgBRevkS8
-4mqdx4w4RVDNcpgsX1z+M6GBxaSBwjCBvzELMAkGA1UEBhMCRUMxDjAMBgNVBAgT
-BUF6dWF5MQ8wDQYDVQQHEwZDdWVuY2ExDjAMBgNVBAoTBUNFRElBMUYwRAYDVQQL
-Ez1Db25zb3JjaW8gRWN1YXRvcmlhbm8gcGFyYSBlbCBEZXNhcnJvbGxvIGRlIElu
-dGVybmV0IEF2YW56YWRvMRYwFAYDVQQDEw1jYS5lZHVyb2FtLmVjMR8wHQYJKoZI
-hvcNAQkBFhBuZWdAY2VkaWEub3JnLmVjggkA1DdxFsaoCnowGwYDVR0SBBQwEoEQ
-bmVnQGNlZGlhLm9yZy5lYzAdBgNVHREEFjAUgRJub2NAdWN1ZW5jYS5lZHUuZWMw
-DQYJKoZIhvcNAQEFBQADggIBABOPR7fu8jE4sX0G1INTL18vKTxP7TqEy+jBFYJU
-HG2IKUaJ3t8txI7vZWXQ8WHK+OiAE6wcSnw9qF/TYcImP8G9ZRw4exFqEOb6pWEC
-Dfy9yAh/MQb2YnJP86M7yTYjziDluACNr4Jtu5Y4ZjSMYXwLC7y2B2CfiSfx8lPH
-MYgLhHanEPaV+rYjlNylsYg9yZdM+OdB31FUWZ9n6oSlbCDHjjLciwg4dwK5TOlE
-KcftZjprpmuZVYniT8X36v4cp9nZdaNYbWKHRZ/Ks/uFp8STU60DWYqWtXSpXSK3
-94dDRbeWrCL8LoggTpUEt/H8sKcr2kia/QNSobXHTMOTj0Qh8PaaNmstXaE/DL+C
-PDf3y0MN6e9YWbeW6oMiKzXe+CeSj/XWGGrtYU/rftVUgKs4M6D+mTHpmnD+q1FT
-tTUixXd8UNu35L2Lm7VOmXdxBmrE5KGDUfAjlOULmfeAdis4Bid/zcIy7EassngZ
-Hn7KvhbATaUdIx6lqsNVyxUz7U2TFlIk70cm2iSkdvGlop0AgNEVry8MBgBw9AvT
-vALkOpAYlJFMYczcSNKSzPjh3cY7cUE0pIRqU4yCK4g69CEQVVnxnctxdhSh2w3W
-ho3ZWwDxAtglwPXJcZeQ9QXi7hzhFOcPg1HBpdKEmI9/9NoBciSkNgLwjwFKE5ri
-W8yj
-
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ucuenca.edu.ec:8443/idp/profile/SAML1/SOAP/Artifact Resolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ucuenca.edu.ec:8443/idp/profile/SAML2/SOAP/ArtifactResoluti on" index="2"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ucuenca.edu.ec/idp/profile/SAML2/Redirect/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ucuenca.edu.ec/idp/profile/SAML2/POST/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ucuenca.edu.ec: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.ucuenca.edu.ec/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ucuenca.edu.ec/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.ucuenca.edu.ec/idp/profile/SAML2/POST-SimpleSign/ SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ucuenca.edu.ec/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.ec</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-
-MIIHfzCCBWegAwIBAgIBCzANBgkqhkiG9w0BAQUFADCBvzELMAkGA1UEBhMCRUMx
-DjAMBgNVBAgTBUF6dWF5MQ8wDQYDVQQHEwZDdWVuY2ExDjAMBgNVBAoTBUNFRElB
-MUYwRAYDVQQLEz1Db25zb3JjaW8gRWN1YXRvcmlhbm8gcGFyYSBlbCBEZXNhcnJv
-bGxvIGRlIEludGVybmV0IEF2YW56YWRvMRYwFAYDVQQDEw1jYS5lZHVyb2FtLmVj
-MR8wHQYJKoZIhvcNAQkBFhBuZWdAY2VkaWEub3JnLmVjMB4XDTE0MDYyNjIyNDcz
-MloXDTE5MDYyNTIyNDczMlowgaAxCzAJBgNVBAYTAkVDMQ4wDAYDVQQIEwVBenVh
-eTEPMA0GA1UEBxMGQ3VlbmNhMRAwDgYDVQQKEwdVY3VlbmNhMR4wHAYDVQQLExVV
-bml2ZXJzaWRhZCBkZSBDdWVuY2ExGzAZBgNVBAMTEmlkcC51Y3VlbmNhLmVkdS5l
-YzEhMB8GCSqGSIb3DQEJARYSbm9jQHVjdWVuY2EuZWR1LmVjMIICIjANBgkqhkiG
-9w0BAQEFAAOCAg8AMIICCgKCAgEArwRQTiod9Z5u4YrlHPdCewpOVYyY194eam5W
-rlJElPDMmGwhwZiU2wj+gidLlzZl8Dg6/Yuz181aScrz44eZLMiHJEXHo/4Re3Gl
-YybeMbAHX6Tjxhr4Nn6iAFFnre6292ZoiKoG6yqEV08AEY5Tcs5dZClEYX+J5+uG
-czIImWWCb0SE/6pGpK7wH9QJqVgWxxcoQKbHmMYyoRvJuEs6Bm0JFOZjBo62UPsF
-6+GFvlNE8JmlJFEAojq/OYZmZh44vu6iFWOc4CoGviScMFQMlL5VhltGNkjGz8EG
-iTqh6rvWB647lLif+W3lc3qIxh5FT+6A2Du0baZFK1oFyZpL7QOw0G9VNmbr168x
-KRpwLyBXSP6rIAuLe9ZSk1sRF3xt2ADL2Z4gaAY20TkFlCz3+wlE2XZaKK5mQOI1
-ZTvLHXiIFqZEXahrH8gJBLUPdjK6nsZbnETqcgiSXtzURX6Uga2/fqsdoFEOFv4s
-M+HvFbwbAtNRZ94i/AidlMGDjfDH3PUDX/Tf1k1IYoL4ElFrUUrC5V82Otoi6leV
-jk86diRPDF0CMZZ75g1A14KQNef/NE+OfVr3ffedJ8HwNfiCx8OXxzkuEehlH2wg
-Hkw3bybRgfQwUAjmRhLzljMYyjyEy1A97C1T7on/L5KjucwELjBsxEOGS2Jbs4aF
-uo4XNqUCAwEAAaOCAaEwggGdMAkGA1UdEwQCMAAwEQYJYIZIAYb4QgEBBAQDAgZA
-MCsGCWCGSAGG+EIBDQQeFhxUaW55Q0EgR2VuZXJhdGVkIENlcnRpZmljYXRlMB0G
-A1UdDgQWBBSoZLhY9p44fdwsaDeKAdjBTM8wgTCB9AYDVR0jBIHsMIHpgBRevkS8
-4mqdx4w4RVDNcpgsX1z+M6GBxaSBwjCBvzELMAkGA1UEBhMCRUMxDjAMBgNVBAgT
-BUF6dWF5MQ8wDQYDVQQHEwZDdWVuY2ExDjAMBgNVBAoTBUNFRElBMUYwRAYDVQQL
-Ez1Db25zb3JjaW8gRWN1YXRvcmlhbm8gcGFyYSBlbCBEZXNhcnJvbGxvIGRlIElu
-dGVybmV0IEF2YW56YWRvMRYwFAYDVQQDEw1jYS5lZHVyb2FtLmVjMR8wHQYJKoZI
-hvcNAQkBFhBuZWdAY2VkaWEub3JnLmVjggkA1DdxFsaoCnowGwYDVR0SBBQwEoEQ
-bmVnQGNlZGlhLm9yZy5lYzAdBgNVHREEFjAUgRJub2NAdWN1ZW5jYS5lZHUuZWMw
-DQYJKoZIhvcNAQEFBQADggIBABOPR7fu8jE4sX0G1INTL18vKTxP7TqEy+jBFYJU
-HG2IKUaJ3t8txI7vZWXQ8WHK+OiAE6wcSnw9qF/TYcImP8G9ZRw4exFqEOb6pWEC
-Dfy9yAh/MQb2YnJP86M7yTYjziDluACNr4Jtu5Y4ZjSMYXwLC7y2B2CfiSfx8lPH
-MYgLhHanEPaV+rYjlNylsYg9yZdM+OdB31FUWZ9n6oSlbCDHjjLciwg4dwK5TOlE
-KcftZjprpmuZVYniT8X36v4cp9nZdaNYbWKHRZ/Ks/uFp8STU60DWYqWtXSpXSK3
-94dDRbeWrCL8LoggTpUEt/H8sKcr2kia/QNSobXHTMOTj0Qh8PaaNmstXaE/DL+C
-PDf3y0MN6e9YWbeW6oMiKzXe+CeSj/XWGGrtYU/rftVUgKs4M6D+mTHpmnD+q1FT
-tTUixXd8UNu35L2Lm7VOmXdxBmrE5KGDUfAjlOULmfeAdis4Bid/zcIy7EassngZ
-Hn7KvhbATaUdIx6lqsNVyxUz7U2TFlIk70cm2iSkdvGlop0AgNEVry8MBgBw9AvT
-vALkOpAYlJFMYczcSNKSzPjh3cY7cUE0pIRqU4yCK4g69CEQVVnxnctxdhSh2w3W
-ho3ZWwDxAtglwPXJcZeQ9QXi7hzhFOcPg1HBpdKEmI9/9NoBciSkNgLwjwFKE5ri
-W8yj
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ucuenca.edu.ec:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ucuenca.edu.ec: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">UCUENCA - Universidad de Cuenca</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Ucuenca - Universidad de Cuenca</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.ucuenca.edu.ec.ec/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Claudio Chacon A</SurName>
-    <EmailAddress>noc@ucuenca.edu.ec</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.ucuenca.edu.ec.xml b/swamid-interfederations-2.0/idp.ucuenca.edu.ec.xml
deleted file mode 100644
index 1967e960..00000000
--- a/swamid-interfederations-2.0/idp.ucuenca.edu.ec.xml
+++ /dev/null
@@ -1,160 +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://idp.ucuenca.edu.ec/idp/shibboleth">
-  <md:Extensions xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata">
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://minga.cedia.org.ec" registrationInstant="2014-10-17T00:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="es">
-                                http://www.cedia.org.ec/minga
-                        </mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </md:Extensions>
-  <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 xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata">
-      <shibmd:Scope regexp="false">ucuenca.edu.ec</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">UCUENCA</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="es">UCUENCA</mdui:DisplayName>
-        <mdui:Description xml:lang="en">
-                                UCUENCA - University of Cuenca
-                        </mdui:Description>
-        <mdui:Description xml:lang="es">
-                                UCUENCA - Universidad de Cuenca
-                        </mdui:Description>
-        <mdui:InformationURL xml:lang="en">
-                                http://www.ucuenca.edu.ec
-                        </mdui:InformationURL>
-        <mdui:InformationURL xml:lang="es">
-                                http://www.ucuenca.edu.ec
-                        </mdui:InformationURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIHfzCCBWegAwIBAgIBCzANBgkqhkiG9w0BAQUFADCBvzELMAkGA1UEBhMCRUMx
-DjAMBgNVBAgTBUF6dWF5MQ8wDQYDVQQHEwZDdWVuY2ExDjAMBgNVBAoTBUNFRElB
-MUYwRAYDVQQLEz1Db25zb3JjaW8gRWN1YXRvcmlhbm8gcGFyYSBlbCBEZXNhcnJv
-bGxvIGRlIEludGVybmV0IEF2YW56YWRvMRYwFAYDVQQDEw1jYS5lZHVyb2FtLmVj
-MR8wHQYJKoZIhvcNAQkBFhBuZWdAY2VkaWEub3JnLmVjMB4XDTE0MDYyNjIyNDcz
-MloXDTE5MDYyNTIyNDczMlowgaAxCzAJBgNVBAYTAkVDMQ4wDAYDVQQIEwVBenVh
-eTEPMA0GA1UEBxMGQ3VlbmNhMRAwDgYDVQQKEwdVY3VlbmNhMR4wHAYDVQQLExVV
-bml2ZXJzaWRhZCBkZSBDdWVuY2ExGzAZBgNVBAMTEmlkcC51Y3VlbmNhLmVkdS5l
-YzEhMB8GCSqGSIb3DQEJARYSbm9jQHVjdWVuY2EuZWR1LmVjMIICIjANBgkqhkiG
-9w0BAQEFAAOCAg8AMIICCgKCAgEArwRQTiod9Z5u4YrlHPdCewpOVYyY194eam5W
-rlJElPDMmGwhwZiU2wj+gidLlzZl8Dg6/Yuz181aScrz44eZLMiHJEXHo/4Re3Gl
-YybeMbAHX6Tjxhr4Nn6iAFFnre6292ZoiKoG6yqEV08AEY5Tcs5dZClEYX+J5+uG
-czIImWWCb0SE/6pGpK7wH9QJqVgWxxcoQKbHmMYyoRvJuEs6Bm0JFOZjBo62UPsF
-6+GFvlNE8JmlJFEAojq/OYZmZh44vu6iFWOc4CoGviScMFQMlL5VhltGNkjGz8EG
-iTqh6rvWB647lLif+W3lc3qIxh5FT+6A2Du0baZFK1oFyZpL7QOw0G9VNmbr168x
-KRpwLyBXSP6rIAuLe9ZSk1sRF3xt2ADL2Z4gaAY20TkFlCz3+wlE2XZaKK5mQOI1
-ZTvLHXiIFqZEXahrH8gJBLUPdjK6nsZbnETqcgiSXtzURX6Uga2/fqsdoFEOFv4s
-M+HvFbwbAtNRZ94i/AidlMGDjfDH3PUDX/Tf1k1IYoL4ElFrUUrC5V82Otoi6leV
-jk86diRPDF0CMZZ75g1A14KQNef/NE+OfVr3ffedJ8HwNfiCx8OXxzkuEehlH2wg
-Hkw3bybRgfQwUAjmRhLzljMYyjyEy1A97C1T7on/L5KjucwELjBsxEOGS2Jbs4aF
-uo4XNqUCAwEAAaOCAaEwggGdMAkGA1UdEwQCMAAwEQYJYIZIAYb4QgEBBAQDAgZA
-MCsGCWCGSAGG+EIBDQQeFhxUaW55Q0EgR2VuZXJhdGVkIENlcnRpZmljYXRlMB0G
-A1UdDgQWBBSoZLhY9p44fdwsaDeKAdjBTM8wgTCB9AYDVR0jBIHsMIHpgBRevkS8
-4mqdx4w4RVDNcpgsX1z+M6GBxaSBwjCBvzELMAkGA1UEBhMCRUMxDjAMBgNVBAgT
-BUF6dWF5MQ8wDQYDVQQHEwZDdWVuY2ExDjAMBgNVBAoTBUNFRElBMUYwRAYDVQQL
-Ez1Db25zb3JjaW8gRWN1YXRvcmlhbm8gcGFyYSBlbCBEZXNhcnJvbGxvIGRlIElu
-dGVybmV0IEF2YW56YWRvMRYwFAYDVQQDEw1jYS5lZHVyb2FtLmVjMR8wHQYJKoZI
-hvcNAQkBFhBuZWdAY2VkaWEub3JnLmVjggkA1DdxFsaoCnowGwYDVR0SBBQwEoEQ
-bmVnQGNlZGlhLm9yZy5lYzAdBgNVHREEFjAUgRJub2NAdWN1ZW5jYS5lZHUuZWMw
-DQYJKoZIhvcNAQEFBQADggIBABOPR7fu8jE4sX0G1INTL18vKTxP7TqEy+jBFYJU
-HG2IKUaJ3t8txI7vZWXQ8WHK+OiAE6wcSnw9qF/TYcImP8G9ZRw4exFqEOb6pWEC
-Dfy9yAh/MQb2YnJP86M7yTYjziDluACNr4Jtu5Y4ZjSMYXwLC7y2B2CfiSfx8lPH
-MYgLhHanEPaV+rYjlNylsYg9yZdM+OdB31FUWZ9n6oSlbCDHjjLciwg4dwK5TOlE
-KcftZjprpmuZVYniT8X36v4cp9nZdaNYbWKHRZ/Ks/uFp8STU60DWYqWtXSpXSK3
-94dDRbeWrCL8LoggTpUEt/H8sKcr2kia/QNSobXHTMOTj0Qh8PaaNmstXaE/DL+C
-PDf3y0MN6e9YWbeW6oMiKzXe+CeSj/XWGGrtYU/rftVUgKs4M6D+mTHpmnD+q1FT
-tTUixXd8UNu35L2Lm7VOmXdxBmrE5KGDUfAjlOULmfeAdis4Bid/zcIy7EassngZ
-Hn7KvhbATaUdIx6lqsNVyxUz7U2TFlIk70cm2iSkdvGlop0AgNEVry8MBgBw9AvT
-vALkOpAYlJFMYczcSNKSzPjh3cY7cUE0pIRqU4yCK4g69CEQVVnxnctxdhSh2w3W
-ho3ZWwDxAtglwPXJcZeQ9QXi7hzhFOcPg1HBpdKEmI9/9NoBciSkNgLwjwFKE5ri
-W8yj
-
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ucuenca.edu.ec:8443/idp/profile/SAML1/SOAP/Artifact Resolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ucuenca.edu.ec:8443/idp/profile/SAML2/SOAP/ArtifactResoluti on" index="2"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ucuenca.edu.ec/idp/profile/SAML2/Redirect/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ucuenca.edu.ec/idp/profile/SAML2/POST/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ucuenca.edu.ec: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.ucuenca.edu.ec/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ucuenca.edu.ec/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.ucuenca.edu.ec/idp/profile/SAML2/POST-SimpleSign/ SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ucuenca.edu.ec/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.ec</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-
-MIIHfzCCBWegAwIBAgIBCzANBgkqhkiG9w0BAQUFADCBvzELMAkGA1UEBhMCRUMx
-DjAMBgNVBAgTBUF6dWF5MQ8wDQYDVQQHEwZDdWVuY2ExDjAMBgNVBAoTBUNFRElB
-MUYwRAYDVQQLEz1Db25zb3JjaW8gRWN1YXRvcmlhbm8gcGFyYSBlbCBEZXNhcnJv
-bGxvIGRlIEludGVybmV0IEF2YW56YWRvMRYwFAYDVQQDEw1jYS5lZHVyb2FtLmVj
-MR8wHQYJKoZIhvcNAQkBFhBuZWdAY2VkaWEub3JnLmVjMB4XDTE0MDYyNjIyNDcz
-MloXDTE5MDYyNTIyNDczMlowgaAxCzAJBgNVBAYTAkVDMQ4wDAYDVQQIEwVBenVh
-eTEPMA0GA1UEBxMGQ3VlbmNhMRAwDgYDVQQKEwdVY3VlbmNhMR4wHAYDVQQLExVV
-bml2ZXJzaWRhZCBkZSBDdWVuY2ExGzAZBgNVBAMTEmlkcC51Y3VlbmNhLmVkdS5l
-YzEhMB8GCSqGSIb3DQEJARYSbm9jQHVjdWVuY2EuZWR1LmVjMIICIjANBgkqhkiG
-9w0BAQEFAAOCAg8AMIICCgKCAgEArwRQTiod9Z5u4YrlHPdCewpOVYyY194eam5W
-rlJElPDMmGwhwZiU2wj+gidLlzZl8Dg6/Yuz181aScrz44eZLMiHJEXHo/4Re3Gl
-YybeMbAHX6Tjxhr4Nn6iAFFnre6292ZoiKoG6yqEV08AEY5Tcs5dZClEYX+J5+uG
-czIImWWCb0SE/6pGpK7wH9QJqVgWxxcoQKbHmMYyoRvJuEs6Bm0JFOZjBo62UPsF
-6+GFvlNE8JmlJFEAojq/OYZmZh44vu6iFWOc4CoGviScMFQMlL5VhltGNkjGz8EG
-iTqh6rvWB647lLif+W3lc3qIxh5FT+6A2Du0baZFK1oFyZpL7QOw0G9VNmbr168x
-KRpwLyBXSP6rIAuLe9ZSk1sRF3xt2ADL2Z4gaAY20TkFlCz3+wlE2XZaKK5mQOI1
-ZTvLHXiIFqZEXahrH8gJBLUPdjK6nsZbnETqcgiSXtzURX6Uga2/fqsdoFEOFv4s
-M+HvFbwbAtNRZ94i/AidlMGDjfDH3PUDX/Tf1k1IYoL4ElFrUUrC5V82Otoi6leV
-jk86diRPDF0CMZZ75g1A14KQNef/NE+OfVr3ffedJ8HwNfiCx8OXxzkuEehlH2wg
-Hkw3bybRgfQwUAjmRhLzljMYyjyEy1A97C1T7on/L5KjucwELjBsxEOGS2Jbs4aF
-uo4XNqUCAwEAAaOCAaEwggGdMAkGA1UdEwQCMAAwEQYJYIZIAYb4QgEBBAQDAgZA
-MCsGCWCGSAGG+EIBDQQeFhxUaW55Q0EgR2VuZXJhdGVkIENlcnRpZmljYXRlMB0G
-A1UdDgQWBBSoZLhY9p44fdwsaDeKAdjBTM8wgTCB9AYDVR0jBIHsMIHpgBRevkS8
-4mqdx4w4RVDNcpgsX1z+M6GBxaSBwjCBvzELMAkGA1UEBhMCRUMxDjAMBgNVBAgT
-BUF6dWF5MQ8wDQYDVQQHEwZDdWVuY2ExDjAMBgNVBAoTBUNFRElBMUYwRAYDVQQL
-Ez1Db25zb3JjaW8gRWN1YXRvcmlhbm8gcGFyYSBlbCBEZXNhcnJvbGxvIGRlIElu
-dGVybmV0IEF2YW56YWRvMRYwFAYDVQQDEw1jYS5lZHVyb2FtLmVjMR8wHQYJKoZI
-hvcNAQkBFhBuZWdAY2VkaWEub3JnLmVjggkA1DdxFsaoCnowGwYDVR0SBBQwEoEQ
-bmVnQGNlZGlhLm9yZy5lYzAdBgNVHREEFjAUgRJub2NAdWN1ZW5jYS5lZHUuZWMw
-DQYJKoZIhvcNAQEFBQADggIBABOPR7fu8jE4sX0G1INTL18vKTxP7TqEy+jBFYJU
-HG2IKUaJ3t8txI7vZWXQ8WHK+OiAE6wcSnw9qF/TYcImP8G9ZRw4exFqEOb6pWEC
-Dfy9yAh/MQb2YnJP86M7yTYjziDluACNr4Jtu5Y4ZjSMYXwLC7y2B2CfiSfx8lPH
-MYgLhHanEPaV+rYjlNylsYg9yZdM+OdB31FUWZ9n6oSlbCDHjjLciwg4dwK5TOlE
-KcftZjprpmuZVYniT8X36v4cp9nZdaNYbWKHRZ/Ks/uFp8STU60DWYqWtXSpXSK3
-94dDRbeWrCL8LoggTpUEt/H8sKcr2kia/QNSobXHTMOTj0Qh8PaaNmstXaE/DL+C
-PDf3y0MN6e9YWbeW6oMiKzXe+CeSj/XWGGrtYU/rftVUgKs4M6D+mTHpmnD+q1FT
-tTUixXd8UNu35L2Lm7VOmXdxBmrE5KGDUfAjlOULmfeAdis4Bid/zcIy7EassngZ
-Hn7KvhbATaUdIx6lqsNVyxUz7U2TFlIk70cm2iSkdvGlop0AgNEVry8MBgBw9AvT
-vALkOpAYlJFMYczcSNKSzPjh3cY7cUE0pIRqU4yCK4g69CEQVVnxnctxdhSh2w3W
-ho3ZWwDxAtglwPXJcZeQ9QXi7hzhFOcPg1HBpdKEmI9/9NoBciSkNgLwjwFKE5ri
-W8yj
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ucuenca.edu.ec:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ucuenca.edu.ec: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">UCUENCA - Universidad de Cuenca</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Ucuenca - Universidad de Cuenca</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.ucuenca.edu.ec.ec/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Claudio Chacon A</SurName>
-    <EmailAddress>noc@ucuenca.edu.ec</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.ueb.cas.cz-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.ueb.cas.cz-idp-shibboleth.xml
deleted file mode 100644
index fdbf6e3f..00000000
--- a/swamid-interfederations-2.0/idp.ueb.cas.cz-idp-shibboleth.xml
+++ /dev/null
@@ -1,118 +0,0 @@
-<?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.ueb.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/" registrationInstant="2014-04-07T09:50:19Z">
-      <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>
-    <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://eduid.cz/uri/idp-group/avcr</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>
-      <shibmd:Scope regexp="false">ueb.cas.cz</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Institute of Experimental Botany AS CR</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="cs">Ústav experimentální botaniky AV ČR</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Identity Provider UEB AV CR employees.</mdui:Description>
-        <mdui:Description xml:lang="cs">Identity Provider pro zaměstnance UEB AV ČR</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.ueb.cas.cz/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="cs">http://www.ueb.cas.cz/</mdui:InformationURL>
-        <mdui:Logo height="44" width="74">https://jiftach.cas.cz/loga/logo-ueb-44.png</mdui:Logo>
-        <mdui:Logo height="411" width="960">https://jiftach.cas.cz/loga/logo-ueb-137.png</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDIzCCAgugAwIBAgIUHyGwRd1qr1kyh3xpoh7NDGHcOCEwDQYJKoZIhvcNAQEF
-BQAwGTEXMBUGA1UEAxMOaWRwLnVlYi5jYXMuY3owHhcNMTQwMzMxMDgwNDMxWhcN
-MzQwMzMxMDgwNDMxWjAZMRcwFQYDVQQDEw5pZHAudWViLmNhcy5jejCCASIwDQYJ
-KoZIhvcNAQEBBQADggEPADCCAQoCggEBAI/mgzyHJjo9tvPdwC/oCHl50NDMEj6d
-JeT6waZ8s39B3CjNvtuKZOng7C/LWD/PSafukUVzWSR7f1C2p2Cv1lcu6BzOfWRA
-1WEQ5G0CeEJinFRdDJhCwhvyZpXY7NKcN1hl64m7K/WnvjZzEXEcko9k9JF1qKTS
-bXa7p/miBDGLOOBpPcc7e1TQ6yyYpcjTVw6jGCaN8ELL9rXuB59nypLydNbmS1qL
-oxJJ306cl5uyt+p09lWu4AnUYjcJDpzng+qjMyac96fPqjWLTwfl2GQmWfA2zehd
-uKad6sO9pGgkulnccPrBo6tIPS2XQ0s4lBrKhbFY0C8UxndtFbwAIEsCAwEAAaNj
-MGEwQAYDVR0RBDkwN4IOaWRwLnVlYi5jYXMuY3qGJWh0dHBzOi8vaWRwLnVlYi5j
-YXMuY3ovaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFOcJV+6pYxQ7C0fQVs0eMtdd
-6f9AMA0GCSqGSIb3DQEBBQUAA4IBAQA8fi7T3V7TQJX7DLQqSsbw9c+ANvRCi/rm
-5GCPdphUBoRZl0p9a2X/waP0aAqJY1IwyAhzzzzaTlXKg6Jj0HkrLZJLECZMPvpM
-iTV7Le/b6sPURJSPUe9A4QExG8CAZhNIZPj+9Q/pS4qX0M9QtL3OoKE30UicL+6+
-AkhT2im4Zc1lmacedEQVFzMPL2dObjDFaYRlTsN2pXElZhrovJGyhIha2nApLR4v
-3JQTA6oUyYFCR2WbQrj00tGndynKeS2Mv0b5Wy8ZMka8DO66u7SMMe8BQ0o2pqXZ
-dCtc+UFehI+q6OrKFdSE+mtuSZkofFrYIdgJb0lqJlDYmfpi/hzS
-
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ueb.cas.cz:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ueb.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.ueb.cas.cz/idp/profile/SAML2/Redirect/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ueb.cas.cz/idp/profile/SAML2/POST/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ueb.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.ueb.cas.cz/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ueb.cas.cz/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.ueb.cas.cz/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ueb.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">ueb.cas.cz</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDIzCCAgugAwIBAgIUHyGwRd1qr1kyh3xpoh7NDGHcOCEwDQYJKoZIhvcNAQEF
-BQAwGTEXMBUGA1UEAxMOaWRwLnVlYi5jYXMuY3owHhcNMTQwMzMxMDgwNDMxWhcN
-MzQwMzMxMDgwNDMxWjAZMRcwFQYDVQQDEw5pZHAudWViLmNhcy5jejCCASIwDQYJ
-KoZIhvcNAQEBBQADggEPADCCAQoCggEBAI/mgzyHJjo9tvPdwC/oCHl50NDMEj6d
-JeT6waZ8s39B3CjNvtuKZOng7C/LWD/PSafukUVzWSR7f1C2p2Cv1lcu6BzOfWRA
-1WEQ5G0CeEJinFRdDJhCwhvyZpXY7NKcN1hl64m7K/WnvjZzEXEcko9k9JF1qKTS
-bXa7p/miBDGLOOBpPcc7e1TQ6yyYpcjTVw6jGCaN8ELL9rXuB59nypLydNbmS1qL
-oxJJ306cl5uyt+p09lWu4AnUYjcJDpzng+qjMyac96fPqjWLTwfl2GQmWfA2zehd
-uKad6sO9pGgkulnccPrBo6tIPS2XQ0s4lBrKhbFY0C8UxndtFbwAIEsCAwEAAaNj
-MGEwQAYDVR0RBDkwN4IOaWRwLnVlYi5jYXMuY3qGJWh0dHBzOi8vaWRwLnVlYi5j
-YXMuY3ovaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFOcJV+6pYxQ7C0fQVs0eMtdd
-6f9AMA0GCSqGSIb3DQEBBQUAA4IBAQA8fi7T3V7TQJX7DLQqSsbw9c+ANvRCi/rm
-5GCPdphUBoRZl0p9a2X/waP0aAqJY1IwyAhzzzzaTlXKg6Jj0HkrLZJLECZMPvpM
-iTV7Le/b6sPURJSPUe9A4QExG8CAZhNIZPj+9Q/pS4qX0M9QtL3OoKE30UicL+6+
-AkhT2im4Zc1lmacedEQVFzMPL2dObjDFaYRlTsN2pXElZhrovJGyhIha2nApLR4v
-3JQTA6oUyYFCR2WbQrj00tGndynKeS2Mv0b5Wy8ZMka8DO66u7SMMe8BQ0o2pqXZ
-dCtc+UFehI+q6OrKFdSE+mtuSZkofFrYIdgJb0lqJlDYmfpi/hzS
-
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ueb.cas.cz:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ueb.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 Experimental Botany AS CR</OrganizationName>
-    <OrganizationName xml:lang="cs">Ústav experimentální botaniky AV ČR</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Institute of Experimental Botany AS CR, v. v. i.</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="cs">Ústav experimentální botaniky AV ČR, v. v. i.</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.ueb.cas.cz/</OrganizationURL>
-    <OrganizationURL xml:lang="cs">http://www.ueb.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.ueb.cas.cz.xml b/swamid-interfederations-2.0/idp.ueb.cas.cz.xml
deleted file mode 100644
index fdbf6e3f..00000000
--- a/swamid-interfederations-2.0/idp.ueb.cas.cz.xml
+++ /dev/null
@@ -1,118 +0,0 @@
-<?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.ueb.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/" registrationInstant="2014-04-07T09:50:19Z">
-      <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>
-    <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://eduid.cz/uri/idp-group/avcr</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>
-      <shibmd:Scope regexp="false">ueb.cas.cz</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Institute of Experimental Botany AS CR</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="cs">Ústav experimentální botaniky AV ČR</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Identity Provider UEB AV CR employees.</mdui:Description>
-        <mdui:Description xml:lang="cs">Identity Provider pro zaměstnance UEB AV ČR</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.ueb.cas.cz/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="cs">http://www.ueb.cas.cz/</mdui:InformationURL>
-        <mdui:Logo height="44" width="74">https://jiftach.cas.cz/loga/logo-ueb-44.png</mdui:Logo>
-        <mdui:Logo height="411" width="960">https://jiftach.cas.cz/loga/logo-ueb-137.png</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDIzCCAgugAwIBAgIUHyGwRd1qr1kyh3xpoh7NDGHcOCEwDQYJKoZIhvcNAQEF
-BQAwGTEXMBUGA1UEAxMOaWRwLnVlYi5jYXMuY3owHhcNMTQwMzMxMDgwNDMxWhcN
-MzQwMzMxMDgwNDMxWjAZMRcwFQYDVQQDEw5pZHAudWViLmNhcy5jejCCASIwDQYJ
-KoZIhvcNAQEBBQADggEPADCCAQoCggEBAI/mgzyHJjo9tvPdwC/oCHl50NDMEj6d
-JeT6waZ8s39B3CjNvtuKZOng7C/LWD/PSafukUVzWSR7f1C2p2Cv1lcu6BzOfWRA
-1WEQ5G0CeEJinFRdDJhCwhvyZpXY7NKcN1hl64m7K/WnvjZzEXEcko9k9JF1qKTS
-bXa7p/miBDGLOOBpPcc7e1TQ6yyYpcjTVw6jGCaN8ELL9rXuB59nypLydNbmS1qL
-oxJJ306cl5uyt+p09lWu4AnUYjcJDpzng+qjMyac96fPqjWLTwfl2GQmWfA2zehd
-uKad6sO9pGgkulnccPrBo6tIPS2XQ0s4lBrKhbFY0C8UxndtFbwAIEsCAwEAAaNj
-MGEwQAYDVR0RBDkwN4IOaWRwLnVlYi5jYXMuY3qGJWh0dHBzOi8vaWRwLnVlYi5j
-YXMuY3ovaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFOcJV+6pYxQ7C0fQVs0eMtdd
-6f9AMA0GCSqGSIb3DQEBBQUAA4IBAQA8fi7T3V7TQJX7DLQqSsbw9c+ANvRCi/rm
-5GCPdphUBoRZl0p9a2X/waP0aAqJY1IwyAhzzzzaTlXKg6Jj0HkrLZJLECZMPvpM
-iTV7Le/b6sPURJSPUe9A4QExG8CAZhNIZPj+9Q/pS4qX0M9QtL3OoKE30UicL+6+
-AkhT2im4Zc1lmacedEQVFzMPL2dObjDFaYRlTsN2pXElZhrovJGyhIha2nApLR4v
-3JQTA6oUyYFCR2WbQrj00tGndynKeS2Mv0b5Wy8ZMka8DO66u7SMMe8BQ0o2pqXZ
-dCtc+UFehI+q6OrKFdSE+mtuSZkofFrYIdgJb0lqJlDYmfpi/hzS
-
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ueb.cas.cz:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ueb.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.ueb.cas.cz/idp/profile/SAML2/Redirect/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ueb.cas.cz/idp/profile/SAML2/POST/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ueb.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.ueb.cas.cz/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ueb.cas.cz/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.ueb.cas.cz/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ueb.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">ueb.cas.cz</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDIzCCAgugAwIBAgIUHyGwRd1qr1kyh3xpoh7NDGHcOCEwDQYJKoZIhvcNAQEF
-BQAwGTEXMBUGA1UEAxMOaWRwLnVlYi5jYXMuY3owHhcNMTQwMzMxMDgwNDMxWhcN
-MzQwMzMxMDgwNDMxWjAZMRcwFQYDVQQDEw5pZHAudWViLmNhcy5jejCCASIwDQYJ
-KoZIhvcNAQEBBQADggEPADCCAQoCggEBAI/mgzyHJjo9tvPdwC/oCHl50NDMEj6d
-JeT6waZ8s39B3CjNvtuKZOng7C/LWD/PSafukUVzWSR7f1C2p2Cv1lcu6BzOfWRA
-1WEQ5G0CeEJinFRdDJhCwhvyZpXY7NKcN1hl64m7K/WnvjZzEXEcko9k9JF1qKTS
-bXa7p/miBDGLOOBpPcc7e1TQ6yyYpcjTVw6jGCaN8ELL9rXuB59nypLydNbmS1qL
-oxJJ306cl5uyt+p09lWu4AnUYjcJDpzng+qjMyac96fPqjWLTwfl2GQmWfA2zehd
-uKad6sO9pGgkulnccPrBo6tIPS2XQ0s4lBrKhbFY0C8UxndtFbwAIEsCAwEAAaNj
-MGEwQAYDVR0RBDkwN4IOaWRwLnVlYi5jYXMuY3qGJWh0dHBzOi8vaWRwLnVlYi5j
-YXMuY3ovaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFOcJV+6pYxQ7C0fQVs0eMtdd
-6f9AMA0GCSqGSIb3DQEBBQUAA4IBAQA8fi7T3V7TQJX7DLQqSsbw9c+ANvRCi/rm
-5GCPdphUBoRZl0p9a2X/waP0aAqJY1IwyAhzzzzaTlXKg6Jj0HkrLZJLECZMPvpM
-iTV7Le/b6sPURJSPUe9A4QExG8CAZhNIZPj+9Q/pS4qX0M9QtL3OoKE30UicL+6+
-AkhT2im4Zc1lmacedEQVFzMPL2dObjDFaYRlTsN2pXElZhrovJGyhIha2nApLR4v
-3JQTA6oUyYFCR2WbQrj00tGndynKeS2Mv0b5Wy8ZMka8DO66u7SMMe8BQ0o2pqXZ
-dCtc+UFehI+q6OrKFdSE+mtuSZkofFrYIdgJb0lqJlDYmfpi/hzS
-
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ueb.cas.cz:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ueb.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 Experimental Botany AS CR</OrganizationName>
-    <OrganizationName xml:lang="cs">Ústav experimentální botaniky AV ČR</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Institute of Experimental Botany AS CR, v. v. i.</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="cs">Ústav experimentální botaniky AV ČR, v. v. i.</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.ueb.cas.cz/</OrganizationURL>
-    <OrganizationURL xml:lang="cs">http://www.ueb.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.uef.fi.xml b/swamid-interfederations-2.0/idp.uef.fi.xml
deleted file mode 100644
index 5c0771e6..00000000
--- a/swamid-interfederations-2.0/idp.uef.fi.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns: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.uef.fi/idp/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">uef.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>MIIDjDCCAnSgAwIBAgICBA8wDQYJKoZIhvcNAQEFBQAwgZAxCzAJBgNVBAYTAkZJ
-MQ8wDQYDVQQHDAZLdW9waW8xJjAkBgNVBAoMHVVuaXZlcnNpdHkgb2YgRWFzdGVy
-biBGaW5sYW5kMRAwDgYDVQQLDAdTaGliIENBMRQwEgYDVQQDDAtVRUYgU2hpYiBD
-QTEgMB4GCSqGSIb3DQEJARYRaG9zdG1hc3RlckB1ZWYuZmkwHhcNMTQwNDA5MTQx
-MTIzWhcNMjkwNDA1MTQxMTIzWjBZMQswCQYDVQQGEwJGSTEmMCQGA1UECgwdVW5p
-dmVyc2l0eSBvZiBFYXN0ZXJuIEZpbmxhbmQxDTALBgNVBAsMBFRpa2UxEzARBgNV
-BAMMCmlkcC51ZWYuZmkwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDE
-JZ1AwVGJ2S7FOsjH/vsvo2SEsUwN9QFdz4Kf+QBR50NaOocbl6wV6spOt//d/Tbp
-M9qs4Z9EgfT8hvCjNLRhI4m8w6XhYlA/MmBcxgQBYn19xoUTJ3DcJJddLIQsMU2H
-qOKoiYWwLL1ZQgbFG5ilZ15ZWpUXRBdDt9Hn8eK2SF2dPNrUKuAOZyDkMSY9cfwR
-pWrSUwX7Mm9+8TceZHWHaoPR2nbBABqBNuhXvZl6yK+bGXFvbPNGbMJTwXY/LJvc
-4x+sSDuR7HM5tGFcwFjVfj2yEva9BwG8jXWB/RSj7eleHLLM7+PvvR5axVaPbQ/9
-CIJjgPh1r8P8arKs140LAgMBAAGjJjAkMCIGA1UdEQQbMBmCCmlkcC51ZWYuZmmC
-C2lkcDIudWVmLmZpMA0GCSqGSIb3DQEBBQUAA4IBAQA9xGaMiAZM1Ivp3XcTeNn2
-2U/vcCD9fZ9FbrB9buJrECPFh31xJqCtY4gTqdJZl9Z9T3e3I8SqahRPdKX8QPed
-XpIjKfMDM9SBSzMFuSUWyVrbvNCrQScwX+qD5PlpsACQzAGC+Q2pF5lqVx9zERef
-fq7jOiSACuaC39ymek0Wok1k6Mes9krUmwJOdP4SjPmgzWCdeh9X/d3xHgUpg2x5
-Sami+WFaMgXxZxJhK+roCmH3hkSh3r8U7xlrnfckSfQ2es9PGYnFI6UlZJqqtrTc
-WGsRO8eC1kCnCdgVhnerPYdvl76LeqVtkqSwepNbrncvnyGIOh+jhD2yrwRV7oqQ</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:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.uef.fi/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="fi">Itä-Suomen yliopisto</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">University of Eastern Finland</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">Östra Finlands universitet</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="fi">Itä-Suomen yliopisto</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">University of Eastern Finland</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="sv">Östra Finlands universitet</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="fi">http://www.uef.fi</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.uef.fi</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sv">http://www.uef.fi</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Jarno</md:GivenName>
-    <md:SurName>Huuskonen</md:SurName>
-    <md:EmailAddress>mailto:haka-ilmoitukset@uef.fi</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Markus</md:GivenName>
-    <md:SurName>Hagman</md:SurName>
-    <md:EmailAddress>mailto:markus.hagman@uef.fi</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Jarno</md:GivenName>
-    <md:SurName>Huuskonen</md:SurName>
-    <md:EmailAddress>mailto:haka-ilmoitukset@uef.fi</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Jarno</md:GivenName>
-    <md:SurName>Huuskonen</md:SurName>
-    <md:EmailAddress>mailto:haka-ilmoitukset@uef.fi</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.ufe.cas.cz-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.ufe.cas.cz-idp-shibboleth.xml
deleted file mode 100644
index 1fb688b6..00000000
--- a/swamid-interfederations-2.0/idp.ufe.cas.cz-idp-shibboleth.xml
+++ /dev/null
@@ -1,118 +0,0 @@
-<?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.ufe.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/" registrationInstant="2014-06-12T10:58:21Z">
-      <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>
-    <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://eduid.cz/uri/idp-group/avcr</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>
-      <shibmd:Scope regexp="false">ufe.cas.cz</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Institute of Photonics and Electronics of the AS CR</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="cs">Ústav fotoniky a elektroniky, Akademie věd ČR</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Identity Provider UFE AV CR employees.</mdui:Description>
-        <mdui:Description xml:lang="cs">Identity Provider pro zaměstnance ÚFE AV ČR</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.ufe.cz/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="cs">http://www.ufe.cz/</mdui:InformationURL>
-        <mdui:Logo height="44" width="50">https://jiftach.cas.cz/loga/logo-ufe-44.png</mdui:Logo>
-        <mdui:Logo height="216" width="247">https://jiftach.cas.cz/loga/logo-ufe-216.png</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDIzCCAgugAwIBAgIUcKS5gFpqf8X/ZLLjYuIQpzjjeXkwDQYJKoZIhvcNAQEF
-BQAwGTEXMBUGA1UEAxMOaWRwLnVmZS5jYXMuY3owHhcNMTQwNTI3MTIxMDE5WhcN
-MzQwNTI3MTIxMDE5WjAZMRcwFQYDVQQDEw5pZHAudWZlLmNhcy5jejCCASIwDQYJ
-KoZIhvcNAQEBBQADggEPADCCAQoCggEBAL5cOnmanq68cqOF7oxg6U5BGUKlj5Wo
-sVPtKUjmSy57yzhLnrIZ9UMKESIuPuBuSKbyTnt7JbjounGkMiwhCIf61hJiOs8b
-JlptSG7WXnLbHcOhMWjiCmbWawWVTLyPNWTlUvUaq3JB5zGNQXOlILfn/UkHnbMl
-Ija8zQ5yhAYvHZ/maGHsnkx92ds87Kcxtz6CjIDlcbo/XAVoLizNWAedeji1FUbc
-EdOdDiJZN+OOnfVxPbDYcRc2uls3YloLsZtbyXO8lKViCiUSlPGPEelx8NxinDDY
-IwZ8hPpiu94Uv5lCkvo9XdAG7RBZsmqiodz0oXGIEsFscS6PKTa3MEUCAwEAAaNj
-MGEwQAYDVR0RBDkwN4IOaWRwLnVmZS5jYXMuY3qGJWh0dHBzOi8vaWRwLnVmZS5j
-YXMuY3ovaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFPVVqO7eJSBY4afM8pfpuTFT
-3rfqMA0GCSqGSIb3DQEBBQUAA4IBAQAg2FJw4TFDfXuCmJP3iPqVLlf+e5ViqQdo
-hum8X97d5zxkPtUShw6U5SLy4Styi36BdaIKsWiGodF+pmqse7QPeJyxRqDtUBUB
-9X4eWbxuhghrbROsP75/QmpqFJVBQiNYd+AyDNSmROseXxqMVqeZ+EzLtHPki0Yj
-3Os7z22eK8t8BBMnOrUskvKYEfFDHyf7rCirwK1vL53LHyPh1gSF7vPwvJ6Zvojh
-JNJvSY9ZNxjgsFNR7HEgyGNt59E+ITrLP2u4Ch2iy0n/tqZgiu6xjXJtIO1l+dDu
-hDT+yeRSzypRvdHOYKvyiqoNLBc/64BpcsCwvR2xGXwDjT2frVjp
-
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ufe.cas.cz:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ufe.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.ufe.cas.cz/idp/profile/SAML2/Redirect/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ufe.cas.cz/idp/profile/SAML2/POST/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ufe.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.ufe.cas.cz/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ufe.cas.cz/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.ufe.cas.cz/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ufe.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">ufe.cas.cz</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDIzCCAgugAwIBAgIUcKS5gFpqf8X/ZLLjYuIQpzjjeXkwDQYJKoZIhvcNAQEF
-BQAwGTEXMBUGA1UEAxMOaWRwLnVmZS5jYXMuY3owHhcNMTQwNTI3MTIxMDE5WhcN
-MzQwNTI3MTIxMDE5WjAZMRcwFQYDVQQDEw5pZHAudWZlLmNhcy5jejCCASIwDQYJ
-KoZIhvcNAQEBBQADggEPADCCAQoCggEBAL5cOnmanq68cqOF7oxg6U5BGUKlj5Wo
-sVPtKUjmSy57yzhLnrIZ9UMKESIuPuBuSKbyTnt7JbjounGkMiwhCIf61hJiOs8b
-JlptSG7WXnLbHcOhMWjiCmbWawWVTLyPNWTlUvUaq3JB5zGNQXOlILfn/UkHnbMl
-Ija8zQ5yhAYvHZ/maGHsnkx92ds87Kcxtz6CjIDlcbo/XAVoLizNWAedeji1FUbc
-EdOdDiJZN+OOnfVxPbDYcRc2uls3YloLsZtbyXO8lKViCiUSlPGPEelx8NxinDDY
-IwZ8hPpiu94Uv5lCkvo9XdAG7RBZsmqiodz0oXGIEsFscS6PKTa3MEUCAwEAAaNj
-MGEwQAYDVR0RBDkwN4IOaWRwLnVmZS5jYXMuY3qGJWh0dHBzOi8vaWRwLnVmZS5j
-YXMuY3ovaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFPVVqO7eJSBY4afM8pfpuTFT
-3rfqMA0GCSqGSIb3DQEBBQUAA4IBAQAg2FJw4TFDfXuCmJP3iPqVLlf+e5ViqQdo
-hum8X97d5zxkPtUShw6U5SLy4Styi36BdaIKsWiGodF+pmqse7QPeJyxRqDtUBUB
-9X4eWbxuhghrbROsP75/QmpqFJVBQiNYd+AyDNSmROseXxqMVqeZ+EzLtHPki0Yj
-3Os7z22eK8t8BBMnOrUskvKYEfFDHyf7rCirwK1vL53LHyPh1gSF7vPwvJ6Zvojh
-JNJvSY9ZNxjgsFNR7HEgyGNt59E+ITrLP2u4Ch2iy0n/tqZgiu6xjXJtIO1l+dDu
-hDT+yeRSzypRvdHOYKvyiqoNLBc/64BpcsCwvR2xGXwDjT2frVjp
-
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ufe.cas.cz:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ufe.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 Photonics and Electronics of the AS CR</OrganizationName>
-    <OrganizationName xml:lang="cs">Ústav fotoniky a elektroniky, Akademie věd ČR</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Institute of Photonics and Electronics of the AS CR, v.v.i.</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="cs">Ústav fotoniky a elektroniky, Akademie věd ČR, v.v.i.</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.ufe.cz/</OrganizationURL>
-    <OrganizationURL xml:lang="cs">http://www.ufe.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.ufe.cas.cz.xml b/swamid-interfederations-2.0/idp.ufe.cas.cz.xml
deleted file mode 100644
index 1fb688b6..00000000
--- a/swamid-interfederations-2.0/idp.ufe.cas.cz.xml
+++ /dev/null
@@ -1,118 +0,0 @@
-<?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.ufe.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/" registrationInstant="2014-06-12T10:58:21Z">
-      <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>
-    <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://eduid.cz/uri/idp-group/avcr</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>
-      <shibmd:Scope regexp="false">ufe.cas.cz</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Institute of Photonics and Electronics of the AS CR</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="cs">Ústav fotoniky a elektroniky, Akademie věd ČR</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Identity Provider UFE AV CR employees.</mdui:Description>
-        <mdui:Description xml:lang="cs">Identity Provider pro zaměstnance ÚFE AV ČR</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.ufe.cz/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="cs">http://www.ufe.cz/</mdui:InformationURL>
-        <mdui:Logo height="44" width="50">https://jiftach.cas.cz/loga/logo-ufe-44.png</mdui:Logo>
-        <mdui:Logo height="216" width="247">https://jiftach.cas.cz/loga/logo-ufe-216.png</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDIzCCAgugAwIBAgIUcKS5gFpqf8X/ZLLjYuIQpzjjeXkwDQYJKoZIhvcNAQEF
-BQAwGTEXMBUGA1UEAxMOaWRwLnVmZS5jYXMuY3owHhcNMTQwNTI3MTIxMDE5WhcN
-MzQwNTI3MTIxMDE5WjAZMRcwFQYDVQQDEw5pZHAudWZlLmNhcy5jejCCASIwDQYJ
-KoZIhvcNAQEBBQADggEPADCCAQoCggEBAL5cOnmanq68cqOF7oxg6U5BGUKlj5Wo
-sVPtKUjmSy57yzhLnrIZ9UMKESIuPuBuSKbyTnt7JbjounGkMiwhCIf61hJiOs8b
-JlptSG7WXnLbHcOhMWjiCmbWawWVTLyPNWTlUvUaq3JB5zGNQXOlILfn/UkHnbMl
-Ija8zQ5yhAYvHZ/maGHsnkx92ds87Kcxtz6CjIDlcbo/XAVoLizNWAedeji1FUbc
-EdOdDiJZN+OOnfVxPbDYcRc2uls3YloLsZtbyXO8lKViCiUSlPGPEelx8NxinDDY
-IwZ8hPpiu94Uv5lCkvo9XdAG7RBZsmqiodz0oXGIEsFscS6PKTa3MEUCAwEAAaNj
-MGEwQAYDVR0RBDkwN4IOaWRwLnVmZS5jYXMuY3qGJWh0dHBzOi8vaWRwLnVmZS5j
-YXMuY3ovaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFPVVqO7eJSBY4afM8pfpuTFT
-3rfqMA0GCSqGSIb3DQEBBQUAA4IBAQAg2FJw4TFDfXuCmJP3iPqVLlf+e5ViqQdo
-hum8X97d5zxkPtUShw6U5SLy4Styi36BdaIKsWiGodF+pmqse7QPeJyxRqDtUBUB
-9X4eWbxuhghrbROsP75/QmpqFJVBQiNYd+AyDNSmROseXxqMVqeZ+EzLtHPki0Yj
-3Os7z22eK8t8BBMnOrUskvKYEfFDHyf7rCirwK1vL53LHyPh1gSF7vPwvJ6Zvojh
-JNJvSY9ZNxjgsFNR7HEgyGNt59E+ITrLP2u4Ch2iy0n/tqZgiu6xjXJtIO1l+dDu
-hDT+yeRSzypRvdHOYKvyiqoNLBc/64BpcsCwvR2xGXwDjT2frVjp
-
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ufe.cas.cz:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ufe.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.ufe.cas.cz/idp/profile/SAML2/Redirect/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ufe.cas.cz/idp/profile/SAML2/POST/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ufe.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.ufe.cas.cz/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ufe.cas.cz/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.ufe.cas.cz/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ufe.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">ufe.cas.cz</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDIzCCAgugAwIBAgIUcKS5gFpqf8X/ZLLjYuIQpzjjeXkwDQYJKoZIhvcNAQEF
-BQAwGTEXMBUGA1UEAxMOaWRwLnVmZS5jYXMuY3owHhcNMTQwNTI3MTIxMDE5WhcN
-MzQwNTI3MTIxMDE5WjAZMRcwFQYDVQQDEw5pZHAudWZlLmNhcy5jejCCASIwDQYJ
-KoZIhvcNAQEBBQADggEPADCCAQoCggEBAL5cOnmanq68cqOF7oxg6U5BGUKlj5Wo
-sVPtKUjmSy57yzhLnrIZ9UMKESIuPuBuSKbyTnt7JbjounGkMiwhCIf61hJiOs8b
-JlptSG7WXnLbHcOhMWjiCmbWawWVTLyPNWTlUvUaq3JB5zGNQXOlILfn/UkHnbMl
-Ija8zQ5yhAYvHZ/maGHsnkx92ds87Kcxtz6CjIDlcbo/XAVoLizNWAedeji1FUbc
-EdOdDiJZN+OOnfVxPbDYcRc2uls3YloLsZtbyXO8lKViCiUSlPGPEelx8NxinDDY
-IwZ8hPpiu94Uv5lCkvo9XdAG7RBZsmqiodz0oXGIEsFscS6PKTa3MEUCAwEAAaNj
-MGEwQAYDVR0RBDkwN4IOaWRwLnVmZS5jYXMuY3qGJWh0dHBzOi8vaWRwLnVmZS5j
-YXMuY3ovaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFPVVqO7eJSBY4afM8pfpuTFT
-3rfqMA0GCSqGSIb3DQEBBQUAA4IBAQAg2FJw4TFDfXuCmJP3iPqVLlf+e5ViqQdo
-hum8X97d5zxkPtUShw6U5SLy4Styi36BdaIKsWiGodF+pmqse7QPeJyxRqDtUBUB
-9X4eWbxuhghrbROsP75/QmpqFJVBQiNYd+AyDNSmROseXxqMVqeZ+EzLtHPki0Yj
-3Os7z22eK8t8BBMnOrUskvKYEfFDHyf7rCirwK1vL53LHyPh1gSF7vPwvJ6Zvojh
-JNJvSY9ZNxjgsFNR7HEgyGNt59E+ITrLP2u4Ch2iy0n/tqZgiu6xjXJtIO1l+dDu
-hDT+yeRSzypRvdHOYKvyiqoNLBc/64BpcsCwvR2xGXwDjT2frVjp
-
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ufe.cas.cz:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ufe.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 Photonics and Electronics of the AS CR</OrganizationName>
-    <OrganizationName xml:lang="cs">Ústav fotoniky a elektroniky, Akademie věd ČR</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Institute of Photonics and Electronics of the AS CR, v.v.i.</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="cs">Ústav fotoniky a elektroniky, Akademie věd ČR, v.v.i.</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.ufe.cz/</OrganizationURL>
-    <OrganizationURL xml:lang="cs">http://www.ufe.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.ufgd.edu.br-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.ufgd.edu.br-idp-shibboleth.xml
deleted file mode 100644
index a417a233..00000000
--- a/swamid-interfederations-2.0/idp.ufgd.edu.br-idp-shibboleth.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://idp.ufgd.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">edu.br</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">UFGD - Universidade Federal da Grande Dourados </mdui:DisplayName>
-        <mdui:DisplayName xml:lang="pt-br">UFGD - Universidade Federal da Grande Dourados </mdui:DisplayName>
-        <mdui:Description xml:lang="en">UFGD - Universidade Federal da Grande Dourados </mdui:Description>
-        <mdui:Description xml:lang="pt-br">UFGD - Universidade Federal da Grande Dourados </mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.ufgd.edu.br/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="pt-br">http://www.ufgd.edu.br/</mdui:InformationURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-    MIIDtDCCApwCAQAwDQYJKoZIhvcNAQEFBQAwgZ8xNzA1BgNVBAoTLlVGR0QgLSBV
-bml2ZXJzaWRhZGUgRmVkZXJhbCBkYSBHcmFuZGUgRG91cmFkb3MxDTALBgNVBAsT
-BENPSU4xETAPBgNVBAcTCERvdXJhZG9zMRswGQYDVQQIExJNYXRvIEdyb3NzbyBk
-byBTdWwxCzAJBgNVBAYTAkJSMRgwFgYDVQQDEw9pZHAudWZnZC5lZHUuYnIwHhcN
-MTQwNjA1MTIwOTMwWhcNMTkwNjA0MTIwOTMwWjCBnzE3MDUGA1UEChMuVUZHRCAt
-IFVuaXZlcnNpZGFkZSBGZWRlcmFsIGRhIEdyYW5kZSBEb3VyYWRvczENMAsGA1UE
-CxMEQ09JTjERMA8GA1UEBxMIRG91cmFkb3MxGzAZBgNVBAgTEk1hdG8gR3Jvc3Nv
-IGRvIFN1bDELMAkGA1UEBhMCQlIxGDAWBgNVBAMTD2lkcC51ZmdkLmVkdS5icjCC
-ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMqNLCdmjAeN7pKaJ68gXkdj
-NE/hAudGd/f5o1omQTsYsBtpBs5M8awzqVkWonX2HZt+OrozxYfueACKECmzuA78
-5EGoRjl5Zj4UiOLqNYjzKOgUg3BtO2+W+8xEQ6S//zUNeqnEEyDllLy1JoSPbID1
-68sAiypFqQ/DN4MNdTQ8Tv8O5X1QDp5NWrqcCjYyMmmUk+dQyPaTXTzBpB5uO7EZ
-MMMXsfl8FUmo/iO0GZa/VrvTKd/92SZh7TQGttv6ju2DVQbo2CWofRavs8kesRKR
-HGwhBlVX+Q4XD07cyh1+RZVy5Wn895vVmstyPgA91AHBiOKFK2jg0+Cut7VKDPEC
-AwEAATANBgkqhkiG9w0BAQUFAAOCAQEAmJkwUFwtyBI7Z9/mJpGkhNWNlGSS3l/0
-hi1NBYUn3vP16egcj+Xc6TVhayPB+D1E4nQvHI4CZ1tQFmjXIEtFIi9gUZFKC42y
-QOWyylrMMEy+wPYbdHsSkzKSzJE0+nN0KFzJCJkU61lTLPjiiq+mSiJny4u4XtUK
-Q97JwAlBXwmtN3HtQpcoK5DI4xa8RCuyU+fyV3skMNaS0JMm4iZHGB/IDuiv6AXy
-YFjfuvCwAgvQMVFWpzop1reFYPsKekFuixpcbG7X366kp2W1mTl3cunPjRP0ea1M
-NmSSKOjYv7Dwun7FmlO9lKnOxg4e2JD49bSoRIB2zTaic8zKh+lCwQ==
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ufgd.edu.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ufgd.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://idp.ufgd.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ufgd.edu.br/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.ufgd.edu.br/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ufgd.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>
-      
-MIIDtDCCApwCAQAwDQYJKoZIhvcNAQEFBQAwgZ8xNzA1BgNVBAoTLlVGR0QgLSBV
-bml2ZXJzaWRhZGUgRmVkZXJhbCBkYSBHcmFuZGUgRG91cmFkb3MxDTALBgNVBAsT
-BENPSU4xETAPBgNVBAcTCERvdXJhZG9zMRswGQYDVQQIExJNYXRvIEdyb3NzbyBk
-byBTdWwxCzAJBgNVBAYTAkJSMRgwFgYDVQQDEw9pZHAudWZnZC5lZHUuYnIwHhcN
-MTQwNjA1MTIwOTMwWhcNMTkwNjA0MTIwOTMwWjCBnzE3MDUGA1UEChMuVUZHRCAt
-IFVuaXZlcnNpZGFkZSBGZWRlcmFsIGRhIEdyYW5kZSBEb3VyYWRvczENMAsGA1UE
-CxMEQ09JTjERMA8GA1UEBxMIRG91cmFkb3MxGzAZBgNVBAgTEk1hdG8gR3Jvc3Nv
-IGRvIFN1bDELMAkGA1UEBhMCQlIxGDAWBgNVBAMTD2lkcC51ZmdkLmVkdS5icjCC
-ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMqNLCdmjAeN7pKaJ68gXkdj
-NE/hAudGd/f5o1omQTsYsBtpBs5M8awzqVkWonX2HZt+OrozxYfueACKECmzuA78
-5EGoRjl5Zj4UiOLqNYjzKOgUg3BtO2+W+8xEQ6S//zUNeqnEEyDllLy1JoSPbID1
-68sAiypFqQ/DN4MNdTQ8Tv8O5X1QDp5NWrqcCjYyMmmUk+dQyPaTXTzBpB5uO7EZ
-MMMXsfl8FUmo/iO0GZa/VrvTKd/92SZh7TQGttv6ju2DVQbo2CWofRavs8kesRKR
-HGwhBlVX+Q4XD07cyh1+RZVy5Wn895vVmstyPgA91AHBiOKFK2jg0+Cut7VKDPEC
-AwEAATANBgkqhkiG9w0BAQUFAAOCAQEAmJkwUFwtyBI7Z9/mJpGkhNWNlGSS3l/0
-hi1NBYUn3vP16egcj+Xc6TVhayPB+D1E4nQvHI4CZ1tQFmjXIEtFIi9gUZFKC42y
-QOWyylrMMEy+wPYbdHsSkzKSzJE0+nN0KFzJCJkU61lTLPjiiq+mSiJny4u4XtUK
-Q97JwAlBXwmtN3HtQpcoK5DI4xa8RCuyU+fyV3skMNaS0JMm4iZHGB/IDuiv6AXy
-YFjfuvCwAgvQMVFWpzop1reFYPsKekFuixpcbG7X366kp2W1mTl3cunPjRP0ea1M
-NmSSKOjYv7Dwun7FmlO9lKnOxg4e2JD49bSoRIB2zTaic8zKh+lCwQ==
-                    
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ufgd.edu.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ufgd.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">UFGD - Universidade Federal da Grande Dourados</OrganizationName>
-    <OrganizationName xml:lang="pt-br">UFGD - Universidade Federal da Grande Dourados</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">UFGD - Universidade Federal da Grande Dourados </OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="pt-br">UFGD - Universidade Federal da Grande Dourados </OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.ufgd.edu.br/</OrganizationURL>
-    <OrganizationURL xml:lang="pt-br">http://www.ufgd.edu.br/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Service Desk</SurName>
-    <EmailAddress>sd@ufgd.edu.br</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.ufgd.edu.br.xml b/swamid-interfederations-2.0/idp.ufgd.edu.br.xml
deleted file mode 100644
index a417a233..00000000
--- a/swamid-interfederations-2.0/idp.ufgd.edu.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://idp.ufgd.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">edu.br</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">UFGD - Universidade Federal da Grande Dourados </mdui:DisplayName>
-        <mdui:DisplayName xml:lang="pt-br">UFGD - Universidade Federal da Grande Dourados </mdui:DisplayName>
-        <mdui:Description xml:lang="en">UFGD - Universidade Federal da Grande Dourados </mdui:Description>
-        <mdui:Description xml:lang="pt-br">UFGD - Universidade Federal da Grande Dourados </mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.ufgd.edu.br/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="pt-br">http://www.ufgd.edu.br/</mdui:InformationURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-    MIIDtDCCApwCAQAwDQYJKoZIhvcNAQEFBQAwgZ8xNzA1BgNVBAoTLlVGR0QgLSBV
-bml2ZXJzaWRhZGUgRmVkZXJhbCBkYSBHcmFuZGUgRG91cmFkb3MxDTALBgNVBAsT
-BENPSU4xETAPBgNVBAcTCERvdXJhZG9zMRswGQYDVQQIExJNYXRvIEdyb3NzbyBk
-byBTdWwxCzAJBgNVBAYTAkJSMRgwFgYDVQQDEw9pZHAudWZnZC5lZHUuYnIwHhcN
-MTQwNjA1MTIwOTMwWhcNMTkwNjA0MTIwOTMwWjCBnzE3MDUGA1UEChMuVUZHRCAt
-IFVuaXZlcnNpZGFkZSBGZWRlcmFsIGRhIEdyYW5kZSBEb3VyYWRvczENMAsGA1UE
-CxMEQ09JTjERMA8GA1UEBxMIRG91cmFkb3MxGzAZBgNVBAgTEk1hdG8gR3Jvc3Nv
-IGRvIFN1bDELMAkGA1UEBhMCQlIxGDAWBgNVBAMTD2lkcC51ZmdkLmVkdS5icjCC
-ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMqNLCdmjAeN7pKaJ68gXkdj
-NE/hAudGd/f5o1omQTsYsBtpBs5M8awzqVkWonX2HZt+OrozxYfueACKECmzuA78
-5EGoRjl5Zj4UiOLqNYjzKOgUg3BtO2+W+8xEQ6S//zUNeqnEEyDllLy1JoSPbID1
-68sAiypFqQ/DN4MNdTQ8Tv8O5X1QDp5NWrqcCjYyMmmUk+dQyPaTXTzBpB5uO7EZ
-MMMXsfl8FUmo/iO0GZa/VrvTKd/92SZh7TQGttv6ju2DVQbo2CWofRavs8kesRKR
-HGwhBlVX+Q4XD07cyh1+RZVy5Wn895vVmstyPgA91AHBiOKFK2jg0+Cut7VKDPEC
-AwEAATANBgkqhkiG9w0BAQUFAAOCAQEAmJkwUFwtyBI7Z9/mJpGkhNWNlGSS3l/0
-hi1NBYUn3vP16egcj+Xc6TVhayPB+D1E4nQvHI4CZ1tQFmjXIEtFIi9gUZFKC42y
-QOWyylrMMEy+wPYbdHsSkzKSzJE0+nN0KFzJCJkU61lTLPjiiq+mSiJny4u4XtUK
-Q97JwAlBXwmtN3HtQpcoK5DI4xa8RCuyU+fyV3skMNaS0JMm4iZHGB/IDuiv6AXy
-YFjfuvCwAgvQMVFWpzop1reFYPsKekFuixpcbG7X366kp2W1mTl3cunPjRP0ea1M
-NmSSKOjYv7Dwun7FmlO9lKnOxg4e2JD49bSoRIB2zTaic8zKh+lCwQ==
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ufgd.edu.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ufgd.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://idp.ufgd.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ufgd.edu.br/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.ufgd.edu.br/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ufgd.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>
-      
-MIIDtDCCApwCAQAwDQYJKoZIhvcNAQEFBQAwgZ8xNzA1BgNVBAoTLlVGR0QgLSBV
-bml2ZXJzaWRhZGUgRmVkZXJhbCBkYSBHcmFuZGUgRG91cmFkb3MxDTALBgNVBAsT
-BENPSU4xETAPBgNVBAcTCERvdXJhZG9zMRswGQYDVQQIExJNYXRvIEdyb3NzbyBk
-byBTdWwxCzAJBgNVBAYTAkJSMRgwFgYDVQQDEw9pZHAudWZnZC5lZHUuYnIwHhcN
-MTQwNjA1MTIwOTMwWhcNMTkwNjA0MTIwOTMwWjCBnzE3MDUGA1UEChMuVUZHRCAt
-IFVuaXZlcnNpZGFkZSBGZWRlcmFsIGRhIEdyYW5kZSBEb3VyYWRvczENMAsGA1UE
-CxMEQ09JTjERMA8GA1UEBxMIRG91cmFkb3MxGzAZBgNVBAgTEk1hdG8gR3Jvc3Nv
-IGRvIFN1bDELMAkGA1UEBhMCQlIxGDAWBgNVBAMTD2lkcC51ZmdkLmVkdS5icjCC
-ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMqNLCdmjAeN7pKaJ68gXkdj
-NE/hAudGd/f5o1omQTsYsBtpBs5M8awzqVkWonX2HZt+OrozxYfueACKECmzuA78
-5EGoRjl5Zj4UiOLqNYjzKOgUg3BtO2+W+8xEQ6S//zUNeqnEEyDllLy1JoSPbID1
-68sAiypFqQ/DN4MNdTQ8Tv8O5X1QDp5NWrqcCjYyMmmUk+dQyPaTXTzBpB5uO7EZ
-MMMXsfl8FUmo/iO0GZa/VrvTKd/92SZh7TQGttv6ju2DVQbo2CWofRavs8kesRKR
-HGwhBlVX+Q4XD07cyh1+RZVy5Wn895vVmstyPgA91AHBiOKFK2jg0+Cut7VKDPEC
-AwEAATANBgkqhkiG9w0BAQUFAAOCAQEAmJkwUFwtyBI7Z9/mJpGkhNWNlGSS3l/0
-hi1NBYUn3vP16egcj+Xc6TVhayPB+D1E4nQvHI4CZ1tQFmjXIEtFIi9gUZFKC42y
-QOWyylrMMEy+wPYbdHsSkzKSzJE0+nN0KFzJCJkU61lTLPjiiq+mSiJny4u4XtUK
-Q97JwAlBXwmtN3HtQpcoK5DI4xa8RCuyU+fyV3skMNaS0JMm4iZHGB/IDuiv6AXy
-YFjfuvCwAgvQMVFWpzop1reFYPsKekFuixpcbG7X366kp2W1mTl3cunPjRP0ea1M
-NmSSKOjYv7Dwun7FmlO9lKnOxg4e2JD49bSoRIB2zTaic8zKh+lCwQ==
-                    
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ufgd.edu.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ufgd.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">UFGD - Universidade Federal da Grande Dourados</OrganizationName>
-    <OrganizationName xml:lang="pt-br">UFGD - Universidade Federal da Grande Dourados</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">UFGD - Universidade Federal da Grande Dourados </OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="pt-br">UFGD - Universidade Federal da Grande Dourados </OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.ufgd.edu.br/</OrganizationURL>
-    <OrganizationURL xml:lang="pt-br">http://www.ufgd.edu.br/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Service Desk</SurName>
-    <EmailAddress>sd@ufgd.edu.br</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.ufmg.br-shibboleth.xml b/swamid-interfederations-2.0/idp.ufmg.br-shibboleth.xml
deleted file mode 100644
index a0d91e33..00000000
--- a/swamid-interfederations-2.0/idp.ufmg.br-shibboleth.xml
+++ /dev/null
@@ -1,108 +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://idp.ufmg.br/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">ufmg.br</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">UFMG - Universidade Federal de Minas Gerais</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="pt-br">UFMG - Universidade Federal de Minas Gerais</mdui:DisplayName>
-        <mdui:Description xml:lang="en">UFMG - Universidade Federal de Minas Gerais</mdui:Description>
-        <mdui:Description xml:lang="pt-br">UFMG - Universidade Federal de Minas Gerais</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.ufmg.br/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="pt-br">http://www.ufmg.br/</mdui:InformationURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-    MIIDaTCCAlECCQCkRIPOgAyxBDANBgkqhkiG9w0BAQUFADB2MQswCQYDVQQGEwJC
-UjEVMBMGA1UECBMMTWluYXMgR2VyYWlzMRcwFQYDVQQHEw5CZWxvIEhvcml6b250
-ZTENMAsGA1UEChMEVUZNRzEMMAoGA1UECxMDTENDMRowGAYDVQQDExFDQSBkbyBw
-b3J0YWwgVUZNRzAeFw0xMTEwMTcxMTM1MDRaFw0yMTEwMTQxMTM1MDRaMHcxCzAJ
-BgNVBAYTAkJSMRUwEwYDVQQIDAxNaW5hcyBHZXJhaXMxFzAVBgNVBAcMDkJlbG8g
-SG9yaXpvbnRlMQ0wCwYDVQQKDARVRk1HMQ4wDAYDVQQLDAVDRUNPTTEZMBcGA1UE
-AwwQc2lzdGVtYXMudWZtZy5icjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
-ggEBAPIWVxfD/hP4xeS+V2PEAWxlBm7+oM5KnUWojPucNO+FDcpc1ZBI1BSvhxuO
-7KnacD3j31Lf1MUq5rb8jS5ojj927W+1dYiVsI4WsV3e/SHKPJwhzA3/8D+9b1//
-6sgYFeaki33+zyoiMXluWYOuHEhdnnZMITBS0BICiM0+Wx4y42ddt8SlojTFZ9/G
-YJCZr3N3FoTISKnDw9htCpiaWRsm/tElikW5PLjQRwuNfk5TUaxysoOMTKU1OHzG
-eWFWT1eC4cM+5PdZJLC9SMwhSBz34o0aJXz6Rl0EmkSLpEUlkjWd8qGgAbA6I+Rj
-ab1lgvK6Gn+DvZSvoYuENypjClcCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAoUhF
-/mtHoskFkWtN7feCf0qaAJi582w1DHUqohbnYRs9ru6XO35saVAW/sn1pzkM4CT8
-W4CCQGknUv4iM5XCdqFzQrmvc6NBekEsdXkJPyV3/L3s+vgpnEJMG44EKP6VkpRM
-mXv14qPfzV+qd5evzDM8oLi6m+Xhi433omqj7FYw49DfCyEWpOsAwE5SdjUaJ+rY
-XhsRQJXlHnagEo7RwekebDBnFS9po0Yz2XgnsZ3QwRnMcAtIVQ1TxA9gUj4IY0MT
-PxmP9DNybuY6lVPrnB0DFL2NQ/S2zmZuivf8kHEpjIa/VuXJFBYC60AIV0wSkSbd
-1K9RfzyW1h7typu5xg==
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sistemas.ufmg.br/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://sistemas.ufmg.br/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://sistemas.ufmg.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sistemas.ufmg.br/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://sistemas.ufmg.br/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sistemas.ufmg.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">ufmg.br</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-      
-MIIDaTCCAlECCQCkRIPOgAyxBDANBgkqhkiG9w0BAQUFADB2MQswCQYDVQQGEwJC
-UjEVMBMGA1UECBMMTWluYXMgR2VyYWlzMRcwFQYDVQQHEw5CZWxvIEhvcml6b250
-ZTENMAsGA1UEChMEVUZNRzEMMAoGA1UECxMDTENDMRowGAYDVQQDExFDQSBkbyBw
-b3J0YWwgVUZNRzAeFw0xMTEwMTcxMTM1MDRaFw0yMTEwMTQxMTM1MDRaMHcxCzAJ
-BgNVBAYTAkJSMRUwEwYDVQQIDAxNaW5hcyBHZXJhaXMxFzAVBgNVBAcMDkJlbG8g
-SG9yaXpvbnRlMQ0wCwYDVQQKDARVRk1HMQ4wDAYDVQQLDAVDRUNPTTEZMBcGA1UE
-AwwQc2lzdGVtYXMudWZtZy5icjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
-ggEBAPIWVxfD/hP4xeS+V2PEAWxlBm7+oM5KnUWojPucNO+FDcpc1ZBI1BSvhxuO
-7KnacD3j31Lf1MUq5rb8jS5ojj927W+1dYiVsI4WsV3e/SHKPJwhzA3/8D+9b1//
-6sgYFeaki33+zyoiMXluWYOuHEhdnnZMITBS0BICiM0+Wx4y42ddt8SlojTFZ9/G
-YJCZr3N3FoTISKnDw9htCpiaWRsm/tElikW5PLjQRwuNfk5TUaxysoOMTKU1OHzG
-eWFWT1eC4cM+5PdZJLC9SMwhSBz34o0aJXz6Rl0EmkSLpEUlkjWd8qGgAbA6I+Rj
-ab1lgvK6Gn+DvZSvoYuENypjClcCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAoUhF
-/mtHoskFkWtN7feCf0qaAJi582w1DHUqohbnYRs9ru6XO35saVAW/sn1pzkM4CT8
-W4CCQGknUv4iM5XCdqFzQrmvc6NBekEsdXkJPyV3/L3s+vgpnEJMG44EKP6VkpRM
-mXv14qPfzV+qd5evzDM8oLi6m+Xhi433omqj7FYw49DfCyEWpOsAwE5SdjUaJ+rY
-XhsRQJXlHnagEo7RwekebDBnFS9po0Yz2XgnsZ3QwRnMcAtIVQ1TxA9gUj4IY0MT
-PxmP9DNybuY6lVPrnB0DFL2NQ/S2zmZuivf8kHEpjIa/VuXJFBYC60AIV0wSkSbd
-1K9RfzyW1h7typu5xg==
-                 
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sistemas.ufmg.br/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://sistemas.ufmg.br/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">UFMG - Universidade Federal de Minas Gerais</OrganizationName>
-    <OrganizationName xml:lang="pt-br">UFMG - Universidade Federal de Minas Gerais</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">UFMG - Universidade Federal de Minas Gerais</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="pt-br">UFMG - Universidade Federal de Minas Gerais</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.ufmg.br/</OrganizationURL>
-    <OrganizationURL xml:lang="pt-br">http://www.ufmg.br/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Renato Veneroso</SurName>
-    <EmailAddress>rveneroso@lcc.ufmg.br</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.ufmg.br.xml b/swamid-interfederations-2.0/idp.ufmg.br.xml
deleted file mode 100644
index a0d91e33..00000000
--- a/swamid-interfederations-2.0/idp.ufmg.br.xml
+++ /dev/null
@@ -1,108 +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://idp.ufmg.br/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">ufmg.br</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">UFMG - Universidade Federal de Minas Gerais</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="pt-br">UFMG - Universidade Federal de Minas Gerais</mdui:DisplayName>
-        <mdui:Description xml:lang="en">UFMG - Universidade Federal de Minas Gerais</mdui:Description>
-        <mdui:Description xml:lang="pt-br">UFMG - Universidade Federal de Minas Gerais</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.ufmg.br/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="pt-br">http://www.ufmg.br/</mdui:InformationURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-    MIIDaTCCAlECCQCkRIPOgAyxBDANBgkqhkiG9w0BAQUFADB2MQswCQYDVQQGEwJC
-UjEVMBMGA1UECBMMTWluYXMgR2VyYWlzMRcwFQYDVQQHEw5CZWxvIEhvcml6b250
-ZTENMAsGA1UEChMEVUZNRzEMMAoGA1UECxMDTENDMRowGAYDVQQDExFDQSBkbyBw
-b3J0YWwgVUZNRzAeFw0xMTEwMTcxMTM1MDRaFw0yMTEwMTQxMTM1MDRaMHcxCzAJ
-BgNVBAYTAkJSMRUwEwYDVQQIDAxNaW5hcyBHZXJhaXMxFzAVBgNVBAcMDkJlbG8g
-SG9yaXpvbnRlMQ0wCwYDVQQKDARVRk1HMQ4wDAYDVQQLDAVDRUNPTTEZMBcGA1UE
-AwwQc2lzdGVtYXMudWZtZy5icjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
-ggEBAPIWVxfD/hP4xeS+V2PEAWxlBm7+oM5KnUWojPucNO+FDcpc1ZBI1BSvhxuO
-7KnacD3j31Lf1MUq5rb8jS5ojj927W+1dYiVsI4WsV3e/SHKPJwhzA3/8D+9b1//
-6sgYFeaki33+zyoiMXluWYOuHEhdnnZMITBS0BICiM0+Wx4y42ddt8SlojTFZ9/G
-YJCZr3N3FoTISKnDw9htCpiaWRsm/tElikW5PLjQRwuNfk5TUaxysoOMTKU1OHzG
-eWFWT1eC4cM+5PdZJLC9SMwhSBz34o0aJXz6Rl0EmkSLpEUlkjWd8qGgAbA6I+Rj
-ab1lgvK6Gn+DvZSvoYuENypjClcCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAoUhF
-/mtHoskFkWtN7feCf0qaAJi582w1DHUqohbnYRs9ru6XO35saVAW/sn1pzkM4CT8
-W4CCQGknUv4iM5XCdqFzQrmvc6NBekEsdXkJPyV3/L3s+vgpnEJMG44EKP6VkpRM
-mXv14qPfzV+qd5evzDM8oLi6m+Xhi433omqj7FYw49DfCyEWpOsAwE5SdjUaJ+rY
-XhsRQJXlHnagEo7RwekebDBnFS9po0Yz2XgnsZ3QwRnMcAtIVQ1TxA9gUj4IY0MT
-PxmP9DNybuY6lVPrnB0DFL2NQ/S2zmZuivf8kHEpjIa/VuXJFBYC60AIV0wSkSbd
-1K9RfzyW1h7typu5xg==
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sistemas.ufmg.br/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://sistemas.ufmg.br/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://sistemas.ufmg.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sistemas.ufmg.br/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://sistemas.ufmg.br/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sistemas.ufmg.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">ufmg.br</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-      
-MIIDaTCCAlECCQCkRIPOgAyxBDANBgkqhkiG9w0BAQUFADB2MQswCQYDVQQGEwJC
-UjEVMBMGA1UECBMMTWluYXMgR2VyYWlzMRcwFQYDVQQHEw5CZWxvIEhvcml6b250
-ZTENMAsGA1UEChMEVUZNRzEMMAoGA1UECxMDTENDMRowGAYDVQQDExFDQSBkbyBw
-b3J0YWwgVUZNRzAeFw0xMTEwMTcxMTM1MDRaFw0yMTEwMTQxMTM1MDRaMHcxCzAJ
-BgNVBAYTAkJSMRUwEwYDVQQIDAxNaW5hcyBHZXJhaXMxFzAVBgNVBAcMDkJlbG8g
-SG9yaXpvbnRlMQ0wCwYDVQQKDARVRk1HMQ4wDAYDVQQLDAVDRUNPTTEZMBcGA1UE
-AwwQc2lzdGVtYXMudWZtZy5icjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
-ggEBAPIWVxfD/hP4xeS+V2PEAWxlBm7+oM5KnUWojPucNO+FDcpc1ZBI1BSvhxuO
-7KnacD3j31Lf1MUq5rb8jS5ojj927W+1dYiVsI4WsV3e/SHKPJwhzA3/8D+9b1//
-6sgYFeaki33+zyoiMXluWYOuHEhdnnZMITBS0BICiM0+Wx4y42ddt8SlojTFZ9/G
-YJCZr3N3FoTISKnDw9htCpiaWRsm/tElikW5PLjQRwuNfk5TUaxysoOMTKU1OHzG
-eWFWT1eC4cM+5PdZJLC9SMwhSBz34o0aJXz6Rl0EmkSLpEUlkjWd8qGgAbA6I+Rj
-ab1lgvK6Gn+DvZSvoYuENypjClcCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAoUhF
-/mtHoskFkWtN7feCf0qaAJi582w1DHUqohbnYRs9ru6XO35saVAW/sn1pzkM4CT8
-W4CCQGknUv4iM5XCdqFzQrmvc6NBekEsdXkJPyV3/L3s+vgpnEJMG44EKP6VkpRM
-mXv14qPfzV+qd5evzDM8oLi6m+Xhi433omqj7FYw49DfCyEWpOsAwE5SdjUaJ+rY
-XhsRQJXlHnagEo7RwekebDBnFS9po0Yz2XgnsZ3QwRnMcAtIVQ1TxA9gUj4IY0MT
-PxmP9DNybuY6lVPrnB0DFL2NQ/S2zmZuivf8kHEpjIa/VuXJFBYC60AIV0wSkSbd
-1K9RfzyW1h7typu5xg==
-                 
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sistemas.ufmg.br/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://sistemas.ufmg.br/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">UFMG - Universidade Federal de Minas Gerais</OrganizationName>
-    <OrganizationName xml:lang="pt-br">UFMG - Universidade Federal de Minas Gerais</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">UFMG - Universidade Federal de Minas Gerais</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="pt-br">UFMG - Universidade Federal de Minas Gerais</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.ufmg.br/</OrganizationURL>
-    <OrganizationURL xml:lang="pt-br">http://www.ufmg.br/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Renato Veneroso</SurName>
-    <EmailAddress>rveneroso@lcc.ufmg.br</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.ufpr.br-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.ufpr.br-idp-shibboleth.xml
deleted file mode 100644
index 7f392164..00000000
--- a/swamid-interfederations-2.0/idp.ufpr.br-idp-shibboleth.xml
+++ /dev/null
@@ -1,115 +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://idp.ufpr.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">ufpr.br</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">UFPR - Universidade Federal do Parana</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="pt-br">UFPR - Universidade Federal do Parana</mdui:DisplayName>
-        <mdui:Description xml:lang="en">UFPR - Universidade Federal do Parana</mdui:Description>
-        <mdui:Description xml:lang="pt-br">UFPR - Universidade Federal do Parana</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.ufpr.br/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="pt-br">http://www.ufpr.br/</mdui:InformationURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-    MIID+jCCAuICAQAwDQYJKoZIhvcNAQEFBQAwgcIxLzAtBgNVBAoUJlVGUFIgLSBV
-bml2ZXJzaWRhZGUgRmVkZXJhbCBkbyBQYXJhbsOhMSswKQYDVQQLFCJDZW50cm8g
-ZGUgQ29tcHV0YcOnw6NvIEVsZXRyw7RuaWNhMRowGAYJKoZIhvcNAQkBFgtjY2VA
-dWZwci5icjERMA8GA1UEBxMIQ3VyaXRpYmExEDAOBgNVBAgUB1BhcmFuw6ExCzAJ
-BgNVBAYTAkJSMRQwEgYDVQQDEwtpZHAudWZwci5icjAeFw0xMjA4MjAyMDIzMzZa
-Fw0xNTA4MjAyMDIzMzZaMIHCMS8wLQYDVQQKFCZVRlBSIC0gVW5pdmVyc2lkYWRl
-IEZlZGVyYWwgZG8gUGFyYW7DoTErMCkGA1UECxQiQ2VudHJvIGRlIENvbXB1dGHD
-p8OjbyBFbGV0csO0bmljYTEaMBgGCSqGSIb3DQEJARYLY2NlQHVmcHIuYnIxETAP
-BgNVBAcTCEN1cml0aWJhMRAwDgYDVQQIFAdQYXJhbsOhMQswCQYDVQQGEwJCUjEU
-MBIGA1UEAxMLaWRwLnVmcHIuYnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
-AoIBAQDhSIFAyy4DlsvFhaSd1r3CiUjp//kkxFlfeZmtj5gLGupTk+fQF18j71Go
-K4OwvL82UI/KYE5Me2tlueEJvBExd79by4fBME6SADdHc9Su1w1lctn4s6Mko9ux
-j9WcbrBfncbdj80T6W88EDH+V74oiCEElxBLfBOeXJCuMjc9uSaasbIMWMK+7ExV
-lz7d8ll7umv5AX84tpq8WDkc+7fcP9+p5GMtcTrdPKvL2CvSFmrnz+efKb6cNOT0
-B058D+uHPb0PasA6+xHpO3V3pSbSdcf8IqlvJKvoK8dch4qQ6uZD+Rz8ruxaPpBH
-cJdZk6hk0gc+7axjEWo/89CJauJzAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBAJ70
-kkZit+4D85Xi5Ms8+EYCjCo0GfUUp83ASZyPRml/D0VnOHLuj+dbPdQM0znnb5Sg
-7hIbSs/ERqrzKFJMJikpFXm1RQZNNRdf0d0V4nTrliXjGQcPCqXexdXRE6oBMeAi
-apbG2X8rFstwVVghWlbqkUjtko8MgUiD/RyjbAqVBWxqNjRGB3JOVt1g2SJ1tW7x
-pL1kcSedKTjYji+gJ9NLqumL9LTdtlqPzdBlChK4SfIIK/BE3GtD1S6rHn2wX+MC
-+anyEs7LQkZJPiqDeo2VM3XLIHdw5VTf8HnFiLJMiDkuIUOj5g77gFFE5HGKPuur
-k+Eyx9965LHHOvpH3Zo=
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ufpr.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ufpr.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://idp.ufpr.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ufpr.br/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.ufpr.br/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ufpr.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">ufpr.br</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-      
-MIID+jCCAuICAQAwDQYJKoZIhvcNAQEFBQAwgcIxLzAtBgNVBAoUJlVGUFIgLSBV
-bml2ZXJzaWRhZGUgRmVkZXJhbCBkbyBQYXJhbsOhMSswKQYDVQQLFCJDZW50cm8g
-ZGUgQ29tcHV0YcOnw6NvIEVsZXRyw7RuaWNhMRowGAYJKoZIhvcNAQkBFgtjY2VA
-dWZwci5icjERMA8GA1UEBxMIQ3VyaXRpYmExEDAOBgNVBAgUB1BhcmFuw6ExCzAJ
-BgNVBAYTAkJSMRQwEgYDVQQDEwtpZHAudWZwci5icjAeFw0xMjA4MjAyMDIzMzZa
-Fw0xNTA4MjAyMDIzMzZaMIHCMS8wLQYDVQQKFCZVRlBSIC0gVW5pdmVyc2lkYWRl
-IEZlZGVyYWwgZG8gUGFyYW7DoTErMCkGA1UECxQiQ2VudHJvIGRlIENvbXB1dGHD
-p8OjbyBFbGV0csO0bmljYTEaMBgGCSqGSIb3DQEJARYLY2NlQHVmcHIuYnIxETAP
-BgNVBAcTCEN1cml0aWJhMRAwDgYDVQQIFAdQYXJhbsOhMQswCQYDVQQGEwJCUjEU
-MBIGA1UEAxMLaWRwLnVmcHIuYnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
-AoIBAQDhSIFAyy4DlsvFhaSd1r3CiUjp//kkxFlfeZmtj5gLGupTk+fQF18j71Go
-K4OwvL82UI/KYE5Me2tlueEJvBExd79by4fBME6SADdHc9Su1w1lctn4s6Mko9ux
-j9WcbrBfncbdj80T6W88EDH+V74oiCEElxBLfBOeXJCuMjc9uSaasbIMWMK+7ExV
-lz7d8ll7umv5AX84tpq8WDkc+7fcP9+p5GMtcTrdPKvL2CvSFmrnz+efKb6cNOT0
-B058D+uHPb0PasA6+xHpO3V3pSbSdcf8IqlvJKvoK8dch4qQ6uZD+Rz8ruxaPpBH
-cJdZk6hk0gc+7axjEWo/89CJauJzAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBAJ70
-kkZit+4D85Xi5Ms8+EYCjCo0GfUUp83ASZyPRml/D0VnOHLuj+dbPdQM0znnb5Sg
-7hIbSs/ERqrzKFJMJikpFXm1RQZNNRdf0d0V4nTrliXjGQcPCqXexdXRE6oBMeAi
-apbG2X8rFstwVVghWlbqkUjtko8MgUiD/RyjbAqVBWxqNjRGB3JOVt1g2SJ1tW7x
-pL1kcSedKTjYji+gJ9NLqumL9LTdtlqPzdBlChK4SfIIK/BE3GtD1S6rHn2wX+MC
-+anyEs7LQkZJPiqDeo2VM3XLIHdw5VTf8HnFiLJMiDkuIUOj5g77gFFE5HGKPuur
-k+Eyx9965LHHOvpH3Zo=
-
-                    
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ufpr.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ufpr.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">UFPR - Universidade Federal do Parana</OrganizationName>
-    <OrganizationName xml:lang="pt-br">UFPR - Universidade Federal do Parana</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">UFPR - Universidade Federal do Parana</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="pt-br">UFPR - Universidade Federal do Parana</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.ufpr.br/</OrganizationURL>
-    <OrganizationURL xml:lang="pt-br">http://www.ufpr.br/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Antonio Rodrigues Barros</SurName>
-    <EmailAddress>antonio@ufpr.br</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.ufpr.br.xml b/swamid-interfederations-2.0/idp.ufpr.br.xml
deleted file mode 100644
index 7f392164..00000000
--- a/swamid-interfederations-2.0/idp.ufpr.br.xml
+++ /dev/null
@@ -1,115 +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://idp.ufpr.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">ufpr.br</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">UFPR - Universidade Federal do Parana</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="pt-br">UFPR - Universidade Federal do Parana</mdui:DisplayName>
-        <mdui:Description xml:lang="en">UFPR - Universidade Federal do Parana</mdui:Description>
-        <mdui:Description xml:lang="pt-br">UFPR - Universidade Federal do Parana</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.ufpr.br/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="pt-br">http://www.ufpr.br/</mdui:InformationURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-    MIID+jCCAuICAQAwDQYJKoZIhvcNAQEFBQAwgcIxLzAtBgNVBAoUJlVGUFIgLSBV
-bml2ZXJzaWRhZGUgRmVkZXJhbCBkbyBQYXJhbsOhMSswKQYDVQQLFCJDZW50cm8g
-ZGUgQ29tcHV0YcOnw6NvIEVsZXRyw7RuaWNhMRowGAYJKoZIhvcNAQkBFgtjY2VA
-dWZwci5icjERMA8GA1UEBxMIQ3VyaXRpYmExEDAOBgNVBAgUB1BhcmFuw6ExCzAJ
-BgNVBAYTAkJSMRQwEgYDVQQDEwtpZHAudWZwci5icjAeFw0xMjA4MjAyMDIzMzZa
-Fw0xNTA4MjAyMDIzMzZaMIHCMS8wLQYDVQQKFCZVRlBSIC0gVW5pdmVyc2lkYWRl
-IEZlZGVyYWwgZG8gUGFyYW7DoTErMCkGA1UECxQiQ2VudHJvIGRlIENvbXB1dGHD
-p8OjbyBFbGV0csO0bmljYTEaMBgGCSqGSIb3DQEJARYLY2NlQHVmcHIuYnIxETAP
-BgNVBAcTCEN1cml0aWJhMRAwDgYDVQQIFAdQYXJhbsOhMQswCQYDVQQGEwJCUjEU
-MBIGA1UEAxMLaWRwLnVmcHIuYnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
-AoIBAQDhSIFAyy4DlsvFhaSd1r3CiUjp//kkxFlfeZmtj5gLGupTk+fQF18j71Go
-K4OwvL82UI/KYE5Me2tlueEJvBExd79by4fBME6SADdHc9Su1w1lctn4s6Mko9ux
-j9WcbrBfncbdj80T6W88EDH+V74oiCEElxBLfBOeXJCuMjc9uSaasbIMWMK+7ExV
-lz7d8ll7umv5AX84tpq8WDkc+7fcP9+p5GMtcTrdPKvL2CvSFmrnz+efKb6cNOT0
-B058D+uHPb0PasA6+xHpO3V3pSbSdcf8IqlvJKvoK8dch4qQ6uZD+Rz8ruxaPpBH
-cJdZk6hk0gc+7axjEWo/89CJauJzAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBAJ70
-kkZit+4D85Xi5Ms8+EYCjCo0GfUUp83ASZyPRml/D0VnOHLuj+dbPdQM0znnb5Sg
-7hIbSs/ERqrzKFJMJikpFXm1RQZNNRdf0d0V4nTrliXjGQcPCqXexdXRE6oBMeAi
-apbG2X8rFstwVVghWlbqkUjtko8MgUiD/RyjbAqVBWxqNjRGB3JOVt1g2SJ1tW7x
-pL1kcSedKTjYji+gJ9NLqumL9LTdtlqPzdBlChK4SfIIK/BE3GtD1S6rHn2wX+MC
-+anyEs7LQkZJPiqDeo2VM3XLIHdw5VTf8HnFiLJMiDkuIUOj5g77gFFE5HGKPuur
-k+Eyx9965LHHOvpH3Zo=
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ufpr.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ufpr.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://idp.ufpr.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ufpr.br/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.ufpr.br/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ufpr.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">ufpr.br</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-      
-MIID+jCCAuICAQAwDQYJKoZIhvcNAQEFBQAwgcIxLzAtBgNVBAoUJlVGUFIgLSBV
-bml2ZXJzaWRhZGUgRmVkZXJhbCBkbyBQYXJhbsOhMSswKQYDVQQLFCJDZW50cm8g
-ZGUgQ29tcHV0YcOnw6NvIEVsZXRyw7RuaWNhMRowGAYJKoZIhvcNAQkBFgtjY2VA
-dWZwci5icjERMA8GA1UEBxMIQ3VyaXRpYmExEDAOBgNVBAgUB1BhcmFuw6ExCzAJ
-BgNVBAYTAkJSMRQwEgYDVQQDEwtpZHAudWZwci5icjAeFw0xMjA4MjAyMDIzMzZa
-Fw0xNTA4MjAyMDIzMzZaMIHCMS8wLQYDVQQKFCZVRlBSIC0gVW5pdmVyc2lkYWRl
-IEZlZGVyYWwgZG8gUGFyYW7DoTErMCkGA1UECxQiQ2VudHJvIGRlIENvbXB1dGHD
-p8OjbyBFbGV0csO0bmljYTEaMBgGCSqGSIb3DQEJARYLY2NlQHVmcHIuYnIxETAP
-BgNVBAcTCEN1cml0aWJhMRAwDgYDVQQIFAdQYXJhbsOhMQswCQYDVQQGEwJCUjEU
-MBIGA1UEAxMLaWRwLnVmcHIuYnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
-AoIBAQDhSIFAyy4DlsvFhaSd1r3CiUjp//kkxFlfeZmtj5gLGupTk+fQF18j71Go
-K4OwvL82UI/KYE5Me2tlueEJvBExd79by4fBME6SADdHc9Su1w1lctn4s6Mko9ux
-j9WcbrBfncbdj80T6W88EDH+V74oiCEElxBLfBOeXJCuMjc9uSaasbIMWMK+7ExV
-lz7d8ll7umv5AX84tpq8WDkc+7fcP9+p5GMtcTrdPKvL2CvSFmrnz+efKb6cNOT0
-B058D+uHPb0PasA6+xHpO3V3pSbSdcf8IqlvJKvoK8dch4qQ6uZD+Rz8ruxaPpBH
-cJdZk6hk0gc+7axjEWo/89CJauJzAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBAJ70
-kkZit+4D85Xi5Ms8+EYCjCo0GfUUp83ASZyPRml/D0VnOHLuj+dbPdQM0znnb5Sg
-7hIbSs/ERqrzKFJMJikpFXm1RQZNNRdf0d0V4nTrliXjGQcPCqXexdXRE6oBMeAi
-apbG2X8rFstwVVghWlbqkUjtko8MgUiD/RyjbAqVBWxqNjRGB3JOVt1g2SJ1tW7x
-pL1kcSedKTjYji+gJ9NLqumL9LTdtlqPzdBlChK4SfIIK/BE3GtD1S6rHn2wX+MC
-+anyEs7LQkZJPiqDeo2VM3XLIHdw5VTf8HnFiLJMiDkuIUOj5g77gFFE5HGKPuur
-k+Eyx9965LHHOvpH3Zo=
-
-                    
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ufpr.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ufpr.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">UFPR - Universidade Federal do Parana</OrganizationName>
-    <OrganizationName xml:lang="pt-br">UFPR - Universidade Federal do Parana</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">UFPR - Universidade Federal do Parana</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="pt-br">UFPR - Universidade Federal do Parana</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.ufpr.br/</OrganizationURL>
-    <OrganizationURL xml:lang="pt-br">http://www.ufpr.br/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Antonio Rodrigues Barros</SurName>
-    <EmailAddress>antonio@ufpr.br</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.ufsm.br-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.ufsm.br-idp-shibboleth.xml
deleted file mode 100644
index b399d033..00000000
--- a/swamid-interfederations-2.0/idp.ufsm.br-idp-shibboleth.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://idp.ufsm.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">ufsm.br</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">UFSM - Universidade Federal de Santa Maria</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="pt-br">UFSM - Universidade Federal de Santa Maria</mdui:DisplayName>
-        <mdui:Description xml:lang="en">UFSM - Universidade Federal de Santa Maria</mdui:Description>
-        <mdui:Description xml:lang="pt-br">UFSM - Universidade Federal de Santa Maria</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.ufsm.br/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="pt-br">http://www.ufsm.br/</mdui:InformationURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-    MIID0DCCArgCAQAwDQYJKoZIhvcNAQEFBQAwga0xLDAqBgNVBAoTI1VuaXZlcnNp
-ZGFkZSBGZWRlcmFsIGRlIFNhbnRhIE1hcmlhMQwwCgYDVQQLEwNDUEQxGjAYBgkq
-hkiG9w0BCQEWC2NwZEB1ZnNtLmJyMRQwEgYDVQQHEwtTYW50YSBNYXJpYTEaMBgG
-A1UECBMRUmlvIEdyYW5kZSBkbyBTdWwxCzAJBgNVBAYTAkJSMRQwEgYDVQQDEwtp
-ZHAudWZzbS5icjAeFw0xMjEwMDUxNDA1MzVaFw0xNTEwMDUxNDA1MzVaMIGtMSww
-KgYDVQQKEyNVbml2ZXJzaWRhZGUgRmVkZXJhbCBkZSBTYW50YSBNYXJpYTEMMAoG
-A1UECxMDQ1BEMRowGAYJKoZIhvcNAQkBFgtjcGRAdWZzbS5icjEUMBIGA1UEBxML
-U2FudGEgTWFyaWExGjAYBgNVBAgTEVJpbyBHcmFuZGUgZG8gU3VsMQswCQYDVQQG
-EwJCUjEUMBIGA1UEAxMLaWRwLnVmc20uYnIwggEiMA0GCSqGSIb3DQEBAQUAA4IB
-DwAwggEKAoIBAQDWBJ1zOYMt8oRHINxfgHCz/YAWxSb2vSxeOu50Jdr+EzKQYMj4
-5eeXhCNYGlWtqPI+rMZj4i3p8P+xbaK+RzXJavEF0gyv3qcamJWBd5GseyO/Q5gd
-u4DpJ5lpA5P1zm2Q646p1swNAlENjS756Ux5MfWFPfRYc3u04Y9W8EDfKMPMYSs2
-H+bFi0Ucn4DaEkUiDc2noJuJMM08m3Nl5GTUEwZSRJAlV9OT2tUbXAfeqdXyteS4
-VaFzc4vt0KqUwATvxhIygOqX+9I7nitBg3wfXbHsmYBo14AUsPxJvVFUV2bLUd4l
-d/xr71cxlkFHk4mzRe5C2kDLYcvYaIqv/jyjAgMBAAEwDQYJKoZIhvcNAQEFBQAD
-ggEBAKiirihev0E7qiHKcDQjWPxP1RTalsGly1pAWYUp1ikY7R2n+VzsSTVu6xh4
-ITgI1YIsHOdQ9eepAQCiEcuPim7CnzcKb1Ru6vgiXxgO9hJg0iNmcycPFQR8t5rk
-2fFUgF2GjL+lpOEnCgKn7WPEsAAHnLHsJjCbNcbX7B12awaVu6Q2nuiBcX2EC/PD
-Vvgi6N7sh/ViG8whuT4y7vN0Zdnc8FdbRFVkgl6FInPQa27MNQL7ZukyxmU+A9AF
-+jDBH/uGNUgpWLHqS/d+TMq0SPcrLoedtMjcadIQIpMgyIk14QvJGo/YB9sgtvHM
-dwJYMximHcBNMJ0UieklpL0lmx0=
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ufsm.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ufsm.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://idp.ufsm.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ufsm.br/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.ufsm.br/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ufsm.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">ufsm.br</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-      
-MIID0DCCArgCAQAwDQYJKoZIhvcNAQEFBQAwga0xLDAqBgNVBAoTI1VuaXZlcnNp
-ZGFkZSBGZWRlcmFsIGRlIFNhbnRhIE1hcmlhMQwwCgYDVQQLEwNDUEQxGjAYBgkq
-hkiG9w0BCQEWC2NwZEB1ZnNtLmJyMRQwEgYDVQQHEwtTYW50YSBNYXJpYTEaMBgG
-A1UECBMRUmlvIEdyYW5kZSBkbyBTdWwxCzAJBgNVBAYTAkJSMRQwEgYDVQQDEwtp
-ZHAudWZzbS5icjAeFw0xMjEwMDUxNDA1MzVaFw0xNTEwMDUxNDA1MzVaMIGtMSww
-KgYDVQQKEyNVbml2ZXJzaWRhZGUgRmVkZXJhbCBkZSBTYW50YSBNYXJpYTEMMAoG
-A1UECxMDQ1BEMRowGAYJKoZIhvcNAQkBFgtjcGRAdWZzbS5icjEUMBIGA1UEBxML
-U2FudGEgTWFyaWExGjAYBgNVBAgTEVJpbyBHcmFuZGUgZG8gU3VsMQswCQYDVQQG
-EwJCUjEUMBIGA1UEAxMLaWRwLnVmc20uYnIwggEiMA0GCSqGSIb3DQEBAQUAA4IB
-DwAwggEKAoIBAQDWBJ1zOYMt8oRHINxfgHCz/YAWxSb2vSxeOu50Jdr+EzKQYMj4
-5eeXhCNYGlWtqPI+rMZj4i3p8P+xbaK+RzXJavEF0gyv3qcamJWBd5GseyO/Q5gd
-u4DpJ5lpA5P1zm2Q646p1swNAlENjS756Ux5MfWFPfRYc3u04Y9W8EDfKMPMYSs2
-H+bFi0Ucn4DaEkUiDc2noJuJMM08m3Nl5GTUEwZSRJAlV9OT2tUbXAfeqdXyteS4
-VaFzc4vt0KqUwATvxhIygOqX+9I7nitBg3wfXbHsmYBo14AUsPxJvVFUV2bLUd4l
-d/xr71cxlkFHk4mzRe5C2kDLYcvYaIqv/jyjAgMBAAEwDQYJKoZIhvcNAQEFBQAD
-ggEBAKiirihev0E7qiHKcDQjWPxP1RTalsGly1pAWYUp1ikY7R2n+VzsSTVu6xh4
-ITgI1YIsHOdQ9eepAQCiEcuPim7CnzcKb1Ru6vgiXxgO9hJg0iNmcycPFQR8t5rk
-2fFUgF2GjL+lpOEnCgKn7WPEsAAHnLHsJjCbNcbX7B12awaVu6Q2nuiBcX2EC/PD
-Vvgi6N7sh/ViG8whuT4y7vN0Zdnc8FdbRFVkgl6FInPQa27MNQL7ZukyxmU+A9AF
-+jDBH/uGNUgpWLHqS/d+TMq0SPcrLoedtMjcadIQIpMgyIk14QvJGo/YB9sgtvHM
-dwJYMximHcBNMJ0UieklpL0lmx0=
-                    
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ufsm.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ufsm.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">UFSM - Universidade Federal de Santa Maria</OrganizationName>
-    <OrganizationName xml:lang="pt-br">UFSM - Universidade Federal de Santa Maria</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">UFSM - Universidade Federal de Santa Maria</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="pt-br">UFSM - Universidade Federal de Santa Maria</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.ufsm.br/</OrganizationURL>
-    <OrganizationURL xml:lang="pt-br">http://www.ufsm.br/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Fabiano B. Franco</SurName>
-    <EmailAddress>fabiano@cpd.ufsm.br</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.ufsm.br.xml b/swamid-interfederations-2.0/idp.ufsm.br.xml
deleted file mode 100644
index b399d033..00000000
--- a/swamid-interfederations-2.0/idp.ufsm.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://idp.ufsm.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">ufsm.br</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">UFSM - Universidade Federal de Santa Maria</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="pt-br">UFSM - Universidade Federal de Santa Maria</mdui:DisplayName>
-        <mdui:Description xml:lang="en">UFSM - Universidade Federal de Santa Maria</mdui:Description>
-        <mdui:Description xml:lang="pt-br">UFSM - Universidade Federal de Santa Maria</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.ufsm.br/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="pt-br">http://www.ufsm.br/</mdui:InformationURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-    MIID0DCCArgCAQAwDQYJKoZIhvcNAQEFBQAwga0xLDAqBgNVBAoTI1VuaXZlcnNp
-ZGFkZSBGZWRlcmFsIGRlIFNhbnRhIE1hcmlhMQwwCgYDVQQLEwNDUEQxGjAYBgkq
-hkiG9w0BCQEWC2NwZEB1ZnNtLmJyMRQwEgYDVQQHEwtTYW50YSBNYXJpYTEaMBgG
-A1UECBMRUmlvIEdyYW5kZSBkbyBTdWwxCzAJBgNVBAYTAkJSMRQwEgYDVQQDEwtp
-ZHAudWZzbS5icjAeFw0xMjEwMDUxNDA1MzVaFw0xNTEwMDUxNDA1MzVaMIGtMSww
-KgYDVQQKEyNVbml2ZXJzaWRhZGUgRmVkZXJhbCBkZSBTYW50YSBNYXJpYTEMMAoG
-A1UECxMDQ1BEMRowGAYJKoZIhvcNAQkBFgtjcGRAdWZzbS5icjEUMBIGA1UEBxML
-U2FudGEgTWFyaWExGjAYBgNVBAgTEVJpbyBHcmFuZGUgZG8gU3VsMQswCQYDVQQG
-EwJCUjEUMBIGA1UEAxMLaWRwLnVmc20uYnIwggEiMA0GCSqGSIb3DQEBAQUAA4IB
-DwAwggEKAoIBAQDWBJ1zOYMt8oRHINxfgHCz/YAWxSb2vSxeOu50Jdr+EzKQYMj4
-5eeXhCNYGlWtqPI+rMZj4i3p8P+xbaK+RzXJavEF0gyv3qcamJWBd5GseyO/Q5gd
-u4DpJ5lpA5P1zm2Q646p1swNAlENjS756Ux5MfWFPfRYc3u04Y9W8EDfKMPMYSs2
-H+bFi0Ucn4DaEkUiDc2noJuJMM08m3Nl5GTUEwZSRJAlV9OT2tUbXAfeqdXyteS4
-VaFzc4vt0KqUwATvxhIygOqX+9I7nitBg3wfXbHsmYBo14AUsPxJvVFUV2bLUd4l
-d/xr71cxlkFHk4mzRe5C2kDLYcvYaIqv/jyjAgMBAAEwDQYJKoZIhvcNAQEFBQAD
-ggEBAKiirihev0E7qiHKcDQjWPxP1RTalsGly1pAWYUp1ikY7R2n+VzsSTVu6xh4
-ITgI1YIsHOdQ9eepAQCiEcuPim7CnzcKb1Ru6vgiXxgO9hJg0iNmcycPFQR8t5rk
-2fFUgF2GjL+lpOEnCgKn7WPEsAAHnLHsJjCbNcbX7B12awaVu6Q2nuiBcX2EC/PD
-Vvgi6N7sh/ViG8whuT4y7vN0Zdnc8FdbRFVkgl6FInPQa27MNQL7ZukyxmU+A9AF
-+jDBH/uGNUgpWLHqS/d+TMq0SPcrLoedtMjcadIQIpMgyIk14QvJGo/YB9sgtvHM
-dwJYMximHcBNMJ0UieklpL0lmx0=
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ufsm.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ufsm.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://idp.ufsm.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ufsm.br/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.ufsm.br/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ufsm.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">ufsm.br</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-      
-MIID0DCCArgCAQAwDQYJKoZIhvcNAQEFBQAwga0xLDAqBgNVBAoTI1VuaXZlcnNp
-ZGFkZSBGZWRlcmFsIGRlIFNhbnRhIE1hcmlhMQwwCgYDVQQLEwNDUEQxGjAYBgkq
-hkiG9w0BCQEWC2NwZEB1ZnNtLmJyMRQwEgYDVQQHEwtTYW50YSBNYXJpYTEaMBgG
-A1UECBMRUmlvIEdyYW5kZSBkbyBTdWwxCzAJBgNVBAYTAkJSMRQwEgYDVQQDEwtp
-ZHAudWZzbS5icjAeFw0xMjEwMDUxNDA1MzVaFw0xNTEwMDUxNDA1MzVaMIGtMSww
-KgYDVQQKEyNVbml2ZXJzaWRhZGUgRmVkZXJhbCBkZSBTYW50YSBNYXJpYTEMMAoG
-A1UECxMDQ1BEMRowGAYJKoZIhvcNAQkBFgtjcGRAdWZzbS5icjEUMBIGA1UEBxML
-U2FudGEgTWFyaWExGjAYBgNVBAgTEVJpbyBHcmFuZGUgZG8gU3VsMQswCQYDVQQG
-EwJCUjEUMBIGA1UEAxMLaWRwLnVmc20uYnIwggEiMA0GCSqGSIb3DQEBAQUAA4IB
-DwAwggEKAoIBAQDWBJ1zOYMt8oRHINxfgHCz/YAWxSb2vSxeOu50Jdr+EzKQYMj4
-5eeXhCNYGlWtqPI+rMZj4i3p8P+xbaK+RzXJavEF0gyv3qcamJWBd5GseyO/Q5gd
-u4DpJ5lpA5P1zm2Q646p1swNAlENjS756Ux5MfWFPfRYc3u04Y9W8EDfKMPMYSs2
-H+bFi0Ucn4DaEkUiDc2noJuJMM08m3Nl5GTUEwZSRJAlV9OT2tUbXAfeqdXyteS4
-VaFzc4vt0KqUwATvxhIygOqX+9I7nitBg3wfXbHsmYBo14AUsPxJvVFUV2bLUd4l
-d/xr71cxlkFHk4mzRe5C2kDLYcvYaIqv/jyjAgMBAAEwDQYJKoZIhvcNAQEFBQAD
-ggEBAKiirihev0E7qiHKcDQjWPxP1RTalsGly1pAWYUp1ikY7R2n+VzsSTVu6xh4
-ITgI1YIsHOdQ9eepAQCiEcuPim7CnzcKb1Ru6vgiXxgO9hJg0iNmcycPFQR8t5rk
-2fFUgF2GjL+lpOEnCgKn7WPEsAAHnLHsJjCbNcbX7B12awaVu6Q2nuiBcX2EC/PD
-Vvgi6N7sh/ViG8whuT4y7vN0Zdnc8FdbRFVkgl6FInPQa27MNQL7ZukyxmU+A9AF
-+jDBH/uGNUgpWLHqS/d+TMq0SPcrLoedtMjcadIQIpMgyIk14QvJGo/YB9sgtvHM
-dwJYMximHcBNMJ0UieklpL0lmx0=
-                    
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ufsm.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ufsm.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">UFSM - Universidade Federal de Santa Maria</OrganizationName>
-    <OrganizationName xml:lang="pt-br">UFSM - Universidade Federal de Santa Maria</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">UFSM - Universidade Federal de Santa Maria</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="pt-br">UFSM - Universidade Federal de Santa Maria</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.ufsm.br/</OrganizationURL>
-    <OrganizationURL xml:lang="pt-br">http://www.ufsm.br/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Fabiano B. Franco</SurName>
-    <EmailAddress>fabiano@cpd.ufsm.br</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.uha.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.uha.fr-idp-shibboleth.xml
deleted file mode 100644
index 3f0e01b1..00000000
--- a/swamid-interfederations-2.0/idp.uha.fr-idp-shibboleth.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://idp.uha.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2012-03-20T17:01:00Z">
-      <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">uha.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">Université de Haute Alsace</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDFDCCAfygAwIBAgIVAMQwDj/V7c3f7N91SfzvRR6357FcMA0GCSqGSIb3DQEB
-BQUAMBUxEzARBgNVBAMTCmlkcC51aGEuZnIwHhcNMDkwNDA5MTQwOTAxWhcNMjkw
-NDA5MTQwOTAxWjAVMRMwEQYDVQQDEwppZHAudWhhLmZyMIIBIjANBgkqhkiG9w0B
-AQEFAAOCAQ8AMIIBCgKCAQEAjwqTRagPEGunfC32fyNnNVRYuJPDM65kHC6DnjRv
-KcGMMKBP9zN1AIXqDSbjw27e/kQ+FXrWECy0EZfk4FT/wYe5nNnZO3ZJmHWxPKLY
-sa8DrGHG3a6xMUErtEEH6ZMTJMnEWBKcT/M7IBBpZfsyzBYmESmhM91Fo0yI6ihY
-pjvv19K7qsl+JXSC0J9Ng6L67I0tKbQ9f/Vke+hN/jxCnVL9uvlEo732XUFsQ97K
-PHxjSfRUDKuO2zRksnAmybHhK+MOf7VhrYiDm+rY1fN9GOyuha89lQUxqr2RakNN
-mtLaEHw7kKGGJJMdhQJXq9uQErDJMppQnbVM4xT41w9VAQIDAQABo1swWTA4BgNV
-HREEMTAvggppZHAudWhhLmZyhiFodHRwczovL2lkcC51aGEuZnIvaWRwL3NoaWJi
-b2xldGgwHQYDVR0OBBYEFBpULgO2pp5BBWWveaICAaeGdhWLMA0GCSqGSIb3DQEB
-BQUAA4IBAQBs5JFe8dPlHV3+GU7RIl/r8LZo6W0zeOHmWiLvAwbuH64qA6ZgWGm5
-M4tKtWi4htYdgl4MjVpwgv3FMi8/hXTfQbVOjqGZiqKCTDjPtHYJOfZvAxL/ufg5
-bSJJlH3DOgLPpMacR1/SynTnplrNptvAYjUseje/cg5me6Myn/8UK7SrJIfOBC6w
-ls4erY4fZXkYtkB7krSAshiSgkfQ6Uyb3u/tl8SI2y8pBTztgiOtYbipIA0HXXsP
-DtsmCguULyq87Qn+zC65jlHJ+8/uA2lVWkZS+i0eeithnR0KjhojwCJ/0PsdAOt9
-f8gbJ9tz+22mD0+GLYu280WZfj2us+fo
-					    </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://idp.uha.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.uha.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.uha.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">uha.fr</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDFDCCAfygAwIBAgIVAMQwDj/V7c3f7N91SfzvRR6357FcMA0GCSqGSIb3DQEB
-BQUAMBUxEzARBgNVBAMTCmlkcC51aGEuZnIwHhcNMDkwNDA5MTQwOTAxWhcNMjkw
-NDA5MTQwOTAxWjAVMRMwEQYDVQQDEwppZHAudWhhLmZyMIIBIjANBgkqhkiG9w0B
-AQEFAAOCAQ8AMIIBCgKCAQEAjwqTRagPEGunfC32fyNnNVRYuJPDM65kHC6DnjRv
-KcGMMKBP9zN1AIXqDSbjw27e/kQ+FXrWECy0EZfk4FT/wYe5nNnZO3ZJmHWxPKLY
-sa8DrGHG3a6xMUErtEEH6ZMTJMnEWBKcT/M7IBBpZfsyzBYmESmhM91Fo0yI6ihY
-pjvv19K7qsl+JXSC0J9Ng6L67I0tKbQ9f/Vke+hN/jxCnVL9uvlEo732XUFsQ97K
-PHxjSfRUDKuO2zRksnAmybHhK+MOf7VhrYiDm+rY1fN9GOyuha89lQUxqr2RakNN
-mtLaEHw7kKGGJJMdhQJXq9uQErDJMppQnbVM4xT41w9VAQIDAQABo1swWTA4BgNV
-HREEMTAvggppZHAudWhhLmZyhiFodHRwczovL2lkcC51aGEuZnIvaWRwL3NoaWJi
-b2xldGgwHQYDVR0OBBYEFBpULgO2pp5BBWWveaICAaeGdhWLMA0GCSqGSIb3DQEB
-BQUAA4IBAQBs5JFe8dPlHV3+GU7RIl/r8LZo6W0zeOHmWiLvAwbuH64qA6ZgWGm5
-M4tKtWi4htYdgl4MjVpwgv3FMi8/hXTfQbVOjqGZiqKCTDjPtHYJOfZvAxL/ufg5
-bSJJlH3DOgLPpMacR1/SynTnplrNptvAYjUseje/cg5me6Myn/8UK7SrJIfOBC6w
-ls4erY4fZXkYtkB7krSAshiSgkfQ6Uyb3u/tl8SI2y8pBTztgiOtYbipIA0HXXsP
-DtsmCguULyq87Qn+zC65jlHJ+8/uA2lVWkZS+i0eeithnR0KjhojwCJ/0PsdAOt9
-f8gbJ9tz+22mD0+GLYu280WZfj2us+fo
-					    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.uha.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">Université de Haute Alsace</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Université de Haute Alsace</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <EmailAddress>contact.di@uha.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.uha.fr.xml b/swamid-interfederations-2.0/idp.uha.fr.xml
deleted file mode 100644
index 3f0e01b1..00000000
--- a/swamid-interfederations-2.0/idp.uha.fr.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://idp.uha.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2012-03-20T17:01:00Z">
-      <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">uha.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">Université de Haute Alsace</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDFDCCAfygAwIBAgIVAMQwDj/V7c3f7N91SfzvRR6357FcMA0GCSqGSIb3DQEB
-BQUAMBUxEzARBgNVBAMTCmlkcC51aGEuZnIwHhcNMDkwNDA5MTQwOTAxWhcNMjkw
-NDA5MTQwOTAxWjAVMRMwEQYDVQQDEwppZHAudWhhLmZyMIIBIjANBgkqhkiG9w0B
-AQEFAAOCAQ8AMIIBCgKCAQEAjwqTRagPEGunfC32fyNnNVRYuJPDM65kHC6DnjRv
-KcGMMKBP9zN1AIXqDSbjw27e/kQ+FXrWECy0EZfk4FT/wYe5nNnZO3ZJmHWxPKLY
-sa8DrGHG3a6xMUErtEEH6ZMTJMnEWBKcT/M7IBBpZfsyzBYmESmhM91Fo0yI6ihY
-pjvv19K7qsl+JXSC0J9Ng6L67I0tKbQ9f/Vke+hN/jxCnVL9uvlEo732XUFsQ97K
-PHxjSfRUDKuO2zRksnAmybHhK+MOf7VhrYiDm+rY1fN9GOyuha89lQUxqr2RakNN
-mtLaEHw7kKGGJJMdhQJXq9uQErDJMppQnbVM4xT41w9VAQIDAQABo1swWTA4BgNV
-HREEMTAvggppZHAudWhhLmZyhiFodHRwczovL2lkcC51aGEuZnIvaWRwL3NoaWJi
-b2xldGgwHQYDVR0OBBYEFBpULgO2pp5BBWWveaICAaeGdhWLMA0GCSqGSIb3DQEB
-BQUAA4IBAQBs5JFe8dPlHV3+GU7RIl/r8LZo6W0zeOHmWiLvAwbuH64qA6ZgWGm5
-M4tKtWi4htYdgl4MjVpwgv3FMi8/hXTfQbVOjqGZiqKCTDjPtHYJOfZvAxL/ufg5
-bSJJlH3DOgLPpMacR1/SynTnplrNptvAYjUseje/cg5me6Myn/8UK7SrJIfOBC6w
-ls4erY4fZXkYtkB7krSAshiSgkfQ6Uyb3u/tl8SI2y8pBTztgiOtYbipIA0HXXsP
-DtsmCguULyq87Qn+zC65jlHJ+8/uA2lVWkZS+i0eeithnR0KjhojwCJ/0PsdAOt9
-f8gbJ9tz+22mD0+GLYu280WZfj2us+fo
-					    </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://idp.uha.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.uha.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.uha.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">uha.fr</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDFDCCAfygAwIBAgIVAMQwDj/V7c3f7N91SfzvRR6357FcMA0GCSqGSIb3DQEB
-BQUAMBUxEzARBgNVBAMTCmlkcC51aGEuZnIwHhcNMDkwNDA5MTQwOTAxWhcNMjkw
-NDA5MTQwOTAxWjAVMRMwEQYDVQQDEwppZHAudWhhLmZyMIIBIjANBgkqhkiG9w0B
-AQEFAAOCAQ8AMIIBCgKCAQEAjwqTRagPEGunfC32fyNnNVRYuJPDM65kHC6DnjRv
-KcGMMKBP9zN1AIXqDSbjw27e/kQ+FXrWECy0EZfk4FT/wYe5nNnZO3ZJmHWxPKLY
-sa8DrGHG3a6xMUErtEEH6ZMTJMnEWBKcT/M7IBBpZfsyzBYmESmhM91Fo0yI6ihY
-pjvv19K7qsl+JXSC0J9Ng6L67I0tKbQ9f/Vke+hN/jxCnVL9uvlEo732XUFsQ97K
-PHxjSfRUDKuO2zRksnAmybHhK+MOf7VhrYiDm+rY1fN9GOyuha89lQUxqr2RakNN
-mtLaEHw7kKGGJJMdhQJXq9uQErDJMppQnbVM4xT41w9VAQIDAQABo1swWTA4BgNV
-HREEMTAvggppZHAudWhhLmZyhiFodHRwczovL2lkcC51aGEuZnIvaWRwL3NoaWJi
-b2xldGgwHQYDVR0OBBYEFBpULgO2pp5BBWWveaICAaeGdhWLMA0GCSqGSIb3DQEB
-BQUAA4IBAQBs5JFe8dPlHV3+GU7RIl/r8LZo6W0zeOHmWiLvAwbuH64qA6ZgWGm5
-M4tKtWi4htYdgl4MjVpwgv3FMi8/hXTfQbVOjqGZiqKCTDjPtHYJOfZvAxL/ufg5
-bSJJlH3DOgLPpMacR1/SynTnplrNptvAYjUseje/cg5me6Myn/8UK7SrJIfOBC6w
-ls4erY4fZXkYtkB7krSAshiSgkfQ6Uyb3u/tl8SI2y8pBTztgiOtYbipIA0HXXsP
-DtsmCguULyq87Qn+zC65jlHJ+8/uA2lVWkZS+i0eeithnR0KjhojwCJ/0PsdAOt9
-f8gbJ9tz+22mD0+GLYu280WZfj2us+fo
-					    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.uha.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">Université de Haute Alsace</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Université de Haute Alsace</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <EmailAddress>contact.di@uha.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.uhk.cz-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.uhk.cz-idp-shibboleth.xml
deleted file mode 100644
index 687cd3bd..00000000
--- a/swamid-interfederations-2.0/idp.uhk.cz-idp-shibboleth.xml
+++ /dev/null
@@ -1,131 +0,0 @@
-<?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.uhk.cz/idp/shibboleth">
-  <md:Extensions xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata">
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/" registrationInstant="2013-03-06T13:11:04Z">
-      <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>
-    <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://eduid.cz/uri/idp-group/university</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md: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">uhk.cz</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">University of Hradec Kralove</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="cs">Univerzita Hradec Králové</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Identity Provider for University of Hradec Kralove</mdui:Description>
-        <mdui:Description xml:lang="cs">Identity Provider pro Univerzitu Hradec Králové</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.uhk.cz/en-us/Pages/default.aspx</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="cs">http://www.uhk.cz/</mdui:InformationURL>
-        <mdui:Logo height="40" width="90">https://idp.uhk.cz/images/logo_40.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>
-MIIEgjCCA2qgAwIBAgIQMky1q3HrRxPo56VN/NmU0DANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTEyMDkxMTAwMDAwMFoXDTE1MDkxMTIzNTk1OVowSTELMAkGA1UE
-BhMCQ1oxJTAjBgNVBAoTHFVuaXZlcnNpdHkgb2YgSHJhZGVjIEtyYWxvdmUxEzAR
-BgNVBAMTCmlkcC51aGsuY3owggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
-AQDrU/S+ixb9ntWiK6bR0xSfKh0mUBUAn8JqIHHTQ3rtUr+kQteHHg23M8iPTcia
-DR9U7oMCrAMeVdI66Ld3tMe2OrmZVIuY654Yj55Vcw64Ew7kKmtflOY4VRtaPzZo
-v2cUVa7aTyJ+740LY7mBS4B1FOoDsxmk0CW64luYoi71cLLC3oxZwa0RXiJEQCX/
-k1H4TwnuZZA3J57TEQWwZ0WBr9jHUhDUNy0UxLnnpgla3Eo/TC8+s0qm1xge/NBV
-US2kT//puh234zpU2t8nSkw5uPKjxnIJCd7o/8/d738kQQtc2nCKdilFRKST+E7Q
-3vuzjEYHYe5oLZrg22u7AFrLAgMBAAGjggF3MIIBczAfBgNVHSMEGDAWgBQMvZNo
-DPPeq6NJays3V0fqkOO57TAdBgNVHQ4EFgQUUBJ3Z32TA3bLvPrqbqT4dXZ6O0cw
-DgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUH
-AwEGCCsGAQUFBwMCMBgGA1UdIAQRMA8wDQYLKwYBBAGyMQECAh0wOgYDVR0fBDMw
-MTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5j
-cmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRjcy50
-ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDovL29j
-c3AudGNzLnRlcmVuYS5vcmcwLwYDVR0RBCgwJoIKaWRwLnVoay5jeoILaWRwMS51
-aGsuY3qCC2lkcDIudWhrLmN6MA0GCSqGSIb3DQEBBQUAA4IBAQAYaJ0RPwGFOXz9
-vCDdQ8rFUicwvoSzL8RrOgtsayyVvtysYJJykVpfmT4ytzgLXI7ilqpCQ3wic/OR
-aQMVyyhhXV8yoUOdxugs5IPCFDDJOaPH2jtwkY8DWOapCEzSNwK0AvxZ5jCCA3rF
-/01BkC2pDt4yOoBTYhCOWigvWcDY7UNCubK3SCzjNGlhoWq0Y3glao0yx4HItwbQ
-sBMIvj9fFFvn0bpREgour8PC18anj/QK2t0jLGu0D6KOHrRmY2043ylhl7Uk/CWH
-2DYpexi2dfcGYko0lfaQ3i8W2GT3jAuSSy8FzY3QKBw9B6MvG4OJfleh+QC5V1ff
-PZ/kn4a7
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.uhk.cz:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.uhk.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>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.uhk.cz/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.uhk.cz/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.uhk.cz/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.uhk.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">uhk.cz</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIEgjCCA2qgAwIBAgIQMky1q3HrRxPo56VN/NmU0DANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTEyMDkxMTAwMDAwMFoXDTE1MDkxMTIzNTk1OVowSTELMAkGA1UE
-BhMCQ1oxJTAjBgNVBAoTHFVuaXZlcnNpdHkgb2YgSHJhZGVjIEtyYWxvdmUxEzAR
-BgNVBAMTCmlkcC51aGsuY3owggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
-AQDrU/S+ixb9ntWiK6bR0xSfKh0mUBUAn8JqIHHTQ3rtUr+kQteHHg23M8iPTcia
-DR9U7oMCrAMeVdI66Ld3tMe2OrmZVIuY654Yj55Vcw64Ew7kKmtflOY4VRtaPzZo
-v2cUVa7aTyJ+740LY7mBS4B1FOoDsxmk0CW64luYoi71cLLC3oxZwa0RXiJEQCX/
-k1H4TwnuZZA3J57TEQWwZ0WBr9jHUhDUNy0UxLnnpgla3Eo/TC8+s0qm1xge/NBV
-US2kT//puh234zpU2t8nSkw5uPKjxnIJCd7o/8/d738kQQtc2nCKdilFRKST+E7Q
-3vuzjEYHYe5oLZrg22u7AFrLAgMBAAGjggF3MIIBczAfBgNVHSMEGDAWgBQMvZNo
-DPPeq6NJays3V0fqkOO57TAdBgNVHQ4EFgQUUBJ3Z32TA3bLvPrqbqT4dXZ6O0cw
-DgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUH
-AwEGCCsGAQUFBwMCMBgGA1UdIAQRMA8wDQYLKwYBBAGyMQECAh0wOgYDVR0fBDMw
-MTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5j
-cmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRjcy50
-ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDovL29j
-c3AudGNzLnRlcmVuYS5vcmcwLwYDVR0RBCgwJoIKaWRwLnVoay5jeoILaWRwMS51
-aGsuY3qCC2lkcDIudWhrLmN6MA0GCSqGSIb3DQEBBQUAA4IBAQAYaJ0RPwGFOXz9
-vCDdQ8rFUicwvoSzL8RrOgtsayyVvtysYJJykVpfmT4ytzgLXI7ilqpCQ3wic/OR
-aQMVyyhhXV8yoUOdxugs5IPCFDDJOaPH2jtwkY8DWOapCEzSNwK0AvxZ5jCCA3rF
-/01BkC2pDt4yOoBTYhCOWigvWcDY7UNCubK3SCzjNGlhoWq0Y3glao0yx4HItwbQ
-sBMIvj9fFFvn0bpREgour8PC18anj/QK2t0jLGu0D6KOHrRmY2043ylhl7Uk/CWH
-2DYpexi2dfcGYko0lfaQ3i8W2GT3jAuSSy8FzY3QKBw9B6MvG4OJfleh+QC5V1ff
-PZ/kn4a7
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.uhk.cz:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.uhk.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>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Hradec Kralove</OrganizationName>
-    <OrganizationName xml:lang="cs">Univerzita Hradec Králové</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Hradec Kralove</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="cs">Univerzita Hradec Králové</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.uhk.cz/en-us/Pages/default.aspx</OrganizationURL>
-    <OrganizationURL xml:lang="cs">http://www.uhk.cz/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Lukas</GivenName>
-    <SurName>Kummer</SurName>
-    <EmailAddress>lukas.kummer@uhk.cz</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.uhk.cz.xml b/swamid-interfederations-2.0/idp.uhk.cz.xml
deleted file mode 100644
index 687cd3bd..00000000
--- a/swamid-interfederations-2.0/idp.uhk.cz.xml
+++ /dev/null
@@ -1,131 +0,0 @@
-<?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.uhk.cz/idp/shibboleth">
-  <md:Extensions xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata">
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/" registrationInstant="2013-03-06T13:11:04Z">
-      <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>
-    <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://eduid.cz/uri/idp-group/university</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md: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">uhk.cz</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">University of Hradec Kralove</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="cs">Univerzita Hradec Králové</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Identity Provider for University of Hradec Kralove</mdui:Description>
-        <mdui:Description xml:lang="cs">Identity Provider pro Univerzitu Hradec Králové</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.uhk.cz/en-us/Pages/default.aspx</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="cs">http://www.uhk.cz/</mdui:InformationURL>
-        <mdui:Logo height="40" width="90">https://idp.uhk.cz/images/logo_40.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>
-MIIEgjCCA2qgAwIBAgIQMky1q3HrRxPo56VN/NmU0DANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTEyMDkxMTAwMDAwMFoXDTE1MDkxMTIzNTk1OVowSTELMAkGA1UE
-BhMCQ1oxJTAjBgNVBAoTHFVuaXZlcnNpdHkgb2YgSHJhZGVjIEtyYWxvdmUxEzAR
-BgNVBAMTCmlkcC51aGsuY3owggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
-AQDrU/S+ixb9ntWiK6bR0xSfKh0mUBUAn8JqIHHTQ3rtUr+kQteHHg23M8iPTcia
-DR9U7oMCrAMeVdI66Ld3tMe2OrmZVIuY654Yj55Vcw64Ew7kKmtflOY4VRtaPzZo
-v2cUVa7aTyJ+740LY7mBS4B1FOoDsxmk0CW64luYoi71cLLC3oxZwa0RXiJEQCX/
-k1H4TwnuZZA3J57TEQWwZ0WBr9jHUhDUNy0UxLnnpgla3Eo/TC8+s0qm1xge/NBV
-US2kT//puh234zpU2t8nSkw5uPKjxnIJCd7o/8/d738kQQtc2nCKdilFRKST+E7Q
-3vuzjEYHYe5oLZrg22u7AFrLAgMBAAGjggF3MIIBczAfBgNVHSMEGDAWgBQMvZNo
-DPPeq6NJays3V0fqkOO57TAdBgNVHQ4EFgQUUBJ3Z32TA3bLvPrqbqT4dXZ6O0cw
-DgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUH
-AwEGCCsGAQUFBwMCMBgGA1UdIAQRMA8wDQYLKwYBBAGyMQECAh0wOgYDVR0fBDMw
-MTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5j
-cmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRjcy50
-ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDovL29j
-c3AudGNzLnRlcmVuYS5vcmcwLwYDVR0RBCgwJoIKaWRwLnVoay5jeoILaWRwMS51
-aGsuY3qCC2lkcDIudWhrLmN6MA0GCSqGSIb3DQEBBQUAA4IBAQAYaJ0RPwGFOXz9
-vCDdQ8rFUicwvoSzL8RrOgtsayyVvtysYJJykVpfmT4ytzgLXI7ilqpCQ3wic/OR
-aQMVyyhhXV8yoUOdxugs5IPCFDDJOaPH2jtwkY8DWOapCEzSNwK0AvxZ5jCCA3rF
-/01BkC2pDt4yOoBTYhCOWigvWcDY7UNCubK3SCzjNGlhoWq0Y3glao0yx4HItwbQ
-sBMIvj9fFFvn0bpREgour8PC18anj/QK2t0jLGu0D6KOHrRmY2043ylhl7Uk/CWH
-2DYpexi2dfcGYko0lfaQ3i8W2GT3jAuSSy8FzY3QKBw9B6MvG4OJfleh+QC5V1ff
-PZ/kn4a7
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.uhk.cz:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.uhk.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>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.uhk.cz/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.uhk.cz/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.uhk.cz/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.uhk.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">uhk.cz</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIEgjCCA2qgAwIBAgIQMky1q3HrRxPo56VN/NmU0DANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTEyMDkxMTAwMDAwMFoXDTE1MDkxMTIzNTk1OVowSTELMAkGA1UE
-BhMCQ1oxJTAjBgNVBAoTHFVuaXZlcnNpdHkgb2YgSHJhZGVjIEtyYWxvdmUxEzAR
-BgNVBAMTCmlkcC51aGsuY3owggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
-AQDrU/S+ixb9ntWiK6bR0xSfKh0mUBUAn8JqIHHTQ3rtUr+kQteHHg23M8iPTcia
-DR9U7oMCrAMeVdI66Ld3tMe2OrmZVIuY654Yj55Vcw64Ew7kKmtflOY4VRtaPzZo
-v2cUVa7aTyJ+740LY7mBS4B1FOoDsxmk0CW64luYoi71cLLC3oxZwa0RXiJEQCX/
-k1H4TwnuZZA3J57TEQWwZ0WBr9jHUhDUNy0UxLnnpgla3Eo/TC8+s0qm1xge/NBV
-US2kT//puh234zpU2t8nSkw5uPKjxnIJCd7o/8/d738kQQtc2nCKdilFRKST+E7Q
-3vuzjEYHYe5oLZrg22u7AFrLAgMBAAGjggF3MIIBczAfBgNVHSMEGDAWgBQMvZNo
-DPPeq6NJays3V0fqkOO57TAdBgNVHQ4EFgQUUBJ3Z32TA3bLvPrqbqT4dXZ6O0cw
-DgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUH
-AwEGCCsGAQUFBwMCMBgGA1UdIAQRMA8wDQYLKwYBBAGyMQECAh0wOgYDVR0fBDMw
-MTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5j
-cmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRjcy50
-ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDovL29j
-c3AudGNzLnRlcmVuYS5vcmcwLwYDVR0RBCgwJoIKaWRwLnVoay5jeoILaWRwMS51
-aGsuY3qCC2lkcDIudWhrLmN6MA0GCSqGSIb3DQEBBQUAA4IBAQAYaJ0RPwGFOXz9
-vCDdQ8rFUicwvoSzL8RrOgtsayyVvtysYJJykVpfmT4ytzgLXI7ilqpCQ3wic/OR
-aQMVyyhhXV8yoUOdxugs5IPCFDDJOaPH2jtwkY8DWOapCEzSNwK0AvxZ5jCCA3rF
-/01BkC2pDt4yOoBTYhCOWigvWcDY7UNCubK3SCzjNGlhoWq0Y3glao0yx4HItwbQ
-sBMIvj9fFFvn0bpREgour8PC18anj/QK2t0jLGu0D6KOHrRmY2043ylhl7Uk/CWH
-2DYpexi2dfcGYko0lfaQ3i8W2GT3jAuSSy8FzY3QKBw9B6MvG4OJfleh+QC5V1ff
-PZ/kn4a7
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.uhk.cz:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.uhk.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>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Hradec Kralove</OrganizationName>
-    <OrganizationName xml:lang="cs">Univerzita Hradec Králové</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Hradec Kralove</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="cs">Univerzita Hradec Králové</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.uhk.cz/en-us/Pages/default.aspx</OrganizationURL>
-    <OrganizationURL xml:lang="cs">http://www.uhk.cz/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Lukas</GivenName>
-    <SurName>Kummer</SurName>
-    <EmailAddress>lukas.kummer@uhk.cz</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.ujep.cz-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.ujep.cz-idp-shibboleth.xml
deleted file mode 100644
index 564cd5f6..00000000
--- a/swamid-interfederations-2.0/idp.ujep.cz-idp-shibboleth.xml
+++ /dev/null
@@ -1,126 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.ujep.cz/idp/shibboleth">
-  <md:Extensions xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata">
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/" registrationInstant="2010-09-21T15:26:39Z">
-      <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>
-    <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://eduid.cz/uri/idp-group/university</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md: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">ujep.cz</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Jan Evangelista Purkyne University in Usti nad Labem</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="cs">Univerzita Jana Evangelisty Purkyně v Ústí nad Labem</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Identity Provider for UJEP in Usti nad Labem</mdui:Description>
-        <mdui:Description xml:lang="cs">Identity Provider pro UJEP v Ústí nad Labem</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.ujep.cz/en/welcome.html</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="cs">http://www.ujep.cz</mdui:InformationURL>
-        <mdui:Logo height="40" width="102">https://trilian.ujep.cz/logo_ujep40.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>
-MIIELjCCAxYCCQD8WhkthREzrjANBgkqhkiG9w0BAQUFADCB2DELMAkGA1UEBhMC
-Q1oxFzAVBgNVBAgTDkN6ZWNoIFJlcHVibGljMRcwFQYDVQQHEw5Vc3RpIG5hZCBM
-YWJlbTE9MDsGA1UEChM0SmFuIEV2YW5nZWxpc3RhIFB1cmt5bmUgVW5pdmVyc2l0
-eSBpbiBVc3RpIG5hZCBMYWJlbTEcMBoGA1UECxMTQ2VudHJ1bSBJbmZvcm1hdGlr
-eTEUMBIGA1UEAxMLaWRwLnVqZXAuY3oxJDAiBgkqhkiG9w0BCQEWFXBhdmVsLnBv
-bGFjZWtAdWplcC5jejAeFw0xMzAyMTEwODEzNTJaFw0yMzAyMDkwODEzNTJaMIHY
-MQswCQYDVQQGEwJDWjEXMBUGA1UECBMOQ3plY2ggUmVwdWJsaWMxFzAVBgNVBAcT
-DlVzdGkgbmFkIExhYmVtMT0wOwYDVQQKEzRKYW4gRXZhbmdlbGlzdGEgUHVya3lu
-ZSBVbml2ZXJzaXR5IGluIFVzdGkgbmFkIExhYmVtMRwwGgYDVQQLExNDZW50cnVt
-IEluZm9ybWF0aWt5MRQwEgYDVQQDEwtpZHAudWplcC5jejEkMCIGCSqGSIb3DQEJ
-ARYVcGF2ZWwucG9sYWNla0B1amVwLmN6MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
-MIIBCgKCAQEAvJIxOavTd0EX9/IM/cpWc/RlFw1wsDiZuN96yFRACjMeY0jxyF80
-KQJbSSUhgnBIXfeLcgOFBYMivtkxpKRw/dqIB7Pq0Reh9sdHvV0Kec7pphHhwiGv
-f5jz9OiqtP8ZfkK8dgZwJfjBhqjt6V5cHI5lGSMek0pH0KcrCo+yAhwtZecuDhTe
-xPHfBJ5UsQ9t/ynCQn6/NckOQrYIkeP9u+wS/XsF8Z5aB35Pjq6RCZCUqrWYomfg
-LpZKAjSikFyA/Er6UiZCXHysYkq1O4kE87ndhkN5ngtH6FBSJQO5QfG8BgrxiOCm
-chPtodxO++n1ZBhMVt4kHAC5txaEhhl9ZwIDAQABMA0GCSqGSIb3DQEBBQUAA4IB
-AQAdNqOKtWjjw2L1YZ7hOxLNyZlAmboyDKeirErCXVK64QVCQvWZTl3BLDmvJzP7
-YbW0NeKq9STOfnxlJOV23NRPLjlaDwMn4B9wF6elNi+FeBplKt8NbXwXPfSSIHN7
-ytJJMwPrEBrrXhSKedT/rpGx28Ld4UuC4aKCjhCVor0fGh3B8BPQZoAY3iO+lXJg
-5jSx2xyJS9xVGE4sjeHrPTYNApQUKHboj4d2aswEQg+JvQYqdEU+SCBveo3Qou3Y
-6VLxR/4Su2F6qooWNjensavLeNix6/TurrOgMcIMOsJ1DcWml8HH2yBqEW40QNFQ
-U19RU7sLdrZ60inUFxdxr+AR
-             </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ujep.cz:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ujep.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>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.ujep.cz/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ujep.cz/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.ujep.cz/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ujep.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 xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ujep.cz</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIELjCCAxYCCQD8WhkthREzrjANBgkqhkiG9w0BAQUFADCB2DELMAkGA1UEBhMC
-Q1oxFzAVBgNVBAgTDkN6ZWNoIFJlcHVibGljMRcwFQYDVQQHEw5Vc3RpIG5hZCBM
-YWJlbTE9MDsGA1UEChM0SmFuIEV2YW5nZWxpc3RhIFB1cmt5bmUgVW5pdmVyc2l0
-eSBpbiBVc3RpIG5hZCBMYWJlbTEcMBoGA1UECxMTQ2VudHJ1bSBJbmZvcm1hdGlr
-eTEUMBIGA1UEAxMLaWRwLnVqZXAuY3oxJDAiBgkqhkiG9w0BCQEWFXBhdmVsLnBv
-bGFjZWtAdWplcC5jejAeFw0xMzAyMTEwODEzNTJaFw0yMzAyMDkwODEzNTJaMIHY
-MQswCQYDVQQGEwJDWjEXMBUGA1UECBMOQ3plY2ggUmVwdWJsaWMxFzAVBgNVBAcT
-DlVzdGkgbmFkIExhYmVtMT0wOwYDVQQKEzRKYW4gRXZhbmdlbGlzdGEgUHVya3lu
-ZSBVbml2ZXJzaXR5IGluIFVzdGkgbmFkIExhYmVtMRwwGgYDVQQLExNDZW50cnVt
-IEluZm9ybWF0aWt5MRQwEgYDVQQDEwtpZHAudWplcC5jejEkMCIGCSqGSIb3DQEJ
-ARYVcGF2ZWwucG9sYWNla0B1amVwLmN6MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
-MIIBCgKCAQEAvJIxOavTd0EX9/IM/cpWc/RlFw1wsDiZuN96yFRACjMeY0jxyF80
-KQJbSSUhgnBIXfeLcgOFBYMivtkxpKRw/dqIB7Pq0Reh9sdHvV0Kec7pphHhwiGv
-f5jz9OiqtP8ZfkK8dgZwJfjBhqjt6V5cHI5lGSMek0pH0KcrCo+yAhwtZecuDhTe
-xPHfBJ5UsQ9t/ynCQn6/NckOQrYIkeP9u+wS/XsF8Z5aB35Pjq6RCZCUqrWYomfg
-LpZKAjSikFyA/Er6UiZCXHysYkq1O4kE87ndhkN5ngtH6FBSJQO5QfG8BgrxiOCm
-chPtodxO++n1ZBhMVt4kHAC5txaEhhl9ZwIDAQABMA0GCSqGSIb3DQEBBQUAA4IB
-AQAdNqOKtWjjw2L1YZ7hOxLNyZlAmboyDKeirErCXVK64QVCQvWZTl3BLDmvJzP7
-YbW0NeKq9STOfnxlJOV23NRPLjlaDwMn4B9wF6elNi+FeBplKt8NbXwXPfSSIHN7
-ytJJMwPrEBrrXhSKedT/rpGx28Ld4UuC4aKCjhCVor0fGh3B8BPQZoAY3iO+lXJg
-5jSx2xyJS9xVGE4sjeHrPTYNApQUKHboj4d2aswEQg+JvQYqdEU+SCBveo3Qou3Y
-6VLxR/4Su2F6qooWNjensavLeNix6/TurrOgMcIMOsJ1DcWml8HH2yBqEW40QNFQ
-U19RU7sLdrZ60inUFxdxr+AR
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ujep.cz:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ujep.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="en">Jan Evangelista Purkyne University in Usti nad Labem</OrganizationName>
-    <OrganizationName xml:lang="cs">Univerzita Jana Evangelisty Purkyně v Ústí nad Labem</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Jan Evangelista Purkyne University in Usti nad Labem</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="cs">Univerzita Jana Evangelisty Purkyně v Ústí nad Labem</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.ujep.cz/en/welcome.html</OrganizationURL>
-    <OrganizationURL xml:lang="cs">http://www.ujep.cz/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Pavel</GivenName>
-    <SurName>Polacek</SurName>
-    <EmailAddress>pavel.polacek@ujep.cz</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.ujep.cz.xml b/swamid-interfederations-2.0/idp.ujep.cz.xml
deleted file mode 100644
index 564cd5f6..00000000
--- a/swamid-interfederations-2.0/idp.ujep.cz.xml
+++ /dev/null
@@ -1,126 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.ujep.cz/idp/shibboleth">
-  <md:Extensions xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata">
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/" registrationInstant="2010-09-21T15:26:39Z">
-      <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>
-    <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://eduid.cz/uri/idp-group/university</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md: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">ujep.cz</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Jan Evangelista Purkyne University in Usti nad Labem</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="cs">Univerzita Jana Evangelisty Purkyně v Ústí nad Labem</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Identity Provider for UJEP in Usti nad Labem</mdui:Description>
-        <mdui:Description xml:lang="cs">Identity Provider pro UJEP v Ústí nad Labem</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.ujep.cz/en/welcome.html</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="cs">http://www.ujep.cz</mdui:InformationURL>
-        <mdui:Logo height="40" width="102">https://trilian.ujep.cz/logo_ujep40.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>
-MIIELjCCAxYCCQD8WhkthREzrjANBgkqhkiG9w0BAQUFADCB2DELMAkGA1UEBhMC
-Q1oxFzAVBgNVBAgTDkN6ZWNoIFJlcHVibGljMRcwFQYDVQQHEw5Vc3RpIG5hZCBM
-YWJlbTE9MDsGA1UEChM0SmFuIEV2YW5nZWxpc3RhIFB1cmt5bmUgVW5pdmVyc2l0
-eSBpbiBVc3RpIG5hZCBMYWJlbTEcMBoGA1UECxMTQ2VudHJ1bSBJbmZvcm1hdGlr
-eTEUMBIGA1UEAxMLaWRwLnVqZXAuY3oxJDAiBgkqhkiG9w0BCQEWFXBhdmVsLnBv
-bGFjZWtAdWplcC5jejAeFw0xMzAyMTEwODEzNTJaFw0yMzAyMDkwODEzNTJaMIHY
-MQswCQYDVQQGEwJDWjEXMBUGA1UECBMOQ3plY2ggUmVwdWJsaWMxFzAVBgNVBAcT
-DlVzdGkgbmFkIExhYmVtMT0wOwYDVQQKEzRKYW4gRXZhbmdlbGlzdGEgUHVya3lu
-ZSBVbml2ZXJzaXR5IGluIFVzdGkgbmFkIExhYmVtMRwwGgYDVQQLExNDZW50cnVt
-IEluZm9ybWF0aWt5MRQwEgYDVQQDEwtpZHAudWplcC5jejEkMCIGCSqGSIb3DQEJ
-ARYVcGF2ZWwucG9sYWNla0B1amVwLmN6MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
-MIIBCgKCAQEAvJIxOavTd0EX9/IM/cpWc/RlFw1wsDiZuN96yFRACjMeY0jxyF80
-KQJbSSUhgnBIXfeLcgOFBYMivtkxpKRw/dqIB7Pq0Reh9sdHvV0Kec7pphHhwiGv
-f5jz9OiqtP8ZfkK8dgZwJfjBhqjt6V5cHI5lGSMek0pH0KcrCo+yAhwtZecuDhTe
-xPHfBJ5UsQ9t/ynCQn6/NckOQrYIkeP9u+wS/XsF8Z5aB35Pjq6RCZCUqrWYomfg
-LpZKAjSikFyA/Er6UiZCXHysYkq1O4kE87ndhkN5ngtH6FBSJQO5QfG8BgrxiOCm
-chPtodxO++n1ZBhMVt4kHAC5txaEhhl9ZwIDAQABMA0GCSqGSIb3DQEBBQUAA4IB
-AQAdNqOKtWjjw2L1YZ7hOxLNyZlAmboyDKeirErCXVK64QVCQvWZTl3BLDmvJzP7
-YbW0NeKq9STOfnxlJOV23NRPLjlaDwMn4B9wF6elNi+FeBplKt8NbXwXPfSSIHN7
-ytJJMwPrEBrrXhSKedT/rpGx28Ld4UuC4aKCjhCVor0fGh3B8BPQZoAY3iO+lXJg
-5jSx2xyJS9xVGE4sjeHrPTYNApQUKHboj4d2aswEQg+JvQYqdEU+SCBveo3Qou3Y
-6VLxR/4Su2F6qooWNjensavLeNix6/TurrOgMcIMOsJ1DcWml8HH2yBqEW40QNFQ
-U19RU7sLdrZ60inUFxdxr+AR
-             </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ujep.cz:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ujep.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>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.ujep.cz/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ujep.cz/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.ujep.cz/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ujep.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 xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ujep.cz</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIELjCCAxYCCQD8WhkthREzrjANBgkqhkiG9w0BAQUFADCB2DELMAkGA1UEBhMC
-Q1oxFzAVBgNVBAgTDkN6ZWNoIFJlcHVibGljMRcwFQYDVQQHEw5Vc3RpIG5hZCBM
-YWJlbTE9MDsGA1UEChM0SmFuIEV2YW5nZWxpc3RhIFB1cmt5bmUgVW5pdmVyc2l0
-eSBpbiBVc3RpIG5hZCBMYWJlbTEcMBoGA1UECxMTQ2VudHJ1bSBJbmZvcm1hdGlr
-eTEUMBIGA1UEAxMLaWRwLnVqZXAuY3oxJDAiBgkqhkiG9w0BCQEWFXBhdmVsLnBv
-bGFjZWtAdWplcC5jejAeFw0xMzAyMTEwODEzNTJaFw0yMzAyMDkwODEzNTJaMIHY
-MQswCQYDVQQGEwJDWjEXMBUGA1UECBMOQ3plY2ggUmVwdWJsaWMxFzAVBgNVBAcT
-DlVzdGkgbmFkIExhYmVtMT0wOwYDVQQKEzRKYW4gRXZhbmdlbGlzdGEgUHVya3lu
-ZSBVbml2ZXJzaXR5IGluIFVzdGkgbmFkIExhYmVtMRwwGgYDVQQLExNDZW50cnVt
-IEluZm9ybWF0aWt5MRQwEgYDVQQDEwtpZHAudWplcC5jejEkMCIGCSqGSIb3DQEJ
-ARYVcGF2ZWwucG9sYWNla0B1amVwLmN6MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
-MIIBCgKCAQEAvJIxOavTd0EX9/IM/cpWc/RlFw1wsDiZuN96yFRACjMeY0jxyF80
-KQJbSSUhgnBIXfeLcgOFBYMivtkxpKRw/dqIB7Pq0Reh9sdHvV0Kec7pphHhwiGv
-f5jz9OiqtP8ZfkK8dgZwJfjBhqjt6V5cHI5lGSMek0pH0KcrCo+yAhwtZecuDhTe
-xPHfBJ5UsQ9t/ynCQn6/NckOQrYIkeP9u+wS/XsF8Z5aB35Pjq6RCZCUqrWYomfg
-LpZKAjSikFyA/Er6UiZCXHysYkq1O4kE87ndhkN5ngtH6FBSJQO5QfG8BgrxiOCm
-chPtodxO++n1ZBhMVt4kHAC5txaEhhl9ZwIDAQABMA0GCSqGSIb3DQEBBQUAA4IB
-AQAdNqOKtWjjw2L1YZ7hOxLNyZlAmboyDKeirErCXVK64QVCQvWZTl3BLDmvJzP7
-YbW0NeKq9STOfnxlJOV23NRPLjlaDwMn4B9wF6elNi+FeBplKt8NbXwXPfSSIHN7
-ytJJMwPrEBrrXhSKedT/rpGx28Ld4UuC4aKCjhCVor0fGh3B8BPQZoAY3iO+lXJg
-5jSx2xyJS9xVGE4sjeHrPTYNApQUKHboj4d2aswEQg+JvQYqdEU+SCBveo3Qou3Y
-6VLxR/4Su2F6qooWNjensavLeNix6/TurrOgMcIMOsJ1DcWml8HH2yBqEW40QNFQ
-U19RU7sLdrZ60inUFxdxr+AR
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ujep.cz:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ujep.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="en">Jan Evangelista Purkyne University in Usti nad Labem</OrganizationName>
-    <OrganizationName xml:lang="cs">Univerzita Jana Evangelisty Purkyně v Ústí nad Labem</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Jan Evangelista Purkyne University in Usti nad Labem</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="cs">Univerzita Jana Evangelisty Purkyně v Ústí nad Labem</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.ujep.cz/en/welcome.html</OrganizationURL>
-    <OrganizationURL xml:lang="cs">http://www.ujep.cz/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Pavel</GivenName>
-    <SurName>Polacek</SurName>
-    <EmailAddress>pavel.polacek@ujep.cz</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.ujf.cas.cz-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.ujf.cas.cz-idp-shibboleth.xml
deleted file mode 100644
index 57293f90..00000000
--- a/swamid-interfederations-2.0/idp.ujf.cas.cz-idp-shibboleth.xml
+++ /dev/null
@@ -1,118 +0,0 @@
-<?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.ujf.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/" registrationInstant="2014-04-09T14:17:34Z">
-      <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>
-    <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://eduid.cz/uri/idp-group/avcr</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>
-      <shibmd:Scope regexp="false">ujf.cas.cz</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Nuclear Physics Institute of the ASCR</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="cs">Ústav jaderné fyziky AV ČR</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Identity Provider NPI ASCR employees.</mdui:Description>
-        <mdui:Description xml:lang="cs">Identity Provider pro zaměstnance ÚJF AV ČR</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.ujf.cas.cz/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="cs">http://www.ujf.cas.cz/</mdui:InformationURL>
-        <mdui:Logo height="44" width="74">https://jiftach.cas.cz/loga/logo-ujf-44.png</mdui:Logo>
-        <mdui:Logo height="411" width="960">https://jiftach.cas.cz/loga/logo-ujf-201.png</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDJDCCAgygAwIBAgIVAOD7Yz6jYE8fRkrwh1ZXoCmNIVU6MA0GCSqGSIb3DQEB
-BQUAMBkxFzAVBgNVBAMTDmlkcC51amYuY2FzLmN6MB4XDTE0MDQwMTExMDUyOVoX
-DTM0MDQwMTExMDUyOVowGTEXMBUGA1UEAxMOaWRwLnVqZi5jYXMuY3owggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCk6sa+XtQhFGDXscfnTX1UUzCmoDh5
-Kz4uFhU7NlFIK7uAjTp3QivxHKiCEP71zGnOcHC/sxBcEa7mt5qcp8eRuN9yxQRQ
-hB82z2WGHmzhB5qn6DCf1gMHMdlF1xSjm5tttmYyyTRqeKFDj4G7kkbvZoLC88UA
-8b5mqLubMNfGbDARjEQdAFjHbi6KZPvxHEg9EHxfSQHPwOon1GBpy565iacaZyKq
-N1c6rBQ1Dk7wM7ggbzye663O/BE3iL3i6j3trKD5oNp+73UHHDov1uevf6a+ytJd
-g7ls87pFGYEnkjMLOQz1ClsbOGmqcpLIaVxL5A0MqLaA1W/a8EyXXSFHAgMBAAGj
-YzBhMEAGA1UdEQQ5MDeCDmlkcC51amYuY2FzLmN6hiVodHRwczovL2lkcC51amYu
-Y2FzLmN6L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBSQTmbv/Y1doqdDwVhaTZm6
-/cTQSjANBgkqhkiG9w0BAQUFAAOCAQEAAymJ3004P1+g69w44c50ARFmSwmNkRig
-/NYhXIBOHCMmHDpzCNBmlLYlxHqf/eoOcC2aEnJsjHt442tmw33Wz4BE4k8X7S7Q
-VskudwRhmCqSglM4OI7hDlNqL7RqFFph6TgeNXHlJgC7ZPZT8///0AlDXI0Zlo1i
-qmRTjFNJq948mACt8uENgTAANFT76+OJMAPfd/9ILn+2EX6rf/yg/DjWzGqcoDkS
-5/h7LWagG5taDgrHmTzYp5+PumgVB2l8avie+ABirn//quP3ppZbSP5xD3ODhx77
-omalIqG0h8g4GccE3iuYIFki2jTqg3YNgi/tWm8a2ORKi9t4kDjUQA==
-
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ujf.cas.cz:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ujf.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.ujf.cas.cz/idp/profile/SAML2/Redirect/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ujf.cas.cz/idp/profile/SAML2/POST/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ujf.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.ujf.cas.cz/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ujf.cas.cz/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.ujf.cas.cz/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ujf.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">ujf.cas.cz</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDJDCCAgygAwIBAgIVAOD7Yz6jYE8fRkrwh1ZXoCmNIVU6MA0GCSqGSIb3DQEB
-BQUAMBkxFzAVBgNVBAMTDmlkcC51amYuY2FzLmN6MB4XDTE0MDQwMTExMDUyOVoX
-DTM0MDQwMTExMDUyOVowGTEXMBUGA1UEAxMOaWRwLnVqZi5jYXMuY3owggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCk6sa+XtQhFGDXscfnTX1UUzCmoDh5
-Kz4uFhU7NlFIK7uAjTp3QivxHKiCEP71zGnOcHC/sxBcEa7mt5qcp8eRuN9yxQRQ
-hB82z2WGHmzhB5qn6DCf1gMHMdlF1xSjm5tttmYyyTRqeKFDj4G7kkbvZoLC88UA
-8b5mqLubMNfGbDARjEQdAFjHbi6KZPvxHEg9EHxfSQHPwOon1GBpy565iacaZyKq
-N1c6rBQ1Dk7wM7ggbzye663O/BE3iL3i6j3trKD5oNp+73UHHDov1uevf6a+ytJd
-g7ls87pFGYEnkjMLOQz1ClsbOGmqcpLIaVxL5A0MqLaA1W/a8EyXXSFHAgMBAAGj
-YzBhMEAGA1UdEQQ5MDeCDmlkcC51amYuY2FzLmN6hiVodHRwczovL2lkcC51amYu
-Y2FzLmN6L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBSQTmbv/Y1doqdDwVhaTZm6
-/cTQSjANBgkqhkiG9w0BAQUFAAOCAQEAAymJ3004P1+g69w44c50ARFmSwmNkRig
-/NYhXIBOHCMmHDpzCNBmlLYlxHqf/eoOcC2aEnJsjHt442tmw33Wz4BE4k8X7S7Q
-VskudwRhmCqSglM4OI7hDlNqL7RqFFph6TgeNXHlJgC7ZPZT8///0AlDXI0Zlo1i
-qmRTjFNJq948mACt8uENgTAANFT76+OJMAPfd/9ILn+2EX6rf/yg/DjWzGqcoDkS
-5/h7LWagG5taDgrHmTzYp5+PumgVB2l8avie+ABirn//quP3ppZbSP5xD3ODhx77
-omalIqG0h8g4GccE3iuYIFki2jTqg3YNgi/tWm8a2ORKi9t4kDjUQA==
-
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ujf.cas.cz:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ujf.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">Nuclear Physics Institute of the ASCR</OrganizationName>
-    <OrganizationName xml:lang="cs">Ústav jaderné fyziky AV ČR</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Nuclear Physics Institute of the ASCR</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="cs">Ústav jaderné fyziky AV ČR, v.v.i.</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.ujf.cas.cz/</OrganizationURL>
-    <OrganizationURL xml:lang="cs">http://www.ujf.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.ujf.cas.cz.xml b/swamid-interfederations-2.0/idp.ujf.cas.cz.xml
deleted file mode 100644
index 57293f90..00000000
--- a/swamid-interfederations-2.0/idp.ujf.cas.cz.xml
+++ /dev/null
@@ -1,118 +0,0 @@
-<?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.ujf.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/" registrationInstant="2014-04-09T14:17:34Z">
-      <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>
-    <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://eduid.cz/uri/idp-group/avcr</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>
-      <shibmd:Scope regexp="false">ujf.cas.cz</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Nuclear Physics Institute of the ASCR</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="cs">Ústav jaderné fyziky AV ČR</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Identity Provider NPI ASCR employees.</mdui:Description>
-        <mdui:Description xml:lang="cs">Identity Provider pro zaměstnance ÚJF AV ČR</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.ujf.cas.cz/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="cs">http://www.ujf.cas.cz/</mdui:InformationURL>
-        <mdui:Logo height="44" width="74">https://jiftach.cas.cz/loga/logo-ujf-44.png</mdui:Logo>
-        <mdui:Logo height="411" width="960">https://jiftach.cas.cz/loga/logo-ujf-201.png</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDJDCCAgygAwIBAgIVAOD7Yz6jYE8fRkrwh1ZXoCmNIVU6MA0GCSqGSIb3DQEB
-BQUAMBkxFzAVBgNVBAMTDmlkcC51amYuY2FzLmN6MB4XDTE0MDQwMTExMDUyOVoX
-DTM0MDQwMTExMDUyOVowGTEXMBUGA1UEAxMOaWRwLnVqZi5jYXMuY3owggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCk6sa+XtQhFGDXscfnTX1UUzCmoDh5
-Kz4uFhU7NlFIK7uAjTp3QivxHKiCEP71zGnOcHC/sxBcEa7mt5qcp8eRuN9yxQRQ
-hB82z2WGHmzhB5qn6DCf1gMHMdlF1xSjm5tttmYyyTRqeKFDj4G7kkbvZoLC88UA
-8b5mqLubMNfGbDARjEQdAFjHbi6KZPvxHEg9EHxfSQHPwOon1GBpy565iacaZyKq
-N1c6rBQ1Dk7wM7ggbzye663O/BE3iL3i6j3trKD5oNp+73UHHDov1uevf6a+ytJd
-g7ls87pFGYEnkjMLOQz1ClsbOGmqcpLIaVxL5A0MqLaA1W/a8EyXXSFHAgMBAAGj
-YzBhMEAGA1UdEQQ5MDeCDmlkcC51amYuY2FzLmN6hiVodHRwczovL2lkcC51amYu
-Y2FzLmN6L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBSQTmbv/Y1doqdDwVhaTZm6
-/cTQSjANBgkqhkiG9w0BAQUFAAOCAQEAAymJ3004P1+g69w44c50ARFmSwmNkRig
-/NYhXIBOHCMmHDpzCNBmlLYlxHqf/eoOcC2aEnJsjHt442tmw33Wz4BE4k8X7S7Q
-VskudwRhmCqSglM4OI7hDlNqL7RqFFph6TgeNXHlJgC7ZPZT8///0AlDXI0Zlo1i
-qmRTjFNJq948mACt8uENgTAANFT76+OJMAPfd/9ILn+2EX6rf/yg/DjWzGqcoDkS
-5/h7LWagG5taDgrHmTzYp5+PumgVB2l8avie+ABirn//quP3ppZbSP5xD3ODhx77
-omalIqG0h8g4GccE3iuYIFki2jTqg3YNgi/tWm8a2ORKi9t4kDjUQA==
-
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ujf.cas.cz:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ujf.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.ujf.cas.cz/idp/profile/SAML2/Redirect/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ujf.cas.cz/idp/profile/SAML2/POST/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ujf.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.ujf.cas.cz/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ujf.cas.cz/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.ujf.cas.cz/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ujf.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">ujf.cas.cz</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDJDCCAgygAwIBAgIVAOD7Yz6jYE8fRkrwh1ZXoCmNIVU6MA0GCSqGSIb3DQEB
-BQUAMBkxFzAVBgNVBAMTDmlkcC51amYuY2FzLmN6MB4XDTE0MDQwMTExMDUyOVoX
-DTM0MDQwMTExMDUyOVowGTEXMBUGA1UEAxMOaWRwLnVqZi5jYXMuY3owggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCk6sa+XtQhFGDXscfnTX1UUzCmoDh5
-Kz4uFhU7NlFIK7uAjTp3QivxHKiCEP71zGnOcHC/sxBcEa7mt5qcp8eRuN9yxQRQ
-hB82z2WGHmzhB5qn6DCf1gMHMdlF1xSjm5tttmYyyTRqeKFDj4G7kkbvZoLC88UA
-8b5mqLubMNfGbDARjEQdAFjHbi6KZPvxHEg9EHxfSQHPwOon1GBpy565iacaZyKq
-N1c6rBQ1Dk7wM7ggbzye663O/BE3iL3i6j3trKD5oNp+73UHHDov1uevf6a+ytJd
-g7ls87pFGYEnkjMLOQz1ClsbOGmqcpLIaVxL5A0MqLaA1W/a8EyXXSFHAgMBAAGj
-YzBhMEAGA1UdEQQ5MDeCDmlkcC51amYuY2FzLmN6hiVodHRwczovL2lkcC51amYu
-Y2FzLmN6L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBSQTmbv/Y1doqdDwVhaTZm6
-/cTQSjANBgkqhkiG9w0BAQUFAAOCAQEAAymJ3004P1+g69w44c50ARFmSwmNkRig
-/NYhXIBOHCMmHDpzCNBmlLYlxHqf/eoOcC2aEnJsjHt442tmw33Wz4BE4k8X7S7Q
-VskudwRhmCqSglM4OI7hDlNqL7RqFFph6TgeNXHlJgC7ZPZT8///0AlDXI0Zlo1i
-qmRTjFNJq948mACt8uENgTAANFT76+OJMAPfd/9ILn+2EX6rf/yg/DjWzGqcoDkS
-5/h7LWagG5taDgrHmTzYp5+PumgVB2l8avie+ABirn//quP3ppZbSP5xD3ODhx77
-omalIqG0h8g4GccE3iuYIFki2jTqg3YNgi/tWm8a2ORKi9t4kDjUQA==
-
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ujf.cas.cz:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ujf.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">Nuclear Physics Institute of the ASCR</OrganizationName>
-    <OrganizationName xml:lang="cs">Ústav jaderné fyziky AV ČR</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Nuclear Physics Institute of the ASCR</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="cs">Ústav jaderné fyziky AV ČR, v.v.i.</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.ujf.cas.cz/</OrganizationURL>
-    <OrganizationURL xml:lang="cs">http://www.ujf.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.ul.ie-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.ul.ie-idp-shibboleth.xml
deleted file mode 100644
index ae0a69ec..00000000
--- a/swamid-interfederations-2.0/idp.ul.ie-idp-shibboleth.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.ul.ie/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.heanet.ie" registrationInstant="2010-09-22T00:00:00Z"/>
-  </md:Extensions>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ul.ie</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">University of Limerick</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="ga">Ollscoil Luimnigh</mdui:DisplayName>
-        <mdui:InformationURL xml:lang="en">http://www.ul.ie</mdui:InformationURL>
-        <mdui:Logo height="105" width="146">https://edugate.heanet.ie/rr3/logos/ul.png</mdui:Logo>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:GeolocationHint>geo:52.67381900899521,-8.566224575042725</mdui:GeolocationHint>
-      </mdui:DiscoHints>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDEDCCAfigAwIBAgIVAJxKI/0KxawomkWiBThPEUHGaeWBMA0GCSqGSIb3DQEB
-BQUAMBQxEjAQBgNVBAMTCWlkcC51bC5pZTAeFw0wOTA2MDMxMzQ1MzVaFw0yOTA2
-MDMxMzQ1MzVaMBQxEjAQBgNVBAMTCWlkcC51bC5pZTCCASIwDQYJKoZIhvcNAQEB
-BQADggEPADCCAQoCggEBAKLSkjj4e2mBQDJq0KHnOW9Hja+ppghnQ3M1uPy7KihO
-Fj066YioJ/L+diFDPFI+RMwg7mtOmALM/v1JgVXwjI/j5mXLcnwipqOw9JqzSlXi
-DLXgZ1OlYBfFzjJo3H80eVutTgQDeHGDZvk+RhstcYd7CBhXFEbusahw0Wt8ii4i
-xL+w22TAFCm34ybpQ29ekFDp+ytqQP4sWZUaB5U+FYksBNNn4hgRO0sg/B8WYIdv
-FT0s/h34BBpP5fQeKfduZ05Qd5ourLI4hMPNDYZ/+dhq1ufnV5ggkuMGuzlEtmtZ
-I4gX73kM/0UVTCdPsu7Q7IagUU8oZcT1DtCaOacn3M8CAwEAAaNZMFcwNgYDVR0R
-BC8wLYIJaWRwLnVsLmllhiBodHRwczovL2lkcC51bC5pZS9pZHAvc2hpYmJvbGV0
-aDAdBgNVHQ4EFgQUO9U1lJbD0Bspt87Hjdjj0rZgBb4wDQYJKoZIhvcNAQEFBQAD
-ggEBAIDL+WS+pD5R1fJdL4sXWEgiE7Qv39aNl8NSBWbV1v/7CBrcb737/dLmJi5F
-H8AwVisWUtmrFxea+OJvwLhrmLt9HXJmsnl8zwyvVEeu2oU4QskbLqDWuewz317g
-orDzkFTm6NcvAUiPYiGpjO9o6HreXSn3mMinVu2waH56e0T7zxkEYMJ1o7A7fJO6
-zZoWbnsaUBtZKpWUp98WKRX7XX3fczEa3lENR4/lnlEimPYXT9wKh8qydCyWPCYS
-k65z+Uw92gy6HaID2r+Vu8juYEp8989R/CHRZlnxFrGQXkmKYn6traja5Rvaqh67
-Rzm7HVZoXU6uXX1z5kqraHrS28c=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ul.ie/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ul.ie/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.ul.ie/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">University of Limerick</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">University of Limerick</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.ul.ie</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:SurName>Brian Sexton</md:SurName>
-    <md:EmailAddress>brian.sexton@ul.ie</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Eugene Murnane</md:SurName>
-    <md:EmailAddress>eugene.murnane@ul.ie</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:SurName>Eugene Murnane</md:SurName>
-    <md:EmailAddress>eugene.murnane@ul.ie</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.ul.ie.xml b/swamid-interfederations-2.0/idp.ul.ie.xml
deleted file mode 100644
index ae0a69ec..00000000
--- a/swamid-interfederations-2.0/idp.ul.ie.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.ul.ie/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.heanet.ie" registrationInstant="2010-09-22T00:00:00Z"/>
-  </md:Extensions>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ul.ie</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">University of Limerick</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="ga">Ollscoil Luimnigh</mdui:DisplayName>
-        <mdui:InformationURL xml:lang="en">http://www.ul.ie</mdui:InformationURL>
-        <mdui:Logo height="105" width="146">https://edugate.heanet.ie/rr3/logos/ul.png</mdui:Logo>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:GeolocationHint>geo:52.67381900899521,-8.566224575042725</mdui:GeolocationHint>
-      </mdui:DiscoHints>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDEDCCAfigAwIBAgIVAJxKI/0KxawomkWiBThPEUHGaeWBMA0GCSqGSIb3DQEB
-BQUAMBQxEjAQBgNVBAMTCWlkcC51bC5pZTAeFw0wOTA2MDMxMzQ1MzVaFw0yOTA2
-MDMxMzQ1MzVaMBQxEjAQBgNVBAMTCWlkcC51bC5pZTCCASIwDQYJKoZIhvcNAQEB
-BQADggEPADCCAQoCggEBAKLSkjj4e2mBQDJq0KHnOW9Hja+ppghnQ3M1uPy7KihO
-Fj066YioJ/L+diFDPFI+RMwg7mtOmALM/v1JgVXwjI/j5mXLcnwipqOw9JqzSlXi
-DLXgZ1OlYBfFzjJo3H80eVutTgQDeHGDZvk+RhstcYd7CBhXFEbusahw0Wt8ii4i
-xL+w22TAFCm34ybpQ29ekFDp+ytqQP4sWZUaB5U+FYksBNNn4hgRO0sg/B8WYIdv
-FT0s/h34BBpP5fQeKfduZ05Qd5ourLI4hMPNDYZ/+dhq1ufnV5ggkuMGuzlEtmtZ
-I4gX73kM/0UVTCdPsu7Q7IagUU8oZcT1DtCaOacn3M8CAwEAAaNZMFcwNgYDVR0R
-BC8wLYIJaWRwLnVsLmllhiBodHRwczovL2lkcC51bC5pZS9pZHAvc2hpYmJvbGV0
-aDAdBgNVHQ4EFgQUO9U1lJbD0Bspt87Hjdjj0rZgBb4wDQYJKoZIhvcNAQEFBQAD
-ggEBAIDL+WS+pD5R1fJdL4sXWEgiE7Qv39aNl8NSBWbV1v/7CBrcb737/dLmJi5F
-H8AwVisWUtmrFxea+OJvwLhrmLt9HXJmsnl8zwyvVEeu2oU4QskbLqDWuewz317g
-orDzkFTm6NcvAUiPYiGpjO9o6HreXSn3mMinVu2waH56e0T7zxkEYMJ1o7A7fJO6
-zZoWbnsaUBtZKpWUp98WKRX7XX3fczEa3lENR4/lnlEimPYXT9wKh8qydCyWPCYS
-k65z+Uw92gy6HaID2r+Vu8juYEp8989R/CHRZlnxFrGQXkmKYn6traja5Rvaqh67
-Rzm7HVZoXU6uXX1z5kqraHrS28c=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ul.ie/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ul.ie/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.ul.ie/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">University of Limerick</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">University of Limerick</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.ul.ie</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:SurName>Brian Sexton</md:SurName>
-    <md:EmailAddress>brian.sexton@ul.ie</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Eugene Murnane</md:SurName>
-    <md:EmailAddress>eugene.murnane@ul.ie</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:SurName>Eugene Murnane</md:SurName>
-    <md:EmailAddress>eugene.murnane@ul.ie</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.ulapland.fi.xml b/swamid-interfederations-2.0/idp.ulapland.fi.xml
deleted file mode 100644
index 2c4ebebd..00000000
--- a/swamid-interfederations-2.0/idp.ulapland.fi.xml
+++ /dev/null
@@ -1,87 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns: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.ulapland.fi/idp/shibboleth">
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope regexp="false">ulapland.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>MIIGrDCCBJSgAwIBAgIQdmrtc4rB3ElPE0L6/94NTjANBgkqhkiG9w0BAQUFADA5
-MRQwEgYDVQQKDAtUZWxpYVNvbmVyYTEhMB8GA1UEAwwYVGVsaWFTb25lcmEgU2Vy
-dmVyIENBIHYxMB4XDTE0MDQxNjEwMjQ0N1oXDTE2MDQxNTEwMjQ0N1owgYQxCzAJ
-BgNVBAYTAkZJMRAwDgYDVQQIDAdMYXBsYW5kMRIwEAYDVQQHDAlSb3ZhbmllbWkx
-HjAcBgNVBAoMFVVuaXZlcnNpdHkgb2YgTGFwbGFuZDEVMBMGA1UECwwMSUNUIFNl
-cnZpY2VzMRgwFgYDVQQDDA9pZHAudWxhcGxhbmQuZmkwggEiMA0GCSqGSIb3DQEB
-AQUAA4IBDwAwggEKAoIBAQDF4kd9ojVzXalhcDQm+DqVC9DAv+SNYCxSWnhbkms2
-8PPk5cMT6WfHy242QSKYZe2Asbvx856xCxbI+pkEtN7MyeDGu5PmFetwcSj5qaVG
-5spVNoZAgzLKWTzBfmxTT9EjhDioLV2ObqIzR+NTOCvQjfEGKpw9Lg9JobadmUwp
-kDhk1Y3o7ERBnOdyVFfvggl8sUMzU47XJfxk+jlpvOy7x3rQswTTOaGZkgd0OVxC
-awr6HzbBTEu08AiX2nsD3GnqSUPS38/K26a5KGOzFx7j+kT4K+ICBiPTFYgTKgln
-50rIwCn2wYf96vb/Vj6KT/S3WpQ6hVLMie5QA5Zuwl4rAgMBAAGjggJiMIICXjCB
-jQYIKwYBBQUHAQEEgYAwfjAtBggrBgEFBQcwAYYhaHR0cDovL29jc3AudHJ1c3Qu
-dGVsaWFzb25lcmEuY29tME0GCCsGAQUFBzAChkFodHRwOi8vcmVwb3NpdG9yeS50
-cnVzdC50ZWxpYXNvbmVyYS5jb20vdGVsaWFzb25lcmFzZXJ2ZXJjYXYxLmNlcjAf
-BgNVHSMEGDAWgBSggb5Vm/N/YQWEiy0MO+AISe5XPjAZBgNVHSAEEjAQMA4GDCsG
-AQQBgg8CAwEBDzCBygYDVR0fBIHCMIG/MEKgQKA+hjxodHRwOi8vY3JsLTMudHJ1
-c3QudGVsaWFzb25lcmEuY29tL3RlbGlhc29uZXJhc2VydmVyY2F2MS5jcmwweaB3
-oHWGc2xkYXA6Ly9jcmwtMS50cnVzdC50ZWxpYXNvbmVyYS5jb20vY249VGVsaWFT
-b25lcmElMjBTZXJ2ZXIlMjBDQSUyMHYxLG89VGVsaWFTb25lcmE/Y2VydGlmaWNh
-dGVyZXZvY2F0aW9ubGlzdDtiaW5hcnkwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsG
-AQUFBwMCMA4GA1UdDwEB/wQEAwIEsDB4BgkqhkiG9w0BCQ8EazBpMA4GCCqGSIb3
-DQMCAgIAgDAOBggqhkiG9w0DBAICAIAwCwYJYIZIAWUDBAEqMAsGCWCGSAFlAwQB
-LTALBglghkgBZQMEAQIwCwYJYIZIAWUDBAEFMAcGBSsOAwIHMAoGCCqGSIb3DQMH
-MBoGA1UdEQQTMBGCD2lkcC51bGFwbGFuZC5maTANBgkqhkiG9w0BAQUFAAOCAgEA
-KrVSvHwBWFnLVT/pQoSRaNMTnMymhmYDM78Lo2PVXLEnfmuD8pZYXFTLGxRMDkM/
-bC8oGTXFKBmphr0wn2unD06itE+XBZXpQac+497q1Fb7/rgmf7Vp11Zq2m2yUnjm
-NaGIsjgP+K6Y1EmeAXicbMVHVjJ2MmBuwTRhZI5kOIktUWrHuthSQ3Vu78Urdirz
-fEC0lqokvJIABrQQf36sZc84p7oyrO7EWb2BePM3ZtNQwSpDATTdhDTTdVgETA6T
-JGOcnvlP6i2rVel18noDgvoUuPr8TKkeV5uyc0cF7nfLnqQpRiLrWnF1Eko0Ze3w
-QmGUdoWkB/RQ9BgJ3Bbfo+37EZg+VxXBCI0chCEXjFwMAurS4SzBYplZsBr7WxXH
-JsrHg0F9JQvo5wQ04sZuiMP3WQhVuTdvHay11pih6GY1ujlMMjlbqlg1SrCJ3tMi
-jwhCYD9uz2EVokoHVRBYfsr9iE9H/Fo9PXYIZJNRdpSQahLammOLqnhmhRGBMtg6
-6zHBsKhwIbmxyb2z8ri2J4bucZG0tLqw+5pm39zMjHpvjUJ49cNhVF8hH8Tsxglb
-WBUVl8rtnAcsFuvvT5nyxPRV6+2hromsdwEK4PeUyLz0BFxQM5U/J9KOhC1faVfM
-sNec1gZqKR5mpgC1RQRtCn3q7woBwcokimHhhsFgFu8=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ulapland.fi/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="fi">Lapin yliopisto</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">University of Lapland</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">Lapplands universitet</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="fi">Lapin yliopisto</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">University of Lapland</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="sv">Lapplands universitet</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="fi">http://www.ulapland.fi</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.ulapland.fi</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sv">http://www.ulapland.fi</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Arto</md:GivenName>
-    <md:SurName>Hangasluoma</md:SurName>
-    <md:EmailAddress>mailto:arto.hangasluoma@ulapland.fi</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Esa</md:GivenName>
-    <md:SurName>Matasaho</md:SurName>
-    <md:EmailAddress>mailto:esa.matasaho@ulapland.fi</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Arto</md:GivenName>
-    <md:SurName>Hangasluoma</md:SurName>
-    <md:EmailAddress>mailto:arto.hangasluoma@ulapland.fi</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Iikka</md:GivenName>
-    <md:SurName>Kupari</md:SurName>
-    <md:EmailAddress>mailto:iikka.kupari@ulapland.fi</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.umk.pl-simplesaml-saml2-idp-metadata.php.xml b/swamid-interfederations-2.0/idp.umk.pl-simplesaml-saml2-idp-metadata.php.xml
deleted file mode 100644
index e5d5ba16..00000000
--- a/swamid-interfederations-2.0/idp.umk.pl-simplesaml-saml2-idp-metadata.php.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?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="2013-12-15T00:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://aai.pionier.net.pl/en/index.php?page=rps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </md:Extensions>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope regexp="false">umk.pl</shibmd:Scope>
-      <shibmd:Scope regexp="false">uni.torun.pl</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Nicolaus Copernicus University</mdui:DisplayName>
-        <mdui:Description xml:lang="en">
-            Nicolaus Copernicus University Identity Provider is used by employees.
-         </mdui:Description>
-        <mdui:Logo height="168" width="150" xml:lang="en">https://www.umk.pl/grafika/logoumk64.png</mdui:Logo>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:IPHint>158.75.0.0/16</mdui:IPHint>
-        <mdui:DomainHint>uni.torun.pl</mdui:DomainHint>
-        <mdui:DomainHint>umk.pl</mdui:DomainHint>
-        <mdui:GeolocationHint>geo:53.1234804,18.0084378</mdui:GeolocationHint>
-      </mdui:DiscoHints>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDejCCAmICCQC6YrVExu7BUTANBgkqhkiG9w0BAQUFADB/MQswCQYDVQQGEwJQTDExMC8GA1UEChMoVW5pd2Vyc3l0ZXQgTWlrb2xhamEgS29wZXJuaWthIHcgVG9ydW5pdTEoMCYGA1UECxMfVWN6ZW5pYW5lIENlbnRydW0gSW5mb3JtYXR5Y3puZTETMBEGA1UEAxMKaWRwLnVtay5wbDAeFw0xMzA0MjIwODUwMzVaFw0yMzA0MjIwODUwMzVaMH8xCzAJBgNVBAYTAlBMMTEwLwYDVQQKEyhVbml3ZXJzeXRldCBNaWtvbGFqYSBLb3Blcm5pa2EgdyBUb3J1bml1MSgwJgYDVQQLEx9VY3plbmlhbmUgQ2VudHJ1bSBJbmZvcm1hdHljem5lMRMwEQYDVQQDEwppZHAudW1rLnBsMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEArq1rEn9i3haxBrIM/h/8V20Ap+LeLeG9SNand3N5k6wTqfQMPHnhDoTSKg4iI1+Wlnlr91HCaUGTqGmuWZpSTmlLIgneKSkB3BZir7Yrz44mjD5b0OOBLKxoQQQrZiVE0Rz2Ek14WDLQ9reI6uBTFV39PRM2JSLCSbzlEO70+vJ1d6oxWwinzcL+wG8NApc2mt3VJgRwF15P2H7PKU1le03CdatY7GyHGqBllQuQ3aa8a3jbqZRlQ7BDw+HiuJGsWRoNKAQkci8SCLz7/RJX3XuWWRdM+DBGw7jALY/4WW00DUWaKv76nfsTqRwG8pySab4EQPoUsYGO196jTC9DVQIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQBu6pNnNvtILCiCgjsBjp7T2tWQLPLrgjpMD4yTBgg0IgQjP+wpLhwBB8huX6FfhySaedz9YXEphUIPN9ZuJyfonp+w1ITHtEguY9V7K06IkTpXJV4/LXjzV7iGVZ3tgvtlYz+uBT2kTdqJcCWBj860JMWP7BHJ3orQsGUka9QentVEtKMqvmdOfOXCd48NZYFvCg4iQlr2lHxPTANTKVf8+d7Js3+MFBqTSPLsRsDAknL9tZWTM+1U6toECw+p4dTk3u3Osn8Fkmbwg/AnUyNP9cfWW9YSHEbLzq0kFWP6SoViqzc2WYPPusaLELoZBZlqFp0dLtEcgQPasj2dJE+a</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDejCCAmICCQC6YrVExu7BUTANBgkqhkiG9w0BAQUFADB/MQswCQYDVQQGEwJQTDExMC8GA1UEChMoVW5pd2Vyc3l0ZXQgTWlrb2xhamEgS29wZXJuaWthIHcgVG9ydW5pdTEoMCYGA1UECxMfVWN6ZW5pYW5lIENlbnRydW0gSW5mb3JtYXR5Y3puZTETMBEGA1UEAxMKaWRwLnVtay5wbDAeFw0xMzA0MjIwODUwMzVaFw0yMzA0MjIwODUwMzVaMH8xCzAJBgNVBAYTAlBMMTEwLwYDVQQKEyhVbml3ZXJzeXRldCBNaWtvbGFqYSBLb3Blcm5pa2EgdyBUb3J1bml1MSgwJgYDVQQLEx9VY3plbmlhbmUgQ2VudHJ1bSBJbmZvcm1hdHljem5lMRMwEQYDVQQDEwppZHAudW1rLnBsMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEArq1rEn9i3haxBrIM/h/8V20Ap+LeLeG9SNand3N5k6wTqfQMPHnhDoTSKg4iI1+Wlnlr91HCaUGTqGmuWZpSTmlLIgneKSkB3BZir7Yrz44mjD5b0OOBLKxoQQQrZiVE0Rz2Ek14WDLQ9reI6uBTFV39PRM2JSLCSbzlEO70+vJ1d6oxWwinzcL+wG8NApc2mt3VJgRwF15P2H7PKU1le03CdatY7GyHGqBllQuQ3aa8a3jbqZRlQ7BDw+HiuJGsWRoNKAQkci8SCLz7/RJX3XuWWRdM+DBGw7jALY/4WW00DUWaKv76nfsTqRwG8pySab4EQPoUsYGO196jTC9DVQIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQBu6pNnNvtILCiCgjsBjp7T2tWQLPLrgjpMD4yTBgg0IgQjP+wpLhwBB8huX6FfhySaedz9YXEphUIPN9ZuJyfonp+w1ITHtEguY9V7K06IkTpXJV4/LXjzV7iGVZ3tgvtlYz+uBT2kTdqJcCWBj860JMWP7BHJ3orQsGUka9QentVEtKMqvmdOfOXCd48NZYFvCg4iQlr2lHxPTANTKVf8+d7Js3+MFBqTSPLsRsDAknL9tZWTM+1U6toECw+p4dTk3u3Osn8Fkmbwg/AnUyNP9cfWW9YSHEbLzq0kFWP6SoViqzc2WYPPusaLELoZBZlqFp0dLtEcgQPasj2dJE+a</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.umk.pl/simplesaml/saml2/idp/SingleLogoutService.php"/>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.umk.pl/simplesaml/saml2/idp/SSOService.php"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Nicolaus Copernicus University in Torun</md:OrganizationName>
-    <md:OrganizationName xml:lang="pl">Uniwersytet Mikołaja Kopernika w Toruniu</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Nicolaus Copernicus University in Torun</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="pl">Uniwersytet Mikołaja Kopernika w Toruniu</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.umk.pl</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>NCU IdP</md:GivenName>
-    <md:SurName>Team</md:SurName>
-    <md:EmailAddress>admin@umk.pl</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.umk.pl.xml b/swamid-interfederations-2.0/idp.umk.pl.xml
deleted file mode 100644
index e5d5ba16..00000000
--- a/swamid-interfederations-2.0/idp.umk.pl.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?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="2013-12-15T00:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://aai.pionier.net.pl/en/index.php?page=rps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </md:Extensions>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope regexp="false">umk.pl</shibmd:Scope>
-      <shibmd:Scope regexp="false">uni.torun.pl</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Nicolaus Copernicus University</mdui:DisplayName>
-        <mdui:Description xml:lang="en">
-            Nicolaus Copernicus University Identity Provider is used by employees.
-         </mdui:Description>
-        <mdui:Logo height="168" width="150" xml:lang="en">https://www.umk.pl/grafika/logoumk64.png</mdui:Logo>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:IPHint>158.75.0.0/16</mdui:IPHint>
-        <mdui:DomainHint>uni.torun.pl</mdui:DomainHint>
-        <mdui:DomainHint>umk.pl</mdui:DomainHint>
-        <mdui:GeolocationHint>geo:53.1234804,18.0084378</mdui:GeolocationHint>
-      </mdui:DiscoHints>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDejCCAmICCQC6YrVExu7BUTANBgkqhkiG9w0BAQUFADB/MQswCQYDVQQGEwJQTDExMC8GA1UEChMoVW5pd2Vyc3l0ZXQgTWlrb2xhamEgS29wZXJuaWthIHcgVG9ydW5pdTEoMCYGA1UECxMfVWN6ZW5pYW5lIENlbnRydW0gSW5mb3JtYXR5Y3puZTETMBEGA1UEAxMKaWRwLnVtay5wbDAeFw0xMzA0MjIwODUwMzVaFw0yMzA0MjIwODUwMzVaMH8xCzAJBgNVBAYTAlBMMTEwLwYDVQQKEyhVbml3ZXJzeXRldCBNaWtvbGFqYSBLb3Blcm5pa2EgdyBUb3J1bml1MSgwJgYDVQQLEx9VY3plbmlhbmUgQ2VudHJ1bSBJbmZvcm1hdHljem5lMRMwEQYDVQQDEwppZHAudW1rLnBsMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEArq1rEn9i3haxBrIM/h/8V20Ap+LeLeG9SNand3N5k6wTqfQMPHnhDoTSKg4iI1+Wlnlr91HCaUGTqGmuWZpSTmlLIgneKSkB3BZir7Yrz44mjD5b0OOBLKxoQQQrZiVE0Rz2Ek14WDLQ9reI6uBTFV39PRM2JSLCSbzlEO70+vJ1d6oxWwinzcL+wG8NApc2mt3VJgRwF15P2H7PKU1le03CdatY7GyHGqBllQuQ3aa8a3jbqZRlQ7BDw+HiuJGsWRoNKAQkci8SCLz7/RJX3XuWWRdM+DBGw7jALY/4WW00DUWaKv76nfsTqRwG8pySab4EQPoUsYGO196jTC9DVQIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQBu6pNnNvtILCiCgjsBjp7T2tWQLPLrgjpMD4yTBgg0IgQjP+wpLhwBB8huX6FfhySaedz9YXEphUIPN9ZuJyfonp+w1ITHtEguY9V7K06IkTpXJV4/LXjzV7iGVZ3tgvtlYz+uBT2kTdqJcCWBj860JMWP7BHJ3orQsGUka9QentVEtKMqvmdOfOXCd48NZYFvCg4iQlr2lHxPTANTKVf8+d7Js3+MFBqTSPLsRsDAknL9tZWTM+1U6toECw+p4dTk3u3Osn8Fkmbwg/AnUyNP9cfWW9YSHEbLzq0kFWP6SoViqzc2WYPPusaLELoZBZlqFp0dLtEcgQPasj2dJE+a</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDejCCAmICCQC6YrVExu7BUTANBgkqhkiG9w0BAQUFADB/MQswCQYDVQQGEwJQTDExMC8GA1UEChMoVW5pd2Vyc3l0ZXQgTWlrb2xhamEgS29wZXJuaWthIHcgVG9ydW5pdTEoMCYGA1UECxMfVWN6ZW5pYW5lIENlbnRydW0gSW5mb3JtYXR5Y3puZTETMBEGA1UEAxMKaWRwLnVtay5wbDAeFw0xMzA0MjIwODUwMzVaFw0yMzA0MjIwODUwMzVaMH8xCzAJBgNVBAYTAlBMMTEwLwYDVQQKEyhVbml3ZXJzeXRldCBNaWtvbGFqYSBLb3Blcm5pa2EgdyBUb3J1bml1MSgwJgYDVQQLEx9VY3plbmlhbmUgQ2VudHJ1bSBJbmZvcm1hdHljem5lMRMwEQYDVQQDEwppZHAudW1rLnBsMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEArq1rEn9i3haxBrIM/h/8V20Ap+LeLeG9SNand3N5k6wTqfQMPHnhDoTSKg4iI1+Wlnlr91HCaUGTqGmuWZpSTmlLIgneKSkB3BZir7Yrz44mjD5b0OOBLKxoQQQrZiVE0Rz2Ek14WDLQ9reI6uBTFV39PRM2JSLCSbzlEO70+vJ1d6oxWwinzcL+wG8NApc2mt3VJgRwF15P2H7PKU1le03CdatY7GyHGqBllQuQ3aa8a3jbqZRlQ7BDw+HiuJGsWRoNKAQkci8SCLz7/RJX3XuWWRdM+DBGw7jALY/4WW00DUWaKv76nfsTqRwG8pySab4EQPoUsYGO196jTC9DVQIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQBu6pNnNvtILCiCgjsBjp7T2tWQLPLrgjpMD4yTBgg0IgQjP+wpLhwBB8huX6FfhySaedz9YXEphUIPN9ZuJyfonp+w1ITHtEguY9V7K06IkTpXJV4/LXjzV7iGVZ3tgvtlYz+uBT2kTdqJcCWBj860JMWP7BHJ3orQsGUka9QentVEtKMqvmdOfOXCd48NZYFvCg4iQlr2lHxPTANTKVf8+d7Js3+MFBqTSPLsRsDAknL9tZWTM+1U6toECw+p4dTk3u3Osn8Fkmbwg/AnUyNP9cfWW9YSHEbLzq0kFWP6SoViqzc2WYPPusaLELoZBZlqFp0dLtEcgQPasj2dJE+a</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.umk.pl/simplesaml/saml2/idp/SingleLogoutService.php"/>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.umk.pl/simplesaml/saml2/idp/SSOService.php"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Nicolaus Copernicus University in Torun</md:OrganizationName>
-    <md:OrganizationName xml:lang="pl">Uniwersytet Mikołaja Kopernika w Toruniu</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Nicolaus Copernicus University in Torun</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="pl">Uniwersytet Mikołaja Kopernika w Toruniu</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.umk.pl</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>NCU IdP</md:GivenName>
-    <md:SurName>Team</md:SurName>
-    <md:EmailAddress>admin@umk.pl</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.unibocconi-prod.it-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.unibocconi-prod.it-idp-shibboleth.xml
deleted file mode 100644
index 02ea365b..00000000
--- a/swamid-interfederations-2.0/idp.unibocconi-prod.it-idp-shibboleth.xml
+++ /dev/null
@@ -1,105 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" entityID="https://idp.unibocconi-prod.it/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2014-08-29T10:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</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">unibocconi.it</shibmd:Scope>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="en">Bocconi University</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="it">Universita' Bocconi</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Identity provider for Bocconi University users</mdui:Description>
-        <mdui:Description xml:lang="it">Identity provider per gli utenti dell'Universita' Bocconi</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.unibocconi.eu/idem</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="it">http://www.unibocconi.it/idem</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">http://www.unibocconi.eu/idem-privacy</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="it">http://www.unibocconi.it/idem-privacy</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDMDCCAhigAwIBAgIVAIwE2/JkvYoJZcBwpAXXselfihnEMA0GCSqGSIb3DQEB
-BQUAMBwxGjAYBgNVBAMTEWlkcC51bmlib2Njb25pLml0MB4XDTEwMDIxNzEzMjAx
-NloXDTMwMDIxNzEzMjAxNlowHDEaMBgGA1UEAxMRaWRwLnVuaWJvY2NvbmkuaXQw
-ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCccPuV4oaBTT+Pg8czitby
-if616ZGLNOcdn58FvjPTx7/bgqy1KoFEnkQyzskglkxQTeVzo0cw3vhydJmnu0/4
-jAmS4AleN5k8RqK/JVDseUYPev6LOgtaghlmaiVBwozRf7iGuiMfwj9ZC4iavaOh
-dbqzGyvbx2SREifRNYGgWrUOwrFdAdbwbT5fmEfxnRm81RdYFFmjYARSKgQdbXTG
-iLa4+117OU19ybxVvdWU0nnz+b0YfcE7F/JtbaMwt27JKx2X67+N7z/6Hjg/kQme
-ktt+pXdqYNKk1km8sMa21Tfb9mBufLwgbgVTUXN/ZoaDWHCV8QiX1ydiaekrX1Q/
-AgMBAAGjaTBnMEYGA1UdEQQ/MD2CEWlkcC51bmlib2Njb25pLml0hihodHRwczov
-L2lkcC51bmlib2Njb25pLml0L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBSo5rDb
-l8qPk/l/4PTC/gsy6kVagzANBgkqhkiG9w0BAQUFAAOCAQEAb0iBvtK+sxUDPRsh
-7mkuz7da4Cbd6YqX3CB5eQ3quBqo7/EjVbyu3o+BwOHBQwjv3PcTd0xv5axZ4jft
-BCyUTpp6lEHTRQw5e3AC46tOBM/pnioN3qVz7AuKZK9GOCNK4LwlRKck8QtvrDc9
-uPLi1pZq4lUAe9cGV5cBKinnpcMl4acTzqOWJ1ddEIR6KFiPiYE+uwxm6Jfrvydp
-9lYG4I0gNd31pe3fVIsHCpD7NDVYFmk7AJ7GIyXxjbzPFkcY7xqHMb8RlZutzQa2
-uo9UEg+bZsGyqWbheDSr5LT8Dc6JLI7PzMH0Q5O/ejDBq+gEuXcQxAKl/esAeLLp
-K93oKA==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.unibocconi.it/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.unibocconi.it/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://idp.unibocconi.it/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.unibocconi.it/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.unibocconi.it/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.unibocconi.it/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">unibocconi.it</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDMDCCAhigAwIBAgIVAIwE2/JkvYoJZcBwpAXXselfihnEMA0GCSqGSIb3DQEB
-BQUAMBwxGjAYBgNVBAMTEWlkcC51bmlib2Njb25pLml0MB4XDTEwMDIxNzEzMjAx
-NloXDTMwMDIxNzEzMjAxNlowHDEaMBgGA1UEAxMRaWRwLnVuaWJvY2NvbmkuaXQw
-ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCccPuV4oaBTT+Pg8czitby
-if616ZGLNOcdn58FvjPTx7/bgqy1KoFEnkQyzskglkxQTeVzo0cw3vhydJmnu0/4
-jAmS4AleN5k8RqK/JVDseUYPev6LOgtaghlmaiVBwozRf7iGuiMfwj9ZC4iavaOh
-dbqzGyvbx2SREifRNYGgWrUOwrFdAdbwbT5fmEfxnRm81RdYFFmjYARSKgQdbXTG
-iLa4+117OU19ybxVvdWU0nnz+b0YfcE7F/JtbaMwt27JKx2X67+N7z/6Hjg/kQme
-ktt+pXdqYNKk1km8sMa21Tfb9mBufLwgbgVTUXN/ZoaDWHCV8QiX1ydiaekrX1Q/
-AgMBAAGjaTBnMEYGA1UdEQQ/MD2CEWlkcC51bmlib2Njb25pLml0hihodHRwczov
-L2lkcC51bmlib2Njb25pLml0L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBSo5rDb
-l8qPk/l/4PTC/gsy6kVagzANBgkqhkiG9w0BAQUFAAOCAQEAb0iBvtK+sxUDPRsh
-7mkuz7da4Cbd6YqX3CB5eQ3quBqo7/EjVbyu3o+BwOHBQwjv3PcTd0xv5axZ4jft
-BCyUTpp6lEHTRQw5e3AC46tOBM/pnioN3qVz7AuKZK9GOCNK4LwlRKck8QtvrDc9
-uPLi1pZq4lUAe9cGV5cBKinnpcMl4acTzqOWJ1ddEIR6KFiPiYE+uwxm6Jfrvydp
-9lYG4I0gNd31pe3fVIsHCpD7NDVYFmk7AJ7GIyXxjbzPFkcY7xqHMb8RlZutzQa2
-uo9UEg+bZsGyqWbheDSr5LT8Dc6JLI7PzMH0Q5O/ejDBq+gEuXcQxAKl/esAeLLp
-K93oKA==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.unibocconi.it/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.unibocconi.it/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="en">Bocconi University</OrganizationName>
-    <OrganizationName xml:lang="it">Universita' Bocconi</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Bocconi University</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="it">Universita' Bocconi</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.unibocconi.eu/</OrganizationURL>
-    <OrganizationURL xml:lang="it">http://www.unibocconi.it/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <EmailAddress>idem@unibocconi.it</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.unibocconi-prod.it.xml b/swamid-interfederations-2.0/idp.unibocconi-prod.it.xml
deleted file mode 100644
index 02ea365b..00000000
--- a/swamid-interfederations-2.0/idp.unibocconi-prod.it.xml
+++ /dev/null
@@ -1,105 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" entityID="https://idp.unibocconi-prod.it/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2014-08-29T10:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</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">unibocconi.it</shibmd:Scope>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="en">Bocconi University</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="it">Universita' Bocconi</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Identity provider for Bocconi University users</mdui:Description>
-        <mdui:Description xml:lang="it">Identity provider per gli utenti dell'Universita' Bocconi</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.unibocconi.eu/idem</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="it">http://www.unibocconi.it/idem</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">http://www.unibocconi.eu/idem-privacy</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="it">http://www.unibocconi.it/idem-privacy</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDMDCCAhigAwIBAgIVAIwE2/JkvYoJZcBwpAXXselfihnEMA0GCSqGSIb3DQEB
-BQUAMBwxGjAYBgNVBAMTEWlkcC51bmlib2Njb25pLml0MB4XDTEwMDIxNzEzMjAx
-NloXDTMwMDIxNzEzMjAxNlowHDEaMBgGA1UEAxMRaWRwLnVuaWJvY2NvbmkuaXQw
-ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCccPuV4oaBTT+Pg8czitby
-if616ZGLNOcdn58FvjPTx7/bgqy1KoFEnkQyzskglkxQTeVzo0cw3vhydJmnu0/4
-jAmS4AleN5k8RqK/JVDseUYPev6LOgtaghlmaiVBwozRf7iGuiMfwj9ZC4iavaOh
-dbqzGyvbx2SREifRNYGgWrUOwrFdAdbwbT5fmEfxnRm81RdYFFmjYARSKgQdbXTG
-iLa4+117OU19ybxVvdWU0nnz+b0YfcE7F/JtbaMwt27JKx2X67+N7z/6Hjg/kQme
-ktt+pXdqYNKk1km8sMa21Tfb9mBufLwgbgVTUXN/ZoaDWHCV8QiX1ydiaekrX1Q/
-AgMBAAGjaTBnMEYGA1UdEQQ/MD2CEWlkcC51bmlib2Njb25pLml0hihodHRwczov
-L2lkcC51bmlib2Njb25pLml0L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBSo5rDb
-l8qPk/l/4PTC/gsy6kVagzANBgkqhkiG9w0BAQUFAAOCAQEAb0iBvtK+sxUDPRsh
-7mkuz7da4Cbd6YqX3CB5eQ3quBqo7/EjVbyu3o+BwOHBQwjv3PcTd0xv5axZ4jft
-BCyUTpp6lEHTRQw5e3AC46tOBM/pnioN3qVz7AuKZK9GOCNK4LwlRKck8QtvrDc9
-uPLi1pZq4lUAe9cGV5cBKinnpcMl4acTzqOWJ1ddEIR6KFiPiYE+uwxm6Jfrvydp
-9lYG4I0gNd31pe3fVIsHCpD7NDVYFmk7AJ7GIyXxjbzPFkcY7xqHMb8RlZutzQa2
-uo9UEg+bZsGyqWbheDSr5LT8Dc6JLI7PzMH0Q5O/ejDBq+gEuXcQxAKl/esAeLLp
-K93oKA==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.unibocconi.it/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.unibocconi.it/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://idp.unibocconi.it/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.unibocconi.it/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.unibocconi.it/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.unibocconi.it/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">unibocconi.it</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDMDCCAhigAwIBAgIVAIwE2/JkvYoJZcBwpAXXselfihnEMA0GCSqGSIb3DQEB
-BQUAMBwxGjAYBgNVBAMTEWlkcC51bmlib2Njb25pLml0MB4XDTEwMDIxNzEzMjAx
-NloXDTMwMDIxNzEzMjAxNlowHDEaMBgGA1UEAxMRaWRwLnVuaWJvY2NvbmkuaXQw
-ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCccPuV4oaBTT+Pg8czitby
-if616ZGLNOcdn58FvjPTx7/bgqy1KoFEnkQyzskglkxQTeVzo0cw3vhydJmnu0/4
-jAmS4AleN5k8RqK/JVDseUYPev6LOgtaghlmaiVBwozRf7iGuiMfwj9ZC4iavaOh
-dbqzGyvbx2SREifRNYGgWrUOwrFdAdbwbT5fmEfxnRm81RdYFFmjYARSKgQdbXTG
-iLa4+117OU19ybxVvdWU0nnz+b0YfcE7F/JtbaMwt27JKx2X67+N7z/6Hjg/kQme
-ktt+pXdqYNKk1km8sMa21Tfb9mBufLwgbgVTUXN/ZoaDWHCV8QiX1ydiaekrX1Q/
-AgMBAAGjaTBnMEYGA1UdEQQ/MD2CEWlkcC51bmlib2Njb25pLml0hihodHRwczov
-L2lkcC51bmlib2Njb25pLml0L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBSo5rDb
-l8qPk/l/4PTC/gsy6kVagzANBgkqhkiG9w0BAQUFAAOCAQEAb0iBvtK+sxUDPRsh
-7mkuz7da4Cbd6YqX3CB5eQ3quBqo7/EjVbyu3o+BwOHBQwjv3PcTd0xv5axZ4jft
-BCyUTpp6lEHTRQw5e3AC46tOBM/pnioN3qVz7AuKZK9GOCNK4LwlRKck8QtvrDc9
-uPLi1pZq4lUAe9cGV5cBKinnpcMl4acTzqOWJ1ddEIR6KFiPiYE+uwxm6Jfrvydp
-9lYG4I0gNd31pe3fVIsHCpD7NDVYFmk7AJ7GIyXxjbzPFkcY7xqHMb8RlZutzQa2
-uo9UEg+bZsGyqWbheDSr5LT8Dc6JLI7PzMH0Q5O/ejDBq+gEuXcQxAKl/esAeLLp
-K93oKA==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.unibocconi.it/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.unibocconi.it/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="en">Bocconi University</OrganizationName>
-    <OrganizationName xml:lang="it">Universita' Bocconi</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Bocconi University</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="it">Universita' Bocconi</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.unibocconi.eu/</OrganizationURL>
-    <OrganizationURL xml:lang="it">http://www.unibocconi.it/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <EmailAddress>idem@unibocconi.it</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.unica.it-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.unica.it-idp-shibboleth.xml
deleted file mode 100644
index 499cde55..00000000
--- a/swamid-interfederations-2.0/idp.unica.it-idp-shibboleth.xml
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" entityID="https://idp.unica.it/idp/shibboleth">
-  <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>
-  <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">unica.it</shibmd:Scope>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="it">Università degli Studi di Cagliari</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Cagliari State University</mdui:DisplayName>
-        <mdui:Description xml:lang="it">Identity provider per gli utenti dell'Università degli Studi di Cagliari</mdui:Description>
-        <mdui:Description xml:lang="en">Identity Provider for Cagliari State University users</mdui:Description>
-        <mdui:InformationURL xml:lang="it">http://people.unica.it/idem/info</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">http://people.unica.it/idem/english-info</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="it">http://people.unica.it/idem/regole/</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="en">http://people.unica.it/idem/rules/</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-      <mdui:DiscoHints>
-        <mdui:DomainHint>unica.it</mdui:DomainHint>
-        <mdui:DomainHint>www.unica.it</mdui:DomainHint>
-        <mdui:GeolocationHint>geo:39.2238411,9.1216613</mdui:GeolocationHint>
-      </mdui:DiscoHints>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDHDCCAgSgAwIBAgIVAIrVesupIJXVvOJ8Fd/p5fJf+3WXMA0GCSqGSIb3DQEB
-BQUAMBcxFTATBgNVBAMTDGlkcC51bmljYS5pdDAeFw0wOTA5MDMxNTQyMzhaFw0y
-OTA5MDMxNTQyMzhaMBcxFTATBgNVBAMTDGlkcC51bmljYS5pdDCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBAOMXRHdthMpVg/OZq0FjVMjInXCzJg0wMiC5
-iajyy2o7I8xlLHkuWLaTa8nOMx3sPoSRiNvyC/F6tpq1fyL1xM6rHC0jm/src17C
-OKB+Vk7TiTdbLugWcKmiUIl9hXjQBuNQHjJpPvoMNmynpiKzJGqr21VNEnfdItin
-Gub+PLT0OU3zBVfO9gbMs1i8iE60Yhks9zowT2mXqlZYvLiYANZJpqTKVk1N9zH1
-E6DrGuTKo434sh9nHFcQcNPgobJqOGawwWxLXJ/1GgwwLeGXTjFxN43mdNKMz6J/
-Wb0aXL343rgxjnaNMN0W0cDraXllAbKcyxFwHSrzGiUN7rRFHIECAwEAAaNfMF0w
-PAYDVR0RBDUwM4IMaWRwLnVuaWNhLml0hiNodHRwczovL2lkcC51bmljYS5pdC9p
-ZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUPaAgHz1jAomoOLcOZ0U+2gHYRiswDQYJ
-KoZIhvcNAQEFBQADggEBALAcfYQamaCFcd1PSLh/twRlywMMlLgXLklNVIVEbgaJ
-p6MmW/jPU21SDkWnQUSlFmgsnL8ONvuX4SGPLKg3XCYKa0c2rP6Q6v8M2xjl0vSD
-0XLwrb5EklZKdPKS5JeBt12dIKscRixRwLoXX8cm1tkQbs/0sNa3GceqvdaorsrB
-bcRbNFgSlA88yKQjeJZJM14pJG7DHSmfYaRFVcnD1v5dELyJG/hie88l1nMwTMMK
-jmsja+qhLCYV1c2MxeV3Y9qdd6imW3OtJXsXMQGQguIhVktWDjM6wD1/ICSm0F5S
-7jxX0Ysnsl9xDuWqKQF0i0Ds6hxNBAiG3jmRGTCF6JE=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.unica.it:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.unica.it: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.unica.it/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.unica.it/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.unica.it/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.unica.it/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">unica.it</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDHDCCAgSgAwIBAgIVAIrVesupIJXVvOJ8Fd/p5fJf+3WXMA0GCSqGSIb3DQEB
-BQUAMBcxFTATBgNVBAMTDGlkcC51bmljYS5pdDAeFw0wOTA5MDMxNTQyMzhaFw0y
-OTA5MDMxNTQyMzhaMBcxFTATBgNVBAMTDGlkcC51bmljYS5pdDCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBAOMXRHdthMpVg/OZq0FjVMjInXCzJg0wMiC5
-iajyy2o7I8xlLHkuWLaTa8nOMx3sPoSRiNvyC/F6tpq1fyL1xM6rHC0jm/src17C
-OKB+Vk7TiTdbLugWcKmiUIl9hXjQBuNQHjJpPvoMNmynpiKzJGqr21VNEnfdItin
-Gub+PLT0OU3zBVfO9gbMs1i8iE60Yhks9zowT2mXqlZYvLiYANZJpqTKVk1N9zH1
-E6DrGuTKo434sh9nHFcQcNPgobJqOGawwWxLXJ/1GgwwLeGXTjFxN43mdNKMz6J/
-Wb0aXL343rgxjnaNMN0W0cDraXllAbKcyxFwHSrzGiUN7rRFHIECAwEAAaNfMF0w
-PAYDVR0RBDUwM4IMaWRwLnVuaWNhLml0hiNodHRwczovL2lkcC51bmljYS5pdC9p
-ZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUPaAgHz1jAomoOLcOZ0U+2gHYRiswDQYJ
-KoZIhvcNAQEFBQADggEBALAcfYQamaCFcd1PSLh/twRlywMMlLgXLklNVIVEbgaJ
-p6MmW/jPU21SDkWnQUSlFmgsnL8ONvuX4SGPLKg3XCYKa0c2rP6Q6v8M2xjl0vSD
-0XLwrb5EklZKdPKS5JeBt12dIKscRixRwLoXX8cm1tkQbs/0sNa3GceqvdaorsrB
-bcRbNFgSlA88yKQjeJZJM14pJG7DHSmfYaRFVcnD1v5dELyJG/hie88l1nMwTMMK
-jmsja+qhLCYV1c2MxeV3Y9qdd6imW3OtJXsXMQGQguIhVktWDjM6wD1/ICSm0F5S
-7jxX0Ysnsl9xDuWqKQF0i0Ds6hxNBAiG3jmRGTCF6JE=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.unica.it:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.unica.it: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="it">Università di Cagliari</OrganizationName>
-    <OrganizationName xml:lang="en">Cagliari State University</OrganizationName>
-    <OrganizationDisplayName xml:lang="it">Università di Cagliari</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">Cagliari State University</OrganizationDisplayName>
-    <OrganizationURL xml:lang="it">http://idp.unica.it/</OrganizationURL>
-    <OrganizationURL xml:lang="en">http://www.unica.it/pub/english/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Assistenza Tecnica</SurName>
-    <EmailAddress>idem-help@unica.it</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.unica.it.xml b/swamid-interfederations-2.0/idp.unica.it.xml
deleted file mode 100644
index 499cde55..00000000
--- a/swamid-interfederations-2.0/idp.unica.it.xml
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" entityID="https://idp.unica.it/idp/shibboleth">
-  <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>
-  <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">unica.it</shibmd:Scope>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="it">Università degli Studi di Cagliari</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Cagliari State University</mdui:DisplayName>
-        <mdui:Description xml:lang="it">Identity provider per gli utenti dell'Università degli Studi di Cagliari</mdui:Description>
-        <mdui:Description xml:lang="en">Identity Provider for Cagliari State University users</mdui:Description>
-        <mdui:InformationURL xml:lang="it">http://people.unica.it/idem/info</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">http://people.unica.it/idem/english-info</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="it">http://people.unica.it/idem/regole/</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="en">http://people.unica.it/idem/rules/</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-      <mdui:DiscoHints>
-        <mdui:DomainHint>unica.it</mdui:DomainHint>
-        <mdui:DomainHint>www.unica.it</mdui:DomainHint>
-        <mdui:GeolocationHint>geo:39.2238411,9.1216613</mdui:GeolocationHint>
-      </mdui:DiscoHints>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDHDCCAgSgAwIBAgIVAIrVesupIJXVvOJ8Fd/p5fJf+3WXMA0GCSqGSIb3DQEB
-BQUAMBcxFTATBgNVBAMTDGlkcC51bmljYS5pdDAeFw0wOTA5MDMxNTQyMzhaFw0y
-OTA5MDMxNTQyMzhaMBcxFTATBgNVBAMTDGlkcC51bmljYS5pdDCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBAOMXRHdthMpVg/OZq0FjVMjInXCzJg0wMiC5
-iajyy2o7I8xlLHkuWLaTa8nOMx3sPoSRiNvyC/F6tpq1fyL1xM6rHC0jm/src17C
-OKB+Vk7TiTdbLugWcKmiUIl9hXjQBuNQHjJpPvoMNmynpiKzJGqr21VNEnfdItin
-Gub+PLT0OU3zBVfO9gbMs1i8iE60Yhks9zowT2mXqlZYvLiYANZJpqTKVk1N9zH1
-E6DrGuTKo434sh9nHFcQcNPgobJqOGawwWxLXJ/1GgwwLeGXTjFxN43mdNKMz6J/
-Wb0aXL343rgxjnaNMN0W0cDraXllAbKcyxFwHSrzGiUN7rRFHIECAwEAAaNfMF0w
-PAYDVR0RBDUwM4IMaWRwLnVuaWNhLml0hiNodHRwczovL2lkcC51bmljYS5pdC9p
-ZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUPaAgHz1jAomoOLcOZ0U+2gHYRiswDQYJ
-KoZIhvcNAQEFBQADggEBALAcfYQamaCFcd1PSLh/twRlywMMlLgXLklNVIVEbgaJ
-p6MmW/jPU21SDkWnQUSlFmgsnL8ONvuX4SGPLKg3XCYKa0c2rP6Q6v8M2xjl0vSD
-0XLwrb5EklZKdPKS5JeBt12dIKscRixRwLoXX8cm1tkQbs/0sNa3GceqvdaorsrB
-bcRbNFgSlA88yKQjeJZJM14pJG7DHSmfYaRFVcnD1v5dELyJG/hie88l1nMwTMMK
-jmsja+qhLCYV1c2MxeV3Y9qdd6imW3OtJXsXMQGQguIhVktWDjM6wD1/ICSm0F5S
-7jxX0Ysnsl9xDuWqKQF0i0Ds6hxNBAiG3jmRGTCF6JE=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.unica.it:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.unica.it: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.unica.it/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.unica.it/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.unica.it/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.unica.it/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">unica.it</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDHDCCAgSgAwIBAgIVAIrVesupIJXVvOJ8Fd/p5fJf+3WXMA0GCSqGSIb3DQEB
-BQUAMBcxFTATBgNVBAMTDGlkcC51bmljYS5pdDAeFw0wOTA5MDMxNTQyMzhaFw0y
-OTA5MDMxNTQyMzhaMBcxFTATBgNVBAMTDGlkcC51bmljYS5pdDCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBAOMXRHdthMpVg/OZq0FjVMjInXCzJg0wMiC5
-iajyy2o7I8xlLHkuWLaTa8nOMx3sPoSRiNvyC/F6tpq1fyL1xM6rHC0jm/src17C
-OKB+Vk7TiTdbLugWcKmiUIl9hXjQBuNQHjJpPvoMNmynpiKzJGqr21VNEnfdItin
-Gub+PLT0OU3zBVfO9gbMs1i8iE60Yhks9zowT2mXqlZYvLiYANZJpqTKVk1N9zH1
-E6DrGuTKo434sh9nHFcQcNPgobJqOGawwWxLXJ/1GgwwLeGXTjFxN43mdNKMz6J/
-Wb0aXL343rgxjnaNMN0W0cDraXllAbKcyxFwHSrzGiUN7rRFHIECAwEAAaNfMF0w
-PAYDVR0RBDUwM4IMaWRwLnVuaWNhLml0hiNodHRwczovL2lkcC51bmljYS5pdC9p
-ZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUPaAgHz1jAomoOLcOZ0U+2gHYRiswDQYJ
-KoZIhvcNAQEFBQADggEBALAcfYQamaCFcd1PSLh/twRlywMMlLgXLklNVIVEbgaJ
-p6MmW/jPU21SDkWnQUSlFmgsnL8ONvuX4SGPLKg3XCYKa0c2rP6Q6v8M2xjl0vSD
-0XLwrb5EklZKdPKS5JeBt12dIKscRixRwLoXX8cm1tkQbs/0sNa3GceqvdaorsrB
-bcRbNFgSlA88yKQjeJZJM14pJG7DHSmfYaRFVcnD1v5dELyJG/hie88l1nMwTMMK
-jmsja+qhLCYV1c2MxeV3Y9qdd6imW3OtJXsXMQGQguIhVktWDjM6wD1/ICSm0F5S
-7jxX0Ysnsl9xDuWqKQF0i0Ds6hxNBAiG3jmRGTCF6JE=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.unica.it:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.unica.it: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="it">Università di Cagliari</OrganizationName>
-    <OrganizationName xml:lang="en">Cagliari State University</OrganizationName>
-    <OrganizationDisplayName xml:lang="it">Università di Cagliari</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">Cagliari State University</OrganizationDisplayName>
-    <OrganizationURL xml:lang="it">http://idp.unica.it/</OrganizationURL>
-    <OrganizationURL xml:lang="en">http://www.unica.it/pub/english/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Assistenza Tecnica</SurName>
-    <EmailAddress>idem-help@unica.it</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.unicaen.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.unicaen.fr-idp-shibboleth.xml
deleted file mode 100644
index 265517d6..00000000
--- a/swamid-interfederations-2.0/idp.unicaen.fr-idp-shibboleth.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.unicaen.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2009-11-20T14:38:11Z">
-      <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">unicaen.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">Université de Caen - Basse Normandie</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDJDCCAgygAwIBAgIVALLJNRifsaDgq9SZsGgf6vqdEpntMA0GCSqGSIb3DQEB
-BQUAMBkxFzAVBgNVBAMTDmlkcC51bmljYWVuLmZyMB4XDTA5MDcyNzEzNDMxMFoX
-DTI5MDcyNzEzNDMxMFowGTEXMBUGA1UEAxMOaWRwLnVuaWNhZW4uZnIwggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCE/YcYohNvzICcNO78kljWYODlicgW
-xGoXBtCNtVN3z2E0S58zQdfGDelCvCgmRECKjeHEUJPCj0Ruarg9q9eqcOz44/9D
-CBZo2uLuNPURnaUeEPt502EPhSXPercAJVjmks7CeqbrA9192EnGWYe8hv5ZqY7d
-oanvW63YYzwIUtyYShUND7TgZFL6GD08o9prPZrBltL+fuodwXI+aFT5XIX25Su1
-FC67/8WU9jbWb4WiIZZnHD6cQDpkhfMTUAmVtZ7sj+qqueCixP0yMTbLpQCisAIP
-p2mqjC3j5i4ZHm++lrjhtfKOE8emD8V41e7z++Hb/ho95hNl5qOD7MP1AgMBAAGj
-YzBhMEAGA1UdEQQ5MDeCDmlkcC51bmljYWVuLmZyhiVodHRwczovL2lkcC51bmlj
-YWVuLmZyL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBTBGIdWisheOftwSUFEzpIO
-Sm4I9jANBgkqhkiG9w0BAQUFAAOCAQEADIDOox8I0gRyY3uetAbe1n2Kfy/pxsQZ
-Nr4Tn90NUMG8i2mp7KVoMuBhmJS5/BHJPdHNMprB6PjzlTDiriNxdl3NPSASUq7D
-E5oMcyemphYHMxcKvXDXif/uRX/dOmRZy77Wt3yjkQjy/Md/fmOYrxd8yKptnhpp
-sjYkdQpopHxBW3npgmOSS1/5X7qy1di8ckgLfEs7u3qfOZfw6i+nn1/98CjMKlv7
-TRVhM943X1kgV4l/lvaMWsPxvgTT8RRvaoAYClmyg6XLbdFC5QQUCjVCPldcbeIY
-IsKc8ui7+rEvhoAKrdmvAPrxTSfN8KMFQ3tbQDz2E3YzAELQD+4zWg==
-					    </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://idp.unicaen.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.unicaen.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.unicaen.fr/idp/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Université de Caen - Basse Normandie</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Université de Caen - Basse Normandie</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Nicolas HEURTEL</SurName>
-    <EmailAddress>nicolas.heurtel@unicaen.fr</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <SurName>David SURVILLE</SurName>
-    <EmailAddress>david.surville@unicaen.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.unicaen.fr.xml b/swamid-interfederations-2.0/idp.unicaen.fr.xml
deleted file mode 100644
index 265517d6..00000000
--- a/swamid-interfederations-2.0/idp.unicaen.fr.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.unicaen.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2009-11-20T14:38:11Z">
-      <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">unicaen.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">Université de Caen - Basse Normandie</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDJDCCAgygAwIBAgIVALLJNRifsaDgq9SZsGgf6vqdEpntMA0GCSqGSIb3DQEB
-BQUAMBkxFzAVBgNVBAMTDmlkcC51bmljYWVuLmZyMB4XDTA5MDcyNzEzNDMxMFoX
-DTI5MDcyNzEzNDMxMFowGTEXMBUGA1UEAxMOaWRwLnVuaWNhZW4uZnIwggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCE/YcYohNvzICcNO78kljWYODlicgW
-xGoXBtCNtVN3z2E0S58zQdfGDelCvCgmRECKjeHEUJPCj0Ruarg9q9eqcOz44/9D
-CBZo2uLuNPURnaUeEPt502EPhSXPercAJVjmks7CeqbrA9192EnGWYe8hv5ZqY7d
-oanvW63YYzwIUtyYShUND7TgZFL6GD08o9prPZrBltL+fuodwXI+aFT5XIX25Su1
-FC67/8WU9jbWb4WiIZZnHD6cQDpkhfMTUAmVtZ7sj+qqueCixP0yMTbLpQCisAIP
-p2mqjC3j5i4ZHm++lrjhtfKOE8emD8V41e7z++Hb/ho95hNl5qOD7MP1AgMBAAGj
-YzBhMEAGA1UdEQQ5MDeCDmlkcC51bmljYWVuLmZyhiVodHRwczovL2lkcC51bmlj
-YWVuLmZyL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBTBGIdWisheOftwSUFEzpIO
-Sm4I9jANBgkqhkiG9w0BAQUFAAOCAQEADIDOox8I0gRyY3uetAbe1n2Kfy/pxsQZ
-Nr4Tn90NUMG8i2mp7KVoMuBhmJS5/BHJPdHNMprB6PjzlTDiriNxdl3NPSASUq7D
-E5oMcyemphYHMxcKvXDXif/uRX/dOmRZy77Wt3yjkQjy/Md/fmOYrxd8yKptnhpp
-sjYkdQpopHxBW3npgmOSS1/5X7qy1di8ckgLfEs7u3qfOZfw6i+nn1/98CjMKlv7
-TRVhM943X1kgV4l/lvaMWsPxvgTT8RRvaoAYClmyg6XLbdFC5QQUCjVCPldcbeIY
-IsKc8ui7+rEvhoAKrdmvAPrxTSfN8KMFQ3tbQDz2E3YzAELQD+4zWg==
-					    </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://idp.unicaen.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.unicaen.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.unicaen.fr/idp/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Université de Caen - Basse Normandie</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Université de Caen - Basse Normandie</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Nicolas HEURTEL</SurName>
-    <EmailAddress>nicolas.heurtel@unicaen.fr</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <SurName>David SURVILLE</SurName>
-    <EmailAddress>david.surville@unicaen.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.unijui.edu.br-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.unijui.edu.br-idp-shibboleth.xml
deleted file mode 100644
index 78f52dcb..00000000
--- a/swamid-interfederations-2.0/idp.unijui.edu.br-idp-shibboleth.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://idp.unijui.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">unijui.edu.br</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">UNIJUI - Universidade Regional do Noroeste do Estado do Rio Grande do Sul</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="pt-br">UNIJUI - Universidade Regional do Noroeste do Estado do Rio Grande do Sul</mdui:DisplayName>
-        <mdui:Description xml:lang="en">UNIJUI - Universidade Regional do Noroeste do Estado do Rio Grande do Sul</mdui:Description>
-        <mdui:Description xml:lang="pt-br">UNIJUI - Universidade Regional do Noroeste do Estado do Rio Grande do Sul</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.unijui.edu.br/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="pt-br">http://www.unijui.edu.br/</mdui:InformationURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-    MIIEQDCCAygCAQAwDQYJKoZIhvcNAQEFBQAwgeUxQjBABgNVBAoTOVVOSVYuIFJF
-R0lPTkFMIERPIE5PUk9FU1RFIERPIEVTVEFETyBETyBSSU8gR1JBTkRFIERPIFNV
-TDEmMCQGA1UECxQdQ29vcmRlbmFkb3JpYSBkZSBJbmZvcm3DoXRpY2ExIjAgBgkq
-hkiG9w0BCQEWE3JlZGVzQHVuaWp1aS5lZHUuYnIxDjAMBgNVBAcUBUlqdcNpMRow
-GAYDVQQIExFSaW8gR3JhbmRlIGRvIFN1bDELMAkGA1UEBhMCQlIxGjAYBgNVBAMT
-EWlkcC51bmlqdWkuZWR1LmJyMB4XDTE0MDYyNTE4MTYwN1oXDTE5MDYyNDE4MTYw
-N1owgeUxQjBABgNVBAoTOVVOSVYuIFJFR0lPTkFMIERPIE5PUk9FU1RFIERPIEVT
-VEFETyBETyBSSU8gR1JBTkRFIERPIFNVTDEmMCQGA1UECxQdQ29vcmRlbmFkb3Jp
-YSBkZSBJbmZvcm3DoXRpY2ExIjAgBgkqhkiG9w0BCQEWE3JlZGVzQHVuaWp1aS5l
-ZHUuYnIxDjAMBgNVBAcUBUlqdcNpMRowGAYDVQQIExFSaW8gR3JhbmRlIGRvIFN1
-bDELMAkGA1UEBhMCQlIxGjAYBgNVBAMTEWlkcC51bmlqdWkuZWR1LmJyMIIBIjAN
-BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvhkzANwm2LBDtoTnXGcG3QyxTmpF
-2KWjbLVEt9ESPrsrY71p23ZPhn4wsI8OWMlrPNL9fmIWIvSybaIWsei+SRdVVFH7
-tPrVZ0p8WEGCJaoG4sk0Gxwc9GtctISb5lMb9GE4DTbw8daKUVeMqlig0liJ+wvU
-04r2f6VLjf4juVqb13rEpC2qRmOyB5jgTTv9scEGPBjC+oL4d1VlDqgmHPeIU1/f
-IwcO21PjkfJH2kDxlaCDIzsx6S0D7h+WJBl3S8RQpUnJSSE4qcsr4Ek8bVTvu1+C
-bsnsVoo0IwmDkx4QM3sfrWkUpXhIqwumQ34O/gQDslGWvmB7HwcTe4yqBQIDAQAB
-MA0GCSqGSIb3DQEBBQUAA4IBAQAoiHDje/oo+aJi4yNj09LxSDtbpDDavqeeCKTX
-XPjmgPaYt/6t8nfZXK8o1jPT3so+3f0t7dNcJbxlbIiSUUp/y1ent8JqZpkLXYBv
-YgRjxIu4IjVY7YS61di8Svnrm/5osUd3smoZ0qSGh8h3aiCK7YkuB5O6l51hsU++
-vVcB15SPOBycWmx5nSRKHLAYa6uBX7auu2fLuHaNRHh3DbH98K/2hAOr2+vqtN/f
-wqwRw3AtMKzp3fPkmn6s6p1PEFUh3QNfoC+bihfQcu5z9PsjGNOjvax4yOPcjyqO
-TjVbXcyyWhkCfxMbGyMNSlUTFkYiET6YjDs4VoshrG2bTe1P
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.unijui.edu.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.unijui.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://idp.unijui.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.unijui.edu.br/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.unijui.edu.br/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.unijui.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">unijui.edu.br</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-      
-MIIEQDCCAygCAQAwDQYJKoZIhvcNAQEFBQAwgeUxQjBABgNVBAoTOVVOSVYuIFJF
-R0lPTkFMIERPIE5PUk9FU1RFIERPIEVTVEFETyBETyBSSU8gR1JBTkRFIERPIFNV
-TDEmMCQGA1UECxQdQ29vcmRlbmFkb3JpYSBkZSBJbmZvcm3DoXRpY2ExIjAgBgkq
-hkiG9w0BCQEWE3JlZGVzQHVuaWp1aS5lZHUuYnIxDjAMBgNVBAcUBUlqdcNpMRow
-GAYDVQQIExFSaW8gR3JhbmRlIGRvIFN1bDELMAkGA1UEBhMCQlIxGjAYBgNVBAMT
-EWlkcC51bmlqdWkuZWR1LmJyMB4XDTE0MDYyNTE4MTYwN1oXDTE5MDYyNDE4MTYw
-N1owgeUxQjBABgNVBAoTOVVOSVYuIFJFR0lPTkFMIERPIE5PUk9FU1RFIERPIEVT
-VEFETyBETyBSSU8gR1JBTkRFIERPIFNVTDEmMCQGA1UECxQdQ29vcmRlbmFkb3Jp
-YSBkZSBJbmZvcm3DoXRpY2ExIjAgBgkqhkiG9w0BCQEWE3JlZGVzQHVuaWp1aS5l
-ZHUuYnIxDjAMBgNVBAcUBUlqdcNpMRowGAYDVQQIExFSaW8gR3JhbmRlIGRvIFN1
-bDELMAkGA1UEBhMCQlIxGjAYBgNVBAMTEWlkcC51bmlqdWkuZWR1LmJyMIIBIjAN
-BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvhkzANwm2LBDtoTnXGcG3QyxTmpF
-2KWjbLVEt9ESPrsrY71p23ZPhn4wsI8OWMlrPNL9fmIWIvSybaIWsei+SRdVVFH7
-tPrVZ0p8WEGCJaoG4sk0Gxwc9GtctISb5lMb9GE4DTbw8daKUVeMqlig0liJ+wvU
-04r2f6VLjf4juVqb13rEpC2qRmOyB5jgTTv9scEGPBjC+oL4d1VlDqgmHPeIU1/f
-IwcO21PjkfJH2kDxlaCDIzsx6S0D7h+WJBl3S8RQpUnJSSE4qcsr4Ek8bVTvu1+C
-bsnsVoo0IwmDkx4QM3sfrWkUpXhIqwumQ34O/gQDslGWvmB7HwcTe4yqBQIDAQAB
-MA0GCSqGSIb3DQEBBQUAA4IBAQAoiHDje/oo+aJi4yNj09LxSDtbpDDavqeeCKTX
-XPjmgPaYt/6t8nfZXK8o1jPT3so+3f0t7dNcJbxlbIiSUUp/y1ent8JqZpkLXYBv
-YgRjxIu4IjVY7YS61di8Svnrm/5osUd3smoZ0qSGh8h3aiCK7YkuB5O6l51hsU++
-vVcB15SPOBycWmx5nSRKHLAYa6uBX7auu2fLuHaNRHh3DbH98K/2hAOr2+vqtN/f
-wqwRw3AtMKzp3fPkmn6s6p1PEFUh3QNfoC+bihfQcu5z9PsjGNOjvax4yOPcjyqO
-TjVbXcyyWhkCfxMbGyMNSlUTFkYiET6YjDs4VoshrG2bTe1P
-                    
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.unijui.edu.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.unijui.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">UNIJUI - Universidade Regional do Noroeste do Estado do Rio Grande do Sul</OrganizationName>
-    <OrganizationName xml:lang="pt-br">UNIJUI - Universidade Regional do Noroeste do Estado do Rio Grande do Sul</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">UNIJUI - Universidade Regional do Noroeste do Estado do Rio Grande do Sul</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="pt-br">UNIJUI - Universidade Regional do Noroeste do Estado do Rio Grande do Sul</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.unijui.edu.br/</OrganizationURL>
-    <OrganizationURL xml:lang="pt-br">http://www.unijui.edu.br/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Nucleo de Redes e Banco de Dados</SurName>
-    <EmailAddress>redes@unijui.edu.br</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.unijui.edu.br.xml b/swamid-interfederations-2.0/idp.unijui.edu.br.xml
deleted file mode 100644
index 78f52dcb..00000000
--- a/swamid-interfederations-2.0/idp.unijui.edu.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://idp.unijui.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">unijui.edu.br</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">UNIJUI - Universidade Regional do Noroeste do Estado do Rio Grande do Sul</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="pt-br">UNIJUI - Universidade Regional do Noroeste do Estado do Rio Grande do Sul</mdui:DisplayName>
-        <mdui:Description xml:lang="en">UNIJUI - Universidade Regional do Noroeste do Estado do Rio Grande do Sul</mdui:Description>
-        <mdui:Description xml:lang="pt-br">UNIJUI - Universidade Regional do Noroeste do Estado do Rio Grande do Sul</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.unijui.edu.br/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="pt-br">http://www.unijui.edu.br/</mdui:InformationURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-    MIIEQDCCAygCAQAwDQYJKoZIhvcNAQEFBQAwgeUxQjBABgNVBAoTOVVOSVYuIFJF
-R0lPTkFMIERPIE5PUk9FU1RFIERPIEVTVEFETyBETyBSSU8gR1JBTkRFIERPIFNV
-TDEmMCQGA1UECxQdQ29vcmRlbmFkb3JpYSBkZSBJbmZvcm3DoXRpY2ExIjAgBgkq
-hkiG9w0BCQEWE3JlZGVzQHVuaWp1aS5lZHUuYnIxDjAMBgNVBAcUBUlqdcNpMRow
-GAYDVQQIExFSaW8gR3JhbmRlIGRvIFN1bDELMAkGA1UEBhMCQlIxGjAYBgNVBAMT
-EWlkcC51bmlqdWkuZWR1LmJyMB4XDTE0MDYyNTE4MTYwN1oXDTE5MDYyNDE4MTYw
-N1owgeUxQjBABgNVBAoTOVVOSVYuIFJFR0lPTkFMIERPIE5PUk9FU1RFIERPIEVT
-VEFETyBETyBSSU8gR1JBTkRFIERPIFNVTDEmMCQGA1UECxQdQ29vcmRlbmFkb3Jp
-YSBkZSBJbmZvcm3DoXRpY2ExIjAgBgkqhkiG9w0BCQEWE3JlZGVzQHVuaWp1aS5l
-ZHUuYnIxDjAMBgNVBAcUBUlqdcNpMRowGAYDVQQIExFSaW8gR3JhbmRlIGRvIFN1
-bDELMAkGA1UEBhMCQlIxGjAYBgNVBAMTEWlkcC51bmlqdWkuZWR1LmJyMIIBIjAN
-BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvhkzANwm2LBDtoTnXGcG3QyxTmpF
-2KWjbLVEt9ESPrsrY71p23ZPhn4wsI8OWMlrPNL9fmIWIvSybaIWsei+SRdVVFH7
-tPrVZ0p8WEGCJaoG4sk0Gxwc9GtctISb5lMb9GE4DTbw8daKUVeMqlig0liJ+wvU
-04r2f6VLjf4juVqb13rEpC2qRmOyB5jgTTv9scEGPBjC+oL4d1VlDqgmHPeIU1/f
-IwcO21PjkfJH2kDxlaCDIzsx6S0D7h+WJBl3S8RQpUnJSSE4qcsr4Ek8bVTvu1+C
-bsnsVoo0IwmDkx4QM3sfrWkUpXhIqwumQ34O/gQDslGWvmB7HwcTe4yqBQIDAQAB
-MA0GCSqGSIb3DQEBBQUAA4IBAQAoiHDje/oo+aJi4yNj09LxSDtbpDDavqeeCKTX
-XPjmgPaYt/6t8nfZXK8o1jPT3so+3f0t7dNcJbxlbIiSUUp/y1ent8JqZpkLXYBv
-YgRjxIu4IjVY7YS61di8Svnrm/5osUd3smoZ0qSGh8h3aiCK7YkuB5O6l51hsU++
-vVcB15SPOBycWmx5nSRKHLAYa6uBX7auu2fLuHaNRHh3DbH98K/2hAOr2+vqtN/f
-wqwRw3AtMKzp3fPkmn6s6p1PEFUh3QNfoC+bihfQcu5z9PsjGNOjvax4yOPcjyqO
-TjVbXcyyWhkCfxMbGyMNSlUTFkYiET6YjDs4VoshrG2bTe1P
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.unijui.edu.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.unijui.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://idp.unijui.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.unijui.edu.br/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.unijui.edu.br/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.unijui.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">unijui.edu.br</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-      
-MIIEQDCCAygCAQAwDQYJKoZIhvcNAQEFBQAwgeUxQjBABgNVBAoTOVVOSVYuIFJF
-R0lPTkFMIERPIE5PUk9FU1RFIERPIEVTVEFETyBETyBSSU8gR1JBTkRFIERPIFNV
-TDEmMCQGA1UECxQdQ29vcmRlbmFkb3JpYSBkZSBJbmZvcm3DoXRpY2ExIjAgBgkq
-hkiG9w0BCQEWE3JlZGVzQHVuaWp1aS5lZHUuYnIxDjAMBgNVBAcUBUlqdcNpMRow
-GAYDVQQIExFSaW8gR3JhbmRlIGRvIFN1bDELMAkGA1UEBhMCQlIxGjAYBgNVBAMT
-EWlkcC51bmlqdWkuZWR1LmJyMB4XDTE0MDYyNTE4MTYwN1oXDTE5MDYyNDE4MTYw
-N1owgeUxQjBABgNVBAoTOVVOSVYuIFJFR0lPTkFMIERPIE5PUk9FU1RFIERPIEVT
-VEFETyBETyBSSU8gR1JBTkRFIERPIFNVTDEmMCQGA1UECxQdQ29vcmRlbmFkb3Jp
-YSBkZSBJbmZvcm3DoXRpY2ExIjAgBgkqhkiG9w0BCQEWE3JlZGVzQHVuaWp1aS5l
-ZHUuYnIxDjAMBgNVBAcUBUlqdcNpMRowGAYDVQQIExFSaW8gR3JhbmRlIGRvIFN1
-bDELMAkGA1UEBhMCQlIxGjAYBgNVBAMTEWlkcC51bmlqdWkuZWR1LmJyMIIBIjAN
-BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvhkzANwm2LBDtoTnXGcG3QyxTmpF
-2KWjbLVEt9ESPrsrY71p23ZPhn4wsI8OWMlrPNL9fmIWIvSybaIWsei+SRdVVFH7
-tPrVZ0p8WEGCJaoG4sk0Gxwc9GtctISb5lMb9GE4DTbw8daKUVeMqlig0liJ+wvU
-04r2f6VLjf4juVqb13rEpC2qRmOyB5jgTTv9scEGPBjC+oL4d1VlDqgmHPeIU1/f
-IwcO21PjkfJH2kDxlaCDIzsx6S0D7h+WJBl3S8RQpUnJSSE4qcsr4Ek8bVTvu1+C
-bsnsVoo0IwmDkx4QM3sfrWkUpXhIqwumQ34O/gQDslGWvmB7HwcTe4yqBQIDAQAB
-MA0GCSqGSIb3DQEBBQUAA4IBAQAoiHDje/oo+aJi4yNj09LxSDtbpDDavqeeCKTX
-XPjmgPaYt/6t8nfZXK8o1jPT3so+3f0t7dNcJbxlbIiSUUp/y1ent8JqZpkLXYBv
-YgRjxIu4IjVY7YS61di8Svnrm/5osUd3smoZ0qSGh8h3aiCK7YkuB5O6l51hsU++
-vVcB15SPOBycWmx5nSRKHLAYa6uBX7auu2fLuHaNRHh3DbH98K/2hAOr2+vqtN/f
-wqwRw3AtMKzp3fPkmn6s6p1PEFUh3QNfoC+bihfQcu5z9PsjGNOjvax4yOPcjyqO
-TjVbXcyyWhkCfxMbGyMNSlUTFkYiET6YjDs4VoshrG2bTe1P
-                    
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.unijui.edu.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.unijui.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">UNIJUI - Universidade Regional do Noroeste do Estado do Rio Grande do Sul</OrganizationName>
-    <OrganizationName xml:lang="pt-br">UNIJUI - Universidade Regional do Noroeste do Estado do Rio Grande do Sul</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">UNIJUI - Universidade Regional do Noroeste do Estado do Rio Grande do Sul</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="pt-br">UNIJUI - Universidade Regional do Noroeste do Estado do Rio Grande do Sul</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.unijui.edu.br/</OrganizationURL>
-    <OrganizationURL xml:lang="pt-br">http://www.unijui.edu.br/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Nucleo de Redes e Banco de Dados</SurName>
-    <EmailAddress>redes@unijui.edu.br</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.unimc.it-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.unimc.it-idp-shibboleth.xml
deleted file mode 100644
index e6bc5e41..00000000
--- a/swamid-interfederations-2.0/idp.unimc.it-idp-shibboleth.xml
+++ /dev/null
@@ -1,114 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" entityID="https://idp.unimc.it/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2014-04-22T12:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">
-                    https://www.idem.garr.it/idem-metadata-registration-practice-statement
-                </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">unimc.it</shibmd:Scope>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="en">University of Macerata.</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="it">Universita' di Macerata</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Identity provider for University of Macerata users (Students, Teachers, and Employees)</mdui:Description>
-        <mdui:Description xml:lang="it">Identity provider per gli utenti dell'Universita' degli Studi di Macerata (Studenti, Docenti, Personale Tecnico)</mdui:Description>
-        <mdui:InformationURL xml:lang="en">https://login.unimc.it/login/new/guida-garr-idem-en.php</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="it">https://login.unimc.it/login/new/guida-garr-idem.php</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">http://www.unimc.it/en/privacy-policy</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="it">http://www.unimc.it/it/privacy-policy</mdui:PrivacyStatementURL>
-        <mdui:Logo height="16" width="16" xml:lang="en">https://login.unimc.it/login/new/images/logo-unimc-idem-garr-16x16.png</mdui:Logo>
-        <mdui:Logo height="16" width="16" xml:lang="it">https://login.unimc.it/login/new/images/logo-unimc-idem-garr-16x16.png</mdui:Logo>
-        <mdui:Logo height="60" width="80" xml:lang="en">https://login.unimc.it/login/new/images/logo-unimc-idem-garr-80x60.png</mdui:Logo>
-        <mdui:Logo height="60" width="80" xml:lang="it">https://login.unimc.it/login/new/images/logo-unimc-idem-garr-80x60.png</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDHDCCAgSgAwIBAgIVAIEgUNZ2kbCrw2zNqYwgIJCvedDSMA0GCSqGSIb3DQEB
-BQUAMBcxFTATBgNVBAMTDGlkcC51bmltYy5pdDAeFw0xMzA0MDExNjAxNDZaFw0z
-MzA0MDExNjAxNDZaMBcxFTATBgNVBAMTDGlkcC51bmltYy5pdDCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBAJtks8bJInpYW8j049YMBTWfGRfkMgTPQ2fI
-T1TLbkZ+zSTvm+hgBdeyY0g0EkpC7MmkrcigKc+BWdXaaeBHWh1extz08cVtcNEH
-52vTw9asy2cXh/EFd0Br1zc9j0dEXLhnCVNHI6Vi7F7oTlsAb2Xt7/iQuWjT/cKM
-Eiqt+qVSgdtRsRCD6RJLlINGeunjFDizUymDxtt1ZB5mU1DlpC4cynImG0jI3DsK
-h0MhjeYSWLn9giA7j7hOTSqJuZddv/Y+YOWrMScV1jfiu1uMN2DllOjapt7DUsxi
-bgtrc7Vig5o/ZVqLd4zI8lHsrqKUCDQBO9EviQq98bMbqqTCq/MCAwEAAaNfMF0w
-PAYDVR0RBDUwM4IMaWRwLnVuaW1jLml0hiNodHRwczovL2lkcC51bmltYy5pdC9p
-ZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQU1nYOH/vCkNVmfvhCYkLSRhlGZR0wDQYJ
-KoZIhvcNAQEFBQADggEBAFmIBImjvlX9VF4e/qYv/rvTILMUskF6rC8BTSYzIdLk
-wX4H6k+AUkTWkdEBkvJyvcIAg8eZqc2TH7CSu4PjYu/p+A8Uum841EY0GngIeQg/
-zeF//LRySr7iMMGcB5JmjYdeOa50DtbWAdns7BR8UNBUFYv9CR9iknmcEbtkZylK
-H/9RF3Xv7HxDNRzUuFOx0AiVdbUvQNo801Jd0SBwK7JIoYrTGM0OdxlP8VgmixZd
-yLZqGcGeMxdBisF78411jjMh+H3rDzmt8W7FkTJI0svAn3THDqBaYJqyPnfJSrab
-gakI/LbrmYc1DoncD0v9+M8RyFpzxx+5hDmhAjeucuU=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.unimc.it:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.unimc.it: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.unimc.it/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.unimc.it/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.unimc.it/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.unimc.it/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">unimc.it</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDHDCCAgSgAwIBAgIVAIEgUNZ2kbCrw2zNqYwgIJCvedDSMA0GCSqGSIb3DQEB
-BQUAMBcxFTATBgNVBAMTDGlkcC51bmltYy5pdDAeFw0xMzA0MDExNjAxNDZaFw0z
-MzA0MDExNjAxNDZaMBcxFTATBgNVBAMTDGlkcC51bmltYy5pdDCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBAJtks8bJInpYW8j049YMBTWfGRfkMgTPQ2fI
-T1TLbkZ+zSTvm+hgBdeyY0g0EkpC7MmkrcigKc+BWdXaaeBHWh1extz08cVtcNEH
-52vTw9asy2cXh/EFd0Br1zc9j0dEXLhnCVNHI6Vi7F7oTlsAb2Xt7/iQuWjT/cKM
-Eiqt+qVSgdtRsRCD6RJLlINGeunjFDizUymDxtt1ZB5mU1DlpC4cynImG0jI3DsK
-h0MhjeYSWLn9giA7j7hOTSqJuZddv/Y+YOWrMScV1jfiu1uMN2DllOjapt7DUsxi
-bgtrc7Vig5o/ZVqLd4zI8lHsrqKUCDQBO9EviQq98bMbqqTCq/MCAwEAAaNfMF0w
-PAYDVR0RBDUwM4IMaWRwLnVuaW1jLml0hiNodHRwczovL2lkcC51bmltYy5pdC9p
-ZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQU1nYOH/vCkNVmfvhCYkLSRhlGZR0wDQYJ
-KoZIhvcNAQEFBQADggEBAFmIBImjvlX9VF4e/qYv/rvTILMUskF6rC8BTSYzIdLk
-wX4H6k+AUkTWkdEBkvJyvcIAg8eZqc2TH7CSu4PjYu/p+A8Uum841EY0GngIeQg/
-zeF//LRySr7iMMGcB5JmjYdeOa50DtbWAdns7BR8UNBUFYv9CR9iknmcEbtkZylK
-H/9RF3Xv7HxDNRzUuFOx0AiVdbUvQNo801Jd0SBwK7JIoYrTGM0OdxlP8VgmixZd
-yLZqGcGeMxdBisF78411jjMh+H3rDzmt8W7FkTJI0svAn3THDqBaYJqyPnfJSrab
-gakI/LbrmYc1DoncD0v9+M8RyFpzxx+5hDmhAjeucuU=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.unimc.it:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.unimc.it: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">University of Macerata</OrganizationName>
-    <OrganizationName xml:lang="it">Università degli Studi di Macerata</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Macerata</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="it">Università degli Studi di Macerata</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.unimc.it/en</OrganizationURL>
-    <OrganizationURL xml:lang="it">http://www.unimc.it/it</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Massimo</GivenName>
-    <SurName>Reda</SurName>
-    <EmailAddress>csia.sistemi@unimc.it</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Marco</GivenName>
-    <SurName>Principi</SurName>
-    <EmailAddress>csia.sistemi@unimc.it</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.unimc.it.xml b/swamid-interfederations-2.0/idp.unimc.it.xml
deleted file mode 100644
index e6bc5e41..00000000
--- a/swamid-interfederations-2.0/idp.unimc.it.xml
+++ /dev/null
@@ -1,114 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" entityID="https://idp.unimc.it/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2014-04-22T12:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">
-                    https://www.idem.garr.it/idem-metadata-registration-practice-statement
-                </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">unimc.it</shibmd:Scope>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="en">University of Macerata.</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="it">Universita' di Macerata</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Identity provider for University of Macerata users (Students, Teachers, and Employees)</mdui:Description>
-        <mdui:Description xml:lang="it">Identity provider per gli utenti dell'Universita' degli Studi di Macerata (Studenti, Docenti, Personale Tecnico)</mdui:Description>
-        <mdui:InformationURL xml:lang="en">https://login.unimc.it/login/new/guida-garr-idem-en.php</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="it">https://login.unimc.it/login/new/guida-garr-idem.php</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">http://www.unimc.it/en/privacy-policy</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="it">http://www.unimc.it/it/privacy-policy</mdui:PrivacyStatementURL>
-        <mdui:Logo height="16" width="16" xml:lang="en">https://login.unimc.it/login/new/images/logo-unimc-idem-garr-16x16.png</mdui:Logo>
-        <mdui:Logo height="16" width="16" xml:lang="it">https://login.unimc.it/login/new/images/logo-unimc-idem-garr-16x16.png</mdui:Logo>
-        <mdui:Logo height="60" width="80" xml:lang="en">https://login.unimc.it/login/new/images/logo-unimc-idem-garr-80x60.png</mdui:Logo>
-        <mdui:Logo height="60" width="80" xml:lang="it">https://login.unimc.it/login/new/images/logo-unimc-idem-garr-80x60.png</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDHDCCAgSgAwIBAgIVAIEgUNZ2kbCrw2zNqYwgIJCvedDSMA0GCSqGSIb3DQEB
-BQUAMBcxFTATBgNVBAMTDGlkcC51bmltYy5pdDAeFw0xMzA0MDExNjAxNDZaFw0z
-MzA0MDExNjAxNDZaMBcxFTATBgNVBAMTDGlkcC51bmltYy5pdDCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBAJtks8bJInpYW8j049YMBTWfGRfkMgTPQ2fI
-T1TLbkZ+zSTvm+hgBdeyY0g0EkpC7MmkrcigKc+BWdXaaeBHWh1extz08cVtcNEH
-52vTw9asy2cXh/EFd0Br1zc9j0dEXLhnCVNHI6Vi7F7oTlsAb2Xt7/iQuWjT/cKM
-Eiqt+qVSgdtRsRCD6RJLlINGeunjFDizUymDxtt1ZB5mU1DlpC4cynImG0jI3DsK
-h0MhjeYSWLn9giA7j7hOTSqJuZddv/Y+YOWrMScV1jfiu1uMN2DllOjapt7DUsxi
-bgtrc7Vig5o/ZVqLd4zI8lHsrqKUCDQBO9EviQq98bMbqqTCq/MCAwEAAaNfMF0w
-PAYDVR0RBDUwM4IMaWRwLnVuaW1jLml0hiNodHRwczovL2lkcC51bmltYy5pdC9p
-ZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQU1nYOH/vCkNVmfvhCYkLSRhlGZR0wDQYJ
-KoZIhvcNAQEFBQADggEBAFmIBImjvlX9VF4e/qYv/rvTILMUskF6rC8BTSYzIdLk
-wX4H6k+AUkTWkdEBkvJyvcIAg8eZqc2TH7CSu4PjYu/p+A8Uum841EY0GngIeQg/
-zeF//LRySr7iMMGcB5JmjYdeOa50DtbWAdns7BR8UNBUFYv9CR9iknmcEbtkZylK
-H/9RF3Xv7HxDNRzUuFOx0AiVdbUvQNo801Jd0SBwK7JIoYrTGM0OdxlP8VgmixZd
-yLZqGcGeMxdBisF78411jjMh+H3rDzmt8W7FkTJI0svAn3THDqBaYJqyPnfJSrab
-gakI/LbrmYc1DoncD0v9+M8RyFpzxx+5hDmhAjeucuU=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.unimc.it:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.unimc.it: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.unimc.it/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.unimc.it/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.unimc.it/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.unimc.it/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">unimc.it</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDHDCCAgSgAwIBAgIVAIEgUNZ2kbCrw2zNqYwgIJCvedDSMA0GCSqGSIb3DQEB
-BQUAMBcxFTATBgNVBAMTDGlkcC51bmltYy5pdDAeFw0xMzA0MDExNjAxNDZaFw0z
-MzA0MDExNjAxNDZaMBcxFTATBgNVBAMTDGlkcC51bmltYy5pdDCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBAJtks8bJInpYW8j049YMBTWfGRfkMgTPQ2fI
-T1TLbkZ+zSTvm+hgBdeyY0g0EkpC7MmkrcigKc+BWdXaaeBHWh1extz08cVtcNEH
-52vTw9asy2cXh/EFd0Br1zc9j0dEXLhnCVNHI6Vi7F7oTlsAb2Xt7/iQuWjT/cKM
-Eiqt+qVSgdtRsRCD6RJLlINGeunjFDizUymDxtt1ZB5mU1DlpC4cynImG0jI3DsK
-h0MhjeYSWLn9giA7j7hOTSqJuZddv/Y+YOWrMScV1jfiu1uMN2DllOjapt7DUsxi
-bgtrc7Vig5o/ZVqLd4zI8lHsrqKUCDQBO9EviQq98bMbqqTCq/MCAwEAAaNfMF0w
-PAYDVR0RBDUwM4IMaWRwLnVuaW1jLml0hiNodHRwczovL2lkcC51bmltYy5pdC9p
-ZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQU1nYOH/vCkNVmfvhCYkLSRhlGZR0wDQYJ
-KoZIhvcNAQEFBQADggEBAFmIBImjvlX9VF4e/qYv/rvTILMUskF6rC8BTSYzIdLk
-wX4H6k+AUkTWkdEBkvJyvcIAg8eZqc2TH7CSu4PjYu/p+A8Uum841EY0GngIeQg/
-zeF//LRySr7iMMGcB5JmjYdeOa50DtbWAdns7BR8UNBUFYv9CR9iknmcEbtkZylK
-H/9RF3Xv7HxDNRzUuFOx0AiVdbUvQNo801Jd0SBwK7JIoYrTGM0OdxlP8VgmixZd
-yLZqGcGeMxdBisF78411jjMh+H3rDzmt8W7FkTJI0svAn3THDqBaYJqyPnfJSrab
-gakI/LbrmYc1DoncD0v9+M8RyFpzxx+5hDmhAjeucuU=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.unimc.it:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.unimc.it: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">University of Macerata</OrganizationName>
-    <OrganizationName xml:lang="it">Università degli Studi di Macerata</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Macerata</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="it">Università degli Studi di Macerata</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.unimc.it/en</OrganizationURL>
-    <OrganizationURL xml:lang="it">http://www.unimc.it/it</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Massimo</GivenName>
-    <SurName>Reda</SurName>
-    <EmailAddress>csia.sistemi@unimc.it</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Marco</GivenName>
-    <SurName>Principi</SurName>
-    <EmailAddress>csia.sistemi@unimc.it</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.unimedizin-mainz.de-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.unimedizin-mainz.de-idp-shibboleth.xml
deleted file mode 100644
index d2d03cf3..00000000
--- a/swamid-interfederations-2.0/idp.unimedizin-mainz.de-idp-shibboleth.xml
+++ /dev/null
@@ -1,245 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.unimedizin-mainz.de/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2014-10-09T21:46:04Z">
-      <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">unimedizin-mainz.de</saml1md:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="de">Universitätsmedizin der JoGu Mainz</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">University Medical Center of the JoGu Mainz</mdui:DisplayName>
-        <mdui:Description xml:lang="de">Universitätsmedizin der Johannes Gutenberg-Universität Mainz</mdui:Description>
-        <mdui:Description xml:lang="en">University Medical Center of the Johannes Gutenberg University Mainz</mdui:Description>
-        <mdui:InformationURL xml:lang="de">http://www.unimedizin-mainz.de</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">http://www.unimedizin-mainz.de</mdui:InformationURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.unimedizin-mainz.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.unimedizin-mainz.de,O=Universitaetsmedizin der Johannes Gutenberg-Universitaet Mainz,L=Mainz,ST=Rheinland-Pfalz,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIGnTCCBYWgAwIBAgIHGFIEk0Z6CDANBgkqhkiG9w0BAQsFADCB2DELMAkGA1UE
-BhMCREUxGDAWBgNVBAgTD1JoZWlubGFuZC1QZmFsejEOMAwGA1UEBxMFTWFpbnox
-RzBFBgNVBAoTPlVuaXZlcnNpdGFldHNtZWRpemluIGRlciBKb2hhbm5lcyBHdXRl
-bmJlcmctVW5pdmVyc2l0YWV0IE1haW56MS8wLQYDVQQDEyZVTklWRVJTSVRBRVRT
-bWVkaXppbi4gTWFpbnogLSBDQSAtIEcwMTElMCMGCSqGSIb3DQEJARYWY2FAdW5p
-bWVkaXppbi1tYWluei5kZTAeFw0xNDEwMDYxMjExNDdaFw0xOTA3MDYwMDAwMDBa
-MIGiMQswCQYDVQQGEwJERTEYMBYGA1UECBMPUmhlaW5sYW5kLVBmYWx6MQ4wDAYD
-VQQHEwVNYWluejFHMEUGA1UEChM+VW5pdmVyc2l0YWV0c21lZGl6aW4gZGVyIEpv
-aGFubmVzIEd1dGVuYmVyZy1Vbml2ZXJzaXRhZXQgTWFpbnoxIDAeBgNVBAMTF2lk
-cC51bmltZWRpemluLW1haW56LmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
-CgKCAQEApf3XPkCctjw5x/tK0fVGr5/M0ZeJ8iPjES2XNyxMMBT0CirU96+r20YW
-aS1rpnWRNwWrr+iWiwK7mYQ5glT5RkwtBB3zdEHYRC/MZHRIrDVlVtEqGVEdN5Fn
-ZEixsxDatWdWBwCcTMO2rp7Uf6zsCxCJn63JwCtZVLyDdcEg4m+2Q32nwQZY29V4
-0t3mVfUZ/r55V9W8V2zhRpRrGarqmCGAv48XXwgVHLhN/Rb0/grsBRJZqEU9CvA0
-ujJwFuk9Lh8S1H3jNbqAv2M2Yf88rQDbGgy8yhOve7aWmHjIxaGm0IOVHSGLHm5g
-9eH/Dd68StfdnxsrubW7Qjl/vTgT7wIDAQABo4ICnjCCApowCQYDVR0TBAIwADAL
-BgNVHQ8EBAMCBeAwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMB0GA1Ud
-DgQWBBS27g1OcWdymQjf/ek1vvVRKOtGjDAfBgNVHSMEGDAWgBSkOU4ibcYqBiBu
-2uhoUVylgQ52PTBWBgNVHREETzBNghdpZHAudW5pbWVkaXppbi1tYWluei5kZYIY
-aWRwMS51bmltZWRpemluLW1haW56LmRlghhpZHAyLnVuaW1lZGl6aW4tbWFpbnou
-ZGUwgZMGA1UdHwSBizCBiDBCoECgPoY8aHR0cDovL2NkcDEucGNhLmRmbi5kZS91
-bmltZWRpemluLW1haW56LWNhL3B1Yi9jcmwvY2FjcmwuY3JsMEKgQKA+hjxodHRw
-Oi8vY2RwMi5wY2EuZGZuLmRlL3VuaW1lZGl6aW4tbWFpbnotY2EvcHViL2NybC9j
-YWNybC5jcmwwgeEGCCsGAQUFBwEBBIHUMIHRMDMGCCsGAQUFBzABhidodHRwOi8v
-b2NzcC5wY2EuZGZuLmRlL09DU1AtU2VydmVyL09DU1AwTAYIKwYBBQUHMAKGQGh0
-dHA6Ly9jZHAxLnBjYS5kZm4uZGUvdW5pbWVkaXppbi1tYWluei1jYS9wdWIvY2Fj
-ZXJ0L2NhY2VydC5jcnQwTAYIKwYBBQUHMAKGQGh0dHA6Ly9jZHAyLnBjYS5kZm4u
-ZGUvdW5pbWVkaXppbi1tYWluei1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwTwYD
-VR0gBEgwRjAPBg0rBgEEAYGtIYIsAQEEMA0GCysGAQQBga0hgiweMBEGDysGAQQB
-ga0hgiwBAQQDAjARBg8rBgEEAYGtIYIsAgEEAwEwDQYJKoZIhvcNAQELBQADggEB
-AEzbmDhzM5OGsMX1WJbj2tTAvVjlyEm3ioEE58dDV2I5QTi2TovCSxolslWnu6m6
-K0W2XZONTXSlbpr63Mk37KpThaMmt50tGhaQzmhDlcJINxpP4kKsDcYFHaem2wKW
-jHbL3pV2VIrYJwOhbVDFlhxJTRJ3wSrKCn52XT1U2/seD/iFBmfZtjDjnKT81r2F
-A/97xPYyf/ERwisDrvq0NqAlDGUQwqb670CNOLwuxm8UgjRct73RNgea9ez3Gs97
-8dmHUIz1D+e8aGj31RallWAk/ZdYp0rKYM0dd7MGbh6toEevStAbb2MTKHqIv45S
-AO8Ifi/pFzKtodcKmmfls3M=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.unimedizin-mainz.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.unimedizin-mainz.de,O=Universitaetsmedizin der Johannes Gutenberg-Universitaet Mainz,L=Mainz,ST=Rheinland-Pfalz,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIGnTCCBYWgAwIBAgIHGFIEk0Z6CDANBgkqhkiG9w0BAQsFADCB2DELMAkGA1UE
-BhMCREUxGDAWBgNVBAgTD1JoZWlubGFuZC1QZmFsejEOMAwGA1UEBxMFTWFpbnox
-RzBFBgNVBAoTPlVuaXZlcnNpdGFldHNtZWRpemluIGRlciBKb2hhbm5lcyBHdXRl
-bmJlcmctVW5pdmVyc2l0YWV0IE1haW56MS8wLQYDVQQDEyZVTklWRVJTSVRBRVRT
-bWVkaXppbi4gTWFpbnogLSBDQSAtIEcwMTElMCMGCSqGSIb3DQEJARYWY2FAdW5p
-bWVkaXppbi1tYWluei5kZTAeFw0xNDEwMDYxMjExNDdaFw0xOTA3MDYwMDAwMDBa
-MIGiMQswCQYDVQQGEwJERTEYMBYGA1UECBMPUmhlaW5sYW5kLVBmYWx6MQ4wDAYD
-VQQHEwVNYWluejFHMEUGA1UEChM+VW5pdmVyc2l0YWV0c21lZGl6aW4gZGVyIEpv
-aGFubmVzIEd1dGVuYmVyZy1Vbml2ZXJzaXRhZXQgTWFpbnoxIDAeBgNVBAMTF2lk
-cC51bmltZWRpemluLW1haW56LmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
-CgKCAQEApf3XPkCctjw5x/tK0fVGr5/M0ZeJ8iPjES2XNyxMMBT0CirU96+r20YW
-aS1rpnWRNwWrr+iWiwK7mYQ5glT5RkwtBB3zdEHYRC/MZHRIrDVlVtEqGVEdN5Fn
-ZEixsxDatWdWBwCcTMO2rp7Uf6zsCxCJn63JwCtZVLyDdcEg4m+2Q32nwQZY29V4
-0t3mVfUZ/r55V9W8V2zhRpRrGarqmCGAv48XXwgVHLhN/Rb0/grsBRJZqEU9CvA0
-ujJwFuk9Lh8S1H3jNbqAv2M2Yf88rQDbGgy8yhOve7aWmHjIxaGm0IOVHSGLHm5g
-9eH/Dd68StfdnxsrubW7Qjl/vTgT7wIDAQABo4ICnjCCApowCQYDVR0TBAIwADAL
-BgNVHQ8EBAMCBeAwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMB0GA1Ud
-DgQWBBS27g1OcWdymQjf/ek1vvVRKOtGjDAfBgNVHSMEGDAWgBSkOU4ibcYqBiBu
-2uhoUVylgQ52PTBWBgNVHREETzBNghdpZHAudW5pbWVkaXppbi1tYWluei5kZYIY
-aWRwMS51bmltZWRpemluLW1haW56LmRlghhpZHAyLnVuaW1lZGl6aW4tbWFpbnou
-ZGUwgZMGA1UdHwSBizCBiDBCoECgPoY8aHR0cDovL2NkcDEucGNhLmRmbi5kZS91
-bmltZWRpemluLW1haW56LWNhL3B1Yi9jcmwvY2FjcmwuY3JsMEKgQKA+hjxodHRw
-Oi8vY2RwMi5wY2EuZGZuLmRlL3VuaW1lZGl6aW4tbWFpbnotY2EvcHViL2NybC9j
-YWNybC5jcmwwgeEGCCsGAQUFBwEBBIHUMIHRMDMGCCsGAQUFBzABhidodHRwOi8v
-b2NzcC5wY2EuZGZuLmRlL09DU1AtU2VydmVyL09DU1AwTAYIKwYBBQUHMAKGQGh0
-dHA6Ly9jZHAxLnBjYS5kZm4uZGUvdW5pbWVkaXppbi1tYWluei1jYS9wdWIvY2Fj
-ZXJ0L2NhY2VydC5jcnQwTAYIKwYBBQUHMAKGQGh0dHA6Ly9jZHAyLnBjYS5kZm4u
-ZGUvdW5pbWVkaXppbi1tYWluei1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwTwYD
-VR0gBEgwRjAPBg0rBgEEAYGtIYIsAQEEMA0GCysGAQQBga0hgiweMBEGDysGAQQB
-ga0hgiwBAQQDAjARBg8rBgEEAYGtIYIsAgEEAwEwDQYJKoZIhvcNAQELBQADggEB
-AEzbmDhzM5OGsMX1WJbj2tTAvVjlyEm3ioEE58dDV2I5QTi2TovCSxolslWnu6m6
-K0W2XZONTXSlbpr63Mk37KpThaMmt50tGhaQzmhDlcJINxpP4kKsDcYFHaem2wKW
-jHbL3pV2VIrYJwOhbVDFlhxJTRJ3wSrKCn52XT1U2/seD/iFBmfZtjDjnKT81r2F
-A/97xPYyf/ERwisDrvq0NqAlDGUQwqb670CNOLwuxm8UgjRct73RNgea9ez3Gs97
-8dmHUIz1D+e8aGj31RallWAk/ZdYp0rKYM0dd7MGbh6toEevStAbb2MTKHqIv45S
-AO8Ifi/pFzKtodcKmmfls3M=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.unimedizin-mainz.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.unimedizin-mainz.de:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.unimedizin-mainz.de/idp/profile/SAML2/Redirect/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.unimedizin-mainz.de/idp/profile/SAML2/POST/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.unimedizin-mainz.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://idp.unimedizin-mainz.de/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.unimedizin-mainz.de/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.unimedizin-mainz.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.unimedizin-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">unimedizin-mainz.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.unimedizin-mainz.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.unimedizin-mainz.de,O=Universitaetsmedizin der Johannes Gutenberg-Universitaet Mainz,L=Mainz,ST=Rheinland-Pfalz,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIGnTCCBYWgAwIBAgIHGFIEk0Z6CDANBgkqhkiG9w0BAQsFADCB2DELMAkGA1UE
-BhMCREUxGDAWBgNVBAgTD1JoZWlubGFuZC1QZmFsejEOMAwGA1UEBxMFTWFpbnox
-RzBFBgNVBAoTPlVuaXZlcnNpdGFldHNtZWRpemluIGRlciBKb2hhbm5lcyBHdXRl
-bmJlcmctVW5pdmVyc2l0YWV0IE1haW56MS8wLQYDVQQDEyZVTklWRVJTSVRBRVRT
-bWVkaXppbi4gTWFpbnogLSBDQSAtIEcwMTElMCMGCSqGSIb3DQEJARYWY2FAdW5p
-bWVkaXppbi1tYWluei5kZTAeFw0xNDEwMDYxMjExNDdaFw0xOTA3MDYwMDAwMDBa
-MIGiMQswCQYDVQQGEwJERTEYMBYGA1UECBMPUmhlaW5sYW5kLVBmYWx6MQ4wDAYD
-VQQHEwVNYWluejFHMEUGA1UEChM+VW5pdmVyc2l0YWV0c21lZGl6aW4gZGVyIEpv
-aGFubmVzIEd1dGVuYmVyZy1Vbml2ZXJzaXRhZXQgTWFpbnoxIDAeBgNVBAMTF2lk
-cC51bmltZWRpemluLW1haW56LmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
-CgKCAQEApf3XPkCctjw5x/tK0fVGr5/M0ZeJ8iPjES2XNyxMMBT0CirU96+r20YW
-aS1rpnWRNwWrr+iWiwK7mYQ5glT5RkwtBB3zdEHYRC/MZHRIrDVlVtEqGVEdN5Fn
-ZEixsxDatWdWBwCcTMO2rp7Uf6zsCxCJn63JwCtZVLyDdcEg4m+2Q32nwQZY29V4
-0t3mVfUZ/r55V9W8V2zhRpRrGarqmCGAv48XXwgVHLhN/Rb0/grsBRJZqEU9CvA0
-ujJwFuk9Lh8S1H3jNbqAv2M2Yf88rQDbGgy8yhOve7aWmHjIxaGm0IOVHSGLHm5g
-9eH/Dd68StfdnxsrubW7Qjl/vTgT7wIDAQABo4ICnjCCApowCQYDVR0TBAIwADAL
-BgNVHQ8EBAMCBeAwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMB0GA1Ud
-DgQWBBS27g1OcWdymQjf/ek1vvVRKOtGjDAfBgNVHSMEGDAWgBSkOU4ibcYqBiBu
-2uhoUVylgQ52PTBWBgNVHREETzBNghdpZHAudW5pbWVkaXppbi1tYWluei5kZYIY
-aWRwMS51bmltZWRpemluLW1haW56LmRlghhpZHAyLnVuaW1lZGl6aW4tbWFpbnou
-ZGUwgZMGA1UdHwSBizCBiDBCoECgPoY8aHR0cDovL2NkcDEucGNhLmRmbi5kZS91
-bmltZWRpemluLW1haW56LWNhL3B1Yi9jcmwvY2FjcmwuY3JsMEKgQKA+hjxodHRw
-Oi8vY2RwMi5wY2EuZGZuLmRlL3VuaW1lZGl6aW4tbWFpbnotY2EvcHViL2NybC9j
-YWNybC5jcmwwgeEGCCsGAQUFBwEBBIHUMIHRMDMGCCsGAQUFBzABhidodHRwOi8v
-b2NzcC5wY2EuZGZuLmRlL09DU1AtU2VydmVyL09DU1AwTAYIKwYBBQUHMAKGQGh0
-dHA6Ly9jZHAxLnBjYS5kZm4uZGUvdW5pbWVkaXppbi1tYWluei1jYS9wdWIvY2Fj
-ZXJ0L2NhY2VydC5jcnQwTAYIKwYBBQUHMAKGQGh0dHA6Ly9jZHAyLnBjYS5kZm4u
-ZGUvdW5pbWVkaXppbi1tYWluei1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwTwYD
-VR0gBEgwRjAPBg0rBgEEAYGtIYIsAQEEMA0GCysGAQQBga0hgiweMBEGDysGAQQB
-ga0hgiwBAQQDAjARBg8rBgEEAYGtIYIsAgEEAwEwDQYJKoZIhvcNAQELBQADggEB
-AEzbmDhzM5OGsMX1WJbj2tTAvVjlyEm3ioEE58dDV2I5QTi2TovCSxolslWnu6m6
-K0W2XZONTXSlbpr63Mk37KpThaMmt50tGhaQzmhDlcJINxpP4kKsDcYFHaem2wKW
-jHbL3pV2VIrYJwOhbVDFlhxJTRJ3wSrKCn52XT1U2/seD/iFBmfZtjDjnKT81r2F
-A/97xPYyf/ERwisDrvq0NqAlDGUQwqb670CNOLwuxm8UgjRct73RNgea9ez3Gs97
-8dmHUIz1D+e8aGj31RallWAk/ZdYp0rKYM0dd7MGbh6toEevStAbb2MTKHqIv45S
-AO8Ifi/pFzKtodcKmmfls3M=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.unimedizin-mainz.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.unimedizin-mainz.de,O=Universitaetsmedizin der Johannes Gutenberg-Universitaet Mainz,L=Mainz,ST=Rheinland-Pfalz,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIGnTCCBYWgAwIBAgIHGFIEk0Z6CDANBgkqhkiG9w0BAQsFADCB2DELMAkGA1UE
-BhMCREUxGDAWBgNVBAgTD1JoZWlubGFuZC1QZmFsejEOMAwGA1UEBxMFTWFpbnox
-RzBFBgNVBAoTPlVuaXZlcnNpdGFldHNtZWRpemluIGRlciBKb2hhbm5lcyBHdXRl
-bmJlcmctVW5pdmVyc2l0YWV0IE1haW56MS8wLQYDVQQDEyZVTklWRVJTSVRBRVRT
-bWVkaXppbi4gTWFpbnogLSBDQSAtIEcwMTElMCMGCSqGSIb3DQEJARYWY2FAdW5p
-bWVkaXppbi1tYWluei5kZTAeFw0xNDEwMDYxMjExNDdaFw0xOTA3MDYwMDAwMDBa
-MIGiMQswCQYDVQQGEwJERTEYMBYGA1UECBMPUmhlaW5sYW5kLVBmYWx6MQ4wDAYD
-VQQHEwVNYWluejFHMEUGA1UEChM+VW5pdmVyc2l0YWV0c21lZGl6aW4gZGVyIEpv
-aGFubmVzIEd1dGVuYmVyZy1Vbml2ZXJzaXRhZXQgTWFpbnoxIDAeBgNVBAMTF2lk
-cC51bmltZWRpemluLW1haW56LmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
-CgKCAQEApf3XPkCctjw5x/tK0fVGr5/M0ZeJ8iPjES2XNyxMMBT0CirU96+r20YW
-aS1rpnWRNwWrr+iWiwK7mYQ5glT5RkwtBB3zdEHYRC/MZHRIrDVlVtEqGVEdN5Fn
-ZEixsxDatWdWBwCcTMO2rp7Uf6zsCxCJn63JwCtZVLyDdcEg4m+2Q32nwQZY29V4
-0t3mVfUZ/r55V9W8V2zhRpRrGarqmCGAv48XXwgVHLhN/Rb0/grsBRJZqEU9CvA0
-ujJwFuk9Lh8S1H3jNbqAv2M2Yf88rQDbGgy8yhOve7aWmHjIxaGm0IOVHSGLHm5g
-9eH/Dd68StfdnxsrubW7Qjl/vTgT7wIDAQABo4ICnjCCApowCQYDVR0TBAIwADAL
-BgNVHQ8EBAMCBeAwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMB0GA1Ud
-DgQWBBS27g1OcWdymQjf/ek1vvVRKOtGjDAfBgNVHSMEGDAWgBSkOU4ibcYqBiBu
-2uhoUVylgQ52PTBWBgNVHREETzBNghdpZHAudW5pbWVkaXppbi1tYWluei5kZYIY
-aWRwMS51bmltZWRpemluLW1haW56LmRlghhpZHAyLnVuaW1lZGl6aW4tbWFpbnou
-ZGUwgZMGA1UdHwSBizCBiDBCoECgPoY8aHR0cDovL2NkcDEucGNhLmRmbi5kZS91
-bmltZWRpemluLW1haW56LWNhL3B1Yi9jcmwvY2FjcmwuY3JsMEKgQKA+hjxodHRw
-Oi8vY2RwMi5wY2EuZGZuLmRlL3VuaW1lZGl6aW4tbWFpbnotY2EvcHViL2NybC9j
-YWNybC5jcmwwgeEGCCsGAQUFBwEBBIHUMIHRMDMGCCsGAQUFBzABhidodHRwOi8v
-b2NzcC5wY2EuZGZuLmRlL09DU1AtU2VydmVyL09DU1AwTAYIKwYBBQUHMAKGQGh0
-dHA6Ly9jZHAxLnBjYS5kZm4uZGUvdW5pbWVkaXppbi1tYWluei1jYS9wdWIvY2Fj
-ZXJ0L2NhY2VydC5jcnQwTAYIKwYBBQUHMAKGQGh0dHA6Ly9jZHAyLnBjYS5kZm4u
-ZGUvdW5pbWVkaXppbi1tYWluei1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwTwYD
-VR0gBEgwRjAPBg0rBgEEAYGtIYIsAQEEMA0GCysGAQQBga0hgiweMBEGDysGAQQB
-ga0hgiwBAQQDAjARBg8rBgEEAYGtIYIsAgEEAwEwDQYJKoZIhvcNAQELBQADggEB
-AEzbmDhzM5OGsMX1WJbj2tTAvVjlyEm3ioEE58dDV2I5QTi2TovCSxolslWnu6m6
-K0W2XZONTXSlbpr63Mk37KpThaMmt50tGhaQzmhDlcJINxpP4kKsDcYFHaem2wKW
-jHbL3pV2VIrYJwOhbVDFlhxJTRJ3wSrKCn52XT1U2/seD/iFBmfZtjDjnKT81r2F
-A/97xPYyf/ERwisDrvq0NqAlDGUQwqb670CNOLwuxm8UgjRct73RNgea9ez3Gs97
-8dmHUIz1D+e8aGj31RallWAk/ZdYp0rKYM0dd7MGbh6toEevStAbb2MTKHqIv45S
-AO8Ifi/pFzKtodcKmmfls3M=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.unimedizin-mainz.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.unimedizin-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">e417</OrganizationName>
-    <OrganizationName xml:lang="en">e417</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">Universitätsmedizin der Johannes Gutenberg-Universität Mainz</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">University Medical Center of the Johannes Gutenberg University Mainz Germany</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.unimedizin-mainz.de</OrganizationURL>
-    <OrganizationURL xml:lang="en">http://www.unimedizin-mainz.de</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="administrative">
-    <GivenName>Ataollah</GivenName>
-    <SurName>Khoddam-Zadeh</SurName>
-    <EmailAddress>mailto:ataollah.khoddam-zadeh@unimedizin-mainz.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Ataollah</GivenName>
-    <SurName>Khoddam-Zadeh</SurName>
-    <EmailAddress>mailto:ataollah.khoddam-zadeh@unimedizin-mainz.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="support">
-    <GivenName>Ataollah</GivenName>
-    <SurName>Khoddam-Zadeh</SurName>
-    <EmailAddress>mailto:ataollah.khoddam-zadeh@unimedizin-mainz.de</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.unimedizin-mainz.de.xml b/swamid-interfederations-2.0/idp.unimedizin-mainz.de.xml
deleted file mode 100644
index d2d03cf3..00000000
--- a/swamid-interfederations-2.0/idp.unimedizin-mainz.de.xml
+++ /dev/null
@@ -1,245 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.unimedizin-mainz.de/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2014-10-09T21:46:04Z">
-      <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">unimedizin-mainz.de</saml1md:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="de">Universitätsmedizin der JoGu Mainz</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">University Medical Center of the JoGu Mainz</mdui:DisplayName>
-        <mdui:Description xml:lang="de">Universitätsmedizin der Johannes Gutenberg-Universität Mainz</mdui:Description>
-        <mdui:Description xml:lang="en">University Medical Center of the Johannes Gutenberg University Mainz</mdui:Description>
-        <mdui:InformationURL xml:lang="de">http://www.unimedizin-mainz.de</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">http://www.unimedizin-mainz.de</mdui:InformationURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.unimedizin-mainz.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.unimedizin-mainz.de,O=Universitaetsmedizin der Johannes Gutenberg-Universitaet Mainz,L=Mainz,ST=Rheinland-Pfalz,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIGnTCCBYWgAwIBAgIHGFIEk0Z6CDANBgkqhkiG9w0BAQsFADCB2DELMAkGA1UE
-BhMCREUxGDAWBgNVBAgTD1JoZWlubGFuZC1QZmFsejEOMAwGA1UEBxMFTWFpbnox
-RzBFBgNVBAoTPlVuaXZlcnNpdGFldHNtZWRpemluIGRlciBKb2hhbm5lcyBHdXRl
-bmJlcmctVW5pdmVyc2l0YWV0IE1haW56MS8wLQYDVQQDEyZVTklWRVJTSVRBRVRT
-bWVkaXppbi4gTWFpbnogLSBDQSAtIEcwMTElMCMGCSqGSIb3DQEJARYWY2FAdW5p
-bWVkaXppbi1tYWluei5kZTAeFw0xNDEwMDYxMjExNDdaFw0xOTA3MDYwMDAwMDBa
-MIGiMQswCQYDVQQGEwJERTEYMBYGA1UECBMPUmhlaW5sYW5kLVBmYWx6MQ4wDAYD
-VQQHEwVNYWluejFHMEUGA1UEChM+VW5pdmVyc2l0YWV0c21lZGl6aW4gZGVyIEpv
-aGFubmVzIEd1dGVuYmVyZy1Vbml2ZXJzaXRhZXQgTWFpbnoxIDAeBgNVBAMTF2lk
-cC51bmltZWRpemluLW1haW56LmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
-CgKCAQEApf3XPkCctjw5x/tK0fVGr5/M0ZeJ8iPjES2XNyxMMBT0CirU96+r20YW
-aS1rpnWRNwWrr+iWiwK7mYQ5glT5RkwtBB3zdEHYRC/MZHRIrDVlVtEqGVEdN5Fn
-ZEixsxDatWdWBwCcTMO2rp7Uf6zsCxCJn63JwCtZVLyDdcEg4m+2Q32nwQZY29V4
-0t3mVfUZ/r55V9W8V2zhRpRrGarqmCGAv48XXwgVHLhN/Rb0/grsBRJZqEU9CvA0
-ujJwFuk9Lh8S1H3jNbqAv2M2Yf88rQDbGgy8yhOve7aWmHjIxaGm0IOVHSGLHm5g
-9eH/Dd68StfdnxsrubW7Qjl/vTgT7wIDAQABo4ICnjCCApowCQYDVR0TBAIwADAL
-BgNVHQ8EBAMCBeAwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMB0GA1Ud
-DgQWBBS27g1OcWdymQjf/ek1vvVRKOtGjDAfBgNVHSMEGDAWgBSkOU4ibcYqBiBu
-2uhoUVylgQ52PTBWBgNVHREETzBNghdpZHAudW5pbWVkaXppbi1tYWluei5kZYIY
-aWRwMS51bmltZWRpemluLW1haW56LmRlghhpZHAyLnVuaW1lZGl6aW4tbWFpbnou
-ZGUwgZMGA1UdHwSBizCBiDBCoECgPoY8aHR0cDovL2NkcDEucGNhLmRmbi5kZS91
-bmltZWRpemluLW1haW56LWNhL3B1Yi9jcmwvY2FjcmwuY3JsMEKgQKA+hjxodHRw
-Oi8vY2RwMi5wY2EuZGZuLmRlL3VuaW1lZGl6aW4tbWFpbnotY2EvcHViL2NybC9j
-YWNybC5jcmwwgeEGCCsGAQUFBwEBBIHUMIHRMDMGCCsGAQUFBzABhidodHRwOi8v
-b2NzcC5wY2EuZGZuLmRlL09DU1AtU2VydmVyL09DU1AwTAYIKwYBBQUHMAKGQGh0
-dHA6Ly9jZHAxLnBjYS5kZm4uZGUvdW5pbWVkaXppbi1tYWluei1jYS9wdWIvY2Fj
-ZXJ0L2NhY2VydC5jcnQwTAYIKwYBBQUHMAKGQGh0dHA6Ly9jZHAyLnBjYS5kZm4u
-ZGUvdW5pbWVkaXppbi1tYWluei1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwTwYD
-VR0gBEgwRjAPBg0rBgEEAYGtIYIsAQEEMA0GCysGAQQBga0hgiweMBEGDysGAQQB
-ga0hgiwBAQQDAjARBg8rBgEEAYGtIYIsAgEEAwEwDQYJKoZIhvcNAQELBQADggEB
-AEzbmDhzM5OGsMX1WJbj2tTAvVjlyEm3ioEE58dDV2I5QTi2TovCSxolslWnu6m6
-K0W2XZONTXSlbpr63Mk37KpThaMmt50tGhaQzmhDlcJINxpP4kKsDcYFHaem2wKW
-jHbL3pV2VIrYJwOhbVDFlhxJTRJ3wSrKCn52XT1U2/seD/iFBmfZtjDjnKT81r2F
-A/97xPYyf/ERwisDrvq0NqAlDGUQwqb670CNOLwuxm8UgjRct73RNgea9ez3Gs97
-8dmHUIz1D+e8aGj31RallWAk/ZdYp0rKYM0dd7MGbh6toEevStAbb2MTKHqIv45S
-AO8Ifi/pFzKtodcKmmfls3M=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.unimedizin-mainz.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.unimedizin-mainz.de,O=Universitaetsmedizin der Johannes Gutenberg-Universitaet Mainz,L=Mainz,ST=Rheinland-Pfalz,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIGnTCCBYWgAwIBAgIHGFIEk0Z6CDANBgkqhkiG9w0BAQsFADCB2DELMAkGA1UE
-BhMCREUxGDAWBgNVBAgTD1JoZWlubGFuZC1QZmFsejEOMAwGA1UEBxMFTWFpbnox
-RzBFBgNVBAoTPlVuaXZlcnNpdGFldHNtZWRpemluIGRlciBKb2hhbm5lcyBHdXRl
-bmJlcmctVW5pdmVyc2l0YWV0IE1haW56MS8wLQYDVQQDEyZVTklWRVJTSVRBRVRT
-bWVkaXppbi4gTWFpbnogLSBDQSAtIEcwMTElMCMGCSqGSIb3DQEJARYWY2FAdW5p
-bWVkaXppbi1tYWluei5kZTAeFw0xNDEwMDYxMjExNDdaFw0xOTA3MDYwMDAwMDBa
-MIGiMQswCQYDVQQGEwJERTEYMBYGA1UECBMPUmhlaW5sYW5kLVBmYWx6MQ4wDAYD
-VQQHEwVNYWluejFHMEUGA1UEChM+VW5pdmVyc2l0YWV0c21lZGl6aW4gZGVyIEpv
-aGFubmVzIEd1dGVuYmVyZy1Vbml2ZXJzaXRhZXQgTWFpbnoxIDAeBgNVBAMTF2lk
-cC51bmltZWRpemluLW1haW56LmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
-CgKCAQEApf3XPkCctjw5x/tK0fVGr5/M0ZeJ8iPjES2XNyxMMBT0CirU96+r20YW
-aS1rpnWRNwWrr+iWiwK7mYQ5glT5RkwtBB3zdEHYRC/MZHRIrDVlVtEqGVEdN5Fn
-ZEixsxDatWdWBwCcTMO2rp7Uf6zsCxCJn63JwCtZVLyDdcEg4m+2Q32nwQZY29V4
-0t3mVfUZ/r55V9W8V2zhRpRrGarqmCGAv48XXwgVHLhN/Rb0/grsBRJZqEU9CvA0
-ujJwFuk9Lh8S1H3jNbqAv2M2Yf88rQDbGgy8yhOve7aWmHjIxaGm0IOVHSGLHm5g
-9eH/Dd68StfdnxsrubW7Qjl/vTgT7wIDAQABo4ICnjCCApowCQYDVR0TBAIwADAL
-BgNVHQ8EBAMCBeAwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMB0GA1Ud
-DgQWBBS27g1OcWdymQjf/ek1vvVRKOtGjDAfBgNVHSMEGDAWgBSkOU4ibcYqBiBu
-2uhoUVylgQ52PTBWBgNVHREETzBNghdpZHAudW5pbWVkaXppbi1tYWluei5kZYIY
-aWRwMS51bmltZWRpemluLW1haW56LmRlghhpZHAyLnVuaW1lZGl6aW4tbWFpbnou
-ZGUwgZMGA1UdHwSBizCBiDBCoECgPoY8aHR0cDovL2NkcDEucGNhLmRmbi5kZS91
-bmltZWRpemluLW1haW56LWNhL3B1Yi9jcmwvY2FjcmwuY3JsMEKgQKA+hjxodHRw
-Oi8vY2RwMi5wY2EuZGZuLmRlL3VuaW1lZGl6aW4tbWFpbnotY2EvcHViL2NybC9j
-YWNybC5jcmwwgeEGCCsGAQUFBwEBBIHUMIHRMDMGCCsGAQUFBzABhidodHRwOi8v
-b2NzcC5wY2EuZGZuLmRlL09DU1AtU2VydmVyL09DU1AwTAYIKwYBBQUHMAKGQGh0
-dHA6Ly9jZHAxLnBjYS5kZm4uZGUvdW5pbWVkaXppbi1tYWluei1jYS9wdWIvY2Fj
-ZXJ0L2NhY2VydC5jcnQwTAYIKwYBBQUHMAKGQGh0dHA6Ly9jZHAyLnBjYS5kZm4u
-ZGUvdW5pbWVkaXppbi1tYWluei1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwTwYD
-VR0gBEgwRjAPBg0rBgEEAYGtIYIsAQEEMA0GCysGAQQBga0hgiweMBEGDysGAQQB
-ga0hgiwBAQQDAjARBg8rBgEEAYGtIYIsAgEEAwEwDQYJKoZIhvcNAQELBQADggEB
-AEzbmDhzM5OGsMX1WJbj2tTAvVjlyEm3ioEE58dDV2I5QTi2TovCSxolslWnu6m6
-K0W2XZONTXSlbpr63Mk37KpThaMmt50tGhaQzmhDlcJINxpP4kKsDcYFHaem2wKW
-jHbL3pV2VIrYJwOhbVDFlhxJTRJ3wSrKCn52XT1U2/seD/iFBmfZtjDjnKT81r2F
-A/97xPYyf/ERwisDrvq0NqAlDGUQwqb670CNOLwuxm8UgjRct73RNgea9ez3Gs97
-8dmHUIz1D+e8aGj31RallWAk/ZdYp0rKYM0dd7MGbh6toEevStAbb2MTKHqIv45S
-AO8Ifi/pFzKtodcKmmfls3M=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.unimedizin-mainz.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.unimedizin-mainz.de:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.unimedizin-mainz.de/idp/profile/SAML2/Redirect/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.unimedizin-mainz.de/idp/profile/SAML2/POST/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.unimedizin-mainz.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://idp.unimedizin-mainz.de/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.unimedizin-mainz.de/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.unimedizin-mainz.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.unimedizin-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">unimedizin-mainz.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.unimedizin-mainz.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.unimedizin-mainz.de,O=Universitaetsmedizin der Johannes Gutenberg-Universitaet Mainz,L=Mainz,ST=Rheinland-Pfalz,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIGnTCCBYWgAwIBAgIHGFIEk0Z6CDANBgkqhkiG9w0BAQsFADCB2DELMAkGA1UE
-BhMCREUxGDAWBgNVBAgTD1JoZWlubGFuZC1QZmFsejEOMAwGA1UEBxMFTWFpbnox
-RzBFBgNVBAoTPlVuaXZlcnNpdGFldHNtZWRpemluIGRlciBKb2hhbm5lcyBHdXRl
-bmJlcmctVW5pdmVyc2l0YWV0IE1haW56MS8wLQYDVQQDEyZVTklWRVJTSVRBRVRT
-bWVkaXppbi4gTWFpbnogLSBDQSAtIEcwMTElMCMGCSqGSIb3DQEJARYWY2FAdW5p
-bWVkaXppbi1tYWluei5kZTAeFw0xNDEwMDYxMjExNDdaFw0xOTA3MDYwMDAwMDBa
-MIGiMQswCQYDVQQGEwJERTEYMBYGA1UECBMPUmhlaW5sYW5kLVBmYWx6MQ4wDAYD
-VQQHEwVNYWluejFHMEUGA1UEChM+VW5pdmVyc2l0YWV0c21lZGl6aW4gZGVyIEpv
-aGFubmVzIEd1dGVuYmVyZy1Vbml2ZXJzaXRhZXQgTWFpbnoxIDAeBgNVBAMTF2lk
-cC51bmltZWRpemluLW1haW56LmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
-CgKCAQEApf3XPkCctjw5x/tK0fVGr5/M0ZeJ8iPjES2XNyxMMBT0CirU96+r20YW
-aS1rpnWRNwWrr+iWiwK7mYQ5glT5RkwtBB3zdEHYRC/MZHRIrDVlVtEqGVEdN5Fn
-ZEixsxDatWdWBwCcTMO2rp7Uf6zsCxCJn63JwCtZVLyDdcEg4m+2Q32nwQZY29V4
-0t3mVfUZ/r55V9W8V2zhRpRrGarqmCGAv48XXwgVHLhN/Rb0/grsBRJZqEU9CvA0
-ujJwFuk9Lh8S1H3jNbqAv2M2Yf88rQDbGgy8yhOve7aWmHjIxaGm0IOVHSGLHm5g
-9eH/Dd68StfdnxsrubW7Qjl/vTgT7wIDAQABo4ICnjCCApowCQYDVR0TBAIwADAL
-BgNVHQ8EBAMCBeAwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMB0GA1Ud
-DgQWBBS27g1OcWdymQjf/ek1vvVRKOtGjDAfBgNVHSMEGDAWgBSkOU4ibcYqBiBu
-2uhoUVylgQ52PTBWBgNVHREETzBNghdpZHAudW5pbWVkaXppbi1tYWluei5kZYIY
-aWRwMS51bmltZWRpemluLW1haW56LmRlghhpZHAyLnVuaW1lZGl6aW4tbWFpbnou
-ZGUwgZMGA1UdHwSBizCBiDBCoECgPoY8aHR0cDovL2NkcDEucGNhLmRmbi5kZS91
-bmltZWRpemluLW1haW56LWNhL3B1Yi9jcmwvY2FjcmwuY3JsMEKgQKA+hjxodHRw
-Oi8vY2RwMi5wY2EuZGZuLmRlL3VuaW1lZGl6aW4tbWFpbnotY2EvcHViL2NybC9j
-YWNybC5jcmwwgeEGCCsGAQUFBwEBBIHUMIHRMDMGCCsGAQUFBzABhidodHRwOi8v
-b2NzcC5wY2EuZGZuLmRlL09DU1AtU2VydmVyL09DU1AwTAYIKwYBBQUHMAKGQGh0
-dHA6Ly9jZHAxLnBjYS5kZm4uZGUvdW5pbWVkaXppbi1tYWluei1jYS9wdWIvY2Fj
-ZXJ0L2NhY2VydC5jcnQwTAYIKwYBBQUHMAKGQGh0dHA6Ly9jZHAyLnBjYS5kZm4u
-ZGUvdW5pbWVkaXppbi1tYWluei1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwTwYD
-VR0gBEgwRjAPBg0rBgEEAYGtIYIsAQEEMA0GCysGAQQBga0hgiweMBEGDysGAQQB
-ga0hgiwBAQQDAjARBg8rBgEEAYGtIYIsAgEEAwEwDQYJKoZIhvcNAQELBQADggEB
-AEzbmDhzM5OGsMX1WJbj2tTAvVjlyEm3ioEE58dDV2I5QTi2TovCSxolslWnu6m6
-K0W2XZONTXSlbpr63Mk37KpThaMmt50tGhaQzmhDlcJINxpP4kKsDcYFHaem2wKW
-jHbL3pV2VIrYJwOhbVDFlhxJTRJ3wSrKCn52XT1U2/seD/iFBmfZtjDjnKT81r2F
-A/97xPYyf/ERwisDrvq0NqAlDGUQwqb670CNOLwuxm8UgjRct73RNgea9ez3Gs97
-8dmHUIz1D+e8aGj31RallWAk/ZdYp0rKYM0dd7MGbh6toEevStAbb2MTKHqIv45S
-AO8Ifi/pFzKtodcKmmfls3M=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.unimedizin-mainz.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.unimedizin-mainz.de,O=Universitaetsmedizin der Johannes Gutenberg-Universitaet Mainz,L=Mainz,ST=Rheinland-Pfalz,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIGnTCCBYWgAwIBAgIHGFIEk0Z6CDANBgkqhkiG9w0BAQsFADCB2DELMAkGA1UE
-BhMCREUxGDAWBgNVBAgTD1JoZWlubGFuZC1QZmFsejEOMAwGA1UEBxMFTWFpbnox
-RzBFBgNVBAoTPlVuaXZlcnNpdGFldHNtZWRpemluIGRlciBKb2hhbm5lcyBHdXRl
-bmJlcmctVW5pdmVyc2l0YWV0IE1haW56MS8wLQYDVQQDEyZVTklWRVJTSVRBRVRT
-bWVkaXppbi4gTWFpbnogLSBDQSAtIEcwMTElMCMGCSqGSIb3DQEJARYWY2FAdW5p
-bWVkaXppbi1tYWluei5kZTAeFw0xNDEwMDYxMjExNDdaFw0xOTA3MDYwMDAwMDBa
-MIGiMQswCQYDVQQGEwJERTEYMBYGA1UECBMPUmhlaW5sYW5kLVBmYWx6MQ4wDAYD
-VQQHEwVNYWluejFHMEUGA1UEChM+VW5pdmVyc2l0YWV0c21lZGl6aW4gZGVyIEpv
-aGFubmVzIEd1dGVuYmVyZy1Vbml2ZXJzaXRhZXQgTWFpbnoxIDAeBgNVBAMTF2lk
-cC51bmltZWRpemluLW1haW56LmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
-CgKCAQEApf3XPkCctjw5x/tK0fVGr5/M0ZeJ8iPjES2XNyxMMBT0CirU96+r20YW
-aS1rpnWRNwWrr+iWiwK7mYQ5glT5RkwtBB3zdEHYRC/MZHRIrDVlVtEqGVEdN5Fn
-ZEixsxDatWdWBwCcTMO2rp7Uf6zsCxCJn63JwCtZVLyDdcEg4m+2Q32nwQZY29V4
-0t3mVfUZ/r55V9W8V2zhRpRrGarqmCGAv48XXwgVHLhN/Rb0/grsBRJZqEU9CvA0
-ujJwFuk9Lh8S1H3jNbqAv2M2Yf88rQDbGgy8yhOve7aWmHjIxaGm0IOVHSGLHm5g
-9eH/Dd68StfdnxsrubW7Qjl/vTgT7wIDAQABo4ICnjCCApowCQYDVR0TBAIwADAL
-BgNVHQ8EBAMCBeAwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMB0GA1Ud
-DgQWBBS27g1OcWdymQjf/ek1vvVRKOtGjDAfBgNVHSMEGDAWgBSkOU4ibcYqBiBu
-2uhoUVylgQ52PTBWBgNVHREETzBNghdpZHAudW5pbWVkaXppbi1tYWluei5kZYIY
-aWRwMS51bmltZWRpemluLW1haW56LmRlghhpZHAyLnVuaW1lZGl6aW4tbWFpbnou
-ZGUwgZMGA1UdHwSBizCBiDBCoECgPoY8aHR0cDovL2NkcDEucGNhLmRmbi5kZS91
-bmltZWRpemluLW1haW56LWNhL3B1Yi9jcmwvY2FjcmwuY3JsMEKgQKA+hjxodHRw
-Oi8vY2RwMi5wY2EuZGZuLmRlL3VuaW1lZGl6aW4tbWFpbnotY2EvcHViL2NybC9j
-YWNybC5jcmwwgeEGCCsGAQUFBwEBBIHUMIHRMDMGCCsGAQUFBzABhidodHRwOi8v
-b2NzcC5wY2EuZGZuLmRlL09DU1AtU2VydmVyL09DU1AwTAYIKwYBBQUHMAKGQGh0
-dHA6Ly9jZHAxLnBjYS5kZm4uZGUvdW5pbWVkaXppbi1tYWluei1jYS9wdWIvY2Fj
-ZXJ0L2NhY2VydC5jcnQwTAYIKwYBBQUHMAKGQGh0dHA6Ly9jZHAyLnBjYS5kZm4u
-ZGUvdW5pbWVkaXppbi1tYWluei1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwTwYD
-VR0gBEgwRjAPBg0rBgEEAYGtIYIsAQEEMA0GCysGAQQBga0hgiweMBEGDysGAQQB
-ga0hgiwBAQQDAjARBg8rBgEEAYGtIYIsAgEEAwEwDQYJKoZIhvcNAQELBQADggEB
-AEzbmDhzM5OGsMX1WJbj2tTAvVjlyEm3ioEE58dDV2I5QTi2TovCSxolslWnu6m6
-K0W2XZONTXSlbpr63Mk37KpThaMmt50tGhaQzmhDlcJINxpP4kKsDcYFHaem2wKW
-jHbL3pV2VIrYJwOhbVDFlhxJTRJ3wSrKCn52XT1U2/seD/iFBmfZtjDjnKT81r2F
-A/97xPYyf/ERwisDrvq0NqAlDGUQwqb670CNOLwuxm8UgjRct73RNgea9ez3Gs97
-8dmHUIz1D+e8aGj31RallWAk/ZdYp0rKYM0dd7MGbh6toEevStAbb2MTKHqIv45S
-AO8Ifi/pFzKtodcKmmfls3M=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.unimedizin-mainz.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.unimedizin-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">e417</OrganizationName>
-    <OrganizationName xml:lang="en">e417</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">Universitätsmedizin der Johannes Gutenberg-Universität Mainz</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">University Medical Center of the Johannes Gutenberg University Mainz Germany</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.unimedizin-mainz.de</OrganizationURL>
-    <OrganizationURL xml:lang="en">http://www.unimedizin-mainz.de</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="administrative">
-    <GivenName>Ataollah</GivenName>
-    <SurName>Khoddam-Zadeh</SurName>
-    <EmailAddress>mailto:ataollah.khoddam-zadeh@unimedizin-mainz.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Ataollah</GivenName>
-    <SurName>Khoddam-Zadeh</SurName>
-    <EmailAddress>mailto:ataollah.khoddam-zadeh@unimedizin-mainz.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="support">
-    <GivenName>Ataollah</GivenName>
-    <SurName>Khoddam-Zadeh</SurName>
-    <EmailAddress>mailto:ataollah.khoddam-zadeh@unimedizin-mainz.de</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.uniparthenope.it-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.uniparthenope.it-idp-shibboleth.xml
deleted file mode 100644
index cf834add..00000000
--- a/swamid-interfederations-2.0/idp.uniparthenope.it-idp-shibboleth.xml
+++ /dev/null
@@ -1,100 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" entityID="https://idp.uniparthenope.it/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2011-01-11T15:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</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">uniparthenope.it</shibmd:Scope>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="en">Università di Napoli Parthenope</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="it">Università di Napoli Parthenope</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Identity Provider for PARTHENOPE University member</mdui:Description>
-        <mdui:Description xml:lang="it">Identity Provider per gli afferenti alla Universita' PARTHENOPE</mdui:Description>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDOzCCAiOgAwIBAgIUaE6MYuJWXmKRLkOaoYJ7v4C0fFowDQYJKoZIhvcNAQEF
-BQAwHzEdMBsGA1UEAxMUaWRwLnVuaXBhcnRoZW5vcGUuaXQwHhcNMTAxMDExMTA1
-OTU2WhcNMzAxMDExMTA1OTU2WjAfMR0wGwYDVQQDExRpZHAudW5pcGFydGhlbm9w
-ZS5pdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJkPb9xxWtT2CoJL
-teZJDfYsGC3ieLYzf3iE+Yb8tv/4YpEFfUlUK07FH+SBDC0gpmGyd6EhUnaQP9Lz
-Hc8iIaiSCNwGy3iZyVQkbYHhiGCcgMvoIbnK2B4/DST1vRjNweCQiZsmk03O05dQ
-+JjcgEkFi+8EeSEpOu3IrACRix/FViPy8l0JOr1ftLiONl/7WdyNJorLfTym6+cY
-kwSJIOzu5+U0UTx1vQJa1RN67dydGPy68Hq9JiKrYZ9zm+n0w7rbkCe+F4oP4Pp/
-lXJhGdenDusAZpohA72CXqFMGpMoKf4ktnm1vg6o2awl6pUQTRFqjhIXdy8v6f7O
-n0W9s/sCAwEAAaNvMG0wTAYDVR0RBEUwQ4IUaWRwLnVuaXBhcnRoZW5vcGUuaXSG
-K2h0dHBzOi8vaWRwLnVuaXBhcnRoZW5vcGUuaXQvaWRwL3NoaWJib2xldGgwHQYD
-VR0OBBYEFBbCXm5gWz4H5pWLzyTs/P1rDgveMA0GCSqGSIb3DQEBBQUAA4IBAQBR
-4eYlPyqz4G+EwI5vRbPA+1MZ3C4NNowmgkzvZVYhyuHNvYXqk0AvfyCTbi9fpPjk
-K87fkCo6qmaQAHlUE0ZxPzCbR1tRGoOVGAszMesh1whopFxHlfh9/zIFHocE2VDz
-Q3X5Orpt5M7J0Q56cXquYh3EuIFmYByXzK9hTOAiDq55n1QQ2nvQHItC4Jkp7GeO
-c5D59ahcQWgbzHw5WbJqHuT2JvU+jF8w08RZbxQLCWEQHPKfwCBuKLQy8R4tWbDr
-NMFx4IIXL5k2bXFtVidG02j1Mw66zjER3tinreZdr4emOtqomO0kR0kpYkGeqJDU
-cReeVaTfudJyy/pCjfbP
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.uniparthenope.it:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.uniparthenope.it: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.uniparthenope.it/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.uniparthenope.it/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.uniparthenope.it/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.uniparthenope.it/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">uniparthenope.it</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDOzCCAiOgAwIBAgIUaE6MYuJWXmKRLkOaoYJ7v4C0fFowDQYJKoZIhvcNAQEF
-BQAwHzEdMBsGA1UEAxMUaWRwLnVuaXBhcnRoZW5vcGUuaXQwHhcNMTAxMDExMTA1
-OTU2WhcNMzAxMDExMTA1OTU2WjAfMR0wGwYDVQQDExRpZHAudW5pcGFydGhlbm9w
-ZS5pdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJkPb9xxWtT2CoJL
-teZJDfYsGC3ieLYzf3iE+Yb8tv/4YpEFfUlUK07FH+SBDC0gpmGyd6EhUnaQP9Lz
-Hc8iIaiSCNwGy3iZyVQkbYHhiGCcgMvoIbnK2B4/DST1vRjNweCQiZsmk03O05dQ
-+JjcgEkFi+8EeSEpOu3IrACRix/FViPy8l0JOr1ftLiONl/7WdyNJorLfTym6+cY
-kwSJIOzu5+U0UTx1vQJa1RN67dydGPy68Hq9JiKrYZ9zm+n0w7rbkCe+F4oP4Pp/
-lXJhGdenDusAZpohA72CXqFMGpMoKf4ktnm1vg6o2awl6pUQTRFqjhIXdy8v6f7O
-n0W9s/sCAwEAAaNvMG0wTAYDVR0RBEUwQ4IUaWRwLnVuaXBhcnRoZW5vcGUuaXSG
-K2h0dHBzOi8vaWRwLnVuaXBhcnRoZW5vcGUuaXQvaWRwL3NoaWJib2xldGgwHQYD
-VR0OBBYEFBbCXm5gWz4H5pWLzyTs/P1rDgveMA0GCSqGSIb3DQEBBQUAA4IBAQBR
-4eYlPyqz4G+EwI5vRbPA+1MZ3C4NNowmgkzvZVYhyuHNvYXqk0AvfyCTbi9fpPjk
-K87fkCo6qmaQAHlUE0ZxPzCbR1tRGoOVGAszMesh1whopFxHlfh9/zIFHocE2VDz
-Q3X5Orpt5M7J0Q56cXquYh3EuIFmYByXzK9hTOAiDq55n1QQ2nvQHItC4Jkp7GeO
-c5D59ahcQWgbzHw5WbJqHuT2JvU+jF8w08RZbxQLCWEQHPKfwCBuKLQy8R4tWbDr
-NMFx4IIXL5k2bXFtVidG02j1Mw66zjER3tinreZdr4emOtqomO0kR0kpYkGeqJDU
-cReeVaTfudJyy/pCjfbP
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.uniparthenope.it:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.uniparthenope.it: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="it">Università di Napoli Parthenope</OrganizationName>
-    <OrganizationName xml:lang="en">Università di Napoli Parthenope</OrganizationName>
-    <OrganizationDisplayName xml:lang="it">Università di Napoli Parthenope</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">Università di Napoli Parthenope</OrganizationDisplayName>
-    <OrganizationURL xml:lang="it">http://www.uniparthenope.it</OrganizationURL>
-    <OrganizationURL xml:lang="en">http://www.uniparthenope.it</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>N.Napolitano-A.Cioffi</SurName>
-    <EmailAddress>idem@uniparthenope.it</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.uniparthenope.it.xml b/swamid-interfederations-2.0/idp.uniparthenope.it.xml
deleted file mode 100644
index cf834add..00000000
--- a/swamid-interfederations-2.0/idp.uniparthenope.it.xml
+++ /dev/null
@@ -1,100 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" entityID="https://idp.uniparthenope.it/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2011-01-11T15:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</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">uniparthenope.it</shibmd:Scope>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="en">Università di Napoli Parthenope</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="it">Università di Napoli Parthenope</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Identity Provider for PARTHENOPE University member</mdui:Description>
-        <mdui:Description xml:lang="it">Identity Provider per gli afferenti alla Universita' PARTHENOPE</mdui:Description>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDOzCCAiOgAwIBAgIUaE6MYuJWXmKRLkOaoYJ7v4C0fFowDQYJKoZIhvcNAQEF
-BQAwHzEdMBsGA1UEAxMUaWRwLnVuaXBhcnRoZW5vcGUuaXQwHhcNMTAxMDExMTA1
-OTU2WhcNMzAxMDExMTA1OTU2WjAfMR0wGwYDVQQDExRpZHAudW5pcGFydGhlbm9w
-ZS5pdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJkPb9xxWtT2CoJL
-teZJDfYsGC3ieLYzf3iE+Yb8tv/4YpEFfUlUK07FH+SBDC0gpmGyd6EhUnaQP9Lz
-Hc8iIaiSCNwGy3iZyVQkbYHhiGCcgMvoIbnK2B4/DST1vRjNweCQiZsmk03O05dQ
-+JjcgEkFi+8EeSEpOu3IrACRix/FViPy8l0JOr1ftLiONl/7WdyNJorLfTym6+cY
-kwSJIOzu5+U0UTx1vQJa1RN67dydGPy68Hq9JiKrYZ9zm+n0w7rbkCe+F4oP4Pp/
-lXJhGdenDusAZpohA72CXqFMGpMoKf4ktnm1vg6o2awl6pUQTRFqjhIXdy8v6f7O
-n0W9s/sCAwEAAaNvMG0wTAYDVR0RBEUwQ4IUaWRwLnVuaXBhcnRoZW5vcGUuaXSG
-K2h0dHBzOi8vaWRwLnVuaXBhcnRoZW5vcGUuaXQvaWRwL3NoaWJib2xldGgwHQYD
-VR0OBBYEFBbCXm5gWz4H5pWLzyTs/P1rDgveMA0GCSqGSIb3DQEBBQUAA4IBAQBR
-4eYlPyqz4G+EwI5vRbPA+1MZ3C4NNowmgkzvZVYhyuHNvYXqk0AvfyCTbi9fpPjk
-K87fkCo6qmaQAHlUE0ZxPzCbR1tRGoOVGAszMesh1whopFxHlfh9/zIFHocE2VDz
-Q3X5Orpt5M7J0Q56cXquYh3EuIFmYByXzK9hTOAiDq55n1QQ2nvQHItC4Jkp7GeO
-c5D59ahcQWgbzHw5WbJqHuT2JvU+jF8w08RZbxQLCWEQHPKfwCBuKLQy8R4tWbDr
-NMFx4IIXL5k2bXFtVidG02j1Mw66zjER3tinreZdr4emOtqomO0kR0kpYkGeqJDU
-cReeVaTfudJyy/pCjfbP
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.uniparthenope.it:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.uniparthenope.it: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.uniparthenope.it/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.uniparthenope.it/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.uniparthenope.it/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.uniparthenope.it/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">uniparthenope.it</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDOzCCAiOgAwIBAgIUaE6MYuJWXmKRLkOaoYJ7v4C0fFowDQYJKoZIhvcNAQEF
-BQAwHzEdMBsGA1UEAxMUaWRwLnVuaXBhcnRoZW5vcGUuaXQwHhcNMTAxMDExMTA1
-OTU2WhcNMzAxMDExMTA1OTU2WjAfMR0wGwYDVQQDExRpZHAudW5pcGFydGhlbm9w
-ZS5pdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJkPb9xxWtT2CoJL
-teZJDfYsGC3ieLYzf3iE+Yb8tv/4YpEFfUlUK07FH+SBDC0gpmGyd6EhUnaQP9Lz
-Hc8iIaiSCNwGy3iZyVQkbYHhiGCcgMvoIbnK2B4/DST1vRjNweCQiZsmk03O05dQ
-+JjcgEkFi+8EeSEpOu3IrACRix/FViPy8l0JOr1ftLiONl/7WdyNJorLfTym6+cY
-kwSJIOzu5+U0UTx1vQJa1RN67dydGPy68Hq9JiKrYZ9zm+n0w7rbkCe+F4oP4Pp/
-lXJhGdenDusAZpohA72CXqFMGpMoKf4ktnm1vg6o2awl6pUQTRFqjhIXdy8v6f7O
-n0W9s/sCAwEAAaNvMG0wTAYDVR0RBEUwQ4IUaWRwLnVuaXBhcnRoZW5vcGUuaXSG
-K2h0dHBzOi8vaWRwLnVuaXBhcnRoZW5vcGUuaXQvaWRwL3NoaWJib2xldGgwHQYD
-VR0OBBYEFBbCXm5gWz4H5pWLzyTs/P1rDgveMA0GCSqGSIb3DQEBBQUAA4IBAQBR
-4eYlPyqz4G+EwI5vRbPA+1MZ3C4NNowmgkzvZVYhyuHNvYXqk0AvfyCTbi9fpPjk
-K87fkCo6qmaQAHlUE0ZxPzCbR1tRGoOVGAszMesh1whopFxHlfh9/zIFHocE2VDz
-Q3X5Orpt5M7J0Q56cXquYh3EuIFmYByXzK9hTOAiDq55n1QQ2nvQHItC4Jkp7GeO
-c5D59ahcQWgbzHw5WbJqHuT2JvU+jF8w08RZbxQLCWEQHPKfwCBuKLQy8R4tWbDr
-NMFx4IIXL5k2bXFtVidG02j1Mw66zjER3tinreZdr4emOtqomO0kR0kpYkGeqJDU
-cReeVaTfudJyy/pCjfbP
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.uniparthenope.it:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.uniparthenope.it: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="it">Università di Napoli Parthenope</OrganizationName>
-    <OrganizationName xml:lang="en">Università di Napoli Parthenope</OrganizationName>
-    <OrganizationDisplayName xml:lang="it">Università di Napoli Parthenope</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">Università di Napoli Parthenope</OrganizationDisplayName>
-    <OrganizationURL xml:lang="it">http://www.uniparthenope.it</OrganizationURL>
-    <OrganizationURL xml:lang="en">http://www.uniparthenope.it</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>N.Napolitano-A.Cioffi</SurName>
-    <EmailAddress>idem@uniparthenope.it</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.unipg.it-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.unipg.it-idp-shibboleth.xml
deleted file mode 100644
index beba8a73..00000000
--- a/swamid-interfederations-2.0/idp.unipg.it-idp-shibboleth.xml
+++ /dev/null
@@ -1,105 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" entityID="https://idp.unipg.it/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2014-09-09T12:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</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>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="en">University of Perugia</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="it">Università degli studi di Perugia</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Identity provider for the University of Perugia</mdui:Description>
-        <mdui:Description xml:lang="it">Identity provider per gli utenti dell'Università degli studi di Perugia</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.unipg.it/en/idem-federation</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="it">http://www.unipg.it/il-portale/servizi-on-line/federazione-idem</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">http://www.unipg.it/en/idem-federation/idem-privacy</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="it">http://www.unipg.it/il-portale/servizi-on-line/federazione-idem/informativa-idem</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-      <shibmd:Scope regexp="false">unipg.it</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDGzCCAgOgAwIBAgIUbtCA5KDFFzAdtSTGPwrF8RKSWf8wDQYJKoZIhvcNAQEF
-BQAwFzEVMBMGA1UEAxMMaWRwLnVuaXBnLml0MB4XDTEzMTEyOTEwNDgyN1oXDTMz
-MTEyOTEwNDgyN1owFzEVMBMGA1UEAxMMaWRwLnVuaXBnLml0MIIBIjANBgkqhkiG
-9w0BAQEFAAOCAQ8AMIIBCgKCAQEArcWMYBTfLliKg2yiUOuJphQVPDuzFh8iAzmB
-N5rs+B9Y841AvxgC2K12IogTLt2oeX5qv2hvyoip2q3XBY8aHo4xwjTW0UmgZ4Td
-dTA1ImOUq61mUYucYemfng+wO2rKpDOaOuwjOOJ4ZwYly0f4MenKDkGxmv/X5vFQ
-mNc5EeC4Zllkvoss95OuE8oQ/xxA+3xsAT6zhjadsHlTrxHfkWBDTbeNhupAbqD0
-JB84CfVNaOrmD/haNzn5lfktKb+aDwac+wSpl/P2wxa2F5ZkTLJeRF6WK0z4S6Wb
-IaaLbrwIXCWnZnQoWY6mFKBaK2hAB8P3emlpsve6cl5QC7TnqwIDAQABo18wXTA8
-BgNVHREENTAzggxpZHAudW5pcGcuaXSGI2h0dHBzOi8vaWRwLnVuaXBnLml0L2lk
-cC9zaGliYm9sZXRoMB0GA1UdDgQWBBRlnQD+3BGocWcSXr2HfL3Pm+HSjTANBgkq
-hkiG9w0BAQUFAAOCAQEAF8seek5DbzQnVsPhRzkzsl367Q6gnCiUWJR4x+KwgDLb
-yC/1F9x62DxiM1HqN21K2IhhJuiBEgEH2vfBBL9XS4U12gCnjOeOrVq4Sn1n0y0n
-Mtr1n/F38kdTww7elicK1c5VfJzNW92SPZ0WDeqx6dsHtCLr0cEbe2m37ObmbP7m
-i+4ZUJg7ph20zCfmZuqz9U7rd2Cextu267R6HGTb7j44QyqyR/HLmGcisZuA8F14
-NESI9h/L+O7VkKo6jKvBZhUuOxNrc/NvUToO5BaKJjtdP0kHDKKgKHpuE5FHSeGr
-a3btFASB68LjOF7z6SBM9h7F+NMDYLzCDuf6qHqMkg==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.unipg.it:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.unipg.it:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.unipg.it/idp/profile/SAML2/Redirect/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.unipg.it/idp/profile/SAML2/POST/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.unipg.it: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.unipg.it/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.unipg.it/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.unipg.it/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.unipg.it/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">unipg.it</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDGzCCAgOgAwIBAgIUbtCA5KDFFzAdtSTGPwrF8RKSWf8wDQYJKoZIhvcNAQEF
-BQAwFzEVMBMGA1UEAxMMaWRwLnVuaXBnLml0MB4XDTEzMTEyOTEwNDgyN1oXDTMz
-MTEyOTEwNDgyN1owFzEVMBMGA1UEAxMMaWRwLnVuaXBnLml0MIIBIjANBgkqhkiG
-9w0BAQEFAAOCAQ8AMIIBCgKCAQEArcWMYBTfLliKg2yiUOuJphQVPDuzFh8iAzmB
-N5rs+B9Y841AvxgC2K12IogTLt2oeX5qv2hvyoip2q3XBY8aHo4xwjTW0UmgZ4Td
-dTA1ImOUq61mUYucYemfng+wO2rKpDOaOuwjOOJ4ZwYly0f4MenKDkGxmv/X5vFQ
-mNc5EeC4Zllkvoss95OuE8oQ/xxA+3xsAT6zhjadsHlTrxHfkWBDTbeNhupAbqD0
-JB84CfVNaOrmD/haNzn5lfktKb+aDwac+wSpl/P2wxa2F5ZkTLJeRF6WK0z4S6Wb
-IaaLbrwIXCWnZnQoWY6mFKBaK2hAB8P3emlpsve6cl5QC7TnqwIDAQABo18wXTA8
-BgNVHREENTAzggxpZHAudW5pcGcuaXSGI2h0dHBzOi8vaWRwLnVuaXBnLml0L2lk
-cC9zaGliYm9sZXRoMB0GA1UdDgQWBBRlnQD+3BGocWcSXr2HfL3Pm+HSjTANBgkq
-hkiG9w0BAQUFAAOCAQEAF8seek5DbzQnVsPhRzkzsl367Q6gnCiUWJR4x+KwgDLb
-yC/1F9x62DxiM1HqN21K2IhhJuiBEgEH2vfBBL9XS4U12gCnjOeOrVq4Sn1n0y0n
-Mtr1n/F38kdTww7elicK1c5VfJzNW92SPZ0WDeqx6dsHtCLr0cEbe2m37ObmbP7m
-i+4ZUJg7ph20zCfmZuqz9U7rd2Cextu267R6HGTb7j44QyqyR/HLmGcisZuA8F14
-NESI9h/L+O7VkKo6jKvBZhUuOxNrc/NvUToO5BaKJjtdP0kHDKKgKHpuE5FHSeGr
-a3btFASB68LjOF7z6SBM9h7F+NMDYLzCDuf6qHqMkg==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.unipg.it:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.unipg.it: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="it">Università degli studi di Perugia</OrganizationName>
-    <OrganizationName xml:lang="en">University of Perugia</OrganizationName>
-    <OrganizationDisplayName xml:lang="it">Università degli studi di Perugia</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">University of Perugia</OrganizationDisplayName>
-    <OrganizationURL xml:lang="it">http://www.unipg.it</OrganizationURL>
-    <OrganizationURL xml:lang="en">http://www.unipg.it/en</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Supporto IDEM</GivenName>
-    <EmailAddress>servizio.idem@unipg.it</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.unipg.it.xml b/swamid-interfederations-2.0/idp.unipg.it.xml
deleted file mode 100644
index beba8a73..00000000
--- a/swamid-interfederations-2.0/idp.unipg.it.xml
+++ /dev/null
@@ -1,105 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" entityID="https://idp.unipg.it/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2014-09-09T12:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</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>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="en">University of Perugia</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="it">Università degli studi di Perugia</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Identity provider for the University of Perugia</mdui:Description>
-        <mdui:Description xml:lang="it">Identity provider per gli utenti dell'Università degli studi di Perugia</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.unipg.it/en/idem-federation</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="it">http://www.unipg.it/il-portale/servizi-on-line/federazione-idem</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">http://www.unipg.it/en/idem-federation/idem-privacy</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="it">http://www.unipg.it/il-portale/servizi-on-line/federazione-idem/informativa-idem</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-      <shibmd:Scope regexp="false">unipg.it</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDGzCCAgOgAwIBAgIUbtCA5KDFFzAdtSTGPwrF8RKSWf8wDQYJKoZIhvcNAQEF
-BQAwFzEVMBMGA1UEAxMMaWRwLnVuaXBnLml0MB4XDTEzMTEyOTEwNDgyN1oXDTMz
-MTEyOTEwNDgyN1owFzEVMBMGA1UEAxMMaWRwLnVuaXBnLml0MIIBIjANBgkqhkiG
-9w0BAQEFAAOCAQ8AMIIBCgKCAQEArcWMYBTfLliKg2yiUOuJphQVPDuzFh8iAzmB
-N5rs+B9Y841AvxgC2K12IogTLt2oeX5qv2hvyoip2q3XBY8aHo4xwjTW0UmgZ4Td
-dTA1ImOUq61mUYucYemfng+wO2rKpDOaOuwjOOJ4ZwYly0f4MenKDkGxmv/X5vFQ
-mNc5EeC4Zllkvoss95OuE8oQ/xxA+3xsAT6zhjadsHlTrxHfkWBDTbeNhupAbqD0
-JB84CfVNaOrmD/haNzn5lfktKb+aDwac+wSpl/P2wxa2F5ZkTLJeRF6WK0z4S6Wb
-IaaLbrwIXCWnZnQoWY6mFKBaK2hAB8P3emlpsve6cl5QC7TnqwIDAQABo18wXTA8
-BgNVHREENTAzggxpZHAudW5pcGcuaXSGI2h0dHBzOi8vaWRwLnVuaXBnLml0L2lk
-cC9zaGliYm9sZXRoMB0GA1UdDgQWBBRlnQD+3BGocWcSXr2HfL3Pm+HSjTANBgkq
-hkiG9w0BAQUFAAOCAQEAF8seek5DbzQnVsPhRzkzsl367Q6gnCiUWJR4x+KwgDLb
-yC/1F9x62DxiM1HqN21K2IhhJuiBEgEH2vfBBL9XS4U12gCnjOeOrVq4Sn1n0y0n
-Mtr1n/F38kdTww7elicK1c5VfJzNW92SPZ0WDeqx6dsHtCLr0cEbe2m37ObmbP7m
-i+4ZUJg7ph20zCfmZuqz9U7rd2Cextu267R6HGTb7j44QyqyR/HLmGcisZuA8F14
-NESI9h/L+O7VkKo6jKvBZhUuOxNrc/NvUToO5BaKJjtdP0kHDKKgKHpuE5FHSeGr
-a3btFASB68LjOF7z6SBM9h7F+NMDYLzCDuf6qHqMkg==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.unipg.it:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.unipg.it:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.unipg.it/idp/profile/SAML2/Redirect/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.unipg.it/idp/profile/SAML2/POST/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.unipg.it: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.unipg.it/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.unipg.it/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.unipg.it/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.unipg.it/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">unipg.it</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDGzCCAgOgAwIBAgIUbtCA5KDFFzAdtSTGPwrF8RKSWf8wDQYJKoZIhvcNAQEF
-BQAwFzEVMBMGA1UEAxMMaWRwLnVuaXBnLml0MB4XDTEzMTEyOTEwNDgyN1oXDTMz
-MTEyOTEwNDgyN1owFzEVMBMGA1UEAxMMaWRwLnVuaXBnLml0MIIBIjANBgkqhkiG
-9w0BAQEFAAOCAQ8AMIIBCgKCAQEArcWMYBTfLliKg2yiUOuJphQVPDuzFh8iAzmB
-N5rs+B9Y841AvxgC2K12IogTLt2oeX5qv2hvyoip2q3XBY8aHo4xwjTW0UmgZ4Td
-dTA1ImOUq61mUYucYemfng+wO2rKpDOaOuwjOOJ4ZwYly0f4MenKDkGxmv/X5vFQ
-mNc5EeC4Zllkvoss95OuE8oQ/xxA+3xsAT6zhjadsHlTrxHfkWBDTbeNhupAbqD0
-JB84CfVNaOrmD/haNzn5lfktKb+aDwac+wSpl/P2wxa2F5ZkTLJeRF6WK0z4S6Wb
-IaaLbrwIXCWnZnQoWY6mFKBaK2hAB8P3emlpsve6cl5QC7TnqwIDAQABo18wXTA8
-BgNVHREENTAzggxpZHAudW5pcGcuaXSGI2h0dHBzOi8vaWRwLnVuaXBnLml0L2lk
-cC9zaGliYm9sZXRoMB0GA1UdDgQWBBRlnQD+3BGocWcSXr2HfL3Pm+HSjTANBgkq
-hkiG9w0BAQUFAAOCAQEAF8seek5DbzQnVsPhRzkzsl367Q6gnCiUWJR4x+KwgDLb
-yC/1F9x62DxiM1HqN21K2IhhJuiBEgEH2vfBBL9XS4U12gCnjOeOrVq4Sn1n0y0n
-Mtr1n/F38kdTww7elicK1c5VfJzNW92SPZ0WDeqx6dsHtCLr0cEbe2m37ObmbP7m
-i+4ZUJg7ph20zCfmZuqz9U7rd2Cextu267R6HGTb7j44QyqyR/HLmGcisZuA8F14
-NESI9h/L+O7VkKo6jKvBZhUuOxNrc/NvUToO5BaKJjtdP0kHDKKgKHpuE5FHSeGr
-a3btFASB68LjOF7z6SBM9h7F+NMDYLzCDuf6qHqMkg==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.unipg.it:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.unipg.it: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="it">Università degli studi di Perugia</OrganizationName>
-    <OrganizationName xml:lang="en">University of Perugia</OrganizationName>
-    <OrganizationDisplayName xml:lang="it">Università degli studi di Perugia</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">University of Perugia</OrganizationDisplayName>
-    <OrganizationURL xml:lang="it">http://www.unipg.it</OrganizationURL>
-    <OrganizationURL xml:lang="en">http://www.unipg.it/en</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Supporto IDEM</GivenName>
-    <EmailAddress>servizio.idem@unipg.it</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.unipi.it-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.unipi.it-idp-shibboleth.xml
deleted file mode 100644
index d175da4b..00000000
--- a/swamid-interfederations-2.0/idp.unipi.it-idp-shibboleth.xml
+++ /dev/null
@@ -1,114 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" entityID="https://idp.unipi.it/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2011-11-01T15:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</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">unipi.it</shibmd:Scope>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="it">Università degli Studi di Pisa</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">University of Pisa</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Identity Provider for University of Pisa users</mdui:Description>
-        <mdui:Description xml:lang="it">Identity Provider per gli utenti dell'Universita' degli Studi di Pisa</mdui:Description>
-        <mdui:InformationURL xml:lang="it">https://idp.unipi.it/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">https://idp.unipi.it/</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="it">https://idp.unipi.it/privacy_it.html</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://idp.unipi.it/privacy_en.html</mdui:PrivacyStatementURL>
-        <mdui:Logo height="82" width="80">https://idp.unipi.it/logos/cherubino_80x80.png</mdui:Logo>
-        <mdui:Logo height="16" width="16">https://idp.unipi.it/logos/cherubino_16x16.png</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDHDCCAgSgAwIBAgIVANpHH4cWOn6yEYz2lRJ3vuZn9emLMA0GCSqGSIb3DQEB
-BQUAMBcxFTATBgNVBAMTDGlkcC51bmlwaS5pdDAeFw0xMTAzMTAxMzM4MjRaFw0z
-MTAzMTAxMzM4MjRaMBcxFTATBgNVBAMTDGlkcC51bmlwaS5pdDCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBAIxD1yQuyQ1P7wVjslFUKXVAtWQ2Oe9h7vVO
-zGVo+08dZ1RFoS9e4wtMj3UOme7VwxKdvlkzp3B0sSJS5FqZ7oMf3Wi0SZKbldew
-zvO/ToeJLjCq4oQBXmi7RePwHZ2GEmyzk7JTujtnBrY6vjfIB+AwviT3y13OHCqB
-T1XCi8bNsAoviDjyN/TKG/AU1pJFc5NWFLRy1YKC+5FlJCh/Kr+uC/KVdUhn40Wm
-cAjLfTATK+Y1RbVb4eHF6vJOOBsTQqvat4heBmpBnuyY06ngU/dZp6Te3BCPMSm2
-6PQnYF8uf9Ftf5U++J32DJIRKimN8N3y0sVK8xsaIUbmAfkT6gMCAwEAAaNfMF0w
-PAYDVR0RBDUwM4IMaWRwLnVuaXBpLml0hiNodHRwczovL2lkcC51bmlwaS5pdC9p
-ZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUuVwagCJNNlDEGjXsYBV07TH67W4wDQYJ
-KoZIhvcNAQEFBQADggEBACVqW+MNuwIyvc4ut3mhAt/TBD5HOFO7kPaylsaTwIe6
-hBgb6H9cEMHQAmgNFITHjzLjDiM5dag9dWqdDvHLoINgKEKgBSN8/tEJoh7qI60m
-Pv7PNEN3Jolwm8YeB0dite8aPioPvw4kReGAQnmkvDX4q809p3SRBOI9SCM4Rgwu
-xZq2gW4a+MiO6qdJ/MQi/3526//S2wreCvVijqYj68zo+NEN/3vevH/r9aWLZYsI
-VPU5U8UPwrVbbpGR6yUiilBrLvdHfaXWNOTnY7XBdMBms0JZEYGRiyUmQ6j4Pi/H
-23jC2wFN8qTFa4MKNluOJFOvXzgSY5iS1t6g0hrslao=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.unipi.it:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.unipi.it: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.unipi.it/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.unipi.it/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.unipi.it/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.unipi.it/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">unipi.it</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDHDCCAgSgAwIBAgIVANpHH4cWOn6yEYz2lRJ3vuZn9emLMA0GCSqGSIb3DQEB
-BQUAMBcxFTATBgNVBAMTDGlkcC51bmlwaS5pdDAeFw0xMTAzMTAxMzM4MjRaFw0z
-MTAzMTAxMzM4MjRaMBcxFTATBgNVBAMTDGlkcC51bmlwaS5pdDCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBAIxD1yQuyQ1P7wVjslFUKXVAtWQ2Oe9h7vVO
-zGVo+08dZ1RFoS9e4wtMj3UOme7VwxKdvlkzp3B0sSJS5FqZ7oMf3Wi0SZKbldew
-zvO/ToeJLjCq4oQBXmi7RePwHZ2GEmyzk7JTujtnBrY6vjfIB+AwviT3y13OHCqB
-T1XCi8bNsAoviDjyN/TKG/AU1pJFc5NWFLRy1YKC+5FlJCh/Kr+uC/KVdUhn40Wm
-cAjLfTATK+Y1RbVb4eHF6vJOOBsTQqvat4heBmpBnuyY06ngU/dZp6Te3BCPMSm2
-6PQnYF8uf9Ftf5U++J32DJIRKimN8N3y0sVK8xsaIUbmAfkT6gMCAwEAAaNfMF0w
-PAYDVR0RBDUwM4IMaWRwLnVuaXBpLml0hiNodHRwczovL2lkcC51bmlwaS5pdC9p
-ZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUuVwagCJNNlDEGjXsYBV07TH67W4wDQYJ
-KoZIhvcNAQEFBQADggEBACVqW+MNuwIyvc4ut3mhAt/TBD5HOFO7kPaylsaTwIe6
-hBgb6H9cEMHQAmgNFITHjzLjDiM5dag9dWqdDvHLoINgKEKgBSN8/tEJoh7qI60m
-Pv7PNEN3Jolwm8YeB0dite8aPioPvw4kReGAQnmkvDX4q809p3SRBOI9SCM4Rgwu
-xZq2gW4a+MiO6qdJ/MQi/3526//S2wreCvVijqYj68zo+NEN/3vevH/r9aWLZYsI
-VPU5U8UPwrVbbpGR6yUiilBrLvdHfaXWNOTnY7XBdMBms0JZEYGRiyUmQ6j4Pi/H
-23jC2wFN8qTFa4MKNluOJFOvXzgSY5iS1t6g0hrslao=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.unipi.it:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.unipi.it: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="it">Università degli Studi di Pisa</OrganizationName>
-    <OrganizationName xml:lang="en">University of Pisa</OrganizationName>
-    <OrganizationDisplayName xml:lang="it">Università di Pisa</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">University of Pisa</OrganizationDisplayName>
-    <OrganizationURL xml:lang="it">http://www.unipi.it</OrganizationURL>
-    <OrganizationURL xml:lang="en">http://www.unipi.it/english</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Technical Support</SurName>
-    <EmailAddress>idem@unipi.it</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="support">
-    <GivenName>Samuele</GivenName>
-    <SurName>Tognini</SurName>
-    <EmailAddress>samuele.tognini@unipi.it</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="support">
-    <GivenName>Davide</GivenName>
-    <SurName>Vaghetti</SurName>
-    <EmailAddress>davide.vaghetti@unipi.it</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.unipi.it.xml b/swamid-interfederations-2.0/idp.unipi.it.xml
deleted file mode 100644
index d175da4b..00000000
--- a/swamid-interfederations-2.0/idp.unipi.it.xml
+++ /dev/null
@@ -1,114 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" entityID="https://idp.unipi.it/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2011-11-01T15:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</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">unipi.it</shibmd:Scope>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="it">Università degli Studi di Pisa</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">University of Pisa</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Identity Provider for University of Pisa users</mdui:Description>
-        <mdui:Description xml:lang="it">Identity Provider per gli utenti dell'Universita' degli Studi di Pisa</mdui:Description>
-        <mdui:InformationURL xml:lang="it">https://idp.unipi.it/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">https://idp.unipi.it/</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="it">https://idp.unipi.it/privacy_it.html</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://idp.unipi.it/privacy_en.html</mdui:PrivacyStatementURL>
-        <mdui:Logo height="82" width="80">https://idp.unipi.it/logos/cherubino_80x80.png</mdui:Logo>
-        <mdui:Logo height="16" width="16">https://idp.unipi.it/logos/cherubino_16x16.png</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDHDCCAgSgAwIBAgIVANpHH4cWOn6yEYz2lRJ3vuZn9emLMA0GCSqGSIb3DQEB
-BQUAMBcxFTATBgNVBAMTDGlkcC51bmlwaS5pdDAeFw0xMTAzMTAxMzM4MjRaFw0z
-MTAzMTAxMzM4MjRaMBcxFTATBgNVBAMTDGlkcC51bmlwaS5pdDCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBAIxD1yQuyQ1P7wVjslFUKXVAtWQ2Oe9h7vVO
-zGVo+08dZ1RFoS9e4wtMj3UOme7VwxKdvlkzp3B0sSJS5FqZ7oMf3Wi0SZKbldew
-zvO/ToeJLjCq4oQBXmi7RePwHZ2GEmyzk7JTujtnBrY6vjfIB+AwviT3y13OHCqB
-T1XCi8bNsAoviDjyN/TKG/AU1pJFc5NWFLRy1YKC+5FlJCh/Kr+uC/KVdUhn40Wm
-cAjLfTATK+Y1RbVb4eHF6vJOOBsTQqvat4heBmpBnuyY06ngU/dZp6Te3BCPMSm2
-6PQnYF8uf9Ftf5U++J32DJIRKimN8N3y0sVK8xsaIUbmAfkT6gMCAwEAAaNfMF0w
-PAYDVR0RBDUwM4IMaWRwLnVuaXBpLml0hiNodHRwczovL2lkcC51bmlwaS5pdC9p
-ZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUuVwagCJNNlDEGjXsYBV07TH67W4wDQYJ
-KoZIhvcNAQEFBQADggEBACVqW+MNuwIyvc4ut3mhAt/TBD5HOFO7kPaylsaTwIe6
-hBgb6H9cEMHQAmgNFITHjzLjDiM5dag9dWqdDvHLoINgKEKgBSN8/tEJoh7qI60m
-Pv7PNEN3Jolwm8YeB0dite8aPioPvw4kReGAQnmkvDX4q809p3SRBOI9SCM4Rgwu
-xZq2gW4a+MiO6qdJ/MQi/3526//S2wreCvVijqYj68zo+NEN/3vevH/r9aWLZYsI
-VPU5U8UPwrVbbpGR6yUiilBrLvdHfaXWNOTnY7XBdMBms0JZEYGRiyUmQ6j4Pi/H
-23jC2wFN8qTFa4MKNluOJFOvXzgSY5iS1t6g0hrslao=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.unipi.it:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.unipi.it: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.unipi.it/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.unipi.it/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.unipi.it/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.unipi.it/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">unipi.it</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDHDCCAgSgAwIBAgIVANpHH4cWOn6yEYz2lRJ3vuZn9emLMA0GCSqGSIb3DQEB
-BQUAMBcxFTATBgNVBAMTDGlkcC51bmlwaS5pdDAeFw0xMTAzMTAxMzM4MjRaFw0z
-MTAzMTAxMzM4MjRaMBcxFTATBgNVBAMTDGlkcC51bmlwaS5pdDCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBAIxD1yQuyQ1P7wVjslFUKXVAtWQ2Oe9h7vVO
-zGVo+08dZ1RFoS9e4wtMj3UOme7VwxKdvlkzp3B0sSJS5FqZ7oMf3Wi0SZKbldew
-zvO/ToeJLjCq4oQBXmi7RePwHZ2GEmyzk7JTujtnBrY6vjfIB+AwviT3y13OHCqB
-T1XCi8bNsAoviDjyN/TKG/AU1pJFc5NWFLRy1YKC+5FlJCh/Kr+uC/KVdUhn40Wm
-cAjLfTATK+Y1RbVb4eHF6vJOOBsTQqvat4heBmpBnuyY06ngU/dZp6Te3BCPMSm2
-6PQnYF8uf9Ftf5U++J32DJIRKimN8N3y0sVK8xsaIUbmAfkT6gMCAwEAAaNfMF0w
-PAYDVR0RBDUwM4IMaWRwLnVuaXBpLml0hiNodHRwczovL2lkcC51bmlwaS5pdC9p
-ZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUuVwagCJNNlDEGjXsYBV07TH67W4wDQYJ
-KoZIhvcNAQEFBQADggEBACVqW+MNuwIyvc4ut3mhAt/TBD5HOFO7kPaylsaTwIe6
-hBgb6H9cEMHQAmgNFITHjzLjDiM5dag9dWqdDvHLoINgKEKgBSN8/tEJoh7qI60m
-Pv7PNEN3Jolwm8YeB0dite8aPioPvw4kReGAQnmkvDX4q809p3SRBOI9SCM4Rgwu
-xZq2gW4a+MiO6qdJ/MQi/3526//S2wreCvVijqYj68zo+NEN/3vevH/r9aWLZYsI
-VPU5U8UPwrVbbpGR6yUiilBrLvdHfaXWNOTnY7XBdMBms0JZEYGRiyUmQ6j4Pi/H
-23jC2wFN8qTFa4MKNluOJFOvXzgSY5iS1t6g0hrslao=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.unipi.it:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.unipi.it: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="it">Università degli Studi di Pisa</OrganizationName>
-    <OrganizationName xml:lang="en">University of Pisa</OrganizationName>
-    <OrganizationDisplayName xml:lang="it">Università di Pisa</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">University of Pisa</OrganizationDisplayName>
-    <OrganizationURL xml:lang="it">http://www.unipi.it</OrganizationURL>
-    <OrganizationURL xml:lang="en">http://www.unipi.it/english</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Technical Support</SurName>
-    <EmailAddress>idem@unipi.it</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="support">
-    <GivenName>Samuele</GivenName>
-    <SurName>Tognini</SurName>
-    <EmailAddress>samuele.tognini@unipi.it</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="support">
-    <GivenName>Davide</GivenName>
-    <SurName>Vaghetti</SurName>
-    <EmailAddress>davide.vaghetti@unipi.it</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.uniroma3.it-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.uniroma3.it-idp-shibboleth.xml
deleted file mode 100644
index 1503b7b8..00000000
--- a/swamid-interfederations-2.0/idp.uniroma3.it-idp-shibboleth.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:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" entityID="https://idp.uniroma3.it/idp/shibboleth">
-  <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>
-  <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">uniroma3.it</shibmd:Scope>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="en">University Roma TRE IdP</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="it">Università di Roma Tre IdP</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Identity Provider for Roma TRE members</mdui:Description>
-        <mdui:Description xml:lang="it">Identity Provider per gli utenti di Roma Tre</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.idem.uniroma3.it/EN</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="it">http://www.idem.uniroma3.it/IT</mdui:InformationURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIEhDCCA2ygAwIBAgIRAJJ4jZUD61jOwDV9E8upZlQwDQYJKoZIhvcNAQEFBQAw
-NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-IFNTTCBDQTAeFw0xMzAyMjgwMDAwMDBaFw0xNjAyMjgyMzU5NTlaMD0xITAfBgNV
-BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEYMBYGA1UEAxMPaWRwLnVuaXJv
-bWEzLml0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA4yxN30NCjUmA
-TmyysmUMGSKilVFkTAPXxVod1FC1hZONeLGsZBNJ0I14IO5xf4L/W5+UW3qyb/f2
-8kJP908QSrMAvdEH5yl4nHTz/MLuZEIBrpTcYKs3sPPkvDlyFWmcdP0hPziETbSB
-CtOggV7FrRyo0r6rK1IOCm1lDRLwLliCea/XNJC4RktQGMywyn5W0TjootD/90wc
-k+cMKA1i4ldoyHRBcfOfrvxjPdCGZy++WIVVYkyMzOVulB9sNKfE/t81H1LZcaAN
-SINPbYPxAM8zlUOUuozUBDVX8XlKE7mbiouq6iAvCNKvE/zh7067Das9i0sydRtN
-x+isE34u/wIDAQABo4IBhDCCAYAwHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsrN1dH
-6pDjue0wHQYDVR0OBBYEFN7YUQ+ImDerq41pkHNNAD1GWoH7MA4GA1UdDwEB/wQE
-AwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcD
-AjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNVHR8EMzAx
-MC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNy
-bDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNzLnRl
-cmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8vb2Nz
-cC50Y3MudGVyZW5hLm9yZzAyBgNVHREEKzApgg9pZHAudW5pcm9tYTMuaXSCFnNo
-aWJib2xldGgudW5pcm9tYTMuaXQwDQYJKoZIhvcNAQEFBQADggEBACYMhQCWzVsh
-G6hbEbDKUvYLRAtc6OUZijZuj3aFtqqYyJOEBSjuSXJ6QMkLgL5wbcI4mI9FLLUM
-Ae7kAd49N7g9r++YnZz0EhTgdCJGfd+3ZmM9XjD1LUQgn3qJqW8qWRGjclHx/oAb
-bRwFd614gGCsWC6s0xtZmesaytSBdzcm5RjnofxPtEHWjQbFhUGxbtFHS6MHmjzT
-WgJ2RWgB09FrRjx/SB7UtFR93WaYSKgNq3CxtKnK5CTxUkd/WidcH6h07anBz66R
-wv+Hdi7+aibTF9pRMYHhYxatMrnPZpIfbX0vxRiaL3NLfopA7UUKpTwDM7Z3DM/B
-cTXFyKPFTrE=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.uniroma3.it:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.uniroma3.it: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.uniroma3.it/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.uniroma3.it/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.uniroma3.it/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.uniroma3.it/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">uniroma3.it</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIEhDCCA2ygAwIBAgIRAJJ4jZUD61jOwDV9E8upZlQwDQYJKoZIhvcNAQEFBQAw
-NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-IFNTTCBDQTAeFw0xMzAyMjgwMDAwMDBaFw0xNjAyMjgyMzU5NTlaMD0xITAfBgNV
-BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEYMBYGA1UEAxMPaWRwLnVuaXJv
-bWEzLml0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA4yxN30NCjUmA
-TmyysmUMGSKilVFkTAPXxVod1FC1hZONeLGsZBNJ0I14IO5xf4L/W5+UW3qyb/f2
-8kJP908QSrMAvdEH5yl4nHTz/MLuZEIBrpTcYKs3sPPkvDlyFWmcdP0hPziETbSB
-CtOggV7FrRyo0r6rK1IOCm1lDRLwLliCea/XNJC4RktQGMywyn5W0TjootD/90wc
-k+cMKA1i4ldoyHRBcfOfrvxjPdCGZy++WIVVYkyMzOVulB9sNKfE/t81H1LZcaAN
-SINPbYPxAM8zlUOUuozUBDVX8XlKE7mbiouq6iAvCNKvE/zh7067Das9i0sydRtN
-x+isE34u/wIDAQABo4IBhDCCAYAwHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsrN1dH
-6pDjue0wHQYDVR0OBBYEFN7YUQ+ImDerq41pkHNNAD1GWoH7MA4GA1UdDwEB/wQE
-AwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcD
-AjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNVHR8EMzAx
-MC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNy
-bDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNzLnRl
-cmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8vb2Nz
-cC50Y3MudGVyZW5hLm9yZzAyBgNVHREEKzApgg9pZHAudW5pcm9tYTMuaXSCFnNo
-aWJib2xldGgudW5pcm9tYTMuaXQwDQYJKoZIhvcNAQEFBQADggEBACYMhQCWzVsh
-G6hbEbDKUvYLRAtc6OUZijZuj3aFtqqYyJOEBSjuSXJ6QMkLgL5wbcI4mI9FLLUM
-Ae7kAd49N7g9r++YnZz0EhTgdCJGfd+3ZmM9XjD1LUQgn3qJqW8qWRGjclHx/oAb
-bRwFd614gGCsWC6s0xtZmesaytSBdzcm5RjnofxPtEHWjQbFhUGxbtFHS6MHmjzT
-WgJ2RWgB09FrRjx/SB7UtFR93WaYSKgNq3CxtKnK5CTxUkd/WidcH6h07anBz66R
-wv+Hdi7+aibTF9pRMYHhYxatMrnPZpIfbX0vxRiaL3NLfopA7UUKpTwDM7Z3DM/B
-cTXFyKPFTrE=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.uniroma3.it:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.uniroma3.it: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">University of Roma TRE</OrganizationName>
-    <OrganizationName xml:lang="it">Università di Roma TRE</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Roma TRE</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="it">Università di Roma TRE</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.uniroma3.it/en2/</OrganizationURL>
-    <OrganizationURL xml:lang="it">http://www.uniroma3.it/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Technical Support</SurName>
-    <EmailAddress>idem@uniroma3.it</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.uniroma3.it.xml b/swamid-interfederations-2.0/idp.uniroma3.it.xml
deleted file mode 100644
index 1503b7b8..00000000
--- a/swamid-interfederations-2.0/idp.uniroma3.it.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:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" entityID="https://idp.uniroma3.it/idp/shibboleth">
-  <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>
-  <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">uniroma3.it</shibmd:Scope>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="en">University Roma TRE IdP</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="it">Università di Roma Tre IdP</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Identity Provider for Roma TRE members</mdui:Description>
-        <mdui:Description xml:lang="it">Identity Provider per gli utenti di Roma Tre</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.idem.uniroma3.it/EN</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="it">http://www.idem.uniroma3.it/IT</mdui:InformationURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIEhDCCA2ygAwIBAgIRAJJ4jZUD61jOwDV9E8upZlQwDQYJKoZIhvcNAQEFBQAw
-NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-IFNTTCBDQTAeFw0xMzAyMjgwMDAwMDBaFw0xNjAyMjgyMzU5NTlaMD0xITAfBgNV
-BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEYMBYGA1UEAxMPaWRwLnVuaXJv
-bWEzLml0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA4yxN30NCjUmA
-TmyysmUMGSKilVFkTAPXxVod1FC1hZONeLGsZBNJ0I14IO5xf4L/W5+UW3qyb/f2
-8kJP908QSrMAvdEH5yl4nHTz/MLuZEIBrpTcYKs3sPPkvDlyFWmcdP0hPziETbSB
-CtOggV7FrRyo0r6rK1IOCm1lDRLwLliCea/XNJC4RktQGMywyn5W0TjootD/90wc
-k+cMKA1i4ldoyHRBcfOfrvxjPdCGZy++WIVVYkyMzOVulB9sNKfE/t81H1LZcaAN
-SINPbYPxAM8zlUOUuozUBDVX8XlKE7mbiouq6iAvCNKvE/zh7067Das9i0sydRtN
-x+isE34u/wIDAQABo4IBhDCCAYAwHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsrN1dH
-6pDjue0wHQYDVR0OBBYEFN7YUQ+ImDerq41pkHNNAD1GWoH7MA4GA1UdDwEB/wQE
-AwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcD
-AjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNVHR8EMzAx
-MC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNy
-bDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNzLnRl
-cmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8vb2Nz
-cC50Y3MudGVyZW5hLm9yZzAyBgNVHREEKzApgg9pZHAudW5pcm9tYTMuaXSCFnNo
-aWJib2xldGgudW5pcm9tYTMuaXQwDQYJKoZIhvcNAQEFBQADggEBACYMhQCWzVsh
-G6hbEbDKUvYLRAtc6OUZijZuj3aFtqqYyJOEBSjuSXJ6QMkLgL5wbcI4mI9FLLUM
-Ae7kAd49N7g9r++YnZz0EhTgdCJGfd+3ZmM9XjD1LUQgn3qJqW8qWRGjclHx/oAb
-bRwFd614gGCsWC6s0xtZmesaytSBdzcm5RjnofxPtEHWjQbFhUGxbtFHS6MHmjzT
-WgJ2RWgB09FrRjx/SB7UtFR93WaYSKgNq3CxtKnK5CTxUkd/WidcH6h07anBz66R
-wv+Hdi7+aibTF9pRMYHhYxatMrnPZpIfbX0vxRiaL3NLfopA7UUKpTwDM7Z3DM/B
-cTXFyKPFTrE=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.uniroma3.it:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.uniroma3.it: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.uniroma3.it/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.uniroma3.it/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.uniroma3.it/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.uniroma3.it/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">uniroma3.it</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIEhDCCA2ygAwIBAgIRAJJ4jZUD61jOwDV9E8upZlQwDQYJKoZIhvcNAQEFBQAw
-NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-IFNTTCBDQTAeFw0xMzAyMjgwMDAwMDBaFw0xNjAyMjgyMzU5NTlaMD0xITAfBgNV
-BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEYMBYGA1UEAxMPaWRwLnVuaXJv
-bWEzLml0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA4yxN30NCjUmA
-TmyysmUMGSKilVFkTAPXxVod1FC1hZONeLGsZBNJ0I14IO5xf4L/W5+UW3qyb/f2
-8kJP908QSrMAvdEH5yl4nHTz/MLuZEIBrpTcYKs3sPPkvDlyFWmcdP0hPziETbSB
-CtOggV7FrRyo0r6rK1IOCm1lDRLwLliCea/XNJC4RktQGMywyn5W0TjootD/90wc
-k+cMKA1i4ldoyHRBcfOfrvxjPdCGZy++WIVVYkyMzOVulB9sNKfE/t81H1LZcaAN
-SINPbYPxAM8zlUOUuozUBDVX8XlKE7mbiouq6iAvCNKvE/zh7067Das9i0sydRtN
-x+isE34u/wIDAQABo4IBhDCCAYAwHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsrN1dH
-6pDjue0wHQYDVR0OBBYEFN7YUQ+ImDerq41pkHNNAD1GWoH7MA4GA1UdDwEB/wQE
-AwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcD
-AjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNVHR8EMzAx
-MC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNy
-bDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNzLnRl
-cmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8vb2Nz
-cC50Y3MudGVyZW5hLm9yZzAyBgNVHREEKzApgg9pZHAudW5pcm9tYTMuaXSCFnNo
-aWJib2xldGgudW5pcm9tYTMuaXQwDQYJKoZIhvcNAQEFBQADggEBACYMhQCWzVsh
-G6hbEbDKUvYLRAtc6OUZijZuj3aFtqqYyJOEBSjuSXJ6QMkLgL5wbcI4mI9FLLUM
-Ae7kAd49N7g9r++YnZz0EhTgdCJGfd+3ZmM9XjD1LUQgn3qJqW8qWRGjclHx/oAb
-bRwFd614gGCsWC6s0xtZmesaytSBdzcm5RjnofxPtEHWjQbFhUGxbtFHS6MHmjzT
-WgJ2RWgB09FrRjx/SB7UtFR93WaYSKgNq3CxtKnK5CTxUkd/WidcH6h07anBz66R
-wv+Hdi7+aibTF9pRMYHhYxatMrnPZpIfbX0vxRiaL3NLfopA7UUKpTwDM7Z3DM/B
-cTXFyKPFTrE=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.uniroma3.it:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.uniroma3.it: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">University of Roma TRE</OrganizationName>
-    <OrganizationName xml:lang="it">Università di Roma TRE</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Roma TRE</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="it">Università di Roma TRE</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.uniroma3.it/en2/</OrganizationURL>
-    <OrganizationURL xml:lang="it">http://www.uniroma3.it/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Technical Support</SurName>
-    <EmailAddress>idem@uniroma3.it</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.unistra.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.unistra.fr-idp-shibboleth.xml
deleted file mode 100644
index 002d41ae..00000000
--- a/swamid-interfederations-2.0/idp.unistra.fr-idp-shibboleth.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://idp.unistra.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2010-11-30T02:21:54Z">
-      <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">unistra.fr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">u-strasbg.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">Université de Strasbourg</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDJDCCAgygAwIBAgIVAJL1uSgdsDY7/9L6gFGKRCNK7RlQMA0GCSqGSIb3DQEB
-BQUAMBkxFzAVBgNVBAMTDmlkcC51bmlzdHJhLmZyMB4XDTEwMTEzMDAxMDc0NFoX
-DTMwMTEzMDAxMDc0NFowGTEXMBUGA1UEAxMOaWRwLnVuaXN0cmEuZnIwggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCfZvr54LdhidtcpIinb+VVc0nvNi7G
-RzVhLGmaWBEe2l/imU0NK+p8Sci4O06Dl17fSfEYh/ymT/X8fzs0ZBL67kmRjKW/
-4LrdaKPISuuBdAQu1ecMw6o5nHvPm8lChQs7+FPuKyHEOdGXU6YJdYcGVZWHGvm3
-YK0qZ5HocND7LYGhcTob083wQPtUm8TVisZSBBw/aY4uxQ3aPHqp20vLVlIWpyQH
-GBVusUsL30y4phRpvGMOhbBUjowba3Ig6cLGxhjmx2z42FoG95nF6NDRyPImp6cP
-dY3MFGFGOHb7o0eTkp2VpaCNwLDKUZq7IxxEg51BjAISYr4RlclDRlC1AgMBAAGj
-YzBhMEAGA1UdEQQ5MDeCDmlkcC51bmlzdHJhLmZyhiVodHRwczovL2lkcC51bmlz
-dHJhLmZyL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBTwSTX+NtpwVFWBJtPaXA23
-OEBp1jANBgkqhkiG9w0BAQUFAAOCAQEAhb+7SoxpdMH42J5nFMEXwNAxpPWKVjPq
-W5zgM3a3W3NSrL6R4j149IMn8YC+WrrfUnWiPYMO0+tEzTxvmL/SQRnV2kQumXN9
-Q32B6gTG1pinL1lcxrkO0FI1zcj/adE+2LkrTy3krQu2hkpO2CRYqE+ddzRNWdXd
-Z6Ym1zSD1ELYVcd6rOjyMA4yXW+8EM9K3P83Xy+o3SkIKd9tZzGv0qfy3CPW+v7V
-2Onsdu1A6uvdXVKl8r10oLIRXNp3LzhqFwhyiFzcRmgfOStZPHXzxSM/N9T8d+We
-gN8WbEdGuWT0j11MYdJkWDRArMdtVtI8aHXkmMCvAuttFvJib8Nzog==
-					    </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://idp.unistra.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.unistra.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.unistra.fr/idp/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Université de Strasbourg</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Université de Strasbourg</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Jean Benoit</SurName>
-    <EmailAddress>jean@unistra.fr</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <SurName>Eric Decornod</SurName>
-    <EmailAddress>decornod@unistra.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.unistra.fr.xml b/swamid-interfederations-2.0/idp.unistra.fr.xml
deleted file mode 100644
index 002d41ae..00000000
--- a/swamid-interfederations-2.0/idp.unistra.fr.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://idp.unistra.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2010-11-30T02:21:54Z">
-      <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">unistra.fr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">u-strasbg.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">Université de Strasbourg</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDJDCCAgygAwIBAgIVAJL1uSgdsDY7/9L6gFGKRCNK7RlQMA0GCSqGSIb3DQEB
-BQUAMBkxFzAVBgNVBAMTDmlkcC51bmlzdHJhLmZyMB4XDTEwMTEzMDAxMDc0NFoX
-DTMwMTEzMDAxMDc0NFowGTEXMBUGA1UEAxMOaWRwLnVuaXN0cmEuZnIwggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCfZvr54LdhidtcpIinb+VVc0nvNi7G
-RzVhLGmaWBEe2l/imU0NK+p8Sci4O06Dl17fSfEYh/ymT/X8fzs0ZBL67kmRjKW/
-4LrdaKPISuuBdAQu1ecMw6o5nHvPm8lChQs7+FPuKyHEOdGXU6YJdYcGVZWHGvm3
-YK0qZ5HocND7LYGhcTob083wQPtUm8TVisZSBBw/aY4uxQ3aPHqp20vLVlIWpyQH
-GBVusUsL30y4phRpvGMOhbBUjowba3Ig6cLGxhjmx2z42FoG95nF6NDRyPImp6cP
-dY3MFGFGOHb7o0eTkp2VpaCNwLDKUZq7IxxEg51BjAISYr4RlclDRlC1AgMBAAGj
-YzBhMEAGA1UdEQQ5MDeCDmlkcC51bmlzdHJhLmZyhiVodHRwczovL2lkcC51bmlz
-dHJhLmZyL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBTwSTX+NtpwVFWBJtPaXA23
-OEBp1jANBgkqhkiG9w0BAQUFAAOCAQEAhb+7SoxpdMH42J5nFMEXwNAxpPWKVjPq
-W5zgM3a3W3NSrL6R4j149IMn8YC+WrrfUnWiPYMO0+tEzTxvmL/SQRnV2kQumXN9
-Q32B6gTG1pinL1lcxrkO0FI1zcj/adE+2LkrTy3krQu2hkpO2CRYqE+ddzRNWdXd
-Z6Ym1zSD1ELYVcd6rOjyMA4yXW+8EM9K3P83Xy+o3SkIKd9tZzGv0qfy3CPW+v7V
-2Onsdu1A6uvdXVKl8r10oLIRXNp3LzhqFwhyiFzcRmgfOStZPHXzxSM/N9T8d+We
-gN8WbEdGuWT0j11MYdJkWDRArMdtVtI8aHXkmMCvAuttFvJib8Nzog==
-					    </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://idp.unistra.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.unistra.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.unistra.fr/idp/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Université de Strasbourg</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Université de Strasbourg</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Jean Benoit</SurName>
-    <EmailAddress>jean@unistra.fr</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <SurName>Eric Decornod</SurName>
-    <EmailAddress>decornod@unistra.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.univ-ag.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.univ-ag.fr-idp-shibboleth.xml
deleted file mode 100644
index 06d071eb..00000000
--- a/swamid-interfederations-2.0/idp.univ-ag.fr-idp-shibboleth.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.univ-ag.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2012-10-25T15:08:43Z">
-      <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">univ-ag.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">Université des Antilles et de la Guyane</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDJDCCAgygAwIBAgIVAPFkF2BmO6RVikcivryW27wULvteMA0GCSqGSIb3DQEB
-BQUAMBkxFzAVBgNVBAMTDmlkcC51bml2LWFnLmZyMB4XDTEyMTAyMzE3MzIxMFoX
-DTMyMTAyMzE3MzIxMFowGTEXMBUGA1UEAxMOaWRwLnVuaXYtYWcuZnIwggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCyyPP8wKSxUpAuUcbFtn+p3mDRnybq
-+qU1qFwxF8J3v2RW63VhgFX+6eKUsULLv5hgDoqY5tsJbUZ0wVGDX+2w6CeurITl
-5amBB0oFuO6Ml7uiYD56w1WQOAYD8L9Nu7kA0XcOb8O4BXngVk19k1lUKlTVHxrQ
-4dRzMPfYuqLYxk1/g8/6Q4ULcBZvqqAlupcgJPmZMh5XPK4PJZYOVHVJhutLY5m9
-TDuo4Sor+BCOLew0aM38rUDTPGydculwZja1R4K8+BHLATq1SFCi4a6ETIpWhy5x
-SAOvoM+W1KyyXSk99QbfmaZVVUlkBTDlupctvegv2sXR42+copiHxcJtAgMBAAGj
-YzBhMEAGA1UdEQQ5MDeCDmlkcC51bml2LWFnLmZyhiVodHRwczovL2lkcC51bml2
-LWFnLmZyL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBTyUENeLeP0xMWsvdAWL29A
-S6V69jANBgkqhkiG9w0BAQUFAAOCAQEAcpTVb3RoQCDVNshZVyM1F0+3Jd4u2gAF
-Ey2DVRfgXcWETmUy2dOO5ZZ+YJtwOi+txpwr1yCbPMrdNCdJxLvVkkFwf5rLVesL
-TIm7h5PeO2fs5rurRWXarWSQCinkV7xE1a3xOMPDooCkmBHSICwY5At5fwwUA74X
-EzGjS76Zk6gvDgTTtG15vQvaq31e1eHB7nCYe7zHuFObyujLpKHJHMrIW4Q8o18y
-NCDZWNuuZJO1dzUQrzyUXufytEqv1w1SGYWedTxxXIm+sQ3HaR4d3TDCmTw27pnr
-TZeKHGCI5BfQ0oQ0Mao+E/hZqbDzdp6KBUrALSf/R3JSDtmdnL+gvQ==
-					    </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://idp.univ-ag.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.univ-ag.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.univ-ag.fr/idp/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Université des Antilles et de la Guyane</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Université des Antilles et de la Guyane</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Robert BOLIN</SurName>
-    <EmailAddress>robert.bolin@martinique.univ-ag.fr</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <SurName>Patrick PLACIDE</SurName>
-    <EmailAddress>patrick.placide@martinique.univ-ag.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.univ-ag.fr.xml b/swamid-interfederations-2.0/idp.univ-ag.fr.xml
deleted file mode 100644
index 06d071eb..00000000
--- a/swamid-interfederations-2.0/idp.univ-ag.fr.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.univ-ag.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2012-10-25T15:08:43Z">
-      <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">univ-ag.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">Université des Antilles et de la Guyane</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDJDCCAgygAwIBAgIVAPFkF2BmO6RVikcivryW27wULvteMA0GCSqGSIb3DQEB
-BQUAMBkxFzAVBgNVBAMTDmlkcC51bml2LWFnLmZyMB4XDTEyMTAyMzE3MzIxMFoX
-DTMyMTAyMzE3MzIxMFowGTEXMBUGA1UEAxMOaWRwLnVuaXYtYWcuZnIwggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCyyPP8wKSxUpAuUcbFtn+p3mDRnybq
-+qU1qFwxF8J3v2RW63VhgFX+6eKUsULLv5hgDoqY5tsJbUZ0wVGDX+2w6CeurITl
-5amBB0oFuO6Ml7uiYD56w1WQOAYD8L9Nu7kA0XcOb8O4BXngVk19k1lUKlTVHxrQ
-4dRzMPfYuqLYxk1/g8/6Q4ULcBZvqqAlupcgJPmZMh5XPK4PJZYOVHVJhutLY5m9
-TDuo4Sor+BCOLew0aM38rUDTPGydculwZja1R4K8+BHLATq1SFCi4a6ETIpWhy5x
-SAOvoM+W1KyyXSk99QbfmaZVVUlkBTDlupctvegv2sXR42+copiHxcJtAgMBAAGj
-YzBhMEAGA1UdEQQ5MDeCDmlkcC51bml2LWFnLmZyhiVodHRwczovL2lkcC51bml2
-LWFnLmZyL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBTyUENeLeP0xMWsvdAWL29A
-S6V69jANBgkqhkiG9w0BAQUFAAOCAQEAcpTVb3RoQCDVNshZVyM1F0+3Jd4u2gAF
-Ey2DVRfgXcWETmUy2dOO5ZZ+YJtwOi+txpwr1yCbPMrdNCdJxLvVkkFwf5rLVesL
-TIm7h5PeO2fs5rurRWXarWSQCinkV7xE1a3xOMPDooCkmBHSICwY5At5fwwUA74X
-EzGjS76Zk6gvDgTTtG15vQvaq31e1eHB7nCYe7zHuFObyujLpKHJHMrIW4Q8o18y
-NCDZWNuuZJO1dzUQrzyUXufytEqv1w1SGYWedTxxXIm+sQ3HaR4d3TDCmTw27pnr
-TZeKHGCI5BfQ0oQ0Mao+E/hZqbDzdp6KBUrALSf/R3JSDtmdnL+gvQ==
-					    </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://idp.univ-ag.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.univ-ag.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.univ-ag.fr/idp/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Université des Antilles et de la Guyane</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Université des Antilles et de la Guyane</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Robert BOLIN</SurName>
-    <EmailAddress>robert.bolin@martinique.univ-ag.fr</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <SurName>Patrick PLACIDE</SurName>
-    <EmailAddress>patrick.placide@martinique.univ-ag.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.univ-amu.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.univ-amu.fr-idp-shibboleth.xml
deleted file mode 100644
index e9d456ed..00000000
--- a/swamid-interfederations-2.0/idp.univ-amu.fr-idp-shibboleth.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.univ-amu.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2012-04-16T08:27:18Z">
-      <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">univ-amu.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">Université d'Aix-Marseille</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDJzCCAg+gAwIBAgIULCzb5nQYuu/jKvNfhCenMAkGKm8wDQYJKoZIhvcNAQEF
-BQAwGjEYMBYGA1UEAxMPaWRwLnVuaXYtYW11LmZyMB4XDTEyMDQxMzE1MTIzM1oX
-DTMyMDQxMzE1MTIzM1owGjEYMBYGA1UEAxMPaWRwLnVuaXYtYW11LmZyMIIBIjAN
-BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAnIH5qfsDRJQDkVQ70lGQbkcAoT2g
-wCu7QruDZGG/Bk6qzCx8vNJh9rfAmrQ33GmsKOVQOxWIfImgdYgmZWsV52CPobHy
-rPsiE64INWyM/W/TEJP79GAQzGsiZ7xID6CfMbhVG83hNpWg3SxXyoh+B0/SVr/8
-IBNUtcVTe0d4Jjiv7ztHFwZXT2UBYxRJKU45V6y9Wss5RH7aAz9QVPK0K4f3r5pi
-+Y+dxiw7dEWHO5QEZqx/9gQayfatac5lzX03QBZr1me5EePFwQJ3eM9raUuS1cbi
-dUxFptkQHJWoUGImaFcTHsuny2G438sM4s+ao6CkE/8WIQYTEBu0jwfIZwIDAQAB
-o2UwYzBCBgNVHREEOzA5gg9pZHAudW5pdi1hbXUuZnKGJmh0dHBzOi8vaWRwLnVu
-aXYtYW11LmZyL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBQP7J5/7grId0BA/iS3
-EQAuh8HTUzANBgkqhkiG9w0BAQUFAAOCAQEAZT28dZUnmtUIuiob36b/jNzT/3dY
-iBZDHu3z1HMzFc6efhPhBuJ20SpLfH9oMBVDCUCktH9tv4VO5LJv0N02FL+r9uuo
-fbeNry2w9g78LM/z/0IWGtcdfEHnHA+6nYad1PEf0vv+K5v82l+atRSDoOR/s9dk
-m3A/gjFibKMSIIXDFvLncxiHYHLrhsrMFeG5HlWXx+pVCunuvo2nNk2uL1ZBWW0Z
-JRO79CP7W1ndIuM+8v1G7C1gjYqkO6rdEKdJArm7hqEMzjUdL60okDqsVX+IYFUX
-VmCmZvTACtUurXS0zocVZTUfQcTaSXkKLSKLU6TQQy4Wf/c9CfNalbv6Sw==
-					    </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://idp.univ-amu.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.univ-amu.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.univ-amu.fr/idp/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Université d'Aix-Marseille</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Université d'Aix-Marseille</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>LALOT Dominique</SurName>
-    <EmailAddress>dominique.lalot@univ-amu.fr</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <SurName>AIMAR Michel</SurName>
-    <EmailAddress>michel.aimar@univ-amu.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.univ-amu.fr.xml b/swamid-interfederations-2.0/idp.univ-amu.fr.xml
deleted file mode 100644
index e9d456ed..00000000
--- a/swamid-interfederations-2.0/idp.univ-amu.fr.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.univ-amu.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2012-04-16T08:27:18Z">
-      <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">univ-amu.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">Université d'Aix-Marseille</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDJzCCAg+gAwIBAgIULCzb5nQYuu/jKvNfhCenMAkGKm8wDQYJKoZIhvcNAQEF
-BQAwGjEYMBYGA1UEAxMPaWRwLnVuaXYtYW11LmZyMB4XDTEyMDQxMzE1MTIzM1oX
-DTMyMDQxMzE1MTIzM1owGjEYMBYGA1UEAxMPaWRwLnVuaXYtYW11LmZyMIIBIjAN
-BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAnIH5qfsDRJQDkVQ70lGQbkcAoT2g
-wCu7QruDZGG/Bk6qzCx8vNJh9rfAmrQ33GmsKOVQOxWIfImgdYgmZWsV52CPobHy
-rPsiE64INWyM/W/TEJP79GAQzGsiZ7xID6CfMbhVG83hNpWg3SxXyoh+B0/SVr/8
-IBNUtcVTe0d4Jjiv7ztHFwZXT2UBYxRJKU45V6y9Wss5RH7aAz9QVPK0K4f3r5pi
-+Y+dxiw7dEWHO5QEZqx/9gQayfatac5lzX03QBZr1me5EePFwQJ3eM9raUuS1cbi
-dUxFptkQHJWoUGImaFcTHsuny2G438sM4s+ao6CkE/8WIQYTEBu0jwfIZwIDAQAB
-o2UwYzBCBgNVHREEOzA5gg9pZHAudW5pdi1hbXUuZnKGJmh0dHBzOi8vaWRwLnVu
-aXYtYW11LmZyL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBQP7J5/7grId0BA/iS3
-EQAuh8HTUzANBgkqhkiG9w0BAQUFAAOCAQEAZT28dZUnmtUIuiob36b/jNzT/3dY
-iBZDHu3z1HMzFc6efhPhBuJ20SpLfH9oMBVDCUCktH9tv4VO5LJv0N02FL+r9uuo
-fbeNry2w9g78LM/z/0IWGtcdfEHnHA+6nYad1PEf0vv+K5v82l+atRSDoOR/s9dk
-m3A/gjFibKMSIIXDFvLncxiHYHLrhsrMFeG5HlWXx+pVCunuvo2nNk2uL1ZBWW0Z
-JRO79CP7W1ndIuM+8v1G7C1gjYqkO6rdEKdJArm7hqEMzjUdL60okDqsVX+IYFUX
-VmCmZvTACtUurXS0zocVZTUfQcTaSXkKLSKLU6TQQy4Wf/c9CfNalbv6Sw==
-					    </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://idp.univ-amu.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.univ-amu.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.univ-amu.fr/idp/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Université d'Aix-Marseille</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Université d'Aix-Marseille</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>LALOT Dominique</SurName>
-    <EmailAddress>dominique.lalot@univ-amu.fr</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <SurName>AIMAR Michel</SurName>
-    <EmailAddress>michel.aimar@univ-amu.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.univ-artois.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.univ-artois.fr-idp-shibboleth.xml
deleted file mode 100644
index a9f128cf..00000000
--- a/swamid-interfederations-2.0/idp.univ-artois.fr-idp-shibboleth.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://idp.univ-artois.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2009-05-07T15:41:23Z">
-      <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">univ-artois.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">Université d'Artois</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDMzCCAhugAwIBAgIUYze6+LHtf+jMXzwG8QReI+Kp9ZcwDQYJKoZIhvcNAQEF
-BQAwHTEbMBkGA1UEAxMSaWRwLnVuaXYtYXJ0b2lzLmZyMB4XDTEyMTExMzE2NTk1
-N1oXDTMyMTExMzE2NTk1N1owHTEbMBkGA1UEAxMSaWRwLnVuaXYtYXJ0b2lzLmZy
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAkpHVwf2i1KtXPTZF/Qnr
-i0DtHLb6czJ/NmtUeYfWo8OM6P7Hkv58A9wXYX2eOX7RgFF4fyEbIn5rvFx3wdMG
-TwE2Cyq414V2HqCSXUtoAmWzhtuhQ5YuqvUkQ4QgUaSQMCAMxLmcAtY+XddfBuAg
-TtSzkh2JUaXUlIYHn8LKJw1r+Wp2X6gxZQyk8TAFzciOcwosVwOT8c2xAmK2ZYhL
-1CavsrTTRvXoHQobo2tmn2XrSHeSyjhMiTOJiDoCDu/XhOt781UdS9p0XFrHIru/
-dIzkv0Kk5uIqaz2idf2xX383qLZA0RfBXue4/yNu4X9aVxUT76JAB/fk+HegEAj8
-GwIDAQABo2swaTBIBgNVHREEQTA/ghJpZHAudW5pdi1hcnRvaXMuZnKGKWh0dHBz
-Oi8vaWRwLnVuaXYtYXJ0b2lzLmZyL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBRm
-g9Y0eqV3krWHdZkro9hJUiyqazANBgkqhkiG9w0BAQUFAAOCAQEAfv8qHbEOTIl2
-c1CNwZb4TfarrTY04ZHytU0tHNJWBL7c21yTO2a+vY1Xb2k3UYhWqPiujx6tY012
-U8mQmjAhk6geFaYgUsNfRxpviAAm9BaxdeMqo09sEE0IY6+Vl3m8gvSq1vuN0jGh
-6R1Jbqhj84FBJeSuRUF/VH+JiRxZA+FK3rP5Oo8DUKkAa3O59v1zzJjcw/gP2WaE
-s/eysRlm/+0o7pMPzFac9m9GmHWuyjifyoRWzNFaqCTEl2xG8eKp2h6lAAuPgu6w
-D/wjE0tsBNLEpO/XVtlNXVk2QQHpypl2XvrEpUpfOCjjb80yv4BD/1hONqUqp0GD
-tfGARKYulw==
-					    </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>
-					      MIIDMzCCAhugAwIBAgIUSQ9eV+7UI3qVsdHcI6lx3hTPYsEwDQYJKoZIhvcNAQEF
-BQAwHTEbMBkGA1UEAxMSaWRwLnVuaXYtYXJ0b2lzLmZyMB4XDTA5MDUwNzA4NTky
-M1oXDTI5MDUwNzA4NTkyM1owHTEbMBkGA1UEAxMSaWRwLnVuaXYtYXJ0b2lzLmZy
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2UT2ctOv7Fz//FWQEyA2
-CEJWoCVCqiAKRMIVJTqnO+asQFnsCya4DHWEWzTRo9DgXBluIelrVbM7JgsG6eAT
-cfVZpRr2HejrhhvZ7j5FPCuy0oLNmMCtcmcqmkMzyDx2rCefJAoScwcBYoz1I8qO
-SAr8DUPcVTZdabL5+val+GdzheeHtUsSKX1Z8pRgL1NwWwR46DXty09Z/gsszY6b
-WJLZ3gs7oaQpdtUmAiMf95/F5mMb9AZZKj878fdztdVt4Vig4QTmAYaqF7GQ9oj6
-8A1gNL4iVHc8gIpGfKDFSFhWmpnLLLJoblREribjP5AWsJBSMkI5Nuu0J7ITDgXW
-vwIDAQABo2swaTBIBgNVHREEQTA/ghJpZHAudW5pdi1hcnRvaXMuZnKGKWh0dHBz
-Oi8vaWRwLnVuaXYtYXJ0b2lzLmZyL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBRy
-4kbAag+Wu/+JCxlZnf8v+nuV4DANBgkqhkiG9w0BAQUFAAOCAQEA1Z63uSJNJKme
-d/xq1BaFdQ6cAJQGxpCi9uDSD+GNcGK/auvUkmtxuCF6DAaY5mxSwJ9cx2KKEqiw
-XuJ3Vs7y3g7ez+0CvkoYZrq8pMRzhKZ+Lk1T8YJ/dNMnbqZjIAwYod1PtoJsYqjW
-iEi2GWmBGh2jwbKI+zJJMquPH+aKIEA425xAse+E6Q+JtudVqzZoG0ktigtBpMlo
-Blby6pfzo7TZbF6FWkTbOfZtvsxW2XDFKvUYqXzpjJulQXljlKuh5Bjm+VBiFJLn
-jm/fe9sgzhgCC7ONajuWtSG6VLszFulq60E8BV8TQiv3/ZwAnCDvQKxot/Hwd8jl
-yurjS9vfAQ==
-					    </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://idp.univ-artois.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.univ-artois.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.univ-artois.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">univ-artois.fr</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDMzCCAhugAwIBAgIUYze6+LHtf+jMXzwG8QReI+Kp9ZcwDQYJKoZIhvcNAQEF
-BQAwHTEbMBkGA1UEAxMSaWRwLnVuaXYtYXJ0b2lzLmZyMB4XDTEyMTExMzE2NTk1
-N1oXDTMyMTExMzE2NTk1N1owHTEbMBkGA1UEAxMSaWRwLnVuaXYtYXJ0b2lzLmZy
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAkpHVwf2i1KtXPTZF/Qnr
-i0DtHLb6czJ/NmtUeYfWo8OM6P7Hkv58A9wXYX2eOX7RgFF4fyEbIn5rvFx3wdMG
-TwE2Cyq414V2HqCSXUtoAmWzhtuhQ5YuqvUkQ4QgUaSQMCAMxLmcAtY+XddfBuAg
-TtSzkh2JUaXUlIYHn8LKJw1r+Wp2X6gxZQyk8TAFzciOcwosVwOT8c2xAmK2ZYhL
-1CavsrTTRvXoHQobo2tmn2XrSHeSyjhMiTOJiDoCDu/XhOt781UdS9p0XFrHIru/
-dIzkv0Kk5uIqaz2idf2xX383qLZA0RfBXue4/yNu4X9aVxUT76JAB/fk+HegEAj8
-GwIDAQABo2swaTBIBgNVHREEQTA/ghJpZHAudW5pdi1hcnRvaXMuZnKGKWh0dHBz
-Oi8vaWRwLnVuaXYtYXJ0b2lzLmZyL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBRm
-g9Y0eqV3krWHdZkro9hJUiyqazANBgkqhkiG9w0BAQUFAAOCAQEAfv8qHbEOTIl2
-c1CNwZb4TfarrTY04ZHytU0tHNJWBL7c21yTO2a+vY1Xb2k3UYhWqPiujx6tY012
-U8mQmjAhk6geFaYgUsNfRxpviAAm9BaxdeMqo09sEE0IY6+Vl3m8gvSq1vuN0jGh
-6R1Jbqhj84FBJeSuRUF/VH+JiRxZA+FK3rP5Oo8DUKkAa3O59v1zzJjcw/gP2WaE
-s/eysRlm/+0o7pMPzFac9m9GmHWuyjifyoRWzNFaqCTEl2xG8eKp2h6lAAuPgu6w
-D/wjE0tsBNLEpO/XVtlNXVk2QQHpypl2XvrEpUpfOCjjb80yv4BD/1hONqUqp0GD
-tfGARKYulw==
-					    </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>
-					      MIIDMzCCAhugAwIBAgIUSQ9eV+7UI3qVsdHcI6lx3hTPYsEwDQYJKoZIhvcNAQEF
-BQAwHTEbMBkGA1UEAxMSaWRwLnVuaXYtYXJ0b2lzLmZyMB4XDTA5MDUwNzA4NTky
-M1oXDTI5MDUwNzA4NTkyM1owHTEbMBkGA1UEAxMSaWRwLnVuaXYtYXJ0b2lzLmZy
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2UT2ctOv7Fz//FWQEyA2
-CEJWoCVCqiAKRMIVJTqnO+asQFnsCya4DHWEWzTRo9DgXBluIelrVbM7JgsG6eAT
-cfVZpRr2HejrhhvZ7j5FPCuy0oLNmMCtcmcqmkMzyDx2rCefJAoScwcBYoz1I8qO
-SAr8DUPcVTZdabL5+val+GdzheeHtUsSKX1Z8pRgL1NwWwR46DXty09Z/gsszY6b
-WJLZ3gs7oaQpdtUmAiMf95/F5mMb9AZZKj878fdztdVt4Vig4QTmAYaqF7GQ9oj6
-8A1gNL4iVHc8gIpGfKDFSFhWmpnLLLJoblREribjP5AWsJBSMkI5Nuu0J7ITDgXW
-vwIDAQABo2swaTBIBgNVHREEQTA/ghJpZHAudW5pdi1hcnRvaXMuZnKGKWh0dHBz
-Oi8vaWRwLnVuaXYtYXJ0b2lzLmZyL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBRy
-4kbAag+Wu/+JCxlZnf8v+nuV4DANBgkqhkiG9w0BAQUFAAOCAQEA1Z63uSJNJKme
-d/xq1BaFdQ6cAJQGxpCi9uDSD+GNcGK/auvUkmtxuCF6DAaY5mxSwJ9cx2KKEqiw
-XuJ3Vs7y3g7ez+0CvkoYZrq8pMRzhKZ+Lk1T8YJ/dNMnbqZjIAwYod1PtoJsYqjW
-iEi2GWmBGh2jwbKI+zJJMquPH+aKIEA425xAse+E6Q+JtudVqzZoG0ktigtBpMlo
-Blby6pfzo7TZbF6FWkTbOfZtvsxW2XDFKvUYqXzpjJulQXljlKuh5Bjm+VBiFJLn
-jm/fe9sgzhgCC7ONajuWtSG6VLszFulq60E8BV8TQiv3/ZwAnCDvQKxot/Hwd8jl
-yurjS9vfAQ==
-					    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.univ-artois.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">Université d'Artois</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Université d'Artois</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <EmailAddress>fed-admin@univ-artois.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.univ-artois.fr.xml b/swamid-interfederations-2.0/idp.univ-artois.fr.xml
deleted file mode 100644
index a9f128cf..00000000
--- a/swamid-interfederations-2.0/idp.univ-artois.fr.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://idp.univ-artois.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2009-05-07T15:41:23Z">
-      <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">univ-artois.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">Université d'Artois</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDMzCCAhugAwIBAgIUYze6+LHtf+jMXzwG8QReI+Kp9ZcwDQYJKoZIhvcNAQEF
-BQAwHTEbMBkGA1UEAxMSaWRwLnVuaXYtYXJ0b2lzLmZyMB4XDTEyMTExMzE2NTk1
-N1oXDTMyMTExMzE2NTk1N1owHTEbMBkGA1UEAxMSaWRwLnVuaXYtYXJ0b2lzLmZy
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAkpHVwf2i1KtXPTZF/Qnr
-i0DtHLb6czJ/NmtUeYfWo8OM6P7Hkv58A9wXYX2eOX7RgFF4fyEbIn5rvFx3wdMG
-TwE2Cyq414V2HqCSXUtoAmWzhtuhQ5YuqvUkQ4QgUaSQMCAMxLmcAtY+XddfBuAg
-TtSzkh2JUaXUlIYHn8LKJw1r+Wp2X6gxZQyk8TAFzciOcwosVwOT8c2xAmK2ZYhL
-1CavsrTTRvXoHQobo2tmn2XrSHeSyjhMiTOJiDoCDu/XhOt781UdS9p0XFrHIru/
-dIzkv0Kk5uIqaz2idf2xX383qLZA0RfBXue4/yNu4X9aVxUT76JAB/fk+HegEAj8
-GwIDAQABo2swaTBIBgNVHREEQTA/ghJpZHAudW5pdi1hcnRvaXMuZnKGKWh0dHBz
-Oi8vaWRwLnVuaXYtYXJ0b2lzLmZyL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBRm
-g9Y0eqV3krWHdZkro9hJUiyqazANBgkqhkiG9w0BAQUFAAOCAQEAfv8qHbEOTIl2
-c1CNwZb4TfarrTY04ZHytU0tHNJWBL7c21yTO2a+vY1Xb2k3UYhWqPiujx6tY012
-U8mQmjAhk6geFaYgUsNfRxpviAAm9BaxdeMqo09sEE0IY6+Vl3m8gvSq1vuN0jGh
-6R1Jbqhj84FBJeSuRUF/VH+JiRxZA+FK3rP5Oo8DUKkAa3O59v1zzJjcw/gP2WaE
-s/eysRlm/+0o7pMPzFac9m9GmHWuyjifyoRWzNFaqCTEl2xG8eKp2h6lAAuPgu6w
-D/wjE0tsBNLEpO/XVtlNXVk2QQHpypl2XvrEpUpfOCjjb80yv4BD/1hONqUqp0GD
-tfGARKYulw==
-					    </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>
-					      MIIDMzCCAhugAwIBAgIUSQ9eV+7UI3qVsdHcI6lx3hTPYsEwDQYJKoZIhvcNAQEF
-BQAwHTEbMBkGA1UEAxMSaWRwLnVuaXYtYXJ0b2lzLmZyMB4XDTA5MDUwNzA4NTky
-M1oXDTI5MDUwNzA4NTkyM1owHTEbMBkGA1UEAxMSaWRwLnVuaXYtYXJ0b2lzLmZy
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2UT2ctOv7Fz//FWQEyA2
-CEJWoCVCqiAKRMIVJTqnO+asQFnsCya4DHWEWzTRo9DgXBluIelrVbM7JgsG6eAT
-cfVZpRr2HejrhhvZ7j5FPCuy0oLNmMCtcmcqmkMzyDx2rCefJAoScwcBYoz1I8qO
-SAr8DUPcVTZdabL5+val+GdzheeHtUsSKX1Z8pRgL1NwWwR46DXty09Z/gsszY6b
-WJLZ3gs7oaQpdtUmAiMf95/F5mMb9AZZKj878fdztdVt4Vig4QTmAYaqF7GQ9oj6
-8A1gNL4iVHc8gIpGfKDFSFhWmpnLLLJoblREribjP5AWsJBSMkI5Nuu0J7ITDgXW
-vwIDAQABo2swaTBIBgNVHREEQTA/ghJpZHAudW5pdi1hcnRvaXMuZnKGKWh0dHBz
-Oi8vaWRwLnVuaXYtYXJ0b2lzLmZyL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBRy
-4kbAag+Wu/+JCxlZnf8v+nuV4DANBgkqhkiG9w0BAQUFAAOCAQEA1Z63uSJNJKme
-d/xq1BaFdQ6cAJQGxpCi9uDSD+GNcGK/auvUkmtxuCF6DAaY5mxSwJ9cx2KKEqiw
-XuJ3Vs7y3g7ez+0CvkoYZrq8pMRzhKZ+Lk1T8YJ/dNMnbqZjIAwYod1PtoJsYqjW
-iEi2GWmBGh2jwbKI+zJJMquPH+aKIEA425xAse+E6Q+JtudVqzZoG0ktigtBpMlo
-Blby6pfzo7TZbF6FWkTbOfZtvsxW2XDFKvUYqXzpjJulQXljlKuh5Bjm+VBiFJLn
-jm/fe9sgzhgCC7ONajuWtSG6VLszFulq60E8BV8TQiv3/ZwAnCDvQKxot/Hwd8jl
-yurjS9vfAQ==
-					    </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://idp.univ-artois.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.univ-artois.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.univ-artois.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">univ-artois.fr</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDMzCCAhugAwIBAgIUYze6+LHtf+jMXzwG8QReI+Kp9ZcwDQYJKoZIhvcNAQEF
-BQAwHTEbMBkGA1UEAxMSaWRwLnVuaXYtYXJ0b2lzLmZyMB4XDTEyMTExMzE2NTk1
-N1oXDTMyMTExMzE2NTk1N1owHTEbMBkGA1UEAxMSaWRwLnVuaXYtYXJ0b2lzLmZy
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAkpHVwf2i1KtXPTZF/Qnr
-i0DtHLb6czJ/NmtUeYfWo8OM6P7Hkv58A9wXYX2eOX7RgFF4fyEbIn5rvFx3wdMG
-TwE2Cyq414V2HqCSXUtoAmWzhtuhQ5YuqvUkQ4QgUaSQMCAMxLmcAtY+XddfBuAg
-TtSzkh2JUaXUlIYHn8LKJw1r+Wp2X6gxZQyk8TAFzciOcwosVwOT8c2xAmK2ZYhL
-1CavsrTTRvXoHQobo2tmn2XrSHeSyjhMiTOJiDoCDu/XhOt781UdS9p0XFrHIru/
-dIzkv0Kk5uIqaz2idf2xX383qLZA0RfBXue4/yNu4X9aVxUT76JAB/fk+HegEAj8
-GwIDAQABo2swaTBIBgNVHREEQTA/ghJpZHAudW5pdi1hcnRvaXMuZnKGKWh0dHBz
-Oi8vaWRwLnVuaXYtYXJ0b2lzLmZyL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBRm
-g9Y0eqV3krWHdZkro9hJUiyqazANBgkqhkiG9w0BAQUFAAOCAQEAfv8qHbEOTIl2
-c1CNwZb4TfarrTY04ZHytU0tHNJWBL7c21yTO2a+vY1Xb2k3UYhWqPiujx6tY012
-U8mQmjAhk6geFaYgUsNfRxpviAAm9BaxdeMqo09sEE0IY6+Vl3m8gvSq1vuN0jGh
-6R1Jbqhj84FBJeSuRUF/VH+JiRxZA+FK3rP5Oo8DUKkAa3O59v1zzJjcw/gP2WaE
-s/eysRlm/+0o7pMPzFac9m9GmHWuyjifyoRWzNFaqCTEl2xG8eKp2h6lAAuPgu6w
-D/wjE0tsBNLEpO/XVtlNXVk2QQHpypl2XvrEpUpfOCjjb80yv4BD/1hONqUqp0GD
-tfGARKYulw==
-					    </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>
-					      MIIDMzCCAhugAwIBAgIUSQ9eV+7UI3qVsdHcI6lx3hTPYsEwDQYJKoZIhvcNAQEF
-BQAwHTEbMBkGA1UEAxMSaWRwLnVuaXYtYXJ0b2lzLmZyMB4XDTA5MDUwNzA4NTky
-M1oXDTI5MDUwNzA4NTkyM1owHTEbMBkGA1UEAxMSaWRwLnVuaXYtYXJ0b2lzLmZy
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2UT2ctOv7Fz//FWQEyA2
-CEJWoCVCqiAKRMIVJTqnO+asQFnsCya4DHWEWzTRo9DgXBluIelrVbM7JgsG6eAT
-cfVZpRr2HejrhhvZ7j5FPCuy0oLNmMCtcmcqmkMzyDx2rCefJAoScwcBYoz1I8qO
-SAr8DUPcVTZdabL5+val+GdzheeHtUsSKX1Z8pRgL1NwWwR46DXty09Z/gsszY6b
-WJLZ3gs7oaQpdtUmAiMf95/F5mMb9AZZKj878fdztdVt4Vig4QTmAYaqF7GQ9oj6
-8A1gNL4iVHc8gIpGfKDFSFhWmpnLLLJoblREribjP5AWsJBSMkI5Nuu0J7ITDgXW
-vwIDAQABo2swaTBIBgNVHREEQTA/ghJpZHAudW5pdi1hcnRvaXMuZnKGKWh0dHBz
-Oi8vaWRwLnVuaXYtYXJ0b2lzLmZyL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBRy
-4kbAag+Wu/+JCxlZnf8v+nuV4DANBgkqhkiG9w0BAQUFAAOCAQEA1Z63uSJNJKme
-d/xq1BaFdQ6cAJQGxpCi9uDSD+GNcGK/auvUkmtxuCF6DAaY5mxSwJ9cx2KKEqiw
-XuJ3Vs7y3g7ez+0CvkoYZrq8pMRzhKZ+Lk1T8YJ/dNMnbqZjIAwYod1PtoJsYqjW
-iEi2GWmBGh2jwbKI+zJJMquPH+aKIEA425xAse+E6Q+JtudVqzZoG0ktigtBpMlo
-Blby6pfzo7TZbF6FWkTbOfZtvsxW2XDFKvUYqXzpjJulQXljlKuh5Bjm+VBiFJLn
-jm/fe9sgzhgCC7ONajuWtSG6VLszFulq60E8BV8TQiv3/ZwAnCDvQKxot/Hwd8jl
-yurjS9vfAQ==
-					    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.univ-artois.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">Université d'Artois</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Université d'Artois</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <EmailAddress>fed-admin@univ-artois.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.univ-avignon.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.univ-avignon.fr-idp-shibboleth.xml
deleted file mode 100644
index b36d8306..00000000
--- a/swamid-interfederations-2.0/idp.univ-avignon.fr-idp-shibboleth.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://idp.univ-avignon.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2012-10-22T12:28:30Z">
-      <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">univ-avignon.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">Université d'Avignon et des Pays de Vaucluse</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDODCCAiCgAwIBAgIVAKFKpfPrDnkBOhfhK+OqWshuX1PZMA0GCSqGSIb3DQEB
-BQUAMB4xHDAaBgNVBAMTE2lkcC51bml2LWF2aWdub24uZnIwHhcNMTIwNzE4MTMx
-NTQxWhcNMTUwNzE4MTMxNTQxWjAeMRwwGgYDVQQDExNpZHAudW5pdi1hdmlnbm9u
-LmZyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAg6G5VXHh5/DoXYDQ
-RQetIRXBzAfe3kh1Illtllq8aWLH+MUw+4EOg4Iks67eoU4/1qRJ8EsTUxFq/MHd
-qVvgaLdGv30e1QmaJbn3U+ASYOcmnEowsLw0KjUVXJwnzDDtkSmM6xtA5RzyIPSs
-JbEI5YC1dN4tr4vm8SbPtQGguGkZK09B0ZC92dWg36ZsMfDuaF09aBykpolTvZ/I
-m7lVCl0qzaa3VQTmLECsKlM3iEUlGzuADJEGTAuGxdyb9sy4hRxMCSs5xnUCYhqr
-G7ZOGowkc4HtQIBGdIfR2GbK9aDJVWepJxvzPXKP/7uWjiIqBmtZcYqY4joRDArR
-vLVtOwIDAQABo20wazBKBgNVHREEQzBBghNpZHAudW5pdi1hdmlnbm9uLmZyhipo
-dHRwczovL2lkcC51bml2LWF2aWdub24uZnIvaWRwL3NoaWJib2xldGgwHQYDVR0O
-BBYEFCcAdmasz9t4KP5u18D0XUU0rxqZMA0GCSqGSIb3DQEBBQUAA4IBAQAP78Pb
-fBUINRSLrm6aNcpdjt6cjXnfyfa9plgR7WkagfhrM5uiodZOouudsTJhEwUH0chb
-ktxfsLvGDbsrf8dcAyeKxLvtmIRlU/0YURZMZaj1q+tpkw5qsyNzkmftSZvFlL4M
-Rin03XAzDZCVlli7U35vcUIT1vY/UPffkdhVpfWBjQOTRziUA5pV2EU0gv7EaRAl
-3mG4gjWO1o6cVzdW3puPiyUlT2v7d1feHU5EGzFXr/KYK8pfGule7DKKwHPEOmxV
-IloyUs/s87ZcfKL++xAYi2q27l5854JcOhKPPKzdjUnoHMUwvOdMr8WMs5RsnwIw
-y2gqec2p7TcIRKIM
-					    </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://idp.univ-avignon.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.univ-avignon.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.univ-avignon.fr/idp/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Université d'Avignon et des Pays de Vaucluse</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Université d'Avignon et des Pays de Vaucluse</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <EmailAddress>idpmaster@univ-avignon.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.univ-avignon.fr.xml b/swamid-interfederations-2.0/idp.univ-avignon.fr.xml
deleted file mode 100644
index b36d8306..00000000
--- a/swamid-interfederations-2.0/idp.univ-avignon.fr.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://idp.univ-avignon.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2012-10-22T12:28:30Z">
-      <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">univ-avignon.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">Université d'Avignon et des Pays de Vaucluse</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDODCCAiCgAwIBAgIVAKFKpfPrDnkBOhfhK+OqWshuX1PZMA0GCSqGSIb3DQEB
-BQUAMB4xHDAaBgNVBAMTE2lkcC51bml2LWF2aWdub24uZnIwHhcNMTIwNzE4MTMx
-NTQxWhcNMTUwNzE4MTMxNTQxWjAeMRwwGgYDVQQDExNpZHAudW5pdi1hdmlnbm9u
-LmZyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAg6G5VXHh5/DoXYDQ
-RQetIRXBzAfe3kh1Illtllq8aWLH+MUw+4EOg4Iks67eoU4/1qRJ8EsTUxFq/MHd
-qVvgaLdGv30e1QmaJbn3U+ASYOcmnEowsLw0KjUVXJwnzDDtkSmM6xtA5RzyIPSs
-JbEI5YC1dN4tr4vm8SbPtQGguGkZK09B0ZC92dWg36ZsMfDuaF09aBykpolTvZ/I
-m7lVCl0qzaa3VQTmLECsKlM3iEUlGzuADJEGTAuGxdyb9sy4hRxMCSs5xnUCYhqr
-G7ZOGowkc4HtQIBGdIfR2GbK9aDJVWepJxvzPXKP/7uWjiIqBmtZcYqY4joRDArR
-vLVtOwIDAQABo20wazBKBgNVHREEQzBBghNpZHAudW5pdi1hdmlnbm9uLmZyhipo
-dHRwczovL2lkcC51bml2LWF2aWdub24uZnIvaWRwL3NoaWJib2xldGgwHQYDVR0O
-BBYEFCcAdmasz9t4KP5u18D0XUU0rxqZMA0GCSqGSIb3DQEBBQUAA4IBAQAP78Pb
-fBUINRSLrm6aNcpdjt6cjXnfyfa9plgR7WkagfhrM5uiodZOouudsTJhEwUH0chb
-ktxfsLvGDbsrf8dcAyeKxLvtmIRlU/0YURZMZaj1q+tpkw5qsyNzkmftSZvFlL4M
-Rin03XAzDZCVlli7U35vcUIT1vY/UPffkdhVpfWBjQOTRziUA5pV2EU0gv7EaRAl
-3mG4gjWO1o6cVzdW3puPiyUlT2v7d1feHU5EGzFXr/KYK8pfGule7DKKwHPEOmxV
-IloyUs/s87ZcfKL++xAYi2q27l5854JcOhKPPKzdjUnoHMUwvOdMr8WMs5RsnwIw
-y2gqec2p7TcIRKIM
-					    </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://idp.univ-avignon.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.univ-avignon.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.univ-avignon.fr/idp/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Université d'Avignon et des Pays de Vaucluse</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Université d'Avignon et des Pays de Vaucluse</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <EmailAddress>idpmaster@univ-avignon.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.univ-bpclermont.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.univ-bpclermont.fr-idp-shibboleth.xml
deleted file mode 100644
index e3a93704..00000000
--- a/swamid-interfederations-2.0/idp.univ-bpclermont.fr-idp-shibboleth.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://idp.univ-bpclermont.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2009-04-16T09:16:56Z">
-      <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">univ-bpclermont.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">Université de Clermont-Ferrand 2 - Blaise Pascal</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDQzCCAiugAwIBAgIUf8Tye3TWDTMkKybmr2WCtI8Rg7gwDQYJKoZIhvcNAQEF
-BQAwITEfMB0GA1UEAxMWaWRwLnVuaXYtYnBjbGVybW9udC5mcjAeFw0wODExMjUx
-MzE4MDlaFw0yODExMjUxMzE4MDlaMCExHzAdBgNVBAMTFmlkcC51bml2LWJwY2xl
-cm1vbnQuZnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCgq4L+M8Cr
-xnSB7fZmGR8wgCnDx6DxFJqAwk45muj/RFAijOjAM9i2iUmjBhpAQjatnybBaGk4
-xjLD/TbzQzpXZMzqLpRYgmvqLQ7RG6PabpLDWz+s/oneLFWtvCzFmyRQXe72Kum5
-FCeG5Jz9uDniAwdv2u5dG82mr+nO7wP+95GwlcYzs9bVfJZ3L0vBZ0wu4bqAIHAQ
-+PMX0FVX/2bmqBWjP1XaJjqIk0UnQJ7//Ccg3y888MRyIcg2d8P4OiG4VvhUl7bL
-QygrvTr0yqrw2XFHdhMAwV7P39Y84+/rAFPg94iiSesPOzZmgv4YvGcsvLjIWwa8
-Pi5gOMtJQXqFAgMBAAGjczBxMFAGA1UdEQRJMEeCFmlkcC51bml2LWJwY2xlcm1v
-bnQuZnKGLWh0dHBzOi8vaWRwLnVuaXYtYnBjbGVybW9udC5mci9pZHAvc2hpYmJv
-bGV0aDAdBgNVHQ4EFgQU9VjTe9bu+B0flgm74MpOhm2yVJYwDQYJKoZIhvcNAQEF
-BQADggEBADRoaAXNoIfymTDg2CETOFI/fhK8Sok1vAQo7PJjjeq2Pue965wgWT4Q
-sJxY9lQdPKlZRonso2ABtY0vNvlB2oQK5Trz8QckUp8MEXQhSDK2EyTc8/jXLae9
-4jU4qjGrD4f6h177SSimK2tmesTRJ57EUZd/Mpoy/cpWMKfp9tx6Pe6w5MYVOSpk
-iqa6wc50EWUt8/EqtC3V45+jo/6mJx1ZPQI2uPP9BK1p+UdljUKZqmQa0ZZJ4IxW
-UP/k2YNC7B4piqvd0HLqVEDHQmmeiwSPLlFsGozwdYZ+FUuXzJoMguhu3KMw8qV4
-P69e+LdcHzrBqln1xmrkY/MMjTqnJ3E=
-					    </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://idp.univ-bpclermont.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.univ-bpclermont.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.univ-bpclermont.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">univ-bpclermont.fr</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDQzCCAiugAwIBAgIUf8Tye3TWDTMkKybmr2WCtI8Rg7gwDQYJKoZIhvcNAQEF
-BQAwITEfMB0GA1UEAxMWaWRwLnVuaXYtYnBjbGVybW9udC5mcjAeFw0wODExMjUx
-MzE4MDlaFw0yODExMjUxMzE4MDlaMCExHzAdBgNVBAMTFmlkcC51bml2LWJwY2xl
-cm1vbnQuZnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCgq4L+M8Cr
-xnSB7fZmGR8wgCnDx6DxFJqAwk45muj/RFAijOjAM9i2iUmjBhpAQjatnybBaGk4
-xjLD/TbzQzpXZMzqLpRYgmvqLQ7RG6PabpLDWz+s/oneLFWtvCzFmyRQXe72Kum5
-FCeG5Jz9uDniAwdv2u5dG82mr+nO7wP+95GwlcYzs9bVfJZ3L0vBZ0wu4bqAIHAQ
-+PMX0FVX/2bmqBWjP1XaJjqIk0UnQJ7//Ccg3y888MRyIcg2d8P4OiG4VvhUl7bL
-QygrvTr0yqrw2XFHdhMAwV7P39Y84+/rAFPg94iiSesPOzZmgv4YvGcsvLjIWwa8
-Pi5gOMtJQXqFAgMBAAGjczBxMFAGA1UdEQRJMEeCFmlkcC51bml2LWJwY2xlcm1v
-bnQuZnKGLWh0dHBzOi8vaWRwLnVuaXYtYnBjbGVybW9udC5mci9pZHAvc2hpYmJv
-bGV0aDAdBgNVHQ4EFgQU9VjTe9bu+B0flgm74MpOhm2yVJYwDQYJKoZIhvcNAQEF
-BQADggEBADRoaAXNoIfymTDg2CETOFI/fhK8Sok1vAQo7PJjjeq2Pue965wgWT4Q
-sJxY9lQdPKlZRonso2ABtY0vNvlB2oQK5Trz8QckUp8MEXQhSDK2EyTc8/jXLae9
-4jU4qjGrD4f6h177SSimK2tmesTRJ57EUZd/Mpoy/cpWMKfp9tx6Pe6w5MYVOSpk
-iqa6wc50EWUt8/EqtC3V45+jo/6mJx1ZPQI2uPP9BK1p+UdljUKZqmQa0ZZJ4IxW
-UP/k2YNC7B4piqvd0HLqVEDHQmmeiwSPLlFsGozwdYZ+FUuXzJoMguhu3KMw8qV4
-P69e+LdcHzrBqln1xmrkY/MMjTqnJ3E=
-					    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.univ-bpclermont.fr/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">Université de Clermont-Ferrand 2 - Blaise Pascal</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Université de Clermont-Ferrand 2 - Blaise Pascal</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <EmailAddress>Fed-Admin@univ-bpclermont.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.univ-bpclermont.fr.xml b/swamid-interfederations-2.0/idp.univ-bpclermont.fr.xml
deleted file mode 100644
index e3a93704..00000000
--- a/swamid-interfederations-2.0/idp.univ-bpclermont.fr.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://idp.univ-bpclermont.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2009-04-16T09:16:56Z">
-      <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">univ-bpclermont.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">Université de Clermont-Ferrand 2 - Blaise Pascal</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDQzCCAiugAwIBAgIUf8Tye3TWDTMkKybmr2WCtI8Rg7gwDQYJKoZIhvcNAQEF
-BQAwITEfMB0GA1UEAxMWaWRwLnVuaXYtYnBjbGVybW9udC5mcjAeFw0wODExMjUx
-MzE4MDlaFw0yODExMjUxMzE4MDlaMCExHzAdBgNVBAMTFmlkcC51bml2LWJwY2xl
-cm1vbnQuZnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCgq4L+M8Cr
-xnSB7fZmGR8wgCnDx6DxFJqAwk45muj/RFAijOjAM9i2iUmjBhpAQjatnybBaGk4
-xjLD/TbzQzpXZMzqLpRYgmvqLQ7RG6PabpLDWz+s/oneLFWtvCzFmyRQXe72Kum5
-FCeG5Jz9uDniAwdv2u5dG82mr+nO7wP+95GwlcYzs9bVfJZ3L0vBZ0wu4bqAIHAQ
-+PMX0FVX/2bmqBWjP1XaJjqIk0UnQJ7//Ccg3y888MRyIcg2d8P4OiG4VvhUl7bL
-QygrvTr0yqrw2XFHdhMAwV7P39Y84+/rAFPg94iiSesPOzZmgv4YvGcsvLjIWwa8
-Pi5gOMtJQXqFAgMBAAGjczBxMFAGA1UdEQRJMEeCFmlkcC51bml2LWJwY2xlcm1v
-bnQuZnKGLWh0dHBzOi8vaWRwLnVuaXYtYnBjbGVybW9udC5mci9pZHAvc2hpYmJv
-bGV0aDAdBgNVHQ4EFgQU9VjTe9bu+B0flgm74MpOhm2yVJYwDQYJKoZIhvcNAQEF
-BQADggEBADRoaAXNoIfymTDg2CETOFI/fhK8Sok1vAQo7PJjjeq2Pue965wgWT4Q
-sJxY9lQdPKlZRonso2ABtY0vNvlB2oQK5Trz8QckUp8MEXQhSDK2EyTc8/jXLae9
-4jU4qjGrD4f6h177SSimK2tmesTRJ57EUZd/Mpoy/cpWMKfp9tx6Pe6w5MYVOSpk
-iqa6wc50EWUt8/EqtC3V45+jo/6mJx1ZPQI2uPP9BK1p+UdljUKZqmQa0ZZJ4IxW
-UP/k2YNC7B4piqvd0HLqVEDHQmmeiwSPLlFsGozwdYZ+FUuXzJoMguhu3KMw8qV4
-P69e+LdcHzrBqln1xmrkY/MMjTqnJ3E=
-					    </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://idp.univ-bpclermont.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.univ-bpclermont.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.univ-bpclermont.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">univ-bpclermont.fr</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDQzCCAiugAwIBAgIUf8Tye3TWDTMkKybmr2WCtI8Rg7gwDQYJKoZIhvcNAQEF
-BQAwITEfMB0GA1UEAxMWaWRwLnVuaXYtYnBjbGVybW9udC5mcjAeFw0wODExMjUx
-MzE4MDlaFw0yODExMjUxMzE4MDlaMCExHzAdBgNVBAMTFmlkcC51bml2LWJwY2xl
-cm1vbnQuZnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCgq4L+M8Cr
-xnSB7fZmGR8wgCnDx6DxFJqAwk45muj/RFAijOjAM9i2iUmjBhpAQjatnybBaGk4
-xjLD/TbzQzpXZMzqLpRYgmvqLQ7RG6PabpLDWz+s/oneLFWtvCzFmyRQXe72Kum5
-FCeG5Jz9uDniAwdv2u5dG82mr+nO7wP+95GwlcYzs9bVfJZ3L0vBZ0wu4bqAIHAQ
-+PMX0FVX/2bmqBWjP1XaJjqIk0UnQJ7//Ccg3y888MRyIcg2d8P4OiG4VvhUl7bL
-QygrvTr0yqrw2XFHdhMAwV7P39Y84+/rAFPg94iiSesPOzZmgv4YvGcsvLjIWwa8
-Pi5gOMtJQXqFAgMBAAGjczBxMFAGA1UdEQRJMEeCFmlkcC51bml2LWJwY2xlcm1v
-bnQuZnKGLWh0dHBzOi8vaWRwLnVuaXYtYnBjbGVybW9udC5mci9pZHAvc2hpYmJv
-bGV0aDAdBgNVHQ4EFgQU9VjTe9bu+B0flgm74MpOhm2yVJYwDQYJKoZIhvcNAQEF
-BQADggEBADRoaAXNoIfymTDg2CETOFI/fhK8Sok1vAQo7PJjjeq2Pue965wgWT4Q
-sJxY9lQdPKlZRonso2ABtY0vNvlB2oQK5Trz8QckUp8MEXQhSDK2EyTc8/jXLae9
-4jU4qjGrD4f6h177SSimK2tmesTRJ57EUZd/Mpoy/cpWMKfp9tx6Pe6w5MYVOSpk
-iqa6wc50EWUt8/EqtC3V45+jo/6mJx1ZPQI2uPP9BK1p+UdljUKZqmQa0ZZJ4IxW
-UP/k2YNC7B4piqvd0HLqVEDHQmmeiwSPLlFsGozwdYZ+FUuXzJoMguhu3KMw8qV4
-P69e+LdcHzrBqln1xmrkY/MMjTqnJ3E=
-					    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.univ-bpclermont.fr/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">Université de Clermont-Ferrand 2 - Blaise Pascal</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Université de Clermont-Ferrand 2 - Blaise Pascal</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <EmailAddress>Fed-Admin@univ-bpclermont.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.univ-fcomte.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.univ-fcomte.fr-idp-shibboleth.xml
deleted file mode 100644
index add4dc14..00000000
--- a/swamid-interfederations-2.0/idp.univ-fcomte.fr-idp-shibboleth.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://idp.univ-fcomte.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2009-09-15T12:46:40Z">
-      <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">univ-fcomte.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">Université de Franche-Comté</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDMzCCAhugAwIBAgIUW6mVllZscKchJexSqcEND0YtS8AwDQYJKoZIhvcNAQEF
-BQAwHTEbMBkGA1UEAxMSaWRwLnVuaXYtZmNvbXRlLmZyMB4XDTA5MDkyMjA5MjY0
-OFoXDTI5MDkyMjA5MjY0OFowHTEbMBkGA1UEAxMSaWRwLnVuaXYtZmNvbXRlLmZy
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAo5IZG9vjS65fZl4V7Rj0
-7m98ICKvOdEKifDECnogADu3DKKwTgNRFdluGjA97M/vLYGyDPIxp6WH5/Xn402n
-dBKoR7x4cCPxcbreXqstbObb6DKLQ9wno2kZGHhCGnSbP04GruIKoLjtZJ0HjkYY
-805ZEB+yR543hZoAKvYoL7yNfkbhw4pqiHocd7lDjeW30airDj26endmgxKMDdma
-QZc+SZQih2c4pwvFeY478VxvMC34U9r+bnljREDXNk6j342vIKTqSEhf2UgMcd6/
-ox+ozGhstsDwRPecDyLm9t4VtcL7jAwC2mF/zhAkziDQ1ZSqszLOpM94kPW8rdvC
-7QIDAQABo2swaTBIBgNVHREEQTA/ghJpZHAudW5pdi1mY29tdGUuZnKGKWh0dHBz
-Oi8vaWRwLnVuaXYtZmNvbXRlLmZyL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBTr
-IVfDPghF09R0vhBjtKCIU7ibzjANBgkqhkiG9w0BAQUFAAOCAQEAjuMuu1Jhi1x6
-6ePM1bMbdyGTRAiWeQIBQsHkz6xbHOzAL86/bgIw2hgQqcjq1Tzy3OTFFsduAW1N
-wIfDITbZ1Bg2FecmYpdxzpwzzTgnPzpaztN013WlCkXURlbf4LP2OBpGe0gC488N
-v720Gk3YrUSZ4Qvfrr15kRsb92unQ87qT7JWGnp8+3/e8Cuw93bNZZY+rgAjLm8z
-XqW8svXuUo4q0dQH93j8YzV7Ehhri1crpeix9jNFHU9Nv1UNT4a1kFgbvtqvbJEK
-nN/RMfsKrrdgX8j3c+CoTxWr/whb+1TSruMB/J1PgNArpPGxNDJEoZloNEMAowoU
-IVPuFCeDJg==
-					    </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>
-					      MIIDQDCCAiigAwIBAgIVAO/8T+HZ1meHZeUYYGYKknaNCO9jMA0GCSqGSIb3DQEB
-BQUAMCAxHjAcBgNVBAMTFXVmYzExMy51bml2LWZjb210ZS5mcjAeFw0wOTA2MjUx
-MTQ3MzJaFw0xMjA2MjUxMTQ3MzJaMCAxHjAcBgNVBAMTFXVmYzExMy51bml2LWZj
-b210ZS5mcjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKtQ/+GORbpD
-E5V4drXcwRL9W+hW5IH4hfeJ9garnrJXVDHz2+2NujNZLFudKsWLmzEtdsV9I80H
-xuvQPeXjwUTu3eA1aPBhG3ffijmAF30+fe72zrWT1lxtwkPPlvAl9NuB3GgRPD4j
-+ZCie2/pZ96zrjxP4OFtzWe29pn1cSNtoRppoVlejHLSx8xLMWygEVKHo48yvSxO
-r1CD0XuI9N4xcHfT9PqMwvcHNk4GJ7K+KbmQaLT5LcbOHHInrij77FjyjMyA53+H
-P1bFHJsXkpTqctjDpWECiqhZq7vT5UmU2BxtKf5DJGvZ1bXu+lZGwvw/umH1bzDo
-8v0IbqJM2MUCAwEAAaNxMG8wTgYDVR0RBEcwRYIVdWZjMTEzLnVuaXYtZmNvbXRl
-LmZyhixodHRwczovL3VmYzExMy51bml2LWZjb210ZS5mci9pZHAvc2hpYmJvbGV0
-aDAdBgNVHQ4EFgQU7ZjX/QJkTHhPUK5jJ1VnXRORswswDQYJKoZIhvcNAQEFBQAD
-ggEBAFl/1/GkovqnPpz0B58Tzug3Hhak1K4sSPTE2QfT0oKF6ffpMj10rUIGnGcj
-5hS84epevQOIs1KqIQoU+1FHk80u7QQ6SjeUwOEaRwipBpJJTJ8/8dXYI0AfavuS
-N6dZU+zaXvYQm3gesWDi//33j8mZ33uCrfGw+hg3VlG6eZddAivDSXMDTodksf4W
-3wkXzErY365XtwnOvKJmnhR3WB7kQuHsAInMmm0AIBtv1cNFprAGDMMyLrIIXwQG
-Yd9szbOmM5Uq2s8WY9fuOWBLbcvTlgwdr+kT9XG5Z81h96q13zi8+a5/aoSEDCyv
-miWCUgajCZNCnjKwKj7taWSFWuw=
-					    </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://idp.univ-fcomte.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.univ-fcomte.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.univ-fcomte.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">univ-fcomte.fr</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDMzCCAhugAwIBAgIUW6mVllZscKchJexSqcEND0YtS8AwDQYJKoZIhvcNAQEF
-BQAwHTEbMBkGA1UEAxMSaWRwLnVuaXYtZmNvbXRlLmZyMB4XDTA5MDkyMjA5MjY0
-OFoXDTI5MDkyMjA5MjY0OFowHTEbMBkGA1UEAxMSaWRwLnVuaXYtZmNvbXRlLmZy
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAo5IZG9vjS65fZl4V7Rj0
-7m98ICKvOdEKifDECnogADu3DKKwTgNRFdluGjA97M/vLYGyDPIxp6WH5/Xn402n
-dBKoR7x4cCPxcbreXqstbObb6DKLQ9wno2kZGHhCGnSbP04GruIKoLjtZJ0HjkYY
-805ZEB+yR543hZoAKvYoL7yNfkbhw4pqiHocd7lDjeW30airDj26endmgxKMDdma
-QZc+SZQih2c4pwvFeY478VxvMC34U9r+bnljREDXNk6j342vIKTqSEhf2UgMcd6/
-ox+ozGhstsDwRPecDyLm9t4VtcL7jAwC2mF/zhAkziDQ1ZSqszLOpM94kPW8rdvC
-7QIDAQABo2swaTBIBgNVHREEQTA/ghJpZHAudW5pdi1mY29tdGUuZnKGKWh0dHBz
-Oi8vaWRwLnVuaXYtZmNvbXRlLmZyL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBTr
-IVfDPghF09R0vhBjtKCIU7ibzjANBgkqhkiG9w0BAQUFAAOCAQEAjuMuu1Jhi1x6
-6ePM1bMbdyGTRAiWeQIBQsHkz6xbHOzAL86/bgIw2hgQqcjq1Tzy3OTFFsduAW1N
-wIfDITbZ1Bg2FecmYpdxzpwzzTgnPzpaztN013WlCkXURlbf4LP2OBpGe0gC488N
-v720Gk3YrUSZ4Qvfrr15kRsb92unQ87qT7JWGnp8+3/e8Cuw93bNZZY+rgAjLm8z
-XqW8svXuUo4q0dQH93j8YzV7Ehhri1crpeix9jNFHU9Nv1UNT4a1kFgbvtqvbJEK
-nN/RMfsKrrdgX8j3c+CoTxWr/whb+1TSruMB/J1PgNArpPGxNDJEoZloNEMAowoU
-IVPuFCeDJg==
-					    </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>
-					      MIIDQDCCAiigAwIBAgIVAO/8T+HZ1meHZeUYYGYKknaNCO9jMA0GCSqGSIb3DQEB
-BQUAMCAxHjAcBgNVBAMTFXVmYzExMy51bml2LWZjb210ZS5mcjAeFw0wOTA2MjUx
-MTQ3MzJaFw0xMjA2MjUxMTQ3MzJaMCAxHjAcBgNVBAMTFXVmYzExMy51bml2LWZj
-b210ZS5mcjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKtQ/+GORbpD
-E5V4drXcwRL9W+hW5IH4hfeJ9garnrJXVDHz2+2NujNZLFudKsWLmzEtdsV9I80H
-xuvQPeXjwUTu3eA1aPBhG3ffijmAF30+fe72zrWT1lxtwkPPlvAl9NuB3GgRPD4j
-+ZCie2/pZ96zrjxP4OFtzWe29pn1cSNtoRppoVlejHLSx8xLMWygEVKHo48yvSxO
-r1CD0XuI9N4xcHfT9PqMwvcHNk4GJ7K+KbmQaLT5LcbOHHInrij77FjyjMyA53+H
-P1bFHJsXkpTqctjDpWECiqhZq7vT5UmU2BxtKf5DJGvZ1bXu+lZGwvw/umH1bzDo
-8v0IbqJM2MUCAwEAAaNxMG8wTgYDVR0RBEcwRYIVdWZjMTEzLnVuaXYtZmNvbXRl
-LmZyhixodHRwczovL3VmYzExMy51bml2LWZjb210ZS5mci9pZHAvc2hpYmJvbGV0
-aDAdBgNVHQ4EFgQU7ZjX/QJkTHhPUK5jJ1VnXRORswswDQYJKoZIhvcNAQEFBQAD
-ggEBAFl/1/GkovqnPpz0B58Tzug3Hhak1K4sSPTE2QfT0oKF6ffpMj10rUIGnGcj
-5hS84epevQOIs1KqIQoU+1FHk80u7QQ6SjeUwOEaRwipBpJJTJ8/8dXYI0AfavuS
-N6dZU+zaXvYQm3gesWDi//33j8mZ33uCrfGw+hg3VlG6eZddAivDSXMDTodksf4W
-3wkXzErY365XtwnOvKJmnhR3WB7kQuHsAInMmm0AIBtv1cNFprAGDMMyLrIIXwQG
-Yd9szbOmM5Uq2s8WY9fuOWBLbcvTlgwdr+kT9XG5Z81h96q13zi8+a5/aoSEDCyv
-miWCUgajCZNCnjKwKj7taWSFWuw=
-					    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.univ-fcomte.fr/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">Université de Franche-Comté</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Université de Franche-Comté</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <EmailAddress>ghislain.pruniaux@univ-fcomte.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.univ-fcomte.fr.xml b/swamid-interfederations-2.0/idp.univ-fcomte.fr.xml
deleted file mode 100644
index add4dc14..00000000
--- a/swamid-interfederations-2.0/idp.univ-fcomte.fr.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://idp.univ-fcomte.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2009-09-15T12:46:40Z">
-      <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">univ-fcomte.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">Université de Franche-Comté</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDMzCCAhugAwIBAgIUW6mVllZscKchJexSqcEND0YtS8AwDQYJKoZIhvcNAQEF
-BQAwHTEbMBkGA1UEAxMSaWRwLnVuaXYtZmNvbXRlLmZyMB4XDTA5MDkyMjA5MjY0
-OFoXDTI5MDkyMjA5MjY0OFowHTEbMBkGA1UEAxMSaWRwLnVuaXYtZmNvbXRlLmZy
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAo5IZG9vjS65fZl4V7Rj0
-7m98ICKvOdEKifDECnogADu3DKKwTgNRFdluGjA97M/vLYGyDPIxp6WH5/Xn402n
-dBKoR7x4cCPxcbreXqstbObb6DKLQ9wno2kZGHhCGnSbP04GruIKoLjtZJ0HjkYY
-805ZEB+yR543hZoAKvYoL7yNfkbhw4pqiHocd7lDjeW30airDj26endmgxKMDdma
-QZc+SZQih2c4pwvFeY478VxvMC34U9r+bnljREDXNk6j342vIKTqSEhf2UgMcd6/
-ox+ozGhstsDwRPecDyLm9t4VtcL7jAwC2mF/zhAkziDQ1ZSqszLOpM94kPW8rdvC
-7QIDAQABo2swaTBIBgNVHREEQTA/ghJpZHAudW5pdi1mY29tdGUuZnKGKWh0dHBz
-Oi8vaWRwLnVuaXYtZmNvbXRlLmZyL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBTr
-IVfDPghF09R0vhBjtKCIU7ibzjANBgkqhkiG9w0BAQUFAAOCAQEAjuMuu1Jhi1x6
-6ePM1bMbdyGTRAiWeQIBQsHkz6xbHOzAL86/bgIw2hgQqcjq1Tzy3OTFFsduAW1N
-wIfDITbZ1Bg2FecmYpdxzpwzzTgnPzpaztN013WlCkXURlbf4LP2OBpGe0gC488N
-v720Gk3YrUSZ4Qvfrr15kRsb92unQ87qT7JWGnp8+3/e8Cuw93bNZZY+rgAjLm8z
-XqW8svXuUo4q0dQH93j8YzV7Ehhri1crpeix9jNFHU9Nv1UNT4a1kFgbvtqvbJEK
-nN/RMfsKrrdgX8j3c+CoTxWr/whb+1TSruMB/J1PgNArpPGxNDJEoZloNEMAowoU
-IVPuFCeDJg==
-					    </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>
-					      MIIDQDCCAiigAwIBAgIVAO/8T+HZ1meHZeUYYGYKknaNCO9jMA0GCSqGSIb3DQEB
-BQUAMCAxHjAcBgNVBAMTFXVmYzExMy51bml2LWZjb210ZS5mcjAeFw0wOTA2MjUx
-MTQ3MzJaFw0xMjA2MjUxMTQ3MzJaMCAxHjAcBgNVBAMTFXVmYzExMy51bml2LWZj
-b210ZS5mcjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKtQ/+GORbpD
-E5V4drXcwRL9W+hW5IH4hfeJ9garnrJXVDHz2+2NujNZLFudKsWLmzEtdsV9I80H
-xuvQPeXjwUTu3eA1aPBhG3ffijmAF30+fe72zrWT1lxtwkPPlvAl9NuB3GgRPD4j
-+ZCie2/pZ96zrjxP4OFtzWe29pn1cSNtoRppoVlejHLSx8xLMWygEVKHo48yvSxO
-r1CD0XuI9N4xcHfT9PqMwvcHNk4GJ7K+KbmQaLT5LcbOHHInrij77FjyjMyA53+H
-P1bFHJsXkpTqctjDpWECiqhZq7vT5UmU2BxtKf5DJGvZ1bXu+lZGwvw/umH1bzDo
-8v0IbqJM2MUCAwEAAaNxMG8wTgYDVR0RBEcwRYIVdWZjMTEzLnVuaXYtZmNvbXRl
-LmZyhixodHRwczovL3VmYzExMy51bml2LWZjb210ZS5mci9pZHAvc2hpYmJvbGV0
-aDAdBgNVHQ4EFgQU7ZjX/QJkTHhPUK5jJ1VnXRORswswDQYJKoZIhvcNAQEFBQAD
-ggEBAFl/1/GkovqnPpz0B58Tzug3Hhak1K4sSPTE2QfT0oKF6ffpMj10rUIGnGcj
-5hS84epevQOIs1KqIQoU+1FHk80u7QQ6SjeUwOEaRwipBpJJTJ8/8dXYI0AfavuS
-N6dZU+zaXvYQm3gesWDi//33j8mZ33uCrfGw+hg3VlG6eZddAivDSXMDTodksf4W
-3wkXzErY365XtwnOvKJmnhR3WB7kQuHsAInMmm0AIBtv1cNFprAGDMMyLrIIXwQG
-Yd9szbOmM5Uq2s8WY9fuOWBLbcvTlgwdr+kT9XG5Z81h96q13zi8+a5/aoSEDCyv
-miWCUgajCZNCnjKwKj7taWSFWuw=
-					    </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://idp.univ-fcomte.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.univ-fcomte.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.univ-fcomte.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">univ-fcomte.fr</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDMzCCAhugAwIBAgIUW6mVllZscKchJexSqcEND0YtS8AwDQYJKoZIhvcNAQEF
-BQAwHTEbMBkGA1UEAxMSaWRwLnVuaXYtZmNvbXRlLmZyMB4XDTA5MDkyMjA5MjY0
-OFoXDTI5MDkyMjA5MjY0OFowHTEbMBkGA1UEAxMSaWRwLnVuaXYtZmNvbXRlLmZy
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAo5IZG9vjS65fZl4V7Rj0
-7m98ICKvOdEKifDECnogADu3DKKwTgNRFdluGjA97M/vLYGyDPIxp6WH5/Xn402n
-dBKoR7x4cCPxcbreXqstbObb6DKLQ9wno2kZGHhCGnSbP04GruIKoLjtZJ0HjkYY
-805ZEB+yR543hZoAKvYoL7yNfkbhw4pqiHocd7lDjeW30airDj26endmgxKMDdma
-QZc+SZQih2c4pwvFeY478VxvMC34U9r+bnljREDXNk6j342vIKTqSEhf2UgMcd6/
-ox+ozGhstsDwRPecDyLm9t4VtcL7jAwC2mF/zhAkziDQ1ZSqszLOpM94kPW8rdvC
-7QIDAQABo2swaTBIBgNVHREEQTA/ghJpZHAudW5pdi1mY29tdGUuZnKGKWh0dHBz
-Oi8vaWRwLnVuaXYtZmNvbXRlLmZyL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBTr
-IVfDPghF09R0vhBjtKCIU7ibzjANBgkqhkiG9w0BAQUFAAOCAQEAjuMuu1Jhi1x6
-6ePM1bMbdyGTRAiWeQIBQsHkz6xbHOzAL86/bgIw2hgQqcjq1Tzy3OTFFsduAW1N
-wIfDITbZ1Bg2FecmYpdxzpwzzTgnPzpaztN013WlCkXURlbf4LP2OBpGe0gC488N
-v720Gk3YrUSZ4Qvfrr15kRsb92unQ87qT7JWGnp8+3/e8Cuw93bNZZY+rgAjLm8z
-XqW8svXuUo4q0dQH93j8YzV7Ehhri1crpeix9jNFHU9Nv1UNT4a1kFgbvtqvbJEK
-nN/RMfsKrrdgX8j3c+CoTxWr/whb+1TSruMB/J1PgNArpPGxNDJEoZloNEMAowoU
-IVPuFCeDJg==
-					    </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>
-					      MIIDQDCCAiigAwIBAgIVAO/8T+HZ1meHZeUYYGYKknaNCO9jMA0GCSqGSIb3DQEB
-BQUAMCAxHjAcBgNVBAMTFXVmYzExMy51bml2LWZjb210ZS5mcjAeFw0wOTA2MjUx
-MTQ3MzJaFw0xMjA2MjUxMTQ3MzJaMCAxHjAcBgNVBAMTFXVmYzExMy51bml2LWZj
-b210ZS5mcjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKtQ/+GORbpD
-E5V4drXcwRL9W+hW5IH4hfeJ9garnrJXVDHz2+2NujNZLFudKsWLmzEtdsV9I80H
-xuvQPeXjwUTu3eA1aPBhG3ffijmAF30+fe72zrWT1lxtwkPPlvAl9NuB3GgRPD4j
-+ZCie2/pZ96zrjxP4OFtzWe29pn1cSNtoRppoVlejHLSx8xLMWygEVKHo48yvSxO
-r1CD0XuI9N4xcHfT9PqMwvcHNk4GJ7K+KbmQaLT5LcbOHHInrij77FjyjMyA53+H
-P1bFHJsXkpTqctjDpWECiqhZq7vT5UmU2BxtKf5DJGvZ1bXu+lZGwvw/umH1bzDo
-8v0IbqJM2MUCAwEAAaNxMG8wTgYDVR0RBEcwRYIVdWZjMTEzLnVuaXYtZmNvbXRl
-LmZyhixodHRwczovL3VmYzExMy51bml2LWZjb210ZS5mci9pZHAvc2hpYmJvbGV0
-aDAdBgNVHQ4EFgQU7ZjX/QJkTHhPUK5jJ1VnXRORswswDQYJKoZIhvcNAQEFBQAD
-ggEBAFl/1/GkovqnPpz0B58Tzug3Hhak1K4sSPTE2QfT0oKF6ffpMj10rUIGnGcj
-5hS84epevQOIs1KqIQoU+1FHk80u7QQ6SjeUwOEaRwipBpJJTJ8/8dXYI0AfavuS
-N6dZU+zaXvYQm3gesWDi//33j8mZ33uCrfGw+hg3VlG6eZddAivDSXMDTodksf4W
-3wkXzErY365XtwnOvKJmnhR3WB7kQuHsAInMmm0AIBtv1cNFprAGDMMyLrIIXwQG
-Yd9szbOmM5Uq2s8WY9fuOWBLbcvTlgwdr+kT9XG5Z81h96q13zi8+a5/aoSEDCyv
-miWCUgajCZNCnjKwKj7taWSFWuw=
-					    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.univ-fcomte.fr/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">Université de Franche-Comté</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Université de Franche-Comté</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <EmailAddress>ghislain.pruniaux@univ-fcomte.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.univ-lehavre.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.univ-lehavre.fr-idp-shibboleth.xml
deleted file mode 100644
index fba2b638..00000000
--- a/swamid-interfederations-2.0/idp.univ-lehavre.fr-idp-shibboleth.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://idp.univ-lehavre.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2009-05-25T10:50:14Z">
-      <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">univ-lehavre.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">Université du Havre</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDODCCAiCgAwIBAgIVAKVZEzNuUG9OyP1vnILb2oaJys+2MA0GCSqGSIb3DQEB
-BQUAMB4xHDAaBgNVBAMTE2lkcC51bml2LWxlaGF2cmUuZnIwHhcNMTAwMjAxMDc0
-MTAyWhcNMzAwMjAxMDc0MTAyWjAeMRwwGgYDVQQDExNpZHAudW5pdi1sZWhhdnJl
-LmZyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAhJ6/Nn9ySl33BpPd
-S6L9nanWg1w/xaTcjsv0XSZXmLToc2iP0tpNg0VYok5SrFzl+Hw+4QtDvHVTmWLu
-wssMqg0mUHqnObwJE+/KKIN0Olchhpod2YfKbhko6w0QRSA57BkkUa4IPzlnJY58
-Nhz6ZdKn8tiA5NibD7K8JSaP3eurVgO2GKSpz62oQBFLAZNP7WPNC2kRIT6X8D9J
-NgreBINUGhAAsPzv7TmUK5L6lOipeLY3nQMwyOKCYUNViKonkZKE0lxNHWTPMIR0
-8DvVBbFMxn9IjAc+RRuCT24WrJrUhVGI1D+n+aDOgnSdxfFOVjb+grrLbsRRI/lj
-9hRezQIDAQABo20wazBKBgNVHREEQzBBghNpZHAudW5pdi1sZWhhdnJlLmZyhipo
-dHRwczovL2lkcC51bml2LWxlaGF2cmUuZnIvaWRwL3NoaWJib2xldGgwHQYDVR0O
-BBYEFG9bkcW0TdTyz6LDBdJArcI+NflfMA0GCSqGSIb3DQEBBQUAA4IBAQBHfdlt
-GfykSuvsXF1U3BZHLuZb8rsSBNXjkYJ/cAa8owWXMeQ0Z/YFiylsVzuexflm8Zeh
-mvHVJK1IKyUGlNq8XEDxKW+Z9qdaFrXkASExQACMsrITYiYjS51mr14AUsbpJ9VX
-bzqXS0On3K9tjgVXUV4CxkHbb1Ce+9x6lEjtna3Tw4WsNleuz2tWVvB2SecmeCJk
-9rl3+lSEotK7cepJY/AzW9wVBDfFI03j1u7GxY2hlD8r3jEII78lLNQzxUBTYUEf
-Kh1cWQw98Mp+EFgBRhkOjAzOXC58eYmrzBUXqK6y49R2AyBcZZ/uEigEinRINPi7
-TLwIDMskmL3PeTdF
-					    </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://idp.univ-lehavre.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.univ-lehavre.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.univ-lehavre.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">univ-lehavre.fr</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDODCCAiCgAwIBAgIVAKVZEzNuUG9OyP1vnILb2oaJys+2MA0GCSqGSIb3DQEB
-BQUAMB4xHDAaBgNVBAMTE2lkcC51bml2LWxlaGF2cmUuZnIwHhcNMTAwMjAxMDc0
-MTAyWhcNMzAwMjAxMDc0MTAyWjAeMRwwGgYDVQQDExNpZHAudW5pdi1sZWhhdnJl
-LmZyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAhJ6/Nn9ySl33BpPd
-S6L9nanWg1w/xaTcjsv0XSZXmLToc2iP0tpNg0VYok5SrFzl+Hw+4QtDvHVTmWLu
-wssMqg0mUHqnObwJE+/KKIN0Olchhpod2YfKbhko6w0QRSA57BkkUa4IPzlnJY58
-Nhz6ZdKn8tiA5NibD7K8JSaP3eurVgO2GKSpz62oQBFLAZNP7WPNC2kRIT6X8D9J
-NgreBINUGhAAsPzv7TmUK5L6lOipeLY3nQMwyOKCYUNViKonkZKE0lxNHWTPMIR0
-8DvVBbFMxn9IjAc+RRuCT24WrJrUhVGI1D+n+aDOgnSdxfFOVjb+grrLbsRRI/lj
-9hRezQIDAQABo20wazBKBgNVHREEQzBBghNpZHAudW5pdi1sZWhhdnJlLmZyhipo
-dHRwczovL2lkcC51bml2LWxlaGF2cmUuZnIvaWRwL3NoaWJib2xldGgwHQYDVR0O
-BBYEFG9bkcW0TdTyz6LDBdJArcI+NflfMA0GCSqGSIb3DQEBBQUAA4IBAQBHfdlt
-GfykSuvsXF1U3BZHLuZb8rsSBNXjkYJ/cAa8owWXMeQ0Z/YFiylsVzuexflm8Zeh
-mvHVJK1IKyUGlNq8XEDxKW+Z9qdaFrXkASExQACMsrITYiYjS51mr14AUsbpJ9VX
-bzqXS0On3K9tjgVXUV4CxkHbb1Ce+9x6lEjtna3Tw4WsNleuz2tWVvB2SecmeCJk
-9rl3+lSEotK7cepJY/AzW9wVBDfFI03j1u7GxY2hlD8r3jEII78lLNQzxUBTYUEf
-Kh1cWQw98Mp+EFgBRhkOjAzOXC58eYmrzBUXqK6y49R2AyBcZZ/uEigEinRINPi7
-TLwIDMskmL3PeTdF
-					    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.univ-lehavre.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">Université du Havre</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Université du Havre</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>AUGER Géraldine</SurName>
-    <EmailAddress>geraldine.auger@univ-lehavre.fr</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <SurName>COIRRE Mickaël</SurName>
-    <EmailAddress>mickael.coirre@univ-lehavre.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.univ-lehavre.fr.xml b/swamid-interfederations-2.0/idp.univ-lehavre.fr.xml
deleted file mode 100644
index fba2b638..00000000
--- a/swamid-interfederations-2.0/idp.univ-lehavre.fr.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://idp.univ-lehavre.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2009-05-25T10:50:14Z">
-      <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">univ-lehavre.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">Université du Havre</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDODCCAiCgAwIBAgIVAKVZEzNuUG9OyP1vnILb2oaJys+2MA0GCSqGSIb3DQEB
-BQUAMB4xHDAaBgNVBAMTE2lkcC51bml2LWxlaGF2cmUuZnIwHhcNMTAwMjAxMDc0
-MTAyWhcNMzAwMjAxMDc0MTAyWjAeMRwwGgYDVQQDExNpZHAudW5pdi1sZWhhdnJl
-LmZyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAhJ6/Nn9ySl33BpPd
-S6L9nanWg1w/xaTcjsv0XSZXmLToc2iP0tpNg0VYok5SrFzl+Hw+4QtDvHVTmWLu
-wssMqg0mUHqnObwJE+/KKIN0Olchhpod2YfKbhko6w0QRSA57BkkUa4IPzlnJY58
-Nhz6ZdKn8tiA5NibD7K8JSaP3eurVgO2GKSpz62oQBFLAZNP7WPNC2kRIT6X8D9J
-NgreBINUGhAAsPzv7TmUK5L6lOipeLY3nQMwyOKCYUNViKonkZKE0lxNHWTPMIR0
-8DvVBbFMxn9IjAc+RRuCT24WrJrUhVGI1D+n+aDOgnSdxfFOVjb+grrLbsRRI/lj
-9hRezQIDAQABo20wazBKBgNVHREEQzBBghNpZHAudW5pdi1sZWhhdnJlLmZyhipo
-dHRwczovL2lkcC51bml2LWxlaGF2cmUuZnIvaWRwL3NoaWJib2xldGgwHQYDVR0O
-BBYEFG9bkcW0TdTyz6LDBdJArcI+NflfMA0GCSqGSIb3DQEBBQUAA4IBAQBHfdlt
-GfykSuvsXF1U3BZHLuZb8rsSBNXjkYJ/cAa8owWXMeQ0Z/YFiylsVzuexflm8Zeh
-mvHVJK1IKyUGlNq8XEDxKW+Z9qdaFrXkASExQACMsrITYiYjS51mr14AUsbpJ9VX
-bzqXS0On3K9tjgVXUV4CxkHbb1Ce+9x6lEjtna3Tw4WsNleuz2tWVvB2SecmeCJk
-9rl3+lSEotK7cepJY/AzW9wVBDfFI03j1u7GxY2hlD8r3jEII78lLNQzxUBTYUEf
-Kh1cWQw98Mp+EFgBRhkOjAzOXC58eYmrzBUXqK6y49R2AyBcZZ/uEigEinRINPi7
-TLwIDMskmL3PeTdF
-					    </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://idp.univ-lehavre.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.univ-lehavre.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.univ-lehavre.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">univ-lehavre.fr</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDODCCAiCgAwIBAgIVAKVZEzNuUG9OyP1vnILb2oaJys+2MA0GCSqGSIb3DQEB
-BQUAMB4xHDAaBgNVBAMTE2lkcC51bml2LWxlaGF2cmUuZnIwHhcNMTAwMjAxMDc0
-MTAyWhcNMzAwMjAxMDc0MTAyWjAeMRwwGgYDVQQDExNpZHAudW5pdi1sZWhhdnJl
-LmZyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAhJ6/Nn9ySl33BpPd
-S6L9nanWg1w/xaTcjsv0XSZXmLToc2iP0tpNg0VYok5SrFzl+Hw+4QtDvHVTmWLu
-wssMqg0mUHqnObwJE+/KKIN0Olchhpod2YfKbhko6w0QRSA57BkkUa4IPzlnJY58
-Nhz6ZdKn8tiA5NibD7K8JSaP3eurVgO2GKSpz62oQBFLAZNP7WPNC2kRIT6X8D9J
-NgreBINUGhAAsPzv7TmUK5L6lOipeLY3nQMwyOKCYUNViKonkZKE0lxNHWTPMIR0
-8DvVBbFMxn9IjAc+RRuCT24WrJrUhVGI1D+n+aDOgnSdxfFOVjb+grrLbsRRI/lj
-9hRezQIDAQABo20wazBKBgNVHREEQzBBghNpZHAudW5pdi1sZWhhdnJlLmZyhipo
-dHRwczovL2lkcC51bml2LWxlaGF2cmUuZnIvaWRwL3NoaWJib2xldGgwHQYDVR0O
-BBYEFG9bkcW0TdTyz6LDBdJArcI+NflfMA0GCSqGSIb3DQEBBQUAA4IBAQBHfdlt
-GfykSuvsXF1U3BZHLuZb8rsSBNXjkYJ/cAa8owWXMeQ0Z/YFiylsVzuexflm8Zeh
-mvHVJK1IKyUGlNq8XEDxKW+Z9qdaFrXkASExQACMsrITYiYjS51mr14AUsbpJ9VX
-bzqXS0On3K9tjgVXUV4CxkHbb1Ce+9x6lEjtna3Tw4WsNleuz2tWVvB2SecmeCJk
-9rl3+lSEotK7cepJY/AzW9wVBDfFI03j1u7GxY2hlD8r3jEII78lLNQzxUBTYUEf
-Kh1cWQw98Mp+EFgBRhkOjAzOXC58eYmrzBUXqK6y49R2AyBcZZ/uEigEinRINPi7
-TLwIDMskmL3PeTdF
-					    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.univ-lehavre.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">Université du Havre</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Université du Havre</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>AUGER Géraldine</SurName>
-    <EmailAddress>geraldine.auger@univ-lehavre.fr</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <SurName>COIRRE Mickaël</SurName>
-    <EmailAddress>mickael.coirre@univ-lehavre.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.univ-lille3.fr-idp.xml b/swamid-interfederations-2.0/idp.univ-lille3.fr-idp.xml
deleted file mode 100644
index 5cc5142a..00000000
--- a/swamid-interfederations-2.0/idp.univ-lille3.fr-idp.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://idp.univ-lille3.fr/idp">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2010-01-27T11:52:40Z">
-      <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">univ-lille3.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">Université Lille 3</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIFvTCCBKWgAwIBAgIQRAUZO7HUWDyhwIniHCjSrzANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTEyMTIyMTAwMDAwMFoXDTE2MDEyNTIzNTk1OVowgZUxCzAJBgNV
-BAYTAkZSMTkwNwYDVQQKEzBVbml2ZXJzaXRlIExpbGxlIDMgU2NpZW5jZXMgSHVt
-YWluZXMgZXQgU29jaWFsZXMxLjAsBgNVBAsTJURpcmVjdGlvbiBkZXMgU3lzdGVt
-ZXMgZCdJbmZvcm1hdGlvbnMxGzAZBgNVBAMTEmlkcC51bml2LWxpbGxlMy5mcjCC
-AiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAKJBlXCU6eHp/JgG+GVNXhC6
-KYCNfwArzTRGutyhWOZbYxBk4VWI9C6RMtysunPq8DqRu8RZ3N/oCZUQ7uJO8/g2
-KqlzVd/PUYajeDe46jNzglXMne8xHQ4cm8ziNmdlN5PLAlB3SElv7IcEbYgKy55U
-poF8gqYla/aCgj0OT+NqzMd7WQvDIrH51616SpmdGMG+Gu28p01AgHj4SZgHDaLY
-TNxiih6hLXG6Sqf9KGrEIx72Vq5P9bX7T8w8EzteFL5tbJOfjL4PsvcJBJ0FbPCY
-TdPPJMiFqi760/QLESl42OaYyIcD9qzzlOeObdX6ympj4P9X6VN2A0JRyx5rxt1e
-/LCW/Mz4O3p0hrdlq1BXVfps97fC11vtMbjHXMmVfNdQUuzNI+FewRpPlRoB4qy4
-W9WoHD2Bl9ZT3nm4aNE4J6dLIMvBRHirkvukEDWjVJ11pP0AAgkHmyLb4MKRAkvd
-pmZbYjynanL8Ih9GZWIcIJWvnrjn9SpceQ6RordZ+G5k1115KM26J/eH1YubWPFs
-wVAwfig9xDax6TA9ff1xhViSmnFO8fJOLvNq61ajILz2BFtvrnQdHp4eJHIdS9FM
-zIpCad0iztAZj9Kh+pSb1R+g35ZRJ6mDUyDDA0ja5j/OEc/m9o9+kxDn0hbXU4qr
-oXZ09G3q+DU2pKBhVdwhAgMBAAGjggFlMIIBYTAfBgNVHSMEGDAWgBQMvZNoDPPe
-q6NJays3V0fqkOO57TAdBgNVHQ4EFgQUW7h7laZgkKdIp8RVCADRQh+a2OwwDgYD
-VR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEG
-CCsGAQUFBwMCMBgGA1UdIAQRMA8wDQYLKwYBBAGyMQECAh0wOgYDVR0fBDMwMTAv
-oC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcmww
-bQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRjcy50ZXJl
-bmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDovL29jc3Au
-dGNzLnRlcmVuYS5vcmcwHQYDVR0RBBYwFIISaWRwLnVuaXYtbGlsbGUzLmZyMA0G
-CSqGSIb3DQEBBQUAA4IBAQA4Vn31FsJwo8S0yhg1GbW8XK+wBkic3E/DfZ7Fk2UC
-87RKVY2s+mj1GljXCzUTz9TRrv9oqyWn1T2LyjJB51Hq8QwOmauz8aY9/M+l8w0e
-f/dOy9TWBleXkbNV6EVKmL5yXC/9tBcvz+ROAMoP/SuZKfB1+t/dtflwOUrfa/Rg
-8Hcf4DDa8kGEW3h0D1Mm9+NXPIL7XsWKYmKAqT3hljLoHsKId0f4cCDs1sVw/GbN
-VUkaXSsU3z1l3pbQ0ag0DCBEct0kI6h7npi8y8M+NtE+SDmu5r6+k4T/35sabheC
-mR/dAiU9Lbx17eGNeLgWiVw6qSW4Y6Ty/Hp2QENstkyH
-					    </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>
-					      MIIEzTCCA7WgAwIBAgIQYDIh1KY11M3WgvldGfZ7RjANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTEwMDEyNzAwMDAwMFoXDTEzMDEyNjIzNTk1OVowgaUxCzAJBgNV
-BAYTAkZSMRowGAYDVQQHExFWSUxMRU5FVVZFIEQnQVNDUTEwMC4GA1UECgwnVW5p
-dmVyc2l0w6kgQ2hhcmxlcyBkZSBHYXVsbGUgLSBMaWxsZSAzMSswKQYDVQQLEyJD
-ZW50cmUgZGUgUmVzc291cmNlcyBJbmZvcm1hdGlxdWVzMRswGQYDVQQDExJpZHAu
-dW5pdi1saWxsZTMuZnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC/
-lljw0dMtyxsufKDjv4+JXtAsPcVkGU29ZeWhP/m8z7QcnZD2AvmXAk/BR7IQqAKY
-cDyUamIiVP1XRm3WGIfHpwWuy8AKEUHE5QgJB/rMXa5fArai9ec+7tMPiueFUwHk
-3g4DGj6x8e91Cv8a1j6csP8/0y+qUNeaRPUNbCbtyqdwKvqpI23zceLaxJD1Uaqp
-23i9WIRY49leYoAPdPqldj3pxj4dKZhOJxqU0K/3y6gG2/LfoSXlsM8a9JXLWaWk
-CBrgLLuOsFE2DRneIOgZJjr8s9pydvOHeCgFk6693eVbodQlUaVIuZfBEW3u0naO
-Wq69LY0S0aD2gCmHaziFAgMBAAGjggFlMIIBYTAfBgNVHSMEGDAWgBQMvZNoDPPe
-q6NJays3V0fqkOO57TAdBgNVHQ4EFgQUeBYv24vRi/V67b1lEfk2+y9rWBwwDgYD
-VR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEG
-CCsGAQUFBwMCMBgGA1UdIAQRMA8wDQYLKwYBBAGyMQECAh0wOgYDVR0fBDMwMTAv
-oC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcmww
-bQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRjcy50ZXJl
-bmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDovL29jc3Au
-dGNzLnRlcmVuYS5vcmcwHQYDVR0RBBYwFIISaWRwLnVuaXYtbGlsbGUzLmZyMA0G
-CSqGSIb3DQEBBQUAA4IBAQBVtPB0DhSyKb6wpRRWt/zyCD4KyfmcifHTpmX/+Uqy
-UisGAqs3F9GaPBBTSfw++n8IeH/tzHXz+8+bz0q0XvB9ibN6oAZ7PpqhvKMOjiv7
-rfqbEoaK6FU4IHrLGI8iwxZXrHgRTUraoldd2eDpDa5ccMgWlYpz8WR3t8/tt2/R
-c2Ou12Nl05z0FtAPTFgflsBKd0PQTEDvpkyR8sHxG1pagcMtRxrT+F8T34h0QEZe
-xO+4QSEL3ssYjePmj6Oj154B1v9ghnsSIcbokzfXI07d51wpy0zGpdDDOJglheMu
-MXsvpupYbpRaf9GGX6Eu5xRuvQN/dFK6o4rzHEbgL3Ri
-					    </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://idp.univ-lille3.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.univ-lille3.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.univ-lille3.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">univ-lille3.fr</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIFvTCCBKWgAwIBAgIQRAUZO7HUWDyhwIniHCjSrzANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTEyMTIyMTAwMDAwMFoXDTE2MDEyNTIzNTk1OVowgZUxCzAJBgNV
-BAYTAkZSMTkwNwYDVQQKEzBVbml2ZXJzaXRlIExpbGxlIDMgU2NpZW5jZXMgSHVt
-YWluZXMgZXQgU29jaWFsZXMxLjAsBgNVBAsTJURpcmVjdGlvbiBkZXMgU3lzdGVt
-ZXMgZCdJbmZvcm1hdGlvbnMxGzAZBgNVBAMTEmlkcC51bml2LWxpbGxlMy5mcjCC
-AiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAKJBlXCU6eHp/JgG+GVNXhC6
-KYCNfwArzTRGutyhWOZbYxBk4VWI9C6RMtysunPq8DqRu8RZ3N/oCZUQ7uJO8/g2
-KqlzVd/PUYajeDe46jNzglXMne8xHQ4cm8ziNmdlN5PLAlB3SElv7IcEbYgKy55U
-poF8gqYla/aCgj0OT+NqzMd7WQvDIrH51616SpmdGMG+Gu28p01AgHj4SZgHDaLY
-TNxiih6hLXG6Sqf9KGrEIx72Vq5P9bX7T8w8EzteFL5tbJOfjL4PsvcJBJ0FbPCY
-TdPPJMiFqi760/QLESl42OaYyIcD9qzzlOeObdX6ympj4P9X6VN2A0JRyx5rxt1e
-/LCW/Mz4O3p0hrdlq1BXVfps97fC11vtMbjHXMmVfNdQUuzNI+FewRpPlRoB4qy4
-W9WoHD2Bl9ZT3nm4aNE4J6dLIMvBRHirkvukEDWjVJ11pP0AAgkHmyLb4MKRAkvd
-pmZbYjynanL8Ih9GZWIcIJWvnrjn9SpceQ6RordZ+G5k1115KM26J/eH1YubWPFs
-wVAwfig9xDax6TA9ff1xhViSmnFO8fJOLvNq61ajILz2BFtvrnQdHp4eJHIdS9FM
-zIpCad0iztAZj9Kh+pSb1R+g35ZRJ6mDUyDDA0ja5j/OEc/m9o9+kxDn0hbXU4qr
-oXZ09G3q+DU2pKBhVdwhAgMBAAGjggFlMIIBYTAfBgNVHSMEGDAWgBQMvZNoDPPe
-q6NJays3V0fqkOO57TAdBgNVHQ4EFgQUW7h7laZgkKdIp8RVCADRQh+a2OwwDgYD
-VR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEG
-CCsGAQUFBwMCMBgGA1UdIAQRMA8wDQYLKwYBBAGyMQECAh0wOgYDVR0fBDMwMTAv
-oC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcmww
-bQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRjcy50ZXJl
-bmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDovL29jc3Au
-dGNzLnRlcmVuYS5vcmcwHQYDVR0RBBYwFIISaWRwLnVuaXYtbGlsbGUzLmZyMA0G
-CSqGSIb3DQEBBQUAA4IBAQA4Vn31FsJwo8S0yhg1GbW8XK+wBkic3E/DfZ7Fk2UC
-87RKVY2s+mj1GljXCzUTz9TRrv9oqyWn1T2LyjJB51Hq8QwOmauz8aY9/M+l8w0e
-f/dOy9TWBleXkbNV6EVKmL5yXC/9tBcvz+ROAMoP/SuZKfB1+t/dtflwOUrfa/Rg
-8Hcf4DDa8kGEW3h0D1Mm9+NXPIL7XsWKYmKAqT3hljLoHsKId0f4cCDs1sVw/GbN
-VUkaXSsU3z1l3pbQ0ag0DCBEct0kI6h7npi8y8M+NtE+SDmu5r6+k4T/35sabheC
-mR/dAiU9Lbx17eGNeLgWiVw6qSW4Y6Ty/Hp2QENstkyH
-					    </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>
-					      MIIEzTCCA7WgAwIBAgIQYDIh1KY11M3WgvldGfZ7RjANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTEwMDEyNzAwMDAwMFoXDTEzMDEyNjIzNTk1OVowgaUxCzAJBgNV
-BAYTAkZSMRowGAYDVQQHExFWSUxMRU5FVVZFIEQnQVNDUTEwMC4GA1UECgwnVW5p
-dmVyc2l0w6kgQ2hhcmxlcyBkZSBHYXVsbGUgLSBMaWxsZSAzMSswKQYDVQQLEyJD
-ZW50cmUgZGUgUmVzc291cmNlcyBJbmZvcm1hdGlxdWVzMRswGQYDVQQDExJpZHAu
-dW5pdi1saWxsZTMuZnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC/
-lljw0dMtyxsufKDjv4+JXtAsPcVkGU29ZeWhP/m8z7QcnZD2AvmXAk/BR7IQqAKY
-cDyUamIiVP1XRm3WGIfHpwWuy8AKEUHE5QgJB/rMXa5fArai9ec+7tMPiueFUwHk
-3g4DGj6x8e91Cv8a1j6csP8/0y+qUNeaRPUNbCbtyqdwKvqpI23zceLaxJD1Uaqp
-23i9WIRY49leYoAPdPqldj3pxj4dKZhOJxqU0K/3y6gG2/LfoSXlsM8a9JXLWaWk
-CBrgLLuOsFE2DRneIOgZJjr8s9pydvOHeCgFk6693eVbodQlUaVIuZfBEW3u0naO
-Wq69LY0S0aD2gCmHaziFAgMBAAGjggFlMIIBYTAfBgNVHSMEGDAWgBQMvZNoDPPe
-q6NJays3V0fqkOO57TAdBgNVHQ4EFgQUeBYv24vRi/V67b1lEfk2+y9rWBwwDgYD
-VR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEG
-CCsGAQUFBwMCMBgGA1UdIAQRMA8wDQYLKwYBBAGyMQECAh0wOgYDVR0fBDMwMTAv
-oC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcmww
-bQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRjcy50ZXJl
-bmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDovL29jc3Au
-dGNzLnRlcmVuYS5vcmcwHQYDVR0RBBYwFIISaWRwLnVuaXYtbGlsbGUzLmZyMA0G
-CSqGSIb3DQEBBQUAA4IBAQBVtPB0DhSyKb6wpRRWt/zyCD4KyfmcifHTpmX/+Uqy
-UisGAqs3F9GaPBBTSfw++n8IeH/tzHXz+8+bz0q0XvB9ibN6oAZ7PpqhvKMOjiv7
-rfqbEoaK6FU4IHrLGI8iwxZXrHgRTUraoldd2eDpDa5ccMgWlYpz8WR3t8/tt2/R
-c2Ou12Nl05z0FtAPTFgflsBKd0PQTEDvpkyR8sHxG1pagcMtRxrT+F8T34h0QEZe
-xO+4QSEL3ssYjePmj6Oj154B1v9ghnsSIcbokzfXI07d51wpy0zGpdDDOJglheMu
-MXsvpupYbpRaf9GGX6Eu5xRuvQN/dFK6o4rzHEbgL3Ri
-					    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.univ-lille3.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">Université Lille 3</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Université Lille 3</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <EmailAddress>dsi.shibboleth@univ-lille3.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.univ-lille3.fr.xml b/swamid-interfederations-2.0/idp.univ-lille3.fr.xml
deleted file mode 100644
index 5cc5142a..00000000
--- a/swamid-interfederations-2.0/idp.univ-lille3.fr.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://idp.univ-lille3.fr/idp">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2010-01-27T11:52:40Z">
-      <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">univ-lille3.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">Université Lille 3</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIFvTCCBKWgAwIBAgIQRAUZO7HUWDyhwIniHCjSrzANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTEyMTIyMTAwMDAwMFoXDTE2MDEyNTIzNTk1OVowgZUxCzAJBgNV
-BAYTAkZSMTkwNwYDVQQKEzBVbml2ZXJzaXRlIExpbGxlIDMgU2NpZW5jZXMgSHVt
-YWluZXMgZXQgU29jaWFsZXMxLjAsBgNVBAsTJURpcmVjdGlvbiBkZXMgU3lzdGVt
-ZXMgZCdJbmZvcm1hdGlvbnMxGzAZBgNVBAMTEmlkcC51bml2LWxpbGxlMy5mcjCC
-AiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAKJBlXCU6eHp/JgG+GVNXhC6
-KYCNfwArzTRGutyhWOZbYxBk4VWI9C6RMtysunPq8DqRu8RZ3N/oCZUQ7uJO8/g2
-KqlzVd/PUYajeDe46jNzglXMne8xHQ4cm8ziNmdlN5PLAlB3SElv7IcEbYgKy55U
-poF8gqYla/aCgj0OT+NqzMd7WQvDIrH51616SpmdGMG+Gu28p01AgHj4SZgHDaLY
-TNxiih6hLXG6Sqf9KGrEIx72Vq5P9bX7T8w8EzteFL5tbJOfjL4PsvcJBJ0FbPCY
-TdPPJMiFqi760/QLESl42OaYyIcD9qzzlOeObdX6ympj4P9X6VN2A0JRyx5rxt1e
-/LCW/Mz4O3p0hrdlq1BXVfps97fC11vtMbjHXMmVfNdQUuzNI+FewRpPlRoB4qy4
-W9WoHD2Bl9ZT3nm4aNE4J6dLIMvBRHirkvukEDWjVJ11pP0AAgkHmyLb4MKRAkvd
-pmZbYjynanL8Ih9GZWIcIJWvnrjn9SpceQ6RordZ+G5k1115KM26J/eH1YubWPFs
-wVAwfig9xDax6TA9ff1xhViSmnFO8fJOLvNq61ajILz2BFtvrnQdHp4eJHIdS9FM
-zIpCad0iztAZj9Kh+pSb1R+g35ZRJ6mDUyDDA0ja5j/OEc/m9o9+kxDn0hbXU4qr
-oXZ09G3q+DU2pKBhVdwhAgMBAAGjggFlMIIBYTAfBgNVHSMEGDAWgBQMvZNoDPPe
-q6NJays3V0fqkOO57TAdBgNVHQ4EFgQUW7h7laZgkKdIp8RVCADRQh+a2OwwDgYD
-VR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEG
-CCsGAQUFBwMCMBgGA1UdIAQRMA8wDQYLKwYBBAGyMQECAh0wOgYDVR0fBDMwMTAv
-oC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcmww
-bQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRjcy50ZXJl
-bmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDovL29jc3Au
-dGNzLnRlcmVuYS5vcmcwHQYDVR0RBBYwFIISaWRwLnVuaXYtbGlsbGUzLmZyMA0G
-CSqGSIb3DQEBBQUAA4IBAQA4Vn31FsJwo8S0yhg1GbW8XK+wBkic3E/DfZ7Fk2UC
-87RKVY2s+mj1GljXCzUTz9TRrv9oqyWn1T2LyjJB51Hq8QwOmauz8aY9/M+l8w0e
-f/dOy9TWBleXkbNV6EVKmL5yXC/9tBcvz+ROAMoP/SuZKfB1+t/dtflwOUrfa/Rg
-8Hcf4DDa8kGEW3h0D1Mm9+NXPIL7XsWKYmKAqT3hljLoHsKId0f4cCDs1sVw/GbN
-VUkaXSsU3z1l3pbQ0ag0DCBEct0kI6h7npi8y8M+NtE+SDmu5r6+k4T/35sabheC
-mR/dAiU9Lbx17eGNeLgWiVw6qSW4Y6Ty/Hp2QENstkyH
-					    </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>
-					      MIIEzTCCA7WgAwIBAgIQYDIh1KY11M3WgvldGfZ7RjANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTEwMDEyNzAwMDAwMFoXDTEzMDEyNjIzNTk1OVowgaUxCzAJBgNV
-BAYTAkZSMRowGAYDVQQHExFWSUxMRU5FVVZFIEQnQVNDUTEwMC4GA1UECgwnVW5p
-dmVyc2l0w6kgQ2hhcmxlcyBkZSBHYXVsbGUgLSBMaWxsZSAzMSswKQYDVQQLEyJD
-ZW50cmUgZGUgUmVzc291cmNlcyBJbmZvcm1hdGlxdWVzMRswGQYDVQQDExJpZHAu
-dW5pdi1saWxsZTMuZnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC/
-lljw0dMtyxsufKDjv4+JXtAsPcVkGU29ZeWhP/m8z7QcnZD2AvmXAk/BR7IQqAKY
-cDyUamIiVP1XRm3WGIfHpwWuy8AKEUHE5QgJB/rMXa5fArai9ec+7tMPiueFUwHk
-3g4DGj6x8e91Cv8a1j6csP8/0y+qUNeaRPUNbCbtyqdwKvqpI23zceLaxJD1Uaqp
-23i9WIRY49leYoAPdPqldj3pxj4dKZhOJxqU0K/3y6gG2/LfoSXlsM8a9JXLWaWk
-CBrgLLuOsFE2DRneIOgZJjr8s9pydvOHeCgFk6693eVbodQlUaVIuZfBEW3u0naO
-Wq69LY0S0aD2gCmHaziFAgMBAAGjggFlMIIBYTAfBgNVHSMEGDAWgBQMvZNoDPPe
-q6NJays3V0fqkOO57TAdBgNVHQ4EFgQUeBYv24vRi/V67b1lEfk2+y9rWBwwDgYD
-VR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEG
-CCsGAQUFBwMCMBgGA1UdIAQRMA8wDQYLKwYBBAGyMQECAh0wOgYDVR0fBDMwMTAv
-oC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcmww
-bQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRjcy50ZXJl
-bmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDovL29jc3Au
-dGNzLnRlcmVuYS5vcmcwHQYDVR0RBBYwFIISaWRwLnVuaXYtbGlsbGUzLmZyMA0G
-CSqGSIb3DQEBBQUAA4IBAQBVtPB0DhSyKb6wpRRWt/zyCD4KyfmcifHTpmX/+Uqy
-UisGAqs3F9GaPBBTSfw++n8IeH/tzHXz+8+bz0q0XvB9ibN6oAZ7PpqhvKMOjiv7
-rfqbEoaK6FU4IHrLGI8iwxZXrHgRTUraoldd2eDpDa5ccMgWlYpz8WR3t8/tt2/R
-c2Ou12Nl05z0FtAPTFgflsBKd0PQTEDvpkyR8sHxG1pagcMtRxrT+F8T34h0QEZe
-xO+4QSEL3ssYjePmj6Oj154B1v9ghnsSIcbokzfXI07d51wpy0zGpdDDOJglheMu
-MXsvpupYbpRaf9GGX6Eu5xRuvQN/dFK6o4rzHEbgL3Ri
-					    </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://idp.univ-lille3.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.univ-lille3.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.univ-lille3.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">univ-lille3.fr</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIFvTCCBKWgAwIBAgIQRAUZO7HUWDyhwIniHCjSrzANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTEyMTIyMTAwMDAwMFoXDTE2MDEyNTIzNTk1OVowgZUxCzAJBgNV
-BAYTAkZSMTkwNwYDVQQKEzBVbml2ZXJzaXRlIExpbGxlIDMgU2NpZW5jZXMgSHVt
-YWluZXMgZXQgU29jaWFsZXMxLjAsBgNVBAsTJURpcmVjdGlvbiBkZXMgU3lzdGVt
-ZXMgZCdJbmZvcm1hdGlvbnMxGzAZBgNVBAMTEmlkcC51bml2LWxpbGxlMy5mcjCC
-AiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAKJBlXCU6eHp/JgG+GVNXhC6
-KYCNfwArzTRGutyhWOZbYxBk4VWI9C6RMtysunPq8DqRu8RZ3N/oCZUQ7uJO8/g2
-KqlzVd/PUYajeDe46jNzglXMne8xHQ4cm8ziNmdlN5PLAlB3SElv7IcEbYgKy55U
-poF8gqYla/aCgj0OT+NqzMd7WQvDIrH51616SpmdGMG+Gu28p01AgHj4SZgHDaLY
-TNxiih6hLXG6Sqf9KGrEIx72Vq5P9bX7T8w8EzteFL5tbJOfjL4PsvcJBJ0FbPCY
-TdPPJMiFqi760/QLESl42OaYyIcD9qzzlOeObdX6ympj4P9X6VN2A0JRyx5rxt1e
-/LCW/Mz4O3p0hrdlq1BXVfps97fC11vtMbjHXMmVfNdQUuzNI+FewRpPlRoB4qy4
-W9WoHD2Bl9ZT3nm4aNE4J6dLIMvBRHirkvukEDWjVJ11pP0AAgkHmyLb4MKRAkvd
-pmZbYjynanL8Ih9GZWIcIJWvnrjn9SpceQ6RordZ+G5k1115KM26J/eH1YubWPFs
-wVAwfig9xDax6TA9ff1xhViSmnFO8fJOLvNq61ajILz2BFtvrnQdHp4eJHIdS9FM
-zIpCad0iztAZj9Kh+pSb1R+g35ZRJ6mDUyDDA0ja5j/OEc/m9o9+kxDn0hbXU4qr
-oXZ09G3q+DU2pKBhVdwhAgMBAAGjggFlMIIBYTAfBgNVHSMEGDAWgBQMvZNoDPPe
-q6NJays3V0fqkOO57TAdBgNVHQ4EFgQUW7h7laZgkKdIp8RVCADRQh+a2OwwDgYD
-VR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEG
-CCsGAQUFBwMCMBgGA1UdIAQRMA8wDQYLKwYBBAGyMQECAh0wOgYDVR0fBDMwMTAv
-oC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcmww
-bQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRjcy50ZXJl
-bmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDovL29jc3Au
-dGNzLnRlcmVuYS5vcmcwHQYDVR0RBBYwFIISaWRwLnVuaXYtbGlsbGUzLmZyMA0G
-CSqGSIb3DQEBBQUAA4IBAQA4Vn31FsJwo8S0yhg1GbW8XK+wBkic3E/DfZ7Fk2UC
-87RKVY2s+mj1GljXCzUTz9TRrv9oqyWn1T2LyjJB51Hq8QwOmauz8aY9/M+l8w0e
-f/dOy9TWBleXkbNV6EVKmL5yXC/9tBcvz+ROAMoP/SuZKfB1+t/dtflwOUrfa/Rg
-8Hcf4DDa8kGEW3h0D1Mm9+NXPIL7XsWKYmKAqT3hljLoHsKId0f4cCDs1sVw/GbN
-VUkaXSsU3z1l3pbQ0ag0DCBEct0kI6h7npi8y8M+NtE+SDmu5r6+k4T/35sabheC
-mR/dAiU9Lbx17eGNeLgWiVw6qSW4Y6Ty/Hp2QENstkyH
-					    </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>
-					      MIIEzTCCA7WgAwIBAgIQYDIh1KY11M3WgvldGfZ7RjANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTEwMDEyNzAwMDAwMFoXDTEzMDEyNjIzNTk1OVowgaUxCzAJBgNV
-BAYTAkZSMRowGAYDVQQHExFWSUxMRU5FVVZFIEQnQVNDUTEwMC4GA1UECgwnVW5p
-dmVyc2l0w6kgQ2hhcmxlcyBkZSBHYXVsbGUgLSBMaWxsZSAzMSswKQYDVQQLEyJD
-ZW50cmUgZGUgUmVzc291cmNlcyBJbmZvcm1hdGlxdWVzMRswGQYDVQQDExJpZHAu
-dW5pdi1saWxsZTMuZnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC/
-lljw0dMtyxsufKDjv4+JXtAsPcVkGU29ZeWhP/m8z7QcnZD2AvmXAk/BR7IQqAKY
-cDyUamIiVP1XRm3WGIfHpwWuy8AKEUHE5QgJB/rMXa5fArai9ec+7tMPiueFUwHk
-3g4DGj6x8e91Cv8a1j6csP8/0y+qUNeaRPUNbCbtyqdwKvqpI23zceLaxJD1Uaqp
-23i9WIRY49leYoAPdPqldj3pxj4dKZhOJxqU0K/3y6gG2/LfoSXlsM8a9JXLWaWk
-CBrgLLuOsFE2DRneIOgZJjr8s9pydvOHeCgFk6693eVbodQlUaVIuZfBEW3u0naO
-Wq69LY0S0aD2gCmHaziFAgMBAAGjggFlMIIBYTAfBgNVHSMEGDAWgBQMvZNoDPPe
-q6NJays3V0fqkOO57TAdBgNVHQ4EFgQUeBYv24vRi/V67b1lEfk2+y9rWBwwDgYD
-VR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEG
-CCsGAQUFBwMCMBgGA1UdIAQRMA8wDQYLKwYBBAGyMQECAh0wOgYDVR0fBDMwMTAv
-oC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcmww
-bQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRjcy50ZXJl
-bmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDovL29jc3Au
-dGNzLnRlcmVuYS5vcmcwHQYDVR0RBBYwFIISaWRwLnVuaXYtbGlsbGUzLmZyMA0G
-CSqGSIb3DQEBBQUAA4IBAQBVtPB0DhSyKb6wpRRWt/zyCD4KyfmcifHTpmX/+Uqy
-UisGAqs3F9GaPBBTSfw++n8IeH/tzHXz+8+bz0q0XvB9ibN6oAZ7PpqhvKMOjiv7
-rfqbEoaK6FU4IHrLGI8iwxZXrHgRTUraoldd2eDpDa5ccMgWlYpz8WR3t8/tt2/R
-c2Ou12Nl05z0FtAPTFgflsBKd0PQTEDvpkyR8sHxG1pagcMtRxrT+F8T34h0QEZe
-xO+4QSEL3ssYjePmj6Oj154B1v9ghnsSIcbokzfXI07d51wpy0zGpdDDOJglheMu
-MXsvpupYbpRaf9GGX6Eu5xRuvQN/dFK6o4rzHEbgL3Ri
-					    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.univ-lille3.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">Université Lille 3</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Université Lille 3</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <EmailAddress>dsi.shibboleth@univ-lille3.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.univ-lorraine.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.univ-lorraine.fr-idp-shibboleth.xml
deleted file mode 100644
index 5da2d44a..00000000
--- a/swamid-interfederations-2.0/idp.univ-lorraine.fr-idp-shibboleth.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://idp.univ-lorraine.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2011-11-04T12:06:06Z">
-      <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">univ-lorraine.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">Université de Lorraine</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDOzCCAiOgAwIBAgIUKECx4WbVaZxB033wZc1aysZ4KF8wDQYJKoZIhvcNAQEF
-BQAwHzEdMBsGA1UEAxMUaWRwLnVuaXYtbG9ycmFpbmUuZnIwHhcNMTExMTAzMTMz
-NDU1WhcNMzExMTAzMTMzNDU1WjAfMR0wGwYDVQQDExRpZHAudW5pdi1sb3JyYWlu
-ZS5mcjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMrph7wDMIFx+XJv
-hG6wZxyLPmZAUqk5GTmFytV+H2Owl9M4F8hhSrislYDvTkRrfAWmey4j3McCCSMc
-HG6ZmM/7LW5GTes77Ny1odhyUIjhd/6Om0V6Or94wxOfFT/vkCLmA825U06GO+kG
-hcrfBg+D0vNRMIKcALMJbwO1paiBb/qfwVH0UixXemG8S/IsLmyx7KpucG3oc1mB
-dl91xr2Qe2f//Be70dOwCtGITdp9Swmw9VHy0oz1ovQI3oVxTLel4BG7zT56yEq3
-ZRRzHQAg72xntWDbbB6IEQoIuQMNvAQWpYo8AAJc3xmt7YSMTx80xZI80bYlvsWD
-BKeW7xsCAwEAAaNvMG0wTAYDVR0RBEUwQ4IUaWRwLnVuaXYtbG9ycmFpbmUuZnKG
-K2h0dHBzOi8vaWRwLnVuaXYtbG9ycmFpbmUuZnIvaWRwL3NoaWJib2xldGgwHQYD
-VR0OBBYEFOfm17yNg5q3qgKf0PmIVteYVOsFMA0GCSqGSIb3DQEBBQUAA4IBAQCU
-uuDEabKp1hCNmMaKF/4DFdwnLoa9nEVIvoTe5Rq0MpQP3eQfKs54yFxNzoteQKVn
-TY1cfVHO2POUgv6h+AWPEbxbgWYLoWjneKwIK/CsWcMAQcrL/YUcUos/i8xx5h2U
-K2dKLUx4XQzbaG6BV8SmsmhtS8CNMx91MUuqn2YilbijsTKSsIR8DnK6rOVQzLJE
-Y10pxgllpZX4+9nHqH881zqMIGabResycrkapt9qICb68J1W1ya4Nt5JpKK2FOMt
-r7oI1OzwHs7GPXEkw762uQijJnX7areGTveAn73vnATWtLXbwmtJSj9IN2i84FkO
-06gmvAA/GVb9pyUNbP+z
-					    </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://idp.univ-lorraine.fr/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.univ-lorraine.fr/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.univ-lorraine.fr/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">univ-lorraine.fr</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDOzCCAiOgAwIBAgIUKECx4WbVaZxB033wZc1aysZ4KF8wDQYJKoZIhvcNAQEF
-BQAwHzEdMBsGA1UEAxMUaWRwLnVuaXYtbG9ycmFpbmUuZnIwHhcNMTExMTAzMTMz
-NDU1WhcNMzExMTAzMTMzNDU1WjAfMR0wGwYDVQQDExRpZHAudW5pdi1sb3JyYWlu
-ZS5mcjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMrph7wDMIFx+XJv
-hG6wZxyLPmZAUqk5GTmFytV+H2Owl9M4F8hhSrislYDvTkRrfAWmey4j3McCCSMc
-HG6ZmM/7LW5GTes77Ny1odhyUIjhd/6Om0V6Or94wxOfFT/vkCLmA825U06GO+kG
-hcrfBg+D0vNRMIKcALMJbwO1paiBb/qfwVH0UixXemG8S/IsLmyx7KpucG3oc1mB
-dl91xr2Qe2f//Be70dOwCtGITdp9Swmw9VHy0oz1ovQI3oVxTLel4BG7zT56yEq3
-ZRRzHQAg72xntWDbbB6IEQoIuQMNvAQWpYo8AAJc3xmt7YSMTx80xZI80bYlvsWD
-BKeW7xsCAwEAAaNvMG0wTAYDVR0RBEUwQ4IUaWRwLnVuaXYtbG9ycmFpbmUuZnKG
-K2h0dHBzOi8vaWRwLnVuaXYtbG9ycmFpbmUuZnIvaWRwL3NoaWJib2xldGgwHQYD
-VR0OBBYEFOfm17yNg5q3qgKf0PmIVteYVOsFMA0GCSqGSIb3DQEBBQUAA4IBAQCU
-uuDEabKp1hCNmMaKF/4DFdwnLoa9nEVIvoTe5Rq0MpQP3eQfKs54yFxNzoteQKVn
-TY1cfVHO2POUgv6h+AWPEbxbgWYLoWjneKwIK/CsWcMAQcrL/YUcUos/i8xx5h2U
-K2dKLUx4XQzbaG6BV8SmsmhtS8CNMx91MUuqn2YilbijsTKSsIR8DnK6rOVQzLJE
-Y10pxgllpZX4+9nHqH881zqMIGabResycrkapt9qICb68J1W1ya4Nt5JpKK2FOMt
-r7oI1OzwHs7GPXEkw762uQijJnX7areGTveAn73vnATWtLXbwmtJSj9IN2i84FkO
-06gmvAA/GVb9pyUNbP+z
-					    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.univ-lorraine.fr:8443/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">Université de Lorraine</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Université de Lorraine</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <EmailAddress>shibboleth-contact@univ-lorraine.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.univ-lorraine.fr.xml b/swamid-interfederations-2.0/idp.univ-lorraine.fr.xml
deleted file mode 100644
index 5da2d44a..00000000
--- a/swamid-interfederations-2.0/idp.univ-lorraine.fr.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://idp.univ-lorraine.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2011-11-04T12:06:06Z">
-      <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">univ-lorraine.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">Université de Lorraine</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDOzCCAiOgAwIBAgIUKECx4WbVaZxB033wZc1aysZ4KF8wDQYJKoZIhvcNAQEF
-BQAwHzEdMBsGA1UEAxMUaWRwLnVuaXYtbG9ycmFpbmUuZnIwHhcNMTExMTAzMTMz
-NDU1WhcNMzExMTAzMTMzNDU1WjAfMR0wGwYDVQQDExRpZHAudW5pdi1sb3JyYWlu
-ZS5mcjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMrph7wDMIFx+XJv
-hG6wZxyLPmZAUqk5GTmFytV+H2Owl9M4F8hhSrislYDvTkRrfAWmey4j3McCCSMc
-HG6ZmM/7LW5GTes77Ny1odhyUIjhd/6Om0V6Or94wxOfFT/vkCLmA825U06GO+kG
-hcrfBg+D0vNRMIKcALMJbwO1paiBb/qfwVH0UixXemG8S/IsLmyx7KpucG3oc1mB
-dl91xr2Qe2f//Be70dOwCtGITdp9Swmw9VHy0oz1ovQI3oVxTLel4BG7zT56yEq3
-ZRRzHQAg72xntWDbbB6IEQoIuQMNvAQWpYo8AAJc3xmt7YSMTx80xZI80bYlvsWD
-BKeW7xsCAwEAAaNvMG0wTAYDVR0RBEUwQ4IUaWRwLnVuaXYtbG9ycmFpbmUuZnKG
-K2h0dHBzOi8vaWRwLnVuaXYtbG9ycmFpbmUuZnIvaWRwL3NoaWJib2xldGgwHQYD
-VR0OBBYEFOfm17yNg5q3qgKf0PmIVteYVOsFMA0GCSqGSIb3DQEBBQUAA4IBAQCU
-uuDEabKp1hCNmMaKF/4DFdwnLoa9nEVIvoTe5Rq0MpQP3eQfKs54yFxNzoteQKVn
-TY1cfVHO2POUgv6h+AWPEbxbgWYLoWjneKwIK/CsWcMAQcrL/YUcUos/i8xx5h2U
-K2dKLUx4XQzbaG6BV8SmsmhtS8CNMx91MUuqn2YilbijsTKSsIR8DnK6rOVQzLJE
-Y10pxgllpZX4+9nHqH881zqMIGabResycrkapt9qICb68J1W1ya4Nt5JpKK2FOMt
-r7oI1OzwHs7GPXEkw762uQijJnX7areGTveAn73vnATWtLXbwmtJSj9IN2i84FkO
-06gmvAA/GVb9pyUNbP+z
-					    </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://idp.univ-lorraine.fr/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.univ-lorraine.fr/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.univ-lorraine.fr/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">univ-lorraine.fr</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDOzCCAiOgAwIBAgIUKECx4WbVaZxB033wZc1aysZ4KF8wDQYJKoZIhvcNAQEF
-BQAwHzEdMBsGA1UEAxMUaWRwLnVuaXYtbG9ycmFpbmUuZnIwHhcNMTExMTAzMTMz
-NDU1WhcNMzExMTAzMTMzNDU1WjAfMR0wGwYDVQQDExRpZHAudW5pdi1sb3JyYWlu
-ZS5mcjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMrph7wDMIFx+XJv
-hG6wZxyLPmZAUqk5GTmFytV+H2Owl9M4F8hhSrislYDvTkRrfAWmey4j3McCCSMc
-HG6ZmM/7LW5GTes77Ny1odhyUIjhd/6Om0V6Or94wxOfFT/vkCLmA825U06GO+kG
-hcrfBg+D0vNRMIKcALMJbwO1paiBb/qfwVH0UixXemG8S/IsLmyx7KpucG3oc1mB
-dl91xr2Qe2f//Be70dOwCtGITdp9Swmw9VHy0oz1ovQI3oVxTLel4BG7zT56yEq3
-ZRRzHQAg72xntWDbbB6IEQoIuQMNvAQWpYo8AAJc3xmt7YSMTx80xZI80bYlvsWD
-BKeW7xsCAwEAAaNvMG0wTAYDVR0RBEUwQ4IUaWRwLnVuaXYtbG9ycmFpbmUuZnKG
-K2h0dHBzOi8vaWRwLnVuaXYtbG9ycmFpbmUuZnIvaWRwL3NoaWJib2xldGgwHQYD
-VR0OBBYEFOfm17yNg5q3qgKf0PmIVteYVOsFMA0GCSqGSIb3DQEBBQUAA4IBAQCU
-uuDEabKp1hCNmMaKF/4DFdwnLoa9nEVIvoTe5Rq0MpQP3eQfKs54yFxNzoteQKVn
-TY1cfVHO2POUgv6h+AWPEbxbgWYLoWjneKwIK/CsWcMAQcrL/YUcUos/i8xx5h2U
-K2dKLUx4XQzbaG6BV8SmsmhtS8CNMx91MUuqn2YilbijsTKSsIR8DnK6rOVQzLJE
-Y10pxgllpZX4+9nHqH881zqMIGabResycrkapt9qICb68J1W1ya4Nt5JpKK2FOMt
-r7oI1OzwHs7GPXEkw762uQijJnX7areGTveAn73vnATWtLXbwmtJSj9IN2i84FkO
-06gmvAA/GVb9pyUNbP+z
-					    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.univ-lorraine.fr:8443/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">Université de Lorraine</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Université de Lorraine</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <EmailAddress>shibboleth-contact@univ-lorraine.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.univ-lyon2.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.univ-lyon2.fr-idp-shibboleth.xml
deleted file mode 100644
index 0f561730..00000000
--- a/swamid-interfederations-2.0/idp.univ-lyon2.fr-idp-shibboleth.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.univ-lyon2.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2012-01-27T11:39:57Z">
-      <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">univ-lyon2.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">Université de Lyon 2 - Lumière</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIE2TCCA8GgAwIBAgIQQx9CsvgcOG0a1Tvla0G65TANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTEyMDkxMjAwMDAwMFoXDTE1MDkxMjIzNTk1OVowdzELMAkGA1UE
-BhMCRlIxIzAhBgNVBAoMGlVuaXZlcnNpdMOpIEx1bWllcmUtTHlvbiAyMScwJQYD
-VQQLDB5EU0kgVW5pdmVyc2l0w6kgTHVtaWVyZSBMeW9uIDIxGjAYBgNVBAMTEWlk
-cC51bml2LWx5b24yLmZyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
-4NRYOErWGGkM3nVhXJZdaILItB3ZS9fwHLPQvsbLy3sbm1IZq0vDaOjXXK+8RFFn
-q6ogmuwI+LvHO7ru+wcEuplCoVsNNVjWaD8109O9Vu160xxsyNgw1w7ly+0ToByI
-WzDpksBVoIkNK4XO4/b5gauiPTVm+T8UBvVQ4K2iT/G1AzcBgKKBeU0icy83mC5q
-7qP+X4CDptjCcDwbr4woZ/ckY+7G1tB1EnPE24Y7kPPFwgUU6kAIXvlmnsvmY22b
-SKNYL6LCYX3ugkc4uH5jAy4usmACtATKeC/ecgHhKfG1a+ID9TD5vDKxl6ICLi2h
-sMJFR/cNnKcc2kJYHYZNUQIDAQABo4IBoDCCAZwwHwYDVR0jBBgwFoAUDL2TaAzz
-3qujSWsrN1dH6pDjue0wHQYDVR0OBBYEFNGHb+t8B/nZLRDgGVzpSZFoqXTBMA4G
-A1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMB
-BggrBgEFBQcDAjAYBgNVHSAEETAPMA0GCysGAQQBsjEBAgIdMDoGA1UdHwQzMDEw
-L6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3Js
-MG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50Y3MudGVy
-ZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9vY3Nw
-LnRjcy50ZXJlbmEub3JnMFgGA1UdEQRRME+CEWlkcC51bml2LWx5b24yLmZyghJp
-ZHAxLnVuaXYtbHlvbjIuZnKCEmlkcDIudW5pdi1seW9uMi5mcoISaWRwMy51bml2
-LWx5b24yLmZyMA0GCSqGSIb3DQEBBQUAA4IBAQAJFkuPz9WIxbSCgK07Zdu5RBsV
-jVCvn6uu1NXznSfROTMQOMuGaOhS+OOLf6mdU/zN9NzFuX0Y9cCX+NqBPzqLjpS1
-Odv2QX1N3EcXJoXOQgmHLDV1wD/8EUR3enc679sOyaSy22i70JLRbgpgHlnGJLIW
-fuYW5lB1Y+iuhUtS4I/ScySNds0DwfC/kHymI8IYpcNFfvEGgYF976e/c6DgNwyQ
-hP96svqli3SO5rx+kUDaJROEZS4d9TA671A/40DKbJN0EuuDmr9Y4zzUVBUeyADY
-MVymo1FuDKpu6laIg6mbezvSwGbqQyQMMg5RA7zWiUJUaBXnBbgUR4Y0+xA8
-					    </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://idp.univ-lyon2.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.univ-lyon2.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.univ-lyon2.fr/idp/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Université de Lyon 2 - Lumière</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Université de Lyon 2 - Lumière</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <EmailAddress>reseau@listes.univ-lyon2.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.univ-lyon2.fr.xml b/swamid-interfederations-2.0/idp.univ-lyon2.fr.xml
deleted file mode 100644
index 0f561730..00000000
--- a/swamid-interfederations-2.0/idp.univ-lyon2.fr.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.univ-lyon2.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2012-01-27T11:39:57Z">
-      <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">univ-lyon2.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">Université de Lyon 2 - Lumière</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIE2TCCA8GgAwIBAgIQQx9CsvgcOG0a1Tvla0G65TANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTEyMDkxMjAwMDAwMFoXDTE1MDkxMjIzNTk1OVowdzELMAkGA1UE
-BhMCRlIxIzAhBgNVBAoMGlVuaXZlcnNpdMOpIEx1bWllcmUtTHlvbiAyMScwJQYD
-VQQLDB5EU0kgVW5pdmVyc2l0w6kgTHVtaWVyZSBMeW9uIDIxGjAYBgNVBAMTEWlk
-cC51bml2LWx5b24yLmZyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
-4NRYOErWGGkM3nVhXJZdaILItB3ZS9fwHLPQvsbLy3sbm1IZq0vDaOjXXK+8RFFn
-q6ogmuwI+LvHO7ru+wcEuplCoVsNNVjWaD8109O9Vu160xxsyNgw1w7ly+0ToByI
-WzDpksBVoIkNK4XO4/b5gauiPTVm+T8UBvVQ4K2iT/G1AzcBgKKBeU0icy83mC5q
-7qP+X4CDptjCcDwbr4woZ/ckY+7G1tB1EnPE24Y7kPPFwgUU6kAIXvlmnsvmY22b
-SKNYL6LCYX3ugkc4uH5jAy4usmACtATKeC/ecgHhKfG1a+ID9TD5vDKxl6ICLi2h
-sMJFR/cNnKcc2kJYHYZNUQIDAQABo4IBoDCCAZwwHwYDVR0jBBgwFoAUDL2TaAzz
-3qujSWsrN1dH6pDjue0wHQYDVR0OBBYEFNGHb+t8B/nZLRDgGVzpSZFoqXTBMA4G
-A1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMB
-BggrBgEFBQcDAjAYBgNVHSAEETAPMA0GCysGAQQBsjEBAgIdMDoGA1UdHwQzMDEw
-L6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3Js
-MG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50Y3MudGVy
-ZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9vY3Nw
-LnRjcy50ZXJlbmEub3JnMFgGA1UdEQRRME+CEWlkcC51bml2LWx5b24yLmZyghJp
-ZHAxLnVuaXYtbHlvbjIuZnKCEmlkcDIudW5pdi1seW9uMi5mcoISaWRwMy51bml2
-LWx5b24yLmZyMA0GCSqGSIb3DQEBBQUAA4IBAQAJFkuPz9WIxbSCgK07Zdu5RBsV
-jVCvn6uu1NXznSfROTMQOMuGaOhS+OOLf6mdU/zN9NzFuX0Y9cCX+NqBPzqLjpS1
-Odv2QX1N3EcXJoXOQgmHLDV1wD/8EUR3enc679sOyaSy22i70JLRbgpgHlnGJLIW
-fuYW5lB1Y+iuhUtS4I/ScySNds0DwfC/kHymI8IYpcNFfvEGgYF976e/c6DgNwyQ
-hP96svqli3SO5rx+kUDaJROEZS4d9TA671A/40DKbJN0EuuDmr9Y4zzUVBUeyADY
-MVymo1FuDKpu6laIg6mbezvSwGbqQyQMMg5RA7zWiUJUaBXnBbgUR4Y0+xA8
-					    </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://idp.univ-lyon2.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.univ-lyon2.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.univ-lyon2.fr/idp/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Université de Lyon 2 - Lumière</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Université de Lyon 2 - Lumière</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <EmailAddress>reseau@listes.univ-lyon2.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.univ-lyon3.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.univ-lyon3.fr-idp-shibboleth.xml
deleted file mode 100644
index d62468d3..00000000
--- a/swamid-interfederations-2.0/idp.univ-lyon3.fr-idp-shibboleth.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://idp.univ-lyon3.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2011-01-28T10:43:17Z">
-      <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">univ-lyon3.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">Université de Lyon 3 - Jean Moulin</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDMDCCAhigAwIBAgIVALk8mZ+AAF53uwidDGYBnH0PYWxbMA0GCSqGSIb3DQEB
-BQUAMBwxGjAYBgNVBAMTEWlkcC51bml2LWx5b24zLmZyMB4XDTEwMTAxMjEzMzk1
-NVoXDTMwMTAxMjEzMzk1NVowHDEaMBgGA1UEAxMRaWRwLnVuaXYtbHlvbjMuZnIw
-ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCnHRL8McVU1CwfcgOZzodc
-G9yjFNUlE5+tKEwGlkDNpOW+dIK3nZ4o3LxeOZVCA6sBJ6zGvPKLrbwaQ1ec7wUw
-Zd2/VGlpT6puPc6hPuqa8ghTKgAsYAaLgnnXMTsXgOi2ieu+KpOhBWUChZU8UgjT
-PFa7KjRzQ7xLoHd4+ZdkXIcb4VUMR8nEBNVQ2C18c4CNgGN6aYPpP++kFHJJi85F
-2jmD07ccl0DES2sPfDLpniZDin+eD8ij8UXviy9e8v4ssrXi/qNvP8eHSsDTUkT8
-zkMEs6ovVCGMZf/aie0RVaZ0h8G4n9UF2xk/+ASAxVcAl5Kwfy6g4/sno0BDWul7
-AgMBAAGjaTBnMEYGA1UdEQQ/MD2CEWlkcC51bml2LWx5b24zLmZyhihodHRwczov
-L2lkcC51bml2LWx5b24zLmZyL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBQRoWeg
-Qi5urVmZRbLmZzQW2w0DkjANBgkqhkiG9w0BAQUFAAOCAQEAYA43hVTg4DIEtI5l
-1I2MMrZhXAkpihNEC8G2HTtpUAq2GeAKTzUzUyQ133V3JgY8XDkpCM8XhPqI6wAH
-5k9pOwKeePRjDWkycJYsBeCl5x1wspNqNGfbWEMfCALXeP8YI5annKFUBnit2VrX
-eXB9i4dKcDeYCVzKW1hd7meBbw6Iijwnxt7ZESzVzibWVYi/gB3zT2OLHjFhONj4
-TWXosGddVcZLkq+eFRjPBFUZmin0Y1i6IPWtHveMnegwrIimwh4hc3Hq9x9frai9
-vU4n/dUR4kWq12hY6VObixqfgw9dHPnALDINjOdTHmmXaSJAyv5tQkmIRGZyMOmc
-n4c/iw==
-					    </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://idp.univ-lyon3.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.univ-lyon3.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.univ-lyon3.fr/idp/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Université de Lyon 3 - Jean Moulin</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Université de Lyon 3 - Jean Moulin</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <EmailAddress>contact-shibboleth@univ-lyon3.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.univ-lyon3.fr.xml b/swamid-interfederations-2.0/idp.univ-lyon3.fr.xml
deleted file mode 100644
index d62468d3..00000000
--- a/swamid-interfederations-2.0/idp.univ-lyon3.fr.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://idp.univ-lyon3.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2011-01-28T10:43:17Z">
-      <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">univ-lyon3.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">Université de Lyon 3 - Jean Moulin</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDMDCCAhigAwIBAgIVALk8mZ+AAF53uwidDGYBnH0PYWxbMA0GCSqGSIb3DQEB
-BQUAMBwxGjAYBgNVBAMTEWlkcC51bml2LWx5b24zLmZyMB4XDTEwMTAxMjEzMzk1
-NVoXDTMwMTAxMjEzMzk1NVowHDEaMBgGA1UEAxMRaWRwLnVuaXYtbHlvbjMuZnIw
-ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCnHRL8McVU1CwfcgOZzodc
-G9yjFNUlE5+tKEwGlkDNpOW+dIK3nZ4o3LxeOZVCA6sBJ6zGvPKLrbwaQ1ec7wUw
-Zd2/VGlpT6puPc6hPuqa8ghTKgAsYAaLgnnXMTsXgOi2ieu+KpOhBWUChZU8UgjT
-PFa7KjRzQ7xLoHd4+ZdkXIcb4VUMR8nEBNVQ2C18c4CNgGN6aYPpP++kFHJJi85F
-2jmD07ccl0DES2sPfDLpniZDin+eD8ij8UXviy9e8v4ssrXi/qNvP8eHSsDTUkT8
-zkMEs6ovVCGMZf/aie0RVaZ0h8G4n9UF2xk/+ASAxVcAl5Kwfy6g4/sno0BDWul7
-AgMBAAGjaTBnMEYGA1UdEQQ/MD2CEWlkcC51bml2LWx5b24zLmZyhihodHRwczov
-L2lkcC51bml2LWx5b24zLmZyL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBQRoWeg
-Qi5urVmZRbLmZzQW2w0DkjANBgkqhkiG9w0BAQUFAAOCAQEAYA43hVTg4DIEtI5l
-1I2MMrZhXAkpihNEC8G2HTtpUAq2GeAKTzUzUyQ133V3JgY8XDkpCM8XhPqI6wAH
-5k9pOwKeePRjDWkycJYsBeCl5x1wspNqNGfbWEMfCALXeP8YI5annKFUBnit2VrX
-eXB9i4dKcDeYCVzKW1hd7meBbw6Iijwnxt7ZESzVzibWVYi/gB3zT2OLHjFhONj4
-TWXosGddVcZLkq+eFRjPBFUZmin0Y1i6IPWtHveMnegwrIimwh4hc3Hq9x9frai9
-vU4n/dUR4kWq12hY6VObixqfgw9dHPnALDINjOdTHmmXaSJAyv5tQkmIRGZyMOmc
-n4c/iw==
-					    </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://idp.univ-lyon3.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.univ-lyon3.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.univ-lyon3.fr/idp/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Université de Lyon 3 - Jean Moulin</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Université de Lyon 3 - Jean Moulin</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <EmailAddress>contact-shibboleth@univ-lyon3.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.univ-orleans.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.univ-orleans.fr-idp-shibboleth.xml
deleted file mode 100644
index d24bf693..00000000
--- a/swamid-interfederations-2.0/idp.univ-orleans.fr-idp-shibboleth.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://idp.univ-orleans.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2011-04-18T17:24:32Z">
-      <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">univ-orleans.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">Université d'Orléans</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDPDCCAiSgAwIBAgIVANWZeCtKF/UQd4fR6YuwUFezr4HpMA0GCSqGSIb3DQEB
-BQUAMB8xHTAbBgNVBAMTFHNoaWIudW5pdi1vcmxlYW5zLmZyMB4XDTExMDQxMTEy
-MDgzMFoXDTMxMDQxMTEyMDgzMFowHzEdMBsGA1UEAxMUc2hpYi51bml2LW9ybGVh
-bnMuZnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDCTIQZAwSNXNbF
-4QOav/RSjyjZjSxLsQtUazKnrbz4NfBb2ne7rz6vCLsWL5ROCo6SxVvs3pXKNSUD
-vURq6o98KadI0MIn9b4NM5K/4pczaSlF1R6hw0IPYh5eYefIt4hOc92JXHUPn/AP
-fQc2xTiMT1ym5mEsPeAefwr0nkbdv/X7joxldaRNqmTgwqrtKacWVY/soMwtRB+m
-bFHd8bAQmnLTVGl/ZP26or3XaTspPkqnY6F2lg/0Zajrj2suV0zhxJ7h+yvEuQju
-GTDsB1+y7WUqV6e3ZYwAEirjX3gjK3cdehNYLukk1v9HVP3nFeiMjfHeAuLqWwoP
-oRwCxs9dAgMBAAGjbzBtMEwGA1UdEQRFMEOCFHNoaWIudW5pdi1vcmxlYW5zLmZy
-hitodHRwczovL3NoaWIudW5pdi1vcmxlYW5zLmZyL2lkcC9zaGliYm9sZXRoMB0G
-A1UdDgQWBBS2+qObLJGIfmja7fzCOw56RXQlpzANBgkqhkiG9w0BAQUFAAOCAQEA
-RZ+y3gkKx9sZ+RCNCfcsqW5J13+vJw5tAog7tiNaeR92/gkPduQnV77R3O1Dc9m1
-97EMCsYfY6LReQOEHTy3yl3oJm/VPDlyaHS6pufnfLtf/PYoQEWhJDCNhA4ebJ8R
-fbi97IoQA3hHQPYwo1qBfZkCy10k2EzHz6hz9EZtEXEjMCcgFGFNhfDkNBWrmDln
-Lk2EiYwXkYbiqz4l8/tVJ3YFYVNmNezvW/PvgeiJaSKaIWwpeHxu/YdB+grKUckN
-IM41Gy3rPU+4VD6wsj+dXYpUCvMUwVKaQahxu1DKWH9hrMMBkYio3dLds0GNs0GJ
-C+qiXdGuUa6kUpYVBFC+Vw==
-					    </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://idp.univ-orleans.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.univ-orleans.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.univ-orleans.fr/idp/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Université d'Orléans</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Université d'Orléans</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <EmailAddress>equipe.reseau@univ-orleans.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.univ-orleans.fr.xml b/swamid-interfederations-2.0/idp.univ-orleans.fr.xml
deleted file mode 100644
index d24bf693..00000000
--- a/swamid-interfederations-2.0/idp.univ-orleans.fr.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://idp.univ-orleans.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2011-04-18T17:24:32Z">
-      <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">univ-orleans.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">Université d'Orléans</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDPDCCAiSgAwIBAgIVANWZeCtKF/UQd4fR6YuwUFezr4HpMA0GCSqGSIb3DQEB
-BQUAMB8xHTAbBgNVBAMTFHNoaWIudW5pdi1vcmxlYW5zLmZyMB4XDTExMDQxMTEy
-MDgzMFoXDTMxMDQxMTEyMDgzMFowHzEdMBsGA1UEAxMUc2hpYi51bml2LW9ybGVh
-bnMuZnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDCTIQZAwSNXNbF
-4QOav/RSjyjZjSxLsQtUazKnrbz4NfBb2ne7rz6vCLsWL5ROCo6SxVvs3pXKNSUD
-vURq6o98KadI0MIn9b4NM5K/4pczaSlF1R6hw0IPYh5eYefIt4hOc92JXHUPn/AP
-fQc2xTiMT1ym5mEsPeAefwr0nkbdv/X7joxldaRNqmTgwqrtKacWVY/soMwtRB+m
-bFHd8bAQmnLTVGl/ZP26or3XaTspPkqnY6F2lg/0Zajrj2suV0zhxJ7h+yvEuQju
-GTDsB1+y7WUqV6e3ZYwAEirjX3gjK3cdehNYLukk1v9HVP3nFeiMjfHeAuLqWwoP
-oRwCxs9dAgMBAAGjbzBtMEwGA1UdEQRFMEOCFHNoaWIudW5pdi1vcmxlYW5zLmZy
-hitodHRwczovL3NoaWIudW5pdi1vcmxlYW5zLmZyL2lkcC9zaGliYm9sZXRoMB0G
-A1UdDgQWBBS2+qObLJGIfmja7fzCOw56RXQlpzANBgkqhkiG9w0BAQUFAAOCAQEA
-RZ+y3gkKx9sZ+RCNCfcsqW5J13+vJw5tAog7tiNaeR92/gkPduQnV77R3O1Dc9m1
-97EMCsYfY6LReQOEHTy3yl3oJm/VPDlyaHS6pufnfLtf/PYoQEWhJDCNhA4ebJ8R
-fbi97IoQA3hHQPYwo1qBfZkCy10k2EzHz6hz9EZtEXEjMCcgFGFNhfDkNBWrmDln
-Lk2EiYwXkYbiqz4l8/tVJ3YFYVNmNezvW/PvgeiJaSKaIWwpeHxu/YdB+grKUckN
-IM41Gy3rPU+4VD6wsj+dXYpUCvMUwVKaQahxu1DKWH9hrMMBkYio3dLds0GNs0GJ
-C+qiXdGuUa6kUpYVBFC+Vw==
-					    </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://idp.univ-orleans.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.univ-orleans.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.univ-orleans.fr/idp/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Université d'Orléans</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Université d'Orléans</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <EmailAddress>equipe.reseau@univ-orleans.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.univ-paris3.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.univ-paris3.fr-idp-shibboleth.xml
deleted file mode 100644
index 33c093b2..00000000
--- a/swamid-interfederations-2.0/idp.univ-paris3.fr-idp-shibboleth.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.univ-paris3.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2011-12-16T22:34:29Z">
-      <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">univ-paris3.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">University Paris 3 - Sorbonne Nouvelle</mdui:DisplayName>
-        <mdui:Description xml:lang="en">All members of the Sorbonne Nouvelle - Paris 3 community: staff, students, library readers, alumni, staff from other institutions working locally, guests, etc.</mdui:Description>
-        <mdui:DisplayName xml:lang="fr">Université de Paris 3 - Sorbonne Nouvelle</mdui:DisplayName>
-        <mdui:Description xml:lang="fr">Tous les membres de la communauté Sorbonne Nouvelle - Paris 3 : personnels, étudiants, lecteurs des bibliothèques, anciens étudiants, personnels d'autres établissements travaillant dans l'université, invités, prestataires, anciens personnels gardant une activité.</mdui:Description>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDNDCCAhygAwIBAgIVAMSFD1SXsksxsNe7dgs+bu0/1u4hMA0GCSqGSIb3DQEB
-BQUAMB0xGzAZBgNVBAMTEmlkcC51bml2LXBhcmlzMy5mcjAeFw0xMTEyMTUxNzE1
-MTZaFw0zMTEyMTUxNzE1MTZaMB0xGzAZBgNVBAMTEmlkcC51bml2LXBhcmlzMy5m
-cjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJjhxfTL8BVpjd1mzrxA
-7zmEcJk8ekFMaUfPm6HL1ScUyiun5Fm9JJQBHEuCSH/VEPrKLNrxz4lctcWWvCyI
-mDk63MLPCBlEZMV8hiFxZt2/VEo1OsQL5eKVDPNBRIwBK8d8CYw/xOWEaiYOvlZa
-7e5fvjQNti0pwWsdGi5jo029tCFkApIeSidl9p/L6C0NIIR58T6cZvShCIIV1rHi
-4MSEdw2iR7w2YE84ljfooVcRhUDSpxMA+ym7FlH6IJD24w4tRrB/oDyQqLQTzEXB
-yb6RhwrLKUFb3KVBKwrq9uTRpEZWIEpWkgbH4KSsPWEGBGXc6CtKhXtcjRFMNuu4
-hXcCAwEAAaNrMGkwSAYDVR0RBEEwP4ISaWRwLnVuaXYtcGFyaXMzLmZyhilodHRw
-czovL2lkcC51bml2LXBhcmlzMy5mci9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQU
-J54xxsuDg3aueO3Q3HHJvMzmqUUwDQYJKoZIhvcNAQEFBQADggEBAI+TkGwGCEWZ
-uthkU8kUaUwop79gqH2yBzSw0OOkRZ3Q3OPg8Qv/s7zD+46gv1b5/YbbzYfvViEq
-S9TthYeos4lqSZJTMPIMnbcF8TX0dCtJ/IKy9JNxEetKzSHWdWgkkm/93onk1gPo
-K0JNyD1AlCipNrHSnNmYkDYUjNzuC2ltXFmqrzBYD4NxkZzXhcnrqd5zxKdI6tQy
-IBbAxUnoEmbTqImHVmF229LIlNphqKpuduDhOtSs+Szd2ZoooyRaSTu9SVMplJ4Y
-bZMYCQGSG0R+xeFXPOJHMRl0brK4iwveaUGTXC2yg8W/wLm9f4MVOKKRKrMTYHGY
-HKtGROgixJI=
-					    </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://idp.univ-paris3.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.univ-paris3.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.univ-paris3.fr/idp/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Université de Paris 3 - Sorbonne Nouvelle</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Université de Paris 3 - Sorbonne Nouvelle</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <EmailAddress>fed-admin@univ-paris3.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.univ-paris3.fr.xml b/swamid-interfederations-2.0/idp.univ-paris3.fr.xml
deleted file mode 100644
index 33c093b2..00000000
--- a/swamid-interfederations-2.0/idp.univ-paris3.fr.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.univ-paris3.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2011-12-16T22:34:29Z">
-      <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">univ-paris3.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">University Paris 3 - Sorbonne Nouvelle</mdui:DisplayName>
-        <mdui:Description xml:lang="en">All members of the Sorbonne Nouvelle - Paris 3 community: staff, students, library readers, alumni, staff from other institutions working locally, guests, etc.</mdui:Description>
-        <mdui:DisplayName xml:lang="fr">Université de Paris 3 - Sorbonne Nouvelle</mdui:DisplayName>
-        <mdui:Description xml:lang="fr">Tous les membres de la communauté Sorbonne Nouvelle - Paris 3 : personnels, étudiants, lecteurs des bibliothèques, anciens étudiants, personnels d'autres établissements travaillant dans l'université, invités, prestataires, anciens personnels gardant une activité.</mdui:Description>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDNDCCAhygAwIBAgIVAMSFD1SXsksxsNe7dgs+bu0/1u4hMA0GCSqGSIb3DQEB
-BQUAMB0xGzAZBgNVBAMTEmlkcC51bml2LXBhcmlzMy5mcjAeFw0xMTEyMTUxNzE1
-MTZaFw0zMTEyMTUxNzE1MTZaMB0xGzAZBgNVBAMTEmlkcC51bml2LXBhcmlzMy5m
-cjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJjhxfTL8BVpjd1mzrxA
-7zmEcJk8ekFMaUfPm6HL1ScUyiun5Fm9JJQBHEuCSH/VEPrKLNrxz4lctcWWvCyI
-mDk63MLPCBlEZMV8hiFxZt2/VEo1OsQL5eKVDPNBRIwBK8d8CYw/xOWEaiYOvlZa
-7e5fvjQNti0pwWsdGi5jo029tCFkApIeSidl9p/L6C0NIIR58T6cZvShCIIV1rHi
-4MSEdw2iR7w2YE84ljfooVcRhUDSpxMA+ym7FlH6IJD24w4tRrB/oDyQqLQTzEXB
-yb6RhwrLKUFb3KVBKwrq9uTRpEZWIEpWkgbH4KSsPWEGBGXc6CtKhXtcjRFMNuu4
-hXcCAwEAAaNrMGkwSAYDVR0RBEEwP4ISaWRwLnVuaXYtcGFyaXMzLmZyhilodHRw
-czovL2lkcC51bml2LXBhcmlzMy5mci9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQU
-J54xxsuDg3aueO3Q3HHJvMzmqUUwDQYJKoZIhvcNAQEFBQADggEBAI+TkGwGCEWZ
-uthkU8kUaUwop79gqH2yBzSw0OOkRZ3Q3OPg8Qv/s7zD+46gv1b5/YbbzYfvViEq
-S9TthYeos4lqSZJTMPIMnbcF8TX0dCtJ/IKy9JNxEetKzSHWdWgkkm/93onk1gPo
-K0JNyD1AlCipNrHSnNmYkDYUjNzuC2ltXFmqrzBYD4NxkZzXhcnrqd5zxKdI6tQy
-IBbAxUnoEmbTqImHVmF229LIlNphqKpuduDhOtSs+Szd2ZoooyRaSTu9SVMplJ4Y
-bZMYCQGSG0R+xeFXPOJHMRl0brK4iwveaUGTXC2yg8W/wLm9f4MVOKKRKrMTYHGY
-HKtGROgixJI=
-					    </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://idp.univ-paris3.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.univ-paris3.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.univ-paris3.fr/idp/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Université de Paris 3 - Sorbonne Nouvelle</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Université de Paris 3 - Sorbonne Nouvelle</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <EmailAddress>fed-admin@univ-paris3.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.univ-paris4.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.univ-paris4.fr-idp-shibboleth.xml
deleted file mode 100644
index 7e32cfcf..00000000
--- a/swamid-interfederations-2.0/idp.univ-paris4.fr-idp-shibboleth.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://idp.univ-paris4.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2010-03-15T16:19:04Z">
-      <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">univ-paris4.fr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">paris-sorbonne.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">Université de Paris IV - Sorbonne</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIEfjCCA2agAwIBAgIQDoytgyQXDrxQwdffQSgBNTANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTEwMDIxOTAwMDAwMFoXDTEzMDIxODIzNTk1OVowVzELMAkGA1UE
-BhMCRlIxDjAMBgNVBAcTBVBBUklTMRswGQYDVQQKExJVTklWRVJTSVRFIFBBUklT
-IDQxGzAZBgNVBAMTEmlkcC51bml2LXBhcmlzNC5mcjCCASIwDQYJKoZIhvcNAQEB
-BQADggEPADCCAQoCggEBAKqttSIJz1BQxcIHy3dNdnJd+0iaQlWU31Y2zsGckNjR
-YbW4lwMq5xcnqHwrgUp8PiaFBy6/jioXDpHs5ByrrLLE052hfeEB0W5AO5mN7Yqd
-URorS4LHo9JsUFrULl0haEF6FFoDD6ABR7djwerDccIebVoICvj9W1ypN8vPmo/P
-qaXZ0QKcJJjmbuxYxt+JnYQyQhqxZXgbGfelyclhfrCNZsjFmoLL2hvpIINAv3Al
-7xFBv1DlKpRImWAjHkqZtWzyGHNU3EryVBrjeoxlRQfVjCMqTnZ5O57bTZc7TK5Y
-eMlvB0syEnzC68HJ02baPgf1T94S2gD3nvFjfcNcJu8CAwEAAaOCAWUwggFhMB8G
-A1UdIwQYMBaAFAy9k2gM896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBQ+ho3P8U/1
-4zqg7ukFkfl9eCelZDAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNV
-HSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwGAYDVR0gBBEwDzANBgsrBgEEAbIx
-AQICHTA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3Jn
-L1RFUkVOQVNTTENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0
-dHA6Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUF
-BzABhhpodHRwOi8vb2NzcC50Y3MudGVyZW5hLm9yZzAdBgNVHREEFjAUghJpZHAu
-dW5pdi1wYXJpczQuZnIwDQYJKoZIhvcNAQEFBQADggEBAHwUYz+yFi2FBkcFN3Km
-2qfIfiBsLFWB6IfkmQ67R1grVxUSlRIIyJ7L4IWrnzlSfua51Z8UJPvcu69n9eBX
-qZziEXS4ZAlDKF7w3eLV8lIy3PX35/k6MQeju9XutriZXn/d6j7tN3sn7hYp+2i3
-+FffOhUyk30j9dUG3P17NpJBQ8vWjily3GNDwcjkZhWnoNLy23BssXqN7vkrc/8k
-LsZ2ycJNxU+3DFaLplq4s2S7llycn+QoR2FGFQYbRxEIkEExzPEjcoHxO9Z9NWiX
-mWTayZwzt0iJJtgUTa8Lr+vSHx2pY70ZHgzsmbwKd1gEn1+u7ltx/5nUar5lRokB
-bz0=
-					    </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://idp.univ-paris4.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.univ-paris4.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.univ-paris4.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">univ-paris4.fr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">paris-sorbonne.fr</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIEfjCCA2agAwIBAgIQDoytgyQXDrxQwdffQSgBNTANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTEwMDIxOTAwMDAwMFoXDTEzMDIxODIzNTk1OVowVzELMAkGA1UE
-BhMCRlIxDjAMBgNVBAcTBVBBUklTMRswGQYDVQQKExJVTklWRVJTSVRFIFBBUklT
-IDQxGzAZBgNVBAMTEmlkcC51bml2LXBhcmlzNC5mcjCCASIwDQYJKoZIhvcNAQEB
-BQADggEPADCCAQoCggEBAKqttSIJz1BQxcIHy3dNdnJd+0iaQlWU31Y2zsGckNjR
-YbW4lwMq5xcnqHwrgUp8PiaFBy6/jioXDpHs5ByrrLLE052hfeEB0W5AO5mN7Yqd
-URorS4LHo9JsUFrULl0haEF6FFoDD6ABR7djwerDccIebVoICvj9W1ypN8vPmo/P
-qaXZ0QKcJJjmbuxYxt+JnYQyQhqxZXgbGfelyclhfrCNZsjFmoLL2hvpIINAv3Al
-7xFBv1DlKpRImWAjHkqZtWzyGHNU3EryVBrjeoxlRQfVjCMqTnZ5O57bTZc7TK5Y
-eMlvB0syEnzC68HJ02baPgf1T94S2gD3nvFjfcNcJu8CAwEAAaOCAWUwggFhMB8G
-A1UdIwQYMBaAFAy9k2gM896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBQ+ho3P8U/1
-4zqg7ukFkfl9eCelZDAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNV
-HSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwGAYDVR0gBBEwDzANBgsrBgEEAbIx
-AQICHTA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3Jn
-L1RFUkVOQVNTTENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0
-dHA6Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUF
-BzABhhpodHRwOi8vb2NzcC50Y3MudGVyZW5hLm9yZzAdBgNVHREEFjAUghJpZHAu
-dW5pdi1wYXJpczQuZnIwDQYJKoZIhvcNAQEFBQADggEBAHwUYz+yFi2FBkcFN3Km
-2qfIfiBsLFWB6IfkmQ67R1grVxUSlRIIyJ7L4IWrnzlSfua51Z8UJPvcu69n9eBX
-qZziEXS4ZAlDKF7w3eLV8lIy3PX35/k6MQeju9XutriZXn/d6j7tN3sn7hYp+2i3
-+FffOhUyk30j9dUG3P17NpJBQ8vWjily3GNDwcjkZhWnoNLy23BssXqN7vkrc/8k
-LsZ2ycJNxU+3DFaLplq4s2S7llycn+QoR2FGFQYbRxEIkEExzPEjcoHxO9Z9NWiX
-mWTayZwzt0iJJtgUTa8Lr+vSHx2pY70ZHgzsmbwKd1gEn1+u7ltx/5nUar5lRokB
-bz0=
-					    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.univ-paris4.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">Université de Paris IV - Sorbonne</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Université de Paris IV - Sorbonne</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>MARIR Brahim</SurName>
-    <EmailAddress>brahim.marir@paris-sorbonne.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.univ-paris4.fr.xml b/swamid-interfederations-2.0/idp.univ-paris4.fr.xml
deleted file mode 100644
index 7e32cfcf..00000000
--- a/swamid-interfederations-2.0/idp.univ-paris4.fr.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://idp.univ-paris4.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2010-03-15T16:19:04Z">
-      <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">univ-paris4.fr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">paris-sorbonne.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">Université de Paris IV - Sorbonne</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIEfjCCA2agAwIBAgIQDoytgyQXDrxQwdffQSgBNTANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTEwMDIxOTAwMDAwMFoXDTEzMDIxODIzNTk1OVowVzELMAkGA1UE
-BhMCRlIxDjAMBgNVBAcTBVBBUklTMRswGQYDVQQKExJVTklWRVJTSVRFIFBBUklT
-IDQxGzAZBgNVBAMTEmlkcC51bml2LXBhcmlzNC5mcjCCASIwDQYJKoZIhvcNAQEB
-BQADggEPADCCAQoCggEBAKqttSIJz1BQxcIHy3dNdnJd+0iaQlWU31Y2zsGckNjR
-YbW4lwMq5xcnqHwrgUp8PiaFBy6/jioXDpHs5ByrrLLE052hfeEB0W5AO5mN7Yqd
-URorS4LHo9JsUFrULl0haEF6FFoDD6ABR7djwerDccIebVoICvj9W1ypN8vPmo/P
-qaXZ0QKcJJjmbuxYxt+JnYQyQhqxZXgbGfelyclhfrCNZsjFmoLL2hvpIINAv3Al
-7xFBv1DlKpRImWAjHkqZtWzyGHNU3EryVBrjeoxlRQfVjCMqTnZ5O57bTZc7TK5Y
-eMlvB0syEnzC68HJ02baPgf1T94S2gD3nvFjfcNcJu8CAwEAAaOCAWUwggFhMB8G
-A1UdIwQYMBaAFAy9k2gM896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBQ+ho3P8U/1
-4zqg7ukFkfl9eCelZDAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNV
-HSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwGAYDVR0gBBEwDzANBgsrBgEEAbIx
-AQICHTA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3Jn
-L1RFUkVOQVNTTENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0
-dHA6Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUF
-BzABhhpodHRwOi8vb2NzcC50Y3MudGVyZW5hLm9yZzAdBgNVHREEFjAUghJpZHAu
-dW5pdi1wYXJpczQuZnIwDQYJKoZIhvcNAQEFBQADggEBAHwUYz+yFi2FBkcFN3Km
-2qfIfiBsLFWB6IfkmQ67R1grVxUSlRIIyJ7L4IWrnzlSfua51Z8UJPvcu69n9eBX
-qZziEXS4ZAlDKF7w3eLV8lIy3PX35/k6MQeju9XutriZXn/d6j7tN3sn7hYp+2i3
-+FffOhUyk30j9dUG3P17NpJBQ8vWjily3GNDwcjkZhWnoNLy23BssXqN7vkrc/8k
-LsZ2ycJNxU+3DFaLplq4s2S7llycn+QoR2FGFQYbRxEIkEExzPEjcoHxO9Z9NWiX
-mWTayZwzt0iJJtgUTa8Lr+vSHx2pY70ZHgzsmbwKd1gEn1+u7ltx/5nUar5lRokB
-bz0=
-					    </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://idp.univ-paris4.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.univ-paris4.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.univ-paris4.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">univ-paris4.fr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">paris-sorbonne.fr</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIEfjCCA2agAwIBAgIQDoytgyQXDrxQwdffQSgBNTANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTEwMDIxOTAwMDAwMFoXDTEzMDIxODIzNTk1OVowVzELMAkGA1UE
-BhMCRlIxDjAMBgNVBAcTBVBBUklTMRswGQYDVQQKExJVTklWRVJTSVRFIFBBUklT
-IDQxGzAZBgNVBAMTEmlkcC51bml2LXBhcmlzNC5mcjCCASIwDQYJKoZIhvcNAQEB
-BQADggEPADCCAQoCggEBAKqttSIJz1BQxcIHy3dNdnJd+0iaQlWU31Y2zsGckNjR
-YbW4lwMq5xcnqHwrgUp8PiaFBy6/jioXDpHs5ByrrLLE052hfeEB0W5AO5mN7Yqd
-URorS4LHo9JsUFrULl0haEF6FFoDD6ABR7djwerDccIebVoICvj9W1ypN8vPmo/P
-qaXZ0QKcJJjmbuxYxt+JnYQyQhqxZXgbGfelyclhfrCNZsjFmoLL2hvpIINAv3Al
-7xFBv1DlKpRImWAjHkqZtWzyGHNU3EryVBrjeoxlRQfVjCMqTnZ5O57bTZc7TK5Y
-eMlvB0syEnzC68HJ02baPgf1T94S2gD3nvFjfcNcJu8CAwEAAaOCAWUwggFhMB8G
-A1UdIwQYMBaAFAy9k2gM896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBQ+ho3P8U/1
-4zqg7ukFkfl9eCelZDAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNV
-HSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwGAYDVR0gBBEwDzANBgsrBgEEAbIx
-AQICHTA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3Jn
-L1RFUkVOQVNTTENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0
-dHA6Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUF
-BzABhhpodHRwOi8vb2NzcC50Y3MudGVyZW5hLm9yZzAdBgNVHREEFjAUghJpZHAu
-dW5pdi1wYXJpczQuZnIwDQYJKoZIhvcNAQEFBQADggEBAHwUYz+yFi2FBkcFN3Km
-2qfIfiBsLFWB6IfkmQ67R1grVxUSlRIIyJ7L4IWrnzlSfua51Z8UJPvcu69n9eBX
-qZziEXS4ZAlDKF7w3eLV8lIy3PX35/k6MQeju9XutriZXn/d6j7tN3sn7hYp+2i3
-+FffOhUyk30j9dUG3P17NpJBQ8vWjily3GNDwcjkZhWnoNLy23BssXqN7vkrc/8k
-LsZ2ycJNxU+3DFaLplq4s2S7llycn+QoR2FGFQYbRxEIkEExzPEjcoHxO9Z9NWiX
-mWTayZwzt0iJJtgUTa8Lr+vSHx2pY70ZHgzsmbwKd1gEn1+u7ltx/5nUar5lRokB
-bz0=
-					    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.univ-paris4.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">Université de Paris IV - Sorbonne</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Université de Paris IV - Sorbonne</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>MARIR Brahim</SurName>
-    <EmailAddress>brahim.marir@paris-sorbonne.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.univ-paris8.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.univ-paris8.fr-idp-shibboleth.xml
deleted file mode 100644
index 060b5a5e..00000000
--- a/swamid-interfederations-2.0/idp.univ-paris8.fr-idp-shibboleth.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://idp.univ-paris8.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2010-09-24T11:17: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">univ-paris8.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">Université de Paris 8 - Vincennes</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIEcTCCA1mgAwIBAgIQU6fzKCJW2smEB7nD2+nWADANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTEzMDYyNzAwMDAwMFoXDTE2MDYyNjIzNTk1OVowQDEhMB8GA1UE
-CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRswGQYDVQQDExJpZHAudW5pdi1w
-YXJpczguZnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDmo0SkZ0JM
-lY6h/s/GZ06X+OKLv3pvhob3myRVfK+dHO+PomnDiydgHo5lS5ihZCuUIGqjLMrm
-MB1oOrpMHFxYlVCAhqrt/4/EnY6niTSsnm38ngkzsONG5Rx4UPchpSRYm9TOKcuQ
-g/yDdi6iSrwqmMWJpuxOIt2HCfXFBTULCc6n18v2mg5Ah4FTssi81R8qBk5F1RzP
-l32jPA+X6G8gIJ4iGuNF+LgiHeNRcEHAuy9XLd7/4FH9DJdAjTwiA9D3E3tK4fx4
-wZC0sOacx775Um5C+UxMNftuObZcSLAMT1rsHzfJMdWxuxbzaub/AzwyYjl/tKSx
-vPMk3ez04E+5AgMBAAGjggFvMIIBazAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3
-V0fqkOO57TAdBgNVHQ4EFgQUMArZEB/NP0dHX30H+1w0TzyO7uQwDgYDVR0PAQH/
-BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUF
-BwMCMCIGA1UdIAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQIBMDoGA1UdHwQz
-MDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0Eu
-Y3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50Y3Mu
-dGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9v
-Y3NwLnRjcy50ZXJlbmEub3JnMB0GA1UdEQQWMBSCEmlkcC51bml2LXBhcmlzOC5m
-cjANBgkqhkiG9w0BAQUFAAOCAQEAILdNZYfosh/VDwYL/imyGlgxmXvVr5qQZpEq
-8g/4KOwUkpbDi/rym3gffbNE/NsU8cl+REMrIPBcNe37E0ZpIav/+PVjfvxLpEH6
-6pBMFkpQEjJfBy1FuW6qiKSCeLmFVK9GkAFVDETtwR3+papXIcLiQpFiJvnCXRH4
-l/ELbK/eJKOdrq6Zmy628SNr3CqnfmJYzCjWWLCPDGFLqdb+NGrJmv/vW6qjaXR8
-/V8oGmyidoea26kUSWvdh3AKMnMQS4zsJmhmxanamVwRPT39MQMpRBkyZE8vbzNg
-UBmu1bU2YiGLaIjIQDOLGGuoia51PW2bRqBpeOc4GdmkMuUMIw==
-					    </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://idp.univ-paris8.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.univ-paris8.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.univ-paris8.fr/idp/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Université de Paris 8 - Vincennes</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Université de Paris 8 - Vincennes</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <EmailAddress>reseau@univ-paris8.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.univ-paris8.fr.xml b/swamid-interfederations-2.0/idp.univ-paris8.fr.xml
deleted file mode 100644
index 060b5a5e..00000000
--- a/swamid-interfederations-2.0/idp.univ-paris8.fr.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://idp.univ-paris8.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2010-09-24T11:17: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">univ-paris8.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">Université de Paris 8 - Vincennes</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIEcTCCA1mgAwIBAgIQU6fzKCJW2smEB7nD2+nWADANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTEzMDYyNzAwMDAwMFoXDTE2MDYyNjIzNTk1OVowQDEhMB8GA1UE
-CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRswGQYDVQQDExJpZHAudW5pdi1w
-YXJpczguZnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDmo0SkZ0JM
-lY6h/s/GZ06X+OKLv3pvhob3myRVfK+dHO+PomnDiydgHo5lS5ihZCuUIGqjLMrm
-MB1oOrpMHFxYlVCAhqrt/4/EnY6niTSsnm38ngkzsONG5Rx4UPchpSRYm9TOKcuQ
-g/yDdi6iSrwqmMWJpuxOIt2HCfXFBTULCc6n18v2mg5Ah4FTssi81R8qBk5F1RzP
-l32jPA+X6G8gIJ4iGuNF+LgiHeNRcEHAuy9XLd7/4FH9DJdAjTwiA9D3E3tK4fx4
-wZC0sOacx775Um5C+UxMNftuObZcSLAMT1rsHzfJMdWxuxbzaub/AzwyYjl/tKSx
-vPMk3ez04E+5AgMBAAGjggFvMIIBazAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3
-V0fqkOO57TAdBgNVHQ4EFgQUMArZEB/NP0dHX30H+1w0TzyO7uQwDgYDVR0PAQH/
-BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUF
-BwMCMCIGA1UdIAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQIBMDoGA1UdHwQz
-MDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0Eu
-Y3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50Y3Mu
-dGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9v
-Y3NwLnRjcy50ZXJlbmEub3JnMB0GA1UdEQQWMBSCEmlkcC51bml2LXBhcmlzOC5m
-cjANBgkqhkiG9w0BAQUFAAOCAQEAILdNZYfosh/VDwYL/imyGlgxmXvVr5qQZpEq
-8g/4KOwUkpbDi/rym3gffbNE/NsU8cl+REMrIPBcNe37E0ZpIav/+PVjfvxLpEH6
-6pBMFkpQEjJfBy1FuW6qiKSCeLmFVK9GkAFVDETtwR3+papXIcLiQpFiJvnCXRH4
-l/ELbK/eJKOdrq6Zmy628SNr3CqnfmJYzCjWWLCPDGFLqdb+NGrJmv/vW6qjaXR8
-/V8oGmyidoea26kUSWvdh3AKMnMQS4zsJmhmxanamVwRPT39MQMpRBkyZE8vbzNg
-UBmu1bU2YiGLaIjIQDOLGGuoia51PW2bRqBpeOc4GdmkMuUMIw==
-					    </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://idp.univ-paris8.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.univ-paris8.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.univ-paris8.fr/idp/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Université de Paris 8 - Vincennes</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Université de Paris 8 - Vincennes</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <EmailAddress>reseau@univ-paris8.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.univ-tours.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.univ-tours.fr-idp-shibboleth.xml
deleted file mode 100644
index 4373e313..00000000
--- a/swamid-interfederations-2.0/idp.univ-tours.fr-idp-shibboleth.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://idp.univ-tours.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2009-06-24T18:00:31Z">
-      <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">univ-tours.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">Université de Tours</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDLzCCAhegAwIBAgIUVH5OPXLEAtiW4UVmoDzKej0fR7wwDQYJKoZIhvcNAQEF
-BQAwHDEaMBgGA1UEAxMRaWRwLnVuaXYtdG91cnMuZnIwHhcNMDkwNjA5MTI0NTIx
-WhcNMjkwNjA5MTI0NTIxWjAcMRowGAYDVQQDExFpZHAudW5pdi10b3Vycy5mcjCC
-ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJV+FLOks9NmLB17N7XlmI+E
-r7NgQKavtPYd75TgOu5ubqe2YYD7DoLrQQzalOs7dw7Q2b1Pd+DSbqKjthjdD/wm
-IrvbA3bddVtU0hurW+wOfcP/aqvODxOL2PjYgRucGu82UfocIxbjDQyKvAhS1wsR
-tz2p0rLdCGKevDJqeJsSC7JAGolSYmnpZHRRY/86qKuvO/5XxBFUxqAuplOD2Cyk
-+SgMsyd1eRNgfNf18peOPuK/s7midkIoSNfmffQri/gqlxXrZujj7sYQawU1bAt6
-IGxxDfKsyzinTxSj/8wXUfO1YaaSZpoOzQI6s42CvqZf5fnLBAu5G7QmGVPSQL8C
-AwEAAaNpMGcwRgYDVR0RBD8wPYIRaWRwLnVuaXYtdG91cnMuZnKGKGh0dHBzOi8v
-aWRwLnVuaXYtdG91cnMuZnIvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFCJdjIn0
-Y6lWGricZa673uc04sZuMA0GCSqGSIb3DQEBBQUAA4IBAQAGMS23ntdqT1WC7zXy
-KvER9CkWn8VHr3/j8FgHxJ/Ny5+eAAp348PPgk4FIl5W3JAyg5ZwqZYUET34xXBd
-C66AZjpoQvuyXEtWWlhama0FFW4UMRKjYxGSFf8BJFmyMk4fRtwolbm9s+MWD4bz
-ZpQtX9RZhBibLqx6BROOvyVFDsXxT/SbR7sHIlZE4Vd9bis6QE2SAefj6qyehYPL
-Nm452WAqt1hsasELZYoMp3q/jUFuLwIqk4HaoyP0ugbGZS5S+uf6vrodMvoVwf84
-Sf1I3HGOP6+0iyh+HO8fJM+1VZRsIxCJy69Z4uWDSacQOJo7cvj6sXSDRdv2Ecm8
-DW4K
-					    </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://idp.univ-tours.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.univ-tours.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.univ-tours.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">univ-tours.fr</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDLzCCAhegAwIBAgIUVH5OPXLEAtiW4UVmoDzKej0fR7wwDQYJKoZIhvcNAQEF
-BQAwHDEaMBgGA1UEAxMRaWRwLnVuaXYtdG91cnMuZnIwHhcNMDkwNjA5MTI0NTIx
-WhcNMjkwNjA5MTI0NTIxWjAcMRowGAYDVQQDExFpZHAudW5pdi10b3Vycy5mcjCC
-ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJV+FLOks9NmLB17N7XlmI+E
-r7NgQKavtPYd75TgOu5ubqe2YYD7DoLrQQzalOs7dw7Q2b1Pd+DSbqKjthjdD/wm
-IrvbA3bddVtU0hurW+wOfcP/aqvODxOL2PjYgRucGu82UfocIxbjDQyKvAhS1wsR
-tz2p0rLdCGKevDJqeJsSC7JAGolSYmnpZHRRY/86qKuvO/5XxBFUxqAuplOD2Cyk
-+SgMsyd1eRNgfNf18peOPuK/s7midkIoSNfmffQri/gqlxXrZujj7sYQawU1bAt6
-IGxxDfKsyzinTxSj/8wXUfO1YaaSZpoOzQI6s42CvqZf5fnLBAu5G7QmGVPSQL8C
-AwEAAaNpMGcwRgYDVR0RBD8wPYIRaWRwLnVuaXYtdG91cnMuZnKGKGh0dHBzOi8v
-aWRwLnVuaXYtdG91cnMuZnIvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFCJdjIn0
-Y6lWGricZa673uc04sZuMA0GCSqGSIb3DQEBBQUAA4IBAQAGMS23ntdqT1WC7zXy
-KvER9CkWn8VHr3/j8FgHxJ/Ny5+eAAp348PPgk4FIl5W3JAyg5ZwqZYUET34xXBd
-C66AZjpoQvuyXEtWWlhama0FFW4UMRKjYxGSFf8BJFmyMk4fRtwolbm9s+MWD4bz
-ZpQtX9RZhBibLqx6BROOvyVFDsXxT/SbR7sHIlZE4Vd9bis6QE2SAefj6qyehYPL
-Nm452WAqt1hsasELZYoMp3q/jUFuLwIqk4HaoyP0ugbGZS5S+uf6vrodMvoVwf84
-Sf1I3HGOP6+0iyh+HO8fJM+1VZRsIxCJy69Z4uWDSacQOJo7cvj6sXSDRdv2Ecm8
-DW4K
-					    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.univ-tours.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">Université de Tours</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Université de Tours</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Patrice Garnier</SurName>
-    <EmailAddress>patrice.garnier@univ-tours.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.univ-tours.fr.xml b/swamid-interfederations-2.0/idp.univ-tours.fr.xml
deleted file mode 100644
index 4373e313..00000000
--- a/swamid-interfederations-2.0/idp.univ-tours.fr.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://idp.univ-tours.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2009-06-24T18:00:31Z">
-      <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">univ-tours.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">Université de Tours</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDLzCCAhegAwIBAgIUVH5OPXLEAtiW4UVmoDzKej0fR7wwDQYJKoZIhvcNAQEF
-BQAwHDEaMBgGA1UEAxMRaWRwLnVuaXYtdG91cnMuZnIwHhcNMDkwNjA5MTI0NTIx
-WhcNMjkwNjA5MTI0NTIxWjAcMRowGAYDVQQDExFpZHAudW5pdi10b3Vycy5mcjCC
-ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJV+FLOks9NmLB17N7XlmI+E
-r7NgQKavtPYd75TgOu5ubqe2YYD7DoLrQQzalOs7dw7Q2b1Pd+DSbqKjthjdD/wm
-IrvbA3bddVtU0hurW+wOfcP/aqvODxOL2PjYgRucGu82UfocIxbjDQyKvAhS1wsR
-tz2p0rLdCGKevDJqeJsSC7JAGolSYmnpZHRRY/86qKuvO/5XxBFUxqAuplOD2Cyk
-+SgMsyd1eRNgfNf18peOPuK/s7midkIoSNfmffQri/gqlxXrZujj7sYQawU1bAt6
-IGxxDfKsyzinTxSj/8wXUfO1YaaSZpoOzQI6s42CvqZf5fnLBAu5G7QmGVPSQL8C
-AwEAAaNpMGcwRgYDVR0RBD8wPYIRaWRwLnVuaXYtdG91cnMuZnKGKGh0dHBzOi8v
-aWRwLnVuaXYtdG91cnMuZnIvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFCJdjIn0
-Y6lWGricZa673uc04sZuMA0GCSqGSIb3DQEBBQUAA4IBAQAGMS23ntdqT1WC7zXy
-KvER9CkWn8VHr3/j8FgHxJ/Ny5+eAAp348PPgk4FIl5W3JAyg5ZwqZYUET34xXBd
-C66AZjpoQvuyXEtWWlhama0FFW4UMRKjYxGSFf8BJFmyMk4fRtwolbm9s+MWD4bz
-ZpQtX9RZhBibLqx6BROOvyVFDsXxT/SbR7sHIlZE4Vd9bis6QE2SAefj6qyehYPL
-Nm452WAqt1hsasELZYoMp3q/jUFuLwIqk4HaoyP0ugbGZS5S+uf6vrodMvoVwf84
-Sf1I3HGOP6+0iyh+HO8fJM+1VZRsIxCJy69Z4uWDSacQOJo7cvj6sXSDRdv2Ecm8
-DW4K
-					    </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://idp.univ-tours.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.univ-tours.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.univ-tours.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">univ-tours.fr</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDLzCCAhegAwIBAgIUVH5OPXLEAtiW4UVmoDzKej0fR7wwDQYJKoZIhvcNAQEF
-BQAwHDEaMBgGA1UEAxMRaWRwLnVuaXYtdG91cnMuZnIwHhcNMDkwNjA5MTI0NTIx
-WhcNMjkwNjA5MTI0NTIxWjAcMRowGAYDVQQDExFpZHAudW5pdi10b3Vycy5mcjCC
-ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJV+FLOks9NmLB17N7XlmI+E
-r7NgQKavtPYd75TgOu5ubqe2YYD7DoLrQQzalOs7dw7Q2b1Pd+DSbqKjthjdD/wm
-IrvbA3bddVtU0hurW+wOfcP/aqvODxOL2PjYgRucGu82UfocIxbjDQyKvAhS1wsR
-tz2p0rLdCGKevDJqeJsSC7JAGolSYmnpZHRRY/86qKuvO/5XxBFUxqAuplOD2Cyk
-+SgMsyd1eRNgfNf18peOPuK/s7midkIoSNfmffQri/gqlxXrZujj7sYQawU1bAt6
-IGxxDfKsyzinTxSj/8wXUfO1YaaSZpoOzQI6s42CvqZf5fnLBAu5G7QmGVPSQL8C
-AwEAAaNpMGcwRgYDVR0RBD8wPYIRaWRwLnVuaXYtdG91cnMuZnKGKGh0dHBzOi8v
-aWRwLnVuaXYtdG91cnMuZnIvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFCJdjIn0
-Y6lWGricZa673uc04sZuMA0GCSqGSIb3DQEBBQUAA4IBAQAGMS23ntdqT1WC7zXy
-KvER9CkWn8VHr3/j8FgHxJ/Ny5+eAAp348PPgk4FIl5W3JAyg5ZwqZYUET34xXBd
-C66AZjpoQvuyXEtWWlhama0FFW4UMRKjYxGSFf8BJFmyMk4fRtwolbm9s+MWD4bz
-ZpQtX9RZhBibLqx6BROOvyVFDsXxT/SbR7sHIlZE4Vd9bis6QE2SAefj6qyehYPL
-Nm452WAqt1hsasELZYoMp3q/jUFuLwIqk4HaoyP0ugbGZS5S+uf6vrodMvoVwf84
-Sf1I3HGOP6+0iyh+HO8fJM+1VZRsIxCJy69Z4uWDSacQOJo7cvj6sXSDRdv2Ecm8
-DW4K
-					    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.univ-tours.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">Université de Tours</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Université de Tours</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Patrice Garnier</SurName>
-    <EmailAddress>patrice.garnier@univ-tours.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.universite-lyon.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.universite-lyon.fr-idp-shibboleth.xml
deleted file mode 100644
index 947af92f..00000000
--- a/swamid-interfederations-2.0/idp.universite-lyon.fr-idp-shibboleth.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://idp.universite-lyon.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2011-03-11T10:47:26Z">
-      <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">universite-lyon.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">Université de Lyon</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDRDCCAiygAwIBAgIVAP2sGfoeCE9dQRA0FpVdm+UCBHNFMA0GCSqGSIb3DQEB
-BQUAMCExHzAdBgNVBAMTFmlkcC51bml2ZXJzaXRlLWx5b24uZnIwHhcNMTEwMzEw
-MTEyMzIxWhcNMzEwMzEwMTEyMzIxWjAhMR8wHQYDVQQDExZpZHAudW5pdmVyc2l0
-ZS1seW9uLmZyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu36fHWJ2
-j8l174LhbbLmqLR9Mc6O0RmAZGkpt+Wga7mGICSY+bk9TPK64vHBBfUdsx0HkVi3
-1EPVf2AK/lJqcd12YJIKy0yisQrxRGYCynF1nhyuVgrgl1kKo6LGjgxb9IRJU2BG
-xL168MWGzov867Ttdmty53ZmdfjTRGAoK7MmDrBInpWOtR6HcI7tKAGQlThsgbo6
-kfXobR6ntp0t90RNPaTUgm+oNlXXsEcMWsLbdeR+d6IxWx9xAPx4D7S+JmA+vAGI
-P/d/DNUXnvZA9o9ysqhMF4TmD9rNgBL9658h4hwS3OAOlbM9YViQPKmVsc9qBp5w
-y9y+qk73cTB+ZwIDAQABo3MwcTBQBgNVHREESTBHghZpZHAudW5pdmVyc2l0ZS1s
-eW9uLmZyhi1odHRwczovL2lkcC51bml2ZXJzaXRlLWx5b24uZnIvaWRwL3NoaWJi
-b2xldGgwHQYDVR0OBBYEFEanTWpekMShUedKb9mgslNYb/gGMA0GCSqGSIb3DQEB
-BQUAA4IBAQAU0hITe/utTwqDfRm70ZkGC1gVwPj7cVvQOrWT41dS158IsYuPZlQr
-p2398RDEob6XcfbuHVERXfL2WZTvg7CD7Ui1g4tM1AffUFauu0AjYW91LP88epsm
-opoZD5iGwCE8Xwyx36MfgQ2VsuxP64LM8r0H8kTBHbGsuvCjbvKNB6XmXoBHM9S1
-h7F5udv5XokwRaF5dzzn5bSOQqxtaUCGfhFpJx0VcmmyBQ6tOhLC9PVC48hyq7v6
-RFr+XMux5XOoza21wQf9RWV70eN43LuUxR1ZNdjdHgvwqXFmIauGAaCib8j3/ARv
-UZpOUBiMjLpIx7nFKyNwPg5DVhxj2BDR
-					    </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://idp.universite-lyon.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.universite-lyon.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.universite-lyon.fr/idp/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Université de Lyon</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Université de Lyon</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <EmailAddress>sysadmin@universite-lyon.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.universite-lyon.fr.xml b/swamid-interfederations-2.0/idp.universite-lyon.fr.xml
deleted file mode 100644
index 947af92f..00000000
--- a/swamid-interfederations-2.0/idp.universite-lyon.fr.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://idp.universite-lyon.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2011-03-11T10:47:26Z">
-      <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">universite-lyon.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">Université de Lyon</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDRDCCAiygAwIBAgIVAP2sGfoeCE9dQRA0FpVdm+UCBHNFMA0GCSqGSIb3DQEB
-BQUAMCExHzAdBgNVBAMTFmlkcC51bml2ZXJzaXRlLWx5b24uZnIwHhcNMTEwMzEw
-MTEyMzIxWhcNMzEwMzEwMTEyMzIxWjAhMR8wHQYDVQQDExZpZHAudW5pdmVyc2l0
-ZS1seW9uLmZyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu36fHWJ2
-j8l174LhbbLmqLR9Mc6O0RmAZGkpt+Wga7mGICSY+bk9TPK64vHBBfUdsx0HkVi3
-1EPVf2AK/lJqcd12YJIKy0yisQrxRGYCynF1nhyuVgrgl1kKo6LGjgxb9IRJU2BG
-xL168MWGzov867Ttdmty53ZmdfjTRGAoK7MmDrBInpWOtR6HcI7tKAGQlThsgbo6
-kfXobR6ntp0t90RNPaTUgm+oNlXXsEcMWsLbdeR+d6IxWx9xAPx4D7S+JmA+vAGI
-P/d/DNUXnvZA9o9ysqhMF4TmD9rNgBL9658h4hwS3OAOlbM9YViQPKmVsc9qBp5w
-y9y+qk73cTB+ZwIDAQABo3MwcTBQBgNVHREESTBHghZpZHAudW5pdmVyc2l0ZS1s
-eW9uLmZyhi1odHRwczovL2lkcC51bml2ZXJzaXRlLWx5b24uZnIvaWRwL3NoaWJi
-b2xldGgwHQYDVR0OBBYEFEanTWpekMShUedKb9mgslNYb/gGMA0GCSqGSIb3DQEB
-BQUAA4IBAQAU0hITe/utTwqDfRm70ZkGC1gVwPj7cVvQOrWT41dS158IsYuPZlQr
-p2398RDEob6XcfbuHVERXfL2WZTvg7CD7Ui1g4tM1AffUFauu0AjYW91LP88epsm
-opoZD5iGwCE8Xwyx36MfgQ2VsuxP64LM8r0H8kTBHbGsuvCjbvKNB6XmXoBHM9S1
-h7F5udv5XokwRaF5dzzn5bSOQqxtaUCGfhFpJx0VcmmyBQ6tOhLC9PVC48hyq7v6
-RFr+XMux5XOoza21wQf9RWV70eN43LuUxR1ZNdjdHgvwqXFmIauGAaCib8j3/ARv
-UZpOUBiMjLpIx7nFKyNwPg5DVhxj2BDR
-					    </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://idp.universite-lyon.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.universite-lyon.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.universite-lyon.fr/idp/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Université de Lyon</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Université de Lyon</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <EmailAddress>sysadmin@universite-lyon.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.unoesc.edu.br-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.unoesc.edu.br-idp-shibboleth.xml
deleted file mode 100644
index a1da9093..00000000
--- a/swamid-interfederations-2.0/idp.unoesc.edu.br-idp-shibboleth.xml
+++ /dev/null
@@ -1,106 +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://idp.unoesc.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">unoesc.lan</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">UNOESC - Universidade do Oeste de Santa Catarina</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="pt-br">UNOESC - Universidade do Oeste de Santa Catarina</mdui:DisplayName>
-        <mdui:Description xml:lang="en">UNOESC - Universidade do Oeste de Santa Catarina</mdui:Description>
-        <mdui:Description xml:lang="pt-br">UNOESC - Universidade do Oeste de Santa Catarina</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.unoesc.edu.br/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="pt-br">http://www.unoesc.edu.br/</mdui:InformationURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-    MIIDMDCCAhigAwIBAgIVAKF0Ji/vZztY4mCNEZ7pPefws602MA0GCSqGSIb3DQEB
-BQUAMBwxGjAYBgNVBAMTEWlkcC51bm9lc2MuZWR1LmJyMB4XDTEzMDgyMDE0MDU0
-NFoXDTMzMDgyMDE0MDU0NFowHDEaMBgGA1UEAxMRaWRwLnVub2VzYy5lZHUuYnIw
-ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCrzalfKRn2m+07ik20IeYC
-ZRH0VTEHLlWsJpPqWjhcUv6cztdeE5yfHzzmqKpPUj+VROgS8N0WO7ET8v66naDv
-D8XwcJpUsWNTjObGT4ZtsuRe223I/mN9GAlDFW9EyRudEJ9JPkAu94ZWzcv/kX4b
-3m5OQKYPI3nqVnsXObowJhjJeOOPNFAq/uVa2mSSVNcpWgdGbMPcISWoW8mIk+e7
-j6R350cHy+jVmEJLkYorIIgUFAq4v5BXk6tcDUw7Zw+BmoKkSCqTXL6Mne7siSzt
-e4kFRDbrtYgC7xYoqUrbj/LAQE29iHvcci1E6x1hpeX1YssgrkXHSa4sS6bJD+nt
-AgMBAAGjaTBnMEYGA1UdEQQ/MD2CEWlkcC51bm9lc2MuZWR1LmJyhihodHRwczov
-L2lkcC51bm9lc2MuZWR1LmJyL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBSEKtwq
-Me8m63UoHRkKdnyxHXMbfjANBgkqhkiG9w0BAQUFAAOCAQEAQeayBPOHksOEXqL6
-9dMRRhsaJOsmEQV8FLQbED5fkIi+WmBvHZ+OUCzYgnYH391/1iL+/KqmIq2kRXFQ
-L5VjytIJrjGyE+PLuycinRAdWgfzCnV47vXZ5agYjsuPBRFH9EI2j7xcZm/Bao6Q
-EOJQJ1edlst14UuaTuPOFql+3mgcKNoTt7tXJggkehJqkCAV1fl1LC7q3Tnkj/rT
-tOPnCI2V0hFiMzPkuhtDDWd8r3/B/SCuBf/gDkQKTjIMemKKBIsrqGg13A9Br23f
-veKi8jp2UG9e1Ws1DXaGXlkGklegRePCGIKEBaggZ6Y59ZJBOoHGBnq8nodIcqo4
-gjfpFw==
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.unoesc.edu.br:443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.unoesc.edu.br:443/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://idp.unoesc.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.unoesc.edu.br/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.unoesc.edu.br/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.unoesc.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">unoesc.lan</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-      
-MIIDMDCCAhigAwIBAgIVAKF0Ji/vZztY4mCNEZ7pPefws602MA0GCSqGSIb3DQEB
-BQUAMBwxGjAYBgNVBAMTEWlkcC51bm9lc2MuZWR1LmJyMB4XDTEzMDgyMDE0MDU0
-NFoXDTMzMDgyMDE0MDU0NFowHDEaMBgGA1UEAxMRaWRwLnVub2VzYy5lZHUuYnIw
-ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCrzalfKRn2m+07ik20IeYC
-ZRH0VTEHLlWsJpPqWjhcUv6cztdeE5yfHzzmqKpPUj+VROgS8N0WO7ET8v66naDv
-D8XwcJpUsWNTjObGT4ZtsuRe223I/mN9GAlDFW9EyRudEJ9JPkAu94ZWzcv/kX4b
-3m5OQKYPI3nqVnsXObowJhjJeOOPNFAq/uVa2mSSVNcpWgdGbMPcISWoW8mIk+e7
-j6R350cHy+jVmEJLkYorIIgUFAq4v5BXk6tcDUw7Zw+BmoKkSCqTXL6Mne7siSzt
-e4kFRDbrtYgC7xYoqUrbj/LAQE29iHvcci1E6x1hpeX1YssgrkXHSa4sS6bJD+nt
-AgMBAAGjaTBnMEYGA1UdEQQ/MD2CEWlkcC51bm9lc2MuZWR1LmJyhihodHRwczov
-L2lkcC51bm9lc2MuZWR1LmJyL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBSEKtwq
-Me8m63UoHRkKdnyxHXMbfjANBgkqhkiG9w0BAQUFAAOCAQEAQeayBPOHksOEXqL6
-9dMRRhsaJOsmEQV8FLQbED5fkIi+WmBvHZ+OUCzYgnYH391/1iL+/KqmIq2kRXFQ
-L5VjytIJrjGyE+PLuycinRAdWgfzCnV47vXZ5agYjsuPBRFH9EI2j7xcZm/Bao6Q
-EOJQJ1edlst14UuaTuPOFql+3mgcKNoTt7tXJggkehJqkCAV1fl1LC7q3Tnkj/rT
-tOPnCI2V0hFiMzPkuhtDDWd8r3/B/SCuBf/gDkQKTjIMemKKBIsrqGg13A9Br23f
-veKi8jp2UG9e1Ws1DXaGXlkGklegRePCGIKEBaggZ6Y59ZJBOoHGBnq8nodIcqo4
-gjfpFw==
-                    
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.unoesc.edu.br:443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.unoesc.edu.br:443/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">Unoesc - Universidade do Oeste de Santa Catarina</OrganizationName>
-    <OrganizationName xml:lang="pt-br">Unoesc - Universidade do Oeste de Santa Catarina</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">UNOESC - Universidade do Oeste de Santa Catarina</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="pt-br">UNOESC - Universidade do Oeste de Santa Catarina</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.unoesc.edu.br/</OrganizationURL>
-    <OrganizationURL xml:lang="pt-br">http://www.unoesc.edu.br/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Adalberto Freiberger</SurName>
-    <EmailAddress>ctic.jba@unoesc.edu.br</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.unoesc.edu.br.xml b/swamid-interfederations-2.0/idp.unoesc.edu.br.xml
deleted file mode 100644
index a1da9093..00000000
--- a/swamid-interfederations-2.0/idp.unoesc.edu.br.xml
+++ /dev/null
@@ -1,106 +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://idp.unoesc.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">unoesc.lan</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">UNOESC - Universidade do Oeste de Santa Catarina</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="pt-br">UNOESC - Universidade do Oeste de Santa Catarina</mdui:DisplayName>
-        <mdui:Description xml:lang="en">UNOESC - Universidade do Oeste de Santa Catarina</mdui:Description>
-        <mdui:Description xml:lang="pt-br">UNOESC - Universidade do Oeste de Santa Catarina</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.unoesc.edu.br/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="pt-br">http://www.unoesc.edu.br/</mdui:InformationURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-    MIIDMDCCAhigAwIBAgIVAKF0Ji/vZztY4mCNEZ7pPefws602MA0GCSqGSIb3DQEB
-BQUAMBwxGjAYBgNVBAMTEWlkcC51bm9lc2MuZWR1LmJyMB4XDTEzMDgyMDE0MDU0
-NFoXDTMzMDgyMDE0MDU0NFowHDEaMBgGA1UEAxMRaWRwLnVub2VzYy5lZHUuYnIw
-ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCrzalfKRn2m+07ik20IeYC
-ZRH0VTEHLlWsJpPqWjhcUv6cztdeE5yfHzzmqKpPUj+VROgS8N0WO7ET8v66naDv
-D8XwcJpUsWNTjObGT4ZtsuRe223I/mN9GAlDFW9EyRudEJ9JPkAu94ZWzcv/kX4b
-3m5OQKYPI3nqVnsXObowJhjJeOOPNFAq/uVa2mSSVNcpWgdGbMPcISWoW8mIk+e7
-j6R350cHy+jVmEJLkYorIIgUFAq4v5BXk6tcDUw7Zw+BmoKkSCqTXL6Mne7siSzt
-e4kFRDbrtYgC7xYoqUrbj/LAQE29iHvcci1E6x1hpeX1YssgrkXHSa4sS6bJD+nt
-AgMBAAGjaTBnMEYGA1UdEQQ/MD2CEWlkcC51bm9lc2MuZWR1LmJyhihodHRwczov
-L2lkcC51bm9lc2MuZWR1LmJyL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBSEKtwq
-Me8m63UoHRkKdnyxHXMbfjANBgkqhkiG9w0BAQUFAAOCAQEAQeayBPOHksOEXqL6
-9dMRRhsaJOsmEQV8FLQbED5fkIi+WmBvHZ+OUCzYgnYH391/1iL+/KqmIq2kRXFQ
-L5VjytIJrjGyE+PLuycinRAdWgfzCnV47vXZ5agYjsuPBRFH9EI2j7xcZm/Bao6Q
-EOJQJ1edlst14UuaTuPOFql+3mgcKNoTt7tXJggkehJqkCAV1fl1LC7q3Tnkj/rT
-tOPnCI2V0hFiMzPkuhtDDWd8r3/B/SCuBf/gDkQKTjIMemKKBIsrqGg13A9Br23f
-veKi8jp2UG9e1Ws1DXaGXlkGklegRePCGIKEBaggZ6Y59ZJBOoHGBnq8nodIcqo4
-gjfpFw==
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.unoesc.edu.br:443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.unoesc.edu.br:443/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://idp.unoesc.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.unoesc.edu.br/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.unoesc.edu.br/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.unoesc.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">unoesc.lan</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-      
-MIIDMDCCAhigAwIBAgIVAKF0Ji/vZztY4mCNEZ7pPefws602MA0GCSqGSIb3DQEB
-BQUAMBwxGjAYBgNVBAMTEWlkcC51bm9lc2MuZWR1LmJyMB4XDTEzMDgyMDE0MDU0
-NFoXDTMzMDgyMDE0MDU0NFowHDEaMBgGA1UEAxMRaWRwLnVub2VzYy5lZHUuYnIw
-ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCrzalfKRn2m+07ik20IeYC
-ZRH0VTEHLlWsJpPqWjhcUv6cztdeE5yfHzzmqKpPUj+VROgS8N0WO7ET8v66naDv
-D8XwcJpUsWNTjObGT4ZtsuRe223I/mN9GAlDFW9EyRudEJ9JPkAu94ZWzcv/kX4b
-3m5OQKYPI3nqVnsXObowJhjJeOOPNFAq/uVa2mSSVNcpWgdGbMPcISWoW8mIk+e7
-j6R350cHy+jVmEJLkYorIIgUFAq4v5BXk6tcDUw7Zw+BmoKkSCqTXL6Mne7siSzt
-e4kFRDbrtYgC7xYoqUrbj/LAQE29iHvcci1E6x1hpeX1YssgrkXHSa4sS6bJD+nt
-AgMBAAGjaTBnMEYGA1UdEQQ/MD2CEWlkcC51bm9lc2MuZWR1LmJyhihodHRwczov
-L2lkcC51bm9lc2MuZWR1LmJyL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBSEKtwq
-Me8m63UoHRkKdnyxHXMbfjANBgkqhkiG9w0BAQUFAAOCAQEAQeayBPOHksOEXqL6
-9dMRRhsaJOsmEQV8FLQbED5fkIi+WmBvHZ+OUCzYgnYH391/1iL+/KqmIq2kRXFQ
-L5VjytIJrjGyE+PLuycinRAdWgfzCnV47vXZ5agYjsuPBRFH9EI2j7xcZm/Bao6Q
-EOJQJ1edlst14UuaTuPOFql+3mgcKNoTt7tXJggkehJqkCAV1fl1LC7q3Tnkj/rT
-tOPnCI2V0hFiMzPkuhtDDWd8r3/B/SCuBf/gDkQKTjIMemKKBIsrqGg13A9Br23f
-veKi8jp2UG9e1Ws1DXaGXlkGklegRePCGIKEBaggZ6Y59ZJBOoHGBnq8nodIcqo4
-gjfpFw==
-                    
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.unoesc.edu.br:443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.unoesc.edu.br:443/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">Unoesc - Universidade do Oeste de Santa Catarina</OrganizationName>
-    <OrganizationName xml:lang="pt-br">Unoesc - Universidade do Oeste de Santa Catarina</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">UNOESC - Universidade do Oeste de Santa Catarina</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="pt-br">UNOESC - Universidade do Oeste de Santa Catarina</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.unoesc.edu.br/</OrganizationURL>
-    <OrganizationURL xml:lang="pt-br">http://www.unoesc.edu.br/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Adalberto Freiberger</SurName>
-    <EmailAddress>ctic.jba@unoesc.edu.br</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.uoa.gr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.uoa.gr-idp-shibboleth.xml
deleted file mode 100644
index 29e2e26e..00000000
--- a/swamid-interfederations-2.0/idp.uoa.gr-idp-shibboleth.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.uoa.gr/idp/shibboleth">
-  <Extensions xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi">
-    <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 xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uoa.gr</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-                            MIIFATCCA+mgAwIBAgIIEms+5gN0OgUwDQYJKoZIhvcNAQEFBQAwgZIxCzAJBgNV
-                            BAYTAkdSMUQwQgYDVQQKEztIZWxsZW5pYyBBY2FkZW1pYyBhbmQgUmVzZWFyY2gg
-                            SW5zdGl0dXRpb25zIENlcnQuIEF1dGhvcml0eTE9MDsGA1UEAxM0TmF0aW9uYWwg
-                            YW5kIEthcG9kaXN0cmlhbiBVbml2ZXJzaXR5IG9mIEF0aGVucyBDQSBSMTAeFw0x
-                            NDA1MjcwMDAwMDBaFw0xNjA1MjYxMDUzNDlaMGAxCzAJBgNVBAYTAkdSMTcwNQYD
-                            VQQKEy5OYXRpb25hbCBhbmQgS2Fwb2Rpc3RyaWFuIFVuaXZlcnNpdHkgb2YgQXRo
-                            ZW5zMRgwFgYDVQQDEw9VT0EgaWRwIHNlcnZpY2UwggEiMA0GCSqGSIb3DQEBAQUA
-                            A4IBDwAwggEKAoIBAQCpFnIjMy+Hp7ZBii7LIm+FqVlRiL9tGew8L2gmevWvDTkH
-                            yTnIvAfOr4hmaZ075R44FqEDL03tiZMsMyFbsDL1uYuJA1bJY4cM66I88+aIWwaL
-                            MKuI1voOvClbx08y4c+gI5+epurxju0NaVcVqgUJuLzAcnbIHmaSiC9NEuvlYo9Z
-                            tkFX8g1nFoUatPEoZseJfukdyufqyb59hGsNtlw9cHnY+gy+69Y4ZmxU7uXmm7oE
-                            0IRoQDBeCp7hiGJePYcQeJHNxWZiO3/SgP6p9G3qO9oSHu892DZ8uPP3CrvwgpW0
-                            6uVGR+7i8IGjjMOdFiTTWtlvfFJmJ/ETKYe3511JAgMBAAGjggGKMIIBhjALBgNV
-                            HQ8EBAMCBaAwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMB0GA1UdDgQW
-                            BBSt7IktXk4pgSt+ECuSqC4RSNQG1zAfBgNVHSMEGDAWgBTWQ2tZXkiPvrW/wHtw
-                            u/Sr8SNBizBrBggrBgEFBQcBAQRfMF0wIQYIKwYBBQUHMAGGFWh0dHA6Ly9vY3Nw
-                            LmhhcmljYS5ncjA4BggrBgEFBQcwAoYsaHR0cDovL3d3dy5oYXJpY2EuZ3IvY2Vy
-                            dHMvSGFyaWNhVW9hQ0FSMS5wZW0wQwYDVR0fBDwwOjA4oDagNIYyaHR0cDovL2Ny
-                            bHYxLmhhcmljYS5nci9IYXJpY2FVb2FDQVIxL2NybHYxLmRlci5jcmwwTwYDVR0g
-                            BEgwRjBEBgwrBgEEAYHPEQEAAgcwNDAyBggrBgEFBQcCARYmaHR0cDovL3d3dy5o
-                            YXJpY2EuZ3IvZG9jdW1lbnRzL0NQUy5waHAwFQYDVR0RBA4wDIIKaWRwLnVvYS5n
-                            cjANBgkqhkiG9w0BAQUFAAOCAQEAaSENditQfkHEUNah+TqAhJziq/UC6UMh11PR
-                            1MIHmmQ7rTEiusr1E2sKkYqJA3UPD9aWhre6aNVNqCuViEfTvbc3YwytTu0vPqMt
-                            h23lNL4RQQHLpPpeUUDoN0vV/PlFUNeHnh/o7JtrCOTcdS7mQgkJvxq6kWwdDuQx
-                            0ZLgZQfyCHUlUToinr5oNCG7FAy2LRjXrzyOKGurX3WSY2FPAvWe1KSqdUS8/ZgI
-                            Jo0dRg7bs242O3GkczYeCobJ57vAwmiOPpHWyLq0QNPOQpJteMRRbDyDPEJxmZqL
-                            fFv23NJu+qiTMvSS1Z89Vph7AOEvYlV+m/BDv+Md9K41XM8i1g==
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.uoa.gr:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.uoa.gr: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://idp.uoa.gr/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.uoa.gr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.uoa.gr/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.uoa.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="false">uoa.gr</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-                            MIIFATCCA+mgAwIBAgIIEms+5gN0OgUwDQYJKoZIhvcNAQEFBQAwgZIxCzAJBgNV
-                            BAYTAkdSMUQwQgYDVQQKEztIZWxsZW5pYyBBY2FkZW1pYyBhbmQgUmVzZWFyY2gg
-                            SW5zdGl0dXRpb25zIENlcnQuIEF1dGhvcml0eTE9MDsGA1UEAxM0TmF0aW9uYWwg
-                            YW5kIEthcG9kaXN0cmlhbiBVbml2ZXJzaXR5IG9mIEF0aGVucyBDQSBSMTAeFw0x
-                            NDA1MjcwMDAwMDBaFw0xNjA1MjYxMDUzNDlaMGAxCzAJBgNVBAYTAkdSMTcwNQYD
-                            VQQKEy5OYXRpb25hbCBhbmQgS2Fwb2Rpc3RyaWFuIFVuaXZlcnNpdHkgb2YgQXRo
-                            ZW5zMRgwFgYDVQQDEw9VT0EgaWRwIHNlcnZpY2UwggEiMA0GCSqGSIb3DQEBAQUA
-                            A4IBDwAwggEKAoIBAQCpFnIjMy+Hp7ZBii7LIm+FqVlRiL9tGew8L2gmevWvDTkH
-                            yTnIvAfOr4hmaZ075R44FqEDL03tiZMsMyFbsDL1uYuJA1bJY4cM66I88+aIWwaL
-                            MKuI1voOvClbx08y4c+gI5+epurxju0NaVcVqgUJuLzAcnbIHmaSiC9NEuvlYo9Z
-                            tkFX8g1nFoUatPEoZseJfukdyufqyb59hGsNtlw9cHnY+gy+69Y4ZmxU7uXmm7oE
-                            0IRoQDBeCp7hiGJePYcQeJHNxWZiO3/SgP6p9G3qO9oSHu892DZ8uPP3CrvwgpW0
-                            6uVGR+7i8IGjjMOdFiTTWtlvfFJmJ/ETKYe3511JAgMBAAGjggGKMIIBhjALBgNV
-                            HQ8EBAMCBaAwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMB0GA1UdDgQW
-                            BBSt7IktXk4pgSt+ECuSqC4RSNQG1zAfBgNVHSMEGDAWgBTWQ2tZXkiPvrW/wHtw
-                            u/Sr8SNBizBrBggrBgEFBQcBAQRfMF0wIQYIKwYBBQUHMAGGFWh0dHA6Ly9vY3Nw
-                            LmhhcmljYS5ncjA4BggrBgEFBQcwAoYsaHR0cDovL3d3dy5oYXJpY2EuZ3IvY2Vy
-                            dHMvSGFyaWNhVW9hQ0FSMS5wZW0wQwYDVR0fBDwwOjA4oDagNIYyaHR0cDovL2Ny
-                            bHYxLmhhcmljYS5nci9IYXJpY2FVb2FDQVIxL2NybHYxLmRlci5jcmwwTwYDVR0g
-                            BEgwRjBEBgwrBgEEAYHPEQEAAgcwNDAyBggrBgEFBQcCARYmaHR0cDovL3d3dy5o
-                            YXJpY2EuZ3IvZG9jdW1lbnRzL0NQUy5waHAwFQYDVR0RBA4wDIIKaWRwLnVvYS5n
-                            cjANBgkqhkiG9w0BAQUFAAOCAQEAaSENditQfkHEUNah+TqAhJziq/UC6UMh11PR
-                            1MIHmmQ7rTEiusr1E2sKkYqJA3UPD9aWhre6aNVNqCuViEfTvbc3YwytTu0vPqMt
-                            h23lNL4RQQHLpPpeUUDoN0vV/PlFUNeHnh/o7JtrCOTcdS7mQgkJvxq6kWwdDuQx
-                            0ZLgZQfyCHUlUToinr5oNCG7FAy2LRjXrzyOKGurX3WSY2FPAvWe1KSqdUS8/ZgI
-                            Jo0dRg7bs242O3GkczYeCobJ57vAwmiOPpHWyLq0QNPOQpJteMRRbDyDPEJxmZqL
-                            fFv23NJu+qiTMvSS1Z89Vph7AOEvYlV+m/BDv+Md9K41XM8i1g==
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.uoa.gr:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.uoa.gr: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="en">National and Kapodistrian University of Athens</OrganizationName>
-    <OrganizationName xml:lang="el">Εθνικό Καποδιστριακό Πανεπιστήμιο Αθηνών</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">National and Kapodistrian University of Athens</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="el">Εθνικό Καποδιστριακό Πανεπιστήμιο Αθηνών</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.uoa.gr/</OrganizationURL>
-    <OrganizationURL xml:lang="el">http://www.uoa.gr/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>University of Athens Helpdesk</SurName>
-    <EmailAddress>helpdesk.idp@noc.uoa.gr</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="support">
-    <SurName>University of Athens Helpdesk</SurName>
-    <EmailAddress>helpdesk.idp@noc.uoa.gr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.uoa.gr.xml b/swamid-interfederations-2.0/idp.uoa.gr.xml
deleted file mode 100644
index 29e2e26e..00000000
--- a/swamid-interfederations-2.0/idp.uoa.gr.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.uoa.gr/idp/shibboleth">
-  <Extensions xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi">
-    <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 xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uoa.gr</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-                            MIIFATCCA+mgAwIBAgIIEms+5gN0OgUwDQYJKoZIhvcNAQEFBQAwgZIxCzAJBgNV
-                            BAYTAkdSMUQwQgYDVQQKEztIZWxsZW5pYyBBY2FkZW1pYyBhbmQgUmVzZWFyY2gg
-                            SW5zdGl0dXRpb25zIENlcnQuIEF1dGhvcml0eTE9MDsGA1UEAxM0TmF0aW9uYWwg
-                            YW5kIEthcG9kaXN0cmlhbiBVbml2ZXJzaXR5IG9mIEF0aGVucyBDQSBSMTAeFw0x
-                            NDA1MjcwMDAwMDBaFw0xNjA1MjYxMDUzNDlaMGAxCzAJBgNVBAYTAkdSMTcwNQYD
-                            VQQKEy5OYXRpb25hbCBhbmQgS2Fwb2Rpc3RyaWFuIFVuaXZlcnNpdHkgb2YgQXRo
-                            ZW5zMRgwFgYDVQQDEw9VT0EgaWRwIHNlcnZpY2UwggEiMA0GCSqGSIb3DQEBAQUA
-                            A4IBDwAwggEKAoIBAQCpFnIjMy+Hp7ZBii7LIm+FqVlRiL9tGew8L2gmevWvDTkH
-                            yTnIvAfOr4hmaZ075R44FqEDL03tiZMsMyFbsDL1uYuJA1bJY4cM66I88+aIWwaL
-                            MKuI1voOvClbx08y4c+gI5+epurxju0NaVcVqgUJuLzAcnbIHmaSiC9NEuvlYo9Z
-                            tkFX8g1nFoUatPEoZseJfukdyufqyb59hGsNtlw9cHnY+gy+69Y4ZmxU7uXmm7oE
-                            0IRoQDBeCp7hiGJePYcQeJHNxWZiO3/SgP6p9G3qO9oSHu892DZ8uPP3CrvwgpW0
-                            6uVGR+7i8IGjjMOdFiTTWtlvfFJmJ/ETKYe3511JAgMBAAGjggGKMIIBhjALBgNV
-                            HQ8EBAMCBaAwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMB0GA1UdDgQW
-                            BBSt7IktXk4pgSt+ECuSqC4RSNQG1zAfBgNVHSMEGDAWgBTWQ2tZXkiPvrW/wHtw
-                            u/Sr8SNBizBrBggrBgEFBQcBAQRfMF0wIQYIKwYBBQUHMAGGFWh0dHA6Ly9vY3Nw
-                            LmhhcmljYS5ncjA4BggrBgEFBQcwAoYsaHR0cDovL3d3dy5oYXJpY2EuZ3IvY2Vy
-                            dHMvSGFyaWNhVW9hQ0FSMS5wZW0wQwYDVR0fBDwwOjA4oDagNIYyaHR0cDovL2Ny
-                            bHYxLmhhcmljYS5nci9IYXJpY2FVb2FDQVIxL2NybHYxLmRlci5jcmwwTwYDVR0g
-                            BEgwRjBEBgwrBgEEAYHPEQEAAgcwNDAyBggrBgEFBQcCARYmaHR0cDovL3d3dy5o
-                            YXJpY2EuZ3IvZG9jdW1lbnRzL0NQUy5waHAwFQYDVR0RBA4wDIIKaWRwLnVvYS5n
-                            cjANBgkqhkiG9w0BAQUFAAOCAQEAaSENditQfkHEUNah+TqAhJziq/UC6UMh11PR
-                            1MIHmmQ7rTEiusr1E2sKkYqJA3UPD9aWhre6aNVNqCuViEfTvbc3YwytTu0vPqMt
-                            h23lNL4RQQHLpPpeUUDoN0vV/PlFUNeHnh/o7JtrCOTcdS7mQgkJvxq6kWwdDuQx
-                            0ZLgZQfyCHUlUToinr5oNCG7FAy2LRjXrzyOKGurX3WSY2FPAvWe1KSqdUS8/ZgI
-                            Jo0dRg7bs242O3GkczYeCobJ57vAwmiOPpHWyLq0QNPOQpJteMRRbDyDPEJxmZqL
-                            fFv23NJu+qiTMvSS1Z89Vph7AOEvYlV+m/BDv+Md9K41XM8i1g==
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.uoa.gr:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.uoa.gr: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://idp.uoa.gr/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.uoa.gr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.uoa.gr/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.uoa.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="false">uoa.gr</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-                            MIIFATCCA+mgAwIBAgIIEms+5gN0OgUwDQYJKoZIhvcNAQEFBQAwgZIxCzAJBgNV
-                            BAYTAkdSMUQwQgYDVQQKEztIZWxsZW5pYyBBY2FkZW1pYyBhbmQgUmVzZWFyY2gg
-                            SW5zdGl0dXRpb25zIENlcnQuIEF1dGhvcml0eTE9MDsGA1UEAxM0TmF0aW9uYWwg
-                            YW5kIEthcG9kaXN0cmlhbiBVbml2ZXJzaXR5IG9mIEF0aGVucyBDQSBSMTAeFw0x
-                            NDA1MjcwMDAwMDBaFw0xNjA1MjYxMDUzNDlaMGAxCzAJBgNVBAYTAkdSMTcwNQYD
-                            VQQKEy5OYXRpb25hbCBhbmQgS2Fwb2Rpc3RyaWFuIFVuaXZlcnNpdHkgb2YgQXRo
-                            ZW5zMRgwFgYDVQQDEw9VT0EgaWRwIHNlcnZpY2UwggEiMA0GCSqGSIb3DQEBAQUA
-                            A4IBDwAwggEKAoIBAQCpFnIjMy+Hp7ZBii7LIm+FqVlRiL9tGew8L2gmevWvDTkH
-                            yTnIvAfOr4hmaZ075R44FqEDL03tiZMsMyFbsDL1uYuJA1bJY4cM66I88+aIWwaL
-                            MKuI1voOvClbx08y4c+gI5+epurxju0NaVcVqgUJuLzAcnbIHmaSiC9NEuvlYo9Z
-                            tkFX8g1nFoUatPEoZseJfukdyufqyb59hGsNtlw9cHnY+gy+69Y4ZmxU7uXmm7oE
-                            0IRoQDBeCp7hiGJePYcQeJHNxWZiO3/SgP6p9G3qO9oSHu892DZ8uPP3CrvwgpW0
-                            6uVGR+7i8IGjjMOdFiTTWtlvfFJmJ/ETKYe3511JAgMBAAGjggGKMIIBhjALBgNV
-                            HQ8EBAMCBaAwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMB0GA1UdDgQW
-                            BBSt7IktXk4pgSt+ECuSqC4RSNQG1zAfBgNVHSMEGDAWgBTWQ2tZXkiPvrW/wHtw
-                            u/Sr8SNBizBrBggrBgEFBQcBAQRfMF0wIQYIKwYBBQUHMAGGFWh0dHA6Ly9vY3Nw
-                            LmhhcmljYS5ncjA4BggrBgEFBQcwAoYsaHR0cDovL3d3dy5oYXJpY2EuZ3IvY2Vy
-                            dHMvSGFyaWNhVW9hQ0FSMS5wZW0wQwYDVR0fBDwwOjA4oDagNIYyaHR0cDovL2Ny
-                            bHYxLmhhcmljYS5nci9IYXJpY2FVb2FDQVIxL2NybHYxLmRlci5jcmwwTwYDVR0g
-                            BEgwRjBEBgwrBgEEAYHPEQEAAgcwNDAyBggrBgEFBQcCARYmaHR0cDovL3d3dy5o
-                            YXJpY2EuZ3IvZG9jdW1lbnRzL0NQUy5waHAwFQYDVR0RBA4wDIIKaWRwLnVvYS5n
-                            cjANBgkqhkiG9w0BAQUFAAOCAQEAaSENditQfkHEUNah+TqAhJziq/UC6UMh11PR
-                            1MIHmmQ7rTEiusr1E2sKkYqJA3UPD9aWhre6aNVNqCuViEfTvbc3YwytTu0vPqMt
-                            h23lNL4RQQHLpPpeUUDoN0vV/PlFUNeHnh/o7JtrCOTcdS7mQgkJvxq6kWwdDuQx
-                            0ZLgZQfyCHUlUToinr5oNCG7FAy2LRjXrzyOKGurX3WSY2FPAvWe1KSqdUS8/ZgI
-                            Jo0dRg7bs242O3GkczYeCobJ57vAwmiOPpHWyLq0QNPOQpJteMRRbDyDPEJxmZqL
-                            fFv23NJu+qiTMvSS1Z89Vph7AOEvYlV+m/BDv+Md9K41XM8i1g==
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.uoa.gr:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.uoa.gr: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="en">National and Kapodistrian University of Athens</OrganizationName>
-    <OrganizationName xml:lang="el">Εθνικό Καποδιστριακό Πανεπιστήμιο Αθηνών</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">National and Kapodistrian University of Athens</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="el">Εθνικό Καποδιστριακό Πανεπιστήμιο Αθηνών</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.uoa.gr/</OrganizationURL>
-    <OrganizationURL xml:lang="el">http://www.uoa.gr/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>University of Athens Helpdesk</SurName>
-    <EmailAddress>helpdesk.idp@noc.uoa.gr</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="support">
-    <SurName>University of Athens Helpdesk</SurName>
-    <EmailAddress>helpdesk.idp@noc.uoa.gr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.upmc.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.upmc.fr-idp-shibboleth.xml
deleted file mode 100644
index 1855b7b6..00000000
--- a/swamid-interfederations-2.0/idp.upmc.fr-idp-shibboleth.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://idp.upmc.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2010-03-30T10:20:06Z">
-      <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">upmc.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">Université de Paris 6 - Pierre et Marie Curie</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDGDCCAgCgAwIBAgIVAN1AZOqK88JKnAIFyCt2qtu7oPjcMA0GCSqGSIb3DQEB
-BQUAMBYxFDASBgNVBAMTC2lkcC51cG1jLmZyMB4XDTA5MTIyOTEyMDUwN1oXDTI5
-MTIyOTEyMDUwN1owFjEUMBIGA1UEAxMLaWRwLnVwbWMuZnIwggEiMA0GCSqGSIb3
-DQEBAQUAA4IBDwAwggEKAoIBAQCoXzLI2AobGhWJRoofrUz1FYBOgAk68Q5TIZ+h
-GvBAJj7/23JkOyaz6vaGqls+iqycDPHx3grJ6KsDbIoCPcgbyb3vyAJOkxT49fzp
-C0RGJVKGPZoNaCV2KXSO49Il5yWb7zIwXBKBn5QSRSOE7S2YINHzzlGVj2SWCaCJ
-LY3K7R+O5TMaiqqKXcO20tmme7FDckHc/fPw8H+R8r9TgLvoPbCIqjnvCHsj+192
-WNtzs99sMwZ21xaMo0QS9VsX6JMmsJViQwNyAgE6gxbG1SEWD2G1ja7bW/o9LuUG
-JvDjfDmzNj316AeYMWnzY+275B2fr/JcawcmmF3aK6xPjqRZAgMBAAGjXTBbMDoG
-A1UdEQQzMDGCC2lkcC51cG1jLmZyhiJodHRwczovL2lkcC51cG1jLmZyL2lkcC9z
-aGliYm9sZXRoMB0GA1UdDgQWBBQHbFPNG0miSxq1PVDJGqFQbHEdtjANBgkqhkiG
-9w0BAQUFAAOCAQEAiznIMyBVikg8EfABaENTvB0ND8rZN1cVNIU/LoiBHL6DF7bQ
-hGd7JManqhNH5TdHXmfK5CsIZMBGbYIMhyTDxsW3ASNR5Ip2Lpq+9YgTSi+k4FzM
-VYCRAJw9mjTrDfCVVG2ZdN0FaWLezJhGG0iJDlmpzhDDpBsAt88Aj6uqXJrKGp3Z
-ExxnD0z0ECRqrbfgM8lUgAW2hS1C4wgO8sz6FpOIJ1kkXZ54TjI9UE2rmWKkD+iT
-nBrz6NcdhS32ZUARncfqoFZvOY+9rh4Q2SQIRyjKrAG/2TNVxVo6E+xEzx8nN63D
-Gz5/Q64Ts766vZwDA9u1fXIedZRbjJHYD4o6Fw==
-					    </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://idp.upmc.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.upmc.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.upmc.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">upmc.fr</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDGDCCAgCgAwIBAgIVAN1AZOqK88JKnAIFyCt2qtu7oPjcMA0GCSqGSIb3DQEB
-BQUAMBYxFDASBgNVBAMTC2lkcC51cG1jLmZyMB4XDTA5MTIyOTEyMDUwN1oXDTI5
-MTIyOTEyMDUwN1owFjEUMBIGA1UEAxMLaWRwLnVwbWMuZnIwggEiMA0GCSqGSIb3
-DQEBAQUAA4IBDwAwggEKAoIBAQCoXzLI2AobGhWJRoofrUz1FYBOgAk68Q5TIZ+h
-GvBAJj7/23JkOyaz6vaGqls+iqycDPHx3grJ6KsDbIoCPcgbyb3vyAJOkxT49fzp
-C0RGJVKGPZoNaCV2KXSO49Il5yWb7zIwXBKBn5QSRSOE7S2YINHzzlGVj2SWCaCJ
-LY3K7R+O5TMaiqqKXcO20tmme7FDckHc/fPw8H+R8r9TgLvoPbCIqjnvCHsj+192
-WNtzs99sMwZ21xaMo0QS9VsX6JMmsJViQwNyAgE6gxbG1SEWD2G1ja7bW/o9LuUG
-JvDjfDmzNj316AeYMWnzY+275B2fr/JcawcmmF3aK6xPjqRZAgMBAAGjXTBbMDoG
-A1UdEQQzMDGCC2lkcC51cG1jLmZyhiJodHRwczovL2lkcC51cG1jLmZyL2lkcC9z
-aGliYm9sZXRoMB0GA1UdDgQWBBQHbFPNG0miSxq1PVDJGqFQbHEdtjANBgkqhkiG
-9w0BAQUFAAOCAQEAiznIMyBVikg8EfABaENTvB0ND8rZN1cVNIU/LoiBHL6DF7bQ
-hGd7JManqhNH5TdHXmfK5CsIZMBGbYIMhyTDxsW3ASNR5Ip2Lpq+9YgTSi+k4FzM
-VYCRAJw9mjTrDfCVVG2ZdN0FaWLezJhGG0iJDlmpzhDDpBsAt88Aj6uqXJrKGp3Z
-ExxnD0z0ECRqrbfgM8lUgAW2hS1C4wgO8sz6FpOIJ1kkXZ54TjI9UE2rmWKkD+iT
-nBrz6NcdhS32ZUARncfqoFZvOY+9rh4Q2SQIRyjKrAG/2TNVxVo6E+xEzx8nN63D
-Gz5/Q64Ts766vZwDA9u1fXIedZRbjJHYD4o6Fw==
-					    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.upmc.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">Université de Paris 6 - Pierre et Marie Curie</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Université de Paris 6 - Pierre et Marie Curie</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <EmailAddress>exploitationdsi@upmc.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.upmc.fr.xml b/swamid-interfederations-2.0/idp.upmc.fr.xml
deleted file mode 100644
index 1855b7b6..00000000
--- a/swamid-interfederations-2.0/idp.upmc.fr.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://idp.upmc.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2010-03-30T10:20:06Z">
-      <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">upmc.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">Université de Paris 6 - Pierre et Marie Curie</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDGDCCAgCgAwIBAgIVAN1AZOqK88JKnAIFyCt2qtu7oPjcMA0GCSqGSIb3DQEB
-BQUAMBYxFDASBgNVBAMTC2lkcC51cG1jLmZyMB4XDTA5MTIyOTEyMDUwN1oXDTI5
-MTIyOTEyMDUwN1owFjEUMBIGA1UEAxMLaWRwLnVwbWMuZnIwggEiMA0GCSqGSIb3
-DQEBAQUAA4IBDwAwggEKAoIBAQCoXzLI2AobGhWJRoofrUz1FYBOgAk68Q5TIZ+h
-GvBAJj7/23JkOyaz6vaGqls+iqycDPHx3grJ6KsDbIoCPcgbyb3vyAJOkxT49fzp
-C0RGJVKGPZoNaCV2KXSO49Il5yWb7zIwXBKBn5QSRSOE7S2YINHzzlGVj2SWCaCJ
-LY3K7R+O5TMaiqqKXcO20tmme7FDckHc/fPw8H+R8r9TgLvoPbCIqjnvCHsj+192
-WNtzs99sMwZ21xaMo0QS9VsX6JMmsJViQwNyAgE6gxbG1SEWD2G1ja7bW/o9LuUG
-JvDjfDmzNj316AeYMWnzY+275B2fr/JcawcmmF3aK6xPjqRZAgMBAAGjXTBbMDoG
-A1UdEQQzMDGCC2lkcC51cG1jLmZyhiJodHRwczovL2lkcC51cG1jLmZyL2lkcC9z
-aGliYm9sZXRoMB0GA1UdDgQWBBQHbFPNG0miSxq1PVDJGqFQbHEdtjANBgkqhkiG
-9w0BAQUFAAOCAQEAiznIMyBVikg8EfABaENTvB0ND8rZN1cVNIU/LoiBHL6DF7bQ
-hGd7JManqhNH5TdHXmfK5CsIZMBGbYIMhyTDxsW3ASNR5Ip2Lpq+9YgTSi+k4FzM
-VYCRAJw9mjTrDfCVVG2ZdN0FaWLezJhGG0iJDlmpzhDDpBsAt88Aj6uqXJrKGp3Z
-ExxnD0z0ECRqrbfgM8lUgAW2hS1C4wgO8sz6FpOIJ1kkXZ54TjI9UE2rmWKkD+iT
-nBrz6NcdhS32ZUARncfqoFZvOY+9rh4Q2SQIRyjKrAG/2TNVxVo6E+xEzx8nN63D
-Gz5/Q64Ts766vZwDA9u1fXIedZRbjJHYD4o6Fw==
-					    </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://idp.upmc.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.upmc.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.upmc.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">upmc.fr</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDGDCCAgCgAwIBAgIVAN1AZOqK88JKnAIFyCt2qtu7oPjcMA0GCSqGSIb3DQEB
-BQUAMBYxFDASBgNVBAMTC2lkcC51cG1jLmZyMB4XDTA5MTIyOTEyMDUwN1oXDTI5
-MTIyOTEyMDUwN1owFjEUMBIGA1UEAxMLaWRwLnVwbWMuZnIwggEiMA0GCSqGSIb3
-DQEBAQUAA4IBDwAwggEKAoIBAQCoXzLI2AobGhWJRoofrUz1FYBOgAk68Q5TIZ+h
-GvBAJj7/23JkOyaz6vaGqls+iqycDPHx3grJ6KsDbIoCPcgbyb3vyAJOkxT49fzp
-C0RGJVKGPZoNaCV2KXSO49Il5yWb7zIwXBKBn5QSRSOE7S2YINHzzlGVj2SWCaCJ
-LY3K7R+O5TMaiqqKXcO20tmme7FDckHc/fPw8H+R8r9TgLvoPbCIqjnvCHsj+192
-WNtzs99sMwZ21xaMo0QS9VsX6JMmsJViQwNyAgE6gxbG1SEWD2G1ja7bW/o9LuUG
-JvDjfDmzNj316AeYMWnzY+275B2fr/JcawcmmF3aK6xPjqRZAgMBAAGjXTBbMDoG
-A1UdEQQzMDGCC2lkcC51cG1jLmZyhiJodHRwczovL2lkcC51cG1jLmZyL2lkcC9z
-aGliYm9sZXRoMB0GA1UdDgQWBBQHbFPNG0miSxq1PVDJGqFQbHEdtjANBgkqhkiG
-9w0BAQUFAAOCAQEAiznIMyBVikg8EfABaENTvB0ND8rZN1cVNIU/LoiBHL6DF7bQ
-hGd7JManqhNH5TdHXmfK5CsIZMBGbYIMhyTDxsW3ASNR5Ip2Lpq+9YgTSi+k4FzM
-VYCRAJw9mjTrDfCVVG2ZdN0FaWLezJhGG0iJDlmpzhDDpBsAt88Aj6uqXJrKGp3Z
-ExxnD0z0ECRqrbfgM8lUgAW2hS1C4wgO8sz6FpOIJ1kkXZ54TjI9UE2rmWKkD+iT
-nBrz6NcdhS32ZUARncfqoFZvOY+9rh4Q2SQIRyjKrAG/2TNVxVo6E+xEzx8nN63D
-Gz5/Q64Ts766vZwDA9u1fXIedZRbjJHYD4o6Fw==
-					    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.upmc.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">Université de Paris 6 - Pierre et Marie Curie</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Université de Paris 6 - Pierre et Marie Curie</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <EmailAddress>exploitationdsi@upmc.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.uqam.ca-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.uqam.ca-idp-shibboleth.xml
deleted file mode 100644
index 454362a6..00000000
--- a/swamid-interfederations-2.0/idp.uqam.ca-idp-shibboleth.xml
+++ /dev/null
@@ -1,139 +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:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://idp.uqam.ca/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.canarie.ca" registrationInstant="2013-07-22T00:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://www.canarie.ca/templates/services/docs/CAF_join_en.pdf</mdrpi:RegistrationPolicy>
-      <mdrpi:RegistrationPolicy xml:lang="fr">http://www.canarie.ca/templates/services/docs/CAF_join_fr.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">uqam.ca</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">UQAM | Université du Québec à Montréal</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="fr">UQAM | Université du Québec à Montréal</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="es">UQAM | Université du Québec à Montréal</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="pt">UQAM | Université du Québec à Montréal</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="it">UQAM | Université du Québec à Montréal</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Students, employees and other UQAM account holders</mdui:Description>
-        <mdui:Description xml:lang="fr">Ãtudiants, employés et autres détenteurs d'identifiants UQAM</mdui:Description>
-        <mdui:Description xml:lang="es">Los estudiantes, los empleados y otros titulares de identificadores UQAM</mdui:Description>
-        <mdui:Description xml:lang="pt">Os alunos, funcionários e outros detentores de identificação UQAM</mdui:Description>
-        <mdui:Description xml:lang="it">Gli studenti, i dipendenti e gli altri titolari di identificatori UQAM</mdui:Description>
-        <mdui:Keywords xml:lang="en">uqam.ca uqam montreal quebec university</mdui:Keywords>
-        <mdui:Keywords xml:lang="fr">uqam.ca uqam montréal québec université</mdui:Keywords>
-        <mdui:Keywords xml:lang="es">uqam.ca uqam montréal québec universidad</mdui:Keywords>
-        <mdui:Keywords xml:lang="pt">uqam.ca uqam montréal québec universidade</mdui:Keywords>
-        <mdui:Keywords xml:lang="it">uqam.ca uqam montréal québec università</mdui:Keywords>
-        <mdui:Logo height="16" width="48">https://idp.uqam.ca/images/logo_uqam-48x16.png</mdui:Logo>
-        <mdui:Logo height="60" width="182">https://idp.uqam.ca/images/logo_uqam-182x60.png</mdui:Logo>
-        <mdui:Logo height="647" width="1960">https://idp.uqam.ca/images/logo_uqam-1960x647.png</mdui:Logo>
-        <mdui:InformationURL xml:lang="en">http://www.uqam.ca/en/about/presentation_en.htm</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="fr">http://www.uqam.ca</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="es">http://www.uqam.ca/es/aproposito/presentacion.htm</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="pt">http://www.uqam.ca/pt/sobrea/apresentacao.htm</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="fr">http://www.instances.uqam.ca/ReglementsPolitiquesDocuments/Documents/REGLEMENT_NO_15.pdf</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:IPHint>132.208.0.0/16</mdui:IPHint>
-        <mdui:DomainHint>uqam.ca</mdui:DomainHint>
-        <mdui:GeolocationHint>geo:45.512843,-73.560893</mdui:GeolocationHint>
-      </mdui:DiscoHints>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDFzCCAf+gAwIBAgIUWJxXbZuGIlRqAdUeM+MQM60cBjIwDQYJKoZIhvcNAQEF
-BQAwFjEUMBIGA1UEAxMLaWRwLnVxYW0uY2EwHhcNMDkwNjAzMTUxNDI3WhcNMjkw
-NjAzMTUxNDI3WjAWMRQwEgYDVQQDEwtpZHAudXFhbS5jYTCCASIwDQYJKoZIhvcN
-AQEBBQADggEPADCCAQoCggEBALTvLffPT+7KOUB1E4/VfYGDMTj8qyRceKedTLxG
-5y1gVngrl1wi3s3qF7aDV8P0SJmJJTtOplxnNNUCTPFyEtKD8TtUAL00Uk2xqB7c
-zgXjXpa5LB0obAz4tkOrrpD/WAffCfjaxiUY7JngPozOsvjCfCp/Yh77Q7wfa1Zx
-Dx65/vQCcgFUaXxcb7vq6ilohDcjQPzMJJvfFjJK2Rg+uNPoEbms15ebQzHfQ4Ci
-UbE+vQ5LxkruxNnOiq0d/C4hizKn5uC7oPxNjpEFe4y5cv5BG78KHkr9sKcWSVwg
-0k9ZtvXS2zGkQPM24f8g9WaF389JJlExaqKms+NPZyNpBqkCAwEAAaNdMFswOgYD
-VR0RBDMwMYILaWRwLnVxYW0uY2GGImh0dHBzOi8vaWRwLnVxYW0uY2EvaWRwL3No
-aWJib2xldGgwHQYDVR0OBBYEFDVR7RoTZA/UsE/TttH8CaUzxeQ/MA0GCSqGSIb3
-DQEBBQUAA4IBAQBoEgpeo8w8SCBHmi/ShGkcMB9A2JFCpUfspkNOQQ7GSAsl2ix1
-/nY0120ooY4V7OWaRyRMkxtL9ycKwMMbJBREj6qiZCeDh4fy5KtyWJePI0+piKUG
-NMl4+fKSXD27kO0aClaPkYiSZeSWfoZEFWq+99FJ8A9uyr9lTyjjkXil87LfoYdg
-iJPe/MZXHYtLYGJcpD8eaIBshbjWWetxlfus6fDAkmu2cVZGwYiMhT/v0CTzhl3C
-l3HcCJmuresheZwe0OdBG9Qh/VHQeOftbJD/6/HhmHBZMJE33H3x8b5ZurP3oxFO
-fiFLy80FQ90W2jDA5xLADjiDZY7BwQMSmzLn
-
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.uqam.ca:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.uqam.ca: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.uqam.ca/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.uqam.ca/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.uqam.ca/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.uqam.ca/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">uqam.ca</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Université du Québec à Montréal</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="fr">Université du Québec à Montréal</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="es">Université du Québec à Montréal</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="pt">Université du Québec à Montréal</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="it">Université du Québec à Montréal</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDFzCCAf+gAwIBAgIUWJxXbZuGIlRqAdUeM+MQM60cBjIwDQYJKoZIhvcNAQEF
-BQAwFjEUMBIGA1UEAxMLaWRwLnVxYW0uY2EwHhcNMDkwNjAzMTUxNDI3WhcNMjkw
-NjAzMTUxNDI3WjAWMRQwEgYDVQQDEwtpZHAudXFhbS5jYTCCASIwDQYJKoZIhvcN
-AQEBBQADggEPADCCAQoCggEBALTvLffPT+7KOUB1E4/VfYGDMTj8qyRceKedTLxG
-5y1gVngrl1wi3s3qF7aDV8P0SJmJJTtOplxnNNUCTPFyEtKD8TtUAL00Uk2xqB7c
-zgXjXpa5LB0obAz4tkOrrpD/WAffCfjaxiUY7JngPozOsvjCfCp/Yh77Q7wfa1Zx
-Dx65/vQCcgFUaXxcb7vq6ilohDcjQPzMJJvfFjJK2Rg+uNPoEbms15ebQzHfQ4Ci
-UbE+vQ5LxkruxNnOiq0d/C4hizKn5uC7oPxNjpEFe4y5cv5BG78KHkr9sKcWSVwg
-0k9ZtvXS2zGkQPM24f8g9WaF389JJlExaqKms+NPZyNpBqkCAwEAAaNdMFswOgYD
-VR0RBDMwMYILaWRwLnVxYW0uY2GGImh0dHBzOi8vaWRwLnVxYW0uY2EvaWRwL3No
-aWJib2xldGgwHQYDVR0OBBYEFDVR7RoTZA/UsE/TttH8CaUzxeQ/MA0GCSqGSIb3
-DQEBBQUAA4IBAQBoEgpeo8w8SCBHmi/ShGkcMB9A2JFCpUfspkNOQQ7GSAsl2ix1
-/nY0120ooY4V7OWaRyRMkxtL9ycKwMMbJBREj6qiZCeDh4fy5KtyWJePI0+piKUG
-NMl4+fKSXD27kO0aClaPkYiSZeSWfoZEFWq+99FJ8A9uyr9lTyjjkXil87LfoYdg
-iJPe/MZXHYtLYGJcpD8eaIBshbjWWetxlfus6fDAkmu2cVZGwYiMhT/v0CTzhl3C
-l3HcCJmuresheZwe0OdBG9Qh/VHQeOftbJD/6/HhmHBZMJE33H3x8b5ZurP3oxFO
-fiFLy80FQ90W2jDA5xLADjiDZY7BwQMSmzLn
-
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.uqam.ca:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.uqam.ca: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">Université du Québec à Montréal</OrganizationName>
-    <OrganizationName xml:lang="fr">Université du Québec à Montréal</OrganizationName>
-    <OrganizationName xml:lang="es">Université du Québec à Montréal</OrganizationName>
-    <OrganizationName xml:lang="pt">Université du Québec à Montréal</OrganizationName>
-    <OrganizationName xml:lang="it">Université du Québec à Montréal</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">UQAM | Université du Québec à Montréal</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="fr">UQAM | Université du Québec à Montréal</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="es">UQAM | Université du Québec à Montréal</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="pt">UQAM | Université du Québec à Montréal</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="it">UQAM | Université du Québec à Montréal</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.uqam.ca/en/about/presentation_en.htm</OrganizationURL>
-    <OrganizationURL xml:lang="fr">http://www.uqam.ca</OrganizationURL>
-    <OrganizationURL xml:lang="es">http://www.uqam.ca/es/aproposito/presentacion.htm</OrganizationURL>
-    <OrganizationURL xml:lang="pt">http://www.uqam.ca/pt/sobrea/apresentacao.htm</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <EmailAddress>shibboleth@uqam.ca</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.uqam.ca.xml b/swamid-interfederations-2.0/idp.uqam.ca.xml
deleted file mode 100644
index 454362a6..00000000
--- a/swamid-interfederations-2.0/idp.uqam.ca.xml
+++ /dev/null
@@ -1,139 +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:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://idp.uqam.ca/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.canarie.ca" registrationInstant="2013-07-22T00:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://www.canarie.ca/templates/services/docs/CAF_join_en.pdf</mdrpi:RegistrationPolicy>
-      <mdrpi:RegistrationPolicy xml:lang="fr">http://www.canarie.ca/templates/services/docs/CAF_join_fr.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">uqam.ca</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">UQAM | Université du Québec à Montréal</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="fr">UQAM | Université du Québec à Montréal</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="es">UQAM | Université du Québec à Montréal</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="pt">UQAM | Université du Québec à Montréal</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="it">UQAM | Université du Québec à Montréal</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Students, employees and other UQAM account holders</mdui:Description>
-        <mdui:Description xml:lang="fr">Ãtudiants, employés et autres détenteurs d'identifiants UQAM</mdui:Description>
-        <mdui:Description xml:lang="es">Los estudiantes, los empleados y otros titulares de identificadores UQAM</mdui:Description>
-        <mdui:Description xml:lang="pt">Os alunos, funcionários e outros detentores de identificação UQAM</mdui:Description>
-        <mdui:Description xml:lang="it">Gli studenti, i dipendenti e gli altri titolari di identificatori UQAM</mdui:Description>
-        <mdui:Keywords xml:lang="en">uqam.ca uqam montreal quebec university</mdui:Keywords>
-        <mdui:Keywords xml:lang="fr">uqam.ca uqam montréal québec université</mdui:Keywords>
-        <mdui:Keywords xml:lang="es">uqam.ca uqam montréal québec universidad</mdui:Keywords>
-        <mdui:Keywords xml:lang="pt">uqam.ca uqam montréal québec universidade</mdui:Keywords>
-        <mdui:Keywords xml:lang="it">uqam.ca uqam montréal québec università</mdui:Keywords>
-        <mdui:Logo height="16" width="48">https://idp.uqam.ca/images/logo_uqam-48x16.png</mdui:Logo>
-        <mdui:Logo height="60" width="182">https://idp.uqam.ca/images/logo_uqam-182x60.png</mdui:Logo>
-        <mdui:Logo height="647" width="1960">https://idp.uqam.ca/images/logo_uqam-1960x647.png</mdui:Logo>
-        <mdui:InformationURL xml:lang="en">http://www.uqam.ca/en/about/presentation_en.htm</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="fr">http://www.uqam.ca</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="es">http://www.uqam.ca/es/aproposito/presentacion.htm</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="pt">http://www.uqam.ca/pt/sobrea/apresentacao.htm</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="fr">http://www.instances.uqam.ca/ReglementsPolitiquesDocuments/Documents/REGLEMENT_NO_15.pdf</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:IPHint>132.208.0.0/16</mdui:IPHint>
-        <mdui:DomainHint>uqam.ca</mdui:DomainHint>
-        <mdui:GeolocationHint>geo:45.512843,-73.560893</mdui:GeolocationHint>
-      </mdui:DiscoHints>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDFzCCAf+gAwIBAgIUWJxXbZuGIlRqAdUeM+MQM60cBjIwDQYJKoZIhvcNAQEF
-BQAwFjEUMBIGA1UEAxMLaWRwLnVxYW0uY2EwHhcNMDkwNjAzMTUxNDI3WhcNMjkw
-NjAzMTUxNDI3WjAWMRQwEgYDVQQDEwtpZHAudXFhbS5jYTCCASIwDQYJKoZIhvcN
-AQEBBQADggEPADCCAQoCggEBALTvLffPT+7KOUB1E4/VfYGDMTj8qyRceKedTLxG
-5y1gVngrl1wi3s3qF7aDV8P0SJmJJTtOplxnNNUCTPFyEtKD8TtUAL00Uk2xqB7c
-zgXjXpa5LB0obAz4tkOrrpD/WAffCfjaxiUY7JngPozOsvjCfCp/Yh77Q7wfa1Zx
-Dx65/vQCcgFUaXxcb7vq6ilohDcjQPzMJJvfFjJK2Rg+uNPoEbms15ebQzHfQ4Ci
-UbE+vQ5LxkruxNnOiq0d/C4hizKn5uC7oPxNjpEFe4y5cv5BG78KHkr9sKcWSVwg
-0k9ZtvXS2zGkQPM24f8g9WaF389JJlExaqKms+NPZyNpBqkCAwEAAaNdMFswOgYD
-VR0RBDMwMYILaWRwLnVxYW0uY2GGImh0dHBzOi8vaWRwLnVxYW0uY2EvaWRwL3No
-aWJib2xldGgwHQYDVR0OBBYEFDVR7RoTZA/UsE/TttH8CaUzxeQ/MA0GCSqGSIb3
-DQEBBQUAA4IBAQBoEgpeo8w8SCBHmi/ShGkcMB9A2JFCpUfspkNOQQ7GSAsl2ix1
-/nY0120ooY4V7OWaRyRMkxtL9ycKwMMbJBREj6qiZCeDh4fy5KtyWJePI0+piKUG
-NMl4+fKSXD27kO0aClaPkYiSZeSWfoZEFWq+99FJ8A9uyr9lTyjjkXil87LfoYdg
-iJPe/MZXHYtLYGJcpD8eaIBshbjWWetxlfus6fDAkmu2cVZGwYiMhT/v0CTzhl3C
-l3HcCJmuresheZwe0OdBG9Qh/VHQeOftbJD/6/HhmHBZMJE33H3x8b5ZurP3oxFO
-fiFLy80FQ90W2jDA5xLADjiDZY7BwQMSmzLn
-
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.uqam.ca:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.uqam.ca: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.uqam.ca/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.uqam.ca/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.uqam.ca/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.uqam.ca/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">uqam.ca</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Université du Québec à Montréal</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="fr">Université du Québec à Montréal</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="es">Université du Québec à Montréal</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="pt">Université du Québec à Montréal</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="it">Université du Québec à Montréal</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDFzCCAf+gAwIBAgIUWJxXbZuGIlRqAdUeM+MQM60cBjIwDQYJKoZIhvcNAQEF
-BQAwFjEUMBIGA1UEAxMLaWRwLnVxYW0uY2EwHhcNMDkwNjAzMTUxNDI3WhcNMjkw
-NjAzMTUxNDI3WjAWMRQwEgYDVQQDEwtpZHAudXFhbS5jYTCCASIwDQYJKoZIhvcN
-AQEBBQADggEPADCCAQoCggEBALTvLffPT+7KOUB1E4/VfYGDMTj8qyRceKedTLxG
-5y1gVngrl1wi3s3qF7aDV8P0SJmJJTtOplxnNNUCTPFyEtKD8TtUAL00Uk2xqB7c
-zgXjXpa5LB0obAz4tkOrrpD/WAffCfjaxiUY7JngPozOsvjCfCp/Yh77Q7wfa1Zx
-Dx65/vQCcgFUaXxcb7vq6ilohDcjQPzMJJvfFjJK2Rg+uNPoEbms15ebQzHfQ4Ci
-UbE+vQ5LxkruxNnOiq0d/C4hizKn5uC7oPxNjpEFe4y5cv5BG78KHkr9sKcWSVwg
-0k9ZtvXS2zGkQPM24f8g9WaF389JJlExaqKms+NPZyNpBqkCAwEAAaNdMFswOgYD
-VR0RBDMwMYILaWRwLnVxYW0uY2GGImh0dHBzOi8vaWRwLnVxYW0uY2EvaWRwL3No
-aWJib2xldGgwHQYDVR0OBBYEFDVR7RoTZA/UsE/TttH8CaUzxeQ/MA0GCSqGSIb3
-DQEBBQUAA4IBAQBoEgpeo8w8SCBHmi/ShGkcMB9A2JFCpUfspkNOQQ7GSAsl2ix1
-/nY0120ooY4V7OWaRyRMkxtL9ycKwMMbJBREj6qiZCeDh4fy5KtyWJePI0+piKUG
-NMl4+fKSXD27kO0aClaPkYiSZeSWfoZEFWq+99FJ8A9uyr9lTyjjkXil87LfoYdg
-iJPe/MZXHYtLYGJcpD8eaIBshbjWWetxlfus6fDAkmu2cVZGwYiMhT/v0CTzhl3C
-l3HcCJmuresheZwe0OdBG9Qh/VHQeOftbJD/6/HhmHBZMJE33H3x8b5ZurP3oxFO
-fiFLy80FQ90W2jDA5xLADjiDZY7BwQMSmzLn
-
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.uqam.ca:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.uqam.ca: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">Université du Québec à Montréal</OrganizationName>
-    <OrganizationName xml:lang="fr">Université du Québec à Montréal</OrganizationName>
-    <OrganizationName xml:lang="es">Université du Québec à Montréal</OrganizationName>
-    <OrganizationName xml:lang="pt">Université du Québec à Montréal</OrganizationName>
-    <OrganizationName xml:lang="it">Université du Québec à Montréal</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">UQAM | Université du Québec à Montréal</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="fr">UQAM | Université du Québec à Montréal</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="es">UQAM | Université du Québec à Montréal</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="pt">UQAM | Université du Québec à Montréal</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="it">UQAM | Université du Québec à Montréal</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.uqam.ca/en/about/presentation_en.htm</OrganizationURL>
-    <OrganizationURL xml:lang="fr">http://www.uqam.ca</OrganizationURL>
-    <OrganizationURL xml:lang="es">http://www.uqam.ca/es/aproposito/presentacion.htm</OrganizationURL>
-    <OrganizationURL xml:lang="pt">http://www.uqam.ca/pt/sobrea/apresentacao.htm</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <EmailAddress>shibboleth@uqam.ca</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.urca.br-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.urca.br-idp-shibboleth.xml
deleted file mode 100644
index 7f41e3ec..00000000
--- a/swamid-interfederations-2.0/idp.urca.br-idp-shibboleth.xml
+++ /dev/null
@@ -1,102 +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://idp.urca.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">urca.br</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">URCA - Universidade Regional do Cariri </mdui:DisplayName>
-        <mdui:DisplayName xml:lang="pt-br">URCA - Universidade Regional do Cariri </mdui:DisplayName>
-        <mdui:Description xml:lang="en">URCA - Universidade Regional do Cariri </mdui:Description>
-        <mdui:Description xml:lang="pt-br">URCA - Universidade Regional do Cariri </mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.urca.br/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="pt-br">http://www.urca.br/</mdui:InformationURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-    MIIC5DCCAcwCAQAwDQYJKoZIhvcNAQEFBQAwODENMAsGA1UEChMEVVJDQTEMMAoG
-A1UECxMDQ1BEMQswCQYDVQQGEwJCUjEMMAoGA1UEAxMDaWRwMB4XDTE0MDcyMzE0
-NDMwNVoXDTE3MDcyMjE0NDMwNVowODENMAsGA1UEChMEVVJDQTEMMAoGA1UECxMD
-Q1BEMQswCQYDVQQGEwJCUjEMMAoGA1UEAxMDaWRwMIIBIjANBgkqhkiG9w0BAQEF
-AAOCAQ8AMIIBCgKCAQEA587p9iqaMIWfFLDlFeSo4dp9k0p3Mdc45vL7+hSiTjCT
-L/GqgQNSRyLvDzwVttKglapDi2GrPSifMlT1lrP6xJIg22NzhV5CmlDis2FF0DZB
-jCnxhfXVpbMGGqwg2B8quc6FItanXjUbRD+leyI8+/jUUfb++XpYo5q6cQSc+jP2
-yzIxh1nRPd7r89S6C36b5LMxGOT178VD7jI9AI78p/v8sbIDi8qE5xvg65HrGgyQ
-7LamfWhHfKzzAecxkJA+BgIW1H+f9srfPXtTL2EUem4p1sSI+XgrhkWXkYc4fZ/L
-qGFt3o7PmBaPmctNe126ljxzwXq17fWdqvzCVCbHbQIDAQABMA0GCSqGSIb3DQEB
-BQUAA4IBAQCrtCCtbhDkpx6uvImEuQ91Bl8YXTxJLOxO4G/cRSvPdQ5pE7umbyLm
-OhFEXa79Ssf3jmDHf/J23X2SJHsqKR/5NbeSyPjPBiDuSDy/Pav0oKMcPvkEXXsp
-oDwJV6Tx1q6ngm10GvU62R5shb7uG1SOUO8A9/pElqiekGziCbsyEqrgl4lfEDRQ
-DWRRPsto+fYtJ3u4acVvDRODzIS/eJBbDyRIGby8WojHR1GQ8zteK8QZbSlCP9YP
-nI8CCcU5SWNtrokzTBcf0Vb71RV+JaxGLod48itA1dStZHDr4N8tcLO6c2xYEwGo
-xJ+47QxRYCpCLQW0WKXIYNcPqobfLQsA
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.urca.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.urca.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://idp.urca.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.urca.br/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.urca.br/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.urca.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">urca.br</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-      
-MIIC5DCCAcwCAQAwDQYJKoZIhvcNAQEFBQAwODENMAsGA1UEChMEVVJDQTEMMAoG
-A1UECxMDQ1BEMQswCQYDVQQGEwJCUjEMMAoGA1UEAxMDaWRwMB4XDTE0MDcyMzE0
-NDMwNVoXDTE3MDcyMjE0NDMwNVowODENMAsGA1UEChMEVVJDQTEMMAoGA1UECxMD
-Q1BEMQswCQYDVQQGEwJCUjEMMAoGA1UEAxMDaWRwMIIBIjANBgkqhkiG9w0BAQEF
-AAOCAQ8AMIIBCgKCAQEA587p9iqaMIWfFLDlFeSo4dp9k0p3Mdc45vL7+hSiTjCT
-L/GqgQNSRyLvDzwVttKglapDi2GrPSifMlT1lrP6xJIg22NzhV5CmlDis2FF0DZB
-jCnxhfXVpbMGGqwg2B8quc6FItanXjUbRD+leyI8+/jUUfb++XpYo5q6cQSc+jP2
-yzIxh1nRPd7r89S6C36b5LMxGOT178VD7jI9AI78p/v8sbIDi8qE5xvg65HrGgyQ
-7LamfWhHfKzzAecxkJA+BgIW1H+f9srfPXtTL2EUem4p1sSI+XgrhkWXkYc4fZ/L
-qGFt3o7PmBaPmctNe126ljxzwXq17fWdqvzCVCbHbQIDAQABMA0GCSqGSIb3DQEB
-BQUAA4IBAQCrtCCtbhDkpx6uvImEuQ91Bl8YXTxJLOxO4G/cRSvPdQ5pE7umbyLm
-OhFEXa79Ssf3jmDHf/J23X2SJHsqKR/5NbeSyPjPBiDuSDy/Pav0oKMcPvkEXXsp
-oDwJV6Tx1q6ngm10GvU62R5shb7uG1SOUO8A9/pElqiekGziCbsyEqrgl4lfEDRQ
-DWRRPsto+fYtJ3u4acVvDRODzIS/eJBbDyRIGby8WojHR1GQ8zteK8QZbSlCP9YP
-nI8CCcU5SWNtrokzTBcf0Vb71RV+JaxGLod48itA1dStZHDr4N8tcLO6c2xYEwGo
-xJ+47QxRYCpCLQW0WKXIYNcPqobfLQsA
-                    
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.urca.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.urca.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">URCA - Universidade Regional do Cariri</OrganizationName>
-    <OrganizationName xml:lang="pt-br">URCA - Universidade Regional do Cariri</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">URCA - Universidade Regional do Cariri </OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="pt-br">URCA - Universidade Regional do Cariri </OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.urca.br/</OrganizationURL>
-    <OrganizationURL xml:lang="pt-br">http://www.urca.br/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Herbert Novais</SurName>
-    <EmailAddress>herbert.novais@urca.br</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.urca.br.xml b/swamid-interfederations-2.0/idp.urca.br.xml
deleted file mode 100644
index 7f41e3ec..00000000
--- a/swamid-interfederations-2.0/idp.urca.br.xml
+++ /dev/null
@@ -1,102 +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://idp.urca.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">urca.br</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">URCA - Universidade Regional do Cariri </mdui:DisplayName>
-        <mdui:DisplayName xml:lang="pt-br">URCA - Universidade Regional do Cariri </mdui:DisplayName>
-        <mdui:Description xml:lang="en">URCA - Universidade Regional do Cariri </mdui:Description>
-        <mdui:Description xml:lang="pt-br">URCA - Universidade Regional do Cariri </mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.urca.br/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="pt-br">http://www.urca.br/</mdui:InformationURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-    MIIC5DCCAcwCAQAwDQYJKoZIhvcNAQEFBQAwODENMAsGA1UEChMEVVJDQTEMMAoG
-A1UECxMDQ1BEMQswCQYDVQQGEwJCUjEMMAoGA1UEAxMDaWRwMB4XDTE0MDcyMzE0
-NDMwNVoXDTE3MDcyMjE0NDMwNVowODENMAsGA1UEChMEVVJDQTEMMAoGA1UECxMD
-Q1BEMQswCQYDVQQGEwJCUjEMMAoGA1UEAxMDaWRwMIIBIjANBgkqhkiG9w0BAQEF
-AAOCAQ8AMIIBCgKCAQEA587p9iqaMIWfFLDlFeSo4dp9k0p3Mdc45vL7+hSiTjCT
-L/GqgQNSRyLvDzwVttKglapDi2GrPSifMlT1lrP6xJIg22NzhV5CmlDis2FF0DZB
-jCnxhfXVpbMGGqwg2B8quc6FItanXjUbRD+leyI8+/jUUfb++XpYo5q6cQSc+jP2
-yzIxh1nRPd7r89S6C36b5LMxGOT178VD7jI9AI78p/v8sbIDi8qE5xvg65HrGgyQ
-7LamfWhHfKzzAecxkJA+BgIW1H+f9srfPXtTL2EUem4p1sSI+XgrhkWXkYc4fZ/L
-qGFt3o7PmBaPmctNe126ljxzwXq17fWdqvzCVCbHbQIDAQABMA0GCSqGSIb3DQEB
-BQUAA4IBAQCrtCCtbhDkpx6uvImEuQ91Bl8YXTxJLOxO4G/cRSvPdQ5pE7umbyLm
-OhFEXa79Ssf3jmDHf/J23X2SJHsqKR/5NbeSyPjPBiDuSDy/Pav0oKMcPvkEXXsp
-oDwJV6Tx1q6ngm10GvU62R5shb7uG1SOUO8A9/pElqiekGziCbsyEqrgl4lfEDRQ
-DWRRPsto+fYtJ3u4acVvDRODzIS/eJBbDyRIGby8WojHR1GQ8zteK8QZbSlCP9YP
-nI8CCcU5SWNtrokzTBcf0Vb71RV+JaxGLod48itA1dStZHDr4N8tcLO6c2xYEwGo
-xJ+47QxRYCpCLQW0WKXIYNcPqobfLQsA
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.urca.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.urca.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://idp.urca.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.urca.br/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.urca.br/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.urca.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">urca.br</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-      
-MIIC5DCCAcwCAQAwDQYJKoZIhvcNAQEFBQAwODENMAsGA1UEChMEVVJDQTEMMAoG
-A1UECxMDQ1BEMQswCQYDVQQGEwJCUjEMMAoGA1UEAxMDaWRwMB4XDTE0MDcyMzE0
-NDMwNVoXDTE3MDcyMjE0NDMwNVowODENMAsGA1UEChMEVVJDQTEMMAoGA1UECxMD
-Q1BEMQswCQYDVQQGEwJCUjEMMAoGA1UEAxMDaWRwMIIBIjANBgkqhkiG9w0BAQEF
-AAOCAQ8AMIIBCgKCAQEA587p9iqaMIWfFLDlFeSo4dp9k0p3Mdc45vL7+hSiTjCT
-L/GqgQNSRyLvDzwVttKglapDi2GrPSifMlT1lrP6xJIg22NzhV5CmlDis2FF0DZB
-jCnxhfXVpbMGGqwg2B8quc6FItanXjUbRD+leyI8+/jUUfb++XpYo5q6cQSc+jP2
-yzIxh1nRPd7r89S6C36b5LMxGOT178VD7jI9AI78p/v8sbIDi8qE5xvg65HrGgyQ
-7LamfWhHfKzzAecxkJA+BgIW1H+f9srfPXtTL2EUem4p1sSI+XgrhkWXkYc4fZ/L
-qGFt3o7PmBaPmctNe126ljxzwXq17fWdqvzCVCbHbQIDAQABMA0GCSqGSIb3DQEB
-BQUAA4IBAQCrtCCtbhDkpx6uvImEuQ91Bl8YXTxJLOxO4G/cRSvPdQ5pE7umbyLm
-OhFEXa79Ssf3jmDHf/J23X2SJHsqKR/5NbeSyPjPBiDuSDy/Pav0oKMcPvkEXXsp
-oDwJV6Tx1q6ngm10GvU62R5shb7uG1SOUO8A9/pElqiekGziCbsyEqrgl4lfEDRQ
-DWRRPsto+fYtJ3u4acVvDRODzIS/eJBbDyRIGby8WojHR1GQ8zteK8QZbSlCP9YP
-nI8CCcU5SWNtrokzTBcf0Vb71RV+JaxGLod48itA1dStZHDr4N8tcLO6c2xYEwGo
-xJ+47QxRYCpCLQW0WKXIYNcPqobfLQsA
-                    
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.urca.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.urca.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">URCA - Universidade Regional do Cariri</OrganizationName>
-    <OrganizationName xml:lang="pt-br">URCA - Universidade Regional do Cariri</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">URCA - Universidade Regional do Cariri </OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="pt-br">URCA - Universidade Regional do Cariri </OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.urca.br/</OrganizationURL>
-    <OrganizationURL xml:lang="pt-br">http://www.urca.br/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Herbert Novais</SurName>
-    <EmailAddress>herbert.novais@urca.br</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.ut-capitole.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.ut-capitole.fr-idp-shibboleth.xml
deleted file mode 100644
index 1aadc4cd..00000000
--- a/swamid-interfederations-2.0/idp.ut-capitole.fr-idp-shibboleth.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.ut-capitole.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2009-03-30T15:33:11Z">
-      <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">ut-capitole.fr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-tlse1.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">Université de Toulouse 1 Capitole</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDNDCCAhygAwIBAgIVALxLFXefFrTC9DNxwQJ5rG/49hVDMA0GCSqGSIb3DQEB
-BQUAMB0xGzAZBgNVBAMTEmlkcC51dC1jYXBpdG9sZS5mcjAeFw0xMjA2MDcxNDUz
-NTBaFw0zMjA2MDcxNDUzNTBaMB0xGzAZBgNVBAMTEmlkcC51dC1jYXBpdG9sZS5m
-cjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKwkRsoTpYYbJf4f+0Vz
-z7ZaAZrsQeDWLgtpyjwOcBtdaRvZzpFNHfp2P/zQhPTdvE0HMU4gaVV5wkCDsKRH
-LolPH3UcgGpZgJ8A3aSm9InPNTMnkFWWASuUssivJvxK30lE/w3JcIzyZwNAwZbP
-syvpXN+mZxY0r1J2wD+cMhubSVVTM7aiGKm8nKZpRP/9GEr9TlKiaq39VA9YXdZt
-q7g1sWgU51eRRmuBCg3SuLaqNabWxrE9u+b04QfPs2LnMduLcykIhOhgs2V3TnLA
-UUGZYnkv9heRngdqbGtR0dK5XgzF9eRHrG9feW5swumQ47fehGO6F+wz8+C6JZ1s
-3s0CAwEAAaNrMGkwSAYDVR0RBEEwP4ISaWRwLnV0LWNhcGl0b2xlLmZyhilodHRw
-czovL2lkcC51dC1jYXBpdG9sZS5mci9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQU
-pQc7jVB0iT0c/A1SJwl6+dQRHl0wDQYJKoZIhvcNAQEFBQADggEBAIY0wIOPgk0d
-w3jg69RkQO+RShp5gO1IMozCDrO/A/oYWo8jQUO6tVXQP9SVhQmRxLIXHIt6uhEn
-3Y5lVdrySy2CzdQbcXi4E4COkJPCWhfy6O5yVFlYXDAl1KDic5CMRaH9fJ6kjAMN
-8TTSUvH0tO/ZAbLMeveuSUQG0uVZ+8hA3hciH0CoRrk3XoJhlM+rrIaWQc3W23rd
-c7C+wWTEXDd31gwpaV3mdXA/Ll8KxqtSw4UFX7mKna86JLkD1RnInHj+47g2KSAa
-icpGH7BFG5C/Y8WID/SDMcDwUBI55XFzBmDdgRkaZ5Sh3Ncfd+op3Rp0KWHeidql
-j9Itfb+dnWQ=
-					    </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://idp.ut-capitole.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ut-capitole.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.ut-capitole.fr/idp/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Université de Toulouse 1 Capitole</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Université de Toulouse 1 Capitole</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <EmailAddress>systeme@ut-capitole.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.ut-capitole.fr.xml b/swamid-interfederations-2.0/idp.ut-capitole.fr.xml
deleted file mode 100644
index 1aadc4cd..00000000
--- a/swamid-interfederations-2.0/idp.ut-capitole.fr.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.ut-capitole.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2009-03-30T15:33:11Z">
-      <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">ut-capitole.fr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-tlse1.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">Université de Toulouse 1 Capitole</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDNDCCAhygAwIBAgIVALxLFXefFrTC9DNxwQJ5rG/49hVDMA0GCSqGSIb3DQEB
-BQUAMB0xGzAZBgNVBAMTEmlkcC51dC1jYXBpdG9sZS5mcjAeFw0xMjA2MDcxNDUz
-NTBaFw0zMjA2MDcxNDUzNTBaMB0xGzAZBgNVBAMTEmlkcC51dC1jYXBpdG9sZS5m
-cjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKwkRsoTpYYbJf4f+0Vz
-z7ZaAZrsQeDWLgtpyjwOcBtdaRvZzpFNHfp2P/zQhPTdvE0HMU4gaVV5wkCDsKRH
-LolPH3UcgGpZgJ8A3aSm9InPNTMnkFWWASuUssivJvxK30lE/w3JcIzyZwNAwZbP
-syvpXN+mZxY0r1J2wD+cMhubSVVTM7aiGKm8nKZpRP/9GEr9TlKiaq39VA9YXdZt
-q7g1sWgU51eRRmuBCg3SuLaqNabWxrE9u+b04QfPs2LnMduLcykIhOhgs2V3TnLA
-UUGZYnkv9heRngdqbGtR0dK5XgzF9eRHrG9feW5swumQ47fehGO6F+wz8+C6JZ1s
-3s0CAwEAAaNrMGkwSAYDVR0RBEEwP4ISaWRwLnV0LWNhcGl0b2xlLmZyhilodHRw
-czovL2lkcC51dC1jYXBpdG9sZS5mci9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQU
-pQc7jVB0iT0c/A1SJwl6+dQRHl0wDQYJKoZIhvcNAQEFBQADggEBAIY0wIOPgk0d
-w3jg69RkQO+RShp5gO1IMozCDrO/A/oYWo8jQUO6tVXQP9SVhQmRxLIXHIt6uhEn
-3Y5lVdrySy2CzdQbcXi4E4COkJPCWhfy6O5yVFlYXDAl1KDic5CMRaH9fJ6kjAMN
-8TTSUvH0tO/ZAbLMeveuSUQG0uVZ+8hA3hciH0CoRrk3XoJhlM+rrIaWQc3W23rd
-c7C+wWTEXDd31gwpaV3mdXA/Ll8KxqtSw4UFX7mKna86JLkD1RnInHj+47g2KSAa
-icpGH7BFG5C/Y8WID/SDMcDwUBI55XFzBmDdgRkaZ5Sh3Ncfd+op3Rp0KWHeidql
-j9Itfb+dnWQ=
-					    </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://idp.ut-capitole.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ut-capitole.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.ut-capitole.fr/idp/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Université de Toulouse 1 Capitole</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Université de Toulouse 1 Capitole</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <EmailAddress>systeme@ut-capitole.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.utia.cas.cz-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.utia.cas.cz-idp-shibboleth.xml
deleted file mode 100644
index e48fe61a..00000000
--- a/swamid-interfederations-2.0/idp.utia.cas.cz-idp-shibboleth.xml
+++ /dev/null
@@ -1,118 +0,0 @@
-<?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/" registrationInstant="2014-03-07T08:48:51Z">
-      <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>
-    <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://eduid.cz/uri/idp-group/avcr</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>
-      <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">Institute of Information Theory and Automation AS CR</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="cs">Ústav teorie informace a automatizace 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.utia.cas.cz.xml b/swamid-interfederations-2.0/idp.utia.cas.cz.xml
deleted file mode 100644
index e48fe61a..00000000
--- a/swamid-interfederations-2.0/idp.utia.cas.cz.xml
+++ /dev/null
@@ -1,118 +0,0 @@
-<?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/" registrationInstant="2014-03-07T08:48:51Z">
-      <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>
-    <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://eduid.cz/uri/idp-group/avcr</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>
-      <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">Institute of Information Theory and Automation AS CR</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="cs">Ústav teorie informace a automatizace 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.utorauth.utoronto.ca-shibboleth.xml b/swamid-interfederations-2.0/idp.utorauth.utoronto.ca-shibboleth.xml
deleted file mode 100644
index bd1582bb..00000000
--- a/swamid-interfederations-2.0/idp.utorauth.utoronto.ca-shibboleth.xml
+++ /dev/null
@@ -1,101 +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://idp.utorauth.utoronto.ca/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.canarie.ca" registrationInstant="2013-05-23T00:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">
-http://www.canarie.ca/templates/services/docs/CAF_join_en.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">utoronto.ca</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">University of Toronto</mdui:DisplayName>
-        <mdui:InformationURL xml:lang="en">http://www.utoronto.ca/about-uoft.htm</mdui:InformationURL>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DomainHint>utoronto.ca</mdui:DomainHint>
-      </mdui:DiscoHints>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDTDCCAjSgAwIBAgIVAKBtctYdDHOwvkS2Cae5mn6+SG12MA0GCSqGSIb3DQEB
-BQUAMCMxITAfBgNVBAMTGGlkcC51dG9yYXV0aC51dG9yb250by5jYTAeFw0xMDAy
-MTcwNDM2MzZaFw0zMDAyMTcwNDM2MzZaMCMxITAfBgNVBAMTGGlkcC51dG9yYXV0
-aC51dG9yb250by5jYTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANsi
-lyIZHSDZPNT7GJAnB6sydHDoezYsO5k6OqQaY1iVJnx8dFkY+mdI5zwmUgDV3LKY
-M+vh/1v1tDx/5G6eVPckZPn6WobTd+GQgwUsXFRGZ5svkHSxQhAzBuc4ltFAFXPI
-JnbgD29oukIE3S6YCo7pQBORbbizsoHbwZ2pzk1u6iEbf7DuiPy8i8+CjdHHs3BS
-wXJ9cG7Yah9ouXK8g44Jy6KqoFKhPckKbZfJ2reojSAQEZm4hu6Rn38PRSAIFJFb
-HFZlqDpvFnLwQXkrB1bcoWoePPRjwkUPWqPjOkqBmTgSRlitKNUpnrQMjzckTaVX
-70r73+hA2L0YbWp2Xt0CAwEAAaN3MHUwVAYDVR0RBE0wS4IYaWRwLnV0b3JhdXRo
-LnV0b3JvbnRvLmNhhi9odHRwczovL2lkcC51dG9yYXV0aC51dG9yb250by5jYS9p
-ZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUrp0AR4X36F4QukpWTPrl7SpIVLUwDQYJ
-KoZIhvcNAQEFBQADggEBAJl0Wi8qk8D02AaPu0XdqoQekjvmZFyi6rcoCKDzCKWd
-jyuF+gqEPWIWg+Ee8zqVvx0XNXx6YqqU5WyXjp1vvcNTE33+kq8eCMGWHrpW+mwn
-FwMXexviS6z/TLsSMwTbbTb7G900iMl81B7++v9KkRzg5KSx3UILKr3t39hmf/nP
-v6q8Ut3UQ5EjnV5J+PTDePSSVhsauAqQgdXJk6e5D0Y6BOYQGKsncBvmmz3LRuEO
-JA6YHVtPjl1wNwGOMImUX4ZT0G0YAGrxx0VN7rU9RCGlLaasDFQCIuNrOOM94w6W
-x5P0oxvLtqiOA5Sbm0KW5p7Fpzig9Hm+7M5dxGJd0L0=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.utorauth.utoronto.ca:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.utorauth.utoronto.ca: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.utorauth.utoronto.ca/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.utorauth.utoronto.ca/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.utorauth.utoronto.ca/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.utorauth.utoronto.ca/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">utoronto.ca</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDTDCCAjSgAwIBAgIVAKBtctYdDHOwvkS2Cae5mn6+SG12MA0GCSqGSIb3DQEB
-BQUAMCMxITAfBgNVBAMTGGlkcC51dG9yYXV0aC51dG9yb250by5jYTAeFw0xMDAy
-MTcwNDM2MzZaFw0zMDAyMTcwNDM2MzZaMCMxITAfBgNVBAMTGGlkcC51dG9yYXV0
-aC51dG9yb250by5jYTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANsi
-lyIZHSDZPNT7GJAnB6sydHDoezYsO5k6OqQaY1iVJnx8dFkY+mdI5zwmUgDV3LKY
-M+vh/1v1tDx/5G6eVPckZPn6WobTd+GQgwUsXFRGZ5svkHSxQhAzBuc4ltFAFXPI
-JnbgD29oukIE3S6YCo7pQBORbbizsoHbwZ2pzk1u6iEbf7DuiPy8i8+CjdHHs3BS
-wXJ9cG7Yah9ouXK8g44Jy6KqoFKhPckKbZfJ2reojSAQEZm4hu6Rn38PRSAIFJFb
-HFZlqDpvFnLwQXkrB1bcoWoePPRjwkUPWqPjOkqBmTgSRlitKNUpnrQMjzckTaVX
-70r73+hA2L0YbWp2Xt0CAwEAAaN3MHUwVAYDVR0RBE0wS4IYaWRwLnV0b3JhdXRo
-LnV0b3JvbnRvLmNhhi9odHRwczovL2lkcC51dG9yYXV0aC51dG9yb250by5jYS9p
-ZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUrp0AR4X36F4QukpWTPrl7SpIVLUwDQYJ
-KoZIhvcNAQEFBQADggEBAJl0Wi8qk8D02AaPu0XdqoQekjvmZFyi6rcoCKDzCKWd
-jyuF+gqEPWIWg+Ee8zqVvx0XNXx6YqqU5WyXjp1vvcNTE33+kq8eCMGWHrpW+mwn
-FwMXexviS6z/TLsSMwTbbTb7G900iMl81B7++v9KkRzg5KSx3UILKr3t39hmf/nP
-v6q8Ut3UQ5EjnV5J+PTDePSSVhsauAqQgdXJk6e5D0Y6BOYQGKsncBvmmz3LRuEO
-JA6YHVtPjl1wNwGOMImUX4ZT0G0YAGrxx0VN7rU9RCGlLaasDFQCIuNrOOM94w6W
-x5P0oxvLtqiOA5Sbm0KW5p7Fpzig9Hm+7M5dxGJd0L0=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.utorauth.utoronto.ca:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.utorauth.utoronto.ca: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">University of Toronto</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Toronto</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.utoronto.ca/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Mike</GivenName>
-    <SurName>Wiseman</SurName>
-    <EmailAddress>mike.wiseman@utoronto.ca</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.utorauth.utoronto.ca.xml b/swamid-interfederations-2.0/idp.utorauth.utoronto.ca.xml
deleted file mode 100644
index bd1582bb..00000000
--- a/swamid-interfederations-2.0/idp.utorauth.utoronto.ca.xml
+++ /dev/null
@@ -1,101 +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://idp.utorauth.utoronto.ca/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.canarie.ca" registrationInstant="2013-05-23T00:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">
-http://www.canarie.ca/templates/services/docs/CAF_join_en.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">utoronto.ca</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">University of Toronto</mdui:DisplayName>
-        <mdui:InformationURL xml:lang="en">http://www.utoronto.ca/about-uoft.htm</mdui:InformationURL>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DomainHint>utoronto.ca</mdui:DomainHint>
-      </mdui:DiscoHints>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDTDCCAjSgAwIBAgIVAKBtctYdDHOwvkS2Cae5mn6+SG12MA0GCSqGSIb3DQEB
-BQUAMCMxITAfBgNVBAMTGGlkcC51dG9yYXV0aC51dG9yb250by5jYTAeFw0xMDAy
-MTcwNDM2MzZaFw0zMDAyMTcwNDM2MzZaMCMxITAfBgNVBAMTGGlkcC51dG9yYXV0
-aC51dG9yb250by5jYTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANsi
-lyIZHSDZPNT7GJAnB6sydHDoezYsO5k6OqQaY1iVJnx8dFkY+mdI5zwmUgDV3LKY
-M+vh/1v1tDx/5G6eVPckZPn6WobTd+GQgwUsXFRGZ5svkHSxQhAzBuc4ltFAFXPI
-JnbgD29oukIE3S6YCo7pQBORbbizsoHbwZ2pzk1u6iEbf7DuiPy8i8+CjdHHs3BS
-wXJ9cG7Yah9ouXK8g44Jy6KqoFKhPckKbZfJ2reojSAQEZm4hu6Rn38PRSAIFJFb
-HFZlqDpvFnLwQXkrB1bcoWoePPRjwkUPWqPjOkqBmTgSRlitKNUpnrQMjzckTaVX
-70r73+hA2L0YbWp2Xt0CAwEAAaN3MHUwVAYDVR0RBE0wS4IYaWRwLnV0b3JhdXRo
-LnV0b3JvbnRvLmNhhi9odHRwczovL2lkcC51dG9yYXV0aC51dG9yb250by5jYS9p
-ZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUrp0AR4X36F4QukpWTPrl7SpIVLUwDQYJ
-KoZIhvcNAQEFBQADggEBAJl0Wi8qk8D02AaPu0XdqoQekjvmZFyi6rcoCKDzCKWd
-jyuF+gqEPWIWg+Ee8zqVvx0XNXx6YqqU5WyXjp1vvcNTE33+kq8eCMGWHrpW+mwn
-FwMXexviS6z/TLsSMwTbbTb7G900iMl81B7++v9KkRzg5KSx3UILKr3t39hmf/nP
-v6q8Ut3UQ5EjnV5J+PTDePSSVhsauAqQgdXJk6e5D0Y6BOYQGKsncBvmmz3LRuEO
-JA6YHVtPjl1wNwGOMImUX4ZT0G0YAGrxx0VN7rU9RCGlLaasDFQCIuNrOOM94w6W
-x5P0oxvLtqiOA5Sbm0KW5p7Fpzig9Hm+7M5dxGJd0L0=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.utorauth.utoronto.ca:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.utorauth.utoronto.ca: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.utorauth.utoronto.ca/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.utorauth.utoronto.ca/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.utorauth.utoronto.ca/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.utorauth.utoronto.ca/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">utoronto.ca</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDTDCCAjSgAwIBAgIVAKBtctYdDHOwvkS2Cae5mn6+SG12MA0GCSqGSIb3DQEB
-BQUAMCMxITAfBgNVBAMTGGlkcC51dG9yYXV0aC51dG9yb250by5jYTAeFw0xMDAy
-MTcwNDM2MzZaFw0zMDAyMTcwNDM2MzZaMCMxITAfBgNVBAMTGGlkcC51dG9yYXV0
-aC51dG9yb250by5jYTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANsi
-lyIZHSDZPNT7GJAnB6sydHDoezYsO5k6OqQaY1iVJnx8dFkY+mdI5zwmUgDV3LKY
-M+vh/1v1tDx/5G6eVPckZPn6WobTd+GQgwUsXFRGZ5svkHSxQhAzBuc4ltFAFXPI
-JnbgD29oukIE3S6YCo7pQBORbbizsoHbwZ2pzk1u6iEbf7DuiPy8i8+CjdHHs3BS
-wXJ9cG7Yah9ouXK8g44Jy6KqoFKhPckKbZfJ2reojSAQEZm4hu6Rn38PRSAIFJFb
-HFZlqDpvFnLwQXkrB1bcoWoePPRjwkUPWqPjOkqBmTgSRlitKNUpnrQMjzckTaVX
-70r73+hA2L0YbWp2Xt0CAwEAAaN3MHUwVAYDVR0RBE0wS4IYaWRwLnV0b3JhdXRo
-LnV0b3JvbnRvLmNhhi9odHRwczovL2lkcC51dG9yYXV0aC51dG9yb250by5jYS9p
-ZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUrp0AR4X36F4QukpWTPrl7SpIVLUwDQYJ
-KoZIhvcNAQEFBQADggEBAJl0Wi8qk8D02AaPu0XdqoQekjvmZFyi6rcoCKDzCKWd
-jyuF+gqEPWIWg+Ee8zqVvx0XNXx6YqqU5WyXjp1vvcNTE33+kq8eCMGWHrpW+mwn
-FwMXexviS6z/TLsSMwTbbTb7G900iMl81B7++v9KkRzg5KSx3UILKr3t39hmf/nP
-v6q8Ut3UQ5EjnV5J+PTDePSSVhsauAqQgdXJk6e5D0Y6BOYQGKsncBvmmz3LRuEO
-JA6YHVtPjl1wNwGOMImUX4ZT0G0YAGrxx0VN7rU9RCGlLaasDFQCIuNrOOM94w6W
-x5P0oxvLtqiOA5Sbm0KW5p7Fpzig9Hm+7M5dxGJd0L0=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.utorauth.utoronto.ca:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.utorauth.utoronto.ca: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">University of Toronto</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Toronto</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.utoronto.ca/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Mike</GivenName>
-    <SurName>Wiseman</SurName>
-    <EmailAddress>mike.wiseman@utoronto.ca</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.vet-alfort.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.vet-alfort.fr-idp-shibboleth.xml
deleted file mode 100644
index 513cde39..00000000
--- a/swamid-interfederations-2.0/idp.vet-alfort.fr-idp-shibboleth.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.vet-alfort.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2014-06-06T14:14:52Z">
-      <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">vet-alfort.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">National Veterinary School of Alfort</mdui:DisplayName>
-        <mdui:Description xml:lang="en">ENVA Students, Teachers and researchers and employees.</mdui:Description>
-        <mdui:DisplayName xml:lang="fr">Ecole Nationale Vétérinaire d'ALFORT</mdui:DisplayName>
-        <mdui:Description xml:lang="fr">Etudiants, Enseignants-Chercheur, Personnels de l'ENVA</mdui:Description>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDMDCCAhigAwIBAgIVAO3N41irRpARAo+XP9yzoR89gA0sMA0GCSqGSIb3DQEB
-BQUAMBwxGjAYBgNVBAMTEWlkcC52ZXQtYWxmb3J0LmZyMB4XDTE0MDYwNjA4NDcz
-NVoXDTM0MDYwNjA4NDczNVowHDEaMBgGA1UEAxMRaWRwLnZldC1hbGZvcnQuZnIw
-ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCDMy3shCyhtNVjXK6/6gSc
-seewwAOZRAPaOppoj+iGJ+261cOu/JthyfDkRnxXvuDkbwatFyqzGBAjZUWrjj9F
-vpLA8AhKFn555ZdFaEz613xB1Ixt2erYh0/B7n54jMKX/R6puVfBPqviYagJBBav
-Ge2tNJu2Q2/qjkWBf9tIE0ZrKAXQJWYwAiaWIFa4nECbmlEq2Y5iyA/Um6xLRwLZ
-jPPr0CNDE86h8z4HTppc5q6Vam7mN4wHlKUWlf6Ie4zPy7WnW6Bp1gxqkx1zGeeA
-pqHYd3H3Mw6Nxpa3W1CUsIXdIYSKpo/ahfpipK8ci5DExUgfjG+IUMnGcoACdX2X
-AgMBAAGjaTBnMEYGA1UdEQQ/MD2CEWlkcC52ZXQtYWxmb3J0LmZyhihodHRwczov
-L2lkcC52ZXQtYWxmb3J0LmZyL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBQdpcAH
-JJCWpA6ERBlywLRbThojDTANBgkqhkiG9w0BAQUFAAOCAQEAeVSp+V5olBI0kcyV
-02igfUKwnrCD116/yABfvo8lpLCVhTI0Hydfyywq9duJNZnpmtlNdgRN+d+OUnx3
-hlDvg1BAh1jPObwa0e9i4KtAr6fZHVxs3TczaUW2V+qdzQCPDj2y+qkEeFyCFEoP
-tAv7a/xGeAqQ4dupq2j6RlqfB62GdZGhfvzLJIUCz4MkH+X2SSRoAwrTUwPkeeqa
-xQIiyDnuAGh+RL+tU4BzJZkfmyLDtgrN+jP1rlmBIph0JB3uV2zG0FuIboFlIkZP
-8juD6wsMppjhxFHr+jq4B9iUmMNMCgsg6gX60VF7JNvTuoB6iXE77dJ/a1o7SXlh
-95exag==
-					    </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://idp.vet-alfort.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.vet-alfort.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.vet-alfort.fr/idp/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Ecole Nationale Vétérinaire d'ALFORT</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Ecole Nationale Vétérinaire d'ALFORT</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Hervé Battaglia</SurName>
-    <EmailAddress>herve.battaglia@vet-alfort.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.vet-alfort.fr.xml b/swamid-interfederations-2.0/idp.vet-alfort.fr.xml
deleted file mode 100644
index 513cde39..00000000
--- a/swamid-interfederations-2.0/idp.vet-alfort.fr.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.vet-alfort.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2014-06-06T14:14:52Z">
-      <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">vet-alfort.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">National Veterinary School of Alfort</mdui:DisplayName>
-        <mdui:Description xml:lang="en">ENVA Students, Teachers and researchers and employees.</mdui:Description>
-        <mdui:DisplayName xml:lang="fr">Ecole Nationale Vétérinaire d'ALFORT</mdui:DisplayName>
-        <mdui:Description xml:lang="fr">Etudiants, Enseignants-Chercheur, Personnels de l'ENVA</mdui:Description>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDMDCCAhigAwIBAgIVAO3N41irRpARAo+XP9yzoR89gA0sMA0GCSqGSIb3DQEB
-BQUAMBwxGjAYBgNVBAMTEWlkcC52ZXQtYWxmb3J0LmZyMB4XDTE0MDYwNjA4NDcz
-NVoXDTM0MDYwNjA4NDczNVowHDEaMBgGA1UEAxMRaWRwLnZldC1hbGZvcnQuZnIw
-ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCDMy3shCyhtNVjXK6/6gSc
-seewwAOZRAPaOppoj+iGJ+261cOu/JthyfDkRnxXvuDkbwatFyqzGBAjZUWrjj9F
-vpLA8AhKFn555ZdFaEz613xB1Ixt2erYh0/B7n54jMKX/R6puVfBPqviYagJBBav
-Ge2tNJu2Q2/qjkWBf9tIE0ZrKAXQJWYwAiaWIFa4nECbmlEq2Y5iyA/Um6xLRwLZ
-jPPr0CNDE86h8z4HTppc5q6Vam7mN4wHlKUWlf6Ie4zPy7WnW6Bp1gxqkx1zGeeA
-pqHYd3H3Mw6Nxpa3W1CUsIXdIYSKpo/ahfpipK8ci5DExUgfjG+IUMnGcoACdX2X
-AgMBAAGjaTBnMEYGA1UdEQQ/MD2CEWlkcC52ZXQtYWxmb3J0LmZyhihodHRwczov
-L2lkcC52ZXQtYWxmb3J0LmZyL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBQdpcAH
-JJCWpA6ERBlywLRbThojDTANBgkqhkiG9w0BAQUFAAOCAQEAeVSp+V5olBI0kcyV
-02igfUKwnrCD116/yABfvo8lpLCVhTI0Hydfyywq9duJNZnpmtlNdgRN+d+OUnx3
-hlDvg1BAh1jPObwa0e9i4KtAr6fZHVxs3TczaUW2V+qdzQCPDj2y+qkEeFyCFEoP
-tAv7a/xGeAqQ4dupq2j6RlqfB62GdZGhfvzLJIUCz4MkH+X2SSRoAwrTUwPkeeqa
-xQIiyDnuAGh+RL+tU4BzJZkfmyLDtgrN+jP1rlmBIph0JB3uV2zG0FuIboFlIkZP
-8juD6wsMppjhxFHr+jq4B9iUmMNMCgsg6gX60VF7JNvTuoB6iXE77dJ/a1o7SXlh
-95exag==
-					    </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://idp.vet-alfort.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.vet-alfort.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.vet-alfort.fr/idp/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Ecole Nationale Vétérinaire d'ALFORT</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Ecole Nationale Vétérinaire d'ALFORT</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Hervé Battaglia</SurName>
-    <EmailAddress>herve.battaglia@vet-alfort.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.vib.be-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.vib.be-idp-shibboleth.xml
deleted file mode 100644
index ccffbee7..00000000
--- a/swamid-interfederations-2.0/idp.vib.be-idp-shibboleth.xml
+++ /dev/null
@@ -1,111 +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: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:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://idp.vib.be/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://federation.belnet.be/" registrationInstant="2012-03-27T12:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://federation.belnet.be/files/Belnet-metadata-registration-practice-statement.txt</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">belnet.be</shibmd:Scope>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="en">VIB</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Vlaams Instituut voor Biotechnologie</mdui:Description>
-        <mdui:Logo height="16" width="16">data:image/jpg;base64,/9j/4QQ5RXhpZgAATU0AKgAAAAgADAEAAAMAAAABA2IAAAEBAAMAAAABA+gAAAECAAMAAAADAAAAngEGAAMAAAABAAIAAAESAAMAAAABAAEAAAEVAAMAAAABAAMAAAEaAAUAAAABAAAApAEbAAUAAAABAAAArAEoAAMAAAABAAIAAAExAAIAAAAeAAAAtAEyAAIAAAAUAAAA0odpAAQAAAABAAAA6AAAASAACAAIAAgALcbAAAAnEAAtxsAAACcQQWRvYmUgUGhvdG9zaG9wIENTNiAoV2luZG93cykAMjAxNDowNToxOSAxNTo1NTo0OAAAAAAEkAAABwAAAAQwMjIxoAEAAwAAAAH//wAAoAIABAAAAAEAAAAQoAMABAAAAAEAAAAQAAAAAAAAAAYBAwADAAAAAQAGAAABGgAFAAAAAQAAAW4BGwAFAAAAAQAAAXYBKAADAAAAAQACAAACAQAEAAAAAQAAAX4CAgAEAAAAAQAAArMAAAAAAAAASAAAAAEAAABIAAAAAf/Y/+0ADEFkb2JlX0NNAAL/7gAOQWRvYmUAZIAAAAAB/9sAhAAMCAgICQgMCQkMEQsKCxEVDwwMDxUYExMVExMYEQwMDAwMDBEMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMAQ0LCw0ODRAODhAUDg4OFBQODg4OFBEMDAwMDBERDAwMDAwMEQwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAz/wAARCAAQABADASIAAhEBAxEB/90ABAAB/8QBPwAAAQUBAQEBAQEAAAAAAAAAAwABAgQFBgcICQoLAQABBQEBAQEBAQAAAAAAAAABAAIDBAUGBwgJCgsQAAEEAQMCBAIFBwYIBQMMMwEAAhEDBCESMQVBUWETInGBMgYUkaGxQiMkFVLBYjM0coLRQwclklPw4fFjczUWorKDJkSTVGRFwqN0NhfSVeJl8rOEw9N14/NGJ5SkhbSVxNTk9KW1xdXl9VZmdoaWprbG1ub2N0dXZ3eHl6e3x9fn9xEAAgIBAgQEAwQFBgcHBgU1AQACEQMhMRIEQVFhcSITBTKBkRShsUIjwVLR8DMkYuFygpJDUxVjczTxJQYWorKDByY1wtJEk1SjF2RFVTZ0ZeLys4TD03Xj80aUpIW0lcTU5PSltcXV5fVWZnaGlqa2xtbm9ic3R1dnd4eXp7fH/9oADAMBAAIRAxEAPwDVuovsvv8A1y/1BbYHAVWxo53uY6l9jP7C0KsLJPS8e7IvqNeK5925jH1WXN/mf1qvdW6rIrtc39Jvt/m0VmE3Jy8uq5jm34z7H5ILjsFZDrMSyn977T/4F6dyqvuppwcMMqBqsxauo2NrJNhHrVOsrL/p3MZZlOyPo2fzX8yny5rNOQjKHDGGsZjIDf2YsWSP/PaeHlPbEzQJyCqr9k8k4P8A/9n/7QwUUGhvdG9zaG9wIDMuMAA4QklNBAQAAAAAAA8cAVoAAxslRxwCAAACAAIAOEJJTQQlAAAAAAAQ/OEfici3yXgvNGI0B1h36zhCSU0EOgAAAAABGQAAABAAAAABAAAAAAALcHJpbnRPdXRwdXQAAAAFAAAAAFBzdFNib29sAQAAAABJbnRlZW51bQAAAABJbnRlAAAAAENscm0AAAAPcHJpbnRTaXh0ZWVuQml0Ym9vbAAAAAALcHJpbnRlck5hbWVURVhUAAAAGwBcAFwAdABvAHQAbwBcAEMAYQBuAG8AbgAgAEYAbABvAG8AcgAgADEAIABDAG8AbABvAHIAAAAAAA9wcmludFByb29mU2V0dXBPYmpjAAAADABQAHIAbwBvAGYAIABTAGUAdAB1AHAAAAAAAApwcm9vZlNldHVwAAAAAQAAAABCbHRuZW51bQAAAAxidWlsdGluUHJvb2YAAAAJcHJvb2ZDTVlLADhCSU0EOwAAAAACLQAAABAAAAABAAAAAAAScHJpbnRPdXRwdXRPcHRpb25zAAAAFwAAAABDcHRuYm9vbAAAAAAAQ2xicmJvb2wAAAAAAFJnc01ib29sAAAAAABDcm5DYm9vbAAAAAAAQ250Q2Jvb2wAAAAAAExibHNib29sAAAAAABOZ3R2Ym9vbAAAAAAARW1sRGJvb2wAAAAAAEludHJib29sAAAAAABCY2tnT2JqYwAAAAEAAAAAAABSR0JDAAAAAwAAAABSZCAgZG91YkBv4AAAAAAAAAAAAEdybiBkb3ViQG/gAAAAAAAAAAAAQmwgIGRvdWJAb+AAAAAAAAAAAABCcmRUVW50RiNSbHQAAAAAAAAAAAAAAABCbGQgVW50RiNSbHQAAAAAAAAAAAAAAABSc2x0VW50RiNQeGxAcsAAAAAAAAAAAAp2ZWN0b3JEYXRhYm9vbAEAAAAAUGdQc2VudW0AAAAAUGdQcwAAAABQZ1BDAAAAAExlZnRVbnRGI1JsdAAAAAAAAAAAAAAAAFRvcCBVbnRGI1JsdAAAAAAAAAAAAAAAAFNjbCBVbnRGI1ByY0BZAAAAAAAAAAAAEGNyb3BXaGVuUHJpbnRpbmdib29sAAAAAA5jcm9wUmVjdEJvdHRvbWxvbmcAAAAAAAAADGNyb3BSZWN0TGVmdGxvbmcAAAAAAAAADWNyb3BSZWN0UmlnaHRsb25nAAAAAAAAAAtjcm9wUmVjdFRvcGxvbmcAAAAAADhCSU0D7QAAAAAAEAEsAAAAAQACASwAAAABAAI4QklNBCYAAAAAAA4AAAAAAAAAAAAAP4AAADhCSU0EDQAAAAAABAAAAB44QklNBBkAAAAAAAQAAAAeOEJJTQPzAAAAAAAJAAAAAAAAAAABADhCSU0ECgAAAAAAAQAAOEJJTScQAAAAAAAKAAEAAAAAAAAAAjhCSU0D9QAAAAAASAAvZmYAAQBsZmYABgAAAAAAAQAvZmYAAQChmZoABgAAAAAAAQAyAAAAAQBaAAAABgAAAAAAAQA1AAAAAQAtAAAABgAAAAAAAThCSU0D+AAAAAAAcAAA/////////////////////////////wPoAAAAAP////////////////////////////8D6AAAAAD/////////////////////////////A+gAAAAA/////////////////////////////wPoAAA4QklNBAgAAAAAABAAAAABAAACQAAAAkAAAAAAOEJJTQQeAAAAAAAEAAAAADhCSU0EGgAAAAADSwAAAAYAAAAAAAAAAAAAABAAAAAQAAAACwBWAEkAQgBfAHIAZwBiAF8AcABvAHMAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAABAAAAAQAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAEAAAAAAABudWxsAAAAAgAAAAZib3VuZHNPYmpjAAAAAQAAAAAAAFJjdDEAAAAEAAAAAFRvcCBsb25nAAAAAAAAAABMZWZ0bG9uZwAAAAAAAAAAQnRvbWxvbmcAAAAQAAAAAFJnaHRsb25nAAAAEAAAAAZzbGljZXNWbExzAAAAAU9iamMAAAABAAAAAAAFc2xpY2UAAAASAAAAB3NsaWNlSURsb25nAAAAAAAAAAdncm91cElEbG9uZwAAAAAAAAAGb3JpZ2luZW51bQAAAAxFU2xpY2VPcmlnaW4AAAANYXV0b0dlbmVyYXRlZAAAAABUeXBlZW51bQAAAApFU2xpY2VUeXBlAAAAAEltZyAAAAAGYm91bmRzT2JqYwAAAAEAAAAAAABSY3QxAAAABAAAAABUb3AgbG9uZwAAAAAAAAAATGVmdGxvbmcAAAAAAAAAAEJ0b21sb25nAAAAEAAAAABSZ2h0bG9uZwAAABAAAAADdXJsVEVYVAAAAAEAAAAAAABudWxsVEVYVAAAAAEAAAAAAABNc2dlVEVYVAAAAAEAAAAAAAZhbHRUYWdURVhUAAAAAQAAAAAADmNlbGxUZXh0SXNIVE1MYm9vbAEAAAAIY2VsbFRleHRURVhUAAAAAQAAAAAACWhvcnpBbGlnbmVudW0AAAAPRVNsaWNlSG9yekFsaWduAAAAB2RlZmF1bHQAAAAJdmVydEFsaWduZW51bQAAAA9FU2xpY2VWZXJ0QWxpZ24AAAAHZGVmYXVsdAAAAAtiZ0NvbG9yVHlwZWVudW0AAAARRVNsaWNlQkdDb2xvclR5cGUAAAAATm9uZQAAAAl0b3BPdXRzZXRsb25nAAAAAAAAAApsZWZ0T3V0c2V0bG9uZwAAAAAAAAAMYm90dG9tT3V0c2V0bG9uZwAAAAAAAAALcmlnaHRPdXRzZXRsb25nAAAAAAA4QklNBCgAAAAAAAwAAAACP/AAAAAAAAA4QklNBBEAAAAAAAEBADhCSU0EFAAAAAAABAAAAAE4QklNBAwAAAAAAs8AAAABAAAAEAAAABAAAAAwAAADAAAAArMAGAAB/9j/7QAMQWRvYmVfQ00AAv/uAA5BZG9iZQBkgAAAAAH/2wCEAAwICAgJCAwJCQwRCwoLERUPDAwPFRgTExUTExgRDAwMDAwMEQwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwBDQsLDQ4NEA4OEBQODg4UFA4ODg4UEQwMDAwMEREMDAwMDAwRDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDP/AABEIABAAEAMBIgACEQEDEQH/3QAEAAH/xAE/AAABBQEBAQEBAQAAAAAAAAADAAECBAUGBwgJCgsBAAEFAQEBAQEBAAAAAAAAAAEAAgMEBQYHCAkKCxAAAQQBAwIEAgUHBggFAwwzAQACEQMEIRIxBUFRYRMicYEyBhSRobFCIyQVUsFiMzRygtFDByWSU/Dh8WNzNRaisoMmRJNUZEXCo3Q2F9JV4mXys4TD03Xj80YnlKSFtJXE1OT0pbXF1eX1VmZ2hpamtsbW5vY3R1dnd4eXp7fH1+f3EQACAgECBAQDBAUGBwcGBTUBAAIRAyExEgRBUWFxIhMFMoGRFKGxQiPBUtHwMyRi4XKCkkNTFWNzNPElBhaisoMHJjXC0kSTVKMXZEVVNnRl4vKzhMPTdePzRpSkhbSVxNTk9KW1xdXl9VZmdoaWprbG1ub2JzdHV2d3h5ent8f/2gAMAwEAAhEDEQA/ANW6i+y+/wDXL/UFtgcBVbGjne5jqX2M/sLQqwsk9Lx7si+o14rn3bmMfVZc3+Z/Wq91bqsiu1zf0m+3+bRWYTcnLy6rmObfjPsfkguOwVkOsxLKf3vtP/gXp3Kq+6mnBwwyoGqzFq6jY2sk2EetU6ysv+ncxlmU7I+jZ/NfzKfLms05CMocMYaxmMgN/ZixZI/89p4eU9sTNAnIKqv2TyTg/wD/2QA4QklNBCEAAAAAAFUAAAABAQAAAA8AQQBkAG8AYgBlACAAUABoAG8AdABvAHMAaABvAHAAAAATAEEAZABvAGIAZQAgAFAAaABvAHQAbwBzAGgAbwBwACAAQwBTADYAAAABADhCSU0EBgAAAAAABwAIAAAAAQEA/+EOP2h0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC8APD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQiPz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENvcmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJERiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczpwaG90b3Nob3A9Imh0dHA6Ly9ucy5hZG9iZS5jb20vcGhvdG9zaG9wLzEuMC8iIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1sbnM6eG1wTU09Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9tbS8iIHhtbG5zOnN0UmVmPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvc1R5cGUvUmVzb3VyY2VSZWYjIiB4bWxuczpzdEV2dD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL3NUeXBlL1Jlc291cmNlRXZlbnQjIiB4bWxuczpkYz0iaHR0cDovL3B1cmwub3JnL2RjL2VsZW1lbnRzLzEuMS8iIHhtbG5zOnhtcFJpZ2h0cz0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL3JpZ2h0cy8iIHBob3Rvc2hvcDpMZWdhY3lJUFRDRGlnZXN0PSI0NjBDRjI4OTI2Qjg1NkRBQjA5QzAxQTFCMEE3OTA3NyIgcGhvdG9zaG9wOkNvbG9yTW9kZT0iMyIgeG1wOkNyZWF0b3JUb29sPSJBZG9iZSBQaG90b3Nob3AgQ1MgTWFjaW50b3NoIiB4bXA6Q3JlYXRlRGF0ZT0iMjAwNy0wMi0yOFQxNjozNDoxNyswMTowMCIgeG1wOk1vZGlmeURhdGU9IjIwMTQtMDUtMTlUMTU6NTU6NDgrMDI6MDAiIHhtcDpNZXRhZGF0YURhdGU9IjIwMTQtMDUtMTlUMTU6NTU6NDgrMDI6MDAiIHhtcE1NOkRvY3VtZW50SUQ9InV1aWQ6NTg3QzdFNEVDOEQ0MTFEQjk2RTNBMEI2OTA3Q0JDMDAiIHhtcE1NOkluc3RhbmNlSUQ9InhtcC5paWQ6QUNBNDA5NDg1RERGRTMxMUI5QzdBRTkzN0QxOEM4QzAiIHhtcE1NOk9yaWdpbmFsRG9jdW1lbnRJRD0idXVpZDo1ODdDN0U0RUM4RDQxMURCOTZFM0EwQjY5MDdDQkMwMCIgZGM6Zm9ybWF0PSJpbWFnZS9qcGVnIiB4bXBSaWdodHM6TWFya2VkPSJGYWxzZSI+IDx4bXBNTTpEZXJpdmVkRnJvbSBzdFJlZjppbnN0YW5jZUlEPSJ1dWlkOjU4N0M3RTREQzhENDExREI5NkUzQTBCNjkwN0NCQzAwIiBzdFJlZjpkb2N1bWVudElEPSJ1dWlkOjU4N0M3RTRDQzhENDExREI5NkUzQTBCNjkwN0NCQzAwIi8+IDx4bXBNTTpIaXN0b3J5PiA8cmRmOlNlcT4gPHJkZjpsaSBzdEV2dDphY3Rpb249InNhdmVkIiBzdEV2dDppbnN0YW5jZUlEPSJ4bXAuaWlkOkFDQTQwOTQ4NURERkUzMTFCOUM3QUU5MzdEMThDOEMwIiBzdEV2dDp3aGVuPSIyMDE0LTA1LTE5VDE1OjU1OjQ4KzAyOjAwIiBzdEV2dDpzb2Z0d2FyZUFnZW50PSJBZG9iZSBQaG90b3Nob3AgQ1M2IChXaW5kb3dzKSIgc3RFdnQ6Y2hhbmdlZD0iLyIvPiA8L3JkZjpTZXE+IDwveG1wTU06SGlzdG9yeT4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgPD94cGFja2V0IGVuZD0idyI/Pv/uAA5BZG9iZQBkQAAAAAH/2wCEAAEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQECAgICAgICAgICAgMDAwMDAwMDAwMBAQEBAQEBAQEBAQICAQICAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDA//AABEIABAAEAMBEQACEQEDEQH/3QAEAAL/xAGiAAAABgIDAQAAAAAAAAAAAAAHCAYFBAkDCgIBAAsBAAAGAwEBAQAAAAAAAAAAAAYFBAMHAggBCQAKCxAAAgEDBAEDAwIDAwMCBgl1AQIDBBEFEgYhBxMiAAgxFEEyIxUJUUIWYSQzF1JxgRhikSVDobHwJjRyChnB0TUn4VM2gvGSokRUc0VGN0djKFVWVxqywtLi8mSDdJOEZaOzw9PjKThm83UqOTpISUpYWVpnaGlqdnd4eXqFhoeIiYqUlZaXmJmapKWmp6ipqrS1tre4ubrExcbHyMnK1NXW19jZ2uTl5ufo6er09fb3+Pn6EQACAQMCBAQDBQQEBAYGBW0BAgMRBCESBTEGACITQVEHMmEUcQhCgSORFVKhYhYzCbEkwdFDcvAX4YI0JZJTGGNE8aKyJjUZVDZFZCcKc4OTRnTC0uLyVWV1VjeEhaOzw9Pj8ykalKS0xNTk9JWltcXV5fUoR1dmOHaGlqa2xtbm9md3h5ent8fX5/dIWGh4iJiouMjY6Pg5SVlpeYmZqbnJ2en5KjpKWmp6ipqqusra6vr/2gAMAwEAAhEDEQA/AD77t2Vvjc2+u0ZI/kr3lLuWl7Z7Kx2Wx+M6U74/glQlHufORT5Xb+b6833vLa1OJsinipcWggMMGlmmUqUPSjZOYt+5Y5e5UteZva7lNrP9z2rJdSbvtlk09YIyjPDfxQvGzoRqXU/fkOynV1xa5s5L5S5w5r553rlf395ytL08x3qPt/7jvrtLYLcyrIEuLC4uFnjR1OlykRKHMSONHRw9q9M9j1Hxi6c312V2f1lV7a6W3F2L2uuU2hsbsLqbtXv3aNRRt11R03e20INy7RzHX3cGy+wcnQTfximyOcpaqvwkCzUvhqZoPeF9pufM3+ubuUHK+5sm67jLJas3iWl+vhvVZIxNHG9tPEqrSOSJVoANDYq3STc+Xvb+f2R2O55t2WK65Z2eGLcIVjF5Y1mioyXCxmZLiCWWQlpYpXdTqYOpwF//0L88X01jOz+2vkDtPfOAz+L7F6Y3v2pvPu3HVu7tyJ1/hetcvjs3vPoDdXXdVTsMdlafu+kqI6iopp5xPgWw+Zo51V4Kc1GNHuZ9032i9xd4/f0Vrf7ducsbG5Z7qfczczvKjmfVfyP9OFTxEjt7dVgVXUBaxo/QN2nlK4spN0G68yXF7bTXbSxIkaWawRuHrAFtWVZKSMsnjvWZylGOmR16AfM7y2bszpD41UuD2DQT7M3V8VumPn9urFbKzOSyHZGQpaj5F9SZndm0K7cyCs3B2Rtvbm7O+azeNQtXR5b+IVeBWlixLSyUgglnk32927lflifkfc9wl3DkuHbks7G0gU7S1kIpUkinS6sJVuGdVQq8epRK7PK0gd26Vb5sG4blttntW1cxvt8CSxmU/TW9348SKC0LJcAqnjSgO0oJdAWQBhg//9k=</mdui:Logo>
-        <mdui:Logo height="128" width="128">data:image/jpg;base64,/9j/4SH/RXhpZgAATU0AKgAAAAgADAEAAAMAAAABA2IAAAEBAAMAAAABA+gAAAECAAMAAAADAAAAngEGAAMAAAABAAIAAAESAAMAAAABAAEAAAEVAAMAAAABAAMAAAEaAAUAAAABAAAApAEbAAUAAAABAAAArAEoAAMAAAABAAIAAAExAAIAAAAeAAAAtAEyAAIAAAAUAAAA0odpAAQAAAABAAAA6AAAASAACAAIAAgALcbAAAAnEAAtxsAAACcQQWRvYmUgUGhvdG9zaG9wIENTNiAoV2luZG93cykAMjAxNDowNToxOSAxNjoxMDowMwAAAAAEkAAABwAAAAQwMjIxoAEAAwAAAAH//wAAoAIABAAAAAEAAACYoAMABAAAAAEAAACYAAAAAAAAAAYBAwADAAAAAQAGAAABGgAFAAAAAQAAAW4BGwAFAAAAAQAAAXYBKAADAAAAAQACAAACAQAEAAAAAQAAAX4CAgAEAAAAAQAAIHkAAAAAAAAASAAAAAEAAABIAAAAAf/Y/+0ADEFkb2JlX0NNAAL/7gAOQWRvYmUAZIAAAAAB/9sAhAAMCAgICQgMCQkMEQsKCxEVDwwMDxUYExMVExMYEQwMDAwMDBEMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMAQ0LCw0ODRAODhAUDg4OFBQODg4OFBEMDAwMDBERDAwMDAwMEQwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAz/wAARCACYAJgDASIAAhEBAxEB/90ABAAK/8QBPwAAAQUBAQEBAQEAAAAAAAAAAwABAgQFBgcICQoLAQABBQEBAQEBAQAAAAAAAAABAAIDBAUGBwgJCgsQAAEEAQMCBAIFBwYIBQMMMwEAAhEDBCESMQVBUWETInGBMgYUkaGxQiMkFVLBYjM0coLRQwclklPw4fFjczUWorKDJkSTVGRFwqN0NhfSVeJl8rOEw9N14/NGJ5SkhbSVxNTk9KW1xdXl9VZmdoaWprbG1ub2N0dXZ3eHl6e3x9fn9xEAAgIBAgQEAwQFBgcHBgU1AQACEQMhMRIEQVFhcSITBTKBkRShsUIjwVLR8DMkYuFygpJDUxVjczTxJQYWorKDByY1wtJEk1SjF2RFVTZ0ZeLys4TD03Xj80aUpIW0lcTU5PSltcXV5fVWZnaGlqa2xtbm9ic3R1dnd4eXp7fH/9oADAMBAAIRAxEAPwD1G+0U0WXESK2ueQOTtG5c6PrzhkT9mt+9v963uof8n5P/ABNn/UuXmLeB8Fe5Ll8eWMzMXRFa05XxTnc3LyxjEQOIG7HE9j/z4w/+41v3t/8AJJf8+MP/ALjW/e3/AMkuOSVz7hy/7p/xi5v+l+c/ej/ixex/58Yf/ca372/+SS/58Yf/AHGt+9v/AJJcckl9w5f90/4xV/pfnP3o/wCLF7H/AJ8Yf/ca372/+SS/58Yf/ca372/+SXHJJfcOX/dP+MVf6X5z96P+LF7H/nxh/wDca372/wDkkv8Anxh/9xrfvb/5JcchWfbbMzDwcNlYfm2GoX37jXW6N1YsZR+l/TfQZ+YmT5PloRM5RPDHfWRX4viXPZckccJRMpmhYhH/AKT23/PjD/7jW/e3/wAksb61fWCzrfTqel4ONfGVk0sywwjccfd+na0Vu3v3/Re39xQb9SPrTZkNpsysPHxtd+XS177CI9oZiZH6Jn6T/h0TA+qHXD1S7Dz3huFUwOp6pjxW95P5rMdzrvQyK3e71f5tVj9xIIHFE1pL1bt+J+KgxlIQlHiqUPTxcP7zHrHR+h4ee7pn1aws8dXAZbczpuS/FpY15/R/bch7349DbGCz02V0+stfE6L9dGY7Aet1Yzqz7Mf0Tlt26+2/NzHszL37nfzv6Ja/RuhYXR23/Z3W23ZT/VycnIebLbHABjfUtd+41vsZ9BaKouq83d1X62dIqdb1PAo6pQ3/AAvTXFl20DvgZe71bP8Awvlf9aQ6fr/03IpZfRRZZVYJY8Fuv4+1zfz2rZ610jF6z063ByPbu91Nzfp1Wt/mcmh30mXUv9zF5PZe/pWc6nqgrw7nk1Z1LBoMqsB1OdXTWPZT1XEO/wDR72WZdV382p+W9oz4co9Mv0r4eEtXnjzEcRny59cNTDh4+OP9X+s+hf8APjD/AO41v3t/8kl/z4w/+41v3t/8kuCPWOmtBLrXBrdHPNVoaCRuDXu9L2vc33ItHUMDJdsoyK3v/wBHO1//AG1Zss/6K0I8rycjUSCewnbjz5/4lAXOMojvLFwj8YvpHR+v0dWstrqqfUagHEvjWSR+b8Eli/UcEZWWDodjNPm5JVvu+P737Veitr/qcTd++5v9HfeLHuXvWn85w/K//9D03qH/ACfk/wDE2f8AUuXmLeB8Fp/Wj/GU+rJzOm9Kw/UxsV4xuodUubY6ikvPo2fosdvqO2O9n8577Gfo67Fz/TepV5pvpD67LMVwa62jcaXtcJrtpNobY3d/o7PetH4bkiOKBPqlrH/BcX43hnIQygXCHpkf3eL5W6kkktNwlJJJJKUkkkkpSazqdnSan9RqsFNmONzHuBLd30Wsexpa57bPobE6odcwbs/pz6KI9Vrm2MaTDXFn+Dd/WTMt+3OhxHhNR7smDh97HxS4I8cbl+7ru9J0b/Gi626jH60zCwXEhmQ77Q/c0x/O+iKLqa2f8FZmexdT0P61dI65fkYuG9zcvE/pGPY2HN9zmBwsYbKLWO2/TousXjXTautYbczDo6e26h3vfVkgNO50bWb2nblN2j+b/wDPau9JzOv/AFU6n9pwzjVUdWfWy91zS+uuw73Cl3puZe2ut73+9n5ixZ8tKMOMCRr5vSY8P+F+k9Rj57HPL7ZMBf8ANkZIzOTTi+T9B9wSXM/Uz6x9X60/qdHVcWrGv6beMd3oEuYXwfWr9Qus3WVOb79v766ZQNtS8s67i5v1h+uXWG4jmYOV0pmIzCvucGVm2uxuSz1/pvfbbvt+zO2fzbP0i9ReHFpDTtcQYdEwfGF4D1zpRo66Om9Zstf1A3Opysx5J9Vth3YOfW632tbtPpPq3/4NECyAOui2chGJkdogyNeD7ziuvZhVOzXNF7amnIcIDd4aPWd+7t3KlldI+r3XsKb8bHzcbJG9tzQ07pG31qsir379v+FqsXimGPrN1PI/5udPzc7P6XjuLcgUA6Vuhl7Nj7WVPq9n6Gq+/wBFe1/VqzGd0bHqxcXIwqcZv2dlGWz07QKv0cvaNzHbtv8AOM+mkQQSD0TGQlESG0hYscO/hJ5Z9Lv8X3U68hgvy/q5nbaLXPcLH4lu79E7c7a5+Lbu/sf1/TrtSvfXPM6b9YOiWdC6ZkVZ2Xm3UUt+zuFoqPqix+Re6rd6ddNePdv/AO2/8IklxSu7N7XaPbhVcMaviqtOLfif/9Hruk/U+zpd+Rg+uzqH1fzd912JmMa+1uQ5zXtsbcGfrDH7ff6/6St9dXprg2dE6l9VftGN1Dp9rcZ9rrKM3FacitzNAyu59f6avZ/g/XrrXsF1oppfa4EitpcQOYaNyw+k/Xj6t9VsdRVlDHyWO2nHyv0NhMw3Y23+c3f8GpMWSeKXuR/u67MHMYMfMQOGZOtS9JqWnV84b9YejGw1uyPReORcx7P+qaot+snQnNLhltAbyC14Jj90bPcvX8jC6fntrOTRVktrc22o2Na8Nc3Wuxm7d7m/muUnYGC9wc7Hqc5p3NcWNJB/eGitf6Sy/uw/53/fNA/A+X/fyfbD/vHx7/nH0cxttssDhMsqeR8D7R7kWjrfR74FeXWHExssJrdPh+k2r2IAAAAQBoAFndU+rnQur1vr6jg05HqCDY5gFg7bmXti5jv6j0h8Sy3rGJH1VL4Hy9emeQHueGX/AHL54QRodEy0X/4tuu9PPo9F6pVbhyS2rOrJcz+Q22nd6n/gSfE/xc/WS+2eqdbbTQP8Hg1w4/8AXbGs9P8AzLFY/wBI4uEHhlfb+1pf6E5jiIEocPSVy1/weFzU/YngDUk6ADzK6H/xs8dpBq611IEcb7K3j+011PuVcf4sHZNmO3q/VHZuNj2Fz6m1mn1mEfzV/o3fTa/6N7P8GgfiWOjUJX0HT7Vw+B5uIA5IcPUji4h/g/8AoTy131g6PS4sdkh5aJd6TXWBv9Z1YLFV6k7D6r9ifiX4+WKLRccGyz0/WGk1fm2Vv02L2HpfQ+kdIpNHTMSrFrfG8Vt1dtG1vqPPvs/trzn66/4u/rR1nrLs7ErwW1EuFYoHou2gufXZlFw/TZNk/pLNyrz5+U4yhOA4Jfukxl/jN3H8IhilHJjyyGSGtzEZw/xPT/03Rwv8ZlvTHHH+svT7GZOTYXYpwWNexzDtaKvfa177mO9v8tdB9ZPrlg9G6Gcxx9LPyKicLCuj1TYfa31aqy/ayt/89/239Nclif4mG3YrbOpdTuGY9jSWNa17a3Efpmbnud6/u/m3t9FbHTP8Un1cx3+r1N9vU7OzXn0amnn9HRjbNv8AU9TYqcuGzwgiPQHUuljExEDIRKf6RiOGP+L6mt9RMv629e6C94z/ALHW2yxrc62v7RfbaXNte+tt+3Grw2bn0NrYz/tv01qdU6J0n684dWfiZVmLbX6uJbc1kPNe415eHbRd/NOc9vtd/OMXU4+PRi0V42NW2qiloZXWwQ1rRo1rWrnPqvj/ALM6/wDWDpjiP0+Q3qVAEAenkhzHw3811d2O9j/+toLni6afrj/i2wsos+x29Muy2sqfa1z3vc/RtsY7q7a/0NXvZa/6f80u+6l1rP6Z9VsrqvU8Jpy8Wt3qY1T/AFK3kO9JljHlrX/Z7Z9b9JX6tVX01r5OJi5bGsyamXMre21jXgOAew7q7IP5zHfRU7ba6an22uDK62l73HQBrRuc4pKfOf8AFli5Wdn2daz4ps9FopxqgK2bSX1MttqYG/zdH6DEq/wVH/CJLc+pmTiZednZeEXHFyGtsoLhtOxznlstKSt+zj97g14ODi/rfzfHxOf95zfdvd09z3eCv0K972uD/wBCf//S9N6j/wAn5P8AxNn/AFLl5bdj4+VWGZNTL2gaCxodH9Un3N/sr1LqH/J+T/xNn/UuXmLeB8Fp/DQDDIDrqHC+OEjJhINECWoaNPSjgvF3RszI6XcO9VjnMdpH6Smx3vWxh/Wz68YLWstfhdWrbJcbA6i537rd7NtH/gSqpKxPk8E/0OH+56fw+VpYvifN49Bk4x2yfrP+d8//ADnep/xnsY9repdFzcVrh/OU7choP50mv0/0f8v/AKCJd/jS6WLCzE6b1HKgwHtoDGH4G17X/wCfWueBI4MJFzjySVD/AKNx3pOVfRtD45mrXFC+9yr/ABXqOnfX+vJss+2dNyMGoAGp73Me55/ODqWO3VbVbs+u3Tm/zVNz/GQ1v/fnLi0k+Pw/AN+KXmf+9YpfGeaN1wR8o/8AfcTtu/xi9YZe5p6AbKd0Msryq5LJ+l6b62+/b+ZuS6z9eMXLwqPs+dlfVzLbYX7r8Q3tc1gLTXc2j16/Ss3b2v3/AODWInDiJAMA8psvhuI/LKQ86kGSHxzOK44Ql5cUJf8Ad/8ARdKr67/WmnFqznDpfUsRwJrbRZbTk5LWu9M20Y9zXOp2fSu9Sldx0rqDOp9Ox+oV12U15VYtZXaAHgO1bvDS9q8yu9c02DHLW3lp9MvnYHR7S/b+a1dd/izzszO+qGJZlwX1OspZYDO9jHFrH/8Aor/rapc1ywwcNSMuK+lDR0uQ54817hMBAQ4aAPFL1cW71SSSSrN9SxLMH0/rnT1EWx6/T34zqS06+nay9ljLfob2+s/9H+4ttYL3G7671V/Z2OZidNfZ9qJJcx91za20tbu2M9SvHtfu2b0lO8uQ/wAZr73dGxMFljqaOoZlePk2MOprLbbPRj/hnVrr1xn+Mm0OZ0fBA912Z6+8CS1uOxz37Xfmb/UZX/UT8QvJAVdyiK+rHnlw4ckgeHhhKXF+7Ud2X1Fa1uRlMYNrW11ta0cAAua0JJ/qP/Ssv+oz8rklo/8Alw+n/qNxf/LP/hf+pX//0/Teof8AJ+T/AMTZ/wBS5eYt4HwXp3UATgZIGpNT9P7JXDYH1Y6vmNa70xj1kfTu9p/7bE2LR+H5IQhkM5CIsbuL8Yw5MuTFHHAzPDL5Q5SUwusZ9Vej4g3dRzdxGpbubWPu91n/AEkZmT9T8L+ZqZa4dwx1h/z7Nydm+Lcrj0M7PmIf9Jq4/g+c65JQx+BPFL/mvIV1XWmKq3Wf1Gl3/Uq5X0LrNv0cO0T+8Nv/AJ82rpn/AFuwqxtoxrHAcD2sH5XID/rjef5vFaP6zyf+pYqU/wDjDgHy1/z5/wDRi2Y/BsI+fNKX92PD/wB+5LPqn1x/NLGf1nt/75vRm/Uvq55fS34ucfyMVp31u6keKqW/Jx/78hO+tPWDw6pvwZ/e5QS/4xjp+EP++kyj4VyY/wA5LzKh9SOod8ikfAOP8E//ADHzv+5NX+a5QP1m61/pWD/rYTf85etf6Zv/AG21M/5Rn+t/iQ/75d/o3kv3Jf4y9v1Dzban0uyqw2xpY4tDg4Bw2y0/vKH+LV7Ok4h+redXZjdRYbLmCx++u6sPcx1mJD7K6n1f9qcb2f6b/SKQ+svWv9Mz/ttq5d/WrLPrr0+52UGsf1GrfUQGj1DU3Dyr6/8ACU12M9Gn/RZNn6RAfFRzcxEiVgaHhA/6La5XBhwcQxAjjq7PF8r68kkuR+uP1v6Di139Ct6p+z82+oizIrrN/otO3fW9lZ3MyL6XP9D/AEf89/o1K2npcHqGJ1Cg5GI82VB7695a5oLq3Guzb6gbubvb9P6Cyvqy23JyeqdYvpbS/MyXU0wHNc7HxScfHsua923e93rPbsb/ADT1zPTKbrLOhZdbceinqOG/pmH0u99ps+xCMmzKZkUN9mY7Er/T/wCD/mP0v6Vd9iYmPhYtWHisFWPjsbXVWJIa1o2tb7vckpMuF+vthd13pVXtIrx8qzj3Dcaapa7+Uu2vvox6X35FjaaawXWWWENa1o5c97va1q826rV1vr314yr8PG9TAwKXYjL2xsd6ey3Iayx21vr/AGm9rNjf9GpeWIGbGSaAkN2vzsZS5XNGIJkYEADd3fqN/Scv+oz8rklP6l1W05uZVcx1VjWMljwWnl3YpK9Y+/3enDv/ANTcrhP+iOGjxcVV1/nX/9T1DJsdVjW2tjcxjnNniQJXDX9Y6plibsl4Dhqxnsb/ANBdvnf0LI/4p/8A1JXnbHDY3UcBZfxScomERIgEGwDVsWUmwvAmeT4nlOm3DxCW4eIWUxLpJtw8QluHiElLpJtw8QluHiElLpJtw8QluHiElLkgNc5xhrQXOJ7ADc53+auI6/1bN6t1DGwsSj7NZQ71mWFwNwgeqLbrGf0dlFbfX9P/AAX01s/W/qZwsHHZXa+q269p31mHBlfus/6TmLuPq59S/qvXXlW1YGQyy3fiXvynu33VkstdZ7H7PSyvZ9H6df6Gz/CLU+G8sD+vlruIf9EyZcUf0vseh6JmOzuk4mW+d9tTS8lrmy6Ie9rbGsf6b3e+p2z31rmvrR9Sfqrb1X/nT1m77Pj47Wuy6oAqtLDFbrdrfVe5/sr2M/nvoLsa666q21VNDK2ANYxoAaGgQ1rWj6LWrn/rn0mvruPhdEtbkNqysgWW30172MZSDY9mTZvr9D12/o6bP0n6b/BrVZWp9U3X/WDqF31symOrxodi9Fx3CNmPI9bLd/wuW9n9itnprrUPHoqxqK8ehuymlja62Ds1o2Mbr+60LG+t+H1HO6acTHyasPBuBZ1HJe812V1HafVx7P5r2/8Aaiq7+eo/R+rUkp5L65fXOnqnqdN6W8X4NTxXcWs3HKyw7dj9Op3uY12HuZ6vULtmz0f0df8AO/pW6R9q6TSxtOQ/7Rq7IuH59j3Ouudsd7dnqvf7VzbPq1lfVfquPk5os/ZjMy/HoyXAbCX1s+xXt2u/7UM+lb/NM9P+Q9dMSAYJEhZXxPNOM4QiTGIHHY04pfL/AM1iyk2A9Z9XOrZXULLq8oMc6prSLWja4gk+135vZJUvqcQcrKj9xn5XJJ3vZPuHHxnjuuK/VXucO6rPt3etv//V9RyXsrx7bLG72MY5zm8yAJc3VcsPrL9XoEdN/wDA6/711V9TbqbKXEhtjSwkcw4bVz4+pHTQI9e/72/+QU+GPKkH342f0dGnzg5y4/duGqPFx8P/AHTV/wCcv1f/APK3/wADr/vS/wCcv1f/APK3/wADr/vVv/mR03/T3/e3/wAgl/zI6b/p7/vb/wCQUvt/Df3D9jUr4r/q/wDmKw+p9Dy63PZ09rQ07YdXX8eyjkdX6HRaandODiADIrrjVXcP6tYeJW5ldtjg47juLfh2aoZH1Wwr7TY620EgCAWxp/ZWFzGPnPveX2I4/uv+SsQ4/wBHf/nOrAH7tj4wPvP+U/daP7d6D/5W/wDgdf8AeiY/Vuh5Fvpt6cGmCZNdcaI3/NDA/wBNd97f/IIuP9V8Kiz1G22kwRBLY1/sqOeLn+E8McfFWmkN0YweOPGBw36v7qDJ6h0TGY1zuntcHGNK6/Ce6r/t3oP/AJW/+B1/3rSyfq5iZLWtfZYA0yII+H7qr/8ANDA/0133t/8AIIY8XxHh/WRxcXgMa7MBxn2h6OltF3UPqxlX0m7pFdljHD0XvqqcWEmdzCfoe791bF3X8emp1hqeQwSQIn/qlXZ9UsFj2vF10tIIkt7f2FZu6Di3VOrdZYA8QSCJ/wCpSmPiolEY/bEP0vkX4uHgn7nz/wCTpp/88MP/ALj3f9H/AMml/wA8MP8A7j3f9H/yaf8A5oYH+mu+9v8A5BL/AJoYH+mu+9v/AJBS/wDCP9X/AJrD+s8G3V13HtrbYK3gPAIBjv8ANZOd9Z+iZLhTmYDsgUWb2CxrHgPbLW2Na930lr1dCxqq21iywhgABJHb+yqD/qX0573PN1wLiSYLe/8AYVr4X7/Hl/0hXBQ9n2/P1cXAt5/3vbx/c64/8rx+XTia2V9a+i5lBx8vAdkUEgmq1tb2y07mHY9xb7XKH/OX6vnU9N/6Ff8Aerf/ADI6b/p7/vb/AOQS/wCZHTf9Pf8Ae3/yC1DH4cd4k+dufXxb/V/8xs9B6p03OtubhYv2ZzGtL3bWtkEmB+jSRukdAxek2WWUWWPNoDXB5B4M6bWt8UlDw8r7tcP6jtXWv+/bVc591r0/eb/q8Hzf94//1u36z9UqOq3W5Leo9QwciwAB2LkvYwFo2t/V5NX9favGvrJlfXP6vdWu6XmdXzXOqh1dgyLQ2ys/zdrP0n53/QevoNcP/jV+qv7Z6L+0sZm7P6aC8ADV9PN1X8r0/wCer/65/pElN36k9L6dd0/C65jZ+fmuuq1GVlPtaHEbLq306U7qrA5n0V1a8d/xPfWn7JnP+r2U+KMwmzEJ4bcB76/+v1t/7dZ/wq9iSUpYP1m6N07Jpt6nm52bgMxaSX2YmS+kBjN1m702n0nWa/uLeXnX+MXqOX13quJ9RukO/S5Dm2dRsGoYwfpGMtj8ytn61b/1hJTzn1F6b9aPrVmW22dZ6jj9Hx3Q+0ZFnqPJ1ZRW4uNfqbPda/b7P+uL1XpHQMbpL7H05GXkOtaGuOVkWX8d2ttc5rHf1Ubo3SMPovTKOm4TdtGO0NB7ud+fa/8A4Sx/verqSnP6v0XH6sytl92RR6RLmnGufQSSI95pc3evKv8AGRidX+quZiHp3Wuouxs1ryGW5Nji11ZZu2va5ns22sXsq8p/x5/S6N8Mn/3WSUj/AMW3SupfWfHys/qnWepGmiwVV01ZVjdztu97rHbnO/PZ9DYvTuldLo6XjHGosuuYXF5fkWvufJj/AAlxc7b7forhv8SX/iezv/Dh/wDPVK9FSUpc11T6l2Z+Rfk1de6tiWXEubVVkxQwnhrMcMb+ib+56q6VJJT83ZnW/rNjZ92FZ1fMc+i11LnfaLYJY41k/wA55L2Wv/F7iNrDX9Z6u98av+2OBn4NbtXifXP/ABR9Q/8ADt3/AJ9evpdJTw3UvqH9Ysep1v1f+svUBczVtGZc6xjj+76jdrWf2qLFyfSf8a31m6NnuwfrFV9sZS815DS1teQwg7XbHV7KbNn/AAjP0n+nXsj3srY6yxwYxgLnOcYAA1LnEr57+tTj9ZfrrnO6JU7L+02htAqE79jGUutH/BudX6nqfuJKfoDDy8fNxKczFeLKMhjbKnju1w3NSVH6sdKs6P8AV/A6Zc4PtxqQ2xw43n3vDf5LXu2pJKf/1/VU3OhTpJKfAv8AGB9W7fqt9YxfhA1YmQ77Tg2N09NzXbn0tP72PZt2f8H6S9h+pv1lp+snQqM9sDIb+iy6x+ba0e/+xZ/O1/yHof13+rLPrJ0G7CaB9rr/AEuG86Ra0aM3fuXN/RPXkn+Lr6z2fVr6w/ZswmvCzHDHy2P0Fbwdtd7gfo+i/wBln/Beokp9k+tX1hx/q50TI6ndDnsGzHqP59rv5qv/AL8//g1g/wCLb6uZGJiXfWHqsv6v1k+q9zx7mVPPqNZ/Jdd/PWf9ar/waynH/n/9dhWPf9XPq+6XHll90/5r22PZ/wCw1X/dhelJKUkkkkpS8p/x5/S6N8Mn/wB1l6svKf8AHn9Lo3wyf/dZJTo/4kv/ABPZ3/hw/wDnqleirzr/ABJf+J7O/wDDh/8APVK9FSUpJJJJT8zdeBP1h6iAYJzLoP8A1169vZ9V/rV6QbZ9asguAAluNQB/35//AE14h1z/AMUfUP8Aw7d/59evpgcJKfN/rD/i0+tfU6iD9ZH5w5GPkh9dc/Cl91f/AIAudxPrV9Z/qDezpmb0jErYGtBLaxW+5rdPW+20Fzb3/wAt7bV7WuM/xtYWNkfU6/ItA9bDsqsoeeQXPZQ9oP8ALrsSU6v1T+uXSvrTiutwyasmmPtGLZG9k/nAj+cqd+bZ/wBQkvJP8UzskfXXFFE7HVXDI8PT2OPu/wCvilJJT//Q9VSXyqkkp+ql4x/jb+qz8XrlHVMGour6s7Y9jRP6yNNB/wB2W+7/AIz1V54kkp+jvqb9XKvq30Gjp7QDkEerl2D865w/Sf2a/wCar/kVrcXyqkkp+qkl8qpJKfprq/XMLo9db8sXO9YltbaKbLnEgbjpQx+3+2vKP8ZfUOofWjMwx03pWf8AZsJjx6lmNY0udYWbtrNrvY1tTPpLzxJJT6f/AItOtZf1axsvA6r0vPZVfYLqrq8axwB2+nY2xu3f+YzZtXp3SurYnVsU5WILBWHFhF1b6nBzY3fo72sd+cvmJJJT9VLC6x9b+n9JyLMV2NmZWTW0ONeNj2WA7huY0XbRT/4IvnJJJTr53RvrFmZuRmO6VltORa+0t9C0wXuNkT6f8pesdB/xivb0+mnrnSuoY+ZUwMstZjPfW8tG31Bo2xjn/nM9NeIJJKfoF/1/wi2cXpXVctx4bVhv/wCqs9Ncx9YsD6//AF5dXifs8dG6QxweG5NgD3uGjX3hm672/mUto2f8YvJUklP0L9TPqN076qY7zU85OdeAMjKcI0GvpUs19Or/AM+f9t7EvnpJJT//2f/tKdpQaG90b3Nob3AgMy4wADhCSU0EBAAAAAAADxwBWgADGyVHHAIAAAIAAgA4QklNBCUAAAAAABD84R+JyLfJeC80YjQHWHfrOEJJTQQ6AAAAAAEZAAAAEAAAAAEAAAAAAAtwcmludE91dHB1dAAAAAUAAAAAUHN0U2Jvb2wBAAAAAEludGVlbnVtAAAAAEludGUAAAAAQ2xybQAAAA9wcmludFNpeHRlZW5CaXRib29sAAAAAAtwcmludGVyTmFtZVRFWFQAAAAbAFwAXAB0AG8AdABvAFwAQwBhAG4AbwBuACAARgBsAG8AbwByACAAMQAgAEMAbwBsAG8AcgAAAAAAD3ByaW50UHJvb2ZTZXR1cE9iamMAAAAMAFAAcgBvAG8AZgAgAFMAZQB0AHUAcAAAAAAACnByb29mU2V0dXAAAAABAAAAAEJsdG5lbnVtAAAADGJ1aWx0aW5Qcm9vZgAAAAlwcm9vZkNNWUsAOEJJTQQ7AAAAAAItAAAAEAAAAAEAAAAAABJwcmludE91dHB1dE9wdGlvbnMAAAAXAAAAAENwdG5ib29sAAAAAABDbGJyYm9vbAAAAAAAUmdzTWJvb2wAAAAAAENybkNib29sAAAAAABDbnRDYm9vbAAAAAAATGJsc2Jvb2wAAAAAAE5ndHZib29sAAAAAABFbWxEYm9vbAAAAAAASW50cmJvb2wAAAAAAEJja2dPYmpjAAAAAQAAAAAAAFJHQkMAAAADAAAAAFJkICBkb3ViQG/gAAAAAAAAAAAAR3JuIGRvdWJAb+AAAAAAAAAAAABCbCAgZG91YkBv4AAAAAAAAAAAAEJyZFRVbnRGI1JsdAAAAAAAAAAAAAAAAEJsZCBVbnRGI1JsdAAAAAAAAAAAAAAAAFJzbHRVbnRGI1B4bEBywAAAAAAAAAAACnZlY3RvckRhdGFib29sAQAAAABQZ1BzZW51bQAAAABQZ1BzAAAAAFBnUEMAAAAATGVmdFVudEYjUmx0AAAAAAAAAAAAAAAAVG9wIFVudEYjUmx0AAAAAAAAAAAAAAAAU2NsIFVudEYjUHJjQFkAAAAAAAAAAAAQY3JvcFdoZW5QcmludGluZ2Jvb2wAAAAADmNyb3BSZWN0Qm90dG9tbG9uZwAAAAAAAAAMY3JvcFJlY3RMZWZ0bG9uZwAAAAAAAAANY3JvcFJlY3RSaWdodGxvbmcAAAAAAAAAC2Nyb3BSZWN0VG9wbG9uZwAAAAAAOEJJTQPtAAAAAAAQASwAAAABAAIBLAAAAAEAAjhCSU0EJgAAAAAADgAAAAAAAAAAAAA/gAAAOEJJTQQNAAAAAAAEAAAAHjhCSU0EGQAAAAAABAAAAB44QklNA/MAAAAAAAkAAAAAAAAAAAEAOEJJTQQKAAAAAAABAAA4QklNJxAAAAAAAAoAAQAAAAAAAAACOEJJTQP1AAAAAABIAC9mZgABAGxmZgAGAAAAAAABAC9mZgABAKGZmgAGAAAAAAABADIAAAABAFoAAAAGAAAAAAABADUAAAABAC0AAAAGAAAAAAABOEJJTQP4AAAAAABwAAD/////////////////////////////A+gAAAAA/////////////////////////////wPoAAAAAP////////////////////////////8D6AAAAAD/////////////////////////////A+gAADhCSU0ECAAAAAAAEAAAAAEAAAJAAAACQAAAAAA4QklNBB4AAAAAAAQAAAAAOEJJTQQaAAAAAANLAAAABgAAAAAAAAAAAAAAmAAAAJgAAAALAFYASQBCAF8AcgBnAGIAXwBwAG8AcwAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAmAAAAJgAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAQAAAAAAAG51bGwAAAACAAAABmJvdW5kc09iamMAAAABAAAAAAAAUmN0MQAAAAQAAAAAVG9wIGxvbmcAAAAAAAAAAExlZnRsb25nAAAAAAAAAABCdG9tbG9uZwAAAJgAAAAAUmdodGxvbmcAAACYAAAABnNsaWNlc1ZsTHMAAAABT2JqYwAAAAEAAAAAAAVzbGljZQAAABIAAAAHc2xpY2VJRGxvbmcAAAAAAAAAB2dyb3VwSURsb25nAAAAAAAAAAZvcmlnaW5lbnVtAAAADEVTbGljZU9yaWdpbgAAAA1hdXRvR2VuZXJhdGVkAAAAAFR5cGVlbnVtAAAACkVTbGljZVR5cGUAAAAASW1nIAAAAAZib3VuZHNPYmpjAAAAAQAAAAAAAFJjdDEAAAAEAAAAAFRvcCBsb25nAAAAAAAAAABMZWZ0bG9uZwAAAAAAAAAAQnRvbWxvbmcAAACYAAAAAFJnaHRsb25nAAAAmAAAAAN1cmxURVhUAAAAAQAAAAAAAG51bGxURVhUAAAAAQAAAAAAAE1zZ2VURVhUAAAAAQAAAAAABmFsdFRhZ1RFWFQAAAABAAAAAAAOY2VsbFRleHRJc0hUTUxib29sAQAAAAhjZWxsVGV4dFRFWFQAAAABAAAAAAAJaG9yekFsaWduZW51bQAAAA9FU2xpY2VIb3J6QWxpZ24AAAAHZGVmYXVsdAAAAAl2ZXJ0QWxpZ25lbnVtAAAAD0VTbGljZVZlcnRBbGlnbgAAAAdkZWZhdWx0AAAAC2JnQ29sb3JUeXBlZW51bQAAABFFU2xpY2VCR0NvbG9yVHlwZQAAAABOb25lAAAACXRvcE91dHNldGxvbmcAAAAAAAAACmxlZnRPdXRzZXRsb25nAAAAAAAAAAxib3R0b21PdXRzZXRsb25nAAAAAAAAAAtyaWdodE91dHNldGxvbmcAAAAAADhCSU0EKAAAAAAADAAAAAI/8AAAAAAAADhCSU0EEQAAAAAAAQEAOEJJTQQUAAAAAAAEAAAAAThCSU0EDAAAAAAglQAAAAEAAACYAAAAmAAAAcgAAQ7AAAAgeQAYAAH/2P/tAAxBZG9iZV9DTQAC/+4ADkFkb2JlAGSAAAAAAf/bAIQADAgICAkIDAkJDBELCgsRFQ8MDA8VGBMTFRMTGBEMDAwMDAwRDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAENCwsNDg0QDg4QFA4ODhQUDg4ODhQRDAwMDAwREQwMDAwMDBEMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwM/8AAEQgAmACYAwEiAAIRAQMRAf/dAAQACv/EAT8AAAEFAQEBAQEBAAAAAAAAAAMAAQIEBQYHCAkKCwEAAQUBAQEBAQEAAAAAAAAAAQACAwQFBgcICQoLEAABBAEDAgQCBQcGCAUDDDMBAAIRAwQhEjEFQVFhEyJxgTIGFJGhsUIjJBVSwWIzNHKC0UMHJZJT8OHxY3M1FqKygyZEk1RkRcKjdDYX0lXiZfKzhMPTdePzRieUpIW0lcTU5PSltcXV5fVWZnaGlqa2xtbm9jdHV2d3h5ent8fX5/cRAAICAQIEBAMEBQYHBwYFNQEAAhEDITESBEFRYXEiEwUygZEUobFCI8FS0fAzJGLhcoKSQ1MVY3M08SUGFqKygwcmNcLSRJNUoxdkRVU2dGXi8rOEw9N14/NGlKSFtJXE1OT0pbXF1eX1VmZ2hpamtsbW5vYnN0dXZ3eHl6e3x//aAAwDAQACEQMRAD8A9RvtFNFlxEitrnkDk7RuXOj684ZE/Zrfvb/et7qH/J+T/wATZ/1Ll5i3gfBXuS5fHljMzF0RWtOV8U53Ny8sYxEDiBuxxPY/8+MP/uNb97f/ACSX/PjD/wC41v3t/wDJLjklc+4cv+6f8Yub/pfnP3o/4sXsf+fGH/3Gt+9v/kkv+fGH/wBxrfvb/wCSXHJJfcOX/dP+MVf6X5z96P8Aixex/wCfGH/3Gt+9v/kkv+fGH/3Gt+9v/klxySX3Dl/3T/jFX+l+c/ej/ixex/58Yf8A3Gt+9v8A5JL/AJ8Yf/ca372/+SXHIVn22zMw8HDZWH5thqF9+411ujdWLGUfpf030GfmJk+T5aETOUTwx31kV+L4lz2XJHHCUTKZoWIR/wCk9t/z4w/+41v3t/8AJLG+tX1gs6306npeDjXxlZNLMsMI3HH3fp2tFbt79/0Xt/cUG/Uj602ZDabMrDx8bXfl0te+wiPaGYmR+iZ+k/4dEwPqh1w9Uuw894bhVMDqeqY8VveT+azHc670Mit3u9X+bVY/cSCBxRNaS9W7fifioMZSEJR4qlD08XD+8x6x0foeHnu6Z9WsLPHVwGW3M6bkvxaWNef0f23Ie9+PQ2xgs9NldPrLXxOi/XRmOwHrdWM6s+zH9E5bduvtvzcx7My9+5387+iWv0boWF0dt/2d1tt2U/1cnJyHmy2xwAY31LXfuNb7GfQWiqLqvN3dV+tnSKnW9TwKOqUN/wAL01xZdtA74GXu9Wz/AML5X/WkOn6/9NyKWX0UWWVWCWPBbr+Ptc389q2etdIxes9Otwcj27vdTc36dVrf5nJod9Jl1L/cxeT2Xv6VnOp6oK8O55NWdSwaDKrAdTnV01j2U9VxDv8A0e9lmXVd/NqflvaM+HKPTL9K+HhLV548xHEZ8ufXDUw4ePjj/V/rPoX/AD4w/wDuNb97f/JJf8+MP/uNb97f/JLgj1jprQS61wa3RzzVaGgkbg17vS9r3N9yLR1DAyXbKMit7/8ARztf/wBtWbLP+itCPK8nI1EgnsJ248+f+JQFzjKI7yxcI/GL6R0fr9HVrLa6qn1GoBxL41kkfm/BJYv1HBGVlg6HYzT5uSVb7vj+9+1Xora/6nE3fvub/R33ix7l71p/OcPyv//Q9N6h/wAn5P8AxNn/AFLl5i3gfBaf1o/xlPqyczpvSsP1MbFeMbqHVLm2OopLz6Nn6LHb6jtjvZ/Oe+xn6Ouxc/03qVeab6Q+uyzFcGuto3Gl7XCa7aTaG2N3f6Oz3rR+G5IjigT6pax/wXF+N4ZyEMoFwh6ZH93i+VupJJLTcJSSSSSlJJJJKUms6nZ0mp/UarBTZjjcx7gS3d9FrHsaWue2z6GxOqHXMG7P6c+iiPVa5tjGkw1xZ/g3f1kzLftzocR4TUe7Jg4fex8UuCPHG5fu67vSdG/xoutuox+tMwsFxIZkO+0P3NMfzvoii6mtn/BWZnsXU9D+tXSOuX5GLhvc3LxP6Rj2Nhzfc5gcLGGyi1jtv06LrF4102rrWG3Mw6Ontuod731ZIDTudG1m9p25Tdo/m/8Az2rvSczr/wBVOp/acM41VHVn1svdc0vrrsO9wpd6bmXtrre9/vZ+YsWfLSjDjAka+b0mPD/hfpPUY+exzy+2TAX/ADZGSMzk04vk/QfcElzP1M+sfV+tP6nR1XFqxr+m3jHd6BLmF8H1q/ULrN1lTm+/b++umUDbUvLOu4ub9Yfrl1huI5mDldKZiMwr7nBlZtrsbks9f6b32277fsztn82z9IvUXhxaQ07XEGHRMHxheA9c6UaOujpvWbLX9QNzqcrMeSfVbYd2Dn1ut9rW7T6T6t/+DRAsgDrotnIRiZHaIMjXg+84rr2YVTs1zRe2ppyHCA3eGj1nfu7dypZXSPq917Cm/Gx83GyRvbc0NO6Rt9arIq9+/b/harF4phj6zdTyP+bnT83Oz+l47i3IFAOlboZezY+1lT6vZ+hqvv8ARXtf1asxndGx6sXFyMKnGb9nZRls9O0Cr9HL2jcx27b/ADjPppEEEg9ExkJREhtIWLHDv4SeWfS7/F91OvIYL8v6uZ22i1z3Cx+Jbu/RO3O2ufi27v7H9f067Ur31zzOm/WDolnQumZFWdl5t1FLfs7haKj6osfkXuq3enXTXj3b/wDtv/CJJcUruze12j24VXDGr4qrTi34n//R67pP1Ps6XfkYPrs6h9X83fddiZjGvtbkOc17bG3Bn6wx+33+v+krfXV6a4NnROpfVX7RjdQ6fa3Gfa6yjNxWnIrczQMrufX+mr2f4P16617BdaKaX2uBIraXEDmGjcsPpP14+rfVbHUVZQx8ljtpx8r9DYTMN2Nt/nN3/BqTFknil7kf7uuzBzGDHzEDhmTrUvSalp1fOG/WHoxsNbsj0XjkXMez/qmqLfrJ0JzS4ZbQG8gteCY/dGz3L1/Iwun57azk0VZLa3NtqNjWvDXN1rsZu3e5v5rlJ2BgvcHOx6nOadzXFjSQf3horX+ksv7sP+d/3zQPwPl/38n2w/7x8e/5x9HMbbbLA4TLKnkfA+0e5Fo630e+BXl1hxMbLCa3T4fpNq9iAAAAEAaABZ3VPq50Lq9b6+o4NOR6gg2OYBYO25l7YuY7+o9IfEst6xiR9VS+B8vXpnkB7nhl/wBy+eEEaHRMtF/+LbrvTz6PReqVW4cktqzqyXM/kNtp3ep/4EnxP8XP1kvtnqnW200D/B4NcOP/AF2xrPT/AMyxWP8ASOLhB4ZX2/taX+hOY4iBKHD0lctf8Hhc1P2J4A1JOgA8yuh/8bPHaQautdSBHG+yt4/tNdT7lXH+LB2TZjt6v1R2bjY9hc+ptZp9ZhH81f6N302v+jez/BoH4ljo1CV9B0+1cPgebiAOSHD1I4uIf4P/AKE8td9YOj0uLHZIeWiXek11gb/WdWCxVepOw+q/Yn4l+Plii0XHBss9P1hpNX5tlb9Ni9h6X0PpHSKTR0zEqxa3xvFbdXbRtb6jz77P7a85+uv+Lv60dZ6y7OxK8FtRLhWKB6LtoLn12ZRcP02TZP6Szcq8+flOMoTgOCX7pMZf4zdx/CIYpRyY8shkhrcxGcP8T0/9N0cL/GZb0xxx/rL0+xmTk2F2KcFjXscw7Wir32te+5jvb/LXQfWT65YPRuhnMcfSz8ionCwro9U2H2t9Wqsv2srf/Pf9t/TXJYn+Jht2K2zqXU7hmPY0ljWte2txH6Zm57nev7v5t7fRWx0z/FJ9XMd/q9Tfb1Ozs159Gpp5/R0Y2zb/AFPU2KnLhs8IIj0B1LpYxMRAyESn+kYjhj/i+prfUTL+tvXugveM/wCx1tssa3Otr+0X22lzbXvrbftxq8Nm59Da2M/7b9NanVOidJ+vOHVn4mVZi21+riW3NZDzXuNeXh20XfzTnPb7XfzjF1OPj0YtFeNjVtqopaGV1sENa0aNa1q5z6r4/wCzOv8A1g6Y4j9PkN6lQBAHp5Icx8N/NdXdjvY//raC54umn64/4tsLKLPsdvTLstrKn2tc973P0bbGO6u2v9DV72Wv+n/NLvupdaz+mfVbK6r1PCacvFrd6mNU/wBSt5DvSZYx5a1/2e2fW/SV+rVV9Na+TiYuWxrMmplzK3ttY14DgHsO6uyD+cx30VO22ump9trgyutpe9x0Aa0bnOKSnzn/ABZYuVnZ9nWs+KbPRaKcaoCtm0l9TLbamBv83R+gxKv8FR/wiS3PqZk4mXnZ2XhFxxchrbKC4bTsc55bLSkrfs4/e4NeDg4v6383x8Tn/ec33b3dPc93gr9Cve9rg/8AQn//0vTeo/8AJ+T/AMTZ/wBS5eW3Y+PlVhmTUy9oGgsaHR/VJ9zf7K9S6h/yfk/8TZ/1Ll5i3gfBafw0AwyA66hwvjhIyYSDRAlqGjT0o4Lxd0bMyOl3DvVY5zHaR+kpsd71sYf1s+vGC1rLX4XVq2yXGwOoud+63ezbR/4EqqSsT5PBP9Dh/uen8PlaWL4nzePQZOMdsn6z/nfP/wA53qf8Z7GPa3qXRc3Fa4fzlO3IaD+dJr9P9H/L/wCgiXf40uliwsxOm9RyoMB7aAxh+Bte1/8An1rngSODCRc48klQ/wCjcd6TlX0bQ+OZq1xQvvcq/wAV6jp31/rybLPtnTcjBqABqe9zHuefzg6ljt1W1W7Prt05v81Tc/xkNb/35y4tJPj8PwDfil5n/vWKXxnmjdcEfKP/AH3E7bv8YvWGXuaegGyndDLK8quSyfpem+tvv2/mbkus/XjFy8Kj7PnZX1cy22F+6/EN7XNYC013No9ev0rN29r9/wDg1iJw4iQDAPKbL4biPyykPOpBkh8cziuOEJeXFCX/AHf/AEXSq+u/1ppxas5w6X1LEcCa20WW05OS1rvTNtGPc1zqdn0rvUpXcdK6gzqfTsfqFddlNeVWLWV2gB4DtW7w0vavMrvXNNgxy1t5afTL52B0e0v2/mtXXf4s87MzvqhiWZcF9TrKWWAzvYxxax//AKK/62qXNcsMHDUjLivpQ0dLkOePNe4TAQEOGgDxS9XFu9UkkkqzfUsSzB9P6509RFsev09+M6ktOvp2svZYy36G9vrP/R/uLbWC9xu+u9Vf2djmYnTX2faiSXMfdc2ttLW7tjPUrx7X7tm9JTvLkP8AGa+93RsTBZY6mjqGZXj5NjDqay22z0Y/4Z1a69cZ/jJtDmdHwQPddmevvAktbjsc9+135m/1GV/1E/ELyQFXcoivqx55cOHJIHh4YSlxfu1Hdl9RWtbkZTGDa1tdbWtHAALmtCSf6j/0rL/qM/K5JaP/AJcPp/6jcX/yz/4X/qV//9P03qH/ACfk/wDE2f8AUuXmLeB8F6d1AE4GSBqTU/T+yVw2B9WOr5jWu9MY9ZH07vaf+2xNi0fh+SEIZDOQiLG7i/GMOTLkxRxwMzwy+UOUlMLrGfVXo+IN3Uc3cRqW7m1j7vdZ/wBJGZk/U/C/mamWuHcMdYf8+zcnZvi3K49DOz5iH/SauP4PnOuSUMfgTxS/5ryFdV1piqt1n9Rpd/1KuV9C6zb9HDtE/vDb/wCfNq6Z/wBbsKsbaMaxwHA9rB+VyA/643n+bxWj+s8n/qWKlP8A4w4B8tf8+f8A0YtmPwbCPnzSl/djw/8AfuSz6p9cfzSxn9Z7f++b0Zv1L6ueX0t+LnH8jFad9bupHiqlvycf+/ITvrT1g8Oqb8Gf3uUEv+MY6fhD/vpMo+FcmP8AOS8yofUjqHfIpHwDj/BP/wAx87/uTV/muUD9Zutf6Vg/62E3/OXrX+mb/wBttTP+UZ/rf4kP++Xf6N5L9yX+Mvb9Q822p9LsqsNsaWOLQ4OAcNstP7yh/i1ezpOIfq3nV2Y3UWGy5gsfvrurD3MdZiQ+yup9X/anG9n+m/0ikPrL1r/TM/7bauXf1qyz669PudlBrH9Rq31EBo9Q1Nw8q+v/AAlNdjPRp/0WTZ+kQHxUc3MRIlYGh4QP+i2uVwYcHEMQI46uzxfK+vJJLkfrj9b+g4td/Qreqfs/NvqIsyK6zf6LTt31vZWdzMi+lz/Q/wBH/Pf6NStp6XB6hidQoORiPNlQe+veWuaC6txrs2+oG7m72/T+gsr6sttycnqnWL6W0vzMl1NMBzXOx8UnHx7Lmvdt3vd6z27G/wA09cz0ym6yzoWXW3Hop6jhv6Zh9LvfabPsQjJsymZFDfZmOxK/0/8Ag/5j9L+lXfYmJj4WLVh4rBVj47G11ViSGtaNrW+73JKTLhfr7YXdd6VV7SK8fKs49w3GmqWu/lLtr76Mel9+RY2mmsF1llhDWtaOXPe72tavNuq1db699eMq/DxvUwMCl2Iy9sbHenstyGssdtb6/wBpvazY3/RqXliBmxkmgJDdr87GUuVzRiCZGBAA3d36jf0nL/qM/K5JT+pdVtObmVXMdVY1jJY8Fp5d2KSvWPv93pw7/wDU3K4T/ojho8XFVdf51//U9QybHVY1trY3MY5zZ4kCVw1/WOqZYm7JeA4asZ7G/wDQXb539CyP+Kf/ANSV52xw2N1HAWX8UnKJhESIBBsA1bFlJsLwJnk+J5Tptw8QluHiFlMS6SbcPEJbh4hJS6SbcPEJbh4hJS6SbcPEJbh4hJS5IDXOcYa0FziewA3Od/mriOv9WzerdQxsLEo+zWUO9ZlhcDcIHqi26xn9HZRW31/T/wAF9NbP1v6mcLBx2V2vqtuvad9ZhwZX7rP+k5i7j6ufUv6r115VtWBkMst34l78p7t91ZLLXWex+z0sr2fR+nX+hs/wi1PhvLA/r5a7iH/RMmXFH9L7HoeiZjs7pOJlvnfbU0vJa5suiHva2xrH+m93vqds99a5r60fUn6q29V/509Zu+z4+O1rsuqAKrSwxW63a31Xuf7K9jP576C7GuuuqttVTQytgDWMaAGhoENa1o+i1q5/659Jr67j4XRLW5DasrIFlt9Ne9jGUg2PZk2b6/Q9dv6Omz9J+m/wa1WVqfVN1/1g6hd9bMpjq8aHYvRcdwjZjyPWy3f8LlvZ/YrZ6a61Dx6KsaivHobsppY2utg7NaNjG6/utCxvrfh9RzumnEx8mrDwbgWdRyXvNdldR2n1cez+a9v/AGoqu/nqP0fq1JKeS+uX1zp6p6nTelvF+DU8V3FrNxyssO3Y/Tqd7mNdh7mer1C7Zs9H9HX/ADv6Vukfauk0sbTkP+0auyLh+fY9zrrnbHe3Z6r3+1c2z6tZX1X6rj5OaLP2YzMvx6MlwGwl9bPsV7drv+1DPpW/zTPT/kPXTEgGCRIWV8TzTjOEIkxiBx2NOKXy/wDNYspNgPWfVzq2V1Cy6vKDHOqa0i1o2uIJPtd+b2SVL6nEHKyo/cZ+VySd72T7hx8Z47riv1V7nDuqz7d3rb//1fUcl7K8e2yxu9jGOc5vMgCXN1XLD6y/V6BHTf8AwOv+9dVfU26mylxIbY0sJHMOG1c+PqR00CPXv+9v/kFPhjypB9+Nn9HRp84OcuP3bhqjxcfD/wB01f8AnL9X/wDyt/8AA6/70v8AnL9X/wDyt/8AA6/71b/5kdN/09/3t/8AIJf8yOm/6e/72/8AkFL7fw39w/Y1K+K/6v8A5isPqfQ8utz2dPa0NO2HV1/Hso5HV+h0Wmp3Tg4gAyK641V3D+rWHiVuZXbY4OO47i34dmqGR9VsK+02OttBIAgFsaf2Vhcxj5z73l9iOP7r/krEOP8AR3/5zqwB+7Y+MD7z/lP3Wj+3eg/+Vv8A4HX/AHomP1boeRb6benBpgmTXXGiN/zQwP8ATXfe3/yCLj/VfCos9RttpMEQS2Nf7Kjni5/hPDHHxVppDdGMHjjxgcN+r+6gyeodExmNc7p7XBxjSuvwnuq/7d6D/wCVv/gdf960sn6uYmS1rX2WANMiCPh+6q//ADQwP9Nd97f/ACCGPF8R4f1kcXF4DGuzAcZ9oejpbRd1D6sZV9Ju6RXZYxw9F76qnFhJncwn6Hu/dWxd1/HpqdYankMEkCJ/6pV2fVLBY9rxddLSCJLe39hWbug4t1Tq3WWAPEEgif8AqUpj4qJRGP2xD9L5F+Lh4J+58/8Ak6af/PDD/wC493/R/wDJpf8APDD/AO493/R/8mn/AOaGB/prvvb/AOQS/wCaGB/prvvb/wCQUv8Awj/V/wCaw/rPBt1ddx7a22Ct4DwCAY7/ADWTnfWfomS4U5mA7IFFm9gsax4D2y1tjWvd9Ja9XQsaqttYssIYAASR2/sqg/6l9Oe9zzdcC4kmC3v/AGFa+F+/x5f9IVwUPZ9vz9XFwLef9728f3OuP/K8fl04mtlfWvouZQcfLwHZFBIJqtbW9stO5h2PcW+1yh/zl+r51PTf+hX/AHq3/wAyOm/6e/72/wDkEv8AmR03/T3/AHt/8gtQx+HHeJPnbn18W/1f/MbPQeqdNzrbm4WL9mcxrS921rZBJgfo0kbpHQMXpNlllFljzaA1weQeDOm1rfFJQ8PK+7XD+o7V1r/v21XOfda9P3m/6vB83/eP/9bt+s/VKjqt1uS3qPUMHIsAAdi5L2MBaNrf1eTV/X2rxr6yZX1z+r3Vrul5nV81zqodXYMi0NsrP83az9J+d/0Hr6DXD/41fqr+2ei/tLGZuz+mgvAA1fTzdV/K9P8Anq/+uf6RJTd+pPS+nXdPwuuY2fn5rrqtRlZT7WhxGy6t9OlO6qwOZ9FdWvHf8T31p+yZz/q9lPijMJsxCeG3Ae+v/r9bf+3Wf8KvYklKWD9ZujdOyabep5udm4DMWkl9mJkvpAYzdZu9Np9J1mv7i3l51/jF6jl9d6rifUbpDv0uQ5tnUbBqGMH6RjLY/MrZ+tW/9YSU859Rem/Wj61ZlttnWeo4/R8d0PtGRZ6jydWUVuLjX6mz3Wv2+z/ri9V6R0DG6S+x9ORl5DrWhrjlZFl/HdrbXOax39VG6N0jD6L0yjpuE3bRjtDQe7nfn2v/AOEsf73q6kpz+r9Fx+rMrZfdkUekS5pxrn0EkiPeaXN3ryr/ABkYnV/qrmYh6d1rqLsbNa8hluTY4tdWWbtr2uZ7NtrF7KvKf8ef0ujfDJ/91klI/wDFt0rqX1nx8rP6p1nqRposFVdNWVY3c7bve6x25zvz2fQ2L07pXS6Ol4xxqLLrmFxeX5Fr7nyY/wAJcXO2+36K4b/El/4ns7/w4f8Az1SvRUlKXNdU+pdmfkX5NXXurYllxLm1VZMUMJ4azHDG/om/uequlSSU/N2Z1v6zY2fdhWdXzHPotdS532i2CWONZP8AOeS9lr/xe4jaw1/WervfGr/tjgZ+DW7V4n1z/wAUfUP/AA7d/wCfXr6XSU8N1L6h/WLHqdb9X/rL1AXM1bRmXOsY4/u+o3a1n9qixcn0n/Gt9ZujZ7sH6xVfbGUvNeQ0tbXkMIO12x1eymzZ/wAIz9J/p17I97K2OsscGMYC5znGAANS5xK+e/rU4/WX665zuiVOy/tNobQKhO/YxlLrR/wbnV+p6n7iSn6Aw8vHzcSnMxXiyjIY2yp47tcNzUlR+rHSrOj/AFfwOmXOD7cakNscON597w3+S17tqSSn/9f1VNzoU6SSnwL/ABgfVu36rfWMX4QNWJkO+04NjdPTc1259LT+9j2bdn/B+kvYfqb9ZafrJ0KjPbAyG/osusfm2tHv/sWfztf8h6H9d/qyz6ydBuwmgfa6/wBLhvOkWtGjN37lzf0T15J/i6+s9n1a+sP2bMJrwsxwx8tj9BW8HbXe4H6Pov8AZZ/wXqJKfZPrV9Ycf6udEyOp3Q57Bsx6j+fa7+ar/wC/P/4NYP8Ai2+rmRiYl31h6rL+r9ZPqvc8e5lTz6jWfyXXfz1n/Wq/8Gspx/5//XYVj3/Vz6vulx5ZfdP+a9tj2f8AsNV/3YXpSSlJJJJKUvKf8ef0ujfDJ/8AdZerLyn/AB5/S6N8Mn/3WSU6P+JL/wAT2d/4cP8A56pXoq86/wASX/iezv8Aw4f/AD1SvRUlKSSSSU/M3XgT9YeogGCcy6D/ANdevb2fVf61ekG2fWrILgAJbjUAf9+f/wBNeIdc/wDFH1D/AMO3f+fXr6YHCSnzf6w/4tPrX1Oog/WR+cORj5IfXXPwpfdX/wCALncT61fWf6g3s6Zm9IxK2BrQS2sVvua3T1vttBc29/8ALe21e1rjP8bWFjZH1OvyLQPWw7KrKHnkFz2UPaD/AC67ElOr9U/rl0r604rrcMmrJpj7Ri2RvZP5wI/nKnfm2f8AUJLyT/FM7JH11xRROx1VwyPD09jj7v8Ar4pSSU//0PVUl8qpJKfqpeMf42/qs/F65R1TBqLq+rO2PY0T+sjTQf8Adlvu/wCM9VeeJJKfo76m/Vyr6t9Bo6e0A5BHq5dg/OucP0n9mv8Amq/5Fa3F8qpJKfqpJfKqSSn6a6v1zC6PXW/LFzvWJbW2imy5xIG46UMft/tryj/GX1DqH1ozMMdN6Vn/AGbCY8epZjWNLnWFm7aza72NbUz6S88SSU+n/wCLTrWX9WsbLwOq9Lz2VX2C6q6vGscAdvp2Nsbt3/mM2bV6d0rq2J1bFOViCwVhxYRdW+pwc2N36O9rHfnL5iSSU/VSwusfW/p/ScizFdjZmVk1tDjXjY9lgO4bmNF20U/+CL5ySSU6+d0b6xZmbkZjulZbTkWvtLfQtMF7jZE+n/KXrHQf8Yr29Ppp650rqGPmVMDLLWYz31vLRt9QaNsY5/5zPTXiCSSn6Bf9f8ItnF6V1XLceG1Yb/8AqrPTXMfWLA+v/wBeXV4n7PHRukMcHhuTYA97ho194Zuu9v5lLaNn/GLyVJJT9C/Uz6jdO+qmO81POTnXgDIynCNBr6VLNfTq/wDPn/bexL56SSU//9kAOEJJTQQhAAAAAABVAAAAAQEAAAAPAEEAZABvAGIAZQAgAFAAaABvAHQAbwBzAGgAbwBwAAAAEwBBAGQAbwBiAGUAIABQAGgAbwB0AG8AcwBoAG8AcAAgAEMAUwA2AAAAAQA4QklNBAYAAAAAAAcACAAAAAEBAP/hDwdodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuMy1jMDExIDY2LjE0NTY2MSwgMjAxMi8wMi8wNi0xNDo1NjoyNyAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6cGhvdG9zaG9wPSJodHRwOi8vbnMuYWRvYmUuY29tL3Bob3Rvc2hvcC8xLjAvIiB4bWxuczp4bXA9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC8iIHhtbG5zOnhtcE1NPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvbW0vIiB4bWxuczpzdFJlZj0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL3NUeXBlL1Jlc291cmNlUmVmIyIgeG1sbnM6c3RFdnQ9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZUV2ZW50IyIgeG1sbnM6ZGM9Imh0dHA6Ly9wdXJsLm9yZy9kYy9lbGVtZW50cy8xLjEvIiB4bWxuczp4bXBSaWdodHM9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9yaWdodHMvIiBwaG90b3Nob3A6TGVnYWN5SVBUQ0RpZ2VzdD0iNDYwQ0YyODkyNkI4NTZEQUIwOUMwMUExQjBBNzkwNzciIHBob3Rvc2hvcDpDb2xvck1vZGU9IjMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENTIE1hY2ludG9zaCIgeG1wOkNyZWF0ZURhdGU9IjIwMDctMDItMjhUMTY6MzQ6MTcrMDE6MDAiIHhtcDpNb2RpZnlEYXRlPSIyMDE0LTA1LTE5VDE2OjEwOjAzKzAyOjAwIiB4bXA6TWV0YWRhdGFEYXRlPSIyMDE0LTA1LTE5VDE2OjEwOjAzKzAyOjAwIiB4bXBNTTpEb2N1bWVudElEPSJ1dWlkOjU4N0M3RTRFQzhENDExREI5NkUzQTBCNjkwN0NCQzAwIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjdDRDA4RDQ1NUZERkUzMTE5MjY4OTU0MTZFNzMyQzc1IiB4bXBNTTpPcmlnaW5hbERvY3VtZW50SUQ9InV1aWQ6NTg3QzdFNEVDOEQ0MTFEQjk2RTNBMEI2OTA3Q0JDMDAiIGRjOmZvcm1hdD0iaW1hZ2UvanBlZyIgeG1wUmlnaHRzOk1hcmtlZD0iRmFsc2UiPiA8eG1wTU06RGVyaXZlZEZyb20gc3RSZWY6aW5zdGFuY2VJRD0idXVpZDo1ODdDN0U0REM4RDQxMURCOTZFM0EwQjY5MDdDQkMwMCIgc3RSZWY6ZG9jdW1lbnRJRD0idXVpZDo1ODdDN0U0Q0M4RDQxMURCOTZFM0EwQjY5MDdDQkMwMCIvPiA8eG1wTU06SGlzdG9yeT4gPHJkZjpTZXE+IDxyZGY6bGkgc3RFdnQ6YWN0aW9uPSJzYXZlZCIgc3RFdnQ6aW5zdGFuY2VJRD0ieG1wLmlpZDo3QkQwOEQ0NTVGREZFMzExOTI2ODk1NDE2RTczMkM3NSIgc3RFdnQ6d2hlbj0iMjAxNC0wNS0xOVQxNjoxMDowMyswMjowMCIgc3RFdnQ6c29mdHdhcmVBZ2VudD0iQWRvYmUgUGhvdG9zaG9wIENTNiAoV2luZG93cykiIHN0RXZ0OmNoYW5nZWQ9Ii8iLz4gPHJkZjpsaSBzdEV2dDphY3Rpb249InNhdmVkIiBzdEV2dDppbnN0YW5jZUlEPSJ4bXAuaWlkOjdDRDA4RDQ1NUZERkUzMTE5MjY4OTU0MTZFNzMyQzc1IiBzdEV2dDp3aGVuPSIyMDE0LTA1LTE5VDE2OjEwOjAzKzAyOjAwIiBzdEV2dDpzb2Z0d2FyZUFnZW50PSJBZG9iZSBQaG90b3Nob3AgQ1M2IChXaW5kb3dzKSIgc3RFdnQ6Y2hhbmdlZD0iLyIvPiA8L3JkZjpTZXE+IDwveG1wTU06SGlzdG9yeT4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgPD94cGFja2V0IGVuZD0idyI/Pv/uAA5BZG9iZQBkQAAAAAH/2wCEAAEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQECAgICAgICAgICAgMDAwMDAwMDAwMBAQEBAQEBAQEBAQICAQICAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDA//AABEIAJgAmAMBEQACEQEDEQH/3QAEABP/xAGiAAAABgIDAQAAAAAAAAAAAAAHCAYFBAkDCgIBAAsBAAAGAwEBAQAAAAAAAAAAAAYFBAMHAggBCQAKCxAAAgEDBAEDAwIDAwMCBgl1AQIDBBEFEgYhBxMiAAgxFEEyIxUJUUIWYSQzF1JxgRhikSVDobHwJjRyChnB0TUn4VM2gvGSokRUc0VGN0djKFVWVxqywtLi8mSDdJOEZaOzw9PjKThm83UqOTpISUpYWVpnaGlqdnd4eXqFhoeIiYqUlZaXmJmapKWmp6ipqrS1tre4ubrExcbHyMnK1NXW19jZ2uTl5ufo6er09fb3+Pn6EQACAQMCBAQDBQQEBAYGBW0BAgMRBCESBTEGACITQVEHMmEUcQhCgSORFVKhYhYzCbEkwdFDcvAX4YI0JZJTGGNE8aKyJjUZVDZFZCcKc4OTRnTC0uLyVWV1VjeEhaOzw9Pj8ykalKS0xNTk9JWltcXV5fUoR1dmOHaGlqa2xtbm9md3h5ent8fX5/dIWGh4iJiouMjY6Pg5SVlpeYmZqbnJ2en5KjpKWmp6ipqqusra6vr/2gAMAwEAAhEDEQA/AN8/fO6qbYuyd4b3raWorqPZ21twbqq6GkaJausptvYmry89LTNOyQrUVEVGUQuwUMRcgezLZdsk3reNp2aGVUmu7mKFWaulTK6oGNM0BappmnDok5m3yDljlvmDmW6haS226xnuXRaamWCJ5WVa41MEIFcVOeqaYf543Tc0MUv+g3tlfLGkmn+JbKOnWoa1/wCNC9r+8t2+5lzcrMv9ctrwf4Z/+gOueLf3mHtqjMjcgbxqBoaSQUqPTIx+Q6yf8PhdOf8APju2P/Pjsr/69e9f8Bpzd/02O1/7zP8A9a+tf8nMvbT/AKYDef8Ae7f/AKC69/w+F05/z47tj/z47K/+vXv3/Aac3f8ATY7X/vM//Wvr3/JzL20/6YDef97t/wDoLr3/AA+F05/z47tj/wA+Oyv/AK9e/f8AAac3f9Njtf8AvM//AFr69/ycy9tP+mA3n/e7f/oLr3/D4XTn/Pju2P8Az47K/wDr179/wGnN3/TY7X/vM/8A1r69/wAnMvbT/pgN5/3u3/6C69/w+F05/wA+O7Y/8+Oyv/r179/wGnN3/TY7X/vM/wD1r69/ycy9tP8ApgN5/wB7t/8AoLr3/D4XTn/Pju2P/Pjsr/69e/f8Bpzd/wBNjtf+8z/9a+vf8nMvbT/pgN5/3u3/AOguvf8AD4XTn/Pju2P/AD47K/8Ar179/wABpzd/02O1/wC8z/8AWvr3/JzL20/6YDef97t/+guvf8PhdOf8+O7Y/wDPjsr/AOvXv3/Aac3f9Njtf+8z/wDWvr3/ACcy9tP+mA3n/e7f/oLr3/D4XTn/AD47tj/z47K/+vXv3/Aac3f9Njtf+8z/APWvr3/JzL20/wCmA3n/AHu3/wCguq2f5p38wHP/AD2+PfXPxK+P/SPfslP3X8ofj/tL5A0Gzc7j6fdeU+Msu9aep7YwmGoNn59dx7hj3FRQwUNfRQAxHGS1D1H7Ak9gn3B+7HznyFyve81fvO03CytSGnSASCSKLNZtLqutFbSrBNTjVqK6QxEnez/36/a/3a572zkEbVe7RuV+NFrJdNH4M9wWAW21oSsUkiljG0pRHZfDDeIyKWz5h/D74PdLd9Zf4r/ytvjJ8+qT5yUuI2V2T2Htn+XV8wO0fiH0j1vtXeWTrodqQfKHuDc28s/1F1NiN2YDH5aoxONw2263cVXQ0pjpo6SKann9429ZudWNdUfC7+c9hev9s0tZ/M+6x6byO0qp49vdRwfH/K/NLblRtc02XmXCdqfJr5Ib42r8ju190NlMlB/ueSTBGCGiCmkqEl8cXuvdKnd/yq/mv/C7amZ3b8qfib0f83etsPUNN/pA/l8bu3H1/wB3UuBocNHPOK/4k/ICsyp39uyvyMU3gpdn78r6qojUsmNjAKreIRGRBM7LETkqAxA9QpZa0/0w6anNwIZTaRo9yFOlXYopNMAuqSFQeFQjfZ0kNl/z9fjf2PtDbfYGwuruy907L3djlym3s9j8ls5YaunEj01XSVdLPmIqzFZvD18UlLkKCpSOroauJ4ZkVl95X7F90/eOZtm27mDYfcDaLrZ7uIPFKi3BVgeIzGCrKaq6MAyOCrAMCOue/NP94VyvyPzNvvJnOPtNzBt3NW2XBhubaVrcPG4ypBDFZIpUIkgmjLRTRMskbEHpS/8AD4XTn/Pju2P/AD47K/8Ar17Nv+A05u/6bHa/95n/AOtfRF/ycy9tP+mA3n/e7f8A6C69/wAPhdOf8+O7Y/8APjsr/wCvXv3/AAGnN3/TY7X/ALzP/wBa+vf8nMvbT/pgN5/3u3/6C6OJ8O/n3sj5j7h3zt7aewN47Nm2LhsJmayp3PVYKohr4s3W5CiigpFxFdWOkkD48sxewIYW+h9xN7sex28+0tjst9um92l2l7LJGohEgKmNVYltarg6qCnp1kR93z70vK/3htx5j2/l7ly9sW22GORzO0baxIzKAoQmlNNcnNf2/wD/0N5n5Cf8yC7w/wDEQdl/+8XmvYr5D/5Xjkz/AKW1p/2kR9R77uf9Op9zv/Fe3H/tDm60VKP/AIB0n/UNB/1qX32pk/tH+0/4evl4uP7ef/Tn/CepPuvTXXvfuvde9+691737r3Xvfuvde9+691737r3QfZ1+6tzdxfG7oXpLA9bwbi+SfYWV6zpe2e4n33W9XdX7ngwjZramP3XtzrCiq97V8vYtTTy43H1atT46lrdAqpY0ZpI4N99/dPmL2n5d2retg5Yhv1uLgxSSzu6wW7UUxrIsdHYz1cIwdVVk0mpYDrK77ov3fuSPvFc77/yxzlz9ebQbC0S4jtrOKJru+jPiCZoZrhZII1tSsbSp4byMkmsaUVj1Z9j/AOSR/NG3J2Jidj7m7y+G/U3UsVRkZNy/Ijqra3YG/wDtTK0i7beqw1Btn489uUFbsLbksu63SkrKqq3XkHWkQzwx3PgfE/d/vge4m4bRFa7Zsu27dvWsl7hA06FfJY4ZqhD5sWaSuAKUNeh3Lv8AdoeyG0c1XG5cwc1cw77yjoAisZpY7KRX/E0t3YpFJKvkiKIgMltR06VV0L/KG+b1T8oux+kPkLuKhwnx92PtXD7k66+enQMuE6w7B7Gy2WipYafA7Z6iy+5OypOq+29m5IT1j5srVYSlko43hpJxUwpGYL97vmC/5N3/AGTfuWLV+Y7i1aCK5hOiECRTG7zW8niVcKSwCt4bN2sgXiVr/dv8lbH7n8rc28o897gnJFpfR3M233YE048J/FSK3vIvCcxMyiJ/HBmRSJUlZwVOwf8ADv4L9L/CbGdpf6Ncp2dvzffeW+afsbunufvLsHLdqdydpbsoNv47a+Iq9274zSRVE2NwGDxiQY7HU0VNjsekkv28EXlfVh/nzNT+X+Sg/YKddJzSuBQelSafKpJJ/Mk+pPRy/futdFU+aXxE6y+cHx53v0D2Yk+MGbgTN9ddjYZGh330h29gYqip637v6wzVNU0GT252J1ruGRK7H1VLU07yKslLKzUtTURSe69189fcW+sx8Q+8sts35Y0HXHx93vuCq3B1r8peu9rUMsVDQ/LjrXF4jKdd/KPaXXW0MZV/3d60+fXQGQpMlJUYSHJ4vMdiYLLyxjHvIKJMp/uze8NjyFuW9ct837uLfk66hM8buGK290mkMajCpNCCGqGOuOPTQkg89vv5fdo3f3b2LlXn72x5Ul3H3U2+6jspoIHiSS8224ZqdsrIjy2dyVkQ+ImmCW4w1RQQKr5f/HOhiyFXXb43RQ4nDy0tLnNxVvSPfdHtrAZKuopspj8Fn8xVdYQx4bPZPDUstfTU1QkfnoIZJ1cqh95fD7yHscZlhHuLZ1IqG0T+H/pS/hUD+YU0JGRjrnC33H/vcLDJMfYvctSsB4f1O3GUgiviKgvSGjHwlg2oOQNFM9LnYffvRPaFcmI6+7j683JuBgb7TbPxbd3tG+pk8Mmxt3x7e3gtTdL+P7EyBSpIs6Fh3y17ichc4iH+rHOG33ssnwxpMolPGn6T6ZM0NO3/AAisRc8+zHvF7ZNc/wCuD7Wb7tUELaXmltXktlNAe66t/GtlFCMtKBxFaq1NiT+R/DNTdofIeCohlp549kbBEkM8bxSxk53cZAeOQK6Eg35H094w/fOxy/yJX/lMuf8Aq3F1n5/dgSxzcxe6MsMivE1ha0KkEH9V+BGD1//R3mfkJ/zILvD/AMRB2X/7xea9ivkP/leOTP8ApbWn/aRH1Hvu5/06n3O/8V7cf+0ObrRUo/8AgHSf9Q0H/WpffamT+0f7T/h6+Xi4/t5/9Of8J6k+69Nde9+691737r3Xvfuvde9+691737r3XvfuvdNmf+S24fhztrcnyc2nvXEdf7m6iw9TuDbm4dx0OVy+2qjcM9sXg9s7i29g6/FZfdOH3ZkK9MfNjYKqmkqknP7sQUyLHnuz+4R7Z87f1mlhTaDYuC0qu6CZqC3OiMq7OJtBjCMrawDqAB6mX7ux5s/19faockWdxccxDd42VIGiSXwFDG8YSTK8UUYtPGEzyI6+CzppYuFNg/w1/wCFQ9fu7ePU/Xfzt2r8KfjRkq+toNo9w5o/J/sKn3VtvMVNEtTFv6m62x3RPY/Xm1Nt11TVUcEuDzPZaV+LNTJLU1irS1Eacb/hoo1svDVpP7WKjStfmQPTr6bQrSLJKVjSmSusY86IGOtwPKgJpxz1fj8I/wCaj8SPnzvjuDqTpXcW6cZ3X0BUSQ9xdRb524uO3Fs+I7ozu1qDKUW6tt5DdfVO/wDAZmfBirpcjtfcWbonoK+jleVDUKg2QRhlIPoQQf2HPTQZWFUdWX1BBB+wgkH8j1Y5791vr3v3Xuve/de60HPnP1n3Z/Mn/nG/zJsZ07mNifGjuT4J7K+Du1/jP2r2vvDbfXvWWW7Z6y7e273htmr7PIp9wbm3D2Dvsbiz7bHraXGVtLDicXBR1/2wqEdfde63k+saze2D6X69yHeuWwUHY2H6v2nWdx52nbH4rbMO9sftSgn7Cy0DxTDFY3BR52GsmUrJ9vDTgWbQL+/de6LN2l8RP5ef8w7piWo390x8dPkp1D3HTf3zxfYe38ZtbNf3klzGMhxcPYew+4tiy0+5cduGoxFNHTwbhweYp8gtPGEjqQgt7roTxFl0jxV4N5j7DxHAdOCaURPB4h8BuK1qppWlV4GlTSo8+qFcvtDI/wDCbr5MbQ7Hw8HfXfv8qX5PRbS6V3vlt17rxfYfYHwT7gn3PNFsDJ0mYztRjM9uLobezZl6eamndDi5YHcVVRWmhoMqKN05y5o3zZtv2Det8uLva7SVngWZjIYiyhWVHar6CqqAhYqukaQtWrH2we13t7ypzTvPOfKvKNltnMO5QLHeSWsYhF1obWsk8aUieYGo8bQJCpKsxFAP/9I6/wDM/wD+FKOa2f2V8jviz8Rvjod4dT9Ib2xfx6+XXzw7V252vub4/dA5nfOeqest2LW7F6kwP978xBt3Oz1mOpayXLUMuVy+Nmgx1BkInpqicw2jc59l3XbN5tY0e6tLiOZFeuhmidXVW0kNpJUBqEGlaGvRPzDsVlzRy/vvLO5TSx7fuNnNayvFpEqx3EbRO0esMmtVclNSsuoDUCKjqoD42fI3Ad41Xaey6bcPXW8N2dJZ7EYXN746Xn3hkOlux9s7jonrdob/AOuq7fWIw27MXTZanglhrMNlYhk8fVQOJABdU6reyHvCnu/se6XN3ti2fMVhIguI49ZgZZdRjkiZ6kVKsrRs7uNOqulsfPh97D7tk/3cecdntrDfpNy5L3lJnspp/CW7R4SnjwXKRBVbSJI3S4SOONg3hldaEsZ/3NnWLHXvfuvde9+691737r3Xvfuvde9+691737r3RTvm90buz5EfHPcXXuwpaJt7Y7c+0t/7awuXyf8ACcDu+t2dU1k020MzVO8NKFy9FXSGkNTJDTrWxRa5YgfIsU+9PJG6c/8AIN9seyGM7vHcQ3MUcjaY7hoWJMDtULSRWOkOQniBNTKO4T/92D3T2H2c95dm5x5pSUcty2N1Y3E8Mfi3Fml2qBbuFQC9YXjXxfDV5DCz6UcjQ1bnxv2r80uk8X8lOluv/iFtrsLrvNLHvDcGwPkRjNubfqv70brpMccXtePc+NzNFg+98NJjMe84xMFY9PDEiyNJQVErwy428g7N7s8oQ8/8pcu+10N7sU36sltuSRJpnkWiQiRXNvfx6FasasFUBQ0kLv4b5n+9PMH3bPdDcPZj3N5w+8RfbTznbsbSDcNglubhTbWryeLdNbSwvPsc4lkCG7kiWR3JQJdwoskZmPid3J8+f5PPyZbs7pWs+Mmw+ufnnu3qLZ/aub7W2ln+wuquo+zcs+7Mxj+t8rT7Q3PgO1sHtDae49yZCP8AiGKaSlfGiMs1Q9IqmF/e/wBoubOTboc6bht8MezbnIjuIXDR2t3OryyWYBYyFIyr+E9CvhhVLahnLP7qP3l/bz3TsZfa/ad2vH5q2GKWOI3cTLNuO2WkiW8G6F0TwfEuFeJp4iyzCZmcxqrCm75/Jp/mMfLj525f5v7B+YHQ3WHS/Y3w570wnReUl6ay+U3P1/lN5w4bLSdh7SXdlZurduOzO6+v83iolyKUU4ipIslTRvqk1OcfeszerwffuvdQMpBX1OMyNNiq+PF5SooKuDG5OaiXIw46vlp5I6Ovlx7T0q18dJUMsjQmWMShdOpb3HuvdfIO+bnxXqOvvnZQ/GD5w7v7Q3D8nq3uneXU3e3yT3nnNw5mo7f2z2HmKLN/Fj5YbRzG/wCujxmMws+DyLYPIbffIy0lNRYQxCpWoLCkF/Ie17NvvNuy7DvsrRWF9KLfxQwUwyS9kUuahlSQqXUjuTUBmnUWe9fMvNvJXtdzjzryRZRXe/7NaNfC2kSRlu4rb9W4tv0leVHmhV1ikjR2SXQdDrVS69QR/wAy75U7/b+WB8bvk589PlN8POpdxZDb/cVP0hjM8YcF11u2qxG2+z9uVeA3L2xtrZO49grU7YqIts4Tdm6sdtmsr1nqKVKP7urkdvnfYto5Z5o3bYdk307lZ2kpiM5hMAeRCVkCoZJKqrgqr6qOBqGCKrfabm7mbn3kDlznHmzk9di3TcYBOtmLoXbRwSjXbtJKIYAsskRR5ItFYWJjLMyk9fUA/lsbi64ynw16a2l1N0X8h/jjsHpfbtL0Lt/qj5SdbwdYdyYSl6fpabZX3u5MLjq7K4HNNmjjPuv4xjKuqoMpNLJNHIWLhQp1I3VW385bt/43fzIvhLvb+X98U+2+svkx3j8ku6Pjp1Fh4ujt1YHuDGdJ1f8Aptxu8Nz9tdpZbYVbncdsranWe0OpNw1OTNZUUszyQxUBMctfBr917r//09iT4n/yg9x/Eze3cHQr9p7S+Vf8r35FHsftPsj46/K7ZO198dvbS+Su5d8bV3Rjd4YXsSj2REO29sZ+lxsjZB92VBy2IyWIxlZQSyVD1Uw917rU4wnwq+SH8ohu4urvkb8QO0MZ1Hne3d4756v+TPxr2jmfkx1luXYc82ModvbV7J3NtKiXsfaOT2xHWCHESbsxWIqMh5Kwx01lM8uYn3dPfDkb295f3Tlvmu3ktZpLozC6ih8QSrpCiObR+pqjOoxmjJpdh2Efqcx/vs/dP94feTnnYefvbe+t9ys4tvW0fbrm6+nNs6ySSG5tC6mDTcAotypMcmuKJg0i9qJDHfzCfhtW5+q2vlO4ajYGdoo5JKmi7V6+7A6+8fid45IjNltvSRx1KyRsPHIY2JUgXYW95R7Z94v2Y3aQw2/OiRSgV/XhngU/Y7por8iQfSvWA/MH3LfvSctWq3d57Ty3UZYDTZXdndSCvmYhMj6f6QBA86DPUGi/mP8AwZr8dkspF8h8HTw4uGpnno8htHsOgy9WtL5NaYjGz7UEmTnqPEfCiMGk1L+m/Dsf3hfZeWCa4TnqIJGCSGguVc0r8CNCC5NO0LUnHr0zc/c0+9HaXlnYye0F08k7KqvHd7e8KFqUMsi3VIlWveWFFo3GmeP/AA4v8QpWx/8ACt79g7opslQw18WR2l0p2ZmMdSioCtHj6+abB4+ZcqiNqkjp4qmFALeUtYEpuPvO+ycEsca82PKpWpaO2nYIT+B6oCslMlQDp4E1x0ILb7h/3r7mGWVvbSC2KuVVZ9xs0eUCv6sOiSVWhYiiO7xs3HwwM9LrZPza+IXYLU0G3vkN15QZOrqhQxbf3xV1/XWfjrjLJD9jVUW9aHC00FUJYipHnZbkDVqYD2LNk96vafmERfu3nywV5KaUnY2zkngNM4TJpQUJBxQ5HUd81/dg+8VyU90N+9nN5a3gUs81nGl/CFFCWDWbzOQK5rGGFDVaAno0k0E1NJ4qiJ4ZNEcoSRSpaKZRJDMl+JIZ4yGR1urqQVJBB9yh1A8UscyeJE4ZKkVHkQaEH0ZThgcg4IB6xgE8AX/1vfur8OPXZVhe6kWNjcEWP9D/AI+/UI8uvAg8D13oIgq6uRooKPHwNV5CuqpoqTH46kS+usyVfUvFR4+jjt6pZnSNfyw90kdIo3lldViUEliQAAASSSaAAAEkk8B1rVWW3t0VmuZnCRooLySOeCRxqC8jnyRFZj5Dooe8vn78P9k5GqweV7vodyVOEpqmqyrdb7c3Z2dhdt06zRLUPl89tDE5LAUKyVMwUmKolXyghyrAXiPfPf8A9neX7sbfuPPMElwCR/iyS3SKcVBkhR461NKKzGoNaU6yQ5S+5595fnPb5N62T2ju4LNtJrfS2+3yyChCssNzIk+kAcZEjwRpqD0AvyNyPUHzAX4x5jqDtb4997QdY9t4/tXI/FvevbNL1k3yDwtPU4aOu2PV1tXLi957K3BVUuOmxxpKynx870mRmkhkSVY/JFPvhbbH738r8r2/t77g7RcbhFcSSpZtcpHJda1WNdMb0ljnjNQI5UQFZGYstBWffut7nzT90fn7n7d/ez2T5ps9kubSG0m3OHb57qHb/BkeVtb2wkhns5tQZ7i1knMbwopUqWKbCHSv/CmPdfxWrcj1t/NP+HvYm2e3e3uyc3uToyr+FWw9n7z2Fu3Z+XG38Xj9kVNPujtjBbk3H2btjOuaCqq4RPNkjUUqCniKq8+D3PvtrzZ7bX1pYc02SRtOmqN45FljegXUAynDJqXUpoaMrCqsrHqx7JfeF9qfvCbPu28+1/MX1kVhOIrmJ42ingZwzRGSN8hJkVnicVDKCMMrKtwP8x/+cf0l8HvhFV93ZLIU+yPk12z1hna74w/F7tVKJO4M92XVU1Zi8LSb36/2blt01GD2/srcSh9yVE9ZBQULU0lBNW09dJHF7AfU19VMfyKu1/5tH8xD4H7kz9F8s6j4/bTxvYnZ+Gw3yr7L61Pyb+RHdvbNVvDbW+dybp2fhe1J8J0ftH43bamyuT2pQ4TG42vemSCejpKnHz0AmX3Xuj6/J34T/E/+f71DsH5DdMd+9j9Kbt2xJ2/8XewOxNubINHvyt6ri3RldofIP409g9UdjzxDYmYye4sQlZRV1XTHK4uNop41qKSsKS+69w4da5+ztpfzi/8AhLf0t3zWYdPhzvr4e79+Wez9p9f7o7I2nunem9d9Z3e1NLRY3sIUHUe4Np742njB13sLRk8duDIV0NDkYzBiaeWSrNVUeJJNTx68AAAAMdbeHyN+aXfPxV/lcd9fLn5T/GDa03dnS2wd4R7u6P6z3y3ZHVvYtdS7r/0fbe3nt3c1ft/FbjoOm9/0mRpdyVlJmsRDntv4CoqKaup5aqldpdEgAknHWwCxCqCWPWvf/wAJmesuzvkD3vvT51/IUUXXu7E6V2nQdZdK9XYmi626+lwdXWbx2Rtrf299k7cxOCx5h2j1cI9q9fYI/cY/B7VU1TibIVS1SyVzH7Zb1ypyNyrznvbCI7xNIIICrB0gjVSssmocZi2qMDAjCsSS9Egvkn335a9xPdr3A9suVITPb8s28QvLzWpikvJXo1tbha6ltlGi4kYj/GCYlX9NmP8A/9TfV3juWl2ZtHdO8K6nqKui2ptzN7lrKSjMIq6mkwWMqspUU9KamWCn+5mhpWWPyOiaiNTAXIM9l2ubfN42nZbeRUuLy5igVmrpVpXWNS1ATpBYE0BNOAJx0Rc0b/a8qcs8xc03sMkllttjcXUiRgF2S3ieZ1QMVBcqhCgkAkipAz1Vp8TP54n8tv5gbhzuwdod+Yzqbtrb2f8A7u1nTXySpk6I7KyFZPXGgxku18PvmrocfvSPLzAGGHEVddWRBk+4ggZ0Ut71tl5y/ut7s27QNBfwTNGyurISVYrUK4VqNTUtVDaSKqDjpRy3vO382bFt3MewXMd1tVzbpKrxOkyqHVWIZ4WkjqhbQxV2TUCFdhk2FdhdL9A/ISh2bW9o9X9Udz47am5Ntdj7Brd67R2rv2k2/urb0suR2nvTatVl6HJxY7MYqWqkloq6lZZI/KxR7O10HRr1PyHRPR+XyGNy2V6b6qyeVw2TkzWIyeQ682jW5DFZmVGjly2NrKnDyVNDk5I2KtPEyykEgt7917oTqampqKngpKOngpKSlhjp6alpoo4KenghQRxQQQxKkcMMSKFVVAVQLAe/de6Jp8ov5dHwa+aG3dybe+THxa6X7Tk3TQ1FDXbuy+xcHR9l49p6U0YyW2+0cRSY/sLa2apqeyw1uPyVNUxgWD6bg+691rPZb/hN186/jnVLsz4LfO7qPe3QRyOUyWC6/wDmn1jmcnu7reGadHptv4XsDrekyc+68ZkUYmpf7TAR0zwqYKYmSVvc3cj/AHhfcvkHa4tl2vcLe62qNtUcV1H4ojr8Sq4ZZAjGh0ayq07AtW1Yn+7P3K/Yf3i5jl5t5g2e92/mSaMJNcbdcNamfT8DzRUe3kkQVAkMWtgaSFwFCyuq/wDhOf8AzHt+7rlqPlv/ADQsD1517B9tbaHwu6wp8FuHO6IplkP9+N44DbJ2lIsk/rP8NzaVSRrrSNgGVzefvIe8e81Q84SWtvg6LaOKAVFc6kTxM1z30NBjA6Y5Y+4z92DlhVP+tnDuVyCf1NwmuL1qHTjTNI0VF09v6dVq2kgEjo33/QM5sLEzU9XtL+Z1/MwoaqghWLHjdvZnT2/Matop9X8TxOT6YoqLNRtUtG4WdSQiMmolgyEVr75e8FnLDND7ibo0kfDxJTKv2skmpX/24PQy3L7pn3Zt2hure69juXUimarGG1S3cH+hJDoki/5tsvQQQf8ACYTI9qZ/qTH/ADO+du5fkj1J1V2LWbh3B19gOo6/oxO/uvsri5jNsjtqs677hgqKLdGE3BT0f2W58ZKKpsSKqmNLHPPHV0zHOXvF7hc/bXtu0cz7601rblydA8LxmfT3TohEcjIqhUOgUGo5Z2JU+1/3Y/ZX2b5h5g5l9vuUVtdw3Dwv7Vzc/SrEhUx2Tzh5raKVmMksaS6GfSQAFA62I/i/8IPiN8LNmZLYHxX+PXV/SO184mJXctNsrbdNTZLd0mCoP4Ziarem46373cm9MhRUbOFqcrV1lQXlldnMksjNGPU+daWv86r/AITt/wA0D5yfMbN9/dM7R+CGN2TWVu8aDaOP6Ux6dDbmG3KTcWa3HtDdveuRz2LbI9jd37sgyCU2Wy0FbVUUE8EP26U9OZCvkJjfxI+2SoNRg1HA1GajyPXpf1ovAm74dJXS2VoeIocUNTUcD0uepv8AhGJjt8dWYrcfyh+c3b1H3nntpbPqajbWE2ltTfW0urNyVeBpI+xdsVed3PnsnVdo00eXeoTE5Si/uwaSMRs0NQ6CRlt7uW47k4k3G/nuJBwMjs5H5sSeiva9j2XY4mg2XZ7WzhY1KwRRxKT8xGqg9WL/ABo/4SSfy6utsqu7flRuLs35qbsSGlFFht0Vi9GdM7cq4an+IVVTtPqnpCu21PjKXIZKSSSXH1eayGLdXIemd2lkkRdGnWzf1315sXqTYm0OsOsdp4HYfXmwdu4raey9mbXxtNiNvbZ23g6OKgxOGw+NpEjp6OhoaSFURVH0Fzckk+691S7/ACvuvG+LHz4/nAfFXKZGmC9k/ITZ38xTrDHY+XF0uGqOuflpi9wbe3GMfgqSKKsxma2l2X1BX4zKtJeGogOOqI/VPL7917q5LsjqbrHuHF4LB9q7C2p2Jhdsbz2t2JgMRvHCUGfxmK3zsfJx5vZ+66ShyUNRSx5vbOYhSqop9JenqEWRCGUEe690ptz7mwGy9tbh3juvLUOB2vtPB5bc25M5k546XG4XAYKgqMpmMtkKqUrFTUOOx1LJNLIxCpGhJ4HvRIAJPDrYBJAAyeqA/wCTR2N1X3J3p8pu4ei581VdL9rYLbHYXVs+4sNV7ezTbM3Ru/duSxaV2ErwK3HLTmV44EkF3pUjcXVwfeZHv9uu4b57L+xW8bqrDcLi3LOWrViIIV1n1LhQ9QSDqwSKdc2PuibFsnK/3lfvVct8vOp2qxvzGgQAIgN1K4iSgHbEHEeQGBUhwHDAf//V3mfkJz0F3gDyD1B2Xcf+SXmvYr5E/wCV45N/6Wtp/wBpEfUfe7f/AE6r3N/8V7cf+0ObrQn3j19132vgcdh+1evdjdm4ympYhSUu/NrYfcsmP10ogLYnI5Glly2Fl8TFRJR1FPIo+jD32R5g5d5f5niNnzHsVnf2y6gq3EKS6a1qULqSjejKQQcg9fMvy3zdzhyDul3uPIfN+6bJeu51tY3U1sJKNq/VjjYRTCorpmjkU+YPQC7N+Kk/QGYg3l8Hvkf8j/hJv6ldpXresezN07u2BuPTRtj6Si3p1tvHOzY7P4+gpG8UEctTJBDGq2p2ZEZcd+avum+2O9Q/8hs3Oy3ta1R3uYmJJqXjncvjGnw5U86g4pmTyB/eJe/3K94P66jbuadoIUaJoksLmMLj9K4tIvCNRxWW1epyJEFR1ZD1D/Ni/nh9C0OBw27dz/Cf527awsWUqM1kd9YHd/x77v3KrRf7jMNR7m2rHjep6OankAKVNRg5C41LPKSyzLAm9fc65+tEeXYuYdrvlUElWaS3kanBUDq0ZLeRaVQDxxnrL3lX+829oNyKxc4cjcxbPIzqodEgvoVB4yO0Eon0r5qluzkZUE1HR99of8KdcVgMrjaH5S/yx/mz0ri8jR0scm7eqqfZvya2tjM2J0TMDIV21avZ1Y21cdTuJYclTU9TU1g4ShXgmE969l/djl403PkHcTQkEwxm5QU4nXB4i6fQkgN5V6yp5U+9L93LnZpV5e95tiLqAdFzcCyl7uA8K78GTX6rpqpFGoelXvH/AIVG/F+HOVuA6c+EX8yHvE0uTbHU+5sL8dcfsrZmVUgmCroMhvfe+K3HSxVCjUqZDE0MoWxZV+gKrH2x9ydykEdl7f7y+aV+kmCg+hYoAMZyQKefQi3f369jdht3uN294+WIVClqHcrUuVHEhBIWYVxgE18uha+PX8/vb3Z+d3kO7fhL8hfjNsnHUOIqOvdwbp3H1tvLde+Kypnq0zVBmeusBmqPLbEGJplp5Yaiaoraes8sqaopIQssmbB9173g3uKW4uNlt9ugAGj6udUeQmtQscayuukUJMgQGtFqQQIJ5q+/192nl2a1tdr5rut9uWdhIdtt/FhgVR2s9xcSW0Mms1UJA0zrQM6qhDdD3uP+dp8dqHxLtbrLuPcrs1pnr8dtTbVPEuoDUjzbnyVVMQtzYQj6W/Psbbb9znn2dv8AdrzHtNtH/RaeY/sEKD/jXUab5/eVe0VmhGw8nb7eT6SR4otbdCfIa1nuGFfMmMU+fVbNd/wop+X2F3zmsVP/ACj6zeHX0e56ilwG8tjfNvqp8zWbNjyc8NNnKzaO4evcW8OfrMT4qgY16ynVJS0TzqB5PYK3f7rnvPY31xBtnLMd/YrIwSaO5tk1qGor+G8wdS60bSwqtaHh1JnLn3/PuvbttVpd73z7NtW6NEhkt5bDcHMUhUGSPxktfDkEbVQSIdL0qKVA64fMn+eB1Z3N0t1gOuPlF8rv5QfdmO7Lyu7Hzfd/wQz/AMhdubj21svC5jC5LZfYmK6wTtPaibI3fkc5FkKDJ0mRnljXE+aop44nRxGe/e2XuDywscm/cnX9vG+ujGIsv6fxklNQAHEE0DKNS1XPU6cm+/Hsv7hPPHyX7n7LuEsZiDLHcoGBmFY10uUJY4DIKsjkI4V6r0EG1v52v80vZPVnX/fmTg/lS/Mvo3J4fP1mz8N0p2d3r0j8svlntfa25TtPI9g9YdP9k4TKZLrmvwHiNbuKlzO2I8fF4ppKVoaWSlLFmzcl848w3G3Wuy8q7hcSXau0JEEio6xCruJHVY9C4BbVQllArUdCDmX3Q9s+TLTe77mr3B2eyg22SCO6DXULyQyXLBII3hjdpBJKSdCFQe1tWnSabUnxY+QWD+V3xz6Z+SW2dmb86+233ZsHA9ibe2h2di8Xht9YfB7jpRW4kZ/G4XM7gxdPNXUDx1MJhrJlkppo3upYqoZ8yPMEg/Ig0IPoQcEeR6HPkpqCCAQRkEEVBBGCCCCCMEEEY6H337r3Xvfuvde9+691VzuLpM7f/nLdZ/Jql7Bp6Edm/wAuzsj455vrHJ7ZzdPBnj1b8gtm9sbb3btve8NM23K/cuHHYuTp6jCVMyVq42WSsp45YkqXg917q0b37r3WuV/wpky2+st8Nvj10FgN5bi6769+V/zQ6t6D7t3btTIyU+ZreuMrsXtLes/XgxtJLSV9fjOw8zsmlpKx1nSnhgiZapJqaWWMjT255dsOb+feU+Vtyu2hsr+8WJmUEse1m0Cnwl9OnWahK6iDShiv3z543n2z9mfc33E5f2qO83fZdoluY4pJBElVKr4jsQ2pYtYkMajVIF0KQWqIP8iyhx+L353niMRQ0+Lw+G606wwuHxdICtLjMPh8hnMbisdTBmdhBQ0FLHEuosxC3JJuTmR98a3t7Tlf27s7SER2kNxPHGg4IiQwqij5KoAH2dc1f7s26u77nD3g3DcLp59xubeGaaV/ikmmuJZJZGpQankZmNABU4AGOv/W3mfkJ/zIPvD/AMRB2X/7xma9ivkP/leOTf8Apa2n/aRH1Hvu3/06n3N/8V7cf+0ObrRUo/8AgHSf9Q0H/WpffamT+0f7T/h6+Xi4/t5/9Of8J6k+69Nde9+691mhqJ6ZtdPPNA/HrhkeJuPp6kZTxf3ZXdK6GIr6GnTckMUy6ZoldfQgEfz6yzV1dUf8CKyqnsCo81RNL6SblfW7cE/j3sySMKGRiPtPTcdraw/2NtGmfJQP8A6ie6dKOve/de697917qTBW1dMk0VPVTww1KmOphjldIaqNkMbxVMIYRVELxsVZHDKykqQQSPejlSpyp8jwP2jgemJba3naKSaBGkQ1UkAsprUFTxUggEEEEEAg1HSb3Yu+KjaG76brOv2ziOwqvbddBsrJbx/iMOysVuCnoTBh8huNcDG2SpsPgqdWeJqeNhStFG2gwoyEu3r99nZN0h5bubeHevp3+nacN9OkgXtMoQFgiipqqnTQGlAejrl/+q0XMPL0/O1pe3HKEd6jXsdn4ZvZbdnrNHb+OfDaadiFYSMDKGcahIysNir/AITO959ud9/yhPj9uDuNaWvzWydx9qdUbY3jTZSDJNv/AGN19vvL4fAbkqo6eGFMdPjpBPhBGdRqIcQlXcCpCrxFudZubppZQ8zSuzMDUMzMWZgfPUxLV869fVjYCFNv26K2tzDax20UccZXSY4441SOPT+Hw0VU0+Wmnl1fl7Z6Vde9+691737r3VUGayU+9f522xNrydP7QzOC6F/lq733+e9K2uzNfu/ZO+++vkbtnZmC63wmI/vDBtvb9LuvZfUWdr6uu/hVVkqyOljg+6padDFWe691a/7917rWa/4UjbsgymJ/lu9AQULpmOw/ma/ch3TTYSqr8ptXavxr6y3PuPcrYrN089Mu15Ny1W8sfiaypZyZMXWVceiRWdDL3sDtMu9e83t/aRTzReFeG5Zo61CWyNKwYggiN6CNzUABshgdJxu++FzHByr92H3k3K4tLaf6jbPoUjn06TLfyLbRsgYMGmiLmaJApLNHQFD3qrP5Hja+zvkO9gNWydhtZQAo1Z/chsAOABf3lL98812DkU043lz/ANW4usCv7sIaeZPdJa8LC1/6uv1//9feZ+Qn/Mg+8P8AxEHZf/vGZr2K+Q/+V45N/wClraf9pEfUe+7f/Tqfc3/xXtx/7Q5utFSj/wCAdJ/1DQf9al99qZP7R/tP+Hr5eLj+3n/05/wnqT7r011weSOJdUkiRqP7TsqL/t2IHvwBOAKnraqznSikt6DPSi27tTdm8JfDtDae6t2y61jKbX23m9wkSMLqjHEUNYFdgeAbE+y/cN12raV17ruttapStZpY4sevey9H2zcq8zcxO8Wwcv3l7KpoVgheVgfQqisa/KlejHbc+C3zH3U8KYr439oQCdQ8c24cPTbRg0lQwaSXdddhhFcH6NY+4/3D3r9pdsDm69wNtbTxEUhnP7IFkr+XUx7N91X7w2+hDY+028JqFR48DWn87rwVH5kdDhhP5Tvzhy5Q1XXW1Nto6B9ef7I2qxW9vS8W36rPzK/+Gn2DLz70Ps1aV8Lfrm4IPCK0n/kZViHUnbT9wX7yO4hTd8rWtiCK1mvbM/kRBPMwP5dCXjv5Mfy3rCn3u4ukcQGI1fc7t3XWMgP1JWg2NMGI/wAD7Dtx97z2tiB8Lb95lPyghH/HrkdDK0/u3vfidl8feOXIUPHXdXJI/KOykB/b0tqf+SL8gXVTVdx9OQMR6lp6LetWqn8hXkxVEWA/rpHsmk++RyMCfC5T3Zh82t1/wSN0K4P7sz3LZR9Tz7sSt/RN0w/nap1N/wCGQe7/APn9/VX/AJ4N3H/ebi/tj/gyuT/+mN3L/nJB0r/5Nlc/f+FE2f8A3m5/609J/dX8iLufd+2N0bNyPenXVHiN47bzu08rkcHS7zxOfx+N3FjKrEVldhK6Omm+1ylLT1bPCSdJYaW9LH2l3L73XIu77Vuu0XfKe8JBd20sLNFLAsiiVGQsj1qrCtQ1D8wRjpZtH93H7ocub5sfMe1c8cuz7ht17BdRR3KXLQSSW8qyokyfTtqiZkAccQDUZA6Sf/CbHOYj4e9S1f8AK+762b2R0z8rMBmO2O2trUm/d/vvHrD5EdeY7s7c+2c7u3oCKj3xvLafX25uvqmhgpd77HpBjcjSVcqZiWnnarrnpOfz6Nb+ESYqmlQAaVxUAkA04gEivn12GiMrRRGdFWcqNQViyhqDUFYqhZQa0JVSRQlQcdbUXuvTnXvfuvdA10d3/wBU/I7ZNf2N09uKq3Rsmg3nvrYTbgqtt7o2vSVu4et9z5LZ27v4RHu3DYOqzOEodxYipggylLHLja9YjLSzzQlZD7r3Vf8A/LPxm6e0Oxfnh82N/wDXWF69z/yF+Tm5eput/ssVvnbm6t1fGj4i12Z6a6a3X2Vg9y5qfCSbn3Jl4tyZWgq6CggE2CyVG/nmjkjip/de6tl9+691qkfz7M7UZH52fALZ5OCqaPa3x4+ZO/8AwzUVTHuXFTZ/IdJ7IbIYzKimFJNjMmxipqqj8xk9CzeO0YcZO/dEtRce7004QFrfZrpjU0oHaGOoHm1SBTyBJ8usCv7yS/e0+7Vb2XilUveadtSgFdbQieejH8KhVZwfN1VfPI+fyOf+Zl/IT/wx9g/+77cfuZfvnf8AKv8AIn/PZc/9W4uscP7sT/lZvdP/AJ4bX/q6/X//0N5zv+KWfofuyGCKWeebqPsiKGCCKSeeaWTZuZSOKGGJXlmlkcgKqgsxNgCfYp5GZU525Pd2CoN1tCSSAABPHUknAA8ycDoA+60Uk3td7kwwoWlfYNwVQBUkm0mAAHmScAdaq3Q/8sT5c9047E5R9k0nVG16ykp5Ytw9sVVRt+qmgMEUgko9nUdLkN3yGWJwYjU0lHDIf92AXYdM+dfvIe1nKE1zbLu77nuSMQYrJRKAakUadmWAUOG0u7D+EnHXDT26+5B77+47R7jJsMey7HK2oT7i5gLKTXsgVJLokr3IzQLE9RSUCpFh+F/lY/D7pmD+I/Jz5Mtla6jigq6vCruTbHVWFsVHlgOPkrczvHIQtIbI0NbTyMBfSL2GHHuL/eAQ7AtwiXew7DCo43lyktxStAVR2iSp/h8GTOBXj1m1yf8A3dHtNy4sVz7i893m53SULRxeFZQH1VwxuJ3A8mjlgJ46RWgE7D9kfyg+igDsjY+yt55Kmg8Yr8V1xuXtPJyOpuSm5d5UOSpfupGW5dKtQAbXC8e8Jed/7x7l+8eaK+94t0viKkx7fFcJH/pawxwQH5AsR6mvWSPLfsr92XkeOJdj9uNrmljWivNA9/IPmJLzxyrH1VhjAoMdKXK/zcek9vU0OP6+6U7HydBTr44IJ4tm7Jx8EaqAiw0seXyckScWsIBYD/Ye8aN6+/hybJLJNtvJ+930xyXnaCAt+Zlmcn7V6lqPnLZtugjtdq2Z0tUFFRVjiRR6BQaAfYOgjzP84fe0rP8A3c6B23Rob+I5/sTI1kij+z5Uxm06VCR+QH/2P59x1e/ft3+Rm/dntpaxJ5eNeu5/MR26D9jdJ5efro18Da0H+mkJ/wACdBxXfzbvkhVKVothdM4m97OaPeeUkF/pcy7koY2t/wAEF/YTufvu+7E1Rbct7BCPXRdSH+dwg/l0kbnrd2+G1t1/Jz/z8OkLkP5ony9rJC1Jl+sMQnNoqPr2epA/x15Hc1WxI9h64++L73zkmO82mEeiWZP/AFcmc9JX5y39j2SwKPlHX/C3TFJ/Mt+Zsn6ewdnQ/wCEXWeAP/W6aY8ey1/vb+/LfDzNZL9ljB/lr00eb+Yj/wAS4x/zbX/OesB/mTfM8m/+kzbA/wAB1ntO3+8wMef9f2yfvZe/tf8AlbrT/sgtv+gevf1u5h/5TE/5xr1li/mUfNAuqjsTaMzMwVVk6020AzMQFW6PCBc/1I/1/bg+9t78pVn5psiB62Fv/kHXv638w/8AKZH/AM416oUzfzT3Dub+dT8Ot8ZTvTDY7Cbg/mQ9NJn9iZahxu0sbH2Pl+hsH8dO9e0dqvVrDvbr3ZO69sT7d21JRyNHt/eeZoJ65DJFCZ3zs+7z7ie5HOu02kfPtlBLPJaSXZuoY/DRElnEdnanwy0DzNCks8yo3iQK0KTqsjlQPeW9y3S+iQbiisShfWooBVqIuCVJ0gswGVwGoTTr6NXvJboU9a8H84j+b18EOo8H21/L23X89D8VO/8AszqvMUe7u3thdS5n5C1HQW26+p26dw7T3Bt7ZmUpcrt3uPtbrXK5Km2vEhaswzzw5eoFMv8ADjWe691Xv8atmbz3PuH+VN3DtnEfH7q3Yny8+GXZP8un44/BLu3sju/OdmzfAzH1eI7v3f3ttvtrq3BLV7e+ReY+O20lO6ZJ6enw1JUR4SlpMrRVOTkSL3XutuXqXqnr3orq/r3pfqbbNHszrHqvZ23dgbB2nQTV1VSbe2ltTF02GwWJiq8nVV2Urfs8dSRo09VPPUzsDJLI8jMx917p63tvjZXWm0dxdgdjbv2vsDYez8TWZ/du9t65/FbV2ltfBY6Jp8hmtxbkztXQYfCYmhgUvNU1M0UMSAlmA59+691pJfKbanzZ/mIfzwe+N+dKdL1G8fjR8X+lt2/FjbPZ2HOMqdl7mHXI2d2B23g9t72ytdiMPWdsN3N2hQ4ufH0TVNRFR4mopeTT1rCf/u4c67DyF7g/vXmK+Frt11aSW7zNG8iqrdyrVCTHrlVNUmhgERw1BkYf/fd9qObvd/2YTYeTtpkv95sNzgvIbdJo4Wd11RSSMJNKzJFbvMRB4gdpWjaJHkSnVvX8mPae6ti91fJHau99sbg2bufHbH2B9/t7dOHr8FmaUNn9yBJJMfkoKeoMElvRKoaJxyrEc+50+91uu173yj7fbns25QXe3SXlzplhkWSM/pxYDISKjzHEeYHWK/8Adzcs8w8pc9e7eycz7Jdbfu8Vja64biJ4ZV/VempJFVhUZFQKihGD1//R3wuy9wZDafXO/wDdOJFM2V21sndW4MYK2J56M5DDYKvyNEKuGOWCSamNTTL5FV0ZluAwPPsPc27ndbJypzNvNkE+ttNvuZo9QJXXFC7pqAIJXUoqAQSMVHHpNeSvBZ3c8dPESNmFeFQpIr8utUzfPzA+TvcNGku9u5t2xUGSoqdqjbuy6ldhbcCyKk4iFHtcUGQqUjduDU1VQ7ADUT74x8z++3u5zypfe+er5LOQA+BbMLWHSchWW3EZenq5Ynz9OoRuN+3rcEU3W4vpZRVU/TX14LQ/tY9F4NLTtUPWSRLNWyMWlrqi9RXTOb6nmrZzJVTO1+WZyT7igxRmQysuqYkks3cxJ4ksasSfUmvRXpXVqp3+vn+3j1I9udW697917r3v3Xuve/de697917r3v3Xuve/de6xVM9LRUWSyWQqYqLF4bE5XO5jIVF/tsZhMHj6jK5nKVbfSOjxuNpJZpXYqiRoSxABItGks01vbwRl7maVI41HF5JGCRovqzuwVQKkk0AJx14AkqqirEgAepJoB9pOOtXL59fLTuz5jfITpHorpjqZ+m919YZxO2Nrbyym6MLWd14pcJt9t8Y7e/Y+7NrLLF1FtnqjZuFq90S4pKqrfA0rTV1VO0iBYuqX3VvZiz9v9v3fmr+tr7nfX48ErDHLDYRGJz4rWyy0a5Z5AI3vCkYkEWmNAoJaWOU9kTb45rv6vxXk7aKCIxQ9xWvxEnBegrSgFOP1W/hV3JX/IL4m/HvuLLrkTnd9dU7Qyu4qzIbf3JtmPM7jixMFBn9yYLGbuwW2dxTbN3Tl6SbJYGuqcfRnJ4WrpaxIkjnQDLzoY9Ue/zQf5J/8AKy3h8p2/m6fN3sWXqXqrqXb+0c38gthyUWCxfVHcGc2fkpMftLPb+nxmFqt7Z/Obklr8VhKrF48VNbuOOio6GFfLK6ze690Iv8p/Ib3/AJknyC7G/nG9ubbzmzup4sdvD40/yxun9yYdcVNsb41xZfFydj/IHJUjRtBJv/5B7jwFPTCeAn+G4nFzUEVRWUUkEvv3Xuthz37r3Wkb/OR/nLbM+WUe7/i/8Tdx0PZfxy2LvPCbD7DqMNsKqz+Y+aHzLxO74sn1J8MetoN0bl2ti818cqDN7bXN9vblXG5DHVm2YaegoamSLKwLky/dt22vYNr3HfN7vo7bZ7OF5ppXNFSONSzMTQngMAAkngD03NNFbxSzzyBYUUlieAA49NvxLHanw82bt/GbG7f3X/pQlTLZ/tvsakqEaLsfsfe+7M32R2Jk6nbeWpKrBUm3a3sDdOQmpqBKOJERgzDWze+NnMX3hfdDd+eeYOdNh5u3Ha7W7udUNqkoaCOGMCOBXgYNBI/hqGkbw6M7N5U6hW55h3Wa/uL63vZYVd6hAaqFGFBU1UmmWNMknrYu/l1/LPtT5Gbi7E272tRbMyWW2PtfbNbj974PBNgdwZSlzWVzME+LzNLFUVONaCCXHLMjUq0set2vF9D7zh+6z78c9+6svM/LnOcltMduhgmSWKMws5lZ4yZIw5hLdmGjjjoMENXAy5T3a43a9u2vreBruOFQJlQLIVLMdDHPaCNQAIFSTp8+v//S3p+8CB0r2+SQAOruwCSTYADaeWJJJ4AA9g73EIHt/wA9E8P3Ne/9o0vSLc/+SbuH/NCT/jp600MTWUn8Kxn+VU//ABb6L/d8X/KtH/tXvgpbzRLbwK0qhgiggkVBoOsfomXwo+4fCP8AB04feUn/ACtU3/U+L/o72948H+/k/aOnKj1HXvvKT/lapv8AqfF/0d7948H+/k/aOvVHqOvfeUn/ACtU3/U+L/o737x4P9/J+0deqPUde+8pP+Vqm/6nxf8AR3v3jwf7+T9o69Ueo6995Sf8rVN/1Pi/6O9+8eD/AH8n7R16o9R177yk/wCVqm/6nxf9He/ePB/v5P2jr1R6jr33lJ/ytU3/AFPi/wCjvfvHg/38n7R16o9R177yk/5Wqb/qfF/0d7948H+/k/aOvVHqOqpP5vHyVqOiejun8Jtffe7di7t7I712xk5Nzde5GKi3ThdhdX+PNbqq6OUMrVMk+WzeL8FMzxwVEtMVmLxgocrPuhcg7Tz77hcwXe/bZbX3Le3bU6SxTKJI3lvT4cY01oGWKOc6uK6hpoTUCvk/b4dw3G4a4iV7aOEggioJfAx9gbPzx1tMfy5v5L38sHbu3O/N37T+KHyD25uTfcfZPxf7S3N8m+xt7Sb1756uym4Np75zu9KeHbG8KTbY2J3nRpQGqegpsdJkcQ9VichTrDNkKOXrJbW8Fnb29pawrHaxIqIiiiqigKqgDgAAAB6DqXVVUVUQUUCgHoB1sObf2/gdp4HCbW2thMRtrbG2sRjcBtzbmAxtHhsDgMDhqOHHYjCYTEY6Gmx+KxGKx9NHBTU0EccMEMaoiqqgB7q3VP385f4mbf8A5hOwvjF8EN4Yn5B47ZPdXyOwW/N8dq9Q9XUu+evthbO6J2/mN6bk233Tu+q3vtFOpqTtjFVcuF21mRT5oruFoP8AIJ9Ohvde6tr2DsXafV+xdl9Z7Dw0O3djdd7S25sXZm36eerqafBbT2lh6PAbdw0FTkKirr6iHGYfHwwK88sszqgLuzEk+691Wn/N06i+Q3fXxsrenOuO6Op/jx8dOx6PPbX+Zfdu7t9bh6y7T6p6fqjhKyDfnUG9Iqyn6/aixE9BVQbwwe5DSU25Nr1dRQU+Sxk0pqffuvdaFOL/AJa3af8AKW+VPUvZ3eVH2RL8RNu/NT5L9FdTd1Z/E7fm2HX5LsHqraUXxi7XxtPgs6mQo6rt3bY+5r9wRLWYHHHFPRKwq6KuiSBPvN8vb/zR7J85bTy3AZb7TDK8esJ4lvBMk1wlCreITEjaY6qXIChqkdB7mm2uLrY72G2FXoCRWlVUhmHzwDjz4V6vDnlhpZpaaeenjmp5Xglj88J0SRMY3S4ex0spHHHvjEl3bSokqXCFGAINRkHIPHqFQykAhhQ9W8/yd5oZezO+fFLFJbY2wL+ORXtfPbp+ukm3vO37iTK/NXuMyMCv7vtOGeE09f8ACP2joechEG+3Oh/0JP8Ajzdf/9PfH7FzeH2z19vrcm4cX/HMBt/Z2583nMKIKWqOYw+KwldX5PF/bVrLRVH8Qoqd4tExET67OdJPtZt+yJzLf2PLkiRMm4TJbESDVGROwiIkWh1IdXeKGq1FDw6I+Z96teW+WuYeYb6BpbKwsZ7mRFoWdIInldVDEKSyqQKkCpyadUJ038yf+XwaeAx/CJ4ozDEY4l6y6UCxoUUpGoXKBQEXgW49zl/ybY2GP9Ndg5KCrgf4gowMcPpOudTf3ivslGzRn2y3aqmmI7KmMY/WGPyHWb/hyb+X5/3hLJ/6LPpb/wCunv3/ACba2P8A6MPJf/ZCv/bJ1X/k4x7I/wDhMt3/AOcVl/1u69/w5N/L8/7wlk/9Fn0t/wDXT37/AJNtbH/0YeS/+yFf+2Tr3/Jxj2R/8Jlu/wDzisv+t3Rh+nvkz8I+5sFlc/hPiJgsTTYnLDESw5frXqfzyzGjhrPLGKOapj8WiYDlgbj6e+X/AN/Hmv2F+4F7g8je3fuP7O7fvW5b9sX70il22wsfCji+ruLPw5PqlgbxNds79qldLLmtQM+vuk7jy597/k3mbnXknZotssNs3T6F0vY08R5PAhn1r4AlXRpmC5YGoOKU6Y9//LX4Pde7nn2tkPhxjsjVQY/H5FqvHda9PfaNHkVmaONfu6+mn8kfhOq6W5FifeO/J33uPuw86bDFzBt33eGS0eaSMB7DadVY9NTiQih1CnQk9xtq2n225sueUdz2qC4vIreGYyQxp4ZWbXpA1hGqNBr20yKE9I3/AGer4I/94VR/+i16V/8Art7E/wDwR33b/wD2X0f9kG1f9bOgR/WTln/pnR/zjh/z9LXr75ZfB/sTcqbZx3w5xuNqnxtfkhVZLrXp/wC1EVAacSRH7SuqZvLJ9wNPo08G5HsK85/e7+7DyTsTb/uX3eGe1E8cVEsNp1apNVDmQCg0mvQ79ttm2r3M5qj5T2va7e2vGtpZ9c0aaNMRQFf0w7aj4gp20wakdK7sv5B/CrrHFYzLZP4i4HKQ5TKHFxQ4vrXqfzRSrRz1nll+9qKSPxaICvpYtqI4tz7DnIn34Puqc/7hf7dtX3c5Y5be38Vi9htFCutUoKSnNWHQ091fa+D2m2na933i3sbqG7uvAVYI+5W8N5NTeIiDTRCMEmpGKdA5/s9XwR/7wqj/APRa9K//AF29yb/wR33b/wD2X0f9kG1f9bOoQ/rJyz/0zo/5xw/5+krkvkD/ACye3N89bVe8/wCXdsHdW69s7gx0XXu5t4dHdAZ7I7EytVmaHI0+V23kq6auyG36iDMUNPVGaiMcwmgRwdSLY0tvvn+y3t7s3MG57B7Q3+32iQtPOtrBt8Bl8FCRq8OdNbKtQuqtKmlKno/5X3ra913/AGXl3bNsNvcbleQ24bSioHlcIrPoJYqpNTQE0rQHqx3eXz16+2XtjOborNj76rqXBUbVk9JRDbv3dQizRw6IPuc3BBrvID6nUWH19gXlj+9Z9nuad+2rl+x9ueZUu7uXQpb6LSDQnNLqvl1kTz17P71yHylv3N+4braT2W3w+I8cXieIw1BaLrRVrnzYDovH/DwHTn/Pou3v/XG/+y33NP8AwdPIf/TD77/2af8AbT1jT/X3b/8AlAuP+Mf9B9eP84HpwAn/AERdvcf+GN/9lvvw+/TyGTT+o++/9mn/AG09ePPu3/8AKBcf8Y/6D6Mhtf517A3Vt7A7ipdk73pKfP42jyVPTVY2/wDcU8dYgdIqjwZmaLypezaGYf0J9wdzB/ew+zvL28bvsl17b8ytdWc7xMR9FpLIaGn+NVoT8usoOUvZXfeb+WNh5ps94s4rS/tY50STxdarIoYK2mNl1AGhoxFeB6r77w/mc/CrtSsotm93/FHcXbtD1n2Gm6NuY/fm0urt44PDb72nJk8Vit34fG7iztXS0+ZxqVlR9pU+ITQeUlSrc++8vIP3ZOa/cLkDkH3C2zmHbYNs5h2Lb90hjl8bxY4dxtIbyKOXREyeIiTKr6WZdQOliKHrk9zr/eEe2fI/OfN3JW48nb1Nf7Pul3YySR/TeG8lpPJbu6aplbQzRll1KDQioB6idn/zWvhX3bsubrjuT4nbl7W69qK3C5KfY3Y2zOpt6bRlyO3MjS5fb1fJt3cecyOIaswWVooamjlMOumniR4yrKCBVJ9zLnSVHil5o2do2BBB+oIIOCCDBQgjBB6DB/vL/aZgQeRd/IPytP8Ato6Tsn8yv4ASyPLL8KZ5JZHZ5JJOtul3d3clmd2bKlmZmNyTyT7j1f7tjYVAVeX+Sgo4AWC/9snRb/ycX9kB/wCCx3f/AJxWX/W7o9HwS+UXxu+QW6exsX0Z0Ken8ptrAbdr9xZJtq7E282doMhkMpT46hM20KupqKoUFRTyyBZ7IvlJXkn2COd/uubd9323sN2stt2KCTc3aJjt9uIXYQgOBKRDFqUGQ6RU0JJoK9ZG/d4+8tyH79bjzJY8n8q3m3S7fBFJI06wLrEjMoA8F3OCK59cdf/U30t6bWot8bO3ZsrJVFVS47eG2c9tavqqFokrqai3Bi6rE1VRRvPFPAtVDBVs0ZdHQOBdSOPZjs+5TbNu217xborXFpcxzKGrpLROrqGoQdJKgGhBpwI6JeZNjtuZ+Xd+5bvZXSz3CyntpGSgdUniaJmTUGXUFcldSkVpUEY6qJi/kifHCKKOIdpd4kRxpGCcrsa5CKFBNtjWuQPeVJ++R7gkk/1b2bJ/guf+2nrAF/7tP2ed2duduZNRJOHsfP8A6guuf/DJHxx/5+j3h/59djf/AGDe9f8ABj+4P/TN7N/vFz/209V/5Noezv8A023Mv/OSx/7Yuvf8MkfHH/n6PeH/AJ9djf8A2De/f8GP7g/9M3s3+8XP/bT17/k2h7O/9NtzL/zksf8Ati6MH1D/AC1On+msHlMDt/e/ZmTpcrlhl55c1XbYlqI5xRw0Yjiai2xRRiHxwg8qTc/X3zK+/T93rlT7/XP/ACR7h+6O8bhtG67Fsf7rhj2owpFJD9XcXniSi7hu3MviXLrVHVNAXt1Ak55/dP5VsvuhcncyclchTy7jt257n9dI9/paRZPAig0obdbddGmFT3Kzaie6lAGXfv8AK46W7B3LPujKb+7Woq2egx+PanxuS2tHSCLHLMsTqk+1aiXyuJjqOog2FgPeP3J393f7UclbBFy9tvOXMclok0kgaSWz1Vk01HZZqtBpFO2vqT0JfcNR7kc1XHNu7kwX8tvFCUhxGFh16SA+tqnWa91MCgHSO/4aF6G/5+R3J/59to//AGH+xR/wDXtt/wBNZv3/ADktv+2XoFf1E2z/AJS7j9qf9AdLTYP8rvpfrzcabmxW/e1a2sTHV2NEGSyW15KXw15gMshSn2tTyeVPtxpOqwubg+wpzn/d2+0/O+xNsG5c58xx2pnjl1Ry2erVHqoO+zdaHUa4rwoR0OPbon215oj5r2f9e+W2lh0TZj0ylCxomhtQ0CndTJqD0q+yP5dXU3ZuLxuKzG9OyMfBi8mcpDJiq/bkU0kzUk9GY5TU7cqUMPjnJsADqA5/HsOcif3Y/s1yBuF/uO1c88zyzXFv4TCWWxoF1q9RosUNaqBkkUrivQy90ud9y919q2vaN8tYLeC1uvHU24YMW8N46N4jSDTRycAGoGaY6CD/AIaF6G/5+R3J/wCfbaP/ANh/uTv+Aa9tv+ms37/nJbf9svUK/wBRNs/5S7j9qf8AQHTnhP5TPRmCzeGztN2J2/NU4XKUWVp4ajKbTanlnoZ1njjnVNpI7QuyWYKykj6Eey/dvuE+2G8bTumz3HN3MC293byQsVktdQWRSpK1tSKgHFQR6g9Guw8tWfL+/bHzBazyvdWF3FcIrlSjPE4dVcBQdJIoaEGnAjobd4fA7rHee2s3tfIbt39S0WdpGo6mooazAR1cMbSxzFqd5sBNGr6owLsrC3uJeWP7qn2Q5V37auYbHn7mt7u0l1ory2GkmhFG02CtTPkQep653939+575U33lDc9ts4rC/h8N3iWQSKKhqoXkda481I+XRf8A/hoXob/n5Hcn/n22j/8AYf7mr/gGvbb/AKazfv8AnJbf9svWOH9RNs/5S7j9qf8AQHXj/KE6GIt/pJ7k5/6u20P/ALD/AH4fca9tgQf6179/zktv+2Xr39RNs/5S7j9qf9AdGJ2z8F+tNrYDB7eot178qKXA46kxtLPV1mBepmho0CRyVDRYGKNpWA9RVVH+A9wdv/8AdQ+x3MO87vvd1z/zWl1eTvKwWXb9IZzUhdVgWoPKrE/PrJjlT3o5i5R5a2Plew2yyksrC1jgR5FkLssahQXKyKpYgZooFeAHRUs5/Jd+PGezWYzlV2b3XDU5nKZDK1EVPlNkrBFPkauWrljhWTZMkgiR5iF1MxsOSffdXkP7zPOXt9yFyH7e7Vse2TbVy/sdhtcEkqzmWSHb7SGziklKTohleOFWkKIiFydKqtAOVPOn93x7Vc8c482867lzfzBFuO8bndX0qRPZiNJLueSd1jD2bsEVpCE1MzaQKsTnpr/4ZI+OP/P0e8P/AD67G/8AsG9ir/gx/cH/AKZvZv8AeLn/ALaeg1/ybQ9nf+m25l/5yWP/AGxde/4ZI+OP/P0e8P8Az67G/wDsG9+/4Mf3B/6ZvZv94uf+2nr3/JtD2d/6bbmX/nJY/wDbF0bX4lfAvrD4e57eu4Ngbt39uSq3ziMNh8lDvKs2/U09LT4Wsrq2nloRhsBhpEmlkr2DmRpBpUWAN/cWe6XvdzJ7sWWz2O+7XY28dlLI6GBZQWMiqpDeJLIKAKKUA6yC9hPuuclfd6v+Ydw5U33dLyXcYY45BdtbsFEbFgU8GCE1JOdRI9Ov/9XaV+Zn8pXZXy73hvns7FfMr+Yb8Yezd443C00GW+Nfy87N2HsXCVu28BS4HDzUvUcmQyGwYcdUpQxS5Ono6Wgmr5TNKtRBUzyVB917r5nv8xztH+cr/LW+WHZHxJ7r/mIfNjKZXZk1Fl9n7zxfyl78pNv9l9b5wS1Oy+wMDBN2BUS0tLmaKFo6qkM0zY7J09VRPJJJTO5917r6FH8lL4xfHjeXQPxn+f8A1X8ufn/8i8t2J1TUT1lN8nPmR2F27t/DbszFG+3eyNo7k66p63G9dTZ7YW7qCvx0eugkNNUUwmRnkWOYe691f77917r3v3Xuqnv5lvw2+PPZu0N/fKrvX5WfNr4uYPpXpPO1G593/F/5a9ldGYjCbM2X/eDeNZnl2TichVbBzO8ya+aGKepxlRUV5WmpmEvjgVfde60h/wCRf8a/5oX83jt/sLdu5P5lX8yPqn4G9R7kqsTuLftH8rO207M3vmqstkNudW7JylbubJbUh3jRbfqqev3BlDQ1tHiopoFFK711Pp917rf1+I/wG60+HOX3bntldw/LTtfLb0wmGweYqfkr8oO2+/oIIMLU1NXFW4TF9g7gyWH2/la2aqb7ieip4GkQBBpT0n3XulV8tvhl178yMJszB7/7I+RvW0excvlMziMj8dPkF2Z0DmK2qy1BFj6iHcOR63zmFm3DRQQwhqeKr8q08hdo9PkcN7r3Xz/f+FH3VXy6/lC9v/Haf4y/zOf5k2W6o+Rm1eya6HbXZfzB7g3Fm9l7r61zG1Is5R4rcmJz23RXbYyWJ35jTSwVdPNXQTU05kqp1kQRe690Yz/hNx8Vvkl/Nb6/74+Qfy4/mY/zL59i9W9k4Tq3Z/XnXHzO7i2jT7j3B/dWm3TunJ70z1TuDN5mbGUuN3DjI6Omxr42UTGV5KiRbRe/de63oPi18YNlfEnrWp6u2Jvbuzf2Gq905bd02e787l373lvj+JZmlxlJVUcO8exMvmc1S4KGPFRvDQRSJSwzSTSqnkmlZvde6Mh7917qkL5RfyXdw/Ibf/bPaW1P5tX83zoTcvY+Xy+4sFsTrP5e1GP+PnXGVr6RIaDGbW6iodo4atp9kYyohWQYuLPU0jq0iiqjZ9a+6918vbt35q/zMOse9eyejtzfzEPmflM71r21vDqjM5eH5R98PR1eW2ZvDI7QyGSpKao38JVppqzGvLGjMGCkAkHn37r3X0wNu/8ACezqnG4Ckocz/Mn/AJxm486KSAVm6Jvnvu/F1k1f4waqso8fjNsQYyjimlLFInjnMaEKXdgXPuvdFQ+SH8hz+Yd1xtnJbu/lv/zt/wCYRQ78wcEmVw/U3y57+3P2dsreGQp9UkeIXeWIjw2M2skkV0hFdtfNU80ulJ3iRmnT3Xutez4n/wDCrP8AmY/B3vTL/H/+ZpsOD5C7e693vkth9u43K7V2z1p8mOtshg8m2HzUWAzW0ocB13vGfAOk032WXxzPmjHEkebo4pPuT7r3X0gen+2ev++equuu6+qdxUe7ete1tl7c7A2NuShJ+3zG2N1YqlzOHrPG4Wamnejq1EsEgWanlDRyKrqyj3Xuv//W3+Pfuvdar/8Awqp/lYD5vfCw/J/qrbj5H5JfDTF5zdtLTYmhkqcz2H0RUeOv7N2T4aOJqvJ5HaaUq7kxCt5TF9pkKaCPy5Jj7917qgr/AIR7/wA0dem+790fy2e3Nw/b9cfIfJ12+vj5WZKdvtdt9747EwDcOyoqioqEp6DHdp7Swwkpk/Sc5ioYYkM+Scn3XuvpK+/de697917rTB/4UT/Ijtf+YD8pfj3/AMJ//hfmkl3j2tujam//AJk7toFq67D9d7Mx4pt3bZ25vgUYQxbf2lgIk3zm6fWs1Q0OCpqdzPUPA/uvdbUHw1+JHTvwX+NPU/xa6JwMWE696p2xSYWmnaKFMturPSA1e6d9bonhVVrt1713BNUZLISgBPuKhkiWOFI40917oz3v3Xuve/de6+fv/wALlf8Agf8Ay0f+oP5cf9bvjd7917o6v/CJr/t3x8pv/Fycp/75LqD37r3W5n7917r3v3Xuve/de6+G983/APt4z8vf/F1+/v8A3+m7Pfuvdfcej/zaf8EX/oUe/de6g5jMYjbuIyu4NwZXG4LA4LG12YzebzFdTYzEYfEYymlrcllcrkq2WCjx+Nx9HA8088zpFFEjMzBQT7917r45381LKVf80r+dX8pcj8C9j7j77TubtfA7a6tx/WmDrMxJvpNhbA2X1vmt+UPhiSCj2dmMrtSqy8mYq2pqCnxk33tVLDCJJB7r3X1Vv5Y3xX3H8JPgD8UfivvLN0u4N59OdQ4Hb+88nj2MmM/vhXyVe4t1Y/DzsS9ZhMNn81UUVFOwRqilp45CkZYovuvdf//X3+PfuvdcJI45o3ilRJYpUaOSORVeOSN1KujowKujqSCCLEe/de6+Rb/woB/lu7q/lGfzG6PsDoaDL7G6N7d3J/swvxW3Vt6Oegg6z3XgNy0ma3F1rgckZZ3gy3Tu7ZaKpx3qLxYWvxbMzy+Uj3XuvpDfycP5km0f5pHwY6x+ReOlxtB2fjYR138g9m0Mqatn9zbXoqJdyCKlVUNNgN30lVTZ7EKNYjxuTihZ2nhmC+690vv5qH8wXYf8sj4TdufKveSY3KZ3b2PG2OoNk5Keogj7H7o3LS10ewdllqMrWDHz1dJLX5SSEiWmwtBWTrdogD7r3VTP/Cbb+XR2F0x1R2N/Mn+X33u4fnP/ADD6yq7S3NltzUbw7o2B1DvDLDeOE2vURzkyYnL9i5KSDcOVpEWBaWmXFY94IZcbIp917rZ39+691737r3XvfuvdfP3/AOFyv/Fw/lo/9Qfy4/63fG737r3R1f8AhE1/274+U/8A4uTk/wD3yXUHv3XutzP37r3Xvfuvde9+6918NH54wT1X8wj5mUtLN9tU1PzK+REFPUBnTwTzd3bwjhm1xXkTxSMGuvqFuOffuvdfU/w38sL+an/dbH4vcX8/n5D1eYgxdFRyZDA/ED4wYej8tPSRQF7VNDlM/VktHczTZBqmY3eRy7Mx917qob+YL/wmo/mq/KzbFdSVH86zfHybpX01UPUPyOwO/uqurZaymtNDMcf1pvfsnZ0dYZoY9Eo2ojIwuX49+691TJ1T/NS/mbf8Jzd97c+KXfP8uv4k7OwlHtjb9FkqzCdVY/rnevyC2ztsx0UXYtJ8m+rMvlMN2nuLIwlY6zKZSiz01FUt4aqjpqpJIB7r3W8z/Ke/nIfFb+bj1Zl919KTZbY3a+woMYO3ugt7z0Lb32HNk/JDSZnG11Awx+9dhZSsppY6LMUixElVSspqGpcUw917r//Q3+Pfuvde9+691UP/ADuv5aGE/mkfAzsjoyhosXH3dtBZO0fjduSvlhoRiO3ds4+tXHYGsy0kbmh232Hi6mpwWSL6oYY62OsKNLSQlfde6+dt/wAJ1f5m24/5WP8AMHXq7uqsyG0fj58gtx0HRnyK2/umefC0vV2+MbnqjD7N7SzNDWiFMTX9a7nqqnH5pp9AgweQyDOrSwQBfde62UclV/8AQRz/ADsKfb9JJ/eX+VJ/KkzTZDLTxPLXbF+SHeTZQU6RGSCWbC7gw+8ty7eeKlf/ACmml2PgKmSN4Hz4De691u3gAAAAAAAAAWAA4AAHAAHv3Xuu/fuvde9+691737r3Xz9/+Fyv/A/+Wj/1B/Lj/rd8bvfuvdHV/wCETX/bvj5Tf+Lk5T/3yXUHv3XutzP37r3Xvfuvde9+6918Nz5xMqfzF/l+7sqInzV+QDO7EBVVe9N2lmYngKoFyffuvdfcfhZXhidGDI0aMrKbqysoKspHBBB49+691k9+691rM/8ACtPpTrTsn+Tr212TvDH4kb4+P/YfTu+OqM/U08X8WoM3u3s7afV25cJj64J94tDuHaO86pqmlVhBNNR000ilqaJk917rS5/4Sb13ZNJ/Oo6Lg2G1WNv5PrHvuh7eWAzikfrZOr87kaZcp4SAaRezsftpohJeP71YL82I917r/9Hf49+691737r3XvfuvdfM0/wCFbP8AK4ynU/zf6t+WPQuxq/I7a+d+bp9mbl23tqikq5n+V9LNS0P22PoIHLfxHubBVVJWU9PFGXq8zQ5SdiXmA9+691vBfyc/5cm1P5X/AMEup/jjj6XHT9mVlGvYnyC3ZQpEz7v7s3ZQ0Mu65fvInkWtw+06elpsBiZBpD4vFQSMolklLe691aT7917r3v3Xuve/de6KD8u/m90p8J8DszO9x43uPNDsHMZPA7Tw/TPRXbPeOdyGSxFBHk6+Krx3Vu0tznBxJRyho5K9qVJ7MIi5jk0+6918/L/hSr3539/No7e+OFF8W/5f/wDMDbqr45bS7Gpn3jvz4kdwbZrN5bs7Sym0J8tJg9u0+3svXU228PithUCRVNd9nV1FVPUKaZIoopZ/de6Mb/wmm+Z3a/8AK063+QPx8+YHwJ/mDbf2V2V2Hh+3Nk9j7K+H/c278fis2NrUe0d14Pd+Fh2zRZ+jgqaDb2MmoKmip69XdalJ1gCxtJ7r3W9X8Vvlb1R8xusZ+2enqfsij2zR7py+zK+h7U6l7I6Z3XQ7iwVNjavJUku0+z9tbXztRSQw5aELWU8M1FJL5IkmaWGZI/de6Mn7917qqn5hfzePj/8AD3fu8Oo8r0z8yu8u2tn7exeen2X8d/ij2/2TQ5B8/h0zOAxtB2FDt7Hdaz1FfTTIsjx5aSKklLxTFJopIl917r5OveHw6/mId390dwd11/wD+YWGrO3e0Owe0a7FQfG3u6vp8TVb93Zl911WOir22DSmshx8+VaISmKMyBNRVb2HuvdfQj+B/wDwoqy+P6C652P8/wD4C/zDupO99kbQwO2N3742t8Suyt59a9i1eCx9LiP75Y8U2Nxe7dt5ncf233lbjJcTJR0k0pWCsnUhU917o7Wb/n89NT43z9SfAP8Am1995ioKxY/C9bfAPtKA1E7t4w1TlN6TbUx1JRwv/npQ8rRrchGtb37r3VFf8xTon+f1/wAKAa7aXT0fxDw38un4Obb3NRbwp8P8hez8TS7w3ruSkp6uixe6e1cftqkyvZFXNhMdVzy43b1HtilxtDV1TGrq66eKkqqX3Xur/P5Mv8jn48/yfuv9x1G1s/X9xfJHs/F4/G9td8Z/FU+Eapw+PqFr6bYfXG2IqnI/3J2BBkUSqqIZKytr8tXRxz1lS8cFDS0Xuvdf/9k=</mdui:Logo>
-      </mdui:UIInfo>
-      <mdui:DiscoHints>
-        <mdui:IPHint>193.191.128.0/24</mdui:IPHint>
-        <mdui:DomainHint>vib.be</mdui:DomainHint>
-        <mdui:GeolocationHint>geo:51.018402,3.691419</mdui:GeolocationHint>
-      </mdui:DiscoHints>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-
-MIIDFDCCAfygAwIBAgIVAJDe4t8YsctH2JGBPfdMqwdkUTh3MA0GCSqGSIb3DQEB
-BQUAMBUxEzARBgNVBAMTCmlkcC52aWIuYmUwHhcNMTMwOTEwMTI0NzU5WhcNMzMw
-OTEwMTI0NzU5WjAVMRMwEQYDVQQDEwppZHAudmliLmJlMIIBIjANBgkqhkiG9w0B
-AQEFAAOCAQ8AMIIBCgKCAQEAjX9kGhK6nYxWvuNeuNdGuU2xyEsUyTEE7a3+vWG1
-//IcBPi6b0KXBYOKysqTekzYsoNiSxi9sup5Yx6lgS+nqHoM+ULqyKH5t78HctvB
-g5R4WGNQ5QW01uw3eLZ5OaCnyb/XXwYhUdZJraaFL/R5sSzkwHRkJ5XN1kUjj3M9
-IIr9Kquc6/gbvZj0P4dRHB8WTkboKoC71yF0lJQtiawK5mmH6kmnnR6hNe7+PPY3
-SSysNjOWscyBKXvLQiyC3/5a7ILzWTo9xAwoDvl87JnlgrZaNTbcVpugDufOI496
-FIq7kMHqMJVxcBht64HXHQ+jdiAL1Fga/zmd2nNbi+1a3QIDAQABo1swWTA4BgNV
-HREEMTAvggppZHAudmliLmJlhiFodHRwczovL2lkcC52aWIuYmUvaWRwL3NoaWJi
-b2xldGgwHQYDVR0OBBYEFCvlrzRYM0OZ/HvA0ZUxTRM3tRUPMA0GCSqGSIb3DQEB
-BQUAA4IBAQAhQdI6woZQyn6p9LAr9IEjc+6CvYLq/SRLK651E/D1j1C3NznmPf3T
-Wc8cMRy5g6EGmuIUk7BIo55eAIH95AgXNbvC2/OEkmwDtMV1nDV/rP3XWp0WzOhL
-SkG9fvuA/Mm6v6UtLW6HDRu6GzZPNPegDdSbJ01xpuOaF+O011U2ThaXZFHv+3fw
-81HKd3ZJ1cImeP4gijREmG7Go+Vq2ROM8/+3f/VhYSOgJU9g6ylkxKLKcxAeyg5J
-0BNkUbCgjbqiU1mg5oV7QYFyYKhOO0vJPFfv5DeLIfCdKFo7Hw/HzI3Y+Afjy0+L
-VJxJ/lqmkwOe7YkIk4wBzp6DTlfsek98
-
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.vib.be:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.vib.be: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.vib.be/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.vib.be/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.vib.be/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.vib.be/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">vib.be</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-
-MIIDFDCCAfygAwIBAgIVAJDe4t8YsctH2JGBPfdMqwdkUTh3MA0GCSqGSIb3DQEB
-BQUAMBUxEzARBgNVBAMTCmlkcC52aWIuYmUwHhcNMTMwOTEwMTI0NzU5WhcNMzMw
-OTEwMTI0NzU5WjAVMRMwEQYDVQQDEwppZHAudmliLmJlMIIBIjANBgkqhkiG9w0B
-AQEFAAOCAQ8AMIIBCgKCAQEAjX9kGhK6nYxWvuNeuNdGuU2xyEsUyTEE7a3+vWG1
-//IcBPi6b0KXBYOKysqTekzYsoNiSxi9sup5Yx6lgS+nqHoM+ULqyKH5t78HctvB
-g5R4WGNQ5QW01uw3eLZ5OaCnyb/XXwYhUdZJraaFL/R5sSzkwHRkJ5XN1kUjj3M9
-IIr9Kquc6/gbvZj0P4dRHB8WTkboKoC71yF0lJQtiawK5mmH6kmnnR6hNe7+PPY3
-SSysNjOWscyBKXvLQiyC3/5a7ILzWTo9xAwoDvl87JnlgrZaNTbcVpugDufOI496
-FIq7kMHqMJVxcBht64HXHQ+jdiAL1Fga/zmd2nNbi+1a3QIDAQABo1swWTA4BgNV
-HREEMTAvggppZHAudmliLmJlhiFodHRwczovL2lkcC52aWIuYmUvaWRwL3NoaWJi
-b2xldGgwHQYDVR0OBBYEFCvlrzRYM0OZ/HvA0ZUxTRM3tRUPMA0GCSqGSIb3DQEB
-BQUAA4IBAQAhQdI6woZQyn6p9LAr9IEjc+6CvYLq/SRLK651E/D1j1C3NznmPf3T
-Wc8cMRy5g6EGmuIUk7BIo55eAIH95AgXNbvC2/OEkmwDtMV1nDV/rP3XWp0WzOhL
-SkG9fvuA/Mm6v6UtLW6HDRu6GzZPNPegDdSbJ01xpuOaF+O011U2ThaXZFHv+3fw
-81HKd3ZJ1cImeP4gijREmG7Go+Vq2ROM8/+3f/VhYSOgJU9g6ylkxKLKcxAeyg5J
-0BNkUbCgjbqiU1mg5oV7QYFyYKhOO0vJPFfv5DeLIfCdKFo7Hw/HzI3Y+Afjy0+L
-VJxJ/lqmkwOe7YkIk4wBzp6DTlfsek98
-
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.vib.be:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.vib.be: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">
-VIB
-</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">
-VIB - Vlaams Instituut voor Biotechnologie
-</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">
-http://www.vib.be
-</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Jasper</GivenName>
-    <SurName>Minnaert</SurName>
-    <EmailAddress>jasper.minnaert@vib.be</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.vib.be.xml b/swamid-interfederations-2.0/idp.vib.be.xml
deleted file mode 100644
index ccffbee7..00000000
--- a/swamid-interfederations-2.0/idp.vib.be.xml
+++ /dev/null
@@ -1,111 +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: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:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://idp.vib.be/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://federation.belnet.be/" registrationInstant="2012-03-27T12:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://federation.belnet.be/files/Belnet-metadata-registration-practice-statement.txt</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">belnet.be</shibmd:Scope>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="en">VIB</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Vlaams Instituut voor Biotechnologie</mdui:Description>
-        <mdui:Logo height="16" width="16">data:image/jpg;base64,/9j/4QQ5RXhpZgAATU0AKgAAAAgADAEAAAMAAAABA2IAAAEBAAMAAAABA+gAAAECAAMAAAADAAAAngEGAAMAAAABAAIAAAESAAMAAAABAAEAAAEVAAMAAAABAAMAAAEaAAUAAAABAAAApAEbAAUAAAABAAAArAEoAAMAAAABAAIAAAExAAIAAAAeAAAAtAEyAAIAAAAUAAAA0odpAAQAAAABAAAA6AAAASAACAAIAAgALcbAAAAnEAAtxsAAACcQQWRvYmUgUGhvdG9zaG9wIENTNiAoV2luZG93cykAMjAxNDowNToxOSAxNTo1NTo0OAAAAAAEkAAABwAAAAQwMjIxoAEAAwAAAAH//wAAoAIABAAAAAEAAAAQoAMABAAAAAEAAAAQAAAAAAAAAAYBAwADAAAAAQAGAAABGgAFAAAAAQAAAW4BGwAFAAAAAQAAAXYBKAADAAAAAQACAAACAQAEAAAAAQAAAX4CAgAEAAAAAQAAArMAAAAAAAAASAAAAAEAAABIAAAAAf/Y/+0ADEFkb2JlX0NNAAL/7gAOQWRvYmUAZIAAAAAB/9sAhAAMCAgICQgMCQkMEQsKCxEVDwwMDxUYExMVExMYEQwMDAwMDBEMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMAQ0LCw0ODRAODhAUDg4OFBQODg4OFBEMDAwMDBERDAwMDAwMEQwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAz/wAARCAAQABADASIAAhEBAxEB/90ABAAB/8QBPwAAAQUBAQEBAQEAAAAAAAAAAwABAgQFBgcICQoLAQABBQEBAQEBAQAAAAAAAAABAAIDBAUGBwgJCgsQAAEEAQMCBAIFBwYIBQMMMwEAAhEDBCESMQVBUWETInGBMgYUkaGxQiMkFVLBYjM0coLRQwclklPw4fFjczUWorKDJkSTVGRFwqN0NhfSVeJl8rOEw9N14/NGJ5SkhbSVxNTk9KW1xdXl9VZmdoaWprbG1ub2N0dXZ3eHl6e3x9fn9xEAAgIBAgQEAwQFBgcHBgU1AQACEQMhMRIEQVFhcSITBTKBkRShsUIjwVLR8DMkYuFygpJDUxVjczTxJQYWorKDByY1wtJEk1SjF2RFVTZ0ZeLys4TD03Xj80aUpIW0lcTU5PSltcXV5fVWZnaGlqa2xtbm9ic3R1dnd4eXp7fH/9oADAMBAAIRAxEAPwDVuovsvv8A1y/1BbYHAVWxo53uY6l9jP7C0KsLJPS8e7IvqNeK5925jH1WXN/mf1qvdW6rIrtc39Jvt/m0VmE3Jy8uq5jm34z7H5ILjsFZDrMSyn977T/4F6dyqvuppwcMMqBqsxauo2NrJNhHrVOsrL/p3MZZlOyPo2fzX8yny5rNOQjKHDGGsZjIDf2YsWSP/PaeHlPbEzQJyCqr9k8k4P8A/9n/7QwUUGhvdG9zaG9wIDMuMAA4QklNBAQAAAAAAA8cAVoAAxslRxwCAAACAAIAOEJJTQQlAAAAAAAQ/OEfici3yXgvNGI0B1h36zhCSU0EOgAAAAABGQAAABAAAAABAAAAAAALcHJpbnRPdXRwdXQAAAAFAAAAAFBzdFNib29sAQAAAABJbnRlZW51bQAAAABJbnRlAAAAAENscm0AAAAPcHJpbnRTaXh0ZWVuQml0Ym9vbAAAAAALcHJpbnRlck5hbWVURVhUAAAAGwBcAFwAdABvAHQAbwBcAEMAYQBuAG8AbgAgAEYAbABvAG8AcgAgADEAIABDAG8AbABvAHIAAAAAAA9wcmludFByb29mU2V0dXBPYmpjAAAADABQAHIAbwBvAGYAIABTAGUAdAB1AHAAAAAAAApwcm9vZlNldHVwAAAAAQAAAABCbHRuZW51bQAAAAxidWlsdGluUHJvb2YAAAAJcHJvb2ZDTVlLADhCSU0EOwAAAAACLQAAABAAAAABAAAAAAAScHJpbnRPdXRwdXRPcHRpb25zAAAAFwAAAABDcHRuYm9vbAAAAAAAQ2xicmJvb2wAAAAAAFJnc01ib29sAAAAAABDcm5DYm9vbAAAAAAAQ250Q2Jvb2wAAAAAAExibHNib29sAAAAAABOZ3R2Ym9vbAAAAAAARW1sRGJvb2wAAAAAAEludHJib29sAAAAAABCY2tnT2JqYwAAAAEAAAAAAABSR0JDAAAAAwAAAABSZCAgZG91YkBv4AAAAAAAAAAAAEdybiBkb3ViQG/gAAAAAAAAAAAAQmwgIGRvdWJAb+AAAAAAAAAAAABCcmRUVW50RiNSbHQAAAAAAAAAAAAAAABCbGQgVW50RiNSbHQAAAAAAAAAAAAAAABSc2x0VW50RiNQeGxAcsAAAAAAAAAAAAp2ZWN0b3JEYXRhYm9vbAEAAAAAUGdQc2VudW0AAAAAUGdQcwAAAABQZ1BDAAAAAExlZnRVbnRGI1JsdAAAAAAAAAAAAAAAAFRvcCBVbnRGI1JsdAAAAAAAAAAAAAAAAFNjbCBVbnRGI1ByY0BZAAAAAAAAAAAAEGNyb3BXaGVuUHJpbnRpbmdib29sAAAAAA5jcm9wUmVjdEJvdHRvbWxvbmcAAAAAAAAADGNyb3BSZWN0TGVmdGxvbmcAAAAAAAAADWNyb3BSZWN0UmlnaHRsb25nAAAAAAAAAAtjcm9wUmVjdFRvcGxvbmcAAAAAADhCSU0D7QAAAAAAEAEsAAAAAQACASwAAAABAAI4QklNBCYAAAAAAA4AAAAAAAAAAAAAP4AAADhCSU0EDQAAAAAABAAAAB44QklNBBkAAAAAAAQAAAAeOEJJTQPzAAAAAAAJAAAAAAAAAAABADhCSU0ECgAAAAAAAQAAOEJJTScQAAAAAAAKAAEAAAAAAAAAAjhCSU0D9QAAAAAASAAvZmYAAQBsZmYABgAAAAAAAQAvZmYAAQChmZoABgAAAAAAAQAyAAAAAQBaAAAABgAAAAAAAQA1AAAAAQAtAAAABgAAAAAAAThCSU0D+AAAAAAAcAAA/////////////////////////////wPoAAAAAP////////////////////////////8D6AAAAAD/////////////////////////////A+gAAAAA/////////////////////////////wPoAAA4QklNBAgAAAAAABAAAAABAAACQAAAAkAAAAAAOEJJTQQeAAAAAAAEAAAAADhCSU0EGgAAAAADSwAAAAYAAAAAAAAAAAAAABAAAAAQAAAACwBWAEkAQgBfAHIAZwBiAF8AcABvAHMAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAABAAAAAQAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAEAAAAAAABudWxsAAAAAgAAAAZib3VuZHNPYmpjAAAAAQAAAAAAAFJjdDEAAAAEAAAAAFRvcCBsb25nAAAAAAAAAABMZWZ0bG9uZwAAAAAAAAAAQnRvbWxvbmcAAAAQAAAAAFJnaHRsb25nAAAAEAAAAAZzbGljZXNWbExzAAAAAU9iamMAAAABAAAAAAAFc2xpY2UAAAASAAAAB3NsaWNlSURsb25nAAAAAAAAAAdncm91cElEbG9uZwAAAAAAAAAGb3JpZ2luZW51bQAAAAxFU2xpY2VPcmlnaW4AAAANYXV0b0dlbmVyYXRlZAAAAABUeXBlZW51bQAAAApFU2xpY2VUeXBlAAAAAEltZyAAAAAGYm91bmRzT2JqYwAAAAEAAAAAAABSY3QxAAAABAAAAABUb3AgbG9uZwAAAAAAAAAATGVmdGxvbmcAAAAAAAAAAEJ0b21sb25nAAAAEAAAAABSZ2h0bG9uZwAAABAAAAADdXJsVEVYVAAAAAEAAAAAAABudWxsVEVYVAAAAAEAAAAAAABNc2dlVEVYVAAAAAEAAAAAAAZhbHRUYWdURVhUAAAAAQAAAAAADmNlbGxUZXh0SXNIVE1MYm9vbAEAAAAIY2VsbFRleHRURVhUAAAAAQAAAAAACWhvcnpBbGlnbmVudW0AAAAPRVNsaWNlSG9yekFsaWduAAAAB2RlZmF1bHQAAAAJdmVydEFsaWduZW51bQAAAA9FU2xpY2VWZXJ0QWxpZ24AAAAHZGVmYXVsdAAAAAtiZ0NvbG9yVHlwZWVudW0AAAARRVNsaWNlQkdDb2xvclR5cGUAAAAATm9uZQAAAAl0b3BPdXRzZXRsb25nAAAAAAAAAApsZWZ0T3V0c2V0bG9uZwAAAAAAAAAMYm90dG9tT3V0c2V0bG9uZwAAAAAAAAALcmlnaHRPdXRzZXRsb25nAAAAAAA4QklNBCgAAAAAAAwAAAACP/AAAAAAAAA4QklNBBEAAAAAAAEBADhCSU0EFAAAAAAABAAAAAE4QklNBAwAAAAAAs8AAAABAAAAEAAAABAAAAAwAAADAAAAArMAGAAB/9j/7QAMQWRvYmVfQ00AAv/uAA5BZG9iZQBkgAAAAAH/2wCEAAwICAgJCAwJCQwRCwoLERUPDAwPFRgTExUTExgRDAwMDAwMEQwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwBDQsLDQ4NEA4OEBQODg4UFA4ODg4UEQwMDAwMEREMDAwMDAwRDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDP/AABEIABAAEAMBIgACEQEDEQH/3QAEAAH/xAE/AAABBQEBAQEBAQAAAAAAAAADAAECBAUGBwgJCgsBAAEFAQEBAQEBAAAAAAAAAAEAAgMEBQYHCAkKCxAAAQQBAwIEAgUHBggFAwwzAQACEQMEIRIxBUFRYRMicYEyBhSRobFCIyQVUsFiMzRygtFDByWSU/Dh8WNzNRaisoMmRJNUZEXCo3Q2F9JV4mXys4TD03Xj80YnlKSFtJXE1OT0pbXF1eX1VmZ2hpamtsbW5vY3R1dnd4eXp7fH1+f3EQACAgECBAQDBAUGBwcGBTUBAAIRAyExEgRBUWFxIhMFMoGRFKGxQiPBUtHwMyRi4XKCkkNTFWNzNPElBhaisoMHJjXC0kSTVKMXZEVVNnRl4vKzhMPTdePzRpSkhbSVxNTk9KW1xdXl9VZmdoaWprbG1ub2JzdHV2d3h5ent8f/2gAMAwEAAhEDEQA/ANW6i+y+/wDXL/UFtgcBVbGjne5jqX2M/sLQqwsk9Lx7si+o14rn3bmMfVZc3+Z/Wq91bqsiu1zf0m+3+bRWYTcnLy6rmObfjPsfkguOwVkOsxLKf3vtP/gXp3Kq+6mnBwwyoGqzFq6jY2sk2EetU6ysv+ncxlmU7I+jZ/NfzKfLms05CMocMYaxmMgN/ZixZI/89p4eU9sTNAnIKqv2TyTg/wD/2QA4QklNBCEAAAAAAFUAAAABAQAAAA8AQQBkAG8AYgBlACAAUABoAG8AdABvAHMAaABvAHAAAAATAEEAZABvAGIAZQAgAFAAaABvAHQAbwBzAGgAbwBwACAAQwBTADYAAAABADhCSU0EBgAAAAAABwAIAAAAAQEA/+EOP2h0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC8APD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQiPz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENvcmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJERiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczpwaG90b3Nob3A9Imh0dHA6Ly9ucy5hZG9iZS5jb20vcGhvdG9zaG9wLzEuMC8iIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1sbnM6eG1wTU09Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9tbS8iIHhtbG5zOnN0UmVmPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvc1R5cGUvUmVzb3VyY2VSZWYjIiB4bWxuczpzdEV2dD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL3NUeXBlL1Jlc291cmNlRXZlbnQjIiB4bWxuczpkYz0iaHR0cDovL3B1cmwub3JnL2RjL2VsZW1lbnRzLzEuMS8iIHhtbG5zOnhtcFJpZ2h0cz0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL3JpZ2h0cy8iIHBob3Rvc2hvcDpMZWdhY3lJUFRDRGlnZXN0PSI0NjBDRjI4OTI2Qjg1NkRBQjA5QzAxQTFCMEE3OTA3NyIgcGhvdG9zaG9wOkNvbG9yTW9kZT0iMyIgeG1wOkNyZWF0b3JUb29sPSJBZG9iZSBQaG90b3Nob3AgQ1MgTWFjaW50b3NoIiB4bXA6Q3JlYXRlRGF0ZT0iMjAwNy0wMi0yOFQxNjozNDoxNyswMTowMCIgeG1wOk1vZGlmeURhdGU9IjIwMTQtMDUtMTlUMTU6NTU6NDgrMDI6MDAiIHhtcDpNZXRhZGF0YURhdGU9IjIwMTQtMDUtMTlUMTU6NTU6NDgrMDI6MDAiIHhtcE1NOkRvY3VtZW50SUQ9InV1aWQ6NTg3QzdFNEVDOEQ0MTFEQjk2RTNBMEI2OTA3Q0JDMDAiIHhtcE1NOkluc3RhbmNlSUQ9InhtcC5paWQ6QUNBNDA5NDg1RERGRTMxMUI5QzdBRTkzN0QxOEM4QzAiIHhtcE1NOk9yaWdpbmFsRG9jdW1lbnRJRD0idXVpZDo1ODdDN0U0RUM4RDQxMURCOTZFM0EwQjY5MDdDQkMwMCIgZGM6Zm9ybWF0PSJpbWFnZS9qcGVnIiB4bXBSaWdodHM6TWFya2VkPSJGYWxzZSI+IDx4bXBNTTpEZXJpdmVkRnJvbSBzdFJlZjppbnN0YW5jZUlEPSJ1dWlkOjU4N0M3RTREQzhENDExREI5NkUzQTBCNjkwN0NCQzAwIiBzdFJlZjpkb2N1bWVudElEPSJ1dWlkOjU4N0M3RTRDQzhENDExREI5NkUzQTBCNjkwN0NCQzAwIi8+IDx4bXBNTTpIaXN0b3J5PiA8cmRmOlNlcT4gPHJkZjpsaSBzdEV2dDphY3Rpb249InNhdmVkIiBzdEV2dDppbnN0YW5jZUlEPSJ4bXAuaWlkOkFDQTQwOTQ4NURERkUzMTFCOUM3QUU5MzdEMThDOEMwIiBzdEV2dDp3aGVuPSIyMDE0LTA1LTE5VDE1OjU1OjQ4KzAyOjAwIiBzdEV2dDpzb2Z0d2FyZUFnZW50PSJBZG9iZSBQaG90b3Nob3AgQ1M2IChXaW5kb3dzKSIgc3RFdnQ6Y2hhbmdlZD0iLyIvPiA8L3JkZjpTZXE+IDwveG1wTU06SGlzdG9yeT4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgPD94cGFja2V0IGVuZD0idyI/Pv/uAA5BZG9iZQBkQAAAAAH/2wCEAAEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQECAgICAgICAgICAgMDAwMDAwMDAwMBAQEBAQEBAQEBAQICAQICAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDA//AABEIABAAEAMBEQACEQEDEQH/3QAEAAL/xAGiAAAABgIDAQAAAAAAAAAAAAAHCAYFBAkDCgIBAAsBAAAGAwEBAQAAAAAAAAAAAAYFBAMHAggBCQAKCxAAAgEDBAEDAwIDAwMCBgl1AQIDBBEFEgYhBxMiAAgxFEEyIxUJUUIWYSQzF1JxgRhikSVDobHwJjRyChnB0TUn4VM2gvGSokRUc0VGN0djKFVWVxqywtLi8mSDdJOEZaOzw9PjKThm83UqOTpISUpYWVpnaGlqdnd4eXqFhoeIiYqUlZaXmJmapKWmp6ipqrS1tre4ubrExcbHyMnK1NXW19jZ2uTl5ufo6er09fb3+Pn6EQACAQMCBAQDBQQEBAYGBW0BAgMRBCESBTEGACITQVEHMmEUcQhCgSORFVKhYhYzCbEkwdFDcvAX4YI0JZJTGGNE8aKyJjUZVDZFZCcKc4OTRnTC0uLyVWV1VjeEhaOzw9Pj8ykalKS0xNTk9JWltcXV5fUoR1dmOHaGlqa2xtbm9md3h5ent8fX5/dIWGh4iJiouMjY6Pg5SVlpeYmZqbnJ2en5KjpKWmp6ipqqusra6vr/2gAMAwEAAhEDEQA/AD77t2Vvjc2+u0ZI/kr3lLuWl7Z7Kx2Wx+M6U74/glQlHufORT5Xb+b6833vLa1OJsinipcWggMMGlmmUqUPSjZOYt+5Y5e5UteZva7lNrP9z2rJdSbvtlk09YIyjPDfxQvGzoRqXU/fkOynV1xa5s5L5S5w5r553rlf395ytL08x3qPt/7jvrtLYLcyrIEuLC4uFnjR1OlykRKHMSONHRw9q9M9j1Hxi6c312V2f1lV7a6W3F2L2uuU2hsbsLqbtXv3aNRRt11R03e20INy7RzHX3cGy+wcnQTfximyOcpaqvwkCzUvhqZoPeF9pufM3+ubuUHK+5sm67jLJas3iWl+vhvVZIxNHG9tPEqrSOSJVoANDYq3STc+Xvb+f2R2O55t2WK65Z2eGLcIVjF5Y1mioyXCxmZLiCWWQlpYpXdTqYOpwF//0L88X01jOz+2vkDtPfOAz+L7F6Y3v2pvPu3HVu7tyJ1/hetcvjs3vPoDdXXdVTsMdlafu+kqI6iopp5xPgWw+Zo51V4Kc1GNHuZ9032i9xd4/f0Vrf7ducsbG5Z7qfczczvKjmfVfyP9OFTxEjt7dVgVXUBaxo/QN2nlK4spN0G68yXF7bTXbSxIkaWawRuHrAFtWVZKSMsnjvWZylGOmR16AfM7y2bszpD41UuD2DQT7M3V8VumPn9urFbKzOSyHZGQpaj5F9SZndm0K7cyCs3B2Rtvbm7O+azeNQtXR5b+IVeBWlixLSyUgglnk32927lflifkfc9wl3DkuHbks7G0gU7S1kIpUkinS6sJVuGdVQq8epRK7PK0gd26Vb5sG4blttntW1cxvt8CSxmU/TW9348SKC0LJcAqnjSgO0oJdAWQBhg//9k=</mdui:Logo>
-        <mdui:Logo height="128" width="128">data:image/jpg;base64,/9j/4SH/RXhpZgAATU0AKgAAAAgADAEAAAMAAAABA2IAAAEBAAMAAAABA+gAAAECAAMAAAADAAAAngEGAAMAAAABAAIAAAESAAMAAAABAAEAAAEVAAMAAAABAAMAAAEaAAUAAAABAAAApAEbAAUAAAABAAAArAEoAAMAAAABAAIAAAExAAIAAAAeAAAAtAEyAAIAAAAUAAAA0odpAAQAAAABAAAA6AAAASAACAAIAAgALcbAAAAnEAAtxsAAACcQQWRvYmUgUGhvdG9zaG9wIENTNiAoV2luZG93cykAMjAxNDowNToxOSAxNjoxMDowMwAAAAAEkAAABwAAAAQwMjIxoAEAAwAAAAH//wAAoAIABAAAAAEAAACYoAMABAAAAAEAAACYAAAAAAAAAAYBAwADAAAAAQAGAAABGgAFAAAAAQAAAW4BGwAFAAAAAQAAAXYBKAADAAAAAQACAAACAQAEAAAAAQAAAX4CAgAEAAAAAQAAIHkAAAAAAAAASAAAAAEAAABIAAAAAf/Y/+0ADEFkb2JlX0NNAAL/7gAOQWRvYmUAZIAAAAAB/9sAhAAMCAgICQgMCQkMEQsKCxEVDwwMDxUYExMVExMYEQwMDAwMDBEMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMAQ0LCw0ODRAODhAUDg4OFBQODg4OFBEMDAwMDBERDAwMDAwMEQwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAz/wAARCACYAJgDASIAAhEBAxEB/90ABAAK/8QBPwAAAQUBAQEBAQEAAAAAAAAAAwABAgQFBgcICQoLAQABBQEBAQEBAQAAAAAAAAABAAIDBAUGBwgJCgsQAAEEAQMCBAIFBwYIBQMMMwEAAhEDBCESMQVBUWETInGBMgYUkaGxQiMkFVLBYjM0coLRQwclklPw4fFjczUWorKDJkSTVGRFwqN0NhfSVeJl8rOEw9N14/NGJ5SkhbSVxNTk9KW1xdXl9VZmdoaWprbG1ub2N0dXZ3eHl6e3x9fn9xEAAgIBAgQEAwQFBgcHBgU1AQACEQMhMRIEQVFhcSITBTKBkRShsUIjwVLR8DMkYuFygpJDUxVjczTxJQYWorKDByY1wtJEk1SjF2RFVTZ0ZeLys4TD03Xj80aUpIW0lcTU5PSltcXV5fVWZnaGlqa2xtbm9ic3R1dnd4eXp7fH/9oADAMBAAIRAxEAPwD1G+0U0WXESK2ueQOTtG5c6PrzhkT9mt+9v963uof8n5P/ABNn/UuXmLeB8Fe5Ll8eWMzMXRFa05XxTnc3LyxjEQOIG7HE9j/z4w/+41v3t/8AJJf8+MP/ALjW/e3/AMkuOSVz7hy/7p/xi5v+l+c/ej/ixex/58Yf/ca372/+SS/58Yf/AHGt+9v/AJJcckl9w5f90/4xV/pfnP3o/wCLF7H/AJ8Yf/ca372/+SS/58Yf/ca372/+SXHJJfcOX/dP+MVf6X5z96P+LF7H/nxh/wDca372/wDkkv8Anxh/9xrfvb/5JcchWfbbMzDwcNlYfm2GoX37jXW6N1YsZR+l/TfQZ+YmT5PloRM5RPDHfWRX4viXPZckccJRMpmhYhH/AKT23/PjD/7jW/e3/wAksb61fWCzrfTqel4ONfGVk0sywwjccfd+na0Vu3v3/Re39xQb9SPrTZkNpsysPHxtd+XS177CI9oZiZH6Jn6T/h0TA+qHXD1S7Dz3huFUwOp6pjxW95P5rMdzrvQyK3e71f5tVj9xIIHFE1pL1bt+J+KgxlIQlHiqUPTxcP7zHrHR+h4ee7pn1aws8dXAZbczpuS/FpY15/R/bch7349DbGCz02V0+stfE6L9dGY7Aet1Yzqz7Mf0Tlt26+2/NzHszL37nfzv6Ja/RuhYXR23/Z3W23ZT/VycnIebLbHABjfUtd+41vsZ9BaKouq83d1X62dIqdb1PAo6pQ3/AAvTXFl20DvgZe71bP8Awvlf9aQ6fr/03IpZfRRZZVYJY8Fuv4+1zfz2rZ610jF6z063ByPbu91Nzfp1Wt/mcmh30mXUv9zF5PZe/pWc6nqgrw7nk1Z1LBoMqsB1OdXTWPZT1XEO/wDR72WZdV382p+W9oz4co9Mv0r4eEtXnjzEcRny59cNTDh4+OP9X+s+hf8APjD/AO41v3t/8kl/z4w/+41v3t/8kuCPWOmtBLrXBrdHPNVoaCRuDXu9L2vc33ItHUMDJdsoyK3v/wBHO1//AG1Zss/6K0I8rycjUSCewnbjz5/4lAXOMojvLFwj8YvpHR+v0dWstrqqfUagHEvjWSR+b8Eli/UcEZWWDodjNPm5JVvu+P737Veitr/qcTd++5v9HfeLHuXvWn85w/K//9D03qH/ACfk/wDE2f8AUuXmLeB8Fp/Wj/GU+rJzOm9Kw/UxsV4xuodUubY6ikvPo2fosdvqO2O9n8577Gfo67Fz/TepV5pvpD67LMVwa62jcaXtcJrtpNobY3d/o7PetH4bkiOKBPqlrH/BcX43hnIQygXCHpkf3eL5W6kkktNwlJJJJKUkkkkpSazqdnSan9RqsFNmONzHuBLd30Wsexpa57bPobE6odcwbs/pz6KI9Vrm2MaTDXFn+Dd/WTMt+3OhxHhNR7smDh97HxS4I8cbl+7ru9J0b/Gi626jH60zCwXEhmQ77Q/c0x/O+iKLqa2f8FZmexdT0P61dI65fkYuG9zcvE/pGPY2HN9zmBwsYbKLWO2/TousXjXTautYbczDo6e26h3vfVkgNO50bWb2nblN2j+b/wDPau9JzOv/AFU6n9pwzjVUdWfWy91zS+uuw73Cl3puZe2ut73+9n5ixZ8tKMOMCRr5vSY8P+F+k9Rj57HPL7ZMBf8ANkZIzOTTi+T9B9wSXM/Uz6x9X60/qdHVcWrGv6beMd3oEuYXwfWr9Qus3WVOb79v766ZQNtS8s67i5v1h+uXWG4jmYOV0pmIzCvucGVm2uxuSz1/pvfbbvt+zO2fzbP0i9ReHFpDTtcQYdEwfGF4D1zpRo66Om9Zstf1A3Opysx5J9Vth3YOfW632tbtPpPq3/4NECyAOui2chGJkdogyNeD7ziuvZhVOzXNF7amnIcIDd4aPWd+7t3KlldI+r3XsKb8bHzcbJG9tzQ07pG31qsir379v+FqsXimGPrN1PI/5udPzc7P6XjuLcgUA6Vuhl7Nj7WVPq9n6Gq+/wBFe1/VqzGd0bHqxcXIwqcZv2dlGWz07QKv0cvaNzHbtv8AOM+mkQQSD0TGQlESG0hYscO/hJ5Z9Lv8X3U68hgvy/q5nbaLXPcLH4lu79E7c7a5+Lbu/sf1/TrtSvfXPM6b9YOiWdC6ZkVZ2Xm3UUt+zuFoqPqix+Re6rd6ddNePdv/AO2/8IklxSu7N7XaPbhVcMaviqtOLfif/9Hruk/U+zpd+Rg+uzqH1fzd912JmMa+1uQ5zXtsbcGfrDH7ff6/6St9dXprg2dE6l9VftGN1Dp9rcZ9rrKM3FacitzNAyu59f6avZ/g/XrrXsF1oppfa4EitpcQOYaNyw+k/Xj6t9VsdRVlDHyWO2nHyv0NhMw3Y23+c3f8GpMWSeKXuR/u67MHMYMfMQOGZOtS9JqWnV84b9YejGw1uyPReORcx7P+qaot+snQnNLhltAbyC14Jj90bPcvX8jC6fntrOTRVktrc22o2Na8Nc3Wuxm7d7m/muUnYGC9wc7Hqc5p3NcWNJB/eGitf6Sy/uw/53/fNA/A+X/fyfbD/vHx7/nH0cxttssDhMsqeR8D7R7kWjrfR74FeXWHExssJrdPh+k2r2IAAAAQBoAFndU+rnQur1vr6jg05HqCDY5gFg7bmXti5jv6j0h8Sy3rGJH1VL4Hy9emeQHueGX/AHL54QRodEy0X/4tuu9PPo9F6pVbhyS2rOrJcz+Q22nd6n/gSfE/xc/WS+2eqdbbTQP8Hg1w4/8AXbGs9P8AzLFY/wBI4uEHhlfb+1pf6E5jiIEocPSVy1/weFzU/YngDUk6ADzK6H/xs8dpBq611IEcb7K3j+011PuVcf4sHZNmO3q/VHZuNj2Fz6m1mn1mEfzV/o3fTa/6N7P8GgfiWOjUJX0HT7Vw+B5uIA5IcPUji4h/g/8AoTy131g6PS4sdkh5aJd6TXWBv9Z1YLFV6k7D6r9ifiX4+WKLRccGyz0/WGk1fm2Vv02L2HpfQ+kdIpNHTMSrFrfG8Vt1dtG1vqPPvs/trzn66/4u/rR1nrLs7ErwW1EuFYoHou2gufXZlFw/TZNk/pLNyrz5+U4yhOA4Jfukxl/jN3H8IhilHJjyyGSGtzEZw/xPT/03Rwv8ZlvTHHH+svT7GZOTYXYpwWNexzDtaKvfa177mO9v8tdB9ZPrlg9G6Gcxx9LPyKicLCuj1TYfa31aqy/ayt/89/239Nclif4mG3YrbOpdTuGY9jSWNa17a3Efpmbnud6/u/m3t9FbHTP8Un1cx3+r1N9vU7OzXn0amnn9HRjbNv8AU9TYqcuGzwgiPQHUuljExEDIRKf6RiOGP+L6mt9RMv629e6C94z/ALHW2yxrc62v7RfbaXNte+tt+3Grw2bn0NrYz/tv01qdU6J0n684dWfiZVmLbX6uJbc1kPNe415eHbRd/NOc9vtd/OMXU4+PRi0V42NW2qiloZXWwQ1rRo1rWrnPqvj/ALM6/wDWDpjiP0+Q3qVAEAenkhzHw3811d2O9j/+toLni6afrj/i2wsos+x29Muy2sqfa1z3vc/RtsY7q7a/0NXvZa/6f80u+6l1rP6Z9VsrqvU8Jpy8Wt3qY1T/AFK3kO9JljHlrX/Z7Z9b9JX6tVX01r5OJi5bGsyamXMre21jXgOAew7q7IP5zHfRU7ba6an22uDK62l73HQBrRuc4pKfOf8AFli5Wdn2daz4ps9FopxqgK2bSX1MttqYG/zdH6DEq/wVH/CJLc+pmTiZednZeEXHFyGtsoLhtOxznlstKSt+zj97g14ODi/rfzfHxOf95zfdvd09z3eCv0K972uD/wBCf//S9N6j/wAn5P8AxNn/AFLl5bdj4+VWGZNTL2gaCxodH9Un3N/sr1LqH/J+T/xNn/UuXmLeB8Fp/DQDDIDrqHC+OEjJhINECWoaNPSjgvF3RszI6XcO9VjnMdpH6Smx3vWxh/Wz68YLWstfhdWrbJcbA6i537rd7NtH/gSqpKxPk8E/0OH+56fw+VpYvifN49Bk4x2yfrP+d8//ADnep/xnsY9repdFzcVrh/OU7choP50mv0/0f8v/AKCJd/jS6WLCzE6b1HKgwHtoDGH4G17X/wCfWueBI4MJFzjySVD/AKNx3pOVfRtD45mrXFC+9yr/ABXqOnfX+vJss+2dNyMGoAGp73Me55/ODqWO3VbVbs+u3Tm/zVNz/GQ1v/fnLi0k+Pw/AN+KXmf+9YpfGeaN1wR8o/8AfcTtu/xi9YZe5p6AbKd0Msryq5LJ+l6b62+/b+ZuS6z9eMXLwqPs+dlfVzLbYX7r8Q3tc1gLTXc2j16/Ss3b2v3/AODWInDiJAMA8psvhuI/LKQ86kGSHxzOK44Ql5cUJf8Ad/8ARdKr67/WmnFqznDpfUsRwJrbRZbTk5LWu9M20Y9zXOp2fSu9Sldx0rqDOp9Ox+oV12U15VYtZXaAHgO1bvDS9q8yu9c02DHLW3lp9MvnYHR7S/b+a1dd/izzszO+qGJZlwX1OspZYDO9jHFrH/8Aor/rapc1ywwcNSMuK+lDR0uQ54817hMBAQ4aAPFL1cW71SSSSrN9SxLMH0/rnT1EWx6/T34zqS06+nay9ljLfob2+s/9H+4ttYL3G7671V/Z2OZidNfZ9qJJcx91za20tbu2M9SvHtfu2b0lO8uQ/wAZr73dGxMFljqaOoZlePk2MOprLbbPRj/hnVrr1xn+Mm0OZ0fBA912Z6+8CS1uOxz37Xfmb/UZX/UT8QvJAVdyiK+rHnlw4ckgeHhhKXF+7Ud2X1Fa1uRlMYNrW11ta0cAAua0JJ/qP/Ssv+oz8rklo/8Alw+n/qNxf/LP/hf+pX//0/Teof8AJ+T/AMTZ/wBS5eYt4HwXp3UATgZIGpNT9P7JXDYH1Y6vmNa70xj1kfTu9p/7bE2LR+H5IQhkM5CIsbuL8Yw5MuTFHHAzPDL5Q5SUwusZ9Vej4g3dRzdxGpbubWPu91n/AEkZmT9T8L+ZqZa4dwx1h/z7Nydm+Lcrj0M7PmIf9Jq4/g+c65JQx+BPFL/mvIV1XWmKq3Wf1Gl3/Uq5X0LrNv0cO0T+8Nv/AJ82rpn/AFuwqxtoxrHAcD2sH5XID/rjef5vFaP6zyf+pYqU/wDjDgHy1/z5/wDRi2Y/BsI+fNKX92PD/wB+5LPqn1x/NLGf1nt/75vRm/Uvq55fS34ucfyMVp31u6keKqW/Jx/78hO+tPWDw6pvwZ/e5QS/4xjp+EP++kyj4VyY/wA5LzKh9SOod8ikfAOP8E//ADHzv+5NX+a5QP1m61/pWD/rYTf85etf6Zv/AG21M/5Rn+t/iQ/75d/o3kv3Jf4y9v1Dzban0uyqw2xpY4tDg4Bw2y0/vKH+LV7Ok4h+redXZjdRYbLmCx++u6sPcx1mJD7K6n1f9qcb2f6b/SKQ+svWv9Mz/ttq5d/WrLPrr0+52UGsf1GrfUQGj1DU3Dyr6/8ACU12M9Gn/RZNn6RAfFRzcxEiVgaHhA/6La5XBhwcQxAjjq7PF8r68kkuR+uP1v6Di139Ct6p+z82+oizIrrN/otO3fW9lZ3MyL6XP9D/AEf89/o1K2npcHqGJ1Cg5GI82VB7695a5oLq3Guzb6gbubvb9P6Cyvqy23JyeqdYvpbS/MyXU0wHNc7HxScfHsua923e93rPbsb/ADT1zPTKbrLOhZdbceinqOG/pmH0u99ps+xCMmzKZkUN9mY7Er/T/wCD/mP0v6Vd9iYmPhYtWHisFWPjsbXVWJIa1o2tb7vckpMuF+vthd13pVXtIrx8qzj3Dcaapa7+Uu2vvox6X35FjaaawXWWWENa1o5c97va1q826rV1vr314yr8PG9TAwKXYjL2xsd6ey3Iayx21vr/AGm9rNjf9GpeWIGbGSaAkN2vzsZS5XNGIJkYEADd3fqN/Scv+oz8rklP6l1W05uZVcx1VjWMljwWnl3YpK9Y+/3enDv/ANTcrhP+iOGjxcVV1/nX/9T1DJsdVjW2tjcxjnNniQJXDX9Y6plibsl4Dhqxnsb/ANBdvnf0LI/4p/8A1JXnbHDY3UcBZfxScomERIgEGwDVsWUmwvAmeT4nlOm3DxCW4eIWUxLpJtw8QluHiElLpJtw8QluHiElLpJtw8QluHiElLkgNc5xhrQXOJ7ADc53+auI6/1bN6t1DGwsSj7NZQ71mWFwNwgeqLbrGf0dlFbfX9P/AAX01s/W/qZwsHHZXa+q269p31mHBlfus/6TmLuPq59S/qvXXlW1YGQyy3fiXvynu33VkstdZ7H7PSyvZ9H6df6Gz/CLU+G8sD+vlruIf9EyZcUf0vseh6JmOzuk4mW+d9tTS8lrmy6Ie9rbGsf6b3e+p2z31rmvrR9Sfqrb1X/nT1m77Pj47Wuy6oAqtLDFbrdrfVe5/sr2M/nvoLsa666q21VNDK2ANYxoAaGgQ1rWj6LWrn/rn0mvruPhdEtbkNqysgWW30172MZSDY9mTZvr9D12/o6bP0n6b/BrVZWp9U3X/WDqF31symOrxodi9Fx3CNmPI9bLd/wuW9n9itnprrUPHoqxqK8ehuymlja62Ds1o2Mbr+60LG+t+H1HO6acTHyasPBuBZ1HJe812V1HafVx7P5r2/8Aaiq7+eo/R+rUkp5L65fXOnqnqdN6W8X4NTxXcWs3HKyw7dj9Op3uY12HuZ6vULtmz0f0df8AO/pW6R9q6TSxtOQ/7Rq7IuH59j3Ouudsd7dnqvf7VzbPq1lfVfquPk5os/ZjMy/HoyXAbCX1s+xXt2u/7UM+lb/NM9P+Q9dMSAYJEhZXxPNOM4QiTGIHHY04pfL/AM1iyk2A9Z9XOrZXULLq8oMc6prSLWja4gk+135vZJUvqcQcrKj9xn5XJJ3vZPuHHxnjuuK/VXucO6rPt3etv//V9RyXsrx7bLG72MY5zm8yAJc3VcsPrL9XoEdN/wDA6/711V9TbqbKXEhtjSwkcw4bVz4+pHTQI9e/72/+QU+GPKkH342f0dGnzg5y4/duGqPFx8P/AHTV/wCcv1f/APK3/wADr/vS/wCcv1f/APK3/wADr/vVv/mR03/T3/e3/wAgl/zI6b/p7/vb/wCQUvt/Df3D9jUr4r/q/wDmKw+p9Dy63PZ09rQ07YdXX8eyjkdX6HRaandODiADIrrjVXcP6tYeJW5ldtjg47juLfh2aoZH1Wwr7TY620EgCAWxp/ZWFzGPnPveX2I4/uv+SsQ4/wBHf/nOrAH7tj4wPvP+U/daP7d6D/5W/wDgdf8AeiY/Vuh5Fvpt6cGmCZNdcaI3/NDA/wBNd97f/IIuP9V8Kiz1G22kwRBLY1/sqOeLn+E8McfFWmkN0YweOPGBw36v7qDJ6h0TGY1zuntcHGNK6/Ce6r/t3oP/AJW/+B1/3rSyfq5iZLWtfZYA0yII+H7qr/8ANDA/0133t/8AIIY8XxHh/WRxcXgMa7MBxn2h6OltF3UPqxlX0m7pFdljHD0XvqqcWEmdzCfoe791bF3X8emp1hqeQwSQIn/qlXZ9UsFj2vF10tIIkt7f2FZu6Di3VOrdZYA8QSCJ/wCpSmPiolEY/bEP0vkX4uHgn7nz/wCTpp/88MP/ALj3f9H/AMml/wA8MP8A7j3f9H/yaf8A5oYH+mu+9v8A5BL/AJoYH+mu+9v/AJBS/wDCP9X/AJrD+s8G3V13HtrbYK3gPAIBjv8ANZOd9Z+iZLhTmYDsgUWb2CxrHgPbLW2Na930lr1dCxqq21iywhgABJHb+yqD/qX0573PN1wLiSYLe/8AYVr4X7/Hl/0hXBQ9n2/P1cXAt5/3vbx/c64/8rx+XTia2V9a+i5lBx8vAdkUEgmq1tb2y07mHY9xb7XKH/OX6vnU9N/6Ff8Aerf/ADI6b/p7/vb/AOQS/wCZHTf9Pf8Ae3/yC1DH4cd4k+dufXxb/V/8xs9B6p03OtubhYv2ZzGtL3bWtkEmB+jSRukdAxek2WWUWWPNoDXB5B4M6bWt8UlDw8r7tcP6jtXWv+/bVc591r0/eb/q8Hzf94//1u36z9UqOq3W5Leo9QwciwAB2LkvYwFo2t/V5NX9favGvrJlfXP6vdWu6XmdXzXOqh1dgyLQ2ys/zdrP0n53/QevoNcP/jV+qv7Z6L+0sZm7P6aC8ADV9PN1X8r0/wCer/65/pElN36k9L6dd0/C65jZ+fmuuq1GVlPtaHEbLq306U7qrA5n0V1a8d/xPfWn7JnP+r2U+KMwmzEJ4bcB76/+v1t/7dZ/wq9iSUpYP1m6N07Jpt6nm52bgMxaSX2YmS+kBjN1m702n0nWa/uLeXnX+MXqOX13quJ9RukO/S5Dm2dRsGoYwfpGMtj8ytn61b/1hJTzn1F6b9aPrVmW22dZ6jj9Hx3Q+0ZFnqPJ1ZRW4uNfqbPda/b7P+uL1XpHQMbpL7H05GXkOtaGuOVkWX8d2ttc5rHf1Ubo3SMPovTKOm4TdtGO0NB7ud+fa/8A4Sx/verqSnP6v0XH6sytl92RR6RLmnGufQSSI95pc3evKv8AGRidX+quZiHp3Wuouxs1ryGW5Nji11ZZu2va5ns22sXsq8p/x5/S6N8Mn/3WSUj/AMW3SupfWfHys/qnWepGmiwVV01ZVjdztu97rHbnO/PZ9DYvTuldLo6XjHGosuuYXF5fkWvufJj/AAlxc7b7forhv8SX/iezv/Dh/wDPVK9FSUpc11T6l2Z+Rfk1de6tiWXEubVVkxQwnhrMcMb+ib+56q6VJJT83ZnW/rNjZ92FZ1fMc+i11LnfaLYJY41k/wA55L2Wv/F7iNrDX9Z6u98av+2OBn4NbtXifXP/ABR9Q/8ADt3/AJ9evpdJTw3UvqH9Ysep1v1f+svUBczVtGZc6xjj+76jdrWf2qLFyfSf8a31m6NnuwfrFV9sZS815DS1teQwg7XbHV7KbNn/AAjP0n+nXsj3srY6yxwYxgLnOcYAA1LnEr57+tTj9ZfrrnO6JU7L+02htAqE79jGUutH/BudX6nqfuJKfoDDy8fNxKczFeLKMhjbKnju1w3NSVH6sdKs6P8AV/A6Zc4PtxqQ2xw43n3vDf5LXu2pJKf/1/VU3OhTpJKfAv8AGB9W7fqt9YxfhA1YmQ77Tg2N09NzXbn0tP72PZt2f8H6S9h+pv1lp+snQqM9sDIb+iy6x+ba0e/+xZ/O1/yHof13+rLPrJ0G7CaB9rr/AEuG86Ra0aM3fuXN/RPXkn+Lr6z2fVr6w/ZswmvCzHDHy2P0Fbwdtd7gfo+i/wBln/Beokp9k+tX1hx/q50TI6ndDnsGzHqP59rv5qv/AL8//g1g/wCLb6uZGJiXfWHqsv6v1k+q9zx7mVPPqNZ/Jdd/PWf9ar/waynH/n/9dhWPf9XPq+6XHll90/5r22PZ/wCw1X/dhelJKUkkkkpS8p/x5/S6N8Mn/wB1l6svKf8AHn9Lo3wyf/dZJTo/4kv/ABPZ3/hw/wDnqleirzr/ABJf+J7O/wDDh/8APVK9FSUpJJJJT8zdeBP1h6iAYJzLoP8A1169vZ9V/rV6QbZ9asguAAluNQB/35//AE14h1z/AMUfUP8Aw7d/59evpgcJKfN/rD/i0+tfU6iD9ZH5w5GPkh9dc/Cl91f/AIAudxPrV9Z/qDezpmb0jErYGtBLaxW+5rdPW+20Fzb3/wAt7bV7WuM/xtYWNkfU6/ItA9bDsqsoeeQXPZQ9oP8ALrsSU6v1T+uXSvrTiutwyasmmPtGLZG9k/nAj+cqd+bZ/wBQkvJP8UzskfXXFFE7HVXDI8PT2OPu/wCvilJJT//Q9VSXyqkkp+ql4x/jb+qz8XrlHVMGour6s7Y9jRP6yNNB/wB2W+7/AIz1V54kkp+jvqb9XKvq30Gjp7QDkEerl2D865w/Sf2a/wCar/kVrcXyqkkp+qkl8qpJKfprq/XMLo9db8sXO9YltbaKbLnEgbjpQx+3+2vKP8ZfUOofWjMwx03pWf8AZsJjx6lmNY0udYWbtrNrvY1tTPpLzxJJT6f/AItOtZf1axsvA6r0vPZVfYLqrq8axwB2+nY2xu3f+YzZtXp3SurYnVsU5WILBWHFhF1b6nBzY3fo72sd+cvmJJJT9VLC6x9b+n9JyLMV2NmZWTW0ONeNj2WA7huY0XbRT/4IvnJJJTr53RvrFmZuRmO6VltORa+0t9C0wXuNkT6f8pesdB/xivb0+mnrnSuoY+ZUwMstZjPfW8tG31Bo2xjn/nM9NeIJJKfoF/1/wi2cXpXVctx4bVhv/wCqs9Ncx9YsD6//AF5dXifs8dG6QxweG5NgD3uGjX3hm672/mUto2f8YvJUklP0L9TPqN076qY7zU85OdeAMjKcI0GvpUs19Or/AM+f9t7EvnpJJT//2f/tKdpQaG90b3Nob3AgMy4wADhCSU0EBAAAAAAADxwBWgADGyVHHAIAAAIAAgA4QklNBCUAAAAAABD84R+JyLfJeC80YjQHWHfrOEJJTQQ6AAAAAAEZAAAAEAAAAAEAAAAAAAtwcmludE91dHB1dAAAAAUAAAAAUHN0U2Jvb2wBAAAAAEludGVlbnVtAAAAAEludGUAAAAAQ2xybQAAAA9wcmludFNpeHRlZW5CaXRib29sAAAAAAtwcmludGVyTmFtZVRFWFQAAAAbAFwAXAB0AG8AdABvAFwAQwBhAG4AbwBuACAARgBsAG8AbwByACAAMQAgAEMAbwBsAG8AcgAAAAAAD3ByaW50UHJvb2ZTZXR1cE9iamMAAAAMAFAAcgBvAG8AZgAgAFMAZQB0AHUAcAAAAAAACnByb29mU2V0dXAAAAABAAAAAEJsdG5lbnVtAAAADGJ1aWx0aW5Qcm9vZgAAAAlwcm9vZkNNWUsAOEJJTQQ7AAAAAAItAAAAEAAAAAEAAAAAABJwcmludE91dHB1dE9wdGlvbnMAAAAXAAAAAENwdG5ib29sAAAAAABDbGJyYm9vbAAAAAAAUmdzTWJvb2wAAAAAAENybkNib29sAAAAAABDbnRDYm9vbAAAAAAATGJsc2Jvb2wAAAAAAE5ndHZib29sAAAAAABFbWxEYm9vbAAAAAAASW50cmJvb2wAAAAAAEJja2dPYmpjAAAAAQAAAAAAAFJHQkMAAAADAAAAAFJkICBkb3ViQG/gAAAAAAAAAAAAR3JuIGRvdWJAb+AAAAAAAAAAAABCbCAgZG91YkBv4AAAAAAAAAAAAEJyZFRVbnRGI1JsdAAAAAAAAAAAAAAAAEJsZCBVbnRGI1JsdAAAAAAAAAAAAAAAAFJzbHRVbnRGI1B4bEBywAAAAAAAAAAACnZlY3RvckRhdGFib29sAQAAAABQZ1BzZW51bQAAAABQZ1BzAAAAAFBnUEMAAAAATGVmdFVudEYjUmx0AAAAAAAAAAAAAAAAVG9wIFVudEYjUmx0AAAAAAAAAAAAAAAAU2NsIFVudEYjUHJjQFkAAAAAAAAAAAAQY3JvcFdoZW5QcmludGluZ2Jvb2wAAAAADmNyb3BSZWN0Qm90dG9tbG9uZwAAAAAAAAAMY3JvcFJlY3RMZWZ0bG9uZwAAAAAAAAANY3JvcFJlY3RSaWdodGxvbmcAAAAAAAAAC2Nyb3BSZWN0VG9wbG9uZwAAAAAAOEJJTQPtAAAAAAAQASwAAAABAAIBLAAAAAEAAjhCSU0EJgAAAAAADgAAAAAAAAAAAAA/gAAAOEJJTQQNAAAAAAAEAAAAHjhCSU0EGQAAAAAABAAAAB44QklNA/MAAAAAAAkAAAAAAAAAAAEAOEJJTQQKAAAAAAABAAA4QklNJxAAAAAAAAoAAQAAAAAAAAACOEJJTQP1AAAAAABIAC9mZgABAGxmZgAGAAAAAAABAC9mZgABAKGZmgAGAAAAAAABADIAAAABAFoAAAAGAAAAAAABADUAAAABAC0AAAAGAAAAAAABOEJJTQP4AAAAAABwAAD/////////////////////////////A+gAAAAA/////////////////////////////wPoAAAAAP////////////////////////////8D6AAAAAD/////////////////////////////A+gAADhCSU0ECAAAAAAAEAAAAAEAAAJAAAACQAAAAAA4QklNBB4AAAAAAAQAAAAAOEJJTQQaAAAAAANLAAAABgAAAAAAAAAAAAAAmAAAAJgAAAALAFYASQBCAF8AcgBnAGIAXwBwAG8AcwAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAmAAAAJgAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAQAAAAAAAG51bGwAAAACAAAABmJvdW5kc09iamMAAAABAAAAAAAAUmN0MQAAAAQAAAAAVG9wIGxvbmcAAAAAAAAAAExlZnRsb25nAAAAAAAAAABCdG9tbG9uZwAAAJgAAAAAUmdodGxvbmcAAACYAAAABnNsaWNlc1ZsTHMAAAABT2JqYwAAAAEAAAAAAAVzbGljZQAAABIAAAAHc2xpY2VJRGxvbmcAAAAAAAAAB2dyb3VwSURsb25nAAAAAAAAAAZvcmlnaW5lbnVtAAAADEVTbGljZU9yaWdpbgAAAA1hdXRvR2VuZXJhdGVkAAAAAFR5cGVlbnVtAAAACkVTbGljZVR5cGUAAAAASW1nIAAAAAZib3VuZHNPYmpjAAAAAQAAAAAAAFJjdDEAAAAEAAAAAFRvcCBsb25nAAAAAAAAAABMZWZ0bG9uZwAAAAAAAAAAQnRvbWxvbmcAAACYAAAAAFJnaHRsb25nAAAAmAAAAAN1cmxURVhUAAAAAQAAAAAAAG51bGxURVhUAAAAAQAAAAAAAE1zZ2VURVhUAAAAAQAAAAAABmFsdFRhZ1RFWFQAAAABAAAAAAAOY2VsbFRleHRJc0hUTUxib29sAQAAAAhjZWxsVGV4dFRFWFQAAAABAAAAAAAJaG9yekFsaWduZW51bQAAAA9FU2xpY2VIb3J6QWxpZ24AAAAHZGVmYXVsdAAAAAl2ZXJ0QWxpZ25lbnVtAAAAD0VTbGljZVZlcnRBbGlnbgAAAAdkZWZhdWx0AAAAC2JnQ29sb3JUeXBlZW51bQAAABFFU2xpY2VCR0NvbG9yVHlwZQAAAABOb25lAAAACXRvcE91dHNldGxvbmcAAAAAAAAACmxlZnRPdXRzZXRsb25nAAAAAAAAAAxib3R0b21PdXRzZXRsb25nAAAAAAAAAAtyaWdodE91dHNldGxvbmcAAAAAADhCSU0EKAAAAAAADAAAAAI/8AAAAAAAADhCSU0EEQAAAAAAAQEAOEJJTQQUAAAAAAAEAAAAAThCSU0EDAAAAAAglQAAAAEAAACYAAAAmAAAAcgAAQ7AAAAgeQAYAAH/2P/tAAxBZG9iZV9DTQAC/+4ADkFkb2JlAGSAAAAAAf/bAIQADAgICAkIDAkJDBELCgsRFQ8MDA8VGBMTFRMTGBEMDAwMDAwRDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAENCwsNDg0QDg4QFA4ODhQUDg4ODhQRDAwMDAwREQwMDAwMDBEMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwM/8AAEQgAmACYAwEiAAIRAQMRAf/dAAQACv/EAT8AAAEFAQEBAQEBAAAAAAAAAAMAAQIEBQYHCAkKCwEAAQUBAQEBAQEAAAAAAAAAAQACAwQFBgcICQoLEAABBAEDAgQCBQcGCAUDDDMBAAIRAwQhEjEFQVFhEyJxgTIGFJGhsUIjJBVSwWIzNHKC0UMHJZJT8OHxY3M1FqKygyZEk1RkRcKjdDYX0lXiZfKzhMPTdePzRieUpIW0lcTU5PSltcXV5fVWZnaGlqa2xtbm9jdHV2d3h5ent8fX5/cRAAICAQIEBAMEBQYHBwYFNQEAAhEDITESBEFRYXEiEwUygZEUobFCI8FS0fAzJGLhcoKSQ1MVY3M08SUGFqKygwcmNcLSRJNUoxdkRVU2dGXi8rOEw9N14/NGlKSFtJXE1OT0pbXF1eX1VmZ2hpamtsbW5vYnN0dXZ3eHl6e3x//aAAwDAQACEQMRAD8A9RvtFNFlxEitrnkDk7RuXOj684ZE/Zrfvb/et7qH/J+T/wATZ/1Ll5i3gfBXuS5fHljMzF0RWtOV8U53Ny8sYxEDiBuxxPY/8+MP/uNb97f/ACSX/PjD/wC41v3t/wDJLjklc+4cv+6f8Yub/pfnP3o/4sXsf+fGH/3Gt+9v/kkv+fGH/wBxrfvb/wCSXHJJfcOX/dP+MVf6X5z96P8Aixex/wCfGH/3Gt+9v/kkv+fGH/3Gt+9v/klxySX3Dl/3T/jFX+l+c/ej/ixex/58Yf8A3Gt+9v8A5JL/AJ8Yf/ca372/+SXHIVn22zMw8HDZWH5thqF9+411ujdWLGUfpf030GfmJk+T5aETOUTwx31kV+L4lz2XJHHCUTKZoWIR/wCk9t/z4w/+41v3t/8AJLG+tX1gs6306npeDjXxlZNLMsMI3HH3fp2tFbt79/0Xt/cUG/Uj602ZDabMrDx8bXfl0te+wiPaGYmR+iZ+k/4dEwPqh1w9Uuw894bhVMDqeqY8VveT+azHc670Mit3u9X+bVY/cSCBxRNaS9W7fifioMZSEJR4qlD08XD+8x6x0foeHnu6Z9WsLPHVwGW3M6bkvxaWNef0f23Ie9+PQ2xgs9NldPrLXxOi/XRmOwHrdWM6s+zH9E5bduvtvzcx7My9+5387+iWv0boWF0dt/2d1tt2U/1cnJyHmy2xwAY31LXfuNb7GfQWiqLqvN3dV+tnSKnW9TwKOqUN/wAL01xZdtA74GXu9Wz/AML5X/WkOn6/9NyKWX0UWWVWCWPBbr+Ptc389q2etdIxes9Otwcj27vdTc36dVrf5nJod9Jl1L/cxeT2Xv6VnOp6oK8O55NWdSwaDKrAdTnV01j2U9VxDv8A0e9lmXVd/NqflvaM+HKPTL9K+HhLV548xHEZ8ufXDUw4ePjj/V/rPoX/AD4w/wDuNb97f/JJf8+MP/uNb97f/JLgj1jprQS61wa3RzzVaGgkbg17vS9r3N9yLR1DAyXbKMit7/8ARztf/wBtWbLP+itCPK8nI1EgnsJ248+f+JQFzjKI7yxcI/GL6R0fr9HVrLa6qn1GoBxL41kkfm/BJYv1HBGVlg6HYzT5uSVb7vj+9+1Xora/6nE3fvub/R33ix7l71p/OcPyv//Q9N6h/wAn5P8AxNn/AFLl5i3gfBaf1o/xlPqyczpvSsP1MbFeMbqHVLm2OopLz6Nn6LHb6jtjvZ/Oe+xn6Ouxc/03qVeab6Q+uyzFcGuto3Gl7XCa7aTaG2N3f6Oz3rR+G5IjigT6pax/wXF+N4ZyEMoFwh6ZH93i+VupJJLTcJSSSSSlJJJJKUms6nZ0mp/UarBTZjjcx7gS3d9FrHsaWue2z6GxOqHXMG7P6c+iiPVa5tjGkw1xZ/g3f1kzLftzocR4TUe7Jg4fex8UuCPHG5fu67vSdG/xoutuox+tMwsFxIZkO+0P3NMfzvoii6mtn/BWZnsXU9D+tXSOuX5GLhvc3LxP6Rj2Nhzfc5gcLGGyi1jtv06LrF4102rrWG3Mw6Ontuod731ZIDTudG1m9p25Tdo/m/8Az2rvSczr/wBVOp/acM41VHVn1svdc0vrrsO9wpd6bmXtrre9/vZ+YsWfLSjDjAka+b0mPD/hfpPUY+exzy+2TAX/ADZGSMzk04vk/QfcElzP1M+sfV+tP6nR1XFqxr+m3jHd6BLmF8H1q/ULrN1lTm+/b++umUDbUvLOu4ub9Yfrl1huI5mDldKZiMwr7nBlZtrsbks9f6b32277fsztn82z9IvUXhxaQ07XEGHRMHxheA9c6UaOujpvWbLX9QNzqcrMeSfVbYd2Dn1ut9rW7T6T6t/+DRAsgDrotnIRiZHaIMjXg+84rr2YVTs1zRe2ppyHCA3eGj1nfu7dypZXSPq917Cm/Gx83GyRvbc0NO6Rt9arIq9+/b/harF4phj6zdTyP+bnT83Oz+l47i3IFAOlboZezY+1lT6vZ+hqvv8ARXtf1asxndGx6sXFyMKnGb9nZRls9O0Cr9HL2jcx27b/ADjPppEEEg9ExkJREhtIWLHDv4SeWfS7/F91OvIYL8v6uZ22i1z3Cx+Jbu/RO3O2ufi27v7H9f067Ur31zzOm/WDolnQumZFWdl5t1FLfs7haKj6osfkXuq3enXTXj3b/wDtv/CJJcUruze12j24VXDGr4qrTi34n//R67pP1Ps6XfkYPrs6h9X83fddiZjGvtbkOc17bG3Bn6wx+33+v+krfXV6a4NnROpfVX7RjdQ6fa3Gfa6yjNxWnIrczQMrufX+mr2f4P16617BdaKaX2uBIraXEDmGjcsPpP14+rfVbHUVZQx8ljtpx8r9DYTMN2Nt/nN3/BqTFknil7kf7uuzBzGDHzEDhmTrUvSalp1fOG/WHoxsNbsj0XjkXMez/qmqLfrJ0JzS4ZbQG8gteCY/dGz3L1/Iwun57azk0VZLa3NtqNjWvDXN1rsZu3e5v5rlJ2BgvcHOx6nOadzXFjSQf3horX+ksv7sP+d/3zQPwPl/38n2w/7x8e/5x9HMbbbLA4TLKnkfA+0e5Fo630e+BXl1hxMbLCa3T4fpNq9iAAAAEAaABZ3VPq50Lq9b6+o4NOR6gg2OYBYO25l7YuY7+o9IfEst6xiR9VS+B8vXpnkB7nhl/wBy+eEEaHRMtF/+LbrvTz6PReqVW4cktqzqyXM/kNtp3ep/4EnxP8XP1kvtnqnW200D/B4NcOP/AF2xrPT/AMyxWP8ASOLhB4ZX2/taX+hOY4iBKHD0lctf8Hhc1P2J4A1JOgA8yuh/8bPHaQautdSBHG+yt4/tNdT7lXH+LB2TZjt6v1R2bjY9hc+ptZp9ZhH81f6N302v+jez/BoH4ljo1CV9B0+1cPgebiAOSHD1I4uIf4P/AKE8td9YOj0uLHZIeWiXek11gb/WdWCxVepOw+q/Yn4l+Plii0XHBss9P1hpNX5tlb9Ni9h6X0PpHSKTR0zEqxa3xvFbdXbRtb6jz77P7a85+uv+Lv60dZ6y7OxK8FtRLhWKB6LtoLn12ZRcP02TZP6Szcq8+flOMoTgOCX7pMZf4zdx/CIYpRyY8shkhrcxGcP8T0/9N0cL/GZb0xxx/rL0+xmTk2F2KcFjXscw7Wir32te+5jvb/LXQfWT65YPRuhnMcfSz8ionCwro9U2H2t9Wqsv2srf/Pf9t/TXJYn+Jht2K2zqXU7hmPY0ljWte2txH6Zm57nev7v5t7fRWx0z/FJ9XMd/q9Tfb1Ozs159Gpp5/R0Y2zb/AFPU2KnLhs8IIj0B1LpYxMRAyESn+kYjhj/i+prfUTL+tvXugveM/wCx1tssa3Otr+0X22lzbXvrbftxq8Nm59Da2M/7b9NanVOidJ+vOHVn4mVZi21+riW3NZDzXuNeXh20XfzTnPb7XfzjF1OPj0YtFeNjVtqopaGV1sENa0aNa1q5z6r4/wCzOv8A1g6Y4j9PkN6lQBAHp5Icx8N/NdXdjvY//raC54umn64/4tsLKLPsdvTLstrKn2tc973P0bbGO6u2v9DV72Wv+n/NLvupdaz+mfVbK6r1PCacvFrd6mNU/wBSt5DvSZYx5a1/2e2fW/SV+rVV9Na+TiYuWxrMmplzK3ttY14DgHsO6uyD+cx30VO22ump9trgyutpe9x0Aa0bnOKSnzn/ABZYuVnZ9nWs+KbPRaKcaoCtm0l9TLbamBv83R+gxKv8FR/wiS3PqZk4mXnZ2XhFxxchrbKC4bTsc55bLSkrfs4/e4NeDg4v6383x8Tn/ec33b3dPc93gr9Cve9rg/8AQn//0vTeo/8AJ+T/AMTZ/wBS5eW3Y+PlVhmTUy9oGgsaHR/VJ9zf7K9S6h/yfk/8TZ/1Ll5i3gfBafw0AwyA66hwvjhIyYSDRAlqGjT0o4Lxd0bMyOl3DvVY5zHaR+kpsd71sYf1s+vGC1rLX4XVq2yXGwOoud+63ezbR/4EqqSsT5PBP9Dh/uen8PlaWL4nzePQZOMdsn6z/nfP/wA53qf8Z7GPa3qXRc3Fa4fzlO3IaD+dJr9P9H/L/wCgiXf40uliwsxOm9RyoMB7aAxh+Bte1/8An1rngSODCRc48klQ/wCjcd6TlX0bQ+OZq1xQvvcq/wAV6jp31/rybLPtnTcjBqABqe9zHuefzg6ljt1W1W7Prt05v81Tc/xkNb/35y4tJPj8PwDfil5n/vWKXxnmjdcEfKP/AH3E7bv8YvWGXuaegGyndDLK8quSyfpem+tvv2/mbkus/XjFy8Kj7PnZX1cy22F+6/EN7XNYC013No9ev0rN29r9/wDg1iJw4iQDAPKbL4biPyykPOpBkh8cziuOEJeXFCX/AHf/AEXSq+u/1ppxas5w6X1LEcCa20WW05OS1rvTNtGPc1zqdn0rvUpXcdK6gzqfTsfqFddlNeVWLWV2gB4DtW7w0vavMrvXNNgxy1t5afTL52B0e0v2/mtXXf4s87MzvqhiWZcF9TrKWWAzvYxxax//AKK/62qXNcsMHDUjLivpQ0dLkOePNe4TAQEOGgDxS9XFu9UkkkqzfUsSzB9P6509RFsev09+M6ktOvp2svZYy36G9vrP/R/uLbWC9xu+u9Vf2djmYnTX2faiSXMfdc2ttLW7tjPUrx7X7tm9JTvLkP8AGa+93RsTBZY6mjqGZXj5NjDqay22z0Y/4Z1a69cZ/jJtDmdHwQPddmevvAktbjsc9+135m/1GV/1E/ELyQFXcoivqx55cOHJIHh4YSlxfu1Hdl9RWtbkZTGDa1tdbWtHAALmtCSf6j/0rL/qM/K5JaP/AJcPp/6jcX/yz/4X/qV//9P03qH/ACfk/wDE2f8AUuXmLeB8F6d1AE4GSBqTU/T+yVw2B9WOr5jWu9MY9ZH07vaf+2xNi0fh+SEIZDOQiLG7i/GMOTLkxRxwMzwy+UOUlMLrGfVXo+IN3Uc3cRqW7m1j7vdZ/wBJGZk/U/C/mamWuHcMdYf8+zcnZvi3K49DOz5iH/SauP4PnOuSUMfgTxS/5ryFdV1piqt1n9Rpd/1KuV9C6zb9HDtE/vDb/wCfNq6Z/wBbsKsbaMaxwHA9rB+VyA/643n+bxWj+s8n/qWKlP8A4w4B8tf8+f8A0YtmPwbCPnzSl/djw/8AfuSz6p9cfzSxn9Z7f++b0Zv1L6ueX0t+LnH8jFad9bupHiqlvycf+/ITvrT1g8Oqb8Gf3uUEv+MY6fhD/vpMo+FcmP8AOS8yofUjqHfIpHwDj/BP/wAx87/uTV/muUD9Zutf6Vg/62E3/OXrX+mb/wBttTP+UZ/rf4kP++Xf6N5L9yX+Mvb9Q822p9LsqsNsaWOLQ4OAcNstP7yh/i1ezpOIfq3nV2Y3UWGy5gsfvrurD3MdZiQ+yup9X/anG9n+m/0ikPrL1r/TM/7bauXf1qyz669PudlBrH9Rq31EBo9Q1Nw8q+v/AAlNdjPRp/0WTZ+kQHxUc3MRIlYGh4QP+i2uVwYcHEMQI46uzxfK+vJJLkfrj9b+g4td/Qreqfs/NvqIsyK6zf6LTt31vZWdzMi+lz/Q/wBH/Pf6NStp6XB6hidQoORiPNlQe+veWuaC6txrs2+oG7m72/T+gsr6sttycnqnWL6W0vzMl1NMBzXOx8UnHx7Lmvdt3vd6z27G/wA09cz0ym6yzoWXW3Hop6jhv6Zh9LvfabPsQjJsymZFDfZmOxK/0/8Ag/5j9L+lXfYmJj4WLVh4rBVj47G11ViSGtaNrW+73JKTLhfr7YXdd6VV7SK8fKs49w3GmqWu/lLtr76Mel9+RY2mmsF1llhDWtaOXPe72tavNuq1db699eMq/DxvUwMCl2Iy9sbHenstyGssdtb6/wBpvazY3/RqXliBmxkmgJDdr87GUuVzRiCZGBAA3d36jf0nL/qM/K5JT+pdVtObmVXMdVY1jJY8Fp5d2KSvWPv93pw7/wDU3K4T/ojho8XFVdf51//U9QybHVY1trY3MY5zZ4kCVw1/WOqZYm7JeA4asZ7G/wDQXb539CyP+Kf/ANSV52xw2N1HAWX8UnKJhESIBBsA1bFlJsLwJnk+J5Tptw8QluHiFlMS6SbcPEJbh4hJS6SbcPEJbh4hJS6SbcPEJbh4hJS5IDXOcYa0FziewA3Od/mriOv9WzerdQxsLEo+zWUO9ZlhcDcIHqi26xn9HZRW31/T/wAF9NbP1v6mcLBx2V2vqtuvad9ZhwZX7rP+k5i7j6ufUv6r115VtWBkMst34l78p7t91ZLLXWex+z0sr2fR+nX+hs/wi1PhvLA/r5a7iH/RMmXFH9L7HoeiZjs7pOJlvnfbU0vJa5suiHva2xrH+m93vqds99a5r60fUn6q29V/509Zu+z4+O1rsuqAKrSwxW63a31Xuf7K9jP576C7GuuuqttVTQytgDWMaAGhoENa1o+i1q5/659Jr67j4XRLW5DasrIFlt9Ne9jGUg2PZk2b6/Q9dv6Omz9J+m/wa1WVqfVN1/1g6hd9bMpjq8aHYvRcdwjZjyPWy3f8LlvZ/YrZ6a61Dx6KsaivHobsppY2utg7NaNjG6/utCxvrfh9RzumnEx8mrDwbgWdRyXvNdldR2n1cez+a9v/AGoqu/nqP0fq1JKeS+uX1zp6p6nTelvF+DU8V3FrNxyssO3Y/Tqd7mNdh7mer1C7Zs9H9HX/ADv6Vukfauk0sbTkP+0auyLh+fY9zrrnbHe3Z6r3+1c2z6tZX1X6rj5OaLP2YzMvx6MlwGwl9bPsV7drv+1DPpW/zTPT/kPXTEgGCRIWV8TzTjOEIkxiBx2NOKXy/wDNYspNgPWfVzq2V1Cy6vKDHOqa0i1o2uIJPtd+b2SVL6nEHKyo/cZ+VySd72T7hx8Z47riv1V7nDuqz7d3rb//1fUcl7K8e2yxu9jGOc5vMgCXN1XLD6y/V6BHTf8AwOv+9dVfU26mylxIbY0sJHMOG1c+PqR00CPXv+9v/kFPhjypB9+Nn9HRp84OcuP3bhqjxcfD/wB01f8AnL9X/wDyt/8AA6/70v8AnL9X/wDyt/8AA6/71b/5kdN/09/3t/8AIJf8yOm/6e/72/8AkFL7fw39w/Y1K+K/6v8A5isPqfQ8utz2dPa0NO2HV1/Hso5HV+h0Wmp3Tg4gAyK641V3D+rWHiVuZXbY4OO47i34dmqGR9VsK+02OttBIAgFsaf2Vhcxj5z73l9iOP7r/krEOP8AR3/5zqwB+7Y+MD7z/lP3Wj+3eg/+Vv8A4HX/AHomP1boeRb6benBpgmTXXGiN/zQwP8ATXfe3/yCLj/VfCos9RttpMEQS2Nf7Kjni5/hPDHHxVppDdGMHjjxgcN+r+6gyeodExmNc7p7XBxjSuvwnuq/7d6D/wCVv/gdf960sn6uYmS1rX2WANMiCPh+6q//ADQwP9Nd97f/ACCGPF8R4f1kcXF4DGuzAcZ9oejpbRd1D6sZV9Ju6RXZYxw9F76qnFhJncwn6Hu/dWxd1/HpqdYankMEkCJ/6pV2fVLBY9rxddLSCJLe39hWbug4t1Tq3WWAPEEgif8AqUpj4qJRGP2xD9L5F+Lh4J+58/8Ak6af/PDD/wC493/R/wDJpf8APDD/AO493/R/8mn/AOaGB/prvvb/AOQS/wCaGB/prvvb/wCQUv8Awj/V/wCaw/rPBt1ddx7a22Ct4DwCAY7/ADWTnfWfomS4U5mA7IFFm9gsax4D2y1tjWvd9Ja9XQsaqttYssIYAASR2/sqg/6l9Oe9zzdcC4kmC3v/AGFa+F+/x5f9IVwUPZ9vz9XFwLef9728f3OuP/K8fl04mtlfWvouZQcfLwHZFBIJqtbW9stO5h2PcW+1yh/zl+r51PTf+hX/AHq3/wAyOm/6e/72/wDkEv8AmR03/T3/AHt/8gtQx+HHeJPnbn18W/1f/MbPQeqdNzrbm4WL9mcxrS921rZBJgfo0kbpHQMXpNlllFljzaA1weQeDOm1rfFJQ8PK+7XD+o7V1r/v21XOfda9P3m/6vB83/eP/9bt+s/VKjqt1uS3qPUMHIsAAdi5L2MBaNrf1eTV/X2rxr6yZX1z+r3Vrul5nV81zqodXYMi0NsrP83az9J+d/0Hr6DXD/41fqr+2ei/tLGZuz+mgvAA1fTzdV/K9P8Anq/+uf6RJTd+pPS+nXdPwuuY2fn5rrqtRlZT7WhxGy6t9OlO6qwOZ9FdWvHf8T31p+yZz/q9lPijMJsxCeG3Ae+v/r9bf+3Wf8KvYklKWD9ZujdOyabep5udm4DMWkl9mJkvpAYzdZu9Np9J1mv7i3l51/jF6jl9d6rifUbpDv0uQ5tnUbBqGMH6RjLY/MrZ+tW/9YSU859Rem/Wj61ZlttnWeo4/R8d0PtGRZ6jydWUVuLjX6mz3Wv2+z/ri9V6R0DG6S+x9ORl5DrWhrjlZFl/HdrbXOax39VG6N0jD6L0yjpuE3bRjtDQe7nfn2v/AOEsf73q6kpz+r9Fx+rMrZfdkUekS5pxrn0EkiPeaXN3ryr/ABkYnV/qrmYh6d1rqLsbNa8hluTY4tdWWbtr2uZ7NtrF7KvKf8ef0ujfDJ/91klI/wDFt0rqX1nx8rP6p1nqRposFVdNWVY3c7bve6x25zvz2fQ2L07pXS6Ol4xxqLLrmFxeX5Fr7nyY/wAJcXO2+36K4b/El/4ns7/w4f8Az1SvRUlKXNdU+pdmfkX5NXXurYllxLm1VZMUMJ4azHDG/om/uequlSSU/N2Z1v6zY2fdhWdXzHPotdS532i2CWONZP8AOeS9lr/xe4jaw1/WervfGr/tjgZ+DW7V4n1z/wAUfUP/AA7d/wCfXr6XSU8N1L6h/WLHqdb9X/rL1AXM1bRmXOsY4/u+o3a1n9qixcn0n/Gt9ZujZ7sH6xVfbGUvNeQ0tbXkMIO12x1eymzZ/wAIz9J/p17I97K2OsscGMYC5znGAANS5xK+e/rU4/WX665zuiVOy/tNobQKhO/YxlLrR/wbnV+p6n7iSn6Aw8vHzcSnMxXiyjIY2yp47tcNzUlR+rHSrOj/AFfwOmXOD7cakNscON597w3+S17tqSSn/9f1VNzoU6SSnwL/ABgfVu36rfWMX4QNWJkO+04NjdPTc1259LT+9j2bdn/B+kvYfqb9ZafrJ0KjPbAyG/osusfm2tHv/sWfztf8h6H9d/qyz6ydBuwmgfa6/wBLhvOkWtGjN37lzf0T15J/i6+s9n1a+sP2bMJrwsxwx8tj9BW8HbXe4H6Pov8AZZ/wXqJKfZPrV9Ycf6udEyOp3Q57Bsx6j+fa7+ar/wC/P/4NYP8Ai2+rmRiYl31h6rL+r9ZPqvc8e5lTz6jWfyXXfz1n/Wq/8Gspx/5//XYVj3/Vz6vulx5ZfdP+a9tj2f8AsNV/3YXpSSlJJJJKUvKf8ef0ujfDJ/8AdZerLyn/AB5/S6N8Mn/3WSU6P+JL/wAT2d/4cP8A56pXoq86/wASX/iezv8Aw4f/AD1SvRUlKSSSSU/M3XgT9YeogGCcy6D/ANdevb2fVf61ekG2fWrILgAJbjUAf9+f/wBNeIdc/wDFH1D/AMO3f+fXr6YHCSnzf6w/4tPrX1Oog/WR+cORj5IfXXPwpfdX/wCALncT61fWf6g3s6Zm9IxK2BrQS2sVvua3T1vttBc29/8ALe21e1rjP8bWFjZH1OvyLQPWw7KrKHnkFz2UPaD/AC67ElOr9U/rl0r604rrcMmrJpj7Ri2RvZP5wI/nKnfm2f8AUJLyT/FM7JH11xRROx1VwyPD09jj7v8Ar4pSSU//0PVUl8qpJKfqpeMf42/qs/F65R1TBqLq+rO2PY0T+sjTQf8Adlvu/wCM9VeeJJKfo76m/Vyr6t9Bo6e0A5BHq5dg/OucP0n9mv8Amq/5Fa3F8qpJKfqpJfKqSSn6a6v1zC6PXW/LFzvWJbW2imy5xIG46UMft/tryj/GX1DqH1ozMMdN6Vn/AGbCY8epZjWNLnWFm7aza72NbUz6S88SSU+n/wCLTrWX9WsbLwOq9Lz2VX2C6q6vGscAdvp2Nsbt3/mM2bV6d0rq2J1bFOViCwVhxYRdW+pwc2N36O9rHfnL5iSSU/VSwusfW/p/ScizFdjZmVk1tDjXjY9lgO4bmNF20U/+CL5ySSU6+d0b6xZmbkZjulZbTkWvtLfQtMF7jZE+n/KXrHQf8Yr29Ppp650rqGPmVMDLLWYz31vLRt9QaNsY5/5zPTXiCSSn6Bf9f8ItnF6V1XLceG1Yb/8AqrPTXMfWLA+v/wBeXV4n7PHRukMcHhuTYA97ho194Zuu9v5lLaNn/GLyVJJT9C/Uz6jdO+qmO81POTnXgDIynCNBr6VLNfTq/wDPn/bexL56SSU//9kAOEJJTQQhAAAAAABVAAAAAQEAAAAPAEEAZABvAGIAZQAgAFAAaABvAHQAbwBzAGgAbwBwAAAAEwBBAGQAbwBiAGUAIABQAGgAbwB0AG8AcwBoAG8AcAAgAEMAUwA2AAAAAQA4QklNBAYAAAAAAAcACAAAAAEBAP/hDwdodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuMy1jMDExIDY2LjE0NTY2MSwgMjAxMi8wMi8wNi0xNDo1NjoyNyAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6cGhvdG9zaG9wPSJodHRwOi8vbnMuYWRvYmUuY29tL3Bob3Rvc2hvcC8xLjAvIiB4bWxuczp4bXA9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC8iIHhtbG5zOnhtcE1NPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvbW0vIiB4bWxuczpzdFJlZj0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL3NUeXBlL1Jlc291cmNlUmVmIyIgeG1sbnM6c3RFdnQ9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZUV2ZW50IyIgeG1sbnM6ZGM9Imh0dHA6Ly9wdXJsLm9yZy9kYy9lbGVtZW50cy8xLjEvIiB4bWxuczp4bXBSaWdodHM9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9yaWdodHMvIiBwaG90b3Nob3A6TGVnYWN5SVBUQ0RpZ2VzdD0iNDYwQ0YyODkyNkI4NTZEQUIwOUMwMUExQjBBNzkwNzciIHBob3Rvc2hvcDpDb2xvck1vZGU9IjMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENTIE1hY2ludG9zaCIgeG1wOkNyZWF0ZURhdGU9IjIwMDctMDItMjhUMTY6MzQ6MTcrMDE6MDAiIHhtcDpNb2RpZnlEYXRlPSIyMDE0LTA1LTE5VDE2OjEwOjAzKzAyOjAwIiB4bXA6TWV0YWRhdGFEYXRlPSIyMDE0LTA1LTE5VDE2OjEwOjAzKzAyOjAwIiB4bXBNTTpEb2N1bWVudElEPSJ1dWlkOjU4N0M3RTRFQzhENDExREI5NkUzQTBCNjkwN0NCQzAwIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjdDRDA4RDQ1NUZERkUzMTE5MjY4OTU0MTZFNzMyQzc1IiB4bXBNTTpPcmlnaW5hbERvY3VtZW50SUQ9InV1aWQ6NTg3QzdFNEVDOEQ0MTFEQjk2RTNBMEI2OTA3Q0JDMDAiIGRjOmZvcm1hdD0iaW1hZ2UvanBlZyIgeG1wUmlnaHRzOk1hcmtlZD0iRmFsc2UiPiA8eG1wTU06RGVyaXZlZEZyb20gc3RSZWY6aW5zdGFuY2VJRD0idXVpZDo1ODdDN0U0REM4RDQxMURCOTZFM0EwQjY5MDdDQkMwMCIgc3RSZWY6ZG9jdW1lbnRJRD0idXVpZDo1ODdDN0U0Q0M4RDQxMURCOTZFM0EwQjY5MDdDQkMwMCIvPiA8eG1wTU06SGlzdG9yeT4gPHJkZjpTZXE+IDxyZGY6bGkgc3RFdnQ6YWN0aW9uPSJzYXZlZCIgc3RFdnQ6aW5zdGFuY2VJRD0ieG1wLmlpZDo3QkQwOEQ0NTVGREZFMzExOTI2ODk1NDE2RTczMkM3NSIgc3RFdnQ6d2hlbj0iMjAxNC0wNS0xOVQxNjoxMDowMyswMjowMCIgc3RFdnQ6c29mdHdhcmVBZ2VudD0iQWRvYmUgUGhvdG9zaG9wIENTNiAoV2luZG93cykiIHN0RXZ0OmNoYW5nZWQ9Ii8iLz4gPHJkZjpsaSBzdEV2dDphY3Rpb249InNhdmVkIiBzdEV2dDppbnN0YW5jZUlEPSJ4bXAuaWlkOjdDRDA4RDQ1NUZERkUzMTE5MjY4OTU0MTZFNzMyQzc1IiBzdEV2dDp3aGVuPSIyMDE0LTA1LTE5VDE2OjEwOjAzKzAyOjAwIiBzdEV2dDpzb2Z0d2FyZUFnZW50PSJBZG9iZSBQaG90b3Nob3AgQ1M2IChXaW5kb3dzKSIgc3RFdnQ6Y2hhbmdlZD0iLyIvPiA8L3JkZjpTZXE+IDwveG1wTU06SGlzdG9yeT4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgPD94cGFja2V0IGVuZD0idyI/Pv/uAA5BZG9iZQBkQAAAAAH/2wCEAAEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQECAgICAgICAgICAgMDAwMDAwMDAwMBAQEBAQEBAQEBAQICAQICAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDA//AABEIAJgAmAMBEQACEQEDEQH/3QAEABP/xAGiAAAABgIDAQAAAAAAAAAAAAAHCAYFBAkDCgIBAAsBAAAGAwEBAQAAAAAAAAAAAAYFBAMHAggBCQAKCxAAAgEDBAEDAwIDAwMCBgl1AQIDBBEFEgYhBxMiAAgxFEEyIxUJUUIWYSQzF1JxgRhikSVDobHwJjRyChnB0TUn4VM2gvGSokRUc0VGN0djKFVWVxqywtLi8mSDdJOEZaOzw9PjKThm83UqOTpISUpYWVpnaGlqdnd4eXqFhoeIiYqUlZaXmJmapKWmp6ipqrS1tre4ubrExcbHyMnK1NXW19jZ2uTl5ufo6er09fb3+Pn6EQACAQMCBAQDBQQEBAYGBW0BAgMRBCESBTEGACITQVEHMmEUcQhCgSORFVKhYhYzCbEkwdFDcvAX4YI0JZJTGGNE8aKyJjUZVDZFZCcKc4OTRnTC0uLyVWV1VjeEhaOzw9Pj8ykalKS0xNTk9JWltcXV5fUoR1dmOHaGlqa2xtbm9md3h5ent8fX5/dIWGh4iJiouMjY6Pg5SVlpeYmZqbnJ2en5KjpKWmp6ipqqusra6vr/2gAMAwEAAhEDEQA/AN8/fO6qbYuyd4b3raWorqPZ21twbqq6GkaJausptvYmry89LTNOyQrUVEVGUQuwUMRcgezLZdsk3reNp2aGVUmu7mKFWaulTK6oGNM0BappmnDok5m3yDljlvmDmW6haS226xnuXRaamWCJ5WVa41MEIFcVOeqaYf543Tc0MUv+g3tlfLGkmn+JbKOnWoa1/wCNC9r+8t2+5lzcrMv9ctrwf4Z/+gOueLf3mHtqjMjcgbxqBoaSQUqPTIx+Q6yf8PhdOf8APju2P/Pjsr/69e9f8Bpzd/02O1/7zP8A9a+tf8nMvbT/AKYDef8Ae7f/AKC69/w+F05/z47tj/z47K/+vXv3/Aac3f8ATY7X/vM//Wvr3/JzL20/6YDef97t/wDoLr3/AA+F05/z47tj/wA+Oyv/AK9e/f8AAac3f9Njtf8AvM//AFr69/ycy9tP+mA3n/e7f/oLr3/D4XTn/Pju2P8Az47K/wDr179/wGnN3/TY7X/vM/8A1r69/wAnMvbT/pgN5/3u3/6C69/w+F05/wA+O7Y/8+Oyv/r179/wGnN3/TY7X/vM/wD1r69/ycy9tP8ApgN5/wB7t/8AoLr3/D4XTn/Pju2P/Pjsr/69e/f8Bpzd/wBNjtf+8z/9a+vf8nMvbT/pgN5/3u3/AOguvf8AD4XTn/Pju2P/AD47K/8Ar179/wABpzd/02O1/wC8z/8AWvr3/JzL20/6YDef97t/+guvf8PhdOf8+O7Y/wDPjsr/AOvXv3/Aac3f9Njtf+8z/wDWvr3/ACcy9tP+mA3n/e7f/oLr3/D4XTn/AD47tj/z47K/+vXv3/Aac3f9Njtf+8z/APWvr3/JzL20/wCmA3n/AHu3/wCguq2f5p38wHP/AD2+PfXPxK+P/SPfslP3X8ofj/tL5A0Gzc7j6fdeU+Msu9aep7YwmGoNn59dx7hj3FRQwUNfRQAxHGS1D1H7Ak9gn3B+7HznyFyve81fvO03CytSGnSASCSKLNZtLqutFbSrBNTjVqK6QxEnez/36/a/3a572zkEbVe7RuV+NFrJdNH4M9wWAW21oSsUkiljG0pRHZfDDeIyKWz5h/D74PdLd9Zf4r/ytvjJ8+qT5yUuI2V2T2Htn+XV8wO0fiH0j1vtXeWTrodqQfKHuDc28s/1F1NiN2YDH5aoxONw2263cVXQ0pjpo6SKann9429ZudWNdUfC7+c9hev9s0tZ/M+6x6byO0qp49vdRwfH/K/NLblRtc02XmXCdqfJr5Ib42r8ju190NlMlB/ueSTBGCGiCmkqEl8cXuvdKnd/yq/mv/C7amZ3b8qfib0f83etsPUNN/pA/l8bu3H1/wB3UuBocNHPOK/4k/ICsyp39uyvyMU3gpdn78r6qojUsmNjAKreIRGRBM7LETkqAxA9QpZa0/0w6anNwIZTaRo9yFOlXYopNMAuqSFQeFQjfZ0kNl/z9fjf2PtDbfYGwuruy907L3djlym3s9j8ls5YaunEj01XSVdLPmIqzFZvD18UlLkKCpSOroauJ4ZkVl95X7F90/eOZtm27mDYfcDaLrZ7uIPFKi3BVgeIzGCrKaq6MAyOCrAMCOue/NP94VyvyPzNvvJnOPtNzBt3NW2XBhubaVrcPG4ypBDFZIpUIkgmjLRTRMskbEHpS/8AD4XTn/Pju2P/AD47K/8Ar17Nv+A05u/6bHa/95n/AOtfRF/ycy9tP+mA3n/e7f8A6C69/wAPhdOf8+O7Y/8APjsr/wCvXv3/AAGnN3/TY7X/ALzP/wBa+vf8nMvbT/pgN5/3u3/6C6OJ8O/n3sj5j7h3zt7aewN47Nm2LhsJmayp3PVYKohr4s3W5CiigpFxFdWOkkD48sxewIYW+h9xN7sex28+0tjst9um92l2l7LJGohEgKmNVYltarg6qCnp1kR93z70vK/3htx5j2/l7ly9sW22GORzO0baxIzKAoQmlNNcnNf2/wD/0N5n5Cf8yC7w/wDEQdl/+8XmvYr5D/5Xjkz/AKW1p/2kR9R77uf9Op9zv/Fe3H/tDm60VKP/AIB0n/UNB/1qX32pk/tH+0/4evl4uP7ef/Tn/CepPuvTXXvfuvde9+691737r3Xvfuvde9+691737r3QfZ1+6tzdxfG7oXpLA9bwbi+SfYWV6zpe2e4n33W9XdX7ngwjZramP3XtzrCiq97V8vYtTTy43H1atT46lrdAqpY0ZpI4N99/dPmL2n5d2retg5Yhv1uLgxSSzu6wW7UUxrIsdHYz1cIwdVVk0mpYDrK77ov3fuSPvFc77/yxzlz9ebQbC0S4jtrOKJru+jPiCZoZrhZII1tSsbSp4byMkmsaUVj1Z9j/AOSR/NG3J2Jidj7m7y+G/U3UsVRkZNy/Ijqra3YG/wDtTK0i7beqw1Btn489uUFbsLbksu63SkrKqq3XkHWkQzwx3PgfE/d/vge4m4bRFa7Zsu27dvWsl7hA06FfJY4ZqhD5sWaSuAKUNeh3Lv8AdoeyG0c1XG5cwc1cw77yjoAisZpY7KRX/E0t3YpFJKvkiKIgMltR06VV0L/KG+b1T8oux+kPkLuKhwnx92PtXD7k66+enQMuE6w7B7Gy2WipYafA7Z6iy+5OypOq+29m5IT1j5srVYSlko43hpJxUwpGYL97vmC/5N3/AGTfuWLV+Y7i1aCK5hOiECRTG7zW8niVcKSwCt4bN2sgXiVr/dv8lbH7n8rc28o897gnJFpfR3M233YE048J/FSK3vIvCcxMyiJ/HBmRSJUlZwVOwf8ADv4L9L/CbGdpf6Ncp2dvzffeW+afsbunufvLsHLdqdydpbsoNv47a+Iq9274zSRVE2NwGDxiQY7HU0VNjsekkv28EXlfVh/nzNT+X+Sg/YKddJzSuBQelSafKpJJ/Mk+pPRy/futdFU+aXxE6y+cHx53v0D2Yk+MGbgTN9ddjYZGh330h29gYqip637v6wzVNU0GT252J1ruGRK7H1VLU07yKslLKzUtTURSe69189fcW+sx8Q+8sts35Y0HXHx93vuCq3B1r8peu9rUMsVDQ/LjrXF4jKdd/KPaXXW0MZV/3d60+fXQGQpMlJUYSHJ4vMdiYLLyxjHvIKJMp/uze8NjyFuW9ct837uLfk66hM8buGK290mkMajCpNCCGqGOuOPTQkg89vv5fdo3f3b2LlXn72x5Ul3H3U2+6jspoIHiSS8224ZqdsrIjy2dyVkQ+ImmCW4w1RQQKr5f/HOhiyFXXb43RQ4nDy0tLnNxVvSPfdHtrAZKuopspj8Fn8xVdYQx4bPZPDUstfTU1QkfnoIZJ1cqh95fD7yHscZlhHuLZ1IqG0T+H/pS/hUD+YU0JGRjrnC33H/vcLDJMfYvctSsB4f1O3GUgiviKgvSGjHwlg2oOQNFM9LnYffvRPaFcmI6+7j683JuBgb7TbPxbd3tG+pk8Mmxt3x7e3gtTdL+P7EyBSpIs6Fh3y17ichc4iH+rHOG33ssnwxpMolPGn6T6ZM0NO3/AAisRc8+zHvF7ZNc/wCuD7Wb7tUELaXmltXktlNAe66t/GtlFCMtKBxFaq1NiT+R/DNTdofIeCohlp549kbBEkM8bxSxk53cZAeOQK6Eg35H094w/fOxy/yJX/lMuf8Aq3F1n5/dgSxzcxe6MsMivE1ha0KkEH9V+BGD1//R3mfkJ/zILvD/AMRB2X/7xea9ivkP/leOTP8ApbWn/aRH1Hvu5/06n3O/8V7cf+0ObrRUo/8AgHSf9Q0H/WpffamT+0f7T/h6+Xi4/t5/9Of8J6k+69Nde9+691737r3Xvfuvde9+691737r3XvfuvdNmf+S24fhztrcnyc2nvXEdf7m6iw9TuDbm4dx0OVy+2qjcM9sXg9s7i29g6/FZfdOH3ZkK9MfNjYKqmkqknP7sQUyLHnuz+4R7Z87f1mlhTaDYuC0qu6CZqC3OiMq7OJtBjCMrawDqAB6mX7ux5s/19faockWdxccxDd42VIGiSXwFDG8YSTK8UUYtPGEzyI6+CzppYuFNg/w1/wCFQ9fu7ePU/Xfzt2r8KfjRkq+toNo9w5o/J/sKn3VtvMVNEtTFv6m62x3RPY/Xm1Nt11TVUcEuDzPZaV+LNTJLU1irS1Eacb/hoo1svDVpP7WKjStfmQPTr6bQrSLJKVjSmSusY86IGOtwPKgJpxz1fj8I/wCaj8SPnzvjuDqTpXcW6cZ3X0BUSQ9xdRb524uO3Fs+I7ozu1qDKUW6tt5DdfVO/wDAZmfBirpcjtfcWbonoK+jleVDUKg2QRhlIPoQQf2HPTQZWFUdWX1BBB+wgkH8j1Y5791vr3v3Xuve/de60HPnP1n3Z/Mn/nG/zJsZ07mNifGjuT4J7K+Du1/jP2r2vvDbfXvWWW7Z6y7e273htmr7PIp9wbm3D2Dvsbiz7bHraXGVtLDicXBR1/2wqEdfde63k+saze2D6X69yHeuWwUHY2H6v2nWdx52nbH4rbMO9sftSgn7Cy0DxTDFY3BR52GsmUrJ9vDTgWbQL+/de6LN2l8RP5ef8w7piWo390x8dPkp1D3HTf3zxfYe38ZtbNf3klzGMhxcPYew+4tiy0+5cduGoxFNHTwbhweYp8gtPGEjqQgt7roTxFl0jxV4N5j7DxHAdOCaURPB4h8BuK1qppWlV4GlTSo8+qFcvtDI/wDCbr5MbQ7Hw8HfXfv8qX5PRbS6V3vlt17rxfYfYHwT7gn3PNFsDJ0mYztRjM9uLobezZl6eamndDi5YHcVVRWmhoMqKN05y5o3zZtv2Det8uLva7SVngWZjIYiyhWVHar6CqqAhYqukaQtWrH2we13t7ypzTvPOfKvKNltnMO5QLHeSWsYhF1obWsk8aUieYGo8bQJCpKsxFAP/9I6/wDM/wD+FKOa2f2V8jviz8Rvjod4dT9Ib2xfx6+XXzw7V252vub4/dA5nfOeqest2LW7F6kwP978xBt3Oz1mOpayXLUMuVy+Nmgx1BkInpqicw2jc59l3XbN5tY0e6tLiOZFeuhmidXVW0kNpJUBqEGlaGvRPzDsVlzRy/vvLO5TSx7fuNnNayvFpEqx3EbRO0esMmtVclNSsuoDUCKjqoD42fI3Ad41Xaey6bcPXW8N2dJZ7EYXN746Xn3hkOlux9s7jonrdob/AOuq7fWIw27MXTZanglhrMNlYhk8fVQOJABdU6reyHvCnu/se6XN3ti2fMVhIguI49ZgZZdRjkiZ6kVKsrRs7uNOqulsfPh97D7tk/3cecdntrDfpNy5L3lJnspp/CW7R4SnjwXKRBVbSJI3S4SOONg3hldaEsZ/3NnWLHXvfuvde9+691737r3Xvfuvde9+691737r3RTvm90buz5EfHPcXXuwpaJt7Y7c+0t/7awuXyf8ACcDu+t2dU1k020MzVO8NKFy9FXSGkNTJDTrWxRa5YgfIsU+9PJG6c/8AIN9seyGM7vHcQ3MUcjaY7hoWJMDtULSRWOkOQniBNTKO4T/92D3T2H2c95dm5x5pSUcty2N1Y3E8Mfi3Fml2qBbuFQC9YXjXxfDV5DCz6UcjQ1bnxv2r80uk8X8lOluv/iFtrsLrvNLHvDcGwPkRjNubfqv70brpMccXtePc+NzNFg+98NJjMe84xMFY9PDEiyNJQVErwy428g7N7s8oQ8/8pcu+10N7sU36sltuSRJpnkWiQiRXNvfx6FasasFUBQ0kLv4b5n+9PMH3bPdDcPZj3N5w+8RfbTznbsbSDcNglubhTbWryeLdNbSwvPsc4lkCG7kiWR3JQJdwoskZmPid3J8+f5PPyZbs7pWs+Mmw+ufnnu3qLZ/aub7W2ln+wuquo+zcs+7Mxj+t8rT7Q3PgO1sHtDae49yZCP8AiGKaSlfGiMs1Q9IqmF/e/wBoubOTboc6bht8MezbnIjuIXDR2t3OryyWYBYyFIyr+E9CvhhVLahnLP7qP3l/bz3TsZfa/ad2vH5q2GKWOI3cTLNuO2WkiW8G6F0TwfEuFeJp4iyzCZmcxqrCm75/Jp/mMfLj525f5v7B+YHQ3WHS/Y3w570wnReUl6ay+U3P1/lN5w4bLSdh7SXdlZurduOzO6+v83iolyKUU4ipIslTRvqk1OcfeszerwffuvdQMpBX1OMyNNiq+PF5SooKuDG5OaiXIw46vlp5I6Ovlx7T0q18dJUMsjQmWMShdOpb3HuvdfIO+bnxXqOvvnZQ/GD5w7v7Q3D8nq3uneXU3e3yT3nnNw5mo7f2z2HmKLN/Fj5YbRzG/wCujxmMws+DyLYPIbffIy0lNRYQxCpWoLCkF/Ie17NvvNuy7DvsrRWF9KLfxQwUwyS9kUuahlSQqXUjuTUBmnUWe9fMvNvJXtdzjzryRZRXe/7NaNfC2kSRlu4rb9W4tv0leVHmhV1ikjR2SXQdDrVS69QR/wAy75U7/b+WB8bvk589PlN8POpdxZDb/cVP0hjM8YcF11u2qxG2+z9uVeA3L2xtrZO49grU7YqIts4Tdm6sdtmsr1nqKVKP7urkdvnfYto5Z5o3bYdk307lZ2kpiM5hMAeRCVkCoZJKqrgqr6qOBqGCKrfabm7mbn3kDlznHmzk9di3TcYBOtmLoXbRwSjXbtJKIYAsskRR5ItFYWJjLMyk9fUA/lsbi64ynw16a2l1N0X8h/jjsHpfbtL0Lt/qj5SdbwdYdyYSl6fpabZX3u5MLjq7K4HNNmjjPuv4xjKuqoMpNLJNHIWLhQp1I3VW385bt/43fzIvhLvb+X98U+2+svkx3j8ku6Pjp1Fh4ujt1YHuDGdJ1f8Aptxu8Nz9tdpZbYVbncdsranWe0OpNw1OTNZUUszyQxUBMctfBr917r//09iT4n/yg9x/Eze3cHQr9p7S+Vf8r35FHsftPsj46/K7ZO198dvbS+Su5d8bV3Rjd4YXsSj2REO29sZ+lxsjZB92VBy2IyWIxlZQSyVD1Uw917rU4wnwq+SH8ohu4urvkb8QO0MZ1Hne3d4756v+TPxr2jmfkx1luXYc82ModvbV7J3NtKiXsfaOT2xHWCHESbsxWIqMh5Kwx01lM8uYn3dPfDkb295f3Tlvmu3ktZpLozC6ih8QSrpCiObR+pqjOoxmjJpdh2Efqcx/vs/dP94feTnnYefvbe+t9ys4tvW0fbrm6+nNs6ySSG5tC6mDTcAotypMcmuKJg0i9qJDHfzCfhtW5+q2vlO4ajYGdoo5JKmi7V6+7A6+8fid45IjNltvSRx1KyRsPHIY2JUgXYW95R7Z94v2Y3aQw2/OiRSgV/XhngU/Y7por8iQfSvWA/MH3LfvSctWq3d57Ty3UZYDTZXdndSCvmYhMj6f6QBA86DPUGi/mP8AwZr8dkspF8h8HTw4uGpnno8htHsOgy9WtL5NaYjGz7UEmTnqPEfCiMGk1L+m/Dsf3hfZeWCa4TnqIJGCSGguVc0r8CNCC5NO0LUnHr0zc/c0+9HaXlnYye0F08k7KqvHd7e8KFqUMsi3VIlWveWFFo3GmeP/AA4v8QpWx/8ACt79g7opslQw18WR2l0p2ZmMdSioCtHj6+abB4+ZcqiNqkjp4qmFALeUtYEpuPvO+ycEsca82PKpWpaO2nYIT+B6oCslMlQDp4E1x0ILb7h/3r7mGWVvbSC2KuVVZ9xs0eUCv6sOiSVWhYiiO7xs3HwwM9LrZPza+IXYLU0G3vkN15QZOrqhQxbf3xV1/XWfjrjLJD9jVUW9aHC00FUJYipHnZbkDVqYD2LNk96vafmERfu3nywV5KaUnY2zkngNM4TJpQUJBxQ5HUd81/dg+8VyU90N+9nN5a3gUs81nGl/CFFCWDWbzOQK5rGGFDVaAno0k0E1NJ4qiJ4ZNEcoSRSpaKZRJDMl+JIZ4yGR1urqQVJBB9yh1A8UscyeJE4ZKkVHkQaEH0ZThgcg4IB6xgE8AX/1vfur8OPXZVhe6kWNjcEWP9D/AI+/UI8uvAg8D13oIgq6uRooKPHwNV5CuqpoqTH46kS+usyVfUvFR4+jjt6pZnSNfyw90kdIo3lldViUEliQAAASSSaAAAEkk8B1rVWW3t0VmuZnCRooLySOeCRxqC8jnyRFZj5Dooe8vn78P9k5GqweV7vodyVOEpqmqyrdb7c3Z2dhdt06zRLUPl89tDE5LAUKyVMwUmKolXyghyrAXiPfPf8A9neX7sbfuPPMElwCR/iyS3SKcVBkhR461NKKzGoNaU6yQ5S+5595fnPb5N62T2ju4LNtJrfS2+3yyChCssNzIk+kAcZEjwRpqD0AvyNyPUHzAX4x5jqDtb4997QdY9t4/tXI/FvevbNL1k3yDwtPU4aOu2PV1tXLi957K3BVUuOmxxpKynx870mRmkhkSVY/JFPvhbbH738r8r2/t77g7RcbhFcSSpZtcpHJda1WNdMb0ljnjNQI5UQFZGYstBWffut7nzT90fn7n7d/ez2T5ps9kubSG0m3OHb57qHb/BkeVtb2wkhns5tQZ7i1knMbwopUqWKbCHSv/CmPdfxWrcj1t/NP+HvYm2e3e3uyc3uToyr+FWw9n7z2Fu3Z+XG38Xj9kVNPujtjBbk3H2btjOuaCqq4RPNkjUUqCniKq8+D3PvtrzZ7bX1pYc02SRtOmqN45FljegXUAynDJqXUpoaMrCqsrHqx7JfeF9qfvCbPu28+1/MX1kVhOIrmJ42ingZwzRGSN8hJkVnicVDKCMMrKtwP8x/+cf0l8HvhFV93ZLIU+yPk12z1hna74w/F7tVKJO4M92XVU1Zi8LSb36/2blt01GD2/srcSh9yVE9ZBQULU0lBNW09dJHF7AfU19VMfyKu1/5tH8xD4H7kz9F8s6j4/bTxvYnZ+Gw3yr7L61Pyb+RHdvbNVvDbW+dybp2fhe1J8J0ftH43bamyuT2pQ4TG42vemSCejpKnHz0AmX3Xuj6/J34T/E/+f71DsH5DdMd+9j9Kbt2xJ2/8XewOxNubINHvyt6ri3RldofIP409g9UdjzxDYmYye4sQlZRV1XTHK4uNop41qKSsKS+69w4da5+ztpfzi/8AhLf0t3zWYdPhzvr4e79+Wez9p9f7o7I2nunem9d9Z3e1NLRY3sIUHUe4Np742njB13sLRk8duDIV0NDkYzBiaeWSrNVUeJJNTx68AAAAMdbeHyN+aXfPxV/lcd9fLn5T/GDa03dnS2wd4R7u6P6z3y3ZHVvYtdS7r/0fbe3nt3c1ft/FbjoOm9/0mRpdyVlJmsRDntv4CoqKaup5aqldpdEgAknHWwCxCqCWPWvf/wAJmesuzvkD3vvT51/IUUXXu7E6V2nQdZdK9XYmi626+lwdXWbx2Rtrf299k7cxOCx5h2j1cI9q9fYI/cY/B7VU1TibIVS1SyVzH7Zb1ypyNyrznvbCI7xNIIICrB0gjVSssmocZi2qMDAjCsSS9Egvkn335a9xPdr3A9suVITPb8s28QvLzWpikvJXo1tbha6ltlGi4kYj/GCYlX9NmP8A/9TfV3juWl2ZtHdO8K6nqKui2ptzN7lrKSjMIq6mkwWMqspUU9KamWCn+5mhpWWPyOiaiNTAXIM9l2ubfN42nZbeRUuLy5igVmrpVpXWNS1ATpBYE0BNOAJx0Rc0b/a8qcs8xc03sMkllttjcXUiRgF2S3ieZ1QMVBcqhCgkAkipAz1Vp8TP54n8tv5gbhzuwdod+Yzqbtrb2f8A7u1nTXySpk6I7KyFZPXGgxku18PvmrocfvSPLzAGGHEVddWRBk+4ggZ0Ut71tl5y/ut7s27QNBfwTNGyurISVYrUK4VqNTUtVDaSKqDjpRy3vO382bFt3MewXMd1tVzbpKrxOkyqHVWIZ4WkjqhbQxV2TUCFdhk2FdhdL9A/ISh2bW9o9X9Udz47am5Ntdj7Brd67R2rv2k2/urb0suR2nvTatVl6HJxY7MYqWqkloq6lZZI/KxR7O10HRr1PyHRPR+XyGNy2V6b6qyeVw2TkzWIyeQ682jW5DFZmVGjly2NrKnDyVNDk5I2KtPEyykEgt7917oTqampqKngpKOngpKSlhjp6alpoo4KenghQRxQQQxKkcMMSKFVVAVQLAe/de6Jp8ov5dHwa+aG3dybe+THxa6X7Tk3TQ1FDXbuy+xcHR9l49p6U0YyW2+0cRSY/sLa2apqeyw1uPyVNUxgWD6bg+691rPZb/hN186/jnVLsz4LfO7qPe3QRyOUyWC6/wDmn1jmcnu7reGadHptv4XsDrekyc+68ZkUYmpf7TAR0zwqYKYmSVvc3cj/AHhfcvkHa4tl2vcLe62qNtUcV1H4ojr8Sq4ZZAjGh0ayq07AtW1Yn+7P3K/Yf3i5jl5t5g2e92/mSaMJNcbdcNamfT8DzRUe3kkQVAkMWtgaSFwFCyuq/wDhOf8AzHt+7rlqPlv/ADQsD1517B9tbaHwu6wp8FuHO6IplkP9+N44DbJ2lIsk/rP8NzaVSRrrSNgGVzefvIe8e81Q84SWtvg6LaOKAVFc6kTxM1z30NBjA6Y5Y+4z92DlhVP+tnDuVyCf1NwmuL1qHTjTNI0VF09v6dVq2kgEjo33/QM5sLEzU9XtL+Z1/MwoaqghWLHjdvZnT2/Matop9X8TxOT6YoqLNRtUtG4WdSQiMmolgyEVr75e8FnLDND7ibo0kfDxJTKv2skmpX/24PQy3L7pn3Zt2hure69juXUimarGG1S3cH+hJDoki/5tsvQQQf8ACYTI9qZ/qTH/ADO+du5fkj1J1V2LWbh3B19gOo6/oxO/uvsri5jNsjtqs677hgqKLdGE3BT0f2W58ZKKpsSKqmNLHPPHV0zHOXvF7hc/bXtu0cz7601rblydA8LxmfT3TohEcjIqhUOgUGo5Z2JU+1/3Y/ZX2b5h5g5l9vuUVtdw3Dwv7Vzc/SrEhUx2Tzh5raKVmMksaS6GfSQAFA62I/i/8IPiN8LNmZLYHxX+PXV/SO184mJXctNsrbdNTZLd0mCoP4Ziarem46373cm9MhRUbOFqcrV1lQXlldnMksjNGPU+daWv86r/AITt/wA0D5yfMbN9/dM7R+CGN2TWVu8aDaOP6Ux6dDbmG3KTcWa3HtDdveuRz2LbI9jd37sgyCU2Wy0FbVUUE8EP26U9OZCvkJjfxI+2SoNRg1HA1GajyPXpf1ovAm74dJXS2VoeIocUNTUcD0uepv8AhGJjt8dWYrcfyh+c3b1H3nntpbPqajbWE2ltTfW0urNyVeBpI+xdsVed3PnsnVdo00eXeoTE5Si/uwaSMRs0NQ6CRlt7uW47k4k3G/nuJBwMjs5H5sSeiva9j2XY4mg2XZ7WzhY1KwRRxKT8xGqg9WL/ABo/4SSfy6utsqu7flRuLs35qbsSGlFFht0Vi9GdM7cq4an+IVVTtPqnpCu21PjKXIZKSSSXH1eayGLdXIemd2lkkRdGnWzf1315sXqTYm0OsOsdp4HYfXmwdu4raey9mbXxtNiNvbZ23g6OKgxOGw+NpEjp6OhoaSFURVH0Fzckk+691S7/ACvuvG+LHz4/nAfFXKZGmC9k/ITZ38xTrDHY+XF0uGqOuflpi9wbe3GMfgqSKKsxma2l2X1BX4zKtJeGogOOqI/VPL7917q5LsjqbrHuHF4LB9q7C2p2Jhdsbz2t2JgMRvHCUGfxmK3zsfJx5vZ+66ShyUNRSx5vbOYhSqop9JenqEWRCGUEe690ptz7mwGy9tbh3juvLUOB2vtPB5bc25M5k546XG4XAYKgqMpmMtkKqUrFTUOOx1LJNLIxCpGhJ4HvRIAJPDrYBJAAyeqA/wCTR2N1X3J3p8pu4ei581VdL9rYLbHYXVs+4sNV7ezTbM3Ru/duSxaV2ErwK3HLTmV44EkF3pUjcXVwfeZHv9uu4b57L+xW8bqrDcLi3LOWrViIIV1n1LhQ9QSDqwSKdc2PuibFsnK/3lfvVct8vOp2qxvzGgQAIgN1K4iSgHbEHEeQGBUhwHDAf//V3mfkJz0F3gDyD1B2Xcf+SXmvYr5E/wCV45N/6Wtp/wBpEfUfe7f/AE6r3N/8V7cf+0ObrQn3j19132vgcdh+1evdjdm4ympYhSUu/NrYfcsmP10ogLYnI5Glly2Fl8TFRJR1FPIo+jD32R5g5d5f5niNnzHsVnf2y6gq3EKS6a1qULqSjejKQQcg9fMvy3zdzhyDul3uPIfN+6bJeu51tY3U1sJKNq/VjjYRTCorpmjkU+YPQC7N+Kk/QGYg3l8Hvkf8j/hJv6ldpXresezN07u2BuPTRtj6Si3p1tvHOzY7P4+gpG8UEctTJBDGq2p2ZEZcd+avum+2O9Q/8hs3Oy3ta1R3uYmJJqXjncvjGnw5U86g4pmTyB/eJe/3K94P66jbuadoIUaJoksLmMLj9K4tIvCNRxWW1epyJEFR1ZD1D/Ni/nh9C0OBw27dz/Cf527awsWUqM1kd9YHd/x77v3KrRf7jMNR7m2rHjep6OankAKVNRg5C41LPKSyzLAm9fc65+tEeXYuYdrvlUElWaS3kanBUDq0ZLeRaVQDxxnrL3lX+829oNyKxc4cjcxbPIzqodEgvoVB4yO0Eon0r5qluzkZUE1HR99of8KdcVgMrjaH5S/yx/mz0ri8jR0scm7eqqfZvya2tjM2J0TMDIV21avZ1Y21cdTuJYclTU9TU1g4ShXgmE969l/djl403PkHcTQkEwxm5QU4nXB4i6fQkgN5V6yp5U+9L93LnZpV5e95tiLqAdFzcCyl7uA8K78GTX6rpqpFGoelXvH/AIVG/F+HOVuA6c+EX8yHvE0uTbHU+5sL8dcfsrZmVUgmCroMhvfe+K3HSxVCjUqZDE0MoWxZV+gKrH2x9ydykEdl7f7y+aV+kmCg+hYoAMZyQKefQi3f369jdht3uN294+WIVClqHcrUuVHEhBIWYVxgE18uha+PX8/vb3Z+d3kO7fhL8hfjNsnHUOIqOvdwbp3H1tvLde+Kypnq0zVBmeusBmqPLbEGJplp5Yaiaoraes8sqaopIQssmbB9173g3uKW4uNlt9ugAGj6udUeQmtQscayuukUJMgQGtFqQQIJ5q+/192nl2a1tdr5rut9uWdhIdtt/FhgVR2s9xcSW0Mms1UJA0zrQM6qhDdD3uP+dp8dqHxLtbrLuPcrs1pnr8dtTbVPEuoDUjzbnyVVMQtzYQj6W/Psbbb9znn2dv8AdrzHtNtH/RaeY/sEKD/jXUab5/eVe0VmhGw8nb7eT6SR4otbdCfIa1nuGFfMmMU+fVbNd/wop+X2F3zmsVP/ACj6zeHX0e56ilwG8tjfNvqp8zWbNjyc8NNnKzaO4evcW8OfrMT4qgY16ynVJS0TzqB5PYK3f7rnvPY31xBtnLMd/YrIwSaO5tk1qGor+G8wdS60bSwqtaHh1JnLn3/PuvbttVpd73z7NtW6NEhkt5bDcHMUhUGSPxktfDkEbVQSIdL0qKVA64fMn+eB1Z3N0t1gOuPlF8rv5QfdmO7Lyu7Hzfd/wQz/AMhdubj21svC5jC5LZfYmK6wTtPaibI3fkc5FkKDJ0mRnljXE+aop44nRxGe/e2XuDywscm/cnX9vG+ujGIsv6fxklNQAHEE0DKNS1XPU6cm+/Hsv7hPPHyX7n7LuEsZiDLHcoGBmFY10uUJY4DIKsjkI4V6r0EG1v52v80vZPVnX/fmTg/lS/Mvo3J4fP1mz8N0p2d3r0j8svlntfa25TtPI9g9YdP9k4TKZLrmvwHiNbuKlzO2I8fF4ppKVoaWSlLFmzcl848w3G3Wuy8q7hcSXau0JEEio6xCruJHVY9C4BbVQllArUdCDmX3Q9s+TLTe77mr3B2eyg22SCO6DXULyQyXLBII3hjdpBJKSdCFQe1tWnSabUnxY+QWD+V3xz6Z+SW2dmb86+233ZsHA9ibe2h2di8Xht9YfB7jpRW4kZ/G4XM7gxdPNXUDx1MJhrJlkppo3upYqoZ8yPMEg/Ig0IPoQcEeR6HPkpqCCAQRkEEVBBGCCCCCMEEEY6H337r3Xvfuvde9+691VzuLpM7f/nLdZ/Jql7Bp6Edm/wAuzsj455vrHJ7ZzdPBnj1b8gtm9sbb3btve8NM23K/cuHHYuTp6jCVMyVq42WSsp45YkqXg917q0b37r3WuV/wpky2+st8Nvj10FgN5bi6769+V/zQ6t6D7t3btTIyU+ZreuMrsXtLes/XgxtJLSV9fjOw8zsmlpKx1nSnhgiZapJqaWWMjT255dsOb+feU+Vtyu2hsr+8WJmUEse1m0Cnwl9OnWahK6iDShiv3z543n2z9mfc33E5f2qO83fZdoluY4pJBElVKr4jsQ2pYtYkMajVIF0KQWqIP8iyhx+L353niMRQ0+Lw+G606wwuHxdICtLjMPh8hnMbisdTBmdhBQ0FLHEuosxC3JJuTmR98a3t7Tlf27s7SER2kNxPHGg4IiQwqij5KoAH2dc1f7s26u77nD3g3DcLp59xubeGaaV/ikmmuJZJZGpQankZmNABU4AGOv/W3mfkJ/zIPvD/AMRB2X/7xma9ivkP/leOTf8Apa2n/aRH1Hvu3/06n3N/8V7cf+0ObrRUo/8AgHSf9Q0H/WpffamT+0f7T/h6+Xi4/t5/9Of8J6k+69Nde9+691mhqJ6ZtdPPNA/HrhkeJuPp6kZTxf3ZXdK6GIr6GnTckMUy6ZoldfQgEfz6yzV1dUf8CKyqnsCo81RNL6SblfW7cE/j3sySMKGRiPtPTcdraw/2NtGmfJQP8A6ie6dKOve/de697917qTBW1dMk0VPVTww1KmOphjldIaqNkMbxVMIYRVELxsVZHDKykqQQSPejlSpyp8jwP2jgemJba3naKSaBGkQ1UkAsprUFTxUggEEEEEAg1HSb3Yu+KjaG76brOv2ziOwqvbddBsrJbx/iMOysVuCnoTBh8huNcDG2SpsPgqdWeJqeNhStFG2gwoyEu3r99nZN0h5bubeHevp3+nacN9OkgXtMoQFgiipqqnTQGlAejrl/+q0XMPL0/O1pe3HKEd6jXsdn4ZvZbdnrNHb+OfDaadiFYSMDKGcahIysNir/AITO959ud9/yhPj9uDuNaWvzWydx9qdUbY3jTZSDJNv/AGN19vvL4fAbkqo6eGFMdPjpBPhBGdRqIcQlXcCpCrxFudZubppZQ8zSuzMDUMzMWZgfPUxLV869fVjYCFNv26K2tzDax20UccZXSY4441SOPT+Hw0VU0+Wmnl1fl7Z6Vde9+691737r3VUGayU+9f522xNrydP7QzOC6F/lq733+e9K2uzNfu/ZO+++vkbtnZmC63wmI/vDBtvb9LuvZfUWdr6uu/hVVkqyOljg+6padDFWe691a/7917rWa/4UjbsgymJ/lu9AQULpmOw/ma/ch3TTYSqr8ptXavxr6y3PuPcrYrN089Mu15Ny1W8sfiaypZyZMXWVceiRWdDL3sDtMu9e83t/aRTzReFeG5Zo61CWyNKwYggiN6CNzUABshgdJxu++FzHByr92H3k3K4tLaf6jbPoUjn06TLfyLbRsgYMGmiLmaJApLNHQFD3qrP5Hja+zvkO9gNWydhtZQAo1Z/chsAOABf3lL98812DkU043lz/ANW4usCv7sIaeZPdJa8LC1/6uv1//9feZ+Qn/Mg+8P8AxEHZf/vGZr2K+Q/+V45N/wClraf9pEfUe+7f/Tqfc3/xXtx/7Q5utFSj/wCAdJ/1DQf9al99qZP7R/tP+Hr5eLj+3n/05/wnqT7r011weSOJdUkiRqP7TsqL/t2IHvwBOAKnraqznSikt6DPSi27tTdm8JfDtDae6t2y61jKbX23m9wkSMLqjHEUNYFdgeAbE+y/cN12raV17ruttapStZpY4sevey9H2zcq8zcxO8Wwcv3l7KpoVgheVgfQqisa/KlejHbc+C3zH3U8KYr439oQCdQ8c24cPTbRg0lQwaSXdddhhFcH6NY+4/3D3r9pdsDm69wNtbTxEUhnP7IFkr+XUx7N91X7w2+hDY+028JqFR48DWn87rwVH5kdDhhP5Tvzhy5Q1XXW1Nto6B9ef7I2qxW9vS8W36rPzK/+Gn2DLz70Ps1aV8Lfrm4IPCK0n/kZViHUnbT9wX7yO4hTd8rWtiCK1mvbM/kRBPMwP5dCXjv5Mfy3rCn3u4ukcQGI1fc7t3XWMgP1JWg2NMGI/wAD7Dtx97z2tiB8Lb95lPyghH/HrkdDK0/u3vfidl8feOXIUPHXdXJI/KOykB/b0tqf+SL8gXVTVdx9OQMR6lp6LetWqn8hXkxVEWA/rpHsmk++RyMCfC5T3Zh82t1/wSN0K4P7sz3LZR9Tz7sSt/RN0w/nap1N/wCGQe7/APn9/VX/AJ4N3H/ebi/tj/gyuT/+mN3L/nJB0r/5Nlc/f+FE2f8A3m5/609J/dX8iLufd+2N0bNyPenXVHiN47bzu08rkcHS7zxOfx+N3FjKrEVldhK6Omm+1ylLT1bPCSdJYaW9LH2l3L73XIu77Vuu0XfKe8JBd20sLNFLAsiiVGQsj1qrCtQ1D8wRjpZtH93H7ocub5sfMe1c8cuz7ht17BdRR3KXLQSSW8qyokyfTtqiZkAccQDUZA6Sf/CbHOYj4e9S1f8AK+762b2R0z8rMBmO2O2trUm/d/vvHrD5EdeY7s7c+2c7u3oCKj3xvLafX25uvqmhgpd77HpBjcjSVcqZiWnnarrnpOfz6Nb+ESYqmlQAaVxUAkA04gEivn12GiMrRRGdFWcqNQViyhqDUFYqhZQa0JVSRQlQcdbUXuvTnXvfuvdA10d3/wBU/I7ZNf2N09uKq3Rsmg3nvrYTbgqtt7o2vSVu4et9z5LZ27v4RHu3DYOqzOEodxYipggylLHLja9YjLSzzQlZD7r3Vf8A/LPxm6e0Oxfnh82N/wDXWF69z/yF+Tm5eput/ssVvnbm6t1fGj4i12Z6a6a3X2Vg9y5qfCSbn3Jl4tyZWgq6CggE2CyVG/nmjkjip/de6tl9+691qkfz7M7UZH52fALZ5OCqaPa3x4+ZO/8AwzUVTHuXFTZ/IdJ7IbIYzKimFJNjMmxipqqj8xk9CzeO0YcZO/dEtRce7004QFrfZrpjU0oHaGOoHm1SBTyBJ8usCv7yS/e0+7Vb2XilUveadtSgFdbQieejH8KhVZwfN1VfPI+fyOf+Zl/IT/wx9g/+77cfuZfvnf8AKv8AIn/PZc/9W4uscP7sT/lZvdP/AJ4bX/q6/X//0N5zv+KWfofuyGCKWeebqPsiKGCCKSeeaWTZuZSOKGGJXlmlkcgKqgsxNgCfYp5GZU525Pd2CoN1tCSSAABPHUknAA8ycDoA+60Uk3td7kwwoWlfYNwVQBUkm0mAAHmScAdaq3Q/8sT5c9047E5R9k0nVG16ykp5Ytw9sVVRt+qmgMEUgko9nUdLkN3yGWJwYjU0lHDIf92AXYdM+dfvIe1nKE1zbLu77nuSMQYrJRKAakUadmWAUOG0u7D+EnHXDT26+5B77+47R7jJsMey7HK2oT7i5gLKTXsgVJLokr3IzQLE9RSUCpFh+F/lY/D7pmD+I/Jz5Mtla6jigq6vCruTbHVWFsVHlgOPkrczvHIQtIbI0NbTyMBfSL2GHHuL/eAQ7AtwiXew7DCo43lyktxStAVR2iSp/h8GTOBXj1m1yf8A3dHtNy4sVz7i893m53SULRxeFZQH1VwxuJ3A8mjlgJ46RWgE7D9kfyg+igDsjY+yt55Kmg8Yr8V1xuXtPJyOpuSm5d5UOSpfupGW5dKtQAbXC8e8Jed/7x7l+8eaK+94t0viKkx7fFcJH/pawxwQH5AsR6mvWSPLfsr92XkeOJdj9uNrmljWivNA9/IPmJLzxyrH1VhjAoMdKXK/zcek9vU0OP6+6U7HydBTr44IJ4tm7Jx8EaqAiw0seXyckScWsIBYD/Ye8aN6+/hybJLJNtvJ+930xyXnaCAt+Zlmcn7V6lqPnLZtugjtdq2Z0tUFFRVjiRR6BQaAfYOgjzP84fe0rP8A3c6B23Rob+I5/sTI1kij+z5Uxm06VCR+QH/2P59x1e/ft3+Rm/dntpaxJ5eNeu5/MR26D9jdJ5efro18Da0H+mkJ/wACdBxXfzbvkhVKVothdM4m97OaPeeUkF/pcy7koY2t/wAEF/YTufvu+7E1Rbct7BCPXRdSH+dwg/l0kbnrd2+G1t1/Jz/z8OkLkP5ony9rJC1Jl+sMQnNoqPr2epA/x15Hc1WxI9h64++L73zkmO82mEeiWZP/AFcmc9JX5y39j2SwKPlHX/C3TFJ/Mt+Zsn6ewdnQ/wCEXWeAP/W6aY8ey1/vb+/LfDzNZL9ljB/lr00eb+Yj/wAS4x/zbX/OesB/mTfM8m/+kzbA/wAB1ntO3+8wMef9f2yfvZe/tf8AlbrT/sgtv+gevf1u5h/5TE/5xr1li/mUfNAuqjsTaMzMwVVk6020AzMQFW6PCBc/1I/1/bg+9t78pVn5psiB62Fv/kHXv638w/8AKZH/AM416oUzfzT3Dub+dT8Ot8ZTvTDY7Cbg/mQ9NJn9iZahxu0sbH2Pl+hsH8dO9e0dqvVrDvbr3ZO69sT7d21JRyNHt/eeZoJ65DJFCZ3zs+7z7ie5HOu02kfPtlBLPJaSXZuoY/DRElnEdnanwy0DzNCks8yo3iQK0KTqsjlQPeW9y3S+iQbiisShfWooBVqIuCVJ0gswGVwGoTTr6NXvJboU9a8H84j+b18EOo8H21/L23X89D8VO/8AszqvMUe7u3thdS5n5C1HQW26+p26dw7T3Bt7ZmUpcrt3uPtbrXK5Km2vEhaswzzw5eoFMv8ADjWe691Xv8atmbz3PuH+VN3DtnEfH7q3Yny8+GXZP8un44/BLu3sju/OdmzfAzH1eI7v3f3ttvtrq3BLV7e+ReY+O20lO6ZJ6enw1JUR4SlpMrRVOTkSL3XutuXqXqnr3orq/r3pfqbbNHszrHqvZ23dgbB2nQTV1VSbe2ltTF02GwWJiq8nVV2Urfs8dSRo09VPPUzsDJLI8jMx917p63tvjZXWm0dxdgdjbv2vsDYez8TWZ/du9t65/FbV2ltfBY6Jp8hmtxbkztXQYfCYmhgUvNU1M0UMSAlmA59+691pJfKbanzZ/mIfzwe+N+dKdL1G8fjR8X+lt2/FjbPZ2HOMqdl7mHXI2d2B23g9t72ytdiMPWdsN3N2hQ4ufH0TVNRFR4mopeTT1rCf/u4c67DyF7g/vXmK+Frt11aSW7zNG8iqrdyrVCTHrlVNUmhgERw1BkYf/fd9qObvd/2YTYeTtpkv95sNzgvIbdJo4Wd11RSSMJNKzJFbvMRB4gdpWjaJHkSnVvX8mPae6ti91fJHau99sbg2bufHbH2B9/t7dOHr8FmaUNn9yBJJMfkoKeoMElvRKoaJxyrEc+50+91uu173yj7fbns25QXe3SXlzplhkWSM/pxYDISKjzHEeYHWK/8Adzcs8w8pc9e7eycz7Jdbfu8Vja64biJ4ZV/VempJFVhUZFQKihGD1//R3wuy9wZDafXO/wDdOJFM2V21sndW4MYK2J56M5DDYKvyNEKuGOWCSamNTTL5FV0ZluAwPPsPc27ndbJypzNvNkE+ttNvuZo9QJXXFC7pqAIJXUoqAQSMVHHpNeSvBZ3c8dPESNmFeFQpIr8utUzfPzA+TvcNGku9u5t2xUGSoqdqjbuy6ldhbcCyKk4iFHtcUGQqUjduDU1VQ7ADUT74x8z++3u5zypfe+er5LOQA+BbMLWHSchWW3EZenq5Ynz9OoRuN+3rcEU3W4vpZRVU/TX14LQ/tY9F4NLTtUPWSRLNWyMWlrqi9RXTOb6nmrZzJVTO1+WZyT7igxRmQysuqYkks3cxJ4ksasSfUmvRXpXVqp3+vn+3j1I9udW697917r3v3Xuve/de697917r3v3Xuve/de6xVM9LRUWSyWQqYqLF4bE5XO5jIVF/tsZhMHj6jK5nKVbfSOjxuNpJZpXYqiRoSxABItGks01vbwRl7maVI41HF5JGCRovqzuwVQKkk0AJx14AkqqirEgAepJoB9pOOtXL59fLTuz5jfITpHorpjqZ+m919YZxO2Nrbyym6MLWd14pcJt9t8Y7e/Y+7NrLLF1FtnqjZuFq90S4pKqrfA0rTV1VO0iBYuqX3VvZiz9v9v3fmr+tr7nfX48ErDHLDYRGJz4rWyy0a5Z5AI3vCkYkEWmNAoJaWOU9kTb45rv6vxXk7aKCIxQ9xWvxEnBegrSgFOP1W/hV3JX/IL4m/HvuLLrkTnd9dU7Qyu4qzIbf3JtmPM7jixMFBn9yYLGbuwW2dxTbN3Tl6SbJYGuqcfRnJ4WrpaxIkjnQDLzoY9Ue/zQf5J/8AKy3h8p2/m6fN3sWXqXqrqXb+0c38gthyUWCxfVHcGc2fkpMftLPb+nxmFqt7Z/Obklr8VhKrF48VNbuOOio6GFfLK6ze690Iv8p/Ib3/AJknyC7G/nG9ubbzmzup4sdvD40/yxun9yYdcVNsb41xZfFydj/IHJUjRtBJv/5B7jwFPTCeAn+G4nFzUEVRWUUkEvv3Xuthz37r3Wkb/OR/nLbM+WUe7/i/8Tdx0PZfxy2LvPCbD7DqMNsKqz+Y+aHzLxO74sn1J8MetoN0bl2ti818cqDN7bXN9vblXG5DHVm2YaegoamSLKwLky/dt22vYNr3HfN7vo7bZ7OF5ppXNFSONSzMTQngMAAkngD03NNFbxSzzyBYUUlieAA49NvxLHanw82bt/GbG7f3X/pQlTLZ/tvsakqEaLsfsfe+7M32R2Jk6nbeWpKrBUm3a3sDdOQmpqBKOJERgzDWze+NnMX3hfdDd+eeYOdNh5u3Ha7W7udUNqkoaCOGMCOBXgYNBI/hqGkbw6M7N5U6hW55h3Wa/uL63vZYVd6hAaqFGFBU1UmmWNMknrYu/l1/LPtT5Gbi7E272tRbMyWW2PtfbNbj974PBNgdwZSlzWVzME+LzNLFUVONaCCXHLMjUq0set2vF9D7zh+6z78c9+6svM/LnOcltMduhgmSWKMws5lZ4yZIw5hLdmGjjjoMENXAy5T3a43a9u2vreBruOFQJlQLIVLMdDHPaCNQAIFSTp8+v//S3p+8CB0r2+SQAOruwCSTYADaeWJJJ4AA9g73EIHt/wA9E8P3Ne/9o0vSLc/+SbuH/NCT/jp600MTWUn8Kxn+VU//ABb6L/d8X/KtH/tXvgpbzRLbwK0qhgiggkVBoOsfomXwo+4fCP8AB04feUn/ACtU3/U+L/o72948H+/k/aOnKj1HXvvKT/lapv8AqfF/0d7948H+/k/aOvVHqOvfeUn/ACtU3/U+L/o737x4P9/J+0deqPUde+8pP+Vqm/6nxf8AR3v3jwf7+T9o69Ueo6995Sf8rVN/1Pi/6O9+8eD/AH8n7R16o9R177yk/wCVqm/6nxf9He/ePB/v5P2jr1R6jr33lJ/ytU3/AFPi/wCjvfvHg/38n7R16o9R177yk/5Wqb/qfF/0d7948H+/k/aOvVHqOqpP5vHyVqOiejun8Jtffe7di7t7I712xk5Nzde5GKi3ThdhdX+PNbqq6OUMrVMk+WzeL8FMzxwVEtMVmLxgocrPuhcg7Tz77hcwXe/bZbX3Le3bU6SxTKJI3lvT4cY01oGWKOc6uK6hpoTUCvk/b4dw3G4a4iV7aOEggioJfAx9gbPzx1tMfy5v5L38sHbu3O/N37T+KHyD25uTfcfZPxf7S3N8m+xt7Sb1756uym4Np75zu9KeHbG8KTbY2J3nRpQGqegpsdJkcQ9VichTrDNkKOXrJbW8Fnb29pawrHaxIqIiiiqigKqgDgAAAB6DqXVVUVUQUUCgHoB1sObf2/gdp4HCbW2thMRtrbG2sRjcBtzbmAxtHhsDgMDhqOHHYjCYTEY6Gmx+KxGKx9NHBTU0EccMEMaoiqqgB7q3VP385f4mbf8A5hOwvjF8EN4Yn5B47ZPdXyOwW/N8dq9Q9XUu+evthbO6J2/mN6bk233Tu+q3vtFOpqTtjFVcuF21mRT5oruFoP8AIJ9Ohvde6tr2DsXafV+xdl9Z7Dw0O3djdd7S25sXZm36eerqafBbT2lh6PAbdw0FTkKirr6iHGYfHwwK88sszqgLuzEk+691Wn/N06i+Q3fXxsrenOuO6Op/jx8dOx6PPbX+Zfdu7t9bh6y7T6p6fqjhKyDfnUG9Iqyn6/aixE9BVQbwwe5DSU25Nr1dRQU+Sxk0pqffuvdaFOL/AJa3af8AKW+VPUvZ3eVH2RL8RNu/NT5L9FdTd1Z/E7fm2HX5LsHqraUXxi7XxtPgs6mQo6rt3bY+5r9wRLWYHHHFPRKwq6KuiSBPvN8vb/zR7J85bTy3AZb7TDK8esJ4lvBMk1wlCreITEjaY6qXIChqkdB7mm2uLrY72G2FXoCRWlVUhmHzwDjz4V6vDnlhpZpaaeenjmp5Xglj88J0SRMY3S4ex0spHHHvjEl3bSokqXCFGAINRkHIPHqFQykAhhQ9W8/yd5oZezO+fFLFJbY2wL+ORXtfPbp+ukm3vO37iTK/NXuMyMCv7vtOGeE09f8ACP2joechEG+3Oh/0JP8Ajzdf/9PfH7FzeH2z19vrcm4cX/HMBt/Z2583nMKIKWqOYw+KwldX5PF/bVrLRVH8Qoqd4tExET67OdJPtZt+yJzLf2PLkiRMm4TJbESDVGROwiIkWh1IdXeKGq1FDw6I+Z96teW+WuYeYb6BpbKwsZ7mRFoWdIInldVDEKSyqQKkCpyadUJ038yf+XwaeAx/CJ4ozDEY4l6y6UCxoUUpGoXKBQEXgW49zl/ybY2GP9Ndg5KCrgf4gowMcPpOudTf3ivslGzRn2y3aqmmI7KmMY/WGPyHWb/hyb+X5/3hLJ/6LPpb/wCunv3/ACba2P8A6MPJf/ZCv/bJ1X/k4x7I/wDhMt3/AOcVl/1u69/w5N/L8/7wlk/9Fn0t/wDXT37/AJNtbH/0YeS/+yFf+2Tr3/Jxj2R/8Jlu/wDzisv+t3Rh+nvkz8I+5sFlc/hPiJgsTTYnLDESw5frXqfzyzGjhrPLGKOapj8WiYDlgbj6e+X/AN/Hmv2F+4F7g8je3fuP7O7fvW5b9sX70il22wsfCji+ruLPw5PqlgbxNds79qldLLmtQM+vuk7jy597/k3mbnXknZotssNs3T6F0vY08R5PAhn1r4AlXRpmC5YGoOKU6Y9//LX4Pde7nn2tkPhxjsjVQY/H5FqvHda9PfaNHkVmaONfu6+mn8kfhOq6W5FifeO/J33uPuw86bDFzBt33eGS0eaSMB7DadVY9NTiQih1CnQk9xtq2n225sueUdz2qC4vIreGYyQxp4ZWbXpA1hGqNBr20yKE9I3/AGer4I/94VR/+i16V/8Art7E/wDwR33b/wD2X0f9kG1f9bOgR/WTln/pnR/zjh/z9LXr75ZfB/sTcqbZx3w5xuNqnxtfkhVZLrXp/wC1EVAacSRH7SuqZvLJ9wNPo08G5HsK85/e7+7DyTsTb/uX3eGe1E8cVEsNp1apNVDmQCg0mvQ79ttm2r3M5qj5T2va7e2vGtpZ9c0aaNMRQFf0w7aj4gp20wakdK7sv5B/CrrHFYzLZP4i4HKQ5TKHFxQ4vrXqfzRSrRz1nll+9qKSPxaICvpYtqI4tz7DnIn34Puqc/7hf7dtX3c5Y5be38Vi9htFCutUoKSnNWHQ091fa+D2m2na933i3sbqG7uvAVYI+5W8N5NTeIiDTRCMEmpGKdA5/s9XwR/7wqj/APRa9K//AF29yb/wR33b/wD2X0f9kG1f9bOoQ/rJyz/0zo/5xw/5+krkvkD/ACye3N89bVe8/wCXdsHdW69s7gx0XXu5t4dHdAZ7I7EytVmaHI0+V23kq6auyG36iDMUNPVGaiMcwmgRwdSLY0tvvn+y3t7s3MG57B7Q3+32iQtPOtrBt8Bl8FCRq8OdNbKtQuqtKmlKno/5X3ra913/AGXl3bNsNvcbleQ24bSioHlcIrPoJYqpNTQE0rQHqx3eXz16+2XtjOborNj76rqXBUbVk9JRDbv3dQizRw6IPuc3BBrvID6nUWH19gXlj+9Z9nuad+2rl+x9ueZUu7uXQpb6LSDQnNLqvl1kTz17P71yHylv3N+4braT2W3w+I8cXieIw1BaLrRVrnzYDovH/DwHTn/Pou3v/XG/+y33NP8AwdPIf/TD77/2af8AbT1jT/X3b/8AlAuP+Mf9B9eP84HpwAn/AERdvcf+GN/9lvvw+/TyGTT+o++/9mn/AG09ePPu3/8AKBcf8Y/6D6Mhtf517A3Vt7A7ipdk73pKfP42jyVPTVY2/wDcU8dYgdIqjwZmaLypezaGYf0J9wdzB/ew+zvL28bvsl17b8ytdWc7xMR9FpLIaGn+NVoT8usoOUvZXfeb+WNh5ps94s4rS/tY50STxdarIoYK2mNl1AGhoxFeB6r77w/mc/CrtSsotm93/FHcXbtD1n2Gm6NuY/fm0urt44PDb72nJk8Vit34fG7iztXS0+ZxqVlR9pU+ITQeUlSrc++8vIP3ZOa/cLkDkH3C2zmHbYNs5h2Lb90hjl8bxY4dxtIbyKOXREyeIiTKr6WZdQOliKHrk9zr/eEe2fI/OfN3JW48nb1Nf7Pul3YySR/TeG8lpPJbu6aplbQzRll1KDQioB6idn/zWvhX3bsubrjuT4nbl7W69qK3C5KfY3Y2zOpt6bRlyO3MjS5fb1fJt3cecyOIaswWVooamjlMOumniR4yrKCBVJ9zLnSVHil5o2do2BBB+oIIOCCDBQgjBB6DB/vL/aZgQeRd/IPytP8Ato6Tsn8yv4ASyPLL8KZ5JZHZ5JJOtul3d3clmd2bKlmZmNyTyT7j1f7tjYVAVeX+Sgo4AWC/9snRb/ycX9kB/wCCx3f/AJxWX/W7o9HwS+UXxu+QW6exsX0Z0Ken8ptrAbdr9xZJtq7E282doMhkMpT46hM20KupqKoUFRTyyBZ7IvlJXkn2COd/uubd9323sN2stt2KCTc3aJjt9uIXYQgOBKRDFqUGQ6RU0JJoK9ZG/d4+8tyH79bjzJY8n8q3m3S7fBFJI06wLrEjMoA8F3OCK59cdf/U30t6bWot8bO3ZsrJVFVS47eG2c9tavqqFokrqai3Bi6rE1VRRvPFPAtVDBVs0ZdHQOBdSOPZjs+5TbNu217xborXFpcxzKGrpLROrqGoQdJKgGhBpwI6JeZNjtuZ+Xd+5bvZXSz3CyntpGSgdUniaJmTUGXUFcldSkVpUEY6qJi/kifHCKKOIdpd4kRxpGCcrsa5CKFBNtjWuQPeVJ++R7gkk/1b2bJ/guf+2nrAF/7tP2ed2duduZNRJOHsfP8A6guuf/DJHxx/5+j3h/59djf/AGDe9f8ABj+4P/TN7N/vFz/209V/5Noezv8A023Mv/OSx/7Yuvf8MkfHH/n6PeH/AJ9djf8A2De/f8GP7g/9M3s3+8XP/bT17/k2h7O/9NtzL/zksf8Ati6MH1D/AC1On+msHlMDt/e/ZmTpcrlhl55c1XbYlqI5xRw0Yjiai2xRRiHxwg8qTc/X3zK+/T93rlT7/XP/ACR7h+6O8bhtG67Fsf7rhj2owpFJD9XcXniSi7hu3MviXLrVHVNAXt1Ak55/dP5VsvuhcncyclchTy7jt257n9dI9/paRZPAig0obdbddGmFT3Kzaie6lAGXfv8AK46W7B3LPujKb+7Woq2egx+PanxuS2tHSCLHLMsTqk+1aiXyuJjqOog2FgPeP3J393f7UclbBFy9tvOXMclok0kgaSWz1Vk01HZZqtBpFO2vqT0JfcNR7kc1XHNu7kwX8tvFCUhxGFh16SA+tqnWa91MCgHSO/4aF6G/5+R3J/59to//AGH+xR/wDXtt/wBNZv3/ADktv+2XoFf1E2z/AJS7j9qf9AdLTYP8rvpfrzcabmxW/e1a2sTHV2NEGSyW15KXw15gMshSn2tTyeVPtxpOqwubg+wpzn/d2+0/O+xNsG5c58xx2pnjl1Ry2erVHqoO+zdaHUa4rwoR0OPbon215oj5r2f9e+W2lh0TZj0ylCxomhtQ0CndTJqD0q+yP5dXU3ZuLxuKzG9OyMfBi8mcpDJiq/bkU0kzUk9GY5TU7cqUMPjnJsADqA5/HsOcif3Y/s1yBuF/uO1c88zyzXFv4TCWWxoF1q9RosUNaqBkkUrivQy90ud9y919q2vaN8tYLeC1uvHU24YMW8N46N4jSDTRycAGoGaY6CD/AIaF6G/5+R3J/wCfbaP/ANh/uTv+Aa9tv+ms37/nJbf9svUK/wBRNs/5S7j9qf8AQHTnhP5TPRmCzeGztN2J2/NU4XKUWVp4ajKbTanlnoZ1njjnVNpI7QuyWYKykj6Eey/dvuE+2G8bTumz3HN3MC293byQsVktdQWRSpK1tSKgHFQR6g9Guw8tWfL+/bHzBazyvdWF3FcIrlSjPE4dVcBQdJIoaEGnAjobd4fA7rHee2s3tfIbt39S0WdpGo6mooazAR1cMbSxzFqd5sBNGr6owLsrC3uJeWP7qn2Q5V37auYbHn7mt7u0l1ory2GkmhFG02CtTPkQep653939+575U33lDc9ts4rC/h8N3iWQSKKhqoXkda481I+XRf8A/hoXob/n5Hcn/n22j/8AYf7mr/gGvbb/AKazfv8AnJbf9svWOH9RNs/5S7j9qf8AQHXj/KE6GIt/pJ7k5/6u20P/ALD/AH4fca9tgQf6179/zktv+2Xr39RNs/5S7j9qf9AdGJ2z8F+tNrYDB7eot178qKXA46kxtLPV1mBepmho0CRyVDRYGKNpWA9RVVH+A9wdv/8AdQ+x3MO87vvd1z/zWl1eTvKwWXb9IZzUhdVgWoPKrE/PrJjlT3o5i5R5a2Plew2yyksrC1jgR5FkLssahQXKyKpYgZooFeAHRUs5/Jd+PGezWYzlV2b3XDU5nKZDK1EVPlNkrBFPkauWrljhWTZMkgiR5iF1MxsOSffdXkP7zPOXt9yFyH7e7Vse2TbVy/sdhtcEkqzmWSHb7SGziklKTohleOFWkKIiFydKqtAOVPOn93x7Vc8c482867lzfzBFuO8bndX0qRPZiNJLueSd1jD2bsEVpCE1MzaQKsTnpr/4ZI+OP/P0e8P/AD67G/8AsG9ir/gx/cH/AKZvZv8AeLn/ALaeg1/ybQ9nf+m25l/5yWP/AGxde/4ZI+OP/P0e8P8Az67G/wDsG9+/4Mf3B/6ZvZv94uf+2nr3/JtD2d/6bbmX/nJY/wDbF0bX4lfAvrD4e57eu4Ngbt39uSq3ziMNh8lDvKs2/U09LT4Wsrq2nloRhsBhpEmlkr2DmRpBpUWAN/cWe6XvdzJ7sWWz2O+7XY28dlLI6GBZQWMiqpDeJLIKAKKUA6yC9hPuuclfd6v+Ydw5U33dLyXcYY45BdtbsFEbFgU8GCE1JOdRI9Ov/9XaV+Zn8pXZXy73hvns7FfMr+Yb8Yezd443C00GW+Nfy87N2HsXCVu28BS4HDzUvUcmQyGwYcdUpQxS5Ono6Wgmr5TNKtRBUzyVB917r5nv8xztH+cr/LW+WHZHxJ7r/mIfNjKZXZk1Fl9n7zxfyl78pNv9l9b5wS1Oy+wMDBN2BUS0tLmaKFo6qkM0zY7J09VRPJJJTO5917r6FH8lL4xfHjeXQPxn+f8A1X8ufn/8i8t2J1TUT1lN8nPmR2F27t/DbszFG+3eyNo7k66p63G9dTZ7YW7qCvx0eugkNNUUwmRnkWOYe691f77917r3v3Xuqnv5lvw2+PPZu0N/fKrvX5WfNr4uYPpXpPO1G593/F/5a9ldGYjCbM2X/eDeNZnl2TichVbBzO8ya+aGKepxlRUV5WmpmEvjgVfde60h/wCRf8a/5oX83jt/sLdu5P5lX8yPqn4G9R7kqsTuLftH8rO207M3vmqstkNudW7JylbubJbUh3jRbfqqev3BlDQ1tHiopoFFK711Pp917rf1+I/wG60+HOX3bntldw/LTtfLb0wmGweYqfkr8oO2+/oIIMLU1NXFW4TF9g7gyWH2/la2aqb7ieip4GkQBBpT0n3XulV8tvhl178yMJszB7/7I+RvW0excvlMziMj8dPkF2Z0DmK2qy1BFj6iHcOR63zmFm3DRQQwhqeKr8q08hdo9PkcN7r3Xz/f+FH3VXy6/lC9v/Haf4y/zOf5k2W6o+Rm1eya6HbXZfzB7g3Fm9l7r61zG1Is5R4rcmJz23RXbYyWJ35jTSwVdPNXQTU05kqp1kQRe690Yz/hNx8Vvkl/Nb6/74+Qfy4/mY/zL59i9W9k4Tq3Z/XnXHzO7i2jT7j3B/dWm3TunJ70z1TuDN5mbGUuN3DjI6Omxr42UTGV5KiRbRe/de63oPi18YNlfEnrWp6u2Jvbuzf2Gq905bd02e787l373lvj+JZmlxlJVUcO8exMvmc1S4KGPFRvDQRSJSwzSTSqnkmlZvde6Mh7917qkL5RfyXdw/Ibf/bPaW1P5tX83zoTcvY+Xy+4sFsTrP5e1GP+PnXGVr6RIaDGbW6iodo4atp9kYyohWQYuLPU0jq0iiqjZ9a+6918vbt35q/zMOse9eyejtzfzEPmflM71r21vDqjM5eH5R98PR1eW2ZvDI7QyGSpKao38JVppqzGvLGjMGCkAkHn37r3X0wNu/8ACezqnG4Ckocz/Mn/AJxm486KSAVm6Jvnvu/F1k1f4waqso8fjNsQYyjimlLFInjnMaEKXdgXPuvdFQ+SH8hz+Yd1xtnJbu/lv/zt/wCYRQ78wcEmVw/U3y57+3P2dsreGQp9UkeIXeWIjw2M2skkV0hFdtfNU80ulJ3iRmnT3Xutez4n/wDCrP8AmY/B3vTL/H/+ZpsOD5C7e693vkth9u43K7V2z1p8mOtshg8m2HzUWAzW0ocB13vGfAOk032WXxzPmjHEkebo4pPuT7r3X0gen+2ev++equuu6+qdxUe7ete1tl7c7A2NuShJ+3zG2N1YqlzOHrPG4Wamnejq1EsEgWanlDRyKrqyj3Xuv//W3+Pfuvdar/8Awqp/lYD5vfCw/J/qrbj5H5JfDTF5zdtLTYmhkqcz2H0RUeOv7N2T4aOJqvJ5HaaUq7kxCt5TF9pkKaCPy5Jj7917qgr/AIR7/wA0dem+790fy2e3Nw/b9cfIfJ12+vj5WZKdvtdt9747EwDcOyoqioqEp6DHdp7Swwkpk/Sc5ioYYkM+Scn3XuvpK+/de697917rTB/4UT/Ijtf+YD8pfj3/AMJ//hfmkl3j2tujam//AJk7toFq67D9d7Mx4pt3bZ25vgUYQxbf2lgIk3zm6fWs1Q0OCpqdzPUPA/uvdbUHw1+JHTvwX+NPU/xa6JwMWE696p2xSYWmnaKFMturPSA1e6d9bonhVVrt1713BNUZLISgBPuKhkiWOFI40917oz3v3Xuve/de6+fv/wALlf8Agf8Ay0f+oP5cf9bvjd7917o6v/CJr/t3x8pv/Fycp/75LqD37r3W5n7917r3v3Xuve/de6+G983/APt4z8vf/F1+/v8A3+m7Pfuvdfcej/zaf8EX/oUe/de6g5jMYjbuIyu4NwZXG4LA4LG12YzebzFdTYzEYfEYymlrcllcrkq2WCjx+Nx9HA8088zpFFEjMzBQT7917r45381LKVf80r+dX8pcj8C9j7j77TubtfA7a6tx/WmDrMxJvpNhbA2X1vmt+UPhiSCj2dmMrtSqy8mYq2pqCnxk33tVLDCJJB7r3X1Vv5Y3xX3H8JPgD8UfivvLN0u4N59OdQ4Hb+88nj2MmM/vhXyVe4t1Y/DzsS9ZhMNn81UUVFOwRqilp45CkZYovuvdf//X3+PfuvdcJI45o3ilRJYpUaOSORVeOSN1KujowKujqSCCLEe/de6+Rb/woB/lu7q/lGfzG6PsDoaDL7G6N7d3J/swvxW3Vt6Oegg6z3XgNy0ma3F1rgckZZ3gy3Tu7ZaKpx3qLxYWvxbMzy+Uj3XuvpDfycP5km0f5pHwY6x+ReOlxtB2fjYR138g9m0Mqatn9zbXoqJdyCKlVUNNgN30lVTZ7EKNYjxuTihZ2nhmC+690vv5qH8wXYf8sj4TdufKveSY3KZ3b2PG2OoNk5Keogj7H7o3LS10ewdllqMrWDHz1dJLX5SSEiWmwtBWTrdogD7r3VTP/Cbb+XR2F0x1R2N/Mn+X33u4fnP/ADD6yq7S3NltzUbw7o2B1DvDLDeOE2vURzkyYnL9i5KSDcOVpEWBaWmXFY94IZcbIp917rZ39+691737r3XvfuvdfP3/AOFyv/Fw/lo/9Qfy4/63fG737r3R1f8AhE1/274+U/8A4uTk/wD3yXUHv3XutzP37r3Xvfuvde9+6918NH54wT1X8wj5mUtLN9tU1PzK+REFPUBnTwTzd3bwjhm1xXkTxSMGuvqFuOffuvdfU/w38sL+an/dbH4vcX8/n5D1eYgxdFRyZDA/ED4wYej8tPSRQF7VNDlM/VktHczTZBqmY3eRy7Mx917qob+YL/wmo/mq/KzbFdSVH86zfHybpX01UPUPyOwO/uqurZaymtNDMcf1pvfsnZ0dYZoY9Eo2ojIwuX49+691TJ1T/NS/mbf8Jzd97c+KXfP8uv4k7OwlHtjb9FkqzCdVY/rnevyC2ztsx0UXYtJ8m+rMvlMN2nuLIwlY6zKZSiz01FUt4aqjpqpJIB7r3W8z/Ke/nIfFb+bj1Zl919KTZbY3a+woMYO3ugt7z0Lb32HNk/JDSZnG11Awx+9dhZSsppY6LMUixElVSspqGpcUw917r//Q3+Pfuvde9+691UP/ADuv5aGE/mkfAzsjoyhosXH3dtBZO0fjduSvlhoRiO3ds4+tXHYGsy0kbmh232Hi6mpwWSL6oYY62OsKNLSQlfde6+dt/wAJ1f5m24/5WP8AMHXq7uqsyG0fj58gtx0HRnyK2/umefC0vV2+MbnqjD7N7SzNDWiFMTX9a7nqqnH5pp9AgweQyDOrSwQBfde62UclV/8AQRz/ADsKfb9JJ/eX+VJ/KkzTZDLTxPLXbF+SHeTZQU6RGSCWbC7gw+8ty7eeKlf/ACmml2PgKmSN4Hz4De691u3gAAAAAAAAAWAA4AAHAAHv3Xuu/fuvde9+691737r3Xz9/+Fyv/A/+Wj/1B/Lj/rd8bvfuvdHV/wCETX/bvj5Tf+Lk5T/3yXUHv3XutzP37r3Xvfuvde9+6918Nz5xMqfzF/l+7sqInzV+QDO7EBVVe9N2lmYngKoFyffuvdfcfhZXhidGDI0aMrKbqysoKspHBBB49+691k9+691rM/8ACtPpTrTsn+Tr212TvDH4kb4+P/YfTu+OqM/U08X8WoM3u3s7afV25cJj64J94tDuHaO86pqmlVhBNNR000ilqaJk917rS5/4Sb13ZNJ/Oo6Lg2G1WNv5PrHvuh7eWAzikfrZOr87kaZcp4SAaRezsftpohJeP71YL82I917r/9Hf49+691737r3XvfuvdfM0/wCFbP8AK4ynU/zf6t+WPQuxq/I7a+d+bp9mbl23tqikq5n+V9LNS0P22PoIHLfxHubBVVJWU9PFGXq8zQ5SdiXmA9+691vBfyc/5cm1P5X/AMEup/jjj6XHT9mVlGvYnyC3ZQpEz7v7s3ZQ0Mu65fvInkWtw+06elpsBiZBpD4vFQSMolklLe691aT7917r3v3Xuve/de6KD8u/m90p8J8DszO9x43uPNDsHMZPA7Tw/TPRXbPeOdyGSxFBHk6+Krx3Vu0tznBxJRyho5K9qVJ7MIi5jk0+6918/L/hSr3539/No7e+OFF8W/5f/wDMDbqr45bS7Gpn3jvz4kdwbZrN5bs7Sym0J8tJg9u0+3svXU228PithUCRVNd9nV1FVPUKaZIoopZ/de6Mb/wmm+Z3a/8AK063+QPx8+YHwJ/mDbf2V2V2Hh+3Nk9j7K+H/c278fis2NrUe0d14Pd+Fh2zRZ+jgqaDb2MmoKmip69XdalJ1gCxtJ7r3W9X8Vvlb1R8xusZ+2enqfsij2zR7py+zK+h7U6l7I6Z3XQ7iwVNjavJUku0+z9tbXztRSQw5aELWU8M1FJL5IkmaWGZI/de6Mn7917qqn5hfzePj/8AD3fu8Oo8r0z8yu8u2tn7exeen2X8d/ij2/2TQ5B8/h0zOAxtB2FDt7Hdaz1FfTTIsjx5aSKklLxTFJopIl917r5OveHw6/mId390dwd11/wD+YWGrO3e0Owe0a7FQfG3u6vp8TVb93Zl911WOir22DSmshx8+VaISmKMyBNRVb2HuvdfQj+B/wDwoqy+P6C652P8/wD4C/zDupO99kbQwO2N3742t8Suyt59a9i1eCx9LiP75Y8U2Nxe7dt5ncf233lbjJcTJR0k0pWCsnUhU917o7Wb/n89NT43z9SfAP8Am1995ioKxY/C9bfAPtKA1E7t4w1TlN6TbUx1JRwv/npQ8rRrchGtb37r3VFf8xTon+f1/wAKAa7aXT0fxDw38un4Obb3NRbwp8P8hez8TS7w3ruSkp6uixe6e1cftqkyvZFXNhMdVzy43b1HtilxtDV1TGrq66eKkqqX3Xur/P5Mv8jn48/yfuv9x1G1s/X9xfJHs/F4/G9td8Z/FU+Eapw+PqFr6bYfXG2IqnI/3J2BBkUSqqIZKytr8tXRxz1lS8cFDS0Xuvdf/9k=</mdui:Logo>
-      </mdui:UIInfo>
-      <mdui:DiscoHints>
-        <mdui:IPHint>193.191.128.0/24</mdui:IPHint>
-        <mdui:DomainHint>vib.be</mdui:DomainHint>
-        <mdui:GeolocationHint>geo:51.018402,3.691419</mdui:GeolocationHint>
-      </mdui:DiscoHints>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-
-MIIDFDCCAfygAwIBAgIVAJDe4t8YsctH2JGBPfdMqwdkUTh3MA0GCSqGSIb3DQEB
-BQUAMBUxEzARBgNVBAMTCmlkcC52aWIuYmUwHhcNMTMwOTEwMTI0NzU5WhcNMzMw
-OTEwMTI0NzU5WjAVMRMwEQYDVQQDEwppZHAudmliLmJlMIIBIjANBgkqhkiG9w0B
-AQEFAAOCAQ8AMIIBCgKCAQEAjX9kGhK6nYxWvuNeuNdGuU2xyEsUyTEE7a3+vWG1
-//IcBPi6b0KXBYOKysqTekzYsoNiSxi9sup5Yx6lgS+nqHoM+ULqyKH5t78HctvB
-g5R4WGNQ5QW01uw3eLZ5OaCnyb/XXwYhUdZJraaFL/R5sSzkwHRkJ5XN1kUjj3M9
-IIr9Kquc6/gbvZj0P4dRHB8WTkboKoC71yF0lJQtiawK5mmH6kmnnR6hNe7+PPY3
-SSysNjOWscyBKXvLQiyC3/5a7ILzWTo9xAwoDvl87JnlgrZaNTbcVpugDufOI496
-FIq7kMHqMJVxcBht64HXHQ+jdiAL1Fga/zmd2nNbi+1a3QIDAQABo1swWTA4BgNV
-HREEMTAvggppZHAudmliLmJlhiFodHRwczovL2lkcC52aWIuYmUvaWRwL3NoaWJi
-b2xldGgwHQYDVR0OBBYEFCvlrzRYM0OZ/HvA0ZUxTRM3tRUPMA0GCSqGSIb3DQEB
-BQUAA4IBAQAhQdI6woZQyn6p9LAr9IEjc+6CvYLq/SRLK651E/D1j1C3NznmPf3T
-Wc8cMRy5g6EGmuIUk7BIo55eAIH95AgXNbvC2/OEkmwDtMV1nDV/rP3XWp0WzOhL
-SkG9fvuA/Mm6v6UtLW6HDRu6GzZPNPegDdSbJ01xpuOaF+O011U2ThaXZFHv+3fw
-81HKd3ZJ1cImeP4gijREmG7Go+Vq2ROM8/+3f/VhYSOgJU9g6ylkxKLKcxAeyg5J
-0BNkUbCgjbqiU1mg5oV7QYFyYKhOO0vJPFfv5DeLIfCdKFo7Hw/HzI3Y+Afjy0+L
-VJxJ/lqmkwOe7YkIk4wBzp6DTlfsek98
-
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.vib.be:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.vib.be: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.vib.be/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.vib.be/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.vib.be/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.vib.be/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">vib.be</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-
-MIIDFDCCAfygAwIBAgIVAJDe4t8YsctH2JGBPfdMqwdkUTh3MA0GCSqGSIb3DQEB
-BQUAMBUxEzARBgNVBAMTCmlkcC52aWIuYmUwHhcNMTMwOTEwMTI0NzU5WhcNMzMw
-OTEwMTI0NzU5WjAVMRMwEQYDVQQDEwppZHAudmliLmJlMIIBIjANBgkqhkiG9w0B
-AQEFAAOCAQ8AMIIBCgKCAQEAjX9kGhK6nYxWvuNeuNdGuU2xyEsUyTEE7a3+vWG1
-//IcBPi6b0KXBYOKysqTekzYsoNiSxi9sup5Yx6lgS+nqHoM+ULqyKH5t78HctvB
-g5R4WGNQ5QW01uw3eLZ5OaCnyb/XXwYhUdZJraaFL/R5sSzkwHRkJ5XN1kUjj3M9
-IIr9Kquc6/gbvZj0P4dRHB8WTkboKoC71yF0lJQtiawK5mmH6kmnnR6hNe7+PPY3
-SSysNjOWscyBKXvLQiyC3/5a7ILzWTo9xAwoDvl87JnlgrZaNTbcVpugDufOI496
-FIq7kMHqMJVxcBht64HXHQ+jdiAL1Fga/zmd2nNbi+1a3QIDAQABo1swWTA4BgNV
-HREEMTAvggppZHAudmliLmJlhiFodHRwczovL2lkcC52aWIuYmUvaWRwL3NoaWJi
-b2xldGgwHQYDVR0OBBYEFCvlrzRYM0OZ/HvA0ZUxTRM3tRUPMA0GCSqGSIb3DQEB
-BQUAA4IBAQAhQdI6woZQyn6p9LAr9IEjc+6CvYLq/SRLK651E/D1j1C3NznmPf3T
-Wc8cMRy5g6EGmuIUk7BIo55eAIH95AgXNbvC2/OEkmwDtMV1nDV/rP3XWp0WzOhL
-SkG9fvuA/Mm6v6UtLW6HDRu6GzZPNPegDdSbJ01xpuOaF+O011U2ThaXZFHv+3fw
-81HKd3ZJ1cImeP4gijREmG7Go+Vq2ROM8/+3f/VhYSOgJU9g6ylkxKLKcxAeyg5J
-0BNkUbCgjbqiU1mg5oV7QYFyYKhOO0vJPFfv5DeLIfCdKFo7Hw/HzI3Y+Afjy0+L
-VJxJ/lqmkwOe7YkIk4wBzp6DTlfsek98
-
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.vib.be:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.vib.be: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">
-VIB
-</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">
-VIB - Vlaams Instituut voor Biotechnologie
-</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">
-http://www.vib.be
-</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Jasper</GivenName>
-    <SurName>Minnaert</SurName>
-    <EmailAddress>jasper.minnaert@vib.be</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.zid.tuwien.ac.at-saml2.xml b/swamid-interfederations-2.0/idp.zid.tuwien.ac.at-saml2.xml
deleted file mode 100644
index dfbceee9..00000000
--- a/swamid-interfederations-2.0/idp.zid.tuwien.ac.at-saml2.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.zid.tuwien.ac.at/saml2">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://eduid.at" registrationInstant="2008-07-15T13:42:53Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://eduid.at/policy/mdrps-20140606</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-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">tuwien.ac.at</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="de">Technische Universität Wien</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Vienna University of Technology</mdui:DisplayName>
-        <mdui:Logo height="92" width="95">https://idp.zid.tuwien.ac.at/fileadmin/zid/images/zid/TU-Logo09.gif</mdui:Logo>
-        <mdui:Logo height="16" width="16">https://www.tuwien.ac.at/fileadmin/tuw/main/images/favicon.ico</mdui:Logo>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDnTCCAoWgAwIBAgIJALst+VObcXe1MA0GCSqGSIb3DQEBBQUAMGUxCzAJBgNVBAYTAkFUMQ8wDQYDVQQIDAZWaWVubmExDTALBgNVBAcMBFdpZW4xEDAOBgNVBAoMB1RVIFdpZW4xDDAKBgNVBAsMA1pJRDEWMBQGA1UEAwwNc2ltcGxlU0FNTHBocDAeFw0xNDA0MDkwOTMxMjRaFw0yNDA0MDgwOTMxMjRaMGUxCzAJBgNVBAYTAkFUMQ8wDQYDVQQIDAZWaWVubmExDTALBgNVBAcMBFdpZW4xEDAOBgNVBAoMB1RVIFdpZW4xDDAKBgNVBAsMA1pJRDEWMBQGA1UEAwwNc2ltcGxlU0FNTHBocDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANz8s2nk5tAVH9uCgpR6CCSQN3G9zHLRPaZq0SA7LE8tzbSiBFeOM6JuN4Er3P81pwDPzeIN6Qfmi5Fi5/mdBr2jiNZxH2anwhf6GpRqA6ckP2c3+1fj5vJPX557XdBpf/SlbcS4H0dCQTFZwPmQN1cbvZ5nPg2jT+GiLJv5X2ugfviG2eaM9HTMuWbwSrGMqM3gJz/GYq6mp6llRJ7PgM6/jY4dLcBQ64Xu+8yr2SJ2bDKyJwfYZIUqcyPhjJOcgj10EnZbJAPzSDDQ2yjBC5btBrO6yIGDwZm4lEJ4JshFDHLNbbiK78R5WlZD7gO+vaeT1069wl3ptGHT86dLQXUCAwEAAaNQME4wHQYDVR0OBBYEFJ5pkC4zjbtkq5dUo7N+GfDLam4AMB8GA1UdIwQYMBaAFJ5pkC4zjbtkq5dUo7N+GfDLam4AMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBADIEncg+saezDSlvcsXvA8ZTd40/pKX2zbvWAU6PlVlT9zmkBMBevrxlodh5bSCrfRQyjsd8GaJGLfiZf+KuXmd9xj35J9Gz10VlZf6Pp+8scjayFesDnfMoA/GvywJUqZBMAvsa9LrSsA5c07NOiwcyWtXnS11zz3NFtX06OynAAmvlJHklSWhsJIBV+i5IYMfV7jzYOI8wmulTRWK3Pycr6PLM1wQD7Pf8xl8nuxyQ8tPG+4gzUeHW9LkJNflNOa1Bb+XMAIj1ZiwQyLWOuo6n2u5reN24gU0jMi/Vy4dhn5oU6Ve86nwITKKm/S+EOM8k5b+uOzI3g939xkINDpc=</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>MIIDnTCCAoWgAwIBAgIJALst+VObcXe1MA0GCSqGSIb3DQEBBQUAMGUxCzAJBgNVBAYTAkFUMQ8wDQYDVQQIDAZWaWVubmExDTALBgNVBAcMBFdpZW4xEDAOBgNVBAoMB1RVIFdpZW4xDDAKBgNVBAsMA1pJRDEWMBQGA1UEAwwNc2ltcGxlU0FNTHBocDAeFw0xNDA0MDkwOTMxMjRaFw0yNDA0MDgwOTMxMjRaMGUxCzAJBgNVBAYTAkFUMQ8wDQYDVQQIDAZWaWVubmExDTALBgNVBAcMBFdpZW4xEDAOBgNVBAoMB1RVIFdpZW4xDDAKBgNVBAsMA1pJRDEWMBQGA1UEAwwNc2ltcGxlU0FNTHBocDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANz8s2nk5tAVH9uCgpR6CCSQN3G9zHLRPaZq0SA7LE8tzbSiBFeOM6JuN4Er3P81pwDPzeIN6Qfmi5Fi5/mdBr2jiNZxH2anwhf6GpRqA6ckP2c3+1fj5vJPX557XdBpf/SlbcS4H0dCQTFZwPmQN1cbvZ5nPg2jT+GiLJv5X2ugfviG2eaM9HTMuWbwSrGMqM3gJz/GYq6mp6llRJ7PgM6/jY4dLcBQ64Xu+8yr2SJ2bDKyJwfYZIUqcyPhjJOcgj10EnZbJAPzSDDQ2yjBC5btBrO6yIGDwZm4lEJ4JshFDHLNbbiK78R5WlZD7gO+vaeT1069wl3ptGHT86dLQXUCAwEAAaNQME4wHQYDVR0OBBYEFJ5pkC4zjbtkq5dUo7N+GfDLam4AMB8GA1UdIwQYMBaAFJ5pkC4zjbtkq5dUo7N+GfDLam4AMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBADIEncg+saezDSlvcsXvA8ZTd40/pKX2zbvWAU6PlVlT9zmkBMBevrxlodh5bSCrfRQyjsd8GaJGLfiZf+KuXmd9xj35J9Gz10VlZf6Pp+8scjayFesDnfMoA/GvywJUqZBMAvsa9LrSsA5c07NOiwcyWtXnS11zz3NFtX06OynAAmvlJHklSWhsJIBV+i5IYMfV7jzYOI8wmulTRWK3Pycr6PLM1wQD7Pf8xl8nuxyQ8tPG+4gzUeHW9LkJNflNOa1Bb+XMAIj1ZiwQyLWOuo6n2u5reN24gU0jMi/Vy4dhn5oU6Ve86nwITKKm/S+EOM8k5b+uOzI3g939xkINDpc=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.zid.tuwien.ac.at/simplesaml/saml2/idp/SingleLogoutService.php" ResponseLocation="https://idp.zid.tuwien.ac.at/simplesaml/saml2/idp/SingleLogoutService.php"/>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.zid.tuwien.ac.at/simplesaml/saml2/idp/SSOService.php"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="de">Technische Universität Wien</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">Vienna University of Technology</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="de">Technische Universität Wien</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Vienna University of Technology</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="de">http://www.tuwien.ac.at/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.tuwien.ac.at/en/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Georg</md:GivenName>
-    <md:SurName>Gollmann</md:SurName>
-    <md:EmailAddress>mailto:gollmann@zid.tuwien.ac.at</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.zid.tuwien.ac.at.xml b/swamid-interfederations-2.0/idp.zid.tuwien.ac.at.xml
deleted file mode 100644
index dfbceee9..00000000
--- a/swamid-interfederations-2.0/idp.zid.tuwien.ac.at.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.zid.tuwien.ac.at/saml2">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://eduid.at" registrationInstant="2008-07-15T13:42:53Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://eduid.at/policy/mdrps-20140606</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-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">tuwien.ac.at</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="de">Technische Universität Wien</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Vienna University of Technology</mdui:DisplayName>
-        <mdui:Logo height="92" width="95">https://idp.zid.tuwien.ac.at/fileadmin/zid/images/zid/TU-Logo09.gif</mdui:Logo>
-        <mdui:Logo height="16" width="16">https://www.tuwien.ac.at/fileadmin/tuw/main/images/favicon.ico</mdui:Logo>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDnTCCAoWgAwIBAgIJALst+VObcXe1MA0GCSqGSIb3DQEBBQUAMGUxCzAJBgNVBAYTAkFUMQ8wDQYDVQQIDAZWaWVubmExDTALBgNVBAcMBFdpZW4xEDAOBgNVBAoMB1RVIFdpZW4xDDAKBgNVBAsMA1pJRDEWMBQGA1UEAwwNc2ltcGxlU0FNTHBocDAeFw0xNDA0MDkwOTMxMjRaFw0yNDA0MDgwOTMxMjRaMGUxCzAJBgNVBAYTAkFUMQ8wDQYDVQQIDAZWaWVubmExDTALBgNVBAcMBFdpZW4xEDAOBgNVBAoMB1RVIFdpZW4xDDAKBgNVBAsMA1pJRDEWMBQGA1UEAwwNc2ltcGxlU0FNTHBocDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANz8s2nk5tAVH9uCgpR6CCSQN3G9zHLRPaZq0SA7LE8tzbSiBFeOM6JuN4Er3P81pwDPzeIN6Qfmi5Fi5/mdBr2jiNZxH2anwhf6GpRqA6ckP2c3+1fj5vJPX557XdBpf/SlbcS4H0dCQTFZwPmQN1cbvZ5nPg2jT+GiLJv5X2ugfviG2eaM9HTMuWbwSrGMqM3gJz/GYq6mp6llRJ7PgM6/jY4dLcBQ64Xu+8yr2SJ2bDKyJwfYZIUqcyPhjJOcgj10EnZbJAPzSDDQ2yjBC5btBrO6yIGDwZm4lEJ4JshFDHLNbbiK78R5WlZD7gO+vaeT1069wl3ptGHT86dLQXUCAwEAAaNQME4wHQYDVR0OBBYEFJ5pkC4zjbtkq5dUo7N+GfDLam4AMB8GA1UdIwQYMBaAFJ5pkC4zjbtkq5dUo7N+GfDLam4AMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBADIEncg+saezDSlvcsXvA8ZTd40/pKX2zbvWAU6PlVlT9zmkBMBevrxlodh5bSCrfRQyjsd8GaJGLfiZf+KuXmd9xj35J9Gz10VlZf6Pp+8scjayFesDnfMoA/GvywJUqZBMAvsa9LrSsA5c07NOiwcyWtXnS11zz3NFtX06OynAAmvlJHklSWhsJIBV+i5IYMfV7jzYOI8wmulTRWK3Pycr6PLM1wQD7Pf8xl8nuxyQ8tPG+4gzUeHW9LkJNflNOa1Bb+XMAIj1ZiwQyLWOuo6n2u5reN24gU0jMi/Vy4dhn5oU6Ve86nwITKKm/S+EOM8k5b+uOzI3g939xkINDpc=</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>MIIDnTCCAoWgAwIBAgIJALst+VObcXe1MA0GCSqGSIb3DQEBBQUAMGUxCzAJBgNVBAYTAkFUMQ8wDQYDVQQIDAZWaWVubmExDTALBgNVBAcMBFdpZW4xEDAOBgNVBAoMB1RVIFdpZW4xDDAKBgNVBAsMA1pJRDEWMBQGA1UEAwwNc2ltcGxlU0FNTHBocDAeFw0xNDA0MDkwOTMxMjRaFw0yNDA0MDgwOTMxMjRaMGUxCzAJBgNVBAYTAkFUMQ8wDQYDVQQIDAZWaWVubmExDTALBgNVBAcMBFdpZW4xEDAOBgNVBAoMB1RVIFdpZW4xDDAKBgNVBAsMA1pJRDEWMBQGA1UEAwwNc2ltcGxlU0FNTHBocDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANz8s2nk5tAVH9uCgpR6CCSQN3G9zHLRPaZq0SA7LE8tzbSiBFeOM6JuN4Er3P81pwDPzeIN6Qfmi5Fi5/mdBr2jiNZxH2anwhf6GpRqA6ckP2c3+1fj5vJPX557XdBpf/SlbcS4H0dCQTFZwPmQN1cbvZ5nPg2jT+GiLJv5X2ugfviG2eaM9HTMuWbwSrGMqM3gJz/GYq6mp6llRJ7PgM6/jY4dLcBQ64Xu+8yr2SJ2bDKyJwfYZIUqcyPhjJOcgj10EnZbJAPzSDDQ2yjBC5btBrO6yIGDwZm4lEJ4JshFDHLNbbiK78R5WlZD7gO+vaeT1069wl3ptGHT86dLQXUCAwEAAaNQME4wHQYDVR0OBBYEFJ5pkC4zjbtkq5dUo7N+GfDLam4AMB8GA1UdIwQYMBaAFJ5pkC4zjbtkq5dUo7N+GfDLam4AMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBADIEncg+saezDSlvcsXvA8ZTd40/pKX2zbvWAU6PlVlT9zmkBMBevrxlodh5bSCrfRQyjsd8GaJGLfiZf+KuXmd9xj35J9Gz10VlZf6Pp+8scjayFesDnfMoA/GvywJUqZBMAvsa9LrSsA5c07NOiwcyWtXnS11zz3NFtX06OynAAmvlJHklSWhsJIBV+i5IYMfV7jzYOI8wmulTRWK3Pycr6PLM1wQD7Pf8xl8nuxyQ8tPG+4gzUeHW9LkJNflNOa1Bb+XMAIj1ZiwQyLWOuo6n2u5reN24gU0jMi/Vy4dhn5oU6Ve86nwITKKm/S+EOM8k5b+uOzI3g939xkINDpc=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.zid.tuwien.ac.at/simplesaml/saml2/idp/SingleLogoutService.php" ResponseLocation="https://idp.zid.tuwien.ac.at/simplesaml/saml2/idp/SingleLogoutService.php"/>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.zid.tuwien.ac.at/simplesaml/saml2/idp/SSOService.php"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="de">Technische Universität Wien</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">Vienna University of Technology</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="de">Technische Universität Wien</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Vienna University of Technology</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="de">http://www.tuwien.ac.at/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.tuwien.ac.at/en/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Georg</md:GivenName>
-    <md:SurName>Gollmann</md:SurName>
-    <md:EmailAddress>mailto:gollmann@zid.tuwien.ac.at</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp1.agroparistech.fr-shibboleth.xml b/swamid-interfederations-2.0/idp1.agroparistech.fr-shibboleth.xml
deleted file mode 100644
index 1a55ad11..00000000
--- a/swamid-interfederations-2.0/idp1.agroparistech.fr-shibboleth.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp1.agroparistech.fr/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2013-11-05T10:39:28Z">
-      <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">agroparistech.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">AgroParisTech Institut des sciences et des industries du vivant et de l'environnement</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDPzCCAiegAwIBAgIUKhgZTCdgvmRXJo0273XOyJSmkg8wDQYJKoZIhvcNAQEF
-BQAwIDEeMBwGA1UEAxMVaWRwMS5hZ3JvcGFyaXN0ZWNoLmZyMB4XDTEzMDgzMDEz
-NDkyN1oXDTMzMDgzMDEzNDkyN1owIDEeMBwGA1UEAxMVaWRwMS5hZ3JvcGFyaXN0
-ZWNoLmZyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAk24oo7/ubsFy
-CeCuWUTIh+FjK9IL9+k482e09iA4JKwmYKgvNyrWvAZ7hLjp1ucnbEDNLV530LDd
-ByNBVNitEFenZMFOXx4TUAwii08XHpf44TMcidd4R3s+11bfL2fZTWHIX2Wg0DHx
-xz0p/aJ/KTpqF6zW8hWODOyg2Z9KizGWAmJPLIObIBUa/miaLaqLG3EQtvO2VlN9
-Qo8/Eu5CoWJDEUKSUwTACMqs71VSSVOW13LqpRq+gyP//qo0RmrRyB33ANY5N2J0
-QPK+U7KWeyuXuoocJwtO8e7KM6RdFCD7WdEPDv5twID+xwpTSrdPAS78QIfRvVCl
-oCBu0yxQ/QIDAQABo3EwbzBOBgNVHREERzBFghVpZHAxLmFncm9wYXJpc3RlY2gu
-ZnKGLGh0dHBzOi8vaWRwMS5hZ3JvcGFyaXN0ZWNoLmZyL2lkcC9zaGliYm9sZXRo
-MB0GA1UdDgQWBBQlFX3fOQedLM0MV538MJPU9i4okzANBgkqhkiG9w0BAQUFAAOC
-AQEAWph8JugfgFwnDI9KulR298qdXFrLhhbDpsVrlE4Uez/DjZpvwFucAoPOaHS6
-MIZaq+BPlOtH86hVyEFVyDtpptq5gpKpW3KTIFpg87gKOhmKH+JMaBJvZ1wOkQHj
-XJ041jMKaqY/J5wRPX8crb0W++gdjIxq6gt6dba9X/NEqnwaJbuhGyhDlmosm6pT
-5aBNL/h89RaDAzS6yeKYoaFcCKjYt/SW85Q5nxqPt9c/pkDm0M7S+IFcjhC9FaeI
-d8gnCW33fFVFobyMfM07xTxC+ZHXM8o9NwAAdcrGG+pNrrlrcYaNcqp230IgDWAL
-mVQRneF5HAR91tSglJwptAkPKA==
-					    </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://idp1.agroparistech.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp1.agroparistech.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp1.agroparistech.fr/idp/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">AgroParisTech Institut des sciences et des industries du vivant et de l'environnement</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">AgroParisTech Institut des sciences et des industries du vivant et de l'environnement</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Hamid Aichoune</SurName>
-    <EmailAddress>hamid.aichoune@agroparistech.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp1.agroparistech.fr.xml b/swamid-interfederations-2.0/idp1.agroparistech.fr.xml
deleted file mode 100644
index 1a55ad11..00000000
--- a/swamid-interfederations-2.0/idp1.agroparistech.fr.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp1.agroparistech.fr/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2013-11-05T10:39:28Z">
-      <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">agroparistech.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">AgroParisTech Institut des sciences et des industries du vivant et de l'environnement</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDPzCCAiegAwIBAgIUKhgZTCdgvmRXJo0273XOyJSmkg8wDQYJKoZIhvcNAQEF
-BQAwIDEeMBwGA1UEAxMVaWRwMS5hZ3JvcGFyaXN0ZWNoLmZyMB4XDTEzMDgzMDEz
-NDkyN1oXDTMzMDgzMDEzNDkyN1owIDEeMBwGA1UEAxMVaWRwMS5hZ3JvcGFyaXN0
-ZWNoLmZyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAk24oo7/ubsFy
-CeCuWUTIh+FjK9IL9+k482e09iA4JKwmYKgvNyrWvAZ7hLjp1ucnbEDNLV530LDd
-ByNBVNitEFenZMFOXx4TUAwii08XHpf44TMcidd4R3s+11bfL2fZTWHIX2Wg0DHx
-xz0p/aJ/KTpqF6zW8hWODOyg2Z9KizGWAmJPLIObIBUa/miaLaqLG3EQtvO2VlN9
-Qo8/Eu5CoWJDEUKSUwTACMqs71VSSVOW13LqpRq+gyP//qo0RmrRyB33ANY5N2J0
-QPK+U7KWeyuXuoocJwtO8e7KM6RdFCD7WdEPDv5twID+xwpTSrdPAS78QIfRvVCl
-oCBu0yxQ/QIDAQABo3EwbzBOBgNVHREERzBFghVpZHAxLmFncm9wYXJpc3RlY2gu
-ZnKGLGh0dHBzOi8vaWRwMS5hZ3JvcGFyaXN0ZWNoLmZyL2lkcC9zaGliYm9sZXRo
-MB0GA1UdDgQWBBQlFX3fOQedLM0MV538MJPU9i4okzANBgkqhkiG9w0BAQUFAAOC
-AQEAWph8JugfgFwnDI9KulR298qdXFrLhhbDpsVrlE4Uez/DjZpvwFucAoPOaHS6
-MIZaq+BPlOtH86hVyEFVyDtpptq5gpKpW3KTIFpg87gKOhmKH+JMaBJvZ1wOkQHj
-XJ041jMKaqY/J5wRPX8crb0W++gdjIxq6gt6dba9X/NEqnwaJbuhGyhDlmosm6pT
-5aBNL/h89RaDAzS6yeKYoaFcCKjYt/SW85Q5nxqPt9c/pkDm0M7S+IFcjhC9FaeI
-d8gnCW33fFVFobyMfM07xTxC+ZHXM8o9NwAAdcrGG+pNrrlrcYaNcqp230IgDWAL
-mVQRneF5HAR91tSglJwptAkPKA==
-					    </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://idp1.agroparistech.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp1.agroparistech.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp1.agroparistech.fr/idp/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">AgroParisTech Institut des sciences et des industries du vivant et de l'environnement</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">AgroParisTech Institut des sciences et des industries du vivant et de l'environnement</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Hamid Aichoune</SurName>
-    <EmailAddress>hamid.aichoune@agroparistech.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp1.crous-aix-marseille.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp1.crous-aix-marseille.fr-idp-shibboleth.xml
deleted file mode 100644
index 44bf3fe1..00000000
--- a/swamid-interfederations-2.0/idp1.crous-aix-marseille.fr-idp-shibboleth.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp1.crous-aix-marseille.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2013-02-07T13:50:54Z">
-      <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">crous-aix.net</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">crous-aix-marseille.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">CROUS Aix Marseille</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIEgTCCA2mgAwIBAgIQMbkj1D0MR48qNrGSMyNhRzANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTEzMDEyNTAwMDAwMFoXDTE2MDEyNTIzNTk1OVowUTELMAkGA1UE
-BhMCRlIxHDAaBgNVBAoTE0NST1VTIEFJWC1NQVJTRUlMTEUxJDAiBgNVBAMTG2lk
-cDEuY3JvdXMtYWl4LW1hcnNlaWxsZS5mcjCCASIwDQYJKoZIhvcNAQEBBQADggEP
-ADCCAQoCggEBALxxt1r6j1fniB75UijZellhzzPfNZ7WDuHyaSDavJ7cWieuntpN
-LKGdo5Xp+0z89AcOZUSOvuIOZTL11NCE/Dl1Vd2teUL13MFdrOPsrcpaipE6cS2R
-CY+XU4hNSqiBG800YLtyexZ/a3s6qjBOA7pEt9Tu3+xza6i5SGVgiZOrI2Z48JgU
-3N3igIkDGhqsy36McnS5Qf9tpvcBIbacRH/DAw+JroswJwiy4AuSsXQuOdtSPA/d
-G40Jp1pjPb6EZ/u1Wjngc2C7Q9AqM0FirTudcOAhjFfvVKNcOobFsBsw02I2B1CS
-sgtAbC6wn47yKhsjtpCr6sdC4qXoXZ/1HucCAwEAAaOCAW4wggFqMB8GA1UdIwQY
-MBaAFAy9k2gM896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBSvDV2R28Nsq8xjoG+t
-DfdIlnmd8zAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAU
-BggrBgEFBQcDAQYIKwYBBQUHAwIwGAYDVR0gBBEwDzANBgsrBgEEAbIxAQICHTA6
-BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVO
-QVNTTENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9j
-cnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpo
-dHRwOi8vb2NzcC50Y3MudGVyZW5hLm9yZzAmBgNVHREEHzAdghtpZHAxLmNyb3Vz
-LWFpeC1tYXJzZWlsbGUuZnIwDQYJKoZIhvcNAQEFBQADggEBAIbtiLL2mvNNc4E8
-8eCNtgwC7uK9WZMS6qm4e2VqUnqoZn/8zxElo8vzbFQ+iIrYN50jO4Wn4HcbLF+B
-9TzWpEjmp7gxYcOG5D/GsugiN8Ha2sC4YfBqRQVFGP6TwSZPQPpI54JtlNvq3Mia
-i0XGkCE5e2h2PunU+SPlgEMhMV+o5mIiobxziZOjaW8avAlu377DXn/HpLysGSjZ
-gU+UAhYM4fdvRn/vr7ri2Fj0HCjUxN+YUWEW3IBLsU5r8OWZpa1o6N+0yFhU5yXm
-HR1USJF9XaGkC+U/bCUzTt/htxLw7uH7D0p69tkpR22dp64YLM0zAYXZem3+zdbb
-y3EJNDw=
-					    </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://idp1.crous-aix-marseille.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp1.crous-aix-marseille.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp1.crous-aix-marseille.fr/idp/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">CROUS Aix Marseille</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">CROUS Aix Marseille</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <EmailAddress>dsi.applis@crous-aix-marseille.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp1.crous-aix-marseille.fr.xml b/swamid-interfederations-2.0/idp1.crous-aix-marseille.fr.xml
deleted file mode 100644
index 44bf3fe1..00000000
--- a/swamid-interfederations-2.0/idp1.crous-aix-marseille.fr.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp1.crous-aix-marseille.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2013-02-07T13:50:54Z">
-      <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">crous-aix.net</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">crous-aix-marseille.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">CROUS Aix Marseille</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIEgTCCA2mgAwIBAgIQMbkj1D0MR48qNrGSMyNhRzANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTEzMDEyNTAwMDAwMFoXDTE2MDEyNTIzNTk1OVowUTELMAkGA1UE
-BhMCRlIxHDAaBgNVBAoTE0NST1VTIEFJWC1NQVJTRUlMTEUxJDAiBgNVBAMTG2lk
-cDEuY3JvdXMtYWl4LW1hcnNlaWxsZS5mcjCCASIwDQYJKoZIhvcNAQEBBQADggEP
-ADCCAQoCggEBALxxt1r6j1fniB75UijZellhzzPfNZ7WDuHyaSDavJ7cWieuntpN
-LKGdo5Xp+0z89AcOZUSOvuIOZTL11NCE/Dl1Vd2teUL13MFdrOPsrcpaipE6cS2R
-CY+XU4hNSqiBG800YLtyexZ/a3s6qjBOA7pEt9Tu3+xza6i5SGVgiZOrI2Z48JgU
-3N3igIkDGhqsy36McnS5Qf9tpvcBIbacRH/DAw+JroswJwiy4AuSsXQuOdtSPA/d
-G40Jp1pjPb6EZ/u1Wjngc2C7Q9AqM0FirTudcOAhjFfvVKNcOobFsBsw02I2B1CS
-sgtAbC6wn47yKhsjtpCr6sdC4qXoXZ/1HucCAwEAAaOCAW4wggFqMB8GA1UdIwQY
-MBaAFAy9k2gM896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBSvDV2R28Nsq8xjoG+t
-DfdIlnmd8zAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAU
-BggrBgEFBQcDAQYIKwYBBQUHAwIwGAYDVR0gBBEwDzANBgsrBgEEAbIxAQICHTA6
-BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVO
-QVNTTENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9j
-cnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpo
-dHRwOi8vb2NzcC50Y3MudGVyZW5hLm9yZzAmBgNVHREEHzAdghtpZHAxLmNyb3Vz
-LWFpeC1tYXJzZWlsbGUuZnIwDQYJKoZIhvcNAQEFBQADggEBAIbtiLL2mvNNc4E8
-8eCNtgwC7uK9WZMS6qm4e2VqUnqoZn/8zxElo8vzbFQ+iIrYN50jO4Wn4HcbLF+B
-9TzWpEjmp7gxYcOG5D/GsugiN8Ha2sC4YfBqRQVFGP6TwSZPQPpI54JtlNvq3Mia
-i0XGkCE5e2h2PunU+SPlgEMhMV+o5mIiobxziZOjaW8avAlu377DXn/HpLysGSjZ
-gU+UAhYM4fdvRn/vr7ri2Fj0HCjUxN+YUWEW3IBLsU5r8OWZpa1o6N+0yFhU5yXm
-HR1USJF9XaGkC+U/bCUzTt/htxLw7uH7D0p69tkpR22dp64YLM0zAYXZem3+zdbb
-y3EJNDw=
-					    </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://idp1.crous-aix-marseille.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp1.crous-aix-marseille.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp1.crous-aix-marseille.fr/idp/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">CROUS Aix Marseille</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">CROUS Aix Marseille</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <EmailAddress>dsi.applis@crous-aix-marseille.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp1.crous-toulouse.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp1.crous-toulouse.fr-idp-shibboleth.xml
deleted file mode 100644
index 0836703b..00000000
--- a/swamid-interfederations-2.0/idp1.crous-toulouse.fr-idp-shibboleth.xml
+++ /dev/null
@@ -1,86 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp1.crous-toulouse.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2012-02-22T14:37:55Z">
-      <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">etu.crous-toulouse.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">CROUS Toulouse - Etudiants</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDLDCCAhSgAwIBAgIVANP/syULUNCGiJ6jMUcqvbTYvZ74MA0GCSqGSIb3DQEB
-BQUAMBsxGTAXBgNVBAMTEFNSVmlEUC5jcm91cy5sYW4wHhcNMTExMDI4MTQwMDAx
-WhcNMzExMDI4MTUwMDAxWjAbMRkwFwYDVQQDExBTUlZpRFAuY3JvdXMubGFuMIIB
-IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAkYnPcZx0e0Ce2gh7d7wyIkME
-ovrrzv0vlruzvby4oU2L0ebZwMb9cxQQBYu7jEgnvITkoAqzzAjnNW0aiPbTDnX0
-Ma1OC1H7yG2HjdjMUmu9Dn7o8nhluFzXk7my3v6Cblt4SrMmsjh8aDFbixEIVLhp
-NdS80dAvUzhxlYd6JzJSdwcqB4pt9Syb4ahJxRh6BuzIQzqM4j+7ChIKkMP8BVYU
-Zl3R0hkTcgB24Ha6GlWBeW15/mKSKnbXmQOy74Jhkhyh/jJ/0u03STQUx9mKnC5R
-OPyQNhIA7eBBQ1soxAXe59UURfcvMHj1u4Zw1jj09sHNLMaQDtf9f13H5bwo8wID
-AQABo2cwZTBEBgNVHREEPTA7ghBTUlZpRFAuY3JvdXMubGFuhidodHRwczovL1NS
-VmlEUC5jcm91cy5sYW4vaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFAawx20ceqtg
-Jga00U1mDWS7Y0uJMA0GCSqGSIb3DQEBBQUAA4IBAQByK4s5e6Mx/3Kfiph8sbOV
-Jlnm3mL8MrnOchYVGZ+qF/9Od66OH7wDv45gZ53EcuLBIFyPO8d1UjXGaMmjx5Un
-pqjvYXU/lWWx1wSa5NzVXHNk/JMbSjvG5eqB4/HNy8PIhK/eviNX31N+tK40iTAP
-AY5+hwohjB3vH2jNsQgnSLqNG23N0XP+gywXbe4DeQyQeOSXCWF1cmN2AyJcwlX4
-+9yrgYP8FwS+60ev2v26ZY7fERxUSDtlpwvuWqor0ANFpPg8HbTiTxw4UCyOyLdL
-Fm2Z0wb+tZB2P+GVyIVeS5Kk7SBtWd6iOnuhPvXdTZxSMTCnBOPDqwuSKJNzYSQL
-					    </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>
-					      MIIEWzCCA0OgAwIBAgIBBDANBgkqhkiG9w0BAQUFADB+MQswCQYDVQQGEwJmcjEO
-MAwGA1UECBMFRmFuY2UxETAPBgNVBAcTCFRvdWxvdXNlMQ4wDAYDVQQKEwVDcm91
-czEmMCQGCSqGSIb3DQEJARYXY3JvdXMtc2lAYWMtdG91bG91c2UuZnIxFDASBgNV
-BAMTC2ludGVybmFsLWNhMB4XDTExMTAyNzE0MjQxOFoXDTIxMTAyNDE0MjQxOFow
-gYMxCzAJBgNVBAYTAmZyMQ4wDAYDVQQIEwVGYW5jZTERMA8GA1UEBxMIVG91bG91
-c2UxDjAMBgNVBAoTBUNyb3VzMSYwJAYJKoZIhvcNAQkBFhdjcm91cy1zaUBhYy10
-b3Vsb3VzZS5mcjEZMBcGA1UEAxMQU1JWaURQLmNyb3VzLmxhbjCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBAMgpkRfNo/rn5xeuCDLvQPoaFrMwq3tjCcCM
-O00rQSCNy81KOtPQOqTtbw+0CiOgHr0oC2jhUqV+IIkXP5rzBcBQw9IkGrHCQLPm
-Yg0Yik1eQPGf8UYZKb5ulvArG2t0HuEfD+npSbsPhJPBmNhr5OkP9aZx+ey3+wQ7
-3RLhR3aDzTyFqwFjkkJcUANLQLmz2CbxnZ3c84OA//SVdDPe/iSqkBwPNOyi/ZsA
-sPSMYGf1OngY2lJJSllKssPIOkYNZPP7EIZxMv9jd7deMtTjEcAnoVJUOb0yb2HE
-+TBXShU4dSE46PBu8K9+/W90woEM11kwkHETwLDHuxzmfde5mrkCAwEAAaOB3TCB
-2jAdBgNVHQ4EFgQU7/P8O36Gwrq+uyg6sDWqG8jN3d4wgaoGA1UdIwSBojCBn4AU
-trBU7BEx8lPtHYx+4HWHX6l5gguhgYOkgYAwfjELMAkGA1UEBhMCZnIxDjAMBgNV
-BAgTBUZhbmNlMREwDwYDVQQHEwhUb3Vsb3VzZTEOMAwGA1UEChMFQ3JvdXMxJjAk
-BgkqhkiG9w0BCQEWF2Nyb3VzLXNpQGFjLXRvdWxvdXNlLmZyMRQwEgYDVQQDEwtp
-bnRlcm5hbC1jYYIBADAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQAV
-UtC7q5CB5NpDeJLsh7Caq5yTBD0Aq6QBp9fgjirq4U6wHxlriGTFqhGtc90t0lxQ
-8x/Xd+sXKT/65+yHj8BlfjGgT/1jTuUuLZNO67eIh04aMv/VGqCifo+6+B41ot77
-/XYb8OCrLhZdTrMyo3k+/tlXC4cZqY8e3q4EhQZm4YCA4/HIwd+VyBN1pjaYT7j/
-J8VDIxl4TLSZqOQQdl/kMZhp5FtvJW6hB5IvFXiPzUru/eSelrTiCErPWDooGVol
-xaAGmA2uF92HwcV8uKkqzq8HVzznIXjR35te/qaKm6SO31RiK6/PxM2hfPK1UeOT
-efZl8BTyGK4ETamE3ANP
-					    </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://idp1.crous-toulouse.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp1.crous-toulouse.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp1.crous-toulouse.fr/idp/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">CROUS Toulouse - Etudiants</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">CROUS Toulouse - Etudiants</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <EmailAddress>crous-reseau@crous-toulouse.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp1.crous-toulouse.fr.xml b/swamid-interfederations-2.0/idp1.crous-toulouse.fr.xml
deleted file mode 100644
index 0836703b..00000000
--- a/swamid-interfederations-2.0/idp1.crous-toulouse.fr.xml
+++ /dev/null
@@ -1,86 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp1.crous-toulouse.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2012-02-22T14:37:55Z">
-      <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">etu.crous-toulouse.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">CROUS Toulouse - Etudiants</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDLDCCAhSgAwIBAgIVANP/syULUNCGiJ6jMUcqvbTYvZ74MA0GCSqGSIb3DQEB
-BQUAMBsxGTAXBgNVBAMTEFNSVmlEUC5jcm91cy5sYW4wHhcNMTExMDI4MTQwMDAx
-WhcNMzExMDI4MTUwMDAxWjAbMRkwFwYDVQQDExBTUlZpRFAuY3JvdXMubGFuMIIB
-IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAkYnPcZx0e0Ce2gh7d7wyIkME
-ovrrzv0vlruzvby4oU2L0ebZwMb9cxQQBYu7jEgnvITkoAqzzAjnNW0aiPbTDnX0
-Ma1OC1H7yG2HjdjMUmu9Dn7o8nhluFzXk7my3v6Cblt4SrMmsjh8aDFbixEIVLhp
-NdS80dAvUzhxlYd6JzJSdwcqB4pt9Syb4ahJxRh6BuzIQzqM4j+7ChIKkMP8BVYU
-Zl3R0hkTcgB24Ha6GlWBeW15/mKSKnbXmQOy74Jhkhyh/jJ/0u03STQUx9mKnC5R
-OPyQNhIA7eBBQ1soxAXe59UURfcvMHj1u4Zw1jj09sHNLMaQDtf9f13H5bwo8wID
-AQABo2cwZTBEBgNVHREEPTA7ghBTUlZpRFAuY3JvdXMubGFuhidodHRwczovL1NS
-VmlEUC5jcm91cy5sYW4vaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFAawx20ceqtg
-Jga00U1mDWS7Y0uJMA0GCSqGSIb3DQEBBQUAA4IBAQByK4s5e6Mx/3Kfiph8sbOV
-Jlnm3mL8MrnOchYVGZ+qF/9Od66OH7wDv45gZ53EcuLBIFyPO8d1UjXGaMmjx5Un
-pqjvYXU/lWWx1wSa5NzVXHNk/JMbSjvG5eqB4/HNy8PIhK/eviNX31N+tK40iTAP
-AY5+hwohjB3vH2jNsQgnSLqNG23N0XP+gywXbe4DeQyQeOSXCWF1cmN2AyJcwlX4
-+9yrgYP8FwS+60ev2v26ZY7fERxUSDtlpwvuWqor0ANFpPg8HbTiTxw4UCyOyLdL
-Fm2Z0wb+tZB2P+GVyIVeS5Kk7SBtWd6iOnuhPvXdTZxSMTCnBOPDqwuSKJNzYSQL
-					    </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>
-					      MIIEWzCCA0OgAwIBAgIBBDANBgkqhkiG9w0BAQUFADB+MQswCQYDVQQGEwJmcjEO
-MAwGA1UECBMFRmFuY2UxETAPBgNVBAcTCFRvdWxvdXNlMQ4wDAYDVQQKEwVDcm91
-czEmMCQGCSqGSIb3DQEJARYXY3JvdXMtc2lAYWMtdG91bG91c2UuZnIxFDASBgNV
-BAMTC2ludGVybmFsLWNhMB4XDTExMTAyNzE0MjQxOFoXDTIxMTAyNDE0MjQxOFow
-gYMxCzAJBgNVBAYTAmZyMQ4wDAYDVQQIEwVGYW5jZTERMA8GA1UEBxMIVG91bG91
-c2UxDjAMBgNVBAoTBUNyb3VzMSYwJAYJKoZIhvcNAQkBFhdjcm91cy1zaUBhYy10
-b3Vsb3VzZS5mcjEZMBcGA1UEAxMQU1JWaURQLmNyb3VzLmxhbjCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBAMgpkRfNo/rn5xeuCDLvQPoaFrMwq3tjCcCM
-O00rQSCNy81KOtPQOqTtbw+0CiOgHr0oC2jhUqV+IIkXP5rzBcBQw9IkGrHCQLPm
-Yg0Yik1eQPGf8UYZKb5ulvArG2t0HuEfD+npSbsPhJPBmNhr5OkP9aZx+ey3+wQ7
-3RLhR3aDzTyFqwFjkkJcUANLQLmz2CbxnZ3c84OA//SVdDPe/iSqkBwPNOyi/ZsA
-sPSMYGf1OngY2lJJSllKssPIOkYNZPP7EIZxMv9jd7deMtTjEcAnoVJUOb0yb2HE
-+TBXShU4dSE46PBu8K9+/W90woEM11kwkHETwLDHuxzmfde5mrkCAwEAAaOB3TCB
-2jAdBgNVHQ4EFgQU7/P8O36Gwrq+uyg6sDWqG8jN3d4wgaoGA1UdIwSBojCBn4AU
-trBU7BEx8lPtHYx+4HWHX6l5gguhgYOkgYAwfjELMAkGA1UEBhMCZnIxDjAMBgNV
-BAgTBUZhbmNlMREwDwYDVQQHEwhUb3Vsb3VzZTEOMAwGA1UEChMFQ3JvdXMxJjAk
-BgkqhkiG9w0BCQEWF2Nyb3VzLXNpQGFjLXRvdWxvdXNlLmZyMRQwEgYDVQQDEwtp
-bnRlcm5hbC1jYYIBADAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQAV
-UtC7q5CB5NpDeJLsh7Caq5yTBD0Aq6QBp9fgjirq4U6wHxlriGTFqhGtc90t0lxQ
-8x/Xd+sXKT/65+yHj8BlfjGgT/1jTuUuLZNO67eIh04aMv/VGqCifo+6+B41ot77
-/XYb8OCrLhZdTrMyo3k+/tlXC4cZqY8e3q4EhQZm4YCA4/HIwd+VyBN1pjaYT7j/
-J8VDIxl4TLSZqOQQdl/kMZhp5FtvJW6hB5IvFXiPzUru/eSelrTiCErPWDooGVol
-xaAGmA2uF92HwcV8uKkqzq8HVzznIXjR35te/qaKm6SO31RiK6/PxM2hfPK1UeOT
-efZl8BTyGK4ETamE3ANP
-					    </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://idp1.crous-toulouse.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp1.crous-toulouse.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp1.crous-toulouse.fr/idp/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">CROUS Toulouse - Etudiants</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">CROUS Toulouse - Etudiants</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <EmailAddress>crous-reseau@crous-toulouse.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp1.hogent.be-idp-shibboleth.xml b/swamid-interfederations-2.0/idp1.hogent.be-idp-shibboleth.xml
deleted file mode 100644
index 78f38dac..00000000
--- a/swamid-interfederations-2.0/idp1.hogent.be-idp-shibboleth.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: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:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://idp1.hogent.be/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://federation.belnet.be/" registrationInstant="2012-03-27T12:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://federation.belnet.be/files/Belnet-metadata-registration-practice-statement.txt</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">hogent.be</shibmd:Scope>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="en">Hogent</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Hogeschool Gent</mdui:Description>
-        <mdui:Logo height="75" width="153">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEsAAABSCAYAAAAclym5AAAABGdBTUEAALGPC/xhBQAACkFpQ0NQSUNDIFByb2ZpbGUAAEgNnZZ3VFPZFofPvTe90BIiICX0GnoJINI7SBUEUYlJgFAChoQmdkQFRhQRKVZkVMABR4ciY0UUC4OCYtcJ8hBQxsFRREXl3YxrCe+tNfPemv3HWd/Z57fX2Wfvfde6AFD8ggTCdFgBgDShWBTu68FcEhPLxPcCGBABDlgBwOFmZgRH+EQC1Py9PZmZqEjGs/buLoBku9ssv1Amc9b/f5EiN0MkBgAKRdU2PH4mF+UClFOzxRky/wTK9JUpMoYxMhahCaKsIuPEr2z2p+Yru8mYlybkoRpZzhm8NJ6Mu1DemiXho4wEoVyYJeBno3wHZb1USZoA5fco09P4nEwAMBSZX8znJqFsiTJFFBnuifICAAiUxDm8cg6L+TlongB4pmfkigSJSWKmEdeYaeXoyGb68bNT+WIxK5TDTeGIeEzP9LQMjjAXgK9vlkUBJVltmWiR7a0c7e1Z1uZo+b/Z3x5+U/09yHr7VfEm7M+eQYyeWd9s7KwvvRYA9iRamx2zvpVVALRtBkDl4axP7yAA8gUAtN6c8x6GbF6SxOIMJwuL7OxscwGfay4r6Df7n4Jvyr+GOfeZy+77VjumFz+BI0kVM2VF5aanpktEzMwMDpfPZP33EP/jwDlpzcnDLJyfwBfxhehVUeiUCYSJaLuFPIFYkC5kCoR/1eF/GDYnBxl+nWsUaHVfAH2FOVC4SQfIbz0AQyMDJG4/egJ961sQMQrIvrxorZGvc48yev7n+h8LXIpu4UxBIlPm9gyPZHIloiwZo9+EbMECEpAHdKAKNIEuMAIsYA0cgDNwA94gAISASBADlgMuSAJpQASyQT7YAApBMdgBdoNqcADUgXrQBE6CNnAGXARXwA1wCwyAR0AKhsFLMAHegWkIgvAQFaJBqpAWpA+ZQtYQG1oIeUNBUDgUA8VDiZAQkkD50CaoGCqDqqFDUD30I3Qaughdg/qgB9AgNAb9AX2EEZgC02EN2AC2gNmwOxwIR8LL4ER4FZwHF8Db4Uq4Fj4Ot8IX4RvwACyFX8KTCEDICAPRRlgIG/FEQpBYJAERIWuRIqQCqUWakA6kG7mNSJFx5AMGh6FhmBgWxhnjh1mM4WJWYdZiSjDVmGOYVkwX5jZmEDOB+YKlYtWxplgnrD92CTYRm40txFZgj2BbsJexA9hh7DscDsfAGeIccH64GFwybjWuBLcP14y7gOvDDeEm8Xi8Kt4U74IPwXPwYnwhvgp/HH8e348fxr8nkAlaBGuCDyGWICRsJFQQGgjnCP2EEcI0UYGoT3QihhB5xFxiKbGO2EG8SRwmTpMUSYYkF1IkKZm0gVRJaiJdJj0mvSGTyTpkR3IYWUBeT64knyBfJQ+SP1CUKCYUT0ocRULZTjlKuUB5QHlDpVINqG7UWKqYup1aT71EfUp9L0eTM5fzl+PJrZOrkWuV65d7JU+U15d3l18unydfIX9K/qb8uAJRwUDBU4GjsFahRuG0wj2FSUWaopViiGKaYolig+I1xVElvJKBkrcST6lA6bDSJaUhGkLTpXnSuLRNtDraZdowHUc3pPvTk+nF9B/ovfQJZSVlW+Uo5RzlGuWzylIGwjBg+DNSGaWMk4y7jI/zNOa5z+PP2zavaV7/vCmV+SpuKnyVIpVmlQGVj6pMVW/VFNWdqm2qT9QwaiZqYWrZavvVLquNz6fPd57PnV80/+T8h+qwuol6uPpq9cPqPeqTGpoavhoZGlUalzTGNRmabprJmuWa5zTHtGhaC7UEWuVa57VeMJWZ7sxUZiWzizmhra7tpy3RPqTdqz2tY6izWGejTrPOE12SLls3Qbdct1N3Qk9LL1gvX69R76E+UZ+tn6S/R79bf8rA0CDaYItBm8GooYqhv2GeYaPhYyOqkavRKqNaozvGOGO2cYrxPuNbJrCJnUmSSY3JTVPY1N5UYLrPtM8Ma+ZoJjSrNbvHorDcWVmsRtagOcM8yHyjeZv5Kws9i1iLnRbdFl8s7SxTLessH1kpWQVYbbTqsPrD2sSaa11jfceGauNjs86m3ea1rakt33a/7X07ml2w3Ra7TrvP9g72Ivsm+zEHPYd4h70O99h0dii7hH3VEevo4bjO8YzjByd7J7HTSaffnVnOKc4NzqMLDBfwF9QtGHLRceG4HHKRLmQujF94cKHUVduV41rr+sxN143ndsRtxN3YPdn9uPsrD0sPkUeLx5Snk+cazwteiJevV5FXr7eS92Lvau+nPjo+iT6NPhO+dr6rfS/4Yf0C/Xb63fPX8Of61/tPBDgErAnoCqQERgRWBz4LMgkSBXUEw8EBwbuCHy/SXyRc1BYCQvxDdoU8CTUMXRX6cxguLDSsJux5uFV4fnh3BC1iRURDxLtIj8jSyEeLjRZLFndGyUfFRdVHTUV7RZdFS5dYLFmz5EaMWowgpj0WHxsVeyR2cqn30t1Lh+Ps4grj7i4zXJaz7NpyteWpy8+ukF/BWXEqHhsfHd8Q/4kTwqnlTK70X7l35QTXk7uH+5LnxivnjfFd+GX8kQSXhLKE0USXxF2JY0muSRVJ4wJPQbXgdbJf8oHkqZSQlKMpM6nRqc1phLT4tNNCJWGKsCtdMz0nvS/DNKMwQ7rKadXuVROiQNGRTChzWWa7mI7+TPVIjCSbJYNZC7Nqst5nR2WfylHMEeb05JrkbssdyfPJ+341ZjV3dWe+dv6G/ME17msOrYXWrlzbuU53XcG64fW+649tIG1I2fDLRsuNZRvfbore1FGgUbC+YGiz7+bGQrlCUeG9Lc5bDmzFbBVs7d1ms61q25ciXtH1YsviiuJPJdyS699ZfVf53cz2hO29pfal+3fgdgh33N3puvNYmWJZXtnQruBdreXM8qLyt7tX7L5WYVtxYA9pj2SPtDKosr1Kr2pH1afqpOqBGo+a5r3qe7ftndrH29e/321/0wGNA8UHPh4UHLx/yPdQa61BbcVh3OGsw8/rouq6v2d/X39E7Ujxkc9HhUelx8KPddU71Nc3qDeUNsKNksax43HHb/3g9UN7E6vpUDOjufgEOCE58eLH+B/vngw82XmKfarpJ/2f9rbQWopaodbc1om2pDZpe0x73+mA050dzh0tP5v/fPSM9pmas8pnS8+RzhWcmzmfd37yQsaF8YuJF4c6V3Q+urTk0p2usK7ey4GXr17xuXKp2737/FWXq2euOV07fZ19ve2G/Y3WHruell/sfmnpte9tvelws/2W462OvgV95/pd+y/e9rp95Y7/nRsDiwb67i6+e/9e3D3pfd790QepD14/zHo4/Wj9Y+zjoicKTyqeqj+t/dX412apvfTsoNdgz7OIZ4+GuEMv/5X5r0/DBc+pzytGtEbqR61Hz4z5jN16sfTF8MuMl9Pjhb8p/rb3ldGrn353+71nYsnE8GvR65k/St6ovjn61vZt52To5NN3ae+mp4req74/9oH9oftj9MeR6exP+E+Vn40/d3wJ/PJ4Jm1m5t/3hPP7MjpZfgAAAAlwSFlzAAAuIwAALiMBeKU/dgAAAi9pVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IlhNUCBDb3JlIDUuNC4wIj4KICAgPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4KICAgICAgPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIKICAgICAgICAgICAgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIgogICAgICAgICAgICB4bWxuczp0aWZmPSJodHRwOi8vbnMuYWRvYmUuY29tL3RpZmYvMS4wLyI+CiAgICAgICAgIDx4bXA6Q3JlYXRvclRvb2w+QWRvYmUgSW1hZ2VSZWFkeTwveG1wOkNyZWF0b3JUb29sPgogICAgICAgICA8dGlmZjpZUmVzb2x1dGlvbj4zMDA8L3RpZmY6WVJlc29sdXRpb24+CiAgICAgICAgIDx0aWZmOk9yaWVudGF0aW9uPjE8L3RpZmY6T3JpZW50YXRpb24+CiAgICAgICAgIDx0aWZmOlhSZXNvbHV0aW9uPjMwMDwvdGlmZjpYUmVzb2x1dGlvbj4KICAgICAgPC9yZGY6RGVzY3JpcHRpb24+CiAgIDwvcmRmOlJERj4KPC94OnhtcG1ldGE+CrAWjfkAABEMSURBVHgB7ZwJkJ1FEYA3m2NDwiEhCYkQgkKhKJcgyCUmRLQQpZRT8YCCUlQUCxWkULBAOQSqQFAKRUSEWIBBQAqIECwBEeQu7iOCEI5oSEggEEg2G79v3vTL7HOP9/bI3VX9uv+enp7unp755//f2x3Q1H/QjGmxtWaIsQMHDtx+yZIlOw4YMGAr2sbDj4Ifl/VVn43sP8hegX8KfIA+9y5cuPAx+MVgwECYJWBbCPqTDugn44Oxu6iwPZpg9+X6YHA3cK3cNo+kvEJSZnI9C3wTtO8IcDRtY2kbC5/85Prp5ubm65FdsWjRovuQB9hu0lYqsJIGFR5vSZLOA+eDS8C54J8I+Fvo7AyOAruasOG0b0Gf/QYNGnQO/R7NdrR1O/g52iPxXdlBbcWCMkljCOwsgpmXg7sN+iXcHd2NywbcVdDNgwcP3hlbTsDr2macEwqbXfUt1JYv69JJQACHEMAsA8nB/CTaCqq+aIKtxkhSSZW7J6mjrnwVhgwZsk0e4/KqsGKruOxbVod6Cwbj/rQWzl8MnQzOZF85BSq4Hwkt4BDQhKgvuvm7Obvf1KJyN3N11JXX32FgE5v9DMjr4DteLwvobbJMlMFsQjXdCT0cnNzW1rY111PghbUrJAW8EL43G7EJjOSsC2/yexsDJuoDg+0pRKK2JDF/pZLGcLf6Bom6UINQ72iCyQywqnqTLO1oQ9Bub20lQ/V+9DRZKVEtLS1btLa2/p3BTMynSdANUPeXWDawqw70pISjokaTqJtJxQiqaq/FixebKO2124hXnVQ1vt5NRFpWbOZXwI8HDyBp06C2uSzKEzaXqw40sgzdK9JjBXvUqfAT2aNOYOldDW9FmSgx9hTYVQsaWYapcjhJ78Gy8yA4lUSdntOhnZTIVSs97aOpN1nqufwGkKDzoIvYo47Kprx9p6WZr1dZUu8yTJXD8vsaVbUty+8HZORZ0P6enVYLqKeyYlP35Hw8OCNXlwlyj1ptoJ7KMqGLufsdBN2Uqjoa+jZo39Vi+RFngu4qy6rygCkcAc6jqnz2E1arqjLg7pIV7duiuzt4JTgHFNYkq5KH6mecqz6phM09Ho6tuFX+qFDNQmaicmrlXpuQdBr3cQZ+Nif1e20AVtmDZyW8jj+7SlYkxIfk7cF7wLnZzGq3BI27q2SlvPAa9z0wI7gL3pcElapa7ZagsXd7dODut5mKLMUnpYDLs5EjQ0xI7HNWZVSt9hoB+8b4YbeeKne80He86FP6oazLIugsWRpJHamocSTKZM1wlB5AvNmMI0gPTLTrEvYWIDXAMuB2ivnCdvV6/Taks2Q5TmR/pBc86rwmBbpzrqK19HO9zG4AdQLqCXBp7/acfX256N7pN0VWWfgJ2yHY7vt/v1YLXWMQo5LkPWi/BXYKnSWraoiKcpDFfEGgsUbAsl9I/x9z+veh2yD7Cgw6kuAXsx1BNSGM/yUULgDfAJXPZ8W04pvv8bWzAfzPudt/F15QJxKbBH50lqyqAoxBh3OlvDvePoNw4hkcewA+vgz9Pye6M1TTrj8uae3tA1pdHYHjGLRbyEv4MA3WxLrffgKZlX49OB8cwd78FLRHELPSxPurs5kZB35/ttRdhfjKxn6724/la1X1B6yHfb/pvqQwXm7iIU4JiwspfaaAL8PWttVel93a3SHaNYQhMh5nK0u2JzA0dzKQLp2p03isBr9i6yg5tWaikssK3BAlbxAx8dEWurU20nUMXNtop+QI5eoMOBsb8sJPtkuDKtRAJChoTXPDl2EnaL0GjMcAWliSY4jrv/ANvYvramaSMxh9Tm8YYHMp4B2kEUcjudK+Qv0Iu/KNwEhiejcdni061WWr22Rxh9Cod7XtsvFGk1X4tPxZ9tLN8GIYk/9w9sYc9DpZYeAFDD9Jsj6C0VjbjVRW9mm5EyfZb8p3knLjuVcKGEvEmgSdfXRVWa7vZIhE3UbC3sf1ltnQypYsJzltuMTycfi5rJiHGo2lq2SZ7bgBTNUws7F3HmBlW4oR5zj8nwjeCsZLzFRxOa4uSRjpTCmVJ3fB2ynUF1HyJCysTMlyFaSqYrI/A+858CpQsBj6LFmedi3h+TxKT6aEt2GDnMS10F2iK1rL/1M/IyFHwr/C5KeV0qhr9QScdFrbWi/ROHvX9/IgJnJl2LuSj5wT93Wy8f9X+P06aFyp4qB1QT3JiqT47HQRuDfVtWe2HntaXYMtByXj038n+WTIG9wNjUFwxdR1F0zafNSTLA1quInyPR3SysBneg34QJva0tWK95HiY6/6OlW1HX6fhos+keizvjcE9SRLg7F3PceAP+J6Bxw4Lo9kma+Iy9HnPv0eT6LOxe8nqapzss89IvUmS+OpZBnQqrobB37mz6zhdSgeSGFXCHB7SJXDXvVb+BarC+pbVn1taK9CP0EjyfKOohNLWI6HQltJnL/N8gneB1JvyUJD+0ClS599xpbhBPqa6CzInlTViRxCb4M33tQGbRgaSZbGHcj1/jS4P/huZs4XaMNAE+asLc8lWa0aKuk7JOn7+DOFSf0pVNC3Hk9mo8lyQAcbQHX9GWd8sbcjCfPcMhy09GNJ9tgpbDQCMY7jOmE+aRzlPgV7J35+WRngqujR8ku9e/FRvQPi2DEkyzeiD2Jvo7DJEpiQ5XEuc2L6ouoMWtgI+2+Bv0tX+QM/TnRc8C5E8cIy+pSqy5SvJgzHvpodnA1Nz49s/jsow3mXgtAfyVrAGBdXzDf5mvlKxwRvRBZ/rBCVntV6TnqyDGM0SzoljFK/iLL/JNfO4I0miH3Cjb8EdfuissJnqTedNqp4F8Z8BP4g/DgHfz4F7xcRJqrh8xR9+g10OgLYmFmdmmf3NSlB+DwWoJ5JC/S6swQqF8s+pf762J8Bvu044BvggegHLPelF47UUoOqOofTR4AvgiZrOvQw2mP/gG0HkQz7B5rMMjHtOrDEd8JmLDkT5VlqTKFU9aWQrXBs6eQIEvVDcKZJA18Ffw1+uiaweoJYyz0QW8fT/z5Qe+KUfDAOG5HkuO5T2tkS6M0gURFxm96AIA9kL/kyRnfNht+CPgo+wvHjGdp8XpsHXci1/YdDR9PP37B+gOttwbjTvoTe1RwyL0X2ABhgomLMkPUp7Y9khYM6L5QBbEUCJhDsx0jCh6Cb0N7d3epVdJ5A9x/QW0mSRwI37wCr2THivBXyPqf9maxwNpZG7V2pBYWx3MnGWkXw/oDERyYDf5PkzCaxM/mNhVX3GlhC2PSJot+TFAMvi2TFWC4vgzS4njyf2d8q8rjQk/506x0sy2SVnhq4GONHdUhDFlSZWC5nLtfAmgysycCaDKzJwJoM9FEGvOPEXUeTcVfqyHzodaXTUb/uZNqtvTN6POjrcbrzY4Vv99wUk1A6a/LiCaCUr1B8R47XK2s0kDIZ8p7g16kxUurUNC2zy2r8A3ikOIlhh0On8dx1C7yNsQR01sPgeNq/Al2bx5NLeQR5HL7U47IhsHJcav43pEN5tJnEI894rv25tV+GXM8LvMlQv7oKH2CXKcQblKVPC8XrjvOzK+X+4bOaXylNKvQOyXoGUc16ltVDUrX4TopElf8PK167BL0OY+tng6lPPcb7SSfFaWJS5pjRjn58HxXmQ7C/7hXSNygVtt2ntmqxNpnxhmATK4cxP0hFTQe/BT8R3As8DTtW1L5M0IVQbVjd2i5BeXfjqR964UtcR9+Qh+0YZ3Mm8wR8+AIN5qHZXyH7989LqB6/aRbKzun1CW17oPOOemC8uo3ZVj/4ZKD4CIcUVe1i4xfawpmnkG9R6CeWti/aLjL2xNxevsrRbtVe0V9ZBFuIq6x+1vYrfaz2Zewbsw/nRe/ybhRGNGgmRXmrqmoEPqCS7creEw+5vnbxLx+sPl/wuS8J2nYsbW0Kfhb0Lx+sIvcox4kx/J8Rk0mkv1F4gX30n7QJsXeoG+Mpj9fV/owo/NaWYzuusoDop1xf3wbDR/uUuskuVT8PeYLYxPxhahgKp1SIJVfKKj2XJjL9NQVGDwd3I8CRKLikHwR/T+B+xR+JtZK353oj8FXaboEKOm8ipf6RAe60mciASFDQoSTT/zHxeRQ2B+33L8a/in6/gnd8K3ER4+0HPZK2O2i7lEo9GuovAJ2s6ZCr8eMyqDFitvkU5BPgtSscgg1/qT1Q59tAl8QZqamDDwbYDZ1YhgdkFR3X+jftn3ER14/B+749ybj29wZV4Pq43PY3hDFZzqoBdwWhuzb9ry3sP4rN8kbxJ4zEX3U4kWdm3TnoPZN5/4wlfJb+MgaGvzW3pe2p1CuTZZAXg5cVOBn+N+BfwOh8cBjGkUnIU7Khl/P/tN5Hm+Xte/fTkYVDh0Uf5Gdn+RUhg6bEQ4dxl9wO3BHcAfu7yCOPpWbwZ+T+L0H9QtfxWuD3A1MSGONoZAngT8r6FoR93AL8JsifHVwTbdidWOnR9N78/wTvyW0XDx06dDyyrUyWAUUiIriu6BezUfv+Ife/G1l8AxzNtt+Q2+9CmCqH6wuy7JKqYq4EE0Ob3/85/pugy2gOgeyZdf1e8hXQ9uqkhZ0ikVORpUokQSdnfWPcJ3Qz3QJZ+o+X6B1TtiGfZj/7h1yDsZ/czrq+lms36NjonPH5rOEtoUeAUQGwTeNAZ92fILov+SVC3LG0uwD5VPr67fDWoHc9736xoVoRATHeIvrMoo/7p5uv32qvjyzpkoyt4K2KNui7uN4V6j874z7Q+gbypIdM33yv/zKYJgnZdPaqO7gWnFj9nYX8VfpbubHMpcYZsQyDF1pCwYDdAM+pyNt/MuMfpu0wpBoxkCZko5DpuBvlC1LAtkiGcp0VhhPYGAJ6inHmIldmIsJeuoHwX20fRbYTaHW5Cf8RfAf91E5fEyA0I7uQ63QhRd8Y0jVtG8NEkGkwrr07J9+hToTg30NGe0VS2egdLyYw+iysJotyG0LwdohbqMpDQL/L8+dEAWFcPVEIWeVq6We0KzExwowKSX+/OAp+JhiO6aRffRm4/ypY1o9a+wuQXUb7HKg+2r8Z/9+Ehg3bhAi29CXs2S/4pJw/SlmVryar6FRt7ESW7FEFrnUd8o+GNknCSkJ0ysS4pDwr2TSPyZglQ0AP08+g/CHc7ty2p8AbsDNlPxNhVe4vBZSHT5GAVvqdhPw/KtTAOK6177lLsL9gYmJSkiB/dCQr24MfbGChHFTjotcxUFBEVf1/w7tsDMwlk841UHUtc5dKbKgP8fD9JDLhHvDOxDU1HQsdCarvmS4lisQeCf9RUKj6SIK0YcLWQScdbOEjkR5jvFO+AF6OPPacsqIQ1w2RD89/wkINRZlGQhy86oBaGSxvIahGfp8k/FMf9qSz4A1cOyNx+FzoBFC4AFTfDdjxbBP8gccU8ED2QI8KuxGwh0L3zgjS8cLH6fDXgE7QsehPkBfgfa40ybY9AUmJh4a/YUOVEkIe8Udb2jawtRO+7YxwnBtjHBN+kbV0MpLl8tCRSYXeIVkvEdpOK9qeh/eWOyNktJ9c6EcCrIJvh06mLmuPCuHPX+H9L98+H+5V2HD53lfo3Q0vRr+b0F039Ol7am57DlnsvSkurkfRNsd2/Dkx90lbE7Lzc79kl/YHB/KxOUr/Bm9ij0nLCj5K0KSxzbT50+j14J+HXsf1S/Aate1WZI/D+zplO/C9oHeim8FjWToXQgUT5exJGWqJh7474D1tjwXtb9v9tJ2J3WOZ1QUiAftIMps2g5xL+7XI34EfDXXMjZH5Y7bz6Hc81Oc5l2Eb7SZufeg0fYWPSjLGZnzYAPoa7f5G9hlloEeT+5ENBBfDewef8T+nCE3wlp7+gAAAAABJRU5ErkJggg==</mdui:Logo>
-      </mdui:UIInfo>
-      <mdui:DiscoHints>
-        <mdui:IPHint>193.190.172.0/26</mdui:IPHint>
-        <mdui:IPHint>2001:6a8:1c60:d000::/64</mdui:IPHint>
-        <mdui:DomainHint>hogent.be</mdui:DomainHint>
-        <mdui:GeolocationHint>geo:51.032894, 3.703396</mdui:GeolocationHint>
-      </mdui:DiscoHints>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDJDCCAgygAwIBAgIVAKN8lW+W0bwU2Fgdizh1Fc78eC1cMA0GCSqGSIb3DQEB
-BQUAMBkxFzAVBgNVBAMTDmlkcDEuaG9nZW50LmJlMB4XDTEzMTAwNzE0MzI1M1oX
-DTMzMTAwNzE0MzI1M1owGTEXMBUGA1UEAxMOaWRwMS5ob2dlbnQuYmUwggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCpFqqWVjzACwe3pHH4Z+zxtqD0UjIF
-upRkh8638dhdPTsEAS/dIdoG9vI5Bo0o/3Mds/2Vcasih1aEtLpOZA5szGjbQyF3
-Bif6ExfNRc07D9o4o1wEzkkOEaNV6edkBJAENNnuFBZVES13FIhvyW673sdFMU26
-q/PTgXt+DVejhpdgkMtqTLaAbD3G4aViVeNIstuJcrIXwZv3YgD4lgU/fXNjjLDE
-Hk8DuL+aGVmalg37cnxNtq+i7O6lW3/yrLxExCOiFkdvcQq2lCfwECU41ira4M2o
-YuB0CDsYqK8rk3Btk4VueIDJsnivARPrJiRNSN7z1WhDjNe7M5pkC4E9AgMBAAGj
-YzBhMEAGA1UdEQQ5MDeCDmlkcDEuaG9nZW50LmJlhiVodHRwczovL2lkcDEuaG9n
-ZW50LmJlL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBQC4xxZFlWHXKtFqS2uu3pI
-8k+42jANBgkqhkiG9w0BAQUFAAOCAQEAXFNa7quzgSZt+SBCYhjI/5L5EF5ZkZv1
-VSViW5l/vIyFNfMZiXKKsZXZ55WfGePMbrnWh7l0GPlLzgRpFnLuBRS2+VwzWpzA
-H5KAS7a7R0rgvKd7/21l7XrRcBr6z/TNewOb8mpySJTH5M3in2PejUd5+Ae6PsU9
-PY4KiNwdLjzlzJPo/IBFLxiu70X5hTxip+OxTp7bxMleEG7PnlTzQIWMmBehHnDa
-YCtYQpTwBizo6WlwrYOpE/KWQRYL5BB/Q3aW2KeUy87jEpbgU/SojjBrp5y8wRsp
-4rV7/SlPD5jEYnPfqLEiiXz/yXbN2dNfvlO47aV2d/GdWvKDGnijBw==
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp1.hogent.be:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp1.hogent.be:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp1.hogent.be/idp/profile/SAML2/Redirect/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp1.hogent.be/idp/profile/SAML2/POST/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp1.hogent.be: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://idp1.hogent.be/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp1.hogent.be/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp1.hogent.be/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp1.hogent.be/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">hogent.be</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDJDCCAgygAwIBAgIVAKN8lW+W0bwU2Fgdizh1Fc78eC1cMA0GCSqGSIb3DQEB
-BQUAMBkxFzAVBgNVBAMTDmlkcDEuaG9nZW50LmJlMB4XDTEzMTAwNzE0MzI1M1oX
-DTMzMTAwNzE0MzI1M1owGTEXMBUGA1UEAxMOaWRwMS5ob2dlbnQuYmUwggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCpFqqWVjzACwe3pHH4Z+zxtqD0UjIF
-upRkh8638dhdPTsEAS/dIdoG9vI5Bo0o/3Mds/2Vcasih1aEtLpOZA5szGjbQyF3
-Bif6ExfNRc07D9o4o1wEzkkOEaNV6edkBJAENNnuFBZVES13FIhvyW673sdFMU26
-q/PTgXt+DVejhpdgkMtqTLaAbD3G4aViVeNIstuJcrIXwZv3YgD4lgU/fXNjjLDE
-Hk8DuL+aGVmalg37cnxNtq+i7O6lW3/yrLxExCOiFkdvcQq2lCfwECU41ira4M2o
-YuB0CDsYqK8rk3Btk4VueIDJsnivARPrJiRNSN7z1WhDjNe7M5pkC4E9AgMBAAGj
-YzBhMEAGA1UdEQQ5MDeCDmlkcDEuaG9nZW50LmJlhiVodHRwczovL2lkcDEuaG9n
-ZW50LmJlL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBQC4xxZFlWHXKtFqS2uu3pI
-8k+42jANBgkqhkiG9w0BAQUFAAOCAQEAXFNa7quzgSZt+SBCYhjI/5L5EF5ZkZv1
-VSViW5l/vIyFNfMZiXKKsZXZ55WfGePMbrnWh7l0GPlLzgRpFnLuBRS2+VwzWpzA
-H5KAS7a7R0rgvKd7/21l7XrRcBr6z/TNewOb8mpySJTH5M3in2PejUd5+Ae6PsU9
-PY4KiNwdLjzlzJPo/IBFLxiu70X5hTxip+OxTp7bxMleEG7PnlTzQIWMmBehHnDa
-YCtYQpTwBizo6WlwrYOpE/KWQRYL5BB/Q3aW2KeUy87jEpbgU/SojjBrp5y8wRsp
-4rV7/SlPD5jEYnPfqLEiiXz/yXbN2dNfvlO47aV2d/GdWvKDGnijBw==
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp1.hogent.be:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp1.hogent.be: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">
-    Hogeschool Gent
-    </OrganizationName>
-    <OrganizationDisplayName xml:lang="en">
-    Hogeschool Gent
-    </OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">
-    http://www.hogent.be
-    </OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Technical Support</GivenName>
-    <SurName>Technical Support</SurName>
-    <EmailAddress>helpdesk@hogent.be</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp1.hogent.be.xml b/swamid-interfederations-2.0/idp1.hogent.be.xml
deleted file mode 100644
index 78f38dac..00000000
--- a/swamid-interfederations-2.0/idp1.hogent.be.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: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:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://idp1.hogent.be/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://federation.belnet.be/" registrationInstant="2012-03-27T12:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://federation.belnet.be/files/Belnet-metadata-registration-practice-statement.txt</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">hogent.be</shibmd:Scope>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="en">Hogent</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Hogeschool Gent</mdui:Description>
-        <mdui:Logo height="75" width="153">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEsAAABSCAYAAAAclym5AAAABGdBTUEAALGPC/xhBQAACkFpQ0NQSUNDIFByb2ZpbGUAAEgNnZZ3VFPZFofPvTe90BIiICX0GnoJINI7SBUEUYlJgFAChoQmdkQFRhQRKVZkVMABR4ciY0UUC4OCYtcJ8hBQxsFRREXl3YxrCe+tNfPemv3HWd/Z57fX2Wfvfde6AFD8ggTCdFgBgDShWBTu68FcEhPLxPcCGBABDlgBwOFmZgRH+EQC1Py9PZmZqEjGs/buLoBku9ssv1Amc9b/f5EiN0MkBgAKRdU2PH4mF+UClFOzxRky/wTK9JUpMoYxMhahCaKsIuPEr2z2p+Yru8mYlybkoRpZzhm8NJ6Mu1DemiXho4wEoVyYJeBno3wHZb1USZoA5fco09P4nEwAMBSZX8znJqFsiTJFFBnuifICAAiUxDm8cg6L+TlongB4pmfkigSJSWKmEdeYaeXoyGb68bNT+WIxK5TDTeGIeEzP9LQMjjAXgK9vlkUBJVltmWiR7a0c7e1Z1uZo+b/Z3x5+U/09yHr7VfEm7M+eQYyeWd9s7KwvvRYA9iRamx2zvpVVALRtBkDl4axP7yAA8gUAtN6c8x6GbF6SxOIMJwuL7OxscwGfay4r6Df7n4Jvyr+GOfeZy+77VjumFz+BI0kVM2VF5aanpktEzMwMDpfPZP33EP/jwDlpzcnDLJyfwBfxhehVUeiUCYSJaLuFPIFYkC5kCoR/1eF/GDYnBxl+nWsUaHVfAH2FOVC4SQfIbz0AQyMDJG4/egJ961sQMQrIvrxorZGvc48yev7n+h8LXIpu4UxBIlPm9gyPZHIloiwZo9+EbMECEpAHdKAKNIEuMAIsYA0cgDNwA94gAISASBADlgMuSAJpQASyQT7YAApBMdgBdoNqcADUgXrQBE6CNnAGXARXwA1wCwyAR0AKhsFLMAHegWkIgvAQFaJBqpAWpA+ZQtYQG1oIeUNBUDgUA8VDiZAQkkD50CaoGCqDqqFDUD30I3Qaughdg/qgB9AgNAb9AX2EEZgC02EN2AC2gNmwOxwIR8LL4ER4FZwHF8Db4Uq4Fj4Ot8IX4RvwACyFX8KTCEDICAPRRlgIG/FEQpBYJAERIWuRIqQCqUWakA6kG7mNSJFx5AMGh6FhmBgWxhnjh1mM4WJWYdZiSjDVmGOYVkwX5jZmEDOB+YKlYtWxplgnrD92CTYRm40txFZgj2BbsJexA9hh7DscDsfAGeIccH64GFwybjWuBLcP14y7gOvDDeEm8Xi8Kt4U74IPwXPwYnwhvgp/HH8e348fxr8nkAlaBGuCDyGWICRsJFQQGgjnCP2EEcI0UYGoT3QihhB5xFxiKbGO2EG8SRwmTpMUSYYkF1IkKZm0gVRJaiJdJj0mvSGTyTpkR3IYWUBeT64knyBfJQ+SP1CUKCYUT0ocRULZTjlKuUB5QHlDpVINqG7UWKqYup1aT71EfUp9L0eTM5fzl+PJrZOrkWuV65d7JU+U15d3l18unydfIX9K/qb8uAJRwUDBU4GjsFahRuG0wj2FSUWaopViiGKaYolig+I1xVElvJKBkrcST6lA6bDSJaUhGkLTpXnSuLRNtDraZdowHUc3pPvTk+nF9B/ovfQJZSVlW+Uo5RzlGuWzylIGwjBg+DNSGaWMk4y7jI/zNOa5z+PP2zavaV7/vCmV+SpuKnyVIpVmlQGVj6pMVW/VFNWdqm2qT9QwaiZqYWrZavvVLquNz6fPd57PnV80/+T8h+qwuol6uPpq9cPqPeqTGpoavhoZGlUalzTGNRmabprJmuWa5zTHtGhaC7UEWuVa57VeMJWZ7sxUZiWzizmhra7tpy3RPqTdqz2tY6izWGejTrPOE12SLls3Qbdct1N3Qk9LL1gvX69R76E+UZ+tn6S/R79bf8rA0CDaYItBm8GooYqhv2GeYaPhYyOqkavRKqNaozvGOGO2cYrxPuNbJrCJnUmSSY3JTVPY1N5UYLrPtM8Ma+ZoJjSrNbvHorDcWVmsRtagOcM8yHyjeZv5Kws9i1iLnRbdFl8s7SxTLessH1kpWQVYbbTqsPrD2sSaa11jfceGauNjs86m3ea1rakt33a/7X07ml2w3Ra7TrvP9g72Ivsm+zEHPYd4h70O99h0dii7hH3VEevo4bjO8YzjByd7J7HTSaffnVnOKc4NzqMLDBfwF9QtGHLRceG4HHKRLmQujF94cKHUVduV41rr+sxN143ndsRtxN3YPdn9uPsrD0sPkUeLx5Snk+cazwteiJevV5FXr7eS92Lvau+nPjo+iT6NPhO+dr6rfS/4Yf0C/Xb63fPX8Of61/tPBDgErAnoCqQERgRWBz4LMgkSBXUEw8EBwbuCHy/SXyRc1BYCQvxDdoU8CTUMXRX6cxguLDSsJux5uFV4fnh3BC1iRURDxLtIj8jSyEeLjRZLFndGyUfFRdVHTUV7RZdFS5dYLFmz5EaMWowgpj0WHxsVeyR2cqn30t1Lh+Ps4grj7i4zXJaz7NpyteWpy8+ukF/BWXEqHhsfHd8Q/4kTwqnlTK70X7l35QTXk7uH+5LnxivnjfFd+GX8kQSXhLKE0USXxF2JY0muSRVJ4wJPQbXgdbJf8oHkqZSQlKMpM6nRqc1phLT4tNNCJWGKsCtdMz0nvS/DNKMwQ7rKadXuVROiQNGRTChzWWa7mI7+TPVIjCSbJYNZC7Nqst5nR2WfylHMEeb05JrkbssdyfPJ+341ZjV3dWe+dv6G/ME17msOrYXWrlzbuU53XcG64fW+649tIG1I2fDLRsuNZRvfbore1FGgUbC+YGiz7+bGQrlCUeG9Lc5bDmzFbBVs7d1ms61q25ciXtH1YsviiuJPJdyS699ZfVf53cz2hO29pfal+3fgdgh33N3puvNYmWJZXtnQruBdreXM8qLyt7tX7L5WYVtxYA9pj2SPtDKosr1Kr2pH1afqpOqBGo+a5r3qe7ftndrH29e/321/0wGNA8UHPh4UHLx/yPdQa61BbcVh3OGsw8/rouq6v2d/X39E7Ujxkc9HhUelx8KPddU71Nc3qDeUNsKNksax43HHb/3g9UN7E6vpUDOjufgEOCE58eLH+B/vngw82XmKfarpJ/2f9rbQWopaodbc1om2pDZpe0x73+mA050dzh0tP5v/fPSM9pmas8pnS8+RzhWcmzmfd37yQsaF8YuJF4c6V3Q+urTk0p2usK7ey4GXr17xuXKp2737/FWXq2euOV07fZ19ve2G/Y3WHruell/sfmnpte9tvelws/2W462OvgV95/pd+y/e9rp95Y7/nRsDiwb67i6+e/9e3D3pfd790QepD14/zHo4/Wj9Y+zjoicKTyqeqj+t/dX412apvfTsoNdgz7OIZ4+GuEMv/5X5r0/DBc+pzytGtEbqR61Hz4z5jN16sfTF8MuMl9Pjhb8p/rb3ldGrn353+71nYsnE8GvR65k/St6ovjn61vZt52To5NN3ae+mp4req74/9oH9oftj9MeR6exP+E+Vn40/d3wJ/PJ4Jm1m5t/3hPP7MjpZfgAAAAlwSFlzAAAuIwAALiMBeKU/dgAAAi9pVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IlhNUCBDb3JlIDUuNC4wIj4KICAgPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4KICAgICAgPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIKICAgICAgICAgICAgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIgogICAgICAgICAgICB4bWxuczp0aWZmPSJodHRwOi8vbnMuYWRvYmUuY29tL3RpZmYvMS4wLyI+CiAgICAgICAgIDx4bXA6Q3JlYXRvclRvb2w+QWRvYmUgSW1hZ2VSZWFkeTwveG1wOkNyZWF0b3JUb29sPgogICAgICAgICA8dGlmZjpZUmVzb2x1dGlvbj4zMDA8L3RpZmY6WVJlc29sdXRpb24+CiAgICAgICAgIDx0aWZmOk9yaWVudGF0aW9uPjE8L3RpZmY6T3JpZW50YXRpb24+CiAgICAgICAgIDx0aWZmOlhSZXNvbHV0aW9uPjMwMDwvdGlmZjpYUmVzb2x1dGlvbj4KICAgICAgPC9yZGY6RGVzY3JpcHRpb24+CiAgIDwvcmRmOlJERj4KPC94OnhtcG1ldGE+CrAWjfkAABEMSURBVHgB7ZwJkJ1FEYA3m2NDwiEhCYkQgkKhKJcgyCUmRLQQpZRT8YCCUlQUCxWkULBAOQSqQFAKRUSEWIBBQAqIECwBEeQu7iOCEI5oSEggEEg2G79v3vTL7HOP9/bI3VX9uv+enp7unp755//f2x3Q1H/QjGmxtWaIsQMHDtx+yZIlOw4YMGAr2sbDj4Ifl/VVn43sP8hegX8KfIA+9y5cuPAx+MVgwECYJWBbCPqTDugn44Oxu6iwPZpg9+X6YHA3cK3cNo+kvEJSZnI9C3wTtO8IcDRtY2kbC5/85Prp5ubm65FdsWjRovuQB9hu0lYqsJIGFR5vSZLOA+eDS8C54J8I+Fvo7AyOAruasOG0b0Gf/QYNGnQO/R7NdrR1O/g52iPxXdlBbcWCMkljCOwsgpmXg7sN+iXcHd2NywbcVdDNgwcP3hlbTsDr2macEwqbXfUt1JYv69JJQACHEMAsA8nB/CTaCqq+aIKtxkhSSZW7J6mjrnwVhgwZsk0e4/KqsGKruOxbVod6Cwbj/rQWzl8MnQzOZF85BSq4Hwkt4BDQhKgvuvm7Obvf1KJyN3N11JXX32FgE5v9DMjr4DteLwvobbJMlMFsQjXdCT0cnNzW1rY111PghbUrJAW8EL43G7EJjOSsC2/yexsDJuoDg+0pRKK2JDF/pZLGcLf6Bom6UINQ72iCyQywqnqTLO1oQ9Bub20lQ/V+9DRZKVEtLS1btLa2/p3BTMynSdANUPeXWDawqw70pISjokaTqJtJxQiqaq/FixebKO2124hXnVQ1vt5NRFpWbOZXwI8HDyBp06C2uSzKEzaXqw40sgzdK9JjBXvUqfAT2aNOYOldDW9FmSgx9hTYVQsaWYapcjhJ78Gy8yA4lUSdntOhnZTIVSs97aOpN1nqufwGkKDzoIvYo47Kprx9p6WZr1dZUu8yTJXD8vsaVbUty+8HZORZ0P6enVYLqKeyYlP35Hw8OCNXlwlyj1ptoJ7KMqGLufsdBN2Uqjoa+jZo39Vi+RFngu4qy6rygCkcAc6jqnz2E1arqjLg7pIV7duiuzt4JTgHFNYkq5KH6mecqz6phM09Ho6tuFX+qFDNQmaicmrlXpuQdBr3cQZ+Nif1e20AVtmDZyW8jj+7SlYkxIfk7cF7wLnZzGq3BI27q2SlvPAa9z0wI7gL3pcElapa7ZagsXd7dODut5mKLMUnpYDLs5EjQ0xI7HNWZVSt9hoB+8b4YbeeKne80He86FP6oazLIugsWRpJHamocSTKZM1wlB5AvNmMI0gPTLTrEvYWIDXAMuB2ivnCdvV6/Taks2Q5TmR/pBc86rwmBbpzrqK19HO9zG4AdQLqCXBp7/acfX256N7pN0VWWfgJ2yHY7vt/v1YLXWMQo5LkPWi/BXYKnSWraoiKcpDFfEGgsUbAsl9I/x9z+veh2yD7Cgw6kuAXsx1BNSGM/yUULgDfAJXPZ8W04pvv8bWzAfzPudt/F15QJxKbBH50lqyqAoxBh3OlvDvePoNw4hkcewA+vgz9Pye6M1TTrj8uae3tA1pdHYHjGLRbyEv4MA3WxLrffgKZlX49OB8cwd78FLRHELPSxPurs5kZB35/ttRdhfjKxn6724/la1X1B6yHfb/pvqQwXm7iIU4JiwspfaaAL8PWttVel93a3SHaNYQhMh5nK0u2JzA0dzKQLp2p03isBr9i6yg5tWaikssK3BAlbxAx8dEWurU20nUMXNtop+QI5eoMOBsb8sJPtkuDKtRAJChoTXPDl2EnaL0GjMcAWliSY4jrv/ANvYvramaSMxh9Tm8YYHMp4B2kEUcjudK+Qv0Iu/KNwEhiejcdni061WWr22Rxh9Cod7XtsvFGk1X4tPxZ9tLN8GIYk/9w9sYc9DpZYeAFDD9Jsj6C0VjbjVRW9mm5EyfZb8p3knLjuVcKGEvEmgSdfXRVWa7vZIhE3UbC3sf1ltnQypYsJzltuMTycfi5rJiHGo2lq2SZ7bgBTNUws7F3HmBlW4oR5zj8nwjeCsZLzFRxOa4uSRjpTCmVJ3fB2ynUF1HyJCysTMlyFaSqYrI/A+858CpQsBj6LFmedi3h+TxKT6aEt2GDnMS10F2iK1rL/1M/IyFHwr/C5KeV0qhr9QScdFrbWi/ROHvX9/IgJnJl2LuSj5wT93Wy8f9X+P06aFyp4qB1QT3JiqT47HQRuDfVtWe2HntaXYMtByXj038n+WTIG9wNjUFwxdR1F0zafNSTLA1quInyPR3SysBneg34QJva0tWK95HiY6/6OlW1HX6fhos+keizvjcE9SRLg7F3PceAP+J6Bxw4Lo9kma+Iy9HnPv0eT6LOxe8nqapzss89IvUmS+OpZBnQqrobB37mz6zhdSgeSGFXCHB7SJXDXvVb+BarC+pbVn1taK9CP0EjyfKOohNLWI6HQltJnL/N8gneB1JvyUJD+0ClS599xpbhBPqa6CzInlTViRxCb4M33tQGbRgaSZbGHcj1/jS4P/huZs4XaMNAE+asLc8lWa0aKuk7JOn7+DOFSf0pVNC3Hk9mo8lyQAcbQHX9GWd8sbcjCfPcMhy09GNJ9tgpbDQCMY7jOmE+aRzlPgV7J35+WRngqujR8ku9e/FRvQPi2DEkyzeiD2Jvo7DJEpiQ5XEuc2L6ouoMWtgI+2+Bv0tX+QM/TnRc8C5E8cIy+pSqy5SvJgzHvpodnA1Nz49s/jsow3mXgtAfyVrAGBdXzDf5mvlKxwRvRBZ/rBCVntV6TnqyDGM0SzoljFK/iLL/JNfO4I0miH3Cjb8EdfuissJnqTedNqp4F8Z8BP4g/DgHfz4F7xcRJqrh8xR9+g10OgLYmFmdmmf3NSlB+DwWoJ5JC/S6swQqF8s+pf762J8Bvu044BvggegHLPelF47UUoOqOofTR4AvgiZrOvQw2mP/gG0HkQz7B5rMMjHtOrDEd8JmLDkT5VlqTKFU9aWQrXBs6eQIEvVDcKZJA18Ffw1+uiaweoJYyz0QW8fT/z5Qe+KUfDAOG5HkuO5T2tkS6M0gURFxm96AIA9kL/kyRnfNht+CPgo+wvHjGdp8XpsHXci1/YdDR9PP37B+gOttwbjTvoTe1RwyL0X2ABhgomLMkPUp7Y9khYM6L5QBbEUCJhDsx0jCh6Cb0N7d3epVdJ5A9x/QW0mSRwI37wCr2THivBXyPqf9maxwNpZG7V2pBYWx3MnGWkXw/oDERyYDf5PkzCaxM/mNhVX3GlhC2PSJot+TFAMvi2TFWC4vgzS4njyf2d8q8rjQk/506x0sy2SVnhq4GONHdUhDFlSZWC5nLtfAmgysycCaDKzJwJoM9FEGvOPEXUeTcVfqyHzodaXTUb/uZNqtvTN6POjrcbrzY4Vv99wUk1A6a/LiCaCUr1B8R47XK2s0kDIZ8p7g16kxUurUNC2zy2r8A3ikOIlhh0On8dx1C7yNsQR01sPgeNq/Al2bx5NLeQR5HL7U47IhsHJcav43pEN5tJnEI894rv25tV+GXM8LvMlQv7oKH2CXKcQblKVPC8XrjvOzK+X+4bOaXylNKvQOyXoGUc16ltVDUrX4TopElf8PK167BL0OY+tng6lPPcb7SSfFaWJS5pjRjn58HxXmQ7C/7hXSNygVtt2ntmqxNpnxhmATK4cxP0hFTQe/BT8R3As8DTtW1L5M0IVQbVjd2i5BeXfjqR964UtcR9+Qh+0YZ3Mm8wR8+AIN5qHZXyH7989LqB6/aRbKzun1CW17oPOOemC8uo3ZVj/4ZKD4CIcUVe1i4xfawpmnkG9R6CeWti/aLjL2xNxevsrRbtVe0V9ZBFuIq6x+1vYrfaz2Zewbsw/nRe/ybhRGNGgmRXmrqmoEPqCS7creEw+5vnbxLx+sPl/wuS8J2nYsbW0Kfhb0Lx+sIvcox4kx/J8Rk0mkv1F4gX30n7QJsXeoG+Mpj9fV/owo/NaWYzuusoDop1xf3wbDR/uUuskuVT8PeYLYxPxhahgKp1SIJVfKKj2XJjL9NQVGDwd3I8CRKLikHwR/T+B+xR+JtZK353oj8FXaboEKOm8ipf6RAe60mciASFDQoSTT/zHxeRQ2B+33L8a/in6/gnd8K3ER4+0HPZK2O2i7lEo9GuovAJ2s6ZCr8eMyqDFitvkU5BPgtSscgg1/qT1Q59tAl8QZqamDDwbYDZ1YhgdkFR3X+jftn3ER14/B+749ybj29wZV4Pq43PY3hDFZzqoBdwWhuzb9ry3sP4rN8kbxJ4zEX3U4kWdm3TnoPZN5/4wlfJb+MgaGvzW3pe2p1CuTZZAXg5cVOBn+N+BfwOh8cBjGkUnIU7Khl/P/tN5Hm+Xte/fTkYVDh0Uf5Gdn+RUhg6bEQ4dxl9wO3BHcAfu7yCOPpWbwZ+T+L0H9QtfxWuD3A1MSGONoZAngT8r6FoR93AL8JsifHVwTbdidWOnR9N78/wTvyW0XDx06dDyyrUyWAUUiIriu6BezUfv+Ife/G1l8AxzNtt+Q2+9CmCqH6wuy7JKqYq4EE0Ob3/85/pugy2gOgeyZdf1e8hXQ9uqkhZ0ikVORpUokQSdnfWPcJ3Qz3QJZ+o+X6B1TtiGfZj/7h1yDsZ/czrq+lms36NjonPH5rOEtoUeAUQGwTeNAZ92fILov+SVC3LG0uwD5VPr67fDWoHc9736xoVoRATHeIvrMoo/7p5uv32qvjyzpkoyt4K2KNui7uN4V6j874z7Q+gbypIdM33yv/zKYJgnZdPaqO7gWnFj9nYX8VfpbubHMpcYZsQyDF1pCwYDdAM+pyNt/MuMfpu0wpBoxkCZko5DpuBvlC1LAtkiGcp0VhhPYGAJ6inHmIldmIsJeuoHwX20fRbYTaHW5Cf8RfAf91E5fEyA0I7uQ63QhRd8Y0jVtG8NEkGkwrr07J9+hToTg30NGe0VS2egdLyYw+iysJotyG0LwdohbqMpDQL/L8+dEAWFcPVEIWeVq6We0KzExwowKSX+/OAp+JhiO6aRffRm4/ypY1o9a+wuQXUb7HKg+2r8Z/9+Ehg3bhAi29CXs2S/4pJw/SlmVryar6FRt7ESW7FEFrnUd8o+GNknCSkJ0ysS4pDwr2TSPyZglQ0AP08+g/CHc7ty2p8AbsDNlPxNhVe4vBZSHT5GAVvqdhPw/KtTAOK6177lLsL9gYmJSkiB/dCQr24MfbGChHFTjotcxUFBEVf1/w7tsDMwlk841UHUtc5dKbKgP8fD9JDLhHvDOxDU1HQsdCarvmS4lisQeCf9RUKj6SIK0YcLWQScdbOEjkR5jvFO+AF6OPPacsqIQ1w2RD89/wkINRZlGQhy86oBaGSxvIahGfp8k/FMf9qSz4A1cOyNx+FzoBFC4AFTfDdjxbBP8gccU8ED2QI8KuxGwh0L3zgjS8cLH6fDXgE7QsehPkBfgfa40ybY9AUmJh4a/YUOVEkIe8Udb2jawtRO+7YxwnBtjHBN+kbV0MpLl8tCRSYXeIVkvEdpOK9qeh/eWOyNktJ9c6EcCrIJvh06mLmuPCuHPX+H9L98+H+5V2HD53lfo3Q0vRr+b0F039Ol7am57DlnsvSkurkfRNsd2/Dkx90lbE7Lzc79kl/YHB/KxOUr/Bm9ij0nLCj5K0KSxzbT50+j14J+HXsf1S/Aate1WZI/D+zplO/C9oHeim8FjWToXQgUT5exJGWqJh7474D1tjwXtb9v9tJ2J3WOZ1QUiAftIMps2g5xL+7XI34EfDXXMjZH5Y7bz6Hc81Oc5l2Eb7SZufeg0fYWPSjLGZnzYAPoa7f5G9hlloEeT+5ENBBfDewef8T+nCE3wlp7+gAAAAABJRU5ErkJggg==</mdui:Logo>
-      </mdui:UIInfo>
-      <mdui:DiscoHints>
-        <mdui:IPHint>193.190.172.0/26</mdui:IPHint>
-        <mdui:IPHint>2001:6a8:1c60:d000::/64</mdui:IPHint>
-        <mdui:DomainHint>hogent.be</mdui:DomainHint>
-        <mdui:GeolocationHint>geo:51.032894, 3.703396</mdui:GeolocationHint>
-      </mdui:DiscoHints>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDJDCCAgygAwIBAgIVAKN8lW+W0bwU2Fgdizh1Fc78eC1cMA0GCSqGSIb3DQEB
-BQUAMBkxFzAVBgNVBAMTDmlkcDEuaG9nZW50LmJlMB4XDTEzMTAwNzE0MzI1M1oX
-DTMzMTAwNzE0MzI1M1owGTEXMBUGA1UEAxMOaWRwMS5ob2dlbnQuYmUwggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCpFqqWVjzACwe3pHH4Z+zxtqD0UjIF
-upRkh8638dhdPTsEAS/dIdoG9vI5Bo0o/3Mds/2Vcasih1aEtLpOZA5szGjbQyF3
-Bif6ExfNRc07D9o4o1wEzkkOEaNV6edkBJAENNnuFBZVES13FIhvyW673sdFMU26
-q/PTgXt+DVejhpdgkMtqTLaAbD3G4aViVeNIstuJcrIXwZv3YgD4lgU/fXNjjLDE
-Hk8DuL+aGVmalg37cnxNtq+i7O6lW3/yrLxExCOiFkdvcQq2lCfwECU41ira4M2o
-YuB0CDsYqK8rk3Btk4VueIDJsnivARPrJiRNSN7z1WhDjNe7M5pkC4E9AgMBAAGj
-YzBhMEAGA1UdEQQ5MDeCDmlkcDEuaG9nZW50LmJlhiVodHRwczovL2lkcDEuaG9n
-ZW50LmJlL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBQC4xxZFlWHXKtFqS2uu3pI
-8k+42jANBgkqhkiG9w0BAQUFAAOCAQEAXFNa7quzgSZt+SBCYhjI/5L5EF5ZkZv1
-VSViW5l/vIyFNfMZiXKKsZXZ55WfGePMbrnWh7l0GPlLzgRpFnLuBRS2+VwzWpzA
-H5KAS7a7R0rgvKd7/21l7XrRcBr6z/TNewOb8mpySJTH5M3in2PejUd5+Ae6PsU9
-PY4KiNwdLjzlzJPo/IBFLxiu70X5hTxip+OxTp7bxMleEG7PnlTzQIWMmBehHnDa
-YCtYQpTwBizo6WlwrYOpE/KWQRYL5BB/Q3aW2KeUy87jEpbgU/SojjBrp5y8wRsp
-4rV7/SlPD5jEYnPfqLEiiXz/yXbN2dNfvlO47aV2d/GdWvKDGnijBw==
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp1.hogent.be:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp1.hogent.be:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp1.hogent.be/idp/profile/SAML2/Redirect/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp1.hogent.be/idp/profile/SAML2/POST/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp1.hogent.be: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://idp1.hogent.be/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp1.hogent.be/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp1.hogent.be/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp1.hogent.be/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">hogent.be</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDJDCCAgygAwIBAgIVAKN8lW+W0bwU2Fgdizh1Fc78eC1cMA0GCSqGSIb3DQEB
-BQUAMBkxFzAVBgNVBAMTDmlkcDEuaG9nZW50LmJlMB4XDTEzMTAwNzE0MzI1M1oX
-DTMzMTAwNzE0MzI1M1owGTEXMBUGA1UEAxMOaWRwMS5ob2dlbnQuYmUwggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCpFqqWVjzACwe3pHH4Z+zxtqD0UjIF
-upRkh8638dhdPTsEAS/dIdoG9vI5Bo0o/3Mds/2Vcasih1aEtLpOZA5szGjbQyF3
-Bif6ExfNRc07D9o4o1wEzkkOEaNV6edkBJAENNnuFBZVES13FIhvyW673sdFMU26
-q/PTgXt+DVejhpdgkMtqTLaAbD3G4aViVeNIstuJcrIXwZv3YgD4lgU/fXNjjLDE
-Hk8DuL+aGVmalg37cnxNtq+i7O6lW3/yrLxExCOiFkdvcQq2lCfwECU41ira4M2o
-YuB0CDsYqK8rk3Btk4VueIDJsnivARPrJiRNSN7z1WhDjNe7M5pkC4E9AgMBAAGj
-YzBhMEAGA1UdEQQ5MDeCDmlkcDEuaG9nZW50LmJlhiVodHRwczovL2lkcDEuaG9n
-ZW50LmJlL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBQC4xxZFlWHXKtFqS2uu3pI
-8k+42jANBgkqhkiG9w0BAQUFAAOCAQEAXFNa7quzgSZt+SBCYhjI/5L5EF5ZkZv1
-VSViW5l/vIyFNfMZiXKKsZXZ55WfGePMbrnWh7l0GPlLzgRpFnLuBRS2+VwzWpzA
-H5KAS7a7R0rgvKd7/21l7XrRcBr6z/TNewOb8mpySJTH5M3in2PejUd5+Ae6PsU9
-PY4KiNwdLjzlzJPo/IBFLxiu70X5hTxip+OxTp7bxMleEG7PnlTzQIWMmBehHnDa
-YCtYQpTwBizo6WlwrYOpE/KWQRYL5BB/Q3aW2KeUy87jEpbgU/SojjBrp5y8wRsp
-4rV7/SlPD5jEYnPfqLEiiXz/yXbN2dNfvlO47aV2d/GdWvKDGnijBw==
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp1.hogent.be:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp1.hogent.be: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">
-    Hogeschool Gent
-    </OrganizationName>
-    <OrganizationDisplayName xml:lang="en">
-    Hogeschool Gent
-    </OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">
-    http://www.hogent.be
-    </OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Technical Support</GivenName>
-    <SurName>Technical Support</SurName>
-    <EmailAddress>helpdesk@hogent.be</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp1.inria.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp1.inria.fr-idp-shibboleth.xml
deleted file mode 100644
index f9006e0d..00000000
--- a/swamid-interfederations-2.0/idp1.inria.fr-idp-shibboleth.xml
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp1.inria.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2009-12-10T14:55:56Z">
-      <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">inria.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">INRIA - Institut National de Recherche en Informatique et Automatique</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDGzCCAgOgAwIBAgIURV2xPGuF9dQa7PmIF3FCjmDqotcwDQYJKoZIhvcNAQEF
-BQAwFzEVMBMGA1UEAxMMaWRwLmlucmlhLmZyMB4XDTEzMDEwMjEyMDgwNVoXDTMz
-MDEwMjEyMDgwNVowFzEVMBMGA1UEAxMMaWRwLmlucmlhLmZyMIIBIjANBgkqhkiG
-9w0BAQEFAAOCAQ8AMIIBCgKCAQEAh/Lk4H48LdeM8wIMNRx00gWGRpoQTmcJe7T1
-3eJmrJqNDEEdyXTcPF/JBJl/bvFhpQ9Z8ghoVvZh8To4mouhXca2S3p4rN3PNN/C
-+3Mg6ZH6VRH+/2rcVJGadS8ufwmt0JQ3dKdx9miitZ18bYkVTFENQxAO2WKf7lcb
-/gWvIGAQS3WjlnRq4Ph2NCfrGdJv0/dEJd6CmcwjBrMW8K6pqewb3A8a29PNzg7j
-VqbM1lsUzKaHbNFpqjk9f9Mw2yXRxHVadcfJT4t68VtW36swQxy7JoIbUXq2SbRS
-7SjnpweA8Wa5DlPtnBkCWBq8XJVVL1qKRxjaqXEpa5DntGKJYwIDAQABo18wXTA8
-BgNVHREENTAzggxpZHAuaW5yaWEuZnKGI2h0dHBzOi8vaWRwLmlucmlhLmZyL2lk
-cC9zaGliYm9sZXRoMB0GA1UdDgQWBBQ01t65p+DndQh2JA0x/QtU8z3glDANBgkq
-hkiG9w0BAQUFAAOCAQEAg6KQHU2mU6TYO47bhaKdRPmXaKS61rUYWi761wg3DtZS
-jrquH6YxroUNbQIBwjx2HZOY+rMcBxXhvm1O3rtjDU5cjA0USs7/xmAmtUOGT4sj
-n4d2iWIp/lvoi1JeqU2Gq4cqBYA3yk+nIKx6BIYVS79HsB5l59Gp2dBneB+iSjTP
-j9jDk04w+X2S0gBPHndkrAFPe4KvbdVKhGQpc9eFr9WfJngSSJmUMrohKaacONH+
-8BJK7Dl2G+yI9IiUkq8OvIiV5JWYjfxv/aA0rLWtKYicBkqhsF+v1iZJloGbsWPW
-WD2nmIT/ciCuzi7ky/ay789gzNOzcBUkOx/suG84gg==
-					    </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>
-					      MIIDIDCCAgigAwIBAgIVAMvLhIH/kO4Uk4hR9sz1+w7AbaK+MA0GCSqGSIb3DQEB
-BQUAMBgxFjAUBgNVBAMTDWlkcDEuaW5yaWEuZnIwHhcNMDkwMzI0MTcyNjQ1WhcN
-MjkwMzI0MTcyNjQ1WjAYMRYwFAYDVQQDEw1pZHAxLmlucmlhLmZyMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApyhY2Zv7OX6n0tXylUfpgQ6TTekJ1qvH
-sCzxArvcDSIbkmasOeR+tWD96A3/NAAzoT9qUVQGW9jhViWXOHbWnCpy+oGyR558
-CwLKyW3s64eLpmCPcQEeJRZ5qrRnwFJf3NaitBrgTnZgP33f+5Rqj9nubSF6kWvO
-P3V8yYSWhOTZHSfQ2ABPDXlHjbeIdgQlCtJm5wBNl9G3359U7Nbd2LFSOZI/fc5N
-Ohgv+QxShMRMnSHdZ5aovS1YwY6Gpu7d5gF30NBW/nZJLv3Bl7RzK6RBcCEomKfC
-Za7mrsZsvLHkgaTvgnSJK6Cvvj7lwKVtThOJ/s2Qot+WifQGZlpoCQIDAQABo2Ew
-XzA+BgNVHREENzA1gg1pZHAxLmlucmlhLmZyhiRodHRwczovL2lkcDEuaW5yaWEu
-ZnIvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFET2ENke8iQOFpTy3U4iYfalAyhv
-MA0GCSqGSIb3DQEBBQUAA4IBAQBNFi0mEBlSLzyUGNlZrqwjNe5mELigcT+FUuvS
-bLwPj+SY2L3iJ55R8rGXzfYDXk93JrvosPZsBJadOkcLmELb9N/xcYqj9J89Riee
-lrh4lR5aj2HC041cwoiT8X8Dof0Js6eeu6rKY/R3zONDPhhLBYvfw8NiMwufbKwF
-QLPSDCzmgTrwURi7GudGF8+Nmld2ksTa/GK8CAIJkhvq2JuwdPylUHdp264a/HCj
-e6mt4EwMWTyPLImuko5g1OJpv3QptusujWHHtMcNzx+t+hu0N7V5litMJ5lVnttV
-EcLaLwP/Je8J8l5lTIZobkfKNMs4Rj5PbFBXezI5MfIidTIW
-					    </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://idp.inria.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.inria.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.inria.fr/idp/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">INRIA - Institut National de Recherche en Informatique et Automatique</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">INRIA - Institut National de Recherche en Informatique et Automatique</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Guillaume Rousse</SurName>
-    <EmailAddress>guillaume.rousse@inria.fr</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <SurName>Denis Joiret</SurName>
-    <EmailAddress>denis.joiret@inria.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp1.inria.fr.xml b/swamid-interfederations-2.0/idp1.inria.fr.xml
deleted file mode 100644
index f9006e0d..00000000
--- a/swamid-interfederations-2.0/idp1.inria.fr.xml
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp1.inria.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2009-12-10T14:55:56Z">
-      <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">inria.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">INRIA - Institut National de Recherche en Informatique et Automatique</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDGzCCAgOgAwIBAgIURV2xPGuF9dQa7PmIF3FCjmDqotcwDQYJKoZIhvcNAQEF
-BQAwFzEVMBMGA1UEAxMMaWRwLmlucmlhLmZyMB4XDTEzMDEwMjEyMDgwNVoXDTMz
-MDEwMjEyMDgwNVowFzEVMBMGA1UEAxMMaWRwLmlucmlhLmZyMIIBIjANBgkqhkiG
-9w0BAQEFAAOCAQ8AMIIBCgKCAQEAh/Lk4H48LdeM8wIMNRx00gWGRpoQTmcJe7T1
-3eJmrJqNDEEdyXTcPF/JBJl/bvFhpQ9Z8ghoVvZh8To4mouhXca2S3p4rN3PNN/C
-+3Mg6ZH6VRH+/2rcVJGadS8ufwmt0JQ3dKdx9miitZ18bYkVTFENQxAO2WKf7lcb
-/gWvIGAQS3WjlnRq4Ph2NCfrGdJv0/dEJd6CmcwjBrMW8K6pqewb3A8a29PNzg7j
-VqbM1lsUzKaHbNFpqjk9f9Mw2yXRxHVadcfJT4t68VtW36swQxy7JoIbUXq2SbRS
-7SjnpweA8Wa5DlPtnBkCWBq8XJVVL1qKRxjaqXEpa5DntGKJYwIDAQABo18wXTA8
-BgNVHREENTAzggxpZHAuaW5yaWEuZnKGI2h0dHBzOi8vaWRwLmlucmlhLmZyL2lk
-cC9zaGliYm9sZXRoMB0GA1UdDgQWBBQ01t65p+DndQh2JA0x/QtU8z3glDANBgkq
-hkiG9w0BAQUFAAOCAQEAg6KQHU2mU6TYO47bhaKdRPmXaKS61rUYWi761wg3DtZS
-jrquH6YxroUNbQIBwjx2HZOY+rMcBxXhvm1O3rtjDU5cjA0USs7/xmAmtUOGT4sj
-n4d2iWIp/lvoi1JeqU2Gq4cqBYA3yk+nIKx6BIYVS79HsB5l59Gp2dBneB+iSjTP
-j9jDk04w+X2S0gBPHndkrAFPe4KvbdVKhGQpc9eFr9WfJngSSJmUMrohKaacONH+
-8BJK7Dl2G+yI9IiUkq8OvIiV5JWYjfxv/aA0rLWtKYicBkqhsF+v1iZJloGbsWPW
-WD2nmIT/ciCuzi7ky/ay789gzNOzcBUkOx/suG84gg==
-					    </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>
-					      MIIDIDCCAgigAwIBAgIVAMvLhIH/kO4Uk4hR9sz1+w7AbaK+MA0GCSqGSIb3DQEB
-BQUAMBgxFjAUBgNVBAMTDWlkcDEuaW5yaWEuZnIwHhcNMDkwMzI0MTcyNjQ1WhcN
-MjkwMzI0MTcyNjQ1WjAYMRYwFAYDVQQDEw1pZHAxLmlucmlhLmZyMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApyhY2Zv7OX6n0tXylUfpgQ6TTekJ1qvH
-sCzxArvcDSIbkmasOeR+tWD96A3/NAAzoT9qUVQGW9jhViWXOHbWnCpy+oGyR558
-CwLKyW3s64eLpmCPcQEeJRZ5qrRnwFJf3NaitBrgTnZgP33f+5Rqj9nubSF6kWvO
-P3V8yYSWhOTZHSfQ2ABPDXlHjbeIdgQlCtJm5wBNl9G3359U7Nbd2LFSOZI/fc5N
-Ohgv+QxShMRMnSHdZ5aovS1YwY6Gpu7d5gF30NBW/nZJLv3Bl7RzK6RBcCEomKfC
-Za7mrsZsvLHkgaTvgnSJK6Cvvj7lwKVtThOJ/s2Qot+WifQGZlpoCQIDAQABo2Ew
-XzA+BgNVHREENzA1gg1pZHAxLmlucmlhLmZyhiRodHRwczovL2lkcDEuaW5yaWEu
-ZnIvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFET2ENke8iQOFpTy3U4iYfalAyhv
-MA0GCSqGSIb3DQEBBQUAA4IBAQBNFi0mEBlSLzyUGNlZrqwjNe5mELigcT+FUuvS
-bLwPj+SY2L3iJ55R8rGXzfYDXk93JrvosPZsBJadOkcLmELb9N/xcYqj9J89Riee
-lrh4lR5aj2HC041cwoiT8X8Dof0Js6eeu6rKY/R3zONDPhhLBYvfw8NiMwufbKwF
-QLPSDCzmgTrwURi7GudGF8+Nmld2ksTa/GK8CAIJkhvq2JuwdPylUHdp264a/HCj
-e6mt4EwMWTyPLImuko5g1OJpv3QptusujWHHtMcNzx+t+hu0N7V5litMJ5lVnttV
-EcLaLwP/Je8J8l5lTIZobkfKNMs4Rj5PbFBXezI5MfIidTIW
-					    </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://idp.inria.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.inria.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.inria.fr/idp/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">INRIA - Institut National de Recherche en Informatique et Automatique</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">INRIA - Institut National de Recherche en Informatique et Automatique</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Guillaume Rousse</SurName>
-    <EmailAddress>guillaume.rousse@inria.fr</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <SurName>Denis Joiret</SurName>
-    <EmailAddress>denis.joiret@inria.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp1.uwaterloo.ca-idp-shibboleth.xml b/swamid-interfederations-2.0/idp1.uwaterloo.ca-idp-shibboleth.xml
deleted file mode 100644
index 0d7854f2..00000000
--- a/swamid-interfederations-2.0/idp1.uwaterloo.ca-idp-shibboleth.xml
+++ /dev/null
@@ -1,102 +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: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:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://idp1.uwaterloo.ca/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.canarie.ca" registrationInstant="2014-06-19T00:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://www.canarie.ca/templates/services/docs/CAF_join_en.pdf</mdrpi:RegistrationPolicy>
-      <mdrpi:RegistrationPolicy xml:lang="fr">http://www.canarie.ca/templates/services/docs/CAF_join_fr.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">uwaterloo.ca</shibmd:Scope>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="en">University of Waterloo</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Students, employees and other University of Waterloo account holders</mdui:Description>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDLzCCAhegAwIBAgIUbKz7iorE+LiL1mldU1jseivAaTkwDQYJKoZIhvcNAQEF
-BQAwHDEaMBgGA1UEAxMRaWRwMS51d2F0ZXJsb28uY2EwHhcNMTQwNjE4MTMxMTQ5
-WhcNMzQwNjE4MTMxMTQ5WjAcMRowGAYDVQQDExFpZHAxLnV3YXRlcmxvby5jYTCC
-ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJLtTKyNTqUzgIoJaZs1s3UJ
-0jPSIy18S8yVyOEhGaa2MT6kd3ik1tZ3O3iFNm59oNU/IU7km+O8Lq364GME0lCD
-KEobEaH2Tcs55Hk2a9rSmpZ/9+MAW9W/UJVb7Y/T1+jpQxVB4KTVULGqleO4wwJZ
-nhRbzNFuQgSW12msKV4d0ClKct5ui2UlkCXLrC6MFOEsKoGawpm5StKSnbTzLD4K
-3B6LdSc3WQWzX8zSHwSbe0PLbH2MD1Ns37YNNFv5uDhiYeh7E9zYfqd1LmUufmK2
-3daof43rjDRi+3Ybzx44GDMp1bMp7c7Q9W2HmnrZDY0fiyeLTXURDPGbsUgENFMC
-AwEAAaNpMGcwRgYDVR0RBD8wPYIRaWRwMS51d2F0ZXJsb28uY2GGKGh0dHBzOi8v
-aWRwMS51d2F0ZXJsb28uY2EvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFHQQAyUs
-uhk9N8P6qen7W7J4k4itMA0GCSqGSIb3DQEBBQUAA4IBAQCMwr7R/xOhdI8OQlc8
-tp6gnIsUSBD6uwcXGVfjg07i/NTtfWTRG3cn8SvV5KcmxqNTQxkkhXyE92RMw88O
-OQM220jmY4fQx63af0OjtXTUYxIOK0Cg0FXMylloHdRyVqp2wbJqbclYL3IWoNRN
-nbyTdmEBxrUjKsAgJl9F4mS06iuOyBUMmcLxqPRQCNuPm7CJECTmYfUiaEKh5Keo
-4f7W4J1Jx1wcvieUsbcMRx258MXiQ+tqYvPVTAuNsFOZ3YcOUHjXTTueSLyzDVb8
-YXl9jLkki1wDKTSv8RDcUDjBWf0rITaf13Q08dKsI2gUp786n2QO9fXaKKgxSM+n
-7zvx</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp1.uwaterloo.ca/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp1.uwaterloo.ca/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp1.uwaterloo.ca/idp/profile/SAML2/Redirect/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp1.uwaterloo.ca/idp/profile/SAML2/POST/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp1.uwaterloo.ca/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://idp1.uwaterloo.ca/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp1.uwaterloo.ca/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp1.uwaterloo.ca/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp1.uwaterloo.ca/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">uwaterloo.ca</shibmd:Scope>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="en">University of Waterloo</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Students, employees and other University of Waterloo account holders</mdui:Description>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDLzCCAhegAwIBAgIUbKz7iorE+LiL1mldU1jseivAaTkwDQYJKoZIhvcNAQEF
-BQAwHDEaMBgGA1UEAxMRaWRwMS51d2F0ZXJsb28uY2EwHhcNMTQwNjE4MTMxMTQ5
-WhcNMzQwNjE4MTMxMTQ5WjAcMRowGAYDVQQDExFpZHAxLnV3YXRlcmxvby5jYTCC
-ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJLtTKyNTqUzgIoJaZs1s3UJ
-0jPSIy18S8yVyOEhGaa2MT6kd3ik1tZ3O3iFNm59oNU/IU7km+O8Lq364GME0lCD
-KEobEaH2Tcs55Hk2a9rSmpZ/9+MAW9W/UJVb7Y/T1+jpQxVB4KTVULGqleO4wwJZ
-nhRbzNFuQgSW12msKV4d0ClKct5ui2UlkCXLrC6MFOEsKoGawpm5StKSnbTzLD4K
-3B6LdSc3WQWzX8zSHwSbe0PLbH2MD1Ns37YNNFv5uDhiYeh7E9zYfqd1LmUufmK2
-3daof43rjDRi+3Ybzx44GDMp1bMp7c7Q9W2HmnrZDY0fiyeLTXURDPGbsUgENFMC
-AwEAAaNpMGcwRgYDVR0RBD8wPYIRaWRwMS51d2F0ZXJsb28uY2GGKGh0dHBzOi8v
-aWRwMS51d2F0ZXJsb28uY2EvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFHQQAyUs
-uhk9N8P6qen7W7J4k4itMA0GCSqGSIb3DQEBBQUAA4IBAQCMwr7R/xOhdI8OQlc8
-tp6gnIsUSBD6uwcXGVfjg07i/NTtfWTRG3cn8SvV5KcmxqNTQxkkhXyE92RMw88O
-OQM220jmY4fQx63af0OjtXTUYxIOK0Cg0FXMylloHdRyVqp2wbJqbclYL3IWoNRN
-nbyTdmEBxrUjKsAgJl9F4mS06iuOyBUMmcLxqPRQCNuPm7CJECTmYfUiaEKh5Keo
-4f7W4J1Jx1wcvieUsbcMRx258MXiQ+tqYvPVTAuNsFOZ3YcOUHjXTTueSLyzDVb8
-YXl9jLkki1wDKTSv8RDcUDjBWf0rITaf13Q08dKsI2gUp786n2QO9fXaKKgxSM+n
-7zvx</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp1.uwaterloo.ca/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp1.uwaterloo.ca/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>
-  <md:Organization xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata">
-    <md:OrganizationName xml:lang="en">University of Waterloo</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">University of Waterloo</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.uwaterloo.ca</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
-    <md:GivenName>Sean</md:GivenName>
-    <md:SurName>Mason</md:SurName>
-    <md:EmailAddress>watiam@uwaterloo.ca</md:EmailAddress>
-  </md:ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp1.uwaterloo.ca.xml b/swamid-interfederations-2.0/idp1.uwaterloo.ca.xml
deleted file mode 100644
index 0d7854f2..00000000
--- a/swamid-interfederations-2.0/idp1.uwaterloo.ca.xml
+++ /dev/null
@@ -1,102 +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: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:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://idp1.uwaterloo.ca/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.canarie.ca" registrationInstant="2014-06-19T00:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://www.canarie.ca/templates/services/docs/CAF_join_en.pdf</mdrpi:RegistrationPolicy>
-      <mdrpi:RegistrationPolicy xml:lang="fr">http://www.canarie.ca/templates/services/docs/CAF_join_fr.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">uwaterloo.ca</shibmd:Scope>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="en">University of Waterloo</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Students, employees and other University of Waterloo account holders</mdui:Description>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDLzCCAhegAwIBAgIUbKz7iorE+LiL1mldU1jseivAaTkwDQYJKoZIhvcNAQEF
-BQAwHDEaMBgGA1UEAxMRaWRwMS51d2F0ZXJsb28uY2EwHhcNMTQwNjE4MTMxMTQ5
-WhcNMzQwNjE4MTMxMTQ5WjAcMRowGAYDVQQDExFpZHAxLnV3YXRlcmxvby5jYTCC
-ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJLtTKyNTqUzgIoJaZs1s3UJ
-0jPSIy18S8yVyOEhGaa2MT6kd3ik1tZ3O3iFNm59oNU/IU7km+O8Lq364GME0lCD
-KEobEaH2Tcs55Hk2a9rSmpZ/9+MAW9W/UJVb7Y/T1+jpQxVB4KTVULGqleO4wwJZ
-nhRbzNFuQgSW12msKV4d0ClKct5ui2UlkCXLrC6MFOEsKoGawpm5StKSnbTzLD4K
-3B6LdSc3WQWzX8zSHwSbe0PLbH2MD1Ns37YNNFv5uDhiYeh7E9zYfqd1LmUufmK2
-3daof43rjDRi+3Ybzx44GDMp1bMp7c7Q9W2HmnrZDY0fiyeLTXURDPGbsUgENFMC
-AwEAAaNpMGcwRgYDVR0RBD8wPYIRaWRwMS51d2F0ZXJsb28uY2GGKGh0dHBzOi8v
-aWRwMS51d2F0ZXJsb28uY2EvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFHQQAyUs
-uhk9N8P6qen7W7J4k4itMA0GCSqGSIb3DQEBBQUAA4IBAQCMwr7R/xOhdI8OQlc8
-tp6gnIsUSBD6uwcXGVfjg07i/NTtfWTRG3cn8SvV5KcmxqNTQxkkhXyE92RMw88O
-OQM220jmY4fQx63af0OjtXTUYxIOK0Cg0FXMylloHdRyVqp2wbJqbclYL3IWoNRN
-nbyTdmEBxrUjKsAgJl9F4mS06iuOyBUMmcLxqPRQCNuPm7CJECTmYfUiaEKh5Keo
-4f7W4J1Jx1wcvieUsbcMRx258MXiQ+tqYvPVTAuNsFOZ3YcOUHjXTTueSLyzDVb8
-YXl9jLkki1wDKTSv8RDcUDjBWf0rITaf13Q08dKsI2gUp786n2QO9fXaKKgxSM+n
-7zvx</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp1.uwaterloo.ca/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp1.uwaterloo.ca/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp1.uwaterloo.ca/idp/profile/SAML2/Redirect/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp1.uwaterloo.ca/idp/profile/SAML2/POST/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp1.uwaterloo.ca/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://idp1.uwaterloo.ca/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp1.uwaterloo.ca/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp1.uwaterloo.ca/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp1.uwaterloo.ca/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">uwaterloo.ca</shibmd:Scope>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="en">University of Waterloo</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Students, employees and other University of Waterloo account holders</mdui:Description>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDLzCCAhegAwIBAgIUbKz7iorE+LiL1mldU1jseivAaTkwDQYJKoZIhvcNAQEF
-BQAwHDEaMBgGA1UEAxMRaWRwMS51d2F0ZXJsb28uY2EwHhcNMTQwNjE4MTMxMTQ5
-WhcNMzQwNjE4MTMxMTQ5WjAcMRowGAYDVQQDExFpZHAxLnV3YXRlcmxvby5jYTCC
-ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJLtTKyNTqUzgIoJaZs1s3UJ
-0jPSIy18S8yVyOEhGaa2MT6kd3ik1tZ3O3iFNm59oNU/IU7km+O8Lq364GME0lCD
-KEobEaH2Tcs55Hk2a9rSmpZ/9+MAW9W/UJVb7Y/T1+jpQxVB4KTVULGqleO4wwJZ
-nhRbzNFuQgSW12msKV4d0ClKct5ui2UlkCXLrC6MFOEsKoGawpm5StKSnbTzLD4K
-3B6LdSc3WQWzX8zSHwSbe0PLbH2MD1Ns37YNNFv5uDhiYeh7E9zYfqd1LmUufmK2
-3daof43rjDRi+3Ybzx44GDMp1bMp7c7Q9W2HmnrZDY0fiyeLTXURDPGbsUgENFMC
-AwEAAaNpMGcwRgYDVR0RBD8wPYIRaWRwMS51d2F0ZXJsb28uY2GGKGh0dHBzOi8v
-aWRwMS51d2F0ZXJsb28uY2EvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFHQQAyUs
-uhk9N8P6qen7W7J4k4itMA0GCSqGSIb3DQEBBQUAA4IBAQCMwr7R/xOhdI8OQlc8
-tp6gnIsUSBD6uwcXGVfjg07i/NTtfWTRG3cn8SvV5KcmxqNTQxkkhXyE92RMw88O
-OQM220jmY4fQx63af0OjtXTUYxIOK0Cg0FXMylloHdRyVqp2wbJqbclYL3IWoNRN
-nbyTdmEBxrUjKsAgJl9F4mS06iuOyBUMmcLxqPRQCNuPm7CJECTmYfUiaEKh5Keo
-4f7W4J1Jx1wcvieUsbcMRx258MXiQ+tqYvPVTAuNsFOZ3YcOUHjXTTueSLyzDVb8
-YXl9jLkki1wDKTSv8RDcUDjBWf0rITaf13Q08dKsI2gUp786n2QO9fXaKKgxSM+n
-7zvx</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp1.uwaterloo.ca/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp1.uwaterloo.ca/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>
-  <md:Organization xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata">
-    <md:OrganizationName xml:lang="en">University of Waterloo</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">University of Waterloo</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.uwaterloo.ca</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
-    <md:GivenName>Sean</md:GivenName>
-    <md:SurName>Mason</md:SurName>
-    <md:EmailAddress>watiam@uwaterloo.ca</md:EmailAddress>
-  </md:ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp2-1.slu.se-idp-shibboleth.xml b/swamid-interfederations-2.0/idp2-1.slu.se-idp-shibboleth.xml
deleted file mode 100644
index 3173d1dc..00000000
--- a/swamid-interfederations-2.0/idp2-1.slu.se-idp-shibboleth.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://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:InformationURL xml:lang="sv">http://www.slu.se/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">http://www.slu.se/en/</mdui:InformationURL>
-        <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:Keywords xml:lang="sv">slu sveriges+lantbruksuniversitet swedish+university+of+agricultural+sciences</mdui:Keywords>
-        <mdui:Keywords xml:lang="en">slu sveriges+lantbruksuniversitet swedish+university+of+agricultural+sciences</mdui:Keywords>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DomainHint>slu.se</mdui:DomainHint>
-      </mdui:DiscoHints>
-    </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="administrative">
-    <Company>Swedish University of Agricultural Science</Company>
-    <SurName>Bengt Norman</SurName>
-    <EmailAddress>saml-admins@slu.se</EmailAddress>
-    <TelephoneNumber>+46 90 786 81 22</TelephoneNumber>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
-    <Company>Swedish University of Agricultural Science</Company>
-    <SurName>Ivan Clegg</SurName>
-    <EmailAddress>saml-admins@slu.se</EmailAddress>
-    <TelephoneNumber>+46 70 2413737</TelephoneNumber>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
-    <Company>Swedish University of Agricultural Science</Company>
-    <SurName>IT-stöd</SurName>
-    <EmailAddress>mailto:IT-stod@slu.se</EmailAddress>
-    <TelephoneNumber>+46 18 67 66 00</TelephoneNumber>
-  </ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp2-1.slu.se.xml b/swamid-interfederations-2.0/idp2-1.slu.se.xml
deleted file mode 100644
index 3173d1dc..00000000
--- a/swamid-interfederations-2.0/idp2-1.slu.se.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://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:InformationURL xml:lang="sv">http://www.slu.se/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">http://www.slu.se/en/</mdui:InformationURL>
-        <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:Keywords xml:lang="sv">slu sveriges+lantbruksuniversitet swedish+university+of+agricultural+sciences</mdui:Keywords>
-        <mdui:Keywords xml:lang="en">slu sveriges+lantbruksuniversitet swedish+university+of+agricultural+sciences</mdui:Keywords>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DomainHint>slu.se</mdui:DomainHint>
-      </mdui:DiscoHints>
-    </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="administrative">
-    <Company>Swedish University of Agricultural Science</Company>
-    <SurName>Bengt Norman</SurName>
-    <EmailAddress>saml-admins@slu.se</EmailAddress>
-    <TelephoneNumber>+46 90 786 81 22</TelephoneNumber>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
-    <Company>Swedish University of Agricultural Science</Company>
-    <SurName>Ivan Clegg</SurName>
-    <EmailAddress>saml-admins@slu.se</EmailAddress>
-    <TelephoneNumber>+46 70 2413737</TelephoneNumber>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
-    <Company>Swedish University of Agricultural Science</Company>
-    <SurName>IT-stöd</SurName>
-    <EmailAddress>mailto:IT-stod@slu.se</EmailAddress>
-    <TelephoneNumber>+46 18 67 66 00</TelephoneNumber>
-  </ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp2.civ.cvut.cz-idp-shibboleth.xml b/swamid-interfederations-2.0/idp2.civ.cvut.cz-idp-shibboleth.xml
deleted file mode 100644
index 04ec7266..00000000
--- a/swamid-interfederations-2.0/idp2.civ.cvut.cz-idp-shibboleth.xml
+++ /dev/null
@@ -1,129 +0,0 @@
-<?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://idp2.civ.cvut.cz/idp/shibboleth">
-  <md:Extensions xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata">
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/" registrationInstant="2010-09-22T14:10:51Z">
-      <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>
-    <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://eduid.cz/uri/idp-group/university</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md: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">cvut.cz</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Czech Technical University in Prague</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="cs">České vysoké učení technické v Praze</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Identity Provider for CTU in Prague</mdui:Description>
-        <mdui:Description xml:lang="cs">Identity Provider pro ČVUT v Praze</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.cvut.cz/en</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="cs">http://www.cvut.cz/cs</mdui:InformationURL>
-        <mdui:Logo height="40" width="53">https://idp2.civ.cvut.cz/idp/images/logo_cvut_40pix.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>
-			    MIIEfTCCA2WgAwIBAgIRALXH4vfn8/gr0Iw5Iowy/gEwDQYJKoZIhvcNAQEFBQAw
-			    NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-			    IFNTTCBDQTAeFw0xMjExMjEwMDAwMDBaFw0xNTExMjEyMzU5NTlaMFcxCzAJBgNV
-			    BAYTAkNaMS0wKwYDVQQKEyRDemVjaCBUZWNobmljYWwgVW5pdmVyc2l0eSBpbiBQ
-			    cmFndWUxGTAXBgNVBAMTEGlkcDIuY2l2LmN2dXQuY3owggEiMA0GCSqGSIb3DQEB
-			    AQUAA4IBDwAwggEKAoIBAQDIAANNkRJrnWIbXPvPd1g/2Dlj8SObKDs4aLG90fkl
-			    7XvId+XJ71GJ8aEjJ9lGAEqs2a9sgm2WpcLQ/B+Y9veRyRtnaK0Ywd8+iSThsA58
-			    oTN5H3V3m/M0oMTd9UPkQSHCLUn+Dp1w04DJ6J8ECWoI2rvIblGHGzxfzF4cb2KH
-			    aMvWDGSuiQh6GeKkwHDTVTr9pZK8Evcw7RT/4KlChf5hfFD3ZwGsrWCjI25NrR+6
-			    753XeaVIOOCKZladSF/93t8kAM4Z+n/ijQDytg3v4poSt0LM5X4+8b7AYTDSjkUq
-			    Nh36JZ+OZY4jRrBsrM0S4RXWuPB9DEc8hLe/CIRZWGIzAgMBAAGjggFjMIIBXzAf
-			    BgNVHSMEGDAWgBQMvZNoDPPeq6NJays3V0fqkOO57TAdBgNVHQ4EFgQUWkdTT+6T
-			    qjlT9i5aI+IBxfKpCm4wDgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYD
-			    VR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMBgGA1UdIAQRMA8wDQYLKwYBBAGy
-			    MQECAh0wOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9y
-			    Zy9URVJFTkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilo
-			    dHRwOi8vY3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEF
-			    BQcwAYYaaHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwGwYDVR0RBBQwEoIQaWRw
-			    Mi5jaXYuY3Z1dC5jejANBgkqhkiG9w0BAQUFAAOCAQEAvV4rEv6A07BXcUMTF6+z
-			    Da8v2shV1S+f0SGfIdL1DzvaUFf7VAWuKOlwny8OfpzXVCs3yg+KSDWUWi8HWR6y
-			    dKWsuHljnD2DxAAPQNZeuESbPSyeZK/EJdSu4Ii+OH0exDRjZjZ3v3VsoueQ41tt
-			    1/Fji03+9bZCQi9dOQpQji/q2SrnKRpPsoCemY+bo8E7SanrUd7jwX1ef6HaOnTP
-			    l8oHphtTzvbg+i3qaTH9bDQXdXbcFZPklU7+5k80wHe56+1sECQ5g1lB+ZFzx1Oi
-			    i5rCf/Zx3bkYkE+xPXAOcCGEWs35at7QpIXuoG9FDU8UKW2cMgEq9GEOddx/wVqB
-			    6w==
-		    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp2.civ.cvut.cz:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp2.civ.cvut.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:2.0:nameid-format:persistent</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp2.civ.cvut.cz/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp2.civ.cvut.cz/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp2.civ.cvut.cz/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp2.civ.cvut.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">cvut.cz</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-			    MIIEfTCCA2WgAwIBAgIRALXH4vfn8/gr0Iw5Iowy/gEwDQYJKoZIhvcNAQEFBQAw
-			    NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-			    IFNTTCBDQTAeFw0xMjExMjEwMDAwMDBaFw0xNTExMjEyMzU5NTlaMFcxCzAJBgNV
-			    BAYTAkNaMS0wKwYDVQQKEyRDemVjaCBUZWNobmljYWwgVW5pdmVyc2l0eSBpbiBQ
-			    cmFndWUxGTAXBgNVBAMTEGlkcDIuY2l2LmN2dXQuY3owggEiMA0GCSqGSIb3DQEB
-			    AQUAA4IBDwAwggEKAoIBAQDIAANNkRJrnWIbXPvPd1g/2Dlj8SObKDs4aLG90fkl
-			    7XvId+XJ71GJ8aEjJ9lGAEqs2a9sgm2WpcLQ/B+Y9veRyRtnaK0Ywd8+iSThsA58
-			    oTN5H3V3m/M0oMTd9UPkQSHCLUn+Dp1w04DJ6J8ECWoI2rvIblGHGzxfzF4cb2KH
-			    aMvWDGSuiQh6GeKkwHDTVTr9pZK8Evcw7RT/4KlChf5hfFD3ZwGsrWCjI25NrR+6
-			    753XeaVIOOCKZladSF/93t8kAM4Z+n/ijQDytg3v4poSt0LM5X4+8b7AYTDSjkUq
-			    Nh36JZ+OZY4jRrBsrM0S4RXWuPB9DEc8hLe/CIRZWGIzAgMBAAGjggFjMIIBXzAf
-			    BgNVHSMEGDAWgBQMvZNoDPPeq6NJays3V0fqkOO57TAdBgNVHQ4EFgQUWkdTT+6T
-			    qjlT9i5aI+IBxfKpCm4wDgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYD
-			    VR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMBgGA1UdIAQRMA8wDQYLKwYBBAGy
-			    MQECAh0wOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9y
-			    Zy9URVJFTkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilo
-			    dHRwOi8vY3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEF
-			    BQcwAYYaaHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwGwYDVR0RBBQwEoIQaWRw
-			    Mi5jaXYuY3Z1dC5jejANBgkqhkiG9w0BAQUFAAOCAQEAvV4rEv6A07BXcUMTF6+z
-			    Da8v2shV1S+f0SGfIdL1DzvaUFf7VAWuKOlwny8OfpzXVCs3yg+KSDWUWi8HWR6y
-			    dKWsuHljnD2DxAAPQNZeuESbPSyeZK/EJdSu4Ii+OH0exDRjZjZ3v3VsoueQ41tt
-			    1/Fji03+9bZCQi9dOQpQji/q2SrnKRpPsoCemY+bo8E7SanrUd7jwX1ef6HaOnTP
-			    l8oHphtTzvbg+i3qaTH9bDQXdXbcFZPklU7+5k80wHe56+1sECQ5g1lB+ZFzx1Oi
-			    i5rCf/Zx3bkYkE+xPXAOcCGEWs35at7QpIXuoG9FDU8UKW2cMgEq9GEOddx/wVqB
-			    6w==
-		    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp2.civ.cvut.cz:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp2.civ.cvut.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">ČVUT</OrganizationName>
-    <OrganizationName xml:lang="en">CTU</OrganizationName>
-    <OrganizationDisplayName xml:lang="cs">České vysoké učení technické v Praze</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">Czech Technical University in Prague</OrganizationDisplayName>
-    <OrganizationURL xml:lang="cs">http://www.cvut.cz/cs</OrganizationURL>
-    <OrganizationURL xml:lang="en">http://www.cvut.cz/en</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Petr</GivenName>
-    <SurName>Strupl</SurName>
-    <EmailAddress>strupl@vc.cvut.cz</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp2.civ.cvut.cz.xml b/swamid-interfederations-2.0/idp2.civ.cvut.cz.xml
deleted file mode 100644
index 04ec7266..00000000
--- a/swamid-interfederations-2.0/idp2.civ.cvut.cz.xml
+++ /dev/null
@@ -1,129 +0,0 @@
-<?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://idp2.civ.cvut.cz/idp/shibboleth">
-  <md:Extensions xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata">
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/" registrationInstant="2010-09-22T14:10:51Z">
-      <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>
-    <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://eduid.cz/uri/idp-group/university</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md: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">cvut.cz</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Czech Technical University in Prague</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="cs">České vysoké učení technické v Praze</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Identity Provider for CTU in Prague</mdui:Description>
-        <mdui:Description xml:lang="cs">Identity Provider pro ČVUT v Praze</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.cvut.cz/en</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="cs">http://www.cvut.cz/cs</mdui:InformationURL>
-        <mdui:Logo height="40" width="53">https://idp2.civ.cvut.cz/idp/images/logo_cvut_40pix.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>
-			    MIIEfTCCA2WgAwIBAgIRALXH4vfn8/gr0Iw5Iowy/gEwDQYJKoZIhvcNAQEFBQAw
-			    NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-			    IFNTTCBDQTAeFw0xMjExMjEwMDAwMDBaFw0xNTExMjEyMzU5NTlaMFcxCzAJBgNV
-			    BAYTAkNaMS0wKwYDVQQKEyRDemVjaCBUZWNobmljYWwgVW5pdmVyc2l0eSBpbiBQ
-			    cmFndWUxGTAXBgNVBAMTEGlkcDIuY2l2LmN2dXQuY3owggEiMA0GCSqGSIb3DQEB
-			    AQUAA4IBDwAwggEKAoIBAQDIAANNkRJrnWIbXPvPd1g/2Dlj8SObKDs4aLG90fkl
-			    7XvId+XJ71GJ8aEjJ9lGAEqs2a9sgm2WpcLQ/B+Y9veRyRtnaK0Ywd8+iSThsA58
-			    oTN5H3V3m/M0oMTd9UPkQSHCLUn+Dp1w04DJ6J8ECWoI2rvIblGHGzxfzF4cb2KH
-			    aMvWDGSuiQh6GeKkwHDTVTr9pZK8Evcw7RT/4KlChf5hfFD3ZwGsrWCjI25NrR+6
-			    753XeaVIOOCKZladSF/93t8kAM4Z+n/ijQDytg3v4poSt0LM5X4+8b7AYTDSjkUq
-			    Nh36JZ+OZY4jRrBsrM0S4RXWuPB9DEc8hLe/CIRZWGIzAgMBAAGjggFjMIIBXzAf
-			    BgNVHSMEGDAWgBQMvZNoDPPeq6NJays3V0fqkOO57TAdBgNVHQ4EFgQUWkdTT+6T
-			    qjlT9i5aI+IBxfKpCm4wDgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYD
-			    VR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMBgGA1UdIAQRMA8wDQYLKwYBBAGy
-			    MQECAh0wOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9y
-			    Zy9URVJFTkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilo
-			    dHRwOi8vY3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEF
-			    BQcwAYYaaHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwGwYDVR0RBBQwEoIQaWRw
-			    Mi5jaXYuY3Z1dC5jejANBgkqhkiG9w0BAQUFAAOCAQEAvV4rEv6A07BXcUMTF6+z
-			    Da8v2shV1S+f0SGfIdL1DzvaUFf7VAWuKOlwny8OfpzXVCs3yg+KSDWUWi8HWR6y
-			    dKWsuHljnD2DxAAPQNZeuESbPSyeZK/EJdSu4Ii+OH0exDRjZjZ3v3VsoueQ41tt
-			    1/Fji03+9bZCQi9dOQpQji/q2SrnKRpPsoCemY+bo8E7SanrUd7jwX1ef6HaOnTP
-			    l8oHphtTzvbg+i3qaTH9bDQXdXbcFZPklU7+5k80wHe56+1sECQ5g1lB+ZFzx1Oi
-			    i5rCf/Zx3bkYkE+xPXAOcCGEWs35at7QpIXuoG9FDU8UKW2cMgEq9GEOddx/wVqB
-			    6w==
-		    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp2.civ.cvut.cz:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp2.civ.cvut.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:2.0:nameid-format:persistent</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp2.civ.cvut.cz/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp2.civ.cvut.cz/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp2.civ.cvut.cz/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp2.civ.cvut.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">cvut.cz</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-			    MIIEfTCCA2WgAwIBAgIRALXH4vfn8/gr0Iw5Iowy/gEwDQYJKoZIhvcNAQEFBQAw
-			    NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-			    IFNTTCBDQTAeFw0xMjExMjEwMDAwMDBaFw0xNTExMjEyMzU5NTlaMFcxCzAJBgNV
-			    BAYTAkNaMS0wKwYDVQQKEyRDemVjaCBUZWNobmljYWwgVW5pdmVyc2l0eSBpbiBQ
-			    cmFndWUxGTAXBgNVBAMTEGlkcDIuY2l2LmN2dXQuY3owggEiMA0GCSqGSIb3DQEB
-			    AQUAA4IBDwAwggEKAoIBAQDIAANNkRJrnWIbXPvPd1g/2Dlj8SObKDs4aLG90fkl
-			    7XvId+XJ71GJ8aEjJ9lGAEqs2a9sgm2WpcLQ/B+Y9veRyRtnaK0Ywd8+iSThsA58
-			    oTN5H3V3m/M0oMTd9UPkQSHCLUn+Dp1w04DJ6J8ECWoI2rvIblGHGzxfzF4cb2KH
-			    aMvWDGSuiQh6GeKkwHDTVTr9pZK8Evcw7RT/4KlChf5hfFD3ZwGsrWCjI25NrR+6
-			    753XeaVIOOCKZladSF/93t8kAM4Z+n/ijQDytg3v4poSt0LM5X4+8b7AYTDSjkUq
-			    Nh36JZ+OZY4jRrBsrM0S4RXWuPB9DEc8hLe/CIRZWGIzAgMBAAGjggFjMIIBXzAf
-			    BgNVHSMEGDAWgBQMvZNoDPPeq6NJays3V0fqkOO57TAdBgNVHQ4EFgQUWkdTT+6T
-			    qjlT9i5aI+IBxfKpCm4wDgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYD
-			    VR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMBgGA1UdIAQRMA8wDQYLKwYBBAGy
-			    MQECAh0wOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9y
-			    Zy9URVJFTkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilo
-			    dHRwOi8vY3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEF
-			    BQcwAYYaaHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwGwYDVR0RBBQwEoIQaWRw
-			    Mi5jaXYuY3Z1dC5jejANBgkqhkiG9w0BAQUFAAOCAQEAvV4rEv6A07BXcUMTF6+z
-			    Da8v2shV1S+f0SGfIdL1DzvaUFf7VAWuKOlwny8OfpzXVCs3yg+KSDWUWi8HWR6y
-			    dKWsuHljnD2DxAAPQNZeuESbPSyeZK/EJdSu4Ii+OH0exDRjZjZ3v3VsoueQ41tt
-			    1/Fji03+9bZCQi9dOQpQji/q2SrnKRpPsoCemY+bo8E7SanrUd7jwX1ef6HaOnTP
-			    l8oHphtTzvbg+i3qaTH9bDQXdXbcFZPklU7+5k80wHe56+1sECQ5g1lB+ZFzx1Oi
-			    i5rCf/Zx3bkYkE+xPXAOcCGEWs35at7QpIXuoG9FDU8UKW2cMgEq9GEOddx/wVqB
-			    6w==
-		    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp2.civ.cvut.cz:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp2.civ.cvut.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">ČVUT</OrganizationName>
-    <OrganizationName xml:lang="en">CTU</OrganizationName>
-    <OrganizationDisplayName xml:lang="cs">České vysoké učení technické v Praze</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">Czech Technical University in Prague</OrganizationDisplayName>
-    <OrganizationURL xml:lang="cs">http://www.cvut.cz/cs</OrganizationURL>
-    <OrganizationURL xml:lang="en">http://www.cvut.cz/en</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Petr</GivenName>
-    <SurName>Strupl</SurName>
-    <EmailAddress>strupl@vc.cvut.cz</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp2.crous-toulouse.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp2.crous-toulouse.fr-idp-shibboleth.xml
deleted file mode 100644
index cb4e6083..00000000
--- a/swamid-interfederations-2.0/idp2.crous-toulouse.fr-idp-shibboleth.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://idp2.crous-toulouse.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2013-01-14T14:57:35Z">
-      <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">crous-toulouse.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">CROUS Toulouse - Personnels</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIEjzCCA3egAwIBAgIRAME/UgvFzamIAmhGwIYeY9owDQYJKoZIhvcNAQEFBQAw
-NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-IFNTTCBDQTAeFw0xMzAxMTEwMDAwMDBaFw0xNjAxMTEyMzU5NTlaMGMxCzAJBgNV
-BAYTAkZSMRcwFQYDVQQKEw5DUk9VUyBUT1VMT1VTRTEaMBgGA1UECxMRU0kgQ1JP
-VVMgVE9VTE9VU0UxHzAdBgNVBAMTFmlkcDIuY3JvdXMtdG91bG91c2UuZnIwggEi
-MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCzyRImYAKxZMm+oUs477vjb2xO
-nv22DLLO05BVPaprrr35zJ7Tksqvz0Oml4Sq4q8GjXuABsmoelldMNII47CTm1Bs
-LjDHULCXSo0PUTlBVUAqNV5DS25V3SbnOIcC7V5xVXpkC1GjSQuv4zCZhZpagD+p
-nnD4m7gEwmr36VbfFEDS82TM6n4twFIkLjRdhTL/gDeckkCtWTg2pAY047kwL4H6
-2nI1JFvA+dG2zAdhTpqiynaqBZAl0mimXax7M9Y5FKRRgeDkGZK5pg1RMLIzwZiE
-zocEwot6T4GCNOfhfQlLp2kw0UZNNshchYXbezuoTJDjWqHWY65F+kEimSNrAgMB
-AAGjggFpMIIBZTAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3V0fqkOO57TAdBgNV
-HQ4EFgQUwBQGVXMkSlvmojcHP99+u4MleawwDgYDVR0PAQH/BAQDAgWgMAwGA1Ud
-EwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMBgGA1UdIAQR
-MA8wDQYLKwYBBAGyMQECAh0wOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50
-Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUG
-CCsGAQUFBzAChilodHRwOi8vY3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENB
-LmNydDAmBggrBgEFBQcwAYYaaHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwIQYD
-VR0RBBowGIIWaWRwMi5jcm91cy10b3Vsb3VzZS5mcjANBgkqhkiG9w0BAQUFAAOC
-AQEAbCnMDjHKtr41LGUi4wzZ2ML4uMu7glEZGfPqwZbUbdYJPJ8ewZZQQRbzNRHs
-hPnZLPJDY44rD6/aJGVA5sBGbscho/wx1gBV904YNeLYXe/XQNW5M0Eqk2vL+ASx
-bTL8uHo0NLoMoF7MNHtBVTUgSwXUb1NdLz4bCafgc1th08gk1C+PoPbpbKxPEcgo
-aWPP1VSsnP3E5ZvhI4K84WeGDtUaJhXJ1Zpmp9Gs7XEOKoW4qAvkY3/3PqJ3MxId
-rcTdcsN5irAL3UeqWh8XE4uajiy9wlRatpgsq7TfgB7Ggl2mA/NwMMO245O3/uXO
-QjMsG/CW82hVf+vg7QGL9QVnIQ==
-					    </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://idp2.crous-toulouse.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp2.crous-toulouse.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp2.crous-toulouse.fr/idp/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">CROUS Toulouse - Personnels</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">CROUS Toulouse - Personnels</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <EmailAddress>systeme.reseau@crous-toulouse.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp2.crous-toulouse.fr.xml b/swamid-interfederations-2.0/idp2.crous-toulouse.fr.xml
deleted file mode 100644
index cb4e6083..00000000
--- a/swamid-interfederations-2.0/idp2.crous-toulouse.fr.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://idp2.crous-toulouse.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2013-01-14T14:57:35Z">
-      <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">crous-toulouse.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">CROUS Toulouse - Personnels</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIEjzCCA3egAwIBAgIRAME/UgvFzamIAmhGwIYeY9owDQYJKoZIhvcNAQEFBQAw
-NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-IFNTTCBDQTAeFw0xMzAxMTEwMDAwMDBaFw0xNjAxMTEyMzU5NTlaMGMxCzAJBgNV
-BAYTAkZSMRcwFQYDVQQKEw5DUk9VUyBUT1VMT1VTRTEaMBgGA1UECxMRU0kgQ1JP
-VVMgVE9VTE9VU0UxHzAdBgNVBAMTFmlkcDIuY3JvdXMtdG91bG91c2UuZnIwggEi
-MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCzyRImYAKxZMm+oUs477vjb2xO
-nv22DLLO05BVPaprrr35zJ7Tksqvz0Oml4Sq4q8GjXuABsmoelldMNII47CTm1Bs
-LjDHULCXSo0PUTlBVUAqNV5DS25V3SbnOIcC7V5xVXpkC1GjSQuv4zCZhZpagD+p
-nnD4m7gEwmr36VbfFEDS82TM6n4twFIkLjRdhTL/gDeckkCtWTg2pAY047kwL4H6
-2nI1JFvA+dG2zAdhTpqiynaqBZAl0mimXax7M9Y5FKRRgeDkGZK5pg1RMLIzwZiE
-zocEwot6T4GCNOfhfQlLp2kw0UZNNshchYXbezuoTJDjWqHWY65F+kEimSNrAgMB
-AAGjggFpMIIBZTAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3V0fqkOO57TAdBgNV
-HQ4EFgQUwBQGVXMkSlvmojcHP99+u4MleawwDgYDVR0PAQH/BAQDAgWgMAwGA1Ud
-EwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMBgGA1UdIAQR
-MA8wDQYLKwYBBAGyMQECAh0wOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50
-Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUG
-CCsGAQUFBzAChilodHRwOi8vY3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENB
-LmNydDAmBggrBgEFBQcwAYYaaHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwIQYD
-VR0RBBowGIIWaWRwMi5jcm91cy10b3Vsb3VzZS5mcjANBgkqhkiG9w0BAQUFAAOC
-AQEAbCnMDjHKtr41LGUi4wzZ2ML4uMu7glEZGfPqwZbUbdYJPJ8ewZZQQRbzNRHs
-hPnZLPJDY44rD6/aJGVA5sBGbscho/wx1gBV904YNeLYXe/XQNW5M0Eqk2vL+ASx
-bTL8uHo0NLoMoF7MNHtBVTUgSwXUb1NdLz4bCafgc1th08gk1C+PoPbpbKxPEcgo
-aWPP1VSsnP3E5ZvhI4K84WeGDtUaJhXJ1Zpmp9Gs7XEOKoW4qAvkY3/3PqJ3MxId
-rcTdcsN5irAL3UeqWh8XE4uajiy9wlRatpgsq7TfgB7Ggl2mA/NwMMO245O3/uXO
-QjMsG/CW82hVf+vg7QGL9QVnIQ==
-					    </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://idp2.crous-toulouse.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp2.crous-toulouse.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp2.crous-toulouse.fr/idp/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">CROUS Toulouse - Personnels</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">CROUS Toulouse - Personnels</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <EmailAddress>systeme.reseau@crous-toulouse.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp2.iay.org.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp2.iay.org.uk-idp-shibboleth.xml
deleted file mode 100644
index b2c2eb06..00000000
--- a/swamid-interfederations-2.0/idp2.iay.org.uk-idp-shibboleth.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://idp2.iay.org.uk/idp/shibboleth">
-  <!--
-		This is a "SDSS (Fountainhall)" project test IdP running outside the University environment for Ian A. Young.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2007-03-30T16:36:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</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>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">SDSS (Fountainhall)</mdui:DisplayName>
-        <mdui:Description xml:lang="en">This is the identity provider for the iay.org.uk domain.</mdui:Description>
-        <mdui:Logo height="80" width="80">https://idp2.iay.org.uk/images/heads_80x80.jpg</mdui:Logo>
-        <mdui:Logo height="43" width="100">https://idp2.iay.org.uk/images/heads_100x43.jpg</mdui:Logo>
-        <mdui:Logo height="104" width="240">https://idp2.iay.org.uk/images/heads_240x104.jpg</mdui:Logo>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:IPHint>217.155.173.104/29</mdui:IPHint>
-        <mdui:DomainHint>iay.org.uk</mdui:DomainHint>
-        <mdui:GeolocationHint>geo:55.9328,-3.17905</mdui:GeolocationHint>
-      </mdui:DiscoHints>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">iay.org.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDSTCCAjGgAwIBAgIhAMSPOSGN+3UUTXSKV+2EBOuF3x/pwPX/TD9GfyEkzLp+
-						MA0GCSqGSIb3DQEBBQUAMFgxGDAWBgNVBAMMD2lkcDIuaWF5Lm9yZy51azETMBEG
-						CgmSJomT8ixkARkWA2lheTETMBEGCgmSJomT8ixkARkWA29yZzESMBAGCgmSJomT
-						8ixkARkWAnVrMB4XDTA4MDIyNTEwMzAxNFoXDTI4MDIyNTEwMzAxNFowWDEYMBYG
-						A1UEAwwPaWRwMi5pYXkub3JnLnVrMRMwEQYKCZImiZPyLGQBGRYDaWF5MRMwEQYK
-						CZImiZPyLGQBGRYDb3JnMRIwEAYKCZImiZPyLGQBGRYCdWswggEiMA0GCSqGSIb3
-						DQEBAQUAA4IBDwAwggEKAoIBAQCb6ts48g10XHTnpy+23huzR184aahkrG0AoeUl
-						FVlomPjoFDk6czq0S3Qyd+ceF7tMRu3XzS7cMmtVH53O9d+wCs8aPQcPXxHQ5gLk
-						L7Gu6eJ+3N3jXhpt7/DDPhnzFPNW3EVMueHJ/0IzyspTvq2LPbNWXJ86NKJ+gesZ
-						QftskwXScOjpoJEIP0EA890QYd4WdYtQPqVV+LPKtnYBoGOnuRhSAM1D/EhCbeb0
-						lCmRGcdGbDFBchiPO4VLGl85sLa0EhjxMIPAOKXcj8bBlO9Ww9kkG06kQp6eLHwm
-						Jmt7VNKveCGhyF2QH/CvmdUaPv3gcp1UjrlqFN9LBVSaTIL/AgMBAAEwDQYJKoZI
-						hvcNAQEFBQADggEBAG+jDBAtlKoHaEBB+l6PpW5zuiDjyHG4zZZYqX77mZ9xP/xe
-						Kn0yJ18ZLjS3b9WztGLYyC4SJHSF2okq1K02bqsCv9YeP+UWpw2uRR8jt96lLWxZ
-						jTjoko2v8jBtzDk8LZsqw58m4vZ0AGNZjKeGIywKhxnepwREguyj3bjBpZAGgl0M
-						HQuXoO/BDC9yKyZslE5CpWp5xP4XzY2/LrorrkwOJLnFuk1sox4/gvkDQukUx/jr
-						YRbrWfOjcNBx3LE/HI6RNLINicK7yUwerDE86nix5Zc3hskVcCykW+r6HbY6bx7P
-						YmNKYMZhQAgDtXIjFHOy+WbyVTidmJvxM9UeYCY=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp2.iay.org.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp2.iay.org.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://idp2.iay.org.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp2.iay.org.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp2.iay.org.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp2.iay.org.uk/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="false">iay.org.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDSTCCAjGgAwIBAgIhAMSPOSGN+3UUTXSKV+2EBOuF3x/pwPX/TD9GfyEkzLp+
-						MA0GCSqGSIb3DQEBBQUAMFgxGDAWBgNVBAMMD2lkcDIuaWF5Lm9yZy51azETMBEG
-						CgmSJomT8ixkARkWA2lheTETMBEGCgmSJomT8ixkARkWA29yZzESMBAGCgmSJomT
-						8ixkARkWAnVrMB4XDTA4MDIyNTEwMzAxNFoXDTI4MDIyNTEwMzAxNFowWDEYMBYG
-						A1UEAwwPaWRwMi5pYXkub3JnLnVrMRMwEQYKCZImiZPyLGQBGRYDaWF5MRMwEQYK
-						CZImiZPyLGQBGRYDb3JnMRIwEAYKCZImiZPyLGQBGRYCdWswggEiMA0GCSqGSIb3
-						DQEBAQUAA4IBDwAwggEKAoIBAQCb6ts48g10XHTnpy+23huzR184aahkrG0AoeUl
-						FVlomPjoFDk6czq0S3Qyd+ceF7tMRu3XzS7cMmtVH53O9d+wCs8aPQcPXxHQ5gLk
-						L7Gu6eJ+3N3jXhpt7/DDPhnzFPNW3EVMueHJ/0IzyspTvq2LPbNWXJ86NKJ+gesZ
-						QftskwXScOjpoJEIP0EA890QYd4WdYtQPqVV+LPKtnYBoGOnuRhSAM1D/EhCbeb0
-						lCmRGcdGbDFBchiPO4VLGl85sLa0EhjxMIPAOKXcj8bBlO9Ww9kkG06kQp6eLHwm
-						Jmt7VNKveCGhyF2QH/CvmdUaPv3gcp1UjrlqFN9LBVSaTIL/AgMBAAEwDQYJKoZI
-						hvcNAQEFBQADggEBAG+jDBAtlKoHaEBB+l6PpW5zuiDjyHG4zZZYqX77mZ9xP/xe
-						Kn0yJ18ZLjS3b9WztGLYyC4SJHSF2okq1K02bqsCv9YeP+UWpw2uRR8jt96lLWxZ
-						jTjoko2v8jBtzDk8LZsqw58m4vZ0AGNZjKeGIywKhxnepwREguyj3bjBpZAGgl0M
-						HQuXoO/BDC9yKyZslE5CpWp5xP4XzY2/LrorrkwOJLnFuk1sox4/gvkDQukUx/jr
-						YRbrWfOjcNBx3LE/HI6RNLINicK7yUwerDE86nix5Zc3hskVcCykW+r6HbY6bx7P
-						YmNKYMZhQAgDtXIjFHOy+WbyVTidmJvxM9UeYCY=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp2.iay.org.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp2.iay.org.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">Ian A. Young</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">SDSS (Fountainhall)</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://iay.org.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Ian</GivenName>
-    <SurName>Young</SurName>
-    <EmailAddress>mailto:ukfed+fc2ee77e@iay.org.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Ian</GivenName>
-    <SurName>Young</SurName>
-    <EmailAddress>mailto:ukfed+fc2ee77e@iay.org.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp2.iay.org.uk.xml b/swamid-interfederations-2.0/idp2.iay.org.uk.xml
deleted file mode 100644
index b2c2eb06..00000000
--- a/swamid-interfederations-2.0/idp2.iay.org.uk.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://idp2.iay.org.uk/idp/shibboleth">
-  <!--
-		This is a "SDSS (Fountainhall)" project test IdP running outside the University environment for Ian A. Young.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2007-03-30T16:36:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</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>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">SDSS (Fountainhall)</mdui:DisplayName>
-        <mdui:Description xml:lang="en">This is the identity provider for the iay.org.uk domain.</mdui:Description>
-        <mdui:Logo height="80" width="80">https://idp2.iay.org.uk/images/heads_80x80.jpg</mdui:Logo>
-        <mdui:Logo height="43" width="100">https://idp2.iay.org.uk/images/heads_100x43.jpg</mdui:Logo>
-        <mdui:Logo height="104" width="240">https://idp2.iay.org.uk/images/heads_240x104.jpg</mdui:Logo>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:IPHint>217.155.173.104/29</mdui:IPHint>
-        <mdui:DomainHint>iay.org.uk</mdui:DomainHint>
-        <mdui:GeolocationHint>geo:55.9328,-3.17905</mdui:GeolocationHint>
-      </mdui:DiscoHints>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">iay.org.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDSTCCAjGgAwIBAgIhAMSPOSGN+3UUTXSKV+2EBOuF3x/pwPX/TD9GfyEkzLp+
-						MA0GCSqGSIb3DQEBBQUAMFgxGDAWBgNVBAMMD2lkcDIuaWF5Lm9yZy51azETMBEG
-						CgmSJomT8ixkARkWA2lheTETMBEGCgmSJomT8ixkARkWA29yZzESMBAGCgmSJomT
-						8ixkARkWAnVrMB4XDTA4MDIyNTEwMzAxNFoXDTI4MDIyNTEwMzAxNFowWDEYMBYG
-						A1UEAwwPaWRwMi5pYXkub3JnLnVrMRMwEQYKCZImiZPyLGQBGRYDaWF5MRMwEQYK
-						CZImiZPyLGQBGRYDb3JnMRIwEAYKCZImiZPyLGQBGRYCdWswggEiMA0GCSqGSIb3
-						DQEBAQUAA4IBDwAwggEKAoIBAQCb6ts48g10XHTnpy+23huzR184aahkrG0AoeUl
-						FVlomPjoFDk6czq0S3Qyd+ceF7tMRu3XzS7cMmtVH53O9d+wCs8aPQcPXxHQ5gLk
-						L7Gu6eJ+3N3jXhpt7/DDPhnzFPNW3EVMueHJ/0IzyspTvq2LPbNWXJ86NKJ+gesZ
-						QftskwXScOjpoJEIP0EA890QYd4WdYtQPqVV+LPKtnYBoGOnuRhSAM1D/EhCbeb0
-						lCmRGcdGbDFBchiPO4VLGl85sLa0EhjxMIPAOKXcj8bBlO9Ww9kkG06kQp6eLHwm
-						Jmt7VNKveCGhyF2QH/CvmdUaPv3gcp1UjrlqFN9LBVSaTIL/AgMBAAEwDQYJKoZI
-						hvcNAQEFBQADggEBAG+jDBAtlKoHaEBB+l6PpW5zuiDjyHG4zZZYqX77mZ9xP/xe
-						Kn0yJ18ZLjS3b9WztGLYyC4SJHSF2okq1K02bqsCv9YeP+UWpw2uRR8jt96lLWxZ
-						jTjoko2v8jBtzDk8LZsqw58m4vZ0AGNZjKeGIywKhxnepwREguyj3bjBpZAGgl0M
-						HQuXoO/BDC9yKyZslE5CpWp5xP4XzY2/LrorrkwOJLnFuk1sox4/gvkDQukUx/jr
-						YRbrWfOjcNBx3LE/HI6RNLINicK7yUwerDE86nix5Zc3hskVcCykW+r6HbY6bx7P
-						YmNKYMZhQAgDtXIjFHOy+WbyVTidmJvxM9UeYCY=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp2.iay.org.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp2.iay.org.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://idp2.iay.org.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp2.iay.org.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp2.iay.org.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp2.iay.org.uk/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="false">iay.org.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDSTCCAjGgAwIBAgIhAMSPOSGN+3UUTXSKV+2EBOuF3x/pwPX/TD9GfyEkzLp+
-						MA0GCSqGSIb3DQEBBQUAMFgxGDAWBgNVBAMMD2lkcDIuaWF5Lm9yZy51azETMBEG
-						CgmSJomT8ixkARkWA2lheTETMBEGCgmSJomT8ixkARkWA29yZzESMBAGCgmSJomT
-						8ixkARkWAnVrMB4XDTA4MDIyNTEwMzAxNFoXDTI4MDIyNTEwMzAxNFowWDEYMBYG
-						A1UEAwwPaWRwMi5pYXkub3JnLnVrMRMwEQYKCZImiZPyLGQBGRYDaWF5MRMwEQYK
-						CZImiZPyLGQBGRYDb3JnMRIwEAYKCZImiZPyLGQBGRYCdWswggEiMA0GCSqGSIb3
-						DQEBAQUAA4IBDwAwggEKAoIBAQCb6ts48g10XHTnpy+23huzR184aahkrG0AoeUl
-						FVlomPjoFDk6czq0S3Qyd+ceF7tMRu3XzS7cMmtVH53O9d+wCs8aPQcPXxHQ5gLk
-						L7Gu6eJ+3N3jXhpt7/DDPhnzFPNW3EVMueHJ/0IzyspTvq2LPbNWXJ86NKJ+gesZ
-						QftskwXScOjpoJEIP0EA890QYd4WdYtQPqVV+LPKtnYBoGOnuRhSAM1D/EhCbeb0
-						lCmRGcdGbDFBchiPO4VLGl85sLa0EhjxMIPAOKXcj8bBlO9Ww9kkG06kQp6eLHwm
-						Jmt7VNKveCGhyF2QH/CvmdUaPv3gcp1UjrlqFN9LBVSaTIL/AgMBAAEwDQYJKoZI
-						hvcNAQEFBQADggEBAG+jDBAtlKoHaEBB+l6PpW5zuiDjyHG4zZZYqX77mZ9xP/xe
-						Kn0yJ18ZLjS3b9WztGLYyC4SJHSF2okq1K02bqsCv9YeP+UWpw2uRR8jt96lLWxZ
-						jTjoko2v8jBtzDk8LZsqw58m4vZ0AGNZjKeGIywKhxnepwREguyj3bjBpZAGgl0M
-						HQuXoO/BDC9yKyZslE5CpWp5xP4XzY2/LrorrkwOJLnFuk1sox4/gvkDQukUx/jr
-						YRbrWfOjcNBx3LE/HI6RNLINicK7yUwerDE86nix5Zc3hskVcCykW+r6HbY6bx7P
-						YmNKYMZhQAgDtXIjFHOy+WbyVTidmJvxM9UeYCY=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp2.iay.org.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp2.iay.org.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">Ian A. Young</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">SDSS (Fountainhall)</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://iay.org.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Ian</GivenName>
-    <SurName>Young</SurName>
-    <EmailAddress>mailto:ukfed+fc2ee77e@iay.org.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Ian</GivenName>
-    <SurName>Young</SurName>
-    <EmailAddress>mailto:ukfed+fc2ee77e@iay.org.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp2.ics.muni.cz-idp-shibboleth.xml b/swamid-interfederations-2.0/idp2.ics.muni.cz-idp-shibboleth.xml
deleted file mode 100644
index 69dcaab9..00000000
--- a/swamid-interfederations-2.0/idp2.ics.muni.cz-idp-shibboleth.xml
+++ /dev/null
@@ -1,135 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp2.ics.muni.cz/idp/shibboleth">
-  <md:Extensions xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata">
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/" registrationInstant="2010-09-15T14:56:45Z">
-      <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>
-    <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://eduid.cz/uri/group/mefanet</saml:AttributeValue>
-        <saml:AttributeValue>http://eduid.cz/uri/idp-group/university</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md: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">muni.cz</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Masaryk University</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="cs">Masarykova univerzita</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Identity Provider for MU</mdui:Description>
-        <mdui:Description xml:lang="cs">Identity Provider pro MU</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.muni.cz/?lang=en</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="cs">http://www.muni.cz/</mdui:InformationURL>
-        <mdui:Logo height="40" width="40">https://idp2.ics.muni.cz/logo.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>
-MIIEajCCA1KgAwIBAgIQEi8JxmnGiL6xNZ8O2MTYZDANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTEyMTIxNzAwMDAwMFoXDTE1MTIxNzIzNTk1OVowRTELMAkGA1UE
-BhMCQ1oxGzAZBgNVBAoTEk1hc2FyeWsgVW5pdmVyc2l0eTEZMBcGA1UEAxMQaWRw
-Mi5pY3MubXVuaS5jejCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMQd
-LDOtSIbIrXUepE/6tvHPC8Ly7TjX7qfkaY/1qd+9QMgXNniLApfu9kCl/ZubelQJ
-nJbx5GJaxuS1RRl0Nuq5zf52OnOQxFrWtmrzticEMu5P1rDKcuQh4uk1Nztla599
-0xWUwVM3oZUQl4+O477j9bN5yvIVB4gsIp5Fj9rplt9lc8qud7nA6qxzM1UjE5eH
-s/NCsnTh5Ce6ocP1zEhVZBcG0yXOenWGo3LzclMk9Ffy8wnJ4fLaoTGVON1n31Dk
-zg3YJ6hxSo92X+iwdfYLoHVTPe6rQDxT7V8vO8zRdDqzvwRn39nSXrtGOp6bCXbk
-IrEo3UH1e490sCkkRVMCAwEAAaOCAWMwggFfMB8GA1UdIwQYMBaAFAy9k2gM896r
-o0lrKzdXR+qQ47ntMB0GA1UdDgQWBBRBJryty03ccYy/kmP60rnahOoGVTAOBgNV
-HQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYI
-KwYBBQUHAwIwGAYDVR0gBBEwDzANBgsrBgEEAbIxAQICHTA6BgNVHR8EMzAxMC+g
-LaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNybDBt
-BggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNzLnRlcmVu
-YS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8vb2NzcC50
-Y3MudGVyZW5hLm9yZzAbBgNVHREEFDASghBpZHAyLmljcy5tdW5pLmN6MA0GCSqG
-SIb3DQEBBQUAA4IBAQBSfzF1XO5gVygzYna/TZwXE1DUJfiTTiK8YYeU+bDKffkf
-O2+4F/N5Jij4C3s82EHP8otVXA4uXGWVvqbLCN+dSkN5zAeE7Hq48m1u/nYVyCKf
-pgLCkrg64JqIPIm8yF+bu9cvU0MbkzZTFCvbxnfqBQCKKfQ4Q6j3MiW12pfifIGe
-r+OsRrA4ZCo+6qGhA3bRfozFYUHCdJA+MxJhZzfcMae1MxK24wGMTSEabFlu6evm
-SJdlV4XPhmyysjuIHh3SnsS2NHpv0l04pT/JJV4shfZFHwqQS06ggNtpqysl3Y6O
-11KVcl/v2z6hhhjdrelepkLFCGKUVgpSOlcImQNb
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp2.ics.muni.cz:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp2.ics.muni.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>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp2.ics.muni.cz/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp2.ics.muni.cz/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp2.ics.muni.cz/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp2.ics.muni.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 xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">muni.cz</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIEajCCA1KgAwIBAgIQEi8JxmnGiL6xNZ8O2MTYZDANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTEyMTIxNzAwMDAwMFoXDTE1MTIxNzIzNTk1OVowRTELMAkGA1UE
-BhMCQ1oxGzAZBgNVBAoTEk1hc2FyeWsgVW5pdmVyc2l0eTEZMBcGA1UEAxMQaWRw
-Mi5pY3MubXVuaS5jejCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMQd
-LDOtSIbIrXUepE/6tvHPC8Ly7TjX7qfkaY/1qd+9QMgXNniLApfu9kCl/ZubelQJ
-nJbx5GJaxuS1RRl0Nuq5zf52OnOQxFrWtmrzticEMu5P1rDKcuQh4uk1Nztla599
-0xWUwVM3oZUQl4+O477j9bN5yvIVB4gsIp5Fj9rplt9lc8qud7nA6qxzM1UjE5eH
-s/NCsnTh5Ce6ocP1zEhVZBcG0yXOenWGo3LzclMk9Ffy8wnJ4fLaoTGVON1n31Dk
-zg3YJ6hxSo92X+iwdfYLoHVTPe6rQDxT7V8vO8zRdDqzvwRn39nSXrtGOp6bCXbk
-IrEo3UH1e490sCkkRVMCAwEAAaOCAWMwggFfMB8GA1UdIwQYMBaAFAy9k2gM896r
-o0lrKzdXR+qQ47ntMB0GA1UdDgQWBBRBJryty03ccYy/kmP60rnahOoGVTAOBgNV
-HQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYI
-KwYBBQUHAwIwGAYDVR0gBBEwDzANBgsrBgEEAbIxAQICHTA6BgNVHR8EMzAxMC+g
-LaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNybDBt
-BggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNzLnRlcmVu
-YS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8vb2NzcC50
-Y3MudGVyZW5hLm9yZzAbBgNVHREEFDASghBpZHAyLmljcy5tdW5pLmN6MA0GCSqG
-SIb3DQEBBQUAA4IBAQBSfzF1XO5gVygzYna/TZwXE1DUJfiTTiK8YYeU+bDKffkf
-O2+4F/N5Jij4C3s82EHP8otVXA4uXGWVvqbLCN+dSkN5zAeE7Hq48m1u/nYVyCKf
-pgLCkrg64JqIPIm8yF+bu9cvU0MbkzZTFCvbxnfqBQCKKfQ4Q6j3MiW12pfifIGe
-r+OsRrA4ZCo+6qGhA3bRfozFYUHCdJA+MxJhZzfcMae1MxK24wGMTSEabFlu6evm
-SJdlV4XPhmyysjuIHh3SnsS2NHpv0l04pT/JJV4shfZFHwqQS06ggNtpqysl3Y6O
-11KVcl/v2z6hhhjdrelepkLFCGKUVgpSOlcImQNb
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp2.ics.muni.cz:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp2.ics.muni.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>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="cs">Masarykova univerzita</OrganizationName>
-    <OrganizationName xml:lang="en">Masaryk University</OrganizationName>
-    <OrganizationDisplayName xml:lang="cs">Masarykova univerzita</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">Masaryk University</OrganizationDisplayName>
-    <OrganizationURL xml:lang="cs">http://www.muni.cz/</OrganizationURL>
-    <OrganizationURL xml:lang="en">http://www.muni.cz/?lang=en</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Radim</GivenName>
-    <SurName>Pesa</SurName>
-    <EmailAddress>pesa@ics.muni.cz</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Tomas</GivenName>
-    <SurName>Sapak</SurName>
-    <EmailAddress>sapakt@ics.muni.cz</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp2.ics.muni.cz.xml b/swamid-interfederations-2.0/idp2.ics.muni.cz.xml
deleted file mode 100644
index 69dcaab9..00000000
--- a/swamid-interfederations-2.0/idp2.ics.muni.cz.xml
+++ /dev/null
@@ -1,135 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp2.ics.muni.cz/idp/shibboleth">
-  <md:Extensions xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata">
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/" registrationInstant="2010-09-15T14:56:45Z">
-      <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>
-    <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://eduid.cz/uri/group/mefanet</saml:AttributeValue>
-        <saml:AttributeValue>http://eduid.cz/uri/idp-group/university</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md: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">muni.cz</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Masaryk University</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="cs">Masarykova univerzita</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Identity Provider for MU</mdui:Description>
-        <mdui:Description xml:lang="cs">Identity Provider pro MU</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.muni.cz/?lang=en</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="cs">http://www.muni.cz/</mdui:InformationURL>
-        <mdui:Logo height="40" width="40">https://idp2.ics.muni.cz/logo.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>
-MIIEajCCA1KgAwIBAgIQEi8JxmnGiL6xNZ8O2MTYZDANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTEyMTIxNzAwMDAwMFoXDTE1MTIxNzIzNTk1OVowRTELMAkGA1UE
-BhMCQ1oxGzAZBgNVBAoTEk1hc2FyeWsgVW5pdmVyc2l0eTEZMBcGA1UEAxMQaWRw
-Mi5pY3MubXVuaS5jejCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMQd
-LDOtSIbIrXUepE/6tvHPC8Ly7TjX7qfkaY/1qd+9QMgXNniLApfu9kCl/ZubelQJ
-nJbx5GJaxuS1RRl0Nuq5zf52OnOQxFrWtmrzticEMu5P1rDKcuQh4uk1Nztla599
-0xWUwVM3oZUQl4+O477j9bN5yvIVB4gsIp5Fj9rplt9lc8qud7nA6qxzM1UjE5eH
-s/NCsnTh5Ce6ocP1zEhVZBcG0yXOenWGo3LzclMk9Ffy8wnJ4fLaoTGVON1n31Dk
-zg3YJ6hxSo92X+iwdfYLoHVTPe6rQDxT7V8vO8zRdDqzvwRn39nSXrtGOp6bCXbk
-IrEo3UH1e490sCkkRVMCAwEAAaOCAWMwggFfMB8GA1UdIwQYMBaAFAy9k2gM896r
-o0lrKzdXR+qQ47ntMB0GA1UdDgQWBBRBJryty03ccYy/kmP60rnahOoGVTAOBgNV
-HQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYI
-KwYBBQUHAwIwGAYDVR0gBBEwDzANBgsrBgEEAbIxAQICHTA6BgNVHR8EMzAxMC+g
-LaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNybDBt
-BggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNzLnRlcmVu
-YS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8vb2NzcC50
-Y3MudGVyZW5hLm9yZzAbBgNVHREEFDASghBpZHAyLmljcy5tdW5pLmN6MA0GCSqG
-SIb3DQEBBQUAA4IBAQBSfzF1XO5gVygzYna/TZwXE1DUJfiTTiK8YYeU+bDKffkf
-O2+4F/N5Jij4C3s82EHP8otVXA4uXGWVvqbLCN+dSkN5zAeE7Hq48m1u/nYVyCKf
-pgLCkrg64JqIPIm8yF+bu9cvU0MbkzZTFCvbxnfqBQCKKfQ4Q6j3MiW12pfifIGe
-r+OsRrA4ZCo+6qGhA3bRfozFYUHCdJA+MxJhZzfcMae1MxK24wGMTSEabFlu6evm
-SJdlV4XPhmyysjuIHh3SnsS2NHpv0l04pT/JJV4shfZFHwqQS06ggNtpqysl3Y6O
-11KVcl/v2z6hhhjdrelepkLFCGKUVgpSOlcImQNb
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp2.ics.muni.cz:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp2.ics.muni.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>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp2.ics.muni.cz/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp2.ics.muni.cz/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp2.ics.muni.cz/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp2.ics.muni.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 xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">muni.cz</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIEajCCA1KgAwIBAgIQEi8JxmnGiL6xNZ8O2MTYZDANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTEyMTIxNzAwMDAwMFoXDTE1MTIxNzIzNTk1OVowRTELMAkGA1UE
-BhMCQ1oxGzAZBgNVBAoTEk1hc2FyeWsgVW5pdmVyc2l0eTEZMBcGA1UEAxMQaWRw
-Mi5pY3MubXVuaS5jejCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMQd
-LDOtSIbIrXUepE/6tvHPC8Ly7TjX7qfkaY/1qd+9QMgXNniLApfu9kCl/ZubelQJ
-nJbx5GJaxuS1RRl0Nuq5zf52OnOQxFrWtmrzticEMu5P1rDKcuQh4uk1Nztla599
-0xWUwVM3oZUQl4+O477j9bN5yvIVB4gsIp5Fj9rplt9lc8qud7nA6qxzM1UjE5eH
-s/NCsnTh5Ce6ocP1zEhVZBcG0yXOenWGo3LzclMk9Ffy8wnJ4fLaoTGVON1n31Dk
-zg3YJ6hxSo92X+iwdfYLoHVTPe6rQDxT7V8vO8zRdDqzvwRn39nSXrtGOp6bCXbk
-IrEo3UH1e490sCkkRVMCAwEAAaOCAWMwggFfMB8GA1UdIwQYMBaAFAy9k2gM896r
-o0lrKzdXR+qQ47ntMB0GA1UdDgQWBBRBJryty03ccYy/kmP60rnahOoGVTAOBgNV
-HQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYI
-KwYBBQUHAwIwGAYDVR0gBBEwDzANBgsrBgEEAbIxAQICHTA6BgNVHR8EMzAxMC+g
-LaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNybDBt
-BggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNzLnRlcmVu
-YS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8vb2NzcC50
-Y3MudGVyZW5hLm9yZzAbBgNVHREEFDASghBpZHAyLmljcy5tdW5pLmN6MA0GCSqG
-SIb3DQEBBQUAA4IBAQBSfzF1XO5gVygzYna/TZwXE1DUJfiTTiK8YYeU+bDKffkf
-O2+4F/N5Jij4C3s82EHP8otVXA4uXGWVvqbLCN+dSkN5zAeE7Hq48m1u/nYVyCKf
-pgLCkrg64JqIPIm8yF+bu9cvU0MbkzZTFCvbxnfqBQCKKfQ4Q6j3MiW12pfifIGe
-r+OsRrA4ZCo+6qGhA3bRfozFYUHCdJA+MxJhZzfcMae1MxK24wGMTSEabFlu6evm
-SJdlV4XPhmyysjuIHh3SnsS2NHpv0l04pT/JJV4shfZFHwqQS06ggNtpqysl3Y6O
-11KVcl/v2z6hhhjdrelepkLFCGKUVgpSOlcImQNb
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp2.ics.muni.cz:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp2.ics.muni.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>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="cs">Masarykova univerzita</OrganizationName>
-    <OrganizationName xml:lang="en">Masaryk University</OrganizationName>
-    <OrganizationDisplayName xml:lang="cs">Masarykova univerzita</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">Masaryk University</OrganizationDisplayName>
-    <OrganizationURL xml:lang="cs">http://www.muni.cz/</OrganizationURL>
-    <OrganizationURL xml:lang="en">http://www.muni.cz/?lang=en</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Radim</GivenName>
-    <SurName>Pesa</SurName>
-    <EmailAddress>pesa@ics.muni.cz</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Tomas</GivenName>
-    <SurName>Sapak</SurName>
-    <EmailAddress>sapakt@ics.muni.cz</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp2.idem.garr.it.xml b/swamid-interfederations-2.0/idp2.idem.garr.it.xml
deleted file mode 100644
index eec138f8..00000000
--- a/swamid-interfederations-2.0/idp2.idem.garr.it.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://idp2.idem.garr.it/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2012-04-30T09:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</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">garr.it</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">GARR Firenze IdP215</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Test Identity Provider for GARR IDEM service</mdui:Description>
-        <mdui:InformationURL xml:lang="en">https://login.dir.garr.it/IdPSupportPage/index.html</mdui:InformationURL>
-        <mdui:DisplayName xml:lang="it">GARR Firenze IdP215</mdui:DisplayName>
-        <mdui:Description xml:lang="it">Identity Provider di Test per il servizio IDEM GARR</mdui:Description>
-        <mdui:InformationURL xml:lang="it">https://login.dir.garr.it/IdPSupportPage/index.html</mdui:InformationURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-                            MIIDLzCCAhegAwIBAgIUIFuTnedSw+ncNzrawzn7HrEEKZEwDQYJKoZIhvcNAQEF
-                            BQAwHDEaMBgGA1UEAxMRaWRwMi5pZGVtLmdhcnIuaXQwHhcNMTMxMDIyMDgzODU4
-                            WhcNMzMxMDIyMDgzODU4WjAcMRowGAYDVQQDExFpZHAyLmlkZW0uZ2Fyci5pdDCC
-                            ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAI2qOdbYF27t06K2AweyYhID
-                            Fg26b4zFyjvhPBFkjKsE+xgWL58ryaxXN9hjFzXVunfZR0eIa4bMOlsn7wssqNrE
-                            0/ZJ7wMCC0/72JDs3ZcdLqwOzstRaW8HVjJkuksZymo/87W/lN5Ep323wO1RCzX9
-                            R0jRRSLcn+YPaXYu6QWUkcCqu8ElcJ7/ZecWUeGe5ZstR+p29PgFYpM4yH37oP7g
-                            5HG343eH0bXQIZMPNkUGvfc+BBxMQHEgDJGjUVJARwkPdeg2L+H1ckgX2IQYaEa2
-                            RRj1ALgai4C2HrwKeDiMfGajPk/SJyuebXwO6xBSlDujZwSBAGEv3BW+dQeyaKMC
-                            AwEAAaNpMGcwRgYDVR0RBD8wPYIRaWRwMi5pZGVtLmdhcnIuaXSGKGh0dHBzOi8v
-                            aWRwMi5pZGVtLmdhcnIuaXQvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFMNCFHnq
-                            ng82i/VxSLB0slGfNMJSMA0GCSqGSIb3DQEBBQUAA4IBAQA/2OWJ2RB5x17ZevUL
-                            kTZcnxEc0IZ1NrOURX6RV3rXUmcGjxgPA2hVgU5G1eNFtPFNhnRRXlOTQtpL7kPg
-                            Tro6oR6zF9133Hvqt5iF72MftTiIDJPrEdUwhDlUZNkPVDPPK2klKlFaLaAcWt94
-                            5LtPCeA8XydzB3EDGv2v1oW4M0Q/08Y4PR8h+xhpC5hhoa4b5W01koHJMiwMbeTc
-                            kkhaJKFWvSz+8OaYeuE2c7++E/wN1mMpCo5e5i6/yu+dOhG5wqt600w8CmPEsFKV
-                            6GUDU9KnP93i/usK+j/aNxxex5y88/iTZLOwywHbOkuIMx+0kn2Gryztv6DLXnCW
-                            gh97
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp2.idem.garr.it:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp2.idem.garr.it: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.idem.garr.it/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp2.idem.garr.it/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp2.idem.garr.it/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp2.idem.garr.it/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="false">garr.it</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-                            MIIDLzCCAhegAwIBAgIUIFuTnedSw+ncNzrawzn7HrEEKZEwDQYJKoZIhvcNAQEF
-                            BQAwHDEaMBgGA1UEAxMRaWRwMi5pZGVtLmdhcnIuaXQwHhcNMTMxMDIyMDgzODU4
-                            WhcNMzMxMDIyMDgzODU4WjAcMRowGAYDVQQDExFpZHAyLmlkZW0uZ2Fyci5pdDCC
-                            ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAI2qOdbYF27t06K2AweyYhID
-                            Fg26b4zFyjvhPBFkjKsE+xgWL58ryaxXN9hjFzXVunfZR0eIa4bMOlsn7wssqNrE
-                            0/ZJ7wMCC0/72JDs3ZcdLqwOzstRaW8HVjJkuksZymo/87W/lN5Ep323wO1RCzX9
-                            R0jRRSLcn+YPaXYu6QWUkcCqu8ElcJ7/ZecWUeGe5ZstR+p29PgFYpM4yH37oP7g
-                            5HG343eH0bXQIZMPNkUGvfc+BBxMQHEgDJGjUVJARwkPdeg2L+H1ckgX2IQYaEa2
-                            RRj1ALgai4C2HrwKeDiMfGajPk/SJyuebXwO6xBSlDujZwSBAGEv3BW+dQeyaKMC
-                            AwEAAaNpMGcwRgYDVR0RBD8wPYIRaWRwMi5pZGVtLmdhcnIuaXSGKGh0dHBzOi8v
-                            aWRwMi5pZGVtLmdhcnIuaXQvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFMNCFHnq
-                            ng82i/VxSLB0slGfNMJSMA0GCSqGSIb3DQEBBQUAA4IBAQA/2OWJ2RB5x17ZevUL
-                            kTZcnxEc0IZ1NrOURX6RV3rXUmcGjxgPA2hVgU5G1eNFtPFNhnRRXlOTQtpL7kPg
-                            Tro6oR6zF9133Hvqt5iF72MftTiIDJPrEdUwhDlUZNkPVDPPK2klKlFaLaAcWt94
-                            5LtPCeA8XydzB3EDGv2v1oW4M0Q/08Y4PR8h+xhpC5hhoa4b5W01koHJMiwMbeTc
-                            kkhaJKFWvSz+8OaYeuE2c7++E/wN1mMpCo5e5i6/yu+dOhG5wqt600w8CmPEsFKV
-                            6GUDU9KnP93i/usK+j/aNxxex5y88/iTZLOwywHbOkuIMx+0kn2Gryztv6DLXnCW
-                            gh97
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp2.idem.garr.it:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp2.idem.garr.it: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">GARR</OrganizationName>
-    <OrganizationName xml:lang="it">GARR</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">GARR, Test IdP in Florence</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="it">GARR, Test IdP Firenze</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.garr.it/b/eng</OrganizationURL>
-    <OrganizationURL xml:lang="it">http://www.garr.it</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <EmailAddress>idem-help@garr.it</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp2.kau.se-idp-shibboleth.xml b/swamid-interfederations-2.0/idp2.kau.se-idp-shibboleth.xml
deleted file mode 100644
index a578507e..00000000
--- a/swamid-interfederations-2.0/idp2.kau.se-idp-shibboleth.xml
+++ /dev/null
@@ -1,133 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp2.kau.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">kau.se</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="sv">Karlstads universitet</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Karlstad University</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Identity Provider för Karlstads universitet</mdui:Description>
-        <mdui:Description xml:lang="en">Identity Provider for Karlstad University</mdui:Description>
-        <mdui:InformationURL xml:lang="sv">http://www.kau.se</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">http://www.kau.se/en</mdui:InformationURL>
-        <mdui:Logo height="112" width="112">https://www.kau.se/sites/all/themes/kau/logo.png</mdui:Logo>
-        <mdui:Logo height="112" width="112" xml:lang="sv">https://www.kau.se/sites/all/themes/kau/logo.png</mdui:Logo>
-        <mdui:Logo height="112" width="112" xml:lang="en">https://www.kau.se/sites/all/themes/kau/logo.png</mdui:Logo>
-        <mdui:PrivacyStatementURL xml:lang="sv">http://www.kau.se/om-webbplatsen/juridisk-information</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="en">http://www.kau.se/en/about-this-website</mdui:PrivacyStatementURL>
-        <mdui:Keywords xml:lang="sv">kau karlstads+universitet karlstad+universitet karlstad+university</mdui:Keywords>
-        <mdui:Keywords xml:lang="en">kau karlstads+universitet karlstad+universitet karlstad+university</mdui:Keywords>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DomainHint>kau.se</mdui:DomainHint>
-        <mdui:IPHint>130.243.16.0/20</mdui:IPHint>
-        <mdui:IPHint>193.10.162.0/24</mdui:IPHint>
-        <mdui:IPHint>193.10.220.0/22</mdui:IPHint>
-        <mdui:IPHint>193.10.224.0/21</mdui:IPHint>
-        <mdui:IPHint>193.10.238.0/24</mdui:IPHint>
-        <mdui:IPHint>193.11.148.0/22</mdui:IPHint>
-        <mdui:IPHint>193.11.152.0/21</mdui:IPHint>
-        <mdui:IPHint>2001:6b0:34::0/48</mdui:IPHint>
-        <mdui:GeolocationHint>geo:59.4059,13.5816</mdui:GeolocationHint>
-      </mdui:DiscoHints>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDFzCCAf+gAwIBAgIUUONxidNrozH1GiZ1VI/uwwgWM8cwDQYJKoZIhvcNAQEF
-BQAwFjEUMBIGA1UEAxMLaWRwMi5rYXUuc2UwHhcNMTAxMDEzMTM1MjM0WhcNMzAx
-MDEzMTM1MjM0WjAWMRQwEgYDVQQDEwtpZHAyLmthdS5zZTCCASIwDQYJKoZIhvcN
-AQEBBQADggEPADCCAQoCggEBAILFxLkJloiLact4UjsWKH98lOkzm6VE2t9GQtUe
-DRYCY5prnaDRmsumqmMYLMZXT6DCT99oNLeeBeBfB+8JwqraYhDanGiRAENTrlbs
-jUTx4p5BYTBuo0rGpVZ8MBi++f8ainvxPI4LGVc02upuG7lhWnjaui2qpKQf9hFB
-mqnjgL2ohS/Jhzo7q5XiEtsTtoD4ssUMabbzK9Zc5x6/txxJVAaicOHhqgXhFkkD
-AfC86PbWim6S8BpX0f8ERcYYKAm58ES/tpgZeImVmIIyHAIHPukjUKXNzuDKh9qa
-3LXp5moCeQKI385mw1BnkwTTqdwZ0Y5QHdYIMfB59VuUPm0CAwEAAaNdMFswOgYD
-VR0RBDMwMYILaWRwMi5rYXUuc2WGImh0dHBzOi8vaWRwMi5rYXUuc2UvaWRwL3No
-aWJib2xldGgwHQYDVR0OBBYEFLywmXKV+OaPFHmRtKgA7vepw1CtMA0GCSqGSIb3
-DQEBBQUAA4IBAQBRG+Zr9oXM/S7WHGRlTuwcXLEqy1jETAre9e2JUJLCYeEQdUor
-W5fETZtgs1DwGvfuquLRFxvIGtnIgELy1Q9eDGszursIl+cY6kv72pl+wP+QvI0U
-GWysjsYepf78eRQ4sNKn/m+2p7ZBfLFixNdTn1nvIGSaPX+8SnOrYfrqLYXZVZuF
-HntH8R43Oh0amq0BYWSJOhhmT4nxpvwwQCETd+RTqyB0SDtXnjYKv7j505JEBltt
-GLzVTSRgddMNMJEIMmpc6L9XAwW1IObqe3HcLewUmWZgtGKnq1Dd1XPtTRjvQPg9
-7FShqSitkM9DR4N7PbfMlbcB71JnezGMtokE
-
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp2.kau.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp2.kau.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.kau.se/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp2.kau.se/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp2.kau.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp2.kau.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">kau.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDFzCCAf+gAwIBAgIUUONxidNrozH1GiZ1VI/uwwgWM8cwDQYJKoZIhvcNAQEF
-BQAwFjEUMBIGA1UEAxMLaWRwMi5rYXUuc2UwHhcNMTAxMDEzMTM1MjM0WhcNMzAx
-MDEzMTM1MjM0WjAWMRQwEgYDVQQDEwtpZHAyLmthdS5zZTCCASIwDQYJKoZIhvcN
-AQEBBQADggEPADCCAQoCggEBAILFxLkJloiLact4UjsWKH98lOkzm6VE2t9GQtUe
-DRYCY5prnaDRmsumqmMYLMZXT6DCT99oNLeeBeBfB+8JwqraYhDanGiRAENTrlbs
-jUTx4p5BYTBuo0rGpVZ8MBi++f8ainvxPI4LGVc02upuG7lhWnjaui2qpKQf9hFB
-mqnjgL2ohS/Jhzo7q5XiEtsTtoD4ssUMabbzK9Zc5x6/txxJVAaicOHhqgXhFkkD
-AfC86PbWim6S8BpX0f8ERcYYKAm58ES/tpgZeImVmIIyHAIHPukjUKXNzuDKh9qa
-3LXp5moCeQKI385mw1BnkwTTqdwZ0Y5QHdYIMfB59VuUPm0CAwEAAaNdMFswOgYD
-VR0RBDMwMYILaWRwMi5rYXUuc2WGImh0dHBzOi8vaWRwMi5rYXUuc2UvaWRwL3No
-aWJib2xldGgwHQYDVR0OBBYEFLywmXKV+OaPFHmRtKgA7vepw1CtMA0GCSqGSIb3
-DQEBBQUAA4IBAQBRG+Zr9oXM/S7WHGRlTuwcXLEqy1jETAre9e2JUJLCYeEQdUor
-W5fETZtgs1DwGvfuquLRFxvIGtnIgELy1Q9eDGszursIl+cY6kv72pl+wP+QvI0U
-GWysjsYepf78eRQ4sNKn/m+2p7ZBfLFixNdTn1nvIGSaPX+8SnOrYfrqLYXZVZuF
-HntH8R43Oh0amq0BYWSJOhhmT4nxpvwwQCETd+RTqyB0SDtXnjYKv7j505JEBltt
-GLzVTSRgddMNMJEIMmpc6L9XAwW1IObqe3HcLewUmWZgtGKnq1Dd1XPtTRjvQPg9
-7FShqSitkM9DR4N7PbfMlbcB71JnezGMtokE
-
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp2.kau.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp2.kau.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">KAU</OrganizationName>
-    <OrganizationDisplayName xml:lang="sv">Karlstads Universitet</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">Karlstad University</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.kau.se</OrganizationURL>
-  </Organization>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
-    <Company>Karlstad University</Company>
-    <SurName>IT-avdelningen</SurName>
-    <EmailAddress>webbteknik@kau.se</EmailAddress>
-    <TelephoneNumber>+46 54 700 2200</TelephoneNumber>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
-    <Company>Karlstad University</Company>
-    <SurName>Paul Scott</SurName>
-    <EmailAddress>paul.scott@kau.se</EmailAddress>
-    <TelephoneNumber>+46 54 700 2307</TelephoneNumber>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
-    <Company>Karlstad University</Company>
-    <SurName>IT-avdelningen Karlstads universitet</SurName>
-    <EmailAddress>datasupport@kau.se</EmailAddress>
-    <TelephoneNumber>+46 54 700 2200</TelephoneNumber>
-  </ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp2.kau.se.xml b/swamid-interfederations-2.0/idp2.kau.se.xml
deleted file mode 100644
index a578507e..00000000
--- a/swamid-interfederations-2.0/idp2.kau.se.xml
+++ /dev/null
@@ -1,133 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp2.kau.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">kau.se</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="sv">Karlstads universitet</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Karlstad University</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Identity Provider för Karlstads universitet</mdui:Description>
-        <mdui:Description xml:lang="en">Identity Provider for Karlstad University</mdui:Description>
-        <mdui:InformationURL xml:lang="sv">http://www.kau.se</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">http://www.kau.se/en</mdui:InformationURL>
-        <mdui:Logo height="112" width="112">https://www.kau.se/sites/all/themes/kau/logo.png</mdui:Logo>
-        <mdui:Logo height="112" width="112" xml:lang="sv">https://www.kau.se/sites/all/themes/kau/logo.png</mdui:Logo>
-        <mdui:Logo height="112" width="112" xml:lang="en">https://www.kau.se/sites/all/themes/kau/logo.png</mdui:Logo>
-        <mdui:PrivacyStatementURL xml:lang="sv">http://www.kau.se/om-webbplatsen/juridisk-information</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="en">http://www.kau.se/en/about-this-website</mdui:PrivacyStatementURL>
-        <mdui:Keywords xml:lang="sv">kau karlstads+universitet karlstad+universitet karlstad+university</mdui:Keywords>
-        <mdui:Keywords xml:lang="en">kau karlstads+universitet karlstad+universitet karlstad+university</mdui:Keywords>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DomainHint>kau.se</mdui:DomainHint>
-        <mdui:IPHint>130.243.16.0/20</mdui:IPHint>
-        <mdui:IPHint>193.10.162.0/24</mdui:IPHint>
-        <mdui:IPHint>193.10.220.0/22</mdui:IPHint>
-        <mdui:IPHint>193.10.224.0/21</mdui:IPHint>
-        <mdui:IPHint>193.10.238.0/24</mdui:IPHint>
-        <mdui:IPHint>193.11.148.0/22</mdui:IPHint>
-        <mdui:IPHint>193.11.152.0/21</mdui:IPHint>
-        <mdui:IPHint>2001:6b0:34::0/48</mdui:IPHint>
-        <mdui:GeolocationHint>geo:59.4059,13.5816</mdui:GeolocationHint>
-      </mdui:DiscoHints>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDFzCCAf+gAwIBAgIUUONxidNrozH1GiZ1VI/uwwgWM8cwDQYJKoZIhvcNAQEF
-BQAwFjEUMBIGA1UEAxMLaWRwMi5rYXUuc2UwHhcNMTAxMDEzMTM1MjM0WhcNMzAx
-MDEzMTM1MjM0WjAWMRQwEgYDVQQDEwtpZHAyLmthdS5zZTCCASIwDQYJKoZIhvcN
-AQEBBQADggEPADCCAQoCggEBAILFxLkJloiLact4UjsWKH98lOkzm6VE2t9GQtUe
-DRYCY5prnaDRmsumqmMYLMZXT6DCT99oNLeeBeBfB+8JwqraYhDanGiRAENTrlbs
-jUTx4p5BYTBuo0rGpVZ8MBi++f8ainvxPI4LGVc02upuG7lhWnjaui2qpKQf9hFB
-mqnjgL2ohS/Jhzo7q5XiEtsTtoD4ssUMabbzK9Zc5x6/txxJVAaicOHhqgXhFkkD
-AfC86PbWim6S8BpX0f8ERcYYKAm58ES/tpgZeImVmIIyHAIHPukjUKXNzuDKh9qa
-3LXp5moCeQKI385mw1BnkwTTqdwZ0Y5QHdYIMfB59VuUPm0CAwEAAaNdMFswOgYD
-VR0RBDMwMYILaWRwMi5rYXUuc2WGImh0dHBzOi8vaWRwMi5rYXUuc2UvaWRwL3No
-aWJib2xldGgwHQYDVR0OBBYEFLywmXKV+OaPFHmRtKgA7vepw1CtMA0GCSqGSIb3
-DQEBBQUAA4IBAQBRG+Zr9oXM/S7WHGRlTuwcXLEqy1jETAre9e2JUJLCYeEQdUor
-W5fETZtgs1DwGvfuquLRFxvIGtnIgELy1Q9eDGszursIl+cY6kv72pl+wP+QvI0U
-GWysjsYepf78eRQ4sNKn/m+2p7ZBfLFixNdTn1nvIGSaPX+8SnOrYfrqLYXZVZuF
-HntH8R43Oh0amq0BYWSJOhhmT4nxpvwwQCETd+RTqyB0SDtXnjYKv7j505JEBltt
-GLzVTSRgddMNMJEIMmpc6L9XAwW1IObqe3HcLewUmWZgtGKnq1Dd1XPtTRjvQPg9
-7FShqSitkM9DR4N7PbfMlbcB71JnezGMtokE
-
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp2.kau.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp2.kau.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.kau.se/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp2.kau.se/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp2.kau.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp2.kau.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">kau.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDFzCCAf+gAwIBAgIUUONxidNrozH1GiZ1VI/uwwgWM8cwDQYJKoZIhvcNAQEF
-BQAwFjEUMBIGA1UEAxMLaWRwMi5rYXUuc2UwHhcNMTAxMDEzMTM1MjM0WhcNMzAx
-MDEzMTM1MjM0WjAWMRQwEgYDVQQDEwtpZHAyLmthdS5zZTCCASIwDQYJKoZIhvcN
-AQEBBQADggEPADCCAQoCggEBAILFxLkJloiLact4UjsWKH98lOkzm6VE2t9GQtUe
-DRYCY5prnaDRmsumqmMYLMZXT6DCT99oNLeeBeBfB+8JwqraYhDanGiRAENTrlbs
-jUTx4p5BYTBuo0rGpVZ8MBi++f8ainvxPI4LGVc02upuG7lhWnjaui2qpKQf9hFB
-mqnjgL2ohS/Jhzo7q5XiEtsTtoD4ssUMabbzK9Zc5x6/txxJVAaicOHhqgXhFkkD
-AfC86PbWim6S8BpX0f8ERcYYKAm58ES/tpgZeImVmIIyHAIHPukjUKXNzuDKh9qa
-3LXp5moCeQKI385mw1BnkwTTqdwZ0Y5QHdYIMfB59VuUPm0CAwEAAaNdMFswOgYD
-VR0RBDMwMYILaWRwMi5rYXUuc2WGImh0dHBzOi8vaWRwMi5rYXUuc2UvaWRwL3No
-aWJib2xldGgwHQYDVR0OBBYEFLywmXKV+OaPFHmRtKgA7vepw1CtMA0GCSqGSIb3
-DQEBBQUAA4IBAQBRG+Zr9oXM/S7WHGRlTuwcXLEqy1jETAre9e2JUJLCYeEQdUor
-W5fETZtgs1DwGvfuquLRFxvIGtnIgELy1Q9eDGszursIl+cY6kv72pl+wP+QvI0U
-GWysjsYepf78eRQ4sNKn/m+2p7ZBfLFixNdTn1nvIGSaPX+8SnOrYfrqLYXZVZuF
-HntH8R43Oh0amq0BYWSJOhhmT4nxpvwwQCETd+RTqyB0SDtXnjYKv7j505JEBltt
-GLzVTSRgddMNMJEIMmpc6L9XAwW1IObqe3HcLewUmWZgtGKnq1Dd1XPtTRjvQPg9
-7FShqSitkM9DR4N7PbfMlbcB71JnezGMtokE
-
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp2.kau.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp2.kau.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">KAU</OrganizationName>
-    <OrganizationDisplayName xml:lang="sv">Karlstads Universitet</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">Karlstad University</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.kau.se</OrganizationURL>
-  </Organization>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
-    <Company>Karlstad University</Company>
-    <SurName>IT-avdelningen</SurName>
-    <EmailAddress>webbteknik@kau.se</EmailAddress>
-    <TelephoneNumber>+46 54 700 2200</TelephoneNumber>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
-    <Company>Karlstad University</Company>
-    <SurName>Paul Scott</SurName>
-    <EmailAddress>paul.scott@kau.se</EmailAddress>
-    <TelephoneNumber>+46 54 700 2307</TelephoneNumber>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
-    <Company>Karlstad University</Company>
-    <SurName>IT-avdelningen Karlstads universitet</SurName>
-    <EmailAddress>datasupport@kau.se</EmailAddress>
-    <TelephoneNumber>+46 54 700 2200</TelephoneNumber>
-  </ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp2.redclara.net-idp-shibboleth.xml b/swamid-interfederations-2.0/idp2.redclara.net-idp-shibboleth.xml
deleted file mode 100644
index 827cfe19..00000000
--- a/swamid-interfederations-2.0/idp2.redclara.net-idp-shibboleth.xml
+++ /dev/null
@@ -1,139 +0,0 @@
-<?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.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>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIGXDCCBUSgAwIBAgIDEE36MA0GCSqGSIb3DQEBBQUAMIGMMQswCQYDVQQGEwJJ
-TDEWMBQGA1UEChMNU3RhcnRDb20gTHRkLjErMCkGA1UECxMiU2VjdXJlIERpZ2l0
-YWwgQ2VydGlmaWNhdGUgU2lnbmluZzE4MDYGA1UEAxMvU3RhcnRDb20gQ2xhc3Mg
-MSBQcmltYXJ5IEludGVybWVkaWF0ZSBTZXJ2ZXIgQ0EwHhcNMTQwNTA1MDk0MTU4
-WhcNMTUwNTA1MTYzNjQyWjBsMRkwFwYDVQQNExBIRkVrbXIzMEliM2VrYzgyMQsw
-CQYDVQQGEwJVWTEaMBgGA1UEAxMRaWRwMi5yZWRjbGFyYS5uZXQxJjAkBgkqhkiG
-9w0BCQEWF3Bvc3RtYXN0ZXJAcmVkY2xhcmEubmV0MIIBIjANBgkqhkiG9w0BAQEF
-AAOCAQ8AMIIBCgKCAQEA789b8ZQhtUF0MlgLSW1ARfe8RIm2OmXBlMc9gdjrPF4Y
-rKySIm/wDmzwzVG0AhL9/OwRleXs+RrEPyo6/k5z1RxNIHs5y8CcnNFRAxFMWIFZ
-qrkDYfMo/GJcM1BHJ1HoTNKcXviVXvzag5Ca1h3Nogp8Sdp8K+vdIozT5URWmkbU
-JGnRdr82MqvqT4IpFSJ5bUPe1G50cV82h0zQvDVTlk2mo4GFS/B+g1t6yA3dlQn6
-O7gCz+LU/3rDiS/XnI2Qk50k/oNEBGq5VLRv68dv5JnAl17AWWi18dGDKSTY0Zds
-ER9Kn6eFH+4PSnB9IyVxAmjeG85d79PqQBpO4qzu3wIDAQABo4IC5DCCAuAwCQYD
-VR0TBAIwADALBgNVHQ8EBAMCA6gwEwYDVR0lBAwwCgYIKwYBBQUHAwEwHQYDVR0O
-BBYEFO43JOeGzab8H3c9zLqeuFlaDcOKMB8GA1UdIwQYMBaAFOtCNNCYsKuf9Btr
-CPfMZC7vDixFMCoGA1UdEQQjMCGCEWlkcDIucmVkY2xhcmEubmV0ggxyZWRjbGFy
-YS5uZXQwggFWBgNVHSAEggFNMIIBSTAIBgZngQwBAgEwggE7BgsrBgEEAYG1NwEC
-AzCCASowLgYIKwYBBQUHAgEWImh0dHA6Ly93d3cuc3RhcnRzc2wuY29tL3BvbGlj
-eS5wZGYwgfcGCCsGAQUFBwICMIHqMCcWIFN0YXJ0Q29tIENlcnRpZmljYXRpb24g
-QXV0aG9yaXR5MAMCAQEagb5UaGlzIGNlcnRpZmljYXRlIHdhcyBpc3N1ZWQgYWNj
-b3JkaW5nIHRvIHRoZSBDbGFzcyAxIFZhbGlkYXRpb24gcmVxdWlyZW1lbnRzIG9m
-IHRoZSBTdGFydENvbSBDQSBwb2xpY3ksIHJlbGlhbmNlIG9ubHkgZm9yIHRoZSBp
-bnRlbmRlZCBwdXJwb3NlIGluIGNvbXBsaWFuY2Ugb2YgdGhlIHJlbHlpbmcgcGFy
-dHkgb2JsaWdhdGlvbnMuMDUGA1UdHwQuMCwwKqAooCaGJGh0dHA6Ly9jcmwuc3Rh
-cnRzc2wuY29tL2NydDEtY3JsLmNybDCBjgYIKwYBBQUHAQEEgYEwfzA5BggrBgEF
-BQcwAYYtaHR0cDovL29jc3Auc3RhcnRzc2wuY29tL3N1Yi9jbGFzczEvc2VydmVy
-L2NhMEIGCCsGAQUFBzAChjZodHRwOi8vYWlhLnN0YXJ0c3NsLmNvbS9jZXJ0cy9z
-dWIuY2xhc3MxLnNlcnZlci5jYS5jcnQwIwYDVR0SBBwwGoYYaHR0cDovL3d3dy5z
-dGFydHNzbC5jb20vMA0GCSqGSIb3DQEBBQUAA4IBAQAi6p7SBeDWUNY52CEwi/Cy
-aDobEkEhR2afn6U1Aa7GEYnQ3fLHdmINfXA6n7JIApWsgD9PML6czu7H1X+DsLAK
-quKoDM/9IGe6yhLlKfH2tBxwGcFo8guaKNZd9HztOONj7dkNvGwX9uzMVAXarCw/
-+P5NwH3C2Ay5ZJs5oLIh4y6yCS3/I1exOQqIBlZPdIQxqVt2B4Fm0mWXENfpA9N3
-RWQrN7vxHeMorebLpkx6Z8+tw3Svi9Z2oP1vPbnUJpFragDqNoZw6K9Crf/JTqD9
-HtCRp1bLRxJ4Ysu5HdV+kAcTelR3MyDYe/gAGAb5Wu7hmNn3NAwwrFn0TygkPzvl
-</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>
-MIIGXDCCBUSgAwIBAgIDEE36MA0GCSqGSIb3DQEBBQUAMIGMMQswCQYDVQQGEwJJ
-TDEWMBQGA1UEChMNU3RhcnRDb20gTHRkLjErMCkGA1UECxMiU2VjdXJlIERpZ2l0
-YWwgQ2VydGlmaWNhdGUgU2lnbmluZzE4MDYGA1UEAxMvU3RhcnRDb20gQ2xhc3Mg
-MSBQcmltYXJ5IEludGVybWVkaWF0ZSBTZXJ2ZXIgQ0EwHhcNMTQwNTA1MDk0MTU4
-WhcNMTUwNTA1MTYzNjQyWjBsMRkwFwYDVQQNExBIRkVrbXIzMEliM2VrYzgyMQsw
-CQYDVQQGEwJVWTEaMBgGA1UEAxMRaWRwMi5yZWRjbGFyYS5uZXQxJjAkBgkqhkiG
-9w0BCQEWF3Bvc3RtYXN0ZXJAcmVkY2xhcmEubmV0MIIBIjANBgkqhkiG9w0BAQEF
-AAOCAQ8AMIIBCgKCAQEA789b8ZQhtUF0MlgLSW1ARfe8RIm2OmXBlMc9gdjrPF4Y
-rKySIm/wDmzwzVG0AhL9/OwRleXs+RrEPyo6/k5z1RxNIHs5y8CcnNFRAxFMWIFZ
-qrkDYfMo/GJcM1BHJ1HoTNKcXviVXvzag5Ca1h3Nogp8Sdp8K+vdIozT5URWmkbU
-JGnRdr82MqvqT4IpFSJ5bUPe1G50cV82h0zQvDVTlk2mo4GFS/B+g1t6yA3dlQn6
-O7gCz+LU/3rDiS/XnI2Qk50k/oNEBGq5VLRv68dv5JnAl17AWWi18dGDKSTY0Zds
-ER9Kn6eFH+4PSnB9IyVxAmjeG85d79PqQBpO4qzu3wIDAQABo4IC5DCCAuAwCQYD
-VR0TBAIwADALBgNVHQ8EBAMCA6gwEwYDVR0lBAwwCgYIKwYBBQUHAwEwHQYDVR0O
-BBYEFO43JOeGzab8H3c9zLqeuFlaDcOKMB8GA1UdIwQYMBaAFOtCNNCYsKuf9Btr
-CPfMZC7vDixFMCoGA1UdEQQjMCGCEWlkcDIucmVkY2xhcmEubmV0ggxyZWRjbGFy
-YS5uZXQwggFWBgNVHSAEggFNMIIBSTAIBgZngQwBAgEwggE7BgsrBgEEAYG1NwEC
-AzCCASowLgYIKwYBBQUHAgEWImh0dHA6Ly93d3cuc3RhcnRzc2wuY29tL3BvbGlj
-eS5wZGYwgfcGCCsGAQUFBwICMIHqMCcWIFN0YXJ0Q29tIENlcnRpZmljYXRpb24g
-QXV0aG9yaXR5MAMCAQEagb5UaGlzIGNlcnRpZmljYXRlIHdhcyBpc3N1ZWQgYWNj
-b3JkaW5nIHRvIHRoZSBDbGFzcyAxIFZhbGlkYXRpb24gcmVxdWlyZW1lbnRzIG9m
-IHRoZSBTdGFydENvbSBDQSBwb2xpY3ksIHJlbGlhbmNlIG9ubHkgZm9yIHRoZSBp
-bnRlbmRlZCBwdXJwb3NlIGluIGNvbXBsaWFuY2Ugb2YgdGhlIHJlbHlpbmcgcGFy
-dHkgb2JsaWdhdGlvbnMuMDUGA1UdHwQuMCwwKqAooCaGJGh0dHA6Ly9jcmwuc3Rh
-cnRzc2wuY29tL2NydDEtY3JsLmNybDCBjgYIKwYBBQUHAQEEgYEwfzA5BggrBgEF
-BQcwAYYtaHR0cDovL29jc3Auc3RhcnRzc2wuY29tL3N1Yi9jbGFzczEvc2VydmVy
-L2NhMEIGCCsGAQUFBzAChjZodHRwOi8vYWlhLnN0YXJ0c3NsLmNvbS9jZXJ0cy9z
-dWIuY2xhc3MxLnNlcnZlci5jYS5jcnQwIwYDVR0SBBwwGoYYaHR0cDovL3d3dy5z
-dGFydHNzbC5jb20vMA0GCSqGSIb3DQEBBQUAA4IBAQAi6p7SBeDWUNY52CEwi/Cy
-aDobEkEhR2afn6U1Aa7GEYnQ3fLHdmINfXA6n7JIApWsgD9PML6czu7H1X+DsLAK
-quKoDM/9IGe6yhLlKfH2tBxwGcFo8guaKNZd9HztOONj7dkNvGwX9uzMVAXarCw/
-+P5NwH3C2Ay5ZJs5oLIh4y6yCS3/I1exOQqIBlZPdIQxqVt2B4Fm0mWXENfpA9N3
-RWQrN7vxHeMorebLpkx6Z8+tw3Svi9Z2oP1vPbnUJpFragDqNoZw6K9Crf/JTqD9
-HtCRp1bLRxJ4Ysu5HdV+kAcTelR3MyDYe/gAGAb5Wu7hmNn3NAwwrFn0TygkPzvl
-</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">http://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/idp2.redclara.net.xml b/swamid-interfederations-2.0/idp2.redclara.net.xml
deleted file mode 100644
index 827cfe19..00000000
--- a/swamid-interfederations-2.0/idp2.redclara.net.xml
+++ /dev/null
@@ -1,139 +0,0 @@
-<?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.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>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIGXDCCBUSgAwIBAgIDEE36MA0GCSqGSIb3DQEBBQUAMIGMMQswCQYDVQQGEwJJ
-TDEWMBQGA1UEChMNU3RhcnRDb20gTHRkLjErMCkGA1UECxMiU2VjdXJlIERpZ2l0
-YWwgQ2VydGlmaWNhdGUgU2lnbmluZzE4MDYGA1UEAxMvU3RhcnRDb20gQ2xhc3Mg
-MSBQcmltYXJ5IEludGVybWVkaWF0ZSBTZXJ2ZXIgQ0EwHhcNMTQwNTA1MDk0MTU4
-WhcNMTUwNTA1MTYzNjQyWjBsMRkwFwYDVQQNExBIRkVrbXIzMEliM2VrYzgyMQsw
-CQYDVQQGEwJVWTEaMBgGA1UEAxMRaWRwMi5yZWRjbGFyYS5uZXQxJjAkBgkqhkiG
-9w0BCQEWF3Bvc3RtYXN0ZXJAcmVkY2xhcmEubmV0MIIBIjANBgkqhkiG9w0BAQEF
-AAOCAQ8AMIIBCgKCAQEA789b8ZQhtUF0MlgLSW1ARfe8RIm2OmXBlMc9gdjrPF4Y
-rKySIm/wDmzwzVG0AhL9/OwRleXs+RrEPyo6/k5z1RxNIHs5y8CcnNFRAxFMWIFZ
-qrkDYfMo/GJcM1BHJ1HoTNKcXviVXvzag5Ca1h3Nogp8Sdp8K+vdIozT5URWmkbU
-JGnRdr82MqvqT4IpFSJ5bUPe1G50cV82h0zQvDVTlk2mo4GFS/B+g1t6yA3dlQn6
-O7gCz+LU/3rDiS/XnI2Qk50k/oNEBGq5VLRv68dv5JnAl17AWWi18dGDKSTY0Zds
-ER9Kn6eFH+4PSnB9IyVxAmjeG85d79PqQBpO4qzu3wIDAQABo4IC5DCCAuAwCQYD
-VR0TBAIwADALBgNVHQ8EBAMCA6gwEwYDVR0lBAwwCgYIKwYBBQUHAwEwHQYDVR0O
-BBYEFO43JOeGzab8H3c9zLqeuFlaDcOKMB8GA1UdIwQYMBaAFOtCNNCYsKuf9Btr
-CPfMZC7vDixFMCoGA1UdEQQjMCGCEWlkcDIucmVkY2xhcmEubmV0ggxyZWRjbGFy
-YS5uZXQwggFWBgNVHSAEggFNMIIBSTAIBgZngQwBAgEwggE7BgsrBgEEAYG1NwEC
-AzCCASowLgYIKwYBBQUHAgEWImh0dHA6Ly93d3cuc3RhcnRzc2wuY29tL3BvbGlj
-eS5wZGYwgfcGCCsGAQUFBwICMIHqMCcWIFN0YXJ0Q29tIENlcnRpZmljYXRpb24g
-QXV0aG9yaXR5MAMCAQEagb5UaGlzIGNlcnRpZmljYXRlIHdhcyBpc3N1ZWQgYWNj
-b3JkaW5nIHRvIHRoZSBDbGFzcyAxIFZhbGlkYXRpb24gcmVxdWlyZW1lbnRzIG9m
-IHRoZSBTdGFydENvbSBDQSBwb2xpY3ksIHJlbGlhbmNlIG9ubHkgZm9yIHRoZSBp
-bnRlbmRlZCBwdXJwb3NlIGluIGNvbXBsaWFuY2Ugb2YgdGhlIHJlbHlpbmcgcGFy
-dHkgb2JsaWdhdGlvbnMuMDUGA1UdHwQuMCwwKqAooCaGJGh0dHA6Ly9jcmwuc3Rh
-cnRzc2wuY29tL2NydDEtY3JsLmNybDCBjgYIKwYBBQUHAQEEgYEwfzA5BggrBgEF
-BQcwAYYtaHR0cDovL29jc3Auc3RhcnRzc2wuY29tL3N1Yi9jbGFzczEvc2VydmVy
-L2NhMEIGCCsGAQUFBzAChjZodHRwOi8vYWlhLnN0YXJ0c3NsLmNvbS9jZXJ0cy9z
-dWIuY2xhc3MxLnNlcnZlci5jYS5jcnQwIwYDVR0SBBwwGoYYaHR0cDovL3d3dy5z
-dGFydHNzbC5jb20vMA0GCSqGSIb3DQEBBQUAA4IBAQAi6p7SBeDWUNY52CEwi/Cy
-aDobEkEhR2afn6U1Aa7GEYnQ3fLHdmINfXA6n7JIApWsgD9PML6czu7H1X+DsLAK
-quKoDM/9IGe6yhLlKfH2tBxwGcFo8guaKNZd9HztOONj7dkNvGwX9uzMVAXarCw/
-+P5NwH3C2Ay5ZJs5oLIh4y6yCS3/I1exOQqIBlZPdIQxqVt2B4Fm0mWXENfpA9N3
-RWQrN7vxHeMorebLpkx6Z8+tw3Svi9Z2oP1vPbnUJpFragDqNoZw6K9Crf/JTqD9
-HtCRp1bLRxJ4Ysu5HdV+kAcTelR3MyDYe/gAGAb5Wu7hmNn3NAwwrFn0TygkPzvl
-</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>
-MIIGXDCCBUSgAwIBAgIDEE36MA0GCSqGSIb3DQEBBQUAMIGMMQswCQYDVQQGEwJJ
-TDEWMBQGA1UEChMNU3RhcnRDb20gTHRkLjErMCkGA1UECxMiU2VjdXJlIERpZ2l0
-YWwgQ2VydGlmaWNhdGUgU2lnbmluZzE4MDYGA1UEAxMvU3RhcnRDb20gQ2xhc3Mg
-MSBQcmltYXJ5IEludGVybWVkaWF0ZSBTZXJ2ZXIgQ0EwHhcNMTQwNTA1MDk0MTU4
-WhcNMTUwNTA1MTYzNjQyWjBsMRkwFwYDVQQNExBIRkVrbXIzMEliM2VrYzgyMQsw
-CQYDVQQGEwJVWTEaMBgGA1UEAxMRaWRwMi5yZWRjbGFyYS5uZXQxJjAkBgkqhkiG
-9w0BCQEWF3Bvc3RtYXN0ZXJAcmVkY2xhcmEubmV0MIIBIjANBgkqhkiG9w0BAQEF
-AAOCAQ8AMIIBCgKCAQEA789b8ZQhtUF0MlgLSW1ARfe8RIm2OmXBlMc9gdjrPF4Y
-rKySIm/wDmzwzVG0AhL9/OwRleXs+RrEPyo6/k5z1RxNIHs5y8CcnNFRAxFMWIFZ
-qrkDYfMo/GJcM1BHJ1HoTNKcXviVXvzag5Ca1h3Nogp8Sdp8K+vdIozT5URWmkbU
-JGnRdr82MqvqT4IpFSJ5bUPe1G50cV82h0zQvDVTlk2mo4GFS/B+g1t6yA3dlQn6
-O7gCz+LU/3rDiS/XnI2Qk50k/oNEBGq5VLRv68dv5JnAl17AWWi18dGDKSTY0Zds
-ER9Kn6eFH+4PSnB9IyVxAmjeG85d79PqQBpO4qzu3wIDAQABo4IC5DCCAuAwCQYD
-VR0TBAIwADALBgNVHQ8EBAMCA6gwEwYDVR0lBAwwCgYIKwYBBQUHAwEwHQYDVR0O
-BBYEFO43JOeGzab8H3c9zLqeuFlaDcOKMB8GA1UdIwQYMBaAFOtCNNCYsKuf9Btr
-CPfMZC7vDixFMCoGA1UdEQQjMCGCEWlkcDIucmVkY2xhcmEubmV0ggxyZWRjbGFy
-YS5uZXQwggFWBgNVHSAEggFNMIIBSTAIBgZngQwBAgEwggE7BgsrBgEEAYG1NwEC
-AzCCASowLgYIKwYBBQUHAgEWImh0dHA6Ly93d3cuc3RhcnRzc2wuY29tL3BvbGlj
-eS5wZGYwgfcGCCsGAQUFBwICMIHqMCcWIFN0YXJ0Q29tIENlcnRpZmljYXRpb24g
-QXV0aG9yaXR5MAMCAQEagb5UaGlzIGNlcnRpZmljYXRlIHdhcyBpc3N1ZWQgYWNj
-b3JkaW5nIHRvIHRoZSBDbGFzcyAxIFZhbGlkYXRpb24gcmVxdWlyZW1lbnRzIG9m
-IHRoZSBTdGFydENvbSBDQSBwb2xpY3ksIHJlbGlhbmNlIG9ubHkgZm9yIHRoZSBp
-bnRlbmRlZCBwdXJwb3NlIGluIGNvbXBsaWFuY2Ugb2YgdGhlIHJlbHlpbmcgcGFy
-dHkgb2JsaWdhdGlvbnMuMDUGA1UdHwQuMCwwKqAooCaGJGh0dHA6Ly9jcmwuc3Rh
-cnRzc2wuY29tL2NydDEtY3JsLmNybDCBjgYIKwYBBQUHAQEEgYEwfzA5BggrBgEF
-BQcwAYYtaHR0cDovL29jc3Auc3RhcnRzc2wuY29tL3N1Yi9jbGFzczEvc2VydmVy
-L2NhMEIGCCsGAQUFBzAChjZodHRwOi8vYWlhLnN0YXJ0c3NsLmNvbS9jZXJ0cy9z
-dWIuY2xhc3MxLnNlcnZlci5jYS5jcnQwIwYDVR0SBBwwGoYYaHR0cDovL3d3dy5z
-dGFydHNzbC5jb20vMA0GCSqGSIb3DQEBBQUAA4IBAQAi6p7SBeDWUNY52CEwi/Cy
-aDobEkEhR2afn6U1Aa7GEYnQ3fLHdmINfXA6n7JIApWsgD9PML6czu7H1X+DsLAK
-quKoDM/9IGe6yhLlKfH2tBxwGcFo8guaKNZd9HztOONj7dkNvGwX9uzMVAXarCw/
-+P5NwH3C2Ay5ZJs5oLIh4y6yCS3/I1exOQqIBlZPdIQxqVt2B4Fm0mWXENfpA9N3
-RWQrN7vxHeMorebLpkx6Z8+tw3Svi9Z2oP1vPbnUJpFragDqNoZw6K9Crf/JTqD9
-HtCRp1bLRxJ4Ysu5HdV+kAcTelR3MyDYe/gAGAb5Wu7hmNn3NAwwrFn0TygkPzvl
-</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">http://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/idpcafe.ifsc.edu.br-idp-shibboleth.xml b/swamid-interfederations-2.0/idpcafe.ifsc.edu.br-idp-shibboleth.xml
deleted file mode 100644
index ef04b671..00000000
--- a/swamid-interfederations-2.0/idpcafe.ifsc.edu.br-idp-shibboleth.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://idpcafe.ifsc.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">ifsc.edu.br</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">IFSC - Instituto Federal de Santa Catarina</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="pt-br">IFSC - Instituto Federal de Santa Catarina</mdui:DisplayName>
-        <mdui:Description xml:lang="en">IFSC - Instituto Federal de Santa Catarina</mdui:Description>
-        <mdui:Description xml:lang="pt-br">IFSC - Instituto Federal de Santa Catarina</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.ifsc.edu.br/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="pt-br">http://www.ifsc.edu.br/</mdui:InformationURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-    MIIDqDCCApACAQAwDQYJKoZIhvcNAQEFBQAwgZkxLDAqBgNVBAoTI0luc3RpdHV0
-byBGZWRlcmFsIGRlIFNhbnRhIENhdGFyaW5hMQ0wCwYDVQQLEwREVElDMRYwFAYD
-VQQHEw1GbG9yaWFub3BvbGlzMRcwFQYDVQQIEw5TYW50YSBDYXRhcmluYTELMAkG
-A1UEBhMCQlIxHDAaBgNVBAMTE2lkcGNhZmUuaWZzYy5lZHUuYnIwHhcNMTQwNDEx
-MTg1ODA4WhcNMTcwNDEwMTg1ODA4WjCBmTEsMCoGA1UEChMjSW5zdGl0dXRvIEZl
-ZGVyYWwgZGUgU2FudGEgQ2F0YXJpbmExDTALBgNVBAsTBERUSUMxFjAUBgNVBAcT
-DUZsb3JpYW5vcG9saXMxFzAVBgNVBAgTDlNhbnRhIENhdGFyaW5hMQswCQYDVQQG
-EwJCUjEcMBoGA1UEAxMTaWRwY2FmZS5pZnNjLmVkdS5icjCCASIwDQYJKoZIhvcN
-AQEBBQADggEPADCCAQoCggEBAN9zndckjBha7MXIXo7pc8deKLY8l4j2LLmbN/PE
-DDirotT2nuxdk0zGBKCpB3ZxHTN83MjBSGLQ205com7jbuFxzAgTFyB8GKJU3E4L
-7htHjpbNhbI7j9VLjbHcEZJeilEj+jViGUjgH1G7QO1GIpIPEakOzSOMWfvsl54E
-VgjK0PEBB4CUqGKHl1Rxu8D9jKLzD3TiciAWqSdwRFpyhfed7xqj4AHA49Sljpbr
-TOttEQ7RxmNEXApvMzTTyVJSeBae9+jcNKypp7VTB5YZcI4YI9HkE599xiNjK19q
-XrHrTu9RAg/21yTrmGOJRPdJtjRbc6skG1+cDMhbSezCInkCAwEAATANBgkqhkiG
-9w0BAQUFAAOCAQEAc/Sgpg8yWTUBY45Yp1Rs4yY3r3kLlK771TdEIVK6uQbLIwzo
-/cidWUp9F7HoJSlT478Z1kpGVDw/nqX9HVKXVcwaGdpae2zq6SBVSmGuwx6WkI0+
-fHw5DsGkY5CuMXIDRGW3G8uhO2dVIqSUaju1W8UCCrZbcWCWQJHPtDe7zGRgtuQV
-+uFs8FxtcQnLGOe0GmT48n9jW0ylQYrG5nbQ7jd0XQSGFMvuWj0tvM+i4q4XefHW
-iqG4LoRUqbCxPpagxpe/lKP1z8DQo0sWH/nfCuDYrSIvMV2PdMwIJqFVahF/QH6w
-+PpKrPXPFokR6cpvUAZYVpFuacTUNza0Knpicg==
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idpcafe.ifsc.edu.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idpcafe.ifsc.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://idpcafe.ifsc.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idpcafe.ifsc.edu.br/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idpcafe.ifsc.edu.br/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idpcafe.ifsc.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>
-      
-MIIDqDCCApACAQAwDQYJKoZIhvcNAQEFBQAwgZkxLDAqBgNVBAoTI0luc3RpdHV0
-byBGZWRlcmFsIGRlIFNhbnRhIENhdGFyaW5hMQ0wCwYDVQQLEwREVElDMRYwFAYD
-VQQHEw1GbG9yaWFub3BvbGlzMRcwFQYDVQQIEw5TYW50YSBDYXRhcmluYTELMAkG
-A1UEBhMCQlIxHDAaBgNVBAMTE2lkcGNhZmUuaWZzYy5lZHUuYnIwHhcNMTQwNDEx
-MTg1ODA4WhcNMTcwNDEwMTg1ODA4WjCBmTEsMCoGA1UEChMjSW5zdGl0dXRvIEZl
-ZGVyYWwgZGUgU2FudGEgQ2F0YXJpbmExDTALBgNVBAsTBERUSUMxFjAUBgNVBAcT
-DUZsb3JpYW5vcG9saXMxFzAVBgNVBAgTDlNhbnRhIENhdGFyaW5hMQswCQYDVQQG
-EwJCUjEcMBoGA1UEAxMTaWRwY2FmZS5pZnNjLmVkdS5icjCCASIwDQYJKoZIhvcN
-AQEBBQADggEPADCCAQoCggEBAN9zndckjBha7MXIXo7pc8deKLY8l4j2LLmbN/PE
-DDirotT2nuxdk0zGBKCpB3ZxHTN83MjBSGLQ205com7jbuFxzAgTFyB8GKJU3E4L
-7htHjpbNhbI7j9VLjbHcEZJeilEj+jViGUjgH1G7QO1GIpIPEakOzSOMWfvsl54E
-VgjK0PEBB4CUqGKHl1Rxu8D9jKLzD3TiciAWqSdwRFpyhfed7xqj4AHA49Sljpbr
-TOttEQ7RxmNEXApvMzTTyVJSeBae9+jcNKypp7VTB5YZcI4YI9HkE599xiNjK19q
-XrHrTu9RAg/21yTrmGOJRPdJtjRbc6skG1+cDMhbSezCInkCAwEAATANBgkqhkiG
-9w0BAQUFAAOCAQEAc/Sgpg8yWTUBY45Yp1Rs4yY3r3kLlK771TdEIVK6uQbLIwzo
-/cidWUp9F7HoJSlT478Z1kpGVDw/nqX9HVKXVcwaGdpae2zq6SBVSmGuwx6WkI0+
-fHw5DsGkY5CuMXIDRGW3G8uhO2dVIqSUaju1W8UCCrZbcWCWQJHPtDe7zGRgtuQV
-+uFs8FxtcQnLGOe0GmT48n9jW0ylQYrG5nbQ7jd0XQSGFMvuWj0tvM+i4q4XefHW
-iqG4LoRUqbCxPpagxpe/lKP1z8DQo0sWH/nfCuDYrSIvMV2PdMwIJqFVahF/QH6w
-+PpKrPXPFokR6cpvUAZYVpFuacTUNza0Knpicg==
-	    
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idpcafe.ifsc.edu.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idpcafe.ifsc.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">IFSC - Instituto Federal de Santa Catarina</OrganizationName>
-    <OrganizationName xml:lang="pt-br">IFSC - Instituto Federal de Santa Catarina</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">IFSC - Instituto Federal de Santa Catarina</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="pt-br">IFSC - Instituto Federal de Santa Catarina</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.ifsc.edu.br/</OrganizationURL>
-    <OrganizationURL xml:lang="pt-br">http://www.ifsc.edu.br/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Diretoria de TIC - IFSC</SurName>
-    <EmailAddress>suporte.reitoria@ifsc.edu.br</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idpcafe.ifsc.edu.br.xml b/swamid-interfederations-2.0/idpcafe.ifsc.edu.br.xml
deleted file mode 100644
index ef04b671..00000000
--- a/swamid-interfederations-2.0/idpcafe.ifsc.edu.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://idpcafe.ifsc.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">ifsc.edu.br</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">IFSC - Instituto Federal de Santa Catarina</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="pt-br">IFSC - Instituto Federal de Santa Catarina</mdui:DisplayName>
-        <mdui:Description xml:lang="en">IFSC - Instituto Federal de Santa Catarina</mdui:Description>
-        <mdui:Description xml:lang="pt-br">IFSC - Instituto Federal de Santa Catarina</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.ifsc.edu.br/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="pt-br">http://www.ifsc.edu.br/</mdui:InformationURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-    MIIDqDCCApACAQAwDQYJKoZIhvcNAQEFBQAwgZkxLDAqBgNVBAoTI0luc3RpdHV0
-byBGZWRlcmFsIGRlIFNhbnRhIENhdGFyaW5hMQ0wCwYDVQQLEwREVElDMRYwFAYD
-VQQHEw1GbG9yaWFub3BvbGlzMRcwFQYDVQQIEw5TYW50YSBDYXRhcmluYTELMAkG
-A1UEBhMCQlIxHDAaBgNVBAMTE2lkcGNhZmUuaWZzYy5lZHUuYnIwHhcNMTQwNDEx
-MTg1ODA4WhcNMTcwNDEwMTg1ODA4WjCBmTEsMCoGA1UEChMjSW5zdGl0dXRvIEZl
-ZGVyYWwgZGUgU2FudGEgQ2F0YXJpbmExDTALBgNVBAsTBERUSUMxFjAUBgNVBAcT
-DUZsb3JpYW5vcG9saXMxFzAVBgNVBAgTDlNhbnRhIENhdGFyaW5hMQswCQYDVQQG
-EwJCUjEcMBoGA1UEAxMTaWRwY2FmZS5pZnNjLmVkdS5icjCCASIwDQYJKoZIhvcN
-AQEBBQADggEPADCCAQoCggEBAN9zndckjBha7MXIXo7pc8deKLY8l4j2LLmbN/PE
-DDirotT2nuxdk0zGBKCpB3ZxHTN83MjBSGLQ205com7jbuFxzAgTFyB8GKJU3E4L
-7htHjpbNhbI7j9VLjbHcEZJeilEj+jViGUjgH1G7QO1GIpIPEakOzSOMWfvsl54E
-VgjK0PEBB4CUqGKHl1Rxu8D9jKLzD3TiciAWqSdwRFpyhfed7xqj4AHA49Sljpbr
-TOttEQ7RxmNEXApvMzTTyVJSeBae9+jcNKypp7VTB5YZcI4YI9HkE599xiNjK19q
-XrHrTu9RAg/21yTrmGOJRPdJtjRbc6skG1+cDMhbSezCInkCAwEAATANBgkqhkiG
-9w0BAQUFAAOCAQEAc/Sgpg8yWTUBY45Yp1Rs4yY3r3kLlK771TdEIVK6uQbLIwzo
-/cidWUp9F7HoJSlT478Z1kpGVDw/nqX9HVKXVcwaGdpae2zq6SBVSmGuwx6WkI0+
-fHw5DsGkY5CuMXIDRGW3G8uhO2dVIqSUaju1W8UCCrZbcWCWQJHPtDe7zGRgtuQV
-+uFs8FxtcQnLGOe0GmT48n9jW0ylQYrG5nbQ7jd0XQSGFMvuWj0tvM+i4q4XefHW
-iqG4LoRUqbCxPpagxpe/lKP1z8DQo0sWH/nfCuDYrSIvMV2PdMwIJqFVahF/QH6w
-+PpKrPXPFokR6cpvUAZYVpFuacTUNza0Knpicg==
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idpcafe.ifsc.edu.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idpcafe.ifsc.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://idpcafe.ifsc.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idpcafe.ifsc.edu.br/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idpcafe.ifsc.edu.br/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idpcafe.ifsc.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>
-      
-MIIDqDCCApACAQAwDQYJKoZIhvcNAQEFBQAwgZkxLDAqBgNVBAoTI0luc3RpdHV0
-byBGZWRlcmFsIGRlIFNhbnRhIENhdGFyaW5hMQ0wCwYDVQQLEwREVElDMRYwFAYD
-VQQHEw1GbG9yaWFub3BvbGlzMRcwFQYDVQQIEw5TYW50YSBDYXRhcmluYTELMAkG
-A1UEBhMCQlIxHDAaBgNVBAMTE2lkcGNhZmUuaWZzYy5lZHUuYnIwHhcNMTQwNDEx
-MTg1ODA4WhcNMTcwNDEwMTg1ODA4WjCBmTEsMCoGA1UEChMjSW5zdGl0dXRvIEZl
-ZGVyYWwgZGUgU2FudGEgQ2F0YXJpbmExDTALBgNVBAsTBERUSUMxFjAUBgNVBAcT
-DUZsb3JpYW5vcG9saXMxFzAVBgNVBAgTDlNhbnRhIENhdGFyaW5hMQswCQYDVQQG
-EwJCUjEcMBoGA1UEAxMTaWRwY2FmZS5pZnNjLmVkdS5icjCCASIwDQYJKoZIhvcN
-AQEBBQADggEPADCCAQoCggEBAN9zndckjBha7MXIXo7pc8deKLY8l4j2LLmbN/PE
-DDirotT2nuxdk0zGBKCpB3ZxHTN83MjBSGLQ205com7jbuFxzAgTFyB8GKJU3E4L
-7htHjpbNhbI7j9VLjbHcEZJeilEj+jViGUjgH1G7QO1GIpIPEakOzSOMWfvsl54E
-VgjK0PEBB4CUqGKHl1Rxu8D9jKLzD3TiciAWqSdwRFpyhfed7xqj4AHA49Sljpbr
-TOttEQ7RxmNEXApvMzTTyVJSeBae9+jcNKypp7VTB5YZcI4YI9HkE599xiNjK19q
-XrHrTu9RAg/21yTrmGOJRPdJtjRbc6skG1+cDMhbSezCInkCAwEAATANBgkqhkiG
-9w0BAQUFAAOCAQEAc/Sgpg8yWTUBY45Yp1Rs4yY3r3kLlK771TdEIVK6uQbLIwzo
-/cidWUp9F7HoJSlT478Z1kpGVDw/nqX9HVKXVcwaGdpae2zq6SBVSmGuwx6WkI0+
-fHw5DsGkY5CuMXIDRGW3G8uhO2dVIqSUaju1W8UCCrZbcWCWQJHPtDe7zGRgtuQV
-+uFs8FxtcQnLGOe0GmT48n9jW0ylQYrG5nbQ7jd0XQSGFMvuWj0tvM+i4q4XefHW
-iqG4LoRUqbCxPpagxpe/lKP1z8DQo0sWH/nfCuDYrSIvMV2PdMwIJqFVahF/QH6w
-+PpKrPXPFokR6cpvUAZYVpFuacTUNza0Knpicg==
-	    
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idpcafe.ifsc.edu.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idpcafe.ifsc.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">IFSC - Instituto Federal de Santa Catarina</OrganizationName>
-    <OrganizationName xml:lang="pt-br">IFSC - Instituto Federal de Santa Catarina</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">IFSC - Instituto Federal de Santa Catarina</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="pt-br">IFSC - Instituto Federal de Santa Catarina</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.ifsc.edu.br/</OrganizationURL>
-    <OrganizationURL xml:lang="pt-br">http://www.ifsc.edu.br/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Diretoria de TIC - IFSC</SurName>
-    <EmailAddress>suporte.reitoria@ifsc.edu.br</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idpcafe.ufjf.br-idp-shibboleth.xml b/swamid-interfederations-2.0/idpcafe.ufjf.br-idp-shibboleth.xml
deleted file mode 100644
index 23df3ae4..00000000
--- a/swamid-interfederations-2.0/idpcafe.ufjf.br-idp-shibboleth.xml
+++ /dev/null
@@ -1,114 +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://idpcafe.ufjf.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">ufjf.br</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">UFJF - Universidade Federal de Juiz de Fora</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="pt-br">UFJF - Universidade Federal de Juiz de Fora</mdui:DisplayName>
-        <mdui:Description xml:lang="en">UFJF - Universidade Federal de Juiz de Fora</mdui:Description>
-        <mdui:Description xml:lang="pt-br">UFJF - Universidade Federal de Juiz de Fora</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.ufjf.br</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="pt-br">http://www.ufjf.br</mdui:InformationURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-    MIID/DCCAuQCAQAwDQYJKoZIhvcNAQEFBQAwgcMxNDAyBgNVBAoTK1VGSkYgLSBV
-bml2ZXJzaWRhZGUgRmVkZXJhbCBkZSBKdWl6IGRlIEZvcmExDTALBgNVBAsTBENH
-Q08xJzAlBgkqhkiG9w0BCQEWGGVuZ2VuaGFyaWEucmVkZXNAdWZqZi5icjEVMBMG
-A1UEBxMMSnVpeiBkZSBGb3JhMRUwEwYDVQQIEwxNaW5hcyBHZXJhaXMxCzAJBgNV
-BAYTAkJSMRgwFgYDVQQDEw9pZHBjYWZlLnVmamYuYnIwHhcNMTQwNTE1MTI1NDA4
-WhcNMTcwNTE0MTI1NDA4WjCBwzE0MDIGA1UEChMrVUZKRiAtIFVuaXZlcnNpZGFk
-ZSBGZWRlcmFsIGRlIEp1aXogZGUgRm9yYTENMAsGA1UECxMEQ0dDTzEnMCUGCSqG
-SIb3DQEJARYYZW5nZW5oYXJpYS5yZWRlc0B1ZmpmLmJyMRUwEwYDVQQHEwxKdWl6
-IGRlIEZvcmExFTATBgNVBAgTDE1pbmFzIEdlcmFpczELMAkGA1UEBhMCQlIxGDAW
-BgNVBAMTD2lkcGNhZmUudWZqZi5icjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
-AQoCggEBALchDbtE8aCMl4QLHxwYXSd6XUKkGLr8MUTeRqanArp6GjbPdmRCVXXD
-1jQxYKOreu3FAe6HA5N+miqKs6/lYFspfiYv3hhv7kYjvch8HDde2Y4dBb6R/tDv
-RronbnX/7yHnlYvVgJsgG8vAvvk8G2i8DkFxXm2voBgd1oZKFCxZ91u5VspOZBll
-9IpRo92eV4s2r4gA29Y5PTt+9QhKcYbwqbY0H/qOsrDUUw3N6eHkbMCmTbTwF9QQ
-9kdGNE9kqsCpVe2pvdDRufAGM2lhW9FRQ7TtQVM2W05gAKqM/gtqmFTHcXOW61s9
-1UNQHy950x3+6XV5uPSJ5goWVH/IBq8CAwEAATANBgkqhkiG9w0BAQUFAAOCAQEA
-ZvdlVROsCPu31t4NMLcJffMJ3UczKuQz/hnpqFopzHx/ZzAvA2qh7EyyDSKZYcVb
-u1Ot25INLgEMywDAE54zD5kzPiWqe7L1ozoXoO5KB3wLPn6E61JVq4T4OJDdKyJy
-+laNFVPumFJ1OoOJimQW5s8LhuW7cwIojE5r0Mi5M8lxuazQIxMUMsOy+cjvEJ1l
-4xAqcBQPPzN8BS9nh21wZ0yrpxDTk7WhASv+OmjFhod5fyYdWrATt/7ayoP3lNv9
-IgvH8wv82qKhKozHFDyFhPwNwBMLIskMni1P/NJSlXbMYt3/I6mvRKLGBVZWOdeG
-VHUsC0A0Nd9rEkuwkV0GdA==
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idpcafe.ufjf.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idpcafe.ufjf.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://idpcafe.ufjf.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idpcafe.ufjf.br/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idpcafe.ufjf.br/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idpcafe.ufjf.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">ufjf.br</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-      
-MIID/DCCAuQCAQAwDQYJKoZIhvcNAQEFBQAwgcMxNDAyBgNVBAoTK1VGSkYgLSBV
-bml2ZXJzaWRhZGUgRmVkZXJhbCBkZSBKdWl6IGRlIEZvcmExDTALBgNVBAsTBENH
-Q08xJzAlBgkqhkiG9w0BCQEWGGVuZ2VuaGFyaWEucmVkZXNAdWZqZi5icjEVMBMG
-A1UEBxMMSnVpeiBkZSBGb3JhMRUwEwYDVQQIEwxNaW5hcyBHZXJhaXMxCzAJBgNV
-BAYTAkJSMRgwFgYDVQQDEw9pZHBjYWZlLnVmamYuYnIwHhcNMTQwNTE1MTI1NDA4
-WhcNMTcwNTE0MTI1NDA4WjCBwzE0MDIGA1UEChMrVUZKRiAtIFVuaXZlcnNpZGFk
-ZSBGZWRlcmFsIGRlIEp1aXogZGUgRm9yYTENMAsGA1UECxMEQ0dDTzEnMCUGCSqG
-SIb3DQEJARYYZW5nZW5oYXJpYS5yZWRlc0B1ZmpmLmJyMRUwEwYDVQQHEwxKdWl6
-IGRlIEZvcmExFTATBgNVBAgTDE1pbmFzIEdlcmFpczELMAkGA1UEBhMCQlIxGDAW
-BgNVBAMTD2lkcGNhZmUudWZqZi5icjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
-AQoCggEBALchDbtE8aCMl4QLHxwYXSd6XUKkGLr8MUTeRqanArp6GjbPdmRCVXXD
-1jQxYKOreu3FAe6HA5N+miqKs6/lYFspfiYv3hhv7kYjvch8HDde2Y4dBb6R/tDv
-RronbnX/7yHnlYvVgJsgG8vAvvk8G2i8DkFxXm2voBgd1oZKFCxZ91u5VspOZBll
-9IpRo92eV4s2r4gA29Y5PTt+9QhKcYbwqbY0H/qOsrDUUw3N6eHkbMCmTbTwF9QQ
-9kdGNE9kqsCpVe2pvdDRufAGM2lhW9FRQ7TtQVM2W05gAKqM/gtqmFTHcXOW61s9
-1UNQHy950x3+6XV5uPSJ5goWVH/IBq8CAwEAATANBgkqhkiG9w0BAQUFAAOCAQEA
-ZvdlVROsCPu31t4NMLcJffMJ3UczKuQz/hnpqFopzHx/ZzAvA2qh7EyyDSKZYcVb
-u1Ot25INLgEMywDAE54zD5kzPiWqe7L1ozoXoO5KB3wLPn6E61JVq4T4OJDdKyJy
-+laNFVPumFJ1OoOJimQW5s8LhuW7cwIojE5r0Mi5M8lxuazQIxMUMsOy+cjvEJ1l
-4xAqcBQPPzN8BS9nh21wZ0yrpxDTk7WhASv+OmjFhod5fyYdWrATt/7ayoP3lNv9
-IgvH8wv82qKhKozHFDyFhPwNwBMLIskMni1P/NJSlXbMYt3/I6mvRKLGBVZWOdeG
-VHUsC0A0Nd9rEkuwkV0GdA==
-                    
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idpcafe.ufjf.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idpcafe.ufjf.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">UFJF - Universidade Federal de Juiz de Fora</OrganizationName>
-    <OrganizationName xml:lang="pt-br">UFJF - Universidade Federal de Juiz de Fora</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">UFJF - Universidade Federal de Juiz de Fora</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="pt-br">UFJF - Universidade Federal de Juiz de Fora</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.ufjf.br</OrganizationURL>
-    <OrganizationURL xml:lang="pt-br">http://www.ufjf.br</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Jose Luiz Ribeiro de Souza Filho</SurName>
-    <EmailAddress>engenharia.redes@ufjf.edu.br</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idpcafe.ufjf.br.xml b/swamid-interfederations-2.0/idpcafe.ufjf.br.xml
deleted file mode 100644
index 23df3ae4..00000000
--- a/swamid-interfederations-2.0/idpcafe.ufjf.br.xml
+++ /dev/null
@@ -1,114 +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://idpcafe.ufjf.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">ufjf.br</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">UFJF - Universidade Federal de Juiz de Fora</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="pt-br">UFJF - Universidade Federal de Juiz de Fora</mdui:DisplayName>
-        <mdui:Description xml:lang="en">UFJF - Universidade Federal de Juiz de Fora</mdui:Description>
-        <mdui:Description xml:lang="pt-br">UFJF - Universidade Federal de Juiz de Fora</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.ufjf.br</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="pt-br">http://www.ufjf.br</mdui:InformationURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-    MIID/DCCAuQCAQAwDQYJKoZIhvcNAQEFBQAwgcMxNDAyBgNVBAoTK1VGSkYgLSBV
-bml2ZXJzaWRhZGUgRmVkZXJhbCBkZSBKdWl6IGRlIEZvcmExDTALBgNVBAsTBENH
-Q08xJzAlBgkqhkiG9w0BCQEWGGVuZ2VuaGFyaWEucmVkZXNAdWZqZi5icjEVMBMG
-A1UEBxMMSnVpeiBkZSBGb3JhMRUwEwYDVQQIEwxNaW5hcyBHZXJhaXMxCzAJBgNV
-BAYTAkJSMRgwFgYDVQQDEw9pZHBjYWZlLnVmamYuYnIwHhcNMTQwNTE1MTI1NDA4
-WhcNMTcwNTE0MTI1NDA4WjCBwzE0MDIGA1UEChMrVUZKRiAtIFVuaXZlcnNpZGFk
-ZSBGZWRlcmFsIGRlIEp1aXogZGUgRm9yYTENMAsGA1UECxMEQ0dDTzEnMCUGCSqG
-SIb3DQEJARYYZW5nZW5oYXJpYS5yZWRlc0B1ZmpmLmJyMRUwEwYDVQQHEwxKdWl6
-IGRlIEZvcmExFTATBgNVBAgTDE1pbmFzIEdlcmFpczELMAkGA1UEBhMCQlIxGDAW
-BgNVBAMTD2lkcGNhZmUudWZqZi5icjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
-AQoCggEBALchDbtE8aCMl4QLHxwYXSd6XUKkGLr8MUTeRqanArp6GjbPdmRCVXXD
-1jQxYKOreu3FAe6HA5N+miqKs6/lYFspfiYv3hhv7kYjvch8HDde2Y4dBb6R/tDv
-RronbnX/7yHnlYvVgJsgG8vAvvk8G2i8DkFxXm2voBgd1oZKFCxZ91u5VspOZBll
-9IpRo92eV4s2r4gA29Y5PTt+9QhKcYbwqbY0H/qOsrDUUw3N6eHkbMCmTbTwF9QQ
-9kdGNE9kqsCpVe2pvdDRufAGM2lhW9FRQ7TtQVM2W05gAKqM/gtqmFTHcXOW61s9
-1UNQHy950x3+6XV5uPSJ5goWVH/IBq8CAwEAATANBgkqhkiG9w0BAQUFAAOCAQEA
-ZvdlVROsCPu31t4NMLcJffMJ3UczKuQz/hnpqFopzHx/ZzAvA2qh7EyyDSKZYcVb
-u1Ot25INLgEMywDAE54zD5kzPiWqe7L1ozoXoO5KB3wLPn6E61JVq4T4OJDdKyJy
-+laNFVPumFJ1OoOJimQW5s8LhuW7cwIojE5r0Mi5M8lxuazQIxMUMsOy+cjvEJ1l
-4xAqcBQPPzN8BS9nh21wZ0yrpxDTk7WhASv+OmjFhod5fyYdWrATt/7ayoP3lNv9
-IgvH8wv82qKhKozHFDyFhPwNwBMLIskMni1P/NJSlXbMYt3/I6mvRKLGBVZWOdeG
-VHUsC0A0Nd9rEkuwkV0GdA==
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idpcafe.ufjf.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idpcafe.ufjf.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://idpcafe.ufjf.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idpcafe.ufjf.br/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idpcafe.ufjf.br/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idpcafe.ufjf.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">ufjf.br</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-      
-MIID/DCCAuQCAQAwDQYJKoZIhvcNAQEFBQAwgcMxNDAyBgNVBAoTK1VGSkYgLSBV
-bml2ZXJzaWRhZGUgRmVkZXJhbCBkZSBKdWl6IGRlIEZvcmExDTALBgNVBAsTBENH
-Q08xJzAlBgkqhkiG9w0BCQEWGGVuZ2VuaGFyaWEucmVkZXNAdWZqZi5icjEVMBMG
-A1UEBxMMSnVpeiBkZSBGb3JhMRUwEwYDVQQIEwxNaW5hcyBHZXJhaXMxCzAJBgNV
-BAYTAkJSMRgwFgYDVQQDEw9pZHBjYWZlLnVmamYuYnIwHhcNMTQwNTE1MTI1NDA4
-WhcNMTcwNTE0MTI1NDA4WjCBwzE0MDIGA1UEChMrVUZKRiAtIFVuaXZlcnNpZGFk
-ZSBGZWRlcmFsIGRlIEp1aXogZGUgRm9yYTENMAsGA1UECxMEQ0dDTzEnMCUGCSqG
-SIb3DQEJARYYZW5nZW5oYXJpYS5yZWRlc0B1ZmpmLmJyMRUwEwYDVQQHEwxKdWl6
-IGRlIEZvcmExFTATBgNVBAgTDE1pbmFzIEdlcmFpczELMAkGA1UEBhMCQlIxGDAW
-BgNVBAMTD2lkcGNhZmUudWZqZi5icjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
-AQoCggEBALchDbtE8aCMl4QLHxwYXSd6XUKkGLr8MUTeRqanArp6GjbPdmRCVXXD
-1jQxYKOreu3FAe6HA5N+miqKs6/lYFspfiYv3hhv7kYjvch8HDde2Y4dBb6R/tDv
-RronbnX/7yHnlYvVgJsgG8vAvvk8G2i8DkFxXm2voBgd1oZKFCxZ91u5VspOZBll
-9IpRo92eV4s2r4gA29Y5PTt+9QhKcYbwqbY0H/qOsrDUUw3N6eHkbMCmTbTwF9QQ
-9kdGNE9kqsCpVe2pvdDRufAGM2lhW9FRQ7TtQVM2W05gAKqM/gtqmFTHcXOW61s9
-1UNQHy950x3+6XV5uPSJ5goWVH/IBq8CAwEAATANBgkqhkiG9w0BAQUFAAOCAQEA
-ZvdlVROsCPu31t4NMLcJffMJ3UczKuQz/hnpqFopzHx/ZzAvA2qh7EyyDSKZYcVb
-u1Ot25INLgEMywDAE54zD5kzPiWqe7L1ozoXoO5KB3wLPn6E61JVq4T4OJDdKyJy
-+laNFVPumFJ1OoOJimQW5s8LhuW7cwIojE5r0Mi5M8lxuazQIxMUMsOy+cjvEJ1l
-4xAqcBQPPzN8BS9nh21wZ0yrpxDTk7WhASv+OmjFhod5fyYdWrATt/7ayoP3lNv9
-IgvH8wv82qKhKozHFDyFhPwNwBMLIskMni1P/NJSlXbMYt3/I6mvRKLGBVZWOdeG
-VHUsC0A0Nd9rEkuwkV0GdA==
-                    
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idpcafe.ufjf.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idpcafe.ufjf.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">UFJF - Universidade Federal de Juiz de Fora</OrganizationName>
-    <OrganizationName xml:lang="pt-br">UFJF - Universidade Federal de Juiz de Fora</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">UFJF - Universidade Federal de Juiz de Fora</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="pt-br">UFJF - Universidade Federal de Juiz de Fora</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.ufjf.br</OrganizationURL>
-    <OrganizationURL xml:lang="pt-br">http://www.ufjf.br</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Jose Luiz Ribeiro de Souza Filho</SurName>
-    <EmailAddress>engenharia.redes@ufjf.edu.br</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idpcafe.usp.br-idp-shibboleth.xml b/swamid-interfederations-2.0/idpcafe.usp.br-idp-shibboleth.xml
deleted file mode 100644
index 6d309e40..00000000
--- a/swamid-interfederations-2.0/idpcafe.usp.br-idp-shibboleth.xml
+++ /dev/null
@@ -1,114 +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://idpcafe.usp.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">usp.br</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">USP - UNIVERSIDADE DE SAO PAULO</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="pt-br">USP - UNIVERSIDADE DE SAO PAULO</mdui:DisplayName>
-        <mdui:Description xml:lang="en">USP - UNIVERSIDADE DE SAO PAULO</mdui:Description>
-        <mdui:Description xml:lang="pt-br">USP - UNIVERSIDADE DE SAO PAULO</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.usp.br/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="pt-br">http://www.usp.br/</mdui:InformationURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-    MIID+jCCAuICAQAwDQYJKoZIhvcNAQEFBQAwgcIxIjAgBgNVBAoTGVVOSVZFUlNJ
-REFERSBERSBTQU8gUEFVTE8xMTAvBgNVBAsTKERFUEFSVEFNRU5UTyBERSBURUNO
-T0xPR0lBIERBIElORk9STUFDQU8xGzAZBgkqhkiG9w0BCQEWDG51dmVtQHVzcC5i
-cjESMBAGA1UEBxMJU0FPIFBBVUxPMRIwEAYDVQQIEwlTQU8gUEFVTE8xCzAJBgNV
-BAYTAkJSMRcwFQYDVQQDEw5pZHBjYWZlLnVzcC5icjAeFw0xMzEyMTExNDUxMDNa
-Fw0xODEyMTAxNDUxMDNaMIHCMSIwIAYDVQQKExlVTklWRVJTSURBREUgREUgU0FP
-IFBBVUxPMTEwLwYDVQQLEyhERVBBUlRBTUVOVE8gREUgVEVDTk9MT0dJQSBEQSBJ
-TkZPUk1BQ0FPMRswGQYJKoZIhvcNAQkBFgxudXZlbUB1c3AuYnIxEjAQBgNVBAcT
-CVNBTyBQQVVMTzESMBAGA1UECBMJU0FPIFBBVUxPMQswCQYDVQQGEwJCUjEXMBUG
-A1UEAxMOaWRwY2FmZS51c3AuYnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
-AoIBAQCjjPbk1OaWxi3zboP0gRIDrAwmYvH7oe7np5DZ1DkOUEUZRPuSPrzMgT0u
-7lSi0Af9RyjYw/1rH1/d5y3U1qBVL7lxi/p2twaKS7BnHLieBIVpdCBqoImVSKGK
-wzhJZolh+Jt623BszlyFhO5DNFN1GY19e+geRwlg7XzRvihcVKJsphgjjMPWB33g
-NqgvkIzIAYjG8KqSfgEo6fYmhWlHHdIyrQZohSkMjZ28xGx5zylruEIgKWvmUMNE
-kQoAlB/Gp5rlccYnzyij8WjbDy7ymoh5znxVguWXPYq4c5DJuydgOC77VynruR4R
-Jdk/BFu0xcLg3FEwYSQq37dNKubXAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBAIs0
-WO6KyOJ/xAW2UXTn8jOVKfDJGVjEz3AzR4ymQUoMp+TvshZyfUsecKla7DLDKxAe
-ec/+UH8IKDWF5FmGVpi38zmiCaz6QPrf4BZjCdVges1CkFpLwdZKE0lrLe26AU9y
-kimqlu5bTwUKxLkPayX1hrQdERVLDLgGpNxvuqRF414A7GufoLDuiaap9oFbyUnr
-4XXRj+T9rbE4/qPgleEnS9uR5ecNZIyZBcQh007Piygh8itK3XyfxTHGxGsD/Wim
-QRPX6jagdA+2Yl+IJOdCFckQMS+uuuHKNl390fHbQvvP+jvgDfKm2mB/GjgzqgR8
-7UdfUKFbnsb/9jdfwzk=
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idpcafe.usp.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idpcafe.usp.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://idpcafe.usp.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idpcafe.usp.br/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idpcafe.usp.br/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idpcafe.usp.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">usp.br</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-      
-MIID+jCCAuICAQAwDQYJKoZIhvcNAQEFBQAwgcIxIjAgBgNVBAoTGVVOSVZFUlNJ
-REFERSBERSBTQU8gUEFVTE8xMTAvBgNVBAsTKERFUEFSVEFNRU5UTyBERSBURUNO
-T0xPR0lBIERBIElORk9STUFDQU8xGzAZBgkqhkiG9w0BCQEWDG51dmVtQHVzcC5i
-cjESMBAGA1UEBxMJU0FPIFBBVUxPMRIwEAYDVQQIEwlTQU8gUEFVTE8xCzAJBgNV
-BAYTAkJSMRcwFQYDVQQDEw5pZHBjYWZlLnVzcC5icjAeFw0xMzEyMTExNDUxMDNa
-Fw0xODEyMTAxNDUxMDNaMIHCMSIwIAYDVQQKExlVTklWRVJTSURBREUgREUgU0FP
-IFBBVUxPMTEwLwYDVQQLEyhERVBBUlRBTUVOVE8gREUgVEVDTk9MT0dJQSBEQSBJ
-TkZPUk1BQ0FPMRswGQYJKoZIhvcNAQkBFgxudXZlbUB1c3AuYnIxEjAQBgNVBAcT
-CVNBTyBQQVVMTzESMBAGA1UECBMJU0FPIFBBVUxPMQswCQYDVQQGEwJCUjEXMBUG
-A1UEAxMOaWRwY2FmZS51c3AuYnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
-AoIBAQCjjPbk1OaWxi3zboP0gRIDrAwmYvH7oe7np5DZ1DkOUEUZRPuSPrzMgT0u
-7lSi0Af9RyjYw/1rH1/d5y3U1qBVL7lxi/p2twaKS7BnHLieBIVpdCBqoImVSKGK
-wzhJZolh+Jt623BszlyFhO5DNFN1GY19e+geRwlg7XzRvihcVKJsphgjjMPWB33g
-NqgvkIzIAYjG8KqSfgEo6fYmhWlHHdIyrQZohSkMjZ28xGx5zylruEIgKWvmUMNE
-kQoAlB/Gp5rlccYnzyij8WjbDy7ymoh5znxVguWXPYq4c5DJuydgOC77VynruR4R
-Jdk/BFu0xcLg3FEwYSQq37dNKubXAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBAIs0
-WO6KyOJ/xAW2UXTn8jOVKfDJGVjEz3AzR4ymQUoMp+TvshZyfUsecKla7DLDKxAe
-ec/+UH8IKDWF5FmGVpi38zmiCaz6QPrf4BZjCdVges1CkFpLwdZKE0lrLe26AU9y
-kimqlu5bTwUKxLkPayX1hrQdERVLDLgGpNxvuqRF414A7GufoLDuiaap9oFbyUnr
-4XXRj+T9rbE4/qPgleEnS9uR5ecNZIyZBcQh007Piygh8itK3XyfxTHGxGsD/Wim
-QRPX6jagdA+2Yl+IJOdCFckQMS+uuuHKNl390fHbQvvP+jvgDfKm2mB/GjgzqgR8
-7UdfUKFbnsb/9jdfwzk=
-                    
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idpcafe.usp.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idpcafe.usp.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">USP - UNIVERSIDADE DE SAO PAULO</OrganizationName>
-    <OrganizationName xml:lang="pt-br">USP - UNIVERSIDADE DE SAO PAULO</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">USP - UNIVERSIDADE DE SAO PAULO</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="pt-br">USP - UNIVERSIDADE DE SAO PAULO</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.usp.br/</OrganizationURL>
-    <OrganizationURL xml:lang="pt-br">http://www.usp.br/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>DTI - Departamento de Tecnologia da Informacao</SurName>
-    <EmailAddress>consulta@usp.br</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idpcafe.usp.br.xml b/swamid-interfederations-2.0/idpcafe.usp.br.xml
deleted file mode 100644
index 6d309e40..00000000
--- a/swamid-interfederations-2.0/idpcafe.usp.br.xml
+++ /dev/null
@@ -1,114 +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://idpcafe.usp.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">usp.br</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">USP - UNIVERSIDADE DE SAO PAULO</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="pt-br">USP - UNIVERSIDADE DE SAO PAULO</mdui:DisplayName>
-        <mdui:Description xml:lang="en">USP - UNIVERSIDADE DE SAO PAULO</mdui:Description>
-        <mdui:Description xml:lang="pt-br">USP - UNIVERSIDADE DE SAO PAULO</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.usp.br/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="pt-br">http://www.usp.br/</mdui:InformationURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-    MIID+jCCAuICAQAwDQYJKoZIhvcNAQEFBQAwgcIxIjAgBgNVBAoTGVVOSVZFUlNJ
-REFERSBERSBTQU8gUEFVTE8xMTAvBgNVBAsTKERFUEFSVEFNRU5UTyBERSBURUNO
-T0xPR0lBIERBIElORk9STUFDQU8xGzAZBgkqhkiG9w0BCQEWDG51dmVtQHVzcC5i
-cjESMBAGA1UEBxMJU0FPIFBBVUxPMRIwEAYDVQQIEwlTQU8gUEFVTE8xCzAJBgNV
-BAYTAkJSMRcwFQYDVQQDEw5pZHBjYWZlLnVzcC5icjAeFw0xMzEyMTExNDUxMDNa
-Fw0xODEyMTAxNDUxMDNaMIHCMSIwIAYDVQQKExlVTklWRVJTSURBREUgREUgU0FP
-IFBBVUxPMTEwLwYDVQQLEyhERVBBUlRBTUVOVE8gREUgVEVDTk9MT0dJQSBEQSBJ
-TkZPUk1BQ0FPMRswGQYJKoZIhvcNAQkBFgxudXZlbUB1c3AuYnIxEjAQBgNVBAcT
-CVNBTyBQQVVMTzESMBAGA1UECBMJU0FPIFBBVUxPMQswCQYDVQQGEwJCUjEXMBUG
-A1UEAxMOaWRwY2FmZS51c3AuYnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
-AoIBAQCjjPbk1OaWxi3zboP0gRIDrAwmYvH7oe7np5DZ1DkOUEUZRPuSPrzMgT0u
-7lSi0Af9RyjYw/1rH1/d5y3U1qBVL7lxi/p2twaKS7BnHLieBIVpdCBqoImVSKGK
-wzhJZolh+Jt623BszlyFhO5DNFN1GY19e+geRwlg7XzRvihcVKJsphgjjMPWB33g
-NqgvkIzIAYjG8KqSfgEo6fYmhWlHHdIyrQZohSkMjZ28xGx5zylruEIgKWvmUMNE
-kQoAlB/Gp5rlccYnzyij8WjbDy7ymoh5znxVguWXPYq4c5DJuydgOC77VynruR4R
-Jdk/BFu0xcLg3FEwYSQq37dNKubXAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBAIs0
-WO6KyOJ/xAW2UXTn8jOVKfDJGVjEz3AzR4ymQUoMp+TvshZyfUsecKla7DLDKxAe
-ec/+UH8IKDWF5FmGVpi38zmiCaz6QPrf4BZjCdVges1CkFpLwdZKE0lrLe26AU9y
-kimqlu5bTwUKxLkPayX1hrQdERVLDLgGpNxvuqRF414A7GufoLDuiaap9oFbyUnr
-4XXRj+T9rbE4/qPgleEnS9uR5ecNZIyZBcQh007Piygh8itK3XyfxTHGxGsD/Wim
-QRPX6jagdA+2Yl+IJOdCFckQMS+uuuHKNl390fHbQvvP+jvgDfKm2mB/GjgzqgR8
-7UdfUKFbnsb/9jdfwzk=
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idpcafe.usp.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idpcafe.usp.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://idpcafe.usp.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idpcafe.usp.br/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idpcafe.usp.br/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idpcafe.usp.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">usp.br</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-      
-MIID+jCCAuICAQAwDQYJKoZIhvcNAQEFBQAwgcIxIjAgBgNVBAoTGVVOSVZFUlNJ
-REFERSBERSBTQU8gUEFVTE8xMTAvBgNVBAsTKERFUEFSVEFNRU5UTyBERSBURUNO
-T0xPR0lBIERBIElORk9STUFDQU8xGzAZBgkqhkiG9w0BCQEWDG51dmVtQHVzcC5i
-cjESMBAGA1UEBxMJU0FPIFBBVUxPMRIwEAYDVQQIEwlTQU8gUEFVTE8xCzAJBgNV
-BAYTAkJSMRcwFQYDVQQDEw5pZHBjYWZlLnVzcC5icjAeFw0xMzEyMTExNDUxMDNa
-Fw0xODEyMTAxNDUxMDNaMIHCMSIwIAYDVQQKExlVTklWRVJTSURBREUgREUgU0FP
-IFBBVUxPMTEwLwYDVQQLEyhERVBBUlRBTUVOVE8gREUgVEVDTk9MT0dJQSBEQSBJ
-TkZPUk1BQ0FPMRswGQYJKoZIhvcNAQkBFgxudXZlbUB1c3AuYnIxEjAQBgNVBAcT
-CVNBTyBQQVVMTzESMBAGA1UECBMJU0FPIFBBVUxPMQswCQYDVQQGEwJCUjEXMBUG
-A1UEAxMOaWRwY2FmZS51c3AuYnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
-AoIBAQCjjPbk1OaWxi3zboP0gRIDrAwmYvH7oe7np5DZ1DkOUEUZRPuSPrzMgT0u
-7lSi0Af9RyjYw/1rH1/d5y3U1qBVL7lxi/p2twaKS7BnHLieBIVpdCBqoImVSKGK
-wzhJZolh+Jt623BszlyFhO5DNFN1GY19e+geRwlg7XzRvihcVKJsphgjjMPWB33g
-NqgvkIzIAYjG8KqSfgEo6fYmhWlHHdIyrQZohSkMjZ28xGx5zylruEIgKWvmUMNE
-kQoAlB/Gp5rlccYnzyij8WjbDy7ymoh5znxVguWXPYq4c5DJuydgOC77VynruR4R
-Jdk/BFu0xcLg3FEwYSQq37dNKubXAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBAIs0
-WO6KyOJ/xAW2UXTn8jOVKfDJGVjEz3AzR4ymQUoMp+TvshZyfUsecKla7DLDKxAe
-ec/+UH8IKDWF5FmGVpi38zmiCaz6QPrf4BZjCdVges1CkFpLwdZKE0lrLe26AU9y
-kimqlu5bTwUKxLkPayX1hrQdERVLDLgGpNxvuqRF414A7GufoLDuiaap9oFbyUnr
-4XXRj+T9rbE4/qPgleEnS9uR5ecNZIyZBcQh007Piygh8itK3XyfxTHGxGsD/Wim
-QRPX6jagdA+2Yl+IJOdCFckQMS+uuuHKNl390fHbQvvP+jvgDfKm2mB/GjgzqgR8
-7UdfUKFbnsb/9jdfwzk=
-                    
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idpcafe.usp.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idpcafe.usp.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">USP - UNIVERSIDADE DE SAO PAULO</OrganizationName>
-    <OrganizationName xml:lang="pt-br">USP - UNIVERSIDADE DE SAO PAULO</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">USP - UNIVERSIDADE DE SAO PAULO</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="pt-br">USP - UNIVERSIDADE DE SAO PAULO</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.usp.br/</OrganizationURL>
-    <OrganizationURL xml:lang="pt-br">http://www.usp.br/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>DTI - Departamento de Tecnologia da Informacao</SurName>
-    <EmailAddress>consulta@usp.br</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idpcnous.cnous.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/idpcnous.cnous.fr-idp-shibboleth.xml
deleted file mode 100644
index 325744fd..00000000
--- a/swamid-interfederations-2.0/idpcnous.cnous.fr-idp-shibboleth.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://idpcnous.cnous.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2013-02-07T10:05:15Z">
-      <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">cnous.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">CNOUS Personnels</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIEgzCCA2ugAwIBAgIRAN+fTxO99oLKFyV67Q3f9oUwDQYJKoZIhvcNAQEFBQAw
-NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-IFNTTCBDQTAeFw0xMzAxMzAwMDAwMDBaFw0xNjAxMzAyMzU5NTlaMFwxCzAJBgNV
-BAYTAkZSMTEwLwYDVQQKEyhDRU5UIE5BVElPTkFMIERFUyBPRVVWUkVTIFVOSVZF
-UlNJVEFJUkVTMRowGAYDVQQDExFpZHBjbm91cy5jbm91cy5mcjCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBAKmDZI9ioaT/upYky/FUoSsDM+ro/CmIlUQx
-878APgpaDBjBE9fDmQ2CYUcrOza6RSSfQPLxI6C6M0bRMSI73qFfipZyaBASRJlU
-K/Ksi2zE99N3+9/C44RoC5GecIw06Dh/XJAmMzMBmZC8DozWzyGqxxUvqjzmS5/X
-NPYUCIio0lATxdxn69AVMAmq13w5FTnQ5szxOs/32NHdhjC1e47i63fiuD0nfbzO
-MjPDGAP3fovPs5WCz6fboVIMvsBQmpJgAYN56OyihdcoDHjN99PeB9m4W8cbt278
-+Vy8FPJai04ewnk9ZV41d7FBQcmJjiLSo1N4Bv6gbwPSuP7dKFECAwEAAaOCAWQw
-ggFgMB8GA1UdIwQYMBaAFAy9k2gM896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBSi
-79FoH7qArry8MfcXBjuww+bjoTAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIw
-ADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwGAYDVR0gBBEwDzANBgsr
-BgEEAbIxAQICHTA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJl
-bmEub3JnL1RFUkVOQVNTTENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUH
-MAKGKWh0dHA6Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYG
-CCsGAQUFBzABhhpodHRwOi8vb2NzcC50Y3MudGVyZW5hLm9yZzAcBgNVHREEFTAT
-ghFpZHBjbm91cy5jbm91cy5mcjANBgkqhkiG9w0BAQUFAAOCAQEAUuPcmzXpxblf
-R0qTWKRTxfQQuH8NxLhQkpsHoARXU3DUKcpNrLkAgio1RAqJpm6S/qLssBxdFPqQ
-UFtI/C45HwIpk+X9gKFYfms5j/cX04y9+6zGJNX/rbQeLuDBmy8Ezak6ANQh0pFc
-4y8Om1X8GZuUdGxc5kN/lTiR87rRtD9Z+JX27C/dCtcvmM240w12EqNP9SsSzd4c
-GgtSQhKmeEnFDu1WDJo3hEgmJ1vual3s2T/+yDWswMdXVdsSVV6gjwMVCMLmhmEQ
-BYCUKfQUTVt7q7XD2d4Jc9DujMUsEUM+narQH37dQbMFli95mGkeqq+Eui33KuHN
-jwAZiSN1rg==
-					    </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://idpcnous.cnous.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idpcnous.cnous.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idpcnous.cnous.fr/idp/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">CNOUS Personnels</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">CNOUS Personnels</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <EmailAddress>equipe.systeme@cnous.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idpcnous.cnous.fr.xml b/swamid-interfederations-2.0/idpcnous.cnous.fr.xml
deleted file mode 100644
index 325744fd..00000000
--- a/swamid-interfederations-2.0/idpcnous.cnous.fr.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://idpcnous.cnous.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2013-02-07T10:05:15Z">
-      <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">cnous.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">CNOUS Personnels</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIEgzCCA2ugAwIBAgIRAN+fTxO99oLKFyV67Q3f9oUwDQYJKoZIhvcNAQEFBQAw
-NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-IFNTTCBDQTAeFw0xMzAxMzAwMDAwMDBaFw0xNjAxMzAyMzU5NTlaMFwxCzAJBgNV
-BAYTAkZSMTEwLwYDVQQKEyhDRU5UIE5BVElPTkFMIERFUyBPRVVWUkVTIFVOSVZF
-UlNJVEFJUkVTMRowGAYDVQQDExFpZHBjbm91cy5jbm91cy5mcjCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBAKmDZI9ioaT/upYky/FUoSsDM+ro/CmIlUQx
-878APgpaDBjBE9fDmQ2CYUcrOza6RSSfQPLxI6C6M0bRMSI73qFfipZyaBASRJlU
-K/Ksi2zE99N3+9/C44RoC5GecIw06Dh/XJAmMzMBmZC8DozWzyGqxxUvqjzmS5/X
-NPYUCIio0lATxdxn69AVMAmq13w5FTnQ5szxOs/32NHdhjC1e47i63fiuD0nfbzO
-MjPDGAP3fovPs5WCz6fboVIMvsBQmpJgAYN56OyihdcoDHjN99PeB9m4W8cbt278
-+Vy8FPJai04ewnk9ZV41d7FBQcmJjiLSo1N4Bv6gbwPSuP7dKFECAwEAAaOCAWQw
-ggFgMB8GA1UdIwQYMBaAFAy9k2gM896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBSi
-79FoH7qArry8MfcXBjuww+bjoTAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIw
-ADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwGAYDVR0gBBEwDzANBgsr
-BgEEAbIxAQICHTA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJl
-bmEub3JnL1RFUkVOQVNTTENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUH
-MAKGKWh0dHA6Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYG
-CCsGAQUFBzABhhpodHRwOi8vb2NzcC50Y3MudGVyZW5hLm9yZzAcBgNVHREEFTAT
-ghFpZHBjbm91cy5jbm91cy5mcjANBgkqhkiG9w0BAQUFAAOCAQEAUuPcmzXpxblf
-R0qTWKRTxfQQuH8NxLhQkpsHoARXU3DUKcpNrLkAgio1RAqJpm6S/qLssBxdFPqQ
-UFtI/C45HwIpk+X9gKFYfms5j/cX04y9+6zGJNX/rbQeLuDBmy8Ezak6ANQh0pFc
-4y8Om1X8GZuUdGxc5kN/lTiR87rRtD9Z+JX27C/dCtcvmM240w12EqNP9SsSzd4c
-GgtSQhKmeEnFDu1WDJo3hEgmJ1vual3s2T/+yDWswMdXVdsSVV6gjwMVCMLmhmEQ
-BYCUKfQUTVt7q7XD2d4Jc9DujMUsEUM+narQH37dQbMFli95mGkeqq+Eui33KuHN
-jwAZiSN1rg==
-					    </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://idpcnous.cnous.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idpcnous.cnous.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idpcnous.cnous.fr/idp/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">CNOUS Personnels</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">CNOUS Personnels</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <EmailAddress>equipe.systeme@cnous.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idpr.tem-tsp.eu-idp-shibboleth.xml b/swamid-interfederations-2.0/idpr.tem-tsp.eu-idp-shibboleth.xml
deleted file mode 100644
index b42251d1..00000000
--- a/swamid-interfederations-2.0/idpr.tem-tsp.eu-idp-shibboleth.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://idpr.tem-tsp.eu/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2009-02-26T10:38:50Z">
-      <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">tem-tsp.eu</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">telecom-em.eu</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">telecom-sudparis.eu</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">it-sudparis.eu</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">int-evry.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Telecom School of Management and Telecom SudParis</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Members of Evry Campus of Institute Mines Telecom, Telecom School of Management and Telecom SudParis</mdui:Description>
-        <mdui:DisplayName xml:lang="fr">Telecom SudParis et Telecom Management</mdui:DisplayName>
-        <mdui:Description xml:lang="fr">Membres du Campus d'Evry de l'Institut Mines Telecom , Telecom école de  Management et Telecom SudParis</mdui:Description>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDJzCCAg+gAwIBAgIUDJP/m/P4o+WqTNaBH+2OVPzIENUwDQYJKoZIhvcNAQEF
-BQAwGjEYMBYGA1UEAxMPaWRwci50ZW0tdHNwLmV1MB4XDTE0MDUxNDA4MzEzNVoX
-DTM0MDUxNDA4MzEzNVowGjEYMBYGA1UEAxMPaWRwci50ZW0tdHNwLmV1MIIBIjAN
-BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAjLvgF4BoRYbMI6NurGUHCG7sR5po
-XoKijYZaS3RQLV+TsdSXcwOFLrdlpEQHlniiI09Jdhstm4rCuXyD5XK9ov7mUBVM
-NGPBIMEdu97DDkmymRQp6duNlfcFpjdeGUPtQmXyG9vvleUrLr/09mr9pDzA+/H8
-yHw4f6TnbnGuJ3bjoo/D1bXsSmVlDJE1Fr37kSORcD4PCumbqcIzwrrv7FamoR++
-BhxHcBMeyM8lft2shYwdXt/PD/HB1sks/JRcxcjd+JjXRgHVkyoSXMQJEkbdUdIR
-ZIRk5Rc/mABlwXIzbQZPQbW7+kxcc9wFeXqZWNQviHIP54TFFSDPrbkFuQIDAQAB
-o2UwYzBCBgNVHREEOzA5gg9pZHByLnRlbS10c3AuZXWGJmh0dHBzOi8vaWRwci50
-ZW0tdHNwLmV1L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBSu7Oapkp9YZQ/+RMAq
-6lHe0V5SwDANBgkqhkiG9w0BAQUFAAOCAQEAAKsatorEb5X1Kip2lxjHMg31km9n
-8ARKM0sfr7hvnl8TidzcTXW5xYvTy/YsOrYSpc+IJgSP+UNvS1a96fcNNswDNGOv
-MfBtVkxXOSWDGJbh2xC8NymyRAzZXWym+kLABAkTWYjaXdypM+lL7femxFuxHtEs
-V8HZzsUOdJsa5F0WieIy6ENpxXqDsn54w/zLub+s+ZzJoX+jzD1ZAtOaRwmUCa8q
-pqwDllq5XdnRupVTEi5djUgqxLX1GZUhxJal+nW51SoZR8exZSikJlfRhrH2lgOj
-nY0kBaFLyUpV84QgSKKM4CoxwLx+J96/Obnkk5BpUp59XyUh75DR54XUQA==
-					    </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>
-					      MIIDSDCCAjCgAwIBAgIVAJv2l61sKf1VgzgHPgGRdmvIdBeGMA0GCSqGSIb3DQEB
-BQUAMCIxIDAeBgNVBAMTF3NoaWJpZHAxLml0LXN1ZHBhcmlzLmV1MB4XDTA4MTIw
-NDA4MjIwNFoXDTI4MTIwNDA4MjIwNFowIjEgMB4GA1UEAxMXc2hpYmlkcDEuaXQt
-c3VkcGFyaXMuZXUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDI6RH6
-/i1p4Fwnp+SxINDTFESSAByc3/a7gL4uIjufRKaraJIIuUfQ/8PQud6mTnKmTSY1
-+174E9r78IAThKTbdX0Y86JxcAlPXkaPFj3G2aMZEy7YkjxHg7bEqKmrtEmEi5ls
-69NQXJae1/v3ReBfNmsmb4lpfLqnspHzN0kM2x9ieuCUTuw6Umwc65Za9GK9J0n/
-8G370vVn9MUWcObx4qeqmeKvXK61KpAQQ5VPSrobB0NafFHq2OHb4Eq6NJmjb3xH
-Q0jNrga28YNDxKSjLF8hUolTr4bdBroqFKqqRK2DOukXsgkYgy6mTwxMbHlbzTX/
-URM7K655kFIcojcpAgMBAAGjdTBzMFIGA1UdEQRLMEmCF3NoaWJpZHAxLml0LXN1
-ZHBhcmlzLmV1hi5odHRwczovL3NoaWJpZHAxLml0LXN1ZHBhcmlzLmV1L2lkcC9z
-aGliYm9sZXRoMB0GA1UdDgQWBBS6EIElOxCx56mi697wUipVtEHCsjANBgkqhkiG
-9w0BAQUFAAOCAQEAxSHKlhfZ3cHud+7KJHl0seAdQpwOC11jLz9eOsIzjPSVnPJQ
-W8rUAUA2kWKiMrmQS6t6nEpPKnx5BcySXMLi5wuvcQ40IWUnPtebALmh26KSheiE
-7rmFxq4bKZhG+ZoOqYphlDhqPoDLVpMny5jgePyq5gvLFO03a7e3DsLeH1Shf6sk
-17+1tixG41PVxw5Lfl8ODvBF2wmY/josVaZfJ3CbJoQhByUDAGH/Cf327CcefloP
-PoLdCyt/DO1aGflUdiQA/DF96+XlbGEQL7edHtEsELKz66Z8WK6fasHqNInlTe+S
-SA354+sPezlzSyImVbYaHH6naLQuFV7cmUNPOQ==
-					    </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://idpr.tem-tsp.eu/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idpr.tem-tsp.eu/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idpr.tem-tsp.eu/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">tem-tsp.eu</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">telecom-em.eu</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">telecom-sudparis.eu</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">it-sudparis.eu</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">int-evry.fr</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDJzCCAg+gAwIBAgIUDJP/m/P4o+WqTNaBH+2OVPzIENUwDQYJKoZIhvcNAQEF
-BQAwGjEYMBYGA1UEAxMPaWRwci50ZW0tdHNwLmV1MB4XDTE0MDUxNDA4MzEzNVoX
-DTM0MDUxNDA4MzEzNVowGjEYMBYGA1UEAxMPaWRwci50ZW0tdHNwLmV1MIIBIjAN
-BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAjLvgF4BoRYbMI6NurGUHCG7sR5po
-XoKijYZaS3RQLV+TsdSXcwOFLrdlpEQHlniiI09Jdhstm4rCuXyD5XK9ov7mUBVM
-NGPBIMEdu97DDkmymRQp6duNlfcFpjdeGUPtQmXyG9vvleUrLr/09mr9pDzA+/H8
-yHw4f6TnbnGuJ3bjoo/D1bXsSmVlDJE1Fr37kSORcD4PCumbqcIzwrrv7FamoR++
-BhxHcBMeyM8lft2shYwdXt/PD/HB1sks/JRcxcjd+JjXRgHVkyoSXMQJEkbdUdIR
-ZIRk5Rc/mABlwXIzbQZPQbW7+kxcc9wFeXqZWNQviHIP54TFFSDPrbkFuQIDAQAB
-o2UwYzBCBgNVHREEOzA5gg9pZHByLnRlbS10c3AuZXWGJmh0dHBzOi8vaWRwci50
-ZW0tdHNwLmV1L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBSu7Oapkp9YZQ/+RMAq
-6lHe0V5SwDANBgkqhkiG9w0BAQUFAAOCAQEAAKsatorEb5X1Kip2lxjHMg31km9n
-8ARKM0sfr7hvnl8TidzcTXW5xYvTy/YsOrYSpc+IJgSP+UNvS1a96fcNNswDNGOv
-MfBtVkxXOSWDGJbh2xC8NymyRAzZXWym+kLABAkTWYjaXdypM+lL7femxFuxHtEs
-V8HZzsUOdJsa5F0WieIy6ENpxXqDsn54w/zLub+s+ZzJoX+jzD1ZAtOaRwmUCa8q
-pqwDllq5XdnRupVTEi5djUgqxLX1GZUhxJal+nW51SoZR8exZSikJlfRhrH2lgOj
-nY0kBaFLyUpV84QgSKKM4CoxwLx+J96/Obnkk5BpUp59XyUh75DR54XUQA==
-					    </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>
-					      MIIDSDCCAjCgAwIBAgIVAJv2l61sKf1VgzgHPgGRdmvIdBeGMA0GCSqGSIb3DQEB
-BQUAMCIxIDAeBgNVBAMTF3NoaWJpZHAxLml0LXN1ZHBhcmlzLmV1MB4XDTA4MTIw
-NDA4MjIwNFoXDTI4MTIwNDA4MjIwNFowIjEgMB4GA1UEAxMXc2hpYmlkcDEuaXQt
-c3VkcGFyaXMuZXUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDI6RH6
-/i1p4Fwnp+SxINDTFESSAByc3/a7gL4uIjufRKaraJIIuUfQ/8PQud6mTnKmTSY1
-+174E9r78IAThKTbdX0Y86JxcAlPXkaPFj3G2aMZEy7YkjxHg7bEqKmrtEmEi5ls
-69NQXJae1/v3ReBfNmsmb4lpfLqnspHzN0kM2x9ieuCUTuw6Umwc65Za9GK9J0n/
-8G370vVn9MUWcObx4qeqmeKvXK61KpAQQ5VPSrobB0NafFHq2OHb4Eq6NJmjb3xH
-Q0jNrga28YNDxKSjLF8hUolTr4bdBroqFKqqRK2DOukXsgkYgy6mTwxMbHlbzTX/
-URM7K655kFIcojcpAgMBAAGjdTBzMFIGA1UdEQRLMEmCF3NoaWJpZHAxLml0LXN1
-ZHBhcmlzLmV1hi5odHRwczovL3NoaWJpZHAxLml0LXN1ZHBhcmlzLmV1L2lkcC9z
-aGliYm9sZXRoMB0GA1UdDgQWBBS6EIElOxCx56mi697wUipVtEHCsjANBgkqhkiG
-9w0BAQUFAAOCAQEAxSHKlhfZ3cHud+7KJHl0seAdQpwOC11jLz9eOsIzjPSVnPJQ
-W8rUAUA2kWKiMrmQS6t6nEpPKnx5BcySXMLi5wuvcQ40IWUnPtebALmh26KSheiE
-7rmFxq4bKZhG+ZoOqYphlDhqPoDLVpMny5jgePyq5gvLFO03a7e3DsLeH1Shf6sk
-17+1tixG41PVxw5Lfl8ODvBF2wmY/josVaZfJ3CbJoQhByUDAGH/Cf327CcefloP
-PoLdCyt/DO1aGflUdiQA/DF96+XlbGEQL7edHtEsELKz66Z8WK6fasHqNInlTe+S
-SA354+sPezlzSyImVbYaHH6naLQuFV7cmUNPOQ==
-					    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idpr.tem-tsp.eu/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">Telecom SudParis et Telecom Management</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Telecom SudParis et Telecom Management</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <EmailAddress>infomatique@tem-tsp.eu</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idpr.tem-tsp.eu.xml b/swamid-interfederations-2.0/idpr.tem-tsp.eu.xml
deleted file mode 100644
index b42251d1..00000000
--- a/swamid-interfederations-2.0/idpr.tem-tsp.eu.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://idpr.tem-tsp.eu/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2009-02-26T10:38:50Z">
-      <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">tem-tsp.eu</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">telecom-em.eu</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">telecom-sudparis.eu</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">it-sudparis.eu</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">int-evry.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Telecom School of Management and Telecom SudParis</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Members of Evry Campus of Institute Mines Telecom, Telecom School of Management and Telecom SudParis</mdui:Description>
-        <mdui:DisplayName xml:lang="fr">Telecom SudParis et Telecom Management</mdui:DisplayName>
-        <mdui:Description xml:lang="fr">Membres du Campus d'Evry de l'Institut Mines Telecom , Telecom école de  Management et Telecom SudParis</mdui:Description>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDJzCCAg+gAwIBAgIUDJP/m/P4o+WqTNaBH+2OVPzIENUwDQYJKoZIhvcNAQEF
-BQAwGjEYMBYGA1UEAxMPaWRwci50ZW0tdHNwLmV1MB4XDTE0MDUxNDA4MzEzNVoX
-DTM0MDUxNDA4MzEzNVowGjEYMBYGA1UEAxMPaWRwci50ZW0tdHNwLmV1MIIBIjAN
-BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAjLvgF4BoRYbMI6NurGUHCG7sR5po
-XoKijYZaS3RQLV+TsdSXcwOFLrdlpEQHlniiI09Jdhstm4rCuXyD5XK9ov7mUBVM
-NGPBIMEdu97DDkmymRQp6duNlfcFpjdeGUPtQmXyG9vvleUrLr/09mr9pDzA+/H8
-yHw4f6TnbnGuJ3bjoo/D1bXsSmVlDJE1Fr37kSORcD4PCumbqcIzwrrv7FamoR++
-BhxHcBMeyM8lft2shYwdXt/PD/HB1sks/JRcxcjd+JjXRgHVkyoSXMQJEkbdUdIR
-ZIRk5Rc/mABlwXIzbQZPQbW7+kxcc9wFeXqZWNQviHIP54TFFSDPrbkFuQIDAQAB
-o2UwYzBCBgNVHREEOzA5gg9pZHByLnRlbS10c3AuZXWGJmh0dHBzOi8vaWRwci50
-ZW0tdHNwLmV1L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBSu7Oapkp9YZQ/+RMAq
-6lHe0V5SwDANBgkqhkiG9w0BAQUFAAOCAQEAAKsatorEb5X1Kip2lxjHMg31km9n
-8ARKM0sfr7hvnl8TidzcTXW5xYvTy/YsOrYSpc+IJgSP+UNvS1a96fcNNswDNGOv
-MfBtVkxXOSWDGJbh2xC8NymyRAzZXWym+kLABAkTWYjaXdypM+lL7femxFuxHtEs
-V8HZzsUOdJsa5F0WieIy6ENpxXqDsn54w/zLub+s+ZzJoX+jzD1ZAtOaRwmUCa8q
-pqwDllq5XdnRupVTEi5djUgqxLX1GZUhxJal+nW51SoZR8exZSikJlfRhrH2lgOj
-nY0kBaFLyUpV84QgSKKM4CoxwLx+J96/Obnkk5BpUp59XyUh75DR54XUQA==
-					    </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>
-					      MIIDSDCCAjCgAwIBAgIVAJv2l61sKf1VgzgHPgGRdmvIdBeGMA0GCSqGSIb3DQEB
-BQUAMCIxIDAeBgNVBAMTF3NoaWJpZHAxLml0LXN1ZHBhcmlzLmV1MB4XDTA4MTIw
-NDA4MjIwNFoXDTI4MTIwNDA4MjIwNFowIjEgMB4GA1UEAxMXc2hpYmlkcDEuaXQt
-c3VkcGFyaXMuZXUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDI6RH6
-/i1p4Fwnp+SxINDTFESSAByc3/a7gL4uIjufRKaraJIIuUfQ/8PQud6mTnKmTSY1
-+174E9r78IAThKTbdX0Y86JxcAlPXkaPFj3G2aMZEy7YkjxHg7bEqKmrtEmEi5ls
-69NQXJae1/v3ReBfNmsmb4lpfLqnspHzN0kM2x9ieuCUTuw6Umwc65Za9GK9J0n/
-8G370vVn9MUWcObx4qeqmeKvXK61KpAQQ5VPSrobB0NafFHq2OHb4Eq6NJmjb3xH
-Q0jNrga28YNDxKSjLF8hUolTr4bdBroqFKqqRK2DOukXsgkYgy6mTwxMbHlbzTX/
-URM7K655kFIcojcpAgMBAAGjdTBzMFIGA1UdEQRLMEmCF3NoaWJpZHAxLml0LXN1
-ZHBhcmlzLmV1hi5odHRwczovL3NoaWJpZHAxLml0LXN1ZHBhcmlzLmV1L2lkcC9z
-aGliYm9sZXRoMB0GA1UdDgQWBBS6EIElOxCx56mi697wUipVtEHCsjANBgkqhkiG
-9w0BAQUFAAOCAQEAxSHKlhfZ3cHud+7KJHl0seAdQpwOC11jLz9eOsIzjPSVnPJQ
-W8rUAUA2kWKiMrmQS6t6nEpPKnx5BcySXMLi5wuvcQ40IWUnPtebALmh26KSheiE
-7rmFxq4bKZhG+ZoOqYphlDhqPoDLVpMny5jgePyq5gvLFO03a7e3DsLeH1Shf6sk
-17+1tixG41PVxw5Lfl8ODvBF2wmY/josVaZfJ3CbJoQhByUDAGH/Cf327CcefloP
-PoLdCyt/DO1aGflUdiQA/DF96+XlbGEQL7edHtEsELKz66Z8WK6fasHqNInlTe+S
-SA354+sPezlzSyImVbYaHH6naLQuFV7cmUNPOQ==
-					    </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://idpr.tem-tsp.eu/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idpr.tem-tsp.eu/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idpr.tem-tsp.eu/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">tem-tsp.eu</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">telecom-em.eu</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">telecom-sudparis.eu</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">it-sudparis.eu</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">int-evry.fr</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDJzCCAg+gAwIBAgIUDJP/m/P4o+WqTNaBH+2OVPzIENUwDQYJKoZIhvcNAQEF
-BQAwGjEYMBYGA1UEAxMPaWRwci50ZW0tdHNwLmV1MB4XDTE0MDUxNDA4MzEzNVoX
-DTM0MDUxNDA4MzEzNVowGjEYMBYGA1UEAxMPaWRwci50ZW0tdHNwLmV1MIIBIjAN
-BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAjLvgF4BoRYbMI6NurGUHCG7sR5po
-XoKijYZaS3RQLV+TsdSXcwOFLrdlpEQHlniiI09Jdhstm4rCuXyD5XK9ov7mUBVM
-NGPBIMEdu97DDkmymRQp6duNlfcFpjdeGUPtQmXyG9vvleUrLr/09mr9pDzA+/H8
-yHw4f6TnbnGuJ3bjoo/D1bXsSmVlDJE1Fr37kSORcD4PCumbqcIzwrrv7FamoR++
-BhxHcBMeyM8lft2shYwdXt/PD/HB1sks/JRcxcjd+JjXRgHVkyoSXMQJEkbdUdIR
-ZIRk5Rc/mABlwXIzbQZPQbW7+kxcc9wFeXqZWNQviHIP54TFFSDPrbkFuQIDAQAB
-o2UwYzBCBgNVHREEOzA5gg9pZHByLnRlbS10c3AuZXWGJmh0dHBzOi8vaWRwci50
-ZW0tdHNwLmV1L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBSu7Oapkp9YZQ/+RMAq
-6lHe0V5SwDANBgkqhkiG9w0BAQUFAAOCAQEAAKsatorEb5X1Kip2lxjHMg31km9n
-8ARKM0sfr7hvnl8TidzcTXW5xYvTy/YsOrYSpc+IJgSP+UNvS1a96fcNNswDNGOv
-MfBtVkxXOSWDGJbh2xC8NymyRAzZXWym+kLABAkTWYjaXdypM+lL7femxFuxHtEs
-V8HZzsUOdJsa5F0WieIy6ENpxXqDsn54w/zLub+s+ZzJoX+jzD1ZAtOaRwmUCa8q
-pqwDllq5XdnRupVTEi5djUgqxLX1GZUhxJal+nW51SoZR8exZSikJlfRhrH2lgOj
-nY0kBaFLyUpV84QgSKKM4CoxwLx+J96/Obnkk5BpUp59XyUh75DR54XUQA==
-					    </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>
-					      MIIDSDCCAjCgAwIBAgIVAJv2l61sKf1VgzgHPgGRdmvIdBeGMA0GCSqGSIb3DQEB
-BQUAMCIxIDAeBgNVBAMTF3NoaWJpZHAxLml0LXN1ZHBhcmlzLmV1MB4XDTA4MTIw
-NDA4MjIwNFoXDTI4MTIwNDA4MjIwNFowIjEgMB4GA1UEAxMXc2hpYmlkcDEuaXQt
-c3VkcGFyaXMuZXUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDI6RH6
-/i1p4Fwnp+SxINDTFESSAByc3/a7gL4uIjufRKaraJIIuUfQ/8PQud6mTnKmTSY1
-+174E9r78IAThKTbdX0Y86JxcAlPXkaPFj3G2aMZEy7YkjxHg7bEqKmrtEmEi5ls
-69NQXJae1/v3ReBfNmsmb4lpfLqnspHzN0kM2x9ieuCUTuw6Umwc65Za9GK9J0n/
-8G370vVn9MUWcObx4qeqmeKvXK61KpAQQ5VPSrobB0NafFHq2OHb4Eq6NJmjb3xH
-Q0jNrga28YNDxKSjLF8hUolTr4bdBroqFKqqRK2DOukXsgkYgy6mTwxMbHlbzTX/
-URM7K655kFIcojcpAgMBAAGjdTBzMFIGA1UdEQRLMEmCF3NoaWJpZHAxLml0LXN1
-ZHBhcmlzLmV1hi5odHRwczovL3NoaWJpZHAxLml0LXN1ZHBhcmlzLmV1L2lkcC9z
-aGliYm9sZXRoMB0GA1UdDgQWBBS6EIElOxCx56mi697wUipVtEHCsjANBgkqhkiG
-9w0BAQUFAAOCAQEAxSHKlhfZ3cHud+7KJHl0seAdQpwOC11jLz9eOsIzjPSVnPJQ
-W8rUAUA2kWKiMrmQS6t6nEpPKnx5BcySXMLi5wuvcQ40IWUnPtebALmh26KSheiE
-7rmFxq4bKZhG+ZoOqYphlDhqPoDLVpMny5jgePyq5gvLFO03a7e3DsLeH1Shf6sk
-17+1tixG41PVxw5Lfl8ODvBF2wmY/josVaZfJ3CbJoQhByUDAGH/Cf327CcefloP
-PoLdCyt/DO1aGflUdiQA/DF96+XlbGEQL7edHtEsELKz66Z8WK6fasHqNInlTe+S
-SA354+sPezlzSyImVbYaHH6naLQuFV7cmUNPOQ==
-					    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idpr.tem-tsp.eu/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">Telecom SudParis et Telecom Management</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Telecom SudParis et Telecom Management</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <EmailAddress>infomatique@tem-tsp.eu</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idpshib01.ifma.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/idpshib01.ifma.fr-idp-shibboleth.xml
deleted file mode 100644
index 364581f6..00000000
--- a/swamid-interfederations-2.0/idpshib01.ifma.fr-idp-shibboleth.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://idpshib01.ifma.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2011-02-16T15:38:32Z">
-      <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">ifma.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">IFMA Clermont-Ferrand - Institut Francais de Mecanique Avancee</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIEcDCCA1igAwIBAgIQeWTtozL+4yMlqLCyZXkkqjANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTExMTIyMDAwMDAwMFoXDTEzMDEwODIzNTk1OVowUjELMAkGA1UE
-BhMCRlIxLzAtBgNVBAoTJkluc3RpdHV0IEZyYW5jYWlzIGRlIE1lY2FuaXF1ZSBB
-dmFuY2VlMRIwEAYDVQQDFAkqLmlmbWEuZnIwggEiMA0GCSqGSIb3DQEBAQUAA4IB
-DwAwggEKAoIBAQDT0T6oBcfYbOMw1YVxmnJSN4p4OHVERMf0c9fX8euMywkzeC7E
-53ijhMu2qLR9dXpyqz3ZBr9aL+/XeyjiF/FAbq8y3ebUywfA9IN0F3wYtjhD8KEa
-YxEvt//JDgg20KGX23WEdr3SZjvMTZgHClfwwRNBvmZtslgsUPChxn+buphf4ZrO
-BdI4gwW4yW4cOM5gBDnj7cpxXL/5ClfvE+Gf9YOJhI9Ou90oySma441KewXyzCvz
-aiffk0Paxcrh8nzP7s531366gm6T5D6syFPmOKrT49r8eyYOKHiwO/0iX250AN+3
-U6xb90aM/q2iAU6kSVznC4LsUkdK7b0aWxgtAgMBAAGjggFcMIIBWDAfBgNVHSME
-GDAWgBQMvZNoDPPeq6NJays3V0fqkOO57TAdBgNVHQ4EFgQUmcSMqeTuutpp0yVl
-Guv4BnmpyUQwDgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYw
-FAYIKwYBBQUHAwEGCCsGAQUFBwMCMBgGA1UdIAQRMA8wDQYLKwYBBAGyMQECAh0w
-OgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJF
-TkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8v
-Y3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYa
-aHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwFAYDVR0RBA0wC4IJKi5pZm1hLmZy
-MA0GCSqGSIb3DQEBBQUAA4IBAQA4WLst0L7sOZ95kiql+s0F759dOaAX3Cl7ZmHZ
-zSG5JVd7yiEbW1vYSweXgBvoX9r/CAhbD8jnbPYdst6c25ux8gMlSLIbfELKsvfK
-siwJ96dtRbGaZW5/pupYJEQlnZR91oFgv+iZqefxVQw44TD7MbDqkYzVVMamT+ZM
-l4Qpi4VdqnK4Tt47CqosYm5Y/NwMsE20yw4IbQSFJyhWthhVJ62lyekh+SnRRUNn
-s50/E8fZWkQetEbw3KpZy2H/eL7loEb6/mJdDFmXd1onNu+4U366Rw3501o7NGbF
-1disNesj8I3wk+psj7WYU56fxmDDdj/F/XB66PmkewkLZL5p
-					    </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>
-					      MIIEizCCA3OgAwIBAgIQLEf5g3ZzwyyqC0OTVDv9IDANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTExMDEwNDAwMDAwMFoXDTEyMDExMDIzNTk1OVowZDELMAkGA1UE
-BhMCRlIxEDAOBgNVBAcTB0FVQklFUkUxLzAtBgNVBAoTJkluc3RpdHV0IEZyYW5j
-YWlzIGRlIE1lY2FuaXF1ZSBBdmFuY2VlMRIwEAYDVQQDFAkqLmlmbWEuZnIwggEi
-MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDTubF0AC1JSefOfgsFnhZ9xQRh
-TrPenpaPberQU90k56eZAdpPv4LNs8UfF4Pc3LSI84+Y+qNcjyMdLXkl4ao7P5li
-ewWVRFGy+tsQh0DDZuejXwSV8+VToa4zUO1FFscg8AjfFua+tKAezlXYX9BLvGYJ
-EZ1OzrK1Wf/FNhak5WNPukrGRrkTUyPbvA4EgaE0GgJoooSuDpnroEAOU2CYV+Ak
-FjE1JAeTiZbTRaSix9YH1XaLu9jF0K69VP7m8gVFMdOAlMyPKfGiy/SVOAFbZlIV
-aYekIb4sQkiZMPuRkSKBbmNQt+ep7sZvv3+r5yuqdi2LwspBuUvBu3wUswktAgMB
-AAGjggFlMIIBYTAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3V0fqkOO57TAdBgNV
-HQ4EFgQUGWxA3csb7HJBW2EjErKBTZWKuwUwDgYDVR0PAQH/BAQDAgWgMAwGA1Ud
-EwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMBgGA1UdIAQR
-MA8wDQYLKwYBBAGyMQECAh0wOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50
-Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUG
-CCsGAQUFBzAChilodHRwOi8vY3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENB
-LmNydDAmBggrBgEFBQcwAYYaaHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwHQYD
-VR0RBBYwFIIJKi5pZm1hLmZyggdpZm1hLmZyMA0GCSqGSIb3DQEBBQUAA4IBAQBO
-b1eGtVUy3poSFOKP+8/BvDLo3zMK3MKt3f79Lz7ksc15vzvazzgYZdoSsHGvGEvh
-B547OOjJ5cY8I64BUH8dBkqEJeJdhFkPD3w2aruHbK6o4jLFfvN7bWVga9zb5hUp
-QjJGfMJnTF18fWmQyHH4ls5WV5vxiSkxZ9NndkIcJifIQtExOraKtKEAlqEZhfEs
-iM1pw6S3F4ntyFWHen/2vMGrasgRv4fXVe8upcrCcVzCQbRM+WaGVExOzCt7t6DW
-uSPJk5uXJUYd4cze+6H0Sbm3WrrzNutRVSiWDIsjGSRpjA7P8OfjNq7r+G4KVqCy
-1wDmC7ZqG8IpwAXFiRYi
-					    </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://idpshib01.ifma.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idpshib01.ifma.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idpshib01.ifma.fr/idp/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">IFMA Clermont-Ferrand - Institut Francais de Mecanique Avancee</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">IFMA Clermont-Ferrand - Institut Francais de Mecanique Avancee</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Christophe DUMONET</SurName>
-    <EmailAddress>christophe.dumonet@ifma.fr</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <SurName>Frédéric DEDIEU</SurName>
-    <EmailAddress>frederic.dedieu@ifma.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idpshib01.ifma.fr.xml b/swamid-interfederations-2.0/idpshib01.ifma.fr.xml
deleted file mode 100644
index 364581f6..00000000
--- a/swamid-interfederations-2.0/idpshib01.ifma.fr.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://idpshib01.ifma.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2011-02-16T15:38:32Z">
-      <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">ifma.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">IFMA Clermont-Ferrand - Institut Francais de Mecanique Avancee</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIEcDCCA1igAwIBAgIQeWTtozL+4yMlqLCyZXkkqjANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTExMTIyMDAwMDAwMFoXDTEzMDEwODIzNTk1OVowUjELMAkGA1UE
-BhMCRlIxLzAtBgNVBAoTJkluc3RpdHV0IEZyYW5jYWlzIGRlIE1lY2FuaXF1ZSBB
-dmFuY2VlMRIwEAYDVQQDFAkqLmlmbWEuZnIwggEiMA0GCSqGSIb3DQEBAQUAA4IB
-DwAwggEKAoIBAQDT0T6oBcfYbOMw1YVxmnJSN4p4OHVERMf0c9fX8euMywkzeC7E
-53ijhMu2qLR9dXpyqz3ZBr9aL+/XeyjiF/FAbq8y3ebUywfA9IN0F3wYtjhD8KEa
-YxEvt//JDgg20KGX23WEdr3SZjvMTZgHClfwwRNBvmZtslgsUPChxn+buphf4ZrO
-BdI4gwW4yW4cOM5gBDnj7cpxXL/5ClfvE+Gf9YOJhI9Ou90oySma441KewXyzCvz
-aiffk0Paxcrh8nzP7s531366gm6T5D6syFPmOKrT49r8eyYOKHiwO/0iX250AN+3
-U6xb90aM/q2iAU6kSVznC4LsUkdK7b0aWxgtAgMBAAGjggFcMIIBWDAfBgNVHSME
-GDAWgBQMvZNoDPPeq6NJays3V0fqkOO57TAdBgNVHQ4EFgQUmcSMqeTuutpp0yVl
-Guv4BnmpyUQwDgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYw
-FAYIKwYBBQUHAwEGCCsGAQUFBwMCMBgGA1UdIAQRMA8wDQYLKwYBBAGyMQECAh0w
-OgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJF
-TkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8v
-Y3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYa
-aHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwFAYDVR0RBA0wC4IJKi5pZm1hLmZy
-MA0GCSqGSIb3DQEBBQUAA4IBAQA4WLst0L7sOZ95kiql+s0F759dOaAX3Cl7ZmHZ
-zSG5JVd7yiEbW1vYSweXgBvoX9r/CAhbD8jnbPYdst6c25ux8gMlSLIbfELKsvfK
-siwJ96dtRbGaZW5/pupYJEQlnZR91oFgv+iZqefxVQw44TD7MbDqkYzVVMamT+ZM
-l4Qpi4VdqnK4Tt47CqosYm5Y/NwMsE20yw4IbQSFJyhWthhVJ62lyekh+SnRRUNn
-s50/E8fZWkQetEbw3KpZy2H/eL7loEb6/mJdDFmXd1onNu+4U366Rw3501o7NGbF
-1disNesj8I3wk+psj7WYU56fxmDDdj/F/XB66PmkewkLZL5p
-					    </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>
-					      MIIEizCCA3OgAwIBAgIQLEf5g3ZzwyyqC0OTVDv9IDANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTExMDEwNDAwMDAwMFoXDTEyMDExMDIzNTk1OVowZDELMAkGA1UE
-BhMCRlIxEDAOBgNVBAcTB0FVQklFUkUxLzAtBgNVBAoTJkluc3RpdHV0IEZyYW5j
-YWlzIGRlIE1lY2FuaXF1ZSBBdmFuY2VlMRIwEAYDVQQDFAkqLmlmbWEuZnIwggEi
-MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDTubF0AC1JSefOfgsFnhZ9xQRh
-TrPenpaPberQU90k56eZAdpPv4LNs8UfF4Pc3LSI84+Y+qNcjyMdLXkl4ao7P5li
-ewWVRFGy+tsQh0DDZuejXwSV8+VToa4zUO1FFscg8AjfFua+tKAezlXYX9BLvGYJ
-EZ1OzrK1Wf/FNhak5WNPukrGRrkTUyPbvA4EgaE0GgJoooSuDpnroEAOU2CYV+Ak
-FjE1JAeTiZbTRaSix9YH1XaLu9jF0K69VP7m8gVFMdOAlMyPKfGiy/SVOAFbZlIV
-aYekIb4sQkiZMPuRkSKBbmNQt+ep7sZvv3+r5yuqdi2LwspBuUvBu3wUswktAgMB
-AAGjggFlMIIBYTAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3V0fqkOO57TAdBgNV
-HQ4EFgQUGWxA3csb7HJBW2EjErKBTZWKuwUwDgYDVR0PAQH/BAQDAgWgMAwGA1Ud
-EwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMBgGA1UdIAQR
-MA8wDQYLKwYBBAGyMQECAh0wOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50
-Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUG
-CCsGAQUFBzAChilodHRwOi8vY3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENB
-LmNydDAmBggrBgEFBQcwAYYaaHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwHQYD
-VR0RBBYwFIIJKi5pZm1hLmZyggdpZm1hLmZyMA0GCSqGSIb3DQEBBQUAA4IBAQBO
-b1eGtVUy3poSFOKP+8/BvDLo3zMK3MKt3f79Lz7ksc15vzvazzgYZdoSsHGvGEvh
-B547OOjJ5cY8I64BUH8dBkqEJeJdhFkPD3w2aruHbK6o4jLFfvN7bWVga9zb5hUp
-QjJGfMJnTF18fWmQyHH4ls5WV5vxiSkxZ9NndkIcJifIQtExOraKtKEAlqEZhfEs
-iM1pw6S3F4ntyFWHen/2vMGrasgRv4fXVe8upcrCcVzCQbRM+WaGVExOzCt7t6DW
-uSPJk5uXJUYd4cze+6H0Sbm3WrrzNutRVSiWDIsjGSRpjA7P8OfjNq7r+G4KVqCy
-1wDmC7ZqG8IpwAXFiRYi
-					    </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://idpshib01.ifma.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idpshib01.ifma.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idpshib01.ifma.fr/idp/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">IFMA Clermont-Ferrand - Institut Francais de Mecanique Avancee</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">IFMA Clermont-Ferrand - Institut Francais de Mecanique Avancee</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Christophe DUMONET</SurName>
-    <EmailAddress>christophe.dumonet@ifma.fr</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <SurName>Frédéric DEDIEU</SurName>
-    <EmailAddress>frederic.dedieu@ifma.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idpstaff.belnet.be-idp-shibboleth.xml b/swamid-interfederations-2.0/idpstaff.belnet.be-idp-shibboleth.xml
deleted file mode 100644
index 7b30b1ec..00000000
--- a/swamid-interfederations-2.0/idpstaff.belnet.be-idp-shibboleth.xml
+++ /dev/null
@@ -1,123 +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: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:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://idpstaff.belnet.be/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://federation.belnet.be/" registrationInstant="2012-03-27T12:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://federation.belnet.be/files/Belnet-metadata-registration-practice-statement.txt</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">belnet.be</shibmd:Scope>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="en">Belnet</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Belnet operates the research and eduction network for Belgium.</mdui:Description>
-        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAAZiS0dEAP8A/wD/oL2nkwAAAAlwSFlzAAALEwAACxMBAJqcGAAAAAd0SU1FB9wDHQktK8+8G0YAAAG+SURBVDjLhZNNaxNRFIafMzN3moxp0iollRSpGqwuuhNFUhSFrgvdSOsPEH9G967ci+CuIIUixYXQRZFC8QM3IlgoqQgtuKhNSSfOzL3jIhM6M2nigcuF+/He9zznHmHpZUwv4hhEGBq5M9bAy3F8NtIhkllzMhuAAK5t4SkbZQunoeY00BhjumdyBp28+NNHMyzemaZSVBSVw7Ef0Px9wpudJu++/iLQZkAKgLIt5mdrzM/WuF4t49jC9ESJ5UadV8/us3D7CuQySjHo2ehOr7d2ebiywYOVDdY/7zN+YYR7N6pDUpCsdKhj2qEmAvwgAuBvqPuKkmIgGSdLjWs0ZqoUXZtbtTF+HByzttPs7gvnM0hHuxNx+MfnqB0QaoPn2lQ8RR5Cv0CivvaxyeMXmyw8f8/q9h5Tl0os3r2KZVmDy5iviKdsRguK0YLqvmbJMAYZAzyZqzN3c5Jxz6U+WebED/jw/RBjYkgJZQQibdj8dkC1UuSi53K5XKDVCXn75Ser23usf9rv6xXJNFMCpTRiU3IdlCX4keHIDwkjnXxlGZ6CAVodTasTnZVMJLH9Pwa9jpSEhpxDJ9e1/wBQnZONeR0FdQAAAABJRU5ErkJggg==</mdui:Logo>
-        <mdui:Logo height="75" width="153">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAJkAAABLCAIAAADsyLLJAAAACXBIWXMAABcRAAAXEQHKJvM/AAAFOnpUWHRSYXcgcHJvZmlsZSB0eXBlIHhtcAAAeNqtWEmWpDgM3esUfQRjeYDjEAHs+r1e1vH7f9kEQ5gMoqqSTBJsWfqabeTXv//JP/jxyanoU5fcZ5e6pOmRYg7eJZ9iymlIs04+z8vj8Vh8xviQAkdi1hgmdWHKLiho+zRI6POYsTBqHsMcQ8J/MFTFIp910dmN+sy9jrlPWJgmCkudd3xPzzRn5ZxQAtCEtBCHjmXiRQ4klZUHTdIx+hBCOrHBnGCSrPoccDkdsXTJ9uPnDCo/pwWE2S/a6cALT0497h73qQjwk2TNsAWl595PlIB5Q+FG7zYkgAHTQHGfhuxAP0CHeUMmpggs08DlYFWfnhsm0uEesTBSeQKAYGD1s+jLDt4RgTEdU7LFE3AGnSEdT/BjBJsRBodP9VkYr7SyEh8ZETr+IHmdOajZpee2pszJOolFw6qxvXVphlwobLaDhSC5y5EsqEHwpuJM78YlqIQpDuFBoHuWexzbzBHJphzxy16Bw6Kml669KVfuLPHKWH73pwXJvIUxnlXwOAFHD/1dcaS6ox8ruzHUaE+MOfyF8h/aIPQc3I+FE+6IUkRsFwOeg46MS9wdYvvBcXsuyjcZy55zAwPNOaSUh6P8d/FEpDv5fRxPUhus3gQqAzKW6U8SPykse67vTFuyKxUCJdJrCwJ4Dp28XOjCALc/Wf7gaL8SY1yjAs1e4QY7Ib8/DUbSyc/BGCbU5j8JSDCcWmFpjMfAUqgWQ2ABm8KjonMh8aw67BJj8AGdAGbxIYVOe3glwlcddOhx74Ivd8yRAq5R/ArM6EKHwW4z57XcC4SBxtb8KpskhaWqKekZmHKxggtGpTZV9OGMXr6Bv6Fnu/TLHp/sANL9Q+mwUOdJwGe8sGjEiKFRsmcW9GhSnjYaqmFDwYF3pIPhjHh2hIKRyCV47N9saQDkE4KWcSPj2uy0xiC8xjKfaa8508zMHRramcFPslsM1vVy6dBoCZKwFC8mYtp5FLuXjHjF5iPkgZ3ONhHx5Gif1x5ySBrElGFKraSR96xpJw23REW2X86C+Y7dyLppePXTTfKYmtG9DwGMkha5pnxEHWTZcdgksCJmZcmZ4GpM2hj6vqJG4cI7L4zg3dxhguUnyRcom2Ei5+yxSO2tHneGjPgYvx+SRw65/1HuBUbb1vx2dh2TS25n1wnBGYDchZ9/SA+mlzTz6zaDbacknzPsXruST/3qql2lUzuV0i3v9a6ShanZkaW9uWoToyJZ9KOABMy5WCpYIrVwq2ADtv+3DebXTMhD/kbfJ51c9/0Yois77TvWk2YRCzyJ8PTx3v0r+zFwDcoR8CjAeBb/iIaSGEF5s9UM/Nyes8O+WsAVE/KQFpN7GLg8mjuorJR+YGmAk9v3SFZWPPidWF3gQZCUoxZzbL93KRRyJrlgw8NYv9JF4MEROu77nJwb3Xd9LjDObHModzPspz5HdlKLmpbA3I7G++JW5Y44dc+onQNYDfXK9XwCrx3I2gxSb+Ylg6ClrfV15/2ikkJ2gYCeHCw8p5LKdkzmmYiRp3tWclywlc47Xnvb+q3kuD/raYQGn/YBcch8hmD+4ZQNFfhdAnF6fVjeM6xr7JuAlEZUtwOfz9kHLHsTyCel7hY9+bZ71Pb1VvDkm2jel7ozUvmd+txCKrVRf9HXyoqKU1eMUh3q6oev0mTQcJj1aEI4rW6H1ejKZzGLcG+tyucB6wd+P1o/C1yyuuc7KRbZE5bPceUTHQ1+/t5XZs4fHaFa2bbYacyvHwzlf8/S0PQ61Gc1AAAACXZwQWcAAACZAAAASwA8NmxMAAAg+klEQVR42u1dCXhU1dmeBLFWwdrWHdr621rtY21t7aq/tf5txSpLyDaTCbuIICgKiFiQRQVBxYWEZGbuLNkDISzZQ1gSCJiEmJBAwhISIAlJyL6vM3Pn/845d793loRg8XmY5zpeJveee855v/1837kqh8NB07SDdvQODuwvqZn6aead8yK8NCZV0M3jxj1um2metDF9R15le8+Ag/nYVTT62Gpau3++dKcqiFKpjd5qg5eGujlfN+6hMSKk4FttnPB6bFFVKwAJKKoA0Lq23h+9EoX+Rg50w00sb2wsCUzoxKAK0BVcaAQcVb2Dtl+8lYB/tcCfvYPMNyfru3BQzDegpjbcuyCyqbNflVVae5MLv0uHVihpTV5azHuB1PascpXP1iwQu1LRCpx7c9a+Q4fa8MhbO1V3zouCMxFrMrjePG5Yw0cCJMYOGBLxKbJab4rZ79jBSFchxu6owOL2Fy/hL4Jz6cOuH51qhc+lPKLlGwcSDf/tHC2LeIxODg+eRCnZxBYX8PM9CzbL5pHitffo2ujI3zKLPCuhdfBtktdILFIpiiPpqnsu5sDQoDACmEwqfyP4NF7+BpWfHh1wAoeaXMbaUKz1hAS4VmSAjXIgQmv6+dKdL2xKn7RpPzn+9XHGxMVxQE83JHJuidKJgPFEtLhtHTxOsI/ufjXmgUVxf1ufPP3zA4stX78VU/h5Ssm2jLLP004ti8qfHZb9v+tSH1gUc9fcqO/NsCBceXuKur6CTm2+2t5LolgoGMl+q6Zsl/PijYmucq/4uI3HcLr8M2ouq7S6saPPbrc7xB8yZZJPU1dvUVVT6P7TExbFe03XfRsaS2Ns6+63O6AzpId2BsuXQ75rTGnhQQXudKsdh4el2rgkIh/DZkPfZKbYEzGI/D851L9ILx8/JwYzqMwyGkVoNcaWnn62e/xHNTn0u2GOgsbR6JAkC6S8g03j50bevzD2J0vi+XkT6P4RY4ni7Oac8w4F5Nx/MHPYL1zthJ7J+zGa6zBqqrm7T94BEZY3ssesMf5wXuTy6Lyd+VUnL7Vcbu7s6B2E/v/glWjWBBkFvkRYRh29wILDfHHcKUKOwdsqR734YjMyl4jncD0mV2PEWNolEsLr5dDrSECjePiEl9e2cAxAs8rrwUUxPJYeylvXMjbq6HmHMmyinwgXSn7nFOqahEKvAKVwhNadI6hVBp7RK1ohlkp8qXXyFE/QlRCf0gWoG4qPcPtEbkRqg9e08PMNHXLh9+DrsU74kho9LGlHTWu37tBZPXOUU9nnU4uqgf+sdhtnejBMjD8tnb23zoxwE1pyoxUoMkf89En50pmMpaREjf5JuQYS6zAXQQ/2r8FmxUAKf71W6NFZpHEV3JQAS4cYy3iC5TDEyfCxpNNP1iKxiRwP7jCMnWH58fzo0uo24ZUEzp4B6yNkWc0FTwCFAu/6UWD9kkPlGwZerMh0ElMD5/66wlJi2ZPWNNhlgsanG9CDfMK5b3QCHjManQF5qEF6hIfarNABlibQd6AetQl3+em9ffVMg9B/5HYT34wiC8hiWqScYIkY9J4FsYzj7o+76o88ezeu+XCxhA/CUs0ubQu6BScPv7nDaqOlli3t+P17exXYDuYI2vHTP7Qk7lXD0cT8i9UtXZxrcaW1J6W4+nXzcZTw4KtzyrJu+FLAamRafXXQ4CLT8eSiy9XNPRLJ1jtoK77csi2r7N8fZ46daRJTkkCEsniMgWYDDN+fZZn8yf7Q/WWnalsHbExTnX1Dx8/Vf7C35Nl1KWwsRY6EU77cVVANkw/2ChzRuZXwvTnpJBZvo45lIOXEXDJ09Q9xeLBkRv9x9V4mEkSEjJZfePsy8xQSzrRNTJk0doTsWGjbIo9UcGJ2GDJWFCg2Eji3ppba7VbO0SKdhHOJygfPqqGtB0gTa3p23mXizitQ//yHaZ19gwIHV2g94AfZ7Ofq2+9+NUa4HsXKYadYyu2Sps7+u+ZHjaa+FPClVIKh/vmGdfUOSToB4/zD6iRxHBnx8QOLYwsqmwSDl/aexnNK9C9ciZbneDlDDYsvVRjIHXmVxFLj5D/tzOOyE2JyTPk0i5FAQsGgYVKitqaeFs++KPYkHFH/wNC/NqYhAU56zi4YO5OxAq+BxxLNwPXAkidSgbkFWrNnYFDisQDb/W5VIi/rtUTiGU9XtwhnQXFO8ZQTqW2tbuq8baZZHtnyDEvLZymn4EnyAJaTD1xH2x229p6BcXMiJMNEHO9LrUsskgCgFAoTWfV/fj9JYgE440uFmFpnP3I6R9OO5fhSK9Z/MLxA6i9rk4dsIi8TxgCaA1nYwot9dVHHqgT42VlxSovuFRhQeCrs63d/g0hbKzJ9lbF8OUwojcdoTSAJaYXAo50WqQMbiwpN4IRzMNf5eCTxVdRG4Feh0S53cJkR4WtIa/B95korWpkQJOw480nkdNDV149S7EZPX6IOpZdUgzl+a7DZO9gEB0zTLcHmW4Ijnli5a2DQLpQwZAyFVY0qNZaNxCcLMoEpxI6QEcJWrCDBbgLTI/zg2WMVVweHMDsyWpP/3DVfpHhc8iWrL/0N8/RHxXPNwADavayuvfxK85mattq2riErozI5gUkkLeo2IR1swoB4KK9towV9w4MZAtXY2NEXmVMJhlVb9yCn8oXiZ3ZYNjKFWIvMGV/CzG/PKg87cC7swJntWWXhB8oXmb92EzQYLpZAq23d/XkVjXkVV/MqmvFJY/6FRnA6uTmieaDQMH76RhzvDKC8MSOIO9b0YGfNYa+42vnzpbvAoEdD9dU98FrsobIrDrtNyKOES1RqPbNa6ZmM9ZoedvTsVb4RmulYeNY5IDJvHx2yk8GF8Al/bHkigCGHHAwcwSqpAS5jRip+6JSt+8GtQpLDVzdGa1kRky8LodhBPHBYupCxP3w1GrUToGNWFQOQczL6PolsCFaR9udFpR34LDg0G8fwBE60r66ysVPe7D3z4yS6EJwHsXhHLZ+tbb9tRpTQGXevL6dsF/aZnNlo+72vxfG8y8rPfYWXZRapY7Elj+VLtGr7VWa5fEIWmY5i04YP/XgHGYsvNkvkAfz31Kq9rPZ1ESuIHcV4rFMsnQh14QnqcVVT1+9W7cFWEmeII7oGb0x+X1pJrWp6uNTf8AkvvtQoab6le/BHC2L44ItLLBkDTW2UkaAdjBpE+7LVUN3BM8KQM5Eua3d9wwbtKNXUMHBXxEIFeZO3kDAQvxaEJNAbkfn8ReyjkZhV0JeiDxj5cizdxIBGhKVdZnlL+ZWcw+2AnMigVxv+/kGq3JF6d0eBF3GoyTo2OfHVfZpaJn22g564OG5YdizwB2JEmVmIs/UNbPyIoYwQxHN2iY+0NqGIjzIG6gXuKfMpudyK2hHGwnBo7Ml390rsGpiY9buL8RgNbvgykFJ0akfRjh2SsyLv4AscIwInqFVkBDKhagr6N1+fKzf8QAtqQrK1ITlwBIccRd+hRwK+PLin4KJcwoMLz5uCnuhLrVHcV7vA9TZJQgohmacFpixzMbgfHOPevzBWQolwZUVDB2iTGdtyyBC4Y1nUCbmNGp51BjsCSCA7xXKxbM3rmnK3lGwf0I4nL7WoQ6Gjh3F3D8OkvxH5dfzxKhyBEyFMpuOr9NPMshe0GaB7OzrfhQKW8bqN/4X9/0NLE/g8UE+w1JicuGuRsqC5cVvGKfnFCEuWLx98PV7Zf1BwLu2SuAE5p7LPs14m5SGWLHdSo4ulQxhbR89gpcodcyKBvThpRrO97+gdRCvSRBcG6N6KypMNm9NONqFeoRXnx+F4eGn8CGSsRG1xfCkSYgxfSkFal1jI2T4g/eQ6gniijJEswk5oczFutP7gOYYWtfph6cvRt30yi2vFQRD+/O5XY/qtNmlshXb8dV0yYwEp8aXr+Iv8/KGlO3gAPMZSzpeMjA1ygyUt5EuEZbznhqB0FFjMGA6fY9ZqBHxJK9qxw1q0v6Z4rPzw1ZXVtMpHhfxc6LrGyPClwOIVxEXd54aRnybAOLkI8PXHkpGxajMWQgaQfjL5aXc4D0PKqXPNjkJF/5KWYmlm9YjhmnMqnWCZUVojwFIswf30e5F/Jv0si8ljHGR/A2P70CKaXWg+BjM1Ruv+YIIvuJL0W8KSFvHlPQtiZWRnO1HZ9L0ZFq6TY4OYc3BU4Bs6IPwnigAIsbzaLlc4LJbSiPd15EupxeyrK6pqkcua5dEFxMKGG5/dkCwn1a2ppwUj9CCDlMmltlx3LGmR7YPGG6CTr4Scr2+/hU3S59azXGVQqNlrpoYhvqSl0pjLK7iuMtYuWvNiM2kJqONmR6I4qkw8gneBZSxyqmDMvANHE4vAcaW1B0YFnjhZEUNRBdawZPMBKD4xQLhs9O3I2F3FzONwrKCurVuuDia+voOL5mC7hqx+G5nhaOV5MBSPpUyPPLgw7nr7JJgvS6qxiGMmFy9gmYn8TCi4yJmvfKTVbn/qP/v4YfgbzjW0iSJFeC6QBx3IFp0RV5oU5qsF0UsNxRc1fFu2j8QnAT3yWUqJYHmHIfHy2jac1GJkus0vX1PihCbh+qVJKGNpab6PQE1qr0vcx15a0zI3PPcVQ67/V4embN0/V3fkndhCc875xs4eElS3O0T+Ivgk9y6IFjb78b5iSdCZrMuDgff8h2kPLIq557VoOB5bnvDY8sS/rtn3zIZkn61ZC6jclXEnxs+NZKtWvj0s1/JY6kgqjISNyJALKpvU2w6DmX3fazEwZLgMhvDku7v/d13KlE8Pzgw78k503u9W7eMZDnjXJ7ywqlmYSEAanP55lmpyOFOxQ44A3ejH1hUTAJioHvmTOH82Mf8iMnw4StSaH1+xy0bbJfYq7WIlV/DRhuRwGSpod4VvkS85thg7w0KC5lwsk/3w/rHScNCQj5yt41ZDETZ++rhjlYrpqJmnaj/eV7I5qXRTUumW5JIFhqNu6tVd/G2M2jSM2Loy0tbq5h5vXJciEoz+hg8Tv5HECTx01zQh2WJF4gzLbW6w7Op1iyUttH0CRZeB1pCnBMtjXvJP9pl6wcq2RRWoDw7Ndsst8Glo60EySVYzxBf4ueZLy5EKTgAKHF5Xy9/CMXT0Wp9YuVtUbMTlNvob0oprFFNjnFU0EB3MYylcJ6GlTh7Pl2qzMO7D6Tk2tm5UxJIWuwi8viQmtNbkFUAFheZwTCnOMXBIqAFFItnu5ZQLsMQaceKS+K7+IUlOBTm3262cC1vT2gmm5YhlrPmd2AJxYpmb8AZ/Je1ILrqMTLtAhVJcIqxumxnxRfppWrrwYncCp4NIMG3IYT7bCBMprg2S1ipxNXtgayAsZaKPTZ8Rl1mxsXVuBonkZNZJpGnTRv8vDnBBA9qNoLITtQIyFi19i3mGpA4J0gGFeXhMLLO6pWvcHPPIa/bAmD5X3947aFNWk+IVQSRSbXRjR19eRSNKUvIJZ0xc8d4WImcxQPf8hymVjZ29g0OuVWZfvxWEzDcXr46fEyUy69VmbjVRmD0lxBI4iVPP3Ke5o+fOeRFyOgPNJBd0q+LyxclNRpQZq9UDDCCos89c6egd4NfkleTkoHUIqKeqqeuZDamMCyCUk9N178UXtPRIBIyIYS43dd8xZ8T5saTTWtMv3kr4y9pksNDgeaCHY3Mv7C28fORMQ3ZZHRwZp+pM2RXrEr6Z8lnmr1fsQQnXOPIuiVkLKgulGc/AN48sTQRLdVvGqZTiamgTBFF6aT3YxjCzc8KO/mF1EvQB51QKsshZK/+Xb+8C0iHHX9Ym/XVN0q9W7BZlfQZSj72zG4YAB3PlmhRW+EtlLDDrM2tTuAZxm8mMopKna5Ph+KMgLRirwF478ipzzzQcLq87eLouOrfiq/TTb0Ycf+6DDDDIcRqD8yCO2vjg67EvbErfnHRy3zfVMAMwD2kltRE5Zz/cUzIrNOfRZbuuwY4V1cHg7bpIPjzOZyF5+yofPZO3T1wrF5GOYLOs7pwSec1AAQEk9QZn38Dhp0epxoGe1RU5ixZpPb3eo41xhBWvsjxvkqnE11CQVB2y3oecGUp5CMITphYDZtUgacR9UbdnRdhGLu+bxG4IgTCeO1NMY3Ra+6GVVNVQ0gEI78V5BQwBaphztoJAMYwnoQmTwHmg3G9gxapJQZfE5URK0RZkOmqcwMmWjvAGp9ogrj9Rrv9iu0ExIQK1gQ0VUWRE14glNby/MsM2CucL94DylCE8LDRUYhogOGYzP62HmzsI9yOzyBIMOF1gEV2sNTElPhJad7Z/DifqsY70CmLq3dwDE8yHdnlqGzmWw1k8c5+W4uFWMFrPicnd9g3/vZ0HRJQt25pmBLvEXHNsXWnKRBtZipWH0q40lLTg5Br3CxtB0et/dx8mz/lBOxyKHyGWctHB7dQTFCGadO21ceRIy98Vtq66EdDVeshh1KjtEuYeSC3lUpC62lJIxIhcpvmwdkfRDnOrLo3RU+0yujsNihc0pEXRiryhEa6oiBoZocrwiOS1ZmLBYpPS5KJWWdItImSIIcqbpsNTfhS/J5zCxRbeYxvBhjjXY6cltVHkQ2uM0t3ohMnQojVa87Xqfnd0J9gKDdcwM26JW4lBlmm0uKPgL6JkGWp4AkTrsaGB6wJumI1fKGkBL659l0HIx2OZqnqNTrCU7YTpR4alNGqjNk5YFB+SWT5+rjvJjuMskzamr0Nry9TExXGfp5X9+p1Eti7aqLDThOREtj+hq8FojH9+P2njvhJRcHVUNp+Rd0O+TQbvRFLSXRaZrQyoSR+nhaSXKfOA2jhudmRI5mlUeyQvTxaejMJ+eMzmhKhPPluzHA7H48t3s6lTlHjRX7C5g68u5mglCor66Z/fmM7niPCMTjY/xN+SE7Xx2fWpC83HvHE0mN0JgVLJ3s7Axi6Mq+NPOBzWx5bvdpJZQ/EadATQKtKZomJmf//tyj1vR3+NFtQwz21JRsnTY7QS+mAGBbTuoB3/2XECJu2lLWnz9UeQPiJRNmbTCvH8XJO+VBvGzYm4Y1aEetth6NMvl+8iFASdu3Ne1Di0yk8JlLZx/NzI782wxBxDC58qX0qU6KA2wF3j56C7bsPbKEC/bwu2jJ8XddfcqO/PQiaPl7/uROXVpvbeH7wSeftsC1cJC82OFz4LvwIAfoG+rUkoHLDZH12WKNmO/NZZ5tvnRULLt8xgSidvm2mGZ90x28LvSa4xjp1hgXZgLKjoWrAqBy2Th+KoloHMBlDY+FfQ7yQWxsUBxpEW5qCWdYfODlntj6/cDQ9Cl7GlIzDA22dHcIQIo/v+rEjmr2oU/GvtHThzpRVNIBo4qvJEc4JjanB++2yLG1Xqxp6crtucdLKhradnYLCv38pgqTHesyC+4EJjZ99gU3t3zNEKhugCTSnF1e09A92Dg31DVpvNBlT5xMrdV9t7X9qC+BJGW1jVDHf1Dg4kFFxU+YQ/+d6e0pqWngFrd//Qufr2lfH5Kh/91+evOhz25u6+ioYOVaB+wuux8As029rVl1Fyhaxsw/fO4xeudvXAjfCswSHbo8t28navxvj4il1FVS3wV+jM+t3F3mrDCxszS2pauvoG69v7tiSXoGBykOlni+Pz8UDg98uNXU+t2UsW6TannIZRdw9Y27r7YYA4IZR6cGHc0bPQkyHoTEZpzZgZyCQcq0Ur9i2dvfCss3VtcHvY/nKaRsXx1c09970W8158IXpJgb8h8khFyeVWrOAB18iKhvZNSaXwrI7eQf8vDkB/Gjv6rHZbc9cAdAlaTi+pRid+eq9Ave7gmaJLzSPdrwAbYz5ofc4BAv25D9I/2H2SwdJPDyOEwS+2HCMVbq8YcuFHsuHaa6bc5zakoDJYLGPx+rsDeBrY4uyVFpi12WHZkz/ZP/nTdBg2/OnC1c5/f5z59DokiiNyzqumhgFyMKon3tmL9oMPomBIABXMyLrEIhjqzrxLMM45YajO+ZOU0kmb9kflVPRbaYYvCZy+YefrOrv7rDBHL23OePr9JJj3+vYBoKoFVC7OyXCANIP53Z6FKilnbM95cXPm+YYOAA9aQHLPYd9XePmFj9I+2otG7fflIej/rrwqq41es6NwbUKR3W5PLqpRBejgXjxF5S9uykCQaIxhB84Aeb2wKf3RZSDDzGR/CvgdFA2c3Ik2uiPVuI5nNySDVICTefocr2kIy/P17UD9D7+Z4B1sKqtpBXoiWJJC65HuV4DtncT8KqCvH8+PhmEDAAjLt3eB9AARDyoN7Qnwzy8qG7tOXmrx9tXXt3bnnm9AcsBnuym7QozlwXtejQIKgPFDz0hV3jNrUaLsrO2H0T9fCoFzS/Y51VRdXkVjXUvXLcER3lgmA9HA7KsmfaGaHAp0erG5+1ZtxO6CSzS0PzUM2nkntmDIZkVYIm/YBHeBICX502idAa88YHgwJP5IMgNrZp+ph+4VVjU2dvaopoSQjRx7B4fuXRD99HpUVfjchjSgNiApEOA4b90IhAjixOuFr6Anh07V1bX1gvTekVeJ3tkzLYxdFTABXwKW//NGPFk52ZpaCq2h7FlcBrrQeAy6DcYanMOk3TrLxGHZ3NEHUopIeLi+rKadYAkjSiq+FiyxgjlUVg/EgvamQbbPQeg0YPnHNSjVpbdvCMRga9cASMhTIDrQnrz92WV1QFDweHPOBQ5LGmMJ0qalpx+InQ1BmKYg4rBP//wA6t/kUBZLxJdommYiwXCLBiXTwiPgQfA4kGPAx2NnmjKKLze09ammoUSQlXEngF0YGYsn4lcrduFUtgNAN0hjBeonfZwB9PfbVchwA4UH0g8oBqay+GIzzJeXD1q4xlja7n0tDoQQwnJ9Olz8m5X7oHGMpR54EcAmo4aeXG7qBv2358QlJEKnhqFNurA5A1hCO2iLKYSlcWsqKuhEWPobCiqbEA29GAqjAFaDX0CpEyy9p4VDO6er24gmBlIur20bJb4MMnkHGlNP1gCWP341ErCc9tkBmA6QsU+tQvWhwA0TFsdNeCMeSP7+hbFg74AEyymv9w62SLBESTpfHYY5AhbfC1iyy5z/tymD4RWCJc3I2OPnGq60945F+0MbgDKALWJzLwC7TFwSD8cDi2JAspFcIcxPhnfjC3ks8RLgBFyKBdKPyf9TG8Epgl/+9kEKwnJuZHVzb35FPdhZxZdb0HxhmrAcqRBi+TfgS7XhN+/uYbE0wkn81xUgYH6yJB48tIkLowAqXBOPtsVkzGyMZQ/BEsaF+PI0w5caw4bEYtpmv2NOBPwyl8qFizksvTgscTsgkPIvtMCUglARYBk5cr5cHo3yfaZ8knHX/AhQMFjGJsDjwU47fqb+F2/vBEkCkwg8p/LbDgIWevPrFXtARSfmX5TI2DHBFBDyubq2x5YnPPzmDpgOUpgRc+wC3A5GGpyj/bWmMfoS/grGMwys8FJTR08/zClKN12xA72xKpB6fydK4/v7B6lwL8grjOUuPlA8XWezO6AdoLOfvRkP1wBN2Gj7gVNXfvrGDuRc0Q6w6eAyMCh4LHMvAJZw8XMfIhn794/SvDGWQ7ZBlLeuNkCDwI6/XbX3oaUocfeRtxKAGlbF5YPgAScSuoeKfAFLrC9//97eO+ZEclgCrYP4fWkz0lOr44vh+w//2YMNVMDVjlyRqWEwezA/4MwQAz7uOKIt8J7vXhAFPQcs7xy5jAUXKlAPYpOk25B0XsAP+kdqQmAGB4fQj8ge89P/YF5MVz/YrzSYqSR9y8vf8KfVyTip9TA09cfViKGtVpTFBAYhcJX/V4fILnSkHWQx+mxfEnEcznv6bSAJyQYyJBUICAg+RVVNIIVAhYP2xfcOkfwmmFwca2R8dqLdQY/CXaiYN4h6C+9RTbbr++ZiC3IzcFUatIP0bpApOrcCOnbfwp3guRNCAWCefBdtX7NhTxHm0USSxdMPRjptL61GiepAuGTrEXjQ1c4+uCxoG8qRHBi0A1fduzCGFOci1YPdEiAymJmufitxVwhfotxXXx0xxIBckLkbSIGzgKaKtvUNoRkDbaocD+EOQSGjk3imn/7Zj5JnhR/995aM+xdGk70kvALMP5wXDUiAUfqPjWlEjhNTZdpnmdqQHJgORJVBJuj9y5szmE2GwGmbGwk8CiIXqxNEKz99IxbMH7AAn1qVxAS9fHXPrk+dFZrzrw+T0YwHUqA7QVvPDD0EtuJ9i2IZh8xPDwYwCNJJGzOBctGuKcI9kPwNP12SoA096L81cwLZKcpX95MlsTNDspGkBSWEq4CfWr0bpZlhPwQ4+58fpYIwBM9y8pbMO+agiQMW+cfGDLiRS3KY/un+4NAjL25ORyUfJILoq5u8OQtG8ac1+0jH4AQ69vKWTNAUIBjASGbet6FGuzhDH8bNtHCeNzArSgVC7YSBXocbn16fQtxWELzQpSlb94PeASUtK+R2y5dak3gTd6W3f6BOcD8a2Be+GEWHmpL+ImlKEiqTx8ZIbEX4XMmN7ARxS77i8LS4ZVHYxaiwesP9rthneW+dDYFrSvC7YEqNfDWORiluxx5Tt+4Hc/3LtFPgF4EPWl7bgWwIYShUEoiXRnK1w1m11zKrmNwF3Oqr7A1FFmeJM9JHuN5mdjjheOUX5XDFCwqxOmcpOZRo5cdt4dW17S/P7YsLzL0zv+poeT3oo8gj57C3anAVmxU+SXlC5VmQwmFoPVi+5ja+0Tp7F4fBTUBc6+RcMfFHQ7mfYtcLZMjmJBdYcFjYLF90k+RXuIHT3XbzbOq2RdYIcqiY5C4N5SZPAwxU/knyFCbhMptiMo5WFAJ1xl7S1XaNu9CiRrIdlnJyl0geKNMWxa8aal2k0Am30Ra+4sj9Ygu7lmdx3qDF7Zx4aSyuMkXcLQkwK5K+Xxxkg7+mkazo8nsdGYf14jHFjl5jCpawMIGfDrXbtyZTSplXRjzFitdbPMHYDd+zGSQKr8sTQUC5zFHlD7SqCI6LyoMXbA1vljUGD1+757JZSjm3SD7gkc2pS6pl89AsHmToePziLa1nmXYKKeOyLBm284xNEEihLR8HrUPIZZRnEmuHsYDOWJt8notFdDuvfvgb3bxPwqW+5CgAKy3KhaHBroA6a1+yNqlsBPD576IZdCWxef2nNkv1giQPW+tBQqXgrcGixEfyvgaN8YGF0eCxqMARbmjrATdfpO1uHjf26/jY/RyYLI6Tl1pQaRupHgQ4H1mWwG8qeHO+buSDVDrgArqJi+PKa9tIXEzFVT0OWe0HT9cFh2ajGIr65iuHb+jjznkRL2/J3HPiUieqFSSbZtr/H9Ub0161rtomAAAAJXRFWHRkYXRlOmNyZWF0ZQAyMDEyLTAzLTI5VDEwOjM2OjEwKzAyOjAwkWix2gAAACV0RVh0ZGF0ZTptb2RpZnkAMjAxMi0wMy0yOVQxMDozNjoxMCswMjowMOA1CWYAAAAUdEVYdGRjOmZvcm1hdABpbWFnZS9qcGVn22DkxQAAACB0RVh0aWxsdXN0cmF0b3I6U3RhcnR1cFByb2ZpbGUAUHJpbnRNbINqAAAAEXRFWHRqcGVnOmNvbG9yc3BhY2UAMix1VZ8AAAAgdEVYdGpwZWc6c2FtcGxpbmctZmFjdG9yADF4MSwxeDEsMXgx6ZX8cAAAACN0RVh0cGRmOlByb2R1Y2VyAEFkb2JlIFBERiBsaWJyYXJ5IDkuMDDiS+ceAAAAEXRFWHRyZGY6QWx0AAogICAgCiAgICuew8EAAAAWdEVYdHJkZjpCYWcACiAgICAKICAgIAogICD4Xmb7AAAAEXRFWHRzdERpbTpoADE5LjQ2NjY4NL2H9bkAAAAWdEVYdHN0RGltOnVuaXQATWlsbGltZXRlcnPv0HhyAAAAEXRFWHRzdERpbTp3ADM5Ljk5OTk3MEN75oAAAAA5dEVYdHN0UmVmOmRvY3VtZW50SUQAeG1wLmRpZDowODgwMTE3NDA3MjA2ODExQjExQkEyRkVENEM0MEFBMf/AfAoAAAA6dEVYdHN0UmVmOmluc3RhbmNlSUQAdXVpZDo1Y2JlZDNjYi00NTBjLTA3NDctODY2Yy03ZTJhYWZjY2M3YmGQqoQXAAAAPnRFWHRzdFJlZjpvcmlnaW5hbERvY3VtZW50SUQAdXVpZDo1RDIwODkyNDkzQkZEQjExOTE0QTg1OTBEMzE1MDhDOB+exmgAAAAedEVYdHN0UmVmOnJlbmRpdGlvbkNsYXNzAHByb29mOnBkZi6gIiYAAAAodEVYdHhtcDpDcmVhdGVEYXRlADIwMTAtMTItMDFUMTQ6MjI6MDMrMDE6MDCEgKZYAAAAJXRFWHR4bXA6Q3JlYXRvclRvb2wAQWRvYmUgSWxsdXN0cmF0b3IgQ1M0Aa/QiwAAACp0RVh0eG1wOk1ldGFkYXRhRGF0ZQAyMDEwLTEyLTAxVDE0OjIyOjAzKzAxOjAwDNrJ3wAAACN0RVh0eG1wOk1vZGlmeURhdGUAMjAxMC0xMi0wMVQxMzoyMjowOFqz99SbAAAAEXRFWHR4bXBNTTpEb2N1bWVudElEAOocGPAAAAA5dEVYdHhtcE1NOkluc3RhbmNlSUQAeG1wLmlpZDpCRTczQkZBODA1MjE2ODExQjExQkEyRkVENEM0MEFBMcWJYwcAAAA+dEVYdHhtcE1NOk9yaWdpbmFsRG9jdW1lbnRJRAB1dWlkOjVEMjA4OTI0OTNCRkRCMTE5MTRBODU5MEQzMTUwOEM49OjDJgAAAB50RVh0eG1wTU06UmVuZGl0aW9uQ2xhc3MAcHJvb2Y6cGRmhKbfiQAAACB0RVh0eG1wVFBnOkhhc1Zpc2libGVPdmVycHJpbnQARmFsc2V5GcblAAAAI3RFWHR4bXBUUGc6SGFzVmlzaWJsZVRyYW5zcGFyZW5jeQBGYWxzZTpcPYIAAAAPdEVYdHhtcFRQZzpOUGFnZXMAMcmB27IAAAAASUVORK5CYII=</mdui:Logo>
-      </mdui:UIInfo>
-      <mdui:DiscoHints>
-        <mdui:IPHint>193.190.0.0/15</mdui:IPHint>
-        <mdui:IPHint>2001:6a8::/32</mdui:IPHint>
-        <mdui:DomainHint>belnet.be</mdui:DomainHint>
-        <mdui:GeolocationHint>geo:50.825312,4.365471</mdui:GeolocationHint>
-      </mdui:DiscoHints>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIExzCCA6+gAwIBAgIRAMNmOaeNUJe5LtzIpBM//sEwDQYJKoZIhvcNAQEFBQAw
-NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-IFNTTCBDQTAeFw0xMjAxMzEwMDAwMDBaFw0xNTAxMzAyMzU5NTlaMIGeMQswCQYD
-VQQGEwJCRTESMBAGA1UECBMJQnJ1eGVsbGVzMRIwEAYDVQQHEwlCcnV4ZWxsZXMx
-NzA1BgNVBAoMLkxlIHLDqXNlYXUgdMOpbMOpbWF0aXF1ZSBiZWxnZSBkZSBsYSBy
-ZWNoZXJjaGUxETAPBgNVBAsTCFNlcnZpY2VzMRswGQYDVQQDExJpZHBzdGFmZi5i
-ZWxuZXQuYmUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDeMjJ+MakW
-ESz80oYi0FOG3gW6iiuyD5BSxQ8Gr9CEg26YxVp5a/eSofaWQm/nTo1WMt+oUYme
-gFhquFXyFofQ9JiQesqryf7imMsBloQ6wvvobpKYsbLLegYpiFoB4WF1jwwbDUDp
-Dt6fV/taiLIv9DWpPQzaQ4FybdMYvERGzYLryUB8BB5q2c7DjyHCor5hqpw2Mf7J
-z6H6WrQYkppE44+pSF/9AUiV5qPv9JJUmaqzF3f3eGU4SHjI0i6rZosMw28kp2vs
-03SFAnrhVjReHRSAy5R+XDGi6fEyO6hV68cncLoKRuiv2aYbc6ZuGJlAzioMPDRD
-2Eo7FGUWfYRTAgMBAAGjggFlMIIBYTAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3
-V0fqkOO57TAdBgNVHQ4EFgQUl14XH6BEPRYstv5He0vPLsM/UmAwDgYDVR0PAQH/
-BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUF
-BwMCMBgGA1UdIAQRMA8wDQYLKwYBBAGyMQECAh0wOgYDVR0fBDMwMTAvoC2gK4Yp
-aHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcmwwbQYIKwYB
-BQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRjcy50ZXJlbmEub3Jn
-L1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDovL29jc3AudGNzLnRl
-cmVuYS5vcmcwHQYDVR0RBBYwFIISaWRwc3RhZmYuYmVsbmV0LmJlMA0GCSqGSIb3
-DQEBBQUAA4IBAQBYZbu3HknWMW2n+JmZBBXiLEOx0DdBWESX1tfG4kvT6b+lXD1I
-BLuOUTWS544wsMyqDD/I1a9mrAZAuoVAYvEVXlNRexkvZC++AzdoFsOuow4dxQg2
-gW87Z2oDHQiTswTPzLUeQBAo9kAc8IcTEVgy7921y7/xVgvwzMNG+jMLWW2hSDo2
-Prwn+VbHSG4eYz4GPrm/MX3WkROUqSbuGNgXIx6Inqr2psLxstXWjSDM55Qt+OsB
-+BIxlm2pnEhk5WaZCjaRrBrdKjyC4TUVNDoYHbdwiu5ZAqnpWkYTT13qhCRAG+fl
-K6fSDEGm6Kz/5tRvh3u1WklUCJRx0A6nMD/b
-                   </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idpstaff.belnet.be:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idpstaff.belnet.be: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://idpstaff.belnet.be/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idpstaff.belnet.be/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idpstaff.belnet.be/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idpstaff.belnet.be/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">belnet.be</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIExzCCA6+gAwIBAgIRAMNmOaeNUJe5LtzIpBM//sEwDQYJKoZIhvcNAQEFBQAw
-NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-IFNTTCBDQTAeFw0xMjAxMzEwMDAwMDBaFw0xNTAxMzAyMzU5NTlaMIGeMQswCQYD
-VQQGEwJCRTESMBAGA1UECBMJQnJ1eGVsbGVzMRIwEAYDVQQHEwlCcnV4ZWxsZXMx
-NzA1BgNVBAoMLkxlIHLDqXNlYXUgdMOpbMOpbWF0aXF1ZSBiZWxnZSBkZSBsYSBy
-ZWNoZXJjaGUxETAPBgNVBAsTCFNlcnZpY2VzMRswGQYDVQQDExJpZHBzdGFmZi5i
-ZWxuZXQuYmUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDeMjJ+MakW
-ESz80oYi0FOG3gW6iiuyD5BSxQ8Gr9CEg26YxVp5a/eSofaWQm/nTo1WMt+oUYme
-gFhquFXyFofQ9JiQesqryf7imMsBloQ6wvvobpKYsbLLegYpiFoB4WF1jwwbDUDp
-Dt6fV/taiLIv9DWpPQzaQ4FybdMYvERGzYLryUB8BB5q2c7DjyHCor5hqpw2Mf7J
-z6H6WrQYkppE44+pSF/9AUiV5qPv9JJUmaqzF3f3eGU4SHjI0i6rZosMw28kp2vs
-03SFAnrhVjReHRSAy5R+XDGi6fEyO6hV68cncLoKRuiv2aYbc6ZuGJlAzioMPDRD
-2Eo7FGUWfYRTAgMBAAGjggFlMIIBYTAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3
-V0fqkOO57TAdBgNVHQ4EFgQUl14XH6BEPRYstv5He0vPLsM/UmAwDgYDVR0PAQH/
-BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUF
-BwMCMBgGA1UdIAQRMA8wDQYLKwYBBAGyMQECAh0wOgYDVR0fBDMwMTAvoC2gK4Yp
-aHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcmwwbQYIKwYB
-BQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRjcy50ZXJlbmEub3Jn
-L1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDovL29jc3AudGNzLnRl
-cmVuYS5vcmcwHQYDVR0RBBYwFIISaWRwc3RhZmYuYmVsbmV0LmJlMA0GCSqGSIb3
-DQEBBQUAA4IBAQBYZbu3HknWMW2n+JmZBBXiLEOx0DdBWESX1tfG4kvT6b+lXD1I
-BLuOUTWS544wsMyqDD/I1a9mrAZAuoVAYvEVXlNRexkvZC++AzdoFsOuow4dxQg2
-gW87Z2oDHQiTswTPzLUeQBAo9kAc8IcTEVgy7921y7/xVgvwzMNG+jMLWW2hSDo2
-Prwn+VbHSG4eYz4GPrm/MX3WkROUqSbuGNgXIx6Inqr2psLxstXWjSDM55Qt+OsB
-+BIxlm2pnEhk5WaZCjaRrBrdKjyC4TUVNDoYHbdwiu5ZAqnpWkYTT13qhCRAG+fl
-K6fSDEGm6Kz/5tRvh3u1WklUCJRx0A6nMD/b
-                  </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idpstaff.belnet.be:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idpstaff.belnet.be: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="en">Belnet</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Belnet staff</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.belnet.be/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Belnet Federation Technical Staff</GivenName>
-    <SurName>Belnet Federation</SurName>
-    <EmailAddress>mailto:federation@belnet.be</EmailAddress>
-    <TelephoneNumber>+32-2-7903333</TelephoneNumber>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idpstaff.belnet.be.xml b/swamid-interfederations-2.0/idpstaff.belnet.be.xml
deleted file mode 100644
index 7b30b1ec..00000000
--- a/swamid-interfederations-2.0/idpstaff.belnet.be.xml
+++ /dev/null
@@ -1,123 +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: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:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://idpstaff.belnet.be/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://federation.belnet.be/" registrationInstant="2012-03-27T12:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://federation.belnet.be/files/Belnet-metadata-registration-practice-statement.txt</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">belnet.be</shibmd:Scope>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="en">Belnet</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Belnet operates the research and eduction network for Belgium.</mdui:Description>
-        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAAZiS0dEAP8A/wD/oL2nkwAAAAlwSFlzAAALEwAACxMBAJqcGAAAAAd0SU1FB9wDHQktK8+8G0YAAAG+SURBVDjLhZNNaxNRFIafMzN3moxp0iollRSpGqwuuhNFUhSFrgvdSOsPEH9G967ci+CuIIUixYXQRZFC8QM3IlgoqQgtuKhNSSfOzL3jIhM6M2nigcuF+/He9zznHmHpZUwv4hhEGBq5M9bAy3F8NtIhkllzMhuAAK5t4SkbZQunoeY00BhjumdyBp28+NNHMyzemaZSVBSVw7Ef0Px9wpudJu++/iLQZkAKgLIt5mdrzM/WuF4t49jC9ESJ5UadV8/us3D7CuQySjHo2ehOr7d2ebiywYOVDdY/7zN+YYR7N6pDUpCsdKhj2qEmAvwgAuBvqPuKkmIgGSdLjWs0ZqoUXZtbtTF+HByzttPs7gvnM0hHuxNx+MfnqB0QaoPn2lQ8RR5Cv0CivvaxyeMXmyw8f8/q9h5Tl0os3r2KZVmDy5iviKdsRguK0YLqvmbJMAYZAzyZqzN3c5Jxz6U+WebED/jw/RBjYkgJZQQibdj8dkC1UuSi53K5XKDVCXn75Ser23usf9rv6xXJNFMCpTRiU3IdlCX4keHIDwkjnXxlGZ6CAVodTasTnZVMJLH9Pwa9jpSEhpxDJ9e1/wBQnZONeR0FdQAAAABJRU5ErkJggg==</mdui:Logo>
-        <mdui:Logo height="75" width="153">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAJkAAABLCAIAAADsyLLJAAAACXBIWXMAABcRAAAXEQHKJvM/AAAFOnpUWHRSYXcgcHJvZmlsZSB0eXBlIHhtcAAAeNqtWEmWpDgM3esUfQRjeYDjEAHs+r1e1vH7f9kEQ5gMoqqSTBJsWfqabeTXv//JP/jxyanoU5fcZ5e6pOmRYg7eJZ9iymlIs04+z8vj8Vh8xviQAkdi1hgmdWHKLiho+zRI6POYsTBqHsMcQ8J/MFTFIp910dmN+sy9jrlPWJgmCkudd3xPzzRn5ZxQAtCEtBCHjmXiRQ4klZUHTdIx+hBCOrHBnGCSrPoccDkdsXTJ9uPnDCo/pwWE2S/a6cALT0497h73qQjwk2TNsAWl595PlIB5Q+FG7zYkgAHTQHGfhuxAP0CHeUMmpggs08DlYFWfnhsm0uEesTBSeQKAYGD1s+jLDt4RgTEdU7LFE3AGnSEdT/BjBJsRBodP9VkYr7SyEh8ZETr+IHmdOajZpee2pszJOolFw6qxvXVphlwobLaDhSC5y5EsqEHwpuJM78YlqIQpDuFBoHuWexzbzBHJphzxy16Bw6Kml669KVfuLPHKWH73pwXJvIUxnlXwOAFHD/1dcaS6ox8ruzHUaE+MOfyF8h/aIPQc3I+FE+6IUkRsFwOeg46MS9wdYvvBcXsuyjcZy55zAwPNOaSUh6P8d/FEpDv5fRxPUhus3gQqAzKW6U8SPykse67vTFuyKxUCJdJrCwJ4Dp28XOjCALc/Wf7gaL8SY1yjAs1e4QY7Ib8/DUbSyc/BGCbU5j8JSDCcWmFpjMfAUqgWQ2ABm8KjonMh8aw67BJj8AGdAGbxIYVOe3glwlcddOhx74Ivd8yRAq5R/ArM6EKHwW4z57XcC4SBxtb8KpskhaWqKekZmHKxggtGpTZV9OGMXr6Bv6Fnu/TLHp/sANL9Q+mwUOdJwGe8sGjEiKFRsmcW9GhSnjYaqmFDwYF3pIPhjHh2hIKRyCV47N9saQDkE4KWcSPj2uy0xiC8xjKfaa8508zMHRramcFPslsM1vVy6dBoCZKwFC8mYtp5FLuXjHjF5iPkgZ3ONhHx5Gif1x5ySBrElGFKraSR96xpJw23REW2X86C+Y7dyLppePXTTfKYmtG9DwGMkha5pnxEHWTZcdgksCJmZcmZ4GpM2hj6vqJG4cI7L4zg3dxhguUnyRcom2Ei5+yxSO2tHneGjPgYvx+SRw65/1HuBUbb1vx2dh2TS25n1wnBGYDchZ9/SA+mlzTz6zaDbacknzPsXruST/3qql2lUzuV0i3v9a6ShanZkaW9uWoToyJZ9KOABMy5WCpYIrVwq2ADtv+3DebXTMhD/kbfJ51c9/0Yois77TvWk2YRCzyJ8PTx3v0r+zFwDcoR8CjAeBb/iIaSGEF5s9UM/Nyes8O+WsAVE/KQFpN7GLg8mjuorJR+YGmAk9v3SFZWPPidWF3gQZCUoxZzbL93KRRyJrlgw8NYv9JF4MEROu77nJwb3Xd9LjDObHModzPspz5HdlKLmpbA3I7G++JW5Y44dc+onQNYDfXK9XwCrx3I2gxSb+Ylg6ClrfV15/2ikkJ2gYCeHCw8p5LKdkzmmYiRp3tWclywlc47Xnvb+q3kuD/raYQGn/YBcch8hmD+4ZQNFfhdAnF6fVjeM6xr7JuAlEZUtwOfz9kHLHsTyCel7hY9+bZ71Pb1VvDkm2jel7ozUvmd+txCKrVRf9HXyoqKU1eMUh3q6oev0mTQcJj1aEI4rW6H1ejKZzGLcG+tyucB6wd+P1o/C1yyuuc7KRbZE5bPceUTHQ1+/t5XZs4fHaFa2bbYacyvHwzlf8/S0PQ61Gc1AAAACXZwQWcAAACZAAAASwA8NmxMAAAg+klEQVR42u1dCXhU1dmeBLFWwdrWHdr621rtY21t7aq/tf5txSpLyDaTCbuIICgKiFiQRQVBxYWEZGbuLNkDISzZQ1gSCJiEmJBAwhISIAlJyL6vM3Pn/845d793loRg8XmY5zpeJveee855v/1837kqh8NB07SDdvQODuwvqZn6aead8yK8NCZV0M3jxj1um2metDF9R15le8+Ag/nYVTT62Gpau3++dKcqiFKpjd5qg5eGujlfN+6hMSKk4FttnPB6bFFVKwAJKKoA0Lq23h+9EoX+Rg50w00sb2wsCUzoxKAK0BVcaAQcVb2Dtl+8lYB/tcCfvYPMNyfru3BQzDegpjbcuyCyqbNflVVae5MLv0uHVihpTV5azHuB1PascpXP1iwQu1LRCpx7c9a+Q4fa8MhbO1V3zouCMxFrMrjePG5Yw0cCJMYOGBLxKbJab4rZ79jBSFchxu6owOL2Fy/hL4Jz6cOuH51qhc+lPKLlGwcSDf/tHC2LeIxODg+eRCnZxBYX8PM9CzbL5pHitffo2ujI3zKLPCuhdfBtktdILFIpiiPpqnsu5sDQoDACmEwqfyP4NF7+BpWfHh1wAoeaXMbaUKz1hAS4VmSAjXIgQmv6+dKdL2xKn7RpPzn+9XHGxMVxQE83JHJuidKJgPFEtLhtHTxOsI/ufjXmgUVxf1ufPP3zA4stX78VU/h5Ssm2jLLP004ti8qfHZb9v+tSH1gUc9fcqO/NsCBceXuKur6CTm2+2t5LolgoGMl+q6Zsl/PijYmucq/4uI3HcLr8M2ouq7S6saPPbrc7xB8yZZJPU1dvUVVT6P7TExbFe03XfRsaS2Ns6+63O6AzpId2BsuXQ75rTGnhQQXudKsdh4el2rgkIh/DZkPfZKbYEzGI/D851L9ILx8/JwYzqMwyGkVoNcaWnn62e/xHNTn0u2GOgsbR6JAkC6S8g03j50bevzD2J0vi+XkT6P4RY4ni7Oac8w4F5Nx/MHPYL1zthJ7J+zGa6zBqqrm7T94BEZY3ssesMf5wXuTy6Lyd+VUnL7Vcbu7s6B2E/v/glWjWBBkFvkRYRh29wILDfHHcKUKOwdsqR734YjMyl4jncD0mV2PEWNolEsLr5dDrSECjePiEl9e2cAxAs8rrwUUxPJYeylvXMjbq6HmHMmyinwgXSn7nFOqahEKvAKVwhNadI6hVBp7RK1ohlkp8qXXyFE/QlRCf0gWoG4qPcPtEbkRqg9e08PMNHXLh9+DrsU74kho9LGlHTWu37tBZPXOUU9nnU4uqgf+sdhtnejBMjD8tnb23zoxwE1pyoxUoMkf89En50pmMpaREjf5JuQYS6zAXQQ/2r8FmxUAKf71W6NFZpHEV3JQAS4cYy3iC5TDEyfCxpNNP1iKxiRwP7jCMnWH58fzo0uo24ZUEzp4B6yNkWc0FTwCFAu/6UWD9kkPlGwZerMh0ElMD5/66wlJi2ZPWNNhlgsanG9CDfMK5b3QCHjManQF5qEF6hIfarNABlibQd6AetQl3+em9ffVMg9B/5HYT34wiC8hiWqScYIkY9J4FsYzj7o+76o88ezeu+XCxhA/CUs0ubQu6BScPv7nDaqOlli3t+P17exXYDuYI2vHTP7Qk7lXD0cT8i9UtXZxrcaW1J6W4+nXzcZTw4KtzyrJu+FLAamRafXXQ4CLT8eSiy9XNPRLJ1jtoK77csi2r7N8fZ46daRJTkkCEsniMgWYDDN+fZZn8yf7Q/WWnalsHbExTnX1Dx8/Vf7C35Nl1KWwsRY6EU77cVVANkw/2ChzRuZXwvTnpJBZvo45lIOXEXDJ09Q9xeLBkRv9x9V4mEkSEjJZfePsy8xQSzrRNTJk0doTsWGjbIo9UcGJ2GDJWFCg2Eji3ppba7VbO0SKdhHOJygfPqqGtB0gTa3p23mXizitQ//yHaZ19gwIHV2g94AfZ7Ofq2+9+NUa4HsXKYadYyu2Sps7+u+ZHjaa+FPClVIKh/vmGdfUOSToB4/zD6iRxHBnx8QOLYwsqmwSDl/aexnNK9C9ciZbneDlDDYsvVRjIHXmVxFLj5D/tzOOyE2JyTPk0i5FAQsGgYVKitqaeFs++KPYkHFH/wNC/NqYhAU56zi4YO5OxAq+BxxLNwPXAkidSgbkFWrNnYFDisQDb/W5VIi/rtUTiGU9XtwhnQXFO8ZQTqW2tbuq8baZZHtnyDEvLZymn4EnyAJaTD1xH2x229p6BcXMiJMNEHO9LrUsskgCgFAoTWfV/fj9JYgE440uFmFpnP3I6R9OO5fhSK9Z/MLxA6i9rk4dsIi8TxgCaA1nYwot9dVHHqgT42VlxSovuFRhQeCrs63d/g0hbKzJ9lbF8OUwojcdoTSAJaYXAo50WqQMbiwpN4IRzMNf5eCTxVdRG4Feh0S53cJkR4WtIa/B95korWpkQJOw480nkdNDV149S7EZPX6IOpZdUgzl+a7DZO9gEB0zTLcHmW4Ijnli5a2DQLpQwZAyFVY0qNZaNxCcLMoEpxI6QEcJWrCDBbgLTI/zg2WMVVweHMDsyWpP/3DVfpHhc8iWrL/0N8/RHxXPNwADavayuvfxK85mattq2riErozI5gUkkLeo2IR1swoB4KK9towV9w4MZAtXY2NEXmVMJhlVb9yCn8oXiZ3ZYNjKFWIvMGV/CzG/PKg87cC7swJntWWXhB8oXmb92EzQYLpZAq23d/XkVjXkVV/MqmvFJY/6FRnA6uTmieaDQMH76RhzvDKC8MSOIO9b0YGfNYa+42vnzpbvAoEdD9dU98FrsobIrDrtNyKOES1RqPbNa6ZmM9ZoedvTsVb4RmulYeNY5IDJvHx2yk8GF8Al/bHkigCGHHAwcwSqpAS5jRip+6JSt+8GtQpLDVzdGa1kRky8LodhBPHBYupCxP3w1GrUToGNWFQOQczL6PolsCFaR9udFpR34LDg0G8fwBE60r66ysVPe7D3z4yS6EJwHsXhHLZ+tbb9tRpTQGXevL6dsF/aZnNlo+72vxfG8y8rPfYWXZRapY7Elj+VLtGr7VWa5fEIWmY5i04YP/XgHGYsvNkvkAfz31Kq9rPZ1ESuIHcV4rFMsnQh14QnqcVVT1+9W7cFWEmeII7oGb0x+X1pJrWp6uNTf8AkvvtQoab6le/BHC2L44ItLLBkDTW2UkaAdjBpE+7LVUN3BM8KQM5Eua3d9wwbtKNXUMHBXxEIFeZO3kDAQvxaEJNAbkfn8ReyjkZhV0JeiDxj5cizdxIBGhKVdZnlL+ZWcw+2AnMigVxv+/kGq3JF6d0eBF3GoyTo2OfHVfZpaJn22g564OG5YdizwB2JEmVmIs/UNbPyIoYwQxHN2iY+0NqGIjzIG6gXuKfMpudyK2hHGwnBo7Ml390rsGpiY9buL8RgNbvgykFJ0akfRjh2SsyLv4AscIwInqFVkBDKhagr6N1+fKzf8QAtqQrK1ITlwBIccRd+hRwK+PLin4KJcwoMLz5uCnuhLrVHcV7vA9TZJQgohmacFpixzMbgfHOPevzBWQolwZUVDB2iTGdtyyBC4Y1nUCbmNGp51BjsCSCA7xXKxbM3rmnK3lGwf0I4nL7WoQ6Gjh3F3D8OkvxH5dfzxKhyBEyFMpuOr9NPMshe0GaB7OzrfhQKW8bqN/4X9/0NLE/g8UE+w1JicuGuRsqC5cVvGKfnFCEuWLx98PV7Zf1BwLu2SuAE5p7LPs14m5SGWLHdSo4ulQxhbR89gpcodcyKBvThpRrO97+gdRCvSRBcG6N6KypMNm9NONqFeoRXnx+F4eGn8CGSsRG1xfCkSYgxfSkFal1jI2T4g/eQ6gniijJEswk5oczFutP7gOYYWtfph6cvRt30yi2vFQRD+/O5XY/qtNmlshXb8dV0yYwEp8aXr+Iv8/KGlO3gAPMZSzpeMjA1ygyUt5EuEZbznhqB0FFjMGA6fY9ZqBHxJK9qxw1q0v6Z4rPzw1ZXVtMpHhfxc6LrGyPClwOIVxEXd54aRnybAOLkI8PXHkpGxajMWQgaQfjL5aXc4D0PKqXPNjkJF/5KWYmlm9YjhmnMqnWCZUVojwFIswf30e5F/Jv0si8ljHGR/A2P70CKaXWg+BjM1Ruv+YIIvuJL0W8KSFvHlPQtiZWRnO1HZ9L0ZFq6TY4OYc3BU4Bs6IPwnigAIsbzaLlc4LJbSiPd15EupxeyrK6pqkcua5dEFxMKGG5/dkCwn1a2ppwUj9CCDlMmltlx3LGmR7YPGG6CTr4Scr2+/hU3S59azXGVQqNlrpoYhvqSl0pjLK7iuMtYuWvNiM2kJqONmR6I4qkw8gneBZSxyqmDMvANHE4vAcaW1B0YFnjhZEUNRBdawZPMBKD4xQLhs9O3I2F3FzONwrKCurVuuDia+voOL5mC7hqx+G5nhaOV5MBSPpUyPPLgw7nr7JJgvS6qxiGMmFy9gmYn8TCi4yJmvfKTVbn/qP/v4YfgbzjW0iSJFeC6QBx3IFp0RV5oU5qsF0UsNxRc1fFu2j8QnAT3yWUqJYHmHIfHy2jac1GJkus0vX1PihCbh+qVJKGNpab6PQE1qr0vcx15a0zI3PPcVQ67/V4embN0/V3fkndhCc875xs4eElS3O0T+Ivgk9y6IFjb78b5iSdCZrMuDgff8h2kPLIq557VoOB5bnvDY8sS/rtn3zIZkn61ZC6jclXEnxs+NZKtWvj0s1/JY6kgqjISNyJALKpvU2w6DmX3fazEwZLgMhvDku7v/d13KlE8Pzgw78k503u9W7eMZDnjXJ7ywqlmYSEAanP55lmpyOFOxQ44A3ejH1hUTAJioHvmTOH82Mf8iMnw4StSaH1+xy0bbJfYq7WIlV/DRhuRwGSpod4VvkS85thg7w0KC5lwsk/3w/rHScNCQj5yt41ZDETZ++rhjlYrpqJmnaj/eV7I5qXRTUumW5JIFhqNu6tVd/G2M2jSM2Loy0tbq5h5vXJciEoz+hg8Tv5HECTx01zQh2WJF4gzLbW6w7Op1iyUttH0CRZeB1pCnBMtjXvJP9pl6wcq2RRWoDw7Ndsst8Glo60EySVYzxBf4ueZLy5EKTgAKHF5Xy9/CMXT0Wp9YuVtUbMTlNvob0oprFFNjnFU0EB3MYylcJ6GlTh7Pl2qzMO7D6Tk2tm5UxJIWuwi8viQmtNbkFUAFheZwTCnOMXBIqAFFItnu5ZQLsMQaceKS+K7+IUlOBTm3262cC1vT2gmm5YhlrPmd2AJxYpmb8AZ/Je1ILrqMTLtAhVJcIqxumxnxRfppWrrwYncCp4NIMG3IYT7bCBMprg2S1ipxNXtgayAsZaKPTZ8Rl1mxsXVuBonkZNZJpGnTRv8vDnBBA9qNoLITtQIyFi19i3mGpA4J0gGFeXhMLLO6pWvcHPPIa/bAmD5X3947aFNWk+IVQSRSbXRjR19eRSNKUvIJZ0xc8d4WImcxQPf8hymVjZ29g0OuVWZfvxWEzDcXr46fEyUy69VmbjVRmD0lxBI4iVPP3Ke5o+fOeRFyOgPNJBd0q+LyxclNRpQZq9UDDCCos89c6egd4NfkleTkoHUIqKeqqeuZDamMCyCUk9N178UXtPRIBIyIYS43dd8xZ8T5saTTWtMv3kr4y9pksNDgeaCHY3Mv7C28fORMQ3ZZHRwZp+pM2RXrEr6Z8lnmr1fsQQnXOPIuiVkLKgulGc/AN48sTQRLdVvGqZTiamgTBFF6aT3YxjCzc8KO/mF1EvQB51QKsshZK/+Xb+8C0iHHX9Ym/XVN0q9W7BZlfQZSj72zG4YAB3PlmhRW+EtlLDDrM2tTuAZxm8mMopKna5Ph+KMgLRirwF478ipzzzQcLq87eLouOrfiq/TTb0Ycf+6DDDDIcRqD8yCO2vjg67EvbErfnHRy3zfVMAMwD2kltRE5Zz/cUzIrNOfRZbuuwY4V1cHg7bpIPjzOZyF5+yofPZO3T1wrF5GOYLOs7pwSec1AAQEk9QZn38Dhp0epxoGe1RU5ixZpPb3eo41xhBWvsjxvkqnE11CQVB2y3oecGUp5CMITphYDZtUgacR9UbdnRdhGLu+bxG4IgTCeO1NMY3Ra+6GVVNVQ0gEI78V5BQwBaphztoJAMYwnoQmTwHmg3G9gxapJQZfE5URK0RZkOmqcwMmWjvAGp9ogrj9Rrv9iu0ExIQK1gQ0VUWRE14glNby/MsM2CucL94DylCE8LDRUYhogOGYzP62HmzsI9yOzyBIMOF1gEV2sNTElPhJad7Z/DifqsY70CmLq3dwDE8yHdnlqGzmWw1k8c5+W4uFWMFrPicnd9g3/vZ0HRJQt25pmBLvEXHNsXWnKRBtZipWH0q40lLTg5Br3CxtB0et/dx8mz/lBOxyKHyGWctHB7dQTFCGadO21ceRIy98Vtq66EdDVeshh1KjtEuYeSC3lUpC62lJIxIhcpvmwdkfRDnOrLo3RU+0yujsNihc0pEXRiryhEa6oiBoZocrwiOS1ZmLBYpPS5KJWWdItImSIIcqbpsNTfhS/J5zCxRbeYxvBhjjXY6cltVHkQ2uM0t3ohMnQojVa87Xqfnd0J9gKDdcwM26JW4lBlmm0uKPgL6JkGWp4AkTrsaGB6wJumI1fKGkBL659l0HIx2OZqnqNTrCU7YTpR4alNGqjNk5YFB+SWT5+rjvJjuMskzamr0Nry9TExXGfp5X9+p1Eti7aqLDThOREtj+hq8FojH9+P2njvhJRcHVUNp+Rd0O+TQbvRFLSXRaZrQyoSR+nhaSXKfOA2jhudmRI5mlUeyQvTxaejMJ+eMzmhKhPPluzHA7H48t3s6lTlHjRX7C5g68u5mglCor66Z/fmM7niPCMTjY/xN+SE7Xx2fWpC83HvHE0mN0JgVLJ3s7Axi6Mq+NPOBzWx5bvdpJZQ/EadATQKtKZomJmf//tyj1vR3+NFtQwz21JRsnTY7QS+mAGBbTuoB3/2XECJu2lLWnz9UeQPiJRNmbTCvH8XJO+VBvGzYm4Y1aEetth6NMvl+8iFASdu3Ne1Di0yk8JlLZx/NzI782wxBxDC58qX0qU6KA2wF3j56C7bsPbKEC/bwu2jJ8XddfcqO/PQiaPl7/uROXVpvbeH7wSeftsC1cJC82OFz4LvwIAfoG+rUkoHLDZH12WKNmO/NZZ5tvnRULLt8xgSidvm2mGZ90x28LvSa4xjp1hgXZgLKjoWrAqBy2Th+KoloHMBlDY+FfQ7yQWxsUBxpEW5qCWdYfODlntj6/cDQ9Cl7GlIzDA22dHcIQIo/v+rEjmr2oU/GvtHThzpRVNIBo4qvJEc4JjanB++2yLG1Xqxp6crtucdLKhradnYLCv38pgqTHesyC+4EJjZ99gU3t3zNEKhugCTSnF1e09A92Dg31DVpvNBlT5xMrdV9t7X9qC+BJGW1jVDHf1Dg4kFFxU+YQ/+d6e0pqWngFrd//Qufr2lfH5Kh/91+evOhz25u6+ioYOVaB+wuux8As029rVl1Fyhaxsw/fO4xeudvXAjfCswSHbo8t28navxvj4il1FVS3wV+jM+t3F3mrDCxszS2pauvoG69v7tiSXoGBykOlni+Pz8UDg98uNXU+t2UsW6TannIZRdw9Y27r7YYA4IZR6cGHc0bPQkyHoTEZpzZgZyCQcq0Ur9i2dvfCss3VtcHvY/nKaRsXx1c09970W8158IXpJgb8h8khFyeVWrOAB18iKhvZNSaXwrI7eQf8vDkB/Gjv6rHZbc9cAdAlaTi+pRid+eq9Ave7gmaJLzSPdrwAbYz5ofc4BAv25D9I/2H2SwdJPDyOEwS+2HCMVbq8YcuFHsuHaa6bc5zakoDJYLGPx+rsDeBrY4uyVFpi12WHZkz/ZP/nTdBg2/OnC1c5/f5z59DokiiNyzqumhgFyMKon3tmL9oMPomBIABXMyLrEIhjqzrxLMM45YajO+ZOU0kmb9kflVPRbaYYvCZy+YefrOrv7rDBHL23OePr9JJj3+vYBoKoFVC7OyXCANIP53Z6FKilnbM95cXPm+YYOAA9aQHLPYd9XePmFj9I+2otG7fflIej/rrwqq41es6NwbUKR3W5PLqpRBejgXjxF5S9uykCQaIxhB84Aeb2wKf3RZSDDzGR/CvgdFA2c3Ik2uiPVuI5nNySDVICTefocr2kIy/P17UD9D7+Z4B1sKqtpBXoiWJJC65HuV4DtncT8KqCvH8+PhmEDAAjLt3eB9AARDyoN7Qnwzy8qG7tOXmrx9tXXt3bnnm9AcsBnuym7QozlwXtejQIKgPFDz0hV3jNrUaLsrO2H0T9fCoFzS/Y51VRdXkVjXUvXLcER3lgmA9HA7KsmfaGaHAp0erG5+1ZtxO6CSzS0PzUM2nkntmDIZkVYIm/YBHeBICX502idAa88YHgwJP5IMgNrZp+ph+4VVjU2dvaopoSQjRx7B4fuXRD99HpUVfjchjSgNiApEOA4b90IhAjixOuFr6Anh07V1bX1gvTekVeJ3tkzLYxdFTABXwKW//NGPFk52ZpaCq2h7FlcBrrQeAy6DcYanMOk3TrLxGHZ3NEHUopIeLi+rKadYAkjSiq+FiyxgjlUVg/EgvamQbbPQeg0YPnHNSjVpbdvCMRga9cASMhTIDrQnrz92WV1QFDweHPOBQ5LGmMJ0qalpx+InQ1BmKYg4rBP//wA6t/kUBZLxJdommYiwXCLBiXTwiPgQfA4kGPAx2NnmjKKLze09ammoUSQlXEngF0YGYsn4lcrduFUtgNAN0hjBeonfZwB9PfbVchwA4UH0g8oBqay+GIzzJeXD1q4xlja7n0tDoQQwnJ9Olz8m5X7oHGMpR54EcAmo4aeXG7qBv2358QlJEKnhqFNurA5A1hCO2iLKYSlcWsqKuhEWPobCiqbEA29GAqjAFaDX0CpEyy9p4VDO6er24gmBlIur20bJb4MMnkHGlNP1gCWP341ErCc9tkBmA6QsU+tQvWhwA0TFsdNeCMeSP7+hbFg74AEyymv9w62SLBESTpfHYY5AhbfC1iyy5z/tymD4RWCJc3I2OPnGq60945F+0MbgDKALWJzLwC7TFwSD8cDi2JAspFcIcxPhnfjC3ks8RLgBFyKBdKPyf9TG8Epgl/+9kEKwnJuZHVzb35FPdhZxZdb0HxhmrAcqRBi+TfgS7XhN+/uYbE0wkn81xUgYH6yJB48tIkLowAqXBOPtsVkzGyMZQ/BEsaF+PI0w5caw4bEYtpmv2NOBPwyl8qFizksvTgscTsgkPIvtMCUglARYBk5cr5cHo3yfaZ8knHX/AhQMFjGJsDjwU47fqb+F2/vBEkCkwg8p/LbDgIWevPrFXtARSfmX5TI2DHBFBDyubq2x5YnPPzmDpgOUpgRc+wC3A5GGpyj/bWmMfoS/grGMwys8FJTR08/zClKN12xA72xKpB6fydK4/v7B6lwL8grjOUuPlA8XWezO6AdoLOfvRkP1wBN2Gj7gVNXfvrGDuRc0Q6w6eAyMCh4LHMvAJZw8XMfIhn794/SvDGWQ7ZBlLeuNkCDwI6/XbX3oaUocfeRtxKAGlbF5YPgAScSuoeKfAFLrC9//97eO+ZEclgCrYP4fWkz0lOr44vh+w//2YMNVMDVjlyRqWEwezA/4MwQAz7uOKIt8J7vXhAFPQcs7xy5jAUXKlAPYpOk25B0XsAP+kdqQmAGB4fQj8ge89P/YF5MVz/YrzSYqSR9y8vf8KfVyTip9TA09cfViKGtVpTFBAYhcJX/V4fILnSkHWQx+mxfEnEcznv6bSAJyQYyJBUICAg+RVVNIIVAhYP2xfcOkfwmmFwca2R8dqLdQY/CXaiYN4h6C+9RTbbr++ZiC3IzcFUatIP0bpApOrcCOnbfwp3guRNCAWCefBdtX7NhTxHm0USSxdMPRjptL61GiepAuGTrEXjQ1c4+uCxoG8qRHBi0A1fduzCGFOci1YPdEiAymJmufitxVwhfotxXXx0xxIBckLkbSIGzgKaKtvUNoRkDbaocD+EOQSGjk3imn/7Zj5JnhR/995aM+xdGk70kvALMP5wXDUiAUfqPjWlEjhNTZdpnmdqQHJgORJVBJuj9y5szmE2GwGmbGwk8CiIXqxNEKz99IxbMH7AAn1qVxAS9fHXPrk+dFZrzrw+T0YwHUqA7QVvPDD0EtuJ9i2IZh8xPDwYwCNJJGzOBctGuKcI9kPwNP12SoA096L81cwLZKcpX95MlsTNDspGkBSWEq4CfWr0bpZlhPwQ4+58fpYIwBM9y8pbMO+agiQMW+cfGDLiRS3KY/un+4NAjL25ORyUfJILoq5u8OQtG8ac1+0jH4AQ69vKWTNAUIBjASGbet6FGuzhDH8bNtHCeNzArSgVC7YSBXocbn16fQtxWELzQpSlb94PeASUtK+R2y5dak3gTd6W3f6BOcD8a2Be+GEWHmpL+ImlKEiqTx8ZIbEX4XMmN7ARxS77i8LS4ZVHYxaiwesP9rthneW+dDYFrSvC7YEqNfDWORiluxx5Tt+4Hc/3LtFPgF4EPWl7bgWwIYShUEoiXRnK1w1m11zKrmNwF3Oqr7A1FFmeJM9JHuN5mdjjheOUX5XDFCwqxOmcpOZRo5cdt4dW17S/P7YsLzL0zv+poeT3oo8gj57C3anAVmxU+SXlC5VmQwmFoPVi+5ja+0Tp7F4fBTUBc6+RcMfFHQ7mfYtcLZMjmJBdYcFjYLF90k+RXuIHT3XbzbOq2RdYIcqiY5C4N5SZPAwxU/knyFCbhMptiMo5WFAJ1xl7S1XaNu9CiRrIdlnJyl0geKNMWxa8aal2k0Am30Ra+4sj9Ygu7lmdx3qDF7Zx4aSyuMkXcLQkwK5K+Xxxkg7+mkazo8nsdGYf14jHFjl5jCpawMIGfDrXbtyZTSplXRjzFitdbPMHYDd+zGSQKr8sTQUC5zFHlD7SqCI6LyoMXbA1vljUGD1+757JZSjm3SD7gkc2pS6pl89AsHmToePziLa1nmXYKKeOyLBm284xNEEihLR8HrUPIZZRnEmuHsYDOWJt8notFdDuvfvgb3bxPwqW+5CgAKy3KhaHBroA6a1+yNqlsBPD576IZdCWxef2nNkv1giQPW+tBQqXgrcGixEfyvgaN8YGF0eCxqMARbmjrATdfpO1uHjf26/jY/RyYLI6Tl1pQaRupHgQ4H1mWwG8qeHO+buSDVDrgArqJi+PKa9tIXEzFVT0OWe0HT9cFh2ajGIr65iuHb+jjznkRL2/J3HPiUieqFSSbZtr/H9Ub0161rtomAAAAJXRFWHRkYXRlOmNyZWF0ZQAyMDEyLTAzLTI5VDEwOjM2OjEwKzAyOjAwkWix2gAAACV0RVh0ZGF0ZTptb2RpZnkAMjAxMi0wMy0yOVQxMDozNjoxMCswMjowMOA1CWYAAAAUdEVYdGRjOmZvcm1hdABpbWFnZS9qcGVn22DkxQAAACB0RVh0aWxsdXN0cmF0b3I6U3RhcnR1cFByb2ZpbGUAUHJpbnRNbINqAAAAEXRFWHRqcGVnOmNvbG9yc3BhY2UAMix1VZ8AAAAgdEVYdGpwZWc6c2FtcGxpbmctZmFjdG9yADF4MSwxeDEsMXgx6ZX8cAAAACN0RVh0cGRmOlByb2R1Y2VyAEFkb2JlIFBERiBsaWJyYXJ5IDkuMDDiS+ceAAAAEXRFWHRyZGY6QWx0AAogICAgCiAgICuew8EAAAAWdEVYdHJkZjpCYWcACiAgICAKICAgIAogICD4Xmb7AAAAEXRFWHRzdERpbTpoADE5LjQ2NjY4NL2H9bkAAAAWdEVYdHN0RGltOnVuaXQATWlsbGltZXRlcnPv0HhyAAAAEXRFWHRzdERpbTp3ADM5Ljk5OTk3MEN75oAAAAA5dEVYdHN0UmVmOmRvY3VtZW50SUQAeG1wLmRpZDowODgwMTE3NDA3MjA2ODExQjExQkEyRkVENEM0MEFBMf/AfAoAAAA6dEVYdHN0UmVmOmluc3RhbmNlSUQAdXVpZDo1Y2JlZDNjYi00NTBjLTA3NDctODY2Yy03ZTJhYWZjY2M3YmGQqoQXAAAAPnRFWHRzdFJlZjpvcmlnaW5hbERvY3VtZW50SUQAdXVpZDo1RDIwODkyNDkzQkZEQjExOTE0QTg1OTBEMzE1MDhDOB+exmgAAAAedEVYdHN0UmVmOnJlbmRpdGlvbkNsYXNzAHByb29mOnBkZi6gIiYAAAAodEVYdHhtcDpDcmVhdGVEYXRlADIwMTAtMTItMDFUMTQ6MjI6MDMrMDE6MDCEgKZYAAAAJXRFWHR4bXA6Q3JlYXRvclRvb2wAQWRvYmUgSWxsdXN0cmF0b3IgQ1M0Aa/QiwAAACp0RVh0eG1wOk1ldGFkYXRhRGF0ZQAyMDEwLTEyLTAxVDE0OjIyOjAzKzAxOjAwDNrJ3wAAACN0RVh0eG1wOk1vZGlmeURhdGUAMjAxMC0xMi0wMVQxMzoyMjowOFqz99SbAAAAEXRFWHR4bXBNTTpEb2N1bWVudElEAOocGPAAAAA5dEVYdHhtcE1NOkluc3RhbmNlSUQAeG1wLmlpZDpCRTczQkZBODA1MjE2ODExQjExQkEyRkVENEM0MEFBMcWJYwcAAAA+dEVYdHhtcE1NOk9yaWdpbmFsRG9jdW1lbnRJRAB1dWlkOjVEMjA4OTI0OTNCRkRCMTE5MTRBODU5MEQzMTUwOEM49OjDJgAAAB50RVh0eG1wTU06UmVuZGl0aW9uQ2xhc3MAcHJvb2Y6cGRmhKbfiQAAACB0RVh0eG1wVFBnOkhhc1Zpc2libGVPdmVycHJpbnQARmFsc2V5GcblAAAAI3RFWHR4bXBUUGc6SGFzVmlzaWJsZVRyYW5zcGFyZW5jeQBGYWxzZTpcPYIAAAAPdEVYdHhtcFRQZzpOUGFnZXMAMcmB27IAAAAASUVORK5CYII=</mdui:Logo>
-      </mdui:UIInfo>
-      <mdui:DiscoHints>
-        <mdui:IPHint>193.190.0.0/15</mdui:IPHint>
-        <mdui:IPHint>2001:6a8::/32</mdui:IPHint>
-        <mdui:DomainHint>belnet.be</mdui:DomainHint>
-        <mdui:GeolocationHint>geo:50.825312,4.365471</mdui:GeolocationHint>
-      </mdui:DiscoHints>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIExzCCA6+gAwIBAgIRAMNmOaeNUJe5LtzIpBM//sEwDQYJKoZIhvcNAQEFBQAw
-NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-IFNTTCBDQTAeFw0xMjAxMzEwMDAwMDBaFw0xNTAxMzAyMzU5NTlaMIGeMQswCQYD
-VQQGEwJCRTESMBAGA1UECBMJQnJ1eGVsbGVzMRIwEAYDVQQHEwlCcnV4ZWxsZXMx
-NzA1BgNVBAoMLkxlIHLDqXNlYXUgdMOpbMOpbWF0aXF1ZSBiZWxnZSBkZSBsYSBy
-ZWNoZXJjaGUxETAPBgNVBAsTCFNlcnZpY2VzMRswGQYDVQQDExJpZHBzdGFmZi5i
-ZWxuZXQuYmUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDeMjJ+MakW
-ESz80oYi0FOG3gW6iiuyD5BSxQ8Gr9CEg26YxVp5a/eSofaWQm/nTo1WMt+oUYme
-gFhquFXyFofQ9JiQesqryf7imMsBloQ6wvvobpKYsbLLegYpiFoB4WF1jwwbDUDp
-Dt6fV/taiLIv9DWpPQzaQ4FybdMYvERGzYLryUB8BB5q2c7DjyHCor5hqpw2Mf7J
-z6H6WrQYkppE44+pSF/9AUiV5qPv9JJUmaqzF3f3eGU4SHjI0i6rZosMw28kp2vs
-03SFAnrhVjReHRSAy5R+XDGi6fEyO6hV68cncLoKRuiv2aYbc6ZuGJlAzioMPDRD
-2Eo7FGUWfYRTAgMBAAGjggFlMIIBYTAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3
-V0fqkOO57TAdBgNVHQ4EFgQUl14XH6BEPRYstv5He0vPLsM/UmAwDgYDVR0PAQH/
-BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUF
-BwMCMBgGA1UdIAQRMA8wDQYLKwYBBAGyMQECAh0wOgYDVR0fBDMwMTAvoC2gK4Yp
-aHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcmwwbQYIKwYB
-BQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRjcy50ZXJlbmEub3Jn
-L1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDovL29jc3AudGNzLnRl
-cmVuYS5vcmcwHQYDVR0RBBYwFIISaWRwc3RhZmYuYmVsbmV0LmJlMA0GCSqGSIb3
-DQEBBQUAA4IBAQBYZbu3HknWMW2n+JmZBBXiLEOx0DdBWESX1tfG4kvT6b+lXD1I
-BLuOUTWS544wsMyqDD/I1a9mrAZAuoVAYvEVXlNRexkvZC++AzdoFsOuow4dxQg2
-gW87Z2oDHQiTswTPzLUeQBAo9kAc8IcTEVgy7921y7/xVgvwzMNG+jMLWW2hSDo2
-Prwn+VbHSG4eYz4GPrm/MX3WkROUqSbuGNgXIx6Inqr2psLxstXWjSDM55Qt+OsB
-+BIxlm2pnEhk5WaZCjaRrBrdKjyC4TUVNDoYHbdwiu5ZAqnpWkYTT13qhCRAG+fl
-K6fSDEGm6Kz/5tRvh3u1WklUCJRx0A6nMD/b
-                   </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idpstaff.belnet.be:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idpstaff.belnet.be: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://idpstaff.belnet.be/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idpstaff.belnet.be/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idpstaff.belnet.be/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idpstaff.belnet.be/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">belnet.be</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIExzCCA6+gAwIBAgIRAMNmOaeNUJe5LtzIpBM//sEwDQYJKoZIhvcNAQEFBQAw
-NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-IFNTTCBDQTAeFw0xMjAxMzEwMDAwMDBaFw0xNTAxMzAyMzU5NTlaMIGeMQswCQYD
-VQQGEwJCRTESMBAGA1UECBMJQnJ1eGVsbGVzMRIwEAYDVQQHEwlCcnV4ZWxsZXMx
-NzA1BgNVBAoMLkxlIHLDqXNlYXUgdMOpbMOpbWF0aXF1ZSBiZWxnZSBkZSBsYSBy
-ZWNoZXJjaGUxETAPBgNVBAsTCFNlcnZpY2VzMRswGQYDVQQDExJpZHBzdGFmZi5i
-ZWxuZXQuYmUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDeMjJ+MakW
-ESz80oYi0FOG3gW6iiuyD5BSxQ8Gr9CEg26YxVp5a/eSofaWQm/nTo1WMt+oUYme
-gFhquFXyFofQ9JiQesqryf7imMsBloQ6wvvobpKYsbLLegYpiFoB4WF1jwwbDUDp
-Dt6fV/taiLIv9DWpPQzaQ4FybdMYvERGzYLryUB8BB5q2c7DjyHCor5hqpw2Mf7J
-z6H6WrQYkppE44+pSF/9AUiV5qPv9JJUmaqzF3f3eGU4SHjI0i6rZosMw28kp2vs
-03SFAnrhVjReHRSAy5R+XDGi6fEyO6hV68cncLoKRuiv2aYbc6ZuGJlAzioMPDRD
-2Eo7FGUWfYRTAgMBAAGjggFlMIIBYTAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3
-V0fqkOO57TAdBgNVHQ4EFgQUl14XH6BEPRYstv5He0vPLsM/UmAwDgYDVR0PAQH/
-BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUF
-BwMCMBgGA1UdIAQRMA8wDQYLKwYBBAGyMQECAh0wOgYDVR0fBDMwMTAvoC2gK4Yp
-aHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcmwwbQYIKwYB
-BQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRjcy50ZXJlbmEub3Jn
-L1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDovL29jc3AudGNzLnRl
-cmVuYS5vcmcwHQYDVR0RBBYwFIISaWRwc3RhZmYuYmVsbmV0LmJlMA0GCSqGSIb3
-DQEBBQUAA4IBAQBYZbu3HknWMW2n+JmZBBXiLEOx0DdBWESX1tfG4kvT6b+lXD1I
-BLuOUTWS544wsMyqDD/I1a9mrAZAuoVAYvEVXlNRexkvZC++AzdoFsOuow4dxQg2
-gW87Z2oDHQiTswTPzLUeQBAo9kAc8IcTEVgy7921y7/xVgvwzMNG+jMLWW2hSDo2
-Prwn+VbHSG4eYz4GPrm/MX3WkROUqSbuGNgXIx6Inqr2psLxstXWjSDM55Qt+OsB
-+BIxlm2pnEhk5WaZCjaRrBrdKjyC4TUVNDoYHbdwiu5ZAqnpWkYTT13qhCRAG+fl
-K6fSDEGm6Kz/5tRvh3u1WklUCJRx0A6nMD/b
-                  </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idpstaff.belnet.be:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idpstaff.belnet.be: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="en">Belnet</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Belnet staff</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.belnet.be/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Belnet Federation Technical Staff</GivenName>
-    <SurName>Belnet Federation</SurName>
-    <EmailAddress>mailto:federation@belnet.be</EmailAddress>
-    <TelephoneNumber>+32-2-7903333</TelephoneNumber>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idptl.telecom-lille.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/idptl.telecom-lille.fr-idp-shibboleth.xml
deleted file mode 100644
index 0eafb861..00000000
--- a/swamid-interfederations-2.0/idptl.telecom-lille.fr-idp-shibboleth.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idptl.telecom-lille.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2014-02-25T16:05:52Z">
-      <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">telecom-lille.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Telecom Lille</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Teachers, Researchers and students.</mdui:Description>
-        <mdui:DisplayName xml:lang="fr">Télécom Lille</mdui:DisplayName>
-        <mdui:Description xml:lang="fr">Enseignants, Chercheurs et Etudiants</mdui:Description>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDQzCCAiugAwIBAgIUdOTTpXbEHWneZrmj++dQu587hqYwDQYJKoZIhvcNAQEF
-BQAwITEfMB0GA1UEAxMWaWRwdGwudGVsZWNvbS1saWxsZS5mcjAeFw0xNDAyMjcw
-ODMwMDJaFw0zNDAyMjcwODMwMDJaMCExHzAdBgNVBAMTFmlkcHRsLnRlbGVjb20t
-bGlsbGUuZnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCreLILg3MJ
-V8fODgvBqTtrkWJjc50DdyouRaBAxTojOPpydqeVP1QATqE+Wf0LenegWcmQGuui
-oJU7VJ/Mn70qBzkTS17qKeAFxp+No7+7ehk65g4lUBxsWtOKWOysg2gJmdQsbz7l
-AF/Hn1+SprxyRe2BJ2s9o8n37sdie6N8zoHCS3e82PDi00yoFuXQ95PxbPpad5Cs
-9EOvAzlI3Aq3t7YU8RBvKePSj3I2sLrkMJZPc4VFMao06QnDP6Pa2GXQl2hZ76KE
-sEN4eGqtSkCbWY/k/QDX9NN8XU7sZSCFpYBzwnm+cCYrhB992+qciE/GKmzsM6tr
-RUKGaeupSS2/AgMBAAGjczBxMFAGA1UdEQRJMEeCFmlkcHRsLnRlbGVjb20tbGls
-bGUuZnKGLWh0dHBzOi8vaWRwdGwudGVsZWNvbS1saWxsZS5mci9pZHAvc2hpYmJv
-bGV0aDAdBgNVHQ4EFgQUt9JZDztpt1bjXPn0mJUj2aErjFowDQYJKoZIhvcNAQEF
-BQADggEBAH8xFBva7Sb5R8vIOyBlNQ57tcEXnsKClZEcYuiL5k3eu79BTH/xRqmx
-5WwQVOAKFiBUjFrcpEJTHGsAHcL1JWaxMIq0G/DW+GufAicNOUezx86ceewRIxJG
-RLzYX4oPKG10r+bUx6/K4CbzojgxysnoZNn9JKqaCH0BBg2Ddk9+0a3k7kML3tD/
-HTHjakbY9quIy8peLhmpjkl85T4mX53V2E90RzOPUhyk1GUzAHiN+O1YBP0n+PEr
-3sd4/75bHQK+6Ec/SBCJA86j/zbK8IPdSqZOWs/zbKYA0Qdava8bErtA5+Qje91C
-qdWukaTYTGYIy6blrFvq4vQQgLPbDGY=
-					    </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://idptl.telecom-lille.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idptl.telecom-lille.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idptl.telecom-lille.fr/idp/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Télécom Lille</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Télécom Lille</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Tovo Rakotonavalona</SurName>
-    <EmailAddress>tovo.rakotonavalona@telecom-lille.fr</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <SurName>Martine Sion</SurName>
-    <EmailAddress>martine.sion@telecom-lille.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idptl.telecom-lille.fr.xml b/swamid-interfederations-2.0/idptl.telecom-lille.fr.xml
deleted file mode 100644
index 0eafb861..00000000
--- a/swamid-interfederations-2.0/idptl.telecom-lille.fr.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idptl.telecom-lille.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2014-02-25T16:05:52Z">
-      <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">telecom-lille.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Telecom Lille</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Teachers, Researchers and students.</mdui:Description>
-        <mdui:DisplayName xml:lang="fr">Télécom Lille</mdui:DisplayName>
-        <mdui:Description xml:lang="fr">Enseignants, Chercheurs et Etudiants</mdui:Description>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDQzCCAiugAwIBAgIUdOTTpXbEHWneZrmj++dQu587hqYwDQYJKoZIhvcNAQEF
-BQAwITEfMB0GA1UEAxMWaWRwdGwudGVsZWNvbS1saWxsZS5mcjAeFw0xNDAyMjcw
-ODMwMDJaFw0zNDAyMjcwODMwMDJaMCExHzAdBgNVBAMTFmlkcHRsLnRlbGVjb20t
-bGlsbGUuZnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCreLILg3MJ
-V8fODgvBqTtrkWJjc50DdyouRaBAxTojOPpydqeVP1QATqE+Wf0LenegWcmQGuui
-oJU7VJ/Mn70qBzkTS17qKeAFxp+No7+7ehk65g4lUBxsWtOKWOysg2gJmdQsbz7l
-AF/Hn1+SprxyRe2BJ2s9o8n37sdie6N8zoHCS3e82PDi00yoFuXQ95PxbPpad5Cs
-9EOvAzlI3Aq3t7YU8RBvKePSj3I2sLrkMJZPc4VFMao06QnDP6Pa2GXQl2hZ76KE
-sEN4eGqtSkCbWY/k/QDX9NN8XU7sZSCFpYBzwnm+cCYrhB992+qciE/GKmzsM6tr
-RUKGaeupSS2/AgMBAAGjczBxMFAGA1UdEQRJMEeCFmlkcHRsLnRlbGVjb20tbGls
-bGUuZnKGLWh0dHBzOi8vaWRwdGwudGVsZWNvbS1saWxsZS5mci9pZHAvc2hpYmJv
-bGV0aDAdBgNVHQ4EFgQUt9JZDztpt1bjXPn0mJUj2aErjFowDQYJKoZIhvcNAQEF
-BQADggEBAH8xFBva7Sb5R8vIOyBlNQ57tcEXnsKClZEcYuiL5k3eu79BTH/xRqmx
-5WwQVOAKFiBUjFrcpEJTHGsAHcL1JWaxMIq0G/DW+GufAicNOUezx86ceewRIxJG
-RLzYX4oPKG10r+bUx6/K4CbzojgxysnoZNn9JKqaCH0BBg2Ddk9+0a3k7kML3tD/
-HTHjakbY9quIy8peLhmpjkl85T4mX53V2E90RzOPUhyk1GUzAHiN+O1YBP0n+PEr
-3sd4/75bHQK+6Ec/SBCJA86j/zbK8IPdSqZOWs/zbKYA0Qdava8bErtA5+Qje91C
-qdWukaTYTGYIy6blrFvq4vQQgLPbDGY=
-					    </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://idptl.telecom-lille.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idptl.telecom-lille.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idptl.telecom-lille.fr/idp/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Télécom Lille</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Télécom Lille</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Tovo Rakotonavalona</SurName>
-    <EmailAddress>tovo.rakotonavalona@telecom-lille.fr</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <SurName>Martine Sion</SurName>
-    <EmailAddress>martine.sion@telecom-lille.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idptoo.osu.cz-simplesaml-saml2-idp-metadata.php.xml b/swamid-interfederations-2.0/idptoo.osu.cz-simplesaml-saml2-idp-metadata.php.xml
deleted file mode 100644
index 96ab3630..00000000
--- a/swamid-interfederations-2.0/idptoo.osu.cz-simplesaml-saml2-idp-metadata.php.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-<?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://idptoo.osu.cz/simplesaml/saml2/idp/metadata.php">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/" registrationInstant="2011-03-21T14:50:41Z">
-      <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>
-    <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://eduid.cz/uri/idp-group/university</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope regexp="false">osu.cz</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="cs">Ostravská univerzita v Ostravě</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">University of Ostrava</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="la">Universitas Ostraviensis</mdui:DisplayName>
-        <mdui:Description xml:lang="cs">Identity Provider pro Ostravskou univerzitu v Ostravě</mdui:Description>
-        <mdui:Description xml:lang="en">Identity Provider for University of Ostrava</mdui:Description>
-        <mdui:InformationURL xml:lang="cs">http://www.osu.cz/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">http://www.osu.eu/</mdui:InformationURL>
-        <mdui:Logo height="40" width="133">https://idptoo.osu.cz/simplesaml/logo_ou.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>MIIEaDCCA1CgAwIBAgIRAI1F3g4wcrtKG/uYYuJMfXcwDQYJKoZIhvcNAQEFBQAwNjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5BIFNTTCBDQTAeFw0xNDA4MDEwMDAwMDBaFw0xNzA3MzEyMzU5NTlaMDsxITAfBgNVBAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEWMBQGA1UEAxMNaWRwdG9vLm9zdS5jejCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAL3OZmWlDARYP9Mgg7lgmVH4qq9ey+arCkDewU8g7ifafWWuacw2PiSQsNPZrmESPWqfEtIKEJl1rdTDAV+O4EjIHwWwWnvLix1p/czACfTWP/QPp6LRML31B6JroQhOPSslq+jR/lArOS2wgpJAsmhLDlGqViAxy8uuLpYsAU/9udUcYIQUz0KiOffo+7X4ZP1qLgwYonfmAkdvdRCw8ppNvjrWYOFokY8H/Y6wUr9EIiJOKK4Q35HbxCVYCXUFGhln+p5AjPh2Cbt92+ft4rnVnA3WDb8q36P7j5PrU0AZQSf44Pyg/1ZPirXsoFT+rqL17Jvtc94HPDpvYqGJ1E0CAwEAAaOCAWowggFmMB8GA1UdIwQYMBaAFAy9k2gM896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBRj1rUtaByWtaeKr02biN9KKRsfxTAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwIgYDVR0gBBswGTANBgsrBgEEAbIxAQICHTAIBgZngQwBAgEwOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwGAYDVR0RBBEwD4INaWRwdG9vLm9zdS5jejANBgkqhkiG9w0BAQUFAAOCAQEAFaGTI0HjZqvUEWfXsKFKX9rSuT2MX/QHSi9Yd0Nr51cEFBZLYedMVp3UE4XPK868eB0j7zTO+lTvAerMcA6jeCebG4uD2TROMfSnVcfOYf16hQV4WfD8kzfCCGqCEC7CYeIXsTcfzoOxF61utkv/tBYGGSbzCfeNDHS3OnY/GuGnK18A1QC/XTA1yRTI4wIPpm0UgEqOmIGQB0WBkCjiHP04trTNb4LT+pLRvxnxu3BHGijpCE9tZDhFRAp1QlVAGYjEBoT434w0RlWs9eH7Q/ANMzPB705mUo+qMknrb+GbS2EaTdJF6oLOa31PI0prGi55RKJclcOGKjyOcB5/fw==</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>MIIEaDCCA1CgAwIBAgIRAI1F3g4wcrtKG/uYYuJMfXcwDQYJKoZIhvcNAQEFBQAwNjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5BIFNTTCBDQTAeFw0xNDA4MDEwMDAwMDBaFw0xNzA3MzEyMzU5NTlaMDsxITAfBgNVBAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEWMBQGA1UEAxMNaWRwdG9vLm9zdS5jejCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAL3OZmWlDARYP9Mgg7lgmVH4qq9ey+arCkDewU8g7ifafWWuacw2PiSQsNPZrmESPWqfEtIKEJl1rdTDAV+O4EjIHwWwWnvLix1p/czACfTWP/QPp6LRML31B6JroQhOPSslq+jR/lArOS2wgpJAsmhLDlGqViAxy8uuLpYsAU/9udUcYIQUz0KiOffo+7X4ZP1qLgwYonfmAkdvdRCw8ppNvjrWYOFokY8H/Y6wUr9EIiJOKK4Q35HbxCVYCXUFGhln+p5AjPh2Cbt92+ft4rnVnA3WDb8q36P7j5PrU0AZQSf44Pyg/1ZPirXsoFT+rqL17Jvtc94HPDpvYqGJ1E0CAwEAAaOCAWowggFmMB8GA1UdIwQYMBaAFAy9k2gM896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBRj1rUtaByWtaeKr02biN9KKRsfxTAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwIgYDVR0gBBswGTANBgsrBgEEAbIxAQICHTAIBgZngQwBAgEwOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwGAYDVR0RBBEwD4INaWRwdG9vLm9zdS5jejANBgkqhkiG9w0BAQUFAAOCAQEAFaGTI0HjZqvUEWfXsKFKX9rSuT2MX/QHSi9Yd0Nr51cEFBZLYedMVp3UE4XPK868eB0j7zTO+lTvAerMcA6jeCebG4uD2TROMfSnVcfOYf16hQV4WfD8kzfCCGqCEC7CYeIXsTcfzoOxF61utkv/tBYGGSbzCfeNDHS3OnY/GuGnK18A1QC/XTA1yRTI4wIPpm0UgEqOmIGQB0WBkCjiHP04trTNb4LT+pLRvxnxu3BHGijpCE9tZDhFRAp1QlVAGYjEBoT434w0RlWs9eH7Q/ANMzPB705mUo+qMknrb+GbS2EaTdJF6oLOa31PI0prGi55RKJclcOGKjyOcB5/fw==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idptoo.osu.cz/simplesaml/saml2/idp/ArtifactResolutionService.php" index="0"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idptoo.osu.cz/simplesaml/saml2/idp/SingleLogoutService.php"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idptoo.osu.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:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idptoo.osu.cz/simplesaml/saml2/idp/SSOService.php"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idptoo.osu.cz/simplesaml/saml2/idp/SSOService.php"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">University of Ostrava</md:OrganizationName>
-    <md:OrganizationName xml:lang="cs">Ostravská univerzita v Ostravě</md:OrganizationName>
-    <md:OrganizationName xml:lang="la">Universitas Ostraviensis</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">University of Ostrava</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="cs">Ostravská univerzita v Ostravě</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="la">Universitas Ostraviensis</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="cs">http://www.osu.cz/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.osu.eu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Alice</md:GivenName>
-    <md:SurName>Vixie</md:SurName>
-    <md:EmailAddress>eduid@osu.cz</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idptoo.osu.cz.xml b/swamid-interfederations-2.0/idptoo.osu.cz.xml
deleted file mode 100644
index 96ab3630..00000000
--- a/swamid-interfederations-2.0/idptoo.osu.cz.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-<?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://idptoo.osu.cz/simplesaml/saml2/idp/metadata.php">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/" registrationInstant="2011-03-21T14:50:41Z">
-      <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>
-    <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://eduid.cz/uri/idp-group/university</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope regexp="false">osu.cz</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="cs">Ostravská univerzita v Ostravě</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">University of Ostrava</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="la">Universitas Ostraviensis</mdui:DisplayName>
-        <mdui:Description xml:lang="cs">Identity Provider pro Ostravskou univerzitu v Ostravě</mdui:Description>
-        <mdui:Description xml:lang="en">Identity Provider for University of Ostrava</mdui:Description>
-        <mdui:InformationURL xml:lang="cs">http://www.osu.cz/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">http://www.osu.eu/</mdui:InformationURL>
-        <mdui:Logo height="40" width="133">https://idptoo.osu.cz/simplesaml/logo_ou.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>MIIEaDCCA1CgAwIBAgIRAI1F3g4wcrtKG/uYYuJMfXcwDQYJKoZIhvcNAQEFBQAwNjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5BIFNTTCBDQTAeFw0xNDA4MDEwMDAwMDBaFw0xNzA3MzEyMzU5NTlaMDsxITAfBgNVBAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEWMBQGA1UEAxMNaWRwdG9vLm9zdS5jejCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAL3OZmWlDARYP9Mgg7lgmVH4qq9ey+arCkDewU8g7ifafWWuacw2PiSQsNPZrmESPWqfEtIKEJl1rdTDAV+O4EjIHwWwWnvLix1p/czACfTWP/QPp6LRML31B6JroQhOPSslq+jR/lArOS2wgpJAsmhLDlGqViAxy8uuLpYsAU/9udUcYIQUz0KiOffo+7X4ZP1qLgwYonfmAkdvdRCw8ppNvjrWYOFokY8H/Y6wUr9EIiJOKK4Q35HbxCVYCXUFGhln+p5AjPh2Cbt92+ft4rnVnA3WDb8q36P7j5PrU0AZQSf44Pyg/1ZPirXsoFT+rqL17Jvtc94HPDpvYqGJ1E0CAwEAAaOCAWowggFmMB8GA1UdIwQYMBaAFAy9k2gM896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBRj1rUtaByWtaeKr02biN9KKRsfxTAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwIgYDVR0gBBswGTANBgsrBgEEAbIxAQICHTAIBgZngQwBAgEwOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwGAYDVR0RBBEwD4INaWRwdG9vLm9zdS5jejANBgkqhkiG9w0BAQUFAAOCAQEAFaGTI0HjZqvUEWfXsKFKX9rSuT2MX/QHSi9Yd0Nr51cEFBZLYedMVp3UE4XPK868eB0j7zTO+lTvAerMcA6jeCebG4uD2TROMfSnVcfOYf16hQV4WfD8kzfCCGqCEC7CYeIXsTcfzoOxF61utkv/tBYGGSbzCfeNDHS3OnY/GuGnK18A1QC/XTA1yRTI4wIPpm0UgEqOmIGQB0WBkCjiHP04trTNb4LT+pLRvxnxu3BHGijpCE9tZDhFRAp1QlVAGYjEBoT434w0RlWs9eH7Q/ANMzPB705mUo+qMknrb+GbS2EaTdJF6oLOa31PI0prGi55RKJclcOGKjyOcB5/fw==</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>MIIEaDCCA1CgAwIBAgIRAI1F3g4wcrtKG/uYYuJMfXcwDQYJKoZIhvcNAQEFBQAwNjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5BIFNTTCBDQTAeFw0xNDA4MDEwMDAwMDBaFw0xNzA3MzEyMzU5NTlaMDsxITAfBgNVBAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEWMBQGA1UEAxMNaWRwdG9vLm9zdS5jejCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAL3OZmWlDARYP9Mgg7lgmVH4qq9ey+arCkDewU8g7ifafWWuacw2PiSQsNPZrmESPWqfEtIKEJl1rdTDAV+O4EjIHwWwWnvLix1p/czACfTWP/QPp6LRML31B6JroQhOPSslq+jR/lArOS2wgpJAsmhLDlGqViAxy8uuLpYsAU/9udUcYIQUz0KiOffo+7X4ZP1qLgwYonfmAkdvdRCw8ppNvjrWYOFokY8H/Y6wUr9EIiJOKK4Q35HbxCVYCXUFGhln+p5AjPh2Cbt92+ft4rnVnA3WDb8q36P7j5PrU0AZQSf44Pyg/1ZPirXsoFT+rqL17Jvtc94HPDpvYqGJ1E0CAwEAAaOCAWowggFmMB8GA1UdIwQYMBaAFAy9k2gM896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBRj1rUtaByWtaeKr02biN9KKRsfxTAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwIgYDVR0gBBswGTANBgsrBgEEAbIxAQICHTAIBgZngQwBAgEwOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwGAYDVR0RBBEwD4INaWRwdG9vLm9zdS5jejANBgkqhkiG9w0BAQUFAAOCAQEAFaGTI0HjZqvUEWfXsKFKX9rSuT2MX/QHSi9Yd0Nr51cEFBZLYedMVp3UE4XPK868eB0j7zTO+lTvAerMcA6jeCebG4uD2TROMfSnVcfOYf16hQV4WfD8kzfCCGqCEC7CYeIXsTcfzoOxF61utkv/tBYGGSbzCfeNDHS3OnY/GuGnK18A1QC/XTA1yRTI4wIPpm0UgEqOmIGQB0WBkCjiHP04trTNb4LT+pLRvxnxu3BHGijpCE9tZDhFRAp1QlVAGYjEBoT434w0RlWs9eH7Q/ANMzPB705mUo+qMknrb+GbS2EaTdJF6oLOa31PI0prGi55RKJclcOGKjyOcB5/fw==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idptoo.osu.cz/simplesaml/saml2/idp/ArtifactResolutionService.php" index="0"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idptoo.osu.cz/simplesaml/saml2/idp/SingleLogoutService.php"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idptoo.osu.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:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idptoo.osu.cz/simplesaml/saml2/idp/SSOService.php"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idptoo.osu.cz/simplesaml/saml2/idp/SSOService.php"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">University of Ostrava</md:OrganizationName>
-    <md:OrganizationName xml:lang="cs">Ostravská univerzita v Ostravě</md:OrganizationName>
-    <md:OrganizationName xml:lang="la">Universitas Ostraviensis</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">University of Ostrava</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="cs">Ostravská univerzita v Ostravě</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="la">Universitas Ostraviensis</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="cs">http://www.osu.cz/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.osu.eu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Alice</md:GivenName>
-    <md:SurName>Vixie</md:SurName>
-    <md:EmailAddress>eduid@osu.cz</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idpuniba.uniba.it-simplesaml-saml2-idp-metadata.php.xml b/swamid-interfederations-2.0/idpuniba.uniba.it-simplesaml-saml2-idp-metadata.php.xml
deleted file mode 100644
index aa1ce103..00000000
--- a/swamid-interfederations-2.0/idpuniba.uniba.it-simplesaml-saml2-idp-metadata.php.xml
+++ /dev/null
@@ -1,100 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" entityID="https://idpuniba.uniba.it/simplesaml/saml2/idp/metadata.php">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2014-10-20T22:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">uniba.it</shibmd:Scope>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="it">Università degli Studi di Bari Aldo Moro</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">University of Bari Aldo Moro</mdui:DisplayName>
-        <mdui:Description xml:lang="it">Identity Provider per gli utenti dell'Università degli Studi di Bari Aldo Moro</mdui:Description>
-        <mdui:Description xml:lang="en">Identity Provider for the users of University of Bari Aldo Moro</mdui:Description>
-        <mdui:InformationURL xml:lang="it">https://idpuniba.uniba.it/info/</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="it">https://idpuniba.uniba.it/info/</mdui:PrivacyStatementURL>
-        <mdui:Logo height="80" width="60" xml:lang="en">https://idpuniba.uniba.it/info/unibalogo.png</mdui:Logo>
-        <mdui:Logo height="80" width="60" xml:lang="it">https://idpuniba.uniba.it/info/unibalogo.png</mdui:Logo>
-        <mdui:Logo height="16" width="16" xml:lang="en">https://idpuniba.uniba.it/info/unibalogo16x16.png</mdui:Logo>
-        <mdui:Logo height="16" width="16" xml:lang="it">https://idpuniba.uniba.it/info/unibalogo16x16.png</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIID7TCCAtWgAwIBAgIJANj5CumEPPiKMA0GCSqGSIb3DQEBBQUAMIGMMQswCQYD
-VQQGEwJJVDEOMAwGA1UECAwFSXRhbHkxDTALBgNVBAcMBEJhcmkxDjAMBgNVBAoM
-BVVuaUJhMRMwEQYDVQQLDApDU0ktQ2FtcHVzMRowGAYDVQQDDBFpZHB1bmliYS51
-bmliYS5pdDEdMBsGCSqGSIb3DQEJARYOc3RhZmZAdW5pYmEuaXQwHhcNMTQwNDAz
-MTQzMjQwWhcNNDQwMzI2MTQzMjQwWjCBjDELMAkGA1UEBhMCSVQxDjAMBgNVBAgM
-BUl0YWx5MQ0wCwYDVQQHDARCYXJpMQ4wDAYDVQQKDAVVbmlCYTETMBEGA1UECwwK
-Q1NJLUNhbXB1czEaMBgGA1UEAwwRaWRwdW5pYmEudW5pYmEuaXQxHTAbBgkqhkiG
-9w0BCQEWDnN0YWZmQHVuaWJhLml0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
-CgKCAQEA2ybitm1sRZ5QF6IXsrh1V1EnuRT5fp3MZdev4WVv5hE/5q/XbRSGSY/v
-eKuQCv2a1yNGd6fwK5lkG0kD8tFoSxfMTz9farfWPpNywhTgvXeMp8nRvzXIJKrw
-T/z34a8CgcXRU19pv6Sd4YgD7Wc/2MP7Uaxp7CCtzYHQ3SOdcWj486spHHdwbMo4
-Ojw9bdZTxkB4XyBVcZ3y5S5P+j/4lsOSSAzKisSCoXm16T+YqZDSZFhwQMdtZTEx
-r2q26MKIqpPzLJMkt0cl/4pHu5olwQ3eTw7ZN/QkpuoXdIRSY5EeeQJyxq67A2ga
-P4KT3ksUKNHobBrPOkaODpnKtiSnJwIDAQABo1AwTjAdBgNVHQ4EFgQU1kgTrmPx
-aF3ULu8QcLg8kF82PXAwHwYDVR0jBBgwFoAU1kgTrmPxaF3ULu8QcLg8kF82PXAw
-DAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAcDLZs+MHK89MVM7964gc
-mK1Rr/7CiKc/ZQ7Swr8+j0kxASSTDO4kJ/+p1VfXx2f2SymbPsJgRnJSE8OxRlbn
-VwD2vciIZhyxYyUGVE17drPvUFBJriNCYvS1Rj+wjO3TvHRrDuSm+ss/ygj0L9FG
-2lDz549x+WGCw3DAEiQHyGMf9i/zksTv5BPlxA/7UqQZIa/BFlqEp/EW3YgVu0+W
-9RBoub2eFvPOcllFQoB28Z5gPQRPBWZhA+Zc1UEvfwcXCo6g61WJgiqAGUYT1ov4
-cCuJJOAZD3rKrhRFexgmfSOP68YWTF0vVcsxPccDmYw5wtYiEV7ziUVV9QuMgM58
-kA==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIID7TCCAtWgAwIBAgIJANj5CumEPPiKMA0GCSqGSIb3DQEBBQUAMIGMMQswCQYD
-VQQGEwJJVDEOMAwGA1UECAwFSXRhbHkxDTALBgNVBAcMBEJhcmkxDjAMBgNVBAoM
-BVVuaUJhMRMwEQYDVQQLDApDU0ktQ2FtcHVzMRowGAYDVQQDDBFpZHB1bmliYS51
-bmliYS5pdDEdMBsGCSqGSIb3DQEJARYOc3RhZmZAdW5pYmEuaXQwHhcNMTQwNDAz
-MTQzMjQwWhcNNDQwMzI2MTQzMjQwWjCBjDELMAkGA1UEBhMCSVQxDjAMBgNVBAgM
-BUl0YWx5MQ0wCwYDVQQHDARCYXJpMQ4wDAYDVQQKDAVVbmlCYTETMBEGA1UECwwK
-Q1NJLUNhbXB1czEaMBgGA1UEAwwRaWRwdW5pYmEudW5pYmEuaXQxHTAbBgkqhkiG
-9w0BCQEWDnN0YWZmQHVuaWJhLml0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
-CgKCAQEA2ybitm1sRZ5QF6IXsrh1V1EnuRT5fp3MZdev4WVv5hE/5q/XbRSGSY/v
-eKuQCv2a1yNGd6fwK5lkG0kD8tFoSxfMTz9farfWPpNywhTgvXeMp8nRvzXIJKrw
-T/z34a8CgcXRU19pv6Sd4YgD7Wc/2MP7Uaxp7CCtzYHQ3SOdcWj486spHHdwbMo4
-Ojw9bdZTxkB4XyBVcZ3y5S5P+j/4lsOSSAzKisSCoXm16T+YqZDSZFhwQMdtZTEx
-r2q26MKIqpPzLJMkt0cl/4pHu5olwQ3eTw7ZN/QkpuoXdIRSY5EeeQJyxq67A2ga
-P4KT3ksUKNHobBrPOkaODpnKtiSnJwIDAQABo1AwTjAdBgNVHQ4EFgQU1kgTrmPx
-aF3ULu8QcLg8kF82PXAwHwYDVR0jBBgwFoAU1kgTrmPxaF3ULu8QcLg8kF82PXAw
-DAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAcDLZs+MHK89MVM7964gc
-mK1Rr/7CiKc/ZQ7Swr8+j0kxASSTDO4kJ/+p1VfXx2f2SymbPsJgRnJSE8OxRlbn
-VwD2vciIZhyxYyUGVE17drPvUFBJriNCYvS1Rj+wjO3TvHRrDuSm+ss/ygj0L9FG
-2lDz549x+WGCw3DAEiQHyGMf9i/zksTv5BPlxA/7UqQZIa/BFlqEp/EW3YgVu0+W
-9RBoub2eFvPOcllFQoB28Z5gPQRPBWZhA+Zc1UEvfwcXCo6g61WJgiqAGUYT1ov4
-cCuJJOAZD3rKrhRFexgmfSOP68YWTF0vVcsxPccDmYw5wtYiEV7ziUVV9QuMgM58
-kA==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idpuniba.uniba.it/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://idpuniba.uniba.it/simplesaml/saml2/idp/SSOService.php"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="it">Università degli Studi di Bari Aldo Moro</OrganizationName>
-    <OrganizationName xml:lang="en">University of Bari Aldo Moro</OrganizationName>
-    <OrganizationDisplayName xml:lang="it">Università degli Studi di Bari Aldo Moro</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">University of Bari Aldo Moro</OrganizationDisplayName>
-    <OrganizationURL xml:lang="it">http://www.uniba.it</OrganizationURL>
-    <OrganizationURL xml:lang="en">http://www.uniba.it/english-version</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Administrator</SurName>
-    <EmailAddress>staff@uniba.it</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idpuniba.uniba.it.xml b/swamid-interfederations-2.0/idpuniba.uniba.it.xml
deleted file mode 100644
index aa1ce103..00000000
--- a/swamid-interfederations-2.0/idpuniba.uniba.it.xml
+++ /dev/null
@@ -1,100 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" entityID="https://idpuniba.uniba.it/simplesaml/saml2/idp/metadata.php">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2014-10-20T22:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">uniba.it</shibmd:Scope>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="it">Università degli Studi di Bari Aldo Moro</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">University of Bari Aldo Moro</mdui:DisplayName>
-        <mdui:Description xml:lang="it">Identity Provider per gli utenti dell'Università degli Studi di Bari Aldo Moro</mdui:Description>
-        <mdui:Description xml:lang="en">Identity Provider for the users of University of Bari Aldo Moro</mdui:Description>
-        <mdui:InformationURL xml:lang="it">https://idpuniba.uniba.it/info/</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="it">https://idpuniba.uniba.it/info/</mdui:PrivacyStatementURL>
-        <mdui:Logo height="80" width="60" xml:lang="en">https://idpuniba.uniba.it/info/unibalogo.png</mdui:Logo>
-        <mdui:Logo height="80" width="60" xml:lang="it">https://idpuniba.uniba.it/info/unibalogo.png</mdui:Logo>
-        <mdui:Logo height="16" width="16" xml:lang="en">https://idpuniba.uniba.it/info/unibalogo16x16.png</mdui:Logo>
-        <mdui:Logo height="16" width="16" xml:lang="it">https://idpuniba.uniba.it/info/unibalogo16x16.png</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIID7TCCAtWgAwIBAgIJANj5CumEPPiKMA0GCSqGSIb3DQEBBQUAMIGMMQswCQYD
-VQQGEwJJVDEOMAwGA1UECAwFSXRhbHkxDTALBgNVBAcMBEJhcmkxDjAMBgNVBAoM
-BVVuaUJhMRMwEQYDVQQLDApDU0ktQ2FtcHVzMRowGAYDVQQDDBFpZHB1bmliYS51
-bmliYS5pdDEdMBsGCSqGSIb3DQEJARYOc3RhZmZAdW5pYmEuaXQwHhcNMTQwNDAz
-MTQzMjQwWhcNNDQwMzI2MTQzMjQwWjCBjDELMAkGA1UEBhMCSVQxDjAMBgNVBAgM
-BUl0YWx5MQ0wCwYDVQQHDARCYXJpMQ4wDAYDVQQKDAVVbmlCYTETMBEGA1UECwwK
-Q1NJLUNhbXB1czEaMBgGA1UEAwwRaWRwdW5pYmEudW5pYmEuaXQxHTAbBgkqhkiG
-9w0BCQEWDnN0YWZmQHVuaWJhLml0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
-CgKCAQEA2ybitm1sRZ5QF6IXsrh1V1EnuRT5fp3MZdev4WVv5hE/5q/XbRSGSY/v
-eKuQCv2a1yNGd6fwK5lkG0kD8tFoSxfMTz9farfWPpNywhTgvXeMp8nRvzXIJKrw
-T/z34a8CgcXRU19pv6Sd4YgD7Wc/2MP7Uaxp7CCtzYHQ3SOdcWj486spHHdwbMo4
-Ojw9bdZTxkB4XyBVcZ3y5S5P+j/4lsOSSAzKisSCoXm16T+YqZDSZFhwQMdtZTEx
-r2q26MKIqpPzLJMkt0cl/4pHu5olwQ3eTw7ZN/QkpuoXdIRSY5EeeQJyxq67A2ga
-P4KT3ksUKNHobBrPOkaODpnKtiSnJwIDAQABo1AwTjAdBgNVHQ4EFgQU1kgTrmPx
-aF3ULu8QcLg8kF82PXAwHwYDVR0jBBgwFoAU1kgTrmPxaF3ULu8QcLg8kF82PXAw
-DAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAcDLZs+MHK89MVM7964gc
-mK1Rr/7CiKc/ZQ7Swr8+j0kxASSTDO4kJ/+p1VfXx2f2SymbPsJgRnJSE8OxRlbn
-VwD2vciIZhyxYyUGVE17drPvUFBJriNCYvS1Rj+wjO3TvHRrDuSm+ss/ygj0L9FG
-2lDz549x+WGCw3DAEiQHyGMf9i/zksTv5BPlxA/7UqQZIa/BFlqEp/EW3YgVu0+W
-9RBoub2eFvPOcllFQoB28Z5gPQRPBWZhA+Zc1UEvfwcXCo6g61WJgiqAGUYT1ov4
-cCuJJOAZD3rKrhRFexgmfSOP68YWTF0vVcsxPccDmYw5wtYiEV7ziUVV9QuMgM58
-kA==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIID7TCCAtWgAwIBAgIJANj5CumEPPiKMA0GCSqGSIb3DQEBBQUAMIGMMQswCQYD
-VQQGEwJJVDEOMAwGA1UECAwFSXRhbHkxDTALBgNVBAcMBEJhcmkxDjAMBgNVBAoM
-BVVuaUJhMRMwEQYDVQQLDApDU0ktQ2FtcHVzMRowGAYDVQQDDBFpZHB1bmliYS51
-bmliYS5pdDEdMBsGCSqGSIb3DQEJARYOc3RhZmZAdW5pYmEuaXQwHhcNMTQwNDAz
-MTQzMjQwWhcNNDQwMzI2MTQzMjQwWjCBjDELMAkGA1UEBhMCSVQxDjAMBgNVBAgM
-BUl0YWx5MQ0wCwYDVQQHDARCYXJpMQ4wDAYDVQQKDAVVbmlCYTETMBEGA1UECwwK
-Q1NJLUNhbXB1czEaMBgGA1UEAwwRaWRwdW5pYmEudW5pYmEuaXQxHTAbBgkqhkiG
-9w0BCQEWDnN0YWZmQHVuaWJhLml0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
-CgKCAQEA2ybitm1sRZ5QF6IXsrh1V1EnuRT5fp3MZdev4WVv5hE/5q/XbRSGSY/v
-eKuQCv2a1yNGd6fwK5lkG0kD8tFoSxfMTz9farfWPpNywhTgvXeMp8nRvzXIJKrw
-T/z34a8CgcXRU19pv6Sd4YgD7Wc/2MP7Uaxp7CCtzYHQ3SOdcWj486spHHdwbMo4
-Ojw9bdZTxkB4XyBVcZ3y5S5P+j/4lsOSSAzKisSCoXm16T+YqZDSZFhwQMdtZTEx
-r2q26MKIqpPzLJMkt0cl/4pHu5olwQ3eTw7ZN/QkpuoXdIRSY5EeeQJyxq67A2ga
-P4KT3ksUKNHobBrPOkaODpnKtiSnJwIDAQABo1AwTjAdBgNVHQ4EFgQU1kgTrmPx
-aF3ULu8QcLg8kF82PXAwHwYDVR0jBBgwFoAU1kgTrmPxaF3ULu8QcLg8kF82PXAw
-DAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAcDLZs+MHK89MVM7964gc
-mK1Rr/7CiKc/ZQ7Swr8+j0kxASSTDO4kJ/+p1VfXx2f2SymbPsJgRnJSE8OxRlbn
-VwD2vciIZhyxYyUGVE17drPvUFBJriNCYvS1Rj+wjO3TvHRrDuSm+ss/ygj0L9FG
-2lDz549x+WGCw3DAEiQHyGMf9i/zksTv5BPlxA/7UqQZIa/BFlqEp/EW3YgVu0+W
-9RBoub2eFvPOcllFQoB28Z5gPQRPBWZhA+Zc1UEvfwcXCo6g61WJgiqAGUYT1ov4
-cCuJJOAZD3rKrhRFexgmfSOP68YWTF0vVcsxPccDmYw5wtYiEV7ziUVV9QuMgM58
-kA==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idpuniba.uniba.it/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://idpuniba.uniba.it/simplesaml/saml2/idp/SSOService.php"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="it">Università degli Studi di Bari Aldo Moro</OrganizationName>
-    <OrganizationName xml:lang="en">University of Bari Aldo Moro</OrganizationName>
-    <OrganizationDisplayName xml:lang="it">Università degli Studi di Bari Aldo Moro</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">University of Bari Aldo Moro</OrganizationDisplayName>
-    <OrganizationURL xml:lang="it">http://www.uniba.it</OrganizationURL>
-    <OrganizationURL xml:lang="en">http://www.uniba.it/english-version</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Administrator</SurName>
-    <EmailAddress>staff@uniba.it</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/ifs00sv056.ifsul.edu.br-idp-shibboleth.xml b/swamid-interfederations-2.0/ifs00sv056.ifsul.edu.br-idp-shibboleth.xml
deleted file mode 100644
index e1f69a35..00000000
--- a/swamid-interfederations-2.0/ifs00sv056.ifsul.edu.br-idp-shibboleth.xml
+++ /dev/null
@@ -1,118 +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://ifs00sv056.ifsul.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">edu.br</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">IFSul - Instituto Federal Sul-rio-grandense</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="pt-br">IFSul - Instituto Federal Sul-rio-grandense</mdui:DisplayName>
-        <mdui:Description xml:lang="en">IFSul - Instituto Federal Sul-rio-grandense</mdui:Description>
-        <mdui:Description xml:lang="pt-br">IFSul - Instituto Federal Sul-rio-grandense</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.ifsul.edu.br/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="pt-br">http://www.ifsul.edu.br/</mdui:InformationURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-    MIIEajCCA1ICAQAwDQYJKoZIhvcNAQEFBQAwgfoxNDAyBgNVBAoTK0lGU3VsIC0g
-SW5zdGl0dXRvIEZlZGVyYWwgU3VsLXJpby1ncmFuZGVuc2UxQzBBBgNVBAsTOkRU
-SUMgLSBEaXJldG9yaWEgZGUgVGVjbm9sb2dpYSBkYSBJbmZvcm1hY2FvIGUgQ29t
-dW5pY2FjYW8xIDAeBgkqhkiG9w0BCQEWEWR0aWNAaWZzdWwuZWR1LmJyMRAwDgYD
-VQQHEwdQZWxvdGFzMRowGAYDVQQIExFSaW8gR3JhbmRlIGRvIFN1bDELMAkGA1UE
-BhMCQlIxIDAeBgNVBAMTF2lmczAwc3YwNTYuaWZzdWwuZWR1LmJyMB4XDTEzMDkx
-MDE0MDUxOFoXDTE2MDkwOTE0MDUxOFowgfoxNDAyBgNVBAoTK0lGU3VsIC0gSW5z
-dGl0dXRvIEZlZGVyYWwgU3VsLXJpby1ncmFuZGVuc2UxQzBBBgNVBAsTOkRUSUMg
-LSBEaXJldG9yaWEgZGUgVGVjbm9sb2dpYSBkYSBJbmZvcm1hY2FvIGUgQ29tdW5p
-Y2FjYW8xIDAeBgkqhkiG9w0BCQEWEWR0aWNAaWZzdWwuZWR1LmJyMRAwDgYDVQQH
-EwdQZWxvdGFzMRowGAYDVQQIExFSaW8gR3JhbmRlIGRvIFN1bDELMAkGA1UEBhMC
-QlIxIDAeBgNVBAMTF2lmczAwc3YwNTYuaWZzdWwuZWR1LmJyMIIBIjANBgkqhkiG
-9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuz4oD/NvC0Hwk0WhnCSYP29C98DOVwJ8sjOT
-1tfcOSkYq2DfXvI9macZLWi6PY8moeOGRlUCquo+w3Y1PJpwj0Hck0+HNN3JchyA
-iKr5LqnS/Ukx5M/CSvrwaeu7uA2Mpqv5PtfnUaU4ytDGBtWX/w1TgxbOTLFQ47UN
-69+359uqqHTvUFiRSPYGE7xGrpu6lq5A5Q/E6mkCMtypRAHH9Ld6fFH7AAWiExJH
-SGJq5rRoml2GTzm786NeM4rc4hIBkE9GuUyTtix6VJumm9PkF3HctGQZRYT/Iwi+
-PyISeGuDy2JWQy+VYgLBuyGsXo3O9LVMVe/sTUPr+2gU52AD1QIDAQABMA0GCSqG
-SIb3DQEBBQUAA4IBAQB1yTZ5bnXiK5+4mMT6NSQvkxnBn6KAu5hau+MREI3WM3CL
-+3udcHBNFkxSEL1BVJjfrg40IzSic5rVQ8pK9EWyhey4AcD9BBkrdem0P7Z+0+PJ
-pV6SV+n0MoAGf7VJxxXaX4JcJmrwQOXhj0v+YhOoBmmm3ccCrmzWvWpKPO/NgUYR
-mXkx/UZzoIc8si4G4f0tdrteQMtpq3p31STZAX7kIr7Ih2GwQXWRqvyRmd0CtAwE
-0YO4sFwtY/JBMQIwBDQNYFv6H/+6wo24inxILDSj/jHX60t/tSKPBRdkN0JXnv1A
-2EfD1BzA7Hv6BsAWRmUYnsxjtSsQc4LJizwpTTvp
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ifs00sv056.ifsul.edu.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://ifs00sv056.ifsul.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://ifs00sv056.ifsul.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ifs00sv056.ifsul.edu.br/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://ifs00sv056.ifsul.edu.br/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ifs00sv056.ifsul.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>
-      
-MIIEajCCA1ICAQAwDQYJKoZIhvcNAQEFBQAwgfoxNDAyBgNVBAoTK0lGU3VsIC0g
-SW5zdGl0dXRvIEZlZGVyYWwgU3VsLXJpby1ncmFuZGVuc2UxQzBBBgNVBAsTOkRU
-SUMgLSBEaXJldG9yaWEgZGUgVGVjbm9sb2dpYSBkYSBJbmZvcm1hY2FvIGUgQ29t
-dW5pY2FjYW8xIDAeBgkqhkiG9w0BCQEWEWR0aWNAaWZzdWwuZWR1LmJyMRAwDgYD
-VQQHEwdQZWxvdGFzMRowGAYDVQQIExFSaW8gR3JhbmRlIGRvIFN1bDELMAkGA1UE
-BhMCQlIxIDAeBgNVBAMTF2lmczAwc3YwNTYuaWZzdWwuZWR1LmJyMB4XDTEzMDkx
-MDE0MDUxOFoXDTE2MDkwOTE0MDUxOFowgfoxNDAyBgNVBAoTK0lGU3VsIC0gSW5z
-dGl0dXRvIEZlZGVyYWwgU3VsLXJpby1ncmFuZGVuc2UxQzBBBgNVBAsTOkRUSUMg
-LSBEaXJldG9yaWEgZGUgVGVjbm9sb2dpYSBkYSBJbmZvcm1hY2FvIGUgQ29tdW5p
-Y2FjYW8xIDAeBgkqhkiG9w0BCQEWEWR0aWNAaWZzdWwuZWR1LmJyMRAwDgYDVQQH
-EwdQZWxvdGFzMRowGAYDVQQIExFSaW8gR3JhbmRlIGRvIFN1bDELMAkGA1UEBhMC
-QlIxIDAeBgNVBAMTF2lmczAwc3YwNTYuaWZzdWwuZWR1LmJyMIIBIjANBgkqhkiG
-9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuz4oD/NvC0Hwk0WhnCSYP29C98DOVwJ8sjOT
-1tfcOSkYq2DfXvI9macZLWi6PY8moeOGRlUCquo+w3Y1PJpwj0Hck0+HNN3JchyA
-iKr5LqnS/Ukx5M/CSvrwaeu7uA2Mpqv5PtfnUaU4ytDGBtWX/w1TgxbOTLFQ47UN
-69+359uqqHTvUFiRSPYGE7xGrpu6lq5A5Q/E6mkCMtypRAHH9Ld6fFH7AAWiExJH
-SGJq5rRoml2GTzm786NeM4rc4hIBkE9GuUyTtix6VJumm9PkF3HctGQZRYT/Iwi+
-PyISeGuDy2JWQy+VYgLBuyGsXo3O9LVMVe/sTUPr+2gU52AD1QIDAQABMA0GCSqG
-SIb3DQEBBQUAA4IBAQB1yTZ5bnXiK5+4mMT6NSQvkxnBn6KAu5hau+MREI3WM3CL
-+3udcHBNFkxSEL1BVJjfrg40IzSic5rVQ8pK9EWyhey4AcD9BBkrdem0P7Z+0+PJ
-pV6SV+n0MoAGf7VJxxXaX4JcJmrwQOXhj0v+YhOoBmmm3ccCrmzWvWpKPO/NgUYR
-mXkx/UZzoIc8si4G4f0tdrteQMtpq3p31STZAX7kIr7Ih2GwQXWRqvyRmd0CtAwE
-0YO4sFwtY/JBMQIwBDQNYFv6H/+6wo24inxILDSj/jHX60t/tSKPBRdkN0JXnv1A
-2EfD1BzA7Hv6BsAWRmUYnsxjtSsQc4LJizwpTTvp
-                    
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ifs00sv056.ifsul.edu.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://ifs00sv056.ifsul.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">IFSul - Instituto Federal Sul-rio-grandense</OrganizationName>
-    <OrganizationName xml:lang="pt-br">IFSul - Instituto Federal Sul-rio-grandense</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">IFSul - Instituto Federal Sul-rio-grandense</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="pt-br">IFSul - Instituto Federal Sul-rio-grandense</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.ifsul.edu.br/</OrganizationURL>
-    <OrganizationURL xml:lang="pt-br">http://www.ifsul.edu.br/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Maicon Anca dos Santos</SurName>
-    <EmailAddress>dtic@ifsul.edu.br</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/ifs00sv056.ifsul.edu.br.xml b/swamid-interfederations-2.0/ifs00sv056.ifsul.edu.br.xml
deleted file mode 100644
index e1f69a35..00000000
--- a/swamid-interfederations-2.0/ifs00sv056.ifsul.edu.br.xml
+++ /dev/null
@@ -1,118 +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://ifs00sv056.ifsul.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">edu.br</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">IFSul - Instituto Federal Sul-rio-grandense</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="pt-br">IFSul - Instituto Federal Sul-rio-grandense</mdui:DisplayName>
-        <mdui:Description xml:lang="en">IFSul - Instituto Federal Sul-rio-grandense</mdui:Description>
-        <mdui:Description xml:lang="pt-br">IFSul - Instituto Federal Sul-rio-grandense</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.ifsul.edu.br/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="pt-br">http://www.ifsul.edu.br/</mdui:InformationURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-    MIIEajCCA1ICAQAwDQYJKoZIhvcNAQEFBQAwgfoxNDAyBgNVBAoTK0lGU3VsIC0g
-SW5zdGl0dXRvIEZlZGVyYWwgU3VsLXJpby1ncmFuZGVuc2UxQzBBBgNVBAsTOkRU
-SUMgLSBEaXJldG9yaWEgZGUgVGVjbm9sb2dpYSBkYSBJbmZvcm1hY2FvIGUgQ29t
-dW5pY2FjYW8xIDAeBgkqhkiG9w0BCQEWEWR0aWNAaWZzdWwuZWR1LmJyMRAwDgYD
-VQQHEwdQZWxvdGFzMRowGAYDVQQIExFSaW8gR3JhbmRlIGRvIFN1bDELMAkGA1UE
-BhMCQlIxIDAeBgNVBAMTF2lmczAwc3YwNTYuaWZzdWwuZWR1LmJyMB4XDTEzMDkx
-MDE0MDUxOFoXDTE2MDkwOTE0MDUxOFowgfoxNDAyBgNVBAoTK0lGU3VsIC0gSW5z
-dGl0dXRvIEZlZGVyYWwgU3VsLXJpby1ncmFuZGVuc2UxQzBBBgNVBAsTOkRUSUMg
-LSBEaXJldG9yaWEgZGUgVGVjbm9sb2dpYSBkYSBJbmZvcm1hY2FvIGUgQ29tdW5p
-Y2FjYW8xIDAeBgkqhkiG9w0BCQEWEWR0aWNAaWZzdWwuZWR1LmJyMRAwDgYDVQQH
-EwdQZWxvdGFzMRowGAYDVQQIExFSaW8gR3JhbmRlIGRvIFN1bDELMAkGA1UEBhMC
-QlIxIDAeBgNVBAMTF2lmczAwc3YwNTYuaWZzdWwuZWR1LmJyMIIBIjANBgkqhkiG
-9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuz4oD/NvC0Hwk0WhnCSYP29C98DOVwJ8sjOT
-1tfcOSkYq2DfXvI9macZLWi6PY8moeOGRlUCquo+w3Y1PJpwj0Hck0+HNN3JchyA
-iKr5LqnS/Ukx5M/CSvrwaeu7uA2Mpqv5PtfnUaU4ytDGBtWX/w1TgxbOTLFQ47UN
-69+359uqqHTvUFiRSPYGE7xGrpu6lq5A5Q/E6mkCMtypRAHH9Ld6fFH7AAWiExJH
-SGJq5rRoml2GTzm786NeM4rc4hIBkE9GuUyTtix6VJumm9PkF3HctGQZRYT/Iwi+
-PyISeGuDy2JWQy+VYgLBuyGsXo3O9LVMVe/sTUPr+2gU52AD1QIDAQABMA0GCSqG
-SIb3DQEBBQUAA4IBAQB1yTZ5bnXiK5+4mMT6NSQvkxnBn6KAu5hau+MREI3WM3CL
-+3udcHBNFkxSEL1BVJjfrg40IzSic5rVQ8pK9EWyhey4AcD9BBkrdem0P7Z+0+PJ
-pV6SV+n0MoAGf7VJxxXaX4JcJmrwQOXhj0v+YhOoBmmm3ccCrmzWvWpKPO/NgUYR
-mXkx/UZzoIc8si4G4f0tdrteQMtpq3p31STZAX7kIr7Ih2GwQXWRqvyRmd0CtAwE
-0YO4sFwtY/JBMQIwBDQNYFv6H/+6wo24inxILDSj/jHX60t/tSKPBRdkN0JXnv1A
-2EfD1BzA7Hv6BsAWRmUYnsxjtSsQc4LJizwpTTvp
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ifs00sv056.ifsul.edu.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://ifs00sv056.ifsul.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://ifs00sv056.ifsul.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ifs00sv056.ifsul.edu.br/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://ifs00sv056.ifsul.edu.br/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ifs00sv056.ifsul.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>
-      
-MIIEajCCA1ICAQAwDQYJKoZIhvcNAQEFBQAwgfoxNDAyBgNVBAoTK0lGU3VsIC0g
-SW5zdGl0dXRvIEZlZGVyYWwgU3VsLXJpby1ncmFuZGVuc2UxQzBBBgNVBAsTOkRU
-SUMgLSBEaXJldG9yaWEgZGUgVGVjbm9sb2dpYSBkYSBJbmZvcm1hY2FvIGUgQ29t
-dW5pY2FjYW8xIDAeBgkqhkiG9w0BCQEWEWR0aWNAaWZzdWwuZWR1LmJyMRAwDgYD
-VQQHEwdQZWxvdGFzMRowGAYDVQQIExFSaW8gR3JhbmRlIGRvIFN1bDELMAkGA1UE
-BhMCQlIxIDAeBgNVBAMTF2lmczAwc3YwNTYuaWZzdWwuZWR1LmJyMB4XDTEzMDkx
-MDE0MDUxOFoXDTE2MDkwOTE0MDUxOFowgfoxNDAyBgNVBAoTK0lGU3VsIC0gSW5z
-dGl0dXRvIEZlZGVyYWwgU3VsLXJpby1ncmFuZGVuc2UxQzBBBgNVBAsTOkRUSUMg
-LSBEaXJldG9yaWEgZGUgVGVjbm9sb2dpYSBkYSBJbmZvcm1hY2FvIGUgQ29tdW5p
-Y2FjYW8xIDAeBgkqhkiG9w0BCQEWEWR0aWNAaWZzdWwuZWR1LmJyMRAwDgYDVQQH
-EwdQZWxvdGFzMRowGAYDVQQIExFSaW8gR3JhbmRlIGRvIFN1bDELMAkGA1UEBhMC
-QlIxIDAeBgNVBAMTF2lmczAwc3YwNTYuaWZzdWwuZWR1LmJyMIIBIjANBgkqhkiG
-9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuz4oD/NvC0Hwk0WhnCSYP29C98DOVwJ8sjOT
-1tfcOSkYq2DfXvI9macZLWi6PY8moeOGRlUCquo+w3Y1PJpwj0Hck0+HNN3JchyA
-iKr5LqnS/Ukx5M/CSvrwaeu7uA2Mpqv5PtfnUaU4ytDGBtWX/w1TgxbOTLFQ47UN
-69+359uqqHTvUFiRSPYGE7xGrpu6lq5A5Q/E6mkCMtypRAHH9Ld6fFH7AAWiExJH
-SGJq5rRoml2GTzm786NeM4rc4hIBkE9GuUyTtix6VJumm9PkF3HctGQZRYT/Iwi+
-PyISeGuDy2JWQy+VYgLBuyGsXo3O9LVMVe/sTUPr+2gU52AD1QIDAQABMA0GCSqG
-SIb3DQEBBQUAA4IBAQB1yTZ5bnXiK5+4mMT6NSQvkxnBn6KAu5hau+MREI3WM3CL
-+3udcHBNFkxSEL1BVJjfrg40IzSic5rVQ8pK9EWyhey4AcD9BBkrdem0P7Z+0+PJ
-pV6SV+n0MoAGf7VJxxXaX4JcJmrwQOXhj0v+YhOoBmmm3ccCrmzWvWpKPO/NgUYR
-mXkx/UZzoIc8si4G4f0tdrteQMtpq3p31STZAX7kIr7Ih2GwQXWRqvyRmd0CtAwE
-0YO4sFwtY/JBMQIwBDQNYFv6H/+6wo24inxILDSj/jHX60t/tSKPBRdkN0JXnv1A
-2EfD1BzA7Hv6BsAWRmUYnsxjtSsQc4LJizwpTTvp
-                    
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ifs00sv056.ifsul.edu.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://ifs00sv056.ifsul.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">IFSul - Instituto Federal Sul-rio-grandense</OrganizationName>
-    <OrganizationName xml:lang="pt-br">IFSul - Instituto Federal Sul-rio-grandense</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">IFSul - Instituto Federal Sul-rio-grandense</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="pt-br">IFSul - Instituto Federal Sul-rio-grandense</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.ifsul.edu.br/</OrganizationURL>
-    <OrganizationURL xml:lang="pt-br">http://www.ifsul.edu.br/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Maicon Anca dos Santos</SurName>
-    <EmailAddress>dtic@ifsul.edu.br</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/imogen.surfnet.nl.xml b/swamid-interfederations-2.0/imogen.surfnet.nl.xml
deleted file mode 100644
index 72e641ca..00000000
--- a/swamid-interfederations-2.0/imogen.surfnet.nl.xml
+++ /dev/null
@@ -1,60 +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://imogen.surfnet.nl/proxy/module.php/saml/sp/metadata.php/default-sp">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.surfconext.nl/" registrationInstant="2013-09-04T14:01:03Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://wiki.surfnetlabs.nl/display/eduGAIN/EduGAIN</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">SURFconext decryption proxy</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Proxy which decrypts assertions and forwards them to SURFconext</mdui:Description>
-        <mdui:Logo height="100" width="186">http://www.surfnet.nl/SURFnet%20imagebank/Logos/logo_surfconext_themasite.png</mdui:Logo>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIID/TCCAuWgAwIBAgIJAPJBDh5BkDCmMA0GCSqGSIb3DQEBBQUAMIGUMQswCQYDVQQGEwJOTDETMBEGA1UECAwKU29tZS1TdGF0ZTEQMA4GA1UEBwwHVXRyZWNodDEQMA4GA1UECgwHU1VSRm5ldDERMA8GA1UECwwIVGVzdCBJZFAxGjAYBgNVBAMMEWltb2dlbi5zdXJmbmV0Lm5sMR0wGwYJKoZIhvcNAQkBFg5iYXNAc3VyZm5ldC5ubDAeFw0xMzA2MTgwNzI5NTRaFw0yMzA2MTgwNzI5NTRaMIGUMQswCQYDVQQGEwJOTDETMBEGA1UECAwKU29tZS1TdGF0ZTEQMA4GA1UEBwwHVXRyZWNodDEQMA4GA1UECgwHU1VSRm5ldDERMA8GA1UECwwIVGVzdCBJZFAxGjAYBgNVBAMMEWltb2dlbi5zdXJmbmV0Lm5sMR0wGwYJKoZIhvcNAQkBFg5iYXNAc3VyZm5ldC5ubDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMXEPdLxltthL2I8oo8H2dJ0iOn3NeRnePRksTn3Y5PoIInHoA2zgOvZqmgot3ovDGEZC9HfAhg4iwLdPfyisQz6bN/8c08BU7VwVwpCbRBG5WFhrPqWEC7vNp5bY8AkE6naxMNCUFgCl/qgjI6c5ainIhfdGfZdZ4TDfIOmed4qXic8J8BjlPm+STK2qJ2BFVjl3UKK/cCr5/h654n8zjw5hTfyQKNg22XdjXM9/RhODdMzGd4ozlSxzUDc7+Z4CzhYd9Gm4nCvXfarvZXqQ22m+wXlCYNuJxFgtcfCQo7KA/d9P4PVI+k6A8hQrukrulaqR0V7aBytFwIULKFm0YMCAwEAAaNQME4wHQYDVR0OBBYEFNI3xt9Ggpd9LP37oo3VYYpTN9iSMB8GA1UdIwQYMBaAFNI3xt9Ggpd9LP37oo3VYYpTN9iSMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAGAbcnBYdAERRJFkl2/q9ZxXjImCxRY1fzMTHTlGFppFMXdH+RRY76hNFPI3UvogcWwN9vJsb/2iO+twWr8ESQYvoeJwWskLitdomOQh1poMja4J+VqA1dBOCZW7rmI8ifc75Gk4NPWsFsBuWnfMgtEFfI7ZNpc6PEF8k/vYEsH58IilI4Cg11pVFj9Tqzscoo7KhfwVGVHFoGagytLKpavH74tvduUUwOreNFSnjB79pEVQYP7I+Gm3fRGI/l5ycNznzZFnaGOx8pM4NfWQfDKGRieQH9OwJe2hPrnbDxDzlH1EerS1yDaK5HkEghH5gZvhePub7hUn+5HoCgutSS0=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIID/TCCAuWgAwIBAgIJAPJBDh5BkDCmMA0GCSqGSIb3DQEBBQUAMIGUMQswCQYDVQQGEwJOTDETMBEGA1UECAwKU29tZS1TdGF0ZTEQMA4GA1UEBwwHVXRyZWNodDEQMA4GA1UECgwHU1VSRm5ldDERMA8GA1UECwwIVGVzdCBJZFAxGjAYBgNVBAMMEWltb2dlbi5zdXJmbmV0Lm5sMR0wGwYJKoZIhvcNAQkBFg5iYXNAc3VyZm5ldC5ubDAeFw0xMzA2MTgwNzI5NTRaFw0yMzA2MTgwNzI5NTRaMIGUMQswCQYDVQQGEwJOTDETMBEGA1UECAwKU29tZS1TdGF0ZTEQMA4GA1UEBwwHVXRyZWNodDEQMA4GA1UECgwHU1VSRm5ldDERMA8GA1UECwwIVGVzdCBJZFAxGjAYBgNVBAMMEWltb2dlbi5zdXJmbmV0Lm5sMR0wGwYJKoZIhvcNAQkBFg5iYXNAc3VyZm5ldC5ubDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMXEPdLxltthL2I8oo8H2dJ0iOn3NeRnePRksTn3Y5PoIInHoA2zgOvZqmgot3ovDGEZC9HfAhg4iwLdPfyisQz6bN/8c08BU7VwVwpCbRBG5WFhrPqWEC7vNp5bY8AkE6naxMNCUFgCl/qgjI6c5ainIhfdGfZdZ4TDfIOmed4qXic8J8BjlPm+STK2qJ2BFVjl3UKK/cCr5/h654n8zjw5hTfyQKNg22XdjXM9/RhODdMzGd4ozlSxzUDc7+Z4CzhYd9Gm4nCvXfarvZXqQ22m+wXlCYNuJxFgtcfCQo7KA/d9P4PVI+k6A8hQrukrulaqR0V7aBytFwIULKFm0YMCAwEAAaNQME4wHQYDVR0OBBYEFNI3xt9Ggpd9LP37oo3VYYpTN9iSMB8GA1UdIwQYMBaAFNI3xt9Ggpd9LP37oo3VYYpTN9iSMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAGAbcnBYdAERRJFkl2/q9ZxXjImCxRY1fzMTHTlGFppFMXdH+RRY76hNFPI3UvogcWwN9vJsb/2iO+twWr8ESQYvoeJwWskLitdomOQh1poMja4J+VqA1dBOCZW7rmI8ifc75Gk4NPWsFsBuWnfMgtEFfI7ZNpc6PEF8k/vYEsH58IilI4Cg11pVFj9Tqzscoo7KhfwVGVHFoGagytLKpavH74tvduUUwOreNFSnjB79pEVQYP7I+Gm3fRGI/l5ycNznzZFnaGOx8pM4NfWQfDKGRieQH9OwJe2hPrnbDxDzlH1EerS1yDaK5HkEghH5gZvhePub7hUn+5HoCgutSS0=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://imogen.surfnet.nl/proxy/module.php/saml/sp/saml2-logout.php/default-sp"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://imogen.surfnet.nl/proxy/module.php/saml/sp/saml2-logout.php/default-sp"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://imogen.surfnet.nl/proxy/module.php/saml/sp/saml2-acs.php/default-sp" index="0"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://imogen.surfnet.nl/proxy/module.php/saml/sp/saml1-acs.php/default-sp" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://imogen.surfnet.nl/proxy/module.php/saml/sp/saml2-acs.php/default-sp" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://imogen.surfnet.nl/proxy/module.php/saml/sp/saml1-acs.php/default-sp/artifact" index="3"/>
-    <md:AttributeConsumingService index="0">
-      <md:ServiceName xml:lang="en">SURFconext test proxy</md:ServiceName>
-      <md:RequestedAttribute FriendlyName="urn:mace:dir:attribute-def:eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="urn:mace:dir:attribute-def:mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-      <md:RequestedAttribute FriendlyName="urn:mace:terena.org:attribute-def:schacHomeOrganization" Name="urn:oid:1.3.6.1.4.1.25178.1.2.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-      <md:RequestedAttribute FriendlyName="urn:mace:dir:attribute-def:cn" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-      <md:RequestedAttribute FriendlyName="urn:mace:dir:attribute-def:displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-      <md:RequestedAttribute FriendlyName="urn:mace:dir:attribute-def:givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-      <md:RequestedAttribute FriendlyName="urn:mace:dir:attribute-def:sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="nl">SURFnet BV</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">SURFnet BV</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="nl">SURFnet</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">SURFnet</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="nl">http://www.surfnet.nl/nl/Pages/default.aspx</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.surfnet.nl/en/Pages/default.aspx</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Bas</md:GivenName>
-    <md:SurName>Zoetekouw</md:SurName>
-    <md:EmailAddress>bas.zoetekouw@surfnet.nl</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/indicate-gw.consorzio-cometa.it-shibboleth.xml b/swamid-interfederations-2.0/indicate-gw.consorzio-cometa.it-shibboleth.xml
deleted file mode 100644
index 618ed2f9..00000000
--- a/swamid-interfederations-2.0/indicate-gw.consorzio-cometa.it-shibboleth.xml
+++ /dev/null
@@ -1,124 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" entityID="https://indicate-gw.consorzio-cometa.it/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2011-09-05T15:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement
-                </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>
-        <mdui:DisplayName xml:lang="en">INDICATE e-Culture Science Gateway</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="it">INDICATE e-Culture Science Gateway</mdui:DisplayName>
-        <mdui:Description xml:lang="en">
-                        This service allows users to access the digital repositories created for the INDICATE
-                        project to demonstrate the usefulness of the adoption of e-Infrastructures for Digital
-                        Cultural Heritage. It is devoted to the INDICATE partners as well as to cultural institutions,
-                        e-Infrastructure providers and the general public.
-                    </mdui:Description>
-        <mdui:Description xml:lang="it">
-                        Questo servizio permette agli utenti di accedere gli archivi digitali creati per il progetto
-                        europeo INDICATE con l'obiettivo di dimostrare l'opportunità di adottare e-Infrastrutture per
-                        i patrimoni culturali digitali. Esso è indirizzato ai partner di INDICATE ed altre istituzioni
-                        culturali, i fornitori di e-Infrastrutture ed al pubblico.
-                    </mdui:Description>
-      </mdui:UIInfo>
-      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://indicate-gw.consorzio-cometa.it/Shibboleth.sso/DS"/>
-      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://indicate-gw.consorzio-cometa.it/Shibboleth.sso/DS" index="1"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIFhDCCBGygAwIBAgIRAOyXU1f6GS689kEaSDAhQPYwDQYJKoZIhvcNAQEFBQAw
-NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-IFNTTCBDQTAeFw0xNDA1MTkwMDAwMDBaFw0xNzA1MTgyMzU5NTlaMEAxITAfBgNV
-BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEbMBkGA1UEAxMSbGlmZXJheS5j
-dC5pbmZuLml0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApizyvtMI
-uoSnnz/fvk7lcXwoDUk11NVAlg5w4zh01YKNvy5SzBu0eRIzRos/ALs4CwmxrmCv
-3JQPA4xxItxVd8x9Q+YElQteEcX+mWXXW5LI5XE3xhPzkdFeQrhkinAK2JreSn6E
-TQk8YO1rOxW3qCpKeYZ2VQF3grAU/JRWbvLF+r2j4zE27n+RzBxnYeZ9rtJ/67gU
-7t1S39DRDTyKit7dJIYl50n9g3atWGALb56QoVnlR+RPRxVI9EFd2hEXfrxWXGdt
-F2v6YIMSAAM5l2/SlEmhQSSkmQ4zXcmPrzC6pte9NWoPOTsQnCnocwMJ16aXsnQy
-BxaoywMtq8NsdwIDAQABo4ICgTCCAn0wHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsr
-N1dH6pDjue0wHQYDVR0OBBYEFCy5dq76F94vaAuznAys6UmGxySTMA4GA1UdDwEB
-/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEF
-BQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNVHR8E
-MzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENB
-LmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNz
-LnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8v
-b2NzcC50Y3MudGVyZW5hLm9yZzCCAS0GA1UdEQSCASQwggEgghJsaWZlcmF5LmN0
-LmluZm4uaXSCGWFwcGxpY2F0aW9ucy5ldS1kZWNpZGUuZXWCGWFwcGxpY2F0aW9u
-cy5ldW1lZGdyaWQuZXWCEGdpbGRhLmN0LmluZm4uaXSCFGdpc2VsYS1ndy5jdC5p
-bmZuLml0gg1ndy5jdC5pbmZuLml0ghNnd2VhdGhlci5jdC5pbmZuLml0ghBnd2xp
-Yi5jdC5pbmZuLml0gh9pbmRpY2F0ZS1ndy5jb25zb3J6aW8tY29tZXRhLml0ghFy
-aWNldmkuY3QuaW5mbi5pdIIUdmlyYWxncmlkLmN0LmluZm4uaXSCFHd3dy5jaGFp
-bi1wcm9qZWN0LmV1ghZ3d3cuc3BlY2lhbC1wcm9qZWN0Lml0MA0GCSqGSIb3DQEB
-BQUAA4IBAQCEZIHNNQPD5WkGSlUhCN/BRSharmQ6dT0NiwjQNmRODCpVqBgwVZY0
-VUlAobHaF186QXeiNYge8ZYSpYY2VhBa4znL7IjFODE3FsaJNseKgsyNFqKR8xNO
-nsOCM//SN9N79hwH8yAxLhGyxbnInpOhE6rEkbhtowTjqhDq26cGGlH8JTTPuYvY
-JhgPGGkxo1286x1nuN4ELKvwZ7RF+YTH/WPOIBMNi+ee+vxrIhWbU6iy97f7k4PA
-2e35ZQ6gutnmX2v/ybFWh0ruO4zszYKiMo+zGyLvYmIpV/+Mjs26KbqqrBOS1jjN
-W3MiH8HMxzzYHExNCvzrAgN1TfB+SCiB
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://indicate-gw.consorzio-cometa.it/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://indicate-gw.consorzio-cometa.it/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://indicate-gw.consorzio-cometa.it/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://indicate-gw.consorzio-cometa.it/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://indicate-gw.consorzio-cometa.it/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://indicate-gw.consorzio-cometa.it/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://indicate-gw.consorzio-cometa.it/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://indicate-gw.consorzio-cometa.it/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://indicate-gw.consorzio-cometa.it/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://indicate-gw.consorzio-cometa.it/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://indicate-gw.consorzio-cometa.it/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <AttributeConsumingService index="1">
-      <ServiceName xml:lang="en">INDICATE e-Culture Science Gateway</ServiceName>
-      <ServiceDescription xml:lang="en">This service allows users to access the digital repositories created for the INDICATE
-                    project to demonstrate the usefulness of the adoption of e-Infrastructures for Digital
-                    Cultural Heritage. It is devoted to the INDICATE partners as well as to cultural institutions,
-                    e-Infrastructure providers and the general public.
-                </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"/>
-    </AttributeConsumingService>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">COMETA Consortium</OrganizationName>
-    <OrganizationName xml:lang="it">Consorzio COMETA (COnsorzio Multi Ente per la promozione e l'adozione di Tecnologie di calcolo Avanzato)</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">COMETA</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="it">COMETA</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.consorzio-cometa.it/</OrganizationURL>
-    <OrganizationURL xml:lang="it">http://www.consorzio-cometa.it/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Marco</GivenName>
-    <SurName>Fargetta</SurName>
-    <EmailAddress>mailto:marco.fargetta@ct.infn.it</EmailAddress>
-    <EmailAddress>mailto:credentials-admin@ct.infn.it</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Riccardo</GivenName>
-    <SurName>Rotondo</SurName>
-    <EmailAddress>mailto:riccardo.rotondo@ct.infn.it</EmailAddress>
-    <EmailAddress>mailto:credentials-admin@ct.infn.it</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="support">
-    <GivenName>Giuseppe</GivenName>
-    <SurName>Platania</SurName>
-    <EmailAddress>mailto:giuseppe.platania@ct.infn.it</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="support">
-    <GivenName>Carlo</GivenName>
-    <SurName>Rocca</SurName>
-    <EmailAddress>mailto:carlo.rocca@ct.infn.it</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="administrative">
-    <GivenName>Roberto</GivenName>
-    <SurName>Barbera</SurName>
-    <EmailAddress>mailto:roberto.barbera@ct.infn.it</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/indicate-gw.consorzio-cometa.it.xml b/swamid-interfederations-2.0/indicate-gw.consorzio-cometa.it.xml
deleted file mode 100644
index 618ed2f9..00000000
--- a/swamid-interfederations-2.0/indicate-gw.consorzio-cometa.it.xml
+++ /dev/null
@@ -1,124 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" entityID="https://indicate-gw.consorzio-cometa.it/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2011-09-05T15:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement
-                </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>
-        <mdui:DisplayName xml:lang="en">INDICATE e-Culture Science Gateway</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="it">INDICATE e-Culture Science Gateway</mdui:DisplayName>
-        <mdui:Description xml:lang="en">
-                        This service allows users to access the digital repositories created for the INDICATE
-                        project to demonstrate the usefulness of the adoption of e-Infrastructures for Digital
-                        Cultural Heritage. It is devoted to the INDICATE partners as well as to cultural institutions,
-                        e-Infrastructure providers and the general public.
-                    </mdui:Description>
-        <mdui:Description xml:lang="it">
-                        Questo servizio permette agli utenti di accedere gli archivi digitali creati per il progetto
-                        europeo INDICATE con l'obiettivo di dimostrare l'opportunità di adottare e-Infrastrutture per
-                        i patrimoni culturali digitali. Esso è indirizzato ai partner di INDICATE ed altre istituzioni
-                        culturali, i fornitori di e-Infrastrutture ed al pubblico.
-                    </mdui:Description>
-      </mdui:UIInfo>
-      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://indicate-gw.consorzio-cometa.it/Shibboleth.sso/DS"/>
-      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://indicate-gw.consorzio-cometa.it/Shibboleth.sso/DS" index="1"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIFhDCCBGygAwIBAgIRAOyXU1f6GS689kEaSDAhQPYwDQYJKoZIhvcNAQEFBQAw
-NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-IFNTTCBDQTAeFw0xNDA1MTkwMDAwMDBaFw0xNzA1MTgyMzU5NTlaMEAxITAfBgNV
-BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEbMBkGA1UEAxMSbGlmZXJheS5j
-dC5pbmZuLml0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApizyvtMI
-uoSnnz/fvk7lcXwoDUk11NVAlg5w4zh01YKNvy5SzBu0eRIzRos/ALs4CwmxrmCv
-3JQPA4xxItxVd8x9Q+YElQteEcX+mWXXW5LI5XE3xhPzkdFeQrhkinAK2JreSn6E
-TQk8YO1rOxW3qCpKeYZ2VQF3grAU/JRWbvLF+r2j4zE27n+RzBxnYeZ9rtJ/67gU
-7t1S39DRDTyKit7dJIYl50n9g3atWGALb56QoVnlR+RPRxVI9EFd2hEXfrxWXGdt
-F2v6YIMSAAM5l2/SlEmhQSSkmQ4zXcmPrzC6pte9NWoPOTsQnCnocwMJ16aXsnQy
-BxaoywMtq8NsdwIDAQABo4ICgTCCAn0wHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsr
-N1dH6pDjue0wHQYDVR0OBBYEFCy5dq76F94vaAuznAys6UmGxySTMA4GA1UdDwEB
-/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEF
-BQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNVHR8E
-MzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENB
-LmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNz
-LnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8v
-b2NzcC50Y3MudGVyZW5hLm9yZzCCAS0GA1UdEQSCASQwggEgghJsaWZlcmF5LmN0
-LmluZm4uaXSCGWFwcGxpY2F0aW9ucy5ldS1kZWNpZGUuZXWCGWFwcGxpY2F0aW9u
-cy5ldW1lZGdyaWQuZXWCEGdpbGRhLmN0LmluZm4uaXSCFGdpc2VsYS1ndy5jdC5p
-bmZuLml0gg1ndy5jdC5pbmZuLml0ghNnd2VhdGhlci5jdC5pbmZuLml0ghBnd2xp
-Yi5jdC5pbmZuLml0gh9pbmRpY2F0ZS1ndy5jb25zb3J6aW8tY29tZXRhLml0ghFy
-aWNldmkuY3QuaW5mbi5pdIIUdmlyYWxncmlkLmN0LmluZm4uaXSCFHd3dy5jaGFp
-bi1wcm9qZWN0LmV1ghZ3d3cuc3BlY2lhbC1wcm9qZWN0Lml0MA0GCSqGSIb3DQEB
-BQUAA4IBAQCEZIHNNQPD5WkGSlUhCN/BRSharmQ6dT0NiwjQNmRODCpVqBgwVZY0
-VUlAobHaF186QXeiNYge8ZYSpYY2VhBa4znL7IjFODE3FsaJNseKgsyNFqKR8xNO
-nsOCM//SN9N79hwH8yAxLhGyxbnInpOhE6rEkbhtowTjqhDq26cGGlH8JTTPuYvY
-JhgPGGkxo1286x1nuN4ELKvwZ7RF+YTH/WPOIBMNi+ee+vxrIhWbU6iy97f7k4PA
-2e35ZQ6gutnmX2v/ybFWh0ruO4zszYKiMo+zGyLvYmIpV/+Mjs26KbqqrBOS1jjN
-W3MiH8HMxzzYHExNCvzrAgN1TfB+SCiB
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://indicate-gw.consorzio-cometa.it/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://indicate-gw.consorzio-cometa.it/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://indicate-gw.consorzio-cometa.it/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://indicate-gw.consorzio-cometa.it/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://indicate-gw.consorzio-cometa.it/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://indicate-gw.consorzio-cometa.it/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://indicate-gw.consorzio-cometa.it/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://indicate-gw.consorzio-cometa.it/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://indicate-gw.consorzio-cometa.it/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://indicate-gw.consorzio-cometa.it/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://indicate-gw.consorzio-cometa.it/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <AttributeConsumingService index="1">
-      <ServiceName xml:lang="en">INDICATE e-Culture Science Gateway</ServiceName>
-      <ServiceDescription xml:lang="en">This service allows users to access the digital repositories created for the INDICATE
-                    project to demonstrate the usefulness of the adoption of e-Infrastructures for Digital
-                    Cultural Heritage. It is devoted to the INDICATE partners as well as to cultural institutions,
-                    e-Infrastructure providers and the general public.
-                </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"/>
-    </AttributeConsumingService>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">COMETA Consortium</OrganizationName>
-    <OrganizationName xml:lang="it">Consorzio COMETA (COnsorzio Multi Ente per la promozione e l'adozione di Tecnologie di calcolo Avanzato)</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">COMETA</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="it">COMETA</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.consorzio-cometa.it/</OrganizationURL>
-    <OrganizationURL xml:lang="it">http://www.consorzio-cometa.it/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Marco</GivenName>
-    <SurName>Fargetta</SurName>
-    <EmailAddress>mailto:marco.fargetta@ct.infn.it</EmailAddress>
-    <EmailAddress>mailto:credentials-admin@ct.infn.it</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Riccardo</GivenName>
-    <SurName>Rotondo</SurName>
-    <EmailAddress>mailto:riccardo.rotondo@ct.infn.it</EmailAddress>
-    <EmailAddress>mailto:credentials-admin@ct.infn.it</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="support">
-    <GivenName>Giuseppe</GivenName>
-    <SurName>Platania</SurName>
-    <EmailAddress>mailto:giuseppe.platania@ct.infn.it</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="support">
-    <GivenName>Carlo</GivenName>
-    <SurName>Rocca</SurName>
-    <EmailAddress>mailto:carlo.rocca@ct.infn.it</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="administrative">
-    <GivenName>Roberto</GivenName>
-    <SurName>Barbera</SurName>
-    <EmailAddress>mailto:roberto.barbera@ct.infn.it</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/instantanatomy.co.uk-shib.xml b/swamid-interfederations-2.0/instantanatomy.co.uk-shib.xml
deleted file mode 100644
index afb9bf35..00000000
--- a/swamid-interfederations-2.0/instantanatomy.co.uk-shib.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://instantanatomy.co.uk/shib">
-  <!--
-		This is a Shibboleth SP for Andrew Whitaker trading as Instant Anatomy.
-	-->
-  <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="2012-09-17T08:48:25Z">
-      <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>
-      <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://instantanatomy.co.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://instantanatomy.co.uk/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:Logo height="62" width="450">https://www.instantanatomy.co.uk/images/title.jpg</mdui:Logo>
-        <mdui:DisplayName xml:lang="en">Instant Anatomy</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDGDCCAgCgAwIBAgIJAOU2/77+QBVIMA0GCSqGSIb3DQEBBQUAMCYxJDAiBgNV
-						BAMTG2Rhcndpbi5pbnN0YW50YW5hdG9teS5jby51azAeFw0xMjA4MTcwMTQ5MzFa
-						Fw0yMjA4MTUwMTQ5MzFaMCYxJDAiBgNVBAMTG2Rhcndpbi5pbnN0YW50YW5hdG9t
-						eS5jby51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAL5l4CVTvTSr
-						wY4T+jbnjlcqK7uLjuUnblB1tp+UClVHk31XDiJGDC/G8uUmL275wVRKcvC5Uj5m
-						1+SK5wNJ+4DkDLFhpho7adK/UZLW6EMvpgUg5nSq5qeJErkDdmexwUgWMX9v4YYr
-						CDxN9qQ3Mf869ORLNUwwwMN+sPT6p8ppiYpdjR1lLkmFRNWPiWztxA2gbHWueC6H
-						NBDxEH3NitETaKo2KV0R2S/7yLa9f0yffK5M8n26WFoTE/OPKhiN/lyT+8ZRQe3E
-						O6MEPQudNhQuR0/7vvd1giIvQr9ARy4tpROL3VQ1VFLeVaoHQgPi8XDkRrUGoGnf
-						coCiPWctp30CAwEAAaNJMEcwJgYDVR0RBB8wHYIbZGFyd2luLmluc3RhbnRhbmF0
-						b215LmNvLnVrMB0GA1UdDgQWBBRCrm+NptHsROj8vWQkA1ifzUbsPzANBgkqhkiG
-						9w0BAQUFAAOCAQEAkKx3nfhfX4Am9Isc0yEXdtJznme1IxfFXHauCupdnZnZU2yd
-						sOqqZaeiEf1E3KU+PcL9m8/syQ9O8RfiTdkrXPwRsrGll6Rpg0s6QHYLpiWRkeu+
-						MXgBUGS7F+HdMah4vBYlB1xK2q5wlzKhFiXWqWuHqpHOlYVgRvVyJhqzwT9QVhgF
-						zvqMQdvEtFw0qF7qwDlxkzDp8qWfa7bNnehynDwVxB6jAdgXbSbu5sqBlTB0naJE
-						1L8iCT+oVfbn8m7vBIwAey/qzie5Av0Q2XHH0cAwff2AQUrlyTcPbkpfna8jnaaK
-						5mOU0vif+aQQFPvwVH2BegxgQF+M+0NVs02wMQ==
-					</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://instantanatomy.co.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://instantanatomy.co.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://instantanatomy.co.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://instantanatomy.co.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://instantanatomy.co.uk/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://instantanatomy.co.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://instantanatomy.co.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://instantanatomy.co.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://instantanatomy.co.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://instantanatomy.co.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://instantanatomy.co.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <AttributeConsumingService index="1">
-      <ServiceName xml:lang="en">Instant Anatomy</ServiceName>
-      <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"/>
-    </AttributeConsumingService>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Andrew Whitaker trading as Instant Anatomy</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Instant Anatomy</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">https://instantanatomy.co.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Andrew</GivenName>
-    <SurName>Whitaker</SurName>
-    <EmailAddress>mailto:info@instantanatomy.co.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Andrew</GivenName>
-    <SurName>Whitaker</SurName>
-    <EmailAddress>mailto:info@instantanatomy.co.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/instantanatomy.co.uk.xml b/swamid-interfederations-2.0/instantanatomy.co.uk.xml
deleted file mode 100644
index afb9bf35..00000000
--- a/swamid-interfederations-2.0/instantanatomy.co.uk.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://instantanatomy.co.uk/shib">
-  <!--
-		This is a Shibboleth SP for Andrew Whitaker trading as Instant Anatomy.
-	-->
-  <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="2012-09-17T08:48:25Z">
-      <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>
-      <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://instantanatomy.co.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://instantanatomy.co.uk/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:Logo height="62" width="450">https://www.instantanatomy.co.uk/images/title.jpg</mdui:Logo>
-        <mdui:DisplayName xml:lang="en">Instant Anatomy</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDGDCCAgCgAwIBAgIJAOU2/77+QBVIMA0GCSqGSIb3DQEBBQUAMCYxJDAiBgNV
-						BAMTG2Rhcndpbi5pbnN0YW50YW5hdG9teS5jby51azAeFw0xMjA4MTcwMTQ5MzFa
-						Fw0yMjA4MTUwMTQ5MzFaMCYxJDAiBgNVBAMTG2Rhcndpbi5pbnN0YW50YW5hdG9t
-						eS5jby51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAL5l4CVTvTSr
-						wY4T+jbnjlcqK7uLjuUnblB1tp+UClVHk31XDiJGDC/G8uUmL275wVRKcvC5Uj5m
-						1+SK5wNJ+4DkDLFhpho7adK/UZLW6EMvpgUg5nSq5qeJErkDdmexwUgWMX9v4YYr
-						CDxN9qQ3Mf869ORLNUwwwMN+sPT6p8ppiYpdjR1lLkmFRNWPiWztxA2gbHWueC6H
-						NBDxEH3NitETaKo2KV0R2S/7yLa9f0yffK5M8n26WFoTE/OPKhiN/lyT+8ZRQe3E
-						O6MEPQudNhQuR0/7vvd1giIvQr9ARy4tpROL3VQ1VFLeVaoHQgPi8XDkRrUGoGnf
-						coCiPWctp30CAwEAAaNJMEcwJgYDVR0RBB8wHYIbZGFyd2luLmluc3RhbnRhbmF0
-						b215LmNvLnVrMB0GA1UdDgQWBBRCrm+NptHsROj8vWQkA1ifzUbsPzANBgkqhkiG
-						9w0BAQUFAAOCAQEAkKx3nfhfX4Am9Isc0yEXdtJznme1IxfFXHauCupdnZnZU2yd
-						sOqqZaeiEf1E3KU+PcL9m8/syQ9O8RfiTdkrXPwRsrGll6Rpg0s6QHYLpiWRkeu+
-						MXgBUGS7F+HdMah4vBYlB1xK2q5wlzKhFiXWqWuHqpHOlYVgRvVyJhqzwT9QVhgF
-						zvqMQdvEtFw0qF7qwDlxkzDp8qWfa7bNnehynDwVxB6jAdgXbSbu5sqBlTB0naJE
-						1L8iCT+oVfbn8m7vBIwAey/qzie5Av0Q2XHH0cAwff2AQUrlyTcPbkpfna8jnaaK
-						5mOU0vif+aQQFPvwVH2BegxgQF+M+0NVs02wMQ==
-					</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://instantanatomy.co.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://instantanatomy.co.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://instantanatomy.co.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://instantanatomy.co.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://instantanatomy.co.uk/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://instantanatomy.co.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://instantanatomy.co.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://instantanatomy.co.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://instantanatomy.co.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://instantanatomy.co.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://instantanatomy.co.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <AttributeConsumingService index="1">
-      <ServiceName xml:lang="en">Instant Anatomy</ServiceName>
-      <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"/>
-    </AttributeConsumingService>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Andrew Whitaker trading as Instant Anatomy</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Instant Anatomy</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">https://instantanatomy.co.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Andrew</GivenName>
-    <SurName>Whitaker</SurName>
-    <EmailAddress>mailto:info@instantanatomy.co.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Andrew</GivenName>
-    <SurName>Whitaker</SurName>
-    <EmailAddress>mailto:info@instantanatomy.co.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/ir-lan-fid.images-et-reseaux.com-idp-shibboleth.xml b/swamid-interfederations-2.0/ir-lan-fid.images-et-reseaux.com-idp-shibboleth.xml
deleted file mode 100644
index f43ec643..00000000
--- a/swamid-interfederations-2.0/ir-lan-fid.images-et-reseaux.com-idp-shibboleth.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://ir-lan-fid.images-et-reseaux.com/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2014-10-16T11:30:38Z">
-      <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">images-et-reseaux.com</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Images et Réseaux - Pôle de compétitivité</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Permanents du pôle Images et Réseaux</mdui:Description>
-        <mdui:DisplayName xml:lang="fr">Images et Réseaux - Pôle de compétitivité</mdui:DisplayName>
-        <mdui:Description xml:lang="fr">Permanents du pôle Images et Réseaux</mdui:Description>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDdTCCAl2gAwIBAgIUfVeQwiqB95BAl22ynEYVWqJBclowDQYJKoZIhvcNAQEF
-BQAwLTErMCkGA1UEAwwiaXItbGFuLWZpZDAxLmltYWdlcy1ldC1yZXNlYXV4LmNv
-bTAeFw0xNDEwMTQxNDU4MzFaFw0xNzEwMTQxNDU4MzFaMC0xKzApBgNVBAMMImly
-LWxhbi1maWQwMS5pbWFnZXMtZXQtcmVzZWF1eC5jb20wggEiMA0GCSqGSIb3DQEB
-AQUAA4IBDwAwggEKAoIBAQCEtN1a3z7IoDPq2fx+81W+8BVvtZ3skA7iyZjCpNC9
-maYCL9gPo8qOQoXKE3z8vtxZwmV0ynmZBVtPjHwtQqdBCpcViEmT+aXhg9+KaRlQ
-1c8FriEX/A7JtWfwwHRgAvMLujFbi0qIQa+sMZ7ggFDwiqZojQwOgFgKBUTAgN/M
-A+ynQZUo9z1uSxdCiXJpY2010TLJf8WSv1MZGhQP2KLUNKXCY3MNfCMC42OEALJb
-mpRUPiI1weJk7QX6hefMOHwc61bXT9PT62R2LNipzA9f2UBYBQhXXOvtnKcg03/w
-90uQIg+kP6doqffDrlmQsB/AeDbnGbpAM3xumEcdxvOdAgMBAAGjgYwwgYkwHQYD
-VR0OBBYEFNhsNcOXWxlijZxR+nrdBdsaPfw0MGgGA1UdEQRhMF+CImlyLWxhbi1m
-aWQwMS5pbWFnZXMtZXQtcmVzZWF1eC5jb22GOWh0dHBzOi8vaXItbGFuLWZpZDAx
-LmltYWdlcy1ldC1yZXNlYXV4LmNvbS9pZHAvc2hpYmJvbGV0aDANBgkqhkiG9w0B
-AQUFAAOCAQEACZDPw9UgXcEPiwrXkB+//NbYYpuvj1SW8rS9kV6NhmtToFAfhbn4
-IjhsjSJ9eHC5E6pBthKPif9strOG1GitiSfHHwu9gRCDxLkj53oZhBOXmUDOV7oV
-aaI0SbgfGoUbSZ44WuJdafHEybFlCucWd789zpZGrnLhd+J7G1RWZe+fV4Gn+amf
-C2PYZIo9GQlKMb3kQ3nwsvo9yHGJAoFOVO2idUpEwnRik7OldKPz8JC0tqgcU7ek
-dxih2c1aTtAR8ppMcajXPEpBCfYPLCM/OqiMVe8uYgPXqIt7LmKibPQKYEof2FfJ
-J50vJWk7ByIh8CfHI1165+hJArgbrRdkvw==
-					    </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://ir-lan-fid.images-et-reseaux.com/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ir-lan-fid.images-et-reseaux.com/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://ir-lan-fid.images-et-reseaux.com/idp/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Images et Réseaux - Pôle de compétitivité</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Images et Réseaux - Pôle de compétitivité</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.images-et-reseaux.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Sergio MORANT</SurName>
-    <EmailAddress>smorant@images-et-reseaux.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/ir-lan-fid.images-et-reseaux.com.xml b/swamid-interfederations-2.0/ir-lan-fid.images-et-reseaux.com.xml
deleted file mode 100644
index f43ec643..00000000
--- a/swamid-interfederations-2.0/ir-lan-fid.images-et-reseaux.com.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://ir-lan-fid.images-et-reseaux.com/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2014-10-16T11:30:38Z">
-      <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">images-et-reseaux.com</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Images et Réseaux - Pôle de compétitivité</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Permanents du pôle Images et Réseaux</mdui:Description>
-        <mdui:DisplayName xml:lang="fr">Images et Réseaux - Pôle de compétitivité</mdui:DisplayName>
-        <mdui:Description xml:lang="fr">Permanents du pôle Images et Réseaux</mdui:Description>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDdTCCAl2gAwIBAgIUfVeQwiqB95BAl22ynEYVWqJBclowDQYJKoZIhvcNAQEF
-BQAwLTErMCkGA1UEAwwiaXItbGFuLWZpZDAxLmltYWdlcy1ldC1yZXNlYXV4LmNv
-bTAeFw0xNDEwMTQxNDU4MzFaFw0xNzEwMTQxNDU4MzFaMC0xKzApBgNVBAMMImly
-LWxhbi1maWQwMS5pbWFnZXMtZXQtcmVzZWF1eC5jb20wggEiMA0GCSqGSIb3DQEB
-AQUAA4IBDwAwggEKAoIBAQCEtN1a3z7IoDPq2fx+81W+8BVvtZ3skA7iyZjCpNC9
-maYCL9gPo8qOQoXKE3z8vtxZwmV0ynmZBVtPjHwtQqdBCpcViEmT+aXhg9+KaRlQ
-1c8FriEX/A7JtWfwwHRgAvMLujFbi0qIQa+sMZ7ggFDwiqZojQwOgFgKBUTAgN/M
-A+ynQZUo9z1uSxdCiXJpY2010TLJf8WSv1MZGhQP2KLUNKXCY3MNfCMC42OEALJb
-mpRUPiI1weJk7QX6hefMOHwc61bXT9PT62R2LNipzA9f2UBYBQhXXOvtnKcg03/w
-90uQIg+kP6doqffDrlmQsB/AeDbnGbpAM3xumEcdxvOdAgMBAAGjgYwwgYkwHQYD
-VR0OBBYEFNhsNcOXWxlijZxR+nrdBdsaPfw0MGgGA1UdEQRhMF+CImlyLWxhbi1m
-aWQwMS5pbWFnZXMtZXQtcmVzZWF1eC5jb22GOWh0dHBzOi8vaXItbGFuLWZpZDAx
-LmltYWdlcy1ldC1yZXNlYXV4LmNvbS9pZHAvc2hpYmJvbGV0aDANBgkqhkiG9w0B
-AQUFAAOCAQEACZDPw9UgXcEPiwrXkB+//NbYYpuvj1SW8rS9kV6NhmtToFAfhbn4
-IjhsjSJ9eHC5E6pBthKPif9strOG1GitiSfHHwu9gRCDxLkj53oZhBOXmUDOV7oV
-aaI0SbgfGoUbSZ44WuJdafHEybFlCucWd789zpZGrnLhd+J7G1RWZe+fV4Gn+amf
-C2PYZIo9GQlKMb3kQ3nwsvo9yHGJAoFOVO2idUpEwnRik7OldKPz8JC0tqgcU7ek
-dxih2c1aTtAR8ppMcajXPEpBCfYPLCM/OqiMVe8uYgPXqIt7LmKibPQKYEof2FfJ
-J50vJWk7ByIh8CfHI1165+hJArgbrRdkvw==
-					    </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://ir-lan-fid.images-et-reseaux.com/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ir-lan-fid.images-et-reseaux.com/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://ir-lan-fid.images-et-reseaux.com/idp/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Images et Réseaux - Pôle de compétitivité</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Images et Réseaux - Pôle de compétitivité</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.images-et-reseaux.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Sergio MORANT</SurName>
-    <EmailAddress>smorant@images-et-reseaux.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/issues.shibboleth.net-shibboleth.xml b/swamid-interfederations-2.0/issues.shibboleth.net-shibboleth.xml
deleted file mode 100644
index da4b6342..00000000
--- a/swamid-interfederations-2.0/issues.shibboleth.net-shibboleth.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://issues.shibboleth.net/shibboleth">
-  <!--
-		This is a Shibboleth Federated Issue Tracking Shibboleth SP for JISC Collections and Janet 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="2011-01-06T16:23:40Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</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>
-      <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://issues.shibboleth.net/jira/Shibboleth.sso/EDS"/>
-      <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://issues.shibboleth.net/jira/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://issues.shibboleth.net/jira/Shibboleth.sso/EDS" 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://issues.shibboleth.net/jira/Shibboleth.sso/Login" index="2"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Shibboleth.net Issue Tracking</mdui:DisplayName>
-        <mdui:Description xml:lang="en">
-					The issue (improvements, bugs, tasks) tracking system used by the Shibboleth project.
-					Unauthenticated users may view submitted issues.  Authenticated users may submit new
-					issues and comment on existing ones.
-				</mdui:Description>
-        <mdui:Logo height="82" width="64">https://shibboleth.net/images/gryphon_64x82.png</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDRjCCAi6gAwIBAgIJAPjZ6g1hwfvPMA0GCSqGSIb3DQEBBQUAMFExEzARBgoJ
-						kiaJk/IsZAEZFgNuZXQxGjAYBgoJkiaJk/IsZAEZFgpzaGliYm9sZXRoMR4wHAYD
-						VQQDExVpc3N1ZXMuc2hpYmJvbGV0aC5uZXQwHhcNMTMxMTI1MTQ1ODA4WhcNMzcw
-						MzA0MTQ1ODA4WjBRMRMwEQYKCZImiZPyLGQBGRYDbmV0MRowGAYKCZImiZPyLGQB
-						GRYKc2hpYmJvbGV0aDEeMBwGA1UEAxMVaXNzdWVzLnNoaWJib2xldGgubmV0MIIB
-						IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtb4jIloWGvHJsSeq0PMjkWDA
-						+hseZ6/6/cEJKPk245f6hktC2k3z0AqJL8Kw9OudOjDx2op2jKm45TuIA46ti6VP
-						f4stLIi7mO1B4A6jTWThCwU0DjMCwBXLhANdBQloyUYJU/usN8RBXlPnWZAV1dVb
-						ygb7GUorkMON+wnFd7nhBePmQdJfbsqvKN8MykWfQ56chS+0lCYhyT7qql2bskJ4
-						y621WSo47php2NyyU1KNcaFBLoao+UTH7KZ9qHOWJyGJGuWKwgZmCiVd0LQhWywP
-						3M/JxZvpTr2Bs/J5d8BzZGSFUaHrVcPzIX+5c3sdK4d1wXUur1XE++bh9F9TjwID
-						AQABoyEwHzAdBgNVHQ4EFgQUHtV8GWr64AIUV634b9YBlMEpHOwwDQYJKoZIhvcN
-						AQEFBQADggEBAI0BSqXoyw5bUVQJKNCnxB3hUwHIOXeoS77jqgv2lesyTqz5U4NV
-						v4Cdz7icwYzt+c6ZSZqem4pqmi3/6COZnf/+l29J/XwWkva32P6tfoO4af3qywF+
-						TvuZiRMXdt1KE7GTlYOSxOsnxaRmXVc6MWfxPT6oTOt5z15aTdfEzK+wVfeUkIf1
-						1soEmMHgjDaa/HQdGgXGq/fStDc0Mcm2W7y50+aNwqIMNiQQiwQYSUgpBatSfKy1
-						umh6DHEyznDZAAHBtatzvQu1YAJHUg6AeimuhminaM5tyBCW6Y6YMywFYSP+VqPU
-						PxCBrPWcCAwOw80Ey/FLVlAdW1FuwUmMejA=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://issues.shibboleth.net/jira/Shibboleth.sso/Artifact/SOAP" index="0"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://issues.shibboleth.net/jira/Shibboleth.sso/SLO/Artifact"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://issues.shibboleth.net/jira/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://issues.shibboleth.net/jira/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://issues.shibboleth.net/jira/Shibboleth.sso/SLO/SOAP"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://issues.shibboleth.net/jira/Shibboleth.sso/SAML/Artifact" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://issues.shibboleth.net/jira/Shibboleth.sso/SAML/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://issues.shibboleth.net/jira/Shibboleth.sso/SAML2/Artifact" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://issues.shibboleth.net/jira/Shibboleth.sso/SAML2/ECP" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://issues.shibboleth.net/jira/Shibboleth.sso/SAML2/POST" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://issues.shibboleth.net/jira/Shibboleth.sso/SAML2/POST-SimpleSign" index="5"/>
-    <AttributeConsumingService index="1">
-      <ServiceName xml:lang="en">Shibboleth.net Issue Tracking</ServiceName>
-      <ServiceDescription xml:lang="en">
-				The issue (improvements, bugs, tasks) tracking system used by the Shibboleth project.
-				Unauthenticated users may view submitted issues.  Authenticated users may submit new
-				issues and comment on existing ones.
-			</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"/>
-      <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="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" 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="cn" Name="urn:oid:2.5.4.3" 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="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="mail" Name="urn:mace:dir:attribute-def:mail" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-      <RequestedAttribute FriendlyName="displayName" Name="urn:mace:dir:attribute-def:displayName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-      <RequestedAttribute FriendlyName="cn" Name="urn:mace:dir:attribute-def:cn" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-    </AttributeConsumingService>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">JISC Collections and Janet Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Shibboleth Federated Issue Tracking</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.shibboleth.net/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Shibboleth.Net Technical Support</GivenName>
-    <EmailAddress>mailto:contact@shibboleth.net</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Scott</GivenName>
-    <SurName>Cantor</SurName>
-    <EmailAddress>mailto:cantor.2@osu.edu</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/issues.shibboleth.net.xml b/swamid-interfederations-2.0/issues.shibboleth.net.xml
deleted file mode 100644
index da4b6342..00000000
--- a/swamid-interfederations-2.0/issues.shibboleth.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://issues.shibboleth.net/shibboleth">
-  <!--
-		This is a Shibboleth Federated Issue Tracking Shibboleth SP for JISC Collections and Janet 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="2011-01-06T16:23:40Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</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>
-      <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://issues.shibboleth.net/jira/Shibboleth.sso/EDS"/>
-      <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://issues.shibboleth.net/jira/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://issues.shibboleth.net/jira/Shibboleth.sso/EDS" 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://issues.shibboleth.net/jira/Shibboleth.sso/Login" index="2"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Shibboleth.net Issue Tracking</mdui:DisplayName>
-        <mdui:Description xml:lang="en">
-					The issue (improvements, bugs, tasks) tracking system used by the Shibboleth project.
-					Unauthenticated users may view submitted issues.  Authenticated users may submit new
-					issues and comment on existing ones.
-				</mdui:Description>
-        <mdui:Logo height="82" width="64">https://shibboleth.net/images/gryphon_64x82.png</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDRjCCAi6gAwIBAgIJAPjZ6g1hwfvPMA0GCSqGSIb3DQEBBQUAMFExEzARBgoJ
-						kiaJk/IsZAEZFgNuZXQxGjAYBgoJkiaJk/IsZAEZFgpzaGliYm9sZXRoMR4wHAYD
-						VQQDExVpc3N1ZXMuc2hpYmJvbGV0aC5uZXQwHhcNMTMxMTI1MTQ1ODA4WhcNMzcw
-						MzA0MTQ1ODA4WjBRMRMwEQYKCZImiZPyLGQBGRYDbmV0MRowGAYKCZImiZPyLGQB
-						GRYKc2hpYmJvbGV0aDEeMBwGA1UEAxMVaXNzdWVzLnNoaWJib2xldGgubmV0MIIB
-						IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtb4jIloWGvHJsSeq0PMjkWDA
-						+hseZ6/6/cEJKPk245f6hktC2k3z0AqJL8Kw9OudOjDx2op2jKm45TuIA46ti6VP
-						f4stLIi7mO1B4A6jTWThCwU0DjMCwBXLhANdBQloyUYJU/usN8RBXlPnWZAV1dVb
-						ygb7GUorkMON+wnFd7nhBePmQdJfbsqvKN8MykWfQ56chS+0lCYhyT7qql2bskJ4
-						y621WSo47php2NyyU1KNcaFBLoao+UTH7KZ9qHOWJyGJGuWKwgZmCiVd0LQhWywP
-						3M/JxZvpTr2Bs/J5d8BzZGSFUaHrVcPzIX+5c3sdK4d1wXUur1XE++bh9F9TjwID
-						AQABoyEwHzAdBgNVHQ4EFgQUHtV8GWr64AIUV634b9YBlMEpHOwwDQYJKoZIhvcN
-						AQEFBQADggEBAI0BSqXoyw5bUVQJKNCnxB3hUwHIOXeoS77jqgv2lesyTqz5U4NV
-						v4Cdz7icwYzt+c6ZSZqem4pqmi3/6COZnf/+l29J/XwWkva32P6tfoO4af3qywF+
-						TvuZiRMXdt1KE7GTlYOSxOsnxaRmXVc6MWfxPT6oTOt5z15aTdfEzK+wVfeUkIf1
-						1soEmMHgjDaa/HQdGgXGq/fStDc0Mcm2W7y50+aNwqIMNiQQiwQYSUgpBatSfKy1
-						umh6DHEyznDZAAHBtatzvQu1YAJHUg6AeimuhminaM5tyBCW6Y6YMywFYSP+VqPU
-						PxCBrPWcCAwOw80Ey/FLVlAdW1FuwUmMejA=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://issues.shibboleth.net/jira/Shibboleth.sso/Artifact/SOAP" index="0"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://issues.shibboleth.net/jira/Shibboleth.sso/SLO/Artifact"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://issues.shibboleth.net/jira/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://issues.shibboleth.net/jira/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://issues.shibboleth.net/jira/Shibboleth.sso/SLO/SOAP"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://issues.shibboleth.net/jira/Shibboleth.sso/SAML/Artifact" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://issues.shibboleth.net/jira/Shibboleth.sso/SAML/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://issues.shibboleth.net/jira/Shibboleth.sso/SAML2/Artifact" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://issues.shibboleth.net/jira/Shibboleth.sso/SAML2/ECP" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://issues.shibboleth.net/jira/Shibboleth.sso/SAML2/POST" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://issues.shibboleth.net/jira/Shibboleth.sso/SAML2/POST-SimpleSign" index="5"/>
-    <AttributeConsumingService index="1">
-      <ServiceName xml:lang="en">Shibboleth.net Issue Tracking</ServiceName>
-      <ServiceDescription xml:lang="en">
-				The issue (improvements, bugs, tasks) tracking system used by the Shibboleth project.
-				Unauthenticated users may view submitted issues.  Authenticated users may submit new
-				issues and comment on existing ones.
-			</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"/>
-      <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="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" 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="cn" Name="urn:oid:2.5.4.3" 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="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="mail" Name="urn:mace:dir:attribute-def:mail" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-      <RequestedAttribute FriendlyName="displayName" Name="urn:mace:dir:attribute-def:displayName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-      <RequestedAttribute FriendlyName="cn" Name="urn:mace:dir:attribute-def:cn" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-    </AttributeConsumingService>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">JISC Collections and Janet Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Shibboleth Federated Issue Tracking</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.shibboleth.net/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Shibboleth.Net Technical Support</GivenName>
-    <EmailAddress>mailto:contact@shibboleth.net</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Scott</GivenName>
-    <SurName>Cantor</SurName>
-    <EmailAddress>mailto:cantor.2@osu.edu</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/itacare.bahiana.edu.br-idp-shibboleth.xml b/swamid-interfederations-2.0/itacare.bahiana.edu.br-idp-shibboleth.xml
deleted file mode 100644
index f9e7a508..00000000
--- a/swamid-interfederations-2.0/itacare.bahiana.edu.br-idp-shibboleth.xml
+++ /dev/null
@@ -1,118 +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://itacare.bahiana.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">edu.br</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">EBMSP - Escola Bahiana de Medicina e Saude Publica</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="pt-br">EBMSP - Escola Bahiana de Medicina e Saude Publica</mdui:DisplayName>
-        <mdui:Description xml:lang="en">EBMSP - Escola Bahiana de Medicina e Saude Publica</mdui:Description>
-        <mdui:Description xml:lang="pt-br">EBMSP - Escola Bahiana de Medicina e Saude Publica</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.bahiana.edu.br/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="pt-br">http://www.bahiana.edu.br/</mdui:InformationURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-    MIIEZDCCA0wCAQAwDQYJKoZIhvcNAQEFBQAwgfcxPTA7BgNVBAoUNEVCTVNQIC0g
-RXNjb2xhIEJhaGlhbmEgZGUgTWVkaWNpbmEgZSBTYcO6ZGUgUMO6YmxpY2ExNDAy
-BgNVBAsUK05USSAtIE7DumNsZW8gZGUgVGVjbm9sb2dpYSBkYSBJbmZvcm1hw6fD
-o28xLzAtBgkqhkiG9w0BCQEWIG50aS1jbGF1ZGlvc2FudG9zQGJhaGlhbmEuZWR1
-LmJyMREwDwYDVQQHEwhTYWx2YWRvcjEOMAwGA1UECBMFQmFoaWExCzAJBgNVBAYT
-AkJSMR8wHQYDVQQDExZpdGFjYXJlLmJhaGlhbmEuZWR1LmJyMB4XDTE0MDQyOTIz
-NDgwMloXDTE5MDQyODIzNDgwMlowgfcxPTA7BgNVBAoUNEVCTVNQIC0gRXNjb2xh
-IEJhaGlhbmEgZGUgTWVkaWNpbmEgZSBTYcO6ZGUgUMO6YmxpY2ExNDAyBgNVBAsU
-K05USSAtIE7DumNsZW8gZGUgVGVjbm9sb2dpYSBkYSBJbmZvcm1hw6fDo28xLzAt
-BgkqhkiG9w0BCQEWIG50aS1jbGF1ZGlvc2FudG9zQGJhaGlhbmEuZWR1LmJyMREw
-DwYDVQQHEwhTYWx2YWRvcjEOMAwGA1UECBMFQmFoaWExCzAJBgNVBAYTAkJSMR8w
-HQYDVQQDExZpdGFjYXJlLmJhaGlhbmEuZWR1LmJyMIIBIjANBgkqhkiG9w0BAQEF
-AAOCAQ8AMIIBCgKCAQEArfqLewyUzBJPl5bZ5wEkkGRTPti74wbKnaAPLgzhLtPD
-tqICjgEVituk3ZSaEi3S9z6XUKLS32zOv0+U2aD1+IefqGrEOEyBbEPQJ7+gr4Zi
-Z13qHrjNWJ5a9b7UVNTD+6r0HWD1SPzW+lWzEaQzsV4WyBUo2l5b7Ik2hPWGn+UR
-STLduCX3Pb9UOTmwGikTN+uhKiyvhYMVkVVI1AV8byR0kXjbpzaOss0MgldLCqZL
-8NA/yF4XULGoUKb4DnH7i2ljgC3inay2oOdwRF1UYhI+lYaWq0bgxu+aDPRbQePZ
-/qOEl6Fg/p6I9mCN5boSalR1c2paAWXjQFIb1yzooQIDAQABMA0GCSqGSIb3DQEB
-BQUAA4IBAQCgIsNDggjacZw0Q/ngHibIkh9B1GzvRXR74eG42/Lsdfyr9VEe+foh
-E8YVGgT0PDJF/TU8a9IK/j5HLMUnwCEiEEA5yt5RjC3QmIlKVkBD19/2EwJ0m9y+
-4xPQ977AsGpdh1IgtwgFGDKe0ZuVMyOJkWBx0VDdROP14215yTMhTgho9BnfAWcL
-dB9LD1cUTQOHl3pALNiJEUoalHigtqsPtZx1ld1qskHvvv/6WhObJBh0DbSXJtak
-qz1SUhwFk05GOst5iQ3sVVkZdS78DpDCuNPGEdj9YDPZVsdd9CepbgkWV29AX/yB
-o4OFX+ZHPirEOF/8flK2xmI8xJ7blH+6
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://itacare.bahiana.edu.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://itacare.bahiana.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://itacare.bahiana.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://itacare.bahiana.edu.br/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://itacare.bahiana.edu.br/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://itacare.bahiana.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>
-      
-MIIEZDCCA0wCAQAwDQYJKoZIhvcNAQEFBQAwgfcxPTA7BgNVBAoUNEVCTVNQIC0g
-RXNjb2xhIEJhaGlhbmEgZGUgTWVkaWNpbmEgZSBTYcO6ZGUgUMO6YmxpY2ExNDAy
-BgNVBAsUK05USSAtIE7DumNsZW8gZGUgVGVjbm9sb2dpYSBkYSBJbmZvcm1hw6fD
-o28xLzAtBgkqhkiG9w0BCQEWIG50aS1jbGF1ZGlvc2FudG9zQGJhaGlhbmEuZWR1
-LmJyMREwDwYDVQQHEwhTYWx2YWRvcjEOMAwGA1UECBMFQmFoaWExCzAJBgNVBAYT
-AkJSMR8wHQYDVQQDExZpdGFjYXJlLmJhaGlhbmEuZWR1LmJyMB4XDTE0MDQyOTIz
-NDgwMloXDTE5MDQyODIzNDgwMlowgfcxPTA7BgNVBAoUNEVCTVNQIC0gRXNjb2xh
-IEJhaGlhbmEgZGUgTWVkaWNpbmEgZSBTYcO6ZGUgUMO6YmxpY2ExNDAyBgNVBAsU
-K05USSAtIE7DumNsZW8gZGUgVGVjbm9sb2dpYSBkYSBJbmZvcm1hw6fDo28xLzAt
-BgkqhkiG9w0BCQEWIG50aS1jbGF1ZGlvc2FudG9zQGJhaGlhbmEuZWR1LmJyMREw
-DwYDVQQHEwhTYWx2YWRvcjEOMAwGA1UECBMFQmFoaWExCzAJBgNVBAYTAkJSMR8w
-HQYDVQQDExZpdGFjYXJlLmJhaGlhbmEuZWR1LmJyMIIBIjANBgkqhkiG9w0BAQEF
-AAOCAQ8AMIIBCgKCAQEArfqLewyUzBJPl5bZ5wEkkGRTPti74wbKnaAPLgzhLtPD
-tqICjgEVituk3ZSaEi3S9z6XUKLS32zOv0+U2aD1+IefqGrEOEyBbEPQJ7+gr4Zi
-Z13qHrjNWJ5a9b7UVNTD+6r0HWD1SPzW+lWzEaQzsV4WyBUo2l5b7Ik2hPWGn+UR
-STLduCX3Pb9UOTmwGikTN+uhKiyvhYMVkVVI1AV8byR0kXjbpzaOss0MgldLCqZL
-8NA/yF4XULGoUKb4DnH7i2ljgC3inay2oOdwRF1UYhI+lYaWq0bgxu+aDPRbQePZ
-/qOEl6Fg/p6I9mCN5boSalR1c2paAWXjQFIb1yzooQIDAQABMA0GCSqGSIb3DQEB
-BQUAA4IBAQCgIsNDggjacZw0Q/ngHibIkh9B1GzvRXR74eG42/Lsdfyr9VEe+foh
-E8YVGgT0PDJF/TU8a9IK/j5HLMUnwCEiEEA5yt5RjC3QmIlKVkBD19/2EwJ0m9y+
-4xPQ977AsGpdh1IgtwgFGDKe0ZuVMyOJkWBx0VDdROP14215yTMhTgho9BnfAWcL
-dB9LD1cUTQOHl3pALNiJEUoalHigtqsPtZx1ld1qskHvvv/6WhObJBh0DbSXJtak
-qz1SUhwFk05GOst5iQ3sVVkZdS78DpDCuNPGEdj9YDPZVsdd9CepbgkWV29AX/yB
-o4OFX+ZHPirEOF/8flK2xmI8xJ7blH+6
-                    
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://itacare.bahiana.edu.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://itacare.bahiana.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">EBMSP - Escola Bahiana de Medicina e Saude Publica</OrganizationName>
-    <OrganizationName xml:lang="pt-br">EBMSP - Escola Bahiana de Medicina e Saude Publica</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">EBMSP - Escola Bahiana de Medicina e Saude Publica</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="pt-br">EBMSP - Escola Bahiana de Medicina e Saude Publica</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.bahiana.edu.br/</OrganizationURL>
-    <OrganizationURL xml:lang="pt-br">http://www.bahiana.edu.br/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Claudio Santos</SurName>
-    <EmailAddress>nti-claudiosantos@bahiana.edu.br</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/itacare.bahiana.edu.br.xml b/swamid-interfederations-2.0/itacare.bahiana.edu.br.xml
deleted file mode 100644
index f9e7a508..00000000
--- a/swamid-interfederations-2.0/itacare.bahiana.edu.br.xml
+++ /dev/null
@@ -1,118 +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://itacare.bahiana.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">edu.br</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">EBMSP - Escola Bahiana de Medicina e Saude Publica</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="pt-br">EBMSP - Escola Bahiana de Medicina e Saude Publica</mdui:DisplayName>
-        <mdui:Description xml:lang="en">EBMSP - Escola Bahiana de Medicina e Saude Publica</mdui:Description>
-        <mdui:Description xml:lang="pt-br">EBMSP - Escola Bahiana de Medicina e Saude Publica</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.bahiana.edu.br/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="pt-br">http://www.bahiana.edu.br/</mdui:InformationURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-    MIIEZDCCA0wCAQAwDQYJKoZIhvcNAQEFBQAwgfcxPTA7BgNVBAoUNEVCTVNQIC0g
-RXNjb2xhIEJhaGlhbmEgZGUgTWVkaWNpbmEgZSBTYcO6ZGUgUMO6YmxpY2ExNDAy
-BgNVBAsUK05USSAtIE7DumNsZW8gZGUgVGVjbm9sb2dpYSBkYSBJbmZvcm1hw6fD
-o28xLzAtBgkqhkiG9w0BCQEWIG50aS1jbGF1ZGlvc2FudG9zQGJhaGlhbmEuZWR1
-LmJyMREwDwYDVQQHEwhTYWx2YWRvcjEOMAwGA1UECBMFQmFoaWExCzAJBgNVBAYT
-AkJSMR8wHQYDVQQDExZpdGFjYXJlLmJhaGlhbmEuZWR1LmJyMB4XDTE0MDQyOTIz
-NDgwMloXDTE5MDQyODIzNDgwMlowgfcxPTA7BgNVBAoUNEVCTVNQIC0gRXNjb2xh
-IEJhaGlhbmEgZGUgTWVkaWNpbmEgZSBTYcO6ZGUgUMO6YmxpY2ExNDAyBgNVBAsU
-K05USSAtIE7DumNsZW8gZGUgVGVjbm9sb2dpYSBkYSBJbmZvcm1hw6fDo28xLzAt
-BgkqhkiG9w0BCQEWIG50aS1jbGF1ZGlvc2FudG9zQGJhaGlhbmEuZWR1LmJyMREw
-DwYDVQQHEwhTYWx2YWRvcjEOMAwGA1UECBMFQmFoaWExCzAJBgNVBAYTAkJSMR8w
-HQYDVQQDExZpdGFjYXJlLmJhaGlhbmEuZWR1LmJyMIIBIjANBgkqhkiG9w0BAQEF
-AAOCAQ8AMIIBCgKCAQEArfqLewyUzBJPl5bZ5wEkkGRTPti74wbKnaAPLgzhLtPD
-tqICjgEVituk3ZSaEi3S9z6XUKLS32zOv0+U2aD1+IefqGrEOEyBbEPQJ7+gr4Zi
-Z13qHrjNWJ5a9b7UVNTD+6r0HWD1SPzW+lWzEaQzsV4WyBUo2l5b7Ik2hPWGn+UR
-STLduCX3Pb9UOTmwGikTN+uhKiyvhYMVkVVI1AV8byR0kXjbpzaOss0MgldLCqZL
-8NA/yF4XULGoUKb4DnH7i2ljgC3inay2oOdwRF1UYhI+lYaWq0bgxu+aDPRbQePZ
-/qOEl6Fg/p6I9mCN5boSalR1c2paAWXjQFIb1yzooQIDAQABMA0GCSqGSIb3DQEB
-BQUAA4IBAQCgIsNDggjacZw0Q/ngHibIkh9B1GzvRXR74eG42/Lsdfyr9VEe+foh
-E8YVGgT0PDJF/TU8a9IK/j5HLMUnwCEiEEA5yt5RjC3QmIlKVkBD19/2EwJ0m9y+
-4xPQ977AsGpdh1IgtwgFGDKe0ZuVMyOJkWBx0VDdROP14215yTMhTgho9BnfAWcL
-dB9LD1cUTQOHl3pALNiJEUoalHigtqsPtZx1ld1qskHvvv/6WhObJBh0DbSXJtak
-qz1SUhwFk05GOst5iQ3sVVkZdS78DpDCuNPGEdj9YDPZVsdd9CepbgkWV29AX/yB
-o4OFX+ZHPirEOF/8flK2xmI8xJ7blH+6
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://itacare.bahiana.edu.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://itacare.bahiana.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://itacare.bahiana.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://itacare.bahiana.edu.br/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://itacare.bahiana.edu.br/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://itacare.bahiana.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>
-      
-MIIEZDCCA0wCAQAwDQYJKoZIhvcNAQEFBQAwgfcxPTA7BgNVBAoUNEVCTVNQIC0g
-RXNjb2xhIEJhaGlhbmEgZGUgTWVkaWNpbmEgZSBTYcO6ZGUgUMO6YmxpY2ExNDAy
-BgNVBAsUK05USSAtIE7DumNsZW8gZGUgVGVjbm9sb2dpYSBkYSBJbmZvcm1hw6fD
-o28xLzAtBgkqhkiG9w0BCQEWIG50aS1jbGF1ZGlvc2FudG9zQGJhaGlhbmEuZWR1
-LmJyMREwDwYDVQQHEwhTYWx2YWRvcjEOMAwGA1UECBMFQmFoaWExCzAJBgNVBAYT
-AkJSMR8wHQYDVQQDExZpdGFjYXJlLmJhaGlhbmEuZWR1LmJyMB4XDTE0MDQyOTIz
-NDgwMloXDTE5MDQyODIzNDgwMlowgfcxPTA7BgNVBAoUNEVCTVNQIC0gRXNjb2xh
-IEJhaGlhbmEgZGUgTWVkaWNpbmEgZSBTYcO6ZGUgUMO6YmxpY2ExNDAyBgNVBAsU
-K05USSAtIE7DumNsZW8gZGUgVGVjbm9sb2dpYSBkYSBJbmZvcm1hw6fDo28xLzAt
-BgkqhkiG9w0BCQEWIG50aS1jbGF1ZGlvc2FudG9zQGJhaGlhbmEuZWR1LmJyMREw
-DwYDVQQHEwhTYWx2YWRvcjEOMAwGA1UECBMFQmFoaWExCzAJBgNVBAYTAkJSMR8w
-HQYDVQQDExZpdGFjYXJlLmJhaGlhbmEuZWR1LmJyMIIBIjANBgkqhkiG9w0BAQEF
-AAOCAQ8AMIIBCgKCAQEArfqLewyUzBJPl5bZ5wEkkGRTPti74wbKnaAPLgzhLtPD
-tqICjgEVituk3ZSaEi3S9z6XUKLS32zOv0+U2aD1+IefqGrEOEyBbEPQJ7+gr4Zi
-Z13qHrjNWJ5a9b7UVNTD+6r0HWD1SPzW+lWzEaQzsV4WyBUo2l5b7Ik2hPWGn+UR
-STLduCX3Pb9UOTmwGikTN+uhKiyvhYMVkVVI1AV8byR0kXjbpzaOss0MgldLCqZL
-8NA/yF4XULGoUKb4DnH7i2ljgC3inay2oOdwRF1UYhI+lYaWq0bgxu+aDPRbQePZ
-/qOEl6Fg/p6I9mCN5boSalR1c2paAWXjQFIb1yzooQIDAQABMA0GCSqGSIb3DQEB
-BQUAA4IBAQCgIsNDggjacZw0Q/ngHibIkh9B1GzvRXR74eG42/Lsdfyr9VEe+foh
-E8YVGgT0PDJF/TU8a9IK/j5HLMUnwCEiEEA5yt5RjC3QmIlKVkBD19/2EwJ0m9y+
-4xPQ977AsGpdh1IgtwgFGDKe0ZuVMyOJkWBx0VDdROP14215yTMhTgho9BnfAWcL
-dB9LD1cUTQOHl3pALNiJEUoalHigtqsPtZx1ld1qskHvvv/6WhObJBh0DbSXJtak
-qz1SUhwFk05GOst5iQ3sVVkZdS78DpDCuNPGEdj9YDPZVsdd9CepbgkWV29AX/yB
-o4OFX+ZHPirEOF/8flK2xmI8xJ7blH+6
-                    
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://itacare.bahiana.edu.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://itacare.bahiana.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">EBMSP - Escola Bahiana de Medicina e Saude Publica</OrganizationName>
-    <OrganizationName xml:lang="pt-br">EBMSP - Escola Bahiana de Medicina e Saude Publica</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">EBMSP - Escola Bahiana de Medicina e Saude Publica</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="pt-br">EBMSP - Escola Bahiana de Medicina e Saude Publica</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.bahiana.edu.br/</OrganizationURL>
-    <OrganizationURL xml:lang="pt-br">http://www.bahiana.edu.br/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Claudio Santos</SurName>
-    <EmailAddress>nti-claudiosantos@bahiana.edu.br</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/janus.bordeaux.archi.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/janus.bordeaux.archi.fr-idp-shibboleth.xml
deleted file mode 100644
index 0578d531..00000000
--- a/swamid-interfederations-2.0/janus.bordeaux.archi.fr-idp-shibboleth.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://janus.bordeaux.archi.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2014-03-03T11:39:30Z">
-      <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">bordeaux.archi.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">ENSAPBX - Ecole Nationale Supérieure d'Architecture et de Paysage de Bordeaux</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDSDCCAjCgAwIBAgIVANQRFAgpYoToGKMWg8l5CtEP+fE3MA0GCSqGSIb3DQEB
-BQUAMCIxIDAeBgNVBAMTF2phbnVzLmJvcmRlYXV4LmFyY2hpLmZyMB4XDTE0MDEw
-NjE0MzYyN1oXDTM0MDEwNjE0MzYyN1owIjEgMB4GA1UEAxMXamFudXMuYm9yZGVh
-dXguYXJjaGkuZnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC8pUD1
-rfIX1k/y24cQnDYj/j06C8eRpjJ7h809cAuMA++rFeeM8CPjzDBxOgcM/sxLk4Hm
-kxetKPSwWaz2Q0eXRpjy1+gX53dz5mYyb7D3kSz3/kLTfrY5IrPjXUgOGZWwYlcG
-Mt05Mh7AMNPns+xuNrrVhKMy9hA/1HO5cgDfamc+ovDqnvRBQIjqRhvxM4CEnJGH
-cyxaGrF++0Hh/DYWrlH0dCeLxLNGUyv6SfDKCm5GBkK3pmPoKu9HYeJb0AZcIA37
-ugRWnx+kHmgLaHWGkKEqTf52sp1mJYplVc+ykdztLYXoghlRRVKJxotZa6aFmcDV
-ukmhCWQLQ8l4xewZAgMBAAGjdTBzMFIGA1UdEQRLMEmCF2phbnVzLmJvcmRlYXV4
-LmFyY2hpLmZyhi5odHRwczovL2phbnVzLmJvcmRlYXV4LmFyY2hpLmZyL2lkcC9z
-aGliYm9sZXRoMB0GA1UdDgQWBBT/gbDUy3XKG6rYVG7mfleHRs97XTANBgkqhkiG
-9w0BAQUFAAOCAQEAar3F3OsrV1trAQ/ObeP8/KPTgUrGa3HV0yNwbNCP/F8CNzZI
-pKY0hE8eGHjdFpfxrC9MPe3YR7CmZtlAT0rkkDZFVRFtjaLK15oOnmrbvuCMkPI7
-yATc1qnTMbH0EgMl55zJvyXy6+HpCn8xASpeGqqf/ZGu0Y4p4oytrD/UZKjHGj59
-fiHuBltSrUbuScoYIDjv/VIiG5XrPe791/OUKEONUzwulye26Lz5qOZcwIUgmCV1
-Yt1QoZ6/V4O7uCiPDiad1bluCsGR6Y0o5BJTcPNSSluKuzc/DwJOY9obsR7rYY0m
-QrKLREVlmoE0vK7znYaAPUaXVpJwmNe9GPqvsw==
-					    </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://janus.bordeaux.archi.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://janus.bordeaux.archi.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://janus.bordeaux.archi.fr/idp/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">ENSAPBX - Ecole Nationale Supérieure d'Architecture et de Paysage de Bordeaux</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">ENSAPBX - Ecole Nationale Supérieure d'Architecture et de Paysage de Bordeaux</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Dépinay</SurName>
-    <EmailAddress>guillaume.depinay@bordeaux.archi.fr</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <SurName>Dumas</SurName>
-    <EmailAddress>jean-louis.dumas@bordeaux.archi.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/janus.bordeaux.archi.fr.xml b/swamid-interfederations-2.0/janus.bordeaux.archi.fr.xml
deleted file mode 100644
index 0578d531..00000000
--- a/swamid-interfederations-2.0/janus.bordeaux.archi.fr.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://janus.bordeaux.archi.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2014-03-03T11:39:30Z">
-      <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">bordeaux.archi.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">ENSAPBX - Ecole Nationale Supérieure d'Architecture et de Paysage de Bordeaux</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDSDCCAjCgAwIBAgIVANQRFAgpYoToGKMWg8l5CtEP+fE3MA0GCSqGSIb3DQEB
-BQUAMCIxIDAeBgNVBAMTF2phbnVzLmJvcmRlYXV4LmFyY2hpLmZyMB4XDTE0MDEw
-NjE0MzYyN1oXDTM0MDEwNjE0MzYyN1owIjEgMB4GA1UEAxMXamFudXMuYm9yZGVh
-dXguYXJjaGkuZnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC8pUD1
-rfIX1k/y24cQnDYj/j06C8eRpjJ7h809cAuMA++rFeeM8CPjzDBxOgcM/sxLk4Hm
-kxetKPSwWaz2Q0eXRpjy1+gX53dz5mYyb7D3kSz3/kLTfrY5IrPjXUgOGZWwYlcG
-Mt05Mh7AMNPns+xuNrrVhKMy9hA/1HO5cgDfamc+ovDqnvRBQIjqRhvxM4CEnJGH
-cyxaGrF++0Hh/DYWrlH0dCeLxLNGUyv6SfDKCm5GBkK3pmPoKu9HYeJb0AZcIA37
-ugRWnx+kHmgLaHWGkKEqTf52sp1mJYplVc+ykdztLYXoghlRRVKJxotZa6aFmcDV
-ukmhCWQLQ8l4xewZAgMBAAGjdTBzMFIGA1UdEQRLMEmCF2phbnVzLmJvcmRlYXV4
-LmFyY2hpLmZyhi5odHRwczovL2phbnVzLmJvcmRlYXV4LmFyY2hpLmZyL2lkcC9z
-aGliYm9sZXRoMB0GA1UdDgQWBBT/gbDUy3XKG6rYVG7mfleHRs97XTANBgkqhkiG
-9w0BAQUFAAOCAQEAar3F3OsrV1trAQ/ObeP8/KPTgUrGa3HV0yNwbNCP/F8CNzZI
-pKY0hE8eGHjdFpfxrC9MPe3YR7CmZtlAT0rkkDZFVRFtjaLK15oOnmrbvuCMkPI7
-yATc1qnTMbH0EgMl55zJvyXy6+HpCn8xASpeGqqf/ZGu0Y4p4oytrD/UZKjHGj59
-fiHuBltSrUbuScoYIDjv/VIiG5XrPe791/OUKEONUzwulye26Lz5qOZcwIUgmCV1
-Yt1QoZ6/V4O7uCiPDiad1bluCsGR6Y0o5BJTcPNSSluKuzc/DwJOY9obsR7rYY0m
-QrKLREVlmoE0vK7znYaAPUaXVpJwmNe9GPqvsw==
-					    </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://janus.bordeaux.archi.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://janus.bordeaux.archi.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://janus.bordeaux.archi.fr/idp/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">ENSAPBX - Ecole Nationale Supérieure d'Architecture et de Paysage de Bordeaux</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">ENSAPBX - Ecole Nationale Supérieure d'Architecture et de Paysage de Bordeaux</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Dépinay</SurName>
-    <EmailAddress>guillaume.depinay@bordeaux.archi.fr</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <SurName>Dumas</SurName>
-    <EmailAddress>jean-louis.dumas@bordeaux.archi.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/joaodebarro.iffarroupilha.edu.br-idp-shibboleth.xml b/swamid-interfederations-2.0/joaodebarro.iffarroupilha.edu.br-idp-shibboleth.xml
deleted file mode 100644
index c17a5967..00000000
--- a/swamid-interfederations-2.0/joaodebarro.iffarroupilha.edu.br-idp-shibboleth.xml
+++ /dev/null
@@ -1,117 +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://joaodebarro.iffarroupilha.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">edu.br</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">IFFarroupilha - Instituto Federal Farroupilha</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="pt-br">IFFarroupilha - Instituto Federal Farroupilha</mdui:DisplayName>
-        <mdui:Description xml:lang="en">IFFarroupilha - Instituto Federal Farroupilha</mdui:Description>
-        <mdui:Description xml:lang="pt-br">IFFarroupilha - Instituto Federal Farroupilha</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.iffarroupilha.edu.br</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="pt-br">http://www.iffarroupilha.edu.br</mdui:InformationURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-    MIIEPDCCAyQCAQAwDQYJKoZIhvcNAQEFBQAwgeMxNjA0BgNVBAoTLUlGRmFycm91
-cGlsaGEgLSBJbnN0aXR1dG8gRmVkZXJhbCBGYXJyb3VwaWxoYTENMAsGA1UECxME
-Q0dUSTEwMC4GCSqGSIb3DQEJARYhZXZlcnRvbi5mYXZhQGlmZmFycm91cGlsaGEu
-ZWR1Yi5yMRQwEgYDVQQHEwtTYW50YSBNYXJpYTEaMBgGA1UECBMRUmlvIEdyYW5k
-ZSBkbyBTdWwxCzAJBgNVBAYTAkJSMSkwJwYDVQQDEyBqb2FvZG9iYXJyby5pZmZh
-cnJvdXBpbGhhLmVkdS5icjAeFw0xNDA5MTAxMjAzMzJaFw0xNzA5MDkxMjAzMzJa
-MIHjMTYwNAYDVQQKEy1JRkZhcnJvdXBpbGhhIC0gSW5zdGl0dXRvIEZlZGVyYWwg
-RmFycm91cGlsaGExDTALBgNVBAsTBENHVEkxMDAuBgkqhkiG9w0BCQEWIWV2ZXJ0
-b24uZmF2YUBpZmZhcnJvdXBpbGhhLmVkdWIucjEUMBIGA1UEBxMLU2FudGEgTWFy
-aWExGjAYBgNVBAgTEVJpbyBHcmFuZGUgZG8gU3VsMQswCQYDVQQGEwJCUjEpMCcG
-A1UEAxMgam9hb2RvYmFycm8uaWZmYXJyb3VwaWxoYS5lZHUuYnIwggEiMA0GCSqG
-SIb3DQEBAQUAA4IBDwAwggEKAoIBAQCjbxzJf9stIGm23HODfY3e2Qgf5TP4pv4f
-pn2oss8MkC99Rm2XPKcui4ny8H5QJoxHU7L059QST5LdKmUKPWX/ormEqUp9pgSL
-k3V5FChn6P/G636wk8Q4b7zPtk4V5R2crxXXt2jxo3Xhb8PLAm4ypN8uUeDgTj4J
-wgRd3KDJt7fFnAXAouT1l4e0a0LELiuI8kjvGyKcGNV+8opQg2S8/+R9qAh07fKL
-V//OVmoPVWnSJmZBHCoH8AcbghazA7mY3YJVnPZdZC4WwAP7u58pRSKkt0OnXnpF
-SWuviPcoIFLbV5JtgZuyxMzq5wwXniienr18Uv0CBpK0PciRnKtTAgMBAAEwDQYJ
-KoZIhvcNAQEFBQADggEBABzAstXEYvu0dkoQvxEhhOh3kBPm8OurJpiGzGQDKX/G
-VDhgLOI+V/3UjYPTcBEMDJsjWE9Q86tjfyEXl+L3WNg2tDscxTi0hXrn9HtKeFdl
-Eqn7o0P0Zy+Ck28whDSlAKtIsoupQvhvDfE6zVltnk7Y6BtBS6IMbLVtOEC83ayc
-u4j17sJlJYYOO++rnuIMpOk6AArPrZCTBgIM1YGGAVC23z5M4KF25L02p/JvzcCH
-BB5WV7TdBFR34zcIEGOr4l8afrmCKZJw4zqLP7HxMwfVQL+bJw/aVx4owdFh/VEr
-7kc9bN7ChGuVCbg9lLSKtVhDRKDWyuIUt/ioaVOWP8s=
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://joaodebarro.iffarroupilha.edu.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://joaodebarro.iffarroupilha.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://joaodebarro.iffarroupilha.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://joaodebarro.iffarroupilha.edu.br/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://joaodebarro.iffarroupilha.edu.br/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://joaodebarro.iffarroupilha.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>
-      
-MIIEPDCCAyQCAQAwDQYJKoZIhvcNAQEFBQAwgeMxNjA0BgNVBAoTLUlGRmFycm91
-cGlsaGEgLSBJbnN0aXR1dG8gRmVkZXJhbCBGYXJyb3VwaWxoYTENMAsGA1UECxME
-Q0dUSTEwMC4GCSqGSIb3DQEJARYhZXZlcnRvbi5mYXZhQGlmZmFycm91cGlsaGEu
-ZWR1Yi5yMRQwEgYDVQQHEwtTYW50YSBNYXJpYTEaMBgGA1UECBMRUmlvIEdyYW5k
-ZSBkbyBTdWwxCzAJBgNVBAYTAkJSMSkwJwYDVQQDEyBqb2FvZG9iYXJyby5pZmZh
-cnJvdXBpbGhhLmVkdS5icjAeFw0xNDA5MTAxMjAzMzJaFw0xNzA5MDkxMjAzMzJa
-MIHjMTYwNAYDVQQKEy1JRkZhcnJvdXBpbGhhIC0gSW5zdGl0dXRvIEZlZGVyYWwg
-RmFycm91cGlsaGExDTALBgNVBAsTBENHVEkxMDAuBgkqhkiG9w0BCQEWIWV2ZXJ0
-b24uZmF2YUBpZmZhcnJvdXBpbGhhLmVkdWIucjEUMBIGA1UEBxMLU2FudGEgTWFy
-aWExGjAYBgNVBAgTEVJpbyBHcmFuZGUgZG8gU3VsMQswCQYDVQQGEwJCUjEpMCcG
-A1UEAxMgam9hb2RvYmFycm8uaWZmYXJyb3VwaWxoYS5lZHUuYnIwggEiMA0GCSqG
-SIb3DQEBAQUAA4IBDwAwggEKAoIBAQCjbxzJf9stIGm23HODfY3e2Qgf5TP4pv4f
-pn2oss8MkC99Rm2XPKcui4ny8H5QJoxHU7L059QST5LdKmUKPWX/ormEqUp9pgSL
-k3V5FChn6P/G636wk8Q4b7zPtk4V5R2crxXXt2jxo3Xhb8PLAm4ypN8uUeDgTj4J
-wgRd3KDJt7fFnAXAouT1l4e0a0LELiuI8kjvGyKcGNV+8opQg2S8/+R9qAh07fKL
-V//OVmoPVWnSJmZBHCoH8AcbghazA7mY3YJVnPZdZC4WwAP7u58pRSKkt0OnXnpF
-SWuviPcoIFLbV5JtgZuyxMzq5wwXniienr18Uv0CBpK0PciRnKtTAgMBAAEwDQYJ
-KoZIhvcNAQEFBQADggEBABzAstXEYvu0dkoQvxEhhOh3kBPm8OurJpiGzGQDKX/G
-VDhgLOI+V/3UjYPTcBEMDJsjWE9Q86tjfyEXl+L3WNg2tDscxTi0hXrn9HtKeFdl
-Eqn7o0P0Zy+Ck28whDSlAKtIsoupQvhvDfE6zVltnk7Y6BtBS6IMbLVtOEC83ayc
-u4j17sJlJYYOO++rnuIMpOk6AArPrZCTBgIM1YGGAVC23z5M4KF25L02p/JvzcCH
-BB5WV7TdBFR34zcIEGOr4l8afrmCKZJw4zqLP7HxMwfVQL+bJw/aVx4owdFh/VEr
-7kc9bN7ChGuVCbg9lLSKtVhDRKDWyuIUt/ioaVOWP8s=
-
-                    
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://joaodebarro.iffarroupilha.edu.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://joaodebarro.iffarroupilha.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">IFFarroupilha - Instituto Federal Farroupilha</OrganizationName>
-    <OrganizationName xml:lang="pt-br">IFFarroupilha - Instituto Federal Farroupilha</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">IFFarroupilha - Instituto Federal Farroupilha</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="pt-br">IFFarroupilha - Instituto Federal Farroupilha</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.iffarroupilha.edu.br</OrganizationURL>
-    <OrganizationURL xml:lang="pt-br">http://www.iffarroupilha.edu.br</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Everton Fava</SurName>
-    <EmailAddress>everton.fava@iffarroupilha.edub.r</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/joaodebarro.iffarroupilha.edu.br.xml b/swamid-interfederations-2.0/joaodebarro.iffarroupilha.edu.br.xml
deleted file mode 100644
index c17a5967..00000000
--- a/swamid-interfederations-2.0/joaodebarro.iffarroupilha.edu.br.xml
+++ /dev/null
@@ -1,117 +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://joaodebarro.iffarroupilha.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">edu.br</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">IFFarroupilha - Instituto Federal Farroupilha</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="pt-br">IFFarroupilha - Instituto Federal Farroupilha</mdui:DisplayName>
-        <mdui:Description xml:lang="en">IFFarroupilha - Instituto Federal Farroupilha</mdui:Description>
-        <mdui:Description xml:lang="pt-br">IFFarroupilha - Instituto Federal Farroupilha</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.iffarroupilha.edu.br</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="pt-br">http://www.iffarroupilha.edu.br</mdui:InformationURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-    MIIEPDCCAyQCAQAwDQYJKoZIhvcNAQEFBQAwgeMxNjA0BgNVBAoTLUlGRmFycm91
-cGlsaGEgLSBJbnN0aXR1dG8gRmVkZXJhbCBGYXJyb3VwaWxoYTENMAsGA1UECxME
-Q0dUSTEwMC4GCSqGSIb3DQEJARYhZXZlcnRvbi5mYXZhQGlmZmFycm91cGlsaGEu
-ZWR1Yi5yMRQwEgYDVQQHEwtTYW50YSBNYXJpYTEaMBgGA1UECBMRUmlvIEdyYW5k
-ZSBkbyBTdWwxCzAJBgNVBAYTAkJSMSkwJwYDVQQDEyBqb2FvZG9iYXJyby5pZmZh
-cnJvdXBpbGhhLmVkdS5icjAeFw0xNDA5MTAxMjAzMzJaFw0xNzA5MDkxMjAzMzJa
-MIHjMTYwNAYDVQQKEy1JRkZhcnJvdXBpbGhhIC0gSW5zdGl0dXRvIEZlZGVyYWwg
-RmFycm91cGlsaGExDTALBgNVBAsTBENHVEkxMDAuBgkqhkiG9w0BCQEWIWV2ZXJ0
-b24uZmF2YUBpZmZhcnJvdXBpbGhhLmVkdWIucjEUMBIGA1UEBxMLU2FudGEgTWFy
-aWExGjAYBgNVBAgTEVJpbyBHcmFuZGUgZG8gU3VsMQswCQYDVQQGEwJCUjEpMCcG
-A1UEAxMgam9hb2RvYmFycm8uaWZmYXJyb3VwaWxoYS5lZHUuYnIwggEiMA0GCSqG
-SIb3DQEBAQUAA4IBDwAwggEKAoIBAQCjbxzJf9stIGm23HODfY3e2Qgf5TP4pv4f
-pn2oss8MkC99Rm2XPKcui4ny8H5QJoxHU7L059QST5LdKmUKPWX/ormEqUp9pgSL
-k3V5FChn6P/G636wk8Q4b7zPtk4V5R2crxXXt2jxo3Xhb8PLAm4ypN8uUeDgTj4J
-wgRd3KDJt7fFnAXAouT1l4e0a0LELiuI8kjvGyKcGNV+8opQg2S8/+R9qAh07fKL
-V//OVmoPVWnSJmZBHCoH8AcbghazA7mY3YJVnPZdZC4WwAP7u58pRSKkt0OnXnpF
-SWuviPcoIFLbV5JtgZuyxMzq5wwXniienr18Uv0CBpK0PciRnKtTAgMBAAEwDQYJ
-KoZIhvcNAQEFBQADggEBABzAstXEYvu0dkoQvxEhhOh3kBPm8OurJpiGzGQDKX/G
-VDhgLOI+V/3UjYPTcBEMDJsjWE9Q86tjfyEXl+L3WNg2tDscxTi0hXrn9HtKeFdl
-Eqn7o0P0Zy+Ck28whDSlAKtIsoupQvhvDfE6zVltnk7Y6BtBS6IMbLVtOEC83ayc
-u4j17sJlJYYOO++rnuIMpOk6AArPrZCTBgIM1YGGAVC23z5M4KF25L02p/JvzcCH
-BB5WV7TdBFR34zcIEGOr4l8afrmCKZJw4zqLP7HxMwfVQL+bJw/aVx4owdFh/VEr
-7kc9bN7ChGuVCbg9lLSKtVhDRKDWyuIUt/ioaVOWP8s=
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://joaodebarro.iffarroupilha.edu.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://joaodebarro.iffarroupilha.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://joaodebarro.iffarroupilha.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://joaodebarro.iffarroupilha.edu.br/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://joaodebarro.iffarroupilha.edu.br/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://joaodebarro.iffarroupilha.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>
-      
-MIIEPDCCAyQCAQAwDQYJKoZIhvcNAQEFBQAwgeMxNjA0BgNVBAoTLUlGRmFycm91
-cGlsaGEgLSBJbnN0aXR1dG8gRmVkZXJhbCBGYXJyb3VwaWxoYTENMAsGA1UECxME
-Q0dUSTEwMC4GCSqGSIb3DQEJARYhZXZlcnRvbi5mYXZhQGlmZmFycm91cGlsaGEu
-ZWR1Yi5yMRQwEgYDVQQHEwtTYW50YSBNYXJpYTEaMBgGA1UECBMRUmlvIEdyYW5k
-ZSBkbyBTdWwxCzAJBgNVBAYTAkJSMSkwJwYDVQQDEyBqb2FvZG9iYXJyby5pZmZh
-cnJvdXBpbGhhLmVkdS5icjAeFw0xNDA5MTAxMjAzMzJaFw0xNzA5MDkxMjAzMzJa
-MIHjMTYwNAYDVQQKEy1JRkZhcnJvdXBpbGhhIC0gSW5zdGl0dXRvIEZlZGVyYWwg
-RmFycm91cGlsaGExDTALBgNVBAsTBENHVEkxMDAuBgkqhkiG9w0BCQEWIWV2ZXJ0
-b24uZmF2YUBpZmZhcnJvdXBpbGhhLmVkdWIucjEUMBIGA1UEBxMLU2FudGEgTWFy
-aWExGjAYBgNVBAgTEVJpbyBHcmFuZGUgZG8gU3VsMQswCQYDVQQGEwJCUjEpMCcG
-A1UEAxMgam9hb2RvYmFycm8uaWZmYXJyb3VwaWxoYS5lZHUuYnIwggEiMA0GCSqG
-SIb3DQEBAQUAA4IBDwAwggEKAoIBAQCjbxzJf9stIGm23HODfY3e2Qgf5TP4pv4f
-pn2oss8MkC99Rm2XPKcui4ny8H5QJoxHU7L059QST5LdKmUKPWX/ormEqUp9pgSL
-k3V5FChn6P/G636wk8Q4b7zPtk4V5R2crxXXt2jxo3Xhb8PLAm4ypN8uUeDgTj4J
-wgRd3KDJt7fFnAXAouT1l4e0a0LELiuI8kjvGyKcGNV+8opQg2S8/+R9qAh07fKL
-V//OVmoPVWnSJmZBHCoH8AcbghazA7mY3YJVnPZdZC4WwAP7u58pRSKkt0OnXnpF
-SWuviPcoIFLbV5JtgZuyxMzq5wwXniienr18Uv0CBpK0PciRnKtTAgMBAAEwDQYJ
-KoZIhvcNAQEFBQADggEBABzAstXEYvu0dkoQvxEhhOh3kBPm8OurJpiGzGQDKX/G
-VDhgLOI+V/3UjYPTcBEMDJsjWE9Q86tjfyEXl+L3WNg2tDscxTi0hXrn9HtKeFdl
-Eqn7o0P0Zy+Ck28whDSlAKtIsoupQvhvDfE6zVltnk7Y6BtBS6IMbLVtOEC83ayc
-u4j17sJlJYYOO++rnuIMpOk6AArPrZCTBgIM1YGGAVC23z5M4KF25L02p/JvzcCH
-BB5WV7TdBFR34zcIEGOr4l8afrmCKZJw4zqLP7HxMwfVQL+bJw/aVx4owdFh/VEr
-7kc9bN7ChGuVCbg9lLSKtVhDRKDWyuIUt/ioaVOWP8s=
-
-                    
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://joaodebarro.iffarroupilha.edu.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://joaodebarro.iffarroupilha.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">IFFarroupilha - Instituto Federal Farroupilha</OrganizationName>
-    <OrganizationName xml:lang="pt-br">IFFarroupilha - Instituto Federal Farroupilha</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">IFFarroupilha - Instituto Federal Farroupilha</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="pt-br">IFFarroupilha - Instituto Federal Farroupilha</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.iffarroupilha.edu.br</OrganizationURL>
-    <OrganizationURL xml:lang="pt-br">http://www.iffarroupilha.edu.br</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Everton Fava</SurName>
-    <EmailAddress>everton.fava@iffarroupilha.edub.r</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/katalog.svkos.cz-idp-shibboleth.xml b/swamid-interfederations-2.0/katalog.svkos.cz-idp-shibboleth.xml
deleted file mode 100644
index faabac66..00000000
--- a/swamid-interfederations-2.0/katalog.svkos.cz-idp-shibboleth.xml
+++ /dev/null
@@ -1,119 +0,0 @@
-<?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">
-  <md:Extensions xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata">
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/" registrationInstant="2014-01-08T16:18:12Z">
-      <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>
-    <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://eduid.cz/uri/idp-group/library</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md: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/katalog.svkos.cz.xml b/swamid-interfederations-2.0/katalog.svkos.cz.xml
deleted file mode 100644
index faabac66..00000000
--- a/swamid-interfederations-2.0/katalog.svkos.cz.xml
+++ /dev/null
@@ -1,119 +0,0 @@
-<?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">
-  <md:Extensions xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata">
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/" registrationInstant="2014-01-08T16:18:12Z">
-      <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>
-    <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://eduid.cz/uri/idp-group/library</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md: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/keybucket.app.nordu.net-saml2-sp-metadata.xml b/swamid-interfederations-2.0/keybucket.app.nordu.net-saml2-sp-metadata.xml
deleted file mode 100644
index f11b9f47..00000000
--- a/swamid-interfederations-2.0/keybucket.app.nordu.net-saml2-sp-metadata.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://keybucket.app.nordu.net/saml2/sp/metadata">
-  <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>
-  <md:SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIIEujCCA6KgAwIBAgIQLINqZJFs8l1wYd2J2IBMTjANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTEyMDIyOTAwMDAwMFoXDTE1MDIyODIzNTk1OVowgZUxCzAJBgNV
-BAYTAkRLMQowCAYDVQQREwEuMQowCAYDVQQIEwEuMQswCQYDVQQHEwIuLjEZMBcG
-A1UECRMQREsgMjk3MCBIb3JzaG9sbTEVMBMGA1UECRMMQWdlcm4gQWxsZSAzMRUw
-EwYDVQQKEwxOT1JEVW5ldCBBL1MxGDAWBgNVBAMUDyouYXBwLm5vcmR1Lm5ldDCC
-ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJkBbj0ZJsjuirO6tN9rbRhE
-5PfQKfjrwMf5lp1a05DHlJcxsv2JZGPszkOA260D8gouWfjk3DJQIIJJgELfn5yP
-L4zwKArBDpsttTXW+DFmhfECbkemWV571ErDHMVC9JUD39uLhE1bAoYFxAeJGr14
-mg/N5YdnsuSTGOfVfC+XuhA3CgylcGBIWoXHPbPlUJk3VWVeNnYjO+nLlKPjhSSq
-mRVhmVhEwREiRPgbKyMEEoFpdmSzuNWcBMtVKt4FTLa0cjx3/rIn77imztcXRDSN
-T6GwXaG5pjy+7E602epC4t5hbj6pxzrC7mpyIQXdYjKboPgaKQ+E7bv+OqJNG3sC
-AwEAAaOCAWIwggFeMB8GA1UdIwQYMBaAFAy9k2gM896ro0lrKzdXR+qQ47ntMB0G
-A1UdDgQWBBT0F6Szj83YxTlMGIIIf3I9jdTedjAOBgNVHQ8BAf8EBAMCBaAwDAYD
-VR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwGAYDVR0g
-BBEwDzANBgsrBgEEAbIxAQICHTA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3Js
-LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNybDBtBggrBgEFBQcBAQRhMF8w
-NQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NM
-Q0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8vb2NzcC50Y3MudGVyZW5hLm9yZzAa
-BgNVHREEEzARgg8qLmFwcC5ub3JkdS5uZXQwDQYJKoZIhvcNAQEFBQADggEBADMQ
-bc0dPVC1SlyOxDf90hN9sDKw92YdVtsUNFfs9MYivZK7KI5+qEQStpAvXkrBUNfd
-gM9wqL9ea9BDDmBcn5lYyjPBgGJBeLLkcyBbZ56JbcBAxIncKKFw6r5M3j7tMcth
-f06K4cm7ngUg80ZEYK00ioAyFle56qPfZ5UM25QFzV38DGvusLl5H1bTtpz1ijh7
-kO/ehJVo4K64KVCbjOr1bavp665TtcIQX2qoPsnTZY30gQ/X/K2UJQSUE5Qc+o19
-BkvvVT5jNYdeLZHXbC6X4kXYNhFKZaz9nURgfaFQIeIEu/zmsIM8tcwLjZyF1veH
-wXXiBDXS3PNHXQnnpys=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://keybucket.app.nordu.net/saml2/sp/ls/"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://keybucket.app.nordu.net/saml2/sp/acs/" index="1"/>
-    <md:AttributeConsumingService index="1">
-      <md:ServiceName xml:lang="en">The KeyBucket</md:ServiceName>
-      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">NORDUNet</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">NORDUnet A/S</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.nordu.net</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:Company>NORDUnet</md:Company>
-    <md:GivenName>Leif</md:GivenName>
-    <md:SurName>Johansson</md:SurName>
-    <md:EmailAddress>leifj@nordu.net</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:Company>NORDUnet</md:Company>
-    <md:GivenName>Johan</md:GivenName>
-    <md:SurName>Berggren</md:SurName>
-    <md:EmailAddress>jbn@nordu.net</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/keybucket.app.nordu.net.xml b/swamid-interfederations-2.0/keybucket.app.nordu.net.xml
deleted file mode 100644
index f11b9f47..00000000
--- a/swamid-interfederations-2.0/keybucket.app.nordu.net.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://keybucket.app.nordu.net/saml2/sp/metadata">
-  <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>
-  <md:SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIIEujCCA6KgAwIBAgIQLINqZJFs8l1wYd2J2IBMTjANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTEyMDIyOTAwMDAwMFoXDTE1MDIyODIzNTk1OVowgZUxCzAJBgNV
-BAYTAkRLMQowCAYDVQQREwEuMQowCAYDVQQIEwEuMQswCQYDVQQHEwIuLjEZMBcG
-A1UECRMQREsgMjk3MCBIb3JzaG9sbTEVMBMGA1UECRMMQWdlcm4gQWxsZSAzMRUw
-EwYDVQQKEwxOT1JEVW5ldCBBL1MxGDAWBgNVBAMUDyouYXBwLm5vcmR1Lm5ldDCC
-ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJkBbj0ZJsjuirO6tN9rbRhE
-5PfQKfjrwMf5lp1a05DHlJcxsv2JZGPszkOA260D8gouWfjk3DJQIIJJgELfn5yP
-L4zwKArBDpsttTXW+DFmhfECbkemWV571ErDHMVC9JUD39uLhE1bAoYFxAeJGr14
-mg/N5YdnsuSTGOfVfC+XuhA3CgylcGBIWoXHPbPlUJk3VWVeNnYjO+nLlKPjhSSq
-mRVhmVhEwREiRPgbKyMEEoFpdmSzuNWcBMtVKt4FTLa0cjx3/rIn77imztcXRDSN
-T6GwXaG5pjy+7E602epC4t5hbj6pxzrC7mpyIQXdYjKboPgaKQ+E7bv+OqJNG3sC
-AwEAAaOCAWIwggFeMB8GA1UdIwQYMBaAFAy9k2gM896ro0lrKzdXR+qQ47ntMB0G
-A1UdDgQWBBT0F6Szj83YxTlMGIIIf3I9jdTedjAOBgNVHQ8BAf8EBAMCBaAwDAYD
-VR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwGAYDVR0g
-BBEwDzANBgsrBgEEAbIxAQICHTA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3Js
-LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNybDBtBggrBgEFBQcBAQRhMF8w
-NQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NM
-Q0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8vb2NzcC50Y3MudGVyZW5hLm9yZzAa
-BgNVHREEEzARgg8qLmFwcC5ub3JkdS5uZXQwDQYJKoZIhvcNAQEFBQADggEBADMQ
-bc0dPVC1SlyOxDf90hN9sDKw92YdVtsUNFfs9MYivZK7KI5+qEQStpAvXkrBUNfd
-gM9wqL9ea9BDDmBcn5lYyjPBgGJBeLLkcyBbZ56JbcBAxIncKKFw6r5M3j7tMcth
-f06K4cm7ngUg80ZEYK00ioAyFle56qPfZ5UM25QFzV38DGvusLl5H1bTtpz1ijh7
-kO/ehJVo4K64KVCbjOr1bavp665TtcIQX2qoPsnTZY30gQ/X/K2UJQSUE5Qc+o19
-BkvvVT5jNYdeLZHXbC6X4kXYNhFKZaz9nURgfaFQIeIEu/zmsIM8tcwLjZyF1veH
-wXXiBDXS3PNHXQnnpys=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://keybucket.app.nordu.net/saml2/sp/ls/"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://keybucket.app.nordu.net/saml2/sp/acs/" index="1"/>
-    <md:AttributeConsumingService index="1">
-      <md:ServiceName xml:lang="en">The KeyBucket</md:ServiceName>
-      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">NORDUNet</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">NORDUnet A/S</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.nordu.net</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:Company>NORDUnet</md:Company>
-    <md:GivenName>Leif</md:GivenName>
-    <md:SurName>Johansson</md:SurName>
-    <md:EmailAddress>leifj@nordu.net</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:Company>NORDUnet</md:Company>
-    <md:GivenName>Johan</md:GivenName>
-    <md:SurName>Berggren</md:SurName>
-    <md:EmailAddress>jbn@nordu.net</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/kiidp.ki.se-idp-shibboleth.xml b/swamid-interfederations-2.0/kiidp.ki.se-idp-shibboleth.xml
deleted file mode 100644
index 26e764d6..00000000
--- a/swamid-interfederations-2.0/kiidp.ki.se-idp-shibboleth.xml
+++ /dev/null
@@ -1,133 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://kiidp.ki.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>
-  <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">ki.se</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="sv">Karolinska Institutet</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Karolinska Institutet</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Identity Provider för Karolinska Institutet.</mdui:Description>
-        <mdui:Description xml:lang="en">Identity Provider for Karolinska Institutet.</mdui:Description>
-        <mdui:Logo height="146" width="292">https://kiidp.ki.se/images/ki_logo_292x146.png</mdui:Logo>
-        <mdui:Keywords xml:lang="sv">ki karolinska+institutet</mdui:Keywords>
-        <mdui:Keywords xml:lang="en">ki karolinska+institutet</mdui:Keywords>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DomainHint>ki.se</mdui:DomainHint>
-        <mdui:IPHint>130.229.0.0/18</mdui:IPHint>
-        <mdui:IPHint>130.237.96.0/19</mdui:IPHint>
-        <mdui:IPHint>130.237.128.0/20</mdui:IPHint>
-        <mdui:IPHint>130.237.204.0/24</mdui:IPHint>
-        <mdui:IPHint>130.237.207.0/24</mdui:IPHint>
-        <mdui:IPHint>193.10.16.0/21</mdui:IPHint>
-        <mdui:IPHint>193.10.140.0/22</mdui:IPHint>
-        <mdui:IPHint>194.14.96.0/24</mdui:IPHint>
-        <mdui:IPHint>2001:06B0:0022::/48</mdui:IPHint>
-        <mdui:IPHint>136.155.0.0/16</mdui:IPHint>
-        <mdui:IPHint>159.38.0.0/16</mdui:IPHint>
-        <mdui:IPHint>193.10.63.0/24</mdui:IPHint>
-        <mdui:IPHint>193.10.76.0/24</mdui:IPHint>
-        <mdui:GeolocationHint>geo:59.3475753,18.0279382</mdui:GeolocationHint>
-        <mdui:GeolocationHint>geo:59.219589,17.940939</mdui:GeolocationHint>
-      </mdui:DiscoHints>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDGDCCAgCgAwIBAgIVAM0PmHWir6jrdlS8z2iCpGvo0CqaMA0GCSqGSIb3DQEB
-BQUAMBYxFDASBgNVBAMTC2tpaWRwLmtpLnNlMB4XDTEwMTEwOTA4MTgwNloXDTMw
-MTEwOTA4MTgwNlowFjEUMBIGA1UEAxMLa2lpZHAua2kuc2UwggEiMA0GCSqGSIb3
-DQEBAQUAA4IBDwAwggEKAoIBAQCGXvXTTL9jXqeUnjwuEuPctScCyn+hRZQOmWm7
-OrvAHMIi+MKQMeSboowpbj+apvYbaxQFY4PH4287fd4OhYJGAdfNk68E7h+S5Ryq
-BVrJVM9SSGcwGAViCSq5YfuSo/ZtvMCGtQJ8ef1uu4sg4VJ+UzXtSjfRvKNko9Jm
-r3lJ3qDUp3ltm+r9Yk7EQ+tKfJFIg41HiAEeFl9Zztlp6DqbOlwXleUjCVPklCZV
-4emEO9flD+uk3zxp9y9TlcOAtuFNp6EmzH5Xc2LvWOusDZITsuNtL6OfadIixkfb
-IctgW4hgD0GOnDi2chYu4Yq3vets8GsQVkD0BAIXNxhJ1HEjAgMBAAGjXTBbMDoG
-A1UdEQQzMDGCC2tpaWRwLmtpLnNlhiJodHRwczovL2tpaWRwLmtpLnNlL2lkcC9z
-aGliYm9sZXRoMB0GA1UdDgQWBBSDaQ4ABwxargqbAwedMAvPxCvABjANBgkqhkiG
-9w0BAQUFAAOCAQEAhHhPDWxChQt/L74HjwWVQHPQghTRcxJaQcBefWKH2yiERNyd
-/PKXU5G3RIzOS3Y3fYGwOMxH+PidKd48txJ50n/3VDI75g2MJsB+KJjLi2iVVkan
-xTyNLauF4A6ueNbn9V/myyZTa7kiru+iDSOasFSlLMf2leQXQHX3qBkOyBmy5Nu8
-eGhJzMVovMnIaDofE1FXMI6yTuF3KG+Uep7moWj+WHY028TupWsiAE4LVs793dAn
-y4PHmY+q902WpZA1xeckJAdpSjS5rLc3fWOEHBNbmhBkOhDr/tarFUyjxi4mKEhm
-uKycjtOvYOwcvABc1u3WpxJ+CdtbbcHrnYCWXg==
-
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://kiidp.ki.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://kiidp.ki.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://kiidp.ki.se/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://kiidp.ki.se/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://kiidp.ki.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://kiidp.ki.se/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ki.se</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDGDCCAgCgAwIBAgIVAM0PmHWir6jrdlS8z2iCpGvo0CqaMA0GCSqGSIb3DQEB
-BQUAMBYxFDASBgNVBAMTC2tpaWRwLmtpLnNlMB4XDTEwMTEwOTA4MTgwNloXDTMw
-MTEwOTA4MTgwNlowFjEUMBIGA1UEAxMLa2lpZHAua2kuc2UwggEiMA0GCSqGSIb3
-DQEBAQUAA4IBDwAwggEKAoIBAQCGXvXTTL9jXqeUnjwuEuPctScCyn+hRZQOmWm7
-OrvAHMIi+MKQMeSboowpbj+apvYbaxQFY4PH4287fd4OhYJGAdfNk68E7h+S5Ryq
-BVrJVM9SSGcwGAViCSq5YfuSo/ZtvMCGtQJ8ef1uu4sg4VJ+UzXtSjfRvKNko9Jm
-r3lJ3qDUp3ltm+r9Yk7EQ+tKfJFIg41HiAEeFl9Zztlp6DqbOlwXleUjCVPklCZV
-4emEO9flD+uk3zxp9y9TlcOAtuFNp6EmzH5Xc2LvWOusDZITsuNtL6OfadIixkfb
-IctgW4hgD0GOnDi2chYu4Yq3vets8GsQVkD0BAIXNxhJ1HEjAgMBAAGjXTBbMDoG
-A1UdEQQzMDGCC2tpaWRwLmtpLnNlhiJodHRwczovL2tpaWRwLmtpLnNlL2lkcC9z
-aGliYm9sZXRoMB0GA1UdDgQWBBSDaQ4ABwxargqbAwedMAvPxCvABjANBgkqhkiG
-9w0BAQUFAAOCAQEAhHhPDWxChQt/L74HjwWVQHPQghTRcxJaQcBefWKH2yiERNyd
-/PKXU5G3RIzOS3Y3fYGwOMxH+PidKd48txJ50n/3VDI75g2MJsB+KJjLi2iVVkan
-xTyNLauF4A6ueNbn9V/myyZTa7kiru+iDSOasFSlLMf2leQXQHX3qBkOyBmy5Nu8
-eGhJzMVovMnIaDofE1FXMI6yTuF3KG+Uep7moWj+WHY028TupWsiAE4LVs793dAn
-y4PHmY+q902WpZA1xeckJAdpSjS5rLc3fWOEHBNbmhBkOhDr/tarFUyjxi4mKEhm
-uKycjtOvYOwcvABc1u3WpxJ+CdtbbcHrnYCWXg==
-
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://kiidp.ki.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://kiidp.ki.se:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">KI</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="sv">Karolinska Institutet</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Karolinska Institutet</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.ki.se</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:Company>Karolinska Institutet</md:Company>
-    <md:SurName>Malin Westerberg</md:SurName>
-    <md:EmailAddress>malin.westerberg@ki.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 8 524 86693</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:Company>Karolinska Institutet</md:Company>
-    <md:SurName>Eric Johansson</md:SurName>
-    <md:EmailAddress>eric.johansson@ki.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 8 524 86382</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:Company>Karolinska Institutet</md:Company>
-    <md:SurName>IT-support</md:SurName>
-    <md:EmailAddress>it-support@ki.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 8 524 82222</md:TelephoneNumber>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/kiidp.ki.se.xml b/swamid-interfederations-2.0/kiidp.ki.se.xml
deleted file mode 100644
index 26e764d6..00000000
--- a/swamid-interfederations-2.0/kiidp.ki.se.xml
+++ /dev/null
@@ -1,133 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://kiidp.ki.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>
-  <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">ki.se</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="sv">Karolinska Institutet</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Karolinska Institutet</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Identity Provider för Karolinska Institutet.</mdui:Description>
-        <mdui:Description xml:lang="en">Identity Provider for Karolinska Institutet.</mdui:Description>
-        <mdui:Logo height="146" width="292">https://kiidp.ki.se/images/ki_logo_292x146.png</mdui:Logo>
-        <mdui:Keywords xml:lang="sv">ki karolinska+institutet</mdui:Keywords>
-        <mdui:Keywords xml:lang="en">ki karolinska+institutet</mdui:Keywords>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DomainHint>ki.se</mdui:DomainHint>
-        <mdui:IPHint>130.229.0.0/18</mdui:IPHint>
-        <mdui:IPHint>130.237.96.0/19</mdui:IPHint>
-        <mdui:IPHint>130.237.128.0/20</mdui:IPHint>
-        <mdui:IPHint>130.237.204.0/24</mdui:IPHint>
-        <mdui:IPHint>130.237.207.0/24</mdui:IPHint>
-        <mdui:IPHint>193.10.16.0/21</mdui:IPHint>
-        <mdui:IPHint>193.10.140.0/22</mdui:IPHint>
-        <mdui:IPHint>194.14.96.0/24</mdui:IPHint>
-        <mdui:IPHint>2001:06B0:0022::/48</mdui:IPHint>
-        <mdui:IPHint>136.155.0.0/16</mdui:IPHint>
-        <mdui:IPHint>159.38.0.0/16</mdui:IPHint>
-        <mdui:IPHint>193.10.63.0/24</mdui:IPHint>
-        <mdui:IPHint>193.10.76.0/24</mdui:IPHint>
-        <mdui:GeolocationHint>geo:59.3475753,18.0279382</mdui:GeolocationHint>
-        <mdui:GeolocationHint>geo:59.219589,17.940939</mdui:GeolocationHint>
-      </mdui:DiscoHints>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDGDCCAgCgAwIBAgIVAM0PmHWir6jrdlS8z2iCpGvo0CqaMA0GCSqGSIb3DQEB
-BQUAMBYxFDASBgNVBAMTC2tpaWRwLmtpLnNlMB4XDTEwMTEwOTA4MTgwNloXDTMw
-MTEwOTA4MTgwNlowFjEUMBIGA1UEAxMLa2lpZHAua2kuc2UwggEiMA0GCSqGSIb3
-DQEBAQUAA4IBDwAwggEKAoIBAQCGXvXTTL9jXqeUnjwuEuPctScCyn+hRZQOmWm7
-OrvAHMIi+MKQMeSboowpbj+apvYbaxQFY4PH4287fd4OhYJGAdfNk68E7h+S5Ryq
-BVrJVM9SSGcwGAViCSq5YfuSo/ZtvMCGtQJ8ef1uu4sg4VJ+UzXtSjfRvKNko9Jm
-r3lJ3qDUp3ltm+r9Yk7EQ+tKfJFIg41HiAEeFl9Zztlp6DqbOlwXleUjCVPklCZV
-4emEO9flD+uk3zxp9y9TlcOAtuFNp6EmzH5Xc2LvWOusDZITsuNtL6OfadIixkfb
-IctgW4hgD0GOnDi2chYu4Yq3vets8GsQVkD0BAIXNxhJ1HEjAgMBAAGjXTBbMDoG
-A1UdEQQzMDGCC2tpaWRwLmtpLnNlhiJodHRwczovL2tpaWRwLmtpLnNlL2lkcC9z
-aGliYm9sZXRoMB0GA1UdDgQWBBSDaQ4ABwxargqbAwedMAvPxCvABjANBgkqhkiG
-9w0BAQUFAAOCAQEAhHhPDWxChQt/L74HjwWVQHPQghTRcxJaQcBefWKH2yiERNyd
-/PKXU5G3RIzOS3Y3fYGwOMxH+PidKd48txJ50n/3VDI75g2MJsB+KJjLi2iVVkan
-xTyNLauF4A6ueNbn9V/myyZTa7kiru+iDSOasFSlLMf2leQXQHX3qBkOyBmy5Nu8
-eGhJzMVovMnIaDofE1FXMI6yTuF3KG+Uep7moWj+WHY028TupWsiAE4LVs793dAn
-y4PHmY+q902WpZA1xeckJAdpSjS5rLc3fWOEHBNbmhBkOhDr/tarFUyjxi4mKEhm
-uKycjtOvYOwcvABc1u3WpxJ+CdtbbcHrnYCWXg==
-
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://kiidp.ki.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://kiidp.ki.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://kiidp.ki.se/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://kiidp.ki.se/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://kiidp.ki.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://kiidp.ki.se/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ki.se</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDGDCCAgCgAwIBAgIVAM0PmHWir6jrdlS8z2iCpGvo0CqaMA0GCSqGSIb3DQEB
-BQUAMBYxFDASBgNVBAMTC2tpaWRwLmtpLnNlMB4XDTEwMTEwOTA4MTgwNloXDTMw
-MTEwOTA4MTgwNlowFjEUMBIGA1UEAxMLa2lpZHAua2kuc2UwggEiMA0GCSqGSIb3
-DQEBAQUAA4IBDwAwggEKAoIBAQCGXvXTTL9jXqeUnjwuEuPctScCyn+hRZQOmWm7
-OrvAHMIi+MKQMeSboowpbj+apvYbaxQFY4PH4287fd4OhYJGAdfNk68E7h+S5Ryq
-BVrJVM9SSGcwGAViCSq5YfuSo/ZtvMCGtQJ8ef1uu4sg4VJ+UzXtSjfRvKNko9Jm
-r3lJ3qDUp3ltm+r9Yk7EQ+tKfJFIg41HiAEeFl9Zztlp6DqbOlwXleUjCVPklCZV
-4emEO9flD+uk3zxp9y9TlcOAtuFNp6EmzH5Xc2LvWOusDZITsuNtL6OfadIixkfb
-IctgW4hgD0GOnDi2chYu4Yq3vets8GsQVkD0BAIXNxhJ1HEjAgMBAAGjXTBbMDoG
-A1UdEQQzMDGCC2tpaWRwLmtpLnNlhiJodHRwczovL2tpaWRwLmtpLnNlL2lkcC9z
-aGliYm9sZXRoMB0GA1UdDgQWBBSDaQ4ABwxargqbAwedMAvPxCvABjANBgkqhkiG
-9w0BAQUFAAOCAQEAhHhPDWxChQt/L74HjwWVQHPQghTRcxJaQcBefWKH2yiERNyd
-/PKXU5G3RIzOS3Y3fYGwOMxH+PidKd48txJ50n/3VDI75g2MJsB+KJjLi2iVVkan
-xTyNLauF4A6ueNbn9V/myyZTa7kiru+iDSOasFSlLMf2leQXQHX3qBkOyBmy5Nu8
-eGhJzMVovMnIaDofE1FXMI6yTuF3KG+Uep7moWj+WHY028TupWsiAE4LVs793dAn
-y4PHmY+q902WpZA1xeckJAdpSjS5rLc3fWOEHBNbmhBkOhDr/tarFUyjxi4mKEhm
-uKycjtOvYOwcvABc1u3WpxJ+CdtbbcHrnYCWXg==
-
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://kiidp.ki.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://kiidp.ki.se:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">KI</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="sv">Karolinska Institutet</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Karolinska Institutet</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.ki.se</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:Company>Karolinska Institutet</md:Company>
-    <md:SurName>Malin Westerberg</md:SurName>
-    <md:EmailAddress>malin.westerberg@ki.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 8 524 86693</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:Company>Karolinska Institutet</md:Company>
-    <md:SurName>Eric Johansson</md:SurName>
-    <md:EmailAddress>eric.johansson@ki.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 8 524 86382</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:Company>Karolinska Institutet</md:Company>
-    <md:SurName>IT-support</md:SurName>
-    <md:EmailAddress>it-support@ki.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 8 524 82222</md:TelephoneNumber>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/laife-idp.lanet.lv.xml b/swamid-interfederations-2.0/laife-idp.lanet.lv.xml
deleted file mode 100644
index 9acadef7..00000000
--- a/swamid-interfederations-2.0/laife-idp.lanet.lv.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://laife-idp.lanet.lv">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://laife.lanet.lv/" registrationInstant="2013-10-10T10:10:10Z">
-      <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>
-MIIE0zCCAvICAQAwDQYJKoZIhvcNAQEEBQAwZzELMAkGA1UEBhMCTFYxDzANBgNV
-BAgTBkxhdHZpYTENMAsGA1UEBxMEUmlnYTELMAkGA1UEChMCTFUxDjAMBgNVBAsT
-BUxBTkVUMRswGQYDVQQDExJsYWlmZS1pZHAubGFuZXQubHYwHhcNMTMwMzA2MTIz
-MTIwWhcNMjMwMzA0MTIzMTIwWjBnMQswCQYDVQQGEwJMVjEPMA0GA1UECBMGTGF0
-dmlhMQ0wCwYDVQQHEwRSaWdhMQswCQYDVQQKEwJMVTEOMAwGA1UECxMFTEFORVQx
-GzAZBgNVBAMTEmxhaWZlLWlkcC5sYW5ldC5sdjCCAeowDQYJKoZIhvcNAQEBBQAD
-ggHXADCCAdICggHJAqmEukkBNsZKvEyjT1GqHjnEEb3r3hV+rF8q5EVpq43ceFmY
-az+G4RzLatiYz36+3P+p7ygH8JJQS4N0tzvf+f++0HHNuwn3Ye9pPzbx9k0BwLxw
-/2In3G2qpmZILKO7O0a7g+RF9NGpyDg/h6Y3wuH/mKftYe3GGvHb0k9n1UK9nPKu
-BnY8DnxR/L6p/EK/PSAHDf+B8vqnym2gVeLa/3UUpH0Ael9mo+GUBcsvkRUrN/Wy
-QuHpB3TKVHH7I+gnLDholI+wIu+vHQ/Hhwe6pnq/ph1xoI/NZ4ffBvMDC/gVa/vA
-Qma4g4EvzujoeXJPKIYrKSQ1rmsHITLuHcas33vzsaPxlBVV1UFeX+9jxvtcHLTC
-0utFcZub4TJ/Ys8/FpxmhbxWRdE1JmEDcEYWyE1ubqWDFdRd9ziE8iI1BeIhnJE7
-OKQdEmlY/2mieGDRdAu/nIGzfybKHhht+IueIBan6nezjlG2DIUuFRPTnVPTTXAo
-itAbrueZ3jJK3KtHoqRkSoANHVvKSeKrFuXFk3o8/0gjK6XPkA1IMX/GSK7B0iXk
-tGpaAO25DWb/EpiBDv0QIJp36/tDzpMjYszsiPJTu4da0zmAnQIDAQABMA0GCSqG
-SIb3DQEBBAUAA4IBygAB6y6Da7AM88xoc+Uu/ZL/gsnRQ5/llUT81ZD5T1dx71Ds
-+edMamrtL0uf0zCRWc8hhkn91ut9MNl6XCEVjDSL4+mhlr+i4uJjeSy/xZ1gQYps
-G0NwX0jMrCLw+/sqbZUxvfueb466br8q/bT4838WAsMRnHj5uFu+9sehlL+VXVT/
-iM9otoQIuvBY3SRVL6OV0KPjZO2dv2hK9QB7ar6TRAdNgCda+Fnnx7O56Jg2cc3M
-1CEWJXC5SGCGmqkcBvfa5XJndiLB3J2Lix5WuSryvI+Z/vB/Pd2ppCNvP6NL45+6
-RwT6S+jAos/eQhoefid2ONZhdUfsd0i5uq8E3VZvDoDbpCmxhTcAJNWCVKtWvjBJ
-P5ZOUL4M0KED41xkL3L1jhc14SdqHgbftPtkVuvXEu436GtwHBGD6mKv19JxZm26
-9jxgUzXXW189mznS/jWq1sVfU5Vjt5rRkZWT2Rcnyr+1QHtUnWrcwbJQ4/qC5PaH
-TyEueSY43VvJHl+WtZOLtCxNj4kWDulEYy6xqRdargHclwk9awkAMbP6QKfRaPUK
-74ng3Rk9KuvN5hoQV5oeWUNlkHsxlxoJCJzF+V5ywxYNtoeIi3W7
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIE0zCCAvICAQAwDQYJKoZIhvcNAQEEBQAwZzELMAkGA1UEBhMCTFYxDzANBgNV
-BAgTBkxhdHZpYTENMAsGA1UEBxMEUmlnYTELMAkGA1UEChMCTFUxDjAMBgNVBAsT
-BUxBTkVUMRswGQYDVQQDExJsYWlmZS1pZHAubGFuZXQubHYwHhcNMTMwMzA2MTIz
-MTIwWhcNMjMwMzA0MTIzMTIwWjBnMQswCQYDVQQGEwJMVjEPMA0GA1UECBMGTGF0
-dmlhMQ0wCwYDVQQHEwRSaWdhMQswCQYDVQQKEwJMVTEOMAwGA1UECxMFTEFORVQx
-GzAZBgNVBAMTEmxhaWZlLWlkcC5sYW5ldC5sdjCCAeowDQYJKoZIhvcNAQEBBQAD
-ggHXADCCAdICggHJAqmEukkBNsZKvEyjT1GqHjnEEb3r3hV+rF8q5EVpq43ceFmY
-az+G4RzLatiYz36+3P+p7ygH8JJQS4N0tzvf+f++0HHNuwn3Ye9pPzbx9k0BwLxw
-/2In3G2qpmZILKO7O0a7g+RF9NGpyDg/h6Y3wuH/mKftYe3GGvHb0k9n1UK9nPKu
-BnY8DnxR/L6p/EK/PSAHDf+B8vqnym2gVeLa/3UUpH0Ael9mo+GUBcsvkRUrN/Wy
-QuHpB3TKVHH7I+gnLDholI+wIu+vHQ/Hhwe6pnq/ph1xoI/NZ4ffBvMDC/gVa/vA
-Qma4g4EvzujoeXJPKIYrKSQ1rmsHITLuHcas33vzsaPxlBVV1UFeX+9jxvtcHLTC
-0utFcZub4TJ/Ys8/FpxmhbxWRdE1JmEDcEYWyE1ubqWDFdRd9ziE8iI1BeIhnJE7
-OKQdEmlY/2mieGDRdAu/nIGzfybKHhht+IueIBan6nezjlG2DIUuFRPTnVPTTXAo
-itAbrueZ3jJK3KtHoqRkSoANHVvKSeKrFuXFk3o8/0gjK6XPkA1IMX/GSK7B0iXk
-tGpaAO25DWb/EpiBDv0QIJp36/tDzpMjYszsiPJTu4da0zmAnQIDAQABMA0GCSqG
-SIb3DQEBBAUAA4IBygAB6y6Da7AM88xoc+Uu/ZL/gsnRQ5/llUT81ZD5T1dx71Ds
-+edMamrtL0uf0zCRWc8hhkn91ut9MNl6XCEVjDSL4+mhlr+i4uJjeSy/xZ1gQYps
-G0NwX0jMrCLw+/sqbZUxvfueb466br8q/bT4838WAsMRnHj5uFu+9sehlL+VXVT/
-iM9otoQIuvBY3SRVL6OV0KPjZO2dv2hK9QB7ar6TRAdNgCda+Fnnx7O56Jg2cc3M
-1CEWJXC5SGCGmqkcBvfa5XJndiLB3J2Lix5WuSryvI+Z/vB/Pd2ppCNvP6NL45+6
-RwT6S+jAos/eQhoefid2ONZhdUfsd0i5uq8E3VZvDoDbpCmxhTcAJNWCVKtWvjBJ
-P5ZOUL4M0KED41xkL3L1jhc14SdqHgbftPtkVuvXEu436GtwHBGD6mKv19JxZm26
-9jxgUzXXW189mznS/jWq1sVfU5Vjt5rRkZWT2Rcnyr+1QHtUnWrcwbJQ4/qC5PaH
-TyEueSY43VvJHl+WtZOLtCxNj4kWDulEYy6xqRdargHclwk9awkAMbP6QKfRaPUK
-74ng3Rk9KuvN5hoQV5oeWUNlkHsxlxoJCJzF+V5ywxYNtoeIi3W7
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://laife-idp.lanet.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://laife-idp.lanet.lv/simplesaml/saml2/idp/SSOService.php"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">LAIFE</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Latvian Identity Federation - LAIFE IDP</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">https://laife.lanet.lv/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Administrator</SurName>
-    <EmailAddress>serviss@lanet.lv</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/laife.lanet.lv.xml b/swamid-interfederations-2.0/laife.lanet.lv.xml
deleted file mode 100644
index 2b17526e..00000000
--- a/swamid-interfederations-2.0/laife.lanet.lv.xml
+++ /dev/null
@@ -1,112 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://laife.lanet.lv/shibboleth">
-  <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: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://laife.lanet.lv/Shibboleth.sso/DS" index="1"/>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>*.lanet.lv</ds:KeyName>
-        <ds:KeyName>lanet.lv</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=*.lanet.lv,O=Latvijas Universitates,L=Riga,ST=Latvija,C=LV</ds:X509SubjectName>
-          <ds:X509Certificate>
-MIIFRzCCBC+gAwIBAgIHB+GeqBl7ejANBgkqhkiG9w0BAQUFADCByjELMAkGA1UE
-BhMCVVMxEDAOBgNVBAgTB0FyaXpvbmExEzARBgNVBAcTClNjb3R0c2RhbGUxGjAY
-BgNVBAoTEUdvRGFkZHkuY29tLCBJbmMuMTMwMQYDVQQLEypodHRwOi8vY2VydGlm
-aWNhdGVzLmdvZGFkZHkuY29tL3JlcG9zaXRvcnkxMDAuBgNVBAMTJ0dvIERhZGR5
-IFNlY3VyZSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTERMA8GA1UEBRMIMDc5Njky
-ODcwHhcNMTEwMzI4MTAxMTU2WhcNMTMwMzI4MTAxMTU2WjBNMRMwEQYDVQQKEwoq
-LmxhbmV0Lmx2MSEwHwYDVQQLExhEb21haW4gQ29udHJvbCBWYWxpZGF0ZWQxEzAR
-BgNVBAMTCioubGFuZXQubHYwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
-AQC3LZIGhNBAI//nDxhLKJ52JqavtYF3vIzSwOhauNnLO1iO4Jij0DtnxAQpNuIu
-ONYSU++MOb0lsjeIEy1tVrzkLAmPNedh5IkYVcK8GsraKdvE+DGpJKgpfuqaw4ZZ
-ZGvOhJ4ZjPYRWnuBQvxSmJ11Rp1IiiGqIbakD9nJ4n0/qDN/Jq8qpjpZGNRqbP/b
-M8CNlMges2MnGsYL8mxK+zwRIAAI81+rv+83ZBzns023hhPJ0i3/orq4yuYqZKHg
-KhUHIdDduFZ3RDjjZDdirzuxqBmXtctubejAh4amA4gepufJAJfhrNhzDQDjG/v/
-GsKxhOa3cI4IHHmJVZqdXAJLAgMBAAGjggGsMIIBqDAPBgNVHRMBAf8EBTADAQEA
-MB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAOBgNVHQ8BAf8EBAMCBaAw
-MwYDVR0fBCwwKjAooCagJIYiaHR0cDovL2NybC5nb2RhZGR5LmNvbS9nZHMxLTMy
-LmNybDBNBgNVHSAERjBEMEIGC2CGSAGG/W0BBxcBMDMwMQYIKwYBBQUHAgEWJWh0
-dHBzOi8vY2VydHMuZ29kYWRkeS5jb20vcmVwb3NpdG9yeS8wgYAGCCsGAQUFBwEB
-BHQwcjAkBggrBgEFBQcwAYYYaHR0cDovL29jc3AuZ29kYWRkeS5jb20vMEoGCCsG
-AQUFBzAChj5odHRwOi8vY2VydGlmaWNhdGVzLmdvZGFkZHkuY29tL3JlcG9zaXRv
-cnkvZ2RfaW50ZXJtZWRpYXRlLmNydDAfBgNVHSMEGDAWgBT9rGEyk2xF1uLuhV+a
-uud2mWjM5zAfBgNVHREEGDAWggoqLmxhbmV0Lmx2gghsYW5ldC5sdjAdBgNVHQ4E
-FgQUzDtQkvXpvhNmd7lv8O6i2cuyRWEwDQYJKoZIhvcNAQEFBQADggEBADv/h1KJ
-5LnLlUx1f5UCpG73ljveZ7mU/Crg+lW7C94Z122RYC93N8xAPlAldniOeicn1dKX
-SxozuQySgzudA2weBzmr+1W4XlUgeaO5xvHxYxe3oUs1UtDaxkhqp25hWG0yWvQ+
-Tr095u0Mrx2k3HzmYN/HkVsUkhhelrG8KVq7rta1CjZVfmt0WHVnGJz2hWPoTaPW
-cTJpk1aTGLektoLaF3PhDYLVo10KEaTokMf9kOsU9zRMVmndj7GTQVVn3S2Txtuq
-bONu6IdJ3rrnkFLTTg2AH72SjjozB2bz7zww6/9JfiqS4eTDGtl/17wlS1dSpC4R
-sn4gMvfrqL7d2Bc=
-         </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>*.lanet.lv</ds:KeyName>
-        <ds:KeyName>lanet.lv</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=*.lanet.lv,O=Latvijas Universitates,L=Riga,ST=Latvija,C=LV</ds:X509SubjectName>
-          <ds:X509Certificate>
-MIIFRzCCBC+gAwIBAgIHB+GeqBl7ejANBgkqhkiG9w0BAQUFADCByjELMAkGA1UE
-BhMCVVMxEDAOBgNVBAgTB0FyaXpvbmExEzARBgNVBAcTClNjb3R0c2RhbGUxGjAY
-BgNVBAoTEUdvRGFkZHkuY29tLCBJbmMuMTMwMQYDVQQLEypodHRwOi8vY2VydGlm
-aWNhdGVzLmdvZGFkZHkuY29tL3JlcG9zaXRvcnkxMDAuBgNVBAMTJ0dvIERhZGR5
-IFNlY3VyZSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTERMA8GA1UEBRMIMDc5Njky
-ODcwHhcNMTEwMzI4MTAxMTU2WhcNMTMwMzI4MTAxMTU2WjBNMRMwEQYDVQQKEwoq
-LmxhbmV0Lmx2MSEwHwYDVQQLExhEb21haW4gQ29udHJvbCBWYWxpZGF0ZWQxEzAR
-BgNVBAMTCioubGFuZXQubHYwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
-AQC3LZIGhNBAI//nDxhLKJ52JqavtYF3vIzSwOhauNnLO1iO4Jij0DtnxAQpNuIu
-ONYSU++MOb0lsjeIEy1tVrzkLAmPNedh5IkYVcK8GsraKdvE+DGpJKgpfuqaw4ZZ
-ZGvOhJ4ZjPYRWnuBQvxSmJ11Rp1IiiGqIbakD9nJ4n0/qDN/Jq8qpjpZGNRqbP/b
-M8CNlMges2MnGsYL8mxK+zwRIAAI81+rv+83ZBzns023hhPJ0i3/orq4yuYqZKHg
-KhUHIdDduFZ3RDjjZDdirzuxqBmXtctubejAh4amA4gepufJAJfhrNhzDQDjG/v/
-GsKxhOa3cI4IHHmJVZqdXAJLAgMBAAGjggGsMIIBqDAPBgNVHRMBAf8EBTADAQEA
-MB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAOBgNVHQ8BAf8EBAMCBaAw
-MwYDVR0fBCwwKjAooCagJIYiaHR0cDovL2NybC5nb2RhZGR5LmNvbS9nZHMxLTMy
-LmNybDBNBgNVHSAERjBEMEIGC2CGSAGG/W0BBxcBMDMwMQYIKwYBBQUHAgEWJWh0
-dHBzOi8vY2VydHMuZ29kYWRkeS5jb20vcmVwb3NpdG9yeS8wgYAGCCsGAQUFBwEB
-BHQwcjAkBggrBgEFBQcwAYYYaHR0cDovL29jc3AuZ29kYWRkeS5jb20vMEoGCCsG
-AQUFBzAChj5odHRwOi8vY2VydGlmaWNhdGVzLmdvZGFkZHkuY29tL3JlcG9zaXRv
-cnkvZ2RfaW50ZXJtZWRpYXRlLmNydDAfBgNVHSMEGDAWgBT9rGEyk2xF1uLuhV+a
-uud2mWjM5zAfBgNVHREEGDAWggoqLmxhbmV0Lmx2gghsYW5ldC5sdjAdBgNVHQ4E
-FgQUzDtQkvXpvhNmd7lv8O6i2cuyRWEwDQYJKoZIhvcNAQEFBQADggEBADv/h1KJ
-5LnLlUx1f5UCpG73ljveZ7mU/Crg+lW7C94Z122RYC93N8xAPlAldniOeicn1dKX
-SxozuQySgzudA2weBzmr+1W4XlUgeaO5xvHxYxe3oUs1UtDaxkhqp25hWG0yWvQ+
-Tr095u0Mrx2k3HzmYN/HkVsUkhhelrG8KVq7rta1CjZVfmt0WHVnGJz2hWPoTaPW
-cTJpk1aTGLektoLaF3PhDYLVo10KEaTokMf9kOsU9zRMVmndj7GTQVVn3S2Txtuq
-bONu6IdJ3rrnkFLTTg2AH72SjjozB2bz7zww6/9JfiqS4eTDGtl/17wlS1dSpC4R
-sn4gMvfrqL7d2Bc=
-         </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://laife.lanet.lv/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://laife.lanet.lv/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://laife.lanet.lv/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://laife.lanet.lv/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://laife.lanet.lv/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://laife.lanet.lv/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://laife.lanet.lv/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://laife.lanet.lv/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://laife.lanet.lv/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://laife.lanet.lv/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://laife.lanet.lv/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://laife.lanet.lv/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://laife.lanet.lv/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://laife.lanet.lv/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://laife.lanet.lv/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
-    <SurName>Administrator</SurName>
-    <EmailAddress>serviss@lanet.lv</EmailAddress>
-  </ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/lanet-idp.lanet.lv.xml b/swamid-interfederations-2.0/lanet-idp.lanet.lv.xml
deleted file mode 100644
index 1f2e1908..00000000
--- a/swamid-interfederations-2.0/lanet-idp.lanet.lv.xml
+++ /dev/null
@@ -1,41 +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://lanet-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/" registrationInstant="2013-10-10T10:10:10Z">
-      <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>
-MIIDhjCCAm4CCQC8Px9pbIuxGDANBgkqhkiG9w0BAQUFADCBhDELMAkGA1UEBhMCTFYxDTALBgNVBAgMBFJpZ2ExDTALBgNVBAcMBFJpZ2ExCzAJBgNVBAoMAkxVMQwwCgYDVQQLDANJVEQxFTATBgNVBAMMDGx1LWlkcC5sdS5sdjElMCMGCSqGSIb3DQEJARYWaXRzZXJ2aXNzIGF0IGx1IGRvdCBsdjAeFw0xMzEyMjAxMDU3MDJaFw0yOTAzMDYxMDU3MDJaMIGEMQswCQYDVQQGEwJMVjENMAsGA1UECAwEUmlnYTENMAsGA1UEBwwEUmlnYTELMAkGA1UECgwCTFUxDDAKBgNVBAsMA0lURDEVMBMGA1UEAwwMbHUtaWRwLmx1Lmx2MSUwIwYJKoZIhvcNAQkBFhZpdHNlcnZpc3MgYXQgbHUgZG90IGx2MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuAy8ri5VknGxy21iuW6kalPwg7VPZBWOuV/jVjRre44tHFd5FinCQUCuzQZn37AU3ZNZg07RRyDhkAzzpsBRQf48VcbnQFRjERuQTKUfT9hzFMxgbjxW2Dayg2Ru2LkGcIUeHilOwfmRn1NIRBN+0UyJIluRvB8YGdHSSHYSMimyw9uYEuMkU9aqewwW78w7TeasCWlB6jiGfJ/SGVtPRThJ6X6KVqoU2gwIY+V7YJkG4b5TOw4HLaIsdOmU4h1Ep3igy+Zsc/7zPn+80iwm1Jk9Q8zGlEwikjPn1N3enMOxR8wpQfAQwm5lIaHNXYFcXCj3mVQ3yQ9EzB/hRC8tHwIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQCFRpI7U/lTwoUW/HwDb2gAmjb0RSmS+5lUWDgmjP/rJwYdh672plabNcY12DiqchtBaSeTOf4qANCqEme+YBAmssFUeLx6O1J+5aXeXfCwAA9GlswGDVeC8ZnTVmQupnbvL0T+ZU8WtkltlLEJdD6o9BtEOqk3+Rspu+94d6FUwmvWB/YWypAOfzXkkSxi+87nsadiFEOyCzTW8fZotOrZMzba52ELLJgCx3IzGLUzV80PSJwLzKYHVp0VluH2DzrxfMKC01bMklG46n1nhEo1UU2KA4vzoScmrXzD+m7nKFZ3GHFjyQvtxqG7gA34qg1Vj2o2O0vN/kvjX73SR5s4
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDhjCCAm4CCQC8Px9pbIuxGDANBgkqhkiG9w0BAQUFADCBhDELMAkGA1UEBhMCTFYxDTALBgNVBAgMBFJpZ2ExDTALBgNVBAcMBFJpZ2ExCzAJBgNVBAoMAkxVMQwwCgYDVQQLDANJVEQxFTATBgNVBAMMDGx1LWlkcC5sdS5sdjElMCMGCSqGSIb3DQEJARYWaXRzZXJ2aXNzIGF0IGx1IGRvdCBsdjAeFw0xMzEyMjAxMDU3MDJaFw0yOTAzMDYxMDU3MDJaMIGEMQswCQYDVQQGEwJMVjENMAsGA1UECAwEUmlnYTENMAsGA1UEBwwEUmlnYTELMAkGA1UECgwCTFUxDDAKBgNVBAsMA0lURDEVMBMGA1UEAwwMbHUtaWRwLmx1Lmx2MSUwIwYJKoZIhvcNAQkBFhZpdHNlcnZpc3MgYXQgbHUgZG90IGx2MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuAy8ri5VknGxy21iuW6kalPwg7VPZBWOuV/jVjRre44tHFd5FinCQUCuzQZn37AU3ZNZg07RRyDhkAzzpsBRQf48VcbnQFRjERuQTKUfT9hzFMxgbjxW2Dayg2Ru2LkGcIUeHilOwfmRn1NIRBN+0UyJIluRvB8YGdHSSHYSMimyw9uYEuMkU9aqewwW78w7TeasCWlB6jiGfJ/SGVtPRThJ6X6KVqoU2gwIY+V7YJkG4b5TOw4HLaIsdOmU4h1Ep3igy+Zsc/7zPn+80iwm1Jk9Q8zGlEwikjPn1N3enMOxR8wpQfAQwm5lIaHNXYFcXCj3mVQ3yQ9EzB/hRC8tHwIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQCFRpI7U/lTwoUW/HwDb2gAmjb0RSmS+5lUWDgmjP/rJwYdh672plabNcY12DiqchtBaSeTOf4qANCqEme+YBAmssFUeLx6O1J+5aXeXfCwAA9GlswGDVeC8ZnTVmQupnbvL0T+ZU8WtkltlLEJdD6o9BtEOqk3+Rspu+94d6FUwmvWB/YWypAOfzXkkSxi+87nsadiFEOyCzTW8fZotOrZMzba52ELLJgCx3IzGLUzV80PSJwLzKYHVp0VluH2DzrxfMKC01bMklG46n1nhEo1UU2KA4vzoScmrXzD+m7nKFZ3GHFjyQvtxqG7gA34qg1Vj2o2O0vN/kvjX73SR5s4
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://lanet-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://lanet-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 - LANET</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">LANET - LANET IDP</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://laife.lanet.lv/</OrganizationURL>
-    <OrganizationURL xml:lang="lv">http://www.lanet.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/ldap-dariah.esc.rzg.mpg.de-idp-shibboleth.xml b/swamid-interfederations-2.0/ldap-dariah.esc.rzg.mpg.de-idp-shibboleth.xml
deleted file mode 100644
index 940abc60..00000000
--- a/swamid-interfederations-2.0/ldap-dariah.esc.rzg.mpg.de-idp-shibboleth.xml
+++ /dev/null
@@ -1,139 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ldap-dariah.esc.rzg.mpg.de/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2014-04-11T07:17:38Z">
-      <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">dariah.eu</saml1md:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="de">DARIAH</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">DARIAH</mdui:DisplayName>
-        <mdui:Description xml:lang="de">DARIAH Homeless IdP</mdui:Description>
-        <mdui:Description xml:lang="en">DARIAH Homeless IdP</mdui:Description>
-        <mdui:Logo height="16" width="16">https://ldap-dariah.esc.rzg.mpg.de/images/DARIAH_flower_icon.png</mdui:Logo>
-        <mdui:Logo height="154" width="160">https://ldap-dariah.esc.rzg.mpg.de/images/DARIAH_flower.png</mdui:Logo>
-        <mdui:InformationURL xml:lang="de">http://www.dariah.eu/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">http://www.dariah.eu/</mdui:InformationURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>ldap-dariah.esc.rzg.mpg.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=ldap-dariah.esc.rzg.mpg.de,OU=Rechenzentrum Garching (RZG),O=Max-Planck-Gesellschaft,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFEDCCA/igAwIBAgIHEy5eQihwbDANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQG
-EwJERTEgMB4GA1UEChMXTWF4LVBsYW5jay1HZXNlbGxzY2hhZnQxDzANBgNVBAMT
-Bk1QRyBDQTEcMBoGCSqGSIb3DQEJARYNbXBnLWNhQG1wZy5kZTAeFw0xMjAxMTIx
-MzMxMzFaFw0xNzAxMTAxMzMxMzFaMHsxCzAJBgNVBAYTAkRFMSAwHgYDVQQKExdN
-YXgtUGxhbmNrLUdlc2VsbHNjaGFmdDElMCMGA1UECxMcUmVjaGVuemVudHJ1bSBH
-YXJjaGluZyAoUlpHKTEjMCEGA1UEAxMabGRhcC1kYXJpYWguZXNjLnJ6Zy5tcGcu
-ZGUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDbyc9BVBglxQEt8MmI
-cbf3GKqCdQADGnnNXAwx9gjq5mQI2+VNGcBk8aq24p5a++hlemue+6P6RQONiv5z
-sAXlIZb6MuGOcF6gOUqRijMuWW1OueysiO4F5ODOJ8TaGSjWytCSQ28cpJbc7wWo
-mnlZxL6NvVyRiDCJuUfDyIW8ICgk7Aw1K0UdpJXeVzFUiBtTIM7Ira80o3yeLDhi
-DDPc+swDZA9syWvn8/W57kN0/vtUYKzGs6Ae+uRxahSfNg/kx1Rnv0sUln1hgUHh
-VuiKqu1MlAIcckNt00Ck/v7LQV98KJJx+rWWPV1F09a6vPEAesEY+GnJQkwAzh/O
-xiTjAgMBAAGjggG0MIIBsDAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUE
-FjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwHQYDVR0OBBYEFEnnIPu9e2M7ABKF66CA
-uTWv1Jf8MB8GA1UdIwQYMBaAFALWHm4Jq79YZacKPEgzYdHOfcNbMCkGA1UdEQQi
-MCCBHnNlcnZlci1jZXJ0aWZpY2F0ZXNAcnpnLm1wZy5kZTB3BgNVHR8EcDBuMDWg
-M6Axhi9odHRwOi8vY2RwMS5wY2EuZGZuLmRlL21wZy1jYS9wdWIvY3JsL2NhY3Js
-LmNybDA1oDOgMYYvaHR0cDovL2NkcDIucGNhLmRmbi5kZS9tcGctY2EvcHViL2Ny
-bC9jYWNybC5jcmwwgZIGCCsGAQUFBwEBBIGFMIGCMD8GCCsGAQUFBzAChjNodHRw
-Oi8vY2RwMS5wY2EuZGZuLmRlL21wZy1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQw
-PwYIKwYBBQUHMAKGM2h0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvbXBnLWNhL3B1Yi9j
-YWNlcnQvY2FjZXJ0LmNydDANBgkqhkiG9w0BAQUFAAOCAQEAxDSpJ7Mn2hmiyDzK
-VVtARi1U9EvfTcSIWZFanc1xn9DaFI8s3c6vnEB7+BL/HMbAwnDauWjUPoNzc5I2
-TeH5IjX8MGDjEh7TyNyycWRNJ88ah0LtQoaCgXc0vpTtXZzGelh0A25Hw80sHKa1
-xY4iDAPYwaPY+kFxxAGyeAL9M4q9Z39t6ZIoze+lQm0sxQ3eTvQUPwukAeI9xOzb
-KsbO/Q7VBdzaH75dVrc+dSQqXy1bOQUAext9foXlso8ECt0b1vQVdspe5tQ1+y3u
-aDG4T0gWjN5P3enk6TN3v4V9UaBA4J1DkBCxC/RNFnNZc22GqQ1Bbf9rKXjyXECp
-q1AZvg==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://ldap-dariah.esc.rzg.mpg.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ldap-dariah.esc.rzg.mpg.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://ldap-dariah.esc.rzg.mpg.de/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ldap-dariah.esc.rzg.mpg.de/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ldap-dariah.esc.rzg.mpg.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ldap-dariah.esc.rzg.mpg.de/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ldap-dariah.esc.rzg.mpg.de/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>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">dariah.eu</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>ldap-dariah.esc.rzg.mpg.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=ldap-dariah.esc.rzg.mpg.de,OU=Rechenzentrum Garching (RZG),O=Max-Planck-Gesellschaft,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFEDCCA/igAwIBAgIHEy5eQihwbDANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQG
-EwJERTEgMB4GA1UEChMXTWF4LVBsYW5jay1HZXNlbGxzY2hhZnQxDzANBgNVBAMT
-Bk1QRyBDQTEcMBoGCSqGSIb3DQEJARYNbXBnLWNhQG1wZy5kZTAeFw0xMjAxMTIx
-MzMxMzFaFw0xNzAxMTAxMzMxMzFaMHsxCzAJBgNVBAYTAkRFMSAwHgYDVQQKExdN
-YXgtUGxhbmNrLUdlc2VsbHNjaGFmdDElMCMGA1UECxMcUmVjaGVuemVudHJ1bSBH
-YXJjaGluZyAoUlpHKTEjMCEGA1UEAxMabGRhcC1kYXJpYWguZXNjLnJ6Zy5tcGcu
-ZGUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDbyc9BVBglxQEt8MmI
-cbf3GKqCdQADGnnNXAwx9gjq5mQI2+VNGcBk8aq24p5a++hlemue+6P6RQONiv5z
-sAXlIZb6MuGOcF6gOUqRijMuWW1OueysiO4F5ODOJ8TaGSjWytCSQ28cpJbc7wWo
-mnlZxL6NvVyRiDCJuUfDyIW8ICgk7Aw1K0UdpJXeVzFUiBtTIM7Ira80o3yeLDhi
-DDPc+swDZA9syWvn8/W57kN0/vtUYKzGs6Ae+uRxahSfNg/kx1Rnv0sUln1hgUHh
-VuiKqu1MlAIcckNt00Ck/v7LQV98KJJx+rWWPV1F09a6vPEAesEY+GnJQkwAzh/O
-xiTjAgMBAAGjggG0MIIBsDAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUE
-FjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwHQYDVR0OBBYEFEnnIPu9e2M7ABKF66CA
-uTWv1Jf8MB8GA1UdIwQYMBaAFALWHm4Jq79YZacKPEgzYdHOfcNbMCkGA1UdEQQi
-MCCBHnNlcnZlci1jZXJ0aWZpY2F0ZXNAcnpnLm1wZy5kZTB3BgNVHR8EcDBuMDWg
-M6Axhi9odHRwOi8vY2RwMS5wY2EuZGZuLmRlL21wZy1jYS9wdWIvY3JsL2NhY3Js
-LmNybDA1oDOgMYYvaHR0cDovL2NkcDIucGNhLmRmbi5kZS9tcGctY2EvcHViL2Ny
-bC9jYWNybC5jcmwwgZIGCCsGAQUFBwEBBIGFMIGCMD8GCCsGAQUFBzAChjNodHRw
-Oi8vY2RwMS5wY2EuZGZuLmRlL21wZy1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQw
-PwYIKwYBBQUHMAKGM2h0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvbXBnLWNhL3B1Yi9j
-YWNlcnQvY2FjZXJ0LmNydDANBgkqhkiG9w0BAQUFAAOCAQEAxDSpJ7Mn2hmiyDzK
-VVtARi1U9EvfTcSIWZFanc1xn9DaFI8s3c6vnEB7+BL/HMbAwnDauWjUPoNzc5I2
-TeH5IjX8MGDjEh7TyNyycWRNJ88ah0LtQoaCgXc0vpTtXZzGelh0A25Hw80sHKa1
-xY4iDAPYwaPY+kFxxAGyeAL9M4q9Z39t6ZIoze+lQm0sxQ3eTvQUPwukAeI9xOzb
-KsbO/Q7VBdzaH75dVrc+dSQqXy1bOQUAext9foXlso8ECt0b1vQVdspe5tQ1+y3u
-aDG4T0gWjN5P3enk6TN3v4V9UaBA4J1DkBCxC/RNFnNZc22GqQ1Bbf9rKXjyXECp
-q1AZvg==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://ldap-dariah.esc.rzg.mpg.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ldap-dariah.esc.rzg.mpg.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">e112</OrganizationName>
-    <OrganizationName xml:lang="en">e112</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">Gesellschaft für wissenschaftliche Datenverarbeitung mbH</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">Gesellschaft für wissenschaftliche Datenverarbeitung mbH</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.gwdg.de</OrganizationURL>
-    <OrganizationURL xml:lang="en">http://www.gwdg.de</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Martin</GivenName>
-    <SurName>Haase</SurName>
-    <EmailAddress>mailto:martin.haase@daasi.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="administrative">
-    <GivenName>Peter</GivenName>
-    <SurName>Gietz</SurName>
-    <EmailAddress>mailto:peter.gietz@daasi.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="support">
-    <GivenName>DARIAH</GivenName>
-    <SurName>Support</SurName>
-    <EmailAddress>mailto:info@de.dariah.eu</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/ldap-dariah.esc.rzg.mpg.de.xml b/swamid-interfederations-2.0/ldap-dariah.esc.rzg.mpg.de.xml
deleted file mode 100644
index 940abc60..00000000
--- a/swamid-interfederations-2.0/ldap-dariah.esc.rzg.mpg.de.xml
+++ /dev/null
@@ -1,139 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ldap-dariah.esc.rzg.mpg.de/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2014-04-11T07:17:38Z">
-      <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">dariah.eu</saml1md:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="de">DARIAH</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">DARIAH</mdui:DisplayName>
-        <mdui:Description xml:lang="de">DARIAH Homeless IdP</mdui:Description>
-        <mdui:Description xml:lang="en">DARIAH Homeless IdP</mdui:Description>
-        <mdui:Logo height="16" width="16">https://ldap-dariah.esc.rzg.mpg.de/images/DARIAH_flower_icon.png</mdui:Logo>
-        <mdui:Logo height="154" width="160">https://ldap-dariah.esc.rzg.mpg.de/images/DARIAH_flower.png</mdui:Logo>
-        <mdui:InformationURL xml:lang="de">http://www.dariah.eu/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">http://www.dariah.eu/</mdui:InformationURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>ldap-dariah.esc.rzg.mpg.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=ldap-dariah.esc.rzg.mpg.de,OU=Rechenzentrum Garching (RZG),O=Max-Planck-Gesellschaft,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFEDCCA/igAwIBAgIHEy5eQihwbDANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQG
-EwJERTEgMB4GA1UEChMXTWF4LVBsYW5jay1HZXNlbGxzY2hhZnQxDzANBgNVBAMT
-Bk1QRyBDQTEcMBoGCSqGSIb3DQEJARYNbXBnLWNhQG1wZy5kZTAeFw0xMjAxMTIx
-MzMxMzFaFw0xNzAxMTAxMzMxMzFaMHsxCzAJBgNVBAYTAkRFMSAwHgYDVQQKExdN
-YXgtUGxhbmNrLUdlc2VsbHNjaGFmdDElMCMGA1UECxMcUmVjaGVuemVudHJ1bSBH
-YXJjaGluZyAoUlpHKTEjMCEGA1UEAxMabGRhcC1kYXJpYWguZXNjLnJ6Zy5tcGcu
-ZGUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDbyc9BVBglxQEt8MmI
-cbf3GKqCdQADGnnNXAwx9gjq5mQI2+VNGcBk8aq24p5a++hlemue+6P6RQONiv5z
-sAXlIZb6MuGOcF6gOUqRijMuWW1OueysiO4F5ODOJ8TaGSjWytCSQ28cpJbc7wWo
-mnlZxL6NvVyRiDCJuUfDyIW8ICgk7Aw1K0UdpJXeVzFUiBtTIM7Ira80o3yeLDhi
-DDPc+swDZA9syWvn8/W57kN0/vtUYKzGs6Ae+uRxahSfNg/kx1Rnv0sUln1hgUHh
-VuiKqu1MlAIcckNt00Ck/v7LQV98KJJx+rWWPV1F09a6vPEAesEY+GnJQkwAzh/O
-xiTjAgMBAAGjggG0MIIBsDAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUE
-FjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwHQYDVR0OBBYEFEnnIPu9e2M7ABKF66CA
-uTWv1Jf8MB8GA1UdIwQYMBaAFALWHm4Jq79YZacKPEgzYdHOfcNbMCkGA1UdEQQi
-MCCBHnNlcnZlci1jZXJ0aWZpY2F0ZXNAcnpnLm1wZy5kZTB3BgNVHR8EcDBuMDWg
-M6Axhi9odHRwOi8vY2RwMS5wY2EuZGZuLmRlL21wZy1jYS9wdWIvY3JsL2NhY3Js
-LmNybDA1oDOgMYYvaHR0cDovL2NkcDIucGNhLmRmbi5kZS9tcGctY2EvcHViL2Ny
-bC9jYWNybC5jcmwwgZIGCCsGAQUFBwEBBIGFMIGCMD8GCCsGAQUFBzAChjNodHRw
-Oi8vY2RwMS5wY2EuZGZuLmRlL21wZy1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQw
-PwYIKwYBBQUHMAKGM2h0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvbXBnLWNhL3B1Yi9j
-YWNlcnQvY2FjZXJ0LmNydDANBgkqhkiG9w0BAQUFAAOCAQEAxDSpJ7Mn2hmiyDzK
-VVtARi1U9EvfTcSIWZFanc1xn9DaFI8s3c6vnEB7+BL/HMbAwnDauWjUPoNzc5I2
-TeH5IjX8MGDjEh7TyNyycWRNJ88ah0LtQoaCgXc0vpTtXZzGelh0A25Hw80sHKa1
-xY4iDAPYwaPY+kFxxAGyeAL9M4q9Z39t6ZIoze+lQm0sxQ3eTvQUPwukAeI9xOzb
-KsbO/Q7VBdzaH75dVrc+dSQqXy1bOQUAext9foXlso8ECt0b1vQVdspe5tQ1+y3u
-aDG4T0gWjN5P3enk6TN3v4V9UaBA4J1DkBCxC/RNFnNZc22GqQ1Bbf9rKXjyXECp
-q1AZvg==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://ldap-dariah.esc.rzg.mpg.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ldap-dariah.esc.rzg.mpg.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://ldap-dariah.esc.rzg.mpg.de/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ldap-dariah.esc.rzg.mpg.de/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ldap-dariah.esc.rzg.mpg.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ldap-dariah.esc.rzg.mpg.de/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ldap-dariah.esc.rzg.mpg.de/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>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">dariah.eu</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>ldap-dariah.esc.rzg.mpg.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=ldap-dariah.esc.rzg.mpg.de,OU=Rechenzentrum Garching (RZG),O=Max-Planck-Gesellschaft,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFEDCCA/igAwIBAgIHEy5eQihwbDANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQG
-EwJERTEgMB4GA1UEChMXTWF4LVBsYW5jay1HZXNlbGxzY2hhZnQxDzANBgNVBAMT
-Bk1QRyBDQTEcMBoGCSqGSIb3DQEJARYNbXBnLWNhQG1wZy5kZTAeFw0xMjAxMTIx
-MzMxMzFaFw0xNzAxMTAxMzMxMzFaMHsxCzAJBgNVBAYTAkRFMSAwHgYDVQQKExdN
-YXgtUGxhbmNrLUdlc2VsbHNjaGFmdDElMCMGA1UECxMcUmVjaGVuemVudHJ1bSBH
-YXJjaGluZyAoUlpHKTEjMCEGA1UEAxMabGRhcC1kYXJpYWguZXNjLnJ6Zy5tcGcu
-ZGUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDbyc9BVBglxQEt8MmI
-cbf3GKqCdQADGnnNXAwx9gjq5mQI2+VNGcBk8aq24p5a++hlemue+6P6RQONiv5z
-sAXlIZb6MuGOcF6gOUqRijMuWW1OueysiO4F5ODOJ8TaGSjWytCSQ28cpJbc7wWo
-mnlZxL6NvVyRiDCJuUfDyIW8ICgk7Aw1K0UdpJXeVzFUiBtTIM7Ira80o3yeLDhi
-DDPc+swDZA9syWvn8/W57kN0/vtUYKzGs6Ae+uRxahSfNg/kx1Rnv0sUln1hgUHh
-VuiKqu1MlAIcckNt00Ck/v7LQV98KJJx+rWWPV1F09a6vPEAesEY+GnJQkwAzh/O
-xiTjAgMBAAGjggG0MIIBsDAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUE
-FjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwHQYDVR0OBBYEFEnnIPu9e2M7ABKF66CA
-uTWv1Jf8MB8GA1UdIwQYMBaAFALWHm4Jq79YZacKPEgzYdHOfcNbMCkGA1UdEQQi
-MCCBHnNlcnZlci1jZXJ0aWZpY2F0ZXNAcnpnLm1wZy5kZTB3BgNVHR8EcDBuMDWg
-M6Axhi9odHRwOi8vY2RwMS5wY2EuZGZuLmRlL21wZy1jYS9wdWIvY3JsL2NhY3Js
-LmNybDA1oDOgMYYvaHR0cDovL2NkcDIucGNhLmRmbi5kZS9tcGctY2EvcHViL2Ny
-bC9jYWNybC5jcmwwgZIGCCsGAQUFBwEBBIGFMIGCMD8GCCsGAQUFBzAChjNodHRw
-Oi8vY2RwMS5wY2EuZGZuLmRlL21wZy1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQw
-PwYIKwYBBQUHMAKGM2h0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvbXBnLWNhL3B1Yi9j
-YWNlcnQvY2FjZXJ0LmNydDANBgkqhkiG9w0BAQUFAAOCAQEAxDSpJ7Mn2hmiyDzK
-VVtARi1U9EvfTcSIWZFanc1xn9DaFI8s3c6vnEB7+BL/HMbAwnDauWjUPoNzc5I2
-TeH5IjX8MGDjEh7TyNyycWRNJ88ah0LtQoaCgXc0vpTtXZzGelh0A25Hw80sHKa1
-xY4iDAPYwaPY+kFxxAGyeAL9M4q9Z39t6ZIoze+lQm0sxQ3eTvQUPwukAeI9xOzb
-KsbO/Q7VBdzaH75dVrc+dSQqXy1bOQUAext9foXlso8ECt0b1vQVdspe5tQ1+y3u
-aDG4T0gWjN5P3enk6TN3v4V9UaBA4J1DkBCxC/RNFnNZc22GqQ1Bbf9rKXjyXECp
-q1AZvg==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://ldap-dariah.esc.rzg.mpg.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ldap-dariah.esc.rzg.mpg.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">e112</OrganizationName>
-    <OrganizationName xml:lang="en">e112</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">Gesellschaft für wissenschaftliche Datenverarbeitung mbH</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">Gesellschaft für wissenschaftliche Datenverarbeitung mbH</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.gwdg.de</OrganizationURL>
-    <OrganizationURL xml:lang="en">http://www.gwdg.de</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Martin</GivenName>
-    <SurName>Haase</SurName>
-    <EmailAddress>mailto:martin.haase@daasi.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="administrative">
-    <GivenName>Peter</GivenName>
-    <SurName>Gietz</SurName>
-    <EmailAddress>mailto:peter.gietz@daasi.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="support">
-    <GivenName>DARIAH</GivenName>
-    <SurName>Support</SurName>
-    <EmailAddress>mailto:info@de.dariah.eu</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/liepu-idp.lanet.lv.xml b/swamid-interfederations-2.0/liepu-idp.lanet.lv.xml
deleted file mode 100644
index f5f41b20..00000000
--- a/swamid-interfederations-2.0/liepu-idp.lanet.lv.xml
+++ /dev/null
@@ -1,41 +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://liepu-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/" registrationInstant="2013-10-10T10:10:10Z">
-      <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>
-MIIDhjCCAm4CCQC8Px9pbIuxGDANBgkqhkiG9w0BAQUFADCBhDELMAkGA1UEBhMCTFYxDTALBgNVBAgMBFJpZ2ExDTALBgNVBAcMBFJpZ2ExCzAJBgNVBAoMAkxVMQwwCgYDVQQLDANJVEQxFTATBgNVBAMMDGx1LWlkcC5sdS5sdjElMCMGCSqGSIb3DQEJARYWaXRzZXJ2aXNzIGF0IGx1IGRvdCBsdjAeFw0xMzEyMjAxMDU3MDJaFw0yOTAzMDYxMDU3MDJaMIGEMQswCQYDVQQGEwJMVjENMAsGA1UECAwEUmlnYTENMAsGA1UEBwwEUmlnYTELMAkGA1UECgwCTFUxDDAKBgNVBAsMA0lURDEVMBMGA1UEAwwMbHUtaWRwLmx1Lmx2MSUwIwYJKoZIhvcNAQkBFhZpdHNlcnZpc3MgYXQgbHUgZG90IGx2MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuAy8ri5VknGxy21iuW6kalPwg7VPZBWOuV/jVjRre44tHFd5FinCQUCuzQZn37AU3ZNZg07RRyDhkAzzpsBRQf48VcbnQFRjERuQTKUfT9hzFMxgbjxW2Dayg2Ru2LkGcIUeHilOwfmRn1NIRBN+0UyJIluRvB8YGdHSSHYSMimyw9uYEuMkU9aqewwW78w7TeasCWlB6jiGfJ/SGVtPRThJ6X6KVqoU2gwIY+V7YJkG4b5TOw4HLaIsdOmU4h1Ep3igy+Zsc/7zPn+80iwm1Jk9Q8zGlEwikjPn1N3enMOxR8wpQfAQwm5lIaHNXYFcXCj3mVQ3yQ9EzB/hRC8tHwIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQCFRpI7U/lTwoUW/HwDb2gAmjb0RSmS+5lUWDgmjP/rJwYdh672plabNcY12DiqchtBaSeTOf4qANCqEme+YBAmssFUeLx6O1J+5aXeXfCwAA9GlswGDVeC8ZnTVmQupnbvL0T+ZU8WtkltlLEJdD6o9BtEOqk3+Rspu+94d6FUwmvWB/YWypAOfzXkkSxi+87nsadiFEOyCzTW8fZotOrZMzba52ELLJgCx3IzGLUzV80PSJwLzKYHVp0VluH2DzrxfMKC01bMklG46n1nhEo1UU2KA4vzoScmrXzD+m7nKFZ3GHFjyQvtxqG7gA34qg1Vj2o2O0vN/kvjX73SR5s4
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDhjCCAm4CCQC8Px9pbIuxGDANBgkqhkiG9w0BAQUFADCBhDELMAkGA1UEBhMCTFYxDTALBgNVBAgMBFJpZ2ExDTALBgNVBAcMBFJpZ2ExCzAJBgNVBAoMAkxVMQwwCgYDVQQLDANJVEQxFTATBgNVBAMMDGx1LWlkcC5sdS5sdjElMCMGCSqGSIb3DQEJARYWaXRzZXJ2aXNzIGF0IGx1IGRvdCBsdjAeFw0xMzEyMjAxMDU3MDJaFw0yOTAzMDYxMDU3MDJaMIGEMQswCQYDVQQGEwJMVjENMAsGA1UECAwEUmlnYTENMAsGA1UEBwwEUmlnYTELMAkGA1UECgwCTFUxDDAKBgNVBAsMA0lURDEVMBMGA1UEAwwMbHUtaWRwLmx1Lmx2MSUwIwYJKoZIhvcNAQkBFhZpdHNlcnZpc3MgYXQgbHUgZG90IGx2MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuAy8ri5VknGxy21iuW6kalPwg7VPZBWOuV/jVjRre44tHFd5FinCQUCuzQZn37AU3ZNZg07RRyDhkAzzpsBRQf48VcbnQFRjERuQTKUfT9hzFMxgbjxW2Dayg2Ru2LkGcIUeHilOwfmRn1NIRBN+0UyJIluRvB8YGdHSSHYSMimyw9uYEuMkU9aqewwW78w7TeasCWlB6jiGfJ/SGVtPRThJ6X6KVqoU2gwIY+V7YJkG4b5TOw4HLaIsdOmU4h1Ep3igy+Zsc/7zPn+80iwm1Jk9Q8zGlEwikjPn1N3enMOxR8wpQfAQwm5lIaHNXYFcXCj3mVQ3yQ9EzB/hRC8tHwIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQCFRpI7U/lTwoUW/HwDb2gAmjb0RSmS+5lUWDgmjP/rJwYdh672plabNcY12DiqchtBaSeTOf4qANCqEme+YBAmssFUeLx6O1J+5aXeXfCwAA9GlswGDVeC8ZnTVmQupnbvL0T+ZU8WtkltlLEJdD6o9BtEOqk3+Rspu+94d6FUwmvWB/YWypAOfzXkkSxi+87nsadiFEOyCzTW8fZotOrZMzba52ELLJgCx3IzGLUzV80PSJwLzKYHVp0VluH2DzrxfMKC01bMklG46n1nhEo1UU2KA4vzoScmrXzD+m7nKFZ3GHFjyQvtxqG7gA34qg1Vj2o2O0vN/kvjX73SR5s4
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://liepu-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://liepu-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 - LIEPU</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Liepaja University - LIEPU IDP</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://laife.lanet.lv/</OrganizationURL>
-    <OrganizationURL xml:lang="lv">http://www.liepu.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/lists.geant.net.xml b/swamid-interfederations-2.0/lists.geant.net.xml
deleted file mode 100644
index 4aa3bb94..00000000
--- a/swamid-interfederations-2.0/lists.geant.net.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://lists.geant.net">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2014-05-27T17:24:47Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</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: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">Geant test mailing list service</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Dante test groupware service. This service offers mailing lists along with other collaborative tools linked to these lists (wiki, surveys)</mdui:Description>
-        <mdui:DisplayName xml:lang="fr">Service de listes de test de Geant</mdui:DisplayName>
-        <mdui:Description xml:lang="fr">Service de groupware de test Geant. Ce service offre des listes de diffusion ainsi que des outils de travail collaboratif couplés aux listes (wikis, sondages).</mdui:Description>
-        <mdui:PrivacyStatementURL xml:lang="en">https://lists.geant.net/coc.html</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIC+jCCAeKgAwIBAgIJAJ91D96cmmSLMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNV
-BAMTEXZpc2hudS5yZW5hdGVyLmZyMB4XDTE0MDIyMTIyNDM0MFoXDTI0MDIxOTIy
-NDM0MFowHDEaMBgGA1UEAxMRdmlzaG51LnJlbmF0ZXIuZnIwggEiMA0GCSqGSIb3
-DQEBAQUAA4IBDwAwggEKAoIBAQC6Au7wJo96snIMRI96gF4vNkIBCMni4sxYfVmC
-sm+s0Dvnzjuxv0GfZOZrw7VTMrucqNzh0XWHIsdoLtqBg0ZHXRlRraGsEs22cm+w
-CbU0P+vJAT6EgJ2O1IJ9vdrlnFF/KsFuh0wJ3n/DLXnn9pdb9zHW8wUu1LZGEPHs
-WIpQTnWxm6b2FiPfQV6kJRjXgjwQ5LnbirUmSRfjZ/MD166k1/XhKXjtKikP/chF
-sC/3+s8CsNB/3Et/NzJKIpLBXjFdrj5R92zV2r9l5LusQe8YzTP8sjAGKadex8XM
-WdlydXTpMaIqAGZ1D3MJ8W8TSU7k4AS1zh2ldBgesq6bwI49AgMBAAGjPzA9MBwG
-A1UdEQQVMBOCEXZpc2hudS5yZW5hdGVyLmZyMB0GA1UdDgQWBBQ3YVGlQFn0dZcJ
-6z0TrciC5+NrIzANBgkqhkiG9w0BAQUFAAOCAQEAUBfBHUpO/03/rkQJiEaoA8xO
-M15wkTwW8q4/UaFlGCHmp+RZyAQW6kwqB4TL7Ej3x/5x551s2qYtstXEPawcNFH7
-s0MdoBzjVldZr1Oo5YbWeqwx6YeBDefRC/uJCeR8XI/tGqHGgj8Jc2cQrT5QhfcT
-ogYCLtavzhT8gPNua7eXnnu0L3T1WQf3Kf0a/IH8iLx6Au7NtaU1hIIi5MR0kVgw
-KkfYgt3iGMMwEHsN1ZHP+aFm/WkR6KJm9R3RUN9MjYoRzVf+Wq7jM9IKaf3vojD2
-qgV795zB+j+dGdmy9+EWyV60D6os+Q+eI4XUsZ5qxDUTRIM1ikBFwRcyju86qg==
-					    </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>
-					      MIIC+jCCAeKgAwIBAgIJAJ91D96cmmSLMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNV
-BAMTEXZpc2hudS5yZW5hdGVyLmZyMB4XDTE0MDIyMTIyNDM0MFoXDTI0MDIxOTIy
-NDM0MFowHDEaMBgGA1UEAxMRdmlzaG51LnJlbmF0ZXIuZnIwggEiMA0GCSqGSIb3
-DQEBAQUAA4IBDwAwggEKAoIBAQC6Au7wJo96snIMRI96gF4vNkIBCMni4sxYfVmC
-sm+s0Dvnzjuxv0GfZOZrw7VTMrucqNzh0XWHIsdoLtqBg0ZHXRlRraGsEs22cm+w
-CbU0P+vJAT6EgJ2O1IJ9vdrlnFF/KsFuh0wJ3n/DLXnn9pdb9zHW8wUu1LZGEPHs
-WIpQTnWxm6b2FiPfQV6kJRjXgjwQ5LnbirUmSRfjZ/MD166k1/XhKXjtKikP/chF
-sC/3+s8CsNB/3Et/NzJKIpLBXjFdrj5R92zV2r9l5LusQe8YzTP8sjAGKadex8XM
-WdlydXTpMaIqAGZ1D3MJ8W8TSU7k4AS1zh2ldBgesq6bwI49AgMBAAGjPzA9MBwG
-A1UdEQQVMBOCEXZpc2hudS5yZW5hdGVyLmZyMB0GA1UdDgQWBBQ3YVGlQFn0dZcJ
-6z0TrciC5+NrIzANBgkqhkiG9w0BAQUFAAOCAQEAUBfBHUpO/03/rkQJiEaoA8xO
-M15wkTwW8q4/UaFlGCHmp+RZyAQW6kwqB4TL7Ej3x/5x551s2qYtstXEPawcNFH7
-s0MdoBzjVldZr1Oo5YbWeqwx6YeBDefRC/uJCeR8XI/tGqHGgj8Jc2cQrT5QhfcT
-ogYCLtavzhT8gPNua7eXnnu0L3T1WQf3Kf0a/IH8iLx6Au7NtaU1hIIi5MR0kVgw
-KkfYgt3iGMMwEHsN1ZHP+aFm/WkR6KJm9R3RUN9MjYoRzVf+Wq7jM9IKaf3vojD2
-qgV795zB+j+dGdmy9+EWyV60D6os+Q+eI4XUsZ5qxDUTRIM1ikBFwRcyju86qg==
-					    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://lists.geant.net/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://lists.geant.net/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AttributeConsumingService index="0">
-      <ServiceName xml:lang="fr">Service de listes de test de Geant</ServiceName>
-      <ServiceName xml:lang="en">Geant test mailing list service</ServiceName>
-      <ServiceDescription xml:lang="fr">Service de groupware de test Geant. Ce service offre des listes de diffusion ainsi que des outils de travail collaboratif couplés aux listes (wikis, sondages).</ServiceDescription>
-      <ServiceDescription xml:lang="en">Dante test groupware service. This service offers mailing lists along with other collaborative tools linked to these lists (wiki, surveys)</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"/>
-    </AttributeConsumingService>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">RENATER</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">RENATER</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.renater.fr</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Pol Moal</SurName>
-    <EmailAddress>pol.moal@renater.fr</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <SurName>David Verdin</SurName>
-    <EmailAddress>david.verdin@renater.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/lma-idp.lanet.lv.xml b/swamid-interfederations-2.0/lma-idp.lanet.lv.xml
deleted file mode 100644
index 6922fbb9..00000000
--- a/swamid-interfederations-2.0/lma-idp.lanet.lv.xml
+++ /dev/null
@@ -1,41 +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://lma-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/" registrationInstant="2013-10-10T10:10:10Z">
-      <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>
-MIIDhjCCAm4CCQC8Px9pbIuxGDANBgkqhkiG9w0BAQUFADCBhDELMAkGA1UEBhMCTFYxDTALBgNVBAgMBFJpZ2ExDTALBgNVBAcMBFJpZ2ExCzAJBgNVBAoMAkxVMQwwCgYDVQQLDANJVEQxFTATBgNVBAMMDGx1LWlkcC5sdS5sdjElMCMGCSqGSIb3DQEJARYWaXRzZXJ2aXNzIGF0IGx1IGRvdCBsdjAeFw0xMzEyMjAxMDU3MDJaFw0yOTAzMDYxMDU3MDJaMIGEMQswCQYDVQQGEwJMVjENMAsGA1UECAwEUmlnYTENMAsGA1UEBwwEUmlnYTELMAkGA1UECgwCTFUxDDAKBgNVBAsMA0lURDEVMBMGA1UEAwwMbHUtaWRwLmx1Lmx2MSUwIwYJKoZIhvcNAQkBFhZpdHNlcnZpc3MgYXQgbHUgZG90IGx2MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuAy8ri5VknGxy21iuW6kalPwg7VPZBWOuV/jVjRre44tHFd5FinCQUCuzQZn37AU3ZNZg07RRyDhkAzzpsBRQf48VcbnQFRjERuQTKUfT9hzFMxgbjxW2Dayg2Ru2LkGcIUeHilOwfmRn1NIRBN+0UyJIluRvB8YGdHSSHYSMimyw9uYEuMkU9aqewwW78w7TeasCWlB6jiGfJ/SGVtPRThJ6X6KVqoU2gwIY+V7YJkG4b5TOw4HLaIsdOmU4h1Ep3igy+Zsc/7zPn+80iwm1Jk9Q8zGlEwikjPn1N3enMOxR8wpQfAQwm5lIaHNXYFcXCj3mVQ3yQ9EzB/hRC8tHwIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQCFRpI7U/lTwoUW/HwDb2gAmjb0RSmS+5lUWDgmjP/rJwYdh672plabNcY12DiqchtBaSeTOf4qANCqEme+YBAmssFUeLx6O1J+5aXeXfCwAA9GlswGDVeC8ZnTVmQupnbvL0T+ZU8WtkltlLEJdD6o9BtEOqk3+Rspu+94d6FUwmvWB/YWypAOfzXkkSxi+87nsadiFEOyCzTW8fZotOrZMzba52ELLJgCx3IzGLUzV80PSJwLzKYHVp0VluH2DzrxfMKC01bMklG46n1nhEo1UU2KA4vzoScmrXzD+m7nKFZ3GHFjyQvtxqG7gA34qg1Vj2o2O0vN/kvjX73SR5s4
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDhjCCAm4CCQC8Px9pbIuxGDANBgkqhkiG9w0BAQUFADCBhDELMAkGA1UEBhMCTFYxDTALBgNVBAgMBFJpZ2ExDTALBgNVBAcMBFJpZ2ExCzAJBgNVBAoMAkxVMQwwCgYDVQQLDANJVEQxFTATBgNVBAMMDGx1LWlkcC5sdS5sdjElMCMGCSqGSIb3DQEJARYWaXRzZXJ2aXNzIGF0IGx1IGRvdCBsdjAeFw0xMzEyMjAxMDU3MDJaFw0yOTAzMDYxMDU3MDJaMIGEMQswCQYDVQQGEwJMVjENMAsGA1UECAwEUmlnYTENMAsGA1UEBwwEUmlnYTELMAkGA1UECgwCTFUxDDAKBgNVBAsMA0lURDEVMBMGA1UEAwwMbHUtaWRwLmx1Lmx2MSUwIwYJKoZIhvcNAQkBFhZpdHNlcnZpc3MgYXQgbHUgZG90IGx2MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuAy8ri5VknGxy21iuW6kalPwg7VPZBWOuV/jVjRre44tHFd5FinCQUCuzQZn37AU3ZNZg07RRyDhkAzzpsBRQf48VcbnQFRjERuQTKUfT9hzFMxgbjxW2Dayg2Ru2LkGcIUeHilOwfmRn1NIRBN+0UyJIluRvB8YGdHSSHYSMimyw9uYEuMkU9aqewwW78w7TeasCWlB6jiGfJ/SGVtPRThJ6X6KVqoU2gwIY+V7YJkG4b5TOw4HLaIsdOmU4h1Ep3igy+Zsc/7zPn+80iwm1Jk9Q8zGlEwikjPn1N3enMOxR8wpQfAQwm5lIaHNXYFcXCj3mVQ3yQ9EzB/hRC8tHwIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQCFRpI7U/lTwoUW/HwDb2gAmjb0RSmS+5lUWDgmjP/rJwYdh672plabNcY12DiqchtBaSeTOf4qANCqEme+YBAmssFUeLx6O1J+5aXeXfCwAA9GlswGDVeC8ZnTVmQupnbvL0T+ZU8WtkltlLEJdD6o9BtEOqk3+Rspu+94d6FUwmvWB/YWypAOfzXkkSxi+87nsadiFEOyCzTW8fZotOrZMzba52ELLJgCx3IzGLUzV80PSJwLzKYHVp0VluH2DzrxfMKC01bMklG46n1nhEo1UU2KA4vzoScmrXzD+m7nKFZ3GHFjyQvtxqG7gA34qg1Vj2o2O0vN/kvjX73SR5s4
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://lma-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://lma-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 - LMA</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Art Academy of Latvia - LMA IDP</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://laife.lanet.lv/</OrganizationURL>
-    <OrganizationURL xml:lang="lv">http://www.lma.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/lmuidp.lrz.de-idp-shibboleth.xml b/swamid-interfederations-2.0/lmuidp.lrz.de-idp-shibboleth.xml
deleted file mode 100644
index 7103d8f2..00000000
--- a/swamid-interfederations-2.0/lmuidp.lrz.de-idp-shibboleth.xml
+++ /dev/null
@@ -1,232 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://lmuidp.lrz.de/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2009-11-11T14:59:40Z">
-      <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>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">lmu.de</saml1md:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="de">Universität München (LMU)</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Universität of Munich (LMU)</mdui:DisplayName>
-        <mdui:Description xml:lang="de">Identity-Provider für die LMU</mdui:Description>
-        <mdui:Description xml:lang="en">Identity Provider for LMU</mdui:Description>
-        <mdui:InformationURL xml:lang="de">https://lmuidp.lrz.de</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">https://lmuidp.lrz.de</mdui:InformationURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>lmuidp.lrz.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=lmuidp.lrz.de,OU=Leibniz-Rechenzentrum,O=Bayerische Akademie der Wissenschaften,L=Garching b. Muenchen,ST=Bayern,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIGKTCCBRGgAwIBAgIHGEI+4+lgoTANBgkqhkiG9w0BAQsFADCBnTELMAkGA1UE
-BhMCREUxDzANBgNVBAgTBkJheWVybjERMA8GA1UEBxMITXVlbmNoZW4xHjAcBgNV
-BAoTFUxlaWJuaXotUmVjaGVuemVudHJ1bTEPMA0GA1UECxMGTFJaLUNBMRUwEwYD
-VQQDEwxMUlotQ0EgLSBHMDExIjAgBgkqhkiG9w0BCQEWE3BraUBscnotbXVlbmNo
-ZW4uZGUwHhcNMTQwOTI0MTMwNDE5WhcNMTkwNzA5MjM1OTAwWjCBpjELMAkGA1UE
-BhMCREUxDzANBgNVBAgTBkJheWVybjEdMBsGA1UEBxMUR2FyY2hpbmcgYi4gTXVl
-bmNoZW4xLzAtBgNVBAoTJkJheWVyaXNjaGUgQWthZGVtaWUgZGVyIFdpc3NlbnNj
-aGFmdGVuMR4wHAYDVQQLExVMZWlibml6LVJlY2hlbnplbnRydW0xFjAUBgNVBAMT
-DWxtdWlkcC5scnouZGUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC2
-XRjCEr0k6MbdVul4Fh7LnStVjlCFPs86sKFP+AR+B/F7KO9mZiyN9geN8OLcTt/t
-6EVjJ5wlwmqmBNI1LiZ2pcbXDXBISZ5sqOc0AJu12J9vp8BhXbL8TVLb3jKwe+h+
-gTYIZYQr4ZHAzy61GoHjllR91bd97yhOg6+uDb0WIsSEByMNQSYvQ+Ez1wl43oTD
-acsTha0uEdeGRbhEyTnM0K7Vl53y3mobsYhr41PDQQ5C+G97DhYPrApPkx+8c1+K
-AWSeuKsOaUhPd/+U27SjN85d3XFZsTaO7DE+1JwIx2YQuQZIqEdB/c4Nx6rWkBbP
-goQ525ShGAcUp01pLfxTAgMBAAGjggJhMIICXTBPBgNVHSAESDBGMBEGDysGAQQB
-ga0hgiwBAQQDAjARBg8rBgEEAYGtIYIsAgEEAwEwDwYNKwYBBAGBrSGCLAEBBDAN
-BgsrBgEEAYGtIYIsHjAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAU
-BggrBgEFBQcDAgYIKwYBBQUHAwEwHQYDVR0OBBYEFKaWNKU6lkHit7g+/fkQT0Gy
-N+svMB8GA1UdIwQYMBaAFJZbTHC7b/yc77U/pHr7k/8J6mp2MFAGA1UdEQRJMEeC
-DWxtdWlkcC5scnouZGWCDmxtdWlkcDEubHJ6LmRlgg5sbXVpZHAyLmxyei5kZYEW
-emJ2dy1jZXJ0LWFkbWluQGxyei5kZTB3BgNVHR8EcDBuMDWgM6Axhi9odHRwOi8v
-Y2RwMS5wY2EuZGZuLmRlL2xyei1jYS9wdWIvY3JsL2NhY3JsLmNybDA1oDOgMYYv
-aHR0cDovL2NkcDIucGNhLmRmbi5kZS9scnotY2EvcHViL2NybC9jYWNybC5jcmww
-gccGCCsGAQUFBwEBBIG6MIG3MDMGCCsGAQUFBzABhidodHRwOi8vb2NzcC5wY2Eu
-ZGZuLmRlL09DU1AtU2VydmVyL09DU1AwPwYIKwYBBQUHMAKGM2h0dHA6Ly9jZHAx
-LnBjYS5kZm4uZGUvbHJ6LWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDA/BggrBgEF
-BQcwAoYzaHR0cDovL2NkcDIucGNhLmRmbi5kZS9scnotY2EvcHViL2NhY2VydC9j
-YWNlcnQuY3J0MA0GCSqGSIb3DQEBCwUAA4IBAQA/lqhcmySrV1rFabrkq5Q0w3jt
-p/3uI7EwzzcjJi3OYd3RkxM6kg6e2rrUqvZFcc8SpYm2xpMua5rAFnxn3ua1c6fZ
-oxoQqezn8T4hoIW3R88bglSAC6934dhTYyppphANgZskCdF6CyMsrQnVrEjKQhzV
-0bR8i9IWBuWR9eXmdY3CFmkrSplog2JvWb8Llbdy1qtrufrh0UvQzLorV9+XfFTq
-rLGlIaqqDcztN+TBHUYjaY8pcYCzzexidfnc45uavSGgjb72S5180e9Yb37MtFD3
-X9vAm37rs2RCx2XYtdp7GL9GolmAli2pb5KgYojBQ8Re0VgxMFMi35xVQNRj
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>lmuidp.lrz.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=lmuidp.lrz.de,OU=Leibniz-Rechenzentrum,O=Bayerische Akademie der Wissenschaften,L=Garching b. Muenchen,ST=Bayern,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIGKTCCBRGgAwIBAgIHGEI+4+lgoTANBgkqhkiG9w0BAQsFADCBnTELMAkGA1UE
-BhMCREUxDzANBgNVBAgTBkJheWVybjERMA8GA1UEBxMITXVlbmNoZW4xHjAcBgNV
-BAoTFUxlaWJuaXotUmVjaGVuemVudHJ1bTEPMA0GA1UECxMGTFJaLUNBMRUwEwYD
-VQQDEwxMUlotQ0EgLSBHMDExIjAgBgkqhkiG9w0BCQEWE3BraUBscnotbXVlbmNo
-ZW4uZGUwHhcNMTQwOTI0MTMwNDE5WhcNMTkwNzA5MjM1OTAwWjCBpjELMAkGA1UE
-BhMCREUxDzANBgNVBAgTBkJheWVybjEdMBsGA1UEBxMUR2FyY2hpbmcgYi4gTXVl
-bmNoZW4xLzAtBgNVBAoTJkJheWVyaXNjaGUgQWthZGVtaWUgZGVyIFdpc3NlbnNj
-aGFmdGVuMR4wHAYDVQQLExVMZWlibml6LVJlY2hlbnplbnRydW0xFjAUBgNVBAMT
-DWxtdWlkcC5scnouZGUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC2
-XRjCEr0k6MbdVul4Fh7LnStVjlCFPs86sKFP+AR+B/F7KO9mZiyN9geN8OLcTt/t
-6EVjJ5wlwmqmBNI1LiZ2pcbXDXBISZ5sqOc0AJu12J9vp8BhXbL8TVLb3jKwe+h+
-gTYIZYQr4ZHAzy61GoHjllR91bd97yhOg6+uDb0WIsSEByMNQSYvQ+Ez1wl43oTD
-acsTha0uEdeGRbhEyTnM0K7Vl53y3mobsYhr41PDQQ5C+G97DhYPrApPkx+8c1+K
-AWSeuKsOaUhPd/+U27SjN85d3XFZsTaO7DE+1JwIx2YQuQZIqEdB/c4Nx6rWkBbP
-goQ525ShGAcUp01pLfxTAgMBAAGjggJhMIICXTBPBgNVHSAESDBGMBEGDysGAQQB
-ga0hgiwBAQQDAjARBg8rBgEEAYGtIYIsAgEEAwEwDwYNKwYBBAGBrSGCLAEBBDAN
-BgsrBgEEAYGtIYIsHjAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAU
-BggrBgEFBQcDAgYIKwYBBQUHAwEwHQYDVR0OBBYEFKaWNKU6lkHit7g+/fkQT0Gy
-N+svMB8GA1UdIwQYMBaAFJZbTHC7b/yc77U/pHr7k/8J6mp2MFAGA1UdEQRJMEeC
-DWxtdWlkcC5scnouZGWCDmxtdWlkcDEubHJ6LmRlgg5sbXVpZHAyLmxyei5kZYEW
-emJ2dy1jZXJ0LWFkbWluQGxyei5kZTB3BgNVHR8EcDBuMDWgM6Axhi9odHRwOi8v
-Y2RwMS5wY2EuZGZuLmRlL2xyei1jYS9wdWIvY3JsL2NhY3JsLmNybDA1oDOgMYYv
-aHR0cDovL2NkcDIucGNhLmRmbi5kZS9scnotY2EvcHViL2NybC9jYWNybC5jcmww
-gccGCCsGAQUFBwEBBIG6MIG3MDMGCCsGAQUFBzABhidodHRwOi8vb2NzcC5wY2Eu
-ZGZuLmRlL09DU1AtU2VydmVyL09DU1AwPwYIKwYBBQUHMAKGM2h0dHA6Ly9jZHAx
-LnBjYS5kZm4uZGUvbHJ6LWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDA/BggrBgEF
-BQcwAoYzaHR0cDovL2NkcDIucGNhLmRmbi5kZS9scnotY2EvcHViL2NhY2VydC9j
-YWNlcnQuY3J0MA0GCSqGSIb3DQEBCwUAA4IBAQA/lqhcmySrV1rFabrkq5Q0w3jt
-p/3uI7EwzzcjJi3OYd3RkxM6kg6e2rrUqvZFcc8SpYm2xpMua5rAFnxn3ua1c6fZ
-oxoQqezn8T4hoIW3R88bglSAC6934dhTYyppphANgZskCdF6CyMsrQnVrEjKQhzV
-0bR8i9IWBuWR9eXmdY3CFmkrSplog2JvWb8Llbdy1qtrufrh0UvQzLorV9+XfFTq
-rLGlIaqqDcztN+TBHUYjaY8pcYCzzexidfnc45uavSGgjb72S5180e9Yb37MtFD3
-X9vAm37rs2RCx2XYtdp7GL9GolmAli2pb5KgYojBQ8Re0VgxMFMi35xVQNRj
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://lmuidp.lrz.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://lmuidp.lrz.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://lmuidp.lrz.de/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://lmuidp.lrz.de/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://lmuidp.lrz.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://lmuidp.lrz.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">lmu.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>lmuidp.lrz.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=lmuidp.lrz.de,OU=Leibniz-Rechenzentrum,O=Bayerische Akademie der Wissenschaften,L=Garching b. Muenchen,ST=Bayern,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIGKTCCBRGgAwIBAgIHGEI+4+lgoTANBgkqhkiG9w0BAQsFADCBnTELMAkGA1UE
-BhMCREUxDzANBgNVBAgTBkJheWVybjERMA8GA1UEBxMITXVlbmNoZW4xHjAcBgNV
-BAoTFUxlaWJuaXotUmVjaGVuemVudHJ1bTEPMA0GA1UECxMGTFJaLUNBMRUwEwYD
-VQQDEwxMUlotQ0EgLSBHMDExIjAgBgkqhkiG9w0BCQEWE3BraUBscnotbXVlbmNo
-ZW4uZGUwHhcNMTQwOTI0MTMwNDE5WhcNMTkwNzA5MjM1OTAwWjCBpjELMAkGA1UE
-BhMCREUxDzANBgNVBAgTBkJheWVybjEdMBsGA1UEBxMUR2FyY2hpbmcgYi4gTXVl
-bmNoZW4xLzAtBgNVBAoTJkJheWVyaXNjaGUgQWthZGVtaWUgZGVyIFdpc3NlbnNj
-aGFmdGVuMR4wHAYDVQQLExVMZWlibml6LVJlY2hlbnplbnRydW0xFjAUBgNVBAMT
-DWxtdWlkcC5scnouZGUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC2
-XRjCEr0k6MbdVul4Fh7LnStVjlCFPs86sKFP+AR+B/F7KO9mZiyN9geN8OLcTt/t
-6EVjJ5wlwmqmBNI1LiZ2pcbXDXBISZ5sqOc0AJu12J9vp8BhXbL8TVLb3jKwe+h+
-gTYIZYQr4ZHAzy61GoHjllR91bd97yhOg6+uDb0WIsSEByMNQSYvQ+Ez1wl43oTD
-acsTha0uEdeGRbhEyTnM0K7Vl53y3mobsYhr41PDQQ5C+G97DhYPrApPkx+8c1+K
-AWSeuKsOaUhPd/+U27SjN85d3XFZsTaO7DE+1JwIx2YQuQZIqEdB/c4Nx6rWkBbP
-goQ525ShGAcUp01pLfxTAgMBAAGjggJhMIICXTBPBgNVHSAESDBGMBEGDysGAQQB
-ga0hgiwBAQQDAjARBg8rBgEEAYGtIYIsAgEEAwEwDwYNKwYBBAGBrSGCLAEBBDAN
-BgsrBgEEAYGtIYIsHjAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAU
-BggrBgEFBQcDAgYIKwYBBQUHAwEwHQYDVR0OBBYEFKaWNKU6lkHit7g+/fkQT0Gy
-N+svMB8GA1UdIwQYMBaAFJZbTHC7b/yc77U/pHr7k/8J6mp2MFAGA1UdEQRJMEeC
-DWxtdWlkcC5scnouZGWCDmxtdWlkcDEubHJ6LmRlgg5sbXVpZHAyLmxyei5kZYEW
-emJ2dy1jZXJ0LWFkbWluQGxyei5kZTB3BgNVHR8EcDBuMDWgM6Axhi9odHRwOi8v
-Y2RwMS5wY2EuZGZuLmRlL2xyei1jYS9wdWIvY3JsL2NhY3JsLmNybDA1oDOgMYYv
-aHR0cDovL2NkcDIucGNhLmRmbi5kZS9scnotY2EvcHViL2NybC9jYWNybC5jcmww
-gccGCCsGAQUFBwEBBIG6MIG3MDMGCCsGAQUFBzABhidodHRwOi8vb2NzcC5wY2Eu
-ZGZuLmRlL09DU1AtU2VydmVyL09DU1AwPwYIKwYBBQUHMAKGM2h0dHA6Ly9jZHAx
-LnBjYS5kZm4uZGUvbHJ6LWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDA/BggrBgEF
-BQcwAoYzaHR0cDovL2NkcDIucGNhLmRmbi5kZS9scnotY2EvcHViL2NhY2VydC9j
-YWNlcnQuY3J0MA0GCSqGSIb3DQEBCwUAA4IBAQA/lqhcmySrV1rFabrkq5Q0w3jt
-p/3uI7EwzzcjJi3OYd3RkxM6kg6e2rrUqvZFcc8SpYm2xpMua5rAFnxn3ua1c6fZ
-oxoQqezn8T4hoIW3R88bglSAC6934dhTYyppphANgZskCdF6CyMsrQnVrEjKQhzV
-0bR8i9IWBuWR9eXmdY3CFmkrSplog2JvWb8Llbdy1qtrufrh0UvQzLorV9+XfFTq
-rLGlIaqqDcztN+TBHUYjaY8pcYCzzexidfnc45uavSGgjb72S5180e9Yb37MtFD3
-X9vAm37rs2RCx2XYtdp7GL9GolmAli2pb5KgYojBQ8Re0VgxMFMi35xVQNRj
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>lmuidp.lrz.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=lmuidp.lrz.de,OU=Leibniz-Rechenzentrum,O=Bayerische Akademie der Wissenschaften,L=Garching b. Muenchen,ST=Bayern,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIGKTCCBRGgAwIBAgIHGEI+4+lgoTANBgkqhkiG9w0BAQsFADCBnTELMAkGA1UE
-BhMCREUxDzANBgNVBAgTBkJheWVybjERMA8GA1UEBxMITXVlbmNoZW4xHjAcBgNV
-BAoTFUxlaWJuaXotUmVjaGVuemVudHJ1bTEPMA0GA1UECxMGTFJaLUNBMRUwEwYD
-VQQDEwxMUlotQ0EgLSBHMDExIjAgBgkqhkiG9w0BCQEWE3BraUBscnotbXVlbmNo
-ZW4uZGUwHhcNMTQwOTI0MTMwNDE5WhcNMTkwNzA5MjM1OTAwWjCBpjELMAkGA1UE
-BhMCREUxDzANBgNVBAgTBkJheWVybjEdMBsGA1UEBxMUR2FyY2hpbmcgYi4gTXVl
-bmNoZW4xLzAtBgNVBAoTJkJheWVyaXNjaGUgQWthZGVtaWUgZGVyIFdpc3NlbnNj
-aGFmdGVuMR4wHAYDVQQLExVMZWlibml6LVJlY2hlbnplbnRydW0xFjAUBgNVBAMT
-DWxtdWlkcC5scnouZGUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC2
-XRjCEr0k6MbdVul4Fh7LnStVjlCFPs86sKFP+AR+B/F7KO9mZiyN9geN8OLcTt/t
-6EVjJ5wlwmqmBNI1LiZ2pcbXDXBISZ5sqOc0AJu12J9vp8BhXbL8TVLb3jKwe+h+
-gTYIZYQr4ZHAzy61GoHjllR91bd97yhOg6+uDb0WIsSEByMNQSYvQ+Ez1wl43oTD
-acsTha0uEdeGRbhEyTnM0K7Vl53y3mobsYhr41PDQQ5C+G97DhYPrApPkx+8c1+K
-AWSeuKsOaUhPd/+U27SjN85d3XFZsTaO7DE+1JwIx2YQuQZIqEdB/c4Nx6rWkBbP
-goQ525ShGAcUp01pLfxTAgMBAAGjggJhMIICXTBPBgNVHSAESDBGMBEGDysGAQQB
-ga0hgiwBAQQDAjARBg8rBgEEAYGtIYIsAgEEAwEwDwYNKwYBBAGBrSGCLAEBBDAN
-BgsrBgEEAYGtIYIsHjAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAU
-BggrBgEFBQcDAgYIKwYBBQUHAwEwHQYDVR0OBBYEFKaWNKU6lkHit7g+/fkQT0Gy
-N+svMB8GA1UdIwQYMBaAFJZbTHC7b/yc77U/pHr7k/8J6mp2MFAGA1UdEQRJMEeC
-DWxtdWlkcC5scnouZGWCDmxtdWlkcDEubHJ6LmRlgg5sbXVpZHAyLmxyei5kZYEW
-emJ2dy1jZXJ0LWFkbWluQGxyei5kZTB3BgNVHR8EcDBuMDWgM6Axhi9odHRwOi8v
-Y2RwMS5wY2EuZGZuLmRlL2xyei1jYS9wdWIvY3JsL2NhY3JsLmNybDA1oDOgMYYv
-aHR0cDovL2NkcDIucGNhLmRmbi5kZS9scnotY2EvcHViL2NybC9jYWNybC5jcmww
-gccGCCsGAQUFBwEBBIG6MIG3MDMGCCsGAQUFBzABhidodHRwOi8vb2NzcC5wY2Eu
-ZGZuLmRlL09DU1AtU2VydmVyL09DU1AwPwYIKwYBBQUHMAKGM2h0dHA6Ly9jZHAx
-LnBjYS5kZm4uZGUvbHJ6LWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDA/BggrBgEF
-BQcwAoYzaHR0cDovL2NkcDIucGNhLmRmbi5kZS9scnotY2EvcHViL2NhY2VydC9j
-YWNlcnQuY3J0MA0GCSqGSIb3DQEBCwUAA4IBAQA/lqhcmySrV1rFabrkq5Q0w3jt
-p/3uI7EwzzcjJi3OYd3RkxM6kg6e2rrUqvZFcc8SpYm2xpMua5rAFnxn3ua1c6fZ
-oxoQqezn8T4hoIW3R88bglSAC6934dhTYyppphANgZskCdF6CyMsrQnVrEjKQhzV
-0bR8i9IWBuWR9eXmdY3CFmkrSplog2JvWb8Llbdy1qtrufrh0UvQzLorV9+XfFTq
-rLGlIaqqDcztN+TBHUYjaY8pcYCzzexidfnc45uavSGgjb72S5180e9Yb37MtFD3
-X9vAm37rs2RCx2XYtdp7GL9GolmAli2pb5KgYojBQ8Re0VgxMFMi35xVQNRj
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://lmuidp.lrz.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://lmuidp.lrz.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">e29</OrganizationName>
-    <OrganizationName xml:lang="en">e29</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">Ludwig-Maximilians-Universität München</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">Ludwig-Maximilians-Universität München</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">https://lmuidp.lrz.de</OrganizationURL>
-    <OrganizationURL xml:lang="en">https://lmuidp.lrz.de</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Ralf</GivenName>
-    <SurName>Ebner</SurName>
-    <EmailAddress>mailto:shibboleth@lrz.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="support">
-    <GivenName>LMU-Helpdesk</GivenName>
-    <SurName>LMU-Helpdesk</SurName>
-    <EmailAddress>mailto:helpdesk@campus.lmu.de</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/lmuidp.lrz.de.xml b/swamid-interfederations-2.0/lmuidp.lrz.de.xml
deleted file mode 100644
index 7103d8f2..00000000
--- a/swamid-interfederations-2.0/lmuidp.lrz.de.xml
+++ /dev/null
@@ -1,232 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://lmuidp.lrz.de/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2009-11-11T14:59:40Z">
-      <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>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">lmu.de</saml1md:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="de">Universität München (LMU)</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Universität of Munich (LMU)</mdui:DisplayName>
-        <mdui:Description xml:lang="de">Identity-Provider für die LMU</mdui:Description>
-        <mdui:Description xml:lang="en">Identity Provider for LMU</mdui:Description>
-        <mdui:InformationURL xml:lang="de">https://lmuidp.lrz.de</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">https://lmuidp.lrz.de</mdui:InformationURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>lmuidp.lrz.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=lmuidp.lrz.de,OU=Leibniz-Rechenzentrum,O=Bayerische Akademie der Wissenschaften,L=Garching b. Muenchen,ST=Bayern,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIGKTCCBRGgAwIBAgIHGEI+4+lgoTANBgkqhkiG9w0BAQsFADCBnTELMAkGA1UE
-BhMCREUxDzANBgNVBAgTBkJheWVybjERMA8GA1UEBxMITXVlbmNoZW4xHjAcBgNV
-BAoTFUxlaWJuaXotUmVjaGVuemVudHJ1bTEPMA0GA1UECxMGTFJaLUNBMRUwEwYD
-VQQDEwxMUlotQ0EgLSBHMDExIjAgBgkqhkiG9w0BCQEWE3BraUBscnotbXVlbmNo
-ZW4uZGUwHhcNMTQwOTI0MTMwNDE5WhcNMTkwNzA5MjM1OTAwWjCBpjELMAkGA1UE
-BhMCREUxDzANBgNVBAgTBkJheWVybjEdMBsGA1UEBxMUR2FyY2hpbmcgYi4gTXVl
-bmNoZW4xLzAtBgNVBAoTJkJheWVyaXNjaGUgQWthZGVtaWUgZGVyIFdpc3NlbnNj
-aGFmdGVuMR4wHAYDVQQLExVMZWlibml6LVJlY2hlbnplbnRydW0xFjAUBgNVBAMT
-DWxtdWlkcC5scnouZGUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC2
-XRjCEr0k6MbdVul4Fh7LnStVjlCFPs86sKFP+AR+B/F7KO9mZiyN9geN8OLcTt/t
-6EVjJ5wlwmqmBNI1LiZ2pcbXDXBISZ5sqOc0AJu12J9vp8BhXbL8TVLb3jKwe+h+
-gTYIZYQr4ZHAzy61GoHjllR91bd97yhOg6+uDb0WIsSEByMNQSYvQ+Ez1wl43oTD
-acsTha0uEdeGRbhEyTnM0K7Vl53y3mobsYhr41PDQQ5C+G97DhYPrApPkx+8c1+K
-AWSeuKsOaUhPd/+U27SjN85d3XFZsTaO7DE+1JwIx2YQuQZIqEdB/c4Nx6rWkBbP
-goQ525ShGAcUp01pLfxTAgMBAAGjggJhMIICXTBPBgNVHSAESDBGMBEGDysGAQQB
-ga0hgiwBAQQDAjARBg8rBgEEAYGtIYIsAgEEAwEwDwYNKwYBBAGBrSGCLAEBBDAN
-BgsrBgEEAYGtIYIsHjAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAU
-BggrBgEFBQcDAgYIKwYBBQUHAwEwHQYDVR0OBBYEFKaWNKU6lkHit7g+/fkQT0Gy
-N+svMB8GA1UdIwQYMBaAFJZbTHC7b/yc77U/pHr7k/8J6mp2MFAGA1UdEQRJMEeC
-DWxtdWlkcC5scnouZGWCDmxtdWlkcDEubHJ6LmRlgg5sbXVpZHAyLmxyei5kZYEW
-emJ2dy1jZXJ0LWFkbWluQGxyei5kZTB3BgNVHR8EcDBuMDWgM6Axhi9odHRwOi8v
-Y2RwMS5wY2EuZGZuLmRlL2xyei1jYS9wdWIvY3JsL2NhY3JsLmNybDA1oDOgMYYv
-aHR0cDovL2NkcDIucGNhLmRmbi5kZS9scnotY2EvcHViL2NybC9jYWNybC5jcmww
-gccGCCsGAQUFBwEBBIG6MIG3MDMGCCsGAQUFBzABhidodHRwOi8vb2NzcC5wY2Eu
-ZGZuLmRlL09DU1AtU2VydmVyL09DU1AwPwYIKwYBBQUHMAKGM2h0dHA6Ly9jZHAx
-LnBjYS5kZm4uZGUvbHJ6LWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDA/BggrBgEF
-BQcwAoYzaHR0cDovL2NkcDIucGNhLmRmbi5kZS9scnotY2EvcHViL2NhY2VydC9j
-YWNlcnQuY3J0MA0GCSqGSIb3DQEBCwUAA4IBAQA/lqhcmySrV1rFabrkq5Q0w3jt
-p/3uI7EwzzcjJi3OYd3RkxM6kg6e2rrUqvZFcc8SpYm2xpMua5rAFnxn3ua1c6fZ
-oxoQqezn8T4hoIW3R88bglSAC6934dhTYyppphANgZskCdF6CyMsrQnVrEjKQhzV
-0bR8i9IWBuWR9eXmdY3CFmkrSplog2JvWb8Llbdy1qtrufrh0UvQzLorV9+XfFTq
-rLGlIaqqDcztN+TBHUYjaY8pcYCzzexidfnc45uavSGgjb72S5180e9Yb37MtFD3
-X9vAm37rs2RCx2XYtdp7GL9GolmAli2pb5KgYojBQ8Re0VgxMFMi35xVQNRj
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>lmuidp.lrz.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=lmuidp.lrz.de,OU=Leibniz-Rechenzentrum,O=Bayerische Akademie der Wissenschaften,L=Garching b. Muenchen,ST=Bayern,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIGKTCCBRGgAwIBAgIHGEI+4+lgoTANBgkqhkiG9w0BAQsFADCBnTELMAkGA1UE
-BhMCREUxDzANBgNVBAgTBkJheWVybjERMA8GA1UEBxMITXVlbmNoZW4xHjAcBgNV
-BAoTFUxlaWJuaXotUmVjaGVuemVudHJ1bTEPMA0GA1UECxMGTFJaLUNBMRUwEwYD
-VQQDEwxMUlotQ0EgLSBHMDExIjAgBgkqhkiG9w0BCQEWE3BraUBscnotbXVlbmNo
-ZW4uZGUwHhcNMTQwOTI0MTMwNDE5WhcNMTkwNzA5MjM1OTAwWjCBpjELMAkGA1UE
-BhMCREUxDzANBgNVBAgTBkJheWVybjEdMBsGA1UEBxMUR2FyY2hpbmcgYi4gTXVl
-bmNoZW4xLzAtBgNVBAoTJkJheWVyaXNjaGUgQWthZGVtaWUgZGVyIFdpc3NlbnNj
-aGFmdGVuMR4wHAYDVQQLExVMZWlibml6LVJlY2hlbnplbnRydW0xFjAUBgNVBAMT
-DWxtdWlkcC5scnouZGUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC2
-XRjCEr0k6MbdVul4Fh7LnStVjlCFPs86sKFP+AR+B/F7KO9mZiyN9geN8OLcTt/t
-6EVjJ5wlwmqmBNI1LiZ2pcbXDXBISZ5sqOc0AJu12J9vp8BhXbL8TVLb3jKwe+h+
-gTYIZYQr4ZHAzy61GoHjllR91bd97yhOg6+uDb0WIsSEByMNQSYvQ+Ez1wl43oTD
-acsTha0uEdeGRbhEyTnM0K7Vl53y3mobsYhr41PDQQ5C+G97DhYPrApPkx+8c1+K
-AWSeuKsOaUhPd/+U27SjN85d3XFZsTaO7DE+1JwIx2YQuQZIqEdB/c4Nx6rWkBbP
-goQ525ShGAcUp01pLfxTAgMBAAGjggJhMIICXTBPBgNVHSAESDBGMBEGDysGAQQB
-ga0hgiwBAQQDAjARBg8rBgEEAYGtIYIsAgEEAwEwDwYNKwYBBAGBrSGCLAEBBDAN
-BgsrBgEEAYGtIYIsHjAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAU
-BggrBgEFBQcDAgYIKwYBBQUHAwEwHQYDVR0OBBYEFKaWNKU6lkHit7g+/fkQT0Gy
-N+svMB8GA1UdIwQYMBaAFJZbTHC7b/yc77U/pHr7k/8J6mp2MFAGA1UdEQRJMEeC
-DWxtdWlkcC5scnouZGWCDmxtdWlkcDEubHJ6LmRlgg5sbXVpZHAyLmxyei5kZYEW
-emJ2dy1jZXJ0LWFkbWluQGxyei5kZTB3BgNVHR8EcDBuMDWgM6Axhi9odHRwOi8v
-Y2RwMS5wY2EuZGZuLmRlL2xyei1jYS9wdWIvY3JsL2NhY3JsLmNybDA1oDOgMYYv
-aHR0cDovL2NkcDIucGNhLmRmbi5kZS9scnotY2EvcHViL2NybC9jYWNybC5jcmww
-gccGCCsGAQUFBwEBBIG6MIG3MDMGCCsGAQUFBzABhidodHRwOi8vb2NzcC5wY2Eu
-ZGZuLmRlL09DU1AtU2VydmVyL09DU1AwPwYIKwYBBQUHMAKGM2h0dHA6Ly9jZHAx
-LnBjYS5kZm4uZGUvbHJ6LWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDA/BggrBgEF
-BQcwAoYzaHR0cDovL2NkcDIucGNhLmRmbi5kZS9scnotY2EvcHViL2NhY2VydC9j
-YWNlcnQuY3J0MA0GCSqGSIb3DQEBCwUAA4IBAQA/lqhcmySrV1rFabrkq5Q0w3jt
-p/3uI7EwzzcjJi3OYd3RkxM6kg6e2rrUqvZFcc8SpYm2xpMua5rAFnxn3ua1c6fZ
-oxoQqezn8T4hoIW3R88bglSAC6934dhTYyppphANgZskCdF6CyMsrQnVrEjKQhzV
-0bR8i9IWBuWR9eXmdY3CFmkrSplog2JvWb8Llbdy1qtrufrh0UvQzLorV9+XfFTq
-rLGlIaqqDcztN+TBHUYjaY8pcYCzzexidfnc45uavSGgjb72S5180e9Yb37MtFD3
-X9vAm37rs2RCx2XYtdp7GL9GolmAli2pb5KgYojBQ8Re0VgxMFMi35xVQNRj
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://lmuidp.lrz.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://lmuidp.lrz.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://lmuidp.lrz.de/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://lmuidp.lrz.de/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://lmuidp.lrz.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://lmuidp.lrz.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">lmu.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>lmuidp.lrz.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=lmuidp.lrz.de,OU=Leibniz-Rechenzentrum,O=Bayerische Akademie der Wissenschaften,L=Garching b. Muenchen,ST=Bayern,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIGKTCCBRGgAwIBAgIHGEI+4+lgoTANBgkqhkiG9w0BAQsFADCBnTELMAkGA1UE
-BhMCREUxDzANBgNVBAgTBkJheWVybjERMA8GA1UEBxMITXVlbmNoZW4xHjAcBgNV
-BAoTFUxlaWJuaXotUmVjaGVuemVudHJ1bTEPMA0GA1UECxMGTFJaLUNBMRUwEwYD
-VQQDEwxMUlotQ0EgLSBHMDExIjAgBgkqhkiG9w0BCQEWE3BraUBscnotbXVlbmNo
-ZW4uZGUwHhcNMTQwOTI0MTMwNDE5WhcNMTkwNzA5MjM1OTAwWjCBpjELMAkGA1UE
-BhMCREUxDzANBgNVBAgTBkJheWVybjEdMBsGA1UEBxMUR2FyY2hpbmcgYi4gTXVl
-bmNoZW4xLzAtBgNVBAoTJkJheWVyaXNjaGUgQWthZGVtaWUgZGVyIFdpc3NlbnNj
-aGFmdGVuMR4wHAYDVQQLExVMZWlibml6LVJlY2hlbnplbnRydW0xFjAUBgNVBAMT
-DWxtdWlkcC5scnouZGUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC2
-XRjCEr0k6MbdVul4Fh7LnStVjlCFPs86sKFP+AR+B/F7KO9mZiyN9geN8OLcTt/t
-6EVjJ5wlwmqmBNI1LiZ2pcbXDXBISZ5sqOc0AJu12J9vp8BhXbL8TVLb3jKwe+h+
-gTYIZYQr4ZHAzy61GoHjllR91bd97yhOg6+uDb0WIsSEByMNQSYvQ+Ez1wl43oTD
-acsTha0uEdeGRbhEyTnM0K7Vl53y3mobsYhr41PDQQ5C+G97DhYPrApPkx+8c1+K
-AWSeuKsOaUhPd/+U27SjN85d3XFZsTaO7DE+1JwIx2YQuQZIqEdB/c4Nx6rWkBbP
-goQ525ShGAcUp01pLfxTAgMBAAGjggJhMIICXTBPBgNVHSAESDBGMBEGDysGAQQB
-ga0hgiwBAQQDAjARBg8rBgEEAYGtIYIsAgEEAwEwDwYNKwYBBAGBrSGCLAEBBDAN
-BgsrBgEEAYGtIYIsHjAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAU
-BggrBgEFBQcDAgYIKwYBBQUHAwEwHQYDVR0OBBYEFKaWNKU6lkHit7g+/fkQT0Gy
-N+svMB8GA1UdIwQYMBaAFJZbTHC7b/yc77U/pHr7k/8J6mp2MFAGA1UdEQRJMEeC
-DWxtdWlkcC5scnouZGWCDmxtdWlkcDEubHJ6LmRlgg5sbXVpZHAyLmxyei5kZYEW
-emJ2dy1jZXJ0LWFkbWluQGxyei5kZTB3BgNVHR8EcDBuMDWgM6Axhi9odHRwOi8v
-Y2RwMS5wY2EuZGZuLmRlL2xyei1jYS9wdWIvY3JsL2NhY3JsLmNybDA1oDOgMYYv
-aHR0cDovL2NkcDIucGNhLmRmbi5kZS9scnotY2EvcHViL2NybC9jYWNybC5jcmww
-gccGCCsGAQUFBwEBBIG6MIG3MDMGCCsGAQUFBzABhidodHRwOi8vb2NzcC5wY2Eu
-ZGZuLmRlL09DU1AtU2VydmVyL09DU1AwPwYIKwYBBQUHMAKGM2h0dHA6Ly9jZHAx
-LnBjYS5kZm4uZGUvbHJ6LWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDA/BggrBgEF
-BQcwAoYzaHR0cDovL2NkcDIucGNhLmRmbi5kZS9scnotY2EvcHViL2NhY2VydC9j
-YWNlcnQuY3J0MA0GCSqGSIb3DQEBCwUAA4IBAQA/lqhcmySrV1rFabrkq5Q0w3jt
-p/3uI7EwzzcjJi3OYd3RkxM6kg6e2rrUqvZFcc8SpYm2xpMua5rAFnxn3ua1c6fZ
-oxoQqezn8T4hoIW3R88bglSAC6934dhTYyppphANgZskCdF6CyMsrQnVrEjKQhzV
-0bR8i9IWBuWR9eXmdY3CFmkrSplog2JvWb8Llbdy1qtrufrh0UvQzLorV9+XfFTq
-rLGlIaqqDcztN+TBHUYjaY8pcYCzzexidfnc45uavSGgjb72S5180e9Yb37MtFD3
-X9vAm37rs2RCx2XYtdp7GL9GolmAli2pb5KgYojBQ8Re0VgxMFMi35xVQNRj
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>lmuidp.lrz.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=lmuidp.lrz.de,OU=Leibniz-Rechenzentrum,O=Bayerische Akademie der Wissenschaften,L=Garching b. Muenchen,ST=Bayern,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIGKTCCBRGgAwIBAgIHGEI+4+lgoTANBgkqhkiG9w0BAQsFADCBnTELMAkGA1UE
-BhMCREUxDzANBgNVBAgTBkJheWVybjERMA8GA1UEBxMITXVlbmNoZW4xHjAcBgNV
-BAoTFUxlaWJuaXotUmVjaGVuemVudHJ1bTEPMA0GA1UECxMGTFJaLUNBMRUwEwYD
-VQQDEwxMUlotQ0EgLSBHMDExIjAgBgkqhkiG9w0BCQEWE3BraUBscnotbXVlbmNo
-ZW4uZGUwHhcNMTQwOTI0MTMwNDE5WhcNMTkwNzA5MjM1OTAwWjCBpjELMAkGA1UE
-BhMCREUxDzANBgNVBAgTBkJheWVybjEdMBsGA1UEBxMUR2FyY2hpbmcgYi4gTXVl
-bmNoZW4xLzAtBgNVBAoTJkJheWVyaXNjaGUgQWthZGVtaWUgZGVyIFdpc3NlbnNj
-aGFmdGVuMR4wHAYDVQQLExVMZWlibml6LVJlY2hlbnplbnRydW0xFjAUBgNVBAMT
-DWxtdWlkcC5scnouZGUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC2
-XRjCEr0k6MbdVul4Fh7LnStVjlCFPs86sKFP+AR+B/F7KO9mZiyN9geN8OLcTt/t
-6EVjJ5wlwmqmBNI1LiZ2pcbXDXBISZ5sqOc0AJu12J9vp8BhXbL8TVLb3jKwe+h+
-gTYIZYQr4ZHAzy61GoHjllR91bd97yhOg6+uDb0WIsSEByMNQSYvQ+Ez1wl43oTD
-acsTha0uEdeGRbhEyTnM0K7Vl53y3mobsYhr41PDQQ5C+G97DhYPrApPkx+8c1+K
-AWSeuKsOaUhPd/+U27SjN85d3XFZsTaO7DE+1JwIx2YQuQZIqEdB/c4Nx6rWkBbP
-goQ525ShGAcUp01pLfxTAgMBAAGjggJhMIICXTBPBgNVHSAESDBGMBEGDysGAQQB
-ga0hgiwBAQQDAjARBg8rBgEEAYGtIYIsAgEEAwEwDwYNKwYBBAGBrSGCLAEBBDAN
-BgsrBgEEAYGtIYIsHjAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAU
-BggrBgEFBQcDAgYIKwYBBQUHAwEwHQYDVR0OBBYEFKaWNKU6lkHit7g+/fkQT0Gy
-N+svMB8GA1UdIwQYMBaAFJZbTHC7b/yc77U/pHr7k/8J6mp2MFAGA1UdEQRJMEeC
-DWxtdWlkcC5scnouZGWCDmxtdWlkcDEubHJ6LmRlgg5sbXVpZHAyLmxyei5kZYEW
-emJ2dy1jZXJ0LWFkbWluQGxyei5kZTB3BgNVHR8EcDBuMDWgM6Axhi9odHRwOi8v
-Y2RwMS5wY2EuZGZuLmRlL2xyei1jYS9wdWIvY3JsL2NhY3JsLmNybDA1oDOgMYYv
-aHR0cDovL2NkcDIucGNhLmRmbi5kZS9scnotY2EvcHViL2NybC9jYWNybC5jcmww
-gccGCCsGAQUFBwEBBIG6MIG3MDMGCCsGAQUFBzABhidodHRwOi8vb2NzcC5wY2Eu
-ZGZuLmRlL09DU1AtU2VydmVyL09DU1AwPwYIKwYBBQUHMAKGM2h0dHA6Ly9jZHAx
-LnBjYS5kZm4uZGUvbHJ6LWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDA/BggrBgEF
-BQcwAoYzaHR0cDovL2NkcDIucGNhLmRmbi5kZS9scnotY2EvcHViL2NhY2VydC9j
-YWNlcnQuY3J0MA0GCSqGSIb3DQEBCwUAA4IBAQA/lqhcmySrV1rFabrkq5Q0w3jt
-p/3uI7EwzzcjJi3OYd3RkxM6kg6e2rrUqvZFcc8SpYm2xpMua5rAFnxn3ua1c6fZ
-oxoQqezn8T4hoIW3R88bglSAC6934dhTYyppphANgZskCdF6CyMsrQnVrEjKQhzV
-0bR8i9IWBuWR9eXmdY3CFmkrSplog2JvWb8Llbdy1qtrufrh0UvQzLorV9+XfFTq
-rLGlIaqqDcztN+TBHUYjaY8pcYCzzexidfnc45uavSGgjb72S5180e9Yb37MtFD3
-X9vAm37rs2RCx2XYtdp7GL9GolmAli2pb5KgYojBQ8Re0VgxMFMi35xVQNRj
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://lmuidp.lrz.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://lmuidp.lrz.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">e29</OrganizationName>
-    <OrganizationName xml:lang="en">e29</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">Ludwig-Maximilians-Universität München</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">Ludwig-Maximilians-Universität München</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">https://lmuidp.lrz.de</OrganizationURL>
-    <OrganizationURL xml:lang="en">https://lmuidp.lrz.de</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Ralf</GivenName>
-    <SurName>Ebner</SurName>
-    <EmailAddress>mailto:shibboleth@lrz.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="support">
-    <GivenName>LMU-Helpdesk</GivenName>
-    <SurName>LMU-Helpdesk</SurName>
-    <EmailAddress>mailto:helpdesk@campus.lmu.de</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/lmuza-idp.lanet.lv.xml b/swamid-interfederations-2.0/lmuza-idp.lanet.lv.xml
deleted file mode 100644
index 8e868f80..00000000
--- a/swamid-interfederations-2.0/lmuza-idp.lanet.lv.xml
+++ /dev/null
@@ -1,41 +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://lmuza-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/" registrationInstant="2013-10-10T10:10:10Z">
-      <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>
-MIIDhjCCAm4CCQC8Px9pbIuxGDANBgkqhkiG9w0BAQUFADCBhDELMAkGA1UEBhMCTFYxDTALBgNVBAgMBFJpZ2ExDTALBgNVBAcMBFJpZ2ExCzAJBgNVBAoMAkxVMQwwCgYDVQQLDANJVEQxFTATBgNVBAMMDGx1LWlkcC5sdS5sdjElMCMGCSqGSIb3DQEJARYWaXRzZXJ2aXNzIGF0IGx1IGRvdCBsdjAeFw0xMzEyMjAxMDU3MDJaFw0yOTAzMDYxMDU3MDJaMIGEMQswCQYDVQQGEwJMVjENMAsGA1UECAwEUmlnYTENMAsGA1UEBwwEUmlnYTELMAkGA1UECgwCTFUxDDAKBgNVBAsMA0lURDEVMBMGA1UEAwwMbHUtaWRwLmx1Lmx2MSUwIwYJKoZIhvcNAQkBFhZpdHNlcnZpc3MgYXQgbHUgZG90IGx2MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuAy8ri5VknGxy21iuW6kalPwg7VPZBWOuV/jVjRre44tHFd5FinCQUCuzQZn37AU3ZNZg07RRyDhkAzzpsBRQf48VcbnQFRjERuQTKUfT9hzFMxgbjxW2Dayg2Ru2LkGcIUeHilOwfmRn1NIRBN+0UyJIluRvB8YGdHSSHYSMimyw9uYEuMkU9aqewwW78w7TeasCWlB6jiGfJ/SGVtPRThJ6X6KVqoU2gwIY+V7YJkG4b5TOw4HLaIsdOmU4h1Ep3igy+Zsc/7zPn+80iwm1Jk9Q8zGlEwikjPn1N3enMOxR8wpQfAQwm5lIaHNXYFcXCj3mVQ3yQ9EzB/hRC8tHwIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQCFRpI7U/lTwoUW/HwDb2gAmjb0RSmS+5lUWDgmjP/rJwYdh672plabNcY12DiqchtBaSeTOf4qANCqEme+YBAmssFUeLx6O1J+5aXeXfCwAA9GlswGDVeC8ZnTVmQupnbvL0T+ZU8WtkltlLEJdD6o9BtEOqk3+Rspu+94d6FUwmvWB/YWypAOfzXkkSxi+87nsadiFEOyCzTW8fZotOrZMzba52ELLJgCx3IzGLUzV80PSJwLzKYHVp0VluH2DzrxfMKC01bMklG46n1nhEo1UU2KA4vzoScmrXzD+m7nKFZ3GHFjyQvtxqG7gA34qg1Vj2o2O0vN/kvjX73SR5s4
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDhjCCAm4CCQC8Px9pbIuxGDANBgkqhkiG9w0BAQUFADCBhDELMAkGA1UEBhMCTFYxDTALBgNVBAgMBFJpZ2ExDTALBgNVBAcMBFJpZ2ExCzAJBgNVBAoMAkxVMQwwCgYDVQQLDANJVEQxFTATBgNVBAMMDGx1LWlkcC5sdS5sdjElMCMGCSqGSIb3DQEJARYWaXRzZXJ2aXNzIGF0IGx1IGRvdCBsdjAeFw0xMzEyMjAxMDU3MDJaFw0yOTAzMDYxMDU3MDJaMIGEMQswCQYDVQQGEwJMVjENMAsGA1UECAwEUmlnYTENMAsGA1UEBwwEUmlnYTELMAkGA1UECgwCTFUxDDAKBgNVBAsMA0lURDEVMBMGA1UEAwwMbHUtaWRwLmx1Lmx2MSUwIwYJKoZIhvcNAQkBFhZpdHNlcnZpc3MgYXQgbHUgZG90IGx2MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuAy8ri5VknGxy21iuW6kalPwg7VPZBWOuV/jVjRre44tHFd5FinCQUCuzQZn37AU3ZNZg07RRyDhkAzzpsBRQf48VcbnQFRjERuQTKUfT9hzFMxgbjxW2Dayg2Ru2LkGcIUeHilOwfmRn1NIRBN+0UyJIluRvB8YGdHSSHYSMimyw9uYEuMkU9aqewwW78w7TeasCWlB6jiGfJ/SGVtPRThJ6X6KVqoU2gwIY+V7YJkG4b5TOw4HLaIsdOmU4h1Ep3igy+Zsc/7zPn+80iwm1Jk9Q8zGlEwikjPn1N3enMOxR8wpQfAQwm5lIaHNXYFcXCj3mVQ3yQ9EzB/hRC8tHwIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQCFRpI7U/lTwoUW/HwDb2gAmjb0RSmS+5lUWDgmjP/rJwYdh672plabNcY12DiqchtBaSeTOf4qANCqEme+YBAmssFUeLx6O1J+5aXeXfCwAA9GlswGDVeC8ZnTVmQupnbvL0T+ZU8WtkltlLEJdD6o9BtEOqk3+Rspu+94d6FUwmvWB/YWypAOfzXkkSxi+87nsadiFEOyCzTW8fZotOrZMzba52ELLJgCx3IzGLUzV80PSJwLzKYHVp0VluH2DzrxfMKC01bMklG46n1nhEo1UU2KA4vzoScmrXzD+m7nKFZ3GHFjyQvtxqG7gA34qg1Vj2o2O0vN/kvjX73SR5s4
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://lmuza-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://lmuza-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 - LMUZA</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Latvian Academy of Music - LMUZA IDP</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://laife.lanet.lv/</OrganizationURL>
-    <OrganizationURL xml:lang="lv">http://www.jvlma.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/login-idp.auth.gr-idp-shibboleth.xml b/swamid-interfederations-2.0/login-idp.auth.gr-idp-shibboleth.xml
deleted file mode 100644
index a8173518..00000000
--- a/swamid-interfederations-2.0/login-idp.auth.gr-idp-shibboleth.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://login-idp.auth.gr/idp/shibboleth">
-  <Extensions xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi">
-    <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 xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">auth.gr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Aristotle University of Thessaloniki</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="el">Αριστοτέλειο Πανεπιστήμιο Θεσσαλονίκης</mdui:DisplayName>
-        <mdui:InformationURL xml:lang="en">http://www.auth.gr/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="el">http://www.auth.gr/</mdui:InformationURL>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DomainHint>auth.gr</mdui:DomainHint>
-        <mdui:IPHint>155.207.0.0/16</mdui:IPHint>
-        <mdui:IPHint>192.104.147.0/24</mdui:IPHint>
-        <mdui:IPHint>2001:648:2800::/48</mdui:IPHint>
-        <mdui:GeolocationHint>geo:40.6308255004333, 22.959268014038116</mdui:GeolocationHint>
-      </mdui:DiscoHints>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-                            MIIGkjCCBXqgAwIBAgIIFYOcoI+l1dUwDQYJKoZIhvcNAQEFBQAwgZAxCzAJBgNV
-                            BAYTAkdSMUQwQgYDVQQKEztIZWxsZW5pYyBBY2FkZW1pYyBhbmQgUmVzZWFyY2gg
-                            SW5zdGl0dXRpb25zIENlcnQuIEF1dGhvcml0eTE7MDkGA1UEAxMyQXJpc3RvdGxl
-                            IFVuaXZlcnNpdHkgb2YgVGhlc3NhbG9uaWtpIENlbnRyYWwgQ0EgUjQwHhcNMTQw
-                            NTA2MDAwMDAwWhcNMTYwNTA1MjI0NjQzWjB/MQswCQYDVQQGEwJHUjEtMCsGA1UE
-                            ChMkQXJpc3RvdGxlIFVuaXZlcnNpdHkgb2YgVGhlc3NhbG9uaWtpMRIwEAYDVQQL
-                            EwlJVCBDZW50ZXIxLTArBgNVBAMTJElkZW50aXR5IFByb3ZpZGVyIGZvciBzaW5n
-                            bGUtc2lnbi1vbjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAPEkfAH9
-                            KWWtM1cux4wPBESwyAGk/SmEWCpj9OyOohQnaaTuRMgK6Athqr0MeKyQSX7TQrAF
-                            0xbmB3zIqIjhP20JiyC3FuYa+h9U/vGD5yMStCk3i6kVYr+gjmqymChIhYlJXhhR
-                            VZGt38nr5p7iScUixgf5AXRdHjrNkiwdA8RhCEgsgELytCvtuZaWGRpyvJ3TKYcC
-                            3evvLv9X7GyvVnMOibcBdgRZ5WgyWphu7WIMWL/bYdkit8amJQppq72AQ8bsALgI
-                            9dt8c69R6gAFv0tMSuimVc1b0sbZ1seu4FAIPo3s1JT/Kpx6mlmz+0mWlYmwEo/V
-                            j+W1Ee72myVZz8sCAwEAAaOCAv4wggL6MAsGA1UdDwQEAwIFoDA7BgNVHSUENDAy
-                            BggrBgEFBQcDAgYIKwYBBQUHAwEGCCsGAQUFBwMFBggrBgEFBQcDBgYIKwYBBQUH
-                            AwcwHQYDVR0OBBYEFAVWQ1l2u4IqtEcqJX4xdkAM8tarMB8GA1UdIwQYMBaAFPWT
-                            F0odc7Z/fyCypRSUV3IZMzbSMHEGCCsGAQUFBwEBBGUwYzAjBggrBgEFBQcwAYYX
-                            aHR0cDovL29jc3AucGtpLmF1dGguZ3IwPAYIKwYBBQUHMAKGMGh0dHA6Ly93d3cu
-                            cGtpLmF1dGguZ3IvY2VydHMvQXV0aENlbnRyYWxDQVI0LnBlbTBHBgNVHR8EQDA+
-                            MDygOqA4hjZodHRwOi8vY3JsdjEucGtpLmF1dGguZ3IvQXV0aENlbnRyYWxDQVI0
-                            L2NybHYxLmRlci5jcmwwggEgBgNVHSAEggEXMIIBEzCCAQ8GCysGAQQBvB0CAAMF
-                            MIH/MDQGCCsGAQUFBwIBFihodHRwOi8vd3d3LnBraS5hdXRoLmdyL2RvY3VtZW50
-                            cy9DUFMucGhwMIHGBggrBgEFBQcCAjCBuTArFiRBcmlzdG90bGUgVW5pdmVyc2l0
-                            eSBvZiBUaGVzc2Fsb25pa2kwAwIBARqBiVRoaXMgY2VydGlmaWNhdGUgaXMgc3Vi
-                            amVjdCB0byBHcmVlayBsYXdzIGFuZCBvdXIgQ1BTLiBUaGlzIENlcnRpZmljYXRl
-                            IG11c3Qgb25seSBiZSB1c2VkIGZvciBhY2FkZW1pYywgcmVzZWFyY2ggb3IgZWR1
-                            Y2F0aW9uYWwgcHVycG9zZXMuMIGNBgNVHREEgYUwgYKCEWxvZ2luLWlkcC5hdXRo
-                            LmdyghRsb2dpbi1pZHAuaXQuYXV0aC5ncoIVbG9naW4taWRwMS5pdC5hdXRoLmdy
-                            ghVsb2dpbi1pZHAxLml0LmF1dGguZ3KCFWxvZ2luLWlkcDIuaXQuYXV0aC5ncoIS
-                            bG9naW4taWRwMi5hdXRoLmdyMA0GCSqGSIb3DQEBBQUAA4IBAQAC990lHYriaAC8
-                            ytQP/AeYS5vsltSv2exJDK21E6+/KmlpWh2t/0UFk4bIvJJc9YKDURurAV3TJ78a
-                            aRMxNCo57TXV54dQNiHw+8pSjvoDCJjEXiVqJX93SPtzD9f26oFG23UBo+MDBEyV
-                            WEugwrXZ3sTrR7SFXNc6+pjEidNSzH4Es4TSa7yHKx5xJzFRcPAFwIFUw35GHxhG
-                            EWOy5M46Ik4/nBvl6CYk52aTjE/uP2WLn61Cd34oQnWspazclxgVENaVJOyWF6Lv
-                            ea+x68KwePqG5bRs+iOrVG/8NNGTlS0TSvDlubnVYNuyHffDHitYaPd3jg8U2q0q
-                            z6v6NL8x
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login-idp.auth.gr:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login-idp.auth.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://login-idp.auth.gr/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login-idp.auth.gr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://login-idp.auth.gr/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login-idp.auth.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="false">auth.gr</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-                            MIIGkjCCBXqgAwIBAgIIFYOcoI+l1dUwDQYJKoZIhvcNAQEFBQAwgZAxCzAJBgNV
-                            BAYTAkdSMUQwQgYDVQQKEztIZWxsZW5pYyBBY2FkZW1pYyBhbmQgUmVzZWFyY2gg
-                            SW5zdGl0dXRpb25zIENlcnQuIEF1dGhvcml0eTE7MDkGA1UEAxMyQXJpc3RvdGxl
-                            IFVuaXZlcnNpdHkgb2YgVGhlc3NhbG9uaWtpIENlbnRyYWwgQ0EgUjQwHhcNMTQw
-                            NTA2MDAwMDAwWhcNMTYwNTA1MjI0NjQzWjB/MQswCQYDVQQGEwJHUjEtMCsGA1UE
-                            ChMkQXJpc3RvdGxlIFVuaXZlcnNpdHkgb2YgVGhlc3NhbG9uaWtpMRIwEAYDVQQL
-                            EwlJVCBDZW50ZXIxLTArBgNVBAMTJElkZW50aXR5IFByb3ZpZGVyIGZvciBzaW5n
-                            bGUtc2lnbi1vbjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAPEkfAH9
-                            KWWtM1cux4wPBESwyAGk/SmEWCpj9OyOohQnaaTuRMgK6Athqr0MeKyQSX7TQrAF
-                            0xbmB3zIqIjhP20JiyC3FuYa+h9U/vGD5yMStCk3i6kVYr+gjmqymChIhYlJXhhR
-                            VZGt38nr5p7iScUixgf5AXRdHjrNkiwdA8RhCEgsgELytCvtuZaWGRpyvJ3TKYcC
-                            3evvLv9X7GyvVnMOibcBdgRZ5WgyWphu7WIMWL/bYdkit8amJQppq72AQ8bsALgI
-                            9dt8c69R6gAFv0tMSuimVc1b0sbZ1seu4FAIPo3s1JT/Kpx6mlmz+0mWlYmwEo/V
-                            j+W1Ee72myVZz8sCAwEAAaOCAv4wggL6MAsGA1UdDwQEAwIFoDA7BgNVHSUENDAy
-                            BggrBgEFBQcDAgYIKwYBBQUHAwEGCCsGAQUFBwMFBggrBgEFBQcDBgYIKwYBBQUH
-                            AwcwHQYDVR0OBBYEFAVWQ1l2u4IqtEcqJX4xdkAM8tarMB8GA1UdIwQYMBaAFPWT
-                            F0odc7Z/fyCypRSUV3IZMzbSMHEGCCsGAQUFBwEBBGUwYzAjBggrBgEFBQcwAYYX
-                            aHR0cDovL29jc3AucGtpLmF1dGguZ3IwPAYIKwYBBQUHMAKGMGh0dHA6Ly93d3cu
-                            cGtpLmF1dGguZ3IvY2VydHMvQXV0aENlbnRyYWxDQVI0LnBlbTBHBgNVHR8EQDA+
-                            MDygOqA4hjZodHRwOi8vY3JsdjEucGtpLmF1dGguZ3IvQXV0aENlbnRyYWxDQVI0
-                            L2NybHYxLmRlci5jcmwwggEgBgNVHSAEggEXMIIBEzCCAQ8GCysGAQQBvB0CAAMF
-                            MIH/MDQGCCsGAQUFBwIBFihodHRwOi8vd3d3LnBraS5hdXRoLmdyL2RvY3VtZW50
-                            cy9DUFMucGhwMIHGBggrBgEFBQcCAjCBuTArFiRBcmlzdG90bGUgVW5pdmVyc2l0
-                            eSBvZiBUaGVzc2Fsb25pa2kwAwIBARqBiVRoaXMgY2VydGlmaWNhdGUgaXMgc3Vi
-                            amVjdCB0byBHcmVlayBsYXdzIGFuZCBvdXIgQ1BTLiBUaGlzIENlcnRpZmljYXRl
-                            IG11c3Qgb25seSBiZSB1c2VkIGZvciBhY2FkZW1pYywgcmVzZWFyY2ggb3IgZWR1
-                            Y2F0aW9uYWwgcHVycG9zZXMuMIGNBgNVHREEgYUwgYKCEWxvZ2luLWlkcC5hdXRo
-                            LmdyghRsb2dpbi1pZHAuaXQuYXV0aC5ncoIVbG9naW4taWRwMS5pdC5hdXRoLmdy
-                            ghVsb2dpbi1pZHAxLml0LmF1dGguZ3KCFWxvZ2luLWlkcDIuaXQuYXV0aC5ncoIS
-                            bG9naW4taWRwMi5hdXRoLmdyMA0GCSqGSIb3DQEBBQUAA4IBAQAC990lHYriaAC8
-                            ytQP/AeYS5vsltSv2exJDK21E6+/KmlpWh2t/0UFk4bIvJJc9YKDURurAV3TJ78a
-                            aRMxNCo57TXV54dQNiHw+8pSjvoDCJjEXiVqJX93SPtzD9f26oFG23UBo+MDBEyV
-                            WEugwrXZ3sTrR7SFXNc6+pjEidNSzH4Es4TSa7yHKx5xJzFRcPAFwIFUw35GHxhG
-                            EWOy5M46Ik4/nBvl6CYk52aTjE/uP2WLn61Cd34oQnWspazclxgVENaVJOyWF6Lv
-                            ea+x68KwePqG5bRs+iOrVG/8NNGTlS0TSvDlubnVYNuyHffDHitYaPd3jg8U2q0q
-                            z6v6NL8x
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login-idp.auth.gr:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login-idp.auth.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">Aristotle University of Thessaloniki</OrganizationName>
-    <OrganizationName xml:lang="el">Αριστοτέλειο Πανεπιστήμιο Θεσσαλονίκης</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Aristotle University of Thessaloniki</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="el">Αριστοτέλειο Πανεπιστήμιο Θεσσαλονίκης</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.auth.gr/</OrganizationURL>
-    <OrganizationURL xml:lang="el">http://www.auth.gr/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <Company>AUTH IT Center AAI Administrators</Company>
-    <EmailAddress>aaiadmin@it.auth.gr</EmailAddress>
-    <TelephoneNumber>+30-2310999000</TelephoneNumber>
-  </ContactPerson>
-  <ContactPerson contactType="support">
-    <Company>AUTH IT Center Helpdesk</Company>
-    <EmailAddress>support@auth.gr</EmailAddress>
-    <TelephoneNumber>+30-2310999000</TelephoneNumber>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/login-idp.auth.gr.xml b/swamid-interfederations-2.0/login-idp.auth.gr.xml
deleted file mode 100644
index a8173518..00000000
--- a/swamid-interfederations-2.0/login-idp.auth.gr.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://login-idp.auth.gr/idp/shibboleth">
-  <Extensions xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi">
-    <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 xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">auth.gr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Aristotle University of Thessaloniki</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="el">Αριστοτέλειο Πανεπιστήμιο Θεσσαλονίκης</mdui:DisplayName>
-        <mdui:InformationURL xml:lang="en">http://www.auth.gr/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="el">http://www.auth.gr/</mdui:InformationURL>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DomainHint>auth.gr</mdui:DomainHint>
-        <mdui:IPHint>155.207.0.0/16</mdui:IPHint>
-        <mdui:IPHint>192.104.147.0/24</mdui:IPHint>
-        <mdui:IPHint>2001:648:2800::/48</mdui:IPHint>
-        <mdui:GeolocationHint>geo:40.6308255004333, 22.959268014038116</mdui:GeolocationHint>
-      </mdui:DiscoHints>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-                            MIIGkjCCBXqgAwIBAgIIFYOcoI+l1dUwDQYJKoZIhvcNAQEFBQAwgZAxCzAJBgNV
-                            BAYTAkdSMUQwQgYDVQQKEztIZWxsZW5pYyBBY2FkZW1pYyBhbmQgUmVzZWFyY2gg
-                            SW5zdGl0dXRpb25zIENlcnQuIEF1dGhvcml0eTE7MDkGA1UEAxMyQXJpc3RvdGxl
-                            IFVuaXZlcnNpdHkgb2YgVGhlc3NhbG9uaWtpIENlbnRyYWwgQ0EgUjQwHhcNMTQw
-                            NTA2MDAwMDAwWhcNMTYwNTA1MjI0NjQzWjB/MQswCQYDVQQGEwJHUjEtMCsGA1UE
-                            ChMkQXJpc3RvdGxlIFVuaXZlcnNpdHkgb2YgVGhlc3NhbG9uaWtpMRIwEAYDVQQL
-                            EwlJVCBDZW50ZXIxLTArBgNVBAMTJElkZW50aXR5IFByb3ZpZGVyIGZvciBzaW5n
-                            bGUtc2lnbi1vbjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAPEkfAH9
-                            KWWtM1cux4wPBESwyAGk/SmEWCpj9OyOohQnaaTuRMgK6Athqr0MeKyQSX7TQrAF
-                            0xbmB3zIqIjhP20JiyC3FuYa+h9U/vGD5yMStCk3i6kVYr+gjmqymChIhYlJXhhR
-                            VZGt38nr5p7iScUixgf5AXRdHjrNkiwdA8RhCEgsgELytCvtuZaWGRpyvJ3TKYcC
-                            3evvLv9X7GyvVnMOibcBdgRZ5WgyWphu7WIMWL/bYdkit8amJQppq72AQ8bsALgI
-                            9dt8c69R6gAFv0tMSuimVc1b0sbZ1seu4FAIPo3s1JT/Kpx6mlmz+0mWlYmwEo/V
-                            j+W1Ee72myVZz8sCAwEAAaOCAv4wggL6MAsGA1UdDwQEAwIFoDA7BgNVHSUENDAy
-                            BggrBgEFBQcDAgYIKwYBBQUHAwEGCCsGAQUFBwMFBggrBgEFBQcDBgYIKwYBBQUH
-                            AwcwHQYDVR0OBBYEFAVWQ1l2u4IqtEcqJX4xdkAM8tarMB8GA1UdIwQYMBaAFPWT
-                            F0odc7Z/fyCypRSUV3IZMzbSMHEGCCsGAQUFBwEBBGUwYzAjBggrBgEFBQcwAYYX
-                            aHR0cDovL29jc3AucGtpLmF1dGguZ3IwPAYIKwYBBQUHMAKGMGh0dHA6Ly93d3cu
-                            cGtpLmF1dGguZ3IvY2VydHMvQXV0aENlbnRyYWxDQVI0LnBlbTBHBgNVHR8EQDA+
-                            MDygOqA4hjZodHRwOi8vY3JsdjEucGtpLmF1dGguZ3IvQXV0aENlbnRyYWxDQVI0
-                            L2NybHYxLmRlci5jcmwwggEgBgNVHSAEggEXMIIBEzCCAQ8GCysGAQQBvB0CAAMF
-                            MIH/MDQGCCsGAQUFBwIBFihodHRwOi8vd3d3LnBraS5hdXRoLmdyL2RvY3VtZW50
-                            cy9DUFMucGhwMIHGBggrBgEFBQcCAjCBuTArFiRBcmlzdG90bGUgVW5pdmVyc2l0
-                            eSBvZiBUaGVzc2Fsb25pa2kwAwIBARqBiVRoaXMgY2VydGlmaWNhdGUgaXMgc3Vi
-                            amVjdCB0byBHcmVlayBsYXdzIGFuZCBvdXIgQ1BTLiBUaGlzIENlcnRpZmljYXRl
-                            IG11c3Qgb25seSBiZSB1c2VkIGZvciBhY2FkZW1pYywgcmVzZWFyY2ggb3IgZWR1
-                            Y2F0aW9uYWwgcHVycG9zZXMuMIGNBgNVHREEgYUwgYKCEWxvZ2luLWlkcC5hdXRo
-                            LmdyghRsb2dpbi1pZHAuaXQuYXV0aC5ncoIVbG9naW4taWRwMS5pdC5hdXRoLmdy
-                            ghVsb2dpbi1pZHAxLml0LmF1dGguZ3KCFWxvZ2luLWlkcDIuaXQuYXV0aC5ncoIS
-                            bG9naW4taWRwMi5hdXRoLmdyMA0GCSqGSIb3DQEBBQUAA4IBAQAC990lHYriaAC8
-                            ytQP/AeYS5vsltSv2exJDK21E6+/KmlpWh2t/0UFk4bIvJJc9YKDURurAV3TJ78a
-                            aRMxNCo57TXV54dQNiHw+8pSjvoDCJjEXiVqJX93SPtzD9f26oFG23UBo+MDBEyV
-                            WEugwrXZ3sTrR7SFXNc6+pjEidNSzH4Es4TSa7yHKx5xJzFRcPAFwIFUw35GHxhG
-                            EWOy5M46Ik4/nBvl6CYk52aTjE/uP2WLn61Cd34oQnWspazclxgVENaVJOyWF6Lv
-                            ea+x68KwePqG5bRs+iOrVG/8NNGTlS0TSvDlubnVYNuyHffDHitYaPd3jg8U2q0q
-                            z6v6NL8x
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login-idp.auth.gr:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login-idp.auth.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://login-idp.auth.gr/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login-idp.auth.gr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://login-idp.auth.gr/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login-idp.auth.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="false">auth.gr</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-                            MIIGkjCCBXqgAwIBAgIIFYOcoI+l1dUwDQYJKoZIhvcNAQEFBQAwgZAxCzAJBgNV
-                            BAYTAkdSMUQwQgYDVQQKEztIZWxsZW5pYyBBY2FkZW1pYyBhbmQgUmVzZWFyY2gg
-                            SW5zdGl0dXRpb25zIENlcnQuIEF1dGhvcml0eTE7MDkGA1UEAxMyQXJpc3RvdGxl
-                            IFVuaXZlcnNpdHkgb2YgVGhlc3NhbG9uaWtpIENlbnRyYWwgQ0EgUjQwHhcNMTQw
-                            NTA2MDAwMDAwWhcNMTYwNTA1MjI0NjQzWjB/MQswCQYDVQQGEwJHUjEtMCsGA1UE
-                            ChMkQXJpc3RvdGxlIFVuaXZlcnNpdHkgb2YgVGhlc3NhbG9uaWtpMRIwEAYDVQQL
-                            EwlJVCBDZW50ZXIxLTArBgNVBAMTJElkZW50aXR5IFByb3ZpZGVyIGZvciBzaW5n
-                            bGUtc2lnbi1vbjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAPEkfAH9
-                            KWWtM1cux4wPBESwyAGk/SmEWCpj9OyOohQnaaTuRMgK6Athqr0MeKyQSX7TQrAF
-                            0xbmB3zIqIjhP20JiyC3FuYa+h9U/vGD5yMStCk3i6kVYr+gjmqymChIhYlJXhhR
-                            VZGt38nr5p7iScUixgf5AXRdHjrNkiwdA8RhCEgsgELytCvtuZaWGRpyvJ3TKYcC
-                            3evvLv9X7GyvVnMOibcBdgRZ5WgyWphu7WIMWL/bYdkit8amJQppq72AQ8bsALgI
-                            9dt8c69R6gAFv0tMSuimVc1b0sbZ1seu4FAIPo3s1JT/Kpx6mlmz+0mWlYmwEo/V
-                            j+W1Ee72myVZz8sCAwEAAaOCAv4wggL6MAsGA1UdDwQEAwIFoDA7BgNVHSUENDAy
-                            BggrBgEFBQcDAgYIKwYBBQUHAwEGCCsGAQUFBwMFBggrBgEFBQcDBgYIKwYBBQUH
-                            AwcwHQYDVR0OBBYEFAVWQ1l2u4IqtEcqJX4xdkAM8tarMB8GA1UdIwQYMBaAFPWT
-                            F0odc7Z/fyCypRSUV3IZMzbSMHEGCCsGAQUFBwEBBGUwYzAjBggrBgEFBQcwAYYX
-                            aHR0cDovL29jc3AucGtpLmF1dGguZ3IwPAYIKwYBBQUHMAKGMGh0dHA6Ly93d3cu
-                            cGtpLmF1dGguZ3IvY2VydHMvQXV0aENlbnRyYWxDQVI0LnBlbTBHBgNVHR8EQDA+
-                            MDygOqA4hjZodHRwOi8vY3JsdjEucGtpLmF1dGguZ3IvQXV0aENlbnRyYWxDQVI0
-                            L2NybHYxLmRlci5jcmwwggEgBgNVHSAEggEXMIIBEzCCAQ8GCysGAQQBvB0CAAMF
-                            MIH/MDQGCCsGAQUFBwIBFihodHRwOi8vd3d3LnBraS5hdXRoLmdyL2RvY3VtZW50
-                            cy9DUFMucGhwMIHGBggrBgEFBQcCAjCBuTArFiRBcmlzdG90bGUgVW5pdmVyc2l0
-                            eSBvZiBUaGVzc2Fsb25pa2kwAwIBARqBiVRoaXMgY2VydGlmaWNhdGUgaXMgc3Vi
-                            amVjdCB0byBHcmVlayBsYXdzIGFuZCBvdXIgQ1BTLiBUaGlzIENlcnRpZmljYXRl
-                            IG11c3Qgb25seSBiZSB1c2VkIGZvciBhY2FkZW1pYywgcmVzZWFyY2ggb3IgZWR1
-                            Y2F0aW9uYWwgcHVycG9zZXMuMIGNBgNVHREEgYUwgYKCEWxvZ2luLWlkcC5hdXRo
-                            LmdyghRsb2dpbi1pZHAuaXQuYXV0aC5ncoIVbG9naW4taWRwMS5pdC5hdXRoLmdy
-                            ghVsb2dpbi1pZHAxLml0LmF1dGguZ3KCFWxvZ2luLWlkcDIuaXQuYXV0aC5ncoIS
-                            bG9naW4taWRwMi5hdXRoLmdyMA0GCSqGSIb3DQEBBQUAA4IBAQAC990lHYriaAC8
-                            ytQP/AeYS5vsltSv2exJDK21E6+/KmlpWh2t/0UFk4bIvJJc9YKDURurAV3TJ78a
-                            aRMxNCo57TXV54dQNiHw+8pSjvoDCJjEXiVqJX93SPtzD9f26oFG23UBo+MDBEyV
-                            WEugwrXZ3sTrR7SFXNc6+pjEidNSzH4Es4TSa7yHKx5xJzFRcPAFwIFUw35GHxhG
-                            EWOy5M46Ik4/nBvl6CYk52aTjE/uP2WLn61Cd34oQnWspazclxgVENaVJOyWF6Lv
-                            ea+x68KwePqG5bRs+iOrVG/8NNGTlS0TSvDlubnVYNuyHffDHitYaPd3jg8U2q0q
-                            z6v6NL8x
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login-idp.auth.gr:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login-idp.auth.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">Aristotle University of Thessaloniki</OrganizationName>
-    <OrganizationName xml:lang="el">Αριστοτέλειο Πανεπιστήμιο Θεσσαλονίκης</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Aristotle University of Thessaloniki</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="el">Αριστοτέλειο Πανεπιστήμιο Θεσσαλονίκης</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.auth.gr/</OrganizationURL>
-    <OrganizationURL xml:lang="el">http://www.auth.gr/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <Company>AUTH IT Center AAI Administrators</Company>
-    <EmailAddress>aaiadmin@it.auth.gr</EmailAddress>
-    <TelephoneNumber>+30-2310999000</TelephoneNumber>
-  </ContactPerson>
-  <ContactPerson contactType="support">
-    <Company>AUTH IT Center Helpdesk</Company>
-    <EmailAddress>support@auth.gr</EmailAddress>
-    <TelephoneNumber>+30-2310999000</TelephoneNumber>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/login.aai.pionier.net.pl-IdP-saml2-idp-metadata.php.xml b/swamid-interfederations-2.0/login.aai.pionier.net.pl-IdP-saml2-idp-metadata.php.xml
deleted file mode 100644
index 6457e51e..00000000
--- a/swamid-interfederations-2.0/login.aai.pionier.net.pl-IdP-saml2-idp-metadata.php.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?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="2013-12-15T00:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://aai.pionier.net.pl/en/index.php?page=rps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </md:Extensions>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope regexp="false">aai.pionier.net.pl</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">PIONIER Consortium</mdui:DisplayName>
-        <mdui:Description xml:lang="en">
-            PIONIER Consortium Identity Provider 
-         </mdui:Description>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDmjCCAoICCQDmaHpUoCXQpDANBgkqhkiG9w0BAQUFADCBjjELMAkGA1UEBhMCUEwxMTAvBgNVBAoTKFVuaXdlcnN5dGV0IE1pa29sYWphIEtvcGVybmlrYSB3IFRvcnVuaXUxKTAnBgNVBAsTIFVjemVsbmlhbmUgQ2VudHJ1bSBJbmZvcm1hdHljem5lMSEwHwYDVQQDExhsb2dpbi5hYWkucGlvbmllci5uZXQucGwwHhcNMTMwNDIyMDkyNjI3WhcNMjMwNDIyMDkyNjI3WjCBjjELMAkGA1UEBhMCUEwxMTAvBgNVBAoTKFVuaXdlcnN5dGV0IE1pa29sYWphIEtvcGVybmlrYSB3IFRvcnVuaXUxKTAnBgNVBAsTIFVjemVsbmlhbmUgQ2VudHJ1bSBJbmZvcm1hdHljem5lMSEwHwYDVQQDExhsb2dpbi5hYWkucGlvbmllci5uZXQucGwwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC0Uf5C3sRuXMaoCQtvE47bf+tWUJX8v8KCIYaAFylqJuMLX7WDM54vtgjGsrLzY9KC3quHEG2H5CtkCnAiRLuz1veufuIkKqXl2vnbVmVwc4f8uXrDGnzEQb9Pa9Nu1Qu6G3WytCHhZJUJ6wL/VyYbONnIxxs99obLxMIJ6knMmeDl/nkM5h5h2/pRTltzbw1v0+YWp8uoX/6WmFasOY2RWy7s27L3ooN4gkRgvfaj3PZ+uRopWg8rssvMoTngQALZDlw1mlzrORupnigyQYsHjTcDZTLm7Dt9QF0WVgHfYNnz3KynCceSqQQL+b2OsTAv7UYBs6h09SvMPz6Ew/KdAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBAEBhyUU61t7kzq6tlZKvsyVlAF2jqyEZCijaeo7kOragifoTrFPLXHCiIDYvfgYkKx3mx/tsus8ntm7zigb2+nbBKNgMux0GQpeu2sXRuSdUZ2qRUzzblXN6x9JmqMXTchTiw9+SCoxuJZ2Di/d0yVSg0NcHNaB42HKE5PenuwnSU9Yo26JgSA3xJfWYFkAcT676yzySgRXasbzv2idBpKYXY2kECoggrzmyxfkuMCHWENk+k06EM1mVuS6gdU/SsJWksLDG+6gjah0UHMpNaXjGsZsNIw/6SkdJOex3Pp1CpW8/nxQyxkftFSIhEYvqbWBVL+VfiAjG9JrZC4o5x/8=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDmjCCAoICCQDmaHpUoCXQpDANBgkqhkiG9w0BAQUFADCBjjELMAkGA1UEBhMCUEwxMTAvBgNVBAoTKFVuaXdlcnN5dGV0IE1pa29sYWphIEtvcGVybmlrYSB3IFRvcnVuaXUxKTAnBgNVBAsTIFVjemVsbmlhbmUgQ2VudHJ1bSBJbmZvcm1hdHljem5lMSEwHwYDVQQDExhsb2dpbi5hYWkucGlvbmllci5uZXQucGwwHhcNMTMwNDIyMDkyNjI3WhcNMjMwNDIyMDkyNjI3WjCBjjELMAkGA1UEBhMCUEwxMTAvBgNVBAoTKFVuaXdlcnN5dGV0IE1pa29sYWphIEtvcGVybmlrYSB3IFRvcnVuaXUxKTAnBgNVBAsTIFVjemVsbmlhbmUgQ2VudHJ1bSBJbmZvcm1hdHljem5lMSEwHwYDVQQDExhsb2dpbi5hYWkucGlvbmllci5uZXQucGwwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC0Uf5C3sRuXMaoCQtvE47bf+tWUJX8v8KCIYaAFylqJuMLX7WDM54vtgjGsrLzY9KC3quHEG2H5CtkCnAiRLuz1veufuIkKqXl2vnbVmVwc4f8uXrDGnzEQb9Pa9Nu1Qu6G3WytCHhZJUJ6wL/VyYbONnIxxs99obLxMIJ6knMmeDl/nkM5h5h2/pRTltzbw1v0+YWp8uoX/6WmFasOY2RWy7s27L3ooN4gkRgvfaj3PZ+uRopWg8rssvMoTngQALZDlw1mlzrORupnigyQYsHjTcDZTLm7Dt9QF0WVgHfYNnz3KynCceSqQQL+b2OsTAv7UYBs6h09SvMPz6Ew/KdAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBAEBhyUU61t7kzq6tlZKvsyVlAF2jqyEZCijaeo7kOragifoTrFPLXHCiIDYvfgYkKx3mx/tsus8ntm7zigb2+nbBKNgMux0GQpeu2sXRuSdUZ2qRUzzblXN6x9JmqMXTchTiw9+SCoxuJZ2Di/d0yVSg0NcHNaB42HKE5PenuwnSU9Yo26JgSA3xJfWYFkAcT676yzySgRXasbzv2idBpKYXY2kECoggrzmyxfkuMCHWENk+k06EM1mVuS6gdU/SsJWksLDG+6gjah0UHMpNaXjGsZsNIw/6SkdJOex3Pp1CpW8/nxQyxkftFSIhEYvqbWBVL+VfiAjG9JrZC4o5x/8=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.aai.pionier.net.pl/IdP/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://login.aai.pionier.net.pl/IdP/saml2/idp/SSOService.php"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">PIONIER Consortium</md:OrganizationName>
-    <md:OrganizationName xml:lang="pl">Konsorcjum PIONIER</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">PIONIER Consortium</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="pl">Konsorcjum PIONIER</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.pionier.net.pl</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>PIONIER IdP</md:SurName>
-    <md:EmailAddress>admin@aai.pionier.net.pl</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/login.aai.pionier.net.pl.xml b/swamid-interfederations-2.0/login.aai.pionier.net.pl.xml
deleted file mode 100644
index 6457e51e..00000000
--- a/swamid-interfederations-2.0/login.aai.pionier.net.pl.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?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="2013-12-15T00:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://aai.pionier.net.pl/en/index.php?page=rps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </md:Extensions>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope regexp="false">aai.pionier.net.pl</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">PIONIER Consortium</mdui:DisplayName>
-        <mdui:Description xml:lang="en">
-            PIONIER Consortium Identity Provider 
-         </mdui:Description>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDmjCCAoICCQDmaHpUoCXQpDANBgkqhkiG9w0BAQUFADCBjjELMAkGA1UEBhMCUEwxMTAvBgNVBAoTKFVuaXdlcnN5dGV0IE1pa29sYWphIEtvcGVybmlrYSB3IFRvcnVuaXUxKTAnBgNVBAsTIFVjemVsbmlhbmUgQ2VudHJ1bSBJbmZvcm1hdHljem5lMSEwHwYDVQQDExhsb2dpbi5hYWkucGlvbmllci5uZXQucGwwHhcNMTMwNDIyMDkyNjI3WhcNMjMwNDIyMDkyNjI3WjCBjjELMAkGA1UEBhMCUEwxMTAvBgNVBAoTKFVuaXdlcnN5dGV0IE1pa29sYWphIEtvcGVybmlrYSB3IFRvcnVuaXUxKTAnBgNVBAsTIFVjemVsbmlhbmUgQ2VudHJ1bSBJbmZvcm1hdHljem5lMSEwHwYDVQQDExhsb2dpbi5hYWkucGlvbmllci5uZXQucGwwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC0Uf5C3sRuXMaoCQtvE47bf+tWUJX8v8KCIYaAFylqJuMLX7WDM54vtgjGsrLzY9KC3quHEG2H5CtkCnAiRLuz1veufuIkKqXl2vnbVmVwc4f8uXrDGnzEQb9Pa9Nu1Qu6G3WytCHhZJUJ6wL/VyYbONnIxxs99obLxMIJ6knMmeDl/nkM5h5h2/pRTltzbw1v0+YWp8uoX/6WmFasOY2RWy7s27L3ooN4gkRgvfaj3PZ+uRopWg8rssvMoTngQALZDlw1mlzrORupnigyQYsHjTcDZTLm7Dt9QF0WVgHfYNnz3KynCceSqQQL+b2OsTAv7UYBs6h09SvMPz6Ew/KdAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBAEBhyUU61t7kzq6tlZKvsyVlAF2jqyEZCijaeo7kOragifoTrFPLXHCiIDYvfgYkKx3mx/tsus8ntm7zigb2+nbBKNgMux0GQpeu2sXRuSdUZ2qRUzzblXN6x9JmqMXTchTiw9+SCoxuJZ2Di/d0yVSg0NcHNaB42HKE5PenuwnSU9Yo26JgSA3xJfWYFkAcT676yzySgRXasbzv2idBpKYXY2kECoggrzmyxfkuMCHWENk+k06EM1mVuS6gdU/SsJWksLDG+6gjah0UHMpNaXjGsZsNIw/6SkdJOex3Pp1CpW8/nxQyxkftFSIhEYvqbWBVL+VfiAjG9JrZC4o5x/8=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDmjCCAoICCQDmaHpUoCXQpDANBgkqhkiG9w0BAQUFADCBjjELMAkGA1UEBhMCUEwxMTAvBgNVBAoTKFVuaXdlcnN5dGV0IE1pa29sYWphIEtvcGVybmlrYSB3IFRvcnVuaXUxKTAnBgNVBAsTIFVjemVsbmlhbmUgQ2VudHJ1bSBJbmZvcm1hdHljem5lMSEwHwYDVQQDExhsb2dpbi5hYWkucGlvbmllci5uZXQucGwwHhcNMTMwNDIyMDkyNjI3WhcNMjMwNDIyMDkyNjI3WjCBjjELMAkGA1UEBhMCUEwxMTAvBgNVBAoTKFVuaXdlcnN5dGV0IE1pa29sYWphIEtvcGVybmlrYSB3IFRvcnVuaXUxKTAnBgNVBAsTIFVjemVsbmlhbmUgQ2VudHJ1bSBJbmZvcm1hdHljem5lMSEwHwYDVQQDExhsb2dpbi5hYWkucGlvbmllci5uZXQucGwwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC0Uf5C3sRuXMaoCQtvE47bf+tWUJX8v8KCIYaAFylqJuMLX7WDM54vtgjGsrLzY9KC3quHEG2H5CtkCnAiRLuz1veufuIkKqXl2vnbVmVwc4f8uXrDGnzEQb9Pa9Nu1Qu6G3WytCHhZJUJ6wL/VyYbONnIxxs99obLxMIJ6knMmeDl/nkM5h5h2/pRTltzbw1v0+YWp8uoX/6WmFasOY2RWy7s27L3ooN4gkRgvfaj3PZ+uRopWg8rssvMoTngQALZDlw1mlzrORupnigyQYsHjTcDZTLm7Dt9QF0WVgHfYNnz3KynCceSqQQL+b2OsTAv7UYBs6h09SvMPz6Ew/KdAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBAEBhyUU61t7kzq6tlZKvsyVlAF2jqyEZCijaeo7kOragifoTrFPLXHCiIDYvfgYkKx3mx/tsus8ntm7zigb2+nbBKNgMux0GQpeu2sXRuSdUZ2qRUzzblXN6x9JmqMXTchTiw9+SCoxuJZ2Di/d0yVSg0NcHNaB42HKE5PenuwnSU9Yo26JgSA3xJfWYFkAcT676yzySgRXasbzv2idBpKYXY2kECoggrzmyxfkuMCHWENk+k06EM1mVuS6gdU/SsJWksLDG+6gjah0UHMpNaXjGsZsNIw/6SkdJOex3Pp1CpW8/nxQyxkftFSIhEYvqbWBVL+VfiAjG9JrZC4o5x/8=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.aai.pionier.net.pl/IdP/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://login.aai.pionier.net.pl/IdP/saml2/idp/SSOService.php"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">PIONIER Consortium</md:OrganizationName>
-    <md:OrganizationName xml:lang="pl">Konsorcjum PIONIER</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">PIONIER Consortium</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="pl">Konsorcjum PIONIER</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.pionier.net.pl</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>PIONIER IdP</md:SurName>
-    <md:EmailAddress>admin@aai.pionier.net.pl</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/login.aaiedu.hr-edugain-saml2-idp-metadata.php.xml b/swamid-interfederations-2.0/login.aaiedu.hr-edugain-saml2-idp-metadata.php.xml
deleted file mode 100644
index d6ea4e2f..00000000
--- a/swamid-interfederations-2.0/login.aaiedu.hr-edugain-saml2-idp-metadata.php.xml
+++ /dev/null
@@ -1,274 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://login.aaiedu.hr/edugain/saml2/idp/metadata.php">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.srce.hr" registrationInstant="2012-01-01T08:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="hr">http://www.aaiedu.hr/docs/AAI@EduHr-pravilnik-ver1.3.1.pdf</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </md:Extensions>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">acmt.hr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">adu.hr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">agr.hr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">alu.hr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">apuri.hr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">arhitekt.hr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">arhiv.hr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">asoo.hr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">aspira.hr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">azoo.hr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">azvo.hr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bak.hr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bernays.hr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bfm.hr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bicro.hr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">boginst.hr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bolnica-karlovac.hr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bolnica-srebrnjak.hr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bolnica-zadar.hr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">carnet.hr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">dhz.hr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">diplomacija.hr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">diu.hr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">djkbf.hr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">dkd.hr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">efos.hr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">efri.hr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">efst.hr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">efzg.hr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">eihp.hr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">eizg.hr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">erf.hr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">etfos.hr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">evtos.hr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fer.hr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fesb.hr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ffdi.hr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ffos.hr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ffri.hr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ffst.hr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ffzg.hr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fkit.hr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fkz.hr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">foi.hr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">foozos.hr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fpz.hr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fpzg.hr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fsb.hr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fthm.hr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ftidi.hr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">galapagos-ic.hr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">geof.hr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gfos.hr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gfv.hr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gkka.hr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gkpz.hr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gkri.hr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gkvk.hr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gkzd.hr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">grad.hr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gradri.hr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gradst.hr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">grf.hr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gskos.hr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">h-r-z.hr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hatz.hr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hazu.hr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hck.hr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hera.hr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hgi-cgs.hr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hhi.hr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hpm.hr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hrbi.hr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hrstud.hr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hrzz.hr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hsin.hr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hzjz.hr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">iarh.hr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">idb.hr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">idi.hr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ief.hr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ifs.hr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ifzg.hr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">igh.hr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ihjj.hr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ijf.hr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">imi.hr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">imin.hr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">imz.hr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">inantro.hr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">iptpo.hr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ipu.hr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ipv-zg.hr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">irb.hr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">irmo.hr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">isp.hr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">izor.hr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">iztzg.hr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kb-merkur.hr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kbc-rijeka.hr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kbc-zagreb.hr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kbcsm.hr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kbd.hr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kbf-st.hr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kbf.hr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kbo.hr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kbsd.hr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kbsplit.hr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kif.hr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kifst.hr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">koncar-institut.hr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">krs.hr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ktf-split.hr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">libertas.hr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lzmk.hr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">matica.hr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">medils.hr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">medri.hr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mef.hr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mefos.hr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mefst.hr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mev.hr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mobilnost.hr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">muza.hr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mzos.hr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ncvvo.hr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nsk.hr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nsz.hr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">obhpknin.hr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">obrtnicko-uciliste.hr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">oikon.hr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">pak.hr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">par.hr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">pbf.hr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">pfos.hr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">pfri.hr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">pfst.hr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">pharma.hr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">pilar.hr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">pmf.hr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">pmfst.hr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">politehnika-pula.hr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">poljinos.hr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">pou-amc.hr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">pou.hr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">pozeska-bolnica.hr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">pravo.hr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">pravos.hr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">pravri.hr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">pravst.hr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ptfos.hr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">public.hr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">racunarstvo.hr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">rgn.hr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">riteh.hr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">scri.hr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">scsi.hr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">scst.hr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">scvz.hr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sczg.hr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sfsb.hr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sfzg.hr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">simet.hr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">skole.hr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">skolski-sport.hr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">snz.hr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">srce.hr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">stampar.hr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">stin.hr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">stucos.hr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">stucsb.hr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sumfak.hr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sumins.hr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">suvag.hr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">svkatarina.hr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">svkri.hr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">svkst.hr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">tcs.hr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">tera.hr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">tfmvi.hr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">thalassotherapia-opatija.hr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ttf.hr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">tvz.hr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uaos.hr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uciliste-umag.hr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ufri.hr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ufzg.hr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">umas.hr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unicath.hr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unidu.hr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unin.hr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unios.hr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unipu.hr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uniri.hr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unist.hr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unizd.hr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unizg.hr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vef.hr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">veinst.hr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">velegs-nikolatesla.hr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">veleknin.hr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">veleri.hr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vernnet.hr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vevu.hr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vguk.hr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vhzk.hr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">visoka-skola-rrif.hr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vps-minerva.hr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vpsvisnjan.hr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vpsz.hr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vsa.hr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vsfp.hr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vsikmp.hr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vsite.hr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vsmti.hr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vss.hr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vszrinski.hr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vtsbj.hr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vuka.hr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vup.hr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vus.hr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vusb.hr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vvg.hr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">zkzd.hr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">zsem.hr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">zvu.hr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">AAI@EduHr Single Sign-On Service</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="hr">AAI@EduHr sustav jedinstvene autentikacije korisnika</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Central Login Service for the AAI@EduHr Federation with implemented Single Sign-On Feature</mdui:Description>
-        <mdui:Description xml:lang="hr">Centralni autentikacijski servis AAI@EduHr federacije s implementiranim sustavom jedinstvene autentikacije korisnika</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>MIIEbDCCA1SgAwIBAgIRAMJdD3IJBmpJHEQG+rTMyXwwDQYJKoZIhvcNAQEFBQAwNjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5BIFNTTCBDQTAeFw0xMzAzMDUwMDAwMDBaFw0xNjAzMDQyMzU5NTlaMD0xITAfBgNVBAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEYMBYGA1UEAxMPbG9naW4uYWFpZWR1LmhyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApy7oHZwX71g3azW6La+cLUi+IQ30SheA6BQy2QDpeYc8CfD88mdNqq7m9ZMg81bKS0YH+dsx4/SRfus1XeyvJpFnYeEbfjk4HMbowkgn8L7ChaepbpVvEjGOE951WtDmRhhmrI7YmxOZLH4b+gI0cVkM6Ui/H4WnhbH48/I5azEtOlxFhMsknDkkKisla4scnzAQh66Cn3+BTPMD23GrrH9Rw5fqR4FiE6Ktyh8x+5m6UdReqz69lV4R5wsaO42LWDig6/xA20QAqM5RGvLCF+aJJir2tX/Lt3ZquEw7GEm6fmmvFkusiFo5ltj0DAWTrfefyDS3FyOJnyY8bZS3SQIDAQABo4IBbDCCAWgwHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsrN1dH6pDjue0wHQYDVR0OBBYEFD5Y+Ju72FzuaCJlvwPZEYpU/T9SMA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8vb2NzcC50Y3MudGVyZW5hLm9yZzAaBgNVHREEEzARgg9sb2dpbi5hYWllZHUuaHIwDQYJKoZIhvcNAQEFBQADggEBABfnS6qVN+xKNaG6FYggkorFWcSGe5L/ff00AFxkYRZfaWn+UfX3bxUF3zGzbhTw7aW95cfyI6ACs8N/WiK5ACbU8H+BoAZqbceuTbEjuyEFlXOqXTX/BGkE9cU9FT9RKV/BOVBQZDGFEGi0lidYqtj8A51kyYIRVDb6MkfUQ3TnB7Iv7yD1ut9eqhq/ifrPvyG8dDwUMEir/iUosdVQBiNyXkGqrL7Wo2VCfAGEmWeeHmDCdEIWktUv+L/b1e0k1Jd9Zvf1vRxHCQNMkUXGbY3OHNircf1wySgccgiCUHKT00armIaw4lbpd98m5ZnaOl6ZhrsZGsvYk/iCoo+sfug=</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>MIIEbDCCA1SgAwIBAgIRAMJdD3IJBmpJHEQG+rTMyXwwDQYJKoZIhvcNAQEFBQAwNjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5BIFNTTCBDQTAeFw0xMzAzMDUwMDAwMDBaFw0xNjAzMDQyMzU5NTlaMD0xITAfBgNVBAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEYMBYGA1UEAxMPbG9naW4uYWFpZWR1LmhyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApy7oHZwX71g3azW6La+cLUi+IQ30SheA6BQy2QDpeYc8CfD88mdNqq7m9ZMg81bKS0YH+dsx4/SRfus1XeyvJpFnYeEbfjk4HMbowkgn8L7ChaepbpVvEjGOE951WtDmRhhmrI7YmxOZLH4b+gI0cVkM6Ui/H4WnhbH48/I5azEtOlxFhMsknDkkKisla4scnzAQh66Cn3+BTPMD23GrrH9Rw5fqR4FiE6Ktyh8x+5m6UdReqz69lV4R5wsaO42LWDig6/xA20QAqM5RGvLCF+aJJir2tX/Lt3ZquEw7GEm6fmmvFkusiFo5ltj0DAWTrfefyDS3FyOJnyY8bZS3SQIDAQABo4IBbDCCAWgwHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsrN1dH6pDjue0wHQYDVR0OBBYEFD5Y+Ju72FzuaCJlvwPZEYpU/T9SMA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8vb2NzcC50Y3MudGVyZW5hLm9yZzAaBgNVHREEEzARgg9sb2dpbi5hYWllZHUuaHIwDQYJKoZIhvcNAQEFBQADggEBABfnS6qVN+xKNaG6FYggkorFWcSGe5L/ff00AFxkYRZfaWn+UfX3bxUF3zGzbhTw7aW95cfyI6ACs8N/WiK5ACbU8H+BoAZqbceuTbEjuyEFlXOqXTX/BGkE9cU9FT9RKV/BOVBQZDGFEGi0lidYqtj8A51kyYIRVDb6MkfUQ3TnB7Iv7yD1ut9eqhq/ifrPvyG8dDwUMEir/iUosdVQBiNyXkGqrL7Wo2VCfAGEmWeeHmDCdEIWktUv+L/b1e0k1Jd9Zvf1vRxHCQNMkUXGbY3OHNircf1wySgccgiCUHKT00armIaw4lbpd98m5ZnaOl6ZhrsZGsvYk/iCoo+sfug=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.aaiedu.hr/edugain/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://login.aaiedu.hr/edugain/saml2/idp/SSOService.php"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">AAI@EduHr</md:OrganizationName>
-    <md:OrganizationName xml:lang="hr">AAI@EduHr</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">AAI@EduHr - Croatian Research and Education Federation</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="hr">AAI@EduHr - Autentikacijska i autorizacijska infrastruktura sustava znanosti i visokog obrazovanja u Republici Hrvatskoj</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.aaiedu.hr</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="hr">http://www.aaiedu.hr</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Dubravko</md:GivenName>
-    <md:SurName>Voncina</md:SurName>
-    <md:EmailAddress>dubravko.voncina@srce.hr</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/login.aaiedu.hr-wayf-module.php-saml-sp-metadata.php-default-sp.xml b/swamid-interfederations-2.0/login.aaiedu.hr-wayf-module.php-saml-sp-metadata.php-default-sp.xml
deleted file mode 100644
index cbc2b884..00000000
--- a/swamid-interfederations-2.0/login.aaiedu.hr-wayf-module.php-saml-sp-metadata.php-default-sp.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://login.aaiedu.hr/wayf/module.php/saml/sp/metadata.php/default-sp">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.srce.hr" registrationInstant="2014-07-01T08:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="hr">http://www.aaiedu.hr/docs/AAI@EduHr-pravilnik-ver1.3.1.pdf</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIIEbDCCA1SgAwIBAgIRAMJdD3IJBmpJHEQG+rTMyXwwDQYJKoZIhvcNAQEFBQAwNjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5BIFNTTCBDQTAeFw0xMzAzMDUwMDAwMDBaFw0xNjAzMDQyMzU5NTlaMD0xITAfBgNVBAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEYMBYGA1UEAxMPbG9naW4uYWFpZWR1LmhyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApy7oHZwX71g3azW6La+cLUi+IQ30SheA6BQy2QDpeYc8CfD88mdNqq7m9ZMg81bKS0YH+dsx4/SRfus1XeyvJpFnYeEbfjk4HMbowkgn8L7ChaepbpVvEjGOE951WtDmRhhmrI7YmxOZLH4b+gI0cVkM6Ui/H4WnhbH48/I5azEtOlxFhMsknDkkKisla4scnzAQh66Cn3+BTPMD23GrrH9Rw5fqR4FiE6Ktyh8x+5m6UdReqz69lV4R5wsaO42LWDig6/xA20QAqM5RGvLCF+aJJir2tX/Lt3ZquEw7GEm6fmmvFkusiFo5ltj0DAWTrfefyDS3FyOJnyY8bZS3SQIDAQABo4IBbDCCAWgwHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsrN1dH6pDjue0wHQYDVR0OBBYEFD5Y+Ju72FzuaCJlvwPZEYpU/T9SMA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8vb2NzcC50Y3MudGVyZW5hLm9yZzAaBgNVHREEEzARgg9sb2dpbi5hYWllZHUuaHIwDQYJKoZIhvcNAQEFBQADggEBABfnS6qVN+xKNaG6FYggkorFWcSGe5L/ff00AFxkYRZfaWn+UfX3bxUF3zGzbhTw7aW95cfyI6ACs8N/WiK5ACbU8H+BoAZqbceuTbEjuyEFlXOqXTX/BGkE9cU9FT9RKV/BOVBQZDGFEGi0lidYqtj8A51kyYIRVDb6MkfUQ3TnB7Iv7yD1ut9eqhq/ifrPvyG8dDwUMEir/iUosdVQBiNyXkGqrL7Wo2VCfAGEmWeeHmDCdEIWktUv+L/b1e0k1Jd9Zvf1vRxHCQNMkUXGbY3OHNircf1wySgccgiCUHKT00armIaw4lbpd98m5ZnaOl6ZhrsZGsvYk/iCoo+sfug=</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>MIIEbDCCA1SgAwIBAgIRAMJdD3IJBmpJHEQG+rTMyXwwDQYJKoZIhvcNAQEFBQAwNjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5BIFNTTCBDQTAeFw0xMzAzMDUwMDAwMDBaFw0xNjAzMDQyMzU5NTlaMD0xITAfBgNVBAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEYMBYGA1UEAxMPbG9naW4uYWFpZWR1LmhyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApy7oHZwX71g3azW6La+cLUi+IQ30SheA6BQy2QDpeYc8CfD88mdNqq7m9ZMg81bKS0YH+dsx4/SRfus1XeyvJpFnYeEbfjk4HMbowkgn8L7ChaepbpVvEjGOE951WtDmRhhmrI7YmxOZLH4b+gI0cVkM6Ui/H4WnhbH48/I5azEtOlxFhMsknDkkKisla4scnzAQh66Cn3+BTPMD23GrrH9Rw5fqR4FiE6Ktyh8x+5m6UdReqz69lV4R5wsaO42LWDig6/xA20QAqM5RGvLCF+aJJir2tX/Lt3ZquEw7GEm6fmmvFkusiFo5ltj0DAWTrfefyDS3FyOJnyY8bZS3SQIDAQABo4IBbDCCAWgwHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsrN1dH6pDjue0wHQYDVR0OBBYEFD5Y+Ju72FzuaCJlvwPZEYpU/T9SMA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8vb2NzcC50Y3MudGVyZW5hLm9yZzAaBgNVHREEEzARgg9sb2dpbi5hYWllZHUuaHIwDQYJKoZIhvcNAQEFBQADggEBABfnS6qVN+xKNaG6FYggkorFWcSGe5L/ff00AFxkYRZfaWn+UfX3bxUF3zGzbhTw7aW95cfyI6ACs8N/WiK5ACbU8H+BoAZqbceuTbEjuyEFlXOqXTX/BGkE9cU9FT9RKV/BOVBQZDGFEGi0lidYqtj8A51kyYIRVDb6MkfUQ3TnB7Iv7yD1ut9eqhq/ifrPvyG8dDwUMEir/iUosdVQBiNyXkGqrL7Wo2VCfAGEmWeeHmDCdEIWktUv+L/b1e0k1Jd9Zvf1vRxHCQNMkUXGbY3OHNircf1wySgccgiCUHKT00armIaw4lbpd98m5ZnaOl6ZhrsZGsvYk/iCoo+sfug=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.aaiedu.hr/wayf/module.php/saml/sp/saml2-logout.php/default-sp"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.aaiedu.hr/wayf/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://login.aaiedu.hr/wayf/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://login.aaiedu.hr/wayf/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://login.aaiedu.hr/wayf/module.php/saml/sp/saml1-acs.php/default-sp/artifact" index="3"/>
-    <md:AttributeConsumingService index="0">
-      <md:ServiceName xml:lang="en">WAYF bridging element for eduGAIN enabled services</md:ServiceName>
-      <md:ServiceDescription xml:lang="en">WAYF bridging element for eduGAIN enabled services registered within AAI@EduHr federation</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:RequestedAttribute Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <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: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: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: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.25178.1.2.5" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">AAI@EduHr</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">AAI@EduHr</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.aaiedu.hr</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Dubravko</md:GivenName>
-    <md:SurName>Voncina</md:SurName>
-    <md:EmailAddress>dubravko.voncina@srce.hr</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:Company>AAI@EduHr operations team</md:Company>
-    <md:EmailAddress>team@aaiedu.hr</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/login.aaiedu.hr.xml b/swamid-interfederations-2.0/login.aaiedu.hr.xml
deleted file mode 100644
index cbc2b884..00000000
--- a/swamid-interfederations-2.0/login.aaiedu.hr.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://login.aaiedu.hr/wayf/module.php/saml/sp/metadata.php/default-sp">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.srce.hr" registrationInstant="2014-07-01T08:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="hr">http://www.aaiedu.hr/docs/AAI@EduHr-pravilnik-ver1.3.1.pdf</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIIEbDCCA1SgAwIBAgIRAMJdD3IJBmpJHEQG+rTMyXwwDQYJKoZIhvcNAQEFBQAwNjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5BIFNTTCBDQTAeFw0xMzAzMDUwMDAwMDBaFw0xNjAzMDQyMzU5NTlaMD0xITAfBgNVBAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEYMBYGA1UEAxMPbG9naW4uYWFpZWR1LmhyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApy7oHZwX71g3azW6La+cLUi+IQ30SheA6BQy2QDpeYc8CfD88mdNqq7m9ZMg81bKS0YH+dsx4/SRfus1XeyvJpFnYeEbfjk4HMbowkgn8L7ChaepbpVvEjGOE951WtDmRhhmrI7YmxOZLH4b+gI0cVkM6Ui/H4WnhbH48/I5azEtOlxFhMsknDkkKisla4scnzAQh66Cn3+BTPMD23GrrH9Rw5fqR4FiE6Ktyh8x+5m6UdReqz69lV4R5wsaO42LWDig6/xA20QAqM5RGvLCF+aJJir2tX/Lt3ZquEw7GEm6fmmvFkusiFo5ltj0DAWTrfefyDS3FyOJnyY8bZS3SQIDAQABo4IBbDCCAWgwHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsrN1dH6pDjue0wHQYDVR0OBBYEFD5Y+Ju72FzuaCJlvwPZEYpU/T9SMA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8vb2NzcC50Y3MudGVyZW5hLm9yZzAaBgNVHREEEzARgg9sb2dpbi5hYWllZHUuaHIwDQYJKoZIhvcNAQEFBQADggEBABfnS6qVN+xKNaG6FYggkorFWcSGe5L/ff00AFxkYRZfaWn+UfX3bxUF3zGzbhTw7aW95cfyI6ACs8N/WiK5ACbU8H+BoAZqbceuTbEjuyEFlXOqXTX/BGkE9cU9FT9RKV/BOVBQZDGFEGi0lidYqtj8A51kyYIRVDb6MkfUQ3TnB7Iv7yD1ut9eqhq/ifrPvyG8dDwUMEir/iUosdVQBiNyXkGqrL7Wo2VCfAGEmWeeHmDCdEIWktUv+L/b1e0k1Jd9Zvf1vRxHCQNMkUXGbY3OHNircf1wySgccgiCUHKT00armIaw4lbpd98m5ZnaOl6ZhrsZGsvYk/iCoo+sfug=</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>MIIEbDCCA1SgAwIBAgIRAMJdD3IJBmpJHEQG+rTMyXwwDQYJKoZIhvcNAQEFBQAwNjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5BIFNTTCBDQTAeFw0xMzAzMDUwMDAwMDBaFw0xNjAzMDQyMzU5NTlaMD0xITAfBgNVBAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEYMBYGA1UEAxMPbG9naW4uYWFpZWR1LmhyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApy7oHZwX71g3azW6La+cLUi+IQ30SheA6BQy2QDpeYc8CfD88mdNqq7m9ZMg81bKS0YH+dsx4/SRfus1XeyvJpFnYeEbfjk4HMbowkgn8L7ChaepbpVvEjGOE951WtDmRhhmrI7YmxOZLH4b+gI0cVkM6Ui/H4WnhbH48/I5azEtOlxFhMsknDkkKisla4scnzAQh66Cn3+BTPMD23GrrH9Rw5fqR4FiE6Ktyh8x+5m6UdReqz69lV4R5wsaO42LWDig6/xA20QAqM5RGvLCF+aJJir2tX/Lt3ZquEw7GEm6fmmvFkusiFo5ltj0DAWTrfefyDS3FyOJnyY8bZS3SQIDAQABo4IBbDCCAWgwHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsrN1dH6pDjue0wHQYDVR0OBBYEFD5Y+Ju72FzuaCJlvwPZEYpU/T9SMA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8vb2NzcC50Y3MudGVyZW5hLm9yZzAaBgNVHREEEzARgg9sb2dpbi5hYWllZHUuaHIwDQYJKoZIhvcNAQEFBQADggEBABfnS6qVN+xKNaG6FYggkorFWcSGe5L/ff00AFxkYRZfaWn+UfX3bxUF3zGzbhTw7aW95cfyI6ACs8N/WiK5ACbU8H+BoAZqbceuTbEjuyEFlXOqXTX/BGkE9cU9FT9RKV/BOVBQZDGFEGi0lidYqtj8A51kyYIRVDb6MkfUQ3TnB7Iv7yD1ut9eqhq/ifrPvyG8dDwUMEir/iUosdVQBiNyXkGqrL7Wo2VCfAGEmWeeHmDCdEIWktUv+L/b1e0k1Jd9Zvf1vRxHCQNMkUXGbY3OHNircf1wySgccgiCUHKT00armIaw4lbpd98m5ZnaOl6ZhrsZGsvYk/iCoo+sfug=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.aaiedu.hr/wayf/module.php/saml/sp/saml2-logout.php/default-sp"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.aaiedu.hr/wayf/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://login.aaiedu.hr/wayf/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://login.aaiedu.hr/wayf/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://login.aaiedu.hr/wayf/module.php/saml/sp/saml1-acs.php/default-sp/artifact" index="3"/>
-    <md:AttributeConsumingService index="0">
-      <md:ServiceName xml:lang="en">WAYF bridging element for eduGAIN enabled services</md:ServiceName>
-      <md:ServiceDescription xml:lang="en">WAYF bridging element for eduGAIN enabled services registered within AAI@EduHr federation</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:RequestedAttribute Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <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: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: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: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.25178.1.2.5" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">AAI@EduHr</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">AAI@EduHr</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.aaiedu.hr</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Dubravko</md:GivenName>
-    <md:SurName>Voncina</md:SurName>
-    <md:EmailAddress>dubravko.voncina@srce.hr</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:Company>AAI@EduHr operations team</md:Company>
-    <md:EmailAddress>team@aaiedu.hr</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/login.athena-innovation.gr-idp-shibboleth.xml b/swamid-interfederations-2.0/login.athena-innovation.gr-idp-shibboleth.xml
deleted file mode 100644
index 05545b55..00000000
--- a/swamid-interfederations-2.0/login.athena-innovation.gr-idp-shibboleth.xml
+++ /dev/null
@@ -1,144 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://login.athena-innovation.gr/idp/shibboleth">
-  <Extensions xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi">
-    <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 xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">athena-innovation.gr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">imis.athena-innovation.gr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ilsp.athena-innovation.gr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ceti.athena-innovation.gr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">isi.athena-innovation.gr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Athena - Research and Innovation Center</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="el">Αθηνά - Ερευνητικό Κέντρο Καινοτομίας</mdui:DisplayName>
-        <mdui:InformationURL xml:lang="en">http://www.athena-innovation.gr/en.html</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="el">http://www.athena-innovation.gr/el.html</mdui:InformationURL>
-        <mdui:Logo height="90" width="73">https://login.athena-innovation.gr/logo.png</mdui:Logo>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DomainHint>athena-innovation.gr</mdui:DomainHint>
-        <mdui:DomainHint>imis.athena-innovation.gr</mdui:DomainHint>
-        <mdui:DomainHint>ilsp.gr</mdui:DomainHint>
-        <mdui:DomainHint>ceti.gr</mdui:DomainHint>
-        <mdui:DomainHint>isi.gr</mdui:DomainHint>
-        <mdui:IPHint>195.251.63.0/24</mdui:IPHint>
-        <mdui:IPHint>195.251.3.0/24</mdui:IPHint>
-        <mdui:IPHint>195.251.58.0/24</mdui:IPHint>
-        <mdui:IPHint>194.177.192.0/24</mdui:IPHint>
-        <mdui:IPHint>194.177.217.0/24</mdui:IPHint>
-        <mdui:IPHint>2001:648:2600::/48</mdui:IPHint>
-        <mdui:GeolocationHint>geo:38.0365046,23.802512</mdui:GeolocationHint>
-      </mdui:DiscoHints>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-                            MIIEmzCCA4OgAwIBAgIQTEvhgWFGJLdkM4ZD5wBQTDANBgkqhkiG9w0BAQUFADA2
-                            MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-                            U1NMIENBMB4XDTE0MDQwOTAwMDAwMFoXDTE3MDQwODIzNTk1OVowSDEhMB8GA1UE
-                            CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMSMwIQYDVQQDExpsb2dpbi5hdGhl
-                            bmEtaW5ub3ZhdGlvbi5ncjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
-                            AKaZpSw3Pb3kDBhJzRXUcnUqFZqJSoLjvSMHnxt0GDjBsvmQZwDflsuIu5nbXQ86
-                            DnK7ImdQszT42hal7RFODHrD9F1TC/7zoQRd5DoLnHdKOeHQRAa2WF+IwkrtiyQT
-                            gMhswaqal8wXr7sM+f0bDOYvU3Q2MVdAmE1TefrlPx90hHys+SbreRjj/HUCCsBI
-                            zgfnFcy56Mmr0m9Olbh56VhAs+qZhYpWDyGhuHaRaNEhuJCx0R7IZmFhNGZ/+2+s
-                            CdK1j/hq08c1L7wON/ZDdSBGbM5cuCoxPqIcLyyEgEh4ieo/c8e04ZfxwBFU9XZI
-                            ApX4niHSErzC/bNDMWR+f3kCAwEAAaOCAZEwggGNMB8GA1UdIwQYMBaAFAy9k2gM
-                            896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBR0AyJjhZwmKiXLMvyVR6BYE68JYTAO
-                            BgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcD
-                            AQYIKwYBBQUHAwIwIgYDVR0gBBswGTANBgsrBgEEAbIxAQICHTAIBgZngQwBAgEw
-                            OgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJF
-                            TkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8v
-                            Y3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYa
-                            aHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwPwYDVR0RBDgwNoIabG9naW4uYXRo
-                            ZW5hLWlubm92YXRpb24uZ3KCGGlkcC5hdGhlbmEtaW5ub3ZhdGlvbi5ncjANBgkq
-                            hkiG9w0BAQUFAAOCAQEAA1a3pfD6Iq6rMgZgmJeUEge9y3uLN5YGzJYjsNYvznhZ
-                            tnfuKighFcdQwH/Ph/ceZYtwcIMXstZFxXsFM878PiEehLSghYJorC0e9EDszIsc
-                            QgbzraX/vEjWRZ4ywQU1nsc1+3EYZyIfxmi35FiT8g0xSEVpSj4O1RoDO3xUz8NJ
-                            zDycQMlH2qMDDNdgYGqs/U3habyE1MeAHbz6zWhX6Sa1oeIy6gijvGUUadDULhX3
-                            iVNxJAYr4coKFN/Xj58Ay6JjomJCgmve/lnkdQRuvAZFcu7UiGJfDpBiJNr1Qyzp
-                            bH/fFKDIDSjRobYahs2BQ/SwbEwwA7e0gx0vS/ACwA==
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.athena-innovation.gr:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.athena-innovation.gr:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.athena-innovation.gr/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.athena-innovation.gr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://login.athena-innovation.gr/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.athena-innovation.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="false">athena-innovation.gr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">imis.athena-innovation.gr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ilsp.athena-innovation.gr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ceti.athena-innovation.gr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">isi.athena-innovation.gr</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-                            MIIEmzCCA4OgAwIBAgIQTEvhgWFGJLdkM4ZD5wBQTDANBgkqhkiG9w0BAQUFADA2
-                            MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-                            U1NMIENBMB4XDTE0MDQwOTAwMDAwMFoXDTE3MDQwODIzNTk1OVowSDEhMB8GA1UE
-                            CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMSMwIQYDVQQDExpsb2dpbi5hdGhl
-                            bmEtaW5ub3ZhdGlvbi5ncjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
-                            AKaZpSw3Pb3kDBhJzRXUcnUqFZqJSoLjvSMHnxt0GDjBsvmQZwDflsuIu5nbXQ86
-                            DnK7ImdQszT42hal7RFODHrD9F1TC/7zoQRd5DoLnHdKOeHQRAa2WF+IwkrtiyQT
-                            gMhswaqal8wXr7sM+f0bDOYvU3Q2MVdAmE1TefrlPx90hHys+SbreRjj/HUCCsBI
-                            zgfnFcy56Mmr0m9Olbh56VhAs+qZhYpWDyGhuHaRaNEhuJCx0R7IZmFhNGZ/+2+s
-                            CdK1j/hq08c1L7wON/ZDdSBGbM5cuCoxPqIcLyyEgEh4ieo/c8e04ZfxwBFU9XZI
-                            ApX4niHSErzC/bNDMWR+f3kCAwEAAaOCAZEwggGNMB8GA1UdIwQYMBaAFAy9k2gM
-                            896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBR0AyJjhZwmKiXLMvyVR6BYE68JYTAO
-                            BgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcD
-                            AQYIKwYBBQUHAwIwIgYDVR0gBBswGTANBgsrBgEEAbIxAQICHTAIBgZngQwBAgEw
-                            OgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJF
-                            TkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8v
-                            Y3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYa
-                            aHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwPwYDVR0RBDgwNoIabG9naW4uYXRo
-                            ZW5hLWlubm92YXRpb24uZ3KCGGlkcC5hdGhlbmEtaW5ub3ZhdGlvbi5ncjANBgkq
-                            hkiG9w0BAQUFAAOCAQEAA1a3pfD6Iq6rMgZgmJeUEge9y3uLN5YGzJYjsNYvznhZ
-                            tnfuKighFcdQwH/Ph/ceZYtwcIMXstZFxXsFM878PiEehLSghYJorC0e9EDszIsc
-                            QgbzraX/vEjWRZ4ywQU1nsc1+3EYZyIfxmi35FiT8g0xSEVpSj4O1RoDO3xUz8NJ
-                            zDycQMlH2qMDDNdgYGqs/U3habyE1MeAHbz6zWhX6Sa1oeIy6gijvGUUadDULhX3
-                            iVNxJAYr4coKFN/Xj58Ay6JjomJCgmve/lnkdQRuvAZFcu7UiGJfDpBiJNr1Qyzp
-                            bH/fFKDIDSjRobYahs2BQ/SwbEwwA7e0gx0vS/ACwA==
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.athena-innovation.gr:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.athena-innovation.gr:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Athena - Research and Innovation Center in Information, Communication and Knowledge Technologies</OrganizationName>
-    <OrganizationName xml:lang="el">Αθηνά - Ερευνητικό Κέντρο Καινοτομίας στις Τεχνολογίες της Πληροφορίας, των Επικοινωνιών και της Γνώσης</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Athena - Research and Innovation Center</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="el">Αθηνά - Ερευνητικό Κέντρο Καινοτομίας</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.athena-innovation.gr/</OrganizationURL>
-    <OrganizationURL xml:lang="el">http://www.athena-innovation.gr/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <Company>Research Center Athena - Institute for the Management of Information Systems</Company>
-    <EmailAddress>staff@imis.athena-innovation.gr</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="support">
-    <Company>Research Center Athena - Institute for the Management of Information Systems</Company>
-    <EmailAddress>staff@imis.athena-innovation.gr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/login.athena-innovation.gr.xml b/swamid-interfederations-2.0/login.athena-innovation.gr.xml
deleted file mode 100644
index 05545b55..00000000
--- a/swamid-interfederations-2.0/login.athena-innovation.gr.xml
+++ /dev/null
@@ -1,144 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://login.athena-innovation.gr/idp/shibboleth">
-  <Extensions xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi">
-    <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 xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">athena-innovation.gr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">imis.athena-innovation.gr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ilsp.athena-innovation.gr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ceti.athena-innovation.gr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">isi.athena-innovation.gr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Athena - Research and Innovation Center</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="el">Αθηνά - Ερευνητικό Κέντρο Καινοτομίας</mdui:DisplayName>
-        <mdui:InformationURL xml:lang="en">http://www.athena-innovation.gr/en.html</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="el">http://www.athena-innovation.gr/el.html</mdui:InformationURL>
-        <mdui:Logo height="90" width="73">https://login.athena-innovation.gr/logo.png</mdui:Logo>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DomainHint>athena-innovation.gr</mdui:DomainHint>
-        <mdui:DomainHint>imis.athena-innovation.gr</mdui:DomainHint>
-        <mdui:DomainHint>ilsp.gr</mdui:DomainHint>
-        <mdui:DomainHint>ceti.gr</mdui:DomainHint>
-        <mdui:DomainHint>isi.gr</mdui:DomainHint>
-        <mdui:IPHint>195.251.63.0/24</mdui:IPHint>
-        <mdui:IPHint>195.251.3.0/24</mdui:IPHint>
-        <mdui:IPHint>195.251.58.0/24</mdui:IPHint>
-        <mdui:IPHint>194.177.192.0/24</mdui:IPHint>
-        <mdui:IPHint>194.177.217.0/24</mdui:IPHint>
-        <mdui:IPHint>2001:648:2600::/48</mdui:IPHint>
-        <mdui:GeolocationHint>geo:38.0365046,23.802512</mdui:GeolocationHint>
-      </mdui:DiscoHints>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-                            MIIEmzCCA4OgAwIBAgIQTEvhgWFGJLdkM4ZD5wBQTDANBgkqhkiG9w0BAQUFADA2
-                            MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-                            U1NMIENBMB4XDTE0MDQwOTAwMDAwMFoXDTE3MDQwODIzNTk1OVowSDEhMB8GA1UE
-                            CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMSMwIQYDVQQDExpsb2dpbi5hdGhl
-                            bmEtaW5ub3ZhdGlvbi5ncjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
-                            AKaZpSw3Pb3kDBhJzRXUcnUqFZqJSoLjvSMHnxt0GDjBsvmQZwDflsuIu5nbXQ86
-                            DnK7ImdQszT42hal7RFODHrD9F1TC/7zoQRd5DoLnHdKOeHQRAa2WF+IwkrtiyQT
-                            gMhswaqal8wXr7sM+f0bDOYvU3Q2MVdAmE1TefrlPx90hHys+SbreRjj/HUCCsBI
-                            zgfnFcy56Mmr0m9Olbh56VhAs+qZhYpWDyGhuHaRaNEhuJCx0R7IZmFhNGZ/+2+s
-                            CdK1j/hq08c1L7wON/ZDdSBGbM5cuCoxPqIcLyyEgEh4ieo/c8e04ZfxwBFU9XZI
-                            ApX4niHSErzC/bNDMWR+f3kCAwEAAaOCAZEwggGNMB8GA1UdIwQYMBaAFAy9k2gM
-                            896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBR0AyJjhZwmKiXLMvyVR6BYE68JYTAO
-                            BgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcD
-                            AQYIKwYBBQUHAwIwIgYDVR0gBBswGTANBgsrBgEEAbIxAQICHTAIBgZngQwBAgEw
-                            OgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJF
-                            TkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8v
-                            Y3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYa
-                            aHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwPwYDVR0RBDgwNoIabG9naW4uYXRo
-                            ZW5hLWlubm92YXRpb24uZ3KCGGlkcC5hdGhlbmEtaW5ub3ZhdGlvbi5ncjANBgkq
-                            hkiG9w0BAQUFAAOCAQEAA1a3pfD6Iq6rMgZgmJeUEge9y3uLN5YGzJYjsNYvznhZ
-                            tnfuKighFcdQwH/Ph/ceZYtwcIMXstZFxXsFM878PiEehLSghYJorC0e9EDszIsc
-                            QgbzraX/vEjWRZ4ywQU1nsc1+3EYZyIfxmi35FiT8g0xSEVpSj4O1RoDO3xUz8NJ
-                            zDycQMlH2qMDDNdgYGqs/U3habyE1MeAHbz6zWhX6Sa1oeIy6gijvGUUadDULhX3
-                            iVNxJAYr4coKFN/Xj58Ay6JjomJCgmve/lnkdQRuvAZFcu7UiGJfDpBiJNr1Qyzp
-                            bH/fFKDIDSjRobYahs2BQ/SwbEwwA7e0gx0vS/ACwA==
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.athena-innovation.gr:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.athena-innovation.gr:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.athena-innovation.gr/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.athena-innovation.gr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://login.athena-innovation.gr/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.athena-innovation.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="false">athena-innovation.gr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">imis.athena-innovation.gr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ilsp.athena-innovation.gr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ceti.athena-innovation.gr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">isi.athena-innovation.gr</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-                            MIIEmzCCA4OgAwIBAgIQTEvhgWFGJLdkM4ZD5wBQTDANBgkqhkiG9w0BAQUFADA2
-                            MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-                            U1NMIENBMB4XDTE0MDQwOTAwMDAwMFoXDTE3MDQwODIzNTk1OVowSDEhMB8GA1UE
-                            CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMSMwIQYDVQQDExpsb2dpbi5hdGhl
-                            bmEtaW5ub3ZhdGlvbi5ncjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
-                            AKaZpSw3Pb3kDBhJzRXUcnUqFZqJSoLjvSMHnxt0GDjBsvmQZwDflsuIu5nbXQ86
-                            DnK7ImdQszT42hal7RFODHrD9F1TC/7zoQRd5DoLnHdKOeHQRAa2WF+IwkrtiyQT
-                            gMhswaqal8wXr7sM+f0bDOYvU3Q2MVdAmE1TefrlPx90hHys+SbreRjj/HUCCsBI
-                            zgfnFcy56Mmr0m9Olbh56VhAs+qZhYpWDyGhuHaRaNEhuJCx0R7IZmFhNGZ/+2+s
-                            CdK1j/hq08c1L7wON/ZDdSBGbM5cuCoxPqIcLyyEgEh4ieo/c8e04ZfxwBFU9XZI
-                            ApX4niHSErzC/bNDMWR+f3kCAwEAAaOCAZEwggGNMB8GA1UdIwQYMBaAFAy9k2gM
-                            896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBR0AyJjhZwmKiXLMvyVR6BYE68JYTAO
-                            BgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcD
-                            AQYIKwYBBQUHAwIwIgYDVR0gBBswGTANBgsrBgEEAbIxAQICHTAIBgZngQwBAgEw
-                            OgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJF
-                            TkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8v
-                            Y3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYa
-                            aHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwPwYDVR0RBDgwNoIabG9naW4uYXRo
-                            ZW5hLWlubm92YXRpb24uZ3KCGGlkcC5hdGhlbmEtaW5ub3ZhdGlvbi5ncjANBgkq
-                            hkiG9w0BAQUFAAOCAQEAA1a3pfD6Iq6rMgZgmJeUEge9y3uLN5YGzJYjsNYvznhZ
-                            tnfuKighFcdQwH/Ph/ceZYtwcIMXstZFxXsFM878PiEehLSghYJorC0e9EDszIsc
-                            QgbzraX/vEjWRZ4ywQU1nsc1+3EYZyIfxmi35FiT8g0xSEVpSj4O1RoDO3xUz8NJ
-                            zDycQMlH2qMDDNdgYGqs/U3habyE1MeAHbz6zWhX6Sa1oeIy6gijvGUUadDULhX3
-                            iVNxJAYr4coKFN/Xj58Ay6JjomJCgmve/lnkdQRuvAZFcu7UiGJfDpBiJNr1Qyzp
-                            bH/fFKDIDSjRobYahs2BQ/SwbEwwA7e0gx0vS/ACwA==
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.athena-innovation.gr:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.athena-innovation.gr:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Athena - Research and Innovation Center in Information, Communication and Knowledge Technologies</OrganizationName>
-    <OrganizationName xml:lang="el">Αθηνά - Ερευνητικό Κέντρο Καινοτομίας στις Τεχνολογίες της Πληροφορίας, των Επικοινωνιών και της Γνώσης</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Athena - Research and Innovation Center</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="el">Αθηνά - Ερευνητικό Κέντρο Καινοτομίας</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.athena-innovation.gr/</OrganizationURL>
-    <OrganizationURL xml:lang="el">http://www.athena-innovation.gr/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <Company>Research Center Athena - Institute for the Management of Information Systems</Company>
-    <EmailAddress>staff@imis.athena-innovation.gr</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="support">
-    <Company>Research Center Athena - Institute for the Management of Information Systems</Company>
-    <EmailAddress>staff@imis.athena-innovation.gr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/login.bme.hu-idp-shibboleth.xml b/swamid-interfederations-2.0/login.bme.hu-idp-shibboleth.xml
deleted file mode 100644
index f390bf1c..00000000
--- a/swamid-interfederations-2.0/login.bme.hu-idp-shibboleth.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://login.bme.hu/idp/shibboleth">
-  <Extensions>
-    <ns9:MetadataSet xmlns:ns9="urn:geant:niif.hu:eduid.hu:entity-attributes:processing-info">bme</ns9:MetadataSet>
-    <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>
-    <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">bme.hu</shibmd:Scope>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-        <mdui:DisplayName xml:lang="hu">Budapesti Műszaki és Gazdaságtudományi Egyetem</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Budapest University of Technology and Economics</mdui:DisplayName>
-        <mdui:Description xml:lang="hu">Budapesti Műszaki és Gazdaságtudományi Egyetem</mdui:Description>
-        <mdui:Description xml:lang="en">Budapest University of Technology and Economics</mdui:Description>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDHDCCAgSgAwIBAgIVALPowTex/0kkPUAX6SJu1p93b0VwMA0GCSqGSIb3DQEBBQUAMBcxFTATBgNVBAMTDGxvZ2luLmJtZS5odTAeFw0xMTEwMDMwMTE0MzVaFw0zMTEwMDMwMTE0MzVaMBcxFTATBgNVBAMTDGxvZ2luLmJtZS5odTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALFQWz8d0dz50J5zJVgQPv739xAPTQjQV6RwQdE9u+ajgytrDy+VuCrBGluvGspGekOjhlEESc7sZ0l92wzEdcdG0McLeg7PL9V4JE9qwKJO289t403EFbxCqekjeZWp3KDhHpDefLOUywYMQ1mPNfYbVRRFg82VtPL+G3FMTSQBWrnjWYLshVjexbHwbK1rMiy8MHBbjVAF27v6RvGHLhzPhNNW11+lqweogXc3d73fgkIBMicKm5SgW/jQvBtlODy49xeoef1GD6MUgckPRpqIyXdd01rqpdGqeDJOyjamB5VI+LMjjpNr6h2pA0LjNNm0RZJVobbgzfFpdzwI09ECAwEAAaNfMF0wPAYDVR0RBDUwM4IMbG9naW4uYm1lLmh1hiNodHRwczovL2xvZ2luLmJtZS5odS9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUbB8MWrjcjCvj3wlxfUMUsdRjYd4wDQYJKoZIhvcNAQEFBQADggEBAK1vfjY8DTLVqrZm7G5g+PSDRalpmk5Iwg5c/flDtGJG8LoHaX5y9AGNyXNOqgfzWw/UITQnl6J1L5o8n/AHYv6B1BHY0VqGBdIg/JvIzX1sODAdbOlYvLdhYqACjK+S/KNW7H0ASh2sY1OVSc4/nOLfdJYgoZ2YZphvWu3zn7oEAaEBL1G1kaHYRTuJcRrS6QtL2P2jj+McxtRwaC5QgcMyewJW6I/608AV0/0++UUqWpb29HUit4H03Mt/7qc2ekLuPcOk+AEXajE97z8Ia99IrBj/n3N4edS+Oj570z1SMzhtuCKzErQeySAtySu6EbCabd0L2JXIDLr2fjc8B+s=</ds:X509Certificate>
-        </ds:X509Data>
-        <ds:KeyName>login.bme.hu</ds:KeyName>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.bme.hu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.bme.hu/idp/profile/SAML2/Redirect/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.bme.hu/idp/profile/SAML2/POST/SLO"/>
-    <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://login.bme.hu/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://login.bme.hu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.bme.hu/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="hu">Budapesti Műszaki és Gazdaságtudományi Egyetem</OrganizationName>
-    <OrganizationName xml:lang="en">Budapest University of Technology and Economics</OrganizationName>
-    <OrganizationDisplayName xml:lang="hu">Budapesti Műszaki és Gazdaságtudományi Egyetem</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">Budapest University of Technology and Economics</OrganizationDisplayName>
-    <OrganizationURL xml:lang="hu">https://bme.hu/</OrganizationURL>
-    <OrganizationURL xml:lang="en">https://bme.hu/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Gyenes Tamás</SurName>
-    <EmailAddress>mailto:tom@impulzus.bme.hu</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="support">
-    <SurName>Gyenes Tamás</SurName>
-    <EmailAddress>mailto:tom@impulzus.bme.hu</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="administrative">
-    <SurName>Gyenes Tamás</SurName>
-    <EmailAddress>mailto:tom@impulzus.bme.hu</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/login.bme.hu.xml b/swamid-interfederations-2.0/login.bme.hu.xml
deleted file mode 100644
index f390bf1c..00000000
--- a/swamid-interfederations-2.0/login.bme.hu.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://login.bme.hu/idp/shibboleth">
-  <Extensions>
-    <ns9:MetadataSet xmlns:ns9="urn:geant:niif.hu:eduid.hu:entity-attributes:processing-info">bme</ns9:MetadataSet>
-    <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>
-    <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">bme.hu</shibmd:Scope>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-        <mdui:DisplayName xml:lang="hu">Budapesti Műszaki és Gazdaságtudományi Egyetem</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Budapest University of Technology and Economics</mdui:DisplayName>
-        <mdui:Description xml:lang="hu">Budapesti Műszaki és Gazdaságtudományi Egyetem</mdui:Description>
-        <mdui:Description xml:lang="en">Budapest University of Technology and Economics</mdui:Description>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDHDCCAgSgAwIBAgIVALPowTex/0kkPUAX6SJu1p93b0VwMA0GCSqGSIb3DQEBBQUAMBcxFTATBgNVBAMTDGxvZ2luLmJtZS5odTAeFw0xMTEwMDMwMTE0MzVaFw0zMTEwMDMwMTE0MzVaMBcxFTATBgNVBAMTDGxvZ2luLmJtZS5odTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALFQWz8d0dz50J5zJVgQPv739xAPTQjQV6RwQdE9u+ajgytrDy+VuCrBGluvGspGekOjhlEESc7sZ0l92wzEdcdG0McLeg7PL9V4JE9qwKJO289t403EFbxCqekjeZWp3KDhHpDefLOUywYMQ1mPNfYbVRRFg82VtPL+G3FMTSQBWrnjWYLshVjexbHwbK1rMiy8MHBbjVAF27v6RvGHLhzPhNNW11+lqweogXc3d73fgkIBMicKm5SgW/jQvBtlODy49xeoef1GD6MUgckPRpqIyXdd01rqpdGqeDJOyjamB5VI+LMjjpNr6h2pA0LjNNm0RZJVobbgzfFpdzwI09ECAwEAAaNfMF0wPAYDVR0RBDUwM4IMbG9naW4uYm1lLmh1hiNodHRwczovL2xvZ2luLmJtZS5odS9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUbB8MWrjcjCvj3wlxfUMUsdRjYd4wDQYJKoZIhvcNAQEFBQADggEBAK1vfjY8DTLVqrZm7G5g+PSDRalpmk5Iwg5c/flDtGJG8LoHaX5y9AGNyXNOqgfzWw/UITQnl6J1L5o8n/AHYv6B1BHY0VqGBdIg/JvIzX1sODAdbOlYvLdhYqACjK+S/KNW7H0ASh2sY1OVSc4/nOLfdJYgoZ2YZphvWu3zn7oEAaEBL1G1kaHYRTuJcRrS6QtL2P2jj+McxtRwaC5QgcMyewJW6I/608AV0/0++UUqWpb29HUit4H03Mt/7qc2ekLuPcOk+AEXajE97z8Ia99IrBj/n3N4edS+Oj570z1SMzhtuCKzErQeySAtySu6EbCabd0L2JXIDLr2fjc8B+s=</ds:X509Certificate>
-        </ds:X509Data>
-        <ds:KeyName>login.bme.hu</ds:KeyName>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.bme.hu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.bme.hu/idp/profile/SAML2/Redirect/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.bme.hu/idp/profile/SAML2/POST/SLO"/>
-    <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://login.bme.hu/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://login.bme.hu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.bme.hu/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="hu">Budapesti Műszaki és Gazdaságtudományi Egyetem</OrganizationName>
-    <OrganizationName xml:lang="en">Budapest University of Technology and Economics</OrganizationName>
-    <OrganizationDisplayName xml:lang="hu">Budapesti Műszaki és Gazdaságtudományi Egyetem</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">Budapest University of Technology and Economics</OrganizationDisplayName>
-    <OrganizationURL xml:lang="hu">https://bme.hu/</OrganizationURL>
-    <OrganizationURL xml:lang="en">https://bme.hu/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Gyenes Tamás</SurName>
-    <EmailAddress>mailto:tom@impulzus.bme.hu</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="support">
-    <SurName>Gyenes Tamás</SurName>
-    <EmailAddress>mailto:tom@impulzus.bme.hu</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="administrative">
-    <SurName>Gyenes Tamás</SurName>
-    <EmailAddress>mailto:tom@impulzus.bme.hu</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/login.du.se-idp-shibboleth.xml b/swamid-interfederations-2.0/login.du.se-idp-shibboleth.xml
deleted file mode 100644
index 35a2ac7c..00000000
--- a/swamid-interfederations-2.0/login.du.se-idp-shibboleth.xml
+++ /dev/null
@@ -1,122 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://login.du.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">du.se</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="sv">Högskolan Dalarna</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Dalarna University</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Identity Provider för anställda och studenter vid Högskolan Dalarna.</mdui:Description>
-        <mdui:Description xml:lang="en">Identity Provider for employees and students at Dalarna University.</mdui:Description>
-        <mdui:Logo height="16" width="16">https://login.du.se/duse-logo-16x16.png</mdui:Logo>
-        <mdui:Logo height="350" width="146" xml:lang="sv">https://login.du.se/duse-logo-sv.png</mdui:Logo>
-        <mdui:Logo height="350" width="146" xml:lang="en">https://login.du.se/duse-logo-en.png</mdui:Logo>
-        <mdui:Keywords xml:lang="sv">hda du</mdui:Keywords>
-        <mdui:Keywords xml:lang="en">hda du</mdui:Keywords>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DomainHint>du.se</mdui:DomainHint>
-        <mdui:IPHint>130.243.32.0/19</mdui:IPHint>
-        <mdui:GeolocationHint>geo:60.6137,15.6536</mdui:GeolocationHint>
-      </mdui:DiscoHints>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDGDCCAgCgAwIBAgIVAPJo+xMJRgt7yTXfyDqsZSyRFE0zMA0GCSqGSIb3DQEB
-BQUAMBYxFDASBgNVBAMTC2xvZ2luLmR1LnNlMB4XDTExMDIwNDEzMzg1MloXDTMx
-MDIwNDEzMzg1MlowFjEUMBIGA1UEAxMLbG9naW4uZHUuc2UwggEiMA0GCSqGSIb3
-DQEBAQUAA4IBDwAwggEKAoIBAQCKFHqKqppmo8B66lFgTbIQDdDNqlBpsrhjZx4m
-l4ay7TR/Q9JhxJCpsg3fttFyYbG6pl4PViMMt6jagpYYMBlBBKGUDefAT95oAcBN
-eRlkTxXfXG4XCS1phIIc6H9Kt8HwFadqLIgx+9ICCuyTZicPIwnUBt+TS4A+hz6k
-8KA87QWvnhteMHpu4UjIL8YRUAdNbFbRV9AuOmaR9HP11yueQd3B+5XnTt8x+JaO
-yWgsbUvBeGKIXPtGm70UgXeBi32vr6LtP5s2ijtj4zORMh5dxAkrjE0hO96E3D6Y
-riLlccqVMGTYhweDuIE4HJA+sY8vFXxSTsL193erJ6ooBUWxAgMBAAGjXTBbMDoG
-A1UdEQQzMDGCC2xvZ2luLmR1LnNlhiJodHRwczovL2xvZ2luLmR1LnNlL2lkcC9z
-aGliYm9sZXRoMB0GA1UdDgQWBBTYD58W7KLBxdd1F6vo5xlukwwdOTANBgkqhkiG
-9w0BAQUFAAOCAQEAXZRof2FZml44oPJ+2GkhIIK0U2t143xH4Z4J2iPbTjQyNfeo
-eusGj+AvLkdkHLisqz8HTQC93sSYwPrQ1PMrqwAmnJZkhcySTto15Rgi5yNWsUFU
-E5RfYEcGj1P2R+uxUpCZ3qf9usCpGf5ao5rCoOjxtxGyv3PqDFTBwkjheuASpsug
-KnPqLMWV0RL1gmJhfAoCbhm+rM8FZZLXloDuV+Xzb0OmjruPupqtTJpHVBkaQ3OI
-2FIPaCf07HjPPcy4s9mQJGq9TEBKJ+WWwoT5ZvhYErkO7m2iQNsXUqCk/dt2Tp7e
-GqI848rh0Iif5MpxnsYQ/mxwDirbsler7jpF0Q==
-
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.du.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.du.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://login.du.se/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.du.se/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://login.du.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.du.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">du.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDGDCCAgCgAwIBAgIVAPJo+xMJRgt7yTXfyDqsZSyRFE0zMA0GCSqGSIb3DQEB
-BQUAMBYxFDASBgNVBAMTC2xvZ2luLmR1LnNlMB4XDTExMDIwNDEzMzg1MloXDTMx
-MDIwNDEzMzg1MlowFjEUMBIGA1UEAxMLbG9naW4uZHUuc2UwggEiMA0GCSqGSIb3
-DQEBAQUAA4IBDwAwggEKAoIBAQCKFHqKqppmo8B66lFgTbIQDdDNqlBpsrhjZx4m
-l4ay7TR/Q9JhxJCpsg3fttFyYbG6pl4PViMMt6jagpYYMBlBBKGUDefAT95oAcBN
-eRlkTxXfXG4XCS1phIIc6H9Kt8HwFadqLIgx+9ICCuyTZicPIwnUBt+TS4A+hz6k
-8KA87QWvnhteMHpu4UjIL8YRUAdNbFbRV9AuOmaR9HP11yueQd3B+5XnTt8x+JaO
-yWgsbUvBeGKIXPtGm70UgXeBi32vr6LtP5s2ijtj4zORMh5dxAkrjE0hO96E3D6Y
-riLlccqVMGTYhweDuIE4HJA+sY8vFXxSTsL193erJ6ooBUWxAgMBAAGjXTBbMDoG
-A1UdEQQzMDGCC2xvZ2luLmR1LnNlhiJodHRwczovL2xvZ2luLmR1LnNlL2lkcC9z
-aGliYm9sZXRoMB0GA1UdDgQWBBTYD58W7KLBxdd1F6vo5xlukwwdOTANBgkqhkiG
-9w0BAQUFAAOCAQEAXZRof2FZml44oPJ+2GkhIIK0U2t143xH4Z4J2iPbTjQyNfeo
-eusGj+AvLkdkHLisqz8HTQC93sSYwPrQ1PMrqwAmnJZkhcySTto15Rgi5yNWsUFU
-E5RfYEcGj1P2R+uxUpCZ3qf9usCpGf5ao5rCoOjxtxGyv3PqDFTBwkjheuASpsug
-KnPqLMWV0RL1gmJhfAoCbhm+rM8FZZLXloDuV+Xzb0OmjruPupqtTJpHVBkaQ3OI
-2FIPaCf07HjPPcy4s9mQJGq9TEBKJ+WWwoT5ZvhYErkO7m2iQNsXUqCk/dt2Tp7e
-GqI848rh0Iif5MpxnsYQ/mxwDirbsler7jpF0Q==
-
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.du.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.du.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">DU</OrganizationName>
-    <OrganizationDisplayName xml:lang="sv">Högskolan Dalarna</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">Dalarna University</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.du.se</OrganizationURL>
-  </Organization>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
-    <Company>Dalarna University</Company>
-    <SurName>IT-avdelningen</SurName>
-    <EmailAddress>shib-admin@du.se</EmailAddress>
-    <TelephoneNumber>+46 23 778891</TelephoneNumber>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
-    <Company>Dalarna University</Company>
-    <SurName>IT-avdelningen</SurName>
-    <EmailAddress>shib-admin@du.se</EmailAddress>
-    <TelephoneNumber>+46 23 778891</TelephoneNumber>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
-    <Company>Dalarna University</Company>
-    <SurName>Högskolan Dalarna Support</SurName>
-    <EmailAddress>support@du.se</EmailAddress>
-    <TelephoneNumber>+46 23 778888</TelephoneNumber>
-  </ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/login.du.se.xml b/swamid-interfederations-2.0/login.du.se.xml
deleted file mode 100644
index 35a2ac7c..00000000
--- a/swamid-interfederations-2.0/login.du.se.xml
+++ /dev/null
@@ -1,122 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://login.du.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">du.se</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="sv">Högskolan Dalarna</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Dalarna University</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Identity Provider för anställda och studenter vid Högskolan Dalarna.</mdui:Description>
-        <mdui:Description xml:lang="en">Identity Provider for employees and students at Dalarna University.</mdui:Description>
-        <mdui:Logo height="16" width="16">https://login.du.se/duse-logo-16x16.png</mdui:Logo>
-        <mdui:Logo height="350" width="146" xml:lang="sv">https://login.du.se/duse-logo-sv.png</mdui:Logo>
-        <mdui:Logo height="350" width="146" xml:lang="en">https://login.du.se/duse-logo-en.png</mdui:Logo>
-        <mdui:Keywords xml:lang="sv">hda du</mdui:Keywords>
-        <mdui:Keywords xml:lang="en">hda du</mdui:Keywords>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DomainHint>du.se</mdui:DomainHint>
-        <mdui:IPHint>130.243.32.0/19</mdui:IPHint>
-        <mdui:GeolocationHint>geo:60.6137,15.6536</mdui:GeolocationHint>
-      </mdui:DiscoHints>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDGDCCAgCgAwIBAgIVAPJo+xMJRgt7yTXfyDqsZSyRFE0zMA0GCSqGSIb3DQEB
-BQUAMBYxFDASBgNVBAMTC2xvZ2luLmR1LnNlMB4XDTExMDIwNDEzMzg1MloXDTMx
-MDIwNDEzMzg1MlowFjEUMBIGA1UEAxMLbG9naW4uZHUuc2UwggEiMA0GCSqGSIb3
-DQEBAQUAA4IBDwAwggEKAoIBAQCKFHqKqppmo8B66lFgTbIQDdDNqlBpsrhjZx4m
-l4ay7TR/Q9JhxJCpsg3fttFyYbG6pl4PViMMt6jagpYYMBlBBKGUDefAT95oAcBN
-eRlkTxXfXG4XCS1phIIc6H9Kt8HwFadqLIgx+9ICCuyTZicPIwnUBt+TS4A+hz6k
-8KA87QWvnhteMHpu4UjIL8YRUAdNbFbRV9AuOmaR9HP11yueQd3B+5XnTt8x+JaO
-yWgsbUvBeGKIXPtGm70UgXeBi32vr6LtP5s2ijtj4zORMh5dxAkrjE0hO96E3D6Y
-riLlccqVMGTYhweDuIE4HJA+sY8vFXxSTsL193erJ6ooBUWxAgMBAAGjXTBbMDoG
-A1UdEQQzMDGCC2xvZ2luLmR1LnNlhiJodHRwczovL2xvZ2luLmR1LnNlL2lkcC9z
-aGliYm9sZXRoMB0GA1UdDgQWBBTYD58W7KLBxdd1F6vo5xlukwwdOTANBgkqhkiG
-9w0BAQUFAAOCAQEAXZRof2FZml44oPJ+2GkhIIK0U2t143xH4Z4J2iPbTjQyNfeo
-eusGj+AvLkdkHLisqz8HTQC93sSYwPrQ1PMrqwAmnJZkhcySTto15Rgi5yNWsUFU
-E5RfYEcGj1P2R+uxUpCZ3qf9usCpGf5ao5rCoOjxtxGyv3PqDFTBwkjheuASpsug
-KnPqLMWV0RL1gmJhfAoCbhm+rM8FZZLXloDuV+Xzb0OmjruPupqtTJpHVBkaQ3OI
-2FIPaCf07HjPPcy4s9mQJGq9TEBKJ+WWwoT5ZvhYErkO7m2iQNsXUqCk/dt2Tp7e
-GqI848rh0Iif5MpxnsYQ/mxwDirbsler7jpF0Q==
-
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.du.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.du.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://login.du.se/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.du.se/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://login.du.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.du.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">du.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDGDCCAgCgAwIBAgIVAPJo+xMJRgt7yTXfyDqsZSyRFE0zMA0GCSqGSIb3DQEB
-BQUAMBYxFDASBgNVBAMTC2xvZ2luLmR1LnNlMB4XDTExMDIwNDEzMzg1MloXDTMx
-MDIwNDEzMzg1MlowFjEUMBIGA1UEAxMLbG9naW4uZHUuc2UwggEiMA0GCSqGSIb3
-DQEBAQUAA4IBDwAwggEKAoIBAQCKFHqKqppmo8B66lFgTbIQDdDNqlBpsrhjZx4m
-l4ay7TR/Q9JhxJCpsg3fttFyYbG6pl4PViMMt6jagpYYMBlBBKGUDefAT95oAcBN
-eRlkTxXfXG4XCS1phIIc6H9Kt8HwFadqLIgx+9ICCuyTZicPIwnUBt+TS4A+hz6k
-8KA87QWvnhteMHpu4UjIL8YRUAdNbFbRV9AuOmaR9HP11yueQd3B+5XnTt8x+JaO
-yWgsbUvBeGKIXPtGm70UgXeBi32vr6LtP5s2ijtj4zORMh5dxAkrjE0hO96E3D6Y
-riLlccqVMGTYhweDuIE4HJA+sY8vFXxSTsL193erJ6ooBUWxAgMBAAGjXTBbMDoG
-A1UdEQQzMDGCC2xvZ2luLmR1LnNlhiJodHRwczovL2xvZ2luLmR1LnNlL2lkcC9z
-aGliYm9sZXRoMB0GA1UdDgQWBBTYD58W7KLBxdd1F6vo5xlukwwdOTANBgkqhkiG
-9w0BAQUFAAOCAQEAXZRof2FZml44oPJ+2GkhIIK0U2t143xH4Z4J2iPbTjQyNfeo
-eusGj+AvLkdkHLisqz8HTQC93sSYwPrQ1PMrqwAmnJZkhcySTto15Rgi5yNWsUFU
-E5RfYEcGj1P2R+uxUpCZ3qf9usCpGf5ao5rCoOjxtxGyv3PqDFTBwkjheuASpsug
-KnPqLMWV0RL1gmJhfAoCbhm+rM8FZZLXloDuV+Xzb0OmjruPupqtTJpHVBkaQ3OI
-2FIPaCf07HjPPcy4s9mQJGq9TEBKJ+WWwoT5ZvhYErkO7m2iQNsXUqCk/dt2Tp7e
-GqI848rh0Iif5MpxnsYQ/mxwDirbsler7jpF0Q==
-
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.du.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.du.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">DU</OrganizationName>
-    <OrganizationDisplayName xml:lang="sv">Högskolan Dalarna</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">Dalarna University</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.du.se</OrganizationURL>
-  </Organization>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
-    <Company>Dalarna University</Company>
-    <SurName>IT-avdelningen</SurName>
-    <EmailAddress>shib-admin@du.se</EmailAddress>
-    <TelephoneNumber>+46 23 778891</TelephoneNumber>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
-    <Company>Dalarna University</Company>
-    <SurName>IT-avdelningen</SurName>
-    <EmailAddress>shib-admin@du.se</EmailAddress>
-    <TelephoneNumber>+46 23 778891</TelephoneNumber>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
-    <Company>Dalarna University</Company>
-    <SurName>Högskolan Dalarna Support</SurName>
-    <EmailAddress>support@du.se</EmailAddress>
-    <TelephoneNumber>+46 23 778888</TelephoneNumber>
-  </ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/login.feld.cvut.cz-idp-shibboleth.xml b/swamid-interfederations-2.0/login.feld.cvut.cz-idp-shibboleth.xml
deleted file mode 100644
index d9b1a1c7..00000000
--- a/swamid-interfederations-2.0/login.feld.cvut.cz-idp-shibboleth.xml
+++ /dev/null
@@ -1,136 +0,0 @@
-<?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://login.feld.cvut.cz/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/" registrationInstant="2010-09-15T12:33:26Z">
-      <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>
-    <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://eduid.cz/uri/idp-group/university</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope regexp="false">fel.cvut.cz</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:Description xml:lang="en">Identity Provider for CTU FEE in Prague</mdui:Description>
-        <mdui:Description xml:lang="cs">Identity Provider pro ČVUT FEL v Praze</mdui:Description>
-        <mdui:DisplayName xml:lang="en">Czech Technical University in Prague, Faculty of Electrical Engineering</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="cs">České vysoké učení technické v Praze, Fakulta elektrotechnická</mdui:DisplayName>
-        <mdui:InformationURL xml:lang="en">http://www.fel.cvut.cz/en/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="cs">http://www.fel.cvut.cz/cz/</mdui:InformationURL>
-        <mdui:Logo height="40" width="53">https://login.fel.cvut.cz/img/logo_cvut_40pix.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>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIEgzCCA2ugAwIBAgIQANoVlz6PcuJYsEUfHOK6tjANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTE0MDQxNjAwMDAwMFoXDTE3MDQxNTIzNTk1OVowPzEhMB8GA1UE
-CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRowGAYDVQQDExFsb2dpbi5mZWwu
-Y3Z1dC5jejCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMnY8VAP8P7X
-ecu4o79lrMkoZuocDhGM9f5zFHIKPU9f4fNhuPkStgyMmEnqpoMvI6obtmLNXyGE
-/BfUrfn8xb27lURWgixhGl8/h9FFGb+xV7/fq4q8j3IJ1jaA+CF292ZL8ua8d1uG
-wqi++ra/Rp6Od/IecwC7z69cBRidqRnBOWEKfgzWtQu7O409Rv4xTjrvLx+8GDKB
-tvJdDykSWDTWkIHY/UuJsFIZKuVHT4ursigm4kFQu9URqLyhKKNIY5JvdDqBHcCn
-7XKPrqugTJZKpwEmmFV2PciClXnLIIdPCaNzsSKvh2nLxFes1m0q4gY6WN8PCYrp
-HUpBqISdJssCAwEAAaOCAYIwggF+MB8GA1UdIwQYMBaAFAy9k2gM896ro0lrKzdX
-R+qQ47ntMB0GA1UdDgQWBBSx5rIOvDo/4kkNb0wMf/gQTgj5BjAOBgNVHQ8BAf8E
-BAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUH
-AwIwIgYDVR0gBBswGTANBgsrBgEEAbIxAQICHTAIBgZngQwBAgEwOgYDVR0fBDMw
-MTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5j
-cmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRjcy50
-ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDovL29j
-c3AudGNzLnRlcmVuYS5vcmcwMAYDVR0RBCkwJ4IRbG9naW4uZmVsLmN2dXQuY3qC
-EmxvZ2luLmZlbGQuY3Z1dC5jejANBgkqhkiG9w0BAQUFAAOCAQEAiA8p8TJej3G9
-P7D51SRAL3uVNwfa0441UL41kRPZ46iz+N6aUudHEDCFWtYtn16htmR/KuUEje6p
-4GgmxFw6TXZhni+TdEjP9NIdXR6XpEZoIqfCY4qB5dBJPJYvEhlOv10jJftckG3u
-r7AIipmKOCM2ufytJ5g2J1YlX37szN/p0QIAbEoip8xAS/wtZVqBsNIBfy15Kd2j
-qXbm8qnB2nj+ucVKO30Gnya5Ada0cnp/DP2YjBv9MfFPjj5+kDoK3gAX5IJi9yjr
-UjhYjMJA2yybAxhTAYld1Ku+NHoYOQoZmiwobVToYcT63SF4OQv/u+1hNQh+/lM2
-yrp1Je1EyA==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.fel.cvut.cz:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.fel.cvut.cz: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:1.1:nameid-format:unspecified</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.fel.cvut.cz/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.fel.cvut.cz/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://login.fel.cvut.cz/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.fel.cvut.cz/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope regexp="false">fel.cvut.cz</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIEgzCCA2ugAwIBAgIQANoVlz6PcuJYsEUfHOK6tjANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTE0MDQxNjAwMDAwMFoXDTE3MDQxNTIzNTk1OVowPzEhMB8GA1UE
-CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRowGAYDVQQDExFsb2dpbi5mZWwu
-Y3Z1dC5jejCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMnY8VAP8P7X
-ecu4o79lrMkoZuocDhGM9f5zFHIKPU9f4fNhuPkStgyMmEnqpoMvI6obtmLNXyGE
-/BfUrfn8xb27lURWgixhGl8/h9FFGb+xV7/fq4q8j3IJ1jaA+CF292ZL8ua8d1uG
-wqi++ra/Rp6Od/IecwC7z69cBRidqRnBOWEKfgzWtQu7O409Rv4xTjrvLx+8GDKB
-tvJdDykSWDTWkIHY/UuJsFIZKuVHT4ursigm4kFQu9URqLyhKKNIY5JvdDqBHcCn
-7XKPrqugTJZKpwEmmFV2PciClXnLIIdPCaNzsSKvh2nLxFes1m0q4gY6WN8PCYrp
-HUpBqISdJssCAwEAAaOCAYIwggF+MB8GA1UdIwQYMBaAFAy9k2gM896ro0lrKzdX
-R+qQ47ntMB0GA1UdDgQWBBSx5rIOvDo/4kkNb0wMf/gQTgj5BjAOBgNVHQ8BAf8E
-BAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUH
-AwIwIgYDVR0gBBswGTANBgsrBgEEAbIxAQICHTAIBgZngQwBAgEwOgYDVR0fBDMw
-MTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5j
-cmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRjcy50
-ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDovL29j
-c3AudGNzLnRlcmVuYS5vcmcwMAYDVR0RBCkwJ4IRbG9naW4uZmVsLmN2dXQuY3qC
-EmxvZ2luLmZlbGQuY3Z1dC5jejANBgkqhkiG9w0BAQUFAAOCAQEAiA8p8TJej3G9
-P7D51SRAL3uVNwfa0441UL41kRPZ46iz+N6aUudHEDCFWtYtn16htmR/KuUEje6p
-4GgmxFw6TXZhni+TdEjP9NIdXR6XpEZoIqfCY4qB5dBJPJYvEhlOv10jJftckG3u
-r7AIipmKOCM2ufytJ5g2J1YlX37szN/p0QIAbEoip8xAS/wtZVqBsNIBfy15Kd2j
-qXbm8qnB2nj+ucVKO30Gnya5Ada0cnp/DP2YjBv9MfFPjj5+kDoK3gAX5IJi9yjr
-UjhYjMJA2yybAxhTAYld1Ku+NHoYOQoZmiwobVToYcT63SF4OQv/u+1hNQh+/lM2
-yrp1Je1EyA==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.fel.cvut.cz:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.fel.cvut.cz:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="cs">ČVUT FEL</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">CTU FEE</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="cs">České vysoké učení technické v Praze, Fakulta elektrotechnická</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Czech Technical University in Prague, Faculty of Electrical Engineering</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="cs">http://www.fel.cvut.cz/cz/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.fel.cvut.cz/en/</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:ContactPerson contactType="technical">
-    <md:GivenName>Jíří</md:GivenName>
-    <md:SurName>Cejp</md:SurName>
-    <md:EmailAddress>cejp@fel.cvut.cz</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/login.feld.cvut.cz.xml b/swamid-interfederations-2.0/login.feld.cvut.cz.xml
deleted file mode 100644
index d9b1a1c7..00000000
--- a/swamid-interfederations-2.0/login.feld.cvut.cz.xml
+++ /dev/null
@@ -1,136 +0,0 @@
-<?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://login.feld.cvut.cz/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/" registrationInstant="2010-09-15T12:33:26Z">
-      <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>
-    <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://eduid.cz/uri/idp-group/university</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope regexp="false">fel.cvut.cz</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:Description xml:lang="en">Identity Provider for CTU FEE in Prague</mdui:Description>
-        <mdui:Description xml:lang="cs">Identity Provider pro ČVUT FEL v Praze</mdui:Description>
-        <mdui:DisplayName xml:lang="en">Czech Technical University in Prague, Faculty of Electrical Engineering</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="cs">České vysoké učení technické v Praze, Fakulta elektrotechnická</mdui:DisplayName>
-        <mdui:InformationURL xml:lang="en">http://www.fel.cvut.cz/en/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="cs">http://www.fel.cvut.cz/cz/</mdui:InformationURL>
-        <mdui:Logo height="40" width="53">https://login.fel.cvut.cz/img/logo_cvut_40pix.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>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIEgzCCA2ugAwIBAgIQANoVlz6PcuJYsEUfHOK6tjANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTE0MDQxNjAwMDAwMFoXDTE3MDQxNTIzNTk1OVowPzEhMB8GA1UE
-CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRowGAYDVQQDExFsb2dpbi5mZWwu
-Y3Z1dC5jejCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMnY8VAP8P7X
-ecu4o79lrMkoZuocDhGM9f5zFHIKPU9f4fNhuPkStgyMmEnqpoMvI6obtmLNXyGE
-/BfUrfn8xb27lURWgixhGl8/h9FFGb+xV7/fq4q8j3IJ1jaA+CF292ZL8ua8d1uG
-wqi++ra/Rp6Od/IecwC7z69cBRidqRnBOWEKfgzWtQu7O409Rv4xTjrvLx+8GDKB
-tvJdDykSWDTWkIHY/UuJsFIZKuVHT4ursigm4kFQu9URqLyhKKNIY5JvdDqBHcCn
-7XKPrqugTJZKpwEmmFV2PciClXnLIIdPCaNzsSKvh2nLxFes1m0q4gY6WN8PCYrp
-HUpBqISdJssCAwEAAaOCAYIwggF+MB8GA1UdIwQYMBaAFAy9k2gM896ro0lrKzdX
-R+qQ47ntMB0GA1UdDgQWBBSx5rIOvDo/4kkNb0wMf/gQTgj5BjAOBgNVHQ8BAf8E
-BAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUH
-AwIwIgYDVR0gBBswGTANBgsrBgEEAbIxAQICHTAIBgZngQwBAgEwOgYDVR0fBDMw
-MTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5j
-cmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRjcy50
-ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDovL29j
-c3AudGNzLnRlcmVuYS5vcmcwMAYDVR0RBCkwJ4IRbG9naW4uZmVsLmN2dXQuY3qC
-EmxvZ2luLmZlbGQuY3Z1dC5jejANBgkqhkiG9w0BAQUFAAOCAQEAiA8p8TJej3G9
-P7D51SRAL3uVNwfa0441UL41kRPZ46iz+N6aUudHEDCFWtYtn16htmR/KuUEje6p
-4GgmxFw6TXZhni+TdEjP9NIdXR6XpEZoIqfCY4qB5dBJPJYvEhlOv10jJftckG3u
-r7AIipmKOCM2ufytJ5g2J1YlX37szN/p0QIAbEoip8xAS/wtZVqBsNIBfy15Kd2j
-qXbm8qnB2nj+ucVKO30Gnya5Ada0cnp/DP2YjBv9MfFPjj5+kDoK3gAX5IJi9yjr
-UjhYjMJA2yybAxhTAYld1Ku+NHoYOQoZmiwobVToYcT63SF4OQv/u+1hNQh+/lM2
-yrp1Je1EyA==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.fel.cvut.cz:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.fel.cvut.cz: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:1.1:nameid-format:unspecified</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.fel.cvut.cz/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.fel.cvut.cz/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://login.fel.cvut.cz/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.fel.cvut.cz/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope regexp="false">fel.cvut.cz</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIEgzCCA2ugAwIBAgIQANoVlz6PcuJYsEUfHOK6tjANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTE0MDQxNjAwMDAwMFoXDTE3MDQxNTIzNTk1OVowPzEhMB8GA1UE
-CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRowGAYDVQQDExFsb2dpbi5mZWwu
-Y3Z1dC5jejCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMnY8VAP8P7X
-ecu4o79lrMkoZuocDhGM9f5zFHIKPU9f4fNhuPkStgyMmEnqpoMvI6obtmLNXyGE
-/BfUrfn8xb27lURWgixhGl8/h9FFGb+xV7/fq4q8j3IJ1jaA+CF292ZL8ua8d1uG
-wqi++ra/Rp6Od/IecwC7z69cBRidqRnBOWEKfgzWtQu7O409Rv4xTjrvLx+8GDKB
-tvJdDykSWDTWkIHY/UuJsFIZKuVHT4ursigm4kFQu9URqLyhKKNIY5JvdDqBHcCn
-7XKPrqugTJZKpwEmmFV2PciClXnLIIdPCaNzsSKvh2nLxFes1m0q4gY6WN8PCYrp
-HUpBqISdJssCAwEAAaOCAYIwggF+MB8GA1UdIwQYMBaAFAy9k2gM896ro0lrKzdX
-R+qQ47ntMB0GA1UdDgQWBBSx5rIOvDo/4kkNb0wMf/gQTgj5BjAOBgNVHQ8BAf8E
-BAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUH
-AwIwIgYDVR0gBBswGTANBgsrBgEEAbIxAQICHTAIBgZngQwBAgEwOgYDVR0fBDMw
-MTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5j
-cmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRjcy50
-ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDovL29j
-c3AudGNzLnRlcmVuYS5vcmcwMAYDVR0RBCkwJ4IRbG9naW4uZmVsLmN2dXQuY3qC
-EmxvZ2luLmZlbGQuY3Z1dC5jejANBgkqhkiG9w0BAQUFAAOCAQEAiA8p8TJej3G9
-P7D51SRAL3uVNwfa0441UL41kRPZ46iz+N6aUudHEDCFWtYtn16htmR/KuUEje6p
-4GgmxFw6TXZhni+TdEjP9NIdXR6XpEZoIqfCY4qB5dBJPJYvEhlOv10jJftckG3u
-r7AIipmKOCM2ufytJ5g2J1YlX37szN/p0QIAbEoip8xAS/wtZVqBsNIBfy15Kd2j
-qXbm8qnB2nj+ucVKO30Gnya5Ada0cnp/DP2YjBv9MfFPjj5+kDoK3gAX5IJi9yjr
-UjhYjMJA2yybAxhTAYld1Ku+NHoYOQoZmiwobVToYcT63SF4OQv/u+1hNQh+/lM2
-yrp1Je1EyA==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.fel.cvut.cz:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.fel.cvut.cz:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="cs">ČVUT FEL</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">CTU FEE</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="cs">České vysoké učení technické v Praze, Fakulta elektrotechnická</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Czech Technical University in Prague, Faculty of Electrical Engineering</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="cs">http://www.fel.cvut.cz/cz/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.fel.cvut.cz/en/</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:ContactPerson contactType="technical">
-    <md:GivenName>Jíří</md:GivenName>
-    <md:SurName>Cejp</md:SurName>
-    <md:EmailAddress>cejp@fel.cvut.cz</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/login.fhv.at-shibboleth.xml b/swamid-interfederations-2.0/login.fhv.at-shibboleth.xml
deleted file mode 100644
index 4220f9ad..00000000
--- a/swamid-interfederations-2.0/login.fhv.at-shibboleth.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://login.fhv.at/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://eduid.at" registrationInstant="2011-07-26T12:52:10Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://eduid.at/policy/mdrps-20140606</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-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fhv.at</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uclv.net</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Vorarlberg University of Applied Sciences</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="de">Fachhochschule Vorarlberg</mdui:DisplayName>
-        <mdui:Logo height="57" width="113">https://login.fhv.at/fhv-logo.png</mdui:Logo>
-        <mdui:Logo height="16" width="16">https://login.fhv.at/favicon.ico</mdui:Logo>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDHDCCAgSgAwIBAgIVANvjM2hsZMTPMmIUd7JVjV9bZ4d1MA0GCSqGSIb3DQEB
-BQUAMBcxFTATBgNVBAMTDGxvZ2luLmZodi5hdDAeFw0xMTA3MjYwOTQ1MTRaFw0z
-MTA3MjYwOTQ1MTRaMBcxFTATBgNVBAMTDGxvZ2luLmZodi5hdDCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBAKxwsD9+OJckD5tkuEmbHOuzwYAtkRyXfVuV
-/Y4up4H8I+eUgqr44g+o4IiIjW/MQHqiottVUUeimuFzbiVwsr/VRzMQBJqNiE/h
-eT2TOnUzHh+nPuZDtVzwy2S5lMxpGI7a5v6IwGhLjf6jV9jJjB1VtQys6ofH7uqv
-jF75Jkz7X5cuPMRCXGaXEecWKeOLX0PaMsptIOUR+a6YXX2dOJbPJojH/E0OOlg2
-XxoizHzZceZF7K3Tr1SZX7mT7TjcFjCOIcbiL0hkrto5oSBkY1G77d3fdkyZvO8u
-65iPN5rVoJSuYe7aYjVqlDECQSHH46vNJXanepMmZ+iPU5K0tkECAwEAAaNfMF0w
-PAYDVR0RBDUwM4IMbG9naW4uZmh2LmF0hiNodHRwczovL2xvZ2luLmZodi5hdC9p
-ZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQU1hyr7QdkMxYmdbqg/wxKiwGh9nUwDQYJ
-KoZIhvcNAQEFBQADggEBAHZCy5j4cx8jyYL6m6sY0oIzX9F5kVGPdKSXhjE85RrY
-GzGlRpXjBTA8CPlxnu99Wt4jZ2jjudwrw/bHLPwxOkZNALxj4HUa7T0cdWXCj3lR
-1b8iI5tXTYHmgjCbl+UTl/WA8YVQvA4v+2RaBMduspAFsvjwZDDOXvskLB4Aflbu
-ewmlLixdIpZYWbQTkSovm0InLzBuoF77CFul8Nt2oIlbLg9Qfd4f94RsaNx/2MrZ
-/YXD0gncEwV9ijUqIUGJuGicMrTGeLhxlr6bltA8K9RyTgAU3dCImRUX0tbK0jRa
-ApOxw/gcmrRQwbhGEghVXhv3KlZ/xEkpVndXwiF651w=
-                    </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://login.fhv.at/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.fhv.at/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://login.fhv.at/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.fhv.at/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="de">Fachhochschule Vorarlberg GmbH</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">Vorarlberg University of Applied Sciences</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="de">Fachhochschule Vorarlberg</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Vorarlberg University of Applied Sciences</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="de">http://www.fhv.at/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.fhv.at/en-fhv-portal?set_language=en</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>FHV</md:GivenName>
-    <md:SurName>System Management</md:SurName>
-    <md:EmailAddress>mailto:sysadmins@fhv.at</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>FHV</md:GivenName>
-    <md:SurName>System Management</md:SurName>
-    <md:EmailAddress>mailto:sysadmins@fhv.at</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/login.fhv.at.xml b/swamid-interfederations-2.0/login.fhv.at.xml
deleted file mode 100644
index 4220f9ad..00000000
--- a/swamid-interfederations-2.0/login.fhv.at.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://login.fhv.at/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://eduid.at" registrationInstant="2011-07-26T12:52:10Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://eduid.at/policy/mdrps-20140606</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-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fhv.at</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uclv.net</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Vorarlberg University of Applied Sciences</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="de">Fachhochschule Vorarlberg</mdui:DisplayName>
-        <mdui:Logo height="57" width="113">https://login.fhv.at/fhv-logo.png</mdui:Logo>
-        <mdui:Logo height="16" width="16">https://login.fhv.at/favicon.ico</mdui:Logo>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDHDCCAgSgAwIBAgIVANvjM2hsZMTPMmIUd7JVjV9bZ4d1MA0GCSqGSIb3DQEB
-BQUAMBcxFTATBgNVBAMTDGxvZ2luLmZodi5hdDAeFw0xMTA3MjYwOTQ1MTRaFw0z
-MTA3MjYwOTQ1MTRaMBcxFTATBgNVBAMTDGxvZ2luLmZodi5hdDCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBAKxwsD9+OJckD5tkuEmbHOuzwYAtkRyXfVuV
-/Y4up4H8I+eUgqr44g+o4IiIjW/MQHqiottVUUeimuFzbiVwsr/VRzMQBJqNiE/h
-eT2TOnUzHh+nPuZDtVzwy2S5lMxpGI7a5v6IwGhLjf6jV9jJjB1VtQys6ofH7uqv
-jF75Jkz7X5cuPMRCXGaXEecWKeOLX0PaMsptIOUR+a6YXX2dOJbPJojH/E0OOlg2
-XxoizHzZceZF7K3Tr1SZX7mT7TjcFjCOIcbiL0hkrto5oSBkY1G77d3fdkyZvO8u
-65iPN5rVoJSuYe7aYjVqlDECQSHH46vNJXanepMmZ+iPU5K0tkECAwEAAaNfMF0w
-PAYDVR0RBDUwM4IMbG9naW4uZmh2LmF0hiNodHRwczovL2xvZ2luLmZodi5hdC9p
-ZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQU1hyr7QdkMxYmdbqg/wxKiwGh9nUwDQYJ
-KoZIhvcNAQEFBQADggEBAHZCy5j4cx8jyYL6m6sY0oIzX9F5kVGPdKSXhjE85RrY
-GzGlRpXjBTA8CPlxnu99Wt4jZ2jjudwrw/bHLPwxOkZNALxj4HUa7T0cdWXCj3lR
-1b8iI5tXTYHmgjCbl+UTl/WA8YVQvA4v+2RaBMduspAFsvjwZDDOXvskLB4Aflbu
-ewmlLixdIpZYWbQTkSovm0InLzBuoF77CFul8Nt2oIlbLg9Qfd4f94RsaNx/2MrZ
-/YXD0gncEwV9ijUqIUGJuGicMrTGeLhxlr6bltA8K9RyTgAU3dCImRUX0tbK0jRa
-ApOxw/gcmrRQwbhGEghVXhv3KlZ/xEkpVndXwiF651w=
-                    </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://login.fhv.at/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.fhv.at/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://login.fhv.at/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.fhv.at/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="de">Fachhochschule Vorarlberg GmbH</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">Vorarlberg University of Applied Sciences</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="de">Fachhochschule Vorarlberg</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Vorarlberg University of Applied Sciences</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="de">http://www.fhv.at/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.fhv.at/en-fhv-portal?set_language=en</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>FHV</md:GivenName>
-    <md:SurName>System Management</md:SurName>
-    <md:EmailAddress>mailto:sysadmins@fhv.at</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>FHV</md:GivenName>
-    <md:SurName>System Management</md:SurName>
-    <md:EmailAddress>mailto:sysadmins@fhv.at</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/login.helsinki.fi-shibboleth.xml b/swamid-interfederations-2.0/login.helsinki.fi-shibboleth.xml
index 1ea67fec..986ba144 100644
--- a/swamid-interfederations-2.0/login.helsinki.fi-shibboleth.xml
+++ b/swamid-interfederations-2.0/login.helsinki.fi-shibboleth.xml
@@ -1,15 +1,14 @@
 <?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" entityID="https://login.helsinki.fi/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.csc.fi/haka">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://www.csc.fi/english/institutions/haka/instructions/join/eduGAINRegistrationStatement/</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
+<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://login.helsinki.fi/shibboleth">
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
       <shibmd:Scope regexp="false">helsinki.fi</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
+      <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>MIIE3jCCA8agAwIBAgIQWSnA5EzgO1nthR4AsdlaoTANBgkqhkiG9w0BAQUFADA2
@@ -41,30 +40,30 @@ NYY+HvJbSaNYXLkLzxOl8+fWFZqxmThOsb5KAx1xVjNVo2DiwC0crol7Wd0uDJEm
 Ahw=</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </KeyDescriptor>
-    <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://login.helsinki.fi/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.helsinki.fi/idp/profile/SAML2/POST/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="fi">Helsingin yliopisto</OrganizationName>
-    <OrganizationName xml:lang="en">University of Helsinki</OrganizationName>
-    <OrganizationName xml:lang="sv">Helsingfors universitet</OrganizationName>
-    <OrganizationDisplayName xml:lang="fi">Helsingin yliopisto</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">University of Helsinki</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="sv">Helsingfors universitet</OrganizationDisplayName>
-    <OrganizationURL xml:lang="fi">http://www.helsinki.fi/yliopisto/</OrganizationURL>
-    <OrganizationURL xml:lang="en">http://www.helsinki.fi/yliopisto/</OrganizationURL>
-    <OrganizationURL xml:lang="sv">http://www.helsinki.fi/yliopisto/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Janne</GivenName>
-    <SurName>Peltonen</SurName>
-    <EmailAddress>mailto:idm-hosting@helsinki.fi</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="support">
-    <GivenName>Juha</GivenName>
-    <SurName>Niemi</SurName>
-    <EmailAddress>mailto:idm-hosting@helsinki.fi</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.helsinki.fi/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.helsinki.fi/idp/profile/SAML2/POST/SSO"/>
+  </md:IDPSSODescriptor>
+  <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>Janne</md:GivenName>
+    <md:SurName>Peltonen</md:SurName>
+    <md:EmailAddress>mailto:idm-hosting@helsinki.fi</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Juha</md:GivenName>
+    <md:SurName>Niemi</md:SurName>
+    <md:EmailAddress>mailto:idm-hosting@helsinki.fi</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/login.helsinki.fi.xml b/swamid-interfederations-2.0/login.helsinki.fi.xml
deleted file mode 100644
index 1ea67fec..00000000
--- a/swamid-interfederations-2.0/login.helsinki.fi.xml
+++ /dev/null
@@ -1,70 +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" entityID="https://login.helsinki.fi/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.csc.fi/haka">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://www.csc.fi/english/institutions/haka/instructions/join/eduGAINRegistrationStatement/</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">helsinki.fi</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIE3jCCA8agAwIBAgIQWSnA5EzgO1nthR4AsdlaoTANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTEyMDYxNTAwMDAwMFoXDTE1MDYxNTIzNTk1OVowgbcxCzAJBgNV
-BAYTAkZJMQ4wDAYDVQQREwUwMDAxNDEQMA4GA1UECBMHVXVzaW1hYTERMA8GA1UE
-BxMISGVsc2lua2kxIjAgBgNVBAkTGVBMIDI2IChUZW9sbGlzdXVza2F0dSAyMykx
-HzAdBgNVBAoTFlVuaXZlcnNpdHkgb2YgSGVsc2lua2kxEjAQBgNVBAsTCUlUIENl
-bnRlcjEaMBgGA1UEAxMRbG9naW4uaGVsc2lua2kuZmkwggEiMA0GCSqGSIb3DQEB
-AQUAA4IBDwAwggEKAoIBAQDrQpyohqDuaPxlOQDkWC/I/aw1ZhYMjLVDEx7x6XxR
-W9C5J4tTXpYYT3Us+oEUSJObhBTSm9EQ0tbDqnZjubwWZDkXHr1tnyP+JCFoFTZ/
-tqV768I3fE3TKdgEY3paVM8MWZPoyJf4uy1dKCz5lwie3anIYNVXw6mlPqbI9zAT
-b5elTMn+cBw9dML4dAQVODTuDJ2+avRMO4ItuqEj5f5PdI0HUjLU2ejRUQLP2nNX
-2MWgtweWvTIS/IWO1neE3Kn8v3j1VLdS3Xk2t/UBSeGl5e6MARhiHbLtigAWuIZv
-1pznlwdppBOzACm0e3somcJrbFnFOnbGmRQKtXq2yQJ3AgMBAAGjggFkMIIBYDAf
-BgNVHSMEGDAWgBQMvZNoDPPeq6NJays3V0fqkOO57TAdBgNVHQ4EFgQUqm3ksXlN
-/umZswjtgICNhBMvWlAwDgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYD
-VR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMBgGA1UdIAQRMA8wDQYLKwYBBAGy
-MQECAh0wOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9y
-Zy9URVJFTkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilo
-dHRwOi8vY3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEF
-BQcwAYYaaHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwHAYDVR0RBBUwE4IRbG9n
-aW4uaGVsc2lua2kuZmkwDQYJKoZIhvcNAQEFBQADggEBACHDbip+j9xIvdz0WXvF
-4jhBCz4FoGoe7THcFwhVZL8oO3pKGyFHvAFQjdxibgWimOjYQyEnRoE2NYi27ccj
-S3hTQ3xcxoN6Zwq7Nq7iFNmQJ6Lc2uimU5zW7tLRqlTWQKKUm6/niFYv598Mg0PT
-NYY+HvJbSaNYXLkLzxOl8+fWFZqxmThOsb5KAx1xVjNVo2DiwC0crol7Wd0uDJEm
-9W8PdlbMcU04uznzo1v5EggbllAoFoqgWLL36H9zkbkh9NpA3a3j0PyvPaQHzwaC
-54RgRywzt/5g35mU+1cX4gTxt3aP6buBLAaEVtDJ+XQcfZJj3KhPQ2oo2y6Z6fNd
-Ahw=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <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://login.helsinki.fi/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.helsinki.fi/idp/profile/SAML2/POST/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="fi">Helsingin yliopisto</OrganizationName>
-    <OrganizationName xml:lang="en">University of Helsinki</OrganizationName>
-    <OrganizationName xml:lang="sv">Helsingfors universitet</OrganizationName>
-    <OrganizationDisplayName xml:lang="fi">Helsingin yliopisto</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">University of Helsinki</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="sv">Helsingfors universitet</OrganizationDisplayName>
-    <OrganizationURL xml:lang="fi">http://www.helsinki.fi/yliopisto/</OrganizationURL>
-    <OrganizationURL xml:lang="en">http://www.helsinki.fi/yliopisto/</OrganizationURL>
-    <OrganizationURL xml:lang="sv">http://www.helsinki.fi/yliopisto/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Janne</GivenName>
-    <SurName>Peltonen</SurName>
-    <EmailAddress>mailto:idm-hosting@helsinki.fi</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="support">
-    <GivenName>Juha</GivenName>
-    <SurName>Niemi</SurName>
-    <EmailAddress>mailto:idm-hosting@helsinki.fi</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/login.idp.hhs.se-idp-shibboleth.xml b/swamid-interfederations-2.0/login.idp.hhs.se-idp-shibboleth.xml
deleted file mode 100644
index a25f5b38..00000000
--- a/swamid-interfederations-2.0/login.idp.hhs.se-idp-shibboleth.xml
+++ /dev/null
@@ -1,100 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://login.idp.hhs.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">hhs.se</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="sv">Handelshögskolan i Stockholm</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Stockholm School of Economics</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Identity Provider för Handelshögskolan i Stockholm.</mdui:Description>
-        <mdui:Description xml:lang="en">Identity Provider for Stockholm School of Economics.</mdui:Description>
-        <mdui:Logo height="82" width="82">https://login.idp.hhs.se/idp/images/logo.png</mdui:Logo>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:IPHint>193.10.48.0/24</mdui:IPHint>
-        <mdui:DomainHint>hhs.se</mdui:DomainHint>
-        <mdui:GeolocationHint>geo:59.34161,18.05659</mdui:GeolocationHint>
-      </mdui:DiscoHints>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDLDCCAhSgAwIBAgIVAPaVg+Pnce+JDTg4a490Fu28tq5UMA0GCSqGSIb3DQEB
-BQUAMBsxGTAXBgNVBAMTEGxvZ2luLmlkcC5oaHMuc2UwHhcNMTQwMjE4MDgzNTI1
-WhcNMTcwMjE4MDgzNTI1WjAbMRkwFwYDVQQDExBsb2dpbi5pZHAuaGhzLnNlMIIB
-IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApHfxE/NtoBdovpvyI+ShRpC9
-PvASzTQ7O2zsFwRsaooYlSeRxWq4jL4dyC7lm1Z5CPWgOAqcprYFkUI1wFhopOLU
-nYvqjc0jx8lSV9nqdSRC2MJrLbOS8V0CL8pAWeVbHE848nVeJS4elOr2EvYkZAij
-t78R/RvBJrVBpRKiAz1uvCGIyZ2HYt6bQBzWkG4L+pxC3z/ttjI2ql9ctWB3im00
-mzdmN7GW6bCQJlYWm8sy0iHI9Yt1aUMkXlBnrlUVNzq+cp+2hhuB7qy/XqhUVUMq
-PkBxpIkk6To2kCN+00uQP4oslomw3khz0GcrV88+nAIAAEeA3zrYbBvh05ABGQID
-AQABo2cwZTBEBgNVHREEPTA7ghBsb2dpbi5pZHAuaGhzLnNlhidodHRwczovL2xv
-Z2luLmlkcC5oaHMuc2UvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFIMbKfamMiy4
-s3T84Lli4DWzkdIbMA0GCSqGSIb3DQEBBQUAA4IBAQBZt9RVrBFSfR+F5L+zPQrl
-3rTfcJXbivC8hWORCF3mFf3Z7nlOY/c/0LvOMK5pXF+gU50kjMhQ56mQHcmph9NC
-sabeqXJNDw7XlwUTYW4JkN8UpbaPvdeWKnWIUS/3zheqKIwbngkef1VqFLLtPOOw
-Io1509ayQEdBHOVmkC6dyzfy0eLoYOhFWlsP2PGaUkwx2IPEkZIT9HYKSO29vJLh
-Npezy9C4aa5Dvq92Chi9C4SVsjbeq2LNccaYLMj9Gt9HBOoQHNn8bcgKn1I17T9S
-UXquEqvQ92VtMjTxgKgQRmQKkzigbL4FehuxJaF/BrO8KcshRQQkqdQeUvmY1/QC</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.idp.hhs.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.idp.hhs.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <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://login.idp.hhs.se/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.idp.hhs.se/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://login.idp.hhs.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.idp.hhs.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">hhs.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDLDCCAhSgAwIBAgIVAPaVg+Pnce+JDTg4a490Fu28tq5UMA0GCSqGSIb3DQEB
-BQUAMBsxGTAXBgNVBAMTEGxvZ2luLmlkcC5oaHMuc2UwHhcNMTQwMjE4MDgzNTI1
-WhcNMTcwMjE4MDgzNTI1WjAbMRkwFwYDVQQDExBsb2dpbi5pZHAuaGhzLnNlMIIB
-IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApHfxE/NtoBdovpvyI+ShRpC9
-PvASzTQ7O2zsFwRsaooYlSeRxWq4jL4dyC7lm1Z5CPWgOAqcprYFkUI1wFhopOLU
-nYvqjc0jx8lSV9nqdSRC2MJrLbOS8V0CL8pAWeVbHE848nVeJS4elOr2EvYkZAij
-t78R/RvBJrVBpRKiAz1uvCGIyZ2HYt6bQBzWkG4L+pxC3z/ttjI2ql9ctWB3im00
-mzdmN7GW6bCQJlYWm8sy0iHI9Yt1aUMkXlBnrlUVNzq+cp+2hhuB7qy/XqhUVUMq
-PkBxpIkk6To2kCN+00uQP4oslomw3khz0GcrV88+nAIAAEeA3zrYbBvh05ABGQID
-AQABo2cwZTBEBgNVHREEPTA7ghBsb2dpbi5pZHAuaGhzLnNlhidodHRwczovL2xv
-Z2luLmlkcC5oaHMuc2UvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFIMbKfamMiy4
-s3T84Lli4DWzkdIbMA0GCSqGSIb3DQEBBQUAA4IBAQBZt9RVrBFSfR+F5L+zPQrl
-3rTfcJXbivC8hWORCF3mFf3Z7nlOY/c/0LvOMK5pXF+gU50kjMhQ56mQHcmph9NC
-sabeqXJNDw7XlwUTYW4JkN8UpbaPvdeWKnWIUS/3zheqKIwbngkef1VqFLLtPOOw
-Io1509ayQEdBHOVmkC6dyzfy0eLoYOhFWlsP2PGaUkwx2IPEkZIT9HYKSO29vJLh
-Npezy9C4aa5Dvq92Chi9C4SVsjbeq2LNccaYLMj9Gt9HBOoQHNn8bcgKn1I17T9S
-UXquEqvQ92VtMjTxgKgQRmQKkzigbL4FehuxJaF/BrO8KcshRQQkqdQeUvmY1/QC</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.idp.hhs.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.idp.hhs.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>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-  <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
-    <OrganizationName xml:lang="en">HHS</OrganizationName>
-    <OrganizationDisplayName xml:lang="sv">Handelshögskolan i Stockholm</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">Stockholm School of Economics</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.hhs.se</OrganizationURL>
-  </Organization>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
-    <Company>Handelshögskolan i Stockholm</Company>
-    <EmailAddress>itsupport@hhs.se</EmailAddress>
-  </ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/login.idp.hhs.se.xml b/swamid-interfederations-2.0/login.idp.hhs.se.xml
deleted file mode 100644
index a25f5b38..00000000
--- a/swamid-interfederations-2.0/login.idp.hhs.se.xml
+++ /dev/null
@@ -1,100 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://login.idp.hhs.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">hhs.se</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="sv">Handelshögskolan i Stockholm</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Stockholm School of Economics</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Identity Provider för Handelshögskolan i Stockholm.</mdui:Description>
-        <mdui:Description xml:lang="en">Identity Provider for Stockholm School of Economics.</mdui:Description>
-        <mdui:Logo height="82" width="82">https://login.idp.hhs.se/idp/images/logo.png</mdui:Logo>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:IPHint>193.10.48.0/24</mdui:IPHint>
-        <mdui:DomainHint>hhs.se</mdui:DomainHint>
-        <mdui:GeolocationHint>geo:59.34161,18.05659</mdui:GeolocationHint>
-      </mdui:DiscoHints>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDLDCCAhSgAwIBAgIVAPaVg+Pnce+JDTg4a490Fu28tq5UMA0GCSqGSIb3DQEB
-BQUAMBsxGTAXBgNVBAMTEGxvZ2luLmlkcC5oaHMuc2UwHhcNMTQwMjE4MDgzNTI1
-WhcNMTcwMjE4MDgzNTI1WjAbMRkwFwYDVQQDExBsb2dpbi5pZHAuaGhzLnNlMIIB
-IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApHfxE/NtoBdovpvyI+ShRpC9
-PvASzTQ7O2zsFwRsaooYlSeRxWq4jL4dyC7lm1Z5CPWgOAqcprYFkUI1wFhopOLU
-nYvqjc0jx8lSV9nqdSRC2MJrLbOS8V0CL8pAWeVbHE848nVeJS4elOr2EvYkZAij
-t78R/RvBJrVBpRKiAz1uvCGIyZ2HYt6bQBzWkG4L+pxC3z/ttjI2ql9ctWB3im00
-mzdmN7GW6bCQJlYWm8sy0iHI9Yt1aUMkXlBnrlUVNzq+cp+2hhuB7qy/XqhUVUMq
-PkBxpIkk6To2kCN+00uQP4oslomw3khz0GcrV88+nAIAAEeA3zrYbBvh05ABGQID
-AQABo2cwZTBEBgNVHREEPTA7ghBsb2dpbi5pZHAuaGhzLnNlhidodHRwczovL2xv
-Z2luLmlkcC5oaHMuc2UvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFIMbKfamMiy4
-s3T84Lli4DWzkdIbMA0GCSqGSIb3DQEBBQUAA4IBAQBZt9RVrBFSfR+F5L+zPQrl
-3rTfcJXbivC8hWORCF3mFf3Z7nlOY/c/0LvOMK5pXF+gU50kjMhQ56mQHcmph9NC
-sabeqXJNDw7XlwUTYW4JkN8UpbaPvdeWKnWIUS/3zheqKIwbngkef1VqFLLtPOOw
-Io1509ayQEdBHOVmkC6dyzfy0eLoYOhFWlsP2PGaUkwx2IPEkZIT9HYKSO29vJLh
-Npezy9C4aa5Dvq92Chi9C4SVsjbeq2LNccaYLMj9Gt9HBOoQHNn8bcgKn1I17T9S
-UXquEqvQ92VtMjTxgKgQRmQKkzigbL4FehuxJaF/BrO8KcshRQQkqdQeUvmY1/QC</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.idp.hhs.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.idp.hhs.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <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://login.idp.hhs.se/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.idp.hhs.se/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://login.idp.hhs.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.idp.hhs.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">hhs.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDLDCCAhSgAwIBAgIVAPaVg+Pnce+JDTg4a490Fu28tq5UMA0GCSqGSIb3DQEB
-BQUAMBsxGTAXBgNVBAMTEGxvZ2luLmlkcC5oaHMuc2UwHhcNMTQwMjE4MDgzNTI1
-WhcNMTcwMjE4MDgzNTI1WjAbMRkwFwYDVQQDExBsb2dpbi5pZHAuaGhzLnNlMIIB
-IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApHfxE/NtoBdovpvyI+ShRpC9
-PvASzTQ7O2zsFwRsaooYlSeRxWq4jL4dyC7lm1Z5CPWgOAqcprYFkUI1wFhopOLU
-nYvqjc0jx8lSV9nqdSRC2MJrLbOS8V0CL8pAWeVbHE848nVeJS4elOr2EvYkZAij
-t78R/RvBJrVBpRKiAz1uvCGIyZ2HYt6bQBzWkG4L+pxC3z/ttjI2ql9ctWB3im00
-mzdmN7GW6bCQJlYWm8sy0iHI9Yt1aUMkXlBnrlUVNzq+cp+2hhuB7qy/XqhUVUMq
-PkBxpIkk6To2kCN+00uQP4oslomw3khz0GcrV88+nAIAAEeA3zrYbBvh05ABGQID
-AQABo2cwZTBEBgNVHREEPTA7ghBsb2dpbi5pZHAuaGhzLnNlhidodHRwczovL2xv
-Z2luLmlkcC5oaHMuc2UvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFIMbKfamMiy4
-s3T84Lli4DWzkdIbMA0GCSqGSIb3DQEBBQUAA4IBAQBZt9RVrBFSfR+F5L+zPQrl
-3rTfcJXbivC8hWORCF3mFf3Z7nlOY/c/0LvOMK5pXF+gU50kjMhQ56mQHcmph9NC
-sabeqXJNDw7XlwUTYW4JkN8UpbaPvdeWKnWIUS/3zheqKIwbngkef1VqFLLtPOOw
-Io1509ayQEdBHOVmkC6dyzfy0eLoYOhFWlsP2PGaUkwx2IPEkZIT9HYKSO29vJLh
-Npezy9C4aa5Dvq92Chi9C4SVsjbeq2LNccaYLMj9Gt9HBOoQHNn8bcgKn1I17T9S
-UXquEqvQ92VtMjTxgKgQRmQKkzigbL4FehuxJaF/BrO8KcshRQQkqdQeUvmY1/QC</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.idp.hhs.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.idp.hhs.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>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-  <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
-    <OrganizationName xml:lang="en">HHS</OrganizationName>
-    <OrganizationDisplayName xml:lang="sv">Handelshögskolan i Stockholm</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">Stockholm School of Economics</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.hhs.se</OrganizationURL>
-  </Organization>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
-    <Company>Handelshögskolan i Stockholm</Company>
-    <EmailAddress>itsupport@hhs.se</EmailAddress>
-  </ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/login.insa-lyon.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/login.insa-lyon.fr-idp-shibboleth.xml
deleted file mode 100644
index eb33e517..00000000
--- a/swamid-interfederations-2.0/login.insa-lyon.fr-idp-shibboleth.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://login.insa-lyon.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2012-04-27T12:03:44Z">
-      <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">insa-lyon.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">INSA de Lyon</mdui:DisplayName>
-        <mdui:Description xml:lang="en">everyone at INSA de LYON</mdui:Description>
-        <mdui:DisplayName xml:lang="fr">INSA de Lyon</mdui:DisplayName>
-        <mdui:Description xml:lang="fr">toutes population (etudiants/personnels) de l'INSA 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>
-					      MIIDMzCCAhugAwIBAgIUSMWboaAOUaXanB/KMcwBhD32kfYwDQYJKoZIhvcNAQEF
-BQAwHTEbMBkGA1UEAxMSbG9naW4uaW5zYS1seW9uLmZyMB4XDTEyMDQyNTExNDMz
-NFoXDTMyMDQyNTExNDMzNFowHTEbMBkGA1UEAxMSbG9naW4uaW5zYS1seW9uLmZy
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAlGLzIxkhLAo8tJXMprLD
-mHamE3JsZx6MPSahfc1eDQek6dAC6I1vT6/g29ykVG02oLLhh6yQdsbl64D625jn
-w38xWf7lIMcnTUOSMWhYs9iGchAAnUrbFBuH+Hf2JnDgHauxX+4HHsvPZEesfyIF
-t8K9nVk/F4w7od3s8gUcRwGyp9JL2L12BFLYcFSZQK99n/xkdnLm7zVYRnjXRHvF
-O19qsTLuOigWEYISS7dMcsJUR0sCrj5m372agTuPlsnr0zRivTHLSkn9KXvRB/9V
-pE+nw4U/oQU7VnyrqJM/QUvJeCT0uDC7lOJiKRvn5MG9AbfeItJi5c7meYSX79pR
-DwIDAQABo2swaTBIBgNVHREEQTA/ghJsb2dpbi5pbnNhLWx5b24uZnKGKWh0dHBz
-Oi8vbG9naW4uaW5zYS1seW9uLmZyL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBRc
-WvjDFJ1TMxlmW51//gXYknsBAjANBgkqhkiG9w0BAQUFAAOCAQEAbtOsiF0RFf30
-qcDbB3gF0jfxXG5QH1xGsMlw9ERAT5PBAWLY6Z+KKswxSq/cx/+oZWIclmfkkAvl
-aV/dRYFKbJgui6NFxXpZOmAabsFVgev5pH+USVi4xXYoi+St5lhS8dGIaCx4gY+j
-fXGsI0PmacCwdzgBQqprkNfuTb9FCKffmdOXwq77P+/RU2rDsnIsprJnuRe9aLyS
-srGPvbAUqLsg9Z5kKNUQ8uTtXDpAVobHIh2p1/HBCm6DsJH3phk4U8khzzFcWrXg
-Hz6zqkIwcnbaal37SlVeiO+ZbBOxuxMRhqvg+jHw/G+35qj+MctKIfQ26mPLssmJ
-pWJ/IW9yrw==
-					    </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://login.insa-lyon.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.insa-lyon.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.insa-lyon.fr/idp/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">INSA de Lyon</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">INSA de Lyon</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Olivier FRANCO</SurName>
-    <EmailAddress>olivier.franco@insa-lyon.fr</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <SurName>Damien BERJOAN</SurName>
-    <EmailAddress>damien.berjoan@insa-lyon.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/login.insa-lyon.fr.xml b/swamid-interfederations-2.0/login.insa-lyon.fr.xml
deleted file mode 100644
index eb33e517..00000000
--- a/swamid-interfederations-2.0/login.insa-lyon.fr.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://login.insa-lyon.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2012-04-27T12:03:44Z">
-      <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">insa-lyon.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">INSA de Lyon</mdui:DisplayName>
-        <mdui:Description xml:lang="en">everyone at INSA de LYON</mdui:Description>
-        <mdui:DisplayName xml:lang="fr">INSA de Lyon</mdui:DisplayName>
-        <mdui:Description xml:lang="fr">toutes population (etudiants/personnels) de l'INSA 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>
-					      MIIDMzCCAhugAwIBAgIUSMWboaAOUaXanB/KMcwBhD32kfYwDQYJKoZIhvcNAQEF
-BQAwHTEbMBkGA1UEAxMSbG9naW4uaW5zYS1seW9uLmZyMB4XDTEyMDQyNTExNDMz
-NFoXDTMyMDQyNTExNDMzNFowHTEbMBkGA1UEAxMSbG9naW4uaW5zYS1seW9uLmZy
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAlGLzIxkhLAo8tJXMprLD
-mHamE3JsZx6MPSahfc1eDQek6dAC6I1vT6/g29ykVG02oLLhh6yQdsbl64D625jn
-w38xWf7lIMcnTUOSMWhYs9iGchAAnUrbFBuH+Hf2JnDgHauxX+4HHsvPZEesfyIF
-t8K9nVk/F4w7od3s8gUcRwGyp9JL2L12BFLYcFSZQK99n/xkdnLm7zVYRnjXRHvF
-O19qsTLuOigWEYISS7dMcsJUR0sCrj5m372agTuPlsnr0zRivTHLSkn9KXvRB/9V
-pE+nw4U/oQU7VnyrqJM/QUvJeCT0uDC7lOJiKRvn5MG9AbfeItJi5c7meYSX79pR
-DwIDAQABo2swaTBIBgNVHREEQTA/ghJsb2dpbi5pbnNhLWx5b24uZnKGKWh0dHBz
-Oi8vbG9naW4uaW5zYS1seW9uLmZyL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBRc
-WvjDFJ1TMxlmW51//gXYknsBAjANBgkqhkiG9w0BAQUFAAOCAQEAbtOsiF0RFf30
-qcDbB3gF0jfxXG5QH1xGsMlw9ERAT5PBAWLY6Z+KKswxSq/cx/+oZWIclmfkkAvl
-aV/dRYFKbJgui6NFxXpZOmAabsFVgev5pH+USVi4xXYoi+St5lhS8dGIaCx4gY+j
-fXGsI0PmacCwdzgBQqprkNfuTb9FCKffmdOXwq77P+/RU2rDsnIsprJnuRe9aLyS
-srGPvbAUqLsg9Z5kKNUQ8uTtXDpAVobHIh2p1/HBCm6DsJH3phk4U8khzzFcWrXg
-Hz6zqkIwcnbaal37SlVeiO+ZbBOxuxMRhqvg+jHw/G+35qj+MctKIfQ26mPLssmJ
-pWJ/IW9yrw==
-					    </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://login.insa-lyon.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.insa-lyon.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.insa-lyon.fr/idp/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">INSA de Lyon</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">INSA de Lyon</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Olivier FRANCO</SurName>
-    <EmailAddress>olivier.franco@insa-lyon.fr</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <SurName>Damien BERJOAN</SurName>
-    <EmailAddress>damien.berjoan@insa-lyon.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/login.ktu.lt-simplesaml-saml2-idp-metadata.php.xml b/swamid-interfederations-2.0/login.ktu.lt-simplesaml-saml2-idp-metadata.php.xml
deleted file mode 100644
index e77f1d5b..00000000
--- a/swamid-interfederations-2.0/login.ktu.lt-simplesaml-saml2-idp-metadata.php.xml
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://login.ktu.lt/simplesaml/saml2/idp/metadata.php">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://fedi.litnet.lt" registrationInstant="2014-05-01T11:00:03Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://federacija.litnet.lt/en</mdrpi:RegistrationPolicy>
-      <mdrpi:RegistrationPolicy xml:lang="lt">https://federacija.litnet.lt/lt</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">Kaunas University of Technology</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="lt">Kauno technologijos universitetas</mdui:DisplayName>
-        <mdui:Description xml:lang="en">KTU Single Sign On</mdui:Description>
-        <mdui:Description xml:lang="lt">KTU vieningas prisijungimas</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://ktu.edu</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="lt">http://ktu.edu</mdui:InformationURL>
-        <mdui:Keywords xml:lang="en">Kaunas Kaunas+University+of+Technology</mdui:Keywords>
-        <mdui:Keywords xml:lang="lt">Kaunas Kauno+technologijos+universitetas</mdui:Keywords>
-        <mdui:Logo height="88" width="80" xml:lang="en">https://tinklas.ktu.lt/images/logo/ktu_80x88.png</mdui:Logo>
-        <mdui:Logo height="88" width="80" xml:lang="lt">https://tinklas.ktu.lt/images/logo/ktu_80x88.png</mdui:Logo>
-        <mdui:Logo height="16" width="16" xml:lang="en">https://tinklas.ktu.lt/images/logo/ktu_16x16.png</mdui:Logo>
-        <mdui:Logo height="16" width="16" xml:lang="lt">https://tinklas.ktu.lt/images/logo/ktu_16x16.png</mdui:Logo>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:IPHint>158.129.0.0/19</mdui:IPHint>
-        <mdui:IPHint>158.129.32.0/21</mdui:IPHint>
-        <mdui:IPHint>83.171.8.0/22</mdui:IPHint>
-        <mdui:IPHint>83.171.15.0/24</mdui:IPHint>
-        <mdui:IPHint>83.171.18.0/23</mdui:IPHint>
-        <mdui:IPHint>83.171.20.0/24</mdui:IPHint>
-        <mdui:IPHint>193.219.32.0/22</mdui:IPHint>
-        <mdui:IPHint>193.219.36.0/24</mdui:IPHint>
-        <mdui:IPHint>193.219.61.0/24</mdui:IPHint>
-        <mdui:IPHint>193.219.63.0/24</mdui:IPHint>
-        <mdui:IPHint>193.219.66.0/23</mdui:IPHint>
-        <mdui:IPHint>193.219.68.0/22</mdui:IPHint>
-        <mdui:IPHint>193.219.74.0/24</mdui:IPHint>
-        <mdui:IPHint>193.219.154.0/24</mdui:IPHint>
-        <mdui:IPHint>193.219.156.0/22</mdui:IPHint>
-        <mdui:IPHint>193.219.160.0/24</mdui:IPHint>
-        <mdui:IPHint>193.219.170.0/23</mdui:IPHint>
-        <mdui:IPHint>193.219.174.0/23</mdui:IPHint>
-        <mdui:IPHint>193.219.176.0/25</mdui:IPHint>
-        <mdui:IPHint>193.219.184.0/24</mdui:IPHint>
-        <mdui:IPHint>2001:778:200::/48</mdui:IPHint>
-        <mdui:DomainHint>ktu.lt</mdui:DomainHint>
-        <mdui:DomainHint>ktu.edu</mdui:DomainHint>
-        <mdui:GeolocationHint>geo:54.9049679,23.956717000000026</mdui:GeolocationHint>
-        <mdui:GeolocationHint>geo:54.8988679,23.91259100000002</mdui:GeolocationHint>
-        <mdui:GeolocationHint>geo:54.898964, 23.921850</mdui:GeolocationHint>
-      </mdui:DiscoHints>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIIElTCCA32gAwIBAgIJALYznSATuns+MA0GCSqGSIb3DQEBBQUAMIGNMQswCQYDVQQGEwJMVDEPMA0GA1UECBMGS2F1bmFzMQ8wDQYDVQQHEwZLYXVuYXMxKjAoBgNVBAoTIUthdW5vIHRlY2hub2xvZ2lqb3MgdW5pdmVyc2l0ZXRhczEVMBMGA1UEAxMMbG9naW4ua3R1Lmx0MRkwFwYJKoZIhvcNAQkBFgpzc29Aa3R1Lmx0MB4XDTE0MDgwNDEzMDY0MFoXDTI0MDgwMzEzMDY0MFowgY0xCzAJBgNVBAYTAkxUMQ8wDQYDVQQIEwZLYXVuYXMxDzANBgNVBAcTBkthdW5hczEqMCgGA1UEChMhS2F1bm8gdGVjaG5vbG9naWpvcyB1bml2ZXJzaXRldGFzMRUwEwYDVQQDEwxsb2dpbi5rdHUubHQxGTAXBgkqhkiG9w0BCQEWCnNzb0BrdHUubHQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCr3YT9UZdS87hoUW2O+nElhco6e1mSJnCVfDXliqaOAv421+khPEqJuKeL1pCeDNHpSlcbVlmdNiwb3SZGUxaXoenTFxaqCZPV09Ggny5f9YBkEzaDOJpB3yGfvbhyrmoRM6zeziATUJiHcns395XuJwd2nwbkNGwY4u4BO7ennVZeQR2r9GOyL+yz3Kly+q8YhIEw0DBXYoPXKhfHBr+otszV9CRXCgnDgVQ7lqqMbxJiK/n7skd1WLRjxxIuTBh3UfTSKmmy3RqwA/NlUYl5Uh42GFE/D0UlKYwzNoBjsV7QXkkmMf8vUiy/x7Tj6PM4zsg716AOafJCPESSuKQJAgMBAAGjgfUwgfIwHQYDVR0OBBYEFMCp68JzkZdFKWHkjPn0XTCo98WhMIHCBgNVHSMEgbowgbeAFMCp68JzkZdFKWHkjPn0XTCo98WhoYGTpIGQMIGNMQswCQYDVQQGEwJMVDEPMA0GA1UECBMGS2F1bmFzMQ8wDQYDVQQHEwZLYXVuYXMxKjAoBgNVBAoTIUthdW5vIHRlY2hub2xvZ2lqb3MgdW5pdmVyc2l0ZXRhczEVMBMGA1UEAxMMbG9naW4ua3R1Lmx0MRkwFwYJKoZIhvcNAQkBFgpzc29Aa3R1Lmx0ggkAtjOdIBO6ez4wDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAdpZ936wIu3ArrlB0/+RL5FreCZnnXhvxSOGWUZzrzq143BXnClnd/i9oZMMz5C4apRk6f7USWQZFeYrzSb8dpSjgJUYXPcCT5REf+u2aMOoPtmwGGg+zkQKY18WZYC3BW4LPwzNocH3YYBhPrxTkKX/d+xjGM9/b0yOCwdJjj0BlwXq5unq0LIK49aSIyuHwA23d+drva9TON936JL4SEqchA2hbnws1elOJNIiykHUJfKqYy/dY9rqRSx+Hf8gsa2TNLU3sl57neVdLF6p6w/3g4mjB111B4U382kXULKO7Y+J1uffkJ71sGBdRWsvH09i0ReJWzbWxAtF2jtzfkw==</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>MIIElTCCA32gAwIBAgIJALYznSATuns+MA0GCSqGSIb3DQEBBQUAMIGNMQswCQYDVQQGEwJMVDEPMA0GA1UECBMGS2F1bmFzMQ8wDQYDVQQHEwZLYXVuYXMxKjAoBgNVBAoTIUthdW5vIHRlY2hub2xvZ2lqb3MgdW5pdmVyc2l0ZXRhczEVMBMGA1UEAxMMbG9naW4ua3R1Lmx0MRkwFwYJKoZIhvcNAQkBFgpzc29Aa3R1Lmx0MB4XDTE0MDgwNDEzMDY0MFoXDTI0MDgwMzEzMDY0MFowgY0xCzAJBgNVBAYTAkxUMQ8wDQYDVQQIEwZLYXVuYXMxDzANBgNVBAcTBkthdW5hczEqMCgGA1UEChMhS2F1bm8gdGVjaG5vbG9naWpvcyB1bml2ZXJzaXRldGFzMRUwEwYDVQQDEwxsb2dpbi5rdHUubHQxGTAXBgkqhkiG9w0BCQEWCnNzb0BrdHUubHQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCr3YT9UZdS87hoUW2O+nElhco6e1mSJnCVfDXliqaOAv421+khPEqJuKeL1pCeDNHpSlcbVlmdNiwb3SZGUxaXoenTFxaqCZPV09Ggny5f9YBkEzaDOJpB3yGfvbhyrmoRM6zeziATUJiHcns395XuJwd2nwbkNGwY4u4BO7ennVZeQR2r9GOyL+yz3Kly+q8YhIEw0DBXYoPXKhfHBr+otszV9CRXCgnDgVQ7lqqMbxJiK/n7skd1WLRjxxIuTBh3UfTSKmmy3RqwA/NlUYl5Uh42GFE/D0UlKYwzNoBjsV7QXkkmMf8vUiy/x7Tj6PM4zsg716AOafJCPESSuKQJAgMBAAGjgfUwgfIwHQYDVR0OBBYEFMCp68JzkZdFKWHkjPn0XTCo98WhMIHCBgNVHSMEgbowgbeAFMCp68JzkZdFKWHkjPn0XTCo98WhoYGTpIGQMIGNMQswCQYDVQQGEwJMVDEPMA0GA1UECBMGS2F1bmFzMQ8wDQYDVQQHEwZLYXVuYXMxKjAoBgNVBAoTIUthdW5vIHRlY2hub2xvZ2lqb3MgdW5pdmVyc2l0ZXRhczEVMBMGA1UEAxMMbG9naW4ua3R1Lmx0MRkwFwYJKoZIhvcNAQkBFgpzc29Aa3R1Lmx0ggkAtjOdIBO6ez4wDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAdpZ936wIu3ArrlB0/+RL5FreCZnnXhvxSOGWUZzrzq143BXnClnd/i9oZMMz5C4apRk6f7USWQZFeYrzSb8dpSjgJUYXPcCT5REf+u2aMOoPtmwGGg+zkQKY18WZYC3BW4LPwzNocH3YYBhPrxTkKX/d+xjGM9/b0yOCwdJjj0BlwXq5unq0LIK49aSIyuHwA23d+drva9TON936JL4SEqchA2hbnws1elOJNIiykHUJfKqYy/dY9rqRSx+Hf8gsa2TNLU3sl57neVdLF6p6w/3g4mjB111B4U382kXULKO7Y+J1uffkJ71sGBdRWsvH09i0ReJWzbWxAtF2jtzfkw==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.ktu.lt/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://login.ktu.lt/simplesaml/saml2/idp/SSOService.php"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Kaunas University of Technology</md:OrganizationName>
-    <md:OrganizationName xml:lang="lt">Kauno technologijos universitetas</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Kaunas University of Technology</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="lt">Kauno technologijos universitetas</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://ktu.edu</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="lt">http://ktu.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>KTU</md:GivenName>
-    <md:SurName>SSO</md:SurName>
-    <md:EmailAddress>sso@ktu.lt</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/login.ktu.lt.xml b/swamid-interfederations-2.0/login.ktu.lt.xml
deleted file mode 100644
index e77f1d5b..00000000
--- a/swamid-interfederations-2.0/login.ktu.lt.xml
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://login.ktu.lt/simplesaml/saml2/idp/metadata.php">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://fedi.litnet.lt" registrationInstant="2014-05-01T11:00:03Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://federacija.litnet.lt/en</mdrpi:RegistrationPolicy>
-      <mdrpi:RegistrationPolicy xml:lang="lt">https://federacija.litnet.lt/lt</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">Kaunas University of Technology</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="lt">Kauno technologijos universitetas</mdui:DisplayName>
-        <mdui:Description xml:lang="en">KTU Single Sign On</mdui:Description>
-        <mdui:Description xml:lang="lt">KTU vieningas prisijungimas</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://ktu.edu</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="lt">http://ktu.edu</mdui:InformationURL>
-        <mdui:Keywords xml:lang="en">Kaunas Kaunas+University+of+Technology</mdui:Keywords>
-        <mdui:Keywords xml:lang="lt">Kaunas Kauno+technologijos+universitetas</mdui:Keywords>
-        <mdui:Logo height="88" width="80" xml:lang="en">https://tinklas.ktu.lt/images/logo/ktu_80x88.png</mdui:Logo>
-        <mdui:Logo height="88" width="80" xml:lang="lt">https://tinklas.ktu.lt/images/logo/ktu_80x88.png</mdui:Logo>
-        <mdui:Logo height="16" width="16" xml:lang="en">https://tinklas.ktu.lt/images/logo/ktu_16x16.png</mdui:Logo>
-        <mdui:Logo height="16" width="16" xml:lang="lt">https://tinklas.ktu.lt/images/logo/ktu_16x16.png</mdui:Logo>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:IPHint>158.129.0.0/19</mdui:IPHint>
-        <mdui:IPHint>158.129.32.0/21</mdui:IPHint>
-        <mdui:IPHint>83.171.8.0/22</mdui:IPHint>
-        <mdui:IPHint>83.171.15.0/24</mdui:IPHint>
-        <mdui:IPHint>83.171.18.0/23</mdui:IPHint>
-        <mdui:IPHint>83.171.20.0/24</mdui:IPHint>
-        <mdui:IPHint>193.219.32.0/22</mdui:IPHint>
-        <mdui:IPHint>193.219.36.0/24</mdui:IPHint>
-        <mdui:IPHint>193.219.61.0/24</mdui:IPHint>
-        <mdui:IPHint>193.219.63.0/24</mdui:IPHint>
-        <mdui:IPHint>193.219.66.0/23</mdui:IPHint>
-        <mdui:IPHint>193.219.68.0/22</mdui:IPHint>
-        <mdui:IPHint>193.219.74.0/24</mdui:IPHint>
-        <mdui:IPHint>193.219.154.0/24</mdui:IPHint>
-        <mdui:IPHint>193.219.156.0/22</mdui:IPHint>
-        <mdui:IPHint>193.219.160.0/24</mdui:IPHint>
-        <mdui:IPHint>193.219.170.0/23</mdui:IPHint>
-        <mdui:IPHint>193.219.174.0/23</mdui:IPHint>
-        <mdui:IPHint>193.219.176.0/25</mdui:IPHint>
-        <mdui:IPHint>193.219.184.0/24</mdui:IPHint>
-        <mdui:IPHint>2001:778:200::/48</mdui:IPHint>
-        <mdui:DomainHint>ktu.lt</mdui:DomainHint>
-        <mdui:DomainHint>ktu.edu</mdui:DomainHint>
-        <mdui:GeolocationHint>geo:54.9049679,23.956717000000026</mdui:GeolocationHint>
-        <mdui:GeolocationHint>geo:54.8988679,23.91259100000002</mdui:GeolocationHint>
-        <mdui:GeolocationHint>geo:54.898964, 23.921850</mdui:GeolocationHint>
-      </mdui:DiscoHints>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIIElTCCA32gAwIBAgIJALYznSATuns+MA0GCSqGSIb3DQEBBQUAMIGNMQswCQYDVQQGEwJMVDEPMA0GA1UECBMGS2F1bmFzMQ8wDQYDVQQHEwZLYXVuYXMxKjAoBgNVBAoTIUthdW5vIHRlY2hub2xvZ2lqb3MgdW5pdmVyc2l0ZXRhczEVMBMGA1UEAxMMbG9naW4ua3R1Lmx0MRkwFwYJKoZIhvcNAQkBFgpzc29Aa3R1Lmx0MB4XDTE0MDgwNDEzMDY0MFoXDTI0MDgwMzEzMDY0MFowgY0xCzAJBgNVBAYTAkxUMQ8wDQYDVQQIEwZLYXVuYXMxDzANBgNVBAcTBkthdW5hczEqMCgGA1UEChMhS2F1bm8gdGVjaG5vbG9naWpvcyB1bml2ZXJzaXRldGFzMRUwEwYDVQQDEwxsb2dpbi5rdHUubHQxGTAXBgkqhkiG9w0BCQEWCnNzb0BrdHUubHQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCr3YT9UZdS87hoUW2O+nElhco6e1mSJnCVfDXliqaOAv421+khPEqJuKeL1pCeDNHpSlcbVlmdNiwb3SZGUxaXoenTFxaqCZPV09Ggny5f9YBkEzaDOJpB3yGfvbhyrmoRM6zeziATUJiHcns395XuJwd2nwbkNGwY4u4BO7ennVZeQR2r9GOyL+yz3Kly+q8YhIEw0DBXYoPXKhfHBr+otszV9CRXCgnDgVQ7lqqMbxJiK/n7skd1WLRjxxIuTBh3UfTSKmmy3RqwA/NlUYl5Uh42GFE/D0UlKYwzNoBjsV7QXkkmMf8vUiy/x7Tj6PM4zsg716AOafJCPESSuKQJAgMBAAGjgfUwgfIwHQYDVR0OBBYEFMCp68JzkZdFKWHkjPn0XTCo98WhMIHCBgNVHSMEgbowgbeAFMCp68JzkZdFKWHkjPn0XTCo98WhoYGTpIGQMIGNMQswCQYDVQQGEwJMVDEPMA0GA1UECBMGS2F1bmFzMQ8wDQYDVQQHEwZLYXVuYXMxKjAoBgNVBAoTIUthdW5vIHRlY2hub2xvZ2lqb3MgdW5pdmVyc2l0ZXRhczEVMBMGA1UEAxMMbG9naW4ua3R1Lmx0MRkwFwYJKoZIhvcNAQkBFgpzc29Aa3R1Lmx0ggkAtjOdIBO6ez4wDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAdpZ936wIu3ArrlB0/+RL5FreCZnnXhvxSOGWUZzrzq143BXnClnd/i9oZMMz5C4apRk6f7USWQZFeYrzSb8dpSjgJUYXPcCT5REf+u2aMOoPtmwGGg+zkQKY18WZYC3BW4LPwzNocH3YYBhPrxTkKX/d+xjGM9/b0yOCwdJjj0BlwXq5unq0LIK49aSIyuHwA23d+drva9TON936JL4SEqchA2hbnws1elOJNIiykHUJfKqYy/dY9rqRSx+Hf8gsa2TNLU3sl57neVdLF6p6w/3g4mjB111B4U382kXULKO7Y+J1uffkJ71sGBdRWsvH09i0ReJWzbWxAtF2jtzfkw==</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>MIIElTCCA32gAwIBAgIJALYznSATuns+MA0GCSqGSIb3DQEBBQUAMIGNMQswCQYDVQQGEwJMVDEPMA0GA1UECBMGS2F1bmFzMQ8wDQYDVQQHEwZLYXVuYXMxKjAoBgNVBAoTIUthdW5vIHRlY2hub2xvZ2lqb3MgdW5pdmVyc2l0ZXRhczEVMBMGA1UEAxMMbG9naW4ua3R1Lmx0MRkwFwYJKoZIhvcNAQkBFgpzc29Aa3R1Lmx0MB4XDTE0MDgwNDEzMDY0MFoXDTI0MDgwMzEzMDY0MFowgY0xCzAJBgNVBAYTAkxUMQ8wDQYDVQQIEwZLYXVuYXMxDzANBgNVBAcTBkthdW5hczEqMCgGA1UEChMhS2F1bm8gdGVjaG5vbG9naWpvcyB1bml2ZXJzaXRldGFzMRUwEwYDVQQDEwxsb2dpbi5rdHUubHQxGTAXBgkqhkiG9w0BCQEWCnNzb0BrdHUubHQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCr3YT9UZdS87hoUW2O+nElhco6e1mSJnCVfDXliqaOAv421+khPEqJuKeL1pCeDNHpSlcbVlmdNiwb3SZGUxaXoenTFxaqCZPV09Ggny5f9YBkEzaDOJpB3yGfvbhyrmoRM6zeziATUJiHcns395XuJwd2nwbkNGwY4u4BO7ennVZeQR2r9GOyL+yz3Kly+q8YhIEw0DBXYoPXKhfHBr+otszV9CRXCgnDgVQ7lqqMbxJiK/n7skd1WLRjxxIuTBh3UfTSKmmy3RqwA/NlUYl5Uh42GFE/D0UlKYwzNoBjsV7QXkkmMf8vUiy/x7Tj6PM4zsg716AOafJCPESSuKQJAgMBAAGjgfUwgfIwHQYDVR0OBBYEFMCp68JzkZdFKWHkjPn0XTCo98WhMIHCBgNVHSMEgbowgbeAFMCp68JzkZdFKWHkjPn0XTCo98WhoYGTpIGQMIGNMQswCQYDVQQGEwJMVDEPMA0GA1UECBMGS2F1bmFzMQ8wDQYDVQQHEwZLYXVuYXMxKjAoBgNVBAoTIUthdW5vIHRlY2hub2xvZ2lqb3MgdW5pdmVyc2l0ZXRhczEVMBMGA1UEAxMMbG9naW4ua3R1Lmx0MRkwFwYJKoZIhvcNAQkBFgpzc29Aa3R1Lmx0ggkAtjOdIBO6ez4wDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAdpZ936wIu3ArrlB0/+RL5FreCZnnXhvxSOGWUZzrzq143BXnClnd/i9oZMMz5C4apRk6f7USWQZFeYrzSb8dpSjgJUYXPcCT5REf+u2aMOoPtmwGGg+zkQKY18WZYC3BW4LPwzNocH3YYBhPrxTkKX/d+xjGM9/b0yOCwdJjj0BlwXq5unq0LIK49aSIyuHwA23d+drva9TON936JL4SEqchA2hbnws1elOJNIiykHUJfKqYy/dY9rqRSx+Hf8gsa2TNLU3sl57neVdLF6p6w/3g4mjB111B4U382kXULKO7Y+J1uffkJ71sGBdRWsvH09i0ReJWzbWxAtF2jtzfkw==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.ktu.lt/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://login.ktu.lt/simplesaml/saml2/idp/SSOService.php"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Kaunas University of Technology</md:OrganizationName>
-    <md:OrganizationName xml:lang="lt">Kauno technologijos universitetas</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Kaunas University of Technology</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="lt">Kauno technologijos universitetas</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://ktu.edu</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="lt">http://ktu.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>KTU</md:GivenName>
-    <md:SurName>SSO</md:SurName>
-    <md:EmailAddress>sso@ktu.lt</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/login.liu.se-idp-shibboleth.xml b/swamid-interfederations-2.0/login.liu.se-idp-shibboleth.xml
deleted file mode 100644
index 4ce953b8..00000000
--- a/swamid-interfederations-2.0/login.liu.se-idp-shibboleth.xml
+++ /dev/null
@@ -1,129 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://login.liu.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">liu.se</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="sv">Linköpings Universitet</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Linköping University</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Identitsutgivare för anställda och studenter vid Linköpings universitet.</mdui:Description>
-        <mdui:Description xml:lang="en">Identity Provider for employees and students at Linköping University.</mdui:Description>
-        <mdui:InformationURL xml:lang="sv">http://www.liu.se/?l=sv</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">http://www.liu.se/?l=en</mdui:InformationURL>
-        <mdui:Logo height="68" width="350" xml:lang="sv">https://login.liu.se/idp/images/logo-350x68-sv.png</mdui:Logo>
-        <mdui:Logo height="53" width="80" xml:lang="sv">https://login.liu.se/idp/images/logo-80x53-sv.png</mdui:Logo>
-        <mdui:Logo height="50" width="50" xml:lang="sv">https://login.liu.se/idp/images/logo-50x50.png</mdui:Logo>
-        <mdui:Logo height="16" width="16" xml:lang="sv">https://login.liu.se/idp/images/logo-16x16.png</mdui:Logo>
-        <mdui:Logo height="68" width="350" xml:lang="en">https://login.liu.se/idp/images/logo-350x68-en.png</mdui:Logo>
-        <mdui:Logo height="53" width="80" xml:lang="en">https://login.liu.se/idp/images/logo-80x53-en.png</mdui:Logo>
-        <mdui:Logo height="50" width="50" xml:lang="en">https://login.liu.se/idp/images/logo-50x50.png</mdui:Logo>
-        <mdui:Logo height="16" width="16" xml:lang="en">https://login.liu.se/idp/images/logo-16x16.png</mdui:Logo>
-        <mdui:Keywords xml:lang="sv">liu linkopings+universitet linkoping+university</mdui:Keywords>
-        <mdui:Keywords xml:lang="en">liu linkopings+universitet linkoping+university</mdui:Keywords>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DomainHint>liu.se</mdui:DomainHint>
-        <mdui:IPHint>130.236.0.0/16</mdui:IPHint>
-        <mdui:IPHint>2001:6b0:17::/48</mdui:IPHint>
-        <mdui:GeolocationHint>geo:58.397282,15.578624</mdui:GeolocationHint>
-      </mdui:DiscoHints>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDGzCCAgOgAwIBAgIUUGevf/6+3wexHl4UyWmMfjha+8owDQYJKoZIhvcNAQEF
-BQAwFzEVMBMGA1UEAxMMbG9naW4ubGl1LnNlMB4XDTA5MDYyNTA2Mjg1NloXDTI5
-MDYyNTA2Mjg1NlowFzEVMBMGA1UEAxMMbG9naW4ubGl1LnNlMIIBIjANBgkqhkiG
-9w0BAQEFAAOCAQ8AMIIBCgKCAQEAkdGaEeZYE4lLbCTP3I/7SWH2dI4RfbVp0bPH
-X3TSDGUAJMf8lVwignl37pypkj1it/Ea1oOs1QAUUJF2s7eDKbbsQZ6IMEZHUCG9
-2yBt6cAA7HH8XyhyQodkTZd6JhY/HJY1oAiKXar7JSnxnVdg6365Z4rP+W4UHcHM
-ePgj6SqR0eW6qXmEIx9a/cyJ+s/R5cUiTrNDL9c0FH/watGYgesLxCxSSgijW7L1
-Cobl5Y5+Wr8i3sPPNVVtHXsp1aRI4G4YWW2qsoPF94s9f+LguJ+vHMT2URqplOZ3
-g41V7NFMqSw8f7n32BKl7ekAVBfhAwMuiKSENCuJ1vWHsXS7wwIDAQABo18wXTA8
-BgNVHREENTAzggxsb2dpbi5saXUuc2WGI2h0dHBzOi8vbG9naW4ubGl1LnNlL2lk
-cC9zaGliYm9sZXRoMB0GA1UdDgQWBBSouPd/n3U2de/t4ArJMSZcZGlsrjANBgkq
-hkiG9w0BAQUFAAOCAQEAdupL+cmtm9wOczmRze5JGpSkrEnJLWOABVH71QGhRPd3
-bEA93XLjwiO9NPuFyLrb03IUrcgdlgkxnCoq2dla2IQBI6ky+VSuc4lCsdanI+XB
-t2SymRPiqJ60K04Rm4TYOZHsDVHPO3dE3f4mjbhx/irlPmDIM+eB88SbT1nPRQfv
-G2bsafC6oxZjtT5CDJP30lUpieKkmIneVjTmYHBLQmWvl0G5o5j5OLtVj1xhfz9r
-zB2373DVTdsTnFIbFLDF8bGXt1jhxNOT5cxviUYKI+L1VLwKRjWlFd2tUMMKKz/I
-dE1S/LL5o/3BCZXOh9Fuvm6ND4e+jSkCizMQNgm4iw==
-
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.liu.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.liu.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://login.liu.se/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.liu.se/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://login.liu.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.liu.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">liu.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDGzCCAgOgAwIBAgIUUGevf/6+3wexHl4UyWmMfjha+8owDQYJKoZIhvcNAQEF
-BQAwFzEVMBMGA1UEAxMMbG9naW4ubGl1LnNlMB4XDTA5MDYyNTA2Mjg1NloXDTI5
-MDYyNTA2Mjg1NlowFzEVMBMGA1UEAxMMbG9naW4ubGl1LnNlMIIBIjANBgkqhkiG
-9w0BAQEFAAOCAQ8AMIIBCgKCAQEAkdGaEeZYE4lLbCTP3I/7SWH2dI4RfbVp0bPH
-X3TSDGUAJMf8lVwignl37pypkj1it/Ea1oOs1QAUUJF2s7eDKbbsQZ6IMEZHUCG9
-2yBt6cAA7HH8XyhyQodkTZd6JhY/HJY1oAiKXar7JSnxnVdg6365Z4rP+W4UHcHM
-ePgj6SqR0eW6qXmEIx9a/cyJ+s/R5cUiTrNDL9c0FH/watGYgesLxCxSSgijW7L1
-Cobl5Y5+Wr8i3sPPNVVtHXsp1aRI4G4YWW2qsoPF94s9f+LguJ+vHMT2URqplOZ3
-g41V7NFMqSw8f7n32BKl7ekAVBfhAwMuiKSENCuJ1vWHsXS7wwIDAQABo18wXTA8
-BgNVHREENTAzggxsb2dpbi5saXUuc2WGI2h0dHBzOi8vbG9naW4ubGl1LnNlL2lk
-cC9zaGliYm9sZXRoMB0GA1UdDgQWBBSouPd/n3U2de/t4ArJMSZcZGlsrjANBgkq
-hkiG9w0BAQUFAAOCAQEAdupL+cmtm9wOczmRze5JGpSkrEnJLWOABVH71QGhRPd3
-bEA93XLjwiO9NPuFyLrb03IUrcgdlgkxnCoq2dla2IQBI6ky+VSuc4lCsdanI+XB
-t2SymRPiqJ60K04Rm4TYOZHsDVHPO3dE3f4mjbhx/irlPmDIM+eB88SbT1nPRQfv
-G2bsafC6oxZjtT5CDJP30lUpieKkmIneVjTmYHBLQmWvl0G5o5j5OLtVj1xhfz9r
-zB2373DVTdsTnFIbFLDF8bGXt1jhxNOT5cxviUYKI+L1VLwKRjWlFd2tUMMKKz/I
-dE1S/LL5o/3BCZXOh9Fuvm6ND4e+jSkCizMQNgm4iw==
-
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.liu.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.liu.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="sv">LiU</OrganizationName>
-    <OrganizationName xml:lang="en">LiU</OrganizationName>
-    <OrganizationDisplayName xml:lang="sv">Linköpings Universitet</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">Linköping University</OrganizationDisplayName>
-    <OrganizationURL xml:lang="sv">http://www.liu.se?l=sv</OrganizationURL>
-    <OrganizationURL xml:lang="en">http://www.liu.se?l=en</OrganizationURL>
-  </Organization>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
-    <Company>Linköping University</Company>
-    <SurName>LiU-IT SAML admins</SurName>
-    <EmailAddress>saml-admins@it.liu.se</EmailAddress>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
-    <Company>Linköping University</Company>
-    <SurName>LiU-IT SAML admins</SurName>
-    <EmailAddress>saml-admins@it.liu.se</EmailAddress>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
-    <Company>Linköping University</Company>
-    <SurName>LiU-IT Helpdesk</SurName>
-    <EmailAddress>helpdesk@liu.se</EmailAddress>
-  </ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/login.liu.se.xml b/swamid-interfederations-2.0/login.liu.se.xml
deleted file mode 100644
index 4ce953b8..00000000
--- a/swamid-interfederations-2.0/login.liu.se.xml
+++ /dev/null
@@ -1,129 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://login.liu.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">liu.se</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="sv">Linköpings Universitet</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Linköping University</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Identitsutgivare för anställda och studenter vid Linköpings universitet.</mdui:Description>
-        <mdui:Description xml:lang="en">Identity Provider for employees and students at Linköping University.</mdui:Description>
-        <mdui:InformationURL xml:lang="sv">http://www.liu.se/?l=sv</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">http://www.liu.se/?l=en</mdui:InformationURL>
-        <mdui:Logo height="68" width="350" xml:lang="sv">https://login.liu.se/idp/images/logo-350x68-sv.png</mdui:Logo>
-        <mdui:Logo height="53" width="80" xml:lang="sv">https://login.liu.se/idp/images/logo-80x53-sv.png</mdui:Logo>
-        <mdui:Logo height="50" width="50" xml:lang="sv">https://login.liu.se/idp/images/logo-50x50.png</mdui:Logo>
-        <mdui:Logo height="16" width="16" xml:lang="sv">https://login.liu.se/idp/images/logo-16x16.png</mdui:Logo>
-        <mdui:Logo height="68" width="350" xml:lang="en">https://login.liu.se/idp/images/logo-350x68-en.png</mdui:Logo>
-        <mdui:Logo height="53" width="80" xml:lang="en">https://login.liu.se/idp/images/logo-80x53-en.png</mdui:Logo>
-        <mdui:Logo height="50" width="50" xml:lang="en">https://login.liu.se/idp/images/logo-50x50.png</mdui:Logo>
-        <mdui:Logo height="16" width="16" xml:lang="en">https://login.liu.se/idp/images/logo-16x16.png</mdui:Logo>
-        <mdui:Keywords xml:lang="sv">liu linkopings+universitet linkoping+university</mdui:Keywords>
-        <mdui:Keywords xml:lang="en">liu linkopings+universitet linkoping+university</mdui:Keywords>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DomainHint>liu.se</mdui:DomainHint>
-        <mdui:IPHint>130.236.0.0/16</mdui:IPHint>
-        <mdui:IPHint>2001:6b0:17::/48</mdui:IPHint>
-        <mdui:GeolocationHint>geo:58.397282,15.578624</mdui:GeolocationHint>
-      </mdui:DiscoHints>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDGzCCAgOgAwIBAgIUUGevf/6+3wexHl4UyWmMfjha+8owDQYJKoZIhvcNAQEF
-BQAwFzEVMBMGA1UEAxMMbG9naW4ubGl1LnNlMB4XDTA5MDYyNTA2Mjg1NloXDTI5
-MDYyNTA2Mjg1NlowFzEVMBMGA1UEAxMMbG9naW4ubGl1LnNlMIIBIjANBgkqhkiG
-9w0BAQEFAAOCAQ8AMIIBCgKCAQEAkdGaEeZYE4lLbCTP3I/7SWH2dI4RfbVp0bPH
-X3TSDGUAJMf8lVwignl37pypkj1it/Ea1oOs1QAUUJF2s7eDKbbsQZ6IMEZHUCG9
-2yBt6cAA7HH8XyhyQodkTZd6JhY/HJY1oAiKXar7JSnxnVdg6365Z4rP+W4UHcHM
-ePgj6SqR0eW6qXmEIx9a/cyJ+s/R5cUiTrNDL9c0FH/watGYgesLxCxSSgijW7L1
-Cobl5Y5+Wr8i3sPPNVVtHXsp1aRI4G4YWW2qsoPF94s9f+LguJ+vHMT2URqplOZ3
-g41V7NFMqSw8f7n32BKl7ekAVBfhAwMuiKSENCuJ1vWHsXS7wwIDAQABo18wXTA8
-BgNVHREENTAzggxsb2dpbi5saXUuc2WGI2h0dHBzOi8vbG9naW4ubGl1LnNlL2lk
-cC9zaGliYm9sZXRoMB0GA1UdDgQWBBSouPd/n3U2de/t4ArJMSZcZGlsrjANBgkq
-hkiG9w0BAQUFAAOCAQEAdupL+cmtm9wOczmRze5JGpSkrEnJLWOABVH71QGhRPd3
-bEA93XLjwiO9NPuFyLrb03IUrcgdlgkxnCoq2dla2IQBI6ky+VSuc4lCsdanI+XB
-t2SymRPiqJ60K04Rm4TYOZHsDVHPO3dE3f4mjbhx/irlPmDIM+eB88SbT1nPRQfv
-G2bsafC6oxZjtT5CDJP30lUpieKkmIneVjTmYHBLQmWvl0G5o5j5OLtVj1xhfz9r
-zB2373DVTdsTnFIbFLDF8bGXt1jhxNOT5cxviUYKI+L1VLwKRjWlFd2tUMMKKz/I
-dE1S/LL5o/3BCZXOh9Fuvm6ND4e+jSkCizMQNgm4iw==
-
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.liu.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.liu.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://login.liu.se/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.liu.se/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://login.liu.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.liu.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">liu.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDGzCCAgOgAwIBAgIUUGevf/6+3wexHl4UyWmMfjha+8owDQYJKoZIhvcNAQEF
-BQAwFzEVMBMGA1UEAxMMbG9naW4ubGl1LnNlMB4XDTA5MDYyNTA2Mjg1NloXDTI5
-MDYyNTA2Mjg1NlowFzEVMBMGA1UEAxMMbG9naW4ubGl1LnNlMIIBIjANBgkqhkiG
-9w0BAQEFAAOCAQ8AMIIBCgKCAQEAkdGaEeZYE4lLbCTP3I/7SWH2dI4RfbVp0bPH
-X3TSDGUAJMf8lVwignl37pypkj1it/Ea1oOs1QAUUJF2s7eDKbbsQZ6IMEZHUCG9
-2yBt6cAA7HH8XyhyQodkTZd6JhY/HJY1oAiKXar7JSnxnVdg6365Z4rP+W4UHcHM
-ePgj6SqR0eW6qXmEIx9a/cyJ+s/R5cUiTrNDL9c0FH/watGYgesLxCxSSgijW7L1
-Cobl5Y5+Wr8i3sPPNVVtHXsp1aRI4G4YWW2qsoPF94s9f+LguJ+vHMT2URqplOZ3
-g41V7NFMqSw8f7n32BKl7ekAVBfhAwMuiKSENCuJ1vWHsXS7wwIDAQABo18wXTA8
-BgNVHREENTAzggxsb2dpbi5saXUuc2WGI2h0dHBzOi8vbG9naW4ubGl1LnNlL2lk
-cC9zaGliYm9sZXRoMB0GA1UdDgQWBBSouPd/n3U2de/t4ArJMSZcZGlsrjANBgkq
-hkiG9w0BAQUFAAOCAQEAdupL+cmtm9wOczmRze5JGpSkrEnJLWOABVH71QGhRPd3
-bEA93XLjwiO9NPuFyLrb03IUrcgdlgkxnCoq2dla2IQBI6ky+VSuc4lCsdanI+XB
-t2SymRPiqJ60K04Rm4TYOZHsDVHPO3dE3f4mjbhx/irlPmDIM+eB88SbT1nPRQfv
-G2bsafC6oxZjtT5CDJP30lUpieKkmIneVjTmYHBLQmWvl0G5o5j5OLtVj1xhfz9r
-zB2373DVTdsTnFIbFLDF8bGXt1jhxNOT5cxviUYKI+L1VLwKRjWlFd2tUMMKKz/I
-dE1S/LL5o/3BCZXOh9Fuvm6ND4e+jSkCizMQNgm4iw==
-
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.liu.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.liu.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="sv">LiU</OrganizationName>
-    <OrganizationName xml:lang="en">LiU</OrganizationName>
-    <OrganizationDisplayName xml:lang="sv">Linköpings Universitet</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">Linköping University</OrganizationDisplayName>
-    <OrganizationURL xml:lang="sv">http://www.liu.se?l=sv</OrganizationURL>
-    <OrganizationURL xml:lang="en">http://www.liu.se?l=en</OrganizationURL>
-  </Organization>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
-    <Company>Linköping University</Company>
-    <SurName>LiU-IT SAML admins</SurName>
-    <EmailAddress>saml-admins@it.liu.se</EmailAddress>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
-    <Company>Linköping University</Company>
-    <SurName>LiU-IT SAML admins</SurName>
-    <EmailAddress>saml-admins@it.liu.se</EmailAddress>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
-    <Company>Linköping University</Company>
-    <SurName>LiU-IT Helpdesk</SurName>
-    <EmailAddress>helpdesk@liu.se</EmailAddress>
-  </ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/login.ntua.gr-idp-shibboleth.xml b/swamid-interfederations-2.0/login.ntua.gr-idp-shibboleth.xml
deleted file mode 100644
index e55f4396..00000000
--- a/swamid-interfederations-2.0/login.ntua.gr-idp-shibboleth.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://login.ntua.gr/idp/shibboleth">
-  <Extensions xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi">
-    <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 xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ntua.gr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">National Technical University of Athens</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="el">Εθνικό Μετσόβιο Πολυτεχνείο</mdui:DisplayName>
-        <mdui:InformationURL xml:lang="en">https://login.ntua.gr/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="el">https://login.ntua.gr/</mdui:InformationURL>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DomainHint>ntua.gr</mdui:DomainHint>
-        <mdui:IPHint>147.102.0.0/16</mdui:IPHint>
-        <mdui:IPHint>2001:648:2000::/48</mdui:IPHint>
-      </mdui:DiscoHints>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-                            MIIEmzCCA4OgAwIBAgIBTDANBgkqhkiG9w0BAQUFADA4MQswCQYDVQQGEwJHUjEN
-                            MAsGA1UEChMETlRVQTEaMBgGA1UEAxMRTlRVQSBDQSAyMDA2LTIwMTgwHhcNMDcw
-                            MzIzMTE0NjAyWhcNMTcwMzIwMTE0NjAyWjBTMQswCQYDVQQGEwJncjENMAsGA1UE
-                            ChMEbnR1YTEQMA4GA1UECxMHc2VydmVyczEWMBQGA1UEAxMNbG9naW4ubnR1YS5n
-                            cjELMAkGA1UEBRMCNzYwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBALZ9Qnww
-                            BRe5Kc0EYuVdbkMASUIBc624cYA8QCv9e0S769ePElXSndg7caaSRXG8pN4gkc9+
-                            LUhvqefUt3ihIDsOIcdDW1tGOJ5b9UH9zjRpUCjubKOcYSxaxFjs+15RGhMweSwm
-                            DwYcFLpmDvFC7vbh+X8rt5ri4S3YSpT9eZdVAgMBAAGjggIXMIICEzAJBgNVHRME
-                            AjAAMEwGA1UdIARFMEMwDQYLKwYBBAGHSQMCAQEwMgYLKwYBBAGHSQMBAQEwIzAh
-                            BggrBgEFBQcCARYVaHR0cDovL2NhLm50dWEuZ3IvY3BzMBEGCWCGSAGG+EIBAQQE
-                            AwIGQDALBgNVHQ8EBAMCBPAwEwYDVR0lBAwwCgYIKwYBBQUHAwEwIQYJYIZIAYb4
-                            QgENBBQWEldXVy1TZXJ2ZXIgb2YgTlRVQTAdBgNVHQ4EFgQUiEqRWLpVT7bpJ6K4
-                            9EfC0UPUGpkwWwYDVR0jBFQwUoAUfNqsx+A0dIrLwYwYsWoolK95CJWhN6Q1MDMx
-                            CzAJBgNVBAYTAkdSMQ0wCwYDVQQKEwROVFVBMRUwEwYDVQQDEwxOVFVBIFJPT1Qg
-                            Q0GCAQIwLwYDVR0RBCgwJoEPbm9jQG5vYy5udHVhLmdyhwSTZt7dgg1sb2dpbi5u
-                            dHVhLmdyMBUGA1UdEgQOMAyBCmNhQG50dWEuZ3IwMgYJYIZIAYb4QgEEBCUWI2h0
-                            dHA6Ly9jYS5udHVhLmdyL3B1Yi9jcmwvY2FjcmwuY3JsMDIGCWCGSAGG+EIBAwQl
-                            FiNodHRwOi8vY2EubnR1YS5nci9wdWIvY3JsL2NhY3JsLmNybDA0BgNVHR8ELTAr
-                            MCmgJ6AlhiNodHRwOi8vY2EubnR1YS5nci9wdWIvY3JsL2NhY3JsLmNybDANBgkq
-                            hkiG9w0BAQUFAAOCAQEAXHXewa99f7iIlhvgdMWp6NXfT9TG9FCGWhtO2V5GeUii
-                            2TBYddAH6+tYrVlJ4cN6p444Dhvin8eVA/Y0WfeVll4YasViq6zxSH9FLZkszbKr
-                            f7CfFyYqChsjcrn/oGJWsfsqGqMGPfdAQSkkpyGOHVMMARCY+gP0S973yK89frkA
-                            QGG+elGtKx786IeEEbm4YS4Z0VMkD3obJk/QRmiy6lvHadODGcpiGLCZq9G1Es2i
-                            mcNedy126VjwlNcg6XBbl0shvgGkjqzA89TPFY/FwtklJGfNl8SP88p8I41CsM8Q
-                            /PFGb40C/OoiQncMfOelJJXz6O+w4jNGdUoJdTCpdQ==
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-                            MIIDFDCCAfygAwIBAgIJAOE9jL5hLZ+yMA0GCSqGSIb3DQEBBQUAMBgxFjAUBgNV
-                            BAMTDWxvZ2luLm50dWEuZ3IwHhcNMTMxMjExMTMyNzM3WhcNMjMxMjA5MTMyNzM3
-                            WjAYMRYwFAYDVQQDEw1sb2dpbi5udHVhLmdyMIIBIjANBgkqhkiG9w0BAQEFAAOC
-                            AQ8AMIIBCgKCAQEA9PPd/C1Smrn+DH1bYdJ24qqvA7aDt7izs/c9bmsF1/zOumIj
-                            3Tmi9V/zmeNt2yiV/Nva2ZU3M/cTUxZST7XYWz+758EyqmvKVvHgyOmmF8JdV+9r
-                            hFT3R3DEdDnGnep4N7QZySOQ/mOp3IsY2Wxqka3NU672keZq/VhV/B1MPDqhqPGt
-                            TPeW/NJGjo2UrMKkeyJLCHQJeNbKOOSzefc5TJYFJHLXqGs7DWIXwqqab0MPJ3Na
-                            N7Ap0SEIZWpNS7u/lAAS//1HJQ26zW15GcUhxgi2pMk3GHs6uwWF+DYLEbWg17MQ
-                            Er9MFbftJjf9V4GOfUILDvgNlutCPnmM6aB4gQIDAQABo2EwXzA+BgNVHREENzA1
-                            gg1sb2dpbi5udHVhLmdyhiRodHRwczovL2xvZ2luLm50dWEuZ3IvaWRwL3NoaWJi
-                            b2xldGgwHQYDVR0OBBYEFNP8/C26TomQ3yAZFMY2W84V40ihMA0GCSqGSIb3DQEB
-                            BQUAA4IBAQAv4cC1fu39MNQlvoSY/k/kV7cbkmS30FfVlsuwdfZQJO/3r2a/E7kd
-                            l9QR9Us+Eraabx6ccq6BYbtsMaXkDrgKPL6KfXFWNIjbizqmmvgdlB2ptYYKN7d0
-                            Bz2L7y0ZWkKApEBDVMUwmBHsS18xs35xchKyezTAralRy3tHBAop93jBumHiRRYF
-                            RuRSEM4KM01/DkDDwkCXWEWu0TolnSozTFtYddwi1u48s0tq4TSBkYk3C7XoyCol
-                            PCUfUb8+3VLdMNqkSkE22WQx9th9BNNWs3e4QdrRgnh/9gKInZCzmrXU8ymWBhmj
-                            1f80WSd+TnQAp2UMPIXxxOOSGhI5NyQn
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.ntua.gr:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.ntua.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://login.ntua.gr/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.ntua.gr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://login.ntua.gr/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.ntua.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="false">ntua.gr</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-                            MIIEmzCCA4OgAwIBAgIBTDANBgkqhkiG9w0BAQUFADA4MQswCQYDVQQGEwJHUjEN
-                            MAsGA1UEChMETlRVQTEaMBgGA1UEAxMRTlRVQSBDQSAyMDA2LTIwMTgwHhcNMDcw
-                            MzIzMTE0NjAyWhcNMTcwMzIwMTE0NjAyWjBTMQswCQYDVQQGEwJncjENMAsGA1UE
-                            ChMEbnR1YTEQMA4GA1UECxMHc2VydmVyczEWMBQGA1UEAxMNbG9naW4ubnR1YS5n
-                            cjELMAkGA1UEBRMCNzYwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBALZ9Qnww
-                            BRe5Kc0EYuVdbkMASUIBc624cYA8QCv9e0S769ePElXSndg7caaSRXG8pN4gkc9+
-                            LUhvqefUt3ihIDsOIcdDW1tGOJ5b9UH9zjRpUCjubKOcYSxaxFjs+15RGhMweSwm
-                            DwYcFLpmDvFC7vbh+X8rt5ri4S3YSpT9eZdVAgMBAAGjggIXMIICEzAJBgNVHRME
-                            AjAAMEwGA1UdIARFMEMwDQYLKwYBBAGHSQMCAQEwMgYLKwYBBAGHSQMBAQEwIzAh
-                            BggrBgEFBQcCARYVaHR0cDovL2NhLm50dWEuZ3IvY3BzMBEGCWCGSAGG+EIBAQQE
-                            AwIGQDALBgNVHQ8EBAMCBPAwEwYDVR0lBAwwCgYIKwYBBQUHAwEwIQYJYIZIAYb4
-                            QgENBBQWEldXVy1TZXJ2ZXIgb2YgTlRVQTAdBgNVHQ4EFgQUiEqRWLpVT7bpJ6K4
-                            9EfC0UPUGpkwWwYDVR0jBFQwUoAUfNqsx+A0dIrLwYwYsWoolK95CJWhN6Q1MDMx
-                            CzAJBgNVBAYTAkdSMQ0wCwYDVQQKEwROVFVBMRUwEwYDVQQDEwxOVFVBIFJPT1Qg
-                            Q0GCAQIwLwYDVR0RBCgwJoEPbm9jQG5vYy5udHVhLmdyhwSTZt7dgg1sb2dpbi5u
-                            dHVhLmdyMBUGA1UdEgQOMAyBCmNhQG50dWEuZ3IwMgYJYIZIAYb4QgEEBCUWI2h0
-                            dHA6Ly9jYS5udHVhLmdyL3B1Yi9jcmwvY2FjcmwuY3JsMDIGCWCGSAGG+EIBAwQl
-                            FiNodHRwOi8vY2EubnR1YS5nci9wdWIvY3JsL2NhY3JsLmNybDA0BgNVHR8ELTAr
-                            MCmgJ6AlhiNodHRwOi8vY2EubnR1YS5nci9wdWIvY3JsL2NhY3JsLmNybDANBgkq
-                            hkiG9w0BAQUFAAOCAQEAXHXewa99f7iIlhvgdMWp6NXfT9TG9FCGWhtO2V5GeUii
-                            2TBYddAH6+tYrVlJ4cN6p444Dhvin8eVA/Y0WfeVll4YasViq6zxSH9FLZkszbKr
-                            f7CfFyYqChsjcrn/oGJWsfsqGqMGPfdAQSkkpyGOHVMMARCY+gP0S973yK89frkA
-                            QGG+elGtKx786IeEEbm4YS4Z0VMkD3obJk/QRmiy6lvHadODGcpiGLCZq9G1Es2i
-                            mcNedy126VjwlNcg6XBbl0shvgGkjqzA89TPFY/FwtklJGfNl8SP88p8I41CsM8Q
-                            /PFGb40C/OoiQncMfOelJJXz6O+w4jNGdUoJdTCpdQ==
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-                            MIIDFDCCAfygAwIBAgIJAOE9jL5hLZ+yMA0GCSqGSIb3DQEBBQUAMBgxFjAUBgNV
-                            BAMTDWxvZ2luLm50dWEuZ3IwHhcNMTMxMjExMTMyNzM3WhcNMjMxMjA5MTMyNzM3
-                            WjAYMRYwFAYDVQQDEw1sb2dpbi5udHVhLmdyMIIBIjANBgkqhkiG9w0BAQEFAAOC
-                            AQ8AMIIBCgKCAQEA9PPd/C1Smrn+DH1bYdJ24qqvA7aDt7izs/c9bmsF1/zOumIj
-                            3Tmi9V/zmeNt2yiV/Nva2ZU3M/cTUxZST7XYWz+758EyqmvKVvHgyOmmF8JdV+9r
-                            hFT3R3DEdDnGnep4N7QZySOQ/mOp3IsY2Wxqka3NU672keZq/VhV/B1MPDqhqPGt
-                            TPeW/NJGjo2UrMKkeyJLCHQJeNbKOOSzefc5TJYFJHLXqGs7DWIXwqqab0MPJ3Na
-                            N7Ap0SEIZWpNS7u/lAAS//1HJQ26zW15GcUhxgi2pMk3GHs6uwWF+DYLEbWg17MQ
-                            Er9MFbftJjf9V4GOfUILDvgNlutCPnmM6aB4gQIDAQABo2EwXzA+BgNVHREENzA1
-                            gg1sb2dpbi5udHVhLmdyhiRodHRwczovL2xvZ2luLm50dWEuZ3IvaWRwL3NoaWJi
-                            b2xldGgwHQYDVR0OBBYEFNP8/C26TomQ3yAZFMY2W84V40ihMA0GCSqGSIb3DQEB
-                            BQUAA4IBAQAv4cC1fu39MNQlvoSY/k/kV7cbkmS30FfVlsuwdfZQJO/3r2a/E7kd
-                            l9QR9Us+Eraabx6ccq6BYbtsMaXkDrgKPL6KfXFWNIjbizqmmvgdlB2ptYYKN7d0
-                            Bz2L7y0ZWkKApEBDVMUwmBHsS18xs35xchKyezTAralRy3tHBAop93jBumHiRRYF
-                            RuRSEM4KM01/DkDDwkCXWEWu0TolnSozTFtYddwi1u48s0tq4TSBkYk3C7XoyCol
-                            PCUfUb8+3VLdMNqkSkE22WQx9th9BNNWs3e4QdrRgnh/9gKInZCzmrXU8ymWBhmj
-                            1f80WSd+TnQAp2UMPIXxxOOSGhI5NyQn
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.ntua.gr:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.ntua.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">National Technical University of Athens</OrganizationName>
-    <OrganizationName xml:lang="el">Εθνικό Μετσόβιο Πολυτεχνείο</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">National Technical University of Athens</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="el">Εθνικό Μετσόβιο Πολυτεχνείο</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.ntua.gr/</OrganizationURL>
-    <OrganizationURL xml:lang="el">http://www.ntua.gr/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <Company>National Technical University of Athens - Network Management Center</Company>
-    <EmailAddress>noc@noc.ntua.gr</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="support">
-    <Company>National Technical University of Athens - Network Management Center</Company>
-    <EmailAddress>help-data@noc.ntua.gr</EmailAddress>
-    <TelephoneNumber>+30-210-772-1861</TelephoneNumber>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/login.ntua.gr.xml b/swamid-interfederations-2.0/login.ntua.gr.xml
deleted file mode 100644
index e55f4396..00000000
--- a/swamid-interfederations-2.0/login.ntua.gr.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://login.ntua.gr/idp/shibboleth">
-  <Extensions xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi">
-    <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 xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ntua.gr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">National Technical University of Athens</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="el">Εθνικό Μετσόβιο Πολυτεχνείο</mdui:DisplayName>
-        <mdui:InformationURL xml:lang="en">https://login.ntua.gr/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="el">https://login.ntua.gr/</mdui:InformationURL>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DomainHint>ntua.gr</mdui:DomainHint>
-        <mdui:IPHint>147.102.0.0/16</mdui:IPHint>
-        <mdui:IPHint>2001:648:2000::/48</mdui:IPHint>
-      </mdui:DiscoHints>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-                            MIIEmzCCA4OgAwIBAgIBTDANBgkqhkiG9w0BAQUFADA4MQswCQYDVQQGEwJHUjEN
-                            MAsGA1UEChMETlRVQTEaMBgGA1UEAxMRTlRVQSBDQSAyMDA2LTIwMTgwHhcNMDcw
-                            MzIzMTE0NjAyWhcNMTcwMzIwMTE0NjAyWjBTMQswCQYDVQQGEwJncjENMAsGA1UE
-                            ChMEbnR1YTEQMA4GA1UECxMHc2VydmVyczEWMBQGA1UEAxMNbG9naW4ubnR1YS5n
-                            cjELMAkGA1UEBRMCNzYwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBALZ9Qnww
-                            BRe5Kc0EYuVdbkMASUIBc624cYA8QCv9e0S769ePElXSndg7caaSRXG8pN4gkc9+
-                            LUhvqefUt3ihIDsOIcdDW1tGOJ5b9UH9zjRpUCjubKOcYSxaxFjs+15RGhMweSwm
-                            DwYcFLpmDvFC7vbh+X8rt5ri4S3YSpT9eZdVAgMBAAGjggIXMIICEzAJBgNVHRME
-                            AjAAMEwGA1UdIARFMEMwDQYLKwYBBAGHSQMCAQEwMgYLKwYBBAGHSQMBAQEwIzAh
-                            BggrBgEFBQcCARYVaHR0cDovL2NhLm50dWEuZ3IvY3BzMBEGCWCGSAGG+EIBAQQE
-                            AwIGQDALBgNVHQ8EBAMCBPAwEwYDVR0lBAwwCgYIKwYBBQUHAwEwIQYJYIZIAYb4
-                            QgENBBQWEldXVy1TZXJ2ZXIgb2YgTlRVQTAdBgNVHQ4EFgQUiEqRWLpVT7bpJ6K4
-                            9EfC0UPUGpkwWwYDVR0jBFQwUoAUfNqsx+A0dIrLwYwYsWoolK95CJWhN6Q1MDMx
-                            CzAJBgNVBAYTAkdSMQ0wCwYDVQQKEwROVFVBMRUwEwYDVQQDEwxOVFVBIFJPT1Qg
-                            Q0GCAQIwLwYDVR0RBCgwJoEPbm9jQG5vYy5udHVhLmdyhwSTZt7dgg1sb2dpbi5u
-                            dHVhLmdyMBUGA1UdEgQOMAyBCmNhQG50dWEuZ3IwMgYJYIZIAYb4QgEEBCUWI2h0
-                            dHA6Ly9jYS5udHVhLmdyL3B1Yi9jcmwvY2FjcmwuY3JsMDIGCWCGSAGG+EIBAwQl
-                            FiNodHRwOi8vY2EubnR1YS5nci9wdWIvY3JsL2NhY3JsLmNybDA0BgNVHR8ELTAr
-                            MCmgJ6AlhiNodHRwOi8vY2EubnR1YS5nci9wdWIvY3JsL2NhY3JsLmNybDANBgkq
-                            hkiG9w0BAQUFAAOCAQEAXHXewa99f7iIlhvgdMWp6NXfT9TG9FCGWhtO2V5GeUii
-                            2TBYddAH6+tYrVlJ4cN6p444Dhvin8eVA/Y0WfeVll4YasViq6zxSH9FLZkszbKr
-                            f7CfFyYqChsjcrn/oGJWsfsqGqMGPfdAQSkkpyGOHVMMARCY+gP0S973yK89frkA
-                            QGG+elGtKx786IeEEbm4YS4Z0VMkD3obJk/QRmiy6lvHadODGcpiGLCZq9G1Es2i
-                            mcNedy126VjwlNcg6XBbl0shvgGkjqzA89TPFY/FwtklJGfNl8SP88p8I41CsM8Q
-                            /PFGb40C/OoiQncMfOelJJXz6O+w4jNGdUoJdTCpdQ==
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-                            MIIDFDCCAfygAwIBAgIJAOE9jL5hLZ+yMA0GCSqGSIb3DQEBBQUAMBgxFjAUBgNV
-                            BAMTDWxvZ2luLm50dWEuZ3IwHhcNMTMxMjExMTMyNzM3WhcNMjMxMjA5MTMyNzM3
-                            WjAYMRYwFAYDVQQDEw1sb2dpbi5udHVhLmdyMIIBIjANBgkqhkiG9w0BAQEFAAOC
-                            AQ8AMIIBCgKCAQEA9PPd/C1Smrn+DH1bYdJ24qqvA7aDt7izs/c9bmsF1/zOumIj
-                            3Tmi9V/zmeNt2yiV/Nva2ZU3M/cTUxZST7XYWz+758EyqmvKVvHgyOmmF8JdV+9r
-                            hFT3R3DEdDnGnep4N7QZySOQ/mOp3IsY2Wxqka3NU672keZq/VhV/B1MPDqhqPGt
-                            TPeW/NJGjo2UrMKkeyJLCHQJeNbKOOSzefc5TJYFJHLXqGs7DWIXwqqab0MPJ3Na
-                            N7Ap0SEIZWpNS7u/lAAS//1HJQ26zW15GcUhxgi2pMk3GHs6uwWF+DYLEbWg17MQ
-                            Er9MFbftJjf9V4GOfUILDvgNlutCPnmM6aB4gQIDAQABo2EwXzA+BgNVHREENzA1
-                            gg1sb2dpbi5udHVhLmdyhiRodHRwczovL2xvZ2luLm50dWEuZ3IvaWRwL3NoaWJi
-                            b2xldGgwHQYDVR0OBBYEFNP8/C26TomQ3yAZFMY2W84V40ihMA0GCSqGSIb3DQEB
-                            BQUAA4IBAQAv4cC1fu39MNQlvoSY/k/kV7cbkmS30FfVlsuwdfZQJO/3r2a/E7kd
-                            l9QR9Us+Eraabx6ccq6BYbtsMaXkDrgKPL6KfXFWNIjbizqmmvgdlB2ptYYKN7d0
-                            Bz2L7y0ZWkKApEBDVMUwmBHsS18xs35xchKyezTAralRy3tHBAop93jBumHiRRYF
-                            RuRSEM4KM01/DkDDwkCXWEWu0TolnSozTFtYddwi1u48s0tq4TSBkYk3C7XoyCol
-                            PCUfUb8+3VLdMNqkSkE22WQx9th9BNNWs3e4QdrRgnh/9gKInZCzmrXU8ymWBhmj
-                            1f80WSd+TnQAp2UMPIXxxOOSGhI5NyQn
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.ntua.gr:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.ntua.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://login.ntua.gr/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.ntua.gr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://login.ntua.gr/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.ntua.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="false">ntua.gr</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-                            MIIEmzCCA4OgAwIBAgIBTDANBgkqhkiG9w0BAQUFADA4MQswCQYDVQQGEwJHUjEN
-                            MAsGA1UEChMETlRVQTEaMBgGA1UEAxMRTlRVQSBDQSAyMDA2LTIwMTgwHhcNMDcw
-                            MzIzMTE0NjAyWhcNMTcwMzIwMTE0NjAyWjBTMQswCQYDVQQGEwJncjENMAsGA1UE
-                            ChMEbnR1YTEQMA4GA1UECxMHc2VydmVyczEWMBQGA1UEAxMNbG9naW4ubnR1YS5n
-                            cjELMAkGA1UEBRMCNzYwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBALZ9Qnww
-                            BRe5Kc0EYuVdbkMASUIBc624cYA8QCv9e0S769ePElXSndg7caaSRXG8pN4gkc9+
-                            LUhvqefUt3ihIDsOIcdDW1tGOJ5b9UH9zjRpUCjubKOcYSxaxFjs+15RGhMweSwm
-                            DwYcFLpmDvFC7vbh+X8rt5ri4S3YSpT9eZdVAgMBAAGjggIXMIICEzAJBgNVHRME
-                            AjAAMEwGA1UdIARFMEMwDQYLKwYBBAGHSQMCAQEwMgYLKwYBBAGHSQMBAQEwIzAh
-                            BggrBgEFBQcCARYVaHR0cDovL2NhLm50dWEuZ3IvY3BzMBEGCWCGSAGG+EIBAQQE
-                            AwIGQDALBgNVHQ8EBAMCBPAwEwYDVR0lBAwwCgYIKwYBBQUHAwEwIQYJYIZIAYb4
-                            QgENBBQWEldXVy1TZXJ2ZXIgb2YgTlRVQTAdBgNVHQ4EFgQUiEqRWLpVT7bpJ6K4
-                            9EfC0UPUGpkwWwYDVR0jBFQwUoAUfNqsx+A0dIrLwYwYsWoolK95CJWhN6Q1MDMx
-                            CzAJBgNVBAYTAkdSMQ0wCwYDVQQKEwROVFVBMRUwEwYDVQQDEwxOVFVBIFJPT1Qg
-                            Q0GCAQIwLwYDVR0RBCgwJoEPbm9jQG5vYy5udHVhLmdyhwSTZt7dgg1sb2dpbi5u
-                            dHVhLmdyMBUGA1UdEgQOMAyBCmNhQG50dWEuZ3IwMgYJYIZIAYb4QgEEBCUWI2h0
-                            dHA6Ly9jYS5udHVhLmdyL3B1Yi9jcmwvY2FjcmwuY3JsMDIGCWCGSAGG+EIBAwQl
-                            FiNodHRwOi8vY2EubnR1YS5nci9wdWIvY3JsL2NhY3JsLmNybDA0BgNVHR8ELTAr
-                            MCmgJ6AlhiNodHRwOi8vY2EubnR1YS5nci9wdWIvY3JsL2NhY3JsLmNybDANBgkq
-                            hkiG9w0BAQUFAAOCAQEAXHXewa99f7iIlhvgdMWp6NXfT9TG9FCGWhtO2V5GeUii
-                            2TBYddAH6+tYrVlJ4cN6p444Dhvin8eVA/Y0WfeVll4YasViq6zxSH9FLZkszbKr
-                            f7CfFyYqChsjcrn/oGJWsfsqGqMGPfdAQSkkpyGOHVMMARCY+gP0S973yK89frkA
-                            QGG+elGtKx786IeEEbm4YS4Z0VMkD3obJk/QRmiy6lvHadODGcpiGLCZq9G1Es2i
-                            mcNedy126VjwlNcg6XBbl0shvgGkjqzA89TPFY/FwtklJGfNl8SP88p8I41CsM8Q
-                            /PFGb40C/OoiQncMfOelJJXz6O+w4jNGdUoJdTCpdQ==
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-                            MIIDFDCCAfygAwIBAgIJAOE9jL5hLZ+yMA0GCSqGSIb3DQEBBQUAMBgxFjAUBgNV
-                            BAMTDWxvZ2luLm50dWEuZ3IwHhcNMTMxMjExMTMyNzM3WhcNMjMxMjA5MTMyNzM3
-                            WjAYMRYwFAYDVQQDEw1sb2dpbi5udHVhLmdyMIIBIjANBgkqhkiG9w0BAQEFAAOC
-                            AQ8AMIIBCgKCAQEA9PPd/C1Smrn+DH1bYdJ24qqvA7aDt7izs/c9bmsF1/zOumIj
-                            3Tmi9V/zmeNt2yiV/Nva2ZU3M/cTUxZST7XYWz+758EyqmvKVvHgyOmmF8JdV+9r
-                            hFT3R3DEdDnGnep4N7QZySOQ/mOp3IsY2Wxqka3NU672keZq/VhV/B1MPDqhqPGt
-                            TPeW/NJGjo2UrMKkeyJLCHQJeNbKOOSzefc5TJYFJHLXqGs7DWIXwqqab0MPJ3Na
-                            N7Ap0SEIZWpNS7u/lAAS//1HJQ26zW15GcUhxgi2pMk3GHs6uwWF+DYLEbWg17MQ
-                            Er9MFbftJjf9V4GOfUILDvgNlutCPnmM6aB4gQIDAQABo2EwXzA+BgNVHREENzA1
-                            gg1sb2dpbi5udHVhLmdyhiRodHRwczovL2xvZ2luLm50dWEuZ3IvaWRwL3NoaWJi
-                            b2xldGgwHQYDVR0OBBYEFNP8/C26TomQ3yAZFMY2W84V40ihMA0GCSqGSIb3DQEB
-                            BQUAA4IBAQAv4cC1fu39MNQlvoSY/k/kV7cbkmS30FfVlsuwdfZQJO/3r2a/E7kd
-                            l9QR9Us+Eraabx6ccq6BYbtsMaXkDrgKPL6KfXFWNIjbizqmmvgdlB2ptYYKN7d0
-                            Bz2L7y0ZWkKApEBDVMUwmBHsS18xs35xchKyezTAralRy3tHBAop93jBumHiRRYF
-                            RuRSEM4KM01/DkDDwkCXWEWu0TolnSozTFtYddwi1u48s0tq4TSBkYk3C7XoyCol
-                            PCUfUb8+3VLdMNqkSkE22WQx9th9BNNWs3e4QdrRgnh/9gKInZCzmrXU8ymWBhmj
-                            1f80WSd+TnQAp2UMPIXxxOOSGhI5NyQn
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.ntua.gr:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.ntua.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">National Technical University of Athens</OrganizationName>
-    <OrganizationName xml:lang="el">Εθνικό Μετσόβιο Πολυτεχνείο</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">National Technical University of Athens</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="el">Εθνικό Μετσόβιο Πολυτεχνείο</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.ntua.gr/</OrganizationURL>
-    <OrganizationURL xml:lang="el">http://www.ntua.gr/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <Company>National Technical University of Athens - Network Management Center</Company>
-    <EmailAddress>noc@noc.ntua.gr</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="support">
-    <Company>National Technical University of Athens - Network Management Center</Company>
-    <EmailAddress>help-data@noc.ntua.gr</EmailAddress>
-    <TelephoneNumber>+30-210-772-1861</TelephoneNumber>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/login.services.uu.nl-nidp-saml2-metadata.xml b/swamid-interfederations-2.0/login.services.uu.nl-nidp-saml2-metadata.xml
deleted file mode 100644
index 59a880b6..00000000
--- a/swamid-interfederations-2.0/login.services.uu.nl-nidp-saml2-metadata.xml
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://login.services.uu.nl/nidp/saml2/metadata">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.surfconext.nl/" registrationInstant="2014-09-01T16:50:23Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://wiki.surfnetlabs.nl/display/eduGAIN/EduGAIN</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="nl">Universiteit Utrecht</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Universiteit Utrecht</mdui:DisplayName>
-        <mdui:Description xml:lang="nl">Universiteit Utrecht</mdui:Description>
-        <mdui:Description xml:lang="en">Universiteit Utrecht</mdui:Description>
-        <mdui:Logo height="36" width="108">https://static.surfconext.nl/media/idp/uu.png</mdui:Logo>
-        <mdui:Keywords xml:lang="nl">Universiteit Utrecht UU</mdui:Keywords>
-        <mdui:Keywords xml:lang="en">Universiteit Utrecht UU</mdui:Keywords>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor xmlns:ds="http://www.w3.org/2000/09/xmldsig#" use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIID3zCCAsegAwIBAgIJAMVC9xn1ZfsuMA0GCSqGSIb3DQEBCwUAMIGFMQswCQYD
-VQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMG
-A1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQD
-DB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTAeFw0xNDA1MDUxNDIyMzVa
-Fw0xOTA1MDUxNDIyMzVaMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNo
-dDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYD
-VQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAy
-MDE0MDUwNTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKthMDbB0jKH
-efPzmRu9t2h7iLP4wAXr42bHpjzTEk6gttHFb4l/hFiz1YBI88TjiH6hVjnozo/Y
-HA2c51us+Y7g0XoS7653lbUN/EHzvDMuyis4Xi2Ijf1A/OUQfH1iFUWttIgtWK9+
-fatXoGUS6tirQvrzVh6ZstEp1xbpo1SF6UoVl+fh7tM81qz+Crr/Kroan0UjpZOF
-TwxPoK6fdLgMAieKSCRmBGpbJHbQ2xxbdykBBrBbdfzIX4CDepfjE9h/40ldw5jR
-n3e392jrS6htk23N9BWWrpBT5QCk0kH3h/6F1Dm6TkyG9CDtt73/anuRkvXbeygI
-4wml9bL3rE8CAwEAAaNQME4wHQYDVR0OBBYEFD+Ac7akFxaMhBQAjVfvgGfY8hNK
-MB8GA1UdIwQYMBaAFD+Ac7akFxaMhBQAjVfvgGfY8hNKMAwGA1UdEwQFMAMBAf8w
-DQYJKoZIhvcNAQELBQADggEBAC8L9D67CxIhGo5aGVu63WqRHBNOdo/FAGI7LURD
-FeRmG5nRw/VXzJLGJksh4FSkx7aPrxNWF1uFiDZ80EuYQuIv7bDLblK31ZEbdg1R
-9LgiZCdYSr464I7yXQY9o6FiNtSKZkQO8EsscJPPy/Zp4uHAnADWACkOUHiCbcKi
-UUFu66dX0Wr/v53Gekz487GgVRs8HEeT9MU1reBKRgdENR8PNg4rbQfLc3YQKLWK
-7yWnn/RenjDpuCiePj8N8/80tGgrNgK/6fzM3zI18sSywnXLswxqDb/J+jgVxnQ6
-MrsTf1urM8MnfcxG/82oHIwfMh/sXPCZpo+DTLkhQxctJ3M=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:NameIDFormat xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:NameIDFormat xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">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://engine.surfconext.nl/authentication/idp/single-sign-on/419dd62d92bdaae8aef5a8a97b1c3f77"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Universiteit Utrecht</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Universiteit Utrecht</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.uu.nl/ict</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>SURFconext-beheer</md:GivenName>
-    <md:EmailAddress>SURFconext-beheer@surfnet.nl</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>SURFconext-beheer</md:GivenName>
-    <md:EmailAddress>SURFconext-beheer@surfnet.nl</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>SURFconext support</md:GivenName>
-    <md:EmailAddress>help@surfconext.nl</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/login.services.uu.nl.xml b/swamid-interfederations-2.0/login.services.uu.nl.xml
deleted file mode 100644
index 59a880b6..00000000
--- a/swamid-interfederations-2.0/login.services.uu.nl.xml
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://login.services.uu.nl/nidp/saml2/metadata">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.surfconext.nl/" registrationInstant="2014-09-01T16:50:23Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://wiki.surfnetlabs.nl/display/eduGAIN/EduGAIN</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="nl">Universiteit Utrecht</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Universiteit Utrecht</mdui:DisplayName>
-        <mdui:Description xml:lang="nl">Universiteit Utrecht</mdui:Description>
-        <mdui:Description xml:lang="en">Universiteit Utrecht</mdui:Description>
-        <mdui:Logo height="36" width="108">https://static.surfconext.nl/media/idp/uu.png</mdui:Logo>
-        <mdui:Keywords xml:lang="nl">Universiteit Utrecht UU</mdui:Keywords>
-        <mdui:Keywords xml:lang="en">Universiteit Utrecht UU</mdui:Keywords>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor xmlns:ds="http://www.w3.org/2000/09/xmldsig#" use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIID3zCCAsegAwIBAgIJAMVC9xn1ZfsuMA0GCSqGSIb3DQEBCwUAMIGFMQswCQYD
-VQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMG
-A1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQD
-DB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTAeFw0xNDA1MDUxNDIyMzVa
-Fw0xOTA1MDUxNDIyMzVaMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNo
-dDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYD
-VQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAy
-MDE0MDUwNTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKthMDbB0jKH
-efPzmRu9t2h7iLP4wAXr42bHpjzTEk6gttHFb4l/hFiz1YBI88TjiH6hVjnozo/Y
-HA2c51us+Y7g0XoS7653lbUN/EHzvDMuyis4Xi2Ijf1A/OUQfH1iFUWttIgtWK9+
-fatXoGUS6tirQvrzVh6ZstEp1xbpo1SF6UoVl+fh7tM81qz+Crr/Kroan0UjpZOF
-TwxPoK6fdLgMAieKSCRmBGpbJHbQ2xxbdykBBrBbdfzIX4CDepfjE9h/40ldw5jR
-n3e392jrS6htk23N9BWWrpBT5QCk0kH3h/6F1Dm6TkyG9CDtt73/anuRkvXbeygI
-4wml9bL3rE8CAwEAAaNQME4wHQYDVR0OBBYEFD+Ac7akFxaMhBQAjVfvgGfY8hNK
-MB8GA1UdIwQYMBaAFD+Ac7akFxaMhBQAjVfvgGfY8hNKMAwGA1UdEwQFMAMBAf8w
-DQYJKoZIhvcNAQELBQADggEBAC8L9D67CxIhGo5aGVu63WqRHBNOdo/FAGI7LURD
-FeRmG5nRw/VXzJLGJksh4FSkx7aPrxNWF1uFiDZ80EuYQuIv7bDLblK31ZEbdg1R
-9LgiZCdYSr464I7yXQY9o6FiNtSKZkQO8EsscJPPy/Zp4uHAnADWACkOUHiCbcKi
-UUFu66dX0Wr/v53Gekz487GgVRs8HEeT9MU1reBKRgdENR8PNg4rbQfLc3YQKLWK
-7yWnn/RenjDpuCiePj8N8/80tGgrNgK/6fzM3zI18sSywnXLswxqDb/J+jgVxnQ6
-MrsTf1urM8MnfcxG/82oHIwfMh/sXPCZpo+DTLkhQxctJ3M=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:NameIDFormat xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:NameIDFormat xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">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://engine.surfconext.nl/authentication/idp/single-sign-on/419dd62d92bdaae8aef5a8a97b1c3f77"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Universiteit Utrecht</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Universiteit Utrecht</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.uu.nl/ict</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>SURFconext-beheer</md:GivenName>
-    <md:EmailAddress>SURFconext-beheer@surfnet.nl</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>SURFconext-beheer</md:GivenName>
-    <md:EmailAddress>SURFconext-beheer@surfnet.nl</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>SURFconext support</md:GivenName>
-    <md:EmailAddress>help@surfconext.nl</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/login.terena.org-idp-saml2-idp-metadata.php.xml b/swamid-interfederations-2.0/login.terena.org-idp-saml2-idp-metadata.php.xml
deleted file mode 100644
index e92e6a4a..00000000
--- a/swamid-interfederations-2.0/login.terena.org-idp-saml2-idp-metadata.php.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://login.terena.org/idp/saml2/idp/metadata.php">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.surfconext.nl/" registrationInstant="2011-06-08T02:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://wiki.surfnetlabs.nl/display/eduGAIN/EduGAIN</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </md:Extensions>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">terena.org</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">terena.nl</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="nl">TERENA Secretariat</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">TERENA Secretariat</mdui:DisplayName>
-        <mdui:Description xml:lang="nl">TERENA Secretariat</mdui:Description>
-        <mdui:Description xml:lang="en">TERENA</mdui:Description>
-        <mdui:Logo height="60" width="120">https://static.surfconext.nl/media/idp/terena.png</mdui:Logo>
-        <mdui:Keywords xml:lang="nl">TERENA Secretariat Trans-European Research and Education Networking Association</mdui:Keywords>
-        <mdui:Keywords xml:lang="en">TERENA Secretariat Trans-European Research and Education Networking Association</mdui:Keywords>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor xmlns:ds="http://www.w3.org/2000/09/xmldsig#" use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIID3zCCAsegAwIBAgIJAMVC9xn1ZfsuMA0GCSqGSIb3DQEBCwUAMIGFMQswCQYD
-VQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMG
-A1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQD
-DB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTAeFw0xNDA1MDUxNDIyMzVa
-Fw0xOTA1MDUxNDIyMzVaMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNo
-dDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYD
-VQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAy
-MDE0MDUwNTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKthMDbB0jKH
-efPzmRu9t2h7iLP4wAXr42bHpjzTEk6gttHFb4l/hFiz1YBI88TjiH6hVjnozo/Y
-HA2c51us+Y7g0XoS7653lbUN/EHzvDMuyis4Xi2Ijf1A/OUQfH1iFUWttIgtWK9+
-fatXoGUS6tirQvrzVh6ZstEp1xbpo1SF6UoVl+fh7tM81qz+Crr/Kroan0UjpZOF
-TwxPoK6fdLgMAieKSCRmBGpbJHbQ2xxbdykBBrBbdfzIX4CDepfjE9h/40ldw5jR
-n3e392jrS6htk23N9BWWrpBT5QCk0kH3h/6F1Dm6TkyG9CDtt73/anuRkvXbeygI
-4wml9bL3rE8CAwEAAaNQME4wHQYDVR0OBBYEFD+Ac7akFxaMhBQAjVfvgGfY8hNK
-MB8GA1UdIwQYMBaAFD+Ac7akFxaMhBQAjVfvgGfY8hNKMAwGA1UdEwQFMAMBAf8w
-DQYJKoZIhvcNAQELBQADggEBAC8L9D67CxIhGo5aGVu63WqRHBNOdo/FAGI7LURD
-FeRmG5nRw/VXzJLGJksh4FSkx7aPrxNWF1uFiDZ80EuYQuIv7bDLblK31ZEbdg1R
-9LgiZCdYSr464I7yXQY9o6FiNtSKZkQO8EsscJPPy/Zp4uHAnADWACkOUHiCbcKi
-UUFu66dX0Wr/v53Gekz487GgVRs8HEeT9MU1reBKRgdENR8PNg4rbQfLc3YQKLWK
-7yWnn/RenjDpuCiePj8N8/80tGgrNgK/6fzM3zI18sSywnXLswxqDb/J+jgVxnQ6
-MrsTf1urM8MnfcxG/82oHIwfMh/sXPCZpo+DTLkhQxctJ3M=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:NameIDFormat xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:NameIDFormat xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">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://engine.surfconext.nl/authentication/idp/single-sign-on/add0aa33e5963c5406d2b82f6b1d9f58"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="nl">TERENA Secretariat</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">TERENA</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="nl">TERENA Secretariat</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">TERENA Secretariat</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="nl">http://www.terena.org</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.terena.org</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>SURFconext-beheer</md:GivenName>
-    <md:EmailAddress>SURFconext-beheer@surfnet.nl</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>SURFconext-beheer</md:GivenName>
-    <md:EmailAddress>SURFconext-beheer@surfnet.nl</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>SURFconext support</md:GivenName>
-    <md:EmailAddress>help@surfconext.nl</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/login.terena.org.xml b/swamid-interfederations-2.0/login.terena.org.xml
deleted file mode 100644
index e92e6a4a..00000000
--- a/swamid-interfederations-2.0/login.terena.org.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://login.terena.org/idp/saml2/idp/metadata.php">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.surfconext.nl/" registrationInstant="2011-06-08T02:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://wiki.surfnetlabs.nl/display/eduGAIN/EduGAIN</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </md:Extensions>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">terena.org</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">terena.nl</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="nl">TERENA Secretariat</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">TERENA Secretariat</mdui:DisplayName>
-        <mdui:Description xml:lang="nl">TERENA Secretariat</mdui:Description>
-        <mdui:Description xml:lang="en">TERENA</mdui:Description>
-        <mdui:Logo height="60" width="120">https://static.surfconext.nl/media/idp/terena.png</mdui:Logo>
-        <mdui:Keywords xml:lang="nl">TERENA Secretariat Trans-European Research and Education Networking Association</mdui:Keywords>
-        <mdui:Keywords xml:lang="en">TERENA Secretariat Trans-European Research and Education Networking Association</mdui:Keywords>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor xmlns:ds="http://www.w3.org/2000/09/xmldsig#" use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIID3zCCAsegAwIBAgIJAMVC9xn1ZfsuMA0GCSqGSIb3DQEBCwUAMIGFMQswCQYD
-VQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMG
-A1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQD
-DB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTAeFw0xNDA1MDUxNDIyMzVa
-Fw0xOTA1MDUxNDIyMzVaMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNo
-dDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYD
-VQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAy
-MDE0MDUwNTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKthMDbB0jKH
-efPzmRu9t2h7iLP4wAXr42bHpjzTEk6gttHFb4l/hFiz1YBI88TjiH6hVjnozo/Y
-HA2c51us+Y7g0XoS7653lbUN/EHzvDMuyis4Xi2Ijf1A/OUQfH1iFUWttIgtWK9+
-fatXoGUS6tirQvrzVh6ZstEp1xbpo1SF6UoVl+fh7tM81qz+Crr/Kroan0UjpZOF
-TwxPoK6fdLgMAieKSCRmBGpbJHbQ2xxbdykBBrBbdfzIX4CDepfjE9h/40ldw5jR
-n3e392jrS6htk23N9BWWrpBT5QCk0kH3h/6F1Dm6TkyG9CDtt73/anuRkvXbeygI
-4wml9bL3rE8CAwEAAaNQME4wHQYDVR0OBBYEFD+Ac7akFxaMhBQAjVfvgGfY8hNK
-MB8GA1UdIwQYMBaAFD+Ac7akFxaMhBQAjVfvgGfY8hNKMAwGA1UdEwQFMAMBAf8w
-DQYJKoZIhvcNAQELBQADggEBAC8L9D67CxIhGo5aGVu63WqRHBNOdo/FAGI7LURD
-FeRmG5nRw/VXzJLGJksh4FSkx7aPrxNWF1uFiDZ80EuYQuIv7bDLblK31ZEbdg1R
-9LgiZCdYSr464I7yXQY9o6FiNtSKZkQO8EsscJPPy/Zp4uHAnADWACkOUHiCbcKi
-UUFu66dX0Wr/v53Gekz487GgVRs8HEeT9MU1reBKRgdENR8PNg4rbQfLc3YQKLWK
-7yWnn/RenjDpuCiePj8N8/80tGgrNgK/6fzM3zI18sSywnXLswxqDb/J+jgVxnQ6
-MrsTf1urM8MnfcxG/82oHIwfMh/sXPCZpo+DTLkhQxctJ3M=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:NameIDFormat xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:NameIDFormat xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">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://engine.surfconext.nl/authentication/idp/single-sign-on/add0aa33e5963c5406d2b82f6b1d9f58"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="nl">TERENA Secretariat</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">TERENA</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="nl">TERENA Secretariat</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">TERENA Secretariat</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="nl">http://www.terena.org</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.terena.org</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>SURFconext-beheer</md:GivenName>
-    <md:EmailAddress>SURFconext-beheer@surfnet.nl</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>SURFconext-beheer</md:GivenName>
-    <md:EmailAddress>SURFconext-beheer@surfnet.nl</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>SURFconext support</md:GivenName>
-    <md:EmailAddress>help@surfconext.nl</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/login.ufrgs.br-idp-shibboleth.xml b/swamid-interfederations-2.0/login.ufrgs.br-idp-shibboleth.xml
deleted file mode 100644
index 72d3f575..00000000
--- a/swamid-interfederations-2.0/login.ufrgs.br-idp-shibboleth.xml
+++ /dev/null
@@ -1,114 +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://login.ufrgs.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">ufrgs.br</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">UFRGS - Universidade Federal do Rio Grande do Sul</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="pt-br">UFRGS - Universidade Federal do Rio Grande do Sul</mdui:DisplayName>
-        <mdui:Description xml:lang="en">UFRGS - Universidade Federal do Rio Grande do Sul</mdui:Description>
-        <mdui:Description xml:lang="pt-br">UFRGS - Universidade Federal do Rio Grande do Sul</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.ufrgs.br/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="pt-br">http://www.ufrgs.br/</mdui:InformationURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-    MIID+jCCAuICAQAwDQYJKoZIhvcNAQEFBQAwgcIxMjAwBgNVBAoTKVVuaXZlcnNp
-ZGFkZSBGZWRlcmFsIGRvIFJpbyBHcmFuZGUgZG8gU3VsMQwwCgYDVQQLEwNDUEQx
-JTAjBgkqhkiG9w0BCQEWFmZvc2NhcmluaUBjcGQudWZyZ3MuYnIxFTATBgNVBAcT
-DFBvcnRvIEFsZWdyZTEaMBgGA1UECBMRUmlvIEdyYW5kZSBkbyBTdWwxCzAJBgNV
-BAYTAkJSMRcwFQYDVQQDEw5sb2dpbi51ZnJncy5icjAeFw0xMzAxMDMxNzU3NDVa
-Fw0xNjAxMDMxNzU3NDVaMIHCMTIwMAYDVQQKEylVbml2ZXJzaWRhZGUgRmVkZXJh
-bCBkbyBSaW8gR3JhbmRlIGRvIFN1bDEMMAoGA1UECxMDQ1BEMSUwIwYJKoZIhvcN
-AQkBFhZmb3NjYXJpbmlAY3BkLnVmcmdzLmJyMRUwEwYDVQQHEwxQb3J0byBBbGVn
-cmUxGjAYBgNVBAgTEVJpbyBHcmFuZGUgZG8gU3VsMQswCQYDVQQGEwJCUjEXMBUG
-A1UEAxMObG9naW4udWZyZ3MuYnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
-AoIBAQC8fLEh7cCQVt0LwqhO5aqUVgh+UDY14fXIi/NLIF/cGW8fz/sL+ZQ/A8/w
-ghXVH/+Fz4BQT1l/ON+wXhgyzum26Ic28+v5U8+zFIw56Qt762t+LNFigyUUnNDB
-2wsctazoyvp0BsEZm/NC+9icGjOZbDzJDMa5upsDsxxCrI3Eeu8JLPQ5F8/uQgJw
-jtFvDJhjixBYeahlQ93oR7ZFSJneFqLoIrE5CgnK0N51OkshiQtKduNTN+NfRofG
-bqU+nfMGk5gRNfd9O0I4KapVxfSj3gjg4HJjX/hvaT/gLDDMiICZSyOY2Lx+Vjbs
-qBqdgRIx36iLCSOGtUwvEk7VpxZPAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBAIUJ
-OF+eWl6O7zZ3Pbb9nvsMx8RV8SgfgdKuATFboeHCWsuc0U/YM+RR3f9fInMLjBQC
-Dm+rvGhVjZgvgQJPenkIy49CZ4OmbRGCerZi2bFmB59cVYCisguPcc7xuJrk8hQI
-71Pztij+L2DR4WJ3GLhhF4wR+3Nr4ElHZyhP6WpMx+DMFfiHVHfVtZkQakpgDOhr
-l5reSTUY4gaj4KVESTXBsgJ+2R7xwwJSiNbtbTixhY8P2KkKHQ6LHigc3EhDA6YW
-Dh7IIF01BPWbOdLHGgWAGTEMXmOoSd0iv7mgHOSCbjETABC8zl5tn1WRaZfIEOsE
-OZgo7MlCCIU7m3ddaIg=
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.ufrgs.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.ufrgs.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://login.ufrgs.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.ufrgs.br/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.ufrgs.br/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.ufrgs.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">ufrgs.br</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-      
-MIID+jCCAuICAQAwDQYJKoZIhvcNAQEFBQAwgcIxMjAwBgNVBAoTKVVuaXZlcnNp
-ZGFkZSBGZWRlcmFsIGRvIFJpbyBHcmFuZGUgZG8gU3VsMQwwCgYDVQQLEwNDUEQx
-JTAjBgkqhkiG9w0BCQEWFmZvc2NhcmluaUBjcGQudWZyZ3MuYnIxFTATBgNVBAcT
-DFBvcnRvIEFsZWdyZTEaMBgGA1UECBMRUmlvIEdyYW5kZSBkbyBTdWwxCzAJBgNV
-BAYTAkJSMRcwFQYDVQQDEw5sb2dpbi51ZnJncy5icjAeFw0xMzAxMDMxNzU3NDVa
-Fw0xNjAxMDMxNzU3NDVaMIHCMTIwMAYDVQQKEylVbml2ZXJzaWRhZGUgRmVkZXJh
-bCBkbyBSaW8gR3JhbmRlIGRvIFN1bDEMMAoGA1UECxMDQ1BEMSUwIwYJKoZIhvcN
-AQkBFhZmb3NjYXJpbmlAY3BkLnVmcmdzLmJyMRUwEwYDVQQHEwxQb3J0byBBbGVn
-cmUxGjAYBgNVBAgTEVJpbyBHcmFuZGUgZG8gU3VsMQswCQYDVQQGEwJCUjEXMBUG
-A1UEAxMObG9naW4udWZyZ3MuYnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
-AoIBAQC8fLEh7cCQVt0LwqhO5aqUVgh+UDY14fXIi/NLIF/cGW8fz/sL+ZQ/A8/w
-ghXVH/+Fz4BQT1l/ON+wXhgyzum26Ic28+v5U8+zFIw56Qt762t+LNFigyUUnNDB
-2wsctazoyvp0BsEZm/NC+9icGjOZbDzJDMa5upsDsxxCrI3Eeu8JLPQ5F8/uQgJw
-jtFvDJhjixBYeahlQ93oR7ZFSJneFqLoIrE5CgnK0N51OkshiQtKduNTN+NfRofG
-bqU+nfMGk5gRNfd9O0I4KapVxfSj3gjg4HJjX/hvaT/gLDDMiICZSyOY2Lx+Vjbs
-qBqdgRIx36iLCSOGtUwvEk7VpxZPAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBAIUJ
-OF+eWl6O7zZ3Pbb9nvsMx8RV8SgfgdKuATFboeHCWsuc0U/YM+RR3f9fInMLjBQC
-Dm+rvGhVjZgvgQJPenkIy49CZ4OmbRGCerZi2bFmB59cVYCisguPcc7xuJrk8hQI
-71Pztij+L2DR4WJ3GLhhF4wR+3Nr4ElHZyhP6WpMx+DMFfiHVHfVtZkQakpgDOhr
-l5reSTUY4gaj4KVESTXBsgJ+2R7xwwJSiNbtbTixhY8P2KkKHQ6LHigc3EhDA6YW
-Dh7IIF01BPWbOdLHGgWAGTEMXmOoSd0iv7mgHOSCbjETABC8zl5tn1WRaZfIEOsE
-OZgo7MlCCIU7m3ddaIg=
-                    
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.ufrgs.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.ufrgs.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">UFRGS - Universidade Federal do Rio Grande do Sul</OrganizationName>
-    <OrganizationName xml:lang="pt-br">UFRGS - Universidade Federal do Rio Grande do Sul</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">UFRGS - Universidade Federal do Rio Grande do Sul</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="pt-br">UFRGS - Universidade Federal do Rio Grande do Sul</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.ufrgs.br/</OrganizationURL>
-    <OrganizationURL xml:lang="pt-br">http://www.ufrgs.br/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Everton Foscarini</SurName>
-    <EmailAddress>foscarini@cpd.ufrgs.br</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/login.ufrgs.br.xml b/swamid-interfederations-2.0/login.ufrgs.br.xml
deleted file mode 100644
index 72d3f575..00000000
--- a/swamid-interfederations-2.0/login.ufrgs.br.xml
+++ /dev/null
@@ -1,114 +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://login.ufrgs.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">ufrgs.br</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">UFRGS - Universidade Federal do Rio Grande do Sul</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="pt-br">UFRGS - Universidade Federal do Rio Grande do Sul</mdui:DisplayName>
-        <mdui:Description xml:lang="en">UFRGS - Universidade Federal do Rio Grande do Sul</mdui:Description>
-        <mdui:Description xml:lang="pt-br">UFRGS - Universidade Federal do Rio Grande do Sul</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.ufrgs.br/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="pt-br">http://www.ufrgs.br/</mdui:InformationURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-    MIID+jCCAuICAQAwDQYJKoZIhvcNAQEFBQAwgcIxMjAwBgNVBAoTKVVuaXZlcnNp
-ZGFkZSBGZWRlcmFsIGRvIFJpbyBHcmFuZGUgZG8gU3VsMQwwCgYDVQQLEwNDUEQx
-JTAjBgkqhkiG9w0BCQEWFmZvc2NhcmluaUBjcGQudWZyZ3MuYnIxFTATBgNVBAcT
-DFBvcnRvIEFsZWdyZTEaMBgGA1UECBMRUmlvIEdyYW5kZSBkbyBTdWwxCzAJBgNV
-BAYTAkJSMRcwFQYDVQQDEw5sb2dpbi51ZnJncy5icjAeFw0xMzAxMDMxNzU3NDVa
-Fw0xNjAxMDMxNzU3NDVaMIHCMTIwMAYDVQQKEylVbml2ZXJzaWRhZGUgRmVkZXJh
-bCBkbyBSaW8gR3JhbmRlIGRvIFN1bDEMMAoGA1UECxMDQ1BEMSUwIwYJKoZIhvcN
-AQkBFhZmb3NjYXJpbmlAY3BkLnVmcmdzLmJyMRUwEwYDVQQHEwxQb3J0byBBbGVn
-cmUxGjAYBgNVBAgTEVJpbyBHcmFuZGUgZG8gU3VsMQswCQYDVQQGEwJCUjEXMBUG
-A1UEAxMObG9naW4udWZyZ3MuYnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
-AoIBAQC8fLEh7cCQVt0LwqhO5aqUVgh+UDY14fXIi/NLIF/cGW8fz/sL+ZQ/A8/w
-ghXVH/+Fz4BQT1l/ON+wXhgyzum26Ic28+v5U8+zFIw56Qt762t+LNFigyUUnNDB
-2wsctazoyvp0BsEZm/NC+9icGjOZbDzJDMa5upsDsxxCrI3Eeu8JLPQ5F8/uQgJw
-jtFvDJhjixBYeahlQ93oR7ZFSJneFqLoIrE5CgnK0N51OkshiQtKduNTN+NfRofG
-bqU+nfMGk5gRNfd9O0I4KapVxfSj3gjg4HJjX/hvaT/gLDDMiICZSyOY2Lx+Vjbs
-qBqdgRIx36iLCSOGtUwvEk7VpxZPAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBAIUJ
-OF+eWl6O7zZ3Pbb9nvsMx8RV8SgfgdKuATFboeHCWsuc0U/YM+RR3f9fInMLjBQC
-Dm+rvGhVjZgvgQJPenkIy49CZ4OmbRGCerZi2bFmB59cVYCisguPcc7xuJrk8hQI
-71Pztij+L2DR4WJ3GLhhF4wR+3Nr4ElHZyhP6WpMx+DMFfiHVHfVtZkQakpgDOhr
-l5reSTUY4gaj4KVESTXBsgJ+2R7xwwJSiNbtbTixhY8P2KkKHQ6LHigc3EhDA6YW
-Dh7IIF01BPWbOdLHGgWAGTEMXmOoSd0iv7mgHOSCbjETABC8zl5tn1WRaZfIEOsE
-OZgo7MlCCIU7m3ddaIg=
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.ufrgs.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.ufrgs.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://login.ufrgs.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.ufrgs.br/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.ufrgs.br/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.ufrgs.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">ufrgs.br</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-      
-MIID+jCCAuICAQAwDQYJKoZIhvcNAQEFBQAwgcIxMjAwBgNVBAoTKVVuaXZlcnNp
-ZGFkZSBGZWRlcmFsIGRvIFJpbyBHcmFuZGUgZG8gU3VsMQwwCgYDVQQLEwNDUEQx
-JTAjBgkqhkiG9w0BCQEWFmZvc2NhcmluaUBjcGQudWZyZ3MuYnIxFTATBgNVBAcT
-DFBvcnRvIEFsZWdyZTEaMBgGA1UECBMRUmlvIEdyYW5kZSBkbyBTdWwxCzAJBgNV
-BAYTAkJSMRcwFQYDVQQDEw5sb2dpbi51ZnJncy5icjAeFw0xMzAxMDMxNzU3NDVa
-Fw0xNjAxMDMxNzU3NDVaMIHCMTIwMAYDVQQKEylVbml2ZXJzaWRhZGUgRmVkZXJh
-bCBkbyBSaW8gR3JhbmRlIGRvIFN1bDEMMAoGA1UECxMDQ1BEMSUwIwYJKoZIhvcN
-AQkBFhZmb3NjYXJpbmlAY3BkLnVmcmdzLmJyMRUwEwYDVQQHEwxQb3J0byBBbGVn
-cmUxGjAYBgNVBAgTEVJpbyBHcmFuZGUgZG8gU3VsMQswCQYDVQQGEwJCUjEXMBUG
-A1UEAxMObG9naW4udWZyZ3MuYnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
-AoIBAQC8fLEh7cCQVt0LwqhO5aqUVgh+UDY14fXIi/NLIF/cGW8fz/sL+ZQ/A8/w
-ghXVH/+Fz4BQT1l/ON+wXhgyzum26Ic28+v5U8+zFIw56Qt762t+LNFigyUUnNDB
-2wsctazoyvp0BsEZm/NC+9icGjOZbDzJDMa5upsDsxxCrI3Eeu8JLPQ5F8/uQgJw
-jtFvDJhjixBYeahlQ93oR7ZFSJneFqLoIrE5CgnK0N51OkshiQtKduNTN+NfRofG
-bqU+nfMGk5gRNfd9O0I4KapVxfSj3gjg4HJjX/hvaT/gLDDMiICZSyOY2Lx+Vjbs
-qBqdgRIx36iLCSOGtUwvEk7VpxZPAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBAIUJ
-OF+eWl6O7zZ3Pbb9nvsMx8RV8SgfgdKuATFboeHCWsuc0U/YM+RR3f9fInMLjBQC
-Dm+rvGhVjZgvgQJPenkIy49CZ4OmbRGCerZi2bFmB59cVYCisguPcc7xuJrk8hQI
-71Pztij+L2DR4WJ3GLhhF4wR+3Nr4ElHZyhP6WpMx+DMFfiHVHfVtZkQakpgDOhr
-l5reSTUY4gaj4KVESTXBsgJ+2R7xwwJSiNbtbTixhY8P2KkKHQ6LHigc3EhDA6YW
-Dh7IIF01BPWbOdLHGgWAGTEMXmOoSd0iv7mgHOSCbjETABC8zl5tn1WRaZfIEOsE
-OZgo7MlCCIU7m3ddaIg=
-                    
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.ufrgs.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.ufrgs.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">UFRGS - Universidade Federal do Rio Grande do Sul</OrganizationName>
-    <OrganizationName xml:lang="pt-br">UFRGS - Universidade Federal do Rio Grande do Sul</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">UFRGS - Universidade Federal do Rio Grande do Sul</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="pt-br">UFRGS - Universidade Federal do Rio Grande do Sul</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.ufrgs.br/</OrganizationURL>
-    <OrganizationURL xml:lang="pt-br">http://www.ufrgs.br/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Everton Foscarini</SurName>
-    <EmailAddress>foscarini@cpd.ufrgs.br</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/login.utenos-kolegija.lt-SAML-IdP.xml b/swamid-interfederations-2.0/login.utenos-kolegija.lt-SAML-IdP.xml
deleted file mode 100644
index b46798ad..00000000
--- a/swamid-interfederations-2.0/login.utenos-kolegija.lt-SAML-IdP.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://login.utenos-kolegija.lt/SAML/IdP">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://fedi.litnet.lt" registrationInstant="2014-10-09T09:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="lt">https://fedi.litnet.lt/lt/tvarka</mdrpi:RegistrationPolicy>
-      <mdrpi:RegistrationPolicy xml:lang="en">https://fedi.litnet.lt/en/policy</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="lt">Utenos kolegija</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Utena University of Applied Sciences</mdui:DisplayName>
-        <mdui:Description xml:lang="lt">Utenos kolegijos vieningas prisijungimas</mdui:Description>
-        <mdui:Description xml:lang="en">Single sign-on for Utena University of Applied Sciences</mdui:Description>
-        <mdui:InformationURL xml:lang="lt">https://login.utenos-kolegija.lt/?lang=lt</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">https://login.utenos-kolegija.lt/?lang=en</mdui:InformationURL>
-        <mdui:Logo height="256" width="256">https://login.utenos-kolegija.lt/static/logo_tr.png</mdui:Logo>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:IPHint>193.219.181.192/26</mdui:IPHint>
-        <mdui:DomainHint>utenos-kolegija.lt</mdui:DomainHint>
-        <mdui:DomainHint>ukolegija.lt</mdui:DomainHint>
-        <mdui:DomainHint>utenacollege.eu</mdui:DomainHint>
-        <mdui:GeolocationHint>geo:55.5,25.6</mdui:GeolocationHint>
-      </mdui:DiscoHints>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIIGITCCBAmgAwIBAgICUAEwDQYJKoZIhvcNAQEFBQAwQTELMAkGA1UEBhMCTFQxGDAWBgNVBAoMD1V0ZW5vcyBrb2xlZ2lqYTEYMBYGA1UEAwwPVXRlbm9zIGtvbGVnaWphMB4XDTE0MDgxMjA2MjYwNFoXDTI0MDgwOTA2MjYwNFowWDELMAkGA1UEBhMCTFQxGDAWBgNVBAoMD1V0ZW5vcyBrb2xlZ2lqYTEMMAoGA1UECwwDSWRQMSEwHwYDVQQDDBhsb2dpbi51dGVub3Mta29sZWdpamEubHQwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCs/TqFTWGqdM+1C6I4p5UE4CnXi7h2wcKZ2sHR8RAuPZvfrjFEjLOo72eYiXZ7QTCfg/5m7CIhjRZYerW9GjRoM9UPPmhkJThI9QSClDSXyAhADm7Yehp7n+tB78GeGlMeJoVaw2tskUxmKsjcdylUitSSThKHpl3Xi4SViXQgNK3RmAPMF7nzYZ6SOH2Ufaf1Yg+ky0iX50xsh19s5aQ+gc/JHnvvGNx+XIk0Wf/zj6uD+M0hI5OcK6Y69cUxfeIXaQe2cLNTOMpTKPHcR0R11TvBZnDhhnIHio/EOEx/8Zp0YebWUH9Ol4c6WB85ndqIZ90XnFEqGtCwFLiXPjrSli0JfpZMHkv2iF6xpeJVpTarMVPRzRemqIroDqHcDbUNJ3OAdoWpcZ1EmrkWwlHZa52K6cm8G1WqsSP2ghoWjeNl7gkuF9DTfWx33F4bOWcJ7WM++khTPDBhUTrWoIcjyu63liHGEV0mLvACm85bnje39XTpQ9/c1QLNNitDnt05XOnR6jKnvCXB8Np5MVmG+23gzleaO973xTTaQlhhFzIShEIKGNrqSZCUgh6ehsaXT8osxHxpOXwxd1HWLZj+N5/SXeFT8BUv/sQAwEgXrdA32w8bUf/1uJnHTw1b7KYx1bi+YuejIsfmv5Hh8uRgO1/qoCMFIdBb0G8c7jQrtwIDAQABo4IBCjCCAQYwDwYDVR0TAQH/BAUwAwEBADAdBgNVHQ4EFgQUcvHStojsZcuShVRpNcJkLmFby88wagYDVR0jBGMwYYAUQeWj/Ma9Fu5g3DHHEezH9JZ33A2hRaRDMEExCzAJBgNVBAYTAkxUMRgwFgYDVQQKDA9VdGVub3Mga29sZWdpamExGDAWBgNVBAMMD1V0ZW5vcyBrb2xlZ2lqYYICE4gwPAYDVR0fBDUwMzAxoC+gLYYraHR0cDovL3d3dy51dGVub3Mta29sZWdpamEubHQvdWtvbGVnaWphLmNybDALBgNVHQ8EBAMCAKgwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMA0GCSqGSIb3DQEBBQUAA4ICAQBFRmlUAfF3RTfhIOay1xKfTKE5NVOnZ1g5bVnMhyci8U76aSs91xThWr4ratbDOmkrujAL/TGCkmgiTgDAztQEt6ZzjSbscHs7W3i7C2XkwsJ2XKFgQmOXHD3IflN6FcxcMCU35pEzGfqBFIEjFeSt45pcJ77GEFGnxWvuSybERyJF/PDFRy9VAaT4FSIOy2OXZdUW0bBuU9nCqKISVnQ8qTJPm2qlC+g+zl5/bmlFu0B0aGyQVvLdeqGwapC8oIuLW9d6LwdUd5bcNSJdbLxOrKJ458/I9wZ69BZA5hOg7uB1YRK8v3XuhFNPQUB8QeVe4L2ae4FY3lypHGdH0iAfr7C3c/1GhuRNbRFqi9sIQOWU/wdSiw7xTax2I5Ncy6CcSjDT1LCFNIU3QnuB/DoAVHY+LG+3CqRIaM6c+hVw5WiIttIQadX94mSSUpCY0Y8tYXvvD0N32Q64cQBlB0vvj2z6925X3UyhUEjLYYIo/+JLo1v17Ta+fdqYtIr+tlT340eUa0Z+YOZ04TIzfer1p6a6kDDz5uSIaGR7KqCUxc+S4eJqqWfkpiZeBV0MOlujel6XVFLC2CIVcb5cAdi7hpUVEHnN1VIkiElj3WHvPCXCQ5g1Y2/cUHTlEKznj9X7OaE5yB8TaJ70N3iVL1dcDebj6FVy4WPNsp66iv3hRA==</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>MIIGITCCBAmgAwIBAgICUAEwDQYJKoZIhvcNAQEFBQAwQTELMAkGA1UEBhMCTFQxGDAWBgNVBAoMD1V0ZW5vcyBrb2xlZ2lqYTEYMBYGA1UEAwwPVXRlbm9zIGtvbGVnaWphMB4XDTE0MDgxMjA2MjYwNFoXDTI0MDgwOTA2MjYwNFowWDELMAkGA1UEBhMCTFQxGDAWBgNVBAoMD1V0ZW5vcyBrb2xlZ2lqYTEMMAoGA1UECwwDSWRQMSEwHwYDVQQDDBhsb2dpbi51dGVub3Mta29sZWdpamEubHQwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCs/TqFTWGqdM+1C6I4p5UE4CnXi7h2wcKZ2sHR8RAuPZvfrjFEjLOo72eYiXZ7QTCfg/5m7CIhjRZYerW9GjRoM9UPPmhkJThI9QSClDSXyAhADm7Yehp7n+tB78GeGlMeJoVaw2tskUxmKsjcdylUitSSThKHpl3Xi4SViXQgNK3RmAPMF7nzYZ6SOH2Ufaf1Yg+ky0iX50xsh19s5aQ+gc/JHnvvGNx+XIk0Wf/zj6uD+M0hI5OcK6Y69cUxfeIXaQe2cLNTOMpTKPHcR0R11TvBZnDhhnIHio/EOEx/8Zp0YebWUH9Ol4c6WB85ndqIZ90XnFEqGtCwFLiXPjrSli0JfpZMHkv2iF6xpeJVpTarMVPRzRemqIroDqHcDbUNJ3OAdoWpcZ1EmrkWwlHZa52K6cm8G1WqsSP2ghoWjeNl7gkuF9DTfWx33F4bOWcJ7WM++khTPDBhUTrWoIcjyu63liHGEV0mLvACm85bnje39XTpQ9/c1QLNNitDnt05XOnR6jKnvCXB8Np5MVmG+23gzleaO973xTTaQlhhFzIShEIKGNrqSZCUgh6ehsaXT8osxHxpOXwxd1HWLZj+N5/SXeFT8BUv/sQAwEgXrdA32w8bUf/1uJnHTw1b7KYx1bi+YuejIsfmv5Hh8uRgO1/qoCMFIdBb0G8c7jQrtwIDAQABo4IBCjCCAQYwDwYDVR0TAQH/BAUwAwEBADAdBgNVHQ4EFgQUcvHStojsZcuShVRpNcJkLmFby88wagYDVR0jBGMwYYAUQeWj/Ma9Fu5g3DHHEezH9JZ33A2hRaRDMEExCzAJBgNVBAYTAkxUMRgwFgYDVQQKDA9VdGVub3Mga29sZWdpamExGDAWBgNVBAMMD1V0ZW5vcyBrb2xlZ2lqYYICE4gwPAYDVR0fBDUwMzAxoC+gLYYraHR0cDovL3d3dy51dGVub3Mta29sZWdpamEubHQvdWtvbGVnaWphLmNybDALBgNVHQ8EBAMCAKgwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMA0GCSqGSIb3DQEBBQUAA4ICAQBFRmlUAfF3RTfhIOay1xKfTKE5NVOnZ1g5bVnMhyci8U76aSs91xThWr4ratbDOmkrujAL/TGCkmgiTgDAztQEt6ZzjSbscHs7W3i7C2XkwsJ2XKFgQmOXHD3IflN6FcxcMCU35pEzGfqBFIEjFeSt45pcJ77GEFGnxWvuSybERyJF/PDFRy9VAaT4FSIOy2OXZdUW0bBuU9nCqKISVnQ8qTJPm2qlC+g+zl5/bmlFu0B0aGyQVvLdeqGwapC8oIuLW9d6LwdUd5bcNSJdbLxOrKJ458/I9wZ69BZA5hOg7uB1YRK8v3XuhFNPQUB8QeVe4L2ae4FY3lypHGdH0iAfr7C3c/1GhuRNbRFqi9sIQOWU/wdSiw7xTax2I5Ncy6CcSjDT1LCFNIU3QnuB/DoAVHY+LG+3CqRIaM6c+hVw5WiIttIQadX94mSSUpCY0Y8tYXvvD0N32Q64cQBlB0vvj2z6925X3UyhUEjLYYIo/+JLo1v17Ta+fdqYtIr+tlT340eUa0Z+YOZ04TIzfer1p6a6kDDz5uSIaGR7KqCUxc+S4eJqqWfkpiZeBV0MOlujel6XVFLC2CIVcb5cAdi7hpUVEHnN1VIkiElj3WHvPCXCQ5g1Y2/cUHTlEKznj9X7OaE5yB8TaJ70N3iVL1dcDebj6FVy4WPNsp66iv3hRA==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.utenos-kolegija.lt/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://login.utenos-kolegija.lt/simplesaml/saml2/idp/SSOService.php"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="lt">Utenos kolegija</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">Utena University of Applied Sciences</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="lt">Utenos kolegija</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Utena University of Applied Sciences</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="lt">http://www.utenos-kolegija.lt/?lang=lt</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.utenos-kolegija.lt/?lang=en</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Mantas</md:GivenName>
-    <md:SurName>Mikulėnas</md:SurName>
-    <md:EmailAddress>mantas@utenos-kolegija.lt</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/login.utenos-kolegija.lt.xml b/swamid-interfederations-2.0/login.utenos-kolegija.lt.xml
deleted file mode 100644
index b46798ad..00000000
--- a/swamid-interfederations-2.0/login.utenos-kolegija.lt.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://login.utenos-kolegija.lt/SAML/IdP">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://fedi.litnet.lt" registrationInstant="2014-10-09T09:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="lt">https://fedi.litnet.lt/lt/tvarka</mdrpi:RegistrationPolicy>
-      <mdrpi:RegistrationPolicy xml:lang="en">https://fedi.litnet.lt/en/policy</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="lt">Utenos kolegija</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Utena University of Applied Sciences</mdui:DisplayName>
-        <mdui:Description xml:lang="lt">Utenos kolegijos vieningas prisijungimas</mdui:Description>
-        <mdui:Description xml:lang="en">Single sign-on for Utena University of Applied Sciences</mdui:Description>
-        <mdui:InformationURL xml:lang="lt">https://login.utenos-kolegija.lt/?lang=lt</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">https://login.utenos-kolegija.lt/?lang=en</mdui:InformationURL>
-        <mdui:Logo height="256" width="256">https://login.utenos-kolegija.lt/static/logo_tr.png</mdui:Logo>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:IPHint>193.219.181.192/26</mdui:IPHint>
-        <mdui:DomainHint>utenos-kolegija.lt</mdui:DomainHint>
-        <mdui:DomainHint>ukolegija.lt</mdui:DomainHint>
-        <mdui:DomainHint>utenacollege.eu</mdui:DomainHint>
-        <mdui:GeolocationHint>geo:55.5,25.6</mdui:GeolocationHint>
-      </mdui:DiscoHints>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIIGITCCBAmgAwIBAgICUAEwDQYJKoZIhvcNAQEFBQAwQTELMAkGA1UEBhMCTFQxGDAWBgNVBAoMD1V0ZW5vcyBrb2xlZ2lqYTEYMBYGA1UEAwwPVXRlbm9zIGtvbGVnaWphMB4XDTE0MDgxMjA2MjYwNFoXDTI0MDgwOTA2MjYwNFowWDELMAkGA1UEBhMCTFQxGDAWBgNVBAoMD1V0ZW5vcyBrb2xlZ2lqYTEMMAoGA1UECwwDSWRQMSEwHwYDVQQDDBhsb2dpbi51dGVub3Mta29sZWdpamEubHQwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCs/TqFTWGqdM+1C6I4p5UE4CnXi7h2wcKZ2sHR8RAuPZvfrjFEjLOo72eYiXZ7QTCfg/5m7CIhjRZYerW9GjRoM9UPPmhkJThI9QSClDSXyAhADm7Yehp7n+tB78GeGlMeJoVaw2tskUxmKsjcdylUitSSThKHpl3Xi4SViXQgNK3RmAPMF7nzYZ6SOH2Ufaf1Yg+ky0iX50xsh19s5aQ+gc/JHnvvGNx+XIk0Wf/zj6uD+M0hI5OcK6Y69cUxfeIXaQe2cLNTOMpTKPHcR0R11TvBZnDhhnIHio/EOEx/8Zp0YebWUH9Ol4c6WB85ndqIZ90XnFEqGtCwFLiXPjrSli0JfpZMHkv2iF6xpeJVpTarMVPRzRemqIroDqHcDbUNJ3OAdoWpcZ1EmrkWwlHZa52K6cm8G1WqsSP2ghoWjeNl7gkuF9DTfWx33F4bOWcJ7WM++khTPDBhUTrWoIcjyu63liHGEV0mLvACm85bnje39XTpQ9/c1QLNNitDnt05XOnR6jKnvCXB8Np5MVmG+23gzleaO973xTTaQlhhFzIShEIKGNrqSZCUgh6ehsaXT8osxHxpOXwxd1HWLZj+N5/SXeFT8BUv/sQAwEgXrdA32w8bUf/1uJnHTw1b7KYx1bi+YuejIsfmv5Hh8uRgO1/qoCMFIdBb0G8c7jQrtwIDAQABo4IBCjCCAQYwDwYDVR0TAQH/BAUwAwEBADAdBgNVHQ4EFgQUcvHStojsZcuShVRpNcJkLmFby88wagYDVR0jBGMwYYAUQeWj/Ma9Fu5g3DHHEezH9JZ33A2hRaRDMEExCzAJBgNVBAYTAkxUMRgwFgYDVQQKDA9VdGVub3Mga29sZWdpamExGDAWBgNVBAMMD1V0ZW5vcyBrb2xlZ2lqYYICE4gwPAYDVR0fBDUwMzAxoC+gLYYraHR0cDovL3d3dy51dGVub3Mta29sZWdpamEubHQvdWtvbGVnaWphLmNybDALBgNVHQ8EBAMCAKgwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMA0GCSqGSIb3DQEBBQUAA4ICAQBFRmlUAfF3RTfhIOay1xKfTKE5NVOnZ1g5bVnMhyci8U76aSs91xThWr4ratbDOmkrujAL/TGCkmgiTgDAztQEt6ZzjSbscHs7W3i7C2XkwsJ2XKFgQmOXHD3IflN6FcxcMCU35pEzGfqBFIEjFeSt45pcJ77GEFGnxWvuSybERyJF/PDFRy9VAaT4FSIOy2OXZdUW0bBuU9nCqKISVnQ8qTJPm2qlC+g+zl5/bmlFu0B0aGyQVvLdeqGwapC8oIuLW9d6LwdUd5bcNSJdbLxOrKJ458/I9wZ69BZA5hOg7uB1YRK8v3XuhFNPQUB8QeVe4L2ae4FY3lypHGdH0iAfr7C3c/1GhuRNbRFqi9sIQOWU/wdSiw7xTax2I5Ncy6CcSjDT1LCFNIU3QnuB/DoAVHY+LG+3CqRIaM6c+hVw5WiIttIQadX94mSSUpCY0Y8tYXvvD0N32Q64cQBlB0vvj2z6925X3UyhUEjLYYIo/+JLo1v17Ta+fdqYtIr+tlT340eUa0Z+YOZ04TIzfer1p6a6kDDz5uSIaGR7KqCUxc+S4eJqqWfkpiZeBV0MOlujel6XVFLC2CIVcb5cAdi7hpUVEHnN1VIkiElj3WHvPCXCQ5g1Y2/cUHTlEKznj9X7OaE5yB8TaJ70N3iVL1dcDebj6FVy4WPNsp66iv3hRA==</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>MIIGITCCBAmgAwIBAgICUAEwDQYJKoZIhvcNAQEFBQAwQTELMAkGA1UEBhMCTFQxGDAWBgNVBAoMD1V0ZW5vcyBrb2xlZ2lqYTEYMBYGA1UEAwwPVXRlbm9zIGtvbGVnaWphMB4XDTE0MDgxMjA2MjYwNFoXDTI0MDgwOTA2MjYwNFowWDELMAkGA1UEBhMCTFQxGDAWBgNVBAoMD1V0ZW5vcyBrb2xlZ2lqYTEMMAoGA1UECwwDSWRQMSEwHwYDVQQDDBhsb2dpbi51dGVub3Mta29sZWdpamEubHQwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCs/TqFTWGqdM+1C6I4p5UE4CnXi7h2wcKZ2sHR8RAuPZvfrjFEjLOo72eYiXZ7QTCfg/5m7CIhjRZYerW9GjRoM9UPPmhkJThI9QSClDSXyAhADm7Yehp7n+tB78GeGlMeJoVaw2tskUxmKsjcdylUitSSThKHpl3Xi4SViXQgNK3RmAPMF7nzYZ6SOH2Ufaf1Yg+ky0iX50xsh19s5aQ+gc/JHnvvGNx+XIk0Wf/zj6uD+M0hI5OcK6Y69cUxfeIXaQe2cLNTOMpTKPHcR0R11TvBZnDhhnIHio/EOEx/8Zp0YebWUH9Ol4c6WB85ndqIZ90XnFEqGtCwFLiXPjrSli0JfpZMHkv2iF6xpeJVpTarMVPRzRemqIroDqHcDbUNJ3OAdoWpcZ1EmrkWwlHZa52K6cm8G1WqsSP2ghoWjeNl7gkuF9DTfWx33F4bOWcJ7WM++khTPDBhUTrWoIcjyu63liHGEV0mLvACm85bnje39XTpQ9/c1QLNNitDnt05XOnR6jKnvCXB8Np5MVmG+23gzleaO973xTTaQlhhFzIShEIKGNrqSZCUgh6ehsaXT8osxHxpOXwxd1HWLZj+N5/SXeFT8BUv/sQAwEgXrdA32w8bUf/1uJnHTw1b7KYx1bi+YuejIsfmv5Hh8uRgO1/qoCMFIdBb0G8c7jQrtwIDAQABo4IBCjCCAQYwDwYDVR0TAQH/BAUwAwEBADAdBgNVHQ4EFgQUcvHStojsZcuShVRpNcJkLmFby88wagYDVR0jBGMwYYAUQeWj/Ma9Fu5g3DHHEezH9JZ33A2hRaRDMEExCzAJBgNVBAYTAkxUMRgwFgYDVQQKDA9VdGVub3Mga29sZWdpamExGDAWBgNVBAMMD1V0ZW5vcyBrb2xlZ2lqYYICE4gwPAYDVR0fBDUwMzAxoC+gLYYraHR0cDovL3d3dy51dGVub3Mta29sZWdpamEubHQvdWtvbGVnaWphLmNybDALBgNVHQ8EBAMCAKgwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMA0GCSqGSIb3DQEBBQUAA4ICAQBFRmlUAfF3RTfhIOay1xKfTKE5NVOnZ1g5bVnMhyci8U76aSs91xThWr4ratbDOmkrujAL/TGCkmgiTgDAztQEt6ZzjSbscHs7W3i7C2XkwsJ2XKFgQmOXHD3IflN6FcxcMCU35pEzGfqBFIEjFeSt45pcJ77GEFGnxWvuSybERyJF/PDFRy9VAaT4FSIOy2OXZdUW0bBuU9nCqKISVnQ8qTJPm2qlC+g+zl5/bmlFu0B0aGyQVvLdeqGwapC8oIuLW9d6LwdUd5bcNSJdbLxOrKJ458/I9wZ69BZA5hOg7uB1YRK8v3XuhFNPQUB8QeVe4L2ae4FY3lypHGdH0iAfr7C3c/1GhuRNbRFqi9sIQOWU/wdSiw7xTax2I5Ncy6CcSjDT1LCFNIU3QnuB/DoAVHY+LG+3CqRIaM6c+hVw5WiIttIQadX94mSSUpCY0Y8tYXvvD0N32Q64cQBlB0vvj2z6925X3UyhUEjLYYIo/+JLo1v17Ta+fdqYtIr+tlT340eUa0Z+YOZ04TIzfer1p6a6kDDz5uSIaGR7KqCUxc+S4eJqqWfkpiZeBV0MOlujel6XVFLC2CIVcb5cAdi7hpUVEHnN1VIkiElj3WHvPCXCQ5g1Y2/cUHTlEKznj9X7OaE5yB8TaJ70N3iVL1dcDebj6FVy4WPNsp66iv3hRA==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.utenos-kolegija.lt/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://login.utenos-kolegija.lt/simplesaml/saml2/idp/SSOService.php"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="lt">Utenos kolegija</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">Utena University of Applied Sciences</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="lt">Utenos kolegija</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Utena University of Applied Sciences</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="lt">http://www.utenos-kolegija.lt/?lang=lt</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.utenos-kolegija.lt/?lang=en</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Mantas</md:GivenName>
-    <md:SurName>Mikulėnas</md:SurName>
-    <md:EmailAddress>mantas@utenos-kolegija.lt</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/logout.uwasa.fi.xml b/swamid-interfederations-2.0/logout.uwasa.fi.xml
deleted file mode 100644
index a5ba47cc..00000000
--- a/swamid-interfederations-2.0/logout.uwasa.fi.xml
+++ /dev/null
@@ -1,173 +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://logout.uwasa.fi/idp/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">student.uwasa.fi</shibmd:Scope>
-      <shibmd:Scope regexp="false">uwasa.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>MIIEqDCCA5CgAwIBAgIQcgCjzteE8HeKV2x3ntlDhjANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTExMTExNzAwMDAwMFoXDTE0MTExNjIzNTk1OVowgYMxCzAJBgNV
-BAYTAkZJMRIwEAYDVQQIEwlQb2hqYW5tYWExDjAMBgNVBAcTBVZhYXNhMRwwGgYD
-VQQKExNVbml2ZXJzaXR5IG9mIFZhYXNhMRgwFgYDVQQLEw9Db21wdXRlciBDZW50
-cmUxGDAWBgNVBAMTD2xvZ291dC51d2FzYS5maTCCASIwDQYJKoZIhvcNAQEBBQAD
-ggEPADCCAQoCggEBAOlqHlgGvQm8gVcZPlogrWE4GLRV685h68SRqJlvmyGYhemf
-le48bvk2dKTOjXPZaIf2WcSuJQQZSMUQyeZqMce1yHB1uKW7RW5aitDYPythooWk
-AxT8IMaMRm51Z1mBEZSexkCZdOC6114/e5h69hTLAQyyV5lrallfH7mdPHX6A5iM
-iHNLexj8dwbT3f+ZsYTrlFgBp824m5YjSM1v/7fsDFi1IfQCJQGdeOgNFh6GNHEZ
-Xm+7VE5iMo+moTWGazNrUxrwD4g2GMXQ8xMp75BANG+t5SNgSRnZAJ4V0kBxRYRG
-du2RVmggolzsTCD+5ck1HJ/H1pivPA8L/3sbszsCAwEAAaOCAWIwggFeMB8GA1Ud
-IwQYMBaAFAy9k2gM896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBQrxB8rmzKHgOIo
-eRFp7RmgK1oPbDAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUE
-FjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwGAYDVR0gBBEwDzANBgsrBgEEAbIxAQIC
-HTA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RF
-UkVOQVNTTENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6
-Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzAB
-hhpodHRwOi8vb2NzcC50Y3MudGVyZW5hLm9yZzAaBgNVHREEEzARgg9sb2dvdXQu
-dXdhc2EuZmkwDQYJKoZIhvcNAQEFBQADggEBAG7RlBd8HjkxZsfvOkuwiDfC+I85
-SSFyg83ONrJhyZKn4cOT+Bl3h6tBJRfzGPTeQJJuedw73ZQAKlIuyOla2En8ZUvL
-exmlXhvCTJnMG2EdTFCzKs6gf4hDL1zWCh0GGi7MDNDJ2bB5x9TwrfrEVzdBkGzK
-1ItThd9oaEK6PPAgZ6c36/ZWJE/0jDdpzQWSO8FtQiWSbUT+Ar31FNa1sQgBwxqk
-7oAQfuW9Ixpgt5ex27m8r1X4w6KXs1eoZxZZnF6HaMdEM5qoAYwxkGVMQ9LNLjDM
-OhihSl/iSFoYuQlobOd1BgGV4B9OVOty2YUFFhcl7oLIR1LO53QU9IKq8dQ=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIEmDCCA4CgAwIBAgIQQ5ujEn6A97wMBYf7wCeq2TANBgkqhkiG9w0BAQsFADBk
-MQswCQYDVQQGEwJOTDEWMBQGA1UECBMNTm9vcmQtSG9sbGFuZDESMBAGA1UEBxMJ
-QW1zdGVyZGFtMQ8wDQYDVQQKEwZURVJFTkExGDAWBgNVBAMTD1RFUkVOQSBTU0wg
-Q0EgMjAeFw0xNDEwMjEwMDAwMDBaFw0xNzExMTQyMzU5NTlaMD0xITAfBgNVBAsT
-GERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEYMBYGA1UEAxMPbG9nb3V0LnV3YXNh
-LmZpMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA7/bXKuhTHYn3F5KR
-bV8p0HYCsFVL8qFbZQ2dWTEUGdo8TsFHHJDtd3zdyBH1G90vJhMErfESRX10Za3D
-pdY2FmrujdrYMnC1ehTmOkmbfj+48F7vdGeAEZgR4lDRGG7gFwrya0TdnOJqtgqa
-jDo0hBz1efTIoFijRwvV3rV0COi2DlOsQTyn9s4gIETCmBxQua/a1AvUJ5ZGdyue
-V4GX3SpWAC+4mVATaFhs9a2phFnpdgv9PZ+k4TI/4jdIsF6POU85ysDUqgXL3C5O
-8WfEFdAH6utWVpOF/Vp9xvI1/LY024U1zPXPRyghwhkV1CnSQIfd8aXFmeqOkoTR
-4ALaNwIDAQABo4IBazCCAWcwHwYDVR0jBBgwFoAUW9CKHJoyW+C13ZZUG+GGKLD9
-tr0wHQYDVR0OBBYEFBb2Xwqc+A65TiHhvkiWdjkTUI0HMA4GA1UdDwEB/wQEAwIF
-oDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAi
-BgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNVHR8EMzAxMC+g
-LaArhilodHRwOi8vY3JsLnVzZXJ0cnVzdC5jb20vVEVSRU5BU1NMQ0EyLmNybDBs
-BggrBgEFBQcBAQRgMF4wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudXNlcnRydXN0
-LmNvbS9URVJFTkFTU0xDQTIuY3J0MCUGCCsGAQUFBzABhhlodHRwOi8vb2NzcC51
-c2VydHJ1c3QuY29tMBoGA1UdEQQTMBGCD2xvZ291dC51d2FzYS5maTANBgkqhkiG
-9w0BAQsFAAOCAQEAfqqvlPEDeZ6j/8lMXNMsAZQiDJlbfvxBwj9pSwaCEQ69hZyp
-StSyQwXJWN1EpRzQw23Dn4j0+qgxvyVX/o5rPObIezoCbXBqP5fK0pXuHMkGrDco
-+4pLXY/xDE5sbGszDu9yy1uKlfUBbvCU2KmTpUqAJ1IAu5P6d+705PFYSJGUdBiL
-6x7F70/NW4zXPigoPlExAgMMroLu+S5eJOroW7XXvpytIal1e0VsWwciPQ17BOfh
-ONX9QOl1soU728FwQYCE1dOGmflU0MRBTCkgZQ6CFyXB5u41LQE5gb0S4nLCzD5Y
-yWnv/dMB+aZQxAaxuHvLIP8NFFGK50CgD63Osw==</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://logout.uwasa.fi/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://logout.uwasa.fi/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://logout.uwasa.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">student.uwasa.fi</shibmd:Scope>
-      <shibmd:Scope regexp="false">uwasa.fi</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIEqDCCA5CgAwIBAgIQcgCjzteE8HeKV2x3ntlDhjANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTExMTExNzAwMDAwMFoXDTE0MTExNjIzNTk1OVowgYMxCzAJBgNV
-BAYTAkZJMRIwEAYDVQQIEwlQb2hqYW5tYWExDjAMBgNVBAcTBVZhYXNhMRwwGgYD
-VQQKExNVbml2ZXJzaXR5IG9mIFZhYXNhMRgwFgYDVQQLEw9Db21wdXRlciBDZW50
-cmUxGDAWBgNVBAMTD2xvZ291dC51d2FzYS5maTCCASIwDQYJKoZIhvcNAQEBBQAD
-ggEPADCCAQoCggEBAOlqHlgGvQm8gVcZPlogrWE4GLRV685h68SRqJlvmyGYhemf
-le48bvk2dKTOjXPZaIf2WcSuJQQZSMUQyeZqMce1yHB1uKW7RW5aitDYPythooWk
-AxT8IMaMRm51Z1mBEZSexkCZdOC6114/e5h69hTLAQyyV5lrallfH7mdPHX6A5iM
-iHNLexj8dwbT3f+ZsYTrlFgBp824m5YjSM1v/7fsDFi1IfQCJQGdeOgNFh6GNHEZ
-Xm+7VE5iMo+moTWGazNrUxrwD4g2GMXQ8xMp75BANG+t5SNgSRnZAJ4V0kBxRYRG
-du2RVmggolzsTCD+5ck1HJ/H1pivPA8L/3sbszsCAwEAAaOCAWIwggFeMB8GA1Ud
-IwQYMBaAFAy9k2gM896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBQrxB8rmzKHgOIo
-eRFp7RmgK1oPbDAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUE
-FjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwGAYDVR0gBBEwDzANBgsrBgEEAbIxAQIC
-HTA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RF
-UkVOQVNTTENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6
-Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzAB
-hhpodHRwOi8vb2NzcC50Y3MudGVyZW5hLm9yZzAaBgNVHREEEzARgg9sb2dvdXQu
-dXdhc2EuZmkwDQYJKoZIhvcNAQEFBQADggEBAG7RlBd8HjkxZsfvOkuwiDfC+I85
-SSFyg83ONrJhyZKn4cOT+Bl3h6tBJRfzGPTeQJJuedw73ZQAKlIuyOla2En8ZUvL
-exmlXhvCTJnMG2EdTFCzKs6gf4hDL1zWCh0GGi7MDNDJ2bB5x9TwrfrEVzdBkGzK
-1ItThd9oaEK6PPAgZ6c36/ZWJE/0jDdpzQWSO8FtQiWSbUT+Ar31FNa1sQgBwxqk
-7oAQfuW9Ixpgt5ex27m8r1X4w6KXs1eoZxZZnF6HaMdEM5qoAYwxkGVMQ9LNLjDM
-OhihSl/iSFoYuQlobOd1BgGV4B9OVOty2YUFFhcl7oLIR1LO53QU9IKq8dQ=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIEmDCCA4CgAwIBAgIQQ5ujEn6A97wMBYf7wCeq2TANBgkqhkiG9w0BAQsFADBk
-MQswCQYDVQQGEwJOTDEWMBQGA1UECBMNTm9vcmQtSG9sbGFuZDESMBAGA1UEBxMJ
-QW1zdGVyZGFtMQ8wDQYDVQQKEwZURVJFTkExGDAWBgNVBAMTD1RFUkVOQSBTU0wg
-Q0EgMjAeFw0xNDEwMjEwMDAwMDBaFw0xNzExMTQyMzU5NTlaMD0xITAfBgNVBAsT
-GERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEYMBYGA1UEAxMPbG9nb3V0LnV3YXNh
-LmZpMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA7/bXKuhTHYn3F5KR
-bV8p0HYCsFVL8qFbZQ2dWTEUGdo8TsFHHJDtd3zdyBH1G90vJhMErfESRX10Za3D
-pdY2FmrujdrYMnC1ehTmOkmbfj+48F7vdGeAEZgR4lDRGG7gFwrya0TdnOJqtgqa
-jDo0hBz1efTIoFijRwvV3rV0COi2DlOsQTyn9s4gIETCmBxQua/a1AvUJ5ZGdyue
-V4GX3SpWAC+4mVATaFhs9a2phFnpdgv9PZ+k4TI/4jdIsF6POU85ysDUqgXL3C5O
-8WfEFdAH6utWVpOF/Vp9xvI1/LY024U1zPXPRyghwhkV1CnSQIfd8aXFmeqOkoTR
-4ALaNwIDAQABo4IBazCCAWcwHwYDVR0jBBgwFoAUW9CKHJoyW+C13ZZUG+GGKLD9
-tr0wHQYDVR0OBBYEFBb2Xwqc+A65TiHhvkiWdjkTUI0HMA4GA1UdDwEB/wQEAwIF
-oDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAi
-BgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNVHR8EMzAxMC+g
-LaArhilodHRwOi8vY3JsLnVzZXJ0cnVzdC5jb20vVEVSRU5BU1NMQ0EyLmNybDBs
-BggrBgEFBQcBAQRgMF4wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudXNlcnRydXN0
-LmNvbS9URVJFTkFTU0xDQTIuY3J0MCUGCCsGAQUFBzABhhlodHRwOi8vb2NzcC51
-c2VydHJ1c3QuY29tMBoGA1UdEQQTMBGCD2xvZ291dC51d2FzYS5maTANBgkqhkiG
-9w0BAQsFAAOCAQEAfqqvlPEDeZ6j/8lMXNMsAZQiDJlbfvxBwj9pSwaCEQ69hZyp
-StSyQwXJWN1EpRzQw23Dn4j0+qgxvyVX/o5rPObIezoCbXBqP5fK0pXuHMkGrDco
-+4pLXY/xDE5sbGszDu9yy1uKlfUBbvCU2KmTpUqAJ1IAu5P6d+705PFYSJGUdBiL
-6x7F70/NW4zXPigoPlExAgMMroLu+S5eJOroW7XXvpytIal1e0VsWwciPQ17BOfh
-ONX9QOl1soU728FwQYCE1dOGmflU0MRBTCkgZQ6CFyXB5u41LQE5gb0S4nLCzD5Y
-yWnv/dMB+aZQxAaxuHvLIP8NFFGK50CgD63Osw==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://logout.uwasa.fi:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://logout.uwasa.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">Vaasan yliopisto</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">University of Vaasa</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">Vasa Universitet</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="fi">Vaasan yliopisto</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">University of Vaasa</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="sv">Vasa Universitet</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="fi">http://www.uwasa.fi/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.uwasa.fi/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sv">http://www.uwasa.fi/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Sami</md:GivenName>
-    <md:SurName>Kinnunen</md:SurName>
-    <md:EmailAddress>mailto:authadm@uwasa.fi</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Sami</md:GivenName>
-    <md:SurName>Kinnunen</md:SurName>
-    <md:EmailAddress>mailto:skk@uwasa.fi</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/lu-idp.lu.lv.xml b/swamid-interfederations-2.0/lu-idp.lu.lv.xml
deleted file mode 100644
index 5454c0d7..00000000
--- a/swamid-interfederations-2.0/lu-idp.lu.lv.xml
+++ /dev/null
@@ -1,47 +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://lu-idp.lu.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/" registrationInstant="2013-10-10T10:10:10Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://laife.lanet.lv/wiki/Latvian-Academic-Identity-Federation-Policy.pdf</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-      <mdui:GeolocationHint>geo:56.950974,24.116292</mdui:GeolocationHint>
-    </mdui:DiscoHints>
-    <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-      <mdui:Logo height="64" width="64">http://net.lu.lv/icon-lu.png</mdui:Logo>
-    </mdui:UIInfo>
-  </Extensions>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDhjCCAm4CCQC8Px9pbIuxGDANBgkqhkiG9w0BAQUFADCBhDELMAkGA1UEBhMCTFYxDTALBgNVBAgMBFJpZ2ExDTALBgNVBAcMBFJpZ2ExCzAJBgNVBAoMAkxVMQwwCgYDVQQLDANJVEQxFTATBgNVBAMMDGx1LWlkcC5sdS5sdjElMCMGCSqGSIb3DQEJARYWaXRzZXJ2aXNzIGF0IGx1IGRvdCBsdjAeFw0xMzEyMjAxMDU3MDJaFw0yOTAzMDYxMDU3MDJaMIGEMQswCQYDVQQGEwJMVjENMAsGA1UECAwEUmlnYTENMAsGA1UEBwwEUmlnYTELMAkGA1UECgwCTFUxDDAKBgNVBAsMA0lURDEVMBMGA1UEAwwMbHUtaWRwLmx1Lmx2MSUwIwYJKoZIhvcNAQkBFhZpdHNlcnZpc3MgYXQgbHUgZG90IGx2MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuAy8ri5VknGxy21iuW6kalPwg7VPZBWOuV/jVjRre44tHFd5FinCQUCuzQZn37AU3ZNZg07RRyDhkAzzpsBRQf48VcbnQFRjERuQTKUfT9hzFMxgbjxW2Dayg2Ru2LkGcIUeHilOwfmRn1NIRBN+0UyJIluRvB8YGdHSSHYSMimyw9uYEuMkU9aqewwW78w7TeasCWlB6jiGfJ/SGVtPRThJ6X6KVqoU2gwIY+V7YJkG4b5TOw4HLaIsdOmU4h1Ep3igy+Zsc/7zPn+80iwm1Jk9Q8zGlEwikjPn1N3enMOxR8wpQfAQwm5lIaHNXYFcXCj3mVQ3yQ9EzB/hRC8tHwIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQCFRpI7U/lTwoUW/HwDb2gAmjb0RSmS+5lUWDgmjP/rJwYdh672plabNcY12DiqchtBaSeTOf4qANCqEme+YBAmssFUeLx6O1J+5aXeXfCwAA9GlswGDVeC8ZnTVmQupnbvL0T+ZU8WtkltlLEJdD6o9BtEOqk3+Rspu+94d6FUwmvWB/YWypAOfzXkkSxi+87nsadiFEOyCzTW8fZotOrZMzba52ELLJgCx3IzGLUzV80PSJwLzKYHVp0VluH2DzrxfMKC01bMklG46n1nhEo1UU2KA4vzoScmrXzD+m7nKFZ3GHFjyQvtxqG7gA34qg1Vj2o2O0vN/kvjX73SR5s4
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDhjCCAm4CCQC8Px9pbIuxGDANBgkqhkiG9w0BAQUFADCBhDELMAkGA1UEBhMCTFYxDTALBgNVBAgMBFJpZ2ExDTALBgNVBAcMBFJpZ2ExCzAJBgNVBAoMAkxVMQwwCgYDVQQLDANJVEQxFTATBgNVBAMMDGx1LWlkcC5sdS5sdjElMCMGCSqGSIb3DQEJARYWaXRzZXJ2aXNzIGF0IGx1IGRvdCBsdjAeFw0xMzEyMjAxMDU3MDJaFw0yOTAzMDYxMDU3MDJaMIGEMQswCQYDVQQGEwJMVjENMAsGA1UECAwEUmlnYTENMAsGA1UEBwwEUmlnYTELMAkGA1UECgwCTFUxDDAKBgNVBAsMA0lURDEVMBMGA1UEAwwMbHUtaWRwLmx1Lmx2MSUwIwYJKoZIhvcNAQkBFhZpdHNlcnZpc3MgYXQgbHUgZG90IGx2MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuAy8ri5VknGxy21iuW6kalPwg7VPZBWOuV/jVjRre44tHFd5FinCQUCuzQZn37AU3ZNZg07RRyDhkAzzpsBRQf48VcbnQFRjERuQTKUfT9hzFMxgbjxW2Dayg2Ru2LkGcIUeHilOwfmRn1NIRBN+0UyJIluRvB8YGdHSSHYSMimyw9uYEuMkU9aqewwW78w7TeasCWlB6jiGfJ/SGVtPRThJ6X6KVqoU2gwIY+V7YJkG4b5TOw4HLaIsdOmU4h1Ep3igy+Zsc/7zPn+80iwm1Jk9Q8zGlEwikjPn1N3enMOxR8wpQfAQwm5lIaHNXYFcXCj3mVQ3yQ9EzB/hRC8tHwIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQCFRpI7U/lTwoUW/HwDb2gAmjb0RSmS+5lUWDgmjP/rJwYdh672plabNcY12DiqchtBaSeTOf4qANCqEme+YBAmssFUeLx6O1J+5aXeXfCwAA9GlswGDVeC8ZnTVmQupnbvL0T+ZU8WtkltlLEJdD6o9BtEOqk3+Rspu+94d6FUwmvWB/YWypAOfzXkkSxi+87nsadiFEOyCzTW8fZotOrZMzba52ELLJgCx3IzGLUzV80PSJwLzKYHVp0VluH2DzrxfMKC01bMklG46n1nhEo1UU2KA4vzoScmrXzD+m7nKFZ3GHFjyQvtxqG7gA34qg1Vj2o2O0vN/kvjX73SR5s4
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://lu-idp.lu.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://lu-idp.lu.lv/simplesaml/saml2/idp/SSOService.php"/>
-  </md:IDPSSODescriptor>
-  <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
-    <OrganizationName xml:lang="en">LAIFE - LU</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Latvia - LU IDP</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://laife.lanet.lv/</OrganizationURL>
-    <OrganizationURL xml:lang="lv">http://www.lu.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/marreco.ifsuldeminas.edu.br-idp-shibboleth.xml b/swamid-interfederations-2.0/marreco.ifsuldeminas.edu.br-idp-shibboleth.xml
deleted file mode 100644
index 379abf46..00000000
--- a/swamid-interfederations-2.0/marreco.ifsuldeminas.edu.br-idp-shibboleth.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://marreco.ifsuldeminas.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">edu.br</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">IFSULDEMINAS - Instituto Federal de Educacao, Ciencia e Tecnologia Sul de Minas Gerais</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="pt-br">IFSULDEMINAS - Instituto Federal de Educacao, Ciencia e Tecnologia Sul de Minas Gerais</mdui:DisplayName>
-        <mdui:Description xml:lang="en">IFSULDEMINAS - Instituto Federal de Educacao, Ciencia e Tecnologia Sul de Minas Gerais</mdui:Description>
-        <mdui:Description xml:lang="pt-br">IFSULDEMINAS - Instituto Federal de Educacao, Ciencia e Tecnologia Sul de Minas Gerais</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.ifsuldeminas.edu.br</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="pt-br">http://www.ifsuldeminas.edu.br</mdui:InformationURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-    MIIDzjCCArYCAQAwDQYJKoZIhvcNAQEFBQAwgawxEDAOBgNVBAoTB0lGU3VsTUcx
-DTALBgNVBAsTBERHVEkxKDAmBgkqhkiG9w0BCQEWGXJlZGVzQGlmc3VsZGVtaW5h
-cy5lZHUuYnIxFTATBgNVBAcTDFBvdXNvIEFsZWdyZTEVMBMGA1UECBMMTWluYXMg
-R2VyYWlzMQswCQYDVQQGEwJCUjEkMCIGA1UEAxMbbWFycmVjby5pZnN1bGRlbWlu
-YXMuZWR1LmJyMB4XDTE0MDgxMzE4MDQxOFoXDTE3MDgxMjE4MDQxOFowgawxEDAO
-BgNVBAoTB0lGU3VsTUcxDTALBgNVBAsTBERHVEkxKDAmBgkqhkiG9w0BCQEWGXJl
-ZGVzQGlmc3VsZGVtaW5hcy5lZHUuYnIxFTATBgNVBAcTDFBvdXNvIEFsZWdyZTEV
-MBMGA1UECBMMTWluYXMgR2VyYWlzMQswCQYDVQQGEwJCUjEkMCIGA1UEAxMbbWFy
-cmVjby5pZnN1bGRlbWluYXMuZWR1LmJyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
-MIIBCgKCAQEAm2G39mQLF6PtP9yQ9r1eG9BB4CC+gdwgj+AmrhyYAwHlcTiRaWNo
-8AE4cvo23i5Wl3wSSGTLVxA8aGWXP0gFYFJQ53r/7k0LZoSsoQVQFpUP5niY9ZI1
-hixiFsvNayQTp/cGJF/WyKzvIs6YsFnoMazjSQYVtC1cciraGJrF1cFLltab5ETj
-vBG9jVs8bJK+98/FgbAHomZnjuYV2ohoXpqNGl0nb7wX++24ucIhJ4XSUYSd7DLM
-jPSQIsEfDo3857dQj00/UcjRiBsKb5jr66VCRJ1m+in8WAf2htC4XhtPxX7Pn9tw
-ljSUVu4w99synaTNpKmVZ6C1orKGy+WFjQIDAQABMA0GCSqGSIb3DQEBBQUAA4IB
-AQAbH/Qk1f0GPuG5FVA+RRnT4zCZBIq4NMPoK0S8mpjSTgGjenezQwwKWhuk/AKG
-qrrUxlJjV6hcMPDi7iFdIOiaVACNAX5n2mOlmeVeYWIrx5vcUu+UahoOsc0DuNHI
-svUttVic+ZMMAxiLXKULW3UY2w1NnxyfMnLuWdgMnAnP/k8Sils+k4J1YypmHR2o
-ZoVaASv7o3le6wJtM415/rrhZ30hHei1enZf3Nul5NiZNxTU3eD7ijkPeKduCNoj
-x/USSNxCh4YzSmU2UWPjPNR0CTdzDlbTQaFqPnhJ4B2fquVT9s/kO8jgJ03t3UlF
-XcsDTkgAli2ZOTFPSACYrL9s
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://marreco.ifsuldeminas.edu.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://marreco.ifsuldeminas.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://marreco.ifsuldeminas.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://marreco.ifsuldeminas.edu.br/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://marreco.ifsuldeminas.edu.br/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://marreco.ifsuldeminas.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>
-      
-MIIDzjCCArYCAQAwDQYJKoZIhvcNAQEFBQAwgawxEDAOBgNVBAoTB0lGU3VsTUcx
-DTALBgNVBAsTBERHVEkxKDAmBgkqhkiG9w0BCQEWGXJlZGVzQGlmc3VsZGVtaW5h
-cy5lZHUuYnIxFTATBgNVBAcTDFBvdXNvIEFsZWdyZTEVMBMGA1UECBMMTWluYXMg
-R2VyYWlzMQswCQYDVQQGEwJCUjEkMCIGA1UEAxMbbWFycmVjby5pZnN1bGRlbWlu
-YXMuZWR1LmJyMB4XDTE0MDgxMzE4MDQxOFoXDTE3MDgxMjE4MDQxOFowgawxEDAO
-BgNVBAoTB0lGU3VsTUcxDTALBgNVBAsTBERHVEkxKDAmBgkqhkiG9w0BCQEWGXJl
-ZGVzQGlmc3VsZGVtaW5hcy5lZHUuYnIxFTATBgNVBAcTDFBvdXNvIEFsZWdyZTEV
-MBMGA1UECBMMTWluYXMgR2VyYWlzMQswCQYDVQQGEwJCUjEkMCIGA1UEAxMbbWFy
-cmVjby5pZnN1bGRlbWluYXMuZWR1LmJyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
-MIIBCgKCAQEAm2G39mQLF6PtP9yQ9r1eG9BB4CC+gdwgj+AmrhyYAwHlcTiRaWNo
-8AE4cvo23i5Wl3wSSGTLVxA8aGWXP0gFYFJQ53r/7k0LZoSsoQVQFpUP5niY9ZI1
-hixiFsvNayQTp/cGJF/WyKzvIs6YsFnoMazjSQYVtC1cciraGJrF1cFLltab5ETj
-vBG9jVs8bJK+98/FgbAHomZnjuYV2ohoXpqNGl0nb7wX++24ucIhJ4XSUYSd7DLM
-jPSQIsEfDo3857dQj00/UcjRiBsKb5jr66VCRJ1m+in8WAf2htC4XhtPxX7Pn9tw
-ljSUVu4w99synaTNpKmVZ6C1orKGy+WFjQIDAQABMA0GCSqGSIb3DQEBBQUAA4IB
-AQAbH/Qk1f0GPuG5FVA+RRnT4zCZBIq4NMPoK0S8mpjSTgGjenezQwwKWhuk/AKG
-qrrUxlJjV6hcMPDi7iFdIOiaVACNAX5n2mOlmeVeYWIrx5vcUu+UahoOsc0DuNHI
-svUttVic+ZMMAxiLXKULW3UY2w1NnxyfMnLuWdgMnAnP/k8Sils+k4J1YypmHR2o
-ZoVaASv7o3le6wJtM415/rrhZ30hHei1enZf3Nul5NiZNxTU3eD7ijkPeKduCNoj
-x/USSNxCh4YzSmU2UWPjPNR0CTdzDlbTQaFqPnhJ4B2fquVT9s/kO8jgJ03t3UlF
-XcsDTkgAli2ZOTFPSACYrL9s
-                    
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://marreco.ifsuldeminas.edu.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://marreco.ifsuldeminas.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">IFSULDEMINAS - Instituto Federal de Educacao, Ciencia e Tecnologia Sul de Minas Gerais</OrganizationName>
-    <OrganizationName xml:lang="pt-br">IFSULDEMINAS - Instituto Federal de Educacao, Ciencia e Tecnologia Sul de Minas Gerais</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">IFSULDEMINAS - Instituto Federal de Educacao, Ciencia e Tecnologia Sul de Minas Gerais</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="pt-br">IFSULDEMINAS - Instituto Federal de Educacao, Ciencia e Tecnologia Sul de Minas Gerais</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.ifsuldeminas.edu.br</OrganizationURL>
-    <OrganizationURL xml:lang="pt-br">http://www.ifsuldeminas.edu.br</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Marcio Prado</SurName>
-    <EmailAddress>redes@ifsuldeminas.edu.br</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/marreco.ifsuldeminas.edu.br.xml b/swamid-interfederations-2.0/marreco.ifsuldeminas.edu.br.xml
deleted file mode 100644
index 379abf46..00000000
--- a/swamid-interfederations-2.0/marreco.ifsuldeminas.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://marreco.ifsuldeminas.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">edu.br</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">IFSULDEMINAS - Instituto Federal de Educacao, Ciencia e Tecnologia Sul de Minas Gerais</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="pt-br">IFSULDEMINAS - Instituto Federal de Educacao, Ciencia e Tecnologia Sul de Minas Gerais</mdui:DisplayName>
-        <mdui:Description xml:lang="en">IFSULDEMINAS - Instituto Federal de Educacao, Ciencia e Tecnologia Sul de Minas Gerais</mdui:Description>
-        <mdui:Description xml:lang="pt-br">IFSULDEMINAS - Instituto Federal de Educacao, Ciencia e Tecnologia Sul de Minas Gerais</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.ifsuldeminas.edu.br</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="pt-br">http://www.ifsuldeminas.edu.br</mdui:InformationURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-    MIIDzjCCArYCAQAwDQYJKoZIhvcNAQEFBQAwgawxEDAOBgNVBAoTB0lGU3VsTUcx
-DTALBgNVBAsTBERHVEkxKDAmBgkqhkiG9w0BCQEWGXJlZGVzQGlmc3VsZGVtaW5h
-cy5lZHUuYnIxFTATBgNVBAcTDFBvdXNvIEFsZWdyZTEVMBMGA1UECBMMTWluYXMg
-R2VyYWlzMQswCQYDVQQGEwJCUjEkMCIGA1UEAxMbbWFycmVjby5pZnN1bGRlbWlu
-YXMuZWR1LmJyMB4XDTE0MDgxMzE4MDQxOFoXDTE3MDgxMjE4MDQxOFowgawxEDAO
-BgNVBAoTB0lGU3VsTUcxDTALBgNVBAsTBERHVEkxKDAmBgkqhkiG9w0BCQEWGXJl
-ZGVzQGlmc3VsZGVtaW5hcy5lZHUuYnIxFTATBgNVBAcTDFBvdXNvIEFsZWdyZTEV
-MBMGA1UECBMMTWluYXMgR2VyYWlzMQswCQYDVQQGEwJCUjEkMCIGA1UEAxMbbWFy
-cmVjby5pZnN1bGRlbWluYXMuZWR1LmJyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
-MIIBCgKCAQEAm2G39mQLF6PtP9yQ9r1eG9BB4CC+gdwgj+AmrhyYAwHlcTiRaWNo
-8AE4cvo23i5Wl3wSSGTLVxA8aGWXP0gFYFJQ53r/7k0LZoSsoQVQFpUP5niY9ZI1
-hixiFsvNayQTp/cGJF/WyKzvIs6YsFnoMazjSQYVtC1cciraGJrF1cFLltab5ETj
-vBG9jVs8bJK+98/FgbAHomZnjuYV2ohoXpqNGl0nb7wX++24ucIhJ4XSUYSd7DLM
-jPSQIsEfDo3857dQj00/UcjRiBsKb5jr66VCRJ1m+in8WAf2htC4XhtPxX7Pn9tw
-ljSUVu4w99synaTNpKmVZ6C1orKGy+WFjQIDAQABMA0GCSqGSIb3DQEBBQUAA4IB
-AQAbH/Qk1f0GPuG5FVA+RRnT4zCZBIq4NMPoK0S8mpjSTgGjenezQwwKWhuk/AKG
-qrrUxlJjV6hcMPDi7iFdIOiaVACNAX5n2mOlmeVeYWIrx5vcUu+UahoOsc0DuNHI
-svUttVic+ZMMAxiLXKULW3UY2w1NnxyfMnLuWdgMnAnP/k8Sils+k4J1YypmHR2o
-ZoVaASv7o3le6wJtM415/rrhZ30hHei1enZf3Nul5NiZNxTU3eD7ijkPeKduCNoj
-x/USSNxCh4YzSmU2UWPjPNR0CTdzDlbTQaFqPnhJ4B2fquVT9s/kO8jgJ03t3UlF
-XcsDTkgAli2ZOTFPSACYrL9s
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://marreco.ifsuldeminas.edu.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://marreco.ifsuldeminas.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://marreco.ifsuldeminas.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://marreco.ifsuldeminas.edu.br/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://marreco.ifsuldeminas.edu.br/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://marreco.ifsuldeminas.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>
-      
-MIIDzjCCArYCAQAwDQYJKoZIhvcNAQEFBQAwgawxEDAOBgNVBAoTB0lGU3VsTUcx
-DTALBgNVBAsTBERHVEkxKDAmBgkqhkiG9w0BCQEWGXJlZGVzQGlmc3VsZGVtaW5h
-cy5lZHUuYnIxFTATBgNVBAcTDFBvdXNvIEFsZWdyZTEVMBMGA1UECBMMTWluYXMg
-R2VyYWlzMQswCQYDVQQGEwJCUjEkMCIGA1UEAxMbbWFycmVjby5pZnN1bGRlbWlu
-YXMuZWR1LmJyMB4XDTE0MDgxMzE4MDQxOFoXDTE3MDgxMjE4MDQxOFowgawxEDAO
-BgNVBAoTB0lGU3VsTUcxDTALBgNVBAsTBERHVEkxKDAmBgkqhkiG9w0BCQEWGXJl
-ZGVzQGlmc3VsZGVtaW5hcy5lZHUuYnIxFTATBgNVBAcTDFBvdXNvIEFsZWdyZTEV
-MBMGA1UECBMMTWluYXMgR2VyYWlzMQswCQYDVQQGEwJCUjEkMCIGA1UEAxMbbWFy
-cmVjby5pZnN1bGRlbWluYXMuZWR1LmJyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
-MIIBCgKCAQEAm2G39mQLF6PtP9yQ9r1eG9BB4CC+gdwgj+AmrhyYAwHlcTiRaWNo
-8AE4cvo23i5Wl3wSSGTLVxA8aGWXP0gFYFJQ53r/7k0LZoSsoQVQFpUP5niY9ZI1
-hixiFsvNayQTp/cGJF/WyKzvIs6YsFnoMazjSQYVtC1cciraGJrF1cFLltab5ETj
-vBG9jVs8bJK+98/FgbAHomZnjuYV2ohoXpqNGl0nb7wX++24ucIhJ4XSUYSd7DLM
-jPSQIsEfDo3857dQj00/UcjRiBsKb5jr66VCRJ1m+in8WAf2htC4XhtPxX7Pn9tw
-ljSUVu4w99synaTNpKmVZ6C1orKGy+WFjQIDAQABMA0GCSqGSIb3DQEBBQUAA4IB
-AQAbH/Qk1f0GPuG5FVA+RRnT4zCZBIq4NMPoK0S8mpjSTgGjenezQwwKWhuk/AKG
-qrrUxlJjV6hcMPDi7iFdIOiaVACNAX5n2mOlmeVeYWIrx5vcUu+UahoOsc0DuNHI
-svUttVic+ZMMAxiLXKULW3UY2w1NnxyfMnLuWdgMnAnP/k8Sils+k4J1YypmHR2o
-ZoVaASv7o3le6wJtM415/rrhZ30hHei1enZf3Nul5NiZNxTU3eD7ijkPeKduCNoj
-x/USSNxCh4YzSmU2UWPjPNR0CTdzDlbTQaFqPnhJ4B2fquVT9s/kO8jgJ03t3UlF
-XcsDTkgAli2ZOTFPSACYrL9s
-                    
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://marreco.ifsuldeminas.edu.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://marreco.ifsuldeminas.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">IFSULDEMINAS - Instituto Federal de Educacao, Ciencia e Tecnologia Sul de Minas Gerais</OrganizationName>
-    <OrganizationName xml:lang="pt-br">IFSULDEMINAS - Instituto Federal de Educacao, Ciencia e Tecnologia Sul de Minas Gerais</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">IFSULDEMINAS - Instituto Federal de Educacao, Ciencia e Tecnologia Sul de Minas Gerais</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="pt-br">IFSULDEMINAS - Instituto Federal de Educacao, Ciencia e Tecnologia Sul de Minas Gerais</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.ifsuldeminas.edu.br</OrganizationURL>
-    <OrganizationURL xml:lang="pt-br">http://www.ifsuldeminas.edu.br</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Marcio Prado</SurName>
-    <EmailAddress>redes@ifsuldeminas.edu.br</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/marte.ifsertao-pe.edu.br-idp-shibboleth.xml b/swamid-interfederations-2.0/marte.ifsertao-pe.edu.br-idp-shibboleth.xml
deleted file mode 100644
index 3e3c7e64..00000000
--- a/swamid-interfederations-2.0/marte.ifsertao-pe.edu.br-idp-shibboleth.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://marte.ifsertao-pe.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">edu.br</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">IFSERTAO-PE - Instituto Federal do Sertao Pernambucano</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="pt-br">IFSERTAO-PE - Instituto Federal do Sertao Pernambucano</mdui:DisplayName>
-        <mdui:Description xml:lang="en">IFSERTAO-PE - Instituto Federal do Sertao Pernambucano</mdui:Description>
-        <mdui:Description xml:lang="pt-br">IFSERTAO-PE - Instituto Federal do Sertao Pernambucano</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.ifsertao-pe.edu.br</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="pt-br">http://www.ifsertao-pe.edu.br</mdui:InformationURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-    MIIDwjCCAqoCAQAwDQYJKoZIhvcNAQEFBQAwgaYxFDASBgNVBAoTC0lGU0VSVEFP
-LVBFMQ0wCwYDVQQLEwRER1RJMSYwJAYJKoZIhvcNAQkBFhdjYWZlQGlmc2VydGFv
-LXBlLmVkdS5icjESMBAGA1UEBxMJUGV0cm9saW5hMRMwEQYDVQQIEwpQZXJuYW1i
-dWNvMQswCQYDVQQGEwJCUjEhMB8GA1UEAxMYbWFydGUuaWZzZXJ0YW8tcGUuZWR1
-LmJyMB4XDTEzMTIwNDEzMjExOFoXDTE2MTIwMzEzMjExOFowgaYxFDASBgNVBAoT
-C0lGU0VSVEFPLVBFMQ0wCwYDVQQLEwRER1RJMSYwJAYJKoZIhvcNAQkBFhdjYWZl
-QGlmc2VydGFvLXBlLmVkdS5icjESMBAGA1UEBxMJUGV0cm9saW5hMRMwEQYDVQQI
-EwpQZXJuYW1idWNvMQswCQYDVQQGEwJCUjEhMB8GA1UEAxMYbWFydGUuaWZzZXJ0
-YW8tcGUuZWR1LmJyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA0JDE
-PZ1eD+TXUZG+HP4FX/SfAqONECwpduJLWNaX2VSorGCmNyQfjyFil0Fce0RdxL2B
-oLc/B4EgGvm9/KCEnhK8EwhWIy9eAi34mJ6dsQnYL40afuO2NFBiGc7TeB+Lj3Hj
-Z/y5g40t50LCnwWUrqzNedUbSLtmJVXWIwn9iO0jPuHuemhTs7YiSt+qIBzBpY2g
-7AeeNkE8VQoJwUFaj5mlmtE4SU9WgURp+u7k05q9La8nIn/xfHFcuVMEzGvQcHsR
-T8lyvJMBjcVJsiJeNCD565GdRTfu3W4tlysQQBM2V/uttteCZ8BpdMQLOop0oNbh
-BPHafdSvF8bLnebtcwIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQBwKBvF2yL3oSI9
-sqKlq1ktY18vHBT58Lc928kyVOWSQH+nDGGJsYOYXCh+zJQdq8Ow3aZA7tXQili3
-avGOhmOM5LfaRvkWCEigfw5frMj4/gRDXk0I7mONk5o5c47XxhSjHg2OiGpQQdqm
-/6MnIQMt98zXoy47mzCtkdgH3qc+hvv2biZtFExcmuZsbjun9TbaCQs1WlTX4Yr9
-ICLuROVF4HNDdN1IeVc+YjL3dIZBw294A3cg8CpSY+5qKEBJF6MgRzrDPy2vzTGP
-UeJoFHTC661va14QsI92zQQCObT42jGq0hRml0MKslZo+c7Cwet0N1xBPQmkjNbe
-DH5XzO/u
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://marte.ifsertao-pe.edu.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://marte.ifsertao-pe.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://marte.ifsertao-pe.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://marte.ifsertao-pe.edu.br/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://marte.ifsertao-pe.edu.br/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://marte.ifsertao-pe.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>
-      
-MIIDwjCCAqoCAQAwDQYJKoZIhvcNAQEFBQAwgaYxFDASBgNVBAoTC0lGU0VSVEFP
-LVBFMQ0wCwYDVQQLEwRER1RJMSYwJAYJKoZIhvcNAQkBFhdjYWZlQGlmc2VydGFv
-LXBlLmVkdS5icjESMBAGA1UEBxMJUGV0cm9saW5hMRMwEQYDVQQIEwpQZXJuYW1i
-dWNvMQswCQYDVQQGEwJCUjEhMB8GA1UEAxMYbWFydGUuaWZzZXJ0YW8tcGUuZWR1
-LmJyMB4XDTEzMTIwNDEzMjExOFoXDTE2MTIwMzEzMjExOFowgaYxFDASBgNVBAoT
-C0lGU0VSVEFPLVBFMQ0wCwYDVQQLEwRER1RJMSYwJAYJKoZIhvcNAQkBFhdjYWZl
-QGlmc2VydGFvLXBlLmVkdS5icjESMBAGA1UEBxMJUGV0cm9saW5hMRMwEQYDVQQI
-EwpQZXJuYW1idWNvMQswCQYDVQQGEwJCUjEhMB8GA1UEAxMYbWFydGUuaWZzZXJ0
-YW8tcGUuZWR1LmJyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA0JDE
-PZ1eD+TXUZG+HP4FX/SfAqONECwpduJLWNaX2VSorGCmNyQfjyFil0Fce0RdxL2B
-oLc/B4EgGvm9/KCEnhK8EwhWIy9eAi34mJ6dsQnYL40afuO2NFBiGc7TeB+Lj3Hj
-Z/y5g40t50LCnwWUrqzNedUbSLtmJVXWIwn9iO0jPuHuemhTs7YiSt+qIBzBpY2g
-7AeeNkE8VQoJwUFaj5mlmtE4SU9WgURp+u7k05q9La8nIn/xfHFcuVMEzGvQcHsR
-T8lyvJMBjcVJsiJeNCD565GdRTfu3W4tlysQQBM2V/uttteCZ8BpdMQLOop0oNbh
-BPHafdSvF8bLnebtcwIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQBwKBvF2yL3oSI9
-sqKlq1ktY18vHBT58Lc928kyVOWSQH+nDGGJsYOYXCh+zJQdq8Ow3aZA7tXQili3
-avGOhmOM5LfaRvkWCEigfw5frMj4/gRDXk0I7mONk5o5c47XxhSjHg2OiGpQQdqm
-/6MnIQMt98zXoy47mzCtkdgH3qc+hvv2biZtFExcmuZsbjun9TbaCQs1WlTX4Yr9
-ICLuROVF4HNDdN1IeVc+YjL3dIZBw294A3cg8CpSY+5qKEBJF6MgRzrDPy2vzTGP
-UeJoFHTC661va14QsI92zQQCObT42jGq0hRml0MKslZo+c7Cwet0N1xBPQmkjNbe
-DH5XzO/u
-                    
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://marte.ifsertao-pe.edu.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://marte.ifsertao-pe.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">IFSERTAO-PE - Instituto Federal do Sertao Pernambucano</OrganizationName>
-    <OrganizationName xml:lang="pt-br">IFSERTAO-PE - Instituto Federal do Sertao Pernambucano</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">IFSERTAO-PE - Instituto Federal do Sertao Pernambucano</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="pt-br">IFSERTAO-PE - Instituto Federal do Sertao Pernambucano</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.ifsertao-pe.edu.br</OrganizationURL>
-    <OrganizationURL xml:lang="pt-br">http://www.ifsertao-pe.edu.br</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Francisco Hamilton</SurName>
-    <EmailAddress>cafe@ifsertao-pe.edu.br</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/marte.ifsertao-pe.edu.br.xml b/swamid-interfederations-2.0/marte.ifsertao-pe.edu.br.xml
deleted file mode 100644
index 3e3c7e64..00000000
--- a/swamid-interfederations-2.0/marte.ifsertao-pe.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://marte.ifsertao-pe.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">edu.br</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">IFSERTAO-PE - Instituto Federal do Sertao Pernambucano</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="pt-br">IFSERTAO-PE - Instituto Federal do Sertao Pernambucano</mdui:DisplayName>
-        <mdui:Description xml:lang="en">IFSERTAO-PE - Instituto Federal do Sertao Pernambucano</mdui:Description>
-        <mdui:Description xml:lang="pt-br">IFSERTAO-PE - Instituto Federal do Sertao Pernambucano</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.ifsertao-pe.edu.br</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="pt-br">http://www.ifsertao-pe.edu.br</mdui:InformationURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-    MIIDwjCCAqoCAQAwDQYJKoZIhvcNAQEFBQAwgaYxFDASBgNVBAoTC0lGU0VSVEFP
-LVBFMQ0wCwYDVQQLEwRER1RJMSYwJAYJKoZIhvcNAQkBFhdjYWZlQGlmc2VydGFv
-LXBlLmVkdS5icjESMBAGA1UEBxMJUGV0cm9saW5hMRMwEQYDVQQIEwpQZXJuYW1i
-dWNvMQswCQYDVQQGEwJCUjEhMB8GA1UEAxMYbWFydGUuaWZzZXJ0YW8tcGUuZWR1
-LmJyMB4XDTEzMTIwNDEzMjExOFoXDTE2MTIwMzEzMjExOFowgaYxFDASBgNVBAoT
-C0lGU0VSVEFPLVBFMQ0wCwYDVQQLEwRER1RJMSYwJAYJKoZIhvcNAQkBFhdjYWZl
-QGlmc2VydGFvLXBlLmVkdS5icjESMBAGA1UEBxMJUGV0cm9saW5hMRMwEQYDVQQI
-EwpQZXJuYW1idWNvMQswCQYDVQQGEwJCUjEhMB8GA1UEAxMYbWFydGUuaWZzZXJ0
-YW8tcGUuZWR1LmJyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA0JDE
-PZ1eD+TXUZG+HP4FX/SfAqONECwpduJLWNaX2VSorGCmNyQfjyFil0Fce0RdxL2B
-oLc/B4EgGvm9/KCEnhK8EwhWIy9eAi34mJ6dsQnYL40afuO2NFBiGc7TeB+Lj3Hj
-Z/y5g40t50LCnwWUrqzNedUbSLtmJVXWIwn9iO0jPuHuemhTs7YiSt+qIBzBpY2g
-7AeeNkE8VQoJwUFaj5mlmtE4SU9WgURp+u7k05q9La8nIn/xfHFcuVMEzGvQcHsR
-T8lyvJMBjcVJsiJeNCD565GdRTfu3W4tlysQQBM2V/uttteCZ8BpdMQLOop0oNbh
-BPHafdSvF8bLnebtcwIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQBwKBvF2yL3oSI9
-sqKlq1ktY18vHBT58Lc928kyVOWSQH+nDGGJsYOYXCh+zJQdq8Ow3aZA7tXQili3
-avGOhmOM5LfaRvkWCEigfw5frMj4/gRDXk0I7mONk5o5c47XxhSjHg2OiGpQQdqm
-/6MnIQMt98zXoy47mzCtkdgH3qc+hvv2biZtFExcmuZsbjun9TbaCQs1WlTX4Yr9
-ICLuROVF4HNDdN1IeVc+YjL3dIZBw294A3cg8CpSY+5qKEBJF6MgRzrDPy2vzTGP
-UeJoFHTC661va14QsI92zQQCObT42jGq0hRml0MKslZo+c7Cwet0N1xBPQmkjNbe
-DH5XzO/u
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://marte.ifsertao-pe.edu.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://marte.ifsertao-pe.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://marte.ifsertao-pe.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://marte.ifsertao-pe.edu.br/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://marte.ifsertao-pe.edu.br/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://marte.ifsertao-pe.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>
-      
-MIIDwjCCAqoCAQAwDQYJKoZIhvcNAQEFBQAwgaYxFDASBgNVBAoTC0lGU0VSVEFP
-LVBFMQ0wCwYDVQQLEwRER1RJMSYwJAYJKoZIhvcNAQkBFhdjYWZlQGlmc2VydGFv
-LXBlLmVkdS5icjESMBAGA1UEBxMJUGV0cm9saW5hMRMwEQYDVQQIEwpQZXJuYW1i
-dWNvMQswCQYDVQQGEwJCUjEhMB8GA1UEAxMYbWFydGUuaWZzZXJ0YW8tcGUuZWR1
-LmJyMB4XDTEzMTIwNDEzMjExOFoXDTE2MTIwMzEzMjExOFowgaYxFDASBgNVBAoT
-C0lGU0VSVEFPLVBFMQ0wCwYDVQQLEwRER1RJMSYwJAYJKoZIhvcNAQkBFhdjYWZl
-QGlmc2VydGFvLXBlLmVkdS5icjESMBAGA1UEBxMJUGV0cm9saW5hMRMwEQYDVQQI
-EwpQZXJuYW1idWNvMQswCQYDVQQGEwJCUjEhMB8GA1UEAxMYbWFydGUuaWZzZXJ0
-YW8tcGUuZWR1LmJyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA0JDE
-PZ1eD+TXUZG+HP4FX/SfAqONECwpduJLWNaX2VSorGCmNyQfjyFil0Fce0RdxL2B
-oLc/B4EgGvm9/KCEnhK8EwhWIy9eAi34mJ6dsQnYL40afuO2NFBiGc7TeB+Lj3Hj
-Z/y5g40t50LCnwWUrqzNedUbSLtmJVXWIwn9iO0jPuHuemhTs7YiSt+qIBzBpY2g
-7AeeNkE8VQoJwUFaj5mlmtE4SU9WgURp+u7k05q9La8nIn/xfHFcuVMEzGvQcHsR
-T8lyvJMBjcVJsiJeNCD565GdRTfu3W4tlysQQBM2V/uttteCZ8BpdMQLOop0oNbh
-BPHafdSvF8bLnebtcwIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQBwKBvF2yL3oSI9
-sqKlq1ktY18vHBT58Lc928kyVOWSQH+nDGGJsYOYXCh+zJQdq8Ow3aZA7tXQili3
-avGOhmOM5LfaRvkWCEigfw5frMj4/gRDXk0I7mONk5o5c47XxhSjHg2OiGpQQdqm
-/6MnIQMt98zXoy47mzCtkdgH3qc+hvv2biZtFExcmuZsbjun9TbaCQs1WlTX4Yr9
-ICLuROVF4HNDdN1IeVc+YjL3dIZBw294A3cg8CpSY+5qKEBJF6MgRzrDPy2vzTGP
-UeJoFHTC661va14QsI92zQQCObT42jGq0hRml0MKslZo+c7Cwet0N1xBPQmkjNbe
-DH5XzO/u
-                    
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://marte.ifsertao-pe.edu.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://marte.ifsertao-pe.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">IFSERTAO-PE - Instituto Federal do Sertao Pernambucano</OrganizationName>
-    <OrganizationName xml:lang="pt-br">IFSERTAO-PE - Instituto Federal do Sertao Pernambucano</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">IFSERTAO-PE - Instituto Federal do Sertao Pernambucano</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="pt-br">IFSERTAO-PE - Instituto Federal do Sertao Pernambucano</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.ifsertao-pe.edu.br</OrganizationURL>
-    <OrganizationURL xml:lang="pt-br">http://www.ifsertao-pe.edu.br</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Francisco Hamilton</SurName>
-    <EmailAddress>cafe@ifsertao-pe.edu.br</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/mayumba.msh-paris.fr-shibauth.php.xml b/swamid-interfederations-2.0/mayumba.msh-paris.fr-shibauth.php.xml
deleted file mode 100644
index 466f678a..00000000
--- a/swamid-interfederations-2.0/mayumba.msh-paris.fr-shibauth.php.xml
+++ /dev/null
@@ -1,135 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://mayumba.msh-paris.fr/shibauth.php">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2014-06-06T15:31:17Z">
-      <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">Eduspot France site</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Eduspot site France</mdui:Description>
-        <mdui:DisplayName xml:lang="fr">Eduspot site France</mdui:DisplayName>
-        <mdui:Description xml:lang="fr">Eduspot site France</mdui:Description>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIEdjCCA16gAwIBAgIRAJLT9rWH2+hZg6OeczPW/SMwDQYJKoZIhvcNAQEFBQAw
-NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-IFNTTCBDQTAeFw0xNDAzMTcwMDAwMDBaFw0xNzAzMTYyMzU5NTlaMEIxITAfBgNV
-BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEdMBsGA1UEAxMUbWF5dW1iYS5t
-c2gtcGFyaXMuZnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC+2Evn
-EJ4196BzLBm5zH056JWxzlbBm/WSBOeLNNImAqDs12N7+b3hUd6xtp1m3A2vCCMO
-n/XVB3ud7bIP7kKOmSzfM4/CXjiO6SkrFEhaGz1DfDAwAloHi3Yfj2ec/U9QDAy6
-YrAG4ylizSnFy/01RAyztNjPNAMrOl2TYYJrqRCg+fU3HacNejKcCf+RDGpbdTL6
-6AHfeenebVRjDpv3eLb6pkRy4u8dbDJ70G9Iq+JOs/CxD0mD5kuj0M+uQ807o9D6
-5QZlrDAaqb+RS0oczHXwitgJ0bFPc+IRyxwzM4S2chebQpoVbB2x5HNVarfDTzC1
-c1vFGYsJssOgzCS3AgMBAAGjggFxMIIBbTAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJ
-ays3V0fqkOO57TAdBgNVHQ4EFgQUIvVHzc7309TyAJFX8xxYFgp3K+0wDgYDVR0P
-AQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsG
-AQUFBwMCMCIGA1UdIAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQIBMDoGA1Ud
-HwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NM
-Q0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50
-Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6
-Ly9vY3NwLnRjcy50ZXJlbmEub3JnMB8GA1UdEQQYMBaCFG1heXVtYmEubXNoLXBh
-cmlzLmZyMA0GCSqGSIb3DQEBBQUAA4IBAQBxCtuXfhTlAFKYiPQFeKaJvL6wAwM7
-DYM9EpC8jzoaqk+K31QAH7+tDSWOMxIL8ovb21/L9Ol863cYl9wve3oXZIYLKmXf
-fU8vBZ6jaEzn7A5o2G0+jcH6ufWmgfgzhq482oCMGca+GVcPvwwRhuEA85k0/hYf
-cVqbNIBZdu0wxYugtmy1GSK0DCp69G277EX+67jjIwLfUhFfFOxk6URmwj4VLDVO
-oBsYkAumOdtWk+4OHxczuEfrFW2QK5HJn8lpHWduwxNdYfgSl2ibdLwLSOQf+LT9
-Or49ZS1V+M3QMurHd0GkuHUbNeScR/FOOF4Nj4MCVfOgl31SfR0MDp5i
-					    </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>
-					      MIIEdjCCA16gAwIBAgIRAJLT9rWH2+hZg6OeczPW/SMwDQYJKoZIhvcNAQEFBQAw
-NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-IFNTTCBDQTAeFw0xNDAzMTcwMDAwMDBaFw0xNzAzMTYyMzU5NTlaMEIxITAfBgNV
-BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEdMBsGA1UEAxMUbWF5dW1iYS5t
-c2gtcGFyaXMuZnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC+2Evn
-EJ4196BzLBm5zH056JWxzlbBm/WSBOeLNNImAqDs12N7+b3hUd6xtp1m3A2vCCMO
-n/XVB3ud7bIP7kKOmSzfM4/CXjiO6SkrFEhaGz1DfDAwAloHi3Yfj2ec/U9QDAy6
-YrAG4ylizSnFy/01RAyztNjPNAMrOl2TYYJrqRCg+fU3HacNejKcCf+RDGpbdTL6
-6AHfeenebVRjDpv3eLb6pkRy4u8dbDJ70G9Iq+JOs/CxD0mD5kuj0M+uQ807o9D6
-5QZlrDAaqb+RS0oczHXwitgJ0bFPc+IRyxwzM4S2chebQpoVbB2x5HNVarfDTzC1
-c1vFGYsJssOgzCS3AgMBAAGjggFxMIIBbTAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJ
-ays3V0fqkOO57TAdBgNVHQ4EFgQUIvVHzc7309TyAJFX8xxYFgp3K+0wDgYDVR0P
-AQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsG
-AQUFBwMCMCIGA1UdIAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQIBMDoGA1Ud
-HwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NM
-Q0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50
-Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6
-Ly9vY3NwLnRjcy50ZXJlbmEub3JnMB8GA1UdEQQYMBaCFG1heXVtYmEubXNoLXBh
-cmlzLmZyMA0GCSqGSIb3DQEBBQUAA4IBAQBxCtuXfhTlAFKYiPQFeKaJvL6wAwM7
-DYM9EpC8jzoaqk+K31QAH7+tDSWOMxIL8ovb21/L9Ol863cYl9wve3oXZIYLKmXf
-fU8vBZ6jaEzn7A5o2G0+jcH6ufWmgfgzhq482oCMGca+GVcPvwwRhuEA85k0/hYf
-cVqbNIBZdu0wxYugtmy1GSK0DCp69G277EX+67jjIwLfUhFfFOxk6URmwj4VLDVO
-oBsYkAumOdtWk+4OHxczuEfrFW2QK5HJn8lpHWduwxNdYfgSl2ibdLwLSOQf+LT9
-Or49ZS1V+M3QMurHd0GkuHUbNeScR/FOOF4Nj4MCVfOgl31SfR0MDp5i
-					    </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>
-					      MIIC5TCCAc2gAwIBAgIJAPzxQDl/0G/mMA0GCSqGSIb3DQEBBQUAMBUxEzARBgNV
-BAMTCnVjb3BpYS5jb20wHhcNMTQwNjA2MTMwMTAyWhcNMjQwNjAzMTMwMTAyWjAV
-MRMwEQYDVQQDEwp1Y29waWEuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
-CgKCAQEA1awiqcSL2EvF9eWa8XJ7RerWu2Ol4rKdx4hEltu48MCuL/i1C4Yg7I7I
-JkAl2ZKcQHIGCyUVpfotn5m7Owy78jsotpbzY8PN54LVN816FHa2KKCfBgJ7/5uh
-GtYisUKez6O/UafnM4Uc6U/Ol5e/MmlUvE6v12MJbvwAIrYhVUp5aSKOX0Gp3hO+
-XVlFsEfHCDFCdulXSPkUNGhqYftMOvlP10miPE2CzoqcxP5iQIctfzfAyK387KDe
-/oFzT/OicnRHMIQRaOpDht3nKGNs7JKjxVpcLDdNqDCAfkRNfUxg7QFQ3/9gPILi
-n3Lskv9dvcmMjXBVoPUe01aUCIiDmwIDAQABozgwNjAVBgNVHREEDjAMggp1Y29w
-aWEuY29tMB0GA1UdDgQWBBRbFXLSHc4k19XNE68D/izAhYDEBTANBgkqhkiG9w0B
-AQUFAAOCAQEAYyDBOUun2YgaT0jndrx9mjcimVIDr71YtGvyF3eSL5fc6DeTH3Ur
-ktOsqDP0MwPZmm5qfQLsD1q/+nLdzdRKStpwOozjUPYSEx/Ebe7JpzsEyC2yOD6w
-vWDCm38KJUKvAS7ekRK9Z8pFYlhaW7N+qSzrK3gbvJkx1txdnKvHTV7W51p4n1jS
-ecFyneuv9tuhQrjCrFufI+fjFijTmN8gBK2SyiHERlP3IDrrwz033mQRRLasjazA
-ZUhgs9OPjysee18xEBIstkff54Mlz6IKUzpjhorRIR335+M63Qk7WkwGFt3CAW5C
-89fZI6z4GQLZqtZNECfC4/uTQNXzZ3L1Hg==
-					    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://mayumba.msh-paris.fr/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://mayumba.msh-paris.fr/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AttributeConsumingService index="0">
-      <ServiceName xml:lang="fr">Eduspot site France</ServiceName>
-      <ServiceName xml:lang="en">Eduspot France site</ServiceName>
-      <ServiceDescription xml:lang="fr">Eduspot site France</ServiceDescription>
-      <ServiceDescription xml:lang="en">Eduspot site France</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">
-        <saml:AttributeValue xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion">Adresse mail institutionnelle</saml:AttributeValue>
-      </RequestedAttribute>
-      <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">
-        <saml:AttributeValue xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion">Nom Prénom</saml:AttributeValue>
-      </RequestedAttribute>
-      <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">
-        <saml:AttributeValue xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion">Nom Prénom</saml:AttributeValue>
-      </RequestedAttribute>
-      <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">
-        <saml:AttributeValue xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion">identifiant de session persistant</saml:AttributeValue>
-      </RequestedAttribute>
-    </AttributeConsumingService>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Ecole des Hautes Etudes en Sciences Sociales Paris</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Ecole des Hautes Etudes en Sciences Sociales Paris</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Laurent Henry</SurName>
-    <EmailAddress>laurent.henry@ehess.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/mayumba.msh-paris.fr.xml b/swamid-interfederations-2.0/mayumba.msh-paris.fr.xml
deleted file mode 100644
index 466f678a..00000000
--- a/swamid-interfederations-2.0/mayumba.msh-paris.fr.xml
+++ /dev/null
@@ -1,135 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://mayumba.msh-paris.fr/shibauth.php">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2014-06-06T15:31:17Z">
-      <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">Eduspot France site</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Eduspot site France</mdui:Description>
-        <mdui:DisplayName xml:lang="fr">Eduspot site France</mdui:DisplayName>
-        <mdui:Description xml:lang="fr">Eduspot site France</mdui:Description>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIEdjCCA16gAwIBAgIRAJLT9rWH2+hZg6OeczPW/SMwDQYJKoZIhvcNAQEFBQAw
-NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-IFNTTCBDQTAeFw0xNDAzMTcwMDAwMDBaFw0xNzAzMTYyMzU5NTlaMEIxITAfBgNV
-BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEdMBsGA1UEAxMUbWF5dW1iYS5t
-c2gtcGFyaXMuZnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC+2Evn
-EJ4196BzLBm5zH056JWxzlbBm/WSBOeLNNImAqDs12N7+b3hUd6xtp1m3A2vCCMO
-n/XVB3ud7bIP7kKOmSzfM4/CXjiO6SkrFEhaGz1DfDAwAloHi3Yfj2ec/U9QDAy6
-YrAG4ylizSnFy/01RAyztNjPNAMrOl2TYYJrqRCg+fU3HacNejKcCf+RDGpbdTL6
-6AHfeenebVRjDpv3eLb6pkRy4u8dbDJ70G9Iq+JOs/CxD0mD5kuj0M+uQ807o9D6
-5QZlrDAaqb+RS0oczHXwitgJ0bFPc+IRyxwzM4S2chebQpoVbB2x5HNVarfDTzC1
-c1vFGYsJssOgzCS3AgMBAAGjggFxMIIBbTAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJ
-ays3V0fqkOO57TAdBgNVHQ4EFgQUIvVHzc7309TyAJFX8xxYFgp3K+0wDgYDVR0P
-AQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsG
-AQUFBwMCMCIGA1UdIAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQIBMDoGA1Ud
-HwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NM
-Q0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50
-Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6
-Ly9vY3NwLnRjcy50ZXJlbmEub3JnMB8GA1UdEQQYMBaCFG1heXVtYmEubXNoLXBh
-cmlzLmZyMA0GCSqGSIb3DQEBBQUAA4IBAQBxCtuXfhTlAFKYiPQFeKaJvL6wAwM7
-DYM9EpC8jzoaqk+K31QAH7+tDSWOMxIL8ovb21/L9Ol863cYl9wve3oXZIYLKmXf
-fU8vBZ6jaEzn7A5o2G0+jcH6ufWmgfgzhq482oCMGca+GVcPvwwRhuEA85k0/hYf
-cVqbNIBZdu0wxYugtmy1GSK0DCp69G277EX+67jjIwLfUhFfFOxk6URmwj4VLDVO
-oBsYkAumOdtWk+4OHxczuEfrFW2QK5HJn8lpHWduwxNdYfgSl2ibdLwLSOQf+LT9
-Or49ZS1V+M3QMurHd0GkuHUbNeScR/FOOF4Nj4MCVfOgl31SfR0MDp5i
-					    </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>
-					      MIIEdjCCA16gAwIBAgIRAJLT9rWH2+hZg6OeczPW/SMwDQYJKoZIhvcNAQEFBQAw
-NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-IFNTTCBDQTAeFw0xNDAzMTcwMDAwMDBaFw0xNzAzMTYyMzU5NTlaMEIxITAfBgNV
-BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEdMBsGA1UEAxMUbWF5dW1iYS5t
-c2gtcGFyaXMuZnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC+2Evn
-EJ4196BzLBm5zH056JWxzlbBm/WSBOeLNNImAqDs12N7+b3hUd6xtp1m3A2vCCMO
-n/XVB3ud7bIP7kKOmSzfM4/CXjiO6SkrFEhaGz1DfDAwAloHi3Yfj2ec/U9QDAy6
-YrAG4ylizSnFy/01RAyztNjPNAMrOl2TYYJrqRCg+fU3HacNejKcCf+RDGpbdTL6
-6AHfeenebVRjDpv3eLb6pkRy4u8dbDJ70G9Iq+JOs/CxD0mD5kuj0M+uQ807o9D6
-5QZlrDAaqb+RS0oczHXwitgJ0bFPc+IRyxwzM4S2chebQpoVbB2x5HNVarfDTzC1
-c1vFGYsJssOgzCS3AgMBAAGjggFxMIIBbTAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJ
-ays3V0fqkOO57TAdBgNVHQ4EFgQUIvVHzc7309TyAJFX8xxYFgp3K+0wDgYDVR0P
-AQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsG
-AQUFBwMCMCIGA1UdIAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQIBMDoGA1Ud
-HwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NM
-Q0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50
-Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6
-Ly9vY3NwLnRjcy50ZXJlbmEub3JnMB8GA1UdEQQYMBaCFG1heXVtYmEubXNoLXBh
-cmlzLmZyMA0GCSqGSIb3DQEBBQUAA4IBAQBxCtuXfhTlAFKYiPQFeKaJvL6wAwM7
-DYM9EpC8jzoaqk+K31QAH7+tDSWOMxIL8ovb21/L9Ol863cYl9wve3oXZIYLKmXf
-fU8vBZ6jaEzn7A5o2G0+jcH6ufWmgfgzhq482oCMGca+GVcPvwwRhuEA85k0/hYf
-cVqbNIBZdu0wxYugtmy1GSK0DCp69G277EX+67jjIwLfUhFfFOxk6URmwj4VLDVO
-oBsYkAumOdtWk+4OHxczuEfrFW2QK5HJn8lpHWduwxNdYfgSl2ibdLwLSOQf+LT9
-Or49ZS1V+M3QMurHd0GkuHUbNeScR/FOOF4Nj4MCVfOgl31SfR0MDp5i
-					    </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>
-					      MIIC5TCCAc2gAwIBAgIJAPzxQDl/0G/mMA0GCSqGSIb3DQEBBQUAMBUxEzARBgNV
-BAMTCnVjb3BpYS5jb20wHhcNMTQwNjA2MTMwMTAyWhcNMjQwNjAzMTMwMTAyWjAV
-MRMwEQYDVQQDEwp1Y29waWEuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
-CgKCAQEA1awiqcSL2EvF9eWa8XJ7RerWu2Ol4rKdx4hEltu48MCuL/i1C4Yg7I7I
-JkAl2ZKcQHIGCyUVpfotn5m7Owy78jsotpbzY8PN54LVN816FHa2KKCfBgJ7/5uh
-GtYisUKez6O/UafnM4Uc6U/Ol5e/MmlUvE6v12MJbvwAIrYhVUp5aSKOX0Gp3hO+
-XVlFsEfHCDFCdulXSPkUNGhqYftMOvlP10miPE2CzoqcxP5iQIctfzfAyK387KDe
-/oFzT/OicnRHMIQRaOpDht3nKGNs7JKjxVpcLDdNqDCAfkRNfUxg7QFQ3/9gPILi
-n3Lskv9dvcmMjXBVoPUe01aUCIiDmwIDAQABozgwNjAVBgNVHREEDjAMggp1Y29w
-aWEuY29tMB0GA1UdDgQWBBRbFXLSHc4k19XNE68D/izAhYDEBTANBgkqhkiG9w0B
-AQUFAAOCAQEAYyDBOUun2YgaT0jndrx9mjcimVIDr71YtGvyF3eSL5fc6DeTH3Ur
-ktOsqDP0MwPZmm5qfQLsD1q/+nLdzdRKStpwOozjUPYSEx/Ebe7JpzsEyC2yOD6w
-vWDCm38KJUKvAS7ekRK9Z8pFYlhaW7N+qSzrK3gbvJkx1txdnKvHTV7W51p4n1jS
-ecFyneuv9tuhQrjCrFufI+fjFijTmN8gBK2SyiHERlP3IDrrwz033mQRRLasjazA
-ZUhgs9OPjysee18xEBIstkff54Mlz6IKUzpjhorRIR335+M63Qk7WkwGFt3CAW5C
-89fZI6z4GQLZqtZNECfC4/uTQNXzZ3L1Hg==
-					    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://mayumba.msh-paris.fr/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://mayumba.msh-paris.fr/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AttributeConsumingService index="0">
-      <ServiceName xml:lang="fr">Eduspot site France</ServiceName>
-      <ServiceName xml:lang="en">Eduspot France site</ServiceName>
-      <ServiceDescription xml:lang="fr">Eduspot site France</ServiceDescription>
-      <ServiceDescription xml:lang="en">Eduspot site France</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">
-        <saml:AttributeValue xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion">Adresse mail institutionnelle</saml:AttributeValue>
-      </RequestedAttribute>
-      <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">
-        <saml:AttributeValue xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion">Nom Prénom</saml:AttributeValue>
-      </RequestedAttribute>
-      <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">
-        <saml:AttributeValue xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion">Nom Prénom</saml:AttributeValue>
-      </RequestedAttribute>
-      <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">
-        <saml:AttributeValue xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion">identifiant de session persistant</saml:AttributeValue>
-      </RequestedAttribute>
-    </AttributeConsumingService>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Ecole des Hautes Etudes en Sciences Sociales Paris</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Ecole des Hautes Etudes en Sciences Sociales Paris</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Laurent Henry</SurName>
-    <EmailAddress>laurent.henry@ehess.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/meta.cesnet.cz-sp-shibboleth.xml b/swamid-interfederations-2.0/meta.cesnet.cz-sp-shibboleth.xml
deleted file mode 100644
index cdd71ffe..00000000
--- a/swamid-interfederations-2.0/meta.cesnet.cz-sp-shibboleth.xml
+++ /dev/null
@@ -1,164 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" 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/" registrationInstant="2010-09-15T11:47:38Z">
-      <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">Perun</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="cs">Perun</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Perun is a system for managing user accounts, user groups and access to computational resources and services in cloud, grid and other e-infrastructures. This Perun instance manages e-infrastructure of CESNET, which is an association of Czech public universities and the Czech Academy of Sciences.</mdui:Description>
-        <mdui:Description xml:lang="cs">Perun je systém pro správu uživatelských účtů, skupin uživatelů a práv přístupu k výpočetním prostředkům a službám v cloudových, gridových a dalších e-infrastrukturách. Tato instance Peruna spravuje e-infrastrukturu organizace CESNET, která je sdružením českých veřejných vysokých škol a ústavů Akademie věd.</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://perun.cesnet.cz/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="cs">http://perun.cesnet.cz/</mdui:InformationURL>
-        <mdui:Logo height="145" width="327">https://meta.cesnet.cz/cesnet_logo_327x145.png</mdui:Logo>
-      </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>_meta_2015-12-07</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>_meta_2015-12-07</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">Perun</md:ServiceName>
-      <md:ServiceName xml:lang="cs">Perun</md:ServiceName>
-      <md:ServiceDescription xml:lang="en">Perun is a system for managing user accounts, user groups and access to the computational resources and services in cloud, grid and other e-infrastructures.</md:ServiceDescription>
-      <md:ServiceDescription xml:lang="cs">Perun je systém pro správu uživatelských účtů, skupin uživatelů a práv přístupu k výpočetním prostředkům a službám v cloudových, gridových a dalších e-infrastrukturách. </md:ServiceDescription>
-      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="cn" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="o" Name="urn:oid:2.5.4.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">CESNET</md:OrganizationName>
-    <md:OrganizationName xml:lang="cs">CESNET</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">CESNET</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="cs">CESNET</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://perun.cesnet.cz/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="cs">http://perun.cesnet.cz/</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/meta.cesnet.cz.xml b/swamid-interfederations-2.0/meta.cesnet.cz.xml
deleted file mode 100644
index cdd71ffe..00000000
--- a/swamid-interfederations-2.0/meta.cesnet.cz.xml
+++ /dev/null
@@ -1,164 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" 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/" registrationInstant="2010-09-15T11:47:38Z">
-      <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">Perun</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="cs">Perun</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Perun is a system for managing user accounts, user groups and access to computational resources and services in cloud, grid and other e-infrastructures. This Perun instance manages e-infrastructure of CESNET, which is an association of Czech public universities and the Czech Academy of Sciences.</mdui:Description>
-        <mdui:Description xml:lang="cs">Perun je systém pro správu uživatelských účtů, skupin uživatelů a práv přístupu k výpočetním prostředkům a službám v cloudových, gridových a dalších e-infrastrukturách. Tato instance Peruna spravuje e-infrastrukturu organizace CESNET, která je sdružením českých veřejných vysokých škol a ústavů Akademie věd.</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://perun.cesnet.cz/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="cs">http://perun.cesnet.cz/</mdui:InformationURL>
-        <mdui:Logo height="145" width="327">https://meta.cesnet.cz/cesnet_logo_327x145.png</mdui:Logo>
-      </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>_meta_2015-12-07</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>_meta_2015-12-07</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">Perun</md:ServiceName>
-      <md:ServiceName xml:lang="cs">Perun</md:ServiceName>
-      <md:ServiceDescription xml:lang="en">Perun is a system for managing user accounts, user groups and access to the computational resources and services in cloud, grid and other e-infrastructures.</md:ServiceDescription>
-      <md:ServiceDescription xml:lang="cs">Perun je systém pro správu uživatelských účtů, skupin uživatelů a práv přístupu k výpočetním prostředkům a službám v cloudových, gridových a dalších e-infrastrukturách. </md:ServiceDescription>
-      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="cn" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="o" Name="urn:oid:2.5.4.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">CESNET</md:OrganizationName>
-    <md:OrganizationName xml:lang="cs">CESNET</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">CESNET</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="cs">CESNET</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://perun.cesnet.cz/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="cs">http://perun.cesnet.cz/</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/monitor.eduroam.org-sp-module.php-saml-sp-metadata.php-default-sp.xml b/swamid-interfederations-2.0/monitor.eduroam.org-sp-module.php-saml-sp-metadata.php-default-sp.xml
deleted file mode 100644
index ebf82a4e..00000000
--- a/swamid-interfederations-2.0/monitor.eduroam.org-sp-module.php-saml-sp-metadata.php-default-sp.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://monitor.eduroam.org/sp/module.php/saml/sp/metadata.php/default-sp">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.srce.hr" registrationInstant="2012-01-01T08:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="hr">http://www.aaiedu.hr/docs/AAI@EduHr-pravilnik-ver1.3.1.pdf</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIIEdDCCA1ygAwIBAgIRAOFAsS0ZwiDxyrWeqjaDx2owDQYJKoZIhvcNAQEFBQAwNjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5BIFNTTCBDQTAeFw0xNDA4MjUwMDAwMDBaFw0xNzA4MjQyMzU5NTlaMEExITAfBgNVBAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEcMBoGA1UEAxMTbW9uaXRvci5lZHVyb2FtLm9yZzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKZEEPPWK3dI4pejrbIg8Ee54wh62ixv9oPeYBwLmiRr2Rdjs+Sd/PkYXstbmGuwrvMkAtHmpv1QEjkwxLGo7WlE7ibEZw7EyaKbAeqfkEjCoQY9IGIxZP4IOUeqGyGMcDE90lKvM+5oS3iTxTOa8fQvjDw+8xyL+SEzbaQ3Ltl51jqbMI88goOGwuaqlgMzPTQgvwnMu5ERxMd3ghZigjFVBKMTk94Bc3SU36NUPzmOTUU0Wz+IplXi0yn/ohlLOvtE6S72vi4rO3UwWWu8DMMJhdyJ6yBq2F3xnIb2tk+cXUueGYEyp4oAI3XuDKKZECbKatiaMyhbwpY6l2yLCr8CAwEAAaOCAXAwggFsMB8GA1UdIwQYMBaAFAy9k2gM896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBRgdssPSBPRcB1pblNsRGZOsfJWYjAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwIgYDVR0gBBswGTANBgsrBgEEAbIxAQICHTAIBgZngQwBAgEwOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwHgYDVR0RBBcwFYITbW9uaXRvci5lZHVyb2FtLm9yZzANBgkqhkiG9w0BAQUFAAOCAQEASYoJQ052RD3Cny9AZhZEhXDLhCHcIKnnvpbVLT8zn6ENZ3QmVJRrBvJynPnstGpsWRNOGprScHYwPxRc/4ec04MtLBdtDuo6R2rBbP5XVP07rSLRW1fz57kYd+8mQdFhbs7hjTEkoAZbWf/whyMm2L+1KIoig0KCQ69pvLtYNUo33HIpBdUhmThMqLK79t9F2NThkvaBFAoIgubiNZcnraq3oCRYhFGsdTkkr3GYS/2DQmsDGEvYd/vJQowK2GLgrzy717L10pbsmWArDD8dL7cq8HCUosF/mYnHe2RjFyM5K2nbYGD7ztTns9NmIPOkMduzJYcxbMCetcg2o2Lf0A==</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>MIIEdDCCA1ygAwIBAgIRAOFAsS0ZwiDxyrWeqjaDx2owDQYJKoZIhvcNAQEFBQAwNjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5BIFNTTCBDQTAeFw0xNDA4MjUwMDAwMDBaFw0xNzA4MjQyMzU5NTlaMEExITAfBgNVBAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEcMBoGA1UEAxMTbW9uaXRvci5lZHVyb2FtLm9yZzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKZEEPPWK3dI4pejrbIg8Ee54wh62ixv9oPeYBwLmiRr2Rdjs+Sd/PkYXstbmGuwrvMkAtHmpv1QEjkwxLGo7WlE7ibEZw7EyaKbAeqfkEjCoQY9IGIxZP4IOUeqGyGMcDE90lKvM+5oS3iTxTOa8fQvjDw+8xyL+SEzbaQ3Ltl51jqbMI88goOGwuaqlgMzPTQgvwnMu5ERxMd3ghZigjFVBKMTk94Bc3SU36NUPzmOTUU0Wz+IplXi0yn/ohlLOvtE6S72vi4rO3UwWWu8DMMJhdyJ6yBq2F3xnIb2tk+cXUueGYEyp4oAI3XuDKKZECbKatiaMyhbwpY6l2yLCr8CAwEAAaOCAXAwggFsMB8GA1UdIwQYMBaAFAy9k2gM896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBRgdssPSBPRcB1pblNsRGZOsfJWYjAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwIgYDVR0gBBswGTANBgsrBgEEAbIxAQICHTAIBgZngQwBAgEwOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwHgYDVR0RBBcwFYITbW9uaXRvci5lZHVyb2FtLm9yZzANBgkqhkiG9w0BAQUFAAOCAQEASYoJQ052RD3Cny9AZhZEhXDLhCHcIKnnvpbVLT8zn6ENZ3QmVJRrBvJynPnstGpsWRNOGprScHYwPxRc/4ec04MtLBdtDuo6R2rBbP5XVP07rSLRW1fz57kYd+8mQdFhbs7hjTEkoAZbWf/whyMm2L+1KIoig0KCQ69pvLtYNUo33HIpBdUhmThMqLK79t9F2NThkvaBFAoIgubiNZcnraq3oCRYhFGsdTkkr3GYS/2DQmsDGEvYd/vJQowK2GLgrzy717L10pbsmWArDD8dL7cq8HCUosF/mYnHe2RjFyM5K2nbYGD7ztTns9NmIPOkMduzJYcxbMCetcg2o2Lf0A==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://monitor.eduroam.org/sp/module.php/saml/sp/saml2-logout.php/default-sp"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://monitor.eduroam.org/sp/module.php/saml/sp/saml2-logout.php/default-sp"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://monitor.eduroam.org/sp/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://monitor.eduroam.org/sp/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://monitor.eduroam.org/sp/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://monitor.eduroam.org/sp/module.php/saml/sp/saml1-acs.php/default-sp/artifact" index="3"/>
-    <md:AttributeConsumingService index="0">
-      <md:ServiceName xml:lang="en">eduroam supporting services</md:ServiceName>
-      <md:ServiceDescription xml:lang="en">eduroam supporting services include: eduroam database, CAT, monitoring, F-Ticks</md:ServiceDescription>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute Name="urn:oid:2.16.840.1.113730.3.1.241" 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:Organization>
-    <md:OrganizationName xml:lang="en">eduroam</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">eduroam</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.eduroam.org</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Dubravko</md:GivenName>
-    <md:SurName>Voncina</md:SurName>
-    <md:EmailAddress>dubravko.voncina@srce.hr</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:Company>eduroam operations team</md:Company>
-    <md:EmailAddress>eduroam-ot@geant.net</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/monitor.eduroam.org.xml b/swamid-interfederations-2.0/monitor.eduroam.org.xml
deleted file mode 100644
index ebf82a4e..00000000
--- a/swamid-interfederations-2.0/monitor.eduroam.org.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://monitor.eduroam.org/sp/module.php/saml/sp/metadata.php/default-sp">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.srce.hr" registrationInstant="2012-01-01T08:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="hr">http://www.aaiedu.hr/docs/AAI@EduHr-pravilnik-ver1.3.1.pdf</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIIEdDCCA1ygAwIBAgIRAOFAsS0ZwiDxyrWeqjaDx2owDQYJKoZIhvcNAQEFBQAwNjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5BIFNTTCBDQTAeFw0xNDA4MjUwMDAwMDBaFw0xNzA4MjQyMzU5NTlaMEExITAfBgNVBAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEcMBoGA1UEAxMTbW9uaXRvci5lZHVyb2FtLm9yZzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKZEEPPWK3dI4pejrbIg8Ee54wh62ixv9oPeYBwLmiRr2Rdjs+Sd/PkYXstbmGuwrvMkAtHmpv1QEjkwxLGo7WlE7ibEZw7EyaKbAeqfkEjCoQY9IGIxZP4IOUeqGyGMcDE90lKvM+5oS3iTxTOa8fQvjDw+8xyL+SEzbaQ3Ltl51jqbMI88goOGwuaqlgMzPTQgvwnMu5ERxMd3ghZigjFVBKMTk94Bc3SU36NUPzmOTUU0Wz+IplXi0yn/ohlLOvtE6S72vi4rO3UwWWu8DMMJhdyJ6yBq2F3xnIb2tk+cXUueGYEyp4oAI3XuDKKZECbKatiaMyhbwpY6l2yLCr8CAwEAAaOCAXAwggFsMB8GA1UdIwQYMBaAFAy9k2gM896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBRgdssPSBPRcB1pblNsRGZOsfJWYjAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwIgYDVR0gBBswGTANBgsrBgEEAbIxAQICHTAIBgZngQwBAgEwOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwHgYDVR0RBBcwFYITbW9uaXRvci5lZHVyb2FtLm9yZzANBgkqhkiG9w0BAQUFAAOCAQEASYoJQ052RD3Cny9AZhZEhXDLhCHcIKnnvpbVLT8zn6ENZ3QmVJRrBvJynPnstGpsWRNOGprScHYwPxRc/4ec04MtLBdtDuo6R2rBbP5XVP07rSLRW1fz57kYd+8mQdFhbs7hjTEkoAZbWf/whyMm2L+1KIoig0KCQ69pvLtYNUo33HIpBdUhmThMqLK79t9F2NThkvaBFAoIgubiNZcnraq3oCRYhFGsdTkkr3GYS/2DQmsDGEvYd/vJQowK2GLgrzy717L10pbsmWArDD8dL7cq8HCUosF/mYnHe2RjFyM5K2nbYGD7ztTns9NmIPOkMduzJYcxbMCetcg2o2Lf0A==</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>MIIEdDCCA1ygAwIBAgIRAOFAsS0ZwiDxyrWeqjaDx2owDQYJKoZIhvcNAQEFBQAwNjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5BIFNTTCBDQTAeFw0xNDA4MjUwMDAwMDBaFw0xNzA4MjQyMzU5NTlaMEExITAfBgNVBAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEcMBoGA1UEAxMTbW9uaXRvci5lZHVyb2FtLm9yZzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKZEEPPWK3dI4pejrbIg8Ee54wh62ixv9oPeYBwLmiRr2Rdjs+Sd/PkYXstbmGuwrvMkAtHmpv1QEjkwxLGo7WlE7ibEZw7EyaKbAeqfkEjCoQY9IGIxZP4IOUeqGyGMcDE90lKvM+5oS3iTxTOa8fQvjDw+8xyL+SEzbaQ3Ltl51jqbMI88goOGwuaqlgMzPTQgvwnMu5ERxMd3ghZigjFVBKMTk94Bc3SU36NUPzmOTUU0Wz+IplXi0yn/ohlLOvtE6S72vi4rO3UwWWu8DMMJhdyJ6yBq2F3xnIb2tk+cXUueGYEyp4oAI3XuDKKZECbKatiaMyhbwpY6l2yLCr8CAwEAAaOCAXAwggFsMB8GA1UdIwQYMBaAFAy9k2gM896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBRgdssPSBPRcB1pblNsRGZOsfJWYjAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwIgYDVR0gBBswGTANBgsrBgEEAbIxAQICHTAIBgZngQwBAgEwOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwHgYDVR0RBBcwFYITbW9uaXRvci5lZHVyb2FtLm9yZzANBgkqhkiG9w0BAQUFAAOCAQEASYoJQ052RD3Cny9AZhZEhXDLhCHcIKnnvpbVLT8zn6ENZ3QmVJRrBvJynPnstGpsWRNOGprScHYwPxRc/4ec04MtLBdtDuo6R2rBbP5XVP07rSLRW1fz57kYd+8mQdFhbs7hjTEkoAZbWf/whyMm2L+1KIoig0KCQ69pvLtYNUo33HIpBdUhmThMqLK79t9F2NThkvaBFAoIgubiNZcnraq3oCRYhFGsdTkkr3GYS/2DQmsDGEvYd/vJQowK2GLgrzy717L10pbsmWArDD8dL7cq8HCUosF/mYnHe2RjFyM5K2nbYGD7ztTns9NmIPOkMduzJYcxbMCetcg2o2Lf0A==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://monitor.eduroam.org/sp/module.php/saml/sp/saml2-logout.php/default-sp"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://monitor.eduroam.org/sp/module.php/saml/sp/saml2-logout.php/default-sp"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://monitor.eduroam.org/sp/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://monitor.eduroam.org/sp/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://monitor.eduroam.org/sp/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://monitor.eduroam.org/sp/module.php/saml/sp/saml1-acs.php/default-sp/artifact" index="3"/>
-    <md:AttributeConsumingService index="0">
-      <md:ServiceName xml:lang="en">eduroam supporting services</md:ServiceName>
-      <md:ServiceDescription xml:lang="en">eduroam supporting services include: eduroam database, CAT, monitoring, F-Ticks</md:ServiceDescription>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute Name="urn:oid:2.16.840.1.113730.3.1.241" 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:Organization>
-    <md:OrganizationName xml:lang="en">eduroam</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">eduroam</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.eduroam.org</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Dubravko</md:GivenName>
-    <md:SurName>Voncina</md:SurName>
-    <md:EmailAddress>dubravko.voncina@srce.hr</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:Company>eduroam operations team</md:Company>
-    <md:EmailAddress>eduroam-ot@geant.net</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/moodle.helsinki.fi.xml b/swamid-interfederations-2.0/moodle.helsinki.fi.xml
deleted file mode 100644
index 02ddf702..00000000
--- a/swamid-interfederations-2.0/moodle.helsinki.fi.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns: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://moodle.helsinki.fi/shibboleth">
-  <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://moodle.helsinki.fi/Shibboleth.sso/HAKALogin" index="1"/>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="en">University of Helsinki Moodle</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="fi">Helsingin yliopiston Moodle</mdui:DisplayName>
-        <mdui:Description xml:lang="en">University of Helsinki Moodle learning management system.</mdui:Description>
-        <mdui:Description xml:lang="fi">Helsingin yliopiston Moodle-oppimisalusta.</mdui:Description>
-        <mdui:PrivacyStatementURL xml:lang="fi">https://moodle.helsinki.fi/rekisteriseloste.htm</mdui:PrivacyStatementURL>
-      </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>MIIFcTCCBFmgAwIBAgIQBs4LDAt4QhHxA6/9vcQV2jANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTE0MDQwOTAwMDAwMFoXDTE3MDQwODIzNTk1OVowQDEhMB8GA1UE
-CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRswGQYDVQQDExJtb29kbGUuaGVs
-c2lua2kuZmkwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDRJht4CmQi
-9WWU+ep1UhI11GXJTUXY4PzukaXUtO4RbZAnvd0U4Xb5sPDNsCVSIASBX0fkbSZJ
-yQ8FY/PhRk2QIt+erjReWIWA6V3UY6kJIq9IrUh4Z06aGrLvkEjHFbI0VA/AZ/8T
-2BxJrMg3v9mT12B9ueDvybIc6IERiDctRrB+s5nPskvua/2oTq4hDM9mGYTN4ZLB
-fR2OViwPxsGi3V22+iLa66JCmIK8kCeekNhS7OsclWWzIfPpCW1azjUZ2HrRndoi
-A/zJSpmT1rxY8WTchr0xdPdgVDzDZSv/FhRDacbFIC99drSWmg4wiYLvIidDt/zu
-tRoJdUGYPxqljdsyHwftjqqy2YNSMrxD8LDsaF07RZYjpK9GLDXroJzEOhlAJu/c
-qd4+RO+LjF21TWTe4Kw9u4+VNvjrfFDvkj5QAPxti70nOzkqY9Y+T4h1UNkyr8u+
-EGjNLOIE41B5V5MhTkf9x6lQD9IkejHpZA2bP5dmUtBft72UCPCDm2YMkLeXfOI9
-CaBkxLzi4doXmNLjXVEtsVx3qkvyH595ACnSaS/kUfnbgjaMdz15dh7PUPz2OQAE
-P3VijjcTzls96u81aBfHOHY1khqEueKkehJLq7ZFLefy/hcnFDMXWNMSeQaiGDjO
-qMAYHGzjR94Uar2Jvxvwzg2dF3GznzLZeQIDAQABo4IBbzCCAWswHwYDVR0jBBgw
-FoAUDL2TaAzz3qujSWsrN1dH6pDjue0wHQYDVR0OBBYEFB8kuozI2dNLBE+Oy8Ie
-Rp4+GmUeMA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQG
-CCsGAQUFBwMBBggrBgEFBQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgG
-BmeBDAECATA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEu
-b3JnL1RFUkVOQVNTTENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKG
-KWh0dHA6Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsG
-AQUFBzABhhpodHRwOi8vb2NzcC50Y3MudGVyZW5hLm9yZzAdBgNVHREEFjAUghJt
-b29kbGUuaGVsc2lua2kuZmkwDQYJKoZIhvcNAQEFBQADggEBAEkxmg/WVjzPKULi
-7OO3LiKrIgAhRchg8SGfngcgM6E2I8RoLS69/ZC0eWOubAZBJPfvCvaX5u3GWTWd
-dtHeCZWIKOhCFKMj079qWO27O67ys/E//vYakEnSxkpBkQ5u0tyolS7BFQcTWoPR
-BFc/Z+NaZhBmcm7tyFkQsrHTQZTq/s1Anxc7t3sXuUsFl4/LOEwiXkJYoxYOPE7t
-A0iMOwlhJ5VuCIEYZLJ1yA6AZCgJX8TgZvQEdsAxIA6VFJmXsJokBa/wDYQt5fPo
-kBViCHGTlh5cyshXEA2zL/Ywe8EjJkZCDWdoOC+r6CGtxjRxD7tvb/27+1dbYnI0
-Red7UuI=</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://moodle.helsinki.fi/Shibboleth.sso/SAML2/POST" index="1" isDefault="true"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://moodle.helsinki.fi/Shibboleth.sso/SAML/POST" index="2" isDefault="false"/>
-    <md:AttributeConsumingService index="1" isDefault="true">
-      <md:ServiceName xml:lang="fi">Helsingin yliopiston Moodle</md:ServiceName>
-      <md:ServiceName xml:lang="en">University of Helsinki's Moodle</md:ServiceName>
-      <md:ServiceDescription xml:lang="fi">Helsingin yliopiston Moodle-oppimisalusta.</md:ServiceDescription>
-      <md:ServiceDescription xml:lang="en">University of Helsinki's Moodle learning management system.</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.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.14" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="schacPersonalUniqueCode"/>
-      <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">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="administrative">
-    <md:GivenName>Heiko</md:GivenName>
-    <md:SurName>Schach</md:SurName>
-    <md:EmailAddress>mailto:heiko.schach@helsinki.fi</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Janne</md:GivenName>
-    <md:SurName>Peltonen</md:SurName>
-    <md:EmailAddress>mailto:haka-hy@helsinki.fi</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/moodle.utu.fi.xml b/swamid-interfederations-2.0/moodle.utu.fi.xml
deleted file mode 100644
index 185d9fe6..00000000
--- a/swamid-interfederations-2.0/moodle.utu.fi.xml
+++ /dev/null
@@ -1,79 +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://moodle.utu.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://moodle.utu.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>MIIEZzCCA0+gAwIBAgIQT5QLlkD90BQrkITUEnBTjzANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTEzMTEwMTAwMDAwMFoXDTE2MTAzMTIzNTk1OVowOzEhMB8GA1UE
-CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRYwFAYDVQQDEw1tb29kbGUudXR1
-LmZpMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu57V8S33XIdPWR0L
-rBU3P7BUaGjMQQXLIvyJG30hdL6LeVmhgdGLmquH4PstOhkovAyU2oRnV8qgRGTv
-S/dpyjiBgLBZ3bM2RHKYmPTzUxW6yYeQskZeRva28BZPtCo7cI6Z0tzrN0svt6hv
-QAvcQr0hpi4eYmflRcLN+Vogwvo2U67xxIxBEqUPC9ESsiIjh3AppAZcO8QzMIZO
-4CVhrWjyXSNpLtq7CS/n7xbw6/ky8bqFuaYsIBeyubsjp6nWbvMsuFRrUOh/Mjj3
-PLVe3kFOb7ueSjxcfAbl+Nd0T2Qa7KT7yY8zBI3JEoj19eTpSrZzPcBToA+LHUwi
-MfeM0wIDAQABo4IBajCCAWYwHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsrN1dH6pDj
-ue0wHQYDVR0OBBYEFHSb32e0HpXDgKuD31baDigtJobzMA4GA1UdDwEB/wQEAwIF
-oDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAi
-BgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNVHR8EMzAxMC+g
-LaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNybDBt
-BggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNzLnRlcmVu
-YS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8vb2NzcC50
-Y3MudGVyZW5hLm9yZzAYBgNVHREEETAPgg1tb29kbGUudXR1LmZpMA0GCSqGSIb3
-DQEBBQUAA4IBAQAqzKnyX9RnkwXwOM1szmj5iCMwTLVKl+ULpwxajHKs3Y8qXpgZ
-qR0JGgdAPE+qpWPQHRy+H0wwoAGwJHayyYVqd0WEUD6ET1YqxLGCbPA6I+gCLwN/
-2Gr2zU+BrPZ+Lbx3libwYEe4DtRhrHGvM+EoK703HLyQbAIFbQQG7xrEFOD4yjFB
-grT2zSpweu6njvXsomDNwjdCcG2sP7xOm5+ECGwB7RS85l6tAhkw/LR3msagUpZ5
-rol41Nc8xtMqDhVlI9K9MBfdGmj4wnvFzYS6bbAuMcOBUEllwtbhzzJf53XKQBZF
-0uKP0MosqHl91zcW2TOx0wxNhL4Hhavhe0hr</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://moodle.utu.fi/Shibboleth.sso/SAML2/POST" index="1" isDefault="true"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://moodle.utu.fi/Shibboleth.sso/SAML/POST" index="2" isDefault="false"/>
-    <md:AttributeConsumingService index="1" isDefault="true">
-      <md:ServiceName xml:lang="fi">Turun yliopiston Moodle-oppimisalusta</md:ServiceName>
-      <md:ServiceName xml:lang="en">University of Turku's Moodle learning management system</md:ServiceName>
-      <md:ServiceDescription xml:lang="fi">Moodle-oppimisalusta</md:ServiceDescription>
-      <md:ServiceDescription xml:lang="en">Moodle learning management system</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" FriendlyName="displayName"/>
-      <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: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: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">Turun yliopisto</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">University of Turku</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">Åbo universitet</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="fi">Turun yliopisto</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">University of Turku</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="sv">Åbo universitet</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="fi">http://www.utu.fi/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.utu.fi/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sv">http://www.utu.fi/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Nadja</md:GivenName>
-    <md:SurName>Plankevitch</md:SurName>
-    <md:EmailAddress>mailto:hakajasen@utu.fi</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Nadja</md:GivenName>
-    <md:SurName>Plankevitch</md:SurName>
-    <md:EmailAddress>mailto:hakajasen@utu.fi</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/neugrid4you.eu-saml-metadata.xml.xml b/swamid-interfederations-2.0/neugrid4you.eu-saml-metadata.xml.xml
deleted file mode 100644
index 517597ee..00000000
--- a/swamid-interfederations-2.0/neugrid4you.eu-saml-metadata.xml.xml
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://neugrid4you.eu/saml/metadata.xml">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2013-11-22T09:21:01Z">
-      <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.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">neuGRID for you</mdui:DisplayName>
-        <mdui:Description xml:lang="en">neuGRID is a web portal aimed to (i) help neuroscientists do high-throughput imaging research, and (ii) provide clinical neurologists automated diagnostic imaging markers of neurodegenerative diseases for individual patient diagnosis. neuGRID’s user-friendly environment is customised to a range of users from students to senior neuroscientists working in the fields of Alzheimer’s disease, psychiatric diseases, and white matter diseases. neuGRID aims to become a widespread resource for brain imaging analyses.</mdui:Description>
-        <mdui:DisplayName xml:lang="fr">neuGRID for you</mdui:DisplayName>
-        <mdui:Description xml:lang="fr">neuGRID est un portail web dédié à la recherche scientifique dans le domaine des maladies neurodégénératives. Grâce à neuGRID (i) les neuroscientifiques auront à disposition pour leur analyses une grande quantité de données de résonances magnétiques cérébrales archivées dans l'infrastructure et (ii) les cliniciens auront la possibilité de sortir automatiquement les marqueurs des maladies neurodégénératives pour effectuer les diagnostiques des patients. NeuGRID est un portail intuitif ouvert à groupes d'utilisateurs différents, à partir des étudiants jusqu'aux neuroscientifiques les plus experts, engagés dans les domaines de la maladie d'Alzheimer, des maladies psychiatriques et des maladies de la substance blanche. NeuGRID vise à devenir une ressource amplement répandue pour l'analyse des résonances magnétiques cérébrales.</mdui:Description>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDfTCCAmWgAwIBAgIEbaA2aTANBgkqhkiG9w0BAQsFADBvMQswCQYDVQQGEwJGUjEVMBMGA1UE
-CBMMSGF1dGUtU2F2b2llMRAwDgYDVQQHEwdBcmdvbmF5MQ4wDAYDVQQKEwVtYWF0RzEOMAwGA1UE
-CxMFbWFhdEcxFzAVBgNVBAMTDm5ldWdyaWQ0eW91LmZyMB4XDTEzMTIwNDE0MzYyNVoXDTIzMTIw
-MjE0MzYyNVowbzELMAkGA1UEBhMCRlIxFTATBgNVBAgTDEhhdXRlLVNhdm9pZTEQMA4GA1UEBxMH
-QXJnb25heTEOMAwGA1UEChMFbWFhdEcxDjAMBgNVBAsTBW1hYXRHMRcwFQYDVQQDEw5uZXVncmlk
-NHlvdS5mcjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKwvYRQpDscRzuobC7VIfUFz
-3DHejMCC3s+l49pcdzngiqHvmNdtveTjg8G2HKqjcakLZZqBGmgFUMk2419BQSGt70Lvyap2Ys8k
-MFV+MX6CveGSNYDO7q6mEoDFSYDGn3YwYIXxWEnrbLxoC1TuPeUJWkgJN5zvuPZYumu5ChqPUGkv
-OfSGFEoWn4RCgzb2Fs1sQ4kGrExA0Ht+wMjy/z55hDarvrOK9dBov8oALhWrIlYc5nNu4a6xrmDz
-sDNjQZywobKSHJXjT34Ymrqvx6oP9s9Zh4nSJiBKhvOHPLsiUTyIvzRTO11sqh4IMxQtQwIrsQ+c
-P5nt2tYlSnTxCFMCAwEAAaMhMB8wHQYDVR0OBBYEFBNhnLLuvMIhcsk4yvJRBX9vsN/bMA0GCSqG
-SIb3DQEBCwUAA4IBAQAneAmyrRTMxvH+QvS9272MMrmKZ7T5krCT1BgIKbxwEHqAqww+6We2R87t
-b8znR6Jgt8SMexYL40BzR4RHXPkr39usz6ptO1Cvdv/WuB238EoqrmGCsnSx3S5Nmbunh0pyWigh
-XM4pLVkZS9b7g59KGh8gAPRrSnb6EMfQ0qf/TcrmPCCzeWVR8uF4mL65i3cZVp0IlLeY+K8lfEVO
-6TgsEuKmzs0rNbbz715rcTJVLZVvk1dFCX1wtQX9yOSBfXt4k6f0igBvy1Tuv1CRa5Qe2FMlR5h3
-avGd92x2qmbKefJkqpTfiZeGJmKwaTqXnqnpq1IQlzyHLMpFLPerP9Kv
-					    </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>
-					      MIIDfTCCAmWgAwIBAgIEbaA2aTANBgkqhkiG9w0BAQsFADBvMQswCQYDVQQGEwJGUjEVMBMGA1UE
-CBMMSGF1dGUtU2F2b2llMRAwDgYDVQQHEwdBcmdvbmF5MQ4wDAYDVQQKEwVtYWF0RzEOMAwGA1UE
-CxMFbWFhdEcxFzAVBgNVBAMTDm5ldWdyaWQ0eW91LmZyMB4XDTEzMTIwNDE0MzYyNVoXDTIzMTIw
-MjE0MzYyNVowbzELMAkGA1UEBhMCRlIxFTATBgNVBAgTDEhhdXRlLVNhdm9pZTEQMA4GA1UEBxMH
-QXJnb25heTEOMAwGA1UEChMFbWFhdEcxDjAMBgNVBAsTBW1hYXRHMRcwFQYDVQQDEw5uZXVncmlk
-NHlvdS5mcjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKwvYRQpDscRzuobC7VIfUFz
-3DHejMCC3s+l49pcdzngiqHvmNdtveTjg8G2HKqjcakLZZqBGmgFUMk2419BQSGt70Lvyap2Ys8k
-MFV+MX6CveGSNYDO7q6mEoDFSYDGn3YwYIXxWEnrbLxoC1TuPeUJWkgJN5zvuPZYumu5ChqPUGkv
-OfSGFEoWn4RCgzb2Fs1sQ4kGrExA0Ht+wMjy/z55hDarvrOK9dBov8oALhWrIlYc5nNu4a6xrmDz
-sDNjQZywobKSHJXjT34Ymrqvx6oP9s9Zh4nSJiBKhvOHPLsiUTyIvzRTO11sqh4IMxQtQwIrsQ+c
-P5nt2tYlSnTxCFMCAwEAAaMhMB8wHQYDVR0OBBYEFBNhnLLuvMIhcsk4yvJRBX9vsN/bMA0GCSqG
-SIb3DQEBCwUAA4IBAQAneAmyrRTMxvH+QvS9272MMrmKZ7T5krCT1BgIKbxwEHqAqww+6We2R87t
-b8znR6Jgt8SMexYL40BzR4RHXPkr39usz6ptO1Cvdv/WuB238EoqrmGCsnSx3S5Nmbunh0pyWigh
-XM4pLVkZS9b7g59KGh8gAPRrSnb6EMfQ0qf/TcrmPCCzeWVR8uF4mL65i3cZVp0IlLeY+K8lfEVO
-6TgsEuKmzs0rNbbz715rcTJVLZVvk1dFCX1wtQX9yOSBfXt4k6f0igBvy1Tuv1CRa5Qe2FMlR5h3
-avGd92x2qmbKefJkqpTfiZeGJmKwaTqXnqnpq1IQlzyHLMpFLPerP9Kv
-					    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://neugrid4you.eu/saml/assertion_consumer_service" index="1"/>
-    <AttributeConsumingService index="0">
-      <ServiceName xml:lang="fr">neuGRID for you</ServiceName>
-      <ServiceName xml:lang="en">neuGRID for you</ServiceName>
-      <ServiceDescription xml:lang="fr">neuGRID est un portail web dédié à la recherche scientifique dans le domaine des maladies neurodégénératives. Grâce à neuGRID (i) les neuroscientifiques auront à disposition pour leur analyses une grande quantité de données de résonances magnétiques cérébrales archivées dans l'infrastructure et (ii) les cliniciens auront la possibilité de sortir automatiquement les marqueurs des maladies neurodégénératives pour effectuer les diagnostiques des patients. NeuGRID est un portail intuitif ouvert à groupes d'utilisateurs différents, à partir des étudiants jusqu'aux neuroscientifiques les plus experts, engagés dans les domaines de la maladie d'Alzheimer, des maladies psychiatriques et des maladies de la substance blanche. NeuGRID vise à devenir une ressource amplement répandue pour l'analyse des résonances magnétiques cérébrales.</ServiceDescription>
-      <ServiceDescription xml:lang="en">neuGRID is a web portal aimed to (i) help neuroscientists do high-throughput imaging research, and (ii) provide clinical neurologists automated diagnostic imaging markers of neurodegenerative diseases for individual patient diagnosis. neuGRID’s user-friendly environment is customised to a range of users from students to senior neuroscientists working in the fields of Alzheimer’s disease, psychiatric diseases, and white matter diseases. neuGRID aims to become a widespread resource for brain imaging analyses.</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"/>
-    </AttributeConsumingService>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">MAAT FRANCE GNUBILA</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">MAAT FRANCE GNUBILA</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <EmailAddress>admin_france@lists.maatg.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/neugrid4you.eu.xml b/swamid-interfederations-2.0/neugrid4you.eu.xml
deleted file mode 100644
index 517597ee..00000000
--- a/swamid-interfederations-2.0/neugrid4you.eu.xml
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://neugrid4you.eu/saml/metadata.xml">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2013-11-22T09:21:01Z">
-      <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.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">neuGRID for you</mdui:DisplayName>
-        <mdui:Description xml:lang="en">neuGRID is a web portal aimed to (i) help neuroscientists do high-throughput imaging research, and (ii) provide clinical neurologists automated diagnostic imaging markers of neurodegenerative diseases for individual patient diagnosis. neuGRID’s user-friendly environment is customised to a range of users from students to senior neuroscientists working in the fields of Alzheimer’s disease, psychiatric diseases, and white matter diseases. neuGRID aims to become a widespread resource for brain imaging analyses.</mdui:Description>
-        <mdui:DisplayName xml:lang="fr">neuGRID for you</mdui:DisplayName>
-        <mdui:Description xml:lang="fr">neuGRID est un portail web dédié à la recherche scientifique dans le domaine des maladies neurodégénératives. Grâce à neuGRID (i) les neuroscientifiques auront à disposition pour leur analyses une grande quantité de données de résonances magnétiques cérébrales archivées dans l'infrastructure et (ii) les cliniciens auront la possibilité de sortir automatiquement les marqueurs des maladies neurodégénératives pour effectuer les diagnostiques des patients. NeuGRID est un portail intuitif ouvert à groupes d'utilisateurs différents, à partir des étudiants jusqu'aux neuroscientifiques les plus experts, engagés dans les domaines de la maladie d'Alzheimer, des maladies psychiatriques et des maladies de la substance blanche. NeuGRID vise à devenir une ressource amplement répandue pour l'analyse des résonances magnétiques cérébrales.</mdui:Description>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDfTCCAmWgAwIBAgIEbaA2aTANBgkqhkiG9w0BAQsFADBvMQswCQYDVQQGEwJGUjEVMBMGA1UE
-CBMMSGF1dGUtU2F2b2llMRAwDgYDVQQHEwdBcmdvbmF5MQ4wDAYDVQQKEwVtYWF0RzEOMAwGA1UE
-CxMFbWFhdEcxFzAVBgNVBAMTDm5ldWdyaWQ0eW91LmZyMB4XDTEzMTIwNDE0MzYyNVoXDTIzMTIw
-MjE0MzYyNVowbzELMAkGA1UEBhMCRlIxFTATBgNVBAgTDEhhdXRlLVNhdm9pZTEQMA4GA1UEBxMH
-QXJnb25heTEOMAwGA1UEChMFbWFhdEcxDjAMBgNVBAsTBW1hYXRHMRcwFQYDVQQDEw5uZXVncmlk
-NHlvdS5mcjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKwvYRQpDscRzuobC7VIfUFz
-3DHejMCC3s+l49pcdzngiqHvmNdtveTjg8G2HKqjcakLZZqBGmgFUMk2419BQSGt70Lvyap2Ys8k
-MFV+MX6CveGSNYDO7q6mEoDFSYDGn3YwYIXxWEnrbLxoC1TuPeUJWkgJN5zvuPZYumu5ChqPUGkv
-OfSGFEoWn4RCgzb2Fs1sQ4kGrExA0Ht+wMjy/z55hDarvrOK9dBov8oALhWrIlYc5nNu4a6xrmDz
-sDNjQZywobKSHJXjT34Ymrqvx6oP9s9Zh4nSJiBKhvOHPLsiUTyIvzRTO11sqh4IMxQtQwIrsQ+c
-P5nt2tYlSnTxCFMCAwEAAaMhMB8wHQYDVR0OBBYEFBNhnLLuvMIhcsk4yvJRBX9vsN/bMA0GCSqG
-SIb3DQEBCwUAA4IBAQAneAmyrRTMxvH+QvS9272MMrmKZ7T5krCT1BgIKbxwEHqAqww+6We2R87t
-b8znR6Jgt8SMexYL40BzR4RHXPkr39usz6ptO1Cvdv/WuB238EoqrmGCsnSx3S5Nmbunh0pyWigh
-XM4pLVkZS9b7g59KGh8gAPRrSnb6EMfQ0qf/TcrmPCCzeWVR8uF4mL65i3cZVp0IlLeY+K8lfEVO
-6TgsEuKmzs0rNbbz715rcTJVLZVvk1dFCX1wtQX9yOSBfXt4k6f0igBvy1Tuv1CRa5Qe2FMlR5h3
-avGd92x2qmbKefJkqpTfiZeGJmKwaTqXnqnpq1IQlzyHLMpFLPerP9Kv
-					    </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>
-					      MIIDfTCCAmWgAwIBAgIEbaA2aTANBgkqhkiG9w0BAQsFADBvMQswCQYDVQQGEwJGUjEVMBMGA1UE
-CBMMSGF1dGUtU2F2b2llMRAwDgYDVQQHEwdBcmdvbmF5MQ4wDAYDVQQKEwVtYWF0RzEOMAwGA1UE
-CxMFbWFhdEcxFzAVBgNVBAMTDm5ldWdyaWQ0eW91LmZyMB4XDTEzMTIwNDE0MzYyNVoXDTIzMTIw
-MjE0MzYyNVowbzELMAkGA1UEBhMCRlIxFTATBgNVBAgTDEhhdXRlLVNhdm9pZTEQMA4GA1UEBxMH
-QXJnb25heTEOMAwGA1UEChMFbWFhdEcxDjAMBgNVBAsTBW1hYXRHMRcwFQYDVQQDEw5uZXVncmlk
-NHlvdS5mcjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKwvYRQpDscRzuobC7VIfUFz
-3DHejMCC3s+l49pcdzngiqHvmNdtveTjg8G2HKqjcakLZZqBGmgFUMk2419BQSGt70Lvyap2Ys8k
-MFV+MX6CveGSNYDO7q6mEoDFSYDGn3YwYIXxWEnrbLxoC1TuPeUJWkgJN5zvuPZYumu5ChqPUGkv
-OfSGFEoWn4RCgzb2Fs1sQ4kGrExA0Ht+wMjy/z55hDarvrOK9dBov8oALhWrIlYc5nNu4a6xrmDz
-sDNjQZywobKSHJXjT34Ymrqvx6oP9s9Zh4nSJiBKhvOHPLsiUTyIvzRTO11sqh4IMxQtQwIrsQ+c
-P5nt2tYlSnTxCFMCAwEAAaMhMB8wHQYDVR0OBBYEFBNhnLLuvMIhcsk4yvJRBX9vsN/bMA0GCSqG
-SIb3DQEBCwUAA4IBAQAneAmyrRTMxvH+QvS9272MMrmKZ7T5krCT1BgIKbxwEHqAqww+6We2R87t
-b8znR6Jgt8SMexYL40BzR4RHXPkr39usz6ptO1Cvdv/WuB238EoqrmGCsnSx3S5Nmbunh0pyWigh
-XM4pLVkZS9b7g59KGh8gAPRrSnb6EMfQ0qf/TcrmPCCzeWVR8uF4mL65i3cZVp0IlLeY+K8lfEVO
-6TgsEuKmzs0rNbbz715rcTJVLZVvk1dFCX1wtQX9yOSBfXt4k6f0igBvy1Tuv1CRa5Qe2FMlR5h3
-avGd92x2qmbKefJkqpTfiZeGJmKwaTqXnqnpq1IQlzyHLMpFLPerP9Kv
-					    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://neugrid4you.eu/saml/assertion_consumer_service" index="1"/>
-    <AttributeConsumingService index="0">
-      <ServiceName xml:lang="fr">neuGRID for you</ServiceName>
-      <ServiceName xml:lang="en">neuGRID for you</ServiceName>
-      <ServiceDescription xml:lang="fr">neuGRID est un portail web dédié à la recherche scientifique dans le domaine des maladies neurodégénératives. Grâce à neuGRID (i) les neuroscientifiques auront à disposition pour leur analyses une grande quantité de données de résonances magnétiques cérébrales archivées dans l'infrastructure et (ii) les cliniciens auront la possibilité de sortir automatiquement les marqueurs des maladies neurodégénératives pour effectuer les diagnostiques des patients. NeuGRID est un portail intuitif ouvert à groupes d'utilisateurs différents, à partir des étudiants jusqu'aux neuroscientifiques les plus experts, engagés dans les domaines de la maladie d'Alzheimer, des maladies psychiatriques et des maladies de la substance blanche. NeuGRID vise à devenir une ressource amplement répandue pour l'analyse des résonances magnétiques cérébrales.</ServiceDescription>
-      <ServiceDescription xml:lang="en">neuGRID is a web portal aimed to (i) help neuroscientists do high-throughput imaging research, and (ii) provide clinical neurologists automated diagnostic imaging markers of neurodegenerative diseases for individual patient diagnosis. neuGRID’s user-friendly environment is customised to a range of users from students to senior neuroscientists working in the fields of Alzheimer’s disease, psychiatric diseases, and white matter diseases. neuGRID aims to become a widespread resource for brain imaging analyses.</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"/>
-    </AttributeConsumingService>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">MAAT FRANCE GNUBILA</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">MAAT FRANCE GNUBILA</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <EmailAddress>admin_france@lists.maatg.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/nrenadmin.redclara.net-simplesaml-saml2-sp-metadata.php.xml b/swamid-interfederations-2.0/nrenadmin.redclara.net-simplesaml-saml2-sp-metadata.php.xml
deleted file mode 100644
index b33a88d9..00000000
--- a/swamid-interfederations-2.0/nrenadmin.redclara.net-simplesaml-saml2-sp-metadata.php.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?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>MIIGZjCCBU6gAwIBAgIDEAE3MA0GCSqGSIb3DQEBBQUAMIGMMQswCQYDVQQGEwJJTDEWMBQGA1UEChMNU3RhcnRDb20gTHRkLjErMCkGA1UECxMiU2VjdXJlIERpZ2l0YWwgQ2VydGlmaWNhdGUgU2lnbmluZzE4MDYGA1UEAxMvU3RhcnRDb20gQ2xhc3MgMSBQcmltYXJ5IEludGVybWVkaWF0ZSBTZXJ2ZXIgQ0EwHhcNMTQwNDIxMDMwNjU5WhcNMTUwNDIxMTkxMDQ4WjBxMRkwFwYDVQQNExBWUnZXQTEzbkZJakpNc05CMQswCQYDVQQGEwJDTzEfMB0GA1UEAxMWbnJlbmFkbWluLnJlZGNsYXJhLm5ldDEmMCQGCSqGSIb3DQEJARYXcG9zdG1hc3RlckByZWRjbGFyYS5uZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDj3XujoWlnyY6hH90qK/WTDpdBH92jVez4ifAJoRCuNssjJP9P1w+5MUSoSakFqMMUFHFPpL46qWxaMnxNkDWDxX4f+kUEcbLgH48CLbK8ILIpa8LF3e5u8cquNvi+jGNRs7iIgm3SQBZcsftFbk/34sVDAgZwX6hY0LlGfy2MKtV/Gt3wpo1tNg/nWjMKc1kDpERmmfW5Yg/hkT61rbCnWOwmqozQLCRXNdcvCUyMrOiY9EvoYaavtnBj3hvUwHlZs1pKs0JXO90yoguHUoyqwR+MPVSIs5ulA0U8xTcHNK9uFSDTYLbY4oHrTtZgADzuF8/9Hp3QnuseVqi099+lAgMBAAGjggLpMIIC5TAJBgNVHRMEAjAAMAsGA1UdDwQEAwIDqDATBgNVHSUEDDAKBggrBgEFBQcDATAdBgNVHQ4EFgQUAIyfM8+VKauj9FFAwhFdvsdoyEQwHwYDVR0jBBgwFoAU60I00Jiwq5/0G2sI98xkLu8OLEUwLwYDVR0RBCgwJoIWbnJlbmFkbWluLnJlZGNsYXJhLm5ldIIMcmVkY2xhcmEubmV0MIIBVgYDVR0gBIIBTTCCAUkwCAYGZ4EMAQIBMIIBOwYLKwYBBAGBtTcBAgMwggEqMC4GCCsGAQUFBwIBFiJodHRwOi8vd3d3LnN0YXJ0c3NsLmNvbS9wb2xpY3kucGRmMIH3BggrBgEFBQcCAjCB6jAnFiBTdGFydENvbSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTADAgEBGoG+VGhpcyBjZXJ0aWZpY2F0ZSB3YXMgaXNzdWVkIGFjY29yZGluZyB0byB0aGUgQ2xhc3MgMSBWYWxpZGF0aW9uIHJlcXVpcmVtZW50cyBvZiB0aGUgU3RhcnRDb20gQ0EgcG9saWN5LCByZWxpYW5jZSBvbmx5IGZvciB0aGUgaW50ZW5kZWQgcHVycG9zZSBpbiBjb21wbGlhbmNlIG9mIHRoZSByZWx5aW5nIHBhcnR5IG9ibGlnYXRpb25zLjA1BgNVHR8ELjAsMCqgKKAmhiRodHRwOi8vY3JsLnN0YXJ0c3NsLmNvbS9jcnQxLWNybC5jcmwwgY4GCCsGAQUFBwEBBIGBMH8wOQYIKwYBBQUHMAGGLWh0dHA6Ly9vY3NwLnN0YXJ0c3NsLmNvbS9zdWIvY2xhc3MxL3NlcnZlci9jYTBCBggrBgEFBQcwAoY2aHR0cDovL2FpYS5zdGFydHNzbC5jb20vY2VydHMvc3ViLmNsYXNzMS5zZXJ2ZXIuY2EuY3J0MCMGA1UdEgQcMBqGGGh0dHA6Ly93d3cuc3RhcnRzc2wuY29tLzANBgkqhkiG9w0BAQUFAAOCAQEAsotw83vyRrTgGEfA6VKVfsDDZT3/dppBTKr+QR62sT3aH4XKWUnl663FZQ3lCofgSVDZvzHsQR2Lubmmku16L+RoSbB7h7/Vh5Qw9K1uhK3DWgnvH915GSB38a53kWZH5Vlc9oVfYlyXFo6/749K7wRy+Nz+2+kq5ab9Sl2OrtqUjNrL+yw4BAwZfxYSyIxi0PMfwB7+6nvS3bKBsfHjSqmo6bwXl8Jp6boEKYIQzkS4luccu7Al8FvG6/lzs5NRMDuH95EDw3fz8HxCSNyn/RtFepG1hLWpeLKRdK4cKU5wB6XcIvApwubFCmyAI4QaWTAAj2UShLzbghXGS7vuaw==
-</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>MIIGZjCCBU6gAwIBAgIDEAE3MA0GCSqGSIb3DQEBBQUAMIGMMQswCQYDVQQGEwJJTDEWMBQGA1UEChMNU3RhcnRDb20gTHRkLjErMCkGA1UECxMiU2VjdXJlIERpZ2l0YWwgQ2VydGlmaWNhdGUgU2lnbmluZzE4MDYGA1UEAxMvU3RhcnRDb20gQ2xhc3MgMSBQcmltYXJ5IEludGVybWVkaWF0ZSBTZXJ2ZXIgQ0EwHhcNMTQwNDIxMDMwNjU5WhcNMTUwNDIxMTkxMDQ4WjBxMRkwFwYDVQQNExBWUnZXQTEzbkZJakpNc05CMQswCQYDVQQGEwJDTzEfMB0GA1UEAxMWbnJlbmFkbWluLnJlZGNsYXJhLm5ldDEmMCQGCSqGSIb3DQEJARYXcG9zdG1hc3RlckByZWRjbGFyYS5uZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDj3XujoWlnyY6hH90qK/WTDpdBH92jVez4ifAJoRCuNssjJP9P1w+5MUSoSakFqMMUFHFPpL46qWxaMnxNkDWDxX4f+kUEcbLgH48CLbK8ILIpa8LF3e5u8cquNvi+jGNRs7iIgm3SQBZcsftFbk/34sVDAgZwX6hY0LlGfy2MKtV/Gt3wpo1tNg/nWjMKc1kDpERmmfW5Yg/hkT61rbCnWOwmqozQLCRXNdcvCUyMrOiY9EvoYaavtnBj3hvUwHlZs1pKs0JXO90yoguHUoyqwR+MPVSIs5ulA0U8xTcHNK9uFSDTYLbY4oHrTtZgADzuF8/9Hp3QnuseVqi099+lAgMBAAGjggLpMIIC5TAJBgNVHRMEAjAAMAsGA1UdDwQEAwIDqDATBgNVHSUEDDAKBggrBgEFBQcDATAdBgNVHQ4EFgQUAIyfM8+VKauj9FFAwhFdvsdoyEQwHwYDVR0jBBgwFoAU60I00Jiwq5/0G2sI98xkLu8OLEUwLwYDVR0RBCgwJoIWbnJlbmFkbWluLnJlZGNsYXJhLm5ldIIMcmVkY2xhcmEubmV0MIIBVgYDVR0gBIIBTTCCAUkwCAYGZ4EMAQIBMIIBOwYLKwYBBAGBtTcBAgMwggEqMC4GCCsGAQUFBwIBFiJodHRwOi8vd3d3LnN0YXJ0c3NsLmNvbS9wb2xpY3kucGRmMIH3BggrBgEFBQcCAjCB6jAnFiBTdGFydENvbSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTADAgEBGoG+VGhpcyBjZXJ0aWZpY2F0ZSB3YXMgaXNzdWVkIGFjY29yZGluZyB0byB0aGUgQ2xhc3MgMSBWYWxpZGF0aW9uIHJlcXVpcmVtZW50cyBvZiB0aGUgU3RhcnRDb20gQ0EgcG9saWN5LCByZWxpYW5jZSBvbmx5IGZvciB0aGUgaW50ZW5kZWQgcHVycG9zZSBpbiBjb21wbGlhbmNlIG9mIHRoZSByZWx5aW5nIHBhcnR5IG9ibGlnYXRpb25zLjA1BgNVHR8ELjAsMCqgKKAmhiRodHRwOi8vY3JsLnN0YXJ0c3NsLmNvbS9jcnQxLWNybC5jcmwwgY4GCCsGAQUFBwEBBIGBMH8wOQYIKwYBBQUHMAGGLWh0dHA6Ly9vY3NwLnN0YXJ0c3NsLmNvbS9zdWIvY2xhc3MxL3NlcnZlci9jYTBCBggrBgEFBQcwAoY2aHR0cDovL2FpYS5zdGFydHNzbC5jb20vY2VydHMvc3ViLmNsYXNzMS5zZXJ2ZXIuY2EuY3J0MCMGA1UdEgQcMBqGGGh0dHA6Ly93d3cuc3RhcnRzc2wuY29tLzANBgkqhkiG9w0BAQUFAAOCAQEAsotw83vyRrTgGEfA6VKVfsDDZT3/dppBTKr+QR62sT3aH4XKWUnl663FZQ3lCofgSVDZvzHsQR2Lubmmku16L+RoSbB7h7/Vh5Qw9K1uhK3DWgnvH915GSB38a53kWZH5Vlc9oVfYlyXFo6/749K7wRy+Nz+2+kq5ab9Sl2OrtqUjNrL+yw4BAwZfxYSyIxi0PMfwB7+6nvS3bKBsfHjSqmo6bwXl8Jp6boEKYIQzkS4luccu7Al8FvG6/lzs5NRMDuH95EDw3fz8HxCSNyn/RtFepG1hLWpeLKRdK4cKU5wB6XcIvApwubFCmyAI4QaWTAAj2UShLzbghXGS7vuaw==
-</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/nrenadmin.redclara.net.xml b/swamid-interfederations-2.0/nrenadmin.redclara.net.xml
deleted file mode 100644
index b33a88d9..00000000
--- a/swamid-interfederations-2.0/nrenadmin.redclara.net.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?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>MIIGZjCCBU6gAwIBAgIDEAE3MA0GCSqGSIb3DQEBBQUAMIGMMQswCQYDVQQGEwJJTDEWMBQGA1UEChMNU3RhcnRDb20gTHRkLjErMCkGA1UECxMiU2VjdXJlIERpZ2l0YWwgQ2VydGlmaWNhdGUgU2lnbmluZzE4MDYGA1UEAxMvU3RhcnRDb20gQ2xhc3MgMSBQcmltYXJ5IEludGVybWVkaWF0ZSBTZXJ2ZXIgQ0EwHhcNMTQwNDIxMDMwNjU5WhcNMTUwNDIxMTkxMDQ4WjBxMRkwFwYDVQQNExBWUnZXQTEzbkZJakpNc05CMQswCQYDVQQGEwJDTzEfMB0GA1UEAxMWbnJlbmFkbWluLnJlZGNsYXJhLm5ldDEmMCQGCSqGSIb3DQEJARYXcG9zdG1hc3RlckByZWRjbGFyYS5uZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDj3XujoWlnyY6hH90qK/WTDpdBH92jVez4ifAJoRCuNssjJP9P1w+5MUSoSakFqMMUFHFPpL46qWxaMnxNkDWDxX4f+kUEcbLgH48CLbK8ILIpa8LF3e5u8cquNvi+jGNRs7iIgm3SQBZcsftFbk/34sVDAgZwX6hY0LlGfy2MKtV/Gt3wpo1tNg/nWjMKc1kDpERmmfW5Yg/hkT61rbCnWOwmqozQLCRXNdcvCUyMrOiY9EvoYaavtnBj3hvUwHlZs1pKs0JXO90yoguHUoyqwR+MPVSIs5ulA0U8xTcHNK9uFSDTYLbY4oHrTtZgADzuF8/9Hp3QnuseVqi099+lAgMBAAGjggLpMIIC5TAJBgNVHRMEAjAAMAsGA1UdDwQEAwIDqDATBgNVHSUEDDAKBggrBgEFBQcDATAdBgNVHQ4EFgQUAIyfM8+VKauj9FFAwhFdvsdoyEQwHwYDVR0jBBgwFoAU60I00Jiwq5/0G2sI98xkLu8OLEUwLwYDVR0RBCgwJoIWbnJlbmFkbWluLnJlZGNsYXJhLm5ldIIMcmVkY2xhcmEubmV0MIIBVgYDVR0gBIIBTTCCAUkwCAYGZ4EMAQIBMIIBOwYLKwYBBAGBtTcBAgMwggEqMC4GCCsGAQUFBwIBFiJodHRwOi8vd3d3LnN0YXJ0c3NsLmNvbS9wb2xpY3kucGRmMIH3BggrBgEFBQcCAjCB6jAnFiBTdGFydENvbSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTADAgEBGoG+VGhpcyBjZXJ0aWZpY2F0ZSB3YXMgaXNzdWVkIGFjY29yZGluZyB0byB0aGUgQ2xhc3MgMSBWYWxpZGF0aW9uIHJlcXVpcmVtZW50cyBvZiB0aGUgU3RhcnRDb20gQ0EgcG9saWN5LCByZWxpYW5jZSBvbmx5IGZvciB0aGUgaW50ZW5kZWQgcHVycG9zZSBpbiBjb21wbGlhbmNlIG9mIHRoZSByZWx5aW5nIHBhcnR5IG9ibGlnYXRpb25zLjA1BgNVHR8ELjAsMCqgKKAmhiRodHRwOi8vY3JsLnN0YXJ0c3NsLmNvbS9jcnQxLWNybC5jcmwwgY4GCCsGAQUFBwEBBIGBMH8wOQYIKwYBBQUHMAGGLWh0dHA6Ly9vY3NwLnN0YXJ0c3NsLmNvbS9zdWIvY2xhc3MxL3NlcnZlci9jYTBCBggrBgEFBQcwAoY2aHR0cDovL2FpYS5zdGFydHNzbC5jb20vY2VydHMvc3ViLmNsYXNzMS5zZXJ2ZXIuY2EuY3J0MCMGA1UdEgQcMBqGGGh0dHA6Ly93d3cuc3RhcnRzc2wuY29tLzANBgkqhkiG9w0BAQUFAAOCAQEAsotw83vyRrTgGEfA6VKVfsDDZT3/dppBTKr+QR62sT3aH4XKWUnl663FZQ3lCofgSVDZvzHsQR2Lubmmku16L+RoSbB7h7/Vh5Qw9K1uhK3DWgnvH915GSB38a53kWZH5Vlc9oVfYlyXFo6/749K7wRy+Nz+2+kq5ab9Sl2OrtqUjNrL+yw4BAwZfxYSyIxi0PMfwB7+6nvS3bKBsfHjSqmo6bwXl8Jp6boEKYIQzkS4luccu7Al8FvG6/lzs5NRMDuH95EDw3fz8HxCSNyn/RtFepG1hLWpeLKRdK4cKU5wB6XcIvApwubFCmyAI4QaWTAAj2UShLzbghXGS7vuaw==
-</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>MIIGZjCCBU6gAwIBAgIDEAE3MA0GCSqGSIb3DQEBBQUAMIGMMQswCQYDVQQGEwJJTDEWMBQGA1UEChMNU3RhcnRDb20gTHRkLjErMCkGA1UECxMiU2VjdXJlIERpZ2l0YWwgQ2VydGlmaWNhdGUgU2lnbmluZzE4MDYGA1UEAxMvU3RhcnRDb20gQ2xhc3MgMSBQcmltYXJ5IEludGVybWVkaWF0ZSBTZXJ2ZXIgQ0EwHhcNMTQwNDIxMDMwNjU5WhcNMTUwNDIxMTkxMDQ4WjBxMRkwFwYDVQQNExBWUnZXQTEzbkZJakpNc05CMQswCQYDVQQGEwJDTzEfMB0GA1UEAxMWbnJlbmFkbWluLnJlZGNsYXJhLm5ldDEmMCQGCSqGSIb3DQEJARYXcG9zdG1hc3RlckByZWRjbGFyYS5uZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDj3XujoWlnyY6hH90qK/WTDpdBH92jVez4ifAJoRCuNssjJP9P1w+5MUSoSakFqMMUFHFPpL46qWxaMnxNkDWDxX4f+kUEcbLgH48CLbK8ILIpa8LF3e5u8cquNvi+jGNRs7iIgm3SQBZcsftFbk/34sVDAgZwX6hY0LlGfy2MKtV/Gt3wpo1tNg/nWjMKc1kDpERmmfW5Yg/hkT61rbCnWOwmqozQLCRXNdcvCUyMrOiY9EvoYaavtnBj3hvUwHlZs1pKs0JXO90yoguHUoyqwR+MPVSIs5ulA0U8xTcHNK9uFSDTYLbY4oHrTtZgADzuF8/9Hp3QnuseVqi099+lAgMBAAGjggLpMIIC5TAJBgNVHRMEAjAAMAsGA1UdDwQEAwIDqDATBgNVHSUEDDAKBggrBgEFBQcDATAdBgNVHQ4EFgQUAIyfM8+VKauj9FFAwhFdvsdoyEQwHwYDVR0jBBgwFoAU60I00Jiwq5/0G2sI98xkLu8OLEUwLwYDVR0RBCgwJoIWbnJlbmFkbWluLnJlZGNsYXJhLm5ldIIMcmVkY2xhcmEubmV0MIIBVgYDVR0gBIIBTTCCAUkwCAYGZ4EMAQIBMIIBOwYLKwYBBAGBtTcBAgMwggEqMC4GCCsGAQUFBwIBFiJodHRwOi8vd3d3LnN0YXJ0c3NsLmNvbS9wb2xpY3kucGRmMIH3BggrBgEFBQcCAjCB6jAnFiBTdGFydENvbSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTADAgEBGoG+VGhpcyBjZXJ0aWZpY2F0ZSB3YXMgaXNzdWVkIGFjY29yZGluZyB0byB0aGUgQ2xhc3MgMSBWYWxpZGF0aW9uIHJlcXVpcmVtZW50cyBvZiB0aGUgU3RhcnRDb20gQ0EgcG9saWN5LCByZWxpYW5jZSBvbmx5IGZvciB0aGUgaW50ZW5kZWQgcHVycG9zZSBpbiBjb21wbGlhbmNlIG9mIHRoZSByZWx5aW5nIHBhcnR5IG9ibGlnYXRpb25zLjA1BgNVHR8ELjAsMCqgKKAmhiRodHRwOi8vY3JsLnN0YXJ0c3NsLmNvbS9jcnQxLWNybC5jcmwwgY4GCCsGAQUFBwEBBIGBMH8wOQYIKwYBBQUHMAGGLWh0dHA6Ly9vY3NwLnN0YXJ0c3NsLmNvbS9zdWIvY2xhc3MxL3NlcnZlci9jYTBCBggrBgEFBQcwAoY2aHR0cDovL2FpYS5zdGFydHNzbC5jb20vY2VydHMvc3ViLmNsYXNzMS5zZXJ2ZXIuY2EuY3J0MCMGA1UdEgQcMBqGGGh0dHA6Ly93d3cuc3RhcnRzc2wuY29tLzANBgkqhkiG9w0BAQUFAAOCAQEAsotw83vyRrTgGEfA6VKVfsDDZT3/dppBTKr+QR62sT3aH4XKWUnl663FZQ3lCofgSVDZvzHsQR2Lubmmku16L+RoSbB7h7/Vh5Qw9K1uhK3DWgnvH915GSB38a53kWZH5Vlc9oVfYlyXFo6/749K7wRy+Nz+2+kq5ab9Sl2OrtqUjNrL+yw4BAwZfxYSyIxi0PMfwB7+6nvS3bKBsfHjSqmo6bwXl8Jp6boEKYIQzkS4luccu7Al8FvG6/lzs5NRMDuH95EDw3fz8HxCSNyn/RtFepG1hLWpeLKRdK4cKU5wB6XcIvApwubFCmyAI4QaWTAAj2UShLzbghXGS7vuaw==
-</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/ns.crous-dijon.fr.xml b/swamid-interfederations-2.0/ns.crous-dijon.fr.xml
deleted file mode 100644
index 9d7976b1..00000000
--- a/swamid-interfederations-2.0/ns.crous-dijon.fr.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://ns.crous-dijon.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2011-02-09T10:59:17Z">
-      <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">crous-dijon.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">CROUS Dijon - Etudiants</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIElzCCA3+gAwIBAgIQPy2p2aIoYIpWK8V4WYOlrTANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTE0MDExNDAwMDAwMFoXDTE3MDExMzIzNTk1OVowPzEhMB8GA1UE
-CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRowGAYDVQQDExFucy5jcm91cy1k
-aWpvbi5mcjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALlULhbUbSZZ
-ik9LO5LVULgpq7eM5tkVzUImTKNOFNtatWJ4rmoyqmRhFou4BcZyWc1On6F5GS9D
-xQf3V6xBVRgAXtzmELYyQq5p4yZNpYIYDNULbQOpZjryJiSreNrW6c561kg3eYHa
-jVEFP0eJGbGg6XXcRPzGbxdPIL3Oc2ahZEs/zmXZcj2pDrHkMR79xrAUBaOYyRIj
-n754kFQEtoKkDL9MSLaZ/NJdqT+QUbl35/cmedIKZTNRdfC4Xa6kvFIZVcdj1UGC
-O3xT53Tad84nadugsGs/0XlbSN7QmYf4kbJtFNlXGuAUeY4SSx0JCNg7s1FKmdiD
-/dgx48vnZtsCAwEAAaOCAZYwggGSMB8GA1UdIwQYMBaAFAy9k2gM896ro0lrKzdX
-R+qQ47ntMB0GA1UdDgQWBBQSmA3rsZAkJYNUFNcFHPD6UaQM8DAOBgNVHQ8BAf8E
-BAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUH
-AwIwIgYDVR0gBBswGTANBgsrBgEEAbIxAQICHTAIBgZngQwBAgEwOgYDVR0fBDMw
-MTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5j
-cmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRjcy50
-ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDovL29j
-c3AudGNzLnRlcmVuYS5vcmcwRAYDVR0RBD0wO4IRbnMuY3JvdXMtZGlqb24uZnKC
-EmNhcy5jcm91cy1kaWpvbi5mcoISaWRwLmNyb3VzLWRpam9uLmZyMA0GCSqGSIb3
-DQEBBQUAA4IBAQA9wIxao4C3Oge+045uprk+C2bS2WSCSmFlpuIZbqP5G/VEI/7l
-YCWSI5xD3RgdivsuXmgZvXockOSj91wdFXwYxE7WZxErOdZp4jA+8GJAy2f9Ak5B
-LPor+zf7pe39wFu+zPlzjUMDTql23vukRPDcqb3DWjm0ibTUu0KRvkeYJ0fAMbOU
-1hsjTWkLBGi4LKupWES8WRxzPD/L/BQd4ePDxHgtWItmYnN91MtAzUj2/r+62Zb/
-ZliaTGvV25FhtxaQQm6Chii9JX70Msc15tnF+q3teIwAJlSbeajJ5dbTFh7Fj4uX
-01zcnufjYWR7N9j6OzzH/86anQIp5WXDWAdi
-					    </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>
-					      MIIErzCCA5egAwIBAgIRAPce78VI0mZGzFqgRgussIEwDQYJKoZIhvcNAQEFBQAw
-NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-IFNTTCBDQTAeFw0xMTAxMTIwMDAwMDBaFw0xNDAxMTEyMzU5NTlaMGAxCzAJBgNV
-BAYTAkZSMQ4wDAYDVQQHEwVEaWpvbjEXMBUGA1UEChMOQ1JPVVMgZGUgRElKT04x
-DDAKBgNVBAsTA0RTSTEaMBgGA1UEAxMRbnMuY3JvdXMtZGlqb24uZnIwggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC4CnU/wibyinuaPI2EqcrvmaWCV9dz
-Z9zkKanUn0KVoPGaFayhJCI/H0c5D+FEJl/lsA0YKzghi8baSc8L+pmq+LV4DF0k
-k3Ke9Yfn9gDr5Y+IadmSo7nmxiE42LJrFZBSzPrqK7HClDKskkgHu6lIXX3vDwX9
-NTUWOITDsqh+iLziudBc4DLim1brrMVwdpZVwCGWixI+pnx+Mn1KaLkW2migteMW
-TvAj7uf37zucUa0RhHXI5IbsmRXsH04r7Xq2et74nQETmGS861kBfEtqNWs8oZNF
-GGT4y7VCq4XIN2ZFp7xZetyzEkrlaGxJyL+2H0PFy2PJkVgU0BRpEA//AgMBAAGj
-ggGMMIIBiDAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3V0fqkOO57TAdBgNVHQ4E
-FgQUkCg4s3FgI7pzpdqRGT3IeDfAkSUwDgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB
-/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMBgGA1UdIAQRMA8w
-DQYLKwYBBAGyMQECAh0wOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3Mu
-dGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsG
-AQUFBzAChilodHRwOi8vY3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNy
-dDAmBggrBgEFBQcwAYYaaHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwRAYDVR0R
-BD0wO4IRbnMuY3JvdXMtZGlqb24uZnKCEmNhcy5jcm91cy1kaWpvbi5mcoISaWRw
-LmNyb3VzLWRpam9uLmZyMA0GCSqGSIb3DQEBBQUAA4IBAQAIUjdnsILs5B0S4r30
-7X842J3m5zaE7xQ2kKKAa8FiF2TNZ+dzQQDbYrB8+nLD85ziWEwLzqGPHulDWbTI
-YxUX6Stt/KMW5frhCXX2i7hEp3gfKazu+jXou9ISXRuqKCU198d2Ic1Pqu8VoxwF
-7BgmqM7TDu+t8FTDF7rufbSKwCIR+yY+3oHtdNlZEdGCvCGOakfBEgqyZ4H6USuH
-WOVN0EpwAIdhLCQfwekeOM9ZulAKFYRB5tEKfmWS1aqo/7wNx71fJdjFV2mOkdcX
-B3ix6dIX1SsZx0ffnk3wPlrx6RGiItqiVD6gPDlUY/BRftSiyH/EEEM00YzHtqO/
-iTNj
-					    </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://ns.crous-dijon.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ns.crous-dijon.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://ns.crous-dijon.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">crous-dijon.fr</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIElzCCA3+gAwIBAgIQPy2p2aIoYIpWK8V4WYOlrTANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTE0MDExNDAwMDAwMFoXDTE3MDExMzIzNTk1OVowPzEhMB8GA1UE
-CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRowGAYDVQQDExFucy5jcm91cy1k
-aWpvbi5mcjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALlULhbUbSZZ
-ik9LO5LVULgpq7eM5tkVzUImTKNOFNtatWJ4rmoyqmRhFou4BcZyWc1On6F5GS9D
-xQf3V6xBVRgAXtzmELYyQq5p4yZNpYIYDNULbQOpZjryJiSreNrW6c561kg3eYHa
-jVEFP0eJGbGg6XXcRPzGbxdPIL3Oc2ahZEs/zmXZcj2pDrHkMR79xrAUBaOYyRIj
-n754kFQEtoKkDL9MSLaZ/NJdqT+QUbl35/cmedIKZTNRdfC4Xa6kvFIZVcdj1UGC
-O3xT53Tad84nadugsGs/0XlbSN7QmYf4kbJtFNlXGuAUeY4SSx0JCNg7s1FKmdiD
-/dgx48vnZtsCAwEAAaOCAZYwggGSMB8GA1UdIwQYMBaAFAy9k2gM896ro0lrKzdX
-R+qQ47ntMB0GA1UdDgQWBBQSmA3rsZAkJYNUFNcFHPD6UaQM8DAOBgNVHQ8BAf8E
-BAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUH
-AwIwIgYDVR0gBBswGTANBgsrBgEEAbIxAQICHTAIBgZngQwBAgEwOgYDVR0fBDMw
-MTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5j
-cmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRjcy50
-ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDovL29j
-c3AudGNzLnRlcmVuYS5vcmcwRAYDVR0RBD0wO4IRbnMuY3JvdXMtZGlqb24uZnKC
-EmNhcy5jcm91cy1kaWpvbi5mcoISaWRwLmNyb3VzLWRpam9uLmZyMA0GCSqGSIb3
-DQEBBQUAA4IBAQA9wIxao4C3Oge+045uprk+C2bS2WSCSmFlpuIZbqP5G/VEI/7l
-YCWSI5xD3RgdivsuXmgZvXockOSj91wdFXwYxE7WZxErOdZp4jA+8GJAy2f9Ak5B
-LPor+zf7pe39wFu+zPlzjUMDTql23vukRPDcqb3DWjm0ibTUu0KRvkeYJ0fAMbOU
-1hsjTWkLBGi4LKupWES8WRxzPD/L/BQd4ePDxHgtWItmYnN91MtAzUj2/r+62Zb/
-ZliaTGvV25FhtxaQQm6Chii9JX70Msc15tnF+q3teIwAJlSbeajJ5dbTFh7Fj4uX
-01zcnufjYWR7N9j6OzzH/86anQIp5WXDWAdi
-					    </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>
-					      MIIErzCCA5egAwIBAgIRAPce78VI0mZGzFqgRgussIEwDQYJKoZIhvcNAQEFBQAw
-NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-IFNTTCBDQTAeFw0xMTAxMTIwMDAwMDBaFw0xNDAxMTEyMzU5NTlaMGAxCzAJBgNV
-BAYTAkZSMQ4wDAYDVQQHEwVEaWpvbjEXMBUGA1UEChMOQ1JPVVMgZGUgRElKT04x
-DDAKBgNVBAsTA0RTSTEaMBgGA1UEAxMRbnMuY3JvdXMtZGlqb24uZnIwggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC4CnU/wibyinuaPI2EqcrvmaWCV9dz
-Z9zkKanUn0KVoPGaFayhJCI/H0c5D+FEJl/lsA0YKzghi8baSc8L+pmq+LV4DF0k
-k3Ke9Yfn9gDr5Y+IadmSo7nmxiE42LJrFZBSzPrqK7HClDKskkgHu6lIXX3vDwX9
-NTUWOITDsqh+iLziudBc4DLim1brrMVwdpZVwCGWixI+pnx+Mn1KaLkW2migteMW
-TvAj7uf37zucUa0RhHXI5IbsmRXsH04r7Xq2et74nQETmGS861kBfEtqNWs8oZNF
-GGT4y7VCq4XIN2ZFp7xZetyzEkrlaGxJyL+2H0PFy2PJkVgU0BRpEA//AgMBAAGj
-ggGMMIIBiDAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3V0fqkOO57TAdBgNVHQ4E
-FgQUkCg4s3FgI7pzpdqRGT3IeDfAkSUwDgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB
-/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMBgGA1UdIAQRMA8w
-DQYLKwYBBAGyMQECAh0wOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3Mu
-dGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsG
-AQUFBzAChilodHRwOi8vY3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNy
-dDAmBggrBgEFBQcwAYYaaHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwRAYDVR0R
-BD0wO4IRbnMuY3JvdXMtZGlqb24uZnKCEmNhcy5jcm91cy1kaWpvbi5mcoISaWRw
-LmNyb3VzLWRpam9uLmZyMA0GCSqGSIb3DQEBBQUAA4IBAQAIUjdnsILs5B0S4r30
-7X842J3m5zaE7xQ2kKKAa8FiF2TNZ+dzQQDbYrB8+nLD85ziWEwLzqGPHulDWbTI
-YxUX6Stt/KMW5frhCXX2i7hEp3gfKazu+jXou9ISXRuqKCU198d2Ic1Pqu8VoxwF
-7BgmqM7TDu+t8FTDF7rufbSKwCIR+yY+3oHtdNlZEdGCvCGOakfBEgqyZ4H6USuH
-WOVN0EpwAIdhLCQfwekeOM9ZulAKFYRB5tEKfmWS1aqo/7wNx71fJdjFV2mOkdcX
-B3ix6dIX1SsZx0ffnk3wPlrx6RGiItqiVD6gPDlUY/BRftSiyH/EEEM00YzHtqO/
-iTNj
-					    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://ns.crous-dijon.fr/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">CROUS Dijon - Etudiants</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">CROUS Dijon - Etudiants</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>PERROT Olivier</SurName>
-    <EmailAddress>olivier.perrot@crous-dijon.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/nte.gemtech.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/nte.gemtech.fr-idp-shibboleth.xml
deleted file mode 100644
index a45e95fc..00000000
--- a/swamid-interfederations-2.0/nte.gemtech.fr-idp-shibboleth.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://nte.gemtech.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2009-05-27T18:55:09Z">
-      <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">emn.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">Ecole des Mines de Nantes</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDJDCCAgygAwIBAgIVAJZdt1xPd7UWKJgii2kanwcKApotMA0GCSqGSIb3DQEB
-BQUAMBkxFzAVBgNVBAMTDm50ZS5nZW10ZWNoLmZyMB4XDTA5MDUyMDE3MjgyNFoX
-DTI5MDUyMDE3MjgyNFowGTEXMBUGA1UEAxMObnRlLmdlbXRlY2guZnIwggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC4iCTgrLcSAZX5/Lvf3AIy7IUEL0dH
-WFyInLn9KME0MwePaECP/y7/GkdmfseeUUvEXPVgEIviQjgqN46wW0dg4G+CdBhw
-VLr+msYPS5upRMnmGuhtyovd425MhUBMRPn0ugicPwQF2u7wqM27SsimUUPZojZj
-IZ4pB244wrF+iFAcwPhvQo7pzEi5nzSisrWhVD3oxYp2nCwNQGsl6ClGr8gUeu8/
-uIAuwP5gLjBV4WLlObeDw3oudCc8RhBtEHevmcO10TAo67Ny7LT+4hKC+OV79sAQ
-us8coX2KRr2nqdCYdIKuhtYmaoZdi44PcdfGPzqgQvfsJYGhllVED+LrAgMBAAGj
-YzBhMEAGA1UdEQQ5MDeCDm50ZS5nZW10ZWNoLmZyhiVodHRwczovL250ZS5nZW10
-ZWNoLmZyL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBSiUapEWm278Sxm5q+fQP2N
-STunvjANBgkqhkiG9w0BAQUFAAOCAQEAe5xGN3CE9neVaPtex7sVpzIkNqtkoHWN
-jtDNpIWy+Uyv8eO9iBsdufVxmkCznTOqDggis3g6AeSHzsy2+LILeuIOq1hXcHXR
-O1WbkwBXfOzgEokck5HY/n4oWyJGnL9zoo6hE5GnG6sOuotxoquUO1jM/nEXfH+Y
-xuxFuAJhtGsxX+IKX7q9UQtmWodSeKZq09RjkIN5nEaJnBz3EKiriRxilPtlCjHS
-WXvTzCxC7xk1+kCao131/bzEtbti5aXRVPrO0Z61nXwQPsxds+6PNaRmx27CLb0P
-IPUU8qHH25+VWAP/+xbiYvjkfnKh31IHhDHHM47hBpibHchhCe680w==
-					    </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://nte.gemtech.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nte.gemtech.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://nte.gemtech.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">emn.fr</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDJDCCAgygAwIBAgIVAJZdt1xPd7UWKJgii2kanwcKApotMA0GCSqGSIb3DQEB
-BQUAMBkxFzAVBgNVBAMTDm50ZS5nZW10ZWNoLmZyMB4XDTA5MDUyMDE3MjgyNFoX
-DTI5MDUyMDE3MjgyNFowGTEXMBUGA1UEAxMObnRlLmdlbXRlY2guZnIwggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC4iCTgrLcSAZX5/Lvf3AIy7IUEL0dH
-WFyInLn9KME0MwePaECP/y7/GkdmfseeUUvEXPVgEIviQjgqN46wW0dg4G+CdBhw
-VLr+msYPS5upRMnmGuhtyovd425MhUBMRPn0ugicPwQF2u7wqM27SsimUUPZojZj
-IZ4pB244wrF+iFAcwPhvQo7pzEi5nzSisrWhVD3oxYp2nCwNQGsl6ClGr8gUeu8/
-uIAuwP5gLjBV4WLlObeDw3oudCc8RhBtEHevmcO10TAo67Ny7LT+4hKC+OV79sAQ
-us8coX2KRr2nqdCYdIKuhtYmaoZdi44PcdfGPzqgQvfsJYGhllVED+LrAgMBAAGj
-YzBhMEAGA1UdEQQ5MDeCDm50ZS5nZW10ZWNoLmZyhiVodHRwczovL250ZS5nZW10
-ZWNoLmZyL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBSiUapEWm278Sxm5q+fQP2N
-STunvjANBgkqhkiG9w0BAQUFAAOCAQEAe5xGN3CE9neVaPtex7sVpzIkNqtkoHWN
-jtDNpIWy+Uyv8eO9iBsdufVxmkCznTOqDggis3g6AeSHzsy2+LILeuIOq1hXcHXR
-O1WbkwBXfOzgEokck5HY/n4oWyJGnL9zoo6hE5GnG6sOuotxoquUO1jM/nEXfH+Y
-xuxFuAJhtGsxX+IKX7q9UQtmWodSeKZq09RjkIN5nEaJnBz3EKiriRxilPtlCjHS
-WXvTzCxC7xk1+kCao131/bzEtbti5aXRVPrO0Z61nXwQPsxds+6PNaRmx27CLb0P
-IPUU8qHH25+VWAP/+xbiYvjkfnKh31IHhDHHM47hBpibHchhCe680w==
-					    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nte.gemtech.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 des Mines de Nantes</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Ecole des Mines de Nantes</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Christian Janin</SurName>
-    <EmailAddress>Christian.Janin@emn.fr</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <SurName>Alain  Bouyahyiaoui</SurName>
-    <EmailAddress>Alain.Bouyahyiaoui@emn.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/nte.gemtech.fr.xml b/swamid-interfederations-2.0/nte.gemtech.fr.xml
deleted file mode 100644
index a45e95fc..00000000
--- a/swamid-interfederations-2.0/nte.gemtech.fr.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://nte.gemtech.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2009-05-27T18:55:09Z">
-      <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">emn.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">Ecole des Mines de Nantes</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDJDCCAgygAwIBAgIVAJZdt1xPd7UWKJgii2kanwcKApotMA0GCSqGSIb3DQEB
-BQUAMBkxFzAVBgNVBAMTDm50ZS5nZW10ZWNoLmZyMB4XDTA5MDUyMDE3MjgyNFoX
-DTI5MDUyMDE3MjgyNFowGTEXMBUGA1UEAxMObnRlLmdlbXRlY2guZnIwggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC4iCTgrLcSAZX5/Lvf3AIy7IUEL0dH
-WFyInLn9KME0MwePaECP/y7/GkdmfseeUUvEXPVgEIviQjgqN46wW0dg4G+CdBhw
-VLr+msYPS5upRMnmGuhtyovd425MhUBMRPn0ugicPwQF2u7wqM27SsimUUPZojZj
-IZ4pB244wrF+iFAcwPhvQo7pzEi5nzSisrWhVD3oxYp2nCwNQGsl6ClGr8gUeu8/
-uIAuwP5gLjBV4WLlObeDw3oudCc8RhBtEHevmcO10TAo67Ny7LT+4hKC+OV79sAQ
-us8coX2KRr2nqdCYdIKuhtYmaoZdi44PcdfGPzqgQvfsJYGhllVED+LrAgMBAAGj
-YzBhMEAGA1UdEQQ5MDeCDm50ZS5nZW10ZWNoLmZyhiVodHRwczovL250ZS5nZW10
-ZWNoLmZyL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBSiUapEWm278Sxm5q+fQP2N
-STunvjANBgkqhkiG9w0BAQUFAAOCAQEAe5xGN3CE9neVaPtex7sVpzIkNqtkoHWN
-jtDNpIWy+Uyv8eO9iBsdufVxmkCznTOqDggis3g6AeSHzsy2+LILeuIOq1hXcHXR
-O1WbkwBXfOzgEokck5HY/n4oWyJGnL9zoo6hE5GnG6sOuotxoquUO1jM/nEXfH+Y
-xuxFuAJhtGsxX+IKX7q9UQtmWodSeKZq09RjkIN5nEaJnBz3EKiriRxilPtlCjHS
-WXvTzCxC7xk1+kCao131/bzEtbti5aXRVPrO0Z61nXwQPsxds+6PNaRmx27CLb0P
-IPUU8qHH25+VWAP/+xbiYvjkfnKh31IHhDHHM47hBpibHchhCe680w==
-					    </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://nte.gemtech.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nte.gemtech.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://nte.gemtech.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">emn.fr</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDJDCCAgygAwIBAgIVAJZdt1xPd7UWKJgii2kanwcKApotMA0GCSqGSIb3DQEB
-BQUAMBkxFzAVBgNVBAMTDm50ZS5nZW10ZWNoLmZyMB4XDTA5MDUyMDE3MjgyNFoX
-DTI5MDUyMDE3MjgyNFowGTEXMBUGA1UEAxMObnRlLmdlbXRlY2guZnIwggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC4iCTgrLcSAZX5/Lvf3AIy7IUEL0dH
-WFyInLn9KME0MwePaECP/y7/GkdmfseeUUvEXPVgEIviQjgqN46wW0dg4G+CdBhw
-VLr+msYPS5upRMnmGuhtyovd425MhUBMRPn0ugicPwQF2u7wqM27SsimUUPZojZj
-IZ4pB244wrF+iFAcwPhvQo7pzEi5nzSisrWhVD3oxYp2nCwNQGsl6ClGr8gUeu8/
-uIAuwP5gLjBV4WLlObeDw3oudCc8RhBtEHevmcO10TAo67Ny7LT+4hKC+OV79sAQ
-us8coX2KRr2nqdCYdIKuhtYmaoZdi44PcdfGPzqgQvfsJYGhllVED+LrAgMBAAGj
-YzBhMEAGA1UdEQQ5MDeCDm50ZS5nZW10ZWNoLmZyhiVodHRwczovL250ZS5nZW10
-ZWNoLmZyL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBSiUapEWm278Sxm5q+fQP2N
-STunvjANBgkqhkiG9w0BAQUFAAOCAQEAe5xGN3CE9neVaPtex7sVpzIkNqtkoHWN
-jtDNpIWy+Uyv8eO9iBsdufVxmkCznTOqDggis3g6AeSHzsy2+LILeuIOq1hXcHXR
-O1WbkwBXfOzgEokck5HY/n4oWyJGnL9zoo6hE5GnG6sOuotxoquUO1jM/nEXfH+Y
-xuxFuAJhtGsxX+IKX7q9UQtmWodSeKZq09RjkIN5nEaJnBz3EKiriRxilPtlCjHS
-WXvTzCxC7xk1+kCao131/bzEtbti5aXRVPrO0Z61nXwQPsxds+6PNaRmx27CLb0P
-IPUU8qHH25+VWAP/+xbiYvjkfnKh31IHhDHHM47hBpibHchhCe680w==
-					    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nte.gemtech.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 des Mines de Nantes</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Ecole des Mines de Nantes</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Christian Janin</SurName>
-    <EmailAddress>Christian.Janin@emn.fr</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <SurName>Alain  Bouyahyiaoui</SurName>
-    <EmailAddress>Alain.Bouyahyiaoui@emn.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/openskos.meertens.knaw.nl-shibboleth.xml b/swamid-interfederations-2.0/openskos.meertens.knaw.nl-shibboleth.xml
deleted file mode 100644
index 6df6866d..00000000
--- a/swamid-interfederations-2.0/openskos.meertens.knaw.nl-shibboleth.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://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>
-  </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>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</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">e404</OrganizationName>
-    <OrganizationName xml:lang="en">e404</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">Meertens Institute</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">Meertens Institute</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.meertens.knaw.nl</OrganizationURL>
-    <OrganizationURL xml:lang="en">http://www.meertens.knaw.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/openskos.meertens.knaw.nl.xml b/swamid-interfederations-2.0/openskos.meertens.knaw.nl.xml
deleted file mode 100644
index 6df6866d..00000000
--- a/swamid-interfederations-2.0/openskos.meertens.knaw.nl.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://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>
-  </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>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</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">e404</OrganizationName>
-    <OrganizationName xml:lang="en">e404</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">Meertens Institute</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">Meertens Institute</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.meertens.knaw.nl</OrganizationURL>
-    <OrganizationURL xml:lang="en">http://www.meertens.knaw.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.uninett.no-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml b/swamid-interfederations-2.0/openwiki.uninett.no-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
index 0d66e714..8e67777f 100644
--- a/swamid-interfederations-2.0/openwiki.uninett.no-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
+++ b/swamid-interfederations-2.0/openwiki.uninett.no-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
@@ -1,28 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://openwiki.uninett.no/simplesaml/module.php/saml/sp/metadata.php/default-sp">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://feide.no/" registrationInstant="2011-08-09T11:34:54Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://www.feide.no/files/feide/metadata-registration-practice-statement.pdf</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </md:Extensions>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://openwiki.uninett.no/simplesaml/module.php/saml/sp/metadata.php/default-sp">
   <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">UNINETT OpenWiki</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="no">UNINETT OpenWiki</mdui:DisplayName>
-        <mdui:Description xml:lang="en">UNINETT OpenWiki is a set of wikis, as a collaboration platform across domains.</mdui:Description>
-        <mdui:Description xml:lang="no">UNINETT OpenWiki er en wikiløsning, for samarbeid på kryss av organisajoner.</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>MIIEGzCCAwOgAwIBAgIJAOrEig4Ycg6MMA0GCSqGSIb3DQEBBQUAMGYxCzAJBgNVBAYTAk5PMRIwEAYDVQQIEwlUcm9uZGhlaW0xEjAQBgNVBAcTCVRyb25kaGVpbTETMBEGA1UEChMKVU5JTkVUVCBBUzEaMBgGA1UEAxMRb3Blbndpa2kuZmVpZGUubm8wHhcNMTIxMDA1MTIzOTI5WhcNMjIxMDA1MTIzOTI5WjBmMQswCQYDVQQGEwJOTzESMBAGA1UECBMJVHJvbmRoZWltMRIwEAYDVQQHEwlUcm9uZGhlaW0xEzARBgNVBAoTClVOSU5FVFQgQVMxGjAYBgNVBAMTEW9wZW53aWtpLmZlaWRlLm5vMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAySsOo8gS8Gx7oQ19CIhVJ5wyJhAW9w073MH0xsSPseqWMur67LSCeT3gN5KFNJ2SP13xD2Htutc1oTMzufdmWviWGQisArcpmFaBbQoJQHSjdYxbKMQ57NXb9wzzp3uQjkzNrMBqekYFy5LtQirOjlEY3fzatWXjwa9IZvqb2u7B0wxpVZjyvuuoklMSYnHom1d+a/crQrNhYEPwm+6juXn8S4/bNxuOvpfUWcuLp90BVvlx3QOUqHI09hLRMU9Ab2C/nVUViUCDuB4mHSmZoj04IbKpdgNlR9HMJjB1p0RbpMG5IZ4NtmgxQkPbU5+ABj6ItzOK0vcto/zD8DHeGQIDAQABo4HLMIHIMB0GA1UdDgQWBBTCEFpRccjnmaW7kroNrJ2iLTYkgTCBmAYDVR0jBIGQMIGNgBTCEFpRccjnmaW7kroNrJ2iLTYkgaFqpGgwZjELMAkGA1UEBhMCTk8xEjAQBgNVBAgTCVRyb25kaGVpbTESMBAGA1UEBxMJVHJvbmRoZWltMRMwEQYDVQQKEwpVTklORVRUIEFTMRowGAYDVQQDExFvcGVud2lraS5mZWlkZS5ub4IJAOrEig4Ycg6MMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAIWi86krhY7Sou8ggyQmwNtq2+qDnJuvJx2Pt4LMCmubxFH6rFXRsoxj7UmmeklScvgZeOT8pcd4rFhqEgh6eX9V5achDeKYqeCt3RVIjhe33O44Lc+cjNmQCchf55QI+qnG7ATtYdDWu37AzXL6q6POVuxx2XHggWPpSlreU+4QWV5wfqWBXblyEFjLoFXzq3yVfTW4N/yM8UXZTUdPiFKmqQ2gmlDSo7EloCE2OMOsbbyTvoXHLMa3mVjfpyk+iEDNsKq/1AHVgDqekE8EH52pWeTOPmx6lGTbviwPvpIDHGxkBv9AZ2JAoN185KET7AuQN1H6neiB9TGnYYuAZGA=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+    <md:KeyDescriptor>
+      <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>MIIEGzCCAwOgAwIBAgIJAOrEig4Ycg6MMA0GCSqGSIb3DQEBBQUAMGYxCzAJBgNVBAYTAk5PMRIwEAYDVQQIEwlUcm9uZGhlaW0xEjAQBgNVBAcTCVRyb25kaGVpbTETMBEGA1UEChMKVU5JTkVUVCBBUzEaMBgGA1UEAxMRb3Blbndpa2kuZmVpZGUubm8wHhcNMTIxMDA1MTIzOTI5WhcNMjIxMDA1MTIzOTI5WjBmMQswCQYDVQQGEwJOTzESMBAGA1UECBMJVHJvbmRoZWltMRIwEAYDVQQHEwlUcm9uZGhlaW0xEzARBgNVBAoTClVOSU5FVFQgQVMxGjAYBgNVBAMTEW9wZW53aWtpLmZlaWRlLm5vMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAySsOo8gS8Gx7oQ19CIhVJ5wyJhAW9w073MH0xsSPseqWMur67LSCeT3gN5KFNJ2SP13xD2Htutc1oTMzufdmWviWGQisArcpmFaBbQoJQHSjdYxbKMQ57NXb9wzzp3uQjkzNrMBqekYFy5LtQirOjlEY3fzatWXjwa9IZvqb2u7B0wxpVZjyvuuoklMSYnHom1d+a/crQrNhYEPwm+6juXn8S4/bNxuOvpfUWcuLp90BVvlx3QOUqHI09hLRMU9Ab2C/nVUViUCDuB4mHSmZoj04IbKpdgNlR9HMJjB1p0RbpMG5IZ4NtmgxQkPbU5+ABj6ItzOK0vcto/zD8DHeGQIDAQABo4HLMIHIMB0GA1UdDgQWBBTCEFpRccjnmaW7kroNrJ2iLTYkgTCBmAYDVR0jBIGQMIGNgBTCEFpRccjnmaW7kroNrJ2iLTYkgaFqpGgwZjELMAkGA1UEBhMCTk8xEjAQBgNVBAgTCVRyb25kaGVpbTESMBAGA1UEBxMJVHJvbmRoZWltMRMwEQYDVQQKEwpVTklORVRUIEFTMRowGAYDVQQDExFvcGVud2lraS5mZWlkZS5ub4IJAOrEig4Ycg6MMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAIWi86krhY7Sou8ggyQmwNtq2+qDnJuvJx2Pt4LMCmubxFH6rFXRsoxj7UmmeklScvgZeOT8pcd4rFhqEgh6eX9V5achDeKYqeCt3RVIjhe33O44Lc+cjNmQCchf55QI+qnG7ATtYdDWu37AzXL6q6POVuxx2XHggWPpSlreU+4QWV5wfqWBXblyEFjLoFXzq3yVfTW4N/yM8UXZTUdPiFKmqQ2gmlDSo7EloCE2OMOsbbyTvoXHLMa3mVjfpyk+iEDNsKq/1AHVgDqekE8EH52pWeTOPmx6lGTbviwPvpIDHGxkBv9AZ2JAoN185KET7AuQN1H6neiB9TGnYYuAZGA=</ds:X509Certificate>
         </ds:X509Data>
@@ -32,27 +12,24 @@
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://openwiki.uninett.no/simplesaml/module.php/saml/sp/saml2-acs.php/default-sp" index="0"/>
     <md:AttributeConsumingService index="0">
       <md:ServiceName xml:lang="en">UNINETT OpenWiki</md:ServiceName>
-      <md:ServiceDescription xml:lang="en">UNINETT OpenWiki is a set of wikis, as a collaboration platform across domains.</md:ServiceDescription>
-      <md:ServiceDescription xml:lang="no">UNINETT OpenWiki er en wikiløsning, for samarbeid på kryss av organisajoner.</md:ServiceDescription>
-      <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="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md: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"/>
-      <md:RequestedAttribute FriendlyName="cn" Name="urn:oid:2.5.4.3" 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="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:ServiceDescription xml:lang="en">UNINETT OpenWiki is a wikifarm where Feide users can create their own wiki.</md:ServiceDescription>
+      <md:ServiceDescription xml:lang="no">UNINETT OpenWiki er en wikifarm hvor Feidebrukere kan lage egne wikier.</md:ServiceDescription>
+      <md:ServiceDescription xml:lang="nn">UNINETT OpenWiki er ein wikifarm der Feidebrukarar kan lage eigne wikiar.</md:ServiceDescription>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonPrincipalName"/>
+      <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: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: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.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="givenName"/>
+      <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.5923.1.1.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonAffiliation"/>
     </md:AttributeConsumingService>
   </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">UNINETT</md:OrganizationName>
-    <md:OrganizationName xml:lang="no">UNINETT</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">UNINETT</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="no">UNINETT</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.uninett.no/english</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="no">http://www.uninett.no/</md:OrganizationURL>
-  </md:Organization>
   <md:ContactPerson contactType="technical">
-    <md:GivenName>Feide Support</md:GivenName>
-    <md:EmailAddress>support@feide.no</md:EmailAddress>
+    <md:Company>UNINETT AS</md:Company>
+    <md:GivenName>Andreas</md:GivenName>
+    <md:SurName>Solberg</md:SurName>
+    <md:EmailAddress>andreas.solberg@uninett.no</md:EmailAddress>
+    <md:TelephoneNumber>+47 73557894</md:TelephoneNumber>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/openwiki.uninett.no.xml b/swamid-interfederations-2.0/openwiki.uninett.no.xml
deleted file mode 100644
index 0d66e714..00000000
--- a/swamid-interfederations-2.0/openwiki.uninett.no.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://openwiki.uninett.no/simplesaml/module.php/saml/sp/metadata.php/default-sp">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://feide.no/" registrationInstant="2011-08-09T11:34:54Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://www.feide.no/files/feide/metadata-registration-practice-statement.pdf</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">UNINETT OpenWiki</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="no">UNINETT OpenWiki</mdui:DisplayName>
-        <mdui:Description xml:lang="en">UNINETT OpenWiki is a set of wikis, as a collaboration platform across domains.</mdui:Description>
-        <mdui:Description xml:lang="no">UNINETT OpenWiki er en wikiløsning, for samarbeid på kryss av organisajoner.</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>MIIEGzCCAwOgAwIBAgIJAOrEig4Ycg6MMA0GCSqGSIb3DQEBBQUAMGYxCzAJBgNVBAYTAk5PMRIwEAYDVQQIEwlUcm9uZGhlaW0xEjAQBgNVBAcTCVRyb25kaGVpbTETMBEGA1UEChMKVU5JTkVUVCBBUzEaMBgGA1UEAxMRb3Blbndpa2kuZmVpZGUubm8wHhcNMTIxMDA1MTIzOTI5WhcNMjIxMDA1MTIzOTI5WjBmMQswCQYDVQQGEwJOTzESMBAGA1UECBMJVHJvbmRoZWltMRIwEAYDVQQHEwlUcm9uZGhlaW0xEzARBgNVBAoTClVOSU5FVFQgQVMxGjAYBgNVBAMTEW9wZW53aWtpLmZlaWRlLm5vMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAySsOo8gS8Gx7oQ19CIhVJ5wyJhAW9w073MH0xsSPseqWMur67LSCeT3gN5KFNJ2SP13xD2Htutc1oTMzufdmWviWGQisArcpmFaBbQoJQHSjdYxbKMQ57NXb9wzzp3uQjkzNrMBqekYFy5LtQirOjlEY3fzatWXjwa9IZvqb2u7B0wxpVZjyvuuoklMSYnHom1d+a/crQrNhYEPwm+6juXn8S4/bNxuOvpfUWcuLp90BVvlx3QOUqHI09hLRMU9Ab2C/nVUViUCDuB4mHSmZoj04IbKpdgNlR9HMJjB1p0RbpMG5IZ4NtmgxQkPbU5+ABj6ItzOK0vcto/zD8DHeGQIDAQABo4HLMIHIMB0GA1UdDgQWBBTCEFpRccjnmaW7kroNrJ2iLTYkgTCBmAYDVR0jBIGQMIGNgBTCEFpRccjnmaW7kroNrJ2iLTYkgaFqpGgwZjELMAkGA1UEBhMCTk8xEjAQBgNVBAgTCVRyb25kaGVpbTESMBAGA1UEBxMJVHJvbmRoZWltMRMwEQYDVQQKEwpVTklORVRUIEFTMRowGAYDVQQDExFvcGVud2lraS5mZWlkZS5ub4IJAOrEig4Ycg6MMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAIWi86krhY7Sou8ggyQmwNtq2+qDnJuvJx2Pt4LMCmubxFH6rFXRsoxj7UmmeklScvgZeOT8pcd4rFhqEgh6eX9V5achDeKYqeCt3RVIjhe33O44Lc+cjNmQCchf55QI+qnG7ATtYdDWu37AzXL6q6POVuxx2XHggWPpSlreU+4QWV5wfqWBXblyEFjLoFXzq3yVfTW4N/yM8UXZTUdPiFKmqQ2gmlDSo7EloCE2OMOsbbyTvoXHLMa3mVjfpyk+iEDNsKq/1AHVgDqekE8EH52pWeTOPmx6lGTbviwPvpIDHGxkBv9AZ2JAoN185KET7AuQN1H6neiB9TGnYYuAZGA=</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>MIIEGzCCAwOgAwIBAgIJAOrEig4Ycg6MMA0GCSqGSIb3DQEBBQUAMGYxCzAJBgNVBAYTAk5PMRIwEAYDVQQIEwlUcm9uZGhlaW0xEjAQBgNVBAcTCVRyb25kaGVpbTETMBEGA1UEChMKVU5JTkVUVCBBUzEaMBgGA1UEAxMRb3Blbndpa2kuZmVpZGUubm8wHhcNMTIxMDA1MTIzOTI5WhcNMjIxMDA1MTIzOTI5WjBmMQswCQYDVQQGEwJOTzESMBAGA1UECBMJVHJvbmRoZWltMRIwEAYDVQQHEwlUcm9uZGhlaW0xEzARBgNVBAoTClVOSU5FVFQgQVMxGjAYBgNVBAMTEW9wZW53aWtpLmZlaWRlLm5vMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAySsOo8gS8Gx7oQ19CIhVJ5wyJhAW9w073MH0xsSPseqWMur67LSCeT3gN5KFNJ2SP13xD2Htutc1oTMzufdmWviWGQisArcpmFaBbQoJQHSjdYxbKMQ57NXb9wzzp3uQjkzNrMBqekYFy5LtQirOjlEY3fzatWXjwa9IZvqb2u7B0wxpVZjyvuuoklMSYnHom1d+a/crQrNhYEPwm+6juXn8S4/bNxuOvpfUWcuLp90BVvlx3QOUqHI09hLRMU9Ab2C/nVUViUCDuB4mHSmZoj04IbKpdgNlR9HMJjB1p0RbpMG5IZ4NtmgxQkPbU5+ABj6ItzOK0vcto/zD8DHeGQIDAQABo4HLMIHIMB0GA1UdDgQWBBTCEFpRccjnmaW7kroNrJ2iLTYkgTCBmAYDVR0jBIGQMIGNgBTCEFpRccjnmaW7kroNrJ2iLTYkgaFqpGgwZjELMAkGA1UEBhMCTk8xEjAQBgNVBAgTCVRyb25kaGVpbTESMBAGA1UEBxMJVHJvbmRoZWltMRMwEQYDVQQKEwpVTklORVRUIEFTMRowGAYDVQQDExFvcGVud2lraS5mZWlkZS5ub4IJAOrEig4Ycg6MMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAIWi86krhY7Sou8ggyQmwNtq2+qDnJuvJx2Pt4LMCmubxFH6rFXRsoxj7UmmeklScvgZeOT8pcd4rFhqEgh6eX9V5achDeKYqeCt3RVIjhe33O44Lc+cjNmQCchf55QI+qnG7ATtYdDWu37AzXL6q6POVuxx2XHggWPpSlreU+4QWV5wfqWBXblyEFjLoFXzq3yVfTW4N/yM8UXZTUdPiFKmqQ2gmlDSo7EloCE2OMOsbbyTvoXHLMa3mVjfpyk+iEDNsKq/1AHVgDqekE8EH52pWeTOPmx6lGTbviwPvpIDHGxkBv9AZ2JAoN185KET7AuQN1H6neiB9TGnYYuAZGA=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://openwiki.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="https://openwiki.uninett.no/simplesaml/module.php/saml/sp/saml2-acs.php/default-sp" index="0"/>
-    <md:AttributeConsumingService index="0">
-      <md:ServiceName xml:lang="en">UNINETT OpenWiki</md:ServiceName>
-      <md:ServiceDescription xml:lang="en">UNINETT OpenWiki is a set of wikis, as a collaboration platform across domains.</md:ServiceDescription>
-      <md:ServiceDescription xml:lang="no">UNINETT OpenWiki er en wikiløsning, for samarbeid på kryss av organisajoner.</md:ServiceDescription>
-      <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="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md: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"/>
-      <md:RequestedAttribute FriendlyName="cn" Name="urn:oid:2.5.4.3" 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="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">UNINETT</md:OrganizationName>
-    <md:OrganizationName xml:lang="no">UNINETT</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">UNINETT</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="no">UNINETT</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.uninett.no/english</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="no">http://www.uninett.no/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Feide Support</md:GivenName>
-    <md:EmailAddress>support@feide.no</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/owncloud.cesnet.cz-saml-sp.xml b/swamid-interfederations-2.0/owncloud.cesnet.cz-saml-sp.xml
deleted file mode 100644
index 339d63b4..00000000
--- a/swamid-interfederations-2.0/owncloud.cesnet.cz-saml-sp.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://owncloud.cesnet.cz/saml/sp">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/" registrationInstant="2014-02-19T21:13:48Z">
-      <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: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">OwnCloud</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="cs">OwnCloud</mdui:DisplayName>
-        <mdui:Description xml:lang="en">CESNETs servis for sharing files.</mdui:Description>
-        <mdui:Description xml:lang="cs">Cesnetí služba pro sdílení souborů.</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://owncloud.cesnet.cz/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="cs">http://owncloud.cesnet.cz/</mdui:InformationURL>
-      </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>MIIEcjCCA1qgAwIBAgIRAPQ1mOW1ZRv5p0ikek6IvdEwDQYJKoZIhvcNAQEFBQAwNjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5BIFNTTCBDQTAeFw0xNDAyMTkwMDAwMDBaFw0xNzAyMTgyMzU5NTlaMEAxITAfBgNVBAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEbMBkGA1UEAxMSb3duY2xvdWQuY2VzbmV0LmN6MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAv79fWh8u/3sVzPN6yxyosMnAxKXqR5DfXnI29E8KOFF5yP+yj23FJqzbEuGsLNKUHZZ4sNcJTcTXi53U78t8pAyerwbPou+vVhxEL+a6wnpqJ/Q2XJ2jJ+OvbFRG4T+5oWyY/KOSqddzlEJhKplm0uMKkuZxC6kn+tUei58rexj4NwUPHTAFsMcLc997hn3yPmwEE0YQ2O9Vn+MuVYxGq+ytAEyBE97Gle1kbQreZ66Gn5R63FxcD6NN/Uvm/gX8Go04L+BPos+nhMD7VvcgbKPkHu/LNYPODaS0/zRUxjDsWiTsma8DbsdrmKdXxcqEkv+IHQaLOTNkwN4sh236yQIDAQABo4IBbzCCAWswHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsrN1dH6pDjue0wHQYDVR0OBBYEFLVNdYAnQ4MAHsI0R854KPZHpdmhMA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8vb2NzcC50Y3MudGVyZW5hLm9yZzAdBgNVHREEFjAUghJvd25jbG91ZC5jZXNuZXQuY3owDQYJKoZIhvcNAQEFBQADggEBADqbluvi3u51NAFwIZli9b/d/oX6X56uZjs81nu8jniC6r9Wt4dGKDF6t3VIoqpFJ1ZtT1Kj+xr5c3g2UJ6HLXiPwcipjtJ5YckfTZAcoKMtAJAxI82SiHBMO5jgqEtvZJuw9FjStNxDIt1JkcmZVpsvoMCOJk3jqonypoKHbG0nq7jg52Ahp2sI/fFcyDmdYwLpV5f3j5DpACol4/anu02Li7Nf7VrnQLsKhvXqNkV8sGDoPJcA1zuseszaPV9RTONMzcZHoWAtzK3Fd5rT5sr+7qVpm+lmEi0TNhFSSW68Yp+4XqDvKLviDkhv1R/Yjqi5XRlMo0KjBerAbs1Un6Q=</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>MIIEcjCCA1qgAwIBAgIRAPQ1mOW1ZRv5p0ikek6IvdEwDQYJKoZIhvcNAQEFBQAwNjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5BIFNTTCBDQTAeFw0xNDAyMTkwMDAwMDBaFw0xNzAyMTgyMzU5NTlaMEAxITAfBgNVBAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEbMBkGA1UEAxMSb3duY2xvdWQuY2VzbmV0LmN6MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAv79fWh8u/3sVzPN6yxyosMnAxKXqR5DfXnI29E8KOFF5yP+yj23FJqzbEuGsLNKUHZZ4sNcJTcTXi53U78t8pAyerwbPou+vVhxEL+a6wnpqJ/Q2XJ2jJ+OvbFRG4T+5oWyY/KOSqddzlEJhKplm0uMKkuZxC6kn+tUei58rexj4NwUPHTAFsMcLc997hn3yPmwEE0YQ2O9Vn+MuVYxGq+ytAEyBE97Gle1kbQreZ66Gn5R63FxcD6NN/Uvm/gX8Go04L+BPos+nhMD7VvcgbKPkHu/LNYPODaS0/zRUxjDsWiTsma8DbsdrmKdXxcqEkv+IHQaLOTNkwN4sh236yQIDAQABo4IBbzCCAWswHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsrN1dH6pDjue0wHQYDVR0OBBYEFLVNdYAnQ4MAHsI0R854KPZHpdmhMA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8vb2NzcC50Y3MudGVyZW5hLm9yZzAdBgNVHREEFjAUghJvd25jbG91ZC5jZXNuZXQuY3owDQYJKoZIhvcNAQEFBQADggEBADqbluvi3u51NAFwIZli9b/d/oX6X56uZjs81nu8jniC6r9Wt4dGKDF6t3VIoqpFJ1ZtT1Kj+xr5c3g2UJ6HLXiPwcipjtJ5YckfTZAcoKMtAJAxI82SiHBMO5jgqEtvZJuw9FjStNxDIt1JkcmZVpsvoMCOJk3jqonypoKHbG0nq7jg52Ahp2sI/fFcyDmdYwLpV5f3j5DpACol4/anu02Li7Nf7VrnQLsKhvXqNkV8sGDoPJcA1zuseszaPV9RTONMzcZHoWAtzK3Fd5rT5sr+7qVpm+lmEi0TNhFSSW68Yp+4XqDvKLviDkhv1R/Yjqi5XRlMo0KjBerAbs1Un6Q=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://owncloud.cesnet.cz/simplesamlphp/module.php/saml/sp/saml2-logout.php/default-sp"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://owncloud6.cesnet.cz/simplesamlphp/module.php/saml/sp/saml2-logout.php/default-sp"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://owncloud.cesnet.cz/simplesamlphp/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://owncloud.cesnet.cz/simplesamlphp/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://owncloud.cesnet.cz/simplesamlphp/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://owncloud.cesnet.cz/simplesamlphp/module.php/saml/sp/saml1-acs.php/default-sp/artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://owncloud6.cesnet.cz/simplesamlphp/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://owncloud6.cesnet.cz/simplesamlphp/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://owncloud6.cesnet.cz/simplesamlphp/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://owncloud6.cesnet.cz/simplesamlphp/module.php/saml/sp/saml1-acs.php/default-sp/artifact" index="3"/>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">CESNET</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">CESNET</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="cs">CESNET</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>Lubos</md:GivenName>
-    <md:SurName>Kopecky - administrator</md:SurName>
-    <md:EmailAddress>du-support@cesnet.cz</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/owncloud.cesnet.cz.xml b/swamid-interfederations-2.0/owncloud.cesnet.cz.xml
deleted file mode 100644
index 339d63b4..00000000
--- a/swamid-interfederations-2.0/owncloud.cesnet.cz.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://owncloud.cesnet.cz/saml/sp">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/" registrationInstant="2014-02-19T21:13:48Z">
-      <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: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">OwnCloud</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="cs">OwnCloud</mdui:DisplayName>
-        <mdui:Description xml:lang="en">CESNETs servis for sharing files.</mdui:Description>
-        <mdui:Description xml:lang="cs">Cesnetí služba pro sdílení souborů.</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://owncloud.cesnet.cz/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="cs">http://owncloud.cesnet.cz/</mdui:InformationURL>
-      </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>MIIEcjCCA1qgAwIBAgIRAPQ1mOW1ZRv5p0ikek6IvdEwDQYJKoZIhvcNAQEFBQAwNjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5BIFNTTCBDQTAeFw0xNDAyMTkwMDAwMDBaFw0xNzAyMTgyMzU5NTlaMEAxITAfBgNVBAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEbMBkGA1UEAxMSb3duY2xvdWQuY2VzbmV0LmN6MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAv79fWh8u/3sVzPN6yxyosMnAxKXqR5DfXnI29E8KOFF5yP+yj23FJqzbEuGsLNKUHZZ4sNcJTcTXi53U78t8pAyerwbPou+vVhxEL+a6wnpqJ/Q2XJ2jJ+OvbFRG4T+5oWyY/KOSqddzlEJhKplm0uMKkuZxC6kn+tUei58rexj4NwUPHTAFsMcLc997hn3yPmwEE0YQ2O9Vn+MuVYxGq+ytAEyBE97Gle1kbQreZ66Gn5R63FxcD6NN/Uvm/gX8Go04L+BPos+nhMD7VvcgbKPkHu/LNYPODaS0/zRUxjDsWiTsma8DbsdrmKdXxcqEkv+IHQaLOTNkwN4sh236yQIDAQABo4IBbzCCAWswHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsrN1dH6pDjue0wHQYDVR0OBBYEFLVNdYAnQ4MAHsI0R854KPZHpdmhMA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8vb2NzcC50Y3MudGVyZW5hLm9yZzAdBgNVHREEFjAUghJvd25jbG91ZC5jZXNuZXQuY3owDQYJKoZIhvcNAQEFBQADggEBADqbluvi3u51NAFwIZli9b/d/oX6X56uZjs81nu8jniC6r9Wt4dGKDF6t3VIoqpFJ1ZtT1Kj+xr5c3g2UJ6HLXiPwcipjtJ5YckfTZAcoKMtAJAxI82SiHBMO5jgqEtvZJuw9FjStNxDIt1JkcmZVpsvoMCOJk3jqonypoKHbG0nq7jg52Ahp2sI/fFcyDmdYwLpV5f3j5DpACol4/anu02Li7Nf7VrnQLsKhvXqNkV8sGDoPJcA1zuseszaPV9RTONMzcZHoWAtzK3Fd5rT5sr+7qVpm+lmEi0TNhFSSW68Yp+4XqDvKLviDkhv1R/Yjqi5XRlMo0KjBerAbs1Un6Q=</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>MIIEcjCCA1qgAwIBAgIRAPQ1mOW1ZRv5p0ikek6IvdEwDQYJKoZIhvcNAQEFBQAwNjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5BIFNTTCBDQTAeFw0xNDAyMTkwMDAwMDBaFw0xNzAyMTgyMzU5NTlaMEAxITAfBgNVBAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEbMBkGA1UEAxMSb3duY2xvdWQuY2VzbmV0LmN6MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAv79fWh8u/3sVzPN6yxyosMnAxKXqR5DfXnI29E8KOFF5yP+yj23FJqzbEuGsLNKUHZZ4sNcJTcTXi53U78t8pAyerwbPou+vVhxEL+a6wnpqJ/Q2XJ2jJ+OvbFRG4T+5oWyY/KOSqddzlEJhKplm0uMKkuZxC6kn+tUei58rexj4NwUPHTAFsMcLc997hn3yPmwEE0YQ2O9Vn+MuVYxGq+ytAEyBE97Gle1kbQreZ66Gn5R63FxcD6NN/Uvm/gX8Go04L+BPos+nhMD7VvcgbKPkHu/LNYPODaS0/zRUxjDsWiTsma8DbsdrmKdXxcqEkv+IHQaLOTNkwN4sh236yQIDAQABo4IBbzCCAWswHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsrN1dH6pDjue0wHQYDVR0OBBYEFLVNdYAnQ4MAHsI0R854KPZHpdmhMA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8vb2NzcC50Y3MudGVyZW5hLm9yZzAdBgNVHREEFjAUghJvd25jbG91ZC5jZXNuZXQuY3owDQYJKoZIhvcNAQEFBQADggEBADqbluvi3u51NAFwIZli9b/d/oX6X56uZjs81nu8jniC6r9Wt4dGKDF6t3VIoqpFJ1ZtT1Kj+xr5c3g2UJ6HLXiPwcipjtJ5YckfTZAcoKMtAJAxI82SiHBMO5jgqEtvZJuw9FjStNxDIt1JkcmZVpsvoMCOJk3jqonypoKHbG0nq7jg52Ahp2sI/fFcyDmdYwLpV5f3j5DpACol4/anu02Li7Nf7VrnQLsKhvXqNkV8sGDoPJcA1zuseszaPV9RTONMzcZHoWAtzK3Fd5rT5sr+7qVpm+lmEi0TNhFSSW68Yp+4XqDvKLviDkhv1R/Yjqi5XRlMo0KjBerAbs1Un6Q=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://owncloud.cesnet.cz/simplesamlphp/module.php/saml/sp/saml2-logout.php/default-sp"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://owncloud6.cesnet.cz/simplesamlphp/module.php/saml/sp/saml2-logout.php/default-sp"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://owncloud.cesnet.cz/simplesamlphp/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://owncloud.cesnet.cz/simplesamlphp/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://owncloud.cesnet.cz/simplesamlphp/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://owncloud.cesnet.cz/simplesamlphp/module.php/saml/sp/saml1-acs.php/default-sp/artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://owncloud6.cesnet.cz/simplesamlphp/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://owncloud6.cesnet.cz/simplesamlphp/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://owncloud6.cesnet.cz/simplesamlphp/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://owncloud6.cesnet.cz/simplesamlphp/module.php/saml/sp/saml1-acs.php/default-sp/artifact" index="3"/>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">CESNET</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">CESNET</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="cs">CESNET</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>Lubos</md:GivenName>
-    <md:SurName>Kopecky - administrator</md:SurName>
-    <md:EmailAddress>du-support@cesnet.cz</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/pan.unifei.edu.br-idp-shibboleth.xml b/swamid-interfederations-2.0/pan.unifei.edu.br-idp-shibboleth.xml
deleted file mode 100644
index 76f1cf1e..00000000
--- a/swamid-interfederations-2.0/pan.unifei.edu.br-idp-shibboleth.xml
+++ /dev/null
@@ -1,114 +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://pan.unifei.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">edu.br</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">UNIFEI - Universidade Federal de Itajuba</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="pt-br">UNIFEI - Universidade Federal de Itajuba</mdui:DisplayName>
-        <mdui:Description xml:lang="en">UNIFEI - Universidade Federal de Itajuba</mdui:Description>
-        <mdui:Description xml:lang="pt-br">UNIFEI - Universidade Federal de Itajuba</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.unifei.edu.br</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="pt-br">http://www.unifei.edu.br</mdui:InformationURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-    MIID7jCCAtYCAQAwDQYJKoZIhvcNAQEFBQAwgbwxMjAwBgNVBAoUKVVOSUZFSSAt
-IFVuaXZlcnNpZGFkZSBGZWRlcmFsIGRlIEl0YWp1YsOhMQwwCgYDVQQLEwNEU0kx
-JTAjBgkqhkiG9w0BCQEWFmV2ZXJhbGRvQHVuaWZlaS5lZHUuYnIxETAPBgNVBAcU
-CEl0YWp1YsOhMRUwEwYDVQQIEwxNaW5hcyBHZXJhaXMxCzAJBgNVBAYTAkJSMRow
-GAYDVQQDExFwYW4udW5pZmVpLmVkdS5icjAeFw0xNDAzMjAxNTAwNTZaFw0xNzAz
-MTkxNTAwNTZaMIG8MTIwMAYDVQQKFClVTklGRUkgLSBVbml2ZXJzaWRhZGUgRmVk
-ZXJhbCBkZSBJdGFqdWLDoTEMMAoGA1UECxMDRFNJMSUwIwYJKoZIhvcNAQkBFhZl
-dmVyYWxkb0B1bmlmZWkuZWR1LmJyMREwDwYDVQQHFAhJdGFqdWLDoTEVMBMGA1UE
-CBMMTWluYXMgR2VyYWlzMQswCQYDVQQGEwJCUjEaMBgGA1UEAxMRcGFuLnVuaWZl
-aS5lZHUuYnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDbdgD4GsIt
-wRNaixhH3B1xh1YKIvluyb0838BJ82fRmbeO70SrJ40XujcMOkgy7CYqbwWiM76h
-KmiSRTFfDUxe7dg1jwMtTpKufLMsar8r36dj0LgK71qquZ+BNDIhI9yuxz+W14hY
-RcMMYVdTYVDU4pN9+EKKGxpX1nDocURYuemWF4IYXYc3iADwAa1EvSthK89W3Szs
-x0NZ1BkMI3lVIk4CabN/begJSgDeQEIDf1aV40ilkQjP+QDGK7dKlrYnnZ/cuNgF
-NpDBNck6cfXRRaZmvbvRjVv1BNZcT8cfjV46KBaPZlkNEhiYNnrVvjJOxirSXN4+
-9tE2n0vZi/G9AgMBAAEwDQYJKoZIhvcNAQEFBQADggEBACGBolIa3MdeTH3RdKSh
-WooDdU6J3538B3APS3Bdoh+k+bH9dlSyc/1jguB1SPUxifDRzaCPM5WJwQuN9OR6
-JZG3mx8jlOrkb7FvGplKU0brF8Xvy57QSlO63RgJaTO8HbnAiwqxerA0ht6VcoQk
-wqIA++KzAcS/+YjjK4lHbZmjnh0Npgk0VriZlw7DzWBrW3h+1+2zL1t5VvsZN3Hz
-Masp/mA4c6ecLM9mTnUq8LK/r7CUpOgENKvwE8gtlwsOifwW2uKtBDjWfLjZOzYN
-ZpXplUMF4O1dNAwWyicalWXeMpUTTMmr7YzbT0r4bdwN3AUoudJiGhpXMSeo2ar7
-xy0=
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://pan.unifei.edu.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://pan.unifei.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://pan.unifei.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://pan.unifei.edu.br/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://pan.unifei.edu.br/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://pan.unifei.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>
-      
-MIID7jCCAtYCAQAwDQYJKoZIhvcNAQEFBQAwgbwxMjAwBgNVBAoUKVVOSUZFSSAt
-IFVuaXZlcnNpZGFkZSBGZWRlcmFsIGRlIEl0YWp1YsOhMQwwCgYDVQQLEwNEU0kx
-JTAjBgkqhkiG9w0BCQEWFmV2ZXJhbGRvQHVuaWZlaS5lZHUuYnIxETAPBgNVBAcU
-CEl0YWp1YsOhMRUwEwYDVQQIEwxNaW5hcyBHZXJhaXMxCzAJBgNVBAYTAkJSMRow
-GAYDVQQDExFwYW4udW5pZmVpLmVkdS5icjAeFw0xNDAzMjAxNTAwNTZaFw0xNzAz
-MTkxNTAwNTZaMIG8MTIwMAYDVQQKFClVTklGRUkgLSBVbml2ZXJzaWRhZGUgRmVk
-ZXJhbCBkZSBJdGFqdWLDoTEMMAoGA1UECxMDRFNJMSUwIwYJKoZIhvcNAQkBFhZl
-dmVyYWxkb0B1bmlmZWkuZWR1LmJyMREwDwYDVQQHFAhJdGFqdWLDoTEVMBMGA1UE
-CBMMTWluYXMgR2VyYWlzMQswCQYDVQQGEwJCUjEaMBgGA1UEAxMRcGFuLnVuaWZl
-aS5lZHUuYnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDbdgD4GsIt
-wRNaixhH3B1xh1YKIvluyb0838BJ82fRmbeO70SrJ40XujcMOkgy7CYqbwWiM76h
-KmiSRTFfDUxe7dg1jwMtTpKufLMsar8r36dj0LgK71qquZ+BNDIhI9yuxz+W14hY
-RcMMYVdTYVDU4pN9+EKKGxpX1nDocURYuemWF4IYXYc3iADwAa1EvSthK89W3Szs
-x0NZ1BkMI3lVIk4CabN/begJSgDeQEIDf1aV40ilkQjP+QDGK7dKlrYnnZ/cuNgF
-NpDBNck6cfXRRaZmvbvRjVv1BNZcT8cfjV46KBaPZlkNEhiYNnrVvjJOxirSXN4+
-9tE2n0vZi/G9AgMBAAEwDQYJKoZIhvcNAQEFBQADggEBACGBolIa3MdeTH3RdKSh
-WooDdU6J3538B3APS3Bdoh+k+bH9dlSyc/1jguB1SPUxifDRzaCPM5WJwQuN9OR6
-JZG3mx8jlOrkb7FvGplKU0brF8Xvy57QSlO63RgJaTO8HbnAiwqxerA0ht6VcoQk
-wqIA++KzAcS/+YjjK4lHbZmjnh0Npgk0VriZlw7DzWBrW3h+1+2zL1t5VvsZN3Hz
-Masp/mA4c6ecLM9mTnUq8LK/r7CUpOgENKvwE8gtlwsOifwW2uKtBDjWfLjZOzYN
-ZpXplUMF4O1dNAwWyicalWXeMpUTTMmr7YzbT0r4bdwN3AUoudJiGhpXMSeo2ar7
-xy0=
-                    
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://pan.unifei.edu.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://pan.unifei.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">UNIFEI - Universidade Federal de Itajuba</OrganizationName>
-    <OrganizationName xml:lang="pt-br">UNIFEI - Universidade Federal de Itajuba</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">UNIFEI - Universidade Federal de Itajuba</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="pt-br">UNIFEI - Universidade Federal de Itajuba</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.unifei.edu.br</OrganizationURL>
-    <OrganizationURL xml:lang="pt-br">http://www.unifei.edu.br</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Everaldo Campos</SurName>
-    <EmailAddress>everaldo@unifei.edu.br</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/pan.unifei.edu.br.xml b/swamid-interfederations-2.0/pan.unifei.edu.br.xml
deleted file mode 100644
index 76f1cf1e..00000000
--- a/swamid-interfederations-2.0/pan.unifei.edu.br.xml
+++ /dev/null
@@ -1,114 +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://pan.unifei.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">edu.br</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">UNIFEI - Universidade Federal de Itajuba</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="pt-br">UNIFEI - Universidade Federal de Itajuba</mdui:DisplayName>
-        <mdui:Description xml:lang="en">UNIFEI - Universidade Federal de Itajuba</mdui:Description>
-        <mdui:Description xml:lang="pt-br">UNIFEI - Universidade Federal de Itajuba</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.unifei.edu.br</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="pt-br">http://www.unifei.edu.br</mdui:InformationURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-    MIID7jCCAtYCAQAwDQYJKoZIhvcNAQEFBQAwgbwxMjAwBgNVBAoUKVVOSUZFSSAt
-IFVuaXZlcnNpZGFkZSBGZWRlcmFsIGRlIEl0YWp1YsOhMQwwCgYDVQQLEwNEU0kx
-JTAjBgkqhkiG9w0BCQEWFmV2ZXJhbGRvQHVuaWZlaS5lZHUuYnIxETAPBgNVBAcU
-CEl0YWp1YsOhMRUwEwYDVQQIEwxNaW5hcyBHZXJhaXMxCzAJBgNVBAYTAkJSMRow
-GAYDVQQDExFwYW4udW5pZmVpLmVkdS5icjAeFw0xNDAzMjAxNTAwNTZaFw0xNzAz
-MTkxNTAwNTZaMIG8MTIwMAYDVQQKFClVTklGRUkgLSBVbml2ZXJzaWRhZGUgRmVk
-ZXJhbCBkZSBJdGFqdWLDoTEMMAoGA1UECxMDRFNJMSUwIwYJKoZIhvcNAQkBFhZl
-dmVyYWxkb0B1bmlmZWkuZWR1LmJyMREwDwYDVQQHFAhJdGFqdWLDoTEVMBMGA1UE
-CBMMTWluYXMgR2VyYWlzMQswCQYDVQQGEwJCUjEaMBgGA1UEAxMRcGFuLnVuaWZl
-aS5lZHUuYnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDbdgD4GsIt
-wRNaixhH3B1xh1YKIvluyb0838BJ82fRmbeO70SrJ40XujcMOkgy7CYqbwWiM76h
-KmiSRTFfDUxe7dg1jwMtTpKufLMsar8r36dj0LgK71qquZ+BNDIhI9yuxz+W14hY
-RcMMYVdTYVDU4pN9+EKKGxpX1nDocURYuemWF4IYXYc3iADwAa1EvSthK89W3Szs
-x0NZ1BkMI3lVIk4CabN/begJSgDeQEIDf1aV40ilkQjP+QDGK7dKlrYnnZ/cuNgF
-NpDBNck6cfXRRaZmvbvRjVv1BNZcT8cfjV46KBaPZlkNEhiYNnrVvjJOxirSXN4+
-9tE2n0vZi/G9AgMBAAEwDQYJKoZIhvcNAQEFBQADggEBACGBolIa3MdeTH3RdKSh
-WooDdU6J3538B3APS3Bdoh+k+bH9dlSyc/1jguB1SPUxifDRzaCPM5WJwQuN9OR6
-JZG3mx8jlOrkb7FvGplKU0brF8Xvy57QSlO63RgJaTO8HbnAiwqxerA0ht6VcoQk
-wqIA++KzAcS/+YjjK4lHbZmjnh0Npgk0VriZlw7DzWBrW3h+1+2zL1t5VvsZN3Hz
-Masp/mA4c6ecLM9mTnUq8LK/r7CUpOgENKvwE8gtlwsOifwW2uKtBDjWfLjZOzYN
-ZpXplUMF4O1dNAwWyicalWXeMpUTTMmr7YzbT0r4bdwN3AUoudJiGhpXMSeo2ar7
-xy0=
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://pan.unifei.edu.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://pan.unifei.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://pan.unifei.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://pan.unifei.edu.br/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://pan.unifei.edu.br/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://pan.unifei.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>
-      
-MIID7jCCAtYCAQAwDQYJKoZIhvcNAQEFBQAwgbwxMjAwBgNVBAoUKVVOSUZFSSAt
-IFVuaXZlcnNpZGFkZSBGZWRlcmFsIGRlIEl0YWp1YsOhMQwwCgYDVQQLEwNEU0kx
-JTAjBgkqhkiG9w0BCQEWFmV2ZXJhbGRvQHVuaWZlaS5lZHUuYnIxETAPBgNVBAcU
-CEl0YWp1YsOhMRUwEwYDVQQIEwxNaW5hcyBHZXJhaXMxCzAJBgNVBAYTAkJSMRow
-GAYDVQQDExFwYW4udW5pZmVpLmVkdS5icjAeFw0xNDAzMjAxNTAwNTZaFw0xNzAz
-MTkxNTAwNTZaMIG8MTIwMAYDVQQKFClVTklGRUkgLSBVbml2ZXJzaWRhZGUgRmVk
-ZXJhbCBkZSBJdGFqdWLDoTEMMAoGA1UECxMDRFNJMSUwIwYJKoZIhvcNAQkBFhZl
-dmVyYWxkb0B1bmlmZWkuZWR1LmJyMREwDwYDVQQHFAhJdGFqdWLDoTEVMBMGA1UE
-CBMMTWluYXMgR2VyYWlzMQswCQYDVQQGEwJCUjEaMBgGA1UEAxMRcGFuLnVuaWZl
-aS5lZHUuYnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDbdgD4GsIt
-wRNaixhH3B1xh1YKIvluyb0838BJ82fRmbeO70SrJ40XujcMOkgy7CYqbwWiM76h
-KmiSRTFfDUxe7dg1jwMtTpKufLMsar8r36dj0LgK71qquZ+BNDIhI9yuxz+W14hY
-RcMMYVdTYVDU4pN9+EKKGxpX1nDocURYuemWF4IYXYc3iADwAa1EvSthK89W3Szs
-x0NZ1BkMI3lVIk4CabN/begJSgDeQEIDf1aV40ilkQjP+QDGK7dKlrYnnZ/cuNgF
-NpDBNck6cfXRRaZmvbvRjVv1BNZcT8cfjV46KBaPZlkNEhiYNnrVvjJOxirSXN4+
-9tE2n0vZi/G9AgMBAAEwDQYJKoZIhvcNAQEFBQADggEBACGBolIa3MdeTH3RdKSh
-WooDdU6J3538B3APS3Bdoh+k+bH9dlSyc/1jguB1SPUxifDRzaCPM5WJwQuN9OR6
-JZG3mx8jlOrkb7FvGplKU0brF8Xvy57QSlO63RgJaTO8HbnAiwqxerA0ht6VcoQk
-wqIA++KzAcS/+YjjK4lHbZmjnh0Npgk0VriZlw7DzWBrW3h+1+2zL1t5VvsZN3Hz
-Masp/mA4c6ecLM9mTnUq8LK/r7CUpOgENKvwE8gtlwsOifwW2uKtBDjWfLjZOzYN
-ZpXplUMF4O1dNAwWyicalWXeMpUTTMmr7YzbT0r4bdwN3AUoudJiGhpXMSeo2ar7
-xy0=
-                    
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://pan.unifei.edu.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://pan.unifei.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">UNIFEI - Universidade Federal de Itajuba</OrganizationName>
-    <OrganizationName xml:lang="pt-br">UNIFEI - Universidade Federal de Itajuba</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">UNIFEI - Universidade Federal de Itajuba</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="pt-br">UNIFEI - Universidade Federal de Itajuba</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.unifei.edu.br</OrganizationURL>
-    <OrganizationURL xml:lang="pt-br">http://www.unifei.edu.br</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Everaldo Campos</SurName>
-    <EmailAddress>everaldo@unifei.edu.br</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/papi.kfki.hu-idp-shibboleth.xml b/swamid-interfederations-2.0/papi.kfki.hu-idp-shibboleth.xml
deleted file mode 100644
index 26de1e87..00000000
--- a/swamid-interfederations-2.0/papi.kfki.hu-idp-shibboleth.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://papi.kfki.hu/idp/shibboleth">
-  <Extensions>
-    <ns9:MetadataSet xmlns:ns9="urn:geant:niif.hu:eduid.hu:entity-attributes:processing-info">kfki</ns9:MetadataSet>
-    <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>
-    <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">kfki.hu</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mail.kfki.hu</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sunserv.kfki.hu</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">rmki.kfki.hu</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">aeki.kfki.hu</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">iki.kfki.hu</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mfa.kfki.hu</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">szfki.hu</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">wigner.mta.hu</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">energia.mta.hu</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ttk.mta.hu</shibmd:Scope>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-        <mdui:IPHint>148.6.0.0/16</mdui:IPHint>
-        <mdui:IPHint>2001:738:5001::/48</mdui:IPHint>
-        <mdui:GeolocationHint>geo:47.48945,18.9497</mdui:GeolocationHint>
-      </mdui:DiscoHints>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-        <mdui:DisplayName xml:lang="hu">MTA Wigner Fizikai Kutatóközpont</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">WIGNER Research Centre for Physics</mdui:DisplayName>
-        <mdui:Description xml:lang="hu">MTA Wigner Fizikai Kutatóközpont</mdui:Description>
-        <mdui:Description xml:lang="en">WIGNER Research Centre for Physics</mdui:Description>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDGzCCAgOgAwIBAgIUdn3t4i5i7MiVMJB07lC7yL4IAoowDQYJKoZIhvcNAQEFBQAwFzEVMBMGA1UEAxMMcGFwaS5rZmtpLmh1MB4XDTA5MDgxMDE2MDEyMloXDTI5MDgxMDE2MDEyMlowFzEVMBMGA1UEAxMMcGFwaS5rZmtpLmh1MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApGGAG9GWNsCJZ6JayutI95u4FmGvsfza6uSKUX3XuZp1uUViY6eH4h4gCNgCzufvJ4GNSdxYhohFEgzB0MM23MrDl9DzS4NX+g7eYFCmmD1zPcui4YzIYJWmCSXAqXDqaLox4aVxtQrOr4sBcy/0jzlXXC3IHSS2GKuCj8tlXf9TLoZTZgZaNcyphelUa/y2DsmNSMIcfZXmYbZCqD/VErNBwfPD5mAr+M+1C5JxRY+6XIPs7jh2eibWZsiafsgDYV2Px2M5NoPfwaJDyBLVA57t34p2G9xCeCak+5cPgu3sZ+sdGC1OZ5uLr+32l9KUu+mR/Q/j2m06dlK4wF8rzwIDAQABo18wXTA8BgNVHREENTAzggxwYXBpLmtma2kuaHWGI2h0dHBzOi8vcGFwaS5rZmtpLmh1L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBS0zg53E13omfWDQUJAKMLs2TKjgDANBgkqhkiG9w0BAQUFAAOCAQEASowJqpasNKCiw9UvgdaYs98wdI5xKFNIngJdJUKqlYIR1EgibCKFSap6dQkjkuVyMoUfd13WNcruCKHm+TYR+A77/xQB8mr07LAKhcMCYXVR3JuHLewzEbKrXhifaP9Qj5isuiLTFPpsYHtOra9HkEhpRRxM9UO0F1tBXZwV9XtTfbSk/vqQUID4MufOnlLGcfoL551wEa8lQWTcj8+alUaizeIp66M3tFIB317xM7gMtAPdkp5FOyEO25ko6DuIXXFA4vIbGhJSPNmb9GjmKF4i2LlEZpFzW8FCrHS12cVtmDBUE8rw993QIE38s8Bi64wgMQPCG9dgeIUvHKn/zw==</ds:X509Certificate>
-        </ds:X509Data>
-        <ds:KeyName>papi.kfki.hu</ds:KeyName>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIIEcDCCA1igAwIBAgIQdJ8kRHCkiTNnB2gsFl8HnDANBgkqhkiG9w0BAQUFADA2MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEgU1NMIENBMB4XDTEyMTAwNTAwMDAwMFoXDTE1MTAwNTIzNTk1OVowTzELMAkGA1UEBhMCSFUxKTAnBgNVBAoTIE1UQSBXaWduZXIgRml6aWthaSBLdXRhdG9rb3pwb250MRUwEwYDVQQDEwxwYXBpLmtma2kuaHUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC2GCoP21qShohHWYORncFPElyjE3mBXCbNIDM+a0GkG0IbiD7b042iseaCxqlTioQtux2wV92DmvGolJvVYHQB4X3bR407ZSCM0KWZpcU+1IsZnQ+t2ZbgC+Hdu4S3lgr8ShWx4b8fsMLZRJDZpMv26jVDMRw3AgC6hYjHlxhEK5dq4Zf+QB39cecsI7AbMeME7VxSV9DrfunDr2gWeGH/VZZ1WxQ7pzaaPg4H/Dwy9PSGL3wcyB4JtmmoxC9V0MtD443Q+eNqTQDOVCgDMRQjPCBLP17EsEtNCAOKoixFR/BnpQIOf7d+nZnBkTZQ4qcQyda2gREyC+YPH9HVZulLAgMBAAGjggFfMIIBWzAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3V0fqkOO57TAdBgNVHQ4EFgQU+K5mh3yYNEZJ1h03qgYcnzPDUXYwDgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMBgGA1UdIAQRMA8wDQYLKwYBBAGyMQECAh0wOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwFwYDVR0RBBAwDoIMcGFwaS5rZmtpLmh1MA0GCSqGSIb3DQEBBQUAA4IBAQC3UcffXrc9R6QaYjPRX1mPnFaBd//JZufTUCNjmeVU5cxV0BXy1pbyJGwrDnIEGtjazkvcF3mwaCLD2B3mGaiXKlO3S7bVfNjCaGQZVmKPlzHMWRubUihPPcDN4MEgXEd5qnRnGw+dMdFX01DK+RPuiQIbvLKrSV3lpwoAm0rIYuognbxmdIinzkU6+lrpQZt77eCvnzTMBDkg1TIFUYFoBJ42viPN7R+380D9DSmV3nh/ewZj71mT6313QdODR2sY8XQsac4OSC/wMQdSQzeQZAAWY+LeLiXUko9EYlwRUdoU5XY/oFrHpRah3uswFK8aKlyxNx0mkPp9lGI/bfOL</ds:X509Certificate>
-        </ds:X509Data>
-        <ds:KeyName>papi.kfki.hu</ds:KeyName>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://papi.kfki.hu:8443/idp/profile/SAML2/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" Location="https://papi.kfki.hu/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://papi.kfki.hu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://papi.kfki.hu/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="hu">MTA Wigner Fizikai Kutatóközpont</OrganizationName>
-    <OrganizationName xml:lang="en">WIGNER Research Centre for Physics</OrganizationName>
-    <OrganizationDisplayName xml:lang="hu">MTA Wigner Fizikai Kutatóközpont</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">WIGNER Research Centre for Physics</OrganizationDisplayName>
-    <OrganizationURL xml:lang="hu">http://wigner.mta.hu</OrganizationURL>
-    <OrganizationURL xml:lang="en">http://wigner.mta.hu</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>KFKI AAI</SurName>
-    <EmailAddress>mailto:aai@kfki.hu</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="support">
-    <SurName>KFKI AAI</SurName>
-    <EmailAddress>mailto:aai@kfki.hu</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="administrative">
-    <SurName>KFKI AAI</SurName>
-    <EmailAddress>mailto:aai@kfki.hu</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/papi.kfki.hu.xml b/swamid-interfederations-2.0/papi.kfki.hu.xml
deleted file mode 100644
index 26de1e87..00000000
--- a/swamid-interfederations-2.0/papi.kfki.hu.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://papi.kfki.hu/idp/shibboleth">
-  <Extensions>
-    <ns9:MetadataSet xmlns:ns9="urn:geant:niif.hu:eduid.hu:entity-attributes:processing-info">kfki</ns9:MetadataSet>
-    <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>
-    <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">kfki.hu</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mail.kfki.hu</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sunserv.kfki.hu</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">rmki.kfki.hu</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">aeki.kfki.hu</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">iki.kfki.hu</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mfa.kfki.hu</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">szfki.hu</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">wigner.mta.hu</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">energia.mta.hu</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ttk.mta.hu</shibmd:Scope>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-        <mdui:IPHint>148.6.0.0/16</mdui:IPHint>
-        <mdui:IPHint>2001:738:5001::/48</mdui:IPHint>
-        <mdui:GeolocationHint>geo:47.48945,18.9497</mdui:GeolocationHint>
-      </mdui:DiscoHints>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-        <mdui:DisplayName xml:lang="hu">MTA Wigner Fizikai Kutatóközpont</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">WIGNER Research Centre for Physics</mdui:DisplayName>
-        <mdui:Description xml:lang="hu">MTA Wigner Fizikai Kutatóközpont</mdui:Description>
-        <mdui:Description xml:lang="en">WIGNER Research Centre for Physics</mdui:Description>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDGzCCAgOgAwIBAgIUdn3t4i5i7MiVMJB07lC7yL4IAoowDQYJKoZIhvcNAQEFBQAwFzEVMBMGA1UEAxMMcGFwaS5rZmtpLmh1MB4XDTA5MDgxMDE2MDEyMloXDTI5MDgxMDE2MDEyMlowFzEVMBMGA1UEAxMMcGFwaS5rZmtpLmh1MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApGGAG9GWNsCJZ6JayutI95u4FmGvsfza6uSKUX3XuZp1uUViY6eH4h4gCNgCzufvJ4GNSdxYhohFEgzB0MM23MrDl9DzS4NX+g7eYFCmmD1zPcui4YzIYJWmCSXAqXDqaLox4aVxtQrOr4sBcy/0jzlXXC3IHSS2GKuCj8tlXf9TLoZTZgZaNcyphelUa/y2DsmNSMIcfZXmYbZCqD/VErNBwfPD5mAr+M+1C5JxRY+6XIPs7jh2eibWZsiafsgDYV2Px2M5NoPfwaJDyBLVA57t34p2G9xCeCak+5cPgu3sZ+sdGC1OZ5uLr+32l9KUu+mR/Q/j2m06dlK4wF8rzwIDAQABo18wXTA8BgNVHREENTAzggxwYXBpLmtma2kuaHWGI2h0dHBzOi8vcGFwaS5rZmtpLmh1L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBS0zg53E13omfWDQUJAKMLs2TKjgDANBgkqhkiG9w0BAQUFAAOCAQEASowJqpasNKCiw9UvgdaYs98wdI5xKFNIngJdJUKqlYIR1EgibCKFSap6dQkjkuVyMoUfd13WNcruCKHm+TYR+A77/xQB8mr07LAKhcMCYXVR3JuHLewzEbKrXhifaP9Qj5isuiLTFPpsYHtOra9HkEhpRRxM9UO0F1tBXZwV9XtTfbSk/vqQUID4MufOnlLGcfoL551wEa8lQWTcj8+alUaizeIp66M3tFIB317xM7gMtAPdkp5FOyEO25ko6DuIXXFA4vIbGhJSPNmb9GjmKF4i2LlEZpFzW8FCrHS12cVtmDBUE8rw993QIE38s8Bi64wgMQPCG9dgeIUvHKn/zw==</ds:X509Certificate>
-        </ds:X509Data>
-        <ds:KeyName>papi.kfki.hu</ds:KeyName>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIIEcDCCA1igAwIBAgIQdJ8kRHCkiTNnB2gsFl8HnDANBgkqhkiG9w0BAQUFADA2MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEgU1NMIENBMB4XDTEyMTAwNTAwMDAwMFoXDTE1MTAwNTIzNTk1OVowTzELMAkGA1UEBhMCSFUxKTAnBgNVBAoTIE1UQSBXaWduZXIgRml6aWthaSBLdXRhdG9rb3pwb250MRUwEwYDVQQDEwxwYXBpLmtma2kuaHUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC2GCoP21qShohHWYORncFPElyjE3mBXCbNIDM+a0GkG0IbiD7b042iseaCxqlTioQtux2wV92DmvGolJvVYHQB4X3bR407ZSCM0KWZpcU+1IsZnQ+t2ZbgC+Hdu4S3lgr8ShWx4b8fsMLZRJDZpMv26jVDMRw3AgC6hYjHlxhEK5dq4Zf+QB39cecsI7AbMeME7VxSV9DrfunDr2gWeGH/VZZ1WxQ7pzaaPg4H/Dwy9PSGL3wcyB4JtmmoxC9V0MtD443Q+eNqTQDOVCgDMRQjPCBLP17EsEtNCAOKoixFR/BnpQIOf7d+nZnBkTZQ4qcQyda2gREyC+YPH9HVZulLAgMBAAGjggFfMIIBWzAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3V0fqkOO57TAdBgNVHQ4EFgQU+K5mh3yYNEZJ1h03qgYcnzPDUXYwDgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMBgGA1UdIAQRMA8wDQYLKwYBBAGyMQECAh0wOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwFwYDVR0RBBAwDoIMcGFwaS5rZmtpLmh1MA0GCSqGSIb3DQEBBQUAA4IBAQC3UcffXrc9R6QaYjPRX1mPnFaBd//JZufTUCNjmeVU5cxV0BXy1pbyJGwrDnIEGtjazkvcF3mwaCLD2B3mGaiXKlO3S7bVfNjCaGQZVmKPlzHMWRubUihPPcDN4MEgXEd5qnRnGw+dMdFX01DK+RPuiQIbvLKrSV3lpwoAm0rIYuognbxmdIinzkU6+lrpQZt77eCvnzTMBDkg1TIFUYFoBJ42viPN7R+380D9DSmV3nh/ewZj71mT6313QdODR2sY8XQsac4OSC/wMQdSQzeQZAAWY+LeLiXUko9EYlwRUdoU5XY/oFrHpRah3uswFK8aKlyxNx0mkPp9lGI/bfOL</ds:X509Certificate>
-        </ds:X509Data>
-        <ds:KeyName>papi.kfki.hu</ds:KeyName>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://papi.kfki.hu:8443/idp/profile/SAML2/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" Location="https://papi.kfki.hu/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://papi.kfki.hu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://papi.kfki.hu/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="hu">MTA Wigner Fizikai Kutatóközpont</OrganizationName>
-    <OrganizationName xml:lang="en">WIGNER Research Centre for Physics</OrganizationName>
-    <OrganizationDisplayName xml:lang="hu">MTA Wigner Fizikai Kutatóközpont</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">WIGNER Research Centre for Physics</OrganizationDisplayName>
-    <OrganizationURL xml:lang="hu">http://wigner.mta.hu</OrganizationURL>
-    <OrganizationURL xml:lang="en">http://wigner.mta.hu</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>KFKI AAI</SurName>
-    <EmailAddress>mailto:aai@kfki.hu</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="support">
-    <SurName>KFKI AAI</SurName>
-    <EmailAddress>mailto:aai@kfki.hu</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="administrative">
-    <SurName>KFKI AAI</SurName>
-    <EmailAddress>mailto:aai@kfki.hu</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/perun-dev.ics.muni.cz.xml b/swamid-interfederations-2.0/perun-dev.ics.muni.cz.xml
deleted file mode 100644
index b43bb071..00000000
--- a/swamid-interfederations-2.0/perun-dev.ics.muni.cz.xml
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://perun-dev.ics.muni.cz/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>
-      <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://perun-dev.ics.muni.cz/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://perun-dev.ics.muni.cz/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Masaryk University</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="cs">Masarykova univerzita</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Perun devel instance for MU</mdui:Description>
-        <mdui:Description xml:lang="cs">Devel instance Peruna pro MU</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.muni.cz/?lang=en</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="cs">http://www.muni.cz/</mdui:InformationURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>perun-dev.ics.muni.cz</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=perun-dev.ics.muni.cz,OU=Domain Control Validated</ds:X509SubjectName>
-          <ds:X509Certificate>MIIEeDCCA2CgAwIBAgIRAJPHnlhYYXpFQ/jdVvQLJg8wDQYJKoZIhvcNAQEFBQAw
-NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-IFNTTCBDQTAeFw0xNDA4MDQwMDAwMDBaFw0xNzA4MDMyMzU5NTlaMEMxITAfBgNV
-BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEeMBwGA1UEAxMVcGVydW4tZGV2
-Lmljcy5tdW5pLmN6MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAzku/
-HV4qVOC/0mZOblorgHTh3InHdp5Q+x2Ra7jxIkv0UDmU6o59oOk6OL0C1ojcPfYB
-PLX0MskupNGVjcCz825FxB3zHlQRdU86ayRRsa//Yo0JbOn1k+/cl/wL0OsJf2kk
-Ks71ldyfO6HvhGWzAMMXw3CmDFwRFCoHd8ANl3ZxDJxzPtga9i7aHpFTs8sDZ00R
-NoM/87kOow48LuNa53VQyoFsg4EsERWykHRzHYW7nPB+qGZjYUrpGr9ALvPPR80X
-NvK1z93cLCeDfnI402FUPt89T4tfa0D3KqFgLNRTLQkzpzWskJTkVjeatVnMqYbJ
-FHU2eUCs7//g14gHdwIDAQABo4IBcjCCAW4wHwYDVR0jBBgwFoAUDL2TaAzz3quj
-SWsrN1dH6pDjue0wHQYDVR0OBBYEFKkVFJJczlQBmoNzt8V/Tos6djRHMA4GA1Ud
-DwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggr
-BgEFBQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNV
-HR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNT
-TENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQu
-dGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRw
-Oi8vb2NzcC50Y3MudGVyZW5hLm9yZzAgBgNVHREEGTAXghVwZXJ1bi1kZXYuaWNz
-Lm11bmkuY3owDQYJKoZIhvcNAQEFBQADggEBAHD+Ji1bk7FLaoEot4tOF0DRPiNw
-DpsJY5OPrJSxpHnHeX3B46cqnmZHeifjbbiEOiZvXhjQPbQ2uGAuVKgAPbhWQ80s
-r2KQ6GzvWzDhpo0mVy9dKZ8SKinAmE71U1w4/66ToaJ3rpkokHbry/Xsl6QzTmAM
-Gevgp3tusOn3Ixs6VY4qO3Vr1N6HcFwZCaDx1BbUsdlFnnmEfT1W5UkguWydPRcb
-JLGAX70RggRScicuTrTD7MvBCQAExJciD2Nh/7oAihzfEGjaoTXwSOgB3PtnT00b
-m/TIaT98RnX+oWtKZ0cq8f8dukjowwizjBd2n7yr0oscWPslHUIFc1WKq+M=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://perun-dev.ics.muni.cz/Shibboleth.sso/Artifact/SOAP" index="0"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://perun-dev.ics.muni.cz/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://perun-dev.ics.muni.cz/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://perun-dev.ics.muni.cz/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://perun-dev.ics.muni.cz/Shibboleth.sso/SLO/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://perun-dev.ics.muni.cz/Shibboleth.sso/SAML2/POST" index="0"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://perun-dev.ics.muni.cz/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://perun-dev.ics.muni.cz/Shibboleth.sso/SAML2/Artifact" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://perun-dev.ics.muni.cz/Shibboleth.sso/SAML2/ECP" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://perun-dev.ics.muni.cz/Shibboleth.sso/SAML/POST" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://perun-dev.ics.muni.cz/Shibboleth.sso/SAML/Artifact" index="5"/>
-    <md:AttributeConsumingService index="1">
-      <md:ServiceName xml:lang="en">Perun MU Devel</md:ServiceName>
-      <md:ServiceName xml:lang="cs">Perun MU Devel</md:ServiceName>
-      <md:ServiceDescription xml:lang="en">Perun devel instance for MU</md:ServiceDescription>
-      <md:ServiceDescription xml:lang="cs">Devel instance Peruna pro MU</md:ServiceDescription>
-      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="cn" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="o" Name="urn:oid:2.5.4.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="cs">Masarykova univerzita</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">Masaryk University</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="cs">Masarykova univerzita</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Masaryk University</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="cs">http://www.muni.cz/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.muni.cz/?lang=en</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Slavek</md:GivenName>
-    <md:SurName>Licehammer</md:SurName>
-    <md:EmailAddress>perun@cesnet.cz</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Michal</md:GivenName>
-    <md:SurName>Prochazka</md:SurName>
-    <md:EmailAddress>perun@cesnet.cz</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/portail.u-picardie.fr.xml b/swamid-interfederations-2.0/portail.u-picardie.fr.xml
deleted file mode 100644
index b2f42f93..00000000
--- a/swamid-interfederations-2.0/portail.u-picardie.fr.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://portail.u-picardie.fr">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2014-09-02T16:43:49Z">
-      <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">Captive Portal UPJV</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Eduspot</mdui:Description>
-        <mdui:DisplayName xml:lang="fr">Portail Captif UPJV</mdui:DisplayName>
-        <mdui:Description xml:lang="fr">Eduspot</mdui:Description>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIEeDCCA2CgAwIBAgIRAI8ATZBA7Bnw3Q1sS4vt94owDQYJKoZIhvcNAQEFBQAw
-NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-IFNTTCBDQTAeFw0xNDA5MDIwMDAwMDBaFw0xNzA5MDEyMzU5NTlaMEMxITAfBgNV
-BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEeMBwGA1UEAxMVcG9ydGFpbC51
-LXBpY2FyZGllLmZyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtnBM
-cAhCPXC9pBbPm3er4NW+GudXQ7RdSSbjcwvdrTJaZYz87cHLW9S9Z8IT1U0yMUF5
-GWpY3QJdZD7sqWRmbbqSPTRocfStRu1BCXeBFhSDmO7BStGYcFNOLEM0m85ltHY9
-8gqegGoWM1khQmIBNZJAzGQXRs9lOG0ot08mPW/XyZGoo5yvCO4VWNpkd1wlZ7Jg
-TiXyPsqRm4R7+YHwn1R8UMWVMsUUvF2CQNxW8+Ghg/OVn7YrvLb+36vQHznSz1iK
-NYTtRUwXlxM5+o2eIdNWlmZJ3TagRLqWvmUSxbWPZMQ6TTQ0yAyoqqwo2uI3SLw5
-Qz9y2Qmb27YCL88i2QIDAQABo4IBcjCCAW4wHwYDVR0jBBgwFoAUDL2TaAzz3quj
-SWsrN1dH6pDjue0wHQYDVR0OBBYEFBOVnqjQVT5ecFN5XpHZFMjTE6qvMA4GA1Ud
-DwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggr
-BgEFBQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNV
-HR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNT
-TENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQu
-dGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRw
-Oi8vb2NzcC50Y3MudGVyZW5hLm9yZzAgBgNVHREEGTAXghVwb3J0YWlsLnUtcGlj
-YXJkaWUuZnIwDQYJKoZIhvcNAQEFBQADggEBAKWOzDpu8ZDdABvbqfqVypK26AuS
-KZQgRWrbhjWXO6beNP1vgv2zkG45tlStDR/IsyJdhif96xUrtHIMNrIJHAX7bO8A
-INrL50AL/tmfSBMrc6zAP4XZyX0MG8PXhMHyZjxuI7mLM/woxXCkn4OiKMZhWVbD
-Fw5YllIUfrdyDXq8Y11DJ/vvZ8fezanidQX1QOtf3YqB6E6XB0iDebyaw92FMe2K
-CWc9pJ6KeATZnLv6m4m3+cfGRD9Oczou7iHD6nt2Cc2NMlfKJXBy8l1FlLMJgzAF
-Jeo/JF+pa6rXH5QzpgLaL56jnm2C62ghYn4OMZlD1hzzTRGsoq2qWguZnyk=
-					    </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>
-					      MIIEeDCCA2CgAwIBAgIRAI8ATZBA7Bnw3Q1sS4vt94owDQYJKoZIhvcNAQEFBQAw
-NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-IFNTTCBDQTAeFw0xNDA5MDIwMDAwMDBaFw0xNzA5MDEyMzU5NTlaMEMxITAfBgNV
-BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEeMBwGA1UEAxMVcG9ydGFpbC51
-LXBpY2FyZGllLmZyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtnBM
-cAhCPXC9pBbPm3er4NW+GudXQ7RdSSbjcwvdrTJaZYz87cHLW9S9Z8IT1U0yMUF5
-GWpY3QJdZD7sqWRmbbqSPTRocfStRu1BCXeBFhSDmO7BStGYcFNOLEM0m85ltHY9
-8gqegGoWM1khQmIBNZJAzGQXRs9lOG0ot08mPW/XyZGoo5yvCO4VWNpkd1wlZ7Jg
-TiXyPsqRm4R7+YHwn1R8UMWVMsUUvF2CQNxW8+Ghg/OVn7YrvLb+36vQHznSz1iK
-NYTtRUwXlxM5+o2eIdNWlmZJ3TagRLqWvmUSxbWPZMQ6TTQ0yAyoqqwo2uI3SLw5
-Qz9y2Qmb27YCL88i2QIDAQABo4IBcjCCAW4wHwYDVR0jBBgwFoAUDL2TaAzz3quj
-SWsrN1dH6pDjue0wHQYDVR0OBBYEFBOVnqjQVT5ecFN5XpHZFMjTE6qvMA4GA1Ud
-DwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggr
-BgEFBQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNV
-HR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNT
-TENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQu
-dGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRw
-Oi8vb2NzcC50Y3MudGVyZW5hLm9yZzAgBgNVHREEGTAXghVwb3J0YWlsLnUtcGlj
-YXJkaWUuZnIwDQYJKoZIhvcNAQEFBQADggEBAKWOzDpu8ZDdABvbqfqVypK26AuS
-KZQgRWrbhjWXO6beNP1vgv2zkG45tlStDR/IsyJdhif96xUrtHIMNrIJHAX7bO8A
-INrL50AL/tmfSBMrc6zAP4XZyX0MG8PXhMHyZjxuI7mLM/woxXCkn4OiKMZhWVbD
-Fw5YllIUfrdyDXq8Y11DJ/vvZ8fezanidQX1QOtf3YqB6E6XB0iDebyaw92FMe2K
-CWc9pJ6KeATZnLv6m4m3+cfGRD9Oczou7iHD6nt2Cc2NMlfKJXBy8l1FlLMJgzAF
-Jeo/JF+pa6rXH5QzpgLaL56jnm2C62ghYn4OMZlD1hzzTRGsoq2qWguZnyk=
-					    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://portail.u-picardie.fr/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://portail.u-picardie.fr/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AttributeConsumingService index="0">
-      <ServiceName xml:lang="fr">Portail Captif UPJV</ServiceName>
-      <ServiceName xml:lang="en">Captive Portal UPJV</ServiceName>
-      <ServiceDescription xml:lang="fr">Eduspot</ServiceDescription>
-      <ServiceDescription xml:lang="en">Eduspot</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">
-        <saml:AttributeValue xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion">eppn</saml:AttributeValue>
-      </RequestedAttribute>
-    </AttributeConsumingService>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Université de Picardie Jules Verne</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Université de Picardie Jules Verne</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Christophe Dupreuil</SurName>
-    <EmailAddress>christophe.dupreuil@u-picardie.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/portal.clarin.inl.nl-.xml b/swamid-interfederations-2.0/portal.clarin.inl.nl-.xml
index 152c3742..33a0d19e 100644
--- a/swamid-interfederations-2.0/portal.clarin.inl.nl-.xml
+++ b/swamid-interfederations-2.0/portal.clarin.inl.nl-.xml
@@ -1,27 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://portal.clarin.inl.nl/">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2014-02-09T11:21:39Z">
-      <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: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://portal.clarin.inl.nl/Shibboleth.sso/DiscoJuice" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="de">Institute for Dutch Lexicology Portal</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Institute for Dutch Lexicology Portal</mdui:DisplayName>
-        <mdui:Description xml:lang="de">Institute for Dutch Lexicology Portal</mdui:Description>
-        <mdui:Description xml:lang="en">Institute for Dutch Lexicology Portal</mdui:Description>
-        <mdui:InformationURL xml:lang="en">https://portal.clarin.inl.nl/</mdui:InformationURL>
+<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://portal.clarin.inl.nl/">
+  <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://portal.clarin.inl.nl/Shibboleth.sso/DS" index="1"/>
+      <mdui:UIInfo>
+        <mdui:DisplayName xml:lang="fi">Hollannin leksikologian instituutin kieliresurssiportaali</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Institute for Dutch Lexicology Language Resource Portal</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Repository for source material for Dutch in the form of historical and contemporary corpora, dictionaries and language technology tools.</mdui:Description>
+        <mdui:Description xml:lang="fi">Hollannin kielen lähderesursseja, mm. korpuksia, sanakirjoja, kieliteknologian työkaluja.</mdui:Description>
+        <mdui:InformationURL xml:lang="en">https://portal.clarin.inl.nl/doc/information_about_deposition.pdf</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://portal.clarin.inl.nl/doc/end_user_license_agreement.pdf</mdui:PrivacyStatementURL>
       </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>portal.clarin.inl.nl</ds:KeyName>
+      <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:X509SubjectName>CN=portal.clarin.inl.nl,OU=InstantSSL,O=St Instituut voor Nederlandse Lexicologie,street=Matthias de Vrieshof 2-3,L=Leiden,ST=Zuid-Holland,postalCode=2311 BZ,C=NL</ds:X509SubjectName>
           <ds:X509Certificate>MIIFwTCCBKmgAwIBAgIQYT/URYqjuNs5Wvey06PWozANBgkqhkiG9w0BAQUFADCB
 iTELMAkGA1UEBhMCR0IxGzAZBgNVBAgTEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4G
 A1UEBxMHU2FsZm9yZDEaMBgGA1UEChMRQ09NT0RPIENBIExpbWl0ZWQxLzAtBgNV
@@ -52,36 +49,45 @@ wVaPQRJ8CAJ75BRokKozs/dbRFsK7nykWIz4ryP8ygPDVVOxVdvweTZY6iRrMhhm
 ipw6JOA9+S12wS4ZVDTw1Lnqx55zhvZufKE/IcYUtXQG9zIThXvkSaZsbl81PeiJ
 JzPwUvRo8xI+nUirIcO80HN9FlZJ2MUHnt5EJNvdzWMOrwVyvIkSPllFsVLwRIih
 EYedRymWuO/OSGWReWSkDjCXxPNrqd4aaZSZH67bOcYLz4FUMR64+4JXSN8/gchW
-zq4XJzocDxUe2X15eEg+Nw6f/ORaY9V9249atYZCavmDX/4vXw==
-</ds:X509Certificate>
+zq4XJzocDxUe2X15eEg+Nw6f/ORaY9V9249atYZCavmDX/4vXw==</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://portal.clarin.inl.nl/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AttributeConsumingService index="1">
-      <ServiceName xml:lang="de">Institute for Dutch Lexicology Portal</ServiceName>
-      <ServiceName xml:lang="en">Institute for Dutch Lexicology Portal</ServiceName>
-      <ServiceDescription xml:lang="de">Institute for Dutch Lexicology Portal</ServiceDescription>
-      <ServiceDescription xml:lang="en">Institute for Dutch Lexicology Portal</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"/>
-    </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="technical">
-    <GivenName>System</GivenName>
-    <SurName>Management</SurName>
-    <EmailAddress>mailto:systeembeheer@inl.nl</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="support">
-    <GivenName>Service</GivenName>
-    <SurName>Desk</SurName>
-    <EmailAddress>mailto:servicedesk@inl.nl</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://portal.clarin.inl.nl/Shibboleth.sso/SAML2/POST" index="1" isDefault="true"/>
+    <md:AttributeConsumingService index="1" isDefault="true">
+      <md:ServiceName xml:lang="fi">Hollannin leksikologian instituutin kieliresurssiportaali</md:ServiceName>
+      <md:ServiceName xml:lang="en">Institute for Dutch Lexicology Language Resource Portal</md:ServiceName>
+      <md:ServiceDescription xml:lang="fi">Hollannin kielen lahderesursseja, mm. korpuksia, sanakirjoja, kieliteknologian tyokaluja.</md:ServiceDescription>
+      <md:ServiceDescription xml:lang="en">Repository for source material for Dutch in the form of historical and contemporary corpora, dictionaries and language technology tools.</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.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonPrincipalName"/>
+      <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.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="mail"/>
+      <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.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">CLARIN Service Provider Federation/MPI</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">CLARIN Service Provider Federation/MPI</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">CLARIN Service Provider Federation/MPI</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="fi">CLARIN Service Provider Federation/MPI</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">CLARIN Service Provider Federation/MPI</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">CLARIN Service Provider Federation/MPI</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="fi">http://www.clarin.eu</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.clarin.eu</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">http://www.clarin.eu</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>systeembeheer@inl.nl</md:GivenName>
+    <md:SurName>INL</md:SurName>
+    <md:EmailAddress>mailto:systeembeheer@inl.nl</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>servicedesk@inl.nl</md:GivenName>
+    <md:SurName>INL</md:SurName>
+    <md:EmailAddress>mailto:servicedesk@inl.nl</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/portal.clarin.inl.nl.xml b/swamid-interfederations-2.0/portal.clarin.inl.nl.xml
deleted file mode 100644
index 152c3742..00000000
--- a/swamid-interfederations-2.0/portal.clarin.inl.nl.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://portal.clarin.inl.nl/">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2014-02-09T11:21:39Z">
-      <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: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://portal.clarin.inl.nl/Shibboleth.sso/DiscoJuice" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="de">Institute for Dutch Lexicology Portal</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Institute for Dutch Lexicology Portal</mdui:DisplayName>
-        <mdui:Description xml:lang="de">Institute for Dutch Lexicology Portal</mdui:Description>
-        <mdui:Description xml:lang="en">Institute for Dutch Lexicology Portal</mdui:Description>
-        <mdui:InformationURL xml:lang="en">https://portal.clarin.inl.nl/</mdui:InformationURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>portal.clarin.inl.nl</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=portal.clarin.inl.nl,OU=InstantSSL,O=St Instituut voor Nederlandse Lexicologie,street=Matthias de Vrieshof 2-3,L=Leiden,ST=Zuid-Holland,postalCode=2311 BZ,C=NL</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFwTCCBKmgAwIBAgIQYT/URYqjuNs5Wvey06PWozANBgkqhkiG9w0BAQUFADCB
-iTELMAkGA1UEBhMCR0IxGzAZBgNVBAgTEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4G
-A1UEBxMHU2FsZm9yZDEaMBgGA1UEChMRQ09NT0RPIENBIExpbWl0ZWQxLzAtBgNV
-BAMTJkNPTU9ETyBIaWdoLUFzc3VyYW5jZSBTZWN1cmUgU2VydmVyIENBMB4XDTEx
-MDgyNTAwMDAwMFoXDTE2MDgyNDIzNTk1OVowgdIxCzAJBgNVBAYTAk5MMRAwDgYD
-VQQREwcyMzExIEJaMRUwEwYDVQQIEwxadWlkLUhvbGxhbmQxDzANBgNVBAcTBkxl
-aWRlbjEhMB8GA1UECRMYTWF0dGhpYXMgZGUgVnJpZXNob2YgMi0zMTIwMAYDVQQK
-EylTdCBJbnN0aXR1dXQgdm9vciBOZWRlcmxhbmRzZSBMZXhpY29sb2dpZTETMBEG
-A1UECxMKSW5zdGFudFNTTDEdMBsGA1UEAxMUcG9ydGFsLmNsYXJpbi5pbmwubmww
-ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC+faM4kQs7smclVpmqWzzX
-ZbhhPBW4ulwloBRQY7iR0unaMAGbxobpHvar28sASdvZ7W8IL+Az2J714pceJpit
-s/1Q10cJBzmcopvHtR4Hp6PZxjdEUljrCifQt+IZeZw99TMH4gpeC9zhAdzyubFs
-d452dy8+oljTOlTumbr1zACGU5ZGUInru467GJtMHYTJDDS1/BGuVx0XKwo0idCC
-goGF8ZIxyHQq/2Q37Py10238nKx614U6KtE//dHP5KkLEHow1Vfm90N+czIkRt+4
-4jl91Cel58jfvjXF3I/Cspi7vFDjRMaeBHsrxtDBWVUOo9GSMWRUiCOeQvGASXcb
-AgMBAAGjggHYMIIB1DAfBgNVHSMEGDAWgBQ/1bXQ1kR5UEoXo5uMSty4sCJkazAd
-BgNVHQ4EFgQUbmgntbNatGZ2IBRNLqazqtbpwGAwDgYDVR0PAQH/BAQDAgWgMAwG
-A1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMEYGA1Ud
-IAQ/MD0wOwYMKwYBBAGyMQECAQMEMCswKQYIKwYBBQUHAgEWHWh0dHBzOi8vc2Vj
-dXJlLmNvbW9kby5jb20vQ1BTME8GA1UdHwRIMEYwRKBCoECGPmh0dHA6Ly9jcmwu
-Y29tb2RvY2EuY29tL0NPTU9ET0hpZ2gtQXNzdXJhbmNlU2VjdXJlU2VydmVyQ0Eu
-Y3JsMIGABggrBgEFBQcBAQR0MHIwSgYIKwYBBQUHMAKGPmh0dHA6Ly9jcnQuY29t
-b2RvY2EuY29tL0NPTU9ET0hpZ2gtQXNzdXJhbmNlU2VjdXJlU2VydmVyQ0EuY3J0
-MCQGCCsGAQUFBzABhhhodHRwOi8vb2NzcC5jb21vZG9jYS5jb20wOQYDVR0RBDIw
-MIIUcG9ydGFsLmNsYXJpbi5pbmwubmyCGHd3dy5wb3J0YWwuY2xhcmluLmlubC5u
-bDANBgkqhkiG9w0BAQUFAAOCAQEARI37zQIk6P0aQkSMyambDpkm+ciyvWTur0Z4
-wVaPQRJ8CAJ75BRokKozs/dbRFsK7nykWIz4ryP8ygPDVVOxVdvweTZY6iRrMhhm
-ipw6JOA9+S12wS4ZVDTw1Lnqx55zhvZufKE/IcYUtXQG9zIThXvkSaZsbl81PeiJ
-JzPwUvRo8xI+nUirIcO80HN9FlZJ2MUHnt5EJNvdzWMOrwVyvIkSPllFsVLwRIih
-EYedRymWuO/OSGWReWSkDjCXxPNrqd4aaZSZH67bOcYLz4FUMR64+4JXSN8/gchW
-zq4XJzocDxUe2X15eEg+Nw6f/ORaY9V9249atYZCavmDX/4vXw==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://portal.clarin.inl.nl/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AttributeConsumingService index="1">
-      <ServiceName xml:lang="de">Institute for Dutch Lexicology Portal</ServiceName>
-      <ServiceName xml:lang="en">Institute for Dutch Lexicology Portal</ServiceName>
-      <ServiceDescription xml:lang="de">Institute for Dutch Lexicology Portal</ServiceDescription>
-      <ServiceDescription xml:lang="en">Institute for Dutch Lexicology Portal</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"/>
-    </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="technical">
-    <GivenName>System</GivenName>
-    <SurName>Management</SurName>
-    <EmailAddress>mailto:systeembeheer@inl.nl</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="support">
-    <GivenName>Service</GivenName>
-    <SurName>Desk</SurName>
-    <EmailAddress>mailto:servicedesk@inl.nl</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/portal.moonshot.ja.net-shibboleth.xml b/swamid-interfederations-2.0/portal.moonshot.ja.net-shibboleth.xml
deleted file mode 100644
index 7657599e..00000000
--- a/swamid-interfederations-2.0/portal.moonshot.ja.net-shibboleth.xml
+++ /dev/null
@@ -1,97 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://portal.moonshot.ja.net/shibboleth">
-  <!--
-		This is a "Moonshot Portal" Shibboleth SP for JISC Collections and Janet 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="2014-06-04T09:59:13Z">
-      <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">Moonshot Portal</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Self-service portal to configure trust links for Moonshot IdPs and RPs</mdui:Description>
-        <mdui:Logo height="400" width="400">https://wiki.moonshot.ja.net/download/attachments/360449/global.logo?version=2&amp;modificationDate=1390577635000&amp;api=v2</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://portal.moonshot.ja.net/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://portal.moonshot.ja.net/Shibboleth.sso/Login" index="1"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIC/TCCAeWgAwIBAgIJAPSyqGhwjBRoMA0GCSqGSIb3DQEBBQUAMB0xGzAZBgNV
-						BAMTEnAxLm1vb25zaG90LmphLm5ldDAeFw0xNDA2MDMxNTE5MzVaFw0yNDA1MzEx
-						NTE5MzVaMB0xGzAZBgNVBAMTEnAxLm1vb25zaG90LmphLm5ldDCCASIwDQYJKoZI
-						hvcNAQEBBQADggEPADCCAQoCggEBAJuhB6CwLcwlMU1BCmk7K2dV0tbnx7uOd2xP
-						6u2OIMpfc6DybIXXbrFlvQc0iu74D8BwVZliaThcufwdCCuRYawa+WgfGq2vbC+e
-						ZDLWub927i71sVPGvUbjpf2o70CWWd8mnJI8O1GW/4h75izs4o6rzIUYKKhhZj8+
-						bT1WfpQIEl6f4dfCaL0BwxcJdtUB5mRXIluvJ/jIOwrZfUwBtt4kTwNv+O5ZnSDR
-						ka9xUVMb5zo5ThKQwvyIasrWHvtJTVrDgipgl5U3yy0pICbefHsVRGsWI9tpedGE
-						yk9lBy4aaitqVUw0wAj9c819R/kFfUO7rrFDL9XXW6fb89JSwsECAwEAAaNAMD4w
-						HQYDVR0RBBYwFIIScDEubW9vbnNob3QuamEubmV0MB0GA1UdDgQWBBQG/nxwZyg5
-						WmVT7dW1ls/M1vbiozANBgkqhkiG9w0BAQUFAAOCAQEAkLBx3gDitwIxjSCuMSxd
-						5ll6UJCygSwaYm6Xi6mjH1ORIInecwlZkJpGpKALcfQK5bKnSMZ+uP2WR5xOawuf
-						y0Thr2Kpi+zHhU1Va2rS92OUTPGzTiFEeg6ZCFx2Gx+8zAHv217cE7c4L1ubwWIh
-						dPnM3T/hDlfNmnxVwsFSlq/bpPL6rtLzkJkguh/4/0RcBo8qiBU524S6Tg06CDIv
-						JRAUSwga2eSyN/TtSCo0cHOhSyngdaInidFRKtt/Fx7MUp6IcmnoeoqeEFw8LfG3
-						XbypI2H0IHybvdGVRRGXWQpkPrjUXnu4D5m5jc+C+/XqzIiaN3/FEAG0fKdIHHDt
-						HQ==
-					</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://portal.moonshot.ja.net/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://portal.moonshot.ja.net/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://portal.moonshot.ja.net/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://portal.moonshot.ja.net/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://portal.moonshot.ja.net/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://portal.moonshot.ja.net/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://portal.moonshot.ja.net/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://portal.moonshot.ja.net/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://portal.moonshot.ja.net/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://portal.moonshot.ja.net/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://portal.moonshot.ja.net/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <AttributeConsumingService index="0" isDefault="true">
-      <ServiceName xml:lang="en">Moonshot Portal</ServiceName>
-      <ServiceDescription xml:lang="en">Self-service portal to configure trust links for Moonshot IdPs and RPs</ServiceDescription>
-      <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"/>
-    </AttributeConsumingService>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">JISC Collections and Janet Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Moonshot Portal</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">https://portal.moonshot.ja.net/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Adam</GivenName>
-    <SurName>Bishop</SurName>
-    <EmailAddress>mailto:Adam.bishop@ja.net</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Adam</GivenName>
-    <SurName>Bishop</SurName>
-    <EmailAddress>mailto:Adam.bishop@ja.net</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/portal.moonshot.ja.net.xml b/swamid-interfederations-2.0/portal.moonshot.ja.net.xml
deleted file mode 100644
index 7657599e..00000000
--- a/swamid-interfederations-2.0/portal.moonshot.ja.net.xml
+++ /dev/null
@@ -1,97 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://portal.moonshot.ja.net/shibboleth">
-  <!--
-		This is a "Moonshot Portal" Shibboleth SP for JISC Collections and Janet 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="2014-06-04T09:59:13Z">
-      <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">Moonshot Portal</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Self-service portal to configure trust links for Moonshot IdPs and RPs</mdui:Description>
-        <mdui:Logo height="400" width="400">https://wiki.moonshot.ja.net/download/attachments/360449/global.logo?version=2&amp;modificationDate=1390577635000&amp;api=v2</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://portal.moonshot.ja.net/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://portal.moonshot.ja.net/Shibboleth.sso/Login" index="1"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIC/TCCAeWgAwIBAgIJAPSyqGhwjBRoMA0GCSqGSIb3DQEBBQUAMB0xGzAZBgNV
-						BAMTEnAxLm1vb25zaG90LmphLm5ldDAeFw0xNDA2MDMxNTE5MzVaFw0yNDA1MzEx
-						NTE5MzVaMB0xGzAZBgNVBAMTEnAxLm1vb25zaG90LmphLm5ldDCCASIwDQYJKoZI
-						hvcNAQEBBQADggEPADCCAQoCggEBAJuhB6CwLcwlMU1BCmk7K2dV0tbnx7uOd2xP
-						6u2OIMpfc6DybIXXbrFlvQc0iu74D8BwVZliaThcufwdCCuRYawa+WgfGq2vbC+e
-						ZDLWub927i71sVPGvUbjpf2o70CWWd8mnJI8O1GW/4h75izs4o6rzIUYKKhhZj8+
-						bT1WfpQIEl6f4dfCaL0BwxcJdtUB5mRXIluvJ/jIOwrZfUwBtt4kTwNv+O5ZnSDR
-						ka9xUVMb5zo5ThKQwvyIasrWHvtJTVrDgipgl5U3yy0pICbefHsVRGsWI9tpedGE
-						yk9lBy4aaitqVUw0wAj9c819R/kFfUO7rrFDL9XXW6fb89JSwsECAwEAAaNAMD4w
-						HQYDVR0RBBYwFIIScDEubW9vbnNob3QuamEubmV0MB0GA1UdDgQWBBQG/nxwZyg5
-						WmVT7dW1ls/M1vbiozANBgkqhkiG9w0BAQUFAAOCAQEAkLBx3gDitwIxjSCuMSxd
-						5ll6UJCygSwaYm6Xi6mjH1ORIInecwlZkJpGpKALcfQK5bKnSMZ+uP2WR5xOawuf
-						y0Thr2Kpi+zHhU1Va2rS92OUTPGzTiFEeg6ZCFx2Gx+8zAHv217cE7c4L1ubwWIh
-						dPnM3T/hDlfNmnxVwsFSlq/bpPL6rtLzkJkguh/4/0RcBo8qiBU524S6Tg06CDIv
-						JRAUSwga2eSyN/TtSCo0cHOhSyngdaInidFRKtt/Fx7MUp6IcmnoeoqeEFw8LfG3
-						XbypI2H0IHybvdGVRRGXWQpkPrjUXnu4D5m5jc+C+/XqzIiaN3/FEAG0fKdIHHDt
-						HQ==
-					</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://portal.moonshot.ja.net/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://portal.moonshot.ja.net/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://portal.moonshot.ja.net/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://portal.moonshot.ja.net/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://portal.moonshot.ja.net/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://portal.moonshot.ja.net/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://portal.moonshot.ja.net/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://portal.moonshot.ja.net/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://portal.moonshot.ja.net/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://portal.moonshot.ja.net/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://portal.moonshot.ja.net/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <AttributeConsumingService index="0" isDefault="true">
-      <ServiceName xml:lang="en">Moonshot Portal</ServiceName>
-      <ServiceDescription xml:lang="en">Self-service portal to configure trust links for Moonshot IdPs and RPs</ServiceDescription>
-      <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"/>
-    </AttributeConsumingService>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">JISC Collections and Janet Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Moonshot Portal</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">https://portal.moonshot.ja.net/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Adam</GivenName>
-    <SurName>Bishop</SurName>
-    <EmailAddress>mailto:Adam.bishop@ja.net</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Adam</GivenName>
-    <SurName>Bishop</SurName>
-    <EmailAddress>mailto:Adam.bishop@ja.net</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/portofranco.ufma.br-idp-shibboleth.xml b/swamid-interfederations-2.0/portofranco.ufma.br-idp-shibboleth.xml
deleted file mode 100644
index e3899df6..00000000
--- a/swamid-interfederations-2.0/portofranco.ufma.br-idp-shibboleth.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://portofranco.ufma.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">ufma.br</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">UFMA - Universidade Federal do Maranhao</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="pt-br">UFMA - Universidade Federal do Maranhao</mdui:DisplayName>
-        <mdui:Description xml:lang="en">UFMA - Universidade Federal do Maranhao</mdui:Description>
-        <mdui:Description xml:lang="pt-br">UFMA - Universidade Federal do Maranhao</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.ufma.br/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="pt-br">http://www.ufma.br/</mdui:InformationURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-    MIIEJDCCAwwCAQAwDQYJKoZIhvcNAQEFBQAwgdcxLzAtBgNVBAoUJlVuaXZlcnNp
-ZGFkZSBGZWRlcmFsIGRvIE1hcmFuaMOjby9VRk1BMTIwMAYDVQQLFClOw7pjbGVv
-IGRlIFRlY25vbG9naWEgZGEgSW5mb3JtYcOnw6NvL05USTEcMBoGCSqGSIb3DQEJ
-ARYNcmVkZXNAdWZtYS5icjETMBEGA1UEBxQKU8OjbyBMdcOtczESMBAGA1UECBQJ
-TWFyYW5ow6NvMQswCQYDVQQGEwJCUjEcMBoGA1UEAxMTcG9ydG9mcmFuY28udWZt
-YS5icjAeFw0xNDAzMTgxNTI5MTRaFw0xNzAzMTcxNTI5MTRaMIHXMS8wLQYDVQQK
-FCZVbml2ZXJzaWRhZGUgRmVkZXJhbCBkbyBNYXJhbmjDo28vVUZNQTEyMDAGA1UE
-CxQpTsO6Y2xlbyBkZSBUZWNub2xvZ2lhIGRhIEluZm9ybWHDp8Ojby9OVEkxHDAa
-BgkqhkiG9w0BCQEWDXJlZGVzQHVmbWEuYnIxEzARBgNVBAcUClPDo28gTHXDrXMx
-EjAQBgNVBAgUCU1hcmFuaMOjbzELMAkGA1UEBhMCQlIxHDAaBgNVBAMTE3BvcnRv
-ZnJhbmNvLnVmbWEuYnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDn
-+fvGMOGQgGgI1pferSixirhZIU56t7zGZuExYh7xj6SpoJJOAKi9ytBC0LXYC8Hj
-2ewc5oYSdqTkp1pIo56yZoeOqxyaXE7oW3qrOYoN+5lcqpzsYlDYvANXPoL4A0Pq
-j5neYufrWnhnDjwcx+Dvsf3eqpc7uMAhqOu0bxhxiUKs+o4VXGl9N72YHyGawRC5
-nEpfbX5kT8kwSxEjLqyevqbIlFVkIo1wFyHBOvy2zyHZTg3ZUPi2royE1EE6S7sW
-A16T+HWBCqVRrWvmW4tota0FAZ6rgyowUrmQabqF/CoRJcOA0BpbPsv2U4ZTV6wW
-c7EJ8R89ba0iyA3Se3tRAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBAJNLZTZn91Wx
-CfYam6xq2A9JnzfL60U3/gsu6tf8Oi6Wpgn1+AXA7Fp4vDKlJGXzxS/jmontDzv3
-P/y18eZOdKcfrUg6EygCFN42Sp7oBzqawCWhJuxoDdBxQXOgW09MLwmzigZ1mTLh
-SS7tAfEZcPLNxBnlu2gyyGTU/tc+RK3eM233qiYsgROUsV8PYaK9AUVYug7xTNms
-xtsGHLRz0ZKG891/D/g5DHMCUekGMfNmH+TmQJZx8eK7kRIVGK1oVj3CMRzHgZQw
-2xytvGMY5mdxYdj8MXhqLRuWXSzLwESsl8rxdYZ8jeUXUniYOqoCuB8IhYSVNgc4
-3Z5X6IYvXaw=
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://portofranco.ufma.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://portofranco.ufma.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://portofranco.ufma.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://portofranco.ufma.br/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://portofranco.ufma.br/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://portofranco.ufma.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">ufma.br</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-      
-MIIEJDCCAwwCAQAwDQYJKoZIhvcNAQEFBQAwgdcxLzAtBgNVBAoUJlVuaXZlcnNp
-ZGFkZSBGZWRlcmFsIGRvIE1hcmFuaMOjby9VRk1BMTIwMAYDVQQLFClOw7pjbGVv
-IGRlIFRlY25vbG9naWEgZGEgSW5mb3JtYcOnw6NvL05USTEcMBoGCSqGSIb3DQEJ
-ARYNcmVkZXNAdWZtYS5icjETMBEGA1UEBxQKU8OjbyBMdcOtczESMBAGA1UECBQJ
-TWFyYW5ow6NvMQswCQYDVQQGEwJCUjEcMBoGA1UEAxMTcG9ydG9mcmFuY28udWZt
-YS5icjAeFw0xNDAzMTgxNTI5MTRaFw0xNzAzMTcxNTI5MTRaMIHXMS8wLQYDVQQK
-FCZVbml2ZXJzaWRhZGUgRmVkZXJhbCBkbyBNYXJhbmjDo28vVUZNQTEyMDAGA1UE
-CxQpTsO6Y2xlbyBkZSBUZWNub2xvZ2lhIGRhIEluZm9ybWHDp8Ojby9OVEkxHDAa
-BgkqhkiG9w0BCQEWDXJlZGVzQHVmbWEuYnIxEzARBgNVBAcUClPDo28gTHXDrXMx
-EjAQBgNVBAgUCU1hcmFuaMOjbzELMAkGA1UEBhMCQlIxHDAaBgNVBAMTE3BvcnRv
-ZnJhbmNvLnVmbWEuYnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDn
-+fvGMOGQgGgI1pferSixirhZIU56t7zGZuExYh7xj6SpoJJOAKi9ytBC0LXYC8Hj
-2ewc5oYSdqTkp1pIo56yZoeOqxyaXE7oW3qrOYoN+5lcqpzsYlDYvANXPoL4A0Pq
-j5neYufrWnhnDjwcx+Dvsf3eqpc7uMAhqOu0bxhxiUKs+o4VXGl9N72YHyGawRC5
-nEpfbX5kT8kwSxEjLqyevqbIlFVkIo1wFyHBOvy2zyHZTg3ZUPi2royE1EE6S7sW
-A16T+HWBCqVRrWvmW4tota0FAZ6rgyowUrmQabqF/CoRJcOA0BpbPsv2U4ZTV6wW
-c7EJ8R89ba0iyA3Se3tRAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBAJNLZTZn91Wx
-CfYam6xq2A9JnzfL60U3/gsu6tf8Oi6Wpgn1+AXA7Fp4vDKlJGXzxS/jmontDzv3
-P/y18eZOdKcfrUg6EygCFN42Sp7oBzqawCWhJuxoDdBxQXOgW09MLwmzigZ1mTLh
-SS7tAfEZcPLNxBnlu2gyyGTU/tc+RK3eM233qiYsgROUsV8PYaK9AUVYug7xTNms
-xtsGHLRz0ZKG891/D/g5DHMCUekGMfNmH+TmQJZx8eK7kRIVGK1oVj3CMRzHgZQw
-2xytvGMY5mdxYdj8MXhqLRuWXSzLwESsl8rxdYZ8jeUXUniYOqoCuB8IhYSVNgc4
-3Z5X6IYvXaw=
-                    
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://portofranco.ufma.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://portofranco.ufma.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">UFMA - Universidade Federal do Maranhao</OrganizationName>
-    <OrganizationName xml:lang="pt-br">UFMA - Universidade Federal do Maranhao</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">UFMA - Universidade Federal do Maranhao</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="pt-br">UFMA - Universidade Federal do Maranhao</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.ufma.br/</OrganizationURL>
-    <OrganizationURL xml:lang="pt-br">http://www.ufma.br/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Roscio Brito</SurName>
-    <EmailAddress>roscio.brito@ufma.br</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/portofranco.ufma.br.xml b/swamid-interfederations-2.0/portofranco.ufma.br.xml
deleted file mode 100644
index e3899df6..00000000
--- a/swamid-interfederations-2.0/portofranco.ufma.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://portofranco.ufma.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">ufma.br</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">UFMA - Universidade Federal do Maranhao</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="pt-br">UFMA - Universidade Federal do Maranhao</mdui:DisplayName>
-        <mdui:Description xml:lang="en">UFMA - Universidade Federal do Maranhao</mdui:Description>
-        <mdui:Description xml:lang="pt-br">UFMA - Universidade Federal do Maranhao</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.ufma.br/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="pt-br">http://www.ufma.br/</mdui:InformationURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-    MIIEJDCCAwwCAQAwDQYJKoZIhvcNAQEFBQAwgdcxLzAtBgNVBAoUJlVuaXZlcnNp
-ZGFkZSBGZWRlcmFsIGRvIE1hcmFuaMOjby9VRk1BMTIwMAYDVQQLFClOw7pjbGVv
-IGRlIFRlY25vbG9naWEgZGEgSW5mb3JtYcOnw6NvL05USTEcMBoGCSqGSIb3DQEJ
-ARYNcmVkZXNAdWZtYS5icjETMBEGA1UEBxQKU8OjbyBMdcOtczESMBAGA1UECBQJ
-TWFyYW5ow6NvMQswCQYDVQQGEwJCUjEcMBoGA1UEAxMTcG9ydG9mcmFuY28udWZt
-YS5icjAeFw0xNDAzMTgxNTI5MTRaFw0xNzAzMTcxNTI5MTRaMIHXMS8wLQYDVQQK
-FCZVbml2ZXJzaWRhZGUgRmVkZXJhbCBkbyBNYXJhbmjDo28vVUZNQTEyMDAGA1UE
-CxQpTsO6Y2xlbyBkZSBUZWNub2xvZ2lhIGRhIEluZm9ybWHDp8Ojby9OVEkxHDAa
-BgkqhkiG9w0BCQEWDXJlZGVzQHVmbWEuYnIxEzARBgNVBAcUClPDo28gTHXDrXMx
-EjAQBgNVBAgUCU1hcmFuaMOjbzELMAkGA1UEBhMCQlIxHDAaBgNVBAMTE3BvcnRv
-ZnJhbmNvLnVmbWEuYnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDn
-+fvGMOGQgGgI1pferSixirhZIU56t7zGZuExYh7xj6SpoJJOAKi9ytBC0LXYC8Hj
-2ewc5oYSdqTkp1pIo56yZoeOqxyaXE7oW3qrOYoN+5lcqpzsYlDYvANXPoL4A0Pq
-j5neYufrWnhnDjwcx+Dvsf3eqpc7uMAhqOu0bxhxiUKs+o4VXGl9N72YHyGawRC5
-nEpfbX5kT8kwSxEjLqyevqbIlFVkIo1wFyHBOvy2zyHZTg3ZUPi2royE1EE6S7sW
-A16T+HWBCqVRrWvmW4tota0FAZ6rgyowUrmQabqF/CoRJcOA0BpbPsv2U4ZTV6wW
-c7EJ8R89ba0iyA3Se3tRAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBAJNLZTZn91Wx
-CfYam6xq2A9JnzfL60U3/gsu6tf8Oi6Wpgn1+AXA7Fp4vDKlJGXzxS/jmontDzv3
-P/y18eZOdKcfrUg6EygCFN42Sp7oBzqawCWhJuxoDdBxQXOgW09MLwmzigZ1mTLh
-SS7tAfEZcPLNxBnlu2gyyGTU/tc+RK3eM233qiYsgROUsV8PYaK9AUVYug7xTNms
-xtsGHLRz0ZKG891/D/g5DHMCUekGMfNmH+TmQJZx8eK7kRIVGK1oVj3CMRzHgZQw
-2xytvGMY5mdxYdj8MXhqLRuWXSzLwESsl8rxdYZ8jeUXUniYOqoCuB8IhYSVNgc4
-3Z5X6IYvXaw=
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://portofranco.ufma.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://portofranco.ufma.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://portofranco.ufma.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://portofranco.ufma.br/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://portofranco.ufma.br/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://portofranco.ufma.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">ufma.br</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-      
-MIIEJDCCAwwCAQAwDQYJKoZIhvcNAQEFBQAwgdcxLzAtBgNVBAoUJlVuaXZlcnNp
-ZGFkZSBGZWRlcmFsIGRvIE1hcmFuaMOjby9VRk1BMTIwMAYDVQQLFClOw7pjbGVv
-IGRlIFRlY25vbG9naWEgZGEgSW5mb3JtYcOnw6NvL05USTEcMBoGCSqGSIb3DQEJ
-ARYNcmVkZXNAdWZtYS5icjETMBEGA1UEBxQKU8OjbyBMdcOtczESMBAGA1UECBQJ
-TWFyYW5ow6NvMQswCQYDVQQGEwJCUjEcMBoGA1UEAxMTcG9ydG9mcmFuY28udWZt
-YS5icjAeFw0xNDAzMTgxNTI5MTRaFw0xNzAzMTcxNTI5MTRaMIHXMS8wLQYDVQQK
-FCZVbml2ZXJzaWRhZGUgRmVkZXJhbCBkbyBNYXJhbmjDo28vVUZNQTEyMDAGA1UE
-CxQpTsO6Y2xlbyBkZSBUZWNub2xvZ2lhIGRhIEluZm9ybWHDp8Ojby9OVEkxHDAa
-BgkqhkiG9w0BCQEWDXJlZGVzQHVmbWEuYnIxEzARBgNVBAcUClPDo28gTHXDrXMx
-EjAQBgNVBAgUCU1hcmFuaMOjbzELMAkGA1UEBhMCQlIxHDAaBgNVBAMTE3BvcnRv
-ZnJhbmNvLnVmbWEuYnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDn
-+fvGMOGQgGgI1pferSixirhZIU56t7zGZuExYh7xj6SpoJJOAKi9ytBC0LXYC8Hj
-2ewc5oYSdqTkp1pIo56yZoeOqxyaXE7oW3qrOYoN+5lcqpzsYlDYvANXPoL4A0Pq
-j5neYufrWnhnDjwcx+Dvsf3eqpc7uMAhqOu0bxhxiUKs+o4VXGl9N72YHyGawRC5
-nEpfbX5kT8kwSxEjLqyevqbIlFVkIo1wFyHBOvy2zyHZTg3ZUPi2royE1EE6S7sW
-A16T+HWBCqVRrWvmW4tota0FAZ6rgyowUrmQabqF/CoRJcOA0BpbPsv2U4ZTV6wW
-c7EJ8R89ba0iyA3Se3tRAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBAJNLZTZn91Wx
-CfYam6xq2A9JnzfL60U3/gsu6tf8Oi6Wpgn1+AXA7Fp4vDKlJGXzxS/jmontDzv3
-P/y18eZOdKcfrUg6EygCFN42Sp7oBzqawCWhJuxoDdBxQXOgW09MLwmzigZ1mTLh
-SS7tAfEZcPLNxBnlu2gyyGTU/tc+RK3eM233qiYsgROUsV8PYaK9AUVYug7xTNms
-xtsGHLRz0ZKG891/D/g5DHMCUekGMfNmH+TmQJZx8eK7kRIVGK1oVj3CMRzHgZQw
-2xytvGMY5mdxYdj8MXhqLRuWXSzLwESsl8rxdYZ8jeUXUniYOqoCuB8IhYSVNgc4
-3Z5X6IYvXaw=
-                    
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://portofranco.ufma.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://portofranco.ufma.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">UFMA - Universidade Federal do Maranhao</OrganizationName>
-    <OrganizationName xml:lang="pt-br">UFMA - Universidade Federal do Maranhao</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">UFMA - Universidade Federal do Maranhao</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="pt-br">UFMA - Universidade Federal do Maranhao</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.ufma.br/</OrganizationURL>
-    <OrganizationURL xml:lang="pt-br">http://www.ufma.br/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Roscio Brito</SurName>
-    <EmailAddress>roscio.brito@ufma.br</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/qub.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/qub.ac.uk-shibboleth.xml
deleted file mode 100644
index 162bb663..00000000
--- a/swamid-interfederations-2.0/qub.ac.uk-shibboleth.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://qub.ac.uk/shibboleth">
-  <!--
-		This is a Shibboleth IdP for The Queen's University of Belfast.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-06-08T10:26:41Z">
-      <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">qub.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDKDCCAhCgAwIBAgIVAJycK9QeBfR7eEXzFTRCeXgxyljUMA0GCSqGSIb3DQEB
-						BQUAMBoxGDAWBgNVBAMTD3NoaWIzLnF1Yi5hYy51azAeFw0xMjAzMjcxMzE4NTha
-						Fw0zMjAzMjcxNDE4NThaMBoxGDAWBgNVBAMTD3NoaWIzLnF1Yi5hYy51azCCASIw
-						DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAIreX13KY2pe43eXfxccSvl/4f3N
-						QD5HtQfUY7tjkMyT+og8bDiavnHm5puyoO8hsIOOV0Hqv4nrF8cKhu895IcnstWY
-						sd9vLjSRhSKXa8w3VcRhpWDMLaxd21jgi/32tofMCWodFx38cGyuINI2Wuv2ME05
-						r03JMVnwWmjFCzGWsdUTHSffi0GlW6bo1X/3jzx+5VMkKRobbLzCvMSzTmyCFEn8
-						rZQhhFtShz3JZAajnOsRLiiJmYi2ep70Ub3aE8ZB3HOizWYsgPulmMTUm3nacr50
-						x9P+tWxKdtd4qU/m4v9wYsRJhJpA6yljZmtrQMsoKMdpgKkHhd1WGdwQt1MCAwEA
-						AaNlMGMwQgYDVR0RBDswOYIPc2hpYjMucXViLmFjLnVrhiZodHRwczovL3NoaWIz
-						LnF1Yi5hYy51ay9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUXmiIagkYVllQI5LM
-						BnzS+VAh5EAwDQYJKoZIhvcNAQEFBQADggEBADuA54YASAFyW/RVKg44Aktj/bGe
-						aYcuOfGcv48TNIOeS/NHRqlQeyjiyvPGlc8ul3mMYv8Q9MoB7DxpCJa7BbbXSVQC
-						n5jkx70rmbc7WOrSH5uNjQP34rbRMK56yOGdlUEAKf4V3raGWHOs5V+Q4n9gE4FG
-						bHqn90pt5kR9L7VZW8D1dPpMA3YDbDj2anX0zM8VQxiqipUWeoISWX0P6cEhQzsz
-						j5jG9uXwrdLwsmzHImL6Xc4K41lVaxXoZydYzmu6nougbKa+XdIRiRLqJDeId6ZA
-						iEW6gm81phqOuQXOIMVz4Qbd0M3RhcskYsYaZW08gG/vBOLNZEyqmtph6/0=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib3.qub.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib3.qub.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://shib3.qub.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib3.qub.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib3.qub.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib3.qub.ac.uk/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="false">qub.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDKDCCAhCgAwIBAgIVAJycK9QeBfR7eEXzFTRCeXgxyljUMA0GCSqGSIb3DQEB
-						BQUAMBoxGDAWBgNVBAMTD3NoaWIzLnF1Yi5hYy51azAeFw0xMjAzMjcxMzE4NTha
-						Fw0zMjAzMjcxNDE4NThaMBoxGDAWBgNVBAMTD3NoaWIzLnF1Yi5hYy51azCCASIw
-						DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAIreX13KY2pe43eXfxccSvl/4f3N
-						QD5HtQfUY7tjkMyT+og8bDiavnHm5puyoO8hsIOOV0Hqv4nrF8cKhu895IcnstWY
-						sd9vLjSRhSKXa8w3VcRhpWDMLaxd21jgi/32tofMCWodFx38cGyuINI2Wuv2ME05
-						r03JMVnwWmjFCzGWsdUTHSffi0GlW6bo1X/3jzx+5VMkKRobbLzCvMSzTmyCFEn8
-						rZQhhFtShz3JZAajnOsRLiiJmYi2ep70Ub3aE8ZB3HOizWYsgPulmMTUm3nacr50
-						x9P+tWxKdtd4qU/m4v9wYsRJhJpA6yljZmtrQMsoKMdpgKkHhd1WGdwQt1MCAwEA
-						AaNlMGMwQgYDVR0RBDswOYIPc2hpYjMucXViLmFjLnVrhiZodHRwczovL3NoaWIz
-						LnF1Yi5hYy51ay9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUXmiIagkYVllQI5LM
-						BnzS+VAh5EAwDQYJKoZIhvcNAQEFBQADggEBADuA54YASAFyW/RVKg44Aktj/bGe
-						aYcuOfGcv48TNIOeS/NHRqlQeyjiyvPGlc8ul3mMYv8Q9MoB7DxpCJa7BbbXSVQC
-						n5jkx70rmbc7WOrSH5uNjQP34rbRMK56yOGdlUEAKf4V3raGWHOs5V+Q4n9gE4FG
-						bHqn90pt5kR9L7VZW8D1dPpMA3YDbDj2anX0zM8VQxiqipUWeoISWX0P6cEhQzsz
-						j5jG9uXwrdLwsmzHImL6Xc4K41lVaxXoZydYzmu6nougbKa+XdIRiRLqJDeId6ZA
-						iEW6gm81phqOuQXOIMVz4Qbd0M3RhcskYsYaZW08gG/vBOLNZEyqmtph6/0=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib3.qub.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib3.qub.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">The Queen's University of Belfast</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Queen's University Belfast</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.qub.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Karen</GivenName>
-    <SurName>Murphy</SurName>
-    <EmailAddress>mailto:eresources@qub.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Karen</GivenName>
-    <SurName>Murphy</SurName>
-    <EmailAddress>mailto:k.l.murphy@qub.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/qub.ac.uk.xml b/swamid-interfederations-2.0/qub.ac.uk.xml
deleted file mode 100644
index 162bb663..00000000
--- a/swamid-interfederations-2.0/qub.ac.uk.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://qub.ac.uk/shibboleth">
-  <!--
-		This is a Shibboleth IdP for The Queen's University of Belfast.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-06-08T10:26:41Z">
-      <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">qub.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDKDCCAhCgAwIBAgIVAJycK9QeBfR7eEXzFTRCeXgxyljUMA0GCSqGSIb3DQEB
-						BQUAMBoxGDAWBgNVBAMTD3NoaWIzLnF1Yi5hYy51azAeFw0xMjAzMjcxMzE4NTha
-						Fw0zMjAzMjcxNDE4NThaMBoxGDAWBgNVBAMTD3NoaWIzLnF1Yi5hYy51azCCASIw
-						DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAIreX13KY2pe43eXfxccSvl/4f3N
-						QD5HtQfUY7tjkMyT+og8bDiavnHm5puyoO8hsIOOV0Hqv4nrF8cKhu895IcnstWY
-						sd9vLjSRhSKXa8w3VcRhpWDMLaxd21jgi/32tofMCWodFx38cGyuINI2Wuv2ME05
-						r03JMVnwWmjFCzGWsdUTHSffi0GlW6bo1X/3jzx+5VMkKRobbLzCvMSzTmyCFEn8
-						rZQhhFtShz3JZAajnOsRLiiJmYi2ep70Ub3aE8ZB3HOizWYsgPulmMTUm3nacr50
-						x9P+tWxKdtd4qU/m4v9wYsRJhJpA6yljZmtrQMsoKMdpgKkHhd1WGdwQt1MCAwEA
-						AaNlMGMwQgYDVR0RBDswOYIPc2hpYjMucXViLmFjLnVrhiZodHRwczovL3NoaWIz
-						LnF1Yi5hYy51ay9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUXmiIagkYVllQI5LM
-						BnzS+VAh5EAwDQYJKoZIhvcNAQEFBQADggEBADuA54YASAFyW/RVKg44Aktj/bGe
-						aYcuOfGcv48TNIOeS/NHRqlQeyjiyvPGlc8ul3mMYv8Q9MoB7DxpCJa7BbbXSVQC
-						n5jkx70rmbc7WOrSH5uNjQP34rbRMK56yOGdlUEAKf4V3raGWHOs5V+Q4n9gE4FG
-						bHqn90pt5kR9L7VZW8D1dPpMA3YDbDj2anX0zM8VQxiqipUWeoISWX0P6cEhQzsz
-						j5jG9uXwrdLwsmzHImL6Xc4K41lVaxXoZydYzmu6nougbKa+XdIRiRLqJDeId6ZA
-						iEW6gm81phqOuQXOIMVz4Qbd0M3RhcskYsYaZW08gG/vBOLNZEyqmtph6/0=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib3.qub.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib3.qub.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://shib3.qub.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib3.qub.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib3.qub.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib3.qub.ac.uk/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="false">qub.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDKDCCAhCgAwIBAgIVAJycK9QeBfR7eEXzFTRCeXgxyljUMA0GCSqGSIb3DQEB
-						BQUAMBoxGDAWBgNVBAMTD3NoaWIzLnF1Yi5hYy51azAeFw0xMjAzMjcxMzE4NTha
-						Fw0zMjAzMjcxNDE4NThaMBoxGDAWBgNVBAMTD3NoaWIzLnF1Yi5hYy51azCCASIw
-						DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAIreX13KY2pe43eXfxccSvl/4f3N
-						QD5HtQfUY7tjkMyT+og8bDiavnHm5puyoO8hsIOOV0Hqv4nrF8cKhu895IcnstWY
-						sd9vLjSRhSKXa8w3VcRhpWDMLaxd21jgi/32tofMCWodFx38cGyuINI2Wuv2ME05
-						r03JMVnwWmjFCzGWsdUTHSffi0GlW6bo1X/3jzx+5VMkKRobbLzCvMSzTmyCFEn8
-						rZQhhFtShz3JZAajnOsRLiiJmYi2ep70Ub3aE8ZB3HOizWYsgPulmMTUm3nacr50
-						x9P+tWxKdtd4qU/m4v9wYsRJhJpA6yljZmtrQMsoKMdpgKkHhd1WGdwQt1MCAwEA
-						AaNlMGMwQgYDVR0RBDswOYIPc2hpYjMucXViLmFjLnVrhiZodHRwczovL3NoaWIz
-						LnF1Yi5hYy51ay9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUXmiIagkYVllQI5LM
-						BnzS+VAh5EAwDQYJKoZIhvcNAQEFBQADggEBADuA54YASAFyW/RVKg44Aktj/bGe
-						aYcuOfGcv48TNIOeS/NHRqlQeyjiyvPGlc8ul3mMYv8Q9MoB7DxpCJa7BbbXSVQC
-						n5jkx70rmbc7WOrSH5uNjQP34rbRMK56yOGdlUEAKf4V3raGWHOs5V+Q4n9gE4FG
-						bHqn90pt5kR9L7VZW8D1dPpMA3YDbDj2anX0zM8VQxiqipUWeoISWX0P6cEhQzsz
-						j5jG9uXwrdLwsmzHImL6Xc4K41lVaxXoZydYzmu6nougbKa+XdIRiRLqJDeId6ZA
-						iEW6gm81phqOuQXOIMVz4Qbd0M3RhcskYsYaZW08gG/vBOLNZEyqmtph6/0=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib3.qub.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib3.qub.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">The Queen's University of Belfast</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Queen's University Belfast</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.qub.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Karen</GivenName>
-    <SurName>Murphy</SurName>
-    <EmailAddress>mailto:eresources@qub.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Karen</GivenName>
-    <SurName>Murphy</SurName>
-    <EmailAddress>mailto:k.l.murphy@qub.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/quod.lib.umich.edu-shibboleth-sp-acls.xml b/swamid-interfederations-2.0/quod.lib.umich.edu-shibboleth-sp-acls.xml
deleted file mode 100644
index 51ed22fd..00000000
--- a/swamid-interfederations-2.0/quod.lib.umich.edu-shibboleth-sp-acls.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://quod.lib.umich.edu/shibboleth-sp/acls">
-  <!--
-		This is a Shibboleth 2 'ACLS Humanities E-Book' SP owned by the University of Michigan.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2009-11-18T16:12:43Z">
-      <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">ACLS Humanities E-Book</mdui:DisplayName>
-        <mdui:Description xml:lang="en">ACLS Humanities E-Book is a digital collection of over 3,300 full-text, cross-searchable books in the humanities.</mdui:Description>
-        <mdui:Logo height="74" width="872">https://quod.lib.umich.edu/a/acls/graphics/aclsheader_new.gif</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIEijCCA3KgAwIBAgIJAIT48jHMZ0+hMA0GCSqGSIb3DQEBBQUAMIHFMQswCQYD
-						VQQGEwJVUzERMA8GA1UECBMITWljaGlnYW4xEjAQBgNVBAcTCUFubiBBcmJvcjEf
-						MB0GA1UEChMWVW5pdmVyc2l0eSBvZiBNaWNoaWdhbjEnMCUGA1UECxMeTGlicmFy
-						eSBJbmZvcm1hdGlvbiBUZWNobm9sb2d5MRswGQYDVQQDExJxdW9kLmxpYi51bWlj
-						aC5lZHUxKDAmBgkqhkiG9w0BCQEWGWxpdC1jcy1zeXNhZG1pbkB1bWljaC5lZHUw
-						HhcNMDkwODA3MTUyODU0WhcNMTkwODA1MTUyODU0WjCBxTELMAkGA1UEBhMCVVMx
-						ETAPBgNVBAgTCE1pY2hpZ2FuMRIwEAYDVQQHEwlBbm4gQXJib3IxHzAdBgNVBAoT
-						FlVuaXZlcnNpdHkgb2YgTWljaGlnYW4xJzAlBgNVBAsTHkxpYnJhcnkgSW5mb3Jt
-						YXRpb24gVGVjaG5vbG9neTEbMBkGA1UEAxMScXVvZC5saWIudW1pY2guZWR1MSgw
-						JgYJKoZIhvcNAQkBFhlsaXQtY3Mtc3lzYWRtaW5AdW1pY2guZWR1MIIBIjANBgkq
-						hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtw76D6i/mIoKdM0RKwvl4j5DN7POIScx
-						hTDtXslnmEzd7Lzfl8q8NVgoFDJ7U6ciRA3ajKe26wlJO/E0F4iZPQiJvcl1T6lT
-						wKOp4lK4xGFBScYsaLJnI1WzjiTHJt8QpMqpuHpfFSzqozhS9rYADBKwVPANi9qr
-						FplIQr/d/h3R48H/9fHcEDV8GFucH5kLw5EkLOmIAu++skkRAG6Wvajj498drE0e
-						CHDGa7O2l3S7HYlLiQH+KnRk9Fv/kwWsqVAk7E/48oa3UuOdJM01/PNVSAEKBg2w
-						i2S0YP5sZqBuCP43RzHarEFHNawmu8kcb51aXFagOq6xlbaisTMjUQIDAQABo3sw
-						eTAJBgNVHRMEAjAAMCwGCWCGSAGG+EIBDQQfFh1PcGVuU1NMIEdlbmVyYXRlZCBD
-						ZXJ0aWZpY2F0ZTAdBgNVHQ4EFgQUjqnAa9SKCm5M1p4CTERZW+ouqEkwHwYDVR0j
-						BBgwFoAUjqnAa9SKCm5M1p4CTERZW+ouqEkwDQYJKoZIhvcNAQEFBQADggEBAKjc
-						MNz0L7eP9Ck1v07Q239cbH31S/KxWaiQP/gbHw7knNZhhNywCs5F/V+/zI/xaPUu
-						gtWOiQborOuysBa7lGdrQkKqP5r8j5Tq8HtM5XhIf0r8BIZg1wX8k92CBI8JR7IY
-						k4qcrrSDrImNB2EEnTTMAWWc8VTKW8+D5z1ygDXQsB2Gxf/ywk4xQ9r+AChBCwt9
-						319gyt4k8RIkhvErotahf2MFzZrzM7GrEdNZhjfyprI8GilTC3MC7tep5wHyvRQ5
-						6+M7kXd3PupQ48lKtXY2BvZqmHJ2XVAcLanoJobr4fBEGBT29i2sE/Uqs9N1DTz5
-						PLcvWTRfLv+JNqoT2yM=
-					</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>
-						MIIEijCCA3KgAwIBAgIJAIT48jHMZ0+hMA0GCSqGSIb3DQEBBQUAMIHFMQswCQYD
-						VQQGEwJVUzERMA8GA1UECBMITWljaGlnYW4xEjAQBgNVBAcTCUFubiBBcmJvcjEf
-						MB0GA1UEChMWVW5pdmVyc2l0eSBvZiBNaWNoaWdhbjEnMCUGA1UECxMeTGlicmFy
-						eSBJbmZvcm1hdGlvbiBUZWNobm9sb2d5MRswGQYDVQQDExJxdW9kLmxpYi51bWlj
-						aC5lZHUxKDAmBgkqhkiG9w0BCQEWGWxpdC1jcy1zeXNhZG1pbkB1bWljaC5lZHUw
-						HhcNMDkwODA3MTUyODU0WhcNMTkwODA1MTUyODU0WjCBxTELMAkGA1UEBhMCVVMx
-						ETAPBgNVBAgTCE1pY2hpZ2FuMRIwEAYDVQQHEwlBbm4gQXJib3IxHzAdBgNVBAoT
-						FlVuaXZlcnNpdHkgb2YgTWljaGlnYW4xJzAlBgNVBAsTHkxpYnJhcnkgSW5mb3Jt
-						YXRpb24gVGVjaG5vbG9neTEbMBkGA1UEAxMScXVvZC5saWIudW1pY2guZWR1MSgw
-						JgYJKoZIhvcNAQkBFhlsaXQtY3Mtc3lzYWRtaW5AdW1pY2guZWR1MIIBIjANBgkq
-						hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtw76D6i/mIoKdM0RKwvl4j5DN7POIScx
-						hTDtXslnmEzd7Lzfl8q8NVgoFDJ7U6ciRA3ajKe26wlJO/E0F4iZPQiJvcl1T6lT
-						wKOp4lK4xGFBScYsaLJnI1WzjiTHJt8QpMqpuHpfFSzqozhS9rYADBKwVPANi9qr
-						FplIQr/d/h3R48H/9fHcEDV8GFucH5kLw5EkLOmIAu++skkRAG6Wvajj498drE0e
-						CHDGa7O2l3S7HYlLiQH+KnRk9Fv/kwWsqVAk7E/48oa3UuOdJM01/PNVSAEKBg2w
-						i2S0YP5sZqBuCP43RzHarEFHNawmu8kcb51aXFagOq6xlbaisTMjUQIDAQABo3sw
-						eTAJBgNVHRMEAjAAMCwGCWCGSAGG+EIBDQQfFh1PcGVuU1NMIEdlbmVyYXRlZCBD
-						ZXJ0aWZpY2F0ZTAdBgNVHQ4EFgQUjqnAa9SKCm5M1p4CTERZW+ouqEkwHwYDVR0j
-						BBgwFoAUjqnAa9SKCm5M1p4CTERZW+ouqEkwDQYJKoZIhvcNAQEFBQADggEBAKjc
-						MNz0L7eP9Ck1v07Q239cbH31S/KxWaiQP/gbHw7knNZhhNywCs5F/V+/zI/xaPUu
-						gtWOiQborOuysBa7lGdrQkKqP5r8j5Tq8HtM5XhIf0r8BIZg1wX8k92CBI8JR7IY
-						k4qcrrSDrImNB2EEnTTMAWWc8VTKW8+D5z1ygDXQsB2Gxf/ywk4xQ9r+AChBCwt9
-						319gyt4k8RIkhvErotahf2MFzZrzM7GrEdNZhjfyprI8GilTC3MC7tep5wHyvRQ5
-						6+M7kXd3PupQ48lKtXY2BvZqmHJ2XVAcLanoJobr4fBEGBT29i2sE/Uqs9N1DTz5
-						PLcvWTRfLv+JNqoT2yM=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://quod.lib.umich.edu/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://quod.lib.umich.edu/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://quod.lib.umich.edu/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://quod.lib.umich.edu/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <AttributeConsumingService index="1">
-      <ServiceName xml:lang="en">University of Michigan: ACLS Humanities E-Book</ServiceName>
-      <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"/>
-    </AttributeConsumingService>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Michigan</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Michigan: ACLS Humanities E-Book</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://humanitiesebook.org/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>University of Michigan Library IT</GivenName>
-    <EmailAddress>mailto:lit-cs-sysadmin@umich.edu</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>University of Michigan Library IT</GivenName>
-    <EmailAddress>mailto:lit-cs-sysadmin@umich.edu</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/quod.lib.umich.edu.xml b/swamid-interfederations-2.0/quod.lib.umich.edu.xml
deleted file mode 100644
index 51ed22fd..00000000
--- a/swamid-interfederations-2.0/quod.lib.umich.edu.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://quod.lib.umich.edu/shibboleth-sp/acls">
-  <!--
-		This is a Shibboleth 2 'ACLS Humanities E-Book' SP owned by the University of Michigan.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2009-11-18T16:12:43Z">
-      <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">ACLS Humanities E-Book</mdui:DisplayName>
-        <mdui:Description xml:lang="en">ACLS Humanities E-Book is a digital collection of over 3,300 full-text, cross-searchable books in the humanities.</mdui:Description>
-        <mdui:Logo height="74" width="872">https://quod.lib.umich.edu/a/acls/graphics/aclsheader_new.gif</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIEijCCA3KgAwIBAgIJAIT48jHMZ0+hMA0GCSqGSIb3DQEBBQUAMIHFMQswCQYD
-						VQQGEwJVUzERMA8GA1UECBMITWljaGlnYW4xEjAQBgNVBAcTCUFubiBBcmJvcjEf
-						MB0GA1UEChMWVW5pdmVyc2l0eSBvZiBNaWNoaWdhbjEnMCUGA1UECxMeTGlicmFy
-						eSBJbmZvcm1hdGlvbiBUZWNobm9sb2d5MRswGQYDVQQDExJxdW9kLmxpYi51bWlj
-						aC5lZHUxKDAmBgkqhkiG9w0BCQEWGWxpdC1jcy1zeXNhZG1pbkB1bWljaC5lZHUw
-						HhcNMDkwODA3MTUyODU0WhcNMTkwODA1MTUyODU0WjCBxTELMAkGA1UEBhMCVVMx
-						ETAPBgNVBAgTCE1pY2hpZ2FuMRIwEAYDVQQHEwlBbm4gQXJib3IxHzAdBgNVBAoT
-						FlVuaXZlcnNpdHkgb2YgTWljaGlnYW4xJzAlBgNVBAsTHkxpYnJhcnkgSW5mb3Jt
-						YXRpb24gVGVjaG5vbG9neTEbMBkGA1UEAxMScXVvZC5saWIudW1pY2guZWR1MSgw
-						JgYJKoZIhvcNAQkBFhlsaXQtY3Mtc3lzYWRtaW5AdW1pY2guZWR1MIIBIjANBgkq
-						hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtw76D6i/mIoKdM0RKwvl4j5DN7POIScx
-						hTDtXslnmEzd7Lzfl8q8NVgoFDJ7U6ciRA3ajKe26wlJO/E0F4iZPQiJvcl1T6lT
-						wKOp4lK4xGFBScYsaLJnI1WzjiTHJt8QpMqpuHpfFSzqozhS9rYADBKwVPANi9qr
-						FplIQr/d/h3R48H/9fHcEDV8GFucH5kLw5EkLOmIAu++skkRAG6Wvajj498drE0e
-						CHDGa7O2l3S7HYlLiQH+KnRk9Fv/kwWsqVAk7E/48oa3UuOdJM01/PNVSAEKBg2w
-						i2S0YP5sZqBuCP43RzHarEFHNawmu8kcb51aXFagOq6xlbaisTMjUQIDAQABo3sw
-						eTAJBgNVHRMEAjAAMCwGCWCGSAGG+EIBDQQfFh1PcGVuU1NMIEdlbmVyYXRlZCBD
-						ZXJ0aWZpY2F0ZTAdBgNVHQ4EFgQUjqnAa9SKCm5M1p4CTERZW+ouqEkwHwYDVR0j
-						BBgwFoAUjqnAa9SKCm5M1p4CTERZW+ouqEkwDQYJKoZIhvcNAQEFBQADggEBAKjc
-						MNz0L7eP9Ck1v07Q239cbH31S/KxWaiQP/gbHw7knNZhhNywCs5F/V+/zI/xaPUu
-						gtWOiQborOuysBa7lGdrQkKqP5r8j5Tq8HtM5XhIf0r8BIZg1wX8k92CBI8JR7IY
-						k4qcrrSDrImNB2EEnTTMAWWc8VTKW8+D5z1ygDXQsB2Gxf/ywk4xQ9r+AChBCwt9
-						319gyt4k8RIkhvErotahf2MFzZrzM7GrEdNZhjfyprI8GilTC3MC7tep5wHyvRQ5
-						6+M7kXd3PupQ48lKtXY2BvZqmHJ2XVAcLanoJobr4fBEGBT29i2sE/Uqs9N1DTz5
-						PLcvWTRfLv+JNqoT2yM=
-					</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>
-						MIIEijCCA3KgAwIBAgIJAIT48jHMZ0+hMA0GCSqGSIb3DQEBBQUAMIHFMQswCQYD
-						VQQGEwJVUzERMA8GA1UECBMITWljaGlnYW4xEjAQBgNVBAcTCUFubiBBcmJvcjEf
-						MB0GA1UEChMWVW5pdmVyc2l0eSBvZiBNaWNoaWdhbjEnMCUGA1UECxMeTGlicmFy
-						eSBJbmZvcm1hdGlvbiBUZWNobm9sb2d5MRswGQYDVQQDExJxdW9kLmxpYi51bWlj
-						aC5lZHUxKDAmBgkqhkiG9w0BCQEWGWxpdC1jcy1zeXNhZG1pbkB1bWljaC5lZHUw
-						HhcNMDkwODA3MTUyODU0WhcNMTkwODA1MTUyODU0WjCBxTELMAkGA1UEBhMCVVMx
-						ETAPBgNVBAgTCE1pY2hpZ2FuMRIwEAYDVQQHEwlBbm4gQXJib3IxHzAdBgNVBAoT
-						FlVuaXZlcnNpdHkgb2YgTWljaGlnYW4xJzAlBgNVBAsTHkxpYnJhcnkgSW5mb3Jt
-						YXRpb24gVGVjaG5vbG9neTEbMBkGA1UEAxMScXVvZC5saWIudW1pY2guZWR1MSgw
-						JgYJKoZIhvcNAQkBFhlsaXQtY3Mtc3lzYWRtaW5AdW1pY2guZWR1MIIBIjANBgkq
-						hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtw76D6i/mIoKdM0RKwvl4j5DN7POIScx
-						hTDtXslnmEzd7Lzfl8q8NVgoFDJ7U6ciRA3ajKe26wlJO/E0F4iZPQiJvcl1T6lT
-						wKOp4lK4xGFBScYsaLJnI1WzjiTHJt8QpMqpuHpfFSzqozhS9rYADBKwVPANi9qr
-						FplIQr/d/h3R48H/9fHcEDV8GFucH5kLw5EkLOmIAu++skkRAG6Wvajj498drE0e
-						CHDGa7O2l3S7HYlLiQH+KnRk9Fv/kwWsqVAk7E/48oa3UuOdJM01/PNVSAEKBg2w
-						i2S0YP5sZqBuCP43RzHarEFHNawmu8kcb51aXFagOq6xlbaisTMjUQIDAQABo3sw
-						eTAJBgNVHRMEAjAAMCwGCWCGSAGG+EIBDQQfFh1PcGVuU1NMIEdlbmVyYXRlZCBD
-						ZXJ0aWZpY2F0ZTAdBgNVHQ4EFgQUjqnAa9SKCm5M1p4CTERZW+ouqEkwHwYDVR0j
-						BBgwFoAUjqnAa9SKCm5M1p4CTERZW+ouqEkwDQYJKoZIhvcNAQEFBQADggEBAKjc
-						MNz0L7eP9Ck1v07Q239cbH31S/KxWaiQP/gbHw7knNZhhNywCs5F/V+/zI/xaPUu
-						gtWOiQborOuysBa7lGdrQkKqP5r8j5Tq8HtM5XhIf0r8BIZg1wX8k92CBI8JR7IY
-						k4qcrrSDrImNB2EEnTTMAWWc8VTKW8+D5z1ygDXQsB2Gxf/ywk4xQ9r+AChBCwt9
-						319gyt4k8RIkhvErotahf2MFzZrzM7GrEdNZhjfyprI8GilTC3MC7tep5wHyvRQ5
-						6+M7kXd3PupQ48lKtXY2BvZqmHJ2XVAcLanoJobr4fBEGBT29i2sE/Uqs9N1DTz5
-						PLcvWTRfLv+JNqoT2yM=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://quod.lib.umich.edu/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://quod.lib.umich.edu/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://quod.lib.umich.edu/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://quod.lib.umich.edu/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <AttributeConsumingService index="1">
-      <ServiceName xml:lang="en">University of Michigan: ACLS Humanities E-Book</ServiceName>
-      <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"/>
-    </AttributeConsumingService>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Michigan</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Michigan: ACLS Humanities E-Book</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://humanitiesebook.org/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>University of Michigan Library IT</GivenName>
-    <EmailAddress>mailto:lit-cs-sysadmin@umich.edu</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>University of Michigan Library IT</GivenName>
-    <EmailAddress>mailto:lit-cs-sysadmin@umich.edu</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/ra-idp.lanet.lv.xml b/swamid-interfederations-2.0/ra-idp.lanet.lv.xml
deleted file mode 100644
index 679a13c3..00000000
--- a/swamid-interfederations-2.0/ra-idp.lanet.lv.xml
+++ /dev/null
@@ -1,41 +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://ra-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/" registrationInstant="2013-10-10T10:10:10Z">
-      <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>
-MIIDhjCCAm4CCQC8Px9pbIuxGDANBgkqhkiG9w0BAQUFADCBhDELMAkGA1UEBhMCTFYxDTALBgNVBAgMBFJpZ2ExDTALBgNVBAcMBFJpZ2ExCzAJBgNVBAoMAkxVMQwwCgYDVQQLDANJVEQxFTATBgNVBAMMDGx1LWlkcC5sdS5sdjElMCMGCSqGSIb3DQEJARYWaXRzZXJ2aXNzIGF0IGx1IGRvdCBsdjAeFw0xMzEyMjAxMDU3MDJaFw0yOTAzMDYxMDU3MDJaMIGEMQswCQYDVQQGEwJMVjENMAsGA1UECAwEUmlnYTENMAsGA1UEBwwEUmlnYTELMAkGA1UECgwCTFUxDDAKBgNVBAsMA0lURDEVMBMGA1UEAwwMbHUtaWRwLmx1Lmx2MSUwIwYJKoZIhvcNAQkBFhZpdHNlcnZpc3MgYXQgbHUgZG90IGx2MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuAy8ri5VknGxy21iuW6kalPwg7VPZBWOuV/jVjRre44tHFd5FinCQUCuzQZn37AU3ZNZg07RRyDhkAzzpsBRQf48VcbnQFRjERuQTKUfT9hzFMxgbjxW2Dayg2Ru2LkGcIUeHilOwfmRn1NIRBN+0UyJIluRvB8YGdHSSHYSMimyw9uYEuMkU9aqewwW78w7TeasCWlB6jiGfJ/SGVtPRThJ6X6KVqoU2gwIY+V7YJkG4b5TOw4HLaIsdOmU4h1Ep3igy+Zsc/7zPn+80iwm1Jk9Q8zGlEwikjPn1N3enMOxR8wpQfAQwm5lIaHNXYFcXCj3mVQ3yQ9EzB/hRC8tHwIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQCFRpI7U/lTwoUW/HwDb2gAmjb0RSmS+5lUWDgmjP/rJwYdh672plabNcY12DiqchtBaSeTOf4qANCqEme+YBAmssFUeLx6O1J+5aXeXfCwAA9GlswGDVeC8ZnTVmQupnbvL0T+ZU8WtkltlLEJdD6o9BtEOqk3+Rspu+94d6FUwmvWB/YWypAOfzXkkSxi+87nsadiFEOyCzTW8fZotOrZMzba52ELLJgCx3IzGLUzV80PSJwLzKYHVp0VluH2DzrxfMKC01bMklG46n1nhEo1UU2KA4vzoScmrXzD+m7nKFZ3GHFjyQvtxqG7gA34qg1Vj2o2O0vN/kvjX73SR5s4
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDhjCCAm4CCQC8Px9pbIuxGDANBgkqhkiG9w0BAQUFADCBhDELMAkGA1UEBhMCTFYxDTALBgNVBAgMBFJpZ2ExDTALBgNVBAcMBFJpZ2ExCzAJBgNVBAoMAkxVMQwwCgYDVQQLDANJVEQxFTATBgNVBAMMDGx1LWlkcC5sdS5sdjElMCMGCSqGSIb3DQEJARYWaXRzZXJ2aXNzIGF0IGx1IGRvdCBsdjAeFw0xMzEyMjAxMDU3MDJaFw0yOTAzMDYxMDU3MDJaMIGEMQswCQYDVQQGEwJMVjENMAsGA1UECAwEUmlnYTENMAsGA1UEBwwEUmlnYTELMAkGA1UECgwCTFUxDDAKBgNVBAsMA0lURDEVMBMGA1UEAwwMbHUtaWRwLmx1Lmx2MSUwIwYJKoZIhvcNAQkBFhZpdHNlcnZpc3MgYXQgbHUgZG90IGx2MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuAy8ri5VknGxy21iuW6kalPwg7VPZBWOuV/jVjRre44tHFd5FinCQUCuzQZn37AU3ZNZg07RRyDhkAzzpsBRQf48VcbnQFRjERuQTKUfT9hzFMxgbjxW2Dayg2Ru2LkGcIUeHilOwfmRn1NIRBN+0UyJIluRvB8YGdHSSHYSMimyw9uYEuMkU9aqewwW78w7TeasCWlB6jiGfJ/SGVtPRThJ6X6KVqoU2gwIY+V7YJkG4b5TOw4HLaIsdOmU4h1Ep3igy+Zsc/7zPn+80iwm1Jk9Q8zGlEwikjPn1N3enMOxR8wpQfAQwm5lIaHNXYFcXCj3mVQ3yQ9EzB/hRC8tHwIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQCFRpI7U/lTwoUW/HwDb2gAmjb0RSmS+5lUWDgmjP/rJwYdh672plabNcY12DiqchtBaSeTOf4qANCqEme+YBAmssFUeLx6O1J+5aXeXfCwAA9GlswGDVeC8ZnTVmQupnbvL0T+ZU8WtkltlLEJdD6o9BtEOqk3+Rspu+94d6FUwmvWB/YWypAOfzXkkSxi+87nsadiFEOyCzTW8fZotOrZMzba52ELLJgCx3IzGLUzV80PSJwLzKYHVp0VluH2DzrxfMKC01bMklG46n1nhEo1UU2KA4vzoScmrXzD+m7nKFZ3GHFjyQvtxqG7gA34qg1Vj2o2O0vN/kvjX73SR5s4
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ra-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://ra-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 - RA</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Rezekne Higher Education Institution - RA IDP</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://laife.lanet.lv/</OrganizationURL>
-    <OrganizationURL xml:lang="lv">http://www.ru.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/rastreador.ifba.edu.br-idp-shibboleth.xml b/swamid-interfederations-2.0/rastreador.ifba.edu.br-idp-shibboleth.xml
deleted file mode 100644
index ade79d7c..00000000
--- a/swamid-interfederations-2.0/rastreador.ifba.edu.br-idp-shibboleth.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://rastreador.ifba.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">edu.br</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">IFBA - Instituto Federal da Bahia</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="pt-br">IFBA - Instituto Federal da Bahia</mdui:DisplayName>
-        <mdui:Description xml:lang="en">IFBA - Instituto Federal da Bahia</mdui:Description>
-        <mdui:Description xml:lang="pt-br">IFBA - Instituto Federal da Bahia</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.ifba.edu.br</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="pt-br">http://www.ifba.edu.br</mdui:InformationURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-    MIID4jCCAsoCAQAwDQYJKoZIhvcNAQEFBQAwgbYxKjAoBgNVBAoTIUlGQkEgLSBJ
-bnN0aXR1dG8gRmVkZXJhbCBkYSBCYWhpYTENMAsGA1UECxMEREdUSTEoMCYGCSqG
-SIb3DQEJARYZcmVpbmFsZG9jb3N0YUBpZmJhLmVkdS5icjERMA8GA1UEBxMIU2Fs
-dmFkb3IxDjAMBgNVBAgTBUJhaGlhMQswCQYDVQQGEwJCUjEfMB0GA1UEAxMWcmFz
-dHJlYWRvci5pZmJhLmVkdS5icjAeFw0xNDA1MjgxNDExMDVaFw0xNzA1MjcxNDEx
-MDVaMIG2MSowKAYDVQQKEyFJRkJBIC0gSW5zdGl0dXRvIEZlZGVyYWwgZGEgQmFo
-aWExDTALBgNVBAsTBERHVEkxKDAmBgkqhkiG9w0BCQEWGXJlaW5hbGRvY29zdGFA
-aWZiYS5lZHUuYnIxETAPBgNVBAcTCFNhbHZhZG9yMQ4wDAYDVQQIEwVCYWhpYTEL
-MAkGA1UEBhMCQlIxHzAdBgNVBAMTFnJhc3RyZWFkb3IuaWZiYS5lZHUuYnIwggEi
-MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC76YPzCeUvBq3XTaaWh0zo1nn6
-1lSxQFz/f0d9NOSjMe4aIxyMfCQHhWvoCldVgPzeVBHM8pioQsSyP8KZve1N0H5d
-6KWPZzk99oCPPkuGWVocYfEOHgodYqKD5aEU4gu8x+sggzZO0sCFlrqCbI26dhEx
-WmBLPy7bu0iownsyQE4UKeYWMBDI9Zmpq8LAIkzlLcs6RPkCqeC5Fl0JY1rmOYqd
-1/dr2oZapOQApH9En6lxfCBm4lo/BWKYJXnJ48GgpxsmaiUZ5A/2ORM7Ts0cJ8Fa
-FOi3KP1izvNxheJRS5i/H9dzPtrpbAz5cvpj36eLPNvLf038tNgRSTpKBCe5AgMB
-AAEwDQYJKoZIhvcNAQEFBQADggEBALAgWE0GCvUpvnMtQD1Jht1dNdGX+1MlVt2k
-9Vq2Z6qlQbidL2aP2nsg8wvGCnoJbH3ChV8URBf0nSxjo070sjoPd24++a8+FZ66
-fxopAvdKKImq6VnSQIXL2fUFtIld/vGGnbPj/IKdlKCvhNNziDBkhnc+N5bM9qnS
-hjssLnLT/qVvMxplYjAB4fCD+h83bAPR2b9oFjduMP9LQ4c0/EMD/2HNmvomB4mM
-Ftuj6MoBNtSICbkYC4Kq9a/J4z4huIrz69ZxKnayVTztrnRJCUPaoOecIpXL/r/g
-NN2zz1zPr1Dc/+gDsijnBBws0KDp9946d4alZG05drL11LjY9bk=
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://rastreador.ifba.edu.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://rastreador.ifba.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://rastreador.ifba.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://rastreador.ifba.edu.br/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://rastreador.ifba.edu.br/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://rastreador.ifba.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>
-      
-MIID4jCCAsoCAQAwDQYJKoZIhvcNAQEFBQAwgbYxKjAoBgNVBAoTIUlGQkEgLSBJ
-bnN0aXR1dG8gRmVkZXJhbCBkYSBCYWhpYTENMAsGA1UECxMEREdUSTEoMCYGCSqG
-SIb3DQEJARYZcmVpbmFsZG9jb3N0YUBpZmJhLmVkdS5icjERMA8GA1UEBxMIU2Fs
-dmFkb3IxDjAMBgNVBAgTBUJhaGlhMQswCQYDVQQGEwJCUjEfMB0GA1UEAxMWcmFz
-dHJlYWRvci5pZmJhLmVkdS5icjAeFw0xNDA1MjgxNDExMDVaFw0xNzA1MjcxNDEx
-MDVaMIG2MSowKAYDVQQKEyFJRkJBIC0gSW5zdGl0dXRvIEZlZGVyYWwgZGEgQmFo
-aWExDTALBgNVBAsTBERHVEkxKDAmBgkqhkiG9w0BCQEWGXJlaW5hbGRvY29zdGFA
-aWZiYS5lZHUuYnIxETAPBgNVBAcTCFNhbHZhZG9yMQ4wDAYDVQQIEwVCYWhpYTEL
-MAkGA1UEBhMCQlIxHzAdBgNVBAMTFnJhc3RyZWFkb3IuaWZiYS5lZHUuYnIwggEi
-MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC76YPzCeUvBq3XTaaWh0zo1nn6
-1lSxQFz/f0d9NOSjMe4aIxyMfCQHhWvoCldVgPzeVBHM8pioQsSyP8KZve1N0H5d
-6KWPZzk99oCPPkuGWVocYfEOHgodYqKD5aEU4gu8x+sggzZO0sCFlrqCbI26dhEx
-WmBLPy7bu0iownsyQE4UKeYWMBDI9Zmpq8LAIkzlLcs6RPkCqeC5Fl0JY1rmOYqd
-1/dr2oZapOQApH9En6lxfCBm4lo/BWKYJXnJ48GgpxsmaiUZ5A/2ORM7Ts0cJ8Fa
-FOi3KP1izvNxheJRS5i/H9dzPtrpbAz5cvpj36eLPNvLf038tNgRSTpKBCe5AgMB
-AAEwDQYJKoZIhvcNAQEFBQADggEBALAgWE0GCvUpvnMtQD1Jht1dNdGX+1MlVt2k
-9Vq2Z6qlQbidL2aP2nsg8wvGCnoJbH3ChV8URBf0nSxjo070sjoPd24++a8+FZ66
-fxopAvdKKImq6VnSQIXL2fUFtIld/vGGnbPj/IKdlKCvhNNziDBkhnc+N5bM9qnS
-hjssLnLT/qVvMxplYjAB4fCD+h83bAPR2b9oFjduMP9LQ4c0/EMD/2HNmvomB4mM
-Ftuj6MoBNtSICbkYC4Kq9a/J4z4huIrz69ZxKnayVTztrnRJCUPaoOecIpXL/r/g
-NN2zz1zPr1Dc/+gDsijnBBws0KDp9946d4alZG05drL11LjY9bk=
-                    
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://rastreador.ifba.edu.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://rastreador.ifba.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">IFBA - Instituto Federal da Bahia</OrganizationName>
-    <OrganizationName xml:lang="pt-br">IFBA - Instituto Federal da Bahia</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">IFBA - Instituto Federal da Bahia</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="pt-br">IFBA - Instituto Federal da Bahia</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.ifba.edu.br</OrganizationURL>
-    <OrganizationURL xml:lang="pt-br">http://www.ifba.edu.br</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Reinaldo Fonseca</SurName>
-    <EmailAddress>reinaldocosta@ifba.edu.br</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/rastreador.ifba.edu.br.xml b/swamid-interfederations-2.0/rastreador.ifba.edu.br.xml
deleted file mode 100644
index ade79d7c..00000000
--- a/swamid-interfederations-2.0/rastreador.ifba.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://rastreador.ifba.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">edu.br</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">IFBA - Instituto Federal da Bahia</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="pt-br">IFBA - Instituto Federal da Bahia</mdui:DisplayName>
-        <mdui:Description xml:lang="en">IFBA - Instituto Federal da Bahia</mdui:Description>
-        <mdui:Description xml:lang="pt-br">IFBA - Instituto Federal da Bahia</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.ifba.edu.br</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="pt-br">http://www.ifba.edu.br</mdui:InformationURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-    MIID4jCCAsoCAQAwDQYJKoZIhvcNAQEFBQAwgbYxKjAoBgNVBAoTIUlGQkEgLSBJ
-bnN0aXR1dG8gRmVkZXJhbCBkYSBCYWhpYTENMAsGA1UECxMEREdUSTEoMCYGCSqG
-SIb3DQEJARYZcmVpbmFsZG9jb3N0YUBpZmJhLmVkdS5icjERMA8GA1UEBxMIU2Fs
-dmFkb3IxDjAMBgNVBAgTBUJhaGlhMQswCQYDVQQGEwJCUjEfMB0GA1UEAxMWcmFz
-dHJlYWRvci5pZmJhLmVkdS5icjAeFw0xNDA1MjgxNDExMDVaFw0xNzA1MjcxNDEx
-MDVaMIG2MSowKAYDVQQKEyFJRkJBIC0gSW5zdGl0dXRvIEZlZGVyYWwgZGEgQmFo
-aWExDTALBgNVBAsTBERHVEkxKDAmBgkqhkiG9w0BCQEWGXJlaW5hbGRvY29zdGFA
-aWZiYS5lZHUuYnIxETAPBgNVBAcTCFNhbHZhZG9yMQ4wDAYDVQQIEwVCYWhpYTEL
-MAkGA1UEBhMCQlIxHzAdBgNVBAMTFnJhc3RyZWFkb3IuaWZiYS5lZHUuYnIwggEi
-MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC76YPzCeUvBq3XTaaWh0zo1nn6
-1lSxQFz/f0d9NOSjMe4aIxyMfCQHhWvoCldVgPzeVBHM8pioQsSyP8KZve1N0H5d
-6KWPZzk99oCPPkuGWVocYfEOHgodYqKD5aEU4gu8x+sggzZO0sCFlrqCbI26dhEx
-WmBLPy7bu0iownsyQE4UKeYWMBDI9Zmpq8LAIkzlLcs6RPkCqeC5Fl0JY1rmOYqd
-1/dr2oZapOQApH9En6lxfCBm4lo/BWKYJXnJ48GgpxsmaiUZ5A/2ORM7Ts0cJ8Fa
-FOi3KP1izvNxheJRS5i/H9dzPtrpbAz5cvpj36eLPNvLf038tNgRSTpKBCe5AgMB
-AAEwDQYJKoZIhvcNAQEFBQADggEBALAgWE0GCvUpvnMtQD1Jht1dNdGX+1MlVt2k
-9Vq2Z6qlQbidL2aP2nsg8wvGCnoJbH3ChV8URBf0nSxjo070sjoPd24++a8+FZ66
-fxopAvdKKImq6VnSQIXL2fUFtIld/vGGnbPj/IKdlKCvhNNziDBkhnc+N5bM9qnS
-hjssLnLT/qVvMxplYjAB4fCD+h83bAPR2b9oFjduMP9LQ4c0/EMD/2HNmvomB4mM
-Ftuj6MoBNtSICbkYC4Kq9a/J4z4huIrz69ZxKnayVTztrnRJCUPaoOecIpXL/r/g
-NN2zz1zPr1Dc/+gDsijnBBws0KDp9946d4alZG05drL11LjY9bk=
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://rastreador.ifba.edu.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://rastreador.ifba.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://rastreador.ifba.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://rastreador.ifba.edu.br/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://rastreador.ifba.edu.br/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://rastreador.ifba.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>
-      
-MIID4jCCAsoCAQAwDQYJKoZIhvcNAQEFBQAwgbYxKjAoBgNVBAoTIUlGQkEgLSBJ
-bnN0aXR1dG8gRmVkZXJhbCBkYSBCYWhpYTENMAsGA1UECxMEREdUSTEoMCYGCSqG
-SIb3DQEJARYZcmVpbmFsZG9jb3N0YUBpZmJhLmVkdS5icjERMA8GA1UEBxMIU2Fs
-dmFkb3IxDjAMBgNVBAgTBUJhaGlhMQswCQYDVQQGEwJCUjEfMB0GA1UEAxMWcmFz
-dHJlYWRvci5pZmJhLmVkdS5icjAeFw0xNDA1MjgxNDExMDVaFw0xNzA1MjcxNDEx
-MDVaMIG2MSowKAYDVQQKEyFJRkJBIC0gSW5zdGl0dXRvIEZlZGVyYWwgZGEgQmFo
-aWExDTALBgNVBAsTBERHVEkxKDAmBgkqhkiG9w0BCQEWGXJlaW5hbGRvY29zdGFA
-aWZiYS5lZHUuYnIxETAPBgNVBAcTCFNhbHZhZG9yMQ4wDAYDVQQIEwVCYWhpYTEL
-MAkGA1UEBhMCQlIxHzAdBgNVBAMTFnJhc3RyZWFkb3IuaWZiYS5lZHUuYnIwggEi
-MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC76YPzCeUvBq3XTaaWh0zo1nn6
-1lSxQFz/f0d9NOSjMe4aIxyMfCQHhWvoCldVgPzeVBHM8pioQsSyP8KZve1N0H5d
-6KWPZzk99oCPPkuGWVocYfEOHgodYqKD5aEU4gu8x+sggzZO0sCFlrqCbI26dhEx
-WmBLPy7bu0iownsyQE4UKeYWMBDI9Zmpq8LAIkzlLcs6RPkCqeC5Fl0JY1rmOYqd
-1/dr2oZapOQApH9En6lxfCBm4lo/BWKYJXnJ48GgpxsmaiUZ5A/2ORM7Ts0cJ8Fa
-FOi3KP1izvNxheJRS5i/H9dzPtrpbAz5cvpj36eLPNvLf038tNgRSTpKBCe5AgMB
-AAEwDQYJKoZIhvcNAQEFBQADggEBALAgWE0GCvUpvnMtQD1Jht1dNdGX+1MlVt2k
-9Vq2Z6qlQbidL2aP2nsg8wvGCnoJbH3ChV8URBf0nSxjo070sjoPd24++a8+FZ66
-fxopAvdKKImq6VnSQIXL2fUFtIld/vGGnbPj/IKdlKCvhNNziDBkhnc+N5bM9qnS
-hjssLnLT/qVvMxplYjAB4fCD+h83bAPR2b9oFjduMP9LQ4c0/EMD/2HNmvomB4mM
-Ftuj6MoBNtSICbkYC4Kq9a/J4z4huIrz69ZxKnayVTztrnRJCUPaoOecIpXL/r/g
-NN2zz1zPr1Dc/+gDsijnBBws0KDp9946d4alZG05drL11LjY9bk=
-                    
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://rastreador.ifba.edu.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://rastreador.ifba.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">IFBA - Instituto Federal da Bahia</OrganizationName>
-    <OrganizationName xml:lang="pt-br">IFBA - Instituto Federal da Bahia</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">IFBA - Instituto Federal da Bahia</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="pt-br">IFBA - Instituto Federal da Bahia</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.ifba.edu.br</OrganizationURL>
-    <OrganizationURL xml:lang="pt-br">http://www.ifba.edu.br</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Reinaldo Fonseca</SurName>
-    <EmailAddress>reinaldocosta@ifba.edu.br</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/registration.dariah.eu-shibboleth.xml b/swamid-interfederations-2.0/registration.dariah.eu-shibboleth.xml
deleted file mode 100644
index 3b426353..00000000
--- a/swamid-interfederations-2.0/registration.dariah.eu-shibboleth.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://registration.dariah.eu/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2014-05-15T11:08: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>
-    <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://ldap-dariah.esc.rzg.mpg.de/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="de">DARIAH Registration</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">DARIAH Registration</mdui:DisplayName>
-        <mdui:Description xml:lang="de">Service zum Registrieren fremder Accounts in der DARIAH Attribute Authority zum Zweck der Autorisierung an Dariah Services</mdui:Description>
-        <mdui:Description xml:lang="en">Service for Registration of Campus Accounts in the DARIAH Attribute Authority in order to enable Authorization for DARIAH Services</mdui:Description>
-        <mdui:Logo height="16" width="16">https://ldap-dariah.esc.rzg.mpg.de/images/DARIAH_flower_icon.png</mdui:Logo>
-        <mdui:Logo height="154" width="160">https://ldap-dariah.esc.rzg.mpg.de/images/DARIAH_flower.png</mdui:Logo>
-        <mdui:InformationURL xml:lang="de">http://dariah.eu/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">http://dariah.eu/</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://de.dariah.eu/ServicePrivacyPolicy</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>ldap-dariah.esc.rzg.mpg.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=ldap-dariah.esc.rzg.mpg.de,OU=Rechenzentrum Garching (RZG),O=Max-Planck-Gesellschaft,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFEDCCA/igAwIBAgIHEy5eQihwbDANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQG
-EwJERTEgMB4GA1UEChMXTWF4LVBsYW5jay1HZXNlbGxzY2hhZnQxDzANBgNVBAMT
-Bk1QRyBDQTEcMBoGCSqGSIb3DQEJARYNbXBnLWNhQG1wZy5kZTAeFw0xMjAxMTIx
-MzMxMzFaFw0xNzAxMTAxMzMxMzFaMHsxCzAJBgNVBAYTAkRFMSAwHgYDVQQKExdN
-YXgtUGxhbmNrLUdlc2VsbHNjaGFmdDElMCMGA1UECxMcUmVjaGVuemVudHJ1bSBH
-YXJjaGluZyAoUlpHKTEjMCEGA1UEAxMabGRhcC1kYXJpYWguZXNjLnJ6Zy5tcGcu
-ZGUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDbyc9BVBglxQEt8MmI
-cbf3GKqCdQADGnnNXAwx9gjq5mQI2+VNGcBk8aq24p5a++hlemue+6P6RQONiv5z
-sAXlIZb6MuGOcF6gOUqRijMuWW1OueysiO4F5ODOJ8TaGSjWytCSQ28cpJbc7wWo
-mnlZxL6NvVyRiDCJuUfDyIW8ICgk7Aw1K0UdpJXeVzFUiBtTIM7Ira80o3yeLDhi
-DDPc+swDZA9syWvn8/W57kN0/vtUYKzGs6Ae+uRxahSfNg/kx1Rnv0sUln1hgUHh
-VuiKqu1MlAIcckNt00Ck/v7LQV98KJJx+rWWPV1F09a6vPEAesEY+GnJQkwAzh/O
-xiTjAgMBAAGjggG0MIIBsDAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUE
-FjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwHQYDVR0OBBYEFEnnIPu9e2M7ABKF66CA
-uTWv1Jf8MB8GA1UdIwQYMBaAFALWHm4Jq79YZacKPEgzYdHOfcNbMCkGA1UdEQQi
-MCCBHnNlcnZlci1jZXJ0aWZpY2F0ZXNAcnpnLm1wZy5kZTB3BgNVHR8EcDBuMDWg
-M6Axhi9odHRwOi8vY2RwMS5wY2EuZGZuLmRlL21wZy1jYS9wdWIvY3JsL2NhY3Js
-LmNybDA1oDOgMYYvaHR0cDovL2NkcDIucGNhLmRmbi5kZS9tcGctY2EvcHViL2Ny
-bC9jYWNybC5jcmwwgZIGCCsGAQUFBwEBBIGFMIGCMD8GCCsGAQUFBzAChjNodHRw
-Oi8vY2RwMS5wY2EuZGZuLmRlL21wZy1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQw
-PwYIKwYBBQUHMAKGM2h0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvbXBnLWNhL3B1Yi9j
-YWNlcnQvY2FjZXJ0LmNydDANBgkqhkiG9w0BAQUFAAOCAQEAxDSpJ7Mn2hmiyDzK
-VVtARi1U9EvfTcSIWZFanc1xn9DaFI8s3c6vnEB7+BL/HMbAwnDauWjUPoNzc5I2
-TeH5IjX8MGDjEh7TyNyycWRNJ88ah0LtQoaCgXc0vpTtXZzGelh0A25Hw80sHKa1
-xY4iDAPYwaPY+kFxxAGyeAL9M4q9Z39t6ZIoze+lQm0sxQ3eTvQUPwukAeI9xOzb
-KsbO/Q7VBdzaH75dVrc+dSQqXy1bOQUAext9foXlso8ECt0b1vQVdspe5tQ1+y3u
-aDG4T0gWjN5P3enk6TN3v4V9UaBA4J1DkBCxC/RNFnNZc22GqQ1Bbf9rKXjyXECp
-q1AZvg==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ldap-dariah.esc.rzg.mpg.de/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ldap-dariah.esc.rzg.mpg.de/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ldap-dariah.esc.rzg.mpg.de/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ldap-dariah.esc.rzg.mpg.de/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ldap-dariah.esc.rzg.mpg.de/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ldap-dariah.esc.rzg.mpg.de/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ldap-dariah.esc.rzg.mpg.de/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ldap-dariah.esc.rzg.mpg.de/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ldap-dariah.esc.rzg.mpg.de/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ldap-dariah.esc.rzg.mpg.de/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <AttributeConsumingService index="1">
-      <ServiceName xml:lang="de">DARIAH Registration</ServiceName>
-      <ServiceName xml:lang="en">DARIAH Registration</ServiceName>
-      <ServiceDescription xml:lang="de">Service zum Registrieren fremder Accounts in der DARIAH Attribute Authority zum Zweck der Autorisierung an Dariah Services</ServiceDescription>
-      <ServiceDescription xml:lang="en">Service for Registration of Campus Accounts in the DARIAH Attribute Authority in order to enable Authorization for DARIAH Services</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="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" 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="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-      <RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-      <RequestedAttribute FriendlyName="o" Name="urn:oid:2.5.4.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-    </AttributeConsumingService>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">e112</OrganizationName>
-    <OrganizationName xml:lang="en">e112</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">Gesellschaft für wissenschaftliche Datenverarbeitung mbH</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">Gesellschaft für wissenschaftliche Datenverarbeitung mbH</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.gwdg.de</OrganizationURL>
-    <OrganizationURL xml:lang="en">http://www.gwdg.de</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Martin</GivenName>
-    <SurName>Haase</SurName>
-    <EmailAddress>mailto:martin.haase@daasi.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="support">
-    <GivenName>Martin</GivenName>
-    <SurName>Haase</SurName>
-    <EmailAddress>mailto:martin.haase@daasi.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="administrative">
-    <GivenName>Martin</GivenName>
-    <SurName>Haase</SurName>
-    <EmailAddress>mailto:martin.haase@daasi.de</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/registration.dariah.eu.xml b/swamid-interfederations-2.0/registration.dariah.eu.xml
deleted file mode 100644
index 3b426353..00000000
--- a/swamid-interfederations-2.0/registration.dariah.eu.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://registration.dariah.eu/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2014-05-15T11:08: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>
-    <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://ldap-dariah.esc.rzg.mpg.de/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="de">DARIAH Registration</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">DARIAH Registration</mdui:DisplayName>
-        <mdui:Description xml:lang="de">Service zum Registrieren fremder Accounts in der DARIAH Attribute Authority zum Zweck der Autorisierung an Dariah Services</mdui:Description>
-        <mdui:Description xml:lang="en">Service for Registration of Campus Accounts in the DARIAH Attribute Authority in order to enable Authorization for DARIAH Services</mdui:Description>
-        <mdui:Logo height="16" width="16">https://ldap-dariah.esc.rzg.mpg.de/images/DARIAH_flower_icon.png</mdui:Logo>
-        <mdui:Logo height="154" width="160">https://ldap-dariah.esc.rzg.mpg.de/images/DARIAH_flower.png</mdui:Logo>
-        <mdui:InformationURL xml:lang="de">http://dariah.eu/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">http://dariah.eu/</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://de.dariah.eu/ServicePrivacyPolicy</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>ldap-dariah.esc.rzg.mpg.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=ldap-dariah.esc.rzg.mpg.de,OU=Rechenzentrum Garching (RZG),O=Max-Planck-Gesellschaft,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFEDCCA/igAwIBAgIHEy5eQihwbDANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQG
-EwJERTEgMB4GA1UEChMXTWF4LVBsYW5jay1HZXNlbGxzY2hhZnQxDzANBgNVBAMT
-Bk1QRyBDQTEcMBoGCSqGSIb3DQEJARYNbXBnLWNhQG1wZy5kZTAeFw0xMjAxMTIx
-MzMxMzFaFw0xNzAxMTAxMzMxMzFaMHsxCzAJBgNVBAYTAkRFMSAwHgYDVQQKExdN
-YXgtUGxhbmNrLUdlc2VsbHNjaGFmdDElMCMGA1UECxMcUmVjaGVuemVudHJ1bSBH
-YXJjaGluZyAoUlpHKTEjMCEGA1UEAxMabGRhcC1kYXJpYWguZXNjLnJ6Zy5tcGcu
-ZGUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDbyc9BVBglxQEt8MmI
-cbf3GKqCdQADGnnNXAwx9gjq5mQI2+VNGcBk8aq24p5a++hlemue+6P6RQONiv5z
-sAXlIZb6MuGOcF6gOUqRijMuWW1OueysiO4F5ODOJ8TaGSjWytCSQ28cpJbc7wWo
-mnlZxL6NvVyRiDCJuUfDyIW8ICgk7Aw1K0UdpJXeVzFUiBtTIM7Ira80o3yeLDhi
-DDPc+swDZA9syWvn8/W57kN0/vtUYKzGs6Ae+uRxahSfNg/kx1Rnv0sUln1hgUHh
-VuiKqu1MlAIcckNt00Ck/v7LQV98KJJx+rWWPV1F09a6vPEAesEY+GnJQkwAzh/O
-xiTjAgMBAAGjggG0MIIBsDAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUE
-FjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwHQYDVR0OBBYEFEnnIPu9e2M7ABKF66CA
-uTWv1Jf8MB8GA1UdIwQYMBaAFALWHm4Jq79YZacKPEgzYdHOfcNbMCkGA1UdEQQi
-MCCBHnNlcnZlci1jZXJ0aWZpY2F0ZXNAcnpnLm1wZy5kZTB3BgNVHR8EcDBuMDWg
-M6Axhi9odHRwOi8vY2RwMS5wY2EuZGZuLmRlL21wZy1jYS9wdWIvY3JsL2NhY3Js
-LmNybDA1oDOgMYYvaHR0cDovL2NkcDIucGNhLmRmbi5kZS9tcGctY2EvcHViL2Ny
-bC9jYWNybC5jcmwwgZIGCCsGAQUFBwEBBIGFMIGCMD8GCCsGAQUFBzAChjNodHRw
-Oi8vY2RwMS5wY2EuZGZuLmRlL21wZy1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQw
-PwYIKwYBBQUHMAKGM2h0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvbXBnLWNhL3B1Yi9j
-YWNlcnQvY2FjZXJ0LmNydDANBgkqhkiG9w0BAQUFAAOCAQEAxDSpJ7Mn2hmiyDzK
-VVtARi1U9EvfTcSIWZFanc1xn9DaFI8s3c6vnEB7+BL/HMbAwnDauWjUPoNzc5I2
-TeH5IjX8MGDjEh7TyNyycWRNJ88ah0LtQoaCgXc0vpTtXZzGelh0A25Hw80sHKa1
-xY4iDAPYwaPY+kFxxAGyeAL9M4q9Z39t6ZIoze+lQm0sxQ3eTvQUPwukAeI9xOzb
-KsbO/Q7VBdzaH75dVrc+dSQqXy1bOQUAext9foXlso8ECt0b1vQVdspe5tQ1+y3u
-aDG4T0gWjN5P3enk6TN3v4V9UaBA4J1DkBCxC/RNFnNZc22GqQ1Bbf9rKXjyXECp
-q1AZvg==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ldap-dariah.esc.rzg.mpg.de/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ldap-dariah.esc.rzg.mpg.de/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ldap-dariah.esc.rzg.mpg.de/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ldap-dariah.esc.rzg.mpg.de/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ldap-dariah.esc.rzg.mpg.de/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ldap-dariah.esc.rzg.mpg.de/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ldap-dariah.esc.rzg.mpg.de/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ldap-dariah.esc.rzg.mpg.de/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ldap-dariah.esc.rzg.mpg.de/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ldap-dariah.esc.rzg.mpg.de/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <AttributeConsumingService index="1">
-      <ServiceName xml:lang="de">DARIAH Registration</ServiceName>
-      <ServiceName xml:lang="en">DARIAH Registration</ServiceName>
-      <ServiceDescription xml:lang="de">Service zum Registrieren fremder Accounts in der DARIAH Attribute Authority zum Zweck der Autorisierung an Dariah Services</ServiceDescription>
-      <ServiceDescription xml:lang="en">Service for Registration of Campus Accounts in the DARIAH Attribute Authority in order to enable Authorization for DARIAH Services</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="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" 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="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-      <RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-      <RequestedAttribute FriendlyName="o" Name="urn:oid:2.5.4.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-    </AttributeConsumingService>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">e112</OrganizationName>
-    <OrganizationName xml:lang="en">e112</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">Gesellschaft für wissenschaftliche Datenverarbeitung mbH</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">Gesellschaft für wissenschaftliche Datenverarbeitung mbH</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.gwdg.de</OrganizationURL>
-    <OrganizationURL xml:lang="en">http://www.gwdg.de</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Martin</GivenName>
-    <SurName>Haase</SurName>
-    <EmailAddress>mailto:martin.haase@daasi.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="support">
-    <GivenName>Martin</GivenName>
-    <SurName>Haase</SurName>
-    <EmailAddress>mailto:martin.haase@daasi.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="administrative">
-    <GivenName>Martin</GivenName>
-    <SurName>Haase</SurName>
-    <EmailAddress>mailto:martin.haase@daasi.de</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/rems.elixir-finland.org-shibboleth.xml b/swamid-interfederations-2.0/rems.elixir-finland.org-shibboleth.xml
deleted file mode 100644
index d3bdd0b3..00000000
--- a/swamid-interfederations-2.0/rems.elixir-finland.org-shibboleth.xml
+++ /dev/null
@@ -1,99 +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#" entityID="https://rems.elixir-finland.org/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.csc.fi/haka">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://www.csc.fi/english/institutions/haka/instructions/join/eduGAINRegistrationStatement/</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:2.0:protocol">
-    <Extensions>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">REMS ELIXIR</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="fi">REMS ELIXIR</mdui:DisplayName>
-        <mdui:Description xml:lang="en">An ELIXIR service for applying for and managing access rights to datasets in the biomedical sciences.</mdui:Description>
-        <mdui:Description xml:lang="fi">ELIXIRin aineistojen käyttövaltuuksien hallintajärjestelmä.</mdui:Description>
-        <mdui:PrivacyStatementURL xml:lang="fi">https://rems.elixir-finland.org/privacy-policy</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://rems.elixir-finland.org/privacy-policy</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIFfDCCBGSgAwIBAgIRAOOPBaozx9H6wmXnbZDrqlYwDQYJKoZIhvcNAQEFBQAw
-NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-IFNTTCBDQTAeFw0xNDA0MDkwMDAwMDBaFw0xNzA0MDgyMzU5NTlaMEUxITAfBgNV
-BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEgMB4GA1UEAxMXcmVtcy5lbGl4
-aXItZmlubGFuZC5vcmcwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDE
-PmEMb9faLtRJlg+4uDV6K9hy3F0rBS/qhD5Gx9+4r3XLUGif6nX+zwErh+nQCqNS
-tujxdFOGALGsM5j6EvUJUyAvgQkoPq/z4GiRymexQeJkg3mQlRJ8rC0eRNfmdMo6
-KwE14GC0Y3aEJnxYbnArBcR2xb5qYM4nXE/2k3Tm6gRHasj2fK2CxbROilD42Dmd
-fj+zPx1kl0qOAZCKfhGNf36nt5VT9Hf39Y0xEBIDKKclAhMm8F9kfy6iDW9wi7yb
-6cNqSgZhe3kJ0SSWidFJVkHbdlxEII5bqlDflEiabxpt1bZk3BCfB66IH+gPOsES
-2wQTIzxeBDn0b++Misf5joU1wP26vhWNV6ZTQWtAqKKg9fXTWyqGGNNGpAZDaO+K
-ObS/EucGN7eDHmvLVpaRIN7RZHHbcMR3Irb9GPb7ICApjcrDiugl3tyTlZiznkpW
-5oL5+yZgc7wBGIGLV7r4ZcGFljJ0hq6+TviclrE/0DQVbHe51iM7nAkRlEdVF9Uc
-sliaHiswU1dhul14qXTNGi4dPUIkFW47Hy050O4ZqK9Bx7/WDhqm//oWt7mmNeW9
-Q7or0YK6btf+8IzuuC7GcGzHI8vhB1aV74wiRoHeegDwVpID+k3iWsZpLHYviCz6
-Vm6D2XZGznbw31YBJJhEVT/zz0nTv+DFY84ezBmmBwIDAQABo4IBdDCCAXAwHwYD
-VR0jBBgwFoAUDL2TaAzz3qujSWsrN1dH6pDjue0wHQYDVR0OBBYEFNKSOwZ7HEKk
-M5/M4lFidibAuVwcMA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1Ud
-JQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEB
-AgIdMAgGBmeBDAECATA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50
-ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYB
-BQUHMAKGKWh0dHA6Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0
-MCYGCCsGAQUFBzABhhpodHRwOi8vb2NzcC50Y3MudGVyZW5hLm9yZzAiBgNVHREE
-GzAZghdyZW1zLmVsaXhpci1maW5sYW5kLm9yZzANBgkqhkiG9w0BAQUFAAOCAQEA
-SGEF/c7aUAjf57SVtsoZqNkrR8YwBEEu99mKvQlvT6qLdIjNdq4bOYsCIHS+MAmv
-nhJyuiMY+Q4FK+jUsX+Emltk7aii37PAMlHSCpgo7OGDK0c6gdg7FYBuWj20HA6n
-FBgU9FD4sHqSKPEDOitsVTb1Vb1PYLYNaLpJnK70WS/vNCK/mZsy4qWeoxSBIUry
-rlnCOtELPe7YWkB3fAbmzI3FVfHrtb73vAJ6hfbOfuzVwfuEAU4U3+V175fktpw5
-RKcIVJFGa06KaJwT75b637GEuqs/YUdjCJU3uDk/eUnxO8ZZvA7gvxNQXAQBQ0oG
-vzJQyIviY90sJo1Cisoynw==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://rems.elixir-finland.org/Shibboleth.sso/SLO/POST"/>
-    <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://rems.elixir-finland.org/Shibboleth.sso/SAML2/POST" index="1" isDefault="true"/>
-    <AttributeConsumingService index="1" isDefault="true">
-      <ServiceName xml:lang="fi">REMS ELIXIR</ServiceName>
-      <ServiceName xml:lang="en">REMS ELIXIR</ServiceName>
-      <ServiceDescription xml:lang="fi">ELIXIRin aineistojen kayttovaltuuksien hallintajarjestelma.</ServiceDescription>
-      <ServiceDescription xml:lang="en">An ELIXIR service for applying for and managing access rights to datasets in the biomedical sciences.</ServiceDescription>
-      <RequestedAttribute FriendlyName="cn" Name="urn:oid:2.5.4.3" 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="eduPersonAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <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="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="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"/>
-      <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="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-    </AttributeConsumingService>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="fi">CSC - Tieteen tietotekniikan keskus Oy</OrganizationName>
-    <OrganizationName xml:lang="en">CSC - IT Center for Science Ltd.</OrganizationName>
-    <OrganizationName xml:lang="sv">CSC - Tieteen tietotekniikan keskus Oy</OrganizationName>
-    <OrganizationDisplayName xml:lang="fi">CSC - Tieteen tietotekniikan keskus Oy</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">CSC - IT Center for Science Ltd.</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="sv">CSC - Tieteen tietotekniikan keskus Oy</OrganizationDisplayName>
-    <OrganizationURL xml:lang="fi">http://www.csc.fi</OrganizationURL>
-    <OrganizationURL xml:lang="en">http://www.csc.fi</OrganizationURL>
-    <OrganizationURL xml:lang="sv">http://www.csc.fi</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="administrative">
-    <GivenName>Timo</GivenName>
-    <SurName>Mustonen</SurName>
-    <EmailAddress>mailto:rems@csc.fi</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Timo</GivenName>
-    <SurName>Mustonen</SurName>
-    <EmailAddress>mailto:rems@csc.fi</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/rems.elixir-finland.org.xml b/swamid-interfederations-2.0/rems.elixir-finland.org.xml
deleted file mode 100644
index d3bdd0b3..00000000
--- a/swamid-interfederations-2.0/rems.elixir-finland.org.xml
+++ /dev/null
@@ -1,99 +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#" entityID="https://rems.elixir-finland.org/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.csc.fi/haka">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://www.csc.fi/english/institutions/haka/instructions/join/eduGAINRegistrationStatement/</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:2.0:protocol">
-    <Extensions>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">REMS ELIXIR</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="fi">REMS ELIXIR</mdui:DisplayName>
-        <mdui:Description xml:lang="en">An ELIXIR service for applying for and managing access rights to datasets in the biomedical sciences.</mdui:Description>
-        <mdui:Description xml:lang="fi">ELIXIRin aineistojen käyttövaltuuksien hallintajärjestelmä.</mdui:Description>
-        <mdui:PrivacyStatementURL xml:lang="fi">https://rems.elixir-finland.org/privacy-policy</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://rems.elixir-finland.org/privacy-policy</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIFfDCCBGSgAwIBAgIRAOOPBaozx9H6wmXnbZDrqlYwDQYJKoZIhvcNAQEFBQAw
-NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-IFNTTCBDQTAeFw0xNDA0MDkwMDAwMDBaFw0xNzA0MDgyMzU5NTlaMEUxITAfBgNV
-BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEgMB4GA1UEAxMXcmVtcy5lbGl4
-aXItZmlubGFuZC5vcmcwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDE
-PmEMb9faLtRJlg+4uDV6K9hy3F0rBS/qhD5Gx9+4r3XLUGif6nX+zwErh+nQCqNS
-tujxdFOGALGsM5j6EvUJUyAvgQkoPq/z4GiRymexQeJkg3mQlRJ8rC0eRNfmdMo6
-KwE14GC0Y3aEJnxYbnArBcR2xb5qYM4nXE/2k3Tm6gRHasj2fK2CxbROilD42Dmd
-fj+zPx1kl0qOAZCKfhGNf36nt5VT9Hf39Y0xEBIDKKclAhMm8F9kfy6iDW9wi7yb
-6cNqSgZhe3kJ0SSWidFJVkHbdlxEII5bqlDflEiabxpt1bZk3BCfB66IH+gPOsES
-2wQTIzxeBDn0b++Misf5joU1wP26vhWNV6ZTQWtAqKKg9fXTWyqGGNNGpAZDaO+K
-ObS/EucGN7eDHmvLVpaRIN7RZHHbcMR3Irb9GPb7ICApjcrDiugl3tyTlZiznkpW
-5oL5+yZgc7wBGIGLV7r4ZcGFljJ0hq6+TviclrE/0DQVbHe51iM7nAkRlEdVF9Uc
-sliaHiswU1dhul14qXTNGi4dPUIkFW47Hy050O4ZqK9Bx7/WDhqm//oWt7mmNeW9
-Q7or0YK6btf+8IzuuC7GcGzHI8vhB1aV74wiRoHeegDwVpID+k3iWsZpLHYviCz6
-Vm6D2XZGznbw31YBJJhEVT/zz0nTv+DFY84ezBmmBwIDAQABo4IBdDCCAXAwHwYD
-VR0jBBgwFoAUDL2TaAzz3qujSWsrN1dH6pDjue0wHQYDVR0OBBYEFNKSOwZ7HEKk
-M5/M4lFidibAuVwcMA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1Ud
-JQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEB
-AgIdMAgGBmeBDAECATA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50
-ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYB
-BQUHMAKGKWh0dHA6Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0
-MCYGCCsGAQUFBzABhhpodHRwOi8vb2NzcC50Y3MudGVyZW5hLm9yZzAiBgNVHREE
-GzAZghdyZW1zLmVsaXhpci1maW5sYW5kLm9yZzANBgkqhkiG9w0BAQUFAAOCAQEA
-SGEF/c7aUAjf57SVtsoZqNkrR8YwBEEu99mKvQlvT6qLdIjNdq4bOYsCIHS+MAmv
-nhJyuiMY+Q4FK+jUsX+Emltk7aii37PAMlHSCpgo7OGDK0c6gdg7FYBuWj20HA6n
-FBgU9FD4sHqSKPEDOitsVTb1Vb1PYLYNaLpJnK70WS/vNCK/mZsy4qWeoxSBIUry
-rlnCOtELPe7YWkB3fAbmzI3FVfHrtb73vAJ6hfbOfuzVwfuEAU4U3+V175fktpw5
-RKcIVJFGa06KaJwT75b637GEuqs/YUdjCJU3uDk/eUnxO8ZZvA7gvxNQXAQBQ0oG
-vzJQyIviY90sJo1Cisoynw==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://rems.elixir-finland.org/Shibboleth.sso/SLO/POST"/>
-    <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://rems.elixir-finland.org/Shibboleth.sso/SAML2/POST" index="1" isDefault="true"/>
-    <AttributeConsumingService index="1" isDefault="true">
-      <ServiceName xml:lang="fi">REMS ELIXIR</ServiceName>
-      <ServiceName xml:lang="en">REMS ELIXIR</ServiceName>
-      <ServiceDescription xml:lang="fi">ELIXIRin aineistojen kayttovaltuuksien hallintajarjestelma.</ServiceDescription>
-      <ServiceDescription xml:lang="en">An ELIXIR service for applying for and managing access rights to datasets in the biomedical sciences.</ServiceDescription>
-      <RequestedAttribute FriendlyName="cn" Name="urn:oid:2.5.4.3" 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="eduPersonAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <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="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="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"/>
-      <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="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-    </AttributeConsumingService>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="fi">CSC - Tieteen tietotekniikan keskus Oy</OrganizationName>
-    <OrganizationName xml:lang="en">CSC - IT Center for Science Ltd.</OrganizationName>
-    <OrganizationName xml:lang="sv">CSC - Tieteen tietotekniikan keskus Oy</OrganizationName>
-    <OrganizationDisplayName xml:lang="fi">CSC - Tieteen tietotekniikan keskus Oy</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">CSC - IT Center for Science Ltd.</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="sv">CSC - Tieteen tietotekniikan keskus Oy</OrganizationDisplayName>
-    <OrganizationURL xml:lang="fi">http://www.csc.fi</OrganizationURL>
-    <OrganizationURL xml:lang="en">http://www.csc.fi</OrganizationURL>
-    <OrganizationURL xml:lang="sv">http://www.csc.fi</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="administrative">
-    <GivenName>Timo</GivenName>
-    <SurName>Mustonen</SurName>
-    <EmailAddress>mailto:rems@csc.fi</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Timo</GivenName>
-    <SurName>Mustonen</SurName>
-    <EmailAddress>mailto:rems@csc.fi</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/repos.ids-mannheim.de-shibboleth.xml b/swamid-interfederations-2.0/repos.ids-mannheim.de-shibboleth.xml
deleted file mode 100644
index fbef3e5f..00000000
--- a/swamid-interfederations-2.0/repos.ids-mannheim.de-shibboleth.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://repos.ids-mannheim.de/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2013-02-08T13:14:47Z">
-      <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://repos.ids-mannheim.de/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="de">Institut für Deutsche Sprache (IDS) - Forschungsprimärdatenrepository</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Institute for the German Language (IDS) - Respository</mdui:DisplayName>
-        <mdui:Description xml:lang="de">Das Forschungsprimärdatenrepository des Institut für Deutsche Sprache (IDS)</mdui:Description>
-        <mdui:Description xml:lang="en">Repository of language resources provided by the Institute for the German Language (IDS).</mdui:Description>
-        <mdui:InformationURL xml:lang="de">https://repos.ids-mannheim.de</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">https://repos.ids-mannheim.de</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://repos.ids-mannheim.de/privacy.html</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>repos.ids-mannheim.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=repos.ids-mannheim.de,O=Institut fuer Deutsche Sprache,L=Mannheim,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFrTCCBJWgAwIBAgIHFSoBfvFYgTANBgkqhkiG9w0BAQUFADBVMQswCQYDVQQG
-EwJERTETMBEGA1UEChMKREZOLVZlcmVpbjEQMA4GA1UECxMHREZOLVBLSTEfMB0G
-A1UEAxMWREZOLVZlcmVpbiBDQSBTZXJ2aWNlczAeFw0xMzAxMzExNDQ3MTFaFw0x
-ODAxMzAxNDQ3MTFaMIGGMQswCQYDVQQGEwJERTEbMBkGA1UECBMSQmFkZW4tV3Vl
-cnR0ZW1iZXJnMREwDwYDVQQHEwhNYW5uaGVpbTEnMCUGA1UEChMeSW5zdGl0dXQg
-ZnVlciBEZXV0c2NoZSBTcHJhY2hlMR4wHAYDVQQDExVyZXBvcy5pZHMtbWFubmhl
-aW0uZGUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCef4ups838DAB9
-AFeOl3+K4nADphpeElH6iRY41C+o9dOQ+m5N9Twmpp7K0EjZGObwvmESRry07pL6
-72mO0pTV7lTiE9USv3CIRMxCplv4bzaCphv2veXFYKUXU/nuo8CT5i6y6GLS/k7q
-0mTVIxOk12thQLcV3mRfvY88OP4yGeWDMmo/Nvefaha3TxrNt5iIilZ9UWstnPSp
-u3pV3uX+l8gUNVRHAretThJyyj2bBNJwxZ2P16nzQZL68hrJOBf4wruJOp743/c+
-X3lKLtapFo/XHfwylwC+V1FIHFKvgVNdAv28d0rtwoQcEJXfHlaHiPTyu+YQMRmn
-MpUcInV3AgMBAAGjggJOMIICSjA5BgNVHSAEMjAwMBEGDysGAQQBga0hgiwBAQQD
-ADARBg8rBgEEAYGtIYIsAgEEAwAwCAYGZ4EMAQICMAkGA1UdEwQCMAAwCwYDVR0P
-BAQDAgXgMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATAdBgNVHQ4EFgQU
-ESD/k/Bc7kTRJc0rsugmsX+uy+EwHwYDVR0jBBgwFoAUHanxhiZ2Tc9d/VCjbuvx
-vCJ1beswIAYDVR0RBBkwF4IVcmVwb3MuaWRzLW1hbm5oZWltLmRlMIGRBgNVHR8E
-gYkwgYYwQaA/oD2GO2h0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvZ2xvYmFsLXNlcnZp
-Y2VzLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMEGgP6A9hjtodHRwOi8vY2RwMi5wY2Eu
-ZGZuLmRlL2dsb2JhbC1zZXJ2aWNlcy1jYS9wdWIvY3JsL2NhY3JsLmNybDCB3wYI
-KwYBBQUHAQEEgdIwgc8wMwYIKwYBBQUHMAGGJ2h0dHA6Ly9vY3NwLnBjYS5kZm4u
-ZGUvT0NTUC1TZXJ2ZXIvT0NTUDBLBggrBgEFBQcwAoY/aHR0cDovL2NkcDEucGNh
-LmRmbi5kZS9nbG9iYWwtc2VydmljZXMtY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0
-MEsGCCsGAQUFBzAChj9odHRwOi8vY2RwMi5wY2EuZGZuLmRlL2dsb2JhbC1zZXJ2
-aWNlcy1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwDQYJKoZIhvcNAQEFBQADggEB
-AJjBPxcfPIjEor07OUrgzTSup6qh4auvTaQzmLj/Q7N5lA2oLElqIm8kmmW+630f
-BK0p0LeExeOmpNI5rIR34qY6sIA99hdYYMwGrxEnNqPIo7PEfrY0naSIHp8nykJk
-n3zsRY/eskpYdUKhbYLdm23mcp9aitQ2cHp4Li+X599Jwew/epXKpkPs+X5n7Vl6
-WDdN1kceolQ/2UKi/eO4P7DoEh5R5EPZCJzCnekVCaAUgz8zXrbdJp9Ctzk03rgH
-b1xeN6QBnOlltEeOTtUV2b/KADXu1eNF41dVN2ofSWAn1zx321gHv/fb0hEhTbUE
-hoWgvpRdJLO3MqO0sMEedQE=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://repos.ids-mannheim.de/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://repos.ids-mannheim.de/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://repos.ids-mannheim.de/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://repos.ids-mannheim.de/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://repos.ids-mannheim.de/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://repos.ids-mannheim.de/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://repos.ids-mannheim.de/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://repos.ids-mannheim.de/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://repos.ids-mannheim.de/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://repos.ids-mannheim.de/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <AttributeConsumingService index="1">
-      <ServiceName xml:lang="de">Institut für Deutsche Sprache (IDS) - Forschungsprimärdatenrepository</ServiceName>
-      <ServiceName xml:lang="en">Institute for the German Language (IDS) - Respository</ServiceName>
-      <ServiceDescription xml:lang="de">Das Forschungsprimärdatenrepository des Institut für Deutsche Sprache (IDS)</ServiceDescription>
-      <ServiceDescription xml:lang="en">Repository of language resources provided by the Institute for the German Language (IDS).</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="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="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-    </AttributeConsumingService>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">e217</OrganizationName>
-    <OrganizationName xml:lang="en">e217</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">Institut für Deutsche Sprache (IDS)</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">Institut für Deutsche Sprache (IDS)</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.ids-mannheim.de</OrganizationURL>
-    <OrganizationURL xml:lang="en">http://www.ids-mannheim.de</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="administrative">
-    <GivenName>Andreas</GivenName>
-    <SurName>Witt</SurName>
-    <EmailAddress>mailto:witt@ids-mannheim.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Oliver</GivenName>
-    <SurName>Schonefeld</SurName>
-    <EmailAddress>mailto:schonefeld@ids-mannheim.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="support">
-    <GivenName>AAI</GivenName>
-    <SurName>Team</SurName>
-    <EmailAddress>mailto:aai@ids-mannheim.de</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/repos.ids-mannheim.de.xml b/swamid-interfederations-2.0/repos.ids-mannheim.de.xml
deleted file mode 100644
index fbef3e5f..00000000
--- a/swamid-interfederations-2.0/repos.ids-mannheim.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://repos.ids-mannheim.de/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2013-02-08T13:14:47Z">
-      <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://repos.ids-mannheim.de/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="de">Institut für Deutsche Sprache (IDS) - Forschungsprimärdatenrepository</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Institute for the German Language (IDS) - Respository</mdui:DisplayName>
-        <mdui:Description xml:lang="de">Das Forschungsprimärdatenrepository des Institut für Deutsche Sprache (IDS)</mdui:Description>
-        <mdui:Description xml:lang="en">Repository of language resources provided by the Institute for the German Language (IDS).</mdui:Description>
-        <mdui:InformationURL xml:lang="de">https://repos.ids-mannheim.de</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">https://repos.ids-mannheim.de</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://repos.ids-mannheim.de/privacy.html</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>repos.ids-mannheim.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=repos.ids-mannheim.de,O=Institut fuer Deutsche Sprache,L=Mannheim,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFrTCCBJWgAwIBAgIHFSoBfvFYgTANBgkqhkiG9w0BAQUFADBVMQswCQYDVQQG
-EwJERTETMBEGA1UEChMKREZOLVZlcmVpbjEQMA4GA1UECxMHREZOLVBLSTEfMB0G
-A1UEAxMWREZOLVZlcmVpbiBDQSBTZXJ2aWNlczAeFw0xMzAxMzExNDQ3MTFaFw0x
-ODAxMzAxNDQ3MTFaMIGGMQswCQYDVQQGEwJERTEbMBkGA1UECBMSQmFkZW4tV3Vl
-cnR0ZW1iZXJnMREwDwYDVQQHEwhNYW5uaGVpbTEnMCUGA1UEChMeSW5zdGl0dXQg
-ZnVlciBEZXV0c2NoZSBTcHJhY2hlMR4wHAYDVQQDExVyZXBvcy5pZHMtbWFubmhl
-aW0uZGUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCef4ups838DAB9
-AFeOl3+K4nADphpeElH6iRY41C+o9dOQ+m5N9Twmpp7K0EjZGObwvmESRry07pL6
-72mO0pTV7lTiE9USv3CIRMxCplv4bzaCphv2veXFYKUXU/nuo8CT5i6y6GLS/k7q
-0mTVIxOk12thQLcV3mRfvY88OP4yGeWDMmo/Nvefaha3TxrNt5iIilZ9UWstnPSp
-u3pV3uX+l8gUNVRHAretThJyyj2bBNJwxZ2P16nzQZL68hrJOBf4wruJOp743/c+
-X3lKLtapFo/XHfwylwC+V1FIHFKvgVNdAv28d0rtwoQcEJXfHlaHiPTyu+YQMRmn
-MpUcInV3AgMBAAGjggJOMIICSjA5BgNVHSAEMjAwMBEGDysGAQQBga0hgiwBAQQD
-ADARBg8rBgEEAYGtIYIsAgEEAwAwCAYGZ4EMAQICMAkGA1UdEwQCMAAwCwYDVR0P
-BAQDAgXgMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATAdBgNVHQ4EFgQU
-ESD/k/Bc7kTRJc0rsugmsX+uy+EwHwYDVR0jBBgwFoAUHanxhiZ2Tc9d/VCjbuvx
-vCJ1beswIAYDVR0RBBkwF4IVcmVwb3MuaWRzLW1hbm5oZWltLmRlMIGRBgNVHR8E
-gYkwgYYwQaA/oD2GO2h0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvZ2xvYmFsLXNlcnZp
-Y2VzLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMEGgP6A9hjtodHRwOi8vY2RwMi5wY2Eu
-ZGZuLmRlL2dsb2JhbC1zZXJ2aWNlcy1jYS9wdWIvY3JsL2NhY3JsLmNybDCB3wYI
-KwYBBQUHAQEEgdIwgc8wMwYIKwYBBQUHMAGGJ2h0dHA6Ly9vY3NwLnBjYS5kZm4u
-ZGUvT0NTUC1TZXJ2ZXIvT0NTUDBLBggrBgEFBQcwAoY/aHR0cDovL2NkcDEucGNh
-LmRmbi5kZS9nbG9iYWwtc2VydmljZXMtY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0
-MEsGCCsGAQUFBzAChj9odHRwOi8vY2RwMi5wY2EuZGZuLmRlL2dsb2JhbC1zZXJ2
-aWNlcy1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwDQYJKoZIhvcNAQEFBQADggEB
-AJjBPxcfPIjEor07OUrgzTSup6qh4auvTaQzmLj/Q7N5lA2oLElqIm8kmmW+630f
-BK0p0LeExeOmpNI5rIR34qY6sIA99hdYYMwGrxEnNqPIo7PEfrY0naSIHp8nykJk
-n3zsRY/eskpYdUKhbYLdm23mcp9aitQ2cHp4Li+X599Jwew/epXKpkPs+X5n7Vl6
-WDdN1kceolQ/2UKi/eO4P7DoEh5R5EPZCJzCnekVCaAUgz8zXrbdJp9Ctzk03rgH
-b1xeN6QBnOlltEeOTtUV2b/KADXu1eNF41dVN2ofSWAn1zx321gHv/fb0hEhTbUE
-hoWgvpRdJLO3MqO0sMEedQE=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://repos.ids-mannheim.de/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://repos.ids-mannheim.de/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://repos.ids-mannheim.de/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://repos.ids-mannheim.de/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://repos.ids-mannheim.de/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://repos.ids-mannheim.de/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://repos.ids-mannheim.de/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://repos.ids-mannheim.de/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://repos.ids-mannheim.de/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://repos.ids-mannheim.de/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <AttributeConsumingService index="1">
-      <ServiceName xml:lang="de">Institut für Deutsche Sprache (IDS) - Forschungsprimärdatenrepository</ServiceName>
-      <ServiceName xml:lang="en">Institute for the German Language (IDS) - Respository</ServiceName>
-      <ServiceDescription xml:lang="de">Das Forschungsprimärdatenrepository des Institut für Deutsche Sprache (IDS)</ServiceDescription>
-      <ServiceDescription xml:lang="en">Repository of language resources provided by the Institute for the German Language (IDS).</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="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="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-    </AttributeConsumingService>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">e217</OrganizationName>
-    <OrganizationName xml:lang="en">e217</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">Institut für Deutsche Sprache (IDS)</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">Institut für Deutsche Sprache (IDS)</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.ids-mannheim.de</OrganizationURL>
-    <OrganizationURL xml:lang="en">http://www.ids-mannheim.de</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="administrative">
-    <GivenName>Andreas</GivenName>
-    <SurName>Witt</SurName>
-    <EmailAddress>mailto:witt@ids-mannheim.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Oliver</GivenName>
-    <SurName>Schonefeld</SurName>
-    <EmailAddress>mailto:schonefeld@ids-mannheim.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="support">
-    <GivenName>AAI</GivenName>
-    <SurName>Team</SurName>
-    <EmailAddress>mailto:aai@ids-mannheim.de</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/ricevi.ct.infn.it-shibboleth.xml b/swamid-interfederations-2.0/ricevi.ct.infn.it-shibboleth.xml
deleted file mode 100644
index ea3f863f..00000000
--- a/swamid-interfederations-2.0/ricevi.ct.infn.it-shibboleth.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:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" entityID="https://ricevi.ct.infn.it/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2011-10-03T15:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement
-                </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>
-        <mdui:DisplayName xml:lang="en">RICeVI portal</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="it">RICeVI portal</mdui:DisplayName>
-        <mdui:Description xml:lang="en">This service provides experimental facilities for e-Learnign and e-Collaboration</mdui:Description>
-        <mdui:Description xml:lang="it">Questo servizio fornisce servizi sperimentali per l'e-Learning e l'e-Collaboration</mdui:Description>
-      </mdui:UIInfo>
-      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://ricevi.ct.infn.it/Shibboleth.sso/DS"/>
-      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://ricevi.ct.infn.it/Shibboleth.sso/DS" index="1"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIFhDCCBGygAwIBAgIRAOyXU1f6GS689kEaSDAhQPYwDQYJKoZIhvcNAQEFBQAw
-NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-IFNTTCBDQTAeFw0xNDA1MTkwMDAwMDBaFw0xNzA1MTgyMzU5NTlaMEAxITAfBgNV
-BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEbMBkGA1UEAxMSbGlmZXJheS5j
-dC5pbmZuLml0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApizyvtMI
-uoSnnz/fvk7lcXwoDUk11NVAlg5w4zh01YKNvy5SzBu0eRIzRos/ALs4CwmxrmCv
-3JQPA4xxItxVd8x9Q+YElQteEcX+mWXXW5LI5XE3xhPzkdFeQrhkinAK2JreSn6E
-TQk8YO1rOxW3qCpKeYZ2VQF3grAU/JRWbvLF+r2j4zE27n+RzBxnYeZ9rtJ/67gU
-7t1S39DRDTyKit7dJIYl50n9g3atWGALb56QoVnlR+RPRxVI9EFd2hEXfrxWXGdt
-F2v6YIMSAAM5l2/SlEmhQSSkmQ4zXcmPrzC6pte9NWoPOTsQnCnocwMJ16aXsnQy
-BxaoywMtq8NsdwIDAQABo4ICgTCCAn0wHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsr
-N1dH6pDjue0wHQYDVR0OBBYEFCy5dq76F94vaAuznAys6UmGxySTMA4GA1UdDwEB
-/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEF
-BQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNVHR8E
-MzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENB
-LmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNz
-LnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8v
-b2NzcC50Y3MudGVyZW5hLm9yZzCCAS0GA1UdEQSCASQwggEgghJsaWZlcmF5LmN0
-LmluZm4uaXSCGWFwcGxpY2F0aW9ucy5ldS1kZWNpZGUuZXWCGWFwcGxpY2F0aW9u
-cy5ldW1lZGdyaWQuZXWCEGdpbGRhLmN0LmluZm4uaXSCFGdpc2VsYS1ndy5jdC5p
-bmZuLml0gg1ndy5jdC5pbmZuLml0ghNnd2VhdGhlci5jdC5pbmZuLml0ghBnd2xp
-Yi5jdC5pbmZuLml0gh9pbmRpY2F0ZS1ndy5jb25zb3J6aW8tY29tZXRhLml0ghFy
-aWNldmkuY3QuaW5mbi5pdIIUdmlyYWxncmlkLmN0LmluZm4uaXSCFHd3dy5jaGFp
-bi1wcm9qZWN0LmV1ghZ3d3cuc3BlY2lhbC1wcm9qZWN0Lml0MA0GCSqGSIb3DQEB
-BQUAA4IBAQCEZIHNNQPD5WkGSlUhCN/BRSharmQ6dT0NiwjQNmRODCpVqBgwVZY0
-VUlAobHaF186QXeiNYge8ZYSpYY2VhBa4znL7IjFODE3FsaJNseKgsyNFqKR8xNO
-nsOCM//SN9N79hwH8yAxLhGyxbnInpOhE6rEkbhtowTjqhDq26cGGlH8JTTPuYvY
-JhgPGGkxo1286x1nuN4ELKvwZ7RF+YTH/WPOIBMNi+ee+vxrIhWbU6iy97f7k4PA
-2e35ZQ6gutnmX2v/ybFWh0ruO4zszYKiMo+zGyLvYmIpV/+Mjs26KbqqrBOS1jjN
-W3MiH8HMxzzYHExNCvzrAgN1TfB+SCiB
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ricevi.ct.infn.it/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ricevi.ct.infn.it/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ricevi.ct.infn.it/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ricevi.ct.infn.it/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ricevi.ct.infn.it/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ricevi.ct.infn.it/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ricevi.ct.infn.it/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ricevi.ct.infn.it/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ricevi.ct.infn.it/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ricevi.ct.infn.it/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ricevi.ct.infn.it/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <AttributeConsumingService index="1">
-      <ServiceName xml:lang="en">RICeVI portal</ServiceName>
-      <ServiceDescription xml:lang="en">This service provides experimental facilities for e-Learnign and e-Collaboration</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"/>
-    </AttributeConsumingService>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">INFN - the National Institute of Nuclear Physics. Catania division</OrganizationName>
-    <OrganizationName xml:lang="it">INFN - Istituto Nazionale di Fisica Nucleare. Sezione di Catania</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">INFN Catania</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="it">INFN Catania</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.ct.infn.it/en/home</OrganizationURL>
-    <OrganizationURL xml:lang="it">http://www.ct.infn.it/it/home</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Marco</GivenName>
-    <SurName>Fargetta</SurName>
-    <EmailAddress>mailto:marco.fargetta@ct.infn.it</EmailAddress>
-    <EmailAddress>mailto:credentials-admin@ct.infn.it</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Riccardo</GivenName>
-    <SurName>Rotondo</SurName>
-    <EmailAddress>mailto:riccardo.rotondo@ct.infn.it</EmailAddress>
-    <EmailAddress>mailto:credentials-admin@ct.infn.it</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="support">
-    <GivenName>Giuseppe</GivenName>
-    <SurName>Platania</SurName>
-    <EmailAddress>mailto:giuseppe.platania@ct.infn.it</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="support">
-    <GivenName>Carlo</GivenName>
-    <SurName>Rocca</SurName>
-    <EmailAddress>mailto:carlo.rocca@ct.infn.it</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="administrative">
-    <GivenName>Roberto</GivenName>
-    <SurName>Barbera</SurName>
-    <EmailAddress>mailto:roberto.barbera@ct.infn.it</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/ricevi.ct.infn.it.xml b/swamid-interfederations-2.0/ricevi.ct.infn.it.xml
deleted file mode 100644
index ea3f863f..00000000
--- a/swamid-interfederations-2.0/ricevi.ct.infn.it.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:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" entityID="https://ricevi.ct.infn.it/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2011-10-03T15:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement
-                </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>
-        <mdui:DisplayName xml:lang="en">RICeVI portal</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="it">RICeVI portal</mdui:DisplayName>
-        <mdui:Description xml:lang="en">This service provides experimental facilities for e-Learnign and e-Collaboration</mdui:Description>
-        <mdui:Description xml:lang="it">Questo servizio fornisce servizi sperimentali per l'e-Learning e l'e-Collaboration</mdui:Description>
-      </mdui:UIInfo>
-      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://ricevi.ct.infn.it/Shibboleth.sso/DS"/>
-      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://ricevi.ct.infn.it/Shibboleth.sso/DS" index="1"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIFhDCCBGygAwIBAgIRAOyXU1f6GS689kEaSDAhQPYwDQYJKoZIhvcNAQEFBQAw
-NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-IFNTTCBDQTAeFw0xNDA1MTkwMDAwMDBaFw0xNzA1MTgyMzU5NTlaMEAxITAfBgNV
-BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEbMBkGA1UEAxMSbGlmZXJheS5j
-dC5pbmZuLml0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApizyvtMI
-uoSnnz/fvk7lcXwoDUk11NVAlg5w4zh01YKNvy5SzBu0eRIzRos/ALs4CwmxrmCv
-3JQPA4xxItxVd8x9Q+YElQteEcX+mWXXW5LI5XE3xhPzkdFeQrhkinAK2JreSn6E
-TQk8YO1rOxW3qCpKeYZ2VQF3grAU/JRWbvLF+r2j4zE27n+RzBxnYeZ9rtJ/67gU
-7t1S39DRDTyKit7dJIYl50n9g3atWGALb56QoVnlR+RPRxVI9EFd2hEXfrxWXGdt
-F2v6YIMSAAM5l2/SlEmhQSSkmQ4zXcmPrzC6pte9NWoPOTsQnCnocwMJ16aXsnQy
-BxaoywMtq8NsdwIDAQABo4ICgTCCAn0wHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsr
-N1dH6pDjue0wHQYDVR0OBBYEFCy5dq76F94vaAuznAys6UmGxySTMA4GA1UdDwEB
-/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEF
-BQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNVHR8E
-MzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENB
-LmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNz
-LnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8v
-b2NzcC50Y3MudGVyZW5hLm9yZzCCAS0GA1UdEQSCASQwggEgghJsaWZlcmF5LmN0
-LmluZm4uaXSCGWFwcGxpY2F0aW9ucy5ldS1kZWNpZGUuZXWCGWFwcGxpY2F0aW9u
-cy5ldW1lZGdyaWQuZXWCEGdpbGRhLmN0LmluZm4uaXSCFGdpc2VsYS1ndy5jdC5p
-bmZuLml0gg1ndy5jdC5pbmZuLml0ghNnd2VhdGhlci5jdC5pbmZuLml0ghBnd2xp
-Yi5jdC5pbmZuLml0gh9pbmRpY2F0ZS1ndy5jb25zb3J6aW8tY29tZXRhLml0ghFy
-aWNldmkuY3QuaW5mbi5pdIIUdmlyYWxncmlkLmN0LmluZm4uaXSCFHd3dy5jaGFp
-bi1wcm9qZWN0LmV1ghZ3d3cuc3BlY2lhbC1wcm9qZWN0Lml0MA0GCSqGSIb3DQEB
-BQUAA4IBAQCEZIHNNQPD5WkGSlUhCN/BRSharmQ6dT0NiwjQNmRODCpVqBgwVZY0
-VUlAobHaF186QXeiNYge8ZYSpYY2VhBa4znL7IjFODE3FsaJNseKgsyNFqKR8xNO
-nsOCM//SN9N79hwH8yAxLhGyxbnInpOhE6rEkbhtowTjqhDq26cGGlH8JTTPuYvY
-JhgPGGkxo1286x1nuN4ELKvwZ7RF+YTH/WPOIBMNi+ee+vxrIhWbU6iy97f7k4PA
-2e35ZQ6gutnmX2v/ybFWh0ruO4zszYKiMo+zGyLvYmIpV/+Mjs26KbqqrBOS1jjN
-W3MiH8HMxzzYHExNCvzrAgN1TfB+SCiB
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ricevi.ct.infn.it/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ricevi.ct.infn.it/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ricevi.ct.infn.it/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ricevi.ct.infn.it/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ricevi.ct.infn.it/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ricevi.ct.infn.it/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ricevi.ct.infn.it/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ricevi.ct.infn.it/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ricevi.ct.infn.it/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ricevi.ct.infn.it/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ricevi.ct.infn.it/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <AttributeConsumingService index="1">
-      <ServiceName xml:lang="en">RICeVI portal</ServiceName>
-      <ServiceDescription xml:lang="en">This service provides experimental facilities for e-Learnign and e-Collaboration</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"/>
-    </AttributeConsumingService>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">INFN - the National Institute of Nuclear Physics. Catania division</OrganizationName>
-    <OrganizationName xml:lang="it">INFN - Istituto Nazionale di Fisica Nucleare. Sezione di Catania</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">INFN Catania</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="it">INFN Catania</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.ct.infn.it/en/home</OrganizationURL>
-    <OrganizationURL xml:lang="it">http://www.ct.infn.it/it/home</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Marco</GivenName>
-    <SurName>Fargetta</SurName>
-    <EmailAddress>mailto:marco.fargetta@ct.infn.it</EmailAddress>
-    <EmailAddress>mailto:credentials-admin@ct.infn.it</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Riccardo</GivenName>
-    <SurName>Rotondo</SurName>
-    <EmailAddress>mailto:riccardo.rotondo@ct.infn.it</EmailAddress>
-    <EmailAddress>mailto:credentials-admin@ct.infn.it</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="support">
-    <GivenName>Giuseppe</GivenName>
-    <SurName>Platania</SurName>
-    <EmailAddress>mailto:giuseppe.platania@ct.infn.it</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="support">
-    <GivenName>Carlo</GivenName>
-    <SurName>Rocca</SurName>
-    <EmailAddress>mailto:carlo.rocca@ct.infn.it</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="administrative">
-    <GivenName>Roberto</GivenName>
-    <SurName>Barbera</SurName>
-    <EmailAddress>mailto:roberto.barbera@ct.infn.it</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/rigal.enpc.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/rigal.enpc.fr-idp-shibboleth.xml
deleted file mode 100644
index 6f2cf774..00000000
--- a/swamid-interfederations-2.0/rigal.enpc.fr-idp-shibboleth.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://rigal.enpc.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2014-03-28T15:39:31Z">
-      <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">enpc.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">École des Ponts ParisTech</mdui:DisplayName>
-        <mdui:Description xml:lang="en">PhD and Service documentary École des Ponts ParisTech</mdui:Description>
-        <mdui:DisplayName xml:lang="fr">École des Ponts ParisTech</mdui:DisplayName>
-        <mdui:Description xml:lang="fr">Doctorants et service documentaire de l'École des Ponts ParisTech</mdui:Description>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDHzCCAgegAwIBAgIUH3f/yFgC6fTl8d177PnqB8yGBfUwDQYJKoZIhvcNAQEF
-BQAwGDEWMBQGA1UEAxMNcmlnYWwuZW5wYy5mcjAeFw0xNDAzMDMwOTIwMTFaFw0z
-NDAzMDMwOTIwMTFaMBgxFjAUBgNVBAMTDXJpZ2FsLmVucGMuZnIwggEiMA0GCSqG
-SIb3DQEBAQUAA4IBDwAwggEKAoIBAQC1gDcOz8nWvGsuFucX+6kW5jtwJMMbDRR1
-gtOCqEiJGk1rgbQEDrUi30PQP67F4qnV/AsVuZqIY17YmTgDSIg/Fu+nkS4FoK5N
-RVWn24laimwKJuCKJHGe01aTsQl1rr+W0uFd2K7R7/dn2fDCHhdtfebNHEMYcE//
-ef6yaBnkUewNpRApFj3WMJtOaQSg68DY0DYLEJZwU/d7UVKeYUiTk7J+K0wWdVX8
-arjMUB4DvKo5s3hpatBpMj5SIdTRuWe4xAZqL/q+gSUZEHuaMRTg7frHlEFNK3vE
-sNGIKqvSmIvhsTW33NUStnl48WhsLI223phM7OCi2nQsI4Es7uqRAgMBAAGjYTBf
-MD4GA1UdEQQ3MDWCDXJpZ2FsLmVucGMuZnKGJGh0dHBzOi8vcmlnYWwuZW5wYy5m
-ci9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUvu92pbXivK9Fs+FYMN/ImZAwVMIw
-DQYJKoZIhvcNAQEFBQADggEBAJaDtoqa/0UAA0ubCVxJB587RFFavytKS7WJlk5X
-BRPIWKG/bSw0NGmzwPy32o4ZKfdp7nTNjJk6qk6w0ZDDRNA9dQkMZamNyVJDMF5/
-QG0wbOzJn8UPu/6A+tB9LwGwB3nX+FbML9DdxBVli9njUoFvNh0Ni4o6U/HXvPeq
-sEO4AsyB/pRaaLnY0f8l4JWQ7FamjxTnh8qHGJoqduObD7Xbb0qXVYkrbFlL3FPM
-PMKklaZEuFwUvhZv4b4/knBsTY44PY+O1RrRrCYPq9vp9Bom1ISiib5z4NEAdqmc
-9qZF1JjPaLWtNJBI1GyC1Pu5LMuR/e/8h0w1OliDby1w3fw=
-					    </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://rigal.enpc.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://rigal.enpc.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://rigal.enpc.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">enpc.fr</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDHzCCAgegAwIBAgIUH3f/yFgC6fTl8d177PnqB8yGBfUwDQYJKoZIhvcNAQEF
-BQAwGDEWMBQGA1UEAxMNcmlnYWwuZW5wYy5mcjAeFw0xNDAzMDMwOTIwMTFaFw0z
-NDAzMDMwOTIwMTFaMBgxFjAUBgNVBAMTDXJpZ2FsLmVucGMuZnIwggEiMA0GCSqG
-SIb3DQEBAQUAA4IBDwAwggEKAoIBAQC1gDcOz8nWvGsuFucX+6kW5jtwJMMbDRR1
-gtOCqEiJGk1rgbQEDrUi30PQP67F4qnV/AsVuZqIY17YmTgDSIg/Fu+nkS4FoK5N
-RVWn24laimwKJuCKJHGe01aTsQl1rr+W0uFd2K7R7/dn2fDCHhdtfebNHEMYcE//
-ef6yaBnkUewNpRApFj3WMJtOaQSg68DY0DYLEJZwU/d7UVKeYUiTk7J+K0wWdVX8
-arjMUB4DvKo5s3hpatBpMj5SIdTRuWe4xAZqL/q+gSUZEHuaMRTg7frHlEFNK3vE
-sNGIKqvSmIvhsTW33NUStnl48WhsLI223phM7OCi2nQsI4Es7uqRAgMBAAGjYTBf
-MD4GA1UdEQQ3MDWCDXJpZ2FsLmVucGMuZnKGJGh0dHBzOi8vcmlnYWwuZW5wYy5m
-ci9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUvu92pbXivK9Fs+FYMN/ImZAwVMIw
-DQYJKoZIhvcNAQEFBQADggEBAJaDtoqa/0UAA0ubCVxJB587RFFavytKS7WJlk5X
-BRPIWKG/bSw0NGmzwPy32o4ZKfdp7nTNjJk6qk6w0ZDDRNA9dQkMZamNyVJDMF5/
-QG0wbOzJn8UPu/6A+tB9LwGwB3nX+FbML9DdxBVli9njUoFvNh0Ni4o6U/HXvPeq
-sEO4AsyB/pRaaLnY0f8l4JWQ7FamjxTnh8qHGJoqduObD7Xbb0qXVYkrbFlL3FPM
-PMKklaZEuFwUvhZv4b4/knBsTY44PY+O1RrRrCYPq9vp9Bom1ISiib5z4NEAdqmc
-9qZF1JjPaLWtNJBI1GyC1Pu5LMuR/e/8h0w1OliDby1w3fw=
-					    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://rigal.enpc.fr: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">École des Ponts ParisTech</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">École des Ponts ParisTech</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <EmailAddress>dsi-exploitation@enpc.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/rigal.enpc.fr.xml b/swamid-interfederations-2.0/rigal.enpc.fr.xml
deleted file mode 100644
index 6f2cf774..00000000
--- a/swamid-interfederations-2.0/rigal.enpc.fr.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://rigal.enpc.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2014-03-28T15:39:31Z">
-      <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">enpc.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">École des Ponts ParisTech</mdui:DisplayName>
-        <mdui:Description xml:lang="en">PhD and Service documentary École des Ponts ParisTech</mdui:Description>
-        <mdui:DisplayName xml:lang="fr">École des Ponts ParisTech</mdui:DisplayName>
-        <mdui:Description xml:lang="fr">Doctorants et service documentaire de l'École des Ponts ParisTech</mdui:Description>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDHzCCAgegAwIBAgIUH3f/yFgC6fTl8d177PnqB8yGBfUwDQYJKoZIhvcNAQEF
-BQAwGDEWMBQGA1UEAxMNcmlnYWwuZW5wYy5mcjAeFw0xNDAzMDMwOTIwMTFaFw0z
-NDAzMDMwOTIwMTFaMBgxFjAUBgNVBAMTDXJpZ2FsLmVucGMuZnIwggEiMA0GCSqG
-SIb3DQEBAQUAA4IBDwAwggEKAoIBAQC1gDcOz8nWvGsuFucX+6kW5jtwJMMbDRR1
-gtOCqEiJGk1rgbQEDrUi30PQP67F4qnV/AsVuZqIY17YmTgDSIg/Fu+nkS4FoK5N
-RVWn24laimwKJuCKJHGe01aTsQl1rr+W0uFd2K7R7/dn2fDCHhdtfebNHEMYcE//
-ef6yaBnkUewNpRApFj3WMJtOaQSg68DY0DYLEJZwU/d7UVKeYUiTk7J+K0wWdVX8
-arjMUB4DvKo5s3hpatBpMj5SIdTRuWe4xAZqL/q+gSUZEHuaMRTg7frHlEFNK3vE
-sNGIKqvSmIvhsTW33NUStnl48WhsLI223phM7OCi2nQsI4Es7uqRAgMBAAGjYTBf
-MD4GA1UdEQQ3MDWCDXJpZ2FsLmVucGMuZnKGJGh0dHBzOi8vcmlnYWwuZW5wYy5m
-ci9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUvu92pbXivK9Fs+FYMN/ImZAwVMIw
-DQYJKoZIhvcNAQEFBQADggEBAJaDtoqa/0UAA0ubCVxJB587RFFavytKS7WJlk5X
-BRPIWKG/bSw0NGmzwPy32o4ZKfdp7nTNjJk6qk6w0ZDDRNA9dQkMZamNyVJDMF5/
-QG0wbOzJn8UPu/6A+tB9LwGwB3nX+FbML9DdxBVli9njUoFvNh0Ni4o6U/HXvPeq
-sEO4AsyB/pRaaLnY0f8l4JWQ7FamjxTnh8qHGJoqduObD7Xbb0qXVYkrbFlL3FPM
-PMKklaZEuFwUvhZv4b4/knBsTY44PY+O1RrRrCYPq9vp9Bom1ISiib5z4NEAdqmc
-9qZF1JjPaLWtNJBI1GyC1Pu5LMuR/e/8h0w1OliDby1w3fw=
-					    </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://rigal.enpc.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://rigal.enpc.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://rigal.enpc.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">enpc.fr</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDHzCCAgegAwIBAgIUH3f/yFgC6fTl8d177PnqB8yGBfUwDQYJKoZIhvcNAQEF
-BQAwGDEWMBQGA1UEAxMNcmlnYWwuZW5wYy5mcjAeFw0xNDAzMDMwOTIwMTFaFw0z
-NDAzMDMwOTIwMTFaMBgxFjAUBgNVBAMTDXJpZ2FsLmVucGMuZnIwggEiMA0GCSqG
-SIb3DQEBAQUAA4IBDwAwggEKAoIBAQC1gDcOz8nWvGsuFucX+6kW5jtwJMMbDRR1
-gtOCqEiJGk1rgbQEDrUi30PQP67F4qnV/AsVuZqIY17YmTgDSIg/Fu+nkS4FoK5N
-RVWn24laimwKJuCKJHGe01aTsQl1rr+W0uFd2K7R7/dn2fDCHhdtfebNHEMYcE//
-ef6yaBnkUewNpRApFj3WMJtOaQSg68DY0DYLEJZwU/d7UVKeYUiTk7J+K0wWdVX8
-arjMUB4DvKo5s3hpatBpMj5SIdTRuWe4xAZqL/q+gSUZEHuaMRTg7frHlEFNK3vE
-sNGIKqvSmIvhsTW33NUStnl48WhsLI223phM7OCi2nQsI4Es7uqRAgMBAAGjYTBf
-MD4GA1UdEQQ3MDWCDXJpZ2FsLmVucGMuZnKGJGh0dHBzOi8vcmlnYWwuZW5wYy5m
-ci9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUvu92pbXivK9Fs+FYMN/ImZAwVMIw
-DQYJKoZIhvcNAQEFBQADggEBAJaDtoqa/0UAA0ubCVxJB587RFFavytKS7WJlk5X
-BRPIWKG/bSw0NGmzwPy32o4ZKfdp7nTNjJk6qk6w0ZDDRNA9dQkMZamNyVJDMF5/
-QG0wbOzJn8UPu/6A+tB9LwGwB3nX+FbML9DdxBVli9njUoFvNh0Ni4o6U/HXvPeq
-sEO4AsyB/pRaaLnY0f8l4JWQ7FamjxTnh8qHGJoqduObD7Xbb0qXVYkrbFlL3FPM
-PMKklaZEuFwUvhZv4b4/knBsTY44PY+O1RrRrCYPq9vp9Bom1ISiib5z4NEAdqmc
-9qZF1JjPaLWtNJBI1GyC1Pu5LMuR/e/8h0w1OliDby1w3fw=
-					    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://rigal.enpc.fr: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">École des Ponts ParisTech</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">École des Ponts ParisTech</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <EmailAddress>dsi-exploitation@enpc.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/rir.dariah.eu-shibboleth.xml b/swamid-interfederations-2.0/rir.dariah.eu-shibboleth.xml
deleted file mode 100644
index 3dc2d159..00000000
--- a/swamid-interfederations-2.0/rir.dariah.eu-shibboleth.xml
+++ /dev/null
@@ -1,105 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://rir.dariah.eu/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2014-04-11T07:20:49Z">
-      <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://rir.dariah.eu/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="de">RiR Suchportal</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">RiR Search Portal</mdui:DisplayName>
-        <mdui:Description xml:lang="de">Relationen im Raum Suchportal</mdui:Description>
-        <mdui:Description xml:lang="en">Relationen im Raum Search Portal</mdui:Description>
-        <mdui:Logo height="48" width="48">https://dev2.dariah.eu/wiki/download/attachments/11468980/RIRPUB</mdui:Logo>
-        <mdui:InformationURL xml:lang="de">https://dev2.dariah.eu/wiki/display/RIRPUB/RiR</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">https://dev2.dariah.eu/wiki/display/RIRPUB/RiR</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://de.dariah.eu/ServicePrivacyPolicy</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>rir.dariah.eu</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=rir.dariah.eu,O=Georg-August-Universitaet Goettingen,L=Goettingen,ST=Niedersachsen,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIF9jCCBN6gAwIBAgIHFzfR3+HryTANBgkqhkiG9w0BAQUFADCBrjELMAkGA1UE
-BhMCREUxFjAUBgNVBAgTDU5pZWRlcnNhY2hzZW4xEzARBgNVBAcTCkdvZXR0aW5n
-ZW4xLTArBgNVBAoTJEdlb3JnLUF1Z3VzdC1Vbml2ZXJzaXRhZXQgR29ldHRpbmdl
-bjEjMCEGA1UEAxMaVW5pdmVyc2l0YWV0LUdvZXR0aW5nZW4gQ0ExHjAcBgkqhkiG
-9w0BCQEWD2d3ZGctY2FAZ3dkZy5kZTAeFw0xNDAzMDYxMDU2MTZaFw0xOTAzMDUx
-MDU2MTZaMIGBMQswCQYDVQQGEwJERTEWMBQGA1UECBMNTmllZGVyc2FjaHNlbjET
-MBEGA1UEBxMKR29ldHRpbmdlbjEtMCsGA1UEChMkR2VvcmctQXVndXN0LVVuaXZl
-cnNpdGFldCBHb2V0dGluZ2VuMRYwFAYDVQQDEw1yaXIuZGFyaWFoLmV1MIIBIjAN
-BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAyyqlVXHDU7q2tfzvU/H9hzwLJgQ2
-zL9lU7xuTatNw6xZf/ur1KzoVobA0Pi3v5Z112fgi9fz/zbniyJSk5aH+1aWv3hF
-cR1HPscdsh3vWD9XSCon/hHtwVJqJyUFNSXeNRQglvJh/KC2mxH9rx4ipzux7uM/
-jZf8pCIHKys7BxDb7Y3mhSesPg6ZX+LeLEDCEqQilyyXp+x/+4unmE4AiFDv3o4N
-/HO9eiu+9pujU/iuF4wh/xe0AMYr0TbuUZK/kNePYuYrexhkbXRJ07215WPVUFIa
-2MJ5s0RZyKY1Swcmk8A58jzP+Tuobb2OM7025qxccHtpS5oE/9ugTX3lwwIDAQAB
-o4ICQjCCAj4wOQYDVR0gBDIwMDARBg8rBgEEAYGtIYIsAQEEAwEwEQYPKwYBBAGB
-rSGCLAIBBAMBMAgGBmeBDAECAjAJBgNVHRMEAjAAMAsGA1UdDwQEAwIE8DAdBgNV
-HSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwHQYDVR0OBBYEFPJVqHGmkxAqwrbD
-qS4U0CRl+hYCMB8GA1UdIwQYMBaAFB29c8xt7m4cdHDZoxs6uqgn3rzrMBgGA1Ud
-EQQRMA+CDXJpci5kYXJpYWguZXUwgY8GA1UdHwSBhzCBhDBAoD6gPIY6aHR0cDov
-L2NkcDEucGNhLmRmbi5kZS91bmktZ29ldHRpbmdlbi1jYS9wdWIvY3JsL2NhY3Js
-LmNybDBAoD6gPIY6aHR0cDovL2NkcDIucGNhLmRmbi5kZS91bmktZ29ldHRpbmdl
-bi1jYS9wdWIvY3JsL2NhY3JsLmNybDCB3QYIKwYBBQUHAQEEgdAwgc0wMwYIKwYB
-BQUHMAGGJ2h0dHA6Ly9vY3NwLnBjYS5kZm4uZGUvT0NTUC1TZXJ2ZXIvT0NTUDBK
-BggrBgEFBQcwAoY+aHR0cDovL2NkcDEucGNhLmRmbi5kZS91bmktZ29ldHRpbmdl
-bi1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwSgYIKwYBBQUHMAKGPmh0dHA6Ly9j
-ZHAyLnBjYS5kZm4uZGUvdW5pLWdvZXR0aW5nZW4tY2EvcHViL2NhY2VydC9jYWNl
-cnQuY3J0MA0GCSqGSIb3DQEBBQUAA4IBAQBWY1r2RQTMoizuMgCy9rtmqgMT1UzZ
-t9CgpUi0mE5n3v84kKLIU//R70xxNwiWvdjXVCyfwSYYPXnIQZsWH+m5f4xz+h/j
-Kh/j8DjAqucHpK2i8RA7QwiPNF7mesX/HzqGrUKDXXkAGXfHBxv7Nia5k/0f7Dsj
-oLD9C/n5AhDtBEBlw31Od3Lb624xDXOg4xLVn/I+egQWN0bu7ZbXLN3LFzFdNLMK
-TuWnKD0bEWbEYRR2MCx7Md1fKW7MlgMC6jFqpHlZAfb4GVWHdIW6DU/TaxM0KJ7V
-V88S++4/7Dd9Tp/NAtNfdv/hkVRV5yNyM5mIA3eYyrnr6RualuszsdzI
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://rir.dariah.eu/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://rir.dariah.eu/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://rir.dariah.eu/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://rir.dariah.eu/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://rir.dariah.eu/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://rir.dariah.eu/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://rir.dariah.eu/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://rir.dariah.eu/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://rir.dariah.eu/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://rir.dariah.eu/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <AttributeConsumingService index="1">
-      <ServiceName xml:lang="de">RiR Suchportal</ServiceName>
-      <ServiceName xml:lang="en">RiR Search Portal</ServiceName>
-      <ServiceDescription xml:lang="de">Relationen im Raum Suchportal</ServiceDescription>
-      <ServiceDescription xml:lang="en">Relationen im Raum Search Portal</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"/>
-    </AttributeConsumingService>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">e112</OrganizationName>
-    <OrganizationName xml:lang="en">e112</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">Gesellschaft für wissenschaftliche Datenverarbeitung mbH</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">Gesellschaft für wissenschaftliche Datenverarbeitung mbH</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.gwdg.de</OrganizationURL>
-    <OrganizationURL xml:lang="en">http://www.gwdg.de</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Tamim</GivenName>
-    <SurName>Ziai</SurName>
-    <EmailAddress>mailto:tamim.ziai@daasi.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="support">
-    <GivenName>Dariah</GivenName>
-    <SurName>Support</SurName>
-    <EmailAddress>mailto:register@dariah.eu</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/rir.dariah.eu.xml b/swamid-interfederations-2.0/rir.dariah.eu.xml
deleted file mode 100644
index 3dc2d159..00000000
--- a/swamid-interfederations-2.0/rir.dariah.eu.xml
+++ /dev/null
@@ -1,105 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://rir.dariah.eu/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2014-04-11T07:20:49Z">
-      <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://rir.dariah.eu/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="de">RiR Suchportal</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">RiR Search Portal</mdui:DisplayName>
-        <mdui:Description xml:lang="de">Relationen im Raum Suchportal</mdui:Description>
-        <mdui:Description xml:lang="en">Relationen im Raum Search Portal</mdui:Description>
-        <mdui:Logo height="48" width="48">https://dev2.dariah.eu/wiki/download/attachments/11468980/RIRPUB</mdui:Logo>
-        <mdui:InformationURL xml:lang="de">https://dev2.dariah.eu/wiki/display/RIRPUB/RiR</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">https://dev2.dariah.eu/wiki/display/RIRPUB/RiR</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://de.dariah.eu/ServicePrivacyPolicy</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>rir.dariah.eu</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=rir.dariah.eu,O=Georg-August-Universitaet Goettingen,L=Goettingen,ST=Niedersachsen,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIF9jCCBN6gAwIBAgIHFzfR3+HryTANBgkqhkiG9w0BAQUFADCBrjELMAkGA1UE
-BhMCREUxFjAUBgNVBAgTDU5pZWRlcnNhY2hzZW4xEzARBgNVBAcTCkdvZXR0aW5n
-ZW4xLTArBgNVBAoTJEdlb3JnLUF1Z3VzdC1Vbml2ZXJzaXRhZXQgR29ldHRpbmdl
-bjEjMCEGA1UEAxMaVW5pdmVyc2l0YWV0LUdvZXR0aW5nZW4gQ0ExHjAcBgkqhkiG
-9w0BCQEWD2d3ZGctY2FAZ3dkZy5kZTAeFw0xNDAzMDYxMDU2MTZaFw0xOTAzMDUx
-MDU2MTZaMIGBMQswCQYDVQQGEwJERTEWMBQGA1UECBMNTmllZGVyc2FjaHNlbjET
-MBEGA1UEBxMKR29ldHRpbmdlbjEtMCsGA1UEChMkR2VvcmctQXVndXN0LVVuaXZl
-cnNpdGFldCBHb2V0dGluZ2VuMRYwFAYDVQQDEw1yaXIuZGFyaWFoLmV1MIIBIjAN
-BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAyyqlVXHDU7q2tfzvU/H9hzwLJgQ2
-zL9lU7xuTatNw6xZf/ur1KzoVobA0Pi3v5Z112fgi9fz/zbniyJSk5aH+1aWv3hF
-cR1HPscdsh3vWD9XSCon/hHtwVJqJyUFNSXeNRQglvJh/KC2mxH9rx4ipzux7uM/
-jZf8pCIHKys7BxDb7Y3mhSesPg6ZX+LeLEDCEqQilyyXp+x/+4unmE4AiFDv3o4N
-/HO9eiu+9pujU/iuF4wh/xe0AMYr0TbuUZK/kNePYuYrexhkbXRJ07215WPVUFIa
-2MJ5s0RZyKY1Swcmk8A58jzP+Tuobb2OM7025qxccHtpS5oE/9ugTX3lwwIDAQAB
-o4ICQjCCAj4wOQYDVR0gBDIwMDARBg8rBgEEAYGtIYIsAQEEAwEwEQYPKwYBBAGB
-rSGCLAIBBAMBMAgGBmeBDAECAjAJBgNVHRMEAjAAMAsGA1UdDwQEAwIE8DAdBgNV
-HSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwHQYDVR0OBBYEFPJVqHGmkxAqwrbD
-qS4U0CRl+hYCMB8GA1UdIwQYMBaAFB29c8xt7m4cdHDZoxs6uqgn3rzrMBgGA1Ud
-EQQRMA+CDXJpci5kYXJpYWguZXUwgY8GA1UdHwSBhzCBhDBAoD6gPIY6aHR0cDov
-L2NkcDEucGNhLmRmbi5kZS91bmktZ29ldHRpbmdlbi1jYS9wdWIvY3JsL2NhY3Js
-LmNybDBAoD6gPIY6aHR0cDovL2NkcDIucGNhLmRmbi5kZS91bmktZ29ldHRpbmdl
-bi1jYS9wdWIvY3JsL2NhY3JsLmNybDCB3QYIKwYBBQUHAQEEgdAwgc0wMwYIKwYB
-BQUHMAGGJ2h0dHA6Ly9vY3NwLnBjYS5kZm4uZGUvT0NTUC1TZXJ2ZXIvT0NTUDBK
-BggrBgEFBQcwAoY+aHR0cDovL2NkcDEucGNhLmRmbi5kZS91bmktZ29ldHRpbmdl
-bi1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwSgYIKwYBBQUHMAKGPmh0dHA6Ly9j
-ZHAyLnBjYS5kZm4uZGUvdW5pLWdvZXR0aW5nZW4tY2EvcHViL2NhY2VydC9jYWNl
-cnQuY3J0MA0GCSqGSIb3DQEBBQUAA4IBAQBWY1r2RQTMoizuMgCy9rtmqgMT1UzZ
-t9CgpUi0mE5n3v84kKLIU//R70xxNwiWvdjXVCyfwSYYPXnIQZsWH+m5f4xz+h/j
-Kh/j8DjAqucHpK2i8RA7QwiPNF7mesX/HzqGrUKDXXkAGXfHBxv7Nia5k/0f7Dsj
-oLD9C/n5AhDtBEBlw31Od3Lb624xDXOg4xLVn/I+egQWN0bu7ZbXLN3LFzFdNLMK
-TuWnKD0bEWbEYRR2MCx7Md1fKW7MlgMC6jFqpHlZAfb4GVWHdIW6DU/TaxM0KJ7V
-V88S++4/7Dd9Tp/NAtNfdv/hkVRV5yNyM5mIA3eYyrnr6RualuszsdzI
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://rir.dariah.eu/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://rir.dariah.eu/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://rir.dariah.eu/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://rir.dariah.eu/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://rir.dariah.eu/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://rir.dariah.eu/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://rir.dariah.eu/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://rir.dariah.eu/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://rir.dariah.eu/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://rir.dariah.eu/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <AttributeConsumingService index="1">
-      <ServiceName xml:lang="de">RiR Suchportal</ServiceName>
-      <ServiceName xml:lang="en">RiR Search Portal</ServiceName>
-      <ServiceDescription xml:lang="de">Relationen im Raum Suchportal</ServiceDescription>
-      <ServiceDescription xml:lang="en">Relationen im Raum Search Portal</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"/>
-    </AttributeConsumingService>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">e112</OrganizationName>
-    <OrganizationName xml:lang="en">e112</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">Gesellschaft für wissenschaftliche Datenverarbeitung mbH</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">Gesellschaft für wissenschaftliche Datenverarbeitung mbH</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.gwdg.de</OrganizationURL>
-    <OrganizationURL xml:lang="en">http://www.gwdg.de</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Tamim</GivenName>
-    <SurName>Ziai</SurName>
-    <EmailAddress>mailto:tamim.ziai@daasi.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="support">
-    <GivenName>Dariah</GivenName>
-    <SurName>Support</SurName>
-    <EmailAddress>mailto:register@dariah.eu</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/rja-idp.lanet.lv.xml b/swamid-interfederations-2.0/rja-idp.lanet.lv.xml
deleted file mode 100644
index ce9da665..00000000
--- a/swamid-interfederations-2.0/rja-idp.lanet.lv.xml
+++ /dev/null
@@ -1,41 +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://rja-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/" registrationInstant="2013-10-10T10:10:10Z">
-      <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>
-MIIDhjCCAm4CCQC8Px9pbIuxGDANBgkqhkiG9w0BAQUFADCBhDELMAkGA1UEBhMCTFYxDTALBgNVBAgMBFJpZ2ExDTALBgNVBAcMBFJpZ2ExCzAJBgNVBAoMAkxVMQwwCgYDVQQLDANJVEQxFTATBgNVBAMMDGx1LWlkcC5sdS5sdjElMCMGCSqGSIb3DQEJARYWaXRzZXJ2aXNzIGF0IGx1IGRvdCBsdjAeFw0xMzEyMjAxMDU3MDJaFw0yOTAzMDYxMDU3MDJaMIGEMQswCQYDVQQGEwJMVjENMAsGA1UECAwEUmlnYTENMAsGA1UEBwwEUmlnYTELMAkGA1UECgwCTFUxDDAKBgNVBAsMA0lURDEVMBMGA1UEAwwMbHUtaWRwLmx1Lmx2MSUwIwYJKoZIhvcNAQkBFhZpdHNlcnZpc3MgYXQgbHUgZG90IGx2MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuAy8ri5VknGxy21iuW6kalPwg7VPZBWOuV/jVjRre44tHFd5FinCQUCuzQZn37AU3ZNZg07RRyDhkAzzpsBRQf48VcbnQFRjERuQTKUfT9hzFMxgbjxW2Dayg2Ru2LkGcIUeHilOwfmRn1NIRBN+0UyJIluRvB8YGdHSSHYSMimyw9uYEuMkU9aqewwW78w7TeasCWlB6jiGfJ/SGVtPRThJ6X6KVqoU2gwIY+V7YJkG4b5TOw4HLaIsdOmU4h1Ep3igy+Zsc/7zPn+80iwm1Jk9Q8zGlEwikjPn1N3enMOxR8wpQfAQwm5lIaHNXYFcXCj3mVQ3yQ9EzB/hRC8tHwIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQCFRpI7U/lTwoUW/HwDb2gAmjb0RSmS+5lUWDgmjP/rJwYdh672plabNcY12DiqchtBaSeTOf4qANCqEme+YBAmssFUeLx6O1J+5aXeXfCwAA9GlswGDVeC8ZnTVmQupnbvL0T+ZU8WtkltlLEJdD6o9BtEOqk3+Rspu+94d6FUwmvWB/YWypAOfzXkkSxi+87nsadiFEOyCzTW8fZotOrZMzba52ELLJgCx3IzGLUzV80PSJwLzKYHVp0VluH2DzrxfMKC01bMklG46n1nhEo1UU2KA4vzoScmrXzD+m7nKFZ3GHFjyQvtxqG7gA34qg1Vj2o2O0vN/kvjX73SR5s4
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDhjCCAm4CCQC8Px9pbIuxGDANBgkqhkiG9w0BAQUFADCBhDELMAkGA1UEBhMCTFYxDTALBgNVBAgMBFJpZ2ExDTALBgNVBAcMBFJpZ2ExCzAJBgNVBAoMAkxVMQwwCgYDVQQLDANJVEQxFTATBgNVBAMMDGx1LWlkcC5sdS5sdjElMCMGCSqGSIb3DQEJARYWaXRzZXJ2aXNzIGF0IGx1IGRvdCBsdjAeFw0xMzEyMjAxMDU3MDJaFw0yOTAzMDYxMDU3MDJaMIGEMQswCQYDVQQGEwJMVjENMAsGA1UECAwEUmlnYTENMAsGA1UEBwwEUmlnYTELMAkGA1UECgwCTFUxDDAKBgNVBAsMA0lURDEVMBMGA1UEAwwMbHUtaWRwLmx1Lmx2MSUwIwYJKoZIhvcNAQkBFhZpdHNlcnZpc3MgYXQgbHUgZG90IGx2MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuAy8ri5VknGxy21iuW6kalPwg7VPZBWOuV/jVjRre44tHFd5FinCQUCuzQZn37AU3ZNZg07RRyDhkAzzpsBRQf48VcbnQFRjERuQTKUfT9hzFMxgbjxW2Dayg2Ru2LkGcIUeHilOwfmRn1NIRBN+0UyJIluRvB8YGdHSSHYSMimyw9uYEuMkU9aqewwW78w7TeasCWlB6jiGfJ/SGVtPRThJ6X6KVqoU2gwIY+V7YJkG4b5TOw4HLaIsdOmU4h1Ep3igy+Zsc/7zPn+80iwm1Jk9Q8zGlEwikjPn1N3enMOxR8wpQfAQwm5lIaHNXYFcXCj3mVQ3yQ9EzB/hRC8tHwIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQCFRpI7U/lTwoUW/HwDb2gAmjb0RSmS+5lUWDgmjP/rJwYdh672plabNcY12DiqchtBaSeTOf4qANCqEme+YBAmssFUeLx6O1J+5aXeXfCwAA9GlswGDVeC8ZnTVmQupnbvL0T+ZU8WtkltlLEJdD6o9BtEOqk3+Rspu+94d6FUwmvWB/YWypAOfzXkkSxi+87nsadiFEOyCzTW8fZotOrZMzba52ELLJgCx3IzGLUzV80PSJwLzKYHVp0VluH2DzrxfMKC01bMklG46n1nhEo1UU2KA4vzoScmrXzD+m7nKFZ3GHFjyQvtxqG7gA34qg1Vj2o2O0vN/kvjX73SR5s4
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://rja-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://rja-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 - RJA</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Riga Graduate School of Law - RJA IDP</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://laife.lanet.lv/</OrganizationURL>
-    <OrganizationURL xml:lang="lv">http://www.rgsl.edu.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/rnp-cafe.ifs.edu.br-idp-shibboleth.xml b/swamid-interfederations-2.0/rnp-cafe.ifs.edu.br-idp-shibboleth.xml
deleted file mode 100644
index a2584668..00000000
--- a/swamid-interfederations-2.0/rnp-cafe.ifs.edu.br-idp-shibboleth.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://rnp-cafe.ifs.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">edu.br</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">IFS - Instituto Federal Sergipe</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="pt-br">IFS - Instituto Federal Sergipe</mdui:DisplayName>
-        <mdui:Description xml:lang="en">IFS - Instituto Federal Sergipe</mdui:Description>
-        <mdui:Description xml:lang="pt-br">IFS - Instituto Federal Sergipe</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.ifs.edu.br</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="pt-br">http://www.ifs.edu.br</mdui:InformationURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-    MIIDyjCCArICAQAwDQYJKoZIhvcNAQEFBQAwgaoxKDAmBgNVBAoTH0lGUyAtIElu
-c3RpdHV0byBGZWRlcmFsIFNlcmdpcGUxDjAMBgNVBAsTBUNPSU1SMR8wHQYJKoZI
-hvcNAQkBFhBjb2ltckBpZnMuZWR1LmJyMRAwDgYDVQQHEwdBcmFjYWp1MRAwDgYD
-VQQIEwdTZXJnaXBlMQswCQYDVQQGEwJCUjEcMBoGA1UEAxMTcm5wLWNhZmUuaWZz
-LmVkdS5icjAeFw0xNDAxMzExMzM5MDFaFw0xNzAxMzAxMzM5MDFaMIGqMSgwJgYD
-VQQKEx9JRlMgLSBJbnN0aXR1dG8gRmVkZXJhbCBTZXJnaXBlMQ4wDAYDVQQLEwVD
-T0lNUjEfMB0GCSqGSIb3DQEJARYQY29pbXJAaWZzLmVkdS5icjEQMA4GA1UEBxMH
-QXJhY2FqdTEQMA4GA1UECBMHU2VyZ2lwZTELMAkGA1UEBhMCQlIxHDAaBgNVBAMT
-E3JucC1jYWZlLmlmcy5lZHUuYnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
-AoIBAQDCM5DpvNNnNY/sEgNPlwTqln/1ErY5NIUFJpd8Z8nhF/Ycg2PHgyaRS5QG
-zg/ytuSPgQwNsqQrBDPVYTM2mPN4bqy3JCMsQ/wurwGY33HQihsq7gsys6sIS3E9
-OeGP2PVEFAAOGBK8/7re/MNkk3zWxVrGHz+jWHUj/XVuz5bEOq/LNmUYgdCKA4EF
-8Fmi22aL522xCT3Fox8ReTq817YxTq+5XLsQEAnOzwIIvOAmRjNZD33lcASWzSJp
-2YMsVKeFpHslgJJUT6a5lbgwH1VOX8VQRYSDGayNfBh63AphlRPbRJRcLG6bQmbx
-D/hfNk2K0FKD9IWxVIJ4O+jxTatlAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBAC4G
-grZK2At9gtsq9XUPYVvIHCKFoROkJfU3VwT+9O0uWz5cu2ycPgjefCTp6zfTjiX7
-G6uGvuJcO/lteK9M6mSS1ti0G2g1IuzQo+6IOYVJgEkwgF1BPLrVAnmAca9WKWhI
-6GgCqbRx1MktZRAEdHiH5//UEkjxqcTUgLV4JZYpVOVkGnz5TakajKoLb3bAvrhH
-0OXmdk6/gaF9jp1ypII8Yfm1PBlhBGXj9tK0AT+6DnMyHDqFxdNw0dAKudol3jep
-3niJmc8qhqspMxB7iVGGiIRp3ybPl+GVo6NPWPhZ30dTjKkbttHoy5iuVQo2n/Jr
-DZqccZQCmzfE8nJworc=
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://rnp-cafe.ifs.edu.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://rnp-cafe.ifs.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://rnp-cafe.ifs.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://rnp-cafe.ifs.edu.br/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://rnp-cafe.ifs.edu.br/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://rnp-cafe.ifs.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>
-      
-MIIDyjCCArICAQAwDQYJKoZIhvcNAQEFBQAwgaoxKDAmBgNVBAoTH0lGUyAtIElu
-c3RpdHV0byBGZWRlcmFsIFNlcmdpcGUxDjAMBgNVBAsTBUNPSU1SMR8wHQYJKoZI
-hvcNAQkBFhBjb2ltckBpZnMuZWR1LmJyMRAwDgYDVQQHEwdBcmFjYWp1MRAwDgYD
-VQQIEwdTZXJnaXBlMQswCQYDVQQGEwJCUjEcMBoGA1UEAxMTcm5wLWNhZmUuaWZz
-LmVkdS5icjAeFw0xNDAxMzExMzM5MDFaFw0xNzAxMzAxMzM5MDFaMIGqMSgwJgYD
-VQQKEx9JRlMgLSBJbnN0aXR1dG8gRmVkZXJhbCBTZXJnaXBlMQ4wDAYDVQQLEwVD
-T0lNUjEfMB0GCSqGSIb3DQEJARYQY29pbXJAaWZzLmVkdS5icjEQMA4GA1UEBxMH
-QXJhY2FqdTEQMA4GA1UECBMHU2VyZ2lwZTELMAkGA1UEBhMCQlIxHDAaBgNVBAMT
-E3JucC1jYWZlLmlmcy5lZHUuYnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
-AoIBAQDCM5DpvNNnNY/sEgNPlwTqln/1ErY5NIUFJpd8Z8nhF/Ycg2PHgyaRS5QG
-zg/ytuSPgQwNsqQrBDPVYTM2mPN4bqy3JCMsQ/wurwGY33HQihsq7gsys6sIS3E9
-OeGP2PVEFAAOGBK8/7re/MNkk3zWxVrGHz+jWHUj/XVuz5bEOq/LNmUYgdCKA4EF
-8Fmi22aL522xCT3Fox8ReTq817YxTq+5XLsQEAnOzwIIvOAmRjNZD33lcASWzSJp
-2YMsVKeFpHslgJJUT6a5lbgwH1VOX8VQRYSDGayNfBh63AphlRPbRJRcLG6bQmbx
-D/hfNk2K0FKD9IWxVIJ4O+jxTatlAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBAC4G
-grZK2At9gtsq9XUPYVvIHCKFoROkJfU3VwT+9O0uWz5cu2ycPgjefCTp6zfTjiX7
-G6uGvuJcO/lteK9M6mSS1ti0G2g1IuzQo+6IOYVJgEkwgF1BPLrVAnmAca9WKWhI
-6GgCqbRx1MktZRAEdHiH5//UEkjxqcTUgLV4JZYpVOVkGnz5TakajKoLb3bAvrhH
-0OXmdk6/gaF9jp1ypII8Yfm1PBlhBGXj9tK0AT+6DnMyHDqFxdNw0dAKudol3jep
-3niJmc8qhqspMxB7iVGGiIRp3ybPl+GVo6NPWPhZ30dTjKkbttHoy5iuVQo2n/Jr
-DZqccZQCmzfE8nJworc=
-                    
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://rnp-cafe.ifs.edu.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://rnp-cafe.ifs.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">IFS - Instituto Federal Sergipe</OrganizationName>
-    <OrganizationName xml:lang="pt-br">IFS - Instituto Federal Sergipe</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">IFS - Instituto Federal Sergipe</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="pt-br">IFS - Instituto Federal Sergipe</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.ifs.edu.br</OrganizationURL>
-    <OrganizationURL xml:lang="pt-br">http://www.ifs.edu.br</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Joao Silvio</SurName>
-    <EmailAddress>coimr@ifs.edu.br</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/rnp-cafe.ifs.edu.br.xml b/swamid-interfederations-2.0/rnp-cafe.ifs.edu.br.xml
deleted file mode 100644
index a2584668..00000000
--- a/swamid-interfederations-2.0/rnp-cafe.ifs.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://rnp-cafe.ifs.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">edu.br</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">IFS - Instituto Federal Sergipe</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="pt-br">IFS - Instituto Federal Sergipe</mdui:DisplayName>
-        <mdui:Description xml:lang="en">IFS - Instituto Federal Sergipe</mdui:Description>
-        <mdui:Description xml:lang="pt-br">IFS - Instituto Federal Sergipe</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.ifs.edu.br</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="pt-br">http://www.ifs.edu.br</mdui:InformationURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-    MIIDyjCCArICAQAwDQYJKoZIhvcNAQEFBQAwgaoxKDAmBgNVBAoTH0lGUyAtIElu
-c3RpdHV0byBGZWRlcmFsIFNlcmdpcGUxDjAMBgNVBAsTBUNPSU1SMR8wHQYJKoZI
-hvcNAQkBFhBjb2ltckBpZnMuZWR1LmJyMRAwDgYDVQQHEwdBcmFjYWp1MRAwDgYD
-VQQIEwdTZXJnaXBlMQswCQYDVQQGEwJCUjEcMBoGA1UEAxMTcm5wLWNhZmUuaWZz
-LmVkdS5icjAeFw0xNDAxMzExMzM5MDFaFw0xNzAxMzAxMzM5MDFaMIGqMSgwJgYD
-VQQKEx9JRlMgLSBJbnN0aXR1dG8gRmVkZXJhbCBTZXJnaXBlMQ4wDAYDVQQLEwVD
-T0lNUjEfMB0GCSqGSIb3DQEJARYQY29pbXJAaWZzLmVkdS5icjEQMA4GA1UEBxMH
-QXJhY2FqdTEQMA4GA1UECBMHU2VyZ2lwZTELMAkGA1UEBhMCQlIxHDAaBgNVBAMT
-E3JucC1jYWZlLmlmcy5lZHUuYnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
-AoIBAQDCM5DpvNNnNY/sEgNPlwTqln/1ErY5NIUFJpd8Z8nhF/Ycg2PHgyaRS5QG
-zg/ytuSPgQwNsqQrBDPVYTM2mPN4bqy3JCMsQ/wurwGY33HQihsq7gsys6sIS3E9
-OeGP2PVEFAAOGBK8/7re/MNkk3zWxVrGHz+jWHUj/XVuz5bEOq/LNmUYgdCKA4EF
-8Fmi22aL522xCT3Fox8ReTq817YxTq+5XLsQEAnOzwIIvOAmRjNZD33lcASWzSJp
-2YMsVKeFpHslgJJUT6a5lbgwH1VOX8VQRYSDGayNfBh63AphlRPbRJRcLG6bQmbx
-D/hfNk2K0FKD9IWxVIJ4O+jxTatlAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBAC4G
-grZK2At9gtsq9XUPYVvIHCKFoROkJfU3VwT+9O0uWz5cu2ycPgjefCTp6zfTjiX7
-G6uGvuJcO/lteK9M6mSS1ti0G2g1IuzQo+6IOYVJgEkwgF1BPLrVAnmAca9WKWhI
-6GgCqbRx1MktZRAEdHiH5//UEkjxqcTUgLV4JZYpVOVkGnz5TakajKoLb3bAvrhH
-0OXmdk6/gaF9jp1ypII8Yfm1PBlhBGXj9tK0AT+6DnMyHDqFxdNw0dAKudol3jep
-3niJmc8qhqspMxB7iVGGiIRp3ybPl+GVo6NPWPhZ30dTjKkbttHoy5iuVQo2n/Jr
-DZqccZQCmzfE8nJworc=
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://rnp-cafe.ifs.edu.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://rnp-cafe.ifs.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://rnp-cafe.ifs.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://rnp-cafe.ifs.edu.br/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://rnp-cafe.ifs.edu.br/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://rnp-cafe.ifs.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>
-      
-MIIDyjCCArICAQAwDQYJKoZIhvcNAQEFBQAwgaoxKDAmBgNVBAoTH0lGUyAtIElu
-c3RpdHV0byBGZWRlcmFsIFNlcmdpcGUxDjAMBgNVBAsTBUNPSU1SMR8wHQYJKoZI
-hvcNAQkBFhBjb2ltckBpZnMuZWR1LmJyMRAwDgYDVQQHEwdBcmFjYWp1MRAwDgYD
-VQQIEwdTZXJnaXBlMQswCQYDVQQGEwJCUjEcMBoGA1UEAxMTcm5wLWNhZmUuaWZz
-LmVkdS5icjAeFw0xNDAxMzExMzM5MDFaFw0xNzAxMzAxMzM5MDFaMIGqMSgwJgYD
-VQQKEx9JRlMgLSBJbnN0aXR1dG8gRmVkZXJhbCBTZXJnaXBlMQ4wDAYDVQQLEwVD
-T0lNUjEfMB0GCSqGSIb3DQEJARYQY29pbXJAaWZzLmVkdS5icjEQMA4GA1UEBxMH
-QXJhY2FqdTEQMA4GA1UECBMHU2VyZ2lwZTELMAkGA1UEBhMCQlIxHDAaBgNVBAMT
-E3JucC1jYWZlLmlmcy5lZHUuYnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
-AoIBAQDCM5DpvNNnNY/sEgNPlwTqln/1ErY5NIUFJpd8Z8nhF/Ycg2PHgyaRS5QG
-zg/ytuSPgQwNsqQrBDPVYTM2mPN4bqy3JCMsQ/wurwGY33HQihsq7gsys6sIS3E9
-OeGP2PVEFAAOGBK8/7re/MNkk3zWxVrGHz+jWHUj/XVuz5bEOq/LNmUYgdCKA4EF
-8Fmi22aL522xCT3Fox8ReTq817YxTq+5XLsQEAnOzwIIvOAmRjNZD33lcASWzSJp
-2YMsVKeFpHslgJJUT6a5lbgwH1VOX8VQRYSDGayNfBh63AphlRPbRJRcLG6bQmbx
-D/hfNk2K0FKD9IWxVIJ4O+jxTatlAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBAC4G
-grZK2At9gtsq9XUPYVvIHCKFoROkJfU3VwT+9O0uWz5cu2ycPgjefCTp6zfTjiX7
-G6uGvuJcO/lteK9M6mSS1ti0G2g1IuzQo+6IOYVJgEkwgF1BPLrVAnmAca9WKWhI
-6GgCqbRx1MktZRAEdHiH5//UEkjxqcTUgLV4JZYpVOVkGnz5TakajKoLb3bAvrhH
-0OXmdk6/gaF9jp1ypII8Yfm1PBlhBGXj9tK0AT+6DnMyHDqFxdNw0dAKudol3jep
-3niJmc8qhqspMxB7iVGGiIRp3ybPl+GVo6NPWPhZ30dTjKkbttHoy5iuVQo2n/Jr
-DZqccZQCmzfE8nJworc=
-                    
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://rnp-cafe.ifs.edu.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://rnp-cafe.ifs.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">IFS - Instituto Federal Sergipe</OrganizationName>
-    <OrganizationName xml:lang="pt-br">IFS - Instituto Federal Sergipe</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">IFS - Instituto Federal Sergipe</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="pt-br">IFS - Instituto Federal Sergipe</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.ifs.edu.br</OrganizationURL>
-    <OrganizationURL xml:lang="pt-br">http://www.ifs.edu.br</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Joao Silvio</SurName>
-    <EmailAddress>coimr@ifs.edu.br</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/ross.impa.br-idp-shibboleth.xml b/swamid-interfederations-2.0/ross.impa.br-idp-shibboleth.xml
deleted file mode 100644
index 9028b7af..00000000
--- a/swamid-interfederations-2.0/ross.impa.br-idp-shibboleth.xml
+++ /dev/null
@@ -1,108 +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://ross.impa.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">impa.br</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">IMPA - Associac Instituto Nacional de Matemaca Pura e Aplicada</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="pt-br">IMPA - Associac Instituto Nacional de Matemaca Pura e Aplicada</mdui:DisplayName>
-        <mdui:Description xml:lang="en">IMPA - Associac Instituto Nacional de Matemaca Pura e Aplicada</mdui:Description>
-        <mdui:Description xml:lang="pt-br">IMPA - Associac Instituto Nacional de Matemaca Pura e Aplicada</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.impa.br/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="pt-br">http://www.impa.br/</mdui:InformationURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-    MIIDijCCAnICAQAwDQYJKoZIhvcNAQEFBQAwgYoxDTALBgNVBAoTBElNUEExDDAK
-BgNVBAsTA0NJTjEdMBsGCSqGSIb3DQEJARYObmV0YWRtQGltcGEuYnIxFzAVBgNV
-BAcTDlJpbyBkZSBKYW5laXJvMRcwFQYDVQQIEw5SaW8gZGUgSmFuZWlybzELMAkG
-A1UEBhMCQlIxDTALBgNVBAMTBHJvc3MwHhcNMTQwOTMwMTg0MjE1WhcNMTcwOTI5
-MTg0MjE1WjCBijENMAsGA1UEChMESU1QQTEMMAoGA1UECxMDQ0lOMR0wGwYJKoZI
-hvcNAQkBFg5uZXRhZG1AaW1wYS5icjEXMBUGA1UEBxMOUmlvIGRlIEphbmVpcm8x
-FzAVBgNVBAgTDlJpbyBkZSBKYW5laXJvMQswCQYDVQQGEwJCUjENMAsGA1UEAxME
-cm9zczCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALZqzra9igATlWYM
-nWpR0mCkXBwbB1mMRmr7vJF9A9ZfKeF4ztOmG+6YRmCLZk8rbd+mhp4bPJ504hL5
-rSjixTm2IXf9XJHcFIQKZLkq77ZquBcdeYKGjkkRqlyFv4YdptJEgViamXqyL9Oj
-U3lbO5I7QLL5l255KUdsiYRxlAAdXJGv+7tglOXkcSf3c7+M3bgM151LruzoHRqM
-x8i5m5PL0Ve8hvUvPiuaPUxKEDRzqgxTCcyeoFTbgXV/P6vt+/LaNNFQia8mrmVV
-2w0LwoLF1NkFbbrSfFuxiMpPCV7voI0F8BLAjHZgZYCgj+e490QfdUCUscVR5xZc
-SssOYGUCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAQYIyUBaYYa+BI7KF3xLb2C6K
-J4PY4GkCxtWEYnaBZYRSsef85OgMT7r1F4finTBY3KfoCOt5Yti5TIkXtwxvoCTN
-nF68zBR55rLFO67LJWJ+B/aAazptn17X53wky+x7pdKASE54GcWhTxW9QEWVLaWD
-xu2Y7bPNIthUtiW9wmbWB+4fY4LhTVhcuh+/4xaFx/MVoTRhf2tFS6hBFeaUcsWT
-m/XJf5kBpLpV1G983akqJtH2D2IMJckYSQ67tUwWVpdXq3B1b8fwpnsl9H075UAD
-qwTl09UClG9hVUE5fDKSwyKE6DCq8Whg3Zb1EdVjTOncky3d7DkzttgD8YDqmA==
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ross.impa.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://ross.impa.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://ross.impa.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ross.impa.br/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://ross.impa.br/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ross.impa.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">impa.br</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-      
-MIIDijCCAnICAQAwDQYJKoZIhvcNAQEFBQAwgYoxDTALBgNVBAoTBElNUEExDDAK
-BgNVBAsTA0NJTjEdMBsGCSqGSIb3DQEJARYObmV0YWRtQGltcGEuYnIxFzAVBgNV
-BAcTDlJpbyBkZSBKYW5laXJvMRcwFQYDVQQIEw5SaW8gZGUgSmFuZWlybzELMAkG
-A1UEBhMCQlIxDTALBgNVBAMTBHJvc3MwHhcNMTQwOTMwMTg0MjE1WhcNMTcwOTI5
-MTg0MjE1WjCBijENMAsGA1UEChMESU1QQTEMMAoGA1UECxMDQ0lOMR0wGwYJKoZI
-hvcNAQkBFg5uZXRhZG1AaW1wYS5icjEXMBUGA1UEBxMOUmlvIGRlIEphbmVpcm8x
-FzAVBgNVBAgTDlJpbyBkZSBKYW5laXJvMQswCQYDVQQGEwJCUjENMAsGA1UEAxME
-cm9zczCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALZqzra9igATlWYM
-nWpR0mCkXBwbB1mMRmr7vJF9A9ZfKeF4ztOmG+6YRmCLZk8rbd+mhp4bPJ504hL5
-rSjixTm2IXf9XJHcFIQKZLkq77ZquBcdeYKGjkkRqlyFv4YdptJEgViamXqyL9Oj
-U3lbO5I7QLL5l255KUdsiYRxlAAdXJGv+7tglOXkcSf3c7+M3bgM151LruzoHRqM
-x8i5m5PL0Ve8hvUvPiuaPUxKEDRzqgxTCcyeoFTbgXV/P6vt+/LaNNFQia8mrmVV
-2w0LwoLF1NkFbbrSfFuxiMpPCV7voI0F8BLAjHZgZYCgj+e490QfdUCUscVR5xZc
-SssOYGUCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAQYIyUBaYYa+BI7KF3xLb2C6K
-J4PY4GkCxtWEYnaBZYRSsef85OgMT7r1F4finTBY3KfoCOt5Yti5TIkXtwxvoCTN
-nF68zBR55rLFO67LJWJ+B/aAazptn17X53wky+x7pdKASE54GcWhTxW9QEWVLaWD
-xu2Y7bPNIthUtiW9wmbWB+4fY4LhTVhcuh+/4xaFx/MVoTRhf2tFS6hBFeaUcsWT
-m/XJf5kBpLpV1G983akqJtH2D2IMJckYSQ67tUwWVpdXq3B1b8fwpnsl9H075UAD
-qwTl09UClG9hVUE5fDKSwyKE6DCq8Whg3Zb1EdVjTOncky3d7DkzttgD8YDqmA==
-                    
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ross.impa.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://ross.impa.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">IMPA - Associac Instituto Nacional de Matemaca Pura e Aplicada</OrganizationName>
-    <OrganizationName xml:lang="pt-br">IMPA - Associac Instituto Nacional de Matemaca Pura e Aplicada</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">IMPA - Associac Instituto Nacional de Matemaca Pura e Aplicada</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="pt-br">IMPA - Associac Instituto Nacional de Matemaca Pura e Aplicada</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.impa.br/</OrganizationURL>
-    <OrganizationURL xml:lang="pt-br">http://www.impa.br/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Ricardo Gomes</SurName>
-    <EmailAddress>netadm@impa.br</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/ross.impa.br.xml b/swamid-interfederations-2.0/ross.impa.br.xml
deleted file mode 100644
index 9028b7af..00000000
--- a/swamid-interfederations-2.0/ross.impa.br.xml
+++ /dev/null
@@ -1,108 +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://ross.impa.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">impa.br</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">IMPA - Associac Instituto Nacional de Matemaca Pura e Aplicada</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="pt-br">IMPA - Associac Instituto Nacional de Matemaca Pura e Aplicada</mdui:DisplayName>
-        <mdui:Description xml:lang="en">IMPA - Associac Instituto Nacional de Matemaca Pura e Aplicada</mdui:Description>
-        <mdui:Description xml:lang="pt-br">IMPA - Associac Instituto Nacional de Matemaca Pura e Aplicada</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.impa.br/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="pt-br">http://www.impa.br/</mdui:InformationURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-    MIIDijCCAnICAQAwDQYJKoZIhvcNAQEFBQAwgYoxDTALBgNVBAoTBElNUEExDDAK
-BgNVBAsTA0NJTjEdMBsGCSqGSIb3DQEJARYObmV0YWRtQGltcGEuYnIxFzAVBgNV
-BAcTDlJpbyBkZSBKYW5laXJvMRcwFQYDVQQIEw5SaW8gZGUgSmFuZWlybzELMAkG
-A1UEBhMCQlIxDTALBgNVBAMTBHJvc3MwHhcNMTQwOTMwMTg0MjE1WhcNMTcwOTI5
-MTg0MjE1WjCBijENMAsGA1UEChMESU1QQTEMMAoGA1UECxMDQ0lOMR0wGwYJKoZI
-hvcNAQkBFg5uZXRhZG1AaW1wYS5icjEXMBUGA1UEBxMOUmlvIGRlIEphbmVpcm8x
-FzAVBgNVBAgTDlJpbyBkZSBKYW5laXJvMQswCQYDVQQGEwJCUjENMAsGA1UEAxME
-cm9zczCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALZqzra9igATlWYM
-nWpR0mCkXBwbB1mMRmr7vJF9A9ZfKeF4ztOmG+6YRmCLZk8rbd+mhp4bPJ504hL5
-rSjixTm2IXf9XJHcFIQKZLkq77ZquBcdeYKGjkkRqlyFv4YdptJEgViamXqyL9Oj
-U3lbO5I7QLL5l255KUdsiYRxlAAdXJGv+7tglOXkcSf3c7+M3bgM151LruzoHRqM
-x8i5m5PL0Ve8hvUvPiuaPUxKEDRzqgxTCcyeoFTbgXV/P6vt+/LaNNFQia8mrmVV
-2w0LwoLF1NkFbbrSfFuxiMpPCV7voI0F8BLAjHZgZYCgj+e490QfdUCUscVR5xZc
-SssOYGUCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAQYIyUBaYYa+BI7KF3xLb2C6K
-J4PY4GkCxtWEYnaBZYRSsef85OgMT7r1F4finTBY3KfoCOt5Yti5TIkXtwxvoCTN
-nF68zBR55rLFO67LJWJ+B/aAazptn17X53wky+x7pdKASE54GcWhTxW9QEWVLaWD
-xu2Y7bPNIthUtiW9wmbWB+4fY4LhTVhcuh+/4xaFx/MVoTRhf2tFS6hBFeaUcsWT
-m/XJf5kBpLpV1G983akqJtH2D2IMJckYSQ67tUwWVpdXq3B1b8fwpnsl9H075UAD
-qwTl09UClG9hVUE5fDKSwyKE6DCq8Whg3Zb1EdVjTOncky3d7DkzttgD8YDqmA==
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ross.impa.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://ross.impa.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://ross.impa.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ross.impa.br/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://ross.impa.br/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ross.impa.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">impa.br</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-      
-MIIDijCCAnICAQAwDQYJKoZIhvcNAQEFBQAwgYoxDTALBgNVBAoTBElNUEExDDAK
-BgNVBAsTA0NJTjEdMBsGCSqGSIb3DQEJARYObmV0YWRtQGltcGEuYnIxFzAVBgNV
-BAcTDlJpbyBkZSBKYW5laXJvMRcwFQYDVQQIEw5SaW8gZGUgSmFuZWlybzELMAkG
-A1UEBhMCQlIxDTALBgNVBAMTBHJvc3MwHhcNMTQwOTMwMTg0MjE1WhcNMTcwOTI5
-MTg0MjE1WjCBijENMAsGA1UEChMESU1QQTEMMAoGA1UECxMDQ0lOMR0wGwYJKoZI
-hvcNAQkBFg5uZXRhZG1AaW1wYS5icjEXMBUGA1UEBxMOUmlvIGRlIEphbmVpcm8x
-FzAVBgNVBAgTDlJpbyBkZSBKYW5laXJvMQswCQYDVQQGEwJCUjENMAsGA1UEAxME
-cm9zczCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALZqzra9igATlWYM
-nWpR0mCkXBwbB1mMRmr7vJF9A9ZfKeF4ztOmG+6YRmCLZk8rbd+mhp4bPJ504hL5
-rSjixTm2IXf9XJHcFIQKZLkq77ZquBcdeYKGjkkRqlyFv4YdptJEgViamXqyL9Oj
-U3lbO5I7QLL5l255KUdsiYRxlAAdXJGv+7tglOXkcSf3c7+M3bgM151LruzoHRqM
-x8i5m5PL0Ve8hvUvPiuaPUxKEDRzqgxTCcyeoFTbgXV/P6vt+/LaNNFQia8mrmVV
-2w0LwoLF1NkFbbrSfFuxiMpPCV7voI0F8BLAjHZgZYCgj+e490QfdUCUscVR5xZc
-SssOYGUCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAQYIyUBaYYa+BI7KF3xLb2C6K
-J4PY4GkCxtWEYnaBZYRSsef85OgMT7r1F4finTBY3KfoCOt5Yti5TIkXtwxvoCTN
-nF68zBR55rLFO67LJWJ+B/aAazptn17X53wky+x7pdKASE54GcWhTxW9QEWVLaWD
-xu2Y7bPNIthUtiW9wmbWB+4fY4LhTVhcuh+/4xaFx/MVoTRhf2tFS6hBFeaUcsWT
-m/XJf5kBpLpV1G983akqJtH2D2IMJckYSQ67tUwWVpdXq3B1b8fwpnsl9H075UAD
-qwTl09UClG9hVUE5fDKSwyKE6DCq8Whg3Zb1EdVjTOncky3d7DkzttgD8YDqmA==
-                    
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ross.impa.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://ross.impa.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">IMPA - Associac Instituto Nacional de Matemaca Pura e Aplicada</OrganizationName>
-    <OrganizationName xml:lang="pt-br">IMPA - Associac Instituto Nacional de Matemaca Pura e Aplicada</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">IMPA - Associac Instituto Nacional de Matemaca Pura e Aplicada</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="pt-br">IMPA - Associac Instituto Nacional de Matemaca Pura e Aplicada</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.impa.br/</OrganizationURL>
-    <OrganizationURL xml:lang="pt-br">http://www.impa.br/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Ricardo Gomes</SurName>
-    <EmailAddress>netadm@impa.br</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/rr.funet.fi-attribute-test.xml b/swamid-interfederations-2.0/rr.funet.fi-attribute-test.xml
index 52415d75..5c5d5cb3 100644
--- a/swamid-interfederations-2.0/rr.funet.fi-attribute-test.xml
+++ b/swamid-interfederations-2.0/rr.funet.fi-attribute-test.xml
@@ -1,19 +1,9 @@
 <?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#" entityID="https://rr.funet.fi/attribute-test">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.csc.fi/haka">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://www.csc.fi/english/institutions/haka/instructions/join/eduGAINRegistrationStatement/</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: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://rr.funet.fi/attribute-test/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+<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://rr.funet.fi/attribute-test">
+  <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://rr.funet.fi/attribute-test/Shibboleth.sso/Login" 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>
@@ -23,8 +13,12 @@
         <mdui:PrivacyStatementURL xml:lang="fi">https://confluence.csc.fi/x/6o4uAg</mdui:PrivacyStatementURL>
         <mdui:PrivacyStatementURL xml:lang="sv">https://confluence.csc.fi/x/6o4uAg</mdui:PrivacyStatementURL>
       </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
+      <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>MIIFijCCBHKgAwIBAgIRAOpF8XtkiUr3wCQ16Yh9PYYwDQYJKoZIhvcNAQEFBQAw
@@ -59,104 +53,104 @@ aUiD/5UIQRBIZKprBZPaQHh3M9a6FfXTAKWnwrePtRcite62ajmeGa3G0Ldh0TLO
 7RGEenBRxaphXGAv1Eb0nZKFlktgZNSVgkJTGQH0</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://rr.funet.fi/attribute-test/Shibboleth.sso/SLO/Redirect"/>
-    <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://rr.funet.fi/attribute-test/Shibboleth.sso/SAML2/POST" index="1" isDefault="true"/>
-    <AttributeConsumingService index="1" isDefault="true">
-      <ServiceName xml:lang="fi">Haka attribuuttitestipalvelu</ServiceName>
-      <ServiceName xml:lang="en">Haka Attribute Test Service</ServiceName>
-      <ServiceDescription xml:lang="fi">Palvelua vasten voi testata IdP-palvelimen luovuttamia attribuutteja.</ServiceDescription>
-      <ServiceDescription xml:lang="en">Attributes released by IdP-server can be tested against this SP.</ServiceDescription>
-      <RequestedAttribute FriendlyName="businessCategory" Name="urn:oid:2.5.4.15" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <RequestedAttribute FriendlyName="businessCode" Name="urn:oid:1.2.246.10" 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" isRequired="true"/>
-      <RequestedAttribute FriendlyName="CountryOfResidence" Name="urn:oid:1.3.6.1.4.1.25178.1.2.11" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <RequestedAttribute FriendlyName="description" Name="urn:oid:2.5.4.13" 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="eduCourseMember" 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" isRequired="true"/>
-      <RequestedAttribute FriendlyName="eduCourseOffering" 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" 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="true"/>
-      <RequestedAttribute FriendlyName="eduPersonEntitlement" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.7" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <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" isRequired="true"/>
-      <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" isRequired="true"/>
-      <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" isRequired="true"/>
-      <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" isRequired="true"/>
-      <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="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <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="electronicIdentificationNumber" Name="urn:oid:1.2.246.22" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <RequestedAttribute FriendlyName="employeeNumber" Name="urn:oid:2.16.840.1.113730.3.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <RequestedAttribute FriendlyName="facsimileTelephoneNumber" Name="urn:oid:2.5.4.23" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <RequestedAttribute FriendlyName="funetEduPersonCreditUnits" Name="urn:oid:1.3.6.1.4.1.16161.1.1.18" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <RequestedAttribute FriendlyName="funetEduPersonECTS" Name="urn:oid:1.3.6.1.4.1.16161.1.1.19" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <RequestedAttribute FriendlyName="funetEduPersonEPPNTimeStamp" Name="urn:oid:1.3.6.1.4.1.16161.1.1.24" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <RequestedAttribute FriendlyName="funetEduPersonHomeCity" Name="urn:oid:1.3.6.1.4.1.16161.1.1.23" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <RequestedAttribute FriendlyName="funetEduPersonPrimaryStudyStart" Name="urn:oid:1.3.6.1.4.1.16161.1.1.15" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <RequestedAttribute FriendlyName="funetEduPersonProgram" Name="urn:oid:1.3.6.1.4.1.16161.1.1.12" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <RequestedAttribute FriendlyName="funetEduPersonSpecialisation" Name="urn:oid:1.3.6.1.4.1.16161.1.1.13" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <RequestedAttribute FriendlyName="funetEduPersonStudentCategory" Name="urn:oid:1.3.6.1.4.1.16161.1.1.20" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <RequestedAttribute FriendlyName="funetEduPersonStudentStatus" Name="urn:oid:1.3.6.1.4.1.16161.1.1.21" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <RequestedAttribute FriendlyName="funetEduPersonStudentUnion" Name="urn:oid:1.3.6.1.4.1.16161.1.1.22" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <RequestedAttribute FriendlyName="funetEduPersonStudyStart" Name="urn:oid:1.3.6.1.4.1.16161.1.1.14" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <RequestedAttribute FriendlyName="funetEduPersonStudyToEnd" Name="urn:oid:1.3.6.1.4.1.16161.1.1.16" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <RequestedAttribute FriendlyName="funetEduPersonTargetDegree" Name="urn:oid:1.3.6.1.4.1.16161.1.1.11" 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" isRequired="true"/>
-      <RequestedAttribute FriendlyName="homePhone" Name="urn:oid:0.9.2342.19200300.100.1.20" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <RequestedAttribute FriendlyName="homePostalAddress" Name="urn:oid:0.9.2342.19200300.100.1.39" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <RequestedAttribute FriendlyName="initials" Name="urn:oid:2.5.4.43" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <RequestedAttribute FriendlyName="jpegPhoto" Name="urn:oid:0.9.2342.19200300.100.1.60" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <RequestedAttribute FriendlyName="l" Name="urn:oid:2.5.4.7" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <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" isRequired="true"/>
-      <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="mobile" Name="urn:oid:0.9.2342.19200300.100.1.41" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <RequestedAttribute FriendlyName="nationalIdentificationNumber" Name="urn:oid:1.2.246.21" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <RequestedAttribute FriendlyName="Nickname" 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" isRequired="true"/>
-      <RequestedAttribute FriendlyName="o" Name="urn:oid:2.5.4.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <RequestedAttribute FriendlyName="ou" Name="urn:oid:2.5.4.11" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <RequestedAttribute FriendlyName="postalAddress" Name="urn:oid:2.5.4.16" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <RequestedAttribute FriendlyName="postalCode" Name="urn:oid:2.5.4.17" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <RequestedAttribute FriendlyName="postOfficeBox" Name="urn:oid:2.5.4.18" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <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" isRequired="true"/>
-      <RequestedAttribute FriendlyName="schacCountryOfCitizenship" Name="urn:oid:1.3.6.1.4.1.25178.1.2.5" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <RequestedAttribute FriendlyName="schacDateOfBirth" Name="urn:oid:1.3.6.1.4.1.25178.1.2.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <RequestedAttribute FriendlyName="schacGender" Name="urn:oid:1.3.6.1.4.1.25178.1.2.2" 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"/>
-      <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="schacMotherTongue" Name="urn:oid:1.3.6.1.4.1.25178.1.2.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <RequestedAttribute FriendlyName="schacPersonalUniqueCode" Name="urn:oid:1.3.6.1.4.1.25178.1.2.14" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <RequestedAttribute FriendlyName="schacPersonalUniqueID" Name="urn:oid:1.3.6.1.4.1.25178.1.2.15" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <RequestedAttribute FriendlyName="schacPlaceOfBirth" Name="urn:oid:1.3.6.1.4.1.25178.1.2.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <RequestedAttribute FriendlyName="seeAlso" Name="urn:oid:2.5.4.34" 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" isRequired="true"/>
-      <RequestedAttribute FriendlyName="street" Name="urn:oid:2.5.4.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <RequestedAttribute FriendlyName="telephoneNumber" Name="urn:oid:2.5.4.20" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <RequestedAttribute FriendlyName="title" Name="urn:oid:2.5.4.12" 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="userCertificate" Name="urn:oid:2.5.4.36" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <RequestedAttribute FriendlyName="userPresenceID" Name="urn:oid:1.3.6.1.4.1.25178.1.2.12" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <RequestedAttribute FriendlyName="userStatus" Name="urn:oid:1.3.6.1.4.1.25178.1.2.19" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-    </AttributeConsumingService>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="fi">CSC - Tieteen tietotekniikan keskus Oy</OrganizationName>
-    <OrganizationName xml:lang="en">CSC - IT Center for Science Ltd.</OrganizationName>
-    <OrganizationName xml:lang="sv">CSC - Tieteen tietotekniikan keskus Oy</OrganizationName>
-    <OrganizationDisplayName xml:lang="fi">CSC - Tieteen tietotekniikan keskus Oy</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">CSC - IT Center for Science Ltd.</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="sv">CSC - Tieteen tietotekniikan keskus Oy</OrganizationDisplayName>
-    <OrganizationURL xml:lang="fi">http://www.csc.fi</OrganizationURL>
-    <OrganizationURL xml:lang="en">http://www.csc.fi</OrganizationURL>
-    <OrganizationURL xml:lang="sv">http://www.csc.fi</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Kari</GivenName>
-    <SurName>Laalo</SurName>
-    <EmailAddress>mailto:kari.laalo@csc.fi</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="support">
-    <GivenName>Timo</GivenName>
-    <SurName>Mustonen</SurName>
-    <EmailAddress>mailto:haka@csc.fi</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://rr.funet.fi/attribute-test/Shibboleth.sso/SLO/Redirect"/>
+    <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://rr.funet.fi/attribute-test/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.15" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="funetEduPersonPrimaryStudyStart"/>
+      <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.5.4.18" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="postOfficeBox"/>
+      <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.15" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="schacPersonalUniqueID"/>
+      <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="technical">
+    <md:GivenName>Kari</md:GivenName>
+    <md:SurName>Laalo</md:SurName>
+    <md:EmailAddress>mailto:kari.laalo@csc.fi</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Timo</md:GivenName>
+    <md:SurName>Mustonen</md:SurName>
+    <md:EmailAddress>mailto:haka@csc.fi</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/rr.funet.fi.xml b/swamid-interfederations-2.0/rr.funet.fi.xml
deleted file mode 100644
index 52415d75..00000000
--- a/swamid-interfederations-2.0/rr.funet.fi.xml
+++ /dev/null
@@ -1,162 +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#" entityID="https://rr.funet.fi/attribute-test">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.csc.fi/haka">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://www.csc.fi/english/institutions/haka/instructions/join/eduGAINRegistrationStatement/</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: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://rr.funet.fi/attribute-test/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <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="en">attribute test</mdui:Keywords>
-        <mdui:PrivacyStatementURL xml:lang="en">https://confluence.csc.fi/x/6o4uAg</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="fi">https://confluence.csc.fi/x/6o4uAg</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="sv">https://confluence.csc.fi/x/6o4uAg</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIFijCCBHKgAwIBAgIRAOpF8XtkiUr3wCQ16Yh9PYYwDQYJKoZIhvcNAQEFBQAw
-NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-IFNTTCBDQTAeFw0xNDA0MDkwMDAwMDBaFw0xNzA0MDgyMzU5NTlaMDkxITAfBgNV
-BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEUMBIGA1UEAxMLcnIuZnVuZXQu
-ZmkwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCo3JlR09DvNOKqY8J0
-X+OnAIgOz8mhKid0kjE/2sYlxPf+NJljQnIZYixD/Oj1eX0E2pb7XNZeSaUeBN+y
-Ge0L9b5r72910p0N8G2ZsycUfpzwUc80jJKPi0Vj0wE7M4itwF6ix7wUDLVKm7WF
-j19VdNhEO5v6oKql+Y1+LioWAGymfhxIf92r4VxUq7x4g5AFUwLE3U6MDa7KPreQ
-MVaPYX6MQBjhl1IksuMYiL9l32vRIBnsvKgJLPuj9w4rRLQksIS3Kq/ubaWcHRLV
-2vdTAlwSJGyFVvsKKUaLMa8PDi7Qh9XyGKBYNqpVT/y73Jen0qxB2ey/i/7s8Wpv
-bVaBmtPaSdrEzJAiF97wvShgKsMsMre5gQwb5Xm9+ivBr73nHyDOw8pPCgcXAZRS
-lMTu6YhVDqWpOj/FyGMmMo0Mr0CAsIKPN3uG2iT5ORkVBhtHufUkKbKtA/lHzGVq
-Wd5UXhvqJJCkdIR+6hW0KuhZCV3rQmav9uT5n0TLQehRL1MQWdno/U7e3gx364vt
-kBbSK6fLvRvUsdHI+82MkWfTFNa9auCgQr55cY5o6kDiEc1d7ofqXbMZFY4+9V9s
-A5b4a2rYfYKmA6QzoNz4Ed0ls45i44AbgBVMgB6gjWWnl8cwLGwbtXIXG2lLHJuJ
-ebv5jS3kU2+biivwcXfacBT+XwIDAQABo4IBjjCCAYowHwYDVR0jBBgwFoAUDL2T
-aAzz3qujSWsrN1dH6pDjue0wHQYDVR0OBBYEFGdyR9kleLAF9CwyvqrCaVT6cRNi
-MA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUF
-BwMBBggrBgEFBQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAEC
-ATA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RF
-UkVOQVNTTENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6
-Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzAB
-hhpodHRwOi8vb2NzcC50Y3MudGVyZW5hLm9yZzA8BgNVHREENTAzggtyci5mdW5l
-dC5maYIQaGFrYS1yci5mdW5ldC5maYISaGFrYS1ycjAxLmZ1bmV0LmZpMA0GCSqG
-SIb3DQEBBQUAA4IBAQCqH0bVH4duhVkYw63tkRZTRLG83JGJWuZYA6bmntr80Wdp
-1OUW3Ez66sByA6hddAX1trKs+ChOehatsSVV4g9YvZzOT5fEU5kkl5ZX+j8aVHwc
-55q2VVkv9RmCdt23hLPZD6eoNc7uDmz8/Ol94zmd/jcXz5lwq3FNss0yMOJ5W5hz
-HnVn+FAnphU6TsJhBYuXkNziSOkrUeZyUTPpRMsz7OlmdrW+i6sLS6RxUprMM6rV
-aUiD/5UIQRBIZKprBZPaQHh3M9a6FfXTAKWnwrePtRcite62ajmeGa3G0Ldh0TLO
-7RGEenBRxaphXGAv1Eb0nZKFlktgZNSVgkJTGQH0</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://rr.funet.fi/attribute-test/Shibboleth.sso/SLO/Redirect"/>
-    <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://rr.funet.fi/attribute-test/Shibboleth.sso/SAML2/POST" index="1" isDefault="true"/>
-    <AttributeConsumingService index="1" isDefault="true">
-      <ServiceName xml:lang="fi">Haka attribuuttitestipalvelu</ServiceName>
-      <ServiceName xml:lang="en">Haka Attribute Test Service</ServiceName>
-      <ServiceDescription xml:lang="fi">Palvelua vasten voi testata IdP-palvelimen luovuttamia attribuutteja.</ServiceDescription>
-      <ServiceDescription xml:lang="en">Attributes released by IdP-server can be tested against this SP.</ServiceDescription>
-      <RequestedAttribute FriendlyName="businessCategory" Name="urn:oid:2.5.4.15" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <RequestedAttribute FriendlyName="businessCode" Name="urn:oid:1.2.246.10" 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" isRequired="true"/>
-      <RequestedAttribute FriendlyName="CountryOfResidence" Name="urn:oid:1.3.6.1.4.1.25178.1.2.11" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <RequestedAttribute FriendlyName="description" Name="urn:oid:2.5.4.13" 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="eduCourseMember" 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" isRequired="true"/>
-      <RequestedAttribute FriendlyName="eduCourseOffering" 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" 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="true"/>
-      <RequestedAttribute FriendlyName="eduPersonEntitlement" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.7" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <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" isRequired="true"/>
-      <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" isRequired="true"/>
-      <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" isRequired="true"/>
-      <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" isRequired="true"/>
-      <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="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <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="electronicIdentificationNumber" Name="urn:oid:1.2.246.22" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <RequestedAttribute FriendlyName="employeeNumber" Name="urn:oid:2.16.840.1.113730.3.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <RequestedAttribute FriendlyName="facsimileTelephoneNumber" Name="urn:oid:2.5.4.23" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <RequestedAttribute FriendlyName="funetEduPersonCreditUnits" Name="urn:oid:1.3.6.1.4.1.16161.1.1.18" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <RequestedAttribute FriendlyName="funetEduPersonECTS" Name="urn:oid:1.3.6.1.4.1.16161.1.1.19" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <RequestedAttribute FriendlyName="funetEduPersonEPPNTimeStamp" Name="urn:oid:1.3.6.1.4.1.16161.1.1.24" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <RequestedAttribute FriendlyName="funetEduPersonHomeCity" Name="urn:oid:1.3.6.1.4.1.16161.1.1.23" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <RequestedAttribute FriendlyName="funetEduPersonPrimaryStudyStart" Name="urn:oid:1.3.6.1.4.1.16161.1.1.15" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <RequestedAttribute FriendlyName="funetEduPersonProgram" Name="urn:oid:1.3.6.1.4.1.16161.1.1.12" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <RequestedAttribute FriendlyName="funetEduPersonSpecialisation" Name="urn:oid:1.3.6.1.4.1.16161.1.1.13" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <RequestedAttribute FriendlyName="funetEduPersonStudentCategory" Name="urn:oid:1.3.6.1.4.1.16161.1.1.20" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <RequestedAttribute FriendlyName="funetEduPersonStudentStatus" Name="urn:oid:1.3.6.1.4.1.16161.1.1.21" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <RequestedAttribute FriendlyName="funetEduPersonStudentUnion" Name="urn:oid:1.3.6.1.4.1.16161.1.1.22" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <RequestedAttribute FriendlyName="funetEduPersonStudyStart" Name="urn:oid:1.3.6.1.4.1.16161.1.1.14" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <RequestedAttribute FriendlyName="funetEduPersonStudyToEnd" Name="urn:oid:1.3.6.1.4.1.16161.1.1.16" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <RequestedAttribute FriendlyName="funetEduPersonTargetDegree" Name="urn:oid:1.3.6.1.4.1.16161.1.1.11" 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" isRequired="true"/>
-      <RequestedAttribute FriendlyName="homePhone" Name="urn:oid:0.9.2342.19200300.100.1.20" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <RequestedAttribute FriendlyName="homePostalAddress" Name="urn:oid:0.9.2342.19200300.100.1.39" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <RequestedAttribute FriendlyName="initials" Name="urn:oid:2.5.4.43" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <RequestedAttribute FriendlyName="jpegPhoto" Name="urn:oid:0.9.2342.19200300.100.1.60" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <RequestedAttribute FriendlyName="l" Name="urn:oid:2.5.4.7" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <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" isRequired="true"/>
-      <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="mobile" Name="urn:oid:0.9.2342.19200300.100.1.41" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <RequestedAttribute FriendlyName="nationalIdentificationNumber" Name="urn:oid:1.2.246.21" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <RequestedAttribute FriendlyName="Nickname" 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" isRequired="true"/>
-      <RequestedAttribute FriendlyName="o" Name="urn:oid:2.5.4.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <RequestedAttribute FriendlyName="ou" Name="urn:oid:2.5.4.11" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <RequestedAttribute FriendlyName="postalAddress" Name="urn:oid:2.5.4.16" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <RequestedAttribute FriendlyName="postalCode" Name="urn:oid:2.5.4.17" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <RequestedAttribute FriendlyName="postOfficeBox" Name="urn:oid:2.5.4.18" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <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" isRequired="true"/>
-      <RequestedAttribute FriendlyName="schacCountryOfCitizenship" Name="urn:oid:1.3.6.1.4.1.25178.1.2.5" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <RequestedAttribute FriendlyName="schacDateOfBirth" Name="urn:oid:1.3.6.1.4.1.25178.1.2.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <RequestedAttribute FriendlyName="schacGender" Name="urn:oid:1.3.6.1.4.1.25178.1.2.2" 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"/>
-      <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="schacMotherTongue" Name="urn:oid:1.3.6.1.4.1.25178.1.2.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <RequestedAttribute FriendlyName="schacPersonalUniqueCode" Name="urn:oid:1.3.6.1.4.1.25178.1.2.14" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <RequestedAttribute FriendlyName="schacPersonalUniqueID" Name="urn:oid:1.3.6.1.4.1.25178.1.2.15" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <RequestedAttribute FriendlyName="schacPlaceOfBirth" Name="urn:oid:1.3.6.1.4.1.25178.1.2.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <RequestedAttribute FriendlyName="seeAlso" Name="urn:oid:2.5.4.34" 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" isRequired="true"/>
-      <RequestedAttribute FriendlyName="street" Name="urn:oid:2.5.4.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <RequestedAttribute FriendlyName="telephoneNumber" Name="urn:oid:2.5.4.20" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <RequestedAttribute FriendlyName="title" Name="urn:oid:2.5.4.12" 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="userCertificate" Name="urn:oid:2.5.4.36" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <RequestedAttribute FriendlyName="userPresenceID" Name="urn:oid:1.3.6.1.4.1.25178.1.2.12" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <RequestedAttribute FriendlyName="userStatus" Name="urn:oid:1.3.6.1.4.1.25178.1.2.19" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-    </AttributeConsumingService>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="fi">CSC - Tieteen tietotekniikan keskus Oy</OrganizationName>
-    <OrganizationName xml:lang="en">CSC - IT Center for Science Ltd.</OrganizationName>
-    <OrganizationName xml:lang="sv">CSC - Tieteen tietotekniikan keskus Oy</OrganizationName>
-    <OrganizationDisplayName xml:lang="fi">CSC - Tieteen tietotekniikan keskus Oy</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">CSC - IT Center for Science Ltd.</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="sv">CSC - Tieteen tietotekniikan keskus Oy</OrganizationDisplayName>
-    <OrganizationURL xml:lang="fi">http://www.csc.fi</OrganizationURL>
-    <OrganizationURL xml:lang="en">http://www.csc.fi</OrganizationURL>
-    <OrganizationURL xml:lang="sv">http://www.csc.fi</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Kari</GivenName>
-    <SurName>Laalo</SurName>
-    <EmailAddress>mailto:kari.laalo@csc.fi</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="support">
-    <GivenName>Timo</GivenName>
-    <SurName>Mustonen</SurName>
-    <EmailAddress>mailto:haka@csc.fi</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/rtrvirshib.ifmt.edu.br.xml b/swamid-interfederations-2.0/rtrvirshib.ifmt.edu.br.xml
deleted file mode 100644
index 4729be33..00000000
--- a/swamid-interfederations-2.0/rtrvirshib.ifmt.edu.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://rtrvirshib.ifmt.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">ifmt.edu.br</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">IFMT - Instituto Federal de Mato Grosso</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="pt-br">IFMT - Instituto Federal de Mato Grosso</mdui:DisplayName>
-        <mdui:Description xml:lang="en">IFMT - Instituto Federal de Mato Grosso</mdui:Description>
-        <mdui:Description xml:lang="pt-br">IFMT - Instituto Federal de Mato Grosso</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.ifmt.edu.br/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="pt-br">http://www.ifmt.edu.br/</mdui:InformationURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-    MIIDnjCCAoYCAQAwDQYJKoZIhvcNAQEFBQAwgZQxDTALBgNVBAoTBElGTVQxDTAL
-BgNVBAsTBERHVEkxHzAdBgkqhkiG9w0BCQEWEGRndGlAaWZtdC5lZHUuYnIxDzAN
-BgNVBAcTBkN1aWFiYTEUMBIGA1UECBMLTWF0byBHcm9zc28xCzAJBgNVBAYTAkJS
-MR8wHQYDVQQDExZydHJ2aXJzaGliLmlmbXQuZWR1LmJyMB4XDTE0MDQxNzEyMzIw
-N1oXDTE5MDQxNjEyMzIwN1owgZQxDTALBgNVBAoTBElGTVQxDTALBgNVBAsTBERH
-VEkxHzAdBgkqhkiG9w0BCQEWEGRndGlAaWZtdC5lZHUuYnIxDzANBgNVBAcTBkN1
-aWFiYTEUMBIGA1UECBMLTWF0byBHcm9zc28xCzAJBgNVBAYTAkJSMR8wHQYDVQQD
-ExZydHJ2aXJzaGliLmlmbXQuZWR1LmJyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
-MIIBCgKCAQEA2eCAjelNjPyH/68OkUNA7eZF2Edd1saA5wL3uYVu7sF3+JeJ/VnL
-th4oBh/AEvoP6GribfKu9kL3la0j3M92Y0R50t/U/oesWlP571lmtt/ktGcrjXsG
-F//9EukOVOhN58kMF9D2ZAxvE2oTrlmwrzZk3ZdxAdmY4BxchfJms8EH9osCfiYC
-kIY/7lc2w3X9OME67Dvg9Z+5EF+KvYs8mkueMQh7azrXXHtcxG8RSpZsaORza6mc
-eA5nsPLpXp0/fr6rj47EZ0LHZdE74jGAdqMYheLwhH0BqlCdNrU+G2DhrsHXMK/A
-XFiaB9OluEe8Ofr41TxnAXrEkwA6CKlOhQIDAQABMA0GCSqGSIb3DQEBBQUAA4IB
-AQCRb5yEkQ9X4IuihBjIb/dI+BN08UCNdASV8qM7kdZU8JmlOyg8QgI6L8rhAEpO
-xY5xIBsfSHm50zgtHvSA8OW2SBL0TOOHQvvIyWDBpaUdy6kneJSqlzibpsOYfB92
-DguqBhy6NfQN+m1aSf7nqxbk0cIbj76eQiq139Gf1tHR9T/bR+ui9Qch4gKvEcxb
-JbfovcHp8joKV/PdoQ3Ibmu5JCwr8lvzgrsxyzO+x74LXE2DTY+eslmIZkBW4/xv
-vJ5FdfQheB90r4to4riv5EjWadshdQBgHaCHqLOrRgaFqHY4r6C6Ot8D8i26FXHq
-mmlVzkmXDVDPlyf/vhWQDReo
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://rtrvirshib.ifmt.edu.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://rtrvirshib.ifmt.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://rtrvirshib.ifmt.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://rtrvirshib.ifmt.edu.br/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://rtrvirshib.ifmt.edu.br/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://rtrvirshib.ifmt.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">ifmt.edu.br</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-      
-MIIDnjCCAoYCAQAwDQYJKoZIhvcNAQEFBQAwgZQxDTALBgNVBAoTBElGTVQxDTAL
-BgNVBAsTBERHVEkxHzAdBgkqhkiG9w0BCQEWEGRndGlAaWZtdC5lZHUuYnIxDzAN
-BgNVBAcTBkN1aWFiYTEUMBIGA1UECBMLTWF0byBHcm9zc28xCzAJBgNVBAYTAkJS
-MR8wHQYDVQQDExZydHJ2aXJzaGliLmlmbXQuZWR1LmJyMB4XDTE0MDQxNzEyMzIw
-N1oXDTE5MDQxNjEyMzIwN1owgZQxDTALBgNVBAoTBElGTVQxDTALBgNVBAsTBERH
-VEkxHzAdBgkqhkiG9w0BCQEWEGRndGlAaWZtdC5lZHUuYnIxDzANBgNVBAcTBkN1
-aWFiYTEUMBIGA1UECBMLTWF0byBHcm9zc28xCzAJBgNVBAYTAkJSMR8wHQYDVQQD
-ExZydHJ2aXJzaGliLmlmbXQuZWR1LmJyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
-MIIBCgKCAQEA2eCAjelNjPyH/68OkUNA7eZF2Edd1saA5wL3uYVu7sF3+JeJ/VnL
-th4oBh/AEvoP6GribfKu9kL3la0j3M92Y0R50t/U/oesWlP571lmtt/ktGcrjXsG
-F//9EukOVOhN58kMF9D2ZAxvE2oTrlmwrzZk3ZdxAdmY4BxchfJms8EH9osCfiYC
-kIY/7lc2w3X9OME67Dvg9Z+5EF+KvYs8mkueMQh7azrXXHtcxG8RSpZsaORza6mc
-eA5nsPLpXp0/fr6rj47EZ0LHZdE74jGAdqMYheLwhH0BqlCdNrU+G2DhrsHXMK/A
-XFiaB9OluEe8Ofr41TxnAXrEkwA6CKlOhQIDAQABMA0GCSqGSIb3DQEBBQUAA4IB
-AQCRb5yEkQ9X4IuihBjIb/dI+BN08UCNdASV8qM7kdZU8JmlOyg8QgI6L8rhAEpO
-xY5xIBsfSHm50zgtHvSA8OW2SBL0TOOHQvvIyWDBpaUdy6kneJSqlzibpsOYfB92
-DguqBhy6NfQN+m1aSf7nqxbk0cIbj76eQiq139Gf1tHR9T/bR+ui9Qch4gKvEcxb
-JbfovcHp8joKV/PdoQ3Ibmu5JCwr8lvzgrsxyzO+x74LXE2DTY+eslmIZkBW4/xv
-vJ5FdfQheB90r4to4riv5EjWadshdQBgHaCHqLOrRgaFqHY4r6C6Ot8D8i26FXHq
-mmlVzkmXDVDPlyf/vhWQDReo
-                    
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://rtrvirshib.ifmt.edu.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://rtrvirshib.ifmt.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">IFMT - Instituto Federal de Mato Grosso</OrganizationName>
-    <OrganizationName xml:lang="pt-br">IFMT - Instituto Federal de Mato Grosso</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">IFMT - Instituto Federal de Mato Grosso</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="pt-br">IFMT - Instituto Federal de Mato Grosso</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.ifmt.edu.br/</OrganizationURL>
-    <OrganizationURL xml:lang="pt-br">http://www.ifmt.edu.br/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Diretoria de Gestao da Tecnologia da Informacao</SurName>
-    <EmailAddress>dgti@ifmt.edu.br</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/saml-1.sys.kth.se-idp-shibboleth.xml b/swamid-interfederations-2.0/saml-1.sys.kth.se-idp-shibboleth.xml
deleted file mode 100644
index db7932d1..00000000
--- a/swamid-interfederations-2.0/saml-1.sys.kth.se-idp-shibboleth.xml
+++ /dev/null
@@ -1,146 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://saml-1.sys.kth.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">kth.se</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="sv">Kungliga Tekniska Högskolan (KTH)</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">KTH Royal Institute of Technology</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Identity Provider för KTH</mdui:Description>
-        <mdui:Description xml:lang="en">Identity Provider for KTH</mdui:Description>
-        <mdui:InformationURL xml:lang="sv">https://www.kth.se/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">https://www.kth.se/en</mdui:InformationURL>
-        <mdui:Logo height="82" width="82">https://saml-1.sys.kth.se/logo-main.png</mdui:Logo>
-        <mdui:Keywords xml:lang="sv">kth kungliga+tekniska+högskolan kungliga+tekniska+hogskolan royal+institute+of+technology stockholm</mdui:Keywords>
-        <mdui:Keywords xml:lang="en">kth kungliga+tekniska+högskolan kungliga+tekniska+hogskolan royal+institute+of+technology stockholm</mdui:Keywords>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DomainHint>kth.se</mdui:DomainHint>
-        <mdui:IPHint>130.237.0.0/18</mdui:IPHint>
-        <mdui:IPHint>130.237.64.0/20</mdui:IPHint>
-        <mdui:IPHint>130.237.80.0/22</mdui:IPHint>
-        <mdui:IPHint>130.237.84.0/24</mdui:IPHint>
-        <mdui:IPHint>130.237.202.0/23</mdui:IPHint>
-        <mdui:IPHint>130.237.206.0/24</mdui:IPHint>
-        <mdui:IPHint>130.237.209.0/24</mdui:IPHint>
-        <mdui:IPHint>130.237.210.0/23</mdui:IPHint>
-        <mdui:IPHint>130.237.212.0/22</mdui:IPHint>
-        <mdui:IPHint>130.237.216.0/24</mdui:IPHint>
-        <mdui:IPHint>130.237.218.0/23</mdui:IPHint>
-        <mdui:IPHint>130.237.220.0/22</mdui:IPHint>
-        <mdui:IPHint>130.237.224.0/22</mdui:IPHint>
-        <mdui:IPHint>130.237.228.0/22</mdui:IPHint>
-        <mdui:IPHint>130.237.232.0/21</mdui:IPHint>
-        <mdui:IPHint>130.237.249.0/24</mdui:IPHint>
-        <mdui:IPHint>130.237.250.0/23</mdui:IPHint>
-        <mdui:IPHint>130.237.255.0/24</mdui:IPHint>
-        <mdui:IPHint>130.229.128.0/18</mdui:IPHint>
-        <mdui:IPHint>193.10.37.0/24</mdui:IPHint>
-        <mdui:IPHint>193.10.38.0/24</mdui:IPHint>
-        <mdui:IPHint>193.10.39.0/24</mdui:IPHint>
-        <mdui:IPHint>2001:6b0:1::/48</mdui:IPHint>
-        <mdui:GeolocationHint>geo:59.346123,18.072305</mdui:GeolocationHint>
-      </mdui:DiscoHints>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDMDCCAhigAwIBAgIVALx4XVtH3sOyM28YH834f5bbuHNlMA0GCSqGSIb3DQEB
-BQUAMBwxGjAYBgNVBAMTEXNhbWwtMS5zeXMua3RoLnNlMB4XDTEwMTExNzE1NTYz
-OFoXDTMwMTExNzE1NTYzOFowHDEaMBgGA1UEAxMRc2FtbC0xLnN5cy5rdGguc2Uw
-ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCDxtJdcAOVTCIq6UQlCpqm
-XbagnXzhINClFn/+XS3+KH0mb5HnLLugIQ12hH0SFfD7KgVh3mRwBZsbs0Q8QJoZ
-YkOfTii/I5Buvw6l4N36m58VLZGv2W0fFAQLMk2IeRqHd32wGyaVro0DojCKj+Wi
-C7pyHkMRQdofNNgS5tV6/Ls/FJUhK4P45u2MYQwGZR00u84ngQaQ+uw1xEoLGbpt
-H1Ic0ZqGH/7E6EhRs82taWCHUBy/qbFNuTsXKzRDQDAvnKvtosrpBfFqZ3wvJdIW
-4Q63jUFk9d84+h5xWe1rJD46MXUti55PYWPzzweIeXUE0vpPnlCWt2C5BzOFqeCt
-AgMBAAGjaTBnMEYGA1UdEQQ/MD2CEXNhbWwtMS5zeXMua3RoLnNlhihodHRwczov
-L3NhbWwtMS5zeXMua3RoLnNlL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBSHF1tH
-0Si0nenf53KeBzfw0JFKMTANBgkqhkiG9w0BAQUFAAOCAQEAfMDHG/jm+HsQo2t6
-if67Cs0iX2d0kridHeHE02BzAUTKSFQ0ywA+jXlJRmYnRXQqnl8qh1V4Qw6PmHKJ
-Im5rjNRUA72a9Vo42QBPXVy8UJOxTHMQhK6aFG0UXTofo5lzroz39YqaNGo6k5zx
-oBDagUCJ+Mfu4tOQ+j2ZbP1syTgCroX0XsRsdU/KXEdmPtQBAdEgWB0siCI31sOc
-JWNDZOy2Zm1yPdryCtJD56IwYEXRi9ACLDUYteoqypxq+Cjp4gkJNe+fsvyCjuCf
-jLJfoU/KdGJJcfuMirPEC2mfSdMWK3XDCvaxKU9Or2ZV6FjitQDPt9V2n/qNe5mu
-sdhdXg==
-
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://saml-1.sys.kth.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://saml-1.sys.kth.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://saml-1.sys.kth.se/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://saml-1.sys.kth.se/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://saml-1.sys.kth.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://saml-1.sys.kth.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">kth.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDMDCCAhigAwIBAgIVALx4XVtH3sOyM28YH834f5bbuHNlMA0GCSqGSIb3DQEB
-BQUAMBwxGjAYBgNVBAMTEXNhbWwtMS5zeXMua3RoLnNlMB4XDTEwMTExNzE1NTYz
-OFoXDTMwMTExNzE1NTYzOFowHDEaMBgGA1UEAxMRc2FtbC0xLnN5cy5rdGguc2Uw
-ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCDxtJdcAOVTCIq6UQlCpqm
-XbagnXzhINClFn/+XS3+KH0mb5HnLLugIQ12hH0SFfD7KgVh3mRwBZsbs0Q8QJoZ
-YkOfTii/I5Buvw6l4N36m58VLZGv2W0fFAQLMk2IeRqHd32wGyaVro0DojCKj+Wi
-C7pyHkMRQdofNNgS5tV6/Ls/FJUhK4P45u2MYQwGZR00u84ngQaQ+uw1xEoLGbpt
-H1Ic0ZqGH/7E6EhRs82taWCHUBy/qbFNuTsXKzRDQDAvnKvtosrpBfFqZ3wvJdIW
-4Q63jUFk9d84+h5xWe1rJD46MXUti55PYWPzzweIeXUE0vpPnlCWt2C5BzOFqeCt
-AgMBAAGjaTBnMEYGA1UdEQQ/MD2CEXNhbWwtMS5zeXMua3RoLnNlhihodHRwczov
-L3NhbWwtMS5zeXMua3RoLnNlL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBSHF1tH
-0Si0nenf53KeBzfw0JFKMTANBgkqhkiG9w0BAQUFAAOCAQEAfMDHG/jm+HsQo2t6
-if67Cs0iX2d0kridHeHE02BzAUTKSFQ0ywA+jXlJRmYnRXQqnl8qh1V4Qw6PmHKJ
-Im5rjNRUA72a9Vo42QBPXVy8UJOxTHMQhK6aFG0UXTofo5lzroz39YqaNGo6k5zx
-oBDagUCJ+Mfu4tOQ+j2ZbP1syTgCroX0XsRsdU/KXEdmPtQBAdEgWB0siCI31sOc
-JWNDZOy2Zm1yPdryCtJD56IwYEXRi9ACLDUYteoqypxq+Cjp4gkJNe+fsvyCjuCf
-jLJfoU/KdGJJcfuMirPEC2mfSdMWK3XDCvaxKU9Or2ZV6FjitQDPt9V2n/qNe5mu
-sdhdXg==
-
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://saml-1.sys.kth.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://saml-1.sys.kth.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">KTH</OrganizationName>
-    <OrganizationDisplayName xml:lang="sv">Kungliga Tekniska Högskolan</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">KTH Royal Institute of Technology</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.kth.se</OrganizationURL>
-  </Organization>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
-    <Company>KTH Royal Institute of Technology</Company>
-    <SurName>UF/ITA Infra (Alexander Boström, Hans Berggren, Jonas Andersson)</SurName>
-    <EmailAddress>ita-infra-saml-contact@kth.se</EmailAddress>
-    <TelephoneNumber>+46 8 790 6000</TelephoneNumber>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
-    <Company>KTH Royal Institute of Technology</Company>
-    <SurName>UF/ITA Infra (Alexander Boström, Hans Berggren, Jonas Andersson)</SurName>
-    <EmailAddress>ita-infra-saml-contact@kth.se</EmailAddress>
-    <TelephoneNumber>+46 8 790 6000</TelephoneNumber>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
-    <Company>KTH Royal Institute of Technology</Company>
-    <SurName>KTH IT-Support</SurName>
-    <EmailAddress>it-support@kth.se</EmailAddress>
-    <TelephoneNumber>+46 8 790 6600</TelephoneNumber>
-  </ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/saml-1.sys.kth.se.xml b/swamid-interfederations-2.0/saml-1.sys.kth.se.xml
deleted file mode 100644
index db7932d1..00000000
--- a/swamid-interfederations-2.0/saml-1.sys.kth.se.xml
+++ /dev/null
@@ -1,146 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://saml-1.sys.kth.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">kth.se</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="sv">Kungliga Tekniska Högskolan (KTH)</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">KTH Royal Institute of Technology</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Identity Provider för KTH</mdui:Description>
-        <mdui:Description xml:lang="en">Identity Provider for KTH</mdui:Description>
-        <mdui:InformationURL xml:lang="sv">https://www.kth.se/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">https://www.kth.se/en</mdui:InformationURL>
-        <mdui:Logo height="82" width="82">https://saml-1.sys.kth.se/logo-main.png</mdui:Logo>
-        <mdui:Keywords xml:lang="sv">kth kungliga+tekniska+högskolan kungliga+tekniska+hogskolan royal+institute+of+technology stockholm</mdui:Keywords>
-        <mdui:Keywords xml:lang="en">kth kungliga+tekniska+högskolan kungliga+tekniska+hogskolan royal+institute+of+technology stockholm</mdui:Keywords>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DomainHint>kth.se</mdui:DomainHint>
-        <mdui:IPHint>130.237.0.0/18</mdui:IPHint>
-        <mdui:IPHint>130.237.64.0/20</mdui:IPHint>
-        <mdui:IPHint>130.237.80.0/22</mdui:IPHint>
-        <mdui:IPHint>130.237.84.0/24</mdui:IPHint>
-        <mdui:IPHint>130.237.202.0/23</mdui:IPHint>
-        <mdui:IPHint>130.237.206.0/24</mdui:IPHint>
-        <mdui:IPHint>130.237.209.0/24</mdui:IPHint>
-        <mdui:IPHint>130.237.210.0/23</mdui:IPHint>
-        <mdui:IPHint>130.237.212.0/22</mdui:IPHint>
-        <mdui:IPHint>130.237.216.0/24</mdui:IPHint>
-        <mdui:IPHint>130.237.218.0/23</mdui:IPHint>
-        <mdui:IPHint>130.237.220.0/22</mdui:IPHint>
-        <mdui:IPHint>130.237.224.0/22</mdui:IPHint>
-        <mdui:IPHint>130.237.228.0/22</mdui:IPHint>
-        <mdui:IPHint>130.237.232.0/21</mdui:IPHint>
-        <mdui:IPHint>130.237.249.0/24</mdui:IPHint>
-        <mdui:IPHint>130.237.250.0/23</mdui:IPHint>
-        <mdui:IPHint>130.237.255.0/24</mdui:IPHint>
-        <mdui:IPHint>130.229.128.0/18</mdui:IPHint>
-        <mdui:IPHint>193.10.37.0/24</mdui:IPHint>
-        <mdui:IPHint>193.10.38.0/24</mdui:IPHint>
-        <mdui:IPHint>193.10.39.0/24</mdui:IPHint>
-        <mdui:IPHint>2001:6b0:1::/48</mdui:IPHint>
-        <mdui:GeolocationHint>geo:59.346123,18.072305</mdui:GeolocationHint>
-      </mdui:DiscoHints>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDMDCCAhigAwIBAgIVALx4XVtH3sOyM28YH834f5bbuHNlMA0GCSqGSIb3DQEB
-BQUAMBwxGjAYBgNVBAMTEXNhbWwtMS5zeXMua3RoLnNlMB4XDTEwMTExNzE1NTYz
-OFoXDTMwMTExNzE1NTYzOFowHDEaMBgGA1UEAxMRc2FtbC0xLnN5cy5rdGguc2Uw
-ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCDxtJdcAOVTCIq6UQlCpqm
-XbagnXzhINClFn/+XS3+KH0mb5HnLLugIQ12hH0SFfD7KgVh3mRwBZsbs0Q8QJoZ
-YkOfTii/I5Buvw6l4N36m58VLZGv2W0fFAQLMk2IeRqHd32wGyaVro0DojCKj+Wi
-C7pyHkMRQdofNNgS5tV6/Ls/FJUhK4P45u2MYQwGZR00u84ngQaQ+uw1xEoLGbpt
-H1Ic0ZqGH/7E6EhRs82taWCHUBy/qbFNuTsXKzRDQDAvnKvtosrpBfFqZ3wvJdIW
-4Q63jUFk9d84+h5xWe1rJD46MXUti55PYWPzzweIeXUE0vpPnlCWt2C5BzOFqeCt
-AgMBAAGjaTBnMEYGA1UdEQQ/MD2CEXNhbWwtMS5zeXMua3RoLnNlhihodHRwczov
-L3NhbWwtMS5zeXMua3RoLnNlL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBSHF1tH
-0Si0nenf53KeBzfw0JFKMTANBgkqhkiG9w0BAQUFAAOCAQEAfMDHG/jm+HsQo2t6
-if67Cs0iX2d0kridHeHE02BzAUTKSFQ0ywA+jXlJRmYnRXQqnl8qh1V4Qw6PmHKJ
-Im5rjNRUA72a9Vo42QBPXVy8UJOxTHMQhK6aFG0UXTofo5lzroz39YqaNGo6k5zx
-oBDagUCJ+Mfu4tOQ+j2ZbP1syTgCroX0XsRsdU/KXEdmPtQBAdEgWB0siCI31sOc
-JWNDZOy2Zm1yPdryCtJD56IwYEXRi9ACLDUYteoqypxq+Cjp4gkJNe+fsvyCjuCf
-jLJfoU/KdGJJcfuMirPEC2mfSdMWK3XDCvaxKU9Or2ZV6FjitQDPt9V2n/qNe5mu
-sdhdXg==
-
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://saml-1.sys.kth.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://saml-1.sys.kth.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://saml-1.sys.kth.se/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://saml-1.sys.kth.se/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://saml-1.sys.kth.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://saml-1.sys.kth.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">kth.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDMDCCAhigAwIBAgIVALx4XVtH3sOyM28YH834f5bbuHNlMA0GCSqGSIb3DQEB
-BQUAMBwxGjAYBgNVBAMTEXNhbWwtMS5zeXMua3RoLnNlMB4XDTEwMTExNzE1NTYz
-OFoXDTMwMTExNzE1NTYzOFowHDEaMBgGA1UEAxMRc2FtbC0xLnN5cy5rdGguc2Uw
-ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCDxtJdcAOVTCIq6UQlCpqm
-XbagnXzhINClFn/+XS3+KH0mb5HnLLugIQ12hH0SFfD7KgVh3mRwBZsbs0Q8QJoZ
-YkOfTii/I5Buvw6l4N36m58VLZGv2W0fFAQLMk2IeRqHd32wGyaVro0DojCKj+Wi
-C7pyHkMRQdofNNgS5tV6/Ls/FJUhK4P45u2MYQwGZR00u84ngQaQ+uw1xEoLGbpt
-H1Ic0ZqGH/7E6EhRs82taWCHUBy/qbFNuTsXKzRDQDAvnKvtosrpBfFqZ3wvJdIW
-4Q63jUFk9d84+h5xWe1rJD46MXUti55PYWPzzweIeXUE0vpPnlCWt2C5BzOFqeCt
-AgMBAAGjaTBnMEYGA1UdEQQ/MD2CEXNhbWwtMS5zeXMua3RoLnNlhihodHRwczov
-L3NhbWwtMS5zeXMua3RoLnNlL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBSHF1tH
-0Si0nenf53KeBzfw0JFKMTANBgkqhkiG9w0BAQUFAAOCAQEAfMDHG/jm+HsQo2t6
-if67Cs0iX2d0kridHeHE02BzAUTKSFQ0ywA+jXlJRmYnRXQqnl8qh1V4Qw6PmHKJ
-Im5rjNRUA72a9Vo42QBPXVy8UJOxTHMQhK6aFG0UXTofo5lzroz39YqaNGo6k5zx
-oBDagUCJ+Mfu4tOQ+j2ZbP1syTgCroX0XsRsdU/KXEdmPtQBAdEgWB0siCI31sOc
-JWNDZOy2Zm1yPdryCtJD56IwYEXRi9ACLDUYteoqypxq+Cjp4gkJNe+fsvyCjuCf
-jLJfoU/KdGJJcfuMirPEC2mfSdMWK3XDCvaxKU9Or2ZV6FjitQDPt9V2n/qNe5mu
-sdhdXg==
-
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://saml-1.sys.kth.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://saml-1.sys.kth.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">KTH</OrganizationName>
-    <OrganizationDisplayName xml:lang="sv">Kungliga Tekniska Högskolan</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">KTH Royal Institute of Technology</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.kth.se</OrganizationURL>
-  </Organization>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
-    <Company>KTH Royal Institute of Technology</Company>
-    <SurName>UF/ITA Infra (Alexander Boström, Hans Berggren, Jonas Andersson)</SurName>
-    <EmailAddress>ita-infra-saml-contact@kth.se</EmailAddress>
-    <TelephoneNumber>+46 8 790 6000</TelephoneNumber>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
-    <Company>KTH Royal Institute of Technology</Company>
-    <SurName>UF/ITA Infra (Alexander Boström, Hans Berggren, Jonas Andersson)</SurName>
-    <EmailAddress>ita-infra-saml-contact@kth.se</EmailAddress>
-    <TelephoneNumber>+46 8 790 6000</TelephoneNumber>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
-    <Company>KTH Royal Institute of Technology</Company>
-    <SurName>KTH IT-Support</SurName>
-    <EmailAddress>it-support@kth.se</EmailAddress>
-    <TelephoneNumber>+46 8 790 6600</TelephoneNumber>
-  </ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/saml.ps-ui-test.qalab.geant.net-perfsonar-ui.xml b/swamid-interfederations-2.0/saml.ps-ui-test.qalab.geant.net-perfsonar-ui.xml
deleted file mode 100644
index 44e94517..00000000
--- a/swamid-interfederations-2.0/saml.ps-ui-test.qalab.geant.net-perfsonar-ui.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="http://saml.ps-ui-test.qalab.geant.net/perfsonar-ui">
-  <!--
-		This is a perfsonarUI SP for Delivery of Advanced Network Technology to Europe Limited.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-10-17T10:07:05Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </Extensions>
-  <SPSSODescriptor AuthnRequestsSigned="true" 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 perfSONAR UI Test</mdui:DisplayName>
-        <mdui:Description xml:lang="en">GÉANT perfSONAR UI - testing instance</mdui:Description>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDRzCCAi+gAwIBAgIJAPW0ygzcXbqIMA0GCSqGSIb3DQEBBQUAMCUxIzAhBgNV
-						BAMTGnBzLXVpLXRlc3QucWFsYWIuZ2VhbnQubmV0MB4XDTE0MTAxNTE1MzQxMloX
-						DTE3MTAxNTE1MzQxMlowJTEjMCEGA1UEAxMacHMtdWktdGVzdC5xYWxhYi5nZWFu
-						dC5uZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC98MhL6OnVYsRP
-						WXeQsxSmCCKvfovv0fG9p7m0BmUe2ZIYYYgq/jM1A8mvnebREWRnJhTzpRMjvUNi
-						6hQE5poxBQk77MGzTbjNFVC4C8u0yvSrWqv5JxbsgBu+V9rRoOVaemlm3+LRpfqP
-						CBi0aeo1oImivuaaT5mnzBp6cNmT2CpiF/obM6r2m1GBquKUu533CnAks46gPTpP
-						zNufB0g9kIRq4FRE/Uk9Si1HkEfqOSKCMWwoOnM2KteZdh/Es87aOcvVAW+sS5Xg
-						kc8BGHA50reChQJMk1XwZa2dqVCT8V/0XzRBDTw5SzDayNE9k9dPxApkMotelhiC
-						Y6T4eZFRAgMBAAGjejB4MFcGA1UdEQRQME6CGnBzLXVpLXRlc3QucWFsYWIuZ2Vh
-						bnQubmV0hjBodHRwczovL3BzLXVpLXRlc3QucWFsYWIuZ2VhbnQubmV0L3BlcmZz
-						b25hci11aS8wHQYDVR0OBBYEFLXYmn/M+mCCItbU6rYMlxHSZxqUMA0GCSqGSIb3
-						DQEBBQUAA4IBAQCKT4IkHvxOFluo5D/aNp+02GqjP0YY4dJFAuzfhBBq1XMkPyPV
-						lyiiPxy4aOeTPgslc44bZzyCgVGZ5REXi667pcs03fpRMu74VSnMknrq/rwt6D3A
-						/s/dLQia27XeAI8g3NWgIeJ/Gg3RHPUeRL7Eus0nc9KSOeX6+hXiHti3Gsbe72lb
-						an/pPnEB3tlAZCbeecFyBM4XdIddT7F7fJxAQKi/bqqGVWcRBXc9UmvbU/GvTfhe
-						GlIu7tlcr20dwyEFKAxGqQVwA+3ozJZGOq+slVI2m279Won2U02j2dhZ9NR+eq5L
-						IkmaapKEWWS06DA57QiaHmqefKuOxprx3cZR
-					</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>
-						MIIDRzCCAi+gAwIBAgIJAPW0ygzcXbqIMA0GCSqGSIb3DQEBBQUAMCUxIzAhBgNV
-						BAMTGnBzLXVpLXRlc3QucWFsYWIuZ2VhbnQubmV0MB4XDTE0MTAxNTE1MzQxMloX
-						DTE3MTAxNTE1MzQxMlowJTEjMCEGA1UEAxMacHMtdWktdGVzdC5xYWxhYi5nZWFu
-						dC5uZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC98MhL6OnVYsRP
-						WXeQsxSmCCKvfovv0fG9p7m0BmUe2ZIYYYgq/jM1A8mvnebREWRnJhTzpRMjvUNi
-						6hQE5poxBQk77MGzTbjNFVC4C8u0yvSrWqv5JxbsgBu+V9rRoOVaemlm3+LRpfqP
-						CBi0aeo1oImivuaaT5mnzBp6cNmT2CpiF/obM6r2m1GBquKUu533CnAks46gPTpP
-						zNufB0g9kIRq4FRE/Uk9Si1HkEfqOSKCMWwoOnM2KteZdh/Es87aOcvVAW+sS5Xg
-						kc8BGHA50reChQJMk1XwZa2dqVCT8V/0XzRBDTw5SzDayNE9k9dPxApkMotelhiC
-						Y6T4eZFRAgMBAAGjejB4MFcGA1UdEQRQME6CGnBzLXVpLXRlc3QucWFsYWIuZ2Vh
-						bnQubmV0hjBodHRwczovL3BzLXVpLXRlc3QucWFsYWIuZ2VhbnQubmV0L3BlcmZz
-						b25hci11aS8wHQYDVR0OBBYEFLXYmn/M+mCCItbU6rYMlxHSZxqUMA0GCSqGSIb3
-						DQEBBQUAA4IBAQCKT4IkHvxOFluo5D/aNp+02GqjP0YY4dJFAuzfhBBq1XMkPyPV
-						lyiiPxy4aOeTPgslc44bZzyCgVGZ5REXi667pcs03fpRMu74VSnMknrq/rwt6D3A
-						/s/dLQia27XeAI8g3NWgIeJ/Gg3RHPUeRL7Eus0nc9KSOeX6+hXiHti3Gsbe72lb
-						an/pPnEB3tlAZCbeecFyBM4XdIddT7F7fJxAQKi/bqqGVWcRBXc9UmvbU/GvTfhe
-						GlIu7tlcr20dwyEFKAxGqQVwA+3ozJZGOq+slVI2m279Won2U02j2dhZ9NR+eq5L
-						IkmaapKEWWS06DA57QiaHmqefKuOxprx3cZR
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ps-ui-test.qalab.geant.net/perfsonar-ui/saml/LogoutServiceHTTPRedirect" ResponseLocation="https://ps-ui-test.qalab.geant.net/perfsonar-ui/saml/LogoutServiceHTTPRedirectResponse"/>
-    <NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</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" Location="https://ps-ui-test.qalab.geant.net/perfsonar-ui/saml/SAMLAssertionConsumer" index="0" isDefault="true"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ps-ui-test.qalab.geant.net/perfsonar-ui/saml/SAMLAssertionConsumer" index="1"/>
-    <AttributeConsumingService index="1">
-      <ServiceName xml:lang="en">GÉANT perfSONAR UI Test</ServiceName>
-      <ServiceDescription xml:lang="en">GÉANT perfSONAR UI - testing instance</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="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="false"/>
-      <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="false"/>
-    </AttributeConsumingService>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Delivery of Advanced Network Technology to Europe Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">DANTE</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.geant.net/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <Company>DANTE IT Support</Company>
-    <EmailAddress>mailto:DANTEITSupport@dante.net</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <Company>DANTE IT</Company>
-    <EmailAddress>mailto:it@dante.net</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/saml.ps-ui-test.qalab.geant.net.xml b/swamid-interfederations-2.0/saml.ps-ui-test.qalab.geant.net.xml
deleted file mode 100644
index 25a7bb0f..00000000
--- a/swamid-interfederations-2.0/saml.ps-ui-test.qalab.geant.net.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="http://saml.ps-ui-test.qalab.geant.net">
-  <!--
-		This is a perfSONAR UI SP for Delivery of Advanced Network Technology to Europe Limited.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-07-01T15:25:50Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </Extensions>
-  <SPSSODescriptor AuthnRequestsSigned="true" 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 perfSONAR UI Test</mdui:DisplayName>
-        <mdui:Description xml:lang="en">GÉANT perfSONAR UI - testing instance</mdui:Description>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDRjCCAi6gAwIBAgIJAJOr6D3n/9SDMA0GCSqGSIb3DQEBBQUAMCUxIzAhBgNV
-						BAMTGnBzLXVpLXRlc3QucWFsYWIuZ2VhbnQubmV0MB4XDTE0MDYxMDE3MTA0OFoX
-						DTE3MDYxMDE3MTA0OFowJTEjMCEGA1UEAxMacHMtdWktdGVzdC5xYWxhYi5nZWFu
-						dC5uZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC6yykwlB/6E0us
-						mtnDv6wniXzry26DbtIv8I5Bn588caVmJmYgeDQSn5ED8riG9BJgYUcOuIZBANfL
-						IzpuKgl91Hr8fAnBJ9TgssX623YkoQ1LFoXul9mfW9FrwyZQSxp3FzyKg9mKLsXJ
-						eDXOi1VFfHUhYnlPrnc0auSNDnBZ9tcMYSY9Q3xNDCsIsg2Mlqqp2p9l99oxMHIi
-						tFT0SXvjDYP+pBiVBfaXDHRPKlTdBeO1HR7TZLpjEA7gPKmNXTTK/wNMP/al9MOw
-						K/93kvcQePV3mb1JugDF9yuZIJOzAAdxXSb5vS9ijRg1MOW6O2XtxyCGGr7rrf09
-						sCpO1kR5AgMBAAGjeTB3MFYGA1UdEQRPME2CGnBzLXVpLXRlc3QucWFsYWIuZ2Vh
-						bnQubmV0hi9odHRwczovL3BzLXVpLXRlc3QucWFsYWIuZ2VhbnQubmV0L3BlcmZz
-						b25hci11aTAdBgNVHQ4EFgQUfw6mrDLe+r53jDsgfKCkYTxXAnYwDQYJKoZIhvcN
-						AQEFBQADggEBAFqcGCSPmdl+S/e4GRWSNVEfe9XEf7z/YKMe6j8fnOTpO6WPFOZX
-						bTYctAUCwoefVBj9aKb17kotmg4jPL8SABR9zk24D4pudXUmlTTPeJDZyC6TVIyL
-						jOTIpR3K6nGXu644BjE0ofUv0BJV/kTepdbjKXD1NJRSJQIdEbGZcQMKhdBk+5+y
-						WPSLKAT9q9ZQLPCammS1mXbwWe3yhLt5vkVfmimQd9C7zuFwVmW/MBiEFcsEbArb
-						L7qgb1CfXuXWFY/Ec1yYFAviHb8LFe92VaTrrdme6Qqba3eryueU4FvjtYfWy6+K
-						KMdsLHnE6yUSj1WUz0AHzZUPDcM9drnKw/k=
-					</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>
-						MIIDRjCCAi6gAwIBAgIJAJOr6D3n/9SDMA0GCSqGSIb3DQEBBQUAMCUxIzAhBgNV
-						BAMTGnBzLXVpLXRlc3QucWFsYWIuZ2VhbnQubmV0MB4XDTE0MDYxMDE3MTA0OFoX
-						DTE3MDYxMDE3MTA0OFowJTEjMCEGA1UEAxMacHMtdWktdGVzdC5xYWxhYi5nZWFu
-						dC5uZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC6yykwlB/6E0us
-						mtnDv6wniXzry26DbtIv8I5Bn588caVmJmYgeDQSn5ED8riG9BJgYUcOuIZBANfL
-						IzpuKgl91Hr8fAnBJ9TgssX623YkoQ1LFoXul9mfW9FrwyZQSxp3FzyKg9mKLsXJ
-						eDXOi1VFfHUhYnlPrnc0auSNDnBZ9tcMYSY9Q3xNDCsIsg2Mlqqp2p9l99oxMHIi
-						tFT0SXvjDYP+pBiVBfaXDHRPKlTdBeO1HR7TZLpjEA7gPKmNXTTK/wNMP/al9MOw
-						K/93kvcQePV3mb1JugDF9yuZIJOzAAdxXSb5vS9ijRg1MOW6O2XtxyCGGr7rrf09
-						sCpO1kR5AgMBAAGjeTB3MFYGA1UdEQRPME2CGnBzLXVpLXRlc3QucWFsYWIuZ2Vh
-						bnQubmV0hi9odHRwczovL3BzLXVpLXRlc3QucWFsYWIuZ2VhbnQubmV0L3BlcmZz
-						b25hci11aTAdBgNVHQ4EFgQUfw6mrDLe+r53jDsgfKCkYTxXAnYwDQYJKoZIhvcN
-						AQEFBQADggEBAFqcGCSPmdl+S/e4GRWSNVEfe9XEf7z/YKMe6j8fnOTpO6WPFOZX
-						bTYctAUCwoefVBj9aKb17kotmg4jPL8SABR9zk24D4pudXUmlTTPeJDZyC6TVIyL
-						jOTIpR3K6nGXu644BjE0ofUv0BJV/kTepdbjKXD1NJRSJQIdEbGZcQMKhdBk+5+y
-						WPSLKAT9q9ZQLPCammS1mXbwWe3yhLt5vkVfmimQd9C7zuFwVmW/MBiEFcsEbArb
-						L7qgb1CfXuXWFY/Ec1yYFAviHb8LFe92VaTrrdme6Qqba3eryueU4FvjtYfWy6+K
-						KMdsLHnE6yUSj1WUz0AHzZUPDcM9drnKw/k=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ps-ui-test.qalab.geant.net/perfsonar-ui/saml/LogoutServiceHTTPRedirect" ResponseLocation="http://ps-ui-test.qalab.geant.net/perfsonar-ui/saml/LogoutServiceHTTPRedirectResponse"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ps-ui-test.qalab.geant.net/perfsonar-ui/saml/LogoutServiceSOAP"/>
-    <NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</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" Location="https://ps-ui-test.qalab.geant.net/perfsonar-ui/saml/SAMLAssertionConsumer" index="0" isDefault="true"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ps-ui-test.qalab.geant.net/perfsonar-ui/saml/SAMLAssertionConsumer" index="1" isDefault="false"/>
-    <AttributeConsumingService index="0" isDefault="true">
-      <ServiceName xml:lang="en">GÉANT perfSONAR UI Test</ServiceName>
-      <ServiceDescription xml:lang="en">GÉANT perfSONAR UI - testing instance</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="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="false"/>
-      <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="false"/>
-    </AttributeConsumingService>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Delivery of Advanced Network Technology to Europe Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">DANTE</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.geant.net/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>DANTE IT Support</GivenName>
-    <EmailAddress>mailto:DANTEITSupport@dante.net</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>DANTE IT</GivenName>
-    <EmailAddress>mailto:it@dante.net</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sau09ret.ifbaiano.edu.br-idp-shibboleth.xml b/swamid-interfederations-2.0/sau09ret.ifbaiano.edu.br-idp-shibboleth.xml
deleted file mode 100644
index f4ba77d0..00000000
--- a/swamid-interfederations-2.0/sau09ret.ifbaiano.edu.br-idp-shibboleth.xml
+++ /dev/null
@@ -1,113 +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://sau09ret.ifbaiano.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">edu.br</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">IFBaiano - Instituto Federal Baiano</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="pt-br">IFBaiano - Instituto Federal Baiano</mdui:DisplayName>
-        <mdui:Description xml:lang="en">IFBaiano - Instituto Federal Baiano</mdui:Description>
-        <mdui:Description xml:lang="pt-br">IFBaiano - Instituto Federal Baiano</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.ifbaiano.edu.br</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="pt-br">http://www.ifbaiano.edu.br</mdui:InformationURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-    MIID4jCCAsoCAQAwDQYJKoZIhvcNAQEFBQAwgbYxLDAqBgNVBAoTI0lGQmFpYW5v
-IC0gSW5zdGl0dXRvIEZlZGVyYWwgQmFpYW5vMQ0wCwYDVQQLEwRER1RJMSQwIgYJ
-KoZIhvcNAQkBFhVjb3RlY0BpZmJhaWFuby5lZHUuYnIxETAPBgNVBAcTCFNhbHZh
-ZG9yMQ4wDAYDVQQIEwVCYWhpYTELMAkGA1UEBhMCQlIxITAfBgNVBAMTGHNhdTA5
-cmV0LmlmYmFpYW5vLmVkdS5icjAeFw0xNDA0MTQyMjU4MThaFw0xNzA0MTMyMjU4
-MThaMIG2MSwwKgYDVQQKEyNJRkJhaWFubyAtIEluc3RpdHV0byBGZWRlcmFsIEJh
-aWFubzENMAsGA1UECxMEREdUSTEkMCIGCSqGSIb3DQEJARYVY290ZWNAaWZiYWlh
-bm8uZWR1LmJyMREwDwYDVQQHEwhTYWx2YWRvcjEOMAwGA1UECBMFQmFoaWExCzAJ
-BgNVBAYTAkJSMSEwHwYDVQQDExhzYXUwOXJldC5pZmJhaWFuby5lZHUuYnIwggEi
-MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQD5ijX0kBu2O+XuV9a01EvCeTof
-uSU2K6jzaX5id9jZB0XcsYFo548SFE5qtzIwuWtN5VmdIKdCCycuvY84ON+WbX+D
-reNAq04e+OfS1tf9KSLwfSvIl1+D4IJvx8ul7U8SPEmd3oxLxdwM6XA1Yz1G2ejh
-WxAZtJB4uAX8y+tXwIjMIFldf2oY0sGTnC7c8CtOu/XmDTo1F8rKm+kbqvehueQO
-LodkLDH/ZwFgoEt+eCEDo2lA9B5saYJk7/8i/zW4M/sHgVLew3+mLHlhzeIjpqLj
-yNsYFFnPECAufWsr8c8e0Dc5WmKEQEXXHnIve3Z/JeNqAyMxP0yCYj/IWpzxAgMB
-AAEwDQYJKoZIhvcNAQEFBQADggEBAIkge9KkVX+lKhFX4QRd6CvNcpXOhVy2W2nt
-A3lLpsleXQD7OOSMGQFT3t0+oddMeOffBZDe5wpZx9jONf+rnnt8nYMBkollvrds
-FY0/KoGApJQfHXBPr+RO1K4eWCllKRSyjuEMCqXM2+jLEVdGa2j3cLVI3tJ69jga
-0hrCLIV6907qSEx/YjUHPazugxLpgiJMl83TdxmbU1K9/XwC27A0xsx6DZEXS1Cu
-KvM7Bvwx6NC1trrrHXoIC8WaSeKyhFAIJ9+q5R0er2tgB1Ylp4iWYJWITk6o2ISg
-zkWv3/eC022LBCTsChUgn2q+prZSfMLrYHDJyYbyhsHewnxgzwk=
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sau09ret.ifbaiano.edu.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://sau09ret.ifbaiano.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://sau09ret.ifbaiano.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sau09ret.ifbaiano.edu.br/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://sau09ret.ifbaiano.edu.br/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sau09ret.ifbaiano.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>
-      
-MIID4jCCAsoCAQAwDQYJKoZIhvcNAQEFBQAwgbYxLDAqBgNVBAoTI0lGQmFpYW5v
-IC0gSW5zdGl0dXRvIEZlZGVyYWwgQmFpYW5vMQ0wCwYDVQQLEwRER1RJMSQwIgYJ
-KoZIhvcNAQkBFhVjb3RlY0BpZmJhaWFuby5lZHUuYnIxETAPBgNVBAcTCFNhbHZh
-ZG9yMQ4wDAYDVQQIEwVCYWhpYTELMAkGA1UEBhMCQlIxITAfBgNVBAMTGHNhdTA5
-cmV0LmlmYmFpYW5vLmVkdS5icjAeFw0xNDA0MTQyMjU4MThaFw0xNzA0MTMyMjU4
-MThaMIG2MSwwKgYDVQQKEyNJRkJhaWFubyAtIEluc3RpdHV0byBGZWRlcmFsIEJh
-aWFubzENMAsGA1UECxMEREdUSTEkMCIGCSqGSIb3DQEJARYVY290ZWNAaWZiYWlh
-bm8uZWR1LmJyMREwDwYDVQQHEwhTYWx2YWRvcjEOMAwGA1UECBMFQmFoaWExCzAJ
-BgNVBAYTAkJSMSEwHwYDVQQDExhzYXUwOXJldC5pZmJhaWFuby5lZHUuYnIwggEi
-MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQD5ijX0kBu2O+XuV9a01EvCeTof
-uSU2K6jzaX5id9jZB0XcsYFo548SFE5qtzIwuWtN5VmdIKdCCycuvY84ON+WbX+D
-reNAq04e+OfS1tf9KSLwfSvIl1+D4IJvx8ul7U8SPEmd3oxLxdwM6XA1Yz1G2ejh
-WxAZtJB4uAX8y+tXwIjMIFldf2oY0sGTnC7c8CtOu/XmDTo1F8rKm+kbqvehueQO
-LodkLDH/ZwFgoEt+eCEDo2lA9B5saYJk7/8i/zW4M/sHgVLew3+mLHlhzeIjpqLj
-yNsYFFnPECAufWsr8c8e0Dc5WmKEQEXXHnIve3Z/JeNqAyMxP0yCYj/IWpzxAgMB
-AAEwDQYJKoZIhvcNAQEFBQADggEBAIkge9KkVX+lKhFX4QRd6CvNcpXOhVy2W2nt
-A3lLpsleXQD7OOSMGQFT3t0+oddMeOffBZDe5wpZx9jONf+rnnt8nYMBkollvrds
-FY0/KoGApJQfHXBPr+RO1K4eWCllKRSyjuEMCqXM2+jLEVdGa2j3cLVI3tJ69jga
-0hrCLIV6907qSEx/YjUHPazugxLpgiJMl83TdxmbU1K9/XwC27A0xsx6DZEXS1Cu
-KvM7Bvwx6NC1trrrHXoIC8WaSeKyhFAIJ9+q5R0er2tgB1Ylp4iWYJWITk6o2ISg
-zkWv3/eC022LBCTsChUgn2q+prZSfMLrYHDJyYbyhsHewnxgzwk=
-
-                    
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sau09ret.ifbaiano.edu.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://sau09ret.ifbaiano.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">IFBaiano - Instituto Federal Baiano</OrganizationName>
-    <OrganizationName xml:lang="pt-br">IFBaiano - Instituto Federal Baiano</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">IFBaiano - Instituto Federal Baiano</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="pt-br">IFBaiano - Instituto Federal Baiano</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.ifbaiano.edu.br</OrganizationURL>
-    <OrganizationURL xml:lang="pt-br">http://www.ifbaiano.edu.br</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Humberto Santiago</SurName>
-    <EmailAddress>cotec@ifbaiano.edu.br</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sau09ret.ifbaiano.edu.br.xml b/swamid-interfederations-2.0/sau09ret.ifbaiano.edu.br.xml
deleted file mode 100644
index f4ba77d0..00000000
--- a/swamid-interfederations-2.0/sau09ret.ifbaiano.edu.br.xml
+++ /dev/null
@@ -1,113 +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://sau09ret.ifbaiano.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">edu.br</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">IFBaiano - Instituto Federal Baiano</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="pt-br">IFBaiano - Instituto Federal Baiano</mdui:DisplayName>
-        <mdui:Description xml:lang="en">IFBaiano - Instituto Federal Baiano</mdui:Description>
-        <mdui:Description xml:lang="pt-br">IFBaiano - Instituto Federal Baiano</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.ifbaiano.edu.br</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="pt-br">http://www.ifbaiano.edu.br</mdui:InformationURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-    MIID4jCCAsoCAQAwDQYJKoZIhvcNAQEFBQAwgbYxLDAqBgNVBAoTI0lGQmFpYW5v
-IC0gSW5zdGl0dXRvIEZlZGVyYWwgQmFpYW5vMQ0wCwYDVQQLEwRER1RJMSQwIgYJ
-KoZIhvcNAQkBFhVjb3RlY0BpZmJhaWFuby5lZHUuYnIxETAPBgNVBAcTCFNhbHZh
-ZG9yMQ4wDAYDVQQIEwVCYWhpYTELMAkGA1UEBhMCQlIxITAfBgNVBAMTGHNhdTA5
-cmV0LmlmYmFpYW5vLmVkdS5icjAeFw0xNDA0MTQyMjU4MThaFw0xNzA0MTMyMjU4
-MThaMIG2MSwwKgYDVQQKEyNJRkJhaWFubyAtIEluc3RpdHV0byBGZWRlcmFsIEJh
-aWFubzENMAsGA1UECxMEREdUSTEkMCIGCSqGSIb3DQEJARYVY290ZWNAaWZiYWlh
-bm8uZWR1LmJyMREwDwYDVQQHEwhTYWx2YWRvcjEOMAwGA1UECBMFQmFoaWExCzAJ
-BgNVBAYTAkJSMSEwHwYDVQQDExhzYXUwOXJldC5pZmJhaWFuby5lZHUuYnIwggEi
-MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQD5ijX0kBu2O+XuV9a01EvCeTof
-uSU2K6jzaX5id9jZB0XcsYFo548SFE5qtzIwuWtN5VmdIKdCCycuvY84ON+WbX+D
-reNAq04e+OfS1tf9KSLwfSvIl1+D4IJvx8ul7U8SPEmd3oxLxdwM6XA1Yz1G2ejh
-WxAZtJB4uAX8y+tXwIjMIFldf2oY0sGTnC7c8CtOu/XmDTo1F8rKm+kbqvehueQO
-LodkLDH/ZwFgoEt+eCEDo2lA9B5saYJk7/8i/zW4M/sHgVLew3+mLHlhzeIjpqLj
-yNsYFFnPECAufWsr8c8e0Dc5WmKEQEXXHnIve3Z/JeNqAyMxP0yCYj/IWpzxAgMB
-AAEwDQYJKoZIhvcNAQEFBQADggEBAIkge9KkVX+lKhFX4QRd6CvNcpXOhVy2W2nt
-A3lLpsleXQD7OOSMGQFT3t0+oddMeOffBZDe5wpZx9jONf+rnnt8nYMBkollvrds
-FY0/KoGApJQfHXBPr+RO1K4eWCllKRSyjuEMCqXM2+jLEVdGa2j3cLVI3tJ69jga
-0hrCLIV6907qSEx/YjUHPazugxLpgiJMl83TdxmbU1K9/XwC27A0xsx6DZEXS1Cu
-KvM7Bvwx6NC1trrrHXoIC8WaSeKyhFAIJ9+q5R0er2tgB1Ylp4iWYJWITk6o2ISg
-zkWv3/eC022LBCTsChUgn2q+prZSfMLrYHDJyYbyhsHewnxgzwk=
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sau09ret.ifbaiano.edu.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://sau09ret.ifbaiano.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://sau09ret.ifbaiano.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sau09ret.ifbaiano.edu.br/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://sau09ret.ifbaiano.edu.br/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sau09ret.ifbaiano.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>
-      
-MIID4jCCAsoCAQAwDQYJKoZIhvcNAQEFBQAwgbYxLDAqBgNVBAoTI0lGQmFpYW5v
-IC0gSW5zdGl0dXRvIEZlZGVyYWwgQmFpYW5vMQ0wCwYDVQQLEwRER1RJMSQwIgYJ
-KoZIhvcNAQkBFhVjb3RlY0BpZmJhaWFuby5lZHUuYnIxETAPBgNVBAcTCFNhbHZh
-ZG9yMQ4wDAYDVQQIEwVCYWhpYTELMAkGA1UEBhMCQlIxITAfBgNVBAMTGHNhdTA5
-cmV0LmlmYmFpYW5vLmVkdS5icjAeFw0xNDA0MTQyMjU4MThaFw0xNzA0MTMyMjU4
-MThaMIG2MSwwKgYDVQQKEyNJRkJhaWFubyAtIEluc3RpdHV0byBGZWRlcmFsIEJh
-aWFubzENMAsGA1UECxMEREdUSTEkMCIGCSqGSIb3DQEJARYVY290ZWNAaWZiYWlh
-bm8uZWR1LmJyMREwDwYDVQQHEwhTYWx2YWRvcjEOMAwGA1UECBMFQmFoaWExCzAJ
-BgNVBAYTAkJSMSEwHwYDVQQDExhzYXUwOXJldC5pZmJhaWFuby5lZHUuYnIwggEi
-MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQD5ijX0kBu2O+XuV9a01EvCeTof
-uSU2K6jzaX5id9jZB0XcsYFo548SFE5qtzIwuWtN5VmdIKdCCycuvY84ON+WbX+D
-reNAq04e+OfS1tf9KSLwfSvIl1+D4IJvx8ul7U8SPEmd3oxLxdwM6XA1Yz1G2ejh
-WxAZtJB4uAX8y+tXwIjMIFldf2oY0sGTnC7c8CtOu/XmDTo1F8rKm+kbqvehueQO
-LodkLDH/ZwFgoEt+eCEDo2lA9B5saYJk7/8i/zW4M/sHgVLew3+mLHlhzeIjpqLj
-yNsYFFnPECAufWsr8c8e0Dc5WmKEQEXXHnIve3Z/JeNqAyMxP0yCYj/IWpzxAgMB
-AAEwDQYJKoZIhvcNAQEFBQADggEBAIkge9KkVX+lKhFX4QRd6CvNcpXOhVy2W2nt
-A3lLpsleXQD7OOSMGQFT3t0+oddMeOffBZDe5wpZx9jONf+rnnt8nYMBkollvrds
-FY0/KoGApJQfHXBPr+RO1K4eWCllKRSyjuEMCqXM2+jLEVdGa2j3cLVI3tJ69jga
-0hrCLIV6907qSEx/YjUHPazugxLpgiJMl83TdxmbU1K9/XwC27A0xsx6DZEXS1Cu
-KvM7Bvwx6NC1trrrHXoIC8WaSeKyhFAIJ9+q5R0er2tgB1Ylp4iWYJWITk6o2ISg
-zkWv3/eC022LBCTsChUgn2q+prZSfMLrYHDJyYbyhsHewnxgzwk=
-
-                    
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sau09ret.ifbaiano.edu.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://sau09ret.ifbaiano.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">IFBaiano - Instituto Federal Baiano</OrganizationName>
-    <OrganizationName xml:lang="pt-br">IFBaiano - Instituto Federal Baiano</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">IFBaiano - Instituto Federal Baiano</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="pt-br">IFBaiano - Instituto Federal Baiano</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.ifbaiano.edu.br</OrganizationURL>
-    <OrganizationURL xml:lang="pt-br">http://www.ifbaiano.edu.br</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Humberto Santiago</SurName>
-    <EmailAddress>cotec@ifbaiano.edu.br</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/science-gateway.chain-project.eu-shibboleth.xml b/swamid-interfederations-2.0/science-gateway.chain-project.eu-shibboleth.xml
deleted file mode 100644
index 5e686e42..00000000
--- a/swamid-interfederations-2.0/science-gateway.chain-project.eu-shibboleth.xml
+++ /dev/null
@@ -1,100 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" entityID="https://science-gateway.chain-project.eu/shibboleth">
-  <Extensions>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2014-10-10T07:30:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</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>
-        <mdui:DisplayName xml:lang="en">CHAIN-REDS Science Gateway</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="it">CHAIN-REDS Science Gateway</mdui:DisplayName>
-        <mdui:Description xml:lang="en">The CHAIN-REDS Science Gateway is a standard-based web 2.0 platform to show the use cases and other demonstrative applications identified by the CHAIN-REDS project (www.chain-project.eu) and execute them on a worldwide e-Infrastructure based on different paradigms (Grid, Cloud and local HPC Cluster Computing)</mdui:Description>
-        <mdui:Description xml:lang="it">Il Sciece Gateway del progetto CHAIN-REDS e' una piattaforma web 2.0 basata su standard avente la finilita'  di mostrare speciali casi d'uso ed appicazioni identificate all'interno del progetto (www.chain-project.eu) ed eseguire queste su una infrastruttura di calcolo distribuita su base mondiale e con differenti paradigmi (grid, cloud, HPC)</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://science-gateway.chain-project.eu/service</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="it">http://science-gateway.chain-project.eu/service</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">http://science-gateway.chain-project.eu/policy</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="it">http://science-gateway.chain-project.eu/policy</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://science-gateway.chain-project.eu/Shibboleth.sso/DS"/>
-      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://science-gateway.chain-project.eu/Shibboleth.sso/DS" index="1"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIE6TCCA9GgAwIBAgIRANEjD1aUdtcPPWqsYvlNii0wDQYJKoZIhvcNAQEFBQAw
-NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-IFNTTCBDQTAeFw0xMjA1MTUwMDAwMDBaFw0xNTA1MTUyMzU5NTlaMHoxCzAJBgNV
-BAYTAklUMS4wLAYDVQQKEyVJc3RpdHV0byBOYXppb25hbGUgZGkgRmlzaWNhIE51
-Y2xlYXJlMRMwEQYDVQQLEwpJTkZOLVJPTUEzMSYwJAYDVQQDEx1zY2llbmNlLWdh
-dGV3YXkucm9tYTMuaW5mbi5pdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
-ggEBAMuILctwFvSF9Yr4Nm5pWLH5WYaUBIA7rv0AN4pMaB9hnvuqq8I4Tmi+FlkG
-sI0EmsCO99y+6yo9C8MpALmJSkna2G/+yw9e7C3Ze0nYUXgvR7PEk14ad3d699zM
-Wk8NN/6wrwx5H99wkIs9xygXqXvYZkv5jp8wfGIXhf5UBCp4a8JR+v2ztOsWpC9T
-oLUDFZdd1Ho7aV9DDqyVyHvVhRqkMKXsKJEZ0D5QJMNAcoRChWncs7xJnNUTh4ZZ
-Od0vqp7hqSlI+fX82QHjN6f4lnKAytcBczG5RTfXqYkaxkH/AXVSMfI2gw3zx18s
-XayRZZsutAZhLabY05URI2Ni5fMCAwEAAaOCAawwggGoMB8GA1UdIwQYMBaAFAy9
-k2gM896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBQoCA4lGZcVFGnG4UnclARLBiwF
-rjAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEF
-BQcDAQYIKwYBBQUHAwIwGAYDVR0gBBEwDzANBgsrBgEEAbIxAQICHTA6BgNVHR8E
-MzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENB
-LmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNz
-LnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8v
-b2NzcC50Y3MudGVyZW5hLm9yZzBkBgNVHREEXTBbgh1zY2llbmNlLWdhdGV3YXku
-cm9tYTMuaW5mbi5pdIIYZ3JpZHNydi0wMy5yb21hMy5pbmZuLml0giBzY2llbmNl
-LWdhdGV3YXkuY2hhaW4tcHJvamVjdC5ldTANBgkqhkiG9w0BAQUFAAOCAQEAg4oZ
-gRrEtULAKSkLPZrmmESdqUdVmgMooDo5sknJ9FClzqEHBCVgMp0R/Lu3oZw9kM/2
-F8ImmlWB6oLEkuArS892zIiurvfqEVDRT0Va7UN1tbbC1u8MtzrO3fqJkCtN3lP7
-+AP9hKxecl638JNYqMnVGPq7bgAUIq4bkiJMWrymmbYp/Ru0ZhNXCUt8dH54SMKc
-73DGb2MPM2kDVwtfWci9zMrgRgz2EgYU8coHbgap+pTN/It3I4Swlx7tTtDScQ6Q
-+3BiBRBlmvGinE8WshaUxHGcZ7k84AykVo99TMQPgjPJ3JHlFihk3dTtdXnOHH51
-uYYzGifeDE10paSw+w==
-</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://science-gateway.chain-project.eu/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://science-gateway.chain-project.eu/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://science-gateway.chain-project.eu/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://science-gateway.chain-project.eu/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://science-gateway.chain-project.eu/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://science-gateway.chain-project.eu/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://science-gateway.chain-project.eu/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://science-gateway.chain-project.eu/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://science-gateway.chain-project.eu/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://science-gateway.chain-project.eu/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://science-gateway.chain-project.eu/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <AttributeConsumingService index="1">
-      <ServiceName xml:lang="en">CHAIN-REDS Science Gateway</ServiceName>
-      <ServiceDescription xml:lang="en">The CHAIN-REDS Science Gateway is a standard-based web 2.0 platform to show the use cases and other demonstrative applications identified by the CHAIN-REDS project (www.chain-project.eu) and execute them on a worldwide e-Infrastructure based on different paradigms (Grid, Cloud and local HPC Cluster Computing)</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"/>
-    </AttributeConsumingService>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">INFN ROMA3</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">INFN ROMA3</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.roma3.infn.it/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <EmailAddress>credentials-admin@ct.infn.it</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/science-gateway.chain-project.eu.xml b/swamid-interfederations-2.0/science-gateway.chain-project.eu.xml
deleted file mode 100644
index 5e686e42..00000000
--- a/swamid-interfederations-2.0/science-gateway.chain-project.eu.xml
+++ /dev/null
@@ -1,100 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" entityID="https://science-gateway.chain-project.eu/shibboleth">
-  <Extensions>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2014-10-10T07:30:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</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>
-        <mdui:DisplayName xml:lang="en">CHAIN-REDS Science Gateway</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="it">CHAIN-REDS Science Gateway</mdui:DisplayName>
-        <mdui:Description xml:lang="en">The CHAIN-REDS Science Gateway is a standard-based web 2.0 platform to show the use cases and other demonstrative applications identified by the CHAIN-REDS project (www.chain-project.eu) and execute them on a worldwide e-Infrastructure based on different paradigms (Grid, Cloud and local HPC Cluster Computing)</mdui:Description>
-        <mdui:Description xml:lang="it">Il Sciece Gateway del progetto CHAIN-REDS e' una piattaforma web 2.0 basata su standard avente la finilita'  di mostrare speciali casi d'uso ed appicazioni identificate all'interno del progetto (www.chain-project.eu) ed eseguire queste su una infrastruttura di calcolo distribuita su base mondiale e con differenti paradigmi (grid, cloud, HPC)</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://science-gateway.chain-project.eu/service</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="it">http://science-gateway.chain-project.eu/service</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">http://science-gateway.chain-project.eu/policy</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="it">http://science-gateway.chain-project.eu/policy</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://science-gateway.chain-project.eu/Shibboleth.sso/DS"/>
-      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://science-gateway.chain-project.eu/Shibboleth.sso/DS" index="1"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIE6TCCA9GgAwIBAgIRANEjD1aUdtcPPWqsYvlNii0wDQYJKoZIhvcNAQEFBQAw
-NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-IFNTTCBDQTAeFw0xMjA1MTUwMDAwMDBaFw0xNTA1MTUyMzU5NTlaMHoxCzAJBgNV
-BAYTAklUMS4wLAYDVQQKEyVJc3RpdHV0byBOYXppb25hbGUgZGkgRmlzaWNhIE51
-Y2xlYXJlMRMwEQYDVQQLEwpJTkZOLVJPTUEzMSYwJAYDVQQDEx1zY2llbmNlLWdh
-dGV3YXkucm9tYTMuaW5mbi5pdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
-ggEBAMuILctwFvSF9Yr4Nm5pWLH5WYaUBIA7rv0AN4pMaB9hnvuqq8I4Tmi+FlkG
-sI0EmsCO99y+6yo9C8MpALmJSkna2G/+yw9e7C3Ze0nYUXgvR7PEk14ad3d699zM
-Wk8NN/6wrwx5H99wkIs9xygXqXvYZkv5jp8wfGIXhf5UBCp4a8JR+v2ztOsWpC9T
-oLUDFZdd1Ho7aV9DDqyVyHvVhRqkMKXsKJEZ0D5QJMNAcoRChWncs7xJnNUTh4ZZ
-Od0vqp7hqSlI+fX82QHjN6f4lnKAytcBczG5RTfXqYkaxkH/AXVSMfI2gw3zx18s
-XayRZZsutAZhLabY05URI2Ni5fMCAwEAAaOCAawwggGoMB8GA1UdIwQYMBaAFAy9
-k2gM896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBQoCA4lGZcVFGnG4UnclARLBiwF
-rjAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEF
-BQcDAQYIKwYBBQUHAwIwGAYDVR0gBBEwDzANBgsrBgEEAbIxAQICHTA6BgNVHR8E
-MzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENB
-LmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNz
-LnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8v
-b2NzcC50Y3MudGVyZW5hLm9yZzBkBgNVHREEXTBbgh1zY2llbmNlLWdhdGV3YXku
-cm9tYTMuaW5mbi5pdIIYZ3JpZHNydi0wMy5yb21hMy5pbmZuLml0giBzY2llbmNl
-LWdhdGV3YXkuY2hhaW4tcHJvamVjdC5ldTANBgkqhkiG9w0BAQUFAAOCAQEAg4oZ
-gRrEtULAKSkLPZrmmESdqUdVmgMooDo5sknJ9FClzqEHBCVgMp0R/Lu3oZw9kM/2
-F8ImmlWB6oLEkuArS892zIiurvfqEVDRT0Va7UN1tbbC1u8MtzrO3fqJkCtN3lP7
-+AP9hKxecl638JNYqMnVGPq7bgAUIq4bkiJMWrymmbYp/Ru0ZhNXCUt8dH54SMKc
-73DGb2MPM2kDVwtfWci9zMrgRgz2EgYU8coHbgap+pTN/It3I4Swlx7tTtDScQ6Q
-+3BiBRBlmvGinE8WshaUxHGcZ7k84AykVo99TMQPgjPJ3JHlFihk3dTtdXnOHH51
-uYYzGifeDE10paSw+w==
-</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://science-gateway.chain-project.eu/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://science-gateway.chain-project.eu/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://science-gateway.chain-project.eu/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://science-gateway.chain-project.eu/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://science-gateway.chain-project.eu/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://science-gateway.chain-project.eu/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://science-gateway.chain-project.eu/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://science-gateway.chain-project.eu/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://science-gateway.chain-project.eu/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://science-gateway.chain-project.eu/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://science-gateway.chain-project.eu/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <AttributeConsumingService index="1">
-      <ServiceName xml:lang="en">CHAIN-REDS Science Gateway</ServiceName>
-      <ServiceDescription xml:lang="en">The CHAIN-REDS Science Gateway is a standard-based web 2.0 platform to show the use cases and other demonstrative applications identified by the CHAIN-REDS project (www.chain-project.eu) and execute them on a worldwide e-Infrastructure based on different paradigms (Grid, Cloud and local HPC Cluster Computing)</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"/>
-    </AttributeConsumingService>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">INFN ROMA3</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">INFN ROMA3</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.roma3.infn.it/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <EmailAddress>credentials-admin@ct.infn.it</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 c5dbbd20..00000000
--- a/swamid-interfederations-2.0/sdauth.sciencedirect.com-.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sdauth.sciencedirect.com/">
-  <!--
-		This is a "ScienceDirect" Shibboleth SP for Elsevier B.V.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-08-08T16:50:51Z"/>
-  </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">
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIEoDCCA4igAwIBAgIBATANBgkqhkiG9w0BAQQFADCBljELMAkGA1UEBhMCVVMx
-						DTALBgNVBAgTBE9oaW8xEzARBgNVBAcTCk1pYW1pc2J1cmcxFDASBgNVBAoTC0xF
-						WElTLU5FWElTMSEwHwYDVQQDExhzZGF1dGguc2NpZW5jZWRpcmVjdC5jb20xKjAo
-						BgkqhkiG9w0BCQEWG0VtYWlsTm90TmVlZGVkQGVsc2V2aWVyLmNvbTAeFw0xMjA3
-						MjcxMzU2MDlaFw0yMjA3MjUxMzU2MDlaMIGWMQswCQYDVQQGEwJVUzENMAsGA1UE
-						CBMET2hpbzETMBEGA1UEBxMKTWlhbWlzYnVyZzEUMBIGA1UEChMLTEVYSVMtTkVY
-						SVMxITAfBgNVBAMTGHNkYXV0aC5zY2llbmNlZGlyZWN0LmNvbTEqMCgGCSqGSIb3
-						DQEJARYbRW1haWxOb3ROZWVkZWRAZWxzZXZpZXIuY29tMIIBIjANBgkqhkiG9w0B
-						AQEFAAOCAQ8AMIIBCgKCAQEArv49mYjjAEm6cINEmhRwPk3amwJjENDm/adyrmDV
-						yo8vP2qV0t1yMkQ4/mjtKNbNtHXdYmHhfKWUvkcfGrWSlTTtL58pzUa1yrAa4/zG
-						4yMDsu0TRa9mXrJObLyQgbW7UW6k4cYVFYh7NdNUlYYZJlQcnOnzd1vg5YUoTCG7
-						2bVvN18ECMgmwpetOuU34+C/0VMWmAta11MnI9SVFdBa7/V34Ui3kQURo9rZGBOK
-						X38UCEQaL0t6OaStEVpPOBubbG3Xk/dOCLTqq0L/694oXr38pZLRy+R+PinTTqTL
-						gg2k8d35knIQoQ+/HbTJnTZ+N0RG2Qs8PjQ+saYJtvf8lQIDAQABo4H2MIHzMB0G
-						A1UdDgQWBBRj2Qz+DnqMnI6xhYJHngQCnWxPyjCBwwYDVR0jBIG7MIG4gBSSutEA
-						8L7ay1vyhalDZtLDe5WNRqGBnKSBmTCBljELMAkGA1UEBhMCVVMxDTALBgNVBAgT
-						BE9oaW8xEzARBgNVBAcTCk1pYW1pc2J1cmcxFDASBgNVBAoTC0xFWElTLU5FWElT
-						MSEwHwYDVQQDExhzZGF1dGguc2NpZW5jZWRpcmVjdC5jb20xKjAoBgkqhkiG9w0B
-						CQEWG0VtYWlsTm90TmVlZGVkQGVsc2V2aWVyLmNvbYIBADAMBgNVHRMEBTADAQH/
-						MA0GCSqGSIb3DQEBBAUAA4IBAQAjfpImUzNMumHr2S2vLEsK7z+m7NQNPEarTSYx
-						j+0TNH3W+ylvgjcEprAoXWVEkJEQkvcYHXS8rWqxqZ9zJptPsaqJ/kDEv3i2MguF
-						4iCRAhUJzNCpIvdpaJ2rDTfLfx2mk+2co78Gx6Ixc5TaUYimoKbWdBgetTLMAT0i
-						EUxAtEgo6M2yacBtQGewYQSnA6/pAiJUlDUBvw0tyEUDs8sAv/LrBFnl/jeYcb4V
-						/khhD8zTvlmaPoCttZyxx/VABsfosRfkEgf52ge02TXsHTvDuKe3GKJUqzqYnuQw
-						0sdo9tQp3aTFCi0r/pYqPrB21ZIbkQ/xybNtFratD7yuJ3Or
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://auth.elsevier.com/SHIRE/SAML2/POST" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://auth.elsevier.com/SHIRE/SAML/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sdauth.sciencedirect.com/SHIRE/SAML/POST" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cdc313-auth.elsevier.com/SHIRE/SAML2/POST" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://cdc313-auth.elsevier.com/SHIRE/SAML/POST" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cdc315-auth.elsevier.com/SHIRE/SAML2/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://cdc315-auth.elsevier.com/SHIRE/SAML/POST" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Elsevier B.V.</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Elsevier: ScienceDirect</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.info.sciverse.com/sciencedirect/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Elsevier Shibboleth Support</GivenName>
-    <EmailAddress>mailto:shibbolethsupport@elsevier.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Elsevier Shibboleth Support</GivenName>
-    <EmailAddress>mailto: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 c5dbbd20..00000000
--- a/swamid-interfederations-2.0/sdauth.sciencedirect.com.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sdauth.sciencedirect.com/">
-  <!--
-		This is a "ScienceDirect" Shibboleth SP for Elsevier B.V.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-08-08T16:50:51Z"/>
-  </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">
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIEoDCCA4igAwIBAgIBATANBgkqhkiG9w0BAQQFADCBljELMAkGA1UEBhMCVVMx
-						DTALBgNVBAgTBE9oaW8xEzARBgNVBAcTCk1pYW1pc2J1cmcxFDASBgNVBAoTC0xF
-						WElTLU5FWElTMSEwHwYDVQQDExhzZGF1dGguc2NpZW5jZWRpcmVjdC5jb20xKjAo
-						BgkqhkiG9w0BCQEWG0VtYWlsTm90TmVlZGVkQGVsc2V2aWVyLmNvbTAeFw0xMjA3
-						MjcxMzU2MDlaFw0yMjA3MjUxMzU2MDlaMIGWMQswCQYDVQQGEwJVUzENMAsGA1UE
-						CBMET2hpbzETMBEGA1UEBxMKTWlhbWlzYnVyZzEUMBIGA1UEChMLTEVYSVMtTkVY
-						SVMxITAfBgNVBAMTGHNkYXV0aC5zY2llbmNlZGlyZWN0LmNvbTEqMCgGCSqGSIb3
-						DQEJARYbRW1haWxOb3ROZWVkZWRAZWxzZXZpZXIuY29tMIIBIjANBgkqhkiG9w0B
-						AQEFAAOCAQ8AMIIBCgKCAQEArv49mYjjAEm6cINEmhRwPk3amwJjENDm/adyrmDV
-						yo8vP2qV0t1yMkQ4/mjtKNbNtHXdYmHhfKWUvkcfGrWSlTTtL58pzUa1yrAa4/zG
-						4yMDsu0TRa9mXrJObLyQgbW7UW6k4cYVFYh7NdNUlYYZJlQcnOnzd1vg5YUoTCG7
-						2bVvN18ECMgmwpetOuU34+C/0VMWmAta11MnI9SVFdBa7/V34Ui3kQURo9rZGBOK
-						X38UCEQaL0t6OaStEVpPOBubbG3Xk/dOCLTqq0L/694oXr38pZLRy+R+PinTTqTL
-						gg2k8d35knIQoQ+/HbTJnTZ+N0RG2Qs8PjQ+saYJtvf8lQIDAQABo4H2MIHzMB0G
-						A1UdDgQWBBRj2Qz+DnqMnI6xhYJHngQCnWxPyjCBwwYDVR0jBIG7MIG4gBSSutEA
-						8L7ay1vyhalDZtLDe5WNRqGBnKSBmTCBljELMAkGA1UEBhMCVVMxDTALBgNVBAgT
-						BE9oaW8xEzARBgNVBAcTCk1pYW1pc2J1cmcxFDASBgNVBAoTC0xFWElTLU5FWElT
-						MSEwHwYDVQQDExhzZGF1dGguc2NpZW5jZWRpcmVjdC5jb20xKjAoBgkqhkiG9w0B
-						CQEWG0VtYWlsTm90TmVlZGVkQGVsc2V2aWVyLmNvbYIBADAMBgNVHRMEBTADAQH/
-						MA0GCSqGSIb3DQEBBAUAA4IBAQAjfpImUzNMumHr2S2vLEsK7z+m7NQNPEarTSYx
-						j+0TNH3W+ylvgjcEprAoXWVEkJEQkvcYHXS8rWqxqZ9zJptPsaqJ/kDEv3i2MguF
-						4iCRAhUJzNCpIvdpaJ2rDTfLfx2mk+2co78Gx6Ixc5TaUYimoKbWdBgetTLMAT0i
-						EUxAtEgo6M2yacBtQGewYQSnA6/pAiJUlDUBvw0tyEUDs8sAv/LrBFnl/jeYcb4V
-						/khhD8zTvlmaPoCttZyxx/VABsfosRfkEgf52ge02TXsHTvDuKe3GKJUqzqYnuQw
-						0sdo9tQp3aTFCi0r/pYqPrB21ZIbkQ/xybNtFratD7yuJ3Or
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://auth.elsevier.com/SHIRE/SAML2/POST" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://auth.elsevier.com/SHIRE/SAML/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sdauth.sciencedirect.com/SHIRE/SAML/POST" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cdc313-auth.elsevier.com/SHIRE/SAML2/POST" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://cdc313-auth.elsevier.com/SHIRE/SAML/POST" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cdc315-auth.elsevier.com/SHIRE/SAML2/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://cdc315-auth.elsevier.com/SHIRE/SAML/POST" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Elsevier B.V.</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Elsevier: ScienceDirect</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.info.sciverse.com/sciencedirect/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Elsevier Shibboleth Support</GivenName>
-    <EmailAddress>mailto:shibbolethsupport@elsevier.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Elsevier Shibboleth Support</GivenName>
-    <EmailAddress>mailto:shibbolethsupport@elsevier.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sds.geschkult.fu-berlin.de-shibboleth.xml b/swamid-interfederations-2.0/sds.geschkult.fu-berlin.de-shibboleth.xml
deleted file mode 100644
index a83caf47..00000000
--- a/swamid-interfederations-2.0/sds.geschkult.fu-berlin.de-shibboleth.xml
+++ /dev/null
@@ -1,152 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sds.geschkult.fu-berlin.de/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2012-11-06T13:57:23Z">
-      <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>
-      <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://sds.geschkult.fu-berlin.de/Shibboleth.sso/DS" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="de">Kunst und Funktion</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Kunst und Funktion</mdui:DisplayName>
-        <mdui:Description xml:lang="de">Die Geschichte der Kunst im Wandel ihrer Funktionen", kurz "Kunst und Funktion" genannt, ist ein Internet-Lernprogramm, das einen Überblick über die Kunstgeschichte in 30 Kapiteln unter der besonderen Fragestellung der Funktion von Kunst bietet.</mdui:Description>
-        <mdui:Description xml:lang="en">Die Geschichte der Kunst im Wandel ihrer Funktionen", kurz "Kunst und Funktion" genannt, ist ein Internet-Lernprogramm, das einen Überblick über die Kunstgeschichte in 30 Kapiteln unter der besonderen Fragestellung der Funktion von Kunst bietet.</mdui:Description>
-        <mdui:InformationURL xml:lang="de">http://www.kunst-und-funktion.de/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">http://www.kunst-und-funktion.de/</mdui:InformationURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>sds.geschkult.fu-berlin.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=sds.geschkult.fu-berlin.de,OU=Fachbereich Geschichts- und Kulturwissenschaften,O=Freie Universitaet Berlin,L=Berlin,ST=Berlin,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFsTCCBJmgAwIBAgIHE7TkxI/mSTANBgkqhkiG9w0BAQUFADCBtTELMAkGA1UE
-BhMCREUxDzANBgNVBAgTBkJlcmxpbjEPMA0GA1UEBxMGQmVybGluMSIwIAYDVQQK
-ExlGcmVpZSBVbml2ZXJzaXRhZXQgQmVybGluMQ4wDAYDVQQLEwVaRURBVDEwMC4G
-A1UEAxMnRnJlaWUgVW5pdmVyc2l0YWV0IEJlcmxpbiAtIEZVLUNBIC0gRzAxMR4w
-HAYJKoZIhvcNAQkBFg9jYUBGVS1CZXJsaW4uREUwHhcNMTIwNDIzMTQyOTA4WhcN
-MTcwNDIyMTQyOTA4WjCBszELMAkGA1UEBhMCREUxDzANBgNVBAgTBkJlcmxpbjEP
-MA0GA1UEBxMGQmVybGluMSIwIAYDVQQKExlGcmVpZSBVbml2ZXJzaXRhZXQgQmVy
-bGluMTkwNwYDVQQLEzBGYWNoYmVyZWljaCBHZXNjaGljaHRzLSB1bmQgS3VsdHVy
-d2lzc2Vuc2NoYWZ0ZW4xIzAhBgNVBAMTGnNkcy5nZXNjaGt1bHQuZnUtYmVybGlu
-LmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxQiC2Eb0zNzFtrlQ
-FMqNF4v5tTD2G4MRUDCu6j2q44u6KIq8MmUj0kmEEEwPp+SM2KgBjvWGFbi6JRxo
-KVPgqo7lSMSOxWzvPtdpMet5FNWl1fMCRff35GsWHb9eM7eE6QZDc4zNyyOCWHYk
-f/fwzWk4a5asHg00+92I1WI9+6Qud5IR4jrvoMG7Jbt3vZQLJeCxiwdiNaK+5QxO
-p/H4zXwqrUZsGCovnpgTYXJ70blUzgScyeDc0mceFActrimEfWgSM0jCIsqSALDF
-PSeQLDrLYmFsp/qWN/UeTU2KvO05CQc88f4OcwwTyZ9Bz8M2XElXT9g47eZQDImh
-PFl+PwIDAQABo4IBxDCCAcAwHAYDVR0gBBUwEzARBg8rBgEEAYGtIYIsAQEEAgIw
-CQYDVR0TBAIwADALBgNVHQ8EBAMCBeAwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsG
-AQUFBwMBMB0GA1UdDgQWBBS+8dPy2YsDwhLcALXLrUDmTPk7oTAfBgNVHSMEGDAW
-gBQG4T30b/Qwt3o7V7AxBYl7DVhabDAfBgNVHREEGDAWgRRqLnBvc2VsQGZ1LWJl
-cmxpbi5kZTB1BgNVHR8EbjBsMDSgMqAwhi5odHRwOi8vY2RwMS5wY2EuZGZuLmRl
-L2Z1LWNhL3B1Yi9jcmwvY2FjcmwuY3JsMDSgMqAwhi5odHRwOi8vY2RwMi5wY2Eu
-ZGZuLmRlL2Z1LWNhL3B1Yi9jcmwvY2FjcmwuY3JsMIGQBggrBgEFBQcBAQSBgzCB
-gDA+BggrBgEFBQcwAoYyaHR0cDovL2NkcDEucGNhLmRmbi5kZS9mdS1jYS9wdWIv
-Y2FjZXJ0L2NhY2VydC5jcnQwPgYIKwYBBQUHMAKGMmh0dHA6Ly9jZHAyLnBjYS5k
-Zm4uZGUvZnUtY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MA0GCSqGSIb3DQEBBQUA
-A4IBAQAfB2BcEnVLU64XzvGRlQsoBDONqU0V47hoYMp+fazwwrFpnd4abnN9afd9
-6WTw+w8iPtouHwDBk2ug+y/O9qKWQ/xcnpHxY/8kTFFfL/l4kqTez1+YlPdcSBOc
-xvUVpkOhTzz/NHnOugGURzx0yr5Ed+qjizYuRXY+b5rCpQuvL+XqeHlCE68sPvpK
-T25BX08SdKK4f0oRnXWWh2QCYQ/4NIWv08ONldVPdtAxk8PBmDuoCG/YIlx9dYiN
-XWJJd+8bBwrHOLmMkpGeRTPkylm/xxzaiar+bcLgovnoDgYHtdwLsFqfz6udseTN
-hxwSl97R2/aZr5SYew488kLknAEp
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>sds.geschkult.fu-berlin.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=sds.geschkult.fu-berlin.de,OU=Fachbereich Geschichts- und Kulturwissenschaften,O=Freie Universitaet Berlin,L=Berlin,ST=Berlin,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFsTCCBJmgAwIBAgIHE7TkxI/mSTANBgkqhkiG9w0BAQUFADCBtTELMAkGA1UE
-BhMCREUxDzANBgNVBAgTBkJlcmxpbjEPMA0GA1UEBxMGQmVybGluMSIwIAYDVQQK
-ExlGcmVpZSBVbml2ZXJzaXRhZXQgQmVybGluMQ4wDAYDVQQLEwVaRURBVDEwMC4G
-A1UEAxMnRnJlaWUgVW5pdmVyc2l0YWV0IEJlcmxpbiAtIEZVLUNBIC0gRzAxMR4w
-HAYJKoZIhvcNAQkBFg9jYUBGVS1CZXJsaW4uREUwHhcNMTIwNDIzMTQyOTA4WhcN
-MTcwNDIyMTQyOTA4WjCBszELMAkGA1UEBhMCREUxDzANBgNVBAgTBkJlcmxpbjEP
-MA0GA1UEBxMGQmVybGluMSIwIAYDVQQKExlGcmVpZSBVbml2ZXJzaXRhZXQgQmVy
-bGluMTkwNwYDVQQLEzBGYWNoYmVyZWljaCBHZXNjaGljaHRzLSB1bmQgS3VsdHVy
-d2lzc2Vuc2NoYWZ0ZW4xIzAhBgNVBAMTGnNkcy5nZXNjaGt1bHQuZnUtYmVybGlu
-LmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxQiC2Eb0zNzFtrlQ
-FMqNF4v5tTD2G4MRUDCu6j2q44u6KIq8MmUj0kmEEEwPp+SM2KgBjvWGFbi6JRxo
-KVPgqo7lSMSOxWzvPtdpMet5FNWl1fMCRff35GsWHb9eM7eE6QZDc4zNyyOCWHYk
-f/fwzWk4a5asHg00+92I1WI9+6Qud5IR4jrvoMG7Jbt3vZQLJeCxiwdiNaK+5QxO
-p/H4zXwqrUZsGCovnpgTYXJ70blUzgScyeDc0mceFActrimEfWgSM0jCIsqSALDF
-PSeQLDrLYmFsp/qWN/UeTU2KvO05CQc88f4OcwwTyZ9Bz8M2XElXT9g47eZQDImh
-PFl+PwIDAQABo4IBxDCCAcAwHAYDVR0gBBUwEzARBg8rBgEEAYGtIYIsAQEEAgIw
-CQYDVR0TBAIwADALBgNVHQ8EBAMCBeAwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsG
-AQUFBwMBMB0GA1UdDgQWBBS+8dPy2YsDwhLcALXLrUDmTPk7oTAfBgNVHSMEGDAW
-gBQG4T30b/Qwt3o7V7AxBYl7DVhabDAfBgNVHREEGDAWgRRqLnBvc2VsQGZ1LWJl
-cmxpbi5kZTB1BgNVHR8EbjBsMDSgMqAwhi5odHRwOi8vY2RwMS5wY2EuZGZuLmRl
-L2Z1LWNhL3B1Yi9jcmwvY2FjcmwuY3JsMDSgMqAwhi5odHRwOi8vY2RwMi5wY2Eu
-ZGZuLmRlL2Z1LWNhL3B1Yi9jcmwvY2FjcmwuY3JsMIGQBggrBgEFBQcBAQSBgzCB
-gDA+BggrBgEFBQcwAoYyaHR0cDovL2NkcDEucGNhLmRmbi5kZS9mdS1jYS9wdWIv
-Y2FjZXJ0L2NhY2VydC5jcnQwPgYIKwYBBQUHMAKGMmh0dHA6Ly9jZHAyLnBjYS5k
-Zm4uZGUvZnUtY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MA0GCSqGSIb3DQEBBQUA
-A4IBAQAfB2BcEnVLU64XzvGRlQsoBDONqU0V47hoYMp+fazwwrFpnd4abnN9afd9
-6WTw+w8iPtouHwDBk2ug+y/O9qKWQ/xcnpHxY/8kTFFfL/l4kqTez1+YlPdcSBOc
-xvUVpkOhTzz/NHnOugGURzx0yr5Ed+qjizYuRXY+b5rCpQuvL+XqeHlCE68sPvpK
-T25BX08SdKK4f0oRnXWWh2QCYQ/4NIWv08ONldVPdtAxk8PBmDuoCG/YIlx9dYiN
-XWJJd+8bBwrHOLmMkpGeRTPkylm/xxzaiar+bcLgovnoDgYHtdwLsFqfz6udseTN
-hxwSl97R2/aZr5SYew488kLknAEp
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sds.geschkult.fu-berlin.de/Shibboleth.sso/SLO/Artifact"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sds.geschkult.fu-berlin.de/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sds.geschkult.fu-berlin.de/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sds.geschkult.fu-berlin.de/Shibboleth.sso/SLO/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sds.geschkult.fu-berlin.de/Shibboleth.sso/NIM/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sds.geschkult.fu-berlin.de/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sds.geschkult.fu-berlin.de/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sds.geschkult.fu-berlin.de/Shibboleth.sso/NIM/SOAP"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sds.geschkult.fu-berlin.de/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sds.geschkult.fu-berlin.de/Shibboleth.sso/SAML/POST" index="7"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sds.geschkult.fu-berlin.de/Shibboleth.sso/SAML2/Artifact" index="8"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://sds.geschkult.fu-berlin.de/Shibboleth.sso/SAML2/ECP" index="9"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sds.geschkult.fu-berlin.de/Shibboleth.sso/SAML2/POST" index="10"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sds.geschkult.fu-berlin.de/Shibboleth.sso/SAML2/POST-SimpleSign" index="11"/>
-    <AttributeConsumingService index="1">
-      <ServiceName xml:lang="de">Kunst und Funktion</ServiceName>
-      <ServiceName xml:lang="en">Kunst und Funktion</ServiceName>
-      <ServiceDescription xml:lang="de">Die Geschichte der Kunst im Wandel ihrer Funktionen", kurz "Kunst und Funktion" genannt, ist ein Internet-Lernprogramm, das einen Überblick über die Kunstgeschichte in 30 Kapiteln unter der besonderen Fragestellung der Funktion von Kunst bietet.</ServiceDescription>
-      <ServiceDescription xml:lang="en">Die Geschichte der Kunst im Wandel ihrer Funktionen", kurz "Kunst und Funktion" genannt, ist ein Internet-Lernprogramm, das einen Überblick über die Kunstgeschichte in 30 Kapiteln unter der besonderen Fragestellung der Funktion von Kunst bietet.</ServiceDescription>
-      <RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <RequestedAttribute FriendlyName="o" Name="urn:oid:2.5.4.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-    </AttributeConsumingService>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">e5</OrganizationName>
-    <OrganizationName xml:lang="en">e5</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">Freie Universität Berlin</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">Freie Universität Berlin</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">https://identity.fu-berlin.de/idp-fub/</OrganizationURL>
-    <OrganizationURL xml:lang="en">https://identity.fu-berlin.de/idp-fub/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Johannes</GivenName>
-    <SurName>Posel</SurName>
-    <EmailAddress>mailto:support@geschkult.fu-berlin.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Steffen</GivenName>
-    <SurName>Hofmann</SurName>
-    <EmailAddress>mailto:fudis@zedat.fu-berlin.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="administrative">
-    <GivenName>Johannes</GivenName>
-    <SurName>Posel</SurName>
-    <EmailAddress>mailto:support@geschkult.fu-berlin.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="support">
-    <GivenName>Johannes</GivenName>
-    <SurName>Posel</SurName>
-    <EmailAddress>mailto:support@geschkult.fu-berlin.de</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sds.geschkult.fu-berlin.de.xml b/swamid-interfederations-2.0/sds.geschkult.fu-berlin.de.xml
deleted file mode 100644
index a83caf47..00000000
--- a/swamid-interfederations-2.0/sds.geschkult.fu-berlin.de.xml
+++ /dev/null
@@ -1,152 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sds.geschkult.fu-berlin.de/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2012-11-06T13:57:23Z">
-      <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>
-      <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://sds.geschkult.fu-berlin.de/Shibboleth.sso/DS" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="de">Kunst und Funktion</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Kunst und Funktion</mdui:DisplayName>
-        <mdui:Description xml:lang="de">Die Geschichte der Kunst im Wandel ihrer Funktionen", kurz "Kunst und Funktion" genannt, ist ein Internet-Lernprogramm, das einen Überblick über die Kunstgeschichte in 30 Kapiteln unter der besonderen Fragestellung der Funktion von Kunst bietet.</mdui:Description>
-        <mdui:Description xml:lang="en">Die Geschichte der Kunst im Wandel ihrer Funktionen", kurz "Kunst und Funktion" genannt, ist ein Internet-Lernprogramm, das einen Überblick über die Kunstgeschichte in 30 Kapiteln unter der besonderen Fragestellung der Funktion von Kunst bietet.</mdui:Description>
-        <mdui:InformationURL xml:lang="de">http://www.kunst-und-funktion.de/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">http://www.kunst-und-funktion.de/</mdui:InformationURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>sds.geschkult.fu-berlin.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=sds.geschkult.fu-berlin.de,OU=Fachbereich Geschichts- und Kulturwissenschaften,O=Freie Universitaet Berlin,L=Berlin,ST=Berlin,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFsTCCBJmgAwIBAgIHE7TkxI/mSTANBgkqhkiG9w0BAQUFADCBtTELMAkGA1UE
-BhMCREUxDzANBgNVBAgTBkJlcmxpbjEPMA0GA1UEBxMGQmVybGluMSIwIAYDVQQK
-ExlGcmVpZSBVbml2ZXJzaXRhZXQgQmVybGluMQ4wDAYDVQQLEwVaRURBVDEwMC4G
-A1UEAxMnRnJlaWUgVW5pdmVyc2l0YWV0IEJlcmxpbiAtIEZVLUNBIC0gRzAxMR4w
-HAYJKoZIhvcNAQkBFg9jYUBGVS1CZXJsaW4uREUwHhcNMTIwNDIzMTQyOTA4WhcN
-MTcwNDIyMTQyOTA4WjCBszELMAkGA1UEBhMCREUxDzANBgNVBAgTBkJlcmxpbjEP
-MA0GA1UEBxMGQmVybGluMSIwIAYDVQQKExlGcmVpZSBVbml2ZXJzaXRhZXQgQmVy
-bGluMTkwNwYDVQQLEzBGYWNoYmVyZWljaCBHZXNjaGljaHRzLSB1bmQgS3VsdHVy
-d2lzc2Vuc2NoYWZ0ZW4xIzAhBgNVBAMTGnNkcy5nZXNjaGt1bHQuZnUtYmVybGlu
-LmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxQiC2Eb0zNzFtrlQ
-FMqNF4v5tTD2G4MRUDCu6j2q44u6KIq8MmUj0kmEEEwPp+SM2KgBjvWGFbi6JRxo
-KVPgqo7lSMSOxWzvPtdpMet5FNWl1fMCRff35GsWHb9eM7eE6QZDc4zNyyOCWHYk
-f/fwzWk4a5asHg00+92I1WI9+6Qud5IR4jrvoMG7Jbt3vZQLJeCxiwdiNaK+5QxO
-p/H4zXwqrUZsGCovnpgTYXJ70blUzgScyeDc0mceFActrimEfWgSM0jCIsqSALDF
-PSeQLDrLYmFsp/qWN/UeTU2KvO05CQc88f4OcwwTyZ9Bz8M2XElXT9g47eZQDImh
-PFl+PwIDAQABo4IBxDCCAcAwHAYDVR0gBBUwEzARBg8rBgEEAYGtIYIsAQEEAgIw
-CQYDVR0TBAIwADALBgNVHQ8EBAMCBeAwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsG
-AQUFBwMBMB0GA1UdDgQWBBS+8dPy2YsDwhLcALXLrUDmTPk7oTAfBgNVHSMEGDAW
-gBQG4T30b/Qwt3o7V7AxBYl7DVhabDAfBgNVHREEGDAWgRRqLnBvc2VsQGZ1LWJl
-cmxpbi5kZTB1BgNVHR8EbjBsMDSgMqAwhi5odHRwOi8vY2RwMS5wY2EuZGZuLmRl
-L2Z1LWNhL3B1Yi9jcmwvY2FjcmwuY3JsMDSgMqAwhi5odHRwOi8vY2RwMi5wY2Eu
-ZGZuLmRlL2Z1LWNhL3B1Yi9jcmwvY2FjcmwuY3JsMIGQBggrBgEFBQcBAQSBgzCB
-gDA+BggrBgEFBQcwAoYyaHR0cDovL2NkcDEucGNhLmRmbi5kZS9mdS1jYS9wdWIv
-Y2FjZXJ0L2NhY2VydC5jcnQwPgYIKwYBBQUHMAKGMmh0dHA6Ly9jZHAyLnBjYS5k
-Zm4uZGUvZnUtY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MA0GCSqGSIb3DQEBBQUA
-A4IBAQAfB2BcEnVLU64XzvGRlQsoBDONqU0V47hoYMp+fazwwrFpnd4abnN9afd9
-6WTw+w8iPtouHwDBk2ug+y/O9qKWQ/xcnpHxY/8kTFFfL/l4kqTez1+YlPdcSBOc
-xvUVpkOhTzz/NHnOugGURzx0yr5Ed+qjizYuRXY+b5rCpQuvL+XqeHlCE68sPvpK
-T25BX08SdKK4f0oRnXWWh2QCYQ/4NIWv08ONldVPdtAxk8PBmDuoCG/YIlx9dYiN
-XWJJd+8bBwrHOLmMkpGeRTPkylm/xxzaiar+bcLgovnoDgYHtdwLsFqfz6udseTN
-hxwSl97R2/aZr5SYew488kLknAEp
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>sds.geschkult.fu-berlin.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=sds.geschkult.fu-berlin.de,OU=Fachbereich Geschichts- und Kulturwissenschaften,O=Freie Universitaet Berlin,L=Berlin,ST=Berlin,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFsTCCBJmgAwIBAgIHE7TkxI/mSTANBgkqhkiG9w0BAQUFADCBtTELMAkGA1UE
-BhMCREUxDzANBgNVBAgTBkJlcmxpbjEPMA0GA1UEBxMGQmVybGluMSIwIAYDVQQK
-ExlGcmVpZSBVbml2ZXJzaXRhZXQgQmVybGluMQ4wDAYDVQQLEwVaRURBVDEwMC4G
-A1UEAxMnRnJlaWUgVW5pdmVyc2l0YWV0IEJlcmxpbiAtIEZVLUNBIC0gRzAxMR4w
-HAYJKoZIhvcNAQkBFg9jYUBGVS1CZXJsaW4uREUwHhcNMTIwNDIzMTQyOTA4WhcN
-MTcwNDIyMTQyOTA4WjCBszELMAkGA1UEBhMCREUxDzANBgNVBAgTBkJlcmxpbjEP
-MA0GA1UEBxMGQmVybGluMSIwIAYDVQQKExlGcmVpZSBVbml2ZXJzaXRhZXQgQmVy
-bGluMTkwNwYDVQQLEzBGYWNoYmVyZWljaCBHZXNjaGljaHRzLSB1bmQgS3VsdHVy
-d2lzc2Vuc2NoYWZ0ZW4xIzAhBgNVBAMTGnNkcy5nZXNjaGt1bHQuZnUtYmVybGlu
-LmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxQiC2Eb0zNzFtrlQ
-FMqNF4v5tTD2G4MRUDCu6j2q44u6KIq8MmUj0kmEEEwPp+SM2KgBjvWGFbi6JRxo
-KVPgqo7lSMSOxWzvPtdpMet5FNWl1fMCRff35GsWHb9eM7eE6QZDc4zNyyOCWHYk
-f/fwzWk4a5asHg00+92I1WI9+6Qud5IR4jrvoMG7Jbt3vZQLJeCxiwdiNaK+5QxO
-p/H4zXwqrUZsGCovnpgTYXJ70blUzgScyeDc0mceFActrimEfWgSM0jCIsqSALDF
-PSeQLDrLYmFsp/qWN/UeTU2KvO05CQc88f4OcwwTyZ9Bz8M2XElXT9g47eZQDImh
-PFl+PwIDAQABo4IBxDCCAcAwHAYDVR0gBBUwEzARBg8rBgEEAYGtIYIsAQEEAgIw
-CQYDVR0TBAIwADALBgNVHQ8EBAMCBeAwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsG
-AQUFBwMBMB0GA1UdDgQWBBS+8dPy2YsDwhLcALXLrUDmTPk7oTAfBgNVHSMEGDAW
-gBQG4T30b/Qwt3o7V7AxBYl7DVhabDAfBgNVHREEGDAWgRRqLnBvc2VsQGZ1LWJl
-cmxpbi5kZTB1BgNVHR8EbjBsMDSgMqAwhi5odHRwOi8vY2RwMS5wY2EuZGZuLmRl
-L2Z1LWNhL3B1Yi9jcmwvY2FjcmwuY3JsMDSgMqAwhi5odHRwOi8vY2RwMi5wY2Eu
-ZGZuLmRlL2Z1LWNhL3B1Yi9jcmwvY2FjcmwuY3JsMIGQBggrBgEFBQcBAQSBgzCB
-gDA+BggrBgEFBQcwAoYyaHR0cDovL2NkcDEucGNhLmRmbi5kZS9mdS1jYS9wdWIv
-Y2FjZXJ0L2NhY2VydC5jcnQwPgYIKwYBBQUHMAKGMmh0dHA6Ly9jZHAyLnBjYS5k
-Zm4uZGUvZnUtY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MA0GCSqGSIb3DQEBBQUA
-A4IBAQAfB2BcEnVLU64XzvGRlQsoBDONqU0V47hoYMp+fazwwrFpnd4abnN9afd9
-6WTw+w8iPtouHwDBk2ug+y/O9qKWQ/xcnpHxY/8kTFFfL/l4kqTez1+YlPdcSBOc
-xvUVpkOhTzz/NHnOugGURzx0yr5Ed+qjizYuRXY+b5rCpQuvL+XqeHlCE68sPvpK
-T25BX08SdKK4f0oRnXWWh2QCYQ/4NIWv08ONldVPdtAxk8PBmDuoCG/YIlx9dYiN
-XWJJd+8bBwrHOLmMkpGeRTPkylm/xxzaiar+bcLgovnoDgYHtdwLsFqfz6udseTN
-hxwSl97R2/aZr5SYew488kLknAEp
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sds.geschkult.fu-berlin.de/Shibboleth.sso/SLO/Artifact"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sds.geschkult.fu-berlin.de/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sds.geschkult.fu-berlin.de/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sds.geschkult.fu-berlin.de/Shibboleth.sso/SLO/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sds.geschkult.fu-berlin.de/Shibboleth.sso/NIM/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sds.geschkult.fu-berlin.de/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sds.geschkult.fu-berlin.de/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sds.geschkult.fu-berlin.de/Shibboleth.sso/NIM/SOAP"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sds.geschkult.fu-berlin.de/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sds.geschkult.fu-berlin.de/Shibboleth.sso/SAML/POST" index="7"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sds.geschkult.fu-berlin.de/Shibboleth.sso/SAML2/Artifact" index="8"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://sds.geschkult.fu-berlin.de/Shibboleth.sso/SAML2/ECP" index="9"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sds.geschkult.fu-berlin.de/Shibboleth.sso/SAML2/POST" index="10"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sds.geschkult.fu-berlin.de/Shibboleth.sso/SAML2/POST-SimpleSign" index="11"/>
-    <AttributeConsumingService index="1">
-      <ServiceName xml:lang="de">Kunst und Funktion</ServiceName>
-      <ServiceName xml:lang="en">Kunst und Funktion</ServiceName>
-      <ServiceDescription xml:lang="de">Die Geschichte der Kunst im Wandel ihrer Funktionen", kurz "Kunst und Funktion" genannt, ist ein Internet-Lernprogramm, das einen Überblick über die Kunstgeschichte in 30 Kapiteln unter der besonderen Fragestellung der Funktion von Kunst bietet.</ServiceDescription>
-      <ServiceDescription xml:lang="en">Die Geschichte der Kunst im Wandel ihrer Funktionen", kurz "Kunst und Funktion" genannt, ist ein Internet-Lernprogramm, das einen Überblick über die Kunstgeschichte in 30 Kapiteln unter der besonderen Fragestellung der Funktion von Kunst bietet.</ServiceDescription>
-      <RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <RequestedAttribute FriendlyName="o" Name="urn:oid:2.5.4.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-    </AttributeConsumingService>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">e5</OrganizationName>
-    <OrganizationName xml:lang="en">e5</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">Freie Universität Berlin</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">Freie Universität Berlin</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">https://identity.fu-berlin.de/idp-fub/</OrganizationURL>
-    <OrganizationURL xml:lang="en">https://identity.fu-berlin.de/idp-fub/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Johannes</GivenName>
-    <SurName>Posel</SurName>
-    <EmailAddress>mailto:support@geschkult.fu-berlin.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Steffen</GivenName>
-    <SurName>Hofmann</SurName>
-    <EmailAddress>mailto:fudis@zedat.fu-berlin.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="administrative">
-    <GivenName>Johannes</GivenName>
-    <SurName>Posel</SurName>
-    <EmailAddress>mailto:support@geschkult.fu-berlin.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="support">
-    <GivenName>Johannes</GivenName>
-    <SurName>Posel</SurName>
-    <EmailAddress>mailto:support@geschkult.fu-berlin.de</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/search.de.dariah.eu-schereg.xml b/swamid-interfederations-2.0/search.de.dariah.eu-schereg.xml
deleted file mode 100644
index eb612c83..00000000
--- a/swamid-interfederations-2.0/search.de.dariah.eu-schereg.xml
+++ /dev/null
@@ -1,143 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://search.de.dariah.eu/schereg">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2014-04-11T07:22:30Z">
-      <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: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://search.de.dariah.eu/schereg/saml/login/alias/schereg?disco=true" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="de">DARIAH Schema Registry</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">DARIAH Schema Registry</mdui:DisplayName>
-        <mdui:Description xml:lang="de">DARIAH Schema Registry</mdui:Description>
-        <mdui:Description xml:lang="en">DARIAH Schema Registry</mdui:Description>
-        <mdui:InformationURL xml:lang="de">http://dariah.eu/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">http://dariah.eu/</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://de.dariah.eu/ServicePrivacyPolicy</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>search.de.dariah.eu</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=search.de.dariah.eu,O=Georg-August-Universitaet Goettingen,L=Goettingen,ST=Niedersachsen,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIGAjCCBOqgAwIBAgIHF0FMzwiCfDANBgkqhkiG9w0BAQUFADCBrjELMAkGA1UE
-BhMCREUxFjAUBgNVBAgTDU5pZWRlcnNhY2hzZW4xEzARBgNVBAcTCkdvZXR0aW5n
-ZW4xLTArBgNVBAoTJEdlb3JnLUF1Z3VzdC1Vbml2ZXJzaXRhZXQgR29ldHRpbmdl
-bjEjMCEGA1UEAxMaVW5pdmVyc2l0YWV0LUdvZXR0aW5nZW4gQ0ExHjAcBgkqhkiG
-9w0BCQEWD2d3ZGctY2FAZ3dkZy5kZTAeFw0xNDAzMTMxNTMxMTJaFw0xOTAzMTIx
-NTMxMTJaMIGHMQswCQYDVQQGEwJERTEWMBQGA1UECBMNTmllZGVyc2FjaHNlbjET
-MBEGA1UEBxMKR29ldHRpbmdlbjEtMCsGA1UEChMkR2VvcmctQXVndXN0LVVuaXZl
-cnNpdGFldCBHb2V0dGluZ2VuMRwwGgYDVQQDExNzZWFyY2guZGUuZGFyaWFoLmV1
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu7pmrlhefv+M2gPqsZGL
-VcaIqF4WYCm6UGO6P2CzjPCMXOoXdHI5dCTAPl0moSDoTLIJ9PHrCsel5qpdblfh
-nuB7b2TbeehaE/kZqduvcbZn3/TTOdax6dwmlbQbbkwEjPcLTiII1co9vccN3OJj
-pClCGbM+g4iPYtqRcSJlmgh6sbyEi8GaRSt/hrVjLz7LgLA4zlwFNCWvwWnapNOw
-PgVINO1PUW7/gUuqaXD4nigvvJueyj5vI17/7XTOJNVOQGdx+WnPutdJupqFR967
-TGKMCYwZivzMh+a36onE+N81dMRERNa+xUbaef0JmWodMRRJX/XINEmNMtvGgB3A
-wQIDAQABo4ICSDCCAkQwOQYDVR0gBDIwMDARBg8rBgEEAYGtIYIsAQEEAwEwEQYP
-KwYBBAGBrSGCLAIBBAMBMAgGBmeBDAECAjAJBgNVHRMEAjAAMAsGA1UdDwQEAwIE
-8DAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwHQYDVR0OBBYEFCCZUdbp
-ix/yKKub4Cu5WlpydwXbMB8GA1UdIwQYMBaAFB29c8xt7m4cdHDZoxs6uqgn3rzr
-MB4GA1UdEQQXMBWCE3NlYXJjaC5kZS5kYXJpYWguZXUwgY8GA1UdHwSBhzCBhDBA
-oD6gPIY6aHR0cDovL2NkcDEucGNhLmRmbi5kZS91bmktZ29ldHRpbmdlbi1jYS9w
-dWIvY3JsL2NhY3JsLmNybDBAoD6gPIY6aHR0cDovL2NkcDIucGNhLmRmbi5kZS91
-bmktZ29ldHRpbmdlbi1jYS9wdWIvY3JsL2NhY3JsLmNybDCB3QYIKwYBBQUHAQEE
-gdAwgc0wMwYIKwYBBQUHMAGGJ2h0dHA6Ly9vY3NwLnBjYS5kZm4uZGUvT0NTUC1T
-ZXJ2ZXIvT0NTUDBKBggrBgEFBQcwAoY+aHR0cDovL2NkcDEucGNhLmRmbi5kZS91
-bmktZ29ldHRpbmdlbi1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwSgYIKwYBBQUH
-MAKGPmh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvdW5pLWdvZXR0aW5nZW4tY2EvcHVi
-L2NhY2VydC9jYWNlcnQuY3J0MA0GCSqGSIb3DQEBBQUAA4IBAQCATCaFTv5NkXiH
-Gqk6O1y9Zkt7MtJheq1ATf2itAeCHVIapN6damvsHhb5IUwKu4pSAyT4h5c6PCiK
-N7f+C0KJPSbH7yEz62BdSa2n+Ut+L8rdz2KjxYC3LMtZgJDOCqVP9c3JL6zGQItA
-3RaIPoIzrB4kD/pJz3I2Tl7JfbnYSDtTaLVzysHtuApY5N+zjLJ54GokAlB5hjcm
-CTn74yz2sDJeQUgUC5DqgxOsPHcnqbNd999xBtDgHZ6xIJwVGhGaTKd1dp7XqH/b
-Lw95jxPRFCuuzadG3QQwB3TtR4fzqDp1envPT4sfv3fvuMd9uKd1AVZhQT4Ekknp
-VJ2CRsza
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>search.de.dariah.eu</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=search.de.dariah.eu,O=Georg-August-Universitaet Goettingen,L=Goettingen,ST=Niedersachsen,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIGAjCCBOqgAwIBAgIHF0FMzwiCfDANBgkqhkiG9w0BAQUFADCBrjELMAkGA1UE
-BhMCREUxFjAUBgNVBAgTDU5pZWRlcnNhY2hzZW4xEzARBgNVBAcTCkdvZXR0aW5n
-ZW4xLTArBgNVBAoTJEdlb3JnLUF1Z3VzdC1Vbml2ZXJzaXRhZXQgR29ldHRpbmdl
-bjEjMCEGA1UEAxMaVW5pdmVyc2l0YWV0LUdvZXR0aW5nZW4gQ0ExHjAcBgkqhkiG
-9w0BCQEWD2d3ZGctY2FAZ3dkZy5kZTAeFw0xNDAzMTMxNTMxMTJaFw0xOTAzMTIx
-NTMxMTJaMIGHMQswCQYDVQQGEwJERTEWMBQGA1UECBMNTmllZGVyc2FjaHNlbjET
-MBEGA1UEBxMKR29ldHRpbmdlbjEtMCsGA1UEChMkR2VvcmctQXVndXN0LVVuaXZl
-cnNpdGFldCBHb2V0dGluZ2VuMRwwGgYDVQQDExNzZWFyY2guZGUuZGFyaWFoLmV1
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu7pmrlhefv+M2gPqsZGL
-VcaIqF4WYCm6UGO6P2CzjPCMXOoXdHI5dCTAPl0moSDoTLIJ9PHrCsel5qpdblfh
-nuB7b2TbeehaE/kZqduvcbZn3/TTOdax6dwmlbQbbkwEjPcLTiII1co9vccN3OJj
-pClCGbM+g4iPYtqRcSJlmgh6sbyEi8GaRSt/hrVjLz7LgLA4zlwFNCWvwWnapNOw
-PgVINO1PUW7/gUuqaXD4nigvvJueyj5vI17/7XTOJNVOQGdx+WnPutdJupqFR967
-TGKMCYwZivzMh+a36onE+N81dMRERNa+xUbaef0JmWodMRRJX/XINEmNMtvGgB3A
-wQIDAQABo4ICSDCCAkQwOQYDVR0gBDIwMDARBg8rBgEEAYGtIYIsAQEEAwEwEQYP
-KwYBBAGBrSGCLAIBBAMBMAgGBmeBDAECAjAJBgNVHRMEAjAAMAsGA1UdDwQEAwIE
-8DAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwHQYDVR0OBBYEFCCZUdbp
-ix/yKKub4Cu5WlpydwXbMB8GA1UdIwQYMBaAFB29c8xt7m4cdHDZoxs6uqgn3rzr
-MB4GA1UdEQQXMBWCE3NlYXJjaC5kZS5kYXJpYWguZXUwgY8GA1UdHwSBhzCBhDBA
-oD6gPIY6aHR0cDovL2NkcDEucGNhLmRmbi5kZS91bmktZ29ldHRpbmdlbi1jYS9w
-dWIvY3JsL2NhY3JsLmNybDBAoD6gPIY6aHR0cDovL2NkcDIucGNhLmRmbi5kZS91
-bmktZ29ldHRpbmdlbi1jYS9wdWIvY3JsL2NhY3JsLmNybDCB3QYIKwYBBQUHAQEE
-gdAwgc0wMwYIKwYBBQUHMAGGJ2h0dHA6Ly9vY3NwLnBjYS5kZm4uZGUvT0NTUC1T
-ZXJ2ZXIvT0NTUDBKBggrBgEFBQcwAoY+aHR0cDovL2NkcDEucGNhLmRmbi5kZS91
-bmktZ29ldHRpbmdlbi1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwSgYIKwYBBQUH
-MAKGPmh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvdW5pLWdvZXR0aW5nZW4tY2EvcHVi
-L2NhY2VydC9jYWNlcnQuY3J0MA0GCSqGSIb3DQEBBQUAA4IBAQCATCaFTv5NkXiH
-Gqk6O1y9Zkt7MtJheq1ATf2itAeCHVIapN6damvsHhb5IUwKu4pSAyT4h5c6PCiK
-N7f+C0KJPSbH7yEz62BdSa2n+Ut+L8rdz2KjxYC3LMtZgJDOCqVP9c3JL6zGQItA
-3RaIPoIzrB4kD/pJz3I2Tl7JfbnYSDtTaLVzysHtuApY5N+zjLJ54GokAlB5hjcm
-CTn74yz2sDJeQUgUC5DqgxOsPHcnqbNd999xBtDgHZ6xIJwVGhGaTKd1dp7XqH/b
-Lw95jxPRFCuuzadG3QQwB3TtR4fzqDp1envPT4sfv3fvuMd9uKd1AVZhQT4Ekknp
-VJ2CRsza
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://search.de.dariah.eu/schereg/saml/SingleLogout/alias/schereg"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://search.de.dariah.eu/schereg/saml/SingleLogout/alias/schereg"/>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://search.de.dariah.eu/schereg/saml/SSO/alias/schereg" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://search.de.dariah.eu/schereg/saml/SSO/alias/schereg" index="1"/>
-    <AttributeConsumingService index="1">
-      <ServiceName xml:lang="de">DARIAH Schema Registry</ServiceName>
-      <ServiceName xml:lang="en">DARIAH Schema Registry</ServiceName>
-      <ServiceDescription xml:lang="de">DARIAH Schema Registry</ServiceDescription>
-      <ServiceDescription xml:lang="en">DARIAH Schema Registry</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"/>
-    </AttributeConsumingService>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">e112</OrganizationName>
-    <OrganizationName xml:lang="en">e112</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">Gesellschaft für wissenschaftliche Datenverarbeitung mbH</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">Gesellschaft für wissenschaftliche Datenverarbeitung mbH</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.gwdg.de</OrganizationURL>
-    <OrganizationURL xml:lang="en">http://www.gwdg.de</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Tobias</GivenName>
-    <SurName>Gradl</SurName>
-    <EmailAddress>mailto:tobias.gradl@uni-bamberg.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="support">
-    <GivenName>Dariah</GivenName>
-    <SurName>Support</SurName>
-    <EmailAddress>mailto:register@dariah.eu</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/search.de.dariah.eu-search.xml b/swamid-interfederations-2.0/search.de.dariah.eu-search.xml
deleted file mode 100644
index c2382cfd..00000000
--- a/swamid-interfederations-2.0/search.de.dariah.eu-search.xml
+++ /dev/null
@@ -1,143 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://search.de.dariah.eu/search">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2014-04-11T07:21:53Z">
-      <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: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://search.de.dariah.eu/search/saml/login/alias/search?disco=true" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="de">DARIAH Generic Search</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">DARIAH Generic Search</mdui:DisplayName>
-        <mdui:Description xml:lang="de">DARIAH Generic Search</mdui:Description>
-        <mdui:Description xml:lang="en">DARIAH Generic Search</mdui:Description>
-        <mdui:InformationURL xml:lang="de">http://dariah.eu/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">http://dariah.eu/</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://de.dariah.eu/ServicePrivacyPolicy</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>search.de.dariah.eu</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=search.de.dariah.eu,O=Georg-August-Universitaet Goettingen,L=Goettingen,ST=Niedersachsen,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIGAjCCBOqgAwIBAgIHF0FMzwiCfDANBgkqhkiG9w0BAQUFADCBrjELMAkGA1UE
-BhMCREUxFjAUBgNVBAgTDU5pZWRlcnNhY2hzZW4xEzARBgNVBAcTCkdvZXR0aW5n
-ZW4xLTArBgNVBAoTJEdlb3JnLUF1Z3VzdC1Vbml2ZXJzaXRhZXQgR29ldHRpbmdl
-bjEjMCEGA1UEAxMaVW5pdmVyc2l0YWV0LUdvZXR0aW5nZW4gQ0ExHjAcBgkqhkiG
-9w0BCQEWD2d3ZGctY2FAZ3dkZy5kZTAeFw0xNDAzMTMxNTMxMTJaFw0xOTAzMTIx
-NTMxMTJaMIGHMQswCQYDVQQGEwJERTEWMBQGA1UECBMNTmllZGVyc2FjaHNlbjET
-MBEGA1UEBxMKR29ldHRpbmdlbjEtMCsGA1UEChMkR2VvcmctQXVndXN0LVVuaXZl
-cnNpdGFldCBHb2V0dGluZ2VuMRwwGgYDVQQDExNzZWFyY2guZGUuZGFyaWFoLmV1
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu7pmrlhefv+M2gPqsZGL
-VcaIqF4WYCm6UGO6P2CzjPCMXOoXdHI5dCTAPl0moSDoTLIJ9PHrCsel5qpdblfh
-nuB7b2TbeehaE/kZqduvcbZn3/TTOdax6dwmlbQbbkwEjPcLTiII1co9vccN3OJj
-pClCGbM+g4iPYtqRcSJlmgh6sbyEi8GaRSt/hrVjLz7LgLA4zlwFNCWvwWnapNOw
-PgVINO1PUW7/gUuqaXD4nigvvJueyj5vI17/7XTOJNVOQGdx+WnPutdJupqFR967
-TGKMCYwZivzMh+a36onE+N81dMRERNa+xUbaef0JmWodMRRJX/XINEmNMtvGgB3A
-wQIDAQABo4ICSDCCAkQwOQYDVR0gBDIwMDARBg8rBgEEAYGtIYIsAQEEAwEwEQYP
-KwYBBAGBrSGCLAIBBAMBMAgGBmeBDAECAjAJBgNVHRMEAjAAMAsGA1UdDwQEAwIE
-8DAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwHQYDVR0OBBYEFCCZUdbp
-ix/yKKub4Cu5WlpydwXbMB8GA1UdIwQYMBaAFB29c8xt7m4cdHDZoxs6uqgn3rzr
-MB4GA1UdEQQXMBWCE3NlYXJjaC5kZS5kYXJpYWguZXUwgY8GA1UdHwSBhzCBhDBA
-oD6gPIY6aHR0cDovL2NkcDEucGNhLmRmbi5kZS91bmktZ29ldHRpbmdlbi1jYS9w
-dWIvY3JsL2NhY3JsLmNybDBAoD6gPIY6aHR0cDovL2NkcDIucGNhLmRmbi5kZS91
-bmktZ29ldHRpbmdlbi1jYS9wdWIvY3JsL2NhY3JsLmNybDCB3QYIKwYBBQUHAQEE
-gdAwgc0wMwYIKwYBBQUHMAGGJ2h0dHA6Ly9vY3NwLnBjYS5kZm4uZGUvT0NTUC1T
-ZXJ2ZXIvT0NTUDBKBggrBgEFBQcwAoY+aHR0cDovL2NkcDEucGNhLmRmbi5kZS91
-bmktZ29ldHRpbmdlbi1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwSgYIKwYBBQUH
-MAKGPmh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvdW5pLWdvZXR0aW5nZW4tY2EvcHVi
-L2NhY2VydC9jYWNlcnQuY3J0MA0GCSqGSIb3DQEBBQUAA4IBAQCATCaFTv5NkXiH
-Gqk6O1y9Zkt7MtJheq1ATf2itAeCHVIapN6damvsHhb5IUwKu4pSAyT4h5c6PCiK
-N7f+C0KJPSbH7yEz62BdSa2n+Ut+L8rdz2KjxYC3LMtZgJDOCqVP9c3JL6zGQItA
-3RaIPoIzrB4kD/pJz3I2Tl7JfbnYSDtTaLVzysHtuApY5N+zjLJ54GokAlB5hjcm
-CTn74yz2sDJeQUgUC5DqgxOsPHcnqbNd999xBtDgHZ6xIJwVGhGaTKd1dp7XqH/b
-Lw95jxPRFCuuzadG3QQwB3TtR4fzqDp1envPT4sfv3fvuMd9uKd1AVZhQT4Ekknp
-VJ2CRsza
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>search.de.dariah.eu</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=search.de.dariah.eu,O=Georg-August-Universitaet Goettingen,L=Goettingen,ST=Niedersachsen,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIGAjCCBOqgAwIBAgIHF0FMzwiCfDANBgkqhkiG9w0BAQUFADCBrjELMAkGA1UE
-BhMCREUxFjAUBgNVBAgTDU5pZWRlcnNhY2hzZW4xEzARBgNVBAcTCkdvZXR0aW5n
-ZW4xLTArBgNVBAoTJEdlb3JnLUF1Z3VzdC1Vbml2ZXJzaXRhZXQgR29ldHRpbmdl
-bjEjMCEGA1UEAxMaVW5pdmVyc2l0YWV0LUdvZXR0aW5nZW4gQ0ExHjAcBgkqhkiG
-9w0BCQEWD2d3ZGctY2FAZ3dkZy5kZTAeFw0xNDAzMTMxNTMxMTJaFw0xOTAzMTIx
-NTMxMTJaMIGHMQswCQYDVQQGEwJERTEWMBQGA1UECBMNTmllZGVyc2FjaHNlbjET
-MBEGA1UEBxMKR29ldHRpbmdlbjEtMCsGA1UEChMkR2VvcmctQXVndXN0LVVuaXZl
-cnNpdGFldCBHb2V0dGluZ2VuMRwwGgYDVQQDExNzZWFyY2guZGUuZGFyaWFoLmV1
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu7pmrlhefv+M2gPqsZGL
-VcaIqF4WYCm6UGO6P2CzjPCMXOoXdHI5dCTAPl0moSDoTLIJ9PHrCsel5qpdblfh
-nuB7b2TbeehaE/kZqduvcbZn3/TTOdax6dwmlbQbbkwEjPcLTiII1co9vccN3OJj
-pClCGbM+g4iPYtqRcSJlmgh6sbyEi8GaRSt/hrVjLz7LgLA4zlwFNCWvwWnapNOw
-PgVINO1PUW7/gUuqaXD4nigvvJueyj5vI17/7XTOJNVOQGdx+WnPutdJupqFR967
-TGKMCYwZivzMh+a36onE+N81dMRERNa+xUbaef0JmWodMRRJX/XINEmNMtvGgB3A
-wQIDAQABo4ICSDCCAkQwOQYDVR0gBDIwMDARBg8rBgEEAYGtIYIsAQEEAwEwEQYP
-KwYBBAGBrSGCLAIBBAMBMAgGBmeBDAECAjAJBgNVHRMEAjAAMAsGA1UdDwQEAwIE
-8DAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwHQYDVR0OBBYEFCCZUdbp
-ix/yKKub4Cu5WlpydwXbMB8GA1UdIwQYMBaAFB29c8xt7m4cdHDZoxs6uqgn3rzr
-MB4GA1UdEQQXMBWCE3NlYXJjaC5kZS5kYXJpYWguZXUwgY8GA1UdHwSBhzCBhDBA
-oD6gPIY6aHR0cDovL2NkcDEucGNhLmRmbi5kZS91bmktZ29ldHRpbmdlbi1jYS9w
-dWIvY3JsL2NhY3JsLmNybDBAoD6gPIY6aHR0cDovL2NkcDIucGNhLmRmbi5kZS91
-bmktZ29ldHRpbmdlbi1jYS9wdWIvY3JsL2NhY3JsLmNybDCB3QYIKwYBBQUHAQEE
-gdAwgc0wMwYIKwYBBQUHMAGGJ2h0dHA6Ly9vY3NwLnBjYS5kZm4uZGUvT0NTUC1T
-ZXJ2ZXIvT0NTUDBKBggrBgEFBQcwAoY+aHR0cDovL2NkcDEucGNhLmRmbi5kZS91
-bmktZ29ldHRpbmdlbi1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwSgYIKwYBBQUH
-MAKGPmh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvdW5pLWdvZXR0aW5nZW4tY2EvcHVi
-L2NhY2VydC9jYWNlcnQuY3J0MA0GCSqGSIb3DQEBBQUAA4IBAQCATCaFTv5NkXiH
-Gqk6O1y9Zkt7MtJheq1ATf2itAeCHVIapN6damvsHhb5IUwKu4pSAyT4h5c6PCiK
-N7f+C0KJPSbH7yEz62BdSa2n+Ut+L8rdz2KjxYC3LMtZgJDOCqVP9c3JL6zGQItA
-3RaIPoIzrB4kD/pJz3I2Tl7JfbnYSDtTaLVzysHtuApY5N+zjLJ54GokAlB5hjcm
-CTn74yz2sDJeQUgUC5DqgxOsPHcnqbNd999xBtDgHZ6xIJwVGhGaTKd1dp7XqH/b
-Lw95jxPRFCuuzadG3QQwB3TtR4fzqDp1envPT4sfv3fvuMd9uKd1AVZhQT4Ekknp
-VJ2CRsza
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://search.de.dariah.eu/search/saml/SingleLogout/alias/search"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://search.de.dariah.eu/search/saml/SingleLogout/alias/search"/>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://search.de.dariah.eu/search/saml/SSO/alias/search" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://search.de.dariah.eu/search/saml/SSO/alias/search" index="1"/>
-    <AttributeConsumingService index="1">
-      <ServiceName xml:lang="de">DARIAH Generic Search</ServiceName>
-      <ServiceName xml:lang="en">DARIAH Generic Search</ServiceName>
-      <ServiceDescription xml:lang="de">DARIAH Generic Search</ServiceDescription>
-      <ServiceDescription xml:lang="en">DARIAH Generic Search</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"/>
-    </AttributeConsumingService>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">e112</OrganizationName>
-    <OrganizationName xml:lang="en">e112</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">Gesellschaft für wissenschaftliche Datenverarbeitung mbH</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">Gesellschaft für wissenschaftliche Datenverarbeitung mbH</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.gwdg.de</OrganizationURL>
-    <OrganizationURL xml:lang="en">http://www.gwdg.de</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Tobias</GivenName>
-    <SurName>Gradl</SurName>
-    <EmailAddress>mailto:tobias.gradl@uni-bamberg.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="support">
-    <GivenName>Dariah</GivenName>
-    <SurName>Support</SurName>
-    <EmailAddress>mailto:register@dariah.eu</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/search.de.dariah.eu.xml b/swamid-interfederations-2.0/search.de.dariah.eu.xml
deleted file mode 100644
index c2382cfd..00000000
--- a/swamid-interfederations-2.0/search.de.dariah.eu.xml
+++ /dev/null
@@ -1,143 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://search.de.dariah.eu/search">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2014-04-11T07:21:53Z">
-      <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: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://search.de.dariah.eu/search/saml/login/alias/search?disco=true" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="de">DARIAH Generic Search</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">DARIAH Generic Search</mdui:DisplayName>
-        <mdui:Description xml:lang="de">DARIAH Generic Search</mdui:Description>
-        <mdui:Description xml:lang="en">DARIAH Generic Search</mdui:Description>
-        <mdui:InformationURL xml:lang="de">http://dariah.eu/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">http://dariah.eu/</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://de.dariah.eu/ServicePrivacyPolicy</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>search.de.dariah.eu</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=search.de.dariah.eu,O=Georg-August-Universitaet Goettingen,L=Goettingen,ST=Niedersachsen,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIGAjCCBOqgAwIBAgIHF0FMzwiCfDANBgkqhkiG9w0BAQUFADCBrjELMAkGA1UE
-BhMCREUxFjAUBgNVBAgTDU5pZWRlcnNhY2hzZW4xEzARBgNVBAcTCkdvZXR0aW5n
-ZW4xLTArBgNVBAoTJEdlb3JnLUF1Z3VzdC1Vbml2ZXJzaXRhZXQgR29ldHRpbmdl
-bjEjMCEGA1UEAxMaVW5pdmVyc2l0YWV0LUdvZXR0aW5nZW4gQ0ExHjAcBgkqhkiG
-9w0BCQEWD2d3ZGctY2FAZ3dkZy5kZTAeFw0xNDAzMTMxNTMxMTJaFw0xOTAzMTIx
-NTMxMTJaMIGHMQswCQYDVQQGEwJERTEWMBQGA1UECBMNTmllZGVyc2FjaHNlbjET
-MBEGA1UEBxMKR29ldHRpbmdlbjEtMCsGA1UEChMkR2VvcmctQXVndXN0LVVuaXZl
-cnNpdGFldCBHb2V0dGluZ2VuMRwwGgYDVQQDExNzZWFyY2guZGUuZGFyaWFoLmV1
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu7pmrlhefv+M2gPqsZGL
-VcaIqF4WYCm6UGO6P2CzjPCMXOoXdHI5dCTAPl0moSDoTLIJ9PHrCsel5qpdblfh
-nuB7b2TbeehaE/kZqduvcbZn3/TTOdax6dwmlbQbbkwEjPcLTiII1co9vccN3OJj
-pClCGbM+g4iPYtqRcSJlmgh6sbyEi8GaRSt/hrVjLz7LgLA4zlwFNCWvwWnapNOw
-PgVINO1PUW7/gUuqaXD4nigvvJueyj5vI17/7XTOJNVOQGdx+WnPutdJupqFR967
-TGKMCYwZivzMh+a36onE+N81dMRERNa+xUbaef0JmWodMRRJX/XINEmNMtvGgB3A
-wQIDAQABo4ICSDCCAkQwOQYDVR0gBDIwMDARBg8rBgEEAYGtIYIsAQEEAwEwEQYP
-KwYBBAGBrSGCLAIBBAMBMAgGBmeBDAECAjAJBgNVHRMEAjAAMAsGA1UdDwQEAwIE
-8DAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwHQYDVR0OBBYEFCCZUdbp
-ix/yKKub4Cu5WlpydwXbMB8GA1UdIwQYMBaAFB29c8xt7m4cdHDZoxs6uqgn3rzr
-MB4GA1UdEQQXMBWCE3NlYXJjaC5kZS5kYXJpYWguZXUwgY8GA1UdHwSBhzCBhDBA
-oD6gPIY6aHR0cDovL2NkcDEucGNhLmRmbi5kZS91bmktZ29ldHRpbmdlbi1jYS9w
-dWIvY3JsL2NhY3JsLmNybDBAoD6gPIY6aHR0cDovL2NkcDIucGNhLmRmbi5kZS91
-bmktZ29ldHRpbmdlbi1jYS9wdWIvY3JsL2NhY3JsLmNybDCB3QYIKwYBBQUHAQEE
-gdAwgc0wMwYIKwYBBQUHMAGGJ2h0dHA6Ly9vY3NwLnBjYS5kZm4uZGUvT0NTUC1T
-ZXJ2ZXIvT0NTUDBKBggrBgEFBQcwAoY+aHR0cDovL2NkcDEucGNhLmRmbi5kZS91
-bmktZ29ldHRpbmdlbi1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwSgYIKwYBBQUH
-MAKGPmh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvdW5pLWdvZXR0aW5nZW4tY2EvcHVi
-L2NhY2VydC9jYWNlcnQuY3J0MA0GCSqGSIb3DQEBBQUAA4IBAQCATCaFTv5NkXiH
-Gqk6O1y9Zkt7MtJheq1ATf2itAeCHVIapN6damvsHhb5IUwKu4pSAyT4h5c6PCiK
-N7f+C0KJPSbH7yEz62BdSa2n+Ut+L8rdz2KjxYC3LMtZgJDOCqVP9c3JL6zGQItA
-3RaIPoIzrB4kD/pJz3I2Tl7JfbnYSDtTaLVzysHtuApY5N+zjLJ54GokAlB5hjcm
-CTn74yz2sDJeQUgUC5DqgxOsPHcnqbNd999xBtDgHZ6xIJwVGhGaTKd1dp7XqH/b
-Lw95jxPRFCuuzadG3QQwB3TtR4fzqDp1envPT4sfv3fvuMd9uKd1AVZhQT4Ekknp
-VJ2CRsza
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>search.de.dariah.eu</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=search.de.dariah.eu,O=Georg-August-Universitaet Goettingen,L=Goettingen,ST=Niedersachsen,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIGAjCCBOqgAwIBAgIHF0FMzwiCfDANBgkqhkiG9w0BAQUFADCBrjELMAkGA1UE
-BhMCREUxFjAUBgNVBAgTDU5pZWRlcnNhY2hzZW4xEzARBgNVBAcTCkdvZXR0aW5n
-ZW4xLTArBgNVBAoTJEdlb3JnLUF1Z3VzdC1Vbml2ZXJzaXRhZXQgR29ldHRpbmdl
-bjEjMCEGA1UEAxMaVW5pdmVyc2l0YWV0LUdvZXR0aW5nZW4gQ0ExHjAcBgkqhkiG
-9w0BCQEWD2d3ZGctY2FAZ3dkZy5kZTAeFw0xNDAzMTMxNTMxMTJaFw0xOTAzMTIx
-NTMxMTJaMIGHMQswCQYDVQQGEwJERTEWMBQGA1UECBMNTmllZGVyc2FjaHNlbjET
-MBEGA1UEBxMKR29ldHRpbmdlbjEtMCsGA1UEChMkR2VvcmctQXVndXN0LVVuaXZl
-cnNpdGFldCBHb2V0dGluZ2VuMRwwGgYDVQQDExNzZWFyY2guZGUuZGFyaWFoLmV1
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu7pmrlhefv+M2gPqsZGL
-VcaIqF4WYCm6UGO6P2CzjPCMXOoXdHI5dCTAPl0moSDoTLIJ9PHrCsel5qpdblfh
-nuB7b2TbeehaE/kZqduvcbZn3/TTOdax6dwmlbQbbkwEjPcLTiII1co9vccN3OJj
-pClCGbM+g4iPYtqRcSJlmgh6sbyEi8GaRSt/hrVjLz7LgLA4zlwFNCWvwWnapNOw
-PgVINO1PUW7/gUuqaXD4nigvvJueyj5vI17/7XTOJNVOQGdx+WnPutdJupqFR967
-TGKMCYwZivzMh+a36onE+N81dMRERNa+xUbaef0JmWodMRRJX/XINEmNMtvGgB3A
-wQIDAQABo4ICSDCCAkQwOQYDVR0gBDIwMDARBg8rBgEEAYGtIYIsAQEEAwEwEQYP
-KwYBBAGBrSGCLAIBBAMBMAgGBmeBDAECAjAJBgNVHRMEAjAAMAsGA1UdDwQEAwIE
-8DAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwHQYDVR0OBBYEFCCZUdbp
-ix/yKKub4Cu5WlpydwXbMB8GA1UdIwQYMBaAFB29c8xt7m4cdHDZoxs6uqgn3rzr
-MB4GA1UdEQQXMBWCE3NlYXJjaC5kZS5kYXJpYWguZXUwgY8GA1UdHwSBhzCBhDBA
-oD6gPIY6aHR0cDovL2NkcDEucGNhLmRmbi5kZS91bmktZ29ldHRpbmdlbi1jYS9w
-dWIvY3JsL2NhY3JsLmNybDBAoD6gPIY6aHR0cDovL2NkcDIucGNhLmRmbi5kZS91
-bmktZ29ldHRpbmdlbi1jYS9wdWIvY3JsL2NhY3JsLmNybDCB3QYIKwYBBQUHAQEE
-gdAwgc0wMwYIKwYBBQUHMAGGJ2h0dHA6Ly9vY3NwLnBjYS5kZm4uZGUvT0NTUC1T
-ZXJ2ZXIvT0NTUDBKBggrBgEFBQcwAoY+aHR0cDovL2NkcDEucGNhLmRmbi5kZS91
-bmktZ29ldHRpbmdlbi1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwSgYIKwYBBQUH
-MAKGPmh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvdW5pLWdvZXR0aW5nZW4tY2EvcHVi
-L2NhY2VydC9jYWNlcnQuY3J0MA0GCSqGSIb3DQEBBQUAA4IBAQCATCaFTv5NkXiH
-Gqk6O1y9Zkt7MtJheq1ATf2itAeCHVIapN6damvsHhb5IUwKu4pSAyT4h5c6PCiK
-N7f+C0KJPSbH7yEz62BdSa2n+Ut+L8rdz2KjxYC3LMtZgJDOCqVP9c3JL6zGQItA
-3RaIPoIzrB4kD/pJz3I2Tl7JfbnYSDtTaLVzysHtuApY5N+zjLJ54GokAlB5hjcm
-CTn74yz2sDJeQUgUC5DqgxOsPHcnqbNd999xBtDgHZ6xIJwVGhGaTKd1dp7XqH/b
-Lw95jxPRFCuuzadG3QQwB3TtR4fzqDp1envPT4sfv3fvuMd9uKd1AVZhQT4Ekknp
-VJ2CRsza
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://search.de.dariah.eu/search/saml/SingleLogout/alias/search"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://search.de.dariah.eu/search/saml/SingleLogout/alias/search"/>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://search.de.dariah.eu/search/saml/SSO/alias/search" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://search.de.dariah.eu/search/saml/SSO/alias/search" index="1"/>
-    <AttributeConsumingService index="1">
-      <ServiceName xml:lang="de">DARIAH Generic Search</ServiceName>
-      <ServiceName xml:lang="en">DARIAH Generic Search</ServiceName>
-      <ServiceDescription xml:lang="de">DARIAH Generic Search</ServiceDescription>
-      <ServiceDescription xml:lang="en">DARIAH Generic Search</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"/>
-    </AttributeConsumingService>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">e112</OrganizationName>
-    <OrganizationName xml:lang="en">e112</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">Gesellschaft für wissenschaftliche Datenverarbeitung mbH</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">Gesellschaft für wissenschaftliche Datenverarbeitung mbH</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.gwdg.de</OrganizationURL>
-    <OrganizationURL xml:lang="en">http://www.gwdg.de</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Tobias</GivenName>
-    <SurName>Gradl</SurName>
-    <EmailAddress>mailto:tobias.gradl@uni-bamberg.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="support">
-    <GivenName>Dariah</GivenName>
-    <SurName>Support</SurName>
-    <EmailAddress>mailto:register@dariah.eu</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sesame.ifsttar.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/sesame.ifsttar.fr-idp-shibboleth.xml
deleted file mode 100644
index ac384ef7..00000000
--- a/swamid-interfederations-2.0/sesame.ifsttar.fr-idp-shibboleth.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://sesame.ifsttar.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2013-07-09T15:33:20Z">
-      <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">ifsttar.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">IFSTTAR</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDLzCCAhegAwIBAgIUFBBFYZ1kzTq980fHApAgt04rr94wDQYJKoZIhvcNAQEF
-BQAwHDEaMBgGA1UEAxMRc2VzYW1lLmlmc3R0YXIuZnIwHhcNMTIxMDE4MTI0NzIw
-WhcNMzIxMDE4MTI0NzIwWjAcMRowGAYDVQQDExFzZXNhbWUuaWZzdHRhci5mcjCC
-ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAITYkLPB/bNFZ5N45Mbt3Qpu
-ln2afxx+yKPW6GmrNVSNF9P8WUoG3ThL1zzgjcfbstBjvG/kDYE93+ltFqIH7tbl
-VzHxVB+tKQW/+343lwuu0efE8bS/KeIwcGc7Z/HHBYj3uMGKwb3uGCuT9NL0OkYw
-PCVruRk9okCFSi4ae1ObBVkuItgvgpTDI/kdj7KmIIMr/yLFAkyMz1DuV3l9+AZz
-duqcJiF+LHJSE0lZf0svHQCLzD6Pe1JQ45OGCWwnoBLmeVKf/b7j2h6W6RXq4RMT
-lrZ5fzWwJ0KsGdEGQVXj5GimCDS9dBogdj2r/talnEQLqPjMiXhp30jhOJwcoFEC
-AwEAAaNpMGcwRgYDVR0RBD8wPYIRc2VzYW1lLmlmc3R0YXIuZnKGKGh0dHBzOi8v
-c2VzYW1lLmlmc3R0YXIuZnIvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFE+NF0RZ
-ywRw9y1ZNpMcW8EacqukMA0GCSqGSIb3DQEBBQUAA4IBAQAHY1rVEQaKk+8ppYzL
-ov5SpSlw9ET6XgBLdOcqa8sR0+ON0AMWc/wAeAKSeZhgSe6rPOppfiupEshtW0GK
-JWcq/QlK1jG8S/MnP3qSrwezdBVpRz305E5u6DDHu2q1WP+2N/zk9WEd/T6q5H23
-whwyEA7h89qOhhU/MmrnogQcF0tNY54dz6faTjhoEUNTniRB1+Wc4yrrLoikBONr
-jfwiOmxdx8Rh/05DYJIU5hv9mjFdpBrpFUrOFup68kp4tqnNhwPmvHWF0E6FiRdU
-0iPZrN+gUvb3I0gaxKAR7bvJIvKlcRZxpMfizcIFnTNI6olY9hCGPPbPsbfZH+b1
-oTFF
-					    </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://sesame.ifsttar.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sesame.ifsttar.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://sesame.ifsttar.fr/idp/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">IFSTTAR</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">IFSTTAR</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <EmailAddress>expl@ifsttar.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sesame.ifsttar.fr.xml b/swamid-interfederations-2.0/sesame.ifsttar.fr.xml
deleted file mode 100644
index ac384ef7..00000000
--- a/swamid-interfederations-2.0/sesame.ifsttar.fr.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://sesame.ifsttar.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2013-07-09T15:33:20Z">
-      <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">ifsttar.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">IFSTTAR</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDLzCCAhegAwIBAgIUFBBFYZ1kzTq980fHApAgt04rr94wDQYJKoZIhvcNAQEF
-BQAwHDEaMBgGA1UEAxMRc2VzYW1lLmlmc3R0YXIuZnIwHhcNMTIxMDE4MTI0NzIw
-WhcNMzIxMDE4MTI0NzIwWjAcMRowGAYDVQQDExFzZXNhbWUuaWZzdHRhci5mcjCC
-ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAITYkLPB/bNFZ5N45Mbt3Qpu
-ln2afxx+yKPW6GmrNVSNF9P8WUoG3ThL1zzgjcfbstBjvG/kDYE93+ltFqIH7tbl
-VzHxVB+tKQW/+343lwuu0efE8bS/KeIwcGc7Z/HHBYj3uMGKwb3uGCuT9NL0OkYw
-PCVruRk9okCFSi4ae1ObBVkuItgvgpTDI/kdj7KmIIMr/yLFAkyMz1DuV3l9+AZz
-duqcJiF+LHJSE0lZf0svHQCLzD6Pe1JQ45OGCWwnoBLmeVKf/b7j2h6W6RXq4RMT
-lrZ5fzWwJ0KsGdEGQVXj5GimCDS9dBogdj2r/talnEQLqPjMiXhp30jhOJwcoFEC
-AwEAAaNpMGcwRgYDVR0RBD8wPYIRc2VzYW1lLmlmc3R0YXIuZnKGKGh0dHBzOi8v
-c2VzYW1lLmlmc3R0YXIuZnIvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFE+NF0RZ
-ywRw9y1ZNpMcW8EacqukMA0GCSqGSIb3DQEBBQUAA4IBAQAHY1rVEQaKk+8ppYzL
-ov5SpSlw9ET6XgBLdOcqa8sR0+ON0AMWc/wAeAKSeZhgSe6rPOppfiupEshtW0GK
-JWcq/QlK1jG8S/MnP3qSrwezdBVpRz305E5u6DDHu2q1WP+2N/zk9WEd/T6q5H23
-whwyEA7h89qOhhU/MmrnogQcF0tNY54dz6faTjhoEUNTniRB1+Wc4yrrLoikBONr
-jfwiOmxdx8Rh/05DYJIU5hv9mjFdpBrpFUrOFup68kp4tqnNhwPmvHWF0E6FiRdU
-0iPZrN+gUvb3I0gaxKAR7bvJIvKlcRZxpMfizcIFnTNI6olY9hCGPPbPsbfZH+b1
-oTFF
-					    </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://sesame.ifsttar.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sesame.ifsttar.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://sesame.ifsttar.fr/idp/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">IFSTTAR</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">IFSTTAR</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <EmailAddress>expl@ifsttar.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sgw.africa-grid.org-shibboleth.xml b/swamid-interfederations-2.0/sgw.africa-grid.org-shibboleth.xml
deleted file mode 100644
index b0714fb8..00000000
--- a/swamid-interfederations-2.0/sgw.africa-grid.org-shibboleth.xml
+++ /dev/null
@@ -1,103 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" entityID="https://sgw.africa-grid.org/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2013-05-27T15:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</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>
-        <mdui:DisplayName xml:lang="en">
-                        Africa Grid Science Gateway
-                    </mdui:DisplayName>
-        <mdui:DisplayName xml:lang="it">
-                        Africa Grid Science Gateway
-                    </mdui:DisplayName>
-        <mdui:Description xml:lang="en">
-                        This service allows to use on a Grid infrastructure the lighthouse applications of the eI4Africa project
-                    </mdui:Description>
-        <mdui:Description xml:lang="it">
-                        Questo servizio permette l'accesso e l'uso delle applicazioni/servizi Grid sviluppati per il progetto eI4Africa
-                    </mdui:Description>
-      </mdui:UIInfo>
-      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://sgw.africa-grid.org/Shibboleth.sso/DS"/>
-      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://sgw.africa-grid.org/Shibboleth.sso/DS" index="1"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIF0TCCBLmgAwIBAgIRAJjvs9uxU/ydSPVPqQh6szEwDQYJKoZIhvcNAQEFBQAw
-NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-IFNTTCBDQTAeFw0xMzAxMDcwMDAwMDBaFw0xNjAxMDcyMzU5NTlaMIHFMQswCQYD
-VQQGEwJJVDEOMAwGA1UEERMFOTUxMjMxDjAMBgNVBAgTBUl0YWx5MRAwDgYDVQQH
-EwdDYXRhbmlhMRkwFwYDVQQJExBWaWEgUy5Tb2ZpYSBuLjY0MS4wLAYDVQQKEyVJ
-c3RpdHV0byBOYXppb25hbGUgZGkgRmlzaWNhIE51Y2xlYXJlMQ8wDQYDVQQLEwZD
-T01FVEExKDAmBgNVBAMTH3d3dy5jYXRhbmlhLXNjaWVuY2UtZ2F0ZXdheXMuaXQw
-ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDMR2RMw4cNImWSKdvZjDhz
-3JuO7/pMOnGw4hF6uu09cqX8qqBpkU/gd33xq7J254ojywwiIlLT7QaTce4YQU2W
-O5mPyqdHjnpA+C0fJWrQgRyJEXsOzwpxyUG42tim/9jgNNDaUuNSGgrMLGlzl0sU
-i3Cq04AY0hukrtFGe6DFvDsm8xoNwfV8jmO3IipWJdJdezRnCGDgTZqgIWj3yrHo
-LjfgLbs85AJ31plMahcEni1jDZYgzu7FurbKpO4FGSLUEI8VUxncdYx3IWidqYBD
-TjxFGIiRIcD59DTIBxZYT4IgGHhG1whnUtE7nZhtuxFvnxfH4gPi7mPcRwidNHg9
-AgMBAAGjggJIMIICRDAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3V0fqkOO57TAd
-BgNVHQ4EFgQU+qOkofxo+Ei3aGD2lLEkM4L7LS0wDgYDVR0PAQH/BAQDAgWgMAwG
-A1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMCIGA1Ud
-IAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQICMDoGA1UdHwQzMDEwL6AtoCuG
-KWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3JsMG0GCCsG
-AQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50Y3MudGVyZW5hLm9y
-Zy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9vY3NwLnRjcy50
-ZXJlbmEub3JnMIH1BgNVHREEge0wgeqCH3d3dy5jYXRhbmlhLXNjaWVuY2UtZ2F0
-ZXdheXMuaXSCFWFnaW5mcmEtc2cuY3QuaW5mbi5pdIIVY29naXRvLW1lZC5jdC5p
-bmZuLml0giJlYXJ0aHNlcnZlci1zZy5jb25zb3J6aW8tY29tZXRhLml0gg5lY3Nn
-LmRjaC1ycC5ldYISZ2Fyci1zZy5jdC5pbmZuLml0ghBrbGlvcy5jdC5pbmZuLml0
-ghNsaWZlcmF5Mi5jdC5pbmZuLml0ghNzZ3cuYWZyaWNhLWdyaWQub3JnghV3d3cu
-cHJvZ2V0dG8taWNhcm8uaXQwDQYJKoZIhvcNAQEFBQADggEBAIzikPZKDI8rXlUU
-iF8KUeEVYZMyBfRtl0sQYBZCprDoVpCr74CPTxQ72Jrh2mD8oAz0ZYVgOA19AbM8
-PskJlhx4bmDJvWU/C2FrOgYDNg9Tl7dqLnr18GDt7DuC0KXCDupgtBmwy7mayNgA
-n2jbIaYsfMI7k1msS1XoaVX7kBMgmeGY3V11Om9Te7iMWKFOhpavI2hbf741ODtV
-zBen58Q2WzjVEKVQYbY7UgtcYzOM44GhMcdS65lLsBviK7HzyB6I5Iu3TR0bcpFE
-2V4bd6L5foq3Qn+WO9wqOwnOk3qfD/TQId7NWv0ZE2vp8fPPaaRF2XcA7Qh5xltt
-j/MCNlE=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sgw.africa-grid.org/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sgw.africa-grid.org/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sgw.africa-grid.org/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sgw.africa-grid.org/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sgw.africa-grid.org/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sgw.africa-grid.org/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sgw.africa-grid.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sgw.africa-grid.org/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://sgw.africa-grid.org/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sgw.africa-grid.org/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sgw.africa-grid.org/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <AttributeConsumingService index="1">
-      <ServiceName xml:lang="en">Africa Grid Science Gateway</ServiceName>
-      <ServiceDescription xml:lang="en">
-                    This service allows to use on a Grid infrastructure the lighthouse applications of the eI4Africa project
-                </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"/>
-    </AttributeConsumingService>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Consorzio COMETA</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">COMETA</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.consorzio-cometa.it/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Marco</GivenName>
-    <SurName>Fargetta</SurName>
-    <EmailAddress>mailto:marco.fargetta@ct.infn.it</EmailAddress>
-    <EmailAddress>mailto:credentials-admin@ct.infn.it</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="administrative">
-    <GivenName>Roberto</GivenName>
-    <SurName>Barbera</SurName>
-    <EmailAddress>mailto:roberto.barbera@ct.infn.it</EmailAddress>
-    <EmailAddress>mailto:credentials-admin@ct.infn.it</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sgw.africa-grid.org.xml b/swamid-interfederations-2.0/sgw.africa-grid.org.xml
deleted file mode 100644
index b0714fb8..00000000
--- a/swamid-interfederations-2.0/sgw.africa-grid.org.xml
+++ /dev/null
@@ -1,103 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" entityID="https://sgw.africa-grid.org/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2013-05-27T15:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</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>
-        <mdui:DisplayName xml:lang="en">
-                        Africa Grid Science Gateway
-                    </mdui:DisplayName>
-        <mdui:DisplayName xml:lang="it">
-                        Africa Grid Science Gateway
-                    </mdui:DisplayName>
-        <mdui:Description xml:lang="en">
-                        This service allows to use on a Grid infrastructure the lighthouse applications of the eI4Africa project
-                    </mdui:Description>
-        <mdui:Description xml:lang="it">
-                        Questo servizio permette l'accesso e l'uso delle applicazioni/servizi Grid sviluppati per il progetto eI4Africa
-                    </mdui:Description>
-      </mdui:UIInfo>
-      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://sgw.africa-grid.org/Shibboleth.sso/DS"/>
-      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://sgw.africa-grid.org/Shibboleth.sso/DS" index="1"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIF0TCCBLmgAwIBAgIRAJjvs9uxU/ydSPVPqQh6szEwDQYJKoZIhvcNAQEFBQAw
-NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-IFNTTCBDQTAeFw0xMzAxMDcwMDAwMDBaFw0xNjAxMDcyMzU5NTlaMIHFMQswCQYD
-VQQGEwJJVDEOMAwGA1UEERMFOTUxMjMxDjAMBgNVBAgTBUl0YWx5MRAwDgYDVQQH
-EwdDYXRhbmlhMRkwFwYDVQQJExBWaWEgUy5Tb2ZpYSBuLjY0MS4wLAYDVQQKEyVJ
-c3RpdHV0byBOYXppb25hbGUgZGkgRmlzaWNhIE51Y2xlYXJlMQ8wDQYDVQQLEwZD
-T01FVEExKDAmBgNVBAMTH3d3dy5jYXRhbmlhLXNjaWVuY2UtZ2F0ZXdheXMuaXQw
-ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDMR2RMw4cNImWSKdvZjDhz
-3JuO7/pMOnGw4hF6uu09cqX8qqBpkU/gd33xq7J254ojywwiIlLT7QaTce4YQU2W
-O5mPyqdHjnpA+C0fJWrQgRyJEXsOzwpxyUG42tim/9jgNNDaUuNSGgrMLGlzl0sU
-i3Cq04AY0hukrtFGe6DFvDsm8xoNwfV8jmO3IipWJdJdezRnCGDgTZqgIWj3yrHo
-LjfgLbs85AJ31plMahcEni1jDZYgzu7FurbKpO4FGSLUEI8VUxncdYx3IWidqYBD
-TjxFGIiRIcD59DTIBxZYT4IgGHhG1whnUtE7nZhtuxFvnxfH4gPi7mPcRwidNHg9
-AgMBAAGjggJIMIICRDAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3V0fqkOO57TAd
-BgNVHQ4EFgQU+qOkofxo+Ei3aGD2lLEkM4L7LS0wDgYDVR0PAQH/BAQDAgWgMAwG
-A1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMCIGA1Ud
-IAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQICMDoGA1UdHwQzMDEwL6AtoCuG
-KWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3JsMG0GCCsG
-AQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50Y3MudGVyZW5hLm9y
-Zy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9vY3NwLnRjcy50
-ZXJlbmEub3JnMIH1BgNVHREEge0wgeqCH3d3dy5jYXRhbmlhLXNjaWVuY2UtZ2F0
-ZXdheXMuaXSCFWFnaW5mcmEtc2cuY3QuaW5mbi5pdIIVY29naXRvLW1lZC5jdC5p
-bmZuLml0giJlYXJ0aHNlcnZlci1zZy5jb25zb3J6aW8tY29tZXRhLml0gg5lY3Nn
-LmRjaC1ycC5ldYISZ2Fyci1zZy5jdC5pbmZuLml0ghBrbGlvcy5jdC5pbmZuLml0
-ghNsaWZlcmF5Mi5jdC5pbmZuLml0ghNzZ3cuYWZyaWNhLWdyaWQub3JnghV3d3cu
-cHJvZ2V0dG8taWNhcm8uaXQwDQYJKoZIhvcNAQEFBQADggEBAIzikPZKDI8rXlUU
-iF8KUeEVYZMyBfRtl0sQYBZCprDoVpCr74CPTxQ72Jrh2mD8oAz0ZYVgOA19AbM8
-PskJlhx4bmDJvWU/C2FrOgYDNg9Tl7dqLnr18GDt7DuC0KXCDupgtBmwy7mayNgA
-n2jbIaYsfMI7k1msS1XoaVX7kBMgmeGY3V11Om9Te7iMWKFOhpavI2hbf741ODtV
-zBen58Q2WzjVEKVQYbY7UgtcYzOM44GhMcdS65lLsBviK7HzyB6I5Iu3TR0bcpFE
-2V4bd6L5foq3Qn+WO9wqOwnOk3qfD/TQId7NWv0ZE2vp8fPPaaRF2XcA7Qh5xltt
-j/MCNlE=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sgw.africa-grid.org/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sgw.africa-grid.org/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sgw.africa-grid.org/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sgw.africa-grid.org/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sgw.africa-grid.org/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sgw.africa-grid.org/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sgw.africa-grid.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sgw.africa-grid.org/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://sgw.africa-grid.org/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sgw.africa-grid.org/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sgw.africa-grid.org/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <AttributeConsumingService index="1">
-      <ServiceName xml:lang="en">Africa Grid Science Gateway</ServiceName>
-      <ServiceDescription xml:lang="en">
-                    This service allows to use on a Grid infrastructure the lighthouse applications of the eI4Africa project
-                </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"/>
-    </AttributeConsumingService>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Consorzio COMETA</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">COMETA</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.consorzio-cometa.it/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Marco</GivenName>
-    <SurName>Fargetta</SurName>
-    <EmailAddress>mailto:marco.fargetta@ct.infn.it</EmailAddress>
-    <EmailAddress>mailto:credentials-admin@ct.infn.it</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="administrative">
-    <GivenName>Roberto</GivenName>
-    <SurName>Barbera</SurName>
-    <EmailAddress>mailto:roberto.barbera@ct.infn.it</EmailAddress>
-    <EmailAddress>mailto:credentials-admin@ct.infn.it</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sgw.garr.it-shibboleth.xml b/swamid-interfederations-2.0/sgw.garr.it-shibboleth.xml
deleted file mode 100644
index cc954d3f..00000000
--- a/swamid-interfederations-2.0/sgw.garr.it-shibboleth.xml
+++ /dev/null
@@ -1,96 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" entityID="https://sgw.garr.it/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2013-05-09T15:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</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>
-      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://sgw.garr.it/Shibboleth.sso/DS"/>
-      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://sgw.garr.it/Shibboleth.sso/DS" index="1"/>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="it">GARR - Science Gateway</mdui:DisplayName>
-        <mdui:Description xml:lang="it">Questo servizio permette di eseguire applicazioni scientifiche appartenenti a domini diversi su risorse di calcolo e di storage distribuite sul territorio italiano e in altre regioni del mondo. Attraverso il GARR Science Gateway, gli utenti possono accedere in maniera trasparente ed uniforme a risorse locali, grid e cloud
-                    </mdui:Description>
-        <mdui:InformationURL xml:lang="it">http://sgw.garr.it</mdui:InformationURL>
-        <mdui:DisplayName xml:lang="en">GARR - Science Gateway</mdui:DisplayName>
-        <mdui:Description xml:lang="en">This service allows to run scientific applications belonging to several domains on computational and storage resources distributed all over Italy and other regions of the world. Through the GARR Science Gateway, local, grid and cloud based resources can be accessed in a seamless and uniform way.
-                    </mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://sgw.garr.it</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">http://sgw.garr.it/policy/</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="it">http://sgw.garr.it/policy/</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIE6DCCA9CgAwIBAgIQDb4u4turk6L4quPPEEv+kjANBgkqhkiG9w0BAQUFADA/
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMR8wHQYDVQQDExZURVJFTkEg
-ZVNjaWVuY2UgU1NMIENBMB4XDTEzMTIxMzAwMDAwMFoXDTE1MDExMjIzNTk1OVow
-gYIxEzARBgoJkiaJk/IsZAEZFgNvcmcxFjAUBgoJkiaJk/IsZAEZFgZ0ZXJlbmEx
-EzARBgoJkiaJk/IsZAEZFgN0Y3MxITAfBgNVBAsTGERvbWFpbiBDb250cm9sIFZh
-bGlkYXRlZDEbMBkGA1UEAxMSc2ctbGlmZXJheS5nYXJyLml0MIIBIjANBgkqhkiG
-9w0BAQEFAAOCAQ8AMIIBCgKCAQEAyBpspPbjl5JERSur4StdxTTFFaObxEY/opI9
-17VRD4KmiPcPfbSUYEfgI4h1e6fSylMwg2sVws1uISJm9mYrzFivRX62N92ALgfS
-nUn8/YOryuRaGUi2VWD2k93uP0wwY+4uOj0my0KWKI5maZ22pTyzjTmq+vmm9IQL
-T1e4SInE/p1KQQYdmdeQ1IHu/M0yxOuo6evQ6o4x6asDFXYiAc8n/KJbZmwj7y9b
-3pVH3Ra5v8dmvlEaii17T7UdyKL4y+70Wntm6gU4vAaGwVn9r7V9hbbIPbK8jndO
-fjlXa5ze2naHKqTcIpWAYx787G333EviWMlMZwUB+GaEN4R76wIDAQABo4IBmjCC
-AZYwHwYDVR0jBBgwFoAUI9OXvcDYoZRhiA2Ftsx1n8l5O5IwHQYDVR0OBBYEFDrj
-WiJIiSmHLfoC++tXo3MW9s0iMA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAA
-MB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAwBgNVHSAEKTAnMA0GCysG
-AQQBsjEBAgIdMAwGCiqGSIb3TAUCAgEwCAYGZ4EMAQIBMEIGA1UdHwQ7MDkwN6A1
-oDOGMWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BZVNjaWVuY2VTU0xD
-QS5jcmwwdQYIKwYBBQUHAQEEaTBnMD0GCCsGAQUFBzAChjFodHRwOi8vY3J0LnRj
-cy50ZXJlbmEub3JnL1RFUkVOQWVTY2llbmNlU1NMQ0EuY3J0MCYGCCsGAQUFBzAB
-hhpodHRwOi8vb2NzcC50Y3MudGVyZW5hLm9yZzAqBgNVHREEIzAhghJzZy1saWZl
-cmF5LmdhcnIuaXSCC3Nndy5nYXJyLml0MA0GCSqGSIb3DQEBBQUAA4IBAQBfUy8v
-GupDJmcDTmNSx5kse8NfmSB1kbwM96IE7Eap+/VgNiIeOwjAyfK2gafLfD4QCYao
-1WQvBPqoqY3h14Wsbl5SRRRS+G6oj4x51YVvm7D6kgh4E5wlqfMPbDsZtGnkfh/m
-ZsTEL1Ixz6dT6PSzsqu5tPa9RnwNtBL+rRCW7OUfs6MPxofNmu+GCry8/6gZy2Rd
-yxyH2bHQkbZCMSil/2cvX/3ib2mg+eYrlZQywmRtWL92UtJoKlt96K1RYUKXdfIq
-Pm6o7CRIyLzXCIKWimG/PIPiJ0GNH1K2+X54yM/tV+bsjBCHlQe8RpUVKxzm5dtG
-zkkOSinydr85B7LG
-</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://sgw.garr.it/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sgw.garr.it/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sgw.garr.it/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sgw.garr.it/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sgw.garr.it/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sgw.garr.it/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sgw.garr.it/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sgw.garr.it/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://sgw.garr.it/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sgw.garr.it/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sgw.garr.it/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <AttributeConsumingService index="1">
-      <ServiceName xml:lang="it">GARR Science Gateway</ServiceName>
-      <ServiceName xml:lang="en">GARR Science Gateway</ServiceName>
-      <ServiceDescription xml:lang="it">Questo servizio permette di eseguire applicazioni scientifiche appartenenti a domini diversi su risorse di calcolo e di storage distribuite sul territorio italiano e in altre regioni del mondo. Attraverso il GARR Science Gateway, gli utenti possono accedere in maniera trasparente ed uniforme a risorse locali, grid e cloud</ServiceDescription>
-      <ServiceDescription xml:lang="en">This service allows to run scientific applications belonging to several domains on computational and storage resources distributed all over Italy and other regions of the world. Through the GARR Science Gateway, local, grid and cloud based resources can be accessed in a seamless and uniform way.</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"/>
-    </AttributeConsumingService>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="it">Consortium GARR</OrganizationName>
-    <OrganizationName xml:lang="en">Consortium GARR</OrganizationName>
-    <OrganizationDisplayName xml:lang="it">GARR Science Gateway erogato da Consortium GARR</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">GARR Science Gateway provided by Consortium GARR</OrganizationDisplayName>
-    <OrganizationURL xml:lang="it">http://www.garr.it/</OrganizationURL>
-    <OrganizationURL xml:lang="en">http://www.garr.it/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <EmailAddress>sgwadmin@garr.it</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sgw.garr.it.xml b/swamid-interfederations-2.0/sgw.garr.it.xml
deleted file mode 100644
index cc954d3f..00000000
--- a/swamid-interfederations-2.0/sgw.garr.it.xml
+++ /dev/null
@@ -1,96 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" entityID="https://sgw.garr.it/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2013-05-09T15:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</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>
-      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://sgw.garr.it/Shibboleth.sso/DS"/>
-      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://sgw.garr.it/Shibboleth.sso/DS" index="1"/>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="it">GARR - Science Gateway</mdui:DisplayName>
-        <mdui:Description xml:lang="it">Questo servizio permette di eseguire applicazioni scientifiche appartenenti a domini diversi su risorse di calcolo e di storage distribuite sul territorio italiano e in altre regioni del mondo. Attraverso il GARR Science Gateway, gli utenti possono accedere in maniera trasparente ed uniforme a risorse locali, grid e cloud
-                    </mdui:Description>
-        <mdui:InformationURL xml:lang="it">http://sgw.garr.it</mdui:InformationURL>
-        <mdui:DisplayName xml:lang="en">GARR - Science Gateway</mdui:DisplayName>
-        <mdui:Description xml:lang="en">This service allows to run scientific applications belonging to several domains on computational and storage resources distributed all over Italy and other regions of the world. Through the GARR Science Gateway, local, grid and cloud based resources can be accessed in a seamless and uniform way.
-                    </mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://sgw.garr.it</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">http://sgw.garr.it/policy/</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="it">http://sgw.garr.it/policy/</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIE6DCCA9CgAwIBAgIQDb4u4turk6L4quPPEEv+kjANBgkqhkiG9w0BAQUFADA/
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMR8wHQYDVQQDExZURVJFTkEg
-ZVNjaWVuY2UgU1NMIENBMB4XDTEzMTIxMzAwMDAwMFoXDTE1MDExMjIzNTk1OVow
-gYIxEzARBgoJkiaJk/IsZAEZFgNvcmcxFjAUBgoJkiaJk/IsZAEZFgZ0ZXJlbmEx
-EzARBgoJkiaJk/IsZAEZFgN0Y3MxITAfBgNVBAsTGERvbWFpbiBDb250cm9sIFZh
-bGlkYXRlZDEbMBkGA1UEAxMSc2ctbGlmZXJheS5nYXJyLml0MIIBIjANBgkqhkiG
-9w0BAQEFAAOCAQ8AMIIBCgKCAQEAyBpspPbjl5JERSur4StdxTTFFaObxEY/opI9
-17VRD4KmiPcPfbSUYEfgI4h1e6fSylMwg2sVws1uISJm9mYrzFivRX62N92ALgfS
-nUn8/YOryuRaGUi2VWD2k93uP0wwY+4uOj0my0KWKI5maZ22pTyzjTmq+vmm9IQL
-T1e4SInE/p1KQQYdmdeQ1IHu/M0yxOuo6evQ6o4x6asDFXYiAc8n/KJbZmwj7y9b
-3pVH3Ra5v8dmvlEaii17T7UdyKL4y+70Wntm6gU4vAaGwVn9r7V9hbbIPbK8jndO
-fjlXa5ze2naHKqTcIpWAYx787G333EviWMlMZwUB+GaEN4R76wIDAQABo4IBmjCC
-AZYwHwYDVR0jBBgwFoAUI9OXvcDYoZRhiA2Ftsx1n8l5O5IwHQYDVR0OBBYEFDrj
-WiJIiSmHLfoC++tXo3MW9s0iMA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAA
-MB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAwBgNVHSAEKTAnMA0GCysG
-AQQBsjEBAgIdMAwGCiqGSIb3TAUCAgEwCAYGZ4EMAQIBMEIGA1UdHwQ7MDkwN6A1
-oDOGMWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BZVNjaWVuY2VTU0xD
-QS5jcmwwdQYIKwYBBQUHAQEEaTBnMD0GCCsGAQUFBzAChjFodHRwOi8vY3J0LnRj
-cy50ZXJlbmEub3JnL1RFUkVOQWVTY2llbmNlU1NMQ0EuY3J0MCYGCCsGAQUFBzAB
-hhpodHRwOi8vb2NzcC50Y3MudGVyZW5hLm9yZzAqBgNVHREEIzAhghJzZy1saWZl
-cmF5LmdhcnIuaXSCC3Nndy5nYXJyLml0MA0GCSqGSIb3DQEBBQUAA4IBAQBfUy8v
-GupDJmcDTmNSx5kse8NfmSB1kbwM96IE7Eap+/VgNiIeOwjAyfK2gafLfD4QCYao
-1WQvBPqoqY3h14Wsbl5SRRRS+G6oj4x51YVvm7D6kgh4E5wlqfMPbDsZtGnkfh/m
-ZsTEL1Ixz6dT6PSzsqu5tPa9RnwNtBL+rRCW7OUfs6MPxofNmu+GCry8/6gZy2Rd
-yxyH2bHQkbZCMSil/2cvX/3ib2mg+eYrlZQywmRtWL92UtJoKlt96K1RYUKXdfIq
-Pm6o7CRIyLzXCIKWimG/PIPiJ0GNH1K2+X54yM/tV+bsjBCHlQe8RpUVKxzm5dtG
-zkkOSinydr85B7LG
-</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://sgw.garr.it/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sgw.garr.it/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sgw.garr.it/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sgw.garr.it/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sgw.garr.it/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sgw.garr.it/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sgw.garr.it/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sgw.garr.it/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://sgw.garr.it/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sgw.garr.it/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sgw.garr.it/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <AttributeConsumingService index="1">
-      <ServiceName xml:lang="it">GARR Science Gateway</ServiceName>
-      <ServiceName xml:lang="en">GARR Science Gateway</ServiceName>
-      <ServiceDescription xml:lang="it">Questo servizio permette di eseguire applicazioni scientifiche appartenenti a domini diversi su risorse di calcolo e di storage distribuite sul territorio italiano e in altre regioni del mondo. Attraverso il GARR Science Gateway, gli utenti possono accedere in maniera trasparente ed uniforme a risorse locali, grid e cloud</ServiceDescription>
-      <ServiceDescription xml:lang="en">This service allows to run scientific applications belonging to several domains on computational and storage resources distributed all over Italy and other regions of the world. Through the GARR Science Gateway, local, grid and cloud based resources can be accessed in a seamless and uniform way.</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"/>
-    </AttributeConsumingService>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="it">Consortium GARR</OrganizationName>
-    <OrganizationName xml:lang="en">Consortium GARR</OrganizationName>
-    <OrganizationDisplayName xml:lang="it">GARR Science Gateway erogato da Consortium GARR</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">GARR Science Gateway provided by Consortium GARR</OrganizationDisplayName>
-    <OrganizationURL xml:lang="it">http://www.garr.it/</OrganizationURL>
-    <OrganizationURL xml:lang="en">http://www.garr.it/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <EmailAddress>sgwadmin@garr.it</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shib-idp-1.oru.se-idp-shibboleth.xml b/swamid-interfederations-2.0/shib-idp-1.oru.se-idp-shibboleth.xml
deleted file mode 100644
index 38ec5524..00000000
--- a/swamid-interfederations-2.0/shib-idp-1.oru.se-idp-shibboleth.xml
+++ /dev/null
@@ -1,117 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shib-idp-1.oru.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">oru.se</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="sv">Örebro universitet</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Örebro University</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Identity Provider för Örebro universitet</mdui:Description>
-        <mdui:Description xml:lang="en">Örebro University Identity Provider</mdui:Description>
-        <mdui:Logo height="65" width="90">https://cas-01.oru.se/cas/Logo_txt_runt_farg.gif</mdui:Logo>
-        <mdui:Keywords xml:lang="sv">ORU ORU.SE Örebro Orebro Orebro+universitet Örebro+University Orebro+university Örebro+universitet</mdui:Keywords>
-        <mdui:Keywords xml:lang="en">ORU ORU.SE Örebro Orebro Orebro+universitet Örebro+University Orebro+university Örebro+universitet</mdui:Keywords>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DomainHint>oru.se</mdui:DomainHint>
-        <mdui:IPHint>130.243.96.0/19</mdui:IPHint>
-        <mdui:GeolocationHint>geo:59.2547,15.2485</mdui:GeolocationHint>
-        <mdui:GeolocationHint>geo:59.7065,14.5473</mdui:GeolocationHint>
-      </mdui:DiscoHints>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDMDCCAhigAwIBAgIVALJU7HH8NWybHvd6JV9KLneiEBQ9MA0GCSqGSIb3DQEB
-BQUAMBwxGjAYBgNVBAMTEXNoaWItaWRwLTEub3J1LnNlMB4XDTA5MTAyNjEwMjU1
-NVoXDTI5MTAyNjA5MjU1NVowHDEaMBgGA1UEAxMRc2hpYi1pZHAtMS5vcnUuc2Uw
-ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC7J4bgJcpbTuu4SD8pYvDC
-D5lRoaxVTvvacSPEIt2FUTGfa+smWLJvaoxL7eaP517Re9xqqw0MyRZ2fjyDW2GU
-z84RhCMQemT6EccDCEDwubkjoq41QQFbOsk/uh40Q0a/fOniP+e9cDpq57vQTux6
-a1tFNHgbOVR/1PsCksVsY6tdVbR364otqKXIti8ddYmPB5ax5Qr4+ezD7MJwitvN
-NyOgZZ2qM8P7Y1rMN+kKb4OTPHLIhVUiCRtww3p/9HTZOhjxRZbDKNLVQjHCwv9N
-pKh+cON1k5YGSEYba28z1ZuKKvVq6cCMcgndTiMA0R8LxMi3psbWB6rohddoo8E9
-AgMBAAGjaTBnMEYGA1UdEQQ/MD2CEXNoaWItaWRwLTEub3J1LnNlhihodHRwczov
-L3NoaWItaWRwLTEub3J1LnNlL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBSJG9Hv
-5hKDK9iBmJYEU3Hg0DZZPzANBgkqhkiG9w0BAQUFAAOCAQEAC1tgenssXaACi4b0
-O+j5Qno3bjq35y+cj0OC/Za2lBuD10zYiySOMcuxg7WdPDiiTKtoBdYkRRN6oKiT
-ix3hLTwuU3PjLTIZ83ytNgezEa6oK+iCGi/ecz2ax77QZ9rqpQCRNudIZjbTN6SO
-x+FduJkHovXk0Z9zfp5YZzJG2ViPYemurS8OEofkJXQKgmoFmw+LycSTMx2G6rnN
-SqQVF5wbEc9N1wy/sisZQ8yw4Err6mDAChcnrGtfFQ5aR89Xrb2VIkaOTRysytEQ
-JCVUOimhAjCyTt7bIWWH3Y1VYBQ9PfklNyHfusJ3AjqnuqYjoDiDKEz42EqLnq71
-Pz8R3A==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib-idp-1.oru.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib-idp-1.oru.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://shib-idp-1.oru.se/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib-idp-1.oru.se/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib-idp-1.oru.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib-idp-1.oru.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">oru.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDMDCCAhigAwIBAgIVALJU7HH8NWybHvd6JV9KLneiEBQ9MA0GCSqGSIb3DQEB
-BQUAMBwxGjAYBgNVBAMTEXNoaWItaWRwLTEub3J1LnNlMB4XDTA5MTAyNjEwMjU1
-NVoXDTI5MTAyNjA5MjU1NVowHDEaMBgGA1UEAxMRc2hpYi1pZHAtMS5vcnUuc2Uw
-ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC7J4bgJcpbTuu4SD8pYvDC
-D5lRoaxVTvvacSPEIt2FUTGfa+smWLJvaoxL7eaP517Re9xqqw0MyRZ2fjyDW2GU
-z84RhCMQemT6EccDCEDwubkjoq41QQFbOsk/uh40Q0a/fOniP+e9cDpq57vQTux6
-a1tFNHgbOVR/1PsCksVsY6tdVbR364otqKXIti8ddYmPB5ax5Qr4+ezD7MJwitvN
-NyOgZZ2qM8P7Y1rMN+kKb4OTPHLIhVUiCRtww3p/9HTZOhjxRZbDKNLVQjHCwv9N
-pKh+cON1k5YGSEYba28z1ZuKKvVq6cCMcgndTiMA0R8LxMi3psbWB6rohddoo8E9
-AgMBAAGjaTBnMEYGA1UdEQQ/MD2CEXNoaWItaWRwLTEub3J1LnNlhihodHRwczov
-L3NoaWItaWRwLTEub3J1LnNlL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBSJG9Hv
-5hKDK9iBmJYEU3Hg0DZZPzANBgkqhkiG9w0BAQUFAAOCAQEAC1tgenssXaACi4b0
-O+j5Qno3bjq35y+cj0OC/Za2lBuD10zYiySOMcuxg7WdPDiiTKtoBdYkRRN6oKiT
-ix3hLTwuU3PjLTIZ83ytNgezEa6oK+iCGi/ecz2ax77QZ9rqpQCRNudIZjbTN6SO
-x+FduJkHovXk0Z9zfp5YZzJG2ViPYemurS8OEofkJXQKgmoFmw+LycSTMx2G6rnN
-SqQVF5wbEc9N1wy/sisZQ8yw4Err6mDAChcnrGtfFQ5aR89Xrb2VIkaOTRysytEQ
-JCVUOimhAjCyTt7bIWWH3Y1VYBQ9PfklNyHfusJ3AjqnuqYjoDiDKEz42EqLnq71
-Pz8R3A==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib-idp-1.oru.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib-idp-1.oru.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">ORU</OrganizationName>
-    <OrganizationDisplayName xml:lang="sv">Örebro Universitet</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">Örebro University</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.oru.se</OrganizationURL>
-  </Organization>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
-    <Company>Örebro University</Company>
-    <SurName>IT Avdelningen</SurName>
-    <EmailAddress>itsupport@oru.se</EmailAddress>
-    <TelephoneNumber>+46 19 303166</TelephoneNumber>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
-    <Company>Örebro University</Company>
-    <SurName>Jonny Ehrnberg</SurName>
-    <EmailAddress>jonny.ehrnberg@oru.se</EmailAddress>
-    <TelephoneNumber>+46 19 303851</TelephoneNumber>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
-    <Company>Örebro University</Company>
-    <SurName>IT Avdelningen Örebro universitet</SurName>
-    <EmailAddress>itsupport@oru.se</EmailAddress>
-    <TelephoneNumber>+46 19 303166</TelephoneNumber>
-  </ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shib-idp-1.oru.se.xml b/swamid-interfederations-2.0/shib-idp-1.oru.se.xml
deleted file mode 100644
index 38ec5524..00000000
--- a/swamid-interfederations-2.0/shib-idp-1.oru.se.xml
+++ /dev/null
@@ -1,117 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shib-idp-1.oru.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">oru.se</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="sv">Örebro universitet</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Örebro University</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Identity Provider för Örebro universitet</mdui:Description>
-        <mdui:Description xml:lang="en">Örebro University Identity Provider</mdui:Description>
-        <mdui:Logo height="65" width="90">https://cas-01.oru.se/cas/Logo_txt_runt_farg.gif</mdui:Logo>
-        <mdui:Keywords xml:lang="sv">ORU ORU.SE Örebro Orebro Orebro+universitet Örebro+University Orebro+university Örebro+universitet</mdui:Keywords>
-        <mdui:Keywords xml:lang="en">ORU ORU.SE Örebro Orebro Orebro+universitet Örebro+University Orebro+university Örebro+universitet</mdui:Keywords>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DomainHint>oru.se</mdui:DomainHint>
-        <mdui:IPHint>130.243.96.0/19</mdui:IPHint>
-        <mdui:GeolocationHint>geo:59.2547,15.2485</mdui:GeolocationHint>
-        <mdui:GeolocationHint>geo:59.7065,14.5473</mdui:GeolocationHint>
-      </mdui:DiscoHints>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDMDCCAhigAwIBAgIVALJU7HH8NWybHvd6JV9KLneiEBQ9MA0GCSqGSIb3DQEB
-BQUAMBwxGjAYBgNVBAMTEXNoaWItaWRwLTEub3J1LnNlMB4XDTA5MTAyNjEwMjU1
-NVoXDTI5MTAyNjA5MjU1NVowHDEaMBgGA1UEAxMRc2hpYi1pZHAtMS5vcnUuc2Uw
-ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC7J4bgJcpbTuu4SD8pYvDC
-D5lRoaxVTvvacSPEIt2FUTGfa+smWLJvaoxL7eaP517Re9xqqw0MyRZ2fjyDW2GU
-z84RhCMQemT6EccDCEDwubkjoq41QQFbOsk/uh40Q0a/fOniP+e9cDpq57vQTux6
-a1tFNHgbOVR/1PsCksVsY6tdVbR364otqKXIti8ddYmPB5ax5Qr4+ezD7MJwitvN
-NyOgZZ2qM8P7Y1rMN+kKb4OTPHLIhVUiCRtww3p/9HTZOhjxRZbDKNLVQjHCwv9N
-pKh+cON1k5YGSEYba28z1ZuKKvVq6cCMcgndTiMA0R8LxMi3psbWB6rohddoo8E9
-AgMBAAGjaTBnMEYGA1UdEQQ/MD2CEXNoaWItaWRwLTEub3J1LnNlhihodHRwczov
-L3NoaWItaWRwLTEub3J1LnNlL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBSJG9Hv
-5hKDK9iBmJYEU3Hg0DZZPzANBgkqhkiG9w0BAQUFAAOCAQEAC1tgenssXaACi4b0
-O+j5Qno3bjq35y+cj0OC/Za2lBuD10zYiySOMcuxg7WdPDiiTKtoBdYkRRN6oKiT
-ix3hLTwuU3PjLTIZ83ytNgezEa6oK+iCGi/ecz2ax77QZ9rqpQCRNudIZjbTN6SO
-x+FduJkHovXk0Z9zfp5YZzJG2ViPYemurS8OEofkJXQKgmoFmw+LycSTMx2G6rnN
-SqQVF5wbEc9N1wy/sisZQ8yw4Err6mDAChcnrGtfFQ5aR89Xrb2VIkaOTRysytEQ
-JCVUOimhAjCyTt7bIWWH3Y1VYBQ9PfklNyHfusJ3AjqnuqYjoDiDKEz42EqLnq71
-Pz8R3A==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib-idp-1.oru.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib-idp-1.oru.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://shib-idp-1.oru.se/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib-idp-1.oru.se/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib-idp-1.oru.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib-idp-1.oru.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">oru.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDMDCCAhigAwIBAgIVALJU7HH8NWybHvd6JV9KLneiEBQ9MA0GCSqGSIb3DQEB
-BQUAMBwxGjAYBgNVBAMTEXNoaWItaWRwLTEub3J1LnNlMB4XDTA5MTAyNjEwMjU1
-NVoXDTI5MTAyNjA5MjU1NVowHDEaMBgGA1UEAxMRc2hpYi1pZHAtMS5vcnUuc2Uw
-ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC7J4bgJcpbTuu4SD8pYvDC
-D5lRoaxVTvvacSPEIt2FUTGfa+smWLJvaoxL7eaP517Re9xqqw0MyRZ2fjyDW2GU
-z84RhCMQemT6EccDCEDwubkjoq41QQFbOsk/uh40Q0a/fOniP+e9cDpq57vQTux6
-a1tFNHgbOVR/1PsCksVsY6tdVbR364otqKXIti8ddYmPB5ax5Qr4+ezD7MJwitvN
-NyOgZZ2qM8P7Y1rMN+kKb4OTPHLIhVUiCRtww3p/9HTZOhjxRZbDKNLVQjHCwv9N
-pKh+cON1k5YGSEYba28z1ZuKKvVq6cCMcgndTiMA0R8LxMi3psbWB6rohddoo8E9
-AgMBAAGjaTBnMEYGA1UdEQQ/MD2CEXNoaWItaWRwLTEub3J1LnNlhihodHRwczov
-L3NoaWItaWRwLTEub3J1LnNlL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBSJG9Hv
-5hKDK9iBmJYEU3Hg0DZZPzANBgkqhkiG9w0BAQUFAAOCAQEAC1tgenssXaACi4b0
-O+j5Qno3bjq35y+cj0OC/Za2lBuD10zYiySOMcuxg7WdPDiiTKtoBdYkRRN6oKiT
-ix3hLTwuU3PjLTIZ83ytNgezEa6oK+iCGi/ecz2ax77QZ9rqpQCRNudIZjbTN6SO
-x+FduJkHovXk0Z9zfp5YZzJG2ViPYemurS8OEofkJXQKgmoFmw+LycSTMx2G6rnN
-SqQVF5wbEc9N1wy/sisZQ8yw4Err6mDAChcnrGtfFQ5aR89Xrb2VIkaOTRysytEQ
-JCVUOimhAjCyTt7bIWWH3Y1VYBQ9PfklNyHfusJ3AjqnuqYjoDiDKEz42EqLnq71
-Pz8R3A==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib-idp-1.oru.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib-idp-1.oru.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">ORU</OrganizationName>
-    <OrganizationDisplayName xml:lang="sv">Örebro Universitet</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">Örebro University</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.oru.se</OrganizationURL>
-  </Organization>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
-    <Company>Örebro University</Company>
-    <SurName>IT Avdelningen</SurName>
-    <EmailAddress>itsupport@oru.se</EmailAddress>
-    <TelephoneNumber>+46 19 303166</TelephoneNumber>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
-    <Company>Örebro University</Company>
-    <SurName>Jonny Ehrnberg</SurName>
-    <EmailAddress>jonny.ehrnberg@oru.se</EmailAddress>
-    <TelephoneNumber>+46 19 303851</TelephoneNumber>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
-    <Company>Örebro University</Company>
-    <SurName>IT Avdelningen Örebro universitet</SurName>
-    <EmailAddress>itsupport@oru.se</EmailAddress>
-    <TelephoneNumber>+46 19 303166</TelephoneNumber>
-  </ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shib-idp.cms.hu-berlin.de-idp-shibboleth.xml b/swamid-interfederations-2.0/shib-idp.cms.hu-berlin.de-idp-shibboleth.xml
deleted file mode 100644
index 9e05635a..00000000
--- a/swamid-interfederations-2.0/shib-idp.cms.hu-berlin.de-idp-shibboleth.xml
+++ /dev/null
@@ -1,151 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shib-idp.cms.hu-berlin.de/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2011-10-21T09:44:34Z">
-      <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">hu-berlin.de</saml1md:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="de">Humboldt-Universität zu Berlin</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Humboldt-Universität zu Berlin</mdui:DisplayName>
-        <mdui:Description xml:lang="de">IdP der Humboldt-Universität zu Berlin</mdui:Description>
-        <mdui:Description xml:lang="en">IdP der Humboldt-Universität zu Berlin</mdui:Description>
-        <mdui:InformationURL xml:lang="de">http://www.hu-berlin.de/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">http://www.hu-berlin.de/</mdui:InformationURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>shibboleth.uvf.hu-berlin.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=shibboleth.uvf.hu-berlin.de,OU=ZE Computer- und Medienservice,O=Humboldt-Universitaet zu Berlin,L=Berlin,ST=Berlin,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIGRzCCBS+gAwIBAgIHF2Z6KgngwzANBgkqhkiG9w0BAQUFADBoMQswCQYDVQQG
-EwJERTEoMCYGA1UEChMfSHVtYm9sZHQtVW5pdmVyc2l0YWV0IHp1IEJlcmxpbjEO
-MAwGA1UEAxMFSFUtQ0ExHzAdBgkqhkiG9w0BCQEWEHBraUBodS1iZXJsaW4uZGUw
-HhcNMTQwNDEwMjAxODM1WhcNMTkwNDA5MjAxODM1WjCBqDELMAkGA1UEBhMCREUx
-DzANBgNVBAgTBkJlcmxpbjEPMA0GA1UEBxMGQmVybGluMSgwJgYDVQQKEx9IdW1i
-b2xkdC1Vbml2ZXJzaXRhZXQgenUgQmVybGluMScwJQYDVQQLEx5aRSBDb21wdXRl
-ci0gdW5kIE1lZGllbnNlcnZpY2UxJDAiBgNVBAMTG3NoaWJib2xldGgudXZmLmh1
-LWJlcmxpbi5kZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAOIlG04F
-e1/y8yyfq/fx3J0yPiTwpkbixt92V8eGFt7JsHRAmK0kJ7RkWtIq8QBzopssW8Kh
-ovSQCJv+iZsx8VIViC6wWNKhfFxBlRMt2yKwA36t9PXZHho41BTJDdFJergVY0Se
-/+R+JXb7M6YTvElpmyT2tqNpsz9MzWqEcWlWD0YO+fD57QImAy5EnenLS0DHOxf8
-W8df0q6UDXeYIpH7owADpLHTl6WvKmLSHuoB4gWGo34F67zs17VGZJNV2fwvw5D4
-rJGdkJ+C+Jpb9rXfaD7+spZdvB2dZEHkVsZe11zTo7IDAQZ7taErgaxP26Yobr0A
-GhE5XKlUKdtKKNcCAwEAAaOCArMwggKvMDkGA1UdIAQyMDAwEQYPKwYBBAGBrSGC
-LAEBBAMBMBEGDysGAQQBga0hgiwCAQQDATAIBgZngQwBAgIwCQYDVR0TBAIwADAL
-BgNVHQ8EBAMCBeAwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMB0GA1Ud
-DgQWBBR45u1WtZRCUF41/A0X15YNq112RjAfBgNVHSMEGDAWgBQf9Sw+90CrLpCg
-atPieV7yds2DdDCBngYDVR0RBIGWMIGTghhzaGliLWRzLmNtcy5odS1iZXJsaW4u
-ZGWCGXNoaWItaWRwLmNtcy5odS1iZXJsaW4uZGWCHnNoaWJib2xldGgtZHMuY21z
-Lmh1LWJlcmxpbi5kZYIfc2hpYmJvbGV0aC1pZHAuY21zLmh1LWJlcmxpbi5kZYIb
-c2hpYmJvbGV0aC51dmYuaHUtYmVybGluLmRlMIGDBgNVHR8EfDB6MDugOaA3hjVo
-dHRwOi8vY2RwMS5wY2EuZGZuLmRlL2h1LWJlcmxpbi1jYS9wdWIvY3JsL2NhY3Js
-LmNybDA7oDmgN4Y1aHR0cDovL2NkcDIucGNhLmRmbi5kZS9odS1iZXJsaW4tY2Ev
-cHViL2NybC9jYWNybC5jcmwwgdMGCCsGAQUFBwEBBIHGMIHDMDMGCCsGAQUFBzAB
-hidodHRwOi8vb2NzcC5wY2EuZGZuLmRlL09DU1AtU2VydmVyL09DU1AwRQYIKwYB
-BQUHMAKGOWh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvaHUtYmVybGluLWNhL3B1Yi9j
-YWNlcnQvY2FjZXJ0LmNydDBFBggrBgEFBQcwAoY5aHR0cDovL2NkcDIucGNhLmRm
-bi5kZS9odS1iZXJsaW4tY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MA0GCSqGSIb3
-DQEBBQUAA4IBAQCzPNgkjA6fa1I4Jmz8jK7uUBK3GJyauJ5ADHqc4ljsvoOjrKzT
-mT4gIy1XVKjsYWVID9anOnqd21EHJ82XNf2UKKmiVc1CIMz50VP5TCFqPr+a3LPy
-YeKN8H82ZHVCuQr1PpCeGDNewdyAWgOWrGGMvvZkYmGskvc3epkKfxG8T/HyueHh
-Moe3fU74QPZ/65iFysiDuK+9lqlT7VRp0FC61qhlPOjZPNcjMYeOXa4zS7hq4NYT
-yc3mkCS1I4050gDzdhTX9WbjFlGXZ1Eyu1ZPMcO9ebA1xXBbvbShAyKREaEl7UoS
-lp8Ny4TYeDIkRYSv+DuzIcJCFhAY//i8BXS8
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib-idp.cms.hu-berlin.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib-idp.cms.hu-berlin.de:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib-idp.cms.hu-berlin.de/idp/profile/SAML2/Redirect/SLO" ResponseLocation="https://shib-idp.cms.hu-berlin.de/idp/profile/SAML2/Redirect/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib-idp.cms.hu-berlin.de/idp/profile/SAML2/POST/SLO" ResponseLocation="https://shib-idp.cms.hu-berlin.de/idp/profile/SAML2/POST/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib-idp.cms.hu-berlin.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://shib-idp.cms.hu-berlin.de/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib-idp.cms.hu-berlin.de/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib-idp.cms.hu-berlin.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib-idp.cms.hu-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">hu-berlin.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>shibboleth.uvf.hu-berlin.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=shibboleth.uvf.hu-berlin.de,OU=ZE Computer- und Medienservice,O=Humboldt-Universitaet zu Berlin,L=Berlin,ST=Berlin,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIGRzCCBS+gAwIBAgIHF2Z6KgngwzANBgkqhkiG9w0BAQUFADBoMQswCQYDVQQG
-EwJERTEoMCYGA1UEChMfSHVtYm9sZHQtVW5pdmVyc2l0YWV0IHp1IEJlcmxpbjEO
-MAwGA1UEAxMFSFUtQ0ExHzAdBgkqhkiG9w0BCQEWEHBraUBodS1iZXJsaW4uZGUw
-HhcNMTQwNDEwMjAxODM1WhcNMTkwNDA5MjAxODM1WjCBqDELMAkGA1UEBhMCREUx
-DzANBgNVBAgTBkJlcmxpbjEPMA0GA1UEBxMGQmVybGluMSgwJgYDVQQKEx9IdW1i
-b2xkdC1Vbml2ZXJzaXRhZXQgenUgQmVybGluMScwJQYDVQQLEx5aRSBDb21wdXRl
-ci0gdW5kIE1lZGllbnNlcnZpY2UxJDAiBgNVBAMTG3NoaWJib2xldGgudXZmLmh1
-LWJlcmxpbi5kZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAOIlG04F
-e1/y8yyfq/fx3J0yPiTwpkbixt92V8eGFt7JsHRAmK0kJ7RkWtIq8QBzopssW8Kh
-ovSQCJv+iZsx8VIViC6wWNKhfFxBlRMt2yKwA36t9PXZHho41BTJDdFJergVY0Se
-/+R+JXb7M6YTvElpmyT2tqNpsz9MzWqEcWlWD0YO+fD57QImAy5EnenLS0DHOxf8
-W8df0q6UDXeYIpH7owADpLHTl6WvKmLSHuoB4gWGo34F67zs17VGZJNV2fwvw5D4
-rJGdkJ+C+Jpb9rXfaD7+spZdvB2dZEHkVsZe11zTo7IDAQZ7taErgaxP26Yobr0A
-GhE5XKlUKdtKKNcCAwEAAaOCArMwggKvMDkGA1UdIAQyMDAwEQYPKwYBBAGBrSGC
-LAEBBAMBMBEGDysGAQQBga0hgiwCAQQDATAIBgZngQwBAgIwCQYDVR0TBAIwADAL
-BgNVHQ8EBAMCBeAwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMB0GA1Ud
-DgQWBBR45u1WtZRCUF41/A0X15YNq112RjAfBgNVHSMEGDAWgBQf9Sw+90CrLpCg
-atPieV7yds2DdDCBngYDVR0RBIGWMIGTghhzaGliLWRzLmNtcy5odS1iZXJsaW4u
-ZGWCGXNoaWItaWRwLmNtcy5odS1iZXJsaW4uZGWCHnNoaWJib2xldGgtZHMuY21z
-Lmh1LWJlcmxpbi5kZYIfc2hpYmJvbGV0aC1pZHAuY21zLmh1LWJlcmxpbi5kZYIb
-c2hpYmJvbGV0aC51dmYuaHUtYmVybGluLmRlMIGDBgNVHR8EfDB6MDugOaA3hjVo
-dHRwOi8vY2RwMS5wY2EuZGZuLmRlL2h1LWJlcmxpbi1jYS9wdWIvY3JsL2NhY3Js
-LmNybDA7oDmgN4Y1aHR0cDovL2NkcDIucGNhLmRmbi5kZS9odS1iZXJsaW4tY2Ev
-cHViL2NybC9jYWNybC5jcmwwgdMGCCsGAQUFBwEBBIHGMIHDMDMGCCsGAQUFBzAB
-hidodHRwOi8vb2NzcC5wY2EuZGZuLmRlL09DU1AtU2VydmVyL09DU1AwRQYIKwYB
-BQUHMAKGOWh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvaHUtYmVybGluLWNhL3B1Yi9j
-YWNlcnQvY2FjZXJ0LmNydDBFBggrBgEFBQcwAoY5aHR0cDovL2NkcDIucGNhLmRm
-bi5kZS9odS1iZXJsaW4tY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MA0GCSqGSIb3
-DQEBBQUAA4IBAQCzPNgkjA6fa1I4Jmz8jK7uUBK3GJyauJ5ADHqc4ljsvoOjrKzT
-mT4gIy1XVKjsYWVID9anOnqd21EHJ82XNf2UKKmiVc1CIMz50VP5TCFqPr+a3LPy
-YeKN8H82ZHVCuQr1PpCeGDNewdyAWgOWrGGMvvZkYmGskvc3epkKfxG8T/HyueHh
-Moe3fU74QPZ/65iFysiDuK+9lqlT7VRp0FC61qhlPOjZPNcjMYeOXa4zS7hq4NYT
-yc3mkCS1I4050gDzdhTX9WbjFlGXZ1Eyu1ZPMcO9ebA1xXBbvbShAyKREaEl7UoS
-lp8Ny4TYeDIkRYSv+DuzIcJCFhAY//i8BXS8
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib-idp.cms.hu-berlin.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib-idp.cms.hu-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">e233</OrganizationName>
-    <OrganizationName xml:lang="en">e233</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">Humboldt-Universität zu Berlin</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">Humboldt-University Berlin</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.hu-berlin.de/</OrganizationURL>
-    <OrganizationURL xml:lang="en">http://www.hu-berlin.de/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="administrative">
-    <GivenName>Petra</GivenName>
-    <SurName>Berg</SurName>
-    <EmailAddress>mailto:shibadmin@hu-berlin.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Petra</GivenName>
-    <SurName>Berg</SurName>
-    <EmailAddress>mailto:shibadmin@hu-berlin.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="support">
-    <GivenName>Petra</GivenName>
-    <SurName>Berg</SurName>
-    <EmailAddress>mailto:shibadmin@hu-berlin.de</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shib-idp.cms.hu-berlin.de.xml b/swamid-interfederations-2.0/shib-idp.cms.hu-berlin.de.xml
deleted file mode 100644
index 9e05635a..00000000
--- a/swamid-interfederations-2.0/shib-idp.cms.hu-berlin.de.xml
+++ /dev/null
@@ -1,151 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shib-idp.cms.hu-berlin.de/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2011-10-21T09:44:34Z">
-      <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">hu-berlin.de</saml1md:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="de">Humboldt-Universität zu Berlin</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Humboldt-Universität zu Berlin</mdui:DisplayName>
-        <mdui:Description xml:lang="de">IdP der Humboldt-Universität zu Berlin</mdui:Description>
-        <mdui:Description xml:lang="en">IdP der Humboldt-Universität zu Berlin</mdui:Description>
-        <mdui:InformationURL xml:lang="de">http://www.hu-berlin.de/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">http://www.hu-berlin.de/</mdui:InformationURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>shibboleth.uvf.hu-berlin.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=shibboleth.uvf.hu-berlin.de,OU=ZE Computer- und Medienservice,O=Humboldt-Universitaet zu Berlin,L=Berlin,ST=Berlin,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIGRzCCBS+gAwIBAgIHF2Z6KgngwzANBgkqhkiG9w0BAQUFADBoMQswCQYDVQQG
-EwJERTEoMCYGA1UEChMfSHVtYm9sZHQtVW5pdmVyc2l0YWV0IHp1IEJlcmxpbjEO
-MAwGA1UEAxMFSFUtQ0ExHzAdBgkqhkiG9w0BCQEWEHBraUBodS1iZXJsaW4uZGUw
-HhcNMTQwNDEwMjAxODM1WhcNMTkwNDA5MjAxODM1WjCBqDELMAkGA1UEBhMCREUx
-DzANBgNVBAgTBkJlcmxpbjEPMA0GA1UEBxMGQmVybGluMSgwJgYDVQQKEx9IdW1i
-b2xkdC1Vbml2ZXJzaXRhZXQgenUgQmVybGluMScwJQYDVQQLEx5aRSBDb21wdXRl
-ci0gdW5kIE1lZGllbnNlcnZpY2UxJDAiBgNVBAMTG3NoaWJib2xldGgudXZmLmh1
-LWJlcmxpbi5kZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAOIlG04F
-e1/y8yyfq/fx3J0yPiTwpkbixt92V8eGFt7JsHRAmK0kJ7RkWtIq8QBzopssW8Kh
-ovSQCJv+iZsx8VIViC6wWNKhfFxBlRMt2yKwA36t9PXZHho41BTJDdFJergVY0Se
-/+R+JXb7M6YTvElpmyT2tqNpsz9MzWqEcWlWD0YO+fD57QImAy5EnenLS0DHOxf8
-W8df0q6UDXeYIpH7owADpLHTl6WvKmLSHuoB4gWGo34F67zs17VGZJNV2fwvw5D4
-rJGdkJ+C+Jpb9rXfaD7+spZdvB2dZEHkVsZe11zTo7IDAQZ7taErgaxP26Yobr0A
-GhE5XKlUKdtKKNcCAwEAAaOCArMwggKvMDkGA1UdIAQyMDAwEQYPKwYBBAGBrSGC
-LAEBBAMBMBEGDysGAQQBga0hgiwCAQQDATAIBgZngQwBAgIwCQYDVR0TBAIwADAL
-BgNVHQ8EBAMCBeAwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMB0GA1Ud
-DgQWBBR45u1WtZRCUF41/A0X15YNq112RjAfBgNVHSMEGDAWgBQf9Sw+90CrLpCg
-atPieV7yds2DdDCBngYDVR0RBIGWMIGTghhzaGliLWRzLmNtcy5odS1iZXJsaW4u
-ZGWCGXNoaWItaWRwLmNtcy5odS1iZXJsaW4uZGWCHnNoaWJib2xldGgtZHMuY21z
-Lmh1LWJlcmxpbi5kZYIfc2hpYmJvbGV0aC1pZHAuY21zLmh1LWJlcmxpbi5kZYIb
-c2hpYmJvbGV0aC51dmYuaHUtYmVybGluLmRlMIGDBgNVHR8EfDB6MDugOaA3hjVo
-dHRwOi8vY2RwMS5wY2EuZGZuLmRlL2h1LWJlcmxpbi1jYS9wdWIvY3JsL2NhY3Js
-LmNybDA7oDmgN4Y1aHR0cDovL2NkcDIucGNhLmRmbi5kZS9odS1iZXJsaW4tY2Ev
-cHViL2NybC9jYWNybC5jcmwwgdMGCCsGAQUFBwEBBIHGMIHDMDMGCCsGAQUFBzAB
-hidodHRwOi8vb2NzcC5wY2EuZGZuLmRlL09DU1AtU2VydmVyL09DU1AwRQYIKwYB
-BQUHMAKGOWh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvaHUtYmVybGluLWNhL3B1Yi9j
-YWNlcnQvY2FjZXJ0LmNydDBFBggrBgEFBQcwAoY5aHR0cDovL2NkcDIucGNhLmRm
-bi5kZS9odS1iZXJsaW4tY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MA0GCSqGSIb3
-DQEBBQUAA4IBAQCzPNgkjA6fa1I4Jmz8jK7uUBK3GJyauJ5ADHqc4ljsvoOjrKzT
-mT4gIy1XVKjsYWVID9anOnqd21EHJ82XNf2UKKmiVc1CIMz50VP5TCFqPr+a3LPy
-YeKN8H82ZHVCuQr1PpCeGDNewdyAWgOWrGGMvvZkYmGskvc3epkKfxG8T/HyueHh
-Moe3fU74QPZ/65iFysiDuK+9lqlT7VRp0FC61qhlPOjZPNcjMYeOXa4zS7hq4NYT
-yc3mkCS1I4050gDzdhTX9WbjFlGXZ1Eyu1ZPMcO9ebA1xXBbvbShAyKREaEl7UoS
-lp8Ny4TYeDIkRYSv+DuzIcJCFhAY//i8BXS8
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib-idp.cms.hu-berlin.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib-idp.cms.hu-berlin.de:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib-idp.cms.hu-berlin.de/idp/profile/SAML2/Redirect/SLO" ResponseLocation="https://shib-idp.cms.hu-berlin.de/idp/profile/SAML2/Redirect/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib-idp.cms.hu-berlin.de/idp/profile/SAML2/POST/SLO" ResponseLocation="https://shib-idp.cms.hu-berlin.de/idp/profile/SAML2/POST/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib-idp.cms.hu-berlin.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://shib-idp.cms.hu-berlin.de/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib-idp.cms.hu-berlin.de/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib-idp.cms.hu-berlin.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib-idp.cms.hu-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">hu-berlin.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>shibboleth.uvf.hu-berlin.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=shibboleth.uvf.hu-berlin.de,OU=ZE Computer- und Medienservice,O=Humboldt-Universitaet zu Berlin,L=Berlin,ST=Berlin,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIGRzCCBS+gAwIBAgIHF2Z6KgngwzANBgkqhkiG9w0BAQUFADBoMQswCQYDVQQG
-EwJERTEoMCYGA1UEChMfSHVtYm9sZHQtVW5pdmVyc2l0YWV0IHp1IEJlcmxpbjEO
-MAwGA1UEAxMFSFUtQ0ExHzAdBgkqhkiG9w0BCQEWEHBraUBodS1iZXJsaW4uZGUw
-HhcNMTQwNDEwMjAxODM1WhcNMTkwNDA5MjAxODM1WjCBqDELMAkGA1UEBhMCREUx
-DzANBgNVBAgTBkJlcmxpbjEPMA0GA1UEBxMGQmVybGluMSgwJgYDVQQKEx9IdW1i
-b2xkdC1Vbml2ZXJzaXRhZXQgenUgQmVybGluMScwJQYDVQQLEx5aRSBDb21wdXRl
-ci0gdW5kIE1lZGllbnNlcnZpY2UxJDAiBgNVBAMTG3NoaWJib2xldGgudXZmLmh1
-LWJlcmxpbi5kZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAOIlG04F
-e1/y8yyfq/fx3J0yPiTwpkbixt92V8eGFt7JsHRAmK0kJ7RkWtIq8QBzopssW8Kh
-ovSQCJv+iZsx8VIViC6wWNKhfFxBlRMt2yKwA36t9PXZHho41BTJDdFJergVY0Se
-/+R+JXb7M6YTvElpmyT2tqNpsz9MzWqEcWlWD0YO+fD57QImAy5EnenLS0DHOxf8
-W8df0q6UDXeYIpH7owADpLHTl6WvKmLSHuoB4gWGo34F67zs17VGZJNV2fwvw5D4
-rJGdkJ+C+Jpb9rXfaD7+spZdvB2dZEHkVsZe11zTo7IDAQZ7taErgaxP26Yobr0A
-GhE5XKlUKdtKKNcCAwEAAaOCArMwggKvMDkGA1UdIAQyMDAwEQYPKwYBBAGBrSGC
-LAEBBAMBMBEGDysGAQQBga0hgiwCAQQDATAIBgZngQwBAgIwCQYDVR0TBAIwADAL
-BgNVHQ8EBAMCBeAwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMB0GA1Ud
-DgQWBBR45u1WtZRCUF41/A0X15YNq112RjAfBgNVHSMEGDAWgBQf9Sw+90CrLpCg
-atPieV7yds2DdDCBngYDVR0RBIGWMIGTghhzaGliLWRzLmNtcy5odS1iZXJsaW4u
-ZGWCGXNoaWItaWRwLmNtcy5odS1iZXJsaW4uZGWCHnNoaWJib2xldGgtZHMuY21z
-Lmh1LWJlcmxpbi5kZYIfc2hpYmJvbGV0aC1pZHAuY21zLmh1LWJlcmxpbi5kZYIb
-c2hpYmJvbGV0aC51dmYuaHUtYmVybGluLmRlMIGDBgNVHR8EfDB6MDugOaA3hjVo
-dHRwOi8vY2RwMS5wY2EuZGZuLmRlL2h1LWJlcmxpbi1jYS9wdWIvY3JsL2NhY3Js
-LmNybDA7oDmgN4Y1aHR0cDovL2NkcDIucGNhLmRmbi5kZS9odS1iZXJsaW4tY2Ev
-cHViL2NybC9jYWNybC5jcmwwgdMGCCsGAQUFBwEBBIHGMIHDMDMGCCsGAQUFBzAB
-hidodHRwOi8vb2NzcC5wY2EuZGZuLmRlL09DU1AtU2VydmVyL09DU1AwRQYIKwYB
-BQUHMAKGOWh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvaHUtYmVybGluLWNhL3B1Yi9j
-YWNlcnQvY2FjZXJ0LmNydDBFBggrBgEFBQcwAoY5aHR0cDovL2NkcDIucGNhLmRm
-bi5kZS9odS1iZXJsaW4tY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MA0GCSqGSIb3
-DQEBBQUAA4IBAQCzPNgkjA6fa1I4Jmz8jK7uUBK3GJyauJ5ADHqc4ljsvoOjrKzT
-mT4gIy1XVKjsYWVID9anOnqd21EHJ82XNf2UKKmiVc1CIMz50VP5TCFqPr+a3LPy
-YeKN8H82ZHVCuQr1PpCeGDNewdyAWgOWrGGMvvZkYmGskvc3epkKfxG8T/HyueHh
-Moe3fU74QPZ/65iFysiDuK+9lqlT7VRp0FC61qhlPOjZPNcjMYeOXa4zS7hq4NYT
-yc3mkCS1I4050gDzdhTX9WbjFlGXZ1Eyu1ZPMcO9ebA1xXBbvbShAyKREaEl7UoS
-lp8Ny4TYeDIkRYSv+DuzIcJCFhAY//i8BXS8
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib-idp.cms.hu-berlin.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib-idp.cms.hu-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">e233</OrganizationName>
-    <OrganizationName xml:lang="en">e233</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">Humboldt-Universität zu Berlin</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">Humboldt-University Berlin</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.hu-berlin.de/</OrganizationURL>
-    <OrganizationURL xml:lang="en">http://www.hu-berlin.de/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="administrative">
-    <GivenName>Petra</GivenName>
-    <SurName>Berg</SurName>
-    <EmailAddress>mailto:shibadmin@hu-berlin.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Petra</GivenName>
-    <SurName>Berg</SurName>
-    <EmailAddress>mailto:shibadmin@hu-berlin.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="support">
-    <GivenName>Petra</GivenName>
-    <SurName>Berg</SurName>
-    <EmailAddress>mailto:shibadmin@hu-berlin.de</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shib-sp-dev.cf.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/shib-sp-dev.cf.ac.uk-shibboleth.xml
deleted file mode 100644
index 5164f2a5..00000000
--- a/swamid-interfederations-2.0/shib-sp-dev.cf.ac.uk-shibboleth.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://shib-sp-dev.cf.ac.uk/shibboleth">
-  <!--
-		This is a Shib Test SP owned by Cardiff University.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2008-10-23T14:26:00Z">
-      <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">
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDETCCAfmgAwIBAgIJAPGWoIhDomdwMA0GCSqGSIb3DQEBBQUAMBYxFDASBgNV
-						BAMTC3NoaWItc3AtZGV2MB4XDTEwMTEwNTA0MTY1MVoXDTMwMTAzMTA0MTY1MVow
-						FjEUMBIGA1UEAxMLc2hpYi1zcC1kZXYwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
-						ggEKAoIBAQDPvKQqQDjZxRKqICIU8CfnT+wU1zRJIHgP9fbiebqVEpklkUwXnlQK
-						+Bif5oNaHAKq3etAp/QzP9/HffBCTHrRubdXPjzzhsqDCLvLMZ4xFk/omgjl36/N
-						1ruDUapMB2T0xUGS2Gev1olYbfL0MjRnhQqasJOvdqswI/U9eU8xYXLnz1dqeOPs
-						Ury21Zop4fVL9KY6sAvFDg6TrdgY7h5f8RJbIkjA3R3E0M+TR/dZiOvIw4CIjKFU
-						qUcIX4F+c0BGvSJU4RaunAG9RyNTGZvm9LBptiVcLGNXMyb0+KxIpwFQdd9juOpp
-						OXHjzkqxwQ87BZ+lCPMH5I4UhqBfNNJDAgMBAAGjYjBgMD8GA1UdEQQ4MDaCC3No
-						aWItc3AtZGV2hidodHRwczovL3NoaWItc3AtZGV2LmNmLmFjLnVrL3NoaWJib2xl
-						dGgwHQYDVR0OBBYEFAiqFmapO7egaR+j3lXoc8yFYs6oMA0GCSqGSIb3DQEBBQUA
-						A4IBAQATLXYR4ia9D/oDtOBHmfxwRHLcrDZqUdYD2NmJc3R7VQoV+SiGeHCxqZ65
-						wF5wWEDWByWjk/LQmOM/vov8UzlLD6GlyVlyo/yLfvNrsDbh83Ohc4TSLKXGar1x
-						2IzA6DP5OwA0FdJ5mZt6F+Mx9f/bo/yQf4yh219Gkuy/2MBtlTDelkSALTuoiaiq
-						9VuAp1o2yJr3ttEa3oyZUQyMi0TbnfVd8rfEkGefvGvjmWdDSRT1ZoojRIfZh+tV
-						w4NpiARsEdi/nWgud1MV7GTScg9YtZcaCahDoVeXVSTao4+NxBKXjlalGieMLlzC
-						ZgojzE1jEQkVmYzQirlmP/kiz1k5
-					</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>
-						MIIDETCCAfmgAwIBAgIJAPGWoIhDomdwMA0GCSqGSIb3DQEBBQUAMBYxFDASBgNV
-						BAMTC3NoaWItc3AtZGV2MB4XDTEwMTEwNTA0MTY1MVoXDTMwMTAzMTA0MTY1MVow
-						FjEUMBIGA1UEAxMLc2hpYi1zcC1kZXYwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
-						ggEKAoIBAQDPvKQqQDjZxRKqICIU8CfnT+wU1zRJIHgP9fbiebqVEpklkUwXnlQK
-						+Bif5oNaHAKq3etAp/QzP9/HffBCTHrRubdXPjzzhsqDCLvLMZ4xFk/omgjl36/N
-						1ruDUapMB2T0xUGS2Gev1olYbfL0MjRnhQqasJOvdqswI/U9eU8xYXLnz1dqeOPs
-						Ury21Zop4fVL9KY6sAvFDg6TrdgY7h5f8RJbIkjA3R3E0M+TR/dZiOvIw4CIjKFU
-						qUcIX4F+c0BGvSJU4RaunAG9RyNTGZvm9LBptiVcLGNXMyb0+KxIpwFQdd9juOpp
-						OXHjzkqxwQ87BZ+lCPMH5I4UhqBfNNJDAgMBAAGjYjBgMD8GA1UdEQQ4MDaCC3No
-						aWItc3AtZGV2hidodHRwczovL3NoaWItc3AtZGV2LmNmLmFjLnVrL3NoaWJib2xl
-						dGgwHQYDVR0OBBYEFAiqFmapO7egaR+j3lXoc8yFYs6oMA0GCSqGSIb3DQEBBQUA
-						A4IBAQATLXYR4ia9D/oDtOBHmfxwRHLcrDZqUdYD2NmJc3R7VQoV+SiGeHCxqZ65
-						wF5wWEDWByWjk/LQmOM/vov8UzlLD6GlyVlyo/yLfvNrsDbh83Ohc4TSLKXGar1x
-						2IzA6DP5OwA0FdJ5mZt6F+Mx9f/bo/yQf4yh219Gkuy/2MBtlTDelkSALTuoiaiq
-						9VuAp1o2yJr3ttEa3oyZUQyMi0TbnfVd8rfEkGefvGvjmWdDSRT1ZoojRIfZh+tV
-						w4NpiARsEdi/nWgud1MV7GTScg9YtZcaCahDoVeXVSTao4+NxBKXjlalGieMLlzC
-						ZgojzE1jEQkVmYzQirlmP/kiz1k5
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib-sp-dev.cf.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib-sp-dev.cf.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib-sp-dev.cf.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shib-sp-dev.cf.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib-sp-dev.cf.ac.uk/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib-sp-dev.cf.ac.uk/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib-sp-dev.cf.ac.uk/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shib-sp-dev.cf.ac.uk/Shibboleth.sso/NIM/Artifact"/>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib-sp-dev.cf.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib-sp-dev.cf.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shib-sp-dev.cf.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shib-sp-dev.cf.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shib-sp-dev.cf.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shib-sp-dev.cf.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Cardiff University</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Cardiff University Test SP</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.cardiff.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Rhys</GivenName>
-    <SurName>Smith</SurName>
-    <EmailAddress>mailto:smith@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/shib-sp-dev.cf.ac.uk.xml b/swamid-interfederations-2.0/shib-sp-dev.cf.ac.uk.xml
deleted file mode 100644
index 5164f2a5..00000000
--- a/swamid-interfederations-2.0/shib-sp-dev.cf.ac.uk.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://shib-sp-dev.cf.ac.uk/shibboleth">
-  <!--
-		This is a Shib Test SP owned by Cardiff University.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2008-10-23T14:26:00Z">
-      <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">
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDETCCAfmgAwIBAgIJAPGWoIhDomdwMA0GCSqGSIb3DQEBBQUAMBYxFDASBgNV
-						BAMTC3NoaWItc3AtZGV2MB4XDTEwMTEwNTA0MTY1MVoXDTMwMTAzMTA0MTY1MVow
-						FjEUMBIGA1UEAxMLc2hpYi1zcC1kZXYwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
-						ggEKAoIBAQDPvKQqQDjZxRKqICIU8CfnT+wU1zRJIHgP9fbiebqVEpklkUwXnlQK
-						+Bif5oNaHAKq3etAp/QzP9/HffBCTHrRubdXPjzzhsqDCLvLMZ4xFk/omgjl36/N
-						1ruDUapMB2T0xUGS2Gev1olYbfL0MjRnhQqasJOvdqswI/U9eU8xYXLnz1dqeOPs
-						Ury21Zop4fVL9KY6sAvFDg6TrdgY7h5f8RJbIkjA3R3E0M+TR/dZiOvIw4CIjKFU
-						qUcIX4F+c0BGvSJU4RaunAG9RyNTGZvm9LBptiVcLGNXMyb0+KxIpwFQdd9juOpp
-						OXHjzkqxwQ87BZ+lCPMH5I4UhqBfNNJDAgMBAAGjYjBgMD8GA1UdEQQ4MDaCC3No
-						aWItc3AtZGV2hidodHRwczovL3NoaWItc3AtZGV2LmNmLmFjLnVrL3NoaWJib2xl
-						dGgwHQYDVR0OBBYEFAiqFmapO7egaR+j3lXoc8yFYs6oMA0GCSqGSIb3DQEBBQUA
-						A4IBAQATLXYR4ia9D/oDtOBHmfxwRHLcrDZqUdYD2NmJc3R7VQoV+SiGeHCxqZ65
-						wF5wWEDWByWjk/LQmOM/vov8UzlLD6GlyVlyo/yLfvNrsDbh83Ohc4TSLKXGar1x
-						2IzA6DP5OwA0FdJ5mZt6F+Mx9f/bo/yQf4yh219Gkuy/2MBtlTDelkSALTuoiaiq
-						9VuAp1o2yJr3ttEa3oyZUQyMi0TbnfVd8rfEkGefvGvjmWdDSRT1ZoojRIfZh+tV
-						w4NpiARsEdi/nWgud1MV7GTScg9YtZcaCahDoVeXVSTao4+NxBKXjlalGieMLlzC
-						ZgojzE1jEQkVmYzQirlmP/kiz1k5
-					</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>
-						MIIDETCCAfmgAwIBAgIJAPGWoIhDomdwMA0GCSqGSIb3DQEBBQUAMBYxFDASBgNV
-						BAMTC3NoaWItc3AtZGV2MB4XDTEwMTEwNTA0MTY1MVoXDTMwMTAzMTA0MTY1MVow
-						FjEUMBIGA1UEAxMLc2hpYi1zcC1kZXYwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
-						ggEKAoIBAQDPvKQqQDjZxRKqICIU8CfnT+wU1zRJIHgP9fbiebqVEpklkUwXnlQK
-						+Bif5oNaHAKq3etAp/QzP9/HffBCTHrRubdXPjzzhsqDCLvLMZ4xFk/omgjl36/N
-						1ruDUapMB2T0xUGS2Gev1olYbfL0MjRnhQqasJOvdqswI/U9eU8xYXLnz1dqeOPs
-						Ury21Zop4fVL9KY6sAvFDg6TrdgY7h5f8RJbIkjA3R3E0M+TR/dZiOvIw4CIjKFU
-						qUcIX4F+c0BGvSJU4RaunAG9RyNTGZvm9LBptiVcLGNXMyb0+KxIpwFQdd9juOpp
-						OXHjzkqxwQ87BZ+lCPMH5I4UhqBfNNJDAgMBAAGjYjBgMD8GA1UdEQQ4MDaCC3No
-						aWItc3AtZGV2hidodHRwczovL3NoaWItc3AtZGV2LmNmLmFjLnVrL3NoaWJib2xl
-						dGgwHQYDVR0OBBYEFAiqFmapO7egaR+j3lXoc8yFYs6oMA0GCSqGSIb3DQEBBQUA
-						A4IBAQATLXYR4ia9D/oDtOBHmfxwRHLcrDZqUdYD2NmJc3R7VQoV+SiGeHCxqZ65
-						wF5wWEDWByWjk/LQmOM/vov8UzlLD6GlyVlyo/yLfvNrsDbh83Ohc4TSLKXGar1x
-						2IzA6DP5OwA0FdJ5mZt6F+Mx9f/bo/yQf4yh219Gkuy/2MBtlTDelkSALTuoiaiq
-						9VuAp1o2yJr3ttEa3oyZUQyMi0TbnfVd8rfEkGefvGvjmWdDSRT1ZoojRIfZh+tV
-						w4NpiARsEdi/nWgud1MV7GTScg9YtZcaCahDoVeXVSTao4+NxBKXjlalGieMLlzC
-						ZgojzE1jEQkVmYzQirlmP/kiz1k5
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib-sp-dev.cf.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib-sp-dev.cf.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib-sp-dev.cf.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shib-sp-dev.cf.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib-sp-dev.cf.ac.uk/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib-sp-dev.cf.ac.uk/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib-sp-dev.cf.ac.uk/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shib-sp-dev.cf.ac.uk/Shibboleth.sso/NIM/Artifact"/>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib-sp-dev.cf.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib-sp-dev.cf.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shib-sp-dev.cf.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shib-sp-dev.cf.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shib-sp-dev.cf.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shib-sp-dev.cf.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Cardiff University</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Cardiff University Test SP</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.cardiff.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Rhys</GivenName>
-    <SurName>Smith</SurName>
-    <EmailAddress>mailto:smith@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/shib-sp.mediacore.tv.xml b/swamid-interfederations-2.0/shib-sp.mediacore.tv.xml
deleted file mode 100644
index 700c4b40..00000000
--- a/swamid-interfederations-2.0/shib-sp.mediacore.tv.xml
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shib-sp.mediacore.tv">
-  <!--
-		This is a "MediaCore Video Learning Platform" Shibboleth SP for Mediacore (EMEA) Ltd.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-07-23T09:25:15Z">
-      <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>
-      <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://shib-sp.mediacore.tv/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://shib-sp.mediacore.tv/Shibboleth.sso/Login" index="1"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIFYTCCBEmgAwIBAgIQaRrqhKKBIbJHb1Xg3FKffDANBgkqhkiG9w0BAQsFADCB
-						kDELMAkGA1UEBhMCR0IxGzAZBgNVBAgTEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4G
-						A1UEBxMHU2FsZm9yZDEaMBgGA1UEChMRQ09NT0RPIENBIExpbWl0ZWQxNjA0BgNV
-						BAMTLUNPTU9ETyBSU0EgRG9tYWluIFZhbGlkYXRpb24gU2VjdXJlIFNlcnZlciBD
-						QTAeFw0xNDA0MTYwMDAwMDBaFw0xNTA0MTYyMzU5NTlaMFgxITAfBgNVBAsTGERv
-						bWFpbiBDb250cm9sIFZhbGlkYXRlZDEUMBIGA1UECxMLUG9zaXRpdmVTU0wxHTAb
-						BgNVBAMTFHNoaWItc3AubWVkaWFjb3JlLnR2MIIBIjANBgkqhkiG9w0BAQEFAAOC
-						AQ8AMIIBCgKCAQEAuXfsOw3NXRphz0NrcmK38BwoV1eeEGsv7gMI79ofGWRQHBbx
-						Pddu5yDiz5G6pVdQRjo/ykhWaDhocIKKhhv2e3n/hLBnQFsdvgGFfZB2cb+Z/qvs
-						/iqOxgmefQ+zSynS6x/2YSd9e8IV6gZuPtCuS8ccMPZhpnohBvs92senZRadaqa1
-						IQdj6N3ygXulr7CW/yy2I6fhNAlPkWwb6OmuQgxRkJdm7ueo1d9HmSyOMCbI+7Ry
-						z0ubrtzN9yxvkOGZo88U0vJH5ERQkLkhaVbRkZJsNUcr/H7VpkOAEurBSquPHn2v
-						pP/KfAfRDOtBFB+gFzJpGBpyo5FA3YQO5Rh3lQIDAQABo4IB7DCCAegwHwYDVR0j
-						BBgwFoAUkK9qOpRaC9iQ6hJWc99DtDoo2ucwHQYDVR0OBBYEFOttslYJv2/qFQUt
-						NmYx4u0eBeggMA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQW
-						MBQGCCsGAQUFBwMBBggrBgEFBQcDAjBQBgNVHSAESTBHMDsGDCsGAQQBsjEBAgED
-						BDArMCkGCCsGAQUFBwIBFh1odHRwczovL3NlY3VyZS5jb21vZG8ubmV0L0NQUzAI
-						BgZngQwBAgEwVAYDVR0fBE0wSzBJoEegRYZDaHR0cDovL2NybC5jb21vZG9jYS5j
-						b20vQ09NT0RPUlNBRG9tYWluVmFsaWRhdGlvblNlY3VyZVNlcnZlckNBLmNybDCB
-						hQYIKwYBBQUHAQEEeTB3ME8GCCsGAQUFBzAChkNodHRwOi8vY3J0LmNvbW9kb2Nh
-						LmNvbS9DT01PRE9SU0FEb21haW5WYWxpZGF0aW9uU2VjdXJlU2VydmVyQ0EuY3J0
-						MCQGCCsGAQUFBzABhhhodHRwOi8vb2NzcC5jb21vZG9jYS5jb20wOQYDVR0RBDIw
-						MIIUc2hpYi1zcC5tZWRpYWNvcmUudHaCGHd3dy5zaGliLXNwLm1lZGlhY29yZS50
-						djANBgkqhkiG9w0BAQsFAAOCAQEAW/hU+rvp5DuoqeW163U/YudsHv9RU9Hn2yIF
-						p1FGo1h3MOgalR+dtVkXjyFXLpK+d1Iu/n2Fh0V6y125NQCnR+vl2f94NEsv3OhF
-						58qUbEDR4DymDvqgfmF+e2IZaCgASp4HC5UilyeETbBZvM5kOwEAWI6UOhuGEfHp
-						uWjlO3wYo2i1jCvaHxi9XgVK/PmQyOWWPnCCnmptyp4q9Mhz8Rv1hAEdQYM62R8L
-						/2NDnY4jkkQJOGXz1bqfE0moBc0zFZQ7/QQi3y0/AKJeGCG3q5gR/7cYyyQwappV
-						5matq67waWoBg35C0yaj9gEDi3KaTs1KOLbzqyVUcmP0FtB7rw==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib-sp.mediacore.tv/Shibboleth.sso/Artifact/SOAP" index="0"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib-sp.mediacore.tv/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib-sp.mediacore.tv/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib-sp.mediacore.tv/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shib-sp.mediacore.tv/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib-sp.mediacore.tv/Shibboleth.sso/SAML2/POST" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib-sp.mediacore.tv/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shib-sp.mediacore.tv/Shibboleth.sso/SAML2/Artifact" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shib-sp.mediacore.tv/Shibboleth.sso/SAML2/ECP" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shib-sp.mediacore.tv/Shibboleth.sso/SAML/POST" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shib-sp.mediacore.tv/Shibboleth.sso/SAML/Artifact" index="5"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Mediacore (EMEA) Ltd</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">MediaCore Video Learning Platform</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://mediacore.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Maddy</GivenName>
-    <SurName>Bentley</SurName>
-    <EmailAddress>mailto:support@mediacore.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>James</GivenName>
-    <SurName>Cross</SurName>
-    <EmailAddress>mailto:james@mediacore.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shib.comune.trieste.it-shibboleth.xml b/swamid-interfederations-2.0/shib.comune.trieste.it-shibboleth.xml
deleted file mode 100644
index 5e7b0e58..00000000
--- a/swamid-interfederations-2.0/shib.comune.trieste.it-shibboleth.xml
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" entityID="https://shib.comune.trieste.it/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2013-12-17T09:30:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</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>
-        <mdui:DisplayName xml:lang="en">Wi-Fi Free - Trieste Municipality - TriesteFreeSpoTS</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="it">Wi-Fi Libero - Comune di Trieste - TriesteFreeSpoTS</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Free Wi-Fi connection for people with smartphone, tablet, notebook and other mobile devices that supports Wi-Fi</mdui:Description>
-        <mdui:Description xml:lang="it">Connessione Wi-Fi libera per chi possiede Smartphone, tablet, pc portatili e qualsiasi altro dispositivo mobile dotato di Wi-Fi.</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.retecivica.trieste.it/triestefreespots</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="it">http://www.retecivica.trieste.it/triestefreespots</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">http://www.retecivica.trieste.it/TriesteFreeSpoTS/privacyen.html</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="it">http://www.retecivica.trieste.it/TriesteFreeSpoTS/privacy.html</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDNDCCAhygAwIBAgIJAJPOWX6jxm8nMA0GCSqGSIb3DQEBBQUAMCExHzAdBgNV
-BAMTFnNoaWIuY29tdW5lLnRyaWVzdGUuaXQwHhcNMTMxMTE5MTMyNzM1WhcNNDMx
-MTEyMTMyNzM1WjAhMR8wHQYDVQQDExZzaGliLmNvbXVuZS50cmllc3RlLml0MIIB
-IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA0Y+CScWVXs3Hl2gxmGp5D1Co
-GdHbRD9LShZ7fCeEpcjxJjZ2apGnXXuQc7DpTthfkiYw+10SvgspjpOsT0T2fPGg
-oL6FIS4AUGKkspcGqmlHJjdj2d0bzVcyEpthd4LQmPajX5vNfiTFL01ZlJC4kBbE
-dFVobxxZPaeeMhxBFAwkf0vfmXBgJrUU4+zQoXE2VD/BOsK/tQStqrQH0uIGMR54
-lCkdFmiAaedYkdjsteZvKtxgb8TslE+ULxK0HAl9MmuHPSs/duaHmiM0Huybztj7
-OCgoa2hXKT9G867xB8kdFKwJgfyTZ2f9bIuPwcJEsVd6p5NBZFvd9qG1ILFWpQID
-AQABo28wbTBMBgNVHREERTBDghZzaGliLmNvbXVuZS50cmllc3RlLml0hilodHRw
-czovL3NoaWIuY29tdW5lLnRyaWVzdGUuaXQvc2hpYmJvbGV0aDAdBgNVHQ4EFgQU
-gYEe61royxEPHxue0/dBHfj4x0swDQYJKoZIhvcNAQEFBQADggEBAMvNk6mztqu3
-5fKoBZNYhJTdVcC9C4MqjcgrgNtiCCltJt9KrFyok7M+/DUKbBOLAVuGyr+W+Lmk
-Gk4CXXAv222AlsZxuOW73uF21H1mUBcCbEWfXphKHkzjGlTlbrqXjop8IHeTD9XO
-NEirAqDB1j/4PAgFsTFBl0We5vJ/96mEYHjk4Ouk5/mn+Tpc2FgVgoe5tizQJ9Lv
-fpXa1oNeZP/WXEwNEVMJjfyqL2Nu9P8t4+5+cTZG/UrVT8JqZ7R/CjxWUwiw+hdI
-P0+J1ansVzeWtND1V+yxrY0kokEbQC/1aoHMnQSRxPLNORe9SRKBkOp+Ci0ROW45
-xEb0XXxzdH8=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDNDCCAhygAwIBAgIJAJPOWX6jxm8nMA0GCSqGSIb3DQEBBQUAMCExHzAdBgNV
-BAMTFnNoaWIuY29tdW5lLnRyaWVzdGUuaXQwHhcNMTMxMTE5MTMyNzM1WhcNNDMx
-MTEyMTMyNzM1WjAhMR8wHQYDVQQDExZzaGliLmNvbXVuZS50cmllc3RlLml0MIIB
-IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA0Y+CScWVXs3Hl2gxmGp5D1Co
-GdHbRD9LShZ7fCeEpcjxJjZ2apGnXXuQc7DpTthfkiYw+10SvgspjpOsT0T2fPGg
-oL6FIS4AUGKkspcGqmlHJjdj2d0bzVcyEpthd4LQmPajX5vNfiTFL01ZlJC4kBbE
-dFVobxxZPaeeMhxBFAwkf0vfmXBgJrUU4+zQoXE2VD/BOsK/tQStqrQH0uIGMR54
-lCkdFmiAaedYkdjsteZvKtxgb8TslE+ULxK0HAl9MmuHPSs/duaHmiM0Huybztj7
-OCgoa2hXKT9G867xB8kdFKwJgfyTZ2f9bIuPwcJEsVd6p5NBZFvd9qG1ILFWpQID
-AQABo28wbTBMBgNVHREERTBDghZzaGliLmNvbXVuZS50cmllc3RlLml0hilodHRw
-czovL3NoaWIuY29tdW5lLnRyaWVzdGUuaXQvc2hpYmJvbGV0aDAdBgNVHQ4EFgQU
-gYEe61royxEPHxue0/dBHfj4x0swDQYJKoZIhvcNAQEFBQADggEBAMvNk6mztqu3
-5fKoBZNYhJTdVcC9C4MqjcgrgNtiCCltJt9KrFyok7M+/DUKbBOLAVuGyr+W+Lmk
-Gk4CXXAv222AlsZxuOW73uF21H1mUBcCbEWfXphKHkzjGlTlbrqXjop8IHeTD9XO
-NEirAqDB1j/4PAgFsTFBl0We5vJ/96mEYHjk4Ouk5/mn+Tpc2FgVgoe5tizQJ9Lv
-fpXa1oNeZP/WXEwNEVMJjfyqL2Nu9P8t4+5+cTZG/UrVT8JqZ7R/CjxWUwiw+hdI
-P0+J1ansVzeWtND1V+yxrY0kokEbQC/1aoHMnQSRxPLNORe9SRKBkOp+Ci0ROW45
-xEb0XXxzdH8=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.comune.trieste.it/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.comune.trieste.it/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.comune.trieste.it/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.comune.trieste.it/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shib.comune.trieste.it/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.comune.trieste.it/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.comune.trieste.it/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.comune.trieste.it/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shib.comune.trieste.it/Shibboleth.sso/NIM/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.comune.trieste.it/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib.comune.trieste.it/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shib.comune.trieste.it/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shib.comune.trieste.it/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shib.comune.trieste.it/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shib.comune.trieste.it/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <AttributeConsumingService index="1">
-      <ServiceName xml:lang="en">Wi-Fi Free - Trieste Municipality - TriesteFreeSpoTS</ServiceName>
-      <ServiceName xml:lang="it">Wi-Fi Libero - Trieste Municipality - TriesteFreeSpoTS</ServiceName>
-      <ServiceDescription xml:lang="en">Wi-Fi Free - Trieste Municipality - TriesteFreeSpoTS</ServiceDescription>
-      <ServiceDescription xml:lang="it">Wi-Fi Libero - Trieste Municipality - TriesteFreeSpoTS</ServiceDescription>
-      <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"/>
-    </AttributeConsumingService>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Municipality of Trieste</OrganizationName>
-    <OrganizationName xml:lang="it">Comune di Trieste</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">TriesteFreeSpoTS provided by Municipality of Trieste</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="it">Servizio TriesteFreeSpoTS erogato da Comune di Trieste</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.retecivica.trieste.it/</OrganizationURL>
-    <OrganizationURL xml:lang="it">http://www.retecivica.trieste.it/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <EmailAddress>triestefreespots@comune.trieste.it</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shib.comune.trieste.it.xml b/swamid-interfederations-2.0/shib.comune.trieste.it.xml
deleted file mode 100644
index 5e7b0e58..00000000
--- a/swamid-interfederations-2.0/shib.comune.trieste.it.xml
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" entityID="https://shib.comune.trieste.it/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2013-12-17T09:30:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</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>
-        <mdui:DisplayName xml:lang="en">Wi-Fi Free - Trieste Municipality - TriesteFreeSpoTS</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="it">Wi-Fi Libero - Comune di Trieste - TriesteFreeSpoTS</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Free Wi-Fi connection for people with smartphone, tablet, notebook and other mobile devices that supports Wi-Fi</mdui:Description>
-        <mdui:Description xml:lang="it">Connessione Wi-Fi libera per chi possiede Smartphone, tablet, pc portatili e qualsiasi altro dispositivo mobile dotato di Wi-Fi.</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.retecivica.trieste.it/triestefreespots</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="it">http://www.retecivica.trieste.it/triestefreespots</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">http://www.retecivica.trieste.it/TriesteFreeSpoTS/privacyen.html</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="it">http://www.retecivica.trieste.it/TriesteFreeSpoTS/privacy.html</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDNDCCAhygAwIBAgIJAJPOWX6jxm8nMA0GCSqGSIb3DQEBBQUAMCExHzAdBgNV
-BAMTFnNoaWIuY29tdW5lLnRyaWVzdGUuaXQwHhcNMTMxMTE5MTMyNzM1WhcNNDMx
-MTEyMTMyNzM1WjAhMR8wHQYDVQQDExZzaGliLmNvbXVuZS50cmllc3RlLml0MIIB
-IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA0Y+CScWVXs3Hl2gxmGp5D1Co
-GdHbRD9LShZ7fCeEpcjxJjZ2apGnXXuQc7DpTthfkiYw+10SvgspjpOsT0T2fPGg
-oL6FIS4AUGKkspcGqmlHJjdj2d0bzVcyEpthd4LQmPajX5vNfiTFL01ZlJC4kBbE
-dFVobxxZPaeeMhxBFAwkf0vfmXBgJrUU4+zQoXE2VD/BOsK/tQStqrQH0uIGMR54
-lCkdFmiAaedYkdjsteZvKtxgb8TslE+ULxK0HAl9MmuHPSs/duaHmiM0Huybztj7
-OCgoa2hXKT9G867xB8kdFKwJgfyTZ2f9bIuPwcJEsVd6p5NBZFvd9qG1ILFWpQID
-AQABo28wbTBMBgNVHREERTBDghZzaGliLmNvbXVuZS50cmllc3RlLml0hilodHRw
-czovL3NoaWIuY29tdW5lLnRyaWVzdGUuaXQvc2hpYmJvbGV0aDAdBgNVHQ4EFgQU
-gYEe61royxEPHxue0/dBHfj4x0swDQYJKoZIhvcNAQEFBQADggEBAMvNk6mztqu3
-5fKoBZNYhJTdVcC9C4MqjcgrgNtiCCltJt9KrFyok7M+/DUKbBOLAVuGyr+W+Lmk
-Gk4CXXAv222AlsZxuOW73uF21H1mUBcCbEWfXphKHkzjGlTlbrqXjop8IHeTD9XO
-NEirAqDB1j/4PAgFsTFBl0We5vJ/96mEYHjk4Ouk5/mn+Tpc2FgVgoe5tizQJ9Lv
-fpXa1oNeZP/WXEwNEVMJjfyqL2Nu9P8t4+5+cTZG/UrVT8JqZ7R/CjxWUwiw+hdI
-P0+J1ansVzeWtND1V+yxrY0kokEbQC/1aoHMnQSRxPLNORe9SRKBkOp+Ci0ROW45
-xEb0XXxzdH8=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDNDCCAhygAwIBAgIJAJPOWX6jxm8nMA0GCSqGSIb3DQEBBQUAMCExHzAdBgNV
-BAMTFnNoaWIuY29tdW5lLnRyaWVzdGUuaXQwHhcNMTMxMTE5MTMyNzM1WhcNNDMx
-MTEyMTMyNzM1WjAhMR8wHQYDVQQDExZzaGliLmNvbXVuZS50cmllc3RlLml0MIIB
-IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA0Y+CScWVXs3Hl2gxmGp5D1Co
-GdHbRD9LShZ7fCeEpcjxJjZ2apGnXXuQc7DpTthfkiYw+10SvgspjpOsT0T2fPGg
-oL6FIS4AUGKkspcGqmlHJjdj2d0bzVcyEpthd4LQmPajX5vNfiTFL01ZlJC4kBbE
-dFVobxxZPaeeMhxBFAwkf0vfmXBgJrUU4+zQoXE2VD/BOsK/tQStqrQH0uIGMR54
-lCkdFmiAaedYkdjsteZvKtxgb8TslE+ULxK0HAl9MmuHPSs/duaHmiM0Huybztj7
-OCgoa2hXKT9G867xB8kdFKwJgfyTZ2f9bIuPwcJEsVd6p5NBZFvd9qG1ILFWpQID
-AQABo28wbTBMBgNVHREERTBDghZzaGliLmNvbXVuZS50cmllc3RlLml0hilodHRw
-czovL3NoaWIuY29tdW5lLnRyaWVzdGUuaXQvc2hpYmJvbGV0aDAdBgNVHQ4EFgQU
-gYEe61royxEPHxue0/dBHfj4x0swDQYJKoZIhvcNAQEFBQADggEBAMvNk6mztqu3
-5fKoBZNYhJTdVcC9C4MqjcgrgNtiCCltJt9KrFyok7M+/DUKbBOLAVuGyr+W+Lmk
-Gk4CXXAv222AlsZxuOW73uF21H1mUBcCbEWfXphKHkzjGlTlbrqXjop8IHeTD9XO
-NEirAqDB1j/4PAgFsTFBl0We5vJ/96mEYHjk4Ouk5/mn+Tpc2FgVgoe5tizQJ9Lv
-fpXa1oNeZP/WXEwNEVMJjfyqL2Nu9P8t4+5+cTZG/UrVT8JqZ7R/CjxWUwiw+hdI
-P0+J1ansVzeWtND1V+yxrY0kokEbQC/1aoHMnQSRxPLNORe9SRKBkOp+Ci0ROW45
-xEb0XXxzdH8=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.comune.trieste.it/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.comune.trieste.it/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.comune.trieste.it/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.comune.trieste.it/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shib.comune.trieste.it/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.comune.trieste.it/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.comune.trieste.it/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.comune.trieste.it/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shib.comune.trieste.it/Shibboleth.sso/NIM/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.comune.trieste.it/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib.comune.trieste.it/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shib.comune.trieste.it/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shib.comune.trieste.it/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shib.comune.trieste.it/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shib.comune.trieste.it/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <AttributeConsumingService index="1">
-      <ServiceName xml:lang="en">Wi-Fi Free - Trieste Municipality - TriesteFreeSpoTS</ServiceName>
-      <ServiceName xml:lang="it">Wi-Fi Libero - Trieste Municipality - TriesteFreeSpoTS</ServiceName>
-      <ServiceDescription xml:lang="en">Wi-Fi Free - Trieste Municipality - TriesteFreeSpoTS</ServiceDescription>
-      <ServiceDescription xml:lang="it">Wi-Fi Libero - Trieste Municipality - TriesteFreeSpoTS</ServiceDescription>
-      <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"/>
-    </AttributeConsumingService>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Municipality of Trieste</OrganizationName>
-    <OrganizationName xml:lang="it">Comune di Trieste</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">TriesteFreeSpoTS provided by Municipality of Trieste</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="it">Servizio TriesteFreeSpoTS erogato da Comune di Trieste</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.retecivica.trieste.it/</OrganizationURL>
-    <OrganizationURL xml:lang="it">http://www.retecivica.trieste.it/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <EmailAddress>triestefreespots@comune.trieste.it</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shib.ifgoiano.edu.br-idp-shibboleth.xml b/swamid-interfederations-2.0/shib.ifgoiano.edu.br-idp-shibboleth.xml
deleted file mode 100644
index d71d04d4..00000000
--- a/swamid-interfederations-2.0/shib.ifgoiano.edu.br-idp-shibboleth.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://shib.ifgoiano.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">edu.br</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">IFGOIANO - Instituto Federal Goiano</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="pt-br">IFGOIANO - Instituto Federal Goiano</mdui:DisplayName>
-        <mdui:Description xml:lang="en">IFGOIANO - Instituto Federal Goiano</mdui:Description>
-        <mdui:Description xml:lang="pt-br">IFGOIANO - Instituto Federal Goiano</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.ifgoiano.edu.br</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="pt-br">http://www.ifgoiano.edu.br</mdui:InformationURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-    MIIEOjCCAyICAQAwDQYJKoZIhvcNAQEFBQAwgeIxLDAqBgNVBAoTI0lGR09JQU5P
-IC0gSW5zdGl0dXRvIEZlZGVyYWwgR29pYW5vMT0wOwYDVQQLFDRER1RJIC0gRGly
-ZXRvcmlhIEdlcmFsIGRlIFRlY25vbG9naWEgZGEgSW5mb3JtYcOnw6NvMSMwIQYJ
-KoZIhvcNAQkBFhRkZ3RpQGlmZ29pYW5vLmVkdS5icjERMA8GA1UEBxQIR29pw6Ju
-aWExDzANBgNVBAgUBkdvacOhczELMAkGA1UEBhMCQlIxHTAbBgNVBAMTFHNoaWIu
-aWZnb2lhbm8uZWR1LmJyMB4XDTE0MDQxMDIxMDc1MFoXDTE5MDQwOTIxMDc1MFow
-geIxLDAqBgNVBAoTI0lGR09JQU5PIC0gSW5zdGl0dXRvIEZlZGVyYWwgR29pYW5v
-MT0wOwYDVQQLFDRER1RJIC0gRGlyZXRvcmlhIEdlcmFsIGRlIFRlY25vbG9naWEg
-ZGEgSW5mb3JtYcOnw6NvMSMwIQYJKoZIhvcNAQkBFhRkZ3RpQGlmZ29pYW5vLmVk
-dS5icjERMA8GA1UEBxQIR29pw6JuaWExDzANBgNVBAgUBkdvacOhczELMAkGA1UE
-BhMCQlIxHTAbBgNVBAMTFHNoaWIuaWZnb2lhbm8uZWR1LmJyMIIBIjANBgkqhkiG
-9w0BAQEFAAOCAQ8AMIIBCgKCAQEAq2egNizK29vvUL0C4Iju9kh6RJ4OE3QjcNHY
-Zh+JmAi+yb81E5CF8/dhBQRZ8Nqqp7DfpqipfD9P8pWUo1FsKeAmgfYGUr0gwYXY
-fQX7E5fOjSLeZegi5J6PYs7UveFRle4WIlD55CP5ERIVZ0QWFEnSXFAX3+xp1Zb7
-L0CASlxgi2UunN5jjpJWSW27A2rUwo3QPoJKPvBLh0tSTB5VAAuO/ksHULLDvDGl
-DdWrDRADXxQCnFKRrAYYfklnnGjegu8MNx1bMTxXHdeuZZEmWzes+FZ/aoZY2/vu
-NGsmNvHhoUTiT+BJRDskEICJ7gLTW9iWEg+tCpX2wuEqqHqkQwIDAQABMA0GCSqG
-SIb3DQEBBQUAA4IBAQAdb1hHAUd7k8uxZn48i38WEK/EteeVDFnK5rNsSpmXBNQn
-VE2McbYxHWpObBmavcG54nlrjgbKz/O8AHoD+uygRmEm70iyXO8La1SqmEaIppWF
-+Aydp01u0EC9VE50ZFYphNpdtKv695D3wvwsQGQ/kV+5xKyHQ8thXD97bVIj9oMR
-m8XXI7eDPZ2s/B0UoEZbvIAy68id7h/EtRyWbYyD8P5TNQ5JUs2I57orOEHfSbTz
-0+MpDn1u65HRka+3/3thgXdHyoyS+kkP9TjNdcnRxhsHpwwB0gvCfFXHS899/zsI
-t4gFfnXOhqI5mhEXE9m9l5n5bX6+LGLBxvNF1Qbt
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.ifgoiano.edu.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.ifgoiano.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://shib.ifgoiano.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.ifgoiano.edu.br/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib.ifgoiano.edu.br/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.ifgoiano.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>
-      
-MIIEOjCCAyICAQAwDQYJKoZIhvcNAQEFBQAwgeIxLDAqBgNVBAoTI0lGR09JQU5P
-IC0gSW5zdGl0dXRvIEZlZGVyYWwgR29pYW5vMT0wOwYDVQQLFDRER1RJIC0gRGly
-ZXRvcmlhIEdlcmFsIGRlIFRlY25vbG9naWEgZGEgSW5mb3JtYcOnw6NvMSMwIQYJ
-KoZIhvcNAQkBFhRkZ3RpQGlmZ29pYW5vLmVkdS5icjERMA8GA1UEBxQIR29pw6Ju
-aWExDzANBgNVBAgUBkdvacOhczELMAkGA1UEBhMCQlIxHTAbBgNVBAMTFHNoaWIu
-aWZnb2lhbm8uZWR1LmJyMB4XDTE0MDQxMDIxMDc1MFoXDTE5MDQwOTIxMDc1MFow
-geIxLDAqBgNVBAoTI0lGR09JQU5PIC0gSW5zdGl0dXRvIEZlZGVyYWwgR29pYW5v
-MT0wOwYDVQQLFDRER1RJIC0gRGlyZXRvcmlhIEdlcmFsIGRlIFRlY25vbG9naWEg
-ZGEgSW5mb3JtYcOnw6NvMSMwIQYJKoZIhvcNAQkBFhRkZ3RpQGlmZ29pYW5vLmVk
-dS5icjERMA8GA1UEBxQIR29pw6JuaWExDzANBgNVBAgUBkdvacOhczELMAkGA1UE
-BhMCQlIxHTAbBgNVBAMTFHNoaWIuaWZnb2lhbm8uZWR1LmJyMIIBIjANBgkqhkiG
-9w0BAQEFAAOCAQ8AMIIBCgKCAQEAq2egNizK29vvUL0C4Iju9kh6RJ4OE3QjcNHY
-Zh+JmAi+yb81E5CF8/dhBQRZ8Nqqp7DfpqipfD9P8pWUo1FsKeAmgfYGUr0gwYXY
-fQX7E5fOjSLeZegi5J6PYs7UveFRle4WIlD55CP5ERIVZ0QWFEnSXFAX3+xp1Zb7
-L0CASlxgi2UunN5jjpJWSW27A2rUwo3QPoJKPvBLh0tSTB5VAAuO/ksHULLDvDGl
-DdWrDRADXxQCnFKRrAYYfklnnGjegu8MNx1bMTxXHdeuZZEmWzes+FZ/aoZY2/vu
-NGsmNvHhoUTiT+BJRDskEICJ7gLTW9iWEg+tCpX2wuEqqHqkQwIDAQABMA0GCSqG
-SIb3DQEBBQUAA4IBAQAdb1hHAUd7k8uxZn48i38WEK/EteeVDFnK5rNsSpmXBNQn
-VE2McbYxHWpObBmavcG54nlrjgbKz/O8AHoD+uygRmEm70iyXO8La1SqmEaIppWF
-+Aydp01u0EC9VE50ZFYphNpdtKv695D3wvwsQGQ/kV+5xKyHQ8thXD97bVIj9oMR
-m8XXI7eDPZ2s/B0UoEZbvIAy68id7h/EtRyWbYyD8P5TNQ5JUs2I57orOEHfSbTz
-0+MpDn1u65HRka+3/3thgXdHyoyS+kkP9TjNdcnRxhsHpwwB0gvCfFXHS899/zsI
-t4gFfnXOhqI5mhEXE9m9l5n5bX6+LGLBxvNF1Qbt
-                    
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.ifgoiano.edu.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.ifgoiano.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">IFGOIANO - Instituto Federal Goiano</OrganizationName>
-    <OrganizationName xml:lang="pt-br">IFGOIANO - Instituto Federal Goiano</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">IFGOIANO - Instituto Federal Goiano</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="pt-br">IFGOIANO - Instituto Federal Goiano</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.ifgoiano.edu.br</OrganizationURL>
-    <OrganizationURL xml:lang="pt-br">http://www.ifgoiano.edu.br</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Frederico Pereira da Cunha</SurName>
-    <EmailAddress>frederico.pereira@ifgoiano.edu.br</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shib.ifgoiano.edu.br.xml b/swamid-interfederations-2.0/shib.ifgoiano.edu.br.xml
deleted file mode 100644
index d71d04d4..00000000
--- a/swamid-interfederations-2.0/shib.ifgoiano.edu.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://shib.ifgoiano.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">edu.br</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">IFGOIANO - Instituto Federal Goiano</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="pt-br">IFGOIANO - Instituto Federal Goiano</mdui:DisplayName>
-        <mdui:Description xml:lang="en">IFGOIANO - Instituto Federal Goiano</mdui:Description>
-        <mdui:Description xml:lang="pt-br">IFGOIANO - Instituto Federal Goiano</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.ifgoiano.edu.br</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="pt-br">http://www.ifgoiano.edu.br</mdui:InformationURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-    MIIEOjCCAyICAQAwDQYJKoZIhvcNAQEFBQAwgeIxLDAqBgNVBAoTI0lGR09JQU5P
-IC0gSW5zdGl0dXRvIEZlZGVyYWwgR29pYW5vMT0wOwYDVQQLFDRER1RJIC0gRGly
-ZXRvcmlhIEdlcmFsIGRlIFRlY25vbG9naWEgZGEgSW5mb3JtYcOnw6NvMSMwIQYJ
-KoZIhvcNAQkBFhRkZ3RpQGlmZ29pYW5vLmVkdS5icjERMA8GA1UEBxQIR29pw6Ju
-aWExDzANBgNVBAgUBkdvacOhczELMAkGA1UEBhMCQlIxHTAbBgNVBAMTFHNoaWIu
-aWZnb2lhbm8uZWR1LmJyMB4XDTE0MDQxMDIxMDc1MFoXDTE5MDQwOTIxMDc1MFow
-geIxLDAqBgNVBAoTI0lGR09JQU5PIC0gSW5zdGl0dXRvIEZlZGVyYWwgR29pYW5v
-MT0wOwYDVQQLFDRER1RJIC0gRGlyZXRvcmlhIEdlcmFsIGRlIFRlY25vbG9naWEg
-ZGEgSW5mb3JtYcOnw6NvMSMwIQYJKoZIhvcNAQkBFhRkZ3RpQGlmZ29pYW5vLmVk
-dS5icjERMA8GA1UEBxQIR29pw6JuaWExDzANBgNVBAgUBkdvacOhczELMAkGA1UE
-BhMCQlIxHTAbBgNVBAMTFHNoaWIuaWZnb2lhbm8uZWR1LmJyMIIBIjANBgkqhkiG
-9w0BAQEFAAOCAQ8AMIIBCgKCAQEAq2egNizK29vvUL0C4Iju9kh6RJ4OE3QjcNHY
-Zh+JmAi+yb81E5CF8/dhBQRZ8Nqqp7DfpqipfD9P8pWUo1FsKeAmgfYGUr0gwYXY
-fQX7E5fOjSLeZegi5J6PYs7UveFRle4WIlD55CP5ERIVZ0QWFEnSXFAX3+xp1Zb7
-L0CASlxgi2UunN5jjpJWSW27A2rUwo3QPoJKPvBLh0tSTB5VAAuO/ksHULLDvDGl
-DdWrDRADXxQCnFKRrAYYfklnnGjegu8MNx1bMTxXHdeuZZEmWzes+FZ/aoZY2/vu
-NGsmNvHhoUTiT+BJRDskEICJ7gLTW9iWEg+tCpX2wuEqqHqkQwIDAQABMA0GCSqG
-SIb3DQEBBQUAA4IBAQAdb1hHAUd7k8uxZn48i38WEK/EteeVDFnK5rNsSpmXBNQn
-VE2McbYxHWpObBmavcG54nlrjgbKz/O8AHoD+uygRmEm70iyXO8La1SqmEaIppWF
-+Aydp01u0EC9VE50ZFYphNpdtKv695D3wvwsQGQ/kV+5xKyHQ8thXD97bVIj9oMR
-m8XXI7eDPZ2s/B0UoEZbvIAy68id7h/EtRyWbYyD8P5TNQ5JUs2I57orOEHfSbTz
-0+MpDn1u65HRka+3/3thgXdHyoyS+kkP9TjNdcnRxhsHpwwB0gvCfFXHS899/zsI
-t4gFfnXOhqI5mhEXE9m9l5n5bX6+LGLBxvNF1Qbt
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.ifgoiano.edu.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.ifgoiano.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://shib.ifgoiano.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.ifgoiano.edu.br/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib.ifgoiano.edu.br/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.ifgoiano.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>
-      
-MIIEOjCCAyICAQAwDQYJKoZIhvcNAQEFBQAwgeIxLDAqBgNVBAoTI0lGR09JQU5P
-IC0gSW5zdGl0dXRvIEZlZGVyYWwgR29pYW5vMT0wOwYDVQQLFDRER1RJIC0gRGly
-ZXRvcmlhIEdlcmFsIGRlIFRlY25vbG9naWEgZGEgSW5mb3JtYcOnw6NvMSMwIQYJ
-KoZIhvcNAQkBFhRkZ3RpQGlmZ29pYW5vLmVkdS5icjERMA8GA1UEBxQIR29pw6Ju
-aWExDzANBgNVBAgUBkdvacOhczELMAkGA1UEBhMCQlIxHTAbBgNVBAMTFHNoaWIu
-aWZnb2lhbm8uZWR1LmJyMB4XDTE0MDQxMDIxMDc1MFoXDTE5MDQwOTIxMDc1MFow
-geIxLDAqBgNVBAoTI0lGR09JQU5PIC0gSW5zdGl0dXRvIEZlZGVyYWwgR29pYW5v
-MT0wOwYDVQQLFDRER1RJIC0gRGlyZXRvcmlhIEdlcmFsIGRlIFRlY25vbG9naWEg
-ZGEgSW5mb3JtYcOnw6NvMSMwIQYJKoZIhvcNAQkBFhRkZ3RpQGlmZ29pYW5vLmVk
-dS5icjERMA8GA1UEBxQIR29pw6JuaWExDzANBgNVBAgUBkdvacOhczELMAkGA1UE
-BhMCQlIxHTAbBgNVBAMTFHNoaWIuaWZnb2lhbm8uZWR1LmJyMIIBIjANBgkqhkiG
-9w0BAQEFAAOCAQ8AMIIBCgKCAQEAq2egNizK29vvUL0C4Iju9kh6RJ4OE3QjcNHY
-Zh+JmAi+yb81E5CF8/dhBQRZ8Nqqp7DfpqipfD9P8pWUo1FsKeAmgfYGUr0gwYXY
-fQX7E5fOjSLeZegi5J6PYs7UveFRle4WIlD55CP5ERIVZ0QWFEnSXFAX3+xp1Zb7
-L0CASlxgi2UunN5jjpJWSW27A2rUwo3QPoJKPvBLh0tSTB5VAAuO/ksHULLDvDGl
-DdWrDRADXxQCnFKRrAYYfklnnGjegu8MNx1bMTxXHdeuZZEmWzes+FZ/aoZY2/vu
-NGsmNvHhoUTiT+BJRDskEICJ7gLTW9iWEg+tCpX2wuEqqHqkQwIDAQABMA0GCSqG
-SIb3DQEBBQUAA4IBAQAdb1hHAUd7k8uxZn48i38WEK/EteeVDFnK5rNsSpmXBNQn
-VE2McbYxHWpObBmavcG54nlrjgbKz/O8AHoD+uygRmEm70iyXO8La1SqmEaIppWF
-+Aydp01u0EC9VE50ZFYphNpdtKv695D3wvwsQGQ/kV+5xKyHQ8thXD97bVIj9oMR
-m8XXI7eDPZ2s/B0UoEZbvIAy68id7h/EtRyWbYyD8P5TNQ5JUs2I57orOEHfSbTz
-0+MpDn1u65HRka+3/3thgXdHyoyS+kkP9TjNdcnRxhsHpwwB0gvCfFXHS899/zsI
-t4gFfnXOhqI5mhEXE9m9l5n5bX6+LGLBxvNF1Qbt
-                    
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.ifgoiano.edu.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.ifgoiano.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">IFGOIANO - Instituto Federal Goiano</OrganizationName>
-    <OrganizationName xml:lang="pt-br">IFGOIANO - Instituto Federal Goiano</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">IFGOIANO - Instituto Federal Goiano</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="pt-br">IFGOIANO - Instituto Federal Goiano</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.ifgoiano.edu.br</OrganizationURL>
-    <OrganizationURL xml:lang="pt-br">http://www.ifgoiano.edu.br</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Frederico Pereira da Cunha</SurName>
-    <EmailAddress>frederico.pereira@ifgoiano.edu.br</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shib.manchester.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/shib.manchester.ac.uk-shibboleth.xml
deleted file mode 100644
index d9b4bb4d..00000000
--- a/swamid-interfederations-2.0/shib.manchester.ac.uk-shibboleth.xml
+++ /dev/null
@@ -1,137 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shib.manchester.ac.uk/shibboleth">
-  <!--
-		This is a Shibboleth IdP for The University of Manchester.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2007-12-04T15:35:56.421696Z">
-      <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">manchester.ac.uk</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">University of Manchester</mdui:DisplayName>
-        <mdui:Logo height="16" width="16">https://login.manchester.ac.uk/disco/logo-16x16-m.png</mdui:Logo>
-        <mdui:Logo height="34" width="80">https://login.manchester.ac.uk/disco/logo-80x34-ltd.png</mdui:Logo>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:IPHint>130.88.0.0/16</mdui:IPHint>
-        <mdui:DomainHint>manchester.ac.uk</mdui:DomainHint>
-        <mdui:DomainHint>man.ac.uk</mdui:DomainHint>
-        <mdui:DomainHint>mbs.ac.uk</mdui:DomainHint>
-        <mdui:DomainHint>mimas.ac.uk</mdui:DomainHint>
-        <mdui:DomainHint>mib.ac.uk</mdui:DomainHint>
-        <mdui:DomainHint>mbs-worldwide.ac.uk</mdui:DomainHint>
-        <mdui:GeolocationHint>geo:53.465624,-2.233193</mdui:GeolocationHint>
-        <mdui:GeolocationHint>geo:53.474881,-2.233593</mdui:GeolocationHint>
-        <mdui:GeolocationHint>geo:53.236237,-2.306421</mdui:GeolocationHint>
-        <mdui:GeolocationHint>geo:53.480372,-2.24893</mdui:GeolocationHint>
-        <mdui:GeolocationHint>geo:51.572576,-1.315923</mdui:GeolocationHint>
-        <mdui:GeolocationHint>geo:53.462436,-2.227711</mdui:GeolocationHint>
-        <mdui:GeolocationHint>geo:53.429749,-2.230049</mdui:GeolocationHint>
-        <mdui:GeolocationHint>geo:53.445089,-2.278115</mdui:GeolocationHint>
-        <mdui:GeolocationHint>geo:53.490592,-2.28839</mdui:GeolocationHint>
-        <mdui:GeolocationHint>geo:53.487545,-2.323424</mdui:GeolocationHint>
-        <mdui:GeolocationHint>geo:53.427332,-2.247825</mdui:GeolocationHint>
-        <mdui:GeolocationHint>geo:46.23145,6.050119</mdui:GeolocationHint>
-      </mdui:DiscoHints>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIEdzCCA1+gAwIBAgIQaXCywgq+vX5DO7vX+v+c6TANBgkqhkiG9w0BAQUFADA2
-						MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-						U1NMIENBMB4XDTEzMDUzMDAwMDAwMFoXDTE2MDUyOTIzNTk1OVowQzEhMB8GA1UE
-						CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMR4wHAYDVQQDExVzaGliLm1hbmNo
-						ZXN0ZXIuYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQD7mNMx
-						lCtJ3uEbR9KNxl4wxdpRof4DyoKCu/FfByvIDfr9zB5H2P8mGQfOD0o49xiEkFCd
-						lozVa8f8a3yNjY3pHgibEIMXSJ1QalP+CrINr/a32O8WYV9ZA2w3rkSggtWxxmVD
-						HHQ9ufTl2lmvkGg1Z0+3VCic5mEEDHDKXKm4CWo5CGnT8/FzTD2sJfGdSsfi1WDK
-						k6Gff+hv9VZCjWzSJgXtuLgYP5Ze9ZcDgcKuqlwlpOzOO6NEMI8dzfHMp+yTL+4B
-						JaahF0zPuOsfJFdi6/r5GsmVLtJXiQuPstRPVTwb9mQuhOmDC4zYcPfjA49yjqnC
-						reJTACJv6Z42rmtRAgMBAAGjggFyMIIBbjAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJ
-						ays3V0fqkOO57TAdBgNVHQ4EFgQUNwr+LyyfLnzNIYq172tNWGDX2tIwDgYDVR0P
-						AQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsG
-						AQUFBwMCMCIGA1UdIAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQIBMDoGA1Ud
-						HwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NM
-						Q0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50
-						Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6
-						Ly9vY3NwLnRjcy50ZXJlbmEub3JnMCAGA1UdEQQZMBeCFXNoaWIubWFuY2hlc3Rl
-						ci5hYy51azANBgkqhkiG9w0BAQUFAAOCAQEAcL1bk4E3a2N2C+va00jBDRb4BF69
-						PfSqKZkXeeUHOpGUU0l30p8iS2uR7F+t3CYHulqN3jqPbtpNHUbtUdBpbIY/KTGW
-						nm2fF8hW84RwmGhR2w7B+f3He5gleC7t7Tj91L+z7ue8YvbYxiLjIZfiEmon0iUT
-						7d2BkbiIL7TVA3W63EIHnQHT4xNLzv1pvWCXU275R2k54qFyoYdmhC9sljPQWZ1v
-						G7+O+Vm74LsAsHXnCQ0qkxarXF8aCLkHqhhLLUm4EgzRTeYbh9E6WFaQlDbQvRp8
-						VwcrfdTH7WKGAJFWbvlQd/HKb8NJOkQOh+bJoHAn71W3DUoZU+DZYjiuIA==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.manchester.ac.uk:8443/shibboleth-idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.manchester.ac.uk:8443/shibboleth-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.manchester.ac.uk/shibboleth-idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.manchester.ac.uk/shibboleth-idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib.manchester.ac.uk/shibboleth-idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.manchester.ac.uk/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>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">manchester.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIEdzCCA1+gAwIBAgIQaXCywgq+vX5DO7vX+v+c6TANBgkqhkiG9w0BAQUFADA2
-						MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-						U1NMIENBMB4XDTEzMDUzMDAwMDAwMFoXDTE2MDUyOTIzNTk1OVowQzEhMB8GA1UE
-						CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMR4wHAYDVQQDExVzaGliLm1hbmNo
-						ZXN0ZXIuYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQD7mNMx
-						lCtJ3uEbR9KNxl4wxdpRof4DyoKCu/FfByvIDfr9zB5H2P8mGQfOD0o49xiEkFCd
-						lozVa8f8a3yNjY3pHgibEIMXSJ1QalP+CrINr/a32O8WYV9ZA2w3rkSggtWxxmVD
-						HHQ9ufTl2lmvkGg1Z0+3VCic5mEEDHDKXKm4CWo5CGnT8/FzTD2sJfGdSsfi1WDK
-						k6Gff+hv9VZCjWzSJgXtuLgYP5Ze9ZcDgcKuqlwlpOzOO6NEMI8dzfHMp+yTL+4B
-						JaahF0zPuOsfJFdi6/r5GsmVLtJXiQuPstRPVTwb9mQuhOmDC4zYcPfjA49yjqnC
-						reJTACJv6Z42rmtRAgMBAAGjggFyMIIBbjAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJ
-						ays3V0fqkOO57TAdBgNVHQ4EFgQUNwr+LyyfLnzNIYq172tNWGDX2tIwDgYDVR0P
-						AQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsG
-						AQUFBwMCMCIGA1UdIAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQIBMDoGA1Ud
-						HwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NM
-						Q0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50
-						Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6
-						Ly9vY3NwLnRjcy50ZXJlbmEub3JnMCAGA1UdEQQZMBeCFXNoaWIubWFuY2hlc3Rl
-						ci5hYy51azANBgkqhkiG9w0BAQUFAAOCAQEAcL1bk4E3a2N2C+va00jBDRb4BF69
-						PfSqKZkXeeUHOpGUU0l30p8iS2uR7F+t3CYHulqN3jqPbtpNHUbtUdBpbIY/KTGW
-						nm2fF8hW84RwmGhR2w7B+f3He5gleC7t7Tj91L+z7ue8YvbYxiLjIZfiEmon0iUT
-						7d2BkbiIL7TVA3W63EIHnQHT4xNLzv1pvWCXU275R2k54qFyoYdmhC9sljPQWZ1v
-						G7+O+Vm74LsAsHXnCQ0qkxarXF8aCLkHqhhLLUm4EgzRTeYbh9E6WFaQlDbQvRp8
-						VwcrfdTH7WKGAJFWbvlQd/HKb8NJOkQOh+bJoHAn71W3DUoZU+DZYjiuIA==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.manchester.ac.uk:8443/shibboleth-idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.manchester.ac.uk: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="en">The University of Manchester</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Manchester</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.manchester.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>IT Service Desk</GivenName>
-    <EmailAddress>mailto:IT-Servicedesk@manchester.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Sam</GivenName>
-    <SurName>Jones</SurName>
-    <EmailAddress>mailto:sam.jones@manchester.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shib.manchester.ac.uk.xml b/swamid-interfederations-2.0/shib.manchester.ac.uk.xml
deleted file mode 100644
index d9b4bb4d..00000000
--- a/swamid-interfederations-2.0/shib.manchester.ac.uk.xml
+++ /dev/null
@@ -1,137 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shib.manchester.ac.uk/shibboleth">
-  <!--
-		This is a Shibboleth IdP for The University of Manchester.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2007-12-04T15:35:56.421696Z">
-      <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">manchester.ac.uk</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">University of Manchester</mdui:DisplayName>
-        <mdui:Logo height="16" width="16">https://login.manchester.ac.uk/disco/logo-16x16-m.png</mdui:Logo>
-        <mdui:Logo height="34" width="80">https://login.manchester.ac.uk/disco/logo-80x34-ltd.png</mdui:Logo>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:IPHint>130.88.0.0/16</mdui:IPHint>
-        <mdui:DomainHint>manchester.ac.uk</mdui:DomainHint>
-        <mdui:DomainHint>man.ac.uk</mdui:DomainHint>
-        <mdui:DomainHint>mbs.ac.uk</mdui:DomainHint>
-        <mdui:DomainHint>mimas.ac.uk</mdui:DomainHint>
-        <mdui:DomainHint>mib.ac.uk</mdui:DomainHint>
-        <mdui:DomainHint>mbs-worldwide.ac.uk</mdui:DomainHint>
-        <mdui:GeolocationHint>geo:53.465624,-2.233193</mdui:GeolocationHint>
-        <mdui:GeolocationHint>geo:53.474881,-2.233593</mdui:GeolocationHint>
-        <mdui:GeolocationHint>geo:53.236237,-2.306421</mdui:GeolocationHint>
-        <mdui:GeolocationHint>geo:53.480372,-2.24893</mdui:GeolocationHint>
-        <mdui:GeolocationHint>geo:51.572576,-1.315923</mdui:GeolocationHint>
-        <mdui:GeolocationHint>geo:53.462436,-2.227711</mdui:GeolocationHint>
-        <mdui:GeolocationHint>geo:53.429749,-2.230049</mdui:GeolocationHint>
-        <mdui:GeolocationHint>geo:53.445089,-2.278115</mdui:GeolocationHint>
-        <mdui:GeolocationHint>geo:53.490592,-2.28839</mdui:GeolocationHint>
-        <mdui:GeolocationHint>geo:53.487545,-2.323424</mdui:GeolocationHint>
-        <mdui:GeolocationHint>geo:53.427332,-2.247825</mdui:GeolocationHint>
-        <mdui:GeolocationHint>geo:46.23145,6.050119</mdui:GeolocationHint>
-      </mdui:DiscoHints>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIEdzCCA1+gAwIBAgIQaXCywgq+vX5DO7vX+v+c6TANBgkqhkiG9w0BAQUFADA2
-						MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-						U1NMIENBMB4XDTEzMDUzMDAwMDAwMFoXDTE2MDUyOTIzNTk1OVowQzEhMB8GA1UE
-						CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMR4wHAYDVQQDExVzaGliLm1hbmNo
-						ZXN0ZXIuYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQD7mNMx
-						lCtJ3uEbR9KNxl4wxdpRof4DyoKCu/FfByvIDfr9zB5H2P8mGQfOD0o49xiEkFCd
-						lozVa8f8a3yNjY3pHgibEIMXSJ1QalP+CrINr/a32O8WYV9ZA2w3rkSggtWxxmVD
-						HHQ9ufTl2lmvkGg1Z0+3VCic5mEEDHDKXKm4CWo5CGnT8/FzTD2sJfGdSsfi1WDK
-						k6Gff+hv9VZCjWzSJgXtuLgYP5Ze9ZcDgcKuqlwlpOzOO6NEMI8dzfHMp+yTL+4B
-						JaahF0zPuOsfJFdi6/r5GsmVLtJXiQuPstRPVTwb9mQuhOmDC4zYcPfjA49yjqnC
-						reJTACJv6Z42rmtRAgMBAAGjggFyMIIBbjAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJ
-						ays3V0fqkOO57TAdBgNVHQ4EFgQUNwr+LyyfLnzNIYq172tNWGDX2tIwDgYDVR0P
-						AQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsG
-						AQUFBwMCMCIGA1UdIAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQIBMDoGA1Ud
-						HwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NM
-						Q0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50
-						Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6
-						Ly9vY3NwLnRjcy50ZXJlbmEub3JnMCAGA1UdEQQZMBeCFXNoaWIubWFuY2hlc3Rl
-						ci5hYy51azANBgkqhkiG9w0BAQUFAAOCAQEAcL1bk4E3a2N2C+va00jBDRb4BF69
-						PfSqKZkXeeUHOpGUU0l30p8iS2uR7F+t3CYHulqN3jqPbtpNHUbtUdBpbIY/KTGW
-						nm2fF8hW84RwmGhR2w7B+f3He5gleC7t7Tj91L+z7ue8YvbYxiLjIZfiEmon0iUT
-						7d2BkbiIL7TVA3W63EIHnQHT4xNLzv1pvWCXU275R2k54qFyoYdmhC9sljPQWZ1v
-						G7+O+Vm74LsAsHXnCQ0qkxarXF8aCLkHqhhLLUm4EgzRTeYbh9E6WFaQlDbQvRp8
-						VwcrfdTH7WKGAJFWbvlQd/HKb8NJOkQOh+bJoHAn71W3DUoZU+DZYjiuIA==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.manchester.ac.uk:8443/shibboleth-idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.manchester.ac.uk:8443/shibboleth-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.manchester.ac.uk/shibboleth-idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.manchester.ac.uk/shibboleth-idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib.manchester.ac.uk/shibboleth-idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.manchester.ac.uk/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>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">manchester.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIEdzCCA1+gAwIBAgIQaXCywgq+vX5DO7vX+v+c6TANBgkqhkiG9w0BAQUFADA2
-						MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-						U1NMIENBMB4XDTEzMDUzMDAwMDAwMFoXDTE2MDUyOTIzNTk1OVowQzEhMB8GA1UE
-						CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMR4wHAYDVQQDExVzaGliLm1hbmNo
-						ZXN0ZXIuYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQD7mNMx
-						lCtJ3uEbR9KNxl4wxdpRof4DyoKCu/FfByvIDfr9zB5H2P8mGQfOD0o49xiEkFCd
-						lozVa8f8a3yNjY3pHgibEIMXSJ1QalP+CrINr/a32O8WYV9ZA2w3rkSggtWxxmVD
-						HHQ9ufTl2lmvkGg1Z0+3VCic5mEEDHDKXKm4CWo5CGnT8/FzTD2sJfGdSsfi1WDK
-						k6Gff+hv9VZCjWzSJgXtuLgYP5Ze9ZcDgcKuqlwlpOzOO6NEMI8dzfHMp+yTL+4B
-						JaahF0zPuOsfJFdi6/r5GsmVLtJXiQuPstRPVTwb9mQuhOmDC4zYcPfjA49yjqnC
-						reJTACJv6Z42rmtRAgMBAAGjggFyMIIBbjAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJ
-						ays3V0fqkOO57TAdBgNVHQ4EFgQUNwr+LyyfLnzNIYq172tNWGDX2tIwDgYDVR0P
-						AQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsG
-						AQUFBwMCMCIGA1UdIAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQIBMDoGA1Ud
-						HwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NM
-						Q0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50
-						Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6
-						Ly9vY3NwLnRjcy50ZXJlbmEub3JnMCAGA1UdEQQZMBeCFXNoaWIubWFuY2hlc3Rl
-						ci5hYy51azANBgkqhkiG9w0BAQUFAAOCAQEAcL1bk4E3a2N2C+va00jBDRb4BF69
-						PfSqKZkXeeUHOpGUU0l30p8iS2uR7F+t3CYHulqN3jqPbtpNHUbtUdBpbIY/KTGW
-						nm2fF8hW84RwmGhR2w7B+f3He5gleC7t7Tj91L+z7ue8YvbYxiLjIZfiEmon0iUT
-						7d2BkbiIL7TVA3W63EIHnQHT4xNLzv1pvWCXU275R2k54qFyoYdmhC9sljPQWZ1v
-						G7+O+Vm74LsAsHXnCQ0qkxarXF8aCLkHqhhLLUm4EgzRTeYbh9E6WFaQlDbQvRp8
-						VwcrfdTH7WKGAJFWbvlQd/HKb8NJOkQOh+bJoHAn71W3DUoZU+DZYjiuIA==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.manchester.ac.uk:8443/shibboleth-idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.manchester.ac.uk: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="en">The University of Manchester</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Manchester</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.manchester.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>IT Service Desk</GivenName>
-    <EmailAddress>mailto:IT-Servicedesk@manchester.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Sam</GivenName>
-    <SurName>Jones</SurName>
-    <EmailAddress>mailto:sam.jones@manchester.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shib.mines-albi.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/shib.mines-albi.fr-idp-shibboleth.xml
deleted file mode 100644
index aa801c33..00000000
--- a/swamid-interfederations-2.0/shib.mines-albi.fr-idp-shibboleth.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shib.mines-albi.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2013-02-12T16:14:41Z">
-      <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">mines-albi.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">Ecole des mines d'Albi-Carmaux</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIEhTCCA22gAwIBAgIRAN3Cm0bi/IrWVLoH6UvZnZswDQYJKoZIhvcNAQEFBQAw
-NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-IFNTTCBDQTAeFw0xMjAzMDkwMDAwMDBaFw0xNTAzMDkyMzU5NTlaMEsxCzAJBgNV
-BAYTAkZSMR8wHQYDVQQKExZFY29sZSBkZXMgTWluZXMgZCdBbGJpMRswGQYDVQQD
-ExJzaGliLm1pbmVzLWFsYmkuZnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
-AoIBAQDUOd76Oa7coiZ9OjUqzxr7K7lYnXveyB7XBimwTkgf3PAskNIFlnJBLZIm
-5v69dhSDeYnylSTYXqzLVQWNKILaY6PXv/Picnc9ASo4zuQU77NRzq4uRIlLOPRS
-DL6lEK2kmyGWWt0N8lN5170uGMfhSIR8uOPXj0u4VBpG7q2C59WoWuZ00osJmyy3
-J7CqWgQzAjjhPo3YU49C6Nz+MJtSqr3y+d/1dezFd/5VMjAGb1ILty3IM/zT/Uss
-UV2pVryL2fD6DSqSPdu5Su4FaP8WKf+FvuF+ebi2VR2MkL9yzsVASLkV4dZHVe9r
-V/aIljhYeJ8teUrQVU3moWcObPGzAgMBAAGjggF3MIIBczAfBgNVHSMEGDAWgBQM
-vZNoDPPeq6NJays3V0fqkOO57TAdBgNVHQ4EFgQUU5J4vjW82XXaQ0Rp1RSPlDg3
-S68wDgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYB
-BQUHAwEGCCsGAQUFBwMCMBgGA1UdIAQRMA8wDQYLKwYBBAGyMQECAh0wOgYDVR0f
-BDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xD
-QS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRj
-cy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDov
-L29jc3AudGNzLnRlcmVuYS5vcmcwLwYDVR0RBCgwJoISc2hpYi5taW5lcy1hbGJp
-LmZyghBzaGliLmVuc3RpbWFjLmZyMA0GCSqGSIb3DQEBBQUAA4IBAQARmzrwfSrH
-BWQCbGimPIZXHyB+v5pM9CuS40vY8v3nYBnAbllO3rcjo9kYmUsj8mgq/pKEfSVr
-ToAQJZnmyItBb17p/NBHI1i3JCIm5GQJ+QohNuwJM6IxM+3938SgH/C2BZ4uQAHP
-frx0UqQxaw5NQeMS8iHu9ftLizGCboYkjHbGsy99EiXwzU/ugoiKqvlTmhckXyEs
-pUfS7z6/BcdP/jMhpy6UCLw7G+FkHSt+6dhmNlUDA7UoLzs3WaRhAxQNhaoseHUz
-K4liinblIRdEy3SqTOQ75m2//mZoG0KE2hvPVWyT7AXYzXLhSixWDBJZGUbDzpK2
-bVrRJYqhRlh7
-					    </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://shib.mines-albi.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.mines-albi.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib.mines-albi.fr/idp/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Ecole des mines d'Albi-Carmaux</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Ecole des mines d'Albi-Carmaux</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>ORTEU Catherine</SurName>
-    <EmailAddress>catherine.orteu@mines-albi.fr</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <SurName>OTTON Emmanuel</SurName>
-    <EmailAddress>emmanuel.otton@mines-albi.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shib.mines-albi.fr.xml b/swamid-interfederations-2.0/shib.mines-albi.fr.xml
deleted file mode 100644
index aa801c33..00000000
--- a/swamid-interfederations-2.0/shib.mines-albi.fr.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shib.mines-albi.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2013-02-12T16:14:41Z">
-      <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">mines-albi.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">Ecole des mines d'Albi-Carmaux</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIEhTCCA22gAwIBAgIRAN3Cm0bi/IrWVLoH6UvZnZswDQYJKoZIhvcNAQEFBQAw
-NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-IFNTTCBDQTAeFw0xMjAzMDkwMDAwMDBaFw0xNTAzMDkyMzU5NTlaMEsxCzAJBgNV
-BAYTAkZSMR8wHQYDVQQKExZFY29sZSBkZXMgTWluZXMgZCdBbGJpMRswGQYDVQQD
-ExJzaGliLm1pbmVzLWFsYmkuZnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
-AoIBAQDUOd76Oa7coiZ9OjUqzxr7K7lYnXveyB7XBimwTkgf3PAskNIFlnJBLZIm
-5v69dhSDeYnylSTYXqzLVQWNKILaY6PXv/Picnc9ASo4zuQU77NRzq4uRIlLOPRS
-DL6lEK2kmyGWWt0N8lN5170uGMfhSIR8uOPXj0u4VBpG7q2C59WoWuZ00osJmyy3
-J7CqWgQzAjjhPo3YU49C6Nz+MJtSqr3y+d/1dezFd/5VMjAGb1ILty3IM/zT/Uss
-UV2pVryL2fD6DSqSPdu5Su4FaP8WKf+FvuF+ebi2VR2MkL9yzsVASLkV4dZHVe9r
-V/aIljhYeJ8teUrQVU3moWcObPGzAgMBAAGjggF3MIIBczAfBgNVHSMEGDAWgBQM
-vZNoDPPeq6NJays3V0fqkOO57TAdBgNVHQ4EFgQUU5J4vjW82XXaQ0Rp1RSPlDg3
-S68wDgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYB
-BQUHAwEGCCsGAQUFBwMCMBgGA1UdIAQRMA8wDQYLKwYBBAGyMQECAh0wOgYDVR0f
-BDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xD
-QS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRj
-cy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDov
-L29jc3AudGNzLnRlcmVuYS5vcmcwLwYDVR0RBCgwJoISc2hpYi5taW5lcy1hbGJp
-LmZyghBzaGliLmVuc3RpbWFjLmZyMA0GCSqGSIb3DQEBBQUAA4IBAQARmzrwfSrH
-BWQCbGimPIZXHyB+v5pM9CuS40vY8v3nYBnAbllO3rcjo9kYmUsj8mgq/pKEfSVr
-ToAQJZnmyItBb17p/NBHI1i3JCIm5GQJ+QohNuwJM6IxM+3938SgH/C2BZ4uQAHP
-frx0UqQxaw5NQeMS8iHu9ftLizGCboYkjHbGsy99EiXwzU/ugoiKqvlTmhckXyEs
-pUfS7z6/BcdP/jMhpy6UCLw7G+FkHSt+6dhmNlUDA7UoLzs3WaRhAxQNhaoseHUz
-K4liinblIRdEy3SqTOQ75m2//mZoG0KE2hvPVWyT7AXYzXLhSixWDBJZGUbDzpK2
-bVrRJYqhRlh7
-					    </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://shib.mines-albi.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.mines-albi.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib.mines-albi.fr/idp/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Ecole des mines d'Albi-Carmaux</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Ecole des mines d'Albi-Carmaux</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>ORTEU Catherine</SurName>
-    <EmailAddress>catherine.orteu@mines-albi.fr</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <SurName>OTTON Emmanuel</SurName>
-    <EmailAddress>emmanuel.otton@mines-albi.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shib.u-paris10.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/shib.u-paris10.fr-idp-shibboleth.xml
deleted file mode 100644
index 7b3acd44..00000000
--- a/swamid-interfederations-2.0/shib.u-paris10.fr-idp-shibboleth.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://shib.u-paris10.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2014-04-30T10:12:46Z">
-      <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">u-paris10.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">Université Paris Ouest Nanterre La Défense</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIEbzCCA1egAwIBAgIQZbrrSlxkQhTabmBhnkMIcjANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTE0MDQyOTAwMDAwMFoXDTE3MDQyODIzNTk1OVowPzEhMB8GA1UE
-CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRowGAYDVQQDExFzaGliLnUtcGFy
-aXMxMC5mcjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAOXQot32/G4U
-65ArzPTHDzV0pukloeif+NPsD1UJ2jRxzVXdalcqbxIo50XubnqASgfJI8quCcQI
-UivML6Pid61W+G1xaFDFH3oqv4rUz+3cvl+e3rk/7EOxv6mCIhsagERX6/7tPG6Q
-nhy5yUAmnPXVG+N5c8+VD0tDnL3GY7kUFIl6EK0kYObmdpX8jJZeQ4LmPBGxIAWX
-zonq0y2/2MDAMiiX4qVmTJphw0LpxILXBcP8ODsSu9EIA01iC0hqr0ZJaGnmm9jF
-e5GR856RaR5IYoWDhJ2B5rA0gnAp1ORkDwxW22SISQeWLE6XFV3Zee+7aQBP6qWo
-GYqJMGQgo4ECAwEAAaOCAW4wggFqMB8GA1UdIwQYMBaAFAy9k2gM896ro0lrKzdX
-R+qQ47ntMB0GA1UdDgQWBBQUr2hjbMrOoM0u5PrMn5ks6PmoKzAOBgNVHQ8BAf8E
-BAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUH
-AwIwIgYDVR0gBBswGTANBgsrBgEEAbIxAQICHTAIBgZngQwBAgEwOgYDVR0fBDMw
-MTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5j
-cmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRjcy50
-ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDovL29j
-c3AudGNzLnRlcmVuYS5vcmcwHAYDVR0RBBUwE4IRc2hpYi51LXBhcmlzMTAuZnIw
-DQYJKoZIhvcNAQEFBQADggEBAHvXqPlH0S0iV2DZuBMgkVjm0FojB9jefcIojoP+
-W5v120m9tvbtWJmE+xOKQi2y+Zct/SWFDKcV+otWus9O0IyfoZcXHwPmPntlhNkD
-NmIWXzwJnDXnnoc0TG2edyNMmtuQMNIjeDSsnCDbspTfymBdnIYKuuuPLy2hSH+V
-wC8FqLmFxsFhnsy4AYicdZyv2zf5e3zIFbaIqJOunr+K1ovMan9M+B+pme5Da7n9
-HmJ60tKDP/4kWNMI1ciPuZ+tFjQFDjbCZTGEL9fcx2+FpHFBc3rLBFqnU4wTr8g+
-tX8DeAKftA5fK5bves4MG9LRLqWMkHmYHZ40TOv95xpE40k=
-					    </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://shib.u-paris10.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.u-paris10.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib.u-paris10.fr/idp/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Université Paris Ouest Nanterre La Défense</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Université Paris Ouest Nanterre La Défense</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Driss Bouzekhrout</SurName>
-    <EmailAddress>driss@u-paris10.fr</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <SurName>Gaël Merlin</SurName>
-    <EmailAddress>gmerlin@u-paris10.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shib.u-paris10.fr.xml b/swamid-interfederations-2.0/shib.u-paris10.fr.xml
deleted file mode 100644
index 7b3acd44..00000000
--- a/swamid-interfederations-2.0/shib.u-paris10.fr.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://shib.u-paris10.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2014-04-30T10:12:46Z">
-      <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">u-paris10.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">Université Paris Ouest Nanterre La Défense</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIEbzCCA1egAwIBAgIQZbrrSlxkQhTabmBhnkMIcjANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTE0MDQyOTAwMDAwMFoXDTE3MDQyODIzNTk1OVowPzEhMB8GA1UE
-CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRowGAYDVQQDExFzaGliLnUtcGFy
-aXMxMC5mcjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAOXQot32/G4U
-65ArzPTHDzV0pukloeif+NPsD1UJ2jRxzVXdalcqbxIo50XubnqASgfJI8quCcQI
-UivML6Pid61W+G1xaFDFH3oqv4rUz+3cvl+e3rk/7EOxv6mCIhsagERX6/7tPG6Q
-nhy5yUAmnPXVG+N5c8+VD0tDnL3GY7kUFIl6EK0kYObmdpX8jJZeQ4LmPBGxIAWX
-zonq0y2/2MDAMiiX4qVmTJphw0LpxILXBcP8ODsSu9EIA01iC0hqr0ZJaGnmm9jF
-e5GR856RaR5IYoWDhJ2B5rA0gnAp1ORkDwxW22SISQeWLE6XFV3Zee+7aQBP6qWo
-GYqJMGQgo4ECAwEAAaOCAW4wggFqMB8GA1UdIwQYMBaAFAy9k2gM896ro0lrKzdX
-R+qQ47ntMB0GA1UdDgQWBBQUr2hjbMrOoM0u5PrMn5ks6PmoKzAOBgNVHQ8BAf8E
-BAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUH
-AwIwIgYDVR0gBBswGTANBgsrBgEEAbIxAQICHTAIBgZngQwBAgEwOgYDVR0fBDMw
-MTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5j
-cmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRjcy50
-ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDovL29j
-c3AudGNzLnRlcmVuYS5vcmcwHAYDVR0RBBUwE4IRc2hpYi51LXBhcmlzMTAuZnIw
-DQYJKoZIhvcNAQEFBQADggEBAHvXqPlH0S0iV2DZuBMgkVjm0FojB9jefcIojoP+
-W5v120m9tvbtWJmE+xOKQi2y+Zct/SWFDKcV+otWus9O0IyfoZcXHwPmPntlhNkD
-NmIWXzwJnDXnnoc0TG2edyNMmtuQMNIjeDSsnCDbspTfymBdnIYKuuuPLy2hSH+V
-wC8FqLmFxsFhnsy4AYicdZyv2zf5e3zIFbaIqJOunr+K1ovMan9M+B+pme5Da7n9
-HmJ60tKDP/4kWNMI1ciPuZ+tFjQFDjbCZTGEL9fcx2+FpHFBc3rLBFqnU4wTr8g+
-tX8DeAKftA5fK5bves4MG9LRLqWMkHmYHZ40TOv95xpE40k=
-					    </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://shib.u-paris10.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.u-paris10.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib.u-paris10.fr/idp/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Université Paris Ouest Nanterre La Défense</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Université Paris Ouest Nanterre La Défense</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Driss Bouzekhrout</SurName>
-    <EmailAddress>driss@u-paris10.fr</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <SurName>Gaël Merlin</SurName>
-    <EmailAddress>gmerlin@u-paris10.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shib.ufg.br-idp-shibboleth.xml b/swamid-interfederations-2.0/shib.ufg.br-idp-shibboleth.xml
deleted file mode 100644
index 43b565af..00000000
--- a/swamid-interfederations-2.0/shib.ufg.br-idp-shibboleth.xml
+++ /dev/null
@@ -1,114 +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://shib.ufg.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">ufg.br</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">UFG - Universidade Federal de Goias</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="pt-br">UFG - Universidade Federal de Goias</mdui:DisplayName>
-        <mdui:Description xml:lang="en">UFG - Universidade Federal de Goias</mdui:Description>
-        <mdui:Description xml:lang="pt-br">UFG - Universidade Federal de Goias</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.ufg.br/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="pt-br">http://www.ufg.br/</mdui:InformationURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-    MIIEEjCCAvoCAQAwDQYJKoZIhvcNAQEFBQAwgc4xLDAqBgNVBAoTI1VGRyAtIFVu
-aXZlcnNpZGFkZSBGZWRlcmFsIGRlIEdvaWFzMTQwMgYDVQQLEytDRVJDT01QIC0g
-Q2VudHJvIGRlIFJlY3Vyc29zIENvbXB1dGFjaW9uYWlzMSMwIQYJKoZIhvcNAQkB
-FhRyZWRlcy5jZXJjb21wQHVmZy5icjEQMA4GA1UEBxMHR29pYW5pYTEOMAwGA1UE
-CBMFR29pYXMxCzAJBgNVBAYTAkJSMRQwEgYDVQQDEwtzaGliLnVmZy5icjAeFw0x
-NDA3MjIxNTU1NTRaFw0xOTA3MjExNTU1NTRaMIHOMSwwKgYDVQQKEyNVRkcgLSBV
-bml2ZXJzaWRhZGUgRmVkZXJhbCBkZSBHb2lhczE0MDIGA1UECxMrQ0VSQ09NUCAt
-IENlbnRybyBkZSBSZWN1cnNvcyBDb21wdXRhY2lvbmFpczEjMCEGCSqGSIb3DQEJ
-ARYUcmVkZXMuY2VyY29tcEB1ZmcuYnIxEDAOBgNVBAcTB0dvaWFuaWExDjAMBgNV
-BAgTBUdvaWFzMQswCQYDVQQGEwJCUjEUMBIGA1UEAxMLc2hpYi51ZmcuYnIwggEi
-MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDjd7v1zv9XiZujENayVRf+lRcF
-HvUq3KtLFWnys3UhsAlQPiXl3rCdCV3qgC3mLFKoQtCIvxW0ubaX7E+7U1FGdLZH
-ZBgkCXdvJ32wMtF/DEhiD/AwT6JMjSWLcE9eGK35NBaB6kC91Pn9oID8OjggQmFA
-ot2NQ7KRlSNJg3nY3RQYCFZghgsLec9+0h/YHaRuKgDKcFnreAQ9UQ4M4Q1jPKit
-Fkn/IJa2okSwXIu6gwV/2Y2I92ar3LgbNfpXCPW/gGqflkPEA+4AXwRb7ZbOdqsD
-g/PLMzi3jS4VHIOVUHx4fg7PZF+CEJpNG65i5pQB2d9VI2he2e3gUtnYxZeBAgMB
-AAEwDQYJKoZIhvcNAQEFBQADggEBAIGSDjTFfq0AONjf4OEJxiG1pZ5um0QwIzUD
-hC+CCdoxsZcUc47cT+VxHi5vrJ1TBJF8mwk1zTp0CKfNxPt+etJMhNwnXhjR7qF/
-A7JtQE9MuoHiWpjIWiwck00x6pAqJCkEcYRrz5UorN6YjBd/3SEkKU0qv1haRVPV
-EqoljRD7IOrbW5m12y+UCojor5ttyl5aYIk3DYXLlqiddtxHwyAyP4VKxOS5373c
-CmAJ4XbSf9+t9lVDXZtJ7GST/AoVT4775ELCkfN/EjEXzqg8uxWgl89feJQyz1u6
-4mvZ4bNMmCEq59Krwicex9EzFraCH4W99LvdMvKBp88MseBihz8=
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.ufg.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.ufg.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://shib.ufg.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.ufg.br/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib.ufg.br/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.ufg.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">ufg.br</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-      
-MIIEEjCCAvoCAQAwDQYJKoZIhvcNAQEFBQAwgc4xLDAqBgNVBAoTI1VGRyAtIFVu
-aXZlcnNpZGFkZSBGZWRlcmFsIGRlIEdvaWFzMTQwMgYDVQQLEytDRVJDT01QIC0g
-Q2VudHJvIGRlIFJlY3Vyc29zIENvbXB1dGFjaW9uYWlzMSMwIQYJKoZIhvcNAQkB
-FhRyZWRlcy5jZXJjb21wQHVmZy5icjEQMA4GA1UEBxMHR29pYW5pYTEOMAwGA1UE
-CBMFR29pYXMxCzAJBgNVBAYTAkJSMRQwEgYDVQQDEwtzaGliLnVmZy5icjAeFw0x
-NDA3MjIxNTU1NTRaFw0xOTA3MjExNTU1NTRaMIHOMSwwKgYDVQQKEyNVRkcgLSBV
-bml2ZXJzaWRhZGUgRmVkZXJhbCBkZSBHb2lhczE0MDIGA1UECxMrQ0VSQ09NUCAt
-IENlbnRybyBkZSBSZWN1cnNvcyBDb21wdXRhY2lvbmFpczEjMCEGCSqGSIb3DQEJ
-ARYUcmVkZXMuY2VyY29tcEB1ZmcuYnIxEDAOBgNVBAcTB0dvaWFuaWExDjAMBgNV
-BAgTBUdvaWFzMQswCQYDVQQGEwJCUjEUMBIGA1UEAxMLc2hpYi51ZmcuYnIwggEi
-MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDjd7v1zv9XiZujENayVRf+lRcF
-HvUq3KtLFWnys3UhsAlQPiXl3rCdCV3qgC3mLFKoQtCIvxW0ubaX7E+7U1FGdLZH
-ZBgkCXdvJ32wMtF/DEhiD/AwT6JMjSWLcE9eGK35NBaB6kC91Pn9oID8OjggQmFA
-ot2NQ7KRlSNJg3nY3RQYCFZghgsLec9+0h/YHaRuKgDKcFnreAQ9UQ4M4Q1jPKit
-Fkn/IJa2okSwXIu6gwV/2Y2I92ar3LgbNfpXCPW/gGqflkPEA+4AXwRb7ZbOdqsD
-g/PLMzi3jS4VHIOVUHx4fg7PZF+CEJpNG65i5pQB2d9VI2he2e3gUtnYxZeBAgMB
-AAEwDQYJKoZIhvcNAQEFBQADggEBAIGSDjTFfq0AONjf4OEJxiG1pZ5um0QwIzUD
-hC+CCdoxsZcUc47cT+VxHi5vrJ1TBJF8mwk1zTp0CKfNxPt+etJMhNwnXhjR7qF/
-A7JtQE9MuoHiWpjIWiwck00x6pAqJCkEcYRrz5UorN6YjBd/3SEkKU0qv1haRVPV
-EqoljRD7IOrbW5m12y+UCojor5ttyl5aYIk3DYXLlqiddtxHwyAyP4VKxOS5373c
-CmAJ4XbSf9+t9lVDXZtJ7GST/AoVT4775ELCkfN/EjEXzqg8uxWgl89feJQyz1u6
-4mvZ4bNMmCEq59Krwicex9EzFraCH4W99LvdMvKBp88MseBihz8=
-                    
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.ufg.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.ufg.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">UFG - Universidade Federal de Goias</OrganizationName>
-    <OrganizationName xml:lang="pt-br">UFG - Universidade Federal de Goias</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">UFG - Universidade Federal de Goias</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="pt-br">UFG - Universidade Federal de Goias</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.ufg.br/</OrganizationURL>
-    <OrganizationURL xml:lang="pt-br">http://www.ufg.br/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Douglas Borges de Oliveira Filho</SurName>
-    <EmailAddress>douglasfilho@cercomp.ufg.br</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shib.ufg.br.xml b/swamid-interfederations-2.0/shib.ufg.br.xml
deleted file mode 100644
index 43b565af..00000000
--- a/swamid-interfederations-2.0/shib.ufg.br.xml
+++ /dev/null
@@ -1,114 +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://shib.ufg.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">ufg.br</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">UFG - Universidade Federal de Goias</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="pt-br">UFG - Universidade Federal de Goias</mdui:DisplayName>
-        <mdui:Description xml:lang="en">UFG - Universidade Federal de Goias</mdui:Description>
-        <mdui:Description xml:lang="pt-br">UFG - Universidade Federal de Goias</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.ufg.br/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="pt-br">http://www.ufg.br/</mdui:InformationURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-    MIIEEjCCAvoCAQAwDQYJKoZIhvcNAQEFBQAwgc4xLDAqBgNVBAoTI1VGRyAtIFVu
-aXZlcnNpZGFkZSBGZWRlcmFsIGRlIEdvaWFzMTQwMgYDVQQLEytDRVJDT01QIC0g
-Q2VudHJvIGRlIFJlY3Vyc29zIENvbXB1dGFjaW9uYWlzMSMwIQYJKoZIhvcNAQkB
-FhRyZWRlcy5jZXJjb21wQHVmZy5icjEQMA4GA1UEBxMHR29pYW5pYTEOMAwGA1UE
-CBMFR29pYXMxCzAJBgNVBAYTAkJSMRQwEgYDVQQDEwtzaGliLnVmZy5icjAeFw0x
-NDA3MjIxNTU1NTRaFw0xOTA3MjExNTU1NTRaMIHOMSwwKgYDVQQKEyNVRkcgLSBV
-bml2ZXJzaWRhZGUgRmVkZXJhbCBkZSBHb2lhczE0MDIGA1UECxMrQ0VSQ09NUCAt
-IENlbnRybyBkZSBSZWN1cnNvcyBDb21wdXRhY2lvbmFpczEjMCEGCSqGSIb3DQEJ
-ARYUcmVkZXMuY2VyY29tcEB1ZmcuYnIxEDAOBgNVBAcTB0dvaWFuaWExDjAMBgNV
-BAgTBUdvaWFzMQswCQYDVQQGEwJCUjEUMBIGA1UEAxMLc2hpYi51ZmcuYnIwggEi
-MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDjd7v1zv9XiZujENayVRf+lRcF
-HvUq3KtLFWnys3UhsAlQPiXl3rCdCV3qgC3mLFKoQtCIvxW0ubaX7E+7U1FGdLZH
-ZBgkCXdvJ32wMtF/DEhiD/AwT6JMjSWLcE9eGK35NBaB6kC91Pn9oID8OjggQmFA
-ot2NQ7KRlSNJg3nY3RQYCFZghgsLec9+0h/YHaRuKgDKcFnreAQ9UQ4M4Q1jPKit
-Fkn/IJa2okSwXIu6gwV/2Y2I92ar3LgbNfpXCPW/gGqflkPEA+4AXwRb7ZbOdqsD
-g/PLMzi3jS4VHIOVUHx4fg7PZF+CEJpNG65i5pQB2d9VI2he2e3gUtnYxZeBAgMB
-AAEwDQYJKoZIhvcNAQEFBQADggEBAIGSDjTFfq0AONjf4OEJxiG1pZ5um0QwIzUD
-hC+CCdoxsZcUc47cT+VxHi5vrJ1TBJF8mwk1zTp0CKfNxPt+etJMhNwnXhjR7qF/
-A7JtQE9MuoHiWpjIWiwck00x6pAqJCkEcYRrz5UorN6YjBd/3SEkKU0qv1haRVPV
-EqoljRD7IOrbW5m12y+UCojor5ttyl5aYIk3DYXLlqiddtxHwyAyP4VKxOS5373c
-CmAJ4XbSf9+t9lVDXZtJ7GST/AoVT4775ELCkfN/EjEXzqg8uxWgl89feJQyz1u6
-4mvZ4bNMmCEq59Krwicex9EzFraCH4W99LvdMvKBp88MseBihz8=
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.ufg.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.ufg.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://shib.ufg.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.ufg.br/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib.ufg.br/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.ufg.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">ufg.br</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-      
-MIIEEjCCAvoCAQAwDQYJKoZIhvcNAQEFBQAwgc4xLDAqBgNVBAoTI1VGRyAtIFVu
-aXZlcnNpZGFkZSBGZWRlcmFsIGRlIEdvaWFzMTQwMgYDVQQLEytDRVJDT01QIC0g
-Q2VudHJvIGRlIFJlY3Vyc29zIENvbXB1dGFjaW9uYWlzMSMwIQYJKoZIhvcNAQkB
-FhRyZWRlcy5jZXJjb21wQHVmZy5icjEQMA4GA1UEBxMHR29pYW5pYTEOMAwGA1UE
-CBMFR29pYXMxCzAJBgNVBAYTAkJSMRQwEgYDVQQDEwtzaGliLnVmZy5icjAeFw0x
-NDA3MjIxNTU1NTRaFw0xOTA3MjExNTU1NTRaMIHOMSwwKgYDVQQKEyNVRkcgLSBV
-bml2ZXJzaWRhZGUgRmVkZXJhbCBkZSBHb2lhczE0MDIGA1UECxMrQ0VSQ09NUCAt
-IENlbnRybyBkZSBSZWN1cnNvcyBDb21wdXRhY2lvbmFpczEjMCEGCSqGSIb3DQEJ
-ARYUcmVkZXMuY2VyY29tcEB1ZmcuYnIxEDAOBgNVBAcTB0dvaWFuaWExDjAMBgNV
-BAgTBUdvaWFzMQswCQYDVQQGEwJCUjEUMBIGA1UEAxMLc2hpYi51ZmcuYnIwggEi
-MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDjd7v1zv9XiZujENayVRf+lRcF
-HvUq3KtLFWnys3UhsAlQPiXl3rCdCV3qgC3mLFKoQtCIvxW0ubaX7E+7U1FGdLZH
-ZBgkCXdvJ32wMtF/DEhiD/AwT6JMjSWLcE9eGK35NBaB6kC91Pn9oID8OjggQmFA
-ot2NQ7KRlSNJg3nY3RQYCFZghgsLec9+0h/YHaRuKgDKcFnreAQ9UQ4M4Q1jPKit
-Fkn/IJa2okSwXIu6gwV/2Y2I92ar3LgbNfpXCPW/gGqflkPEA+4AXwRb7ZbOdqsD
-g/PLMzi3jS4VHIOVUHx4fg7PZF+CEJpNG65i5pQB2d9VI2he2e3gUtnYxZeBAgMB
-AAEwDQYJKoZIhvcNAQEFBQADggEBAIGSDjTFfq0AONjf4OEJxiG1pZ5um0QwIzUD
-hC+CCdoxsZcUc47cT+VxHi5vrJ1TBJF8mwk1zTp0CKfNxPt+etJMhNwnXhjR7qF/
-A7JtQE9MuoHiWpjIWiwck00x6pAqJCkEcYRrz5UorN6YjBd/3SEkKU0qv1haRVPV
-EqoljRD7IOrbW5m12y+UCojor5ttyl5aYIk3DYXLlqiddtxHwyAyP4VKxOS5373c
-CmAJ4XbSf9+t9lVDXZtJ7GST/AoVT4775ELCkfN/EjEXzqg8uxWgl89feJQyz1u6
-4mvZ4bNMmCEq59Krwicex9EzFraCH4W99LvdMvKBp88MseBihz8=
-                    
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.ufg.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.ufg.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">UFG - Universidade Federal de Goias</OrganizationName>
-    <OrganizationName xml:lang="pt-br">UFG - Universidade Federal de Goias</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">UFG - Universidade Federal de Goias</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="pt-br">UFG - Universidade Federal de Goias</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.ufg.br/</OrganizationURL>
-    <OrganizationURL xml:lang="pt-br">http://www.ufg.br/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Douglas Borges de Oliveira Filho</SurName>
-    <EmailAddress>douglasfilho@cercomp.ufg.br</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shib.unibo.it-idp-shibboleth.xml b/swamid-interfederations-2.0/shib.unibo.it-idp-shibboleth.xml
deleted file mode 100644
index 83a039a8..00000000
--- a/swamid-interfederations-2.0/shib.unibo.it-idp-shibboleth.xml
+++ /dev/null
@@ -1,114 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" entityID="https://shib.unibo.it/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2013-04-26T15:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</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">unibo.it</shibmd:Scope>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="it">Università di Bologna</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">University of Bologna</mdui:DisplayName>
-        <mdui:Description xml:lang="it">Università di Bologna</mdui:Description>
-        <mdui:Description xml:lang="en">University of Bologna</mdui:Description>
-        <mdui:InformationURL xml:lang="it">http://www.unibo.it/idem</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">http://www.unibo.it/idem</mdui:InformationURL>
-        <mdui:Keywords xml:lang="it">unibo bologna alma alma+mater </mdui:Keywords>
-        <mdui:Logo height="16" width="16" xml:lang="en">https://shib.unibo.it/idp/img/logo16x16.png</mdui:Logo>
-        <mdui:Logo height="16" width="16" xml:lang="it">https://shib.unibo.it/idp/img/logo16x16.png</mdui:Logo>
-        <mdui:Logo height="60" width="80" xml:lang="en">https://shib.unibo.it/idp/img/logo80x60.png</mdui:Logo>
-        <mdui:Logo height="60" width="80" xml:lang="it">https://shib.unibo.it/idp/img/logo80x60.png</mdui:Logo>
-        <mdui:PrivacyStatementURL xml:lang="en">http://www.unibo.it/Portale/Privacy.htm</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="it">http://www.unibo.it/Portale/Privacy.htm</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-      <mdui:DiscoHints>
-        <mdui:DomainHint>unibo.it</mdui:DomainHint>
-        <mdui:DomainHint>www.unibo.it</mdui:DomainHint>
-        <mdui:IPHint>137.204.0.0/16</mdui:IPHint>
-        <mdui:GeolocationHint>geo:44.497253,11.353107</mdui:GeolocationHint>
-        <mdui:GeolocationHint>geo:44.140212,12.24427</mdui:GeolocationHint>
-        <mdui:GeolocationHint>geo:44.219036,12.042714</mdui:GeolocationHint>
-        <mdui:GeolocationHint>geo:44.413318,12.200308</mdui:GeolocationHint>
-        <mdui:GeolocationHint>geo:44.061449,12.569894</mdui:GeolocationHint>
-      </mdui:DiscoHints>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDHzCCAgegAwIBAgIUckjOBnjDyzW3TnsQ+ZAfn867Dh4wDQYJKoZIhvcNAQEF
-BQAwGDEWMBQGA1UEAxMNc2hpYi51bmliby5pdDAeFw0xMzAzMDcxMTI2MTJaFw0y
-MzAzMDcxMTI2MTJaMBgxFjAUBgNVBAMTDXNoaWIudW5pYm8uaXQwggEiMA0GCSqG
-SIb3DQEBAQUAA4IBDwAwggEKAoIBAQCgeiI39V0e9g2iI6g7xdn6lDpiRQaN5ZpH
-PN3QkBIFQcpsEk824owXGp6AkONgTucUADDJ2QUu0EvaQ2LZE77LFAIqr6sPm+3b
-cUogUFHPAk/Dc5MXA3fk+G3ot40V1VOnBYJCiGhZY8cQjQl74MmvbVJqt3Xj46Bn
-0175RSwWX2U9MYsq1+Dx3y25w66BqjvzegC6xgCUqHDQoKi60kX7d5OQ85Nm9bYb
-K18Py2v4YsS48sn7P78VhShgTzDD1MLqtExBd0Rer3VSgCWeB9YblkBlamQAqk6+
-/Xsg2eRwrAbeb0PlL5MEbCXP+sjhf3yVAIcRpS3Ep9N59UOsxiXtAgMBAAGjYTBf
-MD4GA1UdEQQ3MDWCDXNoaWIudW5pYm8uaXSGJGh0dHBzOi8vc2hpYi51bmliby5p
-dC9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUjAf6KRUx3TaBHIBCT8R3u0p3PUcw
-DQYJKoZIhvcNAQEFBQADggEBACrvNM6+6LFPF9y9lV1ODuPQjv4Vi15QBWqSC1ut
-ttb9Drp8YGTx1O3+h8u1xUaXj6eCci2CZHr5XY0ER8jRwQKueNBGmA75ZVElJLV5
-I+H/b8NbMbUHmN3XKOFJHBR/vo/SDN78Llm+7TiIZm2QzXjUOZLKti9uZtKxW6we
-vVf/0pN8vfaYTPuO3wLwLxHynRopb2qcNYTleFzLDvvxC5ZB6XbE8ni1o1U7NmNQ
-tORMcp/kCLQ38hkhPqJCWH8eIts4Ek5IU7+zJ+1rTYKLzjK7qVi5aX73dVHHVKSu
-WvjIS+CtzsnouYcpjQ5b0jRIkQwPbUCVODfiJ/COYxE0+Yw=
-</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://shib.unibo.it/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.unibo.it/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib.unibo.it/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.unibo.it/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">unibo.it</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDHzCCAgegAwIBAgIUckjOBnjDyzW3TnsQ+ZAfn867Dh4wDQYJKoZIhvcNAQEF
-BQAwGDEWMBQGA1UEAxMNc2hpYi51bmliby5pdDAeFw0xMzAzMDcxMTI2MTJaFw0y
-MzAzMDcxMTI2MTJaMBgxFjAUBgNVBAMTDXNoaWIudW5pYm8uaXQwggEiMA0GCSqG
-SIb3DQEBAQUAA4IBDwAwggEKAoIBAQCgeiI39V0e9g2iI6g7xdn6lDpiRQaN5ZpH
-PN3QkBIFQcpsEk824owXGp6AkONgTucUADDJ2QUu0EvaQ2LZE77LFAIqr6sPm+3b
-cUogUFHPAk/Dc5MXA3fk+G3ot40V1VOnBYJCiGhZY8cQjQl74MmvbVJqt3Xj46Bn
-0175RSwWX2U9MYsq1+Dx3y25w66BqjvzegC6xgCUqHDQoKi60kX7d5OQ85Nm9bYb
-K18Py2v4YsS48sn7P78VhShgTzDD1MLqtExBd0Rer3VSgCWeB9YblkBlamQAqk6+
-/Xsg2eRwrAbeb0PlL5MEbCXP+sjhf3yVAIcRpS3Ep9N59UOsxiXtAgMBAAGjYTBf
-MD4GA1UdEQQ3MDWCDXNoaWIudW5pYm8uaXSGJGh0dHBzOi8vc2hpYi51bmliby5p
-dC9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUjAf6KRUx3TaBHIBCT8R3u0p3PUcw
-DQYJKoZIhvcNAQEFBQADggEBACrvNM6+6LFPF9y9lV1ODuPQjv4Vi15QBWqSC1ut
-ttb9Drp8YGTx1O3+h8u1xUaXj6eCci2CZHr5XY0ER8jRwQKueNBGmA75ZVElJLV5
-I+H/b8NbMbUHmN3XKOFJHBR/vo/SDN78Llm+7TiIZm2QzXjUOZLKti9uZtKxW6we
-vVf/0pN8vfaYTPuO3wLwLxHynRopb2qcNYTleFzLDvvxC5ZB6XbE8ni1o1U7NmNQ
-tORMcp/kCLQ38hkhPqJCWH8eIts4Ek5IU7+zJ+1rTYKLzjK7qVi5aX73dVHHVKSu
-WvjIS+CtzsnouYcpjQ5b0jRIkQwPbUCVODfiJ/COYxE0+Yw=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.unibo.it:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.unibo.it: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">University of Bologna</OrganizationName>
-    <OrganizationName xml:lang="it">Università di Bologna</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Bologna</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="it">Università di Bologna</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.eng.unibo.it</OrganizationURL>
-    <OrganizationURL xml:lang="it">http://www.unibo.it</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <EmailAddress>cesia-sso-support@unibo.it</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shib.unibo.it.xml b/swamid-interfederations-2.0/shib.unibo.it.xml
deleted file mode 100644
index 83a039a8..00000000
--- a/swamid-interfederations-2.0/shib.unibo.it.xml
+++ /dev/null
@@ -1,114 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" entityID="https://shib.unibo.it/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2013-04-26T15:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</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">unibo.it</shibmd:Scope>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="it">Università di Bologna</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">University of Bologna</mdui:DisplayName>
-        <mdui:Description xml:lang="it">Università di Bologna</mdui:Description>
-        <mdui:Description xml:lang="en">University of Bologna</mdui:Description>
-        <mdui:InformationURL xml:lang="it">http://www.unibo.it/idem</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">http://www.unibo.it/idem</mdui:InformationURL>
-        <mdui:Keywords xml:lang="it">unibo bologna alma alma+mater </mdui:Keywords>
-        <mdui:Logo height="16" width="16" xml:lang="en">https://shib.unibo.it/idp/img/logo16x16.png</mdui:Logo>
-        <mdui:Logo height="16" width="16" xml:lang="it">https://shib.unibo.it/idp/img/logo16x16.png</mdui:Logo>
-        <mdui:Logo height="60" width="80" xml:lang="en">https://shib.unibo.it/idp/img/logo80x60.png</mdui:Logo>
-        <mdui:Logo height="60" width="80" xml:lang="it">https://shib.unibo.it/idp/img/logo80x60.png</mdui:Logo>
-        <mdui:PrivacyStatementURL xml:lang="en">http://www.unibo.it/Portale/Privacy.htm</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="it">http://www.unibo.it/Portale/Privacy.htm</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-      <mdui:DiscoHints>
-        <mdui:DomainHint>unibo.it</mdui:DomainHint>
-        <mdui:DomainHint>www.unibo.it</mdui:DomainHint>
-        <mdui:IPHint>137.204.0.0/16</mdui:IPHint>
-        <mdui:GeolocationHint>geo:44.497253,11.353107</mdui:GeolocationHint>
-        <mdui:GeolocationHint>geo:44.140212,12.24427</mdui:GeolocationHint>
-        <mdui:GeolocationHint>geo:44.219036,12.042714</mdui:GeolocationHint>
-        <mdui:GeolocationHint>geo:44.413318,12.200308</mdui:GeolocationHint>
-        <mdui:GeolocationHint>geo:44.061449,12.569894</mdui:GeolocationHint>
-      </mdui:DiscoHints>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDHzCCAgegAwIBAgIUckjOBnjDyzW3TnsQ+ZAfn867Dh4wDQYJKoZIhvcNAQEF
-BQAwGDEWMBQGA1UEAxMNc2hpYi51bmliby5pdDAeFw0xMzAzMDcxMTI2MTJaFw0y
-MzAzMDcxMTI2MTJaMBgxFjAUBgNVBAMTDXNoaWIudW5pYm8uaXQwggEiMA0GCSqG
-SIb3DQEBAQUAA4IBDwAwggEKAoIBAQCgeiI39V0e9g2iI6g7xdn6lDpiRQaN5ZpH
-PN3QkBIFQcpsEk824owXGp6AkONgTucUADDJ2QUu0EvaQ2LZE77LFAIqr6sPm+3b
-cUogUFHPAk/Dc5MXA3fk+G3ot40V1VOnBYJCiGhZY8cQjQl74MmvbVJqt3Xj46Bn
-0175RSwWX2U9MYsq1+Dx3y25w66BqjvzegC6xgCUqHDQoKi60kX7d5OQ85Nm9bYb
-K18Py2v4YsS48sn7P78VhShgTzDD1MLqtExBd0Rer3VSgCWeB9YblkBlamQAqk6+
-/Xsg2eRwrAbeb0PlL5MEbCXP+sjhf3yVAIcRpS3Ep9N59UOsxiXtAgMBAAGjYTBf
-MD4GA1UdEQQ3MDWCDXNoaWIudW5pYm8uaXSGJGh0dHBzOi8vc2hpYi51bmliby5p
-dC9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUjAf6KRUx3TaBHIBCT8R3u0p3PUcw
-DQYJKoZIhvcNAQEFBQADggEBACrvNM6+6LFPF9y9lV1ODuPQjv4Vi15QBWqSC1ut
-ttb9Drp8YGTx1O3+h8u1xUaXj6eCci2CZHr5XY0ER8jRwQKueNBGmA75ZVElJLV5
-I+H/b8NbMbUHmN3XKOFJHBR/vo/SDN78Llm+7TiIZm2QzXjUOZLKti9uZtKxW6we
-vVf/0pN8vfaYTPuO3wLwLxHynRopb2qcNYTleFzLDvvxC5ZB6XbE8ni1o1U7NmNQ
-tORMcp/kCLQ38hkhPqJCWH8eIts4Ek5IU7+zJ+1rTYKLzjK7qVi5aX73dVHHVKSu
-WvjIS+CtzsnouYcpjQ5b0jRIkQwPbUCVODfiJ/COYxE0+Yw=
-</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://shib.unibo.it/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.unibo.it/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib.unibo.it/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.unibo.it/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">unibo.it</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDHzCCAgegAwIBAgIUckjOBnjDyzW3TnsQ+ZAfn867Dh4wDQYJKoZIhvcNAQEF
-BQAwGDEWMBQGA1UEAxMNc2hpYi51bmliby5pdDAeFw0xMzAzMDcxMTI2MTJaFw0y
-MzAzMDcxMTI2MTJaMBgxFjAUBgNVBAMTDXNoaWIudW5pYm8uaXQwggEiMA0GCSqG
-SIb3DQEBAQUAA4IBDwAwggEKAoIBAQCgeiI39V0e9g2iI6g7xdn6lDpiRQaN5ZpH
-PN3QkBIFQcpsEk824owXGp6AkONgTucUADDJ2QUu0EvaQ2LZE77LFAIqr6sPm+3b
-cUogUFHPAk/Dc5MXA3fk+G3ot40V1VOnBYJCiGhZY8cQjQl74MmvbVJqt3Xj46Bn
-0175RSwWX2U9MYsq1+Dx3y25w66BqjvzegC6xgCUqHDQoKi60kX7d5OQ85Nm9bYb
-K18Py2v4YsS48sn7P78VhShgTzDD1MLqtExBd0Rer3VSgCWeB9YblkBlamQAqk6+
-/Xsg2eRwrAbeb0PlL5MEbCXP+sjhf3yVAIcRpS3Ep9N59UOsxiXtAgMBAAGjYTBf
-MD4GA1UdEQQ3MDWCDXNoaWIudW5pYm8uaXSGJGh0dHBzOi8vc2hpYi51bmliby5p
-dC9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUjAf6KRUx3TaBHIBCT8R3u0p3PUcw
-DQYJKoZIhvcNAQEFBQADggEBACrvNM6+6LFPF9y9lV1ODuPQjv4Vi15QBWqSC1ut
-ttb9Drp8YGTx1O3+h8u1xUaXj6eCci2CZHr5XY0ER8jRwQKueNBGmA75ZVElJLV5
-I+H/b8NbMbUHmN3XKOFJHBR/vo/SDN78Llm+7TiIZm2QzXjUOZLKti9uZtKxW6we
-vVf/0pN8vfaYTPuO3wLwLxHynRopb2qcNYTleFzLDvvxC5ZB6XbE8ni1o1U7NmNQ
-tORMcp/kCLQ38hkhPqJCWH8eIts4Ek5IU7+zJ+1rTYKLzjK7qVi5aX73dVHHVKSu
-WvjIS+CtzsnouYcpjQ5b0jRIkQwPbUCVODfiJ/COYxE0+Yw=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.unibo.it:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.unibo.it: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">University of Bologna</OrganizationName>
-    <OrganizationName xml:lang="it">Università di Bologna</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Bologna</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="it">Università di Bologna</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.eng.unibo.it</OrganizationURL>
-    <OrganizationURL xml:lang="it">http://www.unibo.it</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <EmailAddress>cesia-sso-support@unibo.it</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shib.zcu.cz-idp-shibboleth.xml b/swamid-interfederations-2.0/shib.zcu.cz-idp-shibboleth.xml
deleted file mode 100644
index eee5ab80..00000000
--- a/swamid-interfederations-2.0/shib.zcu.cz-idp-shibboleth.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:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://shib.zcu.cz/idp/shibboleth">
-  <md:Extensions xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata">
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/" registrationInstant="2010-09-22T14:22:17Z">
-      <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>
-    <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://eduid.cz/uri/idp-group/university</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md: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">zcu.cz</shibmd:Scope>
-      <shibmd:Scope regexp="false">gapps.zcu.cz</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">University of West Bohemia</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="cs">Západočeská univerzita v Plzni</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Identity Provider for students and staff of the University of West Bohemia.</mdui:Description>
-        <mdui:Description xml:lang="cs">Identity Provider pro studenty a zaměstance Západočeské univerzity v Plzni.</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.zcu.cz/en/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="cs">http://www.zcu.cz/</mdui:InformationURL>
-        <mdui:Logo height="40" width="40">https://shib.zcu.cz/icons/zcu_logo_40px.png</mdui:Logo>
-        <mdui:Logo height="102" width="102">https://shib.zcu.cz/icons/zcu_logo.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>
-MIIDFzCCAf+gAwIBAgIUCDrOzILCIUYr3TrnUQPEsHWa+wMwDQYJKoZIhvcNAQEF
-BQAwFjEUMBIGA1UEAxMLc2hpYi56Y3UuY3owHhcNMTIwNjE1MTIwNzE1WhcNMzIw
-NjE1MTIwNzE1WjAWMRQwEgYDVQQDEwtzaGliLnpjdS5jejCCASIwDQYJKoZIhvcN
-AQEBBQADggEPADCCAQoCggEBAIZDgPqv9Pzl5boNk7nXJpoxPt4AVs++zbuJNPU8
-kJWFdeXrjB2m2wGSDm+1X33NrnkGs2LrNqSqjfXdoPM7UwBKUzqZx6qNSsDssrKt
-S3vK8RfyOss31NXhY6tgG4nw1YhO4324spqFIA7oXMR/QxuPXHnRxUMZjln0XgeM
-hAeHcJJYU/c8ZbLPr4M7eVeQSnzccvkdIc1Hil5qpsdpvb48yvUCOKl7Flm/iVLM
-OKlj1i4IKGSQNd8cUnZZukWK62/H1pr7Al6368zJqkYKvUJbRNfRiXEeV3c9pcg/
-/bx/j66ebUulE4A4ITpE5oQvMpgx/1w2h76mY9rHzTHBMp0CAwEAAaNdMFswOgYD
-VR0RBDMwMYILc2hpYi56Y3UuY3qGImh0dHBzOi8vc2hpYi56Y3UuY3ovaWRwL3No
-aWJib2xldGgwHQYDVR0OBBYEFHLlm9ZAYoCIoT1NQsdo7sPzShFWMA0GCSqGSIb3
-DQEBBQUAA4IBAQAHtEngv7KaSiRJxFaLn3VdzH6f3SC4xNGKTPyGVq0pBrwUitf4
-kMl17K3Hg73ef1D+wInl3+9IuoCDsTH2wKKD3tUSZsL+xgekRGiIu3LIFcoa+U+o
-5n1nnfZ7xfvh8lgmsRZ7TVC3dXFl9wU+BmsVvOWEjneOA5oZQ2MUkKDC9+5sh6jV
-BXl4hMGBSLfs19/xa81PR7nkC9e6N0ri6nq6rT/SwoXXsAxHMHRz9M9gSq5lwxYO
-d+orcDxYVF3fdNbigr2b4qcgMeVygTsdcroU8EncIRMRLw0Wdb5Pk86KmCj74dRq
-C9OOk807XNhUC499735YXOv2kFUlCx5mZeOk
-
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.zcu.cz:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.zcu.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>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib.zcu.cz/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.zcu.cz/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib.zcu.cz/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.zcu.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">zcu.cz</shibmd:Scope>
-      <shibmd:Scope regexp="false">gapps.zcu.cz</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDFzCCAf+gAwIBAgIUCDrOzILCIUYr3TrnUQPEsHWa+wMwDQYJKoZIhvcNAQEF
-BQAwFjEUMBIGA1UEAxMLc2hpYi56Y3UuY3owHhcNMTIwNjE1MTIwNzE1WhcNMzIw
-NjE1MTIwNzE1WjAWMRQwEgYDVQQDEwtzaGliLnpjdS5jejCCASIwDQYJKoZIhvcN
-AQEBBQADggEPADCCAQoCggEBAIZDgPqv9Pzl5boNk7nXJpoxPt4AVs++zbuJNPU8
-kJWFdeXrjB2m2wGSDm+1X33NrnkGs2LrNqSqjfXdoPM7UwBKUzqZx6qNSsDssrKt
-S3vK8RfyOss31NXhY6tgG4nw1YhO4324spqFIA7oXMR/QxuPXHnRxUMZjln0XgeM
-hAeHcJJYU/c8ZbLPr4M7eVeQSnzccvkdIc1Hil5qpsdpvb48yvUCOKl7Flm/iVLM
-OKlj1i4IKGSQNd8cUnZZukWK62/H1pr7Al6368zJqkYKvUJbRNfRiXEeV3c9pcg/
-/bx/j66ebUulE4A4ITpE5oQvMpgx/1w2h76mY9rHzTHBMp0CAwEAAaNdMFswOgYD
-VR0RBDMwMYILc2hpYi56Y3UuY3qGImh0dHBzOi8vc2hpYi56Y3UuY3ovaWRwL3No
-aWJib2xldGgwHQYDVR0OBBYEFHLlm9ZAYoCIoT1NQsdo7sPzShFWMA0GCSqGSIb3
-DQEBBQUAA4IBAQAHtEngv7KaSiRJxFaLn3VdzH6f3SC4xNGKTPyGVq0pBrwUitf4
-kMl17K3Hg73ef1D+wInl3+9IuoCDsTH2wKKD3tUSZsL+xgekRGiIu3LIFcoa+U+o
-5n1nnfZ7xfvh8lgmsRZ7TVC3dXFl9wU+BmsVvOWEjneOA5oZQ2MUkKDC9+5sh6jV
-BXl4hMGBSLfs19/xa81PR7nkC9e6N0ri6nq6rT/SwoXXsAxHMHRz9M9gSq5lwxYO
-d+orcDxYVF3fdNbigr2b4qcgMeVygTsdcroU8EncIRMRLw0Wdb5Pk86KmCj74dRq
-C9OOk807XNhUC499735YXOv2kFUlCx5mZeOk
-
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.zcu.cz:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.zcu.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>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of West Bohemia</OrganizationName>
-    <OrganizationName xml:lang="cs">Západočeská univerzita v Plzni</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of West Bohemia</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="cs">Západočeská univerzita v Plzni</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.zcu.cz/en/</OrganizationURL>
-    <OrganizationURL xml:lang="cs">http://www.zcu.cz/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Petr</GivenName>
-    <SurName>Grolmus</SurName>
-    <EmailAddress>indy@civ.zcu.cz</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shib.zcu.cz.xml b/swamid-interfederations-2.0/shib.zcu.cz.xml
deleted file mode 100644
index eee5ab80..00000000
--- a/swamid-interfederations-2.0/shib.zcu.cz.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:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://shib.zcu.cz/idp/shibboleth">
-  <md:Extensions xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata">
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/" registrationInstant="2010-09-22T14:22:17Z">
-      <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>
-    <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://eduid.cz/uri/idp-group/university</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md: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">zcu.cz</shibmd:Scope>
-      <shibmd:Scope regexp="false">gapps.zcu.cz</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">University of West Bohemia</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="cs">Západočeská univerzita v Plzni</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Identity Provider for students and staff of the University of West Bohemia.</mdui:Description>
-        <mdui:Description xml:lang="cs">Identity Provider pro studenty a zaměstance Západočeské univerzity v Plzni.</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.zcu.cz/en/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="cs">http://www.zcu.cz/</mdui:InformationURL>
-        <mdui:Logo height="40" width="40">https://shib.zcu.cz/icons/zcu_logo_40px.png</mdui:Logo>
-        <mdui:Logo height="102" width="102">https://shib.zcu.cz/icons/zcu_logo.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>
-MIIDFzCCAf+gAwIBAgIUCDrOzILCIUYr3TrnUQPEsHWa+wMwDQYJKoZIhvcNAQEF
-BQAwFjEUMBIGA1UEAxMLc2hpYi56Y3UuY3owHhcNMTIwNjE1MTIwNzE1WhcNMzIw
-NjE1MTIwNzE1WjAWMRQwEgYDVQQDEwtzaGliLnpjdS5jejCCASIwDQYJKoZIhvcN
-AQEBBQADggEPADCCAQoCggEBAIZDgPqv9Pzl5boNk7nXJpoxPt4AVs++zbuJNPU8
-kJWFdeXrjB2m2wGSDm+1X33NrnkGs2LrNqSqjfXdoPM7UwBKUzqZx6qNSsDssrKt
-S3vK8RfyOss31NXhY6tgG4nw1YhO4324spqFIA7oXMR/QxuPXHnRxUMZjln0XgeM
-hAeHcJJYU/c8ZbLPr4M7eVeQSnzccvkdIc1Hil5qpsdpvb48yvUCOKl7Flm/iVLM
-OKlj1i4IKGSQNd8cUnZZukWK62/H1pr7Al6368zJqkYKvUJbRNfRiXEeV3c9pcg/
-/bx/j66ebUulE4A4ITpE5oQvMpgx/1w2h76mY9rHzTHBMp0CAwEAAaNdMFswOgYD
-VR0RBDMwMYILc2hpYi56Y3UuY3qGImh0dHBzOi8vc2hpYi56Y3UuY3ovaWRwL3No
-aWJib2xldGgwHQYDVR0OBBYEFHLlm9ZAYoCIoT1NQsdo7sPzShFWMA0GCSqGSIb3
-DQEBBQUAA4IBAQAHtEngv7KaSiRJxFaLn3VdzH6f3SC4xNGKTPyGVq0pBrwUitf4
-kMl17K3Hg73ef1D+wInl3+9IuoCDsTH2wKKD3tUSZsL+xgekRGiIu3LIFcoa+U+o
-5n1nnfZ7xfvh8lgmsRZ7TVC3dXFl9wU+BmsVvOWEjneOA5oZQ2MUkKDC9+5sh6jV
-BXl4hMGBSLfs19/xa81PR7nkC9e6N0ri6nq6rT/SwoXXsAxHMHRz9M9gSq5lwxYO
-d+orcDxYVF3fdNbigr2b4qcgMeVygTsdcroU8EncIRMRLw0Wdb5Pk86KmCj74dRq
-C9OOk807XNhUC499735YXOv2kFUlCx5mZeOk
-
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.zcu.cz:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.zcu.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>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib.zcu.cz/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.zcu.cz/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib.zcu.cz/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.zcu.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">zcu.cz</shibmd:Scope>
-      <shibmd:Scope regexp="false">gapps.zcu.cz</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDFzCCAf+gAwIBAgIUCDrOzILCIUYr3TrnUQPEsHWa+wMwDQYJKoZIhvcNAQEF
-BQAwFjEUMBIGA1UEAxMLc2hpYi56Y3UuY3owHhcNMTIwNjE1MTIwNzE1WhcNMzIw
-NjE1MTIwNzE1WjAWMRQwEgYDVQQDEwtzaGliLnpjdS5jejCCASIwDQYJKoZIhvcN
-AQEBBQADggEPADCCAQoCggEBAIZDgPqv9Pzl5boNk7nXJpoxPt4AVs++zbuJNPU8
-kJWFdeXrjB2m2wGSDm+1X33NrnkGs2LrNqSqjfXdoPM7UwBKUzqZx6qNSsDssrKt
-S3vK8RfyOss31NXhY6tgG4nw1YhO4324spqFIA7oXMR/QxuPXHnRxUMZjln0XgeM
-hAeHcJJYU/c8ZbLPr4M7eVeQSnzccvkdIc1Hil5qpsdpvb48yvUCOKl7Flm/iVLM
-OKlj1i4IKGSQNd8cUnZZukWK62/H1pr7Al6368zJqkYKvUJbRNfRiXEeV3c9pcg/
-/bx/j66ebUulE4A4ITpE5oQvMpgx/1w2h76mY9rHzTHBMp0CAwEAAaNdMFswOgYD
-VR0RBDMwMYILc2hpYi56Y3UuY3qGImh0dHBzOi8vc2hpYi56Y3UuY3ovaWRwL3No
-aWJib2xldGgwHQYDVR0OBBYEFHLlm9ZAYoCIoT1NQsdo7sPzShFWMA0GCSqGSIb3
-DQEBBQUAA4IBAQAHtEngv7KaSiRJxFaLn3VdzH6f3SC4xNGKTPyGVq0pBrwUitf4
-kMl17K3Hg73ef1D+wInl3+9IuoCDsTH2wKKD3tUSZsL+xgekRGiIu3LIFcoa+U+o
-5n1nnfZ7xfvh8lgmsRZ7TVC3dXFl9wU+BmsVvOWEjneOA5oZQ2MUkKDC9+5sh6jV
-BXl4hMGBSLfs19/xa81PR7nkC9e6N0ri6nq6rT/SwoXXsAxHMHRz9M9gSq5lwxYO
-d+orcDxYVF3fdNbigr2b4qcgMeVygTsdcroU8EncIRMRLw0Wdb5Pk86KmCj74dRq
-C9OOk807XNhUC499735YXOv2kFUlCx5mZeOk
-
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.zcu.cz:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.zcu.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>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of West Bohemia</OrganizationName>
-    <OrganizationName xml:lang="cs">Západočeská univerzita v Plzni</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of West Bohemia</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="cs">Západočeská univerzita v Plzni</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.zcu.cz/en/</OrganizationURL>
-    <OrganizationURL xml:lang="cs">http://www.zcu.cz/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Petr</GivenName>
-    <SurName>Grolmus</SurName>
-    <EmailAddress>indy@civ.zcu.cz</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibb-prod.eseo.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/shibb-prod.eseo.fr-idp-shibboleth.xml
deleted file mode 100644
index 4342b49f..00000000
--- a/swamid-interfederations-2.0/shibb-prod.eseo.fr-idp-shibboleth.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://shibb-prod.eseo.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2014-06-11T17:24:23Z">
-      <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">eseo.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">Groupe ESEO</mdui:DisplayName>
-        <mdui:Description xml:lang="fr">École d'ingénieurs</mdui:Description>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDODCCAiCgAwIBAgIVAPKv3AMhxdHV3jWXxqMbNKHYz0KVMA0GCSqGSIb3DQEB
-BQUAMB4xHDAaBgNVBAMTE3NoaWJib3VsZXRoLmVzZW8uZnIwHhcNMTQwNTEzMTI0
-NDQ4WhcNMzQwNTEzMTI0NDQ4WjAeMRwwGgYDVQQDExNzaGliYm91bGV0aC5lc2Vv
-LmZyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAmCTC2H03ZXvDs4Io
-a1d+L6ggwRUqGwP45mlW5l6Nuti5JBqjDLBvP1tPqAeh1V6boPufnkd2ZquVCZDP
-1WFjLKyL015a81gLeWvJMId1yWq4+7s4s1HBFgaftNM6z6Hl/sTt1UL/dFM3DrNH
-Z1fUHe+TWGv8e60KA4DqhjdphtM+Q0dsZNVDGGp5d0zLOPhrikoZE8pqXvbOD7r/
-W9I8jWEX4RIBJkvpeBI5zpGZVRbq5LKNVaccEJW3dx9v1MyI7JQbT90hmUdBYIOl
-b+vQ5fgJCj9RlgK+tEMJsB67w2SvD7YsG3w/DqogoZBeQUgolwPKteAyKGZIh0Y2
-5pyMSQIDAQABo20wazBKBgNVHREEQzBBghNzaGliYm91bGV0aC5lc2VvLmZyhipo
-dHRwczovL3NoaWJib3VsZXRoLmVzZW8uZnIvaWRwL3NoaWJib2xldGgwHQYDVR0O
-BBYEFMR3J/ymlt+tWJbLpfaFrrhqC2qZMA0GCSqGSIb3DQEBBQUAA4IBAQAzJ0MU
-jZjJiOzYrQkeSkDw0kl2drKEOW1/54ANucqNSko1MQ2QXbOiL2bcgOXC8jDgOyEX
-+G0QO8YdGio1CCirUVPTWSIsxpRM9nI2FbhpGk+DXe2wgPTYnJPN94kdVJrWEE/Y
-BtBvR1BzklAZ6sLrXQMWerGNHAQIyQ8+SInFpqtbB9yJuWuc9oVaoGYIm3TI2N8S
-/Uo1+w4j8jXAl7tXaUnoZ1oKW36H+0sRVhZ2Ys4eH3Vk6nvf5qHPdgUCNjh6txmf
-om24YGvt8hL3ZCb5y2+jFCIZyCf853CuTiEjLyT7c1KZzUPzvDVqf0gL5n3twqxj
-cE2NlFME1N0tqRVC
-					    </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://shibb-prod.eseo.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibb-prod.eseo.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibb-prod.eseo.fr/idp/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Groupe ESEO</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Groupe ESEO</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Duclos Philippe</SurName>
-    <EmailAddress>philippe.duclos@eseo.fr</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <SurName>Tessier Fabien</SurName>
-    <EmailAddress>fabien.tessier@eseo.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibb-prod.eseo.fr.xml b/swamid-interfederations-2.0/shibb-prod.eseo.fr.xml
deleted file mode 100644
index 4342b49f..00000000
--- a/swamid-interfederations-2.0/shibb-prod.eseo.fr.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://shibb-prod.eseo.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2014-06-11T17:24:23Z">
-      <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">eseo.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">Groupe ESEO</mdui:DisplayName>
-        <mdui:Description xml:lang="fr">École d'ingénieurs</mdui:Description>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDODCCAiCgAwIBAgIVAPKv3AMhxdHV3jWXxqMbNKHYz0KVMA0GCSqGSIb3DQEB
-BQUAMB4xHDAaBgNVBAMTE3NoaWJib3VsZXRoLmVzZW8uZnIwHhcNMTQwNTEzMTI0
-NDQ4WhcNMzQwNTEzMTI0NDQ4WjAeMRwwGgYDVQQDExNzaGliYm91bGV0aC5lc2Vv
-LmZyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAmCTC2H03ZXvDs4Io
-a1d+L6ggwRUqGwP45mlW5l6Nuti5JBqjDLBvP1tPqAeh1V6boPufnkd2ZquVCZDP
-1WFjLKyL015a81gLeWvJMId1yWq4+7s4s1HBFgaftNM6z6Hl/sTt1UL/dFM3DrNH
-Z1fUHe+TWGv8e60KA4DqhjdphtM+Q0dsZNVDGGp5d0zLOPhrikoZE8pqXvbOD7r/
-W9I8jWEX4RIBJkvpeBI5zpGZVRbq5LKNVaccEJW3dx9v1MyI7JQbT90hmUdBYIOl
-b+vQ5fgJCj9RlgK+tEMJsB67w2SvD7YsG3w/DqogoZBeQUgolwPKteAyKGZIh0Y2
-5pyMSQIDAQABo20wazBKBgNVHREEQzBBghNzaGliYm91bGV0aC5lc2VvLmZyhipo
-dHRwczovL3NoaWJib3VsZXRoLmVzZW8uZnIvaWRwL3NoaWJib2xldGgwHQYDVR0O
-BBYEFMR3J/ymlt+tWJbLpfaFrrhqC2qZMA0GCSqGSIb3DQEBBQUAA4IBAQAzJ0MU
-jZjJiOzYrQkeSkDw0kl2drKEOW1/54ANucqNSko1MQ2QXbOiL2bcgOXC8jDgOyEX
-+G0QO8YdGio1CCirUVPTWSIsxpRM9nI2FbhpGk+DXe2wgPTYnJPN94kdVJrWEE/Y
-BtBvR1BzklAZ6sLrXQMWerGNHAQIyQ8+SInFpqtbB9yJuWuc9oVaoGYIm3TI2N8S
-/Uo1+w4j8jXAl7tXaUnoZ1oKW36H+0sRVhZ2Ys4eH3Vk6nvf5qHPdgUCNjh6txmf
-om24YGvt8hL3ZCb5y2+jFCIZyCf853CuTiEjLyT7c1KZzUPzvDVqf0gL5n3twqxj
-cE2NlFME1N0tqRVC
-					    </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://shibb-prod.eseo.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibb-prod.eseo.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibb-prod.eseo.fr/idp/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Groupe ESEO</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Groupe ESEO</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Duclos Philippe</SurName>
-    <EmailAddress>philippe.duclos@eseo.fr</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <SurName>Tessier Fabien</SurName>
-    <EmailAddress>fabien.tessier@eseo.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibb.crous-amiens.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/shibb.crous-amiens.fr-idp-shibboleth.xml
deleted file mode 100644
index 26f5e2ce..00000000
--- a/swamid-interfederations-2.0/shibb.crous-amiens.fr-idp-shibboleth.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://shibb.crous-amiens.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2012-07-24T10:29:25Z">
-      <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">crous-amiens.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">CROUS Amiens Picardie</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDPzCCAiegAwIBAgIUWk75AksWnL8BoI7cZDfQb1ljg5cwDQYJKoZIhvcNAQEF
-BQAwIDEeMBwGA1UEAxMVc2hpYmIuY3JvdXMtYW1pZW5zLmZyMB4XDTEyMDYxOTE1
-MjQ1N1oXDTMyMDYxOTE1MjQ1N1owIDEeMBwGA1UEAxMVc2hpYmIuY3JvdXMtYW1p
-ZW5zLmZyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA8Xc9nAhkLiO/
-5Q/cExGa3IiU3Mubsa8mxcpyFUb1IyYtxSByEpp1MQuyfxdcwZ0NraVqz6fo0RCT
-wrzDYD8nwFomEz24KTtJ1Iz4QkvAtIO4R+sELCHVsxDjkc4F27+SSNaw5Nd2ArQ0
-0mVexM7wlQhI9/iSu8XPKt1USrv94aGMZjyiErELkYux9y9r3DjeKqZ0Iy/o5Q0P
-eZjmLLmbQhBeDQV+8jEMy7FdTxAFjSD180ZTQs0Nr1lULpqaS0MRCKXmuVcbwG3j
-0YAA12FpSxqxytPQ5AA+nZEqmp7TjIA80Jr3bdXnZsebYh5PQiuaORuTW1HVuHhP
-8cb2nKk+tQIDAQABo3EwbzBOBgNVHREERzBFghVzaGliYi5jcm91cy1hbWllbnMu
-ZnKGLGh0dHBzOi8vc2hpYmIuY3JvdXMtYW1pZW5zLmZyL2lkcC9zaGliYm9sZXRo
-MB0GA1UdDgQWBBRM+7NkS0UwjHIAamV6UpRchDXMXjANBgkqhkiG9w0BAQUFAAOC
-AQEAVoAbZa8pL0cAwB2lI/Z4HxZ6DRJMNg/UmuaKLvA6t9E3YyPFgi/Rrd/Mfzne
-QB7E/k87akBINd4wo4YaZFD9p03wYH/1nRM+2HNGRBUIE89zUSddA5hX8n0Oe0IT
-jS+8ryJP7PxPFutpAwK7gQmjIJedhZfKb2wSW0Lr+7T5BvDJvlWw4scbtglEvGPJ
-MYiVo4dAlHPpZiCwfqSFmcYwWpv2wn2YOHQXwHW/IOoH4xRTe46OEEWMH4bnEaxF
-J5bzSDrmEU61MbWAP5bXoDLg1GwsD1Ii7W4OSj8NWCOSJfCcBssgu79muvxoxReh
-pext0rl4HCXbrR0ZoRaS0vDaIg==
-					    </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://shibb.crous-amiens.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibb.crous-amiens.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibb.crous-amiens.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">crous-amiens.fr</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDPzCCAiegAwIBAgIUWk75AksWnL8BoI7cZDfQb1ljg5cwDQYJKoZIhvcNAQEF
-BQAwIDEeMBwGA1UEAxMVc2hpYmIuY3JvdXMtYW1pZW5zLmZyMB4XDTEyMDYxOTE1
-MjQ1N1oXDTMyMDYxOTE1MjQ1N1owIDEeMBwGA1UEAxMVc2hpYmIuY3JvdXMtYW1p
-ZW5zLmZyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA8Xc9nAhkLiO/
-5Q/cExGa3IiU3Mubsa8mxcpyFUb1IyYtxSByEpp1MQuyfxdcwZ0NraVqz6fo0RCT
-wrzDYD8nwFomEz24KTtJ1Iz4QkvAtIO4R+sELCHVsxDjkc4F27+SSNaw5Nd2ArQ0
-0mVexM7wlQhI9/iSu8XPKt1USrv94aGMZjyiErELkYux9y9r3DjeKqZ0Iy/o5Q0P
-eZjmLLmbQhBeDQV+8jEMy7FdTxAFjSD180ZTQs0Nr1lULpqaS0MRCKXmuVcbwG3j
-0YAA12FpSxqxytPQ5AA+nZEqmp7TjIA80Jr3bdXnZsebYh5PQiuaORuTW1HVuHhP
-8cb2nKk+tQIDAQABo3EwbzBOBgNVHREERzBFghVzaGliYi5jcm91cy1hbWllbnMu
-ZnKGLGh0dHBzOi8vc2hpYmIuY3JvdXMtYW1pZW5zLmZyL2lkcC9zaGliYm9sZXRo
-MB0GA1UdDgQWBBRM+7NkS0UwjHIAamV6UpRchDXMXjANBgkqhkiG9w0BAQUFAAOC
-AQEAVoAbZa8pL0cAwB2lI/Z4HxZ6DRJMNg/UmuaKLvA6t9E3YyPFgi/Rrd/Mfzne
-QB7E/k87akBINd4wo4YaZFD9p03wYH/1nRM+2HNGRBUIE89zUSddA5hX8n0Oe0IT
-jS+8ryJP7PxPFutpAwK7gQmjIJedhZfKb2wSW0Lr+7T5BvDJvlWw4scbtglEvGPJ
-MYiVo4dAlHPpZiCwfqSFmcYwWpv2wn2YOHQXwHW/IOoH4xRTe46OEEWMH4bnEaxF
-J5bzSDrmEU61MbWAP5bXoDLg1GwsD1Ii7W4OSj8NWCOSJfCcBssgu79muvxoxReh
-pext0rl4HCXbrR0ZoRaS0vDaIg==
-					    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibb.crous-amiens.fr/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">CROUS Amiens Picardie</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">CROUS Amiens Picardie</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <EmailAddress>informatique@crous-amiens.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibb.crous-amiens.fr.xml b/swamid-interfederations-2.0/shibb.crous-amiens.fr.xml
deleted file mode 100644
index 26f5e2ce..00000000
--- a/swamid-interfederations-2.0/shibb.crous-amiens.fr.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://shibb.crous-amiens.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2012-07-24T10:29:25Z">
-      <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">crous-amiens.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">CROUS Amiens Picardie</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDPzCCAiegAwIBAgIUWk75AksWnL8BoI7cZDfQb1ljg5cwDQYJKoZIhvcNAQEF
-BQAwIDEeMBwGA1UEAxMVc2hpYmIuY3JvdXMtYW1pZW5zLmZyMB4XDTEyMDYxOTE1
-MjQ1N1oXDTMyMDYxOTE1MjQ1N1owIDEeMBwGA1UEAxMVc2hpYmIuY3JvdXMtYW1p
-ZW5zLmZyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA8Xc9nAhkLiO/
-5Q/cExGa3IiU3Mubsa8mxcpyFUb1IyYtxSByEpp1MQuyfxdcwZ0NraVqz6fo0RCT
-wrzDYD8nwFomEz24KTtJ1Iz4QkvAtIO4R+sELCHVsxDjkc4F27+SSNaw5Nd2ArQ0
-0mVexM7wlQhI9/iSu8XPKt1USrv94aGMZjyiErELkYux9y9r3DjeKqZ0Iy/o5Q0P
-eZjmLLmbQhBeDQV+8jEMy7FdTxAFjSD180ZTQs0Nr1lULpqaS0MRCKXmuVcbwG3j
-0YAA12FpSxqxytPQ5AA+nZEqmp7TjIA80Jr3bdXnZsebYh5PQiuaORuTW1HVuHhP
-8cb2nKk+tQIDAQABo3EwbzBOBgNVHREERzBFghVzaGliYi5jcm91cy1hbWllbnMu
-ZnKGLGh0dHBzOi8vc2hpYmIuY3JvdXMtYW1pZW5zLmZyL2lkcC9zaGliYm9sZXRo
-MB0GA1UdDgQWBBRM+7NkS0UwjHIAamV6UpRchDXMXjANBgkqhkiG9w0BAQUFAAOC
-AQEAVoAbZa8pL0cAwB2lI/Z4HxZ6DRJMNg/UmuaKLvA6t9E3YyPFgi/Rrd/Mfzne
-QB7E/k87akBINd4wo4YaZFD9p03wYH/1nRM+2HNGRBUIE89zUSddA5hX8n0Oe0IT
-jS+8ryJP7PxPFutpAwK7gQmjIJedhZfKb2wSW0Lr+7T5BvDJvlWw4scbtglEvGPJ
-MYiVo4dAlHPpZiCwfqSFmcYwWpv2wn2YOHQXwHW/IOoH4xRTe46OEEWMH4bnEaxF
-J5bzSDrmEU61MbWAP5bXoDLg1GwsD1Ii7W4OSj8NWCOSJfCcBssgu79muvxoxReh
-pext0rl4HCXbrR0ZoRaS0vDaIg==
-					    </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://shibb.crous-amiens.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibb.crous-amiens.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibb.crous-amiens.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">crous-amiens.fr</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDPzCCAiegAwIBAgIUWk75AksWnL8BoI7cZDfQb1ljg5cwDQYJKoZIhvcNAQEF
-BQAwIDEeMBwGA1UEAxMVc2hpYmIuY3JvdXMtYW1pZW5zLmZyMB4XDTEyMDYxOTE1
-MjQ1N1oXDTMyMDYxOTE1MjQ1N1owIDEeMBwGA1UEAxMVc2hpYmIuY3JvdXMtYW1p
-ZW5zLmZyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA8Xc9nAhkLiO/
-5Q/cExGa3IiU3Mubsa8mxcpyFUb1IyYtxSByEpp1MQuyfxdcwZ0NraVqz6fo0RCT
-wrzDYD8nwFomEz24KTtJ1Iz4QkvAtIO4R+sELCHVsxDjkc4F27+SSNaw5Nd2ArQ0
-0mVexM7wlQhI9/iSu8XPKt1USrv94aGMZjyiErELkYux9y9r3DjeKqZ0Iy/o5Q0P
-eZjmLLmbQhBeDQV+8jEMy7FdTxAFjSD180ZTQs0Nr1lULpqaS0MRCKXmuVcbwG3j
-0YAA12FpSxqxytPQ5AA+nZEqmp7TjIA80Jr3bdXnZsebYh5PQiuaORuTW1HVuHhP
-8cb2nKk+tQIDAQABo3EwbzBOBgNVHREERzBFghVzaGliYi5jcm91cy1hbWllbnMu
-ZnKGLGh0dHBzOi8vc2hpYmIuY3JvdXMtYW1pZW5zLmZyL2lkcC9zaGliYm9sZXRo
-MB0GA1UdDgQWBBRM+7NkS0UwjHIAamV6UpRchDXMXjANBgkqhkiG9w0BAQUFAAOC
-AQEAVoAbZa8pL0cAwB2lI/Z4HxZ6DRJMNg/UmuaKLvA6t9E3YyPFgi/Rrd/Mfzne
-QB7E/k87akBINd4wo4YaZFD9p03wYH/1nRM+2HNGRBUIE89zUSddA5hX8n0Oe0IT
-jS+8ryJP7PxPFutpAwK7gQmjIJedhZfKb2wSW0Lr+7T5BvDJvlWw4scbtglEvGPJ
-MYiVo4dAlHPpZiCwfqSFmcYwWpv2wn2YOHQXwHW/IOoH4xRTe46OEEWMH4bnEaxF
-J5bzSDrmEU61MbWAP5bXoDLg1GwsD1Ii7W4OSj8NWCOSJfCcBssgu79muvxoxReh
-pext0rl4HCXbrR0ZoRaS0vDaIg==
-					    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibb.crous-amiens.fr/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">CROUS Amiens Picardie</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">CROUS Amiens Picardie</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <EmailAddress>informatique@crous-amiens.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibb1.hj.se-idp-shibboleth.xml b/swamid-interfederations-2.0/shibb1.hj.se-idp-shibboleth.xml
deleted file mode 100644
index 3dfba952..00000000
--- a/swamid-interfederations-2.0/shibb1.hj.se-idp-shibboleth.xml
+++ /dev/null
@@ -1,122 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibb1.hj.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">hj.se</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="sv">Högskolan i Jönköping</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Jönköping University</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Identity Provider för anställda och studenter vid Högskolan i Jönköping.</mdui:Description>
-        <mdui:Description xml:lang="en">The Jönköping University Identity Provider is used by employees and students at the university.</mdui:Description>
-        <mdui:InformationURL xml:lang="sv">http://hj.se</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">http://hj.se/en.html</mdui:InformationURL>
-        <mdui:Logo height="77" width="299" xml:lang="sv">https://hj.se/webdav/images/system/gfx/logotype/hj-sv.png</mdui:Logo>
-        <mdui:Logo height="77" width="277" xml:lang="en">https://hj.se/webdav/images/system/gfx/logotype/hj-en.png</mdui:Logo>
-        <mdui:Keywords xml:lang="sv">hj hogskolan+i+jonkoping jonkoping+university</mdui:Keywords>
-        <mdui:Keywords xml:lang="en">hj hogskolan+i+jonkoping jonkoping+university</mdui:Keywords>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DomainHint>hj.se</mdui:DomainHint>
-        <mdui:GeolocationHint>geo:57.7783,14.1633</mdui:GeolocationHint>
-      </mdui:DiscoHints>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDGzCCAgOgAwIBAgIUB7TrKFw9b8VuoROWwTsp8hJE5oowDQYJKoZIhvcNAQEF
-BQAwFzEVMBMGA1UEAxMMc2hpYmIxLmhqLnNlMB4XDTA5MTAxMzA3MjcyNVoXDTI5
-MTAxMzA3MjcyNVowFzEVMBMGA1UEAxMMc2hpYmIxLmhqLnNlMIIBIjANBgkqhkiG
-9w0BAQEFAAOCAQ8AMIIBCgKCAQEAk5R5pnnBvG4o7SW4uekwfFNvAvGSAGUf9lOu
-f7ui6bIi2J0j4mIJXbeVdGsUbXCFUKwoJB9AfBfQm/9V3Szwxk5qHoTOFOH0Y0MS
-FCimnTUv4j2lIeab980784pyfDD2dBgMzsWmFra8JXg6Y66Ag3TXTYQOX1Bodr6W
-Lff27tYfoEiUqfL1WRE3KeH2EzVaTf53zHrMwlbAifB+jhdA7AIJw9gGpMuUpzB4
-sPR5tD/M/SUJPIz37YyGbmpI3pqGoabpvZ8bBWut4Z1EnUFtd7fIwt5UMbFc4i5/
-gUL3jKpDHO7mKfZq8BstcWkgzZ1x0HHRWZFFzfowQytvHea3ewIDAQABo18wXTA8
-BgNVHREENTAzggxzaGliYjEuaGouc2WGI2h0dHBzOi8vc2hpYmIxLmhqLnNlL2lk
-cC9zaGliYm9sZXRoMB0GA1UdDgQWBBS2nNJVvFq4dsSheCENArwBFmDmCzANBgkq
-hkiG9w0BAQUFAAOCAQEAEg326B4J0RirwToLWX/dAa5nTC2mkbzpbVnTTb06mFLp
-ZEo7uIRiucdqAFhQKN6zo0GdxRnTq+9SClFxLhiuJlG7AhnoQEVe63cyVdNcmQNs
-fkeZrOpWJvTz8tWBmhmhwgMmvUgSsJE9VGBgthyoU0W46y6sQv8/fkGz4d6ThXL1
-6BXs5VYnwyXH0q5N98XvDTOEz4u892/jdWIXVsgxipFMcnAI+Kq81w0n1leqthoK
-Fk3SN7U4Ui90TIxZGaNG/HIZTPwJWcbk/m9gLl+N8d1NYqzy4u4lnNYnZWca6WZ8
-nh4O/8qRXaXavKrASZvA1gmVGaA90C6rtK+zuVkU3g==
-
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibb1.hj.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibb1.hj.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://shibb1.hj.se/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibb1.hj.se/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibb1.hj.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibb1.hj.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">hj.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDGzCCAgOgAwIBAgIUB7TrKFw9b8VuoROWwTsp8hJE5oowDQYJKoZIhvcNAQEF
-BQAwFzEVMBMGA1UEAxMMc2hpYmIxLmhqLnNlMB4XDTA5MTAxMzA3MjcyNVoXDTI5
-MTAxMzA3MjcyNVowFzEVMBMGA1UEAxMMc2hpYmIxLmhqLnNlMIIBIjANBgkqhkiG
-9w0BAQEFAAOCAQ8AMIIBCgKCAQEAk5R5pnnBvG4o7SW4uekwfFNvAvGSAGUf9lOu
-f7ui6bIi2J0j4mIJXbeVdGsUbXCFUKwoJB9AfBfQm/9V3Szwxk5qHoTOFOH0Y0MS
-FCimnTUv4j2lIeab980784pyfDD2dBgMzsWmFra8JXg6Y66Ag3TXTYQOX1Bodr6W
-Lff27tYfoEiUqfL1WRE3KeH2EzVaTf53zHrMwlbAifB+jhdA7AIJw9gGpMuUpzB4
-sPR5tD/M/SUJPIz37YyGbmpI3pqGoabpvZ8bBWut4Z1EnUFtd7fIwt5UMbFc4i5/
-gUL3jKpDHO7mKfZq8BstcWkgzZ1x0HHRWZFFzfowQytvHea3ewIDAQABo18wXTA8
-BgNVHREENTAzggxzaGliYjEuaGouc2WGI2h0dHBzOi8vc2hpYmIxLmhqLnNlL2lk
-cC9zaGliYm9sZXRoMB0GA1UdDgQWBBS2nNJVvFq4dsSheCENArwBFmDmCzANBgkq
-hkiG9w0BAQUFAAOCAQEAEg326B4J0RirwToLWX/dAa5nTC2mkbzpbVnTTb06mFLp
-ZEo7uIRiucdqAFhQKN6zo0GdxRnTq+9SClFxLhiuJlG7AhnoQEVe63cyVdNcmQNs
-fkeZrOpWJvTz8tWBmhmhwgMmvUgSsJE9VGBgthyoU0W46y6sQv8/fkGz4d6ThXL1
-6BXs5VYnwyXH0q5N98XvDTOEz4u892/jdWIXVsgxipFMcnAI+Kq81w0n1leqthoK
-Fk3SN7U4Ui90TIxZGaNG/HIZTPwJWcbk/m9gLl+N8d1NYqzy4u4lnNYnZWca6WZ8
-nh4O/8qRXaXavKrASZvA1gmVGaA90C6rtK+zuVkU3g==
-
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibb1.hj.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibb1.hj.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">HJ</OrganizationName>
-    <OrganizationDisplayName xml:lang="sv">Högskolan i Jönköping</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">Jönköping University</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.hj.se</OrganizationURL>
-  </Organization>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
-    <Company>Jönköping University</Company>
-    <SurName>Joakim Danielsson</SurName>
-    <EmailAddress>Joakim.Danielsson@hj.se</EmailAddress>
-    <TelephoneNumber>+46 36 101116</TelephoneNumber>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
-    <Company>Jönköping University</Company>
-    <SurName>Stefan Kindh</SurName>
-    <EmailAddress>Stefan.Kindh@hj.se</EmailAddress>
-    <TelephoneNumber>+46 36 101170</TelephoneNumber>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
-    <Company>Jönköping University</Company>
-    <SurName>IT-Helpdesk</SurName>
-    <EmailAddress>helpdesk@hj.se</EmailAddress>
-    <TelephoneNumber>+46 36 101112</TelephoneNumber>
-  </ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibb1.hj.se.xml b/swamid-interfederations-2.0/shibb1.hj.se.xml
deleted file mode 100644
index 3dfba952..00000000
--- a/swamid-interfederations-2.0/shibb1.hj.se.xml
+++ /dev/null
@@ -1,122 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibb1.hj.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">hj.se</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="sv">Högskolan i Jönköping</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Jönköping University</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Identity Provider för anställda och studenter vid Högskolan i Jönköping.</mdui:Description>
-        <mdui:Description xml:lang="en">The Jönköping University Identity Provider is used by employees and students at the university.</mdui:Description>
-        <mdui:InformationURL xml:lang="sv">http://hj.se</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">http://hj.se/en.html</mdui:InformationURL>
-        <mdui:Logo height="77" width="299" xml:lang="sv">https://hj.se/webdav/images/system/gfx/logotype/hj-sv.png</mdui:Logo>
-        <mdui:Logo height="77" width="277" xml:lang="en">https://hj.se/webdav/images/system/gfx/logotype/hj-en.png</mdui:Logo>
-        <mdui:Keywords xml:lang="sv">hj hogskolan+i+jonkoping jonkoping+university</mdui:Keywords>
-        <mdui:Keywords xml:lang="en">hj hogskolan+i+jonkoping jonkoping+university</mdui:Keywords>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DomainHint>hj.se</mdui:DomainHint>
-        <mdui:GeolocationHint>geo:57.7783,14.1633</mdui:GeolocationHint>
-      </mdui:DiscoHints>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDGzCCAgOgAwIBAgIUB7TrKFw9b8VuoROWwTsp8hJE5oowDQYJKoZIhvcNAQEF
-BQAwFzEVMBMGA1UEAxMMc2hpYmIxLmhqLnNlMB4XDTA5MTAxMzA3MjcyNVoXDTI5
-MTAxMzA3MjcyNVowFzEVMBMGA1UEAxMMc2hpYmIxLmhqLnNlMIIBIjANBgkqhkiG
-9w0BAQEFAAOCAQ8AMIIBCgKCAQEAk5R5pnnBvG4o7SW4uekwfFNvAvGSAGUf9lOu
-f7ui6bIi2J0j4mIJXbeVdGsUbXCFUKwoJB9AfBfQm/9V3Szwxk5qHoTOFOH0Y0MS
-FCimnTUv4j2lIeab980784pyfDD2dBgMzsWmFra8JXg6Y66Ag3TXTYQOX1Bodr6W
-Lff27tYfoEiUqfL1WRE3KeH2EzVaTf53zHrMwlbAifB+jhdA7AIJw9gGpMuUpzB4
-sPR5tD/M/SUJPIz37YyGbmpI3pqGoabpvZ8bBWut4Z1EnUFtd7fIwt5UMbFc4i5/
-gUL3jKpDHO7mKfZq8BstcWkgzZ1x0HHRWZFFzfowQytvHea3ewIDAQABo18wXTA8
-BgNVHREENTAzggxzaGliYjEuaGouc2WGI2h0dHBzOi8vc2hpYmIxLmhqLnNlL2lk
-cC9zaGliYm9sZXRoMB0GA1UdDgQWBBS2nNJVvFq4dsSheCENArwBFmDmCzANBgkq
-hkiG9w0BAQUFAAOCAQEAEg326B4J0RirwToLWX/dAa5nTC2mkbzpbVnTTb06mFLp
-ZEo7uIRiucdqAFhQKN6zo0GdxRnTq+9SClFxLhiuJlG7AhnoQEVe63cyVdNcmQNs
-fkeZrOpWJvTz8tWBmhmhwgMmvUgSsJE9VGBgthyoU0W46y6sQv8/fkGz4d6ThXL1
-6BXs5VYnwyXH0q5N98XvDTOEz4u892/jdWIXVsgxipFMcnAI+Kq81w0n1leqthoK
-Fk3SN7U4Ui90TIxZGaNG/HIZTPwJWcbk/m9gLl+N8d1NYqzy4u4lnNYnZWca6WZ8
-nh4O/8qRXaXavKrASZvA1gmVGaA90C6rtK+zuVkU3g==
-
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibb1.hj.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibb1.hj.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://shibb1.hj.se/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibb1.hj.se/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibb1.hj.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibb1.hj.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">hj.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDGzCCAgOgAwIBAgIUB7TrKFw9b8VuoROWwTsp8hJE5oowDQYJKoZIhvcNAQEF
-BQAwFzEVMBMGA1UEAxMMc2hpYmIxLmhqLnNlMB4XDTA5MTAxMzA3MjcyNVoXDTI5
-MTAxMzA3MjcyNVowFzEVMBMGA1UEAxMMc2hpYmIxLmhqLnNlMIIBIjANBgkqhkiG
-9w0BAQEFAAOCAQ8AMIIBCgKCAQEAk5R5pnnBvG4o7SW4uekwfFNvAvGSAGUf9lOu
-f7ui6bIi2J0j4mIJXbeVdGsUbXCFUKwoJB9AfBfQm/9V3Szwxk5qHoTOFOH0Y0MS
-FCimnTUv4j2lIeab980784pyfDD2dBgMzsWmFra8JXg6Y66Ag3TXTYQOX1Bodr6W
-Lff27tYfoEiUqfL1WRE3KeH2EzVaTf53zHrMwlbAifB+jhdA7AIJw9gGpMuUpzB4
-sPR5tD/M/SUJPIz37YyGbmpI3pqGoabpvZ8bBWut4Z1EnUFtd7fIwt5UMbFc4i5/
-gUL3jKpDHO7mKfZq8BstcWkgzZ1x0HHRWZFFzfowQytvHea3ewIDAQABo18wXTA8
-BgNVHREENTAzggxzaGliYjEuaGouc2WGI2h0dHBzOi8vc2hpYmIxLmhqLnNlL2lk
-cC9zaGliYm9sZXRoMB0GA1UdDgQWBBS2nNJVvFq4dsSheCENArwBFmDmCzANBgkq
-hkiG9w0BAQUFAAOCAQEAEg326B4J0RirwToLWX/dAa5nTC2mkbzpbVnTTb06mFLp
-ZEo7uIRiucdqAFhQKN6zo0GdxRnTq+9SClFxLhiuJlG7AhnoQEVe63cyVdNcmQNs
-fkeZrOpWJvTz8tWBmhmhwgMmvUgSsJE9VGBgthyoU0W46y6sQv8/fkGz4d6ThXL1
-6BXs5VYnwyXH0q5N98XvDTOEz4u892/jdWIXVsgxipFMcnAI+Kq81w0n1leqthoK
-Fk3SN7U4Ui90TIxZGaNG/HIZTPwJWcbk/m9gLl+N8d1NYqzy4u4lnNYnZWca6WZ8
-nh4O/8qRXaXavKrASZvA1gmVGaA90C6rtK+zuVkU3g==
-
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibb1.hj.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibb1.hj.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">HJ</OrganizationName>
-    <OrganizationDisplayName xml:lang="sv">Högskolan i Jönköping</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">Jönköping University</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.hj.se</OrganizationURL>
-  </Organization>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
-    <Company>Jönköping University</Company>
-    <SurName>Joakim Danielsson</SurName>
-    <EmailAddress>Joakim.Danielsson@hj.se</EmailAddress>
-    <TelephoneNumber>+46 36 101116</TelephoneNumber>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
-    <Company>Jönköping University</Company>
-    <SurName>Stefan Kindh</SurName>
-    <EmailAddress>Stefan.Kindh@hj.se</EmailAddress>
-    <TelephoneNumber>+46 36 101170</TelephoneNumber>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
-    <Company>Jönköping University</Company>
-    <SurName>IT-Helpdesk</SurName>
-    <EmailAddress>helpdesk@hj.se</EmailAddress>
-    <TelephoneNumber>+46 36 101112</TelephoneNumber>
-  </ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibbo.ec-nantes.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/shibbo.ec-nantes.fr-idp-shibboleth.xml
deleted file mode 100644
index d1f6ba58..00000000
--- a/swamid-interfederations-2.0/shibbo.ec-nantes.fr-idp-shibboleth.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://shibbo.ec-nantes.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2009-07-08T10:59:42Z">
-      <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">ec-nantes.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">Ecole Centrale de Nantes</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDODCCAiCgAwIBAgIVAJo2ABzrdqEuYQPEMg3AUqxh974mMA0GCSqGSIb3DQEB
-BQUAMB4xHDAaBgNVBAMTE3NoaWJiby5lYy1uYW50ZXMuZnIwHhcNMDkwNjIzMTUy
-MzQ4WhcNMjkwNjIzMTUyMzQ4WjAeMRwwGgYDVQQDExNzaGliYm8uZWMtbmFudGVz
-LmZyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAkKdUKM4/DHJDjU4M
-wYoBAjsKU+LuXIELLk25O2l2qdHDvvXNli+i5dlCo87w+os/v7eUadHxCe+76G6b
-HiUuiMYVGuL1G27QA1AUOG1vAC0mbBIetw3ovME+LkiBwXQqTOlshYq7FaizifwX
-HGvn3qskkAHg29ZKvBsVyFka891bwvUAbiFjho+dwT/v+A4nXJWzv6vvsGw+u16m
-XhMyUpZjxGek9/7LpOjK+j9DNWn0wP9LAiEbLr3n7jguPLBBAC6f70U671Zdnf3R
-mBJkAYRe+YdpYuuVGA5/oIPZGcNb6VBYEH0wxgP+7BpiPoYUqVpiCsKc9FVuFKWG
-eZzi6wIDAQABo20wazBKBgNVHREEQzBBghNzaGliYm8uZWMtbmFudGVzLmZyhipo
-dHRwczovL3NoaWJiby5lYy1uYW50ZXMuZnIvaWRwL3NoaWJib2xldGgwHQYDVR0O
-BBYEFKJXfKXL/okbKTLodXy6vDPmJc8BMA0GCSqGSIb3DQEBBQUAA4IBAQBKmvA3
-m29NOTfsDcF2X2zSok+1L9aDG/EGK28kVuojf2hp3GQMpdjXQ/05CtqYtcNDNBOt
-2rcopaZQsIRdiaU/hcxT/6JUsacFrowdBbpkNxAAuZ9ZJGUwEosSL61TkX9oaaFP
-NCaSmFdeleFd7KVMhtOkDy5+BQC9tJyraO5MqPUm5Q0QwXQN84al67IlnhIg0sNc
-tuTqkhqTxNCAnLzSCtBB/QB36Ao/0hwAHxo6AbFVGQDd2BRhsqQpcApZpb1oDFEh
-bhRZNLT/IXdDvj9i4zhAYNSRRVQ1vmyZOCoyk8wHLcWSRnurt8bbK2V2DxI0TKZh
-+LPVwWXes1OQooJD
-					    </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://shibbo.ec-nantes.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibbo.ec-nantes.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibbo.ec-nantes.fr/idp/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Ecole Centrale de Nantes</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Ecole Centrale de Nantes</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <EmailAddress>cri-sys@ec-nantes.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibbo.ec-nantes.fr.xml b/swamid-interfederations-2.0/shibbo.ec-nantes.fr.xml
deleted file mode 100644
index d1f6ba58..00000000
--- a/swamid-interfederations-2.0/shibbo.ec-nantes.fr.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://shibbo.ec-nantes.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2009-07-08T10:59:42Z">
-      <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">ec-nantes.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">Ecole Centrale de Nantes</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDODCCAiCgAwIBAgIVAJo2ABzrdqEuYQPEMg3AUqxh974mMA0GCSqGSIb3DQEB
-BQUAMB4xHDAaBgNVBAMTE3NoaWJiby5lYy1uYW50ZXMuZnIwHhcNMDkwNjIzMTUy
-MzQ4WhcNMjkwNjIzMTUyMzQ4WjAeMRwwGgYDVQQDExNzaGliYm8uZWMtbmFudGVz
-LmZyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAkKdUKM4/DHJDjU4M
-wYoBAjsKU+LuXIELLk25O2l2qdHDvvXNli+i5dlCo87w+os/v7eUadHxCe+76G6b
-HiUuiMYVGuL1G27QA1AUOG1vAC0mbBIetw3ovME+LkiBwXQqTOlshYq7FaizifwX
-HGvn3qskkAHg29ZKvBsVyFka891bwvUAbiFjho+dwT/v+A4nXJWzv6vvsGw+u16m
-XhMyUpZjxGek9/7LpOjK+j9DNWn0wP9LAiEbLr3n7jguPLBBAC6f70U671Zdnf3R
-mBJkAYRe+YdpYuuVGA5/oIPZGcNb6VBYEH0wxgP+7BpiPoYUqVpiCsKc9FVuFKWG
-eZzi6wIDAQABo20wazBKBgNVHREEQzBBghNzaGliYm8uZWMtbmFudGVzLmZyhipo
-dHRwczovL3NoaWJiby5lYy1uYW50ZXMuZnIvaWRwL3NoaWJib2xldGgwHQYDVR0O
-BBYEFKJXfKXL/okbKTLodXy6vDPmJc8BMA0GCSqGSIb3DQEBBQUAA4IBAQBKmvA3
-m29NOTfsDcF2X2zSok+1L9aDG/EGK28kVuojf2hp3GQMpdjXQ/05CtqYtcNDNBOt
-2rcopaZQsIRdiaU/hcxT/6JUsacFrowdBbpkNxAAuZ9ZJGUwEosSL61TkX9oaaFP
-NCaSmFdeleFd7KVMhtOkDy5+BQC9tJyraO5MqPUm5Q0QwXQN84al67IlnhIg0sNc
-tuTqkhqTxNCAnLzSCtBB/QB36Ao/0hwAHxo6AbFVGQDd2BRhsqQpcApZpb1oDFEh
-bhRZNLT/IXdDvj9i4zhAYNSRRVQ1vmyZOCoyk8wHLcWSRnurt8bbK2V2DxI0TKZh
-+LPVwWXes1OQooJD
-					    </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://shibbo.ec-nantes.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibbo.ec-nantes.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibbo.ec-nantes.fr/idp/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Ecole Centrale de Nantes</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Ecole Centrale de Nantes</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <EmailAddress>cri-sys@ec-nantes.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibbo.emse.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/shibbo.emse.fr-idp-shibboleth.xml
deleted file mode 100644
index c8fe3453..00000000
--- a/swamid-interfederations-2.0/shibbo.emse.fr-idp-shibboleth.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibbo.emse.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2011-02-24T19:45:08Z">
-      <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">emse.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">Ecole des Mines de Saint-Etienne</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDIzCCAgugAwIBAgIUWG4OdOHMXs/jWUMbrVKK/qGFpQgwDQYJKoZIhvcNAQEF
-BQAwGTEXMBUGA1UEAxMOc2hpYmJvLmVtc2UuZnIwHhcNMTEwMTI1MTUxOTAzWhcN
-MzEwMTI1MTUxOTAzWjAZMRcwFQYDVQQDEw5zaGliYm8uZW1zZS5mcjCCASIwDQYJ
-KoZIhvcNAQEBBQADggEPADCCAQoCggEBAIcRRG3bC6uPGH2dcbNjJvqCvFfy3P3p
-joVSK2SVXe1rqJ/mV0PBzyAi0grECmHoCoM8p5wg6IxdOTVrtnXEf4Wfg70bMGQY
-B/3BA5mXlO5gn9sJD/xx89b+vEJdIjAo8XHLjeLXlM5Om9f69jIxgr8RvmDHFl3E
-DzeCiNLURAB10ZgwwMjukIyPoFg7Hp77NH85/hni4yG1/7e82i1eKir4IGujDk3y
-UCc3TIPxLFYEBccoupZ6NfYn7LHgeJOHZktkNjSISyU7ZWlk7xBKrYijTbZmfWBm
-QxKaaAm/vhj7JgxVUdlgickTgyUZ4wptyHENPK6CLstOEU7eZVksgE0CAwEAAaNj
-MGEwQAYDVR0RBDkwN4IOc2hpYmJvLmVtc2UuZnKGJWh0dHBzOi8vc2hpYmJvLmVt
-c2UuZnIvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFIeWYn8hGuMdpEWP1VMxfDVP
-VoIhMA0GCSqGSIb3DQEBBQUAA4IBAQBhsFzDv5g8+KI9HPYtus470fLWG6QeoPJS
-okvD3oKa25+3hfen1fUgNEg4mLmcKG1+y/Ej9u6UiJrjZeo/iHIu3VSh9KClDAal
-BRbo30th1KQ122Nhkz1Hzt0MuVprMJbVzNo3jRfTw6iFtadaVPyC1koEvn5FucTD
-bpyOZ6qLHkuuEPoYgtyn0h/mFudb/XGDD8exhidz7CkuO6IWfT/HB9RC4nf7IAHW
-060v4YqkJ/y5F87gyOTwsLlNA1vWuJ4L90/fgzhJ15sp3l38Dr8XPnaegFYRVyAM
-mG4EGyP6qUE1uSrPxMk9GFtp+QkIXdDDGi5u9iIkLzHPYUMB4IfI
-					    </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://shibbo.emse.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibbo.emse.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibbo.emse.fr/idp/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Ecole des Mines de Saint-Etienne</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Ecole des Mines de Saint-Etienne</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <EmailAddress>dsi-admin@emse.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibbo.emse.fr.xml b/swamid-interfederations-2.0/shibbo.emse.fr.xml
deleted file mode 100644
index c8fe3453..00000000
--- a/swamid-interfederations-2.0/shibbo.emse.fr.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibbo.emse.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2011-02-24T19:45:08Z">
-      <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">emse.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">Ecole des Mines de Saint-Etienne</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDIzCCAgugAwIBAgIUWG4OdOHMXs/jWUMbrVKK/qGFpQgwDQYJKoZIhvcNAQEF
-BQAwGTEXMBUGA1UEAxMOc2hpYmJvLmVtc2UuZnIwHhcNMTEwMTI1MTUxOTAzWhcN
-MzEwMTI1MTUxOTAzWjAZMRcwFQYDVQQDEw5zaGliYm8uZW1zZS5mcjCCASIwDQYJ
-KoZIhvcNAQEBBQADggEPADCCAQoCggEBAIcRRG3bC6uPGH2dcbNjJvqCvFfy3P3p
-joVSK2SVXe1rqJ/mV0PBzyAi0grECmHoCoM8p5wg6IxdOTVrtnXEf4Wfg70bMGQY
-B/3BA5mXlO5gn9sJD/xx89b+vEJdIjAo8XHLjeLXlM5Om9f69jIxgr8RvmDHFl3E
-DzeCiNLURAB10ZgwwMjukIyPoFg7Hp77NH85/hni4yG1/7e82i1eKir4IGujDk3y
-UCc3TIPxLFYEBccoupZ6NfYn7LHgeJOHZktkNjSISyU7ZWlk7xBKrYijTbZmfWBm
-QxKaaAm/vhj7JgxVUdlgickTgyUZ4wptyHENPK6CLstOEU7eZVksgE0CAwEAAaNj
-MGEwQAYDVR0RBDkwN4IOc2hpYmJvLmVtc2UuZnKGJWh0dHBzOi8vc2hpYmJvLmVt
-c2UuZnIvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFIeWYn8hGuMdpEWP1VMxfDVP
-VoIhMA0GCSqGSIb3DQEBBQUAA4IBAQBhsFzDv5g8+KI9HPYtus470fLWG6QeoPJS
-okvD3oKa25+3hfen1fUgNEg4mLmcKG1+y/Ej9u6UiJrjZeo/iHIu3VSh9KClDAal
-BRbo30th1KQ122Nhkz1Hzt0MuVprMJbVzNo3jRfTw6iFtadaVPyC1koEvn5FucTD
-bpyOZ6qLHkuuEPoYgtyn0h/mFudb/XGDD8exhidz7CkuO6IWfT/HB9RC4nf7IAHW
-060v4YqkJ/y5F87gyOTwsLlNA1vWuJ4L90/fgzhJ15sp3l38Dr8XPnaegFYRVyAM
-mG4EGyP6qUE1uSrPxMk9GFtp+QkIXdDDGi5u9iIkLzHPYUMB4IfI
-					    </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://shibbo.emse.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibbo.emse.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibbo.emse.fr/idp/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Ecole des Mines de Saint-Etienne</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Ecole des Mines de Saint-Etienne</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <EmailAddress>dsi-admin@emse.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibbo.enise.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/shibbo.enise.fr-idp-shibboleth.xml
deleted file mode 100644
index b63a80a1..00000000
--- a/swamid-interfederations-2.0/shibbo.enise.fr-idp-shibboleth.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibbo.enise.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2011-06-09T10:47:49Z">
-      <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">enise.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">ENISE</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDKDCCAhCgAwIBAgIVAKRfdU8KUsLMr6sENGNF8GhmyStGMA0GCSqGSIb3DQEB
-BQUAMBoxGDAWBgNVBAMTD3NoaWJiby5lbmlzZS5mcjAeFw0xMTA1MjcwOTIxNTZa
-Fw0zMTA1MjcwOTIxNTZaMBoxGDAWBgNVBAMTD3NoaWJiby5lbmlzZS5mcjCCASIw
-DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALvfzNxgnq/k6QzZmj7igMSW1qoa
-F1Ca593Y6+Ry+ITmjSE8hg91Y6DaSLgfVxiVPRllOLnpeZSdS9/Njq6yfUKKSKOv
-RLWUFiaNqob9Bgx3GSIZAahkmmoc0luCLY0DSK1bRzyhYUAZDe9c9diY7ljke4a2
-4jdUQZJt2T2VPQgh8Zhs97cS7r971agIob8QWyuwXNR7soWTIz7Q4ovHCOX+2jln
-g+KoMxRhXfepOmO/knp5oRnXDgVgTYpeLcUogYvn6ZUQVt0t5zsqd4I6STvS/dss
-EaTN8OY6DTHxifn3+etPf113awDeASDFukJvWkkZdyL2fSIORFIsOlRYN48CAwEA
-AaNlMGMwQgYDVR0RBDswOYIPc2hpYmJvLmVuaXNlLmZyhiZodHRwczovL3NoaWJi
-by5lbmlzZS5mci9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUOnQUAUQSlpsPV4GZ
-bvoXVPrHAIAwDQYJKoZIhvcNAQEFBQADggEBAIdboPwyqZpsWeFhof+pAG78na8I
-iy+DO6p9S4JvkXn0vqozLDaFIg3KVep+0sNstXNaVDafWmbzJRxTWUUmNoVkOBbE
-mi41vE+3dxoAltau1ybtHb6/0m9LzR3FRihAVyPa4FbzqdViXv5S5OFVak6+Dqi1
-S7B6tOHfCbl2dH4soGpfxa7lhqH8xu3JzJKOi+CHBL8q5zxzbiU2Q417gLeswhQ5
-+5cw3Bhz4p5olulTzUsIa1wfae+tSM7YemTCaR1VEKM3JvwHIbMKMeOuL8BCo6o5
-6GIWvBQQJOEbInHSvCFd41vN8us0nDsiislr1Bp26bXXME6ZX7MYct6LQgk=
-					    </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://shibbo.enise.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibbo.enise.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibbo.enise.fr/idp/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">ENISE</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">ENISE</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Guy Dantony</SurName>
-    <EmailAddress>dantony@enise.fr</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <SurName>Benoit Berson</SurName>
-    <EmailAddress>berson@enise.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibbo.enise.fr.xml b/swamid-interfederations-2.0/shibbo.enise.fr.xml
deleted file mode 100644
index b63a80a1..00000000
--- a/swamid-interfederations-2.0/shibbo.enise.fr.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibbo.enise.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2011-06-09T10:47:49Z">
-      <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">enise.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">ENISE</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDKDCCAhCgAwIBAgIVAKRfdU8KUsLMr6sENGNF8GhmyStGMA0GCSqGSIb3DQEB
-BQUAMBoxGDAWBgNVBAMTD3NoaWJiby5lbmlzZS5mcjAeFw0xMTA1MjcwOTIxNTZa
-Fw0zMTA1MjcwOTIxNTZaMBoxGDAWBgNVBAMTD3NoaWJiby5lbmlzZS5mcjCCASIw
-DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALvfzNxgnq/k6QzZmj7igMSW1qoa
-F1Ca593Y6+Ry+ITmjSE8hg91Y6DaSLgfVxiVPRllOLnpeZSdS9/Njq6yfUKKSKOv
-RLWUFiaNqob9Bgx3GSIZAahkmmoc0luCLY0DSK1bRzyhYUAZDe9c9diY7ljke4a2
-4jdUQZJt2T2VPQgh8Zhs97cS7r971agIob8QWyuwXNR7soWTIz7Q4ovHCOX+2jln
-g+KoMxRhXfepOmO/knp5oRnXDgVgTYpeLcUogYvn6ZUQVt0t5zsqd4I6STvS/dss
-EaTN8OY6DTHxifn3+etPf113awDeASDFukJvWkkZdyL2fSIORFIsOlRYN48CAwEA
-AaNlMGMwQgYDVR0RBDswOYIPc2hpYmJvLmVuaXNlLmZyhiZodHRwczovL3NoaWJi
-by5lbmlzZS5mci9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUOnQUAUQSlpsPV4GZ
-bvoXVPrHAIAwDQYJKoZIhvcNAQEFBQADggEBAIdboPwyqZpsWeFhof+pAG78na8I
-iy+DO6p9S4JvkXn0vqozLDaFIg3KVep+0sNstXNaVDafWmbzJRxTWUUmNoVkOBbE
-mi41vE+3dxoAltau1ybtHb6/0m9LzR3FRihAVyPa4FbzqdViXv5S5OFVak6+Dqi1
-S7B6tOHfCbl2dH4soGpfxa7lhqH8xu3JzJKOi+CHBL8q5zxzbiU2Q417gLeswhQ5
-+5cw3Bhz4p5olulTzUsIa1wfae+tSM7YemTCaR1VEKM3JvwHIbMKMeOuL8BCo6o5
-6GIWvBQQJOEbInHSvCFd41vN8us0nDsiislr1Bp26bXXME6ZX7MYct6LQgk=
-					    </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://shibbo.enise.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibbo.enise.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibbo.enise.fr/idp/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">ENISE</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">ENISE</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Guy Dantony</SurName>
-    <EmailAddress>dantony@enise.fr</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <SurName>Benoit Berson</SurName>
-    <EmailAddress>berson@enise.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibbo.ephe.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/shibbo.ephe.fr-idp-shibboleth.xml
deleted file mode 100644
index 1982a323..00000000
--- a/swamid-interfederations-2.0/shibbo.ephe.fr-idp-shibboleth.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibbo.ephe.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2014-05-19T13:42:23Z">
-      <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">ephe.sorbonne.fr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">etu.ephe.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">EPHE - Ecole Pratique des Hautes Etudes</mdui:DisplayName>
-        <mdui:Description xml:lang="en">EPHE - Ecole Pratique des Hautes Etudes</mdui:Description>
-        <mdui:DisplayName xml:lang="fr">EPHE - Ecole Pratique des Hautes Etudes</mdui:DisplayName>
-        <mdui:Description xml:lang="fr">Administratifs , enseignants chercheurs et étudiants EPHE.</mdui:Description>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDJDCCAgygAwIBAgIVANOJEmB/RSq08vn3PcA/H7ukbajAMA0GCSqGSIb3DQEB
-BQUAMBkxFzAVBgNVBAMTDnNoaWJiby5lcGhlLmZyMB4XDTE0MDUxOTA4MjI1N1oX
-DTM0MDUxOTA4MjI1N1owGTEXMBUGA1UEAxMOc2hpYmJvLmVwaGUuZnIwggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDI4+IJOGa+cmOpJD8q9VeYqvP8ZaRA
-+JmrK6SnW22qtxoxIDaVjCb8OCcrDWewdw7q6jjUsmj8nAgmV2PLGNn1RbWjWvZN
-xI/bmfa3X9EEILm644BiV2c0riLWxo0/b8tlhYQ9ys4py4zlFlrWSkhFo2Lr5i6o
-9Qrd9dHVV22TV8Gj1sKWzCx1Rf0xRENYN0AUUafOrO5P0ixBAzOq3VDs32j/xrZm
-kxv9a9h3/z3WAucP5Xrip52iuQMBFpoPV6Jg9DWUz5PF7M6Fhy7hXM+Chf/wZDmN
-aaBvi/cqo5QXvuaig+Ru4+tjRJyKkre9s5tkb7PQlFCJLmBM5ltSi+zdAgMBAAGj
-YzBhMEAGA1UdEQQ5MDeCDnNoaWJiby5lcGhlLmZyhiVodHRwczovL3NoaWJiby5l
-cGhlLmZyL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBQi9BRR9wUI7SW85gyPxGtF
-0XBsHjANBgkqhkiG9w0BAQUFAAOCAQEAe5Mt6cKdJvYGUZchEK2KmteKL0On1KgS
-LjYx0IY8cQodPkKgPmk2+Y/ykaacjLFl+nPaklEiOVtFrGYxYLa0FngNfyOFrRGi
-bjbOwp1K3V2q3i5Ai2k7FiOSvIuFAXK4KrIW7UQVlYz3K/m6owj1O9B0+IIG+HYG
-0IBMSERU/HEGxDpkNT0UD9IzEsPzQN2Cee2EzIZRO1VYtdga9AtzLcpuTe/EVo92
-3KvObCZRk1aMAA6yTWAsBcVbaHueSvl2K2zW0HhXo8JvWz+LRRQRjTOagvBJoK1q
-hq79XpeV3MhLDgRkfc7tH1jHHeyUZUrOtcPvPmbLRySPxSB7WBtOqA==
-					    </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://shibbo.ephe.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibbo.ephe.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibbo.ephe.fr/idp/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">EPHE - Ecole Pratique des Hautes Etudes</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">EPHE - Ecole Pratique des Hautes Etudes</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <EmailAddress>interv@ephe.sorbonne.Fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibbo.ephe.fr.xml b/swamid-interfederations-2.0/shibbo.ephe.fr.xml
deleted file mode 100644
index 1982a323..00000000
--- a/swamid-interfederations-2.0/shibbo.ephe.fr.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibbo.ephe.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2014-05-19T13:42:23Z">
-      <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">ephe.sorbonne.fr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">etu.ephe.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">EPHE - Ecole Pratique des Hautes Etudes</mdui:DisplayName>
-        <mdui:Description xml:lang="en">EPHE - Ecole Pratique des Hautes Etudes</mdui:Description>
-        <mdui:DisplayName xml:lang="fr">EPHE - Ecole Pratique des Hautes Etudes</mdui:DisplayName>
-        <mdui:Description xml:lang="fr">Administratifs , enseignants chercheurs et étudiants EPHE.</mdui:Description>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDJDCCAgygAwIBAgIVANOJEmB/RSq08vn3PcA/H7ukbajAMA0GCSqGSIb3DQEB
-BQUAMBkxFzAVBgNVBAMTDnNoaWJiby5lcGhlLmZyMB4XDTE0MDUxOTA4MjI1N1oX
-DTM0MDUxOTA4MjI1N1owGTEXMBUGA1UEAxMOc2hpYmJvLmVwaGUuZnIwggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDI4+IJOGa+cmOpJD8q9VeYqvP8ZaRA
-+JmrK6SnW22qtxoxIDaVjCb8OCcrDWewdw7q6jjUsmj8nAgmV2PLGNn1RbWjWvZN
-xI/bmfa3X9EEILm644BiV2c0riLWxo0/b8tlhYQ9ys4py4zlFlrWSkhFo2Lr5i6o
-9Qrd9dHVV22TV8Gj1sKWzCx1Rf0xRENYN0AUUafOrO5P0ixBAzOq3VDs32j/xrZm
-kxv9a9h3/z3WAucP5Xrip52iuQMBFpoPV6Jg9DWUz5PF7M6Fhy7hXM+Chf/wZDmN
-aaBvi/cqo5QXvuaig+Ru4+tjRJyKkre9s5tkb7PQlFCJLmBM5ltSi+zdAgMBAAGj
-YzBhMEAGA1UdEQQ5MDeCDnNoaWJiby5lcGhlLmZyhiVodHRwczovL3NoaWJiby5l
-cGhlLmZyL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBQi9BRR9wUI7SW85gyPxGtF
-0XBsHjANBgkqhkiG9w0BAQUFAAOCAQEAe5Mt6cKdJvYGUZchEK2KmteKL0On1KgS
-LjYx0IY8cQodPkKgPmk2+Y/ykaacjLFl+nPaklEiOVtFrGYxYLa0FngNfyOFrRGi
-bjbOwp1K3V2q3i5Ai2k7FiOSvIuFAXK4KrIW7UQVlYz3K/m6owj1O9B0+IIG+HYG
-0IBMSERU/HEGxDpkNT0UD9IzEsPzQN2Cee2EzIZRO1VYtdga9AtzLcpuTe/EVo92
-3KvObCZRk1aMAA6yTWAsBcVbaHueSvl2K2zW0HhXo8JvWz+LRRQRjTOagvBJoK1q
-hq79XpeV3MhLDgRkfc7tH1jHHeyUZUrOtcPvPmbLRySPxSB7WBtOqA==
-					    </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://shibbo.ephe.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibbo.ephe.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibbo.ephe.fr/idp/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">EPHE - Ecole Pratique des Hautes Etudes</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">EPHE - Ecole Pratique des Hautes Etudes</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <EmailAddress>interv@ephe.sorbonne.Fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibbo.ltu.se-idp-shibboleth.xml b/swamid-interfederations-2.0/shibbo.ltu.se-idp-shibboleth.xml
deleted file mode 100644
index e2ee06e5..00000000
--- a/swamid-interfederations-2.0/shibbo.ltu.se-idp-shibboleth.xml
+++ /dev/null
@@ -1,120 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibbo.ltu.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">ltu.se</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="sv">Luleå tekniska universitet</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Lulea University of Technology</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Identity Provider för Luleå tekniska universitet</mdui:Description>
-        <mdui:Description xml:lang="en">Identity Provider for Lulea University of Technology</mdui:Description>
-        <mdui:InformationURL xml:lang="sv">http://www.ltu.se</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">http://www.ltu.se/?l=en</mdui:InformationURL>
-        <mdui:Keywords xml:lang="sv">LTU lulea+tekniska+universitet lulea+university+of+technology</mdui:Keywords>
-        <mdui:Keywords xml:lang="en">LTU lulea+tekniska+universitet lulea+university+of+technology</mdui:Keywords>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DomainHint>ltu.se</mdui:DomainHint>
-        <mdui:IPHint>130.240.0.0/16</mdui:IPHint>
-      </mdui:DiscoHints>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDHzCCAgegAwIBAgIUP6+KvKtryxxdtAf12hYO26nsSrMwDQYJKoZIhvcNAQEF
-BQAwGDEWMBQGA1UEAxMNc2hpYmJvLmx0dS5zZTAeFw0wOTEwMjcxMTUyMDNaFw0y
-OTEwMjcxMDUyMDNaMBgxFjAUBgNVBAMTDXNoaWJiby5sdHUuc2UwggEiMA0GCSqG
-SIb3DQEBAQUAA4IBDwAwggEKAoIBAQCZNYF4pQz13p+ghYGwBZFa/IjzXgLxpM4n
-KJ15+pCqabsxo3VJsnXgnu0monCvx7qFC+1HVfMHAj795wdq0yywGvuUiMI4ncCj
-GWi2ED3VZaZr+mpr+UW2OScWawvli/oN8vs/P1G59ykgEjtRWQ+4ndHumuHXWh7e
-3uUZA+1t/iV6EaIyaIIyDx//83skBEWDIgqZb/IVAGOFh1BUWqZBR2m6PG6ryLX/
-2opHozlbvMlWSZ1RqCmjEuCUCcgm93CS4saGZZmNt1qnt87vDY1V49Iwjin9ORr0
-PX6Ls8lUc4OWWYu+UZlOr6RTi8ravy0OOWnOJiLNnGlhgpI1MXW9AgMBAAGjYTBf
-MD4GA1UdEQQ3MDWCDXNoaWJiby5sdHUuc2WGJGh0dHBzOi8vc2hpYmJvLmx0dS5z
-ZS9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQU+e389gsAkX7kVDwQ360GaU31H50w
-DQYJKoZIhvcNAQEFBQADggEBAAO2nuaLdYOmmj2HaMe7mwRBP7T6zcmSD/HGQ3Wu
-3jqMh2Iws2OW07P+TH9I64Ok/7nzud9ZphqkR71Isq7WiFRMa90dI9PSjVuf2Bp7
-ia0JP50WEAWHivmopL7eCeBWwF06zb5XpVWmsydlIizO6akOvK1vZEsWMBlDvu7h
-iY+1cCt6dGBggGgMiiTLb5MtHZEgS2AEFgT0SXMX/xZS46mb71eFoEt+F0UlQMip
-w0QVWkaY5DYbQq2Jq2x2hb2Ge38Rcrn05ebHraDuNsyKkiJqNIA0/+BSSDzHZIEA
-B2BEejurB8CAdtQkwfCKCSFl7spaJzSGPq/dt4yO4qSslJA=
-
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibbo.ltu.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibbo.ltu.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://shibbo.ltu.se/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibbo.ltu.se/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibbo.ltu.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibbo.ltu.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">ltu.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDHzCCAgegAwIBAgIUP6+KvKtryxxdtAf12hYO26nsSrMwDQYJKoZIhvcNAQEF
-BQAwGDEWMBQGA1UEAxMNc2hpYmJvLmx0dS5zZTAeFw0wOTEwMjcxMTUyMDNaFw0y
-OTEwMjcxMDUyMDNaMBgxFjAUBgNVBAMTDXNoaWJiby5sdHUuc2UwggEiMA0GCSqG
-SIb3DQEBAQUAA4IBDwAwggEKAoIBAQCZNYF4pQz13p+ghYGwBZFa/IjzXgLxpM4n
-KJ15+pCqabsxo3VJsnXgnu0monCvx7qFC+1HVfMHAj795wdq0yywGvuUiMI4ncCj
-GWi2ED3VZaZr+mpr+UW2OScWawvli/oN8vs/P1G59ykgEjtRWQ+4ndHumuHXWh7e
-3uUZA+1t/iV6EaIyaIIyDx//83skBEWDIgqZb/IVAGOFh1BUWqZBR2m6PG6ryLX/
-2opHozlbvMlWSZ1RqCmjEuCUCcgm93CS4saGZZmNt1qnt87vDY1V49Iwjin9ORr0
-PX6Ls8lUc4OWWYu+UZlOr6RTi8ravy0OOWnOJiLNnGlhgpI1MXW9AgMBAAGjYTBf
-MD4GA1UdEQQ3MDWCDXNoaWJiby5sdHUuc2WGJGh0dHBzOi8vc2hpYmJvLmx0dS5z
-ZS9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQU+e389gsAkX7kVDwQ360GaU31H50w
-DQYJKoZIhvcNAQEFBQADggEBAAO2nuaLdYOmmj2HaMe7mwRBP7T6zcmSD/HGQ3Wu
-3jqMh2Iws2OW07P+TH9I64Ok/7nzud9ZphqkR71Isq7WiFRMa90dI9PSjVuf2Bp7
-ia0JP50WEAWHivmopL7eCeBWwF06zb5XpVWmsydlIizO6akOvK1vZEsWMBlDvu7h
-iY+1cCt6dGBggGgMiiTLb5MtHZEgS2AEFgT0SXMX/xZS46mb71eFoEt+F0UlQMip
-w0QVWkaY5DYbQq2Jq2x2hb2Ge38Rcrn05ebHraDuNsyKkiJqNIA0/+BSSDzHZIEA
-B2BEejurB8CAdtQkwfCKCSFl7spaJzSGPq/dt4yO4qSslJA=
-
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibbo.ltu.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibbo.ltu.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">LTU</OrganizationName>
-    <OrganizationDisplayName xml:lang="sv">Luleå Tekniska Universitet</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">Luleå Tekniska Universitet</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.ltu.se</OrganizationURL>
-  </Organization>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
-    <Company>Lulea University of Technology</Company>
-    <SurName>LTU Servicedesk</SurName>
-    <EmailAddress>its-idp@list.ltu.se</EmailAddress>
-    <TelephoneNumber>+46 920 491664</TelephoneNumber>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
-    <Company>Lulea University of Technology</Company>
-    <SurName>LTU Servicedesk</SurName>
-    <EmailAddress>its-idp@list.ltu.se</EmailAddress>
-    <TelephoneNumber>+46 920 491664</TelephoneNumber>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
-    <Company>Lulea University of Technology</Company>
-    <SurName>LTU Servicedesk</SurName>
-    <EmailAddress>its-idp@list.ltu.se</EmailAddress>
-    <TelephoneNumber>+46 920 491664</TelephoneNumber>
-  </ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibbo.ltu.se.xml b/swamid-interfederations-2.0/shibbo.ltu.se.xml
deleted file mode 100644
index e2ee06e5..00000000
--- a/swamid-interfederations-2.0/shibbo.ltu.se.xml
+++ /dev/null
@@ -1,120 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibbo.ltu.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">ltu.se</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="sv">Luleå tekniska universitet</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Lulea University of Technology</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Identity Provider för Luleå tekniska universitet</mdui:Description>
-        <mdui:Description xml:lang="en">Identity Provider for Lulea University of Technology</mdui:Description>
-        <mdui:InformationURL xml:lang="sv">http://www.ltu.se</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">http://www.ltu.se/?l=en</mdui:InformationURL>
-        <mdui:Keywords xml:lang="sv">LTU lulea+tekniska+universitet lulea+university+of+technology</mdui:Keywords>
-        <mdui:Keywords xml:lang="en">LTU lulea+tekniska+universitet lulea+university+of+technology</mdui:Keywords>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DomainHint>ltu.se</mdui:DomainHint>
-        <mdui:IPHint>130.240.0.0/16</mdui:IPHint>
-      </mdui:DiscoHints>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDHzCCAgegAwIBAgIUP6+KvKtryxxdtAf12hYO26nsSrMwDQYJKoZIhvcNAQEF
-BQAwGDEWMBQGA1UEAxMNc2hpYmJvLmx0dS5zZTAeFw0wOTEwMjcxMTUyMDNaFw0y
-OTEwMjcxMDUyMDNaMBgxFjAUBgNVBAMTDXNoaWJiby5sdHUuc2UwggEiMA0GCSqG
-SIb3DQEBAQUAA4IBDwAwggEKAoIBAQCZNYF4pQz13p+ghYGwBZFa/IjzXgLxpM4n
-KJ15+pCqabsxo3VJsnXgnu0monCvx7qFC+1HVfMHAj795wdq0yywGvuUiMI4ncCj
-GWi2ED3VZaZr+mpr+UW2OScWawvli/oN8vs/P1G59ykgEjtRWQ+4ndHumuHXWh7e
-3uUZA+1t/iV6EaIyaIIyDx//83skBEWDIgqZb/IVAGOFh1BUWqZBR2m6PG6ryLX/
-2opHozlbvMlWSZ1RqCmjEuCUCcgm93CS4saGZZmNt1qnt87vDY1V49Iwjin9ORr0
-PX6Ls8lUc4OWWYu+UZlOr6RTi8ravy0OOWnOJiLNnGlhgpI1MXW9AgMBAAGjYTBf
-MD4GA1UdEQQ3MDWCDXNoaWJiby5sdHUuc2WGJGh0dHBzOi8vc2hpYmJvLmx0dS5z
-ZS9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQU+e389gsAkX7kVDwQ360GaU31H50w
-DQYJKoZIhvcNAQEFBQADggEBAAO2nuaLdYOmmj2HaMe7mwRBP7T6zcmSD/HGQ3Wu
-3jqMh2Iws2OW07P+TH9I64Ok/7nzud9ZphqkR71Isq7WiFRMa90dI9PSjVuf2Bp7
-ia0JP50WEAWHivmopL7eCeBWwF06zb5XpVWmsydlIizO6akOvK1vZEsWMBlDvu7h
-iY+1cCt6dGBggGgMiiTLb5MtHZEgS2AEFgT0SXMX/xZS46mb71eFoEt+F0UlQMip
-w0QVWkaY5DYbQq2Jq2x2hb2Ge38Rcrn05ebHraDuNsyKkiJqNIA0/+BSSDzHZIEA
-B2BEejurB8CAdtQkwfCKCSFl7spaJzSGPq/dt4yO4qSslJA=
-
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibbo.ltu.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibbo.ltu.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://shibbo.ltu.se/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibbo.ltu.se/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibbo.ltu.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibbo.ltu.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">ltu.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDHzCCAgegAwIBAgIUP6+KvKtryxxdtAf12hYO26nsSrMwDQYJKoZIhvcNAQEF
-BQAwGDEWMBQGA1UEAxMNc2hpYmJvLmx0dS5zZTAeFw0wOTEwMjcxMTUyMDNaFw0y
-OTEwMjcxMDUyMDNaMBgxFjAUBgNVBAMTDXNoaWJiby5sdHUuc2UwggEiMA0GCSqG
-SIb3DQEBAQUAA4IBDwAwggEKAoIBAQCZNYF4pQz13p+ghYGwBZFa/IjzXgLxpM4n
-KJ15+pCqabsxo3VJsnXgnu0monCvx7qFC+1HVfMHAj795wdq0yywGvuUiMI4ncCj
-GWi2ED3VZaZr+mpr+UW2OScWawvli/oN8vs/P1G59ykgEjtRWQ+4ndHumuHXWh7e
-3uUZA+1t/iV6EaIyaIIyDx//83skBEWDIgqZb/IVAGOFh1BUWqZBR2m6PG6ryLX/
-2opHozlbvMlWSZ1RqCmjEuCUCcgm93CS4saGZZmNt1qnt87vDY1V49Iwjin9ORr0
-PX6Ls8lUc4OWWYu+UZlOr6RTi8ravy0OOWnOJiLNnGlhgpI1MXW9AgMBAAGjYTBf
-MD4GA1UdEQQ3MDWCDXNoaWJiby5sdHUuc2WGJGh0dHBzOi8vc2hpYmJvLmx0dS5z
-ZS9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQU+e389gsAkX7kVDwQ360GaU31H50w
-DQYJKoZIhvcNAQEFBQADggEBAAO2nuaLdYOmmj2HaMe7mwRBP7T6zcmSD/HGQ3Wu
-3jqMh2Iws2OW07P+TH9I64Ok/7nzud9ZphqkR71Isq7WiFRMa90dI9PSjVuf2Bp7
-ia0JP50WEAWHivmopL7eCeBWwF06zb5XpVWmsydlIizO6akOvK1vZEsWMBlDvu7h
-iY+1cCt6dGBggGgMiiTLb5MtHZEgS2AEFgT0SXMX/xZS46mb71eFoEt+F0UlQMip
-w0QVWkaY5DYbQq2Jq2x2hb2Ge38Rcrn05ebHraDuNsyKkiJqNIA0/+BSSDzHZIEA
-B2BEejurB8CAdtQkwfCKCSFl7spaJzSGPq/dt4yO4qSslJA=
-
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibbo.ltu.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibbo.ltu.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">LTU</OrganizationName>
-    <OrganizationDisplayName xml:lang="sv">Luleå Tekniska Universitet</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">Luleå Tekniska Universitet</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.ltu.se</OrganizationURL>
-  </Organization>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
-    <Company>Lulea University of Technology</Company>
-    <SurName>LTU Servicedesk</SurName>
-    <EmailAddress>its-idp@list.ltu.se</EmailAddress>
-    <TelephoneNumber>+46 920 491664</TelephoneNumber>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
-    <Company>Lulea University of Technology</Company>
-    <SurName>LTU Servicedesk</SurName>
-    <EmailAddress>its-idp@list.ltu.se</EmailAddress>
-    <TelephoneNumber>+46 920 491664</TelephoneNumber>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
-    <Company>Lulea University of Technology</Company>
-    <SurName>LTU Servicedesk</SurName>
-    <EmailAddress>its-idp@list.ltu.se</EmailAddress>
-    <TelephoneNumber>+46 920 491664</TelephoneNumber>
-  </ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibbo.tul.cz-idp-shibboleth.xml b/swamid-interfederations-2.0/shibbo.tul.cz-idp-shibboleth.xml
deleted file mode 100644
index 8649b592..00000000
--- a/swamid-interfederations-2.0/shibbo.tul.cz-idp-shibboleth.xml
+++ /dev/null
@@ -1,134 +0,0 @@
-<?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">
-  <md:Extensions xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata">
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/" registrationInstant="2010-09-20T11:45:42Z">
-      <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>
-    <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://eduid.cz/uri/idp-group/university</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md: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/shibbo.tul.cz.xml b/swamid-interfederations-2.0/shibbo.tul.cz.xml
deleted file mode 100644
index 8649b592..00000000
--- a/swamid-interfederations-2.0/shibbo.tul.cz.xml
+++ /dev/null
@@ -1,134 +0,0 @@
-<?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">
-  <md:Extensions xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata">
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/" registrationInstant="2010-09-20T11:45:42Z">
-      <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>
-    <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://eduid.cz/uri/idp-group/university</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md: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.dti.ufv.br-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth-idp.dti.ufv.br-idp-shibboleth.xml
deleted file mode 100644
index bdd723d3..00000000
--- a/swamid-interfederations-2.0/shibboleth-idp.dti.ufv.br-idp-shibboleth.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-idp.dti.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>
-    MIIEKDCCAxACAQAwDQYJKoZIhvcNAQEFBQAwgdkxLTArBgNVBAoTJFVGViAtIFVu
-aXZlcnNpZGFkZSBGZWRlcmFsIGRlIFZpY29zYTE0MDIGA1UECxMrRFRJIC0gRGly
-ZXRvcmlhIGRlIFRlY25vbG9naWEgZGUgSW5mb3JtYWNhbzEZMBcGCSqGSIb3DQEJ
-ARYKZHRpQHVmdi5icjEPMA0GA1UEBxMGVmljb3NhMRUwEwYDVQQIEwxNaW5hcyBH
-ZXJhaXMxCzAJBgNVBAYTAkJSMSIwIAYDVQQDExlzaGliYm9sZXRoLWlkcC5kdGku
-dWZ2LmJyMB4XDTE0MDQxNDExMzc1N1oXDTE5MDQxMzExMzc1N1owgdkxLTArBgNV
-BAoTJFVGViAtIFVuaXZlcnNpZGFkZSBGZWRlcmFsIGRlIFZpY29zYTE0MDIGA1UE
-CxMrRFRJIC0gRGlyZXRvcmlhIGRlIFRlY25vbG9naWEgZGUgSW5mb3JtYWNhbzEZ
-MBcGCSqGSIb3DQEJARYKZHRpQHVmdi5icjEPMA0GA1UEBxMGVmljb3NhMRUwEwYD
-VQQIEwxNaW5hcyBHZXJhaXMxCzAJBgNVBAYTAkJSMSIwIAYDVQQDExlzaGliYm9s
-ZXRoLWlkcC5kdGkudWZ2LmJyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
-AQEAwHXw5lxhsUVVy9cHSvvnkanv1HyyMZz6lmeY76rh79I2bopDPgZlbdHnTAYn
-8vDrHts9RZOOOUXHYsJR2D0jm4lcVRxczZD5P4qDLpYp28kY3OfsOQ9TMZJ8HmnN
-RyjAmR8CofBG1ZHN2xi7tWqMI4HVEJfZw/ZvSWfX4eNBQsvv5oTa1v5eOw1YQQ6A
-aHB6p/Xp7tccGX0+OgTVty2Bq20xEZNBJeJtz2SBYxbiRUE+vaiYTyCJVxDeyNcN
-YIkiOUCUu2pEvgFciuzjhlG7UuUsq7S19HqOEjtUiqdH72gDRGvLNRhwpQ+u22vd
-WBOsXDXZeHB/5MfcOQImtgkYUQIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQCm0AKL
-BmP26xPlCqtrHLg2jUVBieOXLlF9hwc9TT6XQe1oMFHNaYYTEuw6/5To0xBkAWEl
-DrxKfa2qriSd6HBbn33RlWGpkfbMTqI52EgKvq+aUqcHjZfEQIKzdMA+ROIRdNgh
-j5pN94R1x14OARIvBnoYUXTDr/RajPVTs44HPmIKFviSVtkEC0o2pxt44/z1/jcq
-9gDbQO3dHyy+s3Twv7TBBPSECaFM8h3hescyO8I5bU4HJ1SrfjwwOX3jA+f6/U7f
-HGGRxpdKwLluWxlRst23AsG4nQFcIUsisbxQzd0mj29uAfmaQfxGAb+trbAAvZRr
-qTc5UxmPC7Yhv6hM
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth-idp.dti.ufv.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth-idp.dti.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://shibboleth-idp.dti.ufv.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth-idp.dti.ufv.br/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth-idp.dti.ufv.br/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth-idp.dti.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>
-      
-MIIEKDCCAxACAQAwDQYJKoZIhvcNAQEFBQAwgdkxLTArBgNVBAoTJFVGViAtIFVu
-aXZlcnNpZGFkZSBGZWRlcmFsIGRlIFZpY29zYTE0MDIGA1UECxMrRFRJIC0gRGly
-ZXRvcmlhIGRlIFRlY25vbG9naWEgZGUgSW5mb3JtYWNhbzEZMBcGCSqGSIb3DQEJ
-ARYKZHRpQHVmdi5icjEPMA0GA1UEBxMGVmljb3NhMRUwEwYDVQQIEwxNaW5hcyBH
-ZXJhaXMxCzAJBgNVBAYTAkJSMSIwIAYDVQQDExlzaGliYm9sZXRoLWlkcC5kdGku
-dWZ2LmJyMB4XDTE0MDQxNDExMzc1N1oXDTE5MDQxMzExMzc1N1owgdkxLTArBgNV
-BAoTJFVGViAtIFVuaXZlcnNpZGFkZSBGZWRlcmFsIGRlIFZpY29zYTE0MDIGA1UE
-CxMrRFRJIC0gRGlyZXRvcmlhIGRlIFRlY25vbG9naWEgZGUgSW5mb3JtYWNhbzEZ
-MBcGCSqGSIb3DQEJARYKZHRpQHVmdi5icjEPMA0GA1UEBxMGVmljb3NhMRUwEwYD
-VQQIEwxNaW5hcyBHZXJhaXMxCzAJBgNVBAYTAkJSMSIwIAYDVQQDExlzaGliYm9s
-ZXRoLWlkcC5kdGkudWZ2LmJyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
-AQEAwHXw5lxhsUVVy9cHSvvnkanv1HyyMZz6lmeY76rh79I2bopDPgZlbdHnTAYn
-8vDrHts9RZOOOUXHYsJR2D0jm4lcVRxczZD5P4qDLpYp28kY3OfsOQ9TMZJ8HmnN
-RyjAmR8CofBG1ZHN2xi7tWqMI4HVEJfZw/ZvSWfX4eNBQsvv5oTa1v5eOw1YQQ6A
-aHB6p/Xp7tccGX0+OgTVty2Bq20xEZNBJeJtz2SBYxbiRUE+vaiYTyCJVxDeyNcN
-YIkiOUCUu2pEvgFciuzjhlG7UuUsq7S19HqOEjtUiqdH72gDRGvLNRhwpQ+u22vd
-WBOsXDXZeHB/5MfcOQImtgkYUQIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQCm0AKL
-BmP26xPlCqtrHLg2jUVBieOXLlF9hwc9TT6XQe1oMFHNaYYTEuw6/5To0xBkAWEl
-DrxKfa2qriSd6HBbn33RlWGpkfbMTqI52EgKvq+aUqcHjZfEQIKzdMA+ROIRdNgh
-j5pN94R1x14OARIvBnoYUXTDr/RajPVTs44HPmIKFviSVtkEC0o2pxt44/z1/jcq
-9gDbQO3dHyy+s3Twv7TBBPSECaFM8h3hescyO8I5bU4HJ1SrfjwwOX3jA+f6/U7f
-HGGRxpdKwLluWxlRst23AsG4nQFcIUsisbxQzd0mj29uAfmaQfxGAb+trbAAvZRr
-qTc5UxmPC7Yhv6hM
-                    
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth-idp.dti.ufv.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth-idp.dti.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>Harley Balduino Saraiva</SurName>
-    <EmailAddress>harley.saraiva@ufv.br</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth-idp.dti.ufv.br.xml b/swamid-interfederations-2.0/shibboleth-idp.dti.ufv.br.xml
deleted file mode 100644
index bdd723d3..00000000
--- a/swamid-interfederations-2.0/shibboleth-idp.dti.ufv.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-idp.dti.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>
-    MIIEKDCCAxACAQAwDQYJKoZIhvcNAQEFBQAwgdkxLTArBgNVBAoTJFVGViAtIFVu
-aXZlcnNpZGFkZSBGZWRlcmFsIGRlIFZpY29zYTE0MDIGA1UECxMrRFRJIC0gRGly
-ZXRvcmlhIGRlIFRlY25vbG9naWEgZGUgSW5mb3JtYWNhbzEZMBcGCSqGSIb3DQEJ
-ARYKZHRpQHVmdi5icjEPMA0GA1UEBxMGVmljb3NhMRUwEwYDVQQIEwxNaW5hcyBH
-ZXJhaXMxCzAJBgNVBAYTAkJSMSIwIAYDVQQDExlzaGliYm9sZXRoLWlkcC5kdGku
-dWZ2LmJyMB4XDTE0MDQxNDExMzc1N1oXDTE5MDQxMzExMzc1N1owgdkxLTArBgNV
-BAoTJFVGViAtIFVuaXZlcnNpZGFkZSBGZWRlcmFsIGRlIFZpY29zYTE0MDIGA1UE
-CxMrRFRJIC0gRGlyZXRvcmlhIGRlIFRlY25vbG9naWEgZGUgSW5mb3JtYWNhbzEZ
-MBcGCSqGSIb3DQEJARYKZHRpQHVmdi5icjEPMA0GA1UEBxMGVmljb3NhMRUwEwYD
-VQQIEwxNaW5hcyBHZXJhaXMxCzAJBgNVBAYTAkJSMSIwIAYDVQQDExlzaGliYm9s
-ZXRoLWlkcC5kdGkudWZ2LmJyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
-AQEAwHXw5lxhsUVVy9cHSvvnkanv1HyyMZz6lmeY76rh79I2bopDPgZlbdHnTAYn
-8vDrHts9RZOOOUXHYsJR2D0jm4lcVRxczZD5P4qDLpYp28kY3OfsOQ9TMZJ8HmnN
-RyjAmR8CofBG1ZHN2xi7tWqMI4HVEJfZw/ZvSWfX4eNBQsvv5oTa1v5eOw1YQQ6A
-aHB6p/Xp7tccGX0+OgTVty2Bq20xEZNBJeJtz2SBYxbiRUE+vaiYTyCJVxDeyNcN
-YIkiOUCUu2pEvgFciuzjhlG7UuUsq7S19HqOEjtUiqdH72gDRGvLNRhwpQ+u22vd
-WBOsXDXZeHB/5MfcOQImtgkYUQIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQCm0AKL
-BmP26xPlCqtrHLg2jUVBieOXLlF9hwc9TT6XQe1oMFHNaYYTEuw6/5To0xBkAWEl
-DrxKfa2qriSd6HBbn33RlWGpkfbMTqI52EgKvq+aUqcHjZfEQIKzdMA+ROIRdNgh
-j5pN94R1x14OARIvBnoYUXTDr/RajPVTs44HPmIKFviSVtkEC0o2pxt44/z1/jcq
-9gDbQO3dHyy+s3Twv7TBBPSECaFM8h3hescyO8I5bU4HJ1SrfjwwOX3jA+f6/U7f
-HGGRxpdKwLluWxlRst23AsG4nQFcIUsisbxQzd0mj29uAfmaQfxGAb+trbAAvZRr
-qTc5UxmPC7Yhv6hM
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth-idp.dti.ufv.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth-idp.dti.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://shibboleth-idp.dti.ufv.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth-idp.dti.ufv.br/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth-idp.dti.ufv.br/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth-idp.dti.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>
-      
-MIIEKDCCAxACAQAwDQYJKoZIhvcNAQEFBQAwgdkxLTArBgNVBAoTJFVGViAtIFVu
-aXZlcnNpZGFkZSBGZWRlcmFsIGRlIFZpY29zYTE0MDIGA1UECxMrRFRJIC0gRGly
-ZXRvcmlhIGRlIFRlY25vbG9naWEgZGUgSW5mb3JtYWNhbzEZMBcGCSqGSIb3DQEJ
-ARYKZHRpQHVmdi5icjEPMA0GA1UEBxMGVmljb3NhMRUwEwYDVQQIEwxNaW5hcyBH
-ZXJhaXMxCzAJBgNVBAYTAkJSMSIwIAYDVQQDExlzaGliYm9sZXRoLWlkcC5kdGku
-dWZ2LmJyMB4XDTE0MDQxNDExMzc1N1oXDTE5MDQxMzExMzc1N1owgdkxLTArBgNV
-BAoTJFVGViAtIFVuaXZlcnNpZGFkZSBGZWRlcmFsIGRlIFZpY29zYTE0MDIGA1UE
-CxMrRFRJIC0gRGlyZXRvcmlhIGRlIFRlY25vbG9naWEgZGUgSW5mb3JtYWNhbzEZ
-MBcGCSqGSIb3DQEJARYKZHRpQHVmdi5icjEPMA0GA1UEBxMGVmljb3NhMRUwEwYD
-VQQIEwxNaW5hcyBHZXJhaXMxCzAJBgNVBAYTAkJSMSIwIAYDVQQDExlzaGliYm9s
-ZXRoLWlkcC5kdGkudWZ2LmJyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
-AQEAwHXw5lxhsUVVy9cHSvvnkanv1HyyMZz6lmeY76rh79I2bopDPgZlbdHnTAYn
-8vDrHts9RZOOOUXHYsJR2D0jm4lcVRxczZD5P4qDLpYp28kY3OfsOQ9TMZJ8HmnN
-RyjAmR8CofBG1ZHN2xi7tWqMI4HVEJfZw/ZvSWfX4eNBQsvv5oTa1v5eOw1YQQ6A
-aHB6p/Xp7tccGX0+OgTVty2Bq20xEZNBJeJtz2SBYxbiRUE+vaiYTyCJVxDeyNcN
-YIkiOUCUu2pEvgFciuzjhlG7UuUsq7S19HqOEjtUiqdH72gDRGvLNRhwpQ+u22vd
-WBOsXDXZeHB/5MfcOQImtgkYUQIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQCm0AKL
-BmP26xPlCqtrHLg2jUVBieOXLlF9hwc9TT6XQe1oMFHNaYYTEuw6/5To0xBkAWEl
-DrxKfa2qriSd6HBbn33RlWGpkfbMTqI52EgKvq+aUqcHjZfEQIKzdMA+ROIRdNgh
-j5pN94R1x14OARIvBnoYUXTDr/RajPVTs44HPmIKFviSVtkEC0o2pxt44/z1/jcq
-9gDbQO3dHyy+s3Twv7TBBPSECaFM8h3hescyO8I5bU4HJ1SrfjwwOX3jA+f6/U7f
-HGGRxpdKwLluWxlRst23AsG4nQFcIUsisbxQzd0mj29uAfmaQfxGAb+trbAAvZRr
-qTc5UxmPC7Yhv6hM
-                    
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth-idp.dti.ufv.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth-idp.dti.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>Harley Balduino Saraiva</SurName>
-    <EmailAddress>harley.saraiva@ufv.br</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth-idp.gwdg.de-gwdg-shibboleth.xml b/swamid-interfederations-2.0/shibboleth-idp.gwdg.de-gwdg-shibboleth.xml
deleted file mode 100644
index e1d30e7b..00000000
--- a/swamid-interfederations-2.0/shibboleth-idp.gwdg.de-gwdg-shibboleth.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://shibboleth-idp.gwdg.de/gwdg/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2014-01-16T13:09:19Z">
-      <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">gwdg.de</saml1md:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="de">Gesellschaft für wissenschaftliche Datenverarbeitung mbH Göttingen</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Gesellschaft für wissenschaftliche Datenverarbeitung mbH Göttingen</mdui:DisplayName>
-        <mdui:Description xml:lang="de">Wir bieten als Hochschulrechenzentrum für die Georg-August-Universität Göttingen und als Rechen- und IT-Kompetenzzentrum für die Max-Planck-Gesellschaft ein breites Spektrum an Informations- und Kommunikationsleistungen für die Wissenschaft.</mdui:Description>
-        <mdui:Description xml:lang="en">We offer as a university computer center of the Georg-August-University of Göttingen and as computing and IT competence center for the Max Planck Society, a wide range of information and communication services to science.</mdui:Description>
-        <mdui:Logo height="16" width="16">https://www.gwdg.de/fileadmin/images/favicon.ico</mdui:Logo>
-        <mdui:Logo height="72" width="240">https://www.gwdg.de/fileadmin/images/neu/logo.png</mdui:Logo>
-        <mdui:InformationURL xml:lang="de">http://gwdg.de</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">http://gwdg.de</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="de">http://www.gwdg.de/index.php?id=impressum</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="en">http://www.gwdg.de/index.php?id=impressum</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>shibboleth-idp.gwdg.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=shibboleth-idp.gwdg.de,O=Gesellschaft fuer wissenschaftliche Datenverarbeitung,L=GOETTINGEN,ST=NIEDERSACHSEN,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIGCTCCBPGgAwIBAgIHF4B1oKcqfjANBgkqhkiG9w0BAQUFADCBuzELMAkGA1UE
-BhMCREUxFjAUBgNVBAgTDU5JRURFUlNBQ0hTRU4xEzARBgNVBAcTCkdPRVRUSU5H
-RU4xPjA8BgNVBAoTNUdlc2VsbHNjaGFmdCBmdWVyIHdpc3NlbnNjaGFmdGxpY2hl
-IERhdGVudmVyYXJiZWl0dW5nMQ0wCwYDVQQLEwRHV0RHMRAwDgYDVQQDEwdHV0RH
-IENBMR4wHAYJKoZIhvcNAQkBFg9nd2RnLWNhQGd3ZGcuZGUwHhcNMTQwNDMwMTMx
-ODA4WhcNMTkwMjI3MDAwMDAwWjCBmzELMAkGA1UEBhMCREUxFjAUBgNVBAgTDU5J
-RURFUlNBQ0hTRU4xEzARBgNVBAcTCkdPRVRUSU5HRU4xPjA8BgNVBAoTNUdlc2Vs
-bHNjaGFmdCBmdWVyIHdpc3NlbnNjaGFmdGxpY2hlIERhdGVudmVyYXJiZWl0dW5n
-MR8wHQYDVQQDExZzaGliYm9sZXRoLWlkcC5nd2RnLmRlMIIBIjANBgkqhkiG9w0B
-AQEFAAOCAQ8AMIIBCgKCAQEA5YEqdBFXQNiRNJSWaVBGzqEh5Tu8c0UU/9OzzDt2
-CnYc4GVPoXcecHnUlvDZWlt9pABpVQ6cey1sjM45RO4XDSjNaWUjz1cv9qsIYj8w
-i3sZfAnbc3657E2Sloh6oCNpaS5m6mHimdQc+s7qNYF+Z8jzu60y9KOPVoX1Cggz
-Usr6cVjpBjxfx8Hd9ZmZWdXPiHApyEU963KSpf+Vkwgh8P0S/2DftW8huQbCk5Wj
-nhU5C/oUGuZBHfKgV6C3P9RA+oy4J0pnJUvzvnwRxT6CH5dk5C7my6clf3M8d9AR
-FhPwt2RxaGHGL6R5JOkHfYtvAqVcs7/mjAPsFgADSW2OJwIDAQABo4ICLjCCAiow
-OQYDVR0gBDIwMDARBg8rBgEEAYGtIYIsAQEEAwEwEQYPKwYBBAGBrSGCLAIBBAMB
-MAgGBmeBDAECAjAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAUBggr
-BgEFBQcDAgYIKwYBBQUHAwEwHQYDVR0OBBYEFC8ZqXogv+bpEvXmgZrx6XAEeVUG
-MB8GA1UdIwQYMBaAFKbk/5j95Ukyflx18haiTYx0Nd4iMC8GA1UdEQQoMCaCFnNo
-aWJib2xldGgtaWRwLmd3ZGcuZGWBDHNoaWJAZ3dkZy5kZTB5BgNVHR8EcjBwMDag
-NKAyhjBodHRwOi8vY2RwMS5wY2EuZGZuLmRlL2d3ZGctY2EvcHViL2NybC9jYWNy
-bC5jcmwwNqA0oDKGMGh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvZ3dkZy1jYS9wdWIv
-Y3JsL2NhY3JsLmNybDCByQYIKwYBBQUHAQEEgbwwgbkwMwYIKwYBBQUHMAGGJ2h0
-dHA6Ly9vY3NwLnBjYS5kZm4uZGUvT0NTUC1TZXJ2ZXIvT0NTUDBABggrBgEFBQcw
-AoY0aHR0cDovL2NkcDEucGNhLmRmbi5kZS9nd2RnLWNhL3B1Yi9jYWNlcnQvY2Fj
-ZXJ0LmNydDBABggrBgEFBQcwAoY0aHR0cDovL2NkcDIucGNhLmRmbi5kZS9nd2Rn
-LWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDANBgkqhkiG9w0BAQUFAAOCAQEAKK8w
-/Ytq3kzSvek5YglcbnEsa1JFfwxi6z/6l0p+xYB4nAVDWT15f0xLAh/9TRbEagIb
-eAuNmJiL70ONTY2WXph9d2jUwDsRSR9vg1PDbfux8TvEkgZSh2dVewNsUrHw/9gg
-8uGbaIiaKNaVFi58Z4Jx4gCWpJ0p1wdAb6/JurbR0DhtUPWwLFXpEewfTXD9sZEW
-YGsmOqBm6mBudDrpWoxmEougvsI2JgsTV3XaZdVfCi3vuhgUA3IbPt9nVoDbG2E1
-2C0rxeNaWUqzXpReVgkf3qmqvf9Pl+BwQM5Ua5RHHyI4zoP1KaPExje9CuigkVnz
-0k8KqBoqgDYGCrwSLQ==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth-idp.gwdg.de:8443/gwdg/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth-idp.gwdg.de:8443/gwdg/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth-idp.gwdg.de/gwdg/profile/SAML2/Redirect/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth-idp.gwdg.de/gwdg/profile/SAML2/POST/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth-idp.gwdg.de:8443/gwdg/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.gwdg.de/gwdg/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth-idp.gwdg.de/gwdg/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth-idp.gwdg.de/gwdg/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth-idp.gwdg.de/gwdg/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">gwdg.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>shibboleth-idp.gwdg.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=shibboleth-idp.gwdg.de,O=Gesellschaft fuer wissenschaftliche Datenverarbeitung,L=GOETTINGEN,ST=NIEDERSACHSEN,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIGCTCCBPGgAwIBAgIHF4B1oKcqfjANBgkqhkiG9w0BAQUFADCBuzELMAkGA1UE
-BhMCREUxFjAUBgNVBAgTDU5JRURFUlNBQ0hTRU4xEzARBgNVBAcTCkdPRVRUSU5H
-RU4xPjA8BgNVBAoTNUdlc2VsbHNjaGFmdCBmdWVyIHdpc3NlbnNjaGFmdGxpY2hl
-IERhdGVudmVyYXJiZWl0dW5nMQ0wCwYDVQQLEwRHV0RHMRAwDgYDVQQDEwdHV0RH
-IENBMR4wHAYJKoZIhvcNAQkBFg9nd2RnLWNhQGd3ZGcuZGUwHhcNMTQwNDMwMTMx
-ODA4WhcNMTkwMjI3MDAwMDAwWjCBmzELMAkGA1UEBhMCREUxFjAUBgNVBAgTDU5J
-RURFUlNBQ0hTRU4xEzARBgNVBAcTCkdPRVRUSU5HRU4xPjA8BgNVBAoTNUdlc2Vs
-bHNjaGFmdCBmdWVyIHdpc3NlbnNjaGFmdGxpY2hlIERhdGVudmVyYXJiZWl0dW5n
-MR8wHQYDVQQDExZzaGliYm9sZXRoLWlkcC5nd2RnLmRlMIIBIjANBgkqhkiG9w0B
-AQEFAAOCAQ8AMIIBCgKCAQEA5YEqdBFXQNiRNJSWaVBGzqEh5Tu8c0UU/9OzzDt2
-CnYc4GVPoXcecHnUlvDZWlt9pABpVQ6cey1sjM45RO4XDSjNaWUjz1cv9qsIYj8w
-i3sZfAnbc3657E2Sloh6oCNpaS5m6mHimdQc+s7qNYF+Z8jzu60y9KOPVoX1Cggz
-Usr6cVjpBjxfx8Hd9ZmZWdXPiHApyEU963KSpf+Vkwgh8P0S/2DftW8huQbCk5Wj
-nhU5C/oUGuZBHfKgV6C3P9RA+oy4J0pnJUvzvnwRxT6CH5dk5C7my6clf3M8d9AR
-FhPwt2RxaGHGL6R5JOkHfYtvAqVcs7/mjAPsFgADSW2OJwIDAQABo4ICLjCCAiow
-OQYDVR0gBDIwMDARBg8rBgEEAYGtIYIsAQEEAwEwEQYPKwYBBAGBrSGCLAIBBAMB
-MAgGBmeBDAECAjAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAUBggr
-BgEFBQcDAgYIKwYBBQUHAwEwHQYDVR0OBBYEFC8ZqXogv+bpEvXmgZrx6XAEeVUG
-MB8GA1UdIwQYMBaAFKbk/5j95Ukyflx18haiTYx0Nd4iMC8GA1UdEQQoMCaCFnNo
-aWJib2xldGgtaWRwLmd3ZGcuZGWBDHNoaWJAZ3dkZy5kZTB5BgNVHR8EcjBwMDag
-NKAyhjBodHRwOi8vY2RwMS5wY2EuZGZuLmRlL2d3ZGctY2EvcHViL2NybC9jYWNy
-bC5jcmwwNqA0oDKGMGh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvZ3dkZy1jYS9wdWIv
-Y3JsL2NhY3JsLmNybDCByQYIKwYBBQUHAQEEgbwwgbkwMwYIKwYBBQUHMAGGJ2h0
-dHA6Ly9vY3NwLnBjYS5kZm4uZGUvT0NTUC1TZXJ2ZXIvT0NTUDBABggrBgEFBQcw
-AoY0aHR0cDovL2NkcDEucGNhLmRmbi5kZS9nd2RnLWNhL3B1Yi9jYWNlcnQvY2Fj
-ZXJ0LmNydDBABggrBgEFBQcwAoY0aHR0cDovL2NkcDIucGNhLmRmbi5kZS9nd2Rn
-LWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDANBgkqhkiG9w0BAQUFAAOCAQEAKK8w
-/Ytq3kzSvek5YglcbnEsa1JFfwxi6z/6l0p+xYB4nAVDWT15f0xLAh/9TRbEagIb
-eAuNmJiL70ONTY2WXph9d2jUwDsRSR9vg1PDbfux8TvEkgZSh2dVewNsUrHw/9gg
-8uGbaIiaKNaVFi58Z4Jx4gCWpJ0p1wdAb6/JurbR0DhtUPWwLFXpEewfTXD9sZEW
-YGsmOqBm6mBudDrpWoxmEougvsI2JgsTV3XaZdVfCi3vuhgUA3IbPt9nVoDbG2E1
-2C0rxeNaWUqzXpReVgkf3qmqvf9Pl+BwQM5Ua5RHHyI4zoP1KaPExje9CuigkVnz
-0k8KqBoqgDYGCrwSLQ==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth-idp.gwdg.de:8443/gwdg/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth-idp.gwdg.de:8443/gwdg/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">e112</OrganizationName>
-    <OrganizationName xml:lang="en">e112</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">Gesellschaft für wissenschaftliche Datenverarbeitung mbH</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">Gesellschaft für wissenschaftliche Datenverarbeitung mbH</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.gwdg.de</OrganizationURL>
-    <OrganizationURL xml:lang="en">http://www.gwdg.de</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Daniel</GivenName>
-    <SurName>Adler</SurName>
-    <EmailAddress>mailto:daniel.adler@gwdg.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="support">
-    <GivenName>Christof</GivenName>
-    <SurName>Pohl</SurName>
-    <EmailAddress>mailto:christof.pohl@gwdg.de</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth-idp.gwdg.de.xml b/swamid-interfederations-2.0/shibboleth-idp.gwdg.de.xml
deleted file mode 100644
index e1d30e7b..00000000
--- a/swamid-interfederations-2.0/shibboleth-idp.gwdg.de.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://shibboleth-idp.gwdg.de/gwdg/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2014-01-16T13:09:19Z">
-      <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">gwdg.de</saml1md:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="de">Gesellschaft für wissenschaftliche Datenverarbeitung mbH Göttingen</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Gesellschaft für wissenschaftliche Datenverarbeitung mbH Göttingen</mdui:DisplayName>
-        <mdui:Description xml:lang="de">Wir bieten als Hochschulrechenzentrum für die Georg-August-Universität Göttingen und als Rechen- und IT-Kompetenzzentrum für die Max-Planck-Gesellschaft ein breites Spektrum an Informations- und Kommunikationsleistungen für die Wissenschaft.</mdui:Description>
-        <mdui:Description xml:lang="en">We offer as a university computer center of the Georg-August-University of Göttingen and as computing and IT competence center for the Max Planck Society, a wide range of information and communication services to science.</mdui:Description>
-        <mdui:Logo height="16" width="16">https://www.gwdg.de/fileadmin/images/favicon.ico</mdui:Logo>
-        <mdui:Logo height="72" width="240">https://www.gwdg.de/fileadmin/images/neu/logo.png</mdui:Logo>
-        <mdui:InformationURL xml:lang="de">http://gwdg.de</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">http://gwdg.de</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="de">http://www.gwdg.de/index.php?id=impressum</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="en">http://www.gwdg.de/index.php?id=impressum</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>shibboleth-idp.gwdg.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=shibboleth-idp.gwdg.de,O=Gesellschaft fuer wissenschaftliche Datenverarbeitung,L=GOETTINGEN,ST=NIEDERSACHSEN,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIGCTCCBPGgAwIBAgIHF4B1oKcqfjANBgkqhkiG9w0BAQUFADCBuzELMAkGA1UE
-BhMCREUxFjAUBgNVBAgTDU5JRURFUlNBQ0hTRU4xEzARBgNVBAcTCkdPRVRUSU5H
-RU4xPjA8BgNVBAoTNUdlc2VsbHNjaGFmdCBmdWVyIHdpc3NlbnNjaGFmdGxpY2hl
-IERhdGVudmVyYXJiZWl0dW5nMQ0wCwYDVQQLEwRHV0RHMRAwDgYDVQQDEwdHV0RH
-IENBMR4wHAYJKoZIhvcNAQkBFg9nd2RnLWNhQGd3ZGcuZGUwHhcNMTQwNDMwMTMx
-ODA4WhcNMTkwMjI3MDAwMDAwWjCBmzELMAkGA1UEBhMCREUxFjAUBgNVBAgTDU5J
-RURFUlNBQ0hTRU4xEzARBgNVBAcTCkdPRVRUSU5HRU4xPjA8BgNVBAoTNUdlc2Vs
-bHNjaGFmdCBmdWVyIHdpc3NlbnNjaGFmdGxpY2hlIERhdGVudmVyYXJiZWl0dW5n
-MR8wHQYDVQQDExZzaGliYm9sZXRoLWlkcC5nd2RnLmRlMIIBIjANBgkqhkiG9w0B
-AQEFAAOCAQ8AMIIBCgKCAQEA5YEqdBFXQNiRNJSWaVBGzqEh5Tu8c0UU/9OzzDt2
-CnYc4GVPoXcecHnUlvDZWlt9pABpVQ6cey1sjM45RO4XDSjNaWUjz1cv9qsIYj8w
-i3sZfAnbc3657E2Sloh6oCNpaS5m6mHimdQc+s7qNYF+Z8jzu60y9KOPVoX1Cggz
-Usr6cVjpBjxfx8Hd9ZmZWdXPiHApyEU963KSpf+Vkwgh8P0S/2DftW8huQbCk5Wj
-nhU5C/oUGuZBHfKgV6C3P9RA+oy4J0pnJUvzvnwRxT6CH5dk5C7my6clf3M8d9AR
-FhPwt2RxaGHGL6R5JOkHfYtvAqVcs7/mjAPsFgADSW2OJwIDAQABo4ICLjCCAiow
-OQYDVR0gBDIwMDARBg8rBgEEAYGtIYIsAQEEAwEwEQYPKwYBBAGBrSGCLAIBBAMB
-MAgGBmeBDAECAjAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAUBggr
-BgEFBQcDAgYIKwYBBQUHAwEwHQYDVR0OBBYEFC8ZqXogv+bpEvXmgZrx6XAEeVUG
-MB8GA1UdIwQYMBaAFKbk/5j95Ukyflx18haiTYx0Nd4iMC8GA1UdEQQoMCaCFnNo
-aWJib2xldGgtaWRwLmd3ZGcuZGWBDHNoaWJAZ3dkZy5kZTB5BgNVHR8EcjBwMDag
-NKAyhjBodHRwOi8vY2RwMS5wY2EuZGZuLmRlL2d3ZGctY2EvcHViL2NybC9jYWNy
-bC5jcmwwNqA0oDKGMGh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvZ3dkZy1jYS9wdWIv
-Y3JsL2NhY3JsLmNybDCByQYIKwYBBQUHAQEEgbwwgbkwMwYIKwYBBQUHMAGGJ2h0
-dHA6Ly9vY3NwLnBjYS5kZm4uZGUvT0NTUC1TZXJ2ZXIvT0NTUDBABggrBgEFBQcw
-AoY0aHR0cDovL2NkcDEucGNhLmRmbi5kZS9nd2RnLWNhL3B1Yi9jYWNlcnQvY2Fj
-ZXJ0LmNydDBABggrBgEFBQcwAoY0aHR0cDovL2NkcDIucGNhLmRmbi5kZS9nd2Rn
-LWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDANBgkqhkiG9w0BAQUFAAOCAQEAKK8w
-/Ytq3kzSvek5YglcbnEsa1JFfwxi6z/6l0p+xYB4nAVDWT15f0xLAh/9TRbEagIb
-eAuNmJiL70ONTY2WXph9d2jUwDsRSR9vg1PDbfux8TvEkgZSh2dVewNsUrHw/9gg
-8uGbaIiaKNaVFi58Z4Jx4gCWpJ0p1wdAb6/JurbR0DhtUPWwLFXpEewfTXD9sZEW
-YGsmOqBm6mBudDrpWoxmEougvsI2JgsTV3XaZdVfCi3vuhgUA3IbPt9nVoDbG2E1
-2C0rxeNaWUqzXpReVgkf3qmqvf9Pl+BwQM5Ua5RHHyI4zoP1KaPExje9CuigkVnz
-0k8KqBoqgDYGCrwSLQ==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth-idp.gwdg.de:8443/gwdg/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth-idp.gwdg.de:8443/gwdg/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth-idp.gwdg.de/gwdg/profile/SAML2/Redirect/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth-idp.gwdg.de/gwdg/profile/SAML2/POST/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth-idp.gwdg.de:8443/gwdg/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.gwdg.de/gwdg/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth-idp.gwdg.de/gwdg/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth-idp.gwdg.de/gwdg/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth-idp.gwdg.de/gwdg/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">gwdg.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>shibboleth-idp.gwdg.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=shibboleth-idp.gwdg.de,O=Gesellschaft fuer wissenschaftliche Datenverarbeitung,L=GOETTINGEN,ST=NIEDERSACHSEN,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIGCTCCBPGgAwIBAgIHF4B1oKcqfjANBgkqhkiG9w0BAQUFADCBuzELMAkGA1UE
-BhMCREUxFjAUBgNVBAgTDU5JRURFUlNBQ0hTRU4xEzARBgNVBAcTCkdPRVRUSU5H
-RU4xPjA8BgNVBAoTNUdlc2VsbHNjaGFmdCBmdWVyIHdpc3NlbnNjaGFmdGxpY2hl
-IERhdGVudmVyYXJiZWl0dW5nMQ0wCwYDVQQLEwRHV0RHMRAwDgYDVQQDEwdHV0RH
-IENBMR4wHAYJKoZIhvcNAQkBFg9nd2RnLWNhQGd3ZGcuZGUwHhcNMTQwNDMwMTMx
-ODA4WhcNMTkwMjI3MDAwMDAwWjCBmzELMAkGA1UEBhMCREUxFjAUBgNVBAgTDU5J
-RURFUlNBQ0hTRU4xEzARBgNVBAcTCkdPRVRUSU5HRU4xPjA8BgNVBAoTNUdlc2Vs
-bHNjaGFmdCBmdWVyIHdpc3NlbnNjaGFmdGxpY2hlIERhdGVudmVyYXJiZWl0dW5n
-MR8wHQYDVQQDExZzaGliYm9sZXRoLWlkcC5nd2RnLmRlMIIBIjANBgkqhkiG9w0B
-AQEFAAOCAQ8AMIIBCgKCAQEA5YEqdBFXQNiRNJSWaVBGzqEh5Tu8c0UU/9OzzDt2
-CnYc4GVPoXcecHnUlvDZWlt9pABpVQ6cey1sjM45RO4XDSjNaWUjz1cv9qsIYj8w
-i3sZfAnbc3657E2Sloh6oCNpaS5m6mHimdQc+s7qNYF+Z8jzu60y9KOPVoX1Cggz
-Usr6cVjpBjxfx8Hd9ZmZWdXPiHApyEU963KSpf+Vkwgh8P0S/2DftW8huQbCk5Wj
-nhU5C/oUGuZBHfKgV6C3P9RA+oy4J0pnJUvzvnwRxT6CH5dk5C7my6clf3M8d9AR
-FhPwt2RxaGHGL6R5JOkHfYtvAqVcs7/mjAPsFgADSW2OJwIDAQABo4ICLjCCAiow
-OQYDVR0gBDIwMDARBg8rBgEEAYGtIYIsAQEEAwEwEQYPKwYBBAGBrSGCLAIBBAMB
-MAgGBmeBDAECAjAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAUBggr
-BgEFBQcDAgYIKwYBBQUHAwEwHQYDVR0OBBYEFC8ZqXogv+bpEvXmgZrx6XAEeVUG
-MB8GA1UdIwQYMBaAFKbk/5j95Ukyflx18haiTYx0Nd4iMC8GA1UdEQQoMCaCFnNo
-aWJib2xldGgtaWRwLmd3ZGcuZGWBDHNoaWJAZ3dkZy5kZTB5BgNVHR8EcjBwMDag
-NKAyhjBodHRwOi8vY2RwMS5wY2EuZGZuLmRlL2d3ZGctY2EvcHViL2NybC9jYWNy
-bC5jcmwwNqA0oDKGMGh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvZ3dkZy1jYS9wdWIv
-Y3JsL2NhY3JsLmNybDCByQYIKwYBBQUHAQEEgbwwgbkwMwYIKwYBBQUHMAGGJ2h0
-dHA6Ly9vY3NwLnBjYS5kZm4uZGUvT0NTUC1TZXJ2ZXIvT0NTUDBABggrBgEFBQcw
-AoY0aHR0cDovL2NkcDEucGNhLmRmbi5kZS9nd2RnLWNhL3B1Yi9jYWNlcnQvY2Fj
-ZXJ0LmNydDBABggrBgEFBQcwAoY0aHR0cDovL2NkcDIucGNhLmRmbi5kZS9nd2Rn
-LWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDANBgkqhkiG9w0BAQUFAAOCAQEAKK8w
-/Ytq3kzSvek5YglcbnEsa1JFfwxi6z/6l0p+xYB4nAVDWT15f0xLAh/9TRbEagIb
-eAuNmJiL70ONTY2WXph9d2jUwDsRSR9vg1PDbfux8TvEkgZSh2dVewNsUrHw/9gg
-8uGbaIiaKNaVFi58Z4Jx4gCWpJ0p1wdAb6/JurbR0DhtUPWwLFXpEewfTXD9sZEW
-YGsmOqBm6mBudDrpWoxmEougvsI2JgsTV3XaZdVfCi3vuhgUA3IbPt9nVoDbG2E1
-2C0rxeNaWUqzXpReVgkf3qmqvf9Pl+BwQM5Ua5RHHyI4zoP1KaPExje9CuigkVnz
-0k8KqBoqgDYGCrwSLQ==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth-idp.gwdg.de:8443/gwdg/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth-idp.gwdg.de:8443/gwdg/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">e112</OrganizationName>
-    <OrganizationName xml:lang="en">e112</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">Gesellschaft für wissenschaftliche Datenverarbeitung mbH</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">Gesellschaft für wissenschaftliche Datenverarbeitung mbH</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.gwdg.de</OrganizationURL>
-    <OrganizationURL xml:lang="en">http://www.gwdg.de</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Daniel</GivenName>
-    <SurName>Adler</SurName>
-    <EmailAddress>mailto:daniel.adler@gwdg.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="support">
-    <GivenName>Christof</GivenName>
-    <SurName>Pohl</SurName>
-    <EmailAddress>mailto:christof.pohl@gwdg.de</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth-idp.mpg.de-mpg-shibboleth.xml b/swamid-interfederations-2.0/shibboleth-idp.mpg.de-mpg-shibboleth.xml
deleted file mode 100644
index acd1e65d..00000000
--- a/swamid-interfederations-2.0/shibboleth-idp.mpg.de-mpg-shibboleth.xml
+++ /dev/null
@@ -1,144 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth-idp.mpg.de/mpg/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2014-03-10T14:26:51Z">
-      <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">mpg.de</saml1md:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="de">Max-Planck Institute (im MetaDir der GWDG)</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Max-Planck Institutes (in MetaDir of GWDG)</mdui:DisplayName>
-        <mdui:Description xml:lang="de">IdP für MPG Accounts in GWDG MetaDir</mdui:Description>
-        <mdui:Description xml:lang="en">Idp for MPG Accounts in GWDG MetaDir</mdui:Description>
-        <mdui:Logo height="16" width="16">https://www.mpg.de/favicon.ico</mdui:Logo>
-        <mdui:Logo height="163" width="300">https://shibboleth-idp.mpg.de/mpg/uApprove/logo-mpg.png</mdui:Logo>
-        <mdui:InformationURL xml:lang="de">https://www.mpg.de/kurzportrait</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">https://www.mpg.de/183251/portrait</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="de">http://www.mpg.de/impressum</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="en">http://www.mpg.de/imprint</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>shibboleth-idp.mpg.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=shibboleth-idp.mpg.de,OU=PKI,O=Max-Planck-Gesellschaft,L=Goettingen,ST=Niedersachsen,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFlTCCBH2gAwIBAgIHF4B2l7InVDANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQG
-EwJERTEgMB4GA1UEChMXTWF4LVBsYW5jay1HZXNlbGxzY2hhZnQxDzANBgNVBAMT
-Bk1QRyBDQTEcMBoGCSqGSIb3DQEJARYNbXBnLWNhQG1wZy5kZTAeFw0xNDA0MzAx
-MzIyMTVaFw0xOTA0MjkxMzIyMTVaMIGKMQswCQYDVQQGEwJERTEWMBQGA1UECBMN
-TmllZGVyc2FjaHNlbjETMBEGA1UEBxMKR29ldHRpbmdlbjEgMB4GA1UEChMXTWF4
-LVBsYW5jay1HZXNlbGxzY2hhZnQxDDAKBgNVBAsTA1BLSTEeMBwGA1UEAxMVc2hp
-YmJvbGV0aC1pZHAubXBnLmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
-AQEArolAQS1UWd9cHm/XD91J6m3yhQHIzNcHyAPHyPsF4Z/M5+2g4hlSSIPrHYSc
-HI2PSF7DpttiBfTMim2yq7GFCBdJHtZZP0i5Ajk2KuyM4oHHxANYaBzAPiClYbOb
-0oO0hENluVnIBiTkgcfmmFrEXiiA7ltjyONOmSRdEeIdbDUm704NI5d0S6OJ0J+5
-01NLXyHwMLdiLa7dOIjINY9wMJVOhgotYb0HodCfZUF4vuuvkw/JEWK2xEigvTD9
-aIJXdwdpcrx7DgkBbNto+fNPV2evJHHUy++QPbiNG2/2QajLnUAIAgQQsAfZX7zT
-xN2UW9V2dKXIykA621NzSOp8bwIDAQABo4ICKTCCAiUwOQYDVR0gBDIwMDARBg8r
-BgEEAYGtIYIsAQEEAwEwEQYPKwYBBAGBrSGCLAIBBAMBMAgGBmeBDAECAjAJBgNV
-HRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUH
-AwEwHQYDVR0OBBYEFP4tPNkQOhz1sk/77Ft0aqscEojMMB8GA1UdIwQYMBaAFALW
-Hm4Jq79YZacKPEgzYdHOfcNbMC4GA1UdEQQnMCWCFXNoaWJib2xldGgtaWRwLm1w
-Zy5kZYEMc2hpYkBnd2RnLmRlMHcGA1UdHwRwMG4wNaAzoDGGL2h0dHA6Ly9jZHAx
-LnBjYS5kZm4uZGUvbXBnLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMDWgM6Axhi9odHRw
-Oi8vY2RwMi5wY2EuZGZuLmRlL21wZy1jYS9wdWIvY3JsL2NhY3JsLmNybDCBxwYI
-KwYBBQUHAQEEgbowgbcwMwYIKwYBBQUHMAGGJ2h0dHA6Ly9vY3NwLnBjYS5kZm4u
-ZGUvT0NTUC1TZXJ2ZXIvT0NTUDA/BggrBgEFBQcwAoYzaHR0cDovL2NkcDEucGNh
-LmRmbi5kZS9tcGctY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MD8GCCsGAQUFBzAC
-hjNodHRwOi8vY2RwMi5wY2EuZGZuLmRlL21wZy1jYS9wdWIvY2FjZXJ0L2NhY2Vy
-dC5jcnQwDQYJKoZIhvcNAQEFBQADggEBACneffiJgzK7uq8KZEhT3Qh1YA8EoPHD
-z5pigbg1F2IjuRozsxx2MPIHbzvuuXgXLhCNfxw4kepXammx0aYKFQJfhL9/O8Xo
-/KusssOTqTOM5tPJ6w5irVthTIAodch2St9DmF6YV4LfOnXPdKNKAz+LMOfl80ua
-tB/B2fjfaQGqTZY70RctOsS3SdOPub29OqAPS3xYT/dCZd3CSP4E6pjpqFKWDz0w
-LmveeJ9FG98fbaN0wbBh6abViYIfyeednJGp6efTra9aHjdxlGyExBnGjeAbi7iK
-tfyPYfYMvj1QxW+/LOG5aWb/RlyNQG90t+E7Ydh7zj03deDYQk4u3wM=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth-idp.mpg.de:8443/mpg/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth-idp.mpg.de:8443/mpg/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth-idp.mpg.de/mpg/profile/SAML2/Redirect/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth-idp.mpg.de/mpg/profile/SAML2/POST/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth-idp.mpg.de:8443/mpg/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.mpg.de/mpg/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth-idp.mpg.de/mpg/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth-idp.mpg.de/mpg/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth-idp.mpg.de/mpg/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">mpg.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>shibboleth-idp.mpg.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=shibboleth-idp.mpg.de,OU=PKI,O=Max-Planck-Gesellschaft,L=Goettingen,ST=Niedersachsen,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFlTCCBH2gAwIBAgIHF4B2l7InVDANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQG
-EwJERTEgMB4GA1UEChMXTWF4LVBsYW5jay1HZXNlbGxzY2hhZnQxDzANBgNVBAMT
-Bk1QRyBDQTEcMBoGCSqGSIb3DQEJARYNbXBnLWNhQG1wZy5kZTAeFw0xNDA0MzAx
-MzIyMTVaFw0xOTA0MjkxMzIyMTVaMIGKMQswCQYDVQQGEwJERTEWMBQGA1UECBMN
-TmllZGVyc2FjaHNlbjETMBEGA1UEBxMKR29ldHRpbmdlbjEgMB4GA1UEChMXTWF4
-LVBsYW5jay1HZXNlbGxzY2hhZnQxDDAKBgNVBAsTA1BLSTEeMBwGA1UEAxMVc2hp
-YmJvbGV0aC1pZHAubXBnLmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
-AQEArolAQS1UWd9cHm/XD91J6m3yhQHIzNcHyAPHyPsF4Z/M5+2g4hlSSIPrHYSc
-HI2PSF7DpttiBfTMim2yq7GFCBdJHtZZP0i5Ajk2KuyM4oHHxANYaBzAPiClYbOb
-0oO0hENluVnIBiTkgcfmmFrEXiiA7ltjyONOmSRdEeIdbDUm704NI5d0S6OJ0J+5
-01NLXyHwMLdiLa7dOIjINY9wMJVOhgotYb0HodCfZUF4vuuvkw/JEWK2xEigvTD9
-aIJXdwdpcrx7DgkBbNto+fNPV2evJHHUy++QPbiNG2/2QajLnUAIAgQQsAfZX7zT
-xN2UW9V2dKXIykA621NzSOp8bwIDAQABo4ICKTCCAiUwOQYDVR0gBDIwMDARBg8r
-BgEEAYGtIYIsAQEEAwEwEQYPKwYBBAGBrSGCLAIBBAMBMAgGBmeBDAECAjAJBgNV
-HRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUH
-AwEwHQYDVR0OBBYEFP4tPNkQOhz1sk/77Ft0aqscEojMMB8GA1UdIwQYMBaAFALW
-Hm4Jq79YZacKPEgzYdHOfcNbMC4GA1UdEQQnMCWCFXNoaWJib2xldGgtaWRwLm1w
-Zy5kZYEMc2hpYkBnd2RnLmRlMHcGA1UdHwRwMG4wNaAzoDGGL2h0dHA6Ly9jZHAx
-LnBjYS5kZm4uZGUvbXBnLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMDWgM6Axhi9odHRw
-Oi8vY2RwMi5wY2EuZGZuLmRlL21wZy1jYS9wdWIvY3JsL2NhY3JsLmNybDCBxwYI
-KwYBBQUHAQEEgbowgbcwMwYIKwYBBQUHMAGGJ2h0dHA6Ly9vY3NwLnBjYS5kZm4u
-ZGUvT0NTUC1TZXJ2ZXIvT0NTUDA/BggrBgEFBQcwAoYzaHR0cDovL2NkcDEucGNh
-LmRmbi5kZS9tcGctY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MD8GCCsGAQUFBzAC
-hjNodHRwOi8vY2RwMi5wY2EuZGZuLmRlL21wZy1jYS9wdWIvY2FjZXJ0L2NhY2Vy
-dC5jcnQwDQYJKoZIhvcNAQEFBQADggEBACneffiJgzK7uq8KZEhT3Qh1YA8EoPHD
-z5pigbg1F2IjuRozsxx2MPIHbzvuuXgXLhCNfxw4kepXammx0aYKFQJfhL9/O8Xo
-/KusssOTqTOM5tPJ6w5irVthTIAodch2St9DmF6YV4LfOnXPdKNKAz+LMOfl80ua
-tB/B2fjfaQGqTZY70RctOsS3SdOPub29OqAPS3xYT/dCZd3CSP4E6pjpqFKWDz0w
-LmveeJ9FG98fbaN0wbBh6abViYIfyeednJGp6efTra9aHjdxlGyExBnGjeAbi7iK
-tfyPYfYMvj1QxW+/LOG5aWb/RlyNQG90t+E7Ydh7zj03deDYQk4u3wM=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth-idp.mpg.de:8443/mpg/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth-idp.mpg.de:8443/mpg/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">e71</OrganizationName>
-    <OrganizationName xml:lang="en">e71</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">Max-Planck-Gesellschaft</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">Max-Planck-Gesellschaft</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.biochem.mpg.de</OrganizationURL>
-    <OrganizationURL xml:lang="en">http://www.biochem.mpg.de</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Daniel</GivenName>
-    <SurName>Adler</SurName>
-    <EmailAddress>mailto:daniel.adler@gwdg.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="support">
-    <GivenName>Christof</GivenName>
-    <SurName>Pohl</SurName>
-    <EmailAddress>mailto:christof.pohl@gwdg.de</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth-idp.mpg.de.xml b/swamid-interfederations-2.0/shibboleth-idp.mpg.de.xml
deleted file mode 100644
index acd1e65d..00000000
--- a/swamid-interfederations-2.0/shibboleth-idp.mpg.de.xml
+++ /dev/null
@@ -1,144 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth-idp.mpg.de/mpg/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2014-03-10T14:26:51Z">
-      <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">mpg.de</saml1md:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="de">Max-Planck Institute (im MetaDir der GWDG)</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Max-Planck Institutes (in MetaDir of GWDG)</mdui:DisplayName>
-        <mdui:Description xml:lang="de">IdP für MPG Accounts in GWDG MetaDir</mdui:Description>
-        <mdui:Description xml:lang="en">Idp for MPG Accounts in GWDG MetaDir</mdui:Description>
-        <mdui:Logo height="16" width="16">https://www.mpg.de/favicon.ico</mdui:Logo>
-        <mdui:Logo height="163" width="300">https://shibboleth-idp.mpg.de/mpg/uApprove/logo-mpg.png</mdui:Logo>
-        <mdui:InformationURL xml:lang="de">https://www.mpg.de/kurzportrait</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">https://www.mpg.de/183251/portrait</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="de">http://www.mpg.de/impressum</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="en">http://www.mpg.de/imprint</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>shibboleth-idp.mpg.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=shibboleth-idp.mpg.de,OU=PKI,O=Max-Planck-Gesellschaft,L=Goettingen,ST=Niedersachsen,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFlTCCBH2gAwIBAgIHF4B2l7InVDANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQG
-EwJERTEgMB4GA1UEChMXTWF4LVBsYW5jay1HZXNlbGxzY2hhZnQxDzANBgNVBAMT
-Bk1QRyBDQTEcMBoGCSqGSIb3DQEJARYNbXBnLWNhQG1wZy5kZTAeFw0xNDA0MzAx
-MzIyMTVaFw0xOTA0MjkxMzIyMTVaMIGKMQswCQYDVQQGEwJERTEWMBQGA1UECBMN
-TmllZGVyc2FjaHNlbjETMBEGA1UEBxMKR29ldHRpbmdlbjEgMB4GA1UEChMXTWF4
-LVBsYW5jay1HZXNlbGxzY2hhZnQxDDAKBgNVBAsTA1BLSTEeMBwGA1UEAxMVc2hp
-YmJvbGV0aC1pZHAubXBnLmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
-AQEArolAQS1UWd9cHm/XD91J6m3yhQHIzNcHyAPHyPsF4Z/M5+2g4hlSSIPrHYSc
-HI2PSF7DpttiBfTMim2yq7GFCBdJHtZZP0i5Ajk2KuyM4oHHxANYaBzAPiClYbOb
-0oO0hENluVnIBiTkgcfmmFrEXiiA7ltjyONOmSRdEeIdbDUm704NI5d0S6OJ0J+5
-01NLXyHwMLdiLa7dOIjINY9wMJVOhgotYb0HodCfZUF4vuuvkw/JEWK2xEigvTD9
-aIJXdwdpcrx7DgkBbNto+fNPV2evJHHUy++QPbiNG2/2QajLnUAIAgQQsAfZX7zT
-xN2UW9V2dKXIykA621NzSOp8bwIDAQABo4ICKTCCAiUwOQYDVR0gBDIwMDARBg8r
-BgEEAYGtIYIsAQEEAwEwEQYPKwYBBAGBrSGCLAIBBAMBMAgGBmeBDAECAjAJBgNV
-HRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUH
-AwEwHQYDVR0OBBYEFP4tPNkQOhz1sk/77Ft0aqscEojMMB8GA1UdIwQYMBaAFALW
-Hm4Jq79YZacKPEgzYdHOfcNbMC4GA1UdEQQnMCWCFXNoaWJib2xldGgtaWRwLm1w
-Zy5kZYEMc2hpYkBnd2RnLmRlMHcGA1UdHwRwMG4wNaAzoDGGL2h0dHA6Ly9jZHAx
-LnBjYS5kZm4uZGUvbXBnLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMDWgM6Axhi9odHRw
-Oi8vY2RwMi5wY2EuZGZuLmRlL21wZy1jYS9wdWIvY3JsL2NhY3JsLmNybDCBxwYI
-KwYBBQUHAQEEgbowgbcwMwYIKwYBBQUHMAGGJ2h0dHA6Ly9vY3NwLnBjYS5kZm4u
-ZGUvT0NTUC1TZXJ2ZXIvT0NTUDA/BggrBgEFBQcwAoYzaHR0cDovL2NkcDEucGNh
-LmRmbi5kZS9tcGctY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MD8GCCsGAQUFBzAC
-hjNodHRwOi8vY2RwMi5wY2EuZGZuLmRlL21wZy1jYS9wdWIvY2FjZXJ0L2NhY2Vy
-dC5jcnQwDQYJKoZIhvcNAQEFBQADggEBACneffiJgzK7uq8KZEhT3Qh1YA8EoPHD
-z5pigbg1F2IjuRozsxx2MPIHbzvuuXgXLhCNfxw4kepXammx0aYKFQJfhL9/O8Xo
-/KusssOTqTOM5tPJ6w5irVthTIAodch2St9DmF6YV4LfOnXPdKNKAz+LMOfl80ua
-tB/B2fjfaQGqTZY70RctOsS3SdOPub29OqAPS3xYT/dCZd3CSP4E6pjpqFKWDz0w
-LmveeJ9FG98fbaN0wbBh6abViYIfyeednJGp6efTra9aHjdxlGyExBnGjeAbi7iK
-tfyPYfYMvj1QxW+/LOG5aWb/RlyNQG90t+E7Ydh7zj03deDYQk4u3wM=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth-idp.mpg.de:8443/mpg/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth-idp.mpg.de:8443/mpg/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth-idp.mpg.de/mpg/profile/SAML2/Redirect/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth-idp.mpg.de/mpg/profile/SAML2/POST/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth-idp.mpg.de:8443/mpg/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.mpg.de/mpg/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth-idp.mpg.de/mpg/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth-idp.mpg.de/mpg/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth-idp.mpg.de/mpg/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">mpg.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>shibboleth-idp.mpg.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=shibboleth-idp.mpg.de,OU=PKI,O=Max-Planck-Gesellschaft,L=Goettingen,ST=Niedersachsen,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFlTCCBH2gAwIBAgIHF4B2l7InVDANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQG
-EwJERTEgMB4GA1UEChMXTWF4LVBsYW5jay1HZXNlbGxzY2hhZnQxDzANBgNVBAMT
-Bk1QRyBDQTEcMBoGCSqGSIb3DQEJARYNbXBnLWNhQG1wZy5kZTAeFw0xNDA0MzAx
-MzIyMTVaFw0xOTA0MjkxMzIyMTVaMIGKMQswCQYDVQQGEwJERTEWMBQGA1UECBMN
-TmllZGVyc2FjaHNlbjETMBEGA1UEBxMKR29ldHRpbmdlbjEgMB4GA1UEChMXTWF4
-LVBsYW5jay1HZXNlbGxzY2hhZnQxDDAKBgNVBAsTA1BLSTEeMBwGA1UEAxMVc2hp
-YmJvbGV0aC1pZHAubXBnLmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
-AQEArolAQS1UWd9cHm/XD91J6m3yhQHIzNcHyAPHyPsF4Z/M5+2g4hlSSIPrHYSc
-HI2PSF7DpttiBfTMim2yq7GFCBdJHtZZP0i5Ajk2KuyM4oHHxANYaBzAPiClYbOb
-0oO0hENluVnIBiTkgcfmmFrEXiiA7ltjyONOmSRdEeIdbDUm704NI5d0S6OJ0J+5
-01NLXyHwMLdiLa7dOIjINY9wMJVOhgotYb0HodCfZUF4vuuvkw/JEWK2xEigvTD9
-aIJXdwdpcrx7DgkBbNto+fNPV2evJHHUy++QPbiNG2/2QajLnUAIAgQQsAfZX7zT
-xN2UW9V2dKXIykA621NzSOp8bwIDAQABo4ICKTCCAiUwOQYDVR0gBDIwMDARBg8r
-BgEEAYGtIYIsAQEEAwEwEQYPKwYBBAGBrSGCLAIBBAMBMAgGBmeBDAECAjAJBgNV
-HRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUH
-AwEwHQYDVR0OBBYEFP4tPNkQOhz1sk/77Ft0aqscEojMMB8GA1UdIwQYMBaAFALW
-Hm4Jq79YZacKPEgzYdHOfcNbMC4GA1UdEQQnMCWCFXNoaWJib2xldGgtaWRwLm1w
-Zy5kZYEMc2hpYkBnd2RnLmRlMHcGA1UdHwRwMG4wNaAzoDGGL2h0dHA6Ly9jZHAx
-LnBjYS5kZm4uZGUvbXBnLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMDWgM6Axhi9odHRw
-Oi8vY2RwMi5wY2EuZGZuLmRlL21wZy1jYS9wdWIvY3JsL2NhY3JsLmNybDCBxwYI
-KwYBBQUHAQEEgbowgbcwMwYIKwYBBQUHMAGGJ2h0dHA6Ly9vY3NwLnBjYS5kZm4u
-ZGUvT0NTUC1TZXJ2ZXIvT0NTUDA/BggrBgEFBQcwAoYzaHR0cDovL2NkcDEucGNh
-LmRmbi5kZS9tcGctY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MD8GCCsGAQUFBzAC
-hjNodHRwOi8vY2RwMi5wY2EuZGZuLmRlL21wZy1jYS9wdWIvY2FjZXJ0L2NhY2Vy
-dC5jcnQwDQYJKoZIhvcNAQEFBQADggEBACneffiJgzK7uq8KZEhT3Qh1YA8EoPHD
-z5pigbg1F2IjuRozsxx2MPIHbzvuuXgXLhCNfxw4kepXammx0aYKFQJfhL9/O8Xo
-/KusssOTqTOM5tPJ6w5irVthTIAodch2St9DmF6YV4LfOnXPdKNKAz+LMOfl80ua
-tB/B2fjfaQGqTZY70RctOsS3SdOPub29OqAPS3xYT/dCZd3CSP4E6pjpqFKWDz0w
-LmveeJ9FG98fbaN0wbBh6abViYIfyeednJGp6efTra9aHjdxlGyExBnGjeAbi7iK
-tfyPYfYMvj1QxW+/LOG5aWb/RlyNQG90t+E7Ydh7zj03deDYQk4u3wM=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth-idp.mpg.de:8443/mpg/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth-idp.mpg.de:8443/mpg/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">e71</OrganizationName>
-    <OrganizationName xml:lang="en">e71</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">Max-Planck-Gesellschaft</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">Max-Planck-Gesellschaft</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.biochem.mpg.de</OrganizationURL>
-    <OrganizationURL xml:lang="en">http://www.biochem.mpg.de</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Daniel</GivenName>
-    <SurName>Adler</SurName>
-    <EmailAddress>mailto:daniel.adler@gwdg.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="support">
-    <GivenName>Christof</GivenName>
-    <SurName>Pohl</SurName>
-    <EmailAddress>mailto:christof.pohl@gwdg.de</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth-idp.pucrs.br-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth-idp.pucrs.br-idp-shibboleth.xml
deleted file mode 100644
index 365929e4..00000000
--- a/swamid-interfederations-2.0/shibboleth-idp.pucrs.br-idp-shibboleth.xml
+++ /dev/null
@@ -1,102 +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-idp.pucrs.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">pucrs.br</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">PUCRS - Pontificia Universidade Catolica do Rio Grande do Sul</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="pt-br">PUCRS - Pontificia Universidade Catolica do Rio Grande do Sul</mdui:DisplayName>
-        <mdui:Description xml:lang="en">PUCRS - Pontificia Universidade Catolica do Rio Grande do Sul</mdui:Description>
-        <mdui:Description xml:lang="pt-br">PUCRS - Pontificia Universidade Catolica do Rio Grande do Sul</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.pucrs.br/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="pt-br">http://www.pucrs.br/</mdui:InformationURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-    MIIC6jCCAdICAQAwDQYJKoZIhvcNAQEFBQAwOzEKMAgGA1UECxMBIDELMAkGA1UE
-BhMCQlIxIDAeBgNVBAMTF3NoaWJib2xldGgtaWRwLnB1Y3JzLmJyMB4XDTE0MDkw
-MzE2NTAyNloXDTE5MDkwMjE2NTAyNlowOzEKMAgGA1UECxMBIDELMAkGA1UEBhMC
-QlIxIDAeBgNVBAMTF3NoaWJib2xldGgtaWRwLnB1Y3JzLmJyMIIBIjANBgkqhkiG
-9w0BAQEFAAOCAQ8AMIIBCgKCAQEA1iilPh8rOxBD8ceqrAb8KcN3WRX6V8CtSEs8
-GBAKjDt9nRYpFavkJcW6w6+w6ZJz1KlJndy6sgleGjsXR1za5nK3gKe3nvWJwkIm
-qNX/nAjBegCnvxq8VSJ4VspLYZQYoTIbAiGvSs7pP++/7OBimb424JHU+16+ceqG
-F75C9tXeA3vOJzHS/bLgxhRwyhhug25DHkTl8wVDuCU0q/P8Y0D6sLEXaYFb2jl0
-piXWK7dz/5LhX2AyyKtrYlQEzgndR/SkANY5iIFiXqJ7/q5tQTOQQN4aeb9YEQJa
-NWJfoa4co8LTmHki6KQvPCmtaBBAjSU7kk9s3+mXJL8lgtRI6QIDAQABMA0GCSqG
-SIb3DQEBBQUAA4IBAQDRcEBWeU30bZBS/mtcDGdhsbxjLmd1IhHAio/iuHrVvfv6
-0RJv9BtOokGbtsGLInxH/HEqUAm7+I3lm2UH/ah5oSEreumLPpNnGwtqsK+z/oN3
-we03FEd0WUl8GkMsLapmbaQ/NlP8oQDVWTjfYsrUSak42uW8LZ88OUz30NHhYFwo
-2UCXamrmbHrnlCKZFKjWypn2GCwPMZ+liM1Yfxdlp6yVzgTDKpAI8fU/bEwgc3V4
-OIw0tlAwW9X8O7oWvd7h9dfyqCCmHee2LzqZaC+uAb0XPEDeEN+rhgwZPGsjlxpJ
-Zc48iq/nJ5myburOM8iFHNedgaLhTDDuTXIM0EWL
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth-idp.pucrs.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth-idp.pucrs.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-idp.pucrs.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth-idp.pucrs.br/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth-idp.pucrs.br/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth-idp.pucrs.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">pucrs.br</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-      
-MIIC6jCCAdICAQAwDQYJKoZIhvcNAQEFBQAwOzEKMAgGA1UECxMBIDELMAkGA1UE
-BhMCQlIxIDAeBgNVBAMTF3NoaWJib2xldGgtaWRwLnB1Y3JzLmJyMB4XDTE0MDkw
-MzE2NTAyNloXDTE5MDkwMjE2NTAyNlowOzEKMAgGA1UECxMBIDELMAkGA1UEBhMC
-QlIxIDAeBgNVBAMTF3NoaWJib2xldGgtaWRwLnB1Y3JzLmJyMIIBIjANBgkqhkiG
-9w0BAQEFAAOCAQ8AMIIBCgKCAQEA1iilPh8rOxBD8ceqrAb8KcN3WRX6V8CtSEs8
-GBAKjDt9nRYpFavkJcW6w6+w6ZJz1KlJndy6sgleGjsXR1za5nK3gKe3nvWJwkIm
-qNX/nAjBegCnvxq8VSJ4VspLYZQYoTIbAiGvSs7pP++/7OBimb424JHU+16+ceqG
-F75C9tXeA3vOJzHS/bLgxhRwyhhug25DHkTl8wVDuCU0q/P8Y0D6sLEXaYFb2jl0
-piXWK7dz/5LhX2AyyKtrYlQEzgndR/SkANY5iIFiXqJ7/q5tQTOQQN4aeb9YEQJa
-NWJfoa4co8LTmHki6KQvPCmtaBBAjSU7kk9s3+mXJL8lgtRI6QIDAQABMA0GCSqG
-SIb3DQEBBQUAA4IBAQDRcEBWeU30bZBS/mtcDGdhsbxjLmd1IhHAio/iuHrVvfv6
-0RJv9BtOokGbtsGLInxH/HEqUAm7+I3lm2UH/ah5oSEreumLPpNnGwtqsK+z/oN3
-we03FEd0WUl8GkMsLapmbaQ/NlP8oQDVWTjfYsrUSak42uW8LZ88OUz30NHhYFwo
-2UCXamrmbHrnlCKZFKjWypn2GCwPMZ+liM1Yfxdlp6yVzgTDKpAI8fU/bEwgc3V4
-OIw0tlAwW9X8O7oWvd7h9dfyqCCmHee2LzqZaC+uAb0XPEDeEN+rhgwZPGsjlxpJ
-Zc48iq/nJ5myburOM8iFHNedgaLhTDDuTXIM0EWL
-                    
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth-idp.pucrs.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth-idp.pucrs.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">PUCRS - Pontificia Universidade Catolica do Rio Grande do Sul</OrganizationName>
-    <OrganizationName xml:lang="pt-br">PUCRS - Pontificia Universidade Catolica do Rio Grande do Sul</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">PUCRS - Pontificia Universidade Catolica do Rio Grande do Sul</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="pt-br">PUCRS - Pontificia Universidade Catolica do Rio Grande do Sul</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.pucrs.br/</OrganizationURL>
-    <OrganizationURL xml:lang="pt-br">http://www.pucrs.br/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Dilermando Bueno</SurName>
-    <EmailAddress>dbueno@pucrs.br</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth-idp.pucrs.br.xml b/swamid-interfederations-2.0/shibboleth-idp.pucrs.br.xml
deleted file mode 100644
index 365929e4..00000000
--- a/swamid-interfederations-2.0/shibboleth-idp.pucrs.br.xml
+++ /dev/null
@@ -1,102 +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-idp.pucrs.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">pucrs.br</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">PUCRS - Pontificia Universidade Catolica do Rio Grande do Sul</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="pt-br">PUCRS - Pontificia Universidade Catolica do Rio Grande do Sul</mdui:DisplayName>
-        <mdui:Description xml:lang="en">PUCRS - Pontificia Universidade Catolica do Rio Grande do Sul</mdui:Description>
-        <mdui:Description xml:lang="pt-br">PUCRS - Pontificia Universidade Catolica do Rio Grande do Sul</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.pucrs.br/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="pt-br">http://www.pucrs.br/</mdui:InformationURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-    MIIC6jCCAdICAQAwDQYJKoZIhvcNAQEFBQAwOzEKMAgGA1UECxMBIDELMAkGA1UE
-BhMCQlIxIDAeBgNVBAMTF3NoaWJib2xldGgtaWRwLnB1Y3JzLmJyMB4XDTE0MDkw
-MzE2NTAyNloXDTE5MDkwMjE2NTAyNlowOzEKMAgGA1UECxMBIDELMAkGA1UEBhMC
-QlIxIDAeBgNVBAMTF3NoaWJib2xldGgtaWRwLnB1Y3JzLmJyMIIBIjANBgkqhkiG
-9w0BAQEFAAOCAQ8AMIIBCgKCAQEA1iilPh8rOxBD8ceqrAb8KcN3WRX6V8CtSEs8
-GBAKjDt9nRYpFavkJcW6w6+w6ZJz1KlJndy6sgleGjsXR1za5nK3gKe3nvWJwkIm
-qNX/nAjBegCnvxq8VSJ4VspLYZQYoTIbAiGvSs7pP++/7OBimb424JHU+16+ceqG
-F75C9tXeA3vOJzHS/bLgxhRwyhhug25DHkTl8wVDuCU0q/P8Y0D6sLEXaYFb2jl0
-piXWK7dz/5LhX2AyyKtrYlQEzgndR/SkANY5iIFiXqJ7/q5tQTOQQN4aeb9YEQJa
-NWJfoa4co8LTmHki6KQvPCmtaBBAjSU7kk9s3+mXJL8lgtRI6QIDAQABMA0GCSqG
-SIb3DQEBBQUAA4IBAQDRcEBWeU30bZBS/mtcDGdhsbxjLmd1IhHAio/iuHrVvfv6
-0RJv9BtOokGbtsGLInxH/HEqUAm7+I3lm2UH/ah5oSEreumLPpNnGwtqsK+z/oN3
-we03FEd0WUl8GkMsLapmbaQ/NlP8oQDVWTjfYsrUSak42uW8LZ88OUz30NHhYFwo
-2UCXamrmbHrnlCKZFKjWypn2GCwPMZ+liM1Yfxdlp6yVzgTDKpAI8fU/bEwgc3V4
-OIw0tlAwW9X8O7oWvd7h9dfyqCCmHee2LzqZaC+uAb0XPEDeEN+rhgwZPGsjlxpJ
-Zc48iq/nJ5myburOM8iFHNedgaLhTDDuTXIM0EWL
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth-idp.pucrs.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth-idp.pucrs.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-idp.pucrs.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth-idp.pucrs.br/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth-idp.pucrs.br/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth-idp.pucrs.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">pucrs.br</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-      
-MIIC6jCCAdICAQAwDQYJKoZIhvcNAQEFBQAwOzEKMAgGA1UECxMBIDELMAkGA1UE
-BhMCQlIxIDAeBgNVBAMTF3NoaWJib2xldGgtaWRwLnB1Y3JzLmJyMB4XDTE0MDkw
-MzE2NTAyNloXDTE5MDkwMjE2NTAyNlowOzEKMAgGA1UECxMBIDELMAkGA1UEBhMC
-QlIxIDAeBgNVBAMTF3NoaWJib2xldGgtaWRwLnB1Y3JzLmJyMIIBIjANBgkqhkiG
-9w0BAQEFAAOCAQ8AMIIBCgKCAQEA1iilPh8rOxBD8ceqrAb8KcN3WRX6V8CtSEs8
-GBAKjDt9nRYpFavkJcW6w6+w6ZJz1KlJndy6sgleGjsXR1za5nK3gKe3nvWJwkIm
-qNX/nAjBegCnvxq8VSJ4VspLYZQYoTIbAiGvSs7pP++/7OBimb424JHU+16+ceqG
-F75C9tXeA3vOJzHS/bLgxhRwyhhug25DHkTl8wVDuCU0q/P8Y0D6sLEXaYFb2jl0
-piXWK7dz/5LhX2AyyKtrYlQEzgndR/SkANY5iIFiXqJ7/q5tQTOQQN4aeb9YEQJa
-NWJfoa4co8LTmHki6KQvPCmtaBBAjSU7kk9s3+mXJL8lgtRI6QIDAQABMA0GCSqG
-SIb3DQEBBQUAA4IBAQDRcEBWeU30bZBS/mtcDGdhsbxjLmd1IhHAio/iuHrVvfv6
-0RJv9BtOokGbtsGLInxH/HEqUAm7+I3lm2UH/ah5oSEreumLPpNnGwtqsK+z/oN3
-we03FEd0WUl8GkMsLapmbaQ/NlP8oQDVWTjfYsrUSak42uW8LZ88OUz30NHhYFwo
-2UCXamrmbHrnlCKZFKjWypn2GCwPMZ+liM1Yfxdlp6yVzgTDKpAI8fU/bEwgc3V4
-OIw0tlAwW9X8O7oWvd7h9dfyqCCmHee2LzqZaC+uAb0XPEDeEN+rhgwZPGsjlxpJ
-Zc48iq/nJ5myburOM8iFHNedgaLhTDDuTXIM0EWL
-                    
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth-idp.pucrs.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth-idp.pucrs.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">PUCRS - Pontificia Universidade Catolica do Rio Grande do Sul</OrganizationName>
-    <OrganizationName xml:lang="pt-br">PUCRS - Pontificia Universidade Catolica do Rio Grande do Sul</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">PUCRS - Pontificia Universidade Catolica do Rio Grande do Sul</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="pt-br">PUCRS - Pontificia Universidade Catolica do Rio Grande do Sul</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.pucrs.br/</OrganizationURL>
-    <OrganizationURL xml:lang="pt-br">http://www.pucrs.br/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Dilermando Bueno</SurName>
-    <EmailAddress>dbueno@pucrs.br</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth-idp.uni-goettingen.de-uni-shibboleth.xml b/swamid-interfederations-2.0/shibboleth-idp.uni-goettingen.de-uni-shibboleth.xml
deleted file mode 100644
index bc7996fb..00000000
--- a/swamid-interfederations-2.0/shibboleth-idp.uni-goettingen.de-uni-shibboleth.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://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>MIIGKjCCBRKgAwIBAgIHF4B3Y7hUSjANBgkqhkiG9w0BAQUFADCBrjELMAkGA1UE
-BhMCREUxFjAUBgNVBAgTDU5pZWRlcnNhY2hzZW4xEzARBgNVBAcTCkdvZXR0aW5n
-ZW4xLTArBgNVBAoTJEdlb3JnLUF1Z3VzdC1Vbml2ZXJzaXRhZXQgR29ldHRpbmdl
-bjEjMCEGA1UEAxMaVW5pdmVyc2l0YWV0LUdvZXR0aW5nZW4gQ0ExHjAcBgkqhkiG
-9w0BCQEWD2d3ZGctY2FAZ3dkZy5kZTAeFw0xNDA0MzAxMzI1MzlaFw0xOTA0Mjkx
-MzI1MzlaMIGUMQswCQYDVQQGEwJERTEWMBQGA1UECBMNTmllZGVyc2FjaHNlbjET
-MBEGA1UEBxMKR29ldHRpbmdlbjEtMCsGA1UEChMkR2VvcmctQXVndXN0LVVuaXZl
-cnNpdGFldCBHb2V0dGluZ2VuMSkwJwYDVQQDEyBzaGliYm9sZXRoLWlkcC51bmkt
-Z29ldHRpbmdlbi5kZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKaY
-OIuBhaYLZU4M7a9+ut9NChZQiFVxbIJ3jZPMMjtiulx5f6zLDK43QUI4G6MBy6l0
-EEToRvIP2Y39COyDFrJO6Bgk+gIfHvHpogXBZiOk7Nf4PbtV9Mi9uffE/B9fMLdZ
-+jwoHS8ZD8bRuTXuJRq9pHK8g5qrJfYwoWvU4Z+DvdU2hYEvtNm28rUDkyfbPUI2
-HruUKu4nJyc/wK1uwZSrGsXvJ8J/YouIVYEUl0LoEZg4zrXolh1yka9U+GwNY/a9
-Pyvsi8Qglsujvs/klWyDM8k7iGeVwpAVcEQasNo+enjBodt9PLeNnHcjtaqvlvXK
-G8NOjFrtm+nP38EzXXkCAwEAAaOCAmMwggJfMDkGA1UdIAQyMDAwEQYPKwYBBAGB
-rSGCLAEBBAMBMBEGDysGAQQBga0hgiwCAQQDATAIBgZngQwBAgIwCQYDVR0TBAIw
-ADALBgNVHQ8EBAMCBeAwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMB0G
-A1UdDgQWBBS5CdgiLqqsrOWLdx1BYgQU/xu4vDAfBgNVHSMEGDAWgBQdvXPMbe5u
-HHRw2aMbOrqoJ9686zA5BgNVHREEMjAwgiBzaGliYm9sZXRoLWlkcC51bmktZ29l
-dHRpbmdlbi5kZYEMc2hpYkBnd2RnLmRlMIGPBgNVHR8EgYcwgYQwQKA+oDyGOmh0
-dHA6Ly9jZHAxLnBjYS5kZm4uZGUvdW5pLWdvZXR0aW5nZW4tY2EvcHViL2NybC9j
-YWNybC5jcmwwQKA+oDyGOmh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvdW5pLWdvZXR0
-aW5nZW4tY2EvcHViL2NybC9jYWNybC5jcmwwgd0GCCsGAQUFBwEBBIHQMIHNMDMG
-CCsGAQUFBzABhidodHRwOi8vb2NzcC5wY2EuZGZuLmRlL09DU1AtU2VydmVyL09D
-U1AwSgYIKwYBBQUHMAKGPmh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvdW5pLWdvZXR0
-aW5nZW4tY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MEoGCCsGAQUFBzAChj5odHRw
-Oi8vY2RwMi5wY2EuZGZuLmRlL3VuaS1nb2V0dGluZ2VuLWNhL3B1Yi9jYWNlcnQv
-Y2FjZXJ0LmNydDANBgkqhkiG9w0BAQUFAAOCAQEARzs6ng60wS+YtUJeEpa6j2Ee
-kB2+JrXmoBO5ho8X4zUXIsnFU09yEL9Fp3uxmSZnUIKBKQbjmOqJlQj5a3jfuqhU
-lz4BJHDcFG7ine6xMmVR8HEo7vgYISyjqfIJn4aB9EO1Vi1uOY8WApPnDVlFpoHt
-khvLc8hFipt8dWc+LHalZibqdVsNppN0LZi/A2zDnq/oSBrFB49Rs9eaMHx7H95I
-bs3e0k+2d5H0rUK+/oKp9nWzCEt7wDpI2zPVzKyKbMwZ5/DIYtiF6WMZK1bM3zow
-NoiaiccK26vE3CCe+eBrIvz53bLP3zTxI0Z+80apvUj+JwIw0UL03626ma24wQ==
-</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>MIIGKjCCBRKgAwIBAgIHF4B3Y7hUSjANBgkqhkiG9w0BAQUFADCBrjELMAkGA1UE
-BhMCREUxFjAUBgNVBAgTDU5pZWRlcnNhY2hzZW4xEzARBgNVBAcTCkdvZXR0aW5n
-ZW4xLTArBgNVBAoTJEdlb3JnLUF1Z3VzdC1Vbml2ZXJzaXRhZXQgR29ldHRpbmdl
-bjEjMCEGA1UEAxMaVW5pdmVyc2l0YWV0LUdvZXR0aW5nZW4gQ0ExHjAcBgkqhkiG
-9w0BCQEWD2d3ZGctY2FAZ3dkZy5kZTAeFw0xNDA0MzAxMzI1MzlaFw0xOTA0Mjkx
-MzI1MzlaMIGUMQswCQYDVQQGEwJERTEWMBQGA1UECBMNTmllZGVyc2FjaHNlbjET
-MBEGA1UEBxMKR29ldHRpbmdlbjEtMCsGA1UEChMkR2VvcmctQXVndXN0LVVuaXZl
-cnNpdGFldCBHb2V0dGluZ2VuMSkwJwYDVQQDEyBzaGliYm9sZXRoLWlkcC51bmkt
-Z29ldHRpbmdlbi5kZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKaY
-OIuBhaYLZU4M7a9+ut9NChZQiFVxbIJ3jZPMMjtiulx5f6zLDK43QUI4G6MBy6l0
-EEToRvIP2Y39COyDFrJO6Bgk+gIfHvHpogXBZiOk7Nf4PbtV9Mi9uffE/B9fMLdZ
-+jwoHS8ZD8bRuTXuJRq9pHK8g5qrJfYwoWvU4Z+DvdU2hYEvtNm28rUDkyfbPUI2
-HruUKu4nJyc/wK1uwZSrGsXvJ8J/YouIVYEUl0LoEZg4zrXolh1yka9U+GwNY/a9
-Pyvsi8Qglsujvs/klWyDM8k7iGeVwpAVcEQasNo+enjBodt9PLeNnHcjtaqvlvXK
-G8NOjFrtm+nP38EzXXkCAwEAAaOCAmMwggJfMDkGA1UdIAQyMDAwEQYPKwYBBAGB
-rSGCLAEBBAMBMBEGDysGAQQBga0hgiwCAQQDATAIBgZngQwBAgIwCQYDVR0TBAIw
-ADALBgNVHQ8EBAMCBeAwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMB0G
-A1UdDgQWBBS5CdgiLqqsrOWLdx1BYgQU/xu4vDAfBgNVHSMEGDAWgBQdvXPMbe5u
-HHRw2aMbOrqoJ9686zA5BgNVHREEMjAwgiBzaGliYm9sZXRoLWlkcC51bmktZ29l
-dHRpbmdlbi5kZYEMc2hpYkBnd2RnLmRlMIGPBgNVHR8EgYcwgYQwQKA+oDyGOmh0
-dHA6Ly9jZHAxLnBjYS5kZm4uZGUvdW5pLWdvZXR0aW5nZW4tY2EvcHViL2NybC9j
-YWNybC5jcmwwQKA+oDyGOmh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvdW5pLWdvZXR0
-aW5nZW4tY2EvcHViL2NybC9jYWNybC5jcmwwgd0GCCsGAQUFBwEBBIHQMIHNMDMG
-CCsGAQUFBzABhidodHRwOi8vb2NzcC5wY2EuZGZuLmRlL09DU1AtU2VydmVyL09D
-U1AwSgYIKwYBBQUHMAKGPmh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvdW5pLWdvZXR0
-aW5nZW4tY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MEoGCCsGAQUFBzAChj5odHRw
-Oi8vY2RwMi5wY2EuZGZuLmRlL3VuaS1nb2V0dGluZ2VuLWNhL3B1Yi9jYWNlcnQv
-Y2FjZXJ0LmNydDANBgkqhkiG9w0BAQUFAAOCAQEARzs6ng60wS+YtUJeEpa6j2Ee
-kB2+JrXmoBO5ho8X4zUXIsnFU09yEL9Fp3uxmSZnUIKBKQbjmOqJlQj5a3jfuqhU
-lz4BJHDcFG7ine6xMmVR8HEo7vgYISyjqfIJn4aB9EO1Vi1uOY8WApPnDVlFpoHt
-khvLc8hFipt8dWc+LHalZibqdVsNppN0LZi/A2zDnq/oSBrFB49Rs9eaMHx7H95I
-bs3e0k+2d5H0rUK+/oKp9nWzCEt7wDpI2zPVzKyKbMwZ5/DIYtiF6WMZK1bM3zow
-NoiaiccK26vE3CCe+eBrIvz53bLP3zTxI0Z+80apvUj+JwIw0UL03626ma24wQ==
-</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-goettingen.de.xml b/swamid-interfederations-2.0/shibboleth-idp.uni-goettingen.de.xml
deleted file mode 100644
index bc7996fb..00000000
--- a/swamid-interfederations-2.0/shibboleth-idp.uni-goettingen.de.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://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>MIIGKjCCBRKgAwIBAgIHF4B3Y7hUSjANBgkqhkiG9w0BAQUFADCBrjELMAkGA1UE
-BhMCREUxFjAUBgNVBAgTDU5pZWRlcnNhY2hzZW4xEzARBgNVBAcTCkdvZXR0aW5n
-ZW4xLTArBgNVBAoTJEdlb3JnLUF1Z3VzdC1Vbml2ZXJzaXRhZXQgR29ldHRpbmdl
-bjEjMCEGA1UEAxMaVW5pdmVyc2l0YWV0LUdvZXR0aW5nZW4gQ0ExHjAcBgkqhkiG
-9w0BCQEWD2d3ZGctY2FAZ3dkZy5kZTAeFw0xNDA0MzAxMzI1MzlaFw0xOTA0Mjkx
-MzI1MzlaMIGUMQswCQYDVQQGEwJERTEWMBQGA1UECBMNTmllZGVyc2FjaHNlbjET
-MBEGA1UEBxMKR29ldHRpbmdlbjEtMCsGA1UEChMkR2VvcmctQXVndXN0LVVuaXZl
-cnNpdGFldCBHb2V0dGluZ2VuMSkwJwYDVQQDEyBzaGliYm9sZXRoLWlkcC51bmkt
-Z29ldHRpbmdlbi5kZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKaY
-OIuBhaYLZU4M7a9+ut9NChZQiFVxbIJ3jZPMMjtiulx5f6zLDK43QUI4G6MBy6l0
-EEToRvIP2Y39COyDFrJO6Bgk+gIfHvHpogXBZiOk7Nf4PbtV9Mi9uffE/B9fMLdZ
-+jwoHS8ZD8bRuTXuJRq9pHK8g5qrJfYwoWvU4Z+DvdU2hYEvtNm28rUDkyfbPUI2
-HruUKu4nJyc/wK1uwZSrGsXvJ8J/YouIVYEUl0LoEZg4zrXolh1yka9U+GwNY/a9
-Pyvsi8Qglsujvs/klWyDM8k7iGeVwpAVcEQasNo+enjBodt9PLeNnHcjtaqvlvXK
-G8NOjFrtm+nP38EzXXkCAwEAAaOCAmMwggJfMDkGA1UdIAQyMDAwEQYPKwYBBAGB
-rSGCLAEBBAMBMBEGDysGAQQBga0hgiwCAQQDATAIBgZngQwBAgIwCQYDVR0TBAIw
-ADALBgNVHQ8EBAMCBeAwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMB0G
-A1UdDgQWBBS5CdgiLqqsrOWLdx1BYgQU/xu4vDAfBgNVHSMEGDAWgBQdvXPMbe5u
-HHRw2aMbOrqoJ9686zA5BgNVHREEMjAwgiBzaGliYm9sZXRoLWlkcC51bmktZ29l
-dHRpbmdlbi5kZYEMc2hpYkBnd2RnLmRlMIGPBgNVHR8EgYcwgYQwQKA+oDyGOmh0
-dHA6Ly9jZHAxLnBjYS5kZm4uZGUvdW5pLWdvZXR0aW5nZW4tY2EvcHViL2NybC9j
-YWNybC5jcmwwQKA+oDyGOmh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvdW5pLWdvZXR0
-aW5nZW4tY2EvcHViL2NybC9jYWNybC5jcmwwgd0GCCsGAQUFBwEBBIHQMIHNMDMG
-CCsGAQUFBzABhidodHRwOi8vb2NzcC5wY2EuZGZuLmRlL09DU1AtU2VydmVyL09D
-U1AwSgYIKwYBBQUHMAKGPmh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvdW5pLWdvZXR0
-aW5nZW4tY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MEoGCCsGAQUFBzAChj5odHRw
-Oi8vY2RwMi5wY2EuZGZuLmRlL3VuaS1nb2V0dGluZ2VuLWNhL3B1Yi9jYWNlcnQv
-Y2FjZXJ0LmNydDANBgkqhkiG9w0BAQUFAAOCAQEARzs6ng60wS+YtUJeEpa6j2Ee
-kB2+JrXmoBO5ho8X4zUXIsnFU09yEL9Fp3uxmSZnUIKBKQbjmOqJlQj5a3jfuqhU
-lz4BJHDcFG7ine6xMmVR8HEo7vgYISyjqfIJn4aB9EO1Vi1uOY8WApPnDVlFpoHt
-khvLc8hFipt8dWc+LHalZibqdVsNppN0LZi/A2zDnq/oSBrFB49Rs9eaMHx7H95I
-bs3e0k+2d5H0rUK+/oKp9nWzCEt7wDpI2zPVzKyKbMwZ5/DIYtiF6WMZK1bM3zow
-NoiaiccK26vE3CCe+eBrIvz53bLP3zTxI0Z+80apvUj+JwIw0UL03626ma24wQ==
-</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>MIIGKjCCBRKgAwIBAgIHF4B3Y7hUSjANBgkqhkiG9w0BAQUFADCBrjELMAkGA1UE
-BhMCREUxFjAUBgNVBAgTDU5pZWRlcnNhY2hzZW4xEzARBgNVBAcTCkdvZXR0aW5n
-ZW4xLTArBgNVBAoTJEdlb3JnLUF1Z3VzdC1Vbml2ZXJzaXRhZXQgR29ldHRpbmdl
-bjEjMCEGA1UEAxMaVW5pdmVyc2l0YWV0LUdvZXR0aW5nZW4gQ0ExHjAcBgkqhkiG
-9w0BCQEWD2d3ZGctY2FAZ3dkZy5kZTAeFw0xNDA0MzAxMzI1MzlaFw0xOTA0Mjkx
-MzI1MzlaMIGUMQswCQYDVQQGEwJERTEWMBQGA1UECBMNTmllZGVyc2FjaHNlbjET
-MBEGA1UEBxMKR29ldHRpbmdlbjEtMCsGA1UEChMkR2VvcmctQXVndXN0LVVuaXZl
-cnNpdGFldCBHb2V0dGluZ2VuMSkwJwYDVQQDEyBzaGliYm9sZXRoLWlkcC51bmkt
-Z29ldHRpbmdlbi5kZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKaY
-OIuBhaYLZU4M7a9+ut9NChZQiFVxbIJ3jZPMMjtiulx5f6zLDK43QUI4G6MBy6l0
-EEToRvIP2Y39COyDFrJO6Bgk+gIfHvHpogXBZiOk7Nf4PbtV9Mi9uffE/B9fMLdZ
-+jwoHS8ZD8bRuTXuJRq9pHK8g5qrJfYwoWvU4Z+DvdU2hYEvtNm28rUDkyfbPUI2
-HruUKu4nJyc/wK1uwZSrGsXvJ8J/YouIVYEUl0LoEZg4zrXolh1yka9U+GwNY/a9
-Pyvsi8Qglsujvs/klWyDM8k7iGeVwpAVcEQasNo+enjBodt9PLeNnHcjtaqvlvXK
-G8NOjFrtm+nP38EzXXkCAwEAAaOCAmMwggJfMDkGA1UdIAQyMDAwEQYPKwYBBAGB
-rSGCLAEBBAMBMBEGDysGAQQBga0hgiwCAQQDATAIBgZngQwBAgIwCQYDVR0TBAIw
-ADALBgNVHQ8EBAMCBeAwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMB0G
-A1UdDgQWBBS5CdgiLqqsrOWLdx1BYgQU/xu4vDAfBgNVHSMEGDAWgBQdvXPMbe5u
-HHRw2aMbOrqoJ9686zA5BgNVHREEMjAwgiBzaGliYm9sZXRoLWlkcC51bmktZ29l
-dHRpbmdlbi5kZYEMc2hpYkBnd2RnLmRlMIGPBgNVHR8EgYcwgYQwQKA+oDyGOmh0
-dHA6Ly9jZHAxLnBjYS5kZm4uZGUvdW5pLWdvZXR0aW5nZW4tY2EvcHViL2NybC9j
-YWNybC5jcmwwQKA+oDyGOmh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvdW5pLWdvZXR0
-aW5nZW4tY2EvcHViL2NybC9jYWNybC5jcmwwgd0GCCsGAQUFBwEBBIHQMIHNMDMG
-CCsGAQUFBzABhidodHRwOi8vb2NzcC5wY2EuZGZuLmRlL09DU1AtU2VydmVyL09D
-U1AwSgYIKwYBBQUHMAKGPmh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvdW5pLWdvZXR0
-aW5nZW4tY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MEoGCCsGAQUFBzAChj5odHRw
-Oi8vY2RwMi5wY2EuZGZuLmRlL3VuaS1nb2V0dGluZ2VuLWNhL3B1Yi9jYWNlcnQv
-Y2FjZXJ0LmNydDANBgkqhkiG9w0BAQUFAAOCAQEARzs6ng60wS+YtUJeEpa6j2Ee
-kB2+JrXmoBO5ho8X4zUXIsnFU09yEL9Fp3uxmSZnUIKBKQbjmOqJlQj5a3jfuqhU
-lz4BJHDcFG7ine6xMmVR8HEo7vgYISyjqfIJn4aB9EO1Vi1uOY8WApPnDVlFpoHt
-khvLc8hFipt8dWc+LHalZibqdVsNppN0LZi/A2zDnq/oSBrFB49Rs9eaMHx7H95I
-bs3e0k+2d5H0rUK+/oKp9nWzCEt7wDpI2zPVzKyKbMwZ5/DIYtiF6WMZK1bM3zow
-NoiaiccK26vE3CCe+eBrIvz53bLP3zTxI0Z+80apvUj+JwIw0UL03626ma24wQ==
-</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-regensburg.de-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth-idp.uni-regensburg.de-idp-shibboleth.xml
deleted file mode 100644
index e1548cd7..00000000
--- a/swamid-interfederations-2.0/shibboleth-idp.uni-regensburg.de-idp-shibboleth.xml
+++ /dev/null
@@ -1,155 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth-idp.uni-regensburg.de/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2014-06-25T09:17:34Z">
-      <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-regensburg.de</saml1md:Scope>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">ur.de</saml1md:Scope>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">ukr.de</saml1md:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="de">Universität Regensburg</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Universität Regensburg</mdui:DisplayName>
-        <mdui:Description xml:lang="de">IdP der Universität Regensburg</mdui:Description>
-        <mdui:Description xml:lang="en">IdP der Universität Regensburg</mdui:Description>
-        <mdui:Logo height="16" width="16">https://shibboleth-idp.uni-regensburg.de/logo_16x16.gif</mdui:Logo>
-        <mdui:Logo height="76" width="205">https://shibboleth-idp.uni-regensburg.de/loginlogo_205x76.gif</mdui:Logo>
-        <mdui:InformationURL xml:lang="de">http://www.uni-regensburg.de</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">http://www.uni-regensburg.de/index.html.en</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="de">http://www.uni-regensburg.de/datenschutz/index.html</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="en">http://www.uni-regensburg.de/privacy/index.html</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>shibboleth-idp.uni-regensburg.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=shibboleth-idp.uni-regensburg.de,OU=Rechenzentrum,O=Universitaet Regensburg,L=Regensburg,ST=Bayern,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFvjCCBKagAwIBAgIHE7iKqh6JUDANBgkqhkiG9w0BAQUFADCBnTELMAkGA1UE
-BhMCREUxDzANBgNVBAgTBkJheWVybjETMBEGA1UEBxMKUmVnZW5zYnVyZzEgMB4G
-A1UEChMXVW5pdmVyc2l0YWV0IFJlZ2Vuc2J1cmcxIDAeBgNVBAMTF1VuaSBSZWdl
-bnNidXJnIENBIC0gRzAxMSQwIgYJKoZIhvcNAQkBFhVwa2lAdW5pLXJlZ2Vuc2J1
-cmcuZGUwHhcNMTIwNDI2MDg1MzQ2WhcNMTcwNDI1MDg1MzQ2WjCBmDELMAkGA1UE
-BhMCREUxDzANBgNVBAgTBkJheWVybjETMBEGA1UEBxMKUmVnZW5zYnVyZzEgMB4G
-A1UEChMXVW5pdmVyc2l0YWV0IFJlZ2Vuc2J1cmcxFjAUBgNVBAsTDVJlY2hlbnpl
-bnRydW0xKTAnBgNVBAMTIHNoaWJib2xldGgtaWRwLnVuaS1yZWdlbnNidXJnLmRl
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtb6jhoh17E9k//d3JMwg
-vcKYcaYVfQV5ly3yO9jffYX7wQY8MMPcyZNICWDZb+vrMUdjDaVo6cH7E2x0wACY
-wLza6Y7XVODjm5KMiWOIaZ2UL8n4EM7uaqYqhOCuv5kSZ1wkCGQ1F8ta24vZRaxr
-Y/rFslWZ36ckoVh2UD1H2PASmPQNxtk8515kmjpAJa0pRxh6dmLuyaFnENhb/hMA
-VVvhrA7/BVeunf7k+slyafn3bfomRwlTsC7AmGO1zn2C7+PFT3DKEN565ZJjbM59
-aBhlshOyZx1eZ1il7jc8JtfuoChI1ZumbCuXsCMWQyWZEuzQJreloTZqs7S9bHu9
-nwIDAQABo4ICBDCCAgAwHAYDVR0gBBUwEzARBg8rBgEEAYGtIYIsAQEEAgIwCQYD
-VR0TBAIwADALBgNVHQ8EBAMCBeAwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUF
-BwMBMB0GA1UdDgQWBBQm+KuXQAlIJpFpDmYOW9kmR01qYTAfBgNVHSMEGDAWgBQH
-1915iF9BccwW4dTH852yeLHdSDAsBgNVHREEJTAjgSFlZG11bmQud2ViZXJAcnou
-dW5pLXJlZ2Vuc2J1cmcuZGUwgY8GA1UdHwSBhzCBhDBAoD6gPIY6aHR0cDovL2Nk
-cDEucGNhLmRmbi5kZS91bmktcmVnZW5zYnVyZy1jYS9wdWIvY3JsL2NhY3JsLmNy
-bDBAoD6gPIY6aHR0cDovL2NkcDIucGNhLmRmbi5kZS91bmktcmVnZW5zYnVyZy1j
-YS9wdWIvY3JsL2NhY3JsLmNybDCBqAYIKwYBBQUHAQEEgZswgZgwSgYIKwYBBQUH
-MAKGPmh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvdW5pLXJlZ2Vuc2J1cmctY2EvcHVi
-L2NhY2VydC9jYWNlcnQuY3J0MEoGCCsGAQUFBzAChj5odHRwOi8vY2RwMi5wY2Eu
-ZGZuLmRlL3VuaS1yZWdlbnNidXJnLWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDAN
-BgkqhkiG9w0BAQUFAAOCAQEAIGBPkosDWyhVvKtHzWP1W9i9/lg4v7+iRg/f+USs
-eBDEM5dyL80f6JBpYYBq0uguNmo7Z0hbg0UJIuWz4qReSASOXERlaN0MXtgYxXYa
-QCfZ9dSqommep5TDLY+tFX687R0aM3+D6livh8Zlk9tjvIK3peazeib7jWXkZuep
-3ZqgDNF14zSqrcGRg0wY/AEkpLf9k8+Aft3WAqjbf2QghzH1QLOwcBvFyJTKP1lf
-Eo29vwrtTxadJSyiGZd7qdYZPDi9NjCGU9ZAfN/60TZncWEoJmVZaq00as0wwSr3
-yRrHi0bPUSEYjGLZ5Muj2HV6lkYUuuhQxYEy8YCM01kN3A==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth-idp.uni-regensburg.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-regensburg.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-idp.uni-regensburg.de/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth-idp.uni-regensburg.de/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth-idp.uni-regensburg.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth-idp.uni-regensburg.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-regensburg.de</saml1md:Scope>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">ur.de</saml1md:Scope>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">ukr.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>shibboleth-idp.uni-regensburg.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=shibboleth-idp.uni-regensburg.de,OU=Rechenzentrum,O=Universitaet Regensburg,L=Regensburg,ST=Bayern,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFvjCCBKagAwIBAgIHE7iKqh6JUDANBgkqhkiG9w0BAQUFADCBnTELMAkGA1UE
-BhMCREUxDzANBgNVBAgTBkJheWVybjETMBEGA1UEBxMKUmVnZW5zYnVyZzEgMB4G
-A1UEChMXVW5pdmVyc2l0YWV0IFJlZ2Vuc2J1cmcxIDAeBgNVBAMTF1VuaSBSZWdl
-bnNidXJnIENBIC0gRzAxMSQwIgYJKoZIhvcNAQkBFhVwa2lAdW5pLXJlZ2Vuc2J1
-cmcuZGUwHhcNMTIwNDI2MDg1MzQ2WhcNMTcwNDI1MDg1MzQ2WjCBmDELMAkGA1UE
-BhMCREUxDzANBgNVBAgTBkJheWVybjETMBEGA1UEBxMKUmVnZW5zYnVyZzEgMB4G
-A1UEChMXVW5pdmVyc2l0YWV0IFJlZ2Vuc2J1cmcxFjAUBgNVBAsTDVJlY2hlbnpl
-bnRydW0xKTAnBgNVBAMTIHNoaWJib2xldGgtaWRwLnVuaS1yZWdlbnNidXJnLmRl
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtb6jhoh17E9k//d3JMwg
-vcKYcaYVfQV5ly3yO9jffYX7wQY8MMPcyZNICWDZb+vrMUdjDaVo6cH7E2x0wACY
-wLza6Y7XVODjm5KMiWOIaZ2UL8n4EM7uaqYqhOCuv5kSZ1wkCGQ1F8ta24vZRaxr
-Y/rFslWZ36ckoVh2UD1H2PASmPQNxtk8515kmjpAJa0pRxh6dmLuyaFnENhb/hMA
-VVvhrA7/BVeunf7k+slyafn3bfomRwlTsC7AmGO1zn2C7+PFT3DKEN565ZJjbM59
-aBhlshOyZx1eZ1il7jc8JtfuoChI1ZumbCuXsCMWQyWZEuzQJreloTZqs7S9bHu9
-nwIDAQABo4ICBDCCAgAwHAYDVR0gBBUwEzARBg8rBgEEAYGtIYIsAQEEAgIwCQYD
-VR0TBAIwADALBgNVHQ8EBAMCBeAwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUF
-BwMBMB0GA1UdDgQWBBQm+KuXQAlIJpFpDmYOW9kmR01qYTAfBgNVHSMEGDAWgBQH
-1915iF9BccwW4dTH852yeLHdSDAsBgNVHREEJTAjgSFlZG11bmQud2ViZXJAcnou
-dW5pLXJlZ2Vuc2J1cmcuZGUwgY8GA1UdHwSBhzCBhDBAoD6gPIY6aHR0cDovL2Nk
-cDEucGNhLmRmbi5kZS91bmktcmVnZW5zYnVyZy1jYS9wdWIvY3JsL2NhY3JsLmNy
-bDBAoD6gPIY6aHR0cDovL2NkcDIucGNhLmRmbi5kZS91bmktcmVnZW5zYnVyZy1j
-YS9wdWIvY3JsL2NhY3JsLmNybDCBqAYIKwYBBQUHAQEEgZswgZgwSgYIKwYBBQUH
-MAKGPmh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvdW5pLXJlZ2Vuc2J1cmctY2EvcHVi
-L2NhY2VydC9jYWNlcnQuY3J0MEoGCCsGAQUFBzAChj5odHRwOi8vY2RwMi5wY2Eu
-ZGZuLmRlL3VuaS1yZWdlbnNidXJnLWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDAN
-BgkqhkiG9w0BAQUFAAOCAQEAIGBPkosDWyhVvKtHzWP1W9i9/lg4v7+iRg/f+USs
-eBDEM5dyL80f6JBpYYBq0uguNmo7Z0hbg0UJIuWz4qReSASOXERlaN0MXtgYxXYa
-QCfZ9dSqommep5TDLY+tFX687R0aM3+D6livh8Zlk9tjvIK3peazeib7jWXkZuep
-3ZqgDNF14zSqrcGRg0wY/AEkpLf9k8+Aft3WAqjbf2QghzH1QLOwcBvFyJTKP1lf
-Eo29vwrtTxadJSyiGZd7qdYZPDi9NjCGU9ZAfN/60TZncWEoJmVZaq00as0wwSr3
-yRrHi0bPUSEYjGLZ5Muj2HV6lkYUuuhQxYEy8YCM01kN3A==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth-idp.uni-regensburg.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth-idp.uni-regensburg.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">e311</OrganizationName>
-    <OrganizationName xml:lang="en">e311</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">Universität Regensburg</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">University Regensburg</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.uni-regensburg.de</OrganizationURL>
-    <OrganizationURL xml:lang="en">http://www.uni-regensburg.de/index.html.en</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="administrative">
-    <GivenName>Martin</GivenName>
-    <SurName>Wimmer</SurName>
-    <EmailAddress>mailto:martin.wimmer@rz.uni-regensburg.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Edmund</GivenName>
-    <SurName>Weber</SurName>
-    <EmailAddress>mailto:edmund.weber@rz.uni-regensburg.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="support">
-    <GivenName>Help</GivenName>
-    <SurName>Desk</SurName>
-    <EmailAddress>mailto:support@rz.uni-regensburg.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Gerd</GivenName>
-    <SurName>Böhm</SurName>
-    <EmailAddress>mailto:gerd.boehm@rz.uni-regensburg.de</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth-idp.uni-regensburg.de.xml b/swamid-interfederations-2.0/shibboleth-idp.uni-regensburg.de.xml
deleted file mode 100644
index e1548cd7..00000000
--- a/swamid-interfederations-2.0/shibboleth-idp.uni-regensburg.de.xml
+++ /dev/null
@@ -1,155 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth-idp.uni-regensburg.de/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2014-06-25T09:17:34Z">
-      <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-regensburg.de</saml1md:Scope>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">ur.de</saml1md:Scope>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">ukr.de</saml1md:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="de">Universität Regensburg</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Universität Regensburg</mdui:DisplayName>
-        <mdui:Description xml:lang="de">IdP der Universität Regensburg</mdui:Description>
-        <mdui:Description xml:lang="en">IdP der Universität Regensburg</mdui:Description>
-        <mdui:Logo height="16" width="16">https://shibboleth-idp.uni-regensburg.de/logo_16x16.gif</mdui:Logo>
-        <mdui:Logo height="76" width="205">https://shibboleth-idp.uni-regensburg.de/loginlogo_205x76.gif</mdui:Logo>
-        <mdui:InformationURL xml:lang="de">http://www.uni-regensburg.de</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">http://www.uni-regensburg.de/index.html.en</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="de">http://www.uni-regensburg.de/datenschutz/index.html</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="en">http://www.uni-regensburg.de/privacy/index.html</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>shibboleth-idp.uni-regensburg.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=shibboleth-idp.uni-regensburg.de,OU=Rechenzentrum,O=Universitaet Regensburg,L=Regensburg,ST=Bayern,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFvjCCBKagAwIBAgIHE7iKqh6JUDANBgkqhkiG9w0BAQUFADCBnTELMAkGA1UE
-BhMCREUxDzANBgNVBAgTBkJheWVybjETMBEGA1UEBxMKUmVnZW5zYnVyZzEgMB4G
-A1UEChMXVW5pdmVyc2l0YWV0IFJlZ2Vuc2J1cmcxIDAeBgNVBAMTF1VuaSBSZWdl
-bnNidXJnIENBIC0gRzAxMSQwIgYJKoZIhvcNAQkBFhVwa2lAdW5pLXJlZ2Vuc2J1
-cmcuZGUwHhcNMTIwNDI2MDg1MzQ2WhcNMTcwNDI1MDg1MzQ2WjCBmDELMAkGA1UE
-BhMCREUxDzANBgNVBAgTBkJheWVybjETMBEGA1UEBxMKUmVnZW5zYnVyZzEgMB4G
-A1UEChMXVW5pdmVyc2l0YWV0IFJlZ2Vuc2J1cmcxFjAUBgNVBAsTDVJlY2hlbnpl
-bnRydW0xKTAnBgNVBAMTIHNoaWJib2xldGgtaWRwLnVuaS1yZWdlbnNidXJnLmRl
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtb6jhoh17E9k//d3JMwg
-vcKYcaYVfQV5ly3yO9jffYX7wQY8MMPcyZNICWDZb+vrMUdjDaVo6cH7E2x0wACY
-wLza6Y7XVODjm5KMiWOIaZ2UL8n4EM7uaqYqhOCuv5kSZ1wkCGQ1F8ta24vZRaxr
-Y/rFslWZ36ckoVh2UD1H2PASmPQNxtk8515kmjpAJa0pRxh6dmLuyaFnENhb/hMA
-VVvhrA7/BVeunf7k+slyafn3bfomRwlTsC7AmGO1zn2C7+PFT3DKEN565ZJjbM59
-aBhlshOyZx1eZ1il7jc8JtfuoChI1ZumbCuXsCMWQyWZEuzQJreloTZqs7S9bHu9
-nwIDAQABo4ICBDCCAgAwHAYDVR0gBBUwEzARBg8rBgEEAYGtIYIsAQEEAgIwCQYD
-VR0TBAIwADALBgNVHQ8EBAMCBeAwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUF
-BwMBMB0GA1UdDgQWBBQm+KuXQAlIJpFpDmYOW9kmR01qYTAfBgNVHSMEGDAWgBQH
-1915iF9BccwW4dTH852yeLHdSDAsBgNVHREEJTAjgSFlZG11bmQud2ViZXJAcnou
-dW5pLXJlZ2Vuc2J1cmcuZGUwgY8GA1UdHwSBhzCBhDBAoD6gPIY6aHR0cDovL2Nk
-cDEucGNhLmRmbi5kZS91bmktcmVnZW5zYnVyZy1jYS9wdWIvY3JsL2NhY3JsLmNy
-bDBAoD6gPIY6aHR0cDovL2NkcDIucGNhLmRmbi5kZS91bmktcmVnZW5zYnVyZy1j
-YS9wdWIvY3JsL2NhY3JsLmNybDCBqAYIKwYBBQUHAQEEgZswgZgwSgYIKwYBBQUH
-MAKGPmh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvdW5pLXJlZ2Vuc2J1cmctY2EvcHVi
-L2NhY2VydC9jYWNlcnQuY3J0MEoGCCsGAQUFBzAChj5odHRwOi8vY2RwMi5wY2Eu
-ZGZuLmRlL3VuaS1yZWdlbnNidXJnLWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDAN
-BgkqhkiG9w0BAQUFAAOCAQEAIGBPkosDWyhVvKtHzWP1W9i9/lg4v7+iRg/f+USs
-eBDEM5dyL80f6JBpYYBq0uguNmo7Z0hbg0UJIuWz4qReSASOXERlaN0MXtgYxXYa
-QCfZ9dSqommep5TDLY+tFX687R0aM3+D6livh8Zlk9tjvIK3peazeib7jWXkZuep
-3ZqgDNF14zSqrcGRg0wY/AEkpLf9k8+Aft3WAqjbf2QghzH1QLOwcBvFyJTKP1lf
-Eo29vwrtTxadJSyiGZd7qdYZPDi9NjCGU9ZAfN/60TZncWEoJmVZaq00as0wwSr3
-yRrHi0bPUSEYjGLZ5Muj2HV6lkYUuuhQxYEy8YCM01kN3A==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth-idp.uni-regensburg.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-regensburg.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-idp.uni-regensburg.de/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth-idp.uni-regensburg.de/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth-idp.uni-regensburg.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth-idp.uni-regensburg.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-regensburg.de</saml1md:Scope>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">ur.de</saml1md:Scope>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">ukr.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>shibboleth-idp.uni-regensburg.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=shibboleth-idp.uni-regensburg.de,OU=Rechenzentrum,O=Universitaet Regensburg,L=Regensburg,ST=Bayern,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFvjCCBKagAwIBAgIHE7iKqh6JUDANBgkqhkiG9w0BAQUFADCBnTELMAkGA1UE
-BhMCREUxDzANBgNVBAgTBkJheWVybjETMBEGA1UEBxMKUmVnZW5zYnVyZzEgMB4G
-A1UEChMXVW5pdmVyc2l0YWV0IFJlZ2Vuc2J1cmcxIDAeBgNVBAMTF1VuaSBSZWdl
-bnNidXJnIENBIC0gRzAxMSQwIgYJKoZIhvcNAQkBFhVwa2lAdW5pLXJlZ2Vuc2J1
-cmcuZGUwHhcNMTIwNDI2MDg1MzQ2WhcNMTcwNDI1MDg1MzQ2WjCBmDELMAkGA1UE
-BhMCREUxDzANBgNVBAgTBkJheWVybjETMBEGA1UEBxMKUmVnZW5zYnVyZzEgMB4G
-A1UEChMXVW5pdmVyc2l0YWV0IFJlZ2Vuc2J1cmcxFjAUBgNVBAsTDVJlY2hlbnpl
-bnRydW0xKTAnBgNVBAMTIHNoaWJib2xldGgtaWRwLnVuaS1yZWdlbnNidXJnLmRl
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtb6jhoh17E9k//d3JMwg
-vcKYcaYVfQV5ly3yO9jffYX7wQY8MMPcyZNICWDZb+vrMUdjDaVo6cH7E2x0wACY
-wLza6Y7XVODjm5KMiWOIaZ2UL8n4EM7uaqYqhOCuv5kSZ1wkCGQ1F8ta24vZRaxr
-Y/rFslWZ36ckoVh2UD1H2PASmPQNxtk8515kmjpAJa0pRxh6dmLuyaFnENhb/hMA
-VVvhrA7/BVeunf7k+slyafn3bfomRwlTsC7AmGO1zn2C7+PFT3DKEN565ZJjbM59
-aBhlshOyZx1eZ1il7jc8JtfuoChI1ZumbCuXsCMWQyWZEuzQJreloTZqs7S9bHu9
-nwIDAQABo4ICBDCCAgAwHAYDVR0gBBUwEzARBg8rBgEEAYGtIYIsAQEEAgIwCQYD
-VR0TBAIwADALBgNVHQ8EBAMCBeAwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUF
-BwMBMB0GA1UdDgQWBBQm+KuXQAlIJpFpDmYOW9kmR01qYTAfBgNVHSMEGDAWgBQH
-1915iF9BccwW4dTH852yeLHdSDAsBgNVHREEJTAjgSFlZG11bmQud2ViZXJAcnou
-dW5pLXJlZ2Vuc2J1cmcuZGUwgY8GA1UdHwSBhzCBhDBAoD6gPIY6aHR0cDovL2Nk
-cDEucGNhLmRmbi5kZS91bmktcmVnZW5zYnVyZy1jYS9wdWIvY3JsL2NhY3JsLmNy
-bDBAoD6gPIY6aHR0cDovL2NkcDIucGNhLmRmbi5kZS91bmktcmVnZW5zYnVyZy1j
-YS9wdWIvY3JsL2NhY3JsLmNybDCBqAYIKwYBBQUHAQEEgZswgZgwSgYIKwYBBQUH
-MAKGPmh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvdW5pLXJlZ2Vuc2J1cmctY2EvcHVi
-L2NhY2VydC9jYWNlcnQuY3J0MEoGCCsGAQUFBzAChj5odHRwOi8vY2RwMi5wY2Eu
-ZGZuLmRlL3VuaS1yZWdlbnNidXJnLWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDAN
-BgkqhkiG9w0BAQUFAAOCAQEAIGBPkosDWyhVvKtHzWP1W9i9/lg4v7+iRg/f+USs
-eBDEM5dyL80f6JBpYYBq0uguNmo7Z0hbg0UJIuWz4qReSASOXERlaN0MXtgYxXYa
-QCfZ9dSqommep5TDLY+tFX687R0aM3+D6livh8Zlk9tjvIK3peazeib7jWXkZuep
-3ZqgDNF14zSqrcGRg0wY/AEkpLf9k8+Aft3WAqjbf2QghzH1QLOwcBvFyJTKP1lf
-Eo29vwrtTxadJSyiGZd7qdYZPDi9NjCGU9ZAfN/60TZncWEoJmVZaq00as0wwSr3
-yRrHi0bPUSEYjGLZ5Muj2HV6lkYUuuhQxYEy8YCM01kN3A==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth-idp.uni-regensburg.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth-idp.uni-regensburg.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">e311</OrganizationName>
-    <OrganizationName xml:lang="en">e311</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">Universität Regensburg</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">University Regensburg</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.uni-regensburg.de</OrganizationURL>
-    <OrganizationURL xml:lang="en">http://www.uni-regensburg.de/index.html.en</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="administrative">
-    <GivenName>Martin</GivenName>
-    <SurName>Wimmer</SurName>
-    <EmailAddress>mailto:martin.wimmer@rz.uni-regensburg.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Edmund</GivenName>
-    <SurName>Weber</SurName>
-    <EmailAddress>mailto:edmund.weber@rz.uni-regensburg.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="support">
-    <GivenName>Help</GivenName>
-    <SurName>Desk</SurName>
-    <EmailAddress>mailto:support@rz.uni-regensburg.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Gerd</GivenName>
-    <SurName>Böhm</SurName>
-    <EmailAddress>mailto:gerd.boehm@rz.uni-regensburg.de</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.ac-limoges.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.ac-limoges.fr-idp-shibboleth.xml
deleted file mode 100644
index 836c05db..00000000
--- a/swamid-interfederations-2.0/shibboleth.ac-limoges.fr-idp-shibboleth.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://shibboleth.ac-limoges.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2014-05-06T15:34:22Z">
-      <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">ac-limoges.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Rectorat Limoges shib</mdui:DisplayName>
-        <mdui:Description xml:lang="en">any one</mdui:Description>
-        <mdui:DisplayName xml:lang="fr">Rectorat Limoges shib</mdui:DisplayName>
-        <mdui:Description xml:lang="fr">tout personnel Académie</mdui:Description>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIGAzCCA+ugAwIBAgIRAODebMx5oGfvlJ1vAEw7CMkwDQYJKoZIhvcNAQEFBQAw
-cTELMAkGA1UEBhMCRlIxLzAtBgNVBAoTJk1pbmlzdGVyZSBlZHVjYXRpb24gbmF0
-aW9uYWxlIChNRU5FU1IpMRQwEgYDVQQLEwsxMTAgMDQzIDAxNTEbMBkGA1UEAxMS
-QUMgSW5mcmFzdHJ1Y3R1cmVzMB4XDTE0MDYwNDA5MTQyNVoXDTE2MDYwNDA5MTQy
-NVowgYwxCzAJBgNVBAYTAkZSMS8wLQYDVQQKEyZNaW5pc3RlcmUgRWR1Y2F0aW9u
-IE5hdGlvbmFsZSAoTUVORVNSKTEUMBIGA1UECxMLMTEwIDA0MyAwMTUxEzARBgNV
-BAsTCmFjLWxpbW9nZXMxITAfBgNVBAMTGHNoaWJib2xldGguYWMtbGltb2dlcy5m
-cjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANZeOaPk5f0fk/DzmnjJ
-YfxkijPIiy5fuK/YOdIrRPUUK+owNbHwvXIswRYwOkwUI1rlu6KsAy+mAdbzYmMH
-RG+nGEiNVncU35S/RIfUUJ4yweoTXO+g1CW9PQAAaJZqBUFgD1mfRq2FNNHy99nA
-VD+KawE/lu2kzZNCLq7hlAtuVBQVCtPVKc0OJnvDUFvI2Xu4W6tMx0QIwjKDDPbD
-4W1gw8UTbAfZYi4kDAQQf3Q1KakY9qURMFYkc3/BpWtjRXMV2OsWgN5BoR/O39oN
-NWialAH7qcYNsL194slvVkJ4To7vq0WJUiFW9GBC+qzP9TXc5Q6Cz8t7PMq4jVIx
-wzcCAwEAAaOCAXgwggF0MEsGCCsGAQUFBwEBBD8wPTA7BggrBgEFBQcwAoYvaHR0
-cDovL3d3dy5pZ2MuZWR1Y2F0aW9uLmZyL0luZnJhc3RydWN0dXJlcy5jcnQwHwYD
-VR0jBBgwFoAUvjgif3JGqdaEFZ/VyCh/XLMCIMswGgYDVR0gBBMwETAPBg0rBgEE
-AYGeZkUBAQQBMIGqBgNVHR8EgaIwgZ8wgZyggZmggZaGMGh0dHA6Ly9jcmwxLmln
-Yy5lZHVjYXRpb24uZnIvSW5mcmFzdHJ1Y3R1cmVzLmNybIYwaHR0cDovL2NybDIu
-aWdjLmVkdWNhdGlvbi5mci9JbmZyYXN0cnVjdHVyZXMuY3JshjBodHRwOi8vY3Js
-My5pZ2MuZWR1Y2F0aW9uLmZyL0luZnJhc3RydWN0dXJlcy5jcmwwEwYDVR0lBAww
-CgYIKwYBBQUHAwEwDgYDVR0PAQH/BAQDAgWgMBYGA1UdDgQPBA1BVVRPX0dFTkVS
-QVRFMA0GCSqGSIb3DQEBBQUAA4ICAQCbE0n4trI2ybwNLa9fOcM4jfEiFwZ4eFBI
-3KxNX5QSDMWFbkUV4DAvo9nQ0m1llDht0iR4kV1klWCUXeIeR3DXEWXFv4Pv4Zt2
-b8NjNIwhqqF9OH85emYyuOXUYJXzTruj/68sGfC52K+xuA4/0Id53PH1Alod9eKv
-6RafF5JjF5aIflVav/3gFl1zmGiQjlRcc/eRg16EzrVfk7UhfwwDo7ZVg/9ojGVW
-PDznf+1FlB2chzcr+58tduKq7+XCj8W66ZOECwOhg/j67ETJTqtEhzc5/zsrnZ+d
-u3ANuFqmhoqm3cD+O3cKRUEHdRbncizL8E/HbT0PD4Vs/AvVivkRtOIu3HI7IhqY
-h5v+C5lLUsmGVYfqYv1nvMVvK0kEBpsm8xfP31eYFHRJhQH2qXAV6QeIMJTc3IVj
-ObLnOAhEZ/dO992aFiB6KgGN5t73Iv93tk8DY+Qvq15TRc3FbSQSwkSJsnYA9Gmi
-bpU0eyh+xjLxD/DVKrkuaAfttUwJU5OYN7o8zRgclhjUxU1EZ84ipZf6G5UbhtxE
-iMgzQTecoKiJSyWphw2mtvmECRKMXZbi8JGN4bYUwrlKlgqz2QEU/BTz6OlbfWIr
-nbdVWyfnw8CjCO0M+1LVBz5SRqr0esCDdSQzp2T++9Of5eO8LBdTdffWnY7vEMcN
-fbTj07Dtdw==
-					    </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>
-					      MIIDTDCCAjSgAwIBAgIVAPI2OQnwEI796qTcWNc+EBU8y1vbMA0GCSqGSIb3DQEB
-BQUAMCMxITAfBgNVBAMTGHNoaWJib2xldGguYWMtbGltb2dlcy5mcjAeFw0xNDA0
-MzAxNDIzMjFaFw0zNDA0MzAxNDIzMjFaMCMxITAfBgNVBAMTGHNoaWJib2xldGgu
-YWMtbGltb2dlcy5mcjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJRE
-S2ttB2Q4gKGoOA7GRB1u8quMRF/jC0B+dtcxhilipU7ITjiQMCto0Vvlr8MhJsiH
-XzQpucbD2jvfBqX9/3/opLgNgLEEQFiJ8mPtXwcSDiEZVrj/9wqq63wnNQQ6b0qV
-jO8jrD2PmLpPTPmuxd6RpugQ+KM7sEzbM8d/GGnmuBHyKcKYXcmko6WKCwCwm7xf
-WozFuDYQQES8282sRCi1PdPaiUvqkqnx8Bl4N82iwTdN9cDvSWSSlcdamX0z4/6O
-06Cp+q8xWn24vm26UxA2PhODaLH8CAWExTtQS2DEasu6d066vaSx6UVuB2s9C+rM
-ngdB7azRm1ujFU6T4akCAwEAAaN3MHUwVAYDVR0RBE0wS4IYc2hpYmJvbGV0aC5h
-Yy1saW1vZ2VzLmZyhi9odHRwczovL3NoaWJib2xldGguYWMtbGltb2dlcy5mci9p
-ZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQU88f2Yh9G3YvxK1a9XpdwWCspbSYwDQYJ
-KoZIhvcNAQEFBQADggEBAGqCAwe7lZDbaE1Ynj11VxMaRxzphVIYtWTGVoZQmoZ1
-774wmVw96rSxU4CWgFJ+1nurcgdZvH6mkKE8O9FXYklO25mpLD6DB7cGiVjcJVn6
-puYEzKtucKDG57f6KJ2EnO7kWCmtw/56d16JE069Ze7wr8BYHy3XON29UhdBGDZo
-0jnd9p9OUdk+gHxUcc6oAa++jyUOUpJd9O/P/HjovoqvE+brI5WHXFgxXg6ILpXo
-gJ81iLD/uinQAju00xak32Ig/WMrnzCYBFotWMElnHnJkTeS6l3obIYg9JeS/Hgu
-9mMpytM+UUp81UdTXMv7RsTpHsroJoDN3OVfzKOmjnk=
-					    </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.ac-limoges.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.ac-limoges.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.ac-limoges.fr/idp/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Rectorat Limoges shib</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Rectorat Limoges shib</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>cazarres thierry</SurName>
-    <EmailAddress>l.das-ie@ac-limoges.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.ac-limoges.fr.xml b/swamid-interfederations-2.0/shibboleth.ac-limoges.fr.xml
deleted file mode 100644
index 836c05db..00000000
--- a/swamid-interfederations-2.0/shibboleth.ac-limoges.fr.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://shibboleth.ac-limoges.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2014-05-06T15:34:22Z">
-      <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">ac-limoges.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Rectorat Limoges shib</mdui:DisplayName>
-        <mdui:Description xml:lang="en">any one</mdui:Description>
-        <mdui:DisplayName xml:lang="fr">Rectorat Limoges shib</mdui:DisplayName>
-        <mdui:Description xml:lang="fr">tout personnel Académie</mdui:Description>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIGAzCCA+ugAwIBAgIRAODebMx5oGfvlJ1vAEw7CMkwDQYJKoZIhvcNAQEFBQAw
-cTELMAkGA1UEBhMCRlIxLzAtBgNVBAoTJk1pbmlzdGVyZSBlZHVjYXRpb24gbmF0
-aW9uYWxlIChNRU5FU1IpMRQwEgYDVQQLEwsxMTAgMDQzIDAxNTEbMBkGA1UEAxMS
-QUMgSW5mcmFzdHJ1Y3R1cmVzMB4XDTE0MDYwNDA5MTQyNVoXDTE2MDYwNDA5MTQy
-NVowgYwxCzAJBgNVBAYTAkZSMS8wLQYDVQQKEyZNaW5pc3RlcmUgRWR1Y2F0aW9u
-IE5hdGlvbmFsZSAoTUVORVNSKTEUMBIGA1UECxMLMTEwIDA0MyAwMTUxEzARBgNV
-BAsTCmFjLWxpbW9nZXMxITAfBgNVBAMTGHNoaWJib2xldGguYWMtbGltb2dlcy5m
-cjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANZeOaPk5f0fk/DzmnjJ
-YfxkijPIiy5fuK/YOdIrRPUUK+owNbHwvXIswRYwOkwUI1rlu6KsAy+mAdbzYmMH
-RG+nGEiNVncU35S/RIfUUJ4yweoTXO+g1CW9PQAAaJZqBUFgD1mfRq2FNNHy99nA
-VD+KawE/lu2kzZNCLq7hlAtuVBQVCtPVKc0OJnvDUFvI2Xu4W6tMx0QIwjKDDPbD
-4W1gw8UTbAfZYi4kDAQQf3Q1KakY9qURMFYkc3/BpWtjRXMV2OsWgN5BoR/O39oN
-NWialAH7qcYNsL194slvVkJ4To7vq0WJUiFW9GBC+qzP9TXc5Q6Cz8t7PMq4jVIx
-wzcCAwEAAaOCAXgwggF0MEsGCCsGAQUFBwEBBD8wPTA7BggrBgEFBQcwAoYvaHR0
-cDovL3d3dy5pZ2MuZWR1Y2F0aW9uLmZyL0luZnJhc3RydWN0dXJlcy5jcnQwHwYD
-VR0jBBgwFoAUvjgif3JGqdaEFZ/VyCh/XLMCIMswGgYDVR0gBBMwETAPBg0rBgEE
-AYGeZkUBAQQBMIGqBgNVHR8EgaIwgZ8wgZyggZmggZaGMGh0dHA6Ly9jcmwxLmln
-Yy5lZHVjYXRpb24uZnIvSW5mcmFzdHJ1Y3R1cmVzLmNybIYwaHR0cDovL2NybDIu
-aWdjLmVkdWNhdGlvbi5mci9JbmZyYXN0cnVjdHVyZXMuY3JshjBodHRwOi8vY3Js
-My5pZ2MuZWR1Y2F0aW9uLmZyL0luZnJhc3RydWN0dXJlcy5jcmwwEwYDVR0lBAww
-CgYIKwYBBQUHAwEwDgYDVR0PAQH/BAQDAgWgMBYGA1UdDgQPBA1BVVRPX0dFTkVS
-QVRFMA0GCSqGSIb3DQEBBQUAA4ICAQCbE0n4trI2ybwNLa9fOcM4jfEiFwZ4eFBI
-3KxNX5QSDMWFbkUV4DAvo9nQ0m1llDht0iR4kV1klWCUXeIeR3DXEWXFv4Pv4Zt2
-b8NjNIwhqqF9OH85emYyuOXUYJXzTruj/68sGfC52K+xuA4/0Id53PH1Alod9eKv
-6RafF5JjF5aIflVav/3gFl1zmGiQjlRcc/eRg16EzrVfk7UhfwwDo7ZVg/9ojGVW
-PDznf+1FlB2chzcr+58tduKq7+XCj8W66ZOECwOhg/j67ETJTqtEhzc5/zsrnZ+d
-u3ANuFqmhoqm3cD+O3cKRUEHdRbncizL8E/HbT0PD4Vs/AvVivkRtOIu3HI7IhqY
-h5v+C5lLUsmGVYfqYv1nvMVvK0kEBpsm8xfP31eYFHRJhQH2qXAV6QeIMJTc3IVj
-ObLnOAhEZ/dO992aFiB6KgGN5t73Iv93tk8DY+Qvq15TRc3FbSQSwkSJsnYA9Gmi
-bpU0eyh+xjLxD/DVKrkuaAfttUwJU5OYN7o8zRgclhjUxU1EZ84ipZf6G5UbhtxE
-iMgzQTecoKiJSyWphw2mtvmECRKMXZbi8JGN4bYUwrlKlgqz2QEU/BTz6OlbfWIr
-nbdVWyfnw8CjCO0M+1LVBz5SRqr0esCDdSQzp2T++9Of5eO8LBdTdffWnY7vEMcN
-fbTj07Dtdw==
-					    </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>
-					      MIIDTDCCAjSgAwIBAgIVAPI2OQnwEI796qTcWNc+EBU8y1vbMA0GCSqGSIb3DQEB
-BQUAMCMxITAfBgNVBAMTGHNoaWJib2xldGguYWMtbGltb2dlcy5mcjAeFw0xNDA0
-MzAxNDIzMjFaFw0zNDA0MzAxNDIzMjFaMCMxITAfBgNVBAMTGHNoaWJib2xldGgu
-YWMtbGltb2dlcy5mcjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJRE
-S2ttB2Q4gKGoOA7GRB1u8quMRF/jC0B+dtcxhilipU7ITjiQMCto0Vvlr8MhJsiH
-XzQpucbD2jvfBqX9/3/opLgNgLEEQFiJ8mPtXwcSDiEZVrj/9wqq63wnNQQ6b0qV
-jO8jrD2PmLpPTPmuxd6RpugQ+KM7sEzbM8d/GGnmuBHyKcKYXcmko6WKCwCwm7xf
-WozFuDYQQES8282sRCi1PdPaiUvqkqnx8Bl4N82iwTdN9cDvSWSSlcdamX0z4/6O
-06Cp+q8xWn24vm26UxA2PhODaLH8CAWExTtQS2DEasu6d066vaSx6UVuB2s9C+rM
-ngdB7azRm1ujFU6T4akCAwEAAaN3MHUwVAYDVR0RBE0wS4IYc2hpYmJvbGV0aC5h
-Yy1saW1vZ2VzLmZyhi9odHRwczovL3NoaWJib2xldGguYWMtbGltb2dlcy5mci9p
-ZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQU88f2Yh9G3YvxK1a9XpdwWCspbSYwDQYJ
-KoZIhvcNAQEFBQADggEBAGqCAwe7lZDbaE1Ynj11VxMaRxzphVIYtWTGVoZQmoZ1
-774wmVw96rSxU4CWgFJ+1nurcgdZvH6mkKE8O9FXYklO25mpLD6DB7cGiVjcJVn6
-puYEzKtucKDG57f6KJ2EnO7kWCmtw/56d16JE069Ze7wr8BYHy3XON29UhdBGDZo
-0jnd9p9OUdk+gHxUcc6oAa++jyUOUpJd9O/P/HjovoqvE+brI5WHXFgxXg6ILpXo
-gJ81iLD/uinQAju00xak32Ig/WMrnzCYBFotWMElnHnJkTeS6l3obIYg9JeS/Hgu
-9mMpytM+UUp81UdTXMv7RsTpHsroJoDN3OVfzKOmjnk=
-					    </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.ac-limoges.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.ac-limoges.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.ac-limoges.fr/idp/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Rectorat Limoges shib</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Rectorat Limoges shib</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>cazarres thierry</SurName>
-    <EmailAddress>l.das-ie@ac-limoges.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.ad.cybera.ca-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.ad.cybera.ca-idp-shibboleth.xml
deleted file mode 100644
index 0179e708..00000000
--- a/swamid-interfederations-2.0/shibboleth.ad.cybera.ca-idp-shibboleth.xml
+++ /dev/null
@@ -1,108 +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.ad.cybera.ca/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.canarie.ca" registrationInstant="2014-06-11T00:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://www.canarie.ca/templates/services/docs/CAF_join_en.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">cybera.ca</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Cybera</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="fr">Cybera</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Cybera is a not-for-profit, technical agency that is helping Alberta advance its IT frontiers.</mdui:Description>
-        <mdui:Description xml:lang="fr">Cybera is a not-for-profit, technical agency that is helping Alberta advance its IT frontiers.</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.cybera.ca/about/cybera/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="fr">http://www.cybera.ca/about/cybera/</mdui:InformationURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDSDCCAjCgAwIBAgIVAMmg9Pn2Pq9LL6hnJsqirBsx1/hBMA0GCSqGSIb3DQEB
-BQUAMCIxIDAeBgNVBAMTF3NoaWJib2xldGguYWQuY3liZXJhLmNhMB4XDTE0MDYw
-NTIzMjM0N1oXDTM0MDYwNTIzMjM0N1owIjEgMB4GA1UEAxMXc2hpYmJvbGV0aC5h
-ZC5jeWJlcmEuY2EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCG+m9g
-JN1yrI2i29T5fSilW2A3o/2+kV1cQzaDj2pNU7CiXfohyKvw3p6rTWriLh0nGSJp
-9DWtA4DhWOQsrtpPUNez8ZgFDzRQc7OUqZJIdh0EexhlGEipyGsAd4piEDqIbl5R
-EKMyqc7ok+22Lv8KbWi68ksMOYxvxggTbj37MJzoD7siYo72jztDAl8LWUu0On9u
-znQcoGN+yp3b0ZNFrZ+xciiNVN1IISqoHvVZVCzPH8jXrsZKon9Ga75B7DXouQbS
-RJwMEYMBKmBdCa8iL2fn+oaD9GHDZ6TlmRJFsun4ydIpmJYmUy5WzlNHQ95f+hG7
-h1HEt1rKkb33lJu/AgMBAAGjdTBzMFIGA1UdEQRLMEmCF3NoaWJib2xldGguYWQu
-Y3liZXJhLmNhhi5odHRwczovL3NoaWJib2xldGguYWQuY3liZXJhLmNhL2lkcC9z
-aGliYm9sZXRoMB0GA1UdDgQWBBRF16/3CUxWL/2Gig8kuGMyT5Y1RTANBgkqhkiG
-9w0BAQUFAAOCAQEAeYprnDekEmkdGOz7RcEmUGrWjEC+KKSQrXaPNSx1+Wuasc7K
-ARqreWX3dEg+qUFi+M6pPD6/g6GmCyTioxeu9qeq7/vwT06RGA/2XbnLrgJ+Z95v
-vSbaqBB2xbthzV5vSRymh/jT0rYcidffG4i/3VFhM5pTgy1glAM/aorb2M1FWqLw
-jd3mIdybjOjUXTDDMgc5TuyyS3tgaOcbVSTPFZfCzjryjRH3yflUVIW1uhDM189R
-X8Wtsg9NJNF8tSx0c2LV3VpwCPRtGEary4ibf95iSdCX74+UhTK1O638s+vDjUo8
-z/rBMXsATszRELGSAA7w5QsrC4c3V99cTwkYhQ==
-
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.ad.cybera.ca:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.ad.cybera.ca:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.ad.cybera.ca/idp/profile/SAML2/Redirect/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.ad.cybera.ca/idp/profile/SAML2/POST/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.ad.cybera.ca: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://shibboleth.ad.cybera.ca/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.ad.cybera.ca/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.ad.cybera.ca/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.ad.cybera.ca/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">cybera.ca</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDSDCCAjCgAwIBAgIVAMmg9Pn2Pq9LL6hnJsqirBsx1/hBMA0GCSqGSIb3DQEB
-BQUAMCIxIDAeBgNVBAMTF3NoaWJib2xldGguYWQuY3liZXJhLmNhMB4XDTE0MDYw
-NTIzMjM0N1oXDTM0MDYwNTIzMjM0N1owIjEgMB4GA1UEAxMXc2hpYmJvbGV0aC5h
-ZC5jeWJlcmEuY2EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCG+m9g
-JN1yrI2i29T5fSilW2A3o/2+kV1cQzaDj2pNU7CiXfohyKvw3p6rTWriLh0nGSJp
-9DWtA4DhWOQsrtpPUNez8ZgFDzRQc7OUqZJIdh0EexhlGEipyGsAd4piEDqIbl5R
-EKMyqc7ok+22Lv8KbWi68ksMOYxvxggTbj37MJzoD7siYo72jztDAl8LWUu0On9u
-znQcoGN+yp3b0ZNFrZ+xciiNVN1IISqoHvVZVCzPH8jXrsZKon9Ga75B7DXouQbS
-RJwMEYMBKmBdCa8iL2fn+oaD9GHDZ6TlmRJFsun4ydIpmJYmUy5WzlNHQ95f+hG7
-h1HEt1rKkb33lJu/AgMBAAGjdTBzMFIGA1UdEQRLMEmCF3NoaWJib2xldGguYWQu
-Y3liZXJhLmNhhi5odHRwczovL3NoaWJib2xldGguYWQuY3liZXJhLmNhL2lkcC9z
-aGliYm9sZXRoMB0GA1UdDgQWBBRF16/3CUxWL/2Gig8kuGMyT5Y1RTANBgkqhkiG
-9w0BAQUFAAOCAQEAeYprnDekEmkdGOz7RcEmUGrWjEC+KKSQrXaPNSx1+Wuasc7K
-ARqreWX3dEg+qUFi+M6pPD6/g6GmCyTioxeu9qeq7/vwT06RGA/2XbnLrgJ+Z95v
-vSbaqBB2xbthzV5vSRymh/jT0rYcidffG4i/3VFhM5pTgy1glAM/aorb2M1FWqLw
-jd3mIdybjOjUXTDDMgc5TuyyS3tgaOcbVSTPFZfCzjryjRH3yflUVIW1uhDM189R
-X8Wtsg9NJNF8tSx0c2LV3VpwCPRtGEary4ibf95iSdCX74+UhTK1O638s+vDjUo8
-z/rBMXsATszRELGSAA7w5QsrC4c3V99cTwkYhQ==
-
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.ad.cybera.ca:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.ad.cybera.ca: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">Cybera</OrganizationName>
-    <OrganizationName xml:lang="fr">Cybera </OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Cybera</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="fr">Cybera</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.cybera.ca/about/cybera/</OrganizationURL>
-    <OrganizationURL xml:lang="fr">http://www.cybera.ca/about/cybera/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>System Admin</SurName>
-    <EmailAddress>sysadmin@cybera.ca</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.ad.cybera.ca.xml b/swamid-interfederations-2.0/shibboleth.ad.cybera.ca.xml
deleted file mode 100644
index 0179e708..00000000
--- a/swamid-interfederations-2.0/shibboleth.ad.cybera.ca.xml
+++ /dev/null
@@ -1,108 +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.ad.cybera.ca/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.canarie.ca" registrationInstant="2014-06-11T00:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://www.canarie.ca/templates/services/docs/CAF_join_en.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">cybera.ca</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Cybera</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="fr">Cybera</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Cybera is a not-for-profit, technical agency that is helping Alberta advance its IT frontiers.</mdui:Description>
-        <mdui:Description xml:lang="fr">Cybera is a not-for-profit, technical agency that is helping Alberta advance its IT frontiers.</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.cybera.ca/about/cybera/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="fr">http://www.cybera.ca/about/cybera/</mdui:InformationURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDSDCCAjCgAwIBAgIVAMmg9Pn2Pq9LL6hnJsqirBsx1/hBMA0GCSqGSIb3DQEB
-BQUAMCIxIDAeBgNVBAMTF3NoaWJib2xldGguYWQuY3liZXJhLmNhMB4XDTE0MDYw
-NTIzMjM0N1oXDTM0MDYwNTIzMjM0N1owIjEgMB4GA1UEAxMXc2hpYmJvbGV0aC5h
-ZC5jeWJlcmEuY2EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCG+m9g
-JN1yrI2i29T5fSilW2A3o/2+kV1cQzaDj2pNU7CiXfohyKvw3p6rTWriLh0nGSJp
-9DWtA4DhWOQsrtpPUNez8ZgFDzRQc7OUqZJIdh0EexhlGEipyGsAd4piEDqIbl5R
-EKMyqc7ok+22Lv8KbWi68ksMOYxvxggTbj37MJzoD7siYo72jztDAl8LWUu0On9u
-znQcoGN+yp3b0ZNFrZ+xciiNVN1IISqoHvVZVCzPH8jXrsZKon9Ga75B7DXouQbS
-RJwMEYMBKmBdCa8iL2fn+oaD9GHDZ6TlmRJFsun4ydIpmJYmUy5WzlNHQ95f+hG7
-h1HEt1rKkb33lJu/AgMBAAGjdTBzMFIGA1UdEQRLMEmCF3NoaWJib2xldGguYWQu
-Y3liZXJhLmNhhi5odHRwczovL3NoaWJib2xldGguYWQuY3liZXJhLmNhL2lkcC9z
-aGliYm9sZXRoMB0GA1UdDgQWBBRF16/3CUxWL/2Gig8kuGMyT5Y1RTANBgkqhkiG
-9w0BAQUFAAOCAQEAeYprnDekEmkdGOz7RcEmUGrWjEC+KKSQrXaPNSx1+Wuasc7K
-ARqreWX3dEg+qUFi+M6pPD6/g6GmCyTioxeu9qeq7/vwT06RGA/2XbnLrgJ+Z95v
-vSbaqBB2xbthzV5vSRymh/jT0rYcidffG4i/3VFhM5pTgy1glAM/aorb2M1FWqLw
-jd3mIdybjOjUXTDDMgc5TuyyS3tgaOcbVSTPFZfCzjryjRH3yflUVIW1uhDM189R
-X8Wtsg9NJNF8tSx0c2LV3VpwCPRtGEary4ibf95iSdCX74+UhTK1O638s+vDjUo8
-z/rBMXsATszRELGSAA7w5QsrC4c3V99cTwkYhQ==
-
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.ad.cybera.ca:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.ad.cybera.ca:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.ad.cybera.ca/idp/profile/SAML2/Redirect/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.ad.cybera.ca/idp/profile/SAML2/POST/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.ad.cybera.ca: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://shibboleth.ad.cybera.ca/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.ad.cybera.ca/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.ad.cybera.ca/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.ad.cybera.ca/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">cybera.ca</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDSDCCAjCgAwIBAgIVAMmg9Pn2Pq9LL6hnJsqirBsx1/hBMA0GCSqGSIb3DQEB
-BQUAMCIxIDAeBgNVBAMTF3NoaWJib2xldGguYWQuY3liZXJhLmNhMB4XDTE0MDYw
-NTIzMjM0N1oXDTM0MDYwNTIzMjM0N1owIjEgMB4GA1UEAxMXc2hpYmJvbGV0aC5h
-ZC5jeWJlcmEuY2EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCG+m9g
-JN1yrI2i29T5fSilW2A3o/2+kV1cQzaDj2pNU7CiXfohyKvw3p6rTWriLh0nGSJp
-9DWtA4DhWOQsrtpPUNez8ZgFDzRQc7OUqZJIdh0EexhlGEipyGsAd4piEDqIbl5R
-EKMyqc7ok+22Lv8KbWi68ksMOYxvxggTbj37MJzoD7siYo72jztDAl8LWUu0On9u
-znQcoGN+yp3b0ZNFrZ+xciiNVN1IISqoHvVZVCzPH8jXrsZKon9Ga75B7DXouQbS
-RJwMEYMBKmBdCa8iL2fn+oaD9GHDZ6TlmRJFsun4ydIpmJYmUy5WzlNHQ95f+hG7
-h1HEt1rKkb33lJu/AgMBAAGjdTBzMFIGA1UdEQRLMEmCF3NoaWJib2xldGguYWQu
-Y3liZXJhLmNhhi5odHRwczovL3NoaWJib2xldGguYWQuY3liZXJhLmNhL2lkcC9z
-aGliYm9sZXRoMB0GA1UdDgQWBBRF16/3CUxWL/2Gig8kuGMyT5Y1RTANBgkqhkiG
-9w0BAQUFAAOCAQEAeYprnDekEmkdGOz7RcEmUGrWjEC+KKSQrXaPNSx1+Wuasc7K
-ARqreWX3dEg+qUFi+M6pPD6/g6GmCyTioxeu9qeq7/vwT06RGA/2XbnLrgJ+Z95v
-vSbaqBB2xbthzV5vSRymh/jT0rYcidffG4i/3VFhM5pTgy1glAM/aorb2M1FWqLw
-jd3mIdybjOjUXTDDMgc5TuyyS3tgaOcbVSTPFZfCzjryjRH3yflUVIW1uhDM189R
-X8Wtsg9NJNF8tSx0c2LV3VpwCPRtGEary4ibf95iSdCX74+UhTK1O638s+vDjUo8
-z/rBMXsATszRELGSAA7w5QsrC4c3V99cTwkYhQ==
-
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.ad.cybera.ca:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.ad.cybera.ca: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">Cybera</OrganizationName>
-    <OrganizationName xml:lang="fr">Cybera </OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Cybera</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="fr">Cybera</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.cybera.ca/about/cybera/</OrganizationURL>
-    <OrganizationURL xml:lang="fr">http://www.cybera.ca/about/cybera/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>System Admin</SurName>
-    <EmailAddress>sysadmin@cybera.ca</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.bbaw.de.xml b/swamid-interfederations-2.0/shibboleth.bbaw.de.xml
deleted file mode 100644
index 8ceef1b3..00000000
--- a/swamid-interfederations-2.0/shibboleth.bbaw.de.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns: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://shibboleth.bbaw.de/shibboleth">
-  <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://shibboleth.bbaw.de/Shibboleth.sso/Login" 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>MIIFEjCCA/qgAwIBAgIEDxpjazANBgkqhkiG9w0BAQUFADCBnDELMAkGA1UEBhMC
-REUxPDA6BgNVBAoTM0Jlcmxpbi1CcmFuZGVuYnVyZ2lzY2hlIEFrYWRlbWllIGRl
-ciBXaXNzZW5zY2hhZnRlbjEgMB4GA1UECxMXSW5mb3JtYXRpb25zdGVjaG5vbG9n
-aWUxEjAQBgNVBAMTCUJCQVctQ0EgMTEZMBcGCSqGSIb3DQEJARYKY2FAYmJhdy5k
-ZTAeFw0wOTExMTExNjI3MDdaFw0xNDExMTAxNjI3MDdaMGgxCzAJBgNVBAYTAkRF
-MTwwOgYDVQQKEzNCZXJsaW4tQnJhbmRlbmJ1cmdpc2NoZSBBa2FkZW1pZSBkZXIg
-V2lzc2Vuc2NoYWZ0ZW4xGzAZBgNVBAMTEnNoaWJib2xldGguYmJhdy5kZTCCASIw
-DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKqdL1VpZaKldYSwvu4z+8iXzy+j
-+6tpAq1lED8CDcXRJsbgL/F4sioQ9uNylJgX4aromN5kTT8nfmtEN84C9s5ExVg6
-29bkxSPEWviJzdDxKstRqWbl7PzpipFa9Th2b7jOwX4ec3nirC4ijoTACQBge7qd
-GNniTFM/2k5E7D8NPTJg2d9ITWs8JW7Qbx0ezFpKlg1eVWZNZs86L3UShdXWnwrT
-oNtZwKm309EbdDNGDvsAgHseFNhmQIV+rOuMxv44nVMxDUSymARAKhzbeJ4CUWth
-gYjByHbQM45twUdQKGO01vQX+DwS+9RmA34PDZ8nRSktRtlG/Llr9SRXf9ECAwEA
-AaOCAY0wggGJMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgXgMB0GA1UdJQQWMBQGCCsG
-AQUFBwMCBggrBgEFBQcDATAdBgNVHQ4EFgQUoy4g7ejcIv8AoY2/BQx6coBR6EIw
-HwYDVR0jBBgwFoAUjKaP8T8UOwK1+SdUTKs8odgbkJgweQYDVR0fBHIwcDA2oDSg
-MoYwaHR0cDovL2NkcDEucGNhLmRmbi5kZS9iYmF3LWNhL3B1Yi9jcmwvY2Fjcmwu
-Y3JsMDagNKAyhjBodHRwOi8vY2RwMi5wY2EuZGZuLmRlL2JiYXctY2EvcHViL2Ny
-bC9jYWNybC5jcmwwgZQGCCsGAQUFBwEBBIGHMIGEMEAGCCsGAQUFBzAChjRodHRw
-Oi8vY2RwMS5wY2EuZGZuLmRlL2JiYXctY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0
-MEAGCCsGAQUFBzAChjRodHRwOi8vY2RwMi5wY2EuZGZuLmRlL2JiYXctY2EvcHVi
-L2NhY2VydC9jYWNlcnQuY3J0MA0GCSqGSIb3DQEBBQUAA4IBAQBrAUHthoQFOwKU
-a8KybrhK1NofkstRQxhVR2jcNWQDhFB+ife+kXdindHuh6OeWgys07llwmPqACQ9
-T6ccWjVBVyV7DqFwuRCn/Ui/4E+c6EHtJEJ6nktXj4jCRla7a7gxmdnBqBKvjoPJ
-7AdIQbn9kpuWDN+2hoiGPdAz+ZBp1zcY28SJhtHoNHdLmAjyNlrCj3fWsppLL7/k
-znAYO9ZznwCtBE+BWq+rxu0TJhYBf84+fn0kwBruvHWgpCrb+57XpX3RN1HxNbvR
-9lvp1UltizFA44damYGbbKBKOLCHFvJbBg6v81WGKxZB+dv9TcZSMDNaj1oqBxUW
-eQj7ACg8</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://shibboleth.bbaw.de/Shibboleth.sso/SAML2/POST" index="1" isDefault="true"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth.bbaw.de/Shibboleth.sso/SAML/POST" index="2" isDefault="false"/>
-    <md:AttributeConsumingService index="1" isDefault="true">
-      <md:ServiceName xml:lang="fi">German NLP tools from the BBAW/DWDS</md:ServiceName>
-      <md:ServiceName xml:lang="en">German NLP tools from the BBAW/DWDS</md:ServiceName>
-      <md:ServiceDescription xml:lang="en">Tokenizer, Tagger (Moot), Shallow Parser (SynCop) and Named Entity Recognition for historic texts. For Humanities and Social Sciences researchers.</md:ServiceDescription>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonPrincipalName"/>
-      <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:2.5.4.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="o"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="fi">CLARIN Service Provider Federation/MPI</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">CLARIN Service Provider Federation/MPI</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">CLARIN Service Provider Federation/MPI</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="fi">CLARIN Service Provider Federation/MPI</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">CLARIN Service Provider Federation/MPI</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="sv">CLARIN Service Provider Federation/MPI</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="fi">http://www.clarin.eu</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.clarin.eu</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sv">http://www.clarin.eu</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Kai</md:GivenName>
-    <md:SurName>Zimmer</md:SurName>
-    <md:EmailAddress>mailto:zimmer@bbaw.de</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.cndp.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.cndp.fr-idp-shibboleth.xml
deleted file mode 100644
index 068d6776..00000000
--- a/swamid-interfederations-2.0/shibboleth.cndp.fr-idp-shibboleth.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://shibboleth.cndp.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2013-10-31T15:08:09Z">
-      <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">cndp.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">CNDP - Centre National de Documentation Pédagogique</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDNDCCAhygAwIBAgIVAPGwxNIFT88TgM2ndmBAqxnLIgA6MA0GCSqGSIb3DQEB
-BQUAMB0xGzAZBgNVBAMTEnNoaWJib2xldGguY25kcC5mcjAeFw0xMzEwMzEwODE0
-MTJaFw0zMzEwMzEwODE0MTJaMB0xGzAZBgNVBAMTEnNoaWJib2xldGguY25kcC5m
-cjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANcmMpskeoFHzssZUII5
-4pz7M6i7OXbgHJZR9pMGoAz5vOOt9cjmPsh+ZFkW2tjGAk4dEMzUrdk3lqhMjwdr
-06Nw2FBqUYKG/OP//lPOaYYyF7VaUei4Da7KL+NMsUW4S8gACmwl7NwqCTnhaXQ9
-D8J6ChWjaxQmvUDYVG8ktDsqwbrzUqq+yAbCd6i5EOZOJ169Xg/Y0IUiPMREU7ho
-yQfQHnw7bmkMSIOjoOkEFZK7zZzr0+ce3ZUTjCimv9ys7NCLDSJWVvifwHt2lRFG
-iRaIPyn6Oh308mmoizVTCalVRoYV0w+gVu9d0/WOt3Zj+DaCKIB+eOL0YTylZNTr
-4g0CAwEAAaNrMGkwSAYDVR0RBEEwP4ISc2hpYmJvbGV0aC5jbmRwLmZyhilodHRw
-czovL3NoaWJib2xldGguY25kcC5mci9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQU
-B/TrtIJ0tEcByCbKeQMho+xJCQMwDQYJKoZIhvcNAQEFBQADggEBAF+sG6yrz/ao
-30uEN8NpTHFmuiFjFeInMboFMb987yjaA1RonVH3+VquF92H1e8ZDBZK/VRdP7xi
-V42K4OajjP8NYPl0+JwHEvJaGNEhXOm1NNhCw6o/H+VYcqtriqunZc5Ob4p6vsXA
-8IC4FI56+0/UFMFrCPpXh5f/3JrjYAzLACLZAOsD4G3eBWdtnfn5oEz1Prpq6U6a
-Rk5+4EQFr07QmhKWuVCb73np6gGnQfI5qs2cUeDEwKSnw9yJfpiuwlGPakiFrfpI
-AUNVNoq0d2wvNKP1kf4vaGmG1/S/s5cBKDp7z5amg6TauBbDwnoKGyoIY9602jMK
-k93krCoGtSQ=
-					    </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.cndp.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.cndp.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.cndp.fr/idp/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">CNDP - Centre National de Documentation Pédagogique</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">CNDP - Centre National de Documentation Pédagogique</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Alexandre LUCAS</SurName>
-    <EmailAddress>alexandre.lucas@cndp.fr</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <SurName>Simon BIGOT</SurName>
-    <EmailAddress>simon.bigot@cndp.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.cndp.fr.xml b/swamid-interfederations-2.0/shibboleth.cndp.fr.xml
deleted file mode 100644
index 068d6776..00000000
--- a/swamid-interfederations-2.0/shibboleth.cndp.fr.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://shibboleth.cndp.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2013-10-31T15:08:09Z">
-      <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">cndp.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">CNDP - Centre National de Documentation Pédagogique</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDNDCCAhygAwIBAgIVAPGwxNIFT88TgM2ndmBAqxnLIgA6MA0GCSqGSIb3DQEB
-BQUAMB0xGzAZBgNVBAMTEnNoaWJib2xldGguY25kcC5mcjAeFw0xMzEwMzEwODE0
-MTJaFw0zMzEwMzEwODE0MTJaMB0xGzAZBgNVBAMTEnNoaWJib2xldGguY25kcC5m
-cjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANcmMpskeoFHzssZUII5
-4pz7M6i7OXbgHJZR9pMGoAz5vOOt9cjmPsh+ZFkW2tjGAk4dEMzUrdk3lqhMjwdr
-06Nw2FBqUYKG/OP//lPOaYYyF7VaUei4Da7KL+NMsUW4S8gACmwl7NwqCTnhaXQ9
-D8J6ChWjaxQmvUDYVG8ktDsqwbrzUqq+yAbCd6i5EOZOJ169Xg/Y0IUiPMREU7ho
-yQfQHnw7bmkMSIOjoOkEFZK7zZzr0+ce3ZUTjCimv9ys7NCLDSJWVvifwHt2lRFG
-iRaIPyn6Oh308mmoizVTCalVRoYV0w+gVu9d0/WOt3Zj+DaCKIB+eOL0YTylZNTr
-4g0CAwEAAaNrMGkwSAYDVR0RBEEwP4ISc2hpYmJvbGV0aC5jbmRwLmZyhilodHRw
-czovL3NoaWJib2xldGguY25kcC5mci9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQU
-B/TrtIJ0tEcByCbKeQMho+xJCQMwDQYJKoZIhvcNAQEFBQADggEBAF+sG6yrz/ao
-30uEN8NpTHFmuiFjFeInMboFMb987yjaA1RonVH3+VquF92H1e8ZDBZK/VRdP7xi
-V42K4OajjP8NYPl0+JwHEvJaGNEhXOm1NNhCw6o/H+VYcqtriqunZc5Ob4p6vsXA
-8IC4FI56+0/UFMFrCPpXh5f/3JrjYAzLACLZAOsD4G3eBWdtnfn5oEz1Prpq6U6a
-Rk5+4EQFr07QmhKWuVCb73np6gGnQfI5qs2cUeDEwKSnw9yJfpiuwlGPakiFrfpI
-AUNVNoq0d2wvNKP1kf4vaGmG1/S/s5cBKDp7z5amg6TauBbDwnoKGyoIY9602jMK
-k93krCoGtSQ=
-					    </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.cndp.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.cndp.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.cndp.fr/idp/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">CNDP - Centre National de Documentation Pédagogique</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">CNDP - Centre National de Documentation Pédagogique</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Alexandre LUCAS</SurName>
-    <EmailAddress>alexandre.lucas@cndp.fr</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <SurName>Simon BIGOT</SurName>
-    <EmailAddress>simon.bigot@cndp.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.crous-poitiers.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.crous-poitiers.fr-idp-shibboleth.xml
deleted file mode 100644
index 33c2a23a..00000000
--- a/swamid-interfederations-2.0/shibboleth.crous-poitiers.fr-idp-shibboleth.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://shibboleth.crous-poitiers.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2010-09-22T15:55:18Z">
-      <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">crous-poitiers.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">CROUS Poitiers - Etudiants</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDWzCCAkOgAwIBAgIUMWKZ8/6tKA7kwdsn4f4/cqyDED0wDQYJKoZIhvcNAQEF
-BQAwJzElMCMGA1UEAxMcc2hpYmJvbGV0aC5jcm91cy1wb2l0aWVycy5mcjAeFw0x
-MDA2MTAxMzMyNTNaFw0zMDA2MTAxMzMyNTNaMCcxJTAjBgNVBAMTHHNoaWJib2xl
-dGguY3JvdXMtcG9pdGllcnMuZnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
-AoIBAQCax6s86p49Xf1m/noYZtAqbN3LTSLj2rpuCe9jcMM9Gpf4X6p0btKZtWVq
-PMyJ+1oytarshKxBGV7m1U3MkZu88/Bn1OykynsaPPFYCraOWIawJRFJL2t45/By
-K7LVjmahS2JJj5qfVNuFNL4MsrfNieEZjZHdE/B9FZR4ME5sxwH44WvHEOnmumO7
-l6GY8pHrWp8e0HDXf8Y1gn3dj4u0tNs5GBDVygqXgPKsSRi8IHAHKxbNuWx+PDWZ
-m25S2ouiGO27vkIYYPWvFjyxNqe0KFVD6yVYVoWdHFM7rskYJqE+iinmLpgE+tZX
-Q2oMnhEZlFeUiSzKq21Pi07JAwfHAgMBAAGjfzB9MFwGA1UdEQRVMFOCHHNoaWJi
-b2xldGguY3JvdXMtcG9pdGllcnMuZnKGM2h0dHBzOi8vc2hpYmJvbGV0aC5jcm91
-cy1wb2l0aWVycy5mci9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUhXma4CxtS0tm
-sfkbl1uusiIUhq8wDQYJKoZIhvcNAQEFBQADggEBAGzVwbgJ/j2DYjRc8NR7NnDG
-1FAueaBwSVOPe/zawt1M/nNhyHeIAXzsMaLLTptJmXSI1NYH8Zf0ZePlTj34W+iM
-MMYtACZXOqn9MROynG9sUKwh3qTe+yrskUoemApa/WndPY3mlEmoee5v7mJnD70Q
-asxkqS76pkUhyQAUBIZs2XwAdKamI/Fo3kfiOI/3GAFjQObwwnsg9fQLGq/jO8gK
-n44H8PXS4Vf4LLnN8kOUlNvmDD0us5c73Gli/rg/cKTptN1l+TbZ97qBqjTofxPa
-uPReZV8LGAFTW7W5OYm6HcXR3TA/vVBHjBqTmNFZ7/8t8dmgZ5uNGJNLsSgBhg8=
-					    </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.crous-poitiers.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.crous-poitiers.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.crous-poitiers.fr/idp/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">CROUS Poitiers - Etudiants</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">CROUS Poitiers - Etudiants</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <EmailAddress>crous.informatique@crous-poitiers.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.crous-poitiers.fr.xml b/swamid-interfederations-2.0/shibboleth.crous-poitiers.fr.xml
deleted file mode 100644
index 33c2a23a..00000000
--- a/swamid-interfederations-2.0/shibboleth.crous-poitiers.fr.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://shibboleth.crous-poitiers.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2010-09-22T15:55:18Z">
-      <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">crous-poitiers.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">CROUS Poitiers - Etudiants</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDWzCCAkOgAwIBAgIUMWKZ8/6tKA7kwdsn4f4/cqyDED0wDQYJKoZIhvcNAQEF
-BQAwJzElMCMGA1UEAxMcc2hpYmJvbGV0aC5jcm91cy1wb2l0aWVycy5mcjAeFw0x
-MDA2MTAxMzMyNTNaFw0zMDA2MTAxMzMyNTNaMCcxJTAjBgNVBAMTHHNoaWJib2xl
-dGguY3JvdXMtcG9pdGllcnMuZnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
-AoIBAQCax6s86p49Xf1m/noYZtAqbN3LTSLj2rpuCe9jcMM9Gpf4X6p0btKZtWVq
-PMyJ+1oytarshKxBGV7m1U3MkZu88/Bn1OykynsaPPFYCraOWIawJRFJL2t45/By
-K7LVjmahS2JJj5qfVNuFNL4MsrfNieEZjZHdE/B9FZR4ME5sxwH44WvHEOnmumO7
-l6GY8pHrWp8e0HDXf8Y1gn3dj4u0tNs5GBDVygqXgPKsSRi8IHAHKxbNuWx+PDWZ
-m25S2ouiGO27vkIYYPWvFjyxNqe0KFVD6yVYVoWdHFM7rskYJqE+iinmLpgE+tZX
-Q2oMnhEZlFeUiSzKq21Pi07JAwfHAgMBAAGjfzB9MFwGA1UdEQRVMFOCHHNoaWJi
-b2xldGguY3JvdXMtcG9pdGllcnMuZnKGM2h0dHBzOi8vc2hpYmJvbGV0aC5jcm91
-cy1wb2l0aWVycy5mci9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUhXma4CxtS0tm
-sfkbl1uusiIUhq8wDQYJKoZIhvcNAQEFBQADggEBAGzVwbgJ/j2DYjRc8NR7NnDG
-1FAueaBwSVOPe/zawt1M/nNhyHeIAXzsMaLLTptJmXSI1NYH8Zf0ZePlTj34W+iM
-MMYtACZXOqn9MROynG9sUKwh3qTe+yrskUoemApa/WndPY3mlEmoee5v7mJnD70Q
-asxkqS76pkUhyQAUBIZs2XwAdKamI/Fo3kfiOI/3GAFjQObwwnsg9fQLGq/jO8gK
-n44H8PXS4Vf4LLnN8kOUlNvmDD0us5c73Gli/rg/cKTptN1l+TbZ97qBqjTofxPa
-uPReZV8LGAFTW7W5OYm6HcXR3TA/vVBHjBqTmNFZ7/8t8dmgZ5uNGJNLsSgBhg8=
-					    </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.crous-poitiers.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.crous-poitiers.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.crous-poitiers.fr/idp/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">CROUS Poitiers - Etudiants</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">CROUS Poitiers - Etudiants</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <EmailAddress>crous.informatique@crous-poitiers.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.ens-lyon.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.ens-lyon.fr-idp-shibboleth.xml
deleted file mode 100644
index 464a49d7..00000000
--- a/swamid-interfederations-2.0/shibboleth.ens-lyon.fr-idp-shibboleth.xml
+++ /dev/null
@@ -1,174 +0,0 @@
-<?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="fr">ENS de Lyon</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIEkjCCA3qgAwIBAgIQM3AXkLVSja9N0N1o4axc9zANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTE0MDQxNDAwMDAwMFoXDTE3MDQxMzIzNTk1OVowRDEhMB8GA1UE
-CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMR8wHQYDVQQDExZzaGliYm9sZXRo
-LmVucy1seW9uLmZyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtebY
-BLAK3BOoXxYZldMlRY8Mre/ppCSUS3lemujSiq02SS9eZSO0ktkJLEcDc5LYGTk/
-wtn0XcHV/CHTfjpb9vwHBkq4OcJITQahLW+3o52emt1/g+YI2dfJzBIEaVh3my/o
-eNHacSvA8PRtdMMMbxp4kHM7VGyPaU5sNtcdPOhZGwzwH0+1MwLz8T7A82CGCznb
-EfzHSt/7PuWZ0uxexh8w40O4C5sB1d0mrCQZUOinl+04vX+QZaOCU2YOPe/GfF7n
-Tt0AAoK9JejT6vFQ7bO1h9HzF0ahnAFiIyvkVv9xG7CQCtggqpbSl0vXHk61mPsq
-OA0wXeAwVKnd+ts+/QIDAQABo4IBjDCCAYgwHwYDVR0jBBgwFoAUDL2TaAzz3quj
-SWsrN1dH6pDjue0wHQYDVR0OBBYEFChWxiARdSk1TBcSYp/N8SSictJjMA4GA1Ud
-DwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggr
-BgEFBQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNV
-HR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNT
-TENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQu
-dGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRw
-Oi8vb2NzcC50Y3MudGVyZW5hLm9yZzA6BgNVHREEMzAxghZzaGliYm9sZXRoLmVu
-cy1seW9uLmZyghdzaGliYm9sZXRoMi5lbnMtbHlvbi5mcjANBgkqhkiG9w0BAQUF
-AAOCAQEAuUKiMBx/HCAebLHhz3hfgd6P31r5FqLVYxTngYyrJLvDKBifyoOiIPiA
-4ZVx5YEwM31MuRwMZudRSCN9nmv24OocG41g0d2YrPW7UpV3uTgWSdmmeLSkMBFm
-H7rtx57vWgmrW+OrnkeH8Ab0kyJlv41Y1kqDLYbX3biWRhvqYuvUsmsipSI4qhW2
-U0uR+ZuXE63ib7nvKVaOhE0xA51kaVYWGXDkiGZclFShjfn6aiOrb4/AndVNIJ7X
-XmIvINFpZiRoszGN9qpUIgFXGimzydOuKLYTgeczy0lp74wlpYTy5AXt7TIM/Wcm
-fe1ohrE7LQaSLfH8v3Q8YrsPai3rjA==
-					    </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>
-					      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>
-    <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>
-					      MIIEkjCCA3qgAwIBAgIQM3AXkLVSja9N0N1o4axc9zANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTE0MDQxNDAwMDAwMFoXDTE3MDQxMzIzNTk1OVowRDEhMB8GA1UE
-CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMR8wHQYDVQQDExZzaGliYm9sZXRo
-LmVucy1seW9uLmZyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtebY
-BLAK3BOoXxYZldMlRY8Mre/ppCSUS3lemujSiq02SS9eZSO0ktkJLEcDc5LYGTk/
-wtn0XcHV/CHTfjpb9vwHBkq4OcJITQahLW+3o52emt1/g+YI2dfJzBIEaVh3my/o
-eNHacSvA8PRtdMMMbxp4kHM7VGyPaU5sNtcdPOhZGwzwH0+1MwLz8T7A82CGCznb
-EfzHSt/7PuWZ0uxexh8w40O4C5sB1d0mrCQZUOinl+04vX+QZaOCU2YOPe/GfF7n
-Tt0AAoK9JejT6vFQ7bO1h9HzF0ahnAFiIyvkVv9xG7CQCtggqpbSl0vXHk61mPsq
-OA0wXeAwVKnd+ts+/QIDAQABo4IBjDCCAYgwHwYDVR0jBBgwFoAUDL2TaAzz3quj
-SWsrN1dH6pDjue0wHQYDVR0OBBYEFChWxiARdSk1TBcSYp/N8SSictJjMA4GA1Ud
-DwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggr
-BgEFBQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNV
-HR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNT
-TENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQu
-dGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRw
-Oi8vb2NzcC50Y3MudGVyZW5hLm9yZzA6BgNVHREEMzAxghZzaGliYm9sZXRoLmVu
-cy1seW9uLmZyghdzaGliYm9sZXRoMi5lbnMtbHlvbi5mcjANBgkqhkiG9w0BAQUF
-AAOCAQEAuUKiMBx/HCAebLHhz3hfgd6P31r5FqLVYxTngYyrJLvDKBifyoOiIPiA
-4ZVx5YEwM31MuRwMZudRSCN9nmv24OocG41g0d2YrPW7UpV3uTgWSdmmeLSkMBFm
-H7rtx57vWgmrW+OrnkeH8Ab0kyJlv41Y1kqDLYbX3biWRhvqYuvUsmsipSI4qhW2
-U0uR+ZuXE63ib7nvKVaOhE0xA51kaVYWGXDkiGZclFShjfn6aiOrb4/AndVNIJ7X
-XmIvINFpZiRoszGN9qpUIgFXGimzydOuKLYTgeczy0lp74wlpYTy5AXt7TIM/Wcm
-fe1ohrE7LQaSLfH8v3Q8YrsPai3rjA==
-					    </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>
-					      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>
-    <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">ENS de Lyon</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">ENS 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.ens-lyon.fr.xml b/swamid-interfederations-2.0/shibboleth.ens-lyon.fr.xml
deleted file mode 100644
index 464a49d7..00000000
--- a/swamid-interfederations-2.0/shibboleth.ens-lyon.fr.xml
+++ /dev/null
@@ -1,174 +0,0 @@
-<?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="fr">ENS de Lyon</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIEkjCCA3qgAwIBAgIQM3AXkLVSja9N0N1o4axc9zANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTE0MDQxNDAwMDAwMFoXDTE3MDQxMzIzNTk1OVowRDEhMB8GA1UE
-CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMR8wHQYDVQQDExZzaGliYm9sZXRo
-LmVucy1seW9uLmZyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtebY
-BLAK3BOoXxYZldMlRY8Mre/ppCSUS3lemujSiq02SS9eZSO0ktkJLEcDc5LYGTk/
-wtn0XcHV/CHTfjpb9vwHBkq4OcJITQahLW+3o52emt1/g+YI2dfJzBIEaVh3my/o
-eNHacSvA8PRtdMMMbxp4kHM7VGyPaU5sNtcdPOhZGwzwH0+1MwLz8T7A82CGCznb
-EfzHSt/7PuWZ0uxexh8w40O4C5sB1d0mrCQZUOinl+04vX+QZaOCU2YOPe/GfF7n
-Tt0AAoK9JejT6vFQ7bO1h9HzF0ahnAFiIyvkVv9xG7CQCtggqpbSl0vXHk61mPsq
-OA0wXeAwVKnd+ts+/QIDAQABo4IBjDCCAYgwHwYDVR0jBBgwFoAUDL2TaAzz3quj
-SWsrN1dH6pDjue0wHQYDVR0OBBYEFChWxiARdSk1TBcSYp/N8SSictJjMA4GA1Ud
-DwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggr
-BgEFBQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNV
-HR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNT
-TENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQu
-dGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRw
-Oi8vb2NzcC50Y3MudGVyZW5hLm9yZzA6BgNVHREEMzAxghZzaGliYm9sZXRoLmVu
-cy1seW9uLmZyghdzaGliYm9sZXRoMi5lbnMtbHlvbi5mcjANBgkqhkiG9w0BAQUF
-AAOCAQEAuUKiMBx/HCAebLHhz3hfgd6P31r5FqLVYxTngYyrJLvDKBifyoOiIPiA
-4ZVx5YEwM31MuRwMZudRSCN9nmv24OocG41g0d2YrPW7UpV3uTgWSdmmeLSkMBFm
-H7rtx57vWgmrW+OrnkeH8Ab0kyJlv41Y1kqDLYbX3biWRhvqYuvUsmsipSI4qhW2
-U0uR+ZuXE63ib7nvKVaOhE0xA51kaVYWGXDkiGZclFShjfn6aiOrb4/AndVNIJ7X
-XmIvINFpZiRoszGN9qpUIgFXGimzydOuKLYTgeczy0lp74wlpYTy5AXt7TIM/Wcm
-fe1ohrE7LQaSLfH8v3Q8YrsPai3rjA==
-					    </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>
-					      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>
-    <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>
-					      MIIEkjCCA3qgAwIBAgIQM3AXkLVSja9N0N1o4axc9zANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTE0MDQxNDAwMDAwMFoXDTE3MDQxMzIzNTk1OVowRDEhMB8GA1UE
-CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMR8wHQYDVQQDExZzaGliYm9sZXRo
-LmVucy1seW9uLmZyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtebY
-BLAK3BOoXxYZldMlRY8Mre/ppCSUS3lemujSiq02SS9eZSO0ktkJLEcDc5LYGTk/
-wtn0XcHV/CHTfjpb9vwHBkq4OcJITQahLW+3o52emt1/g+YI2dfJzBIEaVh3my/o
-eNHacSvA8PRtdMMMbxp4kHM7VGyPaU5sNtcdPOhZGwzwH0+1MwLz8T7A82CGCznb
-EfzHSt/7PuWZ0uxexh8w40O4C5sB1d0mrCQZUOinl+04vX+QZaOCU2YOPe/GfF7n
-Tt0AAoK9JejT6vFQ7bO1h9HzF0ahnAFiIyvkVv9xG7CQCtggqpbSl0vXHk61mPsq
-OA0wXeAwVKnd+ts+/QIDAQABo4IBjDCCAYgwHwYDVR0jBBgwFoAUDL2TaAzz3quj
-SWsrN1dH6pDjue0wHQYDVR0OBBYEFChWxiARdSk1TBcSYp/N8SSictJjMA4GA1Ud
-DwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggr
-BgEFBQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNV
-HR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNT
-TENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQu
-dGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRw
-Oi8vb2NzcC50Y3MudGVyZW5hLm9yZzA6BgNVHREEMzAxghZzaGliYm9sZXRoLmVu
-cy1seW9uLmZyghdzaGliYm9sZXRoMi5lbnMtbHlvbi5mcjANBgkqhkiG9w0BAQUF
-AAOCAQEAuUKiMBx/HCAebLHhz3hfgd6P31r5FqLVYxTngYyrJLvDKBifyoOiIPiA
-4ZVx5YEwM31MuRwMZudRSCN9nmv24OocG41g0d2YrPW7UpV3uTgWSdmmeLSkMBFm
-H7rtx57vWgmrW+OrnkeH8Ab0kyJlv41Y1kqDLYbX3biWRhvqYuvUsmsipSI4qhW2
-U0uR+ZuXE63ib7nvKVaOhE0xA51kaVYWGXDkiGZclFShjfn6aiOrb4/AndVNIJ7X
-XmIvINFpZiRoszGN9qpUIgFXGimzydOuKLYTgeczy0lp74wlpYTy5AXt7TIM/Wcm
-fe1ohrE7LQaSLfH8v3Q8YrsPai3rjA==
-					    </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>
-					      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>
-    <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">ENS de Lyon</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">ENS 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.ensi-bourges.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.ensi-bourges.fr-idp-shibboleth.xml
deleted file mode 100644
index 7842fe45..00000000
--- a/swamid-interfederations-2.0/shibboleth.ensi-bourges.fr-idp-shibboleth.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://shibboleth.ensi-bourges.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2012-08-23T14:24:45Z">
-      <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">ensi-bourges.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">Ecole Nationale Supérieure d'Ingénieurs de Bourges</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDVDCCAjygAwIBAgIVAN6gM4+w8Gx9no3WaW+bpt8Vs/EOMA0GCSqGSIb3DQEB
-BQUAMCUxIzAhBgNVBAMTGnNoaWJib2xldGguZW5zaS1ib3VyZ2VzLmZyMB4XDTEy
-MDQyMDEzMzk0N1oXDTMyMDQyMDEzMzk0N1owJTEjMCEGA1UEAxMac2hpYmJvbGV0
-aC5lbnNpLWJvdXJnZXMuZnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
-AQCcEpHcghvI1KrNU3oU02iIBGA4qV6Etno9hG4LfTZL+J+8LUY9xbnK2ZBpfUsk
-GN/ioX6FEBSIU+cXNvbxZT45Y4gs492nzjmNpTDKNeU3+HRhnQkGM4b0JXY5G1v2
-nQavrSD1ECIM0BpSveHi1ihDn6iWw8CVdutoKJ4EktVbCr/BNZpYc2k3EJtsKKXm
-ewaAkLxr4IKzeDpY7XWnO7jvmzOYeG4JQ/8japsEG8Nczb+x8kiSyiyYyNVGpxbh
-zsgiB22z/DKOdyKS5qRRL4UeFCtWv21It2d6/yFolks7Q4szZL8L2M5QidVQyK7i
-kUjUNXpeG4ym2em847qId4OvAgMBAAGjezB5MFgGA1UdEQRRME+CGnNoaWJib2xl
-dGguZW5zaS1ib3VyZ2VzLmZyhjFodHRwczovL3NoaWJib2xldGguZW5zaS1ib3Vy
-Z2VzLmZyL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBSAz0Hnruvk56ktSDWEWNPX
-cun+TTANBgkqhkiG9w0BAQUFAAOCAQEAR0Cv5H8SVMZC9TwCd+HoaKsrFbTWylbp
-aqg3E1ZS0/lN+DhoMWtjsV11e4/FUjKWjKejbXMEfGYPJBsssEx8YS7RH3cP/7zD
-8j7MuadL92A6IjA/PSI88Ee+yozMFyDUyEZwhcAvzsDiJgqoZ/Jqyx1n/Ahq4zFo
-xFPbgi4ddFYuZxVpoGMVPYqWfmqX3PXTKVvkqyLns9Fs/wfXI7NBuxxnFPFZS1Y4
-3TPgmBFpVZdI9KCcB4/vz7mqHhA/iT8H51eU2uHV9SfnDjeLW3nB/XfxiBjP5Loe
-2RYyHguWnRCRk0/thc1XVaS0X/CFun8xq053SrDgxgZNINKS+En2yg==
-					    </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.ensi-bourges.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.ensi-bourges.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.ensi-bourges.fr/idp/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Ecole Nationale Supérieure d'Ingénieurs de Bourges</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Ecole Nationale Supérieure d'Ingénieurs de Bourges</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Frédéric AURAMBOUT</SurName>
-    <EmailAddress>frederic.aurambout@ensi-bourges.fr</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <SurName>Sylvain LESAGE</SurName>
-    <EmailAddress>sylvain.lesage@ensi-bourges.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.ensi-bourges.fr.xml b/swamid-interfederations-2.0/shibboleth.ensi-bourges.fr.xml
deleted file mode 100644
index 7842fe45..00000000
--- a/swamid-interfederations-2.0/shibboleth.ensi-bourges.fr.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://shibboleth.ensi-bourges.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2012-08-23T14:24:45Z">
-      <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">ensi-bourges.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">Ecole Nationale Supérieure d'Ingénieurs de Bourges</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDVDCCAjygAwIBAgIVAN6gM4+w8Gx9no3WaW+bpt8Vs/EOMA0GCSqGSIb3DQEB
-BQUAMCUxIzAhBgNVBAMTGnNoaWJib2xldGguZW5zaS1ib3VyZ2VzLmZyMB4XDTEy
-MDQyMDEzMzk0N1oXDTMyMDQyMDEzMzk0N1owJTEjMCEGA1UEAxMac2hpYmJvbGV0
-aC5lbnNpLWJvdXJnZXMuZnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
-AQCcEpHcghvI1KrNU3oU02iIBGA4qV6Etno9hG4LfTZL+J+8LUY9xbnK2ZBpfUsk
-GN/ioX6FEBSIU+cXNvbxZT45Y4gs492nzjmNpTDKNeU3+HRhnQkGM4b0JXY5G1v2
-nQavrSD1ECIM0BpSveHi1ihDn6iWw8CVdutoKJ4EktVbCr/BNZpYc2k3EJtsKKXm
-ewaAkLxr4IKzeDpY7XWnO7jvmzOYeG4JQ/8japsEG8Nczb+x8kiSyiyYyNVGpxbh
-zsgiB22z/DKOdyKS5qRRL4UeFCtWv21It2d6/yFolks7Q4szZL8L2M5QidVQyK7i
-kUjUNXpeG4ym2em847qId4OvAgMBAAGjezB5MFgGA1UdEQRRME+CGnNoaWJib2xl
-dGguZW5zaS1ib3VyZ2VzLmZyhjFodHRwczovL3NoaWJib2xldGguZW5zaS1ib3Vy
-Z2VzLmZyL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBSAz0Hnruvk56ktSDWEWNPX
-cun+TTANBgkqhkiG9w0BAQUFAAOCAQEAR0Cv5H8SVMZC9TwCd+HoaKsrFbTWylbp
-aqg3E1ZS0/lN+DhoMWtjsV11e4/FUjKWjKejbXMEfGYPJBsssEx8YS7RH3cP/7zD
-8j7MuadL92A6IjA/PSI88Ee+yozMFyDUyEZwhcAvzsDiJgqoZ/Jqyx1n/Ahq4zFo
-xFPbgi4ddFYuZxVpoGMVPYqWfmqX3PXTKVvkqyLns9Fs/wfXI7NBuxxnFPFZS1Y4
-3TPgmBFpVZdI9KCcB4/vz7mqHhA/iT8H51eU2uHV9SfnDjeLW3nB/XfxiBjP5Loe
-2RYyHguWnRCRk0/thc1XVaS0X/CFun8xq053SrDgxgZNINKS+En2yg==
-					    </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.ensi-bourges.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.ensi-bourges.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.ensi-bourges.fr/idp/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Ecole Nationale Supérieure d'Ingénieurs de Bourges</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Ecole Nationale Supérieure d'Ingénieurs de Bourges</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Frédéric AURAMBOUT</SurName>
-    <EmailAddress>frederic.aurambout@ensi-bourges.fr</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <SurName>Sylvain LESAGE</SurName>
-    <EmailAddress>sylvain.lesage@ensi-bourges.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.ensicaen.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.ensicaen.fr-idp-shibboleth.xml
deleted file mode 100644
index 969f0486..00000000
--- a/swamid-interfederations-2.0/shibboleth.ensicaen.fr-idp-shibboleth.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://shibboleth.ensicaen.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2010-11-10T23:00:08Z">
-      <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">ensicaen.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">ENSICAEN</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDQzCCAiugAwIBAgIUWJlRFhwGwMk4lj3M8MGZi+WUiKQwDQYJKoZIhvcNAQEF
-BQAwITEfMB0GA1UEAxMWc2hpYmJvbGV0aC5lbnNpY2Flbi5mcjAeFw0xMDAzMTUw
-OTI0MzlaFw0zMDAzMTUwOTI0MzlaMCExHzAdBgNVBAMTFnNoaWJib2xldGguZW5z
-aWNhZW4uZnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCVj+NT2Lhd
-BHoJ7m+6gaI8xBsdkm7dNyFtVJyfsMU9Dvc/qlhjNR+2YSVbiDdmDvqeMgbrFjcC
-lMo5ife47oQMLjBUHhvj2xliSt+evvqEUnRRnJU10PIf4Bchub/v82hS5JbPxL8b
-wLyFag5llUg6hbi93lvhp+bgYk8ZAz5hmJ/VrS3yAQ4sCsogGB1nMuQ00JGZxxxE
-4PfQnVL10DDP5/RpHDLENJu4vZKY/7C+S9CEN4RkqxA+yNyP3JS0KRbP9+7ATYiR
-q+QhF2V4eQZ4KnjiN62O+lJ6Gs3vVBAPqdb2lEFfnaSBsZ19HyZFY6/GjNIcyv3h
-qf5za6LbS4xBAgMBAAGjczBxMFAGA1UdEQRJMEeCFnNoaWJib2xldGguZW5zaWNh
-ZW4uZnKGLWh0dHBzOi8vc2hpYmJvbGV0aC5lbnNpY2Flbi5mci9pZHAvc2hpYmJv
-bGV0aDAdBgNVHQ4EFgQUI3L7p8efYitE5TlY75ZGW7uC4eAwDQYJKoZIhvcNAQEF
-BQADggEBAIC8Dw+q0N19K6FB0xTbEGYEvLbIXSzPei5QAx8aJVm6fowYs1N582Le
-UXfwhI2N0hkIUQiPVnZ263lM2J17OO7neACCFtyHPkG0Qa8gMcu+0BuZZ+YU9zyc
-t7msRhc+8ZFE//98p8mhQ182k1Qwif4Vzn8Sq+ygBIyZyim4zKT2TsS09EuXdzFw
-jdfJTflIFXumBysheVxnDGXqfaIcl9s4s1PC45Ekvfn0KjA8mHU6OOgR6822HvUo
-mNhb2f0nJQSmsahxi2OvvzkuegbrCzMH/55Wb51w8oHcXF/2IUHgKdIXEXa7HtMT
-fM3qXap8JFtk63lFp9nrjdR9nwduKnM=
-					    </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.ensicaen.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.ensicaen.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.ensicaen.fr/idp/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">ENSICAEN</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">ENSICAEN</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>LEPLANQUAIS ARNAUD</SurName>
-    <EmailAddress>arnaud.leplanquais@ensicaen.fr</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <SurName>LEVEE FREDDY</SurName>
-    <EmailAddress>freddy.levee@ensicaen.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.ensicaen.fr.xml b/swamid-interfederations-2.0/shibboleth.ensicaen.fr.xml
deleted file mode 100644
index 969f0486..00000000
--- a/swamid-interfederations-2.0/shibboleth.ensicaen.fr.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://shibboleth.ensicaen.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2010-11-10T23:00:08Z">
-      <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">ensicaen.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">ENSICAEN</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDQzCCAiugAwIBAgIUWJlRFhwGwMk4lj3M8MGZi+WUiKQwDQYJKoZIhvcNAQEF
-BQAwITEfMB0GA1UEAxMWc2hpYmJvbGV0aC5lbnNpY2Flbi5mcjAeFw0xMDAzMTUw
-OTI0MzlaFw0zMDAzMTUwOTI0MzlaMCExHzAdBgNVBAMTFnNoaWJib2xldGguZW5z
-aWNhZW4uZnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCVj+NT2Lhd
-BHoJ7m+6gaI8xBsdkm7dNyFtVJyfsMU9Dvc/qlhjNR+2YSVbiDdmDvqeMgbrFjcC
-lMo5ife47oQMLjBUHhvj2xliSt+evvqEUnRRnJU10PIf4Bchub/v82hS5JbPxL8b
-wLyFag5llUg6hbi93lvhp+bgYk8ZAz5hmJ/VrS3yAQ4sCsogGB1nMuQ00JGZxxxE
-4PfQnVL10DDP5/RpHDLENJu4vZKY/7C+S9CEN4RkqxA+yNyP3JS0KRbP9+7ATYiR
-q+QhF2V4eQZ4KnjiN62O+lJ6Gs3vVBAPqdb2lEFfnaSBsZ19HyZFY6/GjNIcyv3h
-qf5za6LbS4xBAgMBAAGjczBxMFAGA1UdEQRJMEeCFnNoaWJib2xldGguZW5zaWNh
-ZW4uZnKGLWh0dHBzOi8vc2hpYmJvbGV0aC5lbnNpY2Flbi5mci9pZHAvc2hpYmJv
-bGV0aDAdBgNVHQ4EFgQUI3L7p8efYitE5TlY75ZGW7uC4eAwDQYJKoZIhvcNAQEF
-BQADggEBAIC8Dw+q0N19K6FB0xTbEGYEvLbIXSzPei5QAx8aJVm6fowYs1N582Le
-UXfwhI2N0hkIUQiPVnZ263lM2J17OO7neACCFtyHPkG0Qa8gMcu+0BuZZ+YU9zyc
-t7msRhc+8ZFE//98p8mhQ182k1Qwif4Vzn8Sq+ygBIyZyim4zKT2TsS09EuXdzFw
-jdfJTflIFXumBysheVxnDGXqfaIcl9s4s1PC45Ekvfn0KjA8mHU6OOgR6822HvUo
-mNhb2f0nJQSmsahxi2OvvzkuegbrCzMH/55Wb51w8oHcXF/2IUHgKdIXEXa7HtMT
-fM3qXap8JFtk63lFp9nrjdR9nwduKnM=
-					    </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.ensicaen.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.ensicaen.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.ensicaen.fr/idp/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">ENSICAEN</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">ENSICAEN</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>LEPLANQUAIS ARNAUD</SurName>
-    <EmailAddress>arnaud.leplanquais@ensicaen.fr</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <SurName>LEVEE FREDDY</SurName>
-    <EmailAddress>freddy.levee@ensicaen.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.ensiie.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.ensiie.fr-idp-shibboleth.xml
deleted file mode 100644
index 2dbc12c2..00000000
--- a/swamid-interfederations-2.0/shibboleth.ensiie.fr-idp-shibboleth.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.ensiie.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2011-06-01T11:47:42Z">
-      <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">ensiie.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">ENSIIE</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDPDCCAiSgAwIBAgIVAJhRpKXWoL4ec82/4p6JsfCsvqKyMA0GCSqGSIb3DQEB
-BQUAMB8xHTAbBgNVBAMTFHNoaWJib2xldGguZW5zaWllLmZyMB4XDTExMDEyMDA5
-MTQ0OVoXDTMxMDEyMDA5MTQ0OVowHzEdMBsGA1UEAxMUc2hpYmJvbGV0aC5lbnNp
-aWUuZnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCHdchDzLlTFyjs
-d9B41OSth9PhLDux66bxohuYtsLWri93KmXhI4I9lBQNkUhQopg6b8Q6XGyKrdsE
-SOLIuRmD+O0ml5xN36fPfJRCh5Y1Z8Jg4luD3zDaK+LybgU437Dd0IKmPH27Iene
-BiLmMCs0ekRmjQN4cmmzRFoYbY9qaZQjW3y+vg7ucUF7YrXWxbxUcTiNWTdl3N3s
-WxWbRQEdcOeQl9CRNI6nA7Bo0V+6IjB+/8J9ho3GYoLtWbcdAeAW34dwv6AvVrex
-XJqb6PcjbqkESZ8PnXDHD1UMsnLy+NbF0CWxi/A1fAhHDYPMEPWIrJBWJ/Fzl6qN
-x2wlkSPTAgMBAAGjbzBtMEwGA1UdEQRFMEOCFHNoaWJib2xldGguZW5zaWllLmZy
-hitodHRwczovL3NoaWJib2xldGguZW5zaWllLmZyL2lkcC9zaGliYm9sZXRoMB0G
-A1UdDgQWBBT58XqSFu3/O2kvOm+ckV4Eeyur9zANBgkqhkiG9w0BAQUFAAOCAQEA
-eUF1Ye+cUNUfZvi0QHiDVtB1bJVFDVimtqt3DJl5g/eYV5jeLHK48+2xrqo2HRk5
-SU+JpT4lGmxVv89cyGF6QzDl5ZC6f5mTi+bR+DXJagoDTeXTph1bDSy9v12tTmXi
-Omo9LtDoYKd4WKUOxzgMJli1ng3wojkFrCmfVJjUzbFWs7EX9DjDYSfwHEXxO+jI
-vrHxCMUO/ZzbFqeDNVTakzahgQ9yAkjDXUVMuvUgAVnfijxKalijRKcUjZQd2CD8
-OcxQqlta3BMFNJvyeGMEx+OTkwl4aBjXweyhhJjRvEbgDHQDiwciDyfhUMjgAXas
-2SsRh/A6XGOz0FDi5j0Qzw==
-					    </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.ensiie.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.ensiie.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.ensiie.fr/idp/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">ENSIIE</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">ENSIIE</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>THOMAS Gael</SurName>
-    <EmailAddress>gael.thomas@ensiie.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.ensiie.fr.xml b/swamid-interfederations-2.0/shibboleth.ensiie.fr.xml
deleted file mode 100644
index 2dbc12c2..00000000
--- a/swamid-interfederations-2.0/shibboleth.ensiie.fr.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.ensiie.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2011-06-01T11:47:42Z">
-      <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">ensiie.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">ENSIIE</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDPDCCAiSgAwIBAgIVAJhRpKXWoL4ec82/4p6JsfCsvqKyMA0GCSqGSIb3DQEB
-BQUAMB8xHTAbBgNVBAMTFHNoaWJib2xldGguZW5zaWllLmZyMB4XDTExMDEyMDA5
-MTQ0OVoXDTMxMDEyMDA5MTQ0OVowHzEdMBsGA1UEAxMUc2hpYmJvbGV0aC5lbnNp
-aWUuZnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCHdchDzLlTFyjs
-d9B41OSth9PhLDux66bxohuYtsLWri93KmXhI4I9lBQNkUhQopg6b8Q6XGyKrdsE
-SOLIuRmD+O0ml5xN36fPfJRCh5Y1Z8Jg4luD3zDaK+LybgU437Dd0IKmPH27Iene
-BiLmMCs0ekRmjQN4cmmzRFoYbY9qaZQjW3y+vg7ucUF7YrXWxbxUcTiNWTdl3N3s
-WxWbRQEdcOeQl9CRNI6nA7Bo0V+6IjB+/8J9ho3GYoLtWbcdAeAW34dwv6AvVrex
-XJqb6PcjbqkESZ8PnXDHD1UMsnLy+NbF0CWxi/A1fAhHDYPMEPWIrJBWJ/Fzl6qN
-x2wlkSPTAgMBAAGjbzBtMEwGA1UdEQRFMEOCFHNoaWJib2xldGguZW5zaWllLmZy
-hitodHRwczovL3NoaWJib2xldGguZW5zaWllLmZyL2lkcC9zaGliYm9sZXRoMB0G
-A1UdDgQWBBT58XqSFu3/O2kvOm+ckV4Eeyur9zANBgkqhkiG9w0BAQUFAAOCAQEA
-eUF1Ye+cUNUfZvi0QHiDVtB1bJVFDVimtqt3DJl5g/eYV5jeLHK48+2xrqo2HRk5
-SU+JpT4lGmxVv89cyGF6QzDl5ZC6f5mTi+bR+DXJagoDTeXTph1bDSy9v12tTmXi
-Omo9LtDoYKd4WKUOxzgMJli1ng3wojkFrCmfVJjUzbFWs7EX9DjDYSfwHEXxO+jI
-vrHxCMUO/ZzbFqeDNVTakzahgQ9yAkjDXUVMuvUgAVnfijxKalijRKcUjZQd2CD8
-OcxQqlta3BMFNJvyeGMEx+OTkwl4aBjXweyhhJjRvEbgDHQDiwciDyfhUMjgAXas
-2SsRh/A6XGOz0FDi5j0Qzw==
-					    </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.ensiie.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.ensiie.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.ensiie.fr/idp/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">ENSIIE</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">ENSIIE</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>THOMAS Gael</SurName>
-    <EmailAddress>gael.thomas@ensiie.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.envt.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.envt.fr-idp-shibboleth.xml
deleted file mode 100644
index 5512babd..00000000
--- a/swamid-interfederations-2.0/shibboleth.envt.fr-idp-shibboleth.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.envt.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2013-07-15T15:58:51Z">
-      <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">envt.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">Ecole Nationale Vétérinaire de Toulouse (ENVT)</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDNDCCAhygAwIBAgIVALbIAX96KL3MHHLOC3iIdPBazQtRMA0GCSqGSIb3DQEB
-BQUAMB0xGzAZBgNVBAMTEnNoaWJib2xldGguZW52dC5mcjAeFw0xMzA2MjYwNzQ1
-MjhaFw0zMzA2MjYwNzQ1MjhaMB0xGzAZBgNVBAMTEnNoaWJib2xldGguZW52dC5m
-cjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAL14Y39Z+9nkRJRbtsZs
-GIFZcTO8R4DH9nhPuokCn/mByrzCtVAEdC91yQ7+jGgXB/DZ/HECMvolPFnV3aRP
-CrsFap1m1WbaL72fLhO3zxappC0BzZxyefuHtRkvf2yx6hS7qg2HHgzNVqUpJFW9
-cbaxLyIIZuy6cmGvfNGZ7SchdgIqcUclhxZWOo8HH2d4rFZWIIOScZ9gyhThlZUs
-ZKXCe2cw0b69B3tU7DVT2ZL3G8HPDOsJ02EHckSJhExRRB6obM7FSnvi2qOkSoTS
-/tobBMNR6vGN6EYc3+6MwR572TEG0YKDWA4UkfVkrb5BGwclehPoYybuwLO9bIGz
-y+MCAwEAAaNrMGkwSAYDVR0RBEEwP4ISc2hpYmJvbGV0aC5lbnZ0LmZyhilodHRw
-czovL3NoaWJib2xldGguZW52dC5mci9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQU
-fCqGnApiVU0GuQF3nPx7nd06SPswDQYJKoZIhvcNAQEFBQADggEBADI4y7Im35ne
-5YqpHF4hfF6HCIVezRvIrm6WrdL5aB7U//Pfq+ZTDnByLzULEU2LIgOlEyFlz5Os
-5yYI9c5nGrStndK9dvWTTUhQdZjVBJAfiHx0wBIdgEgI/R7X4kUpgZgpPC/WCk0W
-CP+KGdCy+HnpZ40bq0AhDKIoX5iXoXIIvmioONovPXmUh0aHgHVFufW8Y4qHilW/
-iowguqDTs4Es0C9ynTwu/wWLb1GWoIRtBHq7BR1yUCnefmDlZ1dP5sNCShVALvie
-ba49eIXgBqBxpQGrsHsgBR0UlekV5SmAQxH42PmEzeOpLCRTvlmOn2SYTJd4gJ1a
-JZ1pqUirmzM=
-					    </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.envt.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.envt.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.envt.fr/idp/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Ecole Nationale Vétérinaire de Toulouse (ENVT)</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Ecole Nationale Vétérinaire de Toulouse (ENVT)</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>ARNOUX Jean-Baptiste</SurName>
-    <EmailAddress>jb.arnoux@envt.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.envt.fr.xml b/swamid-interfederations-2.0/shibboleth.envt.fr.xml
deleted file mode 100644
index 5512babd..00000000
--- a/swamid-interfederations-2.0/shibboleth.envt.fr.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.envt.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2013-07-15T15:58:51Z">
-      <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">envt.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">Ecole Nationale Vétérinaire de Toulouse (ENVT)</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDNDCCAhygAwIBAgIVALbIAX96KL3MHHLOC3iIdPBazQtRMA0GCSqGSIb3DQEB
-BQUAMB0xGzAZBgNVBAMTEnNoaWJib2xldGguZW52dC5mcjAeFw0xMzA2MjYwNzQ1
-MjhaFw0zMzA2MjYwNzQ1MjhaMB0xGzAZBgNVBAMTEnNoaWJib2xldGguZW52dC5m
-cjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAL14Y39Z+9nkRJRbtsZs
-GIFZcTO8R4DH9nhPuokCn/mByrzCtVAEdC91yQ7+jGgXB/DZ/HECMvolPFnV3aRP
-CrsFap1m1WbaL72fLhO3zxappC0BzZxyefuHtRkvf2yx6hS7qg2HHgzNVqUpJFW9
-cbaxLyIIZuy6cmGvfNGZ7SchdgIqcUclhxZWOo8HH2d4rFZWIIOScZ9gyhThlZUs
-ZKXCe2cw0b69B3tU7DVT2ZL3G8HPDOsJ02EHckSJhExRRB6obM7FSnvi2qOkSoTS
-/tobBMNR6vGN6EYc3+6MwR572TEG0YKDWA4UkfVkrb5BGwclehPoYybuwLO9bIGz
-y+MCAwEAAaNrMGkwSAYDVR0RBEEwP4ISc2hpYmJvbGV0aC5lbnZ0LmZyhilodHRw
-czovL3NoaWJib2xldGguZW52dC5mci9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQU
-fCqGnApiVU0GuQF3nPx7nd06SPswDQYJKoZIhvcNAQEFBQADggEBADI4y7Im35ne
-5YqpHF4hfF6HCIVezRvIrm6WrdL5aB7U//Pfq+ZTDnByLzULEU2LIgOlEyFlz5Os
-5yYI9c5nGrStndK9dvWTTUhQdZjVBJAfiHx0wBIdgEgI/R7X4kUpgZgpPC/WCk0W
-CP+KGdCy+HnpZ40bq0AhDKIoX5iXoXIIvmioONovPXmUh0aHgHVFufW8Y4qHilW/
-iowguqDTs4Es0C9ynTwu/wWLb1GWoIRtBHq7BR1yUCnefmDlZ1dP5sNCShVALvie
-ba49eIXgBqBxpQGrsHsgBR0UlekV5SmAQxH42PmEzeOpLCRTvlmOn2SYTJd4gJ1a
-JZ1pqUirmzM=
-					    </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.envt.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.envt.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.envt.fr/idp/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Ecole Nationale Vétérinaire de Toulouse (ENVT)</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Ecole Nationale Vétérinaire de Toulouse (ENVT)</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>ARNOUX Jean-Baptiste</SurName>
-    <EmailAddress>jb.arnoux@envt.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.fhwn.ac.at-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.fhwn.ac.at-idp-shibboleth.xml
deleted file mode 100644
index 3ae21cc5..00000000
--- a/swamid-interfederations-2.0/shibboleth.fhwn.ac.at-idp-shibboleth.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://shibboleth.fhwn.ac.at/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://eduid.at" registrationInstant="2013-12-06T12:40:18Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://eduid.at/policy/mdrps-20140606</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-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fhwn.ac.at</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">University of Applied Sciences Wiener Neustadt</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="de">FH Wiener Neustadt</mdui:DisplayName>
-        <mdui:Logo height="85" width="125">https://moodle2.fhwn.ac.at/bilder/logo.jpg</mdui:Logo>
-        <mdui:Logo height="16" width="16">https://moodle2.fhwn.ac.at/bilder/favicon.ico</mdui:Logo>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:IPHint>2001:628:2270::/48</mdui:IPHint>
-        <mdui:DomainHint>fhwn.ac.at</mdui:DomainHint>
-        <mdui:GeolocationHint>geo:47.83902,16.24842</mdui:GeolocationHint>
-      </mdui:DiscoHints>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDPzCCAiegAwIBAgIULHX3aIs7dO97h9UxvhHJhQksVhMwDQYJKoZIhvcNAQEF
-BQAwIDEeMBwGA1UEAxMVc2hpYmJvbGV0aC5maHduLmFjLmF0MB4XDTEzMTExMzA4
-MjkxMVoXDTMzMTExMzA4MjkxMVowIDEeMBwGA1UEAxMVc2hpYmJvbGV0aC5maHdu
-LmFjLmF0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAoS8CXF8y8Lcd
-J1bWqWqpcxqK07ajkBtZQ5E7Fo4pOaXx54R4eOQZR72VMLTf7Qg8W8UYopD1A1/h
-cd8u5Un/yFHDuy34pG/rPTc0rvmHEeZ5nEkDNzvKbebX78bizbZ7cThwFf8WADiV
-UAC9gxpxLAiVhqEPjytIJOnoC9ENNBqqKOaBme3KgifRW/18vEes1DANSNMP1LZi
-MLZCMLouKgwVzBpR7MGiDFx3+Xdn/g1210TpXyW4yr4FZyNxJOmuZPY8GGQBoI15
-NmWKp5Wgh1EcuMK/X0rOm7QZuuHMAUd6awXTE71MljXlPmlfDylcLWBx2QHG8Yrq
-WClEBAefeQIDAQABo3EwbzBOBgNVHREERzBFghVzaGliYm9sZXRoLmZod24uYWMu
-YXSGLGh0dHBzOi8vc2hpYmJvbGV0aC5maHduLmFjLmF0L2lkcC9zaGliYm9sZXRo
-MB0GA1UdDgQWBBRju/KxvciXjf6JW/P+nVPegBlUsTANBgkqhkiG9w0BAQUFAAOC
-AQEATpk3i0dOltmwiHTi2NwkXPVnQh6Wtk70ZJle/2Vwl6IJGU5AcruKL9ySROKO
-z69XGJlr/CJsuZcwee/rdeGkQEaNKLjL6PgGqmxWz85LRz5rbBFAFujLj5yBSEXA
-HSLH5mhf+hL6n8uwEYcGk/0WBkWYSjuNld+4XbbyCrr12WreHk7PnZxdmSzR2gQy
-I67i0vpE9NwTTnO7ZfRVvlAtC7jYv5aC3BdS89q7R68F24h2AHbXkvrWkg+DWnjw
-BIVIp1IblZQxAYs2OF5CCTkJyWmteql3RucKtC1zWuPY1heiT+2+ac44TwkIvInI
-aTYBUwf6LPKYdpVL5MFq35/cnQ==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.fhwn.ac.at:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.fhwn.ac.at:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.fhwn.ac.at/idp/profile/SAML2/Redirect/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.fhwn.ac.at/idp/profile/SAML2/POST/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.fhwn.ac.at:8443/idp/profile/SAML2/SOAP/SLO"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.fhwn.ac.at/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.fhwn.ac.at/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.fhwn.ac.at/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.fhwn.ac.at/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">fhwn.ac.at</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDPzCCAiegAwIBAgIULHX3aIs7dO97h9UxvhHJhQksVhMwDQYJKoZIhvcNAQEF
-BQAwIDEeMBwGA1UEAxMVc2hpYmJvbGV0aC5maHduLmFjLmF0MB4XDTEzMTExMzA4
-MjkxMVoXDTMzMTExMzA4MjkxMVowIDEeMBwGA1UEAxMVc2hpYmJvbGV0aC5maHdu
-LmFjLmF0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAoS8CXF8y8Lcd
-J1bWqWqpcxqK07ajkBtZQ5E7Fo4pOaXx54R4eOQZR72VMLTf7Qg8W8UYopD1A1/h
-cd8u5Un/yFHDuy34pG/rPTc0rvmHEeZ5nEkDNzvKbebX78bizbZ7cThwFf8WADiV
-UAC9gxpxLAiVhqEPjytIJOnoC9ENNBqqKOaBme3KgifRW/18vEes1DANSNMP1LZi
-MLZCMLouKgwVzBpR7MGiDFx3+Xdn/g1210TpXyW4yr4FZyNxJOmuZPY8GGQBoI15
-NmWKp5Wgh1EcuMK/X0rOm7QZuuHMAUd6awXTE71MljXlPmlfDylcLWBx2QHG8Yrq
-WClEBAefeQIDAQABo3EwbzBOBgNVHREERzBFghVzaGliYm9sZXRoLmZod24uYWMu
-YXSGLGh0dHBzOi8vc2hpYmJvbGV0aC5maHduLmFjLmF0L2lkcC9zaGliYm9sZXRo
-MB0GA1UdDgQWBBRju/KxvciXjf6JW/P+nVPegBlUsTANBgkqhkiG9w0BAQUFAAOC
-AQEATpk3i0dOltmwiHTi2NwkXPVnQh6Wtk70ZJle/2Vwl6IJGU5AcruKL9ySROKO
-z69XGJlr/CJsuZcwee/rdeGkQEaNKLjL6PgGqmxWz85LRz5rbBFAFujLj5yBSEXA
-HSLH5mhf+hL6n8uwEYcGk/0WBkWYSjuNld+4XbbyCrr12WreHk7PnZxdmSzR2gQy
-I67i0vpE9NwTTnO7ZfRVvlAtC7jYv5aC3BdS89q7R68F24h2AHbXkvrWkg+DWnjw
-BIVIp1IblZQxAYs2OF5CCTkJyWmteql3RucKtC1zWuPY1heiT+2+ac44TwkIvInI
-aTYBUwf6LPKYdpVL5MFq35/cnQ==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.fhwn.ac.at:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.fhwn.ac.at: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="de">FH Wiener Neustadt für Wirtschaft und Technik GesmbH</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">University of Applied Sciences Wiener Neustadt for Business and Engineering Ltd., Austria</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="de">FH Wiener Neustadt</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">University of Applied Sciences Wiener Neustadt</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="de">http://www.fhwn.ac.at/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.fhwn.ac.at/en/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Zentraler</md:GivenName>
-    <md:SurName>Service-Desk</md:SurName>
-    <md:EmailAddress>mailto:support@fhwn.ac.at</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Zentraler</md:GivenName>
-    <md:SurName>Service-Desk</md:SurName>
-    <md:EmailAddress>mailto:support@fhwn.ac.at</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.fhwn.ac.at.xml b/swamid-interfederations-2.0/shibboleth.fhwn.ac.at.xml
deleted file mode 100644
index 3ae21cc5..00000000
--- a/swamid-interfederations-2.0/shibboleth.fhwn.ac.at.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://shibboleth.fhwn.ac.at/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://eduid.at" registrationInstant="2013-12-06T12:40:18Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://eduid.at/policy/mdrps-20140606</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-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fhwn.ac.at</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">University of Applied Sciences Wiener Neustadt</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="de">FH Wiener Neustadt</mdui:DisplayName>
-        <mdui:Logo height="85" width="125">https://moodle2.fhwn.ac.at/bilder/logo.jpg</mdui:Logo>
-        <mdui:Logo height="16" width="16">https://moodle2.fhwn.ac.at/bilder/favicon.ico</mdui:Logo>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:IPHint>2001:628:2270::/48</mdui:IPHint>
-        <mdui:DomainHint>fhwn.ac.at</mdui:DomainHint>
-        <mdui:GeolocationHint>geo:47.83902,16.24842</mdui:GeolocationHint>
-      </mdui:DiscoHints>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDPzCCAiegAwIBAgIULHX3aIs7dO97h9UxvhHJhQksVhMwDQYJKoZIhvcNAQEF
-BQAwIDEeMBwGA1UEAxMVc2hpYmJvbGV0aC5maHduLmFjLmF0MB4XDTEzMTExMzA4
-MjkxMVoXDTMzMTExMzA4MjkxMVowIDEeMBwGA1UEAxMVc2hpYmJvbGV0aC5maHdu
-LmFjLmF0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAoS8CXF8y8Lcd
-J1bWqWqpcxqK07ajkBtZQ5E7Fo4pOaXx54R4eOQZR72VMLTf7Qg8W8UYopD1A1/h
-cd8u5Un/yFHDuy34pG/rPTc0rvmHEeZ5nEkDNzvKbebX78bizbZ7cThwFf8WADiV
-UAC9gxpxLAiVhqEPjytIJOnoC9ENNBqqKOaBme3KgifRW/18vEes1DANSNMP1LZi
-MLZCMLouKgwVzBpR7MGiDFx3+Xdn/g1210TpXyW4yr4FZyNxJOmuZPY8GGQBoI15
-NmWKp5Wgh1EcuMK/X0rOm7QZuuHMAUd6awXTE71MljXlPmlfDylcLWBx2QHG8Yrq
-WClEBAefeQIDAQABo3EwbzBOBgNVHREERzBFghVzaGliYm9sZXRoLmZod24uYWMu
-YXSGLGh0dHBzOi8vc2hpYmJvbGV0aC5maHduLmFjLmF0L2lkcC9zaGliYm9sZXRo
-MB0GA1UdDgQWBBRju/KxvciXjf6JW/P+nVPegBlUsTANBgkqhkiG9w0BAQUFAAOC
-AQEATpk3i0dOltmwiHTi2NwkXPVnQh6Wtk70ZJle/2Vwl6IJGU5AcruKL9ySROKO
-z69XGJlr/CJsuZcwee/rdeGkQEaNKLjL6PgGqmxWz85LRz5rbBFAFujLj5yBSEXA
-HSLH5mhf+hL6n8uwEYcGk/0WBkWYSjuNld+4XbbyCrr12WreHk7PnZxdmSzR2gQy
-I67i0vpE9NwTTnO7ZfRVvlAtC7jYv5aC3BdS89q7R68F24h2AHbXkvrWkg+DWnjw
-BIVIp1IblZQxAYs2OF5CCTkJyWmteql3RucKtC1zWuPY1heiT+2+ac44TwkIvInI
-aTYBUwf6LPKYdpVL5MFq35/cnQ==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.fhwn.ac.at:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.fhwn.ac.at:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.fhwn.ac.at/idp/profile/SAML2/Redirect/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.fhwn.ac.at/idp/profile/SAML2/POST/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.fhwn.ac.at:8443/idp/profile/SAML2/SOAP/SLO"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.fhwn.ac.at/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.fhwn.ac.at/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.fhwn.ac.at/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.fhwn.ac.at/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">fhwn.ac.at</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDPzCCAiegAwIBAgIULHX3aIs7dO97h9UxvhHJhQksVhMwDQYJKoZIhvcNAQEF
-BQAwIDEeMBwGA1UEAxMVc2hpYmJvbGV0aC5maHduLmFjLmF0MB4XDTEzMTExMzA4
-MjkxMVoXDTMzMTExMzA4MjkxMVowIDEeMBwGA1UEAxMVc2hpYmJvbGV0aC5maHdu
-LmFjLmF0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAoS8CXF8y8Lcd
-J1bWqWqpcxqK07ajkBtZQ5E7Fo4pOaXx54R4eOQZR72VMLTf7Qg8W8UYopD1A1/h
-cd8u5Un/yFHDuy34pG/rPTc0rvmHEeZ5nEkDNzvKbebX78bizbZ7cThwFf8WADiV
-UAC9gxpxLAiVhqEPjytIJOnoC9ENNBqqKOaBme3KgifRW/18vEes1DANSNMP1LZi
-MLZCMLouKgwVzBpR7MGiDFx3+Xdn/g1210TpXyW4yr4FZyNxJOmuZPY8GGQBoI15
-NmWKp5Wgh1EcuMK/X0rOm7QZuuHMAUd6awXTE71MljXlPmlfDylcLWBx2QHG8Yrq
-WClEBAefeQIDAQABo3EwbzBOBgNVHREERzBFghVzaGliYm9sZXRoLmZod24uYWMu
-YXSGLGh0dHBzOi8vc2hpYmJvbGV0aC5maHduLmFjLmF0L2lkcC9zaGliYm9sZXRo
-MB0GA1UdDgQWBBRju/KxvciXjf6JW/P+nVPegBlUsTANBgkqhkiG9w0BAQUFAAOC
-AQEATpk3i0dOltmwiHTi2NwkXPVnQh6Wtk70ZJle/2Vwl6IJGU5AcruKL9ySROKO
-z69XGJlr/CJsuZcwee/rdeGkQEaNKLjL6PgGqmxWz85LRz5rbBFAFujLj5yBSEXA
-HSLH5mhf+hL6n8uwEYcGk/0WBkWYSjuNld+4XbbyCrr12WreHk7PnZxdmSzR2gQy
-I67i0vpE9NwTTnO7ZfRVvlAtC7jYv5aC3BdS89q7R68F24h2AHbXkvrWkg+DWnjw
-BIVIp1IblZQxAYs2OF5CCTkJyWmteql3RucKtC1zWuPY1heiT+2+ac44TwkIvInI
-aTYBUwf6LPKYdpVL5MFq35/cnQ==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.fhwn.ac.at:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.fhwn.ac.at: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="de">FH Wiener Neustadt für Wirtschaft und Technik GesmbH</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">University of Applied Sciences Wiener Neustadt for Business and Engineering Ltd., Austria</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="de">FH Wiener Neustadt</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">University of Applied Sciences Wiener Neustadt</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="de">http://www.fhwn.ac.at/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.fhwn.ac.at/en/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Zentraler</md:GivenName>
-    <md:SurName>Service-Desk</md:SurName>
-    <md:EmailAddress>mailto:support@fhwn.ac.at</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Zentraler</md:GivenName>
-    <md:SurName>Service-Desk</md:SurName>
-    <md:EmailAddress>mailto:support@fhwn.ac.at</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.grenoble-inp.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.grenoble-inp.fr-idp-shibboleth.xml
deleted file mode 100644
index c5d56d68..00000000
--- a/swamid-interfederations-2.0/shibboleth.grenoble-inp.fr-idp-shibboleth.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://shibboleth.grenoble-inp.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2012-07-11T10:36:51Z">
-      <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">grenoble-inp.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">Grenoble INP - Institut polytechnique de Grenoble</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDVDCCAjygAwIBAgIVAO/QaN+dR8TZXZ6cNFwn8jJiB3QdMA0GCSqGSIb3DQEB
-BQUAMCUxIzAhBgNVBAMTGnNoaWJib2xldGguZ3Jlbm9ibGUtaW5wLmZyMB4XDTEy
-MDEwOTA5MzY1NVoXDTMyMDEwOTA5MzY1NVowJTEjMCEGA1UEAxMac2hpYmJvbGV0
-aC5ncmVub2JsZS1pbnAuZnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
-AQDKu60J1wRxU9drIKvmtJJfsJ/w+Xmdd+PQOxz0+mIwpdUSpkMbkXWoiYTsj2nf
-BorFExB0qYHAUJTdPVBJL1LVSqOBK8k1w7BopKJnQ/XYujiSPuodTifKRYjiGyiB
-rDKs+pNLawv8jzWTtqnM8NYsfa0+25kdVDwHhKqmSmypB6leLyjNr9MKdHDQ38ca
-q3tKlKz0Mif1iZ0BZdo5eQSzZwO67pzU/4YUgmN2HpJxrwRsk9U98oILg2NVW+0U
-BNcheLXY2XrRd+fTbbPbTTMA4RNcYLCS0EPJ6YA77+wZ5YfD1FGu/hxBKUbCP8b8
-hhQ5O7Y//nWY3w5MlGqLAPjbAgMBAAGjezB5MFgGA1UdEQRRME+CGnNoaWJib2xl
-dGguZ3Jlbm9ibGUtaW5wLmZyhjFodHRwczovL3NoaWJib2xldGguZ3Jlbm9ibGUt
-aW5wLmZyL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBTAG7NXFV8rO7re+ySoBXuv
-3FrnkDANBgkqhkiG9w0BAQUFAAOCAQEAIFBwVqbJE++ODmHmwh6E3ScDv+LDM3q3
-GBpZKQ6I+g5uVdM1r5TRKZBxKL59J51wHBQ2+AmDhlNEeqUszaw42GXFJhWLf8RU
-5hnqyBQawD8NpztjyoNgHg1dLdg6uz8k1YHXTw3mG4eWaqxmeeUKspv+XXyBg7Sw
-xVox8mkoixLKQpOZ20xTOK41X+bAockt816dkuSR2ZV+v8fwE4BZbFunf9XZRJmD
-eyd91K5Q48y3V66rM3lnwlbdRFcBD9QC8vL+kHL1L5RIUSiClWuSm4J6adU29spC
-OXNNpafFw7y4uune6Y8Jq542pO0I1Hlx1rcd9u0vZ3P+ewZdQP5kkw==
-					    </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.grenoble-inp.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.grenoble-inp.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.grenoble-inp.fr/idp/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Grenoble INP - Institut polytechnique de Grenoble</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Grenoble INP - Institut polytechnique de Grenoble</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <EmailAddress>federation.sos@grenoble-inp.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.grenoble-inp.fr.xml b/swamid-interfederations-2.0/shibboleth.grenoble-inp.fr.xml
deleted file mode 100644
index c5d56d68..00000000
--- a/swamid-interfederations-2.0/shibboleth.grenoble-inp.fr.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://shibboleth.grenoble-inp.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2012-07-11T10:36:51Z">
-      <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">grenoble-inp.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">Grenoble INP - Institut polytechnique de Grenoble</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDVDCCAjygAwIBAgIVAO/QaN+dR8TZXZ6cNFwn8jJiB3QdMA0GCSqGSIb3DQEB
-BQUAMCUxIzAhBgNVBAMTGnNoaWJib2xldGguZ3Jlbm9ibGUtaW5wLmZyMB4XDTEy
-MDEwOTA5MzY1NVoXDTMyMDEwOTA5MzY1NVowJTEjMCEGA1UEAxMac2hpYmJvbGV0
-aC5ncmVub2JsZS1pbnAuZnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
-AQDKu60J1wRxU9drIKvmtJJfsJ/w+Xmdd+PQOxz0+mIwpdUSpkMbkXWoiYTsj2nf
-BorFExB0qYHAUJTdPVBJL1LVSqOBK8k1w7BopKJnQ/XYujiSPuodTifKRYjiGyiB
-rDKs+pNLawv8jzWTtqnM8NYsfa0+25kdVDwHhKqmSmypB6leLyjNr9MKdHDQ38ca
-q3tKlKz0Mif1iZ0BZdo5eQSzZwO67pzU/4YUgmN2HpJxrwRsk9U98oILg2NVW+0U
-BNcheLXY2XrRd+fTbbPbTTMA4RNcYLCS0EPJ6YA77+wZ5YfD1FGu/hxBKUbCP8b8
-hhQ5O7Y//nWY3w5MlGqLAPjbAgMBAAGjezB5MFgGA1UdEQRRME+CGnNoaWJib2xl
-dGguZ3Jlbm9ibGUtaW5wLmZyhjFodHRwczovL3NoaWJib2xldGguZ3Jlbm9ibGUt
-aW5wLmZyL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBTAG7NXFV8rO7re+ySoBXuv
-3FrnkDANBgkqhkiG9w0BAQUFAAOCAQEAIFBwVqbJE++ODmHmwh6E3ScDv+LDM3q3
-GBpZKQ6I+g5uVdM1r5TRKZBxKL59J51wHBQ2+AmDhlNEeqUszaw42GXFJhWLf8RU
-5hnqyBQawD8NpztjyoNgHg1dLdg6uz8k1YHXTw3mG4eWaqxmeeUKspv+XXyBg7Sw
-xVox8mkoixLKQpOZ20xTOK41X+bAockt816dkuSR2ZV+v8fwE4BZbFunf9XZRJmD
-eyd91K5Q48y3V66rM3lnwlbdRFcBD9QC8vL+kHL1L5RIUSiClWuSm4J6adU29spC
-OXNNpafFw7y4uune6Y8Jq542pO0I1Hlx1rcd9u0vZ3P+ewZdQP5kkw==
-					    </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.grenoble-inp.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.grenoble-inp.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.grenoble-inp.fr/idp/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Grenoble INP - Institut polytechnique de Grenoble</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Grenoble INP - Institut polytechnique de Grenoble</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <EmailAddress>federation.sos@grenoble-inp.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.ifpr.edu.br-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.ifpr.edu.br-idp-shibboleth.xml
deleted file mode 100644
index 951b1db0..00000000
--- a/swamid-interfederations-2.0/shibboleth.ifpr.edu.br-idp-shibboleth.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://shibboleth.ifpr.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">edu.br</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">IFPR - Instituto Federal do Parana</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="pt-br">IFPR - Instituto Federal do Parana</mdui:DisplayName>
-        <mdui:Description xml:lang="en">IFPR - Instituto Federal do Parana</mdui:Description>
-        <mdui:Description xml:lang="pt-br">IFPR - Instituto Federal do Parana</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.ifpr.edu.br</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="pt-br">http://www.ifpr.edu.br</mdui:InformationURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-    MIID2DCCAsACAQAwDQYJKoZIhvcNAQEFBQAwgbExKzApBgNVBAoTIklGUFIgLSBJ
-bnN0aXR1dG8gRmVkZXJhbCBkbyBQYXJhbmExDTALBgNVBAsTBERUSUMxITAfBgkq
-hkiG9w0BCQEWEmNpbmZyYUBpZnByLmVkdS5icjERMA8GA1UEBxMIQ3VyaXRpYmEx
-DzANBgNVBAgTBlBhcmFuYTELMAkGA1UEBhMCQlIxHzAdBgNVBAMTFnNoaWJib2xl
-dGguaWZwci5lZHUuYnIwHhcNMTQwNDIyMTgyMTAyWhcNMTcwNDIxMTgyMTAyWjCB
-sTErMCkGA1UEChMiSUZQUiAtIEluc3RpdHV0byBGZWRlcmFsIGRvIFBhcmFuYTEN
-MAsGA1UECxMERFRJQzEhMB8GCSqGSIb3DQEJARYSY2luZnJhQGlmcHIuZWR1LmJy
-MREwDwYDVQQHEwhDdXJpdGliYTEPMA0GA1UECBMGUGFyYW5hMQswCQYDVQQGEwJC
-UjEfMB0GA1UEAxMWc2hpYmJvbGV0aC5pZnByLmVkdS5icjCCASIwDQYJKoZIhvcN
-AQEBBQADggEPADCCAQoCggEBAL+QMvkPnIAOTQOZTKrQeyHwl1GsqdR5m7+7XhQl
-7GKYJbNwcszmZ755m7uOtz7lmBiI0ZGe77tvcExGPh9lbQiu2IGNLfA2hEtJ4FOA
-RfAATUN6HNtLEEGFxBoG94+E46FdhNVOWUUIlaPVuu9rWbEnY4+rleHEFQ4qveY6
-l1lan5To0CEd4AZEox20EDvtASKR0V+rsgGTGfX7PRnmLFLmbaOj8DkAaYrLdsvC
-l4cA/KspTuSeFO/JSGaZMwZzUlw9znB7KK1oBIas4HQq4JdgqN02mP32E1zYJwm8
-0i/jqijkPrq8vNh97L8itIKB3Z+MEMUc2mimLfbBHu/BrP8CAwEAATANBgkqhkiG
-9w0BAQUFAAOCAQEAUE5Wp5u744Ur0FMDBRSKpsG0mfgBhneFPE5BnLyjKaNKe9wL
-oWvmERcRMKMfXCthEdL7xRjg3PyaCHanuR2KtqiGrKNMtLtBewhqLBoygasNUfeE
-CIjCG+f57fEsd+cqTidaq5uJn3mcKIy/f3cBEesjRvGsTEQQIjrd6pxKqqKNdMPc
-0s9J+ykM0ZPdWusS+IIStc5WEuS3ZrvkwqgInZxvpAobYBxfFIdZeW1pAudK8YHw
-kHoWX9q1+fm3k/1z+W3MvDdC6+WAqEJKWHyMqVQwnzHbwk6Q2jlzQOH9D9n31L6H
-aNQDToC/YZpWymJvQafzCi1CmvvqS5M497IndQ==
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.ifpr.edu.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.ifpr.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://shibboleth.ifpr.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.ifpr.edu.br/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.ifpr.edu.br/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.ifpr.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>
-      
-MIID2DCCAsACAQAwDQYJKoZIhvcNAQEFBQAwgbExKzApBgNVBAoTIklGUFIgLSBJ
-bnN0aXR1dG8gRmVkZXJhbCBkbyBQYXJhbmExDTALBgNVBAsTBERUSUMxITAfBgkq
-hkiG9w0BCQEWEmNpbmZyYUBpZnByLmVkdS5icjERMA8GA1UEBxMIQ3VyaXRpYmEx
-DzANBgNVBAgTBlBhcmFuYTELMAkGA1UEBhMCQlIxHzAdBgNVBAMTFnNoaWJib2xl
-dGguaWZwci5lZHUuYnIwHhcNMTQwNDIyMTgyMTAyWhcNMTcwNDIxMTgyMTAyWjCB
-sTErMCkGA1UEChMiSUZQUiAtIEluc3RpdHV0byBGZWRlcmFsIGRvIFBhcmFuYTEN
-MAsGA1UECxMERFRJQzEhMB8GCSqGSIb3DQEJARYSY2luZnJhQGlmcHIuZWR1LmJy
-MREwDwYDVQQHEwhDdXJpdGliYTEPMA0GA1UECBMGUGFyYW5hMQswCQYDVQQGEwJC
-UjEfMB0GA1UEAxMWc2hpYmJvbGV0aC5pZnByLmVkdS5icjCCASIwDQYJKoZIhvcN
-AQEBBQADggEPADCCAQoCggEBAL+QMvkPnIAOTQOZTKrQeyHwl1GsqdR5m7+7XhQl
-7GKYJbNwcszmZ755m7uOtz7lmBiI0ZGe77tvcExGPh9lbQiu2IGNLfA2hEtJ4FOA
-RfAATUN6HNtLEEGFxBoG94+E46FdhNVOWUUIlaPVuu9rWbEnY4+rleHEFQ4qveY6
-l1lan5To0CEd4AZEox20EDvtASKR0V+rsgGTGfX7PRnmLFLmbaOj8DkAaYrLdsvC
-l4cA/KspTuSeFO/JSGaZMwZzUlw9znB7KK1oBIas4HQq4JdgqN02mP32E1zYJwm8
-0i/jqijkPrq8vNh97L8itIKB3Z+MEMUc2mimLfbBHu/BrP8CAwEAATANBgkqhkiG
-9w0BAQUFAAOCAQEAUE5Wp5u744Ur0FMDBRSKpsG0mfgBhneFPE5BnLyjKaNKe9wL
-oWvmERcRMKMfXCthEdL7xRjg3PyaCHanuR2KtqiGrKNMtLtBewhqLBoygasNUfeE
-CIjCG+f57fEsd+cqTidaq5uJn3mcKIy/f3cBEesjRvGsTEQQIjrd6pxKqqKNdMPc
-0s9J+ykM0ZPdWusS+IIStc5WEuS3ZrvkwqgInZxvpAobYBxfFIdZeW1pAudK8YHw
-kHoWX9q1+fm3k/1z+W3MvDdC6+WAqEJKWHyMqVQwnzHbwk6Q2jlzQOH9D9n31L6H
-aNQDToC/YZpWymJvQafzCi1CmvvqS5M497IndQ==
-                    
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.ifpr.edu.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.ifpr.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">IFPR - Instituto Federal do Parana</OrganizationName>
-    <OrganizationName xml:lang="pt-br">IFPR - Instituto Federal do Parana</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">IFPR - Instituto Federal do Parana</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="pt-br">IFPR - Instituto Federal do Parana</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.ifpr.edu.br</OrganizationURL>
-    <OrganizationURL xml:lang="pt-br">http://www.ifpr.edu.br</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Jefferson</SurName>
-    <EmailAddress>cinfra@ifpr.edu.br</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.ifpr.edu.br.xml b/swamid-interfederations-2.0/shibboleth.ifpr.edu.br.xml
deleted file mode 100644
index 951b1db0..00000000
--- a/swamid-interfederations-2.0/shibboleth.ifpr.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://shibboleth.ifpr.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">edu.br</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">IFPR - Instituto Federal do Parana</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="pt-br">IFPR - Instituto Federal do Parana</mdui:DisplayName>
-        <mdui:Description xml:lang="en">IFPR - Instituto Federal do Parana</mdui:Description>
-        <mdui:Description xml:lang="pt-br">IFPR - Instituto Federal do Parana</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.ifpr.edu.br</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="pt-br">http://www.ifpr.edu.br</mdui:InformationURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-    MIID2DCCAsACAQAwDQYJKoZIhvcNAQEFBQAwgbExKzApBgNVBAoTIklGUFIgLSBJ
-bnN0aXR1dG8gRmVkZXJhbCBkbyBQYXJhbmExDTALBgNVBAsTBERUSUMxITAfBgkq
-hkiG9w0BCQEWEmNpbmZyYUBpZnByLmVkdS5icjERMA8GA1UEBxMIQ3VyaXRpYmEx
-DzANBgNVBAgTBlBhcmFuYTELMAkGA1UEBhMCQlIxHzAdBgNVBAMTFnNoaWJib2xl
-dGguaWZwci5lZHUuYnIwHhcNMTQwNDIyMTgyMTAyWhcNMTcwNDIxMTgyMTAyWjCB
-sTErMCkGA1UEChMiSUZQUiAtIEluc3RpdHV0byBGZWRlcmFsIGRvIFBhcmFuYTEN
-MAsGA1UECxMERFRJQzEhMB8GCSqGSIb3DQEJARYSY2luZnJhQGlmcHIuZWR1LmJy
-MREwDwYDVQQHEwhDdXJpdGliYTEPMA0GA1UECBMGUGFyYW5hMQswCQYDVQQGEwJC
-UjEfMB0GA1UEAxMWc2hpYmJvbGV0aC5pZnByLmVkdS5icjCCASIwDQYJKoZIhvcN
-AQEBBQADggEPADCCAQoCggEBAL+QMvkPnIAOTQOZTKrQeyHwl1GsqdR5m7+7XhQl
-7GKYJbNwcszmZ755m7uOtz7lmBiI0ZGe77tvcExGPh9lbQiu2IGNLfA2hEtJ4FOA
-RfAATUN6HNtLEEGFxBoG94+E46FdhNVOWUUIlaPVuu9rWbEnY4+rleHEFQ4qveY6
-l1lan5To0CEd4AZEox20EDvtASKR0V+rsgGTGfX7PRnmLFLmbaOj8DkAaYrLdsvC
-l4cA/KspTuSeFO/JSGaZMwZzUlw9znB7KK1oBIas4HQq4JdgqN02mP32E1zYJwm8
-0i/jqijkPrq8vNh97L8itIKB3Z+MEMUc2mimLfbBHu/BrP8CAwEAATANBgkqhkiG
-9w0BAQUFAAOCAQEAUE5Wp5u744Ur0FMDBRSKpsG0mfgBhneFPE5BnLyjKaNKe9wL
-oWvmERcRMKMfXCthEdL7xRjg3PyaCHanuR2KtqiGrKNMtLtBewhqLBoygasNUfeE
-CIjCG+f57fEsd+cqTidaq5uJn3mcKIy/f3cBEesjRvGsTEQQIjrd6pxKqqKNdMPc
-0s9J+ykM0ZPdWusS+IIStc5WEuS3ZrvkwqgInZxvpAobYBxfFIdZeW1pAudK8YHw
-kHoWX9q1+fm3k/1z+W3MvDdC6+WAqEJKWHyMqVQwnzHbwk6Q2jlzQOH9D9n31L6H
-aNQDToC/YZpWymJvQafzCi1CmvvqS5M497IndQ==
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.ifpr.edu.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.ifpr.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://shibboleth.ifpr.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.ifpr.edu.br/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.ifpr.edu.br/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.ifpr.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>
-      
-MIID2DCCAsACAQAwDQYJKoZIhvcNAQEFBQAwgbExKzApBgNVBAoTIklGUFIgLSBJ
-bnN0aXR1dG8gRmVkZXJhbCBkbyBQYXJhbmExDTALBgNVBAsTBERUSUMxITAfBgkq
-hkiG9w0BCQEWEmNpbmZyYUBpZnByLmVkdS5icjERMA8GA1UEBxMIQ3VyaXRpYmEx
-DzANBgNVBAgTBlBhcmFuYTELMAkGA1UEBhMCQlIxHzAdBgNVBAMTFnNoaWJib2xl
-dGguaWZwci5lZHUuYnIwHhcNMTQwNDIyMTgyMTAyWhcNMTcwNDIxMTgyMTAyWjCB
-sTErMCkGA1UEChMiSUZQUiAtIEluc3RpdHV0byBGZWRlcmFsIGRvIFBhcmFuYTEN
-MAsGA1UECxMERFRJQzEhMB8GCSqGSIb3DQEJARYSY2luZnJhQGlmcHIuZWR1LmJy
-MREwDwYDVQQHEwhDdXJpdGliYTEPMA0GA1UECBMGUGFyYW5hMQswCQYDVQQGEwJC
-UjEfMB0GA1UEAxMWc2hpYmJvbGV0aC5pZnByLmVkdS5icjCCASIwDQYJKoZIhvcN
-AQEBBQADggEPADCCAQoCggEBAL+QMvkPnIAOTQOZTKrQeyHwl1GsqdR5m7+7XhQl
-7GKYJbNwcszmZ755m7uOtz7lmBiI0ZGe77tvcExGPh9lbQiu2IGNLfA2hEtJ4FOA
-RfAATUN6HNtLEEGFxBoG94+E46FdhNVOWUUIlaPVuu9rWbEnY4+rleHEFQ4qveY6
-l1lan5To0CEd4AZEox20EDvtASKR0V+rsgGTGfX7PRnmLFLmbaOj8DkAaYrLdsvC
-l4cA/KspTuSeFO/JSGaZMwZzUlw9znB7KK1oBIas4HQq4JdgqN02mP32E1zYJwm8
-0i/jqijkPrq8vNh97L8itIKB3Z+MEMUc2mimLfbBHu/BrP8CAwEAATANBgkqhkiG
-9w0BAQUFAAOCAQEAUE5Wp5u744Ur0FMDBRSKpsG0mfgBhneFPE5BnLyjKaNKe9wL
-oWvmERcRMKMfXCthEdL7xRjg3PyaCHanuR2KtqiGrKNMtLtBewhqLBoygasNUfeE
-CIjCG+f57fEsd+cqTidaq5uJn3mcKIy/f3cBEesjRvGsTEQQIjrd6pxKqqKNdMPc
-0s9J+ykM0ZPdWusS+IIStc5WEuS3ZrvkwqgInZxvpAobYBxfFIdZeW1pAudK8YHw
-kHoWX9q1+fm3k/1z+W3MvDdC6+WAqEJKWHyMqVQwnzHbwk6Q2jlzQOH9D9n31L6H
-aNQDToC/YZpWymJvQafzCi1CmvvqS5M497IndQ==
-                    
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.ifpr.edu.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.ifpr.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">IFPR - Instituto Federal do Parana</OrganizationName>
-    <OrganizationName xml:lang="pt-br">IFPR - Instituto Federal do Parana</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">IFPR - Instituto Federal do Parana</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="pt-br">IFPR - Instituto Federal do Parana</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.ifpr.edu.br</OrganizationURL>
-    <OrganizationURL xml:lang="pt-br">http://www.ifpr.edu.br</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Jefferson</SurName>
-    <EmailAddress>cinfra@ifpr.edu.br</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.im.jku.at-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.im.jku.at-idp-shibboleth.xml
deleted file mode 100644
index 904c960a..00000000
--- a/swamid-interfederations-2.0/shibboleth.im.jku.at-idp-shibboleth.xml
+++ /dev/null
@@ -1,111 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.im.jku.at/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://eduid.at" registrationInstant="2008-08-11T10:50:42Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://eduid.at/policy/mdrps-20140606</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-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">jku.at</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="de">Johannes Kepler Universität Linz</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Johannes Kepler University Linz</mdui:DisplayName>
-        <mdui:Logo height="183" width="385">https://shibboleth.im.jku.at/logos/JKULogokurzWappenlinks.png</mdui:Logo>
-        <mdui:Logo height="92" width="193">https://shibboleth.im.jku.at/logos/JKULogokurzWappenlinks_50.png</mdui:Logo>
-        <mdui:Logo height="16" width="16">https://shibboleth.im.jku.at/logos/favicon.ico</mdui:Logo>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDPDCCAiSgAwIBAgIVAON+suZcxVqRRl5fo2FX1rk+r+TxMA0GCSqGSIb3DQEB
-BQUAMB8xHTAbBgNVBAMTFHNoaWJib2xldGguaW0uamt1LmF0MB4XDTA4MDczMDA3
-Mzk0M1oXDTI4MDczMDA3Mzk0M1owHzEdMBsGA1UEAxMUc2hpYmJvbGV0aC5pbS5q
-a3UuYXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDDfNbFkkCSmIqH
-O3Ai8h+10/n3Pjix9u92Vhnz+V40ZBz+V7BFdQv5gOPuoggwLymOpYjjZ0x3tV1M
-M/hgng8MYnWp4/d5HOMHYPvO1NL/24tuCM2S+sZKeQheKecosQi+lyuOPSG+XCbu
-Nkhsi4hhOzFvEbEV3rpxYZmy+0DYI47hGtEla+41LSkUcxiaym9cPmwTh+iyYRN1
-4qyQ5UsTghf0LNz+7zUwCvCncwOtfb5tyi6gdrnim9fLu6ocjL8kgu96XfcpSBlv
-KZmUsBMlqj0HwpO7SxDfuCZOwcAwZHjKkbGphPtJshWfWioX29Py7tayeYRyf/ul
-2a27GU03AgMBAAGjbzBtMEwGA1UdEQRFMEOCFHNoaWJib2xldGguaW0uamt1LmF0
-hitodHRwczovL3NoaWJib2xldGguaW0uamt1LmF0L2lkcC9zaGliYm9sZXRoMB0G
-A1UdDgQWBBRT3TnG4PgZ44Zu/p6xsK1iBPCknDANBgkqhkiG9w0BAQUFAAOCAQEA
-CcqKRJyTg6PARys1IRCMTAiMiXyEsOORL1sVdJmsV2ljypJfJAkhNgQrPPjnXRB9
-lPmUma+ihYK57HkgICfvCw23RjJ4o5IntarEwHAYyKoI+9kO1P5PCF+cD+P77ACN
-mwWSntdEXINxg2lEH8MZe6JAmAxn4U7EMV7w5zGjn005Dd5h//ESTUorWDwiOYMC
-j57krbfkY+X5tcEGvMTV+gfLkNDbHsw4JkTJfkE/HAxBdL0CX7cbuD5JmUmjIaqV
-AC5O1LtZwJdnlYMLOwYARxZzZ8AQqxpMyQ/J5bHXuMRH/KHU78zkiWH2DRidkGxT
-lkm+eYJRFwZraUdycAffqQ==
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.im.jku.at:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.im.jku.at: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:1.1:nameid-format:unspecified</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.im.jku.at/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.im.jku.at/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.im.jku.at/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.im.jku.at/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">jku.at</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDPDCCAiSgAwIBAgIVAON+suZcxVqRRl5fo2FX1rk+r+TxMA0GCSqGSIb3DQEB
-BQUAMB8xHTAbBgNVBAMTFHNoaWJib2xldGguaW0uamt1LmF0MB4XDTA4MDczMDA3
-Mzk0M1oXDTI4MDczMDA3Mzk0M1owHzEdMBsGA1UEAxMUc2hpYmJvbGV0aC5pbS5q
-a3UuYXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDDfNbFkkCSmIqH
-O3Ai8h+10/n3Pjix9u92Vhnz+V40ZBz+V7BFdQv5gOPuoggwLymOpYjjZ0x3tV1M
-M/hgng8MYnWp4/d5HOMHYPvO1NL/24tuCM2S+sZKeQheKecosQi+lyuOPSG+XCbu
-Nkhsi4hhOzFvEbEV3rpxYZmy+0DYI47hGtEla+41LSkUcxiaym9cPmwTh+iyYRN1
-4qyQ5UsTghf0LNz+7zUwCvCncwOtfb5tyi6gdrnim9fLu6ocjL8kgu96XfcpSBlv
-KZmUsBMlqj0HwpO7SxDfuCZOwcAwZHjKkbGphPtJshWfWioX29Py7tayeYRyf/ul
-2a27GU03AgMBAAGjbzBtMEwGA1UdEQRFMEOCFHNoaWJib2xldGguaW0uamt1LmF0
-hitodHRwczovL3NoaWJib2xldGguaW0uamt1LmF0L2lkcC9zaGliYm9sZXRoMB0G
-A1UdDgQWBBRT3TnG4PgZ44Zu/p6xsK1iBPCknDANBgkqhkiG9w0BAQUFAAOCAQEA
-CcqKRJyTg6PARys1IRCMTAiMiXyEsOORL1sVdJmsV2ljypJfJAkhNgQrPPjnXRB9
-lPmUma+ihYK57HkgICfvCw23RjJ4o5IntarEwHAYyKoI+9kO1P5PCF+cD+P77ACN
-mwWSntdEXINxg2lEH8MZe6JAmAxn4U7EMV7w5zGjn005Dd5h//ESTUorWDwiOYMC
-j57krbfkY+X5tcEGvMTV+gfLkNDbHsw4JkTJfkE/HAxBdL0CX7cbuD5JmUmjIaqV
-AC5O1LtZwJdnlYMLOwYARxZzZ8AQqxpMyQ/J5bHXuMRH/KHU78zkiWH2DRidkGxT
-lkm+eYJRFwZraUdycAffqQ==
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.im.jku.at:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.im.jku.at:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="de">Universität Linz</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">University Linz</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="de">Johannes Kepler Universität Linz</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Johannes Kepler University Linz</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="de">http://www.jku.at/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.jku.at/setCookieFromQuery?language=en</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Server</md:GivenName>
-    <md:SurName>Systems</md:SurName>
-    <md:EmailAddress>mailto:serveradmin@jku.at</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.im.jku.at.xml b/swamid-interfederations-2.0/shibboleth.im.jku.at.xml
deleted file mode 100644
index 904c960a..00000000
--- a/swamid-interfederations-2.0/shibboleth.im.jku.at.xml
+++ /dev/null
@@ -1,111 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.im.jku.at/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://eduid.at" registrationInstant="2008-08-11T10:50:42Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://eduid.at/policy/mdrps-20140606</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-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">jku.at</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="de">Johannes Kepler Universität Linz</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Johannes Kepler University Linz</mdui:DisplayName>
-        <mdui:Logo height="183" width="385">https://shibboleth.im.jku.at/logos/JKULogokurzWappenlinks.png</mdui:Logo>
-        <mdui:Logo height="92" width="193">https://shibboleth.im.jku.at/logos/JKULogokurzWappenlinks_50.png</mdui:Logo>
-        <mdui:Logo height="16" width="16">https://shibboleth.im.jku.at/logos/favicon.ico</mdui:Logo>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDPDCCAiSgAwIBAgIVAON+suZcxVqRRl5fo2FX1rk+r+TxMA0GCSqGSIb3DQEB
-BQUAMB8xHTAbBgNVBAMTFHNoaWJib2xldGguaW0uamt1LmF0MB4XDTA4MDczMDA3
-Mzk0M1oXDTI4MDczMDA3Mzk0M1owHzEdMBsGA1UEAxMUc2hpYmJvbGV0aC5pbS5q
-a3UuYXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDDfNbFkkCSmIqH
-O3Ai8h+10/n3Pjix9u92Vhnz+V40ZBz+V7BFdQv5gOPuoggwLymOpYjjZ0x3tV1M
-M/hgng8MYnWp4/d5HOMHYPvO1NL/24tuCM2S+sZKeQheKecosQi+lyuOPSG+XCbu
-Nkhsi4hhOzFvEbEV3rpxYZmy+0DYI47hGtEla+41LSkUcxiaym9cPmwTh+iyYRN1
-4qyQ5UsTghf0LNz+7zUwCvCncwOtfb5tyi6gdrnim9fLu6ocjL8kgu96XfcpSBlv
-KZmUsBMlqj0HwpO7SxDfuCZOwcAwZHjKkbGphPtJshWfWioX29Py7tayeYRyf/ul
-2a27GU03AgMBAAGjbzBtMEwGA1UdEQRFMEOCFHNoaWJib2xldGguaW0uamt1LmF0
-hitodHRwczovL3NoaWJib2xldGguaW0uamt1LmF0L2lkcC9zaGliYm9sZXRoMB0G
-A1UdDgQWBBRT3TnG4PgZ44Zu/p6xsK1iBPCknDANBgkqhkiG9w0BAQUFAAOCAQEA
-CcqKRJyTg6PARys1IRCMTAiMiXyEsOORL1sVdJmsV2ljypJfJAkhNgQrPPjnXRB9
-lPmUma+ihYK57HkgICfvCw23RjJ4o5IntarEwHAYyKoI+9kO1P5PCF+cD+P77ACN
-mwWSntdEXINxg2lEH8MZe6JAmAxn4U7EMV7w5zGjn005Dd5h//ESTUorWDwiOYMC
-j57krbfkY+X5tcEGvMTV+gfLkNDbHsw4JkTJfkE/HAxBdL0CX7cbuD5JmUmjIaqV
-AC5O1LtZwJdnlYMLOwYARxZzZ8AQqxpMyQ/J5bHXuMRH/KHU78zkiWH2DRidkGxT
-lkm+eYJRFwZraUdycAffqQ==
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.im.jku.at:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.im.jku.at: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:1.1:nameid-format:unspecified</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.im.jku.at/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.im.jku.at/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.im.jku.at/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.im.jku.at/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">jku.at</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDPDCCAiSgAwIBAgIVAON+suZcxVqRRl5fo2FX1rk+r+TxMA0GCSqGSIb3DQEB
-BQUAMB8xHTAbBgNVBAMTFHNoaWJib2xldGguaW0uamt1LmF0MB4XDTA4MDczMDA3
-Mzk0M1oXDTI4MDczMDA3Mzk0M1owHzEdMBsGA1UEAxMUc2hpYmJvbGV0aC5pbS5q
-a3UuYXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDDfNbFkkCSmIqH
-O3Ai8h+10/n3Pjix9u92Vhnz+V40ZBz+V7BFdQv5gOPuoggwLymOpYjjZ0x3tV1M
-M/hgng8MYnWp4/d5HOMHYPvO1NL/24tuCM2S+sZKeQheKecosQi+lyuOPSG+XCbu
-Nkhsi4hhOzFvEbEV3rpxYZmy+0DYI47hGtEla+41LSkUcxiaym9cPmwTh+iyYRN1
-4qyQ5UsTghf0LNz+7zUwCvCncwOtfb5tyi6gdrnim9fLu6ocjL8kgu96XfcpSBlv
-KZmUsBMlqj0HwpO7SxDfuCZOwcAwZHjKkbGphPtJshWfWioX29Py7tayeYRyf/ul
-2a27GU03AgMBAAGjbzBtMEwGA1UdEQRFMEOCFHNoaWJib2xldGguaW0uamt1LmF0
-hitodHRwczovL3NoaWJib2xldGguaW0uamt1LmF0L2lkcC9zaGliYm9sZXRoMB0G
-A1UdDgQWBBRT3TnG4PgZ44Zu/p6xsK1iBPCknDANBgkqhkiG9w0BAQUFAAOCAQEA
-CcqKRJyTg6PARys1IRCMTAiMiXyEsOORL1sVdJmsV2ljypJfJAkhNgQrPPjnXRB9
-lPmUma+ihYK57HkgICfvCw23RjJ4o5IntarEwHAYyKoI+9kO1P5PCF+cD+P77ACN
-mwWSntdEXINxg2lEH8MZe6JAmAxn4U7EMV7w5zGjn005Dd5h//ESTUorWDwiOYMC
-j57krbfkY+X5tcEGvMTV+gfLkNDbHsw4JkTJfkE/HAxBdL0CX7cbuD5JmUmjIaqV
-AC5O1LtZwJdnlYMLOwYARxZzZ8AQqxpMyQ/J5bHXuMRH/KHU78zkiWH2DRidkGxT
-lkm+eYJRFwZraUdycAffqQ==
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.im.jku.at:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.im.jku.at:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="de">Universität Linz</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">University Linz</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="de">Johannes Kepler Universität Linz</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Johannes Kepler University Linz</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="de">http://www.jku.at/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.jku.at/setCookieFromQuery?language=en</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Server</md:GivenName>
-    <md:SurName>Systems</md:SurName>
-    <md:EmailAddress>mailto:serveradmin@jku.at</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.insa-cvl.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.insa-cvl.fr-idp-shibboleth.xml
deleted file mode 100644
index 4a780fd9..00000000
--- a/swamid-interfederations-2.0/shibboleth.insa-cvl.fr-idp-shibboleth.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://shibboleth.insa-cvl.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2014-03-18T10:24:13Z">
-      <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">insa-cvl.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">INSA Centre Val de Loire</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDVDCCAjygAwIBAgIVAN6gM4+w8Gx9no3WaW+bpt8Vs/EOMA0GCSqGSIb3DQEB
-BQUAMCUxIzAhBgNVBAMTGnNoaWJib2xldGguZW5zaS1ib3VyZ2VzLmZyMB4XDTEy
-MDQyMDEzMzk0N1oXDTMyMDQyMDEzMzk0N1owJTEjMCEGA1UEAxMac2hpYmJvbGV0
-aC5lbnNpLWJvdXJnZXMuZnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
-AQCcEpHcghvI1KrNU3oU02iIBGA4qV6Etno9hG4LfTZL+J+8LUY9xbnK2ZBpfUsk
-GN/ioX6FEBSIU+cXNvbxZT45Y4gs492nzjmNpTDKNeU3+HRhnQkGM4b0JXY5G1v2
-nQavrSD1ECIM0BpSveHi1ihDn6iWw8CVdutoKJ4EktVbCr/BNZpYc2k3EJtsKKXm
-ewaAkLxr4IKzeDpY7XWnO7jvmzOYeG4JQ/8japsEG8Nczb+x8kiSyiyYyNVGpxbh
-zsgiB22z/DKOdyKS5qRRL4UeFCtWv21It2d6/yFolks7Q4szZL8L2M5QidVQyK7i
-kUjUNXpeG4ym2em847qId4OvAgMBAAGjezB5MFgGA1UdEQRRME+CGnNoaWJib2xl
-dGguZW5zaS1ib3VyZ2VzLmZyhjFodHRwczovL3NoaWJib2xldGguZW5zaS1ib3Vy
-Z2VzLmZyL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBSAz0Hnruvk56ktSDWEWNPX
-cun+TTANBgkqhkiG9w0BAQUFAAOCAQEAR0Cv5H8SVMZC9TwCd+HoaKsrFbTWylbp
-aqg3E1ZS0/lN+DhoMWtjsV11e4/FUjKWjKejbXMEfGYPJBsssEx8YS7RH3cP/7zD
-8j7MuadL92A6IjA/PSI88Ee+yozMFyDUyEZwhcAvzsDiJgqoZ/Jqyx1n/Ahq4zFo
-xFPbgi4ddFYuZxVpoGMVPYqWfmqX3PXTKVvkqyLns9Fs/wfXI7NBuxxnFPFZS1Y4
-3TPgmBFpVZdI9KCcB4/vz7mqHhA/iT8H51eU2uHV9SfnDjeLW3nB/XfxiBjP5Loe
-2RYyHguWnRCRk0/thc1XVaS0X/CFun8xq053SrDgxgZNINKS+En2yg==
-					    </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.insa-cvl.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.insa-cvl.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.insa-cvl.fr/idp/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">INSA Centre Val de Loire</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">INSA Centre Val de Loire</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Christophe DEROUET</SurName>
-    <EmailAddress>christophe.derouet@insa-cvl.fr</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <SurName>Sylvain LESAGE</SurName>
-    <EmailAddress>sylvain.lesage@insa-cvl.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.insa-cvl.fr.xml b/swamid-interfederations-2.0/shibboleth.insa-cvl.fr.xml
deleted file mode 100644
index 4a780fd9..00000000
--- a/swamid-interfederations-2.0/shibboleth.insa-cvl.fr.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://shibboleth.insa-cvl.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2014-03-18T10:24:13Z">
-      <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">insa-cvl.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">INSA Centre Val de Loire</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDVDCCAjygAwIBAgIVAN6gM4+w8Gx9no3WaW+bpt8Vs/EOMA0GCSqGSIb3DQEB
-BQUAMCUxIzAhBgNVBAMTGnNoaWJib2xldGguZW5zaS1ib3VyZ2VzLmZyMB4XDTEy
-MDQyMDEzMzk0N1oXDTMyMDQyMDEzMzk0N1owJTEjMCEGA1UEAxMac2hpYmJvbGV0
-aC5lbnNpLWJvdXJnZXMuZnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
-AQCcEpHcghvI1KrNU3oU02iIBGA4qV6Etno9hG4LfTZL+J+8LUY9xbnK2ZBpfUsk
-GN/ioX6FEBSIU+cXNvbxZT45Y4gs492nzjmNpTDKNeU3+HRhnQkGM4b0JXY5G1v2
-nQavrSD1ECIM0BpSveHi1ihDn6iWw8CVdutoKJ4EktVbCr/BNZpYc2k3EJtsKKXm
-ewaAkLxr4IKzeDpY7XWnO7jvmzOYeG4JQ/8japsEG8Nczb+x8kiSyiyYyNVGpxbh
-zsgiB22z/DKOdyKS5qRRL4UeFCtWv21It2d6/yFolks7Q4szZL8L2M5QidVQyK7i
-kUjUNXpeG4ym2em847qId4OvAgMBAAGjezB5MFgGA1UdEQRRME+CGnNoaWJib2xl
-dGguZW5zaS1ib3VyZ2VzLmZyhjFodHRwczovL3NoaWJib2xldGguZW5zaS1ib3Vy
-Z2VzLmZyL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBSAz0Hnruvk56ktSDWEWNPX
-cun+TTANBgkqhkiG9w0BAQUFAAOCAQEAR0Cv5H8SVMZC9TwCd+HoaKsrFbTWylbp
-aqg3E1ZS0/lN+DhoMWtjsV11e4/FUjKWjKejbXMEfGYPJBsssEx8YS7RH3cP/7zD
-8j7MuadL92A6IjA/PSI88Ee+yozMFyDUyEZwhcAvzsDiJgqoZ/Jqyx1n/Ahq4zFo
-xFPbgi4ddFYuZxVpoGMVPYqWfmqX3PXTKVvkqyLns9Fs/wfXI7NBuxxnFPFZS1Y4
-3TPgmBFpVZdI9KCcB4/vz7mqHhA/iT8H51eU2uHV9SfnDjeLW3nB/XfxiBjP5Loe
-2RYyHguWnRCRk0/thc1XVaS0X/CFun8xq053SrDgxgZNINKS+En2yg==
-					    </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.insa-cvl.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.insa-cvl.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.insa-cvl.fr/idp/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">INSA Centre Val de Loire</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">INSA Centre Val de Loire</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Christophe DEROUET</SurName>
-    <EmailAddress>christophe.derouet@insa-cvl.fr</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <SurName>Sylvain LESAGE</SurName>
-    <EmailAddress>sylvain.lesage@insa-cvl.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.insa-rouen.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.insa-rouen.fr-idp-shibboleth.xml
deleted file mode 100644
index e056e2fe..00000000
--- a/swamid-interfederations-2.0/shibboleth.insa-rouen.fr-idp-shibboleth.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://shibboleth.insa-rouen.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2010-03-02T14:41:38Z">
-      <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">insa-rouen.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">INSA de Rouen</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDTDCCAjSgAwIBAgIVAMjnzzUZMi+gw/G65zb8aEmhPMcsMA0GCSqGSIb3DQEB
-BQUAMCMxITAfBgNVBAMTGHNoaWJib2xldGguaW5zYS1yb3Vlbi5mcjAeFw0xMDAy
-MTIxNDE0MTNaFw0zMDAyMTIxNDE0MTNaMCMxITAfBgNVBAMTGHNoaWJib2xldGgu
-aW5zYS1yb3Vlbi5mcjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAIrS
-+3iUIFUKCA9bdG5CkzYxYKWg6huMkcRrqruetEbUobvCf/B5Q4R2SuEHa+VG2SMd
-bgjcHSjPIqwtzcaFq9cEK+I24UPSpBUYei/m9//CWMUNR0YGJWgQdtMi9v4N60qP
-Fiep4U5vj/whakGeMY5J3E8mKrzITemh0yLFThQh+edav5QaPOuOuWW1kx8e3Y2P
-uCEdDDvxXS6vtUJ0Y9OOmq824e9Olo2DIHsbicraB3hnHVDwljw4gwKGDqlkr7kJ
-P/5ORgPyRa51RcD21XHaMcNbiZ9BWuyZkgIX7MwY5Pucn9xZBLOCF1XVPrIz5Thw
-3JBDfons1+l52SpmlW0CAwEAAaN3MHUwVAYDVR0RBE0wS4IYc2hpYmJvbGV0aC5p
-bnNhLXJvdWVuLmZyhi9odHRwczovL3NoaWJib2xldGguaW5zYS1yb3Vlbi5mci9p
-ZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUVroJwDQMTj+P/Qy2rF0hgSrMGd0wDQYJ
-KoZIhvcNAQEFBQADggEBABzLkZCSjBO68HuRhDjlVblgc9up8dN5pZZMxxWyQfQM
-GZgv3sYwktpBL/I7jUuEhiMbr5n8I/hq0HrxiBAFulVvuLhahzfY4GxMwEBHTYm/
-gOoNn2cJD+ZKFF1PPZ3TYnlbM1nJ17AbSCjS2QxzNygTzi2tDulpOJgUmacLr81Q
-VZrWGgkPWyDKh3foQ7Olh9eiySh1jSl55uJE4ze1yopOiFyLfe4PHYnsfanu9F0k
-2VITeNSh7Epbl3wutJnfXFpa4XpmWMIzeQD7Eowrs5Oewk1peM6kl2fzn4gKcFXo
-u1n3Fa3LxTYXo8TB+XbBKdEFD+MdaGILc/H8Gb5EEak=
-					    </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.insa-rouen.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.insa-rouen.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.insa-rouen.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">insa-rouen.fr</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDTDCCAjSgAwIBAgIVAMjnzzUZMi+gw/G65zb8aEmhPMcsMA0GCSqGSIb3DQEB
-BQUAMCMxITAfBgNVBAMTGHNoaWJib2xldGguaW5zYS1yb3Vlbi5mcjAeFw0xMDAy
-MTIxNDE0MTNaFw0zMDAyMTIxNDE0MTNaMCMxITAfBgNVBAMTGHNoaWJib2xldGgu
-aW5zYS1yb3Vlbi5mcjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAIrS
-+3iUIFUKCA9bdG5CkzYxYKWg6huMkcRrqruetEbUobvCf/B5Q4R2SuEHa+VG2SMd
-bgjcHSjPIqwtzcaFq9cEK+I24UPSpBUYei/m9//CWMUNR0YGJWgQdtMi9v4N60qP
-Fiep4U5vj/whakGeMY5J3E8mKrzITemh0yLFThQh+edav5QaPOuOuWW1kx8e3Y2P
-uCEdDDvxXS6vtUJ0Y9OOmq824e9Olo2DIHsbicraB3hnHVDwljw4gwKGDqlkr7kJ
-P/5ORgPyRa51RcD21XHaMcNbiZ9BWuyZkgIX7MwY5Pucn9xZBLOCF1XVPrIz5Thw
-3JBDfons1+l52SpmlW0CAwEAAaN3MHUwVAYDVR0RBE0wS4IYc2hpYmJvbGV0aC5p
-bnNhLXJvdWVuLmZyhi9odHRwczovL3NoaWJib2xldGguaW5zYS1yb3Vlbi5mci9p
-ZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUVroJwDQMTj+P/Qy2rF0hgSrMGd0wDQYJ
-KoZIhvcNAQEFBQADggEBABzLkZCSjBO68HuRhDjlVblgc9up8dN5pZZMxxWyQfQM
-GZgv3sYwktpBL/I7jUuEhiMbr5n8I/hq0HrxiBAFulVvuLhahzfY4GxMwEBHTYm/
-gOoNn2cJD+ZKFF1PPZ3TYnlbM1nJ17AbSCjS2QxzNygTzi2tDulpOJgUmacLr81Q
-VZrWGgkPWyDKh3foQ7Olh9eiySh1jSl55uJE4ze1yopOiFyLfe4PHYnsfanu9F0k
-2VITeNSh7Epbl3wutJnfXFpa4XpmWMIzeQD7Eowrs5Oewk1peM6kl2fzn4gKcFXo
-u1n3Fa3LxTYXo8TB+XbBKdEFD+MdaGILc/H8Gb5EEak=
-					    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.insa-rouen.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">INSA de Rouen</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">INSA de Rouen</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>LE GUILLOUS Franck</SurName>
-    <EmailAddress>franck.le-guillous@insa-rouen.fr</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <SurName>Kesraoui Nadir</SurName>
-    <EmailAddress>nadir.kesraoui@insa-rouen.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.insa-rouen.fr.xml b/swamid-interfederations-2.0/shibboleth.insa-rouen.fr.xml
deleted file mode 100644
index e056e2fe..00000000
--- a/swamid-interfederations-2.0/shibboleth.insa-rouen.fr.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://shibboleth.insa-rouen.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2010-03-02T14:41:38Z">
-      <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">insa-rouen.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">INSA de Rouen</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDTDCCAjSgAwIBAgIVAMjnzzUZMi+gw/G65zb8aEmhPMcsMA0GCSqGSIb3DQEB
-BQUAMCMxITAfBgNVBAMTGHNoaWJib2xldGguaW5zYS1yb3Vlbi5mcjAeFw0xMDAy
-MTIxNDE0MTNaFw0zMDAyMTIxNDE0MTNaMCMxITAfBgNVBAMTGHNoaWJib2xldGgu
-aW5zYS1yb3Vlbi5mcjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAIrS
-+3iUIFUKCA9bdG5CkzYxYKWg6huMkcRrqruetEbUobvCf/B5Q4R2SuEHa+VG2SMd
-bgjcHSjPIqwtzcaFq9cEK+I24UPSpBUYei/m9//CWMUNR0YGJWgQdtMi9v4N60qP
-Fiep4U5vj/whakGeMY5J3E8mKrzITemh0yLFThQh+edav5QaPOuOuWW1kx8e3Y2P
-uCEdDDvxXS6vtUJ0Y9OOmq824e9Olo2DIHsbicraB3hnHVDwljw4gwKGDqlkr7kJ
-P/5ORgPyRa51RcD21XHaMcNbiZ9BWuyZkgIX7MwY5Pucn9xZBLOCF1XVPrIz5Thw
-3JBDfons1+l52SpmlW0CAwEAAaN3MHUwVAYDVR0RBE0wS4IYc2hpYmJvbGV0aC5p
-bnNhLXJvdWVuLmZyhi9odHRwczovL3NoaWJib2xldGguaW5zYS1yb3Vlbi5mci9p
-ZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUVroJwDQMTj+P/Qy2rF0hgSrMGd0wDQYJ
-KoZIhvcNAQEFBQADggEBABzLkZCSjBO68HuRhDjlVblgc9up8dN5pZZMxxWyQfQM
-GZgv3sYwktpBL/I7jUuEhiMbr5n8I/hq0HrxiBAFulVvuLhahzfY4GxMwEBHTYm/
-gOoNn2cJD+ZKFF1PPZ3TYnlbM1nJ17AbSCjS2QxzNygTzi2tDulpOJgUmacLr81Q
-VZrWGgkPWyDKh3foQ7Olh9eiySh1jSl55uJE4ze1yopOiFyLfe4PHYnsfanu9F0k
-2VITeNSh7Epbl3wutJnfXFpa4XpmWMIzeQD7Eowrs5Oewk1peM6kl2fzn4gKcFXo
-u1n3Fa3LxTYXo8TB+XbBKdEFD+MdaGILc/H8Gb5EEak=
-					    </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.insa-rouen.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.insa-rouen.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.insa-rouen.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">insa-rouen.fr</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDTDCCAjSgAwIBAgIVAMjnzzUZMi+gw/G65zb8aEmhPMcsMA0GCSqGSIb3DQEB
-BQUAMCMxITAfBgNVBAMTGHNoaWJib2xldGguaW5zYS1yb3Vlbi5mcjAeFw0xMDAy
-MTIxNDE0MTNaFw0zMDAyMTIxNDE0MTNaMCMxITAfBgNVBAMTGHNoaWJib2xldGgu
-aW5zYS1yb3Vlbi5mcjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAIrS
-+3iUIFUKCA9bdG5CkzYxYKWg6huMkcRrqruetEbUobvCf/B5Q4R2SuEHa+VG2SMd
-bgjcHSjPIqwtzcaFq9cEK+I24UPSpBUYei/m9//CWMUNR0YGJWgQdtMi9v4N60qP
-Fiep4U5vj/whakGeMY5J3E8mKrzITemh0yLFThQh+edav5QaPOuOuWW1kx8e3Y2P
-uCEdDDvxXS6vtUJ0Y9OOmq824e9Olo2DIHsbicraB3hnHVDwljw4gwKGDqlkr7kJ
-P/5ORgPyRa51RcD21XHaMcNbiZ9BWuyZkgIX7MwY5Pucn9xZBLOCF1XVPrIz5Thw
-3JBDfons1+l52SpmlW0CAwEAAaN3MHUwVAYDVR0RBE0wS4IYc2hpYmJvbGV0aC5p
-bnNhLXJvdWVuLmZyhi9odHRwczovL3NoaWJib2xldGguaW5zYS1yb3Vlbi5mci9p
-ZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUVroJwDQMTj+P/Qy2rF0hgSrMGd0wDQYJ
-KoZIhvcNAQEFBQADggEBABzLkZCSjBO68HuRhDjlVblgc9up8dN5pZZMxxWyQfQM
-GZgv3sYwktpBL/I7jUuEhiMbr5n8I/hq0HrxiBAFulVvuLhahzfY4GxMwEBHTYm/
-gOoNn2cJD+ZKFF1PPZ3TYnlbM1nJ17AbSCjS2QxzNygTzi2tDulpOJgUmacLr81Q
-VZrWGgkPWyDKh3foQ7Olh9eiySh1jSl55uJE4ze1yopOiFyLfe4PHYnsfanu9F0k
-2VITeNSh7Epbl3wutJnfXFpa4XpmWMIzeQD7Eowrs5Oewk1peM6kl2fzn4gKcFXo
-u1n3Fa3LxTYXo8TB+XbBKdEFD+MdaGILc/H8Gb5EEak=
-					    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.insa-rouen.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">INSA de Rouen</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">INSA de Rouen</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>LE GUILLOUS Franck</SurName>
-    <EmailAddress>franck.le-guillous@insa-rouen.fr</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <SurName>Kesraoui Nadir</SurName>
-    <EmailAddress>nadir.kesraoui@insa-rouen.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.medvik.cz-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.medvik.cz-idp-shibboleth.xml
deleted file mode 100644
index 6d5e7776..00000000
--- a/swamid-interfederations-2.0/shibboleth.medvik.cz-idp-shibboleth.xml
+++ /dev/null
@@ -1,122 +0,0 @@
-<?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.medvik.cz/idp/shibboleth">
-  <md:Extensions xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata">
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/" registrationInstant="2014-10-16T11:08:52Z">
-      <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>
-    <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://eduid.cz/uri/idp-group/library</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md: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="true">medvik.cz</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">National Medical Library, Prague - Medvik</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="cs">Národní lékařská knihovna - Medvik</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Identity Provider for users of Medvik system.</mdui:Description>
-        <mdui:Description xml:lang="cs">Identity Provider pro uživatele systému Medvik.</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.nlk.cz/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="cs">http://www.nlk.cz/</mdui:InformationURL>
-        <mdui:Logo height="75" width="108">https://www.medvik.cz/images/medvik-logo.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>
-
-MIIDPDCCAiSgAwIBAgIVALhNUzUSgsNOgW9LDvjMF1eO3MVfMA0GCSqGSIb3DQEB
-BQUAMB8xHTAbBgNVBAMMFHNoaWJib2xldGgubWVkdmlrLmN6MB4XDTE0MTAwNjEy
-NDAyMFoXDTM0MTAwNjEyNDAyMFowHzEdMBsGA1UEAwwUc2hpYmJvbGV0aC5tZWR2
-aWsuY3owggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDbFpOdyzUFOL+l
-OfkXH3elU8ELBA4HPJxhmnbC0HLcOhtG7F1cpeeHn1qEW8VmTpdrjcXc1+cy7tBo
-cJOtkSYxWPU8SPzSnSXEoxpvaFfLjmQScJ4BnbTj03pItD+ZxBodSwS1MCI0LjJw
-Al1KI2fnV3hCsJ11PW35bhRqyl0zdTrne2Y7s5eQ6lnYOVcxNQBwY5Pz72TuNrvz
-PjyCD9v1iHozseTc+tkhl1EgWtr7NX9uvYqhh0IiowvjWQzhJbKH710mrhtyazYV
-1QsjU/M28FJJh8OY8zwaCN6xKTc+JONGdFMonK4yjrbzZUw8OUfktl4rAMyLtbA2
-WuLV9fRRAgMBAAGjbzBtMB0GA1UdDgQWBBSIZSVLqhf/EKsXe5yziqT5xbGAijBM
-BgNVHREERTBDghRzaGliYm9sZXRoLm1lZHZpay5jeoYraHR0cHM6Ly9zaGliYm9s
-ZXRoLm1lZHZpay5jei9pZHAvc2hpYmJvbGV0aDANBgkqhkiG9w0BAQUFAAOCAQEA
-aliUWOCr/uziYYSeLmJbKRcNwQVyYhGZOVpaar2LpgVo1NfS7+MRjZCEWg+oXPKF
-9ixygW/vaxBeXtXR5/FMgBkzP4NmlRMUVYL8paMqqUqBvJ7Do0yrGOBKf/enm0iJ
-FPk29vsRDXPZtqchryyFgQcubaItqzMjV1tDGNeKKcWXk7DtdXWYX8zYw/9ANWjz
-Avi9oeMfp7Q/w76zUkcHl5PiV8Mr7cxF4InWUWhR/+jbDKL0B22R0je0Jw9QUD2d
-IBOVCjh6ZnQwMUpNxRVeU1zEvy1CHYLyc/jhFnxxmgS0k24qlyQ6BuB76t++E1a5
-0WzVDPkawhmccTbRUyqTcQ==
-
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.medvik.cz/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.medvik.cz/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.medvik.cz/idp/profile/SAML2/Redirect/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.medvik.cz/idp/profile/SAML2/POST/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.medvik.cz/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://shibboleth.medvik.cz/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.medvik.cz/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.medvik.cz/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.medvik.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="true">medvik.cz</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-
-MIIDPDCCAiSgAwIBAgIVALhNUzUSgsNOgW9LDvjMF1eO3MVfMA0GCSqGSIb3DQEB
-BQUAMB8xHTAbBgNVBAMMFHNoaWJib2xldGgubWVkdmlrLmN6MB4XDTE0MTAwNjEy
-NDAyMFoXDTM0MTAwNjEyNDAyMFowHzEdMBsGA1UEAwwUc2hpYmJvbGV0aC5tZWR2
-aWsuY3owggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDbFpOdyzUFOL+l
-OfkXH3elU8ELBA4HPJxhmnbC0HLcOhtG7F1cpeeHn1qEW8VmTpdrjcXc1+cy7tBo
-cJOtkSYxWPU8SPzSnSXEoxpvaFfLjmQScJ4BnbTj03pItD+ZxBodSwS1MCI0LjJw
-Al1KI2fnV3hCsJ11PW35bhRqyl0zdTrne2Y7s5eQ6lnYOVcxNQBwY5Pz72TuNrvz
-PjyCD9v1iHozseTc+tkhl1EgWtr7NX9uvYqhh0IiowvjWQzhJbKH710mrhtyazYV
-1QsjU/M28FJJh8OY8zwaCN6xKTc+JONGdFMonK4yjrbzZUw8OUfktl4rAMyLtbA2
-WuLV9fRRAgMBAAGjbzBtMB0GA1UdDgQWBBSIZSVLqhf/EKsXe5yziqT5xbGAijBM
-BgNVHREERTBDghRzaGliYm9sZXRoLm1lZHZpay5jeoYraHR0cHM6Ly9zaGliYm9s
-ZXRoLm1lZHZpay5jei9pZHAvc2hpYmJvbGV0aDANBgkqhkiG9w0BAQUFAAOCAQEA
-aliUWOCr/uziYYSeLmJbKRcNwQVyYhGZOVpaar2LpgVo1NfS7+MRjZCEWg+oXPKF
-9ixygW/vaxBeXtXR5/FMgBkzP4NmlRMUVYL8paMqqUqBvJ7Do0yrGOBKf/enm0iJ
-FPk29vsRDXPZtqchryyFgQcubaItqzMjV1tDGNeKKcWXk7DtdXWYX8zYw/9ANWjz
-Avi9oeMfp7Q/w76zUkcHl5PiV8Mr7cxF4InWUWhR/+jbDKL0B22R0je0Jw9QUD2d
-IBOVCjh6ZnQwMUpNxRVeU1zEvy1CHYLyc/jhFnxxmgS0k24qlyQ6BuB76t++E1a5
-0WzVDPkawhmccTbRUyqTcQ==
-
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.medvik.cz/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.medvik.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">National Medical Library</OrganizationName>
-    <OrganizationName xml:lang="cs">Národní lékařská knihovna</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">National Medical Library, Prague - Medvik</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="cs">Národní lékařská knihovna - Medvik</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.nlk.cz/</OrganizationURL>
-    <OrganizationURL xml:lang="cs">http://www.nlk.cz/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Filip</GivenName>
-    <SurName>Kriz</SurName>
-    <EmailAddress>medvik@nlk.cz</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.medvik.cz.xml b/swamid-interfederations-2.0/shibboleth.medvik.cz.xml
deleted file mode 100644
index 6d5e7776..00000000
--- a/swamid-interfederations-2.0/shibboleth.medvik.cz.xml
+++ /dev/null
@@ -1,122 +0,0 @@
-<?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.medvik.cz/idp/shibboleth">
-  <md:Extensions xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata">
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/" registrationInstant="2014-10-16T11:08:52Z">
-      <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>
-    <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://eduid.cz/uri/idp-group/library</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md: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="true">medvik.cz</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">National Medical Library, Prague - Medvik</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="cs">Národní lékařská knihovna - Medvik</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Identity Provider for users of Medvik system.</mdui:Description>
-        <mdui:Description xml:lang="cs">Identity Provider pro uživatele systému Medvik.</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.nlk.cz/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="cs">http://www.nlk.cz/</mdui:InformationURL>
-        <mdui:Logo height="75" width="108">https://www.medvik.cz/images/medvik-logo.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>
-
-MIIDPDCCAiSgAwIBAgIVALhNUzUSgsNOgW9LDvjMF1eO3MVfMA0GCSqGSIb3DQEB
-BQUAMB8xHTAbBgNVBAMMFHNoaWJib2xldGgubWVkdmlrLmN6MB4XDTE0MTAwNjEy
-NDAyMFoXDTM0MTAwNjEyNDAyMFowHzEdMBsGA1UEAwwUc2hpYmJvbGV0aC5tZWR2
-aWsuY3owggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDbFpOdyzUFOL+l
-OfkXH3elU8ELBA4HPJxhmnbC0HLcOhtG7F1cpeeHn1qEW8VmTpdrjcXc1+cy7tBo
-cJOtkSYxWPU8SPzSnSXEoxpvaFfLjmQScJ4BnbTj03pItD+ZxBodSwS1MCI0LjJw
-Al1KI2fnV3hCsJ11PW35bhRqyl0zdTrne2Y7s5eQ6lnYOVcxNQBwY5Pz72TuNrvz
-PjyCD9v1iHozseTc+tkhl1EgWtr7NX9uvYqhh0IiowvjWQzhJbKH710mrhtyazYV
-1QsjU/M28FJJh8OY8zwaCN6xKTc+JONGdFMonK4yjrbzZUw8OUfktl4rAMyLtbA2
-WuLV9fRRAgMBAAGjbzBtMB0GA1UdDgQWBBSIZSVLqhf/EKsXe5yziqT5xbGAijBM
-BgNVHREERTBDghRzaGliYm9sZXRoLm1lZHZpay5jeoYraHR0cHM6Ly9zaGliYm9s
-ZXRoLm1lZHZpay5jei9pZHAvc2hpYmJvbGV0aDANBgkqhkiG9w0BAQUFAAOCAQEA
-aliUWOCr/uziYYSeLmJbKRcNwQVyYhGZOVpaar2LpgVo1NfS7+MRjZCEWg+oXPKF
-9ixygW/vaxBeXtXR5/FMgBkzP4NmlRMUVYL8paMqqUqBvJ7Do0yrGOBKf/enm0iJ
-FPk29vsRDXPZtqchryyFgQcubaItqzMjV1tDGNeKKcWXk7DtdXWYX8zYw/9ANWjz
-Avi9oeMfp7Q/w76zUkcHl5PiV8Mr7cxF4InWUWhR/+jbDKL0B22R0je0Jw9QUD2d
-IBOVCjh6ZnQwMUpNxRVeU1zEvy1CHYLyc/jhFnxxmgS0k24qlyQ6BuB76t++E1a5
-0WzVDPkawhmccTbRUyqTcQ==
-
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.medvik.cz/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.medvik.cz/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.medvik.cz/idp/profile/SAML2/Redirect/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.medvik.cz/idp/profile/SAML2/POST/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.medvik.cz/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://shibboleth.medvik.cz/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.medvik.cz/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.medvik.cz/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.medvik.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="true">medvik.cz</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-
-MIIDPDCCAiSgAwIBAgIVALhNUzUSgsNOgW9LDvjMF1eO3MVfMA0GCSqGSIb3DQEB
-BQUAMB8xHTAbBgNVBAMMFHNoaWJib2xldGgubWVkdmlrLmN6MB4XDTE0MTAwNjEy
-NDAyMFoXDTM0MTAwNjEyNDAyMFowHzEdMBsGA1UEAwwUc2hpYmJvbGV0aC5tZWR2
-aWsuY3owggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDbFpOdyzUFOL+l
-OfkXH3elU8ELBA4HPJxhmnbC0HLcOhtG7F1cpeeHn1qEW8VmTpdrjcXc1+cy7tBo
-cJOtkSYxWPU8SPzSnSXEoxpvaFfLjmQScJ4BnbTj03pItD+ZxBodSwS1MCI0LjJw
-Al1KI2fnV3hCsJ11PW35bhRqyl0zdTrne2Y7s5eQ6lnYOVcxNQBwY5Pz72TuNrvz
-PjyCD9v1iHozseTc+tkhl1EgWtr7NX9uvYqhh0IiowvjWQzhJbKH710mrhtyazYV
-1QsjU/M28FJJh8OY8zwaCN6xKTc+JONGdFMonK4yjrbzZUw8OUfktl4rAMyLtbA2
-WuLV9fRRAgMBAAGjbzBtMB0GA1UdDgQWBBSIZSVLqhf/EKsXe5yziqT5xbGAijBM
-BgNVHREERTBDghRzaGliYm9sZXRoLm1lZHZpay5jeoYraHR0cHM6Ly9zaGliYm9s
-ZXRoLm1lZHZpay5jei9pZHAvc2hpYmJvbGV0aDANBgkqhkiG9w0BAQUFAAOCAQEA
-aliUWOCr/uziYYSeLmJbKRcNwQVyYhGZOVpaar2LpgVo1NfS7+MRjZCEWg+oXPKF
-9ixygW/vaxBeXtXR5/FMgBkzP4NmlRMUVYL8paMqqUqBvJ7Do0yrGOBKf/enm0iJ
-FPk29vsRDXPZtqchryyFgQcubaItqzMjV1tDGNeKKcWXk7DtdXWYX8zYw/9ANWjz
-Avi9oeMfp7Q/w76zUkcHl5PiV8Mr7cxF4InWUWhR/+jbDKL0B22R0je0Jw9QUD2d
-IBOVCjh6ZnQwMUpNxRVeU1zEvy1CHYLyc/jhFnxxmgS0k24qlyQ6BuB76t++E1a5
-0WzVDPkawhmccTbRUyqTcQ==
-
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.medvik.cz/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.medvik.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">National Medical Library</OrganizationName>
-    <OrganizationName xml:lang="cs">Národní lékařská knihovna</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">National Medical Library, Prague - Medvik</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="cs">Národní lékařská knihovna - Medvik</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.nlk.cz/</OrganizationURL>
-    <OrganizationURL xml:lang="cs">http://www.nlk.cz/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Filip</GivenName>
-    <SurName>Kriz</SurName>
-    <EmailAddress>medvik@nlk.cz</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.mines-ales.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.mines-ales.fr-idp-shibboleth.xml
deleted file mode 100644
index d4f137fa..00000000
--- a/swamid-interfederations-2.0/shibboleth.mines-ales.fr-idp-shibboleth.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://shibboleth.mines-ales.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2011-06-16T12:03:53Z">
-      <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">mines-ales.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">Ecole des Mines d'Ales</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDTDCCAjSgAwIBAgIVAIqjvHm0aoiaxBOCA0hQPBF/i3NHMA0GCSqGSIb3DQEB
-BQUAMCMxITAfBgNVBAMTGHNoaWJib2xldGgubWluZXMtYWxlcy5mcjAeFw0xMDAy
-MDUxNTM3MzNaFw0zMDAyMDUxNTM3MzNaMCMxITAfBgNVBAMTGHNoaWJib2xldGgu
-bWluZXMtYWxlcy5mcjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAItD
-aS5KDMxNFvZLeYTCJMufD5l6n30RVg7kPxP6QDJsXvCyKW8kaAojwgr0BUNhIuWW
-9KYTab705HN9IUTNHQGngYmcLtOvMvX5eGO9tYKXqBA+vjSyCet5HRSd8bimtjwJ
-mHfOheQXeHtHtF4gcM5rKlToUdny4UKc3V5EaglZPOsgA9bIdLX/XGuXORoU7C8d
-jQpyo3Y6knBQsxHfZEZFiIUQTBfenc/Hqt5+ialLA4OqjR/yZATpVXZubVf1f2Vj
-XEo4685sWxRC2IsZ0IIjCtEWvf+9P4jEgiBW/M9FFwhXLkofqbossasVs+INU04m
-UGfb7SH1222oPbeawBECAwEAAaN3MHUwVAYDVR0RBE0wS4IYc2hpYmJvbGV0aC5t
-aW5lcy1hbGVzLmZyhi9odHRwczovL3NoaWJib2xldGgubWluZXMtYWxlcy5mci9p
-ZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUTlAtOzPum6kvlDfiRmAWJAeNWVswDQYJ
-KoZIhvcNAQEFBQADggEBAD4IpGmClwDAJUSTNQeYZoRCk5dliPTxshVu/X1QLfLg
-oonrMZBGnnbJPqATRQDQyGnDjL7v437cDtzOtpCMYIOLiGIFtBdS/dupqNNvKMJg
-wX5vqXzxlSZNkwHveUeipfZvvRDYNEwwGsGaMWFiYYxQlncMl9ebxvvF+dNyYzue
-HTU084KFhXJ+hhq+HTvPIxAm6xS0SJI9lM5E2OaSh+Twy0+ItMFcF5dHl9BpfiZI
-E3TaYCTUy81TNeHR1G8FxfdCea+Dz1w5jT+mX9l3ZsIZ36HXX6avx+go0MlzEa8d
-BArDDouye8IrssgKRMfPT0sQ0b+Nw56O2B4u/+48w4A=
-					    </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.mines-ales.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.mines-ales.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.mines-ales.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">mines-ales.fr</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDTDCCAjSgAwIBAgIVAIqjvHm0aoiaxBOCA0hQPBF/i3NHMA0GCSqGSIb3DQEB
-BQUAMCMxITAfBgNVBAMTGHNoaWJib2xldGgubWluZXMtYWxlcy5mcjAeFw0xMDAy
-MDUxNTM3MzNaFw0zMDAyMDUxNTM3MzNaMCMxITAfBgNVBAMTGHNoaWJib2xldGgu
-bWluZXMtYWxlcy5mcjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAItD
-aS5KDMxNFvZLeYTCJMufD5l6n30RVg7kPxP6QDJsXvCyKW8kaAojwgr0BUNhIuWW
-9KYTab705HN9IUTNHQGngYmcLtOvMvX5eGO9tYKXqBA+vjSyCet5HRSd8bimtjwJ
-mHfOheQXeHtHtF4gcM5rKlToUdny4UKc3V5EaglZPOsgA9bIdLX/XGuXORoU7C8d
-jQpyo3Y6knBQsxHfZEZFiIUQTBfenc/Hqt5+ialLA4OqjR/yZATpVXZubVf1f2Vj
-XEo4685sWxRC2IsZ0IIjCtEWvf+9P4jEgiBW/M9FFwhXLkofqbossasVs+INU04m
-UGfb7SH1222oPbeawBECAwEAAaN3MHUwVAYDVR0RBE0wS4IYc2hpYmJvbGV0aC5t
-aW5lcy1hbGVzLmZyhi9odHRwczovL3NoaWJib2xldGgubWluZXMtYWxlcy5mci9p
-ZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUTlAtOzPum6kvlDfiRmAWJAeNWVswDQYJ
-KoZIhvcNAQEFBQADggEBAD4IpGmClwDAJUSTNQeYZoRCk5dliPTxshVu/X1QLfLg
-oonrMZBGnnbJPqATRQDQyGnDjL7v437cDtzOtpCMYIOLiGIFtBdS/dupqNNvKMJg
-wX5vqXzxlSZNkwHveUeipfZvvRDYNEwwGsGaMWFiYYxQlncMl9ebxvvF+dNyYzue
-HTU084KFhXJ+hhq+HTvPIxAm6xS0SJI9lM5E2OaSh+Twy0+ItMFcF5dHl9BpfiZI
-E3TaYCTUy81TNeHR1G8FxfdCea+Dz1w5jT+mX9l3ZsIZ36HXX6avx+go0MlzEa8d
-BArDDouye8IrssgKRMfPT0sQ0b+Nw56O2B4u/+48w4A=
-					    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.mines-ales.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 des Mines d'Ales</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Ecole des Mines d'Ales</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>cisana</SurName>
-    <EmailAddress>pascal.cisana@mines-ales.fr</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <SurName>pellissier</SurName>
-    <EmailAddress>laurent.pellissier@mines-ales.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.mines-ales.fr.xml b/swamid-interfederations-2.0/shibboleth.mines-ales.fr.xml
deleted file mode 100644
index d4f137fa..00000000
--- a/swamid-interfederations-2.0/shibboleth.mines-ales.fr.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://shibboleth.mines-ales.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2011-06-16T12:03:53Z">
-      <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">mines-ales.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">Ecole des Mines d'Ales</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDTDCCAjSgAwIBAgIVAIqjvHm0aoiaxBOCA0hQPBF/i3NHMA0GCSqGSIb3DQEB
-BQUAMCMxITAfBgNVBAMTGHNoaWJib2xldGgubWluZXMtYWxlcy5mcjAeFw0xMDAy
-MDUxNTM3MzNaFw0zMDAyMDUxNTM3MzNaMCMxITAfBgNVBAMTGHNoaWJib2xldGgu
-bWluZXMtYWxlcy5mcjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAItD
-aS5KDMxNFvZLeYTCJMufD5l6n30RVg7kPxP6QDJsXvCyKW8kaAojwgr0BUNhIuWW
-9KYTab705HN9IUTNHQGngYmcLtOvMvX5eGO9tYKXqBA+vjSyCet5HRSd8bimtjwJ
-mHfOheQXeHtHtF4gcM5rKlToUdny4UKc3V5EaglZPOsgA9bIdLX/XGuXORoU7C8d
-jQpyo3Y6knBQsxHfZEZFiIUQTBfenc/Hqt5+ialLA4OqjR/yZATpVXZubVf1f2Vj
-XEo4685sWxRC2IsZ0IIjCtEWvf+9P4jEgiBW/M9FFwhXLkofqbossasVs+INU04m
-UGfb7SH1222oPbeawBECAwEAAaN3MHUwVAYDVR0RBE0wS4IYc2hpYmJvbGV0aC5t
-aW5lcy1hbGVzLmZyhi9odHRwczovL3NoaWJib2xldGgubWluZXMtYWxlcy5mci9p
-ZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUTlAtOzPum6kvlDfiRmAWJAeNWVswDQYJ
-KoZIhvcNAQEFBQADggEBAD4IpGmClwDAJUSTNQeYZoRCk5dliPTxshVu/X1QLfLg
-oonrMZBGnnbJPqATRQDQyGnDjL7v437cDtzOtpCMYIOLiGIFtBdS/dupqNNvKMJg
-wX5vqXzxlSZNkwHveUeipfZvvRDYNEwwGsGaMWFiYYxQlncMl9ebxvvF+dNyYzue
-HTU084KFhXJ+hhq+HTvPIxAm6xS0SJI9lM5E2OaSh+Twy0+ItMFcF5dHl9BpfiZI
-E3TaYCTUy81TNeHR1G8FxfdCea+Dz1w5jT+mX9l3ZsIZ36HXX6avx+go0MlzEa8d
-BArDDouye8IrssgKRMfPT0sQ0b+Nw56O2B4u/+48w4A=
-					    </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.mines-ales.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.mines-ales.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.mines-ales.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">mines-ales.fr</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDTDCCAjSgAwIBAgIVAIqjvHm0aoiaxBOCA0hQPBF/i3NHMA0GCSqGSIb3DQEB
-BQUAMCMxITAfBgNVBAMTGHNoaWJib2xldGgubWluZXMtYWxlcy5mcjAeFw0xMDAy
-MDUxNTM3MzNaFw0zMDAyMDUxNTM3MzNaMCMxITAfBgNVBAMTGHNoaWJib2xldGgu
-bWluZXMtYWxlcy5mcjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAItD
-aS5KDMxNFvZLeYTCJMufD5l6n30RVg7kPxP6QDJsXvCyKW8kaAojwgr0BUNhIuWW
-9KYTab705HN9IUTNHQGngYmcLtOvMvX5eGO9tYKXqBA+vjSyCet5HRSd8bimtjwJ
-mHfOheQXeHtHtF4gcM5rKlToUdny4UKc3V5EaglZPOsgA9bIdLX/XGuXORoU7C8d
-jQpyo3Y6knBQsxHfZEZFiIUQTBfenc/Hqt5+ialLA4OqjR/yZATpVXZubVf1f2Vj
-XEo4685sWxRC2IsZ0IIjCtEWvf+9P4jEgiBW/M9FFwhXLkofqbossasVs+INU04m
-UGfb7SH1222oPbeawBECAwEAAaN3MHUwVAYDVR0RBE0wS4IYc2hpYmJvbGV0aC5t
-aW5lcy1hbGVzLmZyhi9odHRwczovL3NoaWJib2xldGgubWluZXMtYWxlcy5mci9p
-ZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUTlAtOzPum6kvlDfiRmAWJAeNWVswDQYJ
-KoZIhvcNAQEFBQADggEBAD4IpGmClwDAJUSTNQeYZoRCk5dliPTxshVu/X1QLfLg
-oonrMZBGnnbJPqATRQDQyGnDjL7v437cDtzOtpCMYIOLiGIFtBdS/dupqNNvKMJg
-wX5vqXzxlSZNkwHveUeipfZvvRDYNEwwGsGaMWFiYYxQlncMl9ebxvvF+dNyYzue
-HTU084KFhXJ+hhq+HTvPIxAm6xS0SJI9lM5E2OaSh+Twy0+ItMFcF5dHl9BpfiZI
-E3TaYCTUy81TNeHR1G8FxfdCea+Dz1w5jT+mX9l3ZsIZ36HXX6avx+go0MlzEa8d
-BArDDouye8IrssgKRMfPT0sQ0b+Nw56O2B4u/+48w4A=
-					    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.mines-ales.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 des Mines d'Ales</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Ecole des Mines d'Ales</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>cisana</SurName>
-    <EmailAddress>pascal.cisana@mines-ales.fr</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <SurName>pellissier</SurName>
-    <EmailAddress>laurent.pellissier@mines-ales.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.mzk.cz-simplesaml-metadata.xml.xml b/swamid-interfederations-2.0/shibboleth.mzk.cz-simplesaml-metadata.xml.xml
deleted file mode 100644
index 87cda6ff..00000000
--- a/swamid-interfederations-2.0/shibboleth.mzk.cz-simplesaml-metadata.xml.xml
+++ /dev/null
@@ -1,78 +0,0 @@
-<?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">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/" registrationInstant="2011-08-10T11:54:57Z">
-      <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>
-    <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://eduid.cz/uri/idp-group/library</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md: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>
-MIIE9zCCA9+gAwIBAgIQdHGSoLeaV4jnLePN/TAq4TANBgkqhkiG9w0BAQUFADA2MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEgU1NMIENBMB4XDTEzMDEzMDAwMDAwMFoXDTE2MDEzMDIzNTk1OVowTDELMAkGA1UEBhMCQ1oxKDAmBgNVBAoTH01vcmF2c2thIHplbXNrYSBrbmlob3ZuYSB2IEJybmUxEzARBgNVBAMTCnd3dy5temsuY3owggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDOcSiUXQ2KY7dO4ImB2hokEwDxG3UlAXfH4XBGn417uzrG6VLcSh/OqiEpljmLSaOMkTAQ8C6oT7HqwxnAmheuDgYCCCsAA1ltTdaoWEhyG7D8ForDbnJVGcCOjOSqQpfzP91NrrHNVvPTIqecsGg8cEstubYhAP0jiRXZMa4Xt53WXUvO9FrBpT81WWgJ44Npy1SgDbflgd2YXT9GZCpNoNlL78NE+/m64Ccx4pvheMp/7tTqBzpo1IRUrjYr8eGVPYfu5rSRUTCQaEySfmLkbdIEKr7BMRZxf01DaW17MqK0srOUbarGNSilJ5sfv+h3C5lpoVfaMGFelBuV8DWtAgMBAAGjggHpMIIB5TAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3V0fqkOO57TAdBgNVHQ4EFgQUre4x48667NN4iCQRNTZfTXIGadAwDgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMBgGA1UdIAQRMA8wDQYLKwYBBAGyMQECAh0wOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwgaAGA1UdEQSBmDCBlYIKd3d3Lm16ay5jeoILYmV0YS5temsuY3qCC2R1aGEubXprLmN6gg9oZWxwZGVzay5temsuY3qCD2ludHJhbmV0Lm16ay5jeoIGbXprLmN6ghFwbGF5Z3JvdW5kLm16ay5jeoIMc2FmZXEubXprLmN6ghFzaGliYm9sZXRoLm16ay5jeoIPc3Bpc292a2EubXprLmN6MA0GCSqGSIb3DQEBBQUAA4IBAQCtIwmPzQ97KOX2Mul/EeDbM2Rz5lXrw54sGKg7xB8l9RUf7ttt94AdNoduPL7es6qrByspdK8XwgC0Et8QWEZ1OJhJlgVtqEvb9dzgv93QAaSNwDL/PZyXrfkoR+iBM4nAbnTn/joInC2Dbyl2KOUsb42V8qmHoIAWZAhRwqKMEtXhbxQArtL98RJRaIW0lkXVN4r8ep1/jF7kua4dIzeK2XpKiXxi77rW8lAkSXcTBitG7RhXwbTPB8MroQ9QVSBq/RS9ArCHap6+wCMmy5H6+0KJ9nsVi4AOqfwh79vx0AuKGL2sEqnniw17UExbcwM1s7ZI/NynOvs1I/HL6Yjg
-</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>
-MIIE9zCCA9+gAwIBAgIQdHGSoLeaV4jnLePN/TAq4TANBgkqhkiG9w0BAQUFADA2MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEgU1NMIENBMB4XDTEzMDEzMDAwMDAwMFoXDTE2MDEzMDIzNTk1OVowTDELMAkGA1UEBhMCQ1oxKDAmBgNVBAoTH01vcmF2c2thIHplbXNrYSBrbmlob3ZuYSB2IEJybmUxEzARBgNVBAMTCnd3dy5temsuY3owggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDOcSiUXQ2KY7dO4ImB2hokEwDxG3UlAXfH4XBGn417uzrG6VLcSh/OqiEpljmLSaOMkTAQ8C6oT7HqwxnAmheuDgYCCCsAA1ltTdaoWEhyG7D8ForDbnJVGcCOjOSqQpfzP91NrrHNVvPTIqecsGg8cEstubYhAP0jiRXZMa4Xt53WXUvO9FrBpT81WWgJ44Npy1SgDbflgd2YXT9GZCpNoNlL78NE+/m64Ccx4pvheMp/7tTqBzpo1IRUrjYr8eGVPYfu5rSRUTCQaEySfmLkbdIEKr7BMRZxf01DaW17MqK0srOUbarGNSilJ5sfv+h3C5lpoVfaMGFelBuV8DWtAgMBAAGjggHpMIIB5TAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3V0fqkOO57TAdBgNVHQ4EFgQUre4x48667NN4iCQRNTZfTXIGadAwDgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMBgGA1UdIAQRMA8wDQYLKwYBBAGyMQECAh0wOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwgaAGA1UdEQSBmDCBlYIKd3d3Lm16ay5jeoILYmV0YS5temsuY3qCC2R1aGEubXprLmN6gg9oZWxwZGVzay5temsuY3qCD2ludHJhbmV0Lm16ay5jeoIGbXprLmN6ghFwbGF5Z3JvdW5kLm16ay5jeoIMc2FmZXEubXprLmN6ghFzaGliYm9sZXRoLm16ay5jeoIPc3Bpc292a2EubXprLmN6MA0GCSqGSIb3DQEBBQUAA4IBAQCtIwmPzQ97KOX2Mul/EeDbM2Rz5lXrw54sGKg7xB8l9RUf7ttt94AdNoduPL7es6qrByspdK8XwgC0Et8QWEZ1OJhJlgVtqEvb9dzgv93QAaSNwDL/PZyXrfkoR+iBM4nAbnTn/joInC2Dbyl2KOUsb42V8qmHoIAWZAhRwqKMEtXhbxQArtL98RJRaIW0lkXVN4r8ep1/jF7kua4dIzeK2XpKiXxi77rW8lAkSXcTBitG7RhXwbTPB8MroQ9QVSBq/RS9ArCHap6+wCMmy5H6+0KJ9nsVi4AOqfwh79vx0AuKGL2sEqnniw17UExbcwM1s7ZI/NynOvs1I/HL6Yjg
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <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: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.mzk.cz.xml b/swamid-interfederations-2.0/shibboleth.mzk.cz.xml
deleted file mode 100644
index 87cda6ff..00000000
--- a/swamid-interfederations-2.0/shibboleth.mzk.cz.xml
+++ /dev/null
@@ -1,78 +0,0 @@
-<?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">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/" registrationInstant="2011-08-10T11:54:57Z">
-      <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>
-    <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://eduid.cz/uri/idp-group/library</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md: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>
-MIIE9zCCA9+gAwIBAgIQdHGSoLeaV4jnLePN/TAq4TANBgkqhkiG9w0BAQUFADA2MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEgU1NMIENBMB4XDTEzMDEzMDAwMDAwMFoXDTE2MDEzMDIzNTk1OVowTDELMAkGA1UEBhMCQ1oxKDAmBgNVBAoTH01vcmF2c2thIHplbXNrYSBrbmlob3ZuYSB2IEJybmUxEzARBgNVBAMTCnd3dy5temsuY3owggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDOcSiUXQ2KY7dO4ImB2hokEwDxG3UlAXfH4XBGn417uzrG6VLcSh/OqiEpljmLSaOMkTAQ8C6oT7HqwxnAmheuDgYCCCsAA1ltTdaoWEhyG7D8ForDbnJVGcCOjOSqQpfzP91NrrHNVvPTIqecsGg8cEstubYhAP0jiRXZMa4Xt53WXUvO9FrBpT81WWgJ44Npy1SgDbflgd2YXT9GZCpNoNlL78NE+/m64Ccx4pvheMp/7tTqBzpo1IRUrjYr8eGVPYfu5rSRUTCQaEySfmLkbdIEKr7BMRZxf01DaW17MqK0srOUbarGNSilJ5sfv+h3C5lpoVfaMGFelBuV8DWtAgMBAAGjggHpMIIB5TAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3V0fqkOO57TAdBgNVHQ4EFgQUre4x48667NN4iCQRNTZfTXIGadAwDgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMBgGA1UdIAQRMA8wDQYLKwYBBAGyMQECAh0wOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwgaAGA1UdEQSBmDCBlYIKd3d3Lm16ay5jeoILYmV0YS5temsuY3qCC2R1aGEubXprLmN6gg9oZWxwZGVzay5temsuY3qCD2ludHJhbmV0Lm16ay5jeoIGbXprLmN6ghFwbGF5Z3JvdW5kLm16ay5jeoIMc2FmZXEubXprLmN6ghFzaGliYm9sZXRoLm16ay5jeoIPc3Bpc292a2EubXprLmN6MA0GCSqGSIb3DQEBBQUAA4IBAQCtIwmPzQ97KOX2Mul/EeDbM2Rz5lXrw54sGKg7xB8l9RUf7ttt94AdNoduPL7es6qrByspdK8XwgC0Et8QWEZ1OJhJlgVtqEvb9dzgv93QAaSNwDL/PZyXrfkoR+iBM4nAbnTn/joInC2Dbyl2KOUsb42V8qmHoIAWZAhRwqKMEtXhbxQArtL98RJRaIW0lkXVN4r8ep1/jF7kua4dIzeK2XpKiXxi77rW8lAkSXcTBitG7RhXwbTPB8MroQ9QVSBq/RS9ArCHap6+wCMmy5H6+0KJ9nsVi4AOqfwh79vx0AuKGL2sEqnniw17UExbcwM1s7ZI/NynOvs1I/HL6Yjg
-</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>
-MIIE9zCCA9+gAwIBAgIQdHGSoLeaV4jnLePN/TAq4TANBgkqhkiG9w0BAQUFADA2MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEgU1NMIENBMB4XDTEzMDEzMDAwMDAwMFoXDTE2MDEzMDIzNTk1OVowTDELMAkGA1UEBhMCQ1oxKDAmBgNVBAoTH01vcmF2c2thIHplbXNrYSBrbmlob3ZuYSB2IEJybmUxEzARBgNVBAMTCnd3dy5temsuY3owggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDOcSiUXQ2KY7dO4ImB2hokEwDxG3UlAXfH4XBGn417uzrG6VLcSh/OqiEpljmLSaOMkTAQ8C6oT7HqwxnAmheuDgYCCCsAA1ltTdaoWEhyG7D8ForDbnJVGcCOjOSqQpfzP91NrrHNVvPTIqecsGg8cEstubYhAP0jiRXZMa4Xt53WXUvO9FrBpT81WWgJ44Npy1SgDbflgd2YXT9GZCpNoNlL78NE+/m64Ccx4pvheMp/7tTqBzpo1IRUrjYr8eGVPYfu5rSRUTCQaEySfmLkbdIEKr7BMRZxf01DaW17MqK0srOUbarGNSilJ5sfv+h3C5lpoVfaMGFelBuV8DWtAgMBAAGjggHpMIIB5TAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3V0fqkOO57TAdBgNVHQ4EFgQUre4x48667NN4iCQRNTZfTXIGadAwDgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMBgGA1UdIAQRMA8wDQYLKwYBBAGyMQECAh0wOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwgaAGA1UdEQSBmDCBlYIKd3d3Lm16ay5jeoILYmV0YS5temsuY3qCC2R1aGEubXprLmN6gg9oZWxwZGVzay5temsuY3qCD2ludHJhbmV0Lm16ay5jeoIGbXprLmN6ghFwbGF5Z3JvdW5kLm16ay5jeoIMc2FmZXEubXprLmN6ghFzaGliYm9sZXRoLm16ay5jeoIPc3Bpc292a2EubXprLmN6MA0GCSqGSIb3DQEBBQUAA4IBAQCtIwmPzQ97KOX2Mul/EeDbM2Rz5lXrw54sGKg7xB8l9RUf7ttt94AdNoduPL7es6qrByspdK8XwgC0Et8QWEZ1OJhJlgVtqEvb9dzgv93QAaSNwDL/PZyXrfkoR+iBM4nAbnTn/joInC2Dbyl2KOUsb42V8qmHoIAWZAhRwqKMEtXhbxQArtL98RJRaIW0lkXVN4r8ep1/jF7kua4dIzeK2XpKiXxi77rW8lAkSXcTBitG7RhXwbTPB8MroQ9QVSBq/RS9ArCHap6+wCMmy5H6+0KJ9nsVi4AOqfwh79vx0AuKGL2sEqnniw17UExbcwM1s7ZI/NynOvs1I/HL6Yjg
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <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: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.nkp.cz-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.nkp.cz-idp-shibboleth.xml
deleted file mode 100644
index 0a987cd0..00000000
--- a/swamid-interfederations-2.0/shibboleth.nkp.cz-idp-shibboleth.xml
+++ /dev/null
@@ -1,127 +0,0 @@
-<?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.nkp.cz/idp/shibboleth">
-  <md:Extensions xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata">
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/" registrationInstant="2010-09-15T15:29:31Z">
-      <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>
-    <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://eduid.cz/uri/idp-group/library</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md: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">nkp.cz</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:Description xml:lang="en">Identity provider for employees the National Library of the Czech Republic</mdui:Description>
-        <mdui:Description xml:lang="cs">Identity provider pro zaměstnance Národní knihovnu České republiky</mdui:Description>
-        <mdui:DisplayName xml:lang="en">The National Library of the Czech Republic</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="cs">Národní knihovna České republiky</mdui:DisplayName>
-        <mdui:InformationURL xml:lang="en">http://www.en.nkp.cz/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="cs">http://www.nkp.cz/</mdui:InformationURL>
-        <mdui:Logo height="472" width="500">https://www2.eduid.cz/idp-loga/nkp.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>
-MIIEhTCCA22gAwIBAgIRAPEPRVT7rSQP6fkTB6zdejAwDQYJKoZIhvcNAQEFBQAw
-NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-IFNTTCBDQTAeFw0xMzAxMzAwMDAwMDBaFw0xNjAxMzAyMzU5NTlaMF4xCzAJBgNV
-BAYTAkNaMTMwMQYDVQQKEypUaGUgTmF0aW9uYWwgTGlicmFyeSBvZiB0aGUgQ3pl
-Y2ggUmVwdWJsaWMxGjAYBgNVBAMTEXNoaWJib2xldGgubmtwLmN6MIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxVz9glo7tIF0FV6n1PNww6xY1RXXH863
-lHNc2GIdZPHjjqjZLEuRY80rRawhlCtRhis0zfwnwlfFE5svgQzs2VhSS+858BJe
-rWKkDhx2NkGOVAvhVpikk8+dslRxYAGh8zMbEfdJccZdpx397gaCLhHxbpbDxKlQ
-K0Cv6nHhmv1gb1q/KOgNpFDGPByjQQ6yZN5q0UQ1jYUtb/yoydt2hbtBFCE9/5Zo
-ehK3Qr8GMkF36bL8yXxezRXX3gK9rM5n2M/6bM86D+YHG40r4Q3XvQLdAPMMphr4
-b1C3sfkX8iGjolxgQEm8YfUYVXUFG4Qx5mxwJQPOaQj863wwn4EYGwIDAQABo4IB
-ZDCCAWAwHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsrN1dH6pDjue0wHQYDVR0OBBYE
-FBXpVcpKQRux0SxErHIOSwZzsq16MA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8E
-AjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAYBgNVHSAEETAPMA0G
-CysGAQQBsjEBAgIdMDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRl
-cmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEF
-BQcwAoYpaHR0cDovL2NydC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQw
-JgYIKwYBBQUHMAGGGmh0dHA6Ly9vY3NwLnRjcy50ZXJlbmEub3JnMBwGA1UdEQQV
-MBOCEXNoaWJib2xldGgubmtwLmN6MA0GCSqGSIb3DQEBBQUAA4IBAQCJokHGcY4h
-y9JK4CIPAHM/y0dwMHMMkkq/VOt9Uefw3AUjFY88J5C7y8fP5CcL9mjF3ju6BgCc
-AWheiYFqdoyp6+A8Vj2bTLw01buM7vR+Tf0uGifsA2mwM+GhBfFfWyQtP/seRsbm
-djnx/F1oz/xk1IpzldKYSHaBKgyU/U0q3Ow5wlGlbvTJ6YOcbruT16Abppt50cte
-xmdVCMK5UEKKXtyyAnpzRiyMtk9ZZWc43aoG9u8g6QnQAvL13eUZCckfkhw20QIo
-6Np3O+ShRrAGEZ1+BEKuslKeFR7s24CAMvHYCmZM1d1l28D/tQ2qUOvshwSFaLye
-sSo3OKOyCBTf
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.nkp.cz:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.nkp.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>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.nkp.cz/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.nkp.cz/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.nkp.cz/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.nkp.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">nkp.cz</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIEhTCCA22gAwIBAgIRAPEPRVT7rSQP6fkTB6zdejAwDQYJKoZIhvcNAQEFBQAw
-NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-IFNTTCBDQTAeFw0xMzAxMzAwMDAwMDBaFw0xNjAxMzAyMzU5NTlaMF4xCzAJBgNV
-BAYTAkNaMTMwMQYDVQQKEypUaGUgTmF0aW9uYWwgTGlicmFyeSBvZiB0aGUgQ3pl
-Y2ggUmVwdWJsaWMxGjAYBgNVBAMTEXNoaWJib2xldGgubmtwLmN6MIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxVz9glo7tIF0FV6n1PNww6xY1RXXH863
-lHNc2GIdZPHjjqjZLEuRY80rRawhlCtRhis0zfwnwlfFE5svgQzs2VhSS+858BJe
-rWKkDhx2NkGOVAvhVpikk8+dslRxYAGh8zMbEfdJccZdpx397gaCLhHxbpbDxKlQ
-K0Cv6nHhmv1gb1q/KOgNpFDGPByjQQ6yZN5q0UQ1jYUtb/yoydt2hbtBFCE9/5Zo
-ehK3Qr8GMkF36bL8yXxezRXX3gK9rM5n2M/6bM86D+YHG40r4Q3XvQLdAPMMphr4
-b1C3sfkX8iGjolxgQEm8YfUYVXUFG4Qx5mxwJQPOaQj863wwn4EYGwIDAQABo4IB
-ZDCCAWAwHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsrN1dH6pDjue0wHQYDVR0OBBYE
-FBXpVcpKQRux0SxErHIOSwZzsq16MA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8E
-AjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAYBgNVHSAEETAPMA0G
-CysGAQQBsjEBAgIdMDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRl
-cmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEF
-BQcwAoYpaHR0cDovL2NydC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQw
-JgYIKwYBBQUHMAGGGmh0dHA6Ly9vY3NwLnRjcy50ZXJlbmEub3JnMBwGA1UdEQQV
-MBOCEXNoaWJib2xldGgubmtwLmN6MA0GCSqGSIb3DQEBBQUAA4IBAQCJokHGcY4h
-y9JK4CIPAHM/y0dwMHMMkkq/VOt9Uefw3AUjFY88J5C7y8fP5CcL9mjF3ju6BgCc
-AWheiYFqdoyp6+A8Vj2bTLw01buM7vR+Tf0uGifsA2mwM+GhBfFfWyQtP/seRsbm
-djnx/F1oz/xk1IpzldKYSHaBKgyU/U0q3Ow5wlGlbvTJ6YOcbruT16Abppt50cte
-xmdVCMK5UEKKXtyyAnpzRiyMtk9ZZWc43aoG9u8g6QnQAvL13eUZCckfkhw20QIo
-6Np3O+ShRrAGEZ1+BEKuslKeFR7s24CAMvHYCmZM1d1l28D/tQ2qUOvshwSFaLye
-sSo3OKOyCBTf
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.nkp.cz:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.nkp.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">The National Library of the Czech Republic</OrganizationName>
-    <OrganizationName xml:lang="cs">Národní knihovna České republiky</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">The National Library of the Czech Republic</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="cs">Národní knihovna České republiky</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.en.nkp.cz/</OrganizationURL>
-    <OrganizationURL xml:lang="cs">http://www.nkp.cz/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Ivan</GivenName>
-    <SurName>Petřík</SurName>
-    <EmailAddress>ivan.petrik@nkp.cz</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.nkp.cz.xml b/swamid-interfederations-2.0/shibboleth.nkp.cz.xml
deleted file mode 100644
index 0a987cd0..00000000
--- a/swamid-interfederations-2.0/shibboleth.nkp.cz.xml
+++ /dev/null
@@ -1,127 +0,0 @@
-<?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.nkp.cz/idp/shibboleth">
-  <md:Extensions xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata">
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/" registrationInstant="2010-09-15T15:29:31Z">
-      <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>
-    <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://eduid.cz/uri/idp-group/library</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md: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">nkp.cz</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:Description xml:lang="en">Identity provider for employees the National Library of the Czech Republic</mdui:Description>
-        <mdui:Description xml:lang="cs">Identity provider pro zaměstnance Národní knihovnu České republiky</mdui:Description>
-        <mdui:DisplayName xml:lang="en">The National Library of the Czech Republic</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="cs">Národní knihovna České republiky</mdui:DisplayName>
-        <mdui:InformationURL xml:lang="en">http://www.en.nkp.cz/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="cs">http://www.nkp.cz/</mdui:InformationURL>
-        <mdui:Logo height="472" width="500">https://www2.eduid.cz/idp-loga/nkp.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>
-MIIEhTCCA22gAwIBAgIRAPEPRVT7rSQP6fkTB6zdejAwDQYJKoZIhvcNAQEFBQAw
-NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-IFNTTCBDQTAeFw0xMzAxMzAwMDAwMDBaFw0xNjAxMzAyMzU5NTlaMF4xCzAJBgNV
-BAYTAkNaMTMwMQYDVQQKEypUaGUgTmF0aW9uYWwgTGlicmFyeSBvZiB0aGUgQ3pl
-Y2ggUmVwdWJsaWMxGjAYBgNVBAMTEXNoaWJib2xldGgubmtwLmN6MIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxVz9glo7tIF0FV6n1PNww6xY1RXXH863
-lHNc2GIdZPHjjqjZLEuRY80rRawhlCtRhis0zfwnwlfFE5svgQzs2VhSS+858BJe
-rWKkDhx2NkGOVAvhVpikk8+dslRxYAGh8zMbEfdJccZdpx397gaCLhHxbpbDxKlQ
-K0Cv6nHhmv1gb1q/KOgNpFDGPByjQQ6yZN5q0UQ1jYUtb/yoydt2hbtBFCE9/5Zo
-ehK3Qr8GMkF36bL8yXxezRXX3gK9rM5n2M/6bM86D+YHG40r4Q3XvQLdAPMMphr4
-b1C3sfkX8iGjolxgQEm8YfUYVXUFG4Qx5mxwJQPOaQj863wwn4EYGwIDAQABo4IB
-ZDCCAWAwHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsrN1dH6pDjue0wHQYDVR0OBBYE
-FBXpVcpKQRux0SxErHIOSwZzsq16MA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8E
-AjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAYBgNVHSAEETAPMA0G
-CysGAQQBsjEBAgIdMDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRl
-cmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEF
-BQcwAoYpaHR0cDovL2NydC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQw
-JgYIKwYBBQUHMAGGGmh0dHA6Ly9vY3NwLnRjcy50ZXJlbmEub3JnMBwGA1UdEQQV
-MBOCEXNoaWJib2xldGgubmtwLmN6MA0GCSqGSIb3DQEBBQUAA4IBAQCJokHGcY4h
-y9JK4CIPAHM/y0dwMHMMkkq/VOt9Uefw3AUjFY88J5C7y8fP5CcL9mjF3ju6BgCc
-AWheiYFqdoyp6+A8Vj2bTLw01buM7vR+Tf0uGifsA2mwM+GhBfFfWyQtP/seRsbm
-djnx/F1oz/xk1IpzldKYSHaBKgyU/U0q3Ow5wlGlbvTJ6YOcbruT16Abppt50cte
-xmdVCMK5UEKKXtyyAnpzRiyMtk9ZZWc43aoG9u8g6QnQAvL13eUZCckfkhw20QIo
-6Np3O+ShRrAGEZ1+BEKuslKeFR7s24CAMvHYCmZM1d1l28D/tQ2qUOvshwSFaLye
-sSo3OKOyCBTf
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.nkp.cz:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.nkp.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>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.nkp.cz/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.nkp.cz/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.nkp.cz/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.nkp.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">nkp.cz</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIEhTCCA22gAwIBAgIRAPEPRVT7rSQP6fkTB6zdejAwDQYJKoZIhvcNAQEFBQAw
-NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-IFNTTCBDQTAeFw0xMzAxMzAwMDAwMDBaFw0xNjAxMzAyMzU5NTlaMF4xCzAJBgNV
-BAYTAkNaMTMwMQYDVQQKEypUaGUgTmF0aW9uYWwgTGlicmFyeSBvZiB0aGUgQ3pl
-Y2ggUmVwdWJsaWMxGjAYBgNVBAMTEXNoaWJib2xldGgubmtwLmN6MIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxVz9glo7tIF0FV6n1PNww6xY1RXXH863
-lHNc2GIdZPHjjqjZLEuRY80rRawhlCtRhis0zfwnwlfFE5svgQzs2VhSS+858BJe
-rWKkDhx2NkGOVAvhVpikk8+dslRxYAGh8zMbEfdJccZdpx397gaCLhHxbpbDxKlQ
-K0Cv6nHhmv1gb1q/KOgNpFDGPByjQQ6yZN5q0UQ1jYUtb/yoydt2hbtBFCE9/5Zo
-ehK3Qr8GMkF36bL8yXxezRXX3gK9rM5n2M/6bM86D+YHG40r4Q3XvQLdAPMMphr4
-b1C3sfkX8iGjolxgQEm8YfUYVXUFG4Qx5mxwJQPOaQj863wwn4EYGwIDAQABo4IB
-ZDCCAWAwHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsrN1dH6pDjue0wHQYDVR0OBBYE
-FBXpVcpKQRux0SxErHIOSwZzsq16MA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8E
-AjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAYBgNVHSAEETAPMA0G
-CysGAQQBsjEBAgIdMDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRl
-cmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEF
-BQcwAoYpaHR0cDovL2NydC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQw
-JgYIKwYBBQUHMAGGGmh0dHA6Ly9vY3NwLnRjcy50ZXJlbmEub3JnMBwGA1UdEQQV
-MBOCEXNoaWJib2xldGgubmtwLmN6MA0GCSqGSIb3DQEBBQUAA4IBAQCJokHGcY4h
-y9JK4CIPAHM/y0dwMHMMkkq/VOt9Uefw3AUjFY88J5C7y8fP5CcL9mjF3ju6BgCc
-AWheiYFqdoyp6+A8Vj2bTLw01buM7vR+Tf0uGifsA2mwM+GhBfFfWyQtP/seRsbm
-djnx/F1oz/xk1IpzldKYSHaBKgyU/U0q3Ow5wlGlbvTJ6YOcbruT16Abppt50cte
-xmdVCMK5UEKKXtyyAnpzRiyMtk9ZZWc43aoG9u8g6QnQAvL13eUZCckfkhw20QIo
-6Np3O+ShRrAGEZ1+BEKuslKeFR7s24CAMvHYCmZM1d1l28D/tQ2qUOvshwSFaLye
-sSo3OKOyCBTf
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.nkp.cz:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.nkp.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">The National Library of the Czech Republic</OrganizationName>
-    <OrganizationName xml:lang="cs">Národní knihovna České republiky</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">The National Library of the Czech Republic</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="cs">Národní knihovna České republiky</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.en.nkp.cz/</OrganizationURL>
-    <OrganizationURL xml:lang="cs">http://www.nkp.cz/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Ivan</GivenName>
-    <SurName>Petřík</SurName>
-    <EmailAddress>ivan.petrik@nkp.cz</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.obspm.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.obspm.fr-idp-shibboleth.xml
deleted file mode 100644
index 1498886c..00000000
--- a/swamid-interfederations-2.0/shibboleth.obspm.fr-idp-shibboleth.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://shibboleth.obspm.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2011-02-16T12:03:34Z">
-      <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">obspm.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">Observatoire de Paris</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDODCCAiCgAwIBAgIVAN6NefE7MNV1gsFFJM6ZXxl7ricmMA0GCSqGSIb3DQEB
-BQUAMB4xHDAaBgNVBAMTE3NoaWJib2xldGgub2JzcG0uZnIwHhcNMTEwMjAzMTYx
-NTIwWhcNMzEwMjAzMTYxNTIwWjAeMRwwGgYDVQQDExNzaGliYm9sZXRoLm9ic3Bt
-LmZyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAorMZSrDEOOO6Zvun
-+HTeRAYTSqd7FSq6F9ojEwPMs1wu6IREubuy8VdxUiPLawen20ZFp3X8XDCAQnWj
-qIq2EN4lmc8Ibtq6tVO6OjS5CilSmPw2pzyl1uc6Cipd/AemRahBzDHUPZgKJSSs
-vABRQDfalExfXUndgnYaROxMKHmrLdBUnHQO/8v0ZQQwXaHxFPCrMoA5FFF6D4Ro
-xrGhxR0TdDWXdyIat9ltvWIslziH+J1gGY+e1q5tmmAaZCeFdy/MthAhCxuTT64d
-E1+nXXT+6tUsI7mHc9/5Vusb4bc6UNxNKTECTB566qMK3CVq19JLrvl/ajzZoo1C
-06pKywIDAQABo20wazBKBgNVHREEQzBBghNzaGliYm9sZXRoLm9ic3BtLmZyhipo
-dHRwczovL3NoaWJib2xldGgub2JzcG0uZnIvaWRwL3NoaWJib2xldGgwHQYDVR0O
-BBYEFI4fpndolWB8RsDA1fRZm87FZGxaMA0GCSqGSIb3DQEBBQUAA4IBAQABf7PS
-TBmzFMbWo85wif9s/cXjoDefSk3RltzARoLvIBxjeMR+xFanb4VeLLbMpVhoZDE/
-EAgQgBZdfZ963sa65/a0MpPQ7c8CwWuVRLNAPFcbOusWMfCV5RGohCbkoPcRWhKy
-i7WmF8LW2bDPzHIIAJ0fJPEwsPD6MceV9aZgtnvcIax2zObATB9AO4e4HTm/QKPE
-Z95J8KjcXSTo7FeOLgY4AxTb4F4feNLZmFD0q06+CZLVZ46ZJBx4ISSobKypu6qE
-wOVcvEXq+Zt5q2+IQgg0Pxk+XEaEj0qq1JmZPrOGOq8wZES2ObjMbnFPwuoNZLMN
-4JZ1jEbeKm7bdK4P
-					    </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.obspm.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.obspm.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.obspm.fr/idp/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Observatoire de Paris</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Observatoire de Paris</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <EmailAddress>interne.admin.DIO@obspm.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.obspm.fr.xml b/swamid-interfederations-2.0/shibboleth.obspm.fr.xml
deleted file mode 100644
index 1498886c..00000000
--- a/swamid-interfederations-2.0/shibboleth.obspm.fr.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://shibboleth.obspm.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2011-02-16T12:03:34Z">
-      <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">obspm.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">Observatoire de Paris</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDODCCAiCgAwIBAgIVAN6NefE7MNV1gsFFJM6ZXxl7ricmMA0GCSqGSIb3DQEB
-BQUAMB4xHDAaBgNVBAMTE3NoaWJib2xldGgub2JzcG0uZnIwHhcNMTEwMjAzMTYx
-NTIwWhcNMzEwMjAzMTYxNTIwWjAeMRwwGgYDVQQDExNzaGliYm9sZXRoLm9ic3Bt
-LmZyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAorMZSrDEOOO6Zvun
-+HTeRAYTSqd7FSq6F9ojEwPMs1wu6IREubuy8VdxUiPLawen20ZFp3X8XDCAQnWj
-qIq2EN4lmc8Ibtq6tVO6OjS5CilSmPw2pzyl1uc6Cipd/AemRahBzDHUPZgKJSSs
-vABRQDfalExfXUndgnYaROxMKHmrLdBUnHQO/8v0ZQQwXaHxFPCrMoA5FFF6D4Ro
-xrGhxR0TdDWXdyIat9ltvWIslziH+J1gGY+e1q5tmmAaZCeFdy/MthAhCxuTT64d
-E1+nXXT+6tUsI7mHc9/5Vusb4bc6UNxNKTECTB566qMK3CVq19JLrvl/ajzZoo1C
-06pKywIDAQABo20wazBKBgNVHREEQzBBghNzaGliYm9sZXRoLm9ic3BtLmZyhipo
-dHRwczovL3NoaWJib2xldGgub2JzcG0uZnIvaWRwL3NoaWJib2xldGgwHQYDVR0O
-BBYEFI4fpndolWB8RsDA1fRZm87FZGxaMA0GCSqGSIb3DQEBBQUAA4IBAQABf7PS
-TBmzFMbWo85wif9s/cXjoDefSk3RltzARoLvIBxjeMR+xFanb4VeLLbMpVhoZDE/
-EAgQgBZdfZ963sa65/a0MpPQ7c8CwWuVRLNAPFcbOusWMfCV5RGohCbkoPcRWhKy
-i7WmF8LW2bDPzHIIAJ0fJPEwsPD6MceV9aZgtnvcIax2zObATB9AO4e4HTm/QKPE
-Z95J8KjcXSTo7FeOLgY4AxTb4F4feNLZmFD0q06+CZLVZ46ZJBx4ISSobKypu6qE
-wOVcvEXq+Zt5q2+IQgg0Pxk+XEaEj0qq1JmZPrOGOq8wZES2ObjMbnFPwuoNZLMN
-4JZ1jEbeKm7bdK4P
-					    </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.obspm.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.obspm.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.obspm.fr/idp/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Observatoire de Paris</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Observatoire de Paris</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <EmailAddress>interne.admin.DIO@obspm.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.reitoria.unesp.br-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.reitoria.unesp.br-idp-shibboleth.xml
deleted file mode 100644
index 24762193..00000000
--- a/swamid-interfederations-2.0/shibboleth.reitoria.unesp.br-idp-shibboleth.xml
+++ /dev/null
@@ -1,103 +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.reitoria.unesp.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">unesp.br</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">UNESP - Univ Estadual Paulista</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="pt-br">UNESP - Univ Estadual Paulista</mdui:DisplayName>
-        <mdui:Description xml:lang="en">UNESP - Univ Estadual Paulista</mdui:Description>
-        <mdui:Description xml:lang="pt-br">UNESP - Univ Estadual Paulista</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.unesp.br/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="pt-br">http://www.unesp.br/</mdui:InformationURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-    MIIC3DCCAcQCAQAwDQYJKoZIhvcNAQEFBQAwNDELMAkGA1UEBhMCQlIxJTAjBgNV
-BAMTHHNoaWJib2xldGgucmVpdG9yaWEudW5lc3AuYnIwHhcNMTIxMjEyMTcxOTU4
-WhcNMTUxMjEyMTcxOTU4WjA0MQswCQYDVQQGEwJCUjElMCMGA1UEAxMcc2hpYmJv
-bGV0aC5yZWl0b3JpYS51bmVzcC5icjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
-AQoCggEBALJ+enDXKwvFOCJ3Ybg6BK+bGi1qY9P2bIvFwo6pJnzMsR0+Pl3pZbux
-Gur2ri3HajOlwc5QnxfSq9fSY8PLiBPo/eA/oeYUuPMnu8Kwn/DtUeNGvSLgQ+k3
-Z4X5Qx12yOTwDZGnHHiaPCctEezundMVLQZmh8deHpH7fsL/m9ONsUNtoVrmabHA
-AR6WbqkKgX2lfP7Lkcu0zO2+mdNDn/S1oELavFwpVpDg+yyCdoBfu/AANYqu2a6g
-ahRcABWog2Ut6smft/UYtODRb8tLEfduguEevnjnE9/Wam33SID6yKXYA5EIoS9H
-kgxftMVSMNKaqO/zMMPELRNxX0AMc3sCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEA
-g2sJmqBNctEPp6EJUOoSUmh5YtsceUfijawWod/96uyNCH2i4DRAmwdrnzndqydn
-mq4lDmZKvSx3o344ciEpQvGzFS6xCUv6PWuB1VkNg8pkNh+z9iVs9Nw/kMhhsuFL
-KvTghGHEMAwB1QNTLy3j/5wEHhlIraYPhU4/j5n59V/1gXcCKF2+zOJtFcUdglfT
-jU2sFACtrH4ArVNIa9GmxGF3uX2I+Kx1YVAehqNj138hozBi4jroEyxwNzSZio7G
-HN95D4pUaaZibMzS41kSxI+tN2N/iUX+lgvB4SSjbtSuQzniq+BsumzHKy4yUpXH
-RnwM1gukVruuY/989uMLdw==
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.reitoria.unesp.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.reitoria.unesp.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.reitoria.unesp.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.reitoria.unesp.br/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.reitoria.unesp.br/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.reitoria.unesp.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">unesp.br</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-      
-MIIC3DCCAcQCAQAwDQYJKoZIhvcNAQEFBQAwNDELMAkGA1UEBhMCQlIxJTAjBgNV
-BAMTHHNoaWJib2xldGgucmVpdG9yaWEudW5lc3AuYnIwHhcNMTIxMjEyMTcxOTU4
-WhcNMTUxMjEyMTcxOTU4WjA0MQswCQYDVQQGEwJCUjElMCMGA1UEAxMcc2hpYmJv
-bGV0aC5yZWl0b3JpYS51bmVzcC5icjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
-AQoCggEBALJ+enDXKwvFOCJ3Ybg6BK+bGi1qY9P2bIvFwo6pJnzMsR0+Pl3pZbux
-Gur2ri3HajOlwc5QnxfSq9fSY8PLiBPo/eA/oeYUuPMnu8Kwn/DtUeNGvSLgQ+k3
-Z4X5Qx12yOTwDZGnHHiaPCctEezundMVLQZmh8deHpH7fsL/m9ONsUNtoVrmabHA
-AR6WbqkKgX2lfP7Lkcu0zO2+mdNDn/S1oELavFwpVpDg+yyCdoBfu/AANYqu2a6g
-ahRcABWog2Ut6smft/UYtODRb8tLEfduguEevnjnE9/Wam33SID6yKXYA5EIoS9H
-kgxftMVSMNKaqO/zMMPELRNxX0AMc3sCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEA
-g2sJmqBNctEPp6EJUOoSUmh5YtsceUfijawWod/96uyNCH2i4DRAmwdrnzndqydn
-mq4lDmZKvSx3o344ciEpQvGzFS6xCUv6PWuB1VkNg8pkNh+z9iVs9Nw/kMhhsuFL
-KvTghGHEMAwB1QNTLy3j/5wEHhlIraYPhU4/j5n59V/1gXcCKF2+zOJtFcUdglfT
-jU2sFACtrH4ArVNIa9GmxGF3uX2I+Kx1YVAehqNj138hozBi4jroEyxwNzSZio7G
-HN95D4pUaaZibMzS41kSxI+tN2N/iUX+lgvB4SSjbtSuQzniq+BsumzHKy4yUpXH
-RnwM1gukVruuY/989uMLdw==
-
-                    
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.reitoria.unesp.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.reitoria.unesp.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">UNESP - Univ Estadual Paulista</OrganizationName>
-    <OrganizationName xml:lang="pt-br">UNESP - Univ Estadual Paulista</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">UNESP - Univ Estadual Paulista</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="pt-br">UNESP - Univ Estadual Paulista</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.unesp.br/</OrganizationURL>
-    <OrganizationURL xml:lang="pt-br">http://www.unesp.br/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Carlos Coletti</SurName>
-    <EmailAddress>grc@unesp.br</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.reitoria.unesp.br.xml b/swamid-interfederations-2.0/shibboleth.reitoria.unesp.br.xml
deleted file mode 100644
index 24762193..00000000
--- a/swamid-interfederations-2.0/shibboleth.reitoria.unesp.br.xml
+++ /dev/null
@@ -1,103 +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.reitoria.unesp.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">unesp.br</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">UNESP - Univ Estadual Paulista</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="pt-br">UNESP - Univ Estadual Paulista</mdui:DisplayName>
-        <mdui:Description xml:lang="en">UNESP - Univ Estadual Paulista</mdui:Description>
-        <mdui:Description xml:lang="pt-br">UNESP - Univ Estadual Paulista</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.unesp.br/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="pt-br">http://www.unesp.br/</mdui:InformationURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-    MIIC3DCCAcQCAQAwDQYJKoZIhvcNAQEFBQAwNDELMAkGA1UEBhMCQlIxJTAjBgNV
-BAMTHHNoaWJib2xldGgucmVpdG9yaWEudW5lc3AuYnIwHhcNMTIxMjEyMTcxOTU4
-WhcNMTUxMjEyMTcxOTU4WjA0MQswCQYDVQQGEwJCUjElMCMGA1UEAxMcc2hpYmJv
-bGV0aC5yZWl0b3JpYS51bmVzcC5icjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
-AQoCggEBALJ+enDXKwvFOCJ3Ybg6BK+bGi1qY9P2bIvFwo6pJnzMsR0+Pl3pZbux
-Gur2ri3HajOlwc5QnxfSq9fSY8PLiBPo/eA/oeYUuPMnu8Kwn/DtUeNGvSLgQ+k3
-Z4X5Qx12yOTwDZGnHHiaPCctEezundMVLQZmh8deHpH7fsL/m9ONsUNtoVrmabHA
-AR6WbqkKgX2lfP7Lkcu0zO2+mdNDn/S1oELavFwpVpDg+yyCdoBfu/AANYqu2a6g
-ahRcABWog2Ut6smft/UYtODRb8tLEfduguEevnjnE9/Wam33SID6yKXYA5EIoS9H
-kgxftMVSMNKaqO/zMMPELRNxX0AMc3sCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEA
-g2sJmqBNctEPp6EJUOoSUmh5YtsceUfijawWod/96uyNCH2i4DRAmwdrnzndqydn
-mq4lDmZKvSx3o344ciEpQvGzFS6xCUv6PWuB1VkNg8pkNh+z9iVs9Nw/kMhhsuFL
-KvTghGHEMAwB1QNTLy3j/5wEHhlIraYPhU4/j5n59V/1gXcCKF2+zOJtFcUdglfT
-jU2sFACtrH4ArVNIa9GmxGF3uX2I+Kx1YVAehqNj138hozBi4jroEyxwNzSZio7G
-HN95D4pUaaZibMzS41kSxI+tN2N/iUX+lgvB4SSjbtSuQzniq+BsumzHKy4yUpXH
-RnwM1gukVruuY/989uMLdw==
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.reitoria.unesp.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.reitoria.unesp.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.reitoria.unesp.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.reitoria.unesp.br/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.reitoria.unesp.br/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.reitoria.unesp.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">unesp.br</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-      
-MIIC3DCCAcQCAQAwDQYJKoZIhvcNAQEFBQAwNDELMAkGA1UEBhMCQlIxJTAjBgNV
-BAMTHHNoaWJib2xldGgucmVpdG9yaWEudW5lc3AuYnIwHhcNMTIxMjEyMTcxOTU4
-WhcNMTUxMjEyMTcxOTU4WjA0MQswCQYDVQQGEwJCUjElMCMGA1UEAxMcc2hpYmJv
-bGV0aC5yZWl0b3JpYS51bmVzcC5icjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
-AQoCggEBALJ+enDXKwvFOCJ3Ybg6BK+bGi1qY9P2bIvFwo6pJnzMsR0+Pl3pZbux
-Gur2ri3HajOlwc5QnxfSq9fSY8PLiBPo/eA/oeYUuPMnu8Kwn/DtUeNGvSLgQ+k3
-Z4X5Qx12yOTwDZGnHHiaPCctEezundMVLQZmh8deHpH7fsL/m9ONsUNtoVrmabHA
-AR6WbqkKgX2lfP7Lkcu0zO2+mdNDn/S1oELavFwpVpDg+yyCdoBfu/AANYqu2a6g
-ahRcABWog2Ut6smft/UYtODRb8tLEfduguEevnjnE9/Wam33SID6yKXYA5EIoS9H
-kgxftMVSMNKaqO/zMMPELRNxX0AMc3sCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEA
-g2sJmqBNctEPp6EJUOoSUmh5YtsceUfijawWod/96uyNCH2i4DRAmwdrnzndqydn
-mq4lDmZKvSx3o344ciEpQvGzFS6xCUv6PWuB1VkNg8pkNh+z9iVs9Nw/kMhhsuFL
-KvTghGHEMAwB1QNTLy3j/5wEHhlIraYPhU4/j5n59V/1gXcCKF2+zOJtFcUdglfT
-jU2sFACtrH4ArVNIa9GmxGF3uX2I+Kx1YVAehqNj138hozBi4jroEyxwNzSZio7G
-HN95D4pUaaZibMzS41kSxI+tN2N/iUX+lgvB4SSjbtSuQzniq+BsumzHKy4yUpXH
-RnwM1gukVruuY/989uMLdw==
-
-                    
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.reitoria.unesp.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.reitoria.unesp.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">UNESP - Univ Estadual Paulista</OrganizationName>
-    <OrganizationName xml:lang="pt-br">UNESP - Univ Estadual Paulista</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">UNESP - Univ Estadual Paulista</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="pt-br">UNESP - Univ Estadual Paulista</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.unesp.br/</OrganizationURL>
-    <OrganizationURL xml:lang="pt-br">http://www.unesp.br/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Carlos Coletti</SurName>
-    <EmailAddress>grc@unesp.br</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.sciencespo-grenoble.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.sciencespo-grenoble.fr-idp-shibboleth.xml
deleted file mode 100644
index 41bc164b..00000000
--- a/swamid-interfederations-2.0/shibboleth.sciencespo-grenoble.fr-idp-shibboleth.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.sciencespo-grenoble.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2012-02-08T15:18:13Z">
-      <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">sciencespo-grenoble.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">Sciences Po Grenoble</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDcTCCAlmgAwIBAgIURqMsHzlG8fMfvT+cOJR2geBiBKYwDQYJKoZIhvcNAQEF
-BQAwLDEqMCgGA1UEAxMhc2hpYmJvbGV0aC5zY2llbmNlc3BvLWdyZW5vYmxlLmZy
-MB4XDTEyMDEyMDA3NTIyN1oXDTMyMDEyMDA3NTIyN1owLDEqMCgGA1UEAxMhc2hp
-YmJvbGV0aC5zY2llbmNlc3BvLWdyZW5vYmxlLmZyMIIBIjANBgkqhkiG9w0BAQEF
-AAOCAQ8AMIIBCgKCAQEAhX/KcdRkiRFlthd8Wm2CC78FJfSCcgKLLfy6HMkq7nk5
-ROvdhRU3ZXjqeP/fuOO5xDdskzLe17jzlyd5isL7SqD4mE48l/i/3sFQdTBeuiy2
-qfqOdW5hoDwlVVNgWkmOQCriiGrn6LPtrtd1boDupPAAtWqYxRcNVLob2WfrbtCU
-915+6Gn606wk0Lh+dLKrT/a7HBD0qIgbftw554oMHDYVYQv8o/oYVWqHfvuzejSv
-z+mAUjyw6gQJnTaTjRBinCuh+vnnMV6Ev+1RsMcL932qASZz1TaL5hEDlDrb/Tqp
-+inaEYsHzaPh5nyDrzZj64Zr+fN0ltc+jV2sQpYbmQIDAQABo4GKMIGHMGYGA1Ud
-EQRfMF2CIXNoaWJib2xldGguc2NpZW5jZXNwby1ncmVub2JsZS5mcoY4aHR0cHM6
-Ly9zaGliYm9sZXRoLnNjaWVuY2VzcG8tZ3Jlbm9ibGUuZnIvaWRwL3NoaWJib2xl
-dGgwHQYDVR0OBBYEFEdiRcE0wWEjU0jB5SLpKHdjJg80MA0GCSqGSIb3DQEBBQUA
-A4IBAQA0E4HykvLXNmhVTzSEepHr0aW5oJWCZOh6va5holMs61vKkFAnNlNkZlI9
-r5R2mU1jEmG5C3uxSvcEs4bk5EkkzVcdoVr6lLrTlAuuaiA5LQSqUpAp/CgfdH5z
-RExURiwE7RHT2mZuEkOLfUPVwWEU1WBGNrW6JnO20sglEQazZd4lsFit+LnVi0mQ
-qo5xryJDCS9U9/9fzKL6bSJH6D1gQcqShNQgQa7DxH3PlT5R17zw2zMBJTbmtBV7
-otA0xiEkUOufFx8+5EHk/7Hc9XnR7MolLH6WDVHVXytu2/8pq922i63pGATJ3ssL
-GbEcopedt4Tn5cP+TYMtHXCewhgi
-					    </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.sciencespo-grenoble.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.sciencespo-grenoble.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.sciencespo-grenoble.fr/idp/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Sciences Po Grenoble</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Sciences Po Grenoble</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Damien Limoges</SurName>
-    <EmailAddress>damien.limoges@sciencespo-grenoble.fr</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <SurName>Frank Boussagol</SurName>
-    <EmailAddress>frank.boussagol@sciencespo-grenoble.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.sciencespo-grenoble.fr.xml b/swamid-interfederations-2.0/shibboleth.sciencespo-grenoble.fr.xml
deleted file mode 100644
index 41bc164b..00000000
--- a/swamid-interfederations-2.0/shibboleth.sciencespo-grenoble.fr.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.sciencespo-grenoble.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2012-02-08T15:18:13Z">
-      <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">sciencespo-grenoble.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">Sciences Po Grenoble</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDcTCCAlmgAwIBAgIURqMsHzlG8fMfvT+cOJR2geBiBKYwDQYJKoZIhvcNAQEF
-BQAwLDEqMCgGA1UEAxMhc2hpYmJvbGV0aC5zY2llbmNlc3BvLWdyZW5vYmxlLmZy
-MB4XDTEyMDEyMDA3NTIyN1oXDTMyMDEyMDA3NTIyN1owLDEqMCgGA1UEAxMhc2hp
-YmJvbGV0aC5zY2llbmNlc3BvLWdyZW5vYmxlLmZyMIIBIjANBgkqhkiG9w0BAQEF
-AAOCAQ8AMIIBCgKCAQEAhX/KcdRkiRFlthd8Wm2CC78FJfSCcgKLLfy6HMkq7nk5
-ROvdhRU3ZXjqeP/fuOO5xDdskzLe17jzlyd5isL7SqD4mE48l/i/3sFQdTBeuiy2
-qfqOdW5hoDwlVVNgWkmOQCriiGrn6LPtrtd1boDupPAAtWqYxRcNVLob2WfrbtCU
-915+6Gn606wk0Lh+dLKrT/a7HBD0qIgbftw554oMHDYVYQv8o/oYVWqHfvuzejSv
-z+mAUjyw6gQJnTaTjRBinCuh+vnnMV6Ev+1RsMcL932qASZz1TaL5hEDlDrb/Tqp
-+inaEYsHzaPh5nyDrzZj64Zr+fN0ltc+jV2sQpYbmQIDAQABo4GKMIGHMGYGA1Ud
-EQRfMF2CIXNoaWJib2xldGguc2NpZW5jZXNwby1ncmVub2JsZS5mcoY4aHR0cHM6
-Ly9zaGliYm9sZXRoLnNjaWVuY2VzcG8tZ3Jlbm9ibGUuZnIvaWRwL3NoaWJib2xl
-dGgwHQYDVR0OBBYEFEdiRcE0wWEjU0jB5SLpKHdjJg80MA0GCSqGSIb3DQEBBQUA
-A4IBAQA0E4HykvLXNmhVTzSEepHr0aW5oJWCZOh6va5holMs61vKkFAnNlNkZlI9
-r5R2mU1jEmG5C3uxSvcEs4bk5EkkzVcdoVr6lLrTlAuuaiA5LQSqUpAp/CgfdH5z
-RExURiwE7RHT2mZuEkOLfUPVwWEU1WBGNrW6JnO20sglEQazZd4lsFit+LnVi0mQ
-qo5xryJDCS9U9/9fzKL6bSJH6D1gQcqShNQgQa7DxH3PlT5R17zw2zMBJTbmtBV7
-otA0xiEkUOufFx8+5EHk/7Hc9XnR7MolLH6WDVHVXytu2/8pq922i63pGATJ3ssL
-GbEcopedt4Tn5cP+TYMtHXCewhgi
-					    </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.sciencespo-grenoble.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.sciencespo-grenoble.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.sciencespo-grenoble.fr/idp/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Sciences Po Grenoble</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Sciences Po Grenoble</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Damien Limoges</SurName>
-    <EmailAddress>damien.limoges@sciencespo-grenoble.fr</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <SurName>Frank Boussagol</SurName>
-    <EmailAddress>frank.boussagol@sciencespo-grenoble.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.techlib.cz-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.techlib.cz-idp-shibboleth.xml
deleted file mode 100644
index 5f2ce733..00000000
--- a/swamid-interfederations-2.0/shibboleth.techlib.cz-idp-shibboleth.xml
+++ /dev/null
@@ -1,114 +0,0 @@
-<?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.techlib.cz/idp/shibboleth">
-  <md:Extensions xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata">
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/" registrationInstant="2013-08-05T12:59:38Z">
-      <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>
-    <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://eduid.cz/uri/idp-group/library</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md: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">techlib.cz</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">National Library of Technology</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="cs">Národní technická knihovna</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Identity Provider for National Library of Technology in Prague.</mdui:Description>
-        <mdui:Description xml:lang="cs">Identity Provider pro Národní technickou knihovnu v Praze.</mdui:Description>
-        <mdui:Logo height="40" width="67">https://www.techlib.cz/public/images/logo-eduid.png</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDPzCCAiegAwIBAgIUX+osnvtxGkyyLqc3Z6xHhgMJP1cwDQYJKoZIhvcNAQEF
-BQAwIDEeMBwGA1UEAxMVc2hpYmJvbGV0aC50ZWNobGliLmN6MB4XDTEwMDIxNzEy
-MjYwM1oXDTMwMDIxNzEyMjYwM1owIDEeMBwGA1UEAxMVc2hpYmJvbGV0aC50ZWNo
-bGliLmN6MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAi5FN6efQHuiH
-zERWjziRdD9X4sF76m0v9dest6lxrVXdxBIMjo52h7zkmZnWTwr402rCu6MLr2rX
-Lfz050FcEGSBDQyVr47QsUEQkvsThjdb2LZtjHzxiMc20fngB5+7nrZG4pBwragw
-XxfklvQ9VVdhQ1evD4QLn9Vj0LavZi9BzyOtbO6nPzzw624u0buU/QNeZAs2gNgj
-DJKx2UQW50R/YJUHz7XEd/q8r48+gSWkqh0KPvAbqaQJkZJ2lwyggcqPCV9i9wlF
-aUuE8aDyVKUkmT6Z8HfJKsFUgoGbiUvMMHTKuasiT4UP9hBvVrwgsIjOvSVu9NnL
-uxtP5VnHvQIDAQABo3EwbzBOBgNVHREERzBFghVzaGliYm9sZXRoLnRlY2hsaWIu
-Y3qGLGh0dHBzOi8vc2hpYmJvbGV0aC50ZWNobGliLmN6L2lkcC9zaGliYm9sZXRo
-MB0GA1UdDgQWBBRvpKOl45kZis1SGQnbs2WT6PX2UjANBgkqhkiG9w0BAQUFAAOC
-AQEAbtw87jOn1csGq3iYcEzPXyNO9j+YX1OFhjWhnjhD0z14FYOJKvr2yZ49hJoA
-UoxLanwsquNEE5MyxwlFjE0J9KAg+gTYZ/RQtUWI4qPMOGHzfT02U6HdXtMJVZOO
-CKGd9enAzy87bQ6lSYLMDgwDSvnTy47Xlv3z4a4IPy8+OJrMs5uE2vRs3+iYlDu3
-X/rdSE1Mpx7yDu7Zb/g1xGNOvmIMrZj1rS5rett+ODN9ewGj64Jm0dbfkjoquz7K
-cz9PxjipO+0hvnpmik2TpUCMnPwgLo7RXw0P0huR/qnT5LK6LWpfoNY4ZVEQ3FMu
-mYyU0qeHcluLxU/GrWy+OGqcqQ==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.techlib.cz:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.techlib.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:2.0:nameid-format:persistent</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.techlib.cz/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.techlib.cz/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.techlib.cz/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.techlib.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">techlib.cz</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">National Library of Technology</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="cs">Národní technická knihovna</mdui:DisplayName>
-        <mdui:Logo height="40" width="67">http://www.techlib.cz/public/images/logo-eduid.png</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDPzCCAiegAwIBAgIUX+osnvtxGkyyLqc3Z6xHhgMJP1cwDQYJKoZIhvcNAQEF
-BQAwIDEeMBwGA1UEAxMVc2hpYmJvbGV0aC50ZWNobGliLmN6MB4XDTEwMDIxNzEy
-MjYwM1oXDTMwMDIxNzEyMjYwM1owIDEeMBwGA1UEAxMVc2hpYmJvbGV0aC50ZWNo
-bGliLmN6MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAi5FN6efQHuiH
-zERWjziRdD9X4sF76m0v9dest6lxrVXdxBIMjo52h7zkmZnWTwr402rCu6MLr2rX
-Lfz050FcEGSBDQyVr47QsUEQkvsThjdb2LZtjHzxiMc20fngB5+7nrZG4pBwragw
-XxfklvQ9VVdhQ1evD4QLn9Vj0LavZi9BzyOtbO6nPzzw624u0buU/QNeZAs2gNgj
-DJKx2UQW50R/YJUHz7XEd/q8r48+gSWkqh0KPvAbqaQJkZJ2lwyggcqPCV9i9wlF
-aUuE8aDyVKUkmT6Z8HfJKsFUgoGbiUvMMHTKuasiT4UP9hBvVrwgsIjOvSVu9NnL
-uxtP5VnHvQIDAQABo3EwbzBOBgNVHREERzBFghVzaGliYm9sZXRoLnRlY2hsaWIu
-Y3qGLGh0dHBzOi8vc2hpYmJvbGV0aC50ZWNobGliLmN6L2lkcC9zaGliYm9sZXRo
-MB0GA1UdDgQWBBRvpKOl45kZis1SGQnbs2WT6PX2UjANBgkqhkiG9w0BAQUFAAOC
-AQEAbtw87jOn1csGq3iYcEzPXyNO9j+YX1OFhjWhnjhD0z14FYOJKvr2yZ49hJoA
-UoxLanwsquNEE5MyxwlFjE0J9KAg+gTYZ/RQtUWI4qPMOGHzfT02U6HdXtMJVZOO
-CKGd9enAzy87bQ6lSYLMDgwDSvnTy47Xlv3z4a4IPy8+OJrMs5uE2vRs3+iYlDu3
-X/rdSE1Mpx7yDu7Zb/g1xGNOvmIMrZj1rS5rett+ODN9ewGj64Jm0dbfkjoquz7K
-cz9PxjipO+0hvnpmik2TpUCMnPwgLo7RXw0P0huR/qnT5LK6LWpfoNY4ZVEQ3FMu
-mYyU0qeHcluLxU/GrWy+OGqcqQ==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.techlib.cz:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.techlib.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">National Library of Technology</OrganizationName>
-    <OrganizationName xml:lang="cs">Narodni technicka knihovna</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">National Library of Technology</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="cs">Narodni technicka knihovna</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.techlib.cz/en/</OrganizationURL>
-    <OrganizationURL xml:lang="cs">http://www.techlib.cz/cs/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Ondrej</GivenName>
-    <SurName>Koch</SurName>
-    <EmailAddress>ondrej.koch@techlib.cz</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.techlib.cz.xml b/swamid-interfederations-2.0/shibboleth.techlib.cz.xml
deleted file mode 100644
index 5f2ce733..00000000
--- a/swamid-interfederations-2.0/shibboleth.techlib.cz.xml
+++ /dev/null
@@ -1,114 +0,0 @@
-<?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.techlib.cz/idp/shibboleth">
-  <md:Extensions xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata">
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/" registrationInstant="2013-08-05T12:59:38Z">
-      <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>
-    <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://eduid.cz/uri/idp-group/library</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md: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">techlib.cz</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">National Library of Technology</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="cs">Národní technická knihovna</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Identity Provider for National Library of Technology in Prague.</mdui:Description>
-        <mdui:Description xml:lang="cs">Identity Provider pro Národní technickou knihovnu v Praze.</mdui:Description>
-        <mdui:Logo height="40" width="67">https://www.techlib.cz/public/images/logo-eduid.png</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDPzCCAiegAwIBAgIUX+osnvtxGkyyLqc3Z6xHhgMJP1cwDQYJKoZIhvcNAQEF
-BQAwIDEeMBwGA1UEAxMVc2hpYmJvbGV0aC50ZWNobGliLmN6MB4XDTEwMDIxNzEy
-MjYwM1oXDTMwMDIxNzEyMjYwM1owIDEeMBwGA1UEAxMVc2hpYmJvbGV0aC50ZWNo
-bGliLmN6MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAi5FN6efQHuiH
-zERWjziRdD9X4sF76m0v9dest6lxrVXdxBIMjo52h7zkmZnWTwr402rCu6MLr2rX
-Lfz050FcEGSBDQyVr47QsUEQkvsThjdb2LZtjHzxiMc20fngB5+7nrZG4pBwragw
-XxfklvQ9VVdhQ1evD4QLn9Vj0LavZi9BzyOtbO6nPzzw624u0buU/QNeZAs2gNgj
-DJKx2UQW50R/YJUHz7XEd/q8r48+gSWkqh0KPvAbqaQJkZJ2lwyggcqPCV9i9wlF
-aUuE8aDyVKUkmT6Z8HfJKsFUgoGbiUvMMHTKuasiT4UP9hBvVrwgsIjOvSVu9NnL
-uxtP5VnHvQIDAQABo3EwbzBOBgNVHREERzBFghVzaGliYm9sZXRoLnRlY2hsaWIu
-Y3qGLGh0dHBzOi8vc2hpYmJvbGV0aC50ZWNobGliLmN6L2lkcC9zaGliYm9sZXRo
-MB0GA1UdDgQWBBRvpKOl45kZis1SGQnbs2WT6PX2UjANBgkqhkiG9w0BAQUFAAOC
-AQEAbtw87jOn1csGq3iYcEzPXyNO9j+YX1OFhjWhnjhD0z14FYOJKvr2yZ49hJoA
-UoxLanwsquNEE5MyxwlFjE0J9KAg+gTYZ/RQtUWI4qPMOGHzfT02U6HdXtMJVZOO
-CKGd9enAzy87bQ6lSYLMDgwDSvnTy47Xlv3z4a4IPy8+OJrMs5uE2vRs3+iYlDu3
-X/rdSE1Mpx7yDu7Zb/g1xGNOvmIMrZj1rS5rett+ODN9ewGj64Jm0dbfkjoquz7K
-cz9PxjipO+0hvnpmik2TpUCMnPwgLo7RXw0P0huR/qnT5LK6LWpfoNY4ZVEQ3FMu
-mYyU0qeHcluLxU/GrWy+OGqcqQ==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.techlib.cz:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.techlib.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:2.0:nameid-format:persistent</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.techlib.cz/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.techlib.cz/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.techlib.cz/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.techlib.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">techlib.cz</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">National Library of Technology</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="cs">Národní technická knihovna</mdui:DisplayName>
-        <mdui:Logo height="40" width="67">http://www.techlib.cz/public/images/logo-eduid.png</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDPzCCAiegAwIBAgIUX+osnvtxGkyyLqc3Z6xHhgMJP1cwDQYJKoZIhvcNAQEF
-BQAwIDEeMBwGA1UEAxMVc2hpYmJvbGV0aC50ZWNobGliLmN6MB4XDTEwMDIxNzEy
-MjYwM1oXDTMwMDIxNzEyMjYwM1owIDEeMBwGA1UEAxMVc2hpYmJvbGV0aC50ZWNo
-bGliLmN6MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAi5FN6efQHuiH
-zERWjziRdD9X4sF76m0v9dest6lxrVXdxBIMjo52h7zkmZnWTwr402rCu6MLr2rX
-Lfz050FcEGSBDQyVr47QsUEQkvsThjdb2LZtjHzxiMc20fngB5+7nrZG4pBwragw
-XxfklvQ9VVdhQ1evD4QLn9Vj0LavZi9BzyOtbO6nPzzw624u0buU/QNeZAs2gNgj
-DJKx2UQW50R/YJUHz7XEd/q8r48+gSWkqh0KPvAbqaQJkZJ2lwyggcqPCV9i9wlF
-aUuE8aDyVKUkmT6Z8HfJKsFUgoGbiUvMMHTKuasiT4UP9hBvVrwgsIjOvSVu9NnL
-uxtP5VnHvQIDAQABo3EwbzBOBgNVHREERzBFghVzaGliYm9sZXRoLnRlY2hsaWIu
-Y3qGLGh0dHBzOi8vc2hpYmJvbGV0aC50ZWNobGliLmN6L2lkcC9zaGliYm9sZXRo
-MB0GA1UdDgQWBBRvpKOl45kZis1SGQnbs2WT6PX2UjANBgkqhkiG9w0BAQUFAAOC
-AQEAbtw87jOn1csGq3iYcEzPXyNO9j+YX1OFhjWhnjhD0z14FYOJKvr2yZ49hJoA
-UoxLanwsquNEE5MyxwlFjE0J9KAg+gTYZ/RQtUWI4qPMOGHzfT02U6HdXtMJVZOO
-CKGd9enAzy87bQ6lSYLMDgwDSvnTy47Xlv3z4a4IPy8+OJrMs5uE2vRs3+iYlDu3
-X/rdSE1Mpx7yDu7Zb/g1xGNOvmIMrZj1rS5rett+ODN9ewGj64Jm0dbfkjoquz7K
-cz9PxjipO+0hvnpmik2TpUCMnPwgLo7RXw0P0huR/qnT5LK6LWpfoNY4ZVEQ3FMu
-mYyU0qeHcluLxU/GrWy+OGqcqQ==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.techlib.cz:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.techlib.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">National Library of Technology</OrganizationName>
-    <OrganizationName xml:lang="cs">Narodni technicka knihovna</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">National Library of Technology</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="cs">Narodni technicka knihovna</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.techlib.cz/en/</OrganizationURL>
-    <OrganizationURL xml:lang="cs">http://www.techlib.cz/cs/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Ondrej</GivenName>
-    <SurName>Koch</SurName>
-    <EmailAddress>ondrej.koch@techlib.cz</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.u-bourgogne.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.u-bourgogne.fr-idp-shibboleth.xml
deleted file mode 100644
index ada43b2c..00000000
--- a/swamid-interfederations-2.0/shibboleth.u-bourgogne.fr-idp-shibboleth.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://shibboleth.u-bourgogne.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2014-02-05T17:33:05Z">
-      <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">u-bourgogne.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">Université de Bourgogne</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDUDCCAjigAwIBAgIVAIeNiIDKvgtvFqf45aiuB8pnYHO3MA0GCSqGSIb3DQEB
-BQUAMCQxIjAgBgNVBAMTGXNoaWJib2xldGgudS1ib3VyZ29nbmUuZnIwHhcNMTMw
-MzA0MTQwODU5WhcNMzMwMzA0MTQwODU5WjAkMSIwIAYDVQQDExlzaGliYm9sZXRo
-LnUtYm91cmdvZ25lLmZyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
-u4o6aNzFq5dFOOJ3FjDd+yUWvuKjHbjxZZXITTSkTY1dJWnNeWgU5/hMqe1eT0b3
-mkREk+0lLOFpIgc8XP7komHv/+oTRBWyrZiHYEBMLa+I7OxNYG9maHm7hABBAMlp
-aCNHLnd3e2mX4ZFiCAx6boIwrXPs1jo3vaEqdqU6t2U6WexjUXscGP7x0P7xthFd
-Givnhf9ibWnQ3FHFsjFK0J0NQJ7gakfiop2OcacHIS7NBFtKzj+F7/4u0OW4yJmq
-TJD3BlbzVWASv40bnETttxYFMysr95/lZ8fE3xHQ+JNZizt4xDQw+43hrxF9z05U
-0gfLMPtaaREZmw7jVjW6NwIDAQABo3kwdzBWBgNVHREETzBNghlzaGliYm9sZXRo
-LnUtYm91cmdvZ25lLmZyhjBodHRwczovL3NoaWJib2xldGgudS1ib3VyZ29nbmUu
-ZnIvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFGXgakJMT66MdgHobQe6tYhWEVpn
-MA0GCSqGSIb3DQEBBQUAA4IBAQA/R7RnXq7N0ZByIkA4xB0LA8EK2e7+ArChE6hN
-44ocg1dUJ1KGCKI22K9RlGC0qyQ/SjXvlyEbTyVxUSeu2ofFb2Q0WtdE/BIIs6PB
-vK4DxIEhIEeNjucQ1nOS0k1U1Yz/vjQ0BtSxOj+ULknjrXLlA+LKXtvi5se+1xu2
-+ibSc3IIu6Xdz3M7tFhB6/OAQ7JJzRG6CI9w3WM6DhE3KsZTBm2duAhH/kV59uey
-fIZ7HFB/k2F6vh0EBz5mpkF3wzax185buQRXhVht8HNm6NBoORp/QxhZmG5RUT5T
-yV61jCIPDC1n3CFjzdLHuvT82V/1Rus0mDey+D8kXZygQRbs
-					    </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.u-bourgogne.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.u-bourgogne.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.u-bourgogne.fr/idp/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Université de Bourgogne</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Université de Bourgogne</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <EmailAddress>shibboleth@u-bourgogne.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.u-bourgogne.fr.xml b/swamid-interfederations-2.0/shibboleth.u-bourgogne.fr.xml
deleted file mode 100644
index ada43b2c..00000000
--- a/swamid-interfederations-2.0/shibboleth.u-bourgogne.fr.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://shibboleth.u-bourgogne.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2014-02-05T17:33:05Z">
-      <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">u-bourgogne.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">Université de Bourgogne</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDUDCCAjigAwIBAgIVAIeNiIDKvgtvFqf45aiuB8pnYHO3MA0GCSqGSIb3DQEB
-BQUAMCQxIjAgBgNVBAMTGXNoaWJib2xldGgudS1ib3VyZ29nbmUuZnIwHhcNMTMw
-MzA0MTQwODU5WhcNMzMwMzA0MTQwODU5WjAkMSIwIAYDVQQDExlzaGliYm9sZXRo
-LnUtYm91cmdvZ25lLmZyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
-u4o6aNzFq5dFOOJ3FjDd+yUWvuKjHbjxZZXITTSkTY1dJWnNeWgU5/hMqe1eT0b3
-mkREk+0lLOFpIgc8XP7komHv/+oTRBWyrZiHYEBMLa+I7OxNYG9maHm7hABBAMlp
-aCNHLnd3e2mX4ZFiCAx6boIwrXPs1jo3vaEqdqU6t2U6WexjUXscGP7x0P7xthFd
-Givnhf9ibWnQ3FHFsjFK0J0NQJ7gakfiop2OcacHIS7NBFtKzj+F7/4u0OW4yJmq
-TJD3BlbzVWASv40bnETttxYFMysr95/lZ8fE3xHQ+JNZizt4xDQw+43hrxF9z05U
-0gfLMPtaaREZmw7jVjW6NwIDAQABo3kwdzBWBgNVHREETzBNghlzaGliYm9sZXRo
-LnUtYm91cmdvZ25lLmZyhjBodHRwczovL3NoaWJib2xldGgudS1ib3VyZ29nbmUu
-ZnIvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFGXgakJMT66MdgHobQe6tYhWEVpn
-MA0GCSqGSIb3DQEBBQUAA4IBAQA/R7RnXq7N0ZByIkA4xB0LA8EK2e7+ArChE6hN
-44ocg1dUJ1KGCKI22K9RlGC0qyQ/SjXvlyEbTyVxUSeu2ofFb2Q0WtdE/BIIs6PB
-vK4DxIEhIEeNjucQ1nOS0k1U1Yz/vjQ0BtSxOj+ULknjrXLlA+LKXtvi5se+1xu2
-+ibSc3IIu6Xdz3M7tFhB6/OAQ7JJzRG6CI9w3WM6DhE3KsZTBm2duAhH/kV59uey
-fIZ7HFB/k2F6vh0EBz5mpkF3wzax185buQRXhVht8HNm6NBoORp/QxhZmG5RUT5T
-yV61jCIPDC1n3CFjzdLHuvT82V/1Rus0mDey+D8kXZygQRbs
-					    </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.u-bourgogne.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.u-bourgogne.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.u-bourgogne.fr/idp/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Université de Bourgogne</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Université de Bourgogne</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <EmailAddress>shibboleth@u-bourgogne.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.u-grenoble3.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.u-grenoble3.fr-idp-shibboleth.xml
deleted file mode 100644
index 61e7e7ee..00000000
--- a/swamid-interfederations-2.0/shibboleth.u-grenoble3.fr-idp-shibboleth.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://shibboleth.u-grenoble3.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2012-12-04T17:11:09Z">
-      <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">u-grenoble3.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">Université  Stendhal - Grenoble 3</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDTzCCAjegAwIBAgIUO6lqrfWSVSjaNN+/XubYFEzq/2wwDQYJKoZIhvcNAQEF
-BQAwJDEiMCAGA1UEAxMZc2hpYmJvbGV0aC51LWdyZW5vYmxlMy5mcjAeFw0xMjEw
-MDgxNTIyMjNaFw0zMjEwMDgxNTIyMjNaMCQxIjAgBgNVBAMTGXNoaWJib2xldGgu
-dS1ncmVub2JsZTMuZnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCC
-1riCyjqN5GFKjy2yese7U7AiHqI/1YdAemLeLBHr11KT6/RsdqW++jwV2lszQiGw
-BSVr2gAI8RY8j4zP7KzeyD+2Hn/ARvRsiZpQhLKDSPDafInTJz5rW5rfgoNHd2nv
-Ii/k66l24ZuslrTYuaTPxAgJGx0acyDk76r8gl4JUFCSkYV17SmLv5ixd2r+Wphz
-6gCVJ1EUSBoZFLIIfqIfWAPOF+liAxKYZuUSHtKGaLt9FkZgy5ykGcTCO7CIKvof
-82sjo5Sd57mZIubuyUHb+ycFN7pTcy7fURSBNuHOgVBgiUufjjPFlWT0j3eQENte
-fSgMl+lzEG8ZNII4If2TAgMBAAGjeTB3MFYGA1UdEQRPME2CGXNoaWJib2xldGgu
-dS1ncmVub2JsZTMuZnKGMGh0dHBzOi8vc2hpYmJvbGV0aC51LWdyZW5vYmxlMy5m
-ci9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUDQaomDjXR+8EYADTSozsPnhYfAow
-DQYJKoZIhvcNAQEFBQADggEBAEXNNQ9VnGiLhmkTJ8QADVpW7ft6nwvIWfUoxTfn
-92YJAWct5VVIzA39d05Sji5eWo2krLwGvSzsK9bUjQsQ/WDrdxfxsn//h5ynYdSF
-Ahxpo7Kp3p5+IvSRzULb5wprjdeKf9sL2mfCfh28siZPtehQLcnu2rjdwzNGsLr7
-LyfZM9UG3qLF7Q9UlHIOCpDOjYYXlD2zvXOtLTzmAX5H7fOPB5XKVfjbIR/WWXQY
-H7UnPfxPl4S6DAIEqMYzLudE8UTRTFkH71vWltAiy0ToSd6CVZsTk/Cn8mxfF0fv
-7AfOWGusEGvE6fUm9UEo+KJ1uM2hXH6+WCuSYIeYj7YWKS8=
-					    </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.u-grenoble3.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.u-grenoble3.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.u-grenoble3.fr/idp/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Université  Stendhal - Grenoble 3</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Université  Stendhal - Grenoble 3</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Yoann MITAINE</SurName>
-    <EmailAddress>yoann.mitaine@u-grenoble3.fr</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <SurName>Nicolay DIMITROV</SurName>
-    <EmailAddress>nicolay.dimitrov@u-grenoble3.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.u-grenoble3.fr.xml b/swamid-interfederations-2.0/shibboleth.u-grenoble3.fr.xml
deleted file mode 100644
index 61e7e7ee..00000000
--- a/swamid-interfederations-2.0/shibboleth.u-grenoble3.fr.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://shibboleth.u-grenoble3.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2012-12-04T17:11:09Z">
-      <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">u-grenoble3.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">Université  Stendhal - Grenoble 3</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDTzCCAjegAwIBAgIUO6lqrfWSVSjaNN+/XubYFEzq/2wwDQYJKoZIhvcNAQEF
-BQAwJDEiMCAGA1UEAxMZc2hpYmJvbGV0aC51LWdyZW5vYmxlMy5mcjAeFw0xMjEw
-MDgxNTIyMjNaFw0zMjEwMDgxNTIyMjNaMCQxIjAgBgNVBAMTGXNoaWJib2xldGgu
-dS1ncmVub2JsZTMuZnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCC
-1riCyjqN5GFKjy2yese7U7AiHqI/1YdAemLeLBHr11KT6/RsdqW++jwV2lszQiGw
-BSVr2gAI8RY8j4zP7KzeyD+2Hn/ARvRsiZpQhLKDSPDafInTJz5rW5rfgoNHd2nv
-Ii/k66l24ZuslrTYuaTPxAgJGx0acyDk76r8gl4JUFCSkYV17SmLv5ixd2r+Wphz
-6gCVJ1EUSBoZFLIIfqIfWAPOF+liAxKYZuUSHtKGaLt9FkZgy5ykGcTCO7CIKvof
-82sjo5Sd57mZIubuyUHb+ycFN7pTcy7fURSBNuHOgVBgiUufjjPFlWT0j3eQENte
-fSgMl+lzEG8ZNII4If2TAgMBAAGjeTB3MFYGA1UdEQRPME2CGXNoaWJib2xldGgu
-dS1ncmVub2JsZTMuZnKGMGh0dHBzOi8vc2hpYmJvbGV0aC51LWdyZW5vYmxlMy5m
-ci9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUDQaomDjXR+8EYADTSozsPnhYfAow
-DQYJKoZIhvcNAQEFBQADggEBAEXNNQ9VnGiLhmkTJ8QADVpW7ft6nwvIWfUoxTfn
-92YJAWct5VVIzA39d05Sji5eWo2krLwGvSzsK9bUjQsQ/WDrdxfxsn//h5ynYdSF
-Ahxpo7Kp3p5+IvSRzULb5wprjdeKf9sL2mfCfh28siZPtehQLcnu2rjdwzNGsLr7
-LyfZM9UG3qLF7Q9UlHIOCpDOjYYXlD2zvXOtLTzmAX5H7fOPB5XKVfjbIR/WWXQY
-H7UnPfxPl4S6DAIEqMYzLudE8UTRTFkH71vWltAiy0ToSd6CVZsTk/Cn8mxfF0fv
-7AfOWGusEGvE6fUm9UEo+KJ1uM2hXH6+WCuSYIeYj7YWKS8=
-					    </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.u-grenoble3.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.u-grenoble3.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.u-grenoble3.fr/idp/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Université  Stendhal - Grenoble 3</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Université  Stendhal - Grenoble 3</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Yoann MITAINE</SurName>
-    <EmailAddress>yoann.mitaine@u-grenoble3.fr</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <SurName>Nicolay DIMITROV</SurName>
-    <EmailAddress>nicolay.dimitrov@u-grenoble3.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.ufsc.br-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.ufsc.br-idp-shibboleth.xml
deleted file mode 100644
index f5549781..00000000
--- a/swamid-interfederations-2.0/shibboleth.ufsc.br-idp-shibboleth.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://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>
-    MIIDpjCCAo4CAQAwDQYJKoZIhvcNAQEFBQAwgZgxDTALBgNVBAoTBFVGU0MxDjAM
-BgNVBAsTBVNlVElDMRwwGgYJKoZIhvcNAQkBFg1hZG1pbkB1ZnNjLmJyMRYwFAYD
-VQQHEw1GbG9yaWFub3BvbGlzMRcwFQYDVQQIEw5TYW50YSBDYXRhcmluYTELMAkG
-A1UEBhMCQlIxGzAZBgNVBAMTEnNoaWJib2xldGgudWZzYy5icjAeFw0xNDA0MTYy
-MjI4MTZaFw0xOTA0MTUyMjI4MTZaMIGYMQ0wCwYDVQQKEwRVRlNDMQ4wDAYDVQQL
-EwVTZVRJQzEcMBoGCSqGSIb3DQEJARYNYWRtaW5AdWZzYy5icjEWMBQGA1UEBxMN
-Rmxvcmlhbm9wb2xpczEXMBUGA1UECBMOU2FudGEgQ2F0YXJpbmExCzAJBgNVBAYT
-AkJSMRswGQYDVQQDExJzaGliYm9sZXRoLnVmc2MuYnIwggEiMA0GCSqGSIb3DQEB
-AQUAA4IBDwAwggEKAoIBAQC/oBIF0VeleZ37F3PzefDHAIrgwIaN2aRyLzZ4Uv8/
-FYsWLIXeOxXr49qJ77jFFkv/UzXZJvLvb6yhKC0A18E+ZDcKSQZuYoG8Arx+ohPR
-EI824htm1uAwGAw/SUsDVTgFodHOmIOmal71f6sorCKb1GeBkDkpkSYyYXG3t7fk
-tVY741kqaPcGellMrccwKztjFs31GvNLNZCpLOpF3lLmmpDApOaFO1f9qbSKv0GZ
-PYPm/8NxE+4wJMUVHzExCpn/YV0rBd4DfNhU4LJGx6yYQCe+Rj6Uu9vL3AHcBU5k
-PT/ggxte+CDsQADIoYct8oPPDsZa4ezejgh1+XbTcqTzAgMBAAEwDQYJKoZIhvcN
-AQEFBQADggEBALAr9prD3ASLuuTCydBg5NHQIFkQdIhoPkgu1VA5IHdqr4qpM4HL
-I1BFbUi7CFBXMlVFC6xDB4H5byq8TidvLcAvePhrL4WLbO6q/CmuOeLEuGXEXY2T
-rYGyJI3JK0/Y2vb4IURylGMQvl0+dX8PHocy3wfNoXVdUYG4w3XYPKAXgWKlKC8F
-sexAwdseeJPodXooXs+WzgUbhKZAlQtfw8w/jEEf3UiOtj8R0oKJpp9NjDxmvFt1
-0Zsj1b736wkbB0weh6x+SjGFDGvN0Pqy6oMe1Up1GltN2e2mwU//UUWTp7hwgRuK
-O/t+U9FZLkeIH0u6xb0pl+3M4vupjleTToU=
-            </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>
-      
-MIIDpjCCAo4CAQAwDQYJKoZIhvcNAQEFBQAwgZgxDTALBgNVBAoTBFVGU0MxDjAM
-BgNVBAsTBVNlVElDMRwwGgYJKoZIhvcNAQkBFg1hZG1pbkB1ZnNjLmJyMRYwFAYD
-VQQHEw1GbG9yaWFub3BvbGlzMRcwFQYDVQQIEw5TYW50YSBDYXRhcmluYTELMAkG
-A1UEBhMCQlIxGzAZBgNVBAMTEnNoaWJib2xldGgudWZzYy5icjAeFw0xNDA0MTYy
-MjI4MTZaFw0xOTA0MTUyMjI4MTZaMIGYMQ0wCwYDVQQKEwRVRlNDMQ4wDAYDVQQL
-EwVTZVRJQzEcMBoGCSqGSIb3DQEJARYNYWRtaW5AdWZzYy5icjEWMBQGA1UEBxMN
-Rmxvcmlhbm9wb2xpczEXMBUGA1UECBMOU2FudGEgQ2F0YXJpbmExCzAJBgNVBAYT
-AkJSMRswGQYDVQQDExJzaGliYm9sZXRoLnVmc2MuYnIwggEiMA0GCSqGSIb3DQEB
-AQUAA4IBDwAwggEKAoIBAQC/oBIF0VeleZ37F3PzefDHAIrgwIaN2aRyLzZ4Uv8/
-FYsWLIXeOxXr49qJ77jFFkv/UzXZJvLvb6yhKC0A18E+ZDcKSQZuYoG8Arx+ohPR
-EI824htm1uAwGAw/SUsDVTgFodHOmIOmal71f6sorCKb1GeBkDkpkSYyYXG3t7fk
-tVY741kqaPcGellMrccwKztjFs31GvNLNZCpLOpF3lLmmpDApOaFO1f9qbSKv0GZ
-PYPm/8NxE+4wJMUVHzExCpn/YV0rBd4DfNhU4LJGx6yYQCe+Rj6Uu9vL3AHcBU5k
-PT/ggxte+CDsQADIoYct8oPPDsZa4ezejgh1+XbTcqTzAgMBAAEwDQYJKoZIhvcN
-AQEFBQADggEBALAr9prD3ASLuuTCydBg5NHQIFkQdIhoPkgu1VA5IHdqr4qpM4HL
-I1BFbUi7CFBXMlVFC6xDB4H5byq8TidvLcAvePhrL4WLbO6q/CmuOeLEuGXEXY2T
-rYGyJI3JK0/Y2vb4IURylGMQvl0+dX8PHocy3wfNoXVdUYG4w3XYPKAXgWKlKC8F
-sexAwdseeJPodXooXs+WzgUbhKZAlQtfw8w/jEEf3UiOtj8R0oKJpp9NjDxmvFt1
-0Zsj1b736wkbB0weh6x+SjGFDGvN0Pqy6oMe1Up1GltN2e2mwU//UUWTp7hwgRuK
-O/t+U9FZLkeIH0u6xb0pl+3M4vupjleTToU=
-                    
-            </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.ufsc.br.xml b/swamid-interfederations-2.0/shibboleth.ufsc.br.xml
deleted file mode 100644
index f5549781..00000000
--- a/swamid-interfederations-2.0/shibboleth.ufsc.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://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>
-    MIIDpjCCAo4CAQAwDQYJKoZIhvcNAQEFBQAwgZgxDTALBgNVBAoTBFVGU0MxDjAM
-BgNVBAsTBVNlVElDMRwwGgYJKoZIhvcNAQkBFg1hZG1pbkB1ZnNjLmJyMRYwFAYD
-VQQHEw1GbG9yaWFub3BvbGlzMRcwFQYDVQQIEw5TYW50YSBDYXRhcmluYTELMAkG
-A1UEBhMCQlIxGzAZBgNVBAMTEnNoaWJib2xldGgudWZzYy5icjAeFw0xNDA0MTYy
-MjI4MTZaFw0xOTA0MTUyMjI4MTZaMIGYMQ0wCwYDVQQKEwRVRlNDMQ4wDAYDVQQL
-EwVTZVRJQzEcMBoGCSqGSIb3DQEJARYNYWRtaW5AdWZzYy5icjEWMBQGA1UEBxMN
-Rmxvcmlhbm9wb2xpczEXMBUGA1UECBMOU2FudGEgQ2F0YXJpbmExCzAJBgNVBAYT
-AkJSMRswGQYDVQQDExJzaGliYm9sZXRoLnVmc2MuYnIwggEiMA0GCSqGSIb3DQEB
-AQUAA4IBDwAwggEKAoIBAQC/oBIF0VeleZ37F3PzefDHAIrgwIaN2aRyLzZ4Uv8/
-FYsWLIXeOxXr49qJ77jFFkv/UzXZJvLvb6yhKC0A18E+ZDcKSQZuYoG8Arx+ohPR
-EI824htm1uAwGAw/SUsDVTgFodHOmIOmal71f6sorCKb1GeBkDkpkSYyYXG3t7fk
-tVY741kqaPcGellMrccwKztjFs31GvNLNZCpLOpF3lLmmpDApOaFO1f9qbSKv0GZ
-PYPm/8NxE+4wJMUVHzExCpn/YV0rBd4DfNhU4LJGx6yYQCe+Rj6Uu9vL3AHcBU5k
-PT/ggxte+CDsQADIoYct8oPPDsZa4ezejgh1+XbTcqTzAgMBAAEwDQYJKoZIhvcN
-AQEFBQADggEBALAr9prD3ASLuuTCydBg5NHQIFkQdIhoPkgu1VA5IHdqr4qpM4HL
-I1BFbUi7CFBXMlVFC6xDB4H5byq8TidvLcAvePhrL4WLbO6q/CmuOeLEuGXEXY2T
-rYGyJI3JK0/Y2vb4IURylGMQvl0+dX8PHocy3wfNoXVdUYG4w3XYPKAXgWKlKC8F
-sexAwdseeJPodXooXs+WzgUbhKZAlQtfw8w/jEEf3UiOtj8R0oKJpp9NjDxmvFt1
-0Zsj1b736wkbB0weh6x+SjGFDGvN0Pqy6oMe1Up1GltN2e2mwU//UUWTp7hwgRuK
-O/t+U9FZLkeIH0u6xb0pl+3M4vupjleTToU=
-            </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>
-      
-MIIDpjCCAo4CAQAwDQYJKoZIhvcNAQEFBQAwgZgxDTALBgNVBAoTBFVGU0MxDjAM
-BgNVBAsTBVNlVElDMRwwGgYJKoZIhvcNAQkBFg1hZG1pbkB1ZnNjLmJyMRYwFAYD
-VQQHEw1GbG9yaWFub3BvbGlzMRcwFQYDVQQIEw5TYW50YSBDYXRhcmluYTELMAkG
-A1UEBhMCQlIxGzAZBgNVBAMTEnNoaWJib2xldGgudWZzYy5icjAeFw0xNDA0MTYy
-MjI4MTZaFw0xOTA0MTUyMjI4MTZaMIGYMQ0wCwYDVQQKEwRVRlNDMQ4wDAYDVQQL
-EwVTZVRJQzEcMBoGCSqGSIb3DQEJARYNYWRtaW5AdWZzYy5icjEWMBQGA1UEBxMN
-Rmxvcmlhbm9wb2xpczEXMBUGA1UECBMOU2FudGEgQ2F0YXJpbmExCzAJBgNVBAYT
-AkJSMRswGQYDVQQDExJzaGliYm9sZXRoLnVmc2MuYnIwggEiMA0GCSqGSIb3DQEB
-AQUAA4IBDwAwggEKAoIBAQC/oBIF0VeleZ37F3PzefDHAIrgwIaN2aRyLzZ4Uv8/
-FYsWLIXeOxXr49qJ77jFFkv/UzXZJvLvb6yhKC0A18E+ZDcKSQZuYoG8Arx+ohPR
-EI824htm1uAwGAw/SUsDVTgFodHOmIOmal71f6sorCKb1GeBkDkpkSYyYXG3t7fk
-tVY741kqaPcGellMrccwKztjFs31GvNLNZCpLOpF3lLmmpDApOaFO1f9qbSKv0GZ
-PYPm/8NxE+4wJMUVHzExCpn/YV0rBd4DfNhU4LJGx6yYQCe+Rj6Uu9vL3AHcBU5k
-PT/ggxte+CDsQADIoYct8oPPDsZa4ezejgh1+XbTcqTzAgMBAAEwDQYJKoZIhvcN
-AQEFBQADggEBALAr9prD3ASLuuTCydBg5NHQIFkQdIhoPkgu1VA5IHdqr4qpM4HL
-I1BFbUi7CFBXMlVFC6xDB4H5byq8TidvLcAvePhrL4WLbO6q/CmuOeLEuGXEXY2T
-rYGyJI3JK0/Y2vb4IURylGMQvl0+dX8PHocy3wfNoXVdUYG4w3XYPKAXgWKlKC8F
-sexAwdseeJPodXooXs+WzgUbhKZAlQtfw8w/jEEf3UiOtj8R0oKJpp9NjDxmvFt1
-0Zsj1b736wkbB0weh6x+SjGFDGvN0Pqy6oMe1Up1GltN2e2mwU//UUWTp7hwgRuK
-O/t+U9FZLkeIH0u6xb0pl+3M4vupjleTToU=
-                    
-            </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.ujf-grenoble.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.ujf-grenoble.fr-idp-shibboleth.xml
deleted file mode 100644
index e06845a5..00000000
--- a/swamid-interfederations-2.0/shibboleth.ujf-grenoble.fr-idp-shibboleth.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://shibboleth.ujf-grenoble.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2012-09-13T14:58:07Z">
-      <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">ujf-grenoble.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">Université de Grenoble 1 - Joseph Fourier</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDUzCCAjugAwIBAgIUIBrWKHsL8z9pJuwM6Xugq6gtHv0wDQYJKoZIhvcNAQEF
-BQAwJTEjMCEGA1UEAxMac2hpYmJvbGV0aC51amYtZ3Jlbm9ibGUuZnIwHhcNMTIw
-NTMwMTM1OTEwWhcNMzIwNTMwMTM1OTEwWjAlMSMwIQYDVQQDExpzaGliYm9sZXRo
-LnVqZi1ncmVub2JsZS5mcjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
-AMKh7FBSR/eSLc6z91Pnqz9DwOsoTcYsmk7vMR5pzzma04GnURN9m4wdLXXXthpT
-wsLsm6X3IajdWwPcychQX+QXjFVu9SwujThoTVKEKHQNQeLcd5d7diiE9NyCnL4n
-dT2TCMetnw7mZi9hjQNzqglecS6hYfz9AbPjE6nBrCMolp93fMW2+DNUx8LjsfhY
-trmbX8302s9oEXbOgawV/4aqrDuRlXUKtCQoHhNZDlaXwRIbEljHvQ+e4RNz1OcA
-WIsARWe7H1WEow3q+SbIRFSYURRqpnA7I98Iee6jk4KrGVSmlzQHpnxYJ2lPVMnG
-9l0VGLuWBE1JLzD9tKnmrPkCAwEAAaN7MHkwWAYDVR0RBFEwT4Iac2hpYmJvbGV0
-aC51amYtZ3Jlbm9ibGUuZnKGMWh0dHBzOi8vc2hpYmJvbGV0aC51amYtZ3Jlbm9i
-bGUuZnIvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFMI3jVWm2/k0WcsNlvWwLwUo
-/OsaMA0GCSqGSIb3DQEBBQUAA4IBAQCGC1Rg9cMwkd7AojNiF8YZ0UBY1cK208ik
-AcP7bhMUTIo2OxlhEDqGa8y0wCr2GFOJXutgR0HED33N+VfzvV2lhPJf3hEg6yFa
-gBnVXFgNP7+m+wjJ8l//EX2x8XGefCEobUFXP1g2xurqfr5Wvm7BlN2dKhhEVn3d
-/Jm1bb3fZT1CM1ryggYtQLnNNlcJYyYDbqPshKA5LIXn3PlSyxC7QtqY3PRgag68
-k1xooEqccP2ldz2s7hAinmiTCGC3nKoSJUpFAkUUo3hEulRnd4KdIqV0Bat0I/qt
-Y8dlCvdx5k6fUjl8mF/ZLzQs6uX9XwCwlb60AKwi9uFRJpFzCX9e
-					    </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.ujf-grenoble.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.ujf-grenoble.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.ujf-grenoble.fr/idp/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Université de Grenoble 1 - Joseph Fourier</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Université de Grenoble 1 - Joseph Fourier</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <EmailAddress>disi-agalan@ujf-grenoble.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.ujf-grenoble.fr.xml b/swamid-interfederations-2.0/shibboleth.ujf-grenoble.fr.xml
deleted file mode 100644
index e06845a5..00000000
--- a/swamid-interfederations-2.0/shibboleth.ujf-grenoble.fr.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://shibboleth.ujf-grenoble.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2012-09-13T14:58:07Z">
-      <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">ujf-grenoble.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">Université de Grenoble 1 - Joseph Fourier</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDUzCCAjugAwIBAgIUIBrWKHsL8z9pJuwM6Xugq6gtHv0wDQYJKoZIhvcNAQEF
-BQAwJTEjMCEGA1UEAxMac2hpYmJvbGV0aC51amYtZ3Jlbm9ibGUuZnIwHhcNMTIw
-NTMwMTM1OTEwWhcNMzIwNTMwMTM1OTEwWjAlMSMwIQYDVQQDExpzaGliYm9sZXRo
-LnVqZi1ncmVub2JsZS5mcjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
-AMKh7FBSR/eSLc6z91Pnqz9DwOsoTcYsmk7vMR5pzzma04GnURN9m4wdLXXXthpT
-wsLsm6X3IajdWwPcychQX+QXjFVu9SwujThoTVKEKHQNQeLcd5d7diiE9NyCnL4n
-dT2TCMetnw7mZi9hjQNzqglecS6hYfz9AbPjE6nBrCMolp93fMW2+DNUx8LjsfhY
-trmbX8302s9oEXbOgawV/4aqrDuRlXUKtCQoHhNZDlaXwRIbEljHvQ+e4RNz1OcA
-WIsARWe7H1WEow3q+SbIRFSYURRqpnA7I98Iee6jk4KrGVSmlzQHpnxYJ2lPVMnG
-9l0VGLuWBE1JLzD9tKnmrPkCAwEAAaN7MHkwWAYDVR0RBFEwT4Iac2hpYmJvbGV0
-aC51amYtZ3Jlbm9ibGUuZnKGMWh0dHBzOi8vc2hpYmJvbGV0aC51amYtZ3Jlbm9i
-bGUuZnIvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFMI3jVWm2/k0WcsNlvWwLwUo
-/OsaMA0GCSqGSIb3DQEBBQUAA4IBAQCGC1Rg9cMwkd7AojNiF8YZ0UBY1cK208ik
-AcP7bhMUTIo2OxlhEDqGa8y0wCr2GFOJXutgR0HED33N+VfzvV2lhPJf3hEg6yFa
-gBnVXFgNP7+m+wjJ8l//EX2x8XGefCEobUFXP1g2xurqfr5Wvm7BlN2dKhhEVn3d
-/Jm1bb3fZT1CM1ryggYtQLnNNlcJYyYDbqPshKA5LIXn3PlSyxC7QtqY3PRgag68
-k1xooEqccP2ldz2s7hAinmiTCGC3nKoSJUpFAkUUo3hEulRnd4KdIqV0Bat0I/qt
-Y8dlCvdx5k6fUjl8mF/ZLzQs6uX9XwCwlb60AKwi9uFRJpFzCX9e
-					    </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.ujf-grenoble.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.ujf-grenoble.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.ujf-grenoble.fr/idp/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Université de Grenoble 1 - Joseph Fourier</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Université de Grenoble 1 - Joseph Fourier</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <EmailAddress>disi-agalan@ujf-grenoble.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.unb.br-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.unb.br-idp-shibboleth.xml
deleted file mode 100644
index 3013a11e..00000000
--- a/swamid-interfederations-2.0/shibboleth.unb.br-idp-shibboleth.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://shibboleth.unb.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">unb.br</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">UNB - Universidade de Brasilia</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="pt-br">UNB - Universidade de Brasilia</mdui:DisplayName>
-        <mdui:Description xml:lang="en">UNB - Universidade de Brasilia</mdui:Description>
-        <mdui:Description xml:lang="pt-br">UNB - Universidade de Brasilia</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.unb.br/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="pt-br">http://www.unb.br/</mdui:InformationURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-    MIID1jCCAr4CAQAwDQYJKoZIhvcNAQEFBQAwgbAxJzAlBgNVBAoTHlVOQiAtIFVu
-aXZlcnNpZGFkZSBkZSBCcmFzaWxpYTEMMAoGA1UECxMDQ1BEMSAwHgYJKoZIhvcN
-AQkBFhFkaW9uaXNpb2pyQHVuYi5icjERMA8GA1UEBxMIQnJhc2lsaWExGTAXBgNV
-BAgTEERpc3RyaXRvIEZlZGVyYWwxCzAJBgNVBAYTAkJSMRowGAYDVQQDExFzaGli
-Ym9sZXRoLnVuYi5icjAeFw0xNDA3MDEyMTUxMjJaFw0xNzA2MzAyMTUxMjJaMIGw
-MScwJQYDVQQKEx5VTkIgLSBVbml2ZXJzaWRhZGUgZGUgQnJhc2lsaWExDDAKBgNV
-BAsTA0NQRDEgMB4GCSqGSIb3DQEJARYRZGlvbmlzaW9qckB1bmIuYnIxETAPBgNV
-BAcTCEJyYXNpbGlhMRkwFwYDVQQIExBEaXN0cml0byBGZWRlcmFsMQswCQYDVQQG
-EwJCUjEaMBgGA1UEAxMRc2hpYmJvbGV0aC51bmIuYnIwggEiMA0GCSqGSIb3DQEB
-AQUAA4IBDwAwggEKAoIBAQDzc4RTYqDqObR8seN1H6eMRfhielgf2cd7of8T2n9h
-LZV6lakR193gP0qRj+SaZUNaDwoiPoDs4jH8C8a901DmE6QoTMDjg6LL+97swZb4
-lCsZRs5V4qIRNjQZ6nF3rgsEs/oNONQwTq0AQKIorYG5zC4oibwwwjYFan7oOszi
-MeohgrdZWl/bhlsEwWOlDaOpKlFxXYtHXskOSbf+3fvZvJArgq5S7PNuG1oBxvuJ
-Xi5AzjHABYt3CziIawUtMS1dWojrnC+64WN3gf3ninVTt4k+xbqn2gZujdoAR/yn
-6JUYi3PZRU77H6xjCag+3+1kuKBx0EBFFdr85ZF8mauHAgMBAAEwDQYJKoZIhvcN
-AQEFBQADggEBAIW2/04fVCKbAv0BKaTdhj8HIG++0nmdA9PsDECgFyURwoh8M2nY
-rkViEKpFdl0s9+8wtj/cGhYVWru0g8Qm1Uo27pXElYIPgU4hm3988VopipwDT2DY
-xsxk+MdoP6KTRtSNJNKFMbuPYj/jr7n7MFJYiWgvOvZ/n/o4RSRHrGhOYVuYNeyn
-/ejprsKScl7RnhMg5dtMXt9qeGgIWW/heVImJJzDURNdsF4sDHD4qKhf3pDNRhHn
-99zu7PASZZerAxI9xXpDiD+of+jaX+uI2/zzap1sMVtlaInMICk/Sa1CL2tBGzY8
-MSmJeH91lUYBcieZYDOgno6WAgr1VoZ8Baw=
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.unb.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.unb.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.unb.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.unb.br/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.unb.br/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.unb.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">unb.br</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-      
-MIID1jCCAr4CAQAwDQYJKoZIhvcNAQEFBQAwgbAxJzAlBgNVBAoTHlVOQiAtIFVu
-aXZlcnNpZGFkZSBkZSBCcmFzaWxpYTEMMAoGA1UECxMDQ1BEMSAwHgYJKoZIhvcN
-AQkBFhFkaW9uaXNpb2pyQHVuYi5icjERMA8GA1UEBxMIQnJhc2lsaWExGTAXBgNV
-BAgTEERpc3RyaXRvIEZlZGVyYWwxCzAJBgNVBAYTAkJSMRowGAYDVQQDExFzaGli
-Ym9sZXRoLnVuYi5icjAeFw0xNDA3MDEyMTUxMjJaFw0xNzA2MzAyMTUxMjJaMIGw
-MScwJQYDVQQKEx5VTkIgLSBVbml2ZXJzaWRhZGUgZGUgQnJhc2lsaWExDDAKBgNV
-BAsTA0NQRDEgMB4GCSqGSIb3DQEJARYRZGlvbmlzaW9qckB1bmIuYnIxETAPBgNV
-BAcTCEJyYXNpbGlhMRkwFwYDVQQIExBEaXN0cml0byBGZWRlcmFsMQswCQYDVQQG
-EwJCUjEaMBgGA1UEAxMRc2hpYmJvbGV0aC51bmIuYnIwggEiMA0GCSqGSIb3DQEB
-AQUAA4IBDwAwggEKAoIBAQDzc4RTYqDqObR8seN1H6eMRfhielgf2cd7of8T2n9h
-LZV6lakR193gP0qRj+SaZUNaDwoiPoDs4jH8C8a901DmE6QoTMDjg6LL+97swZb4
-lCsZRs5V4qIRNjQZ6nF3rgsEs/oNONQwTq0AQKIorYG5zC4oibwwwjYFan7oOszi
-MeohgrdZWl/bhlsEwWOlDaOpKlFxXYtHXskOSbf+3fvZvJArgq5S7PNuG1oBxvuJ
-Xi5AzjHABYt3CziIawUtMS1dWojrnC+64WN3gf3ninVTt4k+xbqn2gZujdoAR/yn
-6JUYi3PZRU77H6xjCag+3+1kuKBx0EBFFdr85ZF8mauHAgMBAAEwDQYJKoZIhvcN
-AQEFBQADggEBAIW2/04fVCKbAv0BKaTdhj8HIG++0nmdA9PsDECgFyURwoh8M2nY
-rkViEKpFdl0s9+8wtj/cGhYVWru0g8Qm1Uo27pXElYIPgU4hm3988VopipwDT2DY
-xsxk+MdoP6KTRtSNJNKFMbuPYj/jr7n7MFJYiWgvOvZ/n/o4RSRHrGhOYVuYNeyn
-/ejprsKScl7RnhMg5dtMXt9qeGgIWW/heVImJJzDURNdsF4sDHD4qKhf3pDNRhHn
-99zu7PASZZerAxI9xXpDiD+of+jaX+uI2/zzap1sMVtlaInMICk/Sa1CL2tBGzY8
-MSmJeH91lUYBcieZYDOgno6WAgr1VoZ8Baw=
-                    
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.unb.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.unb.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">UNB - Universidade de Brasilia</OrganizationName>
-    <OrganizationName xml:lang="pt-br">UNB - Universidade de Brasilia</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">UNB - Universidade de Brasilia</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="pt-br">UNB - Universidade de Brasilia</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.unb.br/</OrganizationURL>
-    <OrganizationURL xml:lang="pt-br">http://www.unb.br/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Dionisio Miziara</SurName>
-    <EmailAddress>dionisiojr@unb.br</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.unb.br.xml b/swamid-interfederations-2.0/shibboleth.unb.br.xml
deleted file mode 100644
index 3013a11e..00000000
--- a/swamid-interfederations-2.0/shibboleth.unb.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://shibboleth.unb.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">unb.br</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">UNB - Universidade de Brasilia</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="pt-br">UNB - Universidade de Brasilia</mdui:DisplayName>
-        <mdui:Description xml:lang="en">UNB - Universidade de Brasilia</mdui:Description>
-        <mdui:Description xml:lang="pt-br">UNB - Universidade de Brasilia</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.unb.br/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="pt-br">http://www.unb.br/</mdui:InformationURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-    MIID1jCCAr4CAQAwDQYJKoZIhvcNAQEFBQAwgbAxJzAlBgNVBAoTHlVOQiAtIFVu
-aXZlcnNpZGFkZSBkZSBCcmFzaWxpYTEMMAoGA1UECxMDQ1BEMSAwHgYJKoZIhvcN
-AQkBFhFkaW9uaXNpb2pyQHVuYi5icjERMA8GA1UEBxMIQnJhc2lsaWExGTAXBgNV
-BAgTEERpc3RyaXRvIEZlZGVyYWwxCzAJBgNVBAYTAkJSMRowGAYDVQQDExFzaGli
-Ym9sZXRoLnVuYi5icjAeFw0xNDA3MDEyMTUxMjJaFw0xNzA2MzAyMTUxMjJaMIGw
-MScwJQYDVQQKEx5VTkIgLSBVbml2ZXJzaWRhZGUgZGUgQnJhc2lsaWExDDAKBgNV
-BAsTA0NQRDEgMB4GCSqGSIb3DQEJARYRZGlvbmlzaW9qckB1bmIuYnIxETAPBgNV
-BAcTCEJyYXNpbGlhMRkwFwYDVQQIExBEaXN0cml0byBGZWRlcmFsMQswCQYDVQQG
-EwJCUjEaMBgGA1UEAxMRc2hpYmJvbGV0aC51bmIuYnIwggEiMA0GCSqGSIb3DQEB
-AQUAA4IBDwAwggEKAoIBAQDzc4RTYqDqObR8seN1H6eMRfhielgf2cd7of8T2n9h
-LZV6lakR193gP0qRj+SaZUNaDwoiPoDs4jH8C8a901DmE6QoTMDjg6LL+97swZb4
-lCsZRs5V4qIRNjQZ6nF3rgsEs/oNONQwTq0AQKIorYG5zC4oibwwwjYFan7oOszi
-MeohgrdZWl/bhlsEwWOlDaOpKlFxXYtHXskOSbf+3fvZvJArgq5S7PNuG1oBxvuJ
-Xi5AzjHABYt3CziIawUtMS1dWojrnC+64WN3gf3ninVTt4k+xbqn2gZujdoAR/yn
-6JUYi3PZRU77H6xjCag+3+1kuKBx0EBFFdr85ZF8mauHAgMBAAEwDQYJKoZIhvcN
-AQEFBQADggEBAIW2/04fVCKbAv0BKaTdhj8HIG++0nmdA9PsDECgFyURwoh8M2nY
-rkViEKpFdl0s9+8wtj/cGhYVWru0g8Qm1Uo27pXElYIPgU4hm3988VopipwDT2DY
-xsxk+MdoP6KTRtSNJNKFMbuPYj/jr7n7MFJYiWgvOvZ/n/o4RSRHrGhOYVuYNeyn
-/ejprsKScl7RnhMg5dtMXt9qeGgIWW/heVImJJzDURNdsF4sDHD4qKhf3pDNRhHn
-99zu7PASZZerAxI9xXpDiD+of+jaX+uI2/zzap1sMVtlaInMICk/Sa1CL2tBGzY8
-MSmJeH91lUYBcieZYDOgno6WAgr1VoZ8Baw=
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.unb.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.unb.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.unb.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.unb.br/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.unb.br/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.unb.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">unb.br</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-      
-MIID1jCCAr4CAQAwDQYJKoZIhvcNAQEFBQAwgbAxJzAlBgNVBAoTHlVOQiAtIFVu
-aXZlcnNpZGFkZSBkZSBCcmFzaWxpYTEMMAoGA1UECxMDQ1BEMSAwHgYJKoZIhvcN
-AQkBFhFkaW9uaXNpb2pyQHVuYi5icjERMA8GA1UEBxMIQnJhc2lsaWExGTAXBgNV
-BAgTEERpc3RyaXRvIEZlZGVyYWwxCzAJBgNVBAYTAkJSMRowGAYDVQQDExFzaGli
-Ym9sZXRoLnVuYi5icjAeFw0xNDA3MDEyMTUxMjJaFw0xNzA2MzAyMTUxMjJaMIGw
-MScwJQYDVQQKEx5VTkIgLSBVbml2ZXJzaWRhZGUgZGUgQnJhc2lsaWExDDAKBgNV
-BAsTA0NQRDEgMB4GCSqGSIb3DQEJARYRZGlvbmlzaW9qckB1bmIuYnIxETAPBgNV
-BAcTCEJyYXNpbGlhMRkwFwYDVQQIExBEaXN0cml0byBGZWRlcmFsMQswCQYDVQQG
-EwJCUjEaMBgGA1UEAxMRc2hpYmJvbGV0aC51bmIuYnIwggEiMA0GCSqGSIb3DQEB
-AQUAA4IBDwAwggEKAoIBAQDzc4RTYqDqObR8seN1H6eMRfhielgf2cd7of8T2n9h
-LZV6lakR193gP0qRj+SaZUNaDwoiPoDs4jH8C8a901DmE6QoTMDjg6LL+97swZb4
-lCsZRs5V4qIRNjQZ6nF3rgsEs/oNONQwTq0AQKIorYG5zC4oibwwwjYFan7oOszi
-MeohgrdZWl/bhlsEwWOlDaOpKlFxXYtHXskOSbf+3fvZvJArgq5S7PNuG1oBxvuJ
-Xi5AzjHABYt3CziIawUtMS1dWojrnC+64WN3gf3ninVTt4k+xbqn2gZujdoAR/yn
-6JUYi3PZRU77H6xjCag+3+1kuKBx0EBFFdr85ZF8mauHAgMBAAEwDQYJKoZIhvcN
-AQEFBQADggEBAIW2/04fVCKbAv0BKaTdhj8HIG++0nmdA9PsDECgFyURwoh8M2nY
-rkViEKpFdl0s9+8wtj/cGhYVWru0g8Qm1Uo27pXElYIPgU4hm3988VopipwDT2DY
-xsxk+MdoP6KTRtSNJNKFMbuPYj/jr7n7MFJYiWgvOvZ/n/o4RSRHrGhOYVuYNeyn
-/ejprsKScl7RnhMg5dtMXt9qeGgIWW/heVImJJzDURNdsF4sDHD4qKhf3pDNRhHn
-99zu7PASZZerAxI9xXpDiD+of+jaX+uI2/zzap1sMVtlaInMICk/Sa1CL2tBGzY8
-MSmJeH91lUYBcieZYDOgno6WAgr1VoZ8Baw=
-                    
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.unb.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.unb.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">UNB - Universidade de Brasilia</OrganizationName>
-    <OrganizationName xml:lang="pt-br">UNB - Universidade de Brasilia</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">UNB - Universidade de Brasilia</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="pt-br">UNB - Universidade de Brasilia</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.unb.br/</OrganizationURL>
-    <OrganizationURL xml:lang="pt-br">http://www.unb.br/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Dionisio Miziara</SurName>
-    <EmailAddress>dionisiojr@unb.br</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.unifi.it-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.unifi.it-idp-shibboleth.xml
deleted file mode 100644
index f33bcb43..00000000
--- a/swamid-interfederations-2.0/shibboleth.unifi.it-idp-shibboleth.xml
+++ /dev/null
@@ -1,101 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" entityID="https://shibboleth.unifi.it/idp/shibboleth">
-  <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>
-  </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">unifi.it</shibmd:Scope>
-      <mdui:UIInfo>
-        <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>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDLDCCAhSgAwIBAgIJAPWvhnhnIM07MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE3NoaWJib2xldGgudW5pZmkuaXQwHhcNMTEwNTA5MTI0MTMyWhcNMzEwNTA5
-MTI0MTMyWjAeMRwwGgYDVQQDExNzaGliYm9sZXRoLnVuaWZpLml0MIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAlTYplVQaIDgOLjhY6W0ysUneVOsAhdD3
-nKOLZC6NO1CFlFB8gINO2i+SkTVkhQ2jFAjq9XXb9WBsqx2Ta4skroyM1I039R6z
-HVFAmtib4Ea8spGXhg87OnxiPaXijJ81d6ka3At+g0VQYJ5w7jC/cuRaT4sk3scc
-eiQlViLn1kdcUYyXQo54gtwBjEoNvlPfF/S9ljdyo/yU7/oz4SQrDuYThqV+xXCM
-4ZTRt0gWcEAdd+d3mpfohNrEuGptbVoD6gpBkG9ytl/UVnKpkd32JDWLxeDDNOQz
-H+PWA1KbjR2aM//87u7rq9WBgjufjwYzTT4nulbzl/Mur+eyUFF80QIDAQABo20w
-azBKBgNVHREEQzBBghNzaGliYm9sZXRoLnVuaWZpLml0hipodHRwczovL3NoaWJi
-b2xldGgudW5pZmkuaXQvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFHnEVLfzRW+Y
-o/M/MOvtO3S+knB3MA0GCSqGSIb3DQEBBQUAA4IBAQCM8asqBBYAnVvJXtFEfuyM
-qNAqiwomAQ1YPTPj4tD0w9EK9aMqJN4OCo/3Dy4fuHx4F9xAtWApP8cRvUswCURu
-saq1eUJ4Oay+ck1AxKl93EueGJxk46ZLUjizspod/N5U342IYKAIMTV2EZxKaLGD
-0yF4A47fZKHJSY+L0MaonVdOleDN1dsICwYbCo5xvhaV+QlW+10orfGhe+JqMm9T
-r8mC7l26BgX42zsxXS6O5cGQpu9YBa9fiL5wqhxet2xvHBI0mOekpH0+PGRvwe18
-OFmZKVHYQGnUEfIKGWoFZSeZhO9UJsWJNdRxSkDf9m71otdlbfFSJ8BqkOm3AElL
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <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"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.unifi.it: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.unifi.it/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.unifi.it/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.unifi.it/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.unifi.it/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">unifi.it</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDLDCCAhSgAwIBAgIJAPWvhnhnIM07MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE3NoaWJib2xldGgudW5pZmkuaXQwHhcNMTEwNTA5MTI0MTMyWhcNMzEwNTA5
-MTI0MTMyWjAeMRwwGgYDVQQDExNzaGliYm9sZXRoLnVuaWZpLml0MIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAlTYplVQaIDgOLjhY6W0ysUneVOsAhdD3
-nKOLZC6NO1CFlFB8gINO2i+SkTVkhQ2jFAjq9XXb9WBsqx2Ta4skroyM1I039R6z
-HVFAmtib4Ea8spGXhg87OnxiPaXijJ81d6ka3At+g0VQYJ5w7jC/cuRaT4sk3scc
-eiQlViLn1kdcUYyXQo54gtwBjEoNvlPfF/S9ljdyo/yU7/oz4SQrDuYThqV+xXCM
-4ZTRt0gWcEAdd+d3mpfohNrEuGptbVoD6gpBkG9ytl/UVnKpkd32JDWLxeDDNOQz
-H+PWA1KbjR2aM//87u7rq9WBgjufjwYzTT4nulbzl/Mur+eyUFF80QIDAQABo20w
-azBKBgNVHREEQzBBghNzaGliYm9sZXRoLnVuaWZpLml0hipodHRwczovL3NoaWJi
-b2xldGgudW5pZmkuaXQvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFHnEVLfzRW+Y
-o/M/MOvtO3S+knB3MA0GCSqGSIb3DQEBBQUAA4IBAQCM8asqBBYAnVvJXtFEfuyM
-qNAqiwomAQ1YPTPj4tD0w9EK9aMqJN4OCo/3Dy4fuHx4F9xAtWApP8cRvUswCURu
-saq1eUJ4Oay+ck1AxKl93EueGJxk46ZLUjizspod/N5U342IYKAIMTV2EZxKaLGD
-0yF4A47fZKHJSY+L0MaonVdOleDN1dsICwYbCo5xvhaV+QlW+10orfGhe+JqMm9T
-r8mC7l26BgX42zsxXS6O5cGQpu9YBa9fiL5wqhxet2xvHBI0mOekpH0+PGRvwe18
-OFmZKVHYQGnUEfIKGWoFZSeZhO9UJsWJNdRxSkDf9m71otdlbfFSJ8BqkOm3AElL
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.unifi.it:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.unifi.it: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">University of Studies of Florence</OrganizationName>
-    <OrganizationName xml:lang="it">Università degli Studi di Firenze</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Florence</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="it">Università di Firenze</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.unifi.it</OrganizationURL>
-    <OrganizationURL xml:lang="it">http://www.unifi.it</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <EmailAddress>idem@unifi.it.it</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.unifi.it.xml b/swamid-interfederations-2.0/shibboleth.unifi.it.xml
deleted file mode 100644
index f33bcb43..00000000
--- a/swamid-interfederations-2.0/shibboleth.unifi.it.xml
+++ /dev/null
@@ -1,101 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" entityID="https://shibboleth.unifi.it/idp/shibboleth">
-  <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>
-  </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">unifi.it</shibmd:Scope>
-      <mdui:UIInfo>
-        <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>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDLDCCAhSgAwIBAgIJAPWvhnhnIM07MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE3NoaWJib2xldGgudW5pZmkuaXQwHhcNMTEwNTA5MTI0MTMyWhcNMzEwNTA5
-MTI0MTMyWjAeMRwwGgYDVQQDExNzaGliYm9sZXRoLnVuaWZpLml0MIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAlTYplVQaIDgOLjhY6W0ysUneVOsAhdD3
-nKOLZC6NO1CFlFB8gINO2i+SkTVkhQ2jFAjq9XXb9WBsqx2Ta4skroyM1I039R6z
-HVFAmtib4Ea8spGXhg87OnxiPaXijJ81d6ka3At+g0VQYJ5w7jC/cuRaT4sk3scc
-eiQlViLn1kdcUYyXQo54gtwBjEoNvlPfF/S9ljdyo/yU7/oz4SQrDuYThqV+xXCM
-4ZTRt0gWcEAdd+d3mpfohNrEuGptbVoD6gpBkG9ytl/UVnKpkd32JDWLxeDDNOQz
-H+PWA1KbjR2aM//87u7rq9WBgjufjwYzTT4nulbzl/Mur+eyUFF80QIDAQABo20w
-azBKBgNVHREEQzBBghNzaGliYm9sZXRoLnVuaWZpLml0hipodHRwczovL3NoaWJi
-b2xldGgudW5pZmkuaXQvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFHnEVLfzRW+Y
-o/M/MOvtO3S+knB3MA0GCSqGSIb3DQEBBQUAA4IBAQCM8asqBBYAnVvJXtFEfuyM
-qNAqiwomAQ1YPTPj4tD0w9EK9aMqJN4OCo/3Dy4fuHx4F9xAtWApP8cRvUswCURu
-saq1eUJ4Oay+ck1AxKl93EueGJxk46ZLUjizspod/N5U342IYKAIMTV2EZxKaLGD
-0yF4A47fZKHJSY+L0MaonVdOleDN1dsICwYbCo5xvhaV+QlW+10orfGhe+JqMm9T
-r8mC7l26BgX42zsxXS6O5cGQpu9YBa9fiL5wqhxet2xvHBI0mOekpH0+PGRvwe18
-OFmZKVHYQGnUEfIKGWoFZSeZhO9UJsWJNdRxSkDf9m71otdlbfFSJ8BqkOm3AElL
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <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"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.unifi.it: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.unifi.it/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.unifi.it/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.unifi.it/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.unifi.it/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">unifi.it</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDLDCCAhSgAwIBAgIJAPWvhnhnIM07MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE3NoaWJib2xldGgudW5pZmkuaXQwHhcNMTEwNTA5MTI0MTMyWhcNMzEwNTA5
-MTI0MTMyWjAeMRwwGgYDVQQDExNzaGliYm9sZXRoLnVuaWZpLml0MIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAlTYplVQaIDgOLjhY6W0ysUneVOsAhdD3
-nKOLZC6NO1CFlFB8gINO2i+SkTVkhQ2jFAjq9XXb9WBsqx2Ta4skroyM1I039R6z
-HVFAmtib4Ea8spGXhg87OnxiPaXijJ81d6ka3At+g0VQYJ5w7jC/cuRaT4sk3scc
-eiQlViLn1kdcUYyXQo54gtwBjEoNvlPfF/S9ljdyo/yU7/oz4SQrDuYThqV+xXCM
-4ZTRt0gWcEAdd+d3mpfohNrEuGptbVoD6gpBkG9ytl/UVnKpkd32JDWLxeDDNOQz
-H+PWA1KbjR2aM//87u7rq9WBgjufjwYzTT4nulbzl/Mur+eyUFF80QIDAQABo20w
-azBKBgNVHREEQzBBghNzaGliYm9sZXRoLnVuaWZpLml0hipodHRwczovL3NoaWJi
-b2xldGgudW5pZmkuaXQvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFHnEVLfzRW+Y
-o/M/MOvtO3S+knB3MA0GCSqGSIb3DQEBBQUAA4IBAQCM8asqBBYAnVvJXtFEfuyM
-qNAqiwomAQ1YPTPj4tD0w9EK9aMqJN4OCo/3Dy4fuHx4F9xAtWApP8cRvUswCURu
-saq1eUJ4Oay+ck1AxKl93EueGJxk46ZLUjizspod/N5U342IYKAIMTV2EZxKaLGD
-0yF4A47fZKHJSY+L0MaonVdOleDN1dsICwYbCo5xvhaV+QlW+10orfGhe+JqMm9T
-r8mC7l26BgX42zsxXS6O5cGQpu9YBa9fiL5wqhxet2xvHBI0mOekpH0+PGRvwe18
-OFmZKVHYQGnUEfIKGWoFZSeZhO9UJsWJNdRxSkDf9m71otdlbfFSJ8BqkOm3AElL
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.unifi.it:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.unifi.it: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">University of Studies of Florence</OrganizationName>
-    <OrganizationName xml:lang="it">Università degli Studi di Firenze</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Florence</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="it">Università di Firenze</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.unifi.it</OrganizationURL>
-    <OrganizationURL xml:lang="it">http://www.unifi.it</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <EmailAddress>idem@unifi.it.it</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.univ-corse.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.univ-corse.fr-idp-shibboleth.xml
deleted file mode 100644
index 206b969d..00000000
--- a/swamid-interfederations-2.0/shibboleth.univ-corse.fr-idp-shibboleth.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.univ-corse.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2010-06-24T18:11:52Z">
-      <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">univ-corse.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">Université de Corse</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDSzCCAjOgAwIBAgIUMl8XYihMN+c1fr7Z/kwhIqchZ14wDQYJKoZIhvcNAQEF
-BQAwIzEhMB8GA1UEAxMYc2hpYmJvbGV0aC51bml2LWNvcnNlLmZyMB4XDTEwMDUy
-MDA4MjIyOFoXDTMwMDUyMDA4MjIyOFowIzEhMB8GA1UEAxMYc2hpYmJvbGV0aC51
-bml2LWNvcnNlLmZyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAmBAW
-WcnpElNR57uUh2Eb7CEy5InpGkloYXu6jUpiZGV/vIM+dB0n2n/gWLLy5G2ME0Om
-clCBmVWG3uDMNZZyC6EBiEoBWbyj6Af93eEOscjfXXSMWgg0Atmyh84/HZWemhM3
-od2NXDRgHRpJ8ZjZ0VcQE4YNjh7kk5yDaFIoHPqpVK5ItNpZfk1nQ6gYHTsuAe9z
-6UDYE/fXOqF2+TO3Q+XG8+aRjcf0g+y2PaZnv8eSJGRYG3412oJEG4MggFmsAWkc
-lCLEiyMk325+7/8tKY5n/Rnd7jCuLEAqZMo2R/PlwbUO7kf5tcRoWaoKeBtjeweP
-LoIqXeXDkYQB93Q+MQIDAQABo3cwdTBUBgNVHREETTBLghhzaGliYm9sZXRoLnVu
-aXYtY29yc2UuZnKGL2h0dHBzOi8vc2hpYmJvbGV0aC51bml2LWNvcnNlLmZyL2lk
-cC9zaGliYm9sZXRoMB0GA1UdDgQWBBStZw7/ALbTOYIUU68SwgUXNM+5LTANBgkq
-hkiG9w0BAQUFAAOCAQEAjzOt2lHyqGXgYtxbu8D4aCdJfCgT9dKcN3zfZLJKUUBk
-w5QRiOoz4AKj/QWqYucmWu4KElu6J8GDKsAblw5IGkMto1Pf+hIogTgqSXaFd9/O
-tu/fwQ4sWsVZIl8MeC735h6C+NK4d3cCB+0fHRJFZ4mriZG9tGHmUHFB4rqn27JK
-nrsOwXXTta43x7OixVk4T30ALeIRWw9GjwssjHOBI6BvXI36tEM4mjdV6TBP13Qv
-ajnfP3xyXWF0/SRe0vvOEqDioR1lKpoeqvINaa5O4u60VsqOFPoZPmNxASoOnnz8
-T9heLa0GVnNgDEgGzmeVmC1UCkmkhz0s325gEEfxAg==
-					    </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.univ-corse.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.univ-corse.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.univ-corse.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">univ-corse.fr</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDSzCCAjOgAwIBAgIUMl8XYihMN+c1fr7Z/kwhIqchZ14wDQYJKoZIhvcNAQEF
-BQAwIzEhMB8GA1UEAxMYc2hpYmJvbGV0aC51bml2LWNvcnNlLmZyMB4XDTEwMDUy
-MDA4MjIyOFoXDTMwMDUyMDA4MjIyOFowIzEhMB8GA1UEAxMYc2hpYmJvbGV0aC51
-bml2LWNvcnNlLmZyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAmBAW
-WcnpElNR57uUh2Eb7CEy5InpGkloYXu6jUpiZGV/vIM+dB0n2n/gWLLy5G2ME0Om
-clCBmVWG3uDMNZZyC6EBiEoBWbyj6Af93eEOscjfXXSMWgg0Atmyh84/HZWemhM3
-od2NXDRgHRpJ8ZjZ0VcQE4YNjh7kk5yDaFIoHPqpVK5ItNpZfk1nQ6gYHTsuAe9z
-6UDYE/fXOqF2+TO3Q+XG8+aRjcf0g+y2PaZnv8eSJGRYG3412oJEG4MggFmsAWkc
-lCLEiyMk325+7/8tKY5n/Rnd7jCuLEAqZMo2R/PlwbUO7kf5tcRoWaoKeBtjeweP
-LoIqXeXDkYQB93Q+MQIDAQABo3cwdTBUBgNVHREETTBLghhzaGliYm9sZXRoLnVu
-aXYtY29yc2UuZnKGL2h0dHBzOi8vc2hpYmJvbGV0aC51bml2LWNvcnNlLmZyL2lk
-cC9zaGliYm9sZXRoMB0GA1UdDgQWBBStZw7/ALbTOYIUU68SwgUXNM+5LTANBgkq
-hkiG9w0BAQUFAAOCAQEAjzOt2lHyqGXgYtxbu8D4aCdJfCgT9dKcN3zfZLJKUUBk
-w5QRiOoz4AKj/QWqYucmWu4KElu6J8GDKsAblw5IGkMto1Pf+hIogTgqSXaFd9/O
-tu/fwQ4sWsVZIl8MeC735h6C+NK4d3cCB+0fHRJFZ4mriZG9tGHmUHFB4rqn27JK
-nrsOwXXTta43x7OixVk4T30ALeIRWw9GjwssjHOBI6BvXI36tEM4mjdV6TBP13Qv
-ajnfP3xyXWF0/SRe0vvOEqDioR1lKpoeqvINaa5O4u60VsqOFPoZPmNxASoOnnz8
-T9heLa0GVnNgDEgGzmeVmC1UCkmkhz0s325gEEfxAg==
-					    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.univ-corse.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">Université de Corse</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Université de Corse</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>VAREILLE</SurName>
-    <EmailAddress>vareille@univ-corse.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.univ-corse.fr.xml b/swamid-interfederations-2.0/shibboleth.univ-corse.fr.xml
deleted file mode 100644
index 206b969d..00000000
--- a/swamid-interfederations-2.0/shibboleth.univ-corse.fr.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.univ-corse.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2010-06-24T18:11:52Z">
-      <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">univ-corse.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">Université de Corse</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDSzCCAjOgAwIBAgIUMl8XYihMN+c1fr7Z/kwhIqchZ14wDQYJKoZIhvcNAQEF
-BQAwIzEhMB8GA1UEAxMYc2hpYmJvbGV0aC51bml2LWNvcnNlLmZyMB4XDTEwMDUy
-MDA4MjIyOFoXDTMwMDUyMDA4MjIyOFowIzEhMB8GA1UEAxMYc2hpYmJvbGV0aC51
-bml2LWNvcnNlLmZyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAmBAW
-WcnpElNR57uUh2Eb7CEy5InpGkloYXu6jUpiZGV/vIM+dB0n2n/gWLLy5G2ME0Om
-clCBmVWG3uDMNZZyC6EBiEoBWbyj6Af93eEOscjfXXSMWgg0Atmyh84/HZWemhM3
-od2NXDRgHRpJ8ZjZ0VcQE4YNjh7kk5yDaFIoHPqpVK5ItNpZfk1nQ6gYHTsuAe9z
-6UDYE/fXOqF2+TO3Q+XG8+aRjcf0g+y2PaZnv8eSJGRYG3412oJEG4MggFmsAWkc
-lCLEiyMk325+7/8tKY5n/Rnd7jCuLEAqZMo2R/PlwbUO7kf5tcRoWaoKeBtjeweP
-LoIqXeXDkYQB93Q+MQIDAQABo3cwdTBUBgNVHREETTBLghhzaGliYm9sZXRoLnVu
-aXYtY29yc2UuZnKGL2h0dHBzOi8vc2hpYmJvbGV0aC51bml2LWNvcnNlLmZyL2lk
-cC9zaGliYm9sZXRoMB0GA1UdDgQWBBStZw7/ALbTOYIUU68SwgUXNM+5LTANBgkq
-hkiG9w0BAQUFAAOCAQEAjzOt2lHyqGXgYtxbu8D4aCdJfCgT9dKcN3zfZLJKUUBk
-w5QRiOoz4AKj/QWqYucmWu4KElu6J8GDKsAblw5IGkMto1Pf+hIogTgqSXaFd9/O
-tu/fwQ4sWsVZIl8MeC735h6C+NK4d3cCB+0fHRJFZ4mriZG9tGHmUHFB4rqn27JK
-nrsOwXXTta43x7OixVk4T30ALeIRWw9GjwssjHOBI6BvXI36tEM4mjdV6TBP13Qv
-ajnfP3xyXWF0/SRe0vvOEqDioR1lKpoeqvINaa5O4u60VsqOFPoZPmNxASoOnnz8
-T9heLa0GVnNgDEgGzmeVmC1UCkmkhz0s325gEEfxAg==
-					    </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.univ-corse.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.univ-corse.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.univ-corse.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">univ-corse.fr</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDSzCCAjOgAwIBAgIUMl8XYihMN+c1fr7Z/kwhIqchZ14wDQYJKoZIhvcNAQEF
-BQAwIzEhMB8GA1UEAxMYc2hpYmJvbGV0aC51bml2LWNvcnNlLmZyMB4XDTEwMDUy
-MDA4MjIyOFoXDTMwMDUyMDA4MjIyOFowIzEhMB8GA1UEAxMYc2hpYmJvbGV0aC51
-bml2LWNvcnNlLmZyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAmBAW
-WcnpElNR57uUh2Eb7CEy5InpGkloYXu6jUpiZGV/vIM+dB0n2n/gWLLy5G2ME0Om
-clCBmVWG3uDMNZZyC6EBiEoBWbyj6Af93eEOscjfXXSMWgg0Atmyh84/HZWemhM3
-od2NXDRgHRpJ8ZjZ0VcQE4YNjh7kk5yDaFIoHPqpVK5ItNpZfk1nQ6gYHTsuAe9z
-6UDYE/fXOqF2+TO3Q+XG8+aRjcf0g+y2PaZnv8eSJGRYG3412oJEG4MggFmsAWkc
-lCLEiyMk325+7/8tKY5n/Rnd7jCuLEAqZMo2R/PlwbUO7kf5tcRoWaoKeBtjeweP
-LoIqXeXDkYQB93Q+MQIDAQABo3cwdTBUBgNVHREETTBLghhzaGliYm9sZXRoLnVu
-aXYtY29yc2UuZnKGL2h0dHBzOi8vc2hpYmJvbGV0aC51bml2LWNvcnNlLmZyL2lk
-cC9zaGliYm9sZXRoMB0GA1UdDgQWBBStZw7/ALbTOYIUU68SwgUXNM+5LTANBgkq
-hkiG9w0BAQUFAAOCAQEAjzOt2lHyqGXgYtxbu8D4aCdJfCgT9dKcN3zfZLJKUUBk
-w5QRiOoz4AKj/QWqYucmWu4KElu6J8GDKsAblw5IGkMto1Pf+hIogTgqSXaFd9/O
-tu/fwQ4sWsVZIl8MeC735h6C+NK4d3cCB+0fHRJFZ4mriZG9tGHmUHFB4rqn27JK
-nrsOwXXTta43x7OixVk4T30ALeIRWw9GjwssjHOBI6BvXI36tEM4mjdV6TBP13Qv
-ajnfP3xyXWF0/SRe0vvOEqDioR1lKpoeqvINaa5O4u60VsqOFPoZPmNxASoOnnz8
-T9heLa0GVnNgDEgGzmeVmC1UCkmkhz0s325gEEfxAg==
-					    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.univ-corse.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">Université de Corse</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Université de Corse</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>VAREILLE</SurName>
-    <EmailAddress>vareille@univ-corse.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.univ-evry.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.univ-evry.fr-idp-shibboleth.xml
deleted file mode 100644
index 57df4e38..00000000
--- a/swamid-interfederations-2.0/shibboleth.univ-evry.fr-idp-shibboleth.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://shibboleth.univ-evry.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2011-01-21T11:14:33Z">
-      <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">univ-evry.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">Université d'Evry Val d'Essonne</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDRzCCAi+gAwIBAgIUAq2mpKTxqh6qstX6eHwrmooVbmMwDQYJKoZIhvcNAQEF
-BQAwIjEgMB4GA1UEAxMXc2hpYmJvbGV0aC51bml2LWV2cnkuZnIwHhcNMTAwOTI0
-MTA0OTA0WhcNMzAwOTI0MTA0OTA0WjAiMSAwHgYDVQQDExdzaGliYm9sZXRoLnVu
-aXYtZXZyeS5mcjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJp52EEk
-t5jLp2Fdl+FW8WxlusVfSKNpnmDCk08OeoWrF+6oxlfGzRxK87iUGawBhHx9Q3Iv
-pDyxfCBr6Cl8uLD1B881s1HF79T5iNeNS42MwGCjYxDmnDK1Jc1DcNDP8e5wfvBL
-2fT8WSjajtOOy+KXFltTsIcoenaCLcPb3l3EBpxmQQdgLwWb886kExL6oeYXxtXs
-DlTo6jzVCtFRxw9JMx7DaaxlPGHLBkGuUjYV6HJ1lX9N9lKzLt5C8QP+zlvaNj4l
-l4NWnvoxZ6b6tmB8A3yOv6YJNZmJEztCWr5szNuLIHV1Ps//jinag738uxQVsH2b
-gYAkC5aLCdheVnMCAwEAAaN1MHMwUgYDVR0RBEswSYIXc2hpYmJvbGV0aC51bml2
-LWV2cnkuZnKGLmh0dHBzOi8vc2hpYmJvbGV0aC51bml2LWV2cnkuZnIvaWRwL3No
-aWJib2xldGgwHQYDVR0OBBYEFEWCfI5AXn3/RakH6dnpRYDa2t9VMA0GCSqGSIb3
-DQEBBQUAA4IBAQBLNO5vu0/3c4pxRULtvx6c/OUQQQcjiPraIvVQVrnEb24aGKs7
-pIHGnk3VnyPaieODwif5KDUqQc3fkG0tXIUVshI4aRzopVL4qFDfwi7KbpDS6nUC
-cRyZSJ4Xp6SYPhadkK49sLSe9lf5tdcn8Kr6EpAL3uvQx45HdtzV9CI1KS8nI/ZE
-+pvpXfptS9ZSrvsEz2SP9KjeEzSWiBTfCmGkKVxTPTiq/Qrg9Ceeoep8sj39Dh6Z
-2Y95aiTAmI2kjFbS4s2bZHjk/0TsYmOB8H6X+Ily18J3+xTfqvBw3c/inBzx1NT+
-21YW2cnfO+jzg5ZJqmB5D1PP001cJMAoHwV3
-					    </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.univ-evry.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.univ-evry.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.univ-evry.fr/idp/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Université d'Evry Val d'Essonne</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Université d'Evry Val d'Essonne</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <EmailAddress>assistance-reseau@univ-evry.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.univ-evry.fr.xml b/swamid-interfederations-2.0/shibboleth.univ-evry.fr.xml
deleted file mode 100644
index 57df4e38..00000000
--- a/swamid-interfederations-2.0/shibboleth.univ-evry.fr.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://shibboleth.univ-evry.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2011-01-21T11:14:33Z">
-      <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">univ-evry.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">Université d'Evry Val d'Essonne</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDRzCCAi+gAwIBAgIUAq2mpKTxqh6qstX6eHwrmooVbmMwDQYJKoZIhvcNAQEF
-BQAwIjEgMB4GA1UEAxMXc2hpYmJvbGV0aC51bml2LWV2cnkuZnIwHhcNMTAwOTI0
-MTA0OTA0WhcNMzAwOTI0MTA0OTA0WjAiMSAwHgYDVQQDExdzaGliYm9sZXRoLnVu
-aXYtZXZyeS5mcjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJp52EEk
-t5jLp2Fdl+FW8WxlusVfSKNpnmDCk08OeoWrF+6oxlfGzRxK87iUGawBhHx9Q3Iv
-pDyxfCBr6Cl8uLD1B881s1HF79T5iNeNS42MwGCjYxDmnDK1Jc1DcNDP8e5wfvBL
-2fT8WSjajtOOy+KXFltTsIcoenaCLcPb3l3EBpxmQQdgLwWb886kExL6oeYXxtXs
-DlTo6jzVCtFRxw9JMx7DaaxlPGHLBkGuUjYV6HJ1lX9N9lKzLt5C8QP+zlvaNj4l
-l4NWnvoxZ6b6tmB8A3yOv6YJNZmJEztCWr5szNuLIHV1Ps//jinag738uxQVsH2b
-gYAkC5aLCdheVnMCAwEAAaN1MHMwUgYDVR0RBEswSYIXc2hpYmJvbGV0aC51bml2
-LWV2cnkuZnKGLmh0dHBzOi8vc2hpYmJvbGV0aC51bml2LWV2cnkuZnIvaWRwL3No
-aWJib2xldGgwHQYDVR0OBBYEFEWCfI5AXn3/RakH6dnpRYDa2t9VMA0GCSqGSIb3
-DQEBBQUAA4IBAQBLNO5vu0/3c4pxRULtvx6c/OUQQQcjiPraIvVQVrnEb24aGKs7
-pIHGnk3VnyPaieODwif5KDUqQc3fkG0tXIUVshI4aRzopVL4qFDfwi7KbpDS6nUC
-cRyZSJ4Xp6SYPhadkK49sLSe9lf5tdcn8Kr6EpAL3uvQx45HdtzV9CI1KS8nI/ZE
-+pvpXfptS9ZSrvsEz2SP9KjeEzSWiBTfCmGkKVxTPTiq/Qrg9Ceeoep8sj39Dh6Z
-2Y95aiTAmI2kjFbS4s2bZHjk/0TsYmOB8H6X+Ily18J3+xTfqvBw3c/inBzx1NT+
-21YW2cnfO+jzg5ZJqmB5D1PP001cJMAoHwV3
-					    </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.univ-evry.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.univ-evry.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.univ-evry.fr/idp/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Université d'Evry Val d'Essonne</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Université d'Evry Val d'Essonne</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <EmailAddress>assistance-reseau@univ-evry.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.univ-paris-est.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.univ-paris-est.fr-idp-shibboleth.xml
deleted file mode 100644
index fccb0c47..00000000
--- a/swamid-interfederations-2.0/shibboleth.univ-paris-est.fr-idp-shibboleth.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.univ-paris-est.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2012-07-10T14:34:50Z">
-      <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">univ-paris-est.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">Université Paris - Est</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDXDCCAkSgAwIBAgIVAN+DxU7o62WL7i36RkN6D6PRm0jqMA0GCSqGSIb3DQEB
-BQUAMCcxJTAjBgNVBAMTHHNoaWJib2xldGgudW5pdi1wYXJpcy1lc3QuZnIwHhcN
-MTIwNzA0MDcyMjAwWhcNMzIwNzA0MDcyMjAwWjAnMSUwIwYDVQQDExxzaGliYm9s
-ZXRoLnVuaXYtcGFyaXMtZXN0LmZyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
-CgKCAQEAkrTsAnTcBP9CxCVbjCyA74Nl/zSOMm1L3Iy6DHDAKHvDdpj+RwrrhmQW
-sFBn6HqmSkCe6uO+7NwWfCIF5h0PdvRFNCfAQNLv6k5d3PU6Ala8gIKrUuviQUul
-AMd2JsGoVhbUB2ieQFWn8CrBkjFbvuLBd4Dlgmiw/mveqwiLapzmi/CRHcHQOSiP
-eDl7p9bUXfpYkJN0974ptVB6phGMyVWpW1q1n61W/xN84NCOCeo0yMNqGRkhJfyN
-hrczmA5QFL3QF11imB3Y6kHZFkBRSSr0B+0FvKjxgfej3C7P0KWNmeYPPHxhYKmx
-G0Sii5++F5IdUiLgpA5b6SHVLrDHiwIDAQABo38wfTBcBgNVHREEVTBTghxzaGli
-Ym9sZXRoLnVuaXYtcGFyaXMtZXN0LmZyhjNodHRwczovL3NoaWJib2xldGgudW5p
-di1wYXJpcy1lc3QuZnIvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFCmKWcbQVqe7
-UnO+QpVcDdKOFRGzMA0GCSqGSIb3DQEBBQUAA4IBAQAEQTnWIsJCaKZp8hJvMkwp
-3TBuf0rF8MvQlF2zAXb6ZsWLl41tEYZxFOFMny0GR7JjfWQqKWr7Db/R13e6xFiy
-vlRibUEZS3cR/1TtOEj7PqttNuZrWJVAgBzAHHgJPyWz9C3Q8d474YVHwJsYCDIY
-mGObSSmyOTQAKqFYYNbPW0Y9X2jSWjS5D7JLhA6jECosQiFU212cSyCShHilp75V
-7qS8dXivDDTgSLzSTzOlPKj3qgR+6mmDYClqCaJe2iFfSMBCbk2aspn8+6hQceM4
-W1qZBfNF1cOpL5ceUG8MFu0NLSbSyFh+3TSWBJKFl6Ml3PqAQcMvfXRZ3QVZ+sWR
-					    </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.univ-paris-est.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.univ-paris-est.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.univ-paris-est.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">univ-paris-est.fr</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDXDCCAkSgAwIBAgIVAN+DxU7o62WL7i36RkN6D6PRm0jqMA0GCSqGSIb3DQEB
-BQUAMCcxJTAjBgNVBAMTHHNoaWJib2xldGgudW5pdi1wYXJpcy1lc3QuZnIwHhcN
-MTIwNzA0MDcyMjAwWhcNMzIwNzA0MDcyMjAwWjAnMSUwIwYDVQQDExxzaGliYm9s
-ZXRoLnVuaXYtcGFyaXMtZXN0LmZyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
-CgKCAQEAkrTsAnTcBP9CxCVbjCyA74Nl/zSOMm1L3Iy6DHDAKHvDdpj+RwrrhmQW
-sFBn6HqmSkCe6uO+7NwWfCIF5h0PdvRFNCfAQNLv6k5d3PU6Ala8gIKrUuviQUul
-AMd2JsGoVhbUB2ieQFWn8CrBkjFbvuLBd4Dlgmiw/mveqwiLapzmi/CRHcHQOSiP
-eDl7p9bUXfpYkJN0974ptVB6phGMyVWpW1q1n61W/xN84NCOCeo0yMNqGRkhJfyN
-hrczmA5QFL3QF11imB3Y6kHZFkBRSSr0B+0FvKjxgfej3C7P0KWNmeYPPHxhYKmx
-G0Sii5++F5IdUiLgpA5b6SHVLrDHiwIDAQABo38wfTBcBgNVHREEVTBTghxzaGli
-Ym9sZXRoLnVuaXYtcGFyaXMtZXN0LmZyhjNodHRwczovL3NoaWJib2xldGgudW5p
-di1wYXJpcy1lc3QuZnIvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFCmKWcbQVqe7
-UnO+QpVcDdKOFRGzMA0GCSqGSIb3DQEBBQUAA4IBAQAEQTnWIsJCaKZp8hJvMkwp
-3TBuf0rF8MvQlF2zAXb6ZsWLl41tEYZxFOFMny0GR7JjfWQqKWr7Db/R13e6xFiy
-vlRibUEZS3cR/1TtOEj7PqttNuZrWJVAgBzAHHgJPyWz9C3Q8d474YVHwJsYCDIY
-mGObSSmyOTQAKqFYYNbPW0Y9X2jSWjS5D7JLhA6jECosQiFU212cSyCShHilp75V
-7qS8dXivDDTgSLzSTzOlPKj3qgR+6mmDYClqCaJe2iFfSMBCbk2aspn8+6hQceM4
-W1qZBfNF1cOpL5ceUG8MFu0NLSbSyFh+3TSWBJKFl6Ml3PqAQcMvfXRZ3QVZ+sWR
-					    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.univ-paris-est.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">Université Paris - Est</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Université Paris - Est</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <EmailAddress>systeme-information@univ-paris-est.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.univ-paris-est.fr.xml b/swamid-interfederations-2.0/shibboleth.univ-paris-est.fr.xml
deleted file mode 100644
index fccb0c47..00000000
--- a/swamid-interfederations-2.0/shibboleth.univ-paris-est.fr.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.univ-paris-est.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2012-07-10T14:34:50Z">
-      <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">univ-paris-est.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">Université Paris - Est</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDXDCCAkSgAwIBAgIVAN+DxU7o62WL7i36RkN6D6PRm0jqMA0GCSqGSIb3DQEB
-BQUAMCcxJTAjBgNVBAMTHHNoaWJib2xldGgudW5pdi1wYXJpcy1lc3QuZnIwHhcN
-MTIwNzA0MDcyMjAwWhcNMzIwNzA0MDcyMjAwWjAnMSUwIwYDVQQDExxzaGliYm9s
-ZXRoLnVuaXYtcGFyaXMtZXN0LmZyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
-CgKCAQEAkrTsAnTcBP9CxCVbjCyA74Nl/zSOMm1L3Iy6DHDAKHvDdpj+RwrrhmQW
-sFBn6HqmSkCe6uO+7NwWfCIF5h0PdvRFNCfAQNLv6k5d3PU6Ala8gIKrUuviQUul
-AMd2JsGoVhbUB2ieQFWn8CrBkjFbvuLBd4Dlgmiw/mveqwiLapzmi/CRHcHQOSiP
-eDl7p9bUXfpYkJN0974ptVB6phGMyVWpW1q1n61W/xN84NCOCeo0yMNqGRkhJfyN
-hrczmA5QFL3QF11imB3Y6kHZFkBRSSr0B+0FvKjxgfej3C7P0KWNmeYPPHxhYKmx
-G0Sii5++F5IdUiLgpA5b6SHVLrDHiwIDAQABo38wfTBcBgNVHREEVTBTghxzaGli
-Ym9sZXRoLnVuaXYtcGFyaXMtZXN0LmZyhjNodHRwczovL3NoaWJib2xldGgudW5p
-di1wYXJpcy1lc3QuZnIvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFCmKWcbQVqe7
-UnO+QpVcDdKOFRGzMA0GCSqGSIb3DQEBBQUAA4IBAQAEQTnWIsJCaKZp8hJvMkwp
-3TBuf0rF8MvQlF2zAXb6ZsWLl41tEYZxFOFMny0GR7JjfWQqKWr7Db/R13e6xFiy
-vlRibUEZS3cR/1TtOEj7PqttNuZrWJVAgBzAHHgJPyWz9C3Q8d474YVHwJsYCDIY
-mGObSSmyOTQAKqFYYNbPW0Y9X2jSWjS5D7JLhA6jECosQiFU212cSyCShHilp75V
-7qS8dXivDDTgSLzSTzOlPKj3qgR+6mmDYClqCaJe2iFfSMBCbk2aspn8+6hQceM4
-W1qZBfNF1cOpL5ceUG8MFu0NLSbSyFh+3TSWBJKFl6Ml3PqAQcMvfXRZ3QVZ+sWR
-					    </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.univ-paris-est.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.univ-paris-est.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.univ-paris-est.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">univ-paris-est.fr</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDXDCCAkSgAwIBAgIVAN+DxU7o62WL7i36RkN6D6PRm0jqMA0GCSqGSIb3DQEB
-BQUAMCcxJTAjBgNVBAMTHHNoaWJib2xldGgudW5pdi1wYXJpcy1lc3QuZnIwHhcN
-MTIwNzA0MDcyMjAwWhcNMzIwNzA0MDcyMjAwWjAnMSUwIwYDVQQDExxzaGliYm9s
-ZXRoLnVuaXYtcGFyaXMtZXN0LmZyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
-CgKCAQEAkrTsAnTcBP9CxCVbjCyA74Nl/zSOMm1L3Iy6DHDAKHvDdpj+RwrrhmQW
-sFBn6HqmSkCe6uO+7NwWfCIF5h0PdvRFNCfAQNLv6k5d3PU6Ala8gIKrUuviQUul
-AMd2JsGoVhbUB2ieQFWn8CrBkjFbvuLBd4Dlgmiw/mveqwiLapzmi/CRHcHQOSiP
-eDl7p9bUXfpYkJN0974ptVB6phGMyVWpW1q1n61W/xN84NCOCeo0yMNqGRkhJfyN
-hrczmA5QFL3QF11imB3Y6kHZFkBRSSr0B+0FvKjxgfej3C7P0KWNmeYPPHxhYKmx
-G0Sii5++F5IdUiLgpA5b6SHVLrDHiwIDAQABo38wfTBcBgNVHREEVTBTghxzaGli
-Ym9sZXRoLnVuaXYtcGFyaXMtZXN0LmZyhjNodHRwczovL3NoaWJib2xldGgudW5p
-di1wYXJpcy1lc3QuZnIvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFCmKWcbQVqe7
-UnO+QpVcDdKOFRGzMA0GCSqGSIb3DQEBBQUAA4IBAQAEQTnWIsJCaKZp8hJvMkwp
-3TBuf0rF8MvQlF2zAXb6ZsWLl41tEYZxFOFMny0GR7JjfWQqKWr7Db/R13e6xFiy
-vlRibUEZS3cR/1TtOEj7PqttNuZrWJVAgBzAHHgJPyWz9C3Q8d474YVHwJsYCDIY
-mGObSSmyOTQAKqFYYNbPW0Y9X2jSWjS5D7JLhA6jECosQiFU212cSyCShHilp75V
-7qS8dXivDDTgSLzSTzOlPKj3qgR+6mmDYClqCaJe2iFfSMBCbk2aspn8+6hQceM4
-W1qZBfNF1cOpL5ceUG8MFu0NLSbSyFh+3TSWBJKFl6Ml3PqAQcMvfXRZ3QVZ+sWR
-					    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.univ-paris-est.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">Université Paris - Est</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Université Paris - Est</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <EmailAddress>systeme-information@univ-paris-est.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.univ-savoie.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.univ-savoie.fr-idp-shibboleth.xml
deleted file mode 100644
index ef0b1a20..00000000
--- a/swamid-interfederations-2.0/shibboleth.univ-savoie.fr-idp-shibboleth.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://shibboleth.univ-savoie.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2009-09-18T11:18:18Z">
-      <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">univ-savoie.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">Université de Savoie</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDUDCCAjigAwIBAgIVAOCN4YQhvq5Sv3vtQso0xMZI5ttnMA0GCSqGSIb3DQEB
-BQUAMCQxIjAgBgNVBAMTGXNoaWJib2xldGgudW5pdi1zYXZvaWUuZnIwHhcNMTIw
-NjA4MTMzMzIwWhcNMzIwNjA4MTMzMzIwWjAkMSIwIAYDVQQDExlzaGliYm9sZXRo
-LnVuaXYtc2F2b2llLmZyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
-h/Lp4hxtoYybi7jGd4Kz/DRgpdKdfRE4OAoYzhejo67XVyQxHXgR02HodAroX54a
-WePk5fNovnQn/IhGFCVKrvLpoRVc3LB6CpGdkTRsK7ytoM27mHHIEjw8WkA72Zpp
-YcuxyVqHmXkrOM8o2BO6gB9LHscMcAyym7mJViKP3UX0qeur6qkSV57jFMm58lXx
-3QneHV4QC7LAu0up9dg8JBFR24fiUxWWMQW52dN2akzDZAnlpUuk6tXs8jtKOlCm
-ijyb4lC5d8BjytJrND/L80FtToFb+kN1/Lzo8/Z33dgQiYCt1UDI2ow4ffzRhK98
-zHOY3ut2l9pNlnF/qa0cbwIDAQABo3kwdzBWBgNVHREETzBNghlzaGliYm9sZXRo
-LnVuaXYtc2F2b2llLmZyhjBodHRwczovL3NoaWJib2xldGgudW5pdi1zYXZvaWUu
-ZnIvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFDrclfWLO3Mi8ua3uUmtjqaKn6m+
-MA0GCSqGSIb3DQEBBQUAA4IBAQBztZW6PM4sJs6GEjKLjErybGaVbFCR8tTaTR9e
-q7xDCH4hgSYf9y0QhZnd2vjWqEwjNNr3CDz+pv1KYwBMq/suwisliWgW38vdF+Cs
-GYwkdO6IyIRgwJ9ZViYwzYsSSA4SYQ/dfLBG2iJyB/22gMjA7xW385fbWt3JbMFK
-W9owxoUf+fPjvX5Ty7b119CywDW9VRH4Z8S28n4nzg7uMhsFlS7O8tp2/37N8erp
-+NlgMF1DgA8x2HmDU9K2W+cDxSf7STvLM+4I767LY4lCR6E6/w4SyobMV6/H5bWY
-fRpaYtLzzvazSNT3CXWP0kJT5+P6Ck0s8cpcMlV7frEEnL4u
-					    </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.univ-savoie.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.univ-savoie.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.univ-savoie.fr/idp/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Université de Savoie</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Université de Savoie</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <EmailAddress>admin@univ-savoie.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.univ-savoie.fr.xml b/swamid-interfederations-2.0/shibboleth.univ-savoie.fr.xml
deleted file mode 100644
index ef0b1a20..00000000
--- a/swamid-interfederations-2.0/shibboleth.univ-savoie.fr.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://shibboleth.univ-savoie.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2009-09-18T11:18:18Z">
-      <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">univ-savoie.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">Université de Savoie</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDUDCCAjigAwIBAgIVAOCN4YQhvq5Sv3vtQso0xMZI5ttnMA0GCSqGSIb3DQEB
-BQUAMCQxIjAgBgNVBAMTGXNoaWJib2xldGgudW5pdi1zYXZvaWUuZnIwHhcNMTIw
-NjA4MTMzMzIwWhcNMzIwNjA4MTMzMzIwWjAkMSIwIAYDVQQDExlzaGliYm9sZXRo
-LnVuaXYtc2F2b2llLmZyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
-h/Lp4hxtoYybi7jGd4Kz/DRgpdKdfRE4OAoYzhejo67XVyQxHXgR02HodAroX54a
-WePk5fNovnQn/IhGFCVKrvLpoRVc3LB6CpGdkTRsK7ytoM27mHHIEjw8WkA72Zpp
-YcuxyVqHmXkrOM8o2BO6gB9LHscMcAyym7mJViKP3UX0qeur6qkSV57jFMm58lXx
-3QneHV4QC7LAu0up9dg8JBFR24fiUxWWMQW52dN2akzDZAnlpUuk6tXs8jtKOlCm
-ijyb4lC5d8BjytJrND/L80FtToFb+kN1/Lzo8/Z33dgQiYCt1UDI2ow4ffzRhK98
-zHOY3ut2l9pNlnF/qa0cbwIDAQABo3kwdzBWBgNVHREETzBNghlzaGliYm9sZXRo
-LnVuaXYtc2F2b2llLmZyhjBodHRwczovL3NoaWJib2xldGgudW5pdi1zYXZvaWUu
-ZnIvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFDrclfWLO3Mi8ua3uUmtjqaKn6m+
-MA0GCSqGSIb3DQEBBQUAA4IBAQBztZW6PM4sJs6GEjKLjErybGaVbFCR8tTaTR9e
-q7xDCH4hgSYf9y0QhZnd2vjWqEwjNNr3CDz+pv1KYwBMq/suwisliWgW38vdF+Cs
-GYwkdO6IyIRgwJ9ZViYwzYsSSA4SYQ/dfLBG2iJyB/22gMjA7xW385fbWt3JbMFK
-W9owxoUf+fPjvX5Ty7b119CywDW9VRH4Z8S28n4nzg7uMhsFlS7O8tp2/37N8erp
-+NlgMF1DgA8x2HmDU9K2W+cDxSf7STvLM+4I767LY4lCR6E6/w4SyobMV6/H5bWY
-fRpaYtLzzvazSNT3CXWP0kJT5+P6Ck0s8cpcMlV7frEEnL4u
-					    </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.univ-savoie.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.univ-savoie.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.univ-savoie.fr/idp/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Université de Savoie</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Université de Savoie</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <EmailAddress>admin@univ-savoie.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.univ-toulouse.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.univ-toulouse.fr-idp-shibboleth.xml
deleted file mode 100644
index 827d4de5..00000000
--- a/swamid-interfederations-2.0/shibboleth.univ-toulouse.fr-idp-shibboleth.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://shibboleth.univ-toulouse.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2012-09-14T11:10:03Z">
-      <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">univ-toulouse.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">Université de Toulouse</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDVzCCAj+gAwIBAgIUbiBTqjVuFrpcZlYOFXAV5Gkjxo8wDQYJKoZIhvcNAQEF
-BQAwJjEkMCIGA1UEAxMbc2hpYmJvbGV0aC51bml2LXRvdWxvdXNlLmZyMB4XDTEy
-MDgwNjE2NTI0N1oXDTMyMDgwNjE2NTI0N1owJjEkMCIGA1UEAxMbc2hpYmJvbGV0
-aC51bml2LXRvdWxvdXNlLmZyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
-AQEAy9KO/R6+ULM1wnOCGj+j9i8QL0T6U+HG5hoKcK1H0MfUcyukRBVXLp6ICeqx
-JUifD3xjbZ+AcDD6TJZcCpXCXejQmadrl9DxQWd3M6mkeRqVR7gtoeOqRocQRcja
-JYBlzh7psgNLX7uET4uXmz38rVBO3NpIYLQuG65wKlZTMTPSxMQogcvWSRbIQ0RE
-xnDLfrumHYiM7KWM5GVzLUHXglDDOMBNjOG1xZuxa5ohFZbkSpIcEChQZrY6ZTkN
-1i6n3tC/8kq53YfTmvv99TB1RmjXPgZMnJFX4Ed36zodJhr+Jynxt6IYVsA93qu/
-N79fk1dZrKa15JEJQKLZarhexQIDAQABo30wezBaBgNVHREEUzBRghtzaGliYm9s
-ZXRoLnVuaXYtdG91bG91c2UuZnKGMmh0dHBzOi8vc2hpYmJvbGV0aC51bml2LXRv
-dWxvdXNlLmZyL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBQbAAEzAb1fawuGZY3z
-jqchRx7fNzANBgkqhkiG9w0BAQUFAAOCAQEARouJ8loz83h+XBcCZsj1ZaEe0pxi
-xtvXJu+V9ujSNcSp4VtpiNUgUhDcgb7vk5q/gpafgTgA4bae7lPLB1qbTnxKNl7u
-OKips5hzSQ3IQ9KA5YKG90c07/lhogp1lk0ZOLnamioOF2ZqY4KqinKXEQe2GA9K
-ykLtdZM1agwtBCF0oC1/pxxPnc64MVixLBqcv0jrEi/MYJ2PcJdkKIj8QqNMj16y
-lY+k+YG78HJpawe6Y8VBsKAiFC/7p9UQhk6FjOQnD2TEEsjnevVyUeSeYq8Ynufz
-neQ3fY40PFNPR6xq43ajr4n5p9AGffHU08Hrm9fRk2HrJ4vmcYIEPXAICw==
-					    </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.univ-toulouse.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.univ-toulouse.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.univ-toulouse.fr/idp/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Université de Toulouse</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Université de Toulouse</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Francis DELBOS</SurName>
-    <EmailAddress>francis.delbos@univ-toulouse.fr</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <SurName>Boris VALERA</SurName>
-    <EmailAddress>boris.valera@univ-toulouse.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.univ-toulouse.fr.xml b/swamid-interfederations-2.0/shibboleth.univ-toulouse.fr.xml
deleted file mode 100644
index 827d4de5..00000000
--- a/swamid-interfederations-2.0/shibboleth.univ-toulouse.fr.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://shibboleth.univ-toulouse.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2012-09-14T11:10:03Z">
-      <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">univ-toulouse.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">Université de Toulouse</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDVzCCAj+gAwIBAgIUbiBTqjVuFrpcZlYOFXAV5Gkjxo8wDQYJKoZIhvcNAQEF
-BQAwJjEkMCIGA1UEAxMbc2hpYmJvbGV0aC51bml2LXRvdWxvdXNlLmZyMB4XDTEy
-MDgwNjE2NTI0N1oXDTMyMDgwNjE2NTI0N1owJjEkMCIGA1UEAxMbc2hpYmJvbGV0
-aC51bml2LXRvdWxvdXNlLmZyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
-AQEAy9KO/R6+ULM1wnOCGj+j9i8QL0T6U+HG5hoKcK1H0MfUcyukRBVXLp6ICeqx
-JUifD3xjbZ+AcDD6TJZcCpXCXejQmadrl9DxQWd3M6mkeRqVR7gtoeOqRocQRcja
-JYBlzh7psgNLX7uET4uXmz38rVBO3NpIYLQuG65wKlZTMTPSxMQogcvWSRbIQ0RE
-xnDLfrumHYiM7KWM5GVzLUHXglDDOMBNjOG1xZuxa5ohFZbkSpIcEChQZrY6ZTkN
-1i6n3tC/8kq53YfTmvv99TB1RmjXPgZMnJFX4Ed36zodJhr+Jynxt6IYVsA93qu/
-N79fk1dZrKa15JEJQKLZarhexQIDAQABo30wezBaBgNVHREEUzBRghtzaGliYm9s
-ZXRoLnVuaXYtdG91bG91c2UuZnKGMmh0dHBzOi8vc2hpYmJvbGV0aC51bml2LXRv
-dWxvdXNlLmZyL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBQbAAEzAb1fawuGZY3z
-jqchRx7fNzANBgkqhkiG9w0BAQUFAAOCAQEARouJ8loz83h+XBcCZsj1ZaEe0pxi
-xtvXJu+V9ujSNcSp4VtpiNUgUhDcgb7vk5q/gpafgTgA4bae7lPLB1qbTnxKNl7u
-OKips5hzSQ3IQ9KA5YKG90c07/lhogp1lk0ZOLnamioOF2ZqY4KqinKXEQe2GA9K
-ykLtdZM1agwtBCF0oC1/pxxPnc64MVixLBqcv0jrEi/MYJ2PcJdkKIj8QqNMj16y
-lY+k+YG78HJpawe6Y8VBsKAiFC/7p9UQhk6FjOQnD2TEEsjnevVyUeSeYq8Ynufz
-neQ3fY40PFNPR6xq43ajr4n5p9AGffHU08Hrm9fRk2HrJ4vmcYIEPXAICw==
-					    </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.univ-toulouse.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.univ-toulouse.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.univ-toulouse.fr/idp/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Université de Toulouse</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Université de Toulouse</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Francis DELBOS</SurName>
-    <EmailAddress>francis.delbos@univ-toulouse.fr</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <SurName>Boris VALERA</SurName>
-    <EmailAddress>boris.valera@univ-toulouse.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.upmf-grenoble.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.upmf-grenoble.fr-idp-shibboleth.xml
deleted file mode 100644
index ca952660..00000000
--- a/swamid-interfederations-2.0/shibboleth.upmf-grenoble.fr-idp-shibboleth.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.upmf-grenoble.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2012-11-07T16:44:49Z">
-      <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">upmf-grenoble.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Grenoble 2 University - UPMF</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Staff and students of Grenoble 2 University</mdui:Description>
-        <mdui:DisplayName xml:lang="fr">Université de Grenoble 2 UPMF</mdui:DisplayName>
-        <mdui:Description xml:lang="fr">Personnels et étudiants de l’université Grenoble 2</mdui:Description>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDVzCCAj+gAwIBAgIUO1f61l32R6TuA6rB5vgAXHLdHFMwDQYJKoZIhvcNAQEF
-BQAwJjEkMCIGA1UEAxMbc2hpYmJvbGV0aC51cG1mLWdyZW5vYmxlLmZyMB4XDTEy
-MDYwNjEzNTYxMVoXDTMyMDYwNjEzNTYxMVowJjEkMCIGA1UEAxMbc2hpYmJvbGV0
-aC51cG1mLWdyZW5vYmxlLmZyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
-AQEApxQzW/bnlgZAvW5YGo5kkUHGQ7kmIH68l7JQJs/lpKGiFJ9J1dker2NpZAeM
-O4DXoPky5GYaLIUW7gB+rwV5rn/xdPcHXEoM6fk4Fo+UdAvAoCfy5+td7H2Vh9FN
-W01HShLqyP6L1t2wNRYYybSn6d1Bn8fmifPaj70AwpTjnIPcfzfoLJQ7cZ2FEiIs
-wncAb2WGIwUpVWff/i8tPFQFb17+DB9iZJZcuBNNutR+XL8ieEqKn1iRMFOacs0m
-lH5g4Upv5s2V+43DJY08+KhNT4ZTAuPDeeduHsR6xWaPJXMr1zIE8kojoI7xWVfi
-ueki9ESCMgGRdo1gxHvSAr0hZQIDAQABo30wezBaBgNVHREEUzBRghtzaGliYm9s
-ZXRoLnVwbWYtZ3Jlbm9ibGUuZnKGMmh0dHBzOi8vc2hpYmJvbGV0aC51cG1mLWdy
-ZW5vYmxlLmZyL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBS7nbtER24yD2pjgXdT
-K9fyXANcdTANBgkqhkiG9w0BAQUFAAOCAQEAWC0ENJVG41ftYyD19+p0d1Ij0kfQ
-Xz86gMzPL/738R1fdrfgDG33nm95lR98v0+MrxwANS7ah9173mxGFY+otLFCwMdb
-5A8+SFx3HTdJmCyiQ0cE7KcWKp2H7t+Y/9rpF9YCw2DQ9SjsdmqdPHnmrNlYBtQN
-7TXRykcIk9vJpCtq5G265MQ9fVkvutx0dFmhkwIB03HwX91V7EQyKFPS7BsMfu50
-i4Rso8QVUsjhRyUPu+LGdANROT8v+NgRL9ef7xDu4VdjMUHJKqxjQ+ahQdEu7+Lb
-zZ6QCFpB0/4tW9KCEPrLa+D/keEg+5vWKfMF+e5TMX4H4d2MW4in6HfySw==
-					    </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.upmf-grenoble.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.upmf-grenoble.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.upmf-grenoble.fr/idp/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Université de Grenoble 2 UPMF</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Université de Grenoble 2 UPMF</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <EmailAddress>sysadm-dsiu2@upmf-grenoble.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.upmf-grenoble.fr.xml b/swamid-interfederations-2.0/shibboleth.upmf-grenoble.fr.xml
deleted file mode 100644
index ca952660..00000000
--- a/swamid-interfederations-2.0/shibboleth.upmf-grenoble.fr.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.upmf-grenoble.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2012-11-07T16:44:49Z">
-      <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">upmf-grenoble.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Grenoble 2 University - UPMF</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Staff and students of Grenoble 2 University</mdui:Description>
-        <mdui:DisplayName xml:lang="fr">Université de Grenoble 2 UPMF</mdui:DisplayName>
-        <mdui:Description xml:lang="fr">Personnels et étudiants de l’université Grenoble 2</mdui:Description>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDVzCCAj+gAwIBAgIUO1f61l32R6TuA6rB5vgAXHLdHFMwDQYJKoZIhvcNAQEF
-BQAwJjEkMCIGA1UEAxMbc2hpYmJvbGV0aC51cG1mLWdyZW5vYmxlLmZyMB4XDTEy
-MDYwNjEzNTYxMVoXDTMyMDYwNjEzNTYxMVowJjEkMCIGA1UEAxMbc2hpYmJvbGV0
-aC51cG1mLWdyZW5vYmxlLmZyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
-AQEApxQzW/bnlgZAvW5YGo5kkUHGQ7kmIH68l7JQJs/lpKGiFJ9J1dker2NpZAeM
-O4DXoPky5GYaLIUW7gB+rwV5rn/xdPcHXEoM6fk4Fo+UdAvAoCfy5+td7H2Vh9FN
-W01HShLqyP6L1t2wNRYYybSn6d1Bn8fmifPaj70AwpTjnIPcfzfoLJQ7cZ2FEiIs
-wncAb2WGIwUpVWff/i8tPFQFb17+DB9iZJZcuBNNutR+XL8ieEqKn1iRMFOacs0m
-lH5g4Upv5s2V+43DJY08+KhNT4ZTAuPDeeduHsR6xWaPJXMr1zIE8kojoI7xWVfi
-ueki9ESCMgGRdo1gxHvSAr0hZQIDAQABo30wezBaBgNVHREEUzBRghtzaGliYm9s
-ZXRoLnVwbWYtZ3Jlbm9ibGUuZnKGMmh0dHBzOi8vc2hpYmJvbGV0aC51cG1mLWdy
-ZW5vYmxlLmZyL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBS7nbtER24yD2pjgXdT
-K9fyXANcdTANBgkqhkiG9w0BAQUFAAOCAQEAWC0ENJVG41ftYyD19+p0d1Ij0kfQ
-Xz86gMzPL/738R1fdrfgDG33nm95lR98v0+MrxwANS7ah9173mxGFY+otLFCwMdb
-5A8+SFx3HTdJmCyiQ0cE7KcWKp2H7t+Y/9rpF9YCw2DQ9SjsdmqdPHnmrNlYBtQN
-7TXRykcIk9vJpCtq5G265MQ9fVkvutx0dFmhkwIB03HwX91V7EQyKFPS7BsMfu50
-i4Rso8QVUsjhRyUPu+LGdANROT8v+NgRL9ef7xDu4VdjMUHJKqxjQ+ahQdEu7+Lb
-zZ6QCFpB0/4tW9KCEPrLa+D/keEg+5vWKfMF+e5TMX4H4d2MW4in6HfySw==
-					    </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.upmf-grenoble.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.upmf-grenoble.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.upmf-grenoble.fr/idp/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Université de Grenoble 2 UPMF</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Université de Grenoble 2 UPMF</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <EmailAddress>sysadm-dsiu2@upmf-grenoble.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.ups-tlse.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.ups-tlse.fr-idp-shibboleth.xml
deleted file mode 100644
index a5fbdb29..00000000
--- a/swamid-interfederations-2.0/shibboleth.ups-tlse.fr-idp-shibboleth.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://shibboleth.ups-tlse.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2009-07-17T08:21:29Z">
-      <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">univ-tlse3.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">Université de Toulouse 3 - Paul Sabatier</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDQzCCAiugAwIBAgIUdyy5eL0UrTjscSSpJnKojdThIJcwDQYJKoZIhvcNAQEF
-BQAwITEfMB0GA1UEAxMWc2hpYmJvbGV0aC51cHMtdGxzZS5mcjAeFw0wOTA1MTkw
-NzIzMTNaFw0yOTA1MTkwNzIzMTNaMCExHzAdBgNVBAMTFnNoaWJib2xldGgudXBz
-LXRsc2UuZnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCDSYueWm19
-K3YtiKE5xRc4CKFGp/aYCA+JIcqXXK7+ky65enp2ObjeYDf2MOcHyiRCNW122y5p
-Ek4UXqWk+tagZ2WOGTszb2Rw7WCWIM7Z+bCfwjtTplv3DEFgj+gCAo6nIBbTSLmt
-sCjT95ZxCXxADhXzfjnrrOls7ySgGLQc5yd/lvnlF5l+EDM8uXqoQtfpxuAhFTUE
-aXJwSqvV4uEX7eyTJQuYcXerMP0BxURRTKayufMqAs6cIxck8DS28b5x0nnt3zTL
-JcVsc19rxk7AQT5eSGMQLmdq+FQh6hFX0AMo06/7Qd0z1cTWSXNN8LXD+tTDsHAj
-vPvpa1SpFyjdAgMBAAGjczBxMFAGA1UdEQRJMEeCFnNoaWJib2xldGgudXBzLXRs
-c2UuZnKGLWh0dHBzOi8vc2hpYmJvbGV0aC51cHMtdGxzZS5mci9pZHAvc2hpYmJv
-bGV0aDAdBgNVHQ4EFgQUnJKnH/FGOsBSsn6uVbMZZ0wO/IYwDQYJKoZIhvcNAQEF
-BQADggEBABgI82Q35fXOPU4JxpA1zRehoH8Y70OZmtDy+OxfoYZ8HHBO1ZXtlFJ6
-rSQtUHvPKR8VUZy8/Z4D5/FncTTLf/LOhisWHk/BOXJNV3KfOE8aVcQAZd2BzQtf
-396ZSsY0HBdgsEGBoWxuZcUeiaI4wzomtE4OfXRngBccgd6580JerqmON7fLytQK
-m12tRjMzKjY4oPO8ILrjLxIiigbNF5fYfMsWVQFMBHW6wVlBDpuxKmeZTu/TwuqB
-8RPESGgN651QtWiUBwk7Na2WAVQvgcmEwr0BZ+vYq8mymtwQiaXGGY1y51ANm3Lf
-qveDyh76C64hnLr9Jvlv1+E5QP2YPgo=
-					    </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.ups-tlse.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.ups-tlse.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.ups-tlse.fr/idp/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Université de Toulouse 3 - Paul Sabatier</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Université de Toulouse 3 - Paul Sabatier</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Christophe Marteau</SurName>
-    <EmailAddress>christophe.marteau@univ-tlse3.fr</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <SurName>Pole enseignement-recherche</SurName>
-    <EmailAddress>dsrt.ger@univ-tlse3.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.ups-tlse.fr.xml b/swamid-interfederations-2.0/shibboleth.ups-tlse.fr.xml
deleted file mode 100644
index a5fbdb29..00000000
--- a/swamid-interfederations-2.0/shibboleth.ups-tlse.fr.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://shibboleth.ups-tlse.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2009-07-17T08:21:29Z">
-      <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">univ-tlse3.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">Université de Toulouse 3 - Paul Sabatier</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDQzCCAiugAwIBAgIUdyy5eL0UrTjscSSpJnKojdThIJcwDQYJKoZIhvcNAQEF
-BQAwITEfMB0GA1UEAxMWc2hpYmJvbGV0aC51cHMtdGxzZS5mcjAeFw0wOTA1MTkw
-NzIzMTNaFw0yOTA1MTkwNzIzMTNaMCExHzAdBgNVBAMTFnNoaWJib2xldGgudXBz
-LXRsc2UuZnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCDSYueWm19
-K3YtiKE5xRc4CKFGp/aYCA+JIcqXXK7+ky65enp2ObjeYDf2MOcHyiRCNW122y5p
-Ek4UXqWk+tagZ2WOGTszb2Rw7WCWIM7Z+bCfwjtTplv3DEFgj+gCAo6nIBbTSLmt
-sCjT95ZxCXxADhXzfjnrrOls7ySgGLQc5yd/lvnlF5l+EDM8uXqoQtfpxuAhFTUE
-aXJwSqvV4uEX7eyTJQuYcXerMP0BxURRTKayufMqAs6cIxck8DS28b5x0nnt3zTL
-JcVsc19rxk7AQT5eSGMQLmdq+FQh6hFX0AMo06/7Qd0z1cTWSXNN8LXD+tTDsHAj
-vPvpa1SpFyjdAgMBAAGjczBxMFAGA1UdEQRJMEeCFnNoaWJib2xldGgudXBzLXRs
-c2UuZnKGLWh0dHBzOi8vc2hpYmJvbGV0aC51cHMtdGxzZS5mci9pZHAvc2hpYmJv
-bGV0aDAdBgNVHQ4EFgQUnJKnH/FGOsBSsn6uVbMZZ0wO/IYwDQYJKoZIhvcNAQEF
-BQADggEBABgI82Q35fXOPU4JxpA1zRehoH8Y70OZmtDy+OxfoYZ8HHBO1ZXtlFJ6
-rSQtUHvPKR8VUZy8/Z4D5/FncTTLf/LOhisWHk/BOXJNV3KfOE8aVcQAZd2BzQtf
-396ZSsY0HBdgsEGBoWxuZcUeiaI4wzomtE4OfXRngBccgd6580JerqmON7fLytQK
-m12tRjMzKjY4oPO8ILrjLxIiigbNF5fYfMsWVQFMBHW6wVlBDpuxKmeZTu/TwuqB
-8RPESGgN651QtWiUBwk7Na2WAVQvgcmEwr0BZ+vYq8mymtwQiaXGGY1y51ANm3Lf
-qveDyh76C64hnLr9Jvlv1+E5QP2YPgo=
-					    </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.ups-tlse.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.ups-tlse.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.ups-tlse.fr/idp/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Université de Toulouse 3 - Paul Sabatier</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Université de Toulouse 3 - Paul Sabatier</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Christophe Marteau</SurName>
-    <EmailAddress>christophe.marteau@univ-tlse3.fr</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <SurName>Pole enseignement-recherche</SurName>
-    <EmailAddress>dsrt.ger@univ-tlse3.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.utb.cz-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.utb.cz-idp-shibboleth.xml
deleted file mode 100644
index dfea2da6..00000000
--- a/swamid-interfederations-2.0/shibboleth.utb.cz-idp-shibboleth.xml
+++ /dev/null
@@ -1,122 +0,0 @@
-<?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">
-  <md:Extensions xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata">
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/" registrationInstant="2013-12-19T16:42:51Z">
-      <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>
-    <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://eduid.cz/uri/idp-group/university</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md: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/shibboleth.utb.cz.xml b/swamid-interfederations-2.0/shibboleth.utb.cz.xml
deleted file mode 100644
index dfea2da6..00000000
--- a/swamid-interfederations-2.0/shibboleth.utb.cz.xml
+++ /dev/null
@@ -1,122 +0,0 @@
-<?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">
-  <md:Extensions xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata">
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/" registrationInstant="2013-12-19T16:42:51Z">
-      <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>
-    <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://eduid.cz/uri/idp-group/university</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md: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/shibboleth.uvsq.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.uvsq.fr-idp-shibboleth.xml
deleted file mode 100644
index 1c57c813..00000000
--- a/swamid-interfederations-2.0/shibboleth.uvsq.fr-idp-shibboleth.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://shibboleth.uvsq.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2010-10-06T11:23:23Z">
-      <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">uvsq.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">Université de Versailles - Saint Quentin en Yvelines</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDMzCCAhugAwIBAgIUMO6BFdwk5alVPNeSspXonkZTWeswDQYJKoZIhvcNAQEF
-BQAwHTEbMBkGA1UEAxMSc2hpYmJvbGV0aC51dnNxLmZyMB4XDTEwMTAwNTExMTQw
-MFoXDTMwMTAwNTExMTQwMFowHTEbMBkGA1UEAxMSc2hpYmJvbGV0aC51dnNxLmZy
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAo1ZxxeymEkqEnXapufkc
-UEfhQXv/1iuIwtD+7rcxG6+QJsAM7h+3U6UqmJ76/c2xkkMT2+87E+TYUD2ISZh+
-ByajOxOeXJZJAZ+o/pHg4AZy1x+DyNJEweOARipGh4TqWeaUPNCtGzriVmfv5dBp
-FX3/eh7hLNSUFfOldVWuU2NLV9uWK0XHMIvT89/X3O7wNYI9nPT4vuJMyWkqpAIP
-TBykD3LFDNyIBzhtVoStJ7/uOAX4L52obU3j3HkuM9uac67pB/7b8FJzRdOHsP+K
-gxhGIPmFO19IelN8PegCSi3yZy6m3bikydI+SJo5ib8Gq8HKYUcg7SrP+T0NI+M8
-LQIDAQABo2swaTBIBgNVHREEQTA/ghJzaGliYm9sZXRoLnV2c3EuZnKGKWh0dHBz
-Oi8vc2hpYmJvbGV0aC51dnNxLmZyL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBTg
-inmoBiTrLzklizIwevMDHFTLfzANBgkqhkiG9w0BAQUFAAOCAQEAY4zjJzGjeWdX
-Mgqsoi30wmKnJFY3nwC2pdPnlwgMxP7PRVG8hmNTNjT3Jo5h5HmTQIPa1RhoCIXw
-2FUL8mMkEfxUsXwvn+H5GzmplenZxF2600TSFmx0Ic0+gd3TJCgJcB9N6CrkR1S/
-C1FLA1wgCxeTsi+KmGq0JNFvQAHIBwG6SwwHuCVWY97C3gaBpILCbZoeJw31Niw5
-5qJF/OGV6Pk7AkhK7ZMH0ptOIL2qiUmkUl4x5nU0Dk81rzc5tQVzHUIUfnzAtayv
-Xyjj+EyUPnVwCMYCUqwr0lvRau6V0YBulvWeViv9Q8PvP3NHklMpriikJOkRxueN
-cJdVGhbkcQ==
-					    </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.uvsq.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.uvsq.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.uvsq.fr/idp/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Université de Versailles - Saint Quentin en Yvelines</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Université de Versailles - Saint Quentin en Yvelines</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <EmailAddress>sysadm@cri.uvsq.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.uvsq.fr.xml b/swamid-interfederations-2.0/shibboleth.uvsq.fr.xml
deleted file mode 100644
index 1c57c813..00000000
--- a/swamid-interfederations-2.0/shibboleth.uvsq.fr.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://shibboleth.uvsq.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2010-10-06T11:23:23Z">
-      <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">uvsq.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">Université de Versailles - Saint Quentin en Yvelines</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDMzCCAhugAwIBAgIUMO6BFdwk5alVPNeSspXonkZTWeswDQYJKoZIhvcNAQEF
-BQAwHTEbMBkGA1UEAxMSc2hpYmJvbGV0aC51dnNxLmZyMB4XDTEwMTAwNTExMTQw
-MFoXDTMwMTAwNTExMTQwMFowHTEbMBkGA1UEAxMSc2hpYmJvbGV0aC51dnNxLmZy
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAo1ZxxeymEkqEnXapufkc
-UEfhQXv/1iuIwtD+7rcxG6+QJsAM7h+3U6UqmJ76/c2xkkMT2+87E+TYUD2ISZh+
-ByajOxOeXJZJAZ+o/pHg4AZy1x+DyNJEweOARipGh4TqWeaUPNCtGzriVmfv5dBp
-FX3/eh7hLNSUFfOldVWuU2NLV9uWK0XHMIvT89/X3O7wNYI9nPT4vuJMyWkqpAIP
-TBykD3LFDNyIBzhtVoStJ7/uOAX4L52obU3j3HkuM9uac67pB/7b8FJzRdOHsP+K
-gxhGIPmFO19IelN8PegCSi3yZy6m3bikydI+SJo5ib8Gq8HKYUcg7SrP+T0NI+M8
-LQIDAQABo2swaTBIBgNVHREEQTA/ghJzaGliYm9sZXRoLnV2c3EuZnKGKWh0dHBz
-Oi8vc2hpYmJvbGV0aC51dnNxLmZyL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBTg
-inmoBiTrLzklizIwevMDHFTLfzANBgkqhkiG9w0BAQUFAAOCAQEAY4zjJzGjeWdX
-Mgqsoi30wmKnJFY3nwC2pdPnlwgMxP7PRVG8hmNTNjT3Jo5h5HmTQIPa1RhoCIXw
-2FUL8mMkEfxUsXwvn+H5GzmplenZxF2600TSFmx0Ic0+gd3TJCgJcB9N6CrkR1S/
-C1FLA1wgCxeTsi+KmGq0JNFvQAHIBwG6SwwHuCVWY97C3gaBpILCbZoeJw31Niw5
-5qJF/OGV6Pk7AkhK7ZMH0ptOIL2qiUmkUl4x5nU0Dk81rzc5tQVzHUIUfnzAtayv
-Xyjj+EyUPnVwCMYCUqwr0lvRau6V0YBulvWeViv9Q8PvP3NHklMpriikJOkRxueN
-cJdVGhbkcQ==
-					    </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.uvsq.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.uvsq.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.uvsq.fr/idp/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Université de Versailles - Saint Quentin en Yvelines</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Université de Versailles - Saint Quentin en Yvelines</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <EmailAddress>sysadm@cri.uvsq.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth2.crous-poitiers.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth2.crous-poitiers.fr-idp-shibboleth.xml
deleted file mode 100644
index cb8afa64..00000000
--- a/swamid-interfederations-2.0/shibboleth2.crous-poitiers.fr-idp-shibboleth.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://shibboleth2.crous-poitiers.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2010-09-22T16:02:19Z">
-      <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">crous-poitiers.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">CROUS Poitiers - Personnels</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDYTCCAkmgAwIBAgIVAK1JJY+Vni1K2/Gj8TSecZ2nfA5OMA0GCSqGSIb3DQEB
-BQUAMCgxJjAkBgNVBAMTHXNoaWJib2xldGgyLmNyb3VzLXBvaXRpZXJzLmZyMB4X
-DTEwMDYxODE2MTUxOVoXDTMwMDYxODE2MTUxOVowKDEmMCQGA1UEAxMdc2hpYmJv
-bGV0aDIuY3JvdXMtcG9pdGllcnMuZnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
-ggEKAoIBAQCBCubIqgo0FUOM1f5vf5m3nQci9P++opOfsX5fmLp0bICTokfgFoOZ
-qEhQmhg/kLnibKyqKs7BqZtSJ+xaku9h7+ueSm1w2apw8QOVim+xe3ll8aymK7xb
-mdH4zW7B7Jks0zifo7e4nW4stsXfPUJOrCNXRdRET703nk6QN/Qiu17RWt88Uadu
-cGadx/AQRGeAZcYBR41LML9/U1xF1FsyuT/zdrN/fVZFnqXOrtEXxYEGRm3ozoNi
-gva/5phybzqwBnpc2SIyRpDuy902LI4WzOLkzeYtpo2lLI5WkoCsXohIMGoFAIj9
-itfNchnJBI4ECX1nJopd2qaxJUGK4uxDAgMBAAGjgYEwfzBeBgNVHREEVzBVgh1z
-aGliYm9sZXRoMi5jcm91cy1wb2l0aWVycy5mcoY0aHR0cHM6Ly9zaGliYm9sZXRo
-Mi5jcm91cy1wb2l0aWVycy5mci9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUaHXQ
-kgsbK/sw5gbIYYRKSjZpG2wwDQYJKoZIhvcNAQEFBQADggEBAGTaQjStIv9u9FoZ
-avsynkNcb346aklMcpI2DCN722bMnOEFszECCBUwEsV23E5n1n/7Axq1InKhpOiv
-T/W9JX1JkE/9aAd5z/oUz2yhhSK1LLz94CZ6UQdVnHXH7ipsHaQryVyO7b+13wcG
-v+jbjhaMv9VLvYGT+M8DiuyweuLEfE+pVHdheqAQoN7HULjW4qne/1BENMUb/vCi
-AJHK4x9hJmHdOd7vCFkzLOmJEyQFYBClzWDbakXM90jaPI8NeC6pWc+qgpYjFGTg
-txfnocW3JJnVt8ty6uqIWt0k+qkO/ogJBnOOe+Lty2s6kWKlpgPNLbT+ongZFDMt
-3IP53Xs=
-					    </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>
-					      MIIEhDCCA2ygAwIBAgIRAOyWnKD1f6FGsnPww4j9GTkwDQYJKoZIhvcNAQEFBQAw
-NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-IFNTTCBDQTAeFw0xMjA1MDcwMDAwMDBaFw0xNTA1MDcyMzU5NTlaMFExCzAJBgNV
-BAYTAkZSMRowGAYDVQQKExFDUk9VUyBERSBQT0lUSUVSUzEmMCQGA1UEAxMdc2hp
-YmJvbGV0aDIuY3JvdXMtcG9pdGllcnMuZnIwggEiMA0GCSqGSIb3DQEBAQUAA4IB
-DwAwggEKAoIBAQCq8uXwSNtArSyErjq/oG7p0QL/ln1e+IEAI95cZwsSwHhdLJqq
-tTNrReMd59N9Py1QzszFEdwbXONtL9UsvAN0vMdGP+9sZMm23iDgAQn4vf994zhR
-zhY7igRMHO9QnpfWbjrWh0f+J83FdIzWfEUAVVz9WnzSacx1qgu+t91PaQtkTXl1
-XFd1DnYSYlVayUjFFIPQVCgMzLRrXmUWK1b88qieHUxlbMoZMi3nzvYA6Wn4NDyV
-lo+qRKV6vOgax3hS3qXsnA+uLp8zsj5skPy79Los8vkPPNvNRp+relTDlRZ7mxT/
-0z6K/ro3KUlZIVTfG3ZcqBGa+QbPtIqTKLT9AgMBAAGjggFwMIIBbDAfBgNVHSME
-GDAWgBQMvZNoDPPeq6NJays3V0fqkOO57TAdBgNVHQ4EFgQUTexnzbEx0Nu56kKI
-nfaKkQfYNAEwDgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYw
-FAYIKwYBBQUHAwEGCCsGAQUFBwMCMBgGA1UdIAQRMA8wDQYLKwYBBAGyMQECAh0w
-OgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJF
-TkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8v
-Y3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYa
-aHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwKAYDVR0RBCEwH4Idc2hpYmJvbGV0
-aDIuY3JvdXMtcG9pdGllcnMuZnIwDQYJKoZIhvcNAQEFBQADggEBAH96TmpWVsZ+
-Vx9ODPTwUZzJIx1aXaIKbGGo8u2J/Oitc836gQoJUNCGsOBPRSKI39074Dy/A5Pt
-a1xkTIbU48smyqjOaP7O7ZDDGD0naX921rfxNl26srCDhP8/nSgRvltS8ngPFPzc
-9yTu7AT7ByIdmJF0oU+tOsHqW1q4swkUWXSY4miFKP3lKYAXAwnFP6W+WrggXjzZ
-bWRonNMfOHD7lQ8sKowKbLEQ5MBXk+CxZlAXtB6J3WXkoWSr6da7oZNz0YoLx/mJ
-9AS7r/BCoOea+IcvD+fob1d4AG9iMhGJVve2XR1qL22bGdoozeBgr4uLqhOUyC+a
-/H5tNLU/LA8=
-					    </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://shibboleth2.crous-poitiers.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth2.crous-poitiers.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth2.crous-poitiers.fr/idp/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">CROUS Poitiers - Personnels</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">CROUS Poitiers - Personnels</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <EmailAddress>crous.informatique@crous-poitiers.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth2.crous-poitiers.fr.xml b/swamid-interfederations-2.0/shibboleth2.crous-poitiers.fr.xml
deleted file mode 100644
index cb8afa64..00000000
--- a/swamid-interfederations-2.0/shibboleth2.crous-poitiers.fr.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://shibboleth2.crous-poitiers.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2010-09-22T16:02:19Z">
-      <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">crous-poitiers.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">CROUS Poitiers - Personnels</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDYTCCAkmgAwIBAgIVAK1JJY+Vni1K2/Gj8TSecZ2nfA5OMA0GCSqGSIb3DQEB
-BQUAMCgxJjAkBgNVBAMTHXNoaWJib2xldGgyLmNyb3VzLXBvaXRpZXJzLmZyMB4X
-DTEwMDYxODE2MTUxOVoXDTMwMDYxODE2MTUxOVowKDEmMCQGA1UEAxMdc2hpYmJv
-bGV0aDIuY3JvdXMtcG9pdGllcnMuZnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
-ggEKAoIBAQCBCubIqgo0FUOM1f5vf5m3nQci9P++opOfsX5fmLp0bICTokfgFoOZ
-qEhQmhg/kLnibKyqKs7BqZtSJ+xaku9h7+ueSm1w2apw8QOVim+xe3ll8aymK7xb
-mdH4zW7B7Jks0zifo7e4nW4stsXfPUJOrCNXRdRET703nk6QN/Qiu17RWt88Uadu
-cGadx/AQRGeAZcYBR41LML9/U1xF1FsyuT/zdrN/fVZFnqXOrtEXxYEGRm3ozoNi
-gva/5phybzqwBnpc2SIyRpDuy902LI4WzOLkzeYtpo2lLI5WkoCsXohIMGoFAIj9
-itfNchnJBI4ECX1nJopd2qaxJUGK4uxDAgMBAAGjgYEwfzBeBgNVHREEVzBVgh1z
-aGliYm9sZXRoMi5jcm91cy1wb2l0aWVycy5mcoY0aHR0cHM6Ly9zaGliYm9sZXRo
-Mi5jcm91cy1wb2l0aWVycy5mci9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUaHXQ
-kgsbK/sw5gbIYYRKSjZpG2wwDQYJKoZIhvcNAQEFBQADggEBAGTaQjStIv9u9FoZ
-avsynkNcb346aklMcpI2DCN722bMnOEFszECCBUwEsV23E5n1n/7Axq1InKhpOiv
-T/W9JX1JkE/9aAd5z/oUz2yhhSK1LLz94CZ6UQdVnHXH7ipsHaQryVyO7b+13wcG
-v+jbjhaMv9VLvYGT+M8DiuyweuLEfE+pVHdheqAQoN7HULjW4qne/1BENMUb/vCi
-AJHK4x9hJmHdOd7vCFkzLOmJEyQFYBClzWDbakXM90jaPI8NeC6pWc+qgpYjFGTg
-txfnocW3JJnVt8ty6uqIWt0k+qkO/ogJBnOOe+Lty2s6kWKlpgPNLbT+ongZFDMt
-3IP53Xs=
-					    </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>
-					      MIIEhDCCA2ygAwIBAgIRAOyWnKD1f6FGsnPww4j9GTkwDQYJKoZIhvcNAQEFBQAw
-NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-IFNTTCBDQTAeFw0xMjA1MDcwMDAwMDBaFw0xNTA1MDcyMzU5NTlaMFExCzAJBgNV
-BAYTAkZSMRowGAYDVQQKExFDUk9VUyBERSBQT0lUSUVSUzEmMCQGA1UEAxMdc2hp
-YmJvbGV0aDIuY3JvdXMtcG9pdGllcnMuZnIwggEiMA0GCSqGSIb3DQEBAQUAA4IB
-DwAwggEKAoIBAQCq8uXwSNtArSyErjq/oG7p0QL/ln1e+IEAI95cZwsSwHhdLJqq
-tTNrReMd59N9Py1QzszFEdwbXONtL9UsvAN0vMdGP+9sZMm23iDgAQn4vf994zhR
-zhY7igRMHO9QnpfWbjrWh0f+J83FdIzWfEUAVVz9WnzSacx1qgu+t91PaQtkTXl1
-XFd1DnYSYlVayUjFFIPQVCgMzLRrXmUWK1b88qieHUxlbMoZMi3nzvYA6Wn4NDyV
-lo+qRKV6vOgax3hS3qXsnA+uLp8zsj5skPy79Los8vkPPNvNRp+relTDlRZ7mxT/
-0z6K/ro3KUlZIVTfG3ZcqBGa+QbPtIqTKLT9AgMBAAGjggFwMIIBbDAfBgNVHSME
-GDAWgBQMvZNoDPPeq6NJays3V0fqkOO57TAdBgNVHQ4EFgQUTexnzbEx0Nu56kKI
-nfaKkQfYNAEwDgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYw
-FAYIKwYBBQUHAwEGCCsGAQUFBwMCMBgGA1UdIAQRMA8wDQYLKwYBBAGyMQECAh0w
-OgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJF
-TkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8v
-Y3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYa
-aHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwKAYDVR0RBCEwH4Idc2hpYmJvbGV0
-aDIuY3JvdXMtcG9pdGllcnMuZnIwDQYJKoZIhvcNAQEFBQADggEBAH96TmpWVsZ+
-Vx9ODPTwUZzJIx1aXaIKbGGo8u2J/Oitc836gQoJUNCGsOBPRSKI39074Dy/A5Pt
-a1xkTIbU48smyqjOaP7O7ZDDGD0naX921rfxNl26srCDhP8/nSgRvltS8ngPFPzc
-9yTu7AT7ByIdmJF0oU+tOsHqW1q4swkUWXSY4miFKP3lKYAXAwnFP6W+WrggXjzZ
-bWRonNMfOHD7lQ8sKowKbLEQ5MBXk+CxZlAXtB6J3WXkoWSr6da7oZNz0YoLx/mJ
-9AS7r/BCoOea+IcvD+fob1d4AG9iMhGJVve2XR1qL22bGdoozeBgr4uLqhOUyC+a
-/H5tNLU/LA8=
-					    </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://shibboleth2.crous-poitiers.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth2.crous-poitiers.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth2.crous-poitiers.fr/idp/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">CROUS Poitiers - Personnels</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">CROUS Poitiers - Personnels</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <EmailAddress>crous.informatique@crous-poitiers.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth2.ufms.br-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth2.ufms.br-idp-shibboleth.xml
deleted file mode 100644
index eab2ef6e..00000000
--- a/swamid-interfederations-2.0/shibboleth2.ufms.br-idp-shibboleth.xml
+++ /dev/null
@@ -1,114 +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://shibboleth2.ufms.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">ufms.br</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">UFMS - Universidade Federal de Mato Grosso do Sul</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="pt-br">UFMS - Universidade Federal de Mato Grosso do Sul</mdui:DisplayName>
-        <mdui:Description xml:lang="en">UFMS - Universidade Federal de Mato Grosso do Sul</mdui:Description>
-        <mdui:Description xml:lang="pt-br">UFMS - Universidade Federal de Mato Grosso do Sul</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.ufms.br/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="pt-br">http://www.ufms.br/</mdui:InformationURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-    MIIEDDCCAvQCAQAwDQYJKoZIhvcNAQEFBQAwgcsxODA2BgNVBAoTL1VuaXZlcnNp
-ZGFkZSBGZWRlcmFsIGRlIE1hdG8gR3Jvc3NvIGRvIFN1bC9VRk1TMQwwCgYDVQQL
-EwNOVEkxIjAgBgkqhkiG9w0BCQEWE3N1cG9ydGUubnRpQHVmbXMuYnIxFTATBgNV
-BAcTDENhbXBvIEdyYW5kZTEbMBkGA1UECBMSTWF0byBHcm9zc28gZG8gU3VsMQsw
-CQYDVQQGEwJCUjEcMBoGA1UEAxMTc2hpYmJvbGV0aDIudWZtcy5icjAeFw0xNDA0
-MTAxMjA1NTNaFw0xNzA0MDkxMjA1NTNaMIHLMTgwNgYDVQQKEy9Vbml2ZXJzaWRh
-ZGUgRmVkZXJhbCBkZSBNYXRvIEdyb3NzbyBkbyBTdWwvVUZNUzEMMAoGA1UECxMD
-TlRJMSIwIAYJKoZIhvcNAQkBFhNzdXBvcnRlLm50aUB1Zm1zLmJyMRUwEwYDVQQH
-EwxDYW1wbyBHcmFuZGUxGzAZBgNVBAgTEk1hdG8gR3Jvc3NvIGRvIFN1bDELMAkG
-A1UEBhMCQlIxHDAaBgNVBAMTE3NoaWJib2xldGgyLnVmbXMuYnIwggEiMA0GCSqG
-SIb3DQEBAQUAA4IBDwAwggEKAoIBAQC4/qfltMXAD1oXEDGUlbOVwwm4Yd7R4bgh
-i+ZU4OlPPPwzeTMe1dnCDypxxw93/5z6tj3iaYakMf/XVPh4GelknjH0nPiQL/Nb
-n+VL9Jx7xScZ//sl/Jr+IGzRl0TIpcWwJaJcIUfyAqKwkvlyvgB7z/78FYhgE/Fn
-8QNPrLQYmpEaiKGA1WkNe3o9U7t/b6xFgOOkZOhRC2jn8MBN+Kn5eUxH0waQk6ti
-HHZ80rH5ud8C6E0ocpkODEFWx5H2Xn5tU0PUn6RngVUEsqzgkQQbAk3tkRdD7d0g
-XG8NHTP74ocv0ivvv3BBpDDjSHlrYvUq5bV7zdPUXpVVlZGPFI2rAgMBAAEwDQYJ
-KoZIhvcNAQEFBQADggEBAH10d5nog6/WojS/rTHB9L6KIwS2btcXXrwgGQymDMOw
-vQKwRXh0lPIpYeIYmsz7aO19HP09KxmEkpJfSbtJ0RAVtYeWvxYdOxRn5B0Tbq9m
-OLQTa+DiCDxNywlFsc5zwJkoeY0LFVVyuL9R+zHC6xjNP4qWN8CuBjY8WtRtXvIr
-aRfk3bQ9jyZLbKyZ5RRLR3PgnM7LyYcRYQ4jWTV/13H8rF4l3VHWo6d+zgkRREeT
-HkC3kRtYLjCoPrY4odcm1Od7hO2o8SJAvgauCF7zFLmNp8vHaxPUdlua9HWf6Xy9
-d08BX8ZFxYA/GMOYSbBNxQEgxZ3aNy76lZ5xR5Te7fo=
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth2.ufms.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth2.ufms.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://shibboleth2.ufms.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth2.ufms.br/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth2.ufms.br/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth2.ufms.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">ufms.br</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-      
-MIIEDDCCAvQCAQAwDQYJKoZIhvcNAQEFBQAwgcsxODA2BgNVBAoTL1VuaXZlcnNp
-ZGFkZSBGZWRlcmFsIGRlIE1hdG8gR3Jvc3NvIGRvIFN1bC9VRk1TMQwwCgYDVQQL
-EwNOVEkxIjAgBgkqhkiG9w0BCQEWE3N1cG9ydGUubnRpQHVmbXMuYnIxFTATBgNV
-BAcTDENhbXBvIEdyYW5kZTEbMBkGA1UECBMSTWF0byBHcm9zc28gZG8gU3VsMQsw
-CQYDVQQGEwJCUjEcMBoGA1UEAxMTc2hpYmJvbGV0aDIudWZtcy5icjAeFw0xNDA0
-MTAxMjA1NTNaFw0xNzA0MDkxMjA1NTNaMIHLMTgwNgYDVQQKEy9Vbml2ZXJzaWRh
-ZGUgRmVkZXJhbCBkZSBNYXRvIEdyb3NzbyBkbyBTdWwvVUZNUzEMMAoGA1UECxMD
-TlRJMSIwIAYJKoZIhvcNAQkBFhNzdXBvcnRlLm50aUB1Zm1zLmJyMRUwEwYDVQQH
-EwxDYW1wbyBHcmFuZGUxGzAZBgNVBAgTEk1hdG8gR3Jvc3NvIGRvIFN1bDELMAkG
-A1UEBhMCQlIxHDAaBgNVBAMTE3NoaWJib2xldGgyLnVmbXMuYnIwggEiMA0GCSqG
-SIb3DQEBAQUAA4IBDwAwggEKAoIBAQC4/qfltMXAD1oXEDGUlbOVwwm4Yd7R4bgh
-i+ZU4OlPPPwzeTMe1dnCDypxxw93/5z6tj3iaYakMf/XVPh4GelknjH0nPiQL/Nb
-n+VL9Jx7xScZ//sl/Jr+IGzRl0TIpcWwJaJcIUfyAqKwkvlyvgB7z/78FYhgE/Fn
-8QNPrLQYmpEaiKGA1WkNe3o9U7t/b6xFgOOkZOhRC2jn8MBN+Kn5eUxH0waQk6ti
-HHZ80rH5ud8C6E0ocpkODEFWx5H2Xn5tU0PUn6RngVUEsqzgkQQbAk3tkRdD7d0g
-XG8NHTP74ocv0ivvv3BBpDDjSHlrYvUq5bV7zdPUXpVVlZGPFI2rAgMBAAEwDQYJ
-KoZIhvcNAQEFBQADggEBAH10d5nog6/WojS/rTHB9L6KIwS2btcXXrwgGQymDMOw
-vQKwRXh0lPIpYeIYmsz7aO19HP09KxmEkpJfSbtJ0RAVtYeWvxYdOxRn5B0Tbq9m
-OLQTa+DiCDxNywlFsc5zwJkoeY0LFVVyuL9R+zHC6xjNP4qWN8CuBjY8WtRtXvIr
-aRfk3bQ9jyZLbKyZ5RRLR3PgnM7LyYcRYQ4jWTV/13H8rF4l3VHWo6d+zgkRREeT
-HkC3kRtYLjCoPrY4odcm1Od7hO2o8SJAvgauCF7zFLmNp8vHaxPUdlua9HWf6Xy9
-d08BX8ZFxYA/GMOYSbBNxQEgxZ3aNy76lZ5xR5Te7fo=
-                    
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth2.ufms.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth2.ufms.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">UFMS - Universidade Federal de Mato Grosso do Sul</OrganizationName>
-    <OrganizationName xml:lang="pt-br">UFMS - Universidade Federal de Mato Grosso do Sul</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">UFMS - Universidade Federal de Mato Grosso do Sul</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="pt-br">UFMS - Universidade Federal de Mato Grosso do Sul</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.ufms.br/</OrganizationURL>
-    <OrganizationURL xml:lang="pt-br">http://www.ufms.br/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Ronaldo Alves Ferreira</SurName>
-    <EmailAddress>raf@dct.ufms.br</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth2.ufms.br.xml b/swamid-interfederations-2.0/shibboleth2.ufms.br.xml
deleted file mode 100644
index eab2ef6e..00000000
--- a/swamid-interfederations-2.0/shibboleth2.ufms.br.xml
+++ /dev/null
@@ -1,114 +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://shibboleth2.ufms.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">ufms.br</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">UFMS - Universidade Federal de Mato Grosso do Sul</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="pt-br">UFMS - Universidade Federal de Mato Grosso do Sul</mdui:DisplayName>
-        <mdui:Description xml:lang="en">UFMS - Universidade Federal de Mato Grosso do Sul</mdui:Description>
-        <mdui:Description xml:lang="pt-br">UFMS - Universidade Federal de Mato Grosso do Sul</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.ufms.br/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="pt-br">http://www.ufms.br/</mdui:InformationURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-    MIIEDDCCAvQCAQAwDQYJKoZIhvcNAQEFBQAwgcsxODA2BgNVBAoTL1VuaXZlcnNp
-ZGFkZSBGZWRlcmFsIGRlIE1hdG8gR3Jvc3NvIGRvIFN1bC9VRk1TMQwwCgYDVQQL
-EwNOVEkxIjAgBgkqhkiG9w0BCQEWE3N1cG9ydGUubnRpQHVmbXMuYnIxFTATBgNV
-BAcTDENhbXBvIEdyYW5kZTEbMBkGA1UECBMSTWF0byBHcm9zc28gZG8gU3VsMQsw
-CQYDVQQGEwJCUjEcMBoGA1UEAxMTc2hpYmJvbGV0aDIudWZtcy5icjAeFw0xNDA0
-MTAxMjA1NTNaFw0xNzA0MDkxMjA1NTNaMIHLMTgwNgYDVQQKEy9Vbml2ZXJzaWRh
-ZGUgRmVkZXJhbCBkZSBNYXRvIEdyb3NzbyBkbyBTdWwvVUZNUzEMMAoGA1UECxMD
-TlRJMSIwIAYJKoZIhvcNAQkBFhNzdXBvcnRlLm50aUB1Zm1zLmJyMRUwEwYDVQQH
-EwxDYW1wbyBHcmFuZGUxGzAZBgNVBAgTEk1hdG8gR3Jvc3NvIGRvIFN1bDELMAkG
-A1UEBhMCQlIxHDAaBgNVBAMTE3NoaWJib2xldGgyLnVmbXMuYnIwggEiMA0GCSqG
-SIb3DQEBAQUAA4IBDwAwggEKAoIBAQC4/qfltMXAD1oXEDGUlbOVwwm4Yd7R4bgh
-i+ZU4OlPPPwzeTMe1dnCDypxxw93/5z6tj3iaYakMf/XVPh4GelknjH0nPiQL/Nb
-n+VL9Jx7xScZ//sl/Jr+IGzRl0TIpcWwJaJcIUfyAqKwkvlyvgB7z/78FYhgE/Fn
-8QNPrLQYmpEaiKGA1WkNe3o9U7t/b6xFgOOkZOhRC2jn8MBN+Kn5eUxH0waQk6ti
-HHZ80rH5ud8C6E0ocpkODEFWx5H2Xn5tU0PUn6RngVUEsqzgkQQbAk3tkRdD7d0g
-XG8NHTP74ocv0ivvv3BBpDDjSHlrYvUq5bV7zdPUXpVVlZGPFI2rAgMBAAEwDQYJ
-KoZIhvcNAQEFBQADggEBAH10d5nog6/WojS/rTHB9L6KIwS2btcXXrwgGQymDMOw
-vQKwRXh0lPIpYeIYmsz7aO19HP09KxmEkpJfSbtJ0RAVtYeWvxYdOxRn5B0Tbq9m
-OLQTa+DiCDxNywlFsc5zwJkoeY0LFVVyuL9R+zHC6xjNP4qWN8CuBjY8WtRtXvIr
-aRfk3bQ9jyZLbKyZ5RRLR3PgnM7LyYcRYQ4jWTV/13H8rF4l3VHWo6d+zgkRREeT
-HkC3kRtYLjCoPrY4odcm1Od7hO2o8SJAvgauCF7zFLmNp8vHaxPUdlua9HWf6Xy9
-d08BX8ZFxYA/GMOYSbBNxQEgxZ3aNy76lZ5xR5Te7fo=
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth2.ufms.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth2.ufms.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://shibboleth2.ufms.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth2.ufms.br/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth2.ufms.br/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth2.ufms.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">ufms.br</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-      
-MIIEDDCCAvQCAQAwDQYJKoZIhvcNAQEFBQAwgcsxODA2BgNVBAoTL1VuaXZlcnNp
-ZGFkZSBGZWRlcmFsIGRlIE1hdG8gR3Jvc3NvIGRvIFN1bC9VRk1TMQwwCgYDVQQL
-EwNOVEkxIjAgBgkqhkiG9w0BCQEWE3N1cG9ydGUubnRpQHVmbXMuYnIxFTATBgNV
-BAcTDENhbXBvIEdyYW5kZTEbMBkGA1UECBMSTWF0byBHcm9zc28gZG8gU3VsMQsw
-CQYDVQQGEwJCUjEcMBoGA1UEAxMTc2hpYmJvbGV0aDIudWZtcy5icjAeFw0xNDA0
-MTAxMjA1NTNaFw0xNzA0MDkxMjA1NTNaMIHLMTgwNgYDVQQKEy9Vbml2ZXJzaWRh
-ZGUgRmVkZXJhbCBkZSBNYXRvIEdyb3NzbyBkbyBTdWwvVUZNUzEMMAoGA1UECxMD
-TlRJMSIwIAYJKoZIhvcNAQkBFhNzdXBvcnRlLm50aUB1Zm1zLmJyMRUwEwYDVQQH
-EwxDYW1wbyBHcmFuZGUxGzAZBgNVBAgTEk1hdG8gR3Jvc3NvIGRvIFN1bDELMAkG
-A1UEBhMCQlIxHDAaBgNVBAMTE3NoaWJib2xldGgyLnVmbXMuYnIwggEiMA0GCSqG
-SIb3DQEBAQUAA4IBDwAwggEKAoIBAQC4/qfltMXAD1oXEDGUlbOVwwm4Yd7R4bgh
-i+ZU4OlPPPwzeTMe1dnCDypxxw93/5z6tj3iaYakMf/XVPh4GelknjH0nPiQL/Nb
-n+VL9Jx7xScZ//sl/Jr+IGzRl0TIpcWwJaJcIUfyAqKwkvlyvgB7z/78FYhgE/Fn
-8QNPrLQYmpEaiKGA1WkNe3o9U7t/b6xFgOOkZOhRC2jn8MBN+Kn5eUxH0waQk6ti
-HHZ80rH5ud8C6E0ocpkODEFWx5H2Xn5tU0PUn6RngVUEsqzgkQQbAk3tkRdD7d0g
-XG8NHTP74ocv0ivvv3BBpDDjSHlrYvUq5bV7zdPUXpVVlZGPFI2rAgMBAAEwDQYJ
-KoZIhvcNAQEFBQADggEBAH10d5nog6/WojS/rTHB9L6KIwS2btcXXrwgGQymDMOw
-vQKwRXh0lPIpYeIYmsz7aO19HP09KxmEkpJfSbtJ0RAVtYeWvxYdOxRn5B0Tbq9m
-OLQTa+DiCDxNywlFsc5zwJkoeY0LFVVyuL9R+zHC6xjNP4qWN8CuBjY8WtRtXvIr
-aRfk3bQ9jyZLbKyZ5RRLR3PgnM7LyYcRYQ4jWTV/13H8rF4l3VHWo6d+zgkRREeT
-HkC3kRtYLjCoPrY4odcm1Od7hO2o8SJAvgauCF7zFLmNp8vHaxPUdlua9HWf6Xy9
-d08BX8ZFxYA/GMOYSbBNxQEgxZ3aNy76lZ5xR5Te7fo=
-                    
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth2.ufms.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth2.ufms.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">UFMS - Universidade Federal de Mato Grosso do Sul</OrganizationName>
-    <OrganizationName xml:lang="pt-br">UFMS - Universidade Federal de Mato Grosso do Sul</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">UFMS - Universidade Federal de Mato Grosso do Sul</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="pt-br">UFMS - Universidade Federal de Mato Grosso do Sul</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.ufms.br/</OrganizationURL>
-    <OrganizationURL xml:lang="pt-br">http://www.ufms.br/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Ronaldo Alves Ferreira</SurName>
-    <EmailAddress>raf@dct.ufms.br</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibidp.cca.unipd.it-idp-shibboleth.xml b/swamid-interfederations-2.0/shibidp.cca.unipd.it-idp-shibboleth.xml
deleted file mode 100644
index ef163336..00000000
--- a/swamid-interfederations-2.0/shibidp.cca.unipd.it-idp-shibboleth.xml
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" entityID="https://shibidp.cca.unipd.it/idp/shibboleth">
-  <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>
-  <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">unipd.it</shibmd:Scope>
-      <mdui:UIInfo>
-        <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:Logo height="16" width="16" xml:lang="en">https://bandi.didattica.unipd.it/logo-unipd16x16.png</mdui:Logo>
-        <mdui:Logo height="16" width="16" xml:lang="it">https://bandi.didattica.unipd.it/logo-unipd16x16.png</mdui:Logo>
-        <mdui:Logo height="60" width="80" xml:lang="en">https://bandi.didattica.unipd.it/logo-unipd80x60.png</mdui:Logo>
-        <mdui:Logo height="60" width="80" xml:lang="it">https://bandi.didattica.unipd.it/logo-unipd80x60.png</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDOzCCAiOgAwIBAgIUTSdt0Dt8swpFu9qJLBfnEV09alwwDQYJKoZIhvcNAQEF
-BQAwHzEdMBsGA1UEAxMUc2hpYmlkcC5jY2EudW5pcGQuaXQwHhcNMTAxMjI5MTgz
-NjIyWhcNMzAxMjI5MTgzNjIyWjAfMR0wGwYDVQQDExRzaGliaWRwLmNjYS51bmlw
-ZC5pdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJMiK2A2ZC6vp69H
-sIR2wqYEMMkDfhs91u1UhDibfc1kT3LZEPN42L6B95s1TZb6+f1M5YDCmDzmHrlA
-YkFbK/yW2jSHXuTR+dSP071d+Xa+00qrokGotUYyqstfqOjiAhVyC4vDVwDgAPj3
-1K9wCjrZcazt3NZC6mPD9XJBQ1YJ6sDvk6y+UVQfeHoKKrAC9MSoFMRwoLI9izIq
-7NbqOLV9pDjV4GvspxJs00krQiATzoYblatuR4xtSHcSpmYFqD6VCTosKwISLqKA
-erlsKlyfKSBF7xuan+lgzJLSLWvvhj+Bv0oRfOJnQEsP1vjG/s9J8RQPee/HdmjQ
-kKiHOF0CAwEAAaNvMG0wTAYDVR0RBEUwQ4IUc2hpYmlkcC5jY2EudW5pcGQuaXSG
-K2h0dHBzOi8vc2hpYmlkcC5jY2EudW5pcGQuaXQvaWRwL3NoaWJib2xldGgwHQYD
-VR0OBBYEFGYTCKzj5155S2lqpPV5/6I1jePjMA0GCSqGSIb3DQEBBQUAA4IBAQAM
-OKvcKfl2rMZS1ivnvOcDNNwgXEaa27Vre4D6PxMhR4dM3UvdS+qP2pL6M2guI95K
-HSR4VUoHXw4Hnq5Hk9yyCBp38xmPs7AefGcbYvgf3nx75CEtXE9jDG35tL9lgted
-d1Ksu3uT3jxKcPTVqdNWnTB7N2TYoWJhbGOmC1US4iMzp5UEGrvdZUvcZI+6/VsG
-d/CKd1tzg3Io4xevtARfgavjvQ5VDbyGdzMg9GD3h5zNsTDDqEjFyylYlay7cUCe
-48QsT4K0vJexMVAd/xf3jNCQmcFmgmE/pgq+4636NURxTV39x3TxwjQv6Wa57zml
-G+DXFhqRaj5xn2FulnFc
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <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"/>
-    <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"/>
-    <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://shibidp.cca.unipd.it/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibidp.cca.unipd.it/idp/profile/SAML2/POST/SSO"/>
-    <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"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibidp.cca.unipd.it/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">unipd.it</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDOzCCAiOgAwIBAgIUTSdt0Dt8swpFu9qJLBfnEV09alwwDQYJKoZIhvcNAQEF
-BQAwHzEdMBsGA1UEAxMUc2hpYmlkcC5jY2EudW5pcGQuaXQwHhcNMTAxMjI5MTgz
-NjIyWhcNMzAxMjI5MTgzNjIyWjAfMR0wGwYDVQQDExRzaGliaWRwLmNjYS51bmlw
-ZC5pdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJMiK2A2ZC6vp69H
-sIR2wqYEMMkDfhs91u1UhDibfc1kT3LZEPN42L6B95s1TZb6+f1M5YDCmDzmHrlA
-YkFbK/yW2jSHXuTR+dSP071d+Xa+00qrokGotUYyqstfqOjiAhVyC4vDVwDgAPj3
-1K9wCjrZcazt3NZC6mPD9XJBQ1YJ6sDvk6y+UVQfeHoKKrAC9MSoFMRwoLI9izIq
-7NbqOLV9pDjV4GvspxJs00krQiATzoYblatuR4xtSHcSpmYFqD6VCTosKwISLqKA
-erlsKlyfKSBF7xuan+lgzJLSLWvvhj+Bv0oRfOJnQEsP1vjG/s9J8RQPee/HdmjQ
-kKiHOF0CAwEAAaNvMG0wTAYDVR0RBEUwQ4IUc2hpYmlkcC5jY2EudW5pcGQuaXSG
-K2h0dHBzOi8vc2hpYmlkcC5jY2EudW5pcGQuaXQvaWRwL3NoaWJib2xldGgwHQYD
-VR0OBBYEFGYTCKzj5155S2lqpPV5/6I1jePjMA0GCSqGSIb3DQEBBQUAA4IBAQAM
-OKvcKfl2rMZS1ivnvOcDNNwgXEaa27Vre4D6PxMhR4dM3UvdS+qP2pL6M2guI95K
-HSR4VUoHXw4Hnq5Hk9yyCBp38xmPs7AefGcbYvgf3nx75CEtXE9jDG35tL9lgted
-d1Ksu3uT3jxKcPTVqdNWnTB7N2TYoWJhbGOmC1US4iMzp5UEGrvdZUvcZI+6/VsG
-d/CKd1tzg3Io4xevtARfgavjvQ5VDbyGdzMg9GD3h5zNsTDDqEjFyylYlay7cUCe
-48QsT4K0vJexMVAd/xf3jNCQmcFmgmE/pgq+4636NURxTV39x3TxwjQv6Wa57zml
-G+DXFhqRaj5xn2FulnFc
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibidp.cca.unipd.it:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibidp.cca.unipd.it: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">University of Padova</OrganizationName>
-    <OrganizationName xml:lang="it">Università degli Studi di Padova</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Padova</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="it">Università di Padova</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.unipd.it/en/</OrganizationURL>
-    <OrganizationURL xml:lang="it">http://www.unipd.it/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <EmailAddress>supporto.sso@unipd.it</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
deleted file mode 100644
index ef163336..00000000
--- a/swamid-interfederations-2.0/shibidp.cca.unipd.it.xml
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" entityID="https://shibidp.cca.unipd.it/idp/shibboleth">
-  <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>
-  <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">unipd.it</shibmd:Scope>
-      <mdui:UIInfo>
-        <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:Logo height="16" width="16" xml:lang="en">https://bandi.didattica.unipd.it/logo-unipd16x16.png</mdui:Logo>
-        <mdui:Logo height="16" width="16" xml:lang="it">https://bandi.didattica.unipd.it/logo-unipd16x16.png</mdui:Logo>
-        <mdui:Logo height="60" width="80" xml:lang="en">https://bandi.didattica.unipd.it/logo-unipd80x60.png</mdui:Logo>
-        <mdui:Logo height="60" width="80" xml:lang="it">https://bandi.didattica.unipd.it/logo-unipd80x60.png</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDOzCCAiOgAwIBAgIUTSdt0Dt8swpFu9qJLBfnEV09alwwDQYJKoZIhvcNAQEF
-BQAwHzEdMBsGA1UEAxMUc2hpYmlkcC5jY2EudW5pcGQuaXQwHhcNMTAxMjI5MTgz
-NjIyWhcNMzAxMjI5MTgzNjIyWjAfMR0wGwYDVQQDExRzaGliaWRwLmNjYS51bmlw
-ZC5pdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJMiK2A2ZC6vp69H
-sIR2wqYEMMkDfhs91u1UhDibfc1kT3LZEPN42L6B95s1TZb6+f1M5YDCmDzmHrlA
-YkFbK/yW2jSHXuTR+dSP071d+Xa+00qrokGotUYyqstfqOjiAhVyC4vDVwDgAPj3
-1K9wCjrZcazt3NZC6mPD9XJBQ1YJ6sDvk6y+UVQfeHoKKrAC9MSoFMRwoLI9izIq
-7NbqOLV9pDjV4GvspxJs00krQiATzoYblatuR4xtSHcSpmYFqD6VCTosKwISLqKA
-erlsKlyfKSBF7xuan+lgzJLSLWvvhj+Bv0oRfOJnQEsP1vjG/s9J8RQPee/HdmjQ
-kKiHOF0CAwEAAaNvMG0wTAYDVR0RBEUwQ4IUc2hpYmlkcC5jY2EudW5pcGQuaXSG
-K2h0dHBzOi8vc2hpYmlkcC5jY2EudW5pcGQuaXQvaWRwL3NoaWJib2xldGgwHQYD
-VR0OBBYEFGYTCKzj5155S2lqpPV5/6I1jePjMA0GCSqGSIb3DQEBBQUAA4IBAQAM
-OKvcKfl2rMZS1ivnvOcDNNwgXEaa27Vre4D6PxMhR4dM3UvdS+qP2pL6M2guI95K
-HSR4VUoHXw4Hnq5Hk9yyCBp38xmPs7AefGcbYvgf3nx75CEtXE9jDG35tL9lgted
-d1Ksu3uT3jxKcPTVqdNWnTB7N2TYoWJhbGOmC1US4iMzp5UEGrvdZUvcZI+6/VsG
-d/CKd1tzg3Io4xevtARfgavjvQ5VDbyGdzMg9GD3h5zNsTDDqEjFyylYlay7cUCe
-48QsT4K0vJexMVAd/xf3jNCQmcFmgmE/pgq+4636NURxTV39x3TxwjQv6Wa57zml
-G+DXFhqRaj5xn2FulnFc
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <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"/>
-    <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"/>
-    <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://shibidp.cca.unipd.it/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibidp.cca.unipd.it/idp/profile/SAML2/POST/SSO"/>
-    <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"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibidp.cca.unipd.it/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">unipd.it</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDOzCCAiOgAwIBAgIUTSdt0Dt8swpFu9qJLBfnEV09alwwDQYJKoZIhvcNAQEF
-BQAwHzEdMBsGA1UEAxMUc2hpYmlkcC5jY2EudW5pcGQuaXQwHhcNMTAxMjI5MTgz
-NjIyWhcNMzAxMjI5MTgzNjIyWjAfMR0wGwYDVQQDExRzaGliaWRwLmNjYS51bmlw
-ZC5pdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJMiK2A2ZC6vp69H
-sIR2wqYEMMkDfhs91u1UhDibfc1kT3LZEPN42L6B95s1TZb6+f1M5YDCmDzmHrlA
-YkFbK/yW2jSHXuTR+dSP071d+Xa+00qrokGotUYyqstfqOjiAhVyC4vDVwDgAPj3
-1K9wCjrZcazt3NZC6mPD9XJBQ1YJ6sDvk6y+UVQfeHoKKrAC9MSoFMRwoLI9izIq
-7NbqOLV9pDjV4GvspxJs00krQiATzoYblatuR4xtSHcSpmYFqD6VCTosKwISLqKA
-erlsKlyfKSBF7xuan+lgzJLSLWvvhj+Bv0oRfOJnQEsP1vjG/s9J8RQPee/HdmjQ
-kKiHOF0CAwEAAaNvMG0wTAYDVR0RBEUwQ4IUc2hpYmlkcC5jY2EudW5pcGQuaXSG
-K2h0dHBzOi8vc2hpYmlkcC5jY2EudW5pcGQuaXQvaWRwL3NoaWJib2xldGgwHQYD
-VR0OBBYEFGYTCKzj5155S2lqpPV5/6I1jePjMA0GCSqGSIb3DQEBBQUAA4IBAQAM
-OKvcKfl2rMZS1ivnvOcDNNwgXEaa27Vre4D6PxMhR4dM3UvdS+qP2pL6M2guI95K
-HSR4VUoHXw4Hnq5Hk9yyCBp38xmPs7AefGcbYvgf3nx75CEtXE9jDG35tL9lgted
-d1Ksu3uT3jxKcPTVqdNWnTB7N2TYoWJhbGOmC1US4iMzp5UEGrvdZUvcZI+6/VsG
-d/CKd1tzg3Io4xevtARfgavjvQ5VDbyGdzMg9GD3h5zNsTDDqEjFyylYlay7cUCe
-48QsT4K0vJexMVAd/xf3jNCQmcFmgmE/pgq+4636NURxTV39x3TxwjQv6Wa57zml
-G+DXFhqRaj5xn2FulnFc
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibidp.cca.unipd.it:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibidp.cca.unipd.it: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">University of Padova</OrganizationName>
-    <OrganizationName xml:lang="it">Università degli Studi di Padova</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Padova</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="it">Università di Padova</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.unipd.it/en/</OrganizationURL>
-    <OrganizationURL xml:lang="it">http://www.unipd.it/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <EmailAddress>supporto.sso@unipd.it</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibidp.oca.eu-idp-shibboleth.xml b/swamid-interfederations-2.0/shibidp.oca.eu-idp-shibboleth.xml
deleted file mode 100644
index 13fd7e93..00000000
--- a/swamid-interfederations-2.0/shibidp.oca.eu-idp-shibboleth.xml
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibidp.oca.eu/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2010-10-12T19:40:58Z">
-      <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">oca.eu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">Observatoire de la Côte d'Azur</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIEajCCA1KgAwIBAgIRAIf9yjW7+yzJysfx2J6FNSMwDQYJKoZIhvcNAQEFBQAw
-NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-IFNTTCBDQTAeFw0xNDA0MTAwMDAwMDBaFw0xNzA0MDkyMzU5NTlaMDwxITAfBgNV
-BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEXMBUGA1UEAxMOc2hpYmlkcC5v
-Y2EuZXUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC2ZMqKhwIA1xBC
-EBCO+wpjOq7EhVrZd216X+8M5bWSahDG82CE4doLvwb5DAfWgb3Q6Me7lKj5L8WW
-GUGuhIBKqFiyyh+qzrL76vfbh3TDhHct3macXDfEcn2oH2zRQLaQ7uiGOtvlSpAu
-ZSTiVGkmIFF+LU6VCSqWFHgqKDjJl7LQhCJ+bprdbbbBqUTXofWlFmZUAsr6uxKg
-bYQW4T40gGaZVM5TnYiCwQnYLId09UjivjvbreCbK2Xu2Wu7LV1VdlWaxXyWEStw
-tMb1XYBorpnvx8O5v4oOuHHkMsqbh846EsgTUlCx6YCjfGJKkXM+x31DQlxonvky
-BW9SfioNAgMBAAGjggFrMIIBZzAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3V0fq
-kOO57TAdBgNVHQ4EFgQUNMas5UrwCLjDZ2CgSW/QRLyatm0wDgYDVR0PAQH/BAQD
-AgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMC
-MCIGA1UdIAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQIBMDoGA1UdHwQzMDEw
-L6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3Js
-MG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50Y3MudGVy
-ZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9vY3Nw
-LnRjcy50ZXJlbmEub3JnMBkGA1UdEQQSMBCCDnNoaWJpZHAub2NhLmV1MA0GCSqG
-SIb3DQEBBQUAA4IBAQB6rhBitpV+rUiGYLQzKOFiF+a7+l7YYxdQd/E3hYctCzDj
-kx+1kLBLgg5AzWwtQJLpjxSa1+EY2F+7qWzLRtcNk1qj3zWJaJTmoss/7VnImu8w
-1WatAbY6YUAwqSK2UwSNVpjmcicncILNDhvp9YAOWbKLywKdZRO0QY/ri617we6R
-kCUcE5Ilz09S6b5aW+7aggZUciXDQLvjhdeYUhjNnIfLI7xHmmonebUZ5FLWqZlT
-65MeLzedeC8die2Q4iXL2VBdX2W4tHVMY6EmiKTcWLjEgvGqdZksWdPEkjOfAdnZ
-W9wN2CGinBD5hb6yOqDycAeJXd3DkGrWzSGIoXyp
-					    </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>
-					      MIIEajCCA1KgAwIBAgIRAPctB3OrtZ/DMXYngPzb1p0wDQYJKoZIhvcNAQEFBQAw
-NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-IFNTTCBDQTAeFw0xMzA2MjQwMDAwMDBaFw0xNjA2MjMyMzU5NTlaMDwxITAfBgNV
-BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEXMBUGA1UEAxMOc2hpYmlkcC5v
-Y2EuZXUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDNvpKIsWyO2FYq
-vWbwJoDZp3ISutces7YEgBLIttUEo/CzAG2nyVLn1QBdT2uBNlPPqwhxCYsUN4n1
-aK+ZSTII5sOm/8rc0UL6KVNpFpr+EE/F0gPiFLz8DvUpLjHbpIfLFg/WeoHmPxqd
-mDsGXBB2VpYk/nlz5+w+hd75oQgnnrwGOGHgW6RNeJJaKAyaBGD1GVKOdHW3IIKT
-yNW9gJEzrfPxW5k0PKwHGPQKwnVbE17OsSeZnR9JSVUQl0NHGw9+DPMiwwOLrt7r
-XalAOKvuiwHftWcffyhiEColQuMEoKGrJgrNveBxBt9ba7SMZtLX8gtxiks2l2FT
-5Xy2872RAgMBAAGjggFrMIIBZzAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3V0fq
-kOO57TAdBgNVHQ4EFgQUfKfBUhc3bS+3XyoSTHXxtHoU3cYwDgYDVR0PAQH/BAQD
-AgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMC
-MCIGA1UdIAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQIBMDoGA1UdHwQzMDEw
-L6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3Js
-MG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50Y3MudGVy
-ZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9vY3Nw
-LnRjcy50ZXJlbmEub3JnMBkGA1UdEQQSMBCCDnNoaWJpZHAub2NhLmV1MA0GCSqG
-SIb3DQEBBQUAA4IBAQCWshenf9oAyyQ7DMDYda6jKQLroVk179R9t4/IAjiz/QUN
-aJxe3ZSnNOXqFgbICMPD2ZNne3nM5hFCSPeeoPaxIyAYb4k0cv3FqYp8Zwlk/Md4
-WRsCETFGz1w6FK50fhf3UKxpb6BtMQkaaS3FXx8iaQl/PdT0NQ4olvY09bNyZy26
-+tcgI3H4sW4p85DRkOTrzUErgdM7LjIRRPGcGIPRS0qogqsx9utaxT318FNzX9Pp
-81ORRTImyM6gcZmKlJMT38X1pIT3qJ6PO6rSYM5eQG+PtvoY6ql4fZ5m+ch/U3M/
-P4u6wlJiC0aMX+G6SJGafFSxDx4zhWz1m7Uou39f
-					    </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://shibidp.oca.eu/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibidp.oca.eu/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibidp.oca.eu/idp/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Observatoire de la Côte d'Azur</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Observatoire de la Côte d'Azur</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <EmailAddress>sit-nice@oca.eu</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibidp.oca.eu.xml b/swamid-interfederations-2.0/shibidp.oca.eu.xml
deleted file mode 100644
index 13fd7e93..00000000
--- a/swamid-interfederations-2.0/shibidp.oca.eu.xml
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibidp.oca.eu/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2010-10-12T19:40:58Z">
-      <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">oca.eu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">Observatoire de la Côte d'Azur</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIEajCCA1KgAwIBAgIRAIf9yjW7+yzJysfx2J6FNSMwDQYJKoZIhvcNAQEFBQAw
-NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-IFNTTCBDQTAeFw0xNDA0MTAwMDAwMDBaFw0xNzA0MDkyMzU5NTlaMDwxITAfBgNV
-BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEXMBUGA1UEAxMOc2hpYmlkcC5v
-Y2EuZXUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC2ZMqKhwIA1xBC
-EBCO+wpjOq7EhVrZd216X+8M5bWSahDG82CE4doLvwb5DAfWgb3Q6Me7lKj5L8WW
-GUGuhIBKqFiyyh+qzrL76vfbh3TDhHct3macXDfEcn2oH2zRQLaQ7uiGOtvlSpAu
-ZSTiVGkmIFF+LU6VCSqWFHgqKDjJl7LQhCJ+bprdbbbBqUTXofWlFmZUAsr6uxKg
-bYQW4T40gGaZVM5TnYiCwQnYLId09UjivjvbreCbK2Xu2Wu7LV1VdlWaxXyWEStw
-tMb1XYBorpnvx8O5v4oOuHHkMsqbh846EsgTUlCx6YCjfGJKkXM+x31DQlxonvky
-BW9SfioNAgMBAAGjggFrMIIBZzAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3V0fq
-kOO57TAdBgNVHQ4EFgQUNMas5UrwCLjDZ2CgSW/QRLyatm0wDgYDVR0PAQH/BAQD
-AgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMC
-MCIGA1UdIAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQIBMDoGA1UdHwQzMDEw
-L6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3Js
-MG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50Y3MudGVy
-ZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9vY3Nw
-LnRjcy50ZXJlbmEub3JnMBkGA1UdEQQSMBCCDnNoaWJpZHAub2NhLmV1MA0GCSqG
-SIb3DQEBBQUAA4IBAQB6rhBitpV+rUiGYLQzKOFiF+a7+l7YYxdQd/E3hYctCzDj
-kx+1kLBLgg5AzWwtQJLpjxSa1+EY2F+7qWzLRtcNk1qj3zWJaJTmoss/7VnImu8w
-1WatAbY6YUAwqSK2UwSNVpjmcicncILNDhvp9YAOWbKLywKdZRO0QY/ri617we6R
-kCUcE5Ilz09S6b5aW+7aggZUciXDQLvjhdeYUhjNnIfLI7xHmmonebUZ5FLWqZlT
-65MeLzedeC8die2Q4iXL2VBdX2W4tHVMY6EmiKTcWLjEgvGqdZksWdPEkjOfAdnZ
-W9wN2CGinBD5hb6yOqDycAeJXd3DkGrWzSGIoXyp
-					    </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>
-					      MIIEajCCA1KgAwIBAgIRAPctB3OrtZ/DMXYngPzb1p0wDQYJKoZIhvcNAQEFBQAw
-NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-IFNTTCBDQTAeFw0xMzA2MjQwMDAwMDBaFw0xNjA2MjMyMzU5NTlaMDwxITAfBgNV
-BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEXMBUGA1UEAxMOc2hpYmlkcC5v
-Y2EuZXUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDNvpKIsWyO2FYq
-vWbwJoDZp3ISutces7YEgBLIttUEo/CzAG2nyVLn1QBdT2uBNlPPqwhxCYsUN4n1
-aK+ZSTII5sOm/8rc0UL6KVNpFpr+EE/F0gPiFLz8DvUpLjHbpIfLFg/WeoHmPxqd
-mDsGXBB2VpYk/nlz5+w+hd75oQgnnrwGOGHgW6RNeJJaKAyaBGD1GVKOdHW3IIKT
-yNW9gJEzrfPxW5k0PKwHGPQKwnVbE17OsSeZnR9JSVUQl0NHGw9+DPMiwwOLrt7r
-XalAOKvuiwHftWcffyhiEColQuMEoKGrJgrNveBxBt9ba7SMZtLX8gtxiks2l2FT
-5Xy2872RAgMBAAGjggFrMIIBZzAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3V0fq
-kOO57TAdBgNVHQ4EFgQUfKfBUhc3bS+3XyoSTHXxtHoU3cYwDgYDVR0PAQH/BAQD
-AgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMC
-MCIGA1UdIAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQIBMDoGA1UdHwQzMDEw
-L6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3Js
-MG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50Y3MudGVy
-ZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9vY3Nw
-LnRjcy50ZXJlbmEub3JnMBkGA1UdEQQSMBCCDnNoaWJpZHAub2NhLmV1MA0GCSqG
-SIb3DQEBBQUAA4IBAQCWshenf9oAyyQ7DMDYda6jKQLroVk179R9t4/IAjiz/QUN
-aJxe3ZSnNOXqFgbICMPD2ZNne3nM5hFCSPeeoPaxIyAYb4k0cv3FqYp8Zwlk/Md4
-WRsCETFGz1w6FK50fhf3UKxpb6BtMQkaaS3FXx8iaQl/PdT0NQ4olvY09bNyZy26
-+tcgI3H4sW4p85DRkOTrzUErgdM7LjIRRPGcGIPRS0qogqsx9utaxT318FNzX9Pp
-81ORRTImyM6gcZmKlJMT38X1pIT3qJ6PO6rSYM5eQG+PtvoY6ql4fZ5m+ch/U3M/
-P4u6wlJiC0aMX+G6SJGafFSxDx4zhWz1m7Uou39f
-					    </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://shibidp.oca.eu/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibidp.oca.eu/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibidp.oca.eu/idp/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Observatoire de la Côte d'Azur</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Observatoire de la Côte d'Azur</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <EmailAddress>sit-nice@oca.eu</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibidp.unipr.it-idp-shibboleth.xml b/swamid-interfederations-2.0/shibidp.unipr.it-idp-shibboleth.xml
deleted file mode 100644
index 435168c5..00000000
--- a/swamid-interfederations-2.0/shibidp.unipr.it-idp-shibboleth.xml
+++ /dev/null
@@ -1,106 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" entityID="https://shibidp.unipr.it/idp/shibboleth">
-  <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>
-  <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">unipr.it</shibmd:Scope>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="it">Università degli Studi di Parma</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">University of Parma</mdui:DisplayName>
-        <mdui:Description xml:lang="it">Identity Provider per gli utenti dell'Università degli Studi di Parma</mdui:Description>
-        <mdui:Description xml:lang="en">Identity Provider for users of University of di Parma</mdui:Description>
-        <mdui:PrivacyStatementURL xml:lang="it">http://www.unipr.it/ateneo/albo-online/privacy</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="en">http://en.unipr.it/privacy</mdui:PrivacyStatementURL>
-        <mdui:InformationURL xml:lang="it">http://www.unipr.it/idem</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">http://en.unipr.it/idem</mdui:InformationURL>
-      </mdui:UIInfo>
-      <mdui:DiscoHints>
-        <mdui:GeolocationHint>geo:44.76630697035048,10.314061939716339</mdui:GeolocationHint>
-      </mdui:DiscoHints>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDLDCCAhSgAwIBAgIVANMt6NQyQVgOzMWv6tQmeV5iMyCNMA0GCSqGSIb3DQEB
-BQUAMBsxGTAXBgNVBAMTEHNoaWJpZHAudW5pcHIuaXQwHhcNMDkwOTAyMDgwMjMz
-WhcNMjkwOTAyMDgwMjMzWjAbMRkwFwYDVQQDExBzaGliaWRwLnVuaXByLml0MIIB
-IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2vzK0+t0DPv0CugzVEeroctE
-N4VdJggVTqeQVexIM4sFW7q3kVQvmA8kgVMmcZ9RHYyZac6Uw3Dj0ooO+DjYsJBg
-YRB4eN13gCpeWZQ1gcbbgV9FhLZGs9r+SRPtWgOjPb1Sns88XFBftjy9fZ7RJqQo
-vbvklEOHgWhhuz4xy6YMOItT01Z+amabYrh6pDG0007vPZjhT10LqcEExwvZjo6I
-5xd5s0w8z84EtDry2FhSaWs5AX3sQZYIiPONp/11uRZSvBBFKmCMDEIA32bGEcEO
-DQLUNKNPs/9AYdj+JFhehtILdVFVmHj3U76P9z6x7Brhrr6bMZ+wdvj+t+kabQID
-AQABo2cwZTBEBgNVHREEPTA7ghBzaGliaWRwLnVuaXByLml0hidodHRwczovL3No
-aWJpZHAudW5pcHIuaXQvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFMlXoLjlhaJD
-mLtp1r0Upn1PYpYlMA0GCSqGSIb3DQEBBQUAA4IBAQCzfKVH8RL3qOrpo6ZAh/AV
-2vYGkeV1RlSc1yc07K/hKG3HKkBim5HvGxeT5jMRNLlXZRkWEnrzmfCoyeyTgbis
-4YWyqKT4VKLCqsOGBdn00mbRUVDhQSH2MSTEy6Iqa+3SDeQ8iyolKinYnBu0LDg7
-aU+b3F6vQHeLEdJvX1V6c/z7gV3YdNEA3Z9dCQavw47LLDB5QlCKtWuKklpBrQao
-ddU75GdAb8W4csgACMgqBSU30w/yJ79q8O9ajffJta01wOXXJhvtlGtNnV42ACg4
-Pqwh2EyQjPtYYja8SrAmwgp4k705jtn+QNLUs1VD6hw9LmoRFpxn1zb21fL3rZAs
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibidp.unipr.it:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibidp.unipr.it: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://shibidp.unipr.it/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibidp.unipr.it/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibidp.unipr.it/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibidp.unipr.it/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">unipr.it</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDLDCCAhSgAwIBAgIVANMt6NQyQVgOzMWv6tQmeV5iMyCNMA0GCSqGSIb3DQEB
-BQUAMBsxGTAXBgNVBAMTEHNoaWJpZHAudW5pcHIuaXQwHhcNMDkwOTAyMDgwMjMz
-WhcNMjkwOTAyMDgwMjMzWjAbMRkwFwYDVQQDExBzaGliaWRwLnVuaXByLml0MIIB
-IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2vzK0+t0DPv0CugzVEeroctE
-N4VdJggVTqeQVexIM4sFW7q3kVQvmA8kgVMmcZ9RHYyZac6Uw3Dj0ooO+DjYsJBg
-YRB4eN13gCpeWZQ1gcbbgV9FhLZGs9r+SRPtWgOjPb1Sns88XFBftjy9fZ7RJqQo
-vbvklEOHgWhhuz4xy6YMOItT01Z+amabYrh6pDG0007vPZjhT10LqcEExwvZjo6I
-5xd5s0w8z84EtDry2FhSaWs5AX3sQZYIiPONp/11uRZSvBBFKmCMDEIA32bGEcEO
-DQLUNKNPs/9AYdj+JFhehtILdVFVmHj3U76P9z6x7Brhrr6bMZ+wdvj+t+kabQID
-AQABo2cwZTBEBgNVHREEPTA7ghBzaGliaWRwLnVuaXByLml0hidodHRwczovL3No
-aWJpZHAudW5pcHIuaXQvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFMlXoLjlhaJD
-mLtp1r0Upn1PYpYlMA0GCSqGSIb3DQEBBQUAA4IBAQCzfKVH8RL3qOrpo6ZAh/AV
-2vYGkeV1RlSc1yc07K/hKG3HKkBim5HvGxeT5jMRNLlXZRkWEnrzmfCoyeyTgbis
-4YWyqKT4VKLCqsOGBdn00mbRUVDhQSH2MSTEy6Iqa+3SDeQ8iyolKinYnBu0LDg7
-aU+b3F6vQHeLEdJvX1V6c/z7gV3YdNEA3Z9dCQavw47LLDB5QlCKtWuKklpBrQao
-ddU75GdAb8W4csgACMgqBSU30w/yJ79q8O9ajffJta01wOXXJhvtlGtNnV42ACg4
-Pqwh2EyQjPtYYja8SrAmwgp4k705jtn+QNLUs1VD6hw9LmoRFpxn1zb21fL3rZAs
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibidp.unipr.it:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibidp.unipr.it: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="it">Università degli Studi di Parma</OrganizationName>
-    <OrganizationName xml:lang="en">University of Parma</OrganizationName>
-    <OrganizationDisplayName xml:lang="it">Università di Parma</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">University of Parma</OrganizationDisplayName>
-    <OrganizationURL xml:lang="it">http://www.unipr.it/</OrganizationURL>
-    <OrganizationURL xml:lang="en">http://en.unipr.it/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Marco</GivenName>
-    <SurName>Panella</SurName>
-    <EmailAddress>idem@unipr.it</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibidp.unipr.it.xml b/swamid-interfederations-2.0/shibidp.unipr.it.xml
deleted file mode 100644
index 435168c5..00000000
--- a/swamid-interfederations-2.0/shibidp.unipr.it.xml
+++ /dev/null
@@ -1,106 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" entityID="https://shibidp.unipr.it/idp/shibboleth">
-  <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>
-  <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">unipr.it</shibmd:Scope>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="it">Università degli Studi di Parma</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">University of Parma</mdui:DisplayName>
-        <mdui:Description xml:lang="it">Identity Provider per gli utenti dell'Università degli Studi di Parma</mdui:Description>
-        <mdui:Description xml:lang="en">Identity Provider for users of University of di Parma</mdui:Description>
-        <mdui:PrivacyStatementURL xml:lang="it">http://www.unipr.it/ateneo/albo-online/privacy</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="en">http://en.unipr.it/privacy</mdui:PrivacyStatementURL>
-        <mdui:InformationURL xml:lang="it">http://www.unipr.it/idem</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">http://en.unipr.it/idem</mdui:InformationURL>
-      </mdui:UIInfo>
-      <mdui:DiscoHints>
-        <mdui:GeolocationHint>geo:44.76630697035048,10.314061939716339</mdui:GeolocationHint>
-      </mdui:DiscoHints>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDLDCCAhSgAwIBAgIVANMt6NQyQVgOzMWv6tQmeV5iMyCNMA0GCSqGSIb3DQEB
-BQUAMBsxGTAXBgNVBAMTEHNoaWJpZHAudW5pcHIuaXQwHhcNMDkwOTAyMDgwMjMz
-WhcNMjkwOTAyMDgwMjMzWjAbMRkwFwYDVQQDExBzaGliaWRwLnVuaXByLml0MIIB
-IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2vzK0+t0DPv0CugzVEeroctE
-N4VdJggVTqeQVexIM4sFW7q3kVQvmA8kgVMmcZ9RHYyZac6Uw3Dj0ooO+DjYsJBg
-YRB4eN13gCpeWZQ1gcbbgV9FhLZGs9r+SRPtWgOjPb1Sns88XFBftjy9fZ7RJqQo
-vbvklEOHgWhhuz4xy6YMOItT01Z+amabYrh6pDG0007vPZjhT10LqcEExwvZjo6I
-5xd5s0w8z84EtDry2FhSaWs5AX3sQZYIiPONp/11uRZSvBBFKmCMDEIA32bGEcEO
-DQLUNKNPs/9AYdj+JFhehtILdVFVmHj3U76P9z6x7Brhrr6bMZ+wdvj+t+kabQID
-AQABo2cwZTBEBgNVHREEPTA7ghBzaGliaWRwLnVuaXByLml0hidodHRwczovL3No
-aWJpZHAudW5pcHIuaXQvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFMlXoLjlhaJD
-mLtp1r0Upn1PYpYlMA0GCSqGSIb3DQEBBQUAA4IBAQCzfKVH8RL3qOrpo6ZAh/AV
-2vYGkeV1RlSc1yc07K/hKG3HKkBim5HvGxeT5jMRNLlXZRkWEnrzmfCoyeyTgbis
-4YWyqKT4VKLCqsOGBdn00mbRUVDhQSH2MSTEy6Iqa+3SDeQ8iyolKinYnBu0LDg7
-aU+b3F6vQHeLEdJvX1V6c/z7gV3YdNEA3Z9dCQavw47LLDB5QlCKtWuKklpBrQao
-ddU75GdAb8W4csgACMgqBSU30w/yJ79q8O9ajffJta01wOXXJhvtlGtNnV42ACg4
-Pqwh2EyQjPtYYja8SrAmwgp4k705jtn+QNLUs1VD6hw9LmoRFpxn1zb21fL3rZAs
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibidp.unipr.it:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibidp.unipr.it: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://shibidp.unipr.it/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibidp.unipr.it/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibidp.unipr.it/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibidp.unipr.it/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">unipr.it</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDLDCCAhSgAwIBAgIVANMt6NQyQVgOzMWv6tQmeV5iMyCNMA0GCSqGSIb3DQEB
-BQUAMBsxGTAXBgNVBAMTEHNoaWJpZHAudW5pcHIuaXQwHhcNMDkwOTAyMDgwMjMz
-WhcNMjkwOTAyMDgwMjMzWjAbMRkwFwYDVQQDExBzaGliaWRwLnVuaXByLml0MIIB
-IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2vzK0+t0DPv0CugzVEeroctE
-N4VdJggVTqeQVexIM4sFW7q3kVQvmA8kgVMmcZ9RHYyZac6Uw3Dj0ooO+DjYsJBg
-YRB4eN13gCpeWZQ1gcbbgV9FhLZGs9r+SRPtWgOjPb1Sns88XFBftjy9fZ7RJqQo
-vbvklEOHgWhhuz4xy6YMOItT01Z+amabYrh6pDG0007vPZjhT10LqcEExwvZjo6I
-5xd5s0w8z84EtDry2FhSaWs5AX3sQZYIiPONp/11uRZSvBBFKmCMDEIA32bGEcEO
-DQLUNKNPs/9AYdj+JFhehtILdVFVmHj3U76P9z6x7Brhrr6bMZ+wdvj+t+kabQID
-AQABo2cwZTBEBgNVHREEPTA7ghBzaGliaWRwLnVuaXByLml0hidodHRwczovL3No
-aWJpZHAudW5pcHIuaXQvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFMlXoLjlhaJD
-mLtp1r0Upn1PYpYlMA0GCSqGSIb3DQEBBQUAA4IBAQCzfKVH8RL3qOrpo6ZAh/AV
-2vYGkeV1RlSc1yc07K/hKG3HKkBim5HvGxeT5jMRNLlXZRkWEnrzmfCoyeyTgbis
-4YWyqKT4VKLCqsOGBdn00mbRUVDhQSH2MSTEy6Iqa+3SDeQ8iyolKinYnBu0LDg7
-aU+b3F6vQHeLEdJvX1V6c/z7gV3YdNEA3Z9dCQavw47LLDB5QlCKtWuKklpBrQao
-ddU75GdAb8W4csgACMgqBSU30w/yJ79q8O9ajffJta01wOXXJhvtlGtNnV42ACg4
-Pqwh2EyQjPtYYja8SrAmwgp4k705jtn+QNLUs1VD6hw9LmoRFpxn1zb21fL3rZAs
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibidp.unipr.it:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibidp.unipr.it: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="it">Università degli Studi di Parma</OrganizationName>
-    <OrganizationName xml:lang="en">University of Parma</OrganizationName>
-    <OrganizationDisplayName xml:lang="it">Università di Parma</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">University of Parma</OrganizationDisplayName>
-    <OrganizationURL xml:lang="it">http://www.unipr.it/</OrganizationURL>
-    <OrganizationURL xml:lang="en">http://en.unipr.it/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Marco</GivenName>
-    <SurName>Panella</SurName>
-    <EmailAddress>idem@unipr.it</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/si.crous-rouen.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/si.crous-rouen.fr-idp-shibboleth.xml
deleted file mode 100644
index 8919a65f..00000000
--- a/swamid-interfederations-2.0/si.crous-rouen.fr-idp-shibboleth.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="https://si.crous-rouen.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2013-03-07T17:54:36Z">
-      <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">crous-rouen.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">CROUS Rouen - Personnels</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIEhzCCA2+gAwIBAgIQJvlpRPEdizrPH+vEmo4c7zANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTEyMTIwNDAwMDAwMFoXDTE1MTIwNDIzNTk1OVowYTELMAkGA1UE
-BhMCRlIxFzAVBgNVBAoTDkNST1VTIGRlIFJvdWVuMR0wGwYDVQQLExRTZXJ2aWNl
-IGluZm9ybWF0aXF1ZTEaMBgGA1UEAxMRc2kuY3JvdXMtcm91ZW4uZnIwggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCxhfxnSTRvwvr8huLLous5gGIB3bA0
-VhtougdS1hdlNEhd+5ndm1GXOqQx3Mh0e6cEl2fmjAO1pf4VYuNpnjyGSmcln+58
-4CY/zPq5WNwKwY10rQy3N3TeXKaafI97p1bEOBViNdDmu/I2wr9tuGjfvMmBD00J
-k35yiFb8K2XxG3WUFRXBAIXwoxZbpBPalfr1dZ85F7UHqvgwh4fZQi3Zourwey5h
-08L86LLKBgeRkkoPbYrCJI6pcquCh9whh5jbFEjxpaFJD8zioEJ/q+ARdC4qtEF2
-OQebDHSd+Gy5wXWsnlu/XfSGhzxtaB6RNLLBogYuE+liCqDXVViQ9s71AgMBAAGj
-ggFkMIIBYDAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3V0fqkOO57TAdBgNVHQ4E
-FgQUF3MBzPJ4bF7LVHDZXQCs5WhxH5QwDgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB
-/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMBgGA1UdIAQRMA8w
-DQYLKwYBBAGyMQECAh0wOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3Mu
-dGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsG
-AQUFBzAChilodHRwOi8vY3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNy
-dDAmBggrBgEFBQcwAYYaaHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwHAYDVR0R
-BBUwE4IRc2kuY3JvdXMtcm91ZW4uZnIwDQYJKoZIhvcNAQEFBQADggEBACE/ua3I
-2BlsFzZ2gtxNlMVg6wLQhZkgoOx+Lz/IgZsCjwiIaoNDAj6XfNvSO/DAAbVoVQJt
-XzpmrdiHmG9L9U1RkVUkj7ADLF8BiHxsbXdva7fbRIry4hBdXfvy2vygdhP+YH78
-RAApFdog+ch9Q7pFovajXuJPxYa56W8OQ788uyO2cZqF834qJUbH9p6R78vLFH5Y
-pE+J4hzosDSAGW1pQrD0ZpUhr4dvnIkTk71if9YppptIBkjaQRs+A3VLlGjx/h+4
-KNJE8Xihgi+rF2omHHm1CzPNO0SDP7slHJNSbXGPcW8sGTtBq3j3qd7/hZrLxFr2
-3afUu/R74xDmkXU=
-					    </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://si.crous-rouen.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://si.crous-rouen.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://si.crous-rouen.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">crous-rouen.fr</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIEhzCCA2+gAwIBAgIQJvlpRPEdizrPH+vEmo4c7zANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTEyMTIwNDAwMDAwMFoXDTE1MTIwNDIzNTk1OVowYTELMAkGA1UE
-BhMCRlIxFzAVBgNVBAoTDkNST1VTIGRlIFJvdWVuMR0wGwYDVQQLExRTZXJ2aWNl
-IGluZm9ybWF0aXF1ZTEaMBgGA1UEAxMRc2kuY3JvdXMtcm91ZW4uZnIwggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCxhfxnSTRvwvr8huLLous5gGIB3bA0
-VhtougdS1hdlNEhd+5ndm1GXOqQx3Mh0e6cEl2fmjAO1pf4VYuNpnjyGSmcln+58
-4CY/zPq5WNwKwY10rQy3N3TeXKaafI97p1bEOBViNdDmu/I2wr9tuGjfvMmBD00J
-k35yiFb8K2XxG3WUFRXBAIXwoxZbpBPalfr1dZ85F7UHqvgwh4fZQi3Zourwey5h
-08L86LLKBgeRkkoPbYrCJI6pcquCh9whh5jbFEjxpaFJD8zioEJ/q+ARdC4qtEF2
-OQebDHSd+Gy5wXWsnlu/XfSGhzxtaB6RNLLBogYuE+liCqDXVViQ9s71AgMBAAGj
-ggFkMIIBYDAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3V0fqkOO57TAdBgNVHQ4E
-FgQUF3MBzPJ4bF7LVHDZXQCs5WhxH5QwDgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB
-/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMBgGA1UdIAQRMA8w
-DQYLKwYBBAGyMQECAh0wOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3Mu
-dGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsG
-AQUFBzAChilodHRwOi8vY3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNy
-dDAmBggrBgEFBQcwAYYaaHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwHAYDVR0R
-BBUwE4IRc2kuY3JvdXMtcm91ZW4uZnIwDQYJKoZIhvcNAQEFBQADggEBACE/ua3I
-2BlsFzZ2gtxNlMVg6wLQhZkgoOx+Lz/IgZsCjwiIaoNDAj6XfNvSO/DAAbVoVQJt
-XzpmrdiHmG9L9U1RkVUkj7ADLF8BiHxsbXdva7fbRIry4hBdXfvy2vygdhP+YH78
-RAApFdog+ch9Q7pFovajXuJPxYa56W8OQ788uyO2cZqF834qJUbH9p6R78vLFH5Y
-pE+J4hzosDSAGW1pQrD0ZpUhr4dvnIkTk71if9YppptIBkjaQRs+A3VLlGjx/h+4
-KNJE8Xihgi+rF2omHHm1CzPNO0SDP7slHJNSbXGPcW8sGTtBq3j3qd7/hZrLxFr2
-3afUu/R74xDmkXU=
-					    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://si.crous-rouen.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">CROUS Rouen - Personnels</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">CROUS Rouen - Personnels</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <EmailAddress>service-informatique@crous-rouen.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/si.crous-rouen.fr.xml b/swamid-interfederations-2.0/si.crous-rouen.fr.xml
deleted file mode 100644
index 8919a65f..00000000
--- a/swamid-interfederations-2.0/si.crous-rouen.fr.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="https://si.crous-rouen.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2013-03-07T17:54:36Z">
-      <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">crous-rouen.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">CROUS Rouen - Personnels</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIEhzCCA2+gAwIBAgIQJvlpRPEdizrPH+vEmo4c7zANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTEyMTIwNDAwMDAwMFoXDTE1MTIwNDIzNTk1OVowYTELMAkGA1UE
-BhMCRlIxFzAVBgNVBAoTDkNST1VTIGRlIFJvdWVuMR0wGwYDVQQLExRTZXJ2aWNl
-IGluZm9ybWF0aXF1ZTEaMBgGA1UEAxMRc2kuY3JvdXMtcm91ZW4uZnIwggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCxhfxnSTRvwvr8huLLous5gGIB3bA0
-VhtougdS1hdlNEhd+5ndm1GXOqQx3Mh0e6cEl2fmjAO1pf4VYuNpnjyGSmcln+58
-4CY/zPq5WNwKwY10rQy3N3TeXKaafI97p1bEOBViNdDmu/I2wr9tuGjfvMmBD00J
-k35yiFb8K2XxG3WUFRXBAIXwoxZbpBPalfr1dZ85F7UHqvgwh4fZQi3Zourwey5h
-08L86LLKBgeRkkoPbYrCJI6pcquCh9whh5jbFEjxpaFJD8zioEJ/q+ARdC4qtEF2
-OQebDHSd+Gy5wXWsnlu/XfSGhzxtaB6RNLLBogYuE+liCqDXVViQ9s71AgMBAAGj
-ggFkMIIBYDAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3V0fqkOO57TAdBgNVHQ4E
-FgQUF3MBzPJ4bF7LVHDZXQCs5WhxH5QwDgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB
-/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMBgGA1UdIAQRMA8w
-DQYLKwYBBAGyMQECAh0wOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3Mu
-dGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsG
-AQUFBzAChilodHRwOi8vY3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNy
-dDAmBggrBgEFBQcwAYYaaHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwHAYDVR0R
-BBUwE4IRc2kuY3JvdXMtcm91ZW4uZnIwDQYJKoZIhvcNAQEFBQADggEBACE/ua3I
-2BlsFzZ2gtxNlMVg6wLQhZkgoOx+Lz/IgZsCjwiIaoNDAj6XfNvSO/DAAbVoVQJt
-XzpmrdiHmG9L9U1RkVUkj7ADLF8BiHxsbXdva7fbRIry4hBdXfvy2vygdhP+YH78
-RAApFdog+ch9Q7pFovajXuJPxYa56W8OQ788uyO2cZqF834qJUbH9p6R78vLFH5Y
-pE+J4hzosDSAGW1pQrD0ZpUhr4dvnIkTk71if9YppptIBkjaQRs+A3VLlGjx/h+4
-KNJE8Xihgi+rF2omHHm1CzPNO0SDP7slHJNSbXGPcW8sGTtBq3j3qd7/hZrLxFr2
-3afUu/R74xDmkXU=
-					    </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://si.crous-rouen.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://si.crous-rouen.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://si.crous-rouen.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">crous-rouen.fr</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIEhzCCA2+gAwIBAgIQJvlpRPEdizrPH+vEmo4c7zANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTEyMTIwNDAwMDAwMFoXDTE1MTIwNDIzNTk1OVowYTELMAkGA1UE
-BhMCRlIxFzAVBgNVBAoTDkNST1VTIGRlIFJvdWVuMR0wGwYDVQQLExRTZXJ2aWNl
-IGluZm9ybWF0aXF1ZTEaMBgGA1UEAxMRc2kuY3JvdXMtcm91ZW4uZnIwggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCxhfxnSTRvwvr8huLLous5gGIB3bA0
-VhtougdS1hdlNEhd+5ndm1GXOqQx3Mh0e6cEl2fmjAO1pf4VYuNpnjyGSmcln+58
-4CY/zPq5WNwKwY10rQy3N3TeXKaafI97p1bEOBViNdDmu/I2wr9tuGjfvMmBD00J
-k35yiFb8K2XxG3WUFRXBAIXwoxZbpBPalfr1dZ85F7UHqvgwh4fZQi3Zourwey5h
-08L86LLKBgeRkkoPbYrCJI6pcquCh9whh5jbFEjxpaFJD8zioEJ/q+ARdC4qtEF2
-OQebDHSd+Gy5wXWsnlu/XfSGhzxtaB6RNLLBogYuE+liCqDXVViQ9s71AgMBAAGj
-ggFkMIIBYDAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3V0fqkOO57TAdBgNVHQ4E
-FgQUF3MBzPJ4bF7LVHDZXQCs5WhxH5QwDgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB
-/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMBgGA1UdIAQRMA8w
-DQYLKwYBBAGyMQECAh0wOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3Mu
-dGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsG
-AQUFBzAChilodHRwOi8vY3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNy
-dDAmBggrBgEFBQcwAYYaaHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwHAYDVR0R
-BBUwE4IRc2kuY3JvdXMtcm91ZW4uZnIwDQYJKoZIhvcNAQEFBQADggEBACE/ua3I
-2BlsFzZ2gtxNlMVg6wLQhZkgoOx+Lz/IgZsCjwiIaoNDAj6XfNvSO/DAAbVoVQJt
-XzpmrdiHmG9L9U1RkVUkj7ADLF8BiHxsbXdva7fbRIry4hBdXfvy2vygdhP+YH78
-RAApFdog+ch9Q7pFovajXuJPxYa56W8OQ788uyO2cZqF834qJUbH9p6R78vLFH5Y
-pE+J4hzosDSAGW1pQrD0ZpUhr4dvnIkTk71if9YppptIBkjaQRs+A3VLlGjx/h+4
-KNJE8Xihgi+rF2omHHm1CzPNO0SDP7slHJNSbXGPcW8sGTtBq3j3qd7/hZrLxFr2
-3afUu/R74xDmkXU=
-					    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://si.crous-rouen.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">CROUS Rouen - Personnels</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">CROUS Rouen - Personnels</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <EmailAddress>service-informatique@crous-rouen.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/siaiap08.univali.br-idp-shibboleth.xml b/swamid-interfederations-2.0/siaiap08.univali.br-idp-shibboleth.xml
deleted file mode 100644
index 0ca3c63b..00000000
--- a/swamid-interfederations-2.0/siaiap08.univali.br-idp-shibboleth.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://siaiap08.univali.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">univali.br</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">UNIVALI - Universidade do Vale do Itajai</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="pt-br">UNIVALI - Universidade do Vale do Itajai</mdui:DisplayName>
-        <mdui:Description xml:lang="en">UNIVALI - Universidade do Vale do Itajai</mdui:Description>
-        <mdui:Description xml:lang="pt-br">UNIVALI - Universidade do Vale do Itajai</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.univali.br/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="pt-br">http://www.univali.br/</mdui:InformationURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-    MIID0DCCArgCAQAwDQYJKoZIhvcNAQEFBQAwga0xJzAlBgNVBAoTHlVuaXZlcnNp
-ZGFkZSBkbyBWYWxlIGRvIEl0YWphaTEMMAoGA1UECxMDR1RJMR8wHQYJKoZIhvcN
-AQkBFhBhZG1pbkB1bml2YWxpLmJyMQ8wDQYDVQQHEwZJdGFqYWkxFzAVBgNVBAgT
-DlNhbnRhIENhdGFyaW5hMQswCQYDVQQGEwJCUjEcMBoGA1UEAxMTc2lhaWFwMDgu
-dW5pdmFsaS5icjAeFw0xNDA0MTcxMjMzNTdaFw0xOTA0MTYxMjMzNTdaMIGtMScw
-JQYDVQQKEx5Vbml2ZXJzaWRhZGUgZG8gVmFsZSBkbyBJdGFqYWkxDDAKBgNVBAsT
-A0dUSTEfMB0GCSqGSIb3DQEJARYQYWRtaW5AdW5pdmFsaS5icjEPMA0GA1UEBxMG
-SXRhamFpMRcwFQYDVQQIEw5TYW50YSBDYXRhcmluYTELMAkGA1UEBhMCQlIxHDAa
-BgNVBAMTE3NpYWlhcDA4LnVuaXZhbGkuYnIwggEiMA0GCSqGSIb3DQEBAQUAA4IB
-DwAwggEKAoIBAQC0j73uQz7HKNv3mF/UfQ4qiCC/A1o8QwYJGhvyT7Ie9DQUP1UL
-yxF4hSYQ/Xtla7Bm0E3iJBZkcJDZ9k6xOhIwMrWa7reWzDzqUCdzbb0DtvSqiR1e
-iDiHfS0kjS482IBaBsO9hYOueRm8FlrAe8JBEVWaild1/9o3OazFb6Nnm97tbuW0
-kLHeAjM5z5Q2HDaAPH4mw78ctdZrQgLgdwKn71EPIrD2Dw00Bz/1Ndvx1KJPUFxB
-hDHT0cMTQ3imeWptocy65Tq7q2xpBwtkWjJqGMLYoGVbr4+aBq8CahoW+8zMrlqo
-aVNU9398awtGiLuFKQRQzwoYOOAy9CoDlcJHAgMBAAEwDQYJKoZIhvcNAQEFBQAD
-ggEBAByTETZ7kpMiPJvt/zy+0q5ClKYda3WpqLpaTwnLl359k72A0KSYrZn6siv6
-GcSrTzlf5X+gEH1rFqySh+JYfIUo/xS2CYJC9zbtuCXiJKuzuXBgR69aPlzBP5kG
-qXMP3r2nGYCZhoVdtONZR7i1V9tzhjEziRi8FTj0RMxxE01pNYd34mp82tRxZsFk
-+dmRQQjNfM5zWaEosG94oV1X+QP06y4AER/kTVZKh1TJOPzHvY/fG8QheEKOHO1j
-xEaJyWk8Zd0mumri/3t63hxIHiILLh+rYK+0qYV/5SF51Qb6a+V93w0FfR0X+vbF
-bDtUbUIh3bPnDHUI9So2aC1i27Q=
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://siaiap08.univali.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://siaiap08.univali.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://siaiap08.univali.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://siaiap08.univali.br/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://siaiap08.univali.br/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://siaiap08.univali.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">univali.br</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-      
-MIID0DCCArgCAQAwDQYJKoZIhvcNAQEFBQAwga0xJzAlBgNVBAoTHlVuaXZlcnNp
-ZGFkZSBkbyBWYWxlIGRvIEl0YWphaTEMMAoGA1UECxMDR1RJMR8wHQYJKoZIhvcN
-AQkBFhBhZG1pbkB1bml2YWxpLmJyMQ8wDQYDVQQHEwZJdGFqYWkxFzAVBgNVBAgT
-DlNhbnRhIENhdGFyaW5hMQswCQYDVQQGEwJCUjEcMBoGA1UEAxMTc2lhaWFwMDgu
-dW5pdmFsaS5icjAeFw0xNDA0MTcxMjMzNTdaFw0xOTA0MTYxMjMzNTdaMIGtMScw
-JQYDVQQKEx5Vbml2ZXJzaWRhZGUgZG8gVmFsZSBkbyBJdGFqYWkxDDAKBgNVBAsT
-A0dUSTEfMB0GCSqGSIb3DQEJARYQYWRtaW5AdW5pdmFsaS5icjEPMA0GA1UEBxMG
-SXRhamFpMRcwFQYDVQQIEw5TYW50YSBDYXRhcmluYTELMAkGA1UEBhMCQlIxHDAa
-BgNVBAMTE3NpYWlhcDA4LnVuaXZhbGkuYnIwggEiMA0GCSqGSIb3DQEBAQUAA4IB
-DwAwggEKAoIBAQC0j73uQz7HKNv3mF/UfQ4qiCC/A1o8QwYJGhvyT7Ie9DQUP1UL
-yxF4hSYQ/Xtla7Bm0E3iJBZkcJDZ9k6xOhIwMrWa7reWzDzqUCdzbb0DtvSqiR1e
-iDiHfS0kjS482IBaBsO9hYOueRm8FlrAe8JBEVWaild1/9o3OazFb6Nnm97tbuW0
-kLHeAjM5z5Q2HDaAPH4mw78ctdZrQgLgdwKn71EPIrD2Dw00Bz/1Ndvx1KJPUFxB
-hDHT0cMTQ3imeWptocy65Tq7q2xpBwtkWjJqGMLYoGVbr4+aBq8CahoW+8zMrlqo
-aVNU9398awtGiLuFKQRQzwoYOOAy9CoDlcJHAgMBAAEwDQYJKoZIhvcNAQEFBQAD
-ggEBAByTETZ7kpMiPJvt/zy+0q5ClKYda3WpqLpaTwnLl359k72A0KSYrZn6siv6
-GcSrTzlf5X+gEH1rFqySh+JYfIUo/xS2CYJC9zbtuCXiJKuzuXBgR69aPlzBP5kG
-qXMP3r2nGYCZhoVdtONZR7i1V9tzhjEziRi8FTj0RMxxE01pNYd34mp82tRxZsFk
-+dmRQQjNfM5zWaEosG94oV1X+QP06y4AER/kTVZKh1TJOPzHvY/fG8QheEKOHO1j
-xEaJyWk8Zd0mumri/3t63hxIHiILLh+rYK+0qYV/5SF51Qb6a+V93w0FfR0X+vbF
-bDtUbUIh3bPnDHUI9So2aC1i27Q=
-                    
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://siaiap08.univali.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://siaiap08.univali.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">UNIVALI - Universidade do Vale do Itajai</OrganizationName>
-    <OrganizationName xml:lang="pt-br">UNIVALI - Universidade do Vale do Itajai</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">UNIVALI - Universidade do Vale do Itajai</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="pt-br">UNIVALI - Universidade do Vale do Itajai</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.univali.br/</OrganizationURL>
-    <OrganizationURL xml:lang="pt-br">http://www.univali.br/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Marcio Luiz Ota</SurName>
-    <EmailAddress>admin@univali.br</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/siaiap08.univali.br.xml b/swamid-interfederations-2.0/siaiap08.univali.br.xml
deleted file mode 100644
index 0ca3c63b..00000000
--- a/swamid-interfederations-2.0/siaiap08.univali.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://siaiap08.univali.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">univali.br</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">UNIVALI - Universidade do Vale do Itajai</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="pt-br">UNIVALI - Universidade do Vale do Itajai</mdui:DisplayName>
-        <mdui:Description xml:lang="en">UNIVALI - Universidade do Vale do Itajai</mdui:Description>
-        <mdui:Description xml:lang="pt-br">UNIVALI - Universidade do Vale do Itajai</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.univali.br/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="pt-br">http://www.univali.br/</mdui:InformationURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-    MIID0DCCArgCAQAwDQYJKoZIhvcNAQEFBQAwga0xJzAlBgNVBAoTHlVuaXZlcnNp
-ZGFkZSBkbyBWYWxlIGRvIEl0YWphaTEMMAoGA1UECxMDR1RJMR8wHQYJKoZIhvcN
-AQkBFhBhZG1pbkB1bml2YWxpLmJyMQ8wDQYDVQQHEwZJdGFqYWkxFzAVBgNVBAgT
-DlNhbnRhIENhdGFyaW5hMQswCQYDVQQGEwJCUjEcMBoGA1UEAxMTc2lhaWFwMDgu
-dW5pdmFsaS5icjAeFw0xNDA0MTcxMjMzNTdaFw0xOTA0MTYxMjMzNTdaMIGtMScw
-JQYDVQQKEx5Vbml2ZXJzaWRhZGUgZG8gVmFsZSBkbyBJdGFqYWkxDDAKBgNVBAsT
-A0dUSTEfMB0GCSqGSIb3DQEJARYQYWRtaW5AdW5pdmFsaS5icjEPMA0GA1UEBxMG
-SXRhamFpMRcwFQYDVQQIEw5TYW50YSBDYXRhcmluYTELMAkGA1UEBhMCQlIxHDAa
-BgNVBAMTE3NpYWlhcDA4LnVuaXZhbGkuYnIwggEiMA0GCSqGSIb3DQEBAQUAA4IB
-DwAwggEKAoIBAQC0j73uQz7HKNv3mF/UfQ4qiCC/A1o8QwYJGhvyT7Ie9DQUP1UL
-yxF4hSYQ/Xtla7Bm0E3iJBZkcJDZ9k6xOhIwMrWa7reWzDzqUCdzbb0DtvSqiR1e
-iDiHfS0kjS482IBaBsO9hYOueRm8FlrAe8JBEVWaild1/9o3OazFb6Nnm97tbuW0
-kLHeAjM5z5Q2HDaAPH4mw78ctdZrQgLgdwKn71EPIrD2Dw00Bz/1Ndvx1KJPUFxB
-hDHT0cMTQ3imeWptocy65Tq7q2xpBwtkWjJqGMLYoGVbr4+aBq8CahoW+8zMrlqo
-aVNU9398awtGiLuFKQRQzwoYOOAy9CoDlcJHAgMBAAEwDQYJKoZIhvcNAQEFBQAD
-ggEBAByTETZ7kpMiPJvt/zy+0q5ClKYda3WpqLpaTwnLl359k72A0KSYrZn6siv6
-GcSrTzlf5X+gEH1rFqySh+JYfIUo/xS2CYJC9zbtuCXiJKuzuXBgR69aPlzBP5kG
-qXMP3r2nGYCZhoVdtONZR7i1V9tzhjEziRi8FTj0RMxxE01pNYd34mp82tRxZsFk
-+dmRQQjNfM5zWaEosG94oV1X+QP06y4AER/kTVZKh1TJOPzHvY/fG8QheEKOHO1j
-xEaJyWk8Zd0mumri/3t63hxIHiILLh+rYK+0qYV/5SF51Qb6a+V93w0FfR0X+vbF
-bDtUbUIh3bPnDHUI9So2aC1i27Q=
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://siaiap08.univali.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://siaiap08.univali.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://siaiap08.univali.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://siaiap08.univali.br/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://siaiap08.univali.br/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://siaiap08.univali.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">univali.br</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-      
-MIID0DCCArgCAQAwDQYJKoZIhvcNAQEFBQAwga0xJzAlBgNVBAoTHlVuaXZlcnNp
-ZGFkZSBkbyBWYWxlIGRvIEl0YWphaTEMMAoGA1UECxMDR1RJMR8wHQYJKoZIhvcN
-AQkBFhBhZG1pbkB1bml2YWxpLmJyMQ8wDQYDVQQHEwZJdGFqYWkxFzAVBgNVBAgT
-DlNhbnRhIENhdGFyaW5hMQswCQYDVQQGEwJCUjEcMBoGA1UEAxMTc2lhaWFwMDgu
-dW5pdmFsaS5icjAeFw0xNDA0MTcxMjMzNTdaFw0xOTA0MTYxMjMzNTdaMIGtMScw
-JQYDVQQKEx5Vbml2ZXJzaWRhZGUgZG8gVmFsZSBkbyBJdGFqYWkxDDAKBgNVBAsT
-A0dUSTEfMB0GCSqGSIb3DQEJARYQYWRtaW5AdW5pdmFsaS5icjEPMA0GA1UEBxMG
-SXRhamFpMRcwFQYDVQQIEw5TYW50YSBDYXRhcmluYTELMAkGA1UEBhMCQlIxHDAa
-BgNVBAMTE3NpYWlhcDA4LnVuaXZhbGkuYnIwggEiMA0GCSqGSIb3DQEBAQUAA4IB
-DwAwggEKAoIBAQC0j73uQz7HKNv3mF/UfQ4qiCC/A1o8QwYJGhvyT7Ie9DQUP1UL
-yxF4hSYQ/Xtla7Bm0E3iJBZkcJDZ9k6xOhIwMrWa7reWzDzqUCdzbb0DtvSqiR1e
-iDiHfS0kjS482IBaBsO9hYOueRm8FlrAe8JBEVWaild1/9o3OazFb6Nnm97tbuW0
-kLHeAjM5z5Q2HDaAPH4mw78ctdZrQgLgdwKn71EPIrD2Dw00Bz/1Ndvx1KJPUFxB
-hDHT0cMTQ3imeWptocy65Tq7q2xpBwtkWjJqGMLYoGVbr4+aBq8CahoW+8zMrlqo
-aVNU9398awtGiLuFKQRQzwoYOOAy9CoDlcJHAgMBAAEwDQYJKoZIhvcNAQEFBQAD
-ggEBAByTETZ7kpMiPJvt/zy+0q5ClKYda3WpqLpaTwnLl359k72A0KSYrZn6siv6
-GcSrTzlf5X+gEH1rFqySh+JYfIUo/xS2CYJC9zbtuCXiJKuzuXBgR69aPlzBP5kG
-qXMP3r2nGYCZhoVdtONZR7i1V9tzhjEziRi8FTj0RMxxE01pNYd34mp82tRxZsFk
-+dmRQQjNfM5zWaEosG94oV1X+QP06y4AER/kTVZKh1TJOPzHvY/fG8QheEKOHO1j
-xEaJyWk8Zd0mumri/3t63hxIHiILLh+rYK+0qYV/5SF51Qb6a+V93w0FfR0X+vbF
-bDtUbUIh3bPnDHUI9So2aC1i27Q=
-                    
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://siaiap08.univali.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://siaiap08.univali.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">UNIVALI - Universidade do Vale do Itajai</OrganizationName>
-    <OrganizationName xml:lang="pt-br">UNIVALI - Universidade do Vale do Itajai</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">UNIVALI - Universidade do Vale do Itajai</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="pt-br">UNIVALI - Universidade do Vale do Itajai</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.univali.br/</OrganizationURL>
-    <OrganizationURL xml:lang="pt-br">http://www.univali.br/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Marcio Luiz Ota</SurName>
-    <EmailAddress>admin@univali.br</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/signon.rug.nl-nidp-saml2-metadata.xml b/swamid-interfederations-2.0/signon.rug.nl-nidp-saml2-metadata.xml
deleted file mode 100644
index 88dd8652..00000000
--- a/swamid-interfederations-2.0/signon.rug.nl-nidp-saml2-metadata.xml
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://signon.rug.nl/nidp/saml2/metadata">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.surfconext.nl/" registrationInstant="2014-10-09T11:57:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://wiki.surfnetlabs.nl/display/eduGAIN/EduGAIN</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="nl">Rijksuniversiteit Groningen</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">University of Groningen</mdui:DisplayName>
-        <mdui:Description xml:lang="nl">Rijksuniversiteit Groningen</mdui:Description>
-        <mdui:Description xml:lang="en">Rijksuniversiteit Groningen</mdui:Description>
-        <mdui:Logo height="25" width="108">https://static.surfconext.nl/media/idp/rug.png</mdui:Logo>
-        <mdui:Keywords xml:lang="nl">University of Groningen Rijksuniversiteit Groningen RUG</mdui:Keywords>
-        <mdui:Keywords xml:lang="en">University of Groningen Rijksuniversiteit Groningen RUG</mdui:Keywords>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor xmlns:ds="http://www.w3.org/2000/09/xmldsig#" use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIID3zCCAsegAwIBAgIJAMVC9xn1ZfsuMA0GCSqGSIb3DQEBCwUAMIGFMQswCQYD
-VQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMG
-A1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQD
-DB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTAeFw0xNDA1MDUxNDIyMzVa
-Fw0xOTA1MDUxNDIyMzVaMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNo
-dDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYD
-VQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAy
-MDE0MDUwNTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKthMDbB0jKH
-efPzmRu9t2h7iLP4wAXr42bHpjzTEk6gttHFb4l/hFiz1YBI88TjiH6hVjnozo/Y
-HA2c51us+Y7g0XoS7653lbUN/EHzvDMuyis4Xi2Ijf1A/OUQfH1iFUWttIgtWK9+
-fatXoGUS6tirQvrzVh6ZstEp1xbpo1SF6UoVl+fh7tM81qz+Crr/Kroan0UjpZOF
-TwxPoK6fdLgMAieKSCRmBGpbJHbQ2xxbdykBBrBbdfzIX4CDepfjE9h/40ldw5jR
-n3e392jrS6htk23N9BWWrpBT5QCk0kH3h/6F1Dm6TkyG9CDtt73/anuRkvXbeygI
-4wml9bL3rE8CAwEAAaNQME4wHQYDVR0OBBYEFD+Ac7akFxaMhBQAjVfvgGfY8hNK
-MB8GA1UdIwQYMBaAFD+Ac7akFxaMhBQAjVfvgGfY8hNKMAwGA1UdEwQFMAMBAf8w
-DQYJKoZIhvcNAQELBQADggEBAC8L9D67CxIhGo5aGVu63WqRHBNOdo/FAGI7LURD
-FeRmG5nRw/VXzJLGJksh4FSkx7aPrxNWF1uFiDZ80EuYQuIv7bDLblK31ZEbdg1R
-9LgiZCdYSr464I7yXQY9o6FiNtSKZkQO8EsscJPPy/Zp4uHAnADWACkOUHiCbcKi
-UUFu66dX0Wr/v53Gekz487GgVRs8HEeT9MU1reBKRgdENR8PNg4rbQfLc3YQKLWK
-7yWnn/RenjDpuCiePj8N8/80tGgrNgK/6fzM3zI18sSywnXLswxqDb/J+jgVxnQ6
-MrsTf1urM8MnfcxG/82oHIwfMh/sXPCZpo+DTLkhQxctJ3M=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:NameIDFormat xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:NameIDFormat xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">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://engine.surfconext.nl/authentication/idp/single-sign-on/56d78f05c751aeb3d57b29caff8510e3"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Rijksuniversiteit Groningen</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">RUG</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.rug.nl</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>SURFconext support</md:GivenName>
-    <md:EmailAddress>support@surfconext.nl</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>SURFconext support</md:GivenName>
-    <md:EmailAddress>support@surfconext.nl</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>SURFconext support</md:GivenName>
-    <md:EmailAddress>help@surfconext.nl</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/signon.rug.nl.xml b/swamid-interfederations-2.0/signon.rug.nl.xml
deleted file mode 100644
index 88dd8652..00000000
--- a/swamid-interfederations-2.0/signon.rug.nl.xml
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://signon.rug.nl/nidp/saml2/metadata">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.surfconext.nl/" registrationInstant="2014-10-09T11:57:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://wiki.surfnetlabs.nl/display/eduGAIN/EduGAIN</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="nl">Rijksuniversiteit Groningen</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">University of Groningen</mdui:DisplayName>
-        <mdui:Description xml:lang="nl">Rijksuniversiteit Groningen</mdui:Description>
-        <mdui:Description xml:lang="en">Rijksuniversiteit Groningen</mdui:Description>
-        <mdui:Logo height="25" width="108">https://static.surfconext.nl/media/idp/rug.png</mdui:Logo>
-        <mdui:Keywords xml:lang="nl">University of Groningen Rijksuniversiteit Groningen RUG</mdui:Keywords>
-        <mdui:Keywords xml:lang="en">University of Groningen Rijksuniversiteit Groningen RUG</mdui:Keywords>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor xmlns:ds="http://www.w3.org/2000/09/xmldsig#" use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIID3zCCAsegAwIBAgIJAMVC9xn1ZfsuMA0GCSqGSIb3DQEBCwUAMIGFMQswCQYD
-VQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMG
-A1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQD
-DB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTAeFw0xNDA1MDUxNDIyMzVa
-Fw0xOTA1MDUxNDIyMzVaMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNo
-dDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYD
-VQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAy
-MDE0MDUwNTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKthMDbB0jKH
-efPzmRu9t2h7iLP4wAXr42bHpjzTEk6gttHFb4l/hFiz1YBI88TjiH6hVjnozo/Y
-HA2c51us+Y7g0XoS7653lbUN/EHzvDMuyis4Xi2Ijf1A/OUQfH1iFUWttIgtWK9+
-fatXoGUS6tirQvrzVh6ZstEp1xbpo1SF6UoVl+fh7tM81qz+Crr/Kroan0UjpZOF
-TwxPoK6fdLgMAieKSCRmBGpbJHbQ2xxbdykBBrBbdfzIX4CDepfjE9h/40ldw5jR
-n3e392jrS6htk23N9BWWrpBT5QCk0kH3h/6F1Dm6TkyG9CDtt73/anuRkvXbeygI
-4wml9bL3rE8CAwEAAaNQME4wHQYDVR0OBBYEFD+Ac7akFxaMhBQAjVfvgGfY8hNK
-MB8GA1UdIwQYMBaAFD+Ac7akFxaMhBQAjVfvgGfY8hNKMAwGA1UdEwQFMAMBAf8w
-DQYJKoZIhvcNAQELBQADggEBAC8L9D67CxIhGo5aGVu63WqRHBNOdo/FAGI7LURD
-FeRmG5nRw/VXzJLGJksh4FSkx7aPrxNWF1uFiDZ80EuYQuIv7bDLblK31ZEbdg1R
-9LgiZCdYSr464I7yXQY9o6FiNtSKZkQO8EsscJPPy/Zp4uHAnADWACkOUHiCbcKi
-UUFu66dX0Wr/v53Gekz487GgVRs8HEeT9MU1reBKRgdENR8PNg4rbQfLc3YQKLWK
-7yWnn/RenjDpuCiePj8N8/80tGgrNgK/6fzM3zI18sSywnXLswxqDb/J+jgVxnQ6
-MrsTf1urM8MnfcxG/82oHIwfMh/sXPCZpo+DTLkhQxctJ3M=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:NameIDFormat xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:NameIDFormat xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">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://engine.surfconext.nl/authentication/idp/single-sign-on/56d78f05c751aeb3d57b29caff8510e3"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Rijksuniversiteit Groningen</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">RUG</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.rug.nl</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>SURFconext support</md:GivenName>
-    <md:EmailAddress>support@surfconext.nl</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>SURFconext support</md:GivenName>
-    <md:EmailAddress>support@surfconext.nl</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>SURFconext support</md:GivenName>
-    <md:EmailAddress>help@surfconext.nl</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sistemas.uepg.br-idp-shibboleth.xml b/swamid-interfederations-2.0/sistemas.uepg.br-idp-shibboleth.xml
deleted file mode 100644
index 3ffe26c5..00000000
--- a/swamid-interfederations-2.0/sistemas.uepg.br-idp-shibboleth.xml
+++ /dev/null
@@ -1,122 +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://sistemas.uepg.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">uepg.br</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">UEPG - Universidade Estadual de Ponta Grossa</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="pt-br">UEPG - Universidade Estadual de Ponta Grossa</mdui:DisplayName>
-        <mdui:Description xml:lang="en">UEPG - Universidade Estadual de Ponta Grossa</mdui:Description>
-        <mdui:Description xml:lang="pt-br">UEPG - Universidade Estadual de Ponta Grossa</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.uepg.br/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="pt-br">http://www.uepg.br/</mdui:InformationURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-    MIIE2zCCA8OgAwIBAgIQCOU7rX76FeJ9Ci35yhOEPDANBgkqhkiG9w0BAQsFADA8
-MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMVGhhd3RlLCBJbmMuMRYwFAYDVQQDEw1U
-aGF3dGUgU1NMIENBMB4XDTEzMTEyMjAwMDAwMFoXDTE2MTIyMTIzNTk1OVowgasx
-CzAJBgNVBAYTAkJSMQ8wDQYDVQQIEwZQYXJhbmExFTATBgNVBAcUDFBvbnRhIEdy
-b3NzYTEuMCwGA1UEChQlVW5pdmVyc2lkYWRlIEVzdGFkdWFsIGRlIFBvbnRhIEdy
-b3NzYTEpMCcGA1UECxQgQ2VudHJvIGRlIFByb2Nlc3NhbWVudG8gZGUgRGFkb3Mx
-GTAXBgNVBAMUEHNpc3RlbWFzLnVlcGcuYnIwggEiMA0GCSqGSIb3DQEBAQUAA4IB
-DwAwggEKAoIBAQC4Z3ynISGCCLmgO6uxZXCyCy2217M4h4R8pK0wB6tQUBxqU6jr
-VI2iw1O1Xw3H18qFkk6BdjDF4fJaF9qY3qwZ5JMrL2kKCWubkHB67Ig13R8bKVGL
-SCl/h8UAbhU6g8PDUSEN/gyPVT8H/g8jOeJAS3ruE9XVdbYQUUEHV6sCBRSztz2U
-NtlGDeQYZ0haN7sX2kXk1vx4xYLzYhTEavajLtY2Kcsp8u/Uy8f1IuV9chNsLfdl
-aZrnMT/Z28qCoWAeFfz4M6bAZ6Gcyy0TeSI8BDmAqsH7WVukEZ5WEhI/wQx3+z9V
-0YnDr3ZTZlDn1Z+1WLjvRpwDfYN048D3DnABAgMBAAGjggFnMIIBYzAbBgNVHREE
-FDASghBzaXN0ZW1hcy51ZXBnLmJyMAkGA1UdEwQCMAAwQgYDVR0gBDswOTA3Bgpg
-hkgBhvhFAQc2MCkwJwYIKwYBBQUHAgEWG2h0dHBzOi8vd3d3LnRoYXd0ZS5jb20v
-Y3BzLzAOBgNVHQ8BAf8EBAMCBaAwHwYDVR0jBBgwFoAUp6KDuzRFQD381TBPErk+
-oQGf9tswOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL3N2ci1vdi1jcmwudGhhd3Rl
-LmNvbS9UaGF3dGVPVi5jcmwwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMC
-MGkGCCsGAQUFBwEBBF0wWzAiBggrBgEFBQcwAYYWaHR0cDovL29jc3AudGhhd3Rl
-LmNvbTA1BggrBgEFBQcwAoYpaHR0cDovL3N2ci1vdi1haWEudGhhd3RlLmNvbS9U
-aGF3dGVPVi5jZXIwDQYJKoZIhvcNAQELBQADggEBADyZXmy6yj//w3chkKMS5mDJ
-c+QyGYnnANYl+3chFGMdOA0MbZV/r6bPpLj0ieHgH76jvCGq7cYDOIX2mJL5UaBt
-pFzP3P/mcrKtgiWVRKPTPSyIEOK3WhAch+kTAiyuf9BAdZXi8GUcF1SYOqxzbWKI
-gYTclKgiji9i8hTJ8NYvLjerxo+hYzXcehaXKvMH78M3qkbHQgu4vKy75hj1O3zw
-sHWt+1i6mNY63pFCGL9zZeuvmoj5USwrwcZXQ2tkwbIMAfqiuGYZnyW7oGYvYagZ
-n41/XeNFdPEQgN8XAz72MitYRzlpUzt8hPgz8zW8yn5JZ3fv56NgRigMwsQgLew=
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sistemas.uepg.br/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://sistemas.uepg.br/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://sistemas.uepg.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sistemas.uepg.br/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://sistemas.uepg.br/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sistemas.uepg.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">uepg.br</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-      
-MIIE2zCCA8OgAwIBAgIQCOU7rX76FeJ9Ci35yhOEPDANBgkqhkiG9w0BAQsFADA8
-MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMVGhhd3RlLCBJbmMuMRYwFAYDVQQDEw1U
-aGF3dGUgU1NMIENBMB4XDTEzMTEyMjAwMDAwMFoXDTE2MTIyMTIzNTk1OVowgasx
-CzAJBgNVBAYTAkJSMQ8wDQYDVQQIEwZQYXJhbmExFTATBgNVBAcUDFBvbnRhIEdy
-b3NzYTEuMCwGA1UEChQlVW5pdmVyc2lkYWRlIEVzdGFkdWFsIGRlIFBvbnRhIEdy
-b3NzYTEpMCcGA1UECxQgQ2VudHJvIGRlIFByb2Nlc3NhbWVudG8gZGUgRGFkb3Mx
-GTAXBgNVBAMUEHNpc3RlbWFzLnVlcGcuYnIwggEiMA0GCSqGSIb3DQEBAQUAA4IB
-DwAwggEKAoIBAQC4Z3ynISGCCLmgO6uxZXCyCy2217M4h4R8pK0wB6tQUBxqU6jr
-VI2iw1O1Xw3H18qFkk6BdjDF4fJaF9qY3qwZ5JMrL2kKCWubkHB67Ig13R8bKVGL
-SCl/h8UAbhU6g8PDUSEN/gyPVT8H/g8jOeJAS3ruE9XVdbYQUUEHV6sCBRSztz2U
-NtlGDeQYZ0haN7sX2kXk1vx4xYLzYhTEavajLtY2Kcsp8u/Uy8f1IuV9chNsLfdl
-aZrnMT/Z28qCoWAeFfz4M6bAZ6Gcyy0TeSI8BDmAqsH7WVukEZ5WEhI/wQx3+z9V
-0YnDr3ZTZlDn1Z+1WLjvRpwDfYN048D3DnABAgMBAAGjggFnMIIBYzAbBgNVHREE
-FDASghBzaXN0ZW1hcy51ZXBnLmJyMAkGA1UdEwQCMAAwQgYDVR0gBDswOTA3Bgpg
-hkgBhvhFAQc2MCkwJwYIKwYBBQUHAgEWG2h0dHBzOi8vd3d3LnRoYXd0ZS5jb20v
-Y3BzLzAOBgNVHQ8BAf8EBAMCBaAwHwYDVR0jBBgwFoAUp6KDuzRFQD381TBPErk+
-oQGf9tswOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL3N2ci1vdi1jcmwudGhhd3Rl
-LmNvbS9UaGF3dGVPVi5jcmwwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMC
-MGkGCCsGAQUFBwEBBF0wWzAiBggrBgEFBQcwAYYWaHR0cDovL29jc3AudGhhd3Rl
-LmNvbTA1BggrBgEFBQcwAoYpaHR0cDovL3N2ci1vdi1haWEudGhhd3RlLmNvbS9U
-aGF3dGVPVi5jZXIwDQYJKoZIhvcNAQELBQADggEBADyZXmy6yj//w3chkKMS5mDJ
-c+QyGYnnANYl+3chFGMdOA0MbZV/r6bPpLj0ieHgH76jvCGq7cYDOIX2mJL5UaBt
-pFzP3P/mcrKtgiWVRKPTPSyIEOK3WhAch+kTAiyuf9BAdZXi8GUcF1SYOqxzbWKI
-gYTclKgiji9i8hTJ8NYvLjerxo+hYzXcehaXKvMH78M3qkbHQgu4vKy75hj1O3zw
-sHWt+1i6mNY63pFCGL9zZeuvmoj5USwrwcZXQ2tkwbIMAfqiuGYZnyW7oGYvYagZ
-n41/XeNFdPEQgN8XAz72MitYRzlpUzt8hPgz8zW8yn5JZ3fv56NgRigMwsQgLew=
-                    
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sistemas.uepg.br/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://sistemas.uepg.br/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">UEPG - Universidade Estadual de Ponta Grossa</OrganizationName>
-    <OrganizationName xml:lang="pt-br">UEPG - Universidade Estadual de Ponta Grossa</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">UEPG - Universidade Estadual de Ponta Grossa</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="pt-br">UEPG - Universidade Estadual de Ponta Grossa</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.uepg.br/</OrganizationURL>
-    <OrganizationURL xml:lang="pt-br">http://www.uepg.br/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Luiz Gustavo Barros</SurName>
-    <EmailAddress>gustavo@uepg.br</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sistemas.uepg.br.xml b/swamid-interfederations-2.0/sistemas.uepg.br.xml
deleted file mode 100644
index 3ffe26c5..00000000
--- a/swamid-interfederations-2.0/sistemas.uepg.br.xml
+++ /dev/null
@@ -1,122 +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://sistemas.uepg.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">uepg.br</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">UEPG - Universidade Estadual de Ponta Grossa</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="pt-br">UEPG - Universidade Estadual de Ponta Grossa</mdui:DisplayName>
-        <mdui:Description xml:lang="en">UEPG - Universidade Estadual de Ponta Grossa</mdui:Description>
-        <mdui:Description xml:lang="pt-br">UEPG - Universidade Estadual de Ponta Grossa</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.uepg.br/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="pt-br">http://www.uepg.br/</mdui:InformationURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-    MIIE2zCCA8OgAwIBAgIQCOU7rX76FeJ9Ci35yhOEPDANBgkqhkiG9w0BAQsFADA8
-MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMVGhhd3RlLCBJbmMuMRYwFAYDVQQDEw1U
-aGF3dGUgU1NMIENBMB4XDTEzMTEyMjAwMDAwMFoXDTE2MTIyMTIzNTk1OVowgasx
-CzAJBgNVBAYTAkJSMQ8wDQYDVQQIEwZQYXJhbmExFTATBgNVBAcUDFBvbnRhIEdy
-b3NzYTEuMCwGA1UEChQlVW5pdmVyc2lkYWRlIEVzdGFkdWFsIGRlIFBvbnRhIEdy
-b3NzYTEpMCcGA1UECxQgQ2VudHJvIGRlIFByb2Nlc3NhbWVudG8gZGUgRGFkb3Mx
-GTAXBgNVBAMUEHNpc3RlbWFzLnVlcGcuYnIwggEiMA0GCSqGSIb3DQEBAQUAA4IB
-DwAwggEKAoIBAQC4Z3ynISGCCLmgO6uxZXCyCy2217M4h4R8pK0wB6tQUBxqU6jr
-VI2iw1O1Xw3H18qFkk6BdjDF4fJaF9qY3qwZ5JMrL2kKCWubkHB67Ig13R8bKVGL
-SCl/h8UAbhU6g8PDUSEN/gyPVT8H/g8jOeJAS3ruE9XVdbYQUUEHV6sCBRSztz2U
-NtlGDeQYZ0haN7sX2kXk1vx4xYLzYhTEavajLtY2Kcsp8u/Uy8f1IuV9chNsLfdl
-aZrnMT/Z28qCoWAeFfz4M6bAZ6Gcyy0TeSI8BDmAqsH7WVukEZ5WEhI/wQx3+z9V
-0YnDr3ZTZlDn1Z+1WLjvRpwDfYN048D3DnABAgMBAAGjggFnMIIBYzAbBgNVHREE
-FDASghBzaXN0ZW1hcy51ZXBnLmJyMAkGA1UdEwQCMAAwQgYDVR0gBDswOTA3Bgpg
-hkgBhvhFAQc2MCkwJwYIKwYBBQUHAgEWG2h0dHBzOi8vd3d3LnRoYXd0ZS5jb20v
-Y3BzLzAOBgNVHQ8BAf8EBAMCBaAwHwYDVR0jBBgwFoAUp6KDuzRFQD381TBPErk+
-oQGf9tswOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL3N2ci1vdi1jcmwudGhhd3Rl
-LmNvbS9UaGF3dGVPVi5jcmwwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMC
-MGkGCCsGAQUFBwEBBF0wWzAiBggrBgEFBQcwAYYWaHR0cDovL29jc3AudGhhd3Rl
-LmNvbTA1BggrBgEFBQcwAoYpaHR0cDovL3N2ci1vdi1haWEudGhhd3RlLmNvbS9U
-aGF3dGVPVi5jZXIwDQYJKoZIhvcNAQELBQADggEBADyZXmy6yj//w3chkKMS5mDJ
-c+QyGYnnANYl+3chFGMdOA0MbZV/r6bPpLj0ieHgH76jvCGq7cYDOIX2mJL5UaBt
-pFzP3P/mcrKtgiWVRKPTPSyIEOK3WhAch+kTAiyuf9BAdZXi8GUcF1SYOqxzbWKI
-gYTclKgiji9i8hTJ8NYvLjerxo+hYzXcehaXKvMH78M3qkbHQgu4vKy75hj1O3zw
-sHWt+1i6mNY63pFCGL9zZeuvmoj5USwrwcZXQ2tkwbIMAfqiuGYZnyW7oGYvYagZ
-n41/XeNFdPEQgN8XAz72MitYRzlpUzt8hPgz8zW8yn5JZ3fv56NgRigMwsQgLew=
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sistemas.uepg.br/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://sistemas.uepg.br/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://sistemas.uepg.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sistemas.uepg.br/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://sistemas.uepg.br/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sistemas.uepg.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">uepg.br</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-      
-MIIE2zCCA8OgAwIBAgIQCOU7rX76FeJ9Ci35yhOEPDANBgkqhkiG9w0BAQsFADA8
-MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMVGhhd3RlLCBJbmMuMRYwFAYDVQQDEw1U
-aGF3dGUgU1NMIENBMB4XDTEzMTEyMjAwMDAwMFoXDTE2MTIyMTIzNTk1OVowgasx
-CzAJBgNVBAYTAkJSMQ8wDQYDVQQIEwZQYXJhbmExFTATBgNVBAcUDFBvbnRhIEdy
-b3NzYTEuMCwGA1UEChQlVW5pdmVyc2lkYWRlIEVzdGFkdWFsIGRlIFBvbnRhIEdy
-b3NzYTEpMCcGA1UECxQgQ2VudHJvIGRlIFByb2Nlc3NhbWVudG8gZGUgRGFkb3Mx
-GTAXBgNVBAMUEHNpc3RlbWFzLnVlcGcuYnIwggEiMA0GCSqGSIb3DQEBAQUAA4IB
-DwAwggEKAoIBAQC4Z3ynISGCCLmgO6uxZXCyCy2217M4h4R8pK0wB6tQUBxqU6jr
-VI2iw1O1Xw3H18qFkk6BdjDF4fJaF9qY3qwZ5JMrL2kKCWubkHB67Ig13R8bKVGL
-SCl/h8UAbhU6g8PDUSEN/gyPVT8H/g8jOeJAS3ruE9XVdbYQUUEHV6sCBRSztz2U
-NtlGDeQYZ0haN7sX2kXk1vx4xYLzYhTEavajLtY2Kcsp8u/Uy8f1IuV9chNsLfdl
-aZrnMT/Z28qCoWAeFfz4M6bAZ6Gcyy0TeSI8BDmAqsH7WVukEZ5WEhI/wQx3+z9V
-0YnDr3ZTZlDn1Z+1WLjvRpwDfYN048D3DnABAgMBAAGjggFnMIIBYzAbBgNVHREE
-FDASghBzaXN0ZW1hcy51ZXBnLmJyMAkGA1UdEwQCMAAwQgYDVR0gBDswOTA3Bgpg
-hkgBhvhFAQc2MCkwJwYIKwYBBQUHAgEWG2h0dHBzOi8vd3d3LnRoYXd0ZS5jb20v
-Y3BzLzAOBgNVHQ8BAf8EBAMCBaAwHwYDVR0jBBgwFoAUp6KDuzRFQD381TBPErk+
-oQGf9tswOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL3N2ci1vdi1jcmwudGhhd3Rl
-LmNvbS9UaGF3dGVPVi5jcmwwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMC
-MGkGCCsGAQUFBwEBBF0wWzAiBggrBgEFBQcwAYYWaHR0cDovL29jc3AudGhhd3Rl
-LmNvbTA1BggrBgEFBQcwAoYpaHR0cDovL3N2ci1vdi1haWEudGhhd3RlLmNvbS9U
-aGF3dGVPVi5jZXIwDQYJKoZIhvcNAQELBQADggEBADyZXmy6yj//w3chkKMS5mDJ
-c+QyGYnnANYl+3chFGMdOA0MbZV/r6bPpLj0ieHgH76jvCGq7cYDOIX2mJL5UaBt
-pFzP3P/mcrKtgiWVRKPTPSyIEOK3WhAch+kTAiyuf9BAdZXi8GUcF1SYOqxzbWKI
-gYTclKgiji9i8hTJ8NYvLjerxo+hYzXcehaXKvMH78M3qkbHQgu4vKy75hj1O3zw
-sHWt+1i6mNY63pFCGL9zZeuvmoj5USwrwcZXQ2tkwbIMAfqiuGYZnyW7oGYvYagZ
-n41/XeNFdPEQgN8XAz72MitYRzlpUzt8hPgz8zW8yn5JZ3fv56NgRigMwsQgLew=
-                    
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sistemas.uepg.br/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://sistemas.uepg.br/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">UEPG - Universidade Estadual de Ponta Grossa</OrganizationName>
-    <OrganizationName xml:lang="pt-br">UEPG - Universidade Estadual de Ponta Grossa</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">UEPG - Universidade Estadual de Ponta Grossa</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="pt-br">UEPG - Universidade Estadual de Ponta Grossa</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.uepg.br/</OrganizationURL>
-    <OrganizationURL xml:lang="pt-br">http://www.uepg.br/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Luiz Gustavo Barros</SurName>
-    <EmailAddress>gustavo@uepg.br</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sivic.redclara.net-shibboleth.xml b/swamid-interfederations-2.0/sivic.redclara.net-shibboleth.xml
deleted file mode 100644
index d5e66362..00000000
--- a/swamid-interfederations-2.0/sivic.redclara.net-shibboleth.xml
+++ /dev/null
@@ -1,151 +0,0 @@
-<?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/sivic.redclara.net.xml b/swamid-interfederations-2.0/sivic.redclara.net.xml
deleted file mode 100644
index d5e66362..00000000
--- a/swamid-interfederations-2.0/sivic.redclara.net.xml
+++ /dev/null
@@ -1,151 +0,0 @@
-<?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/skmms-idp.lanet.lv.xml b/swamid-interfederations-2.0/skmms-idp.lanet.lv.xml
deleted file mode 100644
index a08453ec..00000000
--- a/swamid-interfederations-2.0/skmms-idp.lanet.lv.xml
+++ /dev/null
@@ -1,41 +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://skmms-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/" registrationInstant="2013-10-10T10:10:10Z">
-      <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>
-MIIDhjCCAm4CCQC8Px9pbIuxGDANBgkqhkiG9w0BAQUFADCBhDELMAkGA1UEBhMCTFYxDTALBgNVBAgMBFJpZ2ExDTALBgNVBAcMBFJpZ2ExCzAJBgNVBAoMAkxVMQwwCgYDVQQLDANJVEQxFTATBgNVBAMMDGx1LWlkcC5sdS5sdjElMCMGCSqGSIb3DQEJARYWaXRzZXJ2aXNzIGF0IGx1IGRvdCBsdjAeFw0xMzEyMjAxMDU3MDJaFw0yOTAzMDYxMDU3MDJaMIGEMQswCQYDVQQGEwJMVjENMAsGA1UECAwEUmlnYTENMAsGA1UEBwwEUmlnYTELMAkGA1UECgwCTFUxDDAKBgNVBAsMA0lURDEVMBMGA1UEAwwMbHUtaWRwLmx1Lmx2MSUwIwYJKoZIhvcNAQkBFhZpdHNlcnZpc3MgYXQgbHUgZG90IGx2MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuAy8ri5VknGxy21iuW6kalPwg7VPZBWOuV/jVjRre44tHFd5FinCQUCuzQZn37AU3ZNZg07RRyDhkAzzpsBRQf48VcbnQFRjERuQTKUfT9hzFMxgbjxW2Dayg2Ru2LkGcIUeHilOwfmRn1NIRBN+0UyJIluRvB8YGdHSSHYSMimyw9uYEuMkU9aqewwW78w7TeasCWlB6jiGfJ/SGVtPRThJ6X6KVqoU2gwIY+V7YJkG4b5TOw4HLaIsdOmU4h1Ep3igy+Zsc/7zPn+80iwm1Jk9Q8zGlEwikjPn1N3enMOxR8wpQfAQwm5lIaHNXYFcXCj3mVQ3yQ9EzB/hRC8tHwIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQCFRpI7U/lTwoUW/HwDb2gAmjb0RSmS+5lUWDgmjP/rJwYdh672plabNcY12DiqchtBaSeTOf4qANCqEme+YBAmssFUeLx6O1J+5aXeXfCwAA9GlswGDVeC8ZnTVmQupnbvL0T+ZU8WtkltlLEJdD6o9BtEOqk3+Rspu+94d6FUwmvWB/YWypAOfzXkkSxi+87nsadiFEOyCzTW8fZotOrZMzba52ELLJgCx3IzGLUzV80PSJwLzKYHVp0VluH2DzrxfMKC01bMklG46n1nhEo1UU2KA4vzoScmrXzD+m7nKFZ3GHFjyQvtxqG7gA34qg1Vj2o2O0vN/kvjX73SR5s4
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDhjCCAm4CCQC8Px9pbIuxGDANBgkqhkiG9w0BAQUFADCBhDELMAkGA1UEBhMCTFYxDTALBgNVBAgMBFJpZ2ExDTALBgNVBAcMBFJpZ2ExCzAJBgNVBAoMAkxVMQwwCgYDVQQLDANJVEQxFTATBgNVBAMMDGx1LWlkcC5sdS5sdjElMCMGCSqGSIb3DQEJARYWaXRzZXJ2aXNzIGF0IGx1IGRvdCBsdjAeFw0xMzEyMjAxMDU3MDJaFw0yOTAzMDYxMDU3MDJaMIGEMQswCQYDVQQGEwJMVjENMAsGA1UECAwEUmlnYTENMAsGA1UEBwwEUmlnYTELMAkGA1UECgwCTFUxDDAKBgNVBAsMA0lURDEVMBMGA1UEAwwMbHUtaWRwLmx1Lmx2MSUwIwYJKoZIhvcNAQkBFhZpdHNlcnZpc3MgYXQgbHUgZG90IGx2MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuAy8ri5VknGxy21iuW6kalPwg7VPZBWOuV/jVjRre44tHFd5FinCQUCuzQZn37AU3ZNZg07RRyDhkAzzpsBRQf48VcbnQFRjERuQTKUfT9hzFMxgbjxW2Dayg2Ru2LkGcIUeHilOwfmRn1NIRBN+0UyJIluRvB8YGdHSSHYSMimyw9uYEuMkU9aqewwW78w7TeasCWlB6jiGfJ/SGVtPRThJ6X6KVqoU2gwIY+V7YJkG4b5TOw4HLaIsdOmU4h1Ep3igy+Zsc/7zPn+80iwm1Jk9Q8zGlEwikjPn1N3enMOxR8wpQfAQwm5lIaHNXYFcXCj3mVQ3yQ9EzB/hRC8tHwIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQCFRpI7U/lTwoUW/HwDb2gAmjb0RSmS+5lUWDgmjP/rJwYdh672plabNcY12DiqchtBaSeTOf4qANCqEme+YBAmssFUeLx6O1J+5aXeXfCwAA9GlswGDVeC8ZnTVmQupnbvL0T+ZU8WtkltlLEJdD6o9BtEOqk3+Rspu+94d6FUwmvWB/YWypAOfzXkkSxi+87nsadiFEOyCzTW8fZotOrZMzba52ELLJgCx3IzGLUzV80PSJwLzKYHVp0VluH2DzrxfMKC01bMklG46n1nhEo1UU2KA4vzoScmrXzD+m7nKFZ3GHFjyQvtxqG7gA34qg1Vj2o2O0vN/kvjX73SR5s4
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://skmms-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://skmms-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 - RCMC</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Riga Red Cross Medical College - RCMC IDP</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://laife.lanet.lv/</OrganizationURL>
-    <OrganizationURL xml:lang="lv">http://www.rcmc.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/software.msdnaa.dk.xml b/swamid-interfederations-2.0/software.msdnaa.dk.xml
deleted file mode 100644
index 7306b3e2..00000000
--- a/swamid-interfederations-2.0/software.msdnaa.dk.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://software.msdnaa.dk/">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDgDCCAumgAwIBAgIDEzx+MA0GCSqGSIb3DQEBBQUAME4xCzAJBgNVBAYTAlVTMRAwDgYDVQQKEwdFcXVpZmF4MS0wKwYDVQQLEyRFcXVpZmF4IFNlY3VyZSBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkwHhcNMTAwNjA2MDkyMDM3WhcNMTIwNzA4MDcxMjI0WjCB6zEpMCcGA1UEBRMgLWhiZTRROUFVcWItUFRhc2lCSkxwdnYvRUlIcGc0bksxCzAJBgNVBAYTAkRLMRswGQYDVQQKExJzb2Z0d2FyZS5tc2RuYWEuZGsxEzARBgNVBAsTCkdUMDc5NTQ3NjIxMTAvBgNVBAsTKFNlZSB3d3cucmFwaWRzc2wuY29tL3Jlc291cmNlcy9jcHMgKGMpMTAxLzAtBgNVBAsTJkRvbWFpbiBDb250cm9sIFZhbGlkYXRlZCAtIFJhcGlkU1NMKFIpMRswGQYDVQQDExJzb2Z0d2FyZS5tc2RuYWEuZGswgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAMAFv3keVCtJjzg1taFiriiPjTMWHmVdYSsW9ZSBA38CXKm9I4Du3SiiX+TuXW65+1WwPSX1AxpTMCluFfIEzs2IvHLAMdU5+AyCZLEE627ux7dClGzwd9A9fpqrU4XI2Cq2GdlaxTrFfsfIw00CUv+PYlohLHXM96D8H6B46uRfAgMBAAGjgc0wgcowHwYDVR0jBBgwFoAUSOZo+SvSspXXR9gjIBBPM5iQn9QwDgYDVR0PAQH/BAQDAgTwMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAdBgNVHREEFjAUghJzb2Z0d2FyZS5tc2RuYWEuZGswOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC5nZW90cnVzdC5jb20vY3Jscy9zZWN1cmVjYS5jcmwwHQYDVR0OBBYEFOMgzsyArmCbYFjO+X4rJFgvplLTMA0GCSqGSIb3DQEBBQUAA4GBAIQVfBTbp8SBQI7B/04g5ExQlLO5HW1Y6AbCZ09rbMMJjX6PwDS/HAI4BOrTpe49kB3jxPcmT/IWQrYbBod2I+hIBNP+W/AfAexL2exVxjzFo14kMJ3oBsxpzeC1IuSNrwQTmxHz5Bfa7LPtZU5O7LfTvzvKppGeewAzW6u7pG4I</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDgDCCAumgAwIBAgIDEzx+MA0GCSqGSIb3DQEBBQUAME4xCzAJBgNVBAYTAlVTMRAwDgYDVQQKEwdFcXVpZmF4MS0wKwYDVQQLEyRFcXVpZmF4IFNlY3VyZSBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkwHhcNMTAwNjA2MDkyMDM3WhcNMTIwNzA4MDcxMjI0WjCB6zEpMCcGA1UEBRMgLWhiZTRROUFVcWItUFRhc2lCSkxwdnYvRUlIcGc0bksxCzAJBgNVBAYTAkRLMRswGQYDVQQKExJzb2Z0d2FyZS5tc2RuYWEuZGsxEzARBgNVBAsTCkdUMDc5NTQ3NjIxMTAvBgNVBAsTKFNlZSB3d3cucmFwaWRzc2wuY29tL3Jlc291cmNlcy9jcHMgKGMpMTAxLzAtBgNVBAsTJkRvbWFpbiBDb250cm9sIFZhbGlkYXRlZCAtIFJhcGlkU1NMKFIpMRswGQYDVQQDExJzb2Z0d2FyZS5tc2RuYWEuZGswgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAMAFv3keVCtJjzg1taFiriiPjTMWHmVdYSsW9ZSBA38CXKm9I4Du3SiiX+TuXW65+1WwPSX1AxpTMCluFfIEzs2IvHLAMdU5+AyCZLEE627ux7dClGzwd9A9fpqrU4XI2Cq2GdlaxTrFfsfIw00CUv+PYlohLHXM96D8H6B46uRfAgMBAAGjgc0wgcowHwYDVR0jBBgwFoAUSOZo+SvSspXXR9gjIBBPM5iQn9QwDgYDVR0PAQH/BAQDAgTwMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAdBgNVHREEFjAUghJzb2Z0d2FyZS5tc2RuYWEuZGswOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC5nZW90cnVzdC5jb20vY3Jscy9zZWN1cmVjYS5jcmwwHQYDVR0OBBYEFOMgzsyArmCbYFjO+X4rJFgvplLTMA0GCSqGSIb3DQEBBQUAA4GBAIQVfBTbp8SBQI7B/04g5ExQlLO5HW1Y6AbCZ09rbMMJjX6PwDS/HAI4BOrTpe49kB3jxPcmT/IWQrYbBod2I+hIBNP+W/AfAexL2exVxjzFo14kMJ3oBsxpzeC1IuSNrwQTmxHz5Bfa7LPtZU5O7LfTvzvKppGeewAzW6u7pG4I</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://software.msdnaa.dk/login.ashx"/>
-    <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://software.msdnaa.dk/login.ashx" index="0"/>
-    <md:AttributeConsumingService index="0">
-      <md:ServiceName xml:lang="en">MSDNAA</md:ServiceName>
-      <md:ServiceName xml:lang="da">MSDNAA</md:ServiceName>
-      <md:ServiceDescription xml:lang="en">to provide access to relevant Microsoft products for qualified students. The student will, for selected products, be notified by e-mail with product registration/activation information</md:ServiceDescription>
-      <md:ServiceDescription xml:lang="da">at give adgang til relevante Microsoft-produkter for udvalgte studerende. Den studerende vil for udvalgte produkter modtage e-mail vedrørende produktregistrering og aktiveringsinformation</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: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.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.10" 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: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"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sourcesup.cru.fr-shibboleth.xml b/swamid-interfederations-2.0/sourcesup.cru.fr-shibboleth.xml
deleted file mode 100644
index 8b3d3469..00000000
--- a/swamid-interfederations-2.0/sourcesup.cru.fr-shibboleth.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://sourcesup.cru.fr/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2009-01-21T15:50:35Z">
-      <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 - software forge for RENATER community</mdui:DisplayName>
-        <mdui:Description xml:lang="en">SourceSup is a forge hosting development projects for the French HiEd community</mdui:Description>
-        <mdui:DisplayName xml:lang="fr">RENATER - la plateforme SourceSup</mdui:DisplayName>
-        <mdui:Description 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.</mdui:Description>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDAzCCAeugAwIBAgIJAKFZlPlWzzteMA0GCSqGSIb3DQEBBQUAMB8xHTAbBgNV
-BAMTFHNvdXJjZXN1cC5yZW5hdGVyLmZyMB4XDTE0MTAxNTE0NTAwMVoXDTI0MTAx
-MjE0NTAwMVowHzEdMBsGA1UEAxMUc291cmNlc3VwLnJlbmF0ZXIuZnIwggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDmTMazqkrQ4bXYeC9QVeNhrsGdiblc
-QadYtbfOaXthSjbb+r3jXFUb6TY7/oaHFak+KltcgpzaRMRKicIB81rHBjp3eaXz
-AB1kBU1goo7qznlODkyTso3wftIstcXF8SEZGB5jHTBcZloZsNVJEO9ZsUDNfiI6
-ZBjvgKxKuhfMaH2rsIuv+ioOyTtsIyKq0OWSI4zcVranZw8/rctYRJ3uOH0VJ49u
-PKVteO2gp5vC+y1gDA1WnFfSi13IUwqk0IQliDPX53kV267M+Zk6GpbL2GJMu2lg
-8jdaa7+r739i0EoUk7qwHBqVNnT2M8Gu1a3ipxK4HduUKGYD1ynfkzGVAgMBAAGj
-QjBAMB8GA1UdEQQYMBaCFHNvdXJjZXN1cC5yZW5hdGVyLmZyMB0GA1UdDgQWBBQK
-FmZfmEm0YVmRRt+HIA11jgYFIzANBgkqhkiG9w0BAQUFAAOCAQEAeGrTotOtswlQ
-ftuvhhyLALdVDNXSner08S2A51MbI97REIYpvBmGPzWpcBY0mTnI4YHExtgMjcis
-S5lWSg6a8WZgABRIGJpaOMzUrp6LToRyL0qWpcSR91nUZum6gHaZKfuNc3q7n4C7
-QW4WCvzD+mT2H+gVFpkcmkFsViZ+jWJPzNhmY6O5YZolcF9dhAz9hBSTbCRqhOjo
-iqiun1xo89/hxIYaIvlQpRAXlmykiBs8DeEooIP9KiUPhloaEcFkfx73JqT59b6/
-Q6I7TVBscvDAl+9Q9oB9akTeqhktBupWmJUgOxqeFOPlorir8ezn/AX+WSwZ9fPo
-6e4sAmYv7w==
-					    </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>
-					      MIIDAzCCAeugAwIBAgIJAKFZlPlWzzteMA0GCSqGSIb3DQEBBQUAMB8xHTAbBgNV
-BAMTFHNvdXJjZXN1cC5yZW5hdGVyLmZyMB4XDTE0MTAxNTE0NTAwMVoXDTI0MTAx
-MjE0NTAwMVowHzEdMBsGA1UEAxMUc291cmNlc3VwLnJlbmF0ZXIuZnIwggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDmTMazqkrQ4bXYeC9QVeNhrsGdiblc
-QadYtbfOaXthSjbb+r3jXFUb6TY7/oaHFak+KltcgpzaRMRKicIB81rHBjp3eaXz
-AB1kBU1goo7qznlODkyTso3wftIstcXF8SEZGB5jHTBcZloZsNVJEO9ZsUDNfiI6
-ZBjvgKxKuhfMaH2rsIuv+ioOyTtsIyKq0OWSI4zcVranZw8/rctYRJ3uOH0VJ49u
-PKVteO2gp5vC+y1gDA1WnFfSi13IUwqk0IQliDPX53kV267M+Zk6GpbL2GJMu2lg
-8jdaa7+r739i0EoUk7qwHBqVNnT2M8Gu1a3ipxK4HduUKGYD1ynfkzGVAgMBAAGj
-QjBAMB8GA1UdEQQYMBaCFHNvdXJjZXN1cC5yZW5hdGVyLmZyMB0GA1UdDgQWBBQK
-FmZfmEm0YVmRRt+HIA11jgYFIzANBgkqhkiG9w0BAQUFAAOCAQEAeGrTotOtswlQ
-ftuvhhyLALdVDNXSner08S2A51MbI97REIYpvBmGPzWpcBY0mTnI4YHExtgMjcis
-S5lWSg6a8WZgABRIGJpaOMzUrp6LToRyL0qWpcSR91nUZum6gHaZKfuNc3q7n4C7
-QW4WCvzD+mT2H+gVFpkcmkFsViZ+jWJPzNhmY6O5YZolcF9dhAz9hBSTbCRqhOjo
-iqiun1xo89/hxIYaIvlQpRAXlmykiBs8DeEooIP9KiUPhloaEcFkfx73JqT59b6/
-Q6I7TVBscvDAl+9Q9oB9akTeqhktBupWmJUgOxqeFOPlorir8ezn/AX+WSwZ9fPo
-6e4sAmYv7w==
-					    </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>
-					      MIICwTCCAiqgAwIBAgIBADANBgkqhkiG9w0BAQUFADBQMQswCQYDVQQGEwJGUjEm
-MCQGA1UEChMdQ29taXRlIFJlc2VhdSBkZXMgVW5pdmVyc2l0ZXMxGTAXBgNVBAMT
-EHNvdXJjZXN1cC5jcnUuZnIwHhcNMDgwOTE1MTIwMzQ5WhcNMjgwOTEwMTIwMzQ5
-WjBQMQswCQYDVQQGEwJGUjEmMCQGA1UEChMdQ29taXRlIFJlc2VhdSBkZXMgVW5p
-dmVyc2l0ZXMxGTAXBgNVBAMTEHNvdXJjZXN1cC5jcnUuZnIwgZ8wDQYJKoZIhvcN
-AQEBBQADgY0AMIGJAoGBAKoHgRHVnwdX+iQIvIu2/z5I2g2ljqlYJzp74p2HYslf
-xnndqD7YodHihtoLDLIkPrGJ6Y0vtOJceb6XjoFr8k+MP41hs59s4p3qQ1M0lbY4
-6yEqLXednj00mJkz4XciB0h812bJifjH/rhYx25PdLlnp7Y9xCkq7+2BR1AFWZmZ
-AgMBAAGjgaowgacwHQYDVR0OBBYEFDgGBRQ5LF28lBPNjNWLu8YCDtxhMHgGA1Ud
-IwRxMG+AFDgGBRQ5LF28lBPNjNWLu8YCDtxhoVSkUjBQMQswCQYDVQQGEwJGUjEm
-MCQGA1UEChMdQ29taXRlIFJlc2VhdSBkZXMgVW5pdmVyc2l0ZXMxGTAXBgNVBAMT
-EHNvdXJjZXN1cC5jcnUuZnKCAQAwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUF
-AAOBgQB05YFzaYIRKF0JL9Br0U0mCdSyyP3N9Unm2jG7yRrGXCR+2tnj16fwhQlk
-QIGLfHDFFpfBeBoWozJFBcCmFRCawnK8RYqrApvpy1M/k/Y+yIAhq8G8XfZqzU1G
-HaaOGqD8nCkO3t3qaIPP4CTmE+GS72ooHHntvoGy/RDn32aVVg==
-					    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sourcesup.renater.fr/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sourcesup.renater.fr/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AttributeConsumingService index="0">
-      <ServiceName xml:lang="fr">RENATER - la plateforme SourceSup</ServiceName>
-      <ServiceName xml:lang="en">RENATER - software forge for RENATER community</ServiceName>
-      <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"/>
-    </AttributeConsumingService>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">RENATER</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">RENATER</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.renater.fr</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <EmailAddress>support@renater.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sourcesup.cru.fr.xml b/swamid-interfederations-2.0/sourcesup.cru.fr.xml
deleted file mode 100644
index 8b3d3469..00000000
--- a/swamid-interfederations-2.0/sourcesup.cru.fr.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://sourcesup.cru.fr/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2009-01-21T15:50:35Z">
-      <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 - software forge for RENATER community</mdui:DisplayName>
-        <mdui:Description xml:lang="en">SourceSup is a forge hosting development projects for the French HiEd community</mdui:Description>
-        <mdui:DisplayName xml:lang="fr">RENATER - la plateforme SourceSup</mdui:DisplayName>
-        <mdui:Description 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.</mdui:Description>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDAzCCAeugAwIBAgIJAKFZlPlWzzteMA0GCSqGSIb3DQEBBQUAMB8xHTAbBgNV
-BAMTFHNvdXJjZXN1cC5yZW5hdGVyLmZyMB4XDTE0MTAxNTE0NTAwMVoXDTI0MTAx
-MjE0NTAwMVowHzEdMBsGA1UEAxMUc291cmNlc3VwLnJlbmF0ZXIuZnIwggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDmTMazqkrQ4bXYeC9QVeNhrsGdiblc
-QadYtbfOaXthSjbb+r3jXFUb6TY7/oaHFak+KltcgpzaRMRKicIB81rHBjp3eaXz
-AB1kBU1goo7qznlODkyTso3wftIstcXF8SEZGB5jHTBcZloZsNVJEO9ZsUDNfiI6
-ZBjvgKxKuhfMaH2rsIuv+ioOyTtsIyKq0OWSI4zcVranZw8/rctYRJ3uOH0VJ49u
-PKVteO2gp5vC+y1gDA1WnFfSi13IUwqk0IQliDPX53kV267M+Zk6GpbL2GJMu2lg
-8jdaa7+r739i0EoUk7qwHBqVNnT2M8Gu1a3ipxK4HduUKGYD1ynfkzGVAgMBAAGj
-QjBAMB8GA1UdEQQYMBaCFHNvdXJjZXN1cC5yZW5hdGVyLmZyMB0GA1UdDgQWBBQK
-FmZfmEm0YVmRRt+HIA11jgYFIzANBgkqhkiG9w0BAQUFAAOCAQEAeGrTotOtswlQ
-ftuvhhyLALdVDNXSner08S2A51MbI97REIYpvBmGPzWpcBY0mTnI4YHExtgMjcis
-S5lWSg6a8WZgABRIGJpaOMzUrp6LToRyL0qWpcSR91nUZum6gHaZKfuNc3q7n4C7
-QW4WCvzD+mT2H+gVFpkcmkFsViZ+jWJPzNhmY6O5YZolcF9dhAz9hBSTbCRqhOjo
-iqiun1xo89/hxIYaIvlQpRAXlmykiBs8DeEooIP9KiUPhloaEcFkfx73JqT59b6/
-Q6I7TVBscvDAl+9Q9oB9akTeqhktBupWmJUgOxqeFOPlorir8ezn/AX+WSwZ9fPo
-6e4sAmYv7w==
-					    </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>
-					      MIIDAzCCAeugAwIBAgIJAKFZlPlWzzteMA0GCSqGSIb3DQEBBQUAMB8xHTAbBgNV
-BAMTFHNvdXJjZXN1cC5yZW5hdGVyLmZyMB4XDTE0MTAxNTE0NTAwMVoXDTI0MTAx
-MjE0NTAwMVowHzEdMBsGA1UEAxMUc291cmNlc3VwLnJlbmF0ZXIuZnIwggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDmTMazqkrQ4bXYeC9QVeNhrsGdiblc
-QadYtbfOaXthSjbb+r3jXFUb6TY7/oaHFak+KltcgpzaRMRKicIB81rHBjp3eaXz
-AB1kBU1goo7qznlODkyTso3wftIstcXF8SEZGB5jHTBcZloZsNVJEO9ZsUDNfiI6
-ZBjvgKxKuhfMaH2rsIuv+ioOyTtsIyKq0OWSI4zcVranZw8/rctYRJ3uOH0VJ49u
-PKVteO2gp5vC+y1gDA1WnFfSi13IUwqk0IQliDPX53kV267M+Zk6GpbL2GJMu2lg
-8jdaa7+r739i0EoUk7qwHBqVNnT2M8Gu1a3ipxK4HduUKGYD1ynfkzGVAgMBAAGj
-QjBAMB8GA1UdEQQYMBaCFHNvdXJjZXN1cC5yZW5hdGVyLmZyMB0GA1UdDgQWBBQK
-FmZfmEm0YVmRRt+HIA11jgYFIzANBgkqhkiG9w0BAQUFAAOCAQEAeGrTotOtswlQ
-ftuvhhyLALdVDNXSner08S2A51MbI97REIYpvBmGPzWpcBY0mTnI4YHExtgMjcis
-S5lWSg6a8WZgABRIGJpaOMzUrp6LToRyL0qWpcSR91nUZum6gHaZKfuNc3q7n4C7
-QW4WCvzD+mT2H+gVFpkcmkFsViZ+jWJPzNhmY6O5YZolcF9dhAz9hBSTbCRqhOjo
-iqiun1xo89/hxIYaIvlQpRAXlmykiBs8DeEooIP9KiUPhloaEcFkfx73JqT59b6/
-Q6I7TVBscvDAl+9Q9oB9akTeqhktBupWmJUgOxqeFOPlorir8ezn/AX+WSwZ9fPo
-6e4sAmYv7w==
-					    </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>
-					      MIICwTCCAiqgAwIBAgIBADANBgkqhkiG9w0BAQUFADBQMQswCQYDVQQGEwJGUjEm
-MCQGA1UEChMdQ29taXRlIFJlc2VhdSBkZXMgVW5pdmVyc2l0ZXMxGTAXBgNVBAMT
-EHNvdXJjZXN1cC5jcnUuZnIwHhcNMDgwOTE1MTIwMzQ5WhcNMjgwOTEwMTIwMzQ5
-WjBQMQswCQYDVQQGEwJGUjEmMCQGA1UEChMdQ29taXRlIFJlc2VhdSBkZXMgVW5p
-dmVyc2l0ZXMxGTAXBgNVBAMTEHNvdXJjZXN1cC5jcnUuZnIwgZ8wDQYJKoZIhvcN
-AQEBBQADgY0AMIGJAoGBAKoHgRHVnwdX+iQIvIu2/z5I2g2ljqlYJzp74p2HYslf
-xnndqD7YodHihtoLDLIkPrGJ6Y0vtOJceb6XjoFr8k+MP41hs59s4p3qQ1M0lbY4
-6yEqLXednj00mJkz4XciB0h812bJifjH/rhYx25PdLlnp7Y9xCkq7+2BR1AFWZmZ
-AgMBAAGjgaowgacwHQYDVR0OBBYEFDgGBRQ5LF28lBPNjNWLu8YCDtxhMHgGA1Ud
-IwRxMG+AFDgGBRQ5LF28lBPNjNWLu8YCDtxhoVSkUjBQMQswCQYDVQQGEwJGUjEm
-MCQGA1UEChMdQ29taXRlIFJlc2VhdSBkZXMgVW5pdmVyc2l0ZXMxGTAXBgNVBAMT
-EHNvdXJjZXN1cC5jcnUuZnKCAQAwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUF
-AAOBgQB05YFzaYIRKF0JL9Br0U0mCdSyyP3N9Unm2jG7yRrGXCR+2tnj16fwhQlk
-QIGLfHDFFpfBeBoWozJFBcCmFRCawnK8RYqrApvpy1M/k/Y+yIAhq8G8XfZqzU1G
-HaaOGqD8nCkO3t3qaIPP4CTmE+GS72ooHHntvoGy/RDn32aVVg==
-					    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sourcesup.renater.fr/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sourcesup.renater.fr/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AttributeConsumingService index="0">
-      <ServiceName xml:lang="fr">RENATER - la plateforme SourceSup</ServiceName>
-      <ServiceName xml:lang="en">RENATER - software forge for RENATER community</ServiceName>
-      <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"/>
-    </AttributeConsumingService>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">RENATER</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">RENATER</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.renater.fr</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <EmailAddress>support@renater.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sp-test.swamid.se-shibboleth.xml b/swamid-interfederations-2.0/sp-test.swamid.se-shibboleth.xml
deleted file mode 100644
index a563d053..00000000
--- a/swamid-interfederations-2.0/sp-test.swamid.se-shibboleth.xml
+++ /dev/null
@@ -1,106 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sp-test.swamid.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/sfs-1993-1153</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
-        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/category/nren-service</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:Extensions>
-      <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://sp-test.swamid.se/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://sp-test.swamid.se/Shibboleth.sso/DS/ds.swamid.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://sp-test.swamid.se/Shibboleth.sso/DS/ds.sunet.se" 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://sp-test.swamid.se/Shibboleth.sso/DS/test-ds.nordu.net" index="4"/>
-      <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://sp-test.swamid.se/Shibboleth.sso/DS/kalmar2" index="5"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="sv">SWAMID Test SP</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">SWAMID Test SP</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Detta är en applikation som låter dig testa federerad inloggning.</mdui:Description>
-        <mdui:Description xml:lang="en">This is an application for testing federated authentication.</mdui:Description>
-        <mdui:InformationURL xml:lang="sv">http://www.swamid.se</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">http://www.swamid.se</mdui:InformationURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>sp-test.swamid.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=sp-test.swamid.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIC+jCCAeKgAwIBAgIJAO0UNmz1orzrMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNV
-BAMTEXNwLXRlc3Quc3dhbWlkLnNlMB4XDTA5MTAyNzE0NTkzOFoXDTE5MTAyNTE0
-NTkzOFowHDEaMBgGA1UEAxMRc3AtdGVzdC5zd2FtaWQuc2UwggEiMA0GCSqGSIb3
-DQEBAQUAA4IBDwAwggEKAoIBAQC9292zBRgCYnJeviTmWQ9gDjqjtQwnvzTpZMVa
-o2gmEb8NQOPwGqDAZ8kHhhjsqXd37VjOcQc5KyfxdKnwS8zzb0GFqTyVXtJ1wjZb
-WPkOgRw1c0u7RuRgzn/vWMDLIRtymm2stX2hu1E2qctQ2zSEhiNrWdMNNArh/IKP
-+MNT1a1w5QR3fbv7/Q+7T3VF2vyzFMo44FDId9kApN3/TSnJRaQ0tQQBgnZtrIAk
-vjR6B/R9qowuwK/0QIifM1KrVT9OYHA0GP708IAdEzzuzLU5vyJuAzDhBNirPtFv
-QcAKI8RfYBiwdJ29QkMAWHlNW3oP8KpUJzJ3r3KOcIHMwfSbAgMBAAGjPzA9MBwG
-A1UdEQQVMBOCEXNwLXRlc3Quc3dhbWlkLnNlMB0GA1UdDgQWBBS0j9yIqP5DvTEl
-YHt7Ugh3BTVX/TANBgkqhkiG9w0BAQUFAAOCAQEANL4WmGSMJws0XzNxcodD3TVV
-yvLOLmFy8cNhB7cmz3rqoZebUqN9yWaCmZjCOMQ8Ghw++ITk/Ol0uXuCf7vKvXpW
-7AEPL12mGVfH82PhyxYnY9BZNpfAsGWpM1Nvfz7AOkngD/G8Ws2+Bf4xS4PVHzgm
-yEth2XQtHlSquOj2abA/wjguZvN0PGFUJl+ZxXxZ5mkyFmjQ+wnvF1BUlMD7qBF8
-WUA9TiYEiXgsASTgW/F038f4VNecqrBpJHU4TILmEtioGEFVLipU8huAzbcBCPYb
-0z3axBqiW0bRmgvql97lV3HRRkwGKLV1T8oiau31qQU2zzBt6jC2AQgXWjjvSg==
-</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>sp-test.swamid.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=sp-test.swamid.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIC+jCCAeKgAwIBAgIJAO0UNmz1orzrMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNV
-BAMTEXNwLXRlc3Quc3dhbWlkLnNlMB4XDTA5MTAyNzE0NTkzOFoXDTE5MTAyNTE0
-NTkzOFowHDEaMBgGA1UEAxMRc3AtdGVzdC5zd2FtaWQuc2UwggEiMA0GCSqGSIb3
-DQEBAQUAA4IBDwAwggEKAoIBAQC9292zBRgCYnJeviTmWQ9gDjqjtQwnvzTpZMVa
-o2gmEb8NQOPwGqDAZ8kHhhjsqXd37VjOcQc5KyfxdKnwS8zzb0GFqTyVXtJ1wjZb
-WPkOgRw1c0u7RuRgzn/vWMDLIRtymm2stX2hu1E2qctQ2zSEhiNrWdMNNArh/IKP
-+MNT1a1w5QR3fbv7/Q+7T3VF2vyzFMo44FDId9kApN3/TSnJRaQ0tQQBgnZtrIAk
-vjR6B/R9qowuwK/0QIifM1KrVT9OYHA0GP708IAdEzzuzLU5vyJuAzDhBNirPtFv
-QcAKI8RfYBiwdJ29QkMAWHlNW3oP8KpUJzJ3r3KOcIHMwfSbAgMBAAGjPzA9MBwG
-A1UdEQQVMBOCEXNwLXRlc3Quc3dhbWlkLnNlMB0GA1UdDgQWBBS0j9yIqP5DvTEl
-YHt7Ugh3BTVX/TANBgkqhkiG9w0BAQUFAAOCAQEANL4WmGSMJws0XzNxcodD3TVV
-yvLOLmFy8cNhB7cmz3rqoZebUqN9yWaCmZjCOMQ8Ghw++ITk/Ol0uXuCf7vKvXpW
-7AEPL12mGVfH82PhyxYnY9BZNpfAsGWpM1Nvfz7AOkngD/G8Ws2+Bf4xS4PVHzgm
-yEth2XQtHlSquOj2abA/wjguZvN0PGFUJl+ZxXxZ5mkyFmjQ+wnvF1BUlMD7qBF8
-WUA9TiYEiXgsASTgW/F038f4VNecqrBpJHU4TILmEtioGEFVLipU8huAzbcBCPYb
-0z3axBqiW0bRmgvql97lV3HRRkwGKLV1T8oiau31qQU2zzBt6jC2AQgXWjjvSg==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sp-test.swamid.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sp-test.swamid.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sp-test.swamid.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp-test.swamid.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp-test.swamid.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sp-test.swamid.se/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sp-test.swamid.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp-test.swamid.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp-test.swamid.se/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp-test.swamid.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sp-test.swamid.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp-test.swamid.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://sp-test.swamid.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sp-test.swamid.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sp-test.swamid.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">SWAMID</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Swedish Academic Identity Federation (SWAMID)</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.swamid.se</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:EmailAddress>operations@swamid.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sp-test.swamid.se.xml b/swamid-interfederations-2.0/sp-test.swamid.se.xml
deleted file mode 100644
index a563d053..00000000
--- a/swamid-interfederations-2.0/sp-test.swamid.se.xml
+++ /dev/null
@@ -1,106 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sp-test.swamid.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/sfs-1993-1153</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
-        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/category/nren-service</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:Extensions>
-      <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://sp-test.swamid.se/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://sp-test.swamid.se/Shibboleth.sso/DS/ds.swamid.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://sp-test.swamid.se/Shibboleth.sso/DS/ds.sunet.se" 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://sp-test.swamid.se/Shibboleth.sso/DS/test-ds.nordu.net" index="4"/>
-      <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://sp-test.swamid.se/Shibboleth.sso/DS/kalmar2" index="5"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="sv">SWAMID Test SP</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">SWAMID Test SP</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Detta är en applikation som låter dig testa federerad inloggning.</mdui:Description>
-        <mdui:Description xml:lang="en">This is an application for testing federated authentication.</mdui:Description>
-        <mdui:InformationURL xml:lang="sv">http://www.swamid.se</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">http://www.swamid.se</mdui:InformationURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>sp-test.swamid.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=sp-test.swamid.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIC+jCCAeKgAwIBAgIJAO0UNmz1orzrMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNV
-BAMTEXNwLXRlc3Quc3dhbWlkLnNlMB4XDTA5MTAyNzE0NTkzOFoXDTE5MTAyNTE0
-NTkzOFowHDEaMBgGA1UEAxMRc3AtdGVzdC5zd2FtaWQuc2UwggEiMA0GCSqGSIb3
-DQEBAQUAA4IBDwAwggEKAoIBAQC9292zBRgCYnJeviTmWQ9gDjqjtQwnvzTpZMVa
-o2gmEb8NQOPwGqDAZ8kHhhjsqXd37VjOcQc5KyfxdKnwS8zzb0GFqTyVXtJ1wjZb
-WPkOgRw1c0u7RuRgzn/vWMDLIRtymm2stX2hu1E2qctQ2zSEhiNrWdMNNArh/IKP
-+MNT1a1w5QR3fbv7/Q+7T3VF2vyzFMo44FDId9kApN3/TSnJRaQ0tQQBgnZtrIAk
-vjR6B/R9qowuwK/0QIifM1KrVT9OYHA0GP708IAdEzzuzLU5vyJuAzDhBNirPtFv
-QcAKI8RfYBiwdJ29QkMAWHlNW3oP8KpUJzJ3r3KOcIHMwfSbAgMBAAGjPzA9MBwG
-A1UdEQQVMBOCEXNwLXRlc3Quc3dhbWlkLnNlMB0GA1UdDgQWBBS0j9yIqP5DvTEl
-YHt7Ugh3BTVX/TANBgkqhkiG9w0BAQUFAAOCAQEANL4WmGSMJws0XzNxcodD3TVV
-yvLOLmFy8cNhB7cmz3rqoZebUqN9yWaCmZjCOMQ8Ghw++ITk/Ol0uXuCf7vKvXpW
-7AEPL12mGVfH82PhyxYnY9BZNpfAsGWpM1Nvfz7AOkngD/G8Ws2+Bf4xS4PVHzgm
-yEth2XQtHlSquOj2abA/wjguZvN0PGFUJl+ZxXxZ5mkyFmjQ+wnvF1BUlMD7qBF8
-WUA9TiYEiXgsASTgW/F038f4VNecqrBpJHU4TILmEtioGEFVLipU8huAzbcBCPYb
-0z3axBqiW0bRmgvql97lV3HRRkwGKLV1T8oiau31qQU2zzBt6jC2AQgXWjjvSg==
-</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>sp-test.swamid.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=sp-test.swamid.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIC+jCCAeKgAwIBAgIJAO0UNmz1orzrMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNV
-BAMTEXNwLXRlc3Quc3dhbWlkLnNlMB4XDTA5MTAyNzE0NTkzOFoXDTE5MTAyNTE0
-NTkzOFowHDEaMBgGA1UEAxMRc3AtdGVzdC5zd2FtaWQuc2UwggEiMA0GCSqGSIb3
-DQEBAQUAA4IBDwAwggEKAoIBAQC9292zBRgCYnJeviTmWQ9gDjqjtQwnvzTpZMVa
-o2gmEb8NQOPwGqDAZ8kHhhjsqXd37VjOcQc5KyfxdKnwS8zzb0GFqTyVXtJ1wjZb
-WPkOgRw1c0u7RuRgzn/vWMDLIRtymm2stX2hu1E2qctQ2zSEhiNrWdMNNArh/IKP
-+MNT1a1w5QR3fbv7/Q+7T3VF2vyzFMo44FDId9kApN3/TSnJRaQ0tQQBgnZtrIAk
-vjR6B/R9qowuwK/0QIifM1KrVT9OYHA0GP708IAdEzzuzLU5vyJuAzDhBNirPtFv
-QcAKI8RfYBiwdJ29QkMAWHlNW3oP8KpUJzJ3r3KOcIHMwfSbAgMBAAGjPzA9MBwG
-A1UdEQQVMBOCEXNwLXRlc3Quc3dhbWlkLnNlMB0GA1UdDgQWBBS0j9yIqP5DvTEl
-YHt7Ugh3BTVX/TANBgkqhkiG9w0BAQUFAAOCAQEANL4WmGSMJws0XzNxcodD3TVV
-yvLOLmFy8cNhB7cmz3rqoZebUqN9yWaCmZjCOMQ8Ghw++ITk/Ol0uXuCf7vKvXpW
-7AEPL12mGVfH82PhyxYnY9BZNpfAsGWpM1Nvfz7AOkngD/G8Ws2+Bf4xS4PVHzgm
-yEth2XQtHlSquOj2abA/wjguZvN0PGFUJl+ZxXxZ5mkyFmjQ+wnvF1BUlMD7qBF8
-WUA9TiYEiXgsASTgW/F038f4VNecqrBpJHU4TILmEtioGEFVLipU8huAzbcBCPYb
-0z3axBqiW0bRmgvql97lV3HRRkwGKLV1T8oiau31qQU2zzBt6jC2AQgXWjjvSg==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sp-test.swamid.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sp-test.swamid.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sp-test.swamid.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp-test.swamid.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp-test.swamid.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sp-test.swamid.se/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sp-test.swamid.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp-test.swamid.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp-test.swamid.se/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp-test.swamid.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sp-test.swamid.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp-test.swamid.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://sp-test.swamid.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sp-test.swamid.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sp-test.swamid.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">SWAMID</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Swedish Academic Identity Federation (SWAMID)</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.swamid.se</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:EmailAddress>operations@swamid.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sp.catalog.clarin.eu.xml b/swamid-interfederations-2.0/sp.catalog.clarin.eu.xml
index 5a862cc4..071fb97a 100644
--- a/swamid-interfederations-2.0/sp.catalog.clarin.eu.xml
+++ b/swamid-interfederations-2.0/sp.catalog.clarin.eu.xml
@@ -1,63 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sp.catalog.clarin.eu">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2011-08-29T11:20:42Z">
-      <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://catalog.clarin.eu/Shibboleth.sso/DS" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="de">Clarin Catalog Service Provider</mdui:DisplayName>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" 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://sp.catalog.clarin.eu">
+  <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>
+      <mdui:UIInfo>
         <mdui:DisplayName xml:lang="en">Clarin Catalog Service Provider</mdui:DisplayName>
-        <mdui:Description xml:lang="de">Clarin Catalog Service Provider, verstrekt toegang tot de Data Category Registry (ISOcat), Component Registry, Virtual Language Observatory (VLO) en meer</mdui:Description>
-        <mdui:Description xml:lang="en">Clarin Catalog Service Provider, providing services like the Data Category Registry (ISOcat), Component Registry, Virtual Language Observatory (VLO) and more</mdui:Description>
-        <mdui:InformationURL xml:lang="de">http://www.clarin.eu</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">http://www.clarin.eu</mdui:InformationURL>
+        <mdui:Description xml:lang="en">Providing services like the Data Category Registry (ISOcat), Component Registry, Virtual Language Observatory (VLO) and more</mdui:Description>
+        <mdui:Keywords xml:lang="en">Clarin Catalog Service Provider, providing services like the Data Category Registry (ISOcat), Component Registry, Virtual Language Observatory (VLO) and more</mdui:Keywords>
         <mdui:PrivacyStatementURL xml:lang="en">https://catalog.clarin.eu/privacy_statement.html</mdui:PrivacyStatementURL>
       </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>catalog.clarin.eu</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>emailAddress=latadmin@mpi.nl,CN=catalog.clarin.eu,OU=catalog sp,O=MPI-PL,L=Nijmegen,ST=GLD,C=NL</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDnjCCAoYCCQCIw16p56fGnTANBgkqhkiG9w0BAQUFADCBkDELMAkGA1UEBhMC
-TkwxDDAKBgNVBAgTA0dMRDERMA8GA1UEBxMITmlqbWVnZW4xDzANBgNVBAoTBk1Q
-SS1QTDETMBEGA1UECxMKY2F0YWxvZyBzcDEaMBgGA1UEAxMRY2F0YWxvZy5jbGFy
-aW4uZXUxHjAcBgkqhkiG9w0BCQEWD2xhdGFkbWluQG1waS5ubDAeFw0xNDA0Mjgw
-ODAyMDVaFw0xOTA0MjcwODAyMDVaMIGQMQswCQYDVQQGEwJOTDEMMAoGA1UECBMD
-R0xEMREwDwYDVQQHEwhOaWptZWdlbjEPMA0GA1UEChMGTVBJLVBMMRMwEQYDVQQL
-EwpjYXRhbG9nIHNwMRowGAYDVQQDExFjYXRhbG9nLmNsYXJpbi5ldTEeMBwGCSqG
-SIb3DQEJARYPbGF0YWRtaW5AbXBpLm5sMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
-MIIBCgKCAQEA38nLf8TTeexrcqzfF5LOQ3F/9Tar+V7kNsLFUKO1ua6npX+4zgBu
-EYCm+hKrKDW09QN8yrBd+79a+slA4nCcpUymkh02rQhVbMpNiEQh8UFjqfaYv5fM
-R1OlgIWYXx2POdn60KbUYXIPGSrp2zQSXMFJMrnUOXHqxF8fxfTdbDEtcviXXwyC
-UjhXC4AJSLL/S8eftV8iioQDZMs5h1Kd95NVFsMhRC5MtD+iUyNsYR8X1PGaFg20
-bVg/Jg2eVNwPas49POr+HBOxk3BBtk8KwCAMwjCQUGL3zn7KeDLDFYsry/bWQtVn
-IbebSTysNhbrji3/VKnsPHiuOfCvYiqWEQIDAQABMA0GCSqGSIb3DQEBBQUAA4IB
-AQDTDfQr4wjJGAUo7os8PWTmKFkAH4D3oFQpxe4bvf6U9of4+fmE778S+WZc9kKs
-A0oCNgDwBaY/GdYIYloU/6GAxEu5Kql4HmB1XW5XyYZ15+zYluL86eLFe2DHnPHR
-Z3ZjnjzAkcZS6VU/vbowpAL9Oiic9I15BwyNXsT8lWPtOxKcmxAESMc7OtWm0o4C
-ijjjB4MNkyvUmnvJZD+7ZpYW6qI4v64a4h1kdydtuCSxFz7lQ9U80gOA+oJWKa9a
-yN2Xk8rmco4g1veIYIZ6hKrydr0QJ40WvaiR1EkO0tpPa7wkayhFaOQDRrzFNpfr
-gDLbA/e0dbDclBvxUIm9cemA
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>catalog.clarin.eu</ds:KeyName>
+      <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:X509SubjectName>emailAddress=latadmin@mpi.nl,CN=catalog.clarin.eu,OU=catalog sp,O=MPI-PL,L=Nijmegen,ST=GLD,C=NL</ds:X509SubjectName>
           <ds:X509Certificate>MIIDnjCCAoYCCQCIw16p56fGnTANBgkqhkiG9w0BAQUFADCBkDELMAkGA1UEBhMC
 TkwxDDAKBgNVBAgTA0dMRDERMA8GA1UEBxMITmlqbWVnZW4xDzANBgNVBAoTBk1Q
 SS1QTDETMBEGA1UECxMKY2F0YWxvZyBzcDEaMBgGA1UEAxMRY2F0YWxvZy5jbGFy
@@ -77,56 +35,36 @@ A0oCNgDwBaY/GdYIYloU/6GAxEu5Kql4HmB1XW5XyYZ15+zYluL86eLFe2DHnPHR
 Z3ZjnjzAkcZS6VU/vbowpAL9Oiic9I15BwyNXsT8lWPtOxKcmxAESMc7OtWm0o4C
 ijjjB4MNkyvUmnvJZD+7ZpYW6qI4v64a4h1kdydtuCSxFz7lQ9U80gOA+oJWKa9a
 yN2Xk8rmco4g1veIYIZ6hKrydr0QJ40WvaiR1EkO0tpPa7wkayhFaOQDRrzFNpfr
-gDLbA/e0dbDclBvxUIm9cemA
-</ds:X509Certificate>
+gDLbA/e0dbDclBvxUIm9cemA</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://catalog.clarin.eu/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://catalog.clarin.eu/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://catalog.clarin.eu/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://catalog.clarin.eu/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://catalog.clarin.eu/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://catalog.clarin.eu/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://catalog.clarin.eu/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://catalog.clarin.eu/Shibboleth.sso/NIM/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://catalog.clarin.eu/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://catalog.clarin.eu/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://catalog.clarin.eu/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://catalog.clarin.eu/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://catalog.clarin.eu/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://catalog.clarin.eu/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <AttributeConsumingService index="1">
-      <ServiceName xml:lang="de">Clarin Catalog Service Provider</ServiceName>
-      <ServiceName xml:lang="en">Clarin Catalog Service Provider</ServiceName>
-      <ServiceDescription xml:lang="de">Clarin Catalog Service Provider, verstrekt toegang tot de Data Category Registry (ISOcat), Component Registry, Virtual Language Observatory (VLO) en meer</ServiceDescription>
-      <ServiceDescription xml:lang="en">Clarin Catalog Service Provider, providing services like the Data Category Registry (ISOcat), Component Registry, Virtual Language Observatory (VLO) and more</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="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="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" 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="administrative">
-    <GivenName>Daan</GivenName>
-    <SurName>Broeder</SurName>
-    <EmailAddress>mailto:Daan.Broeder@mpi.nl</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Tobias</GivenName>
-    <SurName>van Valkenhoef</SurName>
-    <EmailAddress>mailto:tobias.vanvalkenhoef@mpi.nl</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="support">
-    <GivenName>Dieter</GivenName>
-    <SurName>Van Uytvanck</SurName>
-    <EmailAddress>mailto:dieter.vanuytvanck@mpi.nl</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
+    </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: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://catalog.clarin.eu/Shibboleth.sso/SAML2/POST" index="1" isDefault="true"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://catalog.clarin.eu/Shibboleth.sso/SAML/POST" index="2" isDefault="false"/>
+    <md:AttributeConsumingService index="1" isDefault="true">
+      <md:ServiceName xml:lang="fi">Clarin Catalog Service Provider</md:ServiceName>
+      <md:ServiceName xml:lang="en">Clarin Catalog Service Provider</md:ServiceName>
+      <md:ServiceName xml:lang="sv">Clarin Catalog Service Provider</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">Providing services like the Data Category Registry (ISOcat), Component Registry, Virtual  Language Observatory (VLO) and more</md:ServiceDescription>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonPrincipalName"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="fi">CLARIN Service Provider Federation/MPI</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">CLARIN Service Provider Federation/MPI</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">CLARIN Service Provider Federation/MPI</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="fi">CLARIN Service Provider Federation/MPI</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">CLARIN Service Provider Federation/MPI</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">CLARIN Service Provider Federation/MPI</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="fi">http://www.clarin.eu</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.clarin.eu</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">http://www.clarin.eu</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Technical support</md:SurName>
+    <md:EmailAddress>mailto:latadmin@mpi.nl</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sp.corpus1.mpi.nl.xml b/swamid-interfederations-2.0/sp.corpus1.mpi.nl.xml
index 09741a34..d2dba0bc 100644
--- a/swamid-interfederations-2.0/sp.corpus1.mpi.nl.xml
+++ b/swamid-interfederations-2.0/sp.corpus1.mpi.nl.xml
@@ -1,117 +1,91 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sp.corpus1.mpi.nl">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2014-02-08T21:53:28Z">
-      <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>
-      <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://corpus1.mpi.nl/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="de">Max Planck Institute for Psycholinguistics Corpus1 Service Provider for Linguistic Services</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Max Planck Institute for Psycholinguistics Corpus1 Service Provider for Linguistic Services</mdui:DisplayName>
-        <mdui:Description xml:lang="de">Max Planck Institute for Psycholinguistics Corpus1 Service Provider for Linguistic Services</mdui:Description>
-        <mdui:Description xml:lang="en">Max Planck Institute for Psycholinguistics Corpus1 Service Provider for Linguistic Services</mdui:Description>
-        <mdui:InformationURL xml:lang="de">http://www.mpi.nl</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">http://www.mpi.nl</mdui:InformationURL>
+<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://sp.corpus1.mpi.nl">
+  <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://corpus1.mpi.nl/Shibboleth.sso/DS" index="1"/>
+      <mdui:UIInfo>
+        <mdui:DisplayName xml:lang="fi">Psykolingvistiikan Max Planck-instituutin palveluntarjoaja</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Max Planck Institute for Psycholinguistics Service Provider</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Max Planck Institute for Psycholinguistics Service Provider for Linguistic Services aimed at researchers.</mdui:Description>
+        <mdui:Description xml:lang="fi">Psykolingvistiikan Max Planck-instituutin tutkijoille suunnattu kielitieteellinen palveluntarjoaja.</mdui:Description>
+        <mdui:PrivacyStatementURL xml:lang="en">http://corpus1.mpi.nl/IMDI/info/privacy_statement.html</mdui:PrivacyStatementURL>
       </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>corpus1.mpi.nl</ds:KeyName>
+      <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:X509SubjectName>emailAddress=latadmin@mpi.nl,CN=corpus1.mpi.nl,O=MPI-PL,L=Nijmegen,ST=GLD,C=NL</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDbDCCAlQCCQDcydJCAWzKeDANBgkqhkiG9w0BAQUFADB4MQswCQYDVQQGEwJO
-TDEMMAoGA1UECBMDR0xEMREwDwYDVQQHEwhOaWptZWdlbjEPMA0GA1UEChMGTVBJ
-LVBMMRcwFQYDVQQDEw5jb3JwdXMxLm1waS5ubDEeMBwGCSqGSIb3DQEJARYPbGF0
-YWRtaW5AbXBpLm5sMB4XDTE0MDUwMjExMjkwNVoXDTE5MDUwMTExMjkwNVoweDEL
-MAkGA1UEBhMCTkwxDDAKBgNVBAgTA0dMRDERMA8GA1UEBxMITmlqbWVnZW4xDzAN
-BgNVBAoTBk1QSS1QTDEXMBUGA1UEAxMOY29ycHVzMS5tcGkubmwxHjAcBgkqhkiG
-9w0BCQEWD2xhdGFkbWluQG1waS5ubDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
-AQoCggEBAMFrApun/KXB9YtFiT49PHz7uV9EoVmrFsCBNqVWYhM+msq2dkM7rNVe
-eZdy2hHID72ILMeqeXKX+hFQPyX18eN4L6lfJzzJJI2HGdIuGPyKZXCsVrCqnIWo
-VPRi5dnTlCpCEPhebt05L9TMQJrLWue2qDhhdwkaYrVfm+tsYGK9yiy3Gbsoa10L
-kEpd2oJZLDGHXSZJ6GL4oUMbQ+Z9bIjCelQWC4tU/u6qFGIzyoabaJbAlnFAxFSq
-DIQ9+27JObXMnVH/6iK0mhHTooB72Gd0LQHVHGiCrFyxmbhMp7tIX0vU3Qn4/U8F
-kt/Kep3+Wam/1h1NmmOJzTux2NuRurcCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEA
-YPPRnb1/92C/Si/V5I15TfFSTdOeMcVHQ0DY0ohUw8B4fEbr9htjZoW7Umyco5pF
-kf+2Jm0GRVEJKjBxFEsbNbY8vusnP25u88vJa4Qy3JJZbsYGcPZiFOKffZWg/xqW
-t5F3i+akH5ihUn910/5l85SDUnDS1VvHVdOGwsedRNW4Yi9eEWjiEGQwjlhH0sWh
-uxjCIgYajcptpsZ8N8g+bR7ysVk61E5tcmScA5Pnu1fwu6+76mTF6gZO57jzWK93
-FlSHA6c7bCPMo+r4EZVccHBdrTRe6ZdD+OSOuEV4i0iI7IONOE1/ClWKUyueTsA/
-vKRir2Cb6A/NaScKNHBBhg==
-</ds:X509Certificate>
+          <ds:X509Certificate>MIIFxTCCBK2gAwIBAgIHFy/hnqc8wTANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQG
+EwJERTEgMB4GA1UEChMXTWF4LVBsYW5jay1HZXNlbGxzY2hhZnQxDzANBgNVBAMT
+Bk1QRyBDQTEcMBoGCSqGSIb3DQEJARYNbXBnLWNhQG1wZy5kZTAeFw0xNDAyMjgx
+MDI1MThaFw0xOTAyMjcxMDI1MThaMIGkMQswCQYDVQQGEwJOTDETMBEGA1UECBMK
+R2VsZGVybGFuZDERMA8GA1UEBxMITmlqbWVnZW4xIDAeBgNVBAoTF01heC1QbGFu
+Y2stR2VzZWxsc2NoYWZ0MTIwMAYDVQQLEylNYXgtUGxhbmNrLUluc3RpdHV0IGZ1
+ZXIgUHN5Y2hvbGluZ3Vpc3RpazEXMBUGA1UEAxMOY29ycHVzMS5tcGkubmwwggEi
+MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDGbPWbCx1FfjX9sh831NEW6MHN
+VSd9DElQH+1eAqevdt5g6sLCK4HTsigUkl94MdiaLzDwVngYoJ/QwycncE0bFFxg
+H0YHs8URXAOfkO9RmKy4x6TkuYElF8AmBnnEhoF58O1b/0DG8TdSpmWsMBrw+lyB
+gV++v15+WjuHn4DdXbG3AaaUMNYWPSk4fIvjPX19U9ys0euYcKa/kTU8nFuOJzVy
+WmUyNWjcgwImszfwwKaumIGDHGKSJ9eME/idNczuUhihY/kgU30+x4yfQ0PPJ6y1
+YLd+E2xAOmbjEbBnytkbRPVxHAPqw0py80meld2s70Cxxklj739+oP+++PwhAgMB
+AAGjggI/MIICOzA5BgNVHSAEMjAwMBEGDysGAQQBga0hgiwBAQQDATARBg8rBgEE
+AYGtIYIsAgEEAwEwCAYGZ4EMAQICMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgXgMB0G
+A1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATAdBgNVHQ4EFgQUE8+HM0pUcvXN
+4uBiDV/q2xwu2O8wHwYDVR0jBBgwFoAUAtYebgmrv1hlpwo8SDNh0c59w1swRAYD
+VR0RBD0wO4IOY29ycHVzMS5tcGkubmyCDGx1eDA3Lm1waS5ubIEbdG9iaWFzLnZh
+bnZhbGtlbmhvZWZAbXBpLm5sMHcGA1UdHwRwMG4wNaAzoDGGL2h0dHA6Ly9jZHAx
+LnBjYS5kZm4uZGUvbXBnLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMDWgM6Axhi9odHRw
+Oi8vY2RwMi5wY2EuZGZuLmRlL21wZy1jYS9wdWIvY3JsL2NhY3JsLmNybDCBxwYI
+KwYBBQUHAQEEgbowgbcwMwYIKwYBBQUHMAGGJ2h0dHA6Ly9vY3NwLnBjYS5kZm4u
+ZGUvT0NTUC1TZXJ2ZXIvT0NTUDA/BggrBgEFBQcwAoYzaHR0cDovL2NkcDEucGNh
+LmRmbi5kZS9tcGctY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MD8GCCsGAQUFBzAC
+hjNodHRwOi8vY2RwMi5wY2EuZGZuLmRlL21wZy1jYS9wdWIvY2FjZXJ0L2NhY2Vy
+dC5jcnQwDQYJKoZIhvcNAQEFBQADggEBAAGH5IPCi3tfYwo+CN357NdkGav1KQT2
+T0sjZ2chg//8SNucof42LXWvMlRIaRXjFP2bTW8sPt3hNwPyVLLAUFE/ogRz955Y
+a4Fbx/0bS1XZSCCneQ+pP+gnfad0AA3PJ2fDb/LUQ43q8xu8B1tm9GyTz6sE2mjU
+c0GOYUp4wvC/Hu3Wr1/80KbebBX5QxQPg9CVqXaz8yECpZwrTJsa3d+pY8WVA6Fr
+/0vQmp9LyYl9II3xrP5KMkLFWfusAqfDQbO+l0q44mGImEee3G4Wkg7VAcwDgKBa
+LHbuhlrBzMoxQBZGyW4eOToiuysyE37dSKtUgCs4vDN4S4EWz90Y6xY=</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>corpus1.mpi.nl</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>emailAddress=latadmin@mpi.nl,CN=corpus1.mpi.nl,O=MPI-PL,L=Nijmegen,ST=GLD,C=NL</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDbDCCAlQCCQDcydJCAWzKeDANBgkqhkiG9w0BAQUFADB4MQswCQYDVQQGEwJO
-TDEMMAoGA1UECBMDR0xEMREwDwYDVQQHEwhOaWptZWdlbjEPMA0GA1UEChMGTVBJ
-LVBMMRcwFQYDVQQDEw5jb3JwdXMxLm1waS5ubDEeMBwGCSqGSIb3DQEJARYPbGF0
-YWRtaW5AbXBpLm5sMB4XDTE0MDUwMjExMjkwNVoXDTE5MDUwMTExMjkwNVoweDEL
-MAkGA1UEBhMCTkwxDDAKBgNVBAgTA0dMRDERMA8GA1UEBxMITmlqbWVnZW4xDzAN
-BgNVBAoTBk1QSS1QTDEXMBUGA1UEAxMOY29ycHVzMS5tcGkubmwxHjAcBgkqhkiG
-9w0BCQEWD2xhdGFkbWluQG1waS5ubDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
-AQoCggEBAMFrApun/KXB9YtFiT49PHz7uV9EoVmrFsCBNqVWYhM+msq2dkM7rNVe
-eZdy2hHID72ILMeqeXKX+hFQPyX18eN4L6lfJzzJJI2HGdIuGPyKZXCsVrCqnIWo
-VPRi5dnTlCpCEPhebt05L9TMQJrLWue2qDhhdwkaYrVfm+tsYGK9yiy3Gbsoa10L
-kEpd2oJZLDGHXSZJ6GL4oUMbQ+Z9bIjCelQWC4tU/u6qFGIzyoabaJbAlnFAxFSq
-DIQ9+27JObXMnVH/6iK0mhHTooB72Gd0LQHVHGiCrFyxmbhMp7tIX0vU3Qn4/U8F
-kt/Kep3+Wam/1h1NmmOJzTux2NuRurcCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEA
-YPPRnb1/92C/Si/V5I15TfFSTdOeMcVHQ0DY0ohUw8B4fEbr9htjZoW7Umyco5pF
-kf+2Jm0GRVEJKjBxFEsbNbY8vusnP25u88vJa4Qy3JJZbsYGcPZiFOKffZWg/xqW
-t5F3i+akH5ihUn910/5l85SDUnDS1VvHVdOGwsedRNW4Yi9eEWjiEGQwjlhH0sWh
-uxjCIgYajcptpsZ8N8g+bR7ysVk61E5tcmScA5Pnu1fwu6+76mTF6gZO57jzWK93
-FlSHA6c7bCPMo+r4EZVccHBdrTRe6ZdD+OSOuEV4i0iI7IONOE1/ClWKUyueTsA/
-vKRir2Cb6A/NaScKNHBBhg==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://corpus1.mpi.nl/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://corpus1.mpi.nl/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://corpus1.mpi.nl/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://corpus1.mpi.nl/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://corpus1.mpi.nl/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://corpus1.mpi.nl/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://corpus1.mpi.nl/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://corpus1.mpi.nl/Shibboleth.sso/NIM/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://corpus1.mpi.nl/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://corpus1.mpi.nl/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://corpus1.mpi.nl/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://corpus1.mpi.nl/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://corpus1.mpi.nl/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://corpus1.mpi.nl/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <AttributeConsumingService index="1">
-      <ServiceName xml:lang="de">Max Planck Institute for Psycholinguistics Corpus1 Service Provider for Linguistic Services</ServiceName>
-      <ServiceName xml:lang="en">Max Planck Institute for Psycholinguistics Corpus1 Service Provider for Linguistic Services</ServiceName>
-      <ServiceDescription xml:lang="de">Max Planck Institute for Psycholinguistics Corpus1 Service Provider for Linguistic Services</ServiceDescription>
-      <ServiceDescription xml:lang="en">Max Planck Institute for Psycholinguistics Corpus1 Service Provider for Linguistic Services</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"/>
-    </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="technical">
-    <GivenName>Technical</GivenName>
-    <SurName>Support</SurName>
-    <EmailAddress>mailto:latadmin@mpi.nl</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="support">
-    <GivenName>General</GivenName>
-    <SurName>Support</SurName>
-    <EmailAddress>mailto:latadmin@mpi.nl</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://corpus1.mpi.nl/Shibboleth.sso/SAML2/POST" index="1" isDefault="true"/>
+    <md:AttributeConsumingService index="1" isDefault="true">
+      <md:ServiceName xml:lang="fi">Psykolingvistiikan Max Planck-instituutin palveluntarjoaja</md:ServiceName>
+      <md:ServiceName xml:lang="en">Max Planck Institute for Psycholinguistics Service Provider</md:ServiceName>
+      <md:ServiceDescription xml:lang="fi">Psykolingvistiikan Max Planck-instituutin tutkijoille suunnattu kielitieteellinen palveluntarjoaja.</md:ServiceDescription>
+      <md:ServiceDescription xml:lang="en">Max Planck Institute for Psycholinguistics Service Provider for Linguistic Services aimed at researchers.</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.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonPrincipalName"/>
+      <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.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="mail"/>
+      <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.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">CLARIN Service Provider Federation/MPI</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">CLARIN Service Provider Federation/MPI</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">CLARIN Service Provider Federation/MPI</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="fi">CLARIN Service Provider Federation/MPI</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">CLARIN Service Provider Federation/MPI</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">CLARIN Service Provider Federation/MPI</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="fi">http://www.clarin.eu</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.clarin.eu</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">http://www.clarin.eu</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Technical</md:GivenName>
+    <md:SurName>Support</md:SurName>
+    <md:EmailAddress>mailto:latadmin@mpi.nl</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:corpman@mpi.nl</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sp.dev.clarin.inl.nl.xml b/swamid-interfederations-2.0/sp.dev.clarin.inl.nl.xml
deleted file mode 100644
index f1ee1523..00000000
--- a/swamid-interfederations-2.0/sp.dev.clarin.inl.nl.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://sp.dev.clarin.inl.nl/shibboleth">
-  <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:KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIFWDCCBECgAwIBAgIQJ/7FXBoKUGe92mfIdkjkTzANBgkqhkiG9w0BAQUFADCB
-iTELMAkGA1UEBhMCR0IxGzAZBgNVBAgTEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4G
-A1UEBxMHU2FsZm9yZDEaMBgGA1UEChMRQ09NT0RPIENBIExpbWl0ZWQxLzAtBgNV
-BAMTJkNPTU9ETyBIaWdoIEFzc3VyYW5jZSBTZWN1cmUgU2VydmVyIENBMB4XDTA5
-MDYxNTAwMDAwMFoXDTE0MDYxNTIzNTk1OVowgdkxCzAJBgNVBAYTAk5MMRAwDgYD
-VQQREwcyMzExIEJaMRUwEwYDVQQIEwxadWlkLUhvbGxhbmQxDzANBgNVBAcTBkxl
-aWRlbjEhMB8GA1UECRMYTWF0dGhpYXMgZGUgVnJpZXNob2YgMi0zMTIwMAYDVQQK
-EylTdCBJbnN0aXR1dXQgdm9vciBOZWRlcmxhbmRzZSBMZXhpY29sb2dpZTEaMBgG
-A1UECxMRQ29tb2RvIEluc3RhbnRTU0wxHTAbBgNVBAMTFHNwLmRldi5jbGFyaW4u
-aW5sLm5sMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCo9rdfDu13+/wOF5/f
-AyUVKFtr2lTIEXdafTiYNzddM4A8adWmpaMxhkUeGdviz97L4m23KxI/Pf/J/wq2
-mmHtOEAYwmQgXb+ltT8Gf9aknvyphzEiH/hNYp+qoOxQ1RSFMCnX3QLl5VMrLyHM
-orAwTQL0uLr/EuzMcViolKcOnwIDAQABo4IB7DCCAegwHwYDVR0jBBgwFoAUYFnN
-gMfF46uML/xr5VsK9Q/eS/8wHQYDVR0OBBYEFC7a6OPUS99Y35xiMz3fPk2ilJTF
-MA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMDQGA1UdJQQtMCsGCCsGAQUF
-BwMBBggrBgEFBQcDAgYKKwYBBAGCNwoDAwYJYIZIAYb4QgQBMEYGA1UdIAQ/MD0w
-OwYMKwYBBAGyMQECAQMEMCswKQYIKwYBBQUHAgEWHWh0dHBzOi8vc2VjdXJlLmNv
-bW9kby5uZXQvQ1BTME4GA1UdHwRHMEUwQ6BBoD+GPWh0dHA6Ly9jcmwuY29tb2Rv
-Y2EuY29tL0NvbW9kb0hpZ2hBc3N1cmFuY2VTZWN1cmVTZXJ2ZXJDQS5jcmwwfwYI
-KwYBBQUHAQEEczBxMEkGCCsGAQUFBzAChj1odHRwOi8vY3J0LmNvbW9kb2NhLmNv
-bS9Db21vZG9IaWdoQXNzdXJhbmNlU2VjdXJlU2VydmVyQ0EuY3J0MCQGCCsGAQUF
-BzABhhhodHRwOi8vb2NzcC5jb21vZG9jYS5jb20wOQYDVR0RBDIwMIIUc3AuZGV2
-LmNsYXJpbi5pbmwubmyCGHd3dy5zcC5kZXYuY2xhcmluLmlubC5ubDANBgkqhkiG
-9w0BAQUFAAOCAQEAjtEgHw+TblkdTK5utNytnxEuQ3lPT5eEMyN+o6V00L51u+F6
-uh+yPdTH5UBXnTWbAc+RRlfYQDE+5x6v8FDyyO1Znf5pKYFoquO9ym8JqjHXEZQY
-s9z/lt6TM7NKiCZO7S7FC8HHzPrnU0kwzgmf6f+Y7fRzOAuDfLxnUZwlpAaGs1R6
-nS2MgFakP+X/ZNjrWETQriNNGSBGbYfcdB1QuoMgJuXkU6zs7DhmHP838uFAQjYi
-OC/70RsuE1f4nsgjJ+jT9x/DoVqV2YbW0gGNyGpWPTH4csvE23Z1dFINIymVUlt9
-MLV2RZ8HHAgA9AeBjEdJIavF9Q9H6a59eFcx4A==</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://sp.dev.clarin.inl.nl/Shibboleth.sso/SAML2/POST" index="1" isDefault="true"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sp.dev.clarin.inl.nl/Shibboleth.sso/SAML/POST" index="2" isDefault="false"/>
-    <md:AttributeConsumingService index="1" isDefault="true">
-      <md:ServiceName xml:lang="fi">Browsable TST-LRs</md:ServiceName>
-      <md:ServiceName xml:lang="en">Browsable TST-LRs</md:ServiceName>
-      <md:ServiceName xml:lang="sv">Browsable TST-LRs</md:ServiceName>
-      <md:ServiceDescription xml:lang="fi">This website gives you access to the IMDI-based language resources (LRs) housed at the TST-centrale.</md:ServiceDescription>
-      <md:ServiceDescription xml:lang="en">This website gives you access to the IMDI-based language resources (LRs) housed at the TST-centrale.</md:ServiceDescription>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonPrincipalName"/>
-      <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:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="fi">CLARIN Service Provider Federation/MPI</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">CLARIN Service Provider Federation/MPI</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">CLARIN Service Provider Federation/MPI</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="fi">CLARIN Service Provider Federation/MPI</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">CLARIN Service Provider Federation/MPI</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="sv">CLARIN Service Provider Federation/MPI</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="fi">http://www.clarin.eu</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.clarin.eu</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sv">http://www.clarin.eu</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Marco</md:GivenName>
-    <md:SurName>Van der Laan</md:SurName>
-    <md:EmailAddress>mailto:systeembeheer@inl.nl</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sp.ebrary.com-shibboleth.xml b/swamid-interfederations-2.0/sp.ebrary.com-shibboleth.xml
deleted file mode 100644
index f9e6bb92..00000000
--- a/swamid-interfederations-2.0/sp.ebrary.com-shibboleth.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://sp.ebrary.com/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2013-09-25T14:15:53Z">
-      <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>
-      <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.ebrary.com/Shibboleth.sso/DS/Edugate" 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.ebrary.com/Shibboleth.sso/DS" index="2"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="de">ebrary ebooks</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">ebrary ebooks</mdui:DisplayName>
-        <mdui:Description xml:lang="de">Um Bibliotheken mit strategischen ebook Akquisition unterstützen, bietet eine Reihe von ebrary Pakete unter Abonnement und ewigen Archiv-Modelle, die von Hand durch unsere on-Bibliothekare ausgewählt sind. Diese abgepackte Produkte können miteinander kombiniert, sowie einzelne Titel unter Modelle wie Patron driven Erwerb und kurzfristige Darlehen für den größten Wert erworben werden.</mdui:Description>
-        <mdui:Description xml:lang="en">To assist libraries with strategic ebook acquisition, ebrary offers a number of packages under subscription and perpetual archive models that are hand selected by our on-staff librarians. These pre-packaged products can be combined with each other as well as individual titles acquired under models such as patron driven acquisition and short-term loan for the greatest value.</mdui:Description>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>shibb01.ebrary.com</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=shibb01.ebrary.com</ds:X509SubjectName>
-          <ds:X509Certificate>MIIC/TCCAeWgAwIBAgIJAJ7CVX1opkHyMA0GCSqGSIb3DQEBBQUAMB0xGzAZBgNV
-BAMTEnNoaWJiMDEuZWJyYXJ5LmNvbTAeFw0xMjAzMDYxNTEzNDFaFw0yMjAzMDQx
-NTEzNDFaMB0xGzAZBgNVBAMTEnNoaWJiMDEuZWJyYXJ5LmNvbTCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBALuIVAFYCaz6nqWxxN9tMxXk+aXzCN0eAyG0
-HIRrO2trVL6ypFzofTm8f2+G95PRXVxzx8E8+9XOo3EpOnU8g/kVP7qT7IrUtZXD
-Vzy2iGgdgwMWrttFC+lOGCwO+bbYUAwYoXtfBh0LkG0Q4gf0TLMg3j61C36ceKLV
-dIOqDdU07YPgRls4eOpYltJjcqa52mODEO+KFJ9FWc8dmVaBRVZgaGDsoZlXhsSo
-tDTHJirO+F14ODi9FL258jF2/lodHD1irsZEGQBQatJE3zJuJ9XfTD3lFGdWq+ZR
-WF/qIMYiTvQN69b1UV5zgoGBsn2S90nEtfA98BC4JirJ5qUzy9sCAwEAAaNAMD4w
-HQYDVR0RBBYwFIISc2hpYmIwMS5lYnJhcnkuY29tMB0GA1UdDgQWBBQayHM3e6AN
-AKKlRKtofjjdfLQdFDANBgkqhkiG9w0BAQUFAAOCAQEAixoxwjRIM1LyByB/9jm0
-UEQQsDIkIYByMdLGSKmhTWNbd6aKOP3We5br6uH544XL2HlsSRQ48QHJLRBtRwvR
-2drWZgfJfUQP6iGs2rZQUjCk7EWW/cVGc0DxJef2nbvwtibk2TVZfLpjrso9T32W
-C5fDoiy5vcwBBRPdhH7xJpgBSzx71lAiYjpUZqkt3URWaPYA3RWEnP5dlRZ1SuY6
-3Nob3XeM7KrmF+lL8P1x0wKpXJo9/mHT9AURPFdgyqkIeGpJRSuOXZrp9rMtBexk
-qXS98sBULfKabCh9PFamzMzeaerLQAKf3ZGcK0f47tLo2fp4GlFUTE9EyIn9sixR
-Dw==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sp.ebrary.com/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sp.ebrary.com/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp.ebrary.com/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp.ebrary.com/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sp.ebrary.com/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sp.ebrary.com/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp.ebrary.com/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp.ebrary.com/Shibboleth.sso/NIM/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sp.ebrary.com/Shibboleth.sso/SAML/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sp.ebrary.com/Shibboleth.sso/SAML/Artifact" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp.ebrary.com/Shibboleth.sso/SAML2/POST" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sp.ebrary.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp.ebrary.com/Shibboleth.sso/SAML2/Artifact" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://sp.ebrary.com/Shibboleth.sso/SAML2/ECP" index="6"/>
-    <AttributeConsumingService index="1">
-      <ServiceName xml:lang="de">ebrary ebooks</ServiceName>
-      <ServiceName xml:lang="en">ebrary ebooks</ServiceName>
-      <ServiceDescription xml:lang="de">Um Bibliotheken mit strategischen ebook Akquisition unterstützen, bietet eine Reihe von ebrary Pakete unter Abonnement und ewigen Archiv-Modelle, die von Hand durch unsere on-Bibliothekare ausgewählt sind. Diese abgepackte Produkte können miteinander kombiniert, sowie einzelne Titel unter Modelle wie Patron driven Erwerb und kurzfristige Darlehen für den größten Wert erworben werden.</ServiceDescription>
-      <ServiceDescription xml:lang="en">To assist libraries with strategic ebook acquisition, ebrary offers a number of packages under subscription and perpetual archive models that are hand selected by our on-staff librarians. These pre-packaged products can be combined with each other as well as individual titles acquired under models such as patron driven acquisition and short-term loan for the greatest value.</ServiceDescription>
-      <RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <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"/>
-    </AttributeConsumingService>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">e65</OrganizationName>
-    <OrganizationName xml:lang="en">e65</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">ProQuest</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">ProQuest</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.proquest.com</OrganizationURL>
-    <OrganizationURL xml:lang="en">http://www.proquest.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>jingwen</GivenName>
-    <SurName>wang</SurName>
-    <EmailAddress>mailto:jingwen@ebrary.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="administrative">
-    <GivenName>rob</GivenName>
-    <SurName>wright</SurName>
-    <EmailAddress>mailto:rob@ebrary.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="support">
-    <GivenName>jingwen</GivenName>
-    <SurName>wang</SurName>
-    <EmailAddress>mailto:jingwen@ebrary.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sp.ebrary.com.xml b/swamid-interfederations-2.0/sp.ebrary.com.xml
deleted file mode 100644
index f9e6bb92..00000000
--- a/swamid-interfederations-2.0/sp.ebrary.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://sp.ebrary.com/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2013-09-25T14:15:53Z">
-      <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>
-      <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.ebrary.com/Shibboleth.sso/DS/Edugate" 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.ebrary.com/Shibboleth.sso/DS" index="2"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="de">ebrary ebooks</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">ebrary ebooks</mdui:DisplayName>
-        <mdui:Description xml:lang="de">Um Bibliotheken mit strategischen ebook Akquisition unterstützen, bietet eine Reihe von ebrary Pakete unter Abonnement und ewigen Archiv-Modelle, die von Hand durch unsere on-Bibliothekare ausgewählt sind. Diese abgepackte Produkte können miteinander kombiniert, sowie einzelne Titel unter Modelle wie Patron driven Erwerb und kurzfristige Darlehen für den größten Wert erworben werden.</mdui:Description>
-        <mdui:Description xml:lang="en">To assist libraries with strategic ebook acquisition, ebrary offers a number of packages under subscription and perpetual archive models that are hand selected by our on-staff librarians. These pre-packaged products can be combined with each other as well as individual titles acquired under models such as patron driven acquisition and short-term loan for the greatest value.</mdui:Description>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>shibb01.ebrary.com</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=shibb01.ebrary.com</ds:X509SubjectName>
-          <ds:X509Certificate>MIIC/TCCAeWgAwIBAgIJAJ7CVX1opkHyMA0GCSqGSIb3DQEBBQUAMB0xGzAZBgNV
-BAMTEnNoaWJiMDEuZWJyYXJ5LmNvbTAeFw0xMjAzMDYxNTEzNDFaFw0yMjAzMDQx
-NTEzNDFaMB0xGzAZBgNVBAMTEnNoaWJiMDEuZWJyYXJ5LmNvbTCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBALuIVAFYCaz6nqWxxN9tMxXk+aXzCN0eAyG0
-HIRrO2trVL6ypFzofTm8f2+G95PRXVxzx8E8+9XOo3EpOnU8g/kVP7qT7IrUtZXD
-Vzy2iGgdgwMWrttFC+lOGCwO+bbYUAwYoXtfBh0LkG0Q4gf0TLMg3j61C36ceKLV
-dIOqDdU07YPgRls4eOpYltJjcqa52mODEO+KFJ9FWc8dmVaBRVZgaGDsoZlXhsSo
-tDTHJirO+F14ODi9FL258jF2/lodHD1irsZEGQBQatJE3zJuJ9XfTD3lFGdWq+ZR
-WF/qIMYiTvQN69b1UV5zgoGBsn2S90nEtfA98BC4JirJ5qUzy9sCAwEAAaNAMD4w
-HQYDVR0RBBYwFIISc2hpYmIwMS5lYnJhcnkuY29tMB0GA1UdDgQWBBQayHM3e6AN
-AKKlRKtofjjdfLQdFDANBgkqhkiG9w0BAQUFAAOCAQEAixoxwjRIM1LyByB/9jm0
-UEQQsDIkIYByMdLGSKmhTWNbd6aKOP3We5br6uH544XL2HlsSRQ48QHJLRBtRwvR
-2drWZgfJfUQP6iGs2rZQUjCk7EWW/cVGc0DxJef2nbvwtibk2TVZfLpjrso9T32W
-C5fDoiy5vcwBBRPdhH7xJpgBSzx71lAiYjpUZqkt3URWaPYA3RWEnP5dlRZ1SuY6
-3Nob3XeM7KrmF+lL8P1x0wKpXJo9/mHT9AURPFdgyqkIeGpJRSuOXZrp9rMtBexk
-qXS98sBULfKabCh9PFamzMzeaerLQAKf3ZGcK0f47tLo2fp4GlFUTE9EyIn9sixR
-Dw==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sp.ebrary.com/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sp.ebrary.com/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp.ebrary.com/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp.ebrary.com/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sp.ebrary.com/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sp.ebrary.com/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp.ebrary.com/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp.ebrary.com/Shibboleth.sso/NIM/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sp.ebrary.com/Shibboleth.sso/SAML/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sp.ebrary.com/Shibboleth.sso/SAML/Artifact" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp.ebrary.com/Shibboleth.sso/SAML2/POST" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sp.ebrary.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp.ebrary.com/Shibboleth.sso/SAML2/Artifact" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://sp.ebrary.com/Shibboleth.sso/SAML2/ECP" index="6"/>
-    <AttributeConsumingService index="1">
-      <ServiceName xml:lang="de">ebrary ebooks</ServiceName>
-      <ServiceName xml:lang="en">ebrary ebooks</ServiceName>
-      <ServiceDescription xml:lang="de">Um Bibliotheken mit strategischen ebook Akquisition unterstützen, bietet eine Reihe von ebrary Pakete unter Abonnement und ewigen Archiv-Modelle, die von Hand durch unsere on-Bibliothekare ausgewählt sind. Diese abgepackte Produkte können miteinander kombiniert, sowie einzelne Titel unter Modelle wie Patron driven Erwerb und kurzfristige Darlehen für den größten Wert erworben werden.</ServiceDescription>
-      <ServiceDescription xml:lang="en">To assist libraries with strategic ebook acquisition, ebrary offers a number of packages under subscription and perpetual archive models that are hand selected by our on-staff librarians. These pre-packaged products can be combined with each other as well as individual titles acquired under models such as patron driven acquisition and short-term loan for the greatest value.</ServiceDescription>
-      <RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <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"/>
-    </AttributeConsumingService>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">e65</OrganizationName>
-    <OrganizationName xml:lang="en">e65</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">ProQuest</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">ProQuest</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.proquest.com</OrganizationURL>
-    <OrganizationURL xml:lang="en">http://www.proquest.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>jingwen</GivenName>
-    <SurName>wang</SurName>
-    <EmailAddress>mailto:jingwen@ebrary.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="administrative">
-    <GivenName>rob</GivenName>
-    <SurName>wright</SurName>
-    <EmailAddress>mailto:rob@ebrary.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="support">
-    <GivenName>jingwen</GivenName>
-    <SurName>wang</SurName>
-    <EmailAddress>mailto:jingwen@ebrary.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sp.edina.ac.uk-shibboleth-kbplus.xml b/swamid-interfederations-2.0/sp.edina.ac.uk-shibboleth-kbplus.xml
deleted file mode 100644
index 6c235ad8..00000000
--- a/swamid-interfederations-2.0/sp.edina.ac.uk-shibboleth-kbplus.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://sp.edina.ac.uk/shibboleth/kbplus">
-  <!--
-		This is an "EDINA Knowledge Base+" SP for the University of Edinburgh.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-03-27T15:54:52Z">
-      <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">Knowledge Base+</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Knowledge Base+</mdui:Description>
-        <mdui:Logo height="64" width="318">https://vsp2.edina.ac.uk/public/images/splogos/kbplus.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://vsp2.edina.ac.uk/kbplus/Shibboleth.sso/Login"/>
-      <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://vsp2.edina.ac.uk/kbplus/Shibboleth.sso/UKDA"/>
-      <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://vsp2.edina.ac.uk/kbplus/Shibboleth.sso/WAYF/EDINASchools"/>
-      <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://vsp2.edina.ac.uk/kbplus/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://vsp2.edina.ac.uk/kbplus/Shibboleth.sso/WAYF/UKall"/>
-      <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://vsp5.edina.ac.uk/kbplus/Shibboleth.sso/Login"/>
-      <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://vsp5.edina.ac.uk/kbplus/Shibboleth.sso/UKDA"/>
-      <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://vsp5.edina.ac.uk/kbplus/Shibboleth.sso/WAYF/EDINASchools"/>
-      <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://vsp5.edina.ac.uk/kbplus/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://vsp5.edina.ac.uk/kbplus/Shibboleth.sso/WAYF/UKall"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIESDCCAzCgAwIBAgIJAKrBnZO7TvNTMA0GCSqGSIb3DQEBBQUAMIGkMQswCQYD
-						VQQGEwJHQjERMA8GA1UECBMIU2NvdGxhbmQxEjAQBgNVBAcTCUVkaW5idXJnaDEk
-						MCIGA1UEChMbVGhlIFVuaXZlcnNpdHkgb2YgRWRpbmJ1cmdoMQ4wDAYDVQQLEwVF
-						RElOQTEZMBcGA1UEAxMQdnNwMi5lZGluYS5hYy51azEdMBsGCSqGSIb3DQEJARYO
-						ZWRpbmFAZWQuYWMudWswHhcNMTAwMjAxMTY0OTI1WhcNMjAwMTMwMTY0OTI1WjCB
-						pDELMAkGA1UEBhMCR0IxETAPBgNVBAgTCFNjb3RsYW5kMRIwEAYDVQQHEwlFZGlu
-						YnVyZ2gxJDAiBgNVBAoTG1RoZSBVbml2ZXJzaXR5IG9mIEVkaW5idXJnaDEOMAwG
-						A1UECxMFRURJTkExGTAXBgNVBAMTEHZzcDIuZWRpbmEuYWMudWsxHTAbBgkqhkiG
-						9w0BCQEWDmVkaW5hQGVkLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
-						CgKCAQEAynwMFgT8x37YBNpxAGTtLJxF3iG1adpqRmin40XS86HdJP21dzsH7JD1
-						RanxUJJOWU8wud9e//ZZTC58TZbc8Zp0JRc5hlTOmLRksYt4B0QxrCqJ4EmFKlIM
-						igE5ZNgoR+lwS1ENKikIHibnVcNF9IpIkX8sTzCY18JcileM8Yz5b+R91yoha1MU
-						asRefMf2j7RR6kldAJw2Xj63aFtN0NXL6Z+HiLyg4JNslJTH9c3Ha88tI+6Ce1Q6
-						rG7rztkpHAD5Rd+ovQMysk9ihA3RN18X0Uu8LqExH2tUqq51Fmd+KQ04hyjE4gx+
-						w2T6MwPmdp6zLQSXFf6x9CeRai7MwwIDAQABo3sweTAJBgNVHRMEAjAAMCwGCWCG
-						SAGG+EIBDQQfFh1PcGVuU1NMIEdlbmVyYXRlZCBDZXJ0aWZpY2F0ZTAdBgNVHQ4E
-						FgQU59hHQ8+jwnn2x3Yz4BDaEaDHUrswHwYDVR0jBBgwFoAU59hHQ8+jwnn2x3Yz
-						4BDaEaDHUrswDQYJKoZIhvcNAQEFBQADggEBAB5CEE4B61l2mn/sBlc7+qN+obOW
-						gZURJvs/EeIlfR7LpWRITMSn4pE5mPR4R96tL0vNXc1jl5c2sTV9dtztazWmU+Z1
-						u3rniEM6jETPFqlmYhOPFzYWoQTB0LGv3Id0NR4dCFDtFNl+EPaQAug9C39gkOCN
-						iLZJlzOZxUALuUvebPbZMfqSTo8SdFT1Cv2No0hQIBjvlO1OimSjAWgkFR3snW8b
-						xzZ/lWUqrLDZYSo5LXQad3yNfhwi4dMJ5PRuAuTH1akdwlVf4AIeIQDm3QBKJIhj
-						TOGrFRiCdlp4cIQwN66UelzUH2KjlI/iQXYLbq5uUHN/EI47I/E0gpnYr5E=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://vsp2.edina.ac.uk/kbplus/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://vsp5.edina.ac.uk/kbplus/Shibboleth.sso/Artifact/SOAP" index="2"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://auth.edina.ac.uk/kbplus/Shibboleth.sso/Artifact/SOAP" index="3"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://vsp2.edina.ac.uk/kbplus/Shibboleth.sso/SLO/Artifact"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://vsp2.edina.ac.uk/kbplus/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://vsp2.edina.ac.uk/kbplus/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://vsp2.edina.ac.uk/kbplus/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://vsp5.edina.ac.uk/kbplus/Shibboleth.sso/SLO/Artifact"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://vsp5.edina.ac.uk/kbplus/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://vsp5.edina.ac.uk/kbplus/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://vsp5.edina.ac.uk/kbplus/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://auth.edina.ac.uk/kbplus/Shibboleth.sso/SLO/Artifact"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://auth.edina.ac.uk/kbplus/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://auth.edina.ac.uk/kbplus/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://auth.edina.ac.uk/kbplus/Shibboleth.sso/SLO/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://vsp2.edina.ac.uk/kbplus/Shibboleth.sso/NIM/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://vsp2.edina.ac.uk/kbplus/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://vsp2.edina.ac.uk/kbplus/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://vsp2.edina.ac.uk/kbplus/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://vsp5.edina.ac.uk/kbplus/Shibboleth.sso/NIM/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://vsp5.edina.ac.uk/kbplus/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://vsp5.edina.ac.uk/kbplus/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://vsp5.edina.ac.uk/kbplus/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://auth.edina.ac.uk/kbplus/Shibboleth.sso/NIM/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://auth.edina.ac.uk/kbplus/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://auth.edina.ac.uk/kbplus/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://auth.edina.ac.uk/kbplus/Shibboleth.sso/NIM/SOAP"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://vsp2.edina.ac.uk/kbplus/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://vsp2.edina.ac.uk/kbplus/Shibboleth.sso/SAML/POST" index="7"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://vsp2.edina.ac.uk/kbplus/Shibboleth.sso/SAML2/Artifact" index="8"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://vsp2.edina.ac.uk/kbplus/Shibboleth.sso/SAML2/ECP" index="9"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://vsp2.edina.ac.uk/kbplus/Shibboleth.sso/SAML2/POST" index="10"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://vsp2.edina.ac.uk/kbplus/Shibboleth.sso/SAML2/POST-SimpleSign" index="11"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://vsp5.edina.ac.uk/kbplus/Shibboleth.sso/SAML/Artifact" index="12"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://vsp5.edina.ac.uk/kbplus/Shibboleth.sso/SAML/POST" index="13"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://vsp5.edina.ac.uk/kbplus/Shibboleth.sso/SAML2/Artifact" index="14"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://vsp5.edina.ac.uk/kbplus/Shibboleth.sso/SAML2/ECP" index="15"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://vsp5.edina.ac.uk/kbplus/Shibboleth.sso/SAML2/POST" index="16"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://vsp5.edina.ac.uk/kbplus/Shibboleth.sso/SAML2/POST-SimpleSign" index="17"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://auth.edina.ac.uk/kbplus/Shibboleth.sso/SAML/Artifact" index="18"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://auth.edina.ac.uk/kbplus/Shibboleth.sso/SAML/POST" index="19"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://auth.edina.ac.uk/kbplus/Shibboleth.sso/SAML2/Artifact" index="20"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://auth.edina.ac.uk/kbplus/Shibboleth.sso/SAML2/ECP" index="21"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://auth.edina.ac.uk/kbplus/Shibboleth.sso/SAML2/POST" index="22"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://auth.edina.ac.uk/kbplus/Shibboleth.sso/SAML2/POST-SimpleSign" index="23"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Edinburgh</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">EDINA Knowledge Base+</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.jisc-collections.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>EDINA Helpdesk</GivenName>
-    <EmailAddress>mailto:edina@ed.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Ben</GivenName>
-    <SurName>Soares</SurName>
-    <EmailAddress>mailto:ben.soares@ed.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sp.edina.ac.uk.xml b/swamid-interfederations-2.0/sp.edina.ac.uk.xml
deleted file mode 100644
index 6c235ad8..00000000
--- a/swamid-interfederations-2.0/sp.edina.ac.uk.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://sp.edina.ac.uk/shibboleth/kbplus">
-  <!--
-		This is an "EDINA Knowledge Base+" SP for the University of Edinburgh.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-03-27T15:54:52Z">
-      <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">Knowledge Base+</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Knowledge Base+</mdui:Description>
-        <mdui:Logo height="64" width="318">https://vsp2.edina.ac.uk/public/images/splogos/kbplus.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://vsp2.edina.ac.uk/kbplus/Shibboleth.sso/Login"/>
-      <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://vsp2.edina.ac.uk/kbplus/Shibboleth.sso/UKDA"/>
-      <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://vsp2.edina.ac.uk/kbplus/Shibboleth.sso/WAYF/EDINASchools"/>
-      <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://vsp2.edina.ac.uk/kbplus/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://vsp2.edina.ac.uk/kbplus/Shibboleth.sso/WAYF/UKall"/>
-      <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://vsp5.edina.ac.uk/kbplus/Shibboleth.sso/Login"/>
-      <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://vsp5.edina.ac.uk/kbplus/Shibboleth.sso/UKDA"/>
-      <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://vsp5.edina.ac.uk/kbplus/Shibboleth.sso/WAYF/EDINASchools"/>
-      <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://vsp5.edina.ac.uk/kbplus/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://vsp5.edina.ac.uk/kbplus/Shibboleth.sso/WAYF/UKall"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIESDCCAzCgAwIBAgIJAKrBnZO7TvNTMA0GCSqGSIb3DQEBBQUAMIGkMQswCQYD
-						VQQGEwJHQjERMA8GA1UECBMIU2NvdGxhbmQxEjAQBgNVBAcTCUVkaW5idXJnaDEk
-						MCIGA1UEChMbVGhlIFVuaXZlcnNpdHkgb2YgRWRpbmJ1cmdoMQ4wDAYDVQQLEwVF
-						RElOQTEZMBcGA1UEAxMQdnNwMi5lZGluYS5hYy51azEdMBsGCSqGSIb3DQEJARYO
-						ZWRpbmFAZWQuYWMudWswHhcNMTAwMjAxMTY0OTI1WhcNMjAwMTMwMTY0OTI1WjCB
-						pDELMAkGA1UEBhMCR0IxETAPBgNVBAgTCFNjb3RsYW5kMRIwEAYDVQQHEwlFZGlu
-						YnVyZ2gxJDAiBgNVBAoTG1RoZSBVbml2ZXJzaXR5IG9mIEVkaW5idXJnaDEOMAwG
-						A1UECxMFRURJTkExGTAXBgNVBAMTEHZzcDIuZWRpbmEuYWMudWsxHTAbBgkqhkiG
-						9w0BCQEWDmVkaW5hQGVkLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
-						CgKCAQEAynwMFgT8x37YBNpxAGTtLJxF3iG1adpqRmin40XS86HdJP21dzsH7JD1
-						RanxUJJOWU8wud9e//ZZTC58TZbc8Zp0JRc5hlTOmLRksYt4B0QxrCqJ4EmFKlIM
-						igE5ZNgoR+lwS1ENKikIHibnVcNF9IpIkX8sTzCY18JcileM8Yz5b+R91yoha1MU
-						asRefMf2j7RR6kldAJw2Xj63aFtN0NXL6Z+HiLyg4JNslJTH9c3Ha88tI+6Ce1Q6
-						rG7rztkpHAD5Rd+ovQMysk9ihA3RN18X0Uu8LqExH2tUqq51Fmd+KQ04hyjE4gx+
-						w2T6MwPmdp6zLQSXFf6x9CeRai7MwwIDAQABo3sweTAJBgNVHRMEAjAAMCwGCWCG
-						SAGG+EIBDQQfFh1PcGVuU1NMIEdlbmVyYXRlZCBDZXJ0aWZpY2F0ZTAdBgNVHQ4E
-						FgQU59hHQ8+jwnn2x3Yz4BDaEaDHUrswHwYDVR0jBBgwFoAU59hHQ8+jwnn2x3Yz
-						4BDaEaDHUrswDQYJKoZIhvcNAQEFBQADggEBAB5CEE4B61l2mn/sBlc7+qN+obOW
-						gZURJvs/EeIlfR7LpWRITMSn4pE5mPR4R96tL0vNXc1jl5c2sTV9dtztazWmU+Z1
-						u3rniEM6jETPFqlmYhOPFzYWoQTB0LGv3Id0NR4dCFDtFNl+EPaQAug9C39gkOCN
-						iLZJlzOZxUALuUvebPbZMfqSTo8SdFT1Cv2No0hQIBjvlO1OimSjAWgkFR3snW8b
-						xzZ/lWUqrLDZYSo5LXQad3yNfhwi4dMJ5PRuAuTH1akdwlVf4AIeIQDm3QBKJIhj
-						TOGrFRiCdlp4cIQwN66UelzUH2KjlI/iQXYLbq5uUHN/EI47I/E0gpnYr5E=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://vsp2.edina.ac.uk/kbplus/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://vsp5.edina.ac.uk/kbplus/Shibboleth.sso/Artifact/SOAP" index="2"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://auth.edina.ac.uk/kbplus/Shibboleth.sso/Artifact/SOAP" index="3"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://vsp2.edina.ac.uk/kbplus/Shibboleth.sso/SLO/Artifact"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://vsp2.edina.ac.uk/kbplus/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://vsp2.edina.ac.uk/kbplus/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://vsp2.edina.ac.uk/kbplus/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://vsp5.edina.ac.uk/kbplus/Shibboleth.sso/SLO/Artifact"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://vsp5.edina.ac.uk/kbplus/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://vsp5.edina.ac.uk/kbplus/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://vsp5.edina.ac.uk/kbplus/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://auth.edina.ac.uk/kbplus/Shibboleth.sso/SLO/Artifact"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://auth.edina.ac.uk/kbplus/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://auth.edina.ac.uk/kbplus/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://auth.edina.ac.uk/kbplus/Shibboleth.sso/SLO/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://vsp2.edina.ac.uk/kbplus/Shibboleth.sso/NIM/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://vsp2.edina.ac.uk/kbplus/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://vsp2.edina.ac.uk/kbplus/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://vsp2.edina.ac.uk/kbplus/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://vsp5.edina.ac.uk/kbplus/Shibboleth.sso/NIM/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://vsp5.edina.ac.uk/kbplus/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://vsp5.edina.ac.uk/kbplus/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://vsp5.edina.ac.uk/kbplus/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://auth.edina.ac.uk/kbplus/Shibboleth.sso/NIM/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://auth.edina.ac.uk/kbplus/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://auth.edina.ac.uk/kbplus/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://auth.edina.ac.uk/kbplus/Shibboleth.sso/NIM/SOAP"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://vsp2.edina.ac.uk/kbplus/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://vsp2.edina.ac.uk/kbplus/Shibboleth.sso/SAML/POST" index="7"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://vsp2.edina.ac.uk/kbplus/Shibboleth.sso/SAML2/Artifact" index="8"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://vsp2.edina.ac.uk/kbplus/Shibboleth.sso/SAML2/ECP" index="9"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://vsp2.edina.ac.uk/kbplus/Shibboleth.sso/SAML2/POST" index="10"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://vsp2.edina.ac.uk/kbplus/Shibboleth.sso/SAML2/POST-SimpleSign" index="11"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://vsp5.edina.ac.uk/kbplus/Shibboleth.sso/SAML/Artifact" index="12"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://vsp5.edina.ac.uk/kbplus/Shibboleth.sso/SAML/POST" index="13"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://vsp5.edina.ac.uk/kbplus/Shibboleth.sso/SAML2/Artifact" index="14"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://vsp5.edina.ac.uk/kbplus/Shibboleth.sso/SAML2/ECP" index="15"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://vsp5.edina.ac.uk/kbplus/Shibboleth.sso/SAML2/POST" index="16"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://vsp5.edina.ac.uk/kbplus/Shibboleth.sso/SAML2/POST-SimpleSign" index="17"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://auth.edina.ac.uk/kbplus/Shibboleth.sso/SAML/Artifact" index="18"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://auth.edina.ac.uk/kbplus/Shibboleth.sso/SAML/POST" index="19"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://auth.edina.ac.uk/kbplus/Shibboleth.sso/SAML2/Artifact" index="20"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://auth.edina.ac.uk/kbplus/Shibboleth.sso/SAML2/ECP" index="21"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://auth.edina.ac.uk/kbplus/Shibboleth.sso/SAML2/POST" index="22"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://auth.edina.ac.uk/kbplus/Shibboleth.sso/SAML2/POST-SimpleSign" index="23"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Edinburgh</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">EDINA Knowledge Base+</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.jisc-collections.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>EDINA Helpdesk</GivenName>
-    <EmailAddress>mailto:edina@ed.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Ben</GivenName>
-    <SurName>Soares</SurName>
-    <EmailAddress>mailto:ben.soares@ed.ac.uk</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 147f3e7e..45933ebd 100644
--- a/swamid-interfederations-2.0/sp.korp.csc.fi-.xml
+++ b/swamid-interfederations-2.0/sp.korp.csc.fi-.xml
@@ -1,19 +1,9 @@
 <?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#" entityID="https://sp.korp.csc.fi/">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.csc.fi/haka">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://www.csc.fi/english/institutions/haka/instructions/join/eduGAINRegistrationStatement/</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: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://korp.csc.fi/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+<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://sp.korp.csc.fi/">
+  <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://korp.csc.fi/Shibboleth.sso/Login" index="1"/>
+      <mdui:UIInfo>
         <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>
@@ -24,8 +14,12 @@
         <mdui:PrivacyStatementURL xml:lang="fi">https://korp.csc.fi/privacy-policy.html</mdui:PrivacyStatementURL>
         <mdui:PrivacyStatementURL xml:lang="sv">https://korp.csc.fi/privacy-policy.html</mdui:PrivacyStatementURL>
       </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
+      <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>MIIEYzCCA0ugAwIBAgIQTmDBZrbiqJFnGKHn80dL1zANBgkqhkiG9w0BAQUFADA2
@@ -54,42 +48,42 @@ eeQKhPUjOTj9UPCeCE8rjrLqJ3pBtqlfhwUkfbIpUeGbYh9FI3zJNDKLmwCGS0g+
 5G7muSfVNRBDgubGawMy3pYMrrCOxB4=</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </KeyDescriptor>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <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://korp.csc.fi/Shibboleth.sso/SAML2/POST" index="1" isDefault="true"/>
-    <AttributeConsumingService index="1" isDefault="true">
-      <ServiceName xml:lang="fi">Korp – hakuohjelma tekstiaineistoille</ServiceName>
-      <ServiceName xml:lang="en">Korp – search service for text material</ServiceName>
-      <ServiceDescription xml:lang="fi">Korp on kielitutkijoille tarkoitettu tyokalu, jolla voi tutkia tekstiaineistoja.</ServiceDescription>
-      <ServiceDescription xml:lang="en">Korp is a user interface for language researchers to examine text material.</ServiceDescription>
-      <RequestedAttribute FriendlyName="eduPersonAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <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"/>
-    </AttributeConsumingService>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="fi">CSC - Tieteen tietotekniikan keskus Oy</OrganizationName>
-    <OrganizationName xml:lang="en">CSC - IT Center for Science Ltd.</OrganizationName>
-    <OrganizationName xml:lang="sv">CSC - Tieteen tietotekniikan keskus Oy</OrganizationName>
-    <OrganizationDisplayName xml:lang="fi">CSC - Tieteen tietotekniikan keskus Oy</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">CSC - IT Center for Science Ltd.</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="sv">CSC - Tieteen tietotekniikan keskus Oy</OrganizationDisplayName>
-    <OrganizationURL xml:lang="fi">http://www.csc.fi</OrganizationURL>
-    <OrganizationURL xml:lang="en">http://www.csc.fi</OrganizationURL>
-    <OrganizationURL xml:lang="sv">http://www.csc.fi</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="administrative">
-    <GivenName>Fin-Clarin</GivenName>
-    <EmailAddress>mailto:fin-clarin@helsinki.fi</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Martin</GivenName>
-    <SurName>Matthiesen</SurName>
-    <EmailAddress>mailto:ling@csc.fi</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="support">
-    <GivenName>Jyrki</GivenName>
-    <SurName>Niemi</SurName>
-    <EmailAddress>mailto:jyrki.niemi@helsinki.fi</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://korp.csc.fi/Shibboleth.sso/SAML2/POST" index="1" isDefault="true"/>
+    <md:AttributeConsumingService index="1" isDefault="true">
+      <md:ServiceName xml:lang="fi">Korp – hakuohjelma tekstiaineistoille</md:ServiceName>
+      <md:ServiceName xml:lang="en">Korp – search service for text material</md:ServiceName>
+      <md:ServiceDescription xml:lang="fi">Korp on kielitutkijoille tarkoitettu tyokalu, jolla voi tutkia tekstiaineistoja.</md:ServiceDescription>
+      <md:ServiceDescription xml:lang="en">Korp is a user interface for language researchers to examine text material.</md:ServiceDescription>
+      <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: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>Fin-Clarin</md:GivenName>
+    <md:EmailAddress>mailto:fin-clarin@helsinki.fi</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Martin</md:GivenName>
+    <md:SurName>Matthiesen</md:SurName>
+    <md:EmailAddress>mailto:ling@csc.fi</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Jyrki</md:GivenName>
+    <md:SurName>Niemi</md:SurName>
+    <md:EmailAddress>mailto:jyrki.niemi@helsinki.fi</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sp.korp.csc.fi.xml b/swamid-interfederations-2.0/sp.korp.csc.fi.xml
deleted file mode 100644
index 147f3e7e..00000000
--- a/swamid-interfederations-2.0/sp.korp.csc.fi.xml
+++ /dev/null
@@ -1,95 +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#" entityID="https://sp.korp.csc.fi/">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.csc.fi/haka">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://www.csc.fi/english/institutions/haka/instructions/join/eduGAINRegistrationStatement/</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: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://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:Description xml:lang="en">With this service you can study text corpora.</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:PrivacyStatementURL xml:lang="sv">https://korp.csc.fi/privacy-policy.html</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIEYzCCA0ugAwIBAgIQTmDBZrbiqJFnGKHn80dL1zANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTEzMTIxMzAwMDAwMFoXDTE2MTIxMjIzNTk1OVowOTEhMB8GA1UE
-CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRQwEgYDVQQDEwtrb3JwLmNzYy5m
-aTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANU16/1jE06KKH6uErmq
-e2wE5u+8SkWqR4Gks+iH67OiPTgoPSVfx1t55FHDUl1zQjijwcvejH26lYIpS7Ts
-js1MGcjcgEt1qFDDQ/eC6931hIg1jRa0PF/cxFjP9qEcd/I7UxuyM5QJga4pfl/o
-IHSL9oPYi5iCJ6qoC3dgNy0glMiisLkKyOKOHIXYzfAdMlIfRAMGCDAnDj3Kw4wK
-zv+RCWSGPEKHxfnPZwY8fgUs0vugICJBfQkSliUQm9P9l9Pt/8PP3XoIzgfXmxKK
-VQg/3EW+u2dnAzV1OKNrbJAajCJYL4VuGejWE7y8x+ixTqFCCPBT1cFZFWgFnzsh
-Yi0CAwEAAaOCAWgwggFkMB8GA1UdIwQYMBaAFAy9k2gM896ro0lrKzdXR+qQ47nt
-MB0GA1UdDgQWBBTkZV9BIXGhYb67UVmwNByxJxsAITAOBgNVHQ8BAf8EBAMCBaAw
-DAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwIgYD
-VR0gBBswGTANBgsrBgEEAbIxAQICHTAIBgZngQwBAgEwOgYDVR0fBDMwMTAvoC2g
-K4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcmwwbQYI
-KwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRjcy50ZXJlbmEu
-b3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDovL29jc3AudGNz
-LnRlcmVuYS5vcmcwFgYDVR0RBA8wDYILa29ycC5jc2MuZmkwDQYJKoZIhvcNAQEF
-BQADggEBAJClAngseLp5qnRUj2iFSlNVccoP9KZKhLaeqiUk6vvwNdyetfMu9Txi
-vllrbfIaoVMvcA3nE5lfWEAlpvoqnQO/wmDv3ObX/XLJpXqSFpNpDOllhEbVeylT
-v8qqjG84Y4OUAd46zhiFpXr+6InhbkahABizqoXs2/aLm3nutf8rWzwFQqm+8YLE
-eLvEROIn209q+8M0V95avRxK1/wTTqwTnEGlGfRU5aTct+hLpJIRQS1DsAJpVDLU
-eeQKhPUjOTj9UPCeCE8rjrLqJ3pBtqlfhwUkfbIpUeGbYh9FI3zJNDKLmwCGS0g+
-5G7muSfVNRBDgubGawMy3pYMrrCOxB4=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <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://korp.csc.fi/Shibboleth.sso/SAML2/POST" index="1" isDefault="true"/>
-    <AttributeConsumingService index="1" isDefault="true">
-      <ServiceName xml:lang="fi">Korp – hakuohjelma tekstiaineistoille</ServiceName>
-      <ServiceName xml:lang="en">Korp – search service for text material</ServiceName>
-      <ServiceDescription xml:lang="fi">Korp on kielitutkijoille tarkoitettu tyokalu, jolla voi tutkia tekstiaineistoja.</ServiceDescription>
-      <ServiceDescription xml:lang="en">Korp is a user interface for language researchers to examine text material.</ServiceDescription>
-      <RequestedAttribute FriendlyName="eduPersonAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <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"/>
-    </AttributeConsumingService>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="fi">CSC - Tieteen tietotekniikan keskus Oy</OrganizationName>
-    <OrganizationName xml:lang="en">CSC - IT Center for Science Ltd.</OrganizationName>
-    <OrganizationName xml:lang="sv">CSC - Tieteen tietotekniikan keskus Oy</OrganizationName>
-    <OrganizationDisplayName xml:lang="fi">CSC - Tieteen tietotekniikan keskus Oy</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">CSC - IT Center for Science Ltd.</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="sv">CSC - Tieteen tietotekniikan keskus Oy</OrganizationDisplayName>
-    <OrganizationURL xml:lang="fi">http://www.csc.fi</OrganizationURL>
-    <OrganizationURL xml:lang="en">http://www.csc.fi</OrganizationURL>
-    <OrganizationURL xml:lang="sv">http://www.csc.fi</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="administrative">
-    <GivenName>Fin-Clarin</GivenName>
-    <EmailAddress>mailto:fin-clarin@helsinki.fi</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Martin</GivenName>
-    <SurName>Matthiesen</SurName>
-    <EmailAddress>mailto:ling@csc.fi</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="support">
-    <GivenName>Jyrki</GivenName>
-    <SurName>Niemi</SurName>
-    <EmailAddress>mailto:jyrki.niemi@helsinki.fi</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sp.lat.csc.fi.xml b/swamid-interfederations-2.0/sp.lat.csc.fi.xml
index cb70909f..6db70753 100644
--- a/swamid-interfederations-2.0/sp.lat.csc.fi.xml
+++ b/swamid-interfederations-2.0/sp.lat.csc.fi.xml
@@ -1,19 +1,9 @@
 <?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#" entityID="http://sp.lat.csc.fi">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.csc.fi/haka">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://www.csc.fi/english/institutions/haka/instructions/join/eduGAINRegistrationStatement/</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: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://lat.csc.fi/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+<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="http://sp.lat.csc.fi">
+  <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://lat.csc.fi/Shibboleth.sso/Login" index="1"/>
+      <mdui:UIInfo>
         <mdui:DisplayName xml:lang="fi">LAT – Language Archive Tools</mdui:DisplayName>
         <mdui:DisplayName xml:lang="en">LAT – Language Archive Tools</mdui:DisplayName>
         <mdui:Description xml:lang="en">LAT is a user interface for language researchers to deposit and process audiovisual material.</mdui:Description>
@@ -26,8 +16,12 @@
         <mdui:PrivacyStatementURL xml:lang="en">http://www.csc.fi/english/research/sciences/linguistics/lat-privacypolicy</mdui:PrivacyStatementURL>
         <mdui:PrivacyStatementURL xml:lang="fi">http://www.csc.fi/english/research/sciences/linguistics/lat-privacypolicy</mdui:PrivacyStatementURL>
       </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
+      <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>MIIEYTCCA0mgAwIBAgIQIp6gFDuZ6VnJilIzPrnFvzANBgkqhkiG9w0BAQUFADA2
@@ -56,42 +50,42 @@ CiBkuiUynwqLsQKjfkcSZa5W9a8spV7y8LmCAEtDk8l03p45TKRvWIgMAexg/60h
 TE5WJb+s+lUOs3IoVL33fpbG+Aor</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </KeyDescriptor>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <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://lat.csc.fi/Shibboleth.sso/SAML2/POST" index="1" isDefault="true"/>
-    <AttributeConsumingService index="1" isDefault="true">
-      <ServiceName xml:lang="fi">LAT – Language Archive Tools</ServiceName>
-      <ServiceName xml:lang="en">LAT – Language Archive Tools</ServiceName>
-      <ServiceDescription xml:lang="fi">LAT-palvelussa tutkijat voivat tallentaa ja kasitella video- ja aanimateriaalia.</ServiceDescription>
-      <ServiceDescription xml:lang="en">LAT is a user interface for language researchers to deposit and process audiovisual material.</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"/>
-    </AttributeConsumingService>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="fi">CSC - Tieteen tietotekniikan keskus Oy</OrganizationName>
-    <OrganizationName xml:lang="en">CSC - IT Center for Science Ltd.</OrganizationName>
-    <OrganizationName xml:lang="sv">CSC - Tieteen tietotekniikan keskus Oy</OrganizationName>
-    <OrganizationDisplayName xml:lang="fi">CSC - Tieteen tietotekniikan keskus Oy</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">CSC - IT Center for Science Ltd.</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="sv">CSC - Tieteen tietotekniikan keskus Oy</OrganizationDisplayName>
-    <OrganizationURL xml:lang="fi">http://www.csc.fi</OrganizationURL>
-    <OrganizationURL xml:lang="en">http://www.csc.fi</OrganizationURL>
-    <OrganizationURL xml:lang="sv">http://www.csc.fi</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="administrative">
-    <GivenName>Tero</GivenName>
-    <SurName>Aalto</SurName>
-    <EmailAddress>mailto:ling@csc.fi</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Martin</GivenName>
-    <SurName>Matthiesen</SurName>
-    <EmailAddress>mailto:martin.matthiesen@csc.fi</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="support">
-    <GivenName>Tero</GivenName>
-    <SurName>Aalto</SurName>
-    <EmailAddress>mailto:ling@csc.fi</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://lat.csc.fi/Shibboleth.sso/SAML2/POST" index="1" isDefault="true"/>
+    <md:AttributeConsumingService index="1" isDefault="true">
+      <md:ServiceName xml:lang="fi">LAT – Language Archive Tools</md:ServiceName>
+      <md:ServiceName xml:lang="en">LAT – Language Archive Tools</md:ServiceName>
+      <md:ServiceDescription xml:lang="fi">LAT-palvelussa tutkijat voivat tallentaa ja kasitella video- ja aanimateriaalia.</md:ServiceDescription>
+      <md:ServiceDescription xml:lang="en">LAT is a user interface for language researchers to deposit and process audiovisual material.</md:ServiceDescription>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonPrincipalName"/>
+    </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>Tero</md:GivenName>
+    <md:SurName>Aalto</md:SurName>
+    <md:EmailAddress>mailto:ling@csc.fi</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Martin</md:GivenName>
+    <md:SurName>Matthiesen</md:SurName>
+    <md:EmailAddress>mailto:martin.matthiesen@csc.fi</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Tero</md:GivenName>
+    <md:SurName>Aalto</md:SurName>
+    <md:EmailAddress>mailto:ling@csc.fi</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sp.lux17.mpi.nl.xml b/swamid-interfederations-2.0/sp.lux17.mpi.nl.xml
index 36d31b9f..52390543 100644
--- a/swamid-interfederations-2.0/sp.lux17.mpi.nl.xml
+++ b/swamid-interfederations-2.0/sp.lux17.mpi.nl.xml
@@ -1,30 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sp.lux17.mpi.nl">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2010-04-27T09:05:42Z">
-      <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>
-      <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://lux17.mpi.nl/Shibboleth.sso/DS" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="de">Max Planck Instituut voor Psycholinguistiek tweede Service Provider</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Max Planck Institute for Psycholinguistics second Service Provider</mdui:DisplayName>
-        <mdui:Description xml:lang="de">Max Planck Instituut voor Psycholinguistiek tweede Service Provider voor Taalkundige Services gericht op onderzoekers</mdui:Description>
-        <mdui:Description xml:lang="en">Max Planck Institute for Psycholinguistics second Service Provider for Linguistic Services aimed at researchers</mdui:Description>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" 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://sp.lux17.mpi.nl">
+  <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>
+      <mdui:UIInfo>
+        <mdui:DisplayName xml:lang="en">Max Planck Institute for Psycholinguistics lux17 SP</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="fi">Max Planck Institute for Psycholinguistics lux17 SP</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Max Planck Institute for Psycholinguistics lux17 Service Provider for Linguistic Services aimed at researchers</mdui:Description>
         <mdui:Logo height="90" width="90">https://lux17.mpi.nl/gif/mpg-logo-90x90-grey.gif</mdui:Logo>
-        <mdui:InformationURL xml:lang="de">http://www.mpi.nl</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">http://www.mpi.nl</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://lux17.mpi.nl/privacy_statement.html</mdui:PrivacyStatementURL>
+        <mdui:Keywords xml:lang="en">Max Planck Institute for Psycholinguistics Lux17 Service Provider Linguistic Services</mdui:Keywords>
+        <mdui:PrivacyStatementURL xml:lang="fi">https://lux17.mpi.nl/privacy_statement.html</mdui:PrivacyStatementURL>
       </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>lux17.mpi.nl</ds:KeyName>
+      <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:X509SubjectName>emailAddress=latadmin@mpi.nl,CN=lux17.mpi.nl,O=MPI-PL,L=Nijmegen,ST=GLD,C=NL</ds:X509SubjectName>
           <ds:X509Certificate>MIIDaDCCAlACCQD2mDCAJYMG3jANBgkqhkiG9w0BAQUFADB2MQswCQYDVQQGEwJO
 TDEMMAoGA1UECBMDR0xEMREwDwYDVQQHEwhOaWptZWdlbjEPMA0GA1UEChMGTVBJ
 LVBMMRUwEwYDVQQDEwxsdXgxNy5tcGkubmwxHjAcBgkqhkiG9w0BCQEWD2xhdGFk
@@ -43,84 +36,37 @@ iwnBgmrwgw0CVEZjgwkbVdZH68RGO4i6n5hZwmzr5jx4yNkfLZ5uwfHLIkqgJjj0
 DvsA6Saom/5BD6dln6TuQ9cwFu+9pOxaWjfEeD2Rm5HFP+VF9GPxM19Gs6xcYi2L
 GlEfBQvH/6vp65r3ciw760KPeO1ITxaIfqX5fOxOaA0NLOIGLjX0G11vf/i3n1OQ
 MZTR7RMV+bjZiLNoPOJ/Ezz5lr+k0V12yVJ35J2J6TIz6lcB9M1tCFDY7tS89nYf
-HFhkY9jzkGrcHMME
-</ds:X509Certificate>
+HFhkY9jzkGrcHMME</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>lux17.mpi.nl</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>emailAddress=latadmin@mpi.nl,CN=lux17.mpi.nl,O=MPI-PL,L=Nijmegen,ST=GLD,C=NL</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDaDCCAlACCQD2mDCAJYMG3jANBgkqhkiG9w0BAQUFADB2MQswCQYDVQQGEwJO
-TDEMMAoGA1UECBMDR0xEMREwDwYDVQQHEwhOaWptZWdlbjEPMA0GA1UEChMGTVBJ
-LVBMMRUwEwYDVQQDEwxsdXgxNy5tcGkubmwxHjAcBgkqhkiG9w0BCQEWD2xhdGFk
-bWluQG1waS5ubDAeFw0xNDA1MDIxMTI2MDZaFw0xOTA1MDExMTI2MDZaMHYxCzAJ
-BgNVBAYTAk5MMQwwCgYDVQQIEwNHTEQxETAPBgNVBAcTCE5pam1lZ2VuMQ8wDQYD
-VQQKEwZNUEktUEwxFTATBgNVBAMTDGx1eDE3Lm1waS5ubDEeMBwGCSqGSIb3DQEJ
-ARYPbGF0YWRtaW5AbXBpLm5sMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
-AQEA3QaSP0LJ0mVZZIdEh7zFJW8lnkVGQFuueAiDfVVvGtGvJ5iz7CRoyrdTQDco
-oJjQDFub/uU6v0i+saVgI+LuzUlq28hrKF5hIjhWCLMRgYZzsnArcGK3etcChsNE
-OPfWNCOCGi90sIqNmJcVRoDw36tLiHXmIkhcy4ZE06SYXvT+qAwo4h30Z/IH2de/
-QlYEpkqF131p2lJGWx1Bi5l7IMeZtlwIzbJn08htAT/T8h6g9XvDfmQxS4xuiXGr
-uRwVhTTkTP9OsdrXkktJEkSE2p+qP0tYekb+ZPd4LzlSjnDWf3V1T/DrbL071eiC
-rx2iDW3n5Wy7so0iwmU5nr9QhwIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQAFSrqi
-HOMohDd4JXB3rjX8npCSTTeam84LTI1Twd8GXOmDQ8izcwsfUIILusEqd+66V/kh
-iwnBgmrwgw0CVEZjgwkbVdZH68RGO4i6n5hZwmzr5jx4yNkfLZ5uwfHLIkqgJjj0
-DvsA6Saom/5BD6dln6TuQ9cwFu+9pOxaWjfEeD2Rm5HFP+VF9GPxM19Gs6xcYi2L
-GlEfBQvH/6vp65r3ciw760KPeO1ITxaIfqX5fOxOaA0NLOIGLjX0G11vf/i3n1OQ
-MZTR7RMV+bjZiLNoPOJ/Ezz5lr+k0V12yVJ35J2J6TIz6lcB9M1tCFDY7tS89nYf
-HFhkY9jzkGrcHMME
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://lux17.mpi.nl/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://lux17.mpi.nl/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://lux17.mpi.nl/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://lux17.mpi.nl/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://lux17.mpi.nl/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://lux17.mpi.nl/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://lux17.mpi.nl/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://lux17.mpi.nl/Shibboleth.sso/NIM/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://lux17.mpi.nl/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://lux17.mpi.nl/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://lux17.mpi.nl/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://lux17.mpi.nl/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://lux17.mpi.nl/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://lux17.mpi.nl/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <AttributeConsumingService index="1">
-      <ServiceName xml:lang="de">Max Planck Instituut voor Psycholinguistiek tweede Service Provider</ServiceName>
-      <ServiceName xml:lang="en">Max Planck Institute for Psycholinguistics second Service Provider</ServiceName>
-      <ServiceDescription xml:lang="de">Max Planck Instituut voor Psycholinguistiek tweede Service Provider voor Taalkundige Services gericht op onderzoekers</ServiceDescription>
-      <ServiceDescription xml:lang="en">Max Planck Institute for Psycholinguistics second Service Provider for Linguistic Services aimed at researchers</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="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="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-    </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="technical">
-    <GivenName>Lat</GivenName>
-    <SurName>Admin</SurName>
-    <EmailAddress>mailto:latadmin@mpi.nl</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="administrative">
-    <GivenName>Dieter</GivenName>
-    <SurName>Van Uytvanck</SurName>
-    <EmailAddress>mailto:dieter.vanuytvanck@mpi.nl</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="support">
-    <GivenName>Dieter</GivenName>
-    <SurName>Van Uytvanck</SurName>
-    <EmailAddress>mailto:dieter.vanuytvanck@mpi.nl</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
+    </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: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://lux17.mpi.nl/Shibboleth.sso/SAML2/POST" index="1" isDefault="true"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://lux17.mpi.nl/Shibboleth.sso/SAML/POST" index="2" isDefault="false"/>
+    <md:AttributeConsumingService index="1" isDefault="true">
+      <md:ServiceName xml:lang="fi">Max Planck Institute for Psycholinguistics second Service Provider</md:ServiceName>
+      <md:ServiceName xml:lang="en">Max Planck Institute for Psycholinguistics second Service Provider</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">Max Planck Institute for Psycholinguistics second Service Provider for Linguistic Services aimed at researchers</md:ServiceDescription>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonPrincipalName"/>
+      <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:2.5.4.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="o"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="fi">CLARIN Service Provider Federation/MPI</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">CLARIN Service Provider Federation/MPI</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">CLARIN Service Provider Federation/MPI</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="fi">CLARIN Service Provider Federation/MPI</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">CLARIN Service Provider Federation/MPI</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">CLARIN Service Provider Federation/MPI</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="fi">http://www.clarin.eu</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.clarin.eu</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">http://www.clarin.eu</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Technical support</md:SurName>
+    <md:EmailAddress>mailto:latadmin@mpi.nl</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sp.onlinelibrary.wiley.com-shibboleth.xml b/swamid-interfederations-2.0/sp.onlinelibrary.wiley.com-shibboleth.xml
deleted file mode 100644
index 04f4e03d..00000000
--- a/swamid-interfederations-2.0/sp.onlinelibrary.wiley.com-shibboleth.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://sp.onlinelibrary.wiley.com/shibboleth">
-  <!--
-		This is a "Wiley Online Library" Shibboleth SP for John Wiley & Sons 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#ecdsa-sha512"/>
-    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-    <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/2001/04/xmldsig-more#ecdsa-sha1"/>
-    <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="2010-07-27T11:15:10Z">
-      <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">John Wiley &amp; Sons Limited: Wiley Online Library</mdui:DisplayName>
-        <mdui:Description xml:lang="en">This service allows Wiley Online Library users to use login credentials at their home organisations</mdui:Description>
-        <mdui:Logo height="60" width="74">https://sp.onlinelibrary.wiley.com/images/WOL_Stacked_k.gif</mdui:Logo>
-        <mdui:Logo height="16" width="16">https://sp.onlinelibrary.wiley.com/images/WOL_favicon.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://sp.onlinelibrary.wiley.com/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://sp.onlinelibrary.wiley.com/Shibboleth.sso/DS" index="1"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIFTDCCBDSgAwIBAgIQGN7fuC0Uze8yew92tsrArTANBgkqhkiG9w0BAQUFADCB
-						tTELMAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQL
-						ExZWZXJpU2lnbiBUcnVzdCBOZXR3b3JrMTswOQYDVQQLEzJUZXJtcyBvZiB1c2Ug
-						YXQgaHR0cHM6Ly93d3cudmVyaXNpZ24uY29tL3JwYSAoYykxMDEvMC0GA1UEAxMm
-						VmVyaVNpZ24gQ2xhc3MgMyBTZWN1cmUgU2VydmVyIENBIC0gRzMwHhcNMTQwNjA0
-						MDAwMDAwWhcNMTYwNzE3MjM1OTU5WjCBljELMAkGA1UEBhMCVVMxEzARBgNVBAgT
-						Ck5ldyBKZXJzZXkxETAPBgNVBAcUCFNvbWVyc2V0MR8wHQYDVQQKFBZKb2huIFdp
-						bGV5ICYgU29ucywgSW5jMRkwFwYDVQQLFBBJbnRlcm5ldCBIb3N0aW5nMSMwIQYD
-						VQQDFBpzcC5vbmxpbmVsaWJyYXJ5LndpbGV5LmNvbTCCASIwDQYJKoZIhvcNAQEB
-						BQADggEPADCCAQoCggEBALxNMyyEQztZxX2CnHwTsI5AIKhOza2HNuJ7fsfbmnS7
-						xCaDNVaVoT9nWvpLNwJ8Dn54IYCVJoFtnwkWHFu/E6AKjGROJt1YDQUMmoeNse+/
-						L1fj5NdGSiUpmFdnrJFSB5dFQ1qDG3R+23lfEZCKqByqEd6nnNZJIgMe32+1vA+k
-						S46cU2tRw+Z5UUDjdZ5dyTjKpdQ4mC+zQW4X1h6vrouNxcs/1En+EFqadQuVmLsQ
-						Yzkj0eLBGrYatWNELyZOxIOFj8ERb9Z+08eiXHa19K7uYUHw7ZBlyYciJZNZYVbw
-						59YiXaByT9BR7cFgGxNKoAJpfw+PsBnT7kFB103yxqkCAwEAAaOCAXMwggFvMCUG
-						A1UdEQQeMByCGnNwLm9ubGluZWxpYnJhcnkud2lsZXkuY29tMAkGA1UdEwQCMAAw
-						DgYDVR0PAQH/BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjBl
-						BgNVHSAEXjBcMFoGCmCGSAGG+EUBBzYwTDAjBggrBgEFBQcCARYXaHR0cHM6Ly9k
-						LnN5bWNiLmNvbS9jcHMwJQYIKwYBBQUHAgIwGRoXaHR0cHM6Ly9kLnN5bWNiLmNv
-						bS9ycGEwHwYDVR0jBBgwFoAUDURcFlNEwYJ+HSCrJfQBY9i+eaUwKwYDVR0fBCQw
-						IjAgoB6gHIYaaHR0cDovL3NkLnN5bWNiLmNvbS9zZC5jcmwwVwYIKwYBBQUHAQEE
-						SzBJMB8GCCsGAQUFBzABhhNodHRwOi8vc2Quc3ltY2QuY29tMCYGCCsGAQUFBzAC
-						hhpodHRwOi8vc2Quc3ltY2IuY29tL3NkLmNydDANBgkqhkiG9w0BAQUFAAOCAQEA
-						Dc2lww9Dk/JaDPLQoHbqQjprtJZUTe9cEVvu02AKWMGvNlaUWDeHAqd1D+dbmMn7
-						mIXhqERDQUiEr7kS9yehKNSazQXvNy5S9xnPuO64m77zoDTslWIREyRgRPClxmvE
-						6LXZzucaLy1KMuuiWK2Jle/yb8e9s5M51jU0UQVVQjFQaWe1NKUzrt31QgWAgTWX
-						vSMwOdHJKGYpHXjpalopAX8fNV4lNg6kt9Ob3kJsQtUQkVLlPkwaVwlVLgWjbTIO
-						avofP9ub8R9GYHjPSoX6IlOlJTFigxBnP4AonNGmQZjVgqp81MZSMhwEo7MZvhnT
-						QQTmkDY7OVzHpicSEkVGKw==
-					</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://sp.onlinelibrary.wiley.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <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"/>
-    <AttributeConsumingService index="1">
-      <ServiceName xml:lang="en">John Wiley &amp; Sons Limited: Wiley Online Library</ServiceName>
-      <ServiceDescription xml:lang="en">
-				This service allows Wiley Online Library users to use login credentials at their home organisations.
-			</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"/>
-    </AttributeConsumingService>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">John Wiley &amp; Sons Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">John Wiley &amp; Sons Limited: Wiley Online Library</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://wiley.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Zhiming</GivenName>
-    <SurName>Chen</SurName>
-    <EmailAddress>mailto:zchen@wiley.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Zhiming</GivenName>
-    <SurName>Chen</SurName>
-    <EmailAddress>mailto:zchen@wiley.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
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 04f4e03d..00000000
--- a/swamid-interfederations-2.0/sp.onlinelibrary.wiley.com.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://sp.onlinelibrary.wiley.com/shibboleth">
-  <!--
-		This is a "Wiley Online Library" Shibboleth SP for John Wiley & Sons 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#ecdsa-sha512"/>
-    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-    <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/2001/04/xmldsig-more#ecdsa-sha1"/>
-    <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="2010-07-27T11:15:10Z">
-      <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">John Wiley &amp; Sons Limited: Wiley Online Library</mdui:DisplayName>
-        <mdui:Description xml:lang="en">This service allows Wiley Online Library users to use login credentials at their home organisations</mdui:Description>
-        <mdui:Logo height="60" width="74">https://sp.onlinelibrary.wiley.com/images/WOL_Stacked_k.gif</mdui:Logo>
-        <mdui:Logo height="16" width="16">https://sp.onlinelibrary.wiley.com/images/WOL_favicon.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://sp.onlinelibrary.wiley.com/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://sp.onlinelibrary.wiley.com/Shibboleth.sso/DS" index="1"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIFTDCCBDSgAwIBAgIQGN7fuC0Uze8yew92tsrArTANBgkqhkiG9w0BAQUFADCB
-						tTELMAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQL
-						ExZWZXJpU2lnbiBUcnVzdCBOZXR3b3JrMTswOQYDVQQLEzJUZXJtcyBvZiB1c2Ug
-						YXQgaHR0cHM6Ly93d3cudmVyaXNpZ24uY29tL3JwYSAoYykxMDEvMC0GA1UEAxMm
-						VmVyaVNpZ24gQ2xhc3MgMyBTZWN1cmUgU2VydmVyIENBIC0gRzMwHhcNMTQwNjA0
-						MDAwMDAwWhcNMTYwNzE3MjM1OTU5WjCBljELMAkGA1UEBhMCVVMxEzARBgNVBAgT
-						Ck5ldyBKZXJzZXkxETAPBgNVBAcUCFNvbWVyc2V0MR8wHQYDVQQKFBZKb2huIFdp
-						bGV5ICYgU29ucywgSW5jMRkwFwYDVQQLFBBJbnRlcm5ldCBIb3N0aW5nMSMwIQYD
-						VQQDFBpzcC5vbmxpbmVsaWJyYXJ5LndpbGV5LmNvbTCCASIwDQYJKoZIhvcNAQEB
-						BQADggEPADCCAQoCggEBALxNMyyEQztZxX2CnHwTsI5AIKhOza2HNuJ7fsfbmnS7
-						xCaDNVaVoT9nWvpLNwJ8Dn54IYCVJoFtnwkWHFu/E6AKjGROJt1YDQUMmoeNse+/
-						L1fj5NdGSiUpmFdnrJFSB5dFQ1qDG3R+23lfEZCKqByqEd6nnNZJIgMe32+1vA+k
-						S46cU2tRw+Z5UUDjdZ5dyTjKpdQ4mC+zQW4X1h6vrouNxcs/1En+EFqadQuVmLsQ
-						Yzkj0eLBGrYatWNELyZOxIOFj8ERb9Z+08eiXHa19K7uYUHw7ZBlyYciJZNZYVbw
-						59YiXaByT9BR7cFgGxNKoAJpfw+PsBnT7kFB103yxqkCAwEAAaOCAXMwggFvMCUG
-						A1UdEQQeMByCGnNwLm9ubGluZWxpYnJhcnkud2lsZXkuY29tMAkGA1UdEwQCMAAw
-						DgYDVR0PAQH/BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjBl
-						BgNVHSAEXjBcMFoGCmCGSAGG+EUBBzYwTDAjBggrBgEFBQcCARYXaHR0cHM6Ly9k
-						LnN5bWNiLmNvbS9jcHMwJQYIKwYBBQUHAgIwGRoXaHR0cHM6Ly9kLnN5bWNiLmNv
-						bS9ycGEwHwYDVR0jBBgwFoAUDURcFlNEwYJ+HSCrJfQBY9i+eaUwKwYDVR0fBCQw
-						IjAgoB6gHIYaaHR0cDovL3NkLnN5bWNiLmNvbS9zZC5jcmwwVwYIKwYBBQUHAQEE
-						SzBJMB8GCCsGAQUFBzABhhNodHRwOi8vc2Quc3ltY2QuY29tMCYGCCsGAQUFBzAC
-						hhpodHRwOi8vc2Quc3ltY2IuY29tL3NkLmNydDANBgkqhkiG9w0BAQUFAAOCAQEA
-						Dc2lww9Dk/JaDPLQoHbqQjprtJZUTe9cEVvu02AKWMGvNlaUWDeHAqd1D+dbmMn7
-						mIXhqERDQUiEr7kS9yehKNSazQXvNy5S9xnPuO64m77zoDTslWIREyRgRPClxmvE
-						6LXZzucaLy1KMuuiWK2Jle/yb8e9s5M51jU0UQVVQjFQaWe1NKUzrt31QgWAgTWX
-						vSMwOdHJKGYpHXjpalopAX8fNV4lNg6kt9Ob3kJsQtUQkVLlPkwaVwlVLgWjbTIO
-						avofP9ub8R9GYHjPSoX6IlOlJTFigxBnP4AonNGmQZjVgqp81MZSMhwEo7MZvhnT
-						QQTmkDY7OVzHpicSEkVGKw==
-					</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://sp.onlinelibrary.wiley.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <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"/>
-    <AttributeConsumingService index="1">
-      <ServiceName xml:lang="en">John Wiley &amp; Sons Limited: Wiley Online Library</ServiceName>
-      <ServiceDescription xml:lang="en">
-				This service allows Wiley Online Library users to use login credentials at their home organisations.
-			</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"/>
-    </AttributeConsumingService>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">John Wiley &amp; Sons Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">John Wiley &amp; Sons Limited: Wiley Online Library</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://wiley.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Zhiming</GivenName>
-    <SurName>Chen</SurName>
-    <EmailAddress>mailto:zchen@wiley.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Zhiming</GivenName>
-    <SurName>Chen</SurName>
-    <EmailAddress>mailto:zchen@wiley.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sp.swamid.se-shibboleth.xml b/swamid-interfederations-2.0/sp.swamid.se-shibboleth.xml
deleted file mode 100644
index 19654dcb..00000000
--- a/swamid-interfederations-2.0/sp.swamid.se-shibboleth.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://sp.swamid.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/sfs-1993-1153</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
-        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol 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://sp.swamid.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://sp.swamid.se/Shibboleth.sso/DS/ds.sunet.se" index="2"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="sv">SWAMID Test SP</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">SWAMID Test SP</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Detta är en applikation som låter dig testa federerad inloggning.</mdui:Description>
-        <mdui:Description xml:lang="en">This is an application for testing federated authentication.</mdui:Description>
-        <mdui:InformationURL xml:lang="sv">http://www.swamid.se</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">http://www.swamid.se</mdui:InformationURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://sp.swamid.se/shibboleth</ds:KeyName>
-        <ds:KeyName>sp.swamid.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=sp.swamid.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDDDCCAfSgAwIBAgIJAKP67GrfYHgtMA0GCSqGSIb3DQEBBQUAMBcxFTATBgNV
-BAMTDHNwLnN3YW1pZC5zZTAeFw0wOTA2MTYxMTA3NTRaFw0xOTA2MTQxMTA3NTRa
-MBcxFTATBgNVBAMTDHNwLnN3YW1pZC5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEP
-ADCCAQoCggEBAOVNkKXqQZrXXNCk7nE7JTsqyjuwbshkafxDCI7XN6HSaRcnR+OY
-swVYkSvGXfMr4XQLzAGyIOfYDcHwOqZina11Zf8sOdD5t6mygGKza+LzbGZN9d4y
-SosskTH1NiCVBCTdJVpfwU2+K87DKrT9xtuRf7TMDDKA3gjPtN+/IxT6hw2+oZZi
-UgQgJoGN68WO9C4c/WMfcFf7hgC7fSt4fji9MFNpJoOw9MsuaRgYEVkCaHubLj46
-Ya3NbyY48zzAuc4ix8hoLJ9dP+nUCyGKtkY81HprKGtuiu8kYSo+pC20nv1Qr8xP
-FhSU14YvXPUIVOGfX9zsGVLOQKpkb4Z4AkUCAwEAAaNbMFkwOAYDVR0RBDEwL4IM
-c3Auc3dhbWlkLnNlhh9odHRwczovL3NwLnN3YW1pZC5zZS9zaGliYm9sZXRoMB0G
-A1UdDgQWBBTpV1dUBMfW7y2/Rjo17VSql2/AijANBgkqhkiG9w0BAQUFAAOCAQEA
-SsYAA5tq6JjKqI5u2gvZfhM5S6ZKgrvciayGoezdTI6FfvpS3kWtCTZlu+CGDYIW
-VBpMtgQ84HpTrGbr3X1w25mspK+hsXi3K7SKqdfMdc0JynwNPrlL4GgmTuR/fgoo
-tuE0Wnbi7xdxpQ1qd0SFzw4gFWp1wC1+FsGtB9HLksSskgnNxniG9Z9+9WxgU6hD
-fJbH6eFgMDUPe2FpKiJ7LXqgiJWJRuK4zgFyGIZ5OFstLpkT/cXa8qNhtsbp2BPO
-jxcbsxoUpA7Qgl/OFu7gzxLkLrl4iRSwk8MTj2bjVBvqvisLJAmuiYDBd9iZvqXB
-IznEEJKY8IltpfdkKGE20g==
-</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>https://sp.swamid.se/shibboleth</ds:KeyName>
-        <ds:KeyName>sp.swamid.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=sp.swamid.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDDDCCAfSgAwIBAgIJAKP67GrfYHgtMA0GCSqGSIb3DQEBBQUAMBcxFTATBgNV
-BAMTDHNwLnN3YW1pZC5zZTAeFw0wOTA2MTYxMTA3NTRaFw0xOTA2MTQxMTA3NTRa
-MBcxFTATBgNVBAMTDHNwLnN3YW1pZC5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEP
-ADCCAQoCggEBAOVNkKXqQZrXXNCk7nE7JTsqyjuwbshkafxDCI7XN6HSaRcnR+OY
-swVYkSvGXfMr4XQLzAGyIOfYDcHwOqZina11Zf8sOdD5t6mygGKza+LzbGZN9d4y
-SosskTH1NiCVBCTdJVpfwU2+K87DKrT9xtuRf7TMDDKA3gjPtN+/IxT6hw2+oZZi
-UgQgJoGN68WO9C4c/WMfcFf7hgC7fSt4fji9MFNpJoOw9MsuaRgYEVkCaHubLj46
-Ya3NbyY48zzAuc4ix8hoLJ9dP+nUCyGKtkY81HprKGtuiu8kYSo+pC20nv1Qr8xP
-FhSU14YvXPUIVOGfX9zsGVLOQKpkb4Z4AkUCAwEAAaNbMFkwOAYDVR0RBDEwL4IM
-c3Auc3dhbWlkLnNlhh9odHRwczovL3NwLnN3YW1pZC5zZS9zaGliYm9sZXRoMB0G
-A1UdDgQWBBTpV1dUBMfW7y2/Rjo17VSql2/AijANBgkqhkiG9w0BAQUFAAOCAQEA
-SsYAA5tq6JjKqI5u2gvZfhM5S6ZKgrvciayGoezdTI6FfvpS3kWtCTZlu+CGDYIW
-VBpMtgQ84HpTrGbr3X1w25mspK+hsXi3K7SKqdfMdc0JynwNPrlL4GgmTuR/fgoo
-tuE0Wnbi7xdxpQ1qd0SFzw4gFWp1wC1+FsGtB9HLksSskgnNxniG9Z9+9WxgU6hD
-fJbH6eFgMDUPe2FpKiJ7LXqgiJWJRuK4zgFyGIZ5OFstLpkT/cXa8qNhtsbp2BPO
-jxcbsxoUpA7Qgl/OFu7gzxLkLrl4iRSwk8MTj2bjVBvqvisLJAmuiYDBd9iZvqXB
-IznEEJKY8IltpfdkKGE20g==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sp.swamid.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sp.swamid.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sp.swamid.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp.swamid.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp.swamid.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sp.swamid.se/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sp.swamid.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp.swamid.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp.swamid.se/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp.swamid.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sp.swamid.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp.swamid.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://sp.swamid.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sp.swamid.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sp.swamid.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <md:AttributeConsumingService index="0">
-      <md:ServiceName xml:lang="en">SWAMID Test SP</md:ServiceName>
-      <md:ServiceDescription xml:lang="en">SWAMID Test SP</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:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">SWAMID</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Swedish Academic Identity Federation (SWAMID)</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.swamid.se</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:EmailAddress>operations@swamid.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sp.swamid.se.xml b/swamid-interfederations-2.0/sp.swamid.se.xml
deleted file mode 100644
index 19654dcb..00000000
--- a/swamid-interfederations-2.0/sp.swamid.se.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://sp.swamid.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/sfs-1993-1153</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
-        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol 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://sp.swamid.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://sp.swamid.se/Shibboleth.sso/DS/ds.sunet.se" index="2"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="sv">SWAMID Test SP</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">SWAMID Test SP</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Detta är en applikation som låter dig testa federerad inloggning.</mdui:Description>
-        <mdui:Description xml:lang="en">This is an application for testing federated authentication.</mdui:Description>
-        <mdui:InformationURL xml:lang="sv">http://www.swamid.se</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">http://www.swamid.se</mdui:InformationURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://sp.swamid.se/shibboleth</ds:KeyName>
-        <ds:KeyName>sp.swamid.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=sp.swamid.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDDDCCAfSgAwIBAgIJAKP67GrfYHgtMA0GCSqGSIb3DQEBBQUAMBcxFTATBgNV
-BAMTDHNwLnN3YW1pZC5zZTAeFw0wOTA2MTYxMTA3NTRaFw0xOTA2MTQxMTA3NTRa
-MBcxFTATBgNVBAMTDHNwLnN3YW1pZC5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEP
-ADCCAQoCggEBAOVNkKXqQZrXXNCk7nE7JTsqyjuwbshkafxDCI7XN6HSaRcnR+OY
-swVYkSvGXfMr4XQLzAGyIOfYDcHwOqZina11Zf8sOdD5t6mygGKza+LzbGZN9d4y
-SosskTH1NiCVBCTdJVpfwU2+K87DKrT9xtuRf7TMDDKA3gjPtN+/IxT6hw2+oZZi
-UgQgJoGN68WO9C4c/WMfcFf7hgC7fSt4fji9MFNpJoOw9MsuaRgYEVkCaHubLj46
-Ya3NbyY48zzAuc4ix8hoLJ9dP+nUCyGKtkY81HprKGtuiu8kYSo+pC20nv1Qr8xP
-FhSU14YvXPUIVOGfX9zsGVLOQKpkb4Z4AkUCAwEAAaNbMFkwOAYDVR0RBDEwL4IM
-c3Auc3dhbWlkLnNlhh9odHRwczovL3NwLnN3YW1pZC5zZS9zaGliYm9sZXRoMB0G
-A1UdDgQWBBTpV1dUBMfW7y2/Rjo17VSql2/AijANBgkqhkiG9w0BAQUFAAOCAQEA
-SsYAA5tq6JjKqI5u2gvZfhM5S6ZKgrvciayGoezdTI6FfvpS3kWtCTZlu+CGDYIW
-VBpMtgQ84HpTrGbr3X1w25mspK+hsXi3K7SKqdfMdc0JynwNPrlL4GgmTuR/fgoo
-tuE0Wnbi7xdxpQ1qd0SFzw4gFWp1wC1+FsGtB9HLksSskgnNxniG9Z9+9WxgU6hD
-fJbH6eFgMDUPe2FpKiJ7LXqgiJWJRuK4zgFyGIZ5OFstLpkT/cXa8qNhtsbp2BPO
-jxcbsxoUpA7Qgl/OFu7gzxLkLrl4iRSwk8MTj2bjVBvqvisLJAmuiYDBd9iZvqXB
-IznEEJKY8IltpfdkKGE20g==
-</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>https://sp.swamid.se/shibboleth</ds:KeyName>
-        <ds:KeyName>sp.swamid.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=sp.swamid.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDDDCCAfSgAwIBAgIJAKP67GrfYHgtMA0GCSqGSIb3DQEBBQUAMBcxFTATBgNV
-BAMTDHNwLnN3YW1pZC5zZTAeFw0wOTA2MTYxMTA3NTRaFw0xOTA2MTQxMTA3NTRa
-MBcxFTATBgNVBAMTDHNwLnN3YW1pZC5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEP
-ADCCAQoCggEBAOVNkKXqQZrXXNCk7nE7JTsqyjuwbshkafxDCI7XN6HSaRcnR+OY
-swVYkSvGXfMr4XQLzAGyIOfYDcHwOqZina11Zf8sOdD5t6mygGKza+LzbGZN9d4y
-SosskTH1NiCVBCTdJVpfwU2+K87DKrT9xtuRf7TMDDKA3gjPtN+/IxT6hw2+oZZi
-UgQgJoGN68WO9C4c/WMfcFf7hgC7fSt4fji9MFNpJoOw9MsuaRgYEVkCaHubLj46
-Ya3NbyY48zzAuc4ix8hoLJ9dP+nUCyGKtkY81HprKGtuiu8kYSo+pC20nv1Qr8xP
-FhSU14YvXPUIVOGfX9zsGVLOQKpkb4Z4AkUCAwEAAaNbMFkwOAYDVR0RBDEwL4IM
-c3Auc3dhbWlkLnNlhh9odHRwczovL3NwLnN3YW1pZC5zZS9zaGliYm9sZXRoMB0G
-A1UdDgQWBBTpV1dUBMfW7y2/Rjo17VSql2/AijANBgkqhkiG9w0BAQUFAAOCAQEA
-SsYAA5tq6JjKqI5u2gvZfhM5S6ZKgrvciayGoezdTI6FfvpS3kWtCTZlu+CGDYIW
-VBpMtgQ84HpTrGbr3X1w25mspK+hsXi3K7SKqdfMdc0JynwNPrlL4GgmTuR/fgoo
-tuE0Wnbi7xdxpQ1qd0SFzw4gFWp1wC1+FsGtB9HLksSskgnNxniG9Z9+9WxgU6hD
-fJbH6eFgMDUPe2FpKiJ7LXqgiJWJRuK4zgFyGIZ5OFstLpkT/cXa8qNhtsbp2BPO
-jxcbsxoUpA7Qgl/OFu7gzxLkLrl4iRSwk8MTj2bjVBvqvisLJAmuiYDBd9iZvqXB
-IznEEJKY8IltpfdkKGE20g==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sp.swamid.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sp.swamid.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sp.swamid.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp.swamid.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp.swamid.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sp.swamid.se/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sp.swamid.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp.swamid.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp.swamid.se/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp.swamid.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sp.swamid.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp.swamid.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://sp.swamid.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sp.swamid.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sp.swamid.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <md:AttributeConsumingService index="0">
-      <md:ServiceName xml:lang="en">SWAMID Test SP</md:ServiceName>
-      <md:ServiceDescription xml:lang="en">SWAMID Test SP</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:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">SWAMID</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Swedish Academic Identity Federation (SWAMID)</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.swamid.se</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:EmailAddress>operations@swamid.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sp.textgridlab.org-shibboleth.xml b/swamid-interfederations-2.0/sp.textgridlab.org-shibboleth.xml
deleted file mode 100644
index 3a7ec7ba..00000000
--- a/swamid-interfederations-2.0/sp.textgridlab.org-shibboleth.xml
+++ /dev/null
@@ -1,163 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sp.textgridlab.org/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2011-11-02T09:05:34Z">
-      <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://textgridlab.org/1.0/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="de">TextGridLab</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">TextGridLab</mdui:DisplayName>
-        <mdui:Description xml:lang="de">Virtuelle Forschungsumgebung TextGridLab</mdui:Description>
-        <mdui:Description xml:lang="en">TextGridLab virtual research environment</mdui:Description>
-        <mdui:InformationURL xml:lang="de">http://www.textgrid.de</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">http://www.textgrid.de</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="de">https://de.dariah.eu/ServicePrivacyPolicy</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://de.dariah.eu/ServicePrivacyPolicy</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>textgridlab.org</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=textgridlab.org,OU=TextGrid,OU=Niedersaechsische Staats- und Universitaetsbibliothek,O=Georg-August-Universitaet Goettingen,L=Goettingen,ST=Niedersachsen,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIGHjCCBQagAwIBAgIHEzj8sz7gpzANBgkqhkiG9w0BAQUFADCBrjELMAkGA1UE
-BhMCREUxFjAUBgNVBAgTDU5pZWRlcnNhY2hzZW4xEzARBgNVBAcTCkdvZXR0aW5n
-ZW4xLTArBgNVBAoTJEdlb3JnLUF1Z3VzdC1Vbml2ZXJzaXRhZXQgR29ldHRpbmdl
-bjEjMCEGA1UEAxMaVW5pdmVyc2l0YWV0LUdvZXR0aW5nZW4gQ0ExHjAcBgkqhkiG
-9w0BCQEWD2d3ZGctY2FAZ3dkZy5kZTAeFw0xMjAxMjAxNDUwMTJaFw0xNzAxMTgx
-NDUwMTJaMIHWMQswCQYDVQQGEwJERTEWMBQGA1UECBMNTmllZGVyc2FjaHNlbjET
-MBEGA1UEBxMKR29ldHRpbmdlbjEtMCsGA1UEChMkR2VvcmctQXVndXN0LVVuaXZl
-cnNpdGFldCBHb2V0dGluZ2VuMT4wPAYDVQQLEzVOaWVkZXJzYWVjaHNpc2NoZSBT
-dGFhdHMtIHVuZCBVbml2ZXJzaXRhZXRzYmlibGlvdGhlazERMA8GA1UECxMIVGV4
-dEdyaWQxGDAWBgNVBAMTD3RleHRncmlkbGFiLm9yZzCCASIwDQYJKoZIhvcNAQEB
-BQADggEPADCCAQoCggEBANDyVAH2OTXsKccRpix/jGx2GRR2YH2Od8IAD/wf36Ep
-ypnqUN7iOCEUh9lB7SMAn/CQjwZ+zFWz+W/HjvlAlFSVZvMVlOF4qh5xiNaCF/bz
-ttSnoXoY0r8VxIooSLi7d+uDRcg44Ck+JpIaJcEh+2JJDLa12bsDbzS0/d1bgKLr
-FLPKKzo+XJjwYe6U0PtqDvuZCfXr1VFw6P2GckFRYd/xfuxWjhRvyRxTD2fmUkXV
-WhmgEhzf3cwxnHqQoUdlxS7iCPcaMrNeSBJMkxneOuYk/H2q0uA6Y+zWNdh6ss0R
-I1avpYOozbaMmY/aD7Avnyp6eby6NYUCPNMPpRPIRbcCAwEAAaOCAhUwggIRMAkG
-A1UdEwQCMAAwCwYDVR0PBAQDAgXgMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggrBgEF
-BQcDATAdBgNVHQ4EFgQUsQ1Bhym48J36cebaA4fsHlU8etcwHwYDVR0jBBgwFoAU
-Hb1zzG3ubhx0cNmjGzq6qCfevOswWwYDVR0RBFQwUoIPdGV4dGdyaWRsYWIub3Jn
-ghN3d3cudGV4dGdyaWRsYWIub3JngRBpbmZvQHRleHRncmlkLmRlgRhjYUBzdWIu
-dW5pLWdvZXR0aW5nZW4uZGUwgY8GA1UdHwSBhzCBhDBAoD6gPIY6aHR0cDovL2Nk
-cDEucGNhLmRmbi5kZS91bmktZ29ldHRpbmdlbi1jYS9wdWIvY3JsL2NhY3JsLmNy
-bDBAoD6gPIY6aHR0cDovL2NkcDIucGNhLmRmbi5kZS91bmktZ29ldHRpbmdlbi1j
-YS9wdWIvY3JsL2NhY3JsLmNybDCBqAYIKwYBBQUHAQEEgZswgZgwSgYIKwYBBQUH
-MAKGPmh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvdW5pLWdvZXR0aW5nZW4tY2EvcHVi
-L2NhY2VydC9jYWNlcnQuY3J0MEoGCCsGAQUFBzAChj5odHRwOi8vY2RwMi5wY2Eu
-ZGZuLmRlL3VuaS1nb2V0dGluZ2VuLWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDAN
-BgkqhkiG9w0BAQUFAAOCAQEANgN+eFxmXlaksI2MQH046IM6azOS11ves9ITaOqh
-GH7vac+bgGRDfpgRnZn7FIZ9NIC0S6iXjsMcRZu1ObAwmJWAs1RHJidfC3+c1yY2
-+C1Ts0VeFvQiM9fYYIAUpmhl1Ia/vDiRcdwuHyUtte1tq2QN67gSuOKVOj9GtDJk
-Szgxk1cNbqUzIfvhFvt9g5Kzlr5/yo0e2fVPZv7yk8Si19dzQO/9OLMVcVjTMNyM
-Mu0ReSI3dNaEQa5SEiRMTjX0sKwnC4KQmbLLIzgqG9VpD61h0vCfKPJzJ/UqMZBd
-Ayj96g/+2D4+WUpiE5AlAEO2WcgBqxxIHgqvmL1dBNhQwA==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>textgridlab.org</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=textgridlab.org,OU=TextGrid,OU=Niedersaechsische Staats- und Universitaetsbibliothek,O=Georg-August-Universitaet Goettingen,L=Goettingen,ST=Niedersachsen,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIGHjCCBQagAwIBAgIHEzj8sz7gpzANBgkqhkiG9w0BAQUFADCBrjELMAkGA1UE
-BhMCREUxFjAUBgNVBAgTDU5pZWRlcnNhY2hzZW4xEzARBgNVBAcTCkdvZXR0aW5n
-ZW4xLTArBgNVBAoTJEdlb3JnLUF1Z3VzdC1Vbml2ZXJzaXRhZXQgR29ldHRpbmdl
-bjEjMCEGA1UEAxMaVW5pdmVyc2l0YWV0LUdvZXR0aW5nZW4gQ0ExHjAcBgkqhkiG
-9w0BCQEWD2d3ZGctY2FAZ3dkZy5kZTAeFw0xMjAxMjAxNDUwMTJaFw0xNzAxMTgx
-NDUwMTJaMIHWMQswCQYDVQQGEwJERTEWMBQGA1UECBMNTmllZGVyc2FjaHNlbjET
-MBEGA1UEBxMKR29ldHRpbmdlbjEtMCsGA1UEChMkR2VvcmctQXVndXN0LVVuaXZl
-cnNpdGFldCBHb2V0dGluZ2VuMT4wPAYDVQQLEzVOaWVkZXJzYWVjaHNpc2NoZSBT
-dGFhdHMtIHVuZCBVbml2ZXJzaXRhZXRzYmlibGlvdGhlazERMA8GA1UECxMIVGV4
-dEdyaWQxGDAWBgNVBAMTD3RleHRncmlkbGFiLm9yZzCCASIwDQYJKoZIhvcNAQEB
-BQADggEPADCCAQoCggEBANDyVAH2OTXsKccRpix/jGx2GRR2YH2Od8IAD/wf36Ep
-ypnqUN7iOCEUh9lB7SMAn/CQjwZ+zFWz+W/HjvlAlFSVZvMVlOF4qh5xiNaCF/bz
-ttSnoXoY0r8VxIooSLi7d+uDRcg44Ck+JpIaJcEh+2JJDLa12bsDbzS0/d1bgKLr
-FLPKKzo+XJjwYe6U0PtqDvuZCfXr1VFw6P2GckFRYd/xfuxWjhRvyRxTD2fmUkXV
-WhmgEhzf3cwxnHqQoUdlxS7iCPcaMrNeSBJMkxneOuYk/H2q0uA6Y+zWNdh6ss0R
-I1avpYOozbaMmY/aD7Avnyp6eby6NYUCPNMPpRPIRbcCAwEAAaOCAhUwggIRMAkG
-A1UdEwQCMAAwCwYDVR0PBAQDAgXgMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggrBgEF
-BQcDATAdBgNVHQ4EFgQUsQ1Bhym48J36cebaA4fsHlU8etcwHwYDVR0jBBgwFoAU
-Hb1zzG3ubhx0cNmjGzq6qCfevOswWwYDVR0RBFQwUoIPdGV4dGdyaWRsYWIub3Jn
-ghN3d3cudGV4dGdyaWRsYWIub3JngRBpbmZvQHRleHRncmlkLmRlgRhjYUBzdWIu
-dW5pLWdvZXR0aW5nZW4uZGUwgY8GA1UdHwSBhzCBhDBAoD6gPIY6aHR0cDovL2Nk
-cDEucGNhLmRmbi5kZS91bmktZ29ldHRpbmdlbi1jYS9wdWIvY3JsL2NhY3JsLmNy
-bDBAoD6gPIY6aHR0cDovL2NkcDIucGNhLmRmbi5kZS91bmktZ29ldHRpbmdlbi1j
-YS9wdWIvY3JsL2NhY3JsLmNybDCBqAYIKwYBBQUHAQEEgZswgZgwSgYIKwYBBQUH
-MAKGPmh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvdW5pLWdvZXR0aW5nZW4tY2EvcHVi
-L2NhY2VydC9jYWNlcnQuY3J0MEoGCCsGAQUFBzAChj5odHRwOi8vY2RwMi5wY2Eu
-ZGZuLmRlL3VuaS1nb2V0dGluZ2VuLWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDAN
-BgkqhkiG9w0BAQUFAAOCAQEANgN+eFxmXlaksI2MQH046IM6azOS11ves9ITaOqh
-GH7vac+bgGRDfpgRnZn7FIZ9NIC0S6iXjsMcRZu1ObAwmJWAs1RHJidfC3+c1yY2
-+C1Ts0VeFvQiM9fYYIAUpmhl1Ia/vDiRcdwuHyUtte1tq2QN67gSuOKVOj9GtDJk
-Szgxk1cNbqUzIfvhFvt9g5Kzlr5/yo0e2fVPZv7yk8Si19dzQO/9OLMVcVjTMNyM
-Mu0ReSI3dNaEQa5SEiRMTjX0sKwnC4KQmbLLIzgqG9VpD61h0vCfKPJzJ/UqMZBd
-Ayj96g/+2D4+WUpiE5AlAEO2WcgBqxxIHgqvmL1dBNhQwA==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://textgridlab.org/1.0/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://textgridlab.org/1.0/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://textgridlab.org/1.0/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://textgridlab.org/1.0/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://textgridlab.org/1.0/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://textgridlab.org/1.0/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://textgridlab.org/1.0/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://textgridlab.org/1.0/Shibboleth.sso/NIM/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://textgridlab.org/1.0/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://textgridlab.org/1.0/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://textgridlab.org/1.0/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://textgridlab.org/1.0/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://textgridlab.org/1.0/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://textgridlab.org/1.0/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://textgridlab.org/2.0/Shibboleth.sso/SAML2/POST" index="7"/>
-    <AttributeConsumingService index="1">
-      <ServiceName xml:lang="de">TextGridLab</ServiceName>
-      <ServiceName xml:lang="en">TextGridLab</ServiceName>
-      <ServiceDescription xml:lang="de">Virtuelle Forschungsumgebung TextGridLab</ServiceDescription>
-      <ServiceDescription xml:lang="en">TextGridLab virtual research environment</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="sn" 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="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-      <RequestedAttribute FriendlyName="o" Name="urn:oid:2.5.4.10" 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="false"/>
-    </AttributeConsumingService>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">e112</OrganizationName>
-    <OrganizationName xml:lang="en">e112</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">Gesellschaft für wissenschaftliche Datenverarbeitung mbH</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">Gesellschaft für wissenschaftliche Datenverarbeitung mbH</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.gwdg.de</OrganizationURL>
-    <OrganizationURL xml:lang="en">http://www.gwdg.de</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Martin</GivenName>
-    <SurName>Haase</SurName>
-    <EmailAddress>mailto:martin.haase@daasi.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="administrative">
-    <GivenName>Christof</GivenName>
-    <SurName>Pohl</SurName>
-    <EmailAddress>mailto:christof.pohl@gwdg.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="support">
-    <GivenName>TextGrid</GivenName>
-    <SurName>Support</SurName>
-    <EmailAddress>mailto:support@textgrid.de</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sp.textgridlab.org.xml b/swamid-interfederations-2.0/sp.textgridlab.org.xml
deleted file mode 100644
index 3a7ec7ba..00000000
--- a/swamid-interfederations-2.0/sp.textgridlab.org.xml
+++ /dev/null
@@ -1,163 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sp.textgridlab.org/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2011-11-02T09:05:34Z">
-      <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://textgridlab.org/1.0/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="de">TextGridLab</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">TextGridLab</mdui:DisplayName>
-        <mdui:Description xml:lang="de">Virtuelle Forschungsumgebung TextGridLab</mdui:Description>
-        <mdui:Description xml:lang="en">TextGridLab virtual research environment</mdui:Description>
-        <mdui:InformationURL xml:lang="de">http://www.textgrid.de</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">http://www.textgrid.de</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="de">https://de.dariah.eu/ServicePrivacyPolicy</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://de.dariah.eu/ServicePrivacyPolicy</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>textgridlab.org</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=textgridlab.org,OU=TextGrid,OU=Niedersaechsische Staats- und Universitaetsbibliothek,O=Georg-August-Universitaet Goettingen,L=Goettingen,ST=Niedersachsen,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIGHjCCBQagAwIBAgIHEzj8sz7gpzANBgkqhkiG9w0BAQUFADCBrjELMAkGA1UE
-BhMCREUxFjAUBgNVBAgTDU5pZWRlcnNhY2hzZW4xEzARBgNVBAcTCkdvZXR0aW5n
-ZW4xLTArBgNVBAoTJEdlb3JnLUF1Z3VzdC1Vbml2ZXJzaXRhZXQgR29ldHRpbmdl
-bjEjMCEGA1UEAxMaVW5pdmVyc2l0YWV0LUdvZXR0aW5nZW4gQ0ExHjAcBgkqhkiG
-9w0BCQEWD2d3ZGctY2FAZ3dkZy5kZTAeFw0xMjAxMjAxNDUwMTJaFw0xNzAxMTgx
-NDUwMTJaMIHWMQswCQYDVQQGEwJERTEWMBQGA1UECBMNTmllZGVyc2FjaHNlbjET
-MBEGA1UEBxMKR29ldHRpbmdlbjEtMCsGA1UEChMkR2VvcmctQXVndXN0LVVuaXZl
-cnNpdGFldCBHb2V0dGluZ2VuMT4wPAYDVQQLEzVOaWVkZXJzYWVjaHNpc2NoZSBT
-dGFhdHMtIHVuZCBVbml2ZXJzaXRhZXRzYmlibGlvdGhlazERMA8GA1UECxMIVGV4
-dEdyaWQxGDAWBgNVBAMTD3RleHRncmlkbGFiLm9yZzCCASIwDQYJKoZIhvcNAQEB
-BQADggEPADCCAQoCggEBANDyVAH2OTXsKccRpix/jGx2GRR2YH2Od8IAD/wf36Ep
-ypnqUN7iOCEUh9lB7SMAn/CQjwZ+zFWz+W/HjvlAlFSVZvMVlOF4qh5xiNaCF/bz
-ttSnoXoY0r8VxIooSLi7d+uDRcg44Ck+JpIaJcEh+2JJDLa12bsDbzS0/d1bgKLr
-FLPKKzo+XJjwYe6U0PtqDvuZCfXr1VFw6P2GckFRYd/xfuxWjhRvyRxTD2fmUkXV
-WhmgEhzf3cwxnHqQoUdlxS7iCPcaMrNeSBJMkxneOuYk/H2q0uA6Y+zWNdh6ss0R
-I1avpYOozbaMmY/aD7Avnyp6eby6NYUCPNMPpRPIRbcCAwEAAaOCAhUwggIRMAkG
-A1UdEwQCMAAwCwYDVR0PBAQDAgXgMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggrBgEF
-BQcDATAdBgNVHQ4EFgQUsQ1Bhym48J36cebaA4fsHlU8etcwHwYDVR0jBBgwFoAU
-Hb1zzG3ubhx0cNmjGzq6qCfevOswWwYDVR0RBFQwUoIPdGV4dGdyaWRsYWIub3Jn
-ghN3d3cudGV4dGdyaWRsYWIub3JngRBpbmZvQHRleHRncmlkLmRlgRhjYUBzdWIu
-dW5pLWdvZXR0aW5nZW4uZGUwgY8GA1UdHwSBhzCBhDBAoD6gPIY6aHR0cDovL2Nk
-cDEucGNhLmRmbi5kZS91bmktZ29ldHRpbmdlbi1jYS9wdWIvY3JsL2NhY3JsLmNy
-bDBAoD6gPIY6aHR0cDovL2NkcDIucGNhLmRmbi5kZS91bmktZ29ldHRpbmdlbi1j
-YS9wdWIvY3JsL2NhY3JsLmNybDCBqAYIKwYBBQUHAQEEgZswgZgwSgYIKwYBBQUH
-MAKGPmh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvdW5pLWdvZXR0aW5nZW4tY2EvcHVi
-L2NhY2VydC9jYWNlcnQuY3J0MEoGCCsGAQUFBzAChj5odHRwOi8vY2RwMi5wY2Eu
-ZGZuLmRlL3VuaS1nb2V0dGluZ2VuLWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDAN
-BgkqhkiG9w0BAQUFAAOCAQEANgN+eFxmXlaksI2MQH046IM6azOS11ves9ITaOqh
-GH7vac+bgGRDfpgRnZn7FIZ9NIC0S6iXjsMcRZu1ObAwmJWAs1RHJidfC3+c1yY2
-+C1Ts0VeFvQiM9fYYIAUpmhl1Ia/vDiRcdwuHyUtte1tq2QN67gSuOKVOj9GtDJk
-Szgxk1cNbqUzIfvhFvt9g5Kzlr5/yo0e2fVPZv7yk8Si19dzQO/9OLMVcVjTMNyM
-Mu0ReSI3dNaEQa5SEiRMTjX0sKwnC4KQmbLLIzgqG9VpD61h0vCfKPJzJ/UqMZBd
-Ayj96g/+2D4+WUpiE5AlAEO2WcgBqxxIHgqvmL1dBNhQwA==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>textgridlab.org</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=textgridlab.org,OU=TextGrid,OU=Niedersaechsische Staats- und Universitaetsbibliothek,O=Georg-August-Universitaet Goettingen,L=Goettingen,ST=Niedersachsen,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIGHjCCBQagAwIBAgIHEzj8sz7gpzANBgkqhkiG9w0BAQUFADCBrjELMAkGA1UE
-BhMCREUxFjAUBgNVBAgTDU5pZWRlcnNhY2hzZW4xEzARBgNVBAcTCkdvZXR0aW5n
-ZW4xLTArBgNVBAoTJEdlb3JnLUF1Z3VzdC1Vbml2ZXJzaXRhZXQgR29ldHRpbmdl
-bjEjMCEGA1UEAxMaVW5pdmVyc2l0YWV0LUdvZXR0aW5nZW4gQ0ExHjAcBgkqhkiG
-9w0BCQEWD2d3ZGctY2FAZ3dkZy5kZTAeFw0xMjAxMjAxNDUwMTJaFw0xNzAxMTgx
-NDUwMTJaMIHWMQswCQYDVQQGEwJERTEWMBQGA1UECBMNTmllZGVyc2FjaHNlbjET
-MBEGA1UEBxMKR29ldHRpbmdlbjEtMCsGA1UEChMkR2VvcmctQXVndXN0LVVuaXZl
-cnNpdGFldCBHb2V0dGluZ2VuMT4wPAYDVQQLEzVOaWVkZXJzYWVjaHNpc2NoZSBT
-dGFhdHMtIHVuZCBVbml2ZXJzaXRhZXRzYmlibGlvdGhlazERMA8GA1UECxMIVGV4
-dEdyaWQxGDAWBgNVBAMTD3RleHRncmlkbGFiLm9yZzCCASIwDQYJKoZIhvcNAQEB
-BQADggEPADCCAQoCggEBANDyVAH2OTXsKccRpix/jGx2GRR2YH2Od8IAD/wf36Ep
-ypnqUN7iOCEUh9lB7SMAn/CQjwZ+zFWz+W/HjvlAlFSVZvMVlOF4qh5xiNaCF/bz
-ttSnoXoY0r8VxIooSLi7d+uDRcg44Ck+JpIaJcEh+2JJDLa12bsDbzS0/d1bgKLr
-FLPKKzo+XJjwYe6U0PtqDvuZCfXr1VFw6P2GckFRYd/xfuxWjhRvyRxTD2fmUkXV
-WhmgEhzf3cwxnHqQoUdlxS7iCPcaMrNeSBJMkxneOuYk/H2q0uA6Y+zWNdh6ss0R
-I1avpYOozbaMmY/aD7Avnyp6eby6NYUCPNMPpRPIRbcCAwEAAaOCAhUwggIRMAkG
-A1UdEwQCMAAwCwYDVR0PBAQDAgXgMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggrBgEF
-BQcDATAdBgNVHQ4EFgQUsQ1Bhym48J36cebaA4fsHlU8etcwHwYDVR0jBBgwFoAU
-Hb1zzG3ubhx0cNmjGzq6qCfevOswWwYDVR0RBFQwUoIPdGV4dGdyaWRsYWIub3Jn
-ghN3d3cudGV4dGdyaWRsYWIub3JngRBpbmZvQHRleHRncmlkLmRlgRhjYUBzdWIu
-dW5pLWdvZXR0aW5nZW4uZGUwgY8GA1UdHwSBhzCBhDBAoD6gPIY6aHR0cDovL2Nk
-cDEucGNhLmRmbi5kZS91bmktZ29ldHRpbmdlbi1jYS9wdWIvY3JsL2NhY3JsLmNy
-bDBAoD6gPIY6aHR0cDovL2NkcDIucGNhLmRmbi5kZS91bmktZ29ldHRpbmdlbi1j
-YS9wdWIvY3JsL2NhY3JsLmNybDCBqAYIKwYBBQUHAQEEgZswgZgwSgYIKwYBBQUH
-MAKGPmh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvdW5pLWdvZXR0aW5nZW4tY2EvcHVi
-L2NhY2VydC9jYWNlcnQuY3J0MEoGCCsGAQUFBzAChj5odHRwOi8vY2RwMi5wY2Eu
-ZGZuLmRlL3VuaS1nb2V0dGluZ2VuLWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDAN
-BgkqhkiG9w0BAQUFAAOCAQEANgN+eFxmXlaksI2MQH046IM6azOS11ves9ITaOqh
-GH7vac+bgGRDfpgRnZn7FIZ9NIC0S6iXjsMcRZu1ObAwmJWAs1RHJidfC3+c1yY2
-+C1Ts0VeFvQiM9fYYIAUpmhl1Ia/vDiRcdwuHyUtte1tq2QN67gSuOKVOj9GtDJk
-Szgxk1cNbqUzIfvhFvt9g5Kzlr5/yo0e2fVPZv7yk8Si19dzQO/9OLMVcVjTMNyM
-Mu0ReSI3dNaEQa5SEiRMTjX0sKwnC4KQmbLLIzgqG9VpD61h0vCfKPJzJ/UqMZBd
-Ayj96g/+2D4+WUpiE5AlAEO2WcgBqxxIHgqvmL1dBNhQwA==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://textgridlab.org/1.0/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://textgridlab.org/1.0/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://textgridlab.org/1.0/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://textgridlab.org/1.0/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://textgridlab.org/1.0/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://textgridlab.org/1.0/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://textgridlab.org/1.0/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://textgridlab.org/1.0/Shibboleth.sso/NIM/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://textgridlab.org/1.0/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://textgridlab.org/1.0/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://textgridlab.org/1.0/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://textgridlab.org/1.0/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://textgridlab.org/1.0/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://textgridlab.org/1.0/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://textgridlab.org/2.0/Shibboleth.sso/SAML2/POST" index="7"/>
-    <AttributeConsumingService index="1">
-      <ServiceName xml:lang="de">TextGridLab</ServiceName>
-      <ServiceName xml:lang="en">TextGridLab</ServiceName>
-      <ServiceDescription xml:lang="de">Virtuelle Forschungsumgebung TextGridLab</ServiceDescription>
-      <ServiceDescription xml:lang="en">TextGridLab virtual research environment</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="sn" 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="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-      <RequestedAttribute FriendlyName="o" Name="urn:oid:2.5.4.10" 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="false"/>
-    </AttributeConsumingService>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">e112</OrganizationName>
-    <OrganizationName xml:lang="en">e112</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">Gesellschaft für wissenschaftliche Datenverarbeitung mbH</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">Gesellschaft für wissenschaftliche Datenverarbeitung mbH</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.gwdg.de</OrganizationURL>
-    <OrganizationURL xml:lang="en">http://www.gwdg.de</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Martin</GivenName>
-    <SurName>Haase</SurName>
-    <EmailAddress>mailto:martin.haase@daasi.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="administrative">
-    <GivenName>Christof</GivenName>
-    <SurName>Pohl</SurName>
-    <EmailAddress>mailto:christof.pohl@gwdg.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="support">
-    <GivenName>TextGrid</GivenName>
-    <SurName>Support</SurName>
-    <EmailAddress>mailto:support@textgrid.de</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sp.upv.es-saml-module.php-saml-sp-metadata.php-upv-sp-saml.xml b/swamid-interfederations-2.0/sp.upv.es-saml-module.php-saml-sp-metadata.php-upv-sp-saml.xml
deleted file mode 100644
index 6ccf0396..00000000
--- a/swamid-interfederations-2.0/sp.upv.es-saml-module.php-saml-sp-metadata.php-upv-sp-saml.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sp.upv.es/saml/module.php/saml/sp/metadata.php/upv-sp-saml">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.rediris.es/" registrationInstant="2013-05-15T10:18:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.rediris.es/sir/edugain/SIR_MRPS.pdf</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIIEgzCCA2ugAwIBAgIJAJqTBSpdJw/JMA0GCSqGSIb3DQEBBQUAMIGHMQswCQYDVQQGEwJFUzERMA8GA1UECBMIVmFsZW5jaWExETAPBgNVBAcTCFZhbGVuY2lhMQwwCgYDVQQKEwNVUFYxDTALBgNVBAsTBEFTSUMxEjAQBgNVBAMTCXNwLnVwdi5lczEhMB8GCSqGSIb3DQEJARYSaWRlbnRpZGFkZXNAdXB2LmVzMB4XDTEzMDUxNDA4MzcxN1oXDTIzMDUxNDA4MzcxN1owgYcxCzAJBgNVBAYTAkVTMREwDwYDVQQIEwhWYWxlbmNpYTERMA8GA1UEBxMIVmFsZW5jaWExDDAKBgNVBAoTA1VQVjENMAsGA1UECxMEQVNJQzESMBAGA1UEAxMJc3AudXB2LmVzMSEwHwYJKoZIhvcNAQkBFhJpZGVudGlkYWRlc0B1cHYuZXMwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDCvyV8WKAkRHXTqikxS6XFvb9Ta3ODdklEKdpXXSofu3vOVA1aIavZChFAZtyECJs4iu/0GTmXBEqx9gwaUSpbTgl+DnMW6G7dmLtneJZ0oRddSmI/HUjnOCfh79WidyUrHtZWOMRewsLBQndHARWh2NX0GkGaVaSRzjfnJxJiQy9nQqAST0APNdPDeO3mwMC4BgV0zV2BsULG4rqubOLbQVC2f6Cv4ea3vX8zKJTiulFeCxZ7MMMtOvcr1oKCH4AcrCF1+6bEeyGpxzKMMYTn4PNE9JIPqO0AFBv1mGF2YyavsTnXhiXYk7pdIdxC4gSIVqs5go3kOikxK+xLDEiRAgMBAAGjge8wgewwHQYDVR0OBBYEFOo/c+wi4Cz6my4Ku2bGfshLHjyGMIG8BgNVHSMEgbQwgbGAFOo/c+wi4Cz6my4Ku2bGfshLHjyGoYGNpIGKMIGHMQswCQYDVQQGEwJFUzERMA8GA1UECBMIVmFsZW5jaWExETAPBgNVBAcTCFZhbGVuY2lhMQwwCgYDVQQKEwNVUFYxDTALBgNVBAsTBEFTSUMxEjAQBgNVBAMTCXNwLnVwdi5lczEhMB8GCSqGSIb3DQEJARYSaWRlbnRpZGFkZXNAdXB2LmVzggkAmpMFKl0nD8kwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAOUXfgwgDqLuSqZBTaealvbvb0z4VwGptu9rYobmVmyb5D/VfmwwPghqd+YAjNUKVJhKTKYorjoSOVMwuIrN7NnHRSP119bRxt+088EtAXrerxukMwj7sP3kxu5rBPo5RqSxXPZPhjZi7zIUZtatiqzlHuc3oshlz7RhkLPkca0Pj+npNy/X+Ql0iAcpomra3Y8+sNy9R3vJPRmhBT7L8z5r2Lj/+6BOBJAQdXQO04kBGnd6V9q/WjxJmo5AIv7HTMBBZUhFmagsHOpZ6I3tbx7kQ/xiikXuIZqf9DBIK9oceKvCi0Lr5X6PvEZLPGd+gtyjA+/vl82v3ZuUD8u/5+g==</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>MIIEgzCCA2ugAwIBAgIJAJqTBSpdJw/JMA0GCSqGSIb3DQEBBQUAMIGHMQswCQYDVQQGEwJFUzERMA8GA1UECBMIVmFsZW5jaWExETAPBgNVBAcTCFZhbGVuY2lhMQwwCgYDVQQKEwNVUFYxDTALBgNVBAsTBEFTSUMxEjAQBgNVBAMTCXNwLnVwdi5lczEhMB8GCSqGSIb3DQEJARYSaWRlbnRpZGFkZXNAdXB2LmVzMB4XDTEzMDUxNDA4MzcxN1oXDTIzMDUxNDA4MzcxN1owgYcxCzAJBgNVBAYTAkVTMREwDwYDVQQIEwhWYWxlbmNpYTERMA8GA1UEBxMIVmFsZW5jaWExDDAKBgNVBAoTA1VQVjENMAsGA1UECxMEQVNJQzESMBAGA1UEAxMJc3AudXB2LmVzMSEwHwYJKoZIhvcNAQkBFhJpZGVudGlkYWRlc0B1cHYuZXMwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDCvyV8WKAkRHXTqikxS6XFvb9Ta3ODdklEKdpXXSofu3vOVA1aIavZChFAZtyECJs4iu/0GTmXBEqx9gwaUSpbTgl+DnMW6G7dmLtneJZ0oRddSmI/HUjnOCfh79WidyUrHtZWOMRewsLBQndHARWh2NX0GkGaVaSRzjfnJxJiQy9nQqAST0APNdPDeO3mwMC4BgV0zV2BsULG4rqubOLbQVC2f6Cv4ea3vX8zKJTiulFeCxZ7MMMtOvcr1oKCH4AcrCF1+6bEeyGpxzKMMYTn4PNE9JIPqO0AFBv1mGF2YyavsTnXhiXYk7pdIdxC4gSIVqs5go3kOikxK+xLDEiRAgMBAAGjge8wgewwHQYDVR0OBBYEFOo/c+wi4Cz6my4Ku2bGfshLHjyGMIG8BgNVHSMEgbQwgbGAFOo/c+wi4Cz6my4Ku2bGfshLHjyGoYGNpIGKMIGHMQswCQYDVQQGEwJFUzERMA8GA1UECBMIVmFsZW5jaWExETAPBgNVBAcTCFZhbGVuY2lhMQwwCgYDVQQKEwNVUFYxDTALBgNVBAsTBEFTSUMxEjAQBgNVBAMTCXNwLnVwdi5lczEhMB8GCSqGSIb3DQEJARYSaWRlbnRpZGFkZXNAdXB2LmVzggkAmpMFKl0nD8kwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAOUXfgwgDqLuSqZBTaealvbvb0z4VwGptu9rYobmVmyb5D/VfmwwPghqd+YAjNUKVJhKTKYorjoSOVMwuIrN7NnHRSP119bRxt+088EtAXrerxukMwj7sP3kxu5rBPo5RqSxXPZPhjZi7zIUZtatiqzlHuc3oshlz7RhkLPkca0Pj+npNy/X+Ql0iAcpomra3Y8+sNy9R3vJPRmhBT7L8z5r2Lj/+6BOBJAQdXQO04kBGnd6V9q/WjxJmo5AIv7HTMBBZUhFmagsHOpZ6I3tbx7kQ/xiikXuIZqf9DBIK9oceKvCi0Lr5X6PvEZLPGd+gtyjA+/vl82v3ZuUD8u/5+g==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sp.upv.es/saml/module.php/saml/sp/saml2-logout.php/upv-sp-saml"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp.upv.es/saml/module.php/saml/sp/saml2-acs.php/upv-sp-saml" index="0"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sp.upv.es/saml/module.php/saml/sp/saml1-acs.php/upv-sp-saml" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp.upv.es/saml/module.php/saml/sp/saml2-acs.php/upv-sp-saml" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sp.upv.es/saml/module.php/saml/sp/saml1-acs.php/upv-sp-saml/artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:profiles:holder-of-key:SSO:browser" Location="https://sp.upv.es/saml/module.php/saml/sp/saml2-acs.php/upv-sp-saml" index="4"/>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Universitat Politècnica de València</md:OrganizationName>
-    <md:OrganizationName xml:lang="es">Universitat Politècnica de València</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Universitat Politècnica de València</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="es">Universitat Politècnica de València</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.upv.es/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="es">http://www.upv.es/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>ASIC-UPV</md:GivenName>
-    <md:EmailAddress>identidades@upv.es</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sp.upv.es.xml b/swamid-interfederations-2.0/sp.upv.es.xml
deleted file mode 100644
index 6ccf0396..00000000
--- a/swamid-interfederations-2.0/sp.upv.es.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sp.upv.es/saml/module.php/saml/sp/metadata.php/upv-sp-saml">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.rediris.es/" registrationInstant="2013-05-15T10:18:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.rediris.es/sir/edugain/SIR_MRPS.pdf</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIIEgzCCA2ugAwIBAgIJAJqTBSpdJw/JMA0GCSqGSIb3DQEBBQUAMIGHMQswCQYDVQQGEwJFUzERMA8GA1UECBMIVmFsZW5jaWExETAPBgNVBAcTCFZhbGVuY2lhMQwwCgYDVQQKEwNVUFYxDTALBgNVBAsTBEFTSUMxEjAQBgNVBAMTCXNwLnVwdi5lczEhMB8GCSqGSIb3DQEJARYSaWRlbnRpZGFkZXNAdXB2LmVzMB4XDTEzMDUxNDA4MzcxN1oXDTIzMDUxNDA4MzcxN1owgYcxCzAJBgNVBAYTAkVTMREwDwYDVQQIEwhWYWxlbmNpYTERMA8GA1UEBxMIVmFsZW5jaWExDDAKBgNVBAoTA1VQVjENMAsGA1UECxMEQVNJQzESMBAGA1UEAxMJc3AudXB2LmVzMSEwHwYJKoZIhvcNAQkBFhJpZGVudGlkYWRlc0B1cHYuZXMwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDCvyV8WKAkRHXTqikxS6XFvb9Ta3ODdklEKdpXXSofu3vOVA1aIavZChFAZtyECJs4iu/0GTmXBEqx9gwaUSpbTgl+DnMW6G7dmLtneJZ0oRddSmI/HUjnOCfh79WidyUrHtZWOMRewsLBQndHARWh2NX0GkGaVaSRzjfnJxJiQy9nQqAST0APNdPDeO3mwMC4BgV0zV2BsULG4rqubOLbQVC2f6Cv4ea3vX8zKJTiulFeCxZ7MMMtOvcr1oKCH4AcrCF1+6bEeyGpxzKMMYTn4PNE9JIPqO0AFBv1mGF2YyavsTnXhiXYk7pdIdxC4gSIVqs5go3kOikxK+xLDEiRAgMBAAGjge8wgewwHQYDVR0OBBYEFOo/c+wi4Cz6my4Ku2bGfshLHjyGMIG8BgNVHSMEgbQwgbGAFOo/c+wi4Cz6my4Ku2bGfshLHjyGoYGNpIGKMIGHMQswCQYDVQQGEwJFUzERMA8GA1UECBMIVmFsZW5jaWExETAPBgNVBAcTCFZhbGVuY2lhMQwwCgYDVQQKEwNVUFYxDTALBgNVBAsTBEFTSUMxEjAQBgNVBAMTCXNwLnVwdi5lczEhMB8GCSqGSIb3DQEJARYSaWRlbnRpZGFkZXNAdXB2LmVzggkAmpMFKl0nD8kwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAOUXfgwgDqLuSqZBTaealvbvb0z4VwGptu9rYobmVmyb5D/VfmwwPghqd+YAjNUKVJhKTKYorjoSOVMwuIrN7NnHRSP119bRxt+088EtAXrerxukMwj7sP3kxu5rBPo5RqSxXPZPhjZi7zIUZtatiqzlHuc3oshlz7RhkLPkca0Pj+npNy/X+Ql0iAcpomra3Y8+sNy9R3vJPRmhBT7L8z5r2Lj/+6BOBJAQdXQO04kBGnd6V9q/WjxJmo5AIv7HTMBBZUhFmagsHOpZ6I3tbx7kQ/xiikXuIZqf9DBIK9oceKvCi0Lr5X6PvEZLPGd+gtyjA+/vl82v3ZuUD8u/5+g==</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>MIIEgzCCA2ugAwIBAgIJAJqTBSpdJw/JMA0GCSqGSIb3DQEBBQUAMIGHMQswCQYDVQQGEwJFUzERMA8GA1UECBMIVmFsZW5jaWExETAPBgNVBAcTCFZhbGVuY2lhMQwwCgYDVQQKEwNVUFYxDTALBgNVBAsTBEFTSUMxEjAQBgNVBAMTCXNwLnVwdi5lczEhMB8GCSqGSIb3DQEJARYSaWRlbnRpZGFkZXNAdXB2LmVzMB4XDTEzMDUxNDA4MzcxN1oXDTIzMDUxNDA4MzcxN1owgYcxCzAJBgNVBAYTAkVTMREwDwYDVQQIEwhWYWxlbmNpYTERMA8GA1UEBxMIVmFsZW5jaWExDDAKBgNVBAoTA1VQVjENMAsGA1UECxMEQVNJQzESMBAGA1UEAxMJc3AudXB2LmVzMSEwHwYJKoZIhvcNAQkBFhJpZGVudGlkYWRlc0B1cHYuZXMwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDCvyV8WKAkRHXTqikxS6XFvb9Ta3ODdklEKdpXXSofu3vOVA1aIavZChFAZtyECJs4iu/0GTmXBEqx9gwaUSpbTgl+DnMW6G7dmLtneJZ0oRddSmI/HUjnOCfh79WidyUrHtZWOMRewsLBQndHARWh2NX0GkGaVaSRzjfnJxJiQy9nQqAST0APNdPDeO3mwMC4BgV0zV2BsULG4rqubOLbQVC2f6Cv4ea3vX8zKJTiulFeCxZ7MMMtOvcr1oKCH4AcrCF1+6bEeyGpxzKMMYTn4PNE9JIPqO0AFBv1mGF2YyavsTnXhiXYk7pdIdxC4gSIVqs5go3kOikxK+xLDEiRAgMBAAGjge8wgewwHQYDVR0OBBYEFOo/c+wi4Cz6my4Ku2bGfshLHjyGMIG8BgNVHSMEgbQwgbGAFOo/c+wi4Cz6my4Ku2bGfshLHjyGoYGNpIGKMIGHMQswCQYDVQQGEwJFUzERMA8GA1UECBMIVmFsZW5jaWExETAPBgNVBAcTCFZhbGVuY2lhMQwwCgYDVQQKEwNVUFYxDTALBgNVBAsTBEFTSUMxEjAQBgNVBAMTCXNwLnVwdi5lczEhMB8GCSqGSIb3DQEJARYSaWRlbnRpZGFkZXNAdXB2LmVzggkAmpMFKl0nD8kwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAOUXfgwgDqLuSqZBTaealvbvb0z4VwGptu9rYobmVmyb5D/VfmwwPghqd+YAjNUKVJhKTKYorjoSOVMwuIrN7NnHRSP119bRxt+088EtAXrerxukMwj7sP3kxu5rBPo5RqSxXPZPhjZi7zIUZtatiqzlHuc3oshlz7RhkLPkca0Pj+npNy/X+Ql0iAcpomra3Y8+sNy9R3vJPRmhBT7L8z5r2Lj/+6BOBJAQdXQO04kBGnd6V9q/WjxJmo5AIv7HTMBBZUhFmagsHOpZ6I3tbx7kQ/xiikXuIZqf9DBIK9oceKvCi0Lr5X6PvEZLPGd+gtyjA+/vl82v3ZuUD8u/5+g==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sp.upv.es/saml/module.php/saml/sp/saml2-logout.php/upv-sp-saml"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp.upv.es/saml/module.php/saml/sp/saml2-acs.php/upv-sp-saml" index="0"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sp.upv.es/saml/module.php/saml/sp/saml1-acs.php/upv-sp-saml" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp.upv.es/saml/module.php/saml/sp/saml2-acs.php/upv-sp-saml" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sp.upv.es/saml/module.php/saml/sp/saml1-acs.php/upv-sp-saml/artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:profiles:holder-of-key:SSO:browser" Location="https://sp.upv.es/saml/module.php/saml/sp/saml2-acs.php/upv-sp-saml" index="4"/>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Universitat Politècnica de València</md:OrganizationName>
-    <md:OrganizationName xml:lang="es">Universitat Politècnica de València</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Universitat Politècnica de València</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="es">Universitat Politècnica de València</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.upv.es/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="es">http://www.upv.es/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>ASIC-UPV</md:GivenName>
-    <md:EmailAddress>identidades@upv.es</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sp24-test.garr.it-shibboleth.xml b/swamid-interfederations-2.0/sp24-test.garr.it-shibboleth.xml
deleted file mode 100644
index a8c4f8c2..00000000
--- a/swamid-interfederations-2.0/sp24-test.garr.it-shibboleth.xml
+++ /dev/null
@@ -1,103 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" entityID="https://sp24-test.garr.it/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2012-05-07T12:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement
-                </mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <mdattr:EntityAttributes>
-      <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:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <Extensions>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="en">Test SP shib 2.4</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="it">Test SP shib 2.4</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Test SP shib 2.4 for attributes release monitoring</mdui:Description>
-        <mdui:Description xml:lang="it">Test SP shib 2.4 per visualizzare il rilascio degli attributi</mdui:Description>
-        <mdui:InformationURL xml:lang="en">https://www.idem.garr.it/en/technical-information/176-servizio-sp-test</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="it">https://www.idem.garr.it/index.php/it/informazioni-tecniche/176-servizio-sp-test</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://www.idem.garr.it/index.php/it/informazioni-tecniche/262</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="it">https://www.idem.garr.it/index.php/it/informazioni-tecniche/262</mdui:PrivacyStatementURL>
-        <mdui:Logo height="60" width="80" xml:lang="en">https://wiki.garr.it/wiki/pub/main/mappegarr/logo-garr.jpg</mdui:Logo>
-        <mdui:Logo height="60" width="80" xml:lang="it">https://wiki.garr.it/wiki/pub/main/mappegarr/logo-garr.jpg</mdui:Logo>
-      </mdui:UIInfo>
-      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://sp24-test.garr.it/Shibboleth.sso/Login"/>
-      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://sp24-test.garr.it/Shibboleth.sso/Login" index="1"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIC3DCCAcSgAwIBAgIJAJ7W+iRwOMUTMA0GCSqGSIb3DQEBBQUAMBIxEDAOBgNV
-BAMTB2NlbnRvczUwHhcNMTEwNDA0MTAxMDU4WhcNMjEwNDAxMTAxMDU4WjASMRAw
-DgYDVQQDEwdjZW50b3M1MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
-6sjvgmK7cxJ5w1zwtrH1qA+lI1Ej1+KtG9N8bXx56KDj8Bg+xr2oRGB+/d34j8wS
-JI3lEic8dvC35SHULX1CcEIs8Nl2GhZIaAiqmwA8DTq0eReQsz5wg1Vq1p0P1vZ9
-0n8Ys1OoMO0euOSpN0lyWu8wzyeuKKssci8EXY8lcIocPVMaBpTScKJ6JP51zPQW
-ELZWw4OP33wLHshxvvhoSvzNAz2ylmul4cdSVeHOxuRYvunqm5Q4VeVsUP2iTCaG
-JPHG21d5B034qq2cTQAGyd85EowlKmqKoJ3wUVR4PVc0Q3XxMo+hoZcdIGwhNrsH
-M6u9mRKkNixl8OzILOxhMwIDAQABozUwMzASBgNVHREECzAJggdjZW50b3M1MB0G
-A1UdDgQWBBQcMWUI1jE4zye8yRzfx3qXhUwWsDANBgkqhkiG9w0BAQUFAAOCAQEA
-WHlWTANnI7kL0S4u9vE9yZp2inDzGrVhZZfY8NL6mN9oTvGEemsNXLmvj1toDJCx
-Mbqbb5ituCor4wAxfNTh6QnHTZiiZwxIAU+/qi1r2smt/2ZsqosQR48OVZ2cELaj
-uaAboK+B5hXLtcPjOxoZ36iZcHmGDQCCTrHfaxG1CIbuCfs5f3RVgf707xGR/OZu
-2LvpeFy4g0jYx0BjYGWSP+nqL5gmsOW3g8VpthgX8ogiA3JiLBjyFQDAPbl2aK3x
-Vxp7Cw9zAwVPssgq6AhWp6csK/qRVeLsS4etFKHriK1UoC4PUhpqWkMr+bblM1hA
-3Qh4/sKlzs5OMglDOMb5VA==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sp24-test.garr.it/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sp24-test.garr.it/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sp24-test.garr.it/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp24-test.garr.it/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp24-test.garr.it/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sp24-test.garr.it/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sp24-test.garr.it/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp24-test.garr.it/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp24-test.garr.it/Shibboleth.sso/NIM/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp24-test.garr.it/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sp24-test.garr.it/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp24-test.garr.it/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://sp24-test.garr.it/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sp24-test.garr.it/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sp24-test.garr.it/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <AttributeConsumingService index="1">
-      <ServiceName xml:lang="en">SP TEST shib 24 Firenze</ServiceName>
-      <ServiceDescription xml:lang="en">IDEM test sp with optional attributes</ServiceDescription>
-      <RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" 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="cn" Name="urn:oid:2.5.4.3" 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="schacMotherTongue" Name="urn:oid:1.3.6.1.4.1.25178.1.2.1" 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="schacPersonalTitle" Name="urn:oid:1.3.6.1.4.1.25178.1.2.8" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute FriendlyName="schacPersonalPosition" Name="urn:oid:1.3.6.1.4.1.25178.1.2.13" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format: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="telephoneNumber" Name="urn:oid:2.5.4.20" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute FriendlyName="facsimileTelephoneNumber" Name="urn:oid:1.3.6.1.4.1.1466.115.121.1.22" 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="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: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="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: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: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: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">Consortium GARR</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">SP shib 2.4 di Prova provided by GARR</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="it">SP shib 2.4 di Prova erogato da GARR</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.garr.it/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>idem-help</SurName>
-    <EmailAddress>idem-help@garr.it</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sp24-test.garr.it.xml b/swamid-interfederations-2.0/sp24-test.garr.it.xml
deleted file mode 100644
index a8c4f8c2..00000000
--- a/swamid-interfederations-2.0/sp24-test.garr.it.xml
+++ /dev/null
@@ -1,103 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" entityID="https://sp24-test.garr.it/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2012-05-07T12:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement
-                </mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <mdattr:EntityAttributes>
-      <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:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <Extensions>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="en">Test SP shib 2.4</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="it">Test SP shib 2.4</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Test SP shib 2.4 for attributes release monitoring</mdui:Description>
-        <mdui:Description xml:lang="it">Test SP shib 2.4 per visualizzare il rilascio degli attributi</mdui:Description>
-        <mdui:InformationURL xml:lang="en">https://www.idem.garr.it/en/technical-information/176-servizio-sp-test</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="it">https://www.idem.garr.it/index.php/it/informazioni-tecniche/176-servizio-sp-test</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://www.idem.garr.it/index.php/it/informazioni-tecniche/262</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="it">https://www.idem.garr.it/index.php/it/informazioni-tecniche/262</mdui:PrivacyStatementURL>
-        <mdui:Logo height="60" width="80" xml:lang="en">https://wiki.garr.it/wiki/pub/main/mappegarr/logo-garr.jpg</mdui:Logo>
-        <mdui:Logo height="60" width="80" xml:lang="it">https://wiki.garr.it/wiki/pub/main/mappegarr/logo-garr.jpg</mdui:Logo>
-      </mdui:UIInfo>
-      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://sp24-test.garr.it/Shibboleth.sso/Login"/>
-      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://sp24-test.garr.it/Shibboleth.sso/Login" index="1"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIC3DCCAcSgAwIBAgIJAJ7W+iRwOMUTMA0GCSqGSIb3DQEBBQUAMBIxEDAOBgNV
-BAMTB2NlbnRvczUwHhcNMTEwNDA0MTAxMDU4WhcNMjEwNDAxMTAxMDU4WjASMRAw
-DgYDVQQDEwdjZW50b3M1MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
-6sjvgmK7cxJ5w1zwtrH1qA+lI1Ej1+KtG9N8bXx56KDj8Bg+xr2oRGB+/d34j8wS
-JI3lEic8dvC35SHULX1CcEIs8Nl2GhZIaAiqmwA8DTq0eReQsz5wg1Vq1p0P1vZ9
-0n8Ys1OoMO0euOSpN0lyWu8wzyeuKKssci8EXY8lcIocPVMaBpTScKJ6JP51zPQW
-ELZWw4OP33wLHshxvvhoSvzNAz2ylmul4cdSVeHOxuRYvunqm5Q4VeVsUP2iTCaG
-JPHG21d5B034qq2cTQAGyd85EowlKmqKoJ3wUVR4PVc0Q3XxMo+hoZcdIGwhNrsH
-M6u9mRKkNixl8OzILOxhMwIDAQABozUwMzASBgNVHREECzAJggdjZW50b3M1MB0G
-A1UdDgQWBBQcMWUI1jE4zye8yRzfx3qXhUwWsDANBgkqhkiG9w0BAQUFAAOCAQEA
-WHlWTANnI7kL0S4u9vE9yZp2inDzGrVhZZfY8NL6mN9oTvGEemsNXLmvj1toDJCx
-Mbqbb5ituCor4wAxfNTh6QnHTZiiZwxIAU+/qi1r2smt/2ZsqosQR48OVZ2cELaj
-uaAboK+B5hXLtcPjOxoZ36iZcHmGDQCCTrHfaxG1CIbuCfs5f3RVgf707xGR/OZu
-2LvpeFy4g0jYx0BjYGWSP+nqL5gmsOW3g8VpthgX8ogiA3JiLBjyFQDAPbl2aK3x
-Vxp7Cw9zAwVPssgq6AhWp6csK/qRVeLsS4etFKHriK1UoC4PUhpqWkMr+bblM1hA
-3Qh4/sKlzs5OMglDOMb5VA==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sp24-test.garr.it/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sp24-test.garr.it/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sp24-test.garr.it/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp24-test.garr.it/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp24-test.garr.it/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sp24-test.garr.it/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sp24-test.garr.it/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp24-test.garr.it/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp24-test.garr.it/Shibboleth.sso/NIM/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp24-test.garr.it/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sp24-test.garr.it/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp24-test.garr.it/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://sp24-test.garr.it/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sp24-test.garr.it/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sp24-test.garr.it/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <AttributeConsumingService index="1">
-      <ServiceName xml:lang="en">SP TEST shib 24 Firenze</ServiceName>
-      <ServiceDescription xml:lang="en">IDEM test sp with optional attributes</ServiceDescription>
-      <RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" 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="cn" Name="urn:oid:2.5.4.3" 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="schacMotherTongue" Name="urn:oid:1.3.6.1.4.1.25178.1.2.1" 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="schacPersonalTitle" Name="urn:oid:1.3.6.1.4.1.25178.1.2.8" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute FriendlyName="schacPersonalPosition" Name="urn:oid:1.3.6.1.4.1.25178.1.2.13" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format: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="telephoneNumber" Name="urn:oid:2.5.4.20" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute FriendlyName="facsimileTelephoneNumber" Name="urn:oid:1.3.6.1.4.1.1466.115.121.1.22" 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="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: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="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: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: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: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">Consortium GARR</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">SP shib 2.4 di Prova provided by GARR</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="it">SP shib 2.4 di Prova erogato da GARR</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.garr.it/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>idem-help</SurName>
-    <EmailAddress>idem-help@garr.it</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/srv-cr-idp.crdp-aquitaine.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/srv-cr-idp.crdp-aquitaine.fr-idp-shibboleth.xml
deleted file mode 100644
index e1bdba76..00000000
--- a/swamid-interfederations-2.0/srv-cr-idp.crdp-aquitaine.fr-idp-shibboleth.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://srv-cr-idp.crdp-aquitaine.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2013-10-21T16:21:50Z">
-      <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">crdp-aquitaine.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">CRDP d'Aquitaine</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDWzCCAkOgAwIBAgIUZNcfs0me3gJRFzAZsv70xd7o1lAwDQYJKoZIhvcNAQEF
-BQAwJzElMCMGA1UEAxMcc3J2LWNyLWlkcC5jcmRwLWFxdWl0YWluZS5mcjAeFw0x
-MzA0MjIxNTMzMzhaFw0zMzA0MjIxNTMzMzhaMCcxJTAjBgNVBAMTHHNydi1jci1p
-ZHAuY3JkcC1hcXVpdGFpbmUuZnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
-AoIBAQCA/Nt2kvmT5TdK1pTBSZ4HMyy+0ocpSDQJEnYy6/eYFvf9lnTcMscUXFBR
-3bx+elUMQInieeQxjaJ3wGTODu6QuVAUeGLrsE/AM+hkhcQuJ9BS3SCWcIPKVdiY
-bPP5VNYQSVspCDvCraTEcztfSjcQhZ8VqofRERNXw9I/yZTxVqXt0uXmo9BphO6o
-vwmO39HtroJ8kJnIhj0XATxP07e/zPAsWSwqWGorqILFnpIHVVvhh5nGq4XwhJaO
-IVVuwul2ffzsPMc3PUDy41JFpvzAiPS8dI5FXDerOp7wFR9nJqGcQ8vkkrDJVAGQ
-2Ux2yGLh0vVnouqFnLhukXV6PCrRAgMBAAGjfzB9MFwGA1UdEQRVMFOCHHNydi1j
-ci1pZHAuY3JkcC1hcXVpdGFpbmUuZnKGM2h0dHBzOi8vc3J2LWNyLWlkcC5jcmRw
-LWFxdWl0YWluZS5mci9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUp3g4+XVx1rOL
-EduivpCD/pkqw5QwDQYJKoZIhvcNAQEFBQADggEBAENp1qGbki2B1hc76pCYlbJM
-CNIF/xnjp2kKLUpCSxrCNVhp1X1TPh5V3v8J6qCXIKDhVDU98eVCMtUoe7S4bXVs
-w1dahL5jKfTNt4gz2ye/eV9U80ls48DU8iHt+6DAsMKhUclXFGrUBJ3dMZtrb1mB
-EXRs3cGPkhtUhU+0W1SHJb9LDP/vD0m+mpYJkm21IE/5/Su/W6NU7zGvNx3EusHh
-jpsClKrNMer75H+SrHphN7YBCRYeZcpEjA8axJr06Vddb3VFoWv1snspplQyLmkh
-m2r+TDGDuoziugKpxooCU7iZVaXp06XOnBUTI3mHXcCEHkt48EomwsH95lenRtU=
-					    </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://srv-cr-idp.crdp-aquitaine.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://srv-cr-idp.crdp-aquitaine.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://srv-cr-idp.crdp-aquitaine.fr/idp/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">CRDP d'Aquitaine</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">CRDP d'Aquitaine</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Alain-Aymerick François</SurName>
-    <EmailAddress>Alain-Aymerick.Francois@crdp-aquitaine.fr</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <SurName>Jean-Hervé RIVARD</SurName>
-    <EmailAddress>jean-herve.rivard@crdp-aquitaine.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/srv-cr-idp.crdp-aquitaine.fr.xml b/swamid-interfederations-2.0/srv-cr-idp.crdp-aquitaine.fr.xml
deleted file mode 100644
index e1bdba76..00000000
--- a/swamid-interfederations-2.0/srv-cr-idp.crdp-aquitaine.fr.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://srv-cr-idp.crdp-aquitaine.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2013-10-21T16:21:50Z">
-      <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">crdp-aquitaine.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">CRDP d'Aquitaine</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDWzCCAkOgAwIBAgIUZNcfs0me3gJRFzAZsv70xd7o1lAwDQYJKoZIhvcNAQEF
-BQAwJzElMCMGA1UEAxMcc3J2LWNyLWlkcC5jcmRwLWFxdWl0YWluZS5mcjAeFw0x
-MzA0MjIxNTMzMzhaFw0zMzA0MjIxNTMzMzhaMCcxJTAjBgNVBAMTHHNydi1jci1p
-ZHAuY3JkcC1hcXVpdGFpbmUuZnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
-AoIBAQCA/Nt2kvmT5TdK1pTBSZ4HMyy+0ocpSDQJEnYy6/eYFvf9lnTcMscUXFBR
-3bx+elUMQInieeQxjaJ3wGTODu6QuVAUeGLrsE/AM+hkhcQuJ9BS3SCWcIPKVdiY
-bPP5VNYQSVspCDvCraTEcztfSjcQhZ8VqofRERNXw9I/yZTxVqXt0uXmo9BphO6o
-vwmO39HtroJ8kJnIhj0XATxP07e/zPAsWSwqWGorqILFnpIHVVvhh5nGq4XwhJaO
-IVVuwul2ffzsPMc3PUDy41JFpvzAiPS8dI5FXDerOp7wFR9nJqGcQ8vkkrDJVAGQ
-2Ux2yGLh0vVnouqFnLhukXV6PCrRAgMBAAGjfzB9MFwGA1UdEQRVMFOCHHNydi1j
-ci1pZHAuY3JkcC1hcXVpdGFpbmUuZnKGM2h0dHBzOi8vc3J2LWNyLWlkcC5jcmRw
-LWFxdWl0YWluZS5mci9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUp3g4+XVx1rOL
-EduivpCD/pkqw5QwDQYJKoZIhvcNAQEFBQADggEBAENp1qGbki2B1hc76pCYlbJM
-CNIF/xnjp2kKLUpCSxrCNVhp1X1TPh5V3v8J6qCXIKDhVDU98eVCMtUoe7S4bXVs
-w1dahL5jKfTNt4gz2ye/eV9U80ls48DU8iHt+6DAsMKhUclXFGrUBJ3dMZtrb1mB
-EXRs3cGPkhtUhU+0W1SHJb9LDP/vD0m+mpYJkm21IE/5/Su/W6NU7zGvNx3EusHh
-jpsClKrNMer75H+SrHphN7YBCRYeZcpEjA8axJr06Vddb3VFoWv1snspplQyLmkh
-m2r+TDGDuoziugKpxooCU7iZVaXp06XOnBUTI3mHXcCEHkt48EomwsH95lenRtU=
-					    </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://srv-cr-idp.crdp-aquitaine.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://srv-cr-idp.crdp-aquitaine.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://srv-cr-idp.crdp-aquitaine.fr/idp/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">CRDP d'Aquitaine</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">CRDP d'Aquitaine</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Alain-Aymerick François</SurName>
-    <EmailAddress>Alain-Aymerick.Francois@crdp-aquitaine.fr</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <SurName>Jean-Hervé RIVARD</SurName>
-    <EmailAddress>jean-herve.rivard@crdp-aquitaine.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/srv-fii.insa-toulouse.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/srv-fii.insa-toulouse.fr-idp-shibboleth.xml
deleted file mode 100644
index d4cd1517..00000000
--- a/swamid-interfederations-2.0/srv-fii.insa-toulouse.fr-idp-shibboleth.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://srv-fii.insa-toulouse.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2012-02-24T14:12:00Z">
-      <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">insa-toulouse.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">INSA de Toulouse</mdui:DisplayName>
-        <mdui:Description xml:lang="en">People from INSA Toulouse</mdui:Description>
-        <mdui:DisplayName xml:lang="fr">INSA de Toulouse</mdui:DisplayName>
-        <mdui:Description xml:lang="fr">Les gens de l'INSA de Toulouse</mdui:Description>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDTDCCAjSgAwIBAgIVAIc+7dsfBy6txSFiZjLaZo7oHPHjMA0GCSqGSIb3DQEB
-BQUAMCMxITAfBgNVBAMTGHNydi1maWkuaW5zYS10b3Vsb3VzZS5mcjAeFw0xNDAz
-MTEwOTIyNDNaFw0zNDAzMTEwOTIyNDNaMCMxITAfBgNVBAMTGHNydi1maWkuaW5z
-YS10b3Vsb3VzZS5mcjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAK74
-hluqPdWzcHqS+sJ7gMMK/AaaY5OTqquhY3ut8EdnWOhLrpdJUmAP67NrCsX7vnlj
-OJJvsPwITMeeuZxYPohw7+0/y/VVjluVM9u0r6QPkNYbUO4HAjZf6JOeSORtD6iq
-JCuHdURPtdx+AALX+1aM/EaX+w9dsq/xDR0aPluAyb8zHT9WYX2C8bFxGqZfayF7
-55F0fJY4YsI2WD0AnG6/DAH1/MpgW/x3rXYE3ofA1aHJTG9m2rhM5a6c2mQ1lsB0
-L4ThOBOeDm+/GPc7HsB3EwK3SJKQEPIZFpHl2HOiAbmp8ZuA9bIjvjFk+2aaJOla
-UVKxNJeBA29jlsdxnzkCAwEAAaN3MHUwVAYDVR0RBE0wS4IYc3J2LWZpaS5pbnNh
-LXRvdWxvdXNlLmZyhi9odHRwczovL3Nydi1maWkuaW5zYS10b3Vsb3VzZS5mci9p
-ZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUQFnEXfdD1G/V0Zf4ArD2VSGlkcAwDQYJ
-KoZIhvcNAQEFBQADggEBAFmmxVsYiBe4u4MwR/vTomhTH6Y6rUTsbi55CBZJo0ki
-vDEeRGdAG/odez6Gx3HvfNQdGAkkXoVqzPM72suXTe3QbNwQ6p6Kfw3vlOb8Bxu+
-L4oGvqtYyKdsmZaOq8uHFSE7pmz5u86npm+5WF2EIISiNgh7V15avMGrXE3fQ+0C
-sSAKnwk3ZDiTJMkOC8JKJSxyHKmdG7tiqdhIxOoGnEa/oPdWgsVTV63xEVXfDHh3
-vVTEoXVyPovJRJieZVJDz0BmEE88Q/pDCAuhUQOCdeC0DX0uN8WrL9oI9WuGbzeD
-dQvqnCF/78eNFMZHSDdbRWgVyZp20ytlaxRlw1cKQ5w=
-					    </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://srv-fii.insa-toulouse.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://srv-fii.insa-toulouse.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://srv-fii.insa-toulouse.fr/idp/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">INSA de Toulouse</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">INSA de Toulouse</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <EmailAddress>support-federation@insa-toulouse.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/srv-fii.insa-toulouse.fr.xml b/swamid-interfederations-2.0/srv-fii.insa-toulouse.fr.xml
deleted file mode 100644
index d4cd1517..00000000
--- a/swamid-interfederations-2.0/srv-fii.insa-toulouse.fr.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://srv-fii.insa-toulouse.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2012-02-24T14:12:00Z">
-      <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">insa-toulouse.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">INSA de Toulouse</mdui:DisplayName>
-        <mdui:Description xml:lang="en">People from INSA Toulouse</mdui:Description>
-        <mdui:DisplayName xml:lang="fr">INSA de Toulouse</mdui:DisplayName>
-        <mdui:Description xml:lang="fr">Les gens de l'INSA de Toulouse</mdui:Description>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDTDCCAjSgAwIBAgIVAIc+7dsfBy6txSFiZjLaZo7oHPHjMA0GCSqGSIb3DQEB
-BQUAMCMxITAfBgNVBAMTGHNydi1maWkuaW5zYS10b3Vsb3VzZS5mcjAeFw0xNDAz
-MTEwOTIyNDNaFw0zNDAzMTEwOTIyNDNaMCMxITAfBgNVBAMTGHNydi1maWkuaW5z
-YS10b3Vsb3VzZS5mcjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAK74
-hluqPdWzcHqS+sJ7gMMK/AaaY5OTqquhY3ut8EdnWOhLrpdJUmAP67NrCsX7vnlj
-OJJvsPwITMeeuZxYPohw7+0/y/VVjluVM9u0r6QPkNYbUO4HAjZf6JOeSORtD6iq
-JCuHdURPtdx+AALX+1aM/EaX+w9dsq/xDR0aPluAyb8zHT9WYX2C8bFxGqZfayF7
-55F0fJY4YsI2WD0AnG6/DAH1/MpgW/x3rXYE3ofA1aHJTG9m2rhM5a6c2mQ1lsB0
-L4ThOBOeDm+/GPc7HsB3EwK3SJKQEPIZFpHl2HOiAbmp8ZuA9bIjvjFk+2aaJOla
-UVKxNJeBA29jlsdxnzkCAwEAAaN3MHUwVAYDVR0RBE0wS4IYc3J2LWZpaS5pbnNh
-LXRvdWxvdXNlLmZyhi9odHRwczovL3Nydi1maWkuaW5zYS10b3Vsb3VzZS5mci9p
-ZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUQFnEXfdD1G/V0Zf4ArD2VSGlkcAwDQYJ
-KoZIhvcNAQEFBQADggEBAFmmxVsYiBe4u4MwR/vTomhTH6Y6rUTsbi55CBZJo0ki
-vDEeRGdAG/odez6Gx3HvfNQdGAkkXoVqzPM72suXTe3QbNwQ6p6Kfw3vlOb8Bxu+
-L4oGvqtYyKdsmZaOq8uHFSE7pmz5u86npm+5WF2EIISiNgh7V15avMGrXE3fQ+0C
-sSAKnwk3ZDiTJMkOC8JKJSxyHKmdG7tiqdhIxOoGnEa/oPdWgsVTV63xEVXfDHh3
-vVTEoXVyPovJRJieZVJDz0BmEE88Q/pDCAuhUQOCdeC0DX0uN8WrL9oI9WuGbzeD
-dQvqnCF/78eNFMZHSDdbRWgVyZp20ytlaxRlw1cKQ5w=
-					    </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://srv-fii.insa-toulouse.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://srv-fii.insa-toulouse.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://srv-fii.insa-toulouse.fr/idp/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">INSA de Toulouse</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">INSA de Toulouse</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <EmailAddress>support-federation@insa-toulouse.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/srvcafe.ifma.edu.br-idp-shibboleth.xml b/swamid-interfederations-2.0/srvcafe.ifma.edu.br-idp-shibboleth.xml
deleted file mode 100644
index 76bfe293..00000000
--- a/swamid-interfederations-2.0/srvcafe.ifma.edu.br-idp-shibboleth.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://srvcafe.ifma.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">ifma.edu.br</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">IFMA - Instituto Federal do Maranhao</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="pt-br">IFMA - Instituto Federal do Maranhao</mdui:DisplayName>
-        <mdui:Description xml:lang="en">IFMA - Instituto Federal do Maranhao</mdui:Description>
-        <mdui:Description xml:lang="pt-br">IFMA - Instituto Federal do Maranhao</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.ifma.edu.br</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="pt-br">http://www.ifma.edu.br</mdui:InformationURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-    MIIERjCCAy4CAQAwDQYJKoZIhvcNAQEFBQAwgegxLjAsBgNVBAoUJUlGTUEgLSBJ
-bnN0aXR1dG8gRmVkZXJhbCBkbyBNYXJhbmjDo28xQjBABgNVBAsUOURHVEkgLSBE
-aXJldG9yaWEgZGUgR2VzdMOjbyBkYSBUZWNub2xvZ2lhIGRhIEluZm9ybWHDp8Oj
-bzEfMB0GCSqGSIb3DQEJARYQZGd0aUBpZm1hLmVkdS5icjESMBAGA1UEBxQJU8Oj
-byBMdWlzMRIwEAYDVQQIFAlNYXJhbmjDo28xCzAJBgNVBAYTAkJSMRwwGgYDVQQD
-ExNzcnZjYWZlLmlmbWEuZWR1LmJyMB4XDTE0MDQxMTIwNTEzNVoXDTE5MDQxMDIw
-NTEzNVowgegxLjAsBgNVBAoUJUlGTUEgLSBJbnN0aXR1dG8gRmVkZXJhbCBkbyBN
-YXJhbmjDo28xQjBABgNVBAsUOURHVEkgLSBEaXJldG9yaWEgZGUgR2VzdMOjbyBk
-YSBUZWNub2xvZ2lhIGRhIEluZm9ybWHDp8OjbzEfMB0GCSqGSIb3DQEJARYQZGd0
-aUBpZm1hLmVkdS5icjESMBAGA1UEBxQJU8OjbyBMdWlzMRIwEAYDVQQIFAlNYXJh
-bmjDo28xCzAJBgNVBAYTAkJSMRwwGgYDVQQDExNzcnZjYWZlLmlmbWEuZWR1LmJy
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAndeQ2TDWt0/WD456cqgd
-XQ9b/8GofISh4bqfAgE/ryJnTq7+Qf/ZEFoAD0dIpSyPlBhUjYE2wwOlUURD4+8y
-ivNSwYbC44MXvTH+7QES86Ei+/rSUvmjOaibXr3jcoEZZPoYSHBUWvuPM8yubjXw
-aY+dyyg9AjGMGq6bm5xm7prcE9IQT++sCzhnLx9PLpfEiFlPr3pnZKuLWvlEb/OV
-E0IkzzCAoFfLDfZAbEK5NInsd399Zw9o0Bfo3M0pRGzyZUHahnTKiGBagdK//tpm
-BhiT3azSvfWF7pxleUOCMJHTEum426AtaBpFyKBrvIEKr0OqgDj8uBsia4PH1lUY
-IwIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQBIZQEEWkQzIWbBHPbM5qGGkRgu2KfT
-39lv6LGDDjZaJH7CPFP1FElKAsw1FVOlsYGdF5xbvclqLiZeRa2WUlFqsEeZQHS2
-WcCWgsYjMANovjer9I834lFpxNATnKe4H3NsI3rlrfyBGJrSX3w/48s2xa8XgWDq
-7EWAk7GVDgPvc25kWIzlex6FXlfmPOnwsXrgpieCk6HH1jFn+xKshJHMntCjk3al
-FBO6NIuxgaFzNAp1X7EbCxKpFTZxjxC1YjfZAa/4XbZHqV9NHuW9w7QRz5wYvbDB
-UgQ4/xzHw95wCdYlE/aIdGiIG/ATFHnXv2ZiSCm8XDmz6wDBRVfw3Wv6
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://srvcafe.ifma.edu.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://srvcafe.ifma.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://srvcafe.ifma.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://srvcafe.ifma.edu.br/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://srvcafe.ifma.edu.br/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://srvcafe.ifma.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">ifma.edu.br</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-      
-MIIERjCCAy4CAQAwDQYJKoZIhvcNAQEFBQAwgegxLjAsBgNVBAoUJUlGTUEgLSBJ
-bnN0aXR1dG8gRmVkZXJhbCBkbyBNYXJhbmjDo28xQjBABgNVBAsUOURHVEkgLSBE
-aXJldG9yaWEgZGUgR2VzdMOjbyBkYSBUZWNub2xvZ2lhIGRhIEluZm9ybWHDp8Oj
-bzEfMB0GCSqGSIb3DQEJARYQZGd0aUBpZm1hLmVkdS5icjESMBAGA1UEBxQJU8Oj
-byBMdWlzMRIwEAYDVQQIFAlNYXJhbmjDo28xCzAJBgNVBAYTAkJSMRwwGgYDVQQD
-ExNzcnZjYWZlLmlmbWEuZWR1LmJyMB4XDTE0MDQxMTIwNTEzNVoXDTE5MDQxMDIw
-NTEzNVowgegxLjAsBgNVBAoUJUlGTUEgLSBJbnN0aXR1dG8gRmVkZXJhbCBkbyBN
-YXJhbmjDo28xQjBABgNVBAsUOURHVEkgLSBEaXJldG9yaWEgZGUgR2VzdMOjbyBk
-YSBUZWNub2xvZ2lhIGRhIEluZm9ybWHDp8OjbzEfMB0GCSqGSIb3DQEJARYQZGd0
-aUBpZm1hLmVkdS5icjESMBAGA1UEBxQJU8OjbyBMdWlzMRIwEAYDVQQIFAlNYXJh
-bmjDo28xCzAJBgNVBAYTAkJSMRwwGgYDVQQDExNzcnZjYWZlLmlmbWEuZWR1LmJy
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAndeQ2TDWt0/WD456cqgd
-XQ9b/8GofISh4bqfAgE/ryJnTq7+Qf/ZEFoAD0dIpSyPlBhUjYE2wwOlUURD4+8y
-ivNSwYbC44MXvTH+7QES86Ei+/rSUvmjOaibXr3jcoEZZPoYSHBUWvuPM8yubjXw
-aY+dyyg9AjGMGq6bm5xm7prcE9IQT++sCzhnLx9PLpfEiFlPr3pnZKuLWvlEb/OV
-E0IkzzCAoFfLDfZAbEK5NInsd399Zw9o0Bfo3M0pRGzyZUHahnTKiGBagdK//tpm
-BhiT3azSvfWF7pxleUOCMJHTEum426AtaBpFyKBrvIEKr0OqgDj8uBsia4PH1lUY
-IwIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQBIZQEEWkQzIWbBHPbM5qGGkRgu2KfT
-39lv6LGDDjZaJH7CPFP1FElKAsw1FVOlsYGdF5xbvclqLiZeRa2WUlFqsEeZQHS2
-WcCWgsYjMANovjer9I834lFpxNATnKe4H3NsI3rlrfyBGJrSX3w/48s2xa8XgWDq
-7EWAk7GVDgPvc25kWIzlex6FXlfmPOnwsXrgpieCk6HH1jFn+xKshJHMntCjk3al
-FBO6NIuxgaFzNAp1X7EbCxKpFTZxjxC1YjfZAa/4XbZHqV9NHuW9w7QRz5wYvbDB
-UgQ4/xzHw95wCdYlE/aIdGiIG/ATFHnXv2ZiSCm8XDmz6wDBRVfw3Wv6
-                    
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://srvcafe.ifma.edu.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://srvcafe.ifma.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">IFMA - Instituto Federal do Maranhao</OrganizationName>
-    <OrganizationName xml:lang="pt-br">IFMA - Instituto Federal do Maranhao</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">IFMA - Instituto Federal do Maranhao</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="pt-br">IFMA - Instituto Federal do Maranhao</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.ifma.edu.br</OrganizationURL>
-    <OrganizationURL xml:lang="pt-br">http://www.ifma.edu.br</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Daniel Torres</SurName>
-    <EmailAddress>daniel.torres@ifma.edu.br</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/srvcafe.ifma.edu.br.xml b/swamid-interfederations-2.0/srvcafe.ifma.edu.br.xml
deleted file mode 100644
index 76bfe293..00000000
--- a/swamid-interfederations-2.0/srvcafe.ifma.edu.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://srvcafe.ifma.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">ifma.edu.br</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">IFMA - Instituto Federal do Maranhao</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="pt-br">IFMA - Instituto Federal do Maranhao</mdui:DisplayName>
-        <mdui:Description xml:lang="en">IFMA - Instituto Federal do Maranhao</mdui:Description>
-        <mdui:Description xml:lang="pt-br">IFMA - Instituto Federal do Maranhao</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.ifma.edu.br</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="pt-br">http://www.ifma.edu.br</mdui:InformationURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-    MIIERjCCAy4CAQAwDQYJKoZIhvcNAQEFBQAwgegxLjAsBgNVBAoUJUlGTUEgLSBJ
-bnN0aXR1dG8gRmVkZXJhbCBkbyBNYXJhbmjDo28xQjBABgNVBAsUOURHVEkgLSBE
-aXJldG9yaWEgZGUgR2VzdMOjbyBkYSBUZWNub2xvZ2lhIGRhIEluZm9ybWHDp8Oj
-bzEfMB0GCSqGSIb3DQEJARYQZGd0aUBpZm1hLmVkdS5icjESMBAGA1UEBxQJU8Oj
-byBMdWlzMRIwEAYDVQQIFAlNYXJhbmjDo28xCzAJBgNVBAYTAkJSMRwwGgYDVQQD
-ExNzcnZjYWZlLmlmbWEuZWR1LmJyMB4XDTE0MDQxMTIwNTEzNVoXDTE5MDQxMDIw
-NTEzNVowgegxLjAsBgNVBAoUJUlGTUEgLSBJbnN0aXR1dG8gRmVkZXJhbCBkbyBN
-YXJhbmjDo28xQjBABgNVBAsUOURHVEkgLSBEaXJldG9yaWEgZGUgR2VzdMOjbyBk
-YSBUZWNub2xvZ2lhIGRhIEluZm9ybWHDp8OjbzEfMB0GCSqGSIb3DQEJARYQZGd0
-aUBpZm1hLmVkdS5icjESMBAGA1UEBxQJU8OjbyBMdWlzMRIwEAYDVQQIFAlNYXJh
-bmjDo28xCzAJBgNVBAYTAkJSMRwwGgYDVQQDExNzcnZjYWZlLmlmbWEuZWR1LmJy
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAndeQ2TDWt0/WD456cqgd
-XQ9b/8GofISh4bqfAgE/ryJnTq7+Qf/ZEFoAD0dIpSyPlBhUjYE2wwOlUURD4+8y
-ivNSwYbC44MXvTH+7QES86Ei+/rSUvmjOaibXr3jcoEZZPoYSHBUWvuPM8yubjXw
-aY+dyyg9AjGMGq6bm5xm7prcE9IQT++sCzhnLx9PLpfEiFlPr3pnZKuLWvlEb/OV
-E0IkzzCAoFfLDfZAbEK5NInsd399Zw9o0Bfo3M0pRGzyZUHahnTKiGBagdK//tpm
-BhiT3azSvfWF7pxleUOCMJHTEum426AtaBpFyKBrvIEKr0OqgDj8uBsia4PH1lUY
-IwIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQBIZQEEWkQzIWbBHPbM5qGGkRgu2KfT
-39lv6LGDDjZaJH7CPFP1FElKAsw1FVOlsYGdF5xbvclqLiZeRa2WUlFqsEeZQHS2
-WcCWgsYjMANovjer9I834lFpxNATnKe4H3NsI3rlrfyBGJrSX3w/48s2xa8XgWDq
-7EWAk7GVDgPvc25kWIzlex6FXlfmPOnwsXrgpieCk6HH1jFn+xKshJHMntCjk3al
-FBO6NIuxgaFzNAp1X7EbCxKpFTZxjxC1YjfZAa/4XbZHqV9NHuW9w7QRz5wYvbDB
-UgQ4/xzHw95wCdYlE/aIdGiIG/ATFHnXv2ZiSCm8XDmz6wDBRVfw3Wv6
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://srvcafe.ifma.edu.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://srvcafe.ifma.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://srvcafe.ifma.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://srvcafe.ifma.edu.br/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://srvcafe.ifma.edu.br/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://srvcafe.ifma.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">ifma.edu.br</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-      
-MIIERjCCAy4CAQAwDQYJKoZIhvcNAQEFBQAwgegxLjAsBgNVBAoUJUlGTUEgLSBJ
-bnN0aXR1dG8gRmVkZXJhbCBkbyBNYXJhbmjDo28xQjBABgNVBAsUOURHVEkgLSBE
-aXJldG9yaWEgZGUgR2VzdMOjbyBkYSBUZWNub2xvZ2lhIGRhIEluZm9ybWHDp8Oj
-bzEfMB0GCSqGSIb3DQEJARYQZGd0aUBpZm1hLmVkdS5icjESMBAGA1UEBxQJU8Oj
-byBMdWlzMRIwEAYDVQQIFAlNYXJhbmjDo28xCzAJBgNVBAYTAkJSMRwwGgYDVQQD
-ExNzcnZjYWZlLmlmbWEuZWR1LmJyMB4XDTE0MDQxMTIwNTEzNVoXDTE5MDQxMDIw
-NTEzNVowgegxLjAsBgNVBAoUJUlGTUEgLSBJbnN0aXR1dG8gRmVkZXJhbCBkbyBN
-YXJhbmjDo28xQjBABgNVBAsUOURHVEkgLSBEaXJldG9yaWEgZGUgR2VzdMOjbyBk
-YSBUZWNub2xvZ2lhIGRhIEluZm9ybWHDp8OjbzEfMB0GCSqGSIb3DQEJARYQZGd0
-aUBpZm1hLmVkdS5icjESMBAGA1UEBxQJU8OjbyBMdWlzMRIwEAYDVQQIFAlNYXJh
-bmjDo28xCzAJBgNVBAYTAkJSMRwwGgYDVQQDExNzcnZjYWZlLmlmbWEuZWR1LmJy
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAndeQ2TDWt0/WD456cqgd
-XQ9b/8GofISh4bqfAgE/ryJnTq7+Qf/ZEFoAD0dIpSyPlBhUjYE2wwOlUURD4+8y
-ivNSwYbC44MXvTH+7QES86Ei+/rSUvmjOaibXr3jcoEZZPoYSHBUWvuPM8yubjXw
-aY+dyyg9AjGMGq6bm5xm7prcE9IQT++sCzhnLx9PLpfEiFlPr3pnZKuLWvlEb/OV
-E0IkzzCAoFfLDfZAbEK5NInsd399Zw9o0Bfo3M0pRGzyZUHahnTKiGBagdK//tpm
-BhiT3azSvfWF7pxleUOCMJHTEum426AtaBpFyKBrvIEKr0OqgDj8uBsia4PH1lUY
-IwIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQBIZQEEWkQzIWbBHPbM5qGGkRgu2KfT
-39lv6LGDDjZaJH7CPFP1FElKAsw1FVOlsYGdF5xbvclqLiZeRa2WUlFqsEeZQHS2
-WcCWgsYjMANovjer9I834lFpxNATnKe4H3NsI3rlrfyBGJrSX3w/48s2xa8XgWDq
-7EWAk7GVDgPvc25kWIzlex6FXlfmPOnwsXrgpieCk6HH1jFn+xKshJHMntCjk3al
-FBO6NIuxgaFzNAp1X7EbCxKpFTZxjxC1YjfZAa/4XbZHqV9NHuW9w7QRz5wYvbDB
-UgQ4/xzHw95wCdYlE/aIdGiIG/ATFHnXv2ZiSCm8XDmz6wDBRVfw3Wv6
-                    
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://srvcafe.ifma.edu.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://srvcafe.ifma.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">IFMA - Instituto Federal do Maranhao</OrganizationName>
-    <OrganizationName xml:lang="pt-br">IFMA - Instituto Federal do Maranhao</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">IFMA - Instituto Federal do Maranhao</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="pt-br">IFMA - Instituto Federal do Maranhao</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.ifma.edu.br</OrganizationURL>
-    <OrganizationURL xml:lang="pt-br">http://www.ifma.edu.br</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Daniel Torres</SurName>
-    <EmailAddress>daniel.torres@ifma.edu.br</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/srvcafe.uniso.br-idp-shibboleth.xml b/swamid-interfederations-2.0/srvcafe.uniso.br-idp-shibboleth.xml
deleted file mode 100644
index bb200bc5..00000000
--- a/swamid-interfederations-2.0/srvcafe.uniso.br-idp-shibboleth.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://srvcafe.uniso.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">uniso.br</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">UNISO - Universidade de Sorocaba</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="pt-br">UNISO - Universidade de Sorocaba</mdui:DisplayName>
-        <mdui:Description xml:lang="en">UNISO - Universidade de Sorocaba</mdui:Description>
-        <mdui:Description xml:lang="pt-br">UNISO - Universidade de Sorocaba</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.uniso.br/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="pt-br">http://www.uniso.br/</mdui:InformationURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-    MIID1jCCAr4CAQAwDQYJKoZIhvcNAQEFBQAwgbAxKTAnBgNVBAoTIFVOSVNPIC0g
-VW5pdmVyc2lkYWRlIGRlIFNvcm9jYWJhMQwwCgYDVQQLEwNTUEQxKDAmBgkqhkiG
-9w0BCQEWGXdpbGxpYW0ub2xpdmVpcmFAdW5pc28uYnIxETAPBgNVBAcTCFNvcm9j
-YWJhMRMwEQYDVQQIFApTw6NvIFBhdWxvMQswCQYDVQQGEwJCUjEWMBQGA1UEAxMN
-Y2FmZS51bmlzby5icjAeFw0xNDA1MTYxNzAzNTBaFw0xNzA1MTUxNzAzNTBaMIGw
-MSkwJwYDVQQKEyBVTklTTyAtIFVuaXZlcnNpZGFkZSBkZSBTb3JvY2FiYTEMMAoG
-A1UECxMDU1BEMSgwJgYJKoZIhvcNAQkBFhl3aWxsaWFtLm9saXZlaXJhQHVuaXNv
-LmJyMREwDwYDVQQHEwhTb3JvY2FiYTETMBEGA1UECBQKU8OjbyBQYXVsbzELMAkG
-A1UEBhMCQlIxFjAUBgNVBAMTDWNhZmUudW5pc28uYnIwggEiMA0GCSqGSIb3DQEB
-AQUAA4IBDwAwggEKAoIBAQDDGWne13N4Edo+DRkrx+sQwJPnh3Xzv00KomAfcn4l
-sH8RDMHvQEEv0oV82SCvrAEqf5HatLNZyxr2gioq73CGN8ijZjDayQ5rxgLKWeVM
-+mlyuOXGGs/HQt9uFHglylC0uzM1Ns0bI2hpupKXmZvF+Mv6czX1sGlNMgLSMUvk
-wfCD4ak25YClASWwEzTzro9+kAtZV/lLWdrpENOgTU/H12QYIH7Gyjb20Mrksqu2
-5Wd5HFbyr/IwQF4FXfc6zS5soDCI2jqHJ4J/CE+JhCmJyUmbgzdGRg1smeKHpLPA
-c+q4dxHXlgG6O/Tk1tip455UbF7gevtNjxgcIOhTITftAgMBAAEwDQYJKoZIhvcN
-AQEFBQADggEBABuT+O4ZBPQXWOaifgeuaA3o7pSegZExaqy4cTjOUH8UCZfyROd8
-gU6RmIWEKGdg/8FbY+L8UjqPYXzkzGNxxbQqWBu+ytrvAeSv24alfpEmI5M9sTzj
-OBGr+lwvbMLFKrSmDGfrWAGnEcj8l7zr5+WjiFgC8TT9RRkZmI2YL4LCa+xuaAHz
-u7FcVvwdnkRaJBMW8+99YtZd1DkhGac5z3rfeJagr4h/Dn7sDglWobnX/IjblwQo
-IBDwiWpQtZ1HNQbMCNddAJHe/+AvjDz797AZB/JmPS8n2C6zX2VEbaLc58borXVA
-tM+CLQt/lQ18Q/48d2qPMVKQS2mGIhHI6wU=
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://srvcafe.uniso.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://srvcafe.uniso.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://srvcafe.uniso.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://srvcafe.uniso.br/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://srvcafe.uniso.br/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://srvcafe.uniso.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">uniso.br</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-      
-MIID1jCCAr4CAQAwDQYJKoZIhvcNAQEFBQAwgbAxKTAnBgNVBAoTIFVOSVNPIC0g
-VW5pdmVyc2lkYWRlIGRlIFNvcm9jYWJhMQwwCgYDVQQLEwNTUEQxKDAmBgkqhkiG
-9w0BCQEWGXdpbGxpYW0ub2xpdmVpcmFAdW5pc28uYnIxETAPBgNVBAcTCFNvcm9j
-YWJhMRMwEQYDVQQIFApTw6NvIFBhdWxvMQswCQYDVQQGEwJCUjEWMBQGA1UEAxMN
-Y2FmZS51bmlzby5icjAeFw0xNDA1MTYxNzAzNTBaFw0xNzA1MTUxNzAzNTBaMIGw
-MSkwJwYDVQQKEyBVTklTTyAtIFVuaXZlcnNpZGFkZSBkZSBTb3JvY2FiYTEMMAoG
-A1UECxMDU1BEMSgwJgYJKoZIhvcNAQkBFhl3aWxsaWFtLm9saXZlaXJhQHVuaXNv
-LmJyMREwDwYDVQQHEwhTb3JvY2FiYTETMBEGA1UECBQKU8OjbyBQYXVsbzELMAkG
-A1UEBhMCQlIxFjAUBgNVBAMTDWNhZmUudW5pc28uYnIwggEiMA0GCSqGSIb3DQEB
-AQUAA4IBDwAwggEKAoIBAQDDGWne13N4Edo+DRkrx+sQwJPnh3Xzv00KomAfcn4l
-sH8RDMHvQEEv0oV82SCvrAEqf5HatLNZyxr2gioq73CGN8ijZjDayQ5rxgLKWeVM
-+mlyuOXGGs/HQt9uFHglylC0uzM1Ns0bI2hpupKXmZvF+Mv6czX1sGlNMgLSMUvk
-wfCD4ak25YClASWwEzTzro9+kAtZV/lLWdrpENOgTU/H12QYIH7Gyjb20Mrksqu2
-5Wd5HFbyr/IwQF4FXfc6zS5soDCI2jqHJ4J/CE+JhCmJyUmbgzdGRg1smeKHpLPA
-c+q4dxHXlgG6O/Tk1tip455UbF7gevtNjxgcIOhTITftAgMBAAEwDQYJKoZIhvcN
-AQEFBQADggEBABuT+O4ZBPQXWOaifgeuaA3o7pSegZExaqy4cTjOUH8UCZfyROd8
-gU6RmIWEKGdg/8FbY+L8UjqPYXzkzGNxxbQqWBu+ytrvAeSv24alfpEmI5M9sTzj
-OBGr+lwvbMLFKrSmDGfrWAGnEcj8l7zr5+WjiFgC8TT9RRkZmI2YL4LCa+xuaAHz
-u7FcVvwdnkRaJBMW8+99YtZd1DkhGac5z3rfeJagr4h/Dn7sDglWobnX/IjblwQo
-IBDwiWpQtZ1HNQbMCNddAJHe/+AvjDz797AZB/JmPS8n2C6zX2VEbaLc58borXVA
-tM+CLQt/lQ18Q/48d2qPMVKQS2mGIhHI6wU=
-                    
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://srvcafe.uniso.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://srvcafe.uniso.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">Universidade de Sorocaba</OrganizationName>
-    <OrganizationName xml:lang="pt-br">Universidade de Sorocaba</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">UNISO - Universidade de Sorocaba</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="pt-br">UNISO - Universidade de Sorocaba</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.uniso.br/</OrganizationURL>
-    <OrganizationURL xml:lang="pt-br">http://www.uniso.br/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>William A Oliveira</SurName>
-    <EmailAddress>william.oliveira@uniso.br</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/srvcafe.uniso.br.xml b/swamid-interfederations-2.0/srvcafe.uniso.br.xml
deleted file mode 100644
index bb200bc5..00000000
--- a/swamid-interfederations-2.0/srvcafe.uniso.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://srvcafe.uniso.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">uniso.br</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">UNISO - Universidade de Sorocaba</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="pt-br">UNISO - Universidade de Sorocaba</mdui:DisplayName>
-        <mdui:Description xml:lang="en">UNISO - Universidade de Sorocaba</mdui:Description>
-        <mdui:Description xml:lang="pt-br">UNISO - Universidade de Sorocaba</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.uniso.br/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="pt-br">http://www.uniso.br/</mdui:InformationURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-    MIID1jCCAr4CAQAwDQYJKoZIhvcNAQEFBQAwgbAxKTAnBgNVBAoTIFVOSVNPIC0g
-VW5pdmVyc2lkYWRlIGRlIFNvcm9jYWJhMQwwCgYDVQQLEwNTUEQxKDAmBgkqhkiG
-9w0BCQEWGXdpbGxpYW0ub2xpdmVpcmFAdW5pc28uYnIxETAPBgNVBAcTCFNvcm9j
-YWJhMRMwEQYDVQQIFApTw6NvIFBhdWxvMQswCQYDVQQGEwJCUjEWMBQGA1UEAxMN
-Y2FmZS51bmlzby5icjAeFw0xNDA1MTYxNzAzNTBaFw0xNzA1MTUxNzAzNTBaMIGw
-MSkwJwYDVQQKEyBVTklTTyAtIFVuaXZlcnNpZGFkZSBkZSBTb3JvY2FiYTEMMAoG
-A1UECxMDU1BEMSgwJgYJKoZIhvcNAQkBFhl3aWxsaWFtLm9saXZlaXJhQHVuaXNv
-LmJyMREwDwYDVQQHEwhTb3JvY2FiYTETMBEGA1UECBQKU8OjbyBQYXVsbzELMAkG
-A1UEBhMCQlIxFjAUBgNVBAMTDWNhZmUudW5pc28uYnIwggEiMA0GCSqGSIb3DQEB
-AQUAA4IBDwAwggEKAoIBAQDDGWne13N4Edo+DRkrx+sQwJPnh3Xzv00KomAfcn4l
-sH8RDMHvQEEv0oV82SCvrAEqf5HatLNZyxr2gioq73CGN8ijZjDayQ5rxgLKWeVM
-+mlyuOXGGs/HQt9uFHglylC0uzM1Ns0bI2hpupKXmZvF+Mv6czX1sGlNMgLSMUvk
-wfCD4ak25YClASWwEzTzro9+kAtZV/lLWdrpENOgTU/H12QYIH7Gyjb20Mrksqu2
-5Wd5HFbyr/IwQF4FXfc6zS5soDCI2jqHJ4J/CE+JhCmJyUmbgzdGRg1smeKHpLPA
-c+q4dxHXlgG6O/Tk1tip455UbF7gevtNjxgcIOhTITftAgMBAAEwDQYJKoZIhvcN
-AQEFBQADggEBABuT+O4ZBPQXWOaifgeuaA3o7pSegZExaqy4cTjOUH8UCZfyROd8
-gU6RmIWEKGdg/8FbY+L8UjqPYXzkzGNxxbQqWBu+ytrvAeSv24alfpEmI5M9sTzj
-OBGr+lwvbMLFKrSmDGfrWAGnEcj8l7zr5+WjiFgC8TT9RRkZmI2YL4LCa+xuaAHz
-u7FcVvwdnkRaJBMW8+99YtZd1DkhGac5z3rfeJagr4h/Dn7sDglWobnX/IjblwQo
-IBDwiWpQtZ1HNQbMCNddAJHe/+AvjDz797AZB/JmPS8n2C6zX2VEbaLc58borXVA
-tM+CLQt/lQ18Q/48d2qPMVKQS2mGIhHI6wU=
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://srvcafe.uniso.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://srvcafe.uniso.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://srvcafe.uniso.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://srvcafe.uniso.br/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://srvcafe.uniso.br/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://srvcafe.uniso.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">uniso.br</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-      
-MIID1jCCAr4CAQAwDQYJKoZIhvcNAQEFBQAwgbAxKTAnBgNVBAoTIFVOSVNPIC0g
-VW5pdmVyc2lkYWRlIGRlIFNvcm9jYWJhMQwwCgYDVQQLEwNTUEQxKDAmBgkqhkiG
-9w0BCQEWGXdpbGxpYW0ub2xpdmVpcmFAdW5pc28uYnIxETAPBgNVBAcTCFNvcm9j
-YWJhMRMwEQYDVQQIFApTw6NvIFBhdWxvMQswCQYDVQQGEwJCUjEWMBQGA1UEAxMN
-Y2FmZS51bmlzby5icjAeFw0xNDA1MTYxNzAzNTBaFw0xNzA1MTUxNzAzNTBaMIGw
-MSkwJwYDVQQKEyBVTklTTyAtIFVuaXZlcnNpZGFkZSBkZSBTb3JvY2FiYTEMMAoG
-A1UECxMDU1BEMSgwJgYJKoZIhvcNAQkBFhl3aWxsaWFtLm9saXZlaXJhQHVuaXNv
-LmJyMREwDwYDVQQHEwhTb3JvY2FiYTETMBEGA1UECBQKU8OjbyBQYXVsbzELMAkG
-A1UEBhMCQlIxFjAUBgNVBAMTDWNhZmUudW5pc28uYnIwggEiMA0GCSqGSIb3DQEB
-AQUAA4IBDwAwggEKAoIBAQDDGWne13N4Edo+DRkrx+sQwJPnh3Xzv00KomAfcn4l
-sH8RDMHvQEEv0oV82SCvrAEqf5HatLNZyxr2gioq73CGN8ijZjDayQ5rxgLKWeVM
-+mlyuOXGGs/HQt9uFHglylC0uzM1Ns0bI2hpupKXmZvF+Mv6czX1sGlNMgLSMUvk
-wfCD4ak25YClASWwEzTzro9+kAtZV/lLWdrpENOgTU/H12QYIH7Gyjb20Mrksqu2
-5Wd5HFbyr/IwQF4FXfc6zS5soDCI2jqHJ4J/CE+JhCmJyUmbgzdGRg1smeKHpLPA
-c+q4dxHXlgG6O/Tk1tip455UbF7gevtNjxgcIOhTITftAgMBAAEwDQYJKoZIhvcN
-AQEFBQADggEBABuT+O4ZBPQXWOaifgeuaA3o7pSegZExaqy4cTjOUH8UCZfyROd8
-gU6RmIWEKGdg/8FbY+L8UjqPYXzkzGNxxbQqWBu+ytrvAeSv24alfpEmI5M9sTzj
-OBGr+lwvbMLFKrSmDGfrWAGnEcj8l7zr5+WjiFgC8TT9RRkZmI2YL4LCa+xuaAHz
-u7FcVvwdnkRaJBMW8+99YtZd1DkhGac5z3rfeJagr4h/Dn7sDglWobnX/IjblwQo
-IBDwiWpQtZ1HNQbMCNddAJHe/+AvjDz797AZB/JmPS8n2C6zX2VEbaLc58borXVA
-tM+CLQt/lQ18Q/48d2qPMVKQS2mGIhHI6wU=
-                    
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://srvcafe.uniso.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://srvcafe.uniso.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">Universidade de Sorocaba</OrganizationName>
-    <OrganizationName xml:lang="pt-br">Universidade de Sorocaba</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">UNISO - Universidade de Sorocaba</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="pt-br">UNISO - Universidade de Sorocaba</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.uniso.br/</OrganizationURL>
-    <OrganizationURL xml:lang="pt-br">http://www.uniso.br/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>William A Oliveira</SurName>
-    <EmailAddress>william.oliveira@uniso.br</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sse-idp.lanet.lv.xml b/swamid-interfederations-2.0/sse-idp.lanet.lv.xml
deleted file mode 100644
index 4c2fee5b..00000000
--- a/swamid-interfederations-2.0/sse-idp.lanet.lv.xml
+++ /dev/null
@@ -1,41 +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://sse-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/" registrationInstant="2013-10-10T10:10:10Z">
-      <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>
-MIIDhjCCAm4CCQC8Px9pbIuxGDANBgkqhkiG9w0BAQUFADCBhDELMAkGA1UEBhMCTFYxDTALBgNVBAgMBFJpZ2ExDTALBgNVBAcMBFJpZ2ExCzAJBgNVBAoMAkxVMQwwCgYDVQQLDANJVEQxFTATBgNVBAMMDGx1LWlkcC5sdS5sdjElMCMGCSqGSIb3DQEJARYWaXRzZXJ2aXNzIGF0IGx1IGRvdCBsdjAeFw0xMzEyMjAxMDU3MDJaFw0yOTAzMDYxMDU3MDJaMIGEMQswCQYDVQQGEwJMVjENMAsGA1UECAwEUmlnYTENMAsGA1UEBwwEUmlnYTELMAkGA1UECgwCTFUxDDAKBgNVBAsMA0lURDEVMBMGA1UEAwwMbHUtaWRwLmx1Lmx2MSUwIwYJKoZIhvcNAQkBFhZpdHNlcnZpc3MgYXQgbHUgZG90IGx2MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuAy8ri5VknGxy21iuW6kalPwg7VPZBWOuV/jVjRre44tHFd5FinCQUCuzQZn37AU3ZNZg07RRyDhkAzzpsBRQf48VcbnQFRjERuQTKUfT9hzFMxgbjxW2Dayg2Ru2LkGcIUeHilOwfmRn1NIRBN+0UyJIluRvB8YGdHSSHYSMimyw9uYEuMkU9aqewwW78w7TeasCWlB6jiGfJ/SGVtPRThJ6X6KVqoU2gwIY+V7YJkG4b5TOw4HLaIsdOmU4h1Ep3igy+Zsc/7zPn+80iwm1Jk9Q8zGlEwikjPn1N3enMOxR8wpQfAQwm5lIaHNXYFcXCj3mVQ3yQ9EzB/hRC8tHwIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQCFRpI7U/lTwoUW/HwDb2gAmjb0RSmS+5lUWDgmjP/rJwYdh672plabNcY12DiqchtBaSeTOf4qANCqEme+YBAmssFUeLx6O1J+5aXeXfCwAA9GlswGDVeC8ZnTVmQupnbvL0T+ZU8WtkltlLEJdD6o9BtEOqk3+Rspu+94d6FUwmvWB/YWypAOfzXkkSxi+87nsadiFEOyCzTW8fZotOrZMzba52ELLJgCx3IzGLUzV80PSJwLzKYHVp0VluH2DzrxfMKC01bMklG46n1nhEo1UU2KA4vzoScmrXzD+m7nKFZ3GHFjyQvtxqG7gA34qg1Vj2o2O0vN/kvjX73SR5s4
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDhjCCAm4CCQC8Px9pbIuxGDANBgkqhkiG9w0BAQUFADCBhDELMAkGA1UEBhMCTFYxDTALBgNVBAgMBFJpZ2ExDTALBgNVBAcMBFJpZ2ExCzAJBgNVBAoMAkxVMQwwCgYDVQQLDANJVEQxFTATBgNVBAMMDGx1LWlkcC5sdS5sdjElMCMGCSqGSIb3DQEJARYWaXRzZXJ2aXNzIGF0IGx1IGRvdCBsdjAeFw0xMzEyMjAxMDU3MDJaFw0yOTAzMDYxMDU3MDJaMIGEMQswCQYDVQQGEwJMVjENMAsGA1UECAwEUmlnYTENMAsGA1UEBwwEUmlnYTELMAkGA1UECgwCTFUxDDAKBgNVBAsMA0lURDEVMBMGA1UEAwwMbHUtaWRwLmx1Lmx2MSUwIwYJKoZIhvcNAQkBFhZpdHNlcnZpc3MgYXQgbHUgZG90IGx2MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuAy8ri5VknGxy21iuW6kalPwg7VPZBWOuV/jVjRre44tHFd5FinCQUCuzQZn37AU3ZNZg07RRyDhkAzzpsBRQf48VcbnQFRjERuQTKUfT9hzFMxgbjxW2Dayg2Ru2LkGcIUeHilOwfmRn1NIRBN+0UyJIluRvB8YGdHSSHYSMimyw9uYEuMkU9aqewwW78w7TeasCWlB6jiGfJ/SGVtPRThJ6X6KVqoU2gwIY+V7YJkG4b5TOw4HLaIsdOmU4h1Ep3igy+Zsc/7zPn+80iwm1Jk9Q8zGlEwikjPn1N3enMOxR8wpQfAQwm5lIaHNXYFcXCj3mVQ3yQ9EzB/hRC8tHwIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQCFRpI7U/lTwoUW/HwDb2gAmjb0RSmS+5lUWDgmjP/rJwYdh672plabNcY12DiqchtBaSeTOf4qANCqEme+YBAmssFUeLx6O1J+5aXeXfCwAA9GlswGDVeC8ZnTVmQupnbvL0T+ZU8WtkltlLEJdD6o9BtEOqk3+Rspu+94d6FUwmvWB/YWypAOfzXkkSxi+87nsadiFEOyCzTW8fZotOrZMzba52ELLJgCx3IzGLUzV80PSJwLzKYHVp0VluH2DzrxfMKC01bMklG46n1nhEo1UU2KA4vzoScmrXzD+m7nKFZ3GHFjyQvtxqG7gA34qg1Vj2o2O0vN/kvjX73SR5s4
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sse-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://sse-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 - SSE</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Stockholm School of Economics in Riga - SSE IDP</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://laife.lanet.lv/</OrganizationURL>
-    <OrganizationURL xml:lang="lv">http://www.sseriga.edu/</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/sso.dshs-koeln.de-idp-shibboleth.xml b/swamid-interfederations-2.0/sso.dshs-koeln.de-idp-shibboleth.xml
deleted file mode 100644
index aa88c9ec..00000000
--- a/swamid-interfederations-2.0/sso.dshs-koeln.de-idp-shibboleth.xml
+++ /dev/null
@@ -1,149 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sso.dshs-koeln.de/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2014-10-01T10:15:58Z">
-      <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">dshs-koeln.de</saml1md:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="de">Deutsche Sporthochschule Köln</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">German Sport University Cologne</mdui:DisplayName>
-        <mdui:Description xml:lang="de">Die Deutsche Sporthochschule Köln, 1947 in Köln gegründet, vereint qualifizierte Lehre, internationale Forschung und Spitzensport auf höchstem Niveau. Sie ist Deutschlands einzige Universität, die sich ausschließlich dem Themenfeld Sport und Bewegung widmet. Während an anderen Universitäten die Sportwissenschaft neben vielen weiteren Fachgebieten besteht, findet man in Köln eine außergewöhnliche Situation vor: An 21 Instituten, vier An-Instituten und neun wissenschaftlichen Zentren wird das vielfältige und spannende Gebiet der Sportwissenschaft in allen seinen Facetten detailliert unter die Lupe genommen.</mdui:Description>
-        <mdui:Description xml:lang="en">The University is recognized internationally for its research: the Faculty of Biochemistry’s renowned testing laboratory has been a part of the international fight against doping, experiments conducted at the Faculty of Physiology and Anatomy have soared with the astronauts into space, and the Research Centre for Performance Sport has brought together the combined efforts of multiple departments to coach and supervise elite athletes. The 21 faculties at the German Sport University Cologne – from education and humanities to social sciences and biomedicine – offer a diverse array of teaching and research opportunities to the university’s some 5,300 students from more than 60 countries. The campus, located directly across from the Muengersdorf Sport Park, provides students and staff alike a first-class environment for learning, working, and living.</mdui:Description>
-        <mdui:Logo height="16" width="16">https://sso.dshs-koeln.de/logo_dshs_kl.png</mdui:Logo>
-        <mdui:Logo height="66" width="65">https://sso.dshs-koeln.de/logo_dshs_gr.png</mdui:Logo>
-        <mdui:InformationURL xml:lang="de">http://www.dshs-koeln.de/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">http://www.dshs-koeln.de/english/</mdui:InformationURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>sso.dshs-koeln.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=sso.dshs-koeln.de,OU=Dezernat 5.3,O=Deutsche Sporthochschule Koeln,L=Koeln,ST=Nordrhein-Westfalen,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIGQDCCBSigAwIBAgIHGEspqdzPezANBgkqhkiG9w0BAQsFADCBwzELMAkGA1UE
-BhMCREUxJzAlBgNVBAoTHkRldXRzY2hlIFNwb3J0aG9jaHNjaHVsZSBLb2VsbjE7
-MDkGA1UECxMySW5mb3JtYXRpb25zLSB1bmQgS29tbXVuaWthdGlvbnN0ZWNobm9s
-b2dpZXplbnRydW0xLDAqBgNVBAMTI0RldXRzY2hlIFNwb3J0aG9jaHNjaHVsZSBL
-b2VsbiAtIENBMSAwHgYJKoZIhvcNAQkBFhFpdWtAZHNocy1rb2Vsbi5kZTAeFw0x
-NDEwMDEwNzI0MDlaFw0xOTA3MDkyMzU5MDBaMIGXMQswCQYDVQQGEwJERTEcMBoG
-A1UECBMTTm9yZHJoZWluLVdlc3RmYWxlbjEOMAwGA1UEBxMFS29lbG4xJzAlBgNV
-BAoTHkRldXRzY2hlIFNwb3J0aG9jaHNjaHVsZSBLb2VsbjEVMBMGA1UECxMMRGV6
-ZXJuYXQgNS4zMRowGAYDVQQDExFzc28uZHNocy1rb2Vsbi5kZTCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBAL2riKeEOiwcQmimbBWijXL5rg2SZJ+qWeqU
-z7S0FWoJnmVxWiDbI2+oxPILr1KDDa30ka/V985R31PJnHkf0vu8l+AIC9yBg51x
-bSml9vAeWhlxXczWw/KTGTxhIwdPOndIvvyaOsuBWQ9FLfJpx76d+MRiwiF5O1S8
-hVVytEOeJ4SvjL7z8kLXZ7G7jqS7yXzP4XY4jo4xzZuQMiXh8o8pD8vVK8dR2Cge
-js3F66inRV3FcWzt0XToYiFUGBTvDUpFVf62mS33xca9qSGmmxRgEDEN9zj2HAtc
-pq6bKYTSvTzvEBDzcoJqj7ZWe2ie9KGbckZfgG5ZKR1wALoiNGkCAwEAAaOCAmEw
-ggJdME8GA1UdIARIMEYwEQYPKwYBBAGBrSGCLAEBBAMCMBEGDysGAQQBga0hgiwC
-AQQDATAPBg0rBgEEAYGtIYIsAQEEMA0GCysGAQQBga0hgiweMAkGA1UdEwQCMAAw
-CwYDVR0PBAQDAgXgMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATAdBgNV
-HQ4EFgQUnr4i0Cl7HcLzIJgupNIWDcJr3RMwHwYDVR0jBBgwFoAUzq4uABegkDVE
-JDZfI3unKqZmtWswMwYDVR0RBCwwKoIRc3NvLmRzaHMta29lbG4uZGWBFXN1cHBv
-cnRAZHNocy1rb2Vsbi5kZTCBhQYDVR0fBH4wfDA8oDqgOIY2aHR0cDovL2NkcDEu
-cGNhLmRmbi5kZS9kc2hzLWtvZWxuLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMDygOqA4
-hjZodHRwOi8vY2RwMi5wY2EuZGZuLmRlL2RzaHMta29lbG4tY2EvcHViL2NybC9j
-YWNybC5jcmwwgdUGCCsGAQUFBwEBBIHIMIHFMDMGCCsGAQUFBzABhidodHRwOi8v
-b2NzcC5wY2EuZGZuLmRlL09DU1AtU2VydmVyL09DU1AwRgYIKwYBBQUHMAKGOmh0
-dHA6Ly9jZHAxLnBjYS5kZm4uZGUvZHNocy1rb2Vsbi1jYS9wdWIvY2FjZXJ0L2Nh
-Y2VydC5jcnQwRgYIKwYBBQUHMAKGOmh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvZHNo
-cy1rb2Vsbi1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwDQYJKoZIhvcNAQELBQAD
-ggEBACm4urG18LsstWwUGDNyqslC0YKihGbClQKXHR6i9Ugmo30JnvpzrUNGLx20
-vM6lxmEGAZjs/l4JfPS8zSXvlU7YkHkoe6CaFqGLqfiXgbDvdydlPe6HmnW6xbI2
-fG+4lt5v58MmN7q30ttxTCiZWN83JwFj2xNIVpf07AdKZJuG/7MG+Lp7LLw56hpe
-rVDHH6cFq6xSr3qPv4NSJf+iHCa0MkpoqEENLXLFnrtan5l5sHYAJcr7smR2h9oS
-IvDoviW6Ttfq6uEFX0ymhUa7KPkTaU2+ywlqjlvNYEENl+V2Pa7m+Mmh4Df550WD
-G6UwcO6gyha4+bma6xJXYLqJqPE=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://sso.dshs-koeln.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sso.dshs-koeln.de:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sso.dshs-koeln.de/idp/profile/SAML2/Redirect/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sso.dshs-koeln.de/idp/profile/SAML2/POST/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sso.dshs-koeln.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://sso.dshs-koeln.de/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sso.dshs-koeln.de/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sso.dshs-koeln.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sso.dshs-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">dshs-koeln.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>sso.dshs-koeln.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=sso.dshs-koeln.de,OU=Dezernat 5.3,O=Deutsche Sporthochschule Koeln,L=Koeln,ST=Nordrhein-Westfalen,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIGQDCCBSigAwIBAgIHGEspqdzPezANBgkqhkiG9w0BAQsFADCBwzELMAkGA1UE
-BhMCREUxJzAlBgNVBAoTHkRldXRzY2hlIFNwb3J0aG9jaHNjaHVsZSBLb2VsbjE7
-MDkGA1UECxMySW5mb3JtYXRpb25zLSB1bmQgS29tbXVuaWthdGlvbnN0ZWNobm9s
-b2dpZXplbnRydW0xLDAqBgNVBAMTI0RldXRzY2hlIFNwb3J0aG9jaHNjaHVsZSBL
-b2VsbiAtIENBMSAwHgYJKoZIhvcNAQkBFhFpdWtAZHNocy1rb2Vsbi5kZTAeFw0x
-NDEwMDEwNzI0MDlaFw0xOTA3MDkyMzU5MDBaMIGXMQswCQYDVQQGEwJERTEcMBoG
-A1UECBMTTm9yZHJoZWluLVdlc3RmYWxlbjEOMAwGA1UEBxMFS29lbG4xJzAlBgNV
-BAoTHkRldXRzY2hlIFNwb3J0aG9jaHNjaHVsZSBLb2VsbjEVMBMGA1UECxMMRGV6
-ZXJuYXQgNS4zMRowGAYDVQQDExFzc28uZHNocy1rb2Vsbi5kZTCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBAL2riKeEOiwcQmimbBWijXL5rg2SZJ+qWeqU
-z7S0FWoJnmVxWiDbI2+oxPILr1KDDa30ka/V985R31PJnHkf0vu8l+AIC9yBg51x
-bSml9vAeWhlxXczWw/KTGTxhIwdPOndIvvyaOsuBWQ9FLfJpx76d+MRiwiF5O1S8
-hVVytEOeJ4SvjL7z8kLXZ7G7jqS7yXzP4XY4jo4xzZuQMiXh8o8pD8vVK8dR2Cge
-js3F66inRV3FcWzt0XToYiFUGBTvDUpFVf62mS33xca9qSGmmxRgEDEN9zj2HAtc
-pq6bKYTSvTzvEBDzcoJqj7ZWe2ie9KGbckZfgG5ZKR1wALoiNGkCAwEAAaOCAmEw
-ggJdME8GA1UdIARIMEYwEQYPKwYBBAGBrSGCLAEBBAMCMBEGDysGAQQBga0hgiwC
-AQQDATAPBg0rBgEEAYGtIYIsAQEEMA0GCysGAQQBga0hgiweMAkGA1UdEwQCMAAw
-CwYDVR0PBAQDAgXgMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATAdBgNV
-HQ4EFgQUnr4i0Cl7HcLzIJgupNIWDcJr3RMwHwYDVR0jBBgwFoAUzq4uABegkDVE
-JDZfI3unKqZmtWswMwYDVR0RBCwwKoIRc3NvLmRzaHMta29lbG4uZGWBFXN1cHBv
-cnRAZHNocy1rb2Vsbi5kZTCBhQYDVR0fBH4wfDA8oDqgOIY2aHR0cDovL2NkcDEu
-cGNhLmRmbi5kZS9kc2hzLWtvZWxuLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMDygOqA4
-hjZodHRwOi8vY2RwMi5wY2EuZGZuLmRlL2RzaHMta29lbG4tY2EvcHViL2NybC9j
-YWNybC5jcmwwgdUGCCsGAQUFBwEBBIHIMIHFMDMGCCsGAQUFBzABhidodHRwOi8v
-b2NzcC5wY2EuZGZuLmRlL09DU1AtU2VydmVyL09DU1AwRgYIKwYBBQUHMAKGOmh0
-dHA6Ly9jZHAxLnBjYS5kZm4uZGUvZHNocy1rb2Vsbi1jYS9wdWIvY2FjZXJ0L2Nh
-Y2VydC5jcnQwRgYIKwYBBQUHMAKGOmh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvZHNo
-cy1rb2Vsbi1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwDQYJKoZIhvcNAQELBQAD
-ggEBACm4urG18LsstWwUGDNyqslC0YKihGbClQKXHR6i9Ugmo30JnvpzrUNGLx20
-vM6lxmEGAZjs/l4JfPS8zSXvlU7YkHkoe6CaFqGLqfiXgbDvdydlPe6HmnW6xbI2
-fG+4lt5v58MmN7q30ttxTCiZWN83JwFj2xNIVpf07AdKZJuG/7MG+Lp7LLw56hpe
-rVDHH6cFq6xSr3qPv4NSJf+iHCa0MkpoqEENLXLFnrtan5l5sHYAJcr7smR2h9oS
-IvDoviW6Ttfq6uEFX0ymhUa7KPkTaU2+ywlqjlvNYEENl+V2Pa7m+Mmh4Df550WD
-G6UwcO6gyha4+bma6xJXYLqJqPE=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://sso.dshs-koeln.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sso.dshs-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>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">e421</OrganizationName>
-    <OrganizationName xml:lang="en">e421</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">Deutsche Sporthochschule Köln</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">German Sport University Cologne</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.dshs-koeln.de</OrganizationURL>
-    <OrganizationURL xml:lang="en">http://www.dshs-koeln.de/english/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Helpdesk</GivenName>
-    <SurName>DSHS</SurName>
-    <EmailAddress>mailto:support@dshs-koeln.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Silke</GivenName>
-    <SurName>Knorr</SurName>
-    <EmailAddress>mailto:s.knorr@dshs-koeln.de</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sso.dshs-koeln.de.xml b/swamid-interfederations-2.0/sso.dshs-koeln.de.xml
deleted file mode 100644
index aa88c9ec..00000000
--- a/swamid-interfederations-2.0/sso.dshs-koeln.de.xml
+++ /dev/null
@@ -1,149 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sso.dshs-koeln.de/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2014-10-01T10:15:58Z">
-      <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">dshs-koeln.de</saml1md:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="de">Deutsche Sporthochschule Köln</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">German Sport University Cologne</mdui:DisplayName>
-        <mdui:Description xml:lang="de">Die Deutsche Sporthochschule Köln, 1947 in Köln gegründet, vereint qualifizierte Lehre, internationale Forschung und Spitzensport auf höchstem Niveau. Sie ist Deutschlands einzige Universität, die sich ausschließlich dem Themenfeld Sport und Bewegung widmet. Während an anderen Universitäten die Sportwissenschaft neben vielen weiteren Fachgebieten besteht, findet man in Köln eine außergewöhnliche Situation vor: An 21 Instituten, vier An-Instituten und neun wissenschaftlichen Zentren wird das vielfältige und spannende Gebiet der Sportwissenschaft in allen seinen Facetten detailliert unter die Lupe genommen.</mdui:Description>
-        <mdui:Description xml:lang="en">The University is recognized internationally for its research: the Faculty of Biochemistry’s renowned testing laboratory has been a part of the international fight against doping, experiments conducted at the Faculty of Physiology and Anatomy have soared with the astronauts into space, and the Research Centre for Performance Sport has brought together the combined efforts of multiple departments to coach and supervise elite athletes. The 21 faculties at the German Sport University Cologne – from education and humanities to social sciences and biomedicine – offer a diverse array of teaching and research opportunities to the university’s some 5,300 students from more than 60 countries. The campus, located directly across from the Muengersdorf Sport Park, provides students and staff alike a first-class environment for learning, working, and living.</mdui:Description>
-        <mdui:Logo height="16" width="16">https://sso.dshs-koeln.de/logo_dshs_kl.png</mdui:Logo>
-        <mdui:Logo height="66" width="65">https://sso.dshs-koeln.de/logo_dshs_gr.png</mdui:Logo>
-        <mdui:InformationURL xml:lang="de">http://www.dshs-koeln.de/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">http://www.dshs-koeln.de/english/</mdui:InformationURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>sso.dshs-koeln.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=sso.dshs-koeln.de,OU=Dezernat 5.3,O=Deutsche Sporthochschule Koeln,L=Koeln,ST=Nordrhein-Westfalen,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIGQDCCBSigAwIBAgIHGEspqdzPezANBgkqhkiG9w0BAQsFADCBwzELMAkGA1UE
-BhMCREUxJzAlBgNVBAoTHkRldXRzY2hlIFNwb3J0aG9jaHNjaHVsZSBLb2VsbjE7
-MDkGA1UECxMySW5mb3JtYXRpb25zLSB1bmQgS29tbXVuaWthdGlvbnN0ZWNobm9s
-b2dpZXplbnRydW0xLDAqBgNVBAMTI0RldXRzY2hlIFNwb3J0aG9jaHNjaHVsZSBL
-b2VsbiAtIENBMSAwHgYJKoZIhvcNAQkBFhFpdWtAZHNocy1rb2Vsbi5kZTAeFw0x
-NDEwMDEwNzI0MDlaFw0xOTA3MDkyMzU5MDBaMIGXMQswCQYDVQQGEwJERTEcMBoG
-A1UECBMTTm9yZHJoZWluLVdlc3RmYWxlbjEOMAwGA1UEBxMFS29lbG4xJzAlBgNV
-BAoTHkRldXRzY2hlIFNwb3J0aG9jaHNjaHVsZSBLb2VsbjEVMBMGA1UECxMMRGV6
-ZXJuYXQgNS4zMRowGAYDVQQDExFzc28uZHNocy1rb2Vsbi5kZTCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBAL2riKeEOiwcQmimbBWijXL5rg2SZJ+qWeqU
-z7S0FWoJnmVxWiDbI2+oxPILr1KDDa30ka/V985R31PJnHkf0vu8l+AIC9yBg51x
-bSml9vAeWhlxXczWw/KTGTxhIwdPOndIvvyaOsuBWQ9FLfJpx76d+MRiwiF5O1S8
-hVVytEOeJ4SvjL7z8kLXZ7G7jqS7yXzP4XY4jo4xzZuQMiXh8o8pD8vVK8dR2Cge
-js3F66inRV3FcWzt0XToYiFUGBTvDUpFVf62mS33xca9qSGmmxRgEDEN9zj2HAtc
-pq6bKYTSvTzvEBDzcoJqj7ZWe2ie9KGbckZfgG5ZKR1wALoiNGkCAwEAAaOCAmEw
-ggJdME8GA1UdIARIMEYwEQYPKwYBBAGBrSGCLAEBBAMCMBEGDysGAQQBga0hgiwC
-AQQDATAPBg0rBgEEAYGtIYIsAQEEMA0GCysGAQQBga0hgiweMAkGA1UdEwQCMAAw
-CwYDVR0PBAQDAgXgMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATAdBgNV
-HQ4EFgQUnr4i0Cl7HcLzIJgupNIWDcJr3RMwHwYDVR0jBBgwFoAUzq4uABegkDVE
-JDZfI3unKqZmtWswMwYDVR0RBCwwKoIRc3NvLmRzaHMta29lbG4uZGWBFXN1cHBv
-cnRAZHNocy1rb2Vsbi5kZTCBhQYDVR0fBH4wfDA8oDqgOIY2aHR0cDovL2NkcDEu
-cGNhLmRmbi5kZS9kc2hzLWtvZWxuLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMDygOqA4
-hjZodHRwOi8vY2RwMi5wY2EuZGZuLmRlL2RzaHMta29lbG4tY2EvcHViL2NybC9j
-YWNybC5jcmwwgdUGCCsGAQUFBwEBBIHIMIHFMDMGCCsGAQUFBzABhidodHRwOi8v
-b2NzcC5wY2EuZGZuLmRlL09DU1AtU2VydmVyL09DU1AwRgYIKwYBBQUHMAKGOmh0
-dHA6Ly9jZHAxLnBjYS5kZm4uZGUvZHNocy1rb2Vsbi1jYS9wdWIvY2FjZXJ0L2Nh
-Y2VydC5jcnQwRgYIKwYBBQUHMAKGOmh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvZHNo
-cy1rb2Vsbi1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwDQYJKoZIhvcNAQELBQAD
-ggEBACm4urG18LsstWwUGDNyqslC0YKihGbClQKXHR6i9Ugmo30JnvpzrUNGLx20
-vM6lxmEGAZjs/l4JfPS8zSXvlU7YkHkoe6CaFqGLqfiXgbDvdydlPe6HmnW6xbI2
-fG+4lt5v58MmN7q30ttxTCiZWN83JwFj2xNIVpf07AdKZJuG/7MG+Lp7LLw56hpe
-rVDHH6cFq6xSr3qPv4NSJf+iHCa0MkpoqEENLXLFnrtan5l5sHYAJcr7smR2h9oS
-IvDoviW6Ttfq6uEFX0ymhUa7KPkTaU2+ywlqjlvNYEENl+V2Pa7m+Mmh4Df550WD
-G6UwcO6gyha4+bma6xJXYLqJqPE=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://sso.dshs-koeln.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sso.dshs-koeln.de:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sso.dshs-koeln.de/idp/profile/SAML2/Redirect/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sso.dshs-koeln.de/idp/profile/SAML2/POST/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sso.dshs-koeln.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://sso.dshs-koeln.de/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sso.dshs-koeln.de/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sso.dshs-koeln.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sso.dshs-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">dshs-koeln.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>sso.dshs-koeln.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=sso.dshs-koeln.de,OU=Dezernat 5.3,O=Deutsche Sporthochschule Koeln,L=Koeln,ST=Nordrhein-Westfalen,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIGQDCCBSigAwIBAgIHGEspqdzPezANBgkqhkiG9w0BAQsFADCBwzELMAkGA1UE
-BhMCREUxJzAlBgNVBAoTHkRldXRzY2hlIFNwb3J0aG9jaHNjaHVsZSBLb2VsbjE7
-MDkGA1UECxMySW5mb3JtYXRpb25zLSB1bmQgS29tbXVuaWthdGlvbnN0ZWNobm9s
-b2dpZXplbnRydW0xLDAqBgNVBAMTI0RldXRzY2hlIFNwb3J0aG9jaHNjaHVsZSBL
-b2VsbiAtIENBMSAwHgYJKoZIhvcNAQkBFhFpdWtAZHNocy1rb2Vsbi5kZTAeFw0x
-NDEwMDEwNzI0MDlaFw0xOTA3MDkyMzU5MDBaMIGXMQswCQYDVQQGEwJERTEcMBoG
-A1UECBMTTm9yZHJoZWluLVdlc3RmYWxlbjEOMAwGA1UEBxMFS29lbG4xJzAlBgNV
-BAoTHkRldXRzY2hlIFNwb3J0aG9jaHNjaHVsZSBLb2VsbjEVMBMGA1UECxMMRGV6
-ZXJuYXQgNS4zMRowGAYDVQQDExFzc28uZHNocy1rb2Vsbi5kZTCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBAL2riKeEOiwcQmimbBWijXL5rg2SZJ+qWeqU
-z7S0FWoJnmVxWiDbI2+oxPILr1KDDa30ka/V985R31PJnHkf0vu8l+AIC9yBg51x
-bSml9vAeWhlxXczWw/KTGTxhIwdPOndIvvyaOsuBWQ9FLfJpx76d+MRiwiF5O1S8
-hVVytEOeJ4SvjL7z8kLXZ7G7jqS7yXzP4XY4jo4xzZuQMiXh8o8pD8vVK8dR2Cge
-js3F66inRV3FcWzt0XToYiFUGBTvDUpFVf62mS33xca9qSGmmxRgEDEN9zj2HAtc
-pq6bKYTSvTzvEBDzcoJqj7ZWe2ie9KGbckZfgG5ZKR1wALoiNGkCAwEAAaOCAmEw
-ggJdME8GA1UdIARIMEYwEQYPKwYBBAGBrSGCLAEBBAMCMBEGDysGAQQBga0hgiwC
-AQQDATAPBg0rBgEEAYGtIYIsAQEEMA0GCysGAQQBga0hgiweMAkGA1UdEwQCMAAw
-CwYDVR0PBAQDAgXgMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATAdBgNV
-HQ4EFgQUnr4i0Cl7HcLzIJgupNIWDcJr3RMwHwYDVR0jBBgwFoAUzq4uABegkDVE
-JDZfI3unKqZmtWswMwYDVR0RBCwwKoIRc3NvLmRzaHMta29lbG4uZGWBFXN1cHBv
-cnRAZHNocy1rb2Vsbi5kZTCBhQYDVR0fBH4wfDA8oDqgOIY2aHR0cDovL2NkcDEu
-cGNhLmRmbi5kZS9kc2hzLWtvZWxuLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMDygOqA4
-hjZodHRwOi8vY2RwMi5wY2EuZGZuLmRlL2RzaHMta29lbG4tY2EvcHViL2NybC9j
-YWNybC5jcmwwgdUGCCsGAQUFBwEBBIHIMIHFMDMGCCsGAQUFBzABhidodHRwOi8v
-b2NzcC5wY2EuZGZuLmRlL09DU1AtU2VydmVyL09DU1AwRgYIKwYBBQUHMAKGOmh0
-dHA6Ly9jZHAxLnBjYS5kZm4uZGUvZHNocy1rb2Vsbi1jYS9wdWIvY2FjZXJ0L2Nh
-Y2VydC5jcnQwRgYIKwYBBQUHMAKGOmh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvZHNo
-cy1rb2Vsbi1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwDQYJKoZIhvcNAQELBQAD
-ggEBACm4urG18LsstWwUGDNyqslC0YKihGbClQKXHR6i9Ugmo30JnvpzrUNGLx20
-vM6lxmEGAZjs/l4JfPS8zSXvlU7YkHkoe6CaFqGLqfiXgbDvdydlPe6HmnW6xbI2
-fG+4lt5v58MmN7q30ttxTCiZWN83JwFj2xNIVpf07AdKZJuG/7MG+Lp7LLw56hpe
-rVDHH6cFq6xSr3qPv4NSJf+iHCa0MkpoqEENLXLFnrtan5l5sHYAJcr7smR2h9oS
-IvDoviW6Ttfq6uEFX0ymhUa7KPkTaU2+ywlqjlvNYEENl+V2Pa7m+Mmh4Df550WD
-G6UwcO6gyha4+bma6xJXYLqJqPE=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://sso.dshs-koeln.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sso.dshs-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>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">e421</OrganizationName>
-    <OrganizationName xml:lang="en">e421</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">Deutsche Sporthochschule Köln</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">German Sport University Cologne</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.dshs-koeln.de</OrganizationURL>
-    <OrganizationURL xml:lang="en">http://www.dshs-koeln.de/english/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Helpdesk</GivenName>
-    <SurName>DSHS</SurName>
-    <EmailAddress>mailto:support@dshs-koeln.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Silke</GivenName>
-    <SurName>Knorr</SurName>
-    <EmailAddress>mailto:s.knorr@dshs-koeln.de</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sso.institutoptique.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/sso.institutoptique.fr-idp-shibboleth.xml
deleted file mode 100644
index 1ab9794b..00000000
--- a/swamid-interfederations-2.0/sso.institutoptique.fr-idp-shibboleth.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.institutoptique.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2013-10-28T09:58:07Z">
-      <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">institutoptique.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Institut Optique Graduate School</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Students, Research, Teachers</mdui:Description>
-        <mdui:DisplayName xml:lang="fr">Institut Optique Graduate School</mdui:DisplayName>
-        <mdui:Description xml:lang="fr">Etudiants, Chercheurs, Enseignants</mdui:Description>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIFejCCBGKgAwIBAgIRAKt1DGxPKyjT+KkLO4BnO6YwDQYJKoZIhvcNAQEFBQAw
-NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-IFNTTCBDQTAeFw0xNDA2MDIwMDAwMDBaFw0xNzA2MDEyMzU5NTlaMEQxITAfBgNV
-BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEfMB0GA1UEAxMWc3NvLmluc3Rp
-dHV0b3B0aXF1ZS5mcjCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBALVr
-AcvdrBs6huG/Vz/cHCC0/fyl5qlak+6TiHXlnKp7dhZkjGHFpD09eql2SPCYro1o
-6Ar/RSvTR9HHHf/sJm2GK2s8qgbOiMdNPsBPKAOTSPKltfDvUP+WMTI+pbocnGCo
-UzOtRHMZyloVNbEd/LwNKJpFqwl/Y2JZSSZtekzt9TcS6glpYuSCQDFU+CZS/tjP
-Lt5UqQOJ7zR3FHRfbTOuf/RBo2ubXZLIoZfCTDHymZCv5SBEoDXCn9hHAhQHZowO
-DfXa4RW+dRvAByklsEli6IlOxvT6jS7qMqjcM529KyAF7b/kJrENLrP3fERHCxuV
-WnVTNjxWfygeuHmNbsbL5aWjDItyDFfqcx57pNVv8FFoohzLLc53Y32ZI1CUEbut
-HbtZH57FLgBNuqqU7NWfhrQMSMtPfBnVvKFzAnawRx4fEtQ/dH1bh+Q8mu7Nz0jT
-ASjclOuStczj3tgpek6aJMM7KewNT5WRxB8nmNOXC8POzpwHTELWA8dgfwMs27Yd
-jyoR7VUT+yL5OQMNPCDrfRcJBWsFeTVRmM56f6J1KvcTtVTaGgC26yU9H9WxKlOu
-1PIy1W2WQRAVENAfwDVwGGE9z7Lr+wMyYOZYX4RzthK+q082Ae2dlFkp1zcG1RIp
-DIZz41X/DXp7FFZqXwkFiS7ZXzDNwkfM6dda/yjzAgMBAAGjggFzMIIBbzAfBgNV
-HSMEGDAWgBQMvZNoDPPeq6NJays3V0fqkOO57TAdBgNVHQ4EFgQUpZEFQu6gLZl1
-4DFbyX8+XdInof8wDgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0l
-BBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMCIGA1UdIAQbMBkwDQYLKwYBBAGyMQEC
-Ah0wCAYGZ4EMAQIBMDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRl
-cmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEF
-BQcwAoYpaHR0cDovL2NydC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQw
-JgYIKwYBBQUHMAGGGmh0dHA6Ly9vY3NwLnRjcy50ZXJlbmEub3JnMCEGA1UdEQQa
-MBiCFnNzby5pbnN0aXR1dG9wdGlxdWUuZnIwDQYJKoZIhvcNAQEFBQADggEBAIY6
-aA9g6qNL/9BruQSSjfgt4HrJUi+agJVEbXDumUNkulhD3QRJroMgZsooizhdfdpz
-7o+yQgIjjhfApH3NOG1LdszkldblDYNVM33TvFlsr/WZyTqSQWnqt85NyM9HFbhw
-9zCXUBd0F3uJ9blJaKDJ80YonJCLZPiuJT1Zdia1DxbHgOwwIeXQgK86xfF9SPS1
-8GZ1MoKXoeR8yrZtYX7euYUSA4WIXaYlly7Kdvn71HchIPtyIEXawgqz0o+zCrGJ
-r2c1GxaK4fuoO5o/aTwbFses0hEp90ifjjWFNdbgbXKbGavGvkHWEe99mSgqvI/T
-LO/bpMuPwFH27VaJTuo=
-					    </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>
-					      MIIHeTCCBmGgAwIBAgIQWjSQUhWiEPpRYjoY6ThcITANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTEzMTAyODAwMDAwMFoXDTE2MTAyNzIzNTk1OVowRDEhMB8GA1UE
-CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMR8wHQYDVQQDExZzc28uaW5zdGl0
-dXRvcHRpcXVlLmZyMIIEIjANBgkqhkiG9w0BAQEFAAOCBA8AMIIECgKCBAEA1gzs
-ryM0GS+EdHhf8FK8ukAp4FfI5y1L+4DJR2kvbCfOFpDWrlJWWh0O2j9HQIyKh1Wc
-Bv1Hh5RxM55oiHjt2cDCDAlD8gEXAffMatRkxAx179WQiB9/mN0KXbkxm45xhM5t
-zznKIlQ9A+bkXMo/NE+LtYlGUSgF9ybX7/exeEtVxBcTfIQGGkM92mJR6shz3KYu
-kciPWKUxAyNzkWaXtbt/azMRfhICnQU34IKWlQlB7UPbI7CogGNTXAOW3YASSSrn
-DejB+iQ7cHjYy5u0HkIuixICqdj7AcEmlsu3xgYes05T0h03PgLvVSCZ75378lJb
-PKZkyZ9QZpxnW7WAUHXeGDmxfyxj4jlT+mocxRFe6ZIBySQT34pmyMsvkehObCsw
-AlnbfnmWMUVKWEtVDwS9lUQwF7i3MepsFefRIWoLDYv46wN45fB2bZr7E0xfbL3F
-3qJeTN8bbjpNaeKXrFctahGz4Ny9u+Vae5TtTZTeM840ptTznTrRazgK1071R0fb
-HvodQLmBPSm2rr5KcLOC5OVUriqE/Z4lE0jI8N3qWEyLe938NsaqsdvCf3kqN86n
-VdggmJGHioxmuqlMsxJqJRvTolyDbeSnpoz3c74U8Szu0u4dm5rILBVLYp7KaIn1
-W1rnCaLmgxqICyT/8WSOyyfw9h4HshOdmSlqjjEMaoskYSRP41tVP66nSw7rBvYo
-oxN+YEG47Op/Sooabonrtpg33zgMz3Diroy1ezIvRxzdGpour1uYImfSqOMM/h2e
-WwfQ7H68RdqDhB52Z1FUvOHOmSgtY2J/oxrPnWtlpUpORhEa/8ZUAXIn8qAdygJY
-j02HQWGsXCDpy6jyi9+terK2Q4+IxwuiJFgLtl4+/Gm0QmH56/OCuzajg1gB2m/S
-1C/6mA/iBn6lftwhRSD0DKitxMcAur3GdZ9DBxOYogdFnP1GLG+Y1fZcPv0d9E+s
-F0h6q1IUoWDMle+HuAuD6J/+Y2w+1vdcPHYaEgtGMCN6nnR9o24IjcCLbD3OKEcO
-af1uSHAbcwA2x3faNXWBRdKLG194vqQLOwvNFHIFXlwI7nJgyOGc7eVo5oDQ+735
-9GEUG0/5zsuWaXWN3i/NYbBDRjtDCIYZG2QlNkSzPRQp9HJM0PmBDBd+WTooxngC
-1x4Bs1JY4799o2x797GSmJhJ2X/fo8ECu+l76mQfWS/7apbjb7MKKnj2JySAToXW
-TggrnchTD7p8SQWfUpSQ6QKwi8IDbN74dB6eO2r1m8rMQ5W/rwF9mH99THOPC0/r
-zGhXgv2V+8GeraFLqHRFKYv8ebti9wmXRYCyHzsCZOWqk1Aq0q1HhUo/6IKSw8XC
-o2lKCW8Xv7hZca+xFwIDAQABo4IBczCCAW8wHwYDVR0jBBgwFoAUDL2TaAzz3quj
-SWsrN1dH6pDjue0wHQYDVR0OBBYEFADhl3EMHhYhjBx83CTvMTrmmcGXMA4GA1Ud
-DwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggr
-BgEFBQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNV
-HR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNT
-TENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQu
-dGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRw
-Oi8vb2NzcC50Y3MudGVyZW5hLm9yZzAhBgNVHREEGjAYghZzc28uaW5zdGl0dXRv
-cHRpcXVlLmZyMA0GCSqGSIb3DQEBBQUAA4IBAQB5jJF6U+ahW/I6o3YXEwqjI32b
-h38zILufAMgajUdH08QFhu2qibjouVB0M3q6/LQ/SrZuaBZvow3kSrsFuQc5TZ+R
-TxxUyt6nT+6DF0UM3/vIZ+8I54cbc2hl9ATVdqHGZ8A+mGGi/tlcqu3P3SOsNWyl
-JIscj5oZrqDXjdb0meoWDILiKwy+kr11Lu4Wf3wncg+0FR3OdlhJtTXpX0YtrZZR
-kL2Het7Oq+k/IfazfLgyefA0ePXmqqtlJPG0YP+MX/t2tympn8mP0Bt2vcpuv2sy
-rfK4yIfD2vtoGN7lNMyamyMzlgmgILv8/anc8mkamyETrRiWjS1RPu74fEku
-					    </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://sso.institutoptique.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sso.institutoptique.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://sso.institutoptique.fr/idp/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Institut Optique Graduate School</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Institut Optique Graduate School</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <EmailAddress>service.info@institutoptique.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sso.institutoptique.fr.xml b/swamid-interfederations-2.0/sso.institutoptique.fr.xml
deleted file mode 100644
index 1ab9794b..00000000
--- a/swamid-interfederations-2.0/sso.institutoptique.fr.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.institutoptique.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2013-10-28T09:58:07Z">
-      <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">institutoptique.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Institut Optique Graduate School</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Students, Research, Teachers</mdui:Description>
-        <mdui:DisplayName xml:lang="fr">Institut Optique Graduate School</mdui:DisplayName>
-        <mdui:Description xml:lang="fr">Etudiants, Chercheurs, Enseignants</mdui:Description>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIFejCCBGKgAwIBAgIRAKt1DGxPKyjT+KkLO4BnO6YwDQYJKoZIhvcNAQEFBQAw
-NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-IFNTTCBDQTAeFw0xNDA2MDIwMDAwMDBaFw0xNzA2MDEyMzU5NTlaMEQxITAfBgNV
-BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEfMB0GA1UEAxMWc3NvLmluc3Rp
-dHV0b3B0aXF1ZS5mcjCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBALVr
-AcvdrBs6huG/Vz/cHCC0/fyl5qlak+6TiHXlnKp7dhZkjGHFpD09eql2SPCYro1o
-6Ar/RSvTR9HHHf/sJm2GK2s8qgbOiMdNPsBPKAOTSPKltfDvUP+WMTI+pbocnGCo
-UzOtRHMZyloVNbEd/LwNKJpFqwl/Y2JZSSZtekzt9TcS6glpYuSCQDFU+CZS/tjP
-Lt5UqQOJ7zR3FHRfbTOuf/RBo2ubXZLIoZfCTDHymZCv5SBEoDXCn9hHAhQHZowO
-DfXa4RW+dRvAByklsEli6IlOxvT6jS7qMqjcM529KyAF7b/kJrENLrP3fERHCxuV
-WnVTNjxWfygeuHmNbsbL5aWjDItyDFfqcx57pNVv8FFoohzLLc53Y32ZI1CUEbut
-HbtZH57FLgBNuqqU7NWfhrQMSMtPfBnVvKFzAnawRx4fEtQ/dH1bh+Q8mu7Nz0jT
-ASjclOuStczj3tgpek6aJMM7KewNT5WRxB8nmNOXC8POzpwHTELWA8dgfwMs27Yd
-jyoR7VUT+yL5OQMNPCDrfRcJBWsFeTVRmM56f6J1KvcTtVTaGgC26yU9H9WxKlOu
-1PIy1W2WQRAVENAfwDVwGGE9z7Lr+wMyYOZYX4RzthK+q082Ae2dlFkp1zcG1RIp
-DIZz41X/DXp7FFZqXwkFiS7ZXzDNwkfM6dda/yjzAgMBAAGjggFzMIIBbzAfBgNV
-HSMEGDAWgBQMvZNoDPPeq6NJays3V0fqkOO57TAdBgNVHQ4EFgQUpZEFQu6gLZl1
-4DFbyX8+XdInof8wDgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0l
-BBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMCIGA1UdIAQbMBkwDQYLKwYBBAGyMQEC
-Ah0wCAYGZ4EMAQIBMDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRl
-cmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEF
-BQcwAoYpaHR0cDovL2NydC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQw
-JgYIKwYBBQUHMAGGGmh0dHA6Ly9vY3NwLnRjcy50ZXJlbmEub3JnMCEGA1UdEQQa
-MBiCFnNzby5pbnN0aXR1dG9wdGlxdWUuZnIwDQYJKoZIhvcNAQEFBQADggEBAIY6
-aA9g6qNL/9BruQSSjfgt4HrJUi+agJVEbXDumUNkulhD3QRJroMgZsooizhdfdpz
-7o+yQgIjjhfApH3NOG1LdszkldblDYNVM33TvFlsr/WZyTqSQWnqt85NyM9HFbhw
-9zCXUBd0F3uJ9blJaKDJ80YonJCLZPiuJT1Zdia1DxbHgOwwIeXQgK86xfF9SPS1
-8GZ1MoKXoeR8yrZtYX7euYUSA4WIXaYlly7Kdvn71HchIPtyIEXawgqz0o+zCrGJ
-r2c1GxaK4fuoO5o/aTwbFses0hEp90ifjjWFNdbgbXKbGavGvkHWEe99mSgqvI/T
-LO/bpMuPwFH27VaJTuo=
-					    </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>
-					      MIIHeTCCBmGgAwIBAgIQWjSQUhWiEPpRYjoY6ThcITANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTEzMTAyODAwMDAwMFoXDTE2MTAyNzIzNTk1OVowRDEhMB8GA1UE
-CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMR8wHQYDVQQDExZzc28uaW5zdGl0
-dXRvcHRpcXVlLmZyMIIEIjANBgkqhkiG9w0BAQEFAAOCBA8AMIIECgKCBAEA1gzs
-ryM0GS+EdHhf8FK8ukAp4FfI5y1L+4DJR2kvbCfOFpDWrlJWWh0O2j9HQIyKh1Wc
-Bv1Hh5RxM55oiHjt2cDCDAlD8gEXAffMatRkxAx179WQiB9/mN0KXbkxm45xhM5t
-zznKIlQ9A+bkXMo/NE+LtYlGUSgF9ybX7/exeEtVxBcTfIQGGkM92mJR6shz3KYu
-kciPWKUxAyNzkWaXtbt/azMRfhICnQU34IKWlQlB7UPbI7CogGNTXAOW3YASSSrn
-DejB+iQ7cHjYy5u0HkIuixICqdj7AcEmlsu3xgYes05T0h03PgLvVSCZ75378lJb
-PKZkyZ9QZpxnW7WAUHXeGDmxfyxj4jlT+mocxRFe6ZIBySQT34pmyMsvkehObCsw
-AlnbfnmWMUVKWEtVDwS9lUQwF7i3MepsFefRIWoLDYv46wN45fB2bZr7E0xfbL3F
-3qJeTN8bbjpNaeKXrFctahGz4Ny9u+Vae5TtTZTeM840ptTznTrRazgK1071R0fb
-HvodQLmBPSm2rr5KcLOC5OVUriqE/Z4lE0jI8N3qWEyLe938NsaqsdvCf3kqN86n
-VdggmJGHioxmuqlMsxJqJRvTolyDbeSnpoz3c74U8Szu0u4dm5rILBVLYp7KaIn1
-W1rnCaLmgxqICyT/8WSOyyfw9h4HshOdmSlqjjEMaoskYSRP41tVP66nSw7rBvYo
-oxN+YEG47Op/Sooabonrtpg33zgMz3Diroy1ezIvRxzdGpour1uYImfSqOMM/h2e
-WwfQ7H68RdqDhB52Z1FUvOHOmSgtY2J/oxrPnWtlpUpORhEa/8ZUAXIn8qAdygJY
-j02HQWGsXCDpy6jyi9+terK2Q4+IxwuiJFgLtl4+/Gm0QmH56/OCuzajg1gB2m/S
-1C/6mA/iBn6lftwhRSD0DKitxMcAur3GdZ9DBxOYogdFnP1GLG+Y1fZcPv0d9E+s
-F0h6q1IUoWDMle+HuAuD6J/+Y2w+1vdcPHYaEgtGMCN6nnR9o24IjcCLbD3OKEcO
-af1uSHAbcwA2x3faNXWBRdKLG194vqQLOwvNFHIFXlwI7nJgyOGc7eVo5oDQ+735
-9GEUG0/5zsuWaXWN3i/NYbBDRjtDCIYZG2QlNkSzPRQp9HJM0PmBDBd+WTooxngC
-1x4Bs1JY4799o2x797GSmJhJ2X/fo8ECu+l76mQfWS/7apbjb7MKKnj2JySAToXW
-TggrnchTD7p8SQWfUpSQ6QKwi8IDbN74dB6eO2r1m8rMQ5W/rwF9mH99THOPC0/r
-zGhXgv2V+8GeraFLqHRFKYv8ebti9wmXRYCyHzsCZOWqk1Aq0q1HhUo/6IKSw8XC
-o2lKCW8Xv7hZca+xFwIDAQABo4IBczCCAW8wHwYDVR0jBBgwFoAUDL2TaAzz3quj
-SWsrN1dH6pDjue0wHQYDVR0OBBYEFADhl3EMHhYhjBx83CTvMTrmmcGXMA4GA1Ud
-DwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggr
-BgEFBQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNV
-HR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNT
-TENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQu
-dGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRw
-Oi8vb2NzcC50Y3MudGVyZW5hLm9yZzAhBgNVHREEGjAYghZzc28uaW5zdGl0dXRv
-cHRpcXVlLmZyMA0GCSqGSIb3DQEBBQUAA4IBAQB5jJF6U+ahW/I6o3YXEwqjI32b
-h38zILufAMgajUdH08QFhu2qibjouVB0M3q6/LQ/SrZuaBZvow3kSrsFuQc5TZ+R
-TxxUyt6nT+6DF0UM3/vIZ+8I54cbc2hl9ATVdqHGZ8A+mGGi/tlcqu3P3SOsNWyl
-JIscj5oZrqDXjdb0meoWDILiKwy+kr11Lu4Wf3wncg+0FR3OdlhJtTXpX0YtrZZR
-kL2Het7Oq+k/IfazfLgyefA0ePXmqqtlJPG0YP+MX/t2tympn8mP0Bt2vcpuv2sy
-rfK4yIfD2vtoGN7lNMyamyMzlgmgILv8/anc8mkamyETrRiWjS1RPu74fEku
-					    </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://sso.institutoptique.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sso.institutoptique.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://sso.institutoptique.fr/idp/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Institut Optique Graduate School</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Institut Optique Graduate School</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <EmailAddress>service.info@institutoptique.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sso.ird.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/sso.ird.fr-idp-shibboleth.xml
deleted file mode 100644
index bb75c263..00000000
--- a/swamid-interfederations-2.0/sso.ird.fr-idp-shibboleth.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sso.ird.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2012-12-05T17:22:15Z">
-      <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">ird.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">IRD - Institut de Recherche pour le Développement</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDEzCCAfugAwIBAgIUVaH89Xx207IW1cTeMZoDrJ2S8cMwDQYJKoZIhvcNAQEF
-BQAwFTETMBEGA1UEAxMKc3NvLmlyZC5mcjAeFw0xMjEyMDQwODUzMTJaFw0zMjEy
-MDQwODUzMTJaMBUxEzARBgNVBAMTCnNzby5pcmQuZnIwggEiMA0GCSqGSIb3DQEB
-AQUAA4IBDwAwggEKAoIBAQCxoxms45eFcIYxIAqWg8xwg1WpmjsGFAeOnBYoldj2
-Mm2bQSxgdA5wNgdHvpsE1NfsWatZ3o+Cu+lAeL4tbzhyeLcv/5tP7xW1lCUCOsnt
-U+71/QN+hd8t0cTZnOcIVQz2933j+GSlYLb7j4mkeOmH2N1t7eZUBHDHDzhTbRbo
-owW1vMec+I7kgS5hxoOJmthyGxqKquBiFbyVR6D2afe1AoFZCTgH5o34o0LJ56JC
-J+7L86F1PKd8M8BRD/+Bgk5z01rP6iLE4CTw0aalcVAcwUhfu+lSQaQc+UnsAkb6
-IO0r2WpflOy/h3qDYAe5ZaoadAVF7DXI3XkkM7PLvoHXAgMBAAGjWzBZMDgGA1Ud
-EQQxMC+CCnNzby5pcmQuZnKGIWh0dHBzOi8vc3NvLmlyZC5mci9pZHAvc2hpYmJv
-bGV0aDAdBgNVHQ4EFgQUxuTYXqdJEQMDfLAcMpaizQmY728wDQYJKoZIhvcNAQEF
-BQADggEBAI0GQeWZzGLSJtpy/ThyIGBsvc9I4POytPsGTAXXjl225vxBW5wREjXT
-5iZYvqDcaRX7/5Ya0LuixjZd4vw0f/GxNVA1q7UrkYD186qwxdD9ERVBK4A8TKw+
-DTqPj960n+BmHjvfbO5kUiOCxRN8aUwkroiIuokjKo/F/ee4PPhJFmjkjC5UQnAR
-XmxFE6G9gZKzMxZsGStIeip2XgtC8+XSS5mO9sXG2AciRYb9A6yAbq1H6UHgCA4+
-pNLOn4jzVVeC76NhcjDI5Uqx+XbQXfZoVsft8i6RsNXGCHWst5dsepdXMoeJOfkP
-kkuzfMwgp7mBgkel9B3MiVnSCXPSNNU=
-					    </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://sso.ird.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sso.ird.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://sso.ird.fr/idp/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">IRD - Institut de Recherche pour le Développement</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">IRD - Institut de Recherche pour le Développement</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>calvayrac</SurName>
-    <EmailAddress>didier.calvayrac@ird.fr</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <SurName>rouquette</SurName>
-    <EmailAddress>julien.rouquette@ird.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sso.ird.fr.xml b/swamid-interfederations-2.0/sso.ird.fr.xml
deleted file mode 100644
index bb75c263..00000000
--- a/swamid-interfederations-2.0/sso.ird.fr.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sso.ird.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2012-12-05T17:22:15Z">
-      <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">ird.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">IRD - Institut de Recherche pour le Développement</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDEzCCAfugAwIBAgIUVaH89Xx207IW1cTeMZoDrJ2S8cMwDQYJKoZIhvcNAQEF
-BQAwFTETMBEGA1UEAxMKc3NvLmlyZC5mcjAeFw0xMjEyMDQwODUzMTJaFw0zMjEy
-MDQwODUzMTJaMBUxEzARBgNVBAMTCnNzby5pcmQuZnIwggEiMA0GCSqGSIb3DQEB
-AQUAA4IBDwAwggEKAoIBAQCxoxms45eFcIYxIAqWg8xwg1WpmjsGFAeOnBYoldj2
-Mm2bQSxgdA5wNgdHvpsE1NfsWatZ3o+Cu+lAeL4tbzhyeLcv/5tP7xW1lCUCOsnt
-U+71/QN+hd8t0cTZnOcIVQz2933j+GSlYLb7j4mkeOmH2N1t7eZUBHDHDzhTbRbo
-owW1vMec+I7kgS5hxoOJmthyGxqKquBiFbyVR6D2afe1AoFZCTgH5o34o0LJ56JC
-J+7L86F1PKd8M8BRD/+Bgk5z01rP6iLE4CTw0aalcVAcwUhfu+lSQaQc+UnsAkb6
-IO0r2WpflOy/h3qDYAe5ZaoadAVF7DXI3XkkM7PLvoHXAgMBAAGjWzBZMDgGA1Ud
-EQQxMC+CCnNzby5pcmQuZnKGIWh0dHBzOi8vc3NvLmlyZC5mci9pZHAvc2hpYmJv
-bGV0aDAdBgNVHQ4EFgQUxuTYXqdJEQMDfLAcMpaizQmY728wDQYJKoZIhvcNAQEF
-BQADggEBAI0GQeWZzGLSJtpy/ThyIGBsvc9I4POytPsGTAXXjl225vxBW5wREjXT
-5iZYvqDcaRX7/5Ya0LuixjZd4vw0f/GxNVA1q7UrkYD186qwxdD9ERVBK4A8TKw+
-DTqPj960n+BmHjvfbO5kUiOCxRN8aUwkroiIuokjKo/F/ee4PPhJFmjkjC5UQnAR
-XmxFE6G9gZKzMxZsGStIeip2XgtC8+XSS5mO9sXG2AciRYb9A6yAbq1H6UHgCA4+
-pNLOn4jzVVeC76NhcjDI5Uqx+XbQXfZoVsft8i6RsNXGCHWst5dsepdXMoeJOfkP
-kkuzfMwgp7mBgkel9B3MiVnSCXPSNNU=
-					    </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://sso.ird.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sso.ird.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://sso.ird.fr/idp/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">IRD - Institut de Recherche pour le Développement</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">IRD - Institut de Recherche pour le Développement</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>calvayrac</SurName>
-    <EmailAddress>didier.calvayrac@ird.fr</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <SurName>rouquette</SurName>
-    <EmailAddress>julien.rouquette@ird.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sso.man.poznan.pl-idp-shibboleth.xml b/swamid-interfederations-2.0/sso.man.poznan.pl-idp-shibboleth.xml
deleted file mode 100644
index 2653064b..00000000
--- a/swamid-interfederations-2.0/sso.man.poznan.pl-idp-shibboleth.xml
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="https://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sso.man.poznan.pl/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://aai.pionier.net.pl" registrationInstant="2014-02-11T00:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://aai.pionier.net.pl/en/index.php?page=rps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </md: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">man.poznan.pl</shibmd:Scope>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="en">PSNC - Poznan Supercomputing and Networking Center</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="pl">PCSS - Poznańskie Centrum Superkomputerowo-Sieciowe</mdui:DisplayName>
-        <mdui:Description xml:lang="en">The PSNC Identity Provider is used by PSNC staff members.</mdui:Description>
-        <mdui:Description xml:lang="pl">Centralny Punkt Logowania dla pracowników PCSS.</mdui:Description>
-        <mdui:Logo height="110" width="300" xml:lang="en">https://sso.man.poznan.pl/logo/psnc.png</mdui:Logo>
-        <mdui:Logo height="110" width="300" xml:lang="pl">https://sso.man.poznan.pl/logo/pcss.png</mdui:Logo>
-      </mdui:UIInfo>
-      <mdui:DiscoHints>
-        <mdui:IPHint>150.254.0.0/16</mdui:IPHint>
-        <mdui:DomainHint>man.poznan.pl</mdui:DomainHint>
-        <mdui:GeolocationHint>geo:52.411793,16.917208</mdui:GeolocationHint>
-      </mdui:DiscoHints>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDMDCCAhigAwIBAgIVAIiHfqRGuhN+o7Ms3VgcU94Sn4aaMA0GCSqGSIb3DQEB
-BQUAMBwxGjAYBgNVBAMTEXNzby5tYW4ucG96bmFuLnBsMB4XDTEyMDIxNzE1MDAx
-NVoXDTMyMDIxNzE1MDAxNVowHDEaMBgGA1UEAxMRc3NvLm1hbi5wb3puYW4ucGww
-ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCCsfe3J1Kxj8jL697Vw7r7
-tGu6li0IDa/8JecsxjRTFkMxl/6qrzs5A8x1i1jWO3Q58xYMjgrlBp4cevH1dbHn
-QxZ2o/FaE5Ww2eHsFmeR7nLZSJN3LukcxEjtA40evwEZPN+p/4DZD/bBMh7Hyw9s
-8Y6YdYCF0xNLUwEFhHo2yDVPZYhWrC6yx6fwY5/NXZZCA9b91W8mRfWTGPFBY9PK
-dVS0m923P/CkudYG3o3+w34gpxkYHca3i6syI9zHOvsE1GRdbwHW1xcqRWMLece+
-dhxL/I1AnlpCvuLqG0CpMxn5nAy19QqoODrH9zVtZeOUISIzb0UhSrlk29fFe6CV
-AgMBAAGjaTBnMEYGA1UdEQQ/MD2CEXNzby5tYW4ucG96bmFuLnBshihodHRwczov
-L3Nzby5tYW4ucG96bmFuLnBsL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBTroN0C
-2g3I0ikT1kP7hjwsQbJpTDANBgkqhkiG9w0BAQUFAAOCAQEAUQXUBQQIg4UXJrCp
-9H0zd65C58uH1fAdcwjYcZUojsftYg5Uc2OIH/TVq2rcB+ZiC9ZRx1x677+WuRq5
-lA85YUQHsPYKD/mOsxU69nIdkFuJcICSZIYBQA4bq4WAsWaD4Z75doqgR2MGoQBb
-vWAAetQH90HyK98XR37vQgkndTHSt+bvwH+9M8URXk10jC4wqwYeVd9bGbIi2opk
-BRF64iGC5zaSIWqhdfyv6XZH7lmIHdydCn/PMD0bAmUDB9oKb4Wr4Dk/52xeErus
-PxMzLl9jowOTlfNZJtlecP1jazd+Hzpen8DHldiRWsH3Hel12OapCsiVfKlb1yrx
-IxWl2w==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://sso.man.poznan.pl/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sso.man.poznan.pl/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sso.man.poznan.pl/idp/profile/SAML2/Redirect/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sso.man.poznan.pl/idp/profile/SAML2/POST/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sso.man.poznan.pl/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://sso.man.poznan.pl/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sso.man.poznan.pl/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sso.man.poznan.pl/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sso.man.poznan.pl/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">man.poznan.pl</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDMDCCAhigAwIBAgIVAIiHfqRGuhN+o7Ms3VgcU94Sn4aaMA0GCSqGSIb3DQEB
-BQUAMBwxGjAYBgNVBAMTEXNzby5tYW4ucG96bmFuLnBsMB4XDTEyMDIxNzE1MDAx
-NVoXDTMyMDIxNzE1MDAxNVowHDEaMBgGA1UEAxMRc3NvLm1hbi5wb3puYW4ucGww
-ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCCsfe3J1Kxj8jL697Vw7r7
-tGu6li0IDa/8JecsxjRTFkMxl/6qrzs5A8x1i1jWO3Q58xYMjgrlBp4cevH1dbHn
-QxZ2o/FaE5Ww2eHsFmeR7nLZSJN3LukcxEjtA40evwEZPN+p/4DZD/bBMh7Hyw9s
-8Y6YdYCF0xNLUwEFhHo2yDVPZYhWrC6yx6fwY5/NXZZCA9b91W8mRfWTGPFBY9PK
-dVS0m923P/CkudYG3o3+w34gpxkYHca3i6syI9zHOvsE1GRdbwHW1xcqRWMLece+
-dhxL/I1AnlpCvuLqG0CpMxn5nAy19QqoODrH9zVtZeOUISIzb0UhSrlk29fFe6CV
-AgMBAAGjaTBnMEYGA1UdEQQ/MD2CEXNzby5tYW4ucG96bmFuLnBshihodHRwczov
-L3Nzby5tYW4ucG96bmFuLnBsL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBTroN0C
-2g3I0ikT1kP7hjwsQbJpTDANBgkqhkiG9w0BAQUFAAOCAQEAUQXUBQQIg4UXJrCp
-9H0zd65C58uH1fAdcwjYcZUojsftYg5Uc2OIH/TVq2rcB+ZiC9ZRx1x677+WuRq5
-lA85YUQHsPYKD/mOsxU69nIdkFuJcICSZIYBQA4bq4WAsWaD4Z75doqgR2MGoQBb
-vWAAetQH90HyK98XR37vQgkndTHSt+bvwH+9M8URXk10jC4wqwYeVd9bGbIi2opk
-BRF64iGC5zaSIWqhdfyv6XZH7lmIHdydCn/PMD0bAmUDB9oKb4Wr4Dk/52xeErus
-PxMzLl9jowOTlfNZJtlecP1jazd+Hzpen8DHldiRWsH3Hel12OapCsiVfKlb1yrx
-IxWl2w==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://sso.man.poznan.pl/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sso.man.poznan.pl/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">Poznan Supercomputing and Networking Center</OrganizationName>
-    <OrganizationName xml:lang="pl">Poznańskie Centrum Superkomputerowo-Sieciowe</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">PSNC - Poznan Supercomputing and Networking Center</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="pl">PCSS - Poznańskie Centrum Superkomputerowo-Sieciowe</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.man.poznan.pl/online/en/</OrganizationURL>
-    <OrganizationURL xml:lang="pl">http://www.man.poznan.pl/online/pl/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>PSNC</GivenName>
-    <SurName>SSO Team</SurName>
-    <EmailAddress>mailto:sso@man.poznan.pl</EmailAddress>
-  </ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sso.man.poznan.pl.xml b/swamid-interfederations-2.0/sso.man.poznan.pl.xml
deleted file mode 100644
index 2653064b..00000000
--- a/swamid-interfederations-2.0/sso.man.poznan.pl.xml
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="https://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sso.man.poznan.pl/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://aai.pionier.net.pl" registrationInstant="2014-02-11T00:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://aai.pionier.net.pl/en/index.php?page=rps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </md: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">man.poznan.pl</shibmd:Scope>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="en">PSNC - Poznan Supercomputing and Networking Center</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="pl">PCSS - Poznańskie Centrum Superkomputerowo-Sieciowe</mdui:DisplayName>
-        <mdui:Description xml:lang="en">The PSNC Identity Provider is used by PSNC staff members.</mdui:Description>
-        <mdui:Description xml:lang="pl">Centralny Punkt Logowania dla pracowników PCSS.</mdui:Description>
-        <mdui:Logo height="110" width="300" xml:lang="en">https://sso.man.poznan.pl/logo/psnc.png</mdui:Logo>
-        <mdui:Logo height="110" width="300" xml:lang="pl">https://sso.man.poznan.pl/logo/pcss.png</mdui:Logo>
-      </mdui:UIInfo>
-      <mdui:DiscoHints>
-        <mdui:IPHint>150.254.0.0/16</mdui:IPHint>
-        <mdui:DomainHint>man.poznan.pl</mdui:DomainHint>
-        <mdui:GeolocationHint>geo:52.411793,16.917208</mdui:GeolocationHint>
-      </mdui:DiscoHints>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDMDCCAhigAwIBAgIVAIiHfqRGuhN+o7Ms3VgcU94Sn4aaMA0GCSqGSIb3DQEB
-BQUAMBwxGjAYBgNVBAMTEXNzby5tYW4ucG96bmFuLnBsMB4XDTEyMDIxNzE1MDAx
-NVoXDTMyMDIxNzE1MDAxNVowHDEaMBgGA1UEAxMRc3NvLm1hbi5wb3puYW4ucGww
-ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCCsfe3J1Kxj8jL697Vw7r7
-tGu6li0IDa/8JecsxjRTFkMxl/6qrzs5A8x1i1jWO3Q58xYMjgrlBp4cevH1dbHn
-QxZ2o/FaE5Ww2eHsFmeR7nLZSJN3LukcxEjtA40evwEZPN+p/4DZD/bBMh7Hyw9s
-8Y6YdYCF0xNLUwEFhHo2yDVPZYhWrC6yx6fwY5/NXZZCA9b91W8mRfWTGPFBY9PK
-dVS0m923P/CkudYG3o3+w34gpxkYHca3i6syI9zHOvsE1GRdbwHW1xcqRWMLece+
-dhxL/I1AnlpCvuLqG0CpMxn5nAy19QqoODrH9zVtZeOUISIzb0UhSrlk29fFe6CV
-AgMBAAGjaTBnMEYGA1UdEQQ/MD2CEXNzby5tYW4ucG96bmFuLnBshihodHRwczov
-L3Nzby5tYW4ucG96bmFuLnBsL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBTroN0C
-2g3I0ikT1kP7hjwsQbJpTDANBgkqhkiG9w0BAQUFAAOCAQEAUQXUBQQIg4UXJrCp
-9H0zd65C58uH1fAdcwjYcZUojsftYg5Uc2OIH/TVq2rcB+ZiC9ZRx1x677+WuRq5
-lA85YUQHsPYKD/mOsxU69nIdkFuJcICSZIYBQA4bq4WAsWaD4Z75doqgR2MGoQBb
-vWAAetQH90HyK98XR37vQgkndTHSt+bvwH+9M8URXk10jC4wqwYeVd9bGbIi2opk
-BRF64iGC5zaSIWqhdfyv6XZH7lmIHdydCn/PMD0bAmUDB9oKb4Wr4Dk/52xeErus
-PxMzLl9jowOTlfNZJtlecP1jazd+Hzpen8DHldiRWsH3Hel12OapCsiVfKlb1yrx
-IxWl2w==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://sso.man.poznan.pl/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sso.man.poznan.pl/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sso.man.poznan.pl/idp/profile/SAML2/Redirect/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sso.man.poznan.pl/idp/profile/SAML2/POST/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sso.man.poznan.pl/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://sso.man.poznan.pl/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sso.man.poznan.pl/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sso.man.poznan.pl/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sso.man.poznan.pl/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">man.poznan.pl</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDMDCCAhigAwIBAgIVAIiHfqRGuhN+o7Ms3VgcU94Sn4aaMA0GCSqGSIb3DQEB
-BQUAMBwxGjAYBgNVBAMTEXNzby5tYW4ucG96bmFuLnBsMB4XDTEyMDIxNzE1MDAx
-NVoXDTMyMDIxNzE1MDAxNVowHDEaMBgGA1UEAxMRc3NvLm1hbi5wb3puYW4ucGww
-ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCCsfe3J1Kxj8jL697Vw7r7
-tGu6li0IDa/8JecsxjRTFkMxl/6qrzs5A8x1i1jWO3Q58xYMjgrlBp4cevH1dbHn
-QxZ2o/FaE5Ww2eHsFmeR7nLZSJN3LukcxEjtA40evwEZPN+p/4DZD/bBMh7Hyw9s
-8Y6YdYCF0xNLUwEFhHo2yDVPZYhWrC6yx6fwY5/NXZZCA9b91W8mRfWTGPFBY9PK
-dVS0m923P/CkudYG3o3+w34gpxkYHca3i6syI9zHOvsE1GRdbwHW1xcqRWMLece+
-dhxL/I1AnlpCvuLqG0CpMxn5nAy19QqoODrH9zVtZeOUISIzb0UhSrlk29fFe6CV
-AgMBAAGjaTBnMEYGA1UdEQQ/MD2CEXNzby5tYW4ucG96bmFuLnBshihodHRwczov
-L3Nzby5tYW4ucG96bmFuLnBsL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBTroN0C
-2g3I0ikT1kP7hjwsQbJpTDANBgkqhkiG9w0BAQUFAAOCAQEAUQXUBQQIg4UXJrCp
-9H0zd65C58uH1fAdcwjYcZUojsftYg5Uc2OIH/TVq2rcB+ZiC9ZRx1x677+WuRq5
-lA85YUQHsPYKD/mOsxU69nIdkFuJcICSZIYBQA4bq4WAsWaD4Z75doqgR2MGoQBb
-vWAAetQH90HyK98XR37vQgkndTHSt+bvwH+9M8URXk10jC4wqwYeVd9bGbIi2opk
-BRF64iGC5zaSIWqhdfyv6XZH7lmIHdydCn/PMD0bAmUDB9oKb4Wr4Dk/52xeErus
-PxMzLl9jowOTlfNZJtlecP1jazd+Hzpen8DHldiRWsH3Hel12OapCsiVfKlb1yrx
-IxWl2w==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://sso.man.poznan.pl/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sso.man.poznan.pl/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">Poznan Supercomputing and Networking Center</OrganizationName>
-    <OrganizationName xml:lang="pl">Poznańskie Centrum Superkomputerowo-Sieciowe</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">PSNC - Poznan Supercomputing and Networking Center</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="pl">PCSS - Poznańskie Centrum Superkomputerowo-Sieciowe</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.man.poznan.pl/online/en/</OrganizationURL>
-    <OrganizationURL xml:lang="pl">http://www.man.poznan.pl/online/pl/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>PSNC</GivenName>
-    <SurName>SSO Team</SurName>
-    <EmailAddress>mailto:sso@man.poznan.pl</EmailAddress>
-  </ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sso.nikhef.nl-sso-saml2-idp-metadata.php.xml b/swamid-interfederations-2.0/sso.nikhef.nl-sso-saml2-idp-metadata.php.xml
deleted file mode 100644
index 5d30a10a..00000000
--- a/swamid-interfederations-2.0/sso.nikhef.nl-sso-saml2-idp-metadata.php.xml
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sso.nikhef.nl/sso/saml2/idp/metadata.php">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.surfconext.nl/" registrationInstant="2013-11-18T00:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://wiki.surfnetlabs.nl/display/eduGAIN/EduGAIN</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="nl">Nikhef</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Nikhef</mdui:DisplayName>
-        <mdui:Description xml:lang="nl">Nikhef</mdui:Description>
-        <mdui:Description xml:lang="en">Nikhef</mdui:Description>
-        <mdui:Logo height="48" width="108">https://static.surfconext.nl/media/idp/nikhef.png</mdui:Logo>
-        <mdui:Keywords xml:lang="nl">nationaal instituut subatomaire fysica Nikhef Research</mdui:Keywords>
-        <mdui:Keywords xml:lang="en">national institute subatomic physics Nikhef Research</mdui:Keywords>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor xmlns:ds="http://www.w3.org/2000/09/xmldsig#" use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIID3zCCAsegAwIBAgIJAMVC9xn1ZfsuMA0GCSqGSIb3DQEBCwUAMIGFMQswCQYD
-VQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMG
-A1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQD
-DB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTAeFw0xNDA1MDUxNDIyMzVa
-Fw0xOTA1MDUxNDIyMzVaMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNo
-dDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYD
-VQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAy
-MDE0MDUwNTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKthMDbB0jKH
-efPzmRu9t2h7iLP4wAXr42bHpjzTEk6gttHFb4l/hFiz1YBI88TjiH6hVjnozo/Y
-HA2c51us+Y7g0XoS7653lbUN/EHzvDMuyis4Xi2Ijf1A/OUQfH1iFUWttIgtWK9+
-fatXoGUS6tirQvrzVh6ZstEp1xbpo1SF6UoVl+fh7tM81qz+Crr/Kroan0UjpZOF
-TwxPoK6fdLgMAieKSCRmBGpbJHbQ2xxbdykBBrBbdfzIX4CDepfjE9h/40ldw5jR
-n3e392jrS6htk23N9BWWrpBT5QCk0kH3h/6F1Dm6TkyG9CDtt73/anuRkvXbeygI
-4wml9bL3rE8CAwEAAaNQME4wHQYDVR0OBBYEFD+Ac7akFxaMhBQAjVfvgGfY8hNK
-MB8GA1UdIwQYMBaAFD+Ac7akFxaMhBQAjVfvgGfY8hNKMAwGA1UdEwQFMAMBAf8w
-DQYJKoZIhvcNAQELBQADggEBAC8L9D67CxIhGo5aGVu63WqRHBNOdo/FAGI7LURD
-FeRmG5nRw/VXzJLGJksh4FSkx7aPrxNWF1uFiDZ80EuYQuIv7bDLblK31ZEbdg1R
-9LgiZCdYSr464I7yXQY9o6FiNtSKZkQO8EsscJPPy/Zp4uHAnADWACkOUHiCbcKi
-UUFu66dX0Wr/v53Gekz487GgVRs8HEeT9MU1reBKRgdENR8PNg4rbQfLc3YQKLWK
-7yWnn/RenjDpuCiePj8N8/80tGgrNgK/6fzM3zI18sSywnXLswxqDb/J+jgVxnQ6
-MrsTf1urM8MnfcxG/82oHIwfMh/sXPCZpo+DTLkhQxctJ3M=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:NameIDFormat xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:NameIDFormat xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">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://engine.surfconext.nl/authentication/idp/single-sign-on/9b3c7c0e251cbaa2fe441bf93e1e07bc"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Nikhef</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Nikhef</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.nikhef.nl/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>SURFconext-beheer</md:GivenName>
-    <md:EmailAddress>SURFconext-beheer@surfnet.nl</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>SURFconext-beheer</md:GivenName>
-    <md:EmailAddress>SURFconext-beheer@surfnet.nl</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>SURFconext support</md:GivenName>
-    <md:EmailAddress>help@surfconext.nl</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sso.nikhef.nl.xml b/swamid-interfederations-2.0/sso.nikhef.nl.xml
deleted file mode 100644
index 5d30a10a..00000000
--- a/swamid-interfederations-2.0/sso.nikhef.nl.xml
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sso.nikhef.nl/sso/saml2/idp/metadata.php">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.surfconext.nl/" registrationInstant="2013-11-18T00:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://wiki.surfnetlabs.nl/display/eduGAIN/EduGAIN</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="nl">Nikhef</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Nikhef</mdui:DisplayName>
-        <mdui:Description xml:lang="nl">Nikhef</mdui:Description>
-        <mdui:Description xml:lang="en">Nikhef</mdui:Description>
-        <mdui:Logo height="48" width="108">https://static.surfconext.nl/media/idp/nikhef.png</mdui:Logo>
-        <mdui:Keywords xml:lang="nl">nationaal instituut subatomaire fysica Nikhef Research</mdui:Keywords>
-        <mdui:Keywords xml:lang="en">national institute subatomic physics Nikhef Research</mdui:Keywords>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor xmlns:ds="http://www.w3.org/2000/09/xmldsig#" use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIID3zCCAsegAwIBAgIJAMVC9xn1ZfsuMA0GCSqGSIb3DQEBCwUAMIGFMQswCQYD
-VQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMG
-A1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQD
-DB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTAeFw0xNDA1MDUxNDIyMzVa
-Fw0xOTA1MDUxNDIyMzVaMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNo
-dDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYD
-VQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAy
-MDE0MDUwNTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKthMDbB0jKH
-efPzmRu9t2h7iLP4wAXr42bHpjzTEk6gttHFb4l/hFiz1YBI88TjiH6hVjnozo/Y
-HA2c51us+Y7g0XoS7653lbUN/EHzvDMuyis4Xi2Ijf1A/OUQfH1iFUWttIgtWK9+
-fatXoGUS6tirQvrzVh6ZstEp1xbpo1SF6UoVl+fh7tM81qz+Crr/Kroan0UjpZOF
-TwxPoK6fdLgMAieKSCRmBGpbJHbQ2xxbdykBBrBbdfzIX4CDepfjE9h/40ldw5jR
-n3e392jrS6htk23N9BWWrpBT5QCk0kH3h/6F1Dm6TkyG9CDtt73/anuRkvXbeygI
-4wml9bL3rE8CAwEAAaNQME4wHQYDVR0OBBYEFD+Ac7akFxaMhBQAjVfvgGfY8hNK
-MB8GA1UdIwQYMBaAFD+Ac7akFxaMhBQAjVfvgGfY8hNKMAwGA1UdEwQFMAMBAf8w
-DQYJKoZIhvcNAQELBQADggEBAC8L9D67CxIhGo5aGVu63WqRHBNOdo/FAGI7LURD
-FeRmG5nRw/VXzJLGJksh4FSkx7aPrxNWF1uFiDZ80EuYQuIv7bDLblK31ZEbdg1R
-9LgiZCdYSr464I7yXQY9o6FiNtSKZkQO8EsscJPPy/Zp4uHAnADWACkOUHiCbcKi
-UUFu66dX0Wr/v53Gekz487GgVRs8HEeT9MU1reBKRgdENR8PNg4rbQfLc3YQKLWK
-7yWnn/RenjDpuCiePj8N8/80tGgrNgK/6fzM3zI18sSywnXLswxqDb/J+jgVxnQ6
-MrsTf1urM8MnfcxG/82oHIwfMh/sXPCZpo+DTLkhQxctJ3M=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:NameIDFormat xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:NameIDFormat xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">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://engine.surfconext.nl/authentication/idp/single-sign-on/9b3c7c0e251cbaa2fe441bf93e1e07bc"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Nikhef</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Nikhef</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.nikhef.nl/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>SURFconext-beheer</md:GivenName>
-    <md:EmailAddress>SURFconext-beheer@surfnet.nl</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>SURFconext-beheer</md:GivenName>
-    <md:EmailAddress>SURFconext-beheer@surfnet.nl</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>SURFconext support</md:GivenName>
-    <md:EmailAddress>help@surfconext.nl</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sso.sbg.ac.at-idp-shibboleth.xml b/swamid-interfederations-2.0/sso.sbg.ac.at-idp-shibboleth.xml
deleted file mode 100644
index 35f0a01f..00000000
--- a/swamid-interfederations-2.0/sso.sbg.ac.at-idp-shibboleth.xml
+++ /dev/null
@@ -1,100 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sso.sbg.ac.at/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://eduid.at" registrationInstant="2010-04-26T14:16:34Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://eduid.at/policy/mdrps-20140606</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">sbg.ac.at</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="de">Universität Salzburg</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">University of Salzburg</mdui:DisplayName>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDIDCCAgigAwIBAgIVAM/a3obaebb4N7KALoWgPOwQKFPuMA0GCSqGSIb3DQEB
-BQUAMBgxFjAUBgNVBAMTDXNzby5zYmcuYWMuYXQwHhcNMTAwNDEwMTgxMzU0WhcN
-MzAwNDEwMTgxMzU0WjAYMRYwFAYDVQQDEw1zc28uc2JnLmFjLmF0MIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAso8F1k1Z3subIMuyqXHpPCNJogiv3GQ1
-uNXHNUL31ToqkIxcL+yL7QBLgnB8pZKmOaDOnveSllrTI8lArzJUbIYTRq/q8vjC
-35I5elBDktrOAAIeoogwdyhtau/AyiNvbZmPZGlcgBmWAPIUPoFjVF+U5+CbiQ8q
-iAzvdJn+yJvX+dkRQGg33Ebvh0pnlvD5qWeiwqWlJgFk4zUFNK40p3FFDMETNkTk
-7/U+bt/xMdwYdHI3wvb42ZBXTajsTsXnSlSA5B695dfpHfGbeIqTae32XsWHm77p
-+Nrl7flUJNGtTm8SNPx7K4CJIdRhdhKiuIX+5sOSxZg8iVDghZC4pwIDAQABo2Ew
-XzA+BgNVHREENzA1gg1zc28uc2JnLmFjLmF0hiRodHRwczovL3Nzby5zYmcuYWMu
-YXQvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFCr2Q6zhfulYa7kl0Pm752frFiF9
-MA0GCSqGSIb3DQEBBQUAA4IBAQB/AyjefKCO1cP806UO/L2olnsnD0VA50smzTto
-p72RH8sBCosRwkeyHI3/aqjSPEqsB1p1IcEEeOR4b+07PgtWmOMbZ6l9zOGDB7zB
-RCK2tq1P1avux6RGlj1q3vHlllfcdUnVFe3U6TOfk3faTeVBTLTpssBQOv0Y/W2k
-mWnkiKSHMFPlwWqllohGFuTfhSRLLDmX4lshBmC2WWPa/GmpqNnvY97oEYe0F/pV
-m/boLPgSS4HU06/UyTL75mHgtC9iCj4iLpDPJPDp8XcfwO62QogFU3+U7qqezqmV
-VfvOxPSoIdhmoHDf8FyFGq6FOVs0pSd+7RFboe5lAvmp6PrI
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://sso.sbg.ac.at:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sso.sbg.ac.at:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://sso.sbg.ac.at/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sso.sbg.ac.at/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sso.sbg.ac.at/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sso.sbg.ac.at/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">sbg.ac.at</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDIDCCAgigAwIBAgIVAM/a3obaebb4N7KALoWgPOwQKFPuMA0GCSqGSIb3DQEB
-BQUAMBgxFjAUBgNVBAMTDXNzby5zYmcuYWMuYXQwHhcNMTAwNDEwMTgxMzU0WhcN
-MzAwNDEwMTgxMzU0WjAYMRYwFAYDVQQDEw1zc28uc2JnLmFjLmF0MIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAso8F1k1Z3subIMuyqXHpPCNJogiv3GQ1
-uNXHNUL31ToqkIxcL+yL7QBLgnB8pZKmOaDOnveSllrTI8lArzJUbIYTRq/q8vjC
-35I5elBDktrOAAIeoogwdyhtau/AyiNvbZmPZGlcgBmWAPIUPoFjVF+U5+CbiQ8q
-iAzvdJn+yJvX+dkRQGg33Ebvh0pnlvD5qWeiwqWlJgFk4zUFNK40p3FFDMETNkTk
-7/U+bt/xMdwYdHI3wvb42ZBXTajsTsXnSlSA5B695dfpHfGbeIqTae32XsWHm77p
-+Nrl7flUJNGtTm8SNPx7K4CJIdRhdhKiuIX+5sOSxZg8iVDghZC4pwIDAQABo2Ew
-XzA+BgNVHREENzA1gg1zc28uc2JnLmFjLmF0hiRodHRwczovL3Nzby5zYmcuYWMu
-YXQvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFCr2Q6zhfulYa7kl0Pm752frFiF9
-MA0GCSqGSIb3DQEBBQUAA4IBAQB/AyjefKCO1cP806UO/L2olnsnD0VA50smzTto
-p72RH8sBCosRwkeyHI3/aqjSPEqsB1p1IcEEeOR4b+07PgtWmOMbZ6l9zOGDB7zB
-RCK2tq1P1avux6RGlj1q3vHlllfcdUnVFe3U6TOfk3faTeVBTLTpssBQOv0Y/W2k
-mWnkiKSHMFPlwWqllohGFuTfhSRLLDmX4lshBmC2WWPa/GmpqNnvY97oEYe0F/pV
-m/boLPgSS4HU06/UyTL75mHgtC9iCj4iLpDPJPDp8XcfwO62QogFU3+U7qqezqmV
-VfvOxPSoIdhmoHDf8FyFGq6FOVs0pSd+7RFboe5lAvmp6PrI
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://sso.sbg.ac.at:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sso.sbg.ac.at:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="de">Universität Salzburg</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">University of Salzburg</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="de">Universität Salzburg</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">University of Salzburg</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="de">http://www.uni-salzburg.at/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.uni-salzburg.at/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Clemens</md:GivenName>
-    <md:SurName>Renzl</md:SurName>
-    <md:EmailAddress>mailto:clemens.renzl@sbg.ac.at</md:EmailAddress>
-    <md:TelephoneNumber>+43 662 8044 6761</md:TelephoneNumber>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sso.sbg.ac.at.xml b/swamid-interfederations-2.0/sso.sbg.ac.at.xml
deleted file mode 100644
index 35f0a01f..00000000
--- a/swamid-interfederations-2.0/sso.sbg.ac.at.xml
+++ /dev/null
@@ -1,100 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sso.sbg.ac.at/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://eduid.at" registrationInstant="2010-04-26T14:16:34Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://eduid.at/policy/mdrps-20140606</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">sbg.ac.at</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="de">Universität Salzburg</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">University of Salzburg</mdui:DisplayName>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDIDCCAgigAwIBAgIVAM/a3obaebb4N7KALoWgPOwQKFPuMA0GCSqGSIb3DQEB
-BQUAMBgxFjAUBgNVBAMTDXNzby5zYmcuYWMuYXQwHhcNMTAwNDEwMTgxMzU0WhcN
-MzAwNDEwMTgxMzU0WjAYMRYwFAYDVQQDEw1zc28uc2JnLmFjLmF0MIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAso8F1k1Z3subIMuyqXHpPCNJogiv3GQ1
-uNXHNUL31ToqkIxcL+yL7QBLgnB8pZKmOaDOnveSllrTI8lArzJUbIYTRq/q8vjC
-35I5elBDktrOAAIeoogwdyhtau/AyiNvbZmPZGlcgBmWAPIUPoFjVF+U5+CbiQ8q
-iAzvdJn+yJvX+dkRQGg33Ebvh0pnlvD5qWeiwqWlJgFk4zUFNK40p3FFDMETNkTk
-7/U+bt/xMdwYdHI3wvb42ZBXTajsTsXnSlSA5B695dfpHfGbeIqTae32XsWHm77p
-+Nrl7flUJNGtTm8SNPx7K4CJIdRhdhKiuIX+5sOSxZg8iVDghZC4pwIDAQABo2Ew
-XzA+BgNVHREENzA1gg1zc28uc2JnLmFjLmF0hiRodHRwczovL3Nzby5zYmcuYWMu
-YXQvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFCr2Q6zhfulYa7kl0Pm752frFiF9
-MA0GCSqGSIb3DQEBBQUAA4IBAQB/AyjefKCO1cP806UO/L2olnsnD0VA50smzTto
-p72RH8sBCosRwkeyHI3/aqjSPEqsB1p1IcEEeOR4b+07PgtWmOMbZ6l9zOGDB7zB
-RCK2tq1P1avux6RGlj1q3vHlllfcdUnVFe3U6TOfk3faTeVBTLTpssBQOv0Y/W2k
-mWnkiKSHMFPlwWqllohGFuTfhSRLLDmX4lshBmC2WWPa/GmpqNnvY97oEYe0F/pV
-m/boLPgSS4HU06/UyTL75mHgtC9iCj4iLpDPJPDp8XcfwO62QogFU3+U7qqezqmV
-VfvOxPSoIdhmoHDf8FyFGq6FOVs0pSd+7RFboe5lAvmp6PrI
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://sso.sbg.ac.at:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sso.sbg.ac.at:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://sso.sbg.ac.at/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sso.sbg.ac.at/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sso.sbg.ac.at/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sso.sbg.ac.at/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">sbg.ac.at</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDIDCCAgigAwIBAgIVAM/a3obaebb4N7KALoWgPOwQKFPuMA0GCSqGSIb3DQEB
-BQUAMBgxFjAUBgNVBAMTDXNzby5zYmcuYWMuYXQwHhcNMTAwNDEwMTgxMzU0WhcN
-MzAwNDEwMTgxMzU0WjAYMRYwFAYDVQQDEw1zc28uc2JnLmFjLmF0MIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAso8F1k1Z3subIMuyqXHpPCNJogiv3GQ1
-uNXHNUL31ToqkIxcL+yL7QBLgnB8pZKmOaDOnveSllrTI8lArzJUbIYTRq/q8vjC
-35I5elBDktrOAAIeoogwdyhtau/AyiNvbZmPZGlcgBmWAPIUPoFjVF+U5+CbiQ8q
-iAzvdJn+yJvX+dkRQGg33Ebvh0pnlvD5qWeiwqWlJgFk4zUFNK40p3FFDMETNkTk
-7/U+bt/xMdwYdHI3wvb42ZBXTajsTsXnSlSA5B695dfpHfGbeIqTae32XsWHm77p
-+Nrl7flUJNGtTm8SNPx7K4CJIdRhdhKiuIX+5sOSxZg8iVDghZC4pwIDAQABo2Ew
-XzA+BgNVHREENzA1gg1zc28uc2JnLmFjLmF0hiRodHRwczovL3Nzby5zYmcuYWMu
-YXQvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFCr2Q6zhfulYa7kl0Pm752frFiF9
-MA0GCSqGSIb3DQEBBQUAA4IBAQB/AyjefKCO1cP806UO/L2olnsnD0VA50smzTto
-p72RH8sBCosRwkeyHI3/aqjSPEqsB1p1IcEEeOR4b+07PgtWmOMbZ6l9zOGDB7zB
-RCK2tq1P1avux6RGlj1q3vHlllfcdUnVFe3U6TOfk3faTeVBTLTpssBQOv0Y/W2k
-mWnkiKSHMFPlwWqllohGFuTfhSRLLDmX4lshBmC2WWPa/GmpqNnvY97oEYe0F/pV
-m/boLPgSS4HU06/UyTL75mHgtC9iCj4iLpDPJPDp8XcfwO62QogFU3+U7qqezqmV
-VfvOxPSoIdhmoHDf8FyFGq6FOVs0pSd+7RFboe5lAvmp6PrI
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://sso.sbg.ac.at:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sso.sbg.ac.at:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="de">Universität Salzburg</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">University of Salzburg</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="de">Universität Salzburg</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">University of Salzburg</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="de">http://www.uni-salzburg.at/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.uni-salzburg.at/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Clemens</md:GivenName>
-    <md:SurName>Renzl</md:SurName>
-    <md:EmailAddress>mailto:clemens.renzl@sbg.ac.at</md:EmailAddress>
-    <md:TelephoneNumber>+43 662 8044 6761</md:TelephoneNumber>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sso.siropglobal.org-shibboleth.xml b/swamid-interfederations-2.0/sso.siropglobal.org-shibboleth.xml
deleted file mode 100644
index 705620b5..00000000
--- a/swamid-interfederations-2.0/sso.siropglobal.org-shibboleth.xml
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sso.siropglobal.org/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://rr.aai.switch.ch/" registrationInstant="2014-10-29T08:23:57Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.switch.ch/aai/federation/switchaai/metadata-registration-practice-statement-20110711.txt</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </Extensions>
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
-    <Extensions>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">SiROP platform (www.siropglobal.org)</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Thousands of students and researchers use SiROP to post and search open positions such as internships, Master, Bachelor or PhD projects and PostDoc positions. We connect students, researchers and institutions.</mdui:Description>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDKDCCAhCgAwIBAgIJALzQmVldx2A3MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE3Nzby5zaXJvcGdsb2JhbC5vcmcwHhcNMTQxMDI4MDgxNzI5WhcNMTcxMDI3
-MDgxNzI5WjAeMRwwGgYDVQQDExNzc28uc2lyb3BnbG9iYWwub3JnMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAx64WLavrAOUS3hrtNy48EdBVdzwbYcDg
-0HmBm6inH9I4yASQp+QSPXJ+5l3FymRLigGKt2HcLzNMsO7h7ptaMd+A3PI1UKT7
-yTu7kzOjsE+9iHgTQ4nbGhQt3yl5xjjBdYdqqQrEj5FWEbvYhA/Wt+iVQMMG+zoW
-dXDwyz9TTqL/UiE02mSt0Ro9ApmLk/kj/1MxUO5miBBuGyRrFUGdXNPgt1OSjPlI
-5VDjAXdg9CYDJffHUMhq6l/QextaQy1yFNDras8A8bGxTUe84VcAAjLIcnCtv827
-mWbwunc4mk4SDTUvVD0lEiB2xBujYPDbztE/DEzChiythqzU1mDDhwIDAQABo2kw
-ZzBGBgNVHREEPzA9ghNzc28uc2lyb3BnbG9iYWwub3JnhiZodHRwczovL3Nzby5z
-aXJvcGdsb2JhbC5vcmcvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUUHYB3v8YkZziQywd
-6zbzQeks38UwDQYJKoZIhvcNAQEFBQADggEBAGKoO/l+amYeu2+/uI57e52A9PX1
-JhjburFtSrayQizXS4zFSIbu9H8SUGzo7UQ2wLEM9uI/rAlmn4Z5VnvkstkODfFj
-I29JZYw3d817h4Jqi20lasU++TfHMYGmnN7Wv9OjIQbOHIIZBGqyL7z7cTLYybT3
-7EI41ClPlg1xYunxMCEcVueS5VCVDpi/iRRgbtf8GefqPWe6nZxcbpmADIPMO8q4
-L7afxqiM5NYZ1c/id4cxXS2tptR943z6Kzfyw6pEClx/1QOWd+muOiE87QTv8ACS
-KnGGy1QRuuesWG8bve/GvCzKfjPNQDlJZv69Hchj3OmVnUVfVBhFKXjlCEQ=
-						</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://sso.siropglobal.org/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sso.siropglobal.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sso.siropglobal.org/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://sso.siropglobal.org/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sso.siropglobal.org/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sso.siropglobal.org/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <AttributeConsumingService index="1">
-      <ServiceName xml:lang="en">SiROP platform (www.siropglobal.org)</ServiceName>
-      <ServiceDescription xml:lang="en">Thousands of students and researchers use SiROP to post and search open positions such as internships, Master, Bachelor or PhD projects and PostDoc positions. We connect students, researchers and institutions.</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="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="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-      <RequestedAttribute FriendlyName="schacHomeOrganization" Name="urn:oid:1.3.6.1.4.1.25178.1.2.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-      <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="false"/>
-    </AttributeConsumingService>
-  </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>
-    <SurName>Brodbeck</SurName>
-    <EmailAddress>mailto:it@siropglobal.org</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Andreas</GivenName>
-    <SurName>Brodbeck</SurName>
-    <EmailAddress>mailto:andreas.brodbeck@mindclue.ch</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sso.siropglobal.org.xml b/swamid-interfederations-2.0/sso.siropglobal.org.xml
deleted file mode 100644
index 705620b5..00000000
--- a/swamid-interfederations-2.0/sso.siropglobal.org.xml
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sso.siropglobal.org/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://rr.aai.switch.ch/" registrationInstant="2014-10-29T08:23:57Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.switch.ch/aai/federation/switchaai/metadata-registration-practice-statement-20110711.txt</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </Extensions>
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
-    <Extensions>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">SiROP platform (www.siropglobal.org)</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Thousands of students and researchers use SiROP to post and search open positions such as internships, Master, Bachelor or PhD projects and PostDoc positions. We connect students, researchers and institutions.</mdui:Description>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDKDCCAhCgAwIBAgIJALzQmVldx2A3MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE3Nzby5zaXJvcGdsb2JhbC5vcmcwHhcNMTQxMDI4MDgxNzI5WhcNMTcxMDI3
-MDgxNzI5WjAeMRwwGgYDVQQDExNzc28uc2lyb3BnbG9iYWwub3JnMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAx64WLavrAOUS3hrtNy48EdBVdzwbYcDg
-0HmBm6inH9I4yASQp+QSPXJ+5l3FymRLigGKt2HcLzNMsO7h7ptaMd+A3PI1UKT7
-yTu7kzOjsE+9iHgTQ4nbGhQt3yl5xjjBdYdqqQrEj5FWEbvYhA/Wt+iVQMMG+zoW
-dXDwyz9TTqL/UiE02mSt0Ro9ApmLk/kj/1MxUO5miBBuGyRrFUGdXNPgt1OSjPlI
-5VDjAXdg9CYDJffHUMhq6l/QextaQy1yFNDras8A8bGxTUe84VcAAjLIcnCtv827
-mWbwunc4mk4SDTUvVD0lEiB2xBujYPDbztE/DEzChiythqzU1mDDhwIDAQABo2kw
-ZzBGBgNVHREEPzA9ghNzc28uc2lyb3BnbG9iYWwub3JnhiZodHRwczovL3Nzby5z
-aXJvcGdsb2JhbC5vcmcvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUUHYB3v8YkZziQywd
-6zbzQeks38UwDQYJKoZIhvcNAQEFBQADggEBAGKoO/l+amYeu2+/uI57e52A9PX1
-JhjburFtSrayQizXS4zFSIbu9H8SUGzo7UQ2wLEM9uI/rAlmn4Z5VnvkstkODfFj
-I29JZYw3d817h4Jqi20lasU++TfHMYGmnN7Wv9OjIQbOHIIZBGqyL7z7cTLYybT3
-7EI41ClPlg1xYunxMCEcVueS5VCVDpi/iRRgbtf8GefqPWe6nZxcbpmADIPMO8q4
-L7afxqiM5NYZ1c/id4cxXS2tptR943z6Kzfyw6pEClx/1QOWd+muOiE87QTv8ACS
-KnGGy1QRuuesWG8bve/GvCzKfjPNQDlJZv69Hchj3OmVnUVfVBhFKXjlCEQ=
-						</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://sso.siropglobal.org/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sso.siropglobal.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sso.siropglobal.org/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://sso.siropglobal.org/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sso.siropglobal.org/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sso.siropglobal.org/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <AttributeConsumingService index="1">
-      <ServiceName xml:lang="en">SiROP platform (www.siropglobal.org)</ServiceName>
-      <ServiceDescription xml:lang="en">Thousands of students and researchers use SiROP to post and search open positions such as internships, Master, Bachelor or PhD projects and PostDoc positions. We connect students, researchers and institutions.</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="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="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-      <RequestedAttribute FriendlyName="schacHomeOrganization" Name="urn:oid:1.3.6.1.4.1.25178.1.2.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-      <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="false"/>
-    </AttributeConsumingService>
-  </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>
-    <SurName>Brodbeck</SurName>
-    <EmailAddress>mailto:it@siropglobal.org</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Andreas</GivenName>
-    <SurName>Brodbeck</SurName>
-    <EmailAddress>mailto:andreas.brodbeck@mindclue.ch</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sso.tugraz.at-idp-shibboleth.xml b/swamid-interfederations-2.0/sso.tugraz.at-idp-shibboleth.xml
deleted file mode 100644
index ae54a3cb..00000000
--- a/swamid-interfederations-2.0/sso.tugraz.at-idp-shibboleth.xml
+++ /dev/null
@@ -1,101 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sso.tugraz.at/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://eduid.at" registrationInstant="2009-07-15T16:30:10Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://eduid.at/policy/mdrps-20140606</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">tugraz.at</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="de">Technische Universität Graz</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Graz University of Technology</mdui:DisplayName>
-        <mdui:Logo height="77" width="200">https://bigmail.tugraz.at/source/images/logo_head.gif</mdui:Logo>
-        <mdui:Logo height="16" width="16">https://bigmail.tugraz.at/favicon.ico</mdui:Logo>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDHzCCAgegAwIBAgIUG6ra0BvXswfyErcCDmzw3AV+uI0wDQYJKoZIhvcNAQEF
-BQAwGDEWMBQGA1UEAxMNc3NvLnR1Z3Jhei5hdDAeFw0xMDAzMjkxNzEzMTZaFw0z
-MDAzMjkxODEzMTZaMBgxFjAUBgNVBAMTDXNzby50dWdyYXouYXQwggEiMA0GCSqG
-SIb3DQEBAQUAA4IBDwAwggEKAoIBAQCEyQxHIM1zxbBnXn60Ksg7B7HcPLPcN7bX
-LrLPOFXtkZxm0YkHY5Rxignm7wHD7C81U09DFS2eT8qRCcVtVz+kuwdgS54fC/al
-g9oLxXk4CgKjhtZZ2ECLdTHfUXOA5uOLlpoN1LY6VpIjSYe3UEX3HxfhXx/fPeE8
-VInGCKnml8Too22G30htB/EU44A2yqrR3LUngJIaq//N0QbeMYitNh02o6xB5+bp
-6k6noM7DH6S9phe0kCEibaiLaCf7k9LpNnAz9bPtQVth0gdJqoUry/iK1QBTFTEX
-vvJynFEp0+5Wz/XFmEcFhsaK8OcHd0R9FfpX5Z2fewA2Q0SLKz+bAgMBAAGjYTBf
-MD4GA1UdEQQ3MDWCDXNzby50dWdyYXouYXSGJGh0dHBzOi8vc3NvLnR1Z3Jhei5h
-dC9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUXd76PcSiXR6wFna5qQi+S0W/9Y0w
-DQYJKoZIhvcNAQEFBQADggEBACgkQqxBtYY1OcuoAUP/P+ukJW7XyofK89qs2dkG
-Clx7s0hR/1zImWgljgfguLJOSfC/CWE1wfNK9bTi4Fu9809PmOoaCxkNmniFRAya
-OiBoUz5XIpJniW7wBo+YBpBlXZXi5PmU2DOsfZxo7fs4se32dHO1WqgJodqkK2Wa
-4HDiigh42trZ9i3uS73uHSSCeIJYQNj84BMJ+ifgj3Zi/TgLS+IX7Ayy2bkDzIzI
-Rnj7ULQ/MgfacGXQXJPHyp+w+YvydQalPAWc43+5DkNacN34K8cE3XjHq1kx/BgY
-OtQ7M2Xa1oApLzPoHO4D2kaf6FCgGR8Mx7GVAz0aQVxfB8I=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://sso.tugraz.at:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sso.tugraz.at: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:1.1:nameid-format:unspecified</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://sso.tugraz.at/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sso.tugraz.at/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sso.tugraz.at/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sso.tugraz.at/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">tugraz.at</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDHzCCAgegAwIBAgIUG6ra0BvXswfyErcCDmzw3AV+uI0wDQYJKoZIhvcNAQEF
-BQAwGDEWMBQGA1UEAxMNc3NvLnR1Z3Jhei5hdDAeFw0xMDAzMjkxNzEzMTZaFw0z
-MDAzMjkxODEzMTZaMBgxFjAUBgNVBAMTDXNzby50dWdyYXouYXQwggEiMA0GCSqG
-SIb3DQEBAQUAA4IBDwAwggEKAoIBAQCEyQxHIM1zxbBnXn60Ksg7B7HcPLPcN7bX
-LrLPOFXtkZxm0YkHY5Rxignm7wHD7C81U09DFS2eT8qRCcVtVz+kuwdgS54fC/al
-g9oLxXk4CgKjhtZZ2ECLdTHfUXOA5uOLlpoN1LY6VpIjSYe3UEX3HxfhXx/fPeE8
-VInGCKnml8Too22G30htB/EU44A2yqrR3LUngJIaq//N0QbeMYitNh02o6xB5+bp
-6k6noM7DH6S9phe0kCEibaiLaCf7k9LpNnAz9bPtQVth0gdJqoUry/iK1QBTFTEX
-vvJynFEp0+5Wz/XFmEcFhsaK8OcHd0R9FfpX5Z2fewA2Q0SLKz+bAgMBAAGjYTBf
-MD4GA1UdEQQ3MDWCDXNzby50dWdyYXouYXSGJGh0dHBzOi8vc3NvLnR1Z3Jhei5h
-dC9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUXd76PcSiXR6wFna5qQi+S0W/9Y0w
-DQYJKoZIhvcNAQEFBQADggEBACgkQqxBtYY1OcuoAUP/P+ukJW7XyofK89qs2dkG
-Clx7s0hR/1zImWgljgfguLJOSfC/CWE1wfNK9bTi4Fu9809PmOoaCxkNmniFRAya
-OiBoUz5XIpJniW7wBo+YBpBlXZXi5PmU2DOsfZxo7fs4se32dHO1WqgJodqkK2Wa
-4HDiigh42trZ9i3uS73uHSSCeIJYQNj84BMJ+ifgj3Zi/TgLS+IX7Ayy2bkDzIzI
-Rnj7ULQ/MgfacGXQXJPHyp+w+YvydQalPAWc43+5DkNacN34K8cE3XjHq1kx/BgY
-OtQ7M2Xa1oApLzPoHO4D2kaf6FCgGR8Mx7GVAz0aQVxfB8I=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://sso.tugraz.at:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sso.tugraz.at:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="de">Technische Universität Graz</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">Graz University of Technology</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="de">Technische Universität Graz</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Graz University of Technology</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="de">http://www.zid.tugraz.at/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.tugraz.at/en/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>SSO</md:GivenName>
-    <md:SurName>Admins</md:SurName>
-    <md:EmailAddress>mailto:sso@tugraz.at</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sso.tugraz.at.xml b/swamid-interfederations-2.0/sso.tugraz.at.xml
deleted file mode 100644
index ae54a3cb..00000000
--- a/swamid-interfederations-2.0/sso.tugraz.at.xml
+++ /dev/null
@@ -1,101 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sso.tugraz.at/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://eduid.at" registrationInstant="2009-07-15T16:30:10Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://eduid.at/policy/mdrps-20140606</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">tugraz.at</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="de">Technische Universität Graz</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Graz University of Technology</mdui:DisplayName>
-        <mdui:Logo height="77" width="200">https://bigmail.tugraz.at/source/images/logo_head.gif</mdui:Logo>
-        <mdui:Logo height="16" width="16">https://bigmail.tugraz.at/favicon.ico</mdui:Logo>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDHzCCAgegAwIBAgIUG6ra0BvXswfyErcCDmzw3AV+uI0wDQYJKoZIhvcNAQEF
-BQAwGDEWMBQGA1UEAxMNc3NvLnR1Z3Jhei5hdDAeFw0xMDAzMjkxNzEzMTZaFw0z
-MDAzMjkxODEzMTZaMBgxFjAUBgNVBAMTDXNzby50dWdyYXouYXQwggEiMA0GCSqG
-SIb3DQEBAQUAA4IBDwAwggEKAoIBAQCEyQxHIM1zxbBnXn60Ksg7B7HcPLPcN7bX
-LrLPOFXtkZxm0YkHY5Rxignm7wHD7C81U09DFS2eT8qRCcVtVz+kuwdgS54fC/al
-g9oLxXk4CgKjhtZZ2ECLdTHfUXOA5uOLlpoN1LY6VpIjSYe3UEX3HxfhXx/fPeE8
-VInGCKnml8Too22G30htB/EU44A2yqrR3LUngJIaq//N0QbeMYitNh02o6xB5+bp
-6k6noM7DH6S9phe0kCEibaiLaCf7k9LpNnAz9bPtQVth0gdJqoUry/iK1QBTFTEX
-vvJynFEp0+5Wz/XFmEcFhsaK8OcHd0R9FfpX5Z2fewA2Q0SLKz+bAgMBAAGjYTBf
-MD4GA1UdEQQ3MDWCDXNzby50dWdyYXouYXSGJGh0dHBzOi8vc3NvLnR1Z3Jhei5h
-dC9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUXd76PcSiXR6wFna5qQi+S0W/9Y0w
-DQYJKoZIhvcNAQEFBQADggEBACgkQqxBtYY1OcuoAUP/P+ukJW7XyofK89qs2dkG
-Clx7s0hR/1zImWgljgfguLJOSfC/CWE1wfNK9bTi4Fu9809PmOoaCxkNmniFRAya
-OiBoUz5XIpJniW7wBo+YBpBlXZXi5PmU2DOsfZxo7fs4se32dHO1WqgJodqkK2Wa
-4HDiigh42trZ9i3uS73uHSSCeIJYQNj84BMJ+ifgj3Zi/TgLS+IX7Ayy2bkDzIzI
-Rnj7ULQ/MgfacGXQXJPHyp+w+YvydQalPAWc43+5DkNacN34K8cE3XjHq1kx/BgY
-OtQ7M2Xa1oApLzPoHO4D2kaf6FCgGR8Mx7GVAz0aQVxfB8I=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://sso.tugraz.at:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sso.tugraz.at: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:1.1:nameid-format:unspecified</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://sso.tugraz.at/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sso.tugraz.at/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sso.tugraz.at/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sso.tugraz.at/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">tugraz.at</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDHzCCAgegAwIBAgIUG6ra0BvXswfyErcCDmzw3AV+uI0wDQYJKoZIhvcNAQEF
-BQAwGDEWMBQGA1UEAxMNc3NvLnR1Z3Jhei5hdDAeFw0xMDAzMjkxNzEzMTZaFw0z
-MDAzMjkxODEzMTZaMBgxFjAUBgNVBAMTDXNzby50dWdyYXouYXQwggEiMA0GCSqG
-SIb3DQEBAQUAA4IBDwAwggEKAoIBAQCEyQxHIM1zxbBnXn60Ksg7B7HcPLPcN7bX
-LrLPOFXtkZxm0YkHY5Rxignm7wHD7C81U09DFS2eT8qRCcVtVz+kuwdgS54fC/al
-g9oLxXk4CgKjhtZZ2ECLdTHfUXOA5uOLlpoN1LY6VpIjSYe3UEX3HxfhXx/fPeE8
-VInGCKnml8Too22G30htB/EU44A2yqrR3LUngJIaq//N0QbeMYitNh02o6xB5+bp
-6k6noM7DH6S9phe0kCEibaiLaCf7k9LpNnAz9bPtQVth0gdJqoUry/iK1QBTFTEX
-vvJynFEp0+5Wz/XFmEcFhsaK8OcHd0R9FfpX5Z2fewA2Q0SLKz+bAgMBAAGjYTBf
-MD4GA1UdEQQ3MDWCDXNzby50dWdyYXouYXSGJGh0dHBzOi8vc3NvLnR1Z3Jhei5h
-dC9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUXd76PcSiXR6wFna5qQi+S0W/9Y0w
-DQYJKoZIhvcNAQEFBQADggEBACgkQqxBtYY1OcuoAUP/P+ukJW7XyofK89qs2dkG
-Clx7s0hR/1zImWgljgfguLJOSfC/CWE1wfNK9bTi4Fu9809PmOoaCxkNmniFRAya
-OiBoUz5XIpJniW7wBo+YBpBlXZXi5PmU2DOsfZxo7fs4se32dHO1WqgJodqkK2Wa
-4HDiigh42trZ9i3uS73uHSSCeIJYQNj84BMJ+ifgj3Zi/TgLS+IX7Ayy2bkDzIzI
-Rnj7ULQ/MgfacGXQXJPHyp+w+YvydQalPAWc43+5DkNacN34K8cE3XjHq1kx/BgY
-OtQ7M2Xa1oApLzPoHO4D2kaf6FCgGR8Mx7GVAz0aQVxfB8I=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://sso.tugraz.at:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sso.tugraz.at:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="de">Technische Universität Graz</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">Graz University of Technology</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="de">Technische Universität Graz</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Graz University of Technology</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="de">http://www.zid.tugraz.at/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.tugraz.at/en/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>SSO</md:GivenName>
-    <md:SurName>Admins</md:SurName>
-    <md:EmailAddress>mailto:sso@tugraz.at</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sso.u-psud.fr-idp.xml b/swamid-interfederations-2.0/sso.u-psud.fr-idp.xml
deleted file mode 100644
index 6f553d74..00000000
--- a/swamid-interfederations-2.0/sso.u-psud.fr-idp.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sso.u-psud.fr/idp">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2010-02-09T10:08:41Z">
-      <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">u-psud.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">Université de Paris-Sud</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDIDCCAgigAwIBAgIVAIUJk6EXza7L7QSpNoIN24P1I8rlMA0GCSqGSIb3DQEB
-BQUAMBgxFjAUBgNVBAMTDXNzby51LXBzdWQuZnIwHhcNMTAwMjA4MTAwOTA0WhcN
-MzAwMjA4MTAwOTA0WjAYMRYwFAYDVQQDEw1zc28udS1wc3VkLmZyMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAroxa30hNBV4PaO3ESgOkEjFPCtg1MaOo
-L55D4a/hiuuuv4Lfa25MNaiAmUx26o7x575VkYv6UJb9BQmXGUZPwHH0EQDXw/ZZ
-LGuW8M9K7L1ZYSLfjFVYWBY1jGsUhQjsEkG+G2zpmluUnWh5WUS6Px8wCS+1KbHP
-HXyR5l/WZoNnH/7A1GLMRokGIt5ZTYDLw9hD3JA9oACCP8c3PgNrZRnQc4kw1/Rl
-GKAncAfde8U0kv6BhCcjr7M2LDEBVP+gC3wEIO+UOAuSbRpD7ECSJVAc8GqR20b4
-5FRFPgKptk9dtoxpyyA3wyPp6DHHiywG24B+GF4xEMv1yUczX1weIQIDAQABo2Ew
-XzA+BgNVHREENzA1gg1zc28udS1wc3VkLmZyhiRodHRwczovL3Nzby51LXBzdWQu
-ZnIvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFAhfKZQU4qijehvftE595ElwwPE5
-MA0GCSqGSIb3DQEBBQUAA4IBAQCjeft61T2pXsTQ+7s/q9nCI3jGTtSjRcA2Pjkx
-RmlmfmCoJfR1U0eG0bZKjjydBoezTGr5WRGpGPGq9Ta7q5t3tmSFTowq60ZKJwSh
-CpXXvrIi9lRHMxoTGC2XyxgP9QmzIG/jR/er1zOCbAhTJBiBThdGFCnBwlPmZDIk
-VwYSV7zlyGtzh7cSldKwIkvifFOh9Op376MhuPAmFqUnfEJGzJbyttrolQ2I4oUw
-wKiyOu3VYdTiu+FcCFVdKWOOIqV+v/8cWHlaUTS1+RC+exL6305K8Kkv5xhpyxCR
-QUfLusw8PKdnTW45JL7EEdO48zPq2va8ihPE82nrZVK0wt/q
-					    </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://sso.u-psud.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sso.u-psud.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://sso.u-psud.fr/idp/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Université de Paris-Sud</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Université de Paris-Sud</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Laubenberger Stéphane</SurName>
-    <EmailAddress>stephane.laubenberger@u-psud.fr</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <SurName>Lambert Dominique</SurName>
-    <EmailAddress>dominique.lambert@u-psud.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sso.u-psud.fr.xml b/swamid-interfederations-2.0/sso.u-psud.fr.xml
deleted file mode 100644
index 6f553d74..00000000
--- a/swamid-interfederations-2.0/sso.u-psud.fr.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sso.u-psud.fr/idp">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2010-02-09T10:08:41Z">
-      <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">u-psud.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">Université de Paris-Sud</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDIDCCAgigAwIBAgIVAIUJk6EXza7L7QSpNoIN24P1I8rlMA0GCSqGSIb3DQEB
-BQUAMBgxFjAUBgNVBAMTDXNzby51LXBzdWQuZnIwHhcNMTAwMjA4MTAwOTA0WhcN
-MzAwMjA4MTAwOTA0WjAYMRYwFAYDVQQDEw1zc28udS1wc3VkLmZyMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAroxa30hNBV4PaO3ESgOkEjFPCtg1MaOo
-L55D4a/hiuuuv4Lfa25MNaiAmUx26o7x575VkYv6UJb9BQmXGUZPwHH0EQDXw/ZZ
-LGuW8M9K7L1ZYSLfjFVYWBY1jGsUhQjsEkG+G2zpmluUnWh5WUS6Px8wCS+1KbHP
-HXyR5l/WZoNnH/7A1GLMRokGIt5ZTYDLw9hD3JA9oACCP8c3PgNrZRnQc4kw1/Rl
-GKAncAfde8U0kv6BhCcjr7M2LDEBVP+gC3wEIO+UOAuSbRpD7ECSJVAc8GqR20b4
-5FRFPgKptk9dtoxpyyA3wyPp6DHHiywG24B+GF4xEMv1yUczX1weIQIDAQABo2Ew
-XzA+BgNVHREENzA1gg1zc28udS1wc3VkLmZyhiRodHRwczovL3Nzby51LXBzdWQu
-ZnIvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFAhfKZQU4qijehvftE595ElwwPE5
-MA0GCSqGSIb3DQEBBQUAA4IBAQCjeft61T2pXsTQ+7s/q9nCI3jGTtSjRcA2Pjkx
-RmlmfmCoJfR1U0eG0bZKjjydBoezTGr5WRGpGPGq9Ta7q5t3tmSFTowq60ZKJwSh
-CpXXvrIi9lRHMxoTGC2XyxgP9QmzIG/jR/er1zOCbAhTJBiBThdGFCnBwlPmZDIk
-VwYSV7zlyGtzh7cSldKwIkvifFOh9Op376MhuPAmFqUnfEJGzJbyttrolQ2I4oUw
-wKiyOu3VYdTiu+FcCFVdKWOOIqV+v/8cWHlaUTS1+RC+exL6305K8Kkv5xhpyxCR
-QUfLusw8PKdnTW45JL7EEdO48zPq2va8ihPE82nrZVK0wt/q
-					    </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://sso.u-psud.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sso.u-psud.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://sso.u-psud.fr/idp/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Université de Paris-Sud</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Université de Paris-Sud</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Laubenberger Stéphane</SurName>
-    <EmailAddress>stephane.laubenberger@u-psud.fr</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <SurName>Lambert Dominique</SurName>
-    <EmailAddress>dominique.lambert@u-psud.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sso.utu.fi-sso-idp.xml b/swamid-interfederations-2.0/sso.utu.fi-sso-idp.xml
index 7275d47e..7b50bdbc 100644
--- a/swamid-interfederations-2.0/sso.utu.fi-sso-idp.xml
+++ b/swamid-interfederations-2.0/sso.utu.fi-sso-idp.xml
@@ -1,20 +1,19 @@
 <?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" entityID="https://sso.utu.fi/sso-idp">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.csc.fi/haka">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://www.csc.fi/english/institutions/haka/instructions/join/eduGAINRegistrationStatement/</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" 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://sso.utu.fi/sso-idp">
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
       <shibmd:Scope regexp="false">utu.fi</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+      <mdui:UIInfo>
         <mdui:DisplayName xml:lang="fi">Turun yliopisto</mdui:DisplayName>
         <mdui:DisplayName xml:lang="en">University of Turku</mdui:DisplayName>
         <mdui:DisplayName xml:lang="sv">Åbo universitet</mdui:DisplayName>
       </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
+      <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>MIIHATCCBemgAwIBAgIQA4hFUiEZYqQbSVWEoSGbCjANBgkqhkiG9w0BAQUFADBp
@@ -57,35 +56,35 @@ njozQAomahtd02Vl0gONjgJIzxu/wzqefV1QON7qmFbeTH4JDXtdOGSK3zvVJI13
 8MIAfW66Oc6zKMOf26tiwK0/jhtn</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </KeyDescriptor>
-    <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:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sso.utu.fi:443/sso/SSORedirect/metaAlias/utu/sso-idp"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="fi">Turun yliopisto</OrganizationName>
-    <OrganizationName xml:lang="en">University of Turku</OrganizationName>
-    <OrganizationName xml:lang="sv">Åbo universitet</OrganizationName>
-    <OrganizationDisplayName xml:lang="fi">Turun yliopisto</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">University of Turku</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="sv">Åbo universitet</OrganizationDisplayName>
-    <OrganizationURL xml:lang="fi">http://www.utu.fi/</OrganizationURL>
-    <OrganizationURL xml:lang="en">http://www.utu.fi/</OrganizationURL>
-    <OrganizationURL xml:lang="sv">http://www.utu.fi/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Tuomas</GivenName>
-    <SurName>Honkala</SurName>
-    <EmailAddress>mailto:hakajasen@utu.fi</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Petri</GivenName>
-    <SurName>Teraspuro</SurName>
-    <EmailAddress>mailto:hakajasen@utu.fi</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="support">
-    <GivenName>Elina</GivenName>
-    <SurName>Toivanen</SurName>
-    <EmailAddress>mailto:hakajasen@utu.fi</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sso.utu.fi:443/sso/SSORedirect/metaAlias/utu/sso-idp"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="fi">Turun yliopisto</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">University of Turku</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">Åbo universitet</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="fi">Turun yliopisto</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">University of Turku</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">Åbo universitet</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="fi">http://www.utu.fi/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.utu.fi/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">http://www.utu.fi/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Tuomas</md:GivenName>
+    <md:SurName>Honkala</md:SurName>
+    <md:EmailAddress>mailto:hakajasen@utu.fi</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Petri</md:GivenName>
+    <md:SurName>Teraspuro</md:SurName>
+    <md:EmailAddress>mailto:hakajasen@utu.fi</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Elina</md:GivenName>
+    <md:SurName>Toivanen</md:SurName>
+    <md:EmailAddress>mailto:hakajasen@utu.fi</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sso.utu.fi.xml b/swamid-interfederations-2.0/sso.utu.fi.xml
deleted file mode 100644
index 7275d47e..00000000
--- a/swamid-interfederations-2.0/sso.utu.fi.xml
+++ /dev/null
@@ -1,91 +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" entityID="https://sso.utu.fi/sso-idp">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.csc.fi/haka">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://www.csc.fi/english/institutions/haka/instructions/join/eduGAINRegistrationStatement/</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">utu.fi</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fi">Turun yliopisto</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">University of Turku</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="sv">Åbo universitet</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIHATCCBemgAwIBAgIQA4hFUiEZYqQbSVWEoSGbCjANBgkqhkiG9w0BAQUFADBp
-MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3
-d3cuZGlnaWNlcnQuY29tMSgwJgYDVQQDEx9EaWdpQ2VydCBIaWdoIEFzc3VyYW5j
-ZSBFViBDQS0xMB4XDTEzMDUwMzAwMDAwMFoXDTE1MDcyNzEyMDAwMFowgccxHTAb
-BgNVBA8MFFByaXZhdGUgT3JnYW5pemF0aW9uMRMwEQYLKwYBBAGCNzwCAQMTAkZJ
-MRIwEAYDVQQFEwkwMjQ1ODk2LTMxFzAVBgNVBAkTDllsaW9waXN0b25tYWtpMQ4w
-DAYDVQQREwUyMDAxNDELMAkGA1UEBhMCRkkxGDAWBgNVBAcTD1R1cnVuIHlsaW9w
-aXN0bzEYMBYGA1UEChMPVHVydW4geWxpb3Bpc3RvMRMwEQYDVQQDEwpzc28udXR1
-LmZpMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA1vhuuU33l0RwmzLX
-vgxp4qondQQzWnRu7y+OMFgLKm4Zfxs/d6XyJZxI/yVzEZGuYAJwPkqjQ33L8RJP
-DQusjfYcMu+oBFC73bi4SR+82DObxleNNS2wfH9f48KwQJrOZHEG4VWtf9zv7OSz
-YU8nrnRF8oEnUpFMH8OMfUFWBPVkTsMTkTlqA527v8C8y+I16vMFThD8KSJHx1bg
-Gg70uLJjcssAvOprsVTxCINCIDtT9C42gfUFN1o5pOD78Gp70zXTjdNz5p+eZ4Uy
-7d9TjCzMEaxi9Lw6XJ5GyMceicZOwmRNIuyeoKTB78QnqTNHcVPIV7ziZlUuTDM4
-+9lnqwIDAQABo4IDRDCCA0AwHwYDVR0jBBgwFoAUTFjLJfBBT1L0KMiBQ5umqKDm
-kuUwHQYDVR0OBBYEFBVqgvD+vMcjkY79qLX45EWTop2lMBUGA1UdEQQOMAyCCnNz
-by51dHUuZmkwDgYDVR0PAQH/BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggr
-BgEFBQcDAjBjBgNVHR8EXDBaMCugKaAnhiVodHRwOi8vY3JsMy5kaWdpY2VydC5j
-b20vZXZjYTEtZzIuY3JsMCugKaAnhiVodHRwOi8vY3JsNC5kaWdpY2VydC5jb20v
-ZXZjYTEtZzIuY3JsMIIBxAYDVR0gBIIBuzCCAbcwggGzBglghkgBhv1sAgEwggGk
-MDoGCCsGAQUFBwIBFi5odHRwOi8vd3d3LmRpZ2ljZXJ0LmNvbS9zc2wtY3BzLXJl
-cG9zaXRvcnkuaHRtMIIBZAYIKwYBBQUHAgIwggFWHoIBUgBBAG4AeQAgAHUAcwBl
-ACAAbwBmACAAdABoAGkAcwAgAEMAZQByAHQAaQBmAGkAYwBhAHQAZQAgAGMAbwBu
-AHMAdABpAHQAdQB0AGUAcwAgAGEAYwBjAGUAcAB0AGEAbgBjAGUAIABvAGYAIAB0
-AGgAZQAgAEQAaQBnAGkAQwBlAHIAdAAgAEMAUAAvAEMAUABTACAAYQBuAGQAIAB0
-AGgAZQAgAFIAZQBsAHkAaQBuAGcAIABQAGEAcgB0AHkAIABBAGcAcgBlAGUAbQBl
-AG4AdAAgAHcAaABpAGMAaAAgAGwAaQBtAGkAdAAgAGwAaQBhAGIAaQBsAGkAdAB5
-ACAAYQBuAGQAIABhAHIAZQAgAGkAbgBjAG8AcgBwAG8AcgBhAHQAZQBkACAAaABl
-AHIAZQBpAG4AIABiAHkAIAByAGUAZgBlAHIAZQBuAGMAZQAuMH0GCCsGAQUFBwEB
-BHEwbzAkBggrBgEFBQcwAYYYaHR0cDovL29jc3AuZGlnaWNlcnQuY29tMEcGCCsG
-AQUFBzAChjtodHRwOi8vY2FjZXJ0cy5kaWdpY2VydC5jb20vRGlnaUNlcnRIaWdo
-QXNzdXJhbmNlRVZDQS0xLmNydDAMBgNVHRMBAf8EAjAAMA0GCSqGSIb3DQEBBQUA
-A4IBAQDCtPwaft7YbgqxW67NORhve9oSg1sqafSHg7edecvgH9UHZlC8VAr0WyAM
-m+tyPyi6UTAVo8VxQL3NO3lXZMLzdKdsSbYz0EZIaZCItuR7wW6Ca+idDx9yP8yA
-nmkbwLzbAnU2gnlYlqmZlndlZKaSRpJvangOhiXM1ekE7qlSxHWfucuSsG2nUvja
-njozQAomahtd02Vl0gONjgJIzxu/wzqefV1QON7qmFbeTH4JDXtdOGSK3zvVJI13
-5yoWgJf59vwhK9XIM+yoT5eapixOXaIFBI3faMN6hCWu43rkKw0hZNe5CBLMTOQz
-8MIAfW66Oc6zKMOf26tiwK0/jhtn</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <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:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sso.utu.fi:443/sso/SSORedirect/metaAlias/utu/sso-idp"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="fi">Turun yliopisto</OrganizationName>
-    <OrganizationName xml:lang="en">University of Turku</OrganizationName>
-    <OrganizationName xml:lang="sv">Åbo universitet</OrganizationName>
-    <OrganizationDisplayName xml:lang="fi">Turun yliopisto</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">University of Turku</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="sv">Åbo universitet</OrganizationDisplayName>
-    <OrganizationURL xml:lang="fi">http://www.utu.fi/</OrganizationURL>
-    <OrganizationURL xml:lang="en">http://www.utu.fi/</OrganizationURL>
-    <OrganizationURL xml:lang="sv">http://www.utu.fi/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Tuomas</GivenName>
-    <SurName>Honkala</SurName>
-    <EmailAddress>mailto:hakajasen@utu.fi</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Petri</GivenName>
-    <SurName>Teraspuro</SurName>
-    <EmailAddress>mailto:hakajasen@utu.fi</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="support">
-    <GivenName>Elina</GivenName>
-    <SurName>Toivanen</SurName>
-    <EmailAddress>mailto:hakajasen@utu.fi</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sso.vgtu.lt-saml2-idp-metadata.php.xml b/swamid-interfederations-2.0/sso.vgtu.lt-saml2-idp-metadata.php.xml
deleted file mode 100644
index 8dd0927d..00000000
--- a/swamid-interfederations-2.0/sso.vgtu.lt-saml2-idp-metadata.php.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sso.vgtu.lt/saml2/idp/metadata.php">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://fedi.litnet.lt" registrationInstant="2013-10-15T09:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="lt">https://fedi.litnet.lt/lt/tvarka</mdrpi:RegistrationPolicy>
-      <mdrpi:RegistrationPolicy xml:lang="en">https://fedi.litnet.lt/en/policy</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="lt">Vilniaus Gedimino technikos universitetas</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Vilnius Gediminas technical university</mdui:DisplayName>
-        <mdui:Description xml:lang="lt">VGTU desc (lt)</mdui:Description>
-        <mdui:Description xml:lang="en">VGTU desc (en)</mdui:Description>
-        <mdui:InformationURL xml:lang="lt">http://www.vgtu.lt/lt</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">http://www.vgtu.lt/en</mdui:InformationURL>
-        <mdui:Logo height="256" width="256">http://www.vgtu.lt/media/VGTU%20tinklapis/pictures/logo2014_pagr.jpg</mdui:Logo>
-        <mdui:Logo height="88" width="80">http://www.vgtu.lt/media/VGTU%20tinklapis/pictures/logo2014_pagr.jpg</mdui:Logo>
-        <mdui:Logo height="16" width="16">http://www.vgtu.lt/media/VGTU%20tinklapis/pictures/logo2014_pagr.jpg</mdui:Logo>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:IPHint>158.129.192.0/18</mdui:IPHint>
-        <mdui:DomainHint>vgtu.lt</mdui:DomainHint>
-        <mdui:GeolocationHint>geo:54.683333,25.283333</mdui:GeolocationHint>
-      </mdui:DiscoHints>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIID2TCCAsGgAwIBAgIJAJxLaKaVPb80MA0GCSqGSIb3DQEBBQUAMIGCMQswCQYDVQQGEwJMVDEQMA4GA1UECAwHVmlsbml1czEQMA4GA1UEBwwHVmlsbml1czENMAsGA1UECgwEVkdUVTELMAkGA1UECwwCSVQxFDASBgNVBAMMC3Nzby52Z3R1Lmx0MR0wGwYJKoZIhvcNAQkBFg5maWxzYXZAdmd0dS5sdDAeFw0xMzAzMDUxMDU3NDRaFw0yMzAzMDUxMDU3NDRaMIGCMQswCQYDVQQGEwJMVDEQMA4GA1UECAwHVmlsbml1czEQMA4GA1UEBwwHVmlsbml1czENMAsGA1UECgwEVkdUVTELMAkGA1UECwwCSVQxFDASBgNVBAMMC3Nzby52Z3R1Lmx0MR0wGwYJKoZIhvcNAQkBFg5maWxzYXZAdmd0dS5sdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANPBRmQdW7yE6Ob47RS63wc6eamLrbcZ8d3BHbkTKOg3zvty9kNGlsRHKJKaTxZJHxxJeGyFK7wD1T7esm6H4xlGd/vPkJ8BiJGaYFt+z6AK0U/C24lAUTBme0XE12kVhR2Ld+AbocdKbgRvkQDs2nupi8bT8GrcLPqEVNfrEcuoWPR0VDrn+cc9eQWsnwAi6vqPNG9BP+tXun1mKRNjLwe7xpIU2dEt4kNNvHKHzbuqMOePvURsMLYWM0GiLA5qMXU/plsgEva09gSONJqUo5PiF5CkcFZqyyJNKznIAZnLuFWJR7a3G4ArQ0BEuGzv7nchzVf+ffdClMlYOflWas0CAwEAAaNQME4wHQYDVR0OBBYEFHaPCulJCIz/U1G0e7fraytboJPGMB8GA1UdIwQYMBaAFHaPCulJCIz/U1G0e7fraytboJPGMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBACoR6yldDCdkFwAM/UvbmAAhYizDFszWNi53//exw4Q7LYFFExl7h6jjnZphO8/JpYBQ8gqthhEyQe1QRs/3ZBkWJC6mhUu9V6pv/n+10wPew8fm2W6FIgprTmjfz98BCff/Bk7SAqssJRGSKKmgqetMcBXQDEcAQ9i1RpFK/j51mQ6+ynBRvynN0wpAGbKYnKlH4nZhe9DDhKO+P9MDMzbDrTudjZViRUXYxY0Ay8Kfm3TgjL+Yw8/LGhSXO0k9XfCcLVC+e+4YQEUOCQNgOPDRKmZH/jntqXmfY0Dtak0612n8RmJzwybPFyeNY+yeZhb+XEWT9uwq3YM7Zl85YSg=</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>MIID2TCCAsGgAwIBAgIJAJxLaKaVPb80MA0GCSqGSIb3DQEBBQUAMIGCMQswCQYDVQQGEwJMVDEQMA4GA1UECAwHVmlsbml1czEQMA4GA1UEBwwHVmlsbml1czENMAsGA1UECgwEVkdUVTELMAkGA1UECwwCSVQxFDASBgNVBAMMC3Nzby52Z3R1Lmx0MR0wGwYJKoZIhvcNAQkBFg5maWxzYXZAdmd0dS5sdDAeFw0xMzAzMDUxMDU3NDRaFw0yMzAzMDUxMDU3NDRaMIGCMQswCQYDVQQGEwJMVDEQMA4GA1UECAwHVmlsbml1czEQMA4GA1UEBwwHVmlsbml1czENMAsGA1UECgwEVkdUVTELMAkGA1UECwwCSVQxFDASBgNVBAMMC3Nzby52Z3R1Lmx0MR0wGwYJKoZIhvcNAQkBFg5maWxzYXZAdmd0dS5sdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANPBRmQdW7yE6Ob47RS63wc6eamLrbcZ8d3BHbkTKOg3zvty9kNGlsRHKJKaTxZJHxxJeGyFK7wD1T7esm6H4xlGd/vPkJ8BiJGaYFt+z6AK0U/C24lAUTBme0XE12kVhR2Ld+AbocdKbgRvkQDs2nupi8bT8GrcLPqEVNfrEcuoWPR0VDrn+cc9eQWsnwAi6vqPNG9BP+tXun1mKRNjLwe7xpIU2dEt4kNNvHKHzbuqMOePvURsMLYWM0GiLA5qMXU/plsgEva09gSONJqUo5PiF5CkcFZqyyJNKznIAZnLuFWJR7a3G4ArQ0BEuGzv7nchzVf+ffdClMlYOflWas0CAwEAAaNQME4wHQYDVR0OBBYEFHaPCulJCIz/U1G0e7fraytboJPGMB8GA1UdIwQYMBaAFHaPCulJCIz/U1G0e7fraytboJPGMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBACoR6yldDCdkFwAM/UvbmAAhYizDFszWNi53//exw4Q7LYFFExl7h6jjnZphO8/JpYBQ8gqthhEyQe1QRs/3ZBkWJC6mhUu9V6pv/n+10wPew8fm2W6FIgprTmjfz98BCff/Bk7SAqssJRGSKKmgqetMcBXQDEcAQ9i1RpFK/j51mQ6+ynBRvynN0wpAGbKYnKlH4nZhe9DDhKO+P9MDMzbDrTudjZViRUXYxY0Ay8Kfm3TgjL+Yw8/LGhSXO0k9XfCcLVC+e+4YQEUOCQNgOPDRKmZH/jntqXmfY0Dtak0612n8RmJzwybPFyeNY+yeZhb+XEWT9uwq3YM7Zl85YSg=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sso.vgtu.lt/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://sso.vgtu.lt/saml2/idp/SSOService.php"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Vilnius Gediminas Technical University</md:OrganizationName>
-    <md:OrganizationName xml:lang="lt">Vilniaus Gedimino technikos universitetas</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Vilnius Gediminas Technical University</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="lt">Vilniaus Gedimino technikos universitetas</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.vgtu.lt</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Filip</md:GivenName>
-    <md:SurName>Savin</md:SurName>
-    <md:EmailAddress>sso@vgtu.lt</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sso.vgtu.lt.xml b/swamid-interfederations-2.0/sso.vgtu.lt.xml
deleted file mode 100644
index 8dd0927d..00000000
--- a/swamid-interfederations-2.0/sso.vgtu.lt.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sso.vgtu.lt/saml2/idp/metadata.php">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://fedi.litnet.lt" registrationInstant="2013-10-15T09:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="lt">https://fedi.litnet.lt/lt/tvarka</mdrpi:RegistrationPolicy>
-      <mdrpi:RegistrationPolicy xml:lang="en">https://fedi.litnet.lt/en/policy</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="lt">Vilniaus Gedimino technikos universitetas</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Vilnius Gediminas technical university</mdui:DisplayName>
-        <mdui:Description xml:lang="lt">VGTU desc (lt)</mdui:Description>
-        <mdui:Description xml:lang="en">VGTU desc (en)</mdui:Description>
-        <mdui:InformationURL xml:lang="lt">http://www.vgtu.lt/lt</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">http://www.vgtu.lt/en</mdui:InformationURL>
-        <mdui:Logo height="256" width="256">http://www.vgtu.lt/media/VGTU%20tinklapis/pictures/logo2014_pagr.jpg</mdui:Logo>
-        <mdui:Logo height="88" width="80">http://www.vgtu.lt/media/VGTU%20tinklapis/pictures/logo2014_pagr.jpg</mdui:Logo>
-        <mdui:Logo height="16" width="16">http://www.vgtu.lt/media/VGTU%20tinklapis/pictures/logo2014_pagr.jpg</mdui:Logo>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:IPHint>158.129.192.0/18</mdui:IPHint>
-        <mdui:DomainHint>vgtu.lt</mdui:DomainHint>
-        <mdui:GeolocationHint>geo:54.683333,25.283333</mdui:GeolocationHint>
-      </mdui:DiscoHints>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIID2TCCAsGgAwIBAgIJAJxLaKaVPb80MA0GCSqGSIb3DQEBBQUAMIGCMQswCQYDVQQGEwJMVDEQMA4GA1UECAwHVmlsbml1czEQMA4GA1UEBwwHVmlsbml1czENMAsGA1UECgwEVkdUVTELMAkGA1UECwwCSVQxFDASBgNVBAMMC3Nzby52Z3R1Lmx0MR0wGwYJKoZIhvcNAQkBFg5maWxzYXZAdmd0dS5sdDAeFw0xMzAzMDUxMDU3NDRaFw0yMzAzMDUxMDU3NDRaMIGCMQswCQYDVQQGEwJMVDEQMA4GA1UECAwHVmlsbml1czEQMA4GA1UEBwwHVmlsbml1czENMAsGA1UECgwEVkdUVTELMAkGA1UECwwCSVQxFDASBgNVBAMMC3Nzby52Z3R1Lmx0MR0wGwYJKoZIhvcNAQkBFg5maWxzYXZAdmd0dS5sdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANPBRmQdW7yE6Ob47RS63wc6eamLrbcZ8d3BHbkTKOg3zvty9kNGlsRHKJKaTxZJHxxJeGyFK7wD1T7esm6H4xlGd/vPkJ8BiJGaYFt+z6AK0U/C24lAUTBme0XE12kVhR2Ld+AbocdKbgRvkQDs2nupi8bT8GrcLPqEVNfrEcuoWPR0VDrn+cc9eQWsnwAi6vqPNG9BP+tXun1mKRNjLwe7xpIU2dEt4kNNvHKHzbuqMOePvURsMLYWM0GiLA5qMXU/plsgEva09gSONJqUo5PiF5CkcFZqyyJNKznIAZnLuFWJR7a3G4ArQ0BEuGzv7nchzVf+ffdClMlYOflWas0CAwEAAaNQME4wHQYDVR0OBBYEFHaPCulJCIz/U1G0e7fraytboJPGMB8GA1UdIwQYMBaAFHaPCulJCIz/U1G0e7fraytboJPGMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBACoR6yldDCdkFwAM/UvbmAAhYizDFszWNi53//exw4Q7LYFFExl7h6jjnZphO8/JpYBQ8gqthhEyQe1QRs/3ZBkWJC6mhUu9V6pv/n+10wPew8fm2W6FIgprTmjfz98BCff/Bk7SAqssJRGSKKmgqetMcBXQDEcAQ9i1RpFK/j51mQ6+ynBRvynN0wpAGbKYnKlH4nZhe9DDhKO+P9MDMzbDrTudjZViRUXYxY0Ay8Kfm3TgjL+Yw8/LGhSXO0k9XfCcLVC+e+4YQEUOCQNgOPDRKmZH/jntqXmfY0Dtak0612n8RmJzwybPFyeNY+yeZhb+XEWT9uwq3YM7Zl85YSg=</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>MIID2TCCAsGgAwIBAgIJAJxLaKaVPb80MA0GCSqGSIb3DQEBBQUAMIGCMQswCQYDVQQGEwJMVDEQMA4GA1UECAwHVmlsbml1czEQMA4GA1UEBwwHVmlsbml1czENMAsGA1UECgwEVkdUVTELMAkGA1UECwwCSVQxFDASBgNVBAMMC3Nzby52Z3R1Lmx0MR0wGwYJKoZIhvcNAQkBFg5maWxzYXZAdmd0dS5sdDAeFw0xMzAzMDUxMDU3NDRaFw0yMzAzMDUxMDU3NDRaMIGCMQswCQYDVQQGEwJMVDEQMA4GA1UECAwHVmlsbml1czEQMA4GA1UEBwwHVmlsbml1czENMAsGA1UECgwEVkdUVTELMAkGA1UECwwCSVQxFDASBgNVBAMMC3Nzby52Z3R1Lmx0MR0wGwYJKoZIhvcNAQkBFg5maWxzYXZAdmd0dS5sdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANPBRmQdW7yE6Ob47RS63wc6eamLrbcZ8d3BHbkTKOg3zvty9kNGlsRHKJKaTxZJHxxJeGyFK7wD1T7esm6H4xlGd/vPkJ8BiJGaYFt+z6AK0U/C24lAUTBme0XE12kVhR2Ld+AbocdKbgRvkQDs2nupi8bT8GrcLPqEVNfrEcuoWPR0VDrn+cc9eQWsnwAi6vqPNG9BP+tXun1mKRNjLwe7xpIU2dEt4kNNvHKHzbuqMOePvURsMLYWM0GiLA5qMXU/plsgEva09gSONJqUo5PiF5CkcFZqyyJNKznIAZnLuFWJR7a3G4ArQ0BEuGzv7nchzVf+ffdClMlYOflWas0CAwEAAaNQME4wHQYDVR0OBBYEFHaPCulJCIz/U1G0e7fraytboJPGMB8GA1UdIwQYMBaAFHaPCulJCIz/U1G0e7fraytboJPGMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBACoR6yldDCdkFwAM/UvbmAAhYizDFszWNi53//exw4Q7LYFFExl7h6jjnZphO8/JpYBQ8gqthhEyQe1QRs/3ZBkWJC6mhUu9V6pv/n+10wPew8fm2W6FIgprTmjfz98BCff/Bk7SAqssJRGSKKmgqetMcBXQDEcAQ9i1RpFK/j51mQ6+ynBRvynN0wpAGbKYnKlH4nZhe9DDhKO+P9MDMzbDrTudjZViRUXYxY0Ay8Kfm3TgjL+Yw8/LGhSXO0k9XfCcLVC+e+4YQEUOCQNgOPDRKmZH/jntqXmfY0Dtak0612n8RmJzwybPFyeNY+yeZhb+XEWT9uwq3YM7Zl85YSg=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sso.vgtu.lt/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://sso.vgtu.lt/saml2/idp/SSOService.php"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Vilnius Gediminas Technical University</md:OrganizationName>
-    <md:OrganizationName xml:lang="lt">Vilniaus Gedimino technikos universitetas</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Vilnius Gediminas Technical University</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="lt">Vilniaus Gedimino technikos universitetas</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.vgtu.lt</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Filip</md:GivenName>
-    <md:SurName>Savin</md:SurName>
-    <md:EmailAddress>sso@vgtu.lt</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/ssso.uni-muenster.de-shibboleth-sp.xml b/swamid-interfederations-2.0/ssso.uni-muenster.de-shibboleth-sp.xml
deleted file mode 100644
index 9b88decb..00000000
--- a/swamid-interfederations-2.0/ssso.uni-muenster.de-shibboleth-sp.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://ssso.uni-muenster.de/shibboleth-sp">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2014-03-24T12:09:33Z">
-      <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>
-      <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://ssso.uni-muenster.de/-shibboleth.sso/Login" index="1"/>
-      <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">Das zentrale Single Sign-On umfasst fast alle Dienste der Universität Münster. Es gibt verschiedene Zugangswege (Reverse Proxy) für verschiedene Authentifizierungsverfahren:&lt;ul compact&gt; &lt;li&gt;http(s)://www.uni-muenster.de = unidentifiziert &lt;li&gt;https://sso.uni-muenster.de = lokales Passwort &lt;li&gt;https://xsso.uni-muenster.de = X.509-Zertifikat (DFN-PKI, Sicherheitsstufe Global) &lt;li&gt;https://&lt;strong&gt;ssso.uni-muenster.de&lt;/strong&gt; = Shibboleth-SP in der DFN-AAI &lt;/ul&gt; &lt;p&gt;Hinweis für IdP-Betreiber: Zur erfolgreichen Authentifizierung ist eduPersonPrincipalName oder eduPersonTargetedID erforderlich. Übergebene Attribute (erbeten wird insbesondere eduPersonScopedAffiliation) können von den einzelnen Webspacebetreibern u. a. zur Zugangskontrolle genutzt werden. &lt;p&gt;Ansprechpartner für technische Fragen: wwwadmin@uni-muenster.de</mdui:Description>
-        <mdui:Description xml:lang="en">Das zentrale Single Sign-On umfasst fast alle Dienste der Universität Münster. Es gibt verschiedene Zugangswege (Reverse Proxy) für verschiedene Authentifizierungsverfahren:&lt;ul compact&gt; &lt;li&gt;http(s)://www.uni-muenster.de = unidentifiziert &lt;li&gt;https://sso.uni-muenster.de = lokales Passwort &lt;li&gt;https://xsso.uni-muenster.de = X.509-Zertifikat (DFN-PKI, Sicherheitsstufe Global) &lt;li&gt;https://&lt;strong&gt;ssso.uni-muenster.de&lt;/strong&gt; = Shibboleth-SP in der DFN-AAI &lt;/ul&gt; &lt;p&gt;Hinweis für IdP-Betreiber: Zur erfolgreichen Authentifizierung ist eduPersonPrincipalName oder eduPersonTargetedID erforderlich. Übergebene Attribute (erbeten wird insbesondere eduPersonScopedAffiliation) können von den einzelnen Webspacebetreibern u. a. zur Zugangskontrolle genutzt werden. &lt;p&gt;Ansprechpartner für technische Fragen: wwwadmin@uni-muenster.de</mdui:Description>
-        <mdui:Logo height="32" width="32">https://www.uni-muenster.de/imperia/md/content/allgemein/farbunabhaengig/favicon.ico</mdui:Logo>
-        <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>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>ssso.uni-muenster.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>emailAddress=wwwadmin@uni-muenster.de,CN=ssso.uni-muenster.de,O=Universitaet Muenster,L=Muenster,ST=Nordrhein-Westfalen,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIGJzCCBQ+gAwIBAgIHGFeCsvNcBjANBgkqhkiG9w0BAQsFADCBjDELMAkGA1UE
-BhMCREUxHjAcBgNVBAoTFVVuaXZlcnNpdGFldCBNdWVuc3RlcjE6MDgGA1UEAxMx
-WmVydGlmaXppZXJ1bmdzc3RlbGxlIFVuaXZlcnNpdGFldCBNdWVuc3RlciAtIEcw
-MjEhMB8GCSqGSIb3DQEJARYSY2FAdW5pLW11ZW5zdGVyLmRlMB4XDTE0MTAxMDE2
-MTExNFoXDTE5MDcwOTIzNTkwMFowgaYxCzAJBgNVBAYTAkRFMRwwGgYDVQQIExNO
-b3JkcmhlaW4tV2VzdGZhbGVuMREwDwYDVQQHEwhNdWVuc3RlcjEeMBwGA1UEChMV
-VW5pdmVyc2l0YWV0IE11ZW5zdGVyMR0wGwYDVQQDExRzc3NvLnVuaS1tdWVuc3Rl
-ci5kZTEnMCUGCSqGSIb3DQEJARYYd3d3YWRtaW5AdW5pLW11ZW5zdGVyLmRlMIIB
-IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAmQsABvLwuKrHBohtO1U86YQ5
-Opt84fnrE75KDuMGYymx22yesGf+K/hygvJtTXtC+QbFq1wqCvmSL/AoN5Upx1c8
-DAr+F7rOpKsIY3fQzCF5xj1/34azBoxn7gsqXAR7or7SYaqrSkh2ynG/uWECO9PL
-4kfGvUj9PEWLNsQcKeIDxRK9XT1j9ga4LoyghKE+wuAOPNCymFjGDmI08i8jiF9C
-QhfJGNO4rI0sNTC+xrEiJX0ZR48xnc7pWrWcXoLYTyynAhDVjR+wq+NyIZHu4keL
-akDxynHgird1o7kj/jx/2ppf8faKDOqn1D1BPvJP6U+ECranLrzrSQP/bZUGRQID
-AQABo4ICcDCCAmwwTwYDVR0gBEgwRjARBg8rBgEEAYGtIYIsAQEEAwIwEQYPKwYB
-BAGBrSGCLAIBBAMBMA8GDSsGAQQBga0hgiwBAQQwDQYLKwYBBAGBrSGCLB4wCQYD
-VR0TBAIwADALBgNVHQ8EBAMCBeAwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUF
-BwMBMB0GA1UdDgQWBBSrZHTvkxxm2VdrB2TKDv9NNFCadTAfBgNVHSMEGDAWgBS+
-nlGiyZJ8u2CL5rBoZHdaUhmhADBXBgNVHREEUDBOghRzc3NvLnVuaS1tdWVuc3Rl
-ci5kZYILc3Nzby53d3UuZGWCGHd3dy5zc3NvLnVuaS1tdWVuc3Rlci5kZYIPd3d3
-LnNzc28ud3d1LmRlMHsGA1UdHwR0MHIwN6A1oDOGMWh0dHA6Ly9jZHAxLnBjYS5k
-Zm4uZGUvd3d1LWNhL3B1Yi9jcmwvZ19jYWNybC5jcmwwN6A1oDOGMWh0dHA6Ly9j
-ZHAyLnBjYS5kZm4uZGUvd3d1LWNhL3B1Yi9jcmwvZ19jYWNybC5jcmwwgcsGCCsG
-AQUFBwEBBIG+MIG7MDMGCCsGAQUFBzABhidodHRwOi8vb2NzcC5wY2EuZGZuLmRl
-L09DU1AtU2VydmVyL09DU1AwQQYIKwYBBQUHMAKGNWh0dHA6Ly9jZHAxLnBjYS5k
-Zm4uZGUvd3d1LWNhL3B1Yi9jYWNlcnQvZ19jYWNlcnQuY3J0MEEGCCsGAQUFBzAC
-hjVodHRwOi8vY2RwMi5wY2EuZGZuLmRlL3d3dS1jYS9wdWIvY2FjZXJ0L2dfY2Fj
-ZXJ0LmNydDANBgkqhkiG9w0BAQsFAAOCAQEAARlsISgb7Li7l4WssY38waKmDuEl
-zHwy5l74OIiBTX+/TTrOxcSpfYCAyucG6z9rP91e1e73r4q3PbyAhwDj7Q3TV8ki
-bagtnLC6U7d2pKerlIh8yt9m28vBzsOniiHKadqOffy9iGH5FNhkMSRRDZtgRKpp
-VE1gq/ydqHWTm0eLfdk0sHgyxEG4WkafWA0KiIafFbOvhZwAUqygruJjzMlUfxxf
-OL9csVR39I5uyveJQpy+J4omKyte4S+Rp8NpI6DW1d8x9kBm2SqLYqMhYTtEYfhi
-k3o3LoCiTxnN6qevn4y3u2a+q1WFEgbdKc+MiKRKeJqmQdHC4CEB5QYztA==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ssso.uni-muenster.de/-shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ssso.uni-muenster.de/-shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ssso.uni-muenster.de/-shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ssso.uni-muenster.de/-shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ssso.uni-muenster.de/-shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ssso.uni-muenster.de/-shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ssso.uni-muenster.de/-shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ssso.uni-muenster.de/-shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ssso.uni-muenster.de/-shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ssso.uni-muenster.de/-shibboleth.sso/SAML/Artifact" index="6"/>
-    <AttributeConsumingService index="1">
-      <ServiceName xml:lang="de">Universität Münster</ServiceName>
-      <ServiceName xml:lang="en">Universität Münster</ServiceName>
-      <ServiceDescription xml:lang="de">Das zentrale Single Sign-On umfasst fast alle Dienste der Universität Münster. Es gibt verschiedene Zugangswege (Reverse Proxy) für verschiedene Authentifizierungsverfahren:&lt;ul compact&gt; &lt;li&gt;http(s)://www.uni-muenster.de = unidentifiziert &lt;li&gt;https://sso.uni-muenster.de = lokales Passwort &lt;li&gt;https://xsso.uni-muenster.de = X.509-Zertifikat (DFN-PKI, Sicherheitsstufe Global) &lt;li&gt;https://&lt;strong&gt;ssso.uni-muenster.de&lt;/strong&gt; = Shibboleth-SP in der DFN-AAI &lt;/ul&gt; &lt;p&gt;Hinweis für IdP-Betreiber: Zur erfolgreichen Authentifizierung ist eduPersonPrincipalName oder eduPersonTargetedID erforderlich. Übergebene Attribute (erbeten wird insbesondere eduPersonScopedAffiliation) können von den einzelnen Webspacebetreibern u. a. zur Zugangskontrolle genutzt werden. &lt;p&gt;Ansprechpartner für technische Fragen: wwwadmin@uni-muenster.de</ServiceDescription>
-      <ServiceDescription xml:lang="en">Das zentrale Single Sign-On umfasst fast alle Dienste der Universität Münster. Es gibt verschiedene Zugangswege (Reverse Proxy) für verschiedene Authentifizierungsverfahren:&lt;ul compact&gt; &lt;li&gt;http(s)://www.uni-muenster.de = unidentifiziert &lt;li&gt;https://sso.uni-muenster.de = lokales Passwort &lt;li&gt;https://xsso.uni-muenster.de = X.509-Zertifikat (DFN-PKI, Sicherheitsstufe Global) &lt;li&gt;https://&lt;strong&gt;ssso.uni-muenster.de&lt;/strong&gt; = Shibboleth-SP in der DFN-AAI &lt;/ul&gt; &lt;p&gt;Hinweis für IdP-Betreiber: Zur erfolgreichen Authentifizierung ist eduPersonPrincipalName oder eduPersonTargetedID erforderlich. Übergebene Attribute (erbeten wird insbesondere eduPersonScopedAffiliation) können von den einzelnen Webspacebetreibern u. a. zur Zugangskontrolle genutzt werden. &lt;p&gt;Ansprechpartner für technische Fragen: wwwadmin@uni-muenster.de</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="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"/>
-    </AttributeConsumingService>
-  </SPSSODescriptor>
-  <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>Rainer</GivenName>
-    <SurName>Perske</SurName>
-    <EmailAddress>mailto:wwwadmin@uni-muenster.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="support">
-    <GivenName>Rainer</GivenName>
-    <SurName>Perske</SurName>
-    <EmailAddress>mailto:wwwadmin@uni-muenster.de</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/ssso.uni-muenster.de.xml b/swamid-interfederations-2.0/ssso.uni-muenster.de.xml
deleted file mode 100644
index 9b88decb..00000000
--- a/swamid-interfederations-2.0/ssso.uni-muenster.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://ssso.uni-muenster.de/shibboleth-sp">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2014-03-24T12:09:33Z">
-      <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>
-      <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://ssso.uni-muenster.de/-shibboleth.sso/Login" index="1"/>
-      <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">Das zentrale Single Sign-On umfasst fast alle Dienste der Universität Münster. Es gibt verschiedene Zugangswege (Reverse Proxy) für verschiedene Authentifizierungsverfahren:&lt;ul compact&gt; &lt;li&gt;http(s)://www.uni-muenster.de = unidentifiziert &lt;li&gt;https://sso.uni-muenster.de = lokales Passwort &lt;li&gt;https://xsso.uni-muenster.de = X.509-Zertifikat (DFN-PKI, Sicherheitsstufe Global) &lt;li&gt;https://&lt;strong&gt;ssso.uni-muenster.de&lt;/strong&gt; = Shibboleth-SP in der DFN-AAI &lt;/ul&gt; &lt;p&gt;Hinweis für IdP-Betreiber: Zur erfolgreichen Authentifizierung ist eduPersonPrincipalName oder eduPersonTargetedID erforderlich. Übergebene Attribute (erbeten wird insbesondere eduPersonScopedAffiliation) können von den einzelnen Webspacebetreibern u. a. zur Zugangskontrolle genutzt werden. &lt;p&gt;Ansprechpartner für technische Fragen: wwwadmin@uni-muenster.de</mdui:Description>
-        <mdui:Description xml:lang="en">Das zentrale Single Sign-On umfasst fast alle Dienste der Universität Münster. Es gibt verschiedene Zugangswege (Reverse Proxy) für verschiedene Authentifizierungsverfahren:&lt;ul compact&gt; &lt;li&gt;http(s)://www.uni-muenster.de = unidentifiziert &lt;li&gt;https://sso.uni-muenster.de = lokales Passwort &lt;li&gt;https://xsso.uni-muenster.de = X.509-Zertifikat (DFN-PKI, Sicherheitsstufe Global) &lt;li&gt;https://&lt;strong&gt;ssso.uni-muenster.de&lt;/strong&gt; = Shibboleth-SP in der DFN-AAI &lt;/ul&gt; &lt;p&gt;Hinweis für IdP-Betreiber: Zur erfolgreichen Authentifizierung ist eduPersonPrincipalName oder eduPersonTargetedID erforderlich. Übergebene Attribute (erbeten wird insbesondere eduPersonScopedAffiliation) können von den einzelnen Webspacebetreibern u. a. zur Zugangskontrolle genutzt werden. &lt;p&gt;Ansprechpartner für technische Fragen: wwwadmin@uni-muenster.de</mdui:Description>
-        <mdui:Logo height="32" width="32">https://www.uni-muenster.de/imperia/md/content/allgemein/farbunabhaengig/favicon.ico</mdui:Logo>
-        <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>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>ssso.uni-muenster.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>emailAddress=wwwadmin@uni-muenster.de,CN=ssso.uni-muenster.de,O=Universitaet Muenster,L=Muenster,ST=Nordrhein-Westfalen,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIGJzCCBQ+gAwIBAgIHGFeCsvNcBjANBgkqhkiG9w0BAQsFADCBjDELMAkGA1UE
-BhMCREUxHjAcBgNVBAoTFVVuaXZlcnNpdGFldCBNdWVuc3RlcjE6MDgGA1UEAxMx
-WmVydGlmaXppZXJ1bmdzc3RlbGxlIFVuaXZlcnNpdGFldCBNdWVuc3RlciAtIEcw
-MjEhMB8GCSqGSIb3DQEJARYSY2FAdW5pLW11ZW5zdGVyLmRlMB4XDTE0MTAxMDE2
-MTExNFoXDTE5MDcwOTIzNTkwMFowgaYxCzAJBgNVBAYTAkRFMRwwGgYDVQQIExNO
-b3JkcmhlaW4tV2VzdGZhbGVuMREwDwYDVQQHEwhNdWVuc3RlcjEeMBwGA1UEChMV
-VW5pdmVyc2l0YWV0IE11ZW5zdGVyMR0wGwYDVQQDExRzc3NvLnVuaS1tdWVuc3Rl
-ci5kZTEnMCUGCSqGSIb3DQEJARYYd3d3YWRtaW5AdW5pLW11ZW5zdGVyLmRlMIIB
-IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAmQsABvLwuKrHBohtO1U86YQ5
-Opt84fnrE75KDuMGYymx22yesGf+K/hygvJtTXtC+QbFq1wqCvmSL/AoN5Upx1c8
-DAr+F7rOpKsIY3fQzCF5xj1/34azBoxn7gsqXAR7or7SYaqrSkh2ynG/uWECO9PL
-4kfGvUj9PEWLNsQcKeIDxRK9XT1j9ga4LoyghKE+wuAOPNCymFjGDmI08i8jiF9C
-QhfJGNO4rI0sNTC+xrEiJX0ZR48xnc7pWrWcXoLYTyynAhDVjR+wq+NyIZHu4keL
-akDxynHgird1o7kj/jx/2ppf8faKDOqn1D1BPvJP6U+ECranLrzrSQP/bZUGRQID
-AQABo4ICcDCCAmwwTwYDVR0gBEgwRjARBg8rBgEEAYGtIYIsAQEEAwIwEQYPKwYB
-BAGBrSGCLAIBBAMBMA8GDSsGAQQBga0hgiwBAQQwDQYLKwYBBAGBrSGCLB4wCQYD
-VR0TBAIwADALBgNVHQ8EBAMCBeAwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUF
-BwMBMB0GA1UdDgQWBBSrZHTvkxxm2VdrB2TKDv9NNFCadTAfBgNVHSMEGDAWgBS+
-nlGiyZJ8u2CL5rBoZHdaUhmhADBXBgNVHREEUDBOghRzc3NvLnVuaS1tdWVuc3Rl
-ci5kZYILc3Nzby53d3UuZGWCGHd3dy5zc3NvLnVuaS1tdWVuc3Rlci5kZYIPd3d3
-LnNzc28ud3d1LmRlMHsGA1UdHwR0MHIwN6A1oDOGMWh0dHA6Ly9jZHAxLnBjYS5k
-Zm4uZGUvd3d1LWNhL3B1Yi9jcmwvZ19jYWNybC5jcmwwN6A1oDOGMWh0dHA6Ly9j
-ZHAyLnBjYS5kZm4uZGUvd3d1LWNhL3B1Yi9jcmwvZ19jYWNybC5jcmwwgcsGCCsG
-AQUFBwEBBIG+MIG7MDMGCCsGAQUFBzABhidodHRwOi8vb2NzcC5wY2EuZGZuLmRl
-L09DU1AtU2VydmVyL09DU1AwQQYIKwYBBQUHMAKGNWh0dHA6Ly9jZHAxLnBjYS5k
-Zm4uZGUvd3d1LWNhL3B1Yi9jYWNlcnQvZ19jYWNlcnQuY3J0MEEGCCsGAQUFBzAC
-hjVodHRwOi8vY2RwMi5wY2EuZGZuLmRlL3d3dS1jYS9wdWIvY2FjZXJ0L2dfY2Fj
-ZXJ0LmNydDANBgkqhkiG9w0BAQsFAAOCAQEAARlsISgb7Li7l4WssY38waKmDuEl
-zHwy5l74OIiBTX+/TTrOxcSpfYCAyucG6z9rP91e1e73r4q3PbyAhwDj7Q3TV8ki
-bagtnLC6U7d2pKerlIh8yt9m28vBzsOniiHKadqOffy9iGH5FNhkMSRRDZtgRKpp
-VE1gq/ydqHWTm0eLfdk0sHgyxEG4WkafWA0KiIafFbOvhZwAUqygruJjzMlUfxxf
-OL9csVR39I5uyveJQpy+J4omKyte4S+Rp8NpI6DW1d8x9kBm2SqLYqMhYTtEYfhi
-k3o3LoCiTxnN6qevn4y3u2a+q1WFEgbdKc+MiKRKeJqmQdHC4CEB5QYztA==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ssso.uni-muenster.de/-shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ssso.uni-muenster.de/-shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ssso.uni-muenster.de/-shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ssso.uni-muenster.de/-shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ssso.uni-muenster.de/-shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ssso.uni-muenster.de/-shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ssso.uni-muenster.de/-shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ssso.uni-muenster.de/-shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ssso.uni-muenster.de/-shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ssso.uni-muenster.de/-shibboleth.sso/SAML/Artifact" index="6"/>
-    <AttributeConsumingService index="1">
-      <ServiceName xml:lang="de">Universität Münster</ServiceName>
-      <ServiceName xml:lang="en">Universität Münster</ServiceName>
-      <ServiceDescription xml:lang="de">Das zentrale Single Sign-On umfasst fast alle Dienste der Universität Münster. Es gibt verschiedene Zugangswege (Reverse Proxy) für verschiedene Authentifizierungsverfahren:&lt;ul compact&gt; &lt;li&gt;http(s)://www.uni-muenster.de = unidentifiziert &lt;li&gt;https://sso.uni-muenster.de = lokales Passwort &lt;li&gt;https://xsso.uni-muenster.de = X.509-Zertifikat (DFN-PKI, Sicherheitsstufe Global) &lt;li&gt;https://&lt;strong&gt;ssso.uni-muenster.de&lt;/strong&gt; = Shibboleth-SP in der DFN-AAI &lt;/ul&gt; &lt;p&gt;Hinweis für IdP-Betreiber: Zur erfolgreichen Authentifizierung ist eduPersonPrincipalName oder eduPersonTargetedID erforderlich. Übergebene Attribute (erbeten wird insbesondere eduPersonScopedAffiliation) können von den einzelnen Webspacebetreibern u. a. zur Zugangskontrolle genutzt werden. &lt;p&gt;Ansprechpartner für technische Fragen: wwwadmin@uni-muenster.de</ServiceDescription>
-      <ServiceDescription xml:lang="en">Das zentrale Single Sign-On umfasst fast alle Dienste der Universität Münster. Es gibt verschiedene Zugangswege (Reverse Proxy) für verschiedene Authentifizierungsverfahren:&lt;ul compact&gt; &lt;li&gt;http(s)://www.uni-muenster.de = unidentifiziert &lt;li&gt;https://sso.uni-muenster.de = lokales Passwort &lt;li&gt;https://xsso.uni-muenster.de = X.509-Zertifikat (DFN-PKI, Sicherheitsstufe Global) &lt;li&gt;https://&lt;strong&gt;ssso.uni-muenster.de&lt;/strong&gt; = Shibboleth-SP in der DFN-AAI &lt;/ul&gt; &lt;p&gt;Hinweis für IdP-Betreiber: Zur erfolgreichen Authentifizierung ist eduPersonPrincipalName oder eduPersonTargetedID erforderlich. Übergebene Attribute (erbeten wird insbesondere eduPersonScopedAffiliation) können von den einzelnen Webspacebetreibern u. a. zur Zugangskontrolle genutzt werden. &lt;p&gt;Ansprechpartner für technische Fragen: wwwadmin@uni-muenster.de</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="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"/>
-    </AttributeConsumingService>
-  </SPSSODescriptor>
-  <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>Rainer</GivenName>
-    <SurName>Perske</SurName>
-    <EmailAddress>mailto:wwwadmin@uni-muenster.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="support">
-    <GivenName>Rainer</GivenName>
-    <SurName>Perske</SurName>
-    <EmailAddress>mailto:wwwadmin@uni-muenster.de</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/store.lu.lv.xml b/swamid-interfederations-2.0/store.lu.lv.xml
deleted file mode 100644
index 2aa7c160..00000000
--- a/swamid-interfederations-2.0/store.lu.lv.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://store.lu.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/" registrationInstant="2013-10-10T10:10:10Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://laife.lanet.lv/wiki/Latvian-Academic-Identity-Federation-Policy.pdf</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIC6DCCAdCgAwIBAgIJANOTPRn8Yj6/MA0GCSqGSIb3DQEBBQUAMBYxFDASBgNV
-BAMTC3N0b3JlLmx1Lmx2MB4XDTEzMDMwODEwMzcyNVoXDTI4MDMwNDEwMzcyNVow
-FjEUMBIGA1UEAxMLc3RvcmUubHUubHYwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
-ggEKAoIBAQCxCVKw78p1ayPtIH4fKtDzmG8bxfJRy2vpZPRn6JLOMWq6eNVvHtwl
-wen+fLTgig1i56GWHPQCF5PGwWoq6xj5S/uRoinAtiIk9Zz5sUz9HtBK5AXkdpLI
-fulUNJZ1uVIe0xIVBl3pGw3ckq1v5WFpDWk2vj5gebQq2090qbgK1TTiMXh/wKZe
-2aHiPT1WCklnTvdoEOgipSl+nClBtbLrTAZh7FZAbGYbxhZI3288pwUfNR91nWu6
-yJ9qdERB8WlN+sgpGsZDKgV/Z/DW+GW1TEIgoIu757jAY/rxB3nhhoqdiFRlj3uh
-zekJxOdPSxNvOHc72c/dV8nY/EGLzd8RAgMBAAGjOTA3MBYGA1UdEQQPMA2CC3N0
-b3JlLmx1Lmx2MB0GA1UdDgQWBBSEEH1irCcK77NEFvdXDphAFRNGJzANBgkqhkiG
-9w0BAQUFAAOCAQEAnHXx7qR4cdStfhLr6YjEqF3w2BWAitOOGKFvewsbdkTNBKL9
-Kf9DyOnnZ35uC99GxqsOQBeoOD5zawYzXPkEMb5mGDaM73RBxZdzrin9NTEy+Dwp
-x1tOkp3N4I6CanD0q+pZ2z8RTOcVtfNKQR0yHJeHM7bA41cuBZ7dNYcAiPYcrZ9R
-E6m2FLWKCd74yEkCWZjPLL6XwGFivfUfpC65O8SIWi606B0fPBPFjldkY2qe/X89
-TBhpZrPMJoN9kYql+W/DkEYWP1Nwgu6Cy4R+MLdgSSsssAKnUAPXVXDQR5vHEPNC
-ibEIPrm7mKfc0uCo6x2gKWDvjQPf/Qr/ZYNoqQ==
-</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>
-MIIC6DCCAdCgAwIBAgIJANOTPRn8Yj6/MA0GCSqGSIb3DQEBBQUAMBYxFDASBgNV
-BAMTC3N0b3JlLmx1Lmx2MB4XDTEzMDMwODEwMzcyNVoXDTI4MDMwNDEwMzcyNVow
-FjEUMBIGA1UEAxMLc3RvcmUubHUubHYwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
-ggEKAoIBAQCxCVKw78p1ayPtIH4fKtDzmG8bxfJRy2vpZPRn6JLOMWq6eNVvHtwl
-wen+fLTgig1i56GWHPQCF5PGwWoq6xj5S/uRoinAtiIk9Zz5sUz9HtBK5AXkdpLI
-fulUNJZ1uVIe0xIVBl3pGw3ckq1v5WFpDWk2vj5gebQq2090qbgK1TTiMXh/wKZe
-2aHiPT1WCklnTvdoEOgipSl+nClBtbLrTAZh7FZAbGYbxhZI3288pwUfNR91nWu6
-yJ9qdERB8WlN+sgpGsZDKgV/Z/DW+GW1TEIgoIu757jAY/rxB3nhhoqdiFRlj3uh
-zekJxOdPSxNvOHc72c/dV8nY/EGLzd8RAgMBAAGjOTA3MBYGA1UdEQQPMA2CC3N0
-b3JlLmx1Lmx2MB0GA1UdDgQWBBSEEH1irCcK77NEFvdXDphAFRNGJzANBgkqhkiG
-9w0BAQUFAAOCAQEAnHXx7qR4cdStfhLr6YjEqF3w2BWAitOOGKFvewsbdkTNBKL9
-Kf9DyOnnZ35uC99GxqsOQBeoOD5zawYzXPkEMb5mGDaM73RBxZdzrin9NTEy+Dwp
-x1tOkp3N4I6CanD0q+pZ2z8RTOcVtfNKQR0yHJeHM7bA41cuBZ7dNYcAiPYcrZ9R
-E6m2FLWKCd74yEkCWZjPLL6XwGFivfUfpC65O8SIWi606B0fPBPFjldkY2qe/X89
-TBhpZrPMJoN9kYql+W/DkEYWP1Nwgu6Cy4R+MLdgSSsssAKnUAPXVXDQR5vHEPNC
-ibEIPrm7mKfc0uCo6x2gKWDvjQPf/Qr/ZYNoqQ==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://store.lu.lv/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://store.lu.lv/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://store.lu.lv/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://store.lu.lv/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://store.lu.lv/simplesaml/module.php/saml/sp/saml1-acs.php/default-sp/artifact" index="3"/>
-  </md:SPSSODescriptor>
-  <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
-    <OrganizationName xml:lang="en">LAIFE - LU</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Latvia - LU SP</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.lu.lv/</OrganizationURL>
-    <OrganizationURL xml:lang="lv">http://www.lu.lv/</OrganizationURL>
-  </Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Martins</md:GivenName>
-    <md:SurName>Purins</md:SurName>
-    <md:EmailAddress>mpurins@lu.lv</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/strong.renater.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/strong.renater.fr-idp-shibboleth.xml
deleted file mode 100644
index 08174104..00000000
--- a/swamid-interfederations-2.0/strong.renater.fr-idp-shibboleth.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://strong.renater.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2014-10-06T11:04:46Z">
-      <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">renater.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">RENATER - 2FA</mdui:DisplayName>
-        <mdui:Description xml:lang="en">RENATER 2FA authentication Identity Provider</mdui:Description>
-        <mdui:DisplayName xml:lang="fr">GIP RENATER - Authentification forte</mdui:DisplayName>
-        <mdui:Description xml:lang="fr">Fournisseur d'identités à authentification forte pour le personnel du GIP RENATER</mdui:Description>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDMDCCAhigAwIBAgIVAKDRx8im6zJdLQ5NHz5dmbcaOBjOMA0GCSqGSIb3DQEB
-BQUAMBwxGjAYBgNVBAMMEXN0cm9uZy5yZW5hdGVyLmZyMB4XDTE0MTAwNjA3NDIx
-OFoXDTM0MTAwNjA3NDIxOFowHDEaMBgGA1UEAwwRc3Ryb25nLnJlbmF0ZXIuZnIw
-ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCcmKoiaTCP4jY9v53P+M5I
-vUAbcaFievc311/2CTLBAucCceVTZ9VwVoucZiQ9ZOebD2DtrxLqNJb/RMh5pyXj
-Qzr86Hwv5Yk3+BVpru02HiOzzGbBqWVjwgZ1HFTSfnqwAYP4zZsu7nx8X/SK+ZJV
-SjxiSpe/Y6Rm+t7gWBfZXYSWvKGu01fbywcVqaeGrGz/UQdi0jvhGwNbK7AUCb+J
-/zSw+tkxxAoDdf/8/uk1LScWt2Uim3HqL9a9E9jrrz6b0s2+6ws8asCL1TD3uAXQ
-IPZAmm3F+TZeJv89+VnI1UM7WsdQaCpZBZXLDXuVDnFFZ/j0Ol+rSTdnYVaws+ev
-AgMBAAGjaTBnMB0GA1UdDgQWBBR7MXxBw9coUGjDO8AWpl+AODh4EDBGBgNVHREE
-PzA9ghFzdHJvbmcucmVuYXRlci5mcoYoaHR0cHM6Ly9zdHJvbmcucmVuYXRlci5m
-ci9pZHAvc2hpYmJvbGV0aDANBgkqhkiG9w0BAQUFAAOCAQEAVdeiyyjO1mbphNLM
-pc9tRSsPVeKkxBv7GFN4FaOivBJn5jTLKgCR3AEulI6ySreL9sgrMsN6LggFsFpW
-kjf4iyilbXeH0EQD05teoVCuaZf0JmT+bfbLGLZuHJckOJQW9WqIh8mog8g58chu
-gk019fVk/DFoPIZXyJZDD8FWLuZk9im8KlCBXNbGAwjwz5tfNkWlMAbaVUqdEvr1
-rlzS4uoe3sVAeC3OBKLjHEWy4/NybEmhfjFbIlqrPc579lsn6mJKvrf82Gx6PDry
-OnHGNIjw12pVU5I3hY1A7X/xRZLG0U90KdPekhyE4KXeutJumdwGYj/pC21jsOzy
-gshHXw==
-					    </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://strong.renater.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://strong.renater.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://strong.renater.fr/idp/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">GIP RENATER - Authentification forte</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">GIP RENATER - Authentification forte</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.renater.fr</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <EmailAddress>support@renater.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/strong.renater.fr.xml b/swamid-interfederations-2.0/strong.renater.fr.xml
deleted file mode 100644
index 08174104..00000000
--- a/swamid-interfederations-2.0/strong.renater.fr.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://strong.renater.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2014-10-06T11:04:46Z">
-      <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">renater.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">RENATER - 2FA</mdui:DisplayName>
-        <mdui:Description xml:lang="en">RENATER 2FA authentication Identity Provider</mdui:Description>
-        <mdui:DisplayName xml:lang="fr">GIP RENATER - Authentification forte</mdui:DisplayName>
-        <mdui:Description xml:lang="fr">Fournisseur d'identités à authentification forte pour le personnel du GIP RENATER</mdui:Description>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDMDCCAhigAwIBAgIVAKDRx8im6zJdLQ5NHz5dmbcaOBjOMA0GCSqGSIb3DQEB
-BQUAMBwxGjAYBgNVBAMMEXN0cm9uZy5yZW5hdGVyLmZyMB4XDTE0MTAwNjA3NDIx
-OFoXDTM0MTAwNjA3NDIxOFowHDEaMBgGA1UEAwwRc3Ryb25nLnJlbmF0ZXIuZnIw
-ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCcmKoiaTCP4jY9v53P+M5I
-vUAbcaFievc311/2CTLBAucCceVTZ9VwVoucZiQ9ZOebD2DtrxLqNJb/RMh5pyXj
-Qzr86Hwv5Yk3+BVpru02HiOzzGbBqWVjwgZ1HFTSfnqwAYP4zZsu7nx8X/SK+ZJV
-SjxiSpe/Y6Rm+t7gWBfZXYSWvKGu01fbywcVqaeGrGz/UQdi0jvhGwNbK7AUCb+J
-/zSw+tkxxAoDdf/8/uk1LScWt2Uim3HqL9a9E9jrrz6b0s2+6ws8asCL1TD3uAXQ
-IPZAmm3F+TZeJv89+VnI1UM7WsdQaCpZBZXLDXuVDnFFZ/j0Ol+rSTdnYVaws+ev
-AgMBAAGjaTBnMB0GA1UdDgQWBBR7MXxBw9coUGjDO8AWpl+AODh4EDBGBgNVHREE
-PzA9ghFzdHJvbmcucmVuYXRlci5mcoYoaHR0cHM6Ly9zdHJvbmcucmVuYXRlci5m
-ci9pZHAvc2hpYmJvbGV0aDANBgkqhkiG9w0BAQUFAAOCAQEAVdeiyyjO1mbphNLM
-pc9tRSsPVeKkxBv7GFN4FaOivBJn5jTLKgCR3AEulI6ySreL9sgrMsN6LggFsFpW
-kjf4iyilbXeH0EQD05teoVCuaZf0JmT+bfbLGLZuHJckOJQW9WqIh8mog8g58chu
-gk019fVk/DFoPIZXyJZDD8FWLuZk9im8KlCBXNbGAwjwz5tfNkWlMAbaVUqdEvr1
-rlzS4uoe3sVAeC3OBKLjHEWy4/NybEmhfjFbIlqrPc579lsn6mJKvrf82Gx6PDry
-OnHGNIjw12pVU5I3hY1A7X/xRZLG0U90KdPekhyE4KXeutJumdwGYj/pC21jsOzy
-gshHXw==
-					    </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://strong.renater.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://strong.renater.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://strong.renater.fr/idp/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">GIP RENATER - Authentification forte</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">GIP RENATER - Authentification forte</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.renater.fr</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <EmailAddress>support@renater.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/studienportal.vetmed.uni-muenchen.de-shibboleth.xml b/swamid-interfederations-2.0/studienportal.vetmed.uni-muenchen.de-shibboleth.xml
deleted file mode 100644
index 22f98d29..00000000
--- a/swamid-interfederations-2.0/studienportal.vetmed.uni-muenchen.de-shibboleth.xml
+++ /dev/null
@@ -1,105 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://studienportal.vetmed.uni-muenchen.de/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2013-04-30T13:50:47Z">
-      <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>
-  <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://studienportal.vetmed.uni-muenchen.de/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="de">Studienportal tierärztliche Fakultät LMU</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Studienportal tierärztliche Fakultät LMU</mdui:DisplayName>
-        <mdui:Description xml:lang="de">Studienportal tierärztliche Fakultät LMU</mdui:Description>
-        <mdui:Description xml:lang="en">Studienportal tierärztliche Fakultät LMU</mdui:Description>
-        <mdui:InformationURL xml:lang="de">https://studienportal.vetmed.uni-muenchen.de</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">https://studienportal.vetmed.uni-muenchen.de</mdui:InformationURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>studienportal.vetmed.uni-muenchen.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=studienportal.vetmed.uni-muenchen.de,OU=Tieraerztliche Fakultaet,O=Ludwig-Maximilians-Universitaet Muenchen,L=Muenchen,ST=Bayern,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFrDCCBJSgAwIBAgIEEOYptTANBgkqhkiG9w0BAQUFADCBkDELMAkGA1UEBhMC
-REUxDzANBgNVBAgTBkJheWVybjERMA8GA1UEBxMITXVlbmNoZW4xMTAvBgNVBAoT
-KEx1ZHdpZy1NYXhpbWlsaWFucy1Vbml2ZXJzaXRhZXQgTXVlbmNoZW4xDzANBgNV
-BAMTBkxNVS1DQTEZMBcGCSqGSIb3DQEJARYKcGtpQGxtdS5kZTAeFw0xMDEwMjYx
-MDIzMzNaFw0xNTEwMjUxMDIzMzNaMIG2MQswCQYDVQQGEwJERTEPMA0GA1UECBMG
-QmF5ZXJuMREwDwYDVQQHEwhNdWVuY2hlbjExMC8GA1UEChMoTHVkd2lnLU1heGlt
-aWxpYW5zLVVuaXZlcnNpdGFldCBNdWVuY2hlbjEhMB8GA1UECxMYVGllcmFlcnp0
-bGljaGUgRmFrdWx0YWV0MS0wKwYDVQQDEyRzdHVkaWVucG9ydGFsLnZldG1lZC51
-bmktbXVlbmNoZW4uZGUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCf
-aVM4c+oiLWXWdu/PVBS7JHqdNKqk//w0wQoH4o/g6gRK5LiSOy3Dqloz5UpFYjNW
-D7lQEzcg1Ar/0/NsQ3HEU75k7uUaOmZi+kNse8seagyCjlfWnU5DAsPDFG7SiotU
-0AX6dPL+GkzyWKpdG7/HrGze43pFbYkB67KaAuwLHPGZwBzeyIDyL9RPjdRXflhI
-o/sxJh5tv/9tLpxNupacnk7mfz1xDlfvSLyWEjr6pL/JtLR7Z3BQ5/PISFncWO+Q
-ZfrY7TGZ/E9uS2pnfteOY22Y6rR1FiVgcIowzScVTOwyshvopoVI1/u3d+ChMhBI
-ezjRfr1udeSajAk/RqVTAgMBAAGjggHkMIIB4DAJBgNVHRMEAjAAMAsGA1UdDwQE
-AwIF4DAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwHQYDVR0OBBYEFGIL
-BlMn4wIAUnAiU7s+tIBt1iu0MB8GA1UdIwQYMBaAFHmHeGov+pu8I0+UpqN3HR4O
-lIAPMDIGA1UdEQQrMCmBJ2FkbWluaXN0cmF0b3JAaXQudmV0bWVkLnVuaS1tdWVu
-Y2hlbi5kZTCBiwYDVR0fBIGDMIGAMD6gPKA6hjhodHRwOi8vY2RwMS5wY2EuZGZu
-LmRlL3VuaS1tdWVuY2hlbi1jYS9wdWIvY3JsL2NhY3JsLmNybDA+oDygOoY4aHR0
-cDovL2NkcDIucGNhLmRmbi5kZS91bmktbXVlbmNoZW4tY2EvcHViL2NybC9jYWNy
-bC5jcmwwgaQGCCsGAQUFBwEBBIGXMIGUMEgGCCsGAQUFBzAChjxodHRwOi8vY2Rw
-MS5wY2EuZGZuLmRlL3VuaS1tdWVuY2hlbi1jYS9wdWIvY2FjZXJ0L2NhY2VydC5j
-cnQwSAYIKwYBBQUHMAKGPGh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvdW5pLW11ZW5j
-aGVuLWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDANBgkqhkiG9w0BAQUFAAOCAQEA
-XoE3xNYk2QmdKevsY4W/szKTswy74uqQ3utXm5Hf5+/9+Cgd7BStYRZVHI24veXq
-a0YOorNUumnTkZFUB4B5OZpaDw9t80WSaefC3o1zc0PXH9+caRhoqmnBSG1JdF6L
-kY0pqAOralMzMChLKOrRb2cnjxHWa/Ug9C7XaXmEJhjP+7GCjZSLMS/du1E1wyKc
-3fN+WdEbKF4OiY1lK+MBlgDyGdXqkrAFX8JbGo1uWyGgDKu2gT7QhMeNXDPzpWn8
-YwnP4oYTHPCDNHFJR6XyRTogzebI5RgoL2eLI8SOf0LXXBTE2KvM2cOWFSmKlgFd
-NL76LsPu9j46CldHJOaVdg==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://studienportal.vetmed.uni-muenchen.de/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://studienportal.vetmed.uni-muenchen.de/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://studienportal.vetmed.uni-muenchen.de/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://studienportal.vetmed.uni-muenchen.de/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://studienportal.vetmed.uni-muenchen.de/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://studienportal.vetmed.uni-muenchen.de/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://studienportal.vetmed.uni-muenchen.de/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://studienportal.vetmed.uni-muenchen.de/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://studienportal.vetmed.uni-muenchen.de/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://studienportal.vetmed.uni-muenchen.de/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <AttributeConsumingService index="1">
-      <ServiceName xml:lang="de">Studienportal tierärztliche Fakultät LMU</ServiceName>
-      <ServiceName xml:lang="en">Studienportal tierärztliche Fakultät LMU</ServiceName>
-      <ServiceDescription xml:lang="de">Studienportal tierärztliche Fakultät LMU</ServiceDescription>
-      <ServiceDescription xml:lang="en">Studienportal tierärztliche Fakultät LMU</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="givenName" Name="urn:oid:2.5.4.42" 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" isRequired="true"/>
-      <RequestedAttribute FriendlyName="dfnEduPersonStudyBranch3" Name="urn:oid:1.3.6.1.4.1.22177.400.1.1.3.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-    </AttributeConsumingService>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">e29</OrganizationName>
-    <OrganizationName xml:lang="en">e29</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">Ludwig-Maximilians-Universität München</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">Ludwig-Maximilians-Universität München</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">https://lmuidp.lrz.de</OrganizationURL>
-    <OrganizationURL xml:lang="en">https://lmuidp.lrz.de</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Cyrill</GivenName>
-    <SurName>Matenaers</SurName>
-    <EmailAddress>mailto:studienportal@it.vetmed.uni-muenchen.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="support">
-    <GivenName>Studienportal</GivenName>
-    <SurName>Helpdesk</SurName>
-    <EmailAddress>mailto:studienportal@it.vetmed.uni-muenchen.de</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/studienportal.vetmed.uni-muenchen.de.xml b/swamid-interfederations-2.0/studienportal.vetmed.uni-muenchen.de.xml
deleted file mode 100644
index 22f98d29..00000000
--- a/swamid-interfederations-2.0/studienportal.vetmed.uni-muenchen.de.xml
+++ /dev/null
@@ -1,105 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://studienportal.vetmed.uni-muenchen.de/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2013-04-30T13:50:47Z">
-      <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>
-  <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://studienportal.vetmed.uni-muenchen.de/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="de">Studienportal tierärztliche Fakultät LMU</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Studienportal tierärztliche Fakultät LMU</mdui:DisplayName>
-        <mdui:Description xml:lang="de">Studienportal tierärztliche Fakultät LMU</mdui:Description>
-        <mdui:Description xml:lang="en">Studienportal tierärztliche Fakultät LMU</mdui:Description>
-        <mdui:InformationURL xml:lang="de">https://studienportal.vetmed.uni-muenchen.de</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">https://studienportal.vetmed.uni-muenchen.de</mdui:InformationURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>studienportal.vetmed.uni-muenchen.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=studienportal.vetmed.uni-muenchen.de,OU=Tieraerztliche Fakultaet,O=Ludwig-Maximilians-Universitaet Muenchen,L=Muenchen,ST=Bayern,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFrDCCBJSgAwIBAgIEEOYptTANBgkqhkiG9w0BAQUFADCBkDELMAkGA1UEBhMC
-REUxDzANBgNVBAgTBkJheWVybjERMA8GA1UEBxMITXVlbmNoZW4xMTAvBgNVBAoT
-KEx1ZHdpZy1NYXhpbWlsaWFucy1Vbml2ZXJzaXRhZXQgTXVlbmNoZW4xDzANBgNV
-BAMTBkxNVS1DQTEZMBcGCSqGSIb3DQEJARYKcGtpQGxtdS5kZTAeFw0xMDEwMjYx
-MDIzMzNaFw0xNTEwMjUxMDIzMzNaMIG2MQswCQYDVQQGEwJERTEPMA0GA1UECBMG
-QmF5ZXJuMREwDwYDVQQHEwhNdWVuY2hlbjExMC8GA1UEChMoTHVkd2lnLU1heGlt
-aWxpYW5zLVVuaXZlcnNpdGFldCBNdWVuY2hlbjEhMB8GA1UECxMYVGllcmFlcnp0
-bGljaGUgRmFrdWx0YWV0MS0wKwYDVQQDEyRzdHVkaWVucG9ydGFsLnZldG1lZC51
-bmktbXVlbmNoZW4uZGUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCf
-aVM4c+oiLWXWdu/PVBS7JHqdNKqk//w0wQoH4o/g6gRK5LiSOy3Dqloz5UpFYjNW
-D7lQEzcg1Ar/0/NsQ3HEU75k7uUaOmZi+kNse8seagyCjlfWnU5DAsPDFG7SiotU
-0AX6dPL+GkzyWKpdG7/HrGze43pFbYkB67KaAuwLHPGZwBzeyIDyL9RPjdRXflhI
-o/sxJh5tv/9tLpxNupacnk7mfz1xDlfvSLyWEjr6pL/JtLR7Z3BQ5/PISFncWO+Q
-ZfrY7TGZ/E9uS2pnfteOY22Y6rR1FiVgcIowzScVTOwyshvopoVI1/u3d+ChMhBI
-ezjRfr1udeSajAk/RqVTAgMBAAGjggHkMIIB4DAJBgNVHRMEAjAAMAsGA1UdDwQE
-AwIF4DAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwHQYDVR0OBBYEFGIL
-BlMn4wIAUnAiU7s+tIBt1iu0MB8GA1UdIwQYMBaAFHmHeGov+pu8I0+UpqN3HR4O
-lIAPMDIGA1UdEQQrMCmBJ2FkbWluaXN0cmF0b3JAaXQudmV0bWVkLnVuaS1tdWVu
-Y2hlbi5kZTCBiwYDVR0fBIGDMIGAMD6gPKA6hjhodHRwOi8vY2RwMS5wY2EuZGZu
-LmRlL3VuaS1tdWVuY2hlbi1jYS9wdWIvY3JsL2NhY3JsLmNybDA+oDygOoY4aHR0
-cDovL2NkcDIucGNhLmRmbi5kZS91bmktbXVlbmNoZW4tY2EvcHViL2NybC9jYWNy
-bC5jcmwwgaQGCCsGAQUFBwEBBIGXMIGUMEgGCCsGAQUFBzAChjxodHRwOi8vY2Rw
-MS5wY2EuZGZuLmRlL3VuaS1tdWVuY2hlbi1jYS9wdWIvY2FjZXJ0L2NhY2VydC5j
-cnQwSAYIKwYBBQUHMAKGPGh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvdW5pLW11ZW5j
-aGVuLWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDANBgkqhkiG9w0BAQUFAAOCAQEA
-XoE3xNYk2QmdKevsY4W/szKTswy74uqQ3utXm5Hf5+/9+Cgd7BStYRZVHI24veXq
-a0YOorNUumnTkZFUB4B5OZpaDw9t80WSaefC3o1zc0PXH9+caRhoqmnBSG1JdF6L
-kY0pqAOralMzMChLKOrRb2cnjxHWa/Ug9C7XaXmEJhjP+7GCjZSLMS/du1E1wyKc
-3fN+WdEbKF4OiY1lK+MBlgDyGdXqkrAFX8JbGo1uWyGgDKu2gT7QhMeNXDPzpWn8
-YwnP4oYTHPCDNHFJR6XyRTogzebI5RgoL2eLI8SOf0LXXBTE2KvM2cOWFSmKlgFd
-NL76LsPu9j46CldHJOaVdg==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://studienportal.vetmed.uni-muenchen.de/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://studienportal.vetmed.uni-muenchen.de/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://studienportal.vetmed.uni-muenchen.de/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://studienportal.vetmed.uni-muenchen.de/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://studienportal.vetmed.uni-muenchen.de/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://studienportal.vetmed.uni-muenchen.de/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://studienportal.vetmed.uni-muenchen.de/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://studienportal.vetmed.uni-muenchen.de/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://studienportal.vetmed.uni-muenchen.de/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://studienportal.vetmed.uni-muenchen.de/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <AttributeConsumingService index="1">
-      <ServiceName xml:lang="de">Studienportal tierärztliche Fakultät LMU</ServiceName>
-      <ServiceName xml:lang="en">Studienportal tierärztliche Fakultät LMU</ServiceName>
-      <ServiceDescription xml:lang="de">Studienportal tierärztliche Fakultät LMU</ServiceDescription>
-      <ServiceDescription xml:lang="en">Studienportal tierärztliche Fakultät LMU</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="givenName" Name="urn:oid:2.5.4.42" 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" isRequired="true"/>
-      <RequestedAttribute FriendlyName="dfnEduPersonStudyBranch3" Name="urn:oid:1.3.6.1.4.1.22177.400.1.1.3.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-    </AttributeConsumingService>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">e29</OrganizationName>
-    <OrganizationName xml:lang="en">e29</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">Ludwig-Maximilians-Universität München</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">Ludwig-Maximilians-Universität München</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">https://lmuidp.lrz.de</OrganizationURL>
-    <OrganizationURL xml:lang="en">https://lmuidp.lrz.de</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Cyrill</GivenName>
-    <SurName>Matenaers</SurName>
-    <EmailAddress>mailto:studienportal@it.vetmed.uni-muenchen.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="support">
-    <GivenName>Studienportal</GivenName>
-    <SurName>Helpdesk</SurName>
-    <EmailAddress>mailto:studienportal@it.vetmed.uni-muenchen.de</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/synnefo.sky.deic.dk.xml b/swamid-interfederations-2.0/synnefo.sky.deic.dk.xml
deleted file mode 100644
index 4d09729f..00000000
--- a/swamid-interfederations-2.0/synnefo.sky.deic.dk.xml
+++ /dev/null
@@ -1,40 +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://synnefo.sky.deic.dk/astakos/ui/login/shibboleth/">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIEczCCA1ugAwIBAgIQHz6y/RkaDilUw5CuCTw/mDANBgkqhkiG9w0BAQUFADA2MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEgU1NMIENBMB4XDTEzMDgyODAwMDAwMFoXDTE2MDgyNzIzNTk1OVowQTEhMB8GA1UECxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRwwGgYDVQQDExNzeW5uZWZvLnNreS5kZWljLmRrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA8sNrox68GaiB3lOVesL6n1D5C69dAAiaWD50G2PctgjQcSBEAW1zy88OzUEcctTHMDIImdTSb4oj48C+OZ4xGX9KGyU5LzEdRPIOjjHcs9vXeg1kNBIpVdW68cJs1NUYIh7EuuAeTNhGcitH0aUidGtS+2394Wz/BbeD/SBsMrp+R0KWSt4a6uBwoVQDgLKuPxh9ABOytMMvvjahpYzcjRlBRnYuZPS1Kd8z6hQoQkSe0DIoJCJv6bQZiZxHyOaqs/17V3yqG9iox44PgM8FV4vfKwlZi/7ESEkQWoovErRQ+NWfkc3AoUvCgx8WWwgzvg3viBiPTNc1jYyE3J3ghwIDAQABo4IBcDCCAWwwHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsrN1dH6pDjue0wHQYDVR0OBBYEFM2VRTEPidBjw2uvUxHjGofaKsAeMA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8vb2NzcC50Y3MudGVyZW5hLm9yZzAeBgNVHREEFzAVghNzeW5uZWZvLnNreS5kZWljLmRrMA0GCSqGSIb3DQEBBQUAA4IBAQCg4m6vWsld8NxtxCtlwZNRdFD0V/rWkv8NTOcdY2pSEXAizi7mSg6CZ6qp3vw7IKl1eF302+eNiQr86WdAN6bgr6EC/eoj7gyEC1YbEafnT1GNyxF+PzsRgt1a5lUR7PR9Xvduj/Ujzq8QJXwWxStcsi7fWz5tXnKakCFEqmZizaOgKiTGoc0NEluMBwRsWvcl9/6gDV7fWALdHBp8d8oVGRFHqRHWSps+5NlV9Z48VeDtQBMJd8xdgh+8Qe4xgQbno2mkkBTfsaYZ5Iy+IcB0hx51UzAdbiNFWzxa072ClafVq62XVKmACmjKGZmDTp0WQma6WMJGT8blf5b0o3pH</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIEczCCA1ugAwIBAgIQHz6y/RkaDilUw5CuCTw/mDANBgkqhkiG9w0BAQUFADA2MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEgU1NMIENBMB4XDTEzMDgyODAwMDAwMFoXDTE2MDgyNzIzNTk1OVowQTEhMB8GA1UECxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRwwGgYDVQQDExNzeW5uZWZvLnNreS5kZWljLmRrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA8sNrox68GaiB3lOVesL6n1D5C69dAAiaWD50G2PctgjQcSBEAW1zy88OzUEcctTHMDIImdTSb4oj48C+OZ4xGX9KGyU5LzEdRPIOjjHcs9vXeg1kNBIpVdW68cJs1NUYIh7EuuAeTNhGcitH0aUidGtS+2394Wz/BbeD/SBsMrp+R0KWSt4a6uBwoVQDgLKuPxh9ABOytMMvvjahpYzcjRlBRnYuZPS1Kd8z6hQoQkSe0DIoJCJv6bQZiZxHyOaqs/17V3yqG9iox44PgM8FV4vfKwlZi/7ESEkQWoovErRQ+NWfkc3AoUvCgx8WWwgzvg3viBiPTNc1jYyE3J3ghwIDAQABo4IBcDCCAWwwHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsrN1dH6pDjue0wHQYDVR0OBBYEFM2VRTEPidBjw2uvUxHjGofaKsAeMA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8vb2NzcC50Y3MudGVyZW5hLm9yZzAeBgNVHREEFzAVghNzeW5uZWZvLnNreS5kZWljLmRrMA0GCSqGSIb3DQEBBQUAA4IBAQCg4m6vWsld8NxtxCtlwZNRdFD0V/rWkv8NTOcdY2pSEXAizi7mSg6CZ6qp3vw7IKl1eF302+eNiQr86WdAN6bgr6EC/eoj7gyEC1YbEafnT1GNyxF+PzsRgt1a5lUR7PR9Xvduj/Ujzq8QJXwWxStcsi7fWz5tXnKakCFEqmZizaOgKiTGoc0NEluMBwRsWvcl9/6gDV7fWALdHBp8d8oVGRFHqRHWSps+5NlV9Z48VeDtQBMJd8xdgh+8Qe4xgQbno2mkkBTfsaYZ5Iy+IcB0hx51UzAdbiNFWzxa072ClafVq62XVKmACmjKGZmDTp0WQma6WMJGT8blf5b0o3pH</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://synnefo.sky.deic.dk/Shibboleth.sso/SLO/SOAP"/>
-    <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://synnefo.sky.deic.dk/Shibboleth.sso/SAML2/Artifact" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://synnefo.sky.deic.dk/Shibboleth.sso/SAML2/POST" index="0"/>
-    <md:AttributeConsumingService index="0">
-      <md:ServiceName xml:lang="en">Synnefo DeIC</md:ServiceName>
-      <md:ServiceName xml:lang="da">Synnefo DeIC</md:ServiceName>
-      <md:ServiceDescription xml:lang="en">to put virtual machines and storage at the disposal of people affiliated with any Danish higher educational institution</md:ServiceDescription>
-      <md:ServiceDescription xml:lang="da">at stille virtuelle maskiner og lagerplads til rådighed for personale og studerende ved de højere læreanstalter</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: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:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:ContactPerson contactType="technical">
-    <md:Company>DeIC</md:Company>
-    <md:GivenName>Istvan</md:GivenName>
-    <md:SurName>Bernath</md:SurName>
-    <md:EmailAddress>isbe@adm.dtu.dk</md:EmailAddress>
-    <md:TelephoneNumber>+45 40142359</md:TelephoneNumber>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/tcs-escience-portal.terena.org-simplesamlphp-module.php-saml-sp-metadata.php-default-sp.xml b/swamid-interfederations-2.0/tcs-escience-portal.terena.org-simplesamlphp-module.php-saml-sp-metadata.php-default-sp.xml
deleted file mode 100644
index faa10d9b..00000000
--- a/swamid-interfederations-2.0/tcs-escience-portal.terena.org-simplesamlphp-module.php-saml-sp-metadata.php-default-sp.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://tcs-escience-portal.terena.org/simplesamlphp/module.php/saml/sp/metadata.php/default-sp">
-  <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 protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="en">TERENA eScience Personal Certificate Service</mdui:DisplayName>
-        <mdui:Description xml:lang="en">This service allows you to get or deactive a personal certificate for eScience applications, such as grid use.</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.terena.org/tcs</mdui:InformationURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIEITCCAwmgAwIBAgIJAMphslCtGfAvMA0GCSqGSIb3DQEBBQUAMGgxCzAJBgNVBAYTAk5MMQswCQYDVQQIEwJOSDESMBAGA1UEBxMJQW1zdGVyZGFtMQ8wDQYDVQQKEwZURVJFTkExJzAlBgNVBAMTHnRjcy1lc2NpZW5jZS1wb3J0YWwudGVyZW5hLm9yZzAeFw0xMzA0MDgwOTM4MDlaFw0zMzA0MDcwOTM4MDlaMGgxCzAJBgNVBAYTAk5MMQswCQYDVQQIEwJOSDESMBAGA1UEBxMJQW1zdGVyZGFtMQ8wDQYDVQQKEwZURVJFTkExJzAlBgNVBAMTHnRjcy1lc2NpZW5jZS1wb3J0YWwudGVyZW5hLm9yZzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANJ78GlTdVJr8q1KWscjN4BEYwgaDQzpkfl5g0dJ/I1XhgRit1SFY1Qcu6MHgpaIJCepkwdrHeDXKJj/t/SwXOeDuwwqwYQIzHVFeGsG0fXkhpvA9Ae07bn6SlQqxp6msleHU+d4oGZnrUOcOVywnDkAaMMUvenWK42f/oBcyf0aJuFlt7ZvaBJv57/z2L02ESkQlCBH3R3NGt77GsBCNXdqGsYaz0BXgQ1U/25ofmL+HcxkbtBFlOfFKfntRMSJJZ3/osgsfkhx++ESQ88OaVdC0X1WEZcphkFjzd/QujxNRW1xlXErVhTtJvX85jYSwoQ0Hl2aO1lF7qundGBYYOsCAwEAAaOBzTCByjAdBgNVHQ4EFgQUFDOLIP6//PMYotoXXSVbz65lyAIwgZoGA1UdIwSBkjCBj4AUFDOLIP6//PMYotoXXSVbz65lyAKhbKRqMGgxCzAJBgNVBAYTAk5MMQswCQYDVQQIEwJOSDESMBAGA1UEBxMJQW1zdGVyZGFtMQ8wDQYDVQQKEwZURVJFTkExJzAlBgNVBAMTHnRjcy1lc2NpZW5jZS1wb3J0YWwudGVyZW5hLm9yZ4IJAMphslCtGfAvMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAJhZchVmfk3ASZ1Spgk56942jWUZCVuloJpo6m0nxQvisa/ZcdsVVfbHFS8AgH79Fub253qHMPzasCfh/WWNn57SVf7QcP+ROA0JuPjmE7gAcPvEb035/tw/3+I5rmNWIq2HVW9ySs5dJVv+p9j1ecr5kLiD4eNJRQxUD0XXNkruWF4NChxTREUim/WaIBy8qlt8ljXF3zyXwkQ7KchQ8/vQu2/4g4cVrjOZR8oulgpTOZcVnVwzdfYZSicWxHv3TkGmc5mPBtUxfUKcuLBbJX38K8346P8aQnizVN26gsW2LbGUEsPwg9HgGnGxaMtL4m/fC32Y7lxU4X6D0MsH3xY=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIEITCCAwmgAwIBAgIJAMphslCtGfAvMA0GCSqGSIb3DQEBBQUAMGgxCzAJBgNVBAYTAk5MMQswCQYDVQQIEwJOSDESMBAGA1UEBxMJQW1zdGVyZGFtMQ8wDQYDVQQKEwZURVJFTkExJzAlBgNVBAMTHnRjcy1lc2NpZW5jZS1wb3J0YWwudGVyZW5hLm9yZzAeFw0xMzA0MDgwOTM4MDlaFw0zMzA0MDcwOTM4MDlaMGgxCzAJBgNVBAYTAk5MMQswCQYDVQQIEwJOSDESMBAGA1UEBxMJQW1zdGVyZGFtMQ8wDQYDVQQKEwZURVJFTkExJzAlBgNVBAMTHnRjcy1lc2NpZW5jZS1wb3J0YWwudGVyZW5hLm9yZzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANJ78GlTdVJr8q1KWscjN4BEYwgaDQzpkfl5g0dJ/I1XhgRit1SFY1Qcu6MHgpaIJCepkwdrHeDXKJj/t/SwXOeDuwwqwYQIzHVFeGsG0fXkhpvA9Ae07bn6SlQqxp6msleHU+d4oGZnrUOcOVywnDkAaMMUvenWK42f/oBcyf0aJuFlt7ZvaBJv57/z2L02ESkQlCBH3R3NGt77GsBCNXdqGsYaz0BXgQ1U/25ofmL+HcxkbtBFlOfFKfntRMSJJZ3/osgsfkhx++ESQ88OaVdC0X1WEZcphkFjzd/QujxNRW1xlXErVhTtJvX85jYSwoQ0Hl2aO1lF7qundGBYYOsCAwEAAaOBzTCByjAdBgNVHQ4EFgQUFDOLIP6//PMYotoXXSVbz65lyAIwgZoGA1UdIwSBkjCBj4AUFDOLIP6//PMYotoXXSVbz65lyAKhbKRqMGgxCzAJBgNVBAYTAk5MMQswCQYDVQQIEwJOSDESMBAGA1UEBxMJQW1zdGVyZGFtMQ8wDQYDVQQKEwZURVJFTkExJzAlBgNVBAMTHnRjcy1lc2NpZW5jZS1wb3J0YWwudGVyZW5hLm9yZ4IJAMphslCtGfAvMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAJhZchVmfk3ASZ1Spgk56942jWUZCVuloJpo6m0nxQvisa/ZcdsVVfbHFS8AgH79Fub253qHMPzasCfh/WWNn57SVf7QcP+ROA0JuPjmE7gAcPvEb035/tw/3+I5rmNWIq2HVW9ySs5dJVv+p9j1ecr5kLiD4eNJRQxUD0XXNkruWF4NChxTREUim/WaIBy8qlt8ljXF3zyXwkQ7KchQ8/vQu2/4g4cVrjOZR8oulgpTOZcVnVwzdfYZSicWxHv3TkGmc5mPBtUxfUKcuLBbJX38K8346P8aQnizVN26gsW2LbGUEsPwg9HgGnGxaMtL4m/fC32Y7lxU4X6D0MsH3xY=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://tcs-escience-portal.terena.org/simplesamlphp/module.php/saml/sp/saml2-logout.php/default-sp"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://tcs-escience-portal.terena.org/simplesamlphp/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://tcs-escience-portal.terena.org/simplesamlphp/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://tcs-escience-portal.terena.org/simplesamlphp/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://tcs-escience-portal.terena.org/simplesamlphp/module.php/saml/sp/saml1-acs.php/default-sp/artifact" index="3"/>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">TERENA</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">TERENA</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.terena.org/tcs</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>UvT</md:GivenName>
-    <md:SurName>LIS Unix</md:SurName>
-    <md:EmailAddress>lis-unix@uvt.nl</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/tcs-escience-portal.terena.org.xml b/swamid-interfederations-2.0/tcs-escience-portal.terena.org.xml
deleted file mode 100644
index faa10d9b..00000000
--- a/swamid-interfederations-2.0/tcs-escience-portal.terena.org.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://tcs-escience-portal.terena.org/simplesamlphp/module.php/saml/sp/metadata.php/default-sp">
-  <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 protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="en">TERENA eScience Personal Certificate Service</mdui:DisplayName>
-        <mdui:Description xml:lang="en">This service allows you to get or deactive a personal certificate for eScience applications, such as grid use.</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.terena.org/tcs</mdui:InformationURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIEITCCAwmgAwIBAgIJAMphslCtGfAvMA0GCSqGSIb3DQEBBQUAMGgxCzAJBgNVBAYTAk5MMQswCQYDVQQIEwJOSDESMBAGA1UEBxMJQW1zdGVyZGFtMQ8wDQYDVQQKEwZURVJFTkExJzAlBgNVBAMTHnRjcy1lc2NpZW5jZS1wb3J0YWwudGVyZW5hLm9yZzAeFw0xMzA0MDgwOTM4MDlaFw0zMzA0MDcwOTM4MDlaMGgxCzAJBgNVBAYTAk5MMQswCQYDVQQIEwJOSDESMBAGA1UEBxMJQW1zdGVyZGFtMQ8wDQYDVQQKEwZURVJFTkExJzAlBgNVBAMTHnRjcy1lc2NpZW5jZS1wb3J0YWwudGVyZW5hLm9yZzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANJ78GlTdVJr8q1KWscjN4BEYwgaDQzpkfl5g0dJ/I1XhgRit1SFY1Qcu6MHgpaIJCepkwdrHeDXKJj/t/SwXOeDuwwqwYQIzHVFeGsG0fXkhpvA9Ae07bn6SlQqxp6msleHU+d4oGZnrUOcOVywnDkAaMMUvenWK42f/oBcyf0aJuFlt7ZvaBJv57/z2L02ESkQlCBH3R3NGt77GsBCNXdqGsYaz0BXgQ1U/25ofmL+HcxkbtBFlOfFKfntRMSJJZ3/osgsfkhx++ESQ88OaVdC0X1WEZcphkFjzd/QujxNRW1xlXErVhTtJvX85jYSwoQ0Hl2aO1lF7qundGBYYOsCAwEAAaOBzTCByjAdBgNVHQ4EFgQUFDOLIP6//PMYotoXXSVbz65lyAIwgZoGA1UdIwSBkjCBj4AUFDOLIP6//PMYotoXXSVbz65lyAKhbKRqMGgxCzAJBgNVBAYTAk5MMQswCQYDVQQIEwJOSDESMBAGA1UEBxMJQW1zdGVyZGFtMQ8wDQYDVQQKEwZURVJFTkExJzAlBgNVBAMTHnRjcy1lc2NpZW5jZS1wb3J0YWwudGVyZW5hLm9yZ4IJAMphslCtGfAvMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAJhZchVmfk3ASZ1Spgk56942jWUZCVuloJpo6m0nxQvisa/ZcdsVVfbHFS8AgH79Fub253qHMPzasCfh/WWNn57SVf7QcP+ROA0JuPjmE7gAcPvEb035/tw/3+I5rmNWIq2HVW9ySs5dJVv+p9j1ecr5kLiD4eNJRQxUD0XXNkruWF4NChxTREUim/WaIBy8qlt8ljXF3zyXwkQ7KchQ8/vQu2/4g4cVrjOZR8oulgpTOZcVnVwzdfYZSicWxHv3TkGmc5mPBtUxfUKcuLBbJX38K8346P8aQnizVN26gsW2LbGUEsPwg9HgGnGxaMtL4m/fC32Y7lxU4X6D0MsH3xY=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIEITCCAwmgAwIBAgIJAMphslCtGfAvMA0GCSqGSIb3DQEBBQUAMGgxCzAJBgNVBAYTAk5MMQswCQYDVQQIEwJOSDESMBAGA1UEBxMJQW1zdGVyZGFtMQ8wDQYDVQQKEwZURVJFTkExJzAlBgNVBAMTHnRjcy1lc2NpZW5jZS1wb3J0YWwudGVyZW5hLm9yZzAeFw0xMzA0MDgwOTM4MDlaFw0zMzA0MDcwOTM4MDlaMGgxCzAJBgNVBAYTAk5MMQswCQYDVQQIEwJOSDESMBAGA1UEBxMJQW1zdGVyZGFtMQ8wDQYDVQQKEwZURVJFTkExJzAlBgNVBAMTHnRjcy1lc2NpZW5jZS1wb3J0YWwudGVyZW5hLm9yZzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANJ78GlTdVJr8q1KWscjN4BEYwgaDQzpkfl5g0dJ/I1XhgRit1SFY1Qcu6MHgpaIJCepkwdrHeDXKJj/t/SwXOeDuwwqwYQIzHVFeGsG0fXkhpvA9Ae07bn6SlQqxp6msleHU+d4oGZnrUOcOVywnDkAaMMUvenWK42f/oBcyf0aJuFlt7ZvaBJv57/z2L02ESkQlCBH3R3NGt77GsBCNXdqGsYaz0BXgQ1U/25ofmL+HcxkbtBFlOfFKfntRMSJJZ3/osgsfkhx++ESQ88OaVdC0X1WEZcphkFjzd/QujxNRW1xlXErVhTtJvX85jYSwoQ0Hl2aO1lF7qundGBYYOsCAwEAAaOBzTCByjAdBgNVHQ4EFgQUFDOLIP6//PMYotoXXSVbz65lyAIwgZoGA1UdIwSBkjCBj4AUFDOLIP6//PMYotoXXSVbz65lyAKhbKRqMGgxCzAJBgNVBAYTAk5MMQswCQYDVQQIEwJOSDESMBAGA1UEBxMJQW1zdGVyZGFtMQ8wDQYDVQQKEwZURVJFTkExJzAlBgNVBAMTHnRjcy1lc2NpZW5jZS1wb3J0YWwudGVyZW5hLm9yZ4IJAMphslCtGfAvMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAJhZchVmfk3ASZ1Spgk56942jWUZCVuloJpo6m0nxQvisa/ZcdsVVfbHFS8AgH79Fub253qHMPzasCfh/WWNn57SVf7QcP+ROA0JuPjmE7gAcPvEb035/tw/3+I5rmNWIq2HVW9ySs5dJVv+p9j1ecr5kLiD4eNJRQxUD0XXNkruWF4NChxTREUim/WaIBy8qlt8ljXF3zyXwkQ7KchQ8/vQu2/4g4cVrjOZR8oulgpTOZcVnVwzdfYZSicWxHv3TkGmc5mPBtUxfUKcuLBbJX38K8346P8aQnizVN26gsW2LbGUEsPwg9HgGnGxaMtL4m/fC32Y7lxU4X6D0MsH3xY=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://tcs-escience-portal.terena.org/simplesamlphp/module.php/saml/sp/saml2-logout.php/default-sp"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://tcs-escience-portal.terena.org/simplesamlphp/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://tcs-escience-portal.terena.org/simplesamlphp/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://tcs-escience-portal.terena.org/simplesamlphp/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://tcs-escience-portal.terena.org/simplesamlphp/module.php/saml/sp/saml1-acs.php/default-sp/artifact" index="3"/>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">TERENA</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">TERENA</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.terena.org/tcs</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>UvT</md:GivenName>
-    <md:SurName>LIS Unix</md:SurName>
-    <md:EmailAddress>lis-unix@uvt.nl</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/tcs-personal-portal.terena.org-simplesamlphp-module.php-saml-sp-metadata.php-default-sp.xml b/swamid-interfederations-2.0/tcs-personal-portal.terena.org-simplesamlphp-module.php-saml-sp-metadata.php-default-sp.xml
deleted file mode 100644
index b485ac9f..00000000
--- a/swamid-interfederations-2.0/tcs-personal-portal.terena.org-simplesamlphp-module.php-saml-sp-metadata.php-default-sp.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://tcs-personal-portal.terena.org/simplesamlphp/module.php/saml/sp/metadata.php/default-sp">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.surfconext.nl/" registrationInstant="2013-05-03T16:31:26Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://wiki.surfnetlabs.nl/display/eduGAIN/EduGAIN</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>
-        <mdui:DisplayName xml:lang="en">TERENA Personal Certificate Service</mdui:DisplayName>
-        <mdui:Description xml:lang="en">This service allows you to get or deactive a personal certificate.</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.terena.org/tcs</mdui:InformationURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIEITCCAwmgAwIBAgIJAJAgPhRkNLb/MA0GCSqGSIb3DQEBBQUAMGgxCzAJBgNVBAYTAk5MMQswCQYDVQQIEwJOSDESMBAGA1UEBxMJQW1zdGVyZGFtMQ8wDQYDVQQKEwZURVJFTkExJzAlBgNVBAMTHnRjcy1wZXJzb25hbC1wb3J0YWwudGVyZW5hLm9yZzAeFw0xMzA0MDgwOTM5MTVaFw0zMzA0MDcwOTM5MTVaMGgxCzAJBgNVBAYTAk5MMQswCQYDVQQIEwJOSDESMBAGA1UEBxMJQW1zdGVyZGFtMQ8wDQYDVQQKEwZURVJFTkExJzAlBgNVBAMTHnRjcy1wZXJzb25hbC1wb3J0YWwudGVyZW5hLm9yZzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANBcWpnN9ebHCveyj0WRiPOylNZXR+KG1uRaiTTT0gDjeajlUlZioQGLX0uoxqWy9D/l86LrAq6VEHX4OaBA+Xz0QonTcLz2ri1Vf1GYDjHtInc+UO6pMQHKCdbxMfS97dUXqz++H25xav/cdSPxXvc9a9mIb3DT2yaR9qsUIR2kGxXqdwoZ1fClQLJOPvEGonvlxxNBfLvaJuhvIGtKx0IXvGdnXEl3bzvp2bGPAwUxSEnFcnhjr4qmIs5QEqaqkSOmfKqwv+v2GCXdUOBjkELGVO4475tR4ouIi5rVoWmx3Tg21m/AWa5UbTBdSS6Di6n2QXsk+0j1L/FVji6exhcCAwEAAaOBzTCByjAdBgNVHQ4EFgQUoPN3NNk77LXCa/WThDYvPCp7gPowgZoGA1UdIwSBkjCBj4AUoPN3NNk77LXCa/WThDYvPCp7gPqhbKRqMGgxCzAJBgNVBAYTAk5MMQswCQYDVQQIEwJOSDESMBAGA1UEBxMJQW1zdGVyZGFtMQ8wDQYDVQQKEwZURVJFTkExJzAlBgNVBAMTHnRjcy1wZXJzb25hbC1wb3J0YWwudGVyZW5hLm9yZ4IJAJAgPhRkNLb/MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAIrsiiKJmDtH73e8oySp/In6QwCw2y2v0MJ9yHrPOdlTH4dQ3QFaGOaKIcD1McdKN1xWCKE6FudqVr3nuJZVliSL4rM+RE+v4gkTuNFzzz/2ARR2EkCn14K/7FuM1kGoUfIHYloB1NohRvJup3vDRGpuvutWJjOznmfxdM5aUCYYzR1fX3GTVanuaYGNzKhpKnDIjlBuZwUx/YEzEbBlTmdh5I3s5PidRnQdU4EnD2rBoT3nuqgYKLoC0d4eN9LvpI14evq9Z4WrXhEJwU4ItX5OQz+iLB6Y7LX3JBqucdfKHYcPI+yvvQVxbeSuTWIB9vhooOqjt8jxGzrBq8arBmc=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIEITCCAwmgAwIBAgIJAJAgPhRkNLb/MA0GCSqGSIb3DQEBBQUAMGgxCzAJBgNVBAYTAk5MMQswCQYDVQQIEwJOSDESMBAGA1UEBxMJQW1zdGVyZGFtMQ8wDQYDVQQKEwZURVJFTkExJzAlBgNVBAMTHnRjcy1wZXJzb25hbC1wb3J0YWwudGVyZW5hLm9yZzAeFw0xMzA0MDgwOTM5MTVaFw0zMzA0MDcwOTM5MTVaMGgxCzAJBgNVBAYTAk5MMQswCQYDVQQIEwJOSDESMBAGA1UEBxMJQW1zdGVyZGFtMQ8wDQYDVQQKEwZURVJFTkExJzAlBgNVBAMTHnRjcy1wZXJzb25hbC1wb3J0YWwudGVyZW5hLm9yZzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANBcWpnN9ebHCveyj0WRiPOylNZXR+KG1uRaiTTT0gDjeajlUlZioQGLX0uoxqWy9D/l86LrAq6VEHX4OaBA+Xz0QonTcLz2ri1Vf1GYDjHtInc+UO6pMQHKCdbxMfS97dUXqz++H25xav/cdSPxXvc9a9mIb3DT2yaR9qsUIR2kGxXqdwoZ1fClQLJOPvEGonvlxxNBfLvaJuhvIGtKx0IXvGdnXEl3bzvp2bGPAwUxSEnFcnhjr4qmIs5QEqaqkSOmfKqwv+v2GCXdUOBjkELGVO4475tR4ouIi5rVoWmx3Tg21m/AWa5UbTBdSS6Di6n2QXsk+0j1L/FVji6exhcCAwEAAaOBzTCByjAdBgNVHQ4EFgQUoPN3NNk77LXCa/WThDYvPCp7gPowgZoGA1UdIwSBkjCBj4AUoPN3NNk77LXCa/WThDYvPCp7gPqhbKRqMGgxCzAJBgNVBAYTAk5MMQswCQYDVQQIEwJOSDESMBAGA1UEBxMJQW1zdGVyZGFtMQ8wDQYDVQQKEwZURVJFTkExJzAlBgNVBAMTHnRjcy1wZXJzb25hbC1wb3J0YWwudGVyZW5hLm9yZ4IJAJAgPhRkNLb/MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAIrsiiKJmDtH73e8oySp/In6QwCw2y2v0MJ9yHrPOdlTH4dQ3QFaGOaKIcD1McdKN1xWCKE6FudqVr3nuJZVliSL4rM+RE+v4gkTuNFzzz/2ARR2EkCn14K/7FuM1kGoUfIHYloB1NohRvJup3vDRGpuvutWJjOznmfxdM5aUCYYzR1fX3GTVanuaYGNzKhpKnDIjlBuZwUx/YEzEbBlTmdh5I3s5PidRnQdU4EnD2rBoT3nuqgYKLoC0d4eN9LvpI14evq9Z4WrXhEJwU4ItX5OQz+iLB6Y7LX3JBqucdfKHYcPI+yvvQVxbeSuTWIB9vhooOqjt8jxGzrBq8arBmc=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://tcs-personal-portal.terena.org/simplesamlphp/module.php/saml/sp/saml2-logout.php/default-sp"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://tcs-personal-portal.terena.org/simplesamlphp/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://tcs-personal-portal.terena.org/simplesamlphp/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://tcs-personal-portal.terena.org/simplesamlphp/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://tcs-personal-portal.terena.org/simplesamlphp/module.php/saml/sp/saml1-acs.php/default-sp/artifact" index="3"/>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">TERENA</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">TERENA</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.terena.org/tcs</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>UvT</md:GivenName>
-    <md:SurName>LIS Unix</md:SurName>
-    <md:EmailAddress>lis-unix@uvt.nl</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/tcs-personal-portal.terena.org.xml b/swamid-interfederations-2.0/tcs-personal-portal.terena.org.xml
deleted file mode 100644
index b485ac9f..00000000
--- a/swamid-interfederations-2.0/tcs-personal-portal.terena.org.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://tcs-personal-portal.terena.org/simplesamlphp/module.php/saml/sp/metadata.php/default-sp">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.surfconext.nl/" registrationInstant="2013-05-03T16:31:26Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://wiki.surfnetlabs.nl/display/eduGAIN/EduGAIN</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>
-        <mdui:DisplayName xml:lang="en">TERENA Personal Certificate Service</mdui:DisplayName>
-        <mdui:Description xml:lang="en">This service allows you to get or deactive a personal certificate.</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.terena.org/tcs</mdui:InformationURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIEITCCAwmgAwIBAgIJAJAgPhRkNLb/MA0GCSqGSIb3DQEBBQUAMGgxCzAJBgNVBAYTAk5MMQswCQYDVQQIEwJOSDESMBAGA1UEBxMJQW1zdGVyZGFtMQ8wDQYDVQQKEwZURVJFTkExJzAlBgNVBAMTHnRjcy1wZXJzb25hbC1wb3J0YWwudGVyZW5hLm9yZzAeFw0xMzA0MDgwOTM5MTVaFw0zMzA0MDcwOTM5MTVaMGgxCzAJBgNVBAYTAk5MMQswCQYDVQQIEwJOSDESMBAGA1UEBxMJQW1zdGVyZGFtMQ8wDQYDVQQKEwZURVJFTkExJzAlBgNVBAMTHnRjcy1wZXJzb25hbC1wb3J0YWwudGVyZW5hLm9yZzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANBcWpnN9ebHCveyj0WRiPOylNZXR+KG1uRaiTTT0gDjeajlUlZioQGLX0uoxqWy9D/l86LrAq6VEHX4OaBA+Xz0QonTcLz2ri1Vf1GYDjHtInc+UO6pMQHKCdbxMfS97dUXqz++H25xav/cdSPxXvc9a9mIb3DT2yaR9qsUIR2kGxXqdwoZ1fClQLJOPvEGonvlxxNBfLvaJuhvIGtKx0IXvGdnXEl3bzvp2bGPAwUxSEnFcnhjr4qmIs5QEqaqkSOmfKqwv+v2GCXdUOBjkELGVO4475tR4ouIi5rVoWmx3Tg21m/AWa5UbTBdSS6Di6n2QXsk+0j1L/FVji6exhcCAwEAAaOBzTCByjAdBgNVHQ4EFgQUoPN3NNk77LXCa/WThDYvPCp7gPowgZoGA1UdIwSBkjCBj4AUoPN3NNk77LXCa/WThDYvPCp7gPqhbKRqMGgxCzAJBgNVBAYTAk5MMQswCQYDVQQIEwJOSDESMBAGA1UEBxMJQW1zdGVyZGFtMQ8wDQYDVQQKEwZURVJFTkExJzAlBgNVBAMTHnRjcy1wZXJzb25hbC1wb3J0YWwudGVyZW5hLm9yZ4IJAJAgPhRkNLb/MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAIrsiiKJmDtH73e8oySp/In6QwCw2y2v0MJ9yHrPOdlTH4dQ3QFaGOaKIcD1McdKN1xWCKE6FudqVr3nuJZVliSL4rM+RE+v4gkTuNFzzz/2ARR2EkCn14K/7FuM1kGoUfIHYloB1NohRvJup3vDRGpuvutWJjOznmfxdM5aUCYYzR1fX3GTVanuaYGNzKhpKnDIjlBuZwUx/YEzEbBlTmdh5I3s5PidRnQdU4EnD2rBoT3nuqgYKLoC0d4eN9LvpI14evq9Z4WrXhEJwU4ItX5OQz+iLB6Y7LX3JBqucdfKHYcPI+yvvQVxbeSuTWIB9vhooOqjt8jxGzrBq8arBmc=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIEITCCAwmgAwIBAgIJAJAgPhRkNLb/MA0GCSqGSIb3DQEBBQUAMGgxCzAJBgNVBAYTAk5MMQswCQYDVQQIEwJOSDESMBAGA1UEBxMJQW1zdGVyZGFtMQ8wDQYDVQQKEwZURVJFTkExJzAlBgNVBAMTHnRjcy1wZXJzb25hbC1wb3J0YWwudGVyZW5hLm9yZzAeFw0xMzA0MDgwOTM5MTVaFw0zMzA0MDcwOTM5MTVaMGgxCzAJBgNVBAYTAk5MMQswCQYDVQQIEwJOSDESMBAGA1UEBxMJQW1zdGVyZGFtMQ8wDQYDVQQKEwZURVJFTkExJzAlBgNVBAMTHnRjcy1wZXJzb25hbC1wb3J0YWwudGVyZW5hLm9yZzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANBcWpnN9ebHCveyj0WRiPOylNZXR+KG1uRaiTTT0gDjeajlUlZioQGLX0uoxqWy9D/l86LrAq6VEHX4OaBA+Xz0QonTcLz2ri1Vf1GYDjHtInc+UO6pMQHKCdbxMfS97dUXqz++H25xav/cdSPxXvc9a9mIb3DT2yaR9qsUIR2kGxXqdwoZ1fClQLJOPvEGonvlxxNBfLvaJuhvIGtKx0IXvGdnXEl3bzvp2bGPAwUxSEnFcnhjr4qmIs5QEqaqkSOmfKqwv+v2GCXdUOBjkELGVO4475tR4ouIi5rVoWmx3Tg21m/AWa5UbTBdSS6Di6n2QXsk+0j1L/FVji6exhcCAwEAAaOBzTCByjAdBgNVHQ4EFgQUoPN3NNk77LXCa/WThDYvPCp7gPowgZoGA1UdIwSBkjCBj4AUoPN3NNk77LXCa/WThDYvPCp7gPqhbKRqMGgxCzAJBgNVBAYTAk5MMQswCQYDVQQIEwJOSDESMBAGA1UEBxMJQW1zdGVyZGFtMQ8wDQYDVQQKEwZURVJFTkExJzAlBgNVBAMTHnRjcy1wZXJzb25hbC1wb3J0YWwudGVyZW5hLm9yZ4IJAJAgPhRkNLb/MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAIrsiiKJmDtH73e8oySp/In6QwCw2y2v0MJ9yHrPOdlTH4dQ3QFaGOaKIcD1McdKN1xWCKE6FudqVr3nuJZVliSL4rM+RE+v4gkTuNFzzz/2ARR2EkCn14K/7FuM1kGoUfIHYloB1NohRvJup3vDRGpuvutWJjOznmfxdM5aUCYYzR1fX3GTVanuaYGNzKhpKnDIjlBuZwUx/YEzEbBlTmdh5I3s5PidRnQdU4EnD2rBoT3nuqgYKLoC0d4eN9LvpI14evq9Z4WrXhEJwU4ItX5OQz+iLB6Y7LX3JBqucdfKHYcPI+yvvQVxbeSuTWIB9vhooOqjt8jxGzrBq8arBmc=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://tcs-personal-portal.terena.org/simplesamlphp/module.php/saml/sp/saml2-logout.php/default-sp"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://tcs-personal-portal.terena.org/simplesamlphp/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://tcs-personal-portal.terena.org/simplesamlphp/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://tcs-personal-portal.terena.org/simplesamlphp/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://tcs-personal-portal.terena.org/simplesamlphp/module.php/saml/sp/saml1-acs.php/default-sp/artifact" index="3"/>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">TERENA</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">TERENA</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.terena.org/tcs</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>UvT</md:GivenName>
-    <md:SurName>LIS Unix</md:SurName>
-    <md:EmailAddress>lis-unix@uvt.nl</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/terena.org-sp.xml b/swamid-interfederations-2.0/terena.org-sp.xml
index 3b1161df..7b64359e 100644
--- a/swamid-interfederations-2.0/terena.org-sp.xml
+++ b/swamid-interfederations-2.0/terena.org-sp.xml
@@ -1,59 +1,32 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://terena.org/sp">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.surfconext.nl/" registrationInstant="2011-06-08T02:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://wiki.surfnetlabs.nl/display/eduGAIN/EduGAIN</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">TERENA Service Provider Proxy</mdui:DisplayName>
-        <mdui:Description xml:lang="en">A service provider proxy for all TERENA federated services</mdui:Description>
-        <mdui:InformationURL xml:lang="en">https://confluence.terena.org/display/aai/Service+Provider+Proxy</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">http://www.terena.org/p3p</mdui:PrivacyStatementURL>
-        <mdui:Logo height="94" width="350">https://www.terena.org/gfx/terena_logo_slogan_rgb-350x97.png</mdui:Logo>
-      </mdui:UIInfo>
-    </md:Extensions>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://terena.org/sp">
+  <md:SPSSODescriptor 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:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>MIIEkjCCA3qgAwIBAgIJAL90CxMEVb/kMA0GCSqGSIb3DQEBBQUAMIGMMQswCQYDVQQGEwJOTDELMAkGA1UECBMCTkgxEjAQBgNVBAcTCUFtc3RlcmRhbTEPMA0GA1UEChMGVEVSRU5BMQwwCgYDVQQLEwNJVFMxHjAcBgNVBAMTFWh0dHBzOi8vdGVyZW5hLm9yZy9zcDEdMBsGCSqGSIb3DQEJARYOYWFpQHRlcmVuYS5vcmcwHhcNMTEwMTEyMTUyNjM4WhcNMjEwMTExMTUyNjM4WjCBjDELMAkGA1UEBhMCTkwxCzAJBgNVBAgTAk5IMRIwEAYDVQQHEwlBbXN0ZXJkYW0xDzANBgNVBAoTBlRFUkVOQTEMMAoGA1UECxMDSVRTMR4wHAYDVQQDExVodHRwczovL3RlcmVuYS5vcmcvc3AxHTAbBgkqhkiG9w0BCQEWDmFhaUB0ZXJlbmEub3JnMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwTxx8JBWSpBJiZgdvGOJDXLwaE29Opx1CBbIrYHm47Oy4btsf0BzCmfdSPDlydDm6//355hsQU8BgIh/waEwFZZCg/XyzrJEXCDTZBm1H210aT7FNp356azqKOO1bYWcku0xpFOWWf3jCIkjtOiTkbl12Tw7Y+zJRhV2+jleC5td3JxZ6k1qotgN+1cGwZ2Tv2HhSNeMC4QsGOyBqeP+7B1CLFqFZSiLWGVqcZi0fGkXf+SrTSEH/kLzdciEg2EePyQPcLCKNz9RiIhSmsLE/Rr1ksOvZGmyWFe7YsPyJOLsNyYcZTufDVwpl9fDuJdYy2GdMT1kSNNOpZXZ7QcgYwIDAQABo4H0MIHxMB0GA1UdDgQWBBQ6tVqjpKC8+30XF/qWlaZ3fUKTvDCBwQYDVR0jBIG5MIG2gBQ6tVqjpKC8+30XF/qWlaZ3fUKTvKGBkqSBjzCBjDELMAkGA1UEBhMCTkwxCzAJBgNVBAgTAk5IMRIwEAYDVQQHEwlBbXN0ZXJkYW0xDzANBgNVBAoTBlRFUkVOQTEMMAoGA1UECxMDSVRTMR4wHAYDVQQDExVodHRwczovL3RlcmVuYS5vcmcvc3AxHTAbBgkqhkiG9w0BCQEWDmFhaUB0ZXJlbmEub3JnggkAv3QLEwRVv+QwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAn+06i7zZE7MjuB68gCaNvnCkrgfumi4PWiP6kaE6+LU2MTbxdFyoSAoKh6Ft9TDi+8ANAsn5jRQ5xLUE4YoVbub/KufMwdlX0zO9i+Q//npDTFESnWsiMi7DHg/av1LtzrYYZvE2E1e5c/7wo/axx8Bk7qsE9YXFRs372vDkDwOGSkLbRtgwdCUX47CE/fXvccPDHH217XMed2cVOGFjQgidsFZlJbSfSvQjWYw5LIE0wo9RtsEu5I3WAIar8Wr6/nhVOgIBUStpcw94GwlPxLywfij5CJ9HT+sN2SOj4YmKPBtcwHI75uNZp7XRy85jRjrvhahg5baIQ0u3aL8aMA==</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
     <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+      <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>MIIEkjCCA3qgAwIBAgIJAL90CxMEVb/kMA0GCSqGSIb3DQEBBQUAMIGMMQswCQYDVQQGEwJOTDELMAkGA1UECBMCTkgxEjAQBgNVBAcTCUFtc3RlcmRhbTEPMA0GA1UEChMGVEVSRU5BMQwwCgYDVQQLEwNJVFMxHjAcBgNVBAMTFWh0dHBzOi8vdGVyZW5hLm9yZy9zcDEdMBsGCSqGSIb3DQEJARYOYWFpQHRlcmVuYS5vcmcwHhcNMTEwMTEyMTUyNjM4WhcNMjEwMTExMTUyNjM4WjCBjDELMAkGA1UEBhMCTkwxCzAJBgNVBAgTAk5IMRIwEAYDVQQHEwlBbXN0ZXJkYW0xDzANBgNVBAoTBlRFUkVOQTEMMAoGA1UECxMDSVRTMR4wHAYDVQQDExVodHRwczovL3RlcmVuYS5vcmcvc3AxHTAbBgkqhkiG9w0BCQEWDmFhaUB0ZXJlbmEub3JnMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwTxx8JBWSpBJiZgdvGOJDXLwaE29Opx1CBbIrYHm47Oy4btsf0BzCmfdSPDlydDm6//355hsQU8BgIh/waEwFZZCg/XyzrJEXCDTZBm1H210aT7FNp356azqKOO1bYWcku0xpFOWWf3jCIkjtOiTkbl12Tw7Y+zJRhV2+jleC5td3JxZ6k1qotgN+1cGwZ2Tv2HhSNeMC4QsGOyBqeP+7B1CLFqFZSiLWGVqcZi0fGkXf+SrTSEH/kLzdciEg2EePyQPcLCKNz9RiIhSmsLE/Rr1ksOvZGmyWFe7YsPyJOLsNyYcZTufDVwpl9fDuJdYy2GdMT1kSNNOpZXZ7QcgYwIDAQABo4H0MIHxMB0GA1UdDgQWBBQ6tVqjpKC8+30XF/qWlaZ3fUKTvDCBwQYDVR0jBIG5MIG2gBQ6tVqjpKC8+30XF/qWlaZ3fUKTvKGBkqSBjzCBjDELMAkGA1UEBhMCTkwxCzAJBgNVBAgTAk5IMRIwEAYDVQQHEwlBbXN0ZXJkYW0xDzANBgNVBAoTBlRFUkVOQTEMMAoGA1UECxMDSVRTMR4wHAYDVQQDExVodHRwczovL3RlcmVuYS5vcmcvc3AxHTAbBgkqhkiG9w0BCQEWDmFhaUB0ZXJlbmEub3JnggkAv3QLEwRVv+QwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAn+06i7zZE7MjuB68gCaNvnCkrgfumi4PWiP6kaE6+LU2MTbxdFyoSAoKh6Ft9TDi+8ANAsn5jRQ5xLUE4YoVbub/KufMwdlX0zO9i+Q//npDTFESnWsiMi7DHg/av1LtzrYYZvE2E1e5c/7wo/axx8Bk7qsE9YXFRs372vDkDwOGSkLbRtgwdCUX47CE/fXvccPDHH217XMed2cVOGFjQgidsFZlJbSfSvQjWYw5LIE0wo9RtsEu5I3WAIar8Wr6/nhVOgIBUStpcw94GwlPxLywfij5CJ9HT+sN2SOj4YmKPBtcwHI75uNZp7XRy85jRjrvhahg5baIQ0u3aL8aMA==</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
     <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.terena.org/wayf/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-Redirect" Location="https://login.terena.org/wayf/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://login.terena.org/wayf/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://login.terena.org/wayf/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://login.terena.org/wayf/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://login.terena.org/wayf/module.php/saml/sp/saml1-acs.php/default-sp/artifact" index="3"/>
     <md:AttributeConsumingService index="0">
       <md:ServiceName xml:lang="en">TERENA Service Provider Proxy</md:ServiceName>
-      <md:ServiceDescription xml:lang="en">A Service Provider Proxy for all TERENA Federated Services</md:ServiceDescription>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute 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:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <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:ServiceName xml:lang="da">TERENA Service Provider Proxy</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">to be a Service Provider Proxy for all TERENA Federated Services</md:ServiceDescription>
+      <md:ServiceDescription xml:lang="da">at fungere som tjenesteudbyder-proxy for alle TERENAs fødererede tjenester</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:1.3.6.1.4.1.5923.1.1.1.7" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
     </md:AttributeConsumingService>
   </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">TERENA</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">TERENA</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.terena.org/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>TERENA</md:GivenName>
-    <md:SurName>AAI team</md:SurName>
-    <md:EmailAddress>aai@terena.org</md:EmailAddress>
-  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/terena.org.xml b/swamid-interfederations-2.0/terena.org.xml
deleted file mode 100644
index 3b1161df..00000000
--- a/swamid-interfederations-2.0/terena.org.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://terena.org/sp">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.surfconext.nl/" registrationInstant="2011-06-08T02:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://wiki.surfnetlabs.nl/display/eduGAIN/EduGAIN</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">TERENA Service Provider Proxy</mdui:DisplayName>
-        <mdui:Description xml:lang="en">A service provider proxy for all TERENA federated services</mdui:Description>
-        <mdui:InformationURL xml:lang="en">https://confluence.terena.org/display/aai/Service+Provider+Proxy</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">http://www.terena.org/p3p</mdui:PrivacyStatementURL>
-        <mdui:Logo height="94" width="350">https://www.terena.org/gfx/terena_logo_slogan_rgb-350x97.png</mdui:Logo>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIIEkjCCA3qgAwIBAgIJAL90CxMEVb/kMA0GCSqGSIb3DQEBBQUAMIGMMQswCQYDVQQGEwJOTDELMAkGA1UECBMCTkgxEjAQBgNVBAcTCUFtc3RlcmRhbTEPMA0GA1UEChMGVEVSRU5BMQwwCgYDVQQLEwNJVFMxHjAcBgNVBAMTFWh0dHBzOi8vdGVyZW5hLm9yZy9zcDEdMBsGCSqGSIb3DQEJARYOYWFpQHRlcmVuYS5vcmcwHhcNMTEwMTEyMTUyNjM4WhcNMjEwMTExMTUyNjM4WjCBjDELMAkGA1UEBhMCTkwxCzAJBgNVBAgTAk5IMRIwEAYDVQQHEwlBbXN0ZXJkYW0xDzANBgNVBAoTBlRFUkVOQTEMMAoGA1UECxMDSVRTMR4wHAYDVQQDExVodHRwczovL3RlcmVuYS5vcmcvc3AxHTAbBgkqhkiG9w0BCQEWDmFhaUB0ZXJlbmEub3JnMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwTxx8JBWSpBJiZgdvGOJDXLwaE29Opx1CBbIrYHm47Oy4btsf0BzCmfdSPDlydDm6//355hsQU8BgIh/waEwFZZCg/XyzrJEXCDTZBm1H210aT7FNp356azqKOO1bYWcku0xpFOWWf3jCIkjtOiTkbl12Tw7Y+zJRhV2+jleC5td3JxZ6k1qotgN+1cGwZ2Tv2HhSNeMC4QsGOyBqeP+7B1CLFqFZSiLWGVqcZi0fGkXf+SrTSEH/kLzdciEg2EePyQPcLCKNz9RiIhSmsLE/Rr1ksOvZGmyWFe7YsPyJOLsNyYcZTufDVwpl9fDuJdYy2GdMT1kSNNOpZXZ7QcgYwIDAQABo4H0MIHxMB0GA1UdDgQWBBQ6tVqjpKC8+30XF/qWlaZ3fUKTvDCBwQYDVR0jBIG5MIG2gBQ6tVqjpKC8+30XF/qWlaZ3fUKTvKGBkqSBjzCBjDELMAkGA1UEBhMCTkwxCzAJBgNVBAgTAk5IMRIwEAYDVQQHEwlBbXN0ZXJkYW0xDzANBgNVBAoTBlRFUkVOQTEMMAoGA1UECxMDSVRTMR4wHAYDVQQDExVodHRwczovL3RlcmVuYS5vcmcvc3AxHTAbBgkqhkiG9w0BCQEWDmFhaUB0ZXJlbmEub3JnggkAv3QLEwRVv+QwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAn+06i7zZE7MjuB68gCaNvnCkrgfumi4PWiP6kaE6+LU2MTbxdFyoSAoKh6Ft9TDi+8ANAsn5jRQ5xLUE4YoVbub/KufMwdlX0zO9i+Q//npDTFESnWsiMi7DHg/av1LtzrYYZvE2E1e5c/7wo/axx8Bk7qsE9YXFRs372vDkDwOGSkLbRtgwdCUX47CE/fXvccPDHH217XMed2cVOGFjQgidsFZlJbSfSvQjWYw5LIE0wo9RtsEu5I3WAIar8Wr6/nhVOgIBUStpcw94GwlPxLywfij5CJ9HT+sN2SOj4YmKPBtcwHI75uNZp7XRy85jRjrvhahg5baIQ0u3aL8aMA==</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>MIIEkjCCA3qgAwIBAgIJAL90CxMEVb/kMA0GCSqGSIb3DQEBBQUAMIGMMQswCQYDVQQGEwJOTDELMAkGA1UECBMCTkgxEjAQBgNVBAcTCUFtc3RlcmRhbTEPMA0GA1UEChMGVEVSRU5BMQwwCgYDVQQLEwNJVFMxHjAcBgNVBAMTFWh0dHBzOi8vdGVyZW5hLm9yZy9zcDEdMBsGCSqGSIb3DQEJARYOYWFpQHRlcmVuYS5vcmcwHhcNMTEwMTEyMTUyNjM4WhcNMjEwMTExMTUyNjM4WjCBjDELMAkGA1UEBhMCTkwxCzAJBgNVBAgTAk5IMRIwEAYDVQQHEwlBbXN0ZXJkYW0xDzANBgNVBAoTBlRFUkVOQTEMMAoGA1UECxMDSVRTMR4wHAYDVQQDExVodHRwczovL3RlcmVuYS5vcmcvc3AxHTAbBgkqhkiG9w0BCQEWDmFhaUB0ZXJlbmEub3JnMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwTxx8JBWSpBJiZgdvGOJDXLwaE29Opx1CBbIrYHm47Oy4btsf0BzCmfdSPDlydDm6//355hsQU8BgIh/waEwFZZCg/XyzrJEXCDTZBm1H210aT7FNp356azqKOO1bYWcku0xpFOWWf3jCIkjtOiTkbl12Tw7Y+zJRhV2+jleC5td3JxZ6k1qotgN+1cGwZ2Tv2HhSNeMC4QsGOyBqeP+7B1CLFqFZSiLWGVqcZi0fGkXf+SrTSEH/kLzdciEg2EePyQPcLCKNz9RiIhSmsLE/Rr1ksOvZGmyWFe7YsPyJOLsNyYcZTufDVwpl9fDuJdYy2GdMT1kSNNOpZXZ7QcgYwIDAQABo4H0MIHxMB0GA1UdDgQWBBQ6tVqjpKC8+30XF/qWlaZ3fUKTvDCBwQYDVR0jBIG5MIG2gBQ6tVqjpKC8+30XF/qWlaZ3fUKTvKGBkqSBjzCBjDELMAkGA1UEBhMCTkwxCzAJBgNVBAgTAk5IMRIwEAYDVQQHEwlBbXN0ZXJkYW0xDzANBgNVBAoTBlRFUkVOQTEMMAoGA1UECxMDSVRTMR4wHAYDVQQDExVodHRwczovL3RlcmVuYS5vcmcvc3AxHTAbBgkqhkiG9w0BCQEWDmFhaUB0ZXJlbmEub3JnggkAv3QLEwRVv+QwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAn+06i7zZE7MjuB68gCaNvnCkrgfumi4PWiP6kaE6+LU2MTbxdFyoSAoKh6Ft9TDi+8ANAsn5jRQ5xLUE4YoVbub/KufMwdlX0zO9i+Q//npDTFESnWsiMi7DHg/av1LtzrYYZvE2E1e5c/7wo/axx8Bk7qsE9YXFRs372vDkDwOGSkLbRtgwdCUX47CE/fXvccPDHH217XMed2cVOGFjQgidsFZlJbSfSvQjWYw5LIE0wo9RtsEu5I3WAIar8Wr6/nhVOgIBUStpcw94GwlPxLywfij5CJ9HT+sN2SOj4YmKPBtcwHI75uNZp7XRy85jRjrvhahg5baIQ0u3aL8aMA==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.terena.org/wayf/module.php/saml/sp/saml2-logout.php/default-sp"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.terena.org/wayf/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://login.terena.org/wayf/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://login.terena.org/wayf/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://login.terena.org/wayf/module.php/saml/sp/saml1-acs.php/default-sp/artifact" index="3"/>
-    <md:AttributeConsumingService index="0">
-      <md:ServiceName xml:lang="en">TERENA Service Provider Proxy</md:ServiceName>
-      <md:ServiceDescription xml:lang="en">A Service Provider Proxy for all TERENA Federated Services</md:ServiceDescription>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute 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:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <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:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">TERENA</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">TERENA</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.terena.org/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>TERENA</md:GivenName>
-    <md:SurName>AAI team</md:SurName>
-    <md:EmailAddress>aai@terena.org</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/test-adfs.geant.net-adfs-services-trust.xml b/swamid-interfederations-2.0/test-adfs.geant.net-adfs-services-trust.xml
deleted file mode 100644
index 6ca45221..00000000
--- a/swamid-interfederations-2.0/test-adfs.geant.net-adfs-services-trust.xml
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="http://test-adfs.geant.net/adfs/services/trust" xsi:schemaLocation="urn:oasis:names:tc:SAML:2.0:metadata saml-schema-metadata-2.0.xsd urn:mace:shibboleth:metadata:1.0 shibboleth-metadata-1.0.xsd http://www.w3.org/2000/09/xmldsig# xmldsig-core-schema.xsd">
-  <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>
-  <SPSSODescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" 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 Intranet Test Instance</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Provides access to GÉANT project documents and internas. Test instance.</mdui:Description>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIEcjCCA1qgAwIBAgIHFoCBhVY+iTANBgkqhkiG9w0BAQsFADA3MQswCQYDVQQG
-EwJERTEPMA0GA1UEChMGZWR1UEtJMRcwFQYDVQQDEw5lZHVQS0kgVGVzdCBDQTAe
-Fw0xMzEwMTgwOTQ4MzdaFw0xODEwMTcwOTQ4MzdaMG0xCzAJBgNVBAYTAkRFMTEw
-LwYDVQQKEyhUaGlzIGlzIGEgVGVzdCBhbmQgRGVtbyBDZXJ0aWZpY2F0ZSBvbmx5
-MQ0wCwYDVQQLEwRUZXN0MRwwGgYDVQQDExN0ZXN0LWFkZnMuZ2VhbnQubmV0MIIB
-IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA1ZgGj3cbCZgNNTCY0P2g8jov
-74KFsNXtaPPM0vNT+RlmdfmqLVNFkCz90HHx+1ZFF98YYF3kNqvtipEYhv8AplU+
-j/UR9I6rPTEvHtM2BFrCv3fvsvLitkcYQVi4NDjI8Qzv4ugVGzfeC3vlPPOwNdsA
-wLsKrIKG5QbnDkgaJMuIKorsUD0QBOb/bema0x77jXWyo7Zsrz3EWE6x9VreBLde
-4bzWdvig79oYBCvYbzckS77qweOY4oDB2oxF96wf0UlyC26u40cyGBkWuwke3DX+
-mypM86il05F5gxbMq0iOt1e+rv4ewqzyLdCEEyrG1Iez9qYIZTqiKoCKCZNlcQID
-AQABo4IBSzCCAUcwCQYDVR0TBAIwADALBgNVHQ8EBAMCBeAwHQYDVR0lBBYwFAYI
-KwYBBQUHAwIGCCsGAQUFBwMBMB0GA1UdDgQWBBRsZ/2CP8ljz4lbwswK7TlU+wvn
-uTAfBgNVHSMEGDAWgBSod7exoyNlktqfxGUUmz5e7PjKIDAtBgNVHREEJjAkghN0
-ZXN0LWFkZnMuZ2VhbnQubmV0gQ1zeXNAZ2VhbnQubmV0MEcGA1UdHwRAMD4wPKA6
-oDiGNmh0dHA6Ly9jZHAuZWR1cGtpLm9yZy9lZHVwa2ktdGVzdC1jYS9wdWIvY3Js
-L2NhY3JsLmNybDBWBggrBgEFBQcBAQRKMEgwRgYIKwYBBQUHMAKGOmh0dHA6Ly9j
-ZHAuZWR1cGtpLm9yZy9lZHVwa2ktdGVzdC1jYS9wdWIvY2FjZXJ0L2NhY2VydC5j
-cnQwDQYJKoZIhvcNAQELBQADggEBAEgQ/IltN/cqHX76ne//6A3sHGdPmc37aIwF
-8x+9d7XrKMp/OPuU7B+rrIAw0NTh8lI6jtjksSJ+ONnTvMmNChpbyGt/MoCpzN96
-43SCBG69g9p65YQRbsjbk+F29ddyxbNMGMRRHmU3y/5PuaKT/kxwhI2qdG8jYos7
-OVRy4URr0xxsk41aMJbyW8G9g8TmHMUwY+SwfvYXziQ4Jf67MMMf4a8c2ywZJXTz
-8Yu/S/of6N7uF5SXxIAsTqBWPsFm5Fs9MbAjqH5+itfgPbvh2OsigzD5yODRBfDV
-+i8UK1ae+ilwPcADJEuc04gZiy3dz1a4rhRmDg+bleNBtH2J/JQ=
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</NameIDFormat>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://test-adfs.geant.net/adfs/ls/" index="0" isDefault="true"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://test-adfs.geant.net/adfs/ls/" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://test-adfs.geant.net/adfs/ls/" index="2"/>
-    <AttributeConsumingService index="1">
-      <ServiceName xml:lang="en">GÉANT Intranet Test Instance</ServiceName>
-      <ServiceDescription xml:lang="en">Provides access to GÉANT project documents and internas.</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="true"/>
-      <RequestedAttribute FriendlyName="surname" Name="urn:oid:2.5.4.4" 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" isRequired="true"/>
-      <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="true"/>
-      <RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <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="true"/>
-    </AttributeConsumingService>
-  </SPSSODescriptor>
-  <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
-    <OrganizationName xml:lang="en">geant.net</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">GÉANT</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.geant.net/</OrganizationURL>
-  </Organization>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
-    <GivenName>eduGAIN</GivenName>
-    <SurName>Integration</SurName>
-    <EmailAddress>mailto:edugain-integration@geant.net</EmailAddress>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
-    <GivenName>eduGAIN</GivenName>
-    <SurName>Operation</SurName>
-    <EmailAddress>mailto:edugain-ot@geant.net</EmailAddress>
-  </ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/test-adfs.geant.net.xml b/swamid-interfederations-2.0/test-adfs.geant.net.xml
deleted file mode 100644
index 6ca45221..00000000
--- a/swamid-interfederations-2.0/test-adfs.geant.net.xml
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="http://test-adfs.geant.net/adfs/services/trust" xsi:schemaLocation="urn:oasis:names:tc:SAML:2.0:metadata saml-schema-metadata-2.0.xsd urn:mace:shibboleth:metadata:1.0 shibboleth-metadata-1.0.xsd http://www.w3.org/2000/09/xmldsig# xmldsig-core-schema.xsd">
-  <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>
-  <SPSSODescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" 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 Intranet Test Instance</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Provides access to GÉANT project documents and internas. Test instance.</mdui:Description>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIEcjCCA1qgAwIBAgIHFoCBhVY+iTANBgkqhkiG9w0BAQsFADA3MQswCQYDVQQG
-EwJERTEPMA0GA1UEChMGZWR1UEtJMRcwFQYDVQQDEw5lZHVQS0kgVGVzdCBDQTAe
-Fw0xMzEwMTgwOTQ4MzdaFw0xODEwMTcwOTQ4MzdaMG0xCzAJBgNVBAYTAkRFMTEw
-LwYDVQQKEyhUaGlzIGlzIGEgVGVzdCBhbmQgRGVtbyBDZXJ0aWZpY2F0ZSBvbmx5
-MQ0wCwYDVQQLEwRUZXN0MRwwGgYDVQQDExN0ZXN0LWFkZnMuZ2VhbnQubmV0MIIB
-IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA1ZgGj3cbCZgNNTCY0P2g8jov
-74KFsNXtaPPM0vNT+RlmdfmqLVNFkCz90HHx+1ZFF98YYF3kNqvtipEYhv8AplU+
-j/UR9I6rPTEvHtM2BFrCv3fvsvLitkcYQVi4NDjI8Qzv4ugVGzfeC3vlPPOwNdsA
-wLsKrIKG5QbnDkgaJMuIKorsUD0QBOb/bema0x77jXWyo7Zsrz3EWE6x9VreBLde
-4bzWdvig79oYBCvYbzckS77qweOY4oDB2oxF96wf0UlyC26u40cyGBkWuwke3DX+
-mypM86il05F5gxbMq0iOt1e+rv4ewqzyLdCEEyrG1Iez9qYIZTqiKoCKCZNlcQID
-AQABo4IBSzCCAUcwCQYDVR0TBAIwADALBgNVHQ8EBAMCBeAwHQYDVR0lBBYwFAYI
-KwYBBQUHAwIGCCsGAQUFBwMBMB0GA1UdDgQWBBRsZ/2CP8ljz4lbwswK7TlU+wvn
-uTAfBgNVHSMEGDAWgBSod7exoyNlktqfxGUUmz5e7PjKIDAtBgNVHREEJjAkghN0
-ZXN0LWFkZnMuZ2VhbnQubmV0gQ1zeXNAZ2VhbnQubmV0MEcGA1UdHwRAMD4wPKA6
-oDiGNmh0dHA6Ly9jZHAuZWR1cGtpLm9yZy9lZHVwa2ktdGVzdC1jYS9wdWIvY3Js
-L2NhY3JsLmNybDBWBggrBgEFBQcBAQRKMEgwRgYIKwYBBQUHMAKGOmh0dHA6Ly9j
-ZHAuZWR1cGtpLm9yZy9lZHVwa2ktdGVzdC1jYS9wdWIvY2FjZXJ0L2NhY2VydC5j
-cnQwDQYJKoZIhvcNAQELBQADggEBAEgQ/IltN/cqHX76ne//6A3sHGdPmc37aIwF
-8x+9d7XrKMp/OPuU7B+rrIAw0NTh8lI6jtjksSJ+ONnTvMmNChpbyGt/MoCpzN96
-43SCBG69g9p65YQRbsjbk+F29ddyxbNMGMRRHmU3y/5PuaKT/kxwhI2qdG8jYos7
-OVRy4URr0xxsk41aMJbyW8G9g8TmHMUwY+SwfvYXziQ4Jf67MMMf4a8c2ywZJXTz
-8Yu/S/of6N7uF5SXxIAsTqBWPsFm5Fs9MbAjqH5+itfgPbvh2OsigzD5yODRBfDV
-+i8UK1ae+ilwPcADJEuc04gZiy3dz1a4rhRmDg+bleNBtH2J/JQ=
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</NameIDFormat>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://test-adfs.geant.net/adfs/ls/" index="0" isDefault="true"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://test-adfs.geant.net/adfs/ls/" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://test-adfs.geant.net/adfs/ls/" index="2"/>
-    <AttributeConsumingService index="1">
-      <ServiceName xml:lang="en">GÉANT Intranet Test Instance</ServiceName>
-      <ServiceDescription xml:lang="en">Provides access to GÉANT project documents and internas.</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="true"/>
-      <RequestedAttribute FriendlyName="surname" Name="urn:oid:2.5.4.4" 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" isRequired="true"/>
-      <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="true"/>
-      <RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <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="true"/>
-    </AttributeConsumingService>
-  </SPSSODescriptor>
-  <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
-    <OrganizationName xml:lang="en">geant.net</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">GÉANT</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.geant.net/</OrganizationURL>
-  </Organization>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
-    <GivenName>eduGAIN</GivenName>
-    <SurName>Integration</SurName>
-    <EmailAddress>mailto:edugain-integration@geant.net</EmailAddress>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
-    <GivenName>eduGAIN</GivenName>
-    <SurName>Operation</SurName>
-    <EmailAddress>mailto:edugain-ot@geant.net</EmailAddress>
-  </ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/test-bod-gui.geant.net-autobahn-gui.xml b/swamid-interfederations-2.0/test-bod-gui.geant.net-autobahn-gui.xml
deleted file mode 100644
index e351d63e..00000000
--- a/swamid-interfederations-2.0/test-bod-gui.geant.net-autobahn-gui.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://test-bod-gui.geant.net/autobahn-gui">
-  <!--
-		This is a "BoD Portal" autobahn-gui SP for Delivery of Advanced Network Technology to Europe Limited.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-05-08T15:01:29Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </Extensions>
-  <SPSSODescriptor AuthnRequestsSigned="true" 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">BoD Portal</mdui:DisplayName>
-        <mdui:Description xml:lang="en">A Portal that can be used to access the BoD service for requesting circuit reservations, tracking their status and for administrative operation</mdui:Description>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDNjCCAh6gAwIBAgIJAPH4vrYKW5oVMA0GCSqGSIb3DQEBBQUAMCExHzAdBgNV
-						BAMTFnRlc3QtYm9kLWd1aS5nZWFudC5uZXQwHhcNMTQwNDExMTUxMDEyWhcNMTcw
-						NDExMTUxMDEyWjAhMR8wHQYDVQQDExZ0ZXN0LWJvZC1ndWkuZ2VhbnQubmV0MIIB
-						IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA9wlYXUI0eKL4E4MgQ4gPk8XW
-						Nvn1drh2cKjBkxsclJ809ZoXdToxSOynO0CKmptzL58sBhHC+dpj6TKkUBeIkPtj
-						3lNzkpFcZAPPzWeloICGfmye6FCZxGJEv4+SCQgTCxJLPvfL7iHLgeNBfN26/kQH
-						7ydU3/TOkhiXjgkI+ZKX6VgLpEWkb+J9F/TWAjTxYQteqoMvgOxfbydM29ZIn/oE
-						727AhEzWwgrmc+rkmhKgSRCHzHif0J7r2eR+df3FYapS+6fknx/HYndQbaWr693q
-						SyNZqH9rxIjyCOZ8IYIFL5VWgP/pO6AuLu8EQrZQ1pW05vuEuxtrybeg1pzzrQID
-						AQABo3EwbzBOBgNVHREERzBFghZ0ZXN0LWJvZC1ndWkuZ2VhbnQubmV0hitodHRw
-						czovL3Rlc3QtYm9kLWd1aS5nZWFudC5uZXQvYXV0b2JhaG4tZ3VpMB0GA1UdDgQW
-						BBQE2RiLCknrDB2uim6zxukDDnVUFzANBgkqhkiG9w0BAQUFAAOCAQEAr2+uchPv
-						0EvCZ0TK19dhDOOTz0zRO1booiUajqPYOifUFaQWrAT5uEZPPO5wtwRARszL0BK7
-						M1oYWK3hxMjP8sAdlaP1nWk9eCK1LzEuquUiGB8V+1PQNi4pOBtobav0wYHfpWvs
-						fWLzAQzeuhVJ9tr7FoSEiIi+JEAriU966HD1LDYmwCJIB0wQrLtUUsBkaLEuq0sU
-						QrmdjxC4IVZG7dHqQgvtdBAMa/CXT0hJpL1NpCDNOlSea+fHGvN5Ztt7EOU1dtmv
-						4XvylEUggQ7GT7X7IMNh4wh29P6NkOeY/5kGJBqt5TjecDECqYLSBalEXhaMO4h4
-						zpPvtpSGaL5QrQ==
-					</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>
-						MIIDNjCCAh6gAwIBAgIJAPH4vrYKW5oVMA0GCSqGSIb3DQEBBQUAMCExHzAdBgNV
-						BAMTFnRlc3QtYm9kLWd1aS5nZWFudC5uZXQwHhcNMTQwNDExMTUxMDEyWhcNMTcw
-						NDExMTUxMDEyWjAhMR8wHQYDVQQDExZ0ZXN0LWJvZC1ndWkuZ2VhbnQubmV0MIIB
-						IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA9wlYXUI0eKL4E4MgQ4gPk8XW
-						Nvn1drh2cKjBkxsclJ809ZoXdToxSOynO0CKmptzL58sBhHC+dpj6TKkUBeIkPtj
-						3lNzkpFcZAPPzWeloICGfmye6FCZxGJEv4+SCQgTCxJLPvfL7iHLgeNBfN26/kQH
-						7ydU3/TOkhiXjgkI+ZKX6VgLpEWkb+J9F/TWAjTxYQteqoMvgOxfbydM29ZIn/oE
-						727AhEzWwgrmc+rkmhKgSRCHzHif0J7r2eR+df3FYapS+6fknx/HYndQbaWr693q
-						SyNZqH9rxIjyCOZ8IYIFL5VWgP/pO6AuLu8EQrZQ1pW05vuEuxtrybeg1pzzrQID
-						AQABo3EwbzBOBgNVHREERzBFghZ0ZXN0LWJvZC1ndWkuZ2VhbnQubmV0hitodHRw
-						czovL3Rlc3QtYm9kLWd1aS5nZWFudC5uZXQvYXV0b2JhaG4tZ3VpMB0GA1UdDgQW
-						BBQE2RiLCknrDB2uim6zxukDDnVUFzANBgkqhkiG9w0BAQUFAAOCAQEAr2+uchPv
-						0EvCZ0TK19dhDOOTz0zRO1booiUajqPYOifUFaQWrAT5uEZPPO5wtwRARszL0BK7
-						M1oYWK3hxMjP8sAdlaP1nWk9eCK1LzEuquUiGB8V+1PQNi4pOBtobav0wYHfpWvs
-						fWLzAQzeuhVJ9tr7FoSEiIi+JEAriU966HD1LDYmwCJIB0wQrLtUUsBkaLEuq0sU
-						QrmdjxC4IVZG7dHqQgvtdBAMa/CXT0hJpL1NpCDNOlSea+fHGvN5Ztt7EOU1dtmv
-						4XvylEUggQ7GT7X7IMNh4wh29P6NkOeY/5kGJBqt5TjecDECqYLSBalEXhaMO4h4
-						zpPvtpSGaL5QrQ==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://test-bod-gui.geant.net/autobahn-gui/saml/LogoutServiceHTTPRedirect" ResponseLocation="https://test-bod-gui.geant.net/autobahn-gui/saml/LogoutServiceHTTPRedirectResponse"/>
-    <NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</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" Location="https://test-bod-gui.geant.net/autobahn-gui/saml/SAMLAssertionConsumer" index="0" isDefault="true"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://test-bod-gui.geant.net/autobahn-gui/saml/SAMLAssertionConsumer" index="1"/>
-    <AttributeConsumingService index="1">
-      <ServiceName xml:lang="en">BoD Portal</ServiceName>
-      <ServiceDescription xml:lang="en">A Portal that can be used to access the BoD service for requesting circuit reservations, tracking their status and for administrative operation</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="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="false"/>
-      <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="false"/>
-    </AttributeConsumingService>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Delivery of Advanced Network Technology to Europe Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">DANTE</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.dante.net/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <Company>DANTE IT Support</Company>
-    <EmailAddress>mailto:DANTEITSupport@dante.net</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <Company>DANTE IT</Company>
-    <EmailAddress>mailto:it@dante.net</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/test-bod-gui.geant.net.xml b/swamid-interfederations-2.0/test-bod-gui.geant.net.xml
deleted file mode 100644
index e351d63e..00000000
--- a/swamid-interfederations-2.0/test-bod-gui.geant.net.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://test-bod-gui.geant.net/autobahn-gui">
-  <!--
-		This is a "BoD Portal" autobahn-gui SP for Delivery of Advanced Network Technology to Europe Limited.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-05-08T15:01:29Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </Extensions>
-  <SPSSODescriptor AuthnRequestsSigned="true" 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">BoD Portal</mdui:DisplayName>
-        <mdui:Description xml:lang="en">A Portal that can be used to access the BoD service for requesting circuit reservations, tracking their status and for administrative operation</mdui:Description>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDNjCCAh6gAwIBAgIJAPH4vrYKW5oVMA0GCSqGSIb3DQEBBQUAMCExHzAdBgNV
-						BAMTFnRlc3QtYm9kLWd1aS5nZWFudC5uZXQwHhcNMTQwNDExMTUxMDEyWhcNMTcw
-						NDExMTUxMDEyWjAhMR8wHQYDVQQDExZ0ZXN0LWJvZC1ndWkuZ2VhbnQubmV0MIIB
-						IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA9wlYXUI0eKL4E4MgQ4gPk8XW
-						Nvn1drh2cKjBkxsclJ809ZoXdToxSOynO0CKmptzL58sBhHC+dpj6TKkUBeIkPtj
-						3lNzkpFcZAPPzWeloICGfmye6FCZxGJEv4+SCQgTCxJLPvfL7iHLgeNBfN26/kQH
-						7ydU3/TOkhiXjgkI+ZKX6VgLpEWkb+J9F/TWAjTxYQteqoMvgOxfbydM29ZIn/oE
-						727AhEzWwgrmc+rkmhKgSRCHzHif0J7r2eR+df3FYapS+6fknx/HYndQbaWr693q
-						SyNZqH9rxIjyCOZ8IYIFL5VWgP/pO6AuLu8EQrZQ1pW05vuEuxtrybeg1pzzrQID
-						AQABo3EwbzBOBgNVHREERzBFghZ0ZXN0LWJvZC1ndWkuZ2VhbnQubmV0hitodHRw
-						czovL3Rlc3QtYm9kLWd1aS5nZWFudC5uZXQvYXV0b2JhaG4tZ3VpMB0GA1UdDgQW
-						BBQE2RiLCknrDB2uim6zxukDDnVUFzANBgkqhkiG9w0BAQUFAAOCAQEAr2+uchPv
-						0EvCZ0TK19dhDOOTz0zRO1booiUajqPYOifUFaQWrAT5uEZPPO5wtwRARszL0BK7
-						M1oYWK3hxMjP8sAdlaP1nWk9eCK1LzEuquUiGB8V+1PQNi4pOBtobav0wYHfpWvs
-						fWLzAQzeuhVJ9tr7FoSEiIi+JEAriU966HD1LDYmwCJIB0wQrLtUUsBkaLEuq0sU
-						QrmdjxC4IVZG7dHqQgvtdBAMa/CXT0hJpL1NpCDNOlSea+fHGvN5Ztt7EOU1dtmv
-						4XvylEUggQ7GT7X7IMNh4wh29P6NkOeY/5kGJBqt5TjecDECqYLSBalEXhaMO4h4
-						zpPvtpSGaL5QrQ==
-					</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>
-						MIIDNjCCAh6gAwIBAgIJAPH4vrYKW5oVMA0GCSqGSIb3DQEBBQUAMCExHzAdBgNV
-						BAMTFnRlc3QtYm9kLWd1aS5nZWFudC5uZXQwHhcNMTQwNDExMTUxMDEyWhcNMTcw
-						NDExMTUxMDEyWjAhMR8wHQYDVQQDExZ0ZXN0LWJvZC1ndWkuZ2VhbnQubmV0MIIB
-						IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA9wlYXUI0eKL4E4MgQ4gPk8XW
-						Nvn1drh2cKjBkxsclJ809ZoXdToxSOynO0CKmptzL58sBhHC+dpj6TKkUBeIkPtj
-						3lNzkpFcZAPPzWeloICGfmye6FCZxGJEv4+SCQgTCxJLPvfL7iHLgeNBfN26/kQH
-						7ydU3/TOkhiXjgkI+ZKX6VgLpEWkb+J9F/TWAjTxYQteqoMvgOxfbydM29ZIn/oE
-						727AhEzWwgrmc+rkmhKgSRCHzHif0J7r2eR+df3FYapS+6fknx/HYndQbaWr693q
-						SyNZqH9rxIjyCOZ8IYIFL5VWgP/pO6AuLu8EQrZQ1pW05vuEuxtrybeg1pzzrQID
-						AQABo3EwbzBOBgNVHREERzBFghZ0ZXN0LWJvZC1ndWkuZ2VhbnQubmV0hitodHRw
-						czovL3Rlc3QtYm9kLWd1aS5nZWFudC5uZXQvYXV0b2JhaG4tZ3VpMB0GA1UdDgQW
-						BBQE2RiLCknrDB2uim6zxukDDnVUFzANBgkqhkiG9w0BAQUFAAOCAQEAr2+uchPv
-						0EvCZ0TK19dhDOOTz0zRO1booiUajqPYOifUFaQWrAT5uEZPPO5wtwRARszL0BK7
-						M1oYWK3hxMjP8sAdlaP1nWk9eCK1LzEuquUiGB8V+1PQNi4pOBtobav0wYHfpWvs
-						fWLzAQzeuhVJ9tr7FoSEiIi+JEAriU966HD1LDYmwCJIB0wQrLtUUsBkaLEuq0sU
-						QrmdjxC4IVZG7dHqQgvtdBAMa/CXT0hJpL1NpCDNOlSea+fHGvN5Ztt7EOU1dtmv
-						4XvylEUggQ7GT7X7IMNh4wh29P6NkOeY/5kGJBqt5TjecDECqYLSBalEXhaMO4h4
-						zpPvtpSGaL5QrQ==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://test-bod-gui.geant.net/autobahn-gui/saml/LogoutServiceHTTPRedirect" ResponseLocation="https://test-bod-gui.geant.net/autobahn-gui/saml/LogoutServiceHTTPRedirectResponse"/>
-    <NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</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" Location="https://test-bod-gui.geant.net/autobahn-gui/saml/SAMLAssertionConsumer" index="0" isDefault="true"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://test-bod-gui.geant.net/autobahn-gui/saml/SAMLAssertionConsumer" index="1"/>
-    <AttributeConsumingService index="1">
-      <ServiceName xml:lang="en">BoD Portal</ServiceName>
-      <ServiceDescription xml:lang="en">A Portal that can be used to access the BoD service for requesting circuit reservations, tracking their status and for administrative operation</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="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="false"/>
-      <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="false"/>
-    </AttributeConsumingService>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Delivery of Advanced Network Technology to Europe Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">DANTE</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.dante.net/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <Company>DANTE IT Support</Company>
-    <EmailAddress>mailto:DANTEITSupport@dante.net</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <Company>DANTE IT</Company>
-    <EmailAddress>mailto:it@dante.net</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/test.federation.renater.fr-validation-ressource.xml b/swamid-interfederations-2.0/test.federation.renater.fr-validation-ressource.xml
deleted file mode 100644
index cc09b54f..00000000
--- a/swamid-interfederations-2.0/test.federation.renater.fr-validation-ressource.xml
+++ /dev/null
@@ -1,145 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://test.federation.renater.fr/validation/ressource">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2013-07-09T15:20:50Z">
-      <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 service</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">Fédération Éducation-Recherche - Ressource de validation</mdui:DisplayName>
-        <mdui:Description xml:lang="fr">Ressource de validation. Permettant la validation rapide d'un fonctionnement d'un IdP dans la fédération Éducation - Recherche. La ressource ne fait qu'afficher les attributs qui lui sont renvoyés par l'IdP.
-Il faut configurer manuellement les filtres d'attributs pour cette ressource.</mdui:Description>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDADCCAeigAwIBAgIJAJo2eFCDBL32MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE2ZlZHRvb2xzLnJlbmF0ZXIuZnIwHhcNMTMwNTEzMTQ0MDI5WhcNMjMwNTEx
-MTQ0MDI5WjAeMRwwGgYDVQQDExNmZWR0b29scy5yZW5hdGVyLmZyMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsLeEy6JlbrAPEwxBrnvwcx2fN5WtZ9Eq
-lZHBgQFocnfxEtHpf7KGSll+LNu3AgqF10Ymljoa1+Gn6E2SbsmKFmXzOs31aB5t
-eu79nAGci1abkuius628KO33o4Cjc3rJ/M7Rk7Px4t9kH7R01bXn3z3UGTvmPNyo
-mfa8LAX8epaD4haoar3ymF0hFHFB57d2HzWC/2HW/OT0Y5CO7T+dJd3TxI/soiK1
-pdw75LYAOdW6MT+ozrw3vY53B4um7jBZK2OhsrKIjrG2e4s0CzWFPs7jCUGnuvaY
-21nAd/kR666LjvmJcoVq/vErOSKksvMS9SxiuKpxjQNkj9lB9klqvQIDAQABo0Ew
-PzAeBgNVHREEFzAVghNmZWR0b29scy5yZW5hdGVyLmZyMB0GA1UdDgQWBBSglPv7
-4KwzHQSzBtZphKPBskiQ5TANBgkqhkiG9w0BAQUFAAOCAQEArYVUgbOsV3U+/Xb/
-NPPYIYdej09vWmdwOQjCjJc/DHiEkDPHQ4R/zbTEXPcW+t0CpYET2t/5MskmKNU7
-vgkZLdw9GrRbXuJarzZZ1ZSdMDNKvMjgujOJfcgQ6KnbSi/KLniU7hagAsvzQkYQ
-CXZqh5Jo6zGSJZIPTx3EpRuT82WFoFpcoccWeTSsda/A5nTQnq/1SpwBnfGz+xtE
-alqV781u8dMtyty6cbwPSg3sYisSoXQRdl+4b7U3vGXQvbHM6PNEAljhkeX0+1Tk
-aCoF678JhADPvQCtWTWZsbIFhV7bOsG+8UFqdH6z+yPMWUCPx6WbbTkkusi23Tbe
-PbS4vQ==
-
-					    </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>
-					      MIIDADCCAeigAwIBAgIJAJo2eFCDBL32MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE2ZlZHRvb2xzLnJlbmF0ZXIuZnIwHhcNMTMwNTEzMTQ0MDI5WhcNMjMwNTEx
-MTQ0MDI5WjAeMRwwGgYDVQQDExNmZWR0b29scy5yZW5hdGVyLmZyMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsLeEy6JlbrAPEwxBrnvwcx2fN5WtZ9Eq
-lZHBgQFocnfxEtHpf7KGSll+LNu3AgqF10Ymljoa1+Gn6E2SbsmKFmXzOs31aB5t
-eu79nAGci1abkuius628KO33o4Cjc3rJ/M7Rk7Px4t9kH7R01bXn3z3UGTvmPNyo
-mfa8LAX8epaD4haoar3ymF0hFHFB57d2HzWC/2HW/OT0Y5CO7T+dJd3TxI/soiK1
-pdw75LYAOdW6MT+ozrw3vY53B4um7jBZK2OhsrKIjrG2e4s0CzWFPs7jCUGnuvaY
-21nAd/kR666LjvmJcoVq/vErOSKksvMS9SxiuKpxjQNkj9lB9klqvQIDAQABo0Ew
-PzAeBgNVHREEFzAVghNmZWR0b29scy5yZW5hdGVyLmZyMB0GA1UdDgQWBBSglPv7
-4KwzHQSzBtZphKPBskiQ5TANBgkqhkiG9w0BAQUFAAOCAQEArYVUgbOsV3U+/Xb/
-NPPYIYdej09vWmdwOQjCjJc/DHiEkDPHQ4R/zbTEXPcW+t0CpYET2t/5MskmKNU7
-vgkZLdw9GrRbXuJarzZZ1ZSdMDNKvMjgujOJfcgQ6KnbSi/KLniU7hagAsvzQkYQ
-CXZqh5Jo6zGSJZIPTx3EpRuT82WFoFpcoccWeTSsda/A5nTQnq/1SpwBnfGz+xtE
-alqV781u8dMtyty6cbwPSg3sYisSoXQRdl+4b7U3vGXQvbHM6PNEAljhkeX0+1Tk
-aCoF678JhADPvQCtWTWZsbIFhV7bOsG+8UFqdH6z+yPMWUCPx6WbbTkkusi23Tbe
-PbS4vQ==
-
-					    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://test.federation.renater.fr/validation/ressource/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://test.federation.renater.fr/validation/ressource/Shibboleth.sso/SAML/POST" index="5"/>
-    <AttributeConsumingService index="0">
-      <ServiceName xml:lang="fr">Fédération Éducation-Recherche - Ressource de validation</ServiceName>
-      <ServiceName xml:lang="en">RENATER - validation service</ServiceName>
-      <ServiceDescription xml:lang="fr">Ressource de validation. Permettant la validation rapide d'un fonctionnement d'un IdP dans la fédération Éducation - Recherche. La ressource ne fait qu'afficher les attributs qui lui sont renvoyés par l'IdP.
-Il faut configurer manuellement les filtres d'attributs pour cette ressource.</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" isRequired="true"/>
-      <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" isRequired="true"/>
-      <RequestedAttribute FriendlyName="o" Name="urn:oid:2.5.4.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <RequestedAttribute FriendlyName="telephoneNumber" Name="urn:oid:2.5.4.20" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <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" isRequired="true"/>
-      <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" isRequired="true"/>
-      <RequestedAttribute FriendlyName="mobile" Name="urn:oid:0.9.2342.19200300.100.1.41" 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="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" isRequired="true"/>
-      <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" isRequired="true"/>
-      <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" 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="ou" Name="urn:oid:2.5.4.11" 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"/>
-      <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" isRequired="true"/>
-      <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" isRequired="true"/>
-      <RequestedAttribute FriendlyName="cn" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <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" 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="true"/>
-      <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" isRequired="true"/>
-      <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" isRequired="true"/>
-      <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" isRequired="true"/>
-      <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" isRequired="true"/>
-      <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" isRequired="true"/>
-      <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" isRequired="true"/>
-      <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" isRequired="true"/>
-      <RequestedAttribute FriendlyName="facsimileTelephoneNumber" Name="urn:oid:2.5.4.23" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <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="l" Name="urn:oid:2.5.4.7" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <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" isRequired="true"/>
-      <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" isRequired="true"/>
-      <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" isRequired="true"/>
-      <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" 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="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <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" isRequired="true"/>
-      <RequestedAttribute FriendlyName="title" Name="urn:oid:2.5.4.12" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <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" isRequired="true"/>
-      <RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <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" isRequired="true"/>
-      <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" isRequired="true"/>
-      <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" isRequired="true"/>
-      <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" isRequired="true"/>
-      <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" isRequired="true"/>
-      <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" isRequired="true"/>
-      <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" isRequired="true"/>
-      <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" isRequired="true"/>
-      <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" 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="userCertificate" Name="urn:oid:2.5.4.36" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <RequestedAttribute FriendlyName="postalAddress" Name="urn:oid:2.5.4.16" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <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="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" isRequired="true"/>
-      <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" isRequired="true"/>
-      <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" isRequired="true"/>
-      <RequestedAttribute FriendlyName="eduPersonEntitlement" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.7" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-    </AttributeConsumingService>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">RENATER</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">RENATER</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.renater.fr</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <EmailAddress>support@renater.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/test.federation.renater.fr.xml b/swamid-interfederations-2.0/test.federation.renater.fr.xml
deleted file mode 100644
index cc09b54f..00000000
--- a/swamid-interfederations-2.0/test.federation.renater.fr.xml
+++ /dev/null
@@ -1,145 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://test.federation.renater.fr/validation/ressource">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2013-07-09T15:20:50Z">
-      <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 service</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">Fédération Éducation-Recherche - Ressource de validation</mdui:DisplayName>
-        <mdui:Description xml:lang="fr">Ressource de validation. Permettant la validation rapide d'un fonctionnement d'un IdP dans la fédération Éducation - Recherche. La ressource ne fait qu'afficher les attributs qui lui sont renvoyés par l'IdP.
-Il faut configurer manuellement les filtres d'attributs pour cette ressource.</mdui:Description>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDADCCAeigAwIBAgIJAJo2eFCDBL32MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE2ZlZHRvb2xzLnJlbmF0ZXIuZnIwHhcNMTMwNTEzMTQ0MDI5WhcNMjMwNTEx
-MTQ0MDI5WjAeMRwwGgYDVQQDExNmZWR0b29scy5yZW5hdGVyLmZyMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsLeEy6JlbrAPEwxBrnvwcx2fN5WtZ9Eq
-lZHBgQFocnfxEtHpf7KGSll+LNu3AgqF10Ymljoa1+Gn6E2SbsmKFmXzOs31aB5t
-eu79nAGci1abkuius628KO33o4Cjc3rJ/M7Rk7Px4t9kH7R01bXn3z3UGTvmPNyo
-mfa8LAX8epaD4haoar3ymF0hFHFB57d2HzWC/2HW/OT0Y5CO7T+dJd3TxI/soiK1
-pdw75LYAOdW6MT+ozrw3vY53B4um7jBZK2OhsrKIjrG2e4s0CzWFPs7jCUGnuvaY
-21nAd/kR666LjvmJcoVq/vErOSKksvMS9SxiuKpxjQNkj9lB9klqvQIDAQABo0Ew
-PzAeBgNVHREEFzAVghNmZWR0b29scy5yZW5hdGVyLmZyMB0GA1UdDgQWBBSglPv7
-4KwzHQSzBtZphKPBskiQ5TANBgkqhkiG9w0BAQUFAAOCAQEArYVUgbOsV3U+/Xb/
-NPPYIYdej09vWmdwOQjCjJc/DHiEkDPHQ4R/zbTEXPcW+t0CpYET2t/5MskmKNU7
-vgkZLdw9GrRbXuJarzZZ1ZSdMDNKvMjgujOJfcgQ6KnbSi/KLniU7hagAsvzQkYQ
-CXZqh5Jo6zGSJZIPTx3EpRuT82WFoFpcoccWeTSsda/A5nTQnq/1SpwBnfGz+xtE
-alqV781u8dMtyty6cbwPSg3sYisSoXQRdl+4b7U3vGXQvbHM6PNEAljhkeX0+1Tk
-aCoF678JhADPvQCtWTWZsbIFhV7bOsG+8UFqdH6z+yPMWUCPx6WbbTkkusi23Tbe
-PbS4vQ==
-
-					    </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>
-					      MIIDADCCAeigAwIBAgIJAJo2eFCDBL32MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE2ZlZHRvb2xzLnJlbmF0ZXIuZnIwHhcNMTMwNTEzMTQ0MDI5WhcNMjMwNTEx
-MTQ0MDI5WjAeMRwwGgYDVQQDExNmZWR0b29scy5yZW5hdGVyLmZyMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsLeEy6JlbrAPEwxBrnvwcx2fN5WtZ9Eq
-lZHBgQFocnfxEtHpf7KGSll+LNu3AgqF10Ymljoa1+Gn6E2SbsmKFmXzOs31aB5t
-eu79nAGci1abkuius628KO33o4Cjc3rJ/M7Rk7Px4t9kH7R01bXn3z3UGTvmPNyo
-mfa8LAX8epaD4haoar3ymF0hFHFB57d2HzWC/2HW/OT0Y5CO7T+dJd3TxI/soiK1
-pdw75LYAOdW6MT+ozrw3vY53B4um7jBZK2OhsrKIjrG2e4s0CzWFPs7jCUGnuvaY
-21nAd/kR666LjvmJcoVq/vErOSKksvMS9SxiuKpxjQNkj9lB9klqvQIDAQABo0Ew
-PzAeBgNVHREEFzAVghNmZWR0b29scy5yZW5hdGVyLmZyMB0GA1UdDgQWBBSglPv7
-4KwzHQSzBtZphKPBskiQ5TANBgkqhkiG9w0BAQUFAAOCAQEArYVUgbOsV3U+/Xb/
-NPPYIYdej09vWmdwOQjCjJc/DHiEkDPHQ4R/zbTEXPcW+t0CpYET2t/5MskmKNU7
-vgkZLdw9GrRbXuJarzZZ1ZSdMDNKvMjgujOJfcgQ6KnbSi/KLniU7hagAsvzQkYQ
-CXZqh5Jo6zGSJZIPTx3EpRuT82WFoFpcoccWeTSsda/A5nTQnq/1SpwBnfGz+xtE
-alqV781u8dMtyty6cbwPSg3sYisSoXQRdl+4b7U3vGXQvbHM6PNEAljhkeX0+1Tk
-aCoF678JhADPvQCtWTWZsbIFhV7bOsG+8UFqdH6z+yPMWUCPx6WbbTkkusi23Tbe
-PbS4vQ==
-
-					    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://test.federation.renater.fr/validation/ressource/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://test.federation.renater.fr/validation/ressource/Shibboleth.sso/SAML/POST" index="5"/>
-    <AttributeConsumingService index="0">
-      <ServiceName xml:lang="fr">Fédération Éducation-Recherche - Ressource de validation</ServiceName>
-      <ServiceName xml:lang="en">RENATER - validation service</ServiceName>
-      <ServiceDescription xml:lang="fr">Ressource de validation. Permettant la validation rapide d'un fonctionnement d'un IdP dans la fédération Éducation - Recherche. La ressource ne fait qu'afficher les attributs qui lui sont renvoyés par l'IdP.
-Il faut configurer manuellement les filtres d'attributs pour cette ressource.</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" isRequired="true"/>
-      <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" isRequired="true"/>
-      <RequestedAttribute FriendlyName="o" Name="urn:oid:2.5.4.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <RequestedAttribute FriendlyName="telephoneNumber" Name="urn:oid:2.5.4.20" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <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" isRequired="true"/>
-      <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" isRequired="true"/>
-      <RequestedAttribute FriendlyName="mobile" Name="urn:oid:0.9.2342.19200300.100.1.41" 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="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" isRequired="true"/>
-      <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" isRequired="true"/>
-      <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" 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="ou" Name="urn:oid:2.5.4.11" 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"/>
-      <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" isRequired="true"/>
-      <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" isRequired="true"/>
-      <RequestedAttribute FriendlyName="cn" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <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" 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="true"/>
-      <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" isRequired="true"/>
-      <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" isRequired="true"/>
-      <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" isRequired="true"/>
-      <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" isRequired="true"/>
-      <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" isRequired="true"/>
-      <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" isRequired="true"/>
-      <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" isRequired="true"/>
-      <RequestedAttribute FriendlyName="facsimileTelephoneNumber" Name="urn:oid:2.5.4.23" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <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="l" Name="urn:oid:2.5.4.7" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <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" isRequired="true"/>
-      <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" isRequired="true"/>
-      <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" isRequired="true"/>
-      <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" 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="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <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" isRequired="true"/>
-      <RequestedAttribute FriendlyName="title" Name="urn:oid:2.5.4.12" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <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" isRequired="true"/>
-      <RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <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" isRequired="true"/>
-      <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" isRequired="true"/>
-      <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" isRequired="true"/>
-      <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" isRequired="true"/>
-      <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" isRequired="true"/>
-      <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" isRequired="true"/>
-      <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" isRequired="true"/>
-      <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" isRequired="true"/>
-      <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" 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="userCertificate" Name="urn:oid:2.5.4.36" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <RequestedAttribute FriendlyName="postalAddress" Name="urn:oid:2.5.4.16" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <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="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" isRequired="true"/>
-      <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" isRequired="true"/>
-      <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" isRequired="true"/>
-      <RequestedAttribute FriendlyName="eduPersonEntitlement" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.7" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-    </AttributeConsumingService>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">RENATER</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">RENATER</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.renater.fr</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <EmailAddress>support@renater.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/test.ukfederation.org.uk-entity.xml b/swamid-interfederations-2.0/test.ukfederation.org.uk-entity.xml
deleted file mode 100644
index f2627d6f..00000000
--- a/swamid-interfederations-2.0/test.ukfederation.org.uk-entity.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://test.ukfederation.org.uk/entity">
-  <!--
-		This is a UK federation Shibboleth 2 test SP.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-07-13T11:19:55Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <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">UK federation 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="216" width="500">https://test.ukfederation.org.uk/images/twigs_500x216.jpg</mdui:Logo>
-        <mdui:Logo height="104" width="240">https://test.ukfederation.org.uk/images/twigs_240x104.jpg</mdui:Logo>
-        <mdui:Logo height="43" width="100">https://test.ukfederation.org.uk/images/twigs_100x43.jpg</mdui:Logo>
-        <mdui:Logo height="75" width="75">https://test.ukfederation.org.uk/images/twigs_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://test.ukfederation.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://test.ukfederation.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://test.ukfederation.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://test.ukfederation.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://test.ukfederation.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://test.ukfederation.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://test.ukfederation.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://test.ukfederation.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://test.ukfederation.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://test.ukfederation.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://test.ukfederation.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://test.ukfederation.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://test.ukfederation.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://test.ukfederation.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://test.ukfederation.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://test.ukfederation.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://test.ukfederation.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://test.ukfederation.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://test.ukfederation.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://test.ukfederation.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://test.ukfederation.org.uk/Shibboleth.sso/EDS" index="7"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDADCCAeigAwIBAgIJALYNI4chorkFMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-						BAMTE3VrZi1zdmMuZWRpbmEuYWMudWswHhcNMTEwMTI4MTY1MjQ2WhcNMjEwMTI1
-						MTY1MjQ2WjAeMRwwGgYDVQQDExN1a2Ytc3ZjLmVkaW5hLmFjLnVrMIIBIjANBgkq
-						hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAv8qWcZAP79noTlNXCrHVJoUUgWlcaBQc
-						V94tQnjUo313VRnbzWgaghHfv8xFEXpWRjQhTOCuAugI3wKmKVjmJQmSYhNc6pgJ
-						lUSUwlefMu2kDBhU9fcY9YhqMgMcsMYNkHygU0gMIZm2HDkJGxTM/BU03VLCM/8o
-						oJqJBqArueI2Crt/6emG2dT9KkxBhYb+mKiI4N8vK/XS6bCQHoAZTsh2fMCcjP/z
-						mI4oGoitkoEEYh4tHf489XQXmCXil7parkOfYPiSbOscpTMnKw+e1E9otaoDakH1
-						Sgs81mRPAWBcWttIOSmS75a6mfooDeVNAE5S4iGuakKTw424ykb96QIDAQABo0Ew
-						PzAeBgNVHREEFzAVghN1a2Ytc3ZjLmVkaW5hLmFjLnVrMB0GA1UdDgQWBBT4yzTF
-						d+G9wC0XOImSgaDBtORrbzANBgkqhkiG9w0BAQUFAAOCAQEAFsLiJAnNO6EQiXwx
-						hdKhH40h4veNxKL4bq3azVkH/YP7Ej8uQ89Ta+aR6xC+TDuvt2Baj3bmN5Dxejen
-						r4I2/WP0eR6nH4r2vZ0cNKNDV2LBcjmxJhvcOM5151HzRDxNdw9nNHfR5kFreU2N
-						ee/3SL8B+EZrQCu9mKZSL1OwuQbm9I9tp7Aqp414UDG9ivZIorrkIA5cJplfOaR9
-						/gIB1Eu9tAgJgofTwi9bzNde2kjOY410MZFfya1T7juPUJYx5WEJ0oHkJLbilx/W
-						2UAEC+Ir/a8rk/IjmVn+uHAyFUJCizUMUiYXlaJSiV3ltexNYOMgj/llrYMKgIjS
-						0HjUig==
-					</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://test.ukfederation.org.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://test.ukfederation.org.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://test.ukfederation.org.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://test.ukfederation.org.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://test.ukfederation.org.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://test.ukfederation.org.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://test.ukfederation.org.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <AttributeConsumingService index="1">
-      <ServiceName xml:lang="en">UK federation 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">University of Edinburgh</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">UK federation SAML 1.1/2.0 Test SP</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://ukfederation.org.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>UK federation helpdesk</GivenName>
-    <EmailAddress>mailto:service@ukfederation.org.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>UK federation infrastructure</GivenName>
-    <EmailAddress>mailto:ukfed.infrastructure@ed.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/test.ukfederation.org.uk.xml b/swamid-interfederations-2.0/test.ukfederation.org.uk.xml
deleted file mode 100644
index f2627d6f..00000000
--- a/swamid-interfederations-2.0/test.ukfederation.org.uk.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://test.ukfederation.org.uk/entity">
-  <!--
-		This is a UK federation Shibboleth 2 test SP.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-07-13T11:19:55Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <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">UK federation 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="216" width="500">https://test.ukfederation.org.uk/images/twigs_500x216.jpg</mdui:Logo>
-        <mdui:Logo height="104" width="240">https://test.ukfederation.org.uk/images/twigs_240x104.jpg</mdui:Logo>
-        <mdui:Logo height="43" width="100">https://test.ukfederation.org.uk/images/twigs_100x43.jpg</mdui:Logo>
-        <mdui:Logo height="75" width="75">https://test.ukfederation.org.uk/images/twigs_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://test.ukfederation.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://test.ukfederation.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://test.ukfederation.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://test.ukfederation.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://test.ukfederation.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://test.ukfederation.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://test.ukfederation.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://test.ukfederation.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://test.ukfederation.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://test.ukfederation.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://test.ukfederation.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://test.ukfederation.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://test.ukfederation.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://test.ukfederation.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://test.ukfederation.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://test.ukfederation.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://test.ukfederation.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://test.ukfederation.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://test.ukfederation.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://test.ukfederation.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://test.ukfederation.org.uk/Shibboleth.sso/EDS" index="7"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDADCCAeigAwIBAgIJALYNI4chorkFMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-						BAMTE3VrZi1zdmMuZWRpbmEuYWMudWswHhcNMTEwMTI4MTY1MjQ2WhcNMjEwMTI1
-						MTY1MjQ2WjAeMRwwGgYDVQQDExN1a2Ytc3ZjLmVkaW5hLmFjLnVrMIIBIjANBgkq
-						hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAv8qWcZAP79noTlNXCrHVJoUUgWlcaBQc
-						V94tQnjUo313VRnbzWgaghHfv8xFEXpWRjQhTOCuAugI3wKmKVjmJQmSYhNc6pgJ
-						lUSUwlefMu2kDBhU9fcY9YhqMgMcsMYNkHygU0gMIZm2HDkJGxTM/BU03VLCM/8o
-						oJqJBqArueI2Crt/6emG2dT9KkxBhYb+mKiI4N8vK/XS6bCQHoAZTsh2fMCcjP/z
-						mI4oGoitkoEEYh4tHf489XQXmCXil7parkOfYPiSbOscpTMnKw+e1E9otaoDakH1
-						Sgs81mRPAWBcWttIOSmS75a6mfooDeVNAE5S4iGuakKTw424ykb96QIDAQABo0Ew
-						PzAeBgNVHREEFzAVghN1a2Ytc3ZjLmVkaW5hLmFjLnVrMB0GA1UdDgQWBBT4yzTF
-						d+G9wC0XOImSgaDBtORrbzANBgkqhkiG9w0BAQUFAAOCAQEAFsLiJAnNO6EQiXwx
-						hdKhH40h4veNxKL4bq3azVkH/YP7Ej8uQ89Ta+aR6xC+TDuvt2Baj3bmN5Dxejen
-						r4I2/WP0eR6nH4r2vZ0cNKNDV2LBcjmxJhvcOM5151HzRDxNdw9nNHfR5kFreU2N
-						ee/3SL8B+EZrQCu9mKZSL1OwuQbm9I9tp7Aqp414UDG9ivZIorrkIA5cJplfOaR9
-						/gIB1Eu9tAgJgofTwi9bzNde2kjOY410MZFfya1T7juPUJYx5WEJ0oHkJLbilx/W
-						2UAEC+Ir/a8rk/IjmVn+uHAyFUJCizUMUiYXlaJSiV3ltexNYOMgj/llrYMKgIjS
-						0HjUig==
-					</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://test.ukfederation.org.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://test.ukfederation.org.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://test.ukfederation.org.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://test.ukfederation.org.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://test.ukfederation.org.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://test.ukfederation.org.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://test.ukfederation.org.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <AttributeConsumingService index="1">
-      <ServiceName xml:lang="en">UK federation 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">University of Edinburgh</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">UK federation SAML 1.1/2.0 Test SP</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://ukfederation.org.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>UK federation helpdesk</GivenName>
-    <EmailAddress>mailto:service@ukfederation.org.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>UK federation infrastructure</GivenName>
-    <EmailAddress>mailto:ukfed.infrastructure@ed.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/testssso.uni-muenster.de-shibboleth-sp.xml b/swamid-interfederations-2.0/testssso.uni-muenster.de-shibboleth-sp.xml
deleted file mode 100644
index 4f6cfe48..00000000
--- a/swamid-interfederations-2.0/testssso.uni-muenster.de-shibboleth-sp.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://testssso.uni-muenster.de/shibboleth-sp">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2014-03-13T10:36:34Z">
-      <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>
-      <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://testssso.uni-muenster.de/-shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="de">Universität Münster (Staging)</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Universität Münster (Staging)</mdui:DisplayName>
-        <mdui:Description xml:lang="de">Dies ist ein weiterer, nur zeitweise aktiver Zugang zum Single Sign-On der Universität Münster (siehe dort).</mdui:Description>
-        <mdui:Description xml:lang="en">Dies ist ein weiterer, nur zeitweise aktiver Zugang zum Single Sign-On der Universität Münster (siehe dort).</mdui:Description>
-        <mdui:Logo height="32" width="32">https://www.uni-muenster.de/imperia/md/content/allgemein/farbunabhaengig/favicon.ico</mdui:Logo>
-        <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>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>testssso.uni-muenster.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>emailAddress=wwwadmin@uni-muenster.de,CN=testssso.uni-muenster.de,OU=Zentrum fuer Informationsverarbeitung,O=Universitaet Muenster,L=Muenster,ST=Nordrhein-Westfalen,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIGJzCCBQ+gAwIBAgIHGFeCs6pz9jANBgkqhkiG9w0BAQsFADCBjDELMAkGA1UE
-BhMCREUxHjAcBgNVBAoTFVVuaXZlcnNpdGFldCBNdWVuc3RlcjE6MDgGA1UEAxMx
-WmVydGlmaXppZXJ1bmdzc3RlbGxlIFVuaXZlcnNpdGFldCBNdWVuc3RlciAtIEcw
-MjEhMB8GCSqGSIb3DQEJARYSY2FAdW5pLW11ZW5zdGVyLmRlMB4XDTE0MTAxMDE2
-MTExNloXDTE5MDcwOTIzNTkwMFowgdoxCzAJBgNVBAYTAkRFMRwwGgYDVQQIExNO
-b3JkcmhlaW4tV2VzdGZhbGVuMREwDwYDVQQHEwhNdWVuc3RlcjEeMBwGA1UEChMV
-VW5pdmVyc2l0YWV0IE11ZW5zdGVyMS4wLAYDVQQLEyVaZW50cnVtIGZ1ZXIgSW5m
-b3JtYXRpb25zdmVyYXJiZWl0dW5nMSEwHwYDVQQDExh0ZXN0c3Nzby51bmktbXVl
-bnN0ZXIuZGUxJzAlBgkqhkiG9w0BCQEWGHd3d2FkbWluQHVuaS1tdWVuc3Rlci5k
-ZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKSQWHcHeqedu29lqBRD
-VOO/WjA7ELkwwGSPcqtVdJSrunce1HkYWY98X8IKnKOk8OXMjNnHLb1ka6azAvcz
-HX8HPda+X2JeyYGehjGNRCP2AI+6C5tRgCpaySeobrH4nI1bLuP0J1xjwzKzqD8Q
-hjEy8jyIs5S5Pqx9V+4+tHPG6HsHlbTDAhxkZ4CWnyFcpnQwJJiJiXCcwbrlCU5/
-jZ8xeJmPEqACtL41o/d8HfBF2f9zXIlknGR5Lh2pCOy5Pt1GnJACUaCp+VKTsM3Y
-Zn71OASRAmMCp2sR+P/dNs9Awx6CPWyZRacArwTUbobVUKGNtcAw0vPsj/25UDkl
-YD0CAwEAAaOCAjwwggI4ME8GA1UdIARIMEYwEQYPKwYBBAGBrSGCLAEBBAMCMBEG
-DysGAQQBga0hgiwCAQQDATAPBg0rBgEEAYGtIYIsAQEEMA0GCysGAQQBga0hgiwe
-MAkGA1UdEwQCMAAwCwYDVR0PBAQDAgXgMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggr
-BgEFBQcDATAdBgNVHQ4EFgQUEc/OhyNJfLbAplQ81eqmpb8Zy0gwHwYDVR0jBBgw
-FoAUvp5RosmSfLtgi+awaGR3WlIZoQAwIwYDVR0RBBwwGoIYdGVzdHNzc28udW5p
-LW11ZW5zdGVyLmRlMHsGA1UdHwR0MHIwN6A1oDOGMWh0dHA6Ly9jZHAxLnBjYS5k
-Zm4uZGUvd3d1LWNhL3B1Yi9jcmwvZ19jYWNybC5jcmwwN6A1oDOGMWh0dHA6Ly9j
-ZHAyLnBjYS5kZm4uZGUvd3d1LWNhL3B1Yi9jcmwvZ19jYWNybC5jcmwwgcsGCCsG
-AQUFBwEBBIG+MIG7MDMGCCsGAQUFBzABhidodHRwOi8vb2NzcC5wY2EuZGZuLmRl
-L09DU1AtU2VydmVyL09DU1AwQQYIKwYBBQUHMAKGNWh0dHA6Ly9jZHAxLnBjYS5k
-Zm4uZGUvd3d1LWNhL3B1Yi9jYWNlcnQvZ19jYWNlcnQuY3J0MEEGCCsGAQUFBzAC
-hjVodHRwOi8vY2RwMi5wY2EuZGZuLmRlL3d3dS1jYS9wdWIvY2FjZXJ0L2dfY2Fj
-ZXJ0LmNydDANBgkqhkiG9w0BAQsFAAOCAQEAZmamJrBlMURerBb8kNhic4WMrn9r
-O+tQOuWkYnRC7guOQxzI4xIyTwgToNimO+AZ2dCWqDnR+xOE2WPTvQ6MfG313kRO
-X7yOwhoZ0vbpzwBPr2+rVawbSYn/n4gZwoYFgewr5dEG4irT+ULcZMYuW+jEX2Da
-Uq1uiMlySocFWLW0F+yEfHu50NmuNm7sYCjhzB0aIksNQq8oSRdioN7Wk8AeNHUO
-bOH9nkcrbf9+K4i8zJGCCl0e+ekwdSqMjX3bS+JcnonHH76QPiFP7d/ndahgGknK
-FayundglgK5Mny/HWnaA/ugqZLUeGb6N7vcRs20Q3Bm+rrv2y7PBPWH4yw==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://testssso.uni-muenster.de/-shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://testssso.uni-muenster.de/-shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://testssso.uni-muenster.de/-shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://testssso.uni-muenster.de/-shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://testssso.uni-muenster.de/-shibboleth.sso/SAML2/POST" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://testssso.uni-muenster.de/-shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://testssso.uni-muenster.de/-shibboleth.sso/SAML2/Artifact" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://testssso.uni-muenster.de/-shibboleth.sso/SAML2/ECP" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://testssso.uni-muenster.de/-shibboleth.sso/SAML/POST" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://testssso.uni-muenster.de/-shibboleth.sso/SAML/Artifact" index="5"/>
-    <AttributeConsumingService index="1">
-      <ServiceName xml:lang="de">Universität Münster (Staging)</ServiceName>
-      <ServiceName xml:lang="en">Universität Münster (Staging)</ServiceName>
-      <ServiceDescription xml:lang="de">Dies ist ein weiterer, nur zeitweise aktiver Zugang zum Single Sign-On der Universität Münster (siehe dort).</ServiceDescription>
-      <ServiceDescription xml:lang="en">Dies ist ein weiterer, nur zeitweise aktiver Zugang zum Single Sign-On der Universität Münster (siehe dort).</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="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"/>
-    </AttributeConsumingService>
-  </SPSSODescriptor>
-  <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>Rainer</GivenName>
-    <SurName>Perske</SurName>
-    <EmailAddress>mailto:wwwadmin@uni-muenster.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="support">
-    <GivenName>Rainer</GivenName>
-    <SurName>Perske</SurName>
-    <EmailAddress>mailto:wwwadmin@uni-muenster.de</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/testssso.uni-muenster.de.xml b/swamid-interfederations-2.0/testssso.uni-muenster.de.xml
deleted file mode 100644
index 4f6cfe48..00000000
--- a/swamid-interfederations-2.0/testssso.uni-muenster.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://testssso.uni-muenster.de/shibboleth-sp">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2014-03-13T10:36:34Z">
-      <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>
-      <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://testssso.uni-muenster.de/-shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="de">Universität Münster (Staging)</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Universität Münster (Staging)</mdui:DisplayName>
-        <mdui:Description xml:lang="de">Dies ist ein weiterer, nur zeitweise aktiver Zugang zum Single Sign-On der Universität Münster (siehe dort).</mdui:Description>
-        <mdui:Description xml:lang="en">Dies ist ein weiterer, nur zeitweise aktiver Zugang zum Single Sign-On der Universität Münster (siehe dort).</mdui:Description>
-        <mdui:Logo height="32" width="32">https://www.uni-muenster.de/imperia/md/content/allgemein/farbunabhaengig/favicon.ico</mdui:Logo>
-        <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>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>testssso.uni-muenster.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>emailAddress=wwwadmin@uni-muenster.de,CN=testssso.uni-muenster.de,OU=Zentrum fuer Informationsverarbeitung,O=Universitaet Muenster,L=Muenster,ST=Nordrhein-Westfalen,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIGJzCCBQ+gAwIBAgIHGFeCs6pz9jANBgkqhkiG9w0BAQsFADCBjDELMAkGA1UE
-BhMCREUxHjAcBgNVBAoTFVVuaXZlcnNpdGFldCBNdWVuc3RlcjE6MDgGA1UEAxMx
-WmVydGlmaXppZXJ1bmdzc3RlbGxlIFVuaXZlcnNpdGFldCBNdWVuc3RlciAtIEcw
-MjEhMB8GCSqGSIb3DQEJARYSY2FAdW5pLW11ZW5zdGVyLmRlMB4XDTE0MTAxMDE2
-MTExNloXDTE5MDcwOTIzNTkwMFowgdoxCzAJBgNVBAYTAkRFMRwwGgYDVQQIExNO
-b3JkcmhlaW4tV2VzdGZhbGVuMREwDwYDVQQHEwhNdWVuc3RlcjEeMBwGA1UEChMV
-VW5pdmVyc2l0YWV0IE11ZW5zdGVyMS4wLAYDVQQLEyVaZW50cnVtIGZ1ZXIgSW5m
-b3JtYXRpb25zdmVyYXJiZWl0dW5nMSEwHwYDVQQDExh0ZXN0c3Nzby51bmktbXVl
-bnN0ZXIuZGUxJzAlBgkqhkiG9w0BCQEWGHd3d2FkbWluQHVuaS1tdWVuc3Rlci5k
-ZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKSQWHcHeqedu29lqBRD
-VOO/WjA7ELkwwGSPcqtVdJSrunce1HkYWY98X8IKnKOk8OXMjNnHLb1ka6azAvcz
-HX8HPda+X2JeyYGehjGNRCP2AI+6C5tRgCpaySeobrH4nI1bLuP0J1xjwzKzqD8Q
-hjEy8jyIs5S5Pqx9V+4+tHPG6HsHlbTDAhxkZ4CWnyFcpnQwJJiJiXCcwbrlCU5/
-jZ8xeJmPEqACtL41o/d8HfBF2f9zXIlknGR5Lh2pCOy5Pt1GnJACUaCp+VKTsM3Y
-Zn71OASRAmMCp2sR+P/dNs9Awx6CPWyZRacArwTUbobVUKGNtcAw0vPsj/25UDkl
-YD0CAwEAAaOCAjwwggI4ME8GA1UdIARIMEYwEQYPKwYBBAGBrSGCLAEBBAMCMBEG
-DysGAQQBga0hgiwCAQQDATAPBg0rBgEEAYGtIYIsAQEEMA0GCysGAQQBga0hgiwe
-MAkGA1UdEwQCMAAwCwYDVR0PBAQDAgXgMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggr
-BgEFBQcDATAdBgNVHQ4EFgQUEc/OhyNJfLbAplQ81eqmpb8Zy0gwHwYDVR0jBBgw
-FoAUvp5RosmSfLtgi+awaGR3WlIZoQAwIwYDVR0RBBwwGoIYdGVzdHNzc28udW5p
-LW11ZW5zdGVyLmRlMHsGA1UdHwR0MHIwN6A1oDOGMWh0dHA6Ly9jZHAxLnBjYS5k
-Zm4uZGUvd3d1LWNhL3B1Yi9jcmwvZ19jYWNybC5jcmwwN6A1oDOGMWh0dHA6Ly9j
-ZHAyLnBjYS5kZm4uZGUvd3d1LWNhL3B1Yi9jcmwvZ19jYWNybC5jcmwwgcsGCCsG
-AQUFBwEBBIG+MIG7MDMGCCsGAQUFBzABhidodHRwOi8vb2NzcC5wY2EuZGZuLmRl
-L09DU1AtU2VydmVyL09DU1AwQQYIKwYBBQUHMAKGNWh0dHA6Ly9jZHAxLnBjYS5k
-Zm4uZGUvd3d1LWNhL3B1Yi9jYWNlcnQvZ19jYWNlcnQuY3J0MEEGCCsGAQUFBzAC
-hjVodHRwOi8vY2RwMi5wY2EuZGZuLmRlL3d3dS1jYS9wdWIvY2FjZXJ0L2dfY2Fj
-ZXJ0LmNydDANBgkqhkiG9w0BAQsFAAOCAQEAZmamJrBlMURerBb8kNhic4WMrn9r
-O+tQOuWkYnRC7guOQxzI4xIyTwgToNimO+AZ2dCWqDnR+xOE2WPTvQ6MfG313kRO
-X7yOwhoZ0vbpzwBPr2+rVawbSYn/n4gZwoYFgewr5dEG4irT+ULcZMYuW+jEX2Da
-Uq1uiMlySocFWLW0F+yEfHu50NmuNm7sYCjhzB0aIksNQq8oSRdioN7Wk8AeNHUO
-bOH9nkcrbf9+K4i8zJGCCl0e+ekwdSqMjX3bS+JcnonHH76QPiFP7d/ndahgGknK
-FayundglgK5Mny/HWnaA/ugqZLUeGb6N7vcRs20Q3Bm+rrv2y7PBPWH4yw==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://testssso.uni-muenster.de/-shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://testssso.uni-muenster.de/-shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://testssso.uni-muenster.de/-shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://testssso.uni-muenster.de/-shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://testssso.uni-muenster.de/-shibboleth.sso/SAML2/POST" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://testssso.uni-muenster.de/-shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://testssso.uni-muenster.de/-shibboleth.sso/SAML2/Artifact" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://testssso.uni-muenster.de/-shibboleth.sso/SAML2/ECP" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://testssso.uni-muenster.de/-shibboleth.sso/SAML/POST" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://testssso.uni-muenster.de/-shibboleth.sso/SAML/Artifact" index="5"/>
-    <AttributeConsumingService index="1">
-      <ServiceName xml:lang="de">Universität Münster (Staging)</ServiceName>
-      <ServiceName xml:lang="en">Universität Münster (Staging)</ServiceName>
-      <ServiceDescription xml:lang="de">Dies ist ein weiterer, nur zeitweise aktiver Zugang zum Single Sign-On der Universität Münster (siehe dort).</ServiceDescription>
-      <ServiceDescription xml:lang="en">Dies ist ein weiterer, nur zeitweise aktiver Zugang zum Single Sign-On der Universität Münster (siehe dort).</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="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"/>
-    </AttributeConsumingService>
-  </SPSSODescriptor>
-  <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>Rainer</GivenName>
-    <SurName>Perske</SurName>
-    <EmailAddress>mailto:wwwadmin@uni-muenster.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="support">
-    <GivenName>Rainer</GivenName>
-    <SurName>Perske</SurName>
-    <EmailAddress>mailto:wwwadmin@uni-muenster.de</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/thalamoss-data.ics.muni.cz-shibboleth.xml b/swamid-interfederations-2.0/thalamoss-data.ics.muni.cz-shibboleth.xml
deleted file mode 100644
index 735eac86..00000000
--- a/swamid-interfederations-2.0/thalamoss-data.ics.muni.cz-shibboleth.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://thalamoss-data.ics.muni.cz/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/" registrationInstant="2014-01-07T17:17:02Z">
-      <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 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>
-      <eduidmd:RepublishRequest xmlns:eduidmd="http://eduid.cz/schema/metadata/1.0">
-        <eduidmd:RepublishTarget>http://edugain.org/</eduidmd:RepublishTarget>
-      </eduidmd:RepublishRequest>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">THALAMOSS Data Management Platform</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="cs">System pro spravu dat projektu THALAMOSS</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Management and distribution platform for THALAMOSS project on personalized therapy of b-thalassaemia</mdui:Description>
-        <mdui:Description xml:lang="cs">System pro spravu a distribuci dat projektu THALAMOSS pro personalizovanou lecbu b-thalassemie</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://thalamoss-data.ics.muni.cz/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="cs">http://thalamoss-data.ics.muni.cz/</mdui:InformationURL>
-      </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://thalamoss-data.ics.muni.cz/auth/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://thalamoss-data.ics.muni.cz/auth/shibboleth.sso/ds" index="1"/>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>thalamoss-data.ics.muni.cz</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=thalamoss-data.ics.muni.cz,OU=Domain Control Validated</ds:X509SubjectName>
-          <ds:X509Certificate>MIIEgTCCA2mgAwIBAgIQNd5X+bSLsMpg3WZ/IC3PmjANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTEzMTIxODAwMDAwMFoXDTE2MTIxNzIzNTk1OVowSDEhMB8GA1UE
-CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMSMwIQYDVQQDExp0aGFsYW1vc3Mt
-ZGF0YS5pY3MubXVuaS5jejCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
-AKUGwM1e1CiGbQVgLW460tAetS5QUTSANMKZEzThUgJYdI2mYJWp9NwF5bXelMo+
-lFObDPcG7wEc8+DpdpKGskBEE4SmcHbcKFE8/hmCYHPbf5AUrjPCei3XKDMbtIaC
-Htmut5AjE4gsG9GJa5vCFCjcsJgIdIat/PQp7++IOMc+qXx5WR22mUroYR15V89u
-jGe7CfjonOUmB4xxj5AVW73xcGEsAgYS1vmCGo3utSiawlgBKYENCTyb6e1AdbQ6
-MS1SBcN1gvFQH6ONoX2gXFG5NAEF1PCwevcUePVoJyUux5grmnBH6wE/7SOp8ygI
-7c6bUVZINmO9s5KY+Ohc7LUCAwEAAaOCAXcwggFzMB8GA1UdIwQYMBaAFAy9k2gM
-896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBT+kNRsn7KWuNVl5xuCU3uOlH3ElTAO
-BgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcD
-AQYIKwYBBQUHAwIwIgYDVR0gBBswGTANBgsrBgEEAbIxAQICHTAIBgZngQwBAgEw
-OgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJF
-TkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8v
-Y3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYa
-aHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwJQYDVR0RBB4wHIIadGhhbGFtb3Nz
-LWRhdGEuaWNzLm11bmkuY3owDQYJKoZIhvcNAQEFBQADggEBAGXev97kSHOHKFTd
-Pb2+xAETh0vA4q5UFVUF96i0yqpOlpmeWF7gV+7VCSI0WOVfWJQE8LeE17KRymb2
-h4G6AetotMBoKdzPxVmuSTIT2GA3q/cMeNWt9Kc1xaFZ73/vV9kJ5ioA/Vqpbk3B
-BOn8kS74xu0s1frpPS3rn23kRY/3LsQORCi0RUhNcio1LcGbkUQ1J7nlEYXt62rH
-6kAGlj0ycmn4GA0vnQbgw7iAYh72rPmH2vvLyXrEf6wKo9L1ywQ7ag9BvQaxCLoT
-gRtPrP5JXkY5jYK6rsPAUltcTEPXxRkxG7CX92WXKlX5/1MXRk3wZV5ZYyh+TGKe
-3EudFd0=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://thalamoss-data.ics.muni.cz/auth/shibboleth.sso/artifact/soap" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://thalamoss-data.ics.muni.cz/auth/shibboleth.sso/slo/soap"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://thalamoss-data.ics.muni.cz/auth/shibboleth.sso/slo/redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://thalamoss-data.ics.muni.cz/auth/shibboleth.sso/slo/post"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://thalamoss-data.ics.muni.cz/auth/shibboleth.sso/slo/artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://thalamoss-data.ics.muni.cz/auth/shibboleth.sso/nim/soap"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://thalamoss-data.ics.muni.cz/auth/shibboleth.sso/nim/redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://thalamoss-data.ics.muni.cz/auth/shibboleth.sso/nim/post"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://thalamoss-data.ics.muni.cz/auth/shibboleth.sso/nim/artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://thalamoss-data.ics.muni.cz/auth/shibboleth.sso/saml2/post" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://thalamoss-data.ics.muni.cz/auth/shibboleth.sso/saml2/post-simplesign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://thalamoss-data.ics.muni.cz/auth/shibboleth.sso/saml2/artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://thalamoss-data.ics.muni.cz/auth/shibboleth.sso/saml2/ecp" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://thalamoss-data.ics.muni.cz/auth/shibboleth.sso/saml/post" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://thalamoss-data.ics.muni.cz/auth/shibboleth.sso/saml/artifact" index="6"/>
-    <md:AttributeConsumingService index="1">
-      <md:ServiceName xml:lang="en">THALAMOSS Data Management Platform</md:ServiceName>
-      <md:ServiceDescription xml:lang="en">Management platform for THALAMOSS project on personalized therapy of b-thalassaemia</md:ServiceDescription>
-      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:mace:dir:attribute-def:eduPersonPrincipalName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:mace:dir:attribute-def:eduPersonScopedAffiliation" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri" isRequired="false"/>
-      <md:RequestedAttribute FriendlyName="eduPersonAffiliation" Name="urn:mace:dir:attribute-def:eduPersonAffiliation" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri" isRequired="false"/>
-      <md:RequestedAttribute FriendlyName="sn" Name="urn:mace:dir:attribute-def:sn" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="cn" Name="urn:mace:dir:attribute-def:cn" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="displayName" Name="urn:mace:dir:attribute-def:displayName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri" isRequired="false"/>
-      <md:RequestedAttribute FriendlyName="givenName" Name="urn:mace:dir:attribute-def:givenName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="o" Name="urn:mace:dir:attribute-def:o" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri" isRequired="false"/>
-      <md:RequestedAttribute FriendlyName="mail" Name="urn:mace:dir:attribute-def:mail" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri" isRequired="false"/>
-      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-      <md:RequestedAttribute FriendlyName="eduPersonAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-      <md:RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="cn" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-      <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="o" Name="urn:oid:2.5.4.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Institute of Computer Science, Masaryk University</md:OrganizationName>
-    <md:OrganizationName xml:lang="cs">Ustav vypocetni techniky, Masarykova univerzita</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Institute of Computer Science, Masaryk University</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="cs">Ustav vypocetni techniky, Masarykova univerzita</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.ics.muni.cz/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="cs">http://www.ics.muni.cz/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Petr</md:GivenName>
-    <md:SurName>Holub</md:SurName>
-    <md:EmailAddress>holub@ics.muni.cz</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Jan</md:GivenName>
-    <md:SurName>Sochor</md:SurName>
-    <md:EmailAddress>325304@mail.muni.cz</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/thalamoss-data.ics.muni.cz.xml b/swamid-interfederations-2.0/thalamoss-data.ics.muni.cz.xml
deleted file mode 100644
index 735eac86..00000000
--- a/swamid-interfederations-2.0/thalamoss-data.ics.muni.cz.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://thalamoss-data.ics.muni.cz/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/" registrationInstant="2014-01-07T17:17:02Z">
-      <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 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>
-      <eduidmd:RepublishRequest xmlns:eduidmd="http://eduid.cz/schema/metadata/1.0">
-        <eduidmd:RepublishTarget>http://edugain.org/</eduidmd:RepublishTarget>
-      </eduidmd:RepublishRequest>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">THALAMOSS Data Management Platform</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="cs">System pro spravu dat projektu THALAMOSS</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Management and distribution platform for THALAMOSS project on personalized therapy of b-thalassaemia</mdui:Description>
-        <mdui:Description xml:lang="cs">System pro spravu a distribuci dat projektu THALAMOSS pro personalizovanou lecbu b-thalassemie</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://thalamoss-data.ics.muni.cz/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="cs">http://thalamoss-data.ics.muni.cz/</mdui:InformationURL>
-      </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://thalamoss-data.ics.muni.cz/auth/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://thalamoss-data.ics.muni.cz/auth/shibboleth.sso/ds" index="1"/>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>thalamoss-data.ics.muni.cz</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=thalamoss-data.ics.muni.cz,OU=Domain Control Validated</ds:X509SubjectName>
-          <ds:X509Certificate>MIIEgTCCA2mgAwIBAgIQNd5X+bSLsMpg3WZ/IC3PmjANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTEzMTIxODAwMDAwMFoXDTE2MTIxNzIzNTk1OVowSDEhMB8GA1UE
-CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMSMwIQYDVQQDExp0aGFsYW1vc3Mt
-ZGF0YS5pY3MubXVuaS5jejCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
-AKUGwM1e1CiGbQVgLW460tAetS5QUTSANMKZEzThUgJYdI2mYJWp9NwF5bXelMo+
-lFObDPcG7wEc8+DpdpKGskBEE4SmcHbcKFE8/hmCYHPbf5AUrjPCei3XKDMbtIaC
-Htmut5AjE4gsG9GJa5vCFCjcsJgIdIat/PQp7++IOMc+qXx5WR22mUroYR15V89u
-jGe7CfjonOUmB4xxj5AVW73xcGEsAgYS1vmCGo3utSiawlgBKYENCTyb6e1AdbQ6
-MS1SBcN1gvFQH6ONoX2gXFG5NAEF1PCwevcUePVoJyUux5grmnBH6wE/7SOp8ygI
-7c6bUVZINmO9s5KY+Ohc7LUCAwEAAaOCAXcwggFzMB8GA1UdIwQYMBaAFAy9k2gM
-896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBT+kNRsn7KWuNVl5xuCU3uOlH3ElTAO
-BgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcD
-AQYIKwYBBQUHAwIwIgYDVR0gBBswGTANBgsrBgEEAbIxAQICHTAIBgZngQwBAgEw
-OgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJF
-TkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8v
-Y3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYa
-aHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwJQYDVR0RBB4wHIIadGhhbGFtb3Nz
-LWRhdGEuaWNzLm11bmkuY3owDQYJKoZIhvcNAQEFBQADggEBAGXev97kSHOHKFTd
-Pb2+xAETh0vA4q5UFVUF96i0yqpOlpmeWF7gV+7VCSI0WOVfWJQE8LeE17KRymb2
-h4G6AetotMBoKdzPxVmuSTIT2GA3q/cMeNWt9Kc1xaFZ73/vV9kJ5ioA/Vqpbk3B
-BOn8kS74xu0s1frpPS3rn23kRY/3LsQORCi0RUhNcio1LcGbkUQ1J7nlEYXt62rH
-6kAGlj0ycmn4GA0vnQbgw7iAYh72rPmH2vvLyXrEf6wKo9L1ywQ7ag9BvQaxCLoT
-gRtPrP5JXkY5jYK6rsPAUltcTEPXxRkxG7CX92WXKlX5/1MXRk3wZV5ZYyh+TGKe
-3EudFd0=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://thalamoss-data.ics.muni.cz/auth/shibboleth.sso/artifact/soap" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://thalamoss-data.ics.muni.cz/auth/shibboleth.sso/slo/soap"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://thalamoss-data.ics.muni.cz/auth/shibboleth.sso/slo/redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://thalamoss-data.ics.muni.cz/auth/shibboleth.sso/slo/post"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://thalamoss-data.ics.muni.cz/auth/shibboleth.sso/slo/artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://thalamoss-data.ics.muni.cz/auth/shibboleth.sso/nim/soap"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://thalamoss-data.ics.muni.cz/auth/shibboleth.sso/nim/redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://thalamoss-data.ics.muni.cz/auth/shibboleth.sso/nim/post"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://thalamoss-data.ics.muni.cz/auth/shibboleth.sso/nim/artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://thalamoss-data.ics.muni.cz/auth/shibboleth.sso/saml2/post" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://thalamoss-data.ics.muni.cz/auth/shibboleth.sso/saml2/post-simplesign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://thalamoss-data.ics.muni.cz/auth/shibboleth.sso/saml2/artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://thalamoss-data.ics.muni.cz/auth/shibboleth.sso/saml2/ecp" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://thalamoss-data.ics.muni.cz/auth/shibboleth.sso/saml/post" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://thalamoss-data.ics.muni.cz/auth/shibboleth.sso/saml/artifact" index="6"/>
-    <md:AttributeConsumingService index="1">
-      <md:ServiceName xml:lang="en">THALAMOSS Data Management Platform</md:ServiceName>
-      <md:ServiceDescription xml:lang="en">Management platform for THALAMOSS project on personalized therapy of b-thalassaemia</md:ServiceDescription>
-      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:mace:dir:attribute-def:eduPersonPrincipalName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:mace:dir:attribute-def:eduPersonScopedAffiliation" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri" isRequired="false"/>
-      <md:RequestedAttribute FriendlyName="eduPersonAffiliation" Name="urn:mace:dir:attribute-def:eduPersonAffiliation" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri" isRequired="false"/>
-      <md:RequestedAttribute FriendlyName="sn" Name="urn:mace:dir:attribute-def:sn" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="cn" Name="urn:mace:dir:attribute-def:cn" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="displayName" Name="urn:mace:dir:attribute-def:displayName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri" isRequired="false"/>
-      <md:RequestedAttribute FriendlyName="givenName" Name="urn:mace:dir:attribute-def:givenName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="o" Name="urn:mace:dir:attribute-def:o" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri" isRequired="false"/>
-      <md:RequestedAttribute FriendlyName="mail" Name="urn:mace:dir:attribute-def:mail" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri" isRequired="false"/>
-      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-      <md:RequestedAttribute FriendlyName="eduPersonAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-      <md:RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="cn" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-      <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="o" Name="urn:oid:2.5.4.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Institute of Computer Science, Masaryk University</md:OrganizationName>
-    <md:OrganizationName xml:lang="cs">Ustav vypocetni techniky, Masarykova univerzita</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Institute of Computer Science, Masaryk University</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="cs">Ustav vypocetni techniky, Masarykova univerzita</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.ics.muni.cz/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="cs">http://www.ics.muni.cz/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Petr</md:GivenName>
-    <md:SurName>Holub</md:SurName>
-    <md:EmailAddress>holub@ics.muni.cz</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Jan</md:GivenName>
-    <md:SurName>Sochor</md:SurName>
-    <md:EmailAddress>325304@mail.muni.cz</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/theia.unifei.edu.br.xml b/swamid-interfederations-2.0/theia.unifei.edu.br.xml
deleted file mode 100644
index 1a4aad9d..00000000
--- a/swamid-interfederations-2.0/theia.unifei.edu.br.xml
+++ /dev/null
@@ -1,100 +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://theia.unifei.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">unifei.edu.br</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">UNIFEI - Universidade Federal de Itajuba</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="pt-br">UNIFEI - Universidade Federal de Itajuba</mdui:DisplayName>
-        <mdui:Description xml:lang="en">UNIFEI - Universidade Federal de Itajuba</mdui:Description>
-        <mdui:Description xml:lang="pt-br">UNIFEI - Universidade Federal de Itajuba</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.unifei.edu.br/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="pt-br">http://www.unifei.edu.br/</mdui:InformationURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-    MIICyjCCAbICAQAwDQYJKoZIhvcNAQEFBQAwKzEMMAoGA1UECxMDRFNJMQswCQYD
-VQQGEwJCUjEOMAwGA1UEAxMFdGhlaWEwHhcNMTQwMTIxMTEzMjIxWhcNMTcwMTIw
-MTEzMjIxWjArMQwwCgYDVQQLEwNEU0kxCzAJBgNVBAYTAkJSMQ4wDAYDVQQDEwV0
-aGVpYTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALM0tuHkFgdeGbLy
-W3O/y9DiMfdU+/8fHiDAIIpYzP6kG+mLHI66UWRebDIEBMS875A1paBddEvLR3QC
-fOVrS3Ax8y+ssb+T5T9HRtLgNkC9TamhWM4smrItzDooUaM0N1cgyS4re5yo296/
-QRZUSsRBx9g81PMmtqvYpnZWR/aOo8i5N6mFnPPDprIRGqhQs0UK3tBj2Mi8Q4HP
-ZjALVXBtcuTBdiAcVBxtjHsS+RjVVUcbx/K/s9GV7LAv9+UhpoGVzT/N03AMqO4D
-nD4i37ja9xOedn3xQ48N4hiYkfYssObFBTA6jLIQ1GZ2ql6QJhwThhpP7MWvJXHZ
-SQwKwa0CAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAd193NYgaXZqOCkmcdv6rP+bl
-6nBIEaPH0gbYjKp0ugs+MoAfUrL2ajJgZo6SPEcvlxqbS3p+aEGqX5zPJ9Zdybdt
-UcNDS3mqv5JcCXJeJXhdaYCsPQF59UslfrC6NNdf4kDpdVJQGbOW45p9aB53h/SX
-9Bf2MD4TlAez2k3qzd23v6AniygO0BQLQVqjUM4B8tO17TDK5kKZP1UPZ6/RCQqS
-AcCLVaA6pjEC4v94Sy+XLgmp8d96SOFSIbv6cwzBp2j2emxdLThKqRJFOsF8y78E
-msxBNWg0y3K04JlGPOj9X4RPkVaUgwMK/Xw0sQGxhTCRc+lag0TxYUjMm9dbzg==
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://theia.unifei.edu.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://theia.unifei.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://theia.unifei.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://theia.unifei.edu.br/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://theia.unifei.edu.br/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://theia.unifei.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">unifei.edu.br</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-      
-MIICyjCCAbICAQAwDQYJKoZIhvcNAQEFBQAwKzEMMAoGA1UECxMDRFNJMQswCQYD
-VQQGEwJCUjEOMAwGA1UEAxMFdGhlaWEwHhcNMTQwMTIxMTEzMjIxWhcNMTcwMTIw
-MTEzMjIxWjArMQwwCgYDVQQLEwNEU0kxCzAJBgNVBAYTAkJSMQ4wDAYDVQQDEwV0
-aGVpYTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALM0tuHkFgdeGbLy
-W3O/y9DiMfdU+/8fHiDAIIpYzP6kG+mLHI66UWRebDIEBMS875A1paBddEvLR3QC
-fOVrS3Ax8y+ssb+T5T9HRtLgNkC9TamhWM4smrItzDooUaM0N1cgyS4re5yo296/
-QRZUSsRBx9g81PMmtqvYpnZWR/aOo8i5N6mFnPPDprIRGqhQs0UK3tBj2Mi8Q4HP
-ZjALVXBtcuTBdiAcVBxtjHsS+RjVVUcbx/K/s9GV7LAv9+UhpoGVzT/N03AMqO4D
-nD4i37ja9xOedn3xQ48N4hiYkfYssObFBTA6jLIQ1GZ2ql6QJhwThhpP7MWvJXHZ
-SQwKwa0CAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAd193NYgaXZqOCkmcdv6rP+bl
-6nBIEaPH0gbYjKp0ugs+MoAfUrL2ajJgZo6SPEcvlxqbS3p+aEGqX5zPJ9Zdybdt
-UcNDS3mqv5JcCXJeJXhdaYCsPQF59UslfrC6NNdf4kDpdVJQGbOW45p9aB53h/SX
-9Bf2MD4TlAez2k3qzd23v6AniygO0BQLQVqjUM4B8tO17TDK5kKZP1UPZ6/RCQqS
-AcCLVaA6pjEC4v94Sy+XLgmp8d96SOFSIbv6cwzBp2j2emxdLThKqRJFOsF8y78E
-msxBNWg0y3K04JlGPOj9X4RPkVaUgwMK/Xw0sQGxhTCRc+lag0TxYUjMm9dbzg==
-                    
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://theia.unifei.edu.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://theia.unifei.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">UNIFEI - Universidade Federal de Itajuba</OrganizationName>
-    <OrganizationName xml:lang="pt-br">UNIFEI - Universidade Federal de Itajuba</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">UNIFEI - Universidade Federal de Itajuba</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="pt-br">UNIFEI - Universidade Federal de Itajuba</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.unifei.edu.br/</OrganizationURL>
-    <OrganizationURL xml:lang="pt-br">http://www.unifei.edu.br/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Everaldo Campos</SurName>
-    <EmailAddress>everaldo@unifei.edu.br</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/ticket.iop.org-shibboleth.xml b/swamid-interfederations-2.0/ticket.iop.org-shibboleth.xml
deleted file mode 100644
index af807a78..00000000
--- a/swamid-interfederations-2.0/ticket.iop.org-shibboleth.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://ticket.iop.org/shibboleth">
-  <!--
-		This is a Shibboleth SP for IOP Publishing Limited.
-		(It has multiple Assertion Consumer Service locations.)
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-04-02T16:45:39Z">
-      <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">
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIF/jCCBOagAwIBAgIQM+YpmcylIPDSTgnHfWNmNTANBgkqhkiG9w0BAQUFADCB
-						tTELMAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQL
-						ExZWZXJpU2lnbiBUcnVzdCBOZXR3b3JrMTswOQYDVQQLEzJUZXJtcyBvZiB1c2Ug
-						YXQgaHR0cHM6Ly93d3cudmVyaXNpZ24uY29tL3JwYSAoYykxMDEvMC0GA1UEAxMm
-						VmVyaVNpZ24gQ2xhc3MgMyBTZWN1cmUgU2VydmVyIENBIC0gRzMwHhcNMTIwMzE5
-						MDAwMDAwWhcNMTgwMzE2MjM1OTU5WjCB6DELMAkGA1UEBhMCR0IxDTALBgNVBAgT
-						BEF2b24xEDAOBgNVBAcUB0JyaXN0b2wxGzAZBgNVBAoUEklPUCBQdWJsaXNoaW5n
-						IEx0ZDE1MDMGA1UECxQsVGVybXMgb2YgdXNlIGF0IHd3dy52ZXJpc2lnbi5jby51
-						ay9ycGEgKGMpMDUxIjAgBgNVBAsTGUF1dGhlbnRpY2F0ZWQgYnkgVmVyaVNpZ24x
-						JzAlBgNVBAsTHk1lbWJlciwgVmVyaVNpZ24gVHJ1c3QgTmV0d29yazEXMBUGA1UE
-						AxQOdGlja2V0LmlvcC5vcmcwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
-						AQC5WcglO3vKPNW09UA2GygrxCcozj67wA8Qd6d7Mu17EPrFzxRUP3h2jqk9wAPn
-						vaIMcNooYHK/CzUawroiINRtdArpRT0lW1aNeXuiZ+9H6SU2KQKfMSI5WoXvIdW9
-						xUUnQyyptaXNVyXINAlkm5y+HTsrbRATRkjJN94Qw4ssRaYfWhOP66rpviu1DfLA
-						Vhhhc/uSme+la90C+bVQ9EHnfF5adHAMsGIiJbqdQCK4Hq5nFlzpW535GRqleHcE
-						9x3HUppIJ32Q1ehYEvzwSIMBp8ACO7hgnSiYPbegpYPdeH+eV1vBmPuSLo/DxaON
-						KCvHtgDOt1QzxMuqiCBfp5QFAgMBAAGjggHTMIIBzzAJBgNVHRMEAjAAMAsGA1Ud
-						DwQEAwIFoDBFBgNVHR8EPjA8MDqgOKA2hjRodHRwOi8vU1ZSU2VjdXJlLUczLWNy
-						bC52ZXJpc2lnbi5jb20vU1ZSU2VjdXJlRzMuY3JsMEYGA1UdIAQ/MD0wOwYLYIZI
-						AYb4RQEHFwMwLDAqBggrBgEFBQcCARYeaHR0cHM6Ly93d3cudmVyaXNpZ24uY28u
-						dWsvcnBhMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAfBgNVHSMEGDAW
-						gBQNRFwWU0TBgn4dIKsl9AFj2L55pTB2BggrBgEFBQcBAQRqMGgwJAYIKwYBBQUH
-						MAGGGGh0dHA6Ly9vY3NwLnZlcmlzaWduLmNvbTBABggrBgEFBQcwAoY0aHR0cDov
-						L1NWUlNlY3VyZS1HMy1haWEudmVyaXNpZ24uY29tL1NWUlNlY3VyZUczLmNlcjBu
-						BggrBgEFBQcBDARiMGChXqBcMFowWDBWFglpbWFnZS9naWYwITAfMAcGBSsOAwIa
-						BBRLa7kolgYMu9BSOJsprEsHiyEFGDAmFiRodHRwOi8vbG9nby52ZXJpc2lnbi5j
-						b20vdnNsb2dvMS5naWYwDQYJKoZIhvcNAQEFBQADggEBAJo/xmh2qJqsFbNlxD2V
-						whco2sZBjNrNBk12LFGtcFJmeUXPPIcAFeKGlWx/37mKirZ1ryxRbgdEi6ShZo8n
-						HGtdJlw9Wj0otC4Idr7PGPH/BEThfx27NYz2OzKiMvfm5vFfvHUPiSKdFlxleIBr
-						beDsBgKfA6YbhWElH6QIqmL9T6Qg2iMvAHdrgN6afMvuJ4h9iT5ad0LfuRxE3Gvq
-						Y7B/QdOZHDQVZ0KquFe/qnRDrWFhlvdPXRxwgByi9XOmbNVuRnlxfnbUOw8Jgks1
-						H39D5zTQOKl+AEOTomKwTr53TFgDjSw8j9R/8Hi0f++axKR29JCknxBnJltVE+iU
-						m7g=
-					</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>
-						MIIF/jCCBOagAwIBAgIQM+YpmcylIPDSTgnHfWNmNTANBgkqhkiG9w0BAQUFADCB
-						tTELMAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQL
-						ExZWZXJpU2lnbiBUcnVzdCBOZXR3b3JrMTswOQYDVQQLEzJUZXJtcyBvZiB1c2Ug
-						YXQgaHR0cHM6Ly93d3cudmVyaXNpZ24uY29tL3JwYSAoYykxMDEvMC0GA1UEAxMm
-						VmVyaVNpZ24gQ2xhc3MgMyBTZWN1cmUgU2VydmVyIENBIC0gRzMwHhcNMTIwMzE5
-						MDAwMDAwWhcNMTgwMzE2MjM1OTU5WjCB6DELMAkGA1UEBhMCR0IxDTALBgNVBAgT
-						BEF2b24xEDAOBgNVBAcUB0JyaXN0b2wxGzAZBgNVBAoUEklPUCBQdWJsaXNoaW5n
-						IEx0ZDE1MDMGA1UECxQsVGVybXMgb2YgdXNlIGF0IHd3dy52ZXJpc2lnbi5jby51
-						ay9ycGEgKGMpMDUxIjAgBgNVBAsTGUF1dGhlbnRpY2F0ZWQgYnkgVmVyaVNpZ24x
-						JzAlBgNVBAsTHk1lbWJlciwgVmVyaVNpZ24gVHJ1c3QgTmV0d29yazEXMBUGA1UE
-						AxQOdGlja2V0LmlvcC5vcmcwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
-						AQC5WcglO3vKPNW09UA2GygrxCcozj67wA8Qd6d7Mu17EPrFzxRUP3h2jqk9wAPn
-						vaIMcNooYHK/CzUawroiINRtdArpRT0lW1aNeXuiZ+9H6SU2KQKfMSI5WoXvIdW9
-						xUUnQyyptaXNVyXINAlkm5y+HTsrbRATRkjJN94Qw4ssRaYfWhOP66rpviu1DfLA
-						Vhhhc/uSme+la90C+bVQ9EHnfF5adHAMsGIiJbqdQCK4Hq5nFlzpW535GRqleHcE
-						9x3HUppIJ32Q1ehYEvzwSIMBp8ACO7hgnSiYPbegpYPdeH+eV1vBmPuSLo/DxaON
-						KCvHtgDOt1QzxMuqiCBfp5QFAgMBAAGjggHTMIIBzzAJBgNVHRMEAjAAMAsGA1Ud
-						DwQEAwIFoDBFBgNVHR8EPjA8MDqgOKA2hjRodHRwOi8vU1ZSU2VjdXJlLUczLWNy
-						bC52ZXJpc2lnbi5jb20vU1ZSU2VjdXJlRzMuY3JsMEYGA1UdIAQ/MD0wOwYLYIZI
-						AYb4RQEHFwMwLDAqBggrBgEFBQcCARYeaHR0cHM6Ly93d3cudmVyaXNpZ24uY28u
-						dWsvcnBhMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAfBgNVHSMEGDAW
-						gBQNRFwWU0TBgn4dIKsl9AFj2L55pTB2BggrBgEFBQcBAQRqMGgwJAYIKwYBBQUH
-						MAGGGGh0dHA6Ly9vY3NwLnZlcmlzaWduLmNvbTBABggrBgEFBQcwAoY0aHR0cDov
-						L1NWUlNlY3VyZS1HMy1haWEudmVyaXNpZ24uY29tL1NWUlNlY3VyZUczLmNlcjBu
-						BggrBgEFBQcBDARiMGChXqBcMFowWDBWFglpbWFnZS9naWYwITAfMAcGBSsOAwIa
-						BBRLa7kolgYMu9BSOJsprEsHiyEFGDAmFiRodHRwOi8vbG9nby52ZXJpc2lnbi5j
-						b20vdnNsb2dvMS5naWYwDQYJKoZIhvcNAQEFBQADggEBAJo/xmh2qJqsFbNlxD2V
-						whco2sZBjNrNBk12LFGtcFJmeUXPPIcAFeKGlWx/37mKirZ1ryxRbgdEi6ShZo8n
-						HGtdJlw9Wj0otC4Idr7PGPH/BEThfx27NYz2OzKiMvfm5vFfvHUPiSKdFlxleIBr
-						beDsBgKfA6YbhWElH6QIqmL9T6Qg2iMvAHdrgN6afMvuJ4h9iT5ad0LfuRxE3Gvq
-						Y7B/QdOZHDQVZ0KquFe/qnRDrWFhlvdPXRxwgByi9XOmbNVuRnlxfnbUOw8Jgks1
-						H39D5zTQOKl+AEOTomKwTr53TFgDjSw8j9R/8Hi0f++axKR29JCknxBnJltVE+iU
-						m7g=
-					</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:artifact-01" Location="https://ticket.iop.org/Shibboleth.sso/SAML/Artifact" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ticket.iop.org/Shibboleth.sso/SAML/POST" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ticket.iop.org/Shibboleth.sso/SAML2/ECP" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ticket.iop.org/Shibboleth.sso/SAML2/POST" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ticket.iop.org/Shibboleth.sso/SAML2/Artifact" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ticket.iop.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="6"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://dev.ticket.iop.org/Shibboleth.sso/SAML/Artifact" index="7"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://dev.ticket.iop.org/Shibboleth.sso/SAML/POST" index="8"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://dev.ticket.iop.org/Shibboleth.sso/SAML2/ECP" index="9"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dev.ticket.iop.org/Shibboleth.sso/SAML2/POST" index="10"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dev.ticket.iop.org/Shibboleth.sso/SAML2/Artifact" index="11"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://dev.ticket.iop.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="12"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://pmh.ticket.iop.org/Shibboleth.sso/SAML/Artifact" index="13"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://pmh.ticket.iop.org/Shibboleth.sso/SAML/POST" index="14"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://pmh.ticket.iop.org/Shibboleth.sso/SAML2/ECP" index="15"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://pmh.ticket.iop.org/Shibboleth.sso/SAML2/POST" index="16"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://pmh.ticket.iop.org/Shibboleth.sso/SAML2/Artifact" index="17"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://pmh.ticket.iop.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="18"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://czh.ticket.iop.org/Shibboleth.sso/SAML/Artifact" index="19"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://czh.ticket.iop.org/Shibboleth.sso/SAML/POST" index="20"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://czh.ticket.iop.org/Shibboleth.sso/SAML2/ECP" index="21"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://czh.ticket.iop.org/Shibboleth.sso/SAML2/POST" index="22"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://czh.ticket.iop.org/Shibboleth.sso/SAML2/Artifact" index="23"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://czh.ticket.iop.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="24"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://test.ticket.iop.org/Shibboleth.sso/SAML/Artifact" index="25"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://test.ticket.iop.org/Shibboleth.sso/SAML/POST" index="26"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://test.ticket.iop.org/Shibboleth.sso/SAML2/ECP" index="27"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://test.ticket.iop.org/Shibboleth.sso/SAML2/POST" index="28"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://test.ticket.iop.org/Shibboleth.sso/SAML2/Artifact" index="29"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://test.ticket.iop.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="30"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://test2.ticket.iop.org/Shibboleth.sso/SAML/Artifact" index="31"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://test2.ticket.iop.org/Shibboleth.sso/SAML/POST" index="32"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://test2.ticket.iop.org/Shibboleth.sso/SAML2/ECP" index="33"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://test2.ticket.iop.org/Shibboleth.sso/SAML2/POST" index="34"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://test2.ticket.iop.org/Shibboleth.sso/SAML2/Artifact" index="35"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://test2.ticket.iop.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="36"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">IOP Publishing Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">IOP online services</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.iop.org/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Chris</GivenName>
-    <SurName>Hayes</SurName>
-    <EmailAddress>mailto:Chris.Hayes@iop.org</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Peter</GivenName>
-    <SurName>Haworth</SurName>
-    <EmailAddress>mailto:Peter.Haworth@iop.org</EmailAddress>
-  </ContactPerson>
-</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 af807a78..00000000
--- a/swamid-interfederations-2.0/ticket.iop.org.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://ticket.iop.org/shibboleth">
-  <!--
-		This is a Shibboleth SP for IOP Publishing Limited.
-		(It has multiple Assertion Consumer Service locations.)
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-04-02T16:45:39Z">
-      <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">
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIF/jCCBOagAwIBAgIQM+YpmcylIPDSTgnHfWNmNTANBgkqhkiG9w0BAQUFADCB
-						tTELMAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQL
-						ExZWZXJpU2lnbiBUcnVzdCBOZXR3b3JrMTswOQYDVQQLEzJUZXJtcyBvZiB1c2Ug
-						YXQgaHR0cHM6Ly93d3cudmVyaXNpZ24uY29tL3JwYSAoYykxMDEvMC0GA1UEAxMm
-						VmVyaVNpZ24gQ2xhc3MgMyBTZWN1cmUgU2VydmVyIENBIC0gRzMwHhcNMTIwMzE5
-						MDAwMDAwWhcNMTgwMzE2MjM1OTU5WjCB6DELMAkGA1UEBhMCR0IxDTALBgNVBAgT
-						BEF2b24xEDAOBgNVBAcUB0JyaXN0b2wxGzAZBgNVBAoUEklPUCBQdWJsaXNoaW5n
-						IEx0ZDE1MDMGA1UECxQsVGVybXMgb2YgdXNlIGF0IHd3dy52ZXJpc2lnbi5jby51
-						ay9ycGEgKGMpMDUxIjAgBgNVBAsTGUF1dGhlbnRpY2F0ZWQgYnkgVmVyaVNpZ24x
-						JzAlBgNVBAsTHk1lbWJlciwgVmVyaVNpZ24gVHJ1c3QgTmV0d29yazEXMBUGA1UE
-						AxQOdGlja2V0LmlvcC5vcmcwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
-						AQC5WcglO3vKPNW09UA2GygrxCcozj67wA8Qd6d7Mu17EPrFzxRUP3h2jqk9wAPn
-						vaIMcNooYHK/CzUawroiINRtdArpRT0lW1aNeXuiZ+9H6SU2KQKfMSI5WoXvIdW9
-						xUUnQyyptaXNVyXINAlkm5y+HTsrbRATRkjJN94Qw4ssRaYfWhOP66rpviu1DfLA
-						Vhhhc/uSme+la90C+bVQ9EHnfF5adHAMsGIiJbqdQCK4Hq5nFlzpW535GRqleHcE
-						9x3HUppIJ32Q1ehYEvzwSIMBp8ACO7hgnSiYPbegpYPdeH+eV1vBmPuSLo/DxaON
-						KCvHtgDOt1QzxMuqiCBfp5QFAgMBAAGjggHTMIIBzzAJBgNVHRMEAjAAMAsGA1Ud
-						DwQEAwIFoDBFBgNVHR8EPjA8MDqgOKA2hjRodHRwOi8vU1ZSU2VjdXJlLUczLWNy
-						bC52ZXJpc2lnbi5jb20vU1ZSU2VjdXJlRzMuY3JsMEYGA1UdIAQ/MD0wOwYLYIZI
-						AYb4RQEHFwMwLDAqBggrBgEFBQcCARYeaHR0cHM6Ly93d3cudmVyaXNpZ24uY28u
-						dWsvcnBhMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAfBgNVHSMEGDAW
-						gBQNRFwWU0TBgn4dIKsl9AFj2L55pTB2BggrBgEFBQcBAQRqMGgwJAYIKwYBBQUH
-						MAGGGGh0dHA6Ly9vY3NwLnZlcmlzaWduLmNvbTBABggrBgEFBQcwAoY0aHR0cDov
-						L1NWUlNlY3VyZS1HMy1haWEudmVyaXNpZ24uY29tL1NWUlNlY3VyZUczLmNlcjBu
-						BggrBgEFBQcBDARiMGChXqBcMFowWDBWFglpbWFnZS9naWYwITAfMAcGBSsOAwIa
-						BBRLa7kolgYMu9BSOJsprEsHiyEFGDAmFiRodHRwOi8vbG9nby52ZXJpc2lnbi5j
-						b20vdnNsb2dvMS5naWYwDQYJKoZIhvcNAQEFBQADggEBAJo/xmh2qJqsFbNlxD2V
-						whco2sZBjNrNBk12LFGtcFJmeUXPPIcAFeKGlWx/37mKirZ1ryxRbgdEi6ShZo8n
-						HGtdJlw9Wj0otC4Idr7PGPH/BEThfx27NYz2OzKiMvfm5vFfvHUPiSKdFlxleIBr
-						beDsBgKfA6YbhWElH6QIqmL9T6Qg2iMvAHdrgN6afMvuJ4h9iT5ad0LfuRxE3Gvq
-						Y7B/QdOZHDQVZ0KquFe/qnRDrWFhlvdPXRxwgByi9XOmbNVuRnlxfnbUOw8Jgks1
-						H39D5zTQOKl+AEOTomKwTr53TFgDjSw8j9R/8Hi0f++axKR29JCknxBnJltVE+iU
-						m7g=
-					</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>
-						MIIF/jCCBOagAwIBAgIQM+YpmcylIPDSTgnHfWNmNTANBgkqhkiG9w0BAQUFADCB
-						tTELMAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQL
-						ExZWZXJpU2lnbiBUcnVzdCBOZXR3b3JrMTswOQYDVQQLEzJUZXJtcyBvZiB1c2Ug
-						YXQgaHR0cHM6Ly93d3cudmVyaXNpZ24uY29tL3JwYSAoYykxMDEvMC0GA1UEAxMm
-						VmVyaVNpZ24gQ2xhc3MgMyBTZWN1cmUgU2VydmVyIENBIC0gRzMwHhcNMTIwMzE5
-						MDAwMDAwWhcNMTgwMzE2MjM1OTU5WjCB6DELMAkGA1UEBhMCR0IxDTALBgNVBAgT
-						BEF2b24xEDAOBgNVBAcUB0JyaXN0b2wxGzAZBgNVBAoUEklPUCBQdWJsaXNoaW5n
-						IEx0ZDE1MDMGA1UECxQsVGVybXMgb2YgdXNlIGF0IHd3dy52ZXJpc2lnbi5jby51
-						ay9ycGEgKGMpMDUxIjAgBgNVBAsTGUF1dGhlbnRpY2F0ZWQgYnkgVmVyaVNpZ24x
-						JzAlBgNVBAsTHk1lbWJlciwgVmVyaVNpZ24gVHJ1c3QgTmV0d29yazEXMBUGA1UE
-						AxQOdGlja2V0LmlvcC5vcmcwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
-						AQC5WcglO3vKPNW09UA2GygrxCcozj67wA8Qd6d7Mu17EPrFzxRUP3h2jqk9wAPn
-						vaIMcNooYHK/CzUawroiINRtdArpRT0lW1aNeXuiZ+9H6SU2KQKfMSI5WoXvIdW9
-						xUUnQyyptaXNVyXINAlkm5y+HTsrbRATRkjJN94Qw4ssRaYfWhOP66rpviu1DfLA
-						Vhhhc/uSme+la90C+bVQ9EHnfF5adHAMsGIiJbqdQCK4Hq5nFlzpW535GRqleHcE
-						9x3HUppIJ32Q1ehYEvzwSIMBp8ACO7hgnSiYPbegpYPdeH+eV1vBmPuSLo/DxaON
-						KCvHtgDOt1QzxMuqiCBfp5QFAgMBAAGjggHTMIIBzzAJBgNVHRMEAjAAMAsGA1Ud
-						DwQEAwIFoDBFBgNVHR8EPjA8MDqgOKA2hjRodHRwOi8vU1ZSU2VjdXJlLUczLWNy
-						bC52ZXJpc2lnbi5jb20vU1ZSU2VjdXJlRzMuY3JsMEYGA1UdIAQ/MD0wOwYLYIZI
-						AYb4RQEHFwMwLDAqBggrBgEFBQcCARYeaHR0cHM6Ly93d3cudmVyaXNpZ24uY28u
-						dWsvcnBhMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAfBgNVHSMEGDAW
-						gBQNRFwWU0TBgn4dIKsl9AFj2L55pTB2BggrBgEFBQcBAQRqMGgwJAYIKwYBBQUH
-						MAGGGGh0dHA6Ly9vY3NwLnZlcmlzaWduLmNvbTBABggrBgEFBQcwAoY0aHR0cDov
-						L1NWUlNlY3VyZS1HMy1haWEudmVyaXNpZ24uY29tL1NWUlNlY3VyZUczLmNlcjBu
-						BggrBgEFBQcBDARiMGChXqBcMFowWDBWFglpbWFnZS9naWYwITAfMAcGBSsOAwIa
-						BBRLa7kolgYMu9BSOJsprEsHiyEFGDAmFiRodHRwOi8vbG9nby52ZXJpc2lnbi5j
-						b20vdnNsb2dvMS5naWYwDQYJKoZIhvcNAQEFBQADggEBAJo/xmh2qJqsFbNlxD2V
-						whco2sZBjNrNBk12LFGtcFJmeUXPPIcAFeKGlWx/37mKirZ1ryxRbgdEi6ShZo8n
-						HGtdJlw9Wj0otC4Idr7PGPH/BEThfx27NYz2OzKiMvfm5vFfvHUPiSKdFlxleIBr
-						beDsBgKfA6YbhWElH6QIqmL9T6Qg2iMvAHdrgN6afMvuJ4h9iT5ad0LfuRxE3Gvq
-						Y7B/QdOZHDQVZ0KquFe/qnRDrWFhlvdPXRxwgByi9XOmbNVuRnlxfnbUOw8Jgks1
-						H39D5zTQOKl+AEOTomKwTr53TFgDjSw8j9R/8Hi0f++axKR29JCknxBnJltVE+iU
-						m7g=
-					</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:artifact-01" Location="https://ticket.iop.org/Shibboleth.sso/SAML/Artifact" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ticket.iop.org/Shibboleth.sso/SAML/POST" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ticket.iop.org/Shibboleth.sso/SAML2/ECP" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ticket.iop.org/Shibboleth.sso/SAML2/POST" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ticket.iop.org/Shibboleth.sso/SAML2/Artifact" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ticket.iop.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="6"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://dev.ticket.iop.org/Shibboleth.sso/SAML/Artifact" index="7"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://dev.ticket.iop.org/Shibboleth.sso/SAML/POST" index="8"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://dev.ticket.iop.org/Shibboleth.sso/SAML2/ECP" index="9"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dev.ticket.iop.org/Shibboleth.sso/SAML2/POST" index="10"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dev.ticket.iop.org/Shibboleth.sso/SAML2/Artifact" index="11"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://dev.ticket.iop.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="12"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://pmh.ticket.iop.org/Shibboleth.sso/SAML/Artifact" index="13"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://pmh.ticket.iop.org/Shibboleth.sso/SAML/POST" index="14"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://pmh.ticket.iop.org/Shibboleth.sso/SAML2/ECP" index="15"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://pmh.ticket.iop.org/Shibboleth.sso/SAML2/POST" index="16"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://pmh.ticket.iop.org/Shibboleth.sso/SAML2/Artifact" index="17"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://pmh.ticket.iop.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="18"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://czh.ticket.iop.org/Shibboleth.sso/SAML/Artifact" index="19"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://czh.ticket.iop.org/Shibboleth.sso/SAML/POST" index="20"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://czh.ticket.iop.org/Shibboleth.sso/SAML2/ECP" index="21"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://czh.ticket.iop.org/Shibboleth.sso/SAML2/POST" index="22"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://czh.ticket.iop.org/Shibboleth.sso/SAML2/Artifact" index="23"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://czh.ticket.iop.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="24"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://test.ticket.iop.org/Shibboleth.sso/SAML/Artifact" index="25"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://test.ticket.iop.org/Shibboleth.sso/SAML/POST" index="26"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://test.ticket.iop.org/Shibboleth.sso/SAML2/ECP" index="27"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://test.ticket.iop.org/Shibboleth.sso/SAML2/POST" index="28"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://test.ticket.iop.org/Shibboleth.sso/SAML2/Artifact" index="29"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://test.ticket.iop.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="30"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://test2.ticket.iop.org/Shibboleth.sso/SAML/Artifact" index="31"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://test2.ticket.iop.org/Shibboleth.sso/SAML/POST" index="32"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://test2.ticket.iop.org/Shibboleth.sso/SAML2/ECP" index="33"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://test2.ticket.iop.org/Shibboleth.sso/SAML2/POST" index="34"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://test2.ticket.iop.org/Shibboleth.sso/SAML2/Artifact" index="35"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://test2.ticket.iop.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="36"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">IOP Publishing Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">IOP online services</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.iop.org/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Chris</GivenName>
-    <SurName>Hayes</SurName>
-    <EmailAddress>mailto:Chris.Hayes@iop.org</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Peter</GivenName>
-    <SurName>Haworth</SurName>
-    <EmailAddress>mailto:Peter.Haworth@iop.org</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/tonga.univ-tlse2.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/tonga.univ-tlse2.fr-idp-shibboleth.xml
deleted file mode 100644
index de62fb7b..00000000
--- a/swamid-interfederations-2.0/tonga.univ-tlse2.fr-idp-shibboleth.xml
+++ /dev/null
@@ -1,163 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://tonga.univ-tlse2.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2011-05-16T16:09:53Z">
-      <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">etu.univ-tlse2.fr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-tlse2.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">Université Toulouse 2 - Mirail</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIEczCCA1ugAwIBAgIQbZHE6LrL3tqFs4H2fek89zANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTEzMDIyNTAwMDAwMFoXDTE2MDIyNTIzNTk1OVowQTEhMB8GA1UE
-CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRwwGgYDVQQDExN0b25nYS51bml2
-LXRsc2UyLmZyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA7uSHCtcm
-npL8YfTCrzbfh/cn2+8KrKbkwXmvc08AEmB/KjifNxaSpnwDCe51yj4efbX/A2KC
-F6UkV9aebsg0yf57+dWVtkAdJZNxtKkj3X/vxa/8DLrFLUNuMrA0K2C+UvT4iahM
-Z7Wn61vXYuyVcjH1akY/zjDOEAGcLCw4PsEfBOyamQ3rjddnJydD2c7swQgWmKA9
-uq8bZ94uHoiEIxGUHx3LwsHeS83mBqCPE1VHFeqGkT5KvUlyXyVNiD4YuIzYhLPo
-OUN5l5VL9DTYJfl1XGTdJ3OETIsgckzzPQuAT7BPqV/063tRKfxs8OVz2af6S85L
-xRbt6XYYPrRbjwIDAQABo4IBcDCCAWwwHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsr
-N1dH6pDjue0wHQYDVR0OBBYEFKgyHfbTQ+G2wcZU0Xm2N40iXCg4MA4GA1UdDwEB
-/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEF
-BQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNVHR8E
-MzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENB
-LmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNz
-LnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8v
-b2NzcC50Y3MudGVyZW5hLm9yZzAeBgNVHREEFzAVghN0b25nYS51bml2LXRsc2Uy
-LmZyMA0GCSqGSIb3DQEBBQUAA4IBAQBW18y/vhfzJr590f4NlYZFpKQdxuM3wrz0
-Lwyt8I0It1K5Axlb+0nCJcx1Wq9U5A7ZSJ/3R9LuhiYJYYeRGcgC12ecrO2JudXZ
-7+6WxjxuO+cfOMAx5Z2ymnLhRlSJlUhg4rSxEgWghxHtoXd/WFrgwv1Redy+fJSB
-yYOY5hOM9Nzxqq7dlvX91gr6aVTxS7Jke9Aje0Ti9jvas0RX5oJB3ItgVEqCIWRH
-4mlCAjYakzm6ucPqhPmbAupbA8CrMDl37ubPxFKnlDUqp02A1MwDJdUJ80A0f6Ce
-2CYly5GL5m70YorIGMbI46RWO/CgfsNzyphB/QHvtodxSrW/3YYs
-					    </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>
-					      MIIEFjCCAv6gAwIBAgIQU4s2cfoLMcS4CAQ5w7PbVzANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTEwMDIyMjAwMDAwMFoXDTEzMDIyMTIzNTk1OVowcjELMAkGA1UE
-BhMCRlIxETAPBgNVBAcTCFRPVUxPVVNFMTIwMAYDVQQKDCl1bml2ZXJzaXTDqSB0
-b3Vsb3VzZSAyIHRvdWxvdXNlIGxlIG1pcmFpbDEcMBoGA1UEAxMTdG9uZ2EudW5p
-di10bHNlMi5mcjCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAseh2pkmnQfS6
-1n8W6B4Zl0oW8VO2U85B1vrP497tOLfg+YZFDExx3o9bo3G1MOe8pPYXX8o4IJbY
-EZOt+1r90hcIZYHxKUChzbj8A5s3JuDzPW9FBeoccJpyH8kjDAA+jOX/MByoXD1y
-eyVyXQ8A2z0xHAjtGKsiKk1or/rqtKUCAwEAAaOCAWYwggFiMB8GA1UdIwQYMBaA
-FAy9k2gM896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBRXvFx/fYlHV5DfndKDygeO
-Anc/ITAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggr
-BgEFBQcDAQYIKwYBBQUHAwIwGAYDVR0gBBEwDzANBgsrBgEEAbIxAQICHTA6BgNV
-HR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNT
-TENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQu
-dGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRw
-Oi8vb2NzcC50Y3MudGVyZW5hLm9yZzAeBgNVHREEFzAVghN0b25nYS51bml2LXRs
-c2UyLmZyMA0GCSqGSIb3DQEBBQUAA4IBAQBXI9WubDIlttQfTXl0XzzBx5+nBxYa
-4Vk3IuemB4pj3xg0sJz+WcX5idfDC9TILD/j7WnceWpNVg5+4bX0LHr8nxXy5GXG
-y7ruA50fuwFlxL1m1f9Rl3lgSS+9OFX/pwO68j8bG2HaAmagHPMftOdES15tcE24
-xRjuQwA+Ci/KVDKRTgMwKPrSLR2unxAEhkQksJ5Qbxz0JZaeDWQuck52JGwY8AxD
-GwPwffWYrCia2bzxfKPUiZbuIIIMQI/JfP79/rDMk/bsiEaOoFyNMgbqG/xMCqJ8
-UiA93mbMlvGxjHprvnENF7KeRcs/1aCCDoPjE7iQ6Ne2AacxR45Vlcer
-					    </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://tonga.univ-tlse2.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://tonga.univ-tlse2.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://tonga.univ-tlse2.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">etu.univ-tlse2.fr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-tlse2.fr</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIEczCCA1ugAwIBAgIQbZHE6LrL3tqFs4H2fek89zANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTEzMDIyNTAwMDAwMFoXDTE2MDIyNTIzNTk1OVowQTEhMB8GA1UE
-CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRwwGgYDVQQDExN0b25nYS51bml2
-LXRsc2UyLmZyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA7uSHCtcm
-npL8YfTCrzbfh/cn2+8KrKbkwXmvc08AEmB/KjifNxaSpnwDCe51yj4efbX/A2KC
-F6UkV9aebsg0yf57+dWVtkAdJZNxtKkj3X/vxa/8DLrFLUNuMrA0K2C+UvT4iahM
-Z7Wn61vXYuyVcjH1akY/zjDOEAGcLCw4PsEfBOyamQ3rjddnJydD2c7swQgWmKA9
-uq8bZ94uHoiEIxGUHx3LwsHeS83mBqCPE1VHFeqGkT5KvUlyXyVNiD4YuIzYhLPo
-OUN5l5VL9DTYJfl1XGTdJ3OETIsgckzzPQuAT7BPqV/063tRKfxs8OVz2af6S85L
-xRbt6XYYPrRbjwIDAQABo4IBcDCCAWwwHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsr
-N1dH6pDjue0wHQYDVR0OBBYEFKgyHfbTQ+G2wcZU0Xm2N40iXCg4MA4GA1UdDwEB
-/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEF
-BQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNVHR8E
-MzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENB
-LmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNz
-LnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8v
-b2NzcC50Y3MudGVyZW5hLm9yZzAeBgNVHREEFzAVghN0b25nYS51bml2LXRsc2Uy
-LmZyMA0GCSqGSIb3DQEBBQUAA4IBAQBW18y/vhfzJr590f4NlYZFpKQdxuM3wrz0
-Lwyt8I0It1K5Axlb+0nCJcx1Wq9U5A7ZSJ/3R9LuhiYJYYeRGcgC12ecrO2JudXZ
-7+6WxjxuO+cfOMAx5Z2ymnLhRlSJlUhg4rSxEgWghxHtoXd/WFrgwv1Redy+fJSB
-yYOY5hOM9Nzxqq7dlvX91gr6aVTxS7Jke9Aje0Ti9jvas0RX5oJB3ItgVEqCIWRH
-4mlCAjYakzm6ucPqhPmbAupbA8CrMDl37ubPxFKnlDUqp02A1MwDJdUJ80A0f6Ce
-2CYly5GL5m70YorIGMbI46RWO/CgfsNzyphB/QHvtodxSrW/3YYs
-					    </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>
-					      MIIEFjCCAv6gAwIBAgIQU4s2cfoLMcS4CAQ5w7PbVzANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTEwMDIyMjAwMDAwMFoXDTEzMDIyMTIzNTk1OVowcjELMAkGA1UE
-BhMCRlIxETAPBgNVBAcTCFRPVUxPVVNFMTIwMAYDVQQKDCl1bml2ZXJzaXTDqSB0
-b3Vsb3VzZSAyIHRvdWxvdXNlIGxlIG1pcmFpbDEcMBoGA1UEAxMTdG9uZ2EudW5p
-di10bHNlMi5mcjCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAseh2pkmnQfS6
-1n8W6B4Zl0oW8VO2U85B1vrP497tOLfg+YZFDExx3o9bo3G1MOe8pPYXX8o4IJbY
-EZOt+1r90hcIZYHxKUChzbj8A5s3JuDzPW9FBeoccJpyH8kjDAA+jOX/MByoXD1y
-eyVyXQ8A2z0xHAjtGKsiKk1or/rqtKUCAwEAAaOCAWYwggFiMB8GA1UdIwQYMBaA
-FAy9k2gM896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBRXvFx/fYlHV5DfndKDygeO
-Anc/ITAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggr
-BgEFBQcDAQYIKwYBBQUHAwIwGAYDVR0gBBEwDzANBgsrBgEEAbIxAQICHTA6BgNV
-HR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNT
-TENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQu
-dGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRw
-Oi8vb2NzcC50Y3MudGVyZW5hLm9yZzAeBgNVHREEFzAVghN0b25nYS51bml2LXRs
-c2UyLmZyMA0GCSqGSIb3DQEBBQUAA4IBAQBXI9WubDIlttQfTXl0XzzBx5+nBxYa
-4Vk3IuemB4pj3xg0sJz+WcX5idfDC9TILD/j7WnceWpNVg5+4bX0LHr8nxXy5GXG
-y7ruA50fuwFlxL1m1f9Rl3lgSS+9OFX/pwO68j8bG2HaAmagHPMftOdES15tcE24
-xRjuQwA+Ci/KVDKRTgMwKPrSLR2unxAEhkQksJ5Qbxz0JZaeDWQuck52JGwY8AxD
-GwPwffWYrCia2bzxfKPUiZbuIIIMQI/JfP79/rDMk/bsiEaOoFyNMgbqG/xMCqJ8
-UiA93mbMlvGxjHprvnENF7KeRcs/1aCCDoPjE7iQ6Ne2AacxR45Vlcer
-					    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://tonga.univ-tlse2.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">Université Toulouse 2 - Mirail</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Université Toulouse 2 - Mirail</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <EmailAddress>sos-ent@univ-tlse2.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/tonga.univ-tlse2.fr.xml b/swamid-interfederations-2.0/tonga.univ-tlse2.fr.xml
deleted file mode 100644
index de62fb7b..00000000
--- a/swamid-interfederations-2.0/tonga.univ-tlse2.fr.xml
+++ /dev/null
@@ -1,163 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://tonga.univ-tlse2.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2011-05-16T16:09:53Z">
-      <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">etu.univ-tlse2.fr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-tlse2.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">Université Toulouse 2 - Mirail</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIEczCCA1ugAwIBAgIQbZHE6LrL3tqFs4H2fek89zANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTEzMDIyNTAwMDAwMFoXDTE2MDIyNTIzNTk1OVowQTEhMB8GA1UE
-CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRwwGgYDVQQDExN0b25nYS51bml2
-LXRsc2UyLmZyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA7uSHCtcm
-npL8YfTCrzbfh/cn2+8KrKbkwXmvc08AEmB/KjifNxaSpnwDCe51yj4efbX/A2KC
-F6UkV9aebsg0yf57+dWVtkAdJZNxtKkj3X/vxa/8DLrFLUNuMrA0K2C+UvT4iahM
-Z7Wn61vXYuyVcjH1akY/zjDOEAGcLCw4PsEfBOyamQ3rjddnJydD2c7swQgWmKA9
-uq8bZ94uHoiEIxGUHx3LwsHeS83mBqCPE1VHFeqGkT5KvUlyXyVNiD4YuIzYhLPo
-OUN5l5VL9DTYJfl1XGTdJ3OETIsgckzzPQuAT7BPqV/063tRKfxs8OVz2af6S85L
-xRbt6XYYPrRbjwIDAQABo4IBcDCCAWwwHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsr
-N1dH6pDjue0wHQYDVR0OBBYEFKgyHfbTQ+G2wcZU0Xm2N40iXCg4MA4GA1UdDwEB
-/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEF
-BQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNVHR8E
-MzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENB
-LmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNz
-LnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8v
-b2NzcC50Y3MudGVyZW5hLm9yZzAeBgNVHREEFzAVghN0b25nYS51bml2LXRsc2Uy
-LmZyMA0GCSqGSIb3DQEBBQUAA4IBAQBW18y/vhfzJr590f4NlYZFpKQdxuM3wrz0
-Lwyt8I0It1K5Axlb+0nCJcx1Wq9U5A7ZSJ/3R9LuhiYJYYeRGcgC12ecrO2JudXZ
-7+6WxjxuO+cfOMAx5Z2ymnLhRlSJlUhg4rSxEgWghxHtoXd/WFrgwv1Redy+fJSB
-yYOY5hOM9Nzxqq7dlvX91gr6aVTxS7Jke9Aje0Ti9jvas0RX5oJB3ItgVEqCIWRH
-4mlCAjYakzm6ucPqhPmbAupbA8CrMDl37ubPxFKnlDUqp02A1MwDJdUJ80A0f6Ce
-2CYly5GL5m70YorIGMbI46RWO/CgfsNzyphB/QHvtodxSrW/3YYs
-					    </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>
-					      MIIEFjCCAv6gAwIBAgIQU4s2cfoLMcS4CAQ5w7PbVzANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTEwMDIyMjAwMDAwMFoXDTEzMDIyMTIzNTk1OVowcjELMAkGA1UE
-BhMCRlIxETAPBgNVBAcTCFRPVUxPVVNFMTIwMAYDVQQKDCl1bml2ZXJzaXTDqSB0
-b3Vsb3VzZSAyIHRvdWxvdXNlIGxlIG1pcmFpbDEcMBoGA1UEAxMTdG9uZ2EudW5p
-di10bHNlMi5mcjCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAseh2pkmnQfS6
-1n8W6B4Zl0oW8VO2U85B1vrP497tOLfg+YZFDExx3o9bo3G1MOe8pPYXX8o4IJbY
-EZOt+1r90hcIZYHxKUChzbj8A5s3JuDzPW9FBeoccJpyH8kjDAA+jOX/MByoXD1y
-eyVyXQ8A2z0xHAjtGKsiKk1or/rqtKUCAwEAAaOCAWYwggFiMB8GA1UdIwQYMBaA
-FAy9k2gM896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBRXvFx/fYlHV5DfndKDygeO
-Anc/ITAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggr
-BgEFBQcDAQYIKwYBBQUHAwIwGAYDVR0gBBEwDzANBgsrBgEEAbIxAQICHTA6BgNV
-HR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNT
-TENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQu
-dGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRw
-Oi8vb2NzcC50Y3MudGVyZW5hLm9yZzAeBgNVHREEFzAVghN0b25nYS51bml2LXRs
-c2UyLmZyMA0GCSqGSIb3DQEBBQUAA4IBAQBXI9WubDIlttQfTXl0XzzBx5+nBxYa
-4Vk3IuemB4pj3xg0sJz+WcX5idfDC9TILD/j7WnceWpNVg5+4bX0LHr8nxXy5GXG
-y7ruA50fuwFlxL1m1f9Rl3lgSS+9OFX/pwO68j8bG2HaAmagHPMftOdES15tcE24
-xRjuQwA+Ci/KVDKRTgMwKPrSLR2unxAEhkQksJ5Qbxz0JZaeDWQuck52JGwY8AxD
-GwPwffWYrCia2bzxfKPUiZbuIIIMQI/JfP79/rDMk/bsiEaOoFyNMgbqG/xMCqJ8
-UiA93mbMlvGxjHprvnENF7KeRcs/1aCCDoPjE7iQ6Ne2AacxR45Vlcer
-					    </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://tonga.univ-tlse2.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://tonga.univ-tlse2.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://tonga.univ-tlse2.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">etu.univ-tlse2.fr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-tlse2.fr</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIEczCCA1ugAwIBAgIQbZHE6LrL3tqFs4H2fek89zANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTEzMDIyNTAwMDAwMFoXDTE2MDIyNTIzNTk1OVowQTEhMB8GA1UE
-CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRwwGgYDVQQDExN0b25nYS51bml2
-LXRsc2UyLmZyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA7uSHCtcm
-npL8YfTCrzbfh/cn2+8KrKbkwXmvc08AEmB/KjifNxaSpnwDCe51yj4efbX/A2KC
-F6UkV9aebsg0yf57+dWVtkAdJZNxtKkj3X/vxa/8DLrFLUNuMrA0K2C+UvT4iahM
-Z7Wn61vXYuyVcjH1akY/zjDOEAGcLCw4PsEfBOyamQ3rjddnJydD2c7swQgWmKA9
-uq8bZ94uHoiEIxGUHx3LwsHeS83mBqCPE1VHFeqGkT5KvUlyXyVNiD4YuIzYhLPo
-OUN5l5VL9DTYJfl1XGTdJ3OETIsgckzzPQuAT7BPqV/063tRKfxs8OVz2af6S85L
-xRbt6XYYPrRbjwIDAQABo4IBcDCCAWwwHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsr
-N1dH6pDjue0wHQYDVR0OBBYEFKgyHfbTQ+G2wcZU0Xm2N40iXCg4MA4GA1UdDwEB
-/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEF
-BQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNVHR8E
-MzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENB
-LmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNz
-LnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8v
-b2NzcC50Y3MudGVyZW5hLm9yZzAeBgNVHREEFzAVghN0b25nYS51bml2LXRsc2Uy
-LmZyMA0GCSqGSIb3DQEBBQUAA4IBAQBW18y/vhfzJr590f4NlYZFpKQdxuM3wrz0
-Lwyt8I0It1K5Axlb+0nCJcx1Wq9U5A7ZSJ/3R9LuhiYJYYeRGcgC12ecrO2JudXZ
-7+6WxjxuO+cfOMAx5Z2ymnLhRlSJlUhg4rSxEgWghxHtoXd/WFrgwv1Redy+fJSB
-yYOY5hOM9Nzxqq7dlvX91gr6aVTxS7Jke9Aje0Ti9jvas0RX5oJB3ItgVEqCIWRH
-4mlCAjYakzm6ucPqhPmbAupbA8CrMDl37ubPxFKnlDUqp02A1MwDJdUJ80A0f6Ce
-2CYly5GL5m70YorIGMbI46RWO/CgfsNzyphB/QHvtodxSrW/3YYs
-					    </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>
-					      MIIEFjCCAv6gAwIBAgIQU4s2cfoLMcS4CAQ5w7PbVzANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTEwMDIyMjAwMDAwMFoXDTEzMDIyMTIzNTk1OVowcjELMAkGA1UE
-BhMCRlIxETAPBgNVBAcTCFRPVUxPVVNFMTIwMAYDVQQKDCl1bml2ZXJzaXTDqSB0
-b3Vsb3VzZSAyIHRvdWxvdXNlIGxlIG1pcmFpbDEcMBoGA1UEAxMTdG9uZ2EudW5p
-di10bHNlMi5mcjCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAseh2pkmnQfS6
-1n8W6B4Zl0oW8VO2U85B1vrP497tOLfg+YZFDExx3o9bo3G1MOe8pPYXX8o4IJbY
-EZOt+1r90hcIZYHxKUChzbj8A5s3JuDzPW9FBeoccJpyH8kjDAA+jOX/MByoXD1y
-eyVyXQ8A2z0xHAjtGKsiKk1or/rqtKUCAwEAAaOCAWYwggFiMB8GA1UdIwQYMBaA
-FAy9k2gM896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBRXvFx/fYlHV5DfndKDygeO
-Anc/ITAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggr
-BgEFBQcDAQYIKwYBBQUHAwIwGAYDVR0gBBEwDzANBgsrBgEEAbIxAQICHTA6BgNV
-HR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNT
-TENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQu
-dGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRw
-Oi8vb2NzcC50Y3MudGVyZW5hLm9yZzAeBgNVHREEFzAVghN0b25nYS51bml2LXRs
-c2UyLmZyMA0GCSqGSIb3DQEBBQUAA4IBAQBXI9WubDIlttQfTXl0XzzBx5+nBxYa
-4Vk3IuemB4pj3xg0sJz+WcX5idfDC9TILD/j7WnceWpNVg5+4bX0LHr8nxXy5GXG
-y7ruA50fuwFlxL1m1f9Rl3lgSS+9OFX/pwO68j8bG2HaAmagHPMftOdES15tcE24
-xRjuQwA+Ci/KVDKRTgMwKPrSLR2unxAEhkQksJ5Qbxz0JZaeDWQuck52JGwY8AxD
-GwPwffWYrCia2bzxfKPUiZbuIIIMQI/JfP79/rDMk/bsiEaOoFyNMgbqG/xMCqJ8
-UiA93mbMlvGxjHprvnENF7KeRcs/1aCCDoPjE7iQ6Ne2AacxR45Vlcer
-					    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://tonga.univ-tlse2.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">Université Toulouse 2 - Mirail</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Université Toulouse 2 - Mirail</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <EmailAddress>sos-ent@univ-tlse2.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/tullbommen.arcada.fi.xml b/swamid-interfederations-2.0/tullbommen.arcada.fi.xml
deleted file mode 100644
index 7e98ca78..00000000
--- a/swamid-interfederations-2.0/tullbommen.arcada.fi.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns: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://tullbommen.arcada.fi/simplesaml/">
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope regexp="false">arcada.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>MIIEdjCCA16gAwIBAgIRANjPKkKEQJwfMHea3kHeKBAwDQYJKoZIhvcNAQEFBQAw
-NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-IFNTTCBDQTAeFw0xMzEwMzAwMDAwMDBaFw0xNjExMDkyMzU5NTlaMEIxITAfBgNV
-BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEdMBsGA1UEAxMUdHVsbGJvbW1l
-bi5hcmNhZGEuZmkwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDUB/mi
-pk7Yn/0yQa9rpQ3AMGmR09/45kBJxos6nS9dCbPZ+efy0dNnvcF/hXCbvbnYXHiA
-ZJg1TjBFOJO6jePNplzs8oDWIk5BV/YaWrnKzZnua66m4dfeFIqLXnTrlnR3bBrN
-9GOdSDHdMEuTIntm+2OVnpJUnVLTBsFjqGcnWISsk7DxSWvJJI5cirawQ+RK3yeX
-QSjg/VXpWQYVTahLe938VaZ7LU2cLeNJ0O2ipv5LEXM5mLX7KSbI+/aSOdXi+0Wd
-D7ThYzrjG1cWwIW8YwU1INIZu1wOvzc+r4LyIix4wFaKIoROHiGr/dMbxgz9oOaC
-kaLl2ZdK4OH2h1n/AgMBAAGjggFxMIIBbTAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJ
-ays3V0fqkOO57TAdBgNVHQ4EFgQUYw143pn/Vha8iT1GD6cNUD36ZxYwDgYDVR0P
-AQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsG
-AQUFBwMCMCIGA1UdIAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQIBMDoGA1Ud
-HwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NM
-Q0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50
-Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6
-Ly9vY3NwLnRjcy50ZXJlbmEub3JnMB8GA1UdEQQYMBaCFHR1bGxib21tZW4uYXJj
-YWRhLmZpMA0GCSqGSIb3DQEBBQUAA4IBAQBRld8PJrEUESgRtOrIVYJ9cyPENSki
-Dg5PFCvckLcfo6t0Or6Bfq5T5575x695zuKw6pD7xToO3oadzqgohveIWpN+qyEz
-0uuQahsRq9cRVQfd9SGensZWfem3ujQZXk3sGwd350G7CiCcNJcNtbsb1wUdFPjW
-h0xhzFZPrHiD0hjAfx8nDMIlIdN2wQtok0+XHN2mll05DGLG2CtniIAnHEOVWEyH
-/bbmOj3zhw+kGJza5x7tldQLVsPntuBsvm74rKW+nAGVfyqhgWlB5kcTuVCe33sw
-d0vPK8knVsYNfPg0Ms8UNdm1LuFpkjxWiwJ4y9IFW7zf86tmV+ryxuBy</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://tullbommen.arcada.fi/simplesaml/saml2/idp/SSOService.php"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://tullbommen.arcada.fi/simplesaml/saml2/idp/SSOService.php"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="fi">Arcada</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">Arcada</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">Arcada</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="fi">Arcada</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Arcada</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="sv">Arcada</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="fi">http://www.arcada.fi/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.arcada.fi/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sv">http://www.arcada.fi/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Fredrik</md:GivenName>
-    <md:SurName>Finnberg</md:SurName>
-    <md:EmailAddress>mailto:haka.admin@arcada.fi</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>David</md:GivenName>
-    <md:SurName>Sjoberg</md:SurName>
-    <md:EmailAddress>mailto:haka@arcada.fi</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Harald</md:GivenName>
-    <md:SurName>Hannelius</md:SurName>
-    <md:EmailAddress>mailto:haka.technical@arcada.fi</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/tumidp.lrz.de-idp-shibboleth.xml b/swamid-interfederations-2.0/tumidp.lrz.de-idp-shibboleth.xml
deleted file mode 100644
index 643e7a04..00000000
--- a/swamid-interfederations-2.0/tumidp.lrz.de-idp-shibboleth.xml
+++ /dev/null
@@ -1,231 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://tumidp.lrz.de/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2009-05-26T08:35:04Z">
-      <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">tum.de</saml1md:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="de">TU München (TUM)</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Munich University of Technology (TUM)</mdui:DisplayName>
-        <mdui:Description xml:lang="de">Identity Provider der Technischen Universität München</mdui:Description>
-        <mdui:Description xml:lang="en">Identity Provider for TUM</mdui:Description>
-        <mdui:InformationURL xml:lang="de">http://www.tum.de</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">http://www.tum.de</mdui:InformationURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>tumidp.lrz.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=tumidp.lrz.de,OU=Leibniz-Rechenzentrum,O=Bayerische Akademie der Wissenschaften,L=Garching b. Muenchen,ST=Bayern,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIGKTCCBRGgAwIBAgIHGEI+5Dgs1DANBgkqhkiG9w0BAQsFADCBnTELMAkGA1UE
-BhMCREUxDzANBgNVBAgTBkJheWVybjERMA8GA1UEBxMITXVlbmNoZW4xHjAcBgNV
-BAoTFUxlaWJuaXotUmVjaGVuemVudHJ1bTEPMA0GA1UECxMGTFJaLUNBMRUwEwYD
-VQQDEwxMUlotQ0EgLSBHMDExIjAgBgkqhkiG9w0BCQEWE3BraUBscnotbXVlbmNo
-ZW4uZGUwHhcNMTQwOTI0MTMwNDIxWhcNMTkwNzA5MjM1OTAwWjCBpjELMAkGA1UE
-BhMCREUxDzANBgNVBAgTBkJheWVybjEdMBsGA1UEBxMUR2FyY2hpbmcgYi4gTXVl
-bmNoZW4xLzAtBgNVBAoTJkJheWVyaXNjaGUgQWthZGVtaWUgZGVyIFdpc3NlbnNj
-aGFmdGVuMR4wHAYDVQQLExVMZWlibml6LVJlY2hlbnplbnRydW0xFjAUBgNVBAMT
-DXR1bWlkcC5scnouZGUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDj
-WPvROHchdCtMHI4Fxr9nNlnLzASonlX8SmuhZ6080jWEYQ+U9/AVyQge6p5kmASc
-NO+4VURn5WpGdT8q1RZeMxHMq0fIb8q8EU8qgC+bvOMgMEEx9tWB5tuOG5+gOPWI
-5NMTvtxRth8EV44DllZunA919Ei7JxvpJ2188y24u4zjs+henD4qir3h0oCiLVwI
-LCme6C0xXYH4aEX65YTfWL2bJqWCyLgWbMeZjxKDHqwDMFJfKZQazEK8la5n2Hzu
-h2bCCT61p1inNjHdxgWXkDYq3YfskDSksOOaY4+DzwGf1MtGiS9LfF7FuLF1uiUO
-h0upAZxiIYQfzCgsbukNAgMBAAGjggJhMIICXTBPBgNVHSAESDBGMBEGDysGAQQB
-ga0hgiwBAQQDAjARBg8rBgEEAYGtIYIsAgEEAwEwDwYNKwYBBAGBrSGCLAEBBDAN
-BgsrBgEEAYGtIYIsHjAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAU
-BggrBgEFBQcDAgYIKwYBBQUHAwEwHQYDVR0OBBYEFByOCp/OHHvM6gbSI9luT2kP
-qEPKMB8GA1UdIwQYMBaAFJZbTHC7b/yc77U/pHr7k/8J6mp2MFAGA1UdEQRJMEeC
-DXR1bWlkcC5scnouZGWCDnR1bWlkcDEubHJ6LmRlgg50dW1pZHAyLmxyei5kZYEW
-emJ2dy1jZXJ0LWFkbWluQGxyei5kZTB3BgNVHR8EcDBuMDWgM6Axhi9odHRwOi8v
-Y2RwMS5wY2EuZGZuLmRlL2xyei1jYS9wdWIvY3JsL2NhY3JsLmNybDA1oDOgMYYv
-aHR0cDovL2NkcDIucGNhLmRmbi5kZS9scnotY2EvcHViL2NybC9jYWNybC5jcmww
-gccGCCsGAQUFBwEBBIG6MIG3MDMGCCsGAQUFBzABhidodHRwOi8vb2NzcC5wY2Eu
-ZGZuLmRlL09DU1AtU2VydmVyL09DU1AwPwYIKwYBBQUHMAKGM2h0dHA6Ly9jZHAx
-LnBjYS5kZm4uZGUvbHJ6LWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDA/BggrBgEF
-BQcwAoYzaHR0cDovL2NkcDIucGNhLmRmbi5kZS9scnotY2EvcHViL2NhY2VydC9j
-YWNlcnQuY3J0MA0GCSqGSIb3DQEBCwUAA4IBAQAT3As5OcAfO2e8xIYLlLgBED7E
-XewUJNl3fajpXnHHtzj0GmffS3yNX8ACBfnwHLH3pLZB7RUddm8G+ZE9S0uH5KJV
-UZgI+2769+aZGQZXvYpjdozSRWMsax3Dxk0/LM8dVd7ungufjQER6C1htiTPo20k
-qyvaCBDYCmxxwvWKEotIBKJzw9OXo+QrilIUu3EWLFWE0si8y1CoJM+448o60J/a
-EXxQStSJsCeVq8wNA3FPZIwE4N8U4DAxutZ3lbiaP9Poh1aX19Q1k/NyF7SqbnW8
-GZTANTovR7saQi2bnxJrrbSG5L7CgpOUFTpC/ROO+LP2DLXjnMP6fE6Aj0rA
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>tumidp.lrz.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=tumidp.lrz.de,OU=Leibniz-Rechenzentrum,O=Bayerische Akademie der Wissenschaften,L=Garching b. Muenchen,ST=Bayern,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIGKTCCBRGgAwIBAgIHGEI+5Dgs1DANBgkqhkiG9w0BAQsFADCBnTELMAkGA1UE
-BhMCREUxDzANBgNVBAgTBkJheWVybjERMA8GA1UEBxMITXVlbmNoZW4xHjAcBgNV
-BAoTFUxlaWJuaXotUmVjaGVuemVudHJ1bTEPMA0GA1UECxMGTFJaLUNBMRUwEwYD
-VQQDEwxMUlotQ0EgLSBHMDExIjAgBgkqhkiG9w0BCQEWE3BraUBscnotbXVlbmNo
-ZW4uZGUwHhcNMTQwOTI0MTMwNDIxWhcNMTkwNzA5MjM1OTAwWjCBpjELMAkGA1UE
-BhMCREUxDzANBgNVBAgTBkJheWVybjEdMBsGA1UEBxMUR2FyY2hpbmcgYi4gTXVl
-bmNoZW4xLzAtBgNVBAoTJkJheWVyaXNjaGUgQWthZGVtaWUgZGVyIFdpc3NlbnNj
-aGFmdGVuMR4wHAYDVQQLExVMZWlibml6LVJlY2hlbnplbnRydW0xFjAUBgNVBAMT
-DXR1bWlkcC5scnouZGUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDj
-WPvROHchdCtMHI4Fxr9nNlnLzASonlX8SmuhZ6080jWEYQ+U9/AVyQge6p5kmASc
-NO+4VURn5WpGdT8q1RZeMxHMq0fIb8q8EU8qgC+bvOMgMEEx9tWB5tuOG5+gOPWI
-5NMTvtxRth8EV44DllZunA919Ei7JxvpJ2188y24u4zjs+henD4qir3h0oCiLVwI
-LCme6C0xXYH4aEX65YTfWL2bJqWCyLgWbMeZjxKDHqwDMFJfKZQazEK8la5n2Hzu
-h2bCCT61p1inNjHdxgWXkDYq3YfskDSksOOaY4+DzwGf1MtGiS9LfF7FuLF1uiUO
-h0upAZxiIYQfzCgsbukNAgMBAAGjggJhMIICXTBPBgNVHSAESDBGMBEGDysGAQQB
-ga0hgiwBAQQDAjARBg8rBgEEAYGtIYIsAgEEAwEwDwYNKwYBBAGBrSGCLAEBBDAN
-BgsrBgEEAYGtIYIsHjAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAU
-BggrBgEFBQcDAgYIKwYBBQUHAwEwHQYDVR0OBBYEFByOCp/OHHvM6gbSI9luT2kP
-qEPKMB8GA1UdIwQYMBaAFJZbTHC7b/yc77U/pHr7k/8J6mp2MFAGA1UdEQRJMEeC
-DXR1bWlkcC5scnouZGWCDnR1bWlkcDEubHJ6LmRlgg50dW1pZHAyLmxyei5kZYEW
-emJ2dy1jZXJ0LWFkbWluQGxyei5kZTB3BgNVHR8EcDBuMDWgM6Axhi9odHRwOi8v
-Y2RwMS5wY2EuZGZuLmRlL2xyei1jYS9wdWIvY3JsL2NhY3JsLmNybDA1oDOgMYYv
-aHR0cDovL2NkcDIucGNhLmRmbi5kZS9scnotY2EvcHViL2NybC9jYWNybC5jcmww
-gccGCCsGAQUFBwEBBIG6MIG3MDMGCCsGAQUFBzABhidodHRwOi8vb2NzcC5wY2Eu
-ZGZuLmRlL09DU1AtU2VydmVyL09DU1AwPwYIKwYBBQUHMAKGM2h0dHA6Ly9jZHAx
-LnBjYS5kZm4uZGUvbHJ6LWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDA/BggrBgEF
-BQcwAoYzaHR0cDovL2NkcDIucGNhLmRmbi5kZS9scnotY2EvcHViL2NhY2VydC9j
-YWNlcnQuY3J0MA0GCSqGSIb3DQEBCwUAA4IBAQAT3As5OcAfO2e8xIYLlLgBED7E
-XewUJNl3fajpXnHHtzj0GmffS3yNX8ACBfnwHLH3pLZB7RUddm8G+ZE9S0uH5KJV
-UZgI+2769+aZGQZXvYpjdozSRWMsax3Dxk0/LM8dVd7ungufjQER6C1htiTPo20k
-qyvaCBDYCmxxwvWKEotIBKJzw9OXo+QrilIUu3EWLFWE0si8y1CoJM+448o60J/a
-EXxQStSJsCeVq8wNA3FPZIwE4N8U4DAxutZ3lbiaP9Poh1aX19Q1k/NyF7SqbnW8
-GZTANTovR7saQi2bnxJrrbSG5L7CgpOUFTpC/ROO+LP2DLXjnMP6fE6Aj0rA
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://tumidp.lrz.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://tumidp.lrz.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://tumidp.lrz.de/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://tumidp.lrz.de/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://tumidp.lrz.de/idp/profile/SAML2/POST/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">tum.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>tumidp.lrz.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=tumidp.lrz.de,OU=Leibniz-Rechenzentrum,O=Bayerische Akademie der Wissenschaften,L=Garching b. Muenchen,ST=Bayern,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIGKTCCBRGgAwIBAgIHGEI+5Dgs1DANBgkqhkiG9w0BAQsFADCBnTELMAkGA1UE
-BhMCREUxDzANBgNVBAgTBkJheWVybjERMA8GA1UEBxMITXVlbmNoZW4xHjAcBgNV
-BAoTFUxlaWJuaXotUmVjaGVuemVudHJ1bTEPMA0GA1UECxMGTFJaLUNBMRUwEwYD
-VQQDEwxMUlotQ0EgLSBHMDExIjAgBgkqhkiG9w0BCQEWE3BraUBscnotbXVlbmNo
-ZW4uZGUwHhcNMTQwOTI0MTMwNDIxWhcNMTkwNzA5MjM1OTAwWjCBpjELMAkGA1UE
-BhMCREUxDzANBgNVBAgTBkJheWVybjEdMBsGA1UEBxMUR2FyY2hpbmcgYi4gTXVl
-bmNoZW4xLzAtBgNVBAoTJkJheWVyaXNjaGUgQWthZGVtaWUgZGVyIFdpc3NlbnNj
-aGFmdGVuMR4wHAYDVQQLExVMZWlibml6LVJlY2hlbnplbnRydW0xFjAUBgNVBAMT
-DXR1bWlkcC5scnouZGUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDj
-WPvROHchdCtMHI4Fxr9nNlnLzASonlX8SmuhZ6080jWEYQ+U9/AVyQge6p5kmASc
-NO+4VURn5WpGdT8q1RZeMxHMq0fIb8q8EU8qgC+bvOMgMEEx9tWB5tuOG5+gOPWI
-5NMTvtxRth8EV44DllZunA919Ei7JxvpJ2188y24u4zjs+henD4qir3h0oCiLVwI
-LCme6C0xXYH4aEX65YTfWL2bJqWCyLgWbMeZjxKDHqwDMFJfKZQazEK8la5n2Hzu
-h2bCCT61p1inNjHdxgWXkDYq3YfskDSksOOaY4+DzwGf1MtGiS9LfF7FuLF1uiUO
-h0upAZxiIYQfzCgsbukNAgMBAAGjggJhMIICXTBPBgNVHSAESDBGMBEGDysGAQQB
-ga0hgiwBAQQDAjARBg8rBgEEAYGtIYIsAgEEAwEwDwYNKwYBBAGBrSGCLAEBBDAN
-BgsrBgEEAYGtIYIsHjAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAU
-BggrBgEFBQcDAgYIKwYBBQUHAwEwHQYDVR0OBBYEFByOCp/OHHvM6gbSI9luT2kP
-qEPKMB8GA1UdIwQYMBaAFJZbTHC7b/yc77U/pHr7k/8J6mp2MFAGA1UdEQRJMEeC
-DXR1bWlkcC5scnouZGWCDnR1bWlkcDEubHJ6LmRlgg50dW1pZHAyLmxyei5kZYEW
-emJ2dy1jZXJ0LWFkbWluQGxyei5kZTB3BgNVHR8EcDBuMDWgM6Axhi9odHRwOi8v
-Y2RwMS5wY2EuZGZuLmRlL2xyei1jYS9wdWIvY3JsL2NhY3JsLmNybDA1oDOgMYYv
-aHR0cDovL2NkcDIucGNhLmRmbi5kZS9scnotY2EvcHViL2NybC9jYWNybC5jcmww
-gccGCCsGAQUFBwEBBIG6MIG3MDMGCCsGAQUFBzABhidodHRwOi8vb2NzcC5wY2Eu
-ZGZuLmRlL09DU1AtU2VydmVyL09DU1AwPwYIKwYBBQUHMAKGM2h0dHA6Ly9jZHAx
-LnBjYS5kZm4uZGUvbHJ6LWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDA/BggrBgEF
-BQcwAoYzaHR0cDovL2NkcDIucGNhLmRmbi5kZS9scnotY2EvcHViL2NhY2VydC9j
-YWNlcnQuY3J0MA0GCSqGSIb3DQEBCwUAA4IBAQAT3As5OcAfO2e8xIYLlLgBED7E
-XewUJNl3fajpXnHHtzj0GmffS3yNX8ACBfnwHLH3pLZB7RUddm8G+ZE9S0uH5KJV
-UZgI+2769+aZGQZXvYpjdozSRWMsax3Dxk0/LM8dVd7ungufjQER6C1htiTPo20k
-qyvaCBDYCmxxwvWKEotIBKJzw9OXo+QrilIUu3EWLFWE0si8y1CoJM+448o60J/a
-EXxQStSJsCeVq8wNA3FPZIwE4N8U4DAxutZ3lbiaP9Poh1aX19Q1k/NyF7SqbnW8
-GZTANTovR7saQi2bnxJrrbSG5L7CgpOUFTpC/ROO+LP2DLXjnMP6fE6Aj0rA
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>tumidp.lrz.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=tumidp.lrz.de,OU=Leibniz-Rechenzentrum,O=Bayerische Akademie der Wissenschaften,L=Garching b. Muenchen,ST=Bayern,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIGKTCCBRGgAwIBAgIHGEI+5Dgs1DANBgkqhkiG9w0BAQsFADCBnTELMAkGA1UE
-BhMCREUxDzANBgNVBAgTBkJheWVybjERMA8GA1UEBxMITXVlbmNoZW4xHjAcBgNV
-BAoTFUxlaWJuaXotUmVjaGVuemVudHJ1bTEPMA0GA1UECxMGTFJaLUNBMRUwEwYD
-VQQDEwxMUlotQ0EgLSBHMDExIjAgBgkqhkiG9w0BCQEWE3BraUBscnotbXVlbmNo
-ZW4uZGUwHhcNMTQwOTI0MTMwNDIxWhcNMTkwNzA5MjM1OTAwWjCBpjELMAkGA1UE
-BhMCREUxDzANBgNVBAgTBkJheWVybjEdMBsGA1UEBxMUR2FyY2hpbmcgYi4gTXVl
-bmNoZW4xLzAtBgNVBAoTJkJheWVyaXNjaGUgQWthZGVtaWUgZGVyIFdpc3NlbnNj
-aGFmdGVuMR4wHAYDVQQLExVMZWlibml6LVJlY2hlbnplbnRydW0xFjAUBgNVBAMT
-DXR1bWlkcC5scnouZGUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDj
-WPvROHchdCtMHI4Fxr9nNlnLzASonlX8SmuhZ6080jWEYQ+U9/AVyQge6p5kmASc
-NO+4VURn5WpGdT8q1RZeMxHMq0fIb8q8EU8qgC+bvOMgMEEx9tWB5tuOG5+gOPWI
-5NMTvtxRth8EV44DllZunA919Ei7JxvpJ2188y24u4zjs+henD4qir3h0oCiLVwI
-LCme6C0xXYH4aEX65YTfWL2bJqWCyLgWbMeZjxKDHqwDMFJfKZQazEK8la5n2Hzu
-h2bCCT61p1inNjHdxgWXkDYq3YfskDSksOOaY4+DzwGf1MtGiS9LfF7FuLF1uiUO
-h0upAZxiIYQfzCgsbukNAgMBAAGjggJhMIICXTBPBgNVHSAESDBGMBEGDysGAQQB
-ga0hgiwBAQQDAjARBg8rBgEEAYGtIYIsAgEEAwEwDwYNKwYBBAGBrSGCLAEBBDAN
-BgsrBgEEAYGtIYIsHjAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAU
-BggrBgEFBQcDAgYIKwYBBQUHAwEwHQYDVR0OBBYEFByOCp/OHHvM6gbSI9luT2kP
-qEPKMB8GA1UdIwQYMBaAFJZbTHC7b/yc77U/pHr7k/8J6mp2MFAGA1UdEQRJMEeC
-DXR1bWlkcC5scnouZGWCDnR1bWlkcDEubHJ6LmRlgg50dW1pZHAyLmxyei5kZYEW
-emJ2dy1jZXJ0LWFkbWluQGxyei5kZTB3BgNVHR8EcDBuMDWgM6Axhi9odHRwOi8v
-Y2RwMS5wY2EuZGZuLmRlL2xyei1jYS9wdWIvY3JsL2NhY3JsLmNybDA1oDOgMYYv
-aHR0cDovL2NkcDIucGNhLmRmbi5kZS9scnotY2EvcHViL2NybC9jYWNybC5jcmww
-gccGCCsGAQUFBwEBBIG6MIG3MDMGCCsGAQUFBzABhidodHRwOi8vb2NzcC5wY2Eu
-ZGZuLmRlL09DU1AtU2VydmVyL09DU1AwPwYIKwYBBQUHMAKGM2h0dHA6Ly9jZHAx
-LnBjYS5kZm4uZGUvbHJ6LWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDA/BggrBgEF
-BQcwAoYzaHR0cDovL2NkcDIucGNhLmRmbi5kZS9scnotY2EvcHViL2NhY2VydC9j
-YWNlcnQuY3J0MA0GCSqGSIb3DQEBCwUAA4IBAQAT3As5OcAfO2e8xIYLlLgBED7E
-XewUJNl3fajpXnHHtzj0GmffS3yNX8ACBfnwHLH3pLZB7RUddm8G+ZE9S0uH5KJV
-UZgI+2769+aZGQZXvYpjdozSRWMsax3Dxk0/LM8dVd7ungufjQER6C1htiTPo20k
-qyvaCBDYCmxxwvWKEotIBKJzw9OXo+QrilIUu3EWLFWE0si8y1CoJM+448o60J/a
-EXxQStSJsCeVq8wNA3FPZIwE4N8U4DAxutZ3lbiaP9Poh1aX19Q1k/NyF7SqbnW8
-GZTANTovR7saQi2bnxJrrbSG5L7CgpOUFTpC/ROO+LP2DLXjnMP6fE6Aj0rA
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://tumidp.lrz.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://tumidp.lrz.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">e8</OrganizationName>
-    <OrganizationName xml:lang="en">e8</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">Technische Universität München</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">Technische Universität München</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.tum.de</OrganizationURL>
-    <OrganizationURL xml:lang="en">http://www.tum.de</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="administrative">
-    <GivenName>Ralf</GivenName>
-    <SurName>Ebner</SurName>
-    <EmailAddress>mailto:shibboleth@lrz.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Ralf</GivenName>
-    <SurName>Ebner</SurName>
-    <EmailAddress>mailto:shibboleth@lrz.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="support">
-    <GivenName>TUM IT-Support</GivenName>
-    <SurName>TUM IT-Support</SurName>
-    <EmailAddress>mailto:it-support@tum.de</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/tumidp.lrz.de.xml b/swamid-interfederations-2.0/tumidp.lrz.de.xml
deleted file mode 100644
index 643e7a04..00000000
--- a/swamid-interfederations-2.0/tumidp.lrz.de.xml
+++ /dev/null
@@ -1,231 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://tumidp.lrz.de/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2009-05-26T08:35:04Z">
-      <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">tum.de</saml1md:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="de">TU München (TUM)</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Munich University of Technology (TUM)</mdui:DisplayName>
-        <mdui:Description xml:lang="de">Identity Provider der Technischen Universität München</mdui:Description>
-        <mdui:Description xml:lang="en">Identity Provider for TUM</mdui:Description>
-        <mdui:InformationURL xml:lang="de">http://www.tum.de</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">http://www.tum.de</mdui:InformationURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>tumidp.lrz.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=tumidp.lrz.de,OU=Leibniz-Rechenzentrum,O=Bayerische Akademie der Wissenschaften,L=Garching b. Muenchen,ST=Bayern,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIGKTCCBRGgAwIBAgIHGEI+5Dgs1DANBgkqhkiG9w0BAQsFADCBnTELMAkGA1UE
-BhMCREUxDzANBgNVBAgTBkJheWVybjERMA8GA1UEBxMITXVlbmNoZW4xHjAcBgNV
-BAoTFUxlaWJuaXotUmVjaGVuemVudHJ1bTEPMA0GA1UECxMGTFJaLUNBMRUwEwYD
-VQQDEwxMUlotQ0EgLSBHMDExIjAgBgkqhkiG9w0BCQEWE3BraUBscnotbXVlbmNo
-ZW4uZGUwHhcNMTQwOTI0MTMwNDIxWhcNMTkwNzA5MjM1OTAwWjCBpjELMAkGA1UE
-BhMCREUxDzANBgNVBAgTBkJheWVybjEdMBsGA1UEBxMUR2FyY2hpbmcgYi4gTXVl
-bmNoZW4xLzAtBgNVBAoTJkJheWVyaXNjaGUgQWthZGVtaWUgZGVyIFdpc3NlbnNj
-aGFmdGVuMR4wHAYDVQQLExVMZWlibml6LVJlY2hlbnplbnRydW0xFjAUBgNVBAMT
-DXR1bWlkcC5scnouZGUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDj
-WPvROHchdCtMHI4Fxr9nNlnLzASonlX8SmuhZ6080jWEYQ+U9/AVyQge6p5kmASc
-NO+4VURn5WpGdT8q1RZeMxHMq0fIb8q8EU8qgC+bvOMgMEEx9tWB5tuOG5+gOPWI
-5NMTvtxRth8EV44DllZunA919Ei7JxvpJ2188y24u4zjs+henD4qir3h0oCiLVwI
-LCme6C0xXYH4aEX65YTfWL2bJqWCyLgWbMeZjxKDHqwDMFJfKZQazEK8la5n2Hzu
-h2bCCT61p1inNjHdxgWXkDYq3YfskDSksOOaY4+DzwGf1MtGiS9LfF7FuLF1uiUO
-h0upAZxiIYQfzCgsbukNAgMBAAGjggJhMIICXTBPBgNVHSAESDBGMBEGDysGAQQB
-ga0hgiwBAQQDAjARBg8rBgEEAYGtIYIsAgEEAwEwDwYNKwYBBAGBrSGCLAEBBDAN
-BgsrBgEEAYGtIYIsHjAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAU
-BggrBgEFBQcDAgYIKwYBBQUHAwEwHQYDVR0OBBYEFByOCp/OHHvM6gbSI9luT2kP
-qEPKMB8GA1UdIwQYMBaAFJZbTHC7b/yc77U/pHr7k/8J6mp2MFAGA1UdEQRJMEeC
-DXR1bWlkcC5scnouZGWCDnR1bWlkcDEubHJ6LmRlgg50dW1pZHAyLmxyei5kZYEW
-emJ2dy1jZXJ0LWFkbWluQGxyei5kZTB3BgNVHR8EcDBuMDWgM6Axhi9odHRwOi8v
-Y2RwMS5wY2EuZGZuLmRlL2xyei1jYS9wdWIvY3JsL2NhY3JsLmNybDA1oDOgMYYv
-aHR0cDovL2NkcDIucGNhLmRmbi5kZS9scnotY2EvcHViL2NybC9jYWNybC5jcmww
-gccGCCsGAQUFBwEBBIG6MIG3MDMGCCsGAQUFBzABhidodHRwOi8vb2NzcC5wY2Eu
-ZGZuLmRlL09DU1AtU2VydmVyL09DU1AwPwYIKwYBBQUHMAKGM2h0dHA6Ly9jZHAx
-LnBjYS5kZm4uZGUvbHJ6LWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDA/BggrBgEF
-BQcwAoYzaHR0cDovL2NkcDIucGNhLmRmbi5kZS9scnotY2EvcHViL2NhY2VydC9j
-YWNlcnQuY3J0MA0GCSqGSIb3DQEBCwUAA4IBAQAT3As5OcAfO2e8xIYLlLgBED7E
-XewUJNl3fajpXnHHtzj0GmffS3yNX8ACBfnwHLH3pLZB7RUddm8G+ZE9S0uH5KJV
-UZgI+2769+aZGQZXvYpjdozSRWMsax3Dxk0/LM8dVd7ungufjQER6C1htiTPo20k
-qyvaCBDYCmxxwvWKEotIBKJzw9OXo+QrilIUu3EWLFWE0si8y1CoJM+448o60J/a
-EXxQStSJsCeVq8wNA3FPZIwE4N8U4DAxutZ3lbiaP9Poh1aX19Q1k/NyF7SqbnW8
-GZTANTovR7saQi2bnxJrrbSG5L7CgpOUFTpC/ROO+LP2DLXjnMP6fE6Aj0rA
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>tumidp.lrz.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=tumidp.lrz.de,OU=Leibniz-Rechenzentrum,O=Bayerische Akademie der Wissenschaften,L=Garching b. Muenchen,ST=Bayern,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIGKTCCBRGgAwIBAgIHGEI+5Dgs1DANBgkqhkiG9w0BAQsFADCBnTELMAkGA1UE
-BhMCREUxDzANBgNVBAgTBkJheWVybjERMA8GA1UEBxMITXVlbmNoZW4xHjAcBgNV
-BAoTFUxlaWJuaXotUmVjaGVuemVudHJ1bTEPMA0GA1UECxMGTFJaLUNBMRUwEwYD
-VQQDEwxMUlotQ0EgLSBHMDExIjAgBgkqhkiG9w0BCQEWE3BraUBscnotbXVlbmNo
-ZW4uZGUwHhcNMTQwOTI0MTMwNDIxWhcNMTkwNzA5MjM1OTAwWjCBpjELMAkGA1UE
-BhMCREUxDzANBgNVBAgTBkJheWVybjEdMBsGA1UEBxMUR2FyY2hpbmcgYi4gTXVl
-bmNoZW4xLzAtBgNVBAoTJkJheWVyaXNjaGUgQWthZGVtaWUgZGVyIFdpc3NlbnNj
-aGFmdGVuMR4wHAYDVQQLExVMZWlibml6LVJlY2hlbnplbnRydW0xFjAUBgNVBAMT
-DXR1bWlkcC5scnouZGUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDj
-WPvROHchdCtMHI4Fxr9nNlnLzASonlX8SmuhZ6080jWEYQ+U9/AVyQge6p5kmASc
-NO+4VURn5WpGdT8q1RZeMxHMq0fIb8q8EU8qgC+bvOMgMEEx9tWB5tuOG5+gOPWI
-5NMTvtxRth8EV44DllZunA919Ei7JxvpJ2188y24u4zjs+henD4qir3h0oCiLVwI
-LCme6C0xXYH4aEX65YTfWL2bJqWCyLgWbMeZjxKDHqwDMFJfKZQazEK8la5n2Hzu
-h2bCCT61p1inNjHdxgWXkDYq3YfskDSksOOaY4+DzwGf1MtGiS9LfF7FuLF1uiUO
-h0upAZxiIYQfzCgsbukNAgMBAAGjggJhMIICXTBPBgNVHSAESDBGMBEGDysGAQQB
-ga0hgiwBAQQDAjARBg8rBgEEAYGtIYIsAgEEAwEwDwYNKwYBBAGBrSGCLAEBBDAN
-BgsrBgEEAYGtIYIsHjAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAU
-BggrBgEFBQcDAgYIKwYBBQUHAwEwHQYDVR0OBBYEFByOCp/OHHvM6gbSI9luT2kP
-qEPKMB8GA1UdIwQYMBaAFJZbTHC7b/yc77U/pHr7k/8J6mp2MFAGA1UdEQRJMEeC
-DXR1bWlkcC5scnouZGWCDnR1bWlkcDEubHJ6LmRlgg50dW1pZHAyLmxyei5kZYEW
-emJ2dy1jZXJ0LWFkbWluQGxyei5kZTB3BgNVHR8EcDBuMDWgM6Axhi9odHRwOi8v
-Y2RwMS5wY2EuZGZuLmRlL2xyei1jYS9wdWIvY3JsL2NhY3JsLmNybDA1oDOgMYYv
-aHR0cDovL2NkcDIucGNhLmRmbi5kZS9scnotY2EvcHViL2NybC9jYWNybC5jcmww
-gccGCCsGAQUFBwEBBIG6MIG3MDMGCCsGAQUFBzABhidodHRwOi8vb2NzcC5wY2Eu
-ZGZuLmRlL09DU1AtU2VydmVyL09DU1AwPwYIKwYBBQUHMAKGM2h0dHA6Ly9jZHAx
-LnBjYS5kZm4uZGUvbHJ6LWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDA/BggrBgEF
-BQcwAoYzaHR0cDovL2NkcDIucGNhLmRmbi5kZS9scnotY2EvcHViL2NhY2VydC9j
-YWNlcnQuY3J0MA0GCSqGSIb3DQEBCwUAA4IBAQAT3As5OcAfO2e8xIYLlLgBED7E
-XewUJNl3fajpXnHHtzj0GmffS3yNX8ACBfnwHLH3pLZB7RUddm8G+ZE9S0uH5KJV
-UZgI+2769+aZGQZXvYpjdozSRWMsax3Dxk0/LM8dVd7ungufjQER6C1htiTPo20k
-qyvaCBDYCmxxwvWKEotIBKJzw9OXo+QrilIUu3EWLFWE0si8y1CoJM+448o60J/a
-EXxQStSJsCeVq8wNA3FPZIwE4N8U4DAxutZ3lbiaP9Poh1aX19Q1k/NyF7SqbnW8
-GZTANTovR7saQi2bnxJrrbSG5L7CgpOUFTpC/ROO+LP2DLXjnMP6fE6Aj0rA
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://tumidp.lrz.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://tumidp.lrz.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://tumidp.lrz.de/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://tumidp.lrz.de/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://tumidp.lrz.de/idp/profile/SAML2/POST/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">tum.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>tumidp.lrz.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=tumidp.lrz.de,OU=Leibniz-Rechenzentrum,O=Bayerische Akademie der Wissenschaften,L=Garching b. Muenchen,ST=Bayern,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIGKTCCBRGgAwIBAgIHGEI+5Dgs1DANBgkqhkiG9w0BAQsFADCBnTELMAkGA1UE
-BhMCREUxDzANBgNVBAgTBkJheWVybjERMA8GA1UEBxMITXVlbmNoZW4xHjAcBgNV
-BAoTFUxlaWJuaXotUmVjaGVuemVudHJ1bTEPMA0GA1UECxMGTFJaLUNBMRUwEwYD
-VQQDEwxMUlotQ0EgLSBHMDExIjAgBgkqhkiG9w0BCQEWE3BraUBscnotbXVlbmNo
-ZW4uZGUwHhcNMTQwOTI0MTMwNDIxWhcNMTkwNzA5MjM1OTAwWjCBpjELMAkGA1UE
-BhMCREUxDzANBgNVBAgTBkJheWVybjEdMBsGA1UEBxMUR2FyY2hpbmcgYi4gTXVl
-bmNoZW4xLzAtBgNVBAoTJkJheWVyaXNjaGUgQWthZGVtaWUgZGVyIFdpc3NlbnNj
-aGFmdGVuMR4wHAYDVQQLExVMZWlibml6LVJlY2hlbnplbnRydW0xFjAUBgNVBAMT
-DXR1bWlkcC5scnouZGUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDj
-WPvROHchdCtMHI4Fxr9nNlnLzASonlX8SmuhZ6080jWEYQ+U9/AVyQge6p5kmASc
-NO+4VURn5WpGdT8q1RZeMxHMq0fIb8q8EU8qgC+bvOMgMEEx9tWB5tuOG5+gOPWI
-5NMTvtxRth8EV44DllZunA919Ei7JxvpJ2188y24u4zjs+henD4qir3h0oCiLVwI
-LCme6C0xXYH4aEX65YTfWL2bJqWCyLgWbMeZjxKDHqwDMFJfKZQazEK8la5n2Hzu
-h2bCCT61p1inNjHdxgWXkDYq3YfskDSksOOaY4+DzwGf1MtGiS9LfF7FuLF1uiUO
-h0upAZxiIYQfzCgsbukNAgMBAAGjggJhMIICXTBPBgNVHSAESDBGMBEGDysGAQQB
-ga0hgiwBAQQDAjARBg8rBgEEAYGtIYIsAgEEAwEwDwYNKwYBBAGBrSGCLAEBBDAN
-BgsrBgEEAYGtIYIsHjAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAU
-BggrBgEFBQcDAgYIKwYBBQUHAwEwHQYDVR0OBBYEFByOCp/OHHvM6gbSI9luT2kP
-qEPKMB8GA1UdIwQYMBaAFJZbTHC7b/yc77U/pHr7k/8J6mp2MFAGA1UdEQRJMEeC
-DXR1bWlkcC5scnouZGWCDnR1bWlkcDEubHJ6LmRlgg50dW1pZHAyLmxyei5kZYEW
-emJ2dy1jZXJ0LWFkbWluQGxyei5kZTB3BgNVHR8EcDBuMDWgM6Axhi9odHRwOi8v
-Y2RwMS5wY2EuZGZuLmRlL2xyei1jYS9wdWIvY3JsL2NhY3JsLmNybDA1oDOgMYYv
-aHR0cDovL2NkcDIucGNhLmRmbi5kZS9scnotY2EvcHViL2NybC9jYWNybC5jcmww
-gccGCCsGAQUFBwEBBIG6MIG3MDMGCCsGAQUFBzABhidodHRwOi8vb2NzcC5wY2Eu
-ZGZuLmRlL09DU1AtU2VydmVyL09DU1AwPwYIKwYBBQUHMAKGM2h0dHA6Ly9jZHAx
-LnBjYS5kZm4uZGUvbHJ6LWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDA/BggrBgEF
-BQcwAoYzaHR0cDovL2NkcDIucGNhLmRmbi5kZS9scnotY2EvcHViL2NhY2VydC9j
-YWNlcnQuY3J0MA0GCSqGSIb3DQEBCwUAA4IBAQAT3As5OcAfO2e8xIYLlLgBED7E
-XewUJNl3fajpXnHHtzj0GmffS3yNX8ACBfnwHLH3pLZB7RUddm8G+ZE9S0uH5KJV
-UZgI+2769+aZGQZXvYpjdozSRWMsax3Dxk0/LM8dVd7ungufjQER6C1htiTPo20k
-qyvaCBDYCmxxwvWKEotIBKJzw9OXo+QrilIUu3EWLFWE0si8y1CoJM+448o60J/a
-EXxQStSJsCeVq8wNA3FPZIwE4N8U4DAxutZ3lbiaP9Poh1aX19Q1k/NyF7SqbnW8
-GZTANTovR7saQi2bnxJrrbSG5L7CgpOUFTpC/ROO+LP2DLXjnMP6fE6Aj0rA
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>tumidp.lrz.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=tumidp.lrz.de,OU=Leibniz-Rechenzentrum,O=Bayerische Akademie der Wissenschaften,L=Garching b. Muenchen,ST=Bayern,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIGKTCCBRGgAwIBAgIHGEI+5Dgs1DANBgkqhkiG9w0BAQsFADCBnTELMAkGA1UE
-BhMCREUxDzANBgNVBAgTBkJheWVybjERMA8GA1UEBxMITXVlbmNoZW4xHjAcBgNV
-BAoTFUxlaWJuaXotUmVjaGVuemVudHJ1bTEPMA0GA1UECxMGTFJaLUNBMRUwEwYD
-VQQDEwxMUlotQ0EgLSBHMDExIjAgBgkqhkiG9w0BCQEWE3BraUBscnotbXVlbmNo
-ZW4uZGUwHhcNMTQwOTI0MTMwNDIxWhcNMTkwNzA5MjM1OTAwWjCBpjELMAkGA1UE
-BhMCREUxDzANBgNVBAgTBkJheWVybjEdMBsGA1UEBxMUR2FyY2hpbmcgYi4gTXVl
-bmNoZW4xLzAtBgNVBAoTJkJheWVyaXNjaGUgQWthZGVtaWUgZGVyIFdpc3NlbnNj
-aGFmdGVuMR4wHAYDVQQLExVMZWlibml6LVJlY2hlbnplbnRydW0xFjAUBgNVBAMT
-DXR1bWlkcC5scnouZGUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDj
-WPvROHchdCtMHI4Fxr9nNlnLzASonlX8SmuhZ6080jWEYQ+U9/AVyQge6p5kmASc
-NO+4VURn5WpGdT8q1RZeMxHMq0fIb8q8EU8qgC+bvOMgMEEx9tWB5tuOG5+gOPWI
-5NMTvtxRth8EV44DllZunA919Ei7JxvpJ2188y24u4zjs+henD4qir3h0oCiLVwI
-LCme6C0xXYH4aEX65YTfWL2bJqWCyLgWbMeZjxKDHqwDMFJfKZQazEK8la5n2Hzu
-h2bCCT61p1inNjHdxgWXkDYq3YfskDSksOOaY4+DzwGf1MtGiS9LfF7FuLF1uiUO
-h0upAZxiIYQfzCgsbukNAgMBAAGjggJhMIICXTBPBgNVHSAESDBGMBEGDysGAQQB
-ga0hgiwBAQQDAjARBg8rBgEEAYGtIYIsAgEEAwEwDwYNKwYBBAGBrSGCLAEBBDAN
-BgsrBgEEAYGtIYIsHjAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAU
-BggrBgEFBQcDAgYIKwYBBQUHAwEwHQYDVR0OBBYEFByOCp/OHHvM6gbSI9luT2kP
-qEPKMB8GA1UdIwQYMBaAFJZbTHC7b/yc77U/pHr7k/8J6mp2MFAGA1UdEQRJMEeC
-DXR1bWlkcC5scnouZGWCDnR1bWlkcDEubHJ6LmRlgg50dW1pZHAyLmxyei5kZYEW
-emJ2dy1jZXJ0LWFkbWluQGxyei5kZTB3BgNVHR8EcDBuMDWgM6Axhi9odHRwOi8v
-Y2RwMS5wY2EuZGZuLmRlL2xyei1jYS9wdWIvY3JsL2NhY3JsLmNybDA1oDOgMYYv
-aHR0cDovL2NkcDIucGNhLmRmbi5kZS9scnotY2EvcHViL2NybC9jYWNybC5jcmww
-gccGCCsGAQUFBwEBBIG6MIG3MDMGCCsGAQUFBzABhidodHRwOi8vb2NzcC5wY2Eu
-ZGZuLmRlL09DU1AtU2VydmVyL09DU1AwPwYIKwYBBQUHMAKGM2h0dHA6Ly9jZHAx
-LnBjYS5kZm4uZGUvbHJ6LWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDA/BggrBgEF
-BQcwAoYzaHR0cDovL2NkcDIucGNhLmRmbi5kZS9scnotY2EvcHViL2NhY2VydC9j
-YWNlcnQuY3J0MA0GCSqGSIb3DQEBCwUAA4IBAQAT3As5OcAfO2e8xIYLlLgBED7E
-XewUJNl3fajpXnHHtzj0GmffS3yNX8ACBfnwHLH3pLZB7RUddm8G+ZE9S0uH5KJV
-UZgI+2769+aZGQZXvYpjdozSRWMsax3Dxk0/LM8dVd7ungufjQER6C1htiTPo20k
-qyvaCBDYCmxxwvWKEotIBKJzw9OXo+QrilIUu3EWLFWE0si8y1CoJM+448o60J/a
-EXxQStSJsCeVq8wNA3FPZIwE4N8U4DAxutZ3lbiaP9Poh1aX19Q1k/NyF7SqbnW8
-GZTANTovR7saQi2bnxJrrbSG5L7CgpOUFTpC/ROO+LP2DLXjnMP6fE6Aj0rA
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://tumidp.lrz.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://tumidp.lrz.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">e8</OrganizationName>
-    <OrganizationName xml:lang="en">e8</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">Technische Universität München</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">Technische Universität München</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.tum.de</OrganizationURL>
-    <OrganizationURL xml:lang="en">http://www.tum.de</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="administrative">
-    <GivenName>Ralf</GivenName>
-    <SurName>Ebner</SurName>
-    <EmailAddress>mailto:shibboleth@lrz.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Ralf</GivenName>
-    <SurName>Ebner</SurName>
-    <EmailAddress>mailto:shibboleth@lrz.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="support">
-    <GivenName>TUM IT-Support</GivenName>
-    <SurName>TUM IT-Support</SurName>
-    <EmailAddress>mailto:it-support@tum.de</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/uat-adfs.geant.net-adfs-services-trust.xml b/swamid-interfederations-2.0/uat-adfs.geant.net-adfs-services-trust.xml
deleted file mode 100644
index fdee8bc4..00000000
--- a/swamid-interfederations-2.0/uat-adfs.geant.net-adfs-services-trust.xml
+++ /dev/null
@@ -1,162 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="http://uat-adfs.geant.net/adfs/services/trust">
-  <!--
-		This is a "DANTE" ADFS SP for Delivery of Advanced Network Technology to Europe Limited.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-02-11T17:06:35Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-    </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>
-          <ds:X509Certificate>
-						MIIIojCCB4qgAwIBAgIQfoxrYI8bPClvLVhlQwiU/zANBgkqhkiG9w0BAQUFADA2
-						MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-						U1NMIENBMB4XDTE0MDIwNDAwMDAwMFoXDTE3MDIwMzIzNTk1OVowPzEhMB8GA1UE
-						CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRowGAYDVQQDExF1YXQtd3d3Lmdl
-						YW50Lm5ldDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAL5OW7kGWzND
-						Q5/5RlPlHElH9zXF1L53YVLmi7PCVGgRcUW9X5EH/9obrP4c0MzdlGbC7RYf+9mK
-						77P1ApSlTi00FA7LS4Wf5JythfHvs1YqJQRz1RU8r+AFV4p65UpafSKnk8mx0vcb
-						KcOyo5cMUhhAt72v8rMzMXlNQk9+tM5liLdwOViLUJCRp6ZbwPj2gt+MDWzV8jC3
-						MWmK7OSW19FNOzj3yMlrTnUDDu1J5R8/ICocUzrRDAyq4PdtbAWu2UdbZdfu/ISi
-						Wg7w1CGIhWJMgM4bzZLl02KCo3yEtvLvRuH6u1JUlqFtbV1pDNQ4dW4rrmWuNWgx
-						hWP0Vh5vWdsCAwEAAaOCBaEwggWdMB8GA1UdIwQYMBaAFAy9k2gM896ro0lrKzdX
-						R+qQ47ntMB0GA1UdDgQWBBT8CQHkvrrktHXoJLNb7Az5h7kqTTAOBgNVHQ8BAf8E
-						BAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUH
-						AwIwIgYDVR0gBBswGTANBgsrBgEEAbIxAQICHTAIBgZngQwBAgEwOgYDVR0fBDMw
-						MTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5j
-						cmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRjcy50
-						ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDovL29j
-						c3AudGNzLnRlcmVuYS5vcmcwggRNBgNVHREEggREMIIEQIIRdWF0LXd3dy5nZWFu
-						dC5uZXSCEnVhdC1hZGZzLmRhbnRlLm5ldIISdWF0LWFkZnMuZ2VhbnQubmV0ghV1
-						YXQtYXJjaGl2ZS5kYW50ZS5uZXSCFnVhdC1hdXRvYmFobi5nZWFudC5uZXSCEXVh
-						dC1ib2QuZ2VhbnQubmV0ghN1YXQtY2FyZW4uZGFudGUubmV0ghN1YXQtY2xvdWQu
-						Z2VhbnQubmV0ghR1YXQtY2xvdWRzLmdlYW50Lm5ldIISdWF0LWNuaXMuZ2VhbnQu
-						bmV0ghd1YXQtY29tbXVuaXR5LmRhbnRlLm5ldIIXdWF0LWNvbW11bml0eS5nZWFu
-						dC5uZXSCEHVhdC1lYy5kYW50ZS5uZXSCEHVhdC1lYy5nZWFudC5uZXSCFXVhdC1l
-						ZHVjb25mLmdlYW50Lm5ldIIVdWF0LWVkdWdhaW4uZ2VhbnQubmV0ghV1YXQtZWR1
-						cGVydC5nZWFudC5uZXSCFHVhdC1lZHVwa2kuZ2VhbnQubmV0ghB1YXQtZXUuZGFu
-						dGUubmV0ghB1YXQtZXUuZ2VhbnQubmV0giV1YXQtZ2VhbnQzLWludHJhbmV0LmFy
-						Y2hpdmUuZ2VhbnQubmV0ghx1YXQtZ2VhbnQzLmFyY2hpdmUuZ2VhbnQubmV0ghJ1
-						YXQtZ2lkcC5nZWFudC5uZXSCFXVhdC1pLXNoYXJlLmdlYW50Lm5ldIIddWF0LWlu
-						dHJhbmV0LmFmcmljYWNvbm5lY3QuZXWCHHVhdC1pbnRyYW5ldC5jYXJlbi5kYW50
-						ZS5uZXSCFnVhdC1pbnRyYW5ldC5kYW50ZS5uZXSCHnVhdC1pbnRyYW5ldC5ldW1l
-						ZGNvbm5lY3QzLm5ldIIWdWF0LWludHJhbmV0LmdlYW50Lm5ldIIWdWF0LWludHJh
-						bmV0LnRlaW4zLm5ldIISdWF0LW1kc2QuZ2VhbnQubmV0ghJ1YXQtbmV3cy5kYW50
-						ZS5uZXSCEnVhdC1uZXdzLmdlYW50Lm5ldIIVdWF0LXBhcnRuZXIuZ2VhbnQubmV0
-						ghd1YXQtcGVyZnNvbmFyLmdlYW50Lm5ldIIRdWF0LXBsbS5nZWFudC5uZXSCFnVh
-						dC1zZXJ2aWNlcy5nZWFudC5uZXSCGHVhdC13YXZlbGVuZ3RoLmdlYW50Lm5ldIIW
-						dWF0LXdlYmxvZ2luLmRhbnRlLm5ldIIWdWF0LXdlYmxvZ2luLmdlYW50Lm5ldIIX
-						dWF0LXdlYmxvZ2luMi5kYW50ZS5uZXSCF3VhdC13ZWJsb2dpbjIuZ2VhbnQubmV0
-						ghh1YXQtd3d3LmFmcmljYWNvbm5lY3QuZXWCEXVhdC13d3cuZGFudGUubmV0ghl1
-						YXQtd3d3LmV1bWVkY29ubmVjdDMubmV0ghV1YXQtd3d3LmdlYW50b3Blbi5uZXSC
-						EXVhdC13d3cudGVpbjMubmV0MA0GCSqGSIb3DQEBBQUAA4IBAQCBhFhaVetfTvO6
-						i09vIxNWRlO5kFxXzeVDuHbm351hshNBdkKn+wIynpGOr55RrbO9N3DeupyxD7yL
-						bAOmoo72KXi1hfWfHavmKEn4eYbkvGfa6tWhudLWUg53R2ddXFlEpjR476Ydw4K0
-						GxbHcI1+XRKqrKEaxbqxhonQL98tW3QPLMTApJgQ4pyP3WY/jTW4B24Y7mrVNIIq
-						eTvZVDJJOberCcq9MDxZsF5RYOeVgKpkuT8XbDr4xKXkgmmGRsMx3eRKntEj7EfC
-						0eNbLLVlydzw/rOP2UPXDsSmb8DEUMD12OSi+Nq7/0MBgmYtNqesmiqI2cxmjIE9
-						MuFyz7mc
-					</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>
-						MIIIojCCB4qgAwIBAgIQfoxrYI8bPClvLVhlQwiU/zANBgkqhkiG9w0BAQUFADA2
-						MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-						U1NMIENBMB4XDTE0MDIwNDAwMDAwMFoXDTE3MDIwMzIzNTk1OVowPzEhMB8GA1UE
-						CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRowGAYDVQQDExF1YXQtd3d3Lmdl
-						YW50Lm5ldDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAL5OW7kGWzND
-						Q5/5RlPlHElH9zXF1L53YVLmi7PCVGgRcUW9X5EH/9obrP4c0MzdlGbC7RYf+9mK
-						77P1ApSlTi00FA7LS4Wf5JythfHvs1YqJQRz1RU8r+AFV4p65UpafSKnk8mx0vcb
-						KcOyo5cMUhhAt72v8rMzMXlNQk9+tM5liLdwOViLUJCRp6ZbwPj2gt+MDWzV8jC3
-						MWmK7OSW19FNOzj3yMlrTnUDDu1J5R8/ICocUzrRDAyq4PdtbAWu2UdbZdfu/ISi
-						Wg7w1CGIhWJMgM4bzZLl02KCo3yEtvLvRuH6u1JUlqFtbV1pDNQ4dW4rrmWuNWgx
-						hWP0Vh5vWdsCAwEAAaOCBaEwggWdMB8GA1UdIwQYMBaAFAy9k2gM896ro0lrKzdX
-						R+qQ47ntMB0GA1UdDgQWBBT8CQHkvrrktHXoJLNb7Az5h7kqTTAOBgNVHQ8BAf8E
-						BAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUH
-						AwIwIgYDVR0gBBswGTANBgsrBgEEAbIxAQICHTAIBgZngQwBAgEwOgYDVR0fBDMw
-						MTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5j
-						cmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRjcy50
-						ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDovL29j
-						c3AudGNzLnRlcmVuYS5vcmcwggRNBgNVHREEggREMIIEQIIRdWF0LXd3dy5nZWFu
-						dC5uZXSCEnVhdC1hZGZzLmRhbnRlLm5ldIISdWF0LWFkZnMuZ2VhbnQubmV0ghV1
-						YXQtYXJjaGl2ZS5kYW50ZS5uZXSCFnVhdC1hdXRvYmFobi5nZWFudC5uZXSCEXVh
-						dC1ib2QuZ2VhbnQubmV0ghN1YXQtY2FyZW4uZGFudGUubmV0ghN1YXQtY2xvdWQu
-						Z2VhbnQubmV0ghR1YXQtY2xvdWRzLmdlYW50Lm5ldIISdWF0LWNuaXMuZ2VhbnQu
-						bmV0ghd1YXQtY29tbXVuaXR5LmRhbnRlLm5ldIIXdWF0LWNvbW11bml0eS5nZWFu
-						dC5uZXSCEHVhdC1lYy5kYW50ZS5uZXSCEHVhdC1lYy5nZWFudC5uZXSCFXVhdC1l
-						ZHVjb25mLmdlYW50Lm5ldIIVdWF0LWVkdWdhaW4uZ2VhbnQubmV0ghV1YXQtZWR1
-						cGVydC5nZWFudC5uZXSCFHVhdC1lZHVwa2kuZ2VhbnQubmV0ghB1YXQtZXUuZGFu
-						dGUubmV0ghB1YXQtZXUuZ2VhbnQubmV0giV1YXQtZ2VhbnQzLWludHJhbmV0LmFy
-						Y2hpdmUuZ2VhbnQubmV0ghx1YXQtZ2VhbnQzLmFyY2hpdmUuZ2VhbnQubmV0ghJ1
-						YXQtZ2lkcC5nZWFudC5uZXSCFXVhdC1pLXNoYXJlLmdlYW50Lm5ldIIddWF0LWlu
-						dHJhbmV0LmFmcmljYWNvbm5lY3QuZXWCHHVhdC1pbnRyYW5ldC5jYXJlbi5kYW50
-						ZS5uZXSCFnVhdC1pbnRyYW5ldC5kYW50ZS5uZXSCHnVhdC1pbnRyYW5ldC5ldW1l
-						ZGNvbm5lY3QzLm5ldIIWdWF0LWludHJhbmV0LmdlYW50Lm5ldIIWdWF0LWludHJh
-						bmV0LnRlaW4zLm5ldIISdWF0LW1kc2QuZ2VhbnQubmV0ghJ1YXQtbmV3cy5kYW50
-						ZS5uZXSCEnVhdC1uZXdzLmdlYW50Lm5ldIIVdWF0LXBhcnRuZXIuZ2VhbnQubmV0
-						ghd1YXQtcGVyZnNvbmFyLmdlYW50Lm5ldIIRdWF0LXBsbS5nZWFudC5uZXSCFnVh
-						dC1zZXJ2aWNlcy5nZWFudC5uZXSCGHVhdC13YXZlbGVuZ3RoLmdlYW50Lm5ldIIW
-						dWF0LXdlYmxvZ2luLmRhbnRlLm5ldIIWdWF0LXdlYmxvZ2luLmdlYW50Lm5ldIIX
-						dWF0LXdlYmxvZ2luMi5kYW50ZS5uZXSCF3VhdC13ZWJsb2dpbjIuZ2VhbnQubmV0
-						ghh1YXQtd3d3LmFmcmljYWNvbm5lY3QuZXWCEXVhdC13d3cuZGFudGUubmV0ghl1
-						YXQtd3d3LmV1bWVkY29ubmVjdDMubmV0ghV1YXQtd3d3LmdlYW50b3Blbi5uZXSC
-						EXVhdC13d3cudGVpbjMubmV0MA0GCSqGSIb3DQEBBQUAA4IBAQCBhFhaVetfTvO6
-						i09vIxNWRlO5kFxXzeVDuHbm351hshNBdkKn+wIynpGOr55RrbO9N3DeupyxD7yL
-						bAOmoo72KXi1hfWfHavmKEn4eYbkvGfa6tWhudLWUg53R2ddXFlEpjR476Ydw4K0
-						GxbHcI1+XRKqrKEaxbqxhonQL98tW3QPLMTApJgQ4pyP3WY/jTW4B24Y7mrVNIIq
-						eTvZVDJJOberCcq9MDxZsF5RYOeVgKpkuT8XbDr4xKXkgmmGRsMx3eRKntEj7EfC
-						0eNbLLVlydzw/rOP2UPXDsSmb8DEUMD12OSi+Nq7/0MBgmYtNqesmiqI2cxmjIE9
-						MuFyz7mc
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://uat-adfs.geant.net/adfs/ls/"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://uat-adfs.geant.net/adfs/ls/"/>
-    <NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</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" 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>
-    <OrganizationDisplayName xml:lang="en">DANTE</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.dante.net/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>DANTE IT Support</GivenName>
-    <EmailAddress>mailto:DANTEITSupport@dante.net</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>DANTE IT</GivenName>
-    <EmailAddress>mailto:it@dante.net</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/uat-adfs.geant.net.xml b/swamid-interfederations-2.0/uat-adfs.geant.net.xml
deleted file mode 100644
index fdee8bc4..00000000
--- a/swamid-interfederations-2.0/uat-adfs.geant.net.xml
+++ /dev/null
@@ -1,162 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="http://uat-adfs.geant.net/adfs/services/trust">
-  <!--
-		This is a "DANTE" ADFS SP for Delivery of Advanced Network Technology to Europe Limited.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-02-11T17:06:35Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-    </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>
-          <ds:X509Certificate>
-						MIIIojCCB4qgAwIBAgIQfoxrYI8bPClvLVhlQwiU/zANBgkqhkiG9w0BAQUFADA2
-						MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-						U1NMIENBMB4XDTE0MDIwNDAwMDAwMFoXDTE3MDIwMzIzNTk1OVowPzEhMB8GA1UE
-						CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRowGAYDVQQDExF1YXQtd3d3Lmdl
-						YW50Lm5ldDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAL5OW7kGWzND
-						Q5/5RlPlHElH9zXF1L53YVLmi7PCVGgRcUW9X5EH/9obrP4c0MzdlGbC7RYf+9mK
-						77P1ApSlTi00FA7LS4Wf5JythfHvs1YqJQRz1RU8r+AFV4p65UpafSKnk8mx0vcb
-						KcOyo5cMUhhAt72v8rMzMXlNQk9+tM5liLdwOViLUJCRp6ZbwPj2gt+MDWzV8jC3
-						MWmK7OSW19FNOzj3yMlrTnUDDu1J5R8/ICocUzrRDAyq4PdtbAWu2UdbZdfu/ISi
-						Wg7w1CGIhWJMgM4bzZLl02KCo3yEtvLvRuH6u1JUlqFtbV1pDNQ4dW4rrmWuNWgx
-						hWP0Vh5vWdsCAwEAAaOCBaEwggWdMB8GA1UdIwQYMBaAFAy9k2gM896ro0lrKzdX
-						R+qQ47ntMB0GA1UdDgQWBBT8CQHkvrrktHXoJLNb7Az5h7kqTTAOBgNVHQ8BAf8E
-						BAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUH
-						AwIwIgYDVR0gBBswGTANBgsrBgEEAbIxAQICHTAIBgZngQwBAgEwOgYDVR0fBDMw
-						MTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5j
-						cmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRjcy50
-						ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDovL29j
-						c3AudGNzLnRlcmVuYS5vcmcwggRNBgNVHREEggREMIIEQIIRdWF0LXd3dy5nZWFu
-						dC5uZXSCEnVhdC1hZGZzLmRhbnRlLm5ldIISdWF0LWFkZnMuZ2VhbnQubmV0ghV1
-						YXQtYXJjaGl2ZS5kYW50ZS5uZXSCFnVhdC1hdXRvYmFobi5nZWFudC5uZXSCEXVh
-						dC1ib2QuZ2VhbnQubmV0ghN1YXQtY2FyZW4uZGFudGUubmV0ghN1YXQtY2xvdWQu
-						Z2VhbnQubmV0ghR1YXQtY2xvdWRzLmdlYW50Lm5ldIISdWF0LWNuaXMuZ2VhbnQu
-						bmV0ghd1YXQtY29tbXVuaXR5LmRhbnRlLm5ldIIXdWF0LWNvbW11bml0eS5nZWFu
-						dC5uZXSCEHVhdC1lYy5kYW50ZS5uZXSCEHVhdC1lYy5nZWFudC5uZXSCFXVhdC1l
-						ZHVjb25mLmdlYW50Lm5ldIIVdWF0LWVkdWdhaW4uZ2VhbnQubmV0ghV1YXQtZWR1
-						cGVydC5nZWFudC5uZXSCFHVhdC1lZHVwa2kuZ2VhbnQubmV0ghB1YXQtZXUuZGFu
-						dGUubmV0ghB1YXQtZXUuZ2VhbnQubmV0giV1YXQtZ2VhbnQzLWludHJhbmV0LmFy
-						Y2hpdmUuZ2VhbnQubmV0ghx1YXQtZ2VhbnQzLmFyY2hpdmUuZ2VhbnQubmV0ghJ1
-						YXQtZ2lkcC5nZWFudC5uZXSCFXVhdC1pLXNoYXJlLmdlYW50Lm5ldIIddWF0LWlu
-						dHJhbmV0LmFmcmljYWNvbm5lY3QuZXWCHHVhdC1pbnRyYW5ldC5jYXJlbi5kYW50
-						ZS5uZXSCFnVhdC1pbnRyYW5ldC5kYW50ZS5uZXSCHnVhdC1pbnRyYW5ldC5ldW1l
-						ZGNvbm5lY3QzLm5ldIIWdWF0LWludHJhbmV0LmdlYW50Lm5ldIIWdWF0LWludHJh
-						bmV0LnRlaW4zLm5ldIISdWF0LW1kc2QuZ2VhbnQubmV0ghJ1YXQtbmV3cy5kYW50
-						ZS5uZXSCEnVhdC1uZXdzLmdlYW50Lm5ldIIVdWF0LXBhcnRuZXIuZ2VhbnQubmV0
-						ghd1YXQtcGVyZnNvbmFyLmdlYW50Lm5ldIIRdWF0LXBsbS5nZWFudC5uZXSCFnVh
-						dC1zZXJ2aWNlcy5nZWFudC5uZXSCGHVhdC13YXZlbGVuZ3RoLmdlYW50Lm5ldIIW
-						dWF0LXdlYmxvZ2luLmRhbnRlLm5ldIIWdWF0LXdlYmxvZ2luLmdlYW50Lm5ldIIX
-						dWF0LXdlYmxvZ2luMi5kYW50ZS5uZXSCF3VhdC13ZWJsb2dpbjIuZ2VhbnQubmV0
-						ghh1YXQtd3d3LmFmcmljYWNvbm5lY3QuZXWCEXVhdC13d3cuZGFudGUubmV0ghl1
-						YXQtd3d3LmV1bWVkY29ubmVjdDMubmV0ghV1YXQtd3d3LmdlYW50b3Blbi5uZXSC
-						EXVhdC13d3cudGVpbjMubmV0MA0GCSqGSIb3DQEBBQUAA4IBAQCBhFhaVetfTvO6
-						i09vIxNWRlO5kFxXzeVDuHbm351hshNBdkKn+wIynpGOr55RrbO9N3DeupyxD7yL
-						bAOmoo72KXi1hfWfHavmKEn4eYbkvGfa6tWhudLWUg53R2ddXFlEpjR476Ydw4K0
-						GxbHcI1+XRKqrKEaxbqxhonQL98tW3QPLMTApJgQ4pyP3WY/jTW4B24Y7mrVNIIq
-						eTvZVDJJOberCcq9MDxZsF5RYOeVgKpkuT8XbDr4xKXkgmmGRsMx3eRKntEj7EfC
-						0eNbLLVlydzw/rOP2UPXDsSmb8DEUMD12OSi+Nq7/0MBgmYtNqesmiqI2cxmjIE9
-						MuFyz7mc
-					</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>
-						MIIIojCCB4qgAwIBAgIQfoxrYI8bPClvLVhlQwiU/zANBgkqhkiG9w0BAQUFADA2
-						MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-						U1NMIENBMB4XDTE0MDIwNDAwMDAwMFoXDTE3MDIwMzIzNTk1OVowPzEhMB8GA1UE
-						CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRowGAYDVQQDExF1YXQtd3d3Lmdl
-						YW50Lm5ldDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAL5OW7kGWzND
-						Q5/5RlPlHElH9zXF1L53YVLmi7PCVGgRcUW9X5EH/9obrP4c0MzdlGbC7RYf+9mK
-						77P1ApSlTi00FA7LS4Wf5JythfHvs1YqJQRz1RU8r+AFV4p65UpafSKnk8mx0vcb
-						KcOyo5cMUhhAt72v8rMzMXlNQk9+tM5liLdwOViLUJCRp6ZbwPj2gt+MDWzV8jC3
-						MWmK7OSW19FNOzj3yMlrTnUDDu1J5R8/ICocUzrRDAyq4PdtbAWu2UdbZdfu/ISi
-						Wg7w1CGIhWJMgM4bzZLl02KCo3yEtvLvRuH6u1JUlqFtbV1pDNQ4dW4rrmWuNWgx
-						hWP0Vh5vWdsCAwEAAaOCBaEwggWdMB8GA1UdIwQYMBaAFAy9k2gM896ro0lrKzdX
-						R+qQ47ntMB0GA1UdDgQWBBT8CQHkvrrktHXoJLNb7Az5h7kqTTAOBgNVHQ8BAf8E
-						BAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUH
-						AwIwIgYDVR0gBBswGTANBgsrBgEEAbIxAQICHTAIBgZngQwBAgEwOgYDVR0fBDMw
-						MTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5j
-						cmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRjcy50
-						ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDovL29j
-						c3AudGNzLnRlcmVuYS5vcmcwggRNBgNVHREEggREMIIEQIIRdWF0LXd3dy5nZWFu
-						dC5uZXSCEnVhdC1hZGZzLmRhbnRlLm5ldIISdWF0LWFkZnMuZ2VhbnQubmV0ghV1
-						YXQtYXJjaGl2ZS5kYW50ZS5uZXSCFnVhdC1hdXRvYmFobi5nZWFudC5uZXSCEXVh
-						dC1ib2QuZ2VhbnQubmV0ghN1YXQtY2FyZW4uZGFudGUubmV0ghN1YXQtY2xvdWQu
-						Z2VhbnQubmV0ghR1YXQtY2xvdWRzLmdlYW50Lm5ldIISdWF0LWNuaXMuZ2VhbnQu
-						bmV0ghd1YXQtY29tbXVuaXR5LmRhbnRlLm5ldIIXdWF0LWNvbW11bml0eS5nZWFu
-						dC5uZXSCEHVhdC1lYy5kYW50ZS5uZXSCEHVhdC1lYy5nZWFudC5uZXSCFXVhdC1l
-						ZHVjb25mLmdlYW50Lm5ldIIVdWF0LWVkdWdhaW4uZ2VhbnQubmV0ghV1YXQtZWR1
-						cGVydC5nZWFudC5uZXSCFHVhdC1lZHVwa2kuZ2VhbnQubmV0ghB1YXQtZXUuZGFu
-						dGUubmV0ghB1YXQtZXUuZ2VhbnQubmV0giV1YXQtZ2VhbnQzLWludHJhbmV0LmFy
-						Y2hpdmUuZ2VhbnQubmV0ghx1YXQtZ2VhbnQzLmFyY2hpdmUuZ2VhbnQubmV0ghJ1
-						YXQtZ2lkcC5nZWFudC5uZXSCFXVhdC1pLXNoYXJlLmdlYW50Lm5ldIIddWF0LWlu
-						dHJhbmV0LmFmcmljYWNvbm5lY3QuZXWCHHVhdC1pbnRyYW5ldC5jYXJlbi5kYW50
-						ZS5uZXSCFnVhdC1pbnRyYW5ldC5kYW50ZS5uZXSCHnVhdC1pbnRyYW5ldC5ldW1l
-						ZGNvbm5lY3QzLm5ldIIWdWF0LWludHJhbmV0LmdlYW50Lm5ldIIWdWF0LWludHJh
-						bmV0LnRlaW4zLm5ldIISdWF0LW1kc2QuZ2VhbnQubmV0ghJ1YXQtbmV3cy5kYW50
-						ZS5uZXSCEnVhdC1uZXdzLmdlYW50Lm5ldIIVdWF0LXBhcnRuZXIuZ2VhbnQubmV0
-						ghd1YXQtcGVyZnNvbmFyLmdlYW50Lm5ldIIRdWF0LXBsbS5nZWFudC5uZXSCFnVh
-						dC1zZXJ2aWNlcy5nZWFudC5uZXSCGHVhdC13YXZlbGVuZ3RoLmdlYW50Lm5ldIIW
-						dWF0LXdlYmxvZ2luLmRhbnRlLm5ldIIWdWF0LXdlYmxvZ2luLmdlYW50Lm5ldIIX
-						dWF0LXdlYmxvZ2luMi5kYW50ZS5uZXSCF3VhdC13ZWJsb2dpbjIuZ2VhbnQubmV0
-						ghh1YXQtd3d3LmFmcmljYWNvbm5lY3QuZXWCEXVhdC13d3cuZGFudGUubmV0ghl1
-						YXQtd3d3LmV1bWVkY29ubmVjdDMubmV0ghV1YXQtd3d3LmdlYW50b3Blbi5uZXSC
-						EXVhdC13d3cudGVpbjMubmV0MA0GCSqGSIb3DQEBBQUAA4IBAQCBhFhaVetfTvO6
-						i09vIxNWRlO5kFxXzeVDuHbm351hshNBdkKn+wIynpGOr55RrbO9N3DeupyxD7yL
-						bAOmoo72KXi1hfWfHavmKEn4eYbkvGfa6tWhudLWUg53R2ddXFlEpjR476Ydw4K0
-						GxbHcI1+XRKqrKEaxbqxhonQL98tW3QPLMTApJgQ4pyP3WY/jTW4B24Y7mrVNIIq
-						eTvZVDJJOberCcq9MDxZsF5RYOeVgKpkuT8XbDr4xKXkgmmGRsMx3eRKntEj7EfC
-						0eNbLLVlydzw/rOP2UPXDsSmb8DEUMD12OSi+Nq7/0MBgmYtNqesmiqI2cxmjIE9
-						MuFyz7mc
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://uat-adfs.geant.net/adfs/ls/"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://uat-adfs.geant.net/adfs/ls/"/>
-    <NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</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" 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>
-    <OrganizationDisplayName xml:lang="en">DANTE</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.dante.net/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>DANTE IT Support</GivenName>
-    <EmailAddress>mailto:DANTEITSupport@dante.net</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>DANTE IT</GivenName>
-    <EmailAddress>mailto:it@dante.net</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/uat-bod-gui.geant.net-autobahn-gui.xml b/swamid-interfederations-2.0/uat-bod-gui.geant.net-autobahn-gui.xml
deleted file mode 100644
index a26aa417..00000000
--- a/swamid-interfederations-2.0/uat-bod-gui.geant.net-autobahn-gui.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://uat-bod-gui.geant.net/autobahn-gui">
-  <!--
-		This is a "UAT BoD Portal" autobahn-gui SP for Delivery of Advanced Network Technology to Europe Limited.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-09-19T16:01:38Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </Extensions>
-  <SPSSODescriptor AuthnRequestsSigned="true" 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">BoD Portal</mdui:DisplayName>
-        <mdui:Description xml:lang="en">A Portal that can be used to access the BoD service for requesting circuit reservations, tracking their status and for administrative operation</mdui:Description>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDMjCCAhqgAwIBAgIJAMEuy+eDkc/OMA0GCSqGSIb3DQEBBQUAMCAxHjAcBgNV
-						BAMTFXVhdC1ib2QtZ3VpLmdlYW50Lm5ldDAeFw0xNDA0MTExNTEwMTRaFw0xNzA0
-						MTExNTEwMTRaMCAxHjAcBgNVBAMTFXVhdC1ib2QtZ3VpLmdlYW50Lm5ldDCCASIw
-						DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAL9lmeNqQLqsIvz+9wIHTQ01unef
-						zHS+ydVbDDdDAt9+GbKGtQMzkEKdDCQP/OVR4oFJoy26YZO2wC3LcgfcYsZn2RNV
-						9de4Y/Wyov/LOulVAtxiPBkcMuBpdDiyeHc04dI29BDAk4A9b/oh2DRLOSOr0X6n
-						SxYlVdoRqlsNlvt5P94O5Y+iywszr+fSWkg4wXnBbhU5wz8WiMajAhwSUv/WihTn
-						0kjbBPCC/oB9X4rInBWPavZlq/vLT+Xs90c/ouu+uDC2xtGopR9mk/tZZUw6VT+w
-						x6TOgSPPVBONVYcVn068Ea8L0fIDvKJUglVOhNnLo4SikRNP6Q6o+vSz5LsCAwEA
-						AaNvMG0wTAYDVR0RBEUwQ4IVdWF0LWJvZC1ndWkuZ2VhbnQubmV0hipodHRwczov
-						L3VhdC1ib2QtZ3VpLmdlYW50Lm5ldC9hdXRvYmFobi1ndWkwHQYDVR0OBBYEFDx7
-						wMI5VKSZDqbH18/emvgkpgogMA0GCSqGSIb3DQEBBQUAA4IBAQCxq8PPlNcMoFdK
-						BCMG8N+ZxA540tGHaaiEdBWutqQ29csBJn/c2BKdcP1P+A71lQKQrDOQUIZ0DHTi
-						KyVVjDeavoVZndhGLZuviHK4CJU7uON15fEzz2mu3tBm1H2i7bVDjG3Quh/TAar7
-						VnGDY6tHLG2vktHHIsXWxidajHIilI8XF14wC+Eoe8nt9ot2xJ0GxYzKcgu6wYUc
-						JTse+N5A0mRv40kor80ySUbJ+U4CrvelDlpaj+PmlcR5k4aSQ05prZnjWViRpQo+
-						qayfadpzImYfGj+E07YDQHoTy4kj2u8mVk5VLlC/zpAZ5E6lz8Sf5+ESYL3TYcAa
-						xYkpdcr0
-					</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>
-						MIIDMjCCAhqgAwIBAgIJAMEuy+eDkc/OMA0GCSqGSIb3DQEBBQUAMCAxHjAcBgNV
-						BAMTFXVhdC1ib2QtZ3VpLmdlYW50Lm5ldDAeFw0xNDA0MTExNTEwMTRaFw0xNzA0
-						MTExNTEwMTRaMCAxHjAcBgNVBAMTFXVhdC1ib2QtZ3VpLmdlYW50Lm5ldDCCASIw
-						DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAL9lmeNqQLqsIvz+9wIHTQ01unef
-						zHS+ydVbDDdDAt9+GbKGtQMzkEKdDCQP/OVR4oFJoy26YZO2wC3LcgfcYsZn2RNV
-						9de4Y/Wyov/LOulVAtxiPBkcMuBpdDiyeHc04dI29BDAk4A9b/oh2DRLOSOr0X6n
-						SxYlVdoRqlsNlvt5P94O5Y+iywszr+fSWkg4wXnBbhU5wz8WiMajAhwSUv/WihTn
-						0kjbBPCC/oB9X4rInBWPavZlq/vLT+Xs90c/ouu+uDC2xtGopR9mk/tZZUw6VT+w
-						x6TOgSPPVBONVYcVn068Ea8L0fIDvKJUglVOhNnLo4SikRNP6Q6o+vSz5LsCAwEA
-						AaNvMG0wTAYDVR0RBEUwQ4IVdWF0LWJvZC1ndWkuZ2VhbnQubmV0hipodHRwczov
-						L3VhdC1ib2QtZ3VpLmdlYW50Lm5ldC9hdXRvYmFobi1ndWkwHQYDVR0OBBYEFDx7
-						wMI5VKSZDqbH18/emvgkpgogMA0GCSqGSIb3DQEBBQUAA4IBAQCxq8PPlNcMoFdK
-						BCMG8N+ZxA540tGHaaiEdBWutqQ29csBJn/c2BKdcP1P+A71lQKQrDOQUIZ0DHTi
-						KyVVjDeavoVZndhGLZuviHK4CJU7uON15fEzz2mu3tBm1H2i7bVDjG3Quh/TAar7
-						VnGDY6tHLG2vktHHIsXWxidajHIilI8XF14wC+Eoe8nt9ot2xJ0GxYzKcgu6wYUc
-						JTse+N5A0mRv40kor80ySUbJ+U4CrvelDlpaj+PmlcR5k4aSQ05prZnjWViRpQo+
-						qayfadpzImYfGj+E07YDQHoTy4kj2u8mVk5VLlC/zpAZ5E6lz8Sf5+ESYL3TYcAa
-						xYkpdcr0
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://uat-bod-gui.geant.net/autobahn-gui/saml/LogoutServiceHTTPRedirect" ResponseLocation="https://uat-bod-gui.geant.net/autobahn-gui/saml/LogoutServiceHTTPRedirectResponse"/>
-    <NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</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" Location="https://uat-bod-gui.geant.net/autobahn-gui/saml/SAMLAssertionConsumer" index="0" isDefault="true"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://uat-bod-gui.geant.net/autobahn-gui/saml/SAMLAssertionConsumer" index="1"/>
-    <AttributeConsumingService index="1">
-      <ServiceName xml:lang="en">BoD Portal</ServiceName>
-      <ServiceDescription xml:lang="en">A Portal that can be used to access the BoD service for requesting circuit reservations, tracking their status and for administrative operation</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="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="false"/>
-      <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="false"/>
-    </AttributeConsumingService>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Delivery of Advanced Network Technology to Europe Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">DANTE</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.dante.net</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <Company>DANTE IT Support</Company>
-    <EmailAddress>mailto:DANTEITSupport@dante.net</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <Company>DANTE IT</Company>
-    <EmailAddress>mailto:it@dante.net</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/uat-bod-gui.geant.net.xml b/swamid-interfederations-2.0/uat-bod-gui.geant.net.xml
deleted file mode 100644
index a26aa417..00000000
--- a/swamid-interfederations-2.0/uat-bod-gui.geant.net.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://uat-bod-gui.geant.net/autobahn-gui">
-  <!--
-		This is a "UAT BoD Portal" autobahn-gui SP for Delivery of Advanced Network Technology to Europe Limited.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-09-19T16:01:38Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </Extensions>
-  <SPSSODescriptor AuthnRequestsSigned="true" 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">BoD Portal</mdui:DisplayName>
-        <mdui:Description xml:lang="en">A Portal that can be used to access the BoD service for requesting circuit reservations, tracking their status and for administrative operation</mdui:Description>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDMjCCAhqgAwIBAgIJAMEuy+eDkc/OMA0GCSqGSIb3DQEBBQUAMCAxHjAcBgNV
-						BAMTFXVhdC1ib2QtZ3VpLmdlYW50Lm5ldDAeFw0xNDA0MTExNTEwMTRaFw0xNzA0
-						MTExNTEwMTRaMCAxHjAcBgNVBAMTFXVhdC1ib2QtZ3VpLmdlYW50Lm5ldDCCASIw
-						DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAL9lmeNqQLqsIvz+9wIHTQ01unef
-						zHS+ydVbDDdDAt9+GbKGtQMzkEKdDCQP/OVR4oFJoy26YZO2wC3LcgfcYsZn2RNV
-						9de4Y/Wyov/LOulVAtxiPBkcMuBpdDiyeHc04dI29BDAk4A9b/oh2DRLOSOr0X6n
-						SxYlVdoRqlsNlvt5P94O5Y+iywszr+fSWkg4wXnBbhU5wz8WiMajAhwSUv/WihTn
-						0kjbBPCC/oB9X4rInBWPavZlq/vLT+Xs90c/ouu+uDC2xtGopR9mk/tZZUw6VT+w
-						x6TOgSPPVBONVYcVn068Ea8L0fIDvKJUglVOhNnLo4SikRNP6Q6o+vSz5LsCAwEA
-						AaNvMG0wTAYDVR0RBEUwQ4IVdWF0LWJvZC1ndWkuZ2VhbnQubmV0hipodHRwczov
-						L3VhdC1ib2QtZ3VpLmdlYW50Lm5ldC9hdXRvYmFobi1ndWkwHQYDVR0OBBYEFDx7
-						wMI5VKSZDqbH18/emvgkpgogMA0GCSqGSIb3DQEBBQUAA4IBAQCxq8PPlNcMoFdK
-						BCMG8N+ZxA540tGHaaiEdBWutqQ29csBJn/c2BKdcP1P+A71lQKQrDOQUIZ0DHTi
-						KyVVjDeavoVZndhGLZuviHK4CJU7uON15fEzz2mu3tBm1H2i7bVDjG3Quh/TAar7
-						VnGDY6tHLG2vktHHIsXWxidajHIilI8XF14wC+Eoe8nt9ot2xJ0GxYzKcgu6wYUc
-						JTse+N5A0mRv40kor80ySUbJ+U4CrvelDlpaj+PmlcR5k4aSQ05prZnjWViRpQo+
-						qayfadpzImYfGj+E07YDQHoTy4kj2u8mVk5VLlC/zpAZ5E6lz8Sf5+ESYL3TYcAa
-						xYkpdcr0
-					</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>
-						MIIDMjCCAhqgAwIBAgIJAMEuy+eDkc/OMA0GCSqGSIb3DQEBBQUAMCAxHjAcBgNV
-						BAMTFXVhdC1ib2QtZ3VpLmdlYW50Lm5ldDAeFw0xNDA0MTExNTEwMTRaFw0xNzA0
-						MTExNTEwMTRaMCAxHjAcBgNVBAMTFXVhdC1ib2QtZ3VpLmdlYW50Lm5ldDCCASIw
-						DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAL9lmeNqQLqsIvz+9wIHTQ01unef
-						zHS+ydVbDDdDAt9+GbKGtQMzkEKdDCQP/OVR4oFJoy26YZO2wC3LcgfcYsZn2RNV
-						9de4Y/Wyov/LOulVAtxiPBkcMuBpdDiyeHc04dI29BDAk4A9b/oh2DRLOSOr0X6n
-						SxYlVdoRqlsNlvt5P94O5Y+iywszr+fSWkg4wXnBbhU5wz8WiMajAhwSUv/WihTn
-						0kjbBPCC/oB9X4rInBWPavZlq/vLT+Xs90c/ouu+uDC2xtGopR9mk/tZZUw6VT+w
-						x6TOgSPPVBONVYcVn068Ea8L0fIDvKJUglVOhNnLo4SikRNP6Q6o+vSz5LsCAwEA
-						AaNvMG0wTAYDVR0RBEUwQ4IVdWF0LWJvZC1ndWkuZ2VhbnQubmV0hipodHRwczov
-						L3VhdC1ib2QtZ3VpLmdlYW50Lm5ldC9hdXRvYmFobi1ndWkwHQYDVR0OBBYEFDx7
-						wMI5VKSZDqbH18/emvgkpgogMA0GCSqGSIb3DQEBBQUAA4IBAQCxq8PPlNcMoFdK
-						BCMG8N+ZxA540tGHaaiEdBWutqQ29csBJn/c2BKdcP1P+A71lQKQrDOQUIZ0DHTi
-						KyVVjDeavoVZndhGLZuviHK4CJU7uON15fEzz2mu3tBm1H2i7bVDjG3Quh/TAar7
-						VnGDY6tHLG2vktHHIsXWxidajHIilI8XF14wC+Eoe8nt9ot2xJ0GxYzKcgu6wYUc
-						JTse+N5A0mRv40kor80ySUbJ+U4CrvelDlpaj+PmlcR5k4aSQ05prZnjWViRpQo+
-						qayfadpzImYfGj+E07YDQHoTy4kj2u8mVk5VLlC/zpAZ5E6lz8Sf5+ESYL3TYcAa
-						xYkpdcr0
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://uat-bod-gui.geant.net/autobahn-gui/saml/LogoutServiceHTTPRedirect" ResponseLocation="https://uat-bod-gui.geant.net/autobahn-gui/saml/LogoutServiceHTTPRedirectResponse"/>
-    <NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</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" Location="https://uat-bod-gui.geant.net/autobahn-gui/saml/SAMLAssertionConsumer" index="0" isDefault="true"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://uat-bod-gui.geant.net/autobahn-gui/saml/SAMLAssertionConsumer" index="1"/>
-    <AttributeConsumingService index="1">
-      <ServiceName xml:lang="en">BoD Portal</ServiceName>
-      <ServiceDescription xml:lang="en">A Portal that can be used to access the BoD service for requesting circuit reservations, tracking their status and for administrative operation</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="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="false"/>
-      <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="false"/>
-    </AttributeConsumingService>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Delivery of Advanced Network Technology to Europe Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">DANTE</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.dante.net</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <Company>DANTE IT Support</Company>
-    <EmailAddress>mailto:DANTEITSupport@dante.net</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <Company>DANTE IT</Company>
-    <EmailAddress>mailto:it@dante.net</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/uat.leeds1.emeraldinsight.com-entity.xml b/swamid-interfederations-2.0/uat.leeds1.emeraldinsight.com-entity.xml
deleted file mode 100644
index 8d1fdc15..00000000
--- a/swamid-interfederations-2.0/uat.leeds1.emeraldinsight.com-entity.xml
+++ /dev/null
@@ -1,155 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://uat.leeds1.emeraldinsight.com/entity">
-  <!--
-		This is an 'Emerald UAT Site' Shibboleth SP for Emerald Group Publishing Ltd.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2009-05-06T16:03:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </Extensions>
-  <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">
-    <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://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/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://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/DS/UKFederation" 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://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/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://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/DS/Kalmar2" 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://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/DS/Wayf"/>
-      <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://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/DS/Wayf" 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://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/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://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/WAYF/dfn"/>
-      <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://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/WAYF/dfn" 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://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/TestShib"/>
-      <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://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/wayf-test"/>
-      <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://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/dfn-test"/>
-      <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://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/dfn-test2"/>
-      <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://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/WAYF/dfn-test"/>
-      <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://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/WAYF/dfn-test" 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://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/abu"/>
-      <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://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/asc"/>
-      <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://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/aru"/>
-      <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://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/asu"/>
-      <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://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/bsu"/>
-      <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://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/bmu"/>
-      <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://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/blc"/>
-      <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://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/bfc"/>
-      <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://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/brc"/>
-      <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://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/bru"/>
-      <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://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/bnu"/>
-      <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://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/cac"/>
-      <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://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/chc"/>
-      <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://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/cmj"/>
-      <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://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/cru"/>
-      <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://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/dmu"/>
-      <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://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/doc"/>
-      <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://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/enu"/>
-      <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://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/icl"/>
-      <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://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/kiu"/>
-      <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://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/lsbu"/>
-      <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://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/mmu"/>
-      <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://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/nec"/>
-      <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://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/ncn"/>
-      <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://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/nrc"/>
-      <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://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/nou"/>
-      <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://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/ntu"/>
-      <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://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/qmu"/>
-      <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://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/qmul"/>
-      <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://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/rgu"/>
-      <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://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/rou"/>
-      <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://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/shu"/>
-      <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://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/ssu"/>
-      <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://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/shu"/>
-      <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://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/tvu"/>
-      <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://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/uls"/>
-      <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://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/umi"/>
-      <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://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/urhb"/>
-      <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://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/uab"/>
-      <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://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/uad"/>
-      <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://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/ube"/>
-      <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://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/ubi"/>
-      <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://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/ubr"/>
-      <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://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/ubri"/>
-      <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://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/uco"/>
-      <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://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/ucu"/>
-      <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://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/ugl"/>
-      <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://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/uglo"/>
-      <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://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/ulo"/>
-      <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://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/uma"/>
-      <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://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/unut"/>
-      <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://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/uno"/>
-      <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://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/upo"/>
-      <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://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/ure"/>
-      <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://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/uso"/>
-      <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://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/usa"/>
-      <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://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/ust"/>
-      <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://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/ustr"/>
-      <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://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/ute"/>
-      <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://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/ual"/>
-      <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://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/uwi"/>
-      <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://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/uwne"/>
-      <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://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/uwtsd"/>
-      <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://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/uwa"/>
-      <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://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/uwe"/>
-      <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://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/uyo"/>
-      <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://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/wac"/>
-      <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://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/wel"/>
-      <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://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/wcc"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDWzCCAkOgAwIBAgIJAOAh4h4v+OW9MA0GCSqGSIb3DQEBBQUAMC0xKzApBgNV
-						BAMTImVtLXVhdC1yaC1zdnIwMy5lbWVyYWxkaW5zaWdodC5jb20wHhcNMTEwNzI3
-						MTQyNjE0WhcNMjEwNzI0MTQyNjE0WjAtMSswKQYDVQQDEyJlbS11YXQtcmgtc3Zy
-						MDMuZW1lcmFsZGluc2lnaHQuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
-						CgKCAQEAnGjTgEi/bQRHpc9poXHq5QlfQomoyoCO5et3+VB4J65HOpP/PkxPE6ah
-						kBTrzJstsD7SDatrcRM2aL28yjT+pj+mHR0x57JIMH8bC64Wy6xxC2/aj1dBZ1J8
-						xo4tLJuy3ojfb7eNSHg8UuJO3pRWIC3TtzXJfQuNiTY/8M32u3i4aY+1rss87BQ6
-						F+4G4MDC7EnjEm0f28WtweCC9+S5sm3AuxVEAwJuLMYJLJPfz5tgwDKYAeU9DmST
-						kLiPgzr1roGEd6Bz6/o6t8rbaSUX4S7Dk6K/gVAJf9wFFvina/M2krLJC0yODqXY
-						p2/8hVVm3uw02XRULx6nv8VRzQ+iuwIDAQABo34wfDBbBgNVHREEVDBSgiJlbS11
-						YXQtcmgtc3ZyMDMuZW1lcmFsZGluc2lnaHQuY29thixodHRwczovL3VhdC5sZWVk
-						czEuZW1lcmFsZGluc2lnaHQuY29tL2VudGl0eTAdBgNVHQ4EFgQUwEzN/hOiH7zK
-						9Mrx+j9GNUPpbUEwDQYJKoZIhvcNAQEFBQADggEBABmXktnHYciTi91g9J/lveDc
-						ZwLUQ9gwi/CrLe1SX1vxI9Zou1qt4WEVXcltofO5JQ4wbbJKOgB6avy56iY6qAcw
-						+3A16o6lZHP+0Q/pomdZPiIxHCe5ZVjlk9OXhBRiAZiY9dI1VNKM3suGkGsDoQQm
-						dojusN4+Hfv/E2gQi4iCJWmWvUbT7rTNkyVeWGBMEUJRCCAHUP5aZcqMVGwqvVlG
-						RqkhtZpBnQu/XTEhKw9xhlpid8XUUEwAz+hfY/Hzf1YhyKCmLc9q709/sPOfnqTq
-						ONpDCEUvKV32/tyP4qR7RwMnwVEtN29Vrc9XZQ+n6zgm47u4WotML5m4gmr0Wqw=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://uat.leeds1.emeraldinsight.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://uat.leeds1.emeraldinsight.com/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://uat.leeds1.emeraldinsight.com/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://uat.leeds1.emeraldinsight.com/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://uat.leeds1.emeraldinsight.com/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://uat.leeds1.emeraldinsight.com/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://uat.leeds1.emeraldinsight.com/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://uat.leeds1.emeraldinsight.com/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://uat.leeds1.emeraldinsight.com/Shibboleth.sso/NIM/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://uat.leeds1.emeraldinsight.com/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://uat.leeds1.emeraldinsight.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://uat.leeds1.emeraldinsight.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://uat.leeds1.emeraldinsight.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://uat.leeds1.emeraldinsight.com/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://uat.leeds1.emeraldinsight.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Emerald Group Publishing Ltd</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Emerald Group Publishing Ltd: UAT Site</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://uat.leeds1.emeraldinsight.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Rob</GivenName>
-    <SurName>Wood</SurName>
-    <EmailAddress>mailto:rwood@emeraldinsight.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Laurence</GivenName>
-    <SurName>Parkin</SurName>
-    <EmailAddress>mailto:lparkin@emeraldinsight.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/uat.leeds1.emeraldinsight.com.xml b/swamid-interfederations-2.0/uat.leeds1.emeraldinsight.com.xml
deleted file mode 100644
index 8d1fdc15..00000000
--- a/swamid-interfederations-2.0/uat.leeds1.emeraldinsight.com.xml
+++ /dev/null
@@ -1,155 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://uat.leeds1.emeraldinsight.com/entity">
-  <!--
-		This is an 'Emerald UAT Site' Shibboleth SP for Emerald Group Publishing Ltd.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2009-05-06T16:03:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </Extensions>
-  <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">
-    <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://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/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://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/DS/UKFederation" 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://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/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://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/DS/Kalmar2" 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://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/DS/Wayf"/>
-      <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://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/DS/Wayf" 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://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/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://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/WAYF/dfn"/>
-      <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://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/WAYF/dfn" 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://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/TestShib"/>
-      <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://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/wayf-test"/>
-      <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://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/dfn-test"/>
-      <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://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/dfn-test2"/>
-      <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://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/WAYF/dfn-test"/>
-      <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://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/WAYF/dfn-test" 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://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/abu"/>
-      <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://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/asc"/>
-      <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://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/aru"/>
-      <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://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/asu"/>
-      <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://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/bsu"/>
-      <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://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/bmu"/>
-      <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://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/blc"/>
-      <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://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/bfc"/>
-      <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://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/brc"/>
-      <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://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/bru"/>
-      <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://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/bnu"/>
-      <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://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/cac"/>
-      <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://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/chc"/>
-      <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://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/cmj"/>
-      <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://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/cru"/>
-      <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://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/dmu"/>
-      <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://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/doc"/>
-      <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://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/enu"/>
-      <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://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/icl"/>
-      <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://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/kiu"/>
-      <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://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/lsbu"/>
-      <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://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/mmu"/>
-      <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://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/nec"/>
-      <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://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/ncn"/>
-      <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://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/nrc"/>
-      <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://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/nou"/>
-      <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://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/ntu"/>
-      <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://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/qmu"/>
-      <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://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/qmul"/>
-      <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://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/rgu"/>
-      <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://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/rou"/>
-      <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://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/shu"/>
-      <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://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/ssu"/>
-      <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://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/shu"/>
-      <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://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/tvu"/>
-      <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://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/uls"/>
-      <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://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/umi"/>
-      <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://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/urhb"/>
-      <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://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/uab"/>
-      <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://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/uad"/>
-      <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://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/ube"/>
-      <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://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/ubi"/>
-      <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://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/ubr"/>
-      <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://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/ubri"/>
-      <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://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/uco"/>
-      <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://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/ucu"/>
-      <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://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/ugl"/>
-      <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://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/uglo"/>
-      <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://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/ulo"/>
-      <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://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/uma"/>
-      <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://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/unut"/>
-      <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://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/uno"/>
-      <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://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/upo"/>
-      <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://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/ure"/>
-      <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://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/uso"/>
-      <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://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/usa"/>
-      <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://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/ust"/>
-      <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://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/ustr"/>
-      <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://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/ute"/>
-      <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://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/ual"/>
-      <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://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/uwi"/>
-      <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://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/uwne"/>
-      <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://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/uwtsd"/>
-      <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://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/uwa"/>
-      <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://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/uwe"/>
-      <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://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/uyo"/>
-      <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://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/wac"/>
-      <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://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/wel"/>
-      <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://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/wcc"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDWzCCAkOgAwIBAgIJAOAh4h4v+OW9MA0GCSqGSIb3DQEBBQUAMC0xKzApBgNV
-						BAMTImVtLXVhdC1yaC1zdnIwMy5lbWVyYWxkaW5zaWdodC5jb20wHhcNMTEwNzI3
-						MTQyNjE0WhcNMjEwNzI0MTQyNjE0WjAtMSswKQYDVQQDEyJlbS11YXQtcmgtc3Zy
-						MDMuZW1lcmFsZGluc2lnaHQuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
-						CgKCAQEAnGjTgEi/bQRHpc9poXHq5QlfQomoyoCO5et3+VB4J65HOpP/PkxPE6ah
-						kBTrzJstsD7SDatrcRM2aL28yjT+pj+mHR0x57JIMH8bC64Wy6xxC2/aj1dBZ1J8
-						xo4tLJuy3ojfb7eNSHg8UuJO3pRWIC3TtzXJfQuNiTY/8M32u3i4aY+1rss87BQ6
-						F+4G4MDC7EnjEm0f28WtweCC9+S5sm3AuxVEAwJuLMYJLJPfz5tgwDKYAeU9DmST
-						kLiPgzr1roGEd6Bz6/o6t8rbaSUX4S7Dk6K/gVAJf9wFFvina/M2krLJC0yODqXY
-						p2/8hVVm3uw02XRULx6nv8VRzQ+iuwIDAQABo34wfDBbBgNVHREEVDBSgiJlbS11
-						YXQtcmgtc3ZyMDMuZW1lcmFsZGluc2lnaHQuY29thixodHRwczovL3VhdC5sZWVk
-						czEuZW1lcmFsZGluc2lnaHQuY29tL2VudGl0eTAdBgNVHQ4EFgQUwEzN/hOiH7zK
-						9Mrx+j9GNUPpbUEwDQYJKoZIhvcNAQEFBQADggEBABmXktnHYciTi91g9J/lveDc
-						ZwLUQ9gwi/CrLe1SX1vxI9Zou1qt4WEVXcltofO5JQ4wbbJKOgB6avy56iY6qAcw
-						+3A16o6lZHP+0Q/pomdZPiIxHCe5ZVjlk9OXhBRiAZiY9dI1VNKM3suGkGsDoQQm
-						dojusN4+Hfv/E2gQi4iCJWmWvUbT7rTNkyVeWGBMEUJRCCAHUP5aZcqMVGwqvVlG
-						RqkhtZpBnQu/XTEhKw9xhlpid8XUUEwAz+hfY/Hzf1YhyKCmLc9q709/sPOfnqTq
-						ONpDCEUvKV32/tyP4qR7RwMnwVEtN29Vrc9XZQ+n6zgm47u4WotML5m4gmr0Wqw=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://uat.leeds1.emeraldinsight.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://uat.leeds1.emeraldinsight.com/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://uat.leeds1.emeraldinsight.com/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://uat.leeds1.emeraldinsight.com/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://uat.leeds1.emeraldinsight.com/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://uat.leeds1.emeraldinsight.com/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://uat.leeds1.emeraldinsight.com/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://uat.leeds1.emeraldinsight.com/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://uat.leeds1.emeraldinsight.com/Shibboleth.sso/NIM/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://uat.leeds1.emeraldinsight.com/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://uat.leeds1.emeraldinsight.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://uat.leeds1.emeraldinsight.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://uat.leeds1.emeraldinsight.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://uat.leeds1.emeraldinsight.com/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://uat.leeds1.emeraldinsight.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Emerald Group Publishing Ltd</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Emerald Group Publishing Ltd: UAT Site</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://uat.leeds1.emeraldinsight.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Rob</GivenName>
-    <SurName>Wood</SurName>
-    <EmailAddress>mailto:rwood@emeraldinsight.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Laurence</GivenName>
-    <SurName>Parkin</SurName>
-    <EmailAddress>mailto:lparkin@emeraldinsight.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/ucopia-shib.ensta-bretagne.fr.xml b/swamid-interfederations-2.0/ucopia-shib.ensta-bretagne.fr.xml
deleted file mode 100644
index 908767c5..00000000
--- a/swamid-interfederations-2.0/ucopia-shib.ensta-bretagne.fr.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://ucopia-shib.ensta-bretagne.fr">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2014-03-18T14:19:04Z">
-      <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">ENSTA Bretagne - WiFi EduSpot</mdui:DisplayName>
-        <mdui:Description xml:lang="en">ENSTA Bretagne - WiFi EduSpot</mdui:Description>
-        <mdui:DisplayName xml:lang="fr">ENSTA Bretagne - Portail WiFi EduSpot</mdui:DisplayName>
-        <mdui:Description xml:lang="fr">ENSTA Bretagne - Portail WiFi EduSpot</mdui:Description>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIEhzCCA2+gAwIBAgIQAXISYiAdwfN5w2mDPgJyXzANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTE0MDMxMzAwMDAwMFoXDTE3MDMxMjIzNTk1OVowSzEhMB8GA1UE
-CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMSYwJAYDVQQDEx11Y29waWEtc2hp
-Yi5lbnN0YS1icmV0YWduZS5mcjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
-ggEBALWTpOdlsKt48L1D1ztRAo9flFnNBBzLbAc98Ii22vUHa2o1Liyd4z9CE2g2
-cGuSDpdnQbCVzvXmC6N7HVI69fUk5ZD8ZLNZ1nM/+eZHQvtHWA+GnJO+Or6t3TGJ
-OlTHdXx8jgoWthhMlqqDQAvH97EaRHCjY2DCRnkdJ0jol2gKP3N6oSxM3rfvLxqd
-SCarw41BJfMFDQHcpfgS3yINT20fPjuQpwIkOMw0ybK2voU5/y4FgTbHoPmWfFtu
-OA7NgQkpXfSvuyrqEmDoxsXkdtN4tT6zOrVmrlwbMD5jaxaxr5kTYIohfqTTwL40
-jPSK7Hwa6Ff1F7KGZ6ObyBijlKUCAwEAAaOCAXowggF2MB8GA1UdIwQYMBaAFAy9
-k2gM896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBScd3VJKkSIGpKtCVfjIsroPi2p
-6TAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEF
-BQcDAQYIKwYBBQUHAwIwIgYDVR0gBBswGTANBgsrBgEEAbIxAQICHTAIBgZngQwB
-AgEwOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9U
-RVJFTkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRw
-Oi8vY3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcw
-AYYaaHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwKAYDVR0RBCEwH4IddWNvcGlh
-LXNoaWIuZW5zdGEtYnJldGFnbmUuZnIwDQYJKoZIhvcNAQEFBQADggEBALbJ7uMn
-SVocgEkQFnI0XR1OSgIblCojbRormbjUOPhcxtXAdj9Rnsr9mQU+L+NF05drhE7Q
-1sWotCJ8h+o7bClHJoqz2rvoZdWjA1rMq78+I+WE98TTmcB+qVBYAQL20JIRef6g
-gN/yEOUFjtv1sFSAo/J1jHxA+KNRgxoJaHQX7GrdfzxlrLQkW8pH4XU0TU86U56u
-Fak+2sEaxzBqxs63/YSX79JLE+rutfGuuXAvlK4zlewsUZXGEhJ2RskxzhIkotIv
-uORzsv2UbiGbqUg1EgUyt2aWOxc+qk+PSEkLSpeDjMj5sc66g8JkqnMEW4bumdEE
-77hhE5zuasiDdvw=
-					    </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>
-					      MIIEhzCCA2+gAwIBAgIQAXISYiAdwfN5w2mDPgJyXzANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTE0MDMxMzAwMDAwMFoXDTE3MDMxMjIzNTk1OVowSzEhMB8GA1UE
-CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMSYwJAYDVQQDEx11Y29waWEtc2hp
-Yi5lbnN0YS1icmV0YWduZS5mcjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
-ggEBALWTpOdlsKt48L1D1ztRAo9flFnNBBzLbAc98Ii22vUHa2o1Liyd4z9CE2g2
-cGuSDpdnQbCVzvXmC6N7HVI69fUk5ZD8ZLNZ1nM/+eZHQvtHWA+GnJO+Or6t3TGJ
-OlTHdXx8jgoWthhMlqqDQAvH97EaRHCjY2DCRnkdJ0jol2gKP3N6oSxM3rfvLxqd
-SCarw41BJfMFDQHcpfgS3yINT20fPjuQpwIkOMw0ybK2voU5/y4FgTbHoPmWfFtu
-OA7NgQkpXfSvuyrqEmDoxsXkdtN4tT6zOrVmrlwbMD5jaxaxr5kTYIohfqTTwL40
-jPSK7Hwa6Ff1F7KGZ6ObyBijlKUCAwEAAaOCAXowggF2MB8GA1UdIwQYMBaAFAy9
-k2gM896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBScd3VJKkSIGpKtCVfjIsroPi2p
-6TAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEF
-BQcDAQYIKwYBBQUHAwIwIgYDVR0gBBswGTANBgsrBgEEAbIxAQICHTAIBgZngQwB
-AgEwOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9U
-RVJFTkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRw
-Oi8vY3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcw
-AYYaaHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwKAYDVR0RBCEwH4IddWNvcGlh
-LXNoaWIuZW5zdGEtYnJldGFnbmUuZnIwDQYJKoZIhvcNAQEFBQADggEBALbJ7uMn
-SVocgEkQFnI0XR1OSgIblCojbRormbjUOPhcxtXAdj9Rnsr9mQU+L+NF05drhE7Q
-1sWotCJ8h+o7bClHJoqz2rvoZdWjA1rMq78+I+WE98TTmcB+qVBYAQL20JIRef6g
-gN/yEOUFjtv1sFSAo/J1jHxA+KNRgxoJaHQX7GrdfzxlrLQkW8pH4XU0TU86U56u
-Fak+2sEaxzBqxs63/YSX79JLE+rutfGuuXAvlK4zlewsUZXGEhJ2RskxzhIkotIv
-uORzsv2UbiGbqUg1EgUyt2aWOxc+qk+PSEkLSpeDjMj5sc66g8JkqnMEW4bumdEE
-77hhE5zuasiDdvw=
-					    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://controller.mobile.lan/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://controller.mobile.lan/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AttributeConsumingService index="0">
-      <ServiceName xml:lang="fr">ENSTA Bretagne - Portail WiFi EduSpot</ServiceName>
-      <ServiceName xml:lang="en">ENSTA Bretagne - WiFi EduSpot</ServiceName>
-      <ServiceDescription xml:lang="fr">ENSTA Bretagne - Portail WiFi EduSpot</ServiceDescription>
-      <ServiceDescription xml:lang="en">ENSTA Bretagne - WiFi EduSpot</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">
-        <saml:AttributeValue xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion">Adresse institutionnelle de courriers</saml:AttributeValue>
-      </RequestedAttribute>
-      <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">
-        <saml:AttributeValue xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion">Identifiant Institutionnel</saml:AttributeValue>
-      </RequestedAttribute>
-    </AttributeConsumingService>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">ENSTA Bretagne</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">ENSTA Bretagne</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Jean-Paul KIRKBRIDE</SurName>
-    <EmailAddress>jean-paul.kirkbride@ensta-bretagne.fr</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <SurName>Pierrick VEILLON</SurName>
-    <EmailAddress>pierrick.veillon@ensta-bretagne.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/ufal-point.mff.cuni.cz-shibboleth-eduid-sp.xml b/swamid-interfederations-2.0/ufal-point.mff.cuni.cz-shibboleth-eduid-sp.xml
index 055e2423..8b7b2688 100644
--- a/swamid-interfederations-2.0/ufal-point.mff.cuni.cz-shibboleth-eduid-sp.xml
+++ b/swamid-interfederations-2.0/ufal-point.mff.cuni.cz-shibboleth-eduid-sp.xml
@@ -1,55 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ufal-point.mff.cuni.cz/shibboleth/eduid/sp">
-  <Extensions xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
-    <eduidmd:RepublishRequest xmlns:eduidmd="http://eduid.cz/schema/metadata/1.0">
-      <eduidmd:RepublishTarget>http://edugain.org/</eduidmd:RepublishTarget>
-    </eduidmd:RepublishRequest>
-    <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:AttributeValue>http://eduid.cz/uri/sp-group/clarin</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-    <alg:DigestMethod xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-    <alg:DigestMethod xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-    <alg:DigestMethod xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-    <alg:DigestMethod xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-    <alg:DigestMethod xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-    <alg:SigningMethod xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-    <alg:SigningMethod xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-    <alg:SigningMethod xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-    <alg:SigningMethod xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-    <alg:SigningMethod xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-    <alg:SigningMethod xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-    <alg:SigningMethod xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-    <alg:SigningMethod xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-    <alg:SigningMethod xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-    <alg:SigningMethod xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-    <alg:SigningMethod xmlns:alg="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://www.eduid.cz/" registrationInstant="2010-09-21T15:24:17Z">
-      <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 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">
-    <Extensions xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+<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://ufal-point.mff.cuni.cz/shibboleth/eduid/sp">
+  <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://lindat.mff.cuni.cz/Shibboleth.sso/DS" index="1"/>
+      <mdui:UIInfo>
         <mdui:DisplayName xml:lang="en">LINDAT/CLARIN repository and services</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="cs">Repozitář a služby projektu LINDAT/CLARIN</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Digital repository and services related to the LINDAT/CLARIN project focused on language research infrastructure at the Institute of Formal and Applied Linguistics, Faculty of Mathematics and Physics, Charles University in Prague</mdui:Description>
-        <mdui:Description xml:lang="cs">Repozitář a služby projektu LINDAT/CLARIN zaměřené na podporu výzkumu jazyka na Ústavu formální a aplikované lingvistiky Matematicko-fyzikální fakulty Univerzity Karlovy v Praze</mdui:Description>
+        <mdui:DisplayName xml:lang="fi">LINDAT/CLARIN säilytyspaikka ja palvelut</mdui:DisplayName>
+        <mdui:Description xml:lang="fi">LINDAT/CLARIN-projektin säilytyspaikka, jonka sijainti on \"Institute of Formal and Applied Linguistics\", Kaarlen yliopisto, Praha.</mdui:Description>
+        <mdui:Description xml:lang="en">The repository of the LINDAT/CLARIN project at Institute of Formal and Applied Linguistics, Charles University in Prague.</mdui:Description>
         <mdui:InformationURL xml:lang="en">http://ufal.mff.cuni.cz/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="cs">http://ufal.mff.cuni.cz/</mdui:InformationURL>
-        <mdui:Logo height="29" width="29">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAB0AAAAdBAMAAACkvXo8AAAABGdBTUEAALGPC/xhBQAAAAFzUkdCAK7OHOkAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAABJQTFRF////6ruX6aZ44Hs48+fc5ItNY8IEdAAAAAFiS0dEAIgFHUgAAAAJcEhZcwAAAEgAAABIAEbJaz4AAABXSURBVBjTY2AgDggJoPKNUfkspg6ofBUkjmgoSJIpEMYXNgbzjYYPHxQYrIYwvrNxCEjUBMZnMgaGjpOxAjxAgo1NQ41NEQHEaAwEyAHKKKQoQmTEoAEATVsQ7xmwu4QAAAAldEVYdGRhdGU6Y3JlYXRlADIwMTMtMTItMTdUMTQ6NDI6NTgrMDE6MDACpPM3AAAAJXRFWHRkYXRlOm1vZGlmeQAyMDEzLTEyLTE3VDE0OjQyOjU5KzAxOjAw1Y5APwAAAABJRU5ErkJggg==</mdui:Logo>
+        <mdui:InformationURL xml:lang="fi">http://ufal.mff.cuni.cz/</mdui:InformationURL>
         <mdui:PrivacyStatementURL xml:lang="en">https://lindat.mff.cuni.cz/privacypolicy.html</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="fi">https://lindat.mff.cuni.cz/privacypolicy.html</mdui:PrivacyStatementURL>
       </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://lindat.mff.cuni.cz/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://lindat.mff.cuni.cz/Shibboleth.sso/DS" 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://lindat.mff.cuni.cz/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://lindat.mff.cuni.cz/Shibboleth.sso/Login" index="2"/>
-    </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">finland</saml:AttributeValue>
+      </saml:Attribute>
+    </md:Extensions>
     <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+      <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>MIIEgTCCA2mgAwIBAgIRANAZM0fxIWg+DEEhaZlreVowDQYJKoZIhvcNAQEFBQAw
 NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
@@ -75,65 +45,43 @@ fk90Maa8HYp1OQagBlY9jhs4ImbPbsHM5Aa3f4ycxhXs+hecaJBD4WiaxeWpOWes
 k5Q+FdJCZoPqHRD2chNwhBErztJgujEarVtMBCUpCEpy5lwgFFFc2oekH8CkhWLw
 sv6GENdYGamg5HfRAq57+mGW3FUnox3gkqTWDuVzOaMfDlHvfqRVtC7n4mhHVAqz
 adGmTo4VvqYQsi0gVzrts5HDZAQBI13mpxua74rU8XyluKEyjS4gkVXLnlRjwXeF
-IhAZYQU=
-</ds:X509Certificate>
+IhAZYQU=</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://lindat.mff.cuni.cz/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://lindat.mff.cuni.cz/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://lindat.mff.cuni.cz/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://lindat.mff.cuni.cz/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://lindat.mff.cuni.cz/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://lindat.mff.cuni.cz/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://lindat.mff.cuni.cz/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://lindat.mff.cuni.cz/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://lindat.mff.cuni.cz/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://lindat.mff.cuni.cz/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://lindat.mff.cuni.cz/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://lindat.mff.cuni.cz/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://lindat.mff.cuni.cz/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://lindat.mff.cuni.cz/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://lindat.mff.cuni.cz/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <md:AttributeConsumingService index="1">
-      <md:ServiceName xml:lang="en">LINDAT/CLARIN digital repository and services</md:ServiceName>
-      <md:ServiceDescription xml:lang="en">Repository and services of LINDAT/CLARIN project at Institute of Formal and Applied Linguistics, Faculty of Mathematics and Physics, Charles University in Prague</md:ServiceDescription>
-      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:mace:dir:attribute-def:eduPersonPrincipalName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="mail" Name="urn:mace:dir:attribute-def:mail" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="cn" Name="urn:mace:dir:attribute-def:cn" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="cn" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="givenName" Name="urn:mace:dir:attribute-def:givenName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri" isRequired="false"/>
-      <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-      <md:RequestedAttribute FriendlyName="surname" Name="urn:mace:dir:attribute-def:sn" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri" isRequired="false"/>
-      <md:RequestedAttribute FriendlyName="surname" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-      <md:RequestedAttribute FriendlyName="eduPersonEntitlement" Name="urn:mace:dir:attribute-def:eduPersonEntitlement" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri" isRequired="false"/>
-      <md:RequestedAttribute FriendlyName="eduPersonEntitlement" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.7" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+    <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:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://lindat.mff.cuni.cz/Shibboleth.sso/SAML2/POST" index="1" isDefault="true"/>
+    <md:AttributeConsumingService index="1" isDefault="true">
+      <md:ServiceName xml:lang="fi">LINDAT/CLARIN sailytyspaikka ja palvelut</md:ServiceName>
+      <md:ServiceName xml:lang="en">LINDAT/CLARIN repository and services</md:ServiceName>
+      <md:ServiceDescription xml:lang="fi">LINDAT/CLARIN-projektin sailytyspaikka, jonka sijainti on "Institute of Formal and Applied Linguistics", Kaarlen yliopisto, Praha .</md:ServiceDescription>
+      <md:ServiceDescription xml:lang="en">The repository of the LINDAT/CLARIN project at the Institute of Formal and Applied Linguistics, Charles University in Prague .</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: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.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonTargetedID"/>
+      <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:AttributeConsumingService>
   </md:SPSSODescriptor>
   <md:Organization>
-    <md:OrganizationName xml:lang="en">Institute of Formal and Applied Linguistics, Faculty of Mathematics and Physics, Charles University in Prague, Czech Republic</md:OrganizationName>
-    <md:OrganizationName xml:lang="cs">Ústav formální a aplikované lingvistiky, Matematicko-fyzikální fakulta, Univerzita Karlova v Praze</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Institute of Formal and Applied Linguistics, Faculty of Mathematics and Physics, Charles University in Prague</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="cs">ÚFAL MFF UK</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://ufal.mff.cuni.cz/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="cs">http://ufal.mff.cuni.cz/</md:OrganizationURL>
+    <md:OrganizationName xml:lang="fi">CLARIN Service Provider Federation/MPI</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">CLARIN Service Provider Federation/MPI</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">CLARIN Service Provider Federation/MPI</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="fi">CLARIN Service Provider Federation/MPI</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">CLARIN Service Provider Federation/MPI</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">CLARIN Service Provider Federation/MPI</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="fi">http://www.clarin.eu</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.clarin.eu</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">http://www.clarin.eu</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="technical">
-    <md:GivenName>Pavel</md:GivenName>
-    <md:SurName>Straňák</md:SurName>
-    <md:EmailAddress>stranak@ufal.mff.cuni.cz</md:EmailAddress>
+    <md:GivenName>Jozef</md:GivenName>
+    <md:SurName>Misutka</md:SurName>
+    <md:EmailAddress>mailto:clarin-list@ufal.mff.cuni.cz</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="support">
-    <md:GivenName>Authentication Support</md:GivenName>
-    <md:EmailAddress>lindat-technical@ufal.mff.cuni.cz</md:EmailAddress>
+    <md:GivenName>Jozef</md:GivenName>
+    <md:SurName>Misutka</md:SurName>
+    <md:EmailAddress>mailto:clarin-list@ufal.mff.cuni.cz</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/ufal-point.mff.cuni.cz.xml b/swamid-interfederations-2.0/ufal-point.mff.cuni.cz.xml
deleted file mode 100644
index 055e2423..00000000
--- a/swamid-interfederations-2.0/ufal-point.mff.cuni.cz.xml
+++ /dev/null
@@ -1,139 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ufal-point.mff.cuni.cz/shibboleth/eduid/sp">
-  <Extensions xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
-    <eduidmd:RepublishRequest xmlns:eduidmd="http://eduid.cz/schema/metadata/1.0">
-      <eduidmd:RepublishTarget>http://edugain.org/</eduidmd:RepublishTarget>
-    </eduidmd:RepublishRequest>
-    <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:AttributeValue>http://eduid.cz/uri/sp-group/clarin</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-    <alg:DigestMethod xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-    <alg:DigestMethod xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-    <alg:DigestMethod xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-    <alg:DigestMethod xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-    <alg:DigestMethod xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-    <alg:SigningMethod xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-    <alg:SigningMethod xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-    <alg:SigningMethod xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-    <alg:SigningMethod xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-    <alg:SigningMethod xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-    <alg:SigningMethod xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-    <alg:SigningMethod xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-    <alg:SigningMethod xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-    <alg:SigningMethod xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-    <alg:SigningMethod xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-    <alg:SigningMethod xmlns:alg="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://www.eduid.cz/" registrationInstant="2010-09-21T15:24:17Z">
-      <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 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">
-    <Extensions xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">LINDAT/CLARIN repository and services</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="cs">Repozitář a služby projektu LINDAT/CLARIN</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Digital repository and services related to the LINDAT/CLARIN project focused on language research infrastructure at the Institute of Formal and Applied Linguistics, Faculty of Mathematics and Physics, Charles University in Prague</mdui:Description>
-        <mdui:Description xml:lang="cs">Repozitář a služby projektu LINDAT/CLARIN zaměřené na podporu výzkumu jazyka na Ústavu formální a aplikované lingvistiky Matematicko-fyzikální fakulty Univerzity Karlovy v Praze</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://ufal.mff.cuni.cz/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="cs">http://ufal.mff.cuni.cz/</mdui:InformationURL>
-        <mdui:Logo height="29" width="29">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAB0AAAAdBAMAAACkvXo8AAAABGdBTUEAALGPC/xhBQAAAAFzUkdCAK7OHOkAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAABJQTFRF////6ruX6aZ44Hs48+fc5ItNY8IEdAAAAAFiS0dEAIgFHUgAAAAJcEhZcwAAAEgAAABIAEbJaz4AAABXSURBVBjTY2AgDggJoPKNUfkspg6ofBUkjmgoSJIpEMYXNgbzjYYPHxQYrIYwvrNxCEjUBMZnMgaGjpOxAjxAgo1NQ41NEQHEaAwEyAHKKKQoQmTEoAEATVsQ7xmwu4QAAAAldEVYdGRhdGU6Y3JlYXRlADIwMTMtMTItMTdUMTQ6NDI6NTgrMDE6MDACpPM3AAAAJXRFWHRkYXRlOm1vZGlmeQAyMDEzLTEyLTE3VDE0OjQyOjU5KzAxOjAw1Y5APwAAAABJRU5ErkJggg==</mdui:Logo>
-        <mdui:PrivacyStatementURL xml:lang="en">https://lindat.mff.cuni.cz/privacypolicy.html</mdui:PrivacyStatementURL>
-      </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://lindat.mff.cuni.cz/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://lindat.mff.cuni.cz/Shibboleth.sso/DS" 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://lindat.mff.cuni.cz/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://lindat.mff.cuni.cz/Shibboleth.sso/Login" index="2"/>
-    </Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIIEgTCCA2mgAwIBAgIRANAZM0fxIWg+DEEhaZlreVowDQYJKoZIhvcNAQEFBQAw
-NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-IFNTTCBDQTAeFw0xMjEwMjQwMDAwMDBaFw0xNTEwMjQyMzU5NTlaMFUxCzAJBgNV
-BAYTAkNaMSUwIwYDVQQKExxDaGFybGVzIFVuaXZlcnNpdHkgaW4gUHJhZ3VlMR8w
-HQYDVQQDExZ1ZmFsLXBvaW50Lm1mZi5jdW5pLmN6MIIBIjANBgkqhkiG9w0BAQEF
-AAOCAQ8AMIIBCgKCAQEAz4nCZa/xBh1ebd2+99GEqRMSqSkCEVfFi4Tndz6v87Iv
-ZMvLY40OJg3lIEzngOz8tnn/ft6xcLxGwr+IbY6raHT08Xu8lQMd8Rj8Gmdi3Ov3
-XuCgjVpAID+GGfNkahzxebWORNfHyqEGSx2oFgRe8HD9BbT8mqheBPF8FIy6mYvs
-495IEkQVc0BvPvTwqEw+qOHKBX+AWQQIHDJDQQnjoteXplHugOFDJiJYH0T/80u3
-DO7h6oyiLlnyDywOVCQdiJPXNOtPMyM9rMT3Vw9SO4iIaMUkF5EafFFdEPLsi+FO
-2Z3r7pBxv1/LkK9AWuzAYSnjK/szHym25FWroxJZOwIDAQABo4IBaTCCAWUwHwYD
-VR0jBBgwFoAUDL2TaAzz3qujSWsrN1dH6pDjue0wHQYDVR0OBBYEFKKMnXN92GaN
-5uyL8cZdchPl9NpQMA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1Ud
-JQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAYBgNVHSAEETAPMA0GCysGAQQBsjEB
-AgIdMDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcv
-VEVSRU5BU1NMQ0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0
-cDovL2NydC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUH
-MAGGGmh0dHA6Ly9vY3NwLnRjcy50ZXJlbmEub3JnMCEGA1UdEQQaMBiCFnVmYWwt
-cG9pbnQubWZmLmN1bmkuY3owDQYJKoZIhvcNAQEFBQADggEBAKWQZsd0zZBi+hz6
-3LBx49MOoCXkpUkIdqecMhz0bpIhC+2Q3Uxp97lpfB/9CIMoI5tq+PRXDXQt2D6A
-fk90Maa8HYp1OQagBlY9jhs4ImbPbsHM5Aa3f4ycxhXs+hecaJBD4WiaxeWpOWes
-k5Q+FdJCZoPqHRD2chNwhBErztJgujEarVtMBCUpCEpy5lwgFFFc2oekH8CkhWLw
-sv6GENdYGamg5HfRAq57+mGW3FUnox3gkqTWDuVzOaMfDlHvfqRVtC7n4mhHVAqz
-adGmTo4VvqYQsi0gVzrts5HDZAQBI13mpxua74rU8XyluKEyjS4gkVXLnlRjwXeF
-IhAZYQU=
-</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://lindat.mff.cuni.cz/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://lindat.mff.cuni.cz/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://lindat.mff.cuni.cz/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://lindat.mff.cuni.cz/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://lindat.mff.cuni.cz/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://lindat.mff.cuni.cz/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://lindat.mff.cuni.cz/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://lindat.mff.cuni.cz/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://lindat.mff.cuni.cz/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://lindat.mff.cuni.cz/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://lindat.mff.cuni.cz/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://lindat.mff.cuni.cz/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://lindat.mff.cuni.cz/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://lindat.mff.cuni.cz/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://lindat.mff.cuni.cz/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <md:AttributeConsumingService index="1">
-      <md:ServiceName xml:lang="en">LINDAT/CLARIN digital repository and services</md:ServiceName>
-      <md:ServiceDescription xml:lang="en">Repository and services of LINDAT/CLARIN project at Institute of Formal and Applied Linguistics, Faculty of Mathematics and Physics, Charles University in Prague</md:ServiceDescription>
-      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:mace:dir:attribute-def:eduPersonPrincipalName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="mail" Name="urn:mace:dir:attribute-def:mail" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="cn" Name="urn:mace:dir:attribute-def:cn" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="cn" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="givenName" Name="urn:mace:dir:attribute-def:givenName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri" isRequired="false"/>
-      <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-      <md:RequestedAttribute FriendlyName="surname" Name="urn:mace:dir:attribute-def:sn" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri" isRequired="false"/>
-      <md:RequestedAttribute FriendlyName="surname" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-      <md:RequestedAttribute FriendlyName="eduPersonEntitlement" Name="urn:mace:dir:attribute-def:eduPersonEntitlement" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri" isRequired="false"/>
-      <md:RequestedAttribute FriendlyName="eduPersonEntitlement" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.7" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Institute of Formal and Applied Linguistics, Faculty of Mathematics and Physics, Charles University in Prague, Czech Republic</md:OrganizationName>
-    <md:OrganizationName xml:lang="cs">Ústav formální a aplikované lingvistiky, Matematicko-fyzikální fakulta, Univerzita Karlova v Praze</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Institute of Formal and Applied Linguistics, Faculty of Mathematics and Physics, Charles University in Prague</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="cs">ÚFAL MFF UK</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://ufal.mff.cuni.cz/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="cs">http://ufal.mff.cuni.cz/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Pavel</md:GivenName>
-    <md:SurName>Straňák</md:SurName>
-    <md:EmailAddress>stranak@ufal.mff.cuni.cz</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Authentication Support</md:GivenName>
-    <md:EmailAddress>lindat-technical@ufal.mff.cuni.cz</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/umbrella.psi.ch-.xml b/swamid-interfederations-2.0/umbrella.psi.ch-.xml
deleted file mode 100644
index b6fc3c63..00000000
--- a/swamid-interfederations-2.0/umbrella.psi.ch-.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://umbrella.psi.ch/">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://rr.aai.switch.ch/" registrationInstant="2014-03-18T09:41:16Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.switch.ch/aai/federation/switchaai/metadata-registration-practice-statement-20110711.txt</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </Extensions>
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
-    <Extensions>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Umbrella Test Service Provider</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Umbrella Test Service Provider for developing  bridging between eduGain and Umbrella Federation</mdui:Description>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDGDCCAgCgAwIBAgIJAPuvSPAzAC6mMA0GCSqGSIb3DQEBBQUAMBoxGDAWBgNV
-BAMTD3VtYnJlbGxhLnBzaS5jaDAeFw0xMzExMjgxMDQ2MjBaFw0xNjExMjcxMDQ2
-MjBaMBoxGDAWBgNVBAMTD3VtYnJlbGxhLnBzaS5jaDCCASIwDQYJKoZIhvcNAQEB
-BQADggEPADCCAQoCggEBAMHaKoQKIBkNpDp0I5R2yZ7uy2WShKsDm9IMxz+D0EzL
-S7k/KCKIt15E6iksEvy6KhKQUmHDjx0T/W9D+hZkAj3NaSytBCB3phGrMUFSotw9
-/GSt0e/C4x0Bju/SD5OwLOAX5QvMJllMlkGTUXQ+T6LcNBcA5kSL/jza2vssAOC0
-9vz0zK7uAxGG2/IrZ55UGL6RFB5lV4m+45DLjd/bnmk0KzPDbfCgpnq+kc4NUFov
-ECrZUJ+CkOUdS6x+Jg4wsUyYWHAMA77JoQtJUWYzLMlaN/hfWoIwsG049Wp20+w3
-axkrc0u/Bd+YQB2e66sv+gzMfpxkoxs78qv9uJGaNo0CAwEAAaNhMF8wPgYDVR0R
-BDcwNYIPdW1icmVsbGEucHNpLmNohiJodHRwczovL3VtYnJlbGxhLnBzaS5jaC9z
-aGliYm9sZXRoMB0GA1UdDgQWBBSycOrbvoq6pE/JYBQQAso92I6NXDANBgkqhkiG
-9w0BAQUFAAOCAQEAfarU3Y9Fi2+2Om89eMvkGB/29lZZnR+7w78sVyu6dZlMcJzT
-SJPNQXVbqAJfPEQLmSxBXxVwvoqEJH80c95xjt59p3CMuXKMxGZ+elpCin9fePrP
-pDkU/CXfNNSU1OIZnSttk6Yh6uQ814ZtxqZES1zDP63Ajm/aM9L2mrxD1UJ2OWAh
-RMaDxuEU6fZCZk9ej8os9Kf2k5XmJ8x5v9cJJ3dXFxEz7tGhb7wMSBlFIsdt+j3l
-mB0SSH6Wh64W+Tkwp4HES9XCdEWbuSeJEO+0MEC8kBR13YlXLIsGU95Q5694eeun
-jXaHZDgEhAR+tFkQFgpQhGcJTs1bLugCxSjdrA==
-
-						</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://umbrella.psi.ch/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://umbrella.psi.ch/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://umbrella.psi.ch/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://umbrella.psi.ch/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://umbrella.psi.ch/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://umbrella.psi.ch/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <AttributeConsumingService index="1">
-      <ServiceName xml:lang="en">Umbrella Test Service Provider</ServiceName>
-      <ServiceDescription xml:lang="en">Umbrella Test Service Provider for developing  bridging between eduGain and Umbrella Federation</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="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="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"/>
-    </AttributeConsumingService>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">psi.ch</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">PSI - Paul Scherrer Institut</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">PSI - Paul Scherrer Institute</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.psi.ch/</OrganizationURL>
-    <OrganizationURL xml:lang="en">http://www.psi.ch/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Björn</GivenName>
-    <SurName>Abt</SurName>
-    <EmailAddress>mailto:bjoern.abt@psi.ch</EmailAddress>
-    <TelephoneNumber>+41563103509</TelephoneNumber>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Björn</GivenName>
-    <SurName>Abt</SurName>
-    <EmailAddress>mailto:bjoern.abt@psi.ch</EmailAddress>
-    <TelephoneNumber>+41563103509</TelephoneNumber>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/umbrella.psi.ch.xml b/swamid-interfederations-2.0/umbrella.psi.ch.xml
deleted file mode 100644
index b6fc3c63..00000000
--- a/swamid-interfederations-2.0/umbrella.psi.ch.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://umbrella.psi.ch/">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://rr.aai.switch.ch/" registrationInstant="2014-03-18T09:41:16Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.switch.ch/aai/federation/switchaai/metadata-registration-practice-statement-20110711.txt</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </Extensions>
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
-    <Extensions>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Umbrella Test Service Provider</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Umbrella Test Service Provider for developing  bridging between eduGain and Umbrella Federation</mdui:Description>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDGDCCAgCgAwIBAgIJAPuvSPAzAC6mMA0GCSqGSIb3DQEBBQUAMBoxGDAWBgNV
-BAMTD3VtYnJlbGxhLnBzaS5jaDAeFw0xMzExMjgxMDQ2MjBaFw0xNjExMjcxMDQ2
-MjBaMBoxGDAWBgNVBAMTD3VtYnJlbGxhLnBzaS5jaDCCASIwDQYJKoZIhvcNAQEB
-BQADggEPADCCAQoCggEBAMHaKoQKIBkNpDp0I5R2yZ7uy2WShKsDm9IMxz+D0EzL
-S7k/KCKIt15E6iksEvy6KhKQUmHDjx0T/W9D+hZkAj3NaSytBCB3phGrMUFSotw9
-/GSt0e/C4x0Bju/SD5OwLOAX5QvMJllMlkGTUXQ+T6LcNBcA5kSL/jza2vssAOC0
-9vz0zK7uAxGG2/IrZ55UGL6RFB5lV4m+45DLjd/bnmk0KzPDbfCgpnq+kc4NUFov
-ECrZUJ+CkOUdS6x+Jg4wsUyYWHAMA77JoQtJUWYzLMlaN/hfWoIwsG049Wp20+w3
-axkrc0u/Bd+YQB2e66sv+gzMfpxkoxs78qv9uJGaNo0CAwEAAaNhMF8wPgYDVR0R
-BDcwNYIPdW1icmVsbGEucHNpLmNohiJodHRwczovL3VtYnJlbGxhLnBzaS5jaC9z
-aGliYm9sZXRoMB0GA1UdDgQWBBSycOrbvoq6pE/JYBQQAso92I6NXDANBgkqhkiG
-9w0BAQUFAAOCAQEAfarU3Y9Fi2+2Om89eMvkGB/29lZZnR+7w78sVyu6dZlMcJzT
-SJPNQXVbqAJfPEQLmSxBXxVwvoqEJH80c95xjt59p3CMuXKMxGZ+elpCin9fePrP
-pDkU/CXfNNSU1OIZnSttk6Yh6uQ814ZtxqZES1zDP63Ajm/aM9L2mrxD1UJ2OWAh
-RMaDxuEU6fZCZk9ej8os9Kf2k5XmJ8x5v9cJJ3dXFxEz7tGhb7wMSBlFIsdt+j3l
-mB0SSH6Wh64W+Tkwp4HES9XCdEWbuSeJEO+0MEC8kBR13YlXLIsGU95Q5694eeun
-jXaHZDgEhAR+tFkQFgpQhGcJTs1bLugCxSjdrA==
-
-						</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://umbrella.psi.ch/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://umbrella.psi.ch/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://umbrella.psi.ch/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://umbrella.psi.ch/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://umbrella.psi.ch/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://umbrella.psi.ch/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <AttributeConsumingService index="1">
-      <ServiceName xml:lang="en">Umbrella Test Service Provider</ServiceName>
-      <ServiceDescription xml:lang="en">Umbrella Test Service Provider for developing  bridging between eduGain and Umbrella Federation</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="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="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"/>
-    </AttributeConsumingService>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">psi.ch</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">PSI - Paul Scherrer Institut</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">PSI - Paul Scherrer Institute</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.psi.ch/</OrganizationURL>
-    <OrganizationURL xml:lang="en">http://www.psi.ch/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Björn</GivenName>
-    <SurName>Abt</SurName>
-    <EmailAddress>mailto:bjoern.abt@psi.ch</EmailAddress>
-    <TelephoneNumber>+41563103509</TelephoneNumber>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Björn</GivenName>
-    <SurName>Abt</SurName>
-    <EmailAddress>mailto:bjoern.abt@psi.ch</EmailAddress>
-    <TelephoneNumber>+41563103509</TelephoneNumber>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/utwente.nl-.xml b/swamid-interfederations-2.0/utwente.nl-.xml
deleted file mode 100644
index a521921a..00000000
--- a/swamid-interfederations-2.0/utwente.nl-.xml
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://utwente.nl/">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.surfconext.nl/" registrationInstant="2014-09-09T08:40:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://wiki.surfnetlabs.nl/display/eduGAIN/EduGAIN</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="nl">Universiteit Twente</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">University of Twente</mdui:DisplayName>
-        <mdui:Description xml:lang="nl">Universiteit Twente</mdui:Description>
-        <mdui:Description xml:lang="en">Universiteit Twente</mdui:Description>
-        <mdui:Logo height="9" width="108">https://static.surfconext.nl/media/idp/utwente.png</mdui:Logo>
-        <mdui:Keywords xml:lang="nl">University of Twente Universiteit Twente ut utwente</mdui:Keywords>
-        <mdui:Keywords xml:lang="en">University of Twente Universiteit Twente ut utwente</mdui:Keywords>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor xmlns:ds="http://www.w3.org/2000/09/xmldsig#" use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIID3zCCAsegAwIBAgIJAMVC9xn1ZfsuMA0GCSqGSIb3DQEBCwUAMIGFMQswCQYD
-VQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMG
-A1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQD
-DB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTAeFw0xNDA1MDUxNDIyMzVa
-Fw0xOTA1MDUxNDIyMzVaMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNo
-dDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYD
-VQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAy
-MDE0MDUwNTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKthMDbB0jKH
-efPzmRu9t2h7iLP4wAXr42bHpjzTEk6gttHFb4l/hFiz1YBI88TjiH6hVjnozo/Y
-HA2c51us+Y7g0XoS7653lbUN/EHzvDMuyis4Xi2Ijf1A/OUQfH1iFUWttIgtWK9+
-fatXoGUS6tirQvrzVh6ZstEp1xbpo1SF6UoVl+fh7tM81qz+Crr/Kroan0UjpZOF
-TwxPoK6fdLgMAieKSCRmBGpbJHbQ2xxbdykBBrBbdfzIX4CDepfjE9h/40ldw5jR
-n3e392jrS6htk23N9BWWrpBT5QCk0kH3h/6F1Dm6TkyG9CDtt73/anuRkvXbeygI
-4wml9bL3rE8CAwEAAaNQME4wHQYDVR0OBBYEFD+Ac7akFxaMhBQAjVfvgGfY8hNK
-MB8GA1UdIwQYMBaAFD+Ac7akFxaMhBQAjVfvgGfY8hNKMAwGA1UdEwQFMAMBAf8w
-DQYJKoZIhvcNAQELBQADggEBAC8L9D67CxIhGo5aGVu63WqRHBNOdo/FAGI7LURD
-FeRmG5nRw/VXzJLGJksh4FSkx7aPrxNWF1uFiDZ80EuYQuIv7bDLblK31ZEbdg1R
-9LgiZCdYSr464I7yXQY9o6FiNtSKZkQO8EsscJPPy/Zp4uHAnADWACkOUHiCbcKi
-UUFu66dX0Wr/v53Gekz487GgVRs8HEeT9MU1reBKRgdENR8PNg4rbQfLc3YQKLWK
-7yWnn/RenjDpuCiePj8N8/80tGgrNgK/6fzM3zI18sSywnXLswxqDb/J+jgVxnQ6
-MrsTf1urM8MnfcxG/82oHIwfMh/sXPCZpo+DTLkhQxctJ3M=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:NameIDFormat xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:NameIDFormat xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">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://engine.surfconext.nl/authentication/idp/single-sign-on/771fcfef97ddd691af69d7a52b7d2457"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Universiteit Twente</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Universiteit Twente</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.utwente.nl/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>SURFconext support</md:GivenName>
-    <md:EmailAddress>support@surfconext.nl</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>SURFconext support</md:GivenName>
-    <md:EmailAddress>support@surfconext.nl</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>SURFconext support</md:GivenName>
-    <md:EmailAddress>help@surfconext.nl</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/utwente.nl.xml b/swamid-interfederations-2.0/utwente.nl.xml
deleted file mode 100644
index a521921a..00000000
--- a/swamid-interfederations-2.0/utwente.nl.xml
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://utwente.nl/">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.surfconext.nl/" registrationInstant="2014-09-09T08:40:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://wiki.surfnetlabs.nl/display/eduGAIN/EduGAIN</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="nl">Universiteit Twente</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">University of Twente</mdui:DisplayName>
-        <mdui:Description xml:lang="nl">Universiteit Twente</mdui:Description>
-        <mdui:Description xml:lang="en">Universiteit Twente</mdui:Description>
-        <mdui:Logo height="9" width="108">https://static.surfconext.nl/media/idp/utwente.png</mdui:Logo>
-        <mdui:Keywords xml:lang="nl">University of Twente Universiteit Twente ut utwente</mdui:Keywords>
-        <mdui:Keywords xml:lang="en">University of Twente Universiteit Twente ut utwente</mdui:Keywords>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor xmlns:ds="http://www.w3.org/2000/09/xmldsig#" use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIID3zCCAsegAwIBAgIJAMVC9xn1ZfsuMA0GCSqGSIb3DQEBCwUAMIGFMQswCQYD
-VQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMG
-A1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQD
-DB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTAeFw0xNDA1MDUxNDIyMzVa
-Fw0xOTA1MDUxNDIyMzVaMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNo
-dDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYD
-VQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAy
-MDE0MDUwNTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKthMDbB0jKH
-efPzmRu9t2h7iLP4wAXr42bHpjzTEk6gttHFb4l/hFiz1YBI88TjiH6hVjnozo/Y
-HA2c51us+Y7g0XoS7653lbUN/EHzvDMuyis4Xi2Ijf1A/OUQfH1iFUWttIgtWK9+
-fatXoGUS6tirQvrzVh6ZstEp1xbpo1SF6UoVl+fh7tM81qz+Crr/Kroan0UjpZOF
-TwxPoK6fdLgMAieKSCRmBGpbJHbQ2xxbdykBBrBbdfzIX4CDepfjE9h/40ldw5jR
-n3e392jrS6htk23N9BWWrpBT5QCk0kH3h/6F1Dm6TkyG9CDtt73/anuRkvXbeygI
-4wml9bL3rE8CAwEAAaNQME4wHQYDVR0OBBYEFD+Ac7akFxaMhBQAjVfvgGfY8hNK
-MB8GA1UdIwQYMBaAFD+Ac7akFxaMhBQAjVfvgGfY8hNKMAwGA1UdEwQFMAMBAf8w
-DQYJKoZIhvcNAQELBQADggEBAC8L9D67CxIhGo5aGVu63WqRHBNOdo/FAGI7LURD
-FeRmG5nRw/VXzJLGJksh4FSkx7aPrxNWF1uFiDZ80EuYQuIv7bDLblK31ZEbdg1R
-9LgiZCdYSr464I7yXQY9o6FiNtSKZkQO8EsscJPPy/Zp4uHAnADWACkOUHiCbcKi
-UUFu66dX0Wr/v53Gekz487GgVRs8HEeT9MU1reBKRgdENR8PNg4rbQfLc3YQKLWK
-7yWnn/RenjDpuCiePj8N8/80tGgrNgK/6fzM3zI18sSywnXLswxqDb/J+jgVxnQ6
-MrsTf1urM8MnfcxG/82oHIwfMh/sXPCZpo+DTLkhQxctJ3M=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:NameIDFormat xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:NameIDFormat xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">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://engine.surfconext.nl/authentication/idp/single-sign-on/771fcfef97ddd691af69d7a52b7d2457"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Universiteit Twente</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Universiteit Twente</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.utwente.nl/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>SURFconext support</md:GivenName>
-    <md:EmailAddress>support@surfconext.nl</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>SURFconext support</md:GivenName>
-    <md:EmailAddress>support@surfconext.nl</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>SURFconext support</md:GivenName>
-    <md:EmailAddress>help@surfconext.nl</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/va-idp.lanet.lv.xml b/swamid-interfederations-2.0/va-idp.lanet.lv.xml
deleted file mode 100644
index 36876e4a..00000000
--- a/swamid-interfederations-2.0/va-idp.lanet.lv.xml
+++ /dev/null
@@ -1,41 +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://va-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/" registrationInstant="2013-10-10T10:10:10Z">
-      <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>
-MIIDhjCCAm4CCQC8Px9pbIuxGDANBgkqhkiG9w0BAQUFADCBhDELMAkGA1UEBhMCTFYxDTALBgNVBAgMBFJpZ2ExDTALBgNVBAcMBFJpZ2ExCzAJBgNVBAoMAkxVMQwwCgYDVQQLDANJVEQxFTATBgNVBAMMDGx1LWlkcC5sdS5sdjElMCMGCSqGSIb3DQEJARYWaXRzZXJ2aXNzIGF0IGx1IGRvdCBsdjAeFw0xMzEyMjAxMDU3MDJaFw0yOTAzMDYxMDU3MDJaMIGEMQswCQYDVQQGEwJMVjENMAsGA1UECAwEUmlnYTENMAsGA1UEBwwEUmlnYTELMAkGA1UECgwCTFUxDDAKBgNVBAsMA0lURDEVMBMGA1UEAwwMbHUtaWRwLmx1Lmx2MSUwIwYJKoZIhvcNAQkBFhZpdHNlcnZpc3MgYXQgbHUgZG90IGx2MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuAy8ri5VknGxy21iuW6kalPwg7VPZBWOuV/jVjRre44tHFd5FinCQUCuzQZn37AU3ZNZg07RRyDhkAzzpsBRQf48VcbnQFRjERuQTKUfT9hzFMxgbjxW2Dayg2Ru2LkGcIUeHilOwfmRn1NIRBN+0UyJIluRvB8YGdHSSHYSMimyw9uYEuMkU9aqewwW78w7TeasCWlB6jiGfJ/SGVtPRThJ6X6KVqoU2gwIY+V7YJkG4b5TOw4HLaIsdOmU4h1Ep3igy+Zsc/7zPn+80iwm1Jk9Q8zGlEwikjPn1N3enMOxR8wpQfAQwm5lIaHNXYFcXCj3mVQ3yQ9EzB/hRC8tHwIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQCFRpI7U/lTwoUW/HwDb2gAmjb0RSmS+5lUWDgmjP/rJwYdh672plabNcY12DiqchtBaSeTOf4qANCqEme+YBAmssFUeLx6O1J+5aXeXfCwAA9GlswGDVeC8ZnTVmQupnbvL0T+ZU8WtkltlLEJdD6o9BtEOqk3+Rspu+94d6FUwmvWB/YWypAOfzXkkSxi+87nsadiFEOyCzTW8fZotOrZMzba52ELLJgCx3IzGLUzV80PSJwLzKYHVp0VluH2DzrxfMKC01bMklG46n1nhEo1UU2KA4vzoScmrXzD+m7nKFZ3GHFjyQvtxqG7gA34qg1Vj2o2O0vN/kvjX73SR5s4
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDhjCCAm4CCQC8Px9pbIuxGDANBgkqhkiG9w0BAQUFADCBhDELMAkGA1UEBhMCTFYxDTALBgNVBAgMBFJpZ2ExDTALBgNVBAcMBFJpZ2ExCzAJBgNVBAoMAkxVMQwwCgYDVQQLDANJVEQxFTATBgNVBAMMDGx1LWlkcC5sdS5sdjElMCMGCSqGSIb3DQEJARYWaXRzZXJ2aXNzIGF0IGx1IGRvdCBsdjAeFw0xMzEyMjAxMDU3MDJaFw0yOTAzMDYxMDU3MDJaMIGEMQswCQYDVQQGEwJMVjENMAsGA1UECAwEUmlnYTENMAsGA1UEBwwEUmlnYTELMAkGA1UECgwCTFUxDDAKBgNVBAsMA0lURDEVMBMGA1UEAwwMbHUtaWRwLmx1Lmx2MSUwIwYJKoZIhvcNAQkBFhZpdHNlcnZpc3MgYXQgbHUgZG90IGx2MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuAy8ri5VknGxy21iuW6kalPwg7VPZBWOuV/jVjRre44tHFd5FinCQUCuzQZn37AU3ZNZg07RRyDhkAzzpsBRQf48VcbnQFRjERuQTKUfT9hzFMxgbjxW2Dayg2Ru2LkGcIUeHilOwfmRn1NIRBN+0UyJIluRvB8YGdHSSHYSMimyw9uYEuMkU9aqewwW78w7TeasCWlB6jiGfJ/SGVtPRThJ6X6KVqoU2gwIY+V7YJkG4b5TOw4HLaIsdOmU4h1Ep3igy+Zsc/7zPn+80iwm1Jk9Q8zGlEwikjPn1N3enMOxR8wpQfAQwm5lIaHNXYFcXCj3mVQ3yQ9EzB/hRC8tHwIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQCFRpI7U/lTwoUW/HwDb2gAmjb0RSmS+5lUWDgmjP/rJwYdh672plabNcY12DiqchtBaSeTOf4qANCqEme+YBAmssFUeLx6O1J+5aXeXfCwAA9GlswGDVeC8ZnTVmQupnbvL0T+ZU8WtkltlLEJdD6o9BtEOqk3+Rspu+94d6FUwmvWB/YWypAOfzXkkSxi+87nsadiFEOyCzTW8fZotOrZMzba52ELLJgCx3IzGLUzV80PSJwLzKYHVp0VluH2DzrxfMKC01bMklG46n1nhEo1UU2KA4vzoScmrXzD+m7nKFZ3GHFjyQvtxqG7gA34qg1Vj2o2O0vN/kvjX73SR5s4
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://va-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://va-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 - VA</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Vidzeme University of Applied Sciences - VA IDP</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://laife.lanet.lv/</OrganizationURL>
-    <OrganizationURL xml:lang="lv">http://www.va.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/vea-idp.lanet.lv.xml b/swamid-interfederations-2.0/vea-idp.lanet.lv.xml
deleted file mode 100644
index 33361c39..00000000
--- a/swamid-interfederations-2.0/vea-idp.lanet.lv.xml
+++ /dev/null
@@ -1,41 +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://vea-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/" registrationInstant="2013-10-10T10:10:10Z">
-      <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>
-MIIDhjCCAm4CCQC8Px9pbIuxGDANBgkqhkiG9w0BAQUFADCBhDELMAkGA1UEBhMCTFYxDTALBgNVBAgMBFJpZ2ExDTALBgNVBAcMBFJpZ2ExCzAJBgNVBAoMAkxVMQwwCgYDVQQLDANJVEQxFTATBgNVBAMMDGx1LWlkcC5sdS5sdjElMCMGCSqGSIb3DQEJARYWaXRzZXJ2aXNzIGF0IGx1IGRvdCBsdjAeFw0xMzEyMjAxMDU3MDJaFw0yOTAzMDYxMDU3MDJaMIGEMQswCQYDVQQGEwJMVjENMAsGA1UECAwEUmlnYTENMAsGA1UEBwwEUmlnYTELMAkGA1UECgwCTFUxDDAKBgNVBAsMA0lURDEVMBMGA1UEAwwMbHUtaWRwLmx1Lmx2MSUwIwYJKoZIhvcNAQkBFhZpdHNlcnZpc3MgYXQgbHUgZG90IGx2MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuAy8ri5VknGxy21iuW6kalPwg7VPZBWOuV/jVjRre44tHFd5FinCQUCuzQZn37AU3ZNZg07RRyDhkAzzpsBRQf48VcbnQFRjERuQTKUfT9hzFMxgbjxW2Dayg2Ru2LkGcIUeHilOwfmRn1NIRBN+0UyJIluRvB8YGdHSSHYSMimyw9uYEuMkU9aqewwW78w7TeasCWlB6jiGfJ/SGVtPRThJ6X6KVqoU2gwIY+V7YJkG4b5TOw4HLaIsdOmU4h1Ep3igy+Zsc/7zPn+80iwm1Jk9Q8zGlEwikjPn1N3enMOxR8wpQfAQwm5lIaHNXYFcXCj3mVQ3yQ9EzB/hRC8tHwIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQCFRpI7U/lTwoUW/HwDb2gAmjb0RSmS+5lUWDgmjP/rJwYdh672plabNcY12DiqchtBaSeTOf4qANCqEme+YBAmssFUeLx6O1J+5aXeXfCwAA9GlswGDVeC8ZnTVmQupnbvL0T+ZU8WtkltlLEJdD6o9BtEOqk3+Rspu+94d6FUwmvWB/YWypAOfzXkkSxi+87nsadiFEOyCzTW8fZotOrZMzba52ELLJgCx3IzGLUzV80PSJwLzKYHVp0VluH2DzrxfMKC01bMklG46n1nhEo1UU2KA4vzoScmrXzD+m7nKFZ3GHFjyQvtxqG7gA34qg1Vj2o2O0vN/kvjX73SR5s4
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDhjCCAm4CCQC8Px9pbIuxGDANBgkqhkiG9w0BAQUFADCBhDELMAkGA1UEBhMCTFYxDTALBgNVBAgMBFJpZ2ExDTALBgNVBAcMBFJpZ2ExCzAJBgNVBAoMAkxVMQwwCgYDVQQLDANJVEQxFTATBgNVBAMMDGx1LWlkcC5sdS5sdjElMCMGCSqGSIb3DQEJARYWaXRzZXJ2aXNzIGF0IGx1IGRvdCBsdjAeFw0xMzEyMjAxMDU3MDJaFw0yOTAzMDYxMDU3MDJaMIGEMQswCQYDVQQGEwJMVjENMAsGA1UECAwEUmlnYTENMAsGA1UEBwwEUmlnYTELMAkGA1UECgwCTFUxDDAKBgNVBAsMA0lURDEVMBMGA1UEAwwMbHUtaWRwLmx1Lmx2MSUwIwYJKoZIhvcNAQkBFhZpdHNlcnZpc3MgYXQgbHUgZG90IGx2MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuAy8ri5VknGxy21iuW6kalPwg7VPZBWOuV/jVjRre44tHFd5FinCQUCuzQZn37AU3ZNZg07RRyDhkAzzpsBRQf48VcbnQFRjERuQTKUfT9hzFMxgbjxW2Dayg2Ru2LkGcIUeHilOwfmRn1NIRBN+0UyJIluRvB8YGdHSSHYSMimyw9uYEuMkU9aqewwW78w7TeasCWlB6jiGfJ/SGVtPRThJ6X6KVqoU2gwIY+V7YJkG4b5TOw4HLaIsdOmU4h1Ep3igy+Zsc/7zPn+80iwm1Jk9Q8zGlEwikjPn1N3enMOxR8wpQfAQwm5lIaHNXYFcXCj3mVQ3yQ9EzB/hRC8tHwIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQCFRpI7U/lTwoUW/HwDb2gAmjb0RSmS+5lUWDgmjP/rJwYdh672plabNcY12DiqchtBaSeTOf4qANCqEme+YBAmssFUeLx6O1J+5aXeXfCwAA9GlswGDVeC8ZnTVmQupnbvL0T+ZU8WtkltlLEJdD6o9BtEOqk3+Rspu+94d6FUwmvWB/YWypAOfzXkkSxi+87nsadiFEOyCzTW8fZotOrZMzba52ELLJgCx3IzGLUzV80PSJwLzKYHVp0VluH2DzrxfMKC01bMklG46n1nhEo1UU2KA4vzoScmrXzD+m7nKFZ3GHFjyQvtxqG7gA34qg1Vj2o2O0vN/kvjX73SR5s4
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://vea-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://vea-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 - VEA</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Ventspils University College - VEA 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/verify.studentbeans.com-shibboleth.xml b/swamid-interfederations-2.0/verify.studentbeans.com-shibboleth.xml
deleted file mode 100644
index b80dd9eb..00000000
--- a/swamid-interfederations-2.0/verify.studentbeans.com-shibboleth.xml
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://verify.studentbeans.com/shibboleth">
-  <!--
-		This is a "Student Beans" Shibboleth SP for The Beans Group Limited.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-09-12T12:07:00Z">
-      <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>
-      <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://verify.studentbeans.com/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://verify.studentbeans.com/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Student Beans</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIEODCCAyCgAwIBAgIJANJg6RwX4lGaMA0GCSqGSIb3DQEBBQUAMIGcMQswCQYD
-						VQQGEwJVSzEPMA0GA1UECAwGTG9uZG9uMQ8wDQYDVQQHDAZMb25kb24xHDAaBgNV
-						BAoME1RoZSBCZWFucyBHcm91cCBMdGQxIDAeBgNVBAMMF3ZlcmlmeS5zdHVkZW50
-						YmVhbnMuY29tMSswKQYJKoZIhvcNAQkBFhxkZXZlbG9wZXJzQHRoZWJlYW5zZ3Jv
-						dXAuY29tMB4XDTE0MDQxMDE1MzcyNloXDTI0MDQwNzE1MzcyNlowgZwxCzAJBgNV
-						BAYTAlVLMQ8wDQYDVQQIDAZMb25kb24xDzANBgNVBAcMBkxvbmRvbjEcMBoGA1UE
-						CgwTVGhlIEJlYW5zIEdyb3VwIEx0ZDEgMB4GA1UEAwwXdmVyaWZ5LnN0dWRlbnRi
-						ZWFucy5jb20xKzApBgkqhkiG9w0BCQEWHGRldmVsb3BlcnNAdGhlYmVhbnNncm91
-						cC5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCqGDfRStUUNFor
-						otpdWs83wj0xQQ4sP0PfIyWV7kjGNSBA4WuyqX/nxz0prwJfOKzdNKcCdM9ZR8vD
-						AzjeDJ5Y2vneAKhmGMjucEPoy5Zb9dC6fFP2M6mmM47oAFGT2rzTZKFWbAKyV0f8
-						zE6K+Ddq//dmkA5IwTWpq63c/ouEtG8IP8kGdthpQLmNvhg1C0Afko/xydvs2LXh
-						y3XZUxKEDSu3NhvIWxE4iv7TTs4vnXvQLmPd3xSWQZEbd+/golvl0hs6tsBCQR8T
-						fUjgUCatbzT177hkhhHNkhlYLaUtf6k/9mO1U1t8aIDA+wlA0Js+irTqxLi4OmgK
-						2XtMjERRAgMBAAGjezB5MAkGA1UdEwQCMAAwLAYJYIZIAYb4QgENBB8WHU9wZW5T
-						U0wgR2VuZXJhdGVkIENlcnRpZmljYXRlMB0GA1UdDgQWBBSq41Sfw3DoEWvPwtTW
-						7Z2Za78S0DAfBgNVHSMEGDAWgBSq41Sfw3DoEWvPwtTW7Z2Za78S0DANBgkqhkiG
-						9w0BAQUFAAOCAQEAfxOkl3ajUkZMYII16kS/SFEQGCQ+KGAvaBFZsVm0fkdGKLhm
-						fCM56Y9yx38PNUG90AACWSxGAjzvRbwV6AwLgOtqO9yGUQMtMgITRa6Gw35DVhWT
-						Iz6w5KFhKX0iCM+NGAQaPGnM0c5Y7zwyI/fBeO9VfAcXUwBPu1eUeoQitzv6/XXz
-						LzmtbQlpgBWPfi30tXx0ZfJALdWkP54Bbubw7nC8KlMZInpTdtot/CYqk6K1yZ5K
-						dbTF8jXsONg/RSWzM2N6J42swNHz1NzcVCbwtvlu8sPzLWftRGLZFLWpj3SJR3mr
-						UKG+a99pFdmiJhaVmr6ppycpR94IcDJb+8Px5A==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://verify.studentbeans.com/Shibboleth.sso/Artifact/SOAP" index="0"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://verify.studentbeans.com/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://verify.studentbeans.com/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://verify.studentbeans.com/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://verify.studentbeans.com/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://verify.studentbeans.com/Shibboleth.sso/SAML2/POST" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://verify.studentbeans.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://verify.studentbeans.com/Shibboleth.sso/SAML2/Artifact" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://verify.studentbeans.com/Shibboleth.sso/SAML2/ECP" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://verify.studentbeans.com/Shibboleth.sso/SAML/POST" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://verify.studentbeans.com/Shibboleth.sso/SAML/Artifact" index="5"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">The Beans Group Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Student Beans</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.studentbeans.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Vincent</GivenName>
-    <SurName>Siebert</SurName>
-    <EmailAddress>mailto:vincent@thebeansgroup.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="support">
-    <GivenName>Seren</GivenName>
-    <SurName>Altiner</SurName>
-    <EmailAddress>mailto:seren@thebeansgroup.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Vincent</GivenName>
-    <SurName>Siebert</SurName>
-    <EmailAddress>mailto:vincent@thebeansgroup.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/verify.studentbeans.com.xml b/swamid-interfederations-2.0/verify.studentbeans.com.xml
deleted file mode 100644
index b80dd9eb..00000000
--- a/swamid-interfederations-2.0/verify.studentbeans.com.xml
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://verify.studentbeans.com/shibboleth">
-  <!--
-		This is a "Student Beans" Shibboleth SP for The Beans Group Limited.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-09-12T12:07:00Z">
-      <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>
-      <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://verify.studentbeans.com/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://verify.studentbeans.com/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Student Beans</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIEODCCAyCgAwIBAgIJANJg6RwX4lGaMA0GCSqGSIb3DQEBBQUAMIGcMQswCQYD
-						VQQGEwJVSzEPMA0GA1UECAwGTG9uZG9uMQ8wDQYDVQQHDAZMb25kb24xHDAaBgNV
-						BAoME1RoZSBCZWFucyBHcm91cCBMdGQxIDAeBgNVBAMMF3ZlcmlmeS5zdHVkZW50
-						YmVhbnMuY29tMSswKQYJKoZIhvcNAQkBFhxkZXZlbG9wZXJzQHRoZWJlYW5zZ3Jv
-						dXAuY29tMB4XDTE0MDQxMDE1MzcyNloXDTI0MDQwNzE1MzcyNlowgZwxCzAJBgNV
-						BAYTAlVLMQ8wDQYDVQQIDAZMb25kb24xDzANBgNVBAcMBkxvbmRvbjEcMBoGA1UE
-						CgwTVGhlIEJlYW5zIEdyb3VwIEx0ZDEgMB4GA1UEAwwXdmVyaWZ5LnN0dWRlbnRi
-						ZWFucy5jb20xKzApBgkqhkiG9w0BCQEWHGRldmVsb3BlcnNAdGhlYmVhbnNncm91
-						cC5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCqGDfRStUUNFor
-						otpdWs83wj0xQQ4sP0PfIyWV7kjGNSBA4WuyqX/nxz0prwJfOKzdNKcCdM9ZR8vD
-						AzjeDJ5Y2vneAKhmGMjucEPoy5Zb9dC6fFP2M6mmM47oAFGT2rzTZKFWbAKyV0f8
-						zE6K+Ddq//dmkA5IwTWpq63c/ouEtG8IP8kGdthpQLmNvhg1C0Afko/xydvs2LXh
-						y3XZUxKEDSu3NhvIWxE4iv7TTs4vnXvQLmPd3xSWQZEbd+/golvl0hs6tsBCQR8T
-						fUjgUCatbzT177hkhhHNkhlYLaUtf6k/9mO1U1t8aIDA+wlA0Js+irTqxLi4OmgK
-						2XtMjERRAgMBAAGjezB5MAkGA1UdEwQCMAAwLAYJYIZIAYb4QgENBB8WHU9wZW5T
-						U0wgR2VuZXJhdGVkIENlcnRpZmljYXRlMB0GA1UdDgQWBBSq41Sfw3DoEWvPwtTW
-						7Z2Za78S0DAfBgNVHSMEGDAWgBSq41Sfw3DoEWvPwtTW7Z2Za78S0DANBgkqhkiG
-						9w0BAQUFAAOCAQEAfxOkl3ajUkZMYII16kS/SFEQGCQ+KGAvaBFZsVm0fkdGKLhm
-						fCM56Y9yx38PNUG90AACWSxGAjzvRbwV6AwLgOtqO9yGUQMtMgITRa6Gw35DVhWT
-						Iz6w5KFhKX0iCM+NGAQaPGnM0c5Y7zwyI/fBeO9VfAcXUwBPu1eUeoQitzv6/XXz
-						LzmtbQlpgBWPfi30tXx0ZfJALdWkP54Bbubw7nC8KlMZInpTdtot/CYqk6K1yZ5K
-						dbTF8jXsONg/RSWzM2N6J42swNHz1NzcVCbwtvlu8sPzLWftRGLZFLWpj3SJR3mr
-						UKG+a99pFdmiJhaVmr6ppycpR94IcDJb+8Px5A==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://verify.studentbeans.com/Shibboleth.sso/Artifact/SOAP" index="0"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://verify.studentbeans.com/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://verify.studentbeans.com/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://verify.studentbeans.com/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://verify.studentbeans.com/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://verify.studentbeans.com/Shibboleth.sso/SAML2/POST" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://verify.studentbeans.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://verify.studentbeans.com/Shibboleth.sso/SAML2/Artifact" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://verify.studentbeans.com/Shibboleth.sso/SAML2/ECP" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://verify.studentbeans.com/Shibboleth.sso/SAML/POST" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://verify.studentbeans.com/Shibboleth.sso/SAML/Artifact" index="5"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">The Beans Group Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Student Beans</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.studentbeans.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Vincent</GivenName>
-    <SurName>Siebert</SurName>
-    <EmailAddress>mailto:vincent@thebeansgroup.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="support">
-    <GivenName>Seren</GivenName>
-    <SurName>Altiner</SurName>
-    <EmailAddress>mailto:seren@thebeansgroup.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Vincent</GivenName>
-    <SurName>Siebert</SurName>
-    <EmailAddress>mailto:vincent@thebeansgroup.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/vip.espci.fr-saml2-idp-metadata.php.xml b/swamid-interfederations-2.0/vip.espci.fr-saml2-idp-metadata.php.xml
deleted file mode 100644
index 30b1bf33..00000000
--- a/swamid-interfederations-2.0/vip.espci.fr-saml2-idp-metadata.php.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://vip.espci.fr/saml2/idp/metadata.php">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2010-05-31T18:03:42Z">
-      <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">espci.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">ESPCI ParisTech</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIFdjCCBF6gAwIBAgIQINOwQe4k09iKRAogjYscZDANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTE0MDQwODAwMDAwMFoXDTE3MDQwNzIzNTk1OVowOjEhMB8GA1UE
-CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRUwEwYDVQQDEwx2aXAuZXNwY2ku
-ZnIwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDG4kQF844cPIa0EonJ
-NOgAx1MC8skufPLiqMFNu9moOTuq7GBVYPgyjPt46xhWm6VvAMTwZHTSPS4NYQwy
-PwU8S6XRYLh+K5hJmeWras/UJFxsNMqwtA/5KRGYRDPKv6kA2oF7dWu9uA8e78L2
-YCGPcY3YVmURl0Hcsa4EN2fU2c3a00NDJjJKuk1QF/M4lh+SG8lzQJHDrVtkl4tg
-dO74GOq1hhY3wq4037Ybi7TnBDQ47MUtANpPmmOhnbUR8nXaNGpBfLX515qoyksr
-tlk7YeoyguEqWIoEHmxNzwuNqh2cVBJQassPzIYYQfabbO6SH/PQxri3kyzVs7eF
-IIxQ4a7ueI6sGDeuuMhLFGG6tvJOPw2K/9fsHGYdGtnUAF7PVmNCUkRC9P667baz
-cJL5wGkAS6yczTXAS14WwL+OPQldB15Etv9odQ8cp/xJWL+fkrx3GzG4lyzRPo2f
-w84G1YQt1PJ5VJ+gT+ZzUDAkTnYpV7Hw2DUm2EIUAMXRL2d/B17GyxKh+YvtWRsl
-r+MkLWjdb2RglF1EtKV8YvXiGk26gDc3J8ZkseOq8RkvYHqFfZl346I4ve1dwB++
-Hwc2AvVCkCWxczQs6kFkgx9kw+GrrFB3OLUB+/EOh39iB5FyC+EKt1TGPhE1r41F
-yjfR4oLG0niAJvbTYtDPZ6AN4wIDAQABo4IBejCCAXYwHwYDVR0jBBgwFoAUDL2T
-aAzz3qujSWsrN1dH6pDjue0wHQYDVR0OBBYEFGqL9qiZrqTzr2sVmqknWvntrCtV
-MA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUF
-BwMBBggrBgEFBQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAEC
-ATA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RF
-UkVOQVNTTENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6
-Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzAB
-hhpodHRwOi8vb2NzcC50Y3MudGVyZW5hLm9yZzAoBgNVHREEITAfggx2aXAuZXNw
-Y2kuZnKCD29wZW5pZC5lc3BjaS5mcjANBgkqhkiG9w0BAQUFAAOCAQEAJ3M5NRTg
-XfOhpzRIyBfNgEMV/D9n2h9vD4YqJI05bYhbELOD1wkmLcpFWSsDc0V1WxCHl9Dz
-y2YdRaq51NbeBlnh/Q8ulKqx//O+29R52AHD3p7Be4lynIHDRgOWWu9pzZTDd0yw
-MthAhzQKI6LenYb3jIJqy8OKgEAZB/kQcWfmVlXws7CyxFk6XJS7tIm52d9ywMGe
-/4Wpe4W1jHEWn4ngfgHIOZ33NHsze0p+A3lhQLQxQc2yYk2pfhwMq2a++veSqnrs
-M3PXyfI7EheNPXVG8+6JL5disJ3pvtZwIrzh3ApWc4NDE2BISXejQZxpl5wVtCt+
-aWaLoR3kbEdTYA==
-					    </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>
-					      MIIFdjCCBF6gAwIBAgIQINOwQe4k09iKRAogjYscZDANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTE0MDQwODAwMDAwMFoXDTE3MDQwNzIzNTk1OVowOjEhMB8GA1UE
-CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRUwEwYDVQQDEwx2aXAuZXNwY2ku
-ZnIwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDG4kQF844cPIa0EonJ
-NOgAx1MC8skufPLiqMFNu9moOTuq7GBVYPgyjPt46xhWm6VvAMTwZHTSPS4NYQwy
-PwU8S6XRYLh+K5hJmeWras/UJFxsNMqwtA/5KRGYRDPKv6kA2oF7dWu9uA8e78L2
-YCGPcY3YVmURl0Hcsa4EN2fU2c3a00NDJjJKuk1QF/M4lh+SG8lzQJHDrVtkl4tg
-dO74GOq1hhY3wq4037Ybi7TnBDQ47MUtANpPmmOhnbUR8nXaNGpBfLX515qoyksr
-tlk7YeoyguEqWIoEHmxNzwuNqh2cVBJQassPzIYYQfabbO6SH/PQxri3kyzVs7eF
-IIxQ4a7ueI6sGDeuuMhLFGG6tvJOPw2K/9fsHGYdGtnUAF7PVmNCUkRC9P667baz
-cJL5wGkAS6yczTXAS14WwL+OPQldB15Etv9odQ8cp/xJWL+fkrx3GzG4lyzRPo2f
-w84G1YQt1PJ5VJ+gT+ZzUDAkTnYpV7Hw2DUm2EIUAMXRL2d/B17GyxKh+YvtWRsl
-r+MkLWjdb2RglF1EtKV8YvXiGk26gDc3J8ZkseOq8RkvYHqFfZl346I4ve1dwB++
-Hwc2AvVCkCWxczQs6kFkgx9kw+GrrFB3OLUB+/EOh39iB5FyC+EKt1TGPhE1r41F
-yjfR4oLG0niAJvbTYtDPZ6AN4wIDAQABo4IBejCCAXYwHwYDVR0jBBgwFoAUDL2T
-aAzz3qujSWsrN1dH6pDjue0wHQYDVR0OBBYEFGqL9qiZrqTzr2sVmqknWvntrCtV
-MA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUF
-BwMBBggrBgEFBQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAEC
-ATA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RF
-UkVOQVNTTENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6
-Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzAB
-hhpodHRwOi8vb2NzcC50Y3MudGVyZW5hLm9yZzAoBgNVHREEITAfggx2aXAuZXNw
-Y2kuZnKCD29wZW5pZC5lc3BjaS5mcjANBgkqhkiG9w0BAQUFAAOCAQEAJ3M5NRTg
-XfOhpzRIyBfNgEMV/D9n2h9vD4YqJI05bYhbELOD1wkmLcpFWSsDc0V1WxCHl9Dz
-y2YdRaq51NbeBlnh/Q8ulKqx//O+29R52AHD3p7Be4lynIHDRgOWWu9pzZTDd0yw
-MthAhzQKI6LenYb3jIJqy8OKgEAZB/kQcWfmVlXws7CyxFk6XJS7tIm52d9ywMGe
-/4Wpe4W1jHEWn4ngfgHIOZ33NHsze0p+A3lhQLQxQc2yYk2pfhwMq2a++veSqnrs
-M3PXyfI7EheNPXVG8+6JL5disJ3pvtZwIrzh3ApWc4NDE2BISXejQZxpl5wVtCt+
-aWaLoR3kbEdTYA==
-					    </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://vip.espci.fr/saml2/idp/SSOService.php"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://vip.espci.fr/saml2/idp/SSOService.php"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://vip.espci.fr/shib13/idp/SSOService.php"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">ESPCI ParisTech</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">ESPCI ParisTech</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Emmanuel Dreyfus</SurName>
-    <EmailAddress>Emmanuel.Dreyfus@espci.fr</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <SurName>Jean-Jacques Puig</SurName>
-    <EmailAddress>Jean-Jacques.Puig@espci.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/vip.espci.fr.xml b/swamid-interfederations-2.0/vip.espci.fr.xml
deleted file mode 100644
index 30b1bf33..00000000
--- a/swamid-interfederations-2.0/vip.espci.fr.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://vip.espci.fr/saml2/idp/metadata.php">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2010-05-31T18:03:42Z">
-      <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">espci.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">ESPCI ParisTech</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIFdjCCBF6gAwIBAgIQINOwQe4k09iKRAogjYscZDANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTE0MDQwODAwMDAwMFoXDTE3MDQwNzIzNTk1OVowOjEhMB8GA1UE
-CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRUwEwYDVQQDEwx2aXAuZXNwY2ku
-ZnIwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDG4kQF844cPIa0EonJ
-NOgAx1MC8skufPLiqMFNu9moOTuq7GBVYPgyjPt46xhWm6VvAMTwZHTSPS4NYQwy
-PwU8S6XRYLh+K5hJmeWras/UJFxsNMqwtA/5KRGYRDPKv6kA2oF7dWu9uA8e78L2
-YCGPcY3YVmURl0Hcsa4EN2fU2c3a00NDJjJKuk1QF/M4lh+SG8lzQJHDrVtkl4tg
-dO74GOq1hhY3wq4037Ybi7TnBDQ47MUtANpPmmOhnbUR8nXaNGpBfLX515qoyksr
-tlk7YeoyguEqWIoEHmxNzwuNqh2cVBJQassPzIYYQfabbO6SH/PQxri3kyzVs7eF
-IIxQ4a7ueI6sGDeuuMhLFGG6tvJOPw2K/9fsHGYdGtnUAF7PVmNCUkRC9P667baz
-cJL5wGkAS6yczTXAS14WwL+OPQldB15Etv9odQ8cp/xJWL+fkrx3GzG4lyzRPo2f
-w84G1YQt1PJ5VJ+gT+ZzUDAkTnYpV7Hw2DUm2EIUAMXRL2d/B17GyxKh+YvtWRsl
-r+MkLWjdb2RglF1EtKV8YvXiGk26gDc3J8ZkseOq8RkvYHqFfZl346I4ve1dwB++
-Hwc2AvVCkCWxczQs6kFkgx9kw+GrrFB3OLUB+/EOh39iB5FyC+EKt1TGPhE1r41F
-yjfR4oLG0niAJvbTYtDPZ6AN4wIDAQABo4IBejCCAXYwHwYDVR0jBBgwFoAUDL2T
-aAzz3qujSWsrN1dH6pDjue0wHQYDVR0OBBYEFGqL9qiZrqTzr2sVmqknWvntrCtV
-MA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUF
-BwMBBggrBgEFBQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAEC
-ATA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RF
-UkVOQVNTTENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6
-Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzAB
-hhpodHRwOi8vb2NzcC50Y3MudGVyZW5hLm9yZzAoBgNVHREEITAfggx2aXAuZXNw
-Y2kuZnKCD29wZW5pZC5lc3BjaS5mcjANBgkqhkiG9w0BAQUFAAOCAQEAJ3M5NRTg
-XfOhpzRIyBfNgEMV/D9n2h9vD4YqJI05bYhbELOD1wkmLcpFWSsDc0V1WxCHl9Dz
-y2YdRaq51NbeBlnh/Q8ulKqx//O+29R52AHD3p7Be4lynIHDRgOWWu9pzZTDd0yw
-MthAhzQKI6LenYb3jIJqy8OKgEAZB/kQcWfmVlXws7CyxFk6XJS7tIm52d9ywMGe
-/4Wpe4W1jHEWn4ngfgHIOZ33NHsze0p+A3lhQLQxQc2yYk2pfhwMq2a++veSqnrs
-M3PXyfI7EheNPXVG8+6JL5disJ3pvtZwIrzh3ApWc4NDE2BISXejQZxpl5wVtCt+
-aWaLoR3kbEdTYA==
-					    </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>
-					      MIIFdjCCBF6gAwIBAgIQINOwQe4k09iKRAogjYscZDANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTE0MDQwODAwMDAwMFoXDTE3MDQwNzIzNTk1OVowOjEhMB8GA1UE
-CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRUwEwYDVQQDEwx2aXAuZXNwY2ku
-ZnIwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDG4kQF844cPIa0EonJ
-NOgAx1MC8skufPLiqMFNu9moOTuq7GBVYPgyjPt46xhWm6VvAMTwZHTSPS4NYQwy
-PwU8S6XRYLh+K5hJmeWras/UJFxsNMqwtA/5KRGYRDPKv6kA2oF7dWu9uA8e78L2
-YCGPcY3YVmURl0Hcsa4EN2fU2c3a00NDJjJKuk1QF/M4lh+SG8lzQJHDrVtkl4tg
-dO74GOq1hhY3wq4037Ybi7TnBDQ47MUtANpPmmOhnbUR8nXaNGpBfLX515qoyksr
-tlk7YeoyguEqWIoEHmxNzwuNqh2cVBJQassPzIYYQfabbO6SH/PQxri3kyzVs7eF
-IIxQ4a7ueI6sGDeuuMhLFGG6tvJOPw2K/9fsHGYdGtnUAF7PVmNCUkRC9P667baz
-cJL5wGkAS6yczTXAS14WwL+OPQldB15Etv9odQ8cp/xJWL+fkrx3GzG4lyzRPo2f
-w84G1YQt1PJ5VJ+gT+ZzUDAkTnYpV7Hw2DUm2EIUAMXRL2d/B17GyxKh+YvtWRsl
-r+MkLWjdb2RglF1EtKV8YvXiGk26gDc3J8ZkseOq8RkvYHqFfZl346I4ve1dwB++
-Hwc2AvVCkCWxczQs6kFkgx9kw+GrrFB3OLUB+/EOh39iB5FyC+EKt1TGPhE1r41F
-yjfR4oLG0niAJvbTYtDPZ6AN4wIDAQABo4IBejCCAXYwHwYDVR0jBBgwFoAUDL2T
-aAzz3qujSWsrN1dH6pDjue0wHQYDVR0OBBYEFGqL9qiZrqTzr2sVmqknWvntrCtV
-MA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUF
-BwMBBggrBgEFBQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAEC
-ATA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RF
-UkVOQVNTTENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6
-Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzAB
-hhpodHRwOi8vb2NzcC50Y3MudGVyZW5hLm9yZzAoBgNVHREEITAfggx2aXAuZXNw
-Y2kuZnKCD29wZW5pZC5lc3BjaS5mcjANBgkqhkiG9w0BAQUFAAOCAQEAJ3M5NRTg
-XfOhpzRIyBfNgEMV/D9n2h9vD4YqJI05bYhbELOD1wkmLcpFWSsDc0V1WxCHl9Dz
-y2YdRaq51NbeBlnh/Q8ulKqx//O+29R52AHD3p7Be4lynIHDRgOWWu9pzZTDd0yw
-MthAhzQKI6LenYb3jIJqy8OKgEAZB/kQcWfmVlXws7CyxFk6XJS7tIm52d9ywMGe
-/4Wpe4W1jHEWn4ngfgHIOZ33NHsze0p+A3lhQLQxQc2yYk2pfhwMq2a++veSqnrs
-M3PXyfI7EheNPXVG8+6JL5disJ3pvtZwIrzh3ApWc4NDE2BISXejQZxpl5wVtCt+
-aWaLoR3kbEdTYA==
-					    </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://vip.espci.fr/saml2/idp/SSOService.php"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://vip.espci.fr/saml2/idp/SSOService.php"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://vip.espci.fr/shib13/idp/SSOService.php"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">ESPCI ParisTech</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">ESPCI ParisTech</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Emmanuel Dreyfus</SurName>
-    <EmailAddress>Emmanuel.Dreyfus@espci.fr</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <SurName>Jean-Jacques Puig</SurName>
-    <EmailAddress>Jean-Jacques.Puig@espci.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/vm-idp.paris-sorbonne.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/vm-idp.paris-sorbonne.fr-idp-shibboleth.xml
deleted file mode 100644
index 5316e48c..00000000
--- a/swamid-interfederations-2.0/vm-idp.paris-sorbonne.fr-idp-shibboleth.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://vm-idp.paris-sorbonne.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2013-07-02T10:38:53Z">
-      <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">paris-sorbonne.fr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-paris4.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">Paris-Sorbonne Universite</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDTDCCAjSgAwIBAgIVAMI/RmCj23hGRPU+v9uRMFWtW9obMA0GCSqGSIb3DQEB
-BQUAMCMxITAfBgNVBAMTGHZtLWlkcC5wYXJpcy1zb3Jib25uZS5mcjAeFw0xMzA3
-MjQxNDAxMDNaFw0zMzA3MjQxNDAxMDNaMCMxITAfBgNVBAMTGHZtLWlkcC5wYXJp
-cy1zb3Jib25uZS5mcjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMK/
-pDQMCJZT2BMJ90P5vE9++hFyrdBmzGN/bxcPpJP+QU1pt0JtKG1YxAuGCIuWRYG2
-I1P1KIxyzHBl8hw3fG0JXosKwr2UgflOMLWLFpOpGboQWMH3DowM7/ljJYylEeO6
-PDUrjBUjPpdXmfGf+WWxp8Pg0vWXOW1qW4TND1n9+l2MBQaO8CBzg+eGG7G67u73
-xXl2VaYDZhgLHWHa72CpiCKZqZ23SWEuSDtgncQfnYUMHAxsCqAYPJVmAagAMsAN
-yaKhNHIEGC7fSemyDRRtAvaoWlTNsGvBu+nV0DPkJcH0vBWc+AxUAzDaAn/gRD8/
-FhEeCXXQI5I/up3XTe8CAwEAAaN3MHUwVAYDVR0RBE0wS4IYdm0taWRwLnBhcmlz
-LXNvcmJvbm5lLmZyhi9odHRwczovL3ZtLWlkcC5wYXJpcy1zb3Jib25uZS5mci9p
-ZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQU8B2ktyp27dZeWdcyJelNcFHP7RgwDQYJ
-KoZIhvcNAQEFBQADggEBACXuIAmAz7T7SXDdAVkSUSaRCd0WzhvG8TtN+VWtl3Uu
-kDLaNuh/dFuk+nCIv5V6Wpof7eLi5RAzfe/iHGknL6W4frMqA9bkIPZCIFTpzUrp
-wO9+6ygvgDnsPqPBwH80Bn7GKBd0/sXSLfXWOlFehgKxOJ+zG0UwvhoID7IqDNQL
-C2AglrZ2PAyVyFeA9T4sDI83Hw0TBXCGFlPKXAkxWw/DuATXn5ChB2ixfTmsxqvl
-KIhv18lDXRbS+DWI8nyXf/0TFFjjKFbfApQc11hVeHZWwDzjMexG2L/6pbt8rjDs
-hJGtnPWpe4IxhR2gkYkT1DdmPuvOIWlF0FJjuUGBBlA=
-					    </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>
-					      MIIDSzCCAjOgAwIBAgIUc0FQTVYKXqv1YkZNpjccybeOcxMwDQYJKoZIhvcNAQEF
-BQAwIzEhMB8GA1UEAxMYdm0taWRwLnBhcmlzLXNvcmJvbm5lLmZyMB4XDTEzMDYx
-ODEzMTg0OFoXDTMzMDYxODEzMTg0OFowIzEhMB8GA1UEAxMYdm0taWRwLnBhcmlz
-LXNvcmJvbm5lLmZyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAgPr/
-zq25BPrGBr/mp2KiN/5DhfHpmyjlVOb6b0txBrdLP1s2WzgY0HJPFsxzrh2Ms91E
-apkaQLyB9iqQPL49QKybBuGRkj/wXXXULzlG4bciAJ4vTwsiChXmvG7L1GXfvqRX
-vLrXLGcSts3MKbKTopqsrYI2MnoTxu95FiUoaxseT+ogy+e31n6iKd6ncR09cYGN
-4aeh4eTRwIsEkrTwYWzQJO0m8UXc1WKzKyhqA+Z4mOMwQbq261M2UHfyimBHqOTt
-VXELAQTGLd/2vBsLa9imthQ+P9DoEaeYbssgnKkNQyoqbDpBAq0Zs457W2A4N6o8
-WCg5bxcOBowGbfAxEQIDAQABo3cwdTBUBgNVHREETTBLghh2bS1pZHAucGFyaXMt
-c29yYm9ubmUuZnKGL2h0dHBzOi8vdm0taWRwLnBhcmlzLXNvcmJvbm5lLmZyL2lk
-cC9zaGliYm9sZXRoMB0GA1UdDgQWBBT7V2DX3R7WhN/ABHzjj6lZgnJz1DANBgkq
-hkiG9w0BAQUFAAOCAQEAZLSTb8R1WTiDwWaRwDQ+W2Zv3cPWay9bN8zm/zGOHnuM
-8ksyIPTQ0navE6gzty8E9GXMD2ymTjuycMuTkR6xZP9F3SB6GRtNIljpLIYxOdbZ
-gYR1+xemNL+5i2VJ5C5Lah2pPVtUiiOUEd8EBHtq5l5hlMslZMFeKgriLnf9ah4l
-rd2bCFrxuxvvj5td6FA+RgFyJyZ9UTAmzwVXzly6vxG9yGh9XXYzNXmcJtK07FDf
-I9JBAYDkTmGHFdS+c5GS+S4hUxdUCsnY9yNgwB3Ew/7r+IDDI2asBlICoLlCaO39
-lS5dpBgbSWTr2qcKD9KMAsG2n1+05Z0NNeohOEIEXg==
-					    </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://vm-idp.paris-sorbonne.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://vm-idp.paris-sorbonne.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://vm-idp.paris-sorbonne.fr/idp/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Paris-Sorbonne Universite</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Paris-Sorbonne Universite</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>NGUYEN Manh Hung</SurName>
-    <EmailAddress>manh-hung.nguyen@paris-sorbonne.fr</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <SurName>Brahim MARIR</SurName>
-    <EmailAddress>brahim.marir@paris-sorbonne.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/vm-idp.paris-sorbonne.fr.xml b/swamid-interfederations-2.0/vm-idp.paris-sorbonne.fr.xml
deleted file mode 100644
index 5316e48c..00000000
--- a/swamid-interfederations-2.0/vm-idp.paris-sorbonne.fr.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://vm-idp.paris-sorbonne.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2013-07-02T10:38:53Z">
-      <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">paris-sorbonne.fr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-paris4.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">Paris-Sorbonne Universite</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDTDCCAjSgAwIBAgIVAMI/RmCj23hGRPU+v9uRMFWtW9obMA0GCSqGSIb3DQEB
-BQUAMCMxITAfBgNVBAMTGHZtLWlkcC5wYXJpcy1zb3Jib25uZS5mcjAeFw0xMzA3
-MjQxNDAxMDNaFw0zMzA3MjQxNDAxMDNaMCMxITAfBgNVBAMTGHZtLWlkcC5wYXJp
-cy1zb3Jib25uZS5mcjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMK/
-pDQMCJZT2BMJ90P5vE9++hFyrdBmzGN/bxcPpJP+QU1pt0JtKG1YxAuGCIuWRYG2
-I1P1KIxyzHBl8hw3fG0JXosKwr2UgflOMLWLFpOpGboQWMH3DowM7/ljJYylEeO6
-PDUrjBUjPpdXmfGf+WWxp8Pg0vWXOW1qW4TND1n9+l2MBQaO8CBzg+eGG7G67u73
-xXl2VaYDZhgLHWHa72CpiCKZqZ23SWEuSDtgncQfnYUMHAxsCqAYPJVmAagAMsAN
-yaKhNHIEGC7fSemyDRRtAvaoWlTNsGvBu+nV0DPkJcH0vBWc+AxUAzDaAn/gRD8/
-FhEeCXXQI5I/up3XTe8CAwEAAaN3MHUwVAYDVR0RBE0wS4IYdm0taWRwLnBhcmlz
-LXNvcmJvbm5lLmZyhi9odHRwczovL3ZtLWlkcC5wYXJpcy1zb3Jib25uZS5mci9p
-ZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQU8B2ktyp27dZeWdcyJelNcFHP7RgwDQYJ
-KoZIhvcNAQEFBQADggEBACXuIAmAz7T7SXDdAVkSUSaRCd0WzhvG8TtN+VWtl3Uu
-kDLaNuh/dFuk+nCIv5V6Wpof7eLi5RAzfe/iHGknL6W4frMqA9bkIPZCIFTpzUrp
-wO9+6ygvgDnsPqPBwH80Bn7GKBd0/sXSLfXWOlFehgKxOJ+zG0UwvhoID7IqDNQL
-C2AglrZ2PAyVyFeA9T4sDI83Hw0TBXCGFlPKXAkxWw/DuATXn5ChB2ixfTmsxqvl
-KIhv18lDXRbS+DWI8nyXf/0TFFjjKFbfApQc11hVeHZWwDzjMexG2L/6pbt8rjDs
-hJGtnPWpe4IxhR2gkYkT1DdmPuvOIWlF0FJjuUGBBlA=
-					    </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>
-					      MIIDSzCCAjOgAwIBAgIUc0FQTVYKXqv1YkZNpjccybeOcxMwDQYJKoZIhvcNAQEF
-BQAwIzEhMB8GA1UEAxMYdm0taWRwLnBhcmlzLXNvcmJvbm5lLmZyMB4XDTEzMDYx
-ODEzMTg0OFoXDTMzMDYxODEzMTg0OFowIzEhMB8GA1UEAxMYdm0taWRwLnBhcmlz
-LXNvcmJvbm5lLmZyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAgPr/
-zq25BPrGBr/mp2KiN/5DhfHpmyjlVOb6b0txBrdLP1s2WzgY0HJPFsxzrh2Ms91E
-apkaQLyB9iqQPL49QKybBuGRkj/wXXXULzlG4bciAJ4vTwsiChXmvG7L1GXfvqRX
-vLrXLGcSts3MKbKTopqsrYI2MnoTxu95FiUoaxseT+ogy+e31n6iKd6ncR09cYGN
-4aeh4eTRwIsEkrTwYWzQJO0m8UXc1WKzKyhqA+Z4mOMwQbq261M2UHfyimBHqOTt
-VXELAQTGLd/2vBsLa9imthQ+P9DoEaeYbssgnKkNQyoqbDpBAq0Zs457W2A4N6o8
-WCg5bxcOBowGbfAxEQIDAQABo3cwdTBUBgNVHREETTBLghh2bS1pZHAucGFyaXMt
-c29yYm9ubmUuZnKGL2h0dHBzOi8vdm0taWRwLnBhcmlzLXNvcmJvbm5lLmZyL2lk
-cC9zaGliYm9sZXRoMB0GA1UdDgQWBBT7V2DX3R7WhN/ABHzjj6lZgnJz1DANBgkq
-hkiG9w0BAQUFAAOCAQEAZLSTb8R1WTiDwWaRwDQ+W2Zv3cPWay9bN8zm/zGOHnuM
-8ksyIPTQ0navE6gzty8E9GXMD2ymTjuycMuTkR6xZP9F3SB6GRtNIljpLIYxOdbZ
-gYR1+xemNL+5i2VJ5C5Lah2pPVtUiiOUEd8EBHtq5l5hlMslZMFeKgriLnf9ah4l
-rd2bCFrxuxvvj5td6FA+RgFyJyZ9UTAmzwVXzly6vxG9yGh9XXYzNXmcJtK07FDf
-I9JBAYDkTmGHFdS+c5GS+S4hUxdUCsnY9yNgwB3Ew/7r+IDDI2asBlICoLlCaO39
-lS5dpBgbSWTr2qcKD9KMAsG2n1+05Z0NNeohOEIEXg==
-					    </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://vm-idp.paris-sorbonne.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://vm-idp.paris-sorbonne.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://vm-idp.paris-sorbonne.fr/idp/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Paris-Sorbonne Universite</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Paris-Sorbonne Universite</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>NGUYEN Manh Hung</SurName>
-    <EmailAddress>manh-hung.nguyen@paris-sorbonne.fr</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <SurName>Brahim MARIR</SurName>
-    <EmailAddress>brahim.marir@paris-sorbonne.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/vmfetid.iamm.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/vmfetid.iamm.fr-idp-shibboleth.xml
deleted file mode 100644
index 6bd007b9..00000000
--- a/swamid-interfederations-2.0/vmfetid.iamm.fr-idp-shibboleth.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://vmfetid.iamm.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2014-03-19T13:59:43Z">
-      <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">iamm.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">CIHEAM / IAMM</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Personnel du CIHEAM / IAMM</mdui:Description>
-        <mdui:DisplayName xml:lang="fr">CIHEAM / IAMM</mdui:DisplayName>
-        <mdui:Description xml:lang="fr">Personnel du CIHEAM / IAMM</mdui:Description>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDJzCCAg+gAwIBAgIUa6YcSsah7wzB8e/uovuAIHgDDikwDQYJKoZIhvcNAQEF
-BQAwGjEYMBYGA1UEAxMPdm1mZXRpZC5pYW1tLmZyMB4XDTE0MDMxOTE0MzUxMloX
-DTM0MDMxOTE0MzUxMlowGjEYMBYGA1UEAxMPdm1mZXRpZC5pYW1tLmZyMIIBIjAN
-BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAgvu2YJSUPkAxdOhba3LMGpEcisXf
-VdNeH7ghFbg6CPBJUUNaDWftx8OqbB7q9UpYJRhSPxoZlsglDLCxmQPNH8zSC7F5
-Tg0cuRRMoUt7UopzEoDoeklLxfd8jTLXQBXdcQftKpZLuQAdSDuAMEW/n8pPTkCE
-Ujy7NkS7SwJTBz8aW2wiXiRrMoYO4MC0IxW0peQ9yp4ovjPqy8P/KfsPh/QjfevC
-PG+SH3J80NIjcSl6tf7CLJBVa4s/zfT6znpl1LB6qnV0gJ+jh+wSXIEsy+Q/Km/E
-VyiDxnl5NI04RKi7kDgPSpsbzAqa9oZrs9uZKIeer/lScG7oizWZZHDwXQIDAQAB
-o2UwYzBCBgNVHREEOzA5gg92bWZldGlkLmlhbW0uZnKGJmh0dHBzOi8vdm1mZXRp
-ZC5pYW1tLmZyL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBSRB4UIB+9SgknpoQOp
-MWDrw6esHjANBgkqhkiG9w0BAQUFAAOCAQEAK/jgKZJrp7uM7+h7wwHdByANU16I
-QVPXf5TNHqduJKKNgdZt84pq6ixn6WRxvFEuLWJdf2LRvRt2jwkaZEOM8gcZhUGq
-68F97X+xBDQt5iqMRmLVDnYsitc6osw5Kf4sxPdwDlt3k56aRl3vHADDsqK54vqI
-aFmAtn0cvucCFRDk7+BxejNbAi0cZWFz9yRaD2ACeJAZuNPt7giuIDjVX1hsD76f
-Oa/zVHg8v6w2WtOYhe/6PW6Aw0vPRStXXissHMStkekSzPRrHxZqu99YyyobYCKi
-I4Uca1MsJ2JD+Ds5G4kRkfKAWM9UDePCbVe9FM9SbU7rY9j+vHlnYjQpHg==
-					    </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://vmfetid.iamm.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://vmfetid.iamm.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://vmfetid.iamm.fr/idp/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">CIHEAM / IAMM</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">CIHEAM / IAMM</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <EmailAddress>assistance@iamm.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/vmfetid.iamm.fr.xml b/swamid-interfederations-2.0/vmfetid.iamm.fr.xml
deleted file mode 100644
index 6bd007b9..00000000
--- a/swamid-interfederations-2.0/vmfetid.iamm.fr.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://vmfetid.iamm.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2014-03-19T13:59:43Z">
-      <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">iamm.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">CIHEAM / IAMM</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Personnel du CIHEAM / IAMM</mdui:Description>
-        <mdui:DisplayName xml:lang="fr">CIHEAM / IAMM</mdui:DisplayName>
-        <mdui:Description xml:lang="fr">Personnel du CIHEAM / IAMM</mdui:Description>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDJzCCAg+gAwIBAgIUa6YcSsah7wzB8e/uovuAIHgDDikwDQYJKoZIhvcNAQEF
-BQAwGjEYMBYGA1UEAxMPdm1mZXRpZC5pYW1tLmZyMB4XDTE0MDMxOTE0MzUxMloX
-DTM0MDMxOTE0MzUxMlowGjEYMBYGA1UEAxMPdm1mZXRpZC5pYW1tLmZyMIIBIjAN
-BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAgvu2YJSUPkAxdOhba3LMGpEcisXf
-VdNeH7ghFbg6CPBJUUNaDWftx8OqbB7q9UpYJRhSPxoZlsglDLCxmQPNH8zSC7F5
-Tg0cuRRMoUt7UopzEoDoeklLxfd8jTLXQBXdcQftKpZLuQAdSDuAMEW/n8pPTkCE
-Ujy7NkS7SwJTBz8aW2wiXiRrMoYO4MC0IxW0peQ9yp4ovjPqy8P/KfsPh/QjfevC
-PG+SH3J80NIjcSl6tf7CLJBVa4s/zfT6znpl1LB6qnV0gJ+jh+wSXIEsy+Q/Km/E
-VyiDxnl5NI04RKi7kDgPSpsbzAqa9oZrs9uZKIeer/lScG7oizWZZHDwXQIDAQAB
-o2UwYzBCBgNVHREEOzA5gg92bWZldGlkLmlhbW0uZnKGJmh0dHBzOi8vdm1mZXRp
-ZC5pYW1tLmZyL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBSRB4UIB+9SgknpoQOp
-MWDrw6esHjANBgkqhkiG9w0BAQUFAAOCAQEAK/jgKZJrp7uM7+h7wwHdByANU16I
-QVPXf5TNHqduJKKNgdZt84pq6ixn6WRxvFEuLWJdf2LRvRt2jwkaZEOM8gcZhUGq
-68F97X+xBDQt5iqMRmLVDnYsitc6osw5Kf4sxPdwDlt3k56aRl3vHADDsqK54vqI
-aFmAtn0cvucCFRDk7+BxejNbAi0cZWFz9yRaD2ACeJAZuNPt7giuIDjVX1hsD76f
-Oa/zVHg8v6w2WtOYhe/6PW6Aw0vPRStXXissHMStkekSzPRrHxZqu99YyyobYCKi
-I4Uca1MsJ2JD+Ds5G4kRkfKAWM9UDePCbVe9FM9SbU7rY9j+vHlnYjQpHg==
-					    </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://vmfetid.iamm.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://vmfetid.iamm.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://vmfetid.iamm.fr/idp/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">CIHEAM / IAMM</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">CIHEAM / IAMM</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <EmailAddress>assistance@iamm.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/vmshib.ufrpe.br-idp-shibboleth.xml b/swamid-interfederations-2.0/vmshib.ufrpe.br-idp-shibboleth.xml
deleted file mode 100644
index 3d626ef5..00000000
--- a/swamid-interfederations-2.0/vmshib.ufrpe.br-idp-shibboleth.xml
+++ /dev/null
@@ -1,104 +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://vmshib.ufrpe.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">ufrpe.br</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">UFRPE - UNIVERSIDADE FEDERAL RURAL DE PERNAMBUCO</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="pt-br">UFRPE - UNIVERSIDADE FEDERAL RURAL DE PERNAMBUCO</mdui:DisplayName>
-        <mdui:Description xml:lang="en">UFRPE - UNIVERSIDADE FEDERAL RURAL DE PERNAMBUCO</mdui:Description>
-        <mdui:Description xml:lang="pt-br">UFRPE - UNIVERSIDADE FEDERAL RURAL DE PERNAMBUCO</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.ufrpe.br/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="pt-br">http://www.ufrpe.br/</mdui:InformationURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-    MIIDKDCCAhACAQAwDQYJKoZIhvcNAQEFBQAwWjExMC8GA1UECxMoTlRJIC0gTnVj
-bGVvIGRlIFRlY25vbG9naWEgZGEgSW5mb3JtYWNhbzELMAkGA1UEBhMCQlIxGDAW
-BgNVBAMTD3Ztc2hpYi51ZnJwZS5icjAeFw0xNDA0MjUyMDA4MzJaFw0xNzA0MjQy
-MDA4MzJaMFoxMTAvBgNVBAsTKE5USSAtIE51Y2xlbyBkZSBUZWNub2xvZ2lhIGRh
-IEluZm9ybWFjYW8xCzAJBgNVBAYTAkJSMRgwFgYDVQQDEw92bXNoaWIudWZycGUu
-YnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDPVBiRXs5gBanImYgn
-tpcQpVepaJQTv+xGZH3GZGMzgHzniCvpemzNTcMruZlNVEpHjJWDNSiPgLoVyruG
-i/JjlwlDjNyI7xklMBWBYIvPAlYgnoiV5cVtv0eum8e99ftVMifBVpD7NRWleFZQ
-moAmoGMqNgVfuOHaJ4bnXx9kluFXsaVKVJtTSiXqamtdliMxNf+JCWsxGZnRfaVS
-Y8MvcYz94+/t77q8mQUusSzXmouK5h8/Px1MaqTn97BEELL/4lSR368K7bTFt6Re
-GWP3vDRQq3fbBnOkpP8tCGTGB5kPKvu+7ohiMOSYPEVumpw6fQLbNt+3h6u7M88l
-VRW3AgMBAAEwDQYJKoZIhvcNAQEFBQADggEBAKF4iTFNslazhSUxZehAycdE+SFV
-oduDsDRA2q0ls46Q/hxpknmCtZC2jusrXx73BWcnzXixTWJIQDwzJK8AyZg6Qf6x
-anig/eIHv48U+D6pfdtFUDbSL2JeCe8oDJiMnEbAZvm4mTphUpmRcw1BHPH2kvVQ
-MKNAqfS7wH7beXEE283UQ6l6Sd45HEqaLAAqnF//j43t772tN3MtmL9Qd/WUyzTb
-xJmcDO6Xnxd2Dg/Hd379EKgwh2yD1snjdvKj61nR4YArdaB5elySqOs3jGc7qJJ5
-8a0HXbnnqC9q4O13ua1oVyg4O0Br9KBW9y4bro1ub/hBmt8n4lg31kvC0a0=
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://vmshib.ufrpe.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://vmshib.ufrpe.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://vmshib.ufrpe.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://vmshib.ufrpe.br/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://vmshib.ufrpe.br/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://vmshib.ufrpe.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">ufrpe.br</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-      
-MIIDKDCCAhACAQAwDQYJKoZIhvcNAQEFBQAwWjExMC8GA1UECxMoTlRJIC0gTnVj
-bGVvIGRlIFRlY25vbG9naWEgZGEgSW5mb3JtYWNhbzELMAkGA1UEBhMCQlIxGDAW
-BgNVBAMTD3Ztc2hpYi51ZnJwZS5icjAeFw0xNDA0MjUyMDA4MzJaFw0xNzA0MjQy
-MDA4MzJaMFoxMTAvBgNVBAsTKE5USSAtIE51Y2xlbyBkZSBUZWNub2xvZ2lhIGRh
-IEluZm9ybWFjYW8xCzAJBgNVBAYTAkJSMRgwFgYDVQQDEw92bXNoaWIudWZycGUu
-YnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDPVBiRXs5gBanImYgn
-tpcQpVepaJQTv+xGZH3GZGMzgHzniCvpemzNTcMruZlNVEpHjJWDNSiPgLoVyruG
-i/JjlwlDjNyI7xklMBWBYIvPAlYgnoiV5cVtv0eum8e99ftVMifBVpD7NRWleFZQ
-moAmoGMqNgVfuOHaJ4bnXx9kluFXsaVKVJtTSiXqamtdliMxNf+JCWsxGZnRfaVS
-Y8MvcYz94+/t77q8mQUusSzXmouK5h8/Px1MaqTn97BEELL/4lSR368K7bTFt6Re
-GWP3vDRQq3fbBnOkpP8tCGTGB5kPKvu+7ohiMOSYPEVumpw6fQLbNt+3h6u7M88l
-VRW3AgMBAAEwDQYJKoZIhvcNAQEFBQADggEBAKF4iTFNslazhSUxZehAycdE+SFV
-oduDsDRA2q0ls46Q/hxpknmCtZC2jusrXx73BWcnzXixTWJIQDwzJK8AyZg6Qf6x
-anig/eIHv48U+D6pfdtFUDbSL2JeCe8oDJiMnEbAZvm4mTphUpmRcw1BHPH2kvVQ
-MKNAqfS7wH7beXEE283UQ6l6Sd45HEqaLAAqnF//j43t772tN3MtmL9Qd/WUyzTb
-xJmcDO6Xnxd2Dg/Hd379EKgwh2yD1snjdvKj61nR4YArdaB5elySqOs3jGc7qJJ5
-8a0HXbnnqC9q4O13ua1oVyg4O0Br9KBW9y4bro1ub/hBmt8n4lg31kvC0a0=
-                    
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://vmshib.ufrpe.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://vmshib.ufrpe.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">UFRPE - UNIVERSIDADE FEDERAL RURAL DE PERNAMBUCO</OrganizationName>
-    <OrganizationName xml:lang="pt-br">UFRPE - UNIVERSIDADE FEDERAL RURAL DE PERNAMBUCO</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">UFRPE - UNIVERSIDADE FEDERAL RURAL DE PERNAMBUCO</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="pt-br">UFRPE - UNIVERSIDADE FEDERAL RURAL DE PERNAMBUCO</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.ufrpe.br/</OrganizationURL>
-    <OrganizationURL xml:lang="pt-br">http://www.ufrpe.br/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Fred Medeiros</SurName>
-    <EmailAddress>coord.suporte@nti.ufrpe.br</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/vmshib.ufrpe.br.xml b/swamid-interfederations-2.0/vmshib.ufrpe.br.xml
deleted file mode 100644
index 3d626ef5..00000000
--- a/swamid-interfederations-2.0/vmshib.ufrpe.br.xml
+++ /dev/null
@@ -1,104 +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://vmshib.ufrpe.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">ufrpe.br</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">UFRPE - UNIVERSIDADE FEDERAL RURAL DE PERNAMBUCO</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="pt-br">UFRPE - UNIVERSIDADE FEDERAL RURAL DE PERNAMBUCO</mdui:DisplayName>
-        <mdui:Description xml:lang="en">UFRPE - UNIVERSIDADE FEDERAL RURAL DE PERNAMBUCO</mdui:Description>
-        <mdui:Description xml:lang="pt-br">UFRPE - UNIVERSIDADE FEDERAL RURAL DE PERNAMBUCO</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.ufrpe.br/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="pt-br">http://www.ufrpe.br/</mdui:InformationURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-    MIIDKDCCAhACAQAwDQYJKoZIhvcNAQEFBQAwWjExMC8GA1UECxMoTlRJIC0gTnVj
-bGVvIGRlIFRlY25vbG9naWEgZGEgSW5mb3JtYWNhbzELMAkGA1UEBhMCQlIxGDAW
-BgNVBAMTD3Ztc2hpYi51ZnJwZS5icjAeFw0xNDA0MjUyMDA4MzJaFw0xNzA0MjQy
-MDA4MzJaMFoxMTAvBgNVBAsTKE5USSAtIE51Y2xlbyBkZSBUZWNub2xvZ2lhIGRh
-IEluZm9ybWFjYW8xCzAJBgNVBAYTAkJSMRgwFgYDVQQDEw92bXNoaWIudWZycGUu
-YnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDPVBiRXs5gBanImYgn
-tpcQpVepaJQTv+xGZH3GZGMzgHzniCvpemzNTcMruZlNVEpHjJWDNSiPgLoVyruG
-i/JjlwlDjNyI7xklMBWBYIvPAlYgnoiV5cVtv0eum8e99ftVMifBVpD7NRWleFZQ
-moAmoGMqNgVfuOHaJ4bnXx9kluFXsaVKVJtTSiXqamtdliMxNf+JCWsxGZnRfaVS
-Y8MvcYz94+/t77q8mQUusSzXmouK5h8/Px1MaqTn97BEELL/4lSR368K7bTFt6Re
-GWP3vDRQq3fbBnOkpP8tCGTGB5kPKvu+7ohiMOSYPEVumpw6fQLbNt+3h6u7M88l
-VRW3AgMBAAEwDQYJKoZIhvcNAQEFBQADggEBAKF4iTFNslazhSUxZehAycdE+SFV
-oduDsDRA2q0ls46Q/hxpknmCtZC2jusrXx73BWcnzXixTWJIQDwzJK8AyZg6Qf6x
-anig/eIHv48U+D6pfdtFUDbSL2JeCe8oDJiMnEbAZvm4mTphUpmRcw1BHPH2kvVQ
-MKNAqfS7wH7beXEE283UQ6l6Sd45HEqaLAAqnF//j43t772tN3MtmL9Qd/WUyzTb
-xJmcDO6Xnxd2Dg/Hd379EKgwh2yD1snjdvKj61nR4YArdaB5elySqOs3jGc7qJJ5
-8a0HXbnnqC9q4O13ua1oVyg4O0Br9KBW9y4bro1ub/hBmt8n4lg31kvC0a0=
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://vmshib.ufrpe.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://vmshib.ufrpe.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://vmshib.ufrpe.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://vmshib.ufrpe.br/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://vmshib.ufrpe.br/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://vmshib.ufrpe.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">ufrpe.br</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-      
-MIIDKDCCAhACAQAwDQYJKoZIhvcNAQEFBQAwWjExMC8GA1UECxMoTlRJIC0gTnVj
-bGVvIGRlIFRlY25vbG9naWEgZGEgSW5mb3JtYWNhbzELMAkGA1UEBhMCQlIxGDAW
-BgNVBAMTD3Ztc2hpYi51ZnJwZS5icjAeFw0xNDA0MjUyMDA4MzJaFw0xNzA0MjQy
-MDA4MzJaMFoxMTAvBgNVBAsTKE5USSAtIE51Y2xlbyBkZSBUZWNub2xvZ2lhIGRh
-IEluZm9ybWFjYW8xCzAJBgNVBAYTAkJSMRgwFgYDVQQDEw92bXNoaWIudWZycGUu
-YnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDPVBiRXs5gBanImYgn
-tpcQpVepaJQTv+xGZH3GZGMzgHzniCvpemzNTcMruZlNVEpHjJWDNSiPgLoVyruG
-i/JjlwlDjNyI7xklMBWBYIvPAlYgnoiV5cVtv0eum8e99ftVMifBVpD7NRWleFZQ
-moAmoGMqNgVfuOHaJ4bnXx9kluFXsaVKVJtTSiXqamtdliMxNf+JCWsxGZnRfaVS
-Y8MvcYz94+/t77q8mQUusSzXmouK5h8/Px1MaqTn97BEELL/4lSR368K7bTFt6Re
-GWP3vDRQq3fbBnOkpP8tCGTGB5kPKvu+7ohiMOSYPEVumpw6fQLbNt+3h6u7M88l
-VRW3AgMBAAEwDQYJKoZIhvcNAQEFBQADggEBAKF4iTFNslazhSUxZehAycdE+SFV
-oduDsDRA2q0ls46Q/hxpknmCtZC2jusrXx73BWcnzXixTWJIQDwzJK8AyZg6Qf6x
-anig/eIHv48U+D6pfdtFUDbSL2JeCe8oDJiMnEbAZvm4mTphUpmRcw1BHPH2kvVQ
-MKNAqfS7wH7beXEE283UQ6l6Sd45HEqaLAAqnF//j43t772tN3MtmL9Qd/WUyzTb
-xJmcDO6Xnxd2Dg/Hd379EKgwh2yD1snjdvKj61nR4YArdaB5elySqOs3jGc7qJJ5
-8a0HXbnnqC9q4O13ua1oVyg4O0Br9KBW9y4bro1ub/hBmt8n4lg31kvC0a0=
-                    
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://vmshib.ufrpe.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://vmshib.ufrpe.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">UFRPE - UNIVERSIDADE FEDERAL RURAL DE PERNAMBUCO</OrganizationName>
-    <OrganizationName xml:lang="pt-br">UFRPE - UNIVERSIDADE FEDERAL RURAL DE PERNAMBUCO</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">UFRPE - UNIVERSIDADE FEDERAL RURAL DE PERNAMBUCO</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="pt-br">UFRPE - UNIVERSIDADE FEDERAL RURAL DE PERNAMBUCO</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.ufrpe.br/</OrganizationURL>
-    <OrganizationURL xml:lang="pt-br">http://www.ufrpe.br/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Fred Medeiros</SurName>
-    <EmailAddress>coord.suporte@nti.ufrpe.br</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/vvc.niif.hu-shibboleth.xml b/swamid-interfederations-2.0/vvc.niif.hu-shibboleth.xml
deleted file mode 100644
index 34d74f75..00000000
--- a/swamid-interfederations-2.0/vvc.niif.hu-shibboleth.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://vvc.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</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" registrationInstant="2010-02-03T00:00:00Z"/>
-  </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:Logo height="86" width="150">https://metadata.eduid.hu/logos/niifi.png</mdui:Logo>
-        <mdui:InformationURL xml:lang="hu">http://vvc.niif.hu/</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="hu">http://vvc.niif.hu/</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>vvc.niif.hu</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDpjCCAo6gAwIBAgIJAMjwevTdUaFoMA0GCSqGSIb3DQEBBQUAMEAxCzAJBgNVBAYTAkhVMQ0wCwYDVQQKEwROSUlGMQwwCgYDVQQLEwNBQUkxFDASBgNVBAMTC3Z2Yy5uaWlmLmh1MB4XDTEwMDIwMzExMTA0NVoXDTM3MDYyMTExMTA0NVowQDELMAkGA1UEBhMCSFUxDTALBgNVBAoTBE5JSUYxDDAKBgNVBAsTA0FBSTEUMBIGA1UEAxMLdnZjLm5paWYuaHUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCoona+rrWD+FiNj++BK8vn/dQyMCteRKU4wa8ZTNycUjoP26eEOkBw6oqrnw1qyw3oKKUVfCEiIIlfXg9nJ5qMo7NTYKe/IlanYC+uGMTmT8DjgTH9fpA/8CoNjssuyAOhh0oEGdWoPcCd89K+II8uF7Fjz1EhP3WRhWfDTO+mfytMj4qwzV2oLUOfePt7LYMXNNoPkWAPa5bar/z0Nl244NjChWvSsM73r23yh1LTCmSH9Lhpotx/k+wvQybhraDhOE57NddmEL/5ylhX91Trsi32ukNO2XG4Ndbm5voonxeVRfB6j1rMa51SwEvTZkmDSThx7rvvzZ/f6x/9WdjDAgMBAAGjgaIwgZ8wHQYDVR0OBBYEFLwrQAopwhLyqnRtc3BcA1NQJZaBMHAGA1UdIwRpMGeAFLwrQAopwhLyqnRtc3BcA1NQJZaBoUSkQjBAMQswCQYDVQQGEwJIVTENMAsGA1UEChMETklJRjEMMAoGA1UECxMDQUFJMRQwEgYDVQQDEwt2dmMubmlpZi5odYIJAMjwevTdUaFoMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAHx0XxnnnmJztT/UEOrQ0nvR3NTGYJijfG68/bovwtrXJB+9plWTYyWyIeysddciTSgmaaVnGFw9jj8HtpuAvf3N5mKr6bELP8z7lhGa/WxKgjjv/ETTflNOCf8tkhxFJeSJC/Y03MOq+Xqb+6ZzriJIVNYhKDOxR+6inftRQSJ2NWmbgwurPYE/CpvqtDTrXeRnweZ1qAjWzKBswU5Un5mnPxcBPOoBuXtf3hhZU8/u4oXEBBQrsX0BsAFmY6VsJKO/UNB+AtAajgMZbngFXKBUCKDhSwmFUNjLda2MtF6WmuCUuMgQsdV6d/pp47VnVpkLLCVTNunYA/WvlS+G5kU=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://vvc.niif.hu/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://vvc.niif.hu/Shibboleth.sso/SLO/SOAP"/>
-    <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://vvc.niif.hu/Shibboleth.sso/SAML2/POST" index="1" isDefault="true"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://vvc.niif.hu/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AttributeConsumingService index="1" isDefault="true">
-      <ServiceName xml:lang="hu">NIIF kollaborációs portál</ServiceName>
-      <ServiceName xml:lang="en">NIIF Voice Video Collaboration Service</ServiceName>
-      <ServiceDescription xml:lang="hu">Elsősorban kutató-fejlesztő csoportok együttműködését hatékonyan támogató infokommunikációs szolgáltatások gyűjteménye (voip, web-, és videó konferencia).rn </ServiceDescription>
-      <ServiceDescription xml:lang="en">Community and support portal of NIIF collaboration services, which provides tools and information to access NIIF collaboration services like VoIP and Videoconferencing (MCU booking, videoconference recording, streaming, etc.)</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="mobile" Name="urn:oid:0.9.2342.19200300.100.1.41" 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"/>
-      <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"/>
-    </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>Video Admin</SurName>
-    <EmailAddress>mailto:video-admin@niif.hu</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="administrative">
-    <SurName>Video Admin</SurName>
-    <EmailAddress>mailto:video-admin@niif.hu</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/vvc.niif.hu.xml b/swamid-interfederations-2.0/vvc.niif.hu.xml
deleted file mode 100644
index 34d74f75..00000000
--- a/swamid-interfederations-2.0/vvc.niif.hu.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://vvc.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</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" registrationInstant="2010-02-03T00:00:00Z"/>
-  </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:Logo height="86" width="150">https://metadata.eduid.hu/logos/niifi.png</mdui:Logo>
-        <mdui:InformationURL xml:lang="hu">http://vvc.niif.hu/</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="hu">http://vvc.niif.hu/</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>vvc.niif.hu</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDpjCCAo6gAwIBAgIJAMjwevTdUaFoMA0GCSqGSIb3DQEBBQUAMEAxCzAJBgNVBAYTAkhVMQ0wCwYDVQQKEwROSUlGMQwwCgYDVQQLEwNBQUkxFDASBgNVBAMTC3Z2Yy5uaWlmLmh1MB4XDTEwMDIwMzExMTA0NVoXDTM3MDYyMTExMTA0NVowQDELMAkGA1UEBhMCSFUxDTALBgNVBAoTBE5JSUYxDDAKBgNVBAsTA0FBSTEUMBIGA1UEAxMLdnZjLm5paWYuaHUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCoona+rrWD+FiNj++BK8vn/dQyMCteRKU4wa8ZTNycUjoP26eEOkBw6oqrnw1qyw3oKKUVfCEiIIlfXg9nJ5qMo7NTYKe/IlanYC+uGMTmT8DjgTH9fpA/8CoNjssuyAOhh0oEGdWoPcCd89K+II8uF7Fjz1EhP3WRhWfDTO+mfytMj4qwzV2oLUOfePt7LYMXNNoPkWAPa5bar/z0Nl244NjChWvSsM73r23yh1LTCmSH9Lhpotx/k+wvQybhraDhOE57NddmEL/5ylhX91Trsi32ukNO2XG4Ndbm5voonxeVRfB6j1rMa51SwEvTZkmDSThx7rvvzZ/f6x/9WdjDAgMBAAGjgaIwgZ8wHQYDVR0OBBYEFLwrQAopwhLyqnRtc3BcA1NQJZaBMHAGA1UdIwRpMGeAFLwrQAopwhLyqnRtc3BcA1NQJZaBoUSkQjBAMQswCQYDVQQGEwJIVTENMAsGA1UEChMETklJRjEMMAoGA1UECxMDQUFJMRQwEgYDVQQDEwt2dmMubmlpZi5odYIJAMjwevTdUaFoMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAHx0XxnnnmJztT/UEOrQ0nvR3NTGYJijfG68/bovwtrXJB+9plWTYyWyIeysddciTSgmaaVnGFw9jj8HtpuAvf3N5mKr6bELP8z7lhGa/WxKgjjv/ETTflNOCf8tkhxFJeSJC/Y03MOq+Xqb+6ZzriJIVNYhKDOxR+6inftRQSJ2NWmbgwurPYE/CpvqtDTrXeRnweZ1qAjWzKBswU5Un5mnPxcBPOoBuXtf3hhZU8/u4oXEBBQrsX0BsAFmY6VsJKO/UNB+AtAajgMZbngFXKBUCKDhSwmFUNjLda2MtF6WmuCUuMgQsdV6d/pp47VnVpkLLCVTNunYA/WvlS+G5kU=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://vvc.niif.hu/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://vvc.niif.hu/Shibboleth.sso/SLO/SOAP"/>
-    <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://vvc.niif.hu/Shibboleth.sso/SAML2/POST" index="1" isDefault="true"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://vvc.niif.hu/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AttributeConsumingService index="1" isDefault="true">
-      <ServiceName xml:lang="hu">NIIF kollaborációs portál</ServiceName>
-      <ServiceName xml:lang="en">NIIF Voice Video Collaboration Service</ServiceName>
-      <ServiceDescription xml:lang="hu">Elsősorban kutató-fejlesztő csoportok együttműködését hatékonyan támogató infokommunikációs szolgáltatások gyűjteménye (voip, web-, és videó konferencia).rn </ServiceDescription>
-      <ServiceDescription xml:lang="en">Community and support portal of NIIF collaboration services, which provides tools and information to access NIIF collaboration services like VoIP and Videoconferencing (MCU booking, videoconference recording, streaming, etc.)</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="mobile" Name="urn:oid:0.9.2342.19200300.100.1.41" 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"/>
-      <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"/>
-    </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>Video Admin</SurName>
-    <EmailAddress>mailto:video-admin@niif.hu</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="administrative">
-    <SurName>Video Admin</SurName>
-    <EmailAddress>mailto:video-admin@niif.hu</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/wayf.card.kilroy.eu.xml b/swamid-interfederations-2.0/wayf.card.kilroy.eu.xml
deleted file mode 100644
index 982ad3d1..00000000
--- a/swamid-interfederations-2.0/wayf.card.kilroy.eu.xml
+++ /dev/null
@@ -1,36 +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://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/wayf.wayf.dk.xml b/swamid-interfederations-2.0/wayf.wayf.dk.xml
index 98ceefcf..b4cacf95 100644
--- a/swamid-interfederations-2.0/wayf.wayf.dk.xml
+++ b/swamid-interfederations-2.0/wayf.wayf.dk.xml
@@ -1,10 +1,5 @@
 <?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://wayf.wayf.dk">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.wayf.dk">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://wayf.dk/images/stories/WAYF-filer/metadataregistrationpracticestatementwayf.pdf</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </md:Extensions>
+<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://wayf.wayf.dk">
   <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
       <shibmd:Scope regexp="false">kb.dk</shibmd:Scope>
@@ -189,6 +184,11 @@
       <shibmd:Scope regexp="false">sbi.aau.dk@aau.dk</shibmd:Scope>
       <shibmd:Scope regexp="false">staff.aau.dk@aau.dk</shibmd:Scope>
       <shibmd:Scope regexp="false">student.aau.dk@aau.dk</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">denmark</saml:AttributeValue>
+        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">iceland</saml:AttributeValue>
+      </saml:Attribute>
     </md:Extensions>
     <md:KeyDescriptor use="signing">
       <ds:KeyInfo>
@@ -216,9 +216,4 @@
     <md:OrganizationURL xml:lang="da">http://wayf.dk/index.php/da</md:OrganizationURL>
     <md:OrganizationURL xml:lang="en">http://wayf.dk/index.php/en</md:OrganizationURL>
   </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>WAYF</md:GivenName>
-    <md:SurName>Operations</md:SurName>
-    <md:EmailAddress>drift@wayf.dk</md:EmailAddress>
-  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/webinar.nordu.net-shibboleth.xml b/swamid-interfederations-2.0/webinar.nordu.net-shibboleth.xml
deleted file mode 100644
index 46d23a2e..00000000
--- a/swamid-interfederations-2.0/webinar.nordu.net-shibboleth.xml
+++ /dev/null
@@ -1,90 +0,0 @@
-<?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://refeds.org/category/research-and-scholarship</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/webinar.nordu.net.xml b/swamid-interfederations-2.0/webinar.nordu.net.xml
deleted file mode 100644
index 46d23a2e..00000000
--- a/swamid-interfederations-2.0/webinar.nordu.net.xml
+++ /dev/null
@@ -1,90 +0,0 @@
-<?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://refeds.org/category/research-and-scholarship</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/weblicht.sfs.uni-tuebingen.de.xml b/swamid-interfederations-2.0/weblicht.sfs.uni-tuebingen.de.xml
index 555f7bcc..14fee192 100644
--- a/swamid-interfederations-2.0/weblicht.sfs.uni-tuebingen.de.xml
+++ b/swamid-interfederations-2.0/weblicht.sfs.uni-tuebingen.de.xml
@@ -1,97 +1,84 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://weblicht.sfs.uni-tuebingen.de">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2010-06-11T09:42:51Z">
-      <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>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="de">WebLicht</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">WebLicht</mdui:DisplayName>
-        <mdui:Description xml:lang="de">CLARIN Federation Demonstrator: several linguistic webapplications at the SfS Tübingen</mdui:Description>
-        <mdui:Description xml:lang="en">CLARIN Federation Demonstrator: several linguistic webapplications at the SfS Tübingen</mdui:Description>
-        <mdui:InformationURL xml:lang="de">http://weblicht.sfs.uni-tuebingen.de/weblichtwiki/index.php/Main_Page</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">http://weblicht.sfs.uni-tuebingen.de/weblichtwiki/index.php/Main_Page</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">http://weblicht.sfs.uni-tuebingen.de/weblichtwiki/index.php/WebLicht_Privacy_Policy_Document</mdui:PrivacyStatementURL>
+<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://weblicht.sfs.uni-tuebingen.de">
+  <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://weblicht.sfs.uni-tuebingen.de/Shibboleth.sso/Login" index="1"/>
+      <mdui:UIInfo>
+        <mdui:DisplayName xml:lang="fi">weblicht</mdui:DisplayName>
       </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>weblicht.sfs.uni-tuebingen.de</ds:KeyName>
+      <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:X509SubjectName>emailAddress=wladmin@sfs.uni-tuebingen.de,CN=weblicht.sfs.uni-tuebingen.de,OU=SfS,O=Universitaet Tuebingen,L=Tuebingen,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIGKzCCBROgAwIBAgIHF3iUXPRQADANBgkqhkiG9w0BAQUFADB3MQswCQYDVQQG
-EwJERTEfMB0GA1UEChMWVW5pdmVyc2l0YWV0IFR1ZWJpbmdlbjEcMBoGA1UEAxMT
-R2xvYmFsLVVOSVRVRS1DQSAwMTEpMCcGCSqGSIb3DQEJARYadW5pdHVlLWNhQHVu
-aS10dWViaW5nZW4uZGUwHhcNMTQwNDI0MTM1MTA4WhcNMTkwMjA0MDAwMDAwWjCB
-wjELMAkGA1UEBhMCREUxGzAZBgNVBAgTEkJhZGVuLVd1ZXJ0dGVtYmVyZzESMBAG
-A1UEBxMJVHVlYmluZ2VuMR8wHQYDVQQKExZVbml2ZXJzaXRhZXQgVHVlYmluZ2Vu
-MQwwCgYDVQQLEwNTZlMxJjAkBgNVBAMTHXdlYmxpY2h0LnNmcy51bmktdHVlYmlu
-Z2VuLmRlMSswKQYJKoZIhvcNAQkBFhx3bGFkbWluQHNmcy51bmktdHVlYmluZ2Vu
-LmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2KsTGSUCY/epaymY
-W3kqRl84RcNArc5w05x0rEi1qQUpAL1V7K7rJ/p5ZnjxqEhXEqYZXWh0ebkYWgzZ
-jr1Bs3mV1XVJ/9HrwRSFcNdyyFPmmP3Glsaculyn3zIQ4UcPyLk/kRlg37rx5nKj
-m3DZdrk345mjHO6MknFMSuh2TosI0tNhaa4rrRMJTlcOVJpiVlAF/DSZgwPjI6Yl
-5aHKes43tkCx1LJxDRAz9i/DaW4HdYNcwW3A0qlkRKRZqqVwRCG3Z5b9qdSry6t0
-UmmXMLYAxaStHVBx8d3eYWURfMLbvnpGKwWl0XGZQcevA9SzWswdmF/3X7zAmVAQ
-4L2qUQIDAQABo4ICbjCCAmowOQYDVR0gBDIwMDARBg8rBgEEAYGtIYIsAQEEAwEw
-EQYPKwYBBAGBrSGCLAIBBAMBMAgGBmeBDAECAjAJBgNVHRMEAjAAMAsGA1UdDwQE
-AwIE8DATBgNVHSUEDDAKBggrBgEFBQcDATAdBgNVHQ4EFgQU9cQi9vwBJfcH9+Ae
-ytdTniex90EwHwYDVR0jBBgwFoAUsMG7aDV/4tZBnBpxr+D8QTTNw6gwRgYDVR0R
-BD8wPYIdd2VibGljaHQuc2ZzLnVuaS10dWViaW5nZW4uZGWBHHdsYWRtaW5Ac2Zz
-LnVuaS10dWViaW5nZW4uZGUwgZMGA1UdHwSBizCBiDBCoECgPoY8aHR0cDovL2Nk
-cDEucGNhLmRmbi5kZS9jbGFzc2ljLXVuaXR1ZS1jYS9wdWIvY3JsL2dfY2Fjcmwu
-Y3JsMEKgQKA+hjxodHRwOi8vY2RwMi5wY2EuZGZuLmRlL2NsYXNzaWMtdW5pdHVl
-LWNhL3B1Yi9jcmwvZ19jYWNybC5jcmwwgeEGCCsGAQUFBwEBBIHUMIHRMDMGCCsG
-AQUFBzABhidodHRwOi8vb2NzcC5wY2EuZGZuLmRlL09DU1AtU2VydmVyL09DU1Aw
-TAYIKwYBBQUHMAKGQGh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvY2xhc3NpYy11bml0
-dWUtY2EvcHViL2NhY2VydC9nX2NhY2VydC5jcnQwTAYIKwYBBQUHMAKGQGh0dHA6
-Ly9jZHAyLnBjYS5kZm4uZGUvY2xhc3NpYy11bml0dWUtY2EvcHViL2NhY2VydC9n
-X2NhY2VydC5jcnQwDQYJKoZIhvcNAQEFBQADggEBAGZ9bLdCBVw1Txf0f59QvfPe
-Ic02a/QJieoXre844zW5ISZwp14vGy+yzk4BK1tSovtxwf/FHiC7Uoqi+T9cL7E5
-yBbP2Y6cBHJuxy4YyXLimJoO7NWBDW+MOQRN1HjI5KXTMhhzmI81iofZbBlZwCSe
-pUzeHCt4KF3LDrrvNy4YiziDuojh23MHEv8W1/aNhX4F0T+MvwO2dGxAbax7XgLL
-ndO3/u6io4gRQiXZrrAS+1ZXGybrr6gUBN6popli1bR148tWwZNzwe1NjbGBIA5a
-ydKuf18CBYHeixW6XzkCMEdcRTec/qVTn7stpLtuuC5TCblNKGDKmhx9Mec+1Jo=
-</ds:X509Certificate>
+          <ds:X509Certificate>MIIFpzCCBI+gAwIBAgIED+vXfzANBgkqhkiG9w0BAQUFADB3MQswCQYDVQQGEwJE
+RTEfMB0GA1UEChMWVW5pdmVyc2l0YWV0IFR1ZWJpbmdlbjEcMBoGA1UEAxMTR2xv
+YmFsLVVOSVRVRS1DQSAwMTEpMCcGCSqGSIb3DQEJARYadW5pdHVlLWNhQHVuaS10
+dWViaW5nZW4uZGUwHhcNMTAwNDE5MTMyNjA3WhcNMTUwNDE4MTMyNjA3WjCByzEL
+MAkGA1UEBhMCREUxHzAdBgNVBAoTFlVuaXZlcnNpdGFldCBUdWViaW5nZW4xKDAm
+BgNVBAsTH1NlbWluYXIgZnVlciBTcHJhY2h3aXNzZW5zY2hhZnQxDjAMBgNVBAsT
+BURTUElOMREwDwYDVQQLEwhXZWJMaWNodDEmMCQGA1UEAxMdd2VibGljaHQuc2Zz
+LnVuaS10dWViaW5nZW4uZGUxJjAkBgkqhkiG9w0BCQEWF2VoQHNmcy51bmktdHVl
+YmluZ2VuLmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAnJJ+lISL
+liCGHMdtC5EKdkSPkZIEfGf6u0I2YT+u/bX37XL4yOvmMxJxRLQM4oEvnE67n8k8
+4qe06B8xErFh3KqgC5Q5keUlQmXJu4wvABnk9AuxlwJKuGXI3PetBYfhid10A7Iu
+3Ki0s3j7+7yYTG6xXJt4qrE7rV/v79zBQcoKOwu1AMdfV9q8GRShEXCQ82P4IITT
+Q4z513p1e0mscDdBIunH6aThNCJA9rUBwEVX90HX5KHaOPSksHISylhjl/++XJFy
+/0wBpiZ4+7pN2S/go9J8A153NZSPhF2M5deyWgjT/K2LSudLnegIlRFTq1Kv89eE
+bF/ZaHuNvakbqQIDAQABo4IB5DCCAeAwCQYDVR0TBAIwADALBgNVHQ8EBAMCBeAw
+HQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMB0GA1UdDgQWBBRmWkIAb3Vr
+zkTtELxvwSx4nngcUDAfBgNVHSMEGDAWgBSwwbtoNX/i1kGcGnGv4PxBNM3DqDAi
+BgNVHREEGzAZgRdlaEBzZnMudW5pLXR1ZWJpbmdlbi5kZTCBkwYDVR0fBIGLMIGI
+MEKgQKA+hjxodHRwOi8vY2RwMS5wY2EuZGZuLmRlL2NsYXNzaWMtdW5pdHVlLWNh
+L3B1Yi9jcmwvZ19jYWNybC5jcmwwQqBAoD6GPGh0dHA6Ly9jZHAyLnBjYS5kZm4u
+ZGUvY2xhc3NpYy11bml0dWUtY2EvcHViL2NybC9nX2NhY3JsLmNybDCBrAYIKwYB
+BQUHAQEEgZ8wgZwwTAYIKwYBBQUHMAKGQGh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUv
+Y2xhc3NpYy11bml0dWUtY2EvcHViL2NhY2VydC9nX2NhY2VydC5jcnQwTAYIKwYB
+BQUHMAKGQGh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvY2xhc3NpYy11bml0dWUtY2Ev
+cHViL2NhY2VydC9nX2NhY2VydC5jcnQwDQYJKoZIhvcNAQEFBQADggEBAGxJyokA
+uUwUFzvszzutQNicSlWWHmrB6g63cRkbgBMsNGFwIyhrizCJtPYTDAbJ1lG2PrYj
+YpbhHR4892JIAm1IkyR4sJvAKXgnzNHtTy1ZTmlP7BjekPb6pcSRWAra84A+bOWY
++Q3KRITfEcUfsFw/PWYO8qwDurTWGBK3ReWkwLJ9y89XZDXQZt4A9RQnnBvnC7RU
+kLkAmxRV27neEuG8eh0tuFXStHuLbClnNnHaAt1c8m2awjWCWShG5cTR99muSJTc
+NGifdwt0qWax50ASplgOtT/GZAw2E7HEEgbDA+6JcKpVlh+UMnk2JN+nkkKUjgnD
+wN2yHSwHNNMiiGY=</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://weblicht.sfs.uni-tuebingen.de/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://weblicht.sfs.uni-tuebingen.de/Shibboleth.sso/SAML/POST" index="6"/>
-    <AttributeConsumingService index="1">
-      <ServiceName xml:lang="de">WebLicht</ServiceName>
-      <ServiceName xml:lang="en">WebLicht</ServiceName>
-      <ServiceDescription xml:lang="de">CLARIN Federation Demonstrator: several linguistic webapplications at the SfS Tübingen</ServiceDescription>
-      <ServiceDescription xml:lang="en">CLARIN Federation Demonstrator: several linguistic webapplications at the SfS Tübingen</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="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"/>
-    </AttributeConsumingService>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">e60</OrganizationName>
-    <OrganizationName xml:lang="en">e60</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">Universität Tübingen</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">University of Tuebingen</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.uni-tuebingen.de/</OrganizationURL>
-    <OrganizationURL xml:lang="en">http://www.uni-tuebingen.de/en/landingpage.html</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Department of Linguistics, General and Computational Linguistics</GivenName>
-    <SurName>Support</SurName>
-    <EmailAddress>mailto:wladmin@sfs.uni-tuebingen.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="support">
-    <GivenName>Department of Linguistics, General and Computational Linguistics</GivenName>
-    <SurName>Support</SurName>
-    <EmailAddress>mailto:wladmin@sfs.uni-tuebingen.de</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://weblicht.sfs.uni-tuebingen.de/Shibboleth.sso/SAML2/POST" index="1" isDefault="true"/>
+    <md:AttributeConsumingService index="1" isDefault="true">
+      <md:ServiceName xml:lang="fi">WebLicht</md:ServiceName>
+      <md:ServiceName xml:lang="en">WebLicht</md:ServiceName>
+      <md:ServiceName xml:lang="sv">WebLicht</md:ServiceName>
+      <md:ServiceDescription xml:lang="fi">Web-based linguistic chaining tool.</md:ServiceDescription>
+      <md:ServiceDescription xml:lang="en">Web-based linguistic chaining tool.</md:ServiceDescription>
+      <md:ServiceDescription xml:lang="sv">Web-based linguistic chaining tool.</md:ServiceDescription>
+      <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:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="fi">CLARIN Service Provider Federation/MPI</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">CLARIN Service Provider Federation/MPI</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">CLARIN Service Provider Federation/MPI</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="fi">CLARIN Service Provider Federation/MPI</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">CLARIN Service Provider Federation/MPI</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">CLARIN Service Provider Federation/MPI</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="fi">http://www.clarin.eu</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.clarin.eu</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">http://www.clarin.eu</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Thomas</md:GivenName>
+    <md:SurName>Zastrow</md:SurName>
+    <md:EmailAddress>mailto:thomas.zastrow@uni-tuebingen.de</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Thomas</md:GivenName>
+    <md:SurName>Zastrow</md:SurName>
+    <md:EmailAddress>mailto:thomas.zastrow@uni-tuebingen.de</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/weblogin.uu.se-idp-shibboleth.xml b/swamid-interfederations-2.0/weblogin.uu.se-idp-shibboleth.xml
deleted file mode 100644
index 1b0956e5..00000000
--- a/swamid-interfederations-2.0/weblogin.uu.se-idp-shibboleth.xml
+++ /dev/null
@@ -1,137 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" 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>
-    <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-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <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">Gemensam webbinloggning för anställda, studenter och övriga verksamma vid Uppsala universitet.</mdui:Description>
-        <mdui:Description xml:lang="en">The Uppsala University Identity Provider is used by employees and students at the university.</mdui:Description>
-        <mdui:InformationURL xml:lang="sv">https://weblogin.uu.se</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">https://weblogin.uu.se/english.html</mdui:InformationURL>
-        <mdui:Logo height="50" width="50">https://weblogin.uu.se/idp/UUlogin/img/logga-50.png</mdui:Logo>
-        <mdui:Logo height="50" width="50" xml:lang="sv">https://weblogin.uu.se/idp/UUlogin/img/logga-50.png</mdui:Logo>
-        <mdui:Logo height="50" width="50" xml:lang="en">https://weblogin.uu.se/idp/UUlogin/img/logga-50.png</mdui:Logo>
-        <mdui:PrivacyStatementURL xml:lang="sv">https://weblogin.uu.se/#2</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://weblogin.uu.se/english.html#2</mdui:PrivacyStatementURL>
-        <mdui:Keywords xml:lang="sv">uppsala+universitet</mdui:Keywords>
-        <mdui:Keywords xml:lang="en">uppsala+universitet</mdui:Keywords>
-      </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="administrative">
-    <Company>Uppsala University</Company>
-    <SurName>SAML2 admins</SurName>
-    <EmailAddress>akka-datordrift@its.uu.se</EmailAddress>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
-    <Company>Uppsala University</Company>
-    <SurName>SAML2 admins</SurName>
-    <EmailAddress>akka-datordrift@its.uu.se</EmailAddress>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
-    <Company>Uppsala universitet</Company>
-    <SurName>IT Servicedesk</SurName>
-    <EmailAddress>helpdesk@uu.se</EmailAddress>
-    <TelephoneNumber>+46 18 4714400</TelephoneNumber>
-  </ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/weblogin.uu.se.xml b/swamid-interfederations-2.0/weblogin.uu.se.xml
deleted file mode 100644
index 1b0956e5..00000000
--- a/swamid-interfederations-2.0/weblogin.uu.se.xml
+++ /dev/null
@@ -1,137 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" 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>
-    <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-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <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">Gemensam webbinloggning för anställda, studenter och övriga verksamma vid Uppsala universitet.</mdui:Description>
-        <mdui:Description xml:lang="en">The Uppsala University Identity Provider is used by employees and students at the university.</mdui:Description>
-        <mdui:InformationURL xml:lang="sv">https://weblogin.uu.se</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">https://weblogin.uu.se/english.html</mdui:InformationURL>
-        <mdui:Logo height="50" width="50">https://weblogin.uu.se/idp/UUlogin/img/logga-50.png</mdui:Logo>
-        <mdui:Logo height="50" width="50" xml:lang="sv">https://weblogin.uu.se/idp/UUlogin/img/logga-50.png</mdui:Logo>
-        <mdui:Logo height="50" width="50" xml:lang="en">https://weblogin.uu.se/idp/UUlogin/img/logga-50.png</mdui:Logo>
-        <mdui:PrivacyStatementURL xml:lang="sv">https://weblogin.uu.se/#2</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://weblogin.uu.se/english.html#2</mdui:PrivacyStatementURL>
-        <mdui:Keywords xml:lang="sv">uppsala+universitet</mdui:Keywords>
-        <mdui:Keywords xml:lang="en">uppsala+universitet</mdui:Keywords>
-      </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="administrative">
-    <Company>Uppsala University</Company>
-    <SurName>SAML2 admins</SurName>
-    <EmailAddress>akka-datordrift@its.uu.se</EmailAddress>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
-    <Company>Uppsala University</Company>
-    <SurName>SAML2 admins</SurName>
-    <EmailAddress>akka-datordrift@its.uu.se</EmailAddress>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
-    <Company>Uppsala universitet</Company>
-    <SurName>IT Servicedesk</SurName>
-    <EmailAddress>helpdesk@uu.se</EmailAddress>
-    <TelephoneNumber>+46 18 4714400</TelephoneNumber>
-  </ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/weblogin2.geant.net-adfs-services-trust.xml b/swamid-interfederations-2.0/weblogin2.geant.net-adfs-services-trust.xml
deleted file mode 100644
index 58c8e156..00000000
--- a/swamid-interfederations-2.0/weblogin2.geant.net-adfs-services-trust.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="http://weblogin2.geant.net/adfs/services/trust">
-  <!--
-		This is a "GÉANT Intranet" ADFS SP for Delivery of Advanced Network Technology to Europe Limited.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-03-18T15:23:31Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</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 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 Intranet</mdui:DisplayName>
-        <mdui:Description xml:lang="en">A collaboration platform for GÉANT Project participants.</mdui:Description>
-        <mdui:PrivacyStatementURL xml:lang="en">http://weblogin2.geant.net/PrivacyPolicy/GEANTIntranetPrivacyPolicy.htm</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIEfzCCA2egAwIBAgIQQSSnV5Mk/EXZxgrsbnU7ajANBgkqhkiG9w0BAQUFADA2
-						MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-						U1NMIENBMB4XDTEzMDMwNjAwMDAwMFoXDTE2MDMwNTIzNTk1OVowRzEhMB8GA1UE
-						CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMSIwIAYDVQQDExlzcDIwMTMtaGEt
-						YWRmczIuZ2VhbnQubmV0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
-						qzeOIPfgr/SneQUtjqDRGLbG4YKxmo2zfAIF+wjaYXnDTq/yWt852nImchvCgjWu
-						eXnHJ6oZZGdaN4kMgPh1oxqJ4UE6dXY9HEoru/Awp2P/CGiYOQ4Q5u5+AyFznGRx
-						y2uNYrD85C6uTIgiKytH6Lai8f6dFxHKO/u8o+kbrl2Z1CkAf6wePu2H5a44tGnF
-						SP/s7lW4ScSthNz1OF8BoPFKpWUmJk/584rZZjR+fqB9fQBwxRoRBCFZTduXP0G9
-						861BS6Nt6Dfuli9jdCBC0L8ai4fH43a94EQVmMfcjImrkYBg7v6lVS4IY75ONiOt
-						sObamvbT+yNEuqw0jBjmKwIDAQABo4IBdjCCAXIwHwYDVR0jBBgwFoAUDL2TaAzz
-						3qujSWsrN1dH6pDjue0wHQYDVR0OBBYEFBQXWZZ8RdkPMtC2o0RF+T+gH7VsMA4G
-						A1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMB
-						BggrBgEFBQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6
-						BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVO
-						QVNTTENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9j
-						cnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpo
-						dHRwOi8vb2NzcC50Y3MudGVyZW5hLm9yZzAkBgNVHREEHTAbghlzcDIwMTMtaGEt
-						YWRmczIuZ2VhbnQubmV0MA0GCSqGSIb3DQEBBQUAA4IBAQCRJqxXjeInIqlPLH5+
-						iFqL92oLPKiJDqlDWpzR9P0xF7IS4oBApWZ3f2Rgcx1dtwUf7TakMpAuxIxzMjfP
-						xaik/AuInMjxKU9AJS/lRlLogT3YXZ2aAGZbt2P/hYn4mdn5ryB9WF/w7mnyrpBb
-						o7vllsYXYmRX/c0MEPYfSMoKxomRAY2ViIh83m4sYk8+Nkm+3I9t0O3wBqaQYqpc
-						Mg48AG2JwLeuKUIC+faPOckeMXdrknL0Ra7Vb+eRoEKCqw3L9ka5/rloFNEN+hMZ
-						zubyfY3feeIV+kq3YNmjCwhDqckv5kXAdnkFprjB3X/xNfML2Jum02hKkff4AYfP
-						2IOi
-					</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>
-						MIIEfzCCA2egAwIBAgIQF6zX9vs9vNm8j+JNDERNrzANBgkqhkiG9w0BAQUFADA2
-						MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-						U1NMIENBMB4XDTEzMDMwNjAwMDAwMFoXDTE2MDMwNTIzNTk1OVowRzEhMB8GA1UE
-						CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMSIwIAYDVQQDExlzcDIwMTMtaGEt
-						YWRmczEuZ2VhbnQubmV0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
-						uKfTJW51WQmvVJxulyh0wNtFIPPLzggtQIeUOvPGiTXexjTrr53MJq45xCa/7mCM
-						pfmtoH8ab1BjXRUzdiz4/YuXdCrkOL/tr9Mb4S/DndLdLfeOrvD3ybgq8Xar1YYL
-						7Xzi1N3eHVoAvl/CQv4VWtw2Vi64uRox8BaF1UtHnwTeAvAhGzn/q7kaaaKSfJJa
-						9dyfyuOyeST6mrxFz9vb4EQ5Lun4XDJCcP85RiiPBF1pkVgyVNtKfN1EMiuEzlUY
-						mUXVGnw7b/oHrvKTYD6XXXMCg9i9hc0ISS2Xwc4bMT5jtVoS1MSpV4rCBDmf5q75
-						QVS/sRGhlGS6XWsiUFElJQIDAQABo4IBdjCCAXIwHwYDVR0jBBgwFoAUDL2TaAzz
-						3qujSWsrN1dH6pDjue0wHQYDVR0OBBYEFIeBraKafW8VLXEb6g6HwVi6+8nVMA4G
-						A1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMB
-						BggrBgEFBQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6
-						BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVO
-						QVNTTENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9j
-						cnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpo
-						dHRwOi8vb2NzcC50Y3MudGVyZW5hLm9yZzAkBgNVHREEHTAbghlzcDIwMTMtaGEt
-						YWRmczEuZ2VhbnQubmV0MA0GCSqGSIb3DQEBBQUAA4IBAQBzqXX72xflZ+TDvjBO
-						Zb8xzcHD2ejDznK3SfK15AvXFenR6BhLnAJO2bllnqh3BpB3IzVm7Qc3Sxt2SK/5
-						li8bnLC5Qw6jtHHZtrIJiU5OQNQaln2rwR4rxE9NZs+RR7KjBUwLMhFvm+Akqr8g
-						oYOqvI8nIiC5IVzKss30nqQRnyl8nJK2sV/pQ78E9kF397uINVme1uFCMzXnAO9S
-						Ry3GIMFd4ky6VaECWVQANXusa3cklaFk4Bl8HwihDqqZCBvu8u6LZCbnlwX4ruLH
-						2+TAfutGBPunq7oftkXZ1qWqt5LQF7kReueHyd+Dplaxj3s6Kk/7HhfUXRC8mfNB
-						BDy6
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://weblogin2.geant.net/adfs/ls/"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://weblogin2.geant.net/adfs/ls/"/>
-    <NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</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" Location="https://weblogin2.geant.net/adfs/ls/" index="0" isDefault="true"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://weblogin2.geant.net/adfs/ls/" index="1"/>
-    <AttributeConsumingService index="1">
-      <ServiceName xml:lang="en">GÉANT Intranet</ServiceName>
-      <ServiceDescription xml:lang="en">A collaboration platform for GÉANT Project participants.</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="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="false"/>
-      <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="false"/>
-    </AttributeConsumingService>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Delivery of Advanced Network Technology to Europe Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">GÉANT Intranet</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.dante.net/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>DANTE IT Support</GivenName>
-    <EmailAddress>mailto:DANTEITSupport@dante.net</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>DANTE IT</GivenName>
-    <EmailAddress>mailto:it@dante.net</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/weblogin2.geant.net.xml b/swamid-interfederations-2.0/weblogin2.geant.net.xml
deleted file mode 100644
index 58c8e156..00000000
--- a/swamid-interfederations-2.0/weblogin2.geant.net.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="http://weblogin2.geant.net/adfs/services/trust">
-  <!--
-		This is a "GÉANT Intranet" ADFS SP for Delivery of Advanced Network Technology to Europe Limited.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-03-18T15:23:31Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</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 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 Intranet</mdui:DisplayName>
-        <mdui:Description xml:lang="en">A collaboration platform for GÉANT Project participants.</mdui:Description>
-        <mdui:PrivacyStatementURL xml:lang="en">http://weblogin2.geant.net/PrivacyPolicy/GEANTIntranetPrivacyPolicy.htm</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIEfzCCA2egAwIBAgIQQSSnV5Mk/EXZxgrsbnU7ajANBgkqhkiG9w0BAQUFADA2
-						MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-						U1NMIENBMB4XDTEzMDMwNjAwMDAwMFoXDTE2MDMwNTIzNTk1OVowRzEhMB8GA1UE
-						CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMSIwIAYDVQQDExlzcDIwMTMtaGEt
-						YWRmczIuZ2VhbnQubmV0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
-						qzeOIPfgr/SneQUtjqDRGLbG4YKxmo2zfAIF+wjaYXnDTq/yWt852nImchvCgjWu
-						eXnHJ6oZZGdaN4kMgPh1oxqJ4UE6dXY9HEoru/Awp2P/CGiYOQ4Q5u5+AyFznGRx
-						y2uNYrD85C6uTIgiKytH6Lai8f6dFxHKO/u8o+kbrl2Z1CkAf6wePu2H5a44tGnF
-						SP/s7lW4ScSthNz1OF8BoPFKpWUmJk/584rZZjR+fqB9fQBwxRoRBCFZTduXP0G9
-						861BS6Nt6Dfuli9jdCBC0L8ai4fH43a94EQVmMfcjImrkYBg7v6lVS4IY75ONiOt
-						sObamvbT+yNEuqw0jBjmKwIDAQABo4IBdjCCAXIwHwYDVR0jBBgwFoAUDL2TaAzz
-						3qujSWsrN1dH6pDjue0wHQYDVR0OBBYEFBQXWZZ8RdkPMtC2o0RF+T+gH7VsMA4G
-						A1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMB
-						BggrBgEFBQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6
-						BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVO
-						QVNTTENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9j
-						cnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpo
-						dHRwOi8vb2NzcC50Y3MudGVyZW5hLm9yZzAkBgNVHREEHTAbghlzcDIwMTMtaGEt
-						YWRmczIuZ2VhbnQubmV0MA0GCSqGSIb3DQEBBQUAA4IBAQCRJqxXjeInIqlPLH5+
-						iFqL92oLPKiJDqlDWpzR9P0xF7IS4oBApWZ3f2Rgcx1dtwUf7TakMpAuxIxzMjfP
-						xaik/AuInMjxKU9AJS/lRlLogT3YXZ2aAGZbt2P/hYn4mdn5ryB9WF/w7mnyrpBb
-						o7vllsYXYmRX/c0MEPYfSMoKxomRAY2ViIh83m4sYk8+Nkm+3I9t0O3wBqaQYqpc
-						Mg48AG2JwLeuKUIC+faPOckeMXdrknL0Ra7Vb+eRoEKCqw3L9ka5/rloFNEN+hMZ
-						zubyfY3feeIV+kq3YNmjCwhDqckv5kXAdnkFprjB3X/xNfML2Jum02hKkff4AYfP
-						2IOi
-					</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>
-						MIIEfzCCA2egAwIBAgIQF6zX9vs9vNm8j+JNDERNrzANBgkqhkiG9w0BAQUFADA2
-						MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-						U1NMIENBMB4XDTEzMDMwNjAwMDAwMFoXDTE2MDMwNTIzNTk1OVowRzEhMB8GA1UE
-						CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMSIwIAYDVQQDExlzcDIwMTMtaGEt
-						YWRmczEuZ2VhbnQubmV0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
-						uKfTJW51WQmvVJxulyh0wNtFIPPLzggtQIeUOvPGiTXexjTrr53MJq45xCa/7mCM
-						pfmtoH8ab1BjXRUzdiz4/YuXdCrkOL/tr9Mb4S/DndLdLfeOrvD3ybgq8Xar1YYL
-						7Xzi1N3eHVoAvl/CQv4VWtw2Vi64uRox8BaF1UtHnwTeAvAhGzn/q7kaaaKSfJJa
-						9dyfyuOyeST6mrxFz9vb4EQ5Lun4XDJCcP85RiiPBF1pkVgyVNtKfN1EMiuEzlUY
-						mUXVGnw7b/oHrvKTYD6XXXMCg9i9hc0ISS2Xwc4bMT5jtVoS1MSpV4rCBDmf5q75
-						QVS/sRGhlGS6XWsiUFElJQIDAQABo4IBdjCCAXIwHwYDVR0jBBgwFoAUDL2TaAzz
-						3qujSWsrN1dH6pDjue0wHQYDVR0OBBYEFIeBraKafW8VLXEb6g6HwVi6+8nVMA4G
-						A1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMB
-						BggrBgEFBQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6
-						BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVO
-						QVNTTENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9j
-						cnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpo
-						dHRwOi8vb2NzcC50Y3MudGVyZW5hLm9yZzAkBgNVHREEHTAbghlzcDIwMTMtaGEt
-						YWRmczEuZ2VhbnQubmV0MA0GCSqGSIb3DQEBBQUAA4IBAQBzqXX72xflZ+TDvjBO
-						Zb8xzcHD2ejDznK3SfK15AvXFenR6BhLnAJO2bllnqh3BpB3IzVm7Qc3Sxt2SK/5
-						li8bnLC5Qw6jtHHZtrIJiU5OQNQaln2rwR4rxE9NZs+RR7KjBUwLMhFvm+Akqr8g
-						oYOqvI8nIiC5IVzKss30nqQRnyl8nJK2sV/pQ78E9kF397uINVme1uFCMzXnAO9S
-						Ry3GIMFd4ky6VaECWVQANXusa3cklaFk4Bl8HwihDqqZCBvu8u6LZCbnlwX4ruLH
-						2+TAfutGBPunq7oftkXZ1qWqt5LQF7kReueHyd+Dplaxj3s6Kk/7HhfUXRC8mfNB
-						BDy6
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://weblogin2.geant.net/adfs/ls/"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://weblogin2.geant.net/adfs/ls/"/>
-    <NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</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" Location="https://weblogin2.geant.net/adfs/ls/" index="0" isDefault="true"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://weblogin2.geant.net/adfs/ls/" index="1"/>
-    <AttributeConsumingService index="1">
-      <ServiceName xml:lang="en">GÉANT Intranet</ServiceName>
-      <ServiceDescription xml:lang="en">A collaboration platform for GÉANT Project participants.</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="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="false"/>
-      <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="false"/>
-    </AttributeConsumingService>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Delivery of Advanced Network Technology to Europe Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">GÉANT Intranet</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.dante.net/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>DANTE IT Support</GivenName>
-    <EmailAddress>mailto:DANTEITSupport@dante.net</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>DANTE IT</GivenName>
-    <EmailAddress>mailto:it@dante.net</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/whoami.cesnet.cz-idp-shibboleth.xml b/swamid-interfederations-2.0/whoami.cesnet.cz-idp-shibboleth.xml
deleted file mode 100644
index 916401f6..00000000
--- a/swamid-interfederations-2.0/whoami.cesnet.cz-idp-shibboleth.xml
+++ /dev/null
@@ -1,121 +0,0 @@
-<?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://whoami.cesnet.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/" registrationInstant="2010-09-15T11:47:38Z">
-      <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>
-    <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://eduid.cz/uri/idp-group/cesnet</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>
-      <shibmd:Scope regexp="false">cesnet.cz</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">CESNET</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="cs">CESNET</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Identity Provider for CESNET employees.</mdui:Description>
-        <mdui:Description xml:lang="cs">Identity Provider pro zaměstnance CESNETu.</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.ces.net/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="cs">http://www.cesnet.cz/</mdui:InformationURL>
-        <mdui:Logo height="88" width="200">https://pki.cesnet.cz/_media/cs/cesnet-logo-200.gif</mdui:Logo>
-        <mdui:Logo height="177" width="400">https://pki.cesnet.cz/_media/cs/cesnet-logo-400.gif</mdui:Logo>
-        <mdui:Logo height="353" width="800">https://pki.cesnet.cz/_media/cs/cesnet-logo-800.gif</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIC7jCCAdYCCQCRzSvIiTLzPDANBgkqhkiG9w0BAQUFADA5MQswCQYDVQQGEwJD
-WjEPMA0GA1UEChMGQ0VTTkVUMRkwFwYDVQQDExB3aG9hbWkuY2VzbmV0LmN6MB4X
-DTExMDYyODE3MTUxNloXDTIxMDYyNTE3MTUxNlowOTELMAkGA1UEBhMCQ1oxDzAN
-BgNVBAoTBkNFU05FVDEZMBcGA1UEAxMQd2hvYW1pLmNlc25ldC5jejCCASIwDQYJ
-KoZIhvcNAQEBBQADggEPADCCAQoCggEBALVaOoSPi3RrWjAIk9qneCw48UDTRqsZ
-saD3YGWGpUzigUqAIFgNewH4gFyZskhgeUB185iBCgsb5+oiNwdGKvm0dSRS8qlo
-vjzbeBP7sSVbgmOeeRy6W9AD8cA7HMrrHXxLn7LFGk2czY+dtEWkA0CFVYOR/JGX
-2a8g0YfHqRypU7DKqoo5feB7eUclzwhiZ9jsjqbE//M3LUk/QPIbxfimB8XFY7tV
-ijdFXkmSyz84FDZhCQ4eypu5Pn6+ov4BF/MXZGjFSsBbUKWL4UDAyL+y7LlzvsZq
-sJ4crixV7D3+ChkCaimW2+ETRZF/3F7c52SiqIgjCnvUV90ttGqQWrsCAwEAATAN
-BgkqhkiG9w0BAQUFAAOCAQEAjxVz8kXKKtoM449sxOGg1+pp/rio4vUpZ//nSfwf
-HnbZdesPoLoE58o+U5E3+e5hcN9jRbOEYyFt1oR9uTmYyo19G6CARvN3HNbUL5dW
-ID4yEvYy54tvokxqWNisk5NtXgOmOD+U2NX0FwAkoCDYOKboASeZ5PTQ5uvIo2Cm
-ljL8VHxgCZ+N4/UYnz3xAiJBKXCFLNgTMVIM2HKNYioKUqxubVDapR9E94vLzuvs
-9NVKKQfcm4DAMfylJKBLMGFNdqNwiFmczxxkOr3Me+vn+Tb7XRzT1tSmQkwilpmY
-i/DVjni4yQ3gisrqPcpvzGZCN/doncbNZ5ZRUerR17Waeg==
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://whoami.cesnet.cz:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://whoami.cesnet.cz:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://whoami.cesnet.cz/idp/profile/SAML2/Redirect/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://whoami.cesnet.cz/idp/profile/SAML2/POST/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://whoami.cesnet.cz:8443/idp/profile/SAML2/SOAP/SLO"/>
-    <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>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://whoami.cesnet.cz/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://whoami.cesnet.cz/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://whoami.cesnet.cz/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://whoami.cesnet.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">cesnet.cz</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIC7jCCAdYCCQCRzSvIiTLzPDANBgkqhkiG9w0BAQUFADA5MQswCQYDVQQGEwJD
-WjEPMA0GA1UEChMGQ0VTTkVUMRkwFwYDVQQDExB3aG9hbWkuY2VzbmV0LmN6MB4X
-DTExMDYyODE3MTUxNloXDTIxMDYyNTE3MTUxNlowOTELMAkGA1UEBhMCQ1oxDzAN
-BgNVBAoTBkNFU05FVDEZMBcGA1UEAxMQd2hvYW1pLmNlc25ldC5jejCCASIwDQYJ
-KoZIhvcNAQEBBQADggEPADCCAQoCggEBALVaOoSPi3RrWjAIk9qneCw48UDTRqsZ
-saD3YGWGpUzigUqAIFgNewH4gFyZskhgeUB185iBCgsb5+oiNwdGKvm0dSRS8qlo
-vjzbeBP7sSVbgmOeeRy6W9AD8cA7HMrrHXxLn7LFGk2czY+dtEWkA0CFVYOR/JGX
-2a8g0YfHqRypU7DKqoo5feB7eUclzwhiZ9jsjqbE//M3LUk/QPIbxfimB8XFY7tV
-ijdFXkmSyz84FDZhCQ4eypu5Pn6+ov4BF/MXZGjFSsBbUKWL4UDAyL+y7LlzvsZq
-sJ4crixV7D3+ChkCaimW2+ETRZF/3F7c52SiqIgjCnvUV90ttGqQWrsCAwEAATAN
-BgkqhkiG9w0BAQUFAAOCAQEAjxVz8kXKKtoM449sxOGg1+pp/rio4vUpZ//nSfwf
-HnbZdesPoLoE58o+U5E3+e5hcN9jRbOEYyFt1oR9uTmYyo19G6CARvN3HNbUL5dW
-ID4yEvYy54tvokxqWNisk5NtXgOmOD+U2NX0FwAkoCDYOKboASeZ5PTQ5uvIo2Cm
-ljL8VHxgCZ+N4/UYnz3xAiJBKXCFLNgTMVIM2HKNYioKUqxubVDapR9E94vLzuvs
-9NVKKQfcm4DAMfylJKBLMGFNdqNwiFmczxxkOr3Me+vn+Tb7XRzT1tSmQkwilpmY
-i/DVjni4yQ3gisrqPcpvzGZCN/doncbNZ5ZRUerR17Waeg==
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://whoami.cesnet.cz:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://whoami.cesnet.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">CESNET</OrganizationName>
-    <OrganizationName xml:lang="cs">CESNET</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">CESNET, a. l. e.</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="cs">CESNET, z. s. p. o.</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.ces.net/</OrganizationURL>
-    <OrganizationURL xml:lang="cs">http://www.cesnet.cz/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Jan</GivenName>
-    <SurName>Oppolzer</SurName>
-    <EmailAddress>jan.oppolzer@cesnet.cz</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Jan</GivenName>
-    <SurName>Tomasek</SurName>
-    <EmailAddress>jan.tomasek@cesnet.cz</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/whoami.cesnet.cz.xml b/swamid-interfederations-2.0/whoami.cesnet.cz.xml
deleted file mode 100644
index 916401f6..00000000
--- a/swamid-interfederations-2.0/whoami.cesnet.cz.xml
+++ /dev/null
@@ -1,121 +0,0 @@
-<?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://whoami.cesnet.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/" registrationInstant="2010-09-15T11:47:38Z">
-      <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>
-    <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://eduid.cz/uri/idp-group/cesnet</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>
-      <shibmd:Scope regexp="false">cesnet.cz</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">CESNET</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="cs">CESNET</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Identity Provider for CESNET employees.</mdui:Description>
-        <mdui:Description xml:lang="cs">Identity Provider pro zaměstnance CESNETu.</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.ces.net/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="cs">http://www.cesnet.cz/</mdui:InformationURL>
-        <mdui:Logo height="88" width="200">https://pki.cesnet.cz/_media/cs/cesnet-logo-200.gif</mdui:Logo>
-        <mdui:Logo height="177" width="400">https://pki.cesnet.cz/_media/cs/cesnet-logo-400.gif</mdui:Logo>
-        <mdui:Logo height="353" width="800">https://pki.cesnet.cz/_media/cs/cesnet-logo-800.gif</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIC7jCCAdYCCQCRzSvIiTLzPDANBgkqhkiG9w0BAQUFADA5MQswCQYDVQQGEwJD
-WjEPMA0GA1UEChMGQ0VTTkVUMRkwFwYDVQQDExB3aG9hbWkuY2VzbmV0LmN6MB4X
-DTExMDYyODE3MTUxNloXDTIxMDYyNTE3MTUxNlowOTELMAkGA1UEBhMCQ1oxDzAN
-BgNVBAoTBkNFU05FVDEZMBcGA1UEAxMQd2hvYW1pLmNlc25ldC5jejCCASIwDQYJ
-KoZIhvcNAQEBBQADggEPADCCAQoCggEBALVaOoSPi3RrWjAIk9qneCw48UDTRqsZ
-saD3YGWGpUzigUqAIFgNewH4gFyZskhgeUB185iBCgsb5+oiNwdGKvm0dSRS8qlo
-vjzbeBP7sSVbgmOeeRy6W9AD8cA7HMrrHXxLn7LFGk2czY+dtEWkA0CFVYOR/JGX
-2a8g0YfHqRypU7DKqoo5feB7eUclzwhiZ9jsjqbE//M3LUk/QPIbxfimB8XFY7tV
-ijdFXkmSyz84FDZhCQ4eypu5Pn6+ov4BF/MXZGjFSsBbUKWL4UDAyL+y7LlzvsZq
-sJ4crixV7D3+ChkCaimW2+ETRZF/3F7c52SiqIgjCnvUV90ttGqQWrsCAwEAATAN
-BgkqhkiG9w0BAQUFAAOCAQEAjxVz8kXKKtoM449sxOGg1+pp/rio4vUpZ//nSfwf
-HnbZdesPoLoE58o+U5E3+e5hcN9jRbOEYyFt1oR9uTmYyo19G6CARvN3HNbUL5dW
-ID4yEvYy54tvokxqWNisk5NtXgOmOD+U2NX0FwAkoCDYOKboASeZ5PTQ5uvIo2Cm
-ljL8VHxgCZ+N4/UYnz3xAiJBKXCFLNgTMVIM2HKNYioKUqxubVDapR9E94vLzuvs
-9NVKKQfcm4DAMfylJKBLMGFNdqNwiFmczxxkOr3Me+vn+Tb7XRzT1tSmQkwilpmY
-i/DVjni4yQ3gisrqPcpvzGZCN/doncbNZ5ZRUerR17Waeg==
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://whoami.cesnet.cz:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://whoami.cesnet.cz:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://whoami.cesnet.cz/idp/profile/SAML2/Redirect/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://whoami.cesnet.cz/idp/profile/SAML2/POST/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://whoami.cesnet.cz:8443/idp/profile/SAML2/SOAP/SLO"/>
-    <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>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://whoami.cesnet.cz/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://whoami.cesnet.cz/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://whoami.cesnet.cz/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://whoami.cesnet.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">cesnet.cz</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIC7jCCAdYCCQCRzSvIiTLzPDANBgkqhkiG9w0BAQUFADA5MQswCQYDVQQGEwJD
-WjEPMA0GA1UEChMGQ0VTTkVUMRkwFwYDVQQDExB3aG9hbWkuY2VzbmV0LmN6MB4X
-DTExMDYyODE3MTUxNloXDTIxMDYyNTE3MTUxNlowOTELMAkGA1UEBhMCQ1oxDzAN
-BgNVBAoTBkNFU05FVDEZMBcGA1UEAxMQd2hvYW1pLmNlc25ldC5jejCCASIwDQYJ
-KoZIhvcNAQEBBQADggEPADCCAQoCggEBALVaOoSPi3RrWjAIk9qneCw48UDTRqsZ
-saD3YGWGpUzigUqAIFgNewH4gFyZskhgeUB185iBCgsb5+oiNwdGKvm0dSRS8qlo
-vjzbeBP7sSVbgmOeeRy6W9AD8cA7HMrrHXxLn7LFGk2czY+dtEWkA0CFVYOR/JGX
-2a8g0YfHqRypU7DKqoo5feB7eUclzwhiZ9jsjqbE//M3LUk/QPIbxfimB8XFY7tV
-ijdFXkmSyz84FDZhCQ4eypu5Pn6+ov4BF/MXZGjFSsBbUKWL4UDAyL+y7LlzvsZq
-sJ4crixV7D3+ChkCaimW2+ETRZF/3F7c52SiqIgjCnvUV90ttGqQWrsCAwEAATAN
-BgkqhkiG9w0BAQUFAAOCAQEAjxVz8kXKKtoM449sxOGg1+pp/rio4vUpZ//nSfwf
-HnbZdesPoLoE58o+U5E3+e5hcN9jRbOEYyFt1oR9uTmYyo19G6CARvN3HNbUL5dW
-ID4yEvYy54tvokxqWNisk5NtXgOmOD+U2NX0FwAkoCDYOKboASeZ5PTQ5uvIo2Cm
-ljL8VHxgCZ+N4/UYnz3xAiJBKXCFLNgTMVIM2HKNYioKUqxubVDapR9E94vLzuvs
-9NVKKQfcm4DAMfylJKBLMGFNdqNwiFmczxxkOr3Me+vn+Tb7XRzT1tSmQkwilpmY
-i/DVjni4yQ3gisrqPcpvzGZCN/doncbNZ5ZRUerR17Waeg==
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://whoami.cesnet.cz:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://whoami.cesnet.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">CESNET</OrganizationName>
-    <OrganizationName xml:lang="cs">CESNET</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">CESNET, a. l. e.</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="cs">CESNET, z. s. p. o.</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.ces.net/</OrganizationURL>
-    <OrganizationURL xml:lang="cs">http://www.cesnet.cz/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Jan</GivenName>
-    <SurName>Oppolzer</SurName>
-    <EmailAddress>jan.oppolzer@cesnet.cz</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Jan</GivenName>
-    <SurName>Tomasek</SurName>
-    <EmailAddress>jan.tomasek@cesnet.cz</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/wifi.dir.garr.it:12081-shibboleth.xml b/swamid-interfederations-2.0/wifi.dir.garr.it:12081-shibboleth.xml
deleted file mode 100644
index 69cd0528..00000000
--- a/swamid-interfederations-2.0/wifi.dir.garr.it:12081-shibboleth.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" entityID="https://wifi.dir.garr.it:12081/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2013-07-30T15:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <mdattr:EntityAttributes>
-      <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:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <Extensions>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="en">WIFI provided by GARR</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="it">WIFI erogato da GARR</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Wi-Fi connection to the wireless network in GARR (Rome, IT). This service enables the authentication by IDEM credentials at wireless network in GARR</mdui:Description>
-        <mdui:Description xml:lang="it">Connessione Wi-Fi alla rete wireless di GARR nella sede di Roma (IT). Questo servizio abilita l'autenticazione mediante credenziali IDEM presso la rete wireless della Direzione GARR</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.garr.it/wifi/info</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="it">http://www.garr.it/wifi/info</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">http://www.garr.it/wifi/privacy</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="it">http://www.garr.it/wifi/privacy</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://wifi.dir.garr.it:12081/Shibboleth.sso/Login"/>
-      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://wifi.dir.garr.it:12081/Shibboleth.sso/WAYF"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIEbjCCA1agAwIBAgIRALxMXgZtagsFRXGxHmc7ojQwDQYJKoZIhvcNAQEFBQAw
-NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-IFNTTCBDQTAeFw0xMzA3MDUwMDAwMDBaFw0xNjA3MDQyMzU5NTlaMD4xITAfBgNV
-BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEZMBcGA1UEAxMQd2lmaS5kaXIu
-Z2Fyci5pdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAM1nKllgz7Q6
-u14Q9efpbAAculFFENIAIIJQVCU/rE7HFPGxxaEDxpBWpq7oUAd9wYT+sFiQk1Zf
-kFwWCxbpwqftLBytbCpOFmzqxcKqtaBX4d8qkBI8v4fIOjYPeC6inMXLZOf+3/QL
-ITNjj70N2S3GXm+JvNBhVik1UiQ3HxVJbjUHAyj33RaMfQGQNonu4H1YOBWTTtXw
-FY1hHAERTRfJBDv7LzGoYo1e6gOYyz2QHNJO3hzHWG+MHZfAA1RpIHO6v9Xs67ZG
-uN9FoeAQMZ89L7Xc8a4b+paS2ShD4BZcw5Htxn8qhdbWfhBfZOUbK+8TQWUO6MNT
-ri2whivd78cCAwEAAaOCAW0wggFpMB8GA1UdIwQYMBaAFAy9k2gM896ro0lrKzdX
-R+qQ47ntMB0GA1UdDgQWBBR6K1Z+w6BoJOYYHclzDHTOD4QsETAOBgNVHQ8BAf8E
-BAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUH
-AwIwIgYDVR0gBBswGTANBgsrBgEEAbIxAQICHTAIBgZngQwBAgEwOgYDVR0fBDMw
-MTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5j
-cmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRjcy50
-ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDovL29j
-c3AudGNzLnRlcmVuYS5vcmcwGwYDVR0RBBQwEoIQd2lmaS5kaXIuZ2Fyci5pdDAN
-BgkqhkiG9w0BAQUFAAOCAQEApWK44BT0P8QiG0UbsMl3x8nW93tHdrIeuXd/2ET1
-43pIBU6o+cvCZolOzzmU5D3tQuvG3+Uhs5aBKDA3sdklV1wK85Tf/FrVGw5OFlxn
-UCXWIXAHYqZrUZVSBJiUsGLhyNxtME/wL5vgjBFtnBUagkYZAoSI6HIAPFC4WmAG
-T7jgUwih9oD9bZqNGy3q8QsJZlAuj65RmLJUTz4XUcS5RJrePlQSMj3WQklkoKkO
-3/o35Z0PboOdmDyvBkGP7vdkZ3xuBH9F8C3FZ91t5F0hieeFnFOEXyZcPq14vQ5C
-Jp4P35Fmyp0bxWiEwrpCwV8TZ5lpllIJvrB1rVPxSYE80w==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://wifi.dir.garr.it:12081/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://wifi.dir.garr.it:12081/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://wifi.dir.garr.it:12081/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wifi.dir.garr.it:12081/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://wifi.dir.garr.it:12081/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://wifi.dir.garr.it:12081/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://wifi.dir.garr.it:12081/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wifi.dir.garr.it:12081/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://wifi.dir.garr.it:12081/Shibboleth.sso/NIM/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wifi.dir.garr.it:12081/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://wifi.dir.garr.it:12081/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://wifi.dir.garr.it:12081/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://wifi.dir.garr.it:12081/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://wifi.dir.garr.it:12081/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://wifi.dir.garr.it:12081/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <AttributeConsumingService index="1">
-      <ServiceName xml:lang="en">WIFI connection provided by GARR</ServiceName>
-      <ServiceDescription xml:lang="en">Wifi access for guests in the GARR wireless network (Rome)</ServiceDescription>
-      <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"/>
-    </AttributeConsumingService>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Consortium GARR</OrganizationName>
-    <OrganizationName xml:lang="it">Consortium GARR</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Wi-Fi provided by Consortium GARR</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="it">Wi-Fi erogato da Consortium GARR</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.garr.it</OrganizationURL>
-    <OrganizationURL xml:lang="it">http://www.garr.it/b/eng</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <EmailAddress>system.support@garr.it</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/wifi.dir.garr.it:12081.xml b/swamid-interfederations-2.0/wifi.dir.garr.it:12081.xml
deleted file mode 100644
index 69cd0528..00000000
--- a/swamid-interfederations-2.0/wifi.dir.garr.it:12081.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" entityID="https://wifi.dir.garr.it:12081/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2013-07-30T15:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <mdattr:EntityAttributes>
-      <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:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <Extensions>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="en">WIFI provided by GARR</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="it">WIFI erogato da GARR</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Wi-Fi connection to the wireless network in GARR (Rome, IT). This service enables the authentication by IDEM credentials at wireless network in GARR</mdui:Description>
-        <mdui:Description xml:lang="it">Connessione Wi-Fi alla rete wireless di GARR nella sede di Roma (IT). Questo servizio abilita l'autenticazione mediante credenziali IDEM presso la rete wireless della Direzione GARR</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.garr.it/wifi/info</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="it">http://www.garr.it/wifi/info</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">http://www.garr.it/wifi/privacy</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="it">http://www.garr.it/wifi/privacy</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://wifi.dir.garr.it:12081/Shibboleth.sso/Login"/>
-      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://wifi.dir.garr.it:12081/Shibboleth.sso/WAYF"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIEbjCCA1agAwIBAgIRALxMXgZtagsFRXGxHmc7ojQwDQYJKoZIhvcNAQEFBQAw
-NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-IFNTTCBDQTAeFw0xMzA3MDUwMDAwMDBaFw0xNjA3MDQyMzU5NTlaMD4xITAfBgNV
-BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEZMBcGA1UEAxMQd2lmaS5kaXIu
-Z2Fyci5pdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAM1nKllgz7Q6
-u14Q9efpbAAculFFENIAIIJQVCU/rE7HFPGxxaEDxpBWpq7oUAd9wYT+sFiQk1Zf
-kFwWCxbpwqftLBytbCpOFmzqxcKqtaBX4d8qkBI8v4fIOjYPeC6inMXLZOf+3/QL
-ITNjj70N2S3GXm+JvNBhVik1UiQ3HxVJbjUHAyj33RaMfQGQNonu4H1YOBWTTtXw
-FY1hHAERTRfJBDv7LzGoYo1e6gOYyz2QHNJO3hzHWG+MHZfAA1RpIHO6v9Xs67ZG
-uN9FoeAQMZ89L7Xc8a4b+paS2ShD4BZcw5Htxn8qhdbWfhBfZOUbK+8TQWUO6MNT
-ri2whivd78cCAwEAAaOCAW0wggFpMB8GA1UdIwQYMBaAFAy9k2gM896ro0lrKzdX
-R+qQ47ntMB0GA1UdDgQWBBR6K1Z+w6BoJOYYHclzDHTOD4QsETAOBgNVHQ8BAf8E
-BAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUH
-AwIwIgYDVR0gBBswGTANBgsrBgEEAbIxAQICHTAIBgZngQwBAgEwOgYDVR0fBDMw
-MTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5j
-cmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRjcy50
-ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDovL29j
-c3AudGNzLnRlcmVuYS5vcmcwGwYDVR0RBBQwEoIQd2lmaS5kaXIuZ2Fyci5pdDAN
-BgkqhkiG9w0BAQUFAAOCAQEApWK44BT0P8QiG0UbsMl3x8nW93tHdrIeuXd/2ET1
-43pIBU6o+cvCZolOzzmU5D3tQuvG3+Uhs5aBKDA3sdklV1wK85Tf/FrVGw5OFlxn
-UCXWIXAHYqZrUZVSBJiUsGLhyNxtME/wL5vgjBFtnBUagkYZAoSI6HIAPFC4WmAG
-T7jgUwih9oD9bZqNGy3q8QsJZlAuj65RmLJUTz4XUcS5RJrePlQSMj3WQklkoKkO
-3/o35Z0PboOdmDyvBkGP7vdkZ3xuBH9F8C3FZ91t5F0hieeFnFOEXyZcPq14vQ5C
-Jp4P35Fmyp0bxWiEwrpCwV8TZ5lpllIJvrB1rVPxSYE80w==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://wifi.dir.garr.it:12081/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://wifi.dir.garr.it:12081/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://wifi.dir.garr.it:12081/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wifi.dir.garr.it:12081/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://wifi.dir.garr.it:12081/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://wifi.dir.garr.it:12081/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://wifi.dir.garr.it:12081/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wifi.dir.garr.it:12081/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://wifi.dir.garr.it:12081/Shibboleth.sso/NIM/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wifi.dir.garr.it:12081/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://wifi.dir.garr.it:12081/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://wifi.dir.garr.it:12081/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://wifi.dir.garr.it:12081/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://wifi.dir.garr.it:12081/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://wifi.dir.garr.it:12081/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <AttributeConsumingService index="1">
-      <ServiceName xml:lang="en">WIFI connection provided by GARR</ServiceName>
-      <ServiceDescription xml:lang="en">Wifi access for guests in the GARR wireless network (Rome)</ServiceDescription>
-      <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"/>
-    </AttributeConsumingService>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Consortium GARR</OrganizationName>
-    <OrganizationName xml:lang="it">Consortium GARR</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Wi-Fi provided by Consortium GARR</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="it">Wi-Fi erogato da Consortium GARR</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.garr.it</OrganizationURL>
-    <OrganizationURL xml:lang="it">http://www.garr.it/b/eng</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <EmailAddress>system.support@garr.it</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/wifi.espci.fr-saml-metadata.xml b/swamid-interfederations-2.0/wifi.espci.fr-saml-metadata.xml
deleted file mode 100644
index d687efe0..00000000
--- a/swamid-interfederations-2.0/wifi.espci.fr-saml-metadata.xml
+++ /dev/null
@@ -1,151 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://wifi.espci.fr/saml/metadata">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2011-04-05T10:14:28Z">
-      <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.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="fr">ESPCI ParisTech - Accès WiFi</mdui:DisplayName>
-        <mdui:Description xml:lang="fr">Accès au portail captif WiFi à l'ESPCI ParisTech, ouvert à tous les usagers de la fédération.</mdui:Description>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIFaDCCBFCgAwIBAgIRAIaYj8BPcZAQKLmv64xhNrYwDQYJKoZIhvcNAQEFBQAw
-NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-IFNTTCBDQTAeFw0xNDA0MDgwMDAwMDBaFw0xNzA0MDcyMzU5NTlaMDsxITAfBgNV
-BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEWMBQGA1UEAxMNd2lmaS5lc3Bj
-aS5mcjCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBANg1N9YQejPppU6s
-vgTVJm78QhVwG1qelsOkcrpG4bzhcJN95zBV/ERuyuJ3YjwqZSYsvgcZcdOJymwf
-zVKLKh7AvDuPL+x6Iz3VSqdl3/n0SfnQP3wCM6upabxikEhLg2mROQEDN2ZnKnNq
-NMWzy0oIuf9TBhbJDddJewQtvHS/OJxqOO3f9S76xqLq9dZhKbMNE8GqWXakAr8f
-oItuYZvc5UapiqngRjB78aOsHjETH3vkE200Gk97wrjIeN0LrBhKcofG88NDeJhN
-zczseS5FwoawYsgA5AAGTFDkg2dydnvZF6hhd/EJ1uEgguCWVCSZQmPSXkzlaoSg
-GAHKx+qdCFkQDipZqVRRpdWCLfRK+qvchu1E+dhzqkvTe4kX/xcvCwKWUJ0I+vlM
-dwzd8o637i6yn736TMnZG6hSMTFDhv9WN5VjD19RkIA5mETXp3KzpMNG+tmn8TPN
-uIPFpcreqQyD+qbRAH5XX5GNATY5P5HWKd+V3QJtqW0QCjen/Viq7o0avEVgmLCi
-dFuabXZo9ta/GgOIsi0n8D3uQiJ0V1snLPFjBemfXevwoI5PyHA+Yya1lLdFQ2QT
-wHyh7B0I/IoTyMoWQI9pixbiyWel6JkLRPzNJqhlB8bKqnH4HR7kgq9itZkFEz2G
-ebZXFLgYWCMvkvj8vXCCYy69I4orAgMBAAGjggFqMIIBZjAfBgNVHSMEGDAWgBQM
-vZNoDPPeq6NJays3V0fqkOO57TAdBgNVHQ4EFgQUFJC/ROWw0QdJWifZ4Eo9CDHp
-MiswDgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYB
-BQUHAwEGCCsGAQUFBwMCMCIGA1UdIAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EM
-AQIBMDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcv
-VEVSRU5BU1NMQ0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0
-cDovL2NydC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUH
-MAGGGmh0dHA6Ly9vY3NwLnRjcy50ZXJlbmEub3JnMBgGA1UdEQQRMA+CDXdpZmku
-ZXNwY2kuZnIwDQYJKoZIhvcNAQEFBQADggEBACcP3xTaWd7EVf5hDvqI7vqrbbor
-zjvEAwdsMXGxtDqJm0Y9G3qk0Cin3vf0beZDWK2DtcYfTf1QIjJT23d+434W457S
-Fj2gVppPEgZ4eFoPIH7KChRul4LXBkyvY4vLw67fQGk8/sr44j9KBUA7vUTsaqIy
-/NW6SgLNx+/NtLF5w5odwoZc6YLfj/YEIc/pLv5wwK556+2jf0p2YnmO99Up+G2U
-gE9rxe6IbLS5rd9eqf0PzBg/1OS1EYOWmdbnkODnpBi2mcBWfHKVBL2IKbyfFHul
-aczMFss205TH+mugaX6YVXl77eIw9xzO7G4SZn+P9tPo0xalGN15rIoQJ1Q=
-					    </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>
-					      MIIFaDCCBFCgAwIBAgIRAIaYj8BPcZAQKLmv64xhNrYwDQYJKoZIhvcNAQEFBQAw
-NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-IFNTTCBDQTAeFw0xNDA0MDgwMDAwMDBaFw0xNzA0MDcyMzU5NTlaMDsxITAfBgNV
-BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEWMBQGA1UEAxMNd2lmaS5lc3Bj
-aS5mcjCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBANg1N9YQejPppU6s
-vgTVJm78QhVwG1qelsOkcrpG4bzhcJN95zBV/ERuyuJ3YjwqZSYsvgcZcdOJymwf
-zVKLKh7AvDuPL+x6Iz3VSqdl3/n0SfnQP3wCM6upabxikEhLg2mROQEDN2ZnKnNq
-NMWzy0oIuf9TBhbJDddJewQtvHS/OJxqOO3f9S76xqLq9dZhKbMNE8GqWXakAr8f
-oItuYZvc5UapiqngRjB78aOsHjETH3vkE200Gk97wrjIeN0LrBhKcofG88NDeJhN
-zczseS5FwoawYsgA5AAGTFDkg2dydnvZF6hhd/EJ1uEgguCWVCSZQmPSXkzlaoSg
-GAHKx+qdCFkQDipZqVRRpdWCLfRK+qvchu1E+dhzqkvTe4kX/xcvCwKWUJ0I+vlM
-dwzd8o637i6yn736TMnZG6hSMTFDhv9WN5VjD19RkIA5mETXp3KzpMNG+tmn8TPN
-uIPFpcreqQyD+qbRAH5XX5GNATY5P5HWKd+V3QJtqW0QCjen/Viq7o0avEVgmLCi
-dFuabXZo9ta/GgOIsi0n8D3uQiJ0V1snLPFjBemfXevwoI5PyHA+Yya1lLdFQ2QT
-wHyh7B0I/IoTyMoWQI9pixbiyWel6JkLRPzNJqhlB8bKqnH4HR7kgq9itZkFEz2G
-ebZXFLgYWCMvkvj8vXCCYy69I4orAgMBAAGjggFqMIIBZjAfBgNVHSMEGDAWgBQM
-vZNoDPPeq6NJays3V0fqkOO57TAdBgNVHQ4EFgQUFJC/ROWw0QdJWifZ4Eo9CDHp
-MiswDgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYB
-BQUHAwEGCCsGAQUFBwMCMCIGA1UdIAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EM
-AQIBMDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcv
-VEVSRU5BU1NMQ0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0
-cDovL2NydC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUH
-MAGGGmh0dHA6Ly9vY3NwLnRjcy50ZXJlbmEub3JnMBgGA1UdEQQRMA+CDXdpZmku
-ZXNwY2kuZnIwDQYJKoZIhvcNAQEFBQADggEBACcP3xTaWd7EVf5hDvqI7vqrbbor
-zjvEAwdsMXGxtDqJm0Y9G3qk0Cin3vf0beZDWK2DtcYfTf1QIjJT23d+434W457S
-Fj2gVppPEgZ4eFoPIH7KChRul4LXBkyvY4vLw67fQGk8/sr44j9KBUA7vUTsaqIy
-/NW6SgLNx+/NtLF5w5odwoZc6YLfj/YEIc/pLv5wwK556+2jf0p2YnmO99Up+G2U
-gE9rxe6IbLS5rd9eqf0PzBg/1OS1EYOWmdbnkODnpBi2mcBWfHKVBL2IKbyfFHul
-aczMFss205TH+mugaX6YVXl77eIw9xzO7G4SZn+P9tPo0xalGN15rIoQJ1Q=
-					    </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>
-					      MIIFpjCCBI6gAwIBAgIRAOE+20QrI5x/Eygq7lsxhZAwDQYJKoZIhvcNAQEFBQAw
-NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-IFNTTCBDQTAeFw0xMjAzMTkwMDAwMDBaFw0xNTAzMTkyMzU5NTlaMIGCMQswCQYD
-VQQGEwJGUjE8MDoGA1UEChMzRWNvbGUgU3VwZXJpZXVyZSBkZSBQaHlzaXF1ZSBl
-dCBDaGltaWUgSW5kdXN0cmllbGxlMR0wGwYDVQQLExRTZXJ2aWNlIEluZm9ybWF0
-aXF1ZTEWMBQGA1UEAxMNd2lmaS5lc3BjaS5mcjCCAiIwDQYJKoZIhvcNAQEBBQAD
-ggIPADCCAgoCggIBALok3W16b6iUybJIMb7NeUtTv0h5ygPqEZRH1vVm/tsDE027
-16hrdkpSsSwP7fi2xm8x5vH7BSOjV0EtzTWsYG6R6pWkLQ+ktMGvQe3VbdmNrCAa
-/dBK2vKtwDAHES91rcQkM6mO8JTtXWrO2V+N15ttlt70gS3OgJI9Uhi8jl3JgHBq
-lEGhJz58NI1cVwDeUD0agxoz+KkPve5FB+PHASypzPZZ7GyVx5y9CE+p2+bvD+KL
-EKZR5WjXJi+nhycFsRizWAnCCAf2t0I8oky8PzQSf/eaayv+EuUnkvJNR8UXIhWE
-n6mfee+omYOoSnEgivHHJbVuJIgo1QK/+r2dYrGNPmhA7ApQqQvtjwciwwczjpe+
-vCLsrfl+jT8WFgS118huBWUS6itNG+h5pdifLdB56Y4xg+lxdsRV8XRKTZu5ttzt
-nrfkZivVtJ+1/GOcpFsvD/IHM8Z0pARxhZDbI6flbEFw7Vx2HfLiPfmWwWMK6tSL
-7IU0slg+K2ANtxhhBiFrCn0FAieCVyGHdfR7fDvzJcAYYSUyiumF00tWNDfa8Ac7
-Epbcb2/sNwfoXrLJPAL+Bhgry4kn4k6isN8RtyU6t+MaZ179VWZkOJi4e5Sy4PBx
-ERkMP7oD89UZa1sDyzBJ01CNidl83zEp+yVQrhLZb3gpVCJ74ogyazqa59SrAgMB
-AAGjggFgMIIBXDAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3V0fqkOO57TAdBgNV
-HQ4EFgQUMNLf8y6GUobcx6Q1ie9thLI8LUkwDgYDVR0PAQH/BAQDAgWgMAwGA1Ud
-EwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMBgGA1UdIAQR
-MA8wDQYLKwYBBAGyMQECAh0wOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50
-Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUG
-CCsGAQUFBzAChilodHRwOi8vY3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENB
-LmNydDAmBggrBgEFBQcwAYYaaHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwGAYD
-VR0RBBEwD4INd2lmaS5lc3BjaS5mcjANBgkqhkiG9w0BAQUFAAOCAQEAY3w5yCh9
-6lr26I9dpFUQsVkiAJdMaKzXcGnLoI3wUA7CcYG76ae0m7QxNbbIjxXdhYbDgyn8
-PVGsMLejGWbjgePf5UhvVyaPWQVB/burU95HfD6pDS2D+/NJYQowVjgf8Meh4Nb6
-1tURmrwzVkwLkIHvTSQ011dZJEQe6aockASx6GMtd7hlm87Rndk0Jm9a6pQtzHjY
-pAVuaQQi/FxV7jkz+Rm4HD8R3bhRdVSCpe+2ukW91t385ZQCJuFawcdTDEeHGaDI
-1bjPX+IrBAd71rGTiMlhH5VUaYUNPJkTxVWJwhCimQztzNGk0CY+ze424o3soWOZ
-2JBnPLINws7O5w==
-					    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wifi.espci.fr/saml/postResponse" index="1"/>
-    <AttributeConsumingService index="0">
-      <ServiceName xml:lang="fr">ESPCI ParisTech - Accès WiFi</ServiceName>
-      <ServiceDescription xml:lang="fr">Accès au portail captif WiFi à l'ESPCI ParisTech, ouvert à tous les usagers de la fédération.</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"/>
-      <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="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="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="en">Ecole Supérieure de Physique et de Chimie Industrielles de la Ville de Paris</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Ecole Supérieure de Physique et de Chimie Industrielles de la Ville de Paris</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Emmanuel Dreyfus</SurName>
-    <EmailAddress>Emmanuel.Dreyfus@espci.fr</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <SurName>Jean-Jacques Puig</SurName>
-    <EmailAddress>Jean-Jacques.Puig@espci.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/wifi.espci.fr.xml b/swamid-interfederations-2.0/wifi.espci.fr.xml
deleted file mode 100644
index d687efe0..00000000
--- a/swamid-interfederations-2.0/wifi.espci.fr.xml
+++ /dev/null
@@ -1,151 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://wifi.espci.fr/saml/metadata">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2011-04-05T10:14:28Z">
-      <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.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="fr">ESPCI ParisTech - Accès WiFi</mdui:DisplayName>
-        <mdui:Description xml:lang="fr">Accès au portail captif WiFi à l'ESPCI ParisTech, ouvert à tous les usagers de la fédération.</mdui:Description>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIFaDCCBFCgAwIBAgIRAIaYj8BPcZAQKLmv64xhNrYwDQYJKoZIhvcNAQEFBQAw
-NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-IFNTTCBDQTAeFw0xNDA0MDgwMDAwMDBaFw0xNzA0MDcyMzU5NTlaMDsxITAfBgNV
-BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEWMBQGA1UEAxMNd2lmaS5lc3Bj
-aS5mcjCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBANg1N9YQejPppU6s
-vgTVJm78QhVwG1qelsOkcrpG4bzhcJN95zBV/ERuyuJ3YjwqZSYsvgcZcdOJymwf
-zVKLKh7AvDuPL+x6Iz3VSqdl3/n0SfnQP3wCM6upabxikEhLg2mROQEDN2ZnKnNq
-NMWzy0oIuf9TBhbJDddJewQtvHS/OJxqOO3f9S76xqLq9dZhKbMNE8GqWXakAr8f
-oItuYZvc5UapiqngRjB78aOsHjETH3vkE200Gk97wrjIeN0LrBhKcofG88NDeJhN
-zczseS5FwoawYsgA5AAGTFDkg2dydnvZF6hhd/EJ1uEgguCWVCSZQmPSXkzlaoSg
-GAHKx+qdCFkQDipZqVRRpdWCLfRK+qvchu1E+dhzqkvTe4kX/xcvCwKWUJ0I+vlM
-dwzd8o637i6yn736TMnZG6hSMTFDhv9WN5VjD19RkIA5mETXp3KzpMNG+tmn8TPN
-uIPFpcreqQyD+qbRAH5XX5GNATY5P5HWKd+V3QJtqW0QCjen/Viq7o0avEVgmLCi
-dFuabXZo9ta/GgOIsi0n8D3uQiJ0V1snLPFjBemfXevwoI5PyHA+Yya1lLdFQ2QT
-wHyh7B0I/IoTyMoWQI9pixbiyWel6JkLRPzNJqhlB8bKqnH4HR7kgq9itZkFEz2G
-ebZXFLgYWCMvkvj8vXCCYy69I4orAgMBAAGjggFqMIIBZjAfBgNVHSMEGDAWgBQM
-vZNoDPPeq6NJays3V0fqkOO57TAdBgNVHQ4EFgQUFJC/ROWw0QdJWifZ4Eo9CDHp
-MiswDgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYB
-BQUHAwEGCCsGAQUFBwMCMCIGA1UdIAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EM
-AQIBMDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcv
-VEVSRU5BU1NMQ0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0
-cDovL2NydC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUH
-MAGGGmh0dHA6Ly9vY3NwLnRjcy50ZXJlbmEub3JnMBgGA1UdEQQRMA+CDXdpZmku
-ZXNwY2kuZnIwDQYJKoZIhvcNAQEFBQADggEBACcP3xTaWd7EVf5hDvqI7vqrbbor
-zjvEAwdsMXGxtDqJm0Y9G3qk0Cin3vf0beZDWK2DtcYfTf1QIjJT23d+434W457S
-Fj2gVppPEgZ4eFoPIH7KChRul4LXBkyvY4vLw67fQGk8/sr44j9KBUA7vUTsaqIy
-/NW6SgLNx+/NtLF5w5odwoZc6YLfj/YEIc/pLv5wwK556+2jf0p2YnmO99Up+G2U
-gE9rxe6IbLS5rd9eqf0PzBg/1OS1EYOWmdbnkODnpBi2mcBWfHKVBL2IKbyfFHul
-aczMFss205TH+mugaX6YVXl77eIw9xzO7G4SZn+P9tPo0xalGN15rIoQJ1Q=
-					    </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>
-					      MIIFaDCCBFCgAwIBAgIRAIaYj8BPcZAQKLmv64xhNrYwDQYJKoZIhvcNAQEFBQAw
-NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-IFNTTCBDQTAeFw0xNDA0MDgwMDAwMDBaFw0xNzA0MDcyMzU5NTlaMDsxITAfBgNV
-BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEWMBQGA1UEAxMNd2lmaS5lc3Bj
-aS5mcjCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBANg1N9YQejPppU6s
-vgTVJm78QhVwG1qelsOkcrpG4bzhcJN95zBV/ERuyuJ3YjwqZSYsvgcZcdOJymwf
-zVKLKh7AvDuPL+x6Iz3VSqdl3/n0SfnQP3wCM6upabxikEhLg2mROQEDN2ZnKnNq
-NMWzy0oIuf9TBhbJDddJewQtvHS/OJxqOO3f9S76xqLq9dZhKbMNE8GqWXakAr8f
-oItuYZvc5UapiqngRjB78aOsHjETH3vkE200Gk97wrjIeN0LrBhKcofG88NDeJhN
-zczseS5FwoawYsgA5AAGTFDkg2dydnvZF6hhd/EJ1uEgguCWVCSZQmPSXkzlaoSg
-GAHKx+qdCFkQDipZqVRRpdWCLfRK+qvchu1E+dhzqkvTe4kX/xcvCwKWUJ0I+vlM
-dwzd8o637i6yn736TMnZG6hSMTFDhv9WN5VjD19RkIA5mETXp3KzpMNG+tmn8TPN
-uIPFpcreqQyD+qbRAH5XX5GNATY5P5HWKd+V3QJtqW0QCjen/Viq7o0avEVgmLCi
-dFuabXZo9ta/GgOIsi0n8D3uQiJ0V1snLPFjBemfXevwoI5PyHA+Yya1lLdFQ2QT
-wHyh7B0I/IoTyMoWQI9pixbiyWel6JkLRPzNJqhlB8bKqnH4HR7kgq9itZkFEz2G
-ebZXFLgYWCMvkvj8vXCCYy69I4orAgMBAAGjggFqMIIBZjAfBgNVHSMEGDAWgBQM
-vZNoDPPeq6NJays3V0fqkOO57TAdBgNVHQ4EFgQUFJC/ROWw0QdJWifZ4Eo9CDHp
-MiswDgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYB
-BQUHAwEGCCsGAQUFBwMCMCIGA1UdIAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EM
-AQIBMDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcv
-VEVSRU5BU1NMQ0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0
-cDovL2NydC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUH
-MAGGGmh0dHA6Ly9vY3NwLnRjcy50ZXJlbmEub3JnMBgGA1UdEQQRMA+CDXdpZmku
-ZXNwY2kuZnIwDQYJKoZIhvcNAQEFBQADggEBACcP3xTaWd7EVf5hDvqI7vqrbbor
-zjvEAwdsMXGxtDqJm0Y9G3qk0Cin3vf0beZDWK2DtcYfTf1QIjJT23d+434W457S
-Fj2gVppPEgZ4eFoPIH7KChRul4LXBkyvY4vLw67fQGk8/sr44j9KBUA7vUTsaqIy
-/NW6SgLNx+/NtLF5w5odwoZc6YLfj/YEIc/pLv5wwK556+2jf0p2YnmO99Up+G2U
-gE9rxe6IbLS5rd9eqf0PzBg/1OS1EYOWmdbnkODnpBi2mcBWfHKVBL2IKbyfFHul
-aczMFss205TH+mugaX6YVXl77eIw9xzO7G4SZn+P9tPo0xalGN15rIoQJ1Q=
-					    </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>
-					      MIIFpjCCBI6gAwIBAgIRAOE+20QrI5x/Eygq7lsxhZAwDQYJKoZIhvcNAQEFBQAw
-NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-IFNTTCBDQTAeFw0xMjAzMTkwMDAwMDBaFw0xNTAzMTkyMzU5NTlaMIGCMQswCQYD
-VQQGEwJGUjE8MDoGA1UEChMzRWNvbGUgU3VwZXJpZXVyZSBkZSBQaHlzaXF1ZSBl
-dCBDaGltaWUgSW5kdXN0cmllbGxlMR0wGwYDVQQLExRTZXJ2aWNlIEluZm9ybWF0
-aXF1ZTEWMBQGA1UEAxMNd2lmaS5lc3BjaS5mcjCCAiIwDQYJKoZIhvcNAQEBBQAD
-ggIPADCCAgoCggIBALok3W16b6iUybJIMb7NeUtTv0h5ygPqEZRH1vVm/tsDE027
-16hrdkpSsSwP7fi2xm8x5vH7BSOjV0EtzTWsYG6R6pWkLQ+ktMGvQe3VbdmNrCAa
-/dBK2vKtwDAHES91rcQkM6mO8JTtXWrO2V+N15ttlt70gS3OgJI9Uhi8jl3JgHBq
-lEGhJz58NI1cVwDeUD0agxoz+KkPve5FB+PHASypzPZZ7GyVx5y9CE+p2+bvD+KL
-EKZR5WjXJi+nhycFsRizWAnCCAf2t0I8oky8PzQSf/eaayv+EuUnkvJNR8UXIhWE
-n6mfee+omYOoSnEgivHHJbVuJIgo1QK/+r2dYrGNPmhA7ApQqQvtjwciwwczjpe+
-vCLsrfl+jT8WFgS118huBWUS6itNG+h5pdifLdB56Y4xg+lxdsRV8XRKTZu5ttzt
-nrfkZivVtJ+1/GOcpFsvD/IHM8Z0pARxhZDbI6flbEFw7Vx2HfLiPfmWwWMK6tSL
-7IU0slg+K2ANtxhhBiFrCn0FAieCVyGHdfR7fDvzJcAYYSUyiumF00tWNDfa8Ac7
-Epbcb2/sNwfoXrLJPAL+Bhgry4kn4k6isN8RtyU6t+MaZ179VWZkOJi4e5Sy4PBx
-ERkMP7oD89UZa1sDyzBJ01CNidl83zEp+yVQrhLZb3gpVCJ74ogyazqa59SrAgMB
-AAGjggFgMIIBXDAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3V0fqkOO57TAdBgNV
-HQ4EFgQUMNLf8y6GUobcx6Q1ie9thLI8LUkwDgYDVR0PAQH/BAQDAgWgMAwGA1Ud
-EwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMBgGA1UdIAQR
-MA8wDQYLKwYBBAGyMQECAh0wOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50
-Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUG
-CCsGAQUFBzAChilodHRwOi8vY3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENB
-LmNydDAmBggrBgEFBQcwAYYaaHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwGAYD
-VR0RBBEwD4INd2lmaS5lc3BjaS5mcjANBgkqhkiG9w0BAQUFAAOCAQEAY3w5yCh9
-6lr26I9dpFUQsVkiAJdMaKzXcGnLoI3wUA7CcYG76ae0m7QxNbbIjxXdhYbDgyn8
-PVGsMLejGWbjgePf5UhvVyaPWQVB/burU95HfD6pDS2D+/NJYQowVjgf8Meh4Nb6
-1tURmrwzVkwLkIHvTSQ011dZJEQe6aockASx6GMtd7hlm87Rndk0Jm9a6pQtzHjY
-pAVuaQQi/FxV7jkz+Rm4HD8R3bhRdVSCpe+2ukW91t385ZQCJuFawcdTDEeHGaDI
-1bjPX+IrBAd71rGTiMlhH5VUaYUNPJkTxVWJwhCimQztzNGk0CY+ze424o3soWOZ
-2JBnPLINws7O5w==
-					    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wifi.espci.fr/saml/postResponse" index="1"/>
-    <AttributeConsumingService index="0">
-      <ServiceName xml:lang="fr">ESPCI ParisTech - Accès WiFi</ServiceName>
-      <ServiceDescription xml:lang="fr">Accès au portail captif WiFi à l'ESPCI ParisTech, ouvert à tous les usagers de la fédération.</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"/>
-      <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="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="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="en">Ecole Supérieure de Physique et de Chimie Industrielles de la Ville de Paris</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Ecole Supérieure de Physique et de Chimie Industrielles de la Ville de Paris</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Emmanuel Dreyfus</SurName>
-    <EmailAddress>Emmanuel.Dreyfus@espci.fr</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <SurName>Jean-Jacques Puig</SurName>
-    <EmailAddress>Jean-Jacques.Puig@espci.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/wiki.edugain.org-shibboleth.xml b/swamid-interfederations-2.0/wiki.edugain.org-shibboleth.xml
deleted file mode 100644
index f1104ea4..00000000
--- a/swamid-interfederations-2.0/wiki.edugain.org-shibboleth.xml
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://wiki.edugain.org/shibboleth" xsi:schemaLocation="urn:oasis:names:tc:SAML:2.0:metadata saml-schema-metadata-2.0.xsd urn:mace:shibboleth:metadata:1.0 shibboleth-metadata-1.0.xsd http://www.w3.org/2000/09/xmldsig# xmldsig-core-schema.xsd">
-  <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">
-      <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>
-  </md:Extensions>
-  <SPSSODescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
-    <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.edugain.org/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.edugain.org/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:PrivacyStatementURL xml:lang="en">https://wiki.edugain.org/eduGAIN:Privacy_policy</mdui:PrivacyStatementURL>
-        <mdui:DisplayName xml:lang="en">eduGAIN Wiki</mdui:DisplayName>
-        <mdui:Description xml:lang="en">This wiki provides recommendations and instructions on how to enable web services for eduGAIN.</mdui:Description>
-        <mdui:DisplayName xml:lang="de">eduGAIN Wiki</mdui:DisplayName>
-        <mdui:Description xml:lang="de">Dieses Wiki enthält Empfehlungen und Anleitungen um Webdienste für eduGAIN anzupassen.</mdui:Description>
-        <mdui:DisplayName xml:lang="fr">eduGAIN Wiki</mdui:DisplayName>
-        <mdui:Description xml:lang="fr">Ce wiki met à disposition des recommandations et instructions expliquant comment intégrer des services web dans eduGAIN.</mdui:Description>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIC9zCCAd+gAwIBAgIJAMU9QRxFmNAuMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
-BAMTEHdpa2kuZWR1Z2Fpbi5vcmcwHhcNMTMwNzA0MTAzMTE0WhcNMjMwNzAyMTAz
-MTE0WjAbMRkwFwYDVQQDExB3aWtpLmVkdWdhaW4ub3JnMIIBIjANBgkqhkiG9w0B
-AQEFAAOCAQ8AMIIBCgKCAQEAnspkp3AJPuXFtIhJc3XTBKG8xF3Qk5CMvmDercSB
-iBBJrQXsAKY+wEzZkH3gc3kFDP5J0uLHQ0wjZhwL5F7XBcqiIvbavIRtcxqVLGwQ
-bySVZOfWimpm9LSguiJciJv5dPqhIyMHHkExhi6WLlqY9Am3vkvep5th7nZJ/Idt
-XMMb+PkhSfmQRoZyZGh5n7nkbY88w3DHH9+i1HbyaCNS/+m2/BxQarEKWEWMngcm
-yZX+eAY70QX8O9p3RTS3PT8fhgXp+gbCQWec33c1dbC37RZZQg3Iku4qlZIQc4ER
-SCIkFF4x0qSCPjwDVHX2d2UypHJnbve2tKahUeOyXhtGEwIDAQABoz4wPDAbBgNV
-HREEFDASghB3aWtpLmVkdWdhaW4ub3JnMB0GA1UdDgQWBBQmj8sgTfdCBiqStP+T
-QyNcyrFNRTANBgkqhkiG9w0BAQUFAAOCAQEAXSa71FEzhRl0gbcHK3cKI/8SRsuM
-BSJJNS/3fHQgr3q3Kozffd5r8i1sVQWd76FqjmN2ueqkYBT0XAAFTnvWUnhzSX6o
-ZR7cNBsibRZHqbMQPOnxWk2IKafGT8HG+BTX/TD6ghX8OXbixuB9I+n9jNTphFGi
-XklReN3a7H5LfzJZNw/IsEt/iII3vM0C3CG4udft7vPHUxoz/sg7vLB1QI5oCIKQ
-czsnN6gKOhE3R9xBXmXEAe+7t0j+xUllfMpzN1visnwJfrBqmPxWZtoAofjZBUxy
-nzhoxAesljRTtndfuhYcEnXorpwi2N+4SCaYnF1inyMnJz7xau5lKyxPhA==
-          </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>
-    <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://wiki.edugain.org/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://wiki.edugain.org/Shibboleth.sso/SAML2/Artifact" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://wiki.edugain.org/Shibboleth.sso/SAML2/ECP" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://wiki.edugain.org/Shibboleth.sso/SAML/POST" index="4" isDefault="true"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://wiki.edugain.org/Shibboleth.sso/SAML/Artifact" index="5"/>
-    <AttributeConsumingService index="1">
-      <ServiceName xml:lang="en">eduGAIN Wiki</ServiceName>
-      <ServiceDescription xml:lang="en">This wiki provides recommendations and instructions on how to enable web services for eduGAIN.</ServiceDescription>
-      <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="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="email" Name="urn:oid:0.9.2342.19200300.100.1.3" 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="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"/>
-    </AttributeConsumingService>
-  </SPSSODescriptor>
-  <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
-    <OrganizationName xml:lang="en">geant.net</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">GÉANT</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.geant.net/</OrganizationURL>
-  </Organization>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
-    <GivenName>eduGAIN</GivenName>
-    <SurName>Integration</SurName>
-    <EmailAddress>mailto:edugain-integration@geant.net</EmailAddress>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
-    <GivenName>eduGAIN</GivenName>
-    <SurName>Operation</SurName>
-    <EmailAddress>mailto:edugain-ot@geant.net</EmailAddress>
-  </ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/wiki.edugain.org.xml b/swamid-interfederations-2.0/wiki.edugain.org.xml
deleted file mode 100644
index f1104ea4..00000000
--- a/swamid-interfederations-2.0/wiki.edugain.org.xml
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://wiki.edugain.org/shibboleth" xsi:schemaLocation="urn:oasis:names:tc:SAML:2.0:metadata saml-schema-metadata-2.0.xsd urn:mace:shibboleth:metadata:1.0 shibboleth-metadata-1.0.xsd http://www.w3.org/2000/09/xmldsig# xmldsig-core-schema.xsd">
-  <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">
-      <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>
-  </md:Extensions>
-  <SPSSODescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
-    <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.edugain.org/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.edugain.org/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:PrivacyStatementURL xml:lang="en">https://wiki.edugain.org/eduGAIN:Privacy_policy</mdui:PrivacyStatementURL>
-        <mdui:DisplayName xml:lang="en">eduGAIN Wiki</mdui:DisplayName>
-        <mdui:Description xml:lang="en">This wiki provides recommendations and instructions on how to enable web services for eduGAIN.</mdui:Description>
-        <mdui:DisplayName xml:lang="de">eduGAIN Wiki</mdui:DisplayName>
-        <mdui:Description xml:lang="de">Dieses Wiki enthält Empfehlungen und Anleitungen um Webdienste für eduGAIN anzupassen.</mdui:Description>
-        <mdui:DisplayName xml:lang="fr">eduGAIN Wiki</mdui:DisplayName>
-        <mdui:Description xml:lang="fr">Ce wiki met à disposition des recommandations et instructions expliquant comment intégrer des services web dans eduGAIN.</mdui:Description>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIC9zCCAd+gAwIBAgIJAMU9QRxFmNAuMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
-BAMTEHdpa2kuZWR1Z2Fpbi5vcmcwHhcNMTMwNzA0MTAzMTE0WhcNMjMwNzAyMTAz
-MTE0WjAbMRkwFwYDVQQDExB3aWtpLmVkdWdhaW4ub3JnMIIBIjANBgkqhkiG9w0B
-AQEFAAOCAQ8AMIIBCgKCAQEAnspkp3AJPuXFtIhJc3XTBKG8xF3Qk5CMvmDercSB
-iBBJrQXsAKY+wEzZkH3gc3kFDP5J0uLHQ0wjZhwL5F7XBcqiIvbavIRtcxqVLGwQ
-bySVZOfWimpm9LSguiJciJv5dPqhIyMHHkExhi6WLlqY9Am3vkvep5th7nZJ/Idt
-XMMb+PkhSfmQRoZyZGh5n7nkbY88w3DHH9+i1HbyaCNS/+m2/BxQarEKWEWMngcm
-yZX+eAY70QX8O9p3RTS3PT8fhgXp+gbCQWec33c1dbC37RZZQg3Iku4qlZIQc4ER
-SCIkFF4x0qSCPjwDVHX2d2UypHJnbve2tKahUeOyXhtGEwIDAQABoz4wPDAbBgNV
-HREEFDASghB3aWtpLmVkdWdhaW4ub3JnMB0GA1UdDgQWBBQmj8sgTfdCBiqStP+T
-QyNcyrFNRTANBgkqhkiG9w0BAQUFAAOCAQEAXSa71FEzhRl0gbcHK3cKI/8SRsuM
-BSJJNS/3fHQgr3q3Kozffd5r8i1sVQWd76FqjmN2ueqkYBT0XAAFTnvWUnhzSX6o
-ZR7cNBsibRZHqbMQPOnxWk2IKafGT8HG+BTX/TD6ghX8OXbixuB9I+n9jNTphFGi
-XklReN3a7H5LfzJZNw/IsEt/iII3vM0C3CG4udft7vPHUxoz/sg7vLB1QI5oCIKQ
-czsnN6gKOhE3R9xBXmXEAe+7t0j+xUllfMpzN1visnwJfrBqmPxWZtoAofjZBUxy
-nzhoxAesljRTtndfuhYcEnXorpwi2N+4SCaYnF1inyMnJz7xau5lKyxPhA==
-          </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>
-    <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://wiki.edugain.org/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://wiki.edugain.org/Shibboleth.sso/SAML2/Artifact" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://wiki.edugain.org/Shibboleth.sso/SAML2/ECP" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://wiki.edugain.org/Shibboleth.sso/SAML/POST" index="4" isDefault="true"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://wiki.edugain.org/Shibboleth.sso/SAML/Artifact" index="5"/>
-    <AttributeConsumingService index="1">
-      <ServiceName xml:lang="en">eduGAIN Wiki</ServiceName>
-      <ServiceDescription xml:lang="en">This wiki provides recommendations and instructions on how to enable web services for eduGAIN.</ServiceDescription>
-      <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="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="email" Name="urn:oid:0.9.2342.19200300.100.1.3" 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="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"/>
-    </AttributeConsumingService>
-  </SPSSODescriptor>
-  <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
-    <OrganizationName xml:lang="en">geant.net</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">GÉANT</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.geant.net/</OrganizationURL>
-  </Organization>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
-    <GivenName>eduGAIN</GivenName>
-    <SurName>Integration</SurName>
-    <EmailAddress>mailto:edugain-integration@geant.net</EmailAddress>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
-    <GivenName>eduGAIN</GivenName>
-    <SurName>Operation</SurName>
-    <EmailAddress>mailto:edugain-ot@geant.net</EmailAddress>
-  </ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/wiki.helsinki.fi-shibboleth.xml b/swamid-interfederations-2.0/wiki.helsinki.fi-shibboleth.xml
deleted file mode 100644
index 74102223..00000000
--- a/swamid-interfederations-2.0/wiki.helsinki.fi-shibboleth.xml
+++ /dev/null
@@ -1,88 +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#" entityID="https://wiki.helsinki.fi/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.csc.fi/haka">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://www.csc.fi/english/institutions/haka/instructions/join/eduGAINRegistrationStatement/</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:mace:shibboleth:1.0 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.helsinki.fi/Shibboleth.sso/HAKALogin" index="1"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIE3DCCA8SgAwIBAgIQHvsLUtobn4QCPblS1Go+ZzANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTEyMDMyMDAwMDAwMFoXDTE1MDMyMDIzNTk1OVowgbYxCzAJBgNV
-BAYTAkZJMQ4wDAYDVQQREwUwMDAxNDEQMA4GA1UECBMHVXVzaW1hYTERMA8GA1UE
-BxMISGVsc2lua2kxIjAgBgNVBAkTGVBMIDI2IChUZW9sbGlzdXVza2F0dSAyMykx
-HzAdBgNVBAoTFlVuaXZlcnNpdHkgb2YgSGVsc2lua2kxEjAQBgNVBAsTCUlUIENl
-bnRlcjEZMBcGA1UEAxMQd2lraS5oZWxzaW5raS5maTCCASIwDQYJKoZIhvcNAQEB
-BQADggEPADCCAQoCggEBAJa+NschpDfTZTMY6WAawa6aKcw9SybYVLvdB33QqALl
-IHY4ZciSmtB03g8r0tYJhYjSJrX/jxQ++Ur8eeHCXOYDbZ+wLJw9iXVAPj3nYcOH
-Jt2aF7+aDyYtmo7kqjkhUfNigJ+Lx3C9PYThPa84+tsnvMjpmlqr8X/vTmjPKAxP
-ZzTUUaeK3v4WjQo+HeKGD+48pbARnZukWNNy5ruHwdcxUsqx4Y1AnPJdrSmYhpbx
-mPRgnd+DDJW9auj0NS29e9p7MmncDeFAsKsY0XYWcliU6okoLE8/Cj6OpIn1dBRe
-4eUQ2miyNuR4TYtN8am9GOAnN26ZGpJNYKRPPwugGksCAwEAAaOCAWMwggFfMB8G
-A1UdIwQYMBaAFAy9k2gM896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBSjzyD/fgp/
-JLTN79lDRdn/VZsJpzAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNV
-HSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwGAYDVR0gBBEwDzANBgsrBgEEAbIx
-AQICHTA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3Jn
-L1RFUkVOQVNTTENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0
-dHA6Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUF
-BzABhhpodHRwOi8vb2NzcC50Y3MudGVyZW5hLm9yZzAbBgNVHREEFDASghB3aWtp
-LmhlbHNpbmtpLmZpMA0GCSqGSIb3DQEBBQUAA4IBAQAYVwB58egt9eARJEYY2nqX
-uBC85chsu5tO5JgN5fRBTC9h+3d83X5ArZm4Lt0ruki/b9eqtdH/sQcfqemKuFab
-4LlchbV7POnRiIbMyDf5gQXQAudP4JheLDxvTnQblnRblwSNrIAZnjls48SiZAJF
-EKnVWUH+2qiFmShHUxHllnrrbbZtrxD3AAjKnDyShzaat5+Io9HEJZ0c7BUWN0pb
-wK1A8To/939K5dMZ78pJnrWNVWGcU20FitYZx/QtfHR5jmm9xWQyjXxYb90oseqw
-av3W2z9P6X70jYlPJNL2MEi1L0imk1o/VYmmGl5ngGfO8XuIRkq6f4ozfwpvHcTD</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://wiki.helsinki.fi/Shibboleth.sso/SAML2/POST" index="1" isDefault="true"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://wiki.helsinki.fi/Shibboleth.sso/SAML/POST" index="2" isDefault="false"/>
-    <AttributeConsumingService index="1" isDefault="true">
-      <ServiceName xml:lang="fi">Helsingin yliopiston Wiki-palvelu</ServiceName>
-      <ServiceName xml:lang="en">University of Helsinki Wiki Service</ServiceName>
-      <ServiceDescription xml:lang="en">Tool for group collaboration and web-publishing.</ServiceDescription>
-      <RequestedAttribute FriendlyName="cn" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <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="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-    </AttributeConsumingService>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="fi">Helsingin yliopisto</OrganizationName>
-    <OrganizationName xml:lang="en">University of Helsinki</OrganizationName>
-    <OrganizationName xml:lang="sv">Helsingfors universitet</OrganizationName>
-    <OrganizationDisplayName xml:lang="fi">Helsingin yliopisto</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">University of Helsinki</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="sv">Helsingfors universitet</OrganizationDisplayName>
-    <OrganizationURL xml:lang="fi">http://www.helsinki.fi/yliopisto/</OrganizationURL>
-    <OrganizationURL xml:lang="en">http://www.helsinki.fi/yliopisto/</OrganizationURL>
-    <OrganizationURL xml:lang="sv">http://www.helsinki.fi/yliopisto/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="administrative">
-    <GivenName>Erkki</GivenName>
-    <SurName>Aalto</SurName>
-    <EmailAddress>mailto:ok-wiki@helsinki.fi</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Janne</GivenName>
-    <SurName>Peltonen</SurName>
-    <EmailAddress>mailto:haka-hy@helsinki.fi</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="support">
-    <GivenName>Erkki</GivenName>
-    <SurName>Aalto</SurName>
-    <EmailAddress>mailto:ok-wiki@helsinki.fi</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/wiki.helsinki.fi.xml b/swamid-interfederations-2.0/wiki.helsinki.fi.xml
deleted file mode 100644
index 74102223..00000000
--- a/swamid-interfederations-2.0/wiki.helsinki.fi.xml
+++ /dev/null
@@ -1,88 +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#" entityID="https://wiki.helsinki.fi/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.csc.fi/haka">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://www.csc.fi/english/institutions/haka/instructions/join/eduGAINRegistrationStatement/</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:mace:shibboleth:1.0 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.helsinki.fi/Shibboleth.sso/HAKALogin" index="1"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIE3DCCA8SgAwIBAgIQHvsLUtobn4QCPblS1Go+ZzANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTEyMDMyMDAwMDAwMFoXDTE1MDMyMDIzNTk1OVowgbYxCzAJBgNV
-BAYTAkZJMQ4wDAYDVQQREwUwMDAxNDEQMA4GA1UECBMHVXVzaW1hYTERMA8GA1UE
-BxMISGVsc2lua2kxIjAgBgNVBAkTGVBMIDI2IChUZW9sbGlzdXVza2F0dSAyMykx
-HzAdBgNVBAoTFlVuaXZlcnNpdHkgb2YgSGVsc2lua2kxEjAQBgNVBAsTCUlUIENl
-bnRlcjEZMBcGA1UEAxMQd2lraS5oZWxzaW5raS5maTCCASIwDQYJKoZIhvcNAQEB
-BQADggEPADCCAQoCggEBAJa+NschpDfTZTMY6WAawa6aKcw9SybYVLvdB33QqALl
-IHY4ZciSmtB03g8r0tYJhYjSJrX/jxQ++Ur8eeHCXOYDbZ+wLJw9iXVAPj3nYcOH
-Jt2aF7+aDyYtmo7kqjkhUfNigJ+Lx3C9PYThPa84+tsnvMjpmlqr8X/vTmjPKAxP
-ZzTUUaeK3v4WjQo+HeKGD+48pbARnZukWNNy5ruHwdcxUsqx4Y1AnPJdrSmYhpbx
-mPRgnd+DDJW9auj0NS29e9p7MmncDeFAsKsY0XYWcliU6okoLE8/Cj6OpIn1dBRe
-4eUQ2miyNuR4TYtN8am9GOAnN26ZGpJNYKRPPwugGksCAwEAAaOCAWMwggFfMB8G
-A1UdIwQYMBaAFAy9k2gM896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBSjzyD/fgp/
-JLTN79lDRdn/VZsJpzAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNV
-HSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwGAYDVR0gBBEwDzANBgsrBgEEAbIx
-AQICHTA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3Jn
-L1RFUkVOQVNTTENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0
-dHA6Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUF
-BzABhhpodHRwOi8vb2NzcC50Y3MudGVyZW5hLm9yZzAbBgNVHREEFDASghB3aWtp
-LmhlbHNpbmtpLmZpMA0GCSqGSIb3DQEBBQUAA4IBAQAYVwB58egt9eARJEYY2nqX
-uBC85chsu5tO5JgN5fRBTC9h+3d83X5ArZm4Lt0ruki/b9eqtdH/sQcfqemKuFab
-4LlchbV7POnRiIbMyDf5gQXQAudP4JheLDxvTnQblnRblwSNrIAZnjls48SiZAJF
-EKnVWUH+2qiFmShHUxHllnrrbbZtrxD3AAjKnDyShzaat5+Io9HEJZ0c7BUWN0pb
-wK1A8To/939K5dMZ78pJnrWNVWGcU20FitYZx/QtfHR5jmm9xWQyjXxYb90oseqw
-av3W2z9P6X70jYlPJNL2MEi1L0imk1o/VYmmGl5ngGfO8XuIRkq6f4ozfwpvHcTD</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://wiki.helsinki.fi/Shibboleth.sso/SAML2/POST" index="1" isDefault="true"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://wiki.helsinki.fi/Shibboleth.sso/SAML/POST" index="2" isDefault="false"/>
-    <AttributeConsumingService index="1" isDefault="true">
-      <ServiceName xml:lang="fi">Helsingin yliopiston Wiki-palvelu</ServiceName>
-      <ServiceName xml:lang="en">University of Helsinki Wiki Service</ServiceName>
-      <ServiceDescription xml:lang="en">Tool for group collaboration and web-publishing.</ServiceDescription>
-      <RequestedAttribute FriendlyName="cn" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <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="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-    </AttributeConsumingService>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="fi">Helsingin yliopisto</OrganizationName>
-    <OrganizationName xml:lang="en">University of Helsinki</OrganizationName>
-    <OrganizationName xml:lang="sv">Helsingfors universitet</OrganizationName>
-    <OrganizationDisplayName xml:lang="fi">Helsingin yliopisto</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">University of Helsinki</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="sv">Helsingfors universitet</OrganizationDisplayName>
-    <OrganizationURL xml:lang="fi">http://www.helsinki.fi/yliopisto/</OrganizationURL>
-    <OrganizationURL xml:lang="en">http://www.helsinki.fi/yliopisto/</OrganizationURL>
-    <OrganizationURL xml:lang="sv">http://www.helsinki.fi/yliopisto/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="administrative">
-    <GivenName>Erkki</GivenName>
-    <SurName>Aalto</SurName>
-    <EmailAddress>mailto:ok-wiki@helsinki.fi</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Janne</GivenName>
-    <SurName>Peltonen</SurName>
-    <EmailAddress>mailto:haka-hy@helsinki.fi</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="support">
-    <GivenName>Erkki</GivenName>
-    <SurName>Aalto</SurName>
-    <EmailAddress>mailto:ok-wiki@helsinki.fi</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/wiki.moonshot.ja.net-shibboleth.xml b/swamid-interfederations-2.0/wiki.moonshot.ja.net-shibboleth.xml
deleted file mode 100644
index 07ddffee..00000000
--- a/swamid-interfederations-2.0/wiki.moonshot.ja.net-shibboleth.xml
+++ /dev/null
@@ -1,97 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://wiki.moonshot.ja.net/shibboleth">
-  <!--
-		This is a "Moonshot Wiki" Shibboleth SP for JISC Collections and Janet 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="2014-01-23T10:58:44Z">
-      <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>
-      <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.moonshot.ja.net/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.moonshot.ja.net/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Moonshot Wiki</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Moonshot is a single, unifying technology for extending the benefits of federated identity to a broad range of non-web services. This service hosts the wiki for Moonshot, containing technical documentation, along with installation and configuration guides.</mdui:Description>
-        <mdui:Logo height="300" width="300">https://wiki.moonshot.ja.net/download/thumbnails/786450/global.jpg</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDAzCCAeugAwIBAgIJAI2lVwLRmJlYMA0GCSqGSIb3DQEBBQUAMB8xHTAbBgNV
-						BAMTFHdpa2kubW9vbnNob3QuamEubmV0MB4XDTE0MDEyMjE1NTUyMloXDTI0MDEy
-						MDE1NTUyMlowHzEdMBsGA1UEAxMUd2lraS5tb29uc2hvdC5qYS5uZXQwggEiMA0G
-						CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDWGUu/30A3CbAtbHJxdqCH3sOeEBRh
-						8zlXj4fg9hFnq+QGZFnprYbBGiJIlCrbESqX5xcJb1B36NbyW2G0FvUVzi6H+RlG
-						t686NKc+NIODcbf4YiOcvn9Ixaxmd2q4/9c/3FBXlFm60chf3hENK9hF6kaw4LUd
-						nXdkL6r4Ha2q2csGUSjWaPlS6azgn+Wx+KFE6AVdVRhhrkeuoU6qko+waPPjXjJG
-						gzIfBs45AYwb6t5rw+7oaKWeDMR1pIDa3YkhyvLpeesi+ZXW+CzzWPO7LK6ffedB
-						n4GOZkArOBo8y/KV6qt67w6wVujD9oW3bNTmt4zh6SPpK/qqUOPe4jZLAgMBAAGj
-						QjBAMB8GA1UdEQQYMBaCFHdpa2kubW9vbnNob3QuamEubmV0MB0GA1UdDgQWBBQX
-						l8auIWrO6aWUz4kAMl1ft5iPLjANBgkqhkiG9w0BAQUFAAOCAQEAEQirkb8jdIye
-						bieiVOnSdkHSgR+9Nigf7DHEF0F1IXMVCKYONud2O4ospFignlg5UnPV1nrul6Fz
-						c681gz4a0mY0Rkhg0noTbsfDsxmeddWBl2exsS8aLfoMcLmN2XaAPoiyXkUB07VM
-						KfuD9TOWjaWBTUXGxqxvWxqYGyMqY/8K0YFmzOSlW3o38Wnal6BmBU70YdUeGpb9
-						k/GRL1yvGpuhK1LGzCdtu0tg/tpLDB6vYqAUJOI9A/0nnavZ8ZRb7qyUU8hnxbGK
-						njlrDErSFqTmSYL6RiJyx24bQfVdDporsXDSrMprH3B2SIIXNHMDNWxraXUDTtg1
-						0oPZBY6WCg==
-					</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://wiki.moonshot.ja.net/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://wiki.moonshot.ja.net/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://wiki.moonshot.ja.net/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wiki.moonshot.ja.net/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://wiki.moonshot.ja.net/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wiki.moonshot.ja.net/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://wiki.moonshot.ja.net/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://wiki.moonshot.ja.net/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://wiki.moonshot.ja.net/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://wiki.moonshot.ja.net/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://wiki.moonshot.ja.net/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <AttributeConsumingService index="1">
-      <ServiceName xml:lang="en">Moonshot Wiki</ServiceName>
-      <ServiceDescription xml:lang="en">Moonshot is a single, unifying technology for extending the benefits of federated identity to a broad range of non-web services. This service hosts the wiki for Moonshot, containing technical documentation, along with installation and configuration guides.</ServiceDescription>
-      <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"/>
-    </AttributeConsumingService>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">JISC Collections and Janet Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Moonshot Wiki</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">https://wiki.moonshot.ja.net/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Adam</GivenName>
-    <SurName>Bishop</SurName>
-    <EmailAddress>mailto:Adam.bishop@ja.net</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Adam</GivenName>
-    <SurName>Bishop</SurName>
-    <EmailAddress>mailto:Adam.bishop@ja.net</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/wiki.moonshot.ja.net.xml b/swamid-interfederations-2.0/wiki.moonshot.ja.net.xml
deleted file mode 100644
index 07ddffee..00000000
--- a/swamid-interfederations-2.0/wiki.moonshot.ja.net.xml
+++ /dev/null
@@ -1,97 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://wiki.moonshot.ja.net/shibboleth">
-  <!--
-		This is a "Moonshot Wiki" Shibboleth SP for JISC Collections and Janet 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="2014-01-23T10:58:44Z">
-      <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>
-      <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.moonshot.ja.net/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.moonshot.ja.net/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Moonshot Wiki</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Moonshot is a single, unifying technology for extending the benefits of federated identity to a broad range of non-web services. This service hosts the wiki for Moonshot, containing technical documentation, along with installation and configuration guides.</mdui:Description>
-        <mdui:Logo height="300" width="300">https://wiki.moonshot.ja.net/download/thumbnails/786450/global.jpg</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDAzCCAeugAwIBAgIJAI2lVwLRmJlYMA0GCSqGSIb3DQEBBQUAMB8xHTAbBgNV
-						BAMTFHdpa2kubW9vbnNob3QuamEubmV0MB4XDTE0MDEyMjE1NTUyMloXDTI0MDEy
-						MDE1NTUyMlowHzEdMBsGA1UEAxMUd2lraS5tb29uc2hvdC5qYS5uZXQwggEiMA0G
-						CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDWGUu/30A3CbAtbHJxdqCH3sOeEBRh
-						8zlXj4fg9hFnq+QGZFnprYbBGiJIlCrbESqX5xcJb1B36NbyW2G0FvUVzi6H+RlG
-						t686NKc+NIODcbf4YiOcvn9Ixaxmd2q4/9c/3FBXlFm60chf3hENK9hF6kaw4LUd
-						nXdkL6r4Ha2q2csGUSjWaPlS6azgn+Wx+KFE6AVdVRhhrkeuoU6qko+waPPjXjJG
-						gzIfBs45AYwb6t5rw+7oaKWeDMR1pIDa3YkhyvLpeesi+ZXW+CzzWPO7LK6ffedB
-						n4GOZkArOBo8y/KV6qt67w6wVujD9oW3bNTmt4zh6SPpK/qqUOPe4jZLAgMBAAGj
-						QjBAMB8GA1UdEQQYMBaCFHdpa2kubW9vbnNob3QuamEubmV0MB0GA1UdDgQWBBQX
-						l8auIWrO6aWUz4kAMl1ft5iPLjANBgkqhkiG9w0BAQUFAAOCAQEAEQirkb8jdIye
-						bieiVOnSdkHSgR+9Nigf7DHEF0F1IXMVCKYONud2O4ospFignlg5UnPV1nrul6Fz
-						c681gz4a0mY0Rkhg0noTbsfDsxmeddWBl2exsS8aLfoMcLmN2XaAPoiyXkUB07VM
-						KfuD9TOWjaWBTUXGxqxvWxqYGyMqY/8K0YFmzOSlW3o38Wnal6BmBU70YdUeGpb9
-						k/GRL1yvGpuhK1LGzCdtu0tg/tpLDB6vYqAUJOI9A/0nnavZ8ZRb7qyUU8hnxbGK
-						njlrDErSFqTmSYL6RiJyx24bQfVdDporsXDSrMprH3B2SIIXNHMDNWxraXUDTtg1
-						0oPZBY6WCg==
-					</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://wiki.moonshot.ja.net/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://wiki.moonshot.ja.net/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://wiki.moonshot.ja.net/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wiki.moonshot.ja.net/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://wiki.moonshot.ja.net/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wiki.moonshot.ja.net/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://wiki.moonshot.ja.net/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://wiki.moonshot.ja.net/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://wiki.moonshot.ja.net/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://wiki.moonshot.ja.net/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://wiki.moonshot.ja.net/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <AttributeConsumingService index="1">
-      <ServiceName xml:lang="en">Moonshot Wiki</ServiceName>
-      <ServiceDescription xml:lang="en">Moonshot is a single, unifying technology for extending the benefits of federated identity to a broad range of non-web services. This service hosts the wiki for Moonshot, containing technical documentation, along with installation and configuration guides.</ServiceDescription>
-      <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"/>
-    </AttributeConsumingService>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">JISC Collections and Janet Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Moonshot Wiki</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">https://wiki.moonshot.ja.net/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Adam</GivenName>
-    <SurName>Bishop</SurName>
-    <EmailAddress>mailto:Adam.bishop@ja.net</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Adam</GivenName>
-    <SurName>Bishop</SurName>
-    <EmailAddress>mailto:Adam.bishop@ja.net</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/wiki.shibboleth.net-shibboleth.xml b/swamid-interfederations-2.0/wiki.shibboleth.net-shibboleth.xml
deleted file mode 100644
index 48b067cb..00000000
--- a/swamid-interfederations-2.0/wiki.shibboleth.net-shibboleth.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://wiki.shibboleth.net/shibboleth">
-  <!--
-		This is a "Shibboleth Federated Wiki" Shibboleth SP for JISC Collections and Janet 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="2011-01-06T16:23:40Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</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>
-      <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.shibboleth.net/confluence/Shibboleth.sso/EDS"/>
-      <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.shibboleth.net/confluence/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.shibboleth.net/confluence/Shibboleth.sso/EDS" 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.shibboleth.net/confluence/Shibboleth.sso/Login" index="2"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Shibboleth.net Wiki</mdui:DisplayName>
-        <mdui:Description xml:lang="en">The wiki hosting the documentation for Shibboleth.
-					Unauthenticated users may view the existing documentation. Authenticated users
-					may create new documentation pages and edit existing ones.
-				</mdui:Description>
-        <mdui:Logo height="82" width="64">https://shibboleth.net/images/gryphon_64x82.png</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDQjCCAiqgAwIBAgIJAMI1r/DZzTEJMA0GCSqGSIb3DQEBBQUAME8xEzARBgoJ
-						kiaJk/IsZAEZFgNuZXQxGjAYBgoJkiaJk/IsZAEZFgpzaGliYm9sZXRoMRwwGgYD
-						VQQDExN3aWtpLnNoaWJib2xldGgubmV0MB4XDTEzMTEyNTE0NTcyOFoXDTM3MDMw
-						NDE0NTcyOFowTzETMBEGCgmSJomT8ixkARkWA25ldDEaMBgGCgmSJomT8ixkARkW
-						CnNoaWJib2xldGgxHDAaBgNVBAMTE3dpa2kuc2hpYmJvbGV0aC5uZXQwggEiMA0G
-						CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC1viMiWhYa8cmxJ6rQ8yORYMD6Gx5n
-						r/r9wQko+Tbjl/qGS0LaTfPQCokvwrD06506MPHainaMqbjlO4gDjq2LpU9/iy0s
-						iLuY7UHgDqNNZOELBTQOMwLAFcuEA10FCWjJRglT+6w3xEFeU+dZkBXV1VvKBvsZ
-						SiuQw437CcV3ueEF4+ZB0l9uyq8o3wzKRZ9DnpyFL7SUJiHJPuqqXZuyQnjLrbVZ
-						KjjumGnY3LJTUo1xoUEuhqj5RMfspn2oc5YnIYka5YrCBmYKJV3QtCFbLA/cz8nF
-						m+lOvYGz8nl3wHNkZIVRoetVw/Mhf7lzex0rh3XBdS6vVcT75uH0X1OPAgMBAAGj
-						ITAfMB0GA1UdDgQWBBQe1XwZavrgAhRXrfhv1gGUwSkc7DANBgkqhkiG9w0BAQUF
-						AAOCAQEADCGhWJ+oZ8ltcjJ7D66rMg1HOZT6GFCVeZ7MfhY/KFrvsnITNbTA+SgZ
-						tCJt/BLlZXxpzmix19bD9bNwqEMo7WSqBy77X7SS97ZXti6y6vwAz8h78vzQopOd
-						rnn8XXyWxtrtRRCK4RMpZGrVm3sfBPW68j9hiPHZqewE4nLavjCki/I9rCMe5dJE
-						3+ZRf4Ip/9hYqM+a5Chcvbo2zJEOtw+EUQqNTZ51j33H/2qF9UoSpt74UFh+Jd5y
-						L2GoFSt/gCld78j/7cU3ObGQEme+hVVZ8/uGa/cCYvFt75vNBdnlj4icZ6fgFe9R
-						9h5hlBTGD3PULSFmCdkgxtwIyd855Q==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://wiki.shibboleth.net/confluence/Shibboleth.sso/Artifact/SOAP" index="0"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://wiki.shibboleth.net/confluence/Shibboleth.sso/SLO/Artifact"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wiki.shibboleth.net/confluence/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://wiki.shibboleth.net/confluence/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://wiki.shibboleth.net/confluence/Shibboleth.sso/SLO/SOAP"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://wiki.shibboleth.net/confluence/Shibboleth.sso/SAML/Artifact" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://wiki.shibboleth.net/confluence/Shibboleth.sso/SAML/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://wiki.shibboleth.net/confluence/Shibboleth.sso/SAML2/Artifact" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://wiki.shibboleth.net/confluence/Shibboleth.sso/SAML2/ECP" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wiki.shibboleth.net/confluence/Shibboleth.sso/SAML2/POST" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://wiki.shibboleth.net/confluence/Shibboleth.sso/SAML2/POST-SimpleSign" index="5"/>
-    <AttributeConsumingService index="1">
-      <ServiceName xml:lang="en">Shibboleth.net Wiki</ServiceName>
-      <ServiceDescription xml:lang="en">
-				The wiki hosting the documentation for Shibboleth.
-				Unauthenticated user may view the existing documentation. Authenticated users
-				may create new documentation pages and edit existing ones. 
-			</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"/>
-      <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="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" 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="cn" Name="urn:oid:2.5.4.3" 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="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="mail" Name="urn:mace:dir:attribute-def:mail" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-      <RequestedAttribute FriendlyName="displayName" Name="urn:mace:dir:attribute-def:displayName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-      <RequestedAttribute FriendlyName="cn" Name="urn:mace:dir:attribute-def:cn" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-    </AttributeConsumingService>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">JISC Collections and Janet Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Shibboleth Federated Wiki</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.shibboleth.net/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Shibboleth.Net Technical Support</GivenName>
-    <EmailAddress>mailto:contact@shibboleth.net</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Scott</GivenName>
-    <SurName>Cantor</SurName>
-    <EmailAddress>mailto:cantor.2@osu.edu</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/wiki.shibboleth.net.xml b/swamid-interfederations-2.0/wiki.shibboleth.net.xml
deleted file mode 100644
index 48b067cb..00000000
--- a/swamid-interfederations-2.0/wiki.shibboleth.net.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://wiki.shibboleth.net/shibboleth">
-  <!--
-		This is a "Shibboleth Federated Wiki" Shibboleth SP for JISC Collections and Janet 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="2011-01-06T16:23:40Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</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>
-      <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.shibboleth.net/confluence/Shibboleth.sso/EDS"/>
-      <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.shibboleth.net/confluence/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.shibboleth.net/confluence/Shibboleth.sso/EDS" 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.shibboleth.net/confluence/Shibboleth.sso/Login" index="2"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Shibboleth.net Wiki</mdui:DisplayName>
-        <mdui:Description xml:lang="en">The wiki hosting the documentation for Shibboleth.
-					Unauthenticated users may view the existing documentation. Authenticated users
-					may create new documentation pages and edit existing ones.
-				</mdui:Description>
-        <mdui:Logo height="82" width="64">https://shibboleth.net/images/gryphon_64x82.png</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDQjCCAiqgAwIBAgIJAMI1r/DZzTEJMA0GCSqGSIb3DQEBBQUAME8xEzARBgoJ
-						kiaJk/IsZAEZFgNuZXQxGjAYBgoJkiaJk/IsZAEZFgpzaGliYm9sZXRoMRwwGgYD
-						VQQDExN3aWtpLnNoaWJib2xldGgubmV0MB4XDTEzMTEyNTE0NTcyOFoXDTM3MDMw
-						NDE0NTcyOFowTzETMBEGCgmSJomT8ixkARkWA25ldDEaMBgGCgmSJomT8ixkARkW
-						CnNoaWJib2xldGgxHDAaBgNVBAMTE3dpa2kuc2hpYmJvbGV0aC5uZXQwggEiMA0G
-						CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC1viMiWhYa8cmxJ6rQ8yORYMD6Gx5n
-						r/r9wQko+Tbjl/qGS0LaTfPQCokvwrD06506MPHainaMqbjlO4gDjq2LpU9/iy0s
-						iLuY7UHgDqNNZOELBTQOMwLAFcuEA10FCWjJRglT+6w3xEFeU+dZkBXV1VvKBvsZ
-						SiuQw437CcV3ueEF4+ZB0l9uyq8o3wzKRZ9DnpyFL7SUJiHJPuqqXZuyQnjLrbVZ
-						KjjumGnY3LJTUo1xoUEuhqj5RMfspn2oc5YnIYka5YrCBmYKJV3QtCFbLA/cz8nF
-						m+lOvYGz8nl3wHNkZIVRoetVw/Mhf7lzex0rh3XBdS6vVcT75uH0X1OPAgMBAAGj
-						ITAfMB0GA1UdDgQWBBQe1XwZavrgAhRXrfhv1gGUwSkc7DANBgkqhkiG9w0BAQUF
-						AAOCAQEADCGhWJ+oZ8ltcjJ7D66rMg1HOZT6GFCVeZ7MfhY/KFrvsnITNbTA+SgZ
-						tCJt/BLlZXxpzmix19bD9bNwqEMo7WSqBy77X7SS97ZXti6y6vwAz8h78vzQopOd
-						rnn8XXyWxtrtRRCK4RMpZGrVm3sfBPW68j9hiPHZqewE4nLavjCki/I9rCMe5dJE
-						3+ZRf4Ip/9hYqM+a5Chcvbo2zJEOtw+EUQqNTZ51j33H/2qF9UoSpt74UFh+Jd5y
-						L2GoFSt/gCld78j/7cU3ObGQEme+hVVZ8/uGa/cCYvFt75vNBdnlj4icZ6fgFe9R
-						9h5hlBTGD3PULSFmCdkgxtwIyd855Q==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://wiki.shibboleth.net/confluence/Shibboleth.sso/Artifact/SOAP" index="0"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://wiki.shibboleth.net/confluence/Shibboleth.sso/SLO/Artifact"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wiki.shibboleth.net/confluence/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://wiki.shibboleth.net/confluence/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://wiki.shibboleth.net/confluence/Shibboleth.sso/SLO/SOAP"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://wiki.shibboleth.net/confluence/Shibboleth.sso/SAML/Artifact" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://wiki.shibboleth.net/confluence/Shibboleth.sso/SAML/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://wiki.shibboleth.net/confluence/Shibboleth.sso/SAML2/Artifact" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://wiki.shibboleth.net/confluence/Shibboleth.sso/SAML2/ECP" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wiki.shibboleth.net/confluence/Shibboleth.sso/SAML2/POST" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://wiki.shibboleth.net/confluence/Shibboleth.sso/SAML2/POST-SimpleSign" index="5"/>
-    <AttributeConsumingService index="1">
-      <ServiceName xml:lang="en">Shibboleth.net Wiki</ServiceName>
-      <ServiceDescription xml:lang="en">
-				The wiki hosting the documentation for Shibboleth.
-				Unauthenticated user may view the existing documentation. Authenticated users
-				may create new documentation pages and edit existing ones. 
-			</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"/>
-      <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="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" 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="cn" Name="urn:oid:2.5.4.3" 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="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="mail" Name="urn:mace:dir:attribute-def:mail" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-      <RequestedAttribute FriendlyName="displayName" Name="urn:mace:dir:attribute-def:displayName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-      <RequestedAttribute FriendlyName="cn" Name="urn:mace:dir:attribute-def:cn" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-    </AttributeConsumingService>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">JISC Collections and Janet Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Shibboleth Federated Wiki</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.shibboleth.net/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Shibboleth.Net Technical Support</GivenName>
-    <EmailAddress>mailto:contact@shibboleth.net</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Scott</GivenName>
-    <SurName>Cantor</SurName>
-    <EmailAddress>mailto:cantor.2@osu.edu</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/wiki2.redclara.net-shibboleth.xml b/swamid-interfederations-2.0/wiki2.redclara.net-shibboleth.xml
deleted file mode 100644
index be3ccc86..00000000
--- a/swamid-interfederations-2.0/wiki2.redclara.net-shibboleth.xml
+++ /dev/null
@@ -1,145 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" 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=webmaster@redclara.net,CN=wiki2.redclara.net,C=CO,description=QfHSXQ3yP741Ruct</ds:X509SubjectName>
-          <ds:X509Certificate>MIIGXTCCBUWgAwIBAgIDEP1PMA0GCSqGSIb3DQEBBQUAMIGMMQswCQYDVQQGEwJJ
-TDEWMBQGA1UEChMNU3RhcnRDb20gTHRkLjErMCkGA1UECxMiU2VjdXJlIERpZ2l0
-YWwgQ2VydGlmaWNhdGUgU2lnbmluZzE4MDYGA1UEAxMvU3RhcnRDb20gQ2xhc3Mg
-MSBQcmltYXJ5IEludGVybWVkaWF0ZSBTZXJ2ZXIgQ0EwHhcNMTQwNjEwMTI1ODM0
-WhcNMTUwNjExMDI1MjI0WjBsMRkwFwYDVQQNExBRZkhTWFEzeVA3NDFSdWN0MQsw
-CQYDVQQGEwJDTzEbMBkGA1UEAxMSd2lraTIucmVkY2xhcmEubmV0MSUwIwYJKoZI
-hvcNAQkBFhZ3ZWJtYXN0ZXJAcmVkY2xhcmEubmV0MIIBIjANBgkqhkiG9w0BAQEF
-AAOCAQ8AMIIBCgKCAQEAvBhJOyV89jNU927Mxwn+DvisAsJZdwvYlV87LmOC970Y
-FACoyMNAW9HKUw14/eiGigtUSzIpc/sLqLWfdSOLvutMIS9l65iM5u6KVztBrqyA
-KHTQiYDgcSbBUe1oCvNfYfLVw0t14oIQwcw+JzjYK9QFsJ/v6ECvnUs0/IOXCfmD
-l4NHrNd3KJcvsHAkuRogEOXfAWSBc7xbT92ljjThTGrEwPJ8WJoXgRrEM5YUl1E4
-dEUgdoZ4ACKq8GxQR0et74+9ffamxRn+i5tIRcSeUJLo9DWCw14iTgnPpdJI6Tpb
-GcMmRh51rIodv1rmuRX/1UiJ+1+VmeJ0spWPma2lGwIDAQABo4IC5TCCAuEwCQYD
-VR0TBAIwADALBgNVHQ8EBAMCA6gwEwYDVR0lBAwwCgYIKwYBBQUHAwEwHQYDVR0O
-BBYEFKe6dZTQ54y1INi3qhIu62ZJdJ7DMB8GA1UdIwQYMBaAFOtCNNCYsKuf9Btr
-CPfMZC7vDixFMCsGA1UdEQQkMCKCEndpa2kyLnJlZGNsYXJhLm5ldIIMcmVkY2xh
-cmEubmV0MIIBVgYDVR0gBIIBTTCCAUkwCAYGZ4EMAQIBMIIBOwYLKwYBBAGBtTcB
-AgMwggEqMC4GCCsGAQUFBwIBFiJodHRwOi8vd3d3LnN0YXJ0c3NsLmNvbS9wb2xp
-Y3kucGRmMIH3BggrBgEFBQcCAjCB6jAnFiBTdGFydENvbSBDZXJ0aWZpY2F0aW9u
-IEF1dGhvcml0eTADAgEBGoG+VGhpcyBjZXJ0aWZpY2F0ZSB3YXMgaXNzdWVkIGFj
-Y29yZGluZyB0byB0aGUgQ2xhc3MgMSBWYWxpZGF0aW9uIHJlcXVpcmVtZW50cyBv
-ZiB0aGUgU3RhcnRDb20gQ0EgcG9saWN5LCByZWxpYW5jZSBvbmx5IGZvciB0aGUg
-aW50ZW5kZWQgcHVycG9zZSBpbiBjb21wbGlhbmNlIG9mIHRoZSByZWx5aW5nIHBh
-cnR5IG9ibGlnYXRpb25zLjA1BgNVHR8ELjAsMCqgKKAmhiRodHRwOi8vY3JsLnN0
-YXJ0c3NsLmNvbS9jcnQxLWNybC5jcmwwgY4GCCsGAQUFBwEBBIGBMH8wOQYIKwYB
-BQUHMAGGLWh0dHA6Ly9vY3NwLnN0YXJ0c3NsLmNvbS9zdWIvY2xhc3MxL3NlcnZl
-ci9jYTBCBggrBgEFBQcwAoY2aHR0cDovL2FpYS5zdGFydHNzbC5jb20vY2VydHMv
-c3ViLmNsYXNzMS5zZXJ2ZXIuY2EuY3J0MCMGA1UdEgQcMBqGGGh0dHA6Ly93d3cu
-c3RhcnRzc2wuY29tLzANBgkqhkiG9w0BAQUFAAOCAQEAEXXajM3y024WuHBS9KX4
-D1mJgqJC3BN/0V6mCbrrtp7naDyg7mGdLEAkR403WwpR7cQlcopwCjzlVaaIM45d
-yiaMgJSxTcZHL5XD77nV7LjtgZDSDasmpIcvKezSwOqrdZgouukWUB4bcjpK8+JS
-vDhW4/nxjS85s0iQzM97y4AlunatpcVUkZmqOvpmoLtXofyRnP6fMXPkyGav1UUa
-rsIJlrC7xLyj8uLmF8SBQw5XqhJ3CieeYEWl9Oodqb9NPnW8+FJ/UPm2yjNbUo3q
-wnUR/FUAapCESXV1HZIoixTWrUlxCUVXJuMP58wjykYc/J6O5vV8I0HaAzQFG/lc
-2g==
-</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=webmaster@redclara.net,CN=wiki2.redclara.net,C=CO,description=QfHSXQ3yP741Ruct</ds:X509SubjectName>
-          <ds:X509Certificate>MIIGXTCCBUWgAwIBAgIDEP1PMA0GCSqGSIb3DQEBBQUAMIGMMQswCQYDVQQGEwJJ
-TDEWMBQGA1UEChMNU3RhcnRDb20gTHRkLjErMCkGA1UECxMiU2VjdXJlIERpZ2l0
-YWwgQ2VydGlmaWNhdGUgU2lnbmluZzE4MDYGA1UEAxMvU3RhcnRDb20gQ2xhc3Mg
-MSBQcmltYXJ5IEludGVybWVkaWF0ZSBTZXJ2ZXIgQ0EwHhcNMTQwNjEwMTI1ODM0
-WhcNMTUwNjExMDI1MjI0WjBsMRkwFwYDVQQNExBRZkhTWFEzeVA3NDFSdWN0MQsw
-CQYDVQQGEwJDTzEbMBkGA1UEAxMSd2lraTIucmVkY2xhcmEubmV0MSUwIwYJKoZI
-hvcNAQkBFhZ3ZWJtYXN0ZXJAcmVkY2xhcmEubmV0MIIBIjANBgkqhkiG9w0BAQEF
-AAOCAQ8AMIIBCgKCAQEAvBhJOyV89jNU927Mxwn+DvisAsJZdwvYlV87LmOC970Y
-FACoyMNAW9HKUw14/eiGigtUSzIpc/sLqLWfdSOLvutMIS9l65iM5u6KVztBrqyA
-KHTQiYDgcSbBUe1oCvNfYfLVw0t14oIQwcw+JzjYK9QFsJ/v6ECvnUs0/IOXCfmD
-l4NHrNd3KJcvsHAkuRogEOXfAWSBc7xbT92ljjThTGrEwPJ8WJoXgRrEM5YUl1E4
-dEUgdoZ4ACKq8GxQR0et74+9ffamxRn+i5tIRcSeUJLo9DWCw14iTgnPpdJI6Tpb
-GcMmRh51rIodv1rmuRX/1UiJ+1+VmeJ0spWPma2lGwIDAQABo4IC5TCCAuEwCQYD
-VR0TBAIwADALBgNVHQ8EBAMCA6gwEwYDVR0lBAwwCgYIKwYBBQUHAwEwHQYDVR0O
-BBYEFKe6dZTQ54y1INi3qhIu62ZJdJ7DMB8GA1UdIwQYMBaAFOtCNNCYsKuf9Btr
-CPfMZC7vDixFMCsGA1UdEQQkMCKCEndpa2kyLnJlZGNsYXJhLm5ldIIMcmVkY2xh
-cmEubmV0MIIBVgYDVR0gBIIBTTCCAUkwCAYGZ4EMAQIBMIIBOwYLKwYBBAGBtTcB
-AgMwggEqMC4GCCsGAQUFBwIBFiJodHRwOi8vd3d3LnN0YXJ0c3NsLmNvbS9wb2xp
-Y3kucGRmMIH3BggrBgEFBQcCAjCB6jAnFiBTdGFydENvbSBDZXJ0aWZpY2F0aW9u
-IEF1dGhvcml0eTADAgEBGoG+VGhpcyBjZXJ0aWZpY2F0ZSB3YXMgaXNzdWVkIGFj
-Y29yZGluZyB0byB0aGUgQ2xhc3MgMSBWYWxpZGF0aW9uIHJlcXVpcmVtZW50cyBv
-ZiB0aGUgU3RhcnRDb20gQ0EgcG9saWN5LCByZWxpYW5jZSBvbmx5IGZvciB0aGUg
-aW50ZW5kZWQgcHVycG9zZSBpbiBjb21wbGlhbmNlIG9mIHRoZSByZWx5aW5nIHBh
-cnR5IG9ibGlnYXRpb25zLjA1BgNVHR8ELjAsMCqgKKAmhiRodHRwOi8vY3JsLnN0
-YXJ0c3NsLmNvbS9jcnQxLWNybC5jcmwwgY4GCCsGAQUFBwEBBIGBMH8wOQYIKwYB
-BQUHMAGGLWh0dHA6Ly9vY3NwLnN0YXJ0c3NsLmNvbS9zdWIvY2xhc3MxL3NlcnZl
-ci9jYTBCBggrBgEFBQcwAoY2aHR0cDovL2FpYS5zdGFydHNzbC5jb20vY2VydHMv
-c3ViLmNsYXNzMS5zZXJ2ZXIuY2EuY3J0MCMGA1UdEgQcMBqGGGh0dHA6Ly93d3cu
-c3RhcnRzc2wuY29tLzANBgkqhkiG9w0BAQUFAAOCAQEAEXXajM3y024WuHBS9KX4
-D1mJgqJC3BN/0V6mCbrrtp7naDyg7mGdLEAkR403WwpR7cQlcopwCjzlVaaIM45d
-yiaMgJSxTcZHL5XD77nV7LjtgZDSDasmpIcvKezSwOqrdZgouukWUB4bcjpK8+JS
-vDhW4/nxjS85s0iQzM97y4AlunatpcVUkZmqOvpmoLtXofyRnP6fMXPkyGav1UUa
-rsIJlrC7xLyj8uLmF8SBQw5XqhJ3CieeYEWl9Oodqb9NPnW8+FJ/UPm2yjNbUo3q
-wnUR/FUAapCESXV1HZIoixTWrUlxCUVXJuMP58wjykYc/J6O5vV8I0HaAzQFG/lc
-2g==
-</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/wiki2.redclara.net.xml b/swamid-interfederations-2.0/wiki2.redclara.net.xml
deleted file mode 100644
index be3ccc86..00000000
--- a/swamid-interfederations-2.0/wiki2.redclara.net.xml
+++ /dev/null
@@ -1,145 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" 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=webmaster@redclara.net,CN=wiki2.redclara.net,C=CO,description=QfHSXQ3yP741Ruct</ds:X509SubjectName>
-          <ds:X509Certificate>MIIGXTCCBUWgAwIBAgIDEP1PMA0GCSqGSIb3DQEBBQUAMIGMMQswCQYDVQQGEwJJ
-TDEWMBQGA1UEChMNU3RhcnRDb20gTHRkLjErMCkGA1UECxMiU2VjdXJlIERpZ2l0
-YWwgQ2VydGlmaWNhdGUgU2lnbmluZzE4MDYGA1UEAxMvU3RhcnRDb20gQ2xhc3Mg
-MSBQcmltYXJ5IEludGVybWVkaWF0ZSBTZXJ2ZXIgQ0EwHhcNMTQwNjEwMTI1ODM0
-WhcNMTUwNjExMDI1MjI0WjBsMRkwFwYDVQQNExBRZkhTWFEzeVA3NDFSdWN0MQsw
-CQYDVQQGEwJDTzEbMBkGA1UEAxMSd2lraTIucmVkY2xhcmEubmV0MSUwIwYJKoZI
-hvcNAQkBFhZ3ZWJtYXN0ZXJAcmVkY2xhcmEubmV0MIIBIjANBgkqhkiG9w0BAQEF
-AAOCAQ8AMIIBCgKCAQEAvBhJOyV89jNU927Mxwn+DvisAsJZdwvYlV87LmOC970Y
-FACoyMNAW9HKUw14/eiGigtUSzIpc/sLqLWfdSOLvutMIS9l65iM5u6KVztBrqyA
-KHTQiYDgcSbBUe1oCvNfYfLVw0t14oIQwcw+JzjYK9QFsJ/v6ECvnUs0/IOXCfmD
-l4NHrNd3KJcvsHAkuRogEOXfAWSBc7xbT92ljjThTGrEwPJ8WJoXgRrEM5YUl1E4
-dEUgdoZ4ACKq8GxQR0et74+9ffamxRn+i5tIRcSeUJLo9DWCw14iTgnPpdJI6Tpb
-GcMmRh51rIodv1rmuRX/1UiJ+1+VmeJ0spWPma2lGwIDAQABo4IC5TCCAuEwCQYD
-VR0TBAIwADALBgNVHQ8EBAMCA6gwEwYDVR0lBAwwCgYIKwYBBQUHAwEwHQYDVR0O
-BBYEFKe6dZTQ54y1INi3qhIu62ZJdJ7DMB8GA1UdIwQYMBaAFOtCNNCYsKuf9Btr
-CPfMZC7vDixFMCsGA1UdEQQkMCKCEndpa2kyLnJlZGNsYXJhLm5ldIIMcmVkY2xh
-cmEubmV0MIIBVgYDVR0gBIIBTTCCAUkwCAYGZ4EMAQIBMIIBOwYLKwYBBAGBtTcB
-AgMwggEqMC4GCCsGAQUFBwIBFiJodHRwOi8vd3d3LnN0YXJ0c3NsLmNvbS9wb2xp
-Y3kucGRmMIH3BggrBgEFBQcCAjCB6jAnFiBTdGFydENvbSBDZXJ0aWZpY2F0aW9u
-IEF1dGhvcml0eTADAgEBGoG+VGhpcyBjZXJ0aWZpY2F0ZSB3YXMgaXNzdWVkIGFj
-Y29yZGluZyB0byB0aGUgQ2xhc3MgMSBWYWxpZGF0aW9uIHJlcXVpcmVtZW50cyBv
-ZiB0aGUgU3RhcnRDb20gQ0EgcG9saWN5LCByZWxpYW5jZSBvbmx5IGZvciB0aGUg
-aW50ZW5kZWQgcHVycG9zZSBpbiBjb21wbGlhbmNlIG9mIHRoZSByZWx5aW5nIHBh
-cnR5IG9ibGlnYXRpb25zLjA1BgNVHR8ELjAsMCqgKKAmhiRodHRwOi8vY3JsLnN0
-YXJ0c3NsLmNvbS9jcnQxLWNybC5jcmwwgY4GCCsGAQUFBwEBBIGBMH8wOQYIKwYB
-BQUHMAGGLWh0dHA6Ly9vY3NwLnN0YXJ0c3NsLmNvbS9zdWIvY2xhc3MxL3NlcnZl
-ci9jYTBCBggrBgEFBQcwAoY2aHR0cDovL2FpYS5zdGFydHNzbC5jb20vY2VydHMv
-c3ViLmNsYXNzMS5zZXJ2ZXIuY2EuY3J0MCMGA1UdEgQcMBqGGGh0dHA6Ly93d3cu
-c3RhcnRzc2wuY29tLzANBgkqhkiG9w0BAQUFAAOCAQEAEXXajM3y024WuHBS9KX4
-D1mJgqJC3BN/0V6mCbrrtp7naDyg7mGdLEAkR403WwpR7cQlcopwCjzlVaaIM45d
-yiaMgJSxTcZHL5XD77nV7LjtgZDSDasmpIcvKezSwOqrdZgouukWUB4bcjpK8+JS
-vDhW4/nxjS85s0iQzM97y4AlunatpcVUkZmqOvpmoLtXofyRnP6fMXPkyGav1UUa
-rsIJlrC7xLyj8uLmF8SBQw5XqhJ3CieeYEWl9Oodqb9NPnW8+FJ/UPm2yjNbUo3q
-wnUR/FUAapCESXV1HZIoixTWrUlxCUVXJuMP58wjykYc/J6O5vV8I0HaAzQFG/lc
-2g==
-</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=webmaster@redclara.net,CN=wiki2.redclara.net,C=CO,description=QfHSXQ3yP741Ruct</ds:X509SubjectName>
-          <ds:X509Certificate>MIIGXTCCBUWgAwIBAgIDEP1PMA0GCSqGSIb3DQEBBQUAMIGMMQswCQYDVQQGEwJJ
-TDEWMBQGA1UEChMNU3RhcnRDb20gTHRkLjErMCkGA1UECxMiU2VjdXJlIERpZ2l0
-YWwgQ2VydGlmaWNhdGUgU2lnbmluZzE4MDYGA1UEAxMvU3RhcnRDb20gQ2xhc3Mg
-MSBQcmltYXJ5IEludGVybWVkaWF0ZSBTZXJ2ZXIgQ0EwHhcNMTQwNjEwMTI1ODM0
-WhcNMTUwNjExMDI1MjI0WjBsMRkwFwYDVQQNExBRZkhTWFEzeVA3NDFSdWN0MQsw
-CQYDVQQGEwJDTzEbMBkGA1UEAxMSd2lraTIucmVkY2xhcmEubmV0MSUwIwYJKoZI
-hvcNAQkBFhZ3ZWJtYXN0ZXJAcmVkY2xhcmEubmV0MIIBIjANBgkqhkiG9w0BAQEF
-AAOCAQ8AMIIBCgKCAQEAvBhJOyV89jNU927Mxwn+DvisAsJZdwvYlV87LmOC970Y
-FACoyMNAW9HKUw14/eiGigtUSzIpc/sLqLWfdSOLvutMIS9l65iM5u6KVztBrqyA
-KHTQiYDgcSbBUe1oCvNfYfLVw0t14oIQwcw+JzjYK9QFsJ/v6ECvnUs0/IOXCfmD
-l4NHrNd3KJcvsHAkuRogEOXfAWSBc7xbT92ljjThTGrEwPJ8WJoXgRrEM5YUl1E4
-dEUgdoZ4ACKq8GxQR0et74+9ffamxRn+i5tIRcSeUJLo9DWCw14iTgnPpdJI6Tpb
-GcMmRh51rIodv1rmuRX/1UiJ+1+VmeJ0spWPma2lGwIDAQABo4IC5TCCAuEwCQYD
-VR0TBAIwADALBgNVHQ8EBAMCA6gwEwYDVR0lBAwwCgYIKwYBBQUHAwEwHQYDVR0O
-BBYEFKe6dZTQ54y1INi3qhIu62ZJdJ7DMB8GA1UdIwQYMBaAFOtCNNCYsKuf9Btr
-CPfMZC7vDixFMCsGA1UdEQQkMCKCEndpa2kyLnJlZGNsYXJhLm5ldIIMcmVkY2xh
-cmEubmV0MIIBVgYDVR0gBIIBTTCCAUkwCAYGZ4EMAQIBMIIBOwYLKwYBBAGBtTcB
-AgMwggEqMC4GCCsGAQUFBwIBFiJodHRwOi8vd3d3LnN0YXJ0c3NsLmNvbS9wb2xp
-Y3kucGRmMIH3BggrBgEFBQcCAjCB6jAnFiBTdGFydENvbSBDZXJ0aWZpY2F0aW9u
-IEF1dGhvcml0eTADAgEBGoG+VGhpcyBjZXJ0aWZpY2F0ZSB3YXMgaXNzdWVkIGFj
-Y29yZGluZyB0byB0aGUgQ2xhc3MgMSBWYWxpZGF0aW9uIHJlcXVpcmVtZW50cyBv
-ZiB0aGUgU3RhcnRDb20gQ0EgcG9saWN5LCByZWxpYW5jZSBvbmx5IGZvciB0aGUg
-aW50ZW5kZWQgcHVycG9zZSBpbiBjb21wbGlhbmNlIG9mIHRoZSByZWx5aW5nIHBh
-cnR5IG9ibGlnYXRpb25zLjA1BgNVHR8ELjAsMCqgKKAmhiRodHRwOi8vY3JsLnN0
-YXJ0c3NsLmNvbS9jcnQxLWNybC5jcmwwgY4GCCsGAQUFBwEBBIGBMH8wOQYIKwYB
-BQUHMAGGLWh0dHA6Ly9vY3NwLnN0YXJ0c3NsLmNvbS9zdWIvY2xhc3MxL3NlcnZl
-ci9jYTBCBggrBgEFBQcwAoY2aHR0cDovL2FpYS5zdGFydHNzbC5jb20vY2VydHMv
-c3ViLmNsYXNzMS5zZXJ2ZXIuY2EuY3J0MCMGA1UdEgQcMBqGGGh0dHA6Ly93d3cu
-c3RhcnRzc2wuY29tLzANBgkqhkiG9w0BAQUFAAOCAQEAEXXajM3y024WuHBS9KX4
-D1mJgqJC3BN/0V6mCbrrtp7naDyg7mGdLEAkR403WwpR7cQlcopwCjzlVaaIM45d
-yiaMgJSxTcZHL5XD77nV7LjtgZDSDasmpIcvKezSwOqrdZgouukWUB4bcjpK8+JS
-vDhW4/nxjS85s0iQzM97y4AlunatpcVUkZmqOvpmoLtXofyRnP6fMXPkyGav1UUa
-rsIJlrC7xLyj8uLmF8SBQw5XqhJ3CieeYEWl9Oodqb9NPnW8+FJ/UPm2yjNbUo3q
-wnUR/FUAapCESXV1HZIoixTWrUlxCUVXJuMP58wjykYc/J6O5vV8I0HaAzQFG/lc
-2g==
-</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/www.ebi.ac.uk-ega-.xml b/swamid-interfederations-2.0/www.ebi.ac.uk-ega-.xml
deleted file mode 100644
index 7f0a5924..00000000
--- a/swamid-interfederations-2.0/www.ebi.ac.uk-ega-.xml
+++ /dev/null
@@ -1,76 +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#" entityID="https://www.ebi.ac.uk/ega/">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.csc.fi/haka">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://www.csc.fi/english/institutions/haka/instructions/join/eduGAINRegistrationStatement/</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </Extensions>
-  <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://www.ebi.ac.uk/ega/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">The European Genome-phenome Archive</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="fi">European Genome-phenome Archive</mdui:DisplayName>
-        <mdui:Description xml:lang="en">The European Genome-phenome Archive is a service from the EMBL-EBI to archive and disseminate data from biomedical research projects.</mdui:Description>
-        <mdui:Description xml:lang="fi">European Genome-phenome Archive on EMBL-EBI:n ylläpitämä datan arkistointi- ja jakopalvelu  biolääketieteen tutkimusprojekteille.</mdui:Description>
-        <mdui:Logo height="62" width="180">https://www.ebi.ac.uk/ega/sites/ebi.ac.uk.ega/files/documents/images/EMBL_EBI_RGB_petrol_lo-res.jpg</mdui:Logo>
-        <mdui:Keywords xml:lang="en">NGS genotype variation cancer diabetes disease</mdui:Keywords>
-        <mdui:InformationURL xml:lang="en">https://www.ebi.ac.uk/ega/</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">http://www.ebi.ac.uk/about/cookies</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDAzCCAeugAwIBAgIJAMOTGo+6cOgBMA0GCSqGSIb3DQEBBQUAMB8xHTAbBgNV
-BAMTFHZlcy1lYmktMTAuZWJpLmFjLnVrMB4XDTEyMTEyMjA5MTc1MloXDTIyMTEy
-MDA5MTc1MlowHzEdMBsGA1UEAxMUdmVzLWViaS0xMC5lYmkuYWMudWswggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDjS5ePByst+LtG8/i7+C7nl/qWQLsF
-mgFWJIafuoUSc/Iy85sQCJYUSpwMvaV+XqxjMjQj79z0aOkA0wyw+MnRnAQnr9jJ
-adbVNMwZOlqPPXAXfZmwW1DkM2fdz8COipBfW9b5lvNu1hZ8Rm0nd1biSxp1+AhL
-4p6FXqM0pjXMO4mZnesmPkoC9IK5TcpVpOE3WWazsLCTlSmE7+iDLO6dwkEE4IYV
-/zRkrQ56hBIxCVui/hrXatbcJy8dPn6JREsnYhZCTJclb+liqxcv9c266aUx5hTf
-WItvFQNkpPp7FsJhzEZOMcUkGebWLr/n5Dw6ERR+/ZM1n/1rhdzfD9hdAgMBAAGj
-QjBAMB8GA1UdEQQYMBaCFHZlcy1lYmktMTAuZWJpLmFjLnVrMB0GA1UdDgQWBBTg
-/BOPCQZP1Tpzz3MVM/ijVkrHVjANBgkqhkiG9w0BAQUFAAOCAQEAZQf3HB46uhJ+
-vw+3ir6C5r9+6H3B4wVFVgXm9XIZB2orryui4Pub/jfoSoxUFkM65G0lnTqtZ66z
-rOTPJz202ya77jRn2uTXmy2YLLPO5aWPqlgGwrCche1RoFoCUEi9vMACp0XDosEO
-sfLW43EnSzV7e0PSQWCpyd4zM9o5AXFN8W5DxT3xxDgSLKVLfcPhhmWZY0j0Smif
-0OgHpkYrmnMoXOPgcKOQORrB7QD1ULnn3eYFaGxbi7J5/tkB8eFPphWtBI7p5YzZ
-5NBxB7QhViLbVlolHx/UoJnmcnFcHXtdEcgvmCcxqlFSE17911r3zKWdRIXiNoot
-u7YBIOFkbw==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <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.ebi.ac.uk/ega/Shibboleth.sso/SAML2/POST" index="1" isDefault="true"/>
-    <AttributeConsumingService index="1" isDefault="true">
-      <ServiceName xml:lang="fi">European Genome-phenome Archive</ServiceName>
-      <ServiceName xml:lang="en">The European Genome-phenome Archive</ServiceName>
-      <ServiceDescription xml:lang="fi">European Genome-phenome Archive on EMBL-EBI:n yllapitama datan arkistointi- ja jakopalvelu  biolaaketieteen tutkimusprojekteille.</ServiceDescription>
-      <ServiceDescription xml:lang="en">The European Genome-phenome Archive is a service from the EMBL-EBI to archive and disseminate data from biomedical research projects.</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"/>
-    </AttributeConsumingService>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="fi">EMBL-EBI    European Bioinformatics Institute</OrganizationName>
-    <OrganizationName xml:lang="en">EMBL-EBI    European Bioinformatics Institute</OrganizationName>
-    <OrganizationName xml:lang="sv">EMBL-EBI    European Bioinformatics Institute</OrganizationName>
-    <OrganizationDisplayName xml:lang="fi">EMBL-EBI    European Bioinformatics Institute</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">EMBL-EBI    European Bioinformatics Institute</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="sv">EMBL-EBI    European Bioinformatics Institute</OrganizationDisplayName>
-    <OrganizationURL xml:lang="fi">http://www.ebi.ac.uk/</OrganizationURL>
-    <OrganizationURL xml:lang="en">http://www.ebi.ac.uk/</OrganizationURL>
-    <OrganizationURL xml:lang="sv">http://www.ebi.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Jag</GivenName>
-    <SurName>Kandasamy</SurName>
-    <EmailAddress>mailto:kandaj@ebi.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="support">
-    <GivenName>Jag</GivenName>
-    <SurName>Kandasamy</SurName>
-    <EmailAddress>mailto:kandaj@ebi.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.ebi.ac.uk.xml b/swamid-interfederations-2.0/www.ebi.ac.uk.xml
deleted file mode 100644
index 7f0a5924..00000000
--- a/swamid-interfederations-2.0/www.ebi.ac.uk.xml
+++ /dev/null
@@ -1,76 +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#" entityID="https://www.ebi.ac.uk/ega/">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.csc.fi/haka">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://www.csc.fi/english/institutions/haka/instructions/join/eduGAINRegistrationStatement/</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </Extensions>
-  <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://www.ebi.ac.uk/ega/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">The European Genome-phenome Archive</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="fi">European Genome-phenome Archive</mdui:DisplayName>
-        <mdui:Description xml:lang="en">The European Genome-phenome Archive is a service from the EMBL-EBI to archive and disseminate data from biomedical research projects.</mdui:Description>
-        <mdui:Description xml:lang="fi">European Genome-phenome Archive on EMBL-EBI:n ylläpitämä datan arkistointi- ja jakopalvelu  biolääketieteen tutkimusprojekteille.</mdui:Description>
-        <mdui:Logo height="62" width="180">https://www.ebi.ac.uk/ega/sites/ebi.ac.uk.ega/files/documents/images/EMBL_EBI_RGB_petrol_lo-res.jpg</mdui:Logo>
-        <mdui:Keywords xml:lang="en">NGS genotype variation cancer diabetes disease</mdui:Keywords>
-        <mdui:InformationURL xml:lang="en">https://www.ebi.ac.uk/ega/</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">http://www.ebi.ac.uk/about/cookies</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDAzCCAeugAwIBAgIJAMOTGo+6cOgBMA0GCSqGSIb3DQEBBQUAMB8xHTAbBgNV
-BAMTFHZlcy1lYmktMTAuZWJpLmFjLnVrMB4XDTEyMTEyMjA5MTc1MloXDTIyMTEy
-MDA5MTc1MlowHzEdMBsGA1UEAxMUdmVzLWViaS0xMC5lYmkuYWMudWswggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDjS5ePByst+LtG8/i7+C7nl/qWQLsF
-mgFWJIafuoUSc/Iy85sQCJYUSpwMvaV+XqxjMjQj79z0aOkA0wyw+MnRnAQnr9jJ
-adbVNMwZOlqPPXAXfZmwW1DkM2fdz8COipBfW9b5lvNu1hZ8Rm0nd1biSxp1+AhL
-4p6FXqM0pjXMO4mZnesmPkoC9IK5TcpVpOE3WWazsLCTlSmE7+iDLO6dwkEE4IYV
-/zRkrQ56hBIxCVui/hrXatbcJy8dPn6JREsnYhZCTJclb+liqxcv9c266aUx5hTf
-WItvFQNkpPp7FsJhzEZOMcUkGebWLr/n5Dw6ERR+/ZM1n/1rhdzfD9hdAgMBAAGj
-QjBAMB8GA1UdEQQYMBaCFHZlcy1lYmktMTAuZWJpLmFjLnVrMB0GA1UdDgQWBBTg
-/BOPCQZP1Tpzz3MVM/ijVkrHVjANBgkqhkiG9w0BAQUFAAOCAQEAZQf3HB46uhJ+
-vw+3ir6C5r9+6H3B4wVFVgXm9XIZB2orryui4Pub/jfoSoxUFkM65G0lnTqtZ66z
-rOTPJz202ya77jRn2uTXmy2YLLPO5aWPqlgGwrCche1RoFoCUEi9vMACp0XDosEO
-sfLW43EnSzV7e0PSQWCpyd4zM9o5AXFN8W5DxT3xxDgSLKVLfcPhhmWZY0j0Smif
-0OgHpkYrmnMoXOPgcKOQORrB7QD1ULnn3eYFaGxbi7J5/tkB8eFPphWtBI7p5YzZ
-5NBxB7QhViLbVlolHx/UoJnmcnFcHXtdEcgvmCcxqlFSE17911r3zKWdRIXiNoot
-u7YBIOFkbw==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <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.ebi.ac.uk/ega/Shibboleth.sso/SAML2/POST" index="1" isDefault="true"/>
-    <AttributeConsumingService index="1" isDefault="true">
-      <ServiceName xml:lang="fi">European Genome-phenome Archive</ServiceName>
-      <ServiceName xml:lang="en">The European Genome-phenome Archive</ServiceName>
-      <ServiceDescription xml:lang="fi">European Genome-phenome Archive on EMBL-EBI:n yllapitama datan arkistointi- ja jakopalvelu  biolaaketieteen tutkimusprojekteille.</ServiceDescription>
-      <ServiceDescription xml:lang="en">The European Genome-phenome Archive is a service from the EMBL-EBI to archive and disseminate data from biomedical research projects.</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"/>
-    </AttributeConsumingService>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="fi">EMBL-EBI    European Bioinformatics Institute</OrganizationName>
-    <OrganizationName xml:lang="en">EMBL-EBI    European Bioinformatics Institute</OrganizationName>
-    <OrganizationName xml:lang="sv">EMBL-EBI    European Bioinformatics Institute</OrganizationName>
-    <OrganizationDisplayName xml:lang="fi">EMBL-EBI    European Bioinformatics Institute</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">EMBL-EBI    European Bioinformatics Institute</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="sv">EMBL-EBI    European Bioinformatics Institute</OrganizationDisplayName>
-    <OrganizationURL xml:lang="fi">http://www.ebi.ac.uk/</OrganizationURL>
-    <OrganizationURL xml:lang="en">http://www.ebi.ac.uk/</OrganizationURL>
-    <OrganizationURL xml:lang="sv">http://www.ebi.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Jag</GivenName>
-    <SurName>Kandasamy</SurName>
-    <EmailAddress>mailto:kandaj@ebi.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="support">
-    <GivenName>Jag</GivenName>
-    <SurName>Kandasamy</SurName>
-    <EmailAddress>mailto:kandaj@ebi.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.emeraldinsight.com-entity.xml b/swamid-interfederations-2.0/www.emeraldinsight.com-entity.xml
deleted file mode 100644
index b054384f..00000000
--- a/swamid-interfederations-2.0/www.emeraldinsight.com-entity.xml
+++ /dev/null
@@ -1,155 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.emeraldinsight.com/entity">
-  <!--
-		This is an 'Emerald Live Site' Shibboleth SP for Emerald Group Publishing Ltd.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2009-05-28T12:31:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </Extensions>
-  <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">
-    <Extensions>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.emeraldinsight.com/Shibboleth.sso/auth/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.emeraldinsight.com/Shibboleth.sso/auth/DS/UKFederation" 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://www.emeraldinsight.com/Shibboleth.sso/auth/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://www.emeraldinsight.com/Shibboleth.sso/auth/DS/Kalmar2" 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://www.emeraldinsight.com/Shibboleth.sso/auth/DS/Wayf"/>
-      <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.emeraldinsight.com/Shibboleth.sso/auth/DS/Wayf" 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://www.emeraldinsight.com/Shibboleth.sso/auth/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.emeraldinsight.com/Shibboleth.sso/auth/WAYF/dfn"/>
-      <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.emeraldinsight.com/Shibboleth.sso/auth/WAYF/dfn" 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://www.emeraldinsight.com/Shibboleth.sso/auth/TestShib"/>
-      <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.emeraldinsight.com/Shibboleth.sso/auth/wayf-test"/>
-      <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.emeraldinsight.com/Shibboleth.sso/auth/dfn-test"/>
-      <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.emeraldinsight.com/Shibboleth.sso/auth/dfn-test2"/>
-      <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.emeraldinsight.com/Shibboleth.sso/auth/WAYF/dfn-test"/>
-      <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.emeraldinsight.com/Shibboleth.sso/auth/WAYF/dfn-test" 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://www.emeraldinsight.com/Shibboleth.sso/auth/abu"/>
-      <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.emeraldinsight.com/Shibboleth.sso/auth/asc"/>
-      <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.emeraldinsight.com/Shibboleth.sso/auth/aru"/>
-      <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.emeraldinsight.com/Shibboleth.sso/auth/asu"/>
-      <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.emeraldinsight.com/Shibboleth.sso/auth/bsu"/>
-      <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.emeraldinsight.com/Shibboleth.sso/auth/bmu"/>
-      <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.emeraldinsight.com/Shibboleth.sso/auth/blc"/>
-      <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.emeraldinsight.com/Shibboleth.sso/auth/bfc"/>
-      <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.emeraldinsight.com/Shibboleth.sso/auth/brc"/>
-      <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.emeraldinsight.com/Shibboleth.sso/auth/bru"/>
-      <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.emeraldinsight.com/Shibboleth.sso/auth/bnu"/>
-      <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.emeraldinsight.com/Shibboleth.sso/auth/cac"/>
-      <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.emeraldinsight.com/Shibboleth.sso/auth/chc"/>
-      <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.emeraldinsight.com/Shibboleth.sso/auth/cmj"/>
-      <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.emeraldinsight.com/Shibboleth.sso/auth/cru"/>
-      <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.emeraldinsight.com/Shibboleth.sso/auth/dmu"/>
-      <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.emeraldinsight.com/Shibboleth.sso/auth/doc"/>
-      <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.emeraldinsight.com/Shibboleth.sso/auth/enu"/>
-      <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.emeraldinsight.com/Shibboleth.sso/auth/icl"/>
-      <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.emeraldinsight.com/Shibboleth.sso/auth/kiu"/>
-      <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.emeraldinsight.com/Shibboleth.sso/auth/lsbu"/>
-      <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.emeraldinsight.com/Shibboleth.sso/auth/mmu"/>
-      <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.emeraldinsight.com/Shibboleth.sso/auth/nec"/>
-      <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.emeraldinsight.com/Shibboleth.sso/auth/ncn"/>
-      <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.emeraldinsight.com/Shibboleth.sso/auth/nrc"/>
-      <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.emeraldinsight.com/Shibboleth.sso/auth/nou"/>
-      <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.emeraldinsight.com/Shibboleth.sso/auth/ntu"/>
-      <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.emeraldinsight.com/Shibboleth.sso/auth/qmu"/>
-      <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.emeraldinsight.com/Shibboleth.sso/auth/qmul"/>
-      <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.emeraldinsight.com/Shibboleth.sso/auth/rgu"/>
-      <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.emeraldinsight.com/Shibboleth.sso/auth/rou"/>
-      <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.emeraldinsight.com/Shibboleth.sso/auth/shu"/>
-      <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.emeraldinsight.com/Shibboleth.sso/auth/ssu"/>
-      <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.emeraldinsight.com/Shibboleth.sso/auth/shu"/>
-      <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.emeraldinsight.com/Shibboleth.sso/auth/tvu"/>
-      <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.emeraldinsight.com/Shibboleth.sso/auth/uls"/>
-      <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.emeraldinsight.com/Shibboleth.sso/auth/umi"/>
-      <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.emeraldinsight.com/Shibboleth.sso/auth/urhb"/>
-      <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.emeraldinsight.com/Shibboleth.sso/auth/uab"/>
-      <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.emeraldinsight.com/Shibboleth.sso/auth/uad"/>
-      <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.emeraldinsight.com/Shibboleth.sso/auth/ube"/>
-      <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.emeraldinsight.com/Shibboleth.sso/auth/ubi"/>
-      <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.emeraldinsight.com/Shibboleth.sso/auth/ubr"/>
-      <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.emeraldinsight.com/Shibboleth.sso/auth/ubri"/>
-      <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.emeraldinsight.com/Shibboleth.sso/auth/uco"/>
-      <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.emeraldinsight.com/Shibboleth.sso/auth/ucu"/>
-      <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.emeraldinsight.com/Shibboleth.sso/auth/ugl"/>
-      <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.emeraldinsight.com/Shibboleth.sso/auth/uglo"/>
-      <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.emeraldinsight.com/Shibboleth.sso/auth/ulo"/>
-      <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.emeraldinsight.com/Shibboleth.sso/auth/uma"/>
-      <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.emeraldinsight.com/Shibboleth.sso/auth/unut"/>
-      <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.emeraldinsight.com/Shibboleth.sso/auth/uno"/>
-      <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.emeraldinsight.com/Shibboleth.sso/auth/upo"/>
-      <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.emeraldinsight.com/Shibboleth.sso/auth/ure"/>
-      <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.emeraldinsight.com/Shibboleth.sso/auth/uso"/>
-      <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.emeraldinsight.com/Shibboleth.sso/auth/usa"/>
-      <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.emeraldinsight.com/Shibboleth.sso/auth/ust"/>
-      <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.emeraldinsight.com/Shibboleth.sso/auth/ustr"/>
-      <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.emeraldinsight.com/Shibboleth.sso/auth/ute"/>
-      <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.emeraldinsight.com/Shibboleth.sso/auth/ual"/>
-      <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.emeraldinsight.com/Shibboleth.sso/auth/uwi"/>
-      <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.emeraldinsight.com/Shibboleth.sso/auth/uwne"/>
-      <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.emeraldinsight.com/Shibboleth.sso/auth/uwtsd"/>
-      <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.emeraldinsight.com/Shibboleth.sso/auth/uwa"/>
-      <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.emeraldinsight.com/Shibboleth.sso/auth/uwe"/>
-      <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.emeraldinsight.com/Shibboleth.sso/auth/uyo"/>
-      <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.emeraldinsight.com/Shibboleth.sso/auth/wac"/>
-      <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.emeraldinsight.com/Shibboleth.sso/auth/wel"/>
-      <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.emeraldinsight.com/Shibboleth.sso/auth/wcc"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDUTCCAjmgAwIBAgIJANuHp/m5TCXsMA0GCSqGSIb3DQEBBQUAMCwxKjAoBgNV
-						BAMTIWVtLWwxLXJoLXN2cjAxLmVtZXJhbGRpbnNpZ2h0LmNvbTAeFw0xMTA4MTEw
-						ODM1MTJaFw0yMTA4MDgwODM1MTJaMCwxKjAoBgNVBAMTIWVtLWwxLXJoLXN2cjAx
-						LmVtZXJhbGRpbnNpZ2h0LmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
-						ggEBAL7nJHjWMmZxHtjdwAYdXKCZwObQn8nDKWS71kULyYRgcxkVxULE+Q8sazuA
-						0bsX3Q4PQUeP6C+xuyBXzHi9XZy6Ef4hoIHo6p9qI7EboB7Qu1MebGROWca0Dtd9
-						zyadDe4y61J8BlE5euVCvbpGkHSSuFVvz0ThhTdC61vAPzvl71R5sqWxUm8xIPDT
-						0TryzRgOA0LsOH3tXsaxQ5Jb5d6G+X6+6K2flFCY8QKbrnxcMKXvTbPpMprTIa1N
-						bUT+XFONWmplOvyjHQH1GdIDQCPKc4aT3WyIA3MxnWfzpPsP8Sdi7Z+QyhXGEgOP
-						obM+cagbqe/E/Om1gUgI3a6F/z0CAwEAAaN2MHQwUwYDVR0RBEwwSoIhZW0tbDEt
-						cmgtc3ZyMDEuZW1lcmFsZGluc2lnaHQuY29thiVodHRwczovL3d3dy5lbWVyYWxk
-						aW5zaWdodC5jb20vZW50aXR5MB0GA1UdDgQWBBT8iPZbLVpj12PDMabI7c5IEAQ0
-						+zANBgkqhkiG9w0BAQUFAAOCAQEAVMg4wyJ1FHeFYIuJ/zBzqPgZRD/dRQ/P64Bg
-						lkM/XKtTEkDL5nizTdMcm5qUB8sSLUpZIyuPUSy8AmYZ+FgvU6SqjW1WIhRzlnYG
-						yl3bKyl0Ji8r7We5lAhLgLnr1FTo3r9ROVd+S/BC3J7CZVE8Jcqo6AS66gTtGBja
-						xwoQYnowMJKcoCFqPkRlPL25ystxifcSpgaaRnVJMik/JHO2IwLLti+WAUj6kwCM
-						uCbrLPgzpR6W8YOkDzUH3rvANVZ5GKgqWNA/u8NfC6WRcA1Sktx2nLnK8Mw3d14g
-						MvgwMr/rwl/SPLLZ0KDGqJ8iSYjIZQKsJ/JXP9xmaeEQW6v35w==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.emeraldinsight.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.emeraldinsight.com/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.emeraldinsight.com/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.emeraldinsight.com/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.emeraldinsight.com/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.emeraldinsight.com/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.emeraldinsight.com/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.emeraldinsight.com/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.emeraldinsight.com/Shibboleth.sso/NIM/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.emeraldinsight.com/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.emeraldinsight.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.emeraldinsight.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.emeraldinsight.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.emeraldinsight.com/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.emeraldinsight.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Emerald Group Publishing Ltd</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Emerald Live Site</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.emeraldinsight.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Rob</GivenName>
-    <SurName>Wood</SurName>
-    <EmailAddress>mailto:rwood@emeraldinsight.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Laurence</GivenName>
-    <SurName>Parkin</SurName>
-    <EmailAddress>mailto:lparkin@emeraldinsight.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.emeraldinsight.com-shibboleth.xml b/swamid-interfederations-2.0/www.emeraldinsight.com-shibboleth.xml
index 2e117403..07391e53 100644
--- a/swamid-interfederations-2.0/www.emeraldinsight.com-shibboleth.xml
+++ b/swamid-interfederations-2.0/www.emeraldinsight.com-shibboleth.xml
@@ -1,62 +1,50 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.emeraldinsight.com/shibboleth">
-  <!--
-		This is an "Emerald Insight" OpenSAML SP for Atypon Systems, Inc.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-07-14T14:43:12Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</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="en">Emerald Insight</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Emerald is a global publisher linking research and practice to the benefit of society.</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.emeraldinsight.com</mdui:InformationURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://www.emeraldinsight.com/shibboleth">
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo>
         <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDNDCCAhygAwIBAgIJAOZnCXnWu9vRMA0GCSqGSIb3DQEBBQUAMCExHzAdBgNV
-						BAMTFnd3dy5lbWVyYWxkaW5zaWdodC5jb20wHhcNMTMwNjI3MjEyNjI2WhcNMTYw
-						NjI2MjEyNjI2WjAhMR8wHQYDVQQDExZ3d3cuZW1lcmFsZGluc2lnaHQuY29tMIIB
-						IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAq4IsI4kV+i/3gsIg9iZa+8DZ
-						NgVbnzpIeD+QnzXt4HeUb/3ga4kn6Vc6WwnMFkFlvpoVucD7nkENzvjc5LpVsuJ7
-						LKCyCUJspB9BQRX0N23tV0nzT/w35p1VbgFRXB2o4teW3ymXzTLYmKfiMy0dYO5Y
-						KFFudXk2vdqHLrspDvbPLpuGhkLwstmaHhIbMmFe5jQuXyNaPl7iGBE8KXKqFtZ4
-						acINV0R7xnQBMvshileah1UznEmd7JEGdNDMFf1o2fAvGa9xcfwD5yXTEzaT178K
-						fsGGhpEO0aW/cFvFupOXDJJTB6aeeS43qeFsKJkJXPWkUr8TFKsQs06NTksAUQID
-						AQABo28wbTBMBgNVHREERTBDghZ3d3cuZW1lcmFsZGluc2lnaHQuY29thilodHRw
-						czovL3d3dy5lbWVyYWxkaW5zaWdodC5jb20vc2hpYmJvbGV0aDAdBgNVHQ4EFgQU
-						j3L5syzTbNpvdAwMEX/ALDDmM6IwDQYJKoZIhvcNAQEFBQADggEBAGkoaPoDQeZ+
-						F7B81Bvt2pjRjtDhWqUeQRy1YphyVXiNRM+/1RAKPq+Ltr5Cpt/ytP06uPZ2YM9B
-						0LMo/iAqrgP7LsCo2wxQojOhUhCfzX4ICjZB1WRhTt4qjOFuQM6lYka9JxgZUDxu
-						01V8YRawDs9iFJuslzYrnRGMI9lJLgwUlBLKMQ3pM1TzwY0bTDvun4HofPID193f
-						f50smOG9qh99rReZ9tTM9odW942gZijzbxJBqKuSU10r556kff6RrjVmTjTAEhGY
-						Maa83O3lH1JgvsqB77ONG7svDudp1Zfc5GEJV5F2rwfGSUoIURH3z69Ewdd1lo3d
-						Bt7qcpd9uOc=
-					</ds:X509Certificate>
+          <ds:X509Certificate>MIIDNDCCAhygAwIBAgIJAOZnCXnWu9vRMA0GCSqGSIb3DQEBBQUAMCExHzAdBgNVBAMTFnd3dy5lbWVyYWxkaW5zaWdodC5jb20wHhcNMTMwNjI3MjEyNjI2WhcNMTYwNjI2MjEyNjI2WjAhMR8wHQYDVQQDExZ3d3cuZW1lcmFsZGluc2lnaHQuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAq4IsI4kV+i/3gsIg9iZa+8DZNgVbnzpIeD+QnzXt4HeUb/3ga4kn6Vc6WwnMFkFlvpoVucD7nkENzvjc5LpVsuJ7LKCyCUJspB9BQRX0N23tV0nzT/w35p1VbgFRXB2o4teW3ymXzTLYmKfiMy0dYO5YKFFudXk2vdqHLrspDvbPLpuGhkLwstmaHhIbMmFe5jQuXyNaPl7iGBE8KXKqFtZ4acINV0R7xnQBMvshileah1UznEmd7JEGdNDMFf1o2fAvGa9xcfwD5yXTEzaT178KfsGGhpEO0aW/cFvFupOXDJJTB6aeeS43qeFsKJkJXPWkUr8TFKsQs06NTksAUQIDAQABo28wbTBMBgNVHREERTBDghZ3d3cuZW1lcmFsZGluc2lnaHQuY29thilodHRwczovL3d3dy5lbWVyYWxkaW5zaWdodC5jb20vc2hpYmJvbGV0aDAdBgNVHQ4EFgQUj3L5syzTbNpvdAwMEX/ALDDmM6IwDQYJKoZIhvcNAQEFBQADggEBAGkoaPoDQeZ+F7B81Bvt2pjRjtDhWqUeQRy1YphyVXiNRM+/1RAKPq+Ltr5Cpt/ytP06uPZ2YM9B0LMo/iAqrgP7LsCo2wxQojOhUhCfzX4ICjZB1WRhTt4qjOFuQM6lYka9JxgZUDxu01V8YRawDs9iFJuslzYrnRGMI9lJLgwUlBLKMQ3pM1TzwY0bTDvun4HofPID193ff50smOG9qh99rReZ9tTM9odW942gZijzbxJBqKuSU10r556kff6RrjVmTjTAEhGYMaa83O3lH1JgvsqB77ONG7svDudp1Zfc5GEJV5F2rwfGSUoIURH3z69Ewdd1lo3dBt7qcpd9uOc=</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.emeraldinsight.com/action/samlACS" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.emeraldinsight.com/action/saml2post" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.emeraldinsight.com/action/saml2artifact" index="3"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Atypon Systems, Inc</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Emerald Insight</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.emeraldgrouppublishing.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>SSO-Support</GivenName>
-    <EmailAddress>mailto:SSO-Support@atypon.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>SSO-Tech</GivenName>
-    <EmailAddress>mailto:SSO-Tech@atypon.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDNDCCAhygAwIBAgIJAOZnCXnWu9vRMA0GCSqGSIb3DQEBBQUAMCExHzAdBgNVBAMTFnd3dy5lbWVyYWxkaW5zaWdodC5jb20wHhcNMTMwNjI3MjEyNjI2WhcNMTYwNjI2MjEyNjI2WjAhMR8wHQYDVQQDExZ3d3cuZW1lcmFsZGluc2lnaHQuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAq4IsI4kV+i/3gsIg9iZa+8DZNgVbnzpIeD+QnzXt4HeUb/3ga4kn6Vc6WwnMFkFlvpoVucD7nkENzvjc5LpVsuJ7LKCyCUJspB9BQRX0N23tV0nzT/w35p1VbgFRXB2o4teW3ymXzTLYmKfiMy0dYO5YKFFudXk2vdqHLrspDvbPLpuGhkLwstmaHhIbMmFe5jQuXyNaPl7iGBE8KXKqFtZ4acINV0R7xnQBMvshileah1UznEmd7JEGdNDMFf1o2fAvGa9xcfwD5yXTEzaT178KfsGGhpEO0aW/cFvFupOXDJJTB6aeeS43qeFsKJkJXPWkUr8TFKsQs06NTksAUQIDAQABo28wbTBMBgNVHREERTBDghZ3d3cuZW1lcmFsZGluc2lnaHQuY29thilodHRwczovL3d3dy5lbWVyYWxkaW5zaWdodC5jb20vc2hpYmJvbGV0aDAdBgNVHQ4EFgQUj3L5syzTbNpvdAwMEX/ALDDmM6IwDQYJKoZIhvcNAQEFBQADggEBAGkoaPoDQeZ+F7B81Bvt2pjRjtDhWqUeQRy1YphyVXiNRM+/1RAKPq+Ltr5Cpt/ytP06uPZ2YM9B0LMo/iAqrgP7LsCo2wxQojOhUhCfzX4ICjZB1WRhTt4qjOFuQM6lYka9JxgZUDxu01V8YRawDs9iFJuslzYrnRGMI9lJLgwUlBLKMQ3pM1TzwY0bTDvun4HofPID193ff50smOG9qh99rReZ9tTM9odW942gZijzbxJBqKuSU10r556kff6RrjVmTjTAEhGYMaa83O3lH1JgvsqB77ONG7svDudp1Zfc5GEJV5F2rwfGSUoIURH3z69Ewdd1lo3dBt7qcpd9uOc=</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-Artifact" Location="https://www.emeraldinsight.com/action/saml2artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.emeraldinsight.com/action/saml2post" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.emeraldinsight.com/action/samlACS" index="1"/>
+    <md:AttributeConsumingService index="0">
+      <md:ServiceName xml:lang="en">Emerald Insight</md:ServiceName>
+      <md:ServiceName xml:lang="da">Emerald Insight</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">to provide personalized access to journals and papers on social sciences</md:ServiceDescription>
+      <md:ServiceDescription xml:lang="da">at give adgang til Emerald Insights tidsskrifter og artikler indenfor socialvidenskab</md:ServiceDescription>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <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:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Emerald Group Publishing</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Emerald Group Publishing</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.emeraldgrouppublishing.com</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:Company>Atypon Systems Inc.</md:Company>
+    <md:GivenName>SSO-Support</md:GivenName>
+    <md:SurName>SSO-Support</md:SurName>
+    <md:EmailAddress>SSO-Support@atypon.com</md:EmailAddress>
+    <md:TelephoneNumber>+14089881240</md:TelephoneNumber>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:Company>Atypon Systems Inc.</md:Company>
+    <md:GivenName>SSO-Tech</md:GivenName>
+    <md:SurName>SSO-Tech</md:SurName>
+    <md:EmailAddress>SSO-Tech@atypon.com</md:EmailAddress>
+    <md:TelephoneNumber>+14089881240</md:TelephoneNumber>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.emeraldinsight.com.xml b/swamid-interfederations-2.0/www.emeraldinsight.com.xml
deleted file mode 100644
index 2e117403..00000000
--- a/swamid-interfederations-2.0/www.emeraldinsight.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://www.emeraldinsight.com/shibboleth">
-  <!--
-		This is an "Emerald Insight" OpenSAML SP for Atypon Systems, Inc.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-07-14T14:43:12Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</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="en">Emerald Insight</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Emerald is a global publisher linking research and practice to the benefit of society.</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.emeraldinsight.com</mdui:InformationURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDNDCCAhygAwIBAgIJAOZnCXnWu9vRMA0GCSqGSIb3DQEBBQUAMCExHzAdBgNV
-						BAMTFnd3dy5lbWVyYWxkaW5zaWdodC5jb20wHhcNMTMwNjI3MjEyNjI2WhcNMTYw
-						NjI2MjEyNjI2WjAhMR8wHQYDVQQDExZ3d3cuZW1lcmFsZGluc2lnaHQuY29tMIIB
-						IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAq4IsI4kV+i/3gsIg9iZa+8DZ
-						NgVbnzpIeD+QnzXt4HeUb/3ga4kn6Vc6WwnMFkFlvpoVucD7nkENzvjc5LpVsuJ7
-						LKCyCUJspB9BQRX0N23tV0nzT/w35p1VbgFRXB2o4teW3ymXzTLYmKfiMy0dYO5Y
-						KFFudXk2vdqHLrspDvbPLpuGhkLwstmaHhIbMmFe5jQuXyNaPl7iGBE8KXKqFtZ4
-						acINV0R7xnQBMvshileah1UznEmd7JEGdNDMFf1o2fAvGa9xcfwD5yXTEzaT178K
-						fsGGhpEO0aW/cFvFupOXDJJTB6aeeS43qeFsKJkJXPWkUr8TFKsQs06NTksAUQID
-						AQABo28wbTBMBgNVHREERTBDghZ3d3cuZW1lcmFsZGluc2lnaHQuY29thilodHRw
-						czovL3d3dy5lbWVyYWxkaW5zaWdodC5jb20vc2hpYmJvbGV0aDAdBgNVHQ4EFgQU
-						j3L5syzTbNpvdAwMEX/ALDDmM6IwDQYJKoZIhvcNAQEFBQADggEBAGkoaPoDQeZ+
-						F7B81Bvt2pjRjtDhWqUeQRy1YphyVXiNRM+/1RAKPq+Ltr5Cpt/ytP06uPZ2YM9B
-						0LMo/iAqrgP7LsCo2wxQojOhUhCfzX4ICjZB1WRhTt4qjOFuQM6lYka9JxgZUDxu
-						01V8YRawDs9iFJuslzYrnRGMI9lJLgwUlBLKMQ3pM1TzwY0bTDvun4HofPID193f
-						f50smOG9qh99rReZ9tTM9odW942gZijzbxJBqKuSU10r556kff6RrjVmTjTAEhGY
-						Maa83O3lH1JgvsqB77ONG7svDudp1Zfc5GEJV5F2rwfGSUoIURH3z69Ewdd1lo3d
-						Bt7qcpd9uOc=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.emeraldinsight.com/action/samlACS" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.emeraldinsight.com/action/saml2post" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.emeraldinsight.com/action/saml2artifact" index="3"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Atypon Systems, Inc</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Emerald Insight</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.emeraldgrouppublishing.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>SSO-Support</GivenName>
-    <EmailAddress>mailto:SSO-Support@atypon.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>SSO-Tech</GivenName>
-    <EmailAddress>mailto:SSO-Tech@atypon.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.knodium.com-Shibboleth.sso-Metadata.xml b/swamid-interfederations-2.0/www.knodium.com-Shibboleth.sso-Metadata.xml
deleted file mode 100644
index 7edb7e2a..00000000
--- a/swamid-interfederations-2.0/www.knodium.com-Shibboleth.sso-Metadata.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://www.knodium.com/Shibboleth.sso/Metadata">
-  <!--
-		This is an SP for Knodium Limited.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-09-11T08:57:13Z">
-      <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>
-      <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.knodium.com/Shibboleth.sso/Login"/>
-      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.knodium.com/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Knodium</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Knodium is an online platform for collaboration.</mdui:Description>
-        <mdui:Logo height="158" width="350">https://www.knodium.com/images/logo-shib.png</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIC9DCCAdygAwIBAgIJAMLknMjt03SjMA0GCSqGSIb3DQEBBQUAMBoxGDAWBgNV
-						BAMTD3d3dy5rbm9kaXVtLmNvbTAeFw0xMjA5MTAxNTI2NTZaFw0yMjA5MDgxNTI2
-						NTZaMBoxGDAWBgNVBAMTD3d3dy5rbm9kaXVtLmNvbTCCASIwDQYJKoZIhvcNAQEB
-						BQADggEPADCCAQoCggEBAMS5B0GMXiaYkvtJDFNsrRNMfFF5WZOTdOdFh4VK2G1C
-						c4Jo+WInPbjfB+l3gNji634Qc06ke0A74GyRTf19pIcKpmB6pyEtjt/0vgInT3Ax
-						ZI38HVgCk1WHwpg5LLzRI4FkzpIIX/SfB7KYB6WDA0AXbE8id2KXaxuCNrGYvoU6
-						orz7Gt+FERDUooNli1Z97ZQ6o6MogAeHizRTpWhWVqIVLKxvAZ42+OXw2OwGzOeL
-						OkefcJ5l/AwJbmEM+19yqdSB4e6VqF+ApsR/NbJaE5kz7GhvitK0FWkrP31bVj5t
-						0pFmyFwYRohge0FFw0wX/vojPZqqBjOM5HafUmDB4PUCAwEAAaM9MDswGgYDVR0R
-						BBMwEYIPd3d3Lmtub2RpdW0uY29tMB0GA1UdDgQWBBQysHs0AHbWoM4U7GlNVirq
-						6w1N4DANBgkqhkiG9w0BAQUFAAOCAQEAY9843vk3HlJssWlGnq5djjjzOeMZ6qPa
-						GXNZBZGi9LI3P4xAkW0fCnUygcb5MZaHdB+RuINEdXj+npITszfLtnj2m4BCq2IN
-						evmRUQRc7F27b9aoUuhYl0q6/Z9MFOjdjzQb6LT1duCDPq83kFp0gS57fqQP97F0
-						8Hbzw5ZdLWALzsDuxU9FGRU5gdZNDmXkzymluKMZRchLuJrJhsRDPb34xmcH7RKF
-						Msv4N8MBOk9nESf3jQTPgkCvZee2t6h9xijoRP+IH5VD3hfq+H3lNKX7w7DkRqlR
-						dB55/ggB6okN6t5L8d+FUbKU3qI8VQmR8V4/NJ/F0EFmLzEklMUxsw==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.knodium.com/Shibboleth.sso/Artifact/SOAP" index="0"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.knodium.com/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.knodium.com/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.knodium.com/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.knodium.com/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.knodium.com/Shibboleth.sso/SAML2/POST" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.knodium.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.knodium.com/Shibboleth.sso/SAML2/Artifact" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.knodium.com/Shibboleth.sso/SAML2/ECP" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.knodium.com/Shibboleth.sso/SAML/POST" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.knodium.com/Shibboleth.sso/SAML/Artifact" index="5"/>
-    <AttributeConsumingService index="1">
-      <ServiceName xml:lang="en">Knodium</ServiceName>
-      <ServiceDescription xml:lang="en">Knodium is an online platform for collaboration.</ServiceDescription>
-      <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="swissEduPersonUniqueID" Name="urn:mace:switch.ch:attribute-def:swissEduPersonUniqueID" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-      <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="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="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="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="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"/>
-      <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"/>
-      <RequestedAttribute FriendlyName="eduCourseMember" 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"/>
-      <RequestedAttribute FriendlyName="eduCourseOffering" 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"/>
-      <RequestedAttribute FriendlyName="organizationName" Name="urn:oid:2.5.4.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format: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="eduPersonAssurance" Name="urn:mace:dir:attribute-def:eduPersonAssurance" 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="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"/>
-    </AttributeConsumingService>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Knodium Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Knodium</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">https://www.knodium.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Web Support</GivenName>
-    <EmailAddress>mailto:webmaster@knodium.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Web Support</GivenName>
-    <EmailAddress>mailto:webmaster@knodium.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.knodium.com.xml b/swamid-interfederations-2.0/www.knodium.com.xml
deleted file mode 100644
index 7edb7e2a..00000000
--- a/swamid-interfederations-2.0/www.knodium.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://www.knodium.com/Shibboleth.sso/Metadata">
-  <!--
-		This is an SP for Knodium Limited.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-09-11T08:57:13Z">
-      <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>
-      <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.knodium.com/Shibboleth.sso/Login"/>
-      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.knodium.com/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Knodium</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Knodium is an online platform for collaboration.</mdui:Description>
-        <mdui:Logo height="158" width="350">https://www.knodium.com/images/logo-shib.png</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIC9DCCAdygAwIBAgIJAMLknMjt03SjMA0GCSqGSIb3DQEBBQUAMBoxGDAWBgNV
-						BAMTD3d3dy5rbm9kaXVtLmNvbTAeFw0xMjA5MTAxNTI2NTZaFw0yMjA5MDgxNTI2
-						NTZaMBoxGDAWBgNVBAMTD3d3dy5rbm9kaXVtLmNvbTCCASIwDQYJKoZIhvcNAQEB
-						BQADggEPADCCAQoCggEBAMS5B0GMXiaYkvtJDFNsrRNMfFF5WZOTdOdFh4VK2G1C
-						c4Jo+WInPbjfB+l3gNji634Qc06ke0A74GyRTf19pIcKpmB6pyEtjt/0vgInT3Ax
-						ZI38HVgCk1WHwpg5LLzRI4FkzpIIX/SfB7KYB6WDA0AXbE8id2KXaxuCNrGYvoU6
-						orz7Gt+FERDUooNli1Z97ZQ6o6MogAeHizRTpWhWVqIVLKxvAZ42+OXw2OwGzOeL
-						OkefcJ5l/AwJbmEM+19yqdSB4e6VqF+ApsR/NbJaE5kz7GhvitK0FWkrP31bVj5t
-						0pFmyFwYRohge0FFw0wX/vojPZqqBjOM5HafUmDB4PUCAwEAAaM9MDswGgYDVR0R
-						BBMwEYIPd3d3Lmtub2RpdW0uY29tMB0GA1UdDgQWBBQysHs0AHbWoM4U7GlNVirq
-						6w1N4DANBgkqhkiG9w0BAQUFAAOCAQEAY9843vk3HlJssWlGnq5djjjzOeMZ6qPa
-						GXNZBZGi9LI3P4xAkW0fCnUygcb5MZaHdB+RuINEdXj+npITszfLtnj2m4BCq2IN
-						evmRUQRc7F27b9aoUuhYl0q6/Z9MFOjdjzQb6LT1duCDPq83kFp0gS57fqQP97F0
-						8Hbzw5ZdLWALzsDuxU9FGRU5gdZNDmXkzymluKMZRchLuJrJhsRDPb34xmcH7RKF
-						Msv4N8MBOk9nESf3jQTPgkCvZee2t6h9xijoRP+IH5VD3hfq+H3lNKX7w7DkRqlR
-						dB55/ggB6okN6t5L8d+FUbKU3qI8VQmR8V4/NJ/F0EFmLzEklMUxsw==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.knodium.com/Shibboleth.sso/Artifact/SOAP" index="0"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.knodium.com/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.knodium.com/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.knodium.com/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.knodium.com/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.knodium.com/Shibboleth.sso/SAML2/POST" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.knodium.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.knodium.com/Shibboleth.sso/SAML2/Artifact" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.knodium.com/Shibboleth.sso/SAML2/ECP" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.knodium.com/Shibboleth.sso/SAML/POST" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.knodium.com/Shibboleth.sso/SAML/Artifact" index="5"/>
-    <AttributeConsumingService index="1">
-      <ServiceName xml:lang="en">Knodium</ServiceName>
-      <ServiceDescription xml:lang="en">Knodium is an online platform for collaboration.</ServiceDescription>
-      <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="swissEduPersonUniqueID" Name="urn:mace:switch.ch:attribute-def:swissEduPersonUniqueID" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-      <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="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="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="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="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"/>
-      <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"/>
-      <RequestedAttribute FriendlyName="eduCourseMember" 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"/>
-      <RequestedAttribute FriendlyName="eduCourseOffering" 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"/>
-      <RequestedAttribute FriendlyName="organizationName" Name="urn:oid:2.5.4.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format: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="eduPersonAssurance" Name="urn:mace:dir:attribute-def:eduPersonAssurance" 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="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"/>
-    </AttributeConsumingService>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Knodium Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Knodium</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">https://www.knodium.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Web Support</GivenName>
-    <EmailAddress>mailto:webmaster@knodium.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Web Support</GivenName>
-    <EmailAddress>mailto:webmaster@knodium.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.meertens.knaw.nl-Shibboleth.sso-Metadata.xml b/swamid-interfederations-2.0/www.meertens.knaw.nl-Shibboleth.sso-Metadata.xml
deleted file mode 100644
index 469e3ed0..00000000
--- a/swamid-interfederations-2.0/www.meertens.knaw.nl-Shibboleth.sso-Metadata.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.meertens.knaw.nl/Shibboleth.sso/Metadata">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2013-12-04T15:23:40Z">
-      <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">Meertens Institute Archive</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Meertens Institute</mdui:DisplayName>
-        <mdui:Description xml:lang="de">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: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>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>www.meertens.knaw.nl</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>emailAddress=servicedesk@knaw.nl,CN=www.meertens.knaw.nl,OU=I&amp;A,O=KNAW,L=Amsterdam,ST=NH,C=NL</ds:X509SubjectName>
-          <ds:X509Certificate>MIIF8TCCA9mgAwIBAgIJAPS1Y07BXsRDMA0GCSqGSIb3DQEBBQUAMIGOMQswCQYD
-VQQGEwJOTDELMAkGA1UECAwCTkgxEjAQBgNVBAcMCUFtc3RlcmRhbTENMAsGA1UE
-CgwES05BVzEMMAoGA1UECwwDSSZBMR0wGwYDVQQDDBR3d3cubWVlcnRlbnMua25h
-dy5ubDEiMCAGCSqGSIb3DQEJARYTc2VydmljZWRlc2tAa25hdy5ubDAeFw0xNDA1
-MDYxMDQxMzJaFw0yNDA1MDMxMDQxMzJaMIGOMQswCQYDVQQGEwJOTDELMAkGA1UE
-CAwCTkgxEjAQBgNVBAcMCUFtc3RlcmRhbTENMAsGA1UECgwES05BVzEMMAoGA1UE
-CwwDSSZBMR0wGwYDVQQDDBR3d3cubWVlcnRlbnMua25hdy5ubDEiMCAGCSqGSIb3
-DQEJARYTc2VydmljZWRlc2tAa25hdy5ubDCCAiIwDQYJKoZIhvcNAQEBBQADggIP
-ADCCAgoCggIBAN0PojgkCqamdv1KflImeJwSTai6yEQv1lVchZsKhtw/eNQrGgFz
-2iC2p/hpQXoa32W76jXYfG9gK59N2Y22HQcjbw4azfMRyrorDXI9ruAjq9KY0l+q
-PibNODH4lXUEcJtQ5tgckCZnHtHJHGMrqIUZmgMDWI91GhmKb9qI5OucuHi4dFw0
-9gvWy2MW/wVejBAuWimQhlDvIzLNF3nesS/mawyXAAIgnyzT5sMEcTDifKuuF/Dq
-DyrIrlbFcUR9063SGtsbi32Qzk43VXZobD1GiMaah/jtlkZvvHx7x9HRXkjsROsy
-T0fqPSGsuH1USF4Ll0ctfmjKZdSU1DXoYefnFGah2+vu5x8+aSHyeIAABoNLzaPj
-NMI+Dt99IuLfSiRKi51HBcgI+uNScJuir/1qxjqxiAzJmXNiKOhPf2ATgsYWeP40
-Q7Q0AFDIdvFMaRBy+apmHcoE6C8DEnf2ejHaeZBm8T50z/2x1yvGd2EvLKB4Vonq
-CH/tdiPDRTEgcNjUMD+ZKDsZS3RhqaXJwWyRms0hHEnLPKsLK0JU9pAVEd15nGyg
-ziL7QpdNpD08UYCjhIoWR/byMPAvU794n/SAYorLs7DpKEinwm4lYeMo1JglhHLa
-9KFuOBMy5iyQyCijxqSjWfzTgmUf0V0SJMY4283ctufsccPiPbBymSQjAgMBAAGj
-UDBOMB0GA1UdDgQWBBTvJnIYoaUYRuUSgD1dejg/rypgajAfBgNVHSMEGDAWgBTv
-JnIYoaUYRuUSgD1dejg/rypgajAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUA
-A4ICAQC7ki6eHoRyFUVoPK+A9aDfarOnLqujQDk8s775ZcNeSZwza47MgX4HVtxB
-bfRO4HRTp0huXVbfldV60Fo/OjoQb4hS7bZjTq0m2zy1XoEmlM9rykMS8UnUsVzr
-BfC4Tq3mF3hBkiTSYkp5EekBr7PVkQK8G3XW8Jfbaf9AMbgOnEiSztHR8VKhgu2H
-6cxEj6K2il1ge/kbvYJWoxHLAhSkxOhnMs225COGoQt8Gb6pWXIIMo5QkVuZwlQE
-AKDXeuthjxa/DtxDN3SYw5MMw9qZN1RPbkwEkJpRzHceq7hQbmL0KlwPKXqqKT90
-o/+9ZTdR/6xptba73E1YtG1Iq5pQBxK6SU3HPLpCBcei6XGdi7QdDFPFfrPLg7RK
-KpxjeDWUTpopH0JEVvSgX0Tn9pVFVq5F4cial+yOpwDxZvAOwjJlWotoqnyVsDOn
-uESSSj1tVqW+2zqLTdzOpWaP0kWlu7wrL5PzqWhaPVChL+KYs40TNd2XK1rlOtNe
-WWcZ8uJ+ftZDNEGNvaTnRZLhxGxE9OWThvwL0iyOw8vEcWHm2JNRy3VkSvguFDcM
-MXWm4sBAe8iEXXkAxrflHdBubei1FTexa+Kl9lQ/ICrpmT+V1Jyi4DrdvS0+2ijb
-SF7hTs3mZvR2FPh5VJ0vBUC7QOXB5RBcP6vy4H25WiovevzKOg==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.meertens.knaw.nl/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.meertens.knaw.nl/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.meertens.knaw.nl/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.meertens.knaw.nl/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.meertens.knaw.nl/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.meertens.knaw.nl/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.meertens.knaw.nl/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.meertens.knaw.nl/Shibboleth.sso/NIM/Artifact"/>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.meertens.knaw.nl/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.meertens.knaw.nl/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.meertens.knaw.nl/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.meertens.knaw.nl/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.meertens.knaw.nl/Shibboleth.sso/SAML2/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.meertens.knaw.nl/Shibboleth.sso/SAML2/POST-SimpleSign" index="6"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.meertens.knaw.nl/Shibboleth.sso/SAML2/Artifact" index="7"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.meertens.knaw.nl/Shibboleth.sso/SAML2/ECP" index="8"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.meertens.knaw.nl/Shibboleth.sso/SAML/POST" index="9"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.meertens.knaw.nl/Shibboleth.sso/SAML/Artifact" index="10"/>
-    <AttributeConsumingService index="1">
-      <ServiceName xml:lang="de">Meertens Institute Archive</ServiceName>
-      <ServiceName xml:lang="en">Meertens Institute</ServiceName>
-      <ServiceDescription xml:lang="de">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</ServiceDescription>
-      <ServiceDescription 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</ServiceDescription>
-      <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"/>
-      <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"/>
-    </AttributeConsumingService>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">e404</OrganizationName>
-    <OrganizationName xml:lang="en">e404</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">Meertens Institute</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">Meertens Institute</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.meertens.knaw.nl</OrganizationURL>
-    <OrganizationURL xml:lang="en">http://www.meertens.knaw.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/www.meertens.knaw.nl.xml b/swamid-interfederations-2.0/www.meertens.knaw.nl.xml
deleted file mode 100644
index 469e3ed0..00000000
--- a/swamid-interfederations-2.0/www.meertens.knaw.nl.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.meertens.knaw.nl/Shibboleth.sso/Metadata">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2013-12-04T15:23:40Z">
-      <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">Meertens Institute Archive</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Meertens Institute</mdui:DisplayName>
-        <mdui:Description xml:lang="de">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: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>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>www.meertens.knaw.nl</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>emailAddress=servicedesk@knaw.nl,CN=www.meertens.knaw.nl,OU=I&amp;A,O=KNAW,L=Amsterdam,ST=NH,C=NL</ds:X509SubjectName>
-          <ds:X509Certificate>MIIF8TCCA9mgAwIBAgIJAPS1Y07BXsRDMA0GCSqGSIb3DQEBBQUAMIGOMQswCQYD
-VQQGEwJOTDELMAkGA1UECAwCTkgxEjAQBgNVBAcMCUFtc3RlcmRhbTENMAsGA1UE
-CgwES05BVzEMMAoGA1UECwwDSSZBMR0wGwYDVQQDDBR3d3cubWVlcnRlbnMua25h
-dy5ubDEiMCAGCSqGSIb3DQEJARYTc2VydmljZWRlc2tAa25hdy5ubDAeFw0xNDA1
-MDYxMDQxMzJaFw0yNDA1MDMxMDQxMzJaMIGOMQswCQYDVQQGEwJOTDELMAkGA1UE
-CAwCTkgxEjAQBgNVBAcMCUFtc3RlcmRhbTENMAsGA1UECgwES05BVzEMMAoGA1UE
-CwwDSSZBMR0wGwYDVQQDDBR3d3cubWVlcnRlbnMua25hdy5ubDEiMCAGCSqGSIb3
-DQEJARYTc2VydmljZWRlc2tAa25hdy5ubDCCAiIwDQYJKoZIhvcNAQEBBQADggIP
-ADCCAgoCggIBAN0PojgkCqamdv1KflImeJwSTai6yEQv1lVchZsKhtw/eNQrGgFz
-2iC2p/hpQXoa32W76jXYfG9gK59N2Y22HQcjbw4azfMRyrorDXI9ruAjq9KY0l+q
-PibNODH4lXUEcJtQ5tgckCZnHtHJHGMrqIUZmgMDWI91GhmKb9qI5OucuHi4dFw0
-9gvWy2MW/wVejBAuWimQhlDvIzLNF3nesS/mawyXAAIgnyzT5sMEcTDifKuuF/Dq
-DyrIrlbFcUR9063SGtsbi32Qzk43VXZobD1GiMaah/jtlkZvvHx7x9HRXkjsROsy
-T0fqPSGsuH1USF4Ll0ctfmjKZdSU1DXoYefnFGah2+vu5x8+aSHyeIAABoNLzaPj
-NMI+Dt99IuLfSiRKi51HBcgI+uNScJuir/1qxjqxiAzJmXNiKOhPf2ATgsYWeP40
-Q7Q0AFDIdvFMaRBy+apmHcoE6C8DEnf2ejHaeZBm8T50z/2x1yvGd2EvLKB4Vonq
-CH/tdiPDRTEgcNjUMD+ZKDsZS3RhqaXJwWyRms0hHEnLPKsLK0JU9pAVEd15nGyg
-ziL7QpdNpD08UYCjhIoWR/byMPAvU794n/SAYorLs7DpKEinwm4lYeMo1JglhHLa
-9KFuOBMy5iyQyCijxqSjWfzTgmUf0V0SJMY4283ctufsccPiPbBymSQjAgMBAAGj
-UDBOMB0GA1UdDgQWBBTvJnIYoaUYRuUSgD1dejg/rypgajAfBgNVHSMEGDAWgBTv
-JnIYoaUYRuUSgD1dejg/rypgajAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUA
-A4ICAQC7ki6eHoRyFUVoPK+A9aDfarOnLqujQDk8s775ZcNeSZwza47MgX4HVtxB
-bfRO4HRTp0huXVbfldV60Fo/OjoQb4hS7bZjTq0m2zy1XoEmlM9rykMS8UnUsVzr
-BfC4Tq3mF3hBkiTSYkp5EekBr7PVkQK8G3XW8Jfbaf9AMbgOnEiSztHR8VKhgu2H
-6cxEj6K2il1ge/kbvYJWoxHLAhSkxOhnMs225COGoQt8Gb6pWXIIMo5QkVuZwlQE
-AKDXeuthjxa/DtxDN3SYw5MMw9qZN1RPbkwEkJpRzHceq7hQbmL0KlwPKXqqKT90
-o/+9ZTdR/6xptba73E1YtG1Iq5pQBxK6SU3HPLpCBcei6XGdi7QdDFPFfrPLg7RK
-KpxjeDWUTpopH0JEVvSgX0Tn9pVFVq5F4cial+yOpwDxZvAOwjJlWotoqnyVsDOn
-uESSSj1tVqW+2zqLTdzOpWaP0kWlu7wrL5PzqWhaPVChL+KYs40TNd2XK1rlOtNe
-WWcZ8uJ+ftZDNEGNvaTnRZLhxGxE9OWThvwL0iyOw8vEcWHm2JNRy3VkSvguFDcM
-MXWm4sBAe8iEXXkAxrflHdBubei1FTexa+Kl9lQ/ICrpmT+V1Jyi4DrdvS0+2ijb
-SF7hTs3mZvR2FPh5VJ0vBUC7QOXB5RBcP6vy4H25WiovevzKOg==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.meertens.knaw.nl/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.meertens.knaw.nl/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.meertens.knaw.nl/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.meertens.knaw.nl/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.meertens.knaw.nl/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.meertens.knaw.nl/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.meertens.knaw.nl/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.meertens.knaw.nl/Shibboleth.sso/NIM/Artifact"/>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.meertens.knaw.nl/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.meertens.knaw.nl/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.meertens.knaw.nl/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.meertens.knaw.nl/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.meertens.knaw.nl/Shibboleth.sso/SAML2/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.meertens.knaw.nl/Shibboleth.sso/SAML2/POST-SimpleSign" index="6"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.meertens.knaw.nl/Shibboleth.sso/SAML2/Artifact" index="7"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.meertens.knaw.nl/Shibboleth.sso/SAML2/ECP" index="8"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.meertens.knaw.nl/Shibboleth.sso/SAML/POST" index="9"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.meertens.knaw.nl/Shibboleth.sso/SAML/Artifact" index="10"/>
-    <AttributeConsumingService index="1">
-      <ServiceName xml:lang="de">Meertens Institute Archive</ServiceName>
-      <ServiceName xml:lang="en">Meertens Institute</ServiceName>
-      <ServiceDescription xml:lang="de">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</ServiceDescription>
-      <ServiceDescription 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</ServiceDescription>
-      <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"/>
-      <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"/>
-    </AttributeConsumingService>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">e404</OrganizationName>
-    <OrganizationName xml:lang="en">e404</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">Meertens Institute</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">Meertens Institute</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.meertens.knaw.nl</OrganizationURL>
-    <OrganizationURL xml:lang="en">http://www.meertens.knaw.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/www.openaccessrepository.it-shibboleth.xml b/swamid-interfederations-2.0/www.openaccessrepository.it-shibboleth.xml
deleted file mode 100644
index 8f2ba283..00000000
--- a/swamid-interfederations-2.0/www.openaccessrepository.it-shibboleth.xml
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" entityID="https://www.openaccessrepository.it/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2014-10-10T08:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</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>
-        <mdui:DisplayName xml:lang="en">Open Access Repository</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="it">Open Access Repository</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Open Access repository of INFN and other Italian research organisations' research products (publications, software, data, etc.)</mdui:Description>
-        <mdui:Description xml:lang="it">Archivio Open Access dei prodotti della ricerca (pubblicazioni, software, dati, ecc.) dell'INFN ed altri organismi di ricerca italiani</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.openaccessrepository.it/service/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="it">http://www.openaccessrepository.it/service/</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">http://www.openaccessrepository.it/help/privacy-policy?ln=en</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="it">http://www.openaccessrepository.it/help/privacy-policy?ln=it</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.openaccessrepository.it/Shibboleth.sso/Login"/>
-      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.openaccessrepository.it/Shibboleth.sso/Login" index="1"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIEgzCCA2ugAwIBAgIQAcOBBEDrU0NaTC9JniJAAjANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTE0MDYyMzAwMDAwMFoXDTE3MDYyMjIzNTk1OVowSTEhMB8GA1UE
-CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMSQwIgYDVQQDExt3d3cub3BlbmFj
-Y2Vzc3JlcG9zaXRvcnkuaXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
-AQC5FlOs0obBs1hyIZkL9ZIySN0OIOIRr0FMaxM2X0ROLUruSg7FvLuMtBf6a5EC
-ELEpkasqJU/T7MoHhOTG1S1pAcx9aQ1AfKB1fJPu7//s6nLMvDV8GzrV9dhEl7MW
-hqHobSjBQsq2cfdic9YvFMW2+dY/fvS0Cqlk0Ga9edM7HFDJ9gVKl6j6G4HbMXXA
-ln/0HplJCG1PyZ50URd3giVuM38SSkQ2V9WtsL4cjENJ7XECFXh1uikqPTsnRHD+
-7dJPw8c+j3/MKqk1d/ZMZ0CnuWsNWD6g+a2TpADUssioabQ9FxyJk4UNdGrqdVIc
-Hpj1Ah+bwMvR1rBY08E+Gi2lAgMBAAGjggF4MIIBdDAfBgNVHSMEGDAWgBQMvZNo
-DPPeq6NJays3V0fqkOO57TAdBgNVHQ4EFgQUjtXXHKbMBYRtpsvnZvTF0zJ+oaQw
-DgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUH
-AwEGCCsGAQUFBwMCMCIGA1UdIAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQIB
-MDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVS
-RU5BU1NMQ0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDov
-L2NydC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGG
-Gmh0dHA6Ly9vY3NwLnRjcy50ZXJlbmEub3JnMCYGA1UdEQQfMB2CG3d3dy5vcGVu
-YWNjZXNzcmVwb3NpdG9yeS5pdDANBgkqhkiG9w0BAQUFAAOCAQEAPJVl6xygzniD
-Zd+1rE7mCqLa4b/by2up2mg4CGED05mIX+XD3XFlVnHY2S4KM/E8Ac0VkiLZmDdG
-dm0Z2MDBSbDZKFfdNvC3/8kFYMtXhhk8Owrg+l+MY1QxjzlC0BD9eisIL7uSf7p0
-W580j+lzHziV0KDB//HekpLtRgJHoYOxMxrvhIYexiptNuhRswO6Og8UZ7CsrA5q
-h/rBSQ+HrCM6vkeKTW79h7Wy6u3dlag1vD2ToM/0Sp7x16auORbwST05kRr83pJB
-xoOiE+hrgoBGwJidjNIMD641bADIz8WXCWpy0QVCuBzdufaa1vJszW3r1Y6cVyBL
-VGXrPl4Lcw==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.openaccessrepository.it/Shibboleth.sso/Artifact/SOAP" index="0"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.openaccessrepository.it/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.openaccessrepository.it/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.openaccessrepository.it/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.openaccessrepository.it/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.openaccessrepository.it/Shibboleth.sso/SAML2/POST" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.openaccessrepository.it/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.openaccessrepository.it/Shibboleth.sso/SAML2/Artifact" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.openaccessrepository.it/Shibboleth.sso/SAML2/ECP" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.openaccessrepository.it/Shibboleth.sso/SAML/POST" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.openaccessrepository.it/Shibboleth.sso/SAML/Artifact" index="5"/>
-    <AttributeConsumingService index="1">
-      <ServiceName xml:lang="en">Open Access Repository</ServiceName>
-      <ServiceDescription xml:lang="en">Open Access repository of INFN and other Italian research organisations' research products (publications, software, data, etc.)</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="en">Italian National Institute for Nuclear Physics</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">INFN</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.infn.it/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <EmailAddress>mailto:credentials-admin@ct.infn.it</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.openaccessrepository.it.xml b/swamid-interfederations-2.0/www.openaccessrepository.it.xml
deleted file mode 100644
index 8f2ba283..00000000
--- a/swamid-interfederations-2.0/www.openaccessrepository.it.xml
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" entityID="https://www.openaccessrepository.it/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2014-10-10T08:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</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>
-        <mdui:DisplayName xml:lang="en">Open Access Repository</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="it">Open Access Repository</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Open Access repository of INFN and other Italian research organisations' research products (publications, software, data, etc.)</mdui:Description>
-        <mdui:Description xml:lang="it">Archivio Open Access dei prodotti della ricerca (pubblicazioni, software, dati, ecc.) dell'INFN ed altri organismi di ricerca italiani</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.openaccessrepository.it/service/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="it">http://www.openaccessrepository.it/service/</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">http://www.openaccessrepository.it/help/privacy-policy?ln=en</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="it">http://www.openaccessrepository.it/help/privacy-policy?ln=it</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.openaccessrepository.it/Shibboleth.sso/Login"/>
-      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.openaccessrepository.it/Shibboleth.sso/Login" index="1"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIEgzCCA2ugAwIBAgIQAcOBBEDrU0NaTC9JniJAAjANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTE0MDYyMzAwMDAwMFoXDTE3MDYyMjIzNTk1OVowSTEhMB8GA1UE
-CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMSQwIgYDVQQDExt3d3cub3BlbmFj
-Y2Vzc3JlcG9zaXRvcnkuaXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
-AQC5FlOs0obBs1hyIZkL9ZIySN0OIOIRr0FMaxM2X0ROLUruSg7FvLuMtBf6a5EC
-ELEpkasqJU/T7MoHhOTG1S1pAcx9aQ1AfKB1fJPu7//s6nLMvDV8GzrV9dhEl7MW
-hqHobSjBQsq2cfdic9YvFMW2+dY/fvS0Cqlk0Ga9edM7HFDJ9gVKl6j6G4HbMXXA
-ln/0HplJCG1PyZ50URd3giVuM38SSkQ2V9WtsL4cjENJ7XECFXh1uikqPTsnRHD+
-7dJPw8c+j3/MKqk1d/ZMZ0CnuWsNWD6g+a2TpADUssioabQ9FxyJk4UNdGrqdVIc
-Hpj1Ah+bwMvR1rBY08E+Gi2lAgMBAAGjggF4MIIBdDAfBgNVHSMEGDAWgBQMvZNo
-DPPeq6NJays3V0fqkOO57TAdBgNVHQ4EFgQUjtXXHKbMBYRtpsvnZvTF0zJ+oaQw
-DgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUH
-AwEGCCsGAQUFBwMCMCIGA1UdIAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQIB
-MDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVS
-RU5BU1NMQ0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDov
-L2NydC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGG
-Gmh0dHA6Ly9vY3NwLnRjcy50ZXJlbmEub3JnMCYGA1UdEQQfMB2CG3d3dy5vcGVu
-YWNjZXNzcmVwb3NpdG9yeS5pdDANBgkqhkiG9w0BAQUFAAOCAQEAPJVl6xygzniD
-Zd+1rE7mCqLa4b/by2up2mg4CGED05mIX+XD3XFlVnHY2S4KM/E8Ac0VkiLZmDdG
-dm0Z2MDBSbDZKFfdNvC3/8kFYMtXhhk8Owrg+l+MY1QxjzlC0BD9eisIL7uSf7p0
-W580j+lzHziV0KDB//HekpLtRgJHoYOxMxrvhIYexiptNuhRswO6Og8UZ7CsrA5q
-h/rBSQ+HrCM6vkeKTW79h7Wy6u3dlag1vD2ToM/0Sp7x16auORbwST05kRr83pJB
-xoOiE+hrgoBGwJidjNIMD641bADIz8WXCWpy0QVCuBzdufaa1vJszW3r1Y6cVyBL
-VGXrPl4Lcw==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.openaccessrepository.it/Shibboleth.sso/Artifact/SOAP" index="0"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.openaccessrepository.it/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.openaccessrepository.it/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.openaccessrepository.it/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.openaccessrepository.it/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.openaccessrepository.it/Shibboleth.sso/SAML2/POST" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.openaccessrepository.it/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.openaccessrepository.it/Shibboleth.sso/SAML2/Artifact" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.openaccessrepository.it/Shibboleth.sso/SAML2/ECP" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.openaccessrepository.it/Shibboleth.sso/SAML/POST" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.openaccessrepository.it/Shibboleth.sso/SAML/Artifact" index="5"/>
-    <AttributeConsumingService index="1">
-      <ServiceName xml:lang="en">Open Access Repository</ServiceName>
-      <ServiceDescription xml:lang="en">Open Access repository of INFN and other Italian research organisations' research products (publications, software, data, etc.)</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="en">Italian National Institute for Nuclear Physics</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">INFN</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.infn.it/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <EmailAddress>mailto:credentials-admin@ct.infn.it</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.portal.euromonitor.com-shibboleth.xml b/swamid-interfederations-2.0/www.portal.euromonitor.com-shibboleth.xml
deleted file mode 100644
index 53dbc143..00000000
--- a/swamid-interfederations-2.0/www.portal.euromonitor.com-shibboleth.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://www.portal.euromonitor.com/shibboleth">
-  <!--
-		This is an OpenAthens service provider for Euromonitor International plc.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2009-01-22T16:58:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </Extensions>
-  <SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIEHDCCAwSgAwIBAgIJAJuSt635KQAmMA0GCSqGSIb3DQEBBQUAMIGOMQswCQYD
-						VQQGEwJHQjEYMBYGA1UECAwPR3JlYXRlciAgTG9uZG9uMQ8wDQYDVQQHDAZMb25k
-						b24xIjAgBgNVBAoMGUV1cm9tb25pdG9yIEludGVybmF0aW9uYWwxCzAJBgNVBAsM
-						AklUMSMwIQYDVQQDDBp3d3cucG9ydGFsLmV1cm9tb25pdG9yLmNvbTAeFw0xMDEy
-						MTAwNjIyMzJaFw0yMDEyMDcwNjIyMzJaMIGOMQswCQYDVQQGEwJHQjEYMBYGA1UE
-						CAwPR3JlYXRlciAgTG9uZG9uMQ8wDQYDVQQHDAZMb25kb24xIjAgBgNVBAoMGUV1
-						cm9tb25pdG9yIEludGVybmF0aW9uYWwxCzAJBgNVBAsMAklUMSMwIQYDVQQDDBp3
-						d3cucG9ydGFsLmV1cm9tb25pdG9yLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEP
-						ADCCAQoCggEBANY09Jl65SJ1NUm1lrht4U2e4NAB0nnoM9YrTlUCwfqljmSRbbNc
-						YVpCzfjop/Z956K2ePUnrVCY6vGXBlAxUBf8ugMek1JfK1lYH+USogWbQ38iNH/W
-						BmN7MI+ZH76nRZ3bcWnSk16suus5mmNd5FZVbdpUcW3Vhi7ZHmAHtwQySJLvxAMs
-						uYGAqVcxPGBZjrG1C6nvPR22I51Tli7nh8uFziCaWmUAjLnyU+k/1GXHsWip9YPu
-						zgXe699GsPcb8GfPLCKfOnL/qNa1dU7vVD6MRz/egKri1djGgWQPYXAIs/F5cfl3
-						t2UC0+1VmSricGkN88tz+bQAA0PpGeLmVDECAwEAAaN7MHkwCQYDVR0TBAIwADAs
-						BglghkgBhvhCAQ0EHxYdT3BlblNTTCBHZW5lcmF0ZWQgQ2VydGlmaWNhdGUwHQYD
-						VR0OBBYEFJDmPtO/5kuHAA1GkiygcECQIgM+MB8GA1UdIwQYMBaAFJDmPtO/5kuH
-						AA1GkiygcECQIgM+MA0GCSqGSIb3DQEBBQUAA4IBAQCwDNd27UiliU2+jRit019f
-						eAz1mpoC4Bxq11rvUyuqWmIdEZC60riLxsTmukGWRI0TnGTPt2oVKr2y8luT7RZF
-						CItFWKcxS6yN4BHSMp3bj6LAgk/KrwpGWu3pKG4rVtfDjrRwjX54f/hF+DPViSbD
-						UcO/MiPwHo9+Ooj8OrLrwpsotCqwCaEnLrjpR4Vw5Kc510tNuca2MVD7Ppkh1+vx
-						BX00Mf1vU2OadW3VBlMyQuzcvpB6oon/pCbOVYJ+vsI4mNIJ27tNI66urifUwtby
-						6N7Wsak8uoAFS1GACPsJ/az3sQsUvTOy3FFrJOUkTUK1ReErc5jHS67YdLT1cHy9
-					</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>
-						MIIEHDCCAwSgAwIBAgIJAJuSt635KQAmMA0GCSqGSIb3DQEBBQUAMIGOMQswCQYD
-						VQQGEwJHQjEYMBYGA1UECAwPR3JlYXRlciAgTG9uZG9uMQ8wDQYDVQQHDAZMb25k
-						b24xIjAgBgNVBAoMGUV1cm9tb25pdG9yIEludGVybmF0aW9uYWwxCzAJBgNVBAsM
-						AklUMSMwIQYDVQQDDBp3d3cucG9ydGFsLmV1cm9tb25pdG9yLmNvbTAeFw0xMDEy
-						MTAwNjIyMzJaFw0yMDEyMDcwNjIyMzJaMIGOMQswCQYDVQQGEwJHQjEYMBYGA1UE
-						CAwPR3JlYXRlciAgTG9uZG9uMQ8wDQYDVQQHDAZMb25kb24xIjAgBgNVBAoMGUV1
-						cm9tb25pdG9yIEludGVybmF0aW9uYWwxCzAJBgNVBAsMAklUMSMwIQYDVQQDDBp3
-						d3cucG9ydGFsLmV1cm9tb25pdG9yLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEP
-						ADCCAQoCggEBANY09Jl65SJ1NUm1lrht4U2e4NAB0nnoM9YrTlUCwfqljmSRbbNc
-						YVpCzfjop/Z956K2ePUnrVCY6vGXBlAxUBf8ugMek1JfK1lYH+USogWbQ38iNH/W
-						BmN7MI+ZH76nRZ3bcWnSk16suus5mmNd5FZVbdpUcW3Vhi7ZHmAHtwQySJLvxAMs
-						uYGAqVcxPGBZjrG1C6nvPR22I51Tli7nh8uFziCaWmUAjLnyU+k/1GXHsWip9YPu
-						zgXe699GsPcb8GfPLCKfOnL/qNa1dU7vVD6MRz/egKri1djGgWQPYXAIs/F5cfl3
-						t2UC0+1VmSricGkN88tz+bQAA0PpGeLmVDECAwEAAaN7MHkwCQYDVR0TBAIwADAs
-						BglghkgBhvhCAQ0EHxYdT3BlblNTTCBHZW5lcmF0ZWQgQ2VydGlmaWNhdGUwHQYD
-						VR0OBBYEFJDmPtO/5kuHAA1GkiygcECQIgM+MB8GA1UdIwQYMBaAFJDmPtO/5kuH
-						AA1GkiygcECQIgM+MA0GCSqGSIb3DQEBBQUAA4IBAQCwDNd27UiliU2+jRit019f
-						eAz1mpoC4Bxq11rvUyuqWmIdEZC60riLxsTmukGWRI0TnGTPt2oVKr2y8luT7RZF
-						CItFWKcxS6yN4BHSMp3bj6LAgk/KrwpGWu3pKG4rVtfDjrRwjX54f/hF+DPViSbD
-						UcO/MiPwHo9+Ooj8OrLrwpsotCqwCaEnLrjpR4Vw5Kc510tNuca2MVD7Ppkh1+vx
-						BX00Mf1vU2OadW3VBlMyQuzcvpB6oon/pCbOVYJ+vsI4mNIJ27tNI66urifUwtby
-						6N7Wsak8uoAFS1GACPsJ/az3sQsUvTOy3FFrJOUkTUK1ReErc5jHS67YdLT1cHy9
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.portal.euromonitor.com/portal/oa/auth/rcv/shib/post" index="1" isDefault="true"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.portal.euromonitor.com/portal/oa/auth/rcv/shib/art" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.portal.euromonitor.com/portal/oa/auth/rcv/saml2/post" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.portal.euromonitor.com/portal/oa/auth/rcv/saml2/art" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.portal.euromonitor.com/portal/default.aspx" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.portal.euromonitor.com/portal/default.aspx" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Euromonitor International plc</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Euromonitor International Passport System</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.euromonitor.com/contact.aspx</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Jurgen</GivenName>
-    <SurName>Wiehan</SurName>
-    <EmailAddress>mailto:jurgen.wiehan@euromonitor.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Jurgen</GivenName>
-    <SurName>Wiehan</SurName>
-    <EmailAddress>mailto:jurgen.wiehan@euromonitor.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.portal.euromonitor.com.xml b/swamid-interfederations-2.0/www.portal.euromonitor.com.xml
deleted file mode 100644
index 53dbc143..00000000
--- a/swamid-interfederations-2.0/www.portal.euromonitor.com.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://www.portal.euromonitor.com/shibboleth">
-  <!--
-		This is an OpenAthens service provider for Euromonitor International plc.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2009-01-22T16:58:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </Extensions>
-  <SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIEHDCCAwSgAwIBAgIJAJuSt635KQAmMA0GCSqGSIb3DQEBBQUAMIGOMQswCQYD
-						VQQGEwJHQjEYMBYGA1UECAwPR3JlYXRlciAgTG9uZG9uMQ8wDQYDVQQHDAZMb25k
-						b24xIjAgBgNVBAoMGUV1cm9tb25pdG9yIEludGVybmF0aW9uYWwxCzAJBgNVBAsM
-						AklUMSMwIQYDVQQDDBp3d3cucG9ydGFsLmV1cm9tb25pdG9yLmNvbTAeFw0xMDEy
-						MTAwNjIyMzJaFw0yMDEyMDcwNjIyMzJaMIGOMQswCQYDVQQGEwJHQjEYMBYGA1UE
-						CAwPR3JlYXRlciAgTG9uZG9uMQ8wDQYDVQQHDAZMb25kb24xIjAgBgNVBAoMGUV1
-						cm9tb25pdG9yIEludGVybmF0aW9uYWwxCzAJBgNVBAsMAklUMSMwIQYDVQQDDBp3
-						d3cucG9ydGFsLmV1cm9tb25pdG9yLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEP
-						ADCCAQoCggEBANY09Jl65SJ1NUm1lrht4U2e4NAB0nnoM9YrTlUCwfqljmSRbbNc
-						YVpCzfjop/Z956K2ePUnrVCY6vGXBlAxUBf8ugMek1JfK1lYH+USogWbQ38iNH/W
-						BmN7MI+ZH76nRZ3bcWnSk16suus5mmNd5FZVbdpUcW3Vhi7ZHmAHtwQySJLvxAMs
-						uYGAqVcxPGBZjrG1C6nvPR22I51Tli7nh8uFziCaWmUAjLnyU+k/1GXHsWip9YPu
-						zgXe699GsPcb8GfPLCKfOnL/qNa1dU7vVD6MRz/egKri1djGgWQPYXAIs/F5cfl3
-						t2UC0+1VmSricGkN88tz+bQAA0PpGeLmVDECAwEAAaN7MHkwCQYDVR0TBAIwADAs
-						BglghkgBhvhCAQ0EHxYdT3BlblNTTCBHZW5lcmF0ZWQgQ2VydGlmaWNhdGUwHQYD
-						VR0OBBYEFJDmPtO/5kuHAA1GkiygcECQIgM+MB8GA1UdIwQYMBaAFJDmPtO/5kuH
-						AA1GkiygcECQIgM+MA0GCSqGSIb3DQEBBQUAA4IBAQCwDNd27UiliU2+jRit019f
-						eAz1mpoC4Bxq11rvUyuqWmIdEZC60riLxsTmukGWRI0TnGTPt2oVKr2y8luT7RZF
-						CItFWKcxS6yN4BHSMp3bj6LAgk/KrwpGWu3pKG4rVtfDjrRwjX54f/hF+DPViSbD
-						UcO/MiPwHo9+Ooj8OrLrwpsotCqwCaEnLrjpR4Vw5Kc510tNuca2MVD7Ppkh1+vx
-						BX00Mf1vU2OadW3VBlMyQuzcvpB6oon/pCbOVYJ+vsI4mNIJ27tNI66urifUwtby
-						6N7Wsak8uoAFS1GACPsJ/az3sQsUvTOy3FFrJOUkTUK1ReErc5jHS67YdLT1cHy9
-					</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>
-						MIIEHDCCAwSgAwIBAgIJAJuSt635KQAmMA0GCSqGSIb3DQEBBQUAMIGOMQswCQYD
-						VQQGEwJHQjEYMBYGA1UECAwPR3JlYXRlciAgTG9uZG9uMQ8wDQYDVQQHDAZMb25k
-						b24xIjAgBgNVBAoMGUV1cm9tb25pdG9yIEludGVybmF0aW9uYWwxCzAJBgNVBAsM
-						AklUMSMwIQYDVQQDDBp3d3cucG9ydGFsLmV1cm9tb25pdG9yLmNvbTAeFw0xMDEy
-						MTAwNjIyMzJaFw0yMDEyMDcwNjIyMzJaMIGOMQswCQYDVQQGEwJHQjEYMBYGA1UE
-						CAwPR3JlYXRlciAgTG9uZG9uMQ8wDQYDVQQHDAZMb25kb24xIjAgBgNVBAoMGUV1
-						cm9tb25pdG9yIEludGVybmF0aW9uYWwxCzAJBgNVBAsMAklUMSMwIQYDVQQDDBp3
-						d3cucG9ydGFsLmV1cm9tb25pdG9yLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEP
-						ADCCAQoCggEBANY09Jl65SJ1NUm1lrht4U2e4NAB0nnoM9YrTlUCwfqljmSRbbNc
-						YVpCzfjop/Z956K2ePUnrVCY6vGXBlAxUBf8ugMek1JfK1lYH+USogWbQ38iNH/W
-						BmN7MI+ZH76nRZ3bcWnSk16suus5mmNd5FZVbdpUcW3Vhi7ZHmAHtwQySJLvxAMs
-						uYGAqVcxPGBZjrG1C6nvPR22I51Tli7nh8uFziCaWmUAjLnyU+k/1GXHsWip9YPu
-						zgXe699GsPcb8GfPLCKfOnL/qNa1dU7vVD6MRz/egKri1djGgWQPYXAIs/F5cfl3
-						t2UC0+1VmSricGkN88tz+bQAA0PpGeLmVDECAwEAAaN7MHkwCQYDVR0TBAIwADAs
-						BglghkgBhvhCAQ0EHxYdT3BlblNTTCBHZW5lcmF0ZWQgQ2VydGlmaWNhdGUwHQYD
-						VR0OBBYEFJDmPtO/5kuHAA1GkiygcECQIgM+MB8GA1UdIwQYMBaAFJDmPtO/5kuH
-						AA1GkiygcECQIgM+MA0GCSqGSIb3DQEBBQUAA4IBAQCwDNd27UiliU2+jRit019f
-						eAz1mpoC4Bxq11rvUyuqWmIdEZC60riLxsTmukGWRI0TnGTPt2oVKr2y8luT7RZF
-						CItFWKcxS6yN4BHSMp3bj6LAgk/KrwpGWu3pKG4rVtfDjrRwjX54f/hF+DPViSbD
-						UcO/MiPwHo9+Ooj8OrLrwpsotCqwCaEnLrjpR4Vw5Kc510tNuca2MVD7Ppkh1+vx
-						BX00Mf1vU2OadW3VBlMyQuzcvpB6oon/pCbOVYJ+vsI4mNIJ27tNI66urifUwtby
-						6N7Wsak8uoAFS1GACPsJ/az3sQsUvTOy3FFrJOUkTUK1ReErc5jHS67YdLT1cHy9
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.portal.euromonitor.com/portal/oa/auth/rcv/shib/post" index="1" isDefault="true"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.portal.euromonitor.com/portal/oa/auth/rcv/shib/art" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.portal.euromonitor.com/portal/oa/auth/rcv/saml2/post" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.portal.euromonitor.com/portal/oa/auth/rcv/saml2/art" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.portal.euromonitor.com/portal/default.aspx" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.portal.euromonitor.com/portal/default.aspx" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Euromonitor International plc</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Euromonitor International Passport System</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.euromonitor.com/contact.aspx</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Jurgen</GivenName>
-    <SurName>Wiehan</SurName>
-    <EmailAddress>mailto:jurgen.wiehan@euromonitor.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Jurgen</GivenName>
-    <SurName>Wiehan</SurName>
-    <EmailAddress>mailto:jurgen.wiehan@euromonitor.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.qoam.eu-.xml b/swamid-interfederations-2.0/www.qoam.eu-.xml
deleted file mode 100644
index 33074fb8..00000000
--- a/swamid-interfederations-2.0/www.qoam.eu-.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.qoam.eu/">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.surfconext.nl/" registrationInstant="2014-06-02T14:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://wiki.surfnetlabs.nl/display/eduGAIN/EduGAIN</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>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="en">QOAM - Quality Open Access Market</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Quality Open Access Market is primarily for authors who want to publish their article in open access in a high quality journal and for a reasonable price.</mdui:Description>
-        <mdui:InformationURL xml:lang="en">https://www.qoam.eu/oamarket/about</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://www.qoam.eu/oamarket/about#privacy</mdui:PrivacyStatementURL>
-        <mdui:Logo height="65" width="65">https://static.surfconext.nl/media/sp/OAmarket.png</mdui:Logo>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDQDCCAiigAwIBAgIJAJcxeRXdkrZFMA0GCSqGSIb3DQEBCwUAME4xCzAJBgNVBAYTAk5MMRAwDgYDVQQKEwdxb2FtLm5sMRAwDgYDVQQDEwdxb2FtLm5sMRswGQYJKoZIhvcNAQkBFgxpbmZvQHFvYW0ubmwwHhcNMTQwNDA0MDkzMjIwWhcNMjQwNDAxMDkzMjIwWjBOMQswCQYDVQQGEwJOTDEQMA4GA1UEChMHcW9hbS5ubDEQMA4GA1UEAxMHcW9hbS5ubDEbMBkGCSqGSIb3DQEJARYMaW5mb0Bxb2FtLm5sMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAy+ZlubUDIVxCkaxhs3JV4M6Yx7oOmmg6v2hPTTff1xhp1w5EjKK3lqHKsTafhR3XpgZEEyNu9Q5YDAh1wTXWxodz4tvkYIArggTAKwygMK88b4VsBqwRmySwc4e5GOhZEo4epdumAv0ZIjiGch2FQpu1HkjOODOAc9nxf22gYkgjxgDZy5whSsaSBshUkFep3IO73h9SMHJw6M6/vKKFOVGqxtCYMd8lv+5eTfzaoJezeOiIsnJRafzt/u5FsQon4mzx121UPQlrKf3LNj7VTrlMpXttrAUlOLzUG1wTelIGzEqUIV6xqmzbyk9c/MR4Dmvq3CJ8q5mpAmyzZMufHwIDAQABoyEwHzAdBgNVHREEFjAUggdxb2FtLm5sggkqLnFvYW0ubmwwDQYJKoZIhvcNAQELBQADggEBAGZICIIb3zJL8af2x956KZqSJ5nFkdpTou3VO8HqCp4LpUt1xrWMtfvczJya+b/5l2qKsgHeA4+dR4GPvA1fARbnJjjPAEXiBue8hI6kdZi0QggeovpfuYqlPhpa//S7ofv0zlq9h08R/BW8r/BtjDL67cra17eGv+3RlqOZ7IEGPJHXnXRhzVUEi6iNlrlnEyyuT0A2IjkCWWUx3LfvIpNnWxhQxmciWgn+Fbj9etFO+gpEKSodCOF6k+ki5ieGL5KZvxypzNS0wAVOmUAbmtPU/3cyh7YRKDXawz5lZ6P0HQ2zwo2QgJ3iGZjNouxtd9dGnCt0sIpSoUZw6mYs+CM=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDQDCCAiigAwIBAgIJAJcxeRXdkrZFMA0GCSqGSIb3DQEBCwUAME4xCzAJBgNVBAYTAk5MMRAwDgYDVQQKEwdxb2FtLm5sMRAwDgYDVQQDEwdxb2FtLm5sMRswGQYJKoZIhvcNAQkBFgxpbmZvQHFvYW0ubmwwHhcNMTQwNDA0MDkzMjIwWhcNMjQwNDAxMDkzMjIwWjBOMQswCQYDVQQGEwJOTDEQMA4GA1UEChMHcW9hbS5ubDEQMA4GA1UEAxMHcW9hbS5ubDEbMBkGCSqGSIb3DQEJARYMaW5mb0Bxb2FtLm5sMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAy+ZlubUDIVxCkaxhs3JV4M6Yx7oOmmg6v2hPTTff1xhp1w5EjKK3lqHKsTafhR3XpgZEEyNu9Q5YDAh1wTXWxodz4tvkYIArggTAKwygMK88b4VsBqwRmySwc4e5GOhZEo4epdumAv0ZIjiGch2FQpu1HkjOODOAc9nxf22gYkgjxgDZy5whSsaSBshUkFep3IO73h9SMHJw6M6/vKKFOVGqxtCYMd8lv+5eTfzaoJezeOiIsnJRafzt/u5FsQon4mzx121UPQlrKf3LNj7VTrlMpXttrAUlOLzUG1wTelIGzEqUIV6xqmzbyk9c/MR4Dmvq3CJ8q5mpAmyzZMufHwIDAQABoyEwHzAdBgNVHREEFjAUggdxb2FtLm5sggkqLnFvYW0ubmwwDQYJKoZIhvcNAQELBQADggEBAGZICIIb3zJL8af2x956KZqSJ5nFkdpTou3VO8HqCp4LpUt1xrWMtfvczJya+b/5l2qKsgHeA4+dR4GPvA1fARbnJjjPAEXiBue8hI6kdZi0QggeovpfuYqlPhpa//S7ofv0zlq9h08R/BW8r/BtjDL67cra17eGv+3RlqOZ7IEGPJHXnXRhzVUEi6iNlrlnEyyuT0A2IjkCWWUx3LfvIpNnWxhQxmciWgn+Fbj9etFO+gpEKSodCOF6k+ki5ieGL5KZvxypzNS0wAVOmUAbmtPU/3cyh7YRKDXawz5lZ6P0HQ2zwo2QgJ3iGZjNouxtd9dGnCt0sIpSoUZw6mYs+CM=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.qoam.eu/saml/module.php/saml/sp/saml2-logout.php/qoam-wayf"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.qoam.eu/saml/module.php/saml/sp/saml2-acs.php/qoam-wayf" index="0"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.qoam.eu/saml/module.php/saml/sp/saml1-acs.php/qoam-wayf" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.qoam.eu/saml/module.php/saml/sp/saml2-acs.php/qoam-wayf" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.qoam.eu/saml/module.php/saml/sp/saml1-acs.php/qoam-wayf/artifact" index="3"/>
-    <md:AttributeConsumingService index="0">
-      <md:ServiceName xml:lang="en">QOAM</md:ServiceName>
-      <md:ServiceName xml:lang="nl">QOAM</md:ServiceName>
-      <md:ServiceDescription xml:lang="en">Quality Open Access Market is primarily for authors who want to publish their article in open access in a high quality journal and for a reasonable price.</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" isRequired="true"/>
-      <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="true"/>
-      <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" isRequired="true"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">QOAM</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">QOAM</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.qoam.eu</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Administrator</md:GivenName>
-    <md:EmailAddress>info@qoam.eu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Leo</md:GivenName>
-    <md:SurName>Waaijers</md:SurName>
-    <md:EmailAddress>leowaa@xs4all.nl</md:EmailAddress>
-    <md:TelephoneNumber>+31 24 36 17961</md:TelephoneNumber>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.qoam.eu.xml b/swamid-interfederations-2.0/www.qoam.eu.xml
deleted file mode 100644
index 33074fb8..00000000
--- a/swamid-interfederations-2.0/www.qoam.eu.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.qoam.eu/">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.surfconext.nl/" registrationInstant="2014-06-02T14:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://wiki.surfnetlabs.nl/display/eduGAIN/EduGAIN</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>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="en">QOAM - Quality Open Access Market</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Quality Open Access Market is primarily for authors who want to publish their article in open access in a high quality journal and for a reasonable price.</mdui:Description>
-        <mdui:InformationURL xml:lang="en">https://www.qoam.eu/oamarket/about</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://www.qoam.eu/oamarket/about#privacy</mdui:PrivacyStatementURL>
-        <mdui:Logo height="65" width="65">https://static.surfconext.nl/media/sp/OAmarket.png</mdui:Logo>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDQDCCAiigAwIBAgIJAJcxeRXdkrZFMA0GCSqGSIb3DQEBCwUAME4xCzAJBgNVBAYTAk5MMRAwDgYDVQQKEwdxb2FtLm5sMRAwDgYDVQQDEwdxb2FtLm5sMRswGQYJKoZIhvcNAQkBFgxpbmZvQHFvYW0ubmwwHhcNMTQwNDA0MDkzMjIwWhcNMjQwNDAxMDkzMjIwWjBOMQswCQYDVQQGEwJOTDEQMA4GA1UEChMHcW9hbS5ubDEQMA4GA1UEAxMHcW9hbS5ubDEbMBkGCSqGSIb3DQEJARYMaW5mb0Bxb2FtLm5sMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAy+ZlubUDIVxCkaxhs3JV4M6Yx7oOmmg6v2hPTTff1xhp1w5EjKK3lqHKsTafhR3XpgZEEyNu9Q5YDAh1wTXWxodz4tvkYIArggTAKwygMK88b4VsBqwRmySwc4e5GOhZEo4epdumAv0ZIjiGch2FQpu1HkjOODOAc9nxf22gYkgjxgDZy5whSsaSBshUkFep3IO73h9SMHJw6M6/vKKFOVGqxtCYMd8lv+5eTfzaoJezeOiIsnJRafzt/u5FsQon4mzx121UPQlrKf3LNj7VTrlMpXttrAUlOLzUG1wTelIGzEqUIV6xqmzbyk9c/MR4Dmvq3CJ8q5mpAmyzZMufHwIDAQABoyEwHzAdBgNVHREEFjAUggdxb2FtLm5sggkqLnFvYW0ubmwwDQYJKoZIhvcNAQELBQADggEBAGZICIIb3zJL8af2x956KZqSJ5nFkdpTou3VO8HqCp4LpUt1xrWMtfvczJya+b/5l2qKsgHeA4+dR4GPvA1fARbnJjjPAEXiBue8hI6kdZi0QggeovpfuYqlPhpa//S7ofv0zlq9h08R/BW8r/BtjDL67cra17eGv+3RlqOZ7IEGPJHXnXRhzVUEi6iNlrlnEyyuT0A2IjkCWWUx3LfvIpNnWxhQxmciWgn+Fbj9etFO+gpEKSodCOF6k+ki5ieGL5KZvxypzNS0wAVOmUAbmtPU/3cyh7YRKDXawz5lZ6P0HQ2zwo2QgJ3iGZjNouxtd9dGnCt0sIpSoUZw6mYs+CM=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDQDCCAiigAwIBAgIJAJcxeRXdkrZFMA0GCSqGSIb3DQEBCwUAME4xCzAJBgNVBAYTAk5MMRAwDgYDVQQKEwdxb2FtLm5sMRAwDgYDVQQDEwdxb2FtLm5sMRswGQYJKoZIhvcNAQkBFgxpbmZvQHFvYW0ubmwwHhcNMTQwNDA0MDkzMjIwWhcNMjQwNDAxMDkzMjIwWjBOMQswCQYDVQQGEwJOTDEQMA4GA1UEChMHcW9hbS5ubDEQMA4GA1UEAxMHcW9hbS5ubDEbMBkGCSqGSIb3DQEJARYMaW5mb0Bxb2FtLm5sMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAy+ZlubUDIVxCkaxhs3JV4M6Yx7oOmmg6v2hPTTff1xhp1w5EjKK3lqHKsTafhR3XpgZEEyNu9Q5YDAh1wTXWxodz4tvkYIArggTAKwygMK88b4VsBqwRmySwc4e5GOhZEo4epdumAv0ZIjiGch2FQpu1HkjOODOAc9nxf22gYkgjxgDZy5whSsaSBshUkFep3IO73h9SMHJw6M6/vKKFOVGqxtCYMd8lv+5eTfzaoJezeOiIsnJRafzt/u5FsQon4mzx121UPQlrKf3LNj7VTrlMpXttrAUlOLzUG1wTelIGzEqUIV6xqmzbyk9c/MR4Dmvq3CJ8q5mpAmyzZMufHwIDAQABoyEwHzAdBgNVHREEFjAUggdxb2FtLm5sggkqLnFvYW0ubmwwDQYJKoZIhvcNAQELBQADggEBAGZICIIb3zJL8af2x956KZqSJ5nFkdpTou3VO8HqCp4LpUt1xrWMtfvczJya+b/5l2qKsgHeA4+dR4GPvA1fARbnJjjPAEXiBue8hI6kdZi0QggeovpfuYqlPhpa//S7ofv0zlq9h08R/BW8r/BtjDL67cra17eGv+3RlqOZ7IEGPJHXnXRhzVUEi6iNlrlnEyyuT0A2IjkCWWUx3LfvIpNnWxhQxmciWgn+Fbj9etFO+gpEKSodCOF6k+ki5ieGL5KZvxypzNS0wAVOmUAbmtPU/3cyh7YRKDXawz5lZ6P0HQ2zwo2QgJ3iGZjNouxtd9dGnCt0sIpSoUZw6mYs+CM=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.qoam.eu/saml/module.php/saml/sp/saml2-logout.php/qoam-wayf"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.qoam.eu/saml/module.php/saml/sp/saml2-acs.php/qoam-wayf" index="0"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.qoam.eu/saml/module.php/saml/sp/saml1-acs.php/qoam-wayf" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.qoam.eu/saml/module.php/saml/sp/saml2-acs.php/qoam-wayf" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.qoam.eu/saml/module.php/saml/sp/saml1-acs.php/qoam-wayf/artifact" index="3"/>
-    <md:AttributeConsumingService index="0">
-      <md:ServiceName xml:lang="en">QOAM</md:ServiceName>
-      <md:ServiceName xml:lang="nl">QOAM</md:ServiceName>
-      <md:ServiceDescription xml:lang="en">Quality Open Access Market is primarily for authors who want to publish their article in open access in a high quality journal and for a reasonable price.</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" isRequired="true"/>
-      <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="true"/>
-      <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" isRequired="true"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">QOAM</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">QOAM</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.qoam.eu</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Administrator</md:GivenName>
-    <md:EmailAddress>info@qoam.eu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Leo</md:GivenName>
-    <md:SurName>Waaijers</md:SurName>
-    <md:EmailAddress>leowaa@xs4all.nl</md:EmailAddress>
-    <md:TelephoneNumber>+31 24 36 17961</md:TelephoneNumber>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.rediris.es-sir-rediristestidp.xml b/swamid-interfederations-2.0/www.rediris.es-sir-rediristestidp.xml
deleted file mode 100644
index 7caf6988..00000000
--- a/swamid-interfederations-2.0/www.rediris.es-sir-rediristestidp.xml
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.rediris.es/sir/rediristestidp">
-  <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">RedIRIS - Spanish Research and Academic Network</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="es">RedIRIS - Red académica y de investigación española</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Identity provider run by RedIRIS</mdui:Description>
-        <mdui:Description xml:lang="es">Proveedor de identidad 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>MIIEeTCCA2GgAwIBAgIQCP9faAGj247/+QVzgpX08zANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTEzMDcwMTAwMDAwMFoXDTE2MDYzMDIzNTk1OVowRDEhMB8GA1UE
-CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMR8wHQYDVQQDExZzYW1saWRwLnNp
-ci5yZWRpcmlzLmVzMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA5tO6
-tYAdozpFMDwS7QH1qm7eECkY05lG1sp14vcVOdyN0mAf8oai+M8dCQ5iyMxD/RaG
-oSmhXfHUvJ+0x8Cp/NHYbKr0cXskANcYTI0JFMFypn9Uac62CGxUYZRhHQ/2LxiE
-vzNgKrm2JiXCvOQbWrbg0sZDEsONv2G1Ln3fvOLiSiO1AjWLvOeYFPNgkNy5dxxt
-7ms7mZ0bFth6Cj38BBL0I1RebVnMgAKZWSgICUXDx35nkB+iLtidIykBgz92ZQ5h
-UrVNndP5+lraoMRuIewESSFt+LBYVeUZFTBGlupiUZ/bi7rhtIuhMM8ahaKIstbu
-IgfQBHPqRkkiiKOJawIDAQABo4IBczCCAW8wHwYDVR0jBBgwFoAUDL2TaAzz3quj
-SWsrN1dH6pDjue0wHQYDVR0OBBYEFARoBLDWcsveEZQhaMVIR9mmJkUkMA4GA1Ud
-DwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggr
-BgEFBQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNV
-HR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNT
-TENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQu
-dGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRw
-Oi8vb2NzcC50Y3MudGVyZW5hLm9yZzAhBgNVHREEGjAYghZzYW1saWRwLnNpci5y
-ZWRpcmlzLmVzMA0GCSqGSIb3DQEBBQUAA4IBAQB0gmr232YgpUC4HkwAHXaH91Zx
-8ZrwiEc8c4jGLh5VsaO0OqMfUEIXMuqZ+P9JNWVwlc6VLtmsypqTuqb9a06DS88q
-2o5sAUpbXZwhArhQs1bQnu5HJ6S84Ajn+NfMOyaO7NF8Colq/9lf3DihkT0jlD7i
-PHPMw2zauvtR/WPwdPszgfIOV/vkJ0rq9AjOXxSX7V2jpkxISGW/m93iahwXEoVF
-c8VXQhNjEfcm6uawmISjsyp6ta/U3e/8GJka2csDrF/bfipMBDSdWcLMscpYO8cb
-DC0L6vehZJ+lPz3wPH6YJmlstICZUdJIgDV3TUhmji6NNKa4p6by34QdYcDH</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>MIIEeTCCA2GgAwIBAgIQCP9faAGj247/+QVzgpX08zANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTEzMDcwMTAwMDAwMFoXDTE2MDYzMDIzNTk1OVowRDEhMB8GA1UE
-CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMR8wHQYDVQQDExZzYW1saWRwLnNp
-ci5yZWRpcmlzLmVzMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA5tO6
-tYAdozpFMDwS7QH1qm7eECkY05lG1sp14vcVOdyN0mAf8oai+M8dCQ5iyMxD/RaG
-oSmhXfHUvJ+0x8Cp/NHYbKr0cXskANcYTI0JFMFypn9Uac62CGxUYZRhHQ/2LxiE
-vzNgKrm2JiXCvOQbWrbg0sZDEsONv2G1Ln3fvOLiSiO1AjWLvOeYFPNgkNy5dxxt
-7ms7mZ0bFth6Cj38BBL0I1RebVnMgAKZWSgICUXDx35nkB+iLtidIykBgz92ZQ5h
-UrVNndP5+lraoMRuIewESSFt+LBYVeUZFTBGlupiUZ/bi7rhtIuhMM8ahaKIstbu
-IgfQBHPqRkkiiKOJawIDAQABo4IBczCCAW8wHwYDVR0jBBgwFoAUDL2TaAzz3quj
-SWsrN1dH6pDjue0wHQYDVR0OBBYEFARoBLDWcsveEZQhaMVIR9mmJkUkMA4GA1Ud
-DwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggr
-BgEFBQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNV
-HR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNT
-TENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQu
-dGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRw
-Oi8vb2NzcC50Y3MudGVyZW5hLm9yZzAhBgNVHREEGjAYghZzYW1saWRwLnNpci5y
-ZWRpcmlzLmVzMA0GCSqGSIb3DQEBBQUAA4IBAQB0gmr232YgpUC4HkwAHXaH91Zx
-8ZrwiEc8c4jGLh5VsaO0OqMfUEIXMuqZ+P9JNWVwlc6VLtmsypqTuqb9a06DS88q
-2o5sAUpbXZwhArhQs1bQnu5HJ6S84Ajn+NfMOyaO7NF8Colq/9lf3DihkT0jlD7i
-PHPMw2zauvtR/WPwdPszgfIOV/vkJ0rq9AjOXxSX7V2jpkxISGW/m93iahwXEoVF
-c8VXQhNjEfcm6uawmISjsyp6ta/U3e/8GJka2csDrF/bfipMBDSdWcLMscpYO8cb
-DC0L6vehZJ+lPz3wPH6YJmlstICZUdJIgDV3TUhmji6NNKa4p6by34QdYcDH</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sir.rediris.es/simplesamlphp/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://sir.rediris.es/simplesamlphp/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/www.rediris.es-sir-umaidp.xml b/swamid-interfederations-2.0/www.rediris.es-sir-umaidp.xml
deleted file mode 100644
index eac93c8d..00000000
--- a/swamid-interfederations-2.0/www.rediris.es-sir-umaidp.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.rediris.es/sir/umaidp">
-  <md:Extensions xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata">
-    <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>
-  <IDPSSODescriptor WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata">
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Universidad de Málaga</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="es">Universidad de Málaga</mdui:DisplayName>
-        <mdui:Description xml:lang="en">The Identity Provider of Universidad de Málaga</mdui:Description>
-        <mdui:Description xml:lang="es">El proveedor de identidad de la Universidad de Málaga</mdui:Description>
-      </mdui:UIInfo>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uma.es</shibmd:Scope>
-    </md:Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIIEeTCCA2GgAwIBAgIQCP9faAGj247/+QVzgpX08zANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTEzMDcwMTAwMDAwMFoXDTE2MDYzMDIzNTk1OVowRDEhMB8GA1UE
-CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMR8wHQYDVQQDExZzYW1saWRwLnNp
-ci5yZWRpcmlzLmVzMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA5tO6
-tYAdozpFMDwS7QH1qm7eECkY05lG1sp14vcVOdyN0mAf8oai+M8dCQ5iyMxD/RaG
-oSmhXfHUvJ+0x8Cp/NHYbKr0cXskANcYTI0JFMFypn9Uac62CGxUYZRhHQ/2LxiE
-vzNgKrm2JiXCvOQbWrbg0sZDEsONv2G1Ln3fvOLiSiO1AjWLvOeYFPNgkNy5dxxt
-7ms7mZ0bFth6Cj38BBL0I1RebVnMgAKZWSgICUXDx35nkB+iLtidIykBgz92ZQ5h
-UrVNndP5+lraoMRuIewESSFt+LBYVeUZFTBGlupiUZ/bi7rhtIuhMM8ahaKIstbu
-IgfQBHPqRkkiiKOJawIDAQABo4IBczCCAW8wHwYDVR0jBBgwFoAUDL2TaAzz3quj
-SWsrN1dH6pDjue0wHQYDVR0OBBYEFARoBLDWcsveEZQhaMVIR9mmJkUkMA4GA1Ud
-DwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggr
-BgEFBQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNV
-HR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNT
-TENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQu
-dGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRw
-Oi8vb2NzcC50Y3MudGVyZW5hLm9yZzAhBgNVHREEGjAYghZzYW1saWRwLnNpci5y
-ZWRpcmlzLmVzMA0GCSqGSIb3DQEBBQUAA4IBAQB0gmr232YgpUC4HkwAHXaH91Zx
-8ZrwiEc8c4jGLh5VsaO0OqMfUEIXMuqZ+P9JNWVwlc6VLtmsypqTuqb9a06DS88q
-2o5sAUpbXZwhArhQs1bQnu5HJ6S84Ajn+NfMOyaO7NF8Colq/9lf3DihkT0jlD7i
-PHPMw2zauvtR/WPwdPszgfIOV/vkJ0rq9AjOXxSX7V2jpkxISGW/m93iahwXEoVF
-c8VXQhNjEfcm6uawmISjsyp6ta/U3e/8GJka2csDrF/bfipMBDSdWcLMscpYO8cb
-DC0L6vehZJ+lPz3wPH6YJmlstICZUdJIgDV3TUhmji6NNKa4p6by34QdYcDH</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="http://sir.rediris.es/uma/saml2/idp/SingleLogoutService.php" ResponseLocation="http://sir.rediris.es/uma/saml2/idp/SingleLogoutService.php"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="http://sir.rediris.es/uma/shib13/idp/SSOService.php"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="http://sir.rediris.es/uma/saml2/idp/SSOService.php"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="http://sir.rediris.es/uma/shib13/idp/aa.php"/>
-  </AttributeAuthorityDescriptor>
-  <md:Organization xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata">
-    <md:OrganizationName xml:lang="en">RedIRIS</md:OrganizationName>
-    <md:OrganizationName xml:lang="es">RedIRIS</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">University of Malaga</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="es">Universidad de Málaga</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 xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
-    <md:GivenName>SIR helpdesk</md:GivenName>
-    <md:EmailAddress>sir@rediris.es</md:EmailAddress>
-  </md:ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.rediris.es-sir-unedidp.xml b/swamid-interfederations-2.0/www.rediris.es-sir-unedidp.xml
deleted file mode 100644
index a34f5f55..00000000
--- a/swamid-interfederations-2.0/www.rediris.es-sir-unedidp.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.rediris.es/sir/unedidp">
-  <md:Extensions xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata">
-    <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>
-  <IDPSSODescriptor WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata">
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">UNED - National Distance Education University</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="es">UNED - Universidad Nacional de Educación a Distancia</mdui:DisplayName>
-        <mdui:Description xml:lang="en">The Identity Provider of UNED</mdui:Description>
-        <mdui:Description xml:lang="es">El proveedor de identidad de UNED</mdui:Description>
-      </mdui:UIInfo>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uned.es</shibmd:Scope>
-    </md:Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIIEeTCCA2GgAwIBAgIQCP9faAGj247/+QVzgpX08zANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTEzMDcwMTAwMDAwMFoXDTE2MDYzMDIzNTk1OVowRDEhMB8GA1UE
-CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMR8wHQYDVQQDExZzYW1saWRwLnNp
-ci5yZWRpcmlzLmVzMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA5tO6
-tYAdozpFMDwS7QH1qm7eECkY05lG1sp14vcVOdyN0mAf8oai+M8dCQ5iyMxD/RaG
-oSmhXfHUvJ+0x8Cp/NHYbKr0cXskANcYTI0JFMFypn9Uac62CGxUYZRhHQ/2LxiE
-vzNgKrm2JiXCvOQbWrbg0sZDEsONv2G1Ln3fvOLiSiO1AjWLvOeYFPNgkNy5dxxt
-7ms7mZ0bFth6Cj38BBL0I1RebVnMgAKZWSgICUXDx35nkB+iLtidIykBgz92ZQ5h
-UrVNndP5+lraoMRuIewESSFt+LBYVeUZFTBGlupiUZ/bi7rhtIuhMM8ahaKIstbu
-IgfQBHPqRkkiiKOJawIDAQABo4IBczCCAW8wHwYDVR0jBBgwFoAUDL2TaAzz3quj
-SWsrN1dH6pDjue0wHQYDVR0OBBYEFARoBLDWcsveEZQhaMVIR9mmJkUkMA4GA1Ud
-DwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggr
-BgEFBQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNV
-HR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNT
-TENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQu
-dGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRw
-Oi8vb2NzcC50Y3MudGVyZW5hLm9yZzAhBgNVHREEGjAYghZzYW1saWRwLnNpci5y
-ZWRpcmlzLmVzMA0GCSqGSIb3DQEBBQUAA4IBAQB0gmr232YgpUC4HkwAHXaH91Zx
-8ZrwiEc8c4jGLh5VsaO0OqMfUEIXMuqZ+P9JNWVwlc6VLtmsypqTuqb9a06DS88q
-2o5sAUpbXZwhArhQs1bQnu5HJ6S84Ajn+NfMOyaO7NF8Colq/9lf3DihkT0jlD7i
-PHPMw2zauvtR/WPwdPszgfIOV/vkJ0rq9AjOXxSX7V2jpkxISGW/m93iahwXEoVF
-c8VXQhNjEfcm6uawmISjsyp6ta/U3e/8GJka2csDrF/bfipMBDSdWcLMscpYO8cb
-DC0L6vehZJ+lPz3wPH6YJmlstICZUdJIgDV3TUhmji6NNKa4p6by34QdYcDH</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="http://sir.rediris.es/uned/saml2/idp/SingleLogoutService.php" ResponseLocation="http://sir.rediris.es/uned/saml2/idp/SingleLogoutService.php"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="http://sir.rediris.es/uned/shib13/idp/SSOService.php"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="http://sir.rediris.es/uned/saml2/idp/SSOService.php"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="http://sir.rediris.es/uned/shib13/idp/aa.php"/>
-  </AttributeAuthorityDescriptor>
-  <md:Organization xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata">
-    <md:OrganizationName xml:lang="en">UNED</md:OrganizationName>
-    <md:OrganizationName xml:lang="es">UNED</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Universidad Nacional de Educación a Distancia</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="es">National Distance Education University</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 xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
-    <md:GivenName>SIR helpdesk</md:GivenName>
-    <md:EmailAddress>sir@rediris.es</md:EmailAddress>
-  </md:ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.rediris.es-sir-uocidp.xml b/swamid-interfederations-2.0/www.rediris.es-sir-uocidp.xml
deleted file mode 100644
index 760c0822..00000000
--- a/swamid-interfederations-2.0/www.rediris.es-sir-uocidp.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.rediris.es/sir/uocidp">
-  <md:Extensions xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata">
-    <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>
-  <IDPSSODescriptor WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata">
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">UOC - Universitat Oberta de Catalunya</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="es">UOC - Universitat Oberta de Catalunya</mdui:DisplayName>
-        <mdui:Description xml:lang="en">UOC Identity Provider</mdui:Description>
-        <mdui:Description xml:lang="es">Proveedor de identidad de UOC</mdui:Description>
-      </mdui:UIInfo>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uoc.edu</shibmd:Scope>
-    </md:Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIIEeTCCA2GgAwIBAgIQCP9faAGj247/+QVzgpX08zANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTEzMDcwMTAwMDAwMFoXDTE2MDYzMDIzNTk1OVowRDEhMB8GA1UE
-CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMR8wHQYDVQQDExZzYW1saWRwLnNp
-ci5yZWRpcmlzLmVzMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA5tO6
-tYAdozpFMDwS7QH1qm7eECkY05lG1sp14vcVOdyN0mAf8oai+M8dCQ5iyMxD/RaG
-oSmhXfHUvJ+0x8Cp/NHYbKr0cXskANcYTI0JFMFypn9Uac62CGxUYZRhHQ/2LxiE
-vzNgKrm2JiXCvOQbWrbg0sZDEsONv2G1Ln3fvOLiSiO1AjWLvOeYFPNgkNy5dxxt
-7ms7mZ0bFth6Cj38BBL0I1RebVnMgAKZWSgICUXDx35nkB+iLtidIykBgz92ZQ5h
-UrVNndP5+lraoMRuIewESSFt+LBYVeUZFTBGlupiUZ/bi7rhtIuhMM8ahaKIstbu
-IgfQBHPqRkkiiKOJawIDAQABo4IBczCCAW8wHwYDVR0jBBgwFoAUDL2TaAzz3quj
-SWsrN1dH6pDjue0wHQYDVR0OBBYEFARoBLDWcsveEZQhaMVIR9mmJkUkMA4GA1Ud
-DwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggr
-BgEFBQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNV
-HR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNT
-TENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQu
-dGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRw
-Oi8vb2NzcC50Y3MudGVyZW5hLm9yZzAhBgNVHREEGjAYghZzYW1saWRwLnNpci5y
-ZWRpcmlzLmVzMA0GCSqGSIb3DQEBBQUAA4IBAQB0gmr232YgpUC4HkwAHXaH91Zx
-8ZrwiEc8c4jGLh5VsaO0OqMfUEIXMuqZ+P9JNWVwlc6VLtmsypqTuqb9a06DS88q
-2o5sAUpbXZwhArhQs1bQnu5HJ6S84Ajn+NfMOyaO7NF8Colq/9lf3DihkT0jlD7i
-PHPMw2zauvtR/WPwdPszgfIOV/vkJ0rq9AjOXxSX7V2jpkxISGW/m93iahwXEoVF
-c8VXQhNjEfcm6uawmISjsyp6ta/U3e/8GJka2csDrF/bfipMBDSdWcLMscpYO8cb
-DC0L6vehZJ+lPz3wPH6YJmlstICZUdJIgDV3TUhmji6NNKa4p6by34QdYcDH</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="http://sir.rediris.es/uoc/saml2/idp/SingleLogoutService.php" ResponseLocation="http://sir.rediris.es/uoc/saml2/idp/SingleLogoutService.php"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="http://sir.rediris.es/uoc/shib13/idp/SSOService.php"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="http://sir.rediris.es/uoc/saml2/idp/SSOService.php"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="http://sir.rediris.es/uoc/shib13/idp/aa.php"/>
-  </AttributeAuthorityDescriptor>
-  <md:Organization xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata">
-    <md:OrganizationName xml:lang="en">UOC</md:OrganizationName>
-    <md:OrganizationName xml:lang="es">UOC</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">UOC - Universitat Oberta de Catalunya</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="es">UOC - Universitat Oberta de Catalunya</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 xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
-    <md:GivenName>SIR helpdesk</md:GivenName>
-    <md:EmailAddress>sir@rediris.es</md:EmailAddress>
-  </md:ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.rediris.es-sir-urvidp.xml b/swamid-interfederations-2.0/www.rediris.es-sir-urvidp.xml
deleted file mode 100644
index 57083f85..00000000
--- a/swamid-interfederations-2.0/www.rediris.es-sir-urvidp.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.rediris.es/sir/urvidp">
-  <md:Extensions xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata">
-    <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>
-  <IDPSSODescriptor WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata">
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">URV - Rovira i Virgili University</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="es">URV - Universidad Rovira i Virgili</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="ca">URV - Universitat Rovira i Virgili</mdui:DisplayName>
-        <mdui:Description xml:lang="en">The Identity Provider of URV</mdui:Description>
-        <mdui:Description xml:lang="es">El proveedor de identidad de URV</mdui:Description>
-      </mdui:UIInfo>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">urv.cat</shibmd:Scope>
-    </md:Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIIEeTCCA2GgAwIBAgIQCP9faAGj247/+QVzgpX08zANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTEzMDcwMTAwMDAwMFoXDTE2MDYzMDIzNTk1OVowRDEhMB8GA1UE
-CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMR8wHQYDVQQDExZzYW1saWRwLnNp
-ci5yZWRpcmlzLmVzMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA5tO6
-tYAdozpFMDwS7QH1qm7eECkY05lG1sp14vcVOdyN0mAf8oai+M8dCQ5iyMxD/RaG
-oSmhXfHUvJ+0x8Cp/NHYbKr0cXskANcYTI0JFMFypn9Uac62CGxUYZRhHQ/2LxiE
-vzNgKrm2JiXCvOQbWrbg0sZDEsONv2G1Ln3fvOLiSiO1AjWLvOeYFPNgkNy5dxxt
-7ms7mZ0bFth6Cj38BBL0I1RebVnMgAKZWSgICUXDx35nkB+iLtidIykBgz92ZQ5h
-UrVNndP5+lraoMRuIewESSFt+LBYVeUZFTBGlupiUZ/bi7rhtIuhMM8ahaKIstbu
-IgfQBHPqRkkiiKOJawIDAQABo4IBczCCAW8wHwYDVR0jBBgwFoAUDL2TaAzz3quj
-SWsrN1dH6pDjue0wHQYDVR0OBBYEFARoBLDWcsveEZQhaMVIR9mmJkUkMA4GA1Ud
-DwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggr
-BgEFBQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNV
-HR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNT
-TENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQu
-dGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRw
-Oi8vb2NzcC50Y3MudGVyZW5hLm9yZzAhBgNVHREEGjAYghZzYW1saWRwLnNpci5y
-ZWRpcmlzLmVzMA0GCSqGSIb3DQEBBQUAA4IBAQB0gmr232YgpUC4HkwAHXaH91Zx
-8ZrwiEc8c4jGLh5VsaO0OqMfUEIXMuqZ+P9JNWVwlc6VLtmsypqTuqb9a06DS88q
-2o5sAUpbXZwhArhQs1bQnu5HJ6S84Ajn+NfMOyaO7NF8Colq/9lf3DihkT0jlD7i
-PHPMw2zauvtR/WPwdPszgfIOV/vkJ0rq9AjOXxSX7V2jpkxISGW/m93iahwXEoVF
-c8VXQhNjEfcm6uawmISjsyp6ta/U3e/8GJka2csDrF/bfipMBDSdWcLMscpYO8cb
-DC0L6vehZJ+lPz3wPH6YJmlstICZUdJIgDV3TUhmji6NNKa4p6by34QdYcDH</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="http://sir.rediris.es/urv/saml2/idp/SingleLogoutService.php" ResponseLocation="http://sir.rediris.es/urv/saml2/idp/SingleLogoutService.php"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="http://sir.rediris.es/urv/shib13/idp/SSOService.php"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="http://sir.rediris.es/urv/saml2/idp/SSOService.php"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="http://sir.rediris.es/urv/shib13/idp/aa.php"/>
-  </AttributeAuthorityDescriptor>
-  <md:Organization xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata">
-    <md:OrganizationName xml:lang="en">URV</md:OrganizationName>
-    <md:OrganizationName xml:lang="es">URV</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Rovira i Virgili University</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="es">Universidad Rovira i Virgili</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="ca">Universitat Rovira i Virgili</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 xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
-    <md:GivenName>SIR helpdesk</md:GivenName>
-    <md:EmailAddress>sir@rediris.es</md:EmailAddress>
-  </md:ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.rediris.es.xml b/swamid-interfederations-2.0/www.rediris.es.xml
deleted file mode 100644
index 57083f85..00000000
--- a/swamid-interfederations-2.0/www.rediris.es.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.rediris.es/sir/urvidp">
-  <md:Extensions xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata">
-    <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>
-  <IDPSSODescriptor WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata">
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">URV - Rovira i Virgili University</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="es">URV - Universidad Rovira i Virgili</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="ca">URV - Universitat Rovira i Virgili</mdui:DisplayName>
-        <mdui:Description xml:lang="en">The Identity Provider of URV</mdui:Description>
-        <mdui:Description xml:lang="es">El proveedor de identidad de URV</mdui:Description>
-      </mdui:UIInfo>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">urv.cat</shibmd:Scope>
-    </md:Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIIEeTCCA2GgAwIBAgIQCP9faAGj247/+QVzgpX08zANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTEzMDcwMTAwMDAwMFoXDTE2MDYzMDIzNTk1OVowRDEhMB8GA1UE
-CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMR8wHQYDVQQDExZzYW1saWRwLnNp
-ci5yZWRpcmlzLmVzMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA5tO6
-tYAdozpFMDwS7QH1qm7eECkY05lG1sp14vcVOdyN0mAf8oai+M8dCQ5iyMxD/RaG
-oSmhXfHUvJ+0x8Cp/NHYbKr0cXskANcYTI0JFMFypn9Uac62CGxUYZRhHQ/2LxiE
-vzNgKrm2JiXCvOQbWrbg0sZDEsONv2G1Ln3fvOLiSiO1AjWLvOeYFPNgkNy5dxxt
-7ms7mZ0bFth6Cj38BBL0I1RebVnMgAKZWSgICUXDx35nkB+iLtidIykBgz92ZQ5h
-UrVNndP5+lraoMRuIewESSFt+LBYVeUZFTBGlupiUZ/bi7rhtIuhMM8ahaKIstbu
-IgfQBHPqRkkiiKOJawIDAQABo4IBczCCAW8wHwYDVR0jBBgwFoAUDL2TaAzz3quj
-SWsrN1dH6pDjue0wHQYDVR0OBBYEFARoBLDWcsveEZQhaMVIR9mmJkUkMA4GA1Ud
-DwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggr
-BgEFBQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNV
-HR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNT
-TENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQu
-dGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRw
-Oi8vb2NzcC50Y3MudGVyZW5hLm9yZzAhBgNVHREEGjAYghZzYW1saWRwLnNpci5y
-ZWRpcmlzLmVzMA0GCSqGSIb3DQEBBQUAA4IBAQB0gmr232YgpUC4HkwAHXaH91Zx
-8ZrwiEc8c4jGLh5VsaO0OqMfUEIXMuqZ+P9JNWVwlc6VLtmsypqTuqb9a06DS88q
-2o5sAUpbXZwhArhQs1bQnu5HJ6S84Ajn+NfMOyaO7NF8Colq/9lf3DihkT0jlD7i
-PHPMw2zauvtR/WPwdPszgfIOV/vkJ0rq9AjOXxSX7V2jpkxISGW/m93iahwXEoVF
-c8VXQhNjEfcm6uawmISjsyp6ta/U3e/8GJka2csDrF/bfipMBDSdWcLMscpYO8cb
-DC0L6vehZJ+lPz3wPH6YJmlstICZUdJIgDV3TUhmji6NNKa4p6by34QdYcDH</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="http://sir.rediris.es/urv/saml2/idp/SingleLogoutService.php" ResponseLocation="http://sir.rediris.es/urv/saml2/idp/SingleLogoutService.php"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="http://sir.rediris.es/urv/shib13/idp/SSOService.php"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="http://sir.rediris.es/urv/saml2/idp/SSOService.php"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="http://sir.rediris.es/urv/shib13/idp/aa.php"/>
-  </AttributeAuthorityDescriptor>
-  <md:Organization xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata">
-    <md:OrganizationName xml:lang="en">URV</md:OrganizationName>
-    <md:OrganizationName xml:lang="es">URV</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Rovira i Virgili University</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="es">Universidad Rovira i Virgili</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="ca">Universitat Rovira i Virgili</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 xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
-    <md:GivenName>SIR helpdesk</md:GivenName>
-    <md:EmailAddress>sir@rediris.es</md:EmailAddress>
-  </md:ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.researchprofessional.com-shibboleth.xml b/swamid-interfederations-2.0/www.researchprofessional.com-shibboleth.xml
deleted file mode 100644
index 5713a3c1..00000000
--- a/swamid-interfederations-2.0/www.researchprofessional.com-shibboleth.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://www.researchprofessional.com/shibboleth">
-  <!--
-		This is a Shibboleth SP for Research Research Ltd.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-07-25T09:10:08Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <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/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>
-      <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.researchprofessional.com/Shibboleth.sso/Login"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:Logo height="35" width="280">https://www.researchprofessional.com/images/header-logo.png</mdui:Logo>
-        <mdui:DisplayName xml:lang="en">Research Professional</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Research Professional is an intuitive platform
-					for online access to news and funding services.</mdui:Description>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIID6jCCAtKgAwIBAgIJALmfy/1EwX4NMA0GCSqGSIb3DQEBBQUAMHYxCzAJBgNV
-						BAYTAkdCMRcwFQYDVQQIEw5HcmVhdGVyIExvbmRvbjEPMA0GA1UEBxMGTG9uZG9u
-						MRYwFAYDVQQKEw1SZXNlYXJjaCBMdGQuMSUwIwYDVQQDExx3d3cucmVzZWFyY2hw
-						cm9mZXNzaW9uYWwuY29tMB4XDTEzMDcyNDExMTUzNFoXDTIzMDcyMjExMTUzNFow
-						djELMAkGA1UEBhMCR0IxFzAVBgNVBAgTDkdyZWF0ZXIgTG9uZG9uMQ8wDQYDVQQH
-						EwZMb25kb24xFjAUBgNVBAoTDVJlc2VhcmNoIEx0ZC4xJTAjBgNVBAMTHHd3dy5y
-						ZXNlYXJjaHByb2Zlc3Npb25hbC5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
-						ggEKAoIBAQDr6isqSDUBMLp8dqaP5zhEJ4IF+cOm46VCvsH7gLkSRPiU8SXuosB9
-						o8wcHQD4SRzdZueZ/8Pv9Dq86+d+jih2wzBzIr1ZQmwCYKdCeuVQ/NrFYOW/K/zJ
-						HI2D8wWdnMRbDHQbBnpLIiI9AeNE3DlzerFfeqXc/amrlaWgCm7oKIfmn5diJmKm
-						0qwlPuHyzCh4qwRPvFofSkuyOTzjdEhuYPoJ/GDuwQOWKzvRrwyr2LNywbesRG76
-						Erlw/jIfEld8FlJjAvAkDWpR4ZJM+K1/Gnrw/emGJbTULj5rV4tqtcRDkkzxvJlo
-						P8tmBdTTFeQKa8fAN8TdqJz5nTA1noP1AgMBAAGjezB5MAkGA1UdEwQCMAAwLAYJ
-						YIZIAYb4QgENBB8WHU9wZW5TU0wgR2VuZXJhdGVkIENlcnRpZmljYXRlMB0GA1Ud
-						DgQWBBRkhl/nawpdfr1xWIgUhBkBU0z8EzAfBgNVHSMEGDAWgBRkhl/nawpdfr1x
-						WIgUhBkBU0z8EzANBgkqhkiG9w0BAQUFAAOCAQEA3rqSgq+7fQHLsQSuSZ5ZAXa5
-						iiah5Lh0nrwNAnx4NNiRo/XreA4zS27f58BWZjETCv7X8phegFLKZawe87VrHiUT
-						cktHPT1yD6LFvB/iw6KR/lmH0ssrHtXpag5V6vQVheU01kxmE1TrVqdlxR3aBX87
-						AScHf43WyOPMzr798LFCOm/RFwEUYhZMtp9DMf9SOUtOA0OrZHv6AP5kclGZkq4+
-						w56TWc4NlFDMfqvwFqedywQyt+FVLNJ3H3Gt3KXpootbOZBmtzd8Bsf/5/SevgkS
-						tgwZBKIPISvO0cHB2chZHzDJI9PQsgD0OmVfHqQtlwuMw32qK2EcD1NC/VZZ/w==
-					</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/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-1_5"/>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.researchprofessional.com/Shibboleth.sso/Artifact/SOAP" index="0"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.researchprofessional.com/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.researchprofessional.com/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.researchprofessional.com/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.researchprofessional.com/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.researchprofessional.com/Shibboleth.sso/SAML2/POST" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.researchprofessional.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.researchprofessional.com/Shibboleth.sso/SAML2/Artifact" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.researchprofessional.com/Shibboleth.sso/SAML2/ECP" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.researchprofessional.com/Shibboleth.sso/SAML/POST" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.researchprofessional.com/Shibboleth.sso/SAML/Artifact" index="5"/>
-    <AttributeConsumingService index="1">
-      <ServiceName xml:lang="en">Research Professional</ServiceName>
-      <RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:mace:dir:attribute-def:eduPersonPrincipalName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace: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="false"/>
-      <RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:mace:dir:attribute-def:eduPersonTargetedID" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri" isRequired="false"/>
-      <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" isRequired="false"/>
-      <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="employeeID" Name="urn:oid:1.2.840.113556.1.4.35" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-    </AttributeConsumingService>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Research Research Ltd</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Research Professional</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.researchresearch.com/rp</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Steve</GivenName>
-    <SurName>Potter</SurName>
-    <EmailAddress>mailto:sp@researchresearch.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Steve</GivenName>
-    <SurName>Potter</SurName>
-    <EmailAddress>mailto:sso-uk@researchresearch.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.researchprofessional.com.xml b/swamid-interfederations-2.0/www.researchprofessional.com.xml
deleted file mode 100644
index 5713a3c1..00000000
--- a/swamid-interfederations-2.0/www.researchprofessional.com.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://www.researchprofessional.com/shibboleth">
-  <!--
-		This is a Shibboleth SP for Research Research Ltd.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-07-25T09:10:08Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <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/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>
-      <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.researchprofessional.com/Shibboleth.sso/Login"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:Logo height="35" width="280">https://www.researchprofessional.com/images/header-logo.png</mdui:Logo>
-        <mdui:DisplayName xml:lang="en">Research Professional</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Research Professional is an intuitive platform
-					for online access to news and funding services.</mdui:Description>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIID6jCCAtKgAwIBAgIJALmfy/1EwX4NMA0GCSqGSIb3DQEBBQUAMHYxCzAJBgNV
-						BAYTAkdCMRcwFQYDVQQIEw5HcmVhdGVyIExvbmRvbjEPMA0GA1UEBxMGTG9uZG9u
-						MRYwFAYDVQQKEw1SZXNlYXJjaCBMdGQuMSUwIwYDVQQDExx3d3cucmVzZWFyY2hw
-						cm9mZXNzaW9uYWwuY29tMB4XDTEzMDcyNDExMTUzNFoXDTIzMDcyMjExMTUzNFow
-						djELMAkGA1UEBhMCR0IxFzAVBgNVBAgTDkdyZWF0ZXIgTG9uZG9uMQ8wDQYDVQQH
-						EwZMb25kb24xFjAUBgNVBAoTDVJlc2VhcmNoIEx0ZC4xJTAjBgNVBAMTHHd3dy5y
-						ZXNlYXJjaHByb2Zlc3Npb25hbC5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
-						ggEKAoIBAQDr6isqSDUBMLp8dqaP5zhEJ4IF+cOm46VCvsH7gLkSRPiU8SXuosB9
-						o8wcHQD4SRzdZueZ/8Pv9Dq86+d+jih2wzBzIr1ZQmwCYKdCeuVQ/NrFYOW/K/zJ
-						HI2D8wWdnMRbDHQbBnpLIiI9AeNE3DlzerFfeqXc/amrlaWgCm7oKIfmn5diJmKm
-						0qwlPuHyzCh4qwRPvFofSkuyOTzjdEhuYPoJ/GDuwQOWKzvRrwyr2LNywbesRG76
-						Erlw/jIfEld8FlJjAvAkDWpR4ZJM+K1/Gnrw/emGJbTULj5rV4tqtcRDkkzxvJlo
-						P8tmBdTTFeQKa8fAN8TdqJz5nTA1noP1AgMBAAGjezB5MAkGA1UdEwQCMAAwLAYJ
-						YIZIAYb4QgENBB8WHU9wZW5TU0wgR2VuZXJhdGVkIENlcnRpZmljYXRlMB0GA1Ud
-						DgQWBBRkhl/nawpdfr1xWIgUhBkBU0z8EzAfBgNVHSMEGDAWgBRkhl/nawpdfr1x
-						WIgUhBkBU0z8EzANBgkqhkiG9w0BAQUFAAOCAQEA3rqSgq+7fQHLsQSuSZ5ZAXa5
-						iiah5Lh0nrwNAnx4NNiRo/XreA4zS27f58BWZjETCv7X8phegFLKZawe87VrHiUT
-						cktHPT1yD6LFvB/iw6KR/lmH0ssrHtXpag5V6vQVheU01kxmE1TrVqdlxR3aBX87
-						AScHf43WyOPMzr798LFCOm/RFwEUYhZMtp9DMf9SOUtOA0OrZHv6AP5kclGZkq4+
-						w56TWc4NlFDMfqvwFqedywQyt+FVLNJ3H3Gt3KXpootbOZBmtzd8Bsf/5/SevgkS
-						tgwZBKIPISvO0cHB2chZHzDJI9PQsgD0OmVfHqQtlwuMw32qK2EcD1NC/VZZ/w==
-					</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/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-1_5"/>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.researchprofessional.com/Shibboleth.sso/Artifact/SOAP" index="0"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.researchprofessional.com/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.researchprofessional.com/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.researchprofessional.com/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.researchprofessional.com/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.researchprofessional.com/Shibboleth.sso/SAML2/POST" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.researchprofessional.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.researchprofessional.com/Shibboleth.sso/SAML2/Artifact" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.researchprofessional.com/Shibboleth.sso/SAML2/ECP" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.researchprofessional.com/Shibboleth.sso/SAML/POST" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.researchprofessional.com/Shibboleth.sso/SAML/Artifact" index="5"/>
-    <AttributeConsumingService index="1">
-      <ServiceName xml:lang="en">Research Professional</ServiceName>
-      <RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:mace:dir:attribute-def:eduPersonPrincipalName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace: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="false"/>
-      <RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:mace:dir:attribute-def:eduPersonTargetedID" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri" isRequired="false"/>
-      <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" isRequired="false"/>
-      <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="employeeID" Name="urn:oid:1.2.840.113556.1.4.35" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-    </AttributeConsumingService>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Research Research Ltd</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Research Professional</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.researchresearch.com/rp</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Steve</GivenName>
-    <SurName>Potter</SurName>
-    <EmailAddress>mailto:sp@researchresearch.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Steve</GivenName>
-    <SurName>Potter</SurName>
-    <EmailAddress>mailto:sso-uk@researchresearch.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.scran.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/www.scran.ac.uk-shibboleth.xml
deleted file mode 100644
index 62c6ab3a..00000000
--- a/swamid-interfederations-2.0/www.scran.ac.uk-shibboleth.xml
+++ /dev/null
@@ -1,135 +0,0 @@
-<?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"/>
-      <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://shib.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://shib.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://shib.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://shib.scran.ac.uk/Shibboleth.sso/DS/UKFederation" index="2"/>
-    </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"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.scran.ac.uk/Shibboleth.sso/Artifact/SOAP" index="2"/>
-    <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"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.scran.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.scran.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.scran.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shib.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"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.scran.ac.uk/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.scran.ac.uk/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.scran.ac.uk/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shib.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"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.scran.ac.uk/Shibboleth.sso/SAML2/POST" index="7"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib.scran.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="8"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shib.scran.ac.uk/Shibboleth.sso/SAML2/Artifact" index="9"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shib.scran.ac.uk/Shibboleth.sso/SAML2/ECP" index="10"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shib.scran.ac.uk/Shibboleth.sso/SAML/POST" index="11"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shib.scran.ac.uk/Shibboleth.sso/SAML/Artifact" index="12"/>
-    <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.scran.ac.uk.xml b/swamid-interfederations-2.0/www.scran.ac.uk.xml
deleted file mode 100644
index 62c6ab3a..00000000
--- a/swamid-interfederations-2.0/www.scran.ac.uk.xml
+++ /dev/null
@@ -1,135 +0,0 @@
-<?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"/>
-      <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://shib.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://shib.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://shib.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://shib.scran.ac.uk/Shibboleth.sso/DS/UKFederation" index="2"/>
-    </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"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.scran.ac.uk/Shibboleth.sso/Artifact/SOAP" index="2"/>
-    <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"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.scran.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.scran.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.scran.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shib.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"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.scran.ac.uk/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.scran.ac.uk/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.scran.ac.uk/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shib.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"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.scran.ac.uk/Shibboleth.sso/SAML2/POST" index="7"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib.scran.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="8"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shib.scran.ac.uk/Shibboleth.sso/SAML2/Artifact" index="9"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shib.scran.ac.uk/Shibboleth.sso/SAML2/ECP" index="10"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shib.scran.ac.uk/Shibboleth.sso/SAML/POST" index="11"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shib.scran.ac.uk/Shibboleth.sso/SAML/Artifact" index="12"/>
-    <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.sso.uni-erlangen.de-simplesaml-saml2-idp-metadata.php.xml b/swamid-interfederations-2.0/www.sso.uni-erlangen.de-simplesaml-saml2-idp-metadata.php.xml
deleted file mode 100644
index 6b1694cc..00000000
--- a/swamid-interfederations-2.0/www.sso.uni-erlangen.de-simplesaml-saml2-idp-metadata.php.xml
+++ /dev/null
@@ -1,88 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.sso.uni-erlangen.de/simplesaml/saml2/idp/metadata.php">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2010-08-11T14:59:01Z">
-      <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-erlangen.de</saml1md:Scope>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">fau.de</saml1md:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="de">Universität Erlangen-Nürnberg</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Universität Erlangen-Nürnberg</mdui:DisplayName>
-        <mdui:Description xml:lang="de">Identity Provider der Universität Erlangen-Nürnberg</mdui:Description>
-        <mdui:Description xml:lang="en">Identity Provider der Universität Erlangen-Nürnberg</mdui:Description>
-        <mdui:InformationURL xml:lang="de">https://www.sso.uni-erlangen.de</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">https://www.sso.uni-erlangen.de</mdui:InformationURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>www.sso.fau.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=www.sso.fau.de,OU=Regionales Rechenzentrum Erlangen (RRZE),O=Universitaet Erlangen-Nuernberg,L=Erlangen,ST=Bayern,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIHCTCCBfGgAwIBAgIHFVh6d4xjCjANBgkqhkiG9w0BAQUFADCBozELMAkGA1UE
-BhMCREUxDzANBgNVBAgTBkJheWVybjERMA8GA1UEBxMIRXJsYW5nZW4xKDAmBgNV
-BAoTH1VuaXZlcnNpdGFldCBFcmxhbmdlbi1OdWVybmJlcmcxDTALBgNVBAsTBFJS
-WkUxDzANBgNVBAMTBkZBVS1DQTEmMCQGCSqGSIb3DQEJARYXY2FAcnJ6ZS51bmkt
-ZXJsYW5nZW4uZGUwHhcNMTMwMzA3MjA0NzM2WhcNMTgwMzA2MjA0NzM2WjCBpzEL
-MAkGA1UEBhMCREUxDzANBgNVBAgTBkJheWVybjERMA8GA1UEBxMIRXJsYW5nZW4x
-KDAmBgNVBAoTH1VuaXZlcnNpdGFldCBFcmxhbmdlbi1OdWVybmJlcmcxMTAvBgNV
-BAsTKFJlZ2lvbmFsZXMgUmVjaGVuemVudHJ1bSBFcmxhbmdlbiAoUlJaRSkxFzAV
-BgNVBAMTDnd3dy5zc28uZmF1LmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
-CgKCAQEAs/qsX/p+z8uxh3feD2sZWdb/NpOI5/YkPeXYQPQAdlRKBijHLohlLRAz
-CNFU7YWhy/FxY4uLE97h0hPVpoxCPlOW5qh56C1ZEWGBdhJImfYpzJbB2UIIUUR2
-WXLjZPyQObzxocui2M3XWa/uhpc3nPvBC/HLzr4fbU0f20D9hr0MXFurfuhGID+j
-t1jRsVWTjMWEVDAXDduKYUCAqrp1RlSc/H6z4WFeiQ92+4Q/+axig6KRkg0e0LBh
-MDA3ozIODmfFDIuo++rGvHWG47GLbLQyJLLeGkPlxxqo8uvVhtENxd5jrIkZrRd8
-y+dFr+jRh36DMmJGTzVkeweZPT2ZpQIDAQABo4IDOjCCAzYwOQYDVR0gBDIwMDAR
-Bg8rBgEEAYGtIYIsAQEEAwAwEQYPKwYBBAGBrSGCLAIBBAMAMAgGBmeBDAECAjAJ
-BgNVHRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYB
-BQUHAwEwHQYDVR0OBBYEFGL4MCMuRKr8cD0oslgL7QGRYj+uMB8GA1UdIwQYMBaA
-FPRz8/rGQrPGXGnAWL50OPlhK45iMIHvBgNVHREEgecwgeSCDW9wZW5pZC5mYXUu
-ZGWCD29wZW5pZC5ycnplLm5ldIIec3NvLXByb3h5LnJyemUudW5pLWVybGFuZ2Vu
-LmRlggpzc28uZmF1LmRlghhzc28ucnJ6ZS51bmktZXJsYW5nZW4uZGWCE3Nzby51
-bmktZXJsYW5nZW4uZGWCEXd3dy5vcGVuaWQuZmF1LmRlghN3d3cub3BlbmlkLnJy
-emUubmV0gg53d3cuc3NvLmZhdS5kZYIXd3d3LnNzby51bmktZXJsYW5nZW4uZGWB
-FnNzby1hZG1pbnNAcnJ6ZS5mYXUuZGUwgZ8GA1UdHwSBlzCBlDBIoEagRIZCaHR0
-cDovL2NkcDEucGNhLmRmbi5kZS91bmktZXJsYW5nZW4tbnVlcm5iZXJnLWNhL3B1
-Yi9jcmwvY2FjcmwuY3JsMEigRqBEhkJodHRwOi8vY2RwMi5wY2EuZGZuLmRlL3Vu
-aS1lcmxhbmdlbi1udWVybmJlcmctY2EvcHViL2NybC9jYWNybC5jcmwwge0GCCsG
-AQUFBwEBBIHgMIHdMDMGCCsGAQUFBzABhidodHRwOi8vb2NzcC5wY2EuZGZuLmRl
-L09DU1AtU2VydmVyL09DU1AwUgYIKwYBBQUHMAKGRmh0dHA6Ly9jZHAxLnBjYS5k
-Zm4uZGUvdW5pLWVybGFuZ2VuLW51ZXJuYmVyZy1jYS9wdWIvY2FjZXJ0L2NhY2Vy
-dC5jcnQwUgYIKwYBBQUHMAKGRmh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvdW5pLWVy
-bGFuZ2VuLW51ZXJuYmVyZy1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwDQYJKoZI
-hvcNAQEFBQADggEBALIsNWnuaDrQA7Tu1ReusFhrkdOKpIH90mMWOBXZoUTPxEaK
-n86rjUAoFj1u1NlWyUrMYRWneXlvy3jQ3KEo7H6nJiEoa7LH1siTNcmOjDiN1dqA
-PO6+zAiESP5Xwsr2D1msyPXade0ra2PFSeG4XZ6hF/KEEYN0xxFpPbrvBD/fa+MU
-fp8NqxF7uANosdABgJs9RFmEmGuWd/Rc3aGzd3+dGwh9nFnKxON9fTrOlXNxa9Og
-jO0N75bg2RQTXLaMZLlUoVGE7n6FljoKjyiXlvUBSSeErakYPLpvgolN6QwAkM2j
-c/GLdms9imUWk7YQ8hzH7aUxdRWOmXLmc+2n/lY=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.sso.uni-erlangen.de/simplesaml/saml2/idp/SingleLogoutService.php"/>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.sso.uni-erlangen.de/simplesaml/saml2/idp/SSOService.php"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://www.sso.uni-erlangen.de/simplesaml/shib13/idp/SSOService.php"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">e131</OrganizationName>
-    <OrganizationName xml:lang="en">e131</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">Friedrich-Alexander-Universität Erlangen-Nürnberg</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">Friedrich-Alexander-Universität Erlangen-Nürnberg</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">https://www.sso.uni-erlangen.de</OrganizationURL>
-    <OrganizationURL xml:lang="en">https://www.sso.uni-erlangen.de</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Frank</GivenName>
-    <SurName>Tröger</SurName>
-    <EmailAddress>mailto:sso-admins@rrze.fau.de</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.sso.uni-erlangen.de.xml b/swamid-interfederations-2.0/www.sso.uni-erlangen.de.xml
deleted file mode 100644
index 6b1694cc..00000000
--- a/swamid-interfederations-2.0/www.sso.uni-erlangen.de.xml
+++ /dev/null
@@ -1,88 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.sso.uni-erlangen.de/simplesaml/saml2/idp/metadata.php">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2010-08-11T14:59:01Z">
-      <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-erlangen.de</saml1md:Scope>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">fau.de</saml1md:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="de">Universität Erlangen-Nürnberg</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Universität Erlangen-Nürnberg</mdui:DisplayName>
-        <mdui:Description xml:lang="de">Identity Provider der Universität Erlangen-Nürnberg</mdui:Description>
-        <mdui:Description xml:lang="en">Identity Provider der Universität Erlangen-Nürnberg</mdui:Description>
-        <mdui:InformationURL xml:lang="de">https://www.sso.uni-erlangen.de</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">https://www.sso.uni-erlangen.de</mdui:InformationURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>www.sso.fau.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=www.sso.fau.de,OU=Regionales Rechenzentrum Erlangen (RRZE),O=Universitaet Erlangen-Nuernberg,L=Erlangen,ST=Bayern,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIHCTCCBfGgAwIBAgIHFVh6d4xjCjANBgkqhkiG9w0BAQUFADCBozELMAkGA1UE
-BhMCREUxDzANBgNVBAgTBkJheWVybjERMA8GA1UEBxMIRXJsYW5nZW4xKDAmBgNV
-BAoTH1VuaXZlcnNpdGFldCBFcmxhbmdlbi1OdWVybmJlcmcxDTALBgNVBAsTBFJS
-WkUxDzANBgNVBAMTBkZBVS1DQTEmMCQGCSqGSIb3DQEJARYXY2FAcnJ6ZS51bmkt
-ZXJsYW5nZW4uZGUwHhcNMTMwMzA3MjA0NzM2WhcNMTgwMzA2MjA0NzM2WjCBpzEL
-MAkGA1UEBhMCREUxDzANBgNVBAgTBkJheWVybjERMA8GA1UEBxMIRXJsYW5nZW4x
-KDAmBgNVBAoTH1VuaXZlcnNpdGFldCBFcmxhbmdlbi1OdWVybmJlcmcxMTAvBgNV
-BAsTKFJlZ2lvbmFsZXMgUmVjaGVuemVudHJ1bSBFcmxhbmdlbiAoUlJaRSkxFzAV
-BgNVBAMTDnd3dy5zc28uZmF1LmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
-CgKCAQEAs/qsX/p+z8uxh3feD2sZWdb/NpOI5/YkPeXYQPQAdlRKBijHLohlLRAz
-CNFU7YWhy/FxY4uLE97h0hPVpoxCPlOW5qh56C1ZEWGBdhJImfYpzJbB2UIIUUR2
-WXLjZPyQObzxocui2M3XWa/uhpc3nPvBC/HLzr4fbU0f20D9hr0MXFurfuhGID+j
-t1jRsVWTjMWEVDAXDduKYUCAqrp1RlSc/H6z4WFeiQ92+4Q/+axig6KRkg0e0LBh
-MDA3ozIODmfFDIuo++rGvHWG47GLbLQyJLLeGkPlxxqo8uvVhtENxd5jrIkZrRd8
-y+dFr+jRh36DMmJGTzVkeweZPT2ZpQIDAQABo4IDOjCCAzYwOQYDVR0gBDIwMDAR
-Bg8rBgEEAYGtIYIsAQEEAwAwEQYPKwYBBAGBrSGCLAIBBAMAMAgGBmeBDAECAjAJ
-BgNVHRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYB
-BQUHAwEwHQYDVR0OBBYEFGL4MCMuRKr8cD0oslgL7QGRYj+uMB8GA1UdIwQYMBaA
-FPRz8/rGQrPGXGnAWL50OPlhK45iMIHvBgNVHREEgecwgeSCDW9wZW5pZC5mYXUu
-ZGWCD29wZW5pZC5ycnplLm5ldIIec3NvLXByb3h5LnJyemUudW5pLWVybGFuZ2Vu
-LmRlggpzc28uZmF1LmRlghhzc28ucnJ6ZS51bmktZXJsYW5nZW4uZGWCE3Nzby51
-bmktZXJsYW5nZW4uZGWCEXd3dy5vcGVuaWQuZmF1LmRlghN3d3cub3BlbmlkLnJy
-emUubmV0gg53d3cuc3NvLmZhdS5kZYIXd3d3LnNzby51bmktZXJsYW5nZW4uZGWB
-FnNzby1hZG1pbnNAcnJ6ZS5mYXUuZGUwgZ8GA1UdHwSBlzCBlDBIoEagRIZCaHR0
-cDovL2NkcDEucGNhLmRmbi5kZS91bmktZXJsYW5nZW4tbnVlcm5iZXJnLWNhL3B1
-Yi9jcmwvY2FjcmwuY3JsMEigRqBEhkJodHRwOi8vY2RwMi5wY2EuZGZuLmRlL3Vu
-aS1lcmxhbmdlbi1udWVybmJlcmctY2EvcHViL2NybC9jYWNybC5jcmwwge0GCCsG
-AQUFBwEBBIHgMIHdMDMGCCsGAQUFBzABhidodHRwOi8vb2NzcC5wY2EuZGZuLmRl
-L09DU1AtU2VydmVyL09DU1AwUgYIKwYBBQUHMAKGRmh0dHA6Ly9jZHAxLnBjYS5k
-Zm4uZGUvdW5pLWVybGFuZ2VuLW51ZXJuYmVyZy1jYS9wdWIvY2FjZXJ0L2NhY2Vy
-dC5jcnQwUgYIKwYBBQUHMAKGRmh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvdW5pLWVy
-bGFuZ2VuLW51ZXJuYmVyZy1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwDQYJKoZI
-hvcNAQEFBQADggEBALIsNWnuaDrQA7Tu1ReusFhrkdOKpIH90mMWOBXZoUTPxEaK
-n86rjUAoFj1u1NlWyUrMYRWneXlvy3jQ3KEo7H6nJiEoa7LH1siTNcmOjDiN1dqA
-PO6+zAiESP5Xwsr2D1msyPXade0ra2PFSeG4XZ6hF/KEEYN0xxFpPbrvBD/fa+MU
-fp8NqxF7uANosdABgJs9RFmEmGuWd/Rc3aGzd3+dGwh9nFnKxON9fTrOlXNxa9Og
-jO0N75bg2RQTXLaMZLlUoVGE7n6FljoKjyiXlvUBSSeErakYPLpvgolN6QwAkM2j
-c/GLdms9imUWk7YQ8hzH7aUxdRWOmXLmc+2n/lY=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.sso.uni-erlangen.de/simplesaml/saml2/idp/SingleLogoutService.php"/>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.sso.uni-erlangen.de/simplesaml/saml2/idp/SSOService.php"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://www.sso.uni-erlangen.de/simplesaml/shib13/idp/SSOService.php"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">e131</OrganizationName>
-    <OrganizationName xml:lang="en">e131</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">Friedrich-Alexander-Universität Erlangen-Nürnberg</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">Friedrich-Alexander-Universität Erlangen-Nürnberg</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">https://www.sso.uni-erlangen.de</OrganizationURL>
-    <OrganizationURL xml:lang="en">https://www.sso.uni-erlangen.de</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Frank</GivenName>
-    <SurName>Tröger</SurName>
-    <EmailAddress>mailto:sso-admins@rrze.fau.de</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.uco.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/www.uco.fr-idp-shibboleth.xml
deleted file mode 100644
index e2c112ed..00000000
--- a/swamid-interfederations-2.0/www.uco.fr-idp-shibboleth.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.uco.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2010-07-09T14:39:03Z">
-      <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">uco.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">Université Catholique de l'Ouest - Angers</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDFDCCAfygAwIBAgIVAPhF6Z+pMtMAffPTgC8LNS+CPPoMMA0GCSqGSIb3DQEB
-BQUAMBUxEzARBgNVBAMTCnd3dy51Y28uZnIwHhcNMTEwNzIwMTQyMzUwWhcNMzEw
-NzIwMTQyMzUwWjAVMRMwEQYDVQQDEwp3d3cudWNvLmZyMIIBIjANBgkqhkiG9w0B
-AQEFAAOCAQ8AMIIBCgKCAQEA0mhB2HdGNn2tfVrT9ciREesIHvTSoXnI6AQpqD9K
-LlB7bIjUX9EyfVXlg2fvcJYyfGeuQL1mbK0bXuM0AUX4aO3kf5vrtVLO0npQSuE4
-reAThATYtCsor30uTOb8YcCANJ0OcnN8jm+GgZmroUIakyl2RRPMtuc+RBx8lnh4
-N+Tac1OssR1Zdx8peAtV0MvXoC6hy5/Rp1i1/QiKX4QHQh85GMPG5wANRpag4U+9
-FPhRikDdwMH+gYyTY2zcAYxdyRJNK1dKtYVSSlW+JoX0JgL8vOcC+H5lHsDpHjK1
-y0k39zeVSURgOxu7U04ZPNclt4qYo6MHi7Gc+LLtyoO7zwIDAQABo1swWTA4BgNV
-HREEMTAvggp3d3cudWNvLmZyhiFodHRwczovL3d3dy51Y28uZnIvaWRwL3NoaWJi
-b2xldGgwHQYDVR0OBBYEFD9XAALJ3NCu1Z7q/lcamqo6vefAMA0GCSqGSIb3DQEB
-BQUAA4IBAQCKoc/CFYtJwGptZuJYo9da4NQ2jk2FvqX5o0AyT7cmimU8tj1B41m9
-DkVjwq2HPeTbcDUoECZJFoisIaQOuoxXxSvA8yYTtgBYUQEvqMOwLG+9cCjkT7V9
-hw9qQmD0JVSknJslFuLoqn88bodKPJE1u7Sgfk/huMEZItLBG/6EMKCINuN+nLt3
-Mk7/mIJoHFhYEh81ZVlwKHPGmZ/ST8Y0GXeH95nO3BuuFp6cWgE7Eu4u9XiF5Ice
-N4chOWs7G4bomBuESzkGeydsJjWl7WmhuoKqfTV5V6W+hsBnkXGG4cpfB9R3Du+v
-0m1zBj8dwon9dDvWHf2On3KrRYbYl2Ff
-					    </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://www.uco.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.uco.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://www.uco.fr/idp/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Université Catholique de l'Ouest - Angers</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Université Catholique de l'Ouest - Angers</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Lucas Joachim</SurName>
-    <EmailAddress>joachim.lucas@uco.fr</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <SurName>Zoundi Patrick</SurName>
-    <EmailAddress>patrick.zoundi@uco.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.uco.fr.xml b/swamid-interfederations-2.0/www.uco.fr.xml
deleted file mode 100644
index e2c112ed..00000000
--- a/swamid-interfederations-2.0/www.uco.fr.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.uco.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2010-07-09T14:39:03Z">
-      <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">uco.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">Université Catholique de l'Ouest - Angers</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDFDCCAfygAwIBAgIVAPhF6Z+pMtMAffPTgC8LNS+CPPoMMA0GCSqGSIb3DQEB
-BQUAMBUxEzARBgNVBAMTCnd3dy51Y28uZnIwHhcNMTEwNzIwMTQyMzUwWhcNMzEw
-NzIwMTQyMzUwWjAVMRMwEQYDVQQDEwp3d3cudWNvLmZyMIIBIjANBgkqhkiG9w0B
-AQEFAAOCAQ8AMIIBCgKCAQEA0mhB2HdGNn2tfVrT9ciREesIHvTSoXnI6AQpqD9K
-LlB7bIjUX9EyfVXlg2fvcJYyfGeuQL1mbK0bXuM0AUX4aO3kf5vrtVLO0npQSuE4
-reAThATYtCsor30uTOb8YcCANJ0OcnN8jm+GgZmroUIakyl2RRPMtuc+RBx8lnh4
-N+Tac1OssR1Zdx8peAtV0MvXoC6hy5/Rp1i1/QiKX4QHQh85GMPG5wANRpag4U+9
-FPhRikDdwMH+gYyTY2zcAYxdyRJNK1dKtYVSSlW+JoX0JgL8vOcC+H5lHsDpHjK1
-y0k39zeVSURgOxu7U04ZPNclt4qYo6MHi7Gc+LLtyoO7zwIDAQABo1swWTA4BgNV
-HREEMTAvggp3d3cudWNvLmZyhiFodHRwczovL3d3dy51Y28uZnIvaWRwL3NoaWJi
-b2xldGgwHQYDVR0OBBYEFD9XAALJ3NCu1Z7q/lcamqo6vefAMA0GCSqGSIb3DQEB
-BQUAA4IBAQCKoc/CFYtJwGptZuJYo9da4NQ2jk2FvqX5o0AyT7cmimU8tj1B41m9
-DkVjwq2HPeTbcDUoECZJFoisIaQOuoxXxSvA8yYTtgBYUQEvqMOwLG+9cCjkT7V9
-hw9qQmD0JVSknJslFuLoqn88bodKPJE1u7Sgfk/huMEZItLBG/6EMKCINuN+nLt3
-Mk7/mIJoHFhYEh81ZVlwKHPGmZ/ST8Y0GXeH95nO3BuuFp6cWgE7Eu4u9XiF5Ice
-N4chOWs7G4bomBuESzkGeydsJjWl7WmhuoKqfTV5V6W+hsBnkXGG4cpfB9R3Du+v
-0m1zBj8dwon9dDvWHf2On3KrRYbYl2Ff
-					    </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://www.uco.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.uco.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://www.uco.fr/idp/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Université Catholique de l'Ouest - Angers</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Université Catholique de l'Ouest - Angers</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Lucas Joachim</SurName>
-    <EmailAddress>joachim.lucas@uco.fr</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <SurName>Zoundi Patrick</SurName>
-    <EmailAddress>patrick.zoundi@uco.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.vho.de-idpvzg.xml b/swamid-interfederations-2.0/www.vho.de-idpvzg.xml
deleted file mode 100644
index 5c9f0003..00000000
--- a/swamid-interfederations-2.0/www.vho.de-idpvzg.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://www.vho.de/idpvzg">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2010-02-10T14:50:56Z">
-      <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">gbv.de</saml1md:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="de">Verbundzentrale des GBV (VZG)</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Verbundzentrale des GBV (VZG)</mdui:DisplayName>
-        <mdui:Description xml:lang="de">IdP der Verbundzentrale des GBV (VZG)</mdui:Description>
-        <mdui:Description xml:lang="en">IdP der Verbundzentrale des GBV (VZG)</mdui:Description>
-        <mdui:InformationURL xml:lang="de">http://www.vho.de</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">http://www.vho.de</mdui:InformationURL>
-      </mdui:UIInfo>
-    </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">gbv.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">e45</OrganizationName>
-    <OrganizationName xml:lang="en">e45</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">Verbundzentrale des GBV (VZG)</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">Verbundzentrale des GBV (VZG)</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.vho.de</OrganizationURL>
-    <OrganizationURL xml:lang="en">http://www.vho.de</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Franck</GivenName>
-    <SurName>Borel</SurName>
-    <EmailAddress>mailto:borel@gbv.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="administrative">
-    <GivenName>Gerald</GivenName>
-    <SurName>Steilen</SurName>
-    <EmailAddress>mailto:steilen@gbv.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Till</GivenName>
-    <SurName>Kinstler</SurName>
-    <EmailAddress>mailto:kinstler@gbv.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 5c9f0003..00000000
--- a/swamid-interfederations-2.0/www.vho.de.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://www.vho.de/idpvzg">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2010-02-10T14:50:56Z">
-      <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">gbv.de</saml1md:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="de">Verbundzentrale des GBV (VZG)</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Verbundzentrale des GBV (VZG)</mdui:DisplayName>
-        <mdui:Description xml:lang="de">IdP der Verbundzentrale des GBV (VZG)</mdui:Description>
-        <mdui:Description xml:lang="en">IdP der Verbundzentrale des GBV (VZG)</mdui:Description>
-        <mdui:InformationURL xml:lang="de">http://www.vho.de</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">http://www.vho.de</mdui:InformationURL>
-      </mdui:UIInfo>
-    </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">gbv.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">e45</OrganizationName>
-    <OrganizationName xml:lang="en">e45</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">Verbundzentrale des GBV (VZG)</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">Verbundzentrale des GBV (VZG)</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.vho.de</OrganizationURL>
-    <OrganizationURL xml:lang="en">http://www.vho.de</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Franck</GivenName>
-    <SurName>Borel</SurName>
-    <EmailAddress>mailto:borel@gbv.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="administrative">
-    <GivenName>Gerald</GivenName>
-    <SurName>Steilen</SurName>
-    <EmailAddress>mailto:steilen@gbv.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Till</GivenName>
-    <SurName>Kinstler</SurName>
-    <EmailAddress>mailto:kinstler@gbv.de</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.videotorium.hu-shibboleth.xml b/swamid-interfederations-2.0/www.videotorium.hu-shibboleth.xml
deleted file mode 100644
index d8b681b0..00000000
--- a/swamid-interfederations-2.0/www.videotorium.hu-shibboleth.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://www.videotorium.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</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">sulinet</ns9:MetadataSet>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://eduid.hu" registrationInstant="2009-11-20T00:00:00Z"/>
-  </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:Logo height="86" width="100">https://metadata.eduid.hu/logos/videotorium.png</mdui:Logo>
-        <mdui:InformationURL xml:lang="hu">http://videotorium.hu</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="hu">http://videotorium.hu/hu/contents/userstos</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>vportal.niif.hu</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIC9DCCAdygAwIBAgIJAMKdDVZkKR0MMA0GCSqGSIb3DQEBBQUAMBoxGDAWBgNVBAMTD3Zwb3J0YWwubmlpZi5odTAeFw0wOTExMjAxMjMzMjRaFw0xOTExMTgxMjMzMjRaMBoxGDAWBgNVBAMTD3Zwb3J0YWwubmlpZi5odTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAOhapHXauA4X/BNSZIhLERDmHjx/7zdw1dxgmkr8GmDzEH1BGZ6/nSdXMAhkrI1HVOGiSz6QhR0l2r6A7mSLXh8u0Sjc3TzCSsAIzz/ygh6Vljl5WMRE9u9uxtkvd+5d4cZP4lUbL9aFOTvNBh3Gizy7oZwWjbp64rSupRNqnz8JFGFPyPnRpXo8HjpNHYeaLyqOqTww9lHTlGWKTqibsyV7CctiFKbADlU2ol/8cdKLiSVAWqlsIed3proxg0fgHskpmyB8cFr77lylFnirJGRXjXMXlVwr1XxlOghfJqBsRxz/wKMXvMNr9sWYoDw14kYBls8S9RCDNF34Fx+UOcECAwEAAaM9MDswGgYDVR0RBBMwEYIPdnBvcnRhbC5uaWlmLmh1MB0GA1UdDgQWBBQgKCZFxt8oR2XfhQ7zGmF7auxUdzANBgkqhkiG9w0BAQUFAAOCAQEAX+R7y/xZi46N65LoxI7OS0a0U9vVh4PxGfylYafbDpPy+FPw1Dh6IqG1R8gt1TSRUouVdoRb9b2k8CjAAkRq4lbF5XctWcsWqMEU69BcUlbzzAtgnpgghVSk8dFlMrEWugQvzd6RL4HDPPrvFsjdMj52+p1mBMtw9SUrazPp+hU1y8zeDdocI2RdyLEhArR5xQVKmV32hDFr754zNdZorvcRuuarkO83b1732Lc//S38m9Co/U1WAPN2sSUN5S7yIZ/EjubTbvf8gcGvEHT1rffoOzqHksfcd+gG9nbNZLO6xZJJEwNwPcOoxEWZXhv3ynvCtFcuvmtcGQazcy0s9Q==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://videotorium.hu/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://videotorium.hu/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://niif.videotorium.hu/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://rmki.videotorium.hu/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://niif.videotorium.hu/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://rmki.videotorium.hu/Shibboleth.sso/SLO/SOAP"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://videotorium.hu/Shibboleth.sso/SAML2/POST" index="1" isDefault="true"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://rmki.videotorium.hu/Shibboleth.sso/SAML2/POST" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://niif.videotorium.hu/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://rmki.videotorium.hu/Shibboleth.sso/SAML2/Artifact" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://videotorium.hu/Shibboleth.sso/SAML2/Artifact" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://niif.videotorium.hu/Shibboleth.sso/SAML2/POST" index="6"/>
-    <AttributeConsumingService index="1" isDefault="true">
-      <ServiceName xml:lang="hu">Videotorium</ServiceName>
-      <ServiceName xml:lang="en">Videotorium</ServiceName>
-      <ServiceDescription xml:lang="hu">A Videotorium a felsőoktatás és kutatás szereplői számára létrehozott videó/audió megosztó portál, amely helyet és professzionális megjelenési formát biztosít a felsőoktatási intézményekben, kutatóintézetekben és közgyűjteményekben készített videó-tartalom számára. </ServiceDescription>
-      <ServiceDescription xml:lang="en">Videotorium is a video/audio sharing portal created for the players of research and education. Videotorium provides professional presentation of video content recorded at higher-education organisations, research institutions and public collections.</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"/>
-      <RequestedAttribute FriendlyName="surname" Name="urn:oid:2.5.4.4" 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="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"/>
-      <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"/>
-    </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>Videotorium Admin</SurName>
-    <EmailAddress>mailto:admin@videotorium.hu</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="support">
-    <SurName>Videotorium Admin</SurName>
-    <EmailAddress>mailto:admin@videotorium.hu</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="administrative">
-    <SurName>Videtorium Admin</SurName>
-    <EmailAddress>mailto:admin@videotorium.hu</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.videotorium.hu.xml b/swamid-interfederations-2.0/www.videotorium.hu.xml
deleted file mode 100644
index d8b681b0..00000000
--- a/swamid-interfederations-2.0/www.videotorium.hu.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://www.videotorium.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</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">sulinet</ns9:MetadataSet>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://eduid.hu" registrationInstant="2009-11-20T00:00:00Z"/>
-  </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:Logo height="86" width="100">https://metadata.eduid.hu/logos/videotorium.png</mdui:Logo>
-        <mdui:InformationURL xml:lang="hu">http://videotorium.hu</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="hu">http://videotorium.hu/hu/contents/userstos</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>vportal.niif.hu</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIC9DCCAdygAwIBAgIJAMKdDVZkKR0MMA0GCSqGSIb3DQEBBQUAMBoxGDAWBgNVBAMTD3Zwb3J0YWwubmlpZi5odTAeFw0wOTExMjAxMjMzMjRaFw0xOTExMTgxMjMzMjRaMBoxGDAWBgNVBAMTD3Zwb3J0YWwubmlpZi5odTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAOhapHXauA4X/BNSZIhLERDmHjx/7zdw1dxgmkr8GmDzEH1BGZ6/nSdXMAhkrI1HVOGiSz6QhR0l2r6A7mSLXh8u0Sjc3TzCSsAIzz/ygh6Vljl5WMRE9u9uxtkvd+5d4cZP4lUbL9aFOTvNBh3Gizy7oZwWjbp64rSupRNqnz8JFGFPyPnRpXo8HjpNHYeaLyqOqTww9lHTlGWKTqibsyV7CctiFKbADlU2ol/8cdKLiSVAWqlsIed3proxg0fgHskpmyB8cFr77lylFnirJGRXjXMXlVwr1XxlOghfJqBsRxz/wKMXvMNr9sWYoDw14kYBls8S9RCDNF34Fx+UOcECAwEAAaM9MDswGgYDVR0RBBMwEYIPdnBvcnRhbC5uaWlmLmh1MB0GA1UdDgQWBBQgKCZFxt8oR2XfhQ7zGmF7auxUdzANBgkqhkiG9w0BAQUFAAOCAQEAX+R7y/xZi46N65LoxI7OS0a0U9vVh4PxGfylYafbDpPy+FPw1Dh6IqG1R8gt1TSRUouVdoRb9b2k8CjAAkRq4lbF5XctWcsWqMEU69BcUlbzzAtgnpgghVSk8dFlMrEWugQvzd6RL4HDPPrvFsjdMj52+p1mBMtw9SUrazPp+hU1y8zeDdocI2RdyLEhArR5xQVKmV32hDFr754zNdZorvcRuuarkO83b1732Lc//S38m9Co/U1WAPN2sSUN5S7yIZ/EjubTbvf8gcGvEHT1rffoOzqHksfcd+gG9nbNZLO6xZJJEwNwPcOoxEWZXhv3ynvCtFcuvmtcGQazcy0s9Q==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://videotorium.hu/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://videotorium.hu/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://niif.videotorium.hu/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://rmki.videotorium.hu/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://niif.videotorium.hu/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://rmki.videotorium.hu/Shibboleth.sso/SLO/SOAP"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://videotorium.hu/Shibboleth.sso/SAML2/POST" index="1" isDefault="true"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://rmki.videotorium.hu/Shibboleth.sso/SAML2/POST" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://niif.videotorium.hu/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://rmki.videotorium.hu/Shibboleth.sso/SAML2/Artifact" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://videotorium.hu/Shibboleth.sso/SAML2/Artifact" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://niif.videotorium.hu/Shibboleth.sso/SAML2/POST" index="6"/>
-    <AttributeConsumingService index="1" isDefault="true">
-      <ServiceName xml:lang="hu">Videotorium</ServiceName>
-      <ServiceName xml:lang="en">Videotorium</ServiceName>
-      <ServiceDescription xml:lang="hu">A Videotorium a felsőoktatás és kutatás szereplői számára létrehozott videó/audió megosztó portál, amely helyet és professzionális megjelenési formát biztosít a felsőoktatási intézményekben, kutatóintézetekben és közgyűjteményekben készített videó-tartalom számára. </ServiceDescription>
-      <ServiceDescription xml:lang="en">Videotorium is a video/audio sharing portal created for the players of research and education. Videotorium provides professional presentation of video content recorded at higher-education organisations, research institutions and public collections.</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"/>
-      <RequestedAttribute FriendlyName="surname" Name="urn:oid:2.5.4.4" 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="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"/>
-      <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"/>
-    </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>Videotorium Admin</SurName>
-    <EmailAddress>mailto:admin@videotorium.hu</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="support">
-    <SurName>Videotorium Admin</SurName>
-    <EmailAddress>mailto:admin@videotorium.hu</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="administrative">
-    <SurName>Videtorium Admin</SurName>
-    <EmailAddress>mailto:admin@videotorium.hu</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.vutbr.cz-SSO-saml2-idp.xml b/swamid-interfederations-2.0/www.vutbr.cz-SSO-saml2-idp.xml
deleted file mode 100644
index d505f235..00000000
--- a/swamid-interfederations-2.0/www.vutbr.cz-SSO-saml2-idp.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://www.vutbr.cz/SSO/saml2/idp">
-  <md:Extensions xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata">
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/" registrationInstant="2010-09-22T12:05:52Z">
-      <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>
-    <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://eduid.cz/uri/idp-group/university</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <IDPSSODescriptor xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">vutbr.cz</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Brno University of Technology</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="cs">Vysoké učení technické v Brně</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Identity Provider for employees and students of the Brno University of Technology</mdui:Description>
-        <mdui:Description xml:lang="cs">Identity Provider pro zaměstnance a studenty Vysokého učení technického v Brně</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.vutbr.cz/en/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="cs">http://www.vutbr.cz/</mdui:InformationURL>
-        <mdui:Logo height="84" width="180">https://www2.eduid.cz/idp-loga/vut.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 use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDyDCCArCgAwIBAgIBAjANBgkqhkiG9w0BAQUFADBpMQswCQYDVQQGEwJDWjEXMBUGA1UECAwOQ3plY2ggUmVwdWJsaWMxDTALBgNVBAcMBEJybm8xDDAKBgNVBAoMA0JVVDENMAsGA1UECwwEQ1ZJUzEVMBMGA1UEAwwMQ1ZJUyBVTklYIENBMB4XDTEyMDgyOTExNTEwNFoXDTIyMDgyNzExNTEwNFowaTELMAkGA1UEBhMCQ1oxFzAVBgNVBAgMDkN6ZWNoIFJlcHVibGljMQ0wCwYDVQQHDARCcm5vMQwwCgYDVQQKDANCVVQxDTALBgNVBAsMBENWSVMxFTATBgNVBAMMDHd3dy52dXRici5jejCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALXWlW/8fKDvTZuYpa3NjOxoreomNt7rb4BBLnyflF4pnrqkO7JkJfzxGPDN1ntMhSG0ubKv8bAq60MLfxwR0ia8KfWU17cVShpQ+/qZBtq3ha+78lsrmRb4K0bFvbnXKBxDTLJ0A9a6644O9DxpWNufnRJWukS45w6+nuwgCz6t3YrfF5FJFyf3z+RxfjZeqPMsxwzVarDmLJ3yMksSZKi9GQYxy3IWs12omM3E5ESIvJp9sYf4chwZJHhnLzGI/wxV2p/TD8HVB72sfAN4hourY4Yyy2Y93r8M6oQ8FpxfVlOnhkE9Y+oHl/eyQcM8rQM2uHKX8YZ8osvypqvoTnUCAwEAAaN7MHkwCQYDVR0TBAIwADAsBglghkgBhvhCAQ0EHxYdT3BlblNTTCBHZW5lcmF0ZWQgQ2VydGlmaWNhdGUwHQYDVR0OBBYEFCZONDpcM7CZ5UWgMgbSKafxnIkJMB8GA1UdIwQYMBaAFAawVMF2h+OuCnZ4RBYk6iGjuvJzMA0GCSqGSIb3DQEBBQUAA4IBAQDf8AxfrehzO9Wx9JFHrhacaz+ON0YpuamXK5Q7sprba7J5tAP3xbBsKpLh9vR1M0UqSYf4rL90ge/fQawJK7Erq3r+O9P192jPfWJeU733K+AyOo9e7ZE4XRDub44L4YrG4+1igQXTAs5GyZFgAtN4c+1bEoAsOU+kChyZ931OsfmnXNnCtP3Zrp2bvAtR28uDJ3y8z7qNgK0SBTuFjBORIXq8eycTkxAjnSrLUiTMEZO+kJIUQkjr0jIAFh9lkD3qFhJ+ariWJwPt156p41twmu4xNCj94EDl9JKzFdnk2TUl5P+5y8aXwJ7WDJUqXswWrTZtdS2E1qIHxcTLnDES</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>MIIDyDCCArCgAwIBAgIBAjANBgkqhkiG9w0BAQUFADBpMQswCQYDVQQGEwJDWjEXMBUGA1UECAwOQ3plY2ggUmVwdWJsaWMxDTALBgNVBAcMBEJybm8xDDAKBgNVBAoMA0JVVDENMAsGA1UECwwEQ1ZJUzEVMBMGA1UEAwwMQ1ZJUyBVTklYIENBMB4XDTEyMDgyOTExNTEwNFoXDTIyMDgyNzExNTEwNFowaTELMAkGA1UEBhMCQ1oxFzAVBgNVBAgMDkN6ZWNoIFJlcHVibGljMQ0wCwYDVQQHDARCcm5vMQwwCgYDVQQKDANCVVQxDTALBgNVBAsMBENWSVMxFTATBgNVBAMMDHd3dy52dXRici5jejCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALXWlW/8fKDvTZuYpa3NjOxoreomNt7rb4BBLnyflF4pnrqkO7JkJfzxGPDN1ntMhSG0ubKv8bAq60MLfxwR0ia8KfWU17cVShpQ+/qZBtq3ha+78lsrmRb4K0bFvbnXKBxDTLJ0A9a6644O9DxpWNufnRJWukS45w6+nuwgCz6t3YrfF5FJFyf3z+RxfjZeqPMsxwzVarDmLJ3yMksSZKi9GQYxy3IWs12omM3E5ESIvJp9sYf4chwZJHhnLzGI/wxV2p/TD8HVB72sfAN4hourY4Yyy2Y93r8M6oQ8FpxfVlOnhkE9Y+oHl/eyQcM8rQM2uHKX8YZ8osvypqvoTnUCAwEAAaN7MHkwCQYDVR0TBAIwADAsBglghkgBhvhCAQ0EHxYdT3BlblNTTCBHZW5lcmF0ZWQgQ2VydGlmaWNhdGUwHQYDVR0OBBYEFCZONDpcM7CZ5UWgMgbSKafxnIkJMB8GA1UdIwQYMBaAFAawVMF2h+OuCnZ4RBYk6iGjuvJzMA0GCSqGSIb3DQEBBQUAA4IBAQDf8AxfrehzO9Wx9JFHrhacaz+ON0YpuamXK5Q7sprba7J5tAP3xbBsKpLh9vR1M0UqSYf4rL90ge/fQawJK7Erq3r+O9P192jPfWJeU733K+AyOo9e7ZE4XRDub44L4YrG4+1igQXTAs5GyZFgAtN4c+1bEoAsOU+kChyZ931OsfmnXNnCtP3Zrp2bvAtR28uDJ3y8z7qNgK0SBTuFjBORIXq8eycTkxAjnSrLUiTMEZO+kJIUQkjr0jIAFh9lkD3qFhJ+ariWJwPt156p41twmu4xNCj94EDl9JKzFdnk2TUl5P+5y8aXwJ7WDJUqXswWrTZtdS2E1qIHxcTLnDES</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.vutbr.cz/SSO/saml2/idp/BUTSingleLogoutService.php" ResponseLocation="https://www.vutbr.cz/SSO/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://www.vutbr.cz/SSO/saml2/idp/SSOService.php"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Brno University of Technology</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Brno University of Technology</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="cs">Vysoké učení technické v Brně</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.vutbr.cz/en</OrganizationURL>
-    <OrganizationURL xml:lang="cs">http://www.vutbr.cz/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Webmasters</GivenName>
-    <SurName>VUT Portal</SurName>
-    <EmailAddress>portal@vutbr.cz</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.vutbr.cz.xml b/swamid-interfederations-2.0/www.vutbr.cz.xml
deleted file mode 100644
index d505f235..00000000
--- a/swamid-interfederations-2.0/www.vutbr.cz.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://www.vutbr.cz/SSO/saml2/idp">
-  <md:Extensions xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata">
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/" registrationInstant="2010-09-22T12:05:52Z">
-      <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>
-    <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://eduid.cz/uri/idp-group/university</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <IDPSSODescriptor xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">vutbr.cz</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Brno University of Technology</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="cs">Vysoké učení technické v Brně</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Identity Provider for employees and students of the Brno University of Technology</mdui:Description>
-        <mdui:Description xml:lang="cs">Identity Provider pro zaměstnance a studenty Vysokého učení technického v Brně</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.vutbr.cz/en/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="cs">http://www.vutbr.cz/</mdui:InformationURL>
-        <mdui:Logo height="84" width="180">https://www2.eduid.cz/idp-loga/vut.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 use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDyDCCArCgAwIBAgIBAjANBgkqhkiG9w0BAQUFADBpMQswCQYDVQQGEwJDWjEXMBUGA1UECAwOQ3plY2ggUmVwdWJsaWMxDTALBgNVBAcMBEJybm8xDDAKBgNVBAoMA0JVVDENMAsGA1UECwwEQ1ZJUzEVMBMGA1UEAwwMQ1ZJUyBVTklYIENBMB4XDTEyMDgyOTExNTEwNFoXDTIyMDgyNzExNTEwNFowaTELMAkGA1UEBhMCQ1oxFzAVBgNVBAgMDkN6ZWNoIFJlcHVibGljMQ0wCwYDVQQHDARCcm5vMQwwCgYDVQQKDANCVVQxDTALBgNVBAsMBENWSVMxFTATBgNVBAMMDHd3dy52dXRici5jejCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALXWlW/8fKDvTZuYpa3NjOxoreomNt7rb4BBLnyflF4pnrqkO7JkJfzxGPDN1ntMhSG0ubKv8bAq60MLfxwR0ia8KfWU17cVShpQ+/qZBtq3ha+78lsrmRb4K0bFvbnXKBxDTLJ0A9a6644O9DxpWNufnRJWukS45w6+nuwgCz6t3YrfF5FJFyf3z+RxfjZeqPMsxwzVarDmLJ3yMksSZKi9GQYxy3IWs12omM3E5ESIvJp9sYf4chwZJHhnLzGI/wxV2p/TD8HVB72sfAN4hourY4Yyy2Y93r8M6oQ8FpxfVlOnhkE9Y+oHl/eyQcM8rQM2uHKX8YZ8osvypqvoTnUCAwEAAaN7MHkwCQYDVR0TBAIwADAsBglghkgBhvhCAQ0EHxYdT3BlblNTTCBHZW5lcmF0ZWQgQ2VydGlmaWNhdGUwHQYDVR0OBBYEFCZONDpcM7CZ5UWgMgbSKafxnIkJMB8GA1UdIwQYMBaAFAawVMF2h+OuCnZ4RBYk6iGjuvJzMA0GCSqGSIb3DQEBBQUAA4IBAQDf8AxfrehzO9Wx9JFHrhacaz+ON0YpuamXK5Q7sprba7J5tAP3xbBsKpLh9vR1M0UqSYf4rL90ge/fQawJK7Erq3r+O9P192jPfWJeU733K+AyOo9e7ZE4XRDub44L4YrG4+1igQXTAs5GyZFgAtN4c+1bEoAsOU+kChyZ931OsfmnXNnCtP3Zrp2bvAtR28uDJ3y8z7qNgK0SBTuFjBORIXq8eycTkxAjnSrLUiTMEZO+kJIUQkjr0jIAFh9lkD3qFhJ+ariWJwPt156p41twmu4xNCj94EDl9JKzFdnk2TUl5P+5y8aXwJ7WDJUqXswWrTZtdS2E1qIHxcTLnDES</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>MIIDyDCCArCgAwIBAgIBAjANBgkqhkiG9w0BAQUFADBpMQswCQYDVQQGEwJDWjEXMBUGA1UECAwOQ3plY2ggUmVwdWJsaWMxDTALBgNVBAcMBEJybm8xDDAKBgNVBAoMA0JVVDENMAsGA1UECwwEQ1ZJUzEVMBMGA1UEAwwMQ1ZJUyBVTklYIENBMB4XDTEyMDgyOTExNTEwNFoXDTIyMDgyNzExNTEwNFowaTELMAkGA1UEBhMCQ1oxFzAVBgNVBAgMDkN6ZWNoIFJlcHVibGljMQ0wCwYDVQQHDARCcm5vMQwwCgYDVQQKDANCVVQxDTALBgNVBAsMBENWSVMxFTATBgNVBAMMDHd3dy52dXRici5jejCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALXWlW/8fKDvTZuYpa3NjOxoreomNt7rb4BBLnyflF4pnrqkO7JkJfzxGPDN1ntMhSG0ubKv8bAq60MLfxwR0ia8KfWU17cVShpQ+/qZBtq3ha+78lsrmRb4K0bFvbnXKBxDTLJ0A9a6644O9DxpWNufnRJWukS45w6+nuwgCz6t3YrfF5FJFyf3z+RxfjZeqPMsxwzVarDmLJ3yMksSZKi9GQYxy3IWs12omM3E5ESIvJp9sYf4chwZJHhnLzGI/wxV2p/TD8HVB72sfAN4hourY4Yyy2Y93r8M6oQ8FpxfVlOnhkE9Y+oHl/eyQcM8rQM2uHKX8YZ8osvypqvoTnUCAwEAAaN7MHkwCQYDVR0TBAIwADAsBglghkgBhvhCAQ0EHxYdT3BlblNTTCBHZW5lcmF0ZWQgQ2VydGlmaWNhdGUwHQYDVR0OBBYEFCZONDpcM7CZ5UWgMgbSKafxnIkJMB8GA1UdIwQYMBaAFAawVMF2h+OuCnZ4RBYk6iGjuvJzMA0GCSqGSIb3DQEBBQUAA4IBAQDf8AxfrehzO9Wx9JFHrhacaz+ON0YpuamXK5Q7sprba7J5tAP3xbBsKpLh9vR1M0UqSYf4rL90ge/fQawJK7Erq3r+O9P192jPfWJeU733K+AyOo9e7ZE4XRDub44L4YrG4+1igQXTAs5GyZFgAtN4c+1bEoAsOU+kChyZ931OsfmnXNnCtP3Zrp2bvAtR28uDJ3y8z7qNgK0SBTuFjBORIXq8eycTkxAjnSrLUiTMEZO+kJIUQkjr0jIAFh9lkD3qFhJ+ariWJwPt156p41twmu4xNCj94EDl9JKzFdnk2TUl5P+5y8aXwJ7WDJUqXswWrTZtdS2E1qIHxcTLnDES</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.vutbr.cz/SSO/saml2/idp/BUTSingleLogoutService.php" ResponseLocation="https://www.vutbr.cz/SSO/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://www.vutbr.cz/SSO/saml2/idp/SSOService.php"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Brno University of Technology</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Brno University of Technology</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="cs">Vysoké učení technické v Brně</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.vutbr.cz/en</OrganizationURL>
-    <OrganizationURL xml:lang="cs">http://www.vutbr.cz/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Webmasters</GivenName>
-    <SurName>VUT Portal</SurName>
-    <EmailAddress>portal@vutbr.cz</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www2.eduroam.cz.xml b/swamid-interfederations-2.0/www2.eduroam.cz.xml
deleted file mode 100644
index 1d980d9e..00000000
--- a/swamid-interfederations-2.0/www2.eduroam.cz.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://www2.eduroam.cz/shibboleth">
-  <md: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>
-  </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://www2.eduroam.cz/Shibboleth.sso/DS" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">eduroam.cz</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="cs">eduroam.cz</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Informational web of the eduroam.cz project. It brings informations to end users and to technical staff at end institutions.</mdui:Description>
-        <mdui:Description xml:lang="cs">Informační web projektu eduroam.cz, který přináší informace jak pro koncové uživatele tak pro správce eduroamu na jednotlivých institucích.</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://eduroam.cz/en/start</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="cs">http://eduroam.cz/cs/start</mdui:InformationURL>
-        <mdui:Logo height="130" width="300">https://www.eduroam.org/downloads/logo/PNG/eduroam_trans_300pix.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:KeyName>www2.cesnet.cz</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=www2.cesnet.cz,O=CESNET,ST=Czech Republic,C=CZ</ds:X509SubjectName>
-          <ds:X509Certificate>MIID1zCCAr+gAwIBAgIJAN4GczKVBwklMA0GCSqGSIb3DQEBBQUAMFAxCzAJBgNV
-BAYTAkNaMRcwFQYDVQQIEw5DemVjaCBSZXB1YmxpYzEPMA0GA1UEChMGQ0VTTkVU
-MRcwFQYDVQQDEw53d3cyLmNlc25ldC5jejAeFw0xMjExMjIwOTI1NDJaFw0yMjEx
-MjAwOTI1NDJaMFAxCzAJBgNVBAYTAkNaMRcwFQYDVQQIEw5DemVjaCBSZXB1Ymxp
-YzEPMA0GA1UEChMGQ0VTTkVUMRcwFQYDVQQDEw53d3cyLmNlc25ldC5jejCCASIw
-DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAM4C2p84KKhJE2AkwuGExdVFQEJk
-C/N71KGtmsqxu0u6AotEJanK6CgalKE3J9kVHz7pi2jbBTVFEz5Ng4g2XGMHkjxE
-AIa1zt6Vj3QPQQZVjTjlqMy8e/emdmH0sxkRC48vOuifcwnfFZ8oH9AkQ9HY1PwM
-gfNZ/PA8uNRQjspVs2pdIkheFzVFKbv8tbqwggArwDIS5MKIHSYeYR7jdvQ+KmEy
-rMW30ke8QEa4WiNjWvClKoUNPYBUeSpBvi4XyubG6iA72gOusoyM0yqUbJFrSYDv
-X5HKtFmIiZmZX3a+0AnO4DrbLxnjtAdaENCekaxEwpcvqWG73T3QYY/f8DkCAwEA
-AaOBszCBsDAdBgNVHQ4EFgQU3HKUUWpDGlK1khcUhb4TpLqsnMgwgYAGA1UdIwR5
-MHeAFNxylFFqQxpStZIXFIW+E6S6rJzIoVSkUjBQMQswCQYDVQQGEwJDWjEXMBUG
-A1UECBMOQ3plY2ggUmVwdWJsaWMxDzANBgNVBAoTBkNFU05FVDEXMBUGA1UEAxMO
-d3d3Mi5jZXNuZXQuY3qCCQDeBnMylQcJJTAMBgNVHRMEBTADAQH/MA0GCSqGSIb3
-DQEBBQUAA4IBAQAzEeRxovASPHS1BwWDpJCz4ui05Fht0IekYi42PqWxmIfQClW5
-KZLRb3N1L6zHpNjeJYVCuMjn0FdCShgHrormyUNZU9TJMbrrjXmV+IZ2FiPqsaj4
-aOBQzRXuN6uq0+4q1iHRFQxzsxmYLmfrHShccGIH3Oe2tWeSFr5vfR7n/e8k8CFW
-PZjO9EXRa0Gt6tRTPHbweVjDSItxf7zbHn+861stvFhBfgKoTyhR/BgIsPQBHe33
-wNzhlgq87jxyV7mFD1koSU13CBTzatU92ZEweNIPhPsviDwFS6uFJmATTQvbW51h
-NMGlYGvOFgmJL+u2sfhAr3F9JJDjPfSUR/9i
-</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>www2.cesnet.cz</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=www2.cesnet.cz,O=CESNET,ST=Czech Republic,C=CZ</ds:X509SubjectName>
-          <ds:X509Certificate>MIID1zCCAr+gAwIBAgIJAN4GczKVBwklMA0GCSqGSIb3DQEBBQUAMFAxCzAJBgNV
-BAYTAkNaMRcwFQYDVQQIEw5DemVjaCBSZXB1YmxpYzEPMA0GA1UEChMGQ0VTTkVU
-MRcwFQYDVQQDEw53d3cyLmNlc25ldC5jejAeFw0xMjExMjIwOTI1NDJaFw0yMjEx
-MjAwOTI1NDJaMFAxCzAJBgNVBAYTAkNaMRcwFQYDVQQIEw5DemVjaCBSZXB1Ymxp
-YzEPMA0GA1UEChMGQ0VTTkVUMRcwFQYDVQQDEw53d3cyLmNlc25ldC5jejCCASIw
-DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAM4C2p84KKhJE2AkwuGExdVFQEJk
-C/N71KGtmsqxu0u6AotEJanK6CgalKE3J9kVHz7pi2jbBTVFEz5Ng4g2XGMHkjxE
-AIa1zt6Vj3QPQQZVjTjlqMy8e/emdmH0sxkRC48vOuifcwnfFZ8oH9AkQ9HY1PwM
-gfNZ/PA8uNRQjspVs2pdIkheFzVFKbv8tbqwggArwDIS5MKIHSYeYR7jdvQ+KmEy
-rMW30ke8QEa4WiNjWvClKoUNPYBUeSpBvi4XyubG6iA72gOusoyM0yqUbJFrSYDv
-X5HKtFmIiZmZX3a+0AnO4DrbLxnjtAdaENCekaxEwpcvqWG73T3QYY/f8DkCAwEA
-AaOBszCBsDAdBgNVHQ4EFgQU3HKUUWpDGlK1khcUhb4TpLqsnMgwgYAGA1UdIwR5
-MHeAFNxylFFqQxpStZIXFIW+E6S6rJzIoVSkUjBQMQswCQYDVQQGEwJDWjEXMBUG
-A1UECBMOQ3plY2ggUmVwdWJsaWMxDzANBgNVBAoTBkNFU05FVDEXMBUGA1UEAxMO
-d3d3Mi5jZXNuZXQuY3qCCQDeBnMylQcJJTAMBgNVHRMEBTADAQH/MA0GCSqGSIb3
-DQEBBQUAA4IBAQAzEeRxovASPHS1BwWDpJCz4ui05Fht0IekYi42PqWxmIfQClW5
-KZLRb3N1L6zHpNjeJYVCuMjn0FdCShgHrormyUNZU9TJMbrrjXmV+IZ2FiPqsaj4
-aOBQzRXuN6uq0+4q1iHRFQxzsxmYLmfrHShccGIH3Oe2tWeSFr5vfR7n/e8k8CFW
-PZjO9EXRa0Gt6tRTPHbweVjDSItxf7zbHn+861stvFhBfgKoTyhR/BgIsPQBHe33
-wNzhlgq87jxyV7mFD1koSU13CBTzatU92ZEweNIPhPsviDwFS6uFJmATTQvbW51h
-NMGlYGvOFgmJL+u2sfhAr3F9JJDjPfSUR/9i
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www2.eduroam.cz/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www2.eduroam.cz/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www2.eduroam.cz/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www2.eduroam.cz/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www2.eduroam.cz/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www2.eduroam.cz/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www2.eduroam.cz/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www2.eduroam.cz/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www2.eduroam.cz/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.eduroam.cz/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wiki.eduroam.cz/Shibboleth.sso/SAML2/POST" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://eduroam.cz/Shibboleth.sso/SAML2/POST" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www2.eduroam.cz/Shibboleth.sso/SAML2/POST" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www2.eduroam.cz/Shibboleth.sso/SAML2/POST-SimpleSign" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www2.eduroam.cz/Shibboleth.sso/SAML2/Artifact" index="6"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www2.eduroam.cz/Shibboleth.sso/SAML2/ECP" index="7"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www2.eduroam.cz/Shibboleth.sso/SAML/POST" index="8"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www2.eduroam.cz/Shibboleth.sso/SAML/Artifact" index="9"/>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">CESNET, z.s.p.o.</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">CESNET</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="cs">CESNET</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.cesnet.cz/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Jan</md:GivenName>
-    <md:SurName>Tomášek</md:SurName>
-    <md:EmailAddress>jan.tomasek@cesnet.cz</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www3.eduid.cz-shibboleth.xml b/swamid-interfederations-2.0/www3.eduid.cz-shibboleth.xml
deleted file mode 100644
index 9c1874fb..00000000
--- a/swamid-interfederations-2.0/www3.eduid.cz-shibboleth.xml
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www3.eduid.cz/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/" registrationInstant="2014-02-03T10:42:36Z">
-      <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>
-      <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://www3.eduid.cz/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://www3.eduid.cz/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">eduID.cz</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="cs">eduID.cz</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Informational web of the eduID.cz federation. It brings informations to end users and to technical staff at end institutions.</mdui:Description>
-        <mdui:Description xml:lang="cs">Informační web projektu eduID.cz, který přináší informace jak pro koncové uživatele tak pro správce na jednotlivých institucích.</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.eduid.cz/en/index</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="cs">http://www.eduid.cz</mdui:InformationURL>
-        <mdui:Logo height="63" width="150">https://www.eduid.cz/eduid-logo-150.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>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://www3.eduid.cz/shibboleth</ds:KeyName>
-        <ds:KeyName>www3.eduid.cz</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=www3.eduid.cz</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDEDCCAfigAwIBAgIJAIxP8cTUiGsTMA0GCSqGSIb3DQEBBQUAMBgxFjAUBgNV
-BAMTDXd3dzMuZWR1aWQuY3owHhcNMTQwMjAxMTc1ODA1WhcNMTcwMTMxMTc1ODA1
-WjAYMRYwFAYDVQQDEw13d3czLmVkdWlkLmN6MIIBIjANBgkqhkiG9w0BAQEFAAOC
-AQ8AMIIBCgKCAQEAyNfO9oxDUu8gABeGHQ6hvtQRYEsp5DnPy40Lugfetbr49eX2
-demuocrQIMUY8i/r1wo+ZRhVtPKYj36/OGUrYh3nNpYsVKO3VIk1CNTWwuQi/wuH
-zH5RUAh0aHGIA4zGYOfUnaczACjxN5aKOuoVlXIJ7eMuVsKGfA8og+VO4A+lhY8B
-pXgk13OuR73wSbbwROHwPQa58rjFir88Al70KycuYTv5F7WcTzBEy+ag6nAGz+fP
-DR9OKWfSepFNqom6PUAUCyXQdjn07sy2EnoE4BODKnX+yueXWaXk8DAwK7uUfk45
-NS7vJEToXCCDBqRJMncNzD9jngIp64SQFIMppwIDAQABo10wWzA6BgNVHREEMzAx
-gg13d3czLmVkdWlkLmN6hiBodHRwczovL3d3dzMuZWR1aWQuY3ovc2hpYmJvbGV0
-aDAdBgNVHQ4EFgQUIzEka3BrLts+IxnQs5Vu9e1E3ucwDQYJKoZIhvcNAQEFBQAD
-ggEBABCZ7nwiWmW6njEBHHabyX6FhaurJ73UlDO3JS7mUKjycFkA0HlabWWEeTON
-jcdtHHOzxPodqNe2dtQKa/+fauvTsnKQkBj/f6ESGQAXySuKVgZUs3aXG7C86i01
-lYMJE03P1TwHX60felfwbR4xKRoypz9pOcmqdjxMOpb0+teajFjOShL/Lm0HQs4H
-Fg9FttPBtPrn9khoZcIebOlktQATVCrazQKU0MK2smgxcqIWBoeanyhHuFbNxA/Q
-5FX1LepWs6GsCmK1qxhXj1JRBisqPEaGuauhp1CgtJJdwj5DJ3Fcw29mujFvdnln
-QioqbJmv4wcuTrPvTGy8h1+Q4iI=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www3.eduid.cz/Shibboleth.sso/Artifact/SOAP" index="0"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www3.eduid.cz/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www3.eduid.cz/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www3.eduid.cz/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www3.eduid.cz/Shibboleth.sso/SLO/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www3.eduid.cz/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www2.eduid.cz/Shibboleth.sso/SAML2/POST" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.eduid.cz/Shibboleth.sso/SAML2/POST" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://eduid.cz/Shibboleth.sso/SAML2/POST" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www3.eduid.cz/Shibboleth.sso/SAML2/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www3.eduid.cz/Shibboleth.sso/SAML2/POST-SimpleSign" index="6"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www3.eduid.cz/Shibboleth.sso/SAML2/Artifact" index="7"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www3.eduid.cz/Shibboleth.sso/SAML2/ECP" index="8"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www3.eduid.cz/Shibboleth.sso/SAML/POST" index="9"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www3.eduid.cz/Shibboleth.sso/SAML/Artifact" index="10"/>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">CESNET</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">CESNET</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="cs">CESNET</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.cesnet.cz/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Jan</md:GivenName>
-    <md:SurName>Tomášek</md:SurName>
-    <md:EmailAddress>jan.tomasek@cesnet.cz</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Jan</md:GivenName>
-    <md:SurName>Oppolzer</md:SurName>
-    <md:EmailAddress>jan.oppolzer@cesnet.cz</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www3.eduid.cz.xml b/swamid-interfederations-2.0/www3.eduid.cz.xml
deleted file mode 100644
index 9c1874fb..00000000
--- a/swamid-interfederations-2.0/www3.eduid.cz.xml
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www3.eduid.cz/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/" registrationInstant="2014-02-03T10:42:36Z">
-      <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>
-      <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://www3.eduid.cz/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://www3.eduid.cz/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">eduID.cz</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="cs">eduID.cz</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Informational web of the eduID.cz federation. It brings informations to end users and to technical staff at end institutions.</mdui:Description>
-        <mdui:Description xml:lang="cs">Informační web projektu eduID.cz, který přináší informace jak pro koncové uživatele tak pro správce na jednotlivých institucích.</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.eduid.cz/en/index</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="cs">http://www.eduid.cz</mdui:InformationURL>
-        <mdui:Logo height="63" width="150">https://www.eduid.cz/eduid-logo-150.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>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://www3.eduid.cz/shibboleth</ds:KeyName>
-        <ds:KeyName>www3.eduid.cz</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=www3.eduid.cz</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDEDCCAfigAwIBAgIJAIxP8cTUiGsTMA0GCSqGSIb3DQEBBQUAMBgxFjAUBgNV
-BAMTDXd3dzMuZWR1aWQuY3owHhcNMTQwMjAxMTc1ODA1WhcNMTcwMTMxMTc1ODA1
-WjAYMRYwFAYDVQQDEw13d3czLmVkdWlkLmN6MIIBIjANBgkqhkiG9w0BAQEFAAOC
-AQ8AMIIBCgKCAQEAyNfO9oxDUu8gABeGHQ6hvtQRYEsp5DnPy40Lugfetbr49eX2
-demuocrQIMUY8i/r1wo+ZRhVtPKYj36/OGUrYh3nNpYsVKO3VIk1CNTWwuQi/wuH
-zH5RUAh0aHGIA4zGYOfUnaczACjxN5aKOuoVlXIJ7eMuVsKGfA8og+VO4A+lhY8B
-pXgk13OuR73wSbbwROHwPQa58rjFir88Al70KycuYTv5F7WcTzBEy+ag6nAGz+fP
-DR9OKWfSepFNqom6PUAUCyXQdjn07sy2EnoE4BODKnX+yueXWaXk8DAwK7uUfk45
-NS7vJEToXCCDBqRJMncNzD9jngIp64SQFIMppwIDAQABo10wWzA6BgNVHREEMzAx
-gg13d3czLmVkdWlkLmN6hiBodHRwczovL3d3dzMuZWR1aWQuY3ovc2hpYmJvbGV0
-aDAdBgNVHQ4EFgQUIzEka3BrLts+IxnQs5Vu9e1E3ucwDQYJKoZIhvcNAQEFBQAD
-ggEBABCZ7nwiWmW6njEBHHabyX6FhaurJ73UlDO3JS7mUKjycFkA0HlabWWEeTON
-jcdtHHOzxPodqNe2dtQKa/+fauvTsnKQkBj/f6ESGQAXySuKVgZUs3aXG7C86i01
-lYMJE03P1TwHX60felfwbR4xKRoypz9pOcmqdjxMOpb0+teajFjOShL/Lm0HQs4H
-Fg9FttPBtPrn9khoZcIebOlktQATVCrazQKU0MK2smgxcqIWBoeanyhHuFbNxA/Q
-5FX1LepWs6GsCmK1qxhXj1JRBisqPEaGuauhp1CgtJJdwj5DJ3Fcw29mujFvdnln
-QioqbJmv4wcuTrPvTGy8h1+Q4iI=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www3.eduid.cz/Shibboleth.sso/Artifact/SOAP" index="0"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www3.eduid.cz/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www3.eduid.cz/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www3.eduid.cz/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www3.eduid.cz/Shibboleth.sso/SLO/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www3.eduid.cz/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www2.eduid.cz/Shibboleth.sso/SAML2/POST" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.eduid.cz/Shibboleth.sso/SAML2/POST" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://eduid.cz/Shibboleth.sso/SAML2/POST" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www3.eduid.cz/Shibboleth.sso/SAML2/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www3.eduid.cz/Shibboleth.sso/SAML2/POST-SimpleSign" index="6"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www3.eduid.cz/Shibboleth.sso/SAML2/Artifact" index="7"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www3.eduid.cz/Shibboleth.sso/SAML2/ECP" index="8"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www3.eduid.cz/Shibboleth.sso/SAML/POST" index="9"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www3.eduid.cz/Shibboleth.sso/SAML/Artifact" index="10"/>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">CESNET</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">CESNET</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="cs">CESNET</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.cesnet.cz/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Jan</md:GivenName>
-    <md:SurName>Tomášek</md:SurName>
-    <md:EmailAddress>jan.tomasek@cesnet.cz</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Jan</md:GivenName>
-    <md:SurName>Oppolzer</md:SurName>
-    <md:EmailAddress>jan.oppolzer@cesnet.cz</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/zeroshell.irccs-stellamaris.it:12081-shibboleth.xml b/swamid-interfederations-2.0/zeroshell.irccs-stellamaris.it:12081-shibboleth.xml
deleted file mode 100644
index 353bb8a3..00000000
--- a/swamid-interfederations-2.0/zeroshell.irccs-stellamaris.it:12081-shibboleth.xml
+++ /dev/null
@@ -1,121 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" entityID="https://zeroshell.irccs-stellamaris.it:12081/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2014-06-04T10:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <mdattr:EntityAttributes>
-      <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:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <Extensions>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="en">WIFI powered by IRCCS Fondazione Stella Maris</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="it">WIFI erogato da IRCCS Fondazione Stella Maris</mdui:DisplayName>
-        <mdui:Description xml:lang="en">IRCCS Fondazione Stella Maris, WiFi network access</mdui:Description>
-        <mdui:Description xml:lang="it">Accesso alla rete WiFi di IRCCS Fondazione Stella Maris</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.fsm.unipi.it/idem/servizio_wifi_en.html</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="it">http://www.fsm.unipi.it/idem/servizio_wifi.html</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">http://www.fsm.unipi.it/idem/servizio_wifi_en.html</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="it">http://www.fsm.unipi.it/idem/servizio_wifi.html</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIEpTCCA42gAwIBAgIRAK+9wyhwi2cPugqoTWMzt7wwDQYJKoZIhvcNAQEFBQAw
-NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-IFNTTCBDQTAeFw0xNDA0MTAwMDAwMDBaFw0xNzA0MDkyMzU5NTlaMEwxITAfBgNV
-BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEnMCUGA1UEAxMeemVyb3NoZWxs
-LmlyY2NzLXN0ZWxsYW1hcmlzLml0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
-CgKCAQEAovLKJXlXtWpDN5QxJI/gsBNZb1qMKFC28k/8KNMWRK1J7iJnvSB10qxY
-DIp/N9f5KuOfE/LWEpn0CRYczS0lKvT9ZHxvu//dXF83+CTuwLdYLInlx98gS47K
-eKoJkTSCS3i6nXXu5pkZ3r73eO4Q9F78kWhZp9VGO6FXcqpAWPDXPiX4tySlnZHE
-bVcgKzrop4mYMEwj6/etuqid2FIEE8cttyn0TSZIAqQpvQl6ny53Ew/zNYrfT2yY
-oJhWt7tdGo+icZJ8ajJU1QTAZjGdrxZOcdrVTO8+2G3p6wXIBApEOlY1GtpVvSHy
-tQbatYv3lqykV7sU4fWYcAJ0c1XyIQIDAQABo4IBljCCAZIwHwYDVR0jBBgwFoAU
-DL2TaAzz3qujSWsrN1dH6pDjue0wHQYDVR0OBBYEFBSOJjQD1lbPrYadWn8cPsv5
-C+CBMA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsG
-AQUFBwMBBggrBgEFBQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeB
-DAECATA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3Jn
-L1RFUkVOQVNTTENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0
-dHA6Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUF
-BzABhhpodHRwOi8vb2NzcC50Y3MudGVyZW5hLm9yZzBEBgNVHREEPTA7gh56ZXJv
-c2hlbGwuaXJjY3Mtc3RlbGxhbWFyaXMuaXSCGXdpZmkuaXJjY3Mtc3RlbGxhbWFy
-aXMuaXQwDQYJKoZIhvcNAQEFBQADggEBABmEJgMv0YbYXVbsojatdIXj8AJo0E9Z
-sCjTrGicfPXMqCBo1/h+k2fKfkBEZHgMH+bg/VwSzwnU6LSMnMPZWsHQ6dof697Y
-RLeYr22GJWHkTrHWH+ur2FaB/VzMaRMpBnK084mSrnKmKI2hTHdrv7wYX8lnuYhs
-2k87PGWZAyyfdes9ciVS+wtLVpiauMYkvbdeiYwFkjQaRAWfxzfuXLlDfHT6OD/2
-CYFaxF/RoF9vvQeQQnKwXv3l6SZHei08SgLClw5oWXiwwv8i0cgKNmf0rvXooZJa
-EBqhfy4T1t3TB0ARzgnn8tJ8VwrzLlEJBiy/h77aZregVImJIX6t20M=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIEpTCCA42gAwIBAgIRAK+9wyhwi2cPugqoTWMzt7wwDQYJKoZIhvcNAQEFBQAw
-NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-IFNTTCBDQTAeFw0xNDA0MTAwMDAwMDBaFw0xNzA0MDkyMzU5NTlaMEwxITAfBgNV
-BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEnMCUGA1UEAxMeemVyb3NoZWxs
-LmlyY2NzLXN0ZWxsYW1hcmlzLml0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
-CgKCAQEAovLKJXlXtWpDN5QxJI/gsBNZb1qMKFC28k/8KNMWRK1J7iJnvSB10qxY
-DIp/N9f5KuOfE/LWEpn0CRYczS0lKvT9ZHxvu//dXF83+CTuwLdYLInlx98gS47K
-eKoJkTSCS3i6nXXu5pkZ3r73eO4Q9F78kWhZp9VGO6FXcqpAWPDXPiX4tySlnZHE
-bVcgKzrop4mYMEwj6/etuqid2FIEE8cttyn0TSZIAqQpvQl6ny53Ew/zNYrfT2yY
-oJhWt7tdGo+icZJ8ajJU1QTAZjGdrxZOcdrVTO8+2G3p6wXIBApEOlY1GtpVvSHy
-tQbatYv3lqykV7sU4fWYcAJ0c1XyIQIDAQABo4IBljCCAZIwHwYDVR0jBBgwFoAU
-DL2TaAzz3qujSWsrN1dH6pDjue0wHQYDVR0OBBYEFBSOJjQD1lbPrYadWn8cPsv5
-C+CBMA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsG
-AQUFBwMBBggrBgEFBQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeB
-DAECATA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3Jn
-L1RFUkVOQVNTTENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0
-dHA6Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUF
-BzABhhpodHRwOi8vb2NzcC50Y3MudGVyZW5hLm9yZzBEBgNVHREEPTA7gh56ZXJv
-c2hlbGwuaXJjY3Mtc3RlbGxhbWFyaXMuaXSCGXdpZmkuaXJjY3Mtc3RlbGxhbWFy
-aXMuaXQwDQYJKoZIhvcNAQEFBQADggEBABmEJgMv0YbYXVbsojatdIXj8AJo0E9Z
-sCjTrGicfPXMqCBo1/h+k2fKfkBEZHgMH+bg/VwSzwnU6LSMnMPZWsHQ6dof697Y
-RLeYr22GJWHkTrHWH+ur2FaB/VzMaRMpBnK084mSrnKmKI2hTHdrv7wYX8lnuYhs
-2k87PGWZAyyfdes9ciVS+wtLVpiauMYkvbdeiYwFkjQaRAWfxzfuXLlDfHT6OD/2
-CYFaxF/RoF9vvQeQQnKwXv3l6SZHei08SgLClw5oWXiwwv8i0cgKNmf0rvXooZJa
-EBqhfy4T1t3TB0ARzgnn8tJ8VwrzLlEJBiy/h77aZregVImJIX6t20M=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://zeroshell.irccs-stellamaris.it:12081/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://zeroshell.irccs-stellamaris.it:12081/Shibboleth.sso/SAML/Artifact" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://zeroshell.irccs-stellamaris.it:12081/Shibboleth.sso/SAML/POST" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://zeroshell.irccs-stellamaris.it:12081/Shibboleth.sso/SAML2/ECP" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://zeroshell.irccs-stellamaris.it:12081/Shibboleth.sso/SAML2/Artifact" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://zeroshell.irccs-stellamaris.it:12081/Shibboleth.sso/SAML2/POST-SimpleSign" index="6"/>
-    <AttributeConsumingService index="1">
-      <ServiceName xml:lang="en">WiFi IRCCS Fondazione Stella Maris</ServiceName>
-      <ServiceDescription xml:lang="en">WiFi IRCCS Fondazione Stella Maris</ServiceDescription>
-      <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="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-    </AttributeConsumingService>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">IRCCS Fondazione Stella Maris</OrganizationName>
-    <OrganizationName xml:lang="it">IRCCS Fondazione Stella Maris</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">WiFi provided by IRCCS Fondazione Stella Maris</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="it">WiFi erogato da IRCCS Fondazione Stella Maris</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.fsm.unipi.it</OrganizationURL>
-    <OrganizationURL xml:lang="it">http://www.fsm.unipi.it</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="administrative">
-    <SurName>Massimo Del Sarto</SurName>
-    <EmailAddress>ced@fsm.unipi.it</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <EmailAddress>ced@fsm.unipi.it</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/zeroshell.irccs-stellamaris.it:12081.xml b/swamid-interfederations-2.0/zeroshell.irccs-stellamaris.it:12081.xml
deleted file mode 100644
index 353bb8a3..00000000
--- a/swamid-interfederations-2.0/zeroshell.irccs-stellamaris.it:12081.xml
+++ /dev/null
@@ -1,121 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" entityID="https://zeroshell.irccs-stellamaris.it:12081/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2014-06-04T10:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <mdattr:EntityAttributes>
-      <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:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <Extensions>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="en">WIFI powered by IRCCS Fondazione Stella Maris</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="it">WIFI erogato da IRCCS Fondazione Stella Maris</mdui:DisplayName>
-        <mdui:Description xml:lang="en">IRCCS Fondazione Stella Maris, WiFi network access</mdui:Description>
-        <mdui:Description xml:lang="it">Accesso alla rete WiFi di IRCCS Fondazione Stella Maris</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.fsm.unipi.it/idem/servizio_wifi_en.html</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="it">http://www.fsm.unipi.it/idem/servizio_wifi.html</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">http://www.fsm.unipi.it/idem/servizio_wifi_en.html</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="it">http://www.fsm.unipi.it/idem/servizio_wifi.html</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIEpTCCA42gAwIBAgIRAK+9wyhwi2cPugqoTWMzt7wwDQYJKoZIhvcNAQEFBQAw
-NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-IFNTTCBDQTAeFw0xNDA0MTAwMDAwMDBaFw0xNzA0MDkyMzU5NTlaMEwxITAfBgNV
-BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEnMCUGA1UEAxMeemVyb3NoZWxs
-LmlyY2NzLXN0ZWxsYW1hcmlzLml0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
-CgKCAQEAovLKJXlXtWpDN5QxJI/gsBNZb1qMKFC28k/8KNMWRK1J7iJnvSB10qxY
-DIp/N9f5KuOfE/LWEpn0CRYczS0lKvT9ZHxvu//dXF83+CTuwLdYLInlx98gS47K
-eKoJkTSCS3i6nXXu5pkZ3r73eO4Q9F78kWhZp9VGO6FXcqpAWPDXPiX4tySlnZHE
-bVcgKzrop4mYMEwj6/etuqid2FIEE8cttyn0TSZIAqQpvQl6ny53Ew/zNYrfT2yY
-oJhWt7tdGo+icZJ8ajJU1QTAZjGdrxZOcdrVTO8+2G3p6wXIBApEOlY1GtpVvSHy
-tQbatYv3lqykV7sU4fWYcAJ0c1XyIQIDAQABo4IBljCCAZIwHwYDVR0jBBgwFoAU
-DL2TaAzz3qujSWsrN1dH6pDjue0wHQYDVR0OBBYEFBSOJjQD1lbPrYadWn8cPsv5
-C+CBMA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsG
-AQUFBwMBBggrBgEFBQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeB
-DAECATA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3Jn
-L1RFUkVOQVNTTENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0
-dHA6Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUF
-BzABhhpodHRwOi8vb2NzcC50Y3MudGVyZW5hLm9yZzBEBgNVHREEPTA7gh56ZXJv
-c2hlbGwuaXJjY3Mtc3RlbGxhbWFyaXMuaXSCGXdpZmkuaXJjY3Mtc3RlbGxhbWFy
-aXMuaXQwDQYJKoZIhvcNAQEFBQADggEBABmEJgMv0YbYXVbsojatdIXj8AJo0E9Z
-sCjTrGicfPXMqCBo1/h+k2fKfkBEZHgMH+bg/VwSzwnU6LSMnMPZWsHQ6dof697Y
-RLeYr22GJWHkTrHWH+ur2FaB/VzMaRMpBnK084mSrnKmKI2hTHdrv7wYX8lnuYhs
-2k87PGWZAyyfdes9ciVS+wtLVpiauMYkvbdeiYwFkjQaRAWfxzfuXLlDfHT6OD/2
-CYFaxF/RoF9vvQeQQnKwXv3l6SZHei08SgLClw5oWXiwwv8i0cgKNmf0rvXooZJa
-EBqhfy4T1t3TB0ARzgnn8tJ8VwrzLlEJBiy/h77aZregVImJIX6t20M=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIEpTCCA42gAwIBAgIRAK+9wyhwi2cPugqoTWMzt7wwDQYJKoZIhvcNAQEFBQAw
-NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-IFNTTCBDQTAeFw0xNDA0MTAwMDAwMDBaFw0xNzA0MDkyMzU5NTlaMEwxITAfBgNV
-BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEnMCUGA1UEAxMeemVyb3NoZWxs
-LmlyY2NzLXN0ZWxsYW1hcmlzLml0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
-CgKCAQEAovLKJXlXtWpDN5QxJI/gsBNZb1qMKFC28k/8KNMWRK1J7iJnvSB10qxY
-DIp/N9f5KuOfE/LWEpn0CRYczS0lKvT9ZHxvu//dXF83+CTuwLdYLInlx98gS47K
-eKoJkTSCS3i6nXXu5pkZ3r73eO4Q9F78kWhZp9VGO6FXcqpAWPDXPiX4tySlnZHE
-bVcgKzrop4mYMEwj6/etuqid2FIEE8cttyn0TSZIAqQpvQl6ny53Ew/zNYrfT2yY
-oJhWt7tdGo+icZJ8ajJU1QTAZjGdrxZOcdrVTO8+2G3p6wXIBApEOlY1GtpVvSHy
-tQbatYv3lqykV7sU4fWYcAJ0c1XyIQIDAQABo4IBljCCAZIwHwYDVR0jBBgwFoAU
-DL2TaAzz3qujSWsrN1dH6pDjue0wHQYDVR0OBBYEFBSOJjQD1lbPrYadWn8cPsv5
-C+CBMA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsG
-AQUFBwMBBggrBgEFBQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeB
-DAECATA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3Jn
-L1RFUkVOQVNTTENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0
-dHA6Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUF
-BzABhhpodHRwOi8vb2NzcC50Y3MudGVyZW5hLm9yZzBEBgNVHREEPTA7gh56ZXJv
-c2hlbGwuaXJjY3Mtc3RlbGxhbWFyaXMuaXSCGXdpZmkuaXJjY3Mtc3RlbGxhbWFy
-aXMuaXQwDQYJKoZIhvcNAQEFBQADggEBABmEJgMv0YbYXVbsojatdIXj8AJo0E9Z
-sCjTrGicfPXMqCBo1/h+k2fKfkBEZHgMH+bg/VwSzwnU6LSMnMPZWsHQ6dof697Y
-RLeYr22GJWHkTrHWH+ur2FaB/VzMaRMpBnK084mSrnKmKI2hTHdrv7wYX8lnuYhs
-2k87PGWZAyyfdes9ciVS+wtLVpiauMYkvbdeiYwFkjQaRAWfxzfuXLlDfHT6OD/2
-CYFaxF/RoF9vvQeQQnKwXv3l6SZHei08SgLClw5oWXiwwv8i0cgKNmf0rvXooZJa
-EBqhfy4T1t3TB0ARzgnn8tJ8VwrzLlEJBiy/h77aZregVImJIX6t20M=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://zeroshell.irccs-stellamaris.it:12081/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://zeroshell.irccs-stellamaris.it:12081/Shibboleth.sso/SAML/Artifact" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://zeroshell.irccs-stellamaris.it:12081/Shibboleth.sso/SAML/POST" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://zeroshell.irccs-stellamaris.it:12081/Shibboleth.sso/SAML2/ECP" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://zeroshell.irccs-stellamaris.it:12081/Shibboleth.sso/SAML2/Artifact" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://zeroshell.irccs-stellamaris.it:12081/Shibboleth.sso/SAML2/POST-SimpleSign" index="6"/>
-    <AttributeConsumingService index="1">
-      <ServiceName xml:lang="en">WiFi IRCCS Fondazione Stella Maris</ServiceName>
-      <ServiceDescription xml:lang="en">WiFi IRCCS Fondazione Stella Maris</ServiceDescription>
-      <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="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-    </AttributeConsumingService>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">IRCCS Fondazione Stella Maris</OrganizationName>
-    <OrganizationName xml:lang="it">IRCCS Fondazione Stella Maris</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">WiFi provided by IRCCS Fondazione Stella Maris</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="it">WiFi erogato da IRCCS Fondazione Stella Maris</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.fsm.unipi.it</OrganizationURL>
-    <OrganizationURL xml:lang="it">http://www.fsm.unipi.it</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="administrative">
-    <SurName>Massimo Del Sarto</SurName>
-    <EmailAddress>ced@fsm.unipi.it</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <EmailAddress>ced@fsm.unipi.it</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/zididp.uni-graz.at-idp-shibboleth.xml b/swamid-interfederations-2.0/zididp.uni-graz.at-idp-shibboleth.xml
deleted file mode 100644
index c10b18fc..00000000
--- a/swamid-interfederations-2.0/zididp.uni-graz.at-idp-shibboleth.xml
+++ /dev/null
@@ -1,170 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://zididp.uni-graz.at/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://eduid.at" registrationInstant="2009-01-29T22:40:01Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://eduid.at/policy/mdrps-20140606</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">uni-graz.at</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="de">Universität Graz</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">University of Graz</mdui:DisplayName>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIID8TCCAtmgAwIBAgILAQAAAAABHJ3GXLgwDQYJKoZIhvcNAQEFBQAwXzELMAkG
-A1UEBhMCQkUxEzARBgNVBAoTCkN5YmVydHJ1c3QxFzAVBgNVBAsTDkVkdWNhdGlv
-bmFsIENBMSIwIAYDVQQDExlDeWJlcnRydXN0IEVkdWNhdGlvbmFsIENBMB4XDTA4
-MDkyNjA4Mjg1NFoXDTExMDkyNjA4Mjg1NFowgZwxCzAJBgNVBAYTAkFUMSgwJgYD
-VQQKEx9LYXJsLUZyYW56ZW5zLVVuaXZlcnNpdGFldCBHcmF6MQwwCgYDVQQLEwNa
-SUQxHjAcBgNVBAMTFXppZDEyOTE1Mi51bmktZ3Jhei5hdDEYMBYGA1UEAxMPaWRw
-LnVuaS1ncmF6LmF0MRswGQYDVQQDExJ6aWRpZHAudW5pLWdyYXouYXQwgZ8wDQYJ
-KoZIhvcNAQEBBQADgY0AMIGJAoGBALtSK1LsNVQ3eyIh4bS3fAmwjAHCzq1jd9NU
-wQFHrFPTzhObsZQM1Pc//QnTXH3x9bSAebR8WI+SmlRpe/p7BvGkEQDS45k6UZ7Y
-CicOizdCqN/iLr/XqwkUFcmVXN/mcoWFsc+637MUqj6O/Yl3f5jTRwacxUgn9pSs
-JHw9FAIrAgMBAAGjgfMwgfAwDgYDVR0PAQH/BAQDAgWgMB8GA1UdIwQYMBaAFGVl
-oz3XOxGjCgclN8lCSlt2d1DhMB0GA1UdDgQWBBTeRMWMrXJOPmghKlcEp0lPrACE
-8jA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLmdsb2JhbHNpZ24ubmV0L2Vk
-dWNhdGlvbmFsLmNybDBPBggrBgEFBQcBAQRDMEEwPwYIKwYBBQUHMAKGM2h0dHA6
-Ly9zZWN1cmUuZ2xvYmFsc2lnbi5uZXQvY2FjZXJ0L2VkdWNhdGlvbmFsLmNydDAR
-BglghkgBhvhCAQEEBAMCBsAwDQYJKoZIhvcNAQEFBQADggEBAGI02zqTHQP4SHrF
-cCE35HpamKHY3c6EqsiLVVInsKAK3XGSlJgbr+ao7WryiXuayxopO/z+ioNxzeve
-Z8r7MUtlx/WjTq05kxdzVEjqCZvTjIe0rfpI6vnaoOW2BLkhnLk63pq9Yv0wUtA2
-WvfWgO+7ckZvWr1lAY4ZtM8ReSzSpE2Zgzj8LVegu5ZllBTdq0HK8FuLvjfBD5BM
-R05jQr92kSpWuJP3W73z5eJmhRjfkrsA/amYJ2tmR2cpOchaVUF/aWqifql4T4w9
-iwXgV22Ekaxei+vI9Lfz5w9hD/mLbFGUlA3TAs1c+7bYYCzkrpa1s0FE287zOLAL
-9QEPjwI=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIID2DCCAsACCQC6ske5V5+nWTANBgkqhkiG9w0BAQUFADCBrTEaMBgGA1UEChMR
-VW5pdmVyc2l0YWV0IEdyYXoxHzAdBgNVBAsTFkluZm9ybWF0aW9uc21hbmFnZW1l
-bnQxJDAiBgkqhkiG9w0BCQEWFWNlcnRhZG1pbkB1bmktZ3Jhei5hdDENMAsGA1UE
-BxMER3JhejEPMA0GA1UECBMGc3R5cmlhMQswCQYDVQQGEwJBVDEbMBkGA1UEAxMS
-emlkaWRwLnVuaS1ncmF6LmF0MB4XDTE0MDkxNzExMjU1OVoXDTM0MDkxMjExMjU1
-OVowga0xGjAYBgNVBAoTEVVuaXZlcnNpdGFldCBHcmF6MR8wHQYDVQQLExZJbmZv
-cm1hdGlvbnNtYW5hZ2VtZW50MSQwIgYJKoZIhvcNAQkBFhVjZXJ0YWRtaW5AdW5p
-LWdyYXouYXQxDTALBgNVBAcTBEdyYXoxDzANBgNVBAgTBnN0eXJpYTELMAkGA1UE
-BhMCQVQxGzAZBgNVBAMTEnppZGlkcC51bmktZ3Jhei5hdDCCASIwDQYJKoZIhvcN
-AQEBBQADggEPADCCAQoCggEBAKdi7feZnBDwtrWaXh17FKpVELVl+G+nCoAQ+6W9
-/Ypxhnil/DTw5FeTbEGsRY0FeaNuSCalAbnRoujSevkEfbnXEVjHH7Kenvq11N5J
-EWmt9im07Ed3DkI0CTBLKDsX/PSlORYC4wEttv2owTxXeb57uvcgBjx4kVjeYoFQ
-pgM2lOGy3Hor9t8rQPhggjBgsEi6tzz5BfTUiy/xDP6Ghxkrk33f7rHhRhR759u4
-xXGzdzgUsZtriMVnoOsqWk39SiFYB0p8RQOComQlp0B8sOuco6lP7X4bta90K5nI
-x2dPqrMjSBdCH+k1EQoqhwIqZSdiJvYqY1ujs8mSTsthq6sCAwEAATANBgkqhkiG
-9w0BAQUFAAOCAQEAUGdarc5KLh56hxfUD77PfvTO/N1t/mRyCxa+scH7EMr+98PW
-kktOoT3UOoAA9Z6A26wIVUBWCna551+Nd3MCBSooVPFxqWo+mGIj4ySnzslJbbv2
-pizCZc6ah4wTpgubjx8vp6fNuLiyXuaOcJqbYJEGzm7gH+gGXKs0C5L9wpPhQ4dG
-fiNgJG5ke2PFmkBH5uc5rAjV+eutWnwB2x4xLEtIlPoQINUJd4ZtfcOQH/G11rTI
-lwIys35bnmIF1VwgYaZJcB0+QBBhZ4KmC9ktOQbi6rKEQzwfbBosZHmgjo+V7hrW
-qtWKibftATdhRMkGvf8LQMI34BK8fGQw9VA3Vg==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://zididp.uni-graz.at:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://zididp.uni-graz.at: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:1.1:nameid-format:unspecified</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://zididp.uni-graz.at/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://zididp.uni-graz.at/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://zididp.uni-graz.at/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://zididp.uni-graz.at/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">uni-graz.at</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIID8TCCAtmgAwIBAgILAQAAAAABHJ3GXLgwDQYJKoZIhvcNAQEFBQAwXzELMAkG
-A1UEBhMCQkUxEzARBgNVBAoTCkN5YmVydHJ1c3QxFzAVBgNVBAsTDkVkdWNhdGlv
-bmFsIENBMSIwIAYDVQQDExlDeWJlcnRydXN0IEVkdWNhdGlvbmFsIENBMB4XDTA4
-MDkyNjA4Mjg1NFoXDTExMDkyNjA4Mjg1NFowgZwxCzAJBgNVBAYTAkFUMSgwJgYD
-VQQKEx9LYXJsLUZyYW56ZW5zLVVuaXZlcnNpdGFldCBHcmF6MQwwCgYDVQQLEwNa
-SUQxHjAcBgNVBAMTFXppZDEyOTE1Mi51bmktZ3Jhei5hdDEYMBYGA1UEAxMPaWRw
-LnVuaS1ncmF6LmF0MRswGQYDVQQDExJ6aWRpZHAudW5pLWdyYXouYXQwgZ8wDQYJ
-KoZIhvcNAQEBBQADgY0AMIGJAoGBALtSK1LsNVQ3eyIh4bS3fAmwjAHCzq1jd9NU
-wQFHrFPTzhObsZQM1Pc//QnTXH3x9bSAebR8WI+SmlRpe/p7BvGkEQDS45k6UZ7Y
-CicOizdCqN/iLr/XqwkUFcmVXN/mcoWFsc+637MUqj6O/Yl3f5jTRwacxUgn9pSs
-JHw9FAIrAgMBAAGjgfMwgfAwDgYDVR0PAQH/BAQDAgWgMB8GA1UdIwQYMBaAFGVl
-oz3XOxGjCgclN8lCSlt2d1DhMB0GA1UdDgQWBBTeRMWMrXJOPmghKlcEp0lPrACE
-8jA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLmdsb2JhbHNpZ24ubmV0L2Vk
-dWNhdGlvbmFsLmNybDBPBggrBgEFBQcBAQRDMEEwPwYIKwYBBQUHMAKGM2h0dHA6
-Ly9zZWN1cmUuZ2xvYmFsc2lnbi5uZXQvY2FjZXJ0L2VkdWNhdGlvbmFsLmNydDAR
-BglghkgBhvhCAQEEBAMCBsAwDQYJKoZIhvcNAQEFBQADggEBAGI02zqTHQP4SHrF
-cCE35HpamKHY3c6EqsiLVVInsKAK3XGSlJgbr+ao7WryiXuayxopO/z+ioNxzeve
-Z8r7MUtlx/WjTq05kxdzVEjqCZvTjIe0rfpI6vnaoOW2BLkhnLk63pq9Yv0wUtA2
-WvfWgO+7ckZvWr1lAY4ZtM8ReSzSpE2Zgzj8LVegu5ZllBTdq0HK8FuLvjfBD5BM
-R05jQr92kSpWuJP3W73z5eJmhRjfkrsA/amYJ2tmR2cpOchaVUF/aWqifql4T4w9
-iwXgV22Ekaxei+vI9Lfz5w9hD/mLbFGUlA3TAs1c+7bYYCzkrpa1s0FE287zOLAL
-9QEPjwI=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIID2DCCAsACCQC6ske5V5+nWTANBgkqhkiG9w0BAQUFADCBrTEaMBgGA1UEChMR
-VW5pdmVyc2l0YWV0IEdyYXoxHzAdBgNVBAsTFkluZm9ybWF0aW9uc21hbmFnZW1l
-bnQxJDAiBgkqhkiG9w0BCQEWFWNlcnRhZG1pbkB1bmktZ3Jhei5hdDENMAsGA1UE
-BxMER3JhejEPMA0GA1UECBMGc3R5cmlhMQswCQYDVQQGEwJBVDEbMBkGA1UEAxMS
-emlkaWRwLnVuaS1ncmF6LmF0MB4XDTE0MDkxNzExMjU1OVoXDTM0MDkxMjExMjU1
-OVowga0xGjAYBgNVBAoTEVVuaXZlcnNpdGFldCBHcmF6MR8wHQYDVQQLExZJbmZv
-cm1hdGlvbnNtYW5hZ2VtZW50MSQwIgYJKoZIhvcNAQkBFhVjZXJ0YWRtaW5AdW5p
-LWdyYXouYXQxDTALBgNVBAcTBEdyYXoxDzANBgNVBAgTBnN0eXJpYTELMAkGA1UE
-BhMCQVQxGzAZBgNVBAMTEnppZGlkcC51bmktZ3Jhei5hdDCCASIwDQYJKoZIhvcN
-AQEBBQADggEPADCCAQoCggEBAKdi7feZnBDwtrWaXh17FKpVELVl+G+nCoAQ+6W9
-/Ypxhnil/DTw5FeTbEGsRY0FeaNuSCalAbnRoujSevkEfbnXEVjHH7Kenvq11N5J
-EWmt9im07Ed3DkI0CTBLKDsX/PSlORYC4wEttv2owTxXeb57uvcgBjx4kVjeYoFQ
-pgM2lOGy3Hor9t8rQPhggjBgsEi6tzz5BfTUiy/xDP6Ghxkrk33f7rHhRhR759u4
-xXGzdzgUsZtriMVnoOsqWk39SiFYB0p8RQOComQlp0B8sOuco6lP7X4bta90K5nI
-x2dPqrMjSBdCH+k1EQoqhwIqZSdiJvYqY1ujs8mSTsthq6sCAwEAATANBgkqhkiG
-9w0BAQUFAAOCAQEAUGdarc5KLh56hxfUD77PfvTO/N1t/mRyCxa+scH7EMr+98PW
-kktOoT3UOoAA9Z6A26wIVUBWCna551+Nd3MCBSooVPFxqWo+mGIj4ySnzslJbbv2
-pizCZc6ah4wTpgubjx8vp6fNuLiyXuaOcJqbYJEGzm7gH+gGXKs0C5L9wpPhQ4dG
-fiNgJG5ke2PFmkBH5uc5rAjV+eutWnwB2x4xLEtIlPoQINUJd4ZtfcOQH/G11rTI
-lwIys35bnmIF1VwgYaZJcB0+QBBhZ4KmC9ktOQbi6rKEQzwfbBosZHmgjo+V7hrW
-qtWKibftATdhRMkGvf8LQMI34BK8fGQw9VA3Vg==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://zididp.uni-graz.at:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://zididp.uni-graz.at:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="de">Universität Graz</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">University of Graz</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="de">Universität Graz</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">University of Graz</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="de">http://www.uni-graz.at/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.uni-graz.at/E/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Technical</md:GivenName>
-    <md:SurName>Support</md:SurName>
-    <md:EmailAddress>mailto:guenther.berthold@uni-graz.at</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>IT-Support</md:GivenName>
-    <md:SurName>Helpdesk</md:SurName>
-    <md:EmailAddress>mailto:helpdesk@uni-graz.at</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/zididp.uni-graz.at.xml b/swamid-interfederations-2.0/zididp.uni-graz.at.xml
deleted file mode 100644
index c10b18fc..00000000
--- a/swamid-interfederations-2.0/zididp.uni-graz.at.xml
+++ /dev/null
@@ -1,170 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://zididp.uni-graz.at/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://eduid.at" registrationInstant="2009-01-29T22:40:01Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://eduid.at/policy/mdrps-20140606</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">uni-graz.at</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="de">Universität Graz</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">University of Graz</mdui:DisplayName>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIID8TCCAtmgAwIBAgILAQAAAAABHJ3GXLgwDQYJKoZIhvcNAQEFBQAwXzELMAkG
-A1UEBhMCQkUxEzARBgNVBAoTCkN5YmVydHJ1c3QxFzAVBgNVBAsTDkVkdWNhdGlv
-bmFsIENBMSIwIAYDVQQDExlDeWJlcnRydXN0IEVkdWNhdGlvbmFsIENBMB4XDTA4
-MDkyNjA4Mjg1NFoXDTExMDkyNjA4Mjg1NFowgZwxCzAJBgNVBAYTAkFUMSgwJgYD
-VQQKEx9LYXJsLUZyYW56ZW5zLVVuaXZlcnNpdGFldCBHcmF6MQwwCgYDVQQLEwNa
-SUQxHjAcBgNVBAMTFXppZDEyOTE1Mi51bmktZ3Jhei5hdDEYMBYGA1UEAxMPaWRw
-LnVuaS1ncmF6LmF0MRswGQYDVQQDExJ6aWRpZHAudW5pLWdyYXouYXQwgZ8wDQYJ
-KoZIhvcNAQEBBQADgY0AMIGJAoGBALtSK1LsNVQ3eyIh4bS3fAmwjAHCzq1jd9NU
-wQFHrFPTzhObsZQM1Pc//QnTXH3x9bSAebR8WI+SmlRpe/p7BvGkEQDS45k6UZ7Y
-CicOizdCqN/iLr/XqwkUFcmVXN/mcoWFsc+637MUqj6O/Yl3f5jTRwacxUgn9pSs
-JHw9FAIrAgMBAAGjgfMwgfAwDgYDVR0PAQH/BAQDAgWgMB8GA1UdIwQYMBaAFGVl
-oz3XOxGjCgclN8lCSlt2d1DhMB0GA1UdDgQWBBTeRMWMrXJOPmghKlcEp0lPrACE
-8jA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLmdsb2JhbHNpZ24ubmV0L2Vk
-dWNhdGlvbmFsLmNybDBPBggrBgEFBQcBAQRDMEEwPwYIKwYBBQUHMAKGM2h0dHA6
-Ly9zZWN1cmUuZ2xvYmFsc2lnbi5uZXQvY2FjZXJ0L2VkdWNhdGlvbmFsLmNydDAR
-BglghkgBhvhCAQEEBAMCBsAwDQYJKoZIhvcNAQEFBQADggEBAGI02zqTHQP4SHrF
-cCE35HpamKHY3c6EqsiLVVInsKAK3XGSlJgbr+ao7WryiXuayxopO/z+ioNxzeve
-Z8r7MUtlx/WjTq05kxdzVEjqCZvTjIe0rfpI6vnaoOW2BLkhnLk63pq9Yv0wUtA2
-WvfWgO+7ckZvWr1lAY4ZtM8ReSzSpE2Zgzj8LVegu5ZllBTdq0HK8FuLvjfBD5BM
-R05jQr92kSpWuJP3W73z5eJmhRjfkrsA/amYJ2tmR2cpOchaVUF/aWqifql4T4w9
-iwXgV22Ekaxei+vI9Lfz5w9hD/mLbFGUlA3TAs1c+7bYYCzkrpa1s0FE287zOLAL
-9QEPjwI=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIID2DCCAsACCQC6ske5V5+nWTANBgkqhkiG9w0BAQUFADCBrTEaMBgGA1UEChMR
-VW5pdmVyc2l0YWV0IEdyYXoxHzAdBgNVBAsTFkluZm9ybWF0aW9uc21hbmFnZW1l
-bnQxJDAiBgkqhkiG9w0BCQEWFWNlcnRhZG1pbkB1bmktZ3Jhei5hdDENMAsGA1UE
-BxMER3JhejEPMA0GA1UECBMGc3R5cmlhMQswCQYDVQQGEwJBVDEbMBkGA1UEAxMS
-emlkaWRwLnVuaS1ncmF6LmF0MB4XDTE0MDkxNzExMjU1OVoXDTM0MDkxMjExMjU1
-OVowga0xGjAYBgNVBAoTEVVuaXZlcnNpdGFldCBHcmF6MR8wHQYDVQQLExZJbmZv
-cm1hdGlvbnNtYW5hZ2VtZW50MSQwIgYJKoZIhvcNAQkBFhVjZXJ0YWRtaW5AdW5p
-LWdyYXouYXQxDTALBgNVBAcTBEdyYXoxDzANBgNVBAgTBnN0eXJpYTELMAkGA1UE
-BhMCQVQxGzAZBgNVBAMTEnppZGlkcC51bmktZ3Jhei5hdDCCASIwDQYJKoZIhvcN
-AQEBBQADggEPADCCAQoCggEBAKdi7feZnBDwtrWaXh17FKpVELVl+G+nCoAQ+6W9
-/Ypxhnil/DTw5FeTbEGsRY0FeaNuSCalAbnRoujSevkEfbnXEVjHH7Kenvq11N5J
-EWmt9im07Ed3DkI0CTBLKDsX/PSlORYC4wEttv2owTxXeb57uvcgBjx4kVjeYoFQ
-pgM2lOGy3Hor9t8rQPhggjBgsEi6tzz5BfTUiy/xDP6Ghxkrk33f7rHhRhR759u4
-xXGzdzgUsZtriMVnoOsqWk39SiFYB0p8RQOComQlp0B8sOuco6lP7X4bta90K5nI
-x2dPqrMjSBdCH+k1EQoqhwIqZSdiJvYqY1ujs8mSTsthq6sCAwEAATANBgkqhkiG
-9w0BAQUFAAOCAQEAUGdarc5KLh56hxfUD77PfvTO/N1t/mRyCxa+scH7EMr+98PW
-kktOoT3UOoAA9Z6A26wIVUBWCna551+Nd3MCBSooVPFxqWo+mGIj4ySnzslJbbv2
-pizCZc6ah4wTpgubjx8vp6fNuLiyXuaOcJqbYJEGzm7gH+gGXKs0C5L9wpPhQ4dG
-fiNgJG5ke2PFmkBH5uc5rAjV+eutWnwB2x4xLEtIlPoQINUJd4ZtfcOQH/G11rTI
-lwIys35bnmIF1VwgYaZJcB0+QBBhZ4KmC9ktOQbi6rKEQzwfbBosZHmgjo+V7hrW
-qtWKibftATdhRMkGvf8LQMI34BK8fGQw9VA3Vg==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://zididp.uni-graz.at:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://zididp.uni-graz.at: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:1.1:nameid-format:unspecified</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://zididp.uni-graz.at/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://zididp.uni-graz.at/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://zididp.uni-graz.at/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://zididp.uni-graz.at/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">uni-graz.at</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIID8TCCAtmgAwIBAgILAQAAAAABHJ3GXLgwDQYJKoZIhvcNAQEFBQAwXzELMAkG
-A1UEBhMCQkUxEzARBgNVBAoTCkN5YmVydHJ1c3QxFzAVBgNVBAsTDkVkdWNhdGlv
-bmFsIENBMSIwIAYDVQQDExlDeWJlcnRydXN0IEVkdWNhdGlvbmFsIENBMB4XDTA4
-MDkyNjA4Mjg1NFoXDTExMDkyNjA4Mjg1NFowgZwxCzAJBgNVBAYTAkFUMSgwJgYD
-VQQKEx9LYXJsLUZyYW56ZW5zLVVuaXZlcnNpdGFldCBHcmF6MQwwCgYDVQQLEwNa
-SUQxHjAcBgNVBAMTFXppZDEyOTE1Mi51bmktZ3Jhei5hdDEYMBYGA1UEAxMPaWRw
-LnVuaS1ncmF6LmF0MRswGQYDVQQDExJ6aWRpZHAudW5pLWdyYXouYXQwgZ8wDQYJ
-KoZIhvcNAQEBBQADgY0AMIGJAoGBALtSK1LsNVQ3eyIh4bS3fAmwjAHCzq1jd9NU
-wQFHrFPTzhObsZQM1Pc//QnTXH3x9bSAebR8WI+SmlRpe/p7BvGkEQDS45k6UZ7Y
-CicOizdCqN/iLr/XqwkUFcmVXN/mcoWFsc+637MUqj6O/Yl3f5jTRwacxUgn9pSs
-JHw9FAIrAgMBAAGjgfMwgfAwDgYDVR0PAQH/BAQDAgWgMB8GA1UdIwQYMBaAFGVl
-oz3XOxGjCgclN8lCSlt2d1DhMB0GA1UdDgQWBBTeRMWMrXJOPmghKlcEp0lPrACE
-8jA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLmdsb2JhbHNpZ24ubmV0L2Vk
-dWNhdGlvbmFsLmNybDBPBggrBgEFBQcBAQRDMEEwPwYIKwYBBQUHMAKGM2h0dHA6
-Ly9zZWN1cmUuZ2xvYmFsc2lnbi5uZXQvY2FjZXJ0L2VkdWNhdGlvbmFsLmNydDAR
-BglghkgBhvhCAQEEBAMCBsAwDQYJKoZIhvcNAQEFBQADggEBAGI02zqTHQP4SHrF
-cCE35HpamKHY3c6EqsiLVVInsKAK3XGSlJgbr+ao7WryiXuayxopO/z+ioNxzeve
-Z8r7MUtlx/WjTq05kxdzVEjqCZvTjIe0rfpI6vnaoOW2BLkhnLk63pq9Yv0wUtA2
-WvfWgO+7ckZvWr1lAY4ZtM8ReSzSpE2Zgzj8LVegu5ZllBTdq0HK8FuLvjfBD5BM
-R05jQr92kSpWuJP3W73z5eJmhRjfkrsA/amYJ2tmR2cpOchaVUF/aWqifql4T4w9
-iwXgV22Ekaxei+vI9Lfz5w9hD/mLbFGUlA3TAs1c+7bYYCzkrpa1s0FE287zOLAL
-9QEPjwI=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIID2DCCAsACCQC6ske5V5+nWTANBgkqhkiG9w0BAQUFADCBrTEaMBgGA1UEChMR
-VW5pdmVyc2l0YWV0IEdyYXoxHzAdBgNVBAsTFkluZm9ybWF0aW9uc21hbmFnZW1l
-bnQxJDAiBgkqhkiG9w0BCQEWFWNlcnRhZG1pbkB1bmktZ3Jhei5hdDENMAsGA1UE
-BxMER3JhejEPMA0GA1UECBMGc3R5cmlhMQswCQYDVQQGEwJBVDEbMBkGA1UEAxMS
-emlkaWRwLnVuaS1ncmF6LmF0MB4XDTE0MDkxNzExMjU1OVoXDTM0MDkxMjExMjU1
-OVowga0xGjAYBgNVBAoTEVVuaXZlcnNpdGFldCBHcmF6MR8wHQYDVQQLExZJbmZv
-cm1hdGlvbnNtYW5hZ2VtZW50MSQwIgYJKoZIhvcNAQkBFhVjZXJ0YWRtaW5AdW5p
-LWdyYXouYXQxDTALBgNVBAcTBEdyYXoxDzANBgNVBAgTBnN0eXJpYTELMAkGA1UE
-BhMCQVQxGzAZBgNVBAMTEnppZGlkcC51bmktZ3Jhei5hdDCCASIwDQYJKoZIhvcN
-AQEBBQADggEPADCCAQoCggEBAKdi7feZnBDwtrWaXh17FKpVELVl+G+nCoAQ+6W9
-/Ypxhnil/DTw5FeTbEGsRY0FeaNuSCalAbnRoujSevkEfbnXEVjHH7Kenvq11N5J
-EWmt9im07Ed3DkI0CTBLKDsX/PSlORYC4wEttv2owTxXeb57uvcgBjx4kVjeYoFQ
-pgM2lOGy3Hor9t8rQPhggjBgsEi6tzz5BfTUiy/xDP6Ghxkrk33f7rHhRhR759u4
-xXGzdzgUsZtriMVnoOsqWk39SiFYB0p8RQOComQlp0B8sOuco6lP7X4bta90K5nI
-x2dPqrMjSBdCH+k1EQoqhwIqZSdiJvYqY1ujs8mSTsthq6sCAwEAATANBgkqhkiG
-9w0BAQUFAAOCAQEAUGdarc5KLh56hxfUD77PfvTO/N1t/mRyCxa+scH7EMr+98PW
-kktOoT3UOoAA9Z6A26wIVUBWCna551+Nd3MCBSooVPFxqWo+mGIj4ySnzslJbbv2
-pizCZc6ah4wTpgubjx8vp6fNuLiyXuaOcJqbYJEGzm7gH+gGXKs0C5L9wpPhQ4dG
-fiNgJG5ke2PFmkBH5uc5rAjV+eutWnwB2x4xLEtIlPoQINUJd4ZtfcOQH/G11rTI
-lwIys35bnmIF1VwgYaZJcB0+QBBhZ4KmC9ktOQbi6rKEQzwfbBosZHmgjo+V7hrW
-qtWKibftATdhRMkGvf8LQMI34BK8fGQw9VA3Vg==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://zididp.uni-graz.at:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://zididp.uni-graz.at:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="de">Universität Graz</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">University of Graz</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="de">Universität Graz</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">University of Graz</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="de">http://www.uni-graz.at/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.uni-graz.at/E/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Technical</md:GivenName>
-    <md:SurName>Support</md:SurName>
-    <md:EmailAddress>mailto:guenther.berthold@uni-graz.at</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>IT-Support</md:GivenName>
-    <md:SurName>Helpdesk</md:SurName>
-    <md:EmailAddress>mailto:helpdesk@uni-graz.at</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/zividp.uni-muenster.de-idp-shibboleth.xml b/swamid-interfederations-2.0/zividp.uni-muenster.de-idp-shibboleth.xml
deleted file mode 100644
index 0be3354a..00000000
--- a/swamid-interfederations-2.0/zividp.uni-muenster.de-idp-shibboleth.xml
+++ /dev/null
@@ -1,227 +0,0 @@
-<?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="32" width="32">https://www.uni-muenster.de/imperia/md/content/allgemein/farbunabhaengig/favicon.ico</mdui:Logo>
-        <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>emailAddress=wwwadmin@uni-muenster.de,CN=zividp.uni-muenster.de,OU=Zentrum fuer Informationsverarbeitung,O=Universitaet Muenster,L=Muenster,ST=Nordrhein-Westfalen,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIGIzCCBQugAwIBAgIHGFeCtRUcrzANBgkqhkiG9w0BAQsFADCBjDELMAkGA1UE
-BhMCREUxHjAcBgNVBAoTFVVuaXZlcnNpdGFldCBNdWVuc3RlcjE6MDgGA1UEAxMx
-WmVydGlmaXppZXJ1bmdzc3RlbGxlIFVuaXZlcnNpdGFldCBNdWVuc3RlciAtIEcw
-MjEhMB8GCSqGSIb3DQEJARYSY2FAdW5pLW11ZW5zdGVyLmRlMB4XDTE0MTAxMDE2
-MTExN1oXDTE5MDcwOTIzNTkwMFowgdgxCzAJBgNVBAYTAkRFMRwwGgYDVQQIExNO
-b3JkcmhlaW4tV2VzdGZhbGVuMREwDwYDVQQHEwhNdWVuc3RlcjEeMBwGA1UEChMV
-VW5pdmVyc2l0YWV0IE11ZW5zdGVyMS4wLAYDVQQLEyVaZW50cnVtIGZ1ZXIgSW5m
-b3JtYXRpb25zdmVyYXJiZWl0dW5nMR8wHQYDVQQDExZ6aXZpZHAudW5pLW11ZW5z
-dGVyLmRlMScwJQYJKoZIhvcNAQkBFhh3d3dhZG1pbkB1bmktbXVlbnN0ZXIuZGUw
-ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDs1fLiqaQJyAodfjyh3/G5
-YN6BhkHxnfeqmvoq9IgdJdn4X/kYPo2Mm/qE1qKebW73YJcgJJ6UoIfORVdZIpdu
-q/0ijQQVwkplC07RGzhhlhgIOGmybMpHt4e5LTnmI1aBLI+ZFsLkc2nEY9lEhRBH
-rSsMfQS/2qNJ5Hd71X/ITjwIByDpjsorHBfa8qQfJWsa+C/M3NjP7maITpDVPZ2k
-u1wwoenTZRMn3Tzzte9nP+GcHxG+hMx5qCNKQPblBnuUinYvAPirMsMQZGM/ZthN
-ujIAkzq7wzLP5z+H9icc4Ap9vEoEWdBhvZY5aZU7HwFm6MnNOBYkRl/SMjNGOwvf
-AgMBAAGjggI6MIICNjBPBgNVHSAESDBGMBEGDysGAQQBga0hgiwBAQQDAjARBg8r
-BgEEAYGtIYIsAgEEAwEwDwYNKwYBBAGBrSGCLAEBBDANBgsrBgEEAYGtIYIsHjAJ
-BgNVHRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYB
-BQUHAwEwHQYDVR0OBBYEFNq4Ch52JoFfVrqS4GJd45Hr9MMgMB8GA1UdIwQYMBaA
-FL6eUaLJkny7YIvmsGhkd1pSGaEAMCEGA1UdEQQaMBiCFnppdmlkcC51bmktbXVl
-bnN0ZXIuZGUwewYDVR0fBHQwcjA3oDWgM4YxaHR0cDovL2NkcDEucGNhLmRmbi5k
-ZS93d3UtY2EvcHViL2NybC9nX2NhY3JsLmNybDA3oDWgM4YxaHR0cDovL2NkcDIu
-cGNhLmRmbi5kZS93d3UtY2EvcHViL2NybC9nX2NhY3JsLmNybDCBywYIKwYBBQUH
-AQEEgb4wgbswMwYIKwYBBQUHMAGGJ2h0dHA6Ly9vY3NwLnBjYS5kZm4uZGUvT0NT
-UC1TZXJ2ZXIvT0NTUDBBBggrBgEFBQcwAoY1aHR0cDovL2NkcDEucGNhLmRmbi5k
-ZS93d3UtY2EvcHViL2NhY2VydC9nX2NhY2VydC5jcnQwQQYIKwYBBQUHMAKGNWh0
-dHA6Ly9jZHAyLnBjYS5kZm4uZGUvd3d1LWNhL3B1Yi9jYWNlcnQvZ19jYWNlcnQu
-Y3J0MA0GCSqGSIb3DQEBCwUAA4IBAQBVWV/BKM9kUH2geEkG7sa9DYJwvkJgZvmZ
-uSs96xhhHGvJ/8q5ZDMc1C5bFYjdOW9oGz6wtMTaj/Re7KbhMDi4M7WMjQX4hYx+
-5WFoCdhgRIBkXS6Nfi+UHEWVo/BLUZzZiwg2bG5Z0RPIcaxJUq387s+Qf76SHm3f
-GMFVt+1XRhsLaruEPfIH6xKwQ2/gf5XJVMsSP/zD5C71oEcimWpSOwYEE974ju+Z
-3f83SMO1Uj4iOtd3WJqQCbCL9u5xIyjXmxWobmTvub/dLs50YvZgBln7nwn227gr
-UuIMesitYxmNwjNX1FjrXtjuGk3ECJ7oJd2ixdXgr6KwPZwVG5VX
-</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>emailAddress=wwwadmin@uni-muenster.de,CN=zividp.uni-muenster.de,OU=Zentrum fuer Informationsverarbeitung,O=Universitaet Muenster,L=Muenster,ST=Nordrhein-Westfalen,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIGIzCCBQugAwIBAgIHGFeCtRUcrzANBgkqhkiG9w0BAQsFADCBjDELMAkGA1UE
-BhMCREUxHjAcBgNVBAoTFVVuaXZlcnNpdGFldCBNdWVuc3RlcjE6MDgGA1UEAxMx
-WmVydGlmaXppZXJ1bmdzc3RlbGxlIFVuaXZlcnNpdGFldCBNdWVuc3RlciAtIEcw
-MjEhMB8GCSqGSIb3DQEJARYSY2FAdW5pLW11ZW5zdGVyLmRlMB4XDTE0MTAxMDE2
-MTExN1oXDTE5MDcwOTIzNTkwMFowgdgxCzAJBgNVBAYTAkRFMRwwGgYDVQQIExNO
-b3JkcmhlaW4tV2VzdGZhbGVuMREwDwYDVQQHEwhNdWVuc3RlcjEeMBwGA1UEChMV
-VW5pdmVyc2l0YWV0IE11ZW5zdGVyMS4wLAYDVQQLEyVaZW50cnVtIGZ1ZXIgSW5m
-b3JtYXRpb25zdmVyYXJiZWl0dW5nMR8wHQYDVQQDExZ6aXZpZHAudW5pLW11ZW5z
-dGVyLmRlMScwJQYJKoZIhvcNAQkBFhh3d3dhZG1pbkB1bmktbXVlbnN0ZXIuZGUw
-ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDs1fLiqaQJyAodfjyh3/G5
-YN6BhkHxnfeqmvoq9IgdJdn4X/kYPo2Mm/qE1qKebW73YJcgJJ6UoIfORVdZIpdu
-q/0ijQQVwkplC07RGzhhlhgIOGmybMpHt4e5LTnmI1aBLI+ZFsLkc2nEY9lEhRBH
-rSsMfQS/2qNJ5Hd71X/ITjwIByDpjsorHBfa8qQfJWsa+C/M3NjP7maITpDVPZ2k
-u1wwoenTZRMn3Tzzte9nP+GcHxG+hMx5qCNKQPblBnuUinYvAPirMsMQZGM/ZthN
-ujIAkzq7wzLP5z+H9icc4Ap9vEoEWdBhvZY5aZU7HwFm6MnNOBYkRl/SMjNGOwvf
-AgMBAAGjggI6MIICNjBPBgNVHSAESDBGMBEGDysGAQQBga0hgiwBAQQDAjARBg8r
-BgEEAYGtIYIsAgEEAwEwDwYNKwYBBAGBrSGCLAEBBDANBgsrBgEEAYGtIYIsHjAJ
-BgNVHRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYB
-BQUHAwEwHQYDVR0OBBYEFNq4Ch52JoFfVrqS4GJd45Hr9MMgMB8GA1UdIwQYMBaA
-FL6eUaLJkny7YIvmsGhkd1pSGaEAMCEGA1UdEQQaMBiCFnppdmlkcC51bmktbXVl
-bnN0ZXIuZGUwewYDVR0fBHQwcjA3oDWgM4YxaHR0cDovL2NkcDEucGNhLmRmbi5k
-ZS93d3UtY2EvcHViL2NybC9nX2NhY3JsLmNybDA3oDWgM4YxaHR0cDovL2NkcDIu
-cGNhLmRmbi5kZS93d3UtY2EvcHViL2NybC9nX2NhY3JsLmNybDCBywYIKwYBBQUH
-AQEEgb4wgbswMwYIKwYBBQUHMAGGJ2h0dHA6Ly9vY3NwLnBjYS5kZm4uZGUvT0NT
-UC1TZXJ2ZXIvT0NTUDBBBggrBgEFBQcwAoY1aHR0cDovL2NkcDEucGNhLmRmbi5k
-ZS93d3UtY2EvcHViL2NhY2VydC9nX2NhY2VydC5jcnQwQQYIKwYBBQUHMAKGNWh0
-dHA6Ly9jZHAyLnBjYS5kZm4uZGUvd3d1LWNhL3B1Yi9jYWNlcnQvZ19jYWNlcnQu
-Y3J0MA0GCSqGSIb3DQEBCwUAA4IBAQBVWV/BKM9kUH2geEkG7sa9DYJwvkJgZvmZ
-uSs96xhhHGvJ/8q5ZDMc1C5bFYjdOW9oGz6wtMTaj/Re7KbhMDi4M7WMjQX4hYx+
-5WFoCdhgRIBkXS6Nfi+UHEWVo/BLUZzZiwg2bG5Z0RPIcaxJUq387s+Qf76SHm3f
-GMFVt+1XRhsLaruEPfIH6xKwQ2/gf5XJVMsSP/zD5C71oEcimWpSOwYEE974ju+Z
-3f83SMO1Uj4iOtd3WJqQCbCL9u5xIyjXmxWobmTvub/dLs50YvZgBln7nwn227gr
-UuIMesitYxmNwjNX1FjrXtjuGk3ECJ7oJd2ixdXgr6KwPZwVG5VX
-</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>emailAddress=wwwadmin@uni-muenster.de,CN=zividp.uni-muenster.de,OU=Zentrum fuer Informationsverarbeitung,O=Universitaet Muenster,L=Muenster,ST=Nordrhein-Westfalen,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIGIzCCBQugAwIBAgIHGFeCtRUcrzANBgkqhkiG9w0BAQsFADCBjDELMAkGA1UE
-BhMCREUxHjAcBgNVBAoTFVVuaXZlcnNpdGFldCBNdWVuc3RlcjE6MDgGA1UEAxMx
-WmVydGlmaXppZXJ1bmdzc3RlbGxlIFVuaXZlcnNpdGFldCBNdWVuc3RlciAtIEcw
-MjEhMB8GCSqGSIb3DQEJARYSY2FAdW5pLW11ZW5zdGVyLmRlMB4XDTE0MTAxMDE2
-MTExN1oXDTE5MDcwOTIzNTkwMFowgdgxCzAJBgNVBAYTAkRFMRwwGgYDVQQIExNO
-b3JkcmhlaW4tV2VzdGZhbGVuMREwDwYDVQQHEwhNdWVuc3RlcjEeMBwGA1UEChMV
-VW5pdmVyc2l0YWV0IE11ZW5zdGVyMS4wLAYDVQQLEyVaZW50cnVtIGZ1ZXIgSW5m
-b3JtYXRpb25zdmVyYXJiZWl0dW5nMR8wHQYDVQQDExZ6aXZpZHAudW5pLW11ZW5z
-dGVyLmRlMScwJQYJKoZIhvcNAQkBFhh3d3dhZG1pbkB1bmktbXVlbnN0ZXIuZGUw
-ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDs1fLiqaQJyAodfjyh3/G5
-YN6BhkHxnfeqmvoq9IgdJdn4X/kYPo2Mm/qE1qKebW73YJcgJJ6UoIfORVdZIpdu
-q/0ijQQVwkplC07RGzhhlhgIOGmybMpHt4e5LTnmI1aBLI+ZFsLkc2nEY9lEhRBH
-rSsMfQS/2qNJ5Hd71X/ITjwIByDpjsorHBfa8qQfJWsa+C/M3NjP7maITpDVPZ2k
-u1wwoenTZRMn3Tzzte9nP+GcHxG+hMx5qCNKQPblBnuUinYvAPirMsMQZGM/ZthN
-ujIAkzq7wzLP5z+H9icc4Ap9vEoEWdBhvZY5aZU7HwFm6MnNOBYkRl/SMjNGOwvf
-AgMBAAGjggI6MIICNjBPBgNVHSAESDBGMBEGDysGAQQBga0hgiwBAQQDAjARBg8r
-BgEEAYGtIYIsAgEEAwEwDwYNKwYBBAGBrSGCLAEBBDANBgsrBgEEAYGtIYIsHjAJ
-BgNVHRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYB
-BQUHAwEwHQYDVR0OBBYEFNq4Ch52JoFfVrqS4GJd45Hr9MMgMB8GA1UdIwQYMBaA
-FL6eUaLJkny7YIvmsGhkd1pSGaEAMCEGA1UdEQQaMBiCFnppdmlkcC51bmktbXVl
-bnN0ZXIuZGUwewYDVR0fBHQwcjA3oDWgM4YxaHR0cDovL2NkcDEucGNhLmRmbi5k
-ZS93d3UtY2EvcHViL2NybC9nX2NhY3JsLmNybDA3oDWgM4YxaHR0cDovL2NkcDIu
-cGNhLmRmbi5kZS93d3UtY2EvcHViL2NybC9nX2NhY3JsLmNybDCBywYIKwYBBQUH
-AQEEgb4wgbswMwYIKwYBBQUHMAGGJ2h0dHA6Ly9vY3NwLnBjYS5kZm4uZGUvT0NT
-UC1TZXJ2ZXIvT0NTUDBBBggrBgEFBQcwAoY1aHR0cDovL2NkcDEucGNhLmRmbi5k
-ZS93d3UtY2EvcHViL2NhY2VydC9nX2NhY2VydC5jcnQwQQYIKwYBBQUHMAKGNWh0
-dHA6Ly9jZHAyLnBjYS5kZm4uZGUvd3d1LWNhL3B1Yi9jYWNlcnQvZ19jYWNlcnQu
-Y3J0MA0GCSqGSIb3DQEBCwUAA4IBAQBVWV/BKM9kUH2geEkG7sa9DYJwvkJgZvmZ
-uSs96xhhHGvJ/8q5ZDMc1C5bFYjdOW9oGz6wtMTaj/Re7KbhMDi4M7WMjQX4hYx+
-5WFoCdhgRIBkXS6Nfi+UHEWVo/BLUZzZiwg2bG5Z0RPIcaxJUq387s+Qf76SHm3f
-GMFVt+1XRhsLaruEPfIH6xKwQ2/gf5XJVMsSP/zD5C71oEcimWpSOwYEE974ju+Z
-3f83SMO1Uj4iOtd3WJqQCbCL9u5xIyjXmxWobmTvub/dLs50YvZgBln7nwn227gr
-UuIMesitYxmNwjNX1FjrXtjuGk3ECJ7oJd2ixdXgr6KwPZwVG5VX
-</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>emailAddress=wwwadmin@uni-muenster.de,CN=zividp.uni-muenster.de,OU=Zentrum fuer Informationsverarbeitung,O=Universitaet Muenster,L=Muenster,ST=Nordrhein-Westfalen,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIGIzCCBQugAwIBAgIHGFeCtRUcrzANBgkqhkiG9w0BAQsFADCBjDELMAkGA1UE
-BhMCREUxHjAcBgNVBAoTFVVuaXZlcnNpdGFldCBNdWVuc3RlcjE6MDgGA1UEAxMx
-WmVydGlmaXppZXJ1bmdzc3RlbGxlIFVuaXZlcnNpdGFldCBNdWVuc3RlciAtIEcw
-MjEhMB8GCSqGSIb3DQEJARYSY2FAdW5pLW11ZW5zdGVyLmRlMB4XDTE0MTAxMDE2
-MTExN1oXDTE5MDcwOTIzNTkwMFowgdgxCzAJBgNVBAYTAkRFMRwwGgYDVQQIExNO
-b3JkcmhlaW4tV2VzdGZhbGVuMREwDwYDVQQHEwhNdWVuc3RlcjEeMBwGA1UEChMV
-VW5pdmVyc2l0YWV0IE11ZW5zdGVyMS4wLAYDVQQLEyVaZW50cnVtIGZ1ZXIgSW5m
-b3JtYXRpb25zdmVyYXJiZWl0dW5nMR8wHQYDVQQDExZ6aXZpZHAudW5pLW11ZW5z
-dGVyLmRlMScwJQYJKoZIhvcNAQkBFhh3d3dhZG1pbkB1bmktbXVlbnN0ZXIuZGUw
-ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDs1fLiqaQJyAodfjyh3/G5
-YN6BhkHxnfeqmvoq9IgdJdn4X/kYPo2Mm/qE1qKebW73YJcgJJ6UoIfORVdZIpdu
-q/0ijQQVwkplC07RGzhhlhgIOGmybMpHt4e5LTnmI1aBLI+ZFsLkc2nEY9lEhRBH
-rSsMfQS/2qNJ5Hd71X/ITjwIByDpjsorHBfa8qQfJWsa+C/M3NjP7maITpDVPZ2k
-u1wwoenTZRMn3Tzzte9nP+GcHxG+hMx5qCNKQPblBnuUinYvAPirMsMQZGM/ZthN
-ujIAkzq7wzLP5z+H9icc4Ap9vEoEWdBhvZY5aZU7HwFm6MnNOBYkRl/SMjNGOwvf
-AgMBAAGjggI6MIICNjBPBgNVHSAESDBGMBEGDysGAQQBga0hgiwBAQQDAjARBg8r
-BgEEAYGtIYIsAgEEAwEwDwYNKwYBBAGBrSGCLAEBBDANBgsrBgEEAYGtIYIsHjAJ
-BgNVHRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYB
-BQUHAwEwHQYDVR0OBBYEFNq4Ch52JoFfVrqS4GJd45Hr9MMgMB8GA1UdIwQYMBaA
-FL6eUaLJkny7YIvmsGhkd1pSGaEAMCEGA1UdEQQaMBiCFnppdmlkcC51bmktbXVl
-bnN0ZXIuZGUwewYDVR0fBHQwcjA3oDWgM4YxaHR0cDovL2NkcDEucGNhLmRmbi5k
-ZS93d3UtY2EvcHViL2NybC9nX2NhY3JsLmNybDA3oDWgM4YxaHR0cDovL2NkcDIu
-cGNhLmRmbi5kZS93d3UtY2EvcHViL2NybC9nX2NhY3JsLmNybDCBywYIKwYBBQUH
-AQEEgb4wgbswMwYIKwYBBQUHMAGGJ2h0dHA6Ly9vY3NwLnBjYS5kZm4uZGUvT0NT
-UC1TZXJ2ZXIvT0NTUDBBBggrBgEFBQcwAoY1aHR0cDovL2NkcDEucGNhLmRmbi5k
-ZS93d3UtY2EvcHViL2NhY2VydC9nX2NhY2VydC5jcnQwQQYIKwYBBQUHMAKGNWh0
-dHA6Ly9jZHAyLnBjYS5kZm4uZGUvd3d1LWNhL3B1Yi9jYWNlcnQvZ19jYWNlcnQu
-Y3J0MA0GCSqGSIb3DQEBCwUAA4IBAQBVWV/BKM9kUH2geEkG7sa9DYJwvkJgZvmZ
-uSs96xhhHGvJ/8q5ZDMc1C5bFYjdOW9oGz6wtMTaj/Re7KbhMDi4M7WMjQX4hYx+
-5WFoCdhgRIBkXS6Nfi+UHEWVo/BLUZzZiwg2bG5Z0RPIcaxJUq387s+Qf76SHm3f
-GMFVt+1XRhsLaruEPfIH6xKwQ2/gf5XJVMsSP/zD5C71oEcimWpSOwYEE974ju+Z
-3f83SMO1Uj4iOtd3WJqQCbCL9u5xIyjXmxWobmTvub/dLs50YvZgBln7nwn227gr
-UuIMesitYxmNwjNX1FjrXtjuGk3ECJ7oJd2ixdXgr6KwPZwVG5VX
-</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>
diff --git a/swamid-interfederations-2.0/zividp.uni-muenster.de.xml b/swamid-interfederations-2.0/zividp.uni-muenster.de.xml
deleted file mode 100644
index 0be3354a..00000000
--- a/swamid-interfederations-2.0/zividp.uni-muenster.de.xml
+++ /dev/null
@@ -1,227 +0,0 @@
-<?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="32" width="32">https://www.uni-muenster.de/imperia/md/content/allgemein/farbunabhaengig/favicon.ico</mdui:Logo>
-        <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>emailAddress=wwwadmin@uni-muenster.de,CN=zividp.uni-muenster.de,OU=Zentrum fuer Informationsverarbeitung,O=Universitaet Muenster,L=Muenster,ST=Nordrhein-Westfalen,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIGIzCCBQugAwIBAgIHGFeCtRUcrzANBgkqhkiG9w0BAQsFADCBjDELMAkGA1UE
-BhMCREUxHjAcBgNVBAoTFVVuaXZlcnNpdGFldCBNdWVuc3RlcjE6MDgGA1UEAxMx
-WmVydGlmaXppZXJ1bmdzc3RlbGxlIFVuaXZlcnNpdGFldCBNdWVuc3RlciAtIEcw
-MjEhMB8GCSqGSIb3DQEJARYSY2FAdW5pLW11ZW5zdGVyLmRlMB4XDTE0MTAxMDE2
-MTExN1oXDTE5MDcwOTIzNTkwMFowgdgxCzAJBgNVBAYTAkRFMRwwGgYDVQQIExNO
-b3JkcmhlaW4tV2VzdGZhbGVuMREwDwYDVQQHEwhNdWVuc3RlcjEeMBwGA1UEChMV
-VW5pdmVyc2l0YWV0IE11ZW5zdGVyMS4wLAYDVQQLEyVaZW50cnVtIGZ1ZXIgSW5m
-b3JtYXRpb25zdmVyYXJiZWl0dW5nMR8wHQYDVQQDExZ6aXZpZHAudW5pLW11ZW5z
-dGVyLmRlMScwJQYJKoZIhvcNAQkBFhh3d3dhZG1pbkB1bmktbXVlbnN0ZXIuZGUw
-ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDs1fLiqaQJyAodfjyh3/G5
-YN6BhkHxnfeqmvoq9IgdJdn4X/kYPo2Mm/qE1qKebW73YJcgJJ6UoIfORVdZIpdu
-q/0ijQQVwkplC07RGzhhlhgIOGmybMpHt4e5LTnmI1aBLI+ZFsLkc2nEY9lEhRBH
-rSsMfQS/2qNJ5Hd71X/ITjwIByDpjsorHBfa8qQfJWsa+C/M3NjP7maITpDVPZ2k
-u1wwoenTZRMn3Tzzte9nP+GcHxG+hMx5qCNKQPblBnuUinYvAPirMsMQZGM/ZthN
-ujIAkzq7wzLP5z+H9icc4Ap9vEoEWdBhvZY5aZU7HwFm6MnNOBYkRl/SMjNGOwvf
-AgMBAAGjggI6MIICNjBPBgNVHSAESDBGMBEGDysGAQQBga0hgiwBAQQDAjARBg8r
-BgEEAYGtIYIsAgEEAwEwDwYNKwYBBAGBrSGCLAEBBDANBgsrBgEEAYGtIYIsHjAJ
-BgNVHRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYB
-BQUHAwEwHQYDVR0OBBYEFNq4Ch52JoFfVrqS4GJd45Hr9MMgMB8GA1UdIwQYMBaA
-FL6eUaLJkny7YIvmsGhkd1pSGaEAMCEGA1UdEQQaMBiCFnppdmlkcC51bmktbXVl
-bnN0ZXIuZGUwewYDVR0fBHQwcjA3oDWgM4YxaHR0cDovL2NkcDEucGNhLmRmbi5k
-ZS93d3UtY2EvcHViL2NybC9nX2NhY3JsLmNybDA3oDWgM4YxaHR0cDovL2NkcDIu
-cGNhLmRmbi5kZS93d3UtY2EvcHViL2NybC9nX2NhY3JsLmNybDCBywYIKwYBBQUH
-AQEEgb4wgbswMwYIKwYBBQUHMAGGJ2h0dHA6Ly9vY3NwLnBjYS5kZm4uZGUvT0NT
-UC1TZXJ2ZXIvT0NTUDBBBggrBgEFBQcwAoY1aHR0cDovL2NkcDEucGNhLmRmbi5k
-ZS93d3UtY2EvcHViL2NhY2VydC9nX2NhY2VydC5jcnQwQQYIKwYBBQUHMAKGNWh0
-dHA6Ly9jZHAyLnBjYS5kZm4uZGUvd3d1LWNhL3B1Yi9jYWNlcnQvZ19jYWNlcnQu
-Y3J0MA0GCSqGSIb3DQEBCwUAA4IBAQBVWV/BKM9kUH2geEkG7sa9DYJwvkJgZvmZ
-uSs96xhhHGvJ/8q5ZDMc1C5bFYjdOW9oGz6wtMTaj/Re7KbhMDi4M7WMjQX4hYx+
-5WFoCdhgRIBkXS6Nfi+UHEWVo/BLUZzZiwg2bG5Z0RPIcaxJUq387s+Qf76SHm3f
-GMFVt+1XRhsLaruEPfIH6xKwQ2/gf5XJVMsSP/zD5C71oEcimWpSOwYEE974ju+Z
-3f83SMO1Uj4iOtd3WJqQCbCL9u5xIyjXmxWobmTvub/dLs50YvZgBln7nwn227gr
-UuIMesitYxmNwjNX1FjrXtjuGk3ECJ7oJd2ixdXgr6KwPZwVG5VX
-</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>emailAddress=wwwadmin@uni-muenster.de,CN=zividp.uni-muenster.de,OU=Zentrum fuer Informationsverarbeitung,O=Universitaet Muenster,L=Muenster,ST=Nordrhein-Westfalen,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIGIzCCBQugAwIBAgIHGFeCtRUcrzANBgkqhkiG9w0BAQsFADCBjDELMAkGA1UE
-BhMCREUxHjAcBgNVBAoTFVVuaXZlcnNpdGFldCBNdWVuc3RlcjE6MDgGA1UEAxMx
-WmVydGlmaXppZXJ1bmdzc3RlbGxlIFVuaXZlcnNpdGFldCBNdWVuc3RlciAtIEcw
-MjEhMB8GCSqGSIb3DQEJARYSY2FAdW5pLW11ZW5zdGVyLmRlMB4XDTE0MTAxMDE2
-MTExN1oXDTE5MDcwOTIzNTkwMFowgdgxCzAJBgNVBAYTAkRFMRwwGgYDVQQIExNO
-b3JkcmhlaW4tV2VzdGZhbGVuMREwDwYDVQQHEwhNdWVuc3RlcjEeMBwGA1UEChMV
-VW5pdmVyc2l0YWV0IE11ZW5zdGVyMS4wLAYDVQQLEyVaZW50cnVtIGZ1ZXIgSW5m
-b3JtYXRpb25zdmVyYXJiZWl0dW5nMR8wHQYDVQQDExZ6aXZpZHAudW5pLW11ZW5z
-dGVyLmRlMScwJQYJKoZIhvcNAQkBFhh3d3dhZG1pbkB1bmktbXVlbnN0ZXIuZGUw
-ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDs1fLiqaQJyAodfjyh3/G5
-YN6BhkHxnfeqmvoq9IgdJdn4X/kYPo2Mm/qE1qKebW73YJcgJJ6UoIfORVdZIpdu
-q/0ijQQVwkplC07RGzhhlhgIOGmybMpHt4e5LTnmI1aBLI+ZFsLkc2nEY9lEhRBH
-rSsMfQS/2qNJ5Hd71X/ITjwIByDpjsorHBfa8qQfJWsa+C/M3NjP7maITpDVPZ2k
-u1wwoenTZRMn3Tzzte9nP+GcHxG+hMx5qCNKQPblBnuUinYvAPirMsMQZGM/ZthN
-ujIAkzq7wzLP5z+H9icc4Ap9vEoEWdBhvZY5aZU7HwFm6MnNOBYkRl/SMjNGOwvf
-AgMBAAGjggI6MIICNjBPBgNVHSAESDBGMBEGDysGAQQBga0hgiwBAQQDAjARBg8r
-BgEEAYGtIYIsAgEEAwEwDwYNKwYBBAGBrSGCLAEBBDANBgsrBgEEAYGtIYIsHjAJ
-BgNVHRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYB
-BQUHAwEwHQYDVR0OBBYEFNq4Ch52JoFfVrqS4GJd45Hr9MMgMB8GA1UdIwQYMBaA
-FL6eUaLJkny7YIvmsGhkd1pSGaEAMCEGA1UdEQQaMBiCFnppdmlkcC51bmktbXVl
-bnN0ZXIuZGUwewYDVR0fBHQwcjA3oDWgM4YxaHR0cDovL2NkcDEucGNhLmRmbi5k
-ZS93d3UtY2EvcHViL2NybC9nX2NhY3JsLmNybDA3oDWgM4YxaHR0cDovL2NkcDIu
-cGNhLmRmbi5kZS93d3UtY2EvcHViL2NybC9nX2NhY3JsLmNybDCBywYIKwYBBQUH
-AQEEgb4wgbswMwYIKwYBBQUHMAGGJ2h0dHA6Ly9vY3NwLnBjYS5kZm4uZGUvT0NT
-UC1TZXJ2ZXIvT0NTUDBBBggrBgEFBQcwAoY1aHR0cDovL2NkcDEucGNhLmRmbi5k
-ZS93d3UtY2EvcHViL2NhY2VydC9nX2NhY2VydC5jcnQwQQYIKwYBBQUHMAKGNWh0
-dHA6Ly9jZHAyLnBjYS5kZm4uZGUvd3d1LWNhL3B1Yi9jYWNlcnQvZ19jYWNlcnQu
-Y3J0MA0GCSqGSIb3DQEBCwUAA4IBAQBVWV/BKM9kUH2geEkG7sa9DYJwvkJgZvmZ
-uSs96xhhHGvJ/8q5ZDMc1C5bFYjdOW9oGz6wtMTaj/Re7KbhMDi4M7WMjQX4hYx+
-5WFoCdhgRIBkXS6Nfi+UHEWVo/BLUZzZiwg2bG5Z0RPIcaxJUq387s+Qf76SHm3f
-GMFVt+1XRhsLaruEPfIH6xKwQ2/gf5XJVMsSP/zD5C71oEcimWpSOwYEE974ju+Z
-3f83SMO1Uj4iOtd3WJqQCbCL9u5xIyjXmxWobmTvub/dLs50YvZgBln7nwn227gr
-UuIMesitYxmNwjNX1FjrXtjuGk3ECJ7oJd2ixdXgr6KwPZwVG5VX
-</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>emailAddress=wwwadmin@uni-muenster.de,CN=zividp.uni-muenster.de,OU=Zentrum fuer Informationsverarbeitung,O=Universitaet Muenster,L=Muenster,ST=Nordrhein-Westfalen,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIGIzCCBQugAwIBAgIHGFeCtRUcrzANBgkqhkiG9w0BAQsFADCBjDELMAkGA1UE
-BhMCREUxHjAcBgNVBAoTFVVuaXZlcnNpdGFldCBNdWVuc3RlcjE6MDgGA1UEAxMx
-WmVydGlmaXppZXJ1bmdzc3RlbGxlIFVuaXZlcnNpdGFldCBNdWVuc3RlciAtIEcw
-MjEhMB8GCSqGSIb3DQEJARYSY2FAdW5pLW11ZW5zdGVyLmRlMB4XDTE0MTAxMDE2
-MTExN1oXDTE5MDcwOTIzNTkwMFowgdgxCzAJBgNVBAYTAkRFMRwwGgYDVQQIExNO
-b3JkcmhlaW4tV2VzdGZhbGVuMREwDwYDVQQHEwhNdWVuc3RlcjEeMBwGA1UEChMV
-VW5pdmVyc2l0YWV0IE11ZW5zdGVyMS4wLAYDVQQLEyVaZW50cnVtIGZ1ZXIgSW5m
-b3JtYXRpb25zdmVyYXJiZWl0dW5nMR8wHQYDVQQDExZ6aXZpZHAudW5pLW11ZW5z
-dGVyLmRlMScwJQYJKoZIhvcNAQkBFhh3d3dhZG1pbkB1bmktbXVlbnN0ZXIuZGUw
-ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDs1fLiqaQJyAodfjyh3/G5
-YN6BhkHxnfeqmvoq9IgdJdn4X/kYPo2Mm/qE1qKebW73YJcgJJ6UoIfORVdZIpdu
-q/0ijQQVwkplC07RGzhhlhgIOGmybMpHt4e5LTnmI1aBLI+ZFsLkc2nEY9lEhRBH
-rSsMfQS/2qNJ5Hd71X/ITjwIByDpjsorHBfa8qQfJWsa+C/M3NjP7maITpDVPZ2k
-u1wwoenTZRMn3Tzzte9nP+GcHxG+hMx5qCNKQPblBnuUinYvAPirMsMQZGM/ZthN
-ujIAkzq7wzLP5z+H9icc4Ap9vEoEWdBhvZY5aZU7HwFm6MnNOBYkRl/SMjNGOwvf
-AgMBAAGjggI6MIICNjBPBgNVHSAESDBGMBEGDysGAQQBga0hgiwBAQQDAjARBg8r
-BgEEAYGtIYIsAgEEAwEwDwYNKwYBBAGBrSGCLAEBBDANBgsrBgEEAYGtIYIsHjAJ
-BgNVHRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYB
-BQUHAwEwHQYDVR0OBBYEFNq4Ch52JoFfVrqS4GJd45Hr9MMgMB8GA1UdIwQYMBaA
-FL6eUaLJkny7YIvmsGhkd1pSGaEAMCEGA1UdEQQaMBiCFnppdmlkcC51bmktbXVl
-bnN0ZXIuZGUwewYDVR0fBHQwcjA3oDWgM4YxaHR0cDovL2NkcDEucGNhLmRmbi5k
-ZS93d3UtY2EvcHViL2NybC9nX2NhY3JsLmNybDA3oDWgM4YxaHR0cDovL2NkcDIu
-cGNhLmRmbi5kZS93d3UtY2EvcHViL2NybC9nX2NhY3JsLmNybDCBywYIKwYBBQUH
-AQEEgb4wgbswMwYIKwYBBQUHMAGGJ2h0dHA6Ly9vY3NwLnBjYS5kZm4uZGUvT0NT
-UC1TZXJ2ZXIvT0NTUDBBBggrBgEFBQcwAoY1aHR0cDovL2NkcDEucGNhLmRmbi5k
-ZS93d3UtY2EvcHViL2NhY2VydC9nX2NhY2VydC5jcnQwQQYIKwYBBQUHMAKGNWh0
-dHA6Ly9jZHAyLnBjYS5kZm4uZGUvd3d1LWNhL3B1Yi9jYWNlcnQvZ19jYWNlcnQu
-Y3J0MA0GCSqGSIb3DQEBCwUAA4IBAQBVWV/BKM9kUH2geEkG7sa9DYJwvkJgZvmZ
-uSs96xhhHGvJ/8q5ZDMc1C5bFYjdOW9oGz6wtMTaj/Re7KbhMDi4M7WMjQX4hYx+
-5WFoCdhgRIBkXS6Nfi+UHEWVo/BLUZzZiwg2bG5Z0RPIcaxJUq387s+Qf76SHm3f
-GMFVt+1XRhsLaruEPfIH6xKwQ2/gf5XJVMsSP/zD5C71oEcimWpSOwYEE974ju+Z
-3f83SMO1Uj4iOtd3WJqQCbCL9u5xIyjXmxWobmTvub/dLs50YvZgBln7nwn227gr
-UuIMesitYxmNwjNX1FjrXtjuGk3ECJ7oJd2ixdXgr6KwPZwVG5VX
-</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>emailAddress=wwwadmin@uni-muenster.de,CN=zividp.uni-muenster.de,OU=Zentrum fuer Informationsverarbeitung,O=Universitaet Muenster,L=Muenster,ST=Nordrhein-Westfalen,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIGIzCCBQugAwIBAgIHGFeCtRUcrzANBgkqhkiG9w0BAQsFADCBjDELMAkGA1UE
-BhMCREUxHjAcBgNVBAoTFVVuaXZlcnNpdGFldCBNdWVuc3RlcjE6MDgGA1UEAxMx
-WmVydGlmaXppZXJ1bmdzc3RlbGxlIFVuaXZlcnNpdGFldCBNdWVuc3RlciAtIEcw
-MjEhMB8GCSqGSIb3DQEJARYSY2FAdW5pLW11ZW5zdGVyLmRlMB4XDTE0MTAxMDE2
-MTExN1oXDTE5MDcwOTIzNTkwMFowgdgxCzAJBgNVBAYTAkRFMRwwGgYDVQQIExNO
-b3JkcmhlaW4tV2VzdGZhbGVuMREwDwYDVQQHEwhNdWVuc3RlcjEeMBwGA1UEChMV
-VW5pdmVyc2l0YWV0IE11ZW5zdGVyMS4wLAYDVQQLEyVaZW50cnVtIGZ1ZXIgSW5m
-b3JtYXRpb25zdmVyYXJiZWl0dW5nMR8wHQYDVQQDExZ6aXZpZHAudW5pLW11ZW5z
-dGVyLmRlMScwJQYJKoZIhvcNAQkBFhh3d3dhZG1pbkB1bmktbXVlbnN0ZXIuZGUw
-ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDs1fLiqaQJyAodfjyh3/G5
-YN6BhkHxnfeqmvoq9IgdJdn4X/kYPo2Mm/qE1qKebW73YJcgJJ6UoIfORVdZIpdu
-q/0ijQQVwkplC07RGzhhlhgIOGmybMpHt4e5LTnmI1aBLI+ZFsLkc2nEY9lEhRBH
-rSsMfQS/2qNJ5Hd71X/ITjwIByDpjsorHBfa8qQfJWsa+C/M3NjP7maITpDVPZ2k
-u1wwoenTZRMn3Tzzte9nP+GcHxG+hMx5qCNKQPblBnuUinYvAPirMsMQZGM/ZthN
-ujIAkzq7wzLP5z+H9icc4Ap9vEoEWdBhvZY5aZU7HwFm6MnNOBYkRl/SMjNGOwvf
-AgMBAAGjggI6MIICNjBPBgNVHSAESDBGMBEGDysGAQQBga0hgiwBAQQDAjARBg8r
-BgEEAYGtIYIsAgEEAwEwDwYNKwYBBAGBrSGCLAEBBDANBgsrBgEEAYGtIYIsHjAJ
-BgNVHRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYB
-BQUHAwEwHQYDVR0OBBYEFNq4Ch52JoFfVrqS4GJd45Hr9MMgMB8GA1UdIwQYMBaA
-FL6eUaLJkny7YIvmsGhkd1pSGaEAMCEGA1UdEQQaMBiCFnppdmlkcC51bmktbXVl
-bnN0ZXIuZGUwewYDVR0fBHQwcjA3oDWgM4YxaHR0cDovL2NkcDEucGNhLmRmbi5k
-ZS93d3UtY2EvcHViL2NybC9nX2NhY3JsLmNybDA3oDWgM4YxaHR0cDovL2NkcDIu
-cGNhLmRmbi5kZS93d3UtY2EvcHViL2NybC9nX2NhY3JsLmNybDCBywYIKwYBBQUH
-AQEEgb4wgbswMwYIKwYBBQUHMAGGJ2h0dHA6Ly9vY3NwLnBjYS5kZm4uZGUvT0NT
-UC1TZXJ2ZXIvT0NTUDBBBggrBgEFBQcwAoY1aHR0cDovL2NkcDEucGNhLmRmbi5k
-ZS93d3UtY2EvcHViL2NhY2VydC9nX2NhY2VydC5jcnQwQQYIKwYBBQUHMAKGNWh0
-dHA6Ly9jZHAyLnBjYS5kZm4uZGUvd3d1LWNhL3B1Yi9jYWNlcnQvZ19jYWNlcnQu
-Y3J0MA0GCSqGSIb3DQEBCwUAA4IBAQBVWV/BKM9kUH2geEkG7sa9DYJwvkJgZvmZ
-uSs96xhhHGvJ/8q5ZDMc1C5bFYjdOW9oGz6wtMTaj/Re7KbhMDi4M7WMjQX4hYx+
-5WFoCdhgRIBkXS6Nfi+UHEWVo/BLUZzZiwg2bG5Z0RPIcaxJUq387s+Qf76SHm3f
-GMFVt+1XRhsLaruEPfIH6xKwQ2/gf5XJVMsSP/zD5C71oEcimWpSOwYEE974ju+Z
-3f83SMO1Uj4iOtd3WJqQCbCL9u5xIyjXmxWobmTvub/dLs50YvZgBln7nwn227gr
-UuIMesitYxmNwjNX1FjrXtjuGk3ECJ7oJd2ixdXgr6KwPZwVG5VX
-</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>